diff options
| -rw-r--r-- | Next/SHA1s | 233 | ||||
| -rw-r--r-- | Next/Trees | 235 | ||||
| -rw-r--r-- | Next/merge.log | 4299 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 4772 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..a052e13221be --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,233 @@ +Name SHA1 +---- ---- +origin e531cdf50a8a0fb7a4d51c06e52097bd01e9bf7c +fixes 36f90b0a2ddd60823fe193a85e60ff1906c2a9b3 +kbuild-current 3d1450d54a4fc277fc4598acf2335f74b66b08fc +arc-current deaf7565eb618a80534844300aeacffa14125182 +arm-current f474c8c857d996f34c39f66bbed23faaa739fad6 +m68k-current efbec135f11d6f14f40806935827c53d8889f59b +metag-fixes 0164a711c97b0beeb7994b7d32ccddf586b6d81a +powerpc-fixes b562e44f507e863c6792946e4e1b1449fbbac85d +powerpc-merge-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +sparc 9ef595d83aea6b4d93c9a120df3c5db2e226929f +net 6b0725232dd1a8ba330663603db2a4009c177181 +ipsec 215276c0147ef49bc07692ca68bae35a30a64b9a +ipvs 7617a24f83b5d67f4dab1844956be1cebc44aec8 +wireless-drivers 10da848f67a7e7152bf7cbe332e4c92d71a990d2 +mac80211 ad8ec957f693c7f76e02793289e7819d087642be +sound-current c64c1437afb14ebc900e40910f31ffb20bf652ad +pci-current 30b5b8808c12bcd947dd474980482561b69c1bcb +driver-core.current 18558cae0272f8fd9647e69d3fec1565a7949865 +tty.current 18558cae0272f8fd9647e69d3fec1565a7949865 +usb.current 6b5f04b6cf8ebab9a65d9c0026c650bb2538fd0f +usb-gadget-fixes 3b2435192fe917a826c91c8b34032428d6efdfc7 +usb-serial-fixes f6cede5b49e822ebc41a099fe41ab4989f64e2cb +usb-chipidea-fixes d144dfea8af7108f613139623e63952ed7e69c0c +staging.current 1200b6809dfd9d73bc4c7db76d288c35fa4b2ebe +char-misc.current 5cd0911a9e0e408f28079a5e36a981217bf47520 +input-current 4d2508a55990c9b0fc1afb2c2cc5636712fd30f7 +crypto-current dfe97ad30e8c038261663a18b9e04b8b5bc07bea +ide 0d7ef45cdeebcc95d581703f45f6de7b2ee89b8d +devicetree-current f76502aa9140ec338a59487218bf70a9c9e92b8f +rr-fixes 8244062ef1e54502ef55f54cced659913f244c3e +vfio-fixes 8160c4e455820d5008a1116d2dca35f0363bb062 +kselftest-fixes 92e963f50fc74041b5e9e744c330dca48e04f08d +backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f +ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600 +mfd-fixes 1b52e50f2a402a266f1ba2281f0a57e87637a047 +drm-intel-fixes b562e44f507e863c6792946e4e1b1449fbbac85d +asm-generic a1cbaad75a8f891bca9cc65a1fb95ae1b28d2f6a +arc 60d77f101c1fdf2d2e5a6459df921e8a6d793fc3 +arm 1b3bf847977c2e5974012ddd4b25fef50967d785 +arm-perf fe638401a091f4473e9e30942ea3cecc0c0b2b94 +arm-soc 35fe688abfcfeadf678664ae2e04815bb416de5a +at91 c40abde4b32e986de8381b7dfc92f7d8684467f9 +bcm2835-dt 1305141d1a7254b53b35303ee84f4c4948007bd0 +bcm2835-soc 92e963f50fc74041b5e9e744c330dca48e04f08d +bcm2835-drivers 92e963f50fc74041b5e9e744c330dca48e04f08d +bcm2835-defconfig 0a05d3b71ada526ef93019fb3fbd6a95561a8a5f +berlin 9a7e0683324926963bcee47058c4f86f4fb6b409 +cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4 +imx-mxs 9e26d5f485d7c160003334bd1cfc0aa39d1ab0bc +keystone 8fdbbde4a16c8c14af47d74a5106664dc0cc2914 +mvebu 5be603bdf1a7b4c9ee619f201264d90384232d55 +omap aec24f100558d3572aa7da7aaa66b68342ed9996 +omap-pending 8fe097a3d99e22355fb8e3bcee59542bf3f46b2d +qcom f17d0d578214b6bb51819f9b43ab7e1d1c7c1c0a +renesas f094c5346231e9237610f8f16f659fb972de1c60 +rockchip 545d1b355f3a010ec32833f2a12b2c9584380d71 +rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590 +samsung 92e963f50fc74041b5e9e744c330dca48e04f08d +samsung-krzk 466369e4e14b3d83c8843500a016afd403769d52 +sunxi 73e5379b04422fa3639ef5076abedd317b2c0ebc +tegra 755f165105b11619cc1da577f030fce110fa9ea9 +arm64 f09f1bacfe2b1e64a5d94bc2711f73b654c95514 +blackfin d91e14b3b9e1d8e1d552f4d6aff45551bbb410b1 +c6x ca3060d39ae7a0964f8c123a4833029981e86476 +cris f9f3f864b5e8c09d7837d8980edba4ad52969819 +h8300 7a93665a22d811046774aff1476dc819003477d1 +hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a +ia64 7e26e9ff0a9301398bd7cf8d896536da3a54aa9a +m68k efbec135f11d6f14f40806935827c53d8889f59b +m68knommu a3595962d82495f51a80feb19dcdb135556a9527 +metag c8b6ad8b3f873ff5b971523f439f4b5a1ac75842 +microblaze c937adb7ec914b8ac66cdf6c00992537f4432860 +mips a6cab95ec1ae38a64b2bc2545e7825ad3a3a7dd4 +nios2 8e3d7c834ba0f79f200c155cf0647eacd39f2fbe +parisc-hd afd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc +powerpc 6e669f085d595cb6053920832c89f1a13067db44 +powerpc-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +fsl fba4e9f9898ab181703723b9890ba29345edfe08 +mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0 +s390 19eedc6df7b64050ec5b4b7010df9a0bf70957c9 +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +tile 35b90a2939a563df4b1f57f18dd925d6aa7cb38a +uml ad32a1f3c36b046b2e7b0361b88c18e3af61419e +unicore32 d670878e2c9adb86b37e42b0937b2d4825bd2b39 +xtensa 9da8320bb97768e35f2e64fa7642015271d672eb +btrfs bb7ab3b92e46da06b580c6f83abe7894dc449cca +btrfs-kdave cb96ddcd037b67295f9cb992e3f2e675d3a39d84 +ceph cd8140c673d9ba9be3591220e1b2226d9e1e40d3 +cifs b562e44f507e863c6792946e4e1b1449fbbac85d +configfs 1ae1602de028acaa42a0f6ff18d19756f8e825c6 +ecryptfs 933c32fe0e42b86d9bc5779401c3ce93d56bd231 +ext3 ab73ef46398e2c0159f3a71de834586422d2a44a +ext4 ff2ea405b86cbdc0a7b9f70fac5d06d53c9e9a0b +f2fs d407574e7948210223a7adca5ff26e3b0ec8143e +fscache b00c2ae2ed3c0c40e0740549fe0e42e234a97dc2 +fuse 742f992708dff0ada8b426228900ffb009c7167b +gfs2 9dffdb38d864ae89e16ff7b3a09451270736e35b +jfs 26456955719b79cc4a011b18221aa68f599f6b6c +nfs f35592a97460f57d1089fd674176e9f34ba311f2 +nfsd 8287ea1c52bd143e884aa595224659e84a681154 +orangefs 2f83ace37181e445cab83d1d2a3a1dc88a36a814 +overlayfs 1fd10315545aa0eabcd55fb534162ba46e40f04b +v9fs a333e4bf2556b93c908e56b39be7bbd555f1b6cc +ubifs c27cb97218b3e72417ffc5e73dce488844017b39 +xfs 2cdb958aba6afbced5bc563167813b972b6acbfe +file-locks 5af9c2e19da6514a1a50b07d97d93b74a7711873 +vfs 8b23a8ce1094f25a85826e25217c5b9779a4f5aa +pci 6e6f498b039aa5558c7377fbbe65f7421d34cea4 +hid c7bc3b24d539da3a7dc00aaaa285986a1650e47d +i2c 886f6f8337dd506e9ae0e45ee13eef3a0ceebd03 +jdelvare-hwmon f02de116250d4ac6137cd3255be7d1f5678ac460 +dmi c3db05ecf8acef3e4ae9436d357a067052061eb0 +hwmon-staging 630300d5fcb6ee9c32c75d8b576c100fbb794159 +v4l-dvb 1752d448bb5ecd9d5ac288a3c5a7892be57a040c +libata 4b3ec02793970ef663332e2ebe1b2ea5aeb3afd6 +pm 6a9c8816542f2e01bf446252fc6870c0e458f80e +idle 31ade3b83e1821da5fbb2f11b5b3d4ab2ec39db8 +thermal 33cae63614e6e99e7beaa8c5679ea3bcf1387d9a +thermal-soc 44fa372da981c9ca4e796ddc3b0f70ec2cd6d746 +ieee1394 e38e5ce81c3ed79dd48fc1801134e8812558c389 +dlm b81171cb6869111dbaf9fb642f4434514c21d696 +swiotlb 386744425e35e04984c6e741c7750fd6eef1a9df +slave-dma 7ea5d41560d970c14e7b0a07f24e5b137c5011c1 +net-next de06dbfa7861c9019eedefc0c356ba86e5098f1b +ipsec-next cb866e3298cd7412503fc7e2c265753c853fab9d +ipvs-next f6ca9f46f6615c3a87529550058d1b468c0cad89 +wireless-drivers-next ccfe1e85322090649d2fae599e55300c1512bf15 +bluetooth de06dbfa7861c9019eedefc0c356ba86e5098f1b +mac80211-next 0a87cadbb54e1595a5f64542adb4c63be914d290 +rdma 520a07bff6fbb23cac905007d74c67058b189acb +mtd 9df4f913eb39046fa57c4217bb3429a63e164000 +l2-mtd 6871c1b96de88d3576d935b528fd1b0ec70e81f5 +crypto 34074205bb9f04b416efb3cbedcd90f418c86200 +drm 568d7c764ae01f3706085ac8f0d8a8ac7e826bd7 +drm-panel c8a3b2ae07130042682bc8e031bcfbae3754463d +drm-intel 94669e6ba1ada133394ec8295d773df8b9238d08 +drm-tegra 341917fe2b62876599315a537b8e248e31bd1366 +drm-misc b47bcb93bbf201e9c5af698945755efeb60c0bc8 +drm-exynos 25364a9e54fb8296837061bf684b76d20eec01fb +drm-msm fcda50c8f484cf1140232c8444470449f0619db9 +hdlcd 8bb912e606b7cd7bace02e9902f67f4efe1f864c +drm-vc4 90d7116061f86c1f8ea460806a0414addea7b58b +kbuild 2468fc97cc4555c37fa491379c98561b30c739f3 +kconfig c0ddc8c745b7f89c50385fd7aa03c78dc543fa7a +regmap d105141b9b4b3c02e38a0f04e49aa05a289518fd +sound c64c1437afb14ebc900e40910f31ffb20bf652ad +sound-asoc 0a63eacf2fab3e7a40bfe5ba659d2216423b9b19 +modules b37a05c083c85c2657dca9bbe1f5d79dccf756d5 +input 82be788c96ed5978d3cb4a00079e26b981a3df3f +block 8fe39574cfce61bf3f61e45fbf3838263e56cd02 +device-mapper 98dbc9c6c61698792e3a66f32f3bf066201d42d7 +pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8 +mmc-uh 64e5cd723120643a4c8bef0880a03a60161d3ccb +md de24075022dcf9e74a0494f089897c697959eb5a +mfd 0343b2f4e4a52c907d7676ce3159e0b5e7f0301c +backlight 60d613d6aef4ae49988eeb3ad38af948c561db1e +battery 0df6e32b0e36710fe989095241833e09dac3e41d +omap_dss2 32ad61951574d011d363694d6037592e99da9421 +regulator 1d64efa042924be05dd9511c0dd89f326022a6df +security 88a1b564a20e371e6be41b39b85673e9c1959491 +integrity 95ee08fa373b9ede1059c2f384cfeafe10dcd6bb +keys 88a1b564a20e371e6be41b39b85673e9c1959491 +selinux 88a1b564a20e371e6be41b39b85673e9c1959491 +tpmdd 59f95b842ad0383b171df3ae81ab39f998467a76 +watchdog d1ed3ba4e3d76b4ebec239c64f990c26d7935700 +iommu 70cf769c5ba283483a42c46f3734202b55dd3041 +dwmw2-iommu 46924008273ed03bd11dbb32136e3da4cfe056e1 +vfio c4aec3101319f84363a57e09086c2aff6c60a3c3 +jc_docs abfa6cd8cda71b9071191e72711bd474e539b1b2 +trivial d00cd819d7dfb1a24d814457f47ff4d6c7be152c +audit fd97646b05957348e01be3d9de5c3d979b25c819 +devicetree 48a9b733e644ab4cc8e2a98950a36ddb12b8c54e +dt-rh 5027e19db8cee24e189f8afa53b548e1ac5d0c1d +mailbox aace66b170ce7feda2d1860a81eefff37fa9d1d2 +spi 8a5a27213f7eab2e040e1f2eacf619962b7e5c01 +tip e05968d2e5abb48f2669f97f8a75b8df1f9ed0ff +clockevents 23cb25d0f407e83be10747258092843e8e20d535 +edac 12f0721c5a70408e86257c5c99605cf743cd44c6 +edac-amd 7cc5a5d3cd4cca0a3852d1500e8c50fe191bcc9d +irqchip a66ce4b7d9d20b59afe0a898fa0b4faf0651fbcd +ftrace 741f3a69f101250dc6b171b88e14ea51b099b1a9 +rcu 7220b7742659c5725c4dbdfdde8052aa70206cd0 +kvm f958ee745f70b60d0e41927cab2c073104bc70c2 +kvm-arm b40c4892d175874d118860c8282a85ee7b64bcbb +kvm-ppc c63517c2e3810071359af926f621c1f784388c3f +kvm-ppc-paulus 58ded4201ff028b15f6b317228faa5f154a0663f +kvms390 c54f0d6ae057444453f5167e66ed999e8cf26936 +xen-tip e01dc539df3ada9061a1097224513236b5381349 +percpu 18fc93fd64129c96432812cb44f59c963871889b +workqueues 22aceb317678057dced5f1d6e3ac15acdb863e7b +drivers-x86 5b4466b8f63bdefc014829409bdf1aaef8ff54bc +chrome-platform 1dc318166a9a3c8646d1f8af6cff246ea89853b2 +hsi 87d99063be016ceee90723a13365a40b21eec0d9 +leds 7296c33ed12ef13de50e03c76643382123766f96 +ipmi 42a018c63aee41d93962cf39e536c6f31fc023c1 +driver-core 112d125a89479519efc437b2961b8d4a98761c1b +tty a95fc9c8e576dc238ad849f65c67e4fd33c01d3b +usb 6b5f04b6cf8ebab9a65d9c0026c650bb2538fd0f +usb-gadget 0561f77e2db9e72dc32e4f82b56fca8ba6b31171 +usb-serial 7084fa868b509646fa30773d5d3ef4f26a62eb6f +usb-chipidea-next 01b8479400abdd61b026df37a3a19de7b8df32f5 +staging 1200b6809dfd9d73bc4c7db76d288c35fa4b2ebe +char-misc 5cd0911a9e0e408f28079a5e36a981217bf47520 +extcon ae64e42cc2b3a17ac0c11815f53211093a54cf55 +cgroup 08fb4e7f8d5f2b4f01e6884b79d157ce32217f9a +scsi 3d926c1d4d089f37a8d871ceb0838fbf47282431 +target-updates 484dfe2e26f7c6c1ab463926de4cef5f036043a9 +target-merge 9a7dea4939c8807a4596d59b1e7e87ce56881d7a +pinctrl 3c177a166253653bf9c377eb28a5155ea2d9b631 +vhost c67f5db82027ba6d2ea4ac9176bc45996a03ae6a +remoteproc 7a6271a80cae8f464d38b326fce0266f0448d77e +rpmsg 0f32cd8e8555a75fa9528f74cb40b30cd46b6509 +gpio 3539699c03a6a349ffb8a2ac83ec40d6a981b2d6 +dma-mapping d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 +pwm 77fe47fbb3b7bcc5525d5794229aafd3353ed602 +dma-buf 8f496d3fcc9df8823e36a023a2fd8b08c7993f4c +userns f2ca379642d7a843be972ea4167abdd3c8c9e5d1 +ktest b953c0d234bc72e8489d3bf51a276c5c4ec85345 +clk 4d3ac6662452060721599a3392bc2f524af984cb +aio b562e44f507e863c6792946e4e1b1449fbbac85d +kselftest 6accd8e9bf22749f621fb7fb57995fa65f4cd873 +y2038 477b8541b31fd4d32168514203a8da8b73884d90 +luto-misc afd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc +borntraeger 36f90b0a2ddd60823fe193a85e60ff1906c2a9b3 +livepatching fda0b150a173b78fc6d36fd7e39ce87490f4e234 +coresight f1e2c1b13dfac357a3988ed4cd9c56f9900e72be +rtc be39f5e1a3a1c366045373e4333eeb738f8b5fbc +hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828 +nvdimm 489011652a2d5555901def04c24d68874e8ba9a1 +akpm-current 1aa1f27e909b00bf4e2e59cb4604506af2a1cf37 +akpm f77751625f98c4a11d6cfe72652139193cd381da diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..a510e2d24724 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,235 @@ +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/mmarek/kbuild.git#rc-fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/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 +powerpc-merge-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.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 +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 +devicetree-current git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git#devicetree/merge +rr-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#fixes +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 +ftrace-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next-urgent +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +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://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/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 +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git#at91-next +bcm2835-dt git git://github.com/anholt/linux.git#bcm2835-dt-next +bcm2835-soc git git://github.com/anholt/linux.git#bcm2835-soc-next +bcm2835-drivers git git://github.com/anholt/linux.git#bcm2835-drivers-next +bcm2835-defconfig git git://github.com/anholt/linux.git#bcm2835-defconfig-next +berlin git git://git.infradead.org/users/hesselba/linux-berlin.git#berlin/for-next +cortex-m git git://git.pengutronix.de/git/ukl/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 +omap-pending git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.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 +rpi git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-rpi-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/mripard/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 +blackfin git http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux.git#for-linus +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 +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next +hexagon git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git#linux-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +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.linux-mips.org/pub/scm/ralf/upstream-sfr.git#mips-for-linux-next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.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 +powerpc-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.git#next +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next +mpc5xxx git git://git.denx.de/linux-denx-agust.git#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 +tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +unicore32 git git://github.com/gxt/linux.git#unicore32 +xtensa git git://github.com/czankel/xtensa-linux.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 +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.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 +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 +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git#for-next +file-locks git git://git.samba.org/jlayton/linux.git#linux-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +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 +jdelvare-hwmon quilt http://jdelvare.nerim.net/devel/linux/jdelvare-hwmon/ +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 +v4l-dvb git git://linuxtv.org/mchehab/media-next.git#master +libata git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git#for-next +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#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 +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-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/dledford/rdma.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 +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-intel#topic/drm-misc +drm-exynos git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#exynos-drm/for-next +drm-msm git git://people.freedesktop.org/~robclark/linux#msm-next +hdlcd git git://linux-arm.org/linux-ld#for-upstream/hdlcd +drm-vc4 git git://github.com/anholt/linux.git#drm-vc4-next +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#for-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/rusty/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 +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git#master +mmc-uh git git://git.linaro.org/people/ulf.hansson/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.infradead.org/battery-2.6.git#master +omap_dss2 git git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.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 +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.infradead.org/users/pcmoore/selinux#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 +jc_docs git git://git.lwn.net/linux.git#docs-next +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.infradead.org/users/pcmoore/audit#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git#devicetree/next +dt-rh 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-ppc git git://github.com/agraf/linux-2.6.git#kvm-ppc-next +kvm-ppc-paulus 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/olof/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://git.code.sf.net/p/openipmi/linux-ipmi#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-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 +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-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 +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 +target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next +target-merge git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next-merge +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +remoteproc git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git#for-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 +dma-mapping git git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git#dma-mapping-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +dma-buf git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.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 +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +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 +luto-misc git git://git.kernel.org/pub/scm/linux/kernel/git/luto/linux.git#next +borntraeger git git://git.kernel.org/pub/scm/linux/kernel/git/borntraeger/linux.git#linux-next +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 +hwspinlock git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git#for-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +akpm-current mmotm http://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm http://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..5c47ba9d09e9 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4299 @@ +$ date -R +Tue, 22 Mar 2016 09:24:23 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 46e595a17dcf Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc +Merging origin/master (e531cdf50a8a Merge tag 'mmc-v4.6' of git://git.linaro.org/people/ulf.hansson/mmc) +$ git merge origin/master +Updating 46e595a17dcf..e531cdf50a8a +Fast-forward + Documentation/ABI/testing/sysfs-fs-f2fs | 14 + + Documentation/DocBook/gpu.tmpl | 118 +- + Documentation/cgroup-v2.txt | 147 ++ + Documentation/devicetree/bindings/arm/cci.txt | 2 + + Documentation/devicetree/bindings/arm/pmu.txt | 11 + + .../devicetree/bindings/display/brcm,bcm-vc4.txt | 12 + + .../bindings/display/exynos/exynos_dsim.txt | 1 + + .../bindings/display/exynos/samsung-fimd.txt | 3 +- + .../devicetree/bindings/display/msm/dsi.txt | 32 +- + .../devicetree/bindings/display/msm/hdmi.txt | 46 +- + .../bindings/display/panel/lg,lp120up1.txt | 7 + + .../bindings/display/panel/urt,umsh-8596md.txt | 16 + + .../devicetree/bindings/display/renesas,du.txt | 16 +- + .../display/rockchip/inno_hdmi-rockchip.txt | 50 + + .../devicetree/bindings/mmc/arasan,sdhci.txt | 20 +- + .../devicetree/bindings/mmc/brcm,sdhci-iproc.txt | 5 +- + .../bindings/mmc/microchip,sdhci-pic32.txt | 29 + + Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 1 + + Documentation/dma-buf-sharing.txt | 40 +- + Documentation/efi-stub.txt | 4 +- + Documentation/kernel-parameters.txt | 3 + + Documentation/x86/x86_64/mm.txt | 12 +- + MAINTAINERS | 27 +- + Makefile | 20 +- + arch/Kconfig | 6 + + arch/arc/Kconfig | 6 +- + arch/arc/Makefile | 22 +- + arch/arc/boot/dts/axs10x_mb.dtsi | 8 + + arch/arc/boot/dts/nsim_hs.dts | 3 +- + arch/arc/boot/dts/nsimosci.dts | 5 +- + arch/arc/boot/dts/nsimosci_hs.dts | 5 +- + arch/arc/boot/dts/nsimosci_hs_idu.dts | 5 +- + arch/arc/configs/axs101_defconfig | 1 - + arch/arc/configs/axs103_defconfig | 1 - + arch/arc/configs/axs103_smp_defconfig | 1 - + arch/arc/configs/nsim_700_defconfig | 1 - + arch/arc/configs/nsim_hs_defconfig | 1 - + arch/arc/configs/nsim_hs_smp_defconfig | 1 - + arch/arc/configs/nsimosci_defconfig | 2 +- + arch/arc/configs/nsimosci_hs_defconfig | 2 +- + arch/arc/configs/nsimosci_hs_smp_defconfig | 3 +- + arch/arc/configs/tb10x_defconfig | 1 - + arch/arc/configs/vdk_hs38_defconfig | 1 - + arch/arc/configs/vdk_hs38_smp_defconfig | 1 - + arch/arc/include/asm/arcregs.h | 6 - + arch/arc/include/asm/bitops.h | 15 - + arch/arc/include/asm/cache.h | 1 + + arch/arc/include/asm/cacheflush.h | 6 +- + arch/arc/include/asm/cmpxchg.h | 2 +- + arch/arc/include/asm/dma-mapping.h | 7 + + arch/arc/include/asm/entry-compact.h | 2 +- + arch/arc/include/asm/io.h | 22 +- + arch/arc/include/asm/page.h | 19 +- + arch/arc/include/asm/pgtable.h | 11 +- + arch/arc/include/asm/tlbflush.h | 7 +- + arch/arc/kernel/setup.c | 21 +- + arch/arc/kernel/stacktrace.c | 2 +- + arch/arc/kernel/time.c | 4 +- + arch/arc/mm/cache.c | 39 +- + arch/arc/mm/dma.c | 75 +- + arch/arc/mm/highmem.c | 2 +- + arch/arc/mm/ioremap.c | 37 +- + arch/arc/mm/tlb.c | 8 +- + arch/arm/kernel/perf_event_v7.c | 13 +- + arch/arm64/boot/dts/cavium/thunder-88xx.dtsi | 5 + + arch/arm64/kernel/perf_event.c | 122 +- + arch/arm64/kernel/vmlinux.lds.S | 1 + + arch/cris/arch-v32/drivers/cryptocop.c | 8 +- + arch/ia64/include/uapi/asm/siginfo.h | 13 +- + arch/ia64/kernel/err_inject.c | 3 +- + arch/mips/include/uapi/asm/siginfo.h | 13 +- + arch/mips/mm/gup.c | 3 +- + arch/powerpc/include/asm/mman.h | 5 +- + arch/powerpc/include/asm/mmu_context.h | 12 + + arch/s390/include/asm/mmu_context.h | 12 + + arch/s390/mm/gup.c | 4 +- + arch/sh/mm/gup.c | 2 +- + arch/sparc/mm/gup.c | 2 +- + arch/um/include/asm/mmu_context.h | 14 + + arch/unicore32/include/asm/mmu_context.h | 12 + + arch/x86/Kconfig | 17 + + arch/x86/boot/Makefile | 3 +- + arch/x86/boot/compressed/Makefile | 3 +- + arch/x86/crypto/aesni-intel_asm.S | 75 +- + arch/x86/crypto/camellia-aesni-avx-asm_64.S | 15 + + arch/x86/crypto/camellia-aesni-avx2-asm_64.S | 15 + + arch/x86/crypto/cast5-avx-x86_64-asm_64.S | 9 + + arch/x86/crypto/cast6-avx-x86_64-asm_64.S | 13 + + arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 8 +- + arch/x86/crypto/ghash-clmulni-intel_asm.S | 5 + + arch/x86/crypto/serpent-avx-x86_64-asm_64.S | 13 + + arch/x86/crypto/serpent-avx2-asm_64.S | 13 + + arch/x86/crypto/sha-mb/sha1_mb_mgr_flush_avx2.S | 35 +- + arch/x86/crypto/sha-mb/sha1_mb_mgr_submit_avx2.S | 36 +- + arch/x86/crypto/twofish-avx-x86_64-asm_64.S | 13 + + arch/x86/entry/Makefile | 4 + + arch/x86/entry/thunk_64.S | 4 + + arch/x86/entry/vdso/Makefile | 6 +- + arch/x86/include/asm/cpufeature.h | 55 +- + arch/x86/include/asm/cpufeatures.h | 6 +- + arch/x86/include/asm/disabled-features.h | 15 + + arch/x86/include/asm/efi.h | 28 +- + arch/x86/include/asm/fpu/internal.h | 2 + + arch/x86/include/asm/fpu/types.h | 12 + + arch/x86/include/asm/fpu/xstate.h | 3 +- + arch/x86/include/asm/mmu_context.h | 85 +- + arch/x86/include/asm/paravirt.h | 9 +- + arch/x86/include/asm/paravirt_types.h | 18 +- + arch/x86/include/asm/pgtable.h | 38 + + arch/x86/include/asm/pgtable_types.h | 39 +- + arch/x86/include/asm/pkeys.h | 34 + + arch/x86/include/asm/preempt.h | 13 +- + arch/x86/include/asm/qspinlock_paravirt.h | 4 + + arch/x86/include/asm/required-features.h | 7 + + arch/x86/include/asm/special_insns.h | 22 + + arch/x86/include/asm/uaccess.h | 5 +- + arch/x86/include/asm/xen/hypercall.h | 5 +- + arch/x86/include/uapi/asm/mman.h | 22 + + arch/x86/include/uapi/asm/processor-flags.h | 2 + + arch/x86/kernel/Makefile | 11 +- + arch/x86/kernel/acpi/wakeup_64.S | 3 + + arch/x86/kernel/cpu/amd.c | 5 +- + arch/x86/kernel/cpu/common.c | 44 + + arch/x86/kernel/fpu/core.c | 63 + + arch/x86/kernel/fpu/xstate.c | 185 +- + arch/x86/kernel/kprobes/core.c | 59 +- + arch/x86/kernel/ldt.c | 4 +- + arch/x86/kernel/process_64.c | 2 + + arch/x86/kernel/setup.c | 9 + + arch/x86/kernel/vmlinux.lds.S | 6 +- + arch/x86/kvm/emulate.c | 31 +- + arch/x86/kvm/vmx.c | 4 +- + arch/x86/lib/insn.c | 6 +- + arch/x86/lib/rwsem.S | 11 +- + arch/x86/mm/Makefile | 2 + + arch/x86/mm/fault.c | 150 +- + arch/x86/mm/gup.c | 45 +- + arch/x86/mm/mpx.c | 4 +- + arch/x86/mm/pageattr.c | 34 +- + arch/x86/mm/pkeys.c | 101 + + arch/x86/net/bpf_jit.S | 48 +- + arch/x86/platform/efi/Makefile | 2 + + arch/x86/platform/efi/efi-bgrt.c | 52 +- + arch/x86/platform/efi/efi.c | 67 +- + arch/x86/platform/efi/efi_32.c | 7 +- + arch/x86/platform/efi/efi_64.c | 206 +- + arch/x86/platform/efi/efi_stub_64.S | 46 +- + arch/x86/platform/efi/quirks.c | 37 +- + arch/x86/power/hibernate_asm_64.S | 7 + + arch/x86/purgatory/Makefile | 2 + + arch/x86/realmode/Makefile | 4 +- + arch/x86/realmode/rm/Makefile | 3 +- + arch/x86/xen/enlighten.c | 3 +- + arch/x86/xen/xen-asm.S | 10 +- + arch/x86/xen/xen-asm_64.S | 1 + + drivers/bus/Kconfig | 10 +- + drivers/bus/arm-cci.c | 621 ++++-- + drivers/char/agp/frontend.c | 2 +- + drivers/char/agp/intel-gtt.c | 32 +- + drivers/dma-buf/dma-buf.c | 58 +- + drivers/firmware/efi/arm-init.c | 14 +- + drivers/firmware/efi/efi.c | 41 +- + drivers/firmware/efi/efivars.c | 2 +- + drivers/firmware/efi/esrt.c | 5 +- + drivers/firmware/efi/libstub/Makefile | 1 + + drivers/firmware/efi/libstub/arm-stub.c | 4 + + drivers/firmware/efi/libstub/arm32-stub.c | 17 + + drivers/firmware/efi/libstub/arm64-stub.c | 34 +- + drivers/firmware/efi/libstub/efistub.h | 12 + + drivers/firmware/efi/runtime-wrappers.c | 113 +- + drivers/firmware/efi/vars.c | 16 +- + drivers/gpu/drm/Kconfig | 12 + + drivers/gpu/drm/Makefile | 6 +- + drivers/gpu/drm/amd/acp/Kconfig | 10 + + drivers/gpu/drm/amd/acp/Makefile | 8 + + .../nvkm/engine/gr/gm206.c => amd/acp/acp_hw.c} | 52 +- + drivers/gpu/drm/amd/acp/include/acp_gfx_if.h | 34 + + drivers/gpu/drm/amd/amdgpu/Makefile | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 321 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 500 +++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_acp.h | 42 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 57 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 13 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 83 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 503 ++--- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 87 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 60 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 53 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 551 ++---- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 201 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 89 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 171 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 34 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 56 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 355 +++- + drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 201 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 60 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 108 -- + drivers/gpu/drm/amd/amdgpu/amdgpu_semaphore.c | 102 - + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 238 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 237 --- + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 66 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 166 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 103 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 138 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 772 ++++---- + drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 49 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 310 +-- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 104 +- + drivers/gpu/drm/amd/amdgpu/cikd.h | 3 - + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 45 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 50 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 45 +- + drivers/gpu/drm/amd/amdgpu/fiji_smc.c | 6 + + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 2006 ++++++++------------ + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 263 +-- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 11 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 17 +- + drivers/gpu/drm/amd/amdgpu/iceland_smc.c | 6 + + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 112 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 110 +- + drivers/gpu/drm/amd/amdgpu/tonga_smc.c | 6 + + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 50 +- + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 49 +- + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 49 +- + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 401 +--- + drivers/gpu/drm/amd/amdgpu/vid.h | 2 - + drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_module.c | 15 +- + drivers/gpu/drm/amd/include/amd_acpi.h | 2 + + drivers/gpu/drm/amd/include/amd_shared.h | 1 + + .../gpu/drm/amd/include/asic_reg/dce/dce_8_0_d.h | 1 + + .../drm/amd/include/asic_reg/dce/dce_8_0_enum.h | 1117 +++++++++++ + .../drm/amd/include/asic_reg/dce/dce_8_0_sh_mask.h | 12 + + .../drm/amd/include/asic_reg/gca/gfx_7_2_enum.h | 6 + + .../drm/amd/include/ivsrcid/ivsrcid_vislands30.h | 102 + + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 2 +- + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 206 +- + drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 212 ++- + drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c | 128 +- + drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.h | 12 +- + .../gpu/drm/amd/powerplay/hwmgr/functiontables.c | 9 +- + .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 93 +- + drivers/gpu/drm/amd/powerplay/hwmgr/ppevvmath.h | 4 +- + drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c | 127 +- + drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.h | 12 +- + drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h | 78 +- + .../gpu/drm/amd/powerplay/inc/hardwaremanager.h | 44 +- + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 12 +- + drivers/gpu/drm/amd/powerplay/inc/pp_endian.h | 38 + + drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 21 + + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.h | 18 - + drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 10 +- + drivers/gpu/drm/amd/scheduler/sched_fence.c | 23 +- + drivers/gpu/drm/arm/Kconfig | 27 + + drivers/gpu/drm/arm/Makefile | 2 + + drivers/gpu/drm/arm/hdlcd_crtc.c | 327 ++++ + drivers/gpu/drm/arm/hdlcd_drv.c | 550 ++++++ + drivers/gpu/drm/arm/hdlcd_drv.h | 42 + + drivers/gpu/drm/arm/hdlcd_regs.h | 87 + + drivers/gpu/drm/armada/armada_drv.c | 3 - + drivers/gpu/drm/ast/ast_mode.c | 16 - + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 27 - + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 10 - + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 3 - + drivers/gpu/drm/bochs/bochs_kms.c | 16 - + drivers/gpu/drm/bridge/dw-hdmi.c | 8 - + drivers/gpu/drm/cirrus/cirrus_mode.c | 22 - + drivers/gpu/drm/drm_atomic.c | 132 +- + drivers/gpu/drm/drm_atomic_helper.c | 412 ++-- + drivers/gpu/drm/drm_bridge.c | 12 +- + drivers/gpu/drm/drm_crtc.c | 140 +- + drivers/gpu/drm/drm_crtc_helper.c | 68 +- + drivers/gpu/drm/drm_dp_aux_dev.c | 368 ++++ + drivers/gpu/drm/drm_dp_helper.c | 16 +- + drivers/gpu/drm/drm_edid.c | 43 +- + drivers/gpu/drm/drm_encoder_slave.c | 3 + + drivers/gpu/drm/drm_fb_cma_helper.c | 3 +- + drivers/gpu/drm/drm_fb_helper.c | 56 +- + drivers/gpu/drm/drm_fops.c | 305 ++- + drivers/gpu/drm/drm_irq.c | 18 +- + drivers/gpu/drm/drm_kms_helper_common.c | 60 + + drivers/gpu/drm/drm_mipi_dsi.c | 127 +- + drivers/gpu/drm/drm_modes.c | 3 +- + drivers/gpu/drm/drm_of.c | 34 + + drivers/gpu/drm/drm_prime.c | 10 +- + drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 219 ++- + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 3 - + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 60 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.h | 17 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 36 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 54 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 4 +- + drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 2 +- + drivers/gpu/drm/etnaviv/state_3d.xml.h | 9 + + drivers/gpu/drm/exynos/Makefile | 1 - + drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 2 +- + drivers/gpu/drm/exynos/exynos7_drm_decon.c | 1 - + drivers/gpu/drm/exynos/exynos_dp_core.c | 15 +- + drivers/gpu/drm/exynos/exynos_dp_core.h | 4 +- + drivers/gpu/drm/exynos/exynos_drm_dpi.c | 8 - + drivers/gpu/drm/exynos/exynos_drm_drv.c | 281 +-- + drivers/gpu/drm/exynos/exynos_drm_drv.h | 10 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 242 +-- + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_fimc.c | 28 - + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 34 +- + drivers/gpu/drm/exynos/exynos_drm_g2d.c | 44 +- + drivers/gpu/drm/exynos/exynos_drm_gem.c | 23 +- + drivers/gpu/drm/exynos/exynos_drm_gem.h | 4 + + drivers/gpu/drm/exynos/exynos_drm_iommu.c | 39 +- + drivers/gpu/drm/exynos/exynos_drm_iommu.h | 4 +- + drivers/gpu/drm/exynos/exynos_drm_ipp.c | 29 +- + drivers/gpu/drm/exynos/exynos_drm_rotator.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 8 - + drivers/gpu/drm/exynos/exynos_hdmi.c | 2 - + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 148 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 70 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h | 4 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_kms.c | 24 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 140 +- + drivers/gpu/drm/gma500/cdv_intel_crt.c | 1 - + drivers/gpu/drm/gma500/cdv_intel_display.c | 13 +- + drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 1 - + drivers/gpu/drm/gma500/framebuffer.c | 20 +- + drivers/gpu/drm/gma500/gma_display.c | 14 - + drivers/gpu/drm/gma500/gma_display.h | 6 - + drivers/gpu/drm/gma500/intel_gmbus.c | 2 +- + drivers/gpu/drm/gma500/mdfld_dsi_output.c | 12 +- + drivers/gpu/drm/gma500/mdfld_intel_display.c | 2 - + drivers/gpu/drm/gma500/oaktrail_crtc.c | 1 - + drivers/gpu/drm/gma500/oaktrail_hdmi.c | 1 - + drivers/gpu/drm/gma500/psb_drv.c | 9 - + drivers/gpu/drm/gma500/psb_intel_display.c | 1 - + drivers/gpu/drm/i2c/ch7006_drv.c | 2 + + drivers/gpu/drm/i2c/sil164_drv.c | 9 - + drivers/gpu/drm/i2c/tda998x_drv.c | 9 - + drivers/gpu/drm/i915/Kconfig | 13 +- + drivers/gpu/drm/i915/i915_debugfs.c | 115 +- + drivers/gpu/drm/i915/i915_dma.c | 260 +-- + drivers/gpu/drm/i915/i915_drv.c | 35 +- + drivers/gpu/drm/i915/i915_drv.h | 192 +- + drivers/gpu/drm/i915/i915_gem.c | 184 +- + drivers/gpu/drm/i915/i915_gem_context.c | 71 +- + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 42 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 6 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 169 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 80 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 16 +- + drivers/gpu/drm/i915/i915_gem_shrinker.c | 78 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 10 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 193 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 14 +- + drivers/gpu/drm/i915/i915_guc_reg.h | 1 + + drivers/gpu/drm/i915/i915_guc_submission.c | 199 +- + drivers/gpu/drm/i915/i915_irq.c | 291 +-- + drivers/gpu/drm/i915/i915_params.c | 19 +- + drivers/gpu/drm/i915/i915_params.h | 67 + + drivers/gpu/drm/i915/i915_reg.h | 52 +- + drivers/gpu/drm/i915/i915_suspend.c | 2 +- + drivers/gpu/drm/i915/i915_sysfs.c | 8 +- + drivers/gpu/drm/i915/i915_trace.h | 27 +- + drivers/gpu/drm/i915/intel_atomic.c | 3 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 14 +- + drivers/gpu/drm/i915/intel_bios.c | 412 ++-- + drivers/gpu/drm/i915/intel_bios.h | 60 +- + drivers/gpu/drm/i915/intel_crt.c | 14 +- + drivers/gpu/drm/i915/intel_csr.c | 25 +- + drivers/gpu/drm/i915/intel_ddi.c | 297 ++- + drivers/gpu/drm/i915/intel_display.c | 1718 +++++++++-------- + drivers/gpu/drm/i915/intel_dp.c | 79 +- + drivers/gpu/drm/i915/intel_dp_mst.c | 9 +- + drivers/gpu/drm/i915/intel_drv.h | 88 +- + drivers/gpu/drm/i915/intel_dsi.c | 27 +- + drivers/gpu/drm/i915/intel_dsi.h | 5 +- + drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 163 +- + drivers/gpu/drm/i915/intel_dsi_pll.c | 95 +- + drivers/gpu/drm/i915/intel_fbc.c | 952 ++++++---- + drivers/gpu/drm/i915/intel_fbdev.c | 21 +- + drivers/gpu/drm/i915/intel_guc.h | 10 +- + drivers/gpu/drm/i915/intel_guc_fwif.h | 122 +- + drivers/gpu/drm/i915/intel_guc_loader.c | 19 +- + drivers/gpu/drm/i915/intel_hdmi.c | 14 + + drivers/gpu/drm/i915/intel_lrc.c | 635 ++++--- + drivers/gpu/drm/i915/intel_lrc.h | 26 +- + drivers/gpu/drm/i915/intel_lvds.c | 8 +- + drivers/gpu/drm/i915/intel_overlay.c | 24 +- + drivers/gpu/drm/i915/intel_pm.c | 287 ++- + drivers/gpu/drm/i915/intel_psr.c | 63 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 106 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 20 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 74 +- + drivers/gpu/drm/i915/intel_sdvo.c | 4 + + drivers/gpu/drm/i915/intel_sdvo_regs.h | 76 +- + drivers/gpu/drm/i915/intel_sideband.c | 23 +- + drivers/gpu/drm/i915/intel_sprite.c | 189 +- + drivers/gpu/drm/i915/intel_tv.c | 16 +- + drivers/gpu/drm/i915/intel_uncore.c | 141 +- + drivers/gpu/drm/imx/dw_hdmi-imx.c | 10 +- + drivers/gpu/drm/imx/imx-drm-core.c | 44 - + drivers/gpu/drm/imx/imx-drm.h | 2 - + drivers/gpu/drm/imx/imx-ldb.c | 13 +- + drivers/gpu/drm/imx/imx-tve.c | 8 - + drivers/gpu/drm/imx/ipuv3-crtc.c | 133 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 2 +- + drivers/gpu/drm/imx/parallel-display.c | 8 - + drivers/gpu/drm/mgag200/mgag200_mode.c | 21 - + drivers/gpu/drm/msm/Makefile | 3 + + drivers/gpu/drm/msm/adreno/a2xx.xml.h | 11 +- + drivers/gpu/drm/msm/adreno/a3xx.xml.h | 493 ++++- + drivers/gpu/drm/msm/adreno/a4xx.xml.h | 1267 ++++++++++++- + drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 108 +- + drivers/gpu/drm/msm/adreno/adreno_common.xml.h | 30 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 8 + + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 44 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 6 + + drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h | 48 +- + drivers/gpu/drm/msm/dsi/dsi.xml.h | 5 +- + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 3 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 118 +- + drivers/gpu/drm/msm/dsi/mmss_cc.xml.h | 5 +- + drivers/gpu/drm/msm/dsi/pll/dsi_pll.h | 4 +- + drivers/gpu/drm/msm/dsi/sfpb.xml.h | 5 +- + drivers/gpu/drm/msm/edp/edp.xml.h | 5 +- + drivers/gpu/drm/msm/hdmi/hdmi.c | 174 +- + drivers/gpu/drm/msm/hdmi/hdmi.h | 110 +- + drivers/gpu/drm/msm/hdmi/hdmi.xml.h | 647 ++++++- + drivers/gpu/drm/msm/hdmi/hdmi_audio.c | 10 +- + drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 56 +- + drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 172 +- + drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c | 166 +- + drivers/gpu/drm/msm/hdmi/hdmi_i2c.c | 20 +- + drivers/gpu/drm/msm/hdmi/hdmi_phy.c | 230 +++ + drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c | 503 +---- + drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c | 766 ++++++++ + drivers/gpu/drm/msm/hdmi/hdmi_phy_8x60.c | 196 +- + drivers/gpu/drm/msm/hdmi/hdmi_phy_8x74.c | 94 +- + drivers/gpu/drm/msm/hdmi/hdmi_pll_8960.c | 461 +++++ + drivers/gpu/drm/msm/hdmi/qfprom.xml.h | 5 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4.xml.h | 5 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 24 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c | 8 - + drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c | 8 - + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 28 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h | 2 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c | 8 - + drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h | 5 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c | 9 - + drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 23 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c | 8 - + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 13 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 1 - + drivers/gpu/drm/msm/mdp/mdp_common.xml.h | 5 +- + drivers/gpu/drm/msm/msm_drv.c | 11 +- + drivers/gpu/drm/msm/msm_drv.h | 7 +- + drivers/gpu/drm/msm/msm_fbdev.c | 4 - + drivers/gpu/drm/msm/msm_gem_submit.c | 20 +- + drivers/gpu/drm/msm/msm_iommu.c | 6 +- + drivers/gpu/drm/msm/msm_mmu.h | 4 +- + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 8 - + drivers/gpu/drm/nouveau/include/nvif/cla06f.h | 26 +- + drivers/gpu/drm/nouveau/include/nvif/class.h | 5 +- + drivers/gpu/drm/nouveau/include/nvif/device.h | 1 + + drivers/gpu/drm/nouveau/include/nvkm/core/device.h | 127 +- + .../gpu/drm/nouveau/include/nvkm/core/firmware.h | 11 + + drivers/gpu/drm/nouveau/include/nvkm/core/gpuobj.h | 4 + + drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h | 3 +- + drivers/gpu/drm/nouveau/include/nvkm/engine/disp.h | 2 +- + drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h | 4 +- + drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h | 3 +- + .../gpu/drm/nouveau/include/nvkm/engine/msenc.h | 4 + + .../gpu/drm/nouveau/include/nvkm/engine/nvdec.h | 4 + + .../gpu/drm/nouveau/include/nvkm/engine/nvenc.h | 4 + + drivers/gpu/drm/nouveau/include/nvkm/engine/vic.h | 4 + + .../drm/nouveau/include/nvkm/subdev/bios/extdev.h | 3 + + .../nouveau/include/nvkm/subdev/bios/iccsense.h | 16 + + drivers/gpu/drm/nouveau/include/nvkm/subdev/clk.h | 1 + + .../gpu/drm/nouveau/include/nvkm/subdev/devinit.h | 2 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/i2c.h | 33 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/ibus.h | 2 +- + .../gpu/drm/nouveau/include/nvkm/subdev/iccsense.h | 17 + + drivers/gpu/drm/nouveau/include/nvkm/subdev/ltc.h | 2 +- + .../gpu/drm/nouveau/include/nvkm/subdev/secboot.h | 59 + + drivers/gpu/drm/nouveau/include/nvkm/subdev/volt.h | 1 + + drivers/gpu/drm/nouveau/nouveau_abi16.c | 18 +- + drivers/gpu/drm/nouveau/nouveau_acpi.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_chan.c | 3 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 21 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 20 +- + drivers/gpu/drm/nouveau/nouveau_hwmon.c | 77 +- + drivers/gpu/drm/nouveau/nv50_display.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/core/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/core/firmware.c | 61 + + drivers/gpu/drm/nouveau/nvkm/core/gpuobj.c | 20 + + drivers/gpu/drm/nouveau/nvkm/core/ramht.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/core/subdev.c | 87 +- + drivers/gpu/drm/nouveau/nvkm/engine/Kbuild | 4 + + drivers/gpu/drm/nouveau/nvkm/engine/ce/Kbuild | 3 +- + drivers/gpu/drm/nouveau/nvkm/engine/ce/gm107.c | 55 + + .../nouveau/nvkm/engine/ce/{gm204.c => gm200.c} | 10 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 288 +-- + drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h | 5 + + drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 10 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild | 8 +- + .../nvkm/engine/disp/{coregm204.c => coregm200.c} | 4 +- + .../gpu/drm/nouveau/nvkm/engine/disp/dmacnv50.h | 2 +- + .../nouveau/nvkm/engine/disp/{gm204.c => gm200.c} | 12 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/outpdp.h | 2 +- + .../nvkm/engine/disp/{rootgm204.c => rootgm200.c} | 14 +- + .../gpu/drm/nouveau/nvkm/engine/disp/rootnv50.h | 2 +- + .../nvkm/engine/disp/{sorgm204.c => sorgm200.c} | 40 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/Kbuild | 7 +- + .../gpu/drm/nouveau/nvkm/engine/fifo/changk104.h | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c | 54 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.h | 9 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c | 270 ++- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h | 55 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk110.c | 46 + + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm107.c | 46 + + .../nouveau/nvkm/engine/fifo/{gm204.c => gm200.c} | 8 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm20b.c | 2 +- + .../gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c | 186 +- + .../gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk110.c | 34 + + .../engine/fifo/{gpfifogm204.c => gpfifogm200.c} | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/Kbuild | 6 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h | 24 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm200.c | 147 ++ + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm204.c | 1049 ---------- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm206.c | 74 - + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm20b.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpc.fuc | 2 + + .../drm/nouveau/nvkm/engine/gr/fuc/gpcgf100.fuc3.h | 80 +- + .../drm/nouveau/nvkm/engine/gr/fuc/gpcgf117.fuc3.h | 82 +- + .../drm/nouveau/nvkm/engine/gr/fuc/gpcgk104.fuc3.h | 82 +- + .../drm/nouveau/nvkm/engine/gr/fuc/gpcgk110.fuc3.h | 82 +- + .../drm/nouveau/nvkm/engine/gr/fuc/gpcgk208.fuc5.h | 68 +- + .../drm/nouveau/nvkm/engine/gr/fuc/gpcgm107.fuc5.h | 70 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hub.fuc | 2 + + .../drm/nouveau/nvkm/engine/gr/fuc/hubgf100.fuc3.h | 252 +-- + .../drm/nouveau/nvkm/engine/gr/fuc/hubgf117.fuc3.h | 252 +-- + .../drm/nouveau/nvkm/engine/gr/fuc/hubgk104.fuc3.h | 238 +-- + .../drm/nouveau/nvkm/engine/gr/fuc/hubgk110.fuc3.h | 238 +-- + .../drm/nouveau/nvkm/engine/gr/fuc/hubgk208.fuc5.h | 210 +- + .../drm/nouveau/nvkm/engine/gr/fuc/hubgm107.fuc5.h | 210 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 83 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h | 20 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c | 181 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gm200.c | 207 ++ + drivers/gpu/drm/nouveau/nvkm/engine/gr/gm204.c | 373 ---- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gm20b.c | 12 +- + drivers/gpu/drm/nouveau/nvkm/engine/msenc/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/nvdec/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/nvenc/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/engine/vic/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/Kbuild | 2 + + drivers/gpu/drm/nouveau/nvkm/subdev/bios/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/bios/extdev.c | 2 +- + .../gpu/drm/nouveau/nvkm/subdev/bios/iccsense.c | 100 + + drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c | 13 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.c | 292 +-- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.h | 65 + + drivers/gpu/drm/nouveau/nvkm/subdev/clk/gm20b.c | 198 ++ + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/Kbuild | 2 +- + .../gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c | 14 +- + .../gpu/drm/nouveau/nvkm/subdev/devinit/gm107.c | 2 +- + .../nvkm/subdev/devinit/{gm204.c => gm200.c} | 12 +- + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.c | 13 +- + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.h | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/Kbuild | 6 +- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.h | 2 +- + .../nvkm/subdev/i2c/{auxgm204.c => auxgm200.c} | 28 +- + .../nouveau/nvkm/subdev/i2c/{gm204.c => gm200.c} | 8 +- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/pad.h | 4 +- + .../nvkm/subdev/i2c/{padgm204.c => padgm200.c} | 20 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ibus/Kbuild | 2 +- + .../nouveau/nvkm/subdev/ibus/{gm204.c => gm200.c} | 6 +- + .../gpu/drm/nouveau/nvkm/subdev/iccsense/Kbuild | 2 + + .../gpu/drm/nouveau/nvkm/subdev/iccsense/base.c | 232 +++ + .../gpu/drm/nouveau/nvkm/subdev/iccsense/gf100.c | 31 + + .../gpu/drm/nouveau/nvkm/subdev/iccsense/priv.h | 16 + + .../gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c | 2 + + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/Kbuild | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gf100.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gm107.c | 8 +- + .../nouveau/nvkm/subdev/ltc/{gm204.c => gm200.c} | 14 +- + .../drm/nouveau/nvkm/subdev/pmu/fuc/gf100.fuc3.h | 1598 ++++++++-------- + .../drm/nouveau/nvkm/subdev/pmu/fuc/gf119.fuc4.h | 1494 +++++++-------- + .../drm/nouveau/nvkm/subdev/pmu/fuc/gk208.fuc5.h | 1420 +++++++------- + .../drm/nouveau/nvkm/subdev/pmu/fuc/gt215.fuc3.h | 1746 ++++++++--------- + .../gpu/drm/nouveau/nvkm/subdev/pmu/fuc/host.fuc | 3 +- + .../gpu/drm/nouveau/nvkm/subdev/pmu/fuc/kernel.fuc | 26 +- + .../gpu/drm/nouveau/nvkm/subdev/pmu/fuc/macros.fuc | 6 +- + .../gpu/drm/nouveau/nvkm/subdev/pmu/fuc/test.fuc | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/secboot/Kbuild | 3 + + drivers/gpu/drm/nouveau/nvkm/subdev/secboot/base.c | 288 +++ + .../gpu/drm/nouveau/nvkm/subdev/secboot/gm200.c | 1489 +++++++++++++++ + .../gpu/drm/nouveau/nvkm/subdev/secboot/gm20b.c | 233 +++ + drivers/gpu/drm/nouveau/nvkm/subdev/secboot/priv.h | 226 +++ + drivers/gpu/drm/nouveau/nvkm/subdev/volt/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c | 57 +- + drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.h | 49 + + drivers/gpu/drm/nouveau/nvkm/subdev/volt/gm20b.c | 56 + + drivers/gpu/drm/omapdrm/Kconfig | 1 - + drivers/gpu/drm/omapdrm/Makefile | 2 +- + drivers/gpu/drm/omapdrm/displays/connector-dvi.c | 55 +- + drivers/gpu/drm/omapdrm/displays/connector-hdmi.c | 39 +- + drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c | 41 +- + .../gpu/drm/omapdrm/displays/encoder-tpd12s015.c | 118 +- + drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 49 +- + .../omapdrm/displays/panel-lgphilips-lb035q02.c | 53 +- + .../drm/omapdrm/displays/panel-nec-nl8048hl11.c | 44 +- + .../drm/omapdrm/displays/panel-sharp-ls037v7dw01.c | 83 +- + .../drm/omapdrm/displays/panel-tpo-td028ttec1.c | 41 +- + .../drm/omapdrm/displays/panel-tpo-td043mtea1.c | 43 +- + drivers/gpu/drm/omapdrm/dss/Makefile | 3 - + drivers/gpu/drm/omapdrm/dss/apply.c | 1702 ----------------- + drivers/gpu/drm/omapdrm/dss/core.c | 36 +- + drivers/gpu/drm/omapdrm/dss/dispc-compat.c | 667 ------- + drivers/gpu/drm/omapdrm/dss/dispc-compat.h | 30 - + drivers/gpu/drm/omapdrm/dss/dispc.c | 71 +- + drivers/gpu/drm/omapdrm/dss/display-sysfs.c | 356 ---- + drivers/gpu/drm/omapdrm/dss/display.c | 49 - + drivers/gpu/drm/omapdrm/dss/dpi.c | 46 +- + drivers/gpu/drm/omapdrm/dss/dsi.c | 61 +- + drivers/gpu/drm/omapdrm/dss/dss.h | 43 +- + drivers/gpu/drm/omapdrm/dss/hdmi4.c | 50 +- + drivers/gpu/drm/omapdrm/dss/hdmi5.c | 54 +- + drivers/gpu/drm/omapdrm/dss/hdmi5_core.c | 42 +- + drivers/gpu/drm/omapdrm/dss/hdmi_wp.c | 32 +- + drivers/gpu/drm/omapdrm/dss/manager-sysfs.c | 531 ------ + drivers/gpu/drm/omapdrm/dss/manager.c | 263 --- + drivers/gpu/drm/omapdrm/dss/omapdss.h | 96 + + drivers/gpu/drm/omapdrm/dss/output.c | 54 +- + drivers/gpu/drm/omapdrm/dss/overlay-sysfs.c | 456 ----- + drivers/gpu/drm/omapdrm/dss/overlay.c | 202 -- + drivers/gpu/drm/omapdrm/dss/rfbi.c | 2 +- + drivers/gpu/drm/omapdrm/dss/sdi.c | 36 +- + drivers/gpu/drm/omapdrm/dss/venc.c | 27 +- + drivers/gpu/drm/omapdrm/omap_connector.c | 4 + + drivers/gpu/drm/omapdrm/omap_crtc.c | 140 +- + drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 54 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 94 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 6 +- + drivers/gpu/drm/omapdrm/omap_encoder.c | 7 +- + drivers/gpu/drm/omapdrm/omap_fb.c | 16 + + drivers/gpu/drm/omapdrm/omap_gem.c | 344 ++-- + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 57 +- + drivers/gpu/drm/omapdrm/omap_plane.c | 6 + + drivers/gpu/drm/panel/panel-simple.c | 82 + + drivers/gpu/drm/qxl/qxl_display.c | 9 - + drivers/gpu/drm/radeon/atom.c | 7 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 10 +- + drivers/gpu/drm/radeon/atombios_dp.c | 4 +- + drivers/gpu/drm/radeon/atombios_encoders.c | 14 +- + drivers/gpu/drm/radeon/btc_dpm.c | 41 +- + drivers/gpu/drm/radeon/ci_dpm.c | 42 +- + drivers/gpu/drm/radeon/ci_smc.c | 8 +- + drivers/gpu/drm/radeon/cik.c | 1708 +++++++---------- + drivers/gpu/drm/radeon/cik_sdma.c | 9 +- + drivers/gpu/drm/radeon/cypress_dpm.c | 8 +- + drivers/gpu/drm/radeon/evergreen.c | 2 +- + drivers/gpu/drm/radeon/evergreen_cs.c | 32 +- + drivers/gpu/drm/radeon/evergreen_hdmi.c | 2 +- + drivers/gpu/drm/radeon/kv_dpm.c | 4 +- + drivers/gpu/drm/radeon/ni.c | 4 +- + drivers/gpu/drm/radeon/ni_dpm.c | 170 +- + drivers/gpu/drm/radeon/r100.c | 10 +- + drivers/gpu/drm/radeon/r600.c | 18 +- + drivers/gpu/drm/radeon/r600_cs.c | 20 +- + drivers/gpu/drm/radeon/r600_dma.c | 9 +- + drivers/gpu/drm/radeon/r600_dpm.c | 6 +- + drivers/gpu/drm/radeon/r600_hdmi.c | 4 +- + drivers/gpu/drm/radeon/radeon.h | 2 + + drivers/gpu/drm/radeon/radeon_acpi.h | 2 + + drivers/gpu/drm/radeon/radeon_atombios.c | 6 +- + drivers/gpu/drm/radeon/radeon_atpx_handler.c | 11 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 6 + + drivers/gpu/drm/radeon/radeon_device.c | 16 +- + drivers/gpu/drm/radeon/radeon_display.c | 17 +- + drivers/gpu/drm/radeon/radeon_drv.c | 21 +- + drivers/gpu/drm/radeon/radeon_fb.c | 25 +- + drivers/gpu/drm/radeon/radeon_fence.c | 40 +- + drivers/gpu/drm/radeon/radeon_ib.c | 4 +- + drivers/gpu/drm/radeon/radeon_kfd.c | 25 +- + drivers/gpu/drm/radeon/radeon_kfd.h | 2 +- + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 4 +- + drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 92 +- + drivers/gpu/drm/radeon/radeon_object.c | 6 +- + drivers/gpu/drm/radeon/radeon_pm.c | 2 +- + drivers/gpu/drm/radeon/radeon_semaphore.c | 4 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 3 +- + drivers/gpu/drm/radeon/radeon_uvd.c | 8 +- + drivers/gpu/drm/radeon/radeon_vce.c | 33 +- + drivers/gpu/drm/radeon/radeon_vm.c | 19 +- + drivers/gpu/drm/radeon/rs780_dpm.c | 2 +- + drivers/gpu/drm/radeon/rv6xx_dpm.c | 18 +- + drivers/gpu/drm/radeon/rv740_dpm.c | 16 +- + drivers/gpu/drm/radeon/rv770_dpm.c | 46 +- + drivers/gpu/drm/radeon/si.c | 969 +++++----- + drivers/gpu/drm/radeon/si_dpm.c | 98 +- + drivers/gpu/drm/radeon/sumo_dpm.c | 6 +- + drivers/gpu/drm/radeon/trinity_dpm.c | 24 +- + drivers/gpu/drm/radeon/uvd_v1_0.c | 10 +- + drivers/gpu/drm/radeon/vce_v2_0.c | 2 +- + drivers/gpu/drm/rcar-du/Kconfig | 15 +- + drivers/gpu/drm/rcar-du/Makefile | 2 + + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 104 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 6 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 228 ++- + drivers/gpu/drm/rcar-du/rcar_du_drv.h | 12 +- + drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 6 +- + drivers/gpu/drm/rcar-du/rcar_du_group.c | 74 +- + drivers/gpu/drm/rcar-du/rcar_du_group.h | 4 + + drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c | 11 +- + drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c | 16 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 313 +-- + drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 11 +- + drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c | 142 +- + drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h | 6 + + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 465 ++++- + drivers/gpu/drm/rcar-du/rcar_du_plane.h | 21 +- + drivers/gpu/drm/rcar-du/rcar_du_regs.h | 21 +- + drivers/gpu/drm/rcar-du/rcar_du_vgacon.c | 11 +- + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 384 ++++ + drivers/gpu/drm/rcar-du/rcar_du_vsp.h | 76 + + drivers/gpu/drm/rcar-du/rcar_lvds_regs.h | 26 +- + drivers/gpu/drm/rockchip/Kconfig | 8 + + drivers/gpu/drm/rockchip/Makefile | 1 + + drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 10 +- + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 2 +- + drivers/gpu/drm/rockchip/inno_hdmi.c | 938 +++++++++ + drivers/gpu/drm/rockchip/inno_hdmi.h | 362 ++++ + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 30 - + drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 2 - + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 28 - + drivers/gpu/drm/shmobile/shmob_drm_crtc.h | 2 - + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 8 - + drivers/gpu/drm/sti/sti_awg_utils.c | 78 +- + drivers/gpu/drm/sti/sti_compositor.c | 4 +- + drivers/gpu/drm/sti/sti_crtc.c | 1 + + drivers/gpu/drm/sti/sti_cursor.c | 184 +- + drivers/gpu/drm/sti/sti_drv.c | 141 +- + drivers/gpu/drm/sti/sti_dvo.c | 78 +- + drivers/gpu/drm/sti/sti_gdp.c | 476 ++++- + drivers/gpu/drm/sti/sti_hda.c | 108 +- + drivers/gpu/drm/sti/sti_hdmi.c | 400 +++- + drivers/gpu/drm/sti/sti_hdmi.h | 31 +- + drivers/gpu/drm/sti/sti_hqvdp.c | 447 ++++- + drivers/gpu/drm/sti/sti_mixer.c | 146 +- + drivers/gpu/drm/sti/sti_mixer.h | 4 +- + drivers/gpu/drm/sti/sti_plane.c | 63 + + drivers/gpu/drm/sti/sti_plane.h | 17 + + drivers/gpu/drm/sti/sti_tvout.c | 301 ++- + drivers/gpu/drm/sti/sti_vid.c | 125 +- + drivers/gpu/drm/sti/sti_vid.h | 4 +- + drivers/gpu/drm/sti/sti_vtg.c | 200 +- + drivers/gpu/drm/sti/sti_vtg.h | 5 + + drivers/gpu/drm/tegra/dc.c | 17 - + drivers/gpu/drm/tegra/drm.c | 4 - + drivers/gpu/drm/tegra/drm.h | 1 - + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 331 ++-- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 138 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.h | 6 +- + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 29 +- + drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 33 +- + drivers/gpu/drm/udl/udl_drv.c | 14 +- + drivers/gpu/drm/udl/udl_encoder.c | 8 - + drivers/gpu/drm/udl/udl_fb.c | 2 - + drivers/gpu/drm/udl/udl_modeset.c | 9 - + drivers/gpu/drm/vc4/vc4_bo.c | 7 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 210 +- + drivers/gpu/drm/vc4/vc4_drv.c | 10 - + drivers/gpu/drm/vc4/vc4_drv.h | 50 +- + drivers/gpu/drm/vc4/vc4_gem.c | 123 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 42 +- + drivers/gpu/drm/vc4/vc4_hvs.c | 97 + + drivers/gpu/drm/vc4/vc4_irq.c | 58 +- + drivers/gpu/drm/vc4/vc4_kms.c | 9 + + drivers/gpu/drm/vc4/vc4_plane.c | 603 +++++- + drivers/gpu/drm/vc4/vc4_regs.h | 120 +- + drivers/gpu/drm/vc4/vc4_v3d.c | 1 + + drivers/gpu/drm/via/via_dmablit.c | 3 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 16 - + drivers/gpu/drm/virtio/virtgpu_drv.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 16 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 14 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 22 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 87 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.h | 2 - + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 163 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 16 + + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 19 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 179 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 453 +++-- + drivers/gpu/host1x/bus.c | 4 +- + drivers/gpu/host1x/job.c | 2 +- + drivers/gpu/ipu-v3/ipu-dc.c | 53 +- + drivers/gpu/vga/vga_switcheroo.c | 119 +- + drivers/infiniband/core/umem.c | 2 +- + drivers/infiniband/core/umem_odp.c | 8 +- + drivers/infiniband/hw/mthca/mthca_memfree.c | 3 +- + drivers/infiniband/hw/qib/qib_user_pages.c | 3 +- + drivers/infiniband/hw/usnic/usnic_uiom.c | 2 +- + drivers/iommu/amd_iommu_v2.c | 1 + + drivers/md/bitmap.c | 4 +- + drivers/md/bitmap.h | 4 +- + drivers/md/md.c | 2 +- + drivers/md/multipath.c | 4 +- + drivers/md/raid1.c | 8 +- + drivers/md/raid10.c | 7 +- + drivers/md/raid5.c | 63 +- + drivers/md/raid5.h | 4 +- + drivers/media/pci/ivtv/ivtv-udma.c | 4 +- + drivers/media/pci/ivtv/ivtv-yuv.c | 10 +- + drivers/media/platform/vsp1/vsp1_dl.c | 4 +- + drivers/media/v4l2-core/videobuf-dma-sg.c | 3 +- + drivers/misc/mic/scif/scif_rma.c | 2 - + drivers/misc/sgi-gru/grufault.c | 3 +- + drivers/mmc/card/block.c | 34 +- + drivers/mmc/card/mmc_test.c | 1 + + drivers/mmc/core/core.c | 29 +- + drivers/mmc/core/debugfs.c | 2 +- + drivers/mmc/core/host.c | 1 + + drivers/mmc/core/mmc.c | 4 +- + drivers/mmc/core/mmc_ops.c | 19 +- + drivers/mmc/core/pwrseq_simple.c | 1 - + drivers/mmc/core/sd.c | 2 - + drivers/mmc/core/sd_ops.c | 7 +- + drivers/mmc/core/sdio.c | 2 - + drivers/mmc/core/sdio_ops.c | 3 +- + drivers/mmc/host/Kconfig | 25 +- + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/atmel-mci.c | 11 +- + drivers/mmc/host/bfin_sdh.c | 3 - + drivers/mmc/host/davinci_mmc.c | 15 +- + drivers/mmc/host/dw_mmc-exynos.c | 31 +- + drivers/mmc/host/dw_mmc-pltfm.c | 19 +- + drivers/mmc/host/dw_mmc-rockchip.c | 7 - + drivers/mmc/host/dw_mmc.c | 101 +- + drivers/mmc/host/dw_mmc.h | 6 +- + drivers/mmc/host/jz4740_mmc.c | 2 - + drivers/mmc/host/mmc_spi.c | 6 + + drivers/mmc/host/mmci.c | 1 - + drivers/mmc/host/mtk-sd.c | 19 +- + drivers/mmc/host/mxcmmc.c | 3 - + drivers/mmc/host/of_mmc_spi.c | 2 - + drivers/mmc/host/omap_hsmmc.c | 9 +- + drivers/mmc/host/pxamci.c | 6 - + drivers/mmc/host/s3cmci.c | 3 +- + drivers/mmc/host/sdhci-acpi.c | 47 +- + drivers/mmc/host/sdhci-bcm2835.c | 14 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 38 +- + drivers/mmc/host/sdhci-iproc.c | 40 +- + drivers/mmc/host/sdhci-msm.c | 25 +- + drivers/mmc/host/sdhci-of-arasan.c | 109 +- + drivers/mmc/host/sdhci-of-at91.c | 53 +- + drivers/mmc/host/sdhci-of-esdhc.c | 19 +- + drivers/mmc/host/sdhci-pci-core.c | 15 - + drivers/mmc/host/sdhci-pic32.c | 257 +++ + drivers/mmc/host/sdhci-pltfm.h | 1 - + drivers/mmc/host/sdhci-pxav2.c | 1 - + drivers/mmc/host/sdhci-pxav3.c | 26 +- + drivers/mmc/host/sdhci-st.c | 40 +- + drivers/mmc/host/sdhci-tegra.c | 82 +- + drivers/mmc/host/sdhci.c | 500 +++-- + drivers/mmc/host/sdhci.h | 4 +- + drivers/mmc/host/sdricoh_cs.c | 26 +- + drivers/mmc/host/sh_mmcif.c | 2 +- + drivers/mmc/host/sh_mobile_sdhi.c | 54 +- + drivers/mmc/host/sunxi-mmc.c | 95 +- + drivers/mmc/host/tmio_mmc_dma.c | 11 - + drivers/mmc/host/tmio_mmc_pio.c | 27 +- + drivers/mmc/host/usdhi6rol0.c | 2 +- + drivers/perf/arm_pmu.c | 109 +- + drivers/platform/x86/apple-gmux.c | 111 +- + drivers/scsi/st.c | 2 - + drivers/staging/android/ashmem.c | 4 +- + drivers/staging/android/ion/ion.c | 6 +- + drivers/staging/android/ion/ion_test.c | 4 +- + drivers/video/fbdev/omap2/omapfb/dss/dispc.h | 1 + + drivers/video/fbdev/omap2/omapfb/dss/dss.h | 78 + + drivers/video/fbdev/pvr2fb.c | 4 +- + drivers/virt/fsl_hypervisor.c | 5 +- + drivers/watchdog/hpwdt.c | 9 +- + fs/Kconfig | 2 + + fs/Makefile | 1 + + fs/crypto/Kconfig | 18 + + fs/crypto/Makefile | 3 + + fs/crypto/crypto.c | 555 ++++++ + fs/{f2fs/crypto_fname.c => crypto/fname.c} | 246 ++- + fs/crypto/keyinfo.c | 272 +++ + fs/crypto/policy.c | 229 +++ + fs/dax.c | 9 +- + fs/direct-io.c | 9 +- + fs/exec.c | 8 +- + fs/ext4/ext4.h | 30 +- + fs/ext4/inode.c | 14 +- + fs/ext4/page-io.c | 10 - + fs/ext4/super.c | 4 +- + fs/f2fs/Kconfig | 12 +- + fs/f2fs/Makefile | 2 - + fs/f2fs/checkpoint.c | 77 +- + fs/f2fs/crypto.c | 489 ----- + fs/f2fs/crypto_key.c | 250 --- + fs/f2fs/crypto_policy.c | 209 -- + fs/f2fs/data.c | 428 +++-- + fs/f2fs/dir.c | 94 +- + fs/f2fs/extent_cache.c | 176 +- + fs/f2fs/f2fs.h | 315 ++- + fs/f2fs/f2fs_crypto.h | 151 -- + fs/f2fs/file.c | 114 +- + fs/f2fs/gc.c | 245 ++- + fs/f2fs/inline.c | 43 +- + fs/f2fs/inode.c | 15 +- + fs/f2fs/namei.c | 168 +- + fs/f2fs/node.c | 223 ++- + fs/f2fs/node.h | 26 +- + fs/f2fs/recovery.c | 14 +- + fs/f2fs/segment.c | 386 ++-- + fs/f2fs/segment.h | 5 +- + fs/f2fs/super.c | 204 +- + fs/f2fs/trace.c | 6 +- + fs/f2fs/xattr.c | 6 +- + fs/f2fs/xattr.h | 3 +- + fs/kernfs/dir.c | 191 +- + fs/kernfs/mount.c | 69 + + fs/ocfs2/aops.c | 7 +- + fs/ocfs2/ocfs2_trace.h | 2 + + fs/ocfs2/quota_global.c | 25 + + fs/proc/namespaces.c | 3 + + fs/proc/task_mmu.c | 14 + + fs/quota/dquot.c | 54 +- + fs/quota/quota.c | 70 +- + fs/quota/quota_tree.c | 67 +- + fs/quota/quota_v2.c | 6 + + fs/reiserfs/super.c | 1 + + fs/udf/dir.c | 13 +- + fs/udf/namei.c | 29 +- + fs/udf/super.c | 38 +- + fs/udf/udfdecl.h | 21 +- + fs/udf/unicode.c | 630 +++--- + fs/xfs/libxfs/xfs_alloc_btree.c | 2 - + fs/xfs/libxfs/xfs_attr_sf.h | 16 - + fs/xfs/libxfs/xfs_bmap.c | 172 +- + fs/xfs/libxfs/xfs_bmap_btree.c | 5 +- + fs/xfs/libxfs/xfs_btree.c | 32 +- + fs/xfs/libxfs/xfs_da_format.h | 16 + + fs/xfs/libxfs/xfs_dir2.c | 12 +- + fs/xfs/libxfs/xfs_dir2_node.c | 4 +- + fs/xfs/libxfs/xfs_ialloc.c | 4 +- + fs/xfs/libxfs/xfs_ialloc_btree.c | 12 +- + fs/xfs/libxfs/xfs_inode_buf.c | 170 +- + fs/xfs/libxfs/xfs_inode_buf.h | 38 +- + fs/xfs/libxfs/xfs_inode_fork.c | 3 +- + fs/xfs/libxfs/xfs_log_format.h | 19 +- + fs/xfs/libxfs/xfs_quota_defs.h | 3 +- + fs/xfs/libxfs/xfs_rtbitmap.c | 32 +- + fs/xfs/libxfs/xfs_sb.h | 1 - + fs/xfs/libxfs/xfs_shared.h | 1 + + fs/xfs/xfs_aops.c | 1016 ++++------ + fs/xfs/xfs_aops.h | 4 +- + fs/xfs/xfs_attr_list.c | 19 +- + fs/xfs/xfs_bmap_util.c | 8 +- + fs/xfs/xfs_buf.c | 2 +- + fs/xfs/xfs_buf.h | 26 +- + fs/xfs/xfs_buf_item.c | 10 +- + fs/xfs/xfs_dir2_readdir.c | 2 +- + fs/xfs/xfs_discard.c | 2 +- + fs/xfs/xfs_dquot.c | 129 +- + fs/xfs/xfs_export.c | 2 +- + fs/xfs/xfs_file.c | 88 +- + fs/xfs/xfs_filestream.c | 4 +- + fs/xfs/xfs_fsops.h | 1 - + fs/xfs/xfs_icache.c | 43 +- + fs/xfs/xfs_inode.c | 174 +- + fs/xfs/xfs_inode.h | 10 +- + fs/xfs/xfs_inode_item.c | 82 +- + fs/xfs/xfs_ioctl.c | 121 +- + fs/xfs/xfs_iops.c | 59 +- + fs/xfs/xfs_itable.c | 22 +- + fs/xfs/xfs_log.c | 152 +- + fs/xfs/xfs_log_recover.c | 97 +- + fs/xfs/xfs_mount.c | 24 +- + fs/xfs/xfs_mount.h | 31 +- + fs/xfs/xfs_ondisk.h | 117 ++ + fs/xfs/xfs_qm.c | 55 +- + fs/xfs/xfs_qm.h | 48 +- + fs/xfs/xfs_qm_syscalls.c | 27 +- + fs/xfs/xfs_quotaops.c | 36 +- + fs/xfs/xfs_rtalloc.c | 2 +- + fs/xfs/xfs_super.c | 528 +++--- + fs/xfs/xfs_super.h | 4 +- + fs/xfs/xfs_sysfs.c | 78 +- + fs/xfs/xfs_trace.h | 9 +- + fs/xfs/xfs_trans.c | 4 +- + fs/xfs/xfs_trans.h | 1 - + fs/xfs/xfs_trans_ail.c | 5 +- + fs/xfs/xfs_trans_buf.c | 10 +- + fs/xfs/xfs_trans_dquot.c | 15 +- + fs/xfs/xfs_trans_inode.c | 14 +- + include/asm-generic/mm_hooks.h | 12 + + include/drm/drmP.h | 30 +- + include/drm/drm_atomic_helper.h | 3 + + include/drm/drm_crtc.h | 74 +- + include/drm/drm_crtc_helper.h | 3 + + include/drm/drm_dp_aux_dev.h | 62 + + include/drm/drm_fb_helper.h | 6 + + include/drm/drm_mipi_dsi.h | 26 + + include/drm/drm_modeset_helper_vtables.h | 2 +- + include/drm/drm_of.h | 33 + + include/drm/exynos_drm.h | 101 - + include/drm/i915_pciids.h | 6 +- + include/linux/apple-gmux.h | 50 + + include/linux/cgroup.h | 49 + + include/linux/dcache.h | 2 + + include/linux/dma-buf.h | 12 +- + include/linux/dqblk_qtree.h | 2 + + include/linux/efi.h | 85 +- + include/linux/f2fs_fs.h | 34 +- + include/linux/frame.h | 23 + + include/linux/fs.h | 10 +- + include/linux/fscrypto.h | 434 +++++ + include/linux/kernfs.h | 11 +- + include/linux/mfd/tmio.h | 4 + + include/linux/mm.h | 99 +- + include/linux/mman.h | 6 +- + include/linux/mmc/core.h | 1 - + include/linux/mmc/dw_mmc.h | 12 +- + include/linux/mmc/tmio.h | 5 + + include/linux/nsproxy.h | 2 + + include/linux/perf/arm_pmu.h | 2 + + include/linux/pkeys.h | 33 + + include/linux/proc_ns.h | 4 + + include/linux/quota.h | 5 + + include/linux/quotaops.h | 3 + + include/linux/vga_switcheroo.h | 36 +- + include/trace/events/f2fs.h | 12 +- + include/uapi/asm-generic/siginfo.h | 17 +- + include/uapi/drm/drm.h | 1 + + include/uapi/drm/drm_mode.h | 15 + + include/uapi/drm/exynos_drm.h | 43 +- + include/uapi/drm/i915_drm.h | 43 +- + include/uapi/drm/msm_drm.h | 2 + + include/uapi/linux/dma-buf.h | 40 + + include/uapi/linux/dqblk_xfs.h | 1 + + include/uapi/linux/fs.h | 18 + + include/uapi/linux/quota.h | 14 + + include/uapi/linux/sched.h | 3 +- + include/video/omap-panel-data.h | 15 - + include/video/omapdss.h | 89 +- + kernel/bpf/core.c | 2 + + kernel/cgroup.c | 229 ++- + kernel/cpuset.c | 8 +- + kernel/events/uprobes.c | 10 +- + kernel/fork.c | 2 +- + kernel/nsproxy.c | 19 +- + kernel/sched/core.c | 4 +- + kernel/signal.c | 4 + + lib/Kconfig.debug | 12 + + mm/Kconfig | 5 + + mm/frame_vector.c | 2 +- + mm/gup.c | 127 +- + mm/ksm.c | 12 +- + mm/memory.c | 8 +- + mm/mempolicy.c | 6 +- + mm/mmap.c | 10 +- + mm/mprotect.c | 8 +- + mm/nommu.c | 66 +- + mm/process_vm_access.c | 11 +- + mm/swapfile.c | 6 + + mm/util.c | 4 +- + net/ceph/pagevec.c | 2 +- + scripts/Makefile.build | 41 +- + scripts/mod/Makefile | 2 + + security/tomoyo/domain.c | 9 +- + tools/Makefile | 13 +- + tools/include/asm-generic/bitops/__fls.h | 2 +- + tools/include/asm-generic/bitops/fls.h | 2 +- + tools/include/asm-generic/bitops/fls64.h | 2 +- + tools/include/linux/hashtable.h | 152 ++ + tools/lib/subcmd/Makefile | 6 +- + tools/objtool/.gitignore | 2 + + tools/objtool/Build | 13 + + tools/objtool/Documentation/stack-validation.txt | 342 ++++ + tools/objtool/Makefile | 63 + + tools/objtool/arch.h | 44 + + tools/objtool/arch/x86/Build | 12 + + tools/objtool/arch/x86/decode.c | 172 ++ + tools/objtool/arch/x86/insn/gen-insn-attr-x86.awk | 387 ++++ + tools/objtool/arch/x86/insn/inat.c | 97 + + tools/objtool/arch/x86/insn/inat.h | 221 +++ + tools/objtool/arch/x86/insn/inat_types.h | 29 + + tools/objtool/arch/x86/insn/insn.c | 594 ++++++ + tools/objtool/arch/x86/insn/insn.h | 201 ++ + tools/objtool/arch/x86/insn/x86-opcode-map.txt | 984 ++++++++++ + tools/objtool/builtin-check.c | 1159 +++++++++++ + tools/objtool/builtin.h | 22 + + tools/objtool/elf.c | 412 ++++ + tools/objtool/elf.h | 85 + + tools/objtool/objtool.c | 136 ++ + tools/objtool/special.c | 193 ++ + tools/objtool/special.h | 42 + + tools/objtool/warn.h | 60 + + tools/perf/util/intel-pt-decoder/insn.c | 6 +- + virt/kvm/async_pf.c | 8 +- + virt/kvm/kvm_main.c | 10 +- + 1125 files changed, 55482 insertions(+), 34018 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/panel/lg,lp120up1.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/urt,umsh-8596md.txt + create mode 100644 Documentation/devicetree/bindings/display/rockchip/inno_hdmi-rockchip.txt + create mode 100644 Documentation/devicetree/bindings/mmc/microchip,sdhci-pic32.txt + create mode 100644 arch/x86/include/asm/pkeys.h + create mode 100644 arch/x86/mm/pkeys.c + create mode 100644 drivers/gpu/drm/amd/acp/Kconfig + create mode 100644 drivers/gpu/drm/amd/acp/Makefile + rename drivers/gpu/drm/{nouveau/nvkm/engine/gr/gm206.c => amd/acp/acp_hw.c} (64%) + create mode 100644 drivers/gpu/drm/amd/acp/include/acp_gfx_if.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_acp.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_job.c + delete mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c + delete mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_semaphore.c + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dce/dce_8_0_enum.h + create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/ivsrcid_vislands30.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/pp_endian.h + create mode 100644 drivers/gpu/drm/arm/Kconfig + create mode 100644 drivers/gpu/drm/arm/Makefile + create mode 100644 drivers/gpu/drm/arm/hdlcd_crtc.c + create mode 100644 drivers/gpu/drm/arm/hdlcd_drv.c + create mode 100644 drivers/gpu/drm/arm/hdlcd_drv.h + create mode 100644 drivers/gpu/drm/arm/hdlcd_regs.h + create mode 100644 drivers/gpu/drm/drm_dp_aux_dev.c + create mode 100644 drivers/gpu/drm/drm_kms_helper_common.c + create mode 100644 drivers/gpu/drm/etnaviv/state_3d.xml.h + create mode 100644 drivers/gpu/drm/i915/i915_params.h + create mode 100644 drivers/gpu/drm/msm/hdmi/hdmi_phy.c + create mode 100644 drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c + create mode 100644 drivers/gpu/drm/msm/hdmi/hdmi_pll_8960.c + create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/core/firmware.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/engine/msenc.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/engine/nvdec.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/engine/nvenc.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/engine/vic.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/iccsense.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/iccsense.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/secboot.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/core/firmware.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/ce/gm107.c + rename drivers/gpu/drm/nouveau/nvkm/engine/ce/{gm204.c => gm200.c} (87%) + rename drivers/gpu/drm/nouveau/nvkm/engine/disp/{coregm204.c => coregm200.c} (95%) + rename drivers/gpu/drm/nouveau/nvkm/engine/disp/{gm204.c => gm200.c} (88%) + rename drivers/gpu/drm/nouveau/nvkm/engine/disp/{rootgm204.c => rootgm200.c} (86%) + rename drivers/gpu/drm/nouveau/nvkm/engine/disp/{sorgm204.c => sorgm200.c} (79%) + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk110.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm107.c + rename drivers/gpu/drm/nouveau/nvkm/engine/fifo/{gm204.c => gm200.c} (89%) + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk110.c + rename drivers/gpu/drm/nouveau/nvkm/engine/fifo/{gpfifogm204.c => gpfifogm200.c} (97%) + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm200.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm204.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm206.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/gr/gm200.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/gr/gm204.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/msenc/Kbuild + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/nvdec/Kbuild + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/nvenc/Kbuild + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/vic/Kbuild + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/bios/iccsense.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/clk/gm20b.c + rename drivers/gpu/drm/nouveau/nvkm/subdev/devinit/{gm204.c => gm200.c} (95%) + rename drivers/gpu/drm/nouveau/nvkm/subdev/i2c/{auxgm204.c => auxgm200.c} (88%) + rename drivers/gpu/drm/nouveau/nvkm/subdev/i2c/{gm204.c => gm200.c} (88%) + rename drivers/gpu/drm/nouveau/nvkm/subdev/i2c/{padgm204.c => padgm200.c} (81%) + rename drivers/gpu/drm/nouveau/nvkm/subdev/ibus/{gm204.c => gm200.c} (91%) + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/Kbuild + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/gf100.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/priv.h + rename drivers/gpu/drm/nouveau/nvkm/subdev/ltc/{gm204.c => gm200.c} (87%) + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/secboot/Kbuild + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/secboot/base.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm200.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm20b.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/secboot/priv.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/volt/gm20b.c + delete mode 100644 drivers/gpu/drm/omapdrm/dss/apply.c + delete mode 100644 drivers/gpu/drm/omapdrm/dss/dispc-compat.c + delete mode 100644 drivers/gpu/drm/omapdrm/dss/dispc-compat.h + delete mode 100644 drivers/gpu/drm/omapdrm/dss/display-sysfs.c + delete mode 100644 drivers/gpu/drm/omapdrm/dss/manager-sysfs.c + delete mode 100644 drivers/gpu/drm/omapdrm/dss/manager.c + create mode 100644 drivers/gpu/drm/omapdrm/dss/omapdss.h + delete mode 100644 drivers/gpu/drm/omapdrm/dss/overlay-sysfs.c + delete mode 100644 drivers/gpu/drm/omapdrm/dss/overlay.c + create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_vsp.c + create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_vsp.h + create mode 100644 drivers/gpu/drm/rockchip/inno_hdmi.c + create mode 100644 drivers/gpu/drm/rockchip/inno_hdmi.h + create mode 100644 drivers/mmc/host/sdhci-pic32.c + create mode 100644 fs/crypto/Kconfig + create mode 100644 fs/crypto/Makefile + create mode 100644 fs/crypto/crypto.c + rename fs/{f2fs/crypto_fname.c => crypto/fname.c} (59%) + create mode 100644 fs/crypto/keyinfo.c + create mode 100644 fs/crypto/policy.c + delete mode 100644 fs/f2fs/crypto.c + delete mode 100644 fs/f2fs/crypto_key.c + delete mode 100644 fs/f2fs/crypto_policy.c + delete mode 100644 fs/f2fs/f2fs_crypto.h + create mode 100644 fs/xfs/xfs_ondisk.h + create mode 100644 include/drm/drm_dp_aux_dev.h + delete mode 100644 include/drm/exynos_drm.h + create mode 100644 include/linux/apple-gmux.h + create mode 100644 include/linux/frame.h + create mode 100644 include/linux/fscrypto.h + create mode 100644 include/linux/pkeys.h + create mode 100644 include/uapi/linux/dma-buf.h + create mode 100644 tools/include/linux/hashtable.h + create mode 100644 tools/objtool/.gitignore + create mode 100644 tools/objtool/Build + create mode 100644 tools/objtool/Documentation/stack-validation.txt + create mode 100644 tools/objtool/Makefile + create mode 100644 tools/objtool/arch.h + create mode 100644 tools/objtool/arch/x86/Build + create mode 100644 tools/objtool/arch/x86/decode.c + create mode 100644 tools/objtool/arch/x86/insn/gen-insn-attr-x86.awk + create mode 100644 tools/objtool/arch/x86/insn/inat.c + create mode 100644 tools/objtool/arch/x86/insn/inat.h + create mode 100644 tools/objtool/arch/x86/insn/inat_types.h + create mode 100644 tools/objtool/arch/x86/insn/insn.c + create mode 100644 tools/objtool/arch/x86/insn/insn.h + create mode 100644 tools/objtool/arch/x86/insn/x86-opcode-map.txt + create mode 100644 tools/objtool/builtin-check.c + create mode 100644 tools/objtool/builtin.h + create mode 100644 tools/objtool/elf.c + create mode 100644 tools/objtool/elf.h + create mode 100644 tools/objtool/objtool.c + create mode 100644 tools/objtool/special.c + create mode 100644 tools/objtool/special.h + create mode 100644 tools/objtool/warn.h +Merging fixes/master (36f90b0a2ddd Linux 4.5-rc2) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (deaf7565eb61 ARCv2: ioremap: Support dynamic peripheral address space) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (f474c8c857d9 ARM: 8544/1: set_memory_xx fixes) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (efbec135f11d m68k: Fix misspellings in comments.) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging powerpc-fixes/fixes (b562e44f507e Linux 4.5) +$ git merge powerpc-fixes/fixes +Already up-to-date. +Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-merge-mpe/fixes +Already up-to-date. +Merging sparc/master (9ef595d83aea sparc: Convert naked unsigned uses to unsigned int) +$ git merge sparc/master +Merge made by the 'recursive' strategy. + arch/sparc/include/asm/compat_signal.h | 8 ++++---- + arch/sparc/include/asm/obio.h | 32 ++++++++++++++++---------------- + arch/sparc/include/asm/openprom.h | 10 +++++----- + arch/sparc/include/asm/pgtable_64.h | 2 +- + arch/sparc/include/asm/processor_64.h | 2 +- + arch/sparc/include/asm/sigcontext.h | 2 +- + arch/sparc/include/asm/tsb.h | 2 +- + arch/sparc/include/uapi/asm/stat.h | 4 ++-- + arch/sparc/kernel/audit.c | 12 ++++++------ + arch/sparc/kernel/compat_audit.c | 12 ++++++------ + arch/sparc/kernel/entry.S | 2 +- + arch/sparc/kernel/ioport.c | 6 +++--- + arch/sparc/kernel/kernel.h | 12 ++++++------ + arch/sparc/kernel/leon_kernel.c | 2 +- + arch/sparc/kernel/process_64.c | 2 +- + arch/sparc/kernel/setup_32.c | 2 +- + arch/sparc/kernel/setup_64.c | 2 +- + arch/sparc/kernel/signal32.c | 2 +- + arch/sparc/kernel/sys_sparc_64.c | 4 ++-- + arch/sparc/kernel/sysfs.c | 2 +- + arch/sparc/kernel/unaligned_64.c | 4 ++-- + arch/sparc/mm/fault_32.c | 8 ++++---- + arch/sparc/net/bpf_jit_comp.c | 2 +- + 23 files changed, 68 insertions(+), 68 deletions(-) +Merging net/master (6b0725232dd1 Merge branch 'bridge-gso-segs-and-size') +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/isdn/mISDN/clock.c | 69 ++++++++++++++------------------ + drivers/net/ethernet/mellanox/mlx4/mcg.c | 2 - + drivers/net/ethernet/smsc/smc911x.c | 2 + + drivers/net/geneve.c | 11 ++--- + drivers/net/phy/mdio-sun4i.c | 4 +- + drivers/net/usb/lan78xx.c | 49 ----------------------- + drivers/net/vxlan.c | 9 ++--- + include/linux/mISDNif.h | 2 +- + include/linux/netdevice.h | 4 +- + include/net/flow.h | 2 +- + include/net/ip_tunnels.h | 16 ++++++++ + include/net/ipv6.h | 6 +++ + include/net/sctp/sctp.h | 10 +++-- + include/net/sctp/structs.h | 2 +- + include/net/vxlan.h | 16 ++++---- + include/trace/events/fib6.h | 2 +- + include/uapi/linux/if_link.h | 2 + + net/bridge/br_if.c | 16 ++++++++ + net/core/dev.c | 3 +- + net/core/gen_estimator.c | 2 + + net/core/gen_stats.c | 1 + + net/core/rtnetlink.c | 4 ++ + net/core/skbuff.c | 2 +- + net/ipv4/af_inet.c | 24 ++++++++++- + net/ipv4/fou.c | 13 +++++- + net/ipv4/gre_offload.c | 5 +++ + net/ipv4/ip_tunnel_core.c | 3 +- + net/ipv4/udp_offload.c | 6 +-- + net/ipv6/ip6_offload.c | 15 ++++++- + net/ipv6/sit.c | 6 ++- + net/sctp/associola.c | 3 +- + net/sctp/bind_addr.c | 14 ++++--- + net/sctp/input.c | 3 +- + net/sctp/outqueue.c | 6 ++- + net/sctp/protocol.c | 1 + + net/sctp/sm_make_chunk.c | 3 +- + net/sctp/sm_sideeffect.c | 6 ++- + net/sctp/socket.c | 4 +- + net/sctp/transport.c | 4 +- + 39 files changed, 204 insertions(+), 148 deletions(-) +Merging ipsec/master (215276c0147e xfrm: Reset encapsulation field of the skb before transformation) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + include/net/netns/xfrm.h | 1 + + net/core/flow.c | 14 +++++++++++++- + net/xfrm/xfrm_output.c | 3 +++ + 3 files changed, 17 insertions(+), 1 deletion(-) +Merging ipvs/master (7617a24f83b5 ipvs: correct initial offset of Call-ID header search in SIP persistence engine) +$ git merge ipvs/master +Already up-to-date. +Merging wireless-drivers/master (10da848f67a7 ssb: host_soc depends on sprom) +$ git merge wireless-drivers/master +Already up-to-date. +Merging mac80211/master (ad8ec957f693 wext: unregister_pernet_subsys() on notifier registration failure) +$ git merge mac80211/master +Merge made by the 'recursive' strategy. + net/wireless/wext-core.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) +Merging sound-current/for-linus (c64c1437afb1 ALSA: hda - Fix missing ELD update at unplugging) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/hda/patch_hdmi.c | 37 +++++++++++++++++++++++++++---------- + sound/usb/quirks.c | 1 + + 2 files changed, 28 insertions(+), 10 deletions(-) +Merging pci-current/for-linus (30b5b8808c12 PCI: Restore inclusion of pci/hotplug Kconfig) +$ git merge pci-current/for-linus +Merge made by the 'recursive' strategy. + drivers/pci/Kconfig | 1 + + 1 file changed, 1 insertion(+) +Merging driver-core.current/driver-core-linus (18558cae0272 Linux 4.5-rc4) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (18558cae0272 Linux 4.5-rc4) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (6b5f04b6cf8e Merge branch 'for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (3b2435192fe9 MAINTAINERS: drop OMAP USB and MUSB maintainership) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (f6cede5b49e8 Linux 4.5-rc7) +$ git merge usb-serial-fixes/usb-linus +Already up-to-date. +Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg: change workqueue ci_otg as freezable) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Already up-to-date. +Merging staging.current/staging-linus (1200b6809dfd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (5cd0911a9e0e Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (4d2508a55990 ARM: pxa/raumfeld: use PROPERTY_ENTRY_INTEGER to define props) +$ git merge input-current/for-linus +Already up-to-date. +Merging crypto-current/master (dfe97ad30e8c crypto: marvell/cesa - forward devm_ioremap_resource() error code) +$ git merge crypto-current/master +Auto-merging drivers/crypto/marvell/cesa.c +Merge made by the 'recursive' strategy. + drivers/crypto/ccp/ccp-dev.c | 6 +-- + drivers/crypto/marvell/cesa.c | 2 +- + drivers/crypto/marvell/cesa.h | 3 +- + drivers/crypto/marvell/hash.c | 106 +++++++++++++++--------------------------- + fs/ecryptfs/keystore.c | 6 +-- + 5 files changed, 46 insertions(+), 77 deletions(-) +Merging ide/master (0d7ef45cdeeb ide: palm_bk3710: test clock rate to avoid division by 0) +$ git merge ide/master +Merge made by the 'recursive' strategy. + drivers/ide/icside.c | 2 +- + drivers/ide/palm_bk3710.c | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) +Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES) +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging vfio-fixes/for-linus (8160c4e45582 vfio: fix ioctl error handling) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (92e963f50fc7 Linux 4.5-rc1) +$ git merge kselftest-fixes/fixes +Already up-to-date. +Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM) +$ git merge backlight-fixes/for-backlight-fixes +Already up-to-date. +Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct) +$ git merge ftrace-fixes/for-next-urgent +Already up-to-date. +Merging mfd-fixes/for-mfd-fixes (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error) +$ git merge mfd-fixes/for-mfd-fixes +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (b562e44f507e Linux 4.5) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up-to-date. +Merging asm-generic/master (a1cbaad75a8f asm-generic: remove old nonatomic-io wrapper files) +$ git merge asm-generic/master +Removing include/asm-generic/io-64-nonatomic-lo-hi.h +Removing include/asm-generic/io-64-nonatomic-hi-lo.h +Auto-merging include/asm-generic/bug.h +Auto-merging drivers/dma/idma64.h +Auto-merging arch/arc/include/asm/page.h +Merge made by the 'recursive' strategy. + arch/arc/include/asm/page.h | 3 --- + arch/arm/include/asm/page-nommu.h | 3 --- + arch/frv/include/asm/page.h | 3 --- + arch/m68k/include/asm/page_mm.h | 3 --- + arch/m68k/include/asm/page_no.h | 3 --- + arch/openrisc/include/asm/page.h | 3 --- + drivers/dma/idma64.h | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c | 2 +- + drivers/net/ethernet/netronome/nfp/nfp_net.h | 2 +- + include/asm-generic/bug.h | 2 +- + include/asm-generic/io-64-nonatomic-hi-lo.h | 2 -- + include/asm-generic/io-64-nonatomic-lo-hi.h | 2 -- + include/asm-generic/page.h | 3 --- + 13 files changed, 4 insertions(+), 29 deletions(-) + delete mode 100644 include/asm-generic/io-64-nonatomic-hi-lo.h + delete mode 100644 include/asm-generic/io-64-nonatomic-lo-hi.h +Merging arc/for-next (60d77f101c1f ARC: thp: unbork !CONFIG_TRANSPARENT_HUGEPAGE build) +$ git merge arc/for-next +Merge made by the 'recursive' strategy. +Merging arm/for-next (1b3bf847977c Merge branches 'amba', 'fixes', 'misc' and 'tauros2' into for-next) +$ git merge arm/for-next +Already up-to-date. +Merging arm-perf/for-next/perf (fe638401a091 arm64: perf: Extend ARMV8_EVTYPE_MASK to include PMCR.LC) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (35fe688abfcf arm-soc: document merges) +$ git merge arm-soc/for-next +Auto-merging arch/arm64/boot/dts/socionext/uniphier-ph1-ld20.dtsi +Auto-merging arch/arm64/boot/dts/socionext/uniphier-ph1-ld20-ref.dts +Auto-merging arch/arm/boot/dts/ls1021a.dtsi +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/vendor-prefixes.txt | 2 + + arch/arm/arm-soc-for-next-contents.txt | 313 ++++ + arch/arm/boot/dts/Makefile | 12 +- + .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 2 +- + arch/arm/boot/dts/imx25.dtsi | 37 +- + arch/arm/boot/dts/imx28-apf28dev.dts | 2 +- + arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi | 4 +- + arch/arm/boot/dts/imx28-tx28.dts | 4 +- + .../boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts | 2 +- + arch/arm/boot/dts/imx35.dtsi | 8 +- + arch/arm/boot/dts/imx51-babbage.dts | 2 +- + arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi | 2 +- + .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 2 +- + arch/arm/boot/dts/imx51-pinfunc.h | 1 - + arch/arm/boot/dts/imx53-ard.dts | 6 +- + arch/arm/boot/dts/imx53-qsb-common.dtsi | 16 +- + arch/arm/boot/dts/imx53-tx53-x03x.dts | 2 +- + arch/arm/boot/dts/imx53-tx53-x13x.dts | 42 +- + arch/arm/boot/dts/imx53-tx53.dtsi | 4 +- + arch/arm/boot/dts/imx6dl-tx6u-811x.dts | 2 +- + arch/arm/boot/dts/imx6dl-wandboard-revb1.dts | 2 +- + arch/arm/boot/dts/imx6q-apalis-ixora.dts | 272 +++ + arch/arm/boot/dts/imx6q-b450v3.dts | 88 + + arch/arm/boot/dts/imx6q-b650v3.dts | 88 + + arch/arm/boot/dts/imx6q-b850v3.dts | 157 ++ + arch/arm/boot/dts/imx6q-ba16.dtsi | 632 +++++++ + arch/arm/boot/dts/imx6q-bx50v3.dtsi | 225 +++ + arch/arm/boot/dts/imx6q-evi.dts | 502 ++++++ + arch/arm/boot/dts/imx6q-gk802.dts | 2 +- + arch/arm/boot/dts/imx6q-icore-rqs.dts | 78 + + arch/arm/boot/dts/imx6q-tbs2910.dts | 318 ++-- + arch/arm/boot/dts/imx6q-tx6q-1110.dts | 2 +- + arch/arm/boot/dts/imx6q-wandboard-revb1.dts | 2 +- + arch/arm/boot/dts/imx6q.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 984 +++++++++++ + arch/arm/boot/dts/imx6qdl-apf6dev.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 15 +- + arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 8 +- + arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi | 411 +++++ + arch/arm/boot/dts/imx6qdl-microsom.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 7 +- + arch/arm/boot/dts/imx6qdl-tx6.dtsi | 13 +- + arch/arm/boot/dts/imx6qdl-udoo.dtsi | 57 + + arch/arm/boot/dts/imx6qdl.dtsi | 8 +- + arch/arm/boot/dts/imx6qp-sabreauto.dts | 93 + + arch/arm/boot/dts/imx6qp-sabresd.dts | 93 + + arch/arm/boot/dts/imx6qp.dtsi | 86 + + arch/arm/boot/dts/imx6sl-warp.dts | 2 +- + arch/arm/boot/dts/imx6sx-sabreauto.dts | 2 +- + arch/arm/boot/dts/imx6sx-sdb.dtsi | 18 +- + arch/arm/boot/dts/imx6ul-14x14-evk.dts | 5 +- + arch/arm/boot/dts/imx6ul-pinfunc.h | 1836 ++++++++++---------- + arch/arm/boot/dts/imx6ul.dtsi | 220 ++- + arch/arm/boot/dts/imx7d-sbc-imx7.dts | 2 +- + arch/arm/boot/dts/imx7d-sdb.dts | 2 +- + arch/arm/boot/dts/imx7d.dtsi | 9 + + arch/arm/boot/dts/ls1021a.dtsi | 44 + + arch/arm/boot/dts/uniphier-common32.dtsi | 27 +- + arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts | 8 - + arch/arm/boot/dts/uniphier-ph1-ld4.dtsi | 4 + + arch/arm/boot/dts/uniphier-ph1-ld6b-ref.dts | 8 - + arch/arm/boot/dts/uniphier-ph1-pro4-ace.dts | 113 ++ + arch/arm/boot/dts/uniphier-ph1-pro4-ref.dts | 8 - + arch/arm/boot/dts/uniphier-ph1-pro4-sanji.dts | 108 ++ + arch/arm/boot/dts/uniphier-ph1-pro4.dtsi | 4 + + arch/arm/boot/dts/uniphier-ph1-pro5.dtsi | 4 + + arch/arm/boot/dts/uniphier-ph1-sld3-ref.dts | 8 - + arch/arm/boot/dts/uniphier-ph1-sld3.dtsi | 26 +- + arch/arm/boot/dts/uniphier-ph1-sld8-ref.dts | 8 - + arch/arm/boot/dts/uniphier-ph1-sld8.dtsi | 4 + + arch/arm/boot/dts/uniphier-pinctrl.dtsi | 5 + + arch/arm/boot/dts/uniphier-proxstream2-gentil.dts | 10 + + arch/arm/boot/dts/uniphier-proxstream2.dtsi | 4 + + arch/arm/boot/dts/uniphier-ref-daughter.dtsi | 2 +- + arch/arm/boot/dts/uniphier-support-card.dtsi | 6 +- + arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 94 +- + arch/arm/boot/dts/vf-colibri.dtsi | 76 +- + arch/arm/boot/dts/vf500-colibri-eval-v3.dts | 40 +- + arch/arm/boot/dts/vf500-colibri.dtsi | 40 +- + arch/arm/boot/dts/vf500.dtsi | 49 +- + arch/arm/boot/dts/vf610-colibri-eval-v3.dts | 42 +- + arch/arm/boot/dts/vf610-colibri.dtsi | 40 +- + arch/arm/boot/dts/vf610-twr.dts | 44 +- + arch/arm/boot/dts/vf610.dtsi | 40 +- + arch/arm/boot/dts/vfxxx.dtsi | 102 +- + arch/arm64/boot/dts/socionext/Makefile | 2 +- + ...-ph1-ld10-ref.dts => uniphier-ph1-ld20-ref.dts} | 16 +- + ...iphier-ph1-ld10.dtsi => uniphier-ph1-ld20.dtsi} | 25 +- + drivers/clk/imx/clk-imx6q.c | 132 +- + drivers/clk/imx/clk-imx6ul.c | 65 +- + include/dt-bindings/clock/imx6qdl-clock.h | 16 +- + include/dt-bindings/clock/imx6ul-clock.h | 149 +- + 99 files changed, 6627 insertions(+), 1473 deletions(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/imx6q-apalis-ixora.dts + create mode 100644 arch/arm/boot/dts/imx6q-b450v3.dts + create mode 100644 arch/arm/boot/dts/imx6q-b650v3.dts + create mode 100644 arch/arm/boot/dts/imx6q-b850v3.dts + create mode 100644 arch/arm/boot/dts/imx6q-ba16.dtsi + create mode 100644 arch/arm/boot/dts/imx6q-bx50v3.dtsi + create mode 100644 arch/arm/boot/dts/imx6q-evi.dts + create mode 100644 arch/arm/boot/dts/imx6q-icore-rqs.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-apalis.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi + create mode 100644 arch/arm/boot/dts/imx6qp-sabreauto.dts + create mode 100644 arch/arm/boot/dts/imx6qp-sabresd.dts + create mode 100644 arch/arm/boot/dts/imx6qp.dtsi + create mode 100644 arch/arm/boot/dts/uniphier-ph1-pro4-ace.dts + create mode 100644 arch/arm/boot/dts/uniphier-ph1-pro4-sanji.dts + rename arch/arm64/boot/dts/socionext/{uniphier-ph1-ld10-ref.dts => uniphier-ph1-ld20-ref.dts} (88%) + rename arch/arm64/boot/dts/socionext/{uniphier-ph1-ld10.dtsi => uniphier-ph1-ld20.dtsi} (94%) +Merging at91/at91-next (c40abde4b32e Merge branch 'at91-4.6-dt' into at91-next) +$ git merge at91/at91-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging bcm2835-dt/bcm2835-dt-next (1305141d1a72 ARM: bcm2835: add bcm2835-aux-uart support to DT) +$ git merge bcm2835-dt/bcm2835-dt-next +Already up-to-date. +Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1) +$ git merge bcm2835-soc/bcm2835-soc-next +Already up-to-date. +Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1) +$ git merge bcm2835-drivers/bcm2835-drivers-next +Already up-to-date. +Merging bcm2835-defconfig/bcm2835-defconfig-next (0a05d3b71ada ARM: multi_v7_defconfig: Enable BCM283x) +$ git merge bcm2835-defconfig/bcm2835-defconfig-next +Already up-to-date. +Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next) +$ git merge berlin/berlin/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings) +$ git merge cortex-m/for-next +Already up-to-date. +Merging imx-mxs/for-next (9e26d5f485d7 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging keystone/next (8fdbbde4a16c Merge branch 'for_4.6/keystone_dts' into next) +$ git merge keystone/next +Resolved 'arch/arm/boot/dts/Makefile' using previous resolution. +Auto-merging arch/arm/boot/dts/Makefile +CONFLICT (content): Merge conflict in arch/arm/boot/dts/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9694d033905e] Merge remote-tracking branch 'keystone/next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/boot/dts/k2g-evm.dts | 32 ++++++++++++++++ + arch/arm/boot/dts/k2g.dtsi | 89 +++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 121 insertions(+) + create mode 100644 arch/arm/boot/dts/k2g-evm.dts + create mode 100644 arch/arm/boot/dts/k2g.dtsi +Merging mvebu/for-next (5be603bdf1a7 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Merge made by the 'recursive' strategy. +Merging omap/for-next (aec24f100558 Merge branch 'omap-for-v4.6/fixes-not-urgent' into for-next) +$ git merge omap/for-next +Resolved 'arch/arm/boot/dts/logicpd-torpedo-som.dtsi' using previous resolution. +Resolved 'drivers/clk/Kconfig' using previous resolution. +Auto-merging drivers/clk/Makefile +Auto-merging drivers/clk/Kconfig +CONFLICT (content): Merge conflict in drivers/clk/Kconfig +Auto-merging arch/arm/boot/dts/logicpd-torpedo-som.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/logicpd-torpedo-som.dtsi +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fc3521529a36] Merge remote-tracking branch 'omap/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/clock/ti/adpll.txt | 41 + + arch/arm/boot/dts/dm814x-clocks.dtsi | 243 ++++- + arch/arm/boot/dts/dra62x-clocks.dtsi | 26 + + arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 2 + + drivers/clk/Kconfig | 1 + + drivers/clk/Makefile | 2 +- + drivers/clk/ti/Kconfig | 6 + + drivers/clk/ti/Makefile | 6 + + drivers/clk/ti/adpll.c | 983 +++++++++++++++++++++ + drivers/clk/ti/clk-814x.c | 53 ++ + 10 files changed, 1331 insertions(+), 32 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/ti/adpll.txt + create mode 100644 drivers/clk/ti/Kconfig + create mode 100644 drivers/clk/ti/adpll.c +Merging omap-pending/for-next (8fe097a3d99e ARM: DRA7: hwmod: Add reset data for PCIe) +$ git merge omap-pending/for-next +Already up-to-date. +Merging qcom/for-next (f17d0d578214 ARM: dts: msm8974: Add SCM firmware node) +$ git merge qcom/for-next +Resolved 'MAINTAINERS' using previous resolution. +Auto-merging arch/arm/Makefile +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8f14556f370c] Merge remote-tracking branch 'qcom/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/firmware/qcom,scm.txt | 25 ++ + MAINTAINERS | 3 + + arch/arm/Makefile | 3 +- + arch/arm/boot/dts/qcom-msm8974.dtsi | 11 + + arch/arm/mach-qcom/Kconfig | 17 +- + drivers/firmware/qcom_scm-32.c | 82 +++++++ + drivers/firmware/qcom_scm-64.c | 25 ++ + drivers/firmware/qcom_scm.c | 271 ++++++++++++++++++++- + drivers/firmware/qcom_scm.h | 12 + + drivers/soc/qcom/smd.c | 229 ++++++++++++----- + drivers/soc/qcom/smp2p.c | 2 +- + drivers/soc/qcom/spm.c | 8 +- + include/linux/qcom_scm.h | 6 + + include/linux/soc/qcom/smd.h | 8 +- + include/linux/soc/qcom/smem_state.h | 35 +++ + 15 files changed, 655 insertions(+), 82 deletions(-) + create mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.txt +Merging renesas/next (f094c5346231 Merge branch 'heads/sh-drivers-for-v4.6' into next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. + arch/arm/configs/shmobile_defconfig | 3 +++ + drivers/sh/pm_runtime.c | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) +Merging rockchip/for-next (545d1b355f3a Merge branch 'v4.6-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Auto-merging drivers/clk/rockchip/clk.c +Auto-merging drivers/clk/rockchip/clk-rk3368.c +Auto-merging drivers/clk/rockchip/clk-rk3036.c +Auto-merging arch/arm/boot/dts/rk3288.dtsi +Auto-merging arch/arm/boot/dts/rk3228.dtsi +Auto-merging arch/arm/boot/dts/rk3036.dtsi +Auto-merging arch/arm/boot/dts/rk3036-kylin.dts +Merge made by the 'recursive' strategy. + .../devicetree/bindings/soc/rockchip/grf.txt | 35 +++++ + arch/arm/boot/dts/rk3036-kylin.dts | 13 +- + arch/arm/boot/dts/rk3036.dtsi | 66 +++++++- + arch/arm/boot/dts/rk3066a-rayeager.dts | 2 - + arch/arm/boot/dts/rk3228-evb.dts | 8 +- + arch/arm/boot/dts/rk3228.dtsi | 69 ++++++++ + arch/arm/boot/dts/rk3288-evb.dtsi | 1 - + arch/arm/boot/dts/rk3288-firefly.dtsi | 2 - + arch/arm/boot/dts/rk3288-popmetal.dts | 1 - + arch/arm/boot/dts/rk3288-veyron.dtsi | 4 +- + arch/arm/boot/dts/rk3288.dtsi | 7 +- + arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi | 1 - + arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 4 +- + drivers/clk/rockchip/clk-cpu.c | 8 +- + drivers/clk/rockchip/clk-inverter.c | 8 +- + drivers/clk/rockchip/clk-mmc-phase.c | 8 +- + drivers/clk/rockchip/clk-pll.c | 5 + + drivers/clk/rockchip/clk-rk3036.c | 33 +--- + drivers/clk/rockchip/clk-rk3188.c | 27 ++-- + drivers/clk/rockchip/clk-rk3228.c | 56 ++----- + drivers/clk/rockchip/clk-rk3288.c | 38 ++--- + drivers/clk/rockchip/clk-rk3368.c | 175 +++++++++++---------- + drivers/clk/rockchip/clk.c | 64 +++++++- + drivers/clk/rockchip/clk.h | 28 ++++ + drivers/soc/rockchip/pm_domains.c | 4 + + include/dt-bindings/clock/rk3228-cru.h | 12 ++ + 27 files changed, 449 insertions(+), 231 deletions(-) + create mode 100644 Documentation/devicetree/bindings/soc/rockchip/grf.txt +Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) +$ git merge rpi/for-rpi-next +Already up-to-date. +Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1) +$ git merge samsung/for-next +Already up-to-date. +Merging samsung-krzk/for-next (466369e4e14b Merge branch 'next/defconfig' into for-next) +$ git merge samsung-krzk/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging sunxi/sunxi/for-next (73e5379b0442 Merge branches 'sunxi/clocks-for-4.6', 'sunxi/config64-for-4.6' and 'sunxi/dt-for-4.6' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/clock/sunxi.txt | 4 + + drivers/clk/sunxi/clk-a10-hosc.c | 3 +- + drivers/clk/sunxi/clk-a20-gmac.c | 2 - + drivers/clk/sunxi/clk-factors.c | 123 ++- + drivers/clk/sunxi/clk-factors.h | 26 +- + drivers/clk/sunxi/clk-mod0.c | 23 +- + drivers/clk/sunxi/clk-simple-gates.c | 4 + + drivers/clk/sunxi/clk-sun6i-apb0-gates.c | 2 - + drivers/clk/sunxi/clk-sun6i-ar100.c | 235 ++---- + drivers/clk/sunxi/clk-sun8i-apb0.c | 2 +- + drivers/clk/sunxi/clk-sun8i-bus-gates.c | 3 +- + drivers/clk/sunxi/clk-sun8i-mbus.c | 127 ++-- + drivers/clk/sunxi/clk-sun9i-core.c | 86 +-- + drivers/clk/sunxi/clk-sunxi.c | 863 ++++++++++------------ + drivers/clk/sunxi/clk-usb.c | 24 +- + 15 files changed, 691 insertions(+), 836 deletions(-) +Merging tegra/for-next (755f165105b1 Merge branch for-4.6/arm64 into for-next) +$ git merge tegra/for-next +Auto-merging drivers/gpu/drm/tegra/drm.h +Auto-merging arch/arm64/boot/dts/nvidia/tegra210.dtsi +Auto-merging arch/arm64/boot/dts/nvidia/tegra132.dtsi +Auto-merging arch/arm64/boot/dts/nvidia/tegra132-norrin.dts +Merge made by the 'recursive' strategy. + .../bindings/arm/tegra/nvidia,tegra20-pmc.txt | 12 +- + arch/arm/boot/dts/tegra114-dalmore.dts | 2 +- + arch/arm/boot/dts/tegra114-roth.dts | 2 +- + arch/arm/boot/dts/tegra114-tn7.dts | 2 +- + arch/arm/boot/dts/tegra114.dtsi | 4 +- + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 28 +++- + arch/arm/boot/dts/tegra124-nyan.dtsi | 4 +- + arch/arm/boot/dts/tegra124-venice2.dts | 2 +- + arch/arm/boot/dts/tegra124.dtsi | 4 +- + arch/arm/boot/dts/tegra20-harmony.dts | 2 +- + arch/arm/boot/dts/tegra20-paz00.dts | 2 +- + arch/arm/boot/dts/tegra20-seaboard.dts | 4 +- + arch/arm/boot/dts/tegra20-trimslice.dts | 2 +- + arch/arm/boot/dts/tegra20-ventana.dts | 2 +- + arch/arm/boot/dts/tegra20-whistler.dts | 2 +- + arch/arm/boot/dts/tegra20.dtsi | 2 +- + arch/arm/boot/dts/tegra30-apalis-eval.dts | 2 +- + arch/arm/boot/dts/tegra30-cardhu.dtsi | 2 +- + arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 2 +- + arch/arm/boot/dts/tegra30.dtsi | 2 +- + arch/arm/mach-tegra/platsmp.c | 16 +-- + arch/arm64/boot/dts/nvidia/Makefile | 1 + + arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 4 +- + arch/arm64/boot/dts/nvidia/tegra132.dtsi | 2 +- + arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 26 ++++ + arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 126 +++++++++++++++++ + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 2 +- + drivers/gpu/drm/tegra/drm.h | 2 +- + drivers/soc/tegra/Kconfig | 2 - + drivers/soc/tegra/pmc.c | 150 +++++++++++++-------- + include/soc/tegra/pmc.h | 35 ++--- + 31 files changed, 330 insertions(+), 120 deletions(-) + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-smaug.dts +Merging arm64/for-next/core (f09f1bacfe2b arm64: Split pr_notice("Virtual kernel memory layout...") into multiple pr_cont()) +$ git merge arm64/for-next/core +Recorded preimage for 'arch/arm64/mm/init.c' +Auto-merging arch/arm64/mm/init.c +CONFLICT (content): Merge conflict in arch/arm64/mm/init.c +Auto-merging arch/arm64/kernel/head.S +Auto-merging arch/arm64/include/asm/cacheflush.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/arm64/mm/init.c'. +[master ae271f2b3645] Merge remote-tracking branch 'arm64/for-next/core' +$ git diff -M --stat --summary HEAD^.. + arch/arm64/include/asm/cacheflush.h | 7 ----- + arch/arm64/kernel/entry.S | 2 +- + arch/arm64/kernel/head.S | 5 ++-- + arch/arm64/mm/init.c | 60 +++++++++++++++++-------------------- + 4 files changed, 32 insertions(+), 42 deletions(-) +Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe) +$ git merge blackfin/for-linus +Already up-to-date. +Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code) +$ git merge cris/for-next +Already up-to-date. +Merging h8300/h8300-next (7a93665a22d8 Merge remote-tracking branch 'origin' into h8300-next) +$ git merge h8300/h8300-next +Merge made by the 'recursive' strategy. + arch/h8300/boot/dts/edosk2674.dts | 6 +-- + arch/h8300/boot/dts/h8300h_sim.dts | 4 +- + arch/h8300/boot/dts/h8s_sim.dts | 4 +- + arch/h8300/configs/h8300h-sim_defconfig | 2 +- + arch/h8300/kernel/setup.c | 7 ---- + arch/h8300/kernel/sim-console.c | 67 +++++---------------------------- + 6 files changed, 17 insertions(+), 73 deletions(-) +Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error") +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted()) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (efbec135f11d m68k: Fix misspellings in comments.) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (a3595962d824 m68knommu: remove obsolete 68360 support) +$ git merge m68knommu/for-next +Already up-to-date. +Merging metag/for-next (c8b6ad8b3f87 metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init) +$ git merge metag/for-next +Auto-merging arch/metag/kernel/ftrace.c +Merge made by the 'recursive' strategy. + arch/metag/kernel/ftrace.c | 1 - + 1 file changed, 1 deletion(-) +Merging microblaze/next (c937adb7ec91 microblaze: Wire up userfaultfd, membarrier, mlock2 syscalls) +$ git merge microblaze/next +Merge made by the 'recursive' strategy. + arch/microblaze/include/asm/unistd.h | 2 +- + arch/microblaze/include/uapi/asm/unistd.h | 3 +++ + arch/microblaze/kernel/syscall_table.S | 3 +++ + 3 files changed, 7 insertions(+), 1 deletion(-) +Merging mips/mips-for-linux-next (a6cab95ec1ae Merge branch '4.5-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Auto-merging drivers/firmware/broadcom/bcm47xx_sprom.c +Auto-merging arch/mips/include/asm/octeon/cvmx.h +Auto-merging arch/mips/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mips/cavium/ciu3.txt | 27 + + arch/mips/Kconfig | 4 +- + arch/mips/alchemy/common/dbdma.c | 4 +- + arch/mips/ath79/Kconfig | 12 - + arch/mips/ath79/setup.c | 13 +- + arch/mips/bcm47xx/Makefile | 2 +- + arch/mips/bcm47xx/bcm47xx_private.h | 3 - + arch/mips/bcm47xx/setup.c | 2 +- + arch/mips/boot/compressed/Makefile | 12 +- + .../boot/dts/cavium-octeon/dlink_dsr-1000n.dts | 78 +++ + arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dts | 205 +------ + arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dtsi | 231 +++++++ + arch/mips/boot/dts/cavium-octeon/ubnt_e100.dts | 59 ++ + arch/mips/boot/dts/qca/Makefile | 3 - + arch/mips/cavium-octeon/csrc-octeon.c | 13 +- + .../executive/cvmx-interrupt-decodes.c | 14 +- + arch/mips/cavium-octeon/executive/cvmx-pko.c | 2 +- + arch/mips/cavium-octeon/executive/cvmx-sysinfo.c | 72 +-- + arch/mips/cavium-octeon/executive/octeon-model.c | 82 ++- + arch/mips/cavium-octeon/octeon-irq.c | 679 ++++++++++++++++++++- + arch/mips/cavium-octeon/octeon-platform.c | 94 ++- + arch/mips/cavium-octeon/setup.c | 86 ++- + arch/mips/cavium-octeon/smp.c | 153 ++++- + arch/mips/configs/ci20_defconfig | 14 +- + arch/mips/dec/int-handler.S | 2 +- + arch/mips/fw/arc/memory.c | 2 +- + arch/mips/include/asm/cpu.h | 2 + + arch/mips/include/asm/highmem.h | 4 +- + arch/mips/include/asm/irq_regs.h | 10 + + .../asm/mach-cavium-octeon/kernel-entry-init.h | 2 +- + .../include/asm/mach-generic/kernel-entry-init.h | 2 +- + arch/mips/include/asm/mach-ip27/irq.h | 2 +- + .../mips/include/asm/mach-ip27/kernel-entry-init.h | 2 +- + arch/mips/include/asm/mach-jz4740/gpio.h | 2 +- + arch/mips/include/asm/mips-cm.h | 2 +- + arch/mips/include/asm/mips-r2-to-r6-emul.h | 2 +- + arch/mips/include/asm/octeon/cvmx-bootinfo.h | 16 +- + arch/mips/include/asm/octeon/cvmx-ciu3-defs.h | 353 +++++++++++ + arch/mips/include/asm/octeon/cvmx-config.h | 2 +- + arch/mips/include/asm/octeon/cvmx-coremask.h | 89 +++ + arch/mips/include/asm/octeon/cvmx-fpa-defs.h | 1 + + arch/mips/include/asm/octeon/cvmx-mio-defs.h | 410 ++++++++++++- + arch/mips/include/asm/octeon/cvmx-sysinfo.h | 37 +- + arch/mips/include/asm/octeon/cvmx.h | 29 +- + arch/mips/include/asm/octeon/octeon-feature.h | 19 +- + arch/mips/include/asm/octeon/octeon-model.h | 5 + + arch/mips/include/asm/octeon/octeon.h | 25 + + arch/mips/include/asm/pci/bridge.h | 18 +- + arch/mips/include/asm/sgi/hpc3.h | 2 +- + arch/mips/include/asm/sgiarcs.h | 4 +- + arch/mips/include/asm/sn/ioc3.h | 2 +- + arch/mips/include/asm/sn/sn0/hubio.h | 2 +- + arch/mips/include/asm/uaccess.h | 2 +- + arch/mips/kernel/cpu-probe.c | 2 + + arch/mips/kernel/mips-cm.c | 2 +- + arch/mips/kernel/mips-r2-to-r6-emul.c | 12 +- + arch/mips/kernel/perf_event_mipsxx.c | 2 +- + arch/mips/kernel/pm-cps.c | 2 +- + arch/mips/kernel/process.c | 2 +- + arch/mips/kernel/traps.c | 25 +- + arch/mips/kvm/tlb.c | 2 +- + arch/mips/kvm/trap_emul.c | 2 +- + arch/mips/lantiq/xway/reset.c | 2 +- + arch/mips/loongson64/loongson-3/smp.c | 1 - + arch/mips/math-emu/ieee754dp.c | 6 +- + arch/mips/math-emu/ieee754sp.c | 6 +- + arch/mips/mm/sc-ip22.c | 2 +- + arch/mips/mm/tlb-r4k.c | 5 + + arch/mips/mm/tlbex.c | 2 +- + arch/mips/pmcs-msp71xx/msp_setup.c | 2 +- + arch/mips/ralink/reset.c | 2 +- + arch/mips/sgi-ip27/ip27-memory.c | 2 +- + arch/mips/vr41xx/common/pmu.c | 2 +- + drivers/firmware/broadcom/Kconfig | 11 + + drivers/firmware/broadcom/Makefile | 1 + + .../firmware/broadcom/bcm47xx_sprom.c | 31 +- + include/linux/bcm47xx_sprom.h | 24 + + 77 files changed, 2531 insertions(+), 533 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mips/cavium/ciu3.txt + create mode 100644 arch/mips/boot/dts/cavium-octeon/dlink_dsr-1000n.dts + create mode 100644 arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dtsi + create mode 100644 arch/mips/boot/dts/cavium-octeon/ubnt_e100.dts + create mode 100644 arch/mips/include/asm/octeon/cvmx-ciu3-defs.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-coremask.h + rename arch/mips/bcm47xx/sprom.c => drivers/firmware/broadcom/bcm47xx_sprom.c (97%) + create mode 100644 include/linux/bcm47xx_sprom.h +Merging nios2/for-next (8e3d7c834ba0 nios2: fix cache coherency) +$ git merge nios2/for-next +Already up-to-date. +Merging parisc-hd/for-next (afd2ff9b7e1b Linux 4.4) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc/next (6e669f085d59 powerpc: Fix unrecoverable SLB miss during restore_math()) +$ git merge powerpc/next +Already up-to-date. +Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-mpe/next +Already up-to-date. +Merging fsl/next (fba4e9f9898a powerpc/fsl/dts: Add "jedec,spi-nor" flash compatible) +$ git merge fsl/next +Already up-to-date. +Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc) +$ git merge mpc5xxx/next +Already up-to-date. +Merging s390/features (19eedc6df7b6 s390: wire up preadv2/pwritev2 syscalls) +$ git merge s390/features +Auto-merging arch/s390/mm/gup.c +Auto-merging arch/s390/Kconfig +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 3 + + arch/s390/crypto/prng.c | 2 + + arch/s390/include/asm/cache.h | 3 + + arch/s390/include/uapi/asm/unistd.h | 4 +- + arch/s390/kernel/perf_cpum_cf.c | 1 + + arch/s390/kernel/perf_cpum_sf.c | 2 +- + arch/s390/kernel/syscalls.S | 2 + + arch/s390/mm/gup.c | 8 +- + arch/s390/mm/init.c | 10 +- + arch/s390/pci/pci_clp.c | 3 +- + drivers/s390/block/dasd.c | 56 +++++++++ + drivers/s390/block/dasd_alias.c | 226 +++++++++--------------------------- + drivers/s390/block/dasd_devmap.c | 27 +++++ + drivers/s390/block/dasd_eckd.c | 202 ++++++++++++++++++++++++++++++-- + drivers/s390/block/dasd_eckd.h | 36 +++++- + drivers/s390/block/dasd_int.h | 5 + + 16 files changed, 396 insertions(+), 194 deletions(-) +Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (35b90a2939a5 tile: Fix misspellings in comments.) +$ git merge tile/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 ++-- + arch/tile/include/hv/drv_mpipe_intf.h | 26 +++++++++++++------------- + arch/tile/kernel/kgdb.c | 16 ++++++++-------- + arch/tile/kernel/pci_gx.c | 2 +- + 4 files changed, 24 insertions(+), 24 deletions(-) +Merging uml/linux-next (ad32a1f3c36b um: use %lx format specifiers for unsigned longs) +$ git merge uml/linux-next +Already up-to-date. +Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) +$ git merge unicore32/unicore32 +Already up-to-date. +Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant) +$ git merge xtensa/for_next +Already up-to-date. +Merging btrfs/next (bb7ab3b92e46 btrfs: Fix misspellings in comments.) +$ git merge btrfs/next +Auto-merging fs/btrfs/tests/btrfs-tests.c +Auto-merging fs/btrfs/root-tree.c +Auto-merging fs/btrfs/disk-io.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/btrfs.txt | 261 ++------------------------ + fs/btrfs/backref.c | 12 +- + fs/btrfs/check-integrity.c | 12 +- + fs/btrfs/compression.h | 9 + + fs/btrfs/ctree.c | 36 ++-- + fs/btrfs/ctree.h | 87 ++++++--- + fs/btrfs/delayed-inode.c | 10 +- + fs/btrfs/delayed-ref.c | 12 +- + fs/btrfs/dev-replace.c | 134 +++++++------- + fs/btrfs/dev-replace.h | 7 +- + fs/btrfs/disk-io.c | 71 ++++--- + fs/btrfs/extent-tree.c | 40 ++-- + fs/btrfs/extent_io.c | 40 ++-- + fs/btrfs/extent_io.h | 5 +- + fs/btrfs/extent_map.c | 8 +- + fs/btrfs/file-item.c | 93 ++++++---- + fs/btrfs/file.c | 158 +++++++++------- + fs/btrfs/inode-map.c | 3 + + fs/btrfs/inode.c | 326 +++++++++++++++++++++++---------- + fs/btrfs/ioctl.c | 35 ++-- + fs/btrfs/ordered-data.c | 6 +- + fs/btrfs/print-tree.c | 23 ++- + fs/btrfs/props.c | 1 + + fs/btrfs/reada.c | 268 +++++++++++++-------------- + fs/btrfs/root-tree.c | 2 +- + fs/btrfs/scrub.c | 32 ++-- + fs/btrfs/send.c | 37 ++-- + fs/btrfs/super.c | 52 ++++-- + fs/btrfs/tests/btrfs-tests.c | 6 - + fs/btrfs/tests/free-space-tree-tests.c | 1 + + fs/btrfs/tests/inode-tests.c | 1 + + fs/btrfs/transaction.c | 13 +- + fs/btrfs/tree-log.c | 102 +++++++++-- + fs/btrfs/tree-log.h | 2 + + fs/btrfs/volumes.c | 51 +++--- + fs/btrfs/xattr.c | 67 ++++--- + 36 files changed, 1092 insertions(+), 931 deletions(-) +Merging btrfs-kdave/for-next (cb96ddcd037b Merge branch 'for-next-4.6-20160321' into for-next-20160321) +$ git merge btrfs-kdave/for-next +Auto-merging fs/btrfs/disk-io.c +Merge made by the 'recursive' strategy. + fs/btrfs/ctree.c | 6 +- + fs/btrfs/ctree.h | 81 +++++------ + fs/btrfs/dev-replace.c | 28 +--- + fs/btrfs/disk-io.c | 53 +++---- + fs/btrfs/extent-tree.c | 2 +- + fs/btrfs/extent_io.c | 39 ++++-- + fs/btrfs/file-item.c | 10 ++ + fs/btrfs/file.c | 9 +- + fs/btrfs/inode-item.c | 2 +- + fs/btrfs/ioctl.c | 66 ++++++++- + fs/btrfs/relocation.c | 2 +- + fs/btrfs/root-tree.c | 4 +- + fs/btrfs/super.c | 22 ++- + fs/btrfs/transaction.c | 2 +- + fs/btrfs/tree-log.c | 8 +- + fs/btrfs/volumes.c | 335 ++++++++++++++++++++++----------------------- + fs/btrfs/volumes.h | 7 +- + include/uapi/linux/btrfs.h | 15 +- + 18 files changed, 379 insertions(+), 312 deletions(-) +Merging ceph/master (cd8140c673d9 libceph: don't spam dmesg with stray reply warnings) +$ git merge ceph/master +Already up-to-date. +Merging cifs/for-next (b562e44f507e Linux 4.5) +$ git merge cifs/for-next +Already up-to-date. +Merging configfs/for-next (1ae1602de028 configfs: switch ->default groups to a linked list) +$ git merge configfs/for-next +Already up-to-date. +Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/main.c +Merge made by the 'recursive' strategy. + fs/ecryptfs/main.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging ext3/for_next (ab73ef46398e quota: Fix possible GPF due to uninitialised pointers) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (ff2ea405b86c ext4: check if in-inode xattr is corrupted in ext4_expand_extra_isize_ea()) +$ git merge ext4/dev +Resolved 'fs/overlayfs/super.c' using previous resolution. +Auto-merging include/linux/fs.h +Auto-merging include/linux/dcache.h +Auto-merging fs/overlayfs/super.c +CONFLICT (content): Merge conflict in fs/overlayfs/super.c +Auto-merging fs/nfs/dir.c +Auto-merging fs/ext4/file.c +Auto-merging fs/ext4/crypto.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6a5d7a4709d4] Merge remote-tracking branch 'ext4/dev' +$ git diff -M --stat --summary HEAD^.. + fs/ext4/crypto.c | 12 ++++++++---- + fs/ext4/file.c | 12 ++++++++---- + fs/ext4/xattr.c | 32 ++++++++++++++++++++++++++++---- + fs/nfs/dir.c | 6 +++--- + fs/nfs/inode.c | 2 +- + fs/nfs/nfs4file.c | 4 ++-- + fs/open.c | 11 +++++++++++ + fs/overlayfs/super.c | 16 ++++++++++++++++ + include/linux/dcache.h | 1 + + include/linux/fs.h | 2 ++ + 10 files changed, 80 insertions(+), 18 deletions(-) +Merging f2fs/dev (d407574e7948 Merge tag 'for-f2fs-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs) +$ git merge f2fs/dev +Already up-to-date. +Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed) +$ git merge fscache/fscache +Merge made by the 'recursive' strategy. +Merging fuse/for-next (742f992708df fuse: return patrial success from fuse_direct_io()) +$ git merge fuse/for-next +Merge made by the 'recursive' strategy. + fs/fuse/cuse.c | 4 ++-- + fs/fuse/file.c | 56 +++++++++++++++++++++++++++++++++++--------------------- + fs/fuse/fuse_i.h | 9 +++++++++ + 3 files changed, 46 insertions(+), 23 deletions(-) +Merging gfs2/for-next (9dffdb38d864 Merge tag 'staging-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging) +$ git merge gfs2/for-next +Already up-to-date. +Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock) +$ git merge jfs/jfs-next +Already up-to-date. +Merging nfs/linux-next (f35592a97460 nfs/blocklayout: make sure making a aligned read request) +$ git merge nfs/linux-next +Auto-merging fs/nfs/nfs4proc.c +Auto-merging fs/nfs/nfs4file.c +Auto-merging fs/nfs/inode.c +Merge made by the 'recursive' strategy. + fs/nfs/blocklayout/blocklayout.c | 13 +- + fs/nfs/callback.h | 3 +- + fs/nfs/callback_proc.c | 69 +++-- + fs/nfs/callback_xdr.c | 12 +- + fs/nfs/file.c | 12 +- + fs/nfs/flexfilelayout/flexfilelayoutdev.c | 2 + + fs/nfs/inode.c | 2 +- + fs/nfs/internal.h | 6 +- + fs/nfs/nfs4file.c | 33 +-- + fs/nfs/nfs4proc.c | 63 +++- + fs/nfs/nfs4session.c | 54 +++- + fs/nfs/nfs4session.h | 8 + + fs/nfs/pnfs_nfs.c | 16 +- + include/linux/sunrpc/clnt.h | 18 +- + include/linux/sunrpc/rpc_rdma.h | 12 +- + include/linux/sunrpc/sched.h | 32 +- + include/linux/sunrpc/xprt.h | 22 +- + include/linux/sunrpc/xprtmultipath.h | 69 +++++ + include/linux/sunrpc/xprtrdma.h | 2 - + net/sunrpc/Makefile | 3 +- + net/sunrpc/auth_gss/auth_gss.c | 4 +- + net/sunrpc/clnt.c | 328 ++++++++++++++++----- + net/sunrpc/rpcb_clnt.c | 10 +- + net/sunrpc/sched.c | 2 + + net/sunrpc/xprt.c | 42 ++- + net/sunrpc/xprtmultipath.c | 475 ++++++++++++++++++++++++++++++ + net/sunrpc/xprtrdma/fmr_ops.c | 28 +- + net/sunrpc/xprtrdma/frwr_ops.c | 143 +++++---- + net/sunrpc/xprtrdma/physical_ops.c | 1 - + net/sunrpc/xprtrdma/rpc_rdma.c | 108 +++++-- + net/sunrpc/xprtrdma/verbs.c | 204 ++++--------- + net/sunrpc/xprtrdma/xprt_rdma.h | 14 +- + net/sunrpc/xprtsock.c | 4 +- + 33 files changed, 1327 insertions(+), 487 deletions(-) + create mode 100644 include/linux/sunrpc/xprtmultipath.h + create mode 100644 net/sunrpc/xprtmultipath.c +Merging nfsd/nfsd-next (8287ea1c52bd nfsd: block and scsi layout drivers need to depend on CONFIG_BLOCK) +$ git merge nfsd/nfsd-next +Auto-merging fs/xfs/xfs_export.c +Auto-merging fs/nfsd/nfs4recover.c +Auto-merging fs/nfs/blocklayout/extent_tree.c +Auto-merging fs/nfs/blocklayout/blocklayout.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/nfs/pnfs-scsi-server.txt | 23 ++ + fs/nfs/blocklayout/blocklayout.c | 59 ++- + fs/nfs/blocklayout/blocklayout.h | 14 +- + fs/nfs/blocklayout/dev.c | 144 ++++++- + fs/nfs/blocklayout/extent_tree.c | 44 +- + fs/nfs/blocklayout/rpc_pipefs.c | 2 +- + fs/nfsd/Kconfig | 28 +- + fs/nfsd/Makefile | 4 +- + fs/nfsd/blocklayout.c | 298 ++++++++++++-- + fs/nfsd/blocklayoutxdr.c | 65 ++- + fs/nfsd/blocklayoutxdr.h | 14 + + fs/nfsd/nfs4layouts.c | 31 +- + fs/nfsd/nfs4proc.c | 9 +- + fs/nfsd/nfs4recover.c | 1 + + fs/nfsd/nfs4state.c | 29 +- + fs/nfsd/nfs4xdr.c | 15 +- + fs/nfsd/pnfs.h | 8 + + fs/xfs/Makefile | 3 +- + fs/xfs/xfs_export.c | 2 +- + fs/xfs/xfs_pnfs.h | 2 +- + include/linux/nfs4.h | 19 + + include/linux/sunrpc/auth.h | 7 + + include/linux/sunrpc/svc_rdma.h | 20 +- + net/sunrpc/auth_null.c | 4 +- + net/sunrpc/auth_unix.c | 6 +- + net/sunrpc/cache.c | 6 +- + net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 17 +- + net/sunrpc/xprtrdma/svc_rdma_marshal.c | 64 ++- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 60 ++- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 196 ++++++--- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 445 +++++++-------------- + 31 files changed, 1092 insertions(+), 547 deletions(-) + create mode 100644 Documentation/filesystems/nfs/pnfs-scsi-server.txt +Merging orangefs/for-next (2f83ace37181 orangefs: put register_chrdev immediately before register_filesystem) +$ git merge orangefs/for-next +Auto-merging fs/Makefile +Auto-merging fs/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-fs-orangefs | 87 ++ + Documentation/filesystems/orangefs.txt | 406 +++++++ + MAINTAINERS | 8 + + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/orangefs/Kconfig | 6 + + fs/orangefs/Makefile | 10 + + fs/orangefs/acl.c | 175 +++ + fs/orangefs/dcache.c | 139 +++ + fs/orangefs/devorangefs-req.c | 938 +++++++++++++++ + fs/orangefs/dir.c | 433 +++++++ + fs/orangefs/downcall.h | 133 +++ + fs/orangefs/file.c | 726 ++++++++++++ + fs/orangefs/inode.c | 477 ++++++++ + fs/orangefs/namei.c | 462 ++++++++ + fs/orangefs/orangefs-bufmap.c | 569 +++++++++ + fs/orangefs/orangefs-bufmap.h | 47 + + fs/orangefs/orangefs-cache.c | 161 +++ + fs/orangefs/orangefs-debug.h | 92 ++ + fs/orangefs/orangefs-debugfs.c | 455 +++++++ + fs/orangefs/orangefs-debugfs.h | 3 + + fs/orangefs/orangefs-dev-proto.h | 62 + + fs/orangefs/orangefs-kernel.h | 664 +++++++++++ + fs/orangefs/orangefs-mod.c | 293 +++++ + fs/orangefs/orangefs-sysfs.c | 1772 ++++++++++++++++++++++++++++ + fs/orangefs/orangefs-sysfs.h | 2 + + fs/orangefs/orangefs-utils.c | 1208 +++++++++++++++++++ + fs/orangefs/protocol.h | 452 +++++++ + fs/orangefs/super.c | 544 +++++++++ + fs/orangefs/symlink.c | 19 + + fs/orangefs/upcall.h | 246 ++++ + fs/orangefs/waitqueue.c | 357 ++++++ + fs/orangefs/xattr.c | 545 +++++++++ + 33 files changed, 11493 insertions(+) + create mode 100644 Documentation/ABI/stable/sysfs-fs-orangefs + create mode 100644 Documentation/filesystems/orangefs.txt + create mode 100644 fs/orangefs/Kconfig + create mode 100644 fs/orangefs/Makefile + create mode 100644 fs/orangefs/acl.c + create mode 100644 fs/orangefs/dcache.c + create mode 100644 fs/orangefs/devorangefs-req.c + create mode 100644 fs/orangefs/dir.c + create mode 100644 fs/orangefs/downcall.h + create mode 100644 fs/orangefs/file.c + create mode 100644 fs/orangefs/inode.c + create mode 100644 fs/orangefs/namei.c + create mode 100644 fs/orangefs/orangefs-bufmap.c + create mode 100644 fs/orangefs/orangefs-bufmap.h + create mode 100644 fs/orangefs/orangefs-cache.c + create mode 100644 fs/orangefs/orangefs-debug.h + create mode 100644 fs/orangefs/orangefs-debugfs.c + create mode 100644 fs/orangefs/orangefs-debugfs.h + create mode 100644 fs/orangefs/orangefs-dev-proto.h + create mode 100644 fs/orangefs/orangefs-kernel.h + create mode 100644 fs/orangefs/orangefs-mod.c + create mode 100644 fs/orangefs/orangefs-sysfs.c + create mode 100644 fs/orangefs/orangefs-sysfs.h + create mode 100644 fs/orangefs/orangefs-utils.c + create mode 100644 fs/orangefs/protocol.h + create mode 100644 fs/orangefs/super.c + create mode 100644 fs/orangefs/symlink.c + create mode 100644 fs/orangefs/upcall.h + create mode 100644 fs/orangefs/waitqueue.c + create mode 100644 fs/orangefs/xattr.c +Merging overlayfs/overlayfs-next (1fd10315545a ovl: ignore permissions on underlying lookup) +$ git merge overlayfs/overlayfs-next +Auto-merging fs/overlayfs/super.c +Merge made by the 'recursive' strategy. + fs/namei.c | 47 +++++++++++++++++++++++++++++-------- + fs/overlayfs/copy_up.c | 35 +++++++++++++++++++++++++++ + fs/overlayfs/dir.c | 61 ++++++++++++++++++++++++++++++------------------ + fs/overlayfs/overlayfs.h | 1 + + fs/overlayfs/readdir.c | 53 ++++++++++++++++++++++++++++++++++------- + fs/overlayfs/super.c | 20 ++++++++++++++-- + include/linux/namei.h | 2 ++ + 7 files changed, 176 insertions(+), 43 deletions(-) +Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (c27cb97218b3 ubifs: Remove unused header) +$ git merge ubifs/linux-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 ++- + drivers/mtd/ubi/misc.c | 49 +++++++++++++++++++++++++++++++++++++++++++ + drivers/mtd/ubi/ubi.h | 16 ++++++++------ + fs/ubifs/Makefile | 1 + + fs/ubifs/misc.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++ + fs/ubifs/ubifs.h | 41 +++++++++++++++--------------------- + fs/ubifs/xattr.c | 1 - + 7 files changed, 136 insertions(+), 32 deletions(-) + create mode 100644 fs/ubifs/misc.c +Merging xfs/for-next (2cdb958aba6a Merge branch 'xfs-misc-fixes-4.6-4' into for-next) +$ git merge xfs/for-next +Already up-to-date. +Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew)) +$ git merge file-locks/linux-next +Already up-to-date. +Merging vfs/for-next (8b23a8ce1094 Merge branches 'work.lookups', 'work.misc' and 'work.preadv2' into for-next) +$ git merge vfs/for-next +Already up-to-date. +Merging pci/next (6e6f498b039a Merge branch 'pci/resource' into next) +$ git merge pci/next +Already up-to-date. +Merging hid/for-next (c7bc3b24d539 Merge branch 'for-4.6/upstream-fixes' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/hid-wiimote-modules.c | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) +Merging i2c/i2c/for-next (886f6f8337dd i2c: octeon: Support I2C_M_RECV_LEN) +$ git merge i2c/i2c/for-next +Auto-merging drivers/i2c/busses/i2c-i801.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-platform-i2c-demux-pinctrl | 23 + + .../devicetree/bindings/i2c/i2c-demux-pinctrl.txt | 135 +++ + Documentation/devicetree/bindings/i2c/i2c-imx.txt | 2 +- + Documentation/devicetree/bindings/i2c/i2c-rcar.txt | 2 +- + Documentation/devicetree/bindings/i2c/i2c-sirf.txt | 2 +- + Documentation/devicetree/bindings/i2c/i2c-xiic.txt | 3 + + MAINTAINERS | 14 +- + drivers/i2c/busses/Kconfig | 10 +- + drivers/i2c/busses/i2c-bcm-iproc.c | 177 ++-- + drivers/i2c/busses/i2c-cadence.c | 14 +- + drivers/i2c/busses/i2c-designware-baytrail.c | 5 - + drivers/i2c/busses/i2c-designware-core.c | 22 +- + drivers/i2c/busses/i2c-designware-core.h | 2 - + drivers/i2c/busses/i2c-i801.c | 8 +- + drivers/i2c/busses/i2c-imx.c | 12 +- + drivers/i2c/busses/i2c-mt65xx.c | 42 + + drivers/i2c/busses/i2c-octeon.c | 307 +++---- + drivers/i2c/busses/i2c-piix4.c | 48 +- + drivers/i2c/busses/i2c-qup.c | 977 ++++++++++++++++++++- + drivers/i2c/busses/i2c-rcar.c | 2 +- + drivers/i2c/busses/i2c-tegra.c | 4 +- + drivers/i2c/busses/i2c-xiic.c | 88 +- + drivers/i2c/i2c-boardinfo.c | 6 +- + drivers/i2c/i2c-core.c | 39 +- + drivers/i2c/i2c-dev.c | 14 +- + drivers/i2c/i2c-mux.c | 8 +- + drivers/i2c/i2c-smbus.c | 8 +- + drivers/i2c/i2c-stub.c | 8 +- + drivers/i2c/muxes/Kconfig | 9 + + drivers/i2c/muxes/Makefile | 2 + + drivers/i2c/muxes/i2c-demux-pinctrl.c | 272 ++++++ + 31 files changed, 1893 insertions(+), 372 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-platform-i2c-demux-pinctrl + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-demux-pinctrl.txt + create mode 100644 drivers/i2c/muxes/i2c-demux-pinctrl.c +Merging jdelvare-hwmon/master (f02de116250d Documentation/hwmon: Update links in max34440) +$ git merge jdelvare-hwmon/master +Auto-merging Documentation/hwmon/max34440 +Merge made by the 'recursive' strategy. + Documentation/hwmon/max34440 | 6 +++--- + drivers/hwmon/emc2103.c | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots) +$ git merge dmi/master +Merge made by the 'recursive' strategy. +Merging hwmon-staging/hwmon-next (630300d5fcb6 hwmon: Create an NSA320 hardware monitoring driver) +$ git merge hwmon-staging/hwmon-next +Already up-to-date. +Merging v4l-dvb/master (1752d448bb5e Merge branch 'v4l_for_linus' into to_next) +$ git merge v4l-dvb/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging libata/for-next (4b3ec0279397 Merge branch 'for-4.6' into for-next) +$ git merge libata/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging pm/linux-next (6a9c8816542f Merge branches 'pm-cpufreq' and 'acpi-soc' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + drivers/acpi/acpi_apd.c | 1 + + drivers/acpi/property.c | 1 + + drivers/base/power/clock_ops.c | 89 ++++++++++++++++++++++++++++++++++++++++ + drivers/cpufreq/acpi-cpufreq.c | 6 ++- + drivers/cpufreq/cpufreq.c | 12 +++++- + drivers/cpufreq/intel_pstate.c | 73 ++++++++++++++++++-------------- + drivers/cpuidle/governors/menu.c | 42 +++++++++++-------- + drivers/devfreq/Kconfig | 2 +- + include/linux/pm_clock.h | 9 ++++ + 9 files changed, 182 insertions(+), 53 deletions(-) +Merging idle/next (31ade3b83e18 Linux 4.4-rc3) +$ git merge idle/next +Already up-to-date. +Merging thermal/next (33cae63614e6 Merge branches 'thermal-core' and 'thermal-intel' into next) +$ git merge thermal/next +Merge made by the 'recursive' strategy. + drivers/thermal/intel_pch_thermal.c | 6 ++++++ + include/trace/events/thermal.h | 16 ++++++++++++++-- + 2 files changed, 20 insertions(+), 2 deletions(-) +Merging thermal-soc/next (44fa372da981 Merge branch 'work-linus' into work-next) +$ git merge thermal-soc/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/thermal/exynos-thermal.txt | 18 +- + .../bindings/thermal/mediatek-thermal.txt | 43 ++ + Documentation/thermal/sysfs-api.txt | 68 +++ + drivers/thermal/Kconfig | 21 +- + drivers/thermal/Makefile | 1 + + drivers/thermal/mtk_thermal.c | 625 +++++++++++++++++++++ + drivers/thermal/of-thermal.c | 81 +++ + drivers/thermal/rcar_thermal.c | 3 +- + drivers/thermal/rockchip_thermal.c | 239 ++++---- + drivers/thermal/samsung/Kconfig | 1 + + drivers/thermal/samsung/exynos_tmu.c | 19 +- + drivers/thermal/tegra_soctherm.c | 2 +- + drivers/thermal/ti-soc-thermal/ti-bandgap.c | 10 +- + include/linux/thermal.h | 18 + + 14 files changed, 1031 insertions(+), 118 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/mediatek-thermal.txt + create mode 100644 drivers/thermal/mtk_thermal.c +Merging ieee1394/for-next (e38e5ce81c3e firewire: ABI documentation: libhinawa uses firewire-cdev) +$ git merge ieee1394/for-next +Already up-to-date. +Merging dlm/next (b81171cb6869 DLM: Save and restore socket callbacks properly) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging slave-dma/next (7ea5d41560d9 Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging net-next/master (de06dbfa7861 Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm) +$ git merge net-next/master +Already up-to-date. +Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error) +$ git merge ipsec-next/master +Already up-to-date. +Merging ipvs-next/master (f6ca9f46f661 netfilter: ipvs: avoid unused variable warnings) +$ git merge ipvs-next/master +Already up-to-date. +Merging wireless-drivers-next/master (ccfe1e853220 rtl8xxxu: Temporarily disable 8192eu device init) +$ git merge wireless-drivers-next/master +Already up-to-date. +Merging bluetooth/master (de06dbfa7861 Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm) +$ git merge bluetooth/master +Already up-to-date. +Merging mac80211-next/master (0a87cadbb54e nl80211: add feature for BSS selection support) +$ git merge mac80211-next/master +Auto-merging net/wireless/sme.c +Auto-merging net/wireless/nl80211.c +Auto-merging net/wireless/core.c +Auto-merging net/sctp/proc.c +Auto-merging net/mac80211/tx.c +Auto-merging net/mac80211/ieee80211_i.h +Auto-merging fs/gfs2/glock.c +Auto-merging drivers/net/wireless/mac80211_hwsim.c +Auto-merging drivers/net/wireless/ath/ath10k/htt_rx.c +Merge made by the 'recursive' strategy. + Documentation/networking/mac80211-injection.txt | 17 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 2 +- + drivers/net/wireless/ath/wcn36xx/txrx.c | 2 +- + drivers/net/wireless/mac80211_hwsim.c | 5 + + fs/gfs2/glock.c | 4 +- + include/linux/rhashtable.h | 3 +- + include/net/cfg80211.h | 36 + + include/net/mac80211.h | 13 +- + include/uapi/linux/nl80211.h | 56 +- + lib/rhashtable.c | 6 +- + lib/test_rhashtable.c | 2 +- + net/ipv6/ila/ila_xlat.c | 3 +- + net/mac80211/cfg.c | 4 +- + net/mac80211/chan.c | 4 +- + net/mac80211/driver-ops.h | 15 + + net/mac80211/ieee80211_i.h | 9 + + net/mac80211/mesh.c | 12 +- + net/mac80211/mesh.h | 38 +- + net/mac80211/mesh_pathtbl.c | 950 ++++++++---------------- + net/mac80211/scan.c | 8 +- + net/mac80211/sta_info.c | 9 +- + net/mac80211/tdls.c | 40 +- + net/mac80211/trace.h | 12 + + net/mac80211/tx.c | 44 +- + net/mac80211/util.c | 5 +- + net/mac80211/vht.c | 30 +- + net/mac80211/wpa.c | 26 +- + net/netfilter/nft_hash.c | 4 +- + net/netlink/af_netlink.c | 3 +- + net/rfkill/core.c | 36 +- + net/sctp/proc.c | 3 +- + net/wireless/core.c | 7 + + net/wireless/nl80211.c | 117 +++ + net/wireless/scan.c | 2 + + net/wireless/sme.c | 2 + + 35 files changed, 792 insertions(+), 737 deletions(-) +Merging rdma/for-next (520a07bff6fb Merge branches 'i40iw', 'sriov' and 'hfi1' into k.o/for-4.6) +$ git merge rdma/for-next +Recorded preimage for 'drivers/staging/rdma/hfi1/mad.c' +Recorded preimage for 'drivers/staging/rdma/hfi1/user_pages.c' +Recorded preimage for 'drivers/staging/rdma/hfi1/verbs.c' +Auto-merging net/core/rtnetlink.c +Auto-merging include/uapi/linux/if_link.h +Auto-merging include/linux/netdevice.h +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging include/linux/mlx5/driver.h +Auto-merging include/linux/mlx5/device.h +Auto-merging drivers/staging/rdma/hfi1/verbs.c +CONFLICT (content): Merge conflict in drivers/staging/rdma/hfi1/verbs.c +Auto-merging drivers/staging/rdma/hfi1/user_sdma.c +Auto-merging drivers/staging/rdma/hfi1/user_pages.c +CONFLICT (content): Merge conflict in drivers/staging/rdma/hfi1/user_pages.c +Auto-merging drivers/staging/rdma/hfi1/ud.c +Auto-merging drivers/staging/rdma/hfi1/platform.h +Auto-merging drivers/staging/rdma/hfi1/pio_copy.c +Auto-merging drivers/staging/rdma/hfi1/pcie.c +CONFLICT (modify/delete): drivers/staging/rdma/hfi1/mr.c deleted in rdma/for-next and modified in HEAD. Version HEAD of drivers/staging/rdma/hfi1/mr.c left in tree. +Auto-merging drivers/staging/rdma/hfi1/mad.c +CONFLICT (content): Merge conflict in drivers/staging/rdma/hfi1/mad.c +CONFLICT (modify/delete): drivers/staging/rdma/hfi1/keys.c deleted in rdma/for-next and modified in HEAD. Version HEAD of drivers/staging/rdma/hfi1/keys.c left in tree. +Auto-merging drivers/staging/rdma/hfi1/init.c +Auto-merging drivers/staging/rdma/hfi1/hfi.h +Auto-merging drivers/staging/rdma/hfi1/file_ops.c +Auto-merging drivers/staging/rdma/hfi1/efivar.c +Auto-merging drivers/staging/rdma/hfi1/driver.c +Auto-merging drivers/staging/rdma/hfi1/diag.c +Auto-merging drivers/staging/rdma/hfi1/chip_registers.h +Auto-merging drivers/staging/rdma/hfi1/chip.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/cmd.c +Auto-merging drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h +Auto-merging drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +Auto-merging drivers/net/ethernet/intel/i40e/i40e_type.h +Auto-merging drivers/net/ethernet/intel/i40e/i40e_main.c +Auto-merging drivers/net/ethernet/intel/i40e/i40e.h +Auto-merging drivers/infiniband/sw/rdmavt/srq.c +Auto-merging drivers/infiniband/sw/rdmavt/mmap.c +Auto-merging drivers/infiniband/sw/rdmavt/mcast.c +Auto-merging drivers/infiniband/sw/rdmavt/cq.c +Removing drivers/infiniband/hw/qib/qib_verbs_mcast.c +Removing drivers/infiniband/hw/qib/qib_srq.c +Removing drivers/infiniband/hw/qib/qib_mr.c +Removing drivers/infiniband/hw/qib/qib_mmap.c +Removing drivers/infiniband/hw/qib/qib_cq.c +Auto-merging drivers/infiniband/hw/mlx5/main.c +Auto-merging drivers/infiniband/core/sa_query.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/rdma/hfi1/keys.c drivers/staging/rdma/hfi1/mr.c +drivers/staging/rdma/hfi1/keys.c: needs merge +drivers/staging/rdma/hfi1/mr.c: needs merge +rm 'drivers/staging/rdma/hfi1/keys.c' +rm 'drivers/staging/rdma/hfi1/mr.c' +$ git commit -v -a +Recorded resolution for 'drivers/staging/rdma/hfi1/mad.c'. +Recorded resolution for 'drivers/staging/rdma/hfi1/user_pages.c'. +Recorded resolution for 'drivers/staging/rdma/hfi1/verbs.c'. +[master b3893760bfe5] Merge remote-tracking branch 'rdma/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/infiniband/sysfs.txt | 3 +- + MAINTAINERS | 16 + + drivers/infiniband/Kconfig | 3 + + drivers/infiniband/Makefile | 1 + + drivers/infiniband/core/device.c | 15 +- + drivers/infiniband/core/sa_query.c | 5 + + drivers/infiniband/core/uverbs_cmd.c | 17 +- + drivers/infiniband/core/verbs.c | 40 + + drivers/infiniband/hw/Makefile | 1 + + drivers/infiniband/hw/i40iw/Kconfig | 7 + + drivers/infiniband/hw/i40iw/Makefile | 9 + + drivers/infiniband/hw/i40iw/i40iw.h | 570 +++ + drivers/infiniband/hw/i40iw/i40iw_cm.c | 4141 +++++++++++++++++ + drivers/infiniband/hw/i40iw/i40iw_cm.h | 456 ++ + drivers/infiniband/hw/i40iw/i40iw_ctrl.c | 4743 ++++++++++++++++++++ + drivers/infiniband/hw/i40iw/i40iw_d.h | 1713 +++++++ + drivers/infiniband/hw/i40iw/i40iw_hmc.c | 821 ++++ + drivers/infiniband/hw/i40iw/i40iw_hmc.h | 241 + + drivers/infiniband/hw/i40iw/i40iw_hw.c | 730 +++ + drivers/infiniband/hw/i40iw/i40iw_main.c | 1910 ++++++++ + drivers/infiniband/hw/i40iw/i40iw_osdep.h | 215 + + drivers/infiniband/hw/i40iw/i40iw_p.h | 106 + + drivers/infiniband/hw/i40iw/i40iw_pble.c | 618 +++ + drivers/infiniband/hw/i40iw/i40iw_pble.h | 131 + + drivers/infiniband/hw/i40iw/i40iw_puda.c | 1436 ++++++ + drivers/infiniband/hw/i40iw/i40iw_puda.h | 183 + + drivers/infiniband/hw/i40iw/i40iw_register.h | 1030 +++++ + drivers/infiniband/hw/i40iw/i40iw_status.h | 100 + + drivers/infiniband/hw/i40iw/i40iw_type.h | 1312 ++++++ + drivers/infiniband/hw/i40iw/i40iw_ucontext.h | 107 + + drivers/infiniband/hw/i40iw/i40iw_uk.c | 1204 +++++ + drivers/infiniband/hw/i40iw/i40iw_user.h | 442 ++ + drivers/infiniband/hw/i40iw/i40iw_utils.c | 1270 ++++++ + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 2437 ++++++++++ + drivers/infiniband/hw/i40iw/i40iw_verbs.h | 173 + + drivers/infiniband/hw/i40iw/i40iw_vf.c | 85 + + drivers/infiniband/hw/i40iw/i40iw_vf.h | 62 + + drivers/infiniband/hw/i40iw/i40iw_virtchnl.c | 748 +++ + drivers/infiniband/hw/i40iw/i40iw_virtchnl.h | 124 + + drivers/infiniband/hw/mlx5/Makefile | 2 +- + drivers/infiniband/hw/mlx5/ib_virt.c | 194 + + drivers/infiniband/hw/mlx5/mad.c | 2 +- + drivers/infiniband/hw/mlx5/main.c | 12 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 8 + + drivers/infiniband/hw/qib/Kconfig | 2 +- + drivers/infiniband/hw/qib/Makefile | 10 +- + drivers/infiniband/hw/qib/qib.h | 33 +- + drivers/infiniband/hw/qib/qib_common.h | 3 - + drivers/infiniband/hw/qib/qib_cq.c | 545 --- + drivers/infiniband/hw/qib/qib_driver.c | 71 +- + drivers/infiniband/hw/qib/qib_iba6120.c | 8 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 6 +- + drivers/infiniband/hw/qib/qib_init.c | 25 +- + drivers/infiniband/hw/qib/qib_intr.c | 2 +- + drivers/infiniband/hw/qib/qib_keys.c | 186 +- + drivers/infiniband/hw/qib/qib_mad.c | 338 +- + drivers/infiniband/hw/qib/qib_mmap.c | 174 - + drivers/infiniband/hw/qib/qib_mr.c | 490 -- + drivers/infiniband/hw/qib/qib_qp.c | 1178 +---- + drivers/infiniband/hw/qib/qib_rc.c | 409 +- + drivers/infiniband/hw/qib/qib_ruc.c | 191 +- + drivers/infiniband/hw/qib/qib_sdma.c | 41 +- + drivers/infiniband/hw/qib/qib_srq.c | 380 -- + drivers/infiniband/hw/qib/qib_sysfs.c | 85 +- + drivers/infiniband/hw/qib/qib_uc.c | 79 +- + drivers/infiniband/hw/qib/qib_ud.c | 142 +- + drivers/infiniband/hw/qib/qib_verbs.c | 1223 ++--- + drivers/infiniband/hw/qib/qib_verbs.h | 812 +--- + drivers/infiniband/hw/qib/qib_verbs_mcast.c | 363 -- + drivers/infiniband/sw/Makefile | 1 + + drivers/infiniband/sw/rdmavt/Kconfig | 6 + + drivers/infiniband/sw/rdmavt/Makefile | 13 + + drivers/infiniband/sw/rdmavt/ah.c | 196 + + drivers/infiniband/sw/rdmavt/ah.h | 59 + + .../rdma/hfi1 => infiniband/sw/rdmavt}/cq.c | 325 +- + drivers/infiniband/sw/rdmavt/cq.h | 64 + + drivers/infiniband/sw/rdmavt/dma.c | 184 + + drivers/infiniband/sw/rdmavt/dma.h | 53 + + drivers/infiniband/sw/rdmavt/mad.c | 171 + + drivers/infiniband/sw/rdmavt/mad.h | 60 + + .../verbs_mcast.c => infiniband/sw/rdmavt/mcast.c} | 262 +- + drivers/infiniband/sw/rdmavt/mcast.h | 58 + + .../rdma/hfi1 => infiniband/sw/rdmavt}/mmap.c | 142 +- + drivers/infiniband/sw/rdmavt/mmap.h | 63 + + drivers/infiniband/sw/rdmavt/mr.c | 830 ++++ + drivers/infiniband/sw/rdmavt/mr.h | 92 + + drivers/infiniband/sw/rdmavt/pd.c | 119 + + drivers/infiniband/sw/rdmavt/pd.h | 58 + + drivers/infiniband/sw/rdmavt/qp.c | 1696 +++++++ + drivers/infiniband/sw/rdmavt/qp.h | 69 + + .../rdma/hfi1 => infiniband/sw/rdmavt}/srq.c | 204 +- + drivers/infiniband/sw/rdmavt/srq.h | 62 + + drivers/infiniband/sw/rdmavt/trace.c | 49 + + drivers/infiniband/sw/rdmavt/trace.h | 187 + + drivers/infiniband/sw/rdmavt/vt.c | 873 ++++ + drivers/infiniband/sw/rdmavt/vt.h | 104 + + drivers/infiniband/ulp/ipoib/ipoib.h | 2 +- + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 27 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 65 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 2 +- + drivers/net/ethernet/intel/i40e/Makefile | 1 + + drivers/net/ethernet/intel/i40e/i40e.h | 22 + + drivers/net/ethernet/intel/i40e/i40e_client.c | 1012 +++++ + drivers/net/ethernet/intel/i40e/i40e_client.h | 232 + + drivers/net/ethernet/intel/i40e/i40e_main.c | 115 +- + drivers/net/ethernet/intel/i40e/i40e_type.h | 3 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl.h | 34 + + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 247 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 4 + + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 6 + + drivers/net/ethernet/mellanox/mlx5/core/fw.c | 57 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 24 +- + drivers/net/ethernet/mellanox/mlx5/core/vport.c | 72 +- + drivers/staging/rdma/hfi1/Kconfig | 13 +- + drivers/staging/rdma/hfi1/Makefile | 10 +- + drivers/staging/rdma/hfi1/affinity.c | 430 ++ + drivers/staging/rdma/hfi1/affinity.h | 91 + + drivers/staging/rdma/hfi1/aspm.h | 309 ++ + drivers/staging/rdma/hfi1/chip.c | 2456 +++++----- + drivers/staging/rdma/hfi1/chip.h | 151 +- + drivers/staging/rdma/hfi1/chip_registers.h | 9 +- + drivers/staging/rdma/hfi1/common.h | 12 +- + drivers/staging/rdma/hfi1/debugfs.c | 332 +- + drivers/staging/rdma/hfi1/debugfs.h | 5 +- + drivers/staging/rdma/hfi1/device.c | 5 +- + drivers/staging/rdma/hfi1/device.h | 5 +- + drivers/staging/rdma/hfi1/diag.c | 103 +- + drivers/staging/rdma/hfi1/dma.c | 17 +- + drivers/staging/rdma/hfi1/driver.c | 344 +- + drivers/staging/rdma/hfi1/efivar.c | 5 +- + drivers/staging/rdma/hfi1/efivar.h | 5 +- + drivers/staging/rdma/hfi1/eprom.c | 117 +- + drivers/staging/rdma/hfi1/eprom.h | 7 +- + drivers/staging/rdma/hfi1/file_ops.c | 552 +-- + drivers/staging/rdma/hfi1/firmware.c | 587 ++- + drivers/staging/rdma/hfi1/hfi.h | 251 +- + drivers/staging/rdma/hfi1/init.c | 183 +- + drivers/staging/rdma/hfi1/intr.c | 29 +- + drivers/staging/rdma/hfi1/iowait.h | 126 +- + drivers/staging/rdma/hfi1/keys.c | 356 -- + drivers/staging/rdma/hfi1/mad.c | 1005 +++-- + drivers/staging/rdma/hfi1/mad.h | 14 +- + drivers/staging/rdma/hfi1/mmu_rb.c | 292 ++ + drivers/staging/rdma/hfi1/mmu_rb.h | 73 + + drivers/staging/rdma/hfi1/mr.c | 473 -- + drivers/staging/rdma/hfi1/opa_compat.h | 20 +- + drivers/staging/rdma/hfi1/pcie.c | 192 +- + drivers/staging/rdma/hfi1/pio.c | 365 +- + drivers/staging/rdma/hfi1/pio.h | 118 +- + drivers/staging/rdma/hfi1/pio_copy.c | 67 +- + drivers/staging/rdma/hfi1/platform.c | 893 ++++ + .../rdma/hfi1/{platform_config.h => platform.h} | 58 +- + drivers/staging/rdma/hfi1/qp.c | 1642 ++----- + drivers/staging/rdma/hfi1/qp.h | 198 +- + drivers/staging/rdma/hfi1/qsfp.c | 270 +- + drivers/staging/rdma/hfi1/qsfp.h | 57 +- + drivers/staging/rdma/hfi1/rc.c | 765 ++-- + drivers/staging/rdma/hfi1/ruc.c | 373 +- + drivers/staging/rdma/hfi1/sdma.c | 365 +- + drivers/staging/rdma/hfi1/sdma.h | 116 +- + drivers/staging/rdma/hfi1/sdma_txreq.h | 135 + + drivers/staging/rdma/hfi1/sysfs.c | 136 +- + drivers/staging/rdma/hfi1/trace.c | 53 +- + drivers/staging/rdma/hfi1/trace.h | 1477 +++--- + drivers/staging/rdma/hfi1/twsi.c | 205 +- + drivers/staging/rdma/hfi1/twsi.h | 9 +- + drivers/staging/rdma/hfi1/uc.c | 164 +- + drivers/staging/rdma/hfi1/ud.c | 248 +- + drivers/staging/rdma/hfi1/user_exp_rcv.c | 1044 +++++ + drivers/staging/rdma/hfi1/user_exp_rcv.h | 13 +- + drivers/staging/rdma/hfi1/user_pages.c | 74 +- + drivers/staging/rdma/hfi1/user_sdma.c | 621 +-- + drivers/staging/rdma/hfi1/user_sdma.h | 11 +- + drivers/staging/rdma/hfi1/verbs.c | 1663 +++---- + drivers/staging/rdma/hfi1/verbs.h | 824 +--- + drivers/staging/rdma/hfi1/verbs_txreq.c | 149 + + drivers/staging/rdma/hfi1/verbs_txreq.h | 116 + + include/linux/mlx5/device.h | 6 + + include/linux/mlx5/driver.h | 8 +- + include/linux/mlx5/mlx5_ifc.h | 37 +- + include/linux/mlx5/vport.h | 7 +- + include/linux/netdevice.h | 3 + + include/rdma/ib_verbs.h | 29 +- + include/rdma/opa_port_info.h | 2 +- + include/rdma/rdma_vt.h | 481 ++ + include/rdma/rdmavt_cq.h | 99 + + include/rdma/rdmavt_mr.h | 139 + + include/rdma/rdmavt_qp.h | 446 ++ + include/uapi/linux/if_link.h | 7 + + include/uapi/rdma/hfi/hfi1_user.h | 14 +- + include/uapi/rdma/rdma_netlink.h | 1 + + net/core/rtnetlink.c | 36 + + 192 files changed, 49074 insertions(+), 15213 deletions(-) + create mode 100644 drivers/infiniband/hw/i40iw/Kconfig + create mode 100644 drivers/infiniband/hw/i40iw/Makefile + create mode 100644 drivers/infiniband/hw/i40iw/i40iw.h + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_cm.c + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_cm.h + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_ctrl.c + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_d.h + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_hmc.c + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_hmc.h + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_hw.c + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_main.c + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_osdep.h + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_p.h + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_pble.c + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_pble.h + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_puda.c + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_puda.h + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_register.h + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_status.h + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_type.h + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_ucontext.h + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_uk.c + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_user.h + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_utils.c + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_verbs.c + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_verbs.h + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_vf.c + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_vf.h + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_virtchnl.c + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_virtchnl.h + create mode 100644 drivers/infiniband/hw/mlx5/ib_virt.c + delete mode 100644 drivers/infiniband/hw/qib/qib_cq.c + delete mode 100644 drivers/infiniband/hw/qib/qib_mmap.c + delete mode 100644 drivers/infiniband/hw/qib/qib_mr.c + delete mode 100644 drivers/infiniband/hw/qib/qib_srq.c + delete mode 100644 drivers/infiniband/hw/qib/qib_verbs_mcast.c + create mode 100644 drivers/infiniband/sw/Makefile + create mode 100644 drivers/infiniband/sw/rdmavt/Kconfig + create mode 100644 drivers/infiniband/sw/rdmavt/Makefile + create mode 100644 drivers/infiniband/sw/rdmavt/ah.c + create mode 100644 drivers/infiniband/sw/rdmavt/ah.h + rename drivers/{staging/rdma/hfi1 => infiniband/sw/rdmavt}/cq.c (72%) + create mode 100644 drivers/infiniband/sw/rdmavt/cq.h + create mode 100644 drivers/infiniband/sw/rdmavt/dma.c + create mode 100644 drivers/infiniband/sw/rdmavt/dma.h + create mode 100644 drivers/infiniband/sw/rdmavt/mad.c + create mode 100644 drivers/infiniband/sw/rdmavt/mad.h + rename drivers/{staging/rdma/hfi1/verbs_mcast.c => infiniband/sw/rdmavt/mcast.c} (58%) + create mode 100644 drivers/infiniband/sw/rdmavt/mcast.h + rename drivers/{staging/rdma/hfi1 => infiniband/sw/rdmavt}/mmap.c (55%) + create mode 100644 drivers/infiniband/sw/rdmavt/mmap.h + create mode 100644 drivers/infiniband/sw/rdmavt/mr.c + create mode 100644 drivers/infiniband/sw/rdmavt/mr.h + create mode 100644 drivers/infiniband/sw/rdmavt/pd.c + create mode 100644 drivers/infiniband/sw/rdmavt/pd.h + create mode 100644 drivers/infiniband/sw/rdmavt/qp.c + create mode 100644 drivers/infiniband/sw/rdmavt/qp.h + rename drivers/{staging/rdma/hfi1 => infiniband/sw/rdmavt}/srq.c (64%) + create mode 100644 drivers/infiniband/sw/rdmavt/srq.h + create mode 100644 drivers/infiniband/sw/rdmavt/trace.c + create mode 100644 drivers/infiniband/sw/rdmavt/trace.h + create mode 100644 drivers/infiniband/sw/rdmavt/vt.c + create mode 100644 drivers/infiniband/sw/rdmavt/vt.h + create mode 100644 drivers/net/ethernet/intel/i40e/i40e_client.c + create mode 100644 drivers/net/ethernet/intel/i40e/i40e_client.h + create mode 100644 drivers/staging/rdma/hfi1/affinity.c + create mode 100644 drivers/staging/rdma/hfi1/affinity.h + create mode 100644 drivers/staging/rdma/hfi1/aspm.h + delete mode 100644 drivers/staging/rdma/hfi1/keys.c + create mode 100644 drivers/staging/rdma/hfi1/mmu_rb.c + create mode 100644 drivers/staging/rdma/hfi1/mmu_rb.h + delete mode 100644 drivers/staging/rdma/hfi1/mr.c + create mode 100644 drivers/staging/rdma/hfi1/platform.c + rename drivers/staging/rdma/hfi1/{platform_config.h => platform.h} (89%) + create mode 100644 drivers/staging/rdma/hfi1/sdma_txreq.h + create mode 100644 drivers/staging/rdma/hfi1/user_exp_rcv.c + create mode 100644 drivers/staging/rdma/hfi1/verbs_txreq.c + create mode 100644 drivers/staging/rdma/hfi1/verbs_txreq.h + create mode 100644 include/rdma/rdma_vt.h + create mode 100644 include/rdma/rdmavt_cq.h + create mode 100644 include/rdma/rdmavt_mr.h + create mode 100644 include/rdma/rdmavt_qp.h +Merging mtd/master (9df4f913eb39 MAINTAINERS: add a maintainer for the NAND subsystem) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (6871c1b96de8 mtd: nand: remove kerneldoc for removed function parameter) +$ git merge l2-mtd/master +Auto-merging fs/jffs2/gc.c +Auto-merging drivers/staging/mt29f_spinand/mt29f_spinand.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/atmel-nand.txt | 31 +- + .../devicetree/bindings/mtd/fsl-quadspi.txt | 5 +- + .../devicetree/bindings/mtd/qcom_nandc.txt | 86 + + arch/arm/plat-samsung/devs.c | 9 - + arch/mips/include/asm/mach-jz4740/jz4740_nand.h | 2 - + drivers/memory/fsl_ifc.c | 2 +- + drivers/mtd/Kconfig | 2 +- + drivers/mtd/bcm47xxpart.c | 42 +- + drivers/mtd/bcm63xxpart.c | 182 +- + drivers/mtd/devices/docg3.c | 5 +- + drivers/mtd/devices/mtdram.c | 5 +- + drivers/mtd/mtdpart.c | 5 +- + drivers/mtd/mtdswap.c | 24 +- + drivers/mtd/nand/Kconfig | 10 + + drivers/mtd/nand/Makefile | 1 + + drivers/mtd/nand/atmel_nand.c | 89 +- + drivers/mtd/nand/atmel_nand_ecc.h | 9 +- + drivers/mtd/nand/atmel_nand_nfc.h | 3 +- + drivers/mtd/nand/brcmnand/brcmnand.c | 42 +- + drivers/mtd/nand/cafe_nand.c | 2 +- + drivers/mtd/nand/diskonchip.c | 2 +- + drivers/mtd/nand/docg4.c | 3 +- + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 73 +- + drivers/mtd/nand/hisi504_nand.c | 1 - + drivers/mtd/nand/jz4740_nand.c | 3 - + drivers/mtd/nand/lpc32xx_mlc.c | 2 +- + drivers/mtd/nand/mpc5121_nfc.c | 7 +- + drivers/mtd/nand/nand_base.c | 78 +- + drivers/mtd/nand/nand_bbt.c | 2 - + drivers/mtd/nand/nand_bch.c | 27 +- + drivers/mtd/nand/nand_ids.c | 4 +- + drivers/mtd/nand/nuc900_nand.c | 2 +- + drivers/mtd/nand/omap2.c | 28 +- + drivers/mtd/nand/plat_nand.c | 1 - + drivers/mtd/nand/pxa3xx_nand.c | 191 +- + drivers/mtd/nand/qcom_nandc.c | 2223 ++++++++++++++++++++ + drivers/mtd/nand/s3c2410.c | 3 - + drivers/mtd/nand/sunxi_nand.c | 287 ++- + drivers/mtd/nand/vf610_nfc.c | 2 - + drivers/mtd/onenand/onenand_base.c | 32 +- + drivers/mtd/onenand/onenand_bbt.c | 5 +- + drivers/mtd/spi-nor/Kconfig | 3 +- + drivers/mtd/spi-nor/fsl-quadspi.c | 167 +- + drivers/mtd/spi-nor/mtk-quadspi.c | 4 +- + drivers/mtd/spi-nor/spi-nor.c | 246 ++- + drivers/mtd/tests/oobtest.c | 49 +- + drivers/staging/mt29f_spinand/mt29f_spinand.c | 1 - + drivers/staging/mt29f_spinand/mt29f_spinand.h | 1 - + fs/jffs2/gc.c | 64 +- + fs/jffs2/jffs2_fs_sb.h | 2 +- + fs/jffs2/nodemgmt.c | 4 +- + fs/jffs2/wbuf.c | 6 +- + include/linux/mtd/bbm.h | 1 - + include/linux/mtd/inftl.h | 1 - + include/linux/mtd/map.h | 7 +- + include/linux/mtd/mtd.h | 6 +- + include/linux/mtd/nand.h | 10 +- + include/linux/mtd/nand_bch.h | 8 +- + include/linux/mtd/nftl.h | 1 - + include/linux/mtd/spi-nor.h | 2 + + include/linux/platform_data/mtd-nand-s3c2410.h | 1 - + 61 files changed, 3524 insertions(+), 592 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/qcom_nandc.txt + create mode 100644 drivers/mtd/nand/qcom_nandc.c +Merging crypto/master (34074205bb9f crypto: qat - remove redundant arbiter configuration) +$ git merge crypto/master +Already up-to-date. +Merging drm/drm-next (568d7c764ae0 drm/amdgpu: release_pages requires linux/pagemap.h) +$ git merge drm/drm-next +Already up-to-date. +Merging drm-panel/drm/panel/for-next (c8a3b2ae0713 drm/bridge: Make (pre/post) enable/disable callbacks optional) +$ git merge drm-panel/drm/panel/for-next +Already up-to-date. +Merging drm-intel/for-linux-next (94669e6ba1ad drm/i915: Handle -EDEADLK in drm_atomic_commit from load-detect.) +$ git merge drm-intel/for-linux-next +Already up-to-date. +Merging drm-tegra/drm/tegra/for-next (341917fe2b62 gpu: host1x: Use a signed return type for do_relocs()) +$ git merge drm-tegra/drm/tegra/for-next +Already up-to-date. +Merging drm-misc/topic/drm-misc (b47bcb93bbf2 dma-buf/fence: fix fence_is_later v2) +$ git merge drm-misc/topic/drm-misc +Auto-merging include/linux/fence.h +Auto-merging drivers/staging/android/ion/ion.c +Auto-merging drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c +Auto-merging drivers/gpu/drm/drm_atomic_helper.c +Auto-merging drivers/gpu/drm/drm_atomic.c +Merge made by the 'recursive' strategy. + Documentation/dma-buf-sharing.txt | 11 ++++++----- + drivers/dma-buf/dma-buf.c | 19 ++++++++++++------- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 2 +- + drivers/gpu/drm/drm_atomic.c | 1 - + drivers/gpu/drm/drm_atomic_helper.c | 14 ++++++++------ + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 15 +++++---------- + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 5 +++-- + drivers/gpu/drm/udl/udl_fb.c | 4 ++-- + drivers/staging/android/ion/ion.c | 6 ++++-- + include/linux/dma-buf.h | 6 +++--- + include/linux/fence.h | 2 +- + 11 files changed, 45 insertions(+), 40 deletions(-) +Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid) +$ git merge drm-exynos/exynos-drm/for-next +Already up-to-date. +Merging drm-msm/msm-next (fcda50c8f484 drm/msm: rename hdmi symbols) +$ git merge drm-msm/msm-next +Already up-to-date. +Merging hdlcd/for-upstream/hdlcd (8bb912e606b7 arm64: Juno: Add HDLCD support to the Juno boards.) +$ git merge hdlcd/for-upstream/hdlcd +Resolved 'arch/arm64/boot/dts/arm/juno-base.dtsi' using previous resolution. +Auto-merging arch/arm64/boot/dts/arm/juno-base.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/arm/juno-base.dtsi +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3a4c7623ef65] Merge remote-tracking branch 'hdlcd/for-upstream/hdlcd' +$ git diff -M --stat --summary HEAD^.. +Merging drm-vc4/drm-vc4-next (90d7116061f8 drm/vc4: Recognize a more specific compatible string for V3D.) +$ git merge drm-vc4/drm-vc4-next +Already up-to-date. +Merging kbuild/for-next (2468fc97cc45 Merge branch 'kbuild/kbuild' into kbuild/for-next) +$ git merge kbuild/for-next +Auto-merging scripts/link-vmlinux.sh +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 3 + + include/linux/compiler-clang.h | 5 + + scripts/Kbuild.include | 6 +- + scripts/Makefile.dtbinst | 2 - + scripts/basic/fixdep.c | 6 +- + scripts/coccinelle/api/pm_runtime.cocci | 2 +- + scripts/coccinelle/api/setup_timer.cocci | 199 ++++++++++++++++++++++ + scripts/coccinelle/iterators/use_after_iter.cocci | 2 +- + scripts/coccinelle/misc/array_size.cocci | 2 +- + scripts/coccinelle/misc/badty.cocci | 2 +- + scripts/coccinelle/misc/bugon.cocci | 2 +- + scripts/kconfig/Makefile | 4 +- + scripts/kconfig/confdata.c | 12 +- + scripts/link-vmlinux.sh | 7 +- + scripts/package/mkspec | 13 +- + scripts/tags.sh | 2 + + 16 files changed, 245 insertions(+), 24 deletions(-) + create mode 100644 scripts/coccinelle/api/setup_timer.cocci +Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too) +$ git merge kconfig/for-next +Already up-to-date. +Merging regmap/for-next (d105141b9b4b Merge remote-tracking branch 'regmap/fix/doc' into regmap-linus) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regmap/regmap.txt | 59 +++++++--------------- + 1 file changed, 19 insertions(+), 40 deletions(-) +Merging sound/for-next (c64c1437afb1 ALSA: hda - Fix missing ELD update at unplugging) +$ git merge sound/for-next +Already up-to-date. +Merging sound-asoc/for-next (0a63eacf2fab Merge remote-tracking branches 'asoc/fix/cs35l32', 'asoc/fix/rt5616' and 'asoc/fix/rt5640' into asoc-linus) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + sound/hda/ext/hdac_ext_stream.c | 5 ++--- + sound/soc/codecs/Kconfig | 1 + + sound/soc/codecs/cs35l32.c | 17 +++++++++++++---- + sound/soc/codecs/rt5640.c | 2 +- + sound/soc/codecs/rt5640.h | 36 +++++++++++++++++------------------ + sound/soc/intel/Kconfig | 1 - + sound/soc/intel/skylake/skl-sst-dsp.c | 5 +++++ + sound/soc/intel/skylake/skl.c | 17 ++++++++++------- + sound/soc/soc-dapm.c | 7 +++++++ + 9 files changed, 57 insertions(+), 34 deletions(-) +Merging modules/modules-next (b37a05c083c8 Merge branch 'akpm' (patches from Andrew)) +$ git merge modules/modules-next +Already up-to-date. +Merging input/next (82be788c96ed Input: synaptics - handle spurious release of trackstick buttons, again) +$ git merge input/next +Merge made by the 'recursive' strategy. + drivers/input/misc/ims-pcu.c | 4 + + drivers/input/mouse/byd.c | 565 +++++++++++++++++++++----------- + drivers/input/mouse/psmouse-base.c | 2 +- + drivers/input/mouse/synaptics.c | 5 +- + drivers/input/rmi4/rmi_driver.c | 5 +- + drivers/input/touchscreen/melfas_mip4.c | 28 +- + 6 files changed, 405 insertions(+), 204 deletions(-) +Merging block/for-next (8fe39574cfce Merge branch 'for-linus' into for-next) +$ git merge block/for-next +Merge made by the 'recursive' strategy. + block/blk-mq-sysfs.c | 6 ++- + block/blk-mq.c | 3 +- + drivers/block/mtip32xx/mtip32xx.c | 4 +- + drivers/block/null_blk.c | 3 +- + drivers/lightnvm/core.c | 7 +++ + drivers/lightnvm/gennvm.c | 84 ++++++++++++++++++++++++++++- + drivers/lightnvm/gennvm.h | 6 +++ + drivers/lightnvm/rrpc.c | 109 +++++++++++++++++++++++++++----------- + drivers/lightnvm/rrpc.h | 1 + + drivers/nvme/host/lightnvm.c | 17 +++++- + fs/fs-writeback.c | 37 ++++++++----- + include/linux/blk-mq.h | 14 ----- + include/linux/lightnvm.h | 14 +++++ + 13 files changed, 238 insertions(+), 67 deletions(-) +Merging device-mapper/for-next (98dbc9c6c616 dm: fix rq_end_stats() NULL pointer in dm_requeue_original_request()) +$ git merge device-mapper/for-next +Already up-to-date. +Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards) +$ git merge pcmcia/master +Already up-to-date. +Merging mmc-uh/next (64e5cd723120 mmc: sdhci-of-at91: fix wake-up issue when using runtime pm) +$ git merge mmc-uh/next +Already up-to-date. +Merging md/for-next (de24075022dc md: fix a trivial typo in comments) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + drivers/md/md.c | 2 +- + drivers/md/raid1.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging mfd/for-mfd-next (0343b2f4e4a5 mfd: intel-lpss: Pass I2C configuration via properties on BXT) +$ git merge mfd/for-mfd-next +Already up-to-date. +Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path) +$ git merge backlight/for-backlight-next +Already up-to-date. +Merging battery/master (0df6e32b0e36 power: pm2301-charger: use __maybe_unused to hide pm functions) +$ git merge battery/master +Already up-to-date. +Merging omap_dss2/for-next (32ad61951574 video: fbdev: sis: remove unused variable) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (1d64efa04292 Merge remote-tracking branch 'regulator/fix/gpio' into regulator-linus) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + drivers/regulator/gpio-regulator.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging security/next (88a1b564a20e Merge tag 'keys-next-20160303' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next) +$ git merge security/next +Already up-to-date. +Merging integrity/next (95ee08fa373b ima: require signed IMA policy) +$ git merge integrity/next +Already up-to-date. +Merging keys/keys-next (88a1b564a20e Merge tag 'keys-next-20160303' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next) +$ git merge keys/keys-next +Already up-to-date. +Merging selinux/next (88a1b564a20e Merge tag 'keys-next-20160303' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next) +$ git merge selinux/next +Already up-to-date. +Merging tpmdd/next (59f95b842ad0 Merge branch 'master' into next) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + drivers/char/tpm/st33zp24/Kconfig | 11 +- + drivers/char/tpm/st33zp24/i2c.c | 76 +++++++++--- + drivers/char/tpm/st33zp24/spi.c | 190 +++++++++++++++++------------ + drivers/char/tpm/st33zp24/st33zp24.c | 2 +- + drivers/char/tpm/st33zp24/st33zp24.h | 2 +- + drivers/char/tpm/tpm-chip.c | 214 +++++++++++++++++++++++---------- + drivers/char/tpm/tpm-dev.c | 15 ++- + drivers/char/tpm/tpm-interface.c | 50 ++++---- + drivers/char/tpm/tpm-sysfs.c | 11 +- + drivers/char/tpm/tpm.h | 25 ++-- + drivers/char/tpm/tpm2-cmd.c | 8 +- + drivers/char/tpm/tpm_atmel.c | 14 +-- + drivers/char/tpm/tpm_eventlog.c | 2 +- + drivers/char/tpm/tpm_eventlog.h | 4 +- + drivers/char/tpm/tpm_i2c_atmel.c | 16 +-- + drivers/char/tpm/tpm_i2c_infineon.c | 6 +- + drivers/char/tpm/tpm_i2c_nuvoton.c | 24 ++-- + drivers/char/tpm/tpm_infineon.c | 22 ++-- + drivers/char/tpm/tpm_nsc.c | 20 +-- + drivers/char/tpm/tpm_tis.c | 18 +-- + include/linux/platform_data/st33zp24.h | 2 +- + 21 files changed, 458 insertions(+), 274 deletions(-) +Merging watchdog/master (d1ed3ba4e3d7 watchdog: Ensure that wdd is not dereferenced if NULL) +$ git merge watchdog/master +Already up-to-date. +Merging iommu/next (70cf769c5ba2 Merge branches 'arm/rockchip', 'arm/exynos', 'arm/smmu', 'arm/mediatek', 'arm/io-pgtable', 'arm/renesas' and 'core' into next) +$ git merge iommu/next +Resolved 'arch/arm64/boot/dts/mediatek/mt8173.dtsi' using previous resolution. +Auto-merging arch/arm64/boot/dts/mediatek/mt8173.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/mediatek/mt8173.dtsi +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ab52917f1117] Merge remote-tracking branch 'iommu/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/iommu/mediatek,iommu.txt | 68 ++ + .../bindings/iommu/renesas,ipmmu-vmsa.txt | 15 +- + .../devicetree/bindings/iommu/samsung,sysmmu.txt | 22 +- + .../memory-controllers/mediatek,smi-common.txt | 24 + + .../memory-controllers/mediatek,smi-larb.txt | 25 + + MAINTAINERS | 8 + + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 81 ++ + drivers/iommu/Kconfig | 42 +- + drivers/iommu/Makefile | 2 + + drivers/iommu/arm-smmu-v3.c | 50 +- + drivers/iommu/arm-smmu.c | 79 +- + drivers/iommu/exynos-iommu.c | 608 +++++++++------ + drivers/iommu/io-pgtable-arm-v7s.c | 846 +++++++++++++++++++++ + drivers/iommu/io-pgtable-arm.c | 34 +- + drivers/iommu/io-pgtable.c | 5 +- + drivers/iommu/io-pgtable.h | 53 +- + drivers/iommu/iommu.c | 3 +- + drivers/iommu/mtk_iommu.c | 736 ++++++++++++++++++ + drivers/iommu/of_iommu.c | 1 + + drivers/iommu/rockchip-iommu.c | 214 ++++-- + drivers/memory/Kconfig | 8 + + drivers/memory/Makefile | 1 + + drivers/memory/mtk-smi.c | 273 +++++++ + include/dt-bindings/memory/mt8173-larb-port.h | 111 +++ + include/soc/mediatek/smi.h | 58 ++ + 25 files changed, 2953 insertions(+), 414 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iommu/mediatek,iommu.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/mediatek,smi-common.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.txt + create mode 100644 drivers/iommu/io-pgtable-arm-v7s.c + create mode 100644 drivers/iommu/mtk_iommu.c + create mode 100644 drivers/memory/mtk-smi.c + create mode 100644 include/dt-bindings/memory/mt8173-larb-port.h + create mode 100644 include/soc/mediatek/smi.h +Merging dwmw2-iommu/master (46924008273e iommu/vt-d: Clear PPR bit to ensure we get more page request interrupts) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (c4aec3101319 vfio/pci: return -EFAULT if copy_to_user fails) +$ git merge vfio/next +Already up-to-date. +Merging jc_docs/docs-next (abfa6cd8cda7 modsign: Fix documentation on module signing enforcement parameter.) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging trivial/for-next (d00cd819d7df drivers/rtc: broken link fix) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/next (fd97646b0595 audit: Fix typo in comment) +$ git merge audit/next +Already up-to-date. +Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh) +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging dt-rh/for-next (5027e19db8ce of: Add vendor prefix for eGalax_eMPIA Technology Inc) +$ git merge dt-rh/for-next +Already up-to-date. +Merging mailbox/mailbox-for-next (aace66b170ce mailbox: Introduce TI message manager driver) +$ git merge mailbox/mailbox-for-next +Merge made by the 'recursive' strategy. + .../bindings/mailbox/ti,message-manager.txt | 50 ++ + drivers/mailbox/Kconfig | 11 + + drivers/mailbox/Makefile | 2 + + drivers/mailbox/ti-msgmgr.c | 639 +++++++++++++++++++++ + include/linux/soc/ti/ti-msgmgr.h | 35 ++ + 5 files changed, 737 insertions(+) + create mode 100644 Documentation/devicetree/bindings/mailbox/ti,message-manager.txt + create mode 100644 drivers/mailbox/ti-msgmgr.c + create mode 100644 include/linux/soc/ti/ti-msgmgr.h +Merging spi/for-next (8a5a27213f7e Merge remote-tracking branch 'spi/fix/rockchip' into spi-linus) +$ git merge spi/for-next +Auto-merging drivers/spi/spi-rockchip.c +Merge made by the 'recursive' strategy. + drivers/spi/spi-imx.c | 16 ++++++++++++++-- + drivers/spi/spi-rockchip.c | 2 +- + drivers/spi/spi.c | 4 ++-- + 3 files changed, 17 insertions(+), 5 deletions(-) +Merging tip/auto-latest (e05968d2e5ab Merge branch 'sched/urgent') +$ git merge tip/auto-latest +Recorded preimage for 'arch/x86/Kconfig' +Resolved 'kernel/sched/sched.h' using previous resolution. +Auto-merging kernel/sched/sched.h +CONFLICT (content): Merge conflict in kernel/sched/sched.h +Auto-merging kernel/sched/fair.c +Auto-merging kernel/sched/cpuacct.c +Auto-merging kernel/sched/core.c +Auto-merging include/linux/perf_event.h +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx.c +Auto-merging arch/x86/kvm/mmu.c +Auto-merging arch/x86/events/core.c +Auto-merging arch/x86/Kconfig +CONFLICT (content): Merge conflict in arch/x86/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/x86/Kconfig'. +[master c472a19eb58d] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + .../interrupt-controller/hisilicon,mbigen-v2.txt | 22 +- + Documentation/memory-barriers.txt | 141 +++++-- + arch/x86/Kconfig | 9 + + arch/x86/entry/vdso/vclock_gettime.c | 2 +- + arch/x86/events/Makefile | 1 + + arch/x86/events/amd/ibs.c | 37 +- + arch/x86/events/amd/iommu.c | 5 + + arch/x86/events/amd/power.c | 353 ++++++++++++++++ + arch/x86/events/core.c | 4 +- + arch/x86/events/intel/cqm.c | 454 +++++++++++++++++++-- + arch/x86/events/intel/ds.c | 5 +- + arch/x86/events/intel/lbr.c | 2 +- + arch/x86/events/intel/rapl.c | 2 + + arch/x86/events/intel/uncore_snbep.c | 7 +- + arch/x86/events/perf_event.h | 2 +- + arch/x86/include/asm/apic.h | 2 +- + arch/x86/include/asm/cpufeatures.h | 4 +- + arch/x86/include/asm/ftrace.h | 2 +- + arch/x86/include/asm/hw_irq.h | 15 +- + arch/x86/include/asm/rwsem.h | 2 +- + arch/x86/include/asm/string_64.h | 4 +- + arch/x86/include/asm/xen/hypervisor.h | 2 + + arch/x86/kernel/acpi/boot.c | 4 +- + arch/x86/kernel/apb_timer.c | 2 +- + arch/x86/kernel/apic/apic.c | 2 +- + arch/x86/kernel/apic/vector.c | 88 +++- + arch/x86/kernel/apic/x2apic_uv_x.c | 5 +- + arch/x86/kernel/apm_32.c | 2 +- + arch/x86/kernel/cpu/amd.c | 20 +- + arch/x86/kernel/cpu/common.c | 8 +- + arch/x86/kernel/cpu/mtrr/generic.c | 2 +- + arch/x86/kernel/early_printk.c | 2 +- + arch/x86/kernel/fpu/regset.c | 2 +- + arch/x86/kernel/hpet.c | 2 +- + arch/x86/kernel/ioport.c | 12 +- + arch/x86/kernel/kexec-bzimage64.c | 2 +- + arch/x86/kernel/kgdb.c | 4 +- + arch/x86/kernel/kvmclock.c | 2 +- + arch/x86/kernel/process_64.c | 12 + + arch/x86/kernel/smpboot.c | 27 +- + arch/x86/kernel/tsc.c | 8 +- + arch/x86/kvm/mmu.c | 4 +- + arch/x86/kvm/vmx.c | 4 +- + arch/x86/kvm/x86.c | 2 +- + arch/x86/lib/memcpy_64.S | 7 +- + arch/x86/lib/memset_64.S | 2 +- + arch/x86/mm/mpx.c | 4 +- + arch/x86/mm/pat.c | 2 +- + arch/x86/oprofile/nmi_int.c | 3 +- + .../intel-mid/device_libs/platform_bma023.c | 2 +- + .../intel-mid/device_libs/platform_emc1403.c | 2 +- + .../intel-mid/device_libs/platform_gpio_keys.c | 2 +- + .../intel-mid/device_libs/platform_lis331.c | 2 +- + .../intel-mid/device_libs/platform_max7315.c | 2 +- + .../intel-mid/device_libs/platform_mpu3050.c | 2 +- + .../platform/intel-mid/device_libs/platform_msic.c | 2 +- + .../intel-mid/device_libs/platform_msic_audio.c | 2 +- + .../intel-mid/device_libs/platform_msic_battery.c | 2 +- + .../intel-mid/device_libs/platform_msic_gpio.c | 2 +- + .../intel-mid/device_libs/platform_msic_ocd.c | 2 +- + .../device_libs/platform_msic_power_btn.c | 2 +- + .../intel-mid/device_libs/platform_msic_thermal.c | 2 +- + .../intel-mid/device_libs/platform_pmic_gpio.c | 2 +- + .../intel-mid/device_libs/platform_tc35876x.c | 2 +- + .../intel-mid/device_libs/platform_tca6416.c | 2 +- + arch/x86/purgatory/stack.S | 2 +- + arch/x86/video/fbdev.c | 18 +- + arch/x86/xen/enlighten.c | 2 +- + arch/x86/xen/mmu.c | 8 +- + arch/x86/xen/xen-head.S | 2 +- + drivers/irqchip/irq-mbigen.c | 38 +- + drivers/irqchip/irq-tegra.c | 14 +- + include/asm-generic/bitops/lock.h | 14 +- + include/linux/perf_event.h | 5 + + kernel/events/core.c | 114 ++++-- + kernel/events/ring_buffer.c | 6 +- + kernel/sched/core.c | 36 +- + kernel/sched/cpuacct.c | 35 +- + kernel/sched/cpuacct.h | 4 +- + kernel/sched/fair.c | 39 +- + kernel/sched/sched.h | 13 + + tools/testing/selftests/x86/Makefile | 2 +- + tools/testing/selftests/x86/iopl.c | 135 ++++++ + 83 files changed, 1517 insertions(+), 313 deletions(-) + create mode 100644 arch/x86/events/amd/power.c + create mode 100644 tools/testing/selftests/x86/iopl.c +Merging clockevents/clockevents/next (23cb25d0f407 clocksource/drivers/arm_global_timer: Register delay timer) +$ git merge clockevents/clockevents/next +Resolved 'drivers/clocksource/Kconfig' using previous resolution. +Auto-merging drivers/clocksource/Kconfig +CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a544110fc447] Merge remote-tracking branch 'clockevents/clockevents/next' +$ git diff -M --stat --summary HEAD^.. +Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (7cc5a5d3cd4c ARM: socfpga: Enable OCRAM ECC on startup) +$ git merge edac-amd/for-next +Already up-to-date. +Merging irqchip/irqchip/for-next (a66ce4b7d9d2 Merge branch 'irqchip/mvebu' into irqchip/for-next) +$ git merge irqchip/irqchip/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging ftrace/for-next (741f3a69f101 tracing: Remove redundant reset per-CPU buff in irqsoff tracer) +$ git merge ftrace/for-next +Auto-merging kernel/trace/trace_syscalls.c +Auto-merging include/trace/events/kmem.h +Auto-merging include/linux/trace_events.h +Auto-merging arch/x86/kernel/ftrace.c +Merge made by the 'recursive' strategy. + arch/x86/kernel/ftrace.c | 2 +- + include/linux/trace_events.h | 7 ++- + include/trace/events/kmem.h | 42 ++----------- + include/trace/events/tlb.h | 4 +- + include/trace/events/writeback.h | 121 ++++++++++++++---------------------- + kernel/trace/ftrace.c | 41 ++++++------ + kernel/trace/trace.c | 35 ++++++----- + kernel/trace/trace.h | 112 ++++++++++++++++++++++++++------- + kernel/trace/trace_events_filter.c | 12 ---- + kernel/trace/trace_events_trigger.c | 88 +++++++++++++++----------- + kernel/trace/trace_functions.c | 6 ++ + kernel/trace/trace_irqsoff.c | 9 ++- + kernel/trace/trace_nop.c | 4 +- + kernel/trace/trace_syscalls.c | 11 ++++ + 14 files changed, 265 insertions(+), 229 deletions(-) +Merging rcu/rcu/next (7220b7742659 locktorture: Fix nil pointer dereferencing for cleanup paths) +$ git merge rcu/rcu/next +Merge made by the 'recursive' strategy. + kernel/locking/locktorture.c | 18 +++++++++++++++--- + 1 file changed, 15 insertions(+), 3 deletions(-) +Merging kvm/linux-next (f958ee745f70 Merge tag 'kvm-s390-next-4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) +$ git merge kvm/linux-next +Already up-to-date. +Merging kvm-arm/next (b40c4892d175 arm64: KVM: vgic-v3: Only wipe LRs on vcpu exit) +$ git merge kvm-arm/next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging kvm-ppc-paulus/kvm-ppc-next (58ded4201ff0 KVM: PPC: Add support for 64bit TCE windows) +$ git merge kvm-ppc-paulus/kvm-ppc-next +Already up-to-date. +Merging kvms390/next (c54f0d6ae057 KVM: s390: allocate only one DMA page per VM) +$ git merge kvms390/next +Already up-to-date. +Merging xen-tip/linux-next (e01dc539df3a drivers/xen: make platform-pci.c explicitly non-modular) +$ git merge xen-tip/linux-next +Auto-merging drivers/xen/xenbus/xenbus_dev_frontend.c +Auto-merging drivers/xen/xen-pciback/pciback_ops.c +Auto-merging drivers/xen/events/events_2l.c +Auto-merging drivers/xen/balloon.c +Auto-merging drivers/tty/hvc/hvc_xen.c +Auto-merging arch/x86/xen/xen-head.S +Merge made by the 'recursive' strategy. + arch/arm/include/asm/xen/hypercall.h | 2 + + arch/x86/xen/xen-head.S | 19 +++++--- + drivers/tty/hvc/hvc_xen.c | 75 ++++++++++++++++++++++++-------- + drivers/xen/balloon.c | 4 -- + drivers/xen/events/events_2l.c | 1 - + drivers/xen/events/events_base.c | 2 +- + drivers/xen/events/events_fifo.c | 1 - + drivers/xen/features.c | 2 +- + drivers/xen/grant-table.c | 1 - + drivers/xen/platform-pci.c | 22 ++++------ + drivers/xen/sys-hypervisor.c | 59 ++++--------------------- + drivers/xen/xen-balloon.c | 14 ++---- + drivers/xen/xen-pciback/conf_space.c | 2 +- + drivers/xen/xen-pciback/pciback_ops.c | 2 +- + drivers/xen/xen-pciback/xenbus.c | 2 +- + drivers/xen/xen-selfballoon.c | 1 - + drivers/xen/xenbus/xenbus_dev_backend.c | 13 +----- + drivers/xen/xenbus/xenbus_dev_frontend.c | 13 +----- + drivers/xen/xenbus/xenbus_xs.c | 1 - + drivers/xen/xenfs/xensyms.c | 1 - + 20 files changed, 101 insertions(+), 136 deletions(-) +Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition) +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next (22aceb317678 workqueue: Fix comment for work_on_cpu()) +$ git merge workqueues/for-next +Already up-to-date. +Merging drivers-x86/for-next (5b4466b8f63b hp-wmi: Remove GPS rfkill support via pre-2009 interface) +$ git merge drivers-x86/for-next +Auto-merging drivers/platform/x86/intel-hid.c +Auto-merging drivers/leds/Kconfig +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-driver-toshiba_acpi | 16 + + drivers/leds/Kconfig | 1 + + drivers/leds/dell-led.c | 126 +------ + drivers/platform/x86/Kconfig | 15 +- + drivers/platform/x86/Makefile | 1 + + drivers/platform/x86/alienware-wmi.c | 286 +++++++++++++--- + drivers/platform/x86/asus-nb-wmi.c | 9 + + drivers/platform/x86/dell-laptop.c | 370 ++++++--------------- + drivers/platform/x86/dell-rbtn.c | 15 + + drivers/platform/x86/dell-smbios.c | 193 +++++++++++ + drivers/platform/x86/dell-smbios.h | 46 +++ + drivers/platform/x86/dell-wmi.c | 238 +++++++++++-- + drivers/platform/x86/fujitsu-laptop.c | 8 +- + drivers/platform/x86/hp-wmi.c | 46 +-- + drivers/platform/x86/ideapad-laptop.c | 14 + + drivers/platform/x86/intel-hid.c | 3 +- + drivers/platform/x86/intel_pmc_ipc.c | 8 +- + drivers/platform/x86/intel_scu_ipc.c | 35 +- + drivers/platform/x86/intel_telemetry_pltdrv.c | 13 +- + drivers/platform/x86/thinkpad_acpi.c | 4 +- + drivers/platform/x86/toshiba_acpi.c | 115 +++++++ + 21 files changed, 1026 insertions(+), 536 deletions(-) + create mode 100644 drivers/platform/x86/dell-smbios.c + create mode 100644 drivers/platform/x86/dell-smbios.h +Merging chrome-platform/for-next (1dc318166a9a platform/chrome: use to_platform_device()) +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. + drivers/platform/chrome/chromeos_laptop.c | 15 ++++++++ + drivers/platform/chrome/chromeos_pstore.c | 55 ++++++++++++++++++++++++++++-- + drivers/platform/chrome/cros_ec_lightbar.c | 3 +- + 3 files changed, 69 insertions(+), 4 deletions(-) +Merging hsi/for-next (87d99063be01 HSI: ssi-protocol: Use handshake logic from n950) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (7296c33ed12e leds: triggers: simplify led_trigger_store) +$ git merge leds/for-next +Already up-to-date. +Merging ipmi/for-next (42a018c63aee ipmi: do not probe ACPI devices if si_tryacpi is unset) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. +Merging driver-core/driver-core-next (112d125a8947 Revert "driver-core: platform: probe of-devices only using list of compatibles") +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (a95fc9c8e576 serial: 8250: describe CONFIG_SERIAL_8250_RSA) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (6b5f04b6cf8e Merge branch 'for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup) +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (0561f77e2db9 usb: gadget: f_acm: Fix configfs attr name) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (7084fa868b50 USB: serial: cp210x: add new access functions for large registers) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging usb-chipidea-next/ci-for-usb-next (01b8479400ab usb: chipidea: imx: avoid EPROBE_DEFER printed as error) +$ git merge usb-chipidea-next/ci-for-usb-next +Merge made by the 'recursive' strategy. +Merging staging/staging-next (1200b6809dfd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next) +$ git merge staging/staging-next +Already up-to-date. +Merging char-misc/char-misc-next (5cd0911a9e0e Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging extcon/extcon-next (ae64e42cc2b3 extcon: palmas: Drop IRQF_EARLY_RESUME flag) +$ git merge extcon/extcon-next +Already up-to-date. +Merging cgroup/for-next (08fb4e7f8d5f Merge branch 'for-4.6' into for-next) +$ git merge cgroup/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging scsi/for-next (3d926c1d4d08 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ufs/ufshcd-pltfrm.txt | 3 + + drivers/scsi/device_handler/scsi_dh_alua.c | 2 +- + drivers/scsi/megaraid/megaraid_sas.h | 2 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 14 +- + drivers/scsi/scsi_sas_internal.h | 2 +- + drivers/scsi/scsi_sysfs.c | 2 +- + drivers/scsi/scsi_transport_sas.c | 2 + + drivers/scsi/ufs/ufs-qcom.c | 155 +++- + drivers/scsi/ufs/ufs-qcom.h | 9 + + drivers/scsi/ufs/ufs.h | 33 + + drivers/scsi/ufs/ufs_quirks.h | 151 ++++ + drivers/scsi/ufs/ufshcd-pltfrm.c | 19 + + drivers/scsi/ufs/ufshcd.c | 818 ++++++++++++++++++--- + drivers/scsi/ufs/ufshcd.h | 40 +- + drivers/scsi/ufs/ufshci.h | 4 + + drivers/scsi/ufs/unipro.h | 22 + + 16 files changed, 1143 insertions(+), 135 deletions(-) + create mode 100644 drivers/scsi/ufs/ufs_quirks.h +Merging target-updates/for-next (484dfe2e26f7 target: Fix target_release_cmd_kref shutdown comp leak) +$ git merge target-updates/for-next +Auto-merging include/target/target_core_base.h +Auto-merging drivers/xen/xen-scsiback.c +Auto-merging drivers/vhost/scsi.c +Auto-merging drivers/usb/gadget/function/f_tcm.c +Auto-merging drivers/target/target_core_internal.h +Auto-merging drivers/target/target_core_fabric_configfs.c +Auto-merging drivers/scsi/qla2xxx/qla_def.h +Auto-merging drivers/infiniband/ulp/srpt/ib_srpt.h +Auto-merging drivers/infiniband/ulp/srpt/ib_srpt.c +Merge made by the 'recursive' strategy. + Documentation/target/tcmu-design.txt | 11 +- + drivers/infiniband/ulp/isert/ib_isert.c | 810 ++++++++++++--------------- + drivers/infiniband/ulp/isert/ib_isert.h | 72 +-- + drivers/infiniband/ulp/srpt/ib_srpt.c | 76 +-- + drivers/infiniband/ulp/srpt/ib_srpt.h | 2 - + drivers/scsi/qla2xxx/qla_def.h | 1 + + drivers/scsi/qla2xxx/qla_dfs.c | 55 ++ + drivers/scsi/qla2xxx/qla_target.c | 57 +- + drivers/scsi/qla2xxx/qla_target.h | 2 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 79 +-- + drivers/target/loopback/tcm_loop.c | 46 +- + drivers/target/sbp/sbp_target.c | 95 ++-- + drivers/target/target_core_device.c | 41 +- + drivers/target/target_core_fabric_configfs.c | 32 +- + drivers/target/target_core_iblock.c | 72 ++- + drivers/target/target_core_iblock.h | 1 + + drivers/target/target_core_internal.h | 8 +- + drivers/target/target_core_spc.c | 3 +- + drivers/target/target_core_tpg.c | 21 +- + drivers/target/target_core_transport.c | 79 ++- + drivers/target/target_core_user.c | 267 +++++---- + drivers/target/tcm_fc/tfc_cmd.c | 20 +- + drivers/target/tcm_fc/tfc_sess.c | 44 +- + drivers/usb/gadget/function/f_tcm.c | 193 +++---- + drivers/usb/gadget/function/tcm.h | 2 + + drivers/vhost/scsi.c | 99 ++-- + drivers/xen/xen-scsiback.c | 281 +++++----- + include/target/target_core_base.h | 11 +- + include/target/target_core_fabric.h | 6 + + include/uapi/linux/target_core_user.h | 1 + + 30 files changed, 1283 insertions(+), 1204 deletions(-) +Merging target-merge/for-next-merge (9a7dea4939c8 cxgb4: update Kconfig and Makefile) +$ git merge target-merge/for-next-merge +Resolved 'drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h' using previous resolution. +Auto-merging drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h +CONFLICT (content): Merge conflict in drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h +Auto-merging drivers/net/ethernet/chelsio/cxgb4/t4_msg.h +Auto-merging drivers/net/ethernet/chelsio/cxgb4/sge.c +Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ea070c38ea6a] Merge remote-tracking branch 'target-merge/for-next-merge' +$ git diff -M --stat --summary HEAD^.. + drivers/infiniband/hw/cxgb4/t4fw_ri_api.h | 99 ----- + drivers/net/ethernet/chelsio/Kconfig | 11 + + drivers/net/ethernet/chelsio/cxgb4/Makefile | 1 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 27 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 34 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 97 ++++- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ppm.c | 464 +++++++++++++++++++++ + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ppm.h | 310 ++++++++++++++ + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 11 + + drivers/net/ethernet/chelsio/cxgb4/l2t.c | 2 - + drivers/net/ethernet/chelsio/cxgb4/l2t.h | 2 + + drivers/net/ethernet/chelsio/cxgb4/sge.c | 13 +- + drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 217 ++++++++++ + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 8 +- + drivers/scsi/cxgbi/cxgb4i/cxgb4i.h | 17 - + 15 files changed, 1174 insertions(+), 139 deletions(-) + create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_ppm.c + create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_ppm.h +Merging pinctrl/for-next (3c177a166253 pinctrl: single: Use a separate lockdep class) +$ git merge pinctrl/for-next +Already up-to-date. +Merging vhost/linux-next (c67f5db82027 virtio_net: replace netdev_alloc_skb_ip_align() with napi_alloc_skb()) +$ git merge vhost/linux-next +Already up-to-date. +Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias) +$ git merge remoteproc/for-next +Merge made by the 'recursive' strategy. +Merging rpmsg/for-next (0f32cd8e8555 remoteproc: st: fix check of syscon_regmap_lookup_by_phandle() return value) +$ git merge rpmsg/for-next +Merge made by the 'recursive' strategy. + drivers/remoteproc/st_remoteproc.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging gpio/for-next (3539699c03a6 gpio: mcp23s08: Fix clearing of interrupt.) +$ git merge gpio/for-next +Already up-to-date. +Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (77fe47fbb3b7 pwm: omap-dmtimer: Add debug message for effective period and duty cycle) +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + drivers/pwm/Kconfig | 2 +- + drivers/pwm/pwm-brcmstb.c | 4 +-- + drivers/pwm/pwm-img.c | 5 +++ + drivers/pwm/pwm-lpc18xx-sct.c | 5 +++ + drivers/pwm/pwm-omap-dmtimer.c | 74 +++++++++++++++++++++++++++++++++--------- + 5 files changed, 71 insertions(+), 19 deletions(-) +Merging dma-buf/for-next (8f496d3fcc9d dma-buf/fence: fix fence_is_later v2) +$ git merge dma-buf/for-next +Merge made by the 'recursive' strategy. +Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns) +$ git merge userns/for-next +Already up-to-date. +Merging ktest/for-next (b953c0d234bc Linux 4.1) +$ git merge ktest/for-next +Already up-to-date. +Merging clk/clk-next (4d3ac6662452 clk: bcm2835: fix check of error code returned by devm_ioremap_resource()) +$ git merge clk/clk-next +Resolved 'drivers/clk/at91/clk-main.c' using previous resolution. +Auto-merging include/linux/device.h +Auto-merging include/linux/clk/renesas.h +Auto-merging drivers/clk/renesas/renesas-cpg-mssr.h +Auto-merging drivers/clk/renesas/renesas-cpg-mssr.c +Auto-merging drivers/clk/renesas/r8a7795-cpg-mssr.c +Auto-merging drivers/clk/renesas/clk-sh73a0.c +Auto-merging drivers/clk/renesas/clk-rz.c +Auto-merging drivers/clk/renesas/clk-rcar-gen2.c +Auto-merging drivers/clk/renesas/clk-r8a7779.c +Auto-merging drivers/clk/renesas/clk-r8a7778.c +Auto-merging drivers/clk/renesas/clk-r8a7740.c +Auto-merging drivers/clk/renesas/clk-r8a73a4.c +Auto-merging drivers/clk/renesas/clk-mstp.c +Auto-merging drivers/clk/renesas/clk-div6.h +Auto-merging drivers/clk/renesas/clk-div6.c +Auto-merging drivers/clk/pxa/clk-pxa3xx.c +Auto-merging drivers/clk/pxa/clk-pxa27x.c +Auto-merging drivers/clk/pxa/clk-pxa25x.c +Auto-merging drivers/clk/at91/clk-usb.c +Auto-merging drivers/clk/at91/clk-smd.c +Auto-merging drivers/clk/at91/clk-slow.c +Auto-merging drivers/clk/at91/clk-programmable.c +Auto-merging drivers/clk/at91/clk-master.c +CONFLICT (content): Merge conflict in drivers/clk/at91/clk-master.c +Auto-merging drivers/clk/at91/clk-main.c +CONFLICT (content): Merge conflict in drivers/clk/at91/clk-main.c +Auto-merging drivers/clk/at91/clk-generated.c +Auto-merging drivers/clk/Kconfig +Auto-merging arch/mips/Kconfig +Auto-merging arch/arm/mach-shmobile/setup-rcar-gen2.c +Auto-merging arch/arm/mach-mvebu/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f974a286c528] Merge remote-tracking branch 'clk/clk-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/clock/axi-clkgen.txt | 5 +- + .../bindings/clock/brcm,iproc-clocks.txt | 6 + + .../devicetree/bindings/clock/lpc1850-creg-clk.txt | 52 + + .../devicetree/bindings/clock/qcom,gcc.txt | 1 + + .../devicetree/bindings/clock/renesas,cpg-mssr.txt | 2 +- + arch/arm/mach-mvebu/Kconfig | 3 + + arch/arm/mach-shmobile/pm-rmobile.c | 2 +- + arch/arm/mach-shmobile/setup-r8a7778.c | 2 +- + arch/arm/mach-shmobile/setup-r8a7779.c | 2 +- + arch/arm/mach-shmobile/setup-rcar-gen2.c | 2 +- + arch/mips/Kconfig | 2 - + arch/mips/pic32/Kconfig | 1 - + drivers/clk/Kconfig | 21 +- + drivers/clk/Makefile | 3 +- + drivers/clk/at91/clk-generated.c | 4 +- + drivers/clk/at91/clk-main.c | 6 +- + drivers/clk/at91/clk-master.c | 4 +- + drivers/clk/at91/clk-programmable.c | 4 +- + drivers/clk/at91/clk-slow.c | 8 +- + drivers/clk/at91/clk-smd.c | 4 +- + drivers/clk/at91/clk-usb.c | 4 +- + drivers/clk/bcm/clk-bcm2835-aux.c | 4 +- + drivers/clk/bcm/clk-bcm2835.c | 47 +- + drivers/clk/bcm/clk-cygnus.c | 59 + + drivers/clk/bcm/clk-iproc-pll.c | 41 +- + drivers/clk/bcm/clk-iproc.h | 43 +- + drivers/clk/clk-axi-clkgen.c | 170 +-- + drivers/clk/clk-divider.c | 5 +- + drivers/clk/clk-efm32gg.c | 2 +- + drivers/clk/clk-fixed-factor.c | 13 + + drivers/clk/clk-fixed-rate.c | 16 +- + drivers/clk/clk-gpio.c | 161 +-- + drivers/clk/clk-max77686.c | 3 - + drivers/clk/clk-max77802.c | 2 - + drivers/clk/clk-mb86s7x.c | 4 +- + drivers/clk/clk-palmas.c | 16 +- + drivers/clk/clk-pwm.c | 2 +- + drivers/clk/clk-s2mps11.c | 3 - + drivers/clk/clk-scpi.c | 2 +- + drivers/clk/clk-si514.c | 2 +- + drivers/clk/clk-si5351.c | 2 +- + drivers/clk/clk-si570.c | 2 +- + drivers/clk/clk-vt8500.c | 100 +- + drivers/clk/clk-xgene.c | 4 +- + drivers/clk/clk.c | 221 ++-- + drivers/clk/h8300/clk-div.c | 6 +- + drivers/clk/h8300/clk-h8s2678.c | 4 +- + drivers/clk/hisilicon/clk-hi3620.c | 18 +- + drivers/clk/hisilicon/clk-hi6220-stub.c | 2 +- + drivers/clk/hisilicon/clk-hi6220.c | 26 +- + drivers/clk/hisilicon/clk-hip04.c | 6 +- + drivers/clk/hisilicon/clk-hix5hd2.c | 60 +- + drivers/clk/imx/clk.h | 2 +- + drivers/clk/mediatek/clk-mtk.c | 4 +- + drivers/clk/meson/clkc.c | 2 +- + drivers/clk/mvebu/Kconfig | 2 - + drivers/clk/mvebu/common.c | 11 +- + drivers/clk/mvebu/dove-divider.c | 3 +- + drivers/clk/mxs/clk.h | 2 +- + drivers/clk/nxp/Makefile | 1 + + drivers/clk/nxp/clk-lpc18xx-cgu.c | 2 +- + drivers/clk/nxp/clk-lpc18xx-creg.c | 226 ++++ + drivers/clk/nxp/clk-lpc32xx.c | 15 +- + drivers/clk/pxa/clk-pxa25x.c | 8 +- + drivers/clk/pxa/clk-pxa27x.c | 6 +- + drivers/clk/pxa/clk-pxa3xx.c | 8 +- + drivers/clk/qcom/Kconfig | 8 + + drivers/clk/qcom/Makefile | 1 + + drivers/clk/qcom/clk-rcg.c | 4 +- + drivers/clk/qcom/common.c | 30 +- + drivers/clk/qcom/gcc-ipq4019.c | 1354 ++++++++++++++++++++ + drivers/clk/qcom/gcc-ipq806x.c | 37 - + drivers/clk/qcom/gcc-msm8660.c | 32 - + drivers/clk/qcom/gcc-msm8916.c | 18 + + drivers/clk/qcom/gcc-msm8960.c | 46 +- + drivers/clk/qcom/gcc-msm8974.c | 1 - + drivers/clk/qcom/gcc-msm8996.c | 98 +- + drivers/clk/qcom/gdsc.c | 89 +- + drivers/clk/qcom/gdsc.h | 34 +- + drivers/clk/qcom/mmcc-msm8960.c | 35 - + drivers/clk/qcom/mmcc-msm8974.c | 15 +- + drivers/clk/qcom/mmcc-msm8996.c | 157 +++ + drivers/clk/{shmobile => renesas}/Makefile | 0 + drivers/clk/{shmobile => renesas}/clk-div6.c | 3 +- + drivers/clk/{shmobile => renesas}/clk-div6.h | 4 +- + drivers/clk/{shmobile => renesas}/clk-emev2.c | 0 + drivers/clk/{shmobile => renesas}/clk-mstp.c | 2 +- + drivers/clk/{shmobile => renesas}/clk-r8a73a4.c | 2 +- + drivers/clk/{shmobile => renesas}/clk-r8a7740.c | 2 +- + drivers/clk/{shmobile => renesas}/clk-r8a7778.c | 2 +- + drivers/clk/{shmobile => renesas}/clk-r8a7779.c | 2 +- + drivers/clk/{shmobile => renesas}/clk-rcar-gen2.c | 2 +- + drivers/clk/{shmobile => renesas}/clk-rz.c | 2 +- + drivers/clk/{shmobile => renesas}/clk-sh73a0.c | 2 +- + .../clk/{shmobile => renesas}/r8a7795-cpg-mssr.c | 255 ++++ + .../clk/{shmobile => renesas}/renesas-cpg-mssr.c | 7 +- + .../clk/{shmobile => renesas}/renesas-cpg-mssr.h | 2 + + drivers/clk/samsung/clk-exynos4.c | 12 +- + drivers/clk/samsung/clk-exynos4415.c | 2 +- + drivers/clk/samsung/clk-exynos5250.c | 10 +- + drivers/clk/samsung/clk-exynos5260.c | 36 +- + drivers/clk/samsung/clk-exynos5420.c | 12 +- + drivers/clk/samsung/clk-exynos5433.c | 208 +-- + drivers/clk/samsung/clk-exynos5440.c | 12 +- + drivers/clk/samsung/clk-exynos7.c | 12 +- + drivers/clk/samsung/clk-s3c2410.c | 2 +- + drivers/clk/samsung/clk-s3c2412.c | 4 +- + drivers/clk/samsung/clk-s3c2443.c | 8 +- + drivers/clk/samsung/clk-s3c64xx.c | 8 +- + drivers/clk/samsung/clk-s5pv210.c | 10 +- + drivers/clk/socfpga/clk-gate-a10.c | 6 +- + drivers/clk/socfpga/clk-periph-a10.c | 7 +- + drivers/clk/socfpga/clk-pll-a10.c | 2 +- + drivers/clk/spear/spear1310_clock.c | 21 +- + drivers/clk/spear/spear1340_clock.c | 16 +- + drivers/clk/spear/spear3xx_clock.c | 8 +- + drivers/clk/spear/spear6xx_clock.c | 6 +- + drivers/clk/st/clk-flexgen.c | 4 +- + drivers/clk/st/clkgen-fsyn.c | 8 +- + drivers/clk/st/clkgen-mux.c | 4 +- + drivers/clk/sunxi/clk-sun8i-mbus.c | 11 +- + drivers/clk/tegra/clk-audio-sync.c | 2 +- + drivers/clk/tegra/clk-dfll.c | 1 - + drivers/clk/tegra/clk-tegra-fixed.c | 6 +- + drivers/clk/tegra/clk-tegra114.c | 3 +- + drivers/clk/tegra/clk-tegra20.c | 10 +- + drivers/clk/ti/apll.c | 20 +- + drivers/clk/ti/clk.c | 4 +- + drivers/clk/ti/clkt_dpll.c | 6 +- + drivers/clk/ti/clockdomain.c | 2 +- + drivers/clk/ti/composite.c | 8 +- + drivers/clk/ti/dpll.c | 27 +- + drivers/clk/ti/dpll3xxx.c | 17 +- + drivers/clk/ti/dpll44xx.c | 8 +- + drivers/clk/ti/mux.c | 4 +- + drivers/clk/ux500/abx500-clk.c | 5 +- + drivers/clk/ux500/u8500_of_clk.c | 74 +- + drivers/clk/ux500/u8540_clk.c | 80 +- + drivers/clk/versatile/clk-icst.c | 2 +- + drivers/clk/versatile/clk-impd1.c | 3 +- + drivers/clk/versatile/clk-realview.c | 8 +- + drivers/clk/versatile/clk-sp810.c | 4 +- + drivers/clk/versatile/clk-vexpress-osc.c | 2 +- + drivers/clk/x86/clk-lpt.c | 4 +- + drivers/clk/zynq/clkc.c | 3 +- + drivers/usb/dwc3/dwc3-of-simple.c | 9 +- + drivers/video/fbdev/simplefb.c | 4 +- + include/dt-bindings/clock/bcm-cygnus.h | 6 + + include/dt-bindings/clock/exynos5433.h | 9 +- + include/dt-bindings/clock/lpc32xx-clock.h | 1 + + include/dt-bindings/clock/qcom,gcc-ipq4019.h | 158 +++ + include/dt-bindings/clock/qcom,gcc-msm8916.h | 1 + + include/dt-bindings/clock/qcom,gcc-msm8996.h | 11 + + include/dt-bindings/clock/qcom,mmcc-msm8996.h | 17 + + include/linux/clk-provider.h | 11 +- + include/linux/clk/{shmobile.h => renesas.h} | 4 +- + include/linux/clk/ti.h | 8 +- + include/linux/device.h | 12 + + 158 files changed, 3423 insertions(+), 1282 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/lpc1850-creg-clk.txt + create mode 100644 drivers/clk/nxp/clk-lpc18xx-creg.c + create mode 100644 drivers/clk/qcom/gcc-ipq4019.c + rename drivers/clk/{shmobile => renesas}/Makefile (100%) + rename drivers/clk/{shmobile => renesas}/clk-div6.c (98%) + rename drivers/clk/{shmobile => renesas}/clk-div6.h (68%) + rename drivers/clk/{shmobile => renesas}/clk-emev2.c (100%) + rename drivers/clk/{shmobile => renesas}/clk-mstp.c (99%) + rename drivers/clk/{shmobile => renesas}/clk-r8a73a4.c (99%) + rename drivers/clk/{shmobile => renesas}/clk-r8a7740.c (99%) + rename drivers/clk/{shmobile => renesas}/clk-r8a7778.c (99%) + rename drivers/clk/{shmobile => renesas}/clk-r8a7779.c (99%) + rename drivers/clk/{shmobile => renesas}/clk-rcar-gen2.c (99%) + rename drivers/clk/{shmobile => renesas}/clk-rz.c (98%) + rename drivers/clk/{shmobile => renesas}/clk-sh73a0.c (99%) + rename drivers/clk/{shmobile => renesas}/r8a7795-cpg-mssr.c (61%) + rename drivers/clk/{shmobile => renesas}/renesas-cpg-mssr.c (99%) + rename drivers/clk/{shmobile => renesas}/renesas-cpg-mssr.h (97%) + create mode 100644 include/dt-bindings/clock/qcom,gcc-ipq4019.h + rename include/linux/clk/{shmobile.h => renesas.h} (93%) +Merging aio/master (b562e44f507e Linux 4.5) +$ git merge aio/master +Already up-to-date. +Merging kselftest/next (6accd8e9bf22 selftests: media_dcevice_test fix usage information) +$ git merge kselftest/next +Already up-to-date. +Merging y2038/y2038 (477b8541b31f qla2xxx: Remove use of 'struct timeval') +$ git merge y2038/y2038 +Merge made by the 'recursive' strategy. + drivers/scsi/qla2xxx/qla_mr.c | 5 ++--- + fs/afs/main.c | 6 ++---- + 2 files changed, 4 insertions(+), 7 deletions(-) +Merging luto-misc/next (afd2ff9b7e1b Linux 4.4) +$ git merge luto-misc/next +Already up-to-date. +Merging borntraeger/linux-next (36f90b0a2ddd Linux 4.5-rc2) +$ git merge borntraeger/linux-next +Already up-to-date. +Merging livepatching/for-next (fda0b150a173 Merge branch 'for-4.6/notifier-cleanup' into for-next) +$ git merge livepatching/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging coresight/next (f1e2c1b13dfa drivers/hwtracing: make coresight-etm-perf.c explicitly non-modular) +$ git merge coresight/next +Resolved 'drivers/hwtracing/coresight/coresight-etm3x.c' using previous resolution. +Auto-merging drivers/hwtracing/coresight/coresight-etm3x.c +CONFLICT (content): Merge conflict in drivers/hwtracing/coresight/coresight-etm3x.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b68f4e53a32b] Merge remote-tracking branch 'coresight/next' +$ git diff -M --stat --summary HEAD^.. +Merging rtc/rtc-next (be39f5e1a3a1 rv8803: workaround i2c HW issue) +$ git merge rtc/rtc-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/rtc/maxim,mcp795.txt | 11 +++++++++ + drivers/rtc/Kconfig | 2 +- + drivers/rtc/rtc-asm9260.c | 4 ++-- + drivers/rtc/rtc-m41t80.c | 6 +++++ + drivers/rtc/rtc-mcp795.c | 10 ++++++++ + drivers/rtc/rtc-rv8803.c | 28 +++++++++++++++++----- + drivers/rtc/rtc-s3c.c | 19 +++++++++++---- + 7 files changed, 66 insertions(+), 14 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/maxim,mcp795.txt +Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field) +$ git merge hwspinlock/for-next +Already up-to-date. +Merging nvdimm/libnvdimm-for-next (489011652a2d Merge branch 'for-4.6/pfn' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Already up-to-date. +Merging akpm-current/current (1aa1f27e909b ipc/msg.c: use freezable blocking call) +$ git merge --no-ff akpm-current/current +Resolved 'arch/mips/Kconfig' using previous resolution. +Resolved 'arch/x86/boot/Makefile' using previous resolution. +Resolved 'arch/x86/boot/compressed/Makefile' using previous resolution. +Resolved 'arch/x86/entry/vdso/Makefile' using previous resolution. +Resolved 'arch/x86/kernel/Makefile' using previous resolution. +Resolved 'drivers/firmware/efi/libstub/Makefile' using previous resolution. +Resolved 'fs/ocfs2/aops.c' using previous resolution. +Resolved 'mm/huge_memory.c' using previous resolution. +Auto-merging scripts/Makefile.lib +Auto-merging net/sctp/socket.c +Auto-merging mm/util.c +Auto-merging mm/memory.c +Auto-merging mm/ksm.c +Auto-merging mm/huge_memory.c +CONFLICT (content): Merge conflict in mm/huge_memory.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/kexec_file.c +Auto-merging kernel/fork.c +Auto-merging kernel/Makefile +Auto-merging init/Kconfig +Auto-merging include/uapi/linux/Kbuild +Auto-merging include/linux/sched.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/compat.h +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging fs/open.c +Auto-merging fs/ocfs2/quota_global.c +Auto-merging fs/ocfs2/ocfs2_trace.h +Auto-merging fs/ocfs2/aops.c +CONFLICT (content): Merge conflict in fs/ocfs2/aops.c +Auto-merging drivers/watchdog/hpwdt.c +Auto-merging drivers/staging/lustre/lustre/llite/llite_internal.h +Auto-merging drivers/firmware/efi/libstub/Makefile +CONFLICT (content): Merge conflict in drivers/firmware/efi/libstub/Makefile +Auto-merging drivers/firmware/efi/efivars.c +Auto-merging arch/x86/realmode/rm/Makefile +CONFLICT (content): Merge conflict in arch/x86/realmode/rm/Makefile +Auto-merging arch/x86/mm/Makefile +Auto-merging arch/x86/kernel/vmlinux.lds.S +Auto-merging arch/x86/kernel/process_64.c +Auto-merging arch/x86/kernel/Makefile +CONFLICT (content): Merge conflict in arch/x86/kernel/Makefile +Auto-merging arch/x86/include/asm/ftrace.h +Auto-merging arch/x86/entry/vdso/Makefile +CONFLICT (content): Merge conflict in arch/x86/entry/vdso/Makefile +Auto-merging arch/x86/boot/compressed/Makefile +CONFLICT (content): Merge conflict in arch/x86/boot/compressed/Makefile +Auto-merging arch/x86/boot/Makefile +CONFLICT (content): Merge conflict in arch/x86/boot/Makefile +Auto-merging arch/x86/Kconfig +Auto-merging arch/sh/Kconfig +Auto-merging arch/s390/Kconfig +Auto-merging arch/powerpc/sysdev/fsl_rmu.c +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/mips/Kconfig +CONFLICT (content): Merge conflict in arch/mips/Kconfig +Auto-merging arch/arm64/kernel/vmlinux.lds.S +Auto-merging arch/arm/kernel/vmlinux.lds.S +Auto-merging arch/arm/Kconfig +Auto-merging arch/Kconfig +Auto-merging Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 83fa9eb4b926] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/blockdev/zram.txt | 10 + + .../filesystems/ocfs2-online-filecheck.txt | 94 + + Documentation/filesystems/vfat.txt | 7 +- + Documentation/kasan.txt | 5 +- + Documentation/kcov.txt | 111 + + Documentation/rapidio/mport_cdev.txt | 104 + + Documentation/rapidio/tsi721.txt | 9 + + Documentation/vm/ksm.txt | 63 + + Makefile | 11 +- + arch/Kconfig | 4 + + arch/arm/Kconfig | 1 + + arch/arm/include/asm/exception.h | 2 +- + arch/arm/include/asm/page.h | 2 + + arch/arm/kernel/smp.c | 2 + + arch/arm/kernel/vmlinux.lds.S | 1 + + arch/arm64/include/asm/exception.h | 2 +- + arch/arm64/kernel/vmlinux.lds.S | 1 + + arch/avr32/Kconfig | 1 + + arch/blackfin/Kconfig | 1 + + arch/blackfin/kernel/vmlinux.lds.S | 1 + + arch/c6x/kernel/vmlinux.lds.S | 1 + + arch/cris/Kconfig | 1 + + arch/metag/kernel/vmlinux.lds.S | 1 + + arch/microblaze/kernel/vmlinux.lds.S | 1 + + arch/mips/Kconfig | 1 + + arch/mips/kernel/vmlinux.lds.S | 1 + + arch/nios2/kernel/vmlinux.lds.S | 1 + + arch/openrisc/kernel/vmlinux.lds.S | 1 + + arch/parisc/kernel/vmlinux.lds.S | 1 + + arch/powerpc/Kconfig | 1 + + arch/powerpc/kernel/vmlinux.lds.S | 1 + + arch/powerpc/sysdev/fsl_rio.c | 19 +- + arch/powerpc/sysdev/fsl_rio.h | 1 + + arch/powerpc/sysdev/fsl_rmu.c | 16 +- + arch/s390/Kconfig | 1 + + arch/s390/kernel/vmlinux.lds.S | 1 + + arch/sh/Kconfig | 1 + + arch/sh/kernel/vmlinux.lds.S | 1 + + arch/sparc/Kconfig | 1 + + arch/sparc/include/asm/compat.h | 7 + + arch/sparc/include/asm/syscall.h | 9 +- + arch/sparc/kernel/vmlinux.lds.S | 1 + + arch/tile/Kconfig | 1 + + arch/tile/kernel/vmlinux.lds.S | 1 + + arch/um/drivers/mconsole_kern.c | 2 +- + arch/x86/Kconfig | 2 + + arch/x86/boot/Makefile | 6 + + arch/x86/boot/compressed/Makefile | 2 + + arch/x86/entry/vdso/Makefile | 2 + + arch/x86/include/asm/compat.h | 3 +- + arch/x86/include/asm/ftrace.h | 2 +- + arch/x86/kernel/Makefile | 7 + + arch/x86/kernel/apic/Makefile | 4 + + arch/x86/kernel/apic/hw_nmi.c | 1 - + arch/x86/kernel/cpu/Makefile | 4 + + arch/x86/kernel/machine_kexec_64.c | 46 + + arch/x86/kernel/process_64.c | 2 +- + arch/x86/kernel/vmlinux.lds.S | 1 + + arch/x86/lib/Makefile | 3 + + arch/x86/mm/Makefile | 3 + + arch/x86/realmode/rm/Makefile | 3 + + block/genhd.c | 2 +- + drivers/block/zram/zcomp.c | 24 + + drivers/block/zram/zcomp.h | 2 + + drivers/block/zram/zram_drv.c | 7 +- + drivers/char/ipmi/ipmi_watchdog.c | 2 +- + drivers/firewire/core-cdev.c | 4 +- + drivers/firmware/efi/efivars.c | 2 +- + drivers/firmware/efi/libstub/Makefile | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2 +- + drivers/hid/uhid.c | 2 +- + drivers/input/input-compat.h | 12 +- + drivers/net/rionet.c | 277 +- + drivers/rapidio/Kconfig | 8 + + drivers/rapidio/devices/Makefile | 1 + + drivers/rapidio/devices/rio_mport_cdev.c | 2720 ++++++++++++++++++++ + drivers/rapidio/devices/tsi721.c | 1034 +++++--- + drivers/rapidio/devices/tsi721.h | 87 +- + drivers/rapidio/devices/tsi721_dma.c | 397 ++- + drivers/rapidio/rio-driver.c | 12 + + drivers/rapidio/rio-scan.c | 135 +- + drivers/rapidio/rio.c | 433 +++- + drivers/rapidio/rio.h | 5 + + .../staging/lustre/lustre/llite/llite_internal.h | 2 +- + drivers/watchdog/hpwdt.c | 11 +- + fs/coredump.c | 30 +- + fs/eventfd.c | 42 +- + fs/ext4/dir.c | 2 +- + fs/ext4/fsync.c | 5 +- + fs/fat/Kconfig | 18 +- + fs/fat/inode.c | 4 +- + fs/fhandle.c | 2 +- + fs/ocfs2/Makefile | 3 +- + fs/ocfs2/alloc.c | 105 +- + fs/ocfs2/aops.c | 1147 ++++----- + fs/ocfs2/aops.h | 19 +- + fs/ocfs2/cluster/heartbeat.c | 181 +- + fs/ocfs2/dlm/dlmconvert.c | 30 +- + fs/ocfs2/dlm/dlmrecovery.c | 1 - + fs/ocfs2/file.c | 165 +- + fs/ocfs2/filecheck.c | 606 +++++ + fs/ocfs2/filecheck.h | 49 + + fs/ocfs2/inode.c | 228 +- + fs/ocfs2/inode.h | 9 +- + fs/ocfs2/journal.c | 8 +- + fs/ocfs2/localalloc.c | 4 +- + fs/ocfs2/mmap.c | 4 +- + fs/ocfs2/ocfs2.h | 8 + + fs/ocfs2/ocfs2_trace.h | 18 +- + fs/ocfs2/quota_global.c | 2 +- + fs/ocfs2/resize.c | 2 +- + fs/ocfs2/stackglue.c | 3 +- + fs/ocfs2/stackglue.h | 2 + + fs/ocfs2/super.c | 44 +- + fs/ocfs2/super.h | 2 - + fs/open.c | 6 +- + include/asm-generic/vmlinux.lds.h | 12 +- + include/linux/capability.h | 2 - + include/linux/compat.h | 15 + + include/linux/cpumask.h | 2 - + include/linux/crc64_ecma.h | 56 + + include/linux/cred.h | 5 +- + include/linux/fs.h | 2 +- + include/linux/ftrace.h | 11 - + include/linux/hardirq.h | 2 + + include/linux/interrupt.h | 20 + + include/linux/kasan.h | 63 +- + include/linux/kcov.h | 29 + + include/linux/kernel.h | 21 +- + include/linux/kexec.h | 4 + + include/linux/kfifo.h | 2 +- + include/linux/mm.h | 2 + + include/linux/oom.h | 2 +- + include/linux/percpu.h | 3 - + include/linux/printk.h | 12 +- + include/linux/rio.h | 98 +- + include/linux/rio_drv.h | 15 +- + include/linux/rio_mport_cdev.h | 271 ++ + include/linux/rio_regs.h | 3 + + include/linux/sched.h | 17 + + include/linux/sem.h | 1 + + include/linux/slab.h | 10 +- + include/linux/slab_def.h | 14 + + include/linux/slub_def.h | 11 + + include/linux/stackdepot.h | 32 + + include/linux/string.h | 1 + + include/linux/swap.h | 1 + + include/trace/events/huge_memory.h | 38 +- + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/kcov.h | 10 + + init/Kconfig | 27 + + init/main.c | 1 + + ipc/msg.c | 5 +- + ipc/sem.c | 137 +- + kernel/Makefile | 12 + + kernel/auditsc.c | 4 +- + kernel/exit.c | 4 +- + kernel/fork.c | 3 + + kernel/hung_task.c | 21 +- + kernel/kcov.c | 273 ++ + kernel/kexec.c | 119 +- + kernel/kexec_core.c | 6 + + kernel/kexec_file.c | 8 +- + kernel/locking/Makefile | 3 + + kernel/panic.c | 20 + + kernel/printk/Makefile | 1 + + kernel/printk/internal.h | 55 + + kernel/printk/nmi.c | 222 ++ + kernel/printk/printk.c | 29 +- + kernel/profile.c | 4 +- + kernel/ptrace.c | 5 +- + kernel/rcu/Makefile | 4 + + kernel/sched/Makefile | 4 + + kernel/seccomp.c | 4 +- + kernel/softirq.c | 2 +- + kernel/sysctl_binary.c | 2 +- + kernel/time/timer.c | 11 + + kernel/trace/trace_functions_graph.c | 1 + + lib/Kconfig | 11 + + lib/Kconfig.debug | 21 + + lib/Kconfig.kasan | 5 +- + lib/Kconfig.ubsan | 5 + + lib/Makefile | 16 + + lib/crc64_ecma.c | 341 +++ + lib/nmi_backtrace.c | 89 +- + lib/stackdepot.c | 278 ++ + lib/test_kasan.c | 59 +- + mm/Makefile | 16 + + mm/backing-dev.c | 20 +- + mm/huge_memory.c | 89 +- + mm/internal.h | 9 + + mm/kasan/Makefile | 5 + + mm/kasan/kasan.c | 219 +- + mm/kasan/kasan.h | 44 + + mm/kasan/quarantine.c | 289 +++ + mm/kasan/report.c | 63 +- + mm/ksm.c | 733 +++++- + mm/memblock.c | 3 + + mm/memory.c | 19 +- + mm/mempool.c | 23 +- + mm/oom_kill.c | 196 +- + mm/page_alloc.c | 124 +- + mm/slab.c | 53 +- + mm/slab.h | 4 +- + mm/slab_common.c | 8 +- + mm/slub.c | 19 +- + mm/util.c | 30 + + mm/vmscan.c | 25 +- + net/sctp/socket.c | 2 +- + net/xfrm/xfrm_user.c | 2 +- + scripts/Makefile.lib | 6 + + scripts/Makefile.ubsan | 4 + + scripts/gdb/linux/modules.py | 5 +- + scripts/gdb/linux/proc.py | 41 + + scripts/gdb/linux/symbols.py | 2 +- + scripts/gdb/vmlinux-gdb.py | 1 + + 217 files changed, 11144 insertions(+), 2040 deletions(-) + create mode 100644 Documentation/filesystems/ocfs2-online-filecheck.txt + create mode 100644 Documentation/kcov.txt + create mode 100644 Documentation/rapidio/mport_cdev.txt + create mode 100644 drivers/rapidio/devices/rio_mport_cdev.c + create mode 100644 fs/ocfs2/filecheck.c + create mode 100644 fs/ocfs2/filecheck.h + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 include/linux/kcov.h + create mode 100644 include/linux/rio_mport_cdev.h + create mode 100644 include/linux/stackdepot.h + create mode 100644 include/uapi/linux/kcov.h + create mode 100644 kernel/kcov.c + create mode 100644 kernel/printk/internal.h + create mode 100644 kernel/printk/nmi.c + create mode 100644 lib/crc64_ecma.c + create mode 100644 lib/stackdepot.c + create mode 100644 mm/kasan/quarantine.c + create mode 100644 scripts/gdb/linux/proc.py +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression +Applying: staging/goldfish: use 6-arg get_user_pages() +Applying: mm/mprotect.c: don't imply PROT_EXEC on non-exec fs +Applying: kernel/signal.c: add compile-time check for __ARCH_SI_PREAMBLE_SIZE +Applying: memremap: don't modify flags +Applying: memremap: add MEMREMAP_WC flag +Applying: drivers: dma-coherent: use MEMREMAP_WC for DMA_MEMORY_MAP +Applying: drivers: dma-coherent: use memset_io for DMA_MEMORY_IO mappings +Applying: kernel/...: convert pr_warning to pr_warn +Applying: dma-rename-dma__writecombine-to-dma__wc-checkpatch-fixes +Applying: alpha/extable: use generic search and sort routines +Applying: s390/extable: use generic search and sort routines +Applying: x86/extable: use generic search and sort routines +Applying: ia64/extable: use generic search and sort routines +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 91d3bbb6643d...f77751625f98 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (f77751625f98 ia64/extable: use generic search and sort routines) +$ git merge --no-ff akpm/master +Removing arch/s390/mm/extable.c +Removing arch/alpha/mm/extable.c +Merge made by the 'recursive' strategy. + arch/alpha/include/asm/uaccess.h | 10 ++- + arch/alpha/mm/Makefile | 2 +- + arch/alpha/mm/extable.c | 92 --------------------- + arch/ia64/include/asm/uaccess.h | 8 +- + arch/ia64/mm/extable.c | 97 +--------------------- + arch/s390/include/asm/uaccess.h | 8 +- + arch/s390/mm/Makefile | 2 +- + arch/s390/mm/extable.c | 85 ------------------- + arch/x86/include/asm/uaccess.h | 5 +- + arch/x86/mm/extable.c | 108 ------------------------- + drivers/base/dma-coherent.c | 25 ++++-- + drivers/gpu/host1x/job.c | 2 +- + drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 3 +- + drivers/platform/goldfish/goldfish_pipe.c | 3 +- + drivers/video/fbdev/s3c-fb.c | 2 +- + include/linux/io.h | 1 + + kernel/irq/manage.c | 4 +- + kernel/memremap.c | 27 ++++--- + kernel/power/suspend.c | 3 +- + kernel/signal.c | 4 + + kernel/time/tick-sched.c | 8 +- + kernel/trace/blktrace.c | 4 +- + kernel/trace/ftrace.c | 7 +- + kernel/trace/trace.c | 40 ++++----- + kernel/trace/trace_functions_graph.c | 6 +- + kernel/trace/trace_kprobe.c | 27 +++---- + kernel/trace/trace_mmiotrace.c | 2 +- + kernel/trace/trace_probe.c | 4 +- + kernel/trace/trace_stat.c | 3 +- + kernel/trace/trace_uprobe.c | 2 +- + kernel/tracepoint.c | 2 +- + mm/mprotect.c | 13 +-- + 32 files changed, 124 insertions(+), 485 deletions(-) + delete mode 100644 arch/alpha/mm/extable.c + delete mode 100644 arch/s390/mm/extable.c diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..195163909790 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,4 @@ +Importing jdelvare-hwmon based on 4.5-rc2 +Unchanged quilt series jdelvare-hwmon +Importing dmi based on 4.4 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..50fa741a1348 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20160322 |