diff options
| -rw-r--r-- | Next/SHA1s | 233 | ||||
| -rw-r--r-- | Next/Trees | 235 | ||||
| -rw-r--r-- | Next/merge.log | 2237 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 2710 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..74858339243e --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,233 @@ +Name SHA1 +---- ---- +origin f55532a0c0b8bb6148f4e07853b876ef73bc69ca +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 322cea2f41adb62c975f46a3242f4e3b43226fa1 +ipsec 215276c0147ef49bc07692ca68bae35a30a64b9a +ipvs 7617a24f83b5d67f4dab1844956be1cebc44aec8 +wireless-drivers 2acd846485549655582ee379ceb966206f91e6f8 +mac80211 ad8ec957f693c7f76e02793289e7819d087642be +sound-current 91d2178e26fdc806f33063f9df5904a48e3b6aeb +pci-current 9188269a2e8ea5b32affef99d42c5eda91c07fdf +driver-core.current 1d02369dba2cd9db110f0f35d9a777ee691e498b +tty.current 1d02369dba2cd9db110f0f35d9a777ee691e498b +usb.current 1d02369dba2cd9db110f0f35d9a777ee691e498b +usb-gadget-fixes 3b2435192fe917a826c91c8b34032428d6efdfc7 +usb-serial-fixes f6cede5b49e822ebc41a099fe41ab4989f64e2cb +usb-chipidea-fixes d144dfea8af7108f613139623e63952ed7e69c0c +staging.current 1d02369dba2cd9db110f0f35d9a777ee691e498b +char-misc.current 5cd0911a9e0e408f28079a5e36a981217bf47520 +input-current d314e9e80c5ea561b73584b73806c2ae9e30f503 +crypto-current e54358915d0a00399c11c2c23ae1be674cba188a +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 772c75951fa95d0740f8ae260304b13c24c58f13 +bcm2835-dt 1305141d1a7254b53b35303ee84f4c4948007bd0 +bcm2835-soc 92e963f50fc74041b5e9e744c330dca48e04f08d +bcm2835-drivers 92e963f50fc74041b5e9e744c330dca48e04f08d +bcm2835-defconfig 0a05d3b71ada526ef93019fb3fbd6a95561a8a5f +berlin 9a7e0683324926963bcee47058c4f86f4fb6b409 +cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4 +imx-mxs 9e26d5f485d7c160003334bd1cfc0aa39d1ab0bc +keystone 1bdd5a9b339c7a5e1443d40aecccaa87d858ea78 +mvebu 5be603bdf1a7b4c9ee619f201264d90384232d55 +omap aec24f100558d3572aa7da7aaa66b68342ed9996 +omap-pending 8fe097a3d99e22355fb8e3bcee59542bf3f46b2d +qcom f17d0d578214b6bb51819f9b43ab7e1d1c7c1c0a +renesas f094c5346231e9237610f8f16f659fb972de1c60 +rockchip 1ee969dbc19984bc88f995b845b8cb86d7cb10b4 +rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590 +samsung 92e963f50fc74041b5e9e744c330dca48e04f08d +samsung-krzk 079017960a680c5ba871ecefb94355ba04346b27 +sunxi 73e5379b04422fa3639ef5076abedd317b2c0ebc +tegra 755f165105b11619cc1da577f030fce110fa9ea9 +arm64 691b1e2ebf727167a2e3cdcd1ea0851dee10247b +blackfin 391e74a51ea2ce54f4d4a213a207a6bfb73e0b33 +c6x ca3060d39ae7a0964f8c123a4833029981e86476 +cris f9f3f864b5e8c09d7837d8980edba4ad52969819 +h8300 8cad489261c564d4ee1db4de4ac365af56807d8a +hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a +ia64 7e26e9ff0a9301398bd7cf8d896536da3a54aa9a +m68k efbec135f11d6f14f40806935827c53d8889f59b +m68knommu a3595962d82495f51a80feb19dcdb135556a9527 +metag c8b6ad8b3f873ff5b971523f439f4b5a1ac75842 +microblaze 10f4b26deb411fdd61054a59d8c7d82e29712e33 +mips 8628008513d7882093967f1dd1194025400ed011 +nios2 8e3d7c834ba0f79f200c155cf0647eacd39f2fbe +parisc-hd 119a0a3c13ef5ffe78dc0c1a55c5da9e377b2976 +powerpc 6e669f085d595cb6053920832c89f1a13067db44 +powerpc-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +fsl fba4e9f9898ab181703723b9890ba29345edfe08 +mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0 +s390 37da5234dfa8cd968b6540e3f65b21c5863f5a69 +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +tile 35b90a2939a563df4b1f57f18dd925d6aa7cb38a +uml ad32a1f3c36b046b2e7b0361b88c18e3af61419e +unicore32 d670878e2c9adb86b37e42b0937b2d4825bd2b39 +xtensa 9da8320bb97768e35f2e64fa7642015271d672eb +btrfs bb7ab3b92e46da06b580c6f83abe7894dc449cca +btrfs-kdave 2f06df5ab10067ee1a4bede47cb34a90dd551b55 +ceph 7c886661dc31992bf8fc8f4811fa1f210981924e +cifs b562e44f507e863c6792946e4e1b1449fbbac85d +configfs 96c22a3293512ba684e73a981196430f524689da +ecryptfs 933c32fe0e42b86d9bc5779401c3ce93d56bd231 +ext3 ab73ef46398e2c0159f3a71de834586422d2a44a +ext4 3d43bcfef5f0548845a425365011c499875491b0 +f2fs d407574e7948210223a7adca5ff26e3b0ec8143e +fscache b00c2ae2ed3c0c40e0740549fe0e42e234a97dc2 +fuse 742f992708dff0ada8b426228900ffb009c7167b +gfs2 3e11e530415027a57936545957126aff49267b76 +jfs 26456955719b79cc4a011b18221aa68f599f6b6c +nfs 606c61a0579669c292dc5f5e1cf898edecfc0d53 +nfsd ac503e4a309a3993a069750f95c2815ee5db5aa5 +orangefs 45996492e5c85aa0ac93a95d1b2d1ed56851c865 +overlayfs e3608e3f68f6e82113555c873333722362eca6a0 +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 0dcdd3ba27cb11cf9eb6b0552c4c1b90e5edc776 +libata 4b3ec02793970ef663332e2ebe1b2ea5aeb3afd6 +pm 15dbc136dff62ebefb03353cfb7d308d49b275f3 +idle 31ade3b83e1821da5fbb2f11b5b3d4ab2ec39db8 +thermal 81ad4276b505e987dd8ebbdf63605f92cd172b52 +thermal-soc 44fa372da981c9ca4e796ddc3b0f70ec2cd6d746 +ieee1394 384fbb96f9268eee0b703b39cb07557403bd9aac +dlm b81171cb6869111dbaf9fb642f4434514c21d696 +swiotlb 386744425e35e04984c6e741c7750fd6eef1a9df +slave-dma 7ea5d41560d970c14e7b0a07f24e5b137c5011c1 +net-next e46b4e2b46e173889b19999b8bd033d5e8b3acf0 +ipsec-next cb866e3298cd7412503fc7e2c265753c853fab9d +ipvs-next f6ca9f46f6615c3a87529550058d1b468c0cad89 +wireless-drivers-next ccfe1e85322090649d2fae599e55300c1512bf15 +bluetooth de06dbfa7861c9019eedefc0c356ba86e5098f1b +mac80211-next 0a87cadbb54e1595a5f64542adb4c63be914d290 +rdma 520a07bff6fbb23cac905007d74c67058b189acb +mtd a2d4fa1acbb95dd5befb15789d04bbf1d0074a86 +l2-mtd a2d4fa1acbb95dd5befb15789d04bbf1d0074a86 +crypto 34074205bb9f04b416efb3cbedcd90f418c86200 +drm 4604202ca8d2a5e33b4bca0812b5d92975ed1bd8 +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 46a1026cc1a08f6247d6e4cfc58a49a7a35c4e3b +sound 91d2178e26fdc806f33063f9df5904a48e3b6aeb +sound-asoc 0a63eacf2fab3e7a40bfe5ba659d2216423b9b19 +modules b37a05c083c85c2657dca9bbe1f5d79dccf756d5 +input d314e9e80c5ea561b73584b73806c2ae9e30f503 +block 258b83ad99309bd13e90181acfaf3e7330627285 +device-mapper ef6e0d57417a198a7e978d496b49884fc3c6963c +pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8 +mmc-uh 64e5cd723120643a4c8bef0880a03a60161d3ccb +md de24075022dcf9e74a0494f089897c697959eb5a +mfd dd3506a611d966711997c60d40464bb475ceb3f0 +backlight 60d613d6aef4ae49988eeb3ad38af948c561db1e +battery 0df6e32b0e36710fe989095241833e09dac3e41d +omap_dss2 32ad61951574d011d363694d6037592e99da9421 +regulator e3eeaf3d7f2134a63c51f637331a62678d13e3c3 +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 aca04ce5dbda50758b813b1e3d710098991cfa9a +spi 78b5a17c35bd3b301bac25a72a1988b7537e5dc6 +tip e05968d2e5abb48f2669f97f8a75b8df1f9ed0ff +clockevents 23cb25d0f407e83be10747258092843e8e20d535 +edac 12f0721c5a70408e86257c5c99605cf743cd44c6 +edac-amd 7cc5a5d3cd4cca0a3852d1500e8c50fe191bcc9d +irqchip a66ce4b7d9d20b59afe0a898fa0b4faf0651fbcd +ftrace 7e6867bf831c71fe0e47438831ae3a94d4c7ab3c +rcu 7220b7742659c5725c4dbdfdde8052aa70206cd0 +kvm aca04ce5dbda50758b813b1e3d710098991cfa9a +kvm-arm b40c4892d175874d118860c8282a85ee7b64bcbb +kvm-ppc c63517c2e3810071359af926f621c1f784388c3f +kvm-ppc-paulus 58ded4201ff028b15f6b317228faa5f154a0663f +kvms390 c54f0d6ae057444453f5167e66ed999e8cf26936 +xen-tip e01dc539df3ada9061a1097224513236b5381349 +percpu 18fc93fd64129c96432812cb44f59c963871889b +workqueues 22aceb317678057dced5f1d6e3ac15acdb863e7b +drivers-x86 fffcad87d4e7c5f6f6f6e5fc9d337bd6f197f80f +chrome-platform 1dc318166a9a3c8646d1f8af6cff246ea89853b2 +hsi 87d99063be016ceee90723a13365a40b21eec0d9 +leds 7296c33ed12ef13de50e03c76643382123766f96 +ipmi 42a018c63aee41d93962cf39e536c6f31fc023c1 +driver-core 1d02369dba2cd9db110f0f35d9a777ee691e498b +tty 1d02369dba2cd9db110f0f35d9a777ee691e498b +usb 1d02369dba2cd9db110f0f35d9a777ee691e498b +usb-gadget 0561f77e2db9e72dc32e4f82b56fca8ba6b31171 +usb-serial 7084fa868b509646fa30773d5d3ef4f26a62eb6f +usb-chipidea-next 01b8479400abdd61b026df37a3a19de7b8df32f5 +staging 1d02369dba2cd9db110f0f35d9a777ee691e498b +char-misc 5cd0911a9e0e408f28079a5e36a981217bf47520 +extcon ae64e42cc2b3a17ac0c11815f53211093a54cf55 +cgroup 08fb4e7f8d5f2b4f01e6884b79d157ce32217f9a +scsi fd30a352d56bf38da3a4bb0de81c9e0c14c4da87 +target-updates 5e47f1985d7107331c3f64fb3ec83d66fd73577e +target-merge 2994a75183173defc21f0d26ce23b63232211b88 +pinctrl 3c177a166253653bf9c377eb28a5155ea2d9b631 +vhost c67f5db82027ba6d2ea4ac9176bc45996a03ae6a +remoteproc 7a6271a80cae8f464d38b326fce0266f0448d77e +rpmsg 0f32cd8e8555a75fa9528f74cb40b30cd46b6509 +gpio 968f3e374faf41e5e6049399eb7302777a09a1e8 +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 ee087744247c421c83abea7f01217bfd39b8f5a9 +hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828 +nvdimm 489011652a2d5555901def04c24d68874e8ba9a1 +akpm-current c0b923091eea489210fa9ba419a47260dd6ee1e0 +akpm 5c6227b4cce4e8e71ddbe85bf67f118a0b1f71e7 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..3178ecca14a3 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2237 @@ +$ date -R +Sun, 27 Mar 2016 14:34:23 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at c13042362033 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 +Merging origin/master (f55532a0c0b8 Linux 4.6-rc1) +$ git merge origin/master +Updating c13042362033..f55532a0c0b8 +Fast-forward + Documentation/ABI/stable/sysfs-fs-orangefs | 87 + + Documentation/ABI/testing/sysfs-devices-system-cpu | 69 + + .../ABI/testing/sysfs-driver-toshiba_acpi | 16 + + .../interrupt-controller/hisilicon,mbigen-v2.txt | 22 +- + .../devicetree/bindings/mtd/atmel-nand.txt | 31 +- + .../devicetree/bindings/mtd/fsl-quadspi.txt | 5 +- + .../devicetree/bindings/mtd/qcom_nandc.txt | 86 + + .../bindings/power/rockchip-io-domain.txt | 11 + + .../devicetree/bindings/rtc/maxim,mcp795.txt | 11 + + .../devicetree/bindings/thermal/exynos-thermal.txt | 18 +- + .../bindings/thermal/mediatek-thermal.txt | 43 + + .../devicetree/bindings/ufs/ufshcd-pltfrm.txt | 3 + + .../devicetree/bindings/vendor-prefixes.txt | 2 + + Documentation/dma-buf-sharing.txt | 11 +- + Documentation/filesystems/nfs/pnfs-scsi-server.txt | 23 + + Documentation/filesystems/orangefs.txt | 406 ++++ + Documentation/kasan.txt | 5 +- + Documentation/memory-barriers.txt | 141 +- + Documentation/networking/ip-sysctl.txt | 19 +- + Documentation/thermal/sysfs-api.txt | 68 + + MAINTAINERS | 121 +- + Makefile | 7 +- + arch/arc/include/asm/page.h | 3 - + arch/arm/boot/dts/Makefile | 12 +- + arch/arm/boot/dts/at91-sama5d3_xplained.dts | 1 + + arch/arm/boot/dts/at91-sama5d4_xplained.dts | 1 + + .../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/arm/include/asm/exception.h | 2 +- + arch/arm/include/asm/page-nommu.h | 3 - + arch/arm/kernel/vmlinux.lds.S | 1 + + arch/arm/plat-samsung/devs.c | 9 - + arch/arm64/Kconfig.platforms | 1 + + 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 +- + arch/arm64/include/asm/cacheflush.h | 7 - + arch/arm64/include/asm/exception.h | 2 +- + arch/arm64/kernel/entry.S | 2 +- + arch/arm64/kernel/head.S | 9 +- + arch/arm64/kernel/vmlinux.lds.S | 1 + + arch/arm64/mm/flush.c | 4 - + arch/arm64/mm/init.c | 60 +- + arch/arm64/mm/mmu.c | 6 +- + arch/blackfin/kernel/vmlinux.lds.S | 1 + + arch/c6x/kernel/vmlinux.lds.S | 1 + + arch/frv/include/asm/page.h | 3 - + 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 +- + arch/ia64/include/asm/unistd.h | 2 +- + arch/ia64/include/uapi/asm/unistd.h | 2 + + arch/ia64/kernel/entry.S | 2 + + arch/m68k/include/asm/page_mm.h | 3 - + arch/m68k/include/asm/page_no.h | 3 - + arch/metag/kernel/vmlinux.lds.S | 1 + + arch/microblaze/kernel/vmlinux.lds.S | 1 + + arch/mips/include/asm/mach-jz4740/jz4740_nand.h | 2 - + arch/mips/kernel/vmlinux.lds.S | 1 + + arch/nios2/kernel/vmlinux.lds.S | 1 + + arch/openrisc/include/asm/page.h | 3 - + arch/openrisc/kernel/vmlinux.lds.S | 1 + + arch/parisc/Kconfig | 1 + + arch/parisc/include/asm/assembly.h | 2 +- + arch/parisc/include/asm/uaccess.h | 7 +- + arch/parisc/include/uapi/asm/unistd.h | 8 +- + arch/parisc/kernel/sys_parisc.c | 10 - + arch/parisc/kernel/syscall_table.S | 6 +- + arch/parisc/kernel/traps.c | 5 +- + arch/parisc/kernel/vmlinux.lds.S | 1 + + arch/parisc/mm/fault.c | 9 +- + arch/powerpc/kernel/vmlinux.lds.S | 1 + + arch/s390/kernel/vmlinux.lds.S | 1 + + arch/sh/kernel/vmlinux.lds.S | 1 + + arch/sparc/kernel/vmlinux.lds.S | 1 + + arch/tile/kernel/vmlinux.lds.S | 1 + + 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/msr.h | 8 - + 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/Makefile | 1 + + 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/ftrace.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/kernel/vmlinux.lds.S | 1 + + 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 +- + block/blk-mq-sysfs.c | 6 +- + block/blk-mq.c | 3 +- + drivers/acpi/acpi_apd.c | 1 + + drivers/acpi/property.c | 1 + + drivers/acpi/resource.c | 14 +- + drivers/acpi/sleep.c | 1 + + drivers/acpi/utils.c | 2 +- + drivers/base/power/clock_ops.c | 89 + + drivers/block/mtip32xx/mtip32xx.c | 4 +- + drivers/block/null_blk.c | 3 +- + drivers/block/rbd.c | 14 +- + drivers/char/ppdev.c | 25 +- + drivers/clocksource/time-pistachio.c | 4 +- + drivers/cpufreq/acpi-cpufreq.c | 18 +- + drivers/cpufreq/cpufreq.c | 98 +- + drivers/cpufreq/cpufreq_governor.c | 2 +- + drivers/cpufreq/intel_pstate.c | 73 +- + drivers/cpufreq/powernv-cpufreq.c | 124 +- + drivers/cpuidle/governors/menu.c | 50 +- + drivers/devfreq/Kconfig | 2 +- + drivers/dma-buf/dma-buf.c | 19 +- + drivers/dma/idma64.h | 2 +- + drivers/firewire/nosy.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 120 +- + drivers/gpu/drm/amd/powerplay/Makefile | 14 +- + .../amd/powerplay/hwmgr/tonga_processpptables.c | 4 +- + 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/radeon/radeon_dp_mst.c | 22 +- + drivers/gpu/drm/udl/udl_fb.c | 4 +- + drivers/idle/intel_idle.c | 133 +- + drivers/infiniband/hw/cxgb4/t4fw_ri_api.h | 99 - + drivers/input/input-compat.c | 6 +- + drivers/input/input-compat.h | 4 +- + drivers/input/input.c | 2 +- + drivers/input/misc/ati_remote2.c | 36 +- + drivers/input/misc/ims-pcu.c | 4 + + drivers/input/misc/uinput.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 +- + drivers/input/touchscreen/sur40.c | 21 +- + drivers/irqchip/Kconfig | 14 +- + drivers/irqchip/irq-mbigen.c | 38 +- + drivers/irqchip/irq-tegra.c | 14 +- + drivers/isdn/mISDN/clock.c | 69 +- + drivers/leds/Kconfig | 1 + + drivers/leds/dell-led.c | 126 +- + 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/memory/fsl_ifc.c | 2 +- + drivers/memstick/host/r592.c | 3 +- + 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/mtd/ubi/misc.c | 49 + + drivers/mtd/ubi/ubi.h | 16 +- + drivers/net/ethernet/cadence/macb.c | 4 +- + 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/net/ethernet/freescale/fman/fman.c | 104 +- + drivers/net/ethernet/hisilicon/hns/hnae.h | 3 + + drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 12 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c | 38 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 15 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h | 6 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 5 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c | 5 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h | 2 + + drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 2 + + .../net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 32 +- + drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 38 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/mcg.c | 2 - + drivers/net/ethernet/netronome/nfp/nfp_net.h | 2 +- + drivers/net/ethernet/smsc/smc911x.c | 2 + + drivers/net/geneve.c | 11 +- + drivers/net/hyperv/hyperv_net.h | 7 +- + drivers/net/hyperv/netvsc_drv.c | 5 +- + drivers/net/hyperv/rndis_filter.c | 16 +- + drivers/net/phy/at803x.c | 10 +- + drivers/net/phy/mdio-sun4i.c | 4 +- + drivers/net/ppp/ppp_generic.c | 4 +- + drivers/net/usb/lan78xx.c | 49 - + drivers/net/vxlan.c | 9 +- + drivers/ntb/hw/amd/ntb_hw_amd.c | 30 - + drivers/ntb/ntb_transport.c | 31 +- + drivers/ntb/test/ntb_perf.c | 78 +- + drivers/nvme/host/lightnvm.c | 17 +- + drivers/nvme/host/pci.c | 24 +- + 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 + + drivers/power/avs/rockchip-io-domain.c | 58 + + 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 +- + drivers/rtc/Kconfig | 2 +- + drivers/rtc/rtc-abx80x.c | 252 ++- + 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 +- + drivers/scsi/cxgbi/cxgb4i/cxgb4i.h | 17 - + drivers/scsi/device_handler/scsi_dh_alua.c | 2 +- + drivers/scsi/fnic/fnic_scsi.c | 13 +- + drivers/scsi/lpfc/lpfc_init.c | 5 +- + drivers/scsi/megaraid/megaraid_sas.h | 2 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 17 +- + drivers/scsi/qla2xxx/qla_target.c | 16 +- + drivers/scsi/scsi_common.c | 12 +- + drivers/scsi/scsi_sas_internal.h | 2 +- + drivers/scsi/scsi_sysfs.c | 2 +- + drivers/scsi/scsi_transport_sas.c | 2 + + drivers/scsi/ufs/Kconfig | 1 + + 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 + + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/android/ion/ion.c | 6 +- + drivers/staging/android/ion/ion_test.c | 4 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 12 +- + drivers/staging/fsl-mc/bus/mc-bus.c | 4 +- + drivers/staging/fsl-mc/bus/mc-sys.c | 6 +- + drivers/staging/lustre/lustre/Kconfig | 2 +- + drivers/staging/lustre/lustre/mgc/mgc_request.c | 2 +- + drivers/staging/most/hdm-dim2/dim2_hdm.c | 2 +- + drivers/staging/mt29f_spinand/mt29f_spinand.c | 1 - + drivers/staging/mt29f_spinand/mt29f_spinand.h | 1 - + drivers/staging/rtl8712/TODO | 12 +- + drivers/staging/rtl8723au/TODO | 3 + + drivers/staging/ste_rmi4/Kconfig | 9 - + drivers/staging/ste_rmi4/Makefile | 4 - + drivers/staging/ste_rmi4/TODO | 7 - + drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 1137 ---------- + drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h | 46 - + drivers/staging/wilc1000/coreconfigurator.c | 8 +- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 7 + + drivers/thermal/Kconfig | 21 +- + drivers/thermal/Makefile | 1 + + drivers/thermal/intel_pch_thermal.c | 6 + + 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/thermal_core.c | 13 +- + drivers/thermal/ti-soc-thermal/ti-bandgap.c | 10 +- + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/ceph/addr.c | 324 +-- + fs/ceph/caps.c | 11 +- + fs/ceph/dir.c | 69 +- + fs/ceph/export.c | 13 + + fs/ceph/file.c | 15 +- + fs/ceph/inode.c | 34 +- + fs/ceph/mds_client.c | 7 +- + fs/ceph/snap.c | 16 - + fs/ceph/super.c | 47 +- + fs/ceph/super.h | 23 +- + fs/ceph/xattr.c | 78 +- + fs/crypto/crypto.c | 2 +- + fs/fs-writeback.c | 37 +- + fs/jffs2/gc.c | 64 +- + fs/jffs2/jffs2_fs_sb.h | 2 +- + fs/jffs2/nodemgmt.c | 4 +- + fs/jffs2/wbuf.c | 6 +- + 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 | 77 +- + fs/nfsd/blocklayoutxdr.h | 14 + + fs/nfsd/nfs3proc.c | 7 +- + fs/nfsd/nfs4layouts.c | 31 +- + fs/nfsd/nfs4proc.c | 9 +- + fs/nfsd/nfs4recover.c | 1 + + fs/nfsd/nfs4state.c | 29 +- + fs/nfsd/nfs4xdr.c | 26 +- + fs/nfsd/pnfs.h | 8 + + fs/nfsd/vfs.h | 19 + + fs/ocfs2/alloc.c | 105 +- + fs/ocfs2/aops.c | 1146 +++++----- + fs/ocfs2/aops.h | 19 +- + fs/ocfs2/cluster/heartbeat.c | 4 +- + fs/ocfs2/dlm/dlmconvert.c | 30 +- + fs/ocfs2/dlm/dlmrecovery.c | 1 - + fs/ocfs2/file.c | 165 +- + fs/ocfs2/inode.c | 3 + + fs/ocfs2/inode.h | 6 +- + 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 | 16 +- + fs/ocfs2/quota_global.c | 2 +- + fs/ocfs2/resize.c | 2 +- + fs/ocfs2/super.c | 39 +- + fs/ocfs2/super.h | 2 - + fs/orangefs/Kconfig | 6 + + fs/orangefs/Makefile | 10 + + fs/orangefs/acl.c | 175 ++ + fs/orangefs/dcache.c | 138 ++ + fs/orangefs/devorangefs-req.c | 943 +++++++++ + fs/orangefs/dir.c | 400 ++++ + fs/orangefs/downcall.h | 133 ++ + fs/orangefs/file.c | 717 +++++++ + fs/orangefs/inode.c | 475 +++++ + fs/orangefs/namei.c | 462 ++++ + fs/orangefs/orangefs-bufmap.c | 556 +++++ + fs/orangefs/orangefs-bufmap.h | 36 + + 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 | 623 ++++++ + fs/orangefs/orangefs-mod.c | 293 +++ + fs/orangefs/orangefs-sysfs.c | 1772 ++++++++++++++++ + fs/orangefs/orangefs-sysfs.h | 2 + + fs/orangefs/orangefs-utils.c | 1048 +++++++++ + fs/orangefs/protocol.h | 452 ++++ + fs/orangefs/super.c | 559 +++++ + fs/orangefs/symlink.c | 19 + + fs/orangefs/upcall.h | 246 +++ + fs/orangefs/waitqueue.c | 357 ++++ + fs/orangefs/xattr.c | 545 +++++ + fs/ubifs/Makefile | 1 + + fs/ubifs/misc.c | 57 + + fs/ubifs/ubifs.h | 41 +- + fs/ubifs/xattr.c | 1 - + fs/xfs/Makefile | 3 +- + fs/xfs/xfs_export.c | 2 +- + fs/xfs/xfs_pnfs.h | 2 +- + include/asm-generic/bitops/lock.h | 14 +- + 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 - + include/asm-generic/vmlinux.lds.h | 12 +- + include/linux/blk-mq.h | 14 - + include/linux/ceph/ceph_features.h | 2 + + include/linux/ceph/ceph_fs.h | 7 +- + include/linux/ceph/libceph.h | 8 +- + include/linux/ceph/mon_client.h | 31 +- + include/linux/ceph/osd_client.h | 15 +- + include/linux/compiler-clang.h | 5 + + include/linux/dma-buf.h | 6 +- + include/linux/fence.h | 2 +- + include/linux/ftrace.h | 11 - + include/linux/interrupt.h | 20 + + include/linux/kasan.h | 31 +- + include/linux/kernel.h | 6 +- + include/linux/lightnvm.h | 14 + + include/linux/mISDNif.h | 2 +- + include/linux/mm.h | 2 + + 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/netdevice.h | 225 +- + include/linux/nfs4.h | 19 + + include/linux/nmi.h | 1 - + include/linux/ntb.h | 10 +- + include/linux/oom.h | 4 +- + include/linux/perf_event.h | 5 + + include/linux/platform_data/mtd-nand-s3c2410.h | 1 - + include/linux/pm_clock.h | 9 + + include/linux/sched.h | 12 + + include/linux/slab.h | 10 +- + include/linux/slab_def.h | 14 + + include/linux/slub_def.h | 11 + + include/linux/stackdepot.h | 32 + + include/linux/sunrpc/auth.h | 7 + + include/linux/sunrpc/svc_rdma.h | 20 +- + include/linux/thermal.h | 20 + + include/linux/trace_events.h | 7 +- + include/net/flow.h | 2 +- + include/net/inet6_connection_sock.h | 1 - + include/net/ip_tunnels.h | 16 + + include/net/ipv6.h | 6 + + include/net/ping.h | 1 - + include/net/sctp/sctp.h | 10 +- + include/net/sctp/structs.h | 2 +- + include/net/vxlan.h | 16 +- + include/scsi/scsi_transport_fc.h | 15 +- + include/trace/events/fib6.h | 2 +- + include/trace/events/kmem.h | 42 +- + include/trace/events/thermal.h | 16 +- + include/trace/events/tlb.h | 4 +- + include/trace/events/writeback.h | 121 +- + include/uapi/linux/ethtool.h | 6 +- + include/uapi/linux/if_link.h | 2 + + kernel/events/core.c | 114 +- + kernel/events/ring_buffer.c | 6 +- + kernel/exit.c | 2 +- + kernel/power/hibernate.c | 1 + + 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 + + kernel/softirq.c | 2 +- + kernel/time/timer.c | 11 + + kernel/trace/ftrace.c | 41 +- + kernel/trace/trace.c | 36 +- + kernel/trace/trace.h | 113 +- + kernel/trace/trace_events_filter.c | 12 - + kernel/trace/trace_events_trigger.c | 88 +- + kernel/trace/trace_functions.c | 6 + + kernel/trace/trace_functions_graph.c | 1 + + kernel/trace/trace_irqsoff.c | 9 +- + kernel/trace/trace_nop.c | 4 +- + kernel/trace/trace_output.c | 10 +- + kernel/trace/trace_printk.c | 3 + + kernel/trace/trace_syscalls.c | 11 + + lib/Kconfig | 4 + + lib/Kconfig.debug | 2 +- + lib/Kconfig.kasan | 5 +- + lib/Makefile | 3 + + lib/stackdepot.c | 284 +++ + lib/test_kasan.c | 30 +- + mm/Makefile | 1 + + mm/filemap.c | 7 +- + mm/huge_memory.c | 2 +- + mm/internal.h | 5 + + mm/kasan/kasan.c | 162 +- + mm/kasan/kasan.h | 37 + + mm/kasan/report.c | 62 +- + mm/memory.c | 17 +- + mm/mempool.c | 16 +- + mm/oom_kill.c | 196 +- + mm/page_alloc.c | 46 +- + mm/slab.c | 42 +- + mm/slab.h | 2 +- + mm/slab_common.c | 6 +- + mm/slub.c | 15 +- + net/Kconfig | 2 +- + net/bridge/br_if.c | 16 + + net/ceph/ceph_common.c | 4 +- + net/ceph/debugfs.c | 17 +- + net/ceph/messenger.c | 29 +- + net/ceph/mon_client.c | 457 ++-- + net/ceph/osd_client.c | 109 +- + 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 | 26 +- + net/ipv4/fib_frontend.c | 16 +- + net/ipv4/fou.c | 13 +- + net/ipv4/gre_offload.c | 6 + + net/ipv4/ip_tunnel_core.c | 3 +- + net/ipv4/udp.c | 12 +- + net/ipv4/udp_offload.c | 7 +- + net/ipv6/ip6_offload.c | 15 +- + net/ipv6/ping.c | 59 +- + net/ipv6/sit.c | 6 +- + net/netlink/af_netlink.c | 10 +- + 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 +- + 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 ++-- + net/vmw_vsock/af_vsock.c | 155 +- + 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/sortextable.c | 1 + + scripts/tags.sh | 2 + + tools/include/linux/stringify.h | 12 + + tools/lib/api/Makefile | 2 +- + tools/lib/subcmd/Makefile | 2 +- + tools/lib/traceevent/event-parse.c | 4 +- + tools/perf/Documentation/Makefile | 2 +- + tools/perf/Documentation/perf-list.txt | 6 +- + tools/perf/Makefile.perf | 2 +- + tools/perf/arch/powerpc/util/header.c | 4 +- + tools/perf/bench/bench.h | 22 +- + tools/perf/bench/mem-memcpy-arch.h | 2 +- + tools/perf/bench/mem-memset-arch.h | 2 +- + tools/perf/bench/numa.c | 2 +- + tools/perf/builtin-annotate.c | 2 +- + tools/perf/builtin-diff.c | 2 +- + tools/perf/builtin-help.c | 69 +- + tools/perf/builtin-inject.c | 8 +- + tools/perf/builtin-mem.c | 2 +- + tools/perf/builtin-report.c | 3 +- + tools/perf/builtin-script.c | 46 +- + tools/perf/builtin-timechart.c | 2 +- + tools/perf/builtin-top.c | 8 +- + tools/perf/builtin-trace.c | 9 +- + tools/perf/builtin.h | 64 +- + tools/perf/config/Makefile | 2 +- + tools/perf/tests/code-reading.c | 5 +- + tools/perf/tests/dwarf-unwind.c | 4 +- + tools/perf/tests/hists_common.c | 6 +- + tools/perf/tests/hists_cumulate.c | 9 +- + tools/perf/tests/hists_filter.c | 9 +- + tools/perf/tests/hists_link.c | 20 +- + tools/perf/tests/hists_output.c | 9 +- + tools/perf/ui/gtk/hists.c | 2 +- + tools/perf/util/Build | 1 - + tools/perf/util/abspath.c | 37 - + tools/perf/util/annotate.h | 2 +- + tools/perf/util/auxtrace.h | 2 +- + tools/perf/util/build-id.c | 3 +- + tools/perf/util/cache.h | 24 +- + tools/perf/util/callchain.h | 4 +- + tools/perf/util/cgroup.h | 4 +- + tools/perf/util/cloexec.h | 2 +- + tools/perf/util/data-convert-bt.c | 2 +- + tools/perf/util/db-export.c | 2 +- + tools/perf/util/dso.h | 3 +- + tools/perf/util/dwarf-aux.c | 10 +- + tools/perf/util/dwarf-aux.h | 72 +- + tools/perf/util/event.c | 23 +- + tools/perf/util/event.h | 13 +- + tools/perf/util/evsel.c | 1 + + tools/perf/util/genelf.h | 8 +- + tools/perf/util/header.c | 5 - + tools/perf/util/header.h | 2 +- + tools/perf/util/hist.c | 2 +- + tools/perf/util/hist.h | 3 +- + tools/perf/util/intel-bts.c | 2 +- + tools/perf/util/jit.h | 12 +- + tools/perf/util/llvm-utils.c | 24 +- + tools/perf/util/llvm-utils.h | 7 +- + tools/perf/util/machine.c | 14 +- + tools/perf/util/machine.h | 2 +- + tools/perf/util/parse-events.h | 21 +- + tools/perf/util/path.c | 30 - + tools/perf/util/probe-event.c | 2 +- + tools/perf/util/probe-event.h | 57 +- + tools/perf/util/probe-finder.c | 8 +- + tools/perf/util/probe-finder.h | 24 +- + tools/perf/util/quote.h | 2 +- + tools/perf/util/session.c | 5 +- + tools/perf/util/sort.c | 2 +- + tools/perf/util/stat-shadow.c | 18 +- + tools/perf/util/strbuf.c | 9 +- + tools/perf/util/strbuf.h | 21 +- + tools/perf/util/svghelper.h | 51 +- + tools/perf/util/symbol-elf.c | 12 +- + tools/perf/util/symbol.h | 4 +- + tools/perf/util/usage.c | 8 +- + tools/perf/util/util.h | 27 +- + tools/perf/util/wrapper.c | 12 - + tools/{perf/config => scripts}/utilities.mak | 0 + tools/testing/selftests/x86/Makefile | 2 +- + tools/testing/selftests/x86/iopl.c | 135 ++ + 804 files changed, 34385 insertions(+), 8723 deletions(-) + create mode 100644 Documentation/ABI/stable/sysfs-fs-orangefs + create mode 100644 Documentation/devicetree/bindings/mtd/qcom_nandc.txt + create mode 100644 Documentation/devicetree/bindings/rtc/maxim,mcp795.txt + create mode 100644 Documentation/devicetree/bindings/thermal/mediatek-thermal.txt + create mode 100644 Documentation/filesystems/nfs/pnfs-scsi-server.txt + create mode 100644 Documentation/filesystems/orangefs.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%) + create mode 100644 arch/x86/events/amd/power.c + create mode 100644 drivers/mtd/nand/qcom_nandc.c + create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_ppm.c + create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_ppm.h + create mode 100644 drivers/platform/x86/dell-smbios.c + create mode 100644 drivers/platform/x86/dell-smbios.h + create mode 100644 drivers/scsi/ufs/ufs_quirks.h + delete mode 100644 drivers/staging/ste_rmi4/Kconfig + delete mode 100644 drivers/staging/ste_rmi4/Makefile + delete mode 100644 drivers/staging/ste_rmi4/TODO + delete mode 100644 drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c + delete mode 100644 drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h + create mode 100644 drivers/thermal/mtk_thermal.c + 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 + create mode 100644 fs/ubifs/misc.c + delete mode 100644 include/asm-generic/io-64-nonatomic-hi-lo.h + delete mode 100644 include/asm-generic/io-64-nonatomic-lo-hi.h + create mode 100644 include/linux/stackdepot.h + create mode 100644 lib/stackdepot.c + create mode 100644 scripts/coccinelle/api/setup_timer.cocci + create mode 100644 tools/include/linux/stringify.h + delete mode 100644 tools/perf/util/abspath.c + rename tools/{perf/config => scripts}/utilities.mak (100%) + create mode 100644 tools/testing/selftests/x86/iopl.c +Merging fixes/master (36f90b0a2ddd Linux 4.5-rc2) +$ git merge fixes/master +Already up-to-date. +$ git am -3 ../patches/0001-perf-tools-we-stil-need-header.h-for-various-things.patch +Applying: perf tools: we stil need header.h for various things +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 (322cea2f41ad bpf: add missing map_flags to bpf_map_show_fdinfo) +$ git merge net/master +Merge made by the 'recursive' strategy. + Documentation/networking/switchdev.txt | 2 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 16 ++++++--- + drivers/net/ethernet/broadcom/genet/bcmgenet.h | 6 ++++ + drivers/net/ethernet/cadence/macb.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c | 3 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 12 +++---- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 40 ++++++++++++---------- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 2 ++ + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 16 ++++----- + drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 4 +-- + kernel/bpf/syscall.c | 6 ++-- + net/core/netpoll.c | 3 +- + net/switchdev/switchdev.c | 2 +- + net/xfrm/xfrm_input.c | 3 ++ + 14 files changed, 70 insertions(+), 47 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 (2acd84648554 rtlwifi: fix gcc-6 indentation warning) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/bcma/main.c | 17 ++++------------- + drivers/net/wireless/broadcom/b43/main.c | 6 ++++-- + drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c | 6 +++--- + 3 files changed, 11 insertions(+), 18 deletions(-) +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 (91d2178e26fd ALSA: timer: fix gparams ioctl compatibility for different architectures) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/core/timer.c | 20 +++++++++++++------- + sound/core/timer_compat.c | 30 +++++++++++++++++++++++++++++- + 2 files changed, 42 insertions(+), 8 deletions(-) +Merging pci-current/for-linus (9188269a2e8e Revert "PCI: dra7xx: Mark driver as broken") +$ git merge pci-current/for-linus +Already up-to-date. +Merging driver-core.current/driver-core-linus (1d02369dba2c Merge branch 'for-linus' of git://git.kernel.dk/linux-block) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (1d02369dba2c Merge branch 'for-linus' of git://git.kernel.dk/linux-block) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (1d02369dba2c Merge branch 'for-linus' of git://git.kernel.dk/linux-block) +$ 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 (1d02369dba2c Merge branch 'for-linus' of git://git.kernel.dk/linux-block) +$ 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 (d314e9e80c5e Input: sur40 - fix DMA on stack) +$ git merge input-current/for-linus +Already up-to-date. +Merging crypto-current/master (e54358915d0a PKCS#7: pkcs7_validate_trust(): initialize the _trusted output argument) +$ git merge crypto-current/master +Auto-merging crypto/asymmetric_keys/pkcs7_trust.c +Merge made by the 'recursive' strategy. + crypto/asymmetric_keys/pkcs7_trust.c | 2 ++ + 1 file changed, 2 insertions(+) +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 +Already up-to-date. +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 +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 313 +++++++++++++++++++++++++++++++++ + 1 file changed, 313 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging at91/at91-next (772c75951fa9 Merge tag 'at91-fixes' 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 (1bdd5a9b339c ARM: dts: k2*: Rename the k2* files to keystone-k2* files) +$ git merge keystone/next +Auto-merging arch/arm/boot/dts/keystone-k2l.dtsi +Auto-merging arch/arm/boot/dts/keystone-k2l-evm.dts +Auto-merging arch/arm/boot/dts/keystone-k2hk.dtsi +Auto-merging arch/arm/boot/dts/keystone-k2hk-evm.dts +Auto-merging arch/arm/boot/dts/keystone-k2e.dtsi +Auto-merging arch/arm/boot/dts/keystone-k2e-evm.dts +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + arch/arm/boot/dts/Makefile | 6 +++--- + arch/arm/boot/dts/{k2e-clocks.dtsi => keystone-k2e-clocks.dtsi} | 0 + arch/arm/boot/dts/{k2e-evm.dts => keystone-k2e-evm.dts} | 2 +- + arch/arm/boot/dts/{k2e-netcp.dtsi => keystone-k2e-netcp.dtsi} | 0 + arch/arm/boot/dts/{k2e.dtsi => keystone-k2e.dtsi} | 4 ++-- + arch/arm/boot/dts/{k2hk-clocks.dtsi => keystone-k2hk-clocks.dtsi} | 0 + arch/arm/boot/dts/{k2hk-evm.dts => keystone-k2hk-evm.dts} | 2 +- + arch/arm/boot/dts/{k2hk-netcp.dtsi => keystone-k2hk-netcp.dtsi} | 0 + arch/arm/boot/dts/{k2hk.dtsi => keystone-k2hk.dtsi} | 4 ++-- + arch/arm/boot/dts/{k2l-clocks.dtsi => keystone-k2l-clocks.dtsi} | 0 + arch/arm/boot/dts/{k2l-evm.dts => keystone-k2l-evm.dts} | 2 +- + arch/arm/boot/dts/{k2l-netcp.dtsi => keystone-k2l-netcp.dtsi} | 0 + arch/arm/boot/dts/{k2l.dtsi => keystone-k2l.dtsi} | 4 ++-- + 14 files changed, 13 insertions(+), 13 deletions(-) + rename arch/arm/boot/dts/{k2e-clocks.dtsi => keystone-k2e-clocks.dtsi} (100%) + rename arch/arm/boot/dts/{k2e-evm.dts => keystone-k2e-evm.dts} (98%) + rename arch/arm/boot/dts/{k2e-netcp.dtsi => keystone-k2e-netcp.dtsi} (100%) + rename arch/arm/boot/dts/{k2e.dtsi => keystone-k2e.dtsi} (97%) + rename arch/arm/boot/dts/{k2hk-clocks.dtsi => keystone-k2hk-clocks.dtsi} (100%) + rename arch/arm/boot/dts/{k2hk-evm.dts => keystone-k2hk-evm.dts} (99%) + rename arch/arm/boot/dts/{k2hk-netcp.dtsi => keystone-k2hk-netcp.dtsi} (100%) + rename arch/arm/boot/dts/{k2hk.dtsi => keystone-k2hk.dtsi} (96%) + rename arch/arm/boot/dts/{k2l-clocks.dtsi => keystone-k2l-clocks.dtsi} (100%) + rename arch/arm/boot/dts/{k2l-evm.dts => keystone-k2l-evm.dts} (98%) + rename arch/arm/boot/dts/{k2l-netcp.dtsi => keystone-k2l-netcp.dtsi} (100%) + rename arch/arm/boot/dts/{k2l.dtsi => keystone-k2l.dtsi} (96%) +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. +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 96750dfbf4fd] Merge remote-tracking branch 'omap/for-next' +$ git diff -M --stat --summary HEAD^.. + 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 + + 3 files changed, 240 insertions(+), 31 deletions(-) +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 7b722ed86561] 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 (1ee969dbc199 Merge branch 'v4.6-armsoc/dts64-fixes' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + arch/arm/mach-rockchip/platsmp.c | 2 +- + arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) +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 (079017960a68 Merge branch 'fixes' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 +Already up-to-date! +Merge made by the 'recursive' strategy. +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 (691b1e2ebf72 arm64: mm: allow preemption in copy_to_user_page) +$ git merge arm64/for-next/core +Already up-to-date. +Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe) +$ git merge blackfin/for-linus +Resolved 'arch/blackfin/mach-common/pm.c' using previous resolution. +Auto-merging arch/blackfin/mach-common/pm.c +CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ae975d517e93] Merge remote-tracking branch 'blackfin/for-linus' +$ git diff -M --stat --summary HEAD^.. +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 (8cad489261c5 h8300: switch EARLYCON) +$ git merge h8300/h8300-next +Already up-to-date. +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 (10f4b26deb41 microblaze/PCI: export isa_io_base to fix link errors) +$ git merge microblaze/next +Auto-merging arch/microblaze/pci/pci-common.c +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 +++ + arch/microblaze/pci/pci-common.c | 2 ++ + 4 files changed, 9 insertions(+), 1 deletion(-) +Merging mips/mips-for-linux-next (8628008513d7 Merge branch '4.6-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Auto-merging drivers/firmware/broadcom/bcm47xx_sprom.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/qca,ath79-pll.txt | 6 +- + .../devicetree/bindings/mips/cavium/ciu3.txt | 27 + + .../devicetree/bindings/vendor-prefixes.txt | 3 + + arch/mips/Kconfig | 7 +- + arch/mips/alchemy/common/dbdma.c | 4 +- + arch/mips/ath79/Kconfig | 12 - + arch/mips/ath79/clock.c | 241 +++++--- + arch/mips/ath79/setup.c | 65 +- + 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 | 7 +- + arch/mips/boot/dts/qca/ar9132.dtsi | 19 +- + arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts | 100 ++- + arch/mips/boot/dts/qca/ar9331.dtsi | 155 +++++ + arch/mips/boot/dts/qca/ar9331_dpt_module.dts | 78 +++ + arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts | 102 ++++ + arch/mips/boot/dts/qca/ar9331_omega.dts | 78 +++ + arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts | 118 ++++ + 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-features.h | 4 + + arch/mips/include/asm/cpu-info.h | 4 +- + arch/mips/include/asm/cpu-type.h | 5 + + arch/mips/include/asm/cpu.h | 9 +- + arch/mips/include/asm/elf.h | 5 + + 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 | 8 +- + arch/mips/include/asm/mips-cpc.h | 3 + + arch/mips/include/asm/mips-r2-to-r6-emul.h | 2 +- + arch/mips/include/asm/mipsregs.h | 1 + + 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/smp-cps.h | 2 +- + 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/cps-vec.S | 296 +++++---- + arch/mips/kernel/cpu-probe.c | 13 + + arch/mips/kernel/mips-cm.c | 2 +- + arch/mips/kernel/mips-r2-to-r6-emul.c | 12 +- + arch/mips/kernel/module-rela.c | 75 ++- + arch/mips/kernel/module.c | 77 ++- + arch/mips/kernel/perf_event_mipsxx.c | 8 +- + arch/mips/kernel/pm-cps.c | 17 +- + arch/mips/kernel/process.c | 2 +- + arch/mips/kernel/smp-cps.c | 64 +- + arch/mips/kernel/smp.c | 12 + + arch/mips/kernel/spram.c | 1 + + arch/mips/kernel/traps.c | 33 +- + arch/mips/kvm/tlb.c | 2 +- + arch/mips/kvm/trap_emul.c | 2 +- + arch/mips/lantiq/Kconfig | 12 +- + arch/mips/lantiq/prom.c | 13 +- + 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/c-r4k.c | 2 + + arch/mips/mm/sc-ip22.c | 2 +- + arch/mips/mm/sc-mips.c | 1 + + 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 +- + drivers/irqchip/irq-mips-gic.c | 22 +- + include/dt-bindings/clock/ath79-clk.h | 19 + + include/linux/bcm47xx_sprom.h | 24 + + include/linux/irqchip/mips-gic.h | 17 + + tools/testing/selftests/seccomp/seccomp_bpf.c | 30 +- + 108 files changed, 3884 insertions(+), 857 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/boot/dts/qca/ar9331.dtsi + create mode 100644 arch/mips/boot/dts/qca/ar9331_dpt_module.dts + create mode 100644 arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts + create mode 100644 arch/mips/boot/dts/qca/ar9331_omega.dts + create mode 100644 arch/mips/boot/dts/qca/ar9331_tl_mr3020.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/dt-bindings/clock/ath79-clk.h + 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 (119a0a3c13ef parisc: Wire up preadv2 and pwritev2 syscalls) +$ 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 (37da5234dfa8 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 +Already up-to-date. +Merging btrfs-kdave/for-next (2f06df5ab100 Merge branch 'for-next-4.6-20160324' into for-next-20160324) +$ 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 | 64 +++++---- + fs/btrfs/extent_io.c | 39 ++++-- + fs/btrfs/file.c | 9 +- + fs/btrfs/inode-item.c | 2 +- + fs/btrfs/inode.c | 264 ++++++++++++++++++++++++++++++++++- + fs/btrfs/ioctl.c | 66 ++++++++- + fs/btrfs/relocation.c | 3 +- + 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, 666 insertions(+), 342 deletions(-) +Merging ceph/master (7c886661dc31 libceph: use KMEM_CACHE macro) +$ git merge ceph/master +Auto-merging drivers/block/rbd.c +Merge made by the 'recursive' strategy. + drivers/block/rbd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging cifs/for-next (b562e44f507e Linux 4.5) +$ git merge cifs/for-next +Already up-to-date. +Merging configfs/for-next (96c22a329351 configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions) +$ git merge configfs/for-next +Merge made by the 'recursive' strategy. + include/linux/configfs.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +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 (3d43bcfef5f0 ext4 crypto: use dget_parent() in ext4_d_revalidate()) +$ git merge ext4/dev +Auto-merging include/linux/fs.h +Auto-merging fs/nfs/nfs4file.c +Auto-merging fs/nfs/inode.c +Merge made by the 'recursive' strategy. + fs/dcache.c | 5 ++++- + fs/ext4/crypto.c | 49 +++++++++++++++++++++++++++++-------------------- + fs/ext4/ext4.h | 6 ++++-- + fs/ext4/file.c | 12 ++++++++---- + fs/ext4/page-io.c | 14 +++++++++++++- + fs/ext4/readpage.c | 2 +- + fs/ext4/xattr.c | 32 ++++++++++++++++++++++++++++---- + fs/nfs/dir.c | 6 +++--- + fs/nfs/inode.c | 2 +- + fs/nfs/nfs4file.c | 4 ++-- + fs/overlayfs/super.c | 33 +++++++++++++++++++++++++++++++++ + include/linux/dcache.h | 10 ++++++++++ + include/linux/fs.h | 10 ++++++++++ + 13 files changed, 146 insertions(+), 39 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 +Already up-to-date. +Merging gfs2/for-next (3e11e5304150 GFS2: ignore unlock failures after withdraw) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/glock.c | 9 ++++++++- + fs/gfs2/util.c | 1 + + 2 files changed, 9 insertions(+), 1 deletion(-) +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 (606c61a05796 Merge branch 'akpm' (patches from Andrew)) +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next (ac503e4a309a nfsd: use short read as well as i_size to set eof) +$ git merge nfsd/nfsd-next +Already up-to-date. +Merging orangefs/for-next (45996492e5c8 orangefs: fix orangefs_superblock locking) +$ git merge orangefs/for-next +Already up-to-date. +Merging overlayfs/overlayfs-next (e3608e3f68f6 Btrfs: fix crash/invalid memory access on fsync when using overlayfs) +$ git merge overlayfs/overlayfs-next +Auto-merging fs/overlayfs/super.c +Auto-merging fs/btrfs/file.c +Merge made by the 'recursive' strategy. + fs/btrfs/file.c | 2 +- + fs/namei.c | 48 ++++++++++++++++++++++++++++++++++++++---------- + fs/overlayfs/super.c | 2 +- + include/linux/namei.h | 2 ++ + 4 files changed, 42 insertions(+), 12 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 +Already up-to-date. +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 +Already up-to-date. +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 (0dcdd3ba27cb sound/usb: fix to release stream resources from media_snd_device_delete()) +$ git merge v4l-dvb/master +Auto-merging sound/usb/card.c +Merge made by the 'recursive' strategy. + drivers/media/media-device.c | 143 ++++++++++++++++++++++---------- + drivers/media/media-devnode.c | 3 + + drivers/media/media-entity.c | 16 ++-- + drivers/media/usb/au0828/au0828-cards.c | 4 - + drivers/media/usb/au0828/au0828-core.c | 74 ++++++++++++----- + drivers/media/usb/au0828/au0828-input.c | 4 +- + drivers/media/usb/au0828/au0828-video.c | 63 +++++++------- + drivers/media/usb/au0828/au0828.h | 9 +- + drivers/media/v4l2-core/v4l2-mc.c | 2 +- + include/media/media-device.h | 38 +++++++-- + sound/usb/card.c | 2 +- + sound/usb/media.c | 30 ++++--- + 12 files changed, 247 insertions(+), 141 deletions(-) +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 (15dbc136dff6 Merge tag 'pm+acpi-4.6-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) +$ git merge pm/linux-next +Already up-to-date. +Merging idle/next (31ade3b83e18 Linux 4.4-rc3) +$ git merge idle/next +Already up-to-date. +Merging thermal/next (81ad4276b505 Thermal: Ignore invalid trip points) +$ git merge thermal/next +Already up-to-date. +Merging thermal-soc/next (44fa372da981 Merge branch 'work-linus' into work-next) +$ git merge thermal-soc/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64) +$ 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 (e46b4e2b46e1 Merge tag 'trace-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) +$ 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/netlink/af_netlink.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 +Already up-to-date. +Merging mtd/master (a2d4fa1acbb9 Merge MTD 4.6 development into 4.5 fixes) +$ git merge mtd/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging l2-mtd/master (a2d4fa1acbb9 Merge MTD 4.6 development into 4.5 fixes) +$ git merge l2-mtd/master +Already up-to-date. +Merging crypto/master (34074205bb9f crypto: qat - remove redundant arbiter configuration) +$ git merge crypto/master +Already up-to-date. +Merging drm/drm-next (4604202ca8d2 Merge branch 'drm-next-4.6' of git://people.freedesktop.org/~agd5f/linux into drm-next) +$ 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 +Already up-to-date. +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 c62e0e3ecc68] 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 +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too) +$ git merge kconfig/for-next +Already up-to-date. +Merging regmap/for-next (46a1026cc1a0 Merge remote-tracking branches 'regmap/fix/be' and 'regmap/fix/doc' into regmap-linus) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regmap/regmap.txt | 59 +++++++--------------- + drivers/base/regmap/regmap-mmio.c | 2 +- + 2 files changed, 20 insertions(+), 41 deletions(-) +Merging sound/for-next (91d2178e26fd ALSA: timer: fix gparams ioctl compatibility for different architectures) +$ 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 (d314e9e80c5e Input: sur40 - fix DMA on stack) +$ git merge input/next +Already up-to-date. +Merging block/for-next (258b83ad9930 Merge branch 'for-linus' into for-next) +$ git merge block/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging device-mapper/for-next (ef6e0d57417a dm raid1: do not error successfully written bios during suspend) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + drivers/md/dm-raid1.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +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 (dd3506a611d9 mfd: lp8788-irq: Uninitialized variable in irq handler) +$ git merge mfd/for-mfd-next +Merge made by the 'recursive' strategy. + drivers/mfd/axp20x.c | 3 +++ + drivers/mfd/da9063-irq.c | 2 -- + drivers/mfd/intel_quark_i2c_gpio.c | 45 +++++++++++++++++++++++--------------- + drivers/mfd/lp8788-irq.c | 2 +- + drivers/mfd/mfd-core.c | 2 +- + include/linux/mfd/syscon.h | 1 + + 6 files changed, 33 insertions(+), 22 deletions(-) +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 (e3eeaf3d7f21 Merge remote-tracking branches 'regulator/fix/constrain' and 'regulator/fix/gpio' into regulator-linus) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + drivers/regulator/core.c | 43 ++++++++++++++++++++++---------------- + drivers/regulator/gpio-regulator.c | 2 ++ + drivers/regulator/of_regulator.c | 6 ++---- + 3 files changed, 29 insertions(+), 22 deletions(-) +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 +Already up-to-date. +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 (aca04ce5dbda Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge mailbox/mailbox-for-next +Already up-to-date. +Merging spi/for-next (78b5a17c35bd Merge remote-tracking branches 'spi/fix/omap2' and '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-omap2-mcspi.c | 62 ++++++++++++------------------------------- + drivers/spi/spi-rockchip.c | 2 +- + drivers/spi/spi.c | 4 +-- + 4 files changed, 34 insertions(+), 50 deletions(-) +Merging tip/auto-latest (e05968d2e5ab Merge branch 'sched/urgent') +$ git merge tip/auto-latest +Resolved 'arch/x86/Kconfig' using previous resolution. +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 +[master 933a38c4ef4e] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. +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 c368e245b922] 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 (7e6867bf831c tracing: Record and show NMI state) +$ git merge ftrace/for-next +Already up-to-date. +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 (aca04ce5dbda Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ 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 +Already up-to-date. +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 (fffcad87d4e7 hp-wmi: Remove GPS rfkill support via pre-2009 interface) +$ git merge drivers-x86/for-next +Already up-to-date. +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 (1d02369dba2c Merge branch 'for-linus' of git://git.kernel.dk/linux-block) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (1d02369dba2c Merge branch 'for-linus' of git://git.kernel.dk/linux-block) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (1d02369dba2c Merge branch 'for-linus' of git://git.kernel.dk/linux-block) +$ 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 (1d02369dba2c Merge branch 'for-linus' of git://git.kernel.dk/linux-block) +$ 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 (fd30a352d56b Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging target-updates/for-next (5e47f1985d71 target: Fix target_release_cmd_kref shutdown comp leak) +$ git merge target-updates/for-next +Already up-to-date. +Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile) +$ git merge target-merge/for-next-merge +Already up-to-date. +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 (968f3e374faf Merge branch 'for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs) +$ 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. +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 +Already up-to-date. +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 0e632ce76e70] Merge remote-tracking branch 'coresight/next' +$ git diff -M --stat --summary HEAD^.. +Merging rtc/rtc-next (ee087744247c rtc: abx80x: handle the oscillator failure bit) +$ git merge rtc/rtc-next +Already up-to-date. +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 (a2b056ea291d x86, pmem: use memcpy_mcsafe() for memcpy_from_pmem()) +$ git merge nvdimm/libnvdimm-for-next +Merge made by the 'recursive' strategy. + arch/x86/include/asm/pmem.h | 9 +++++++++ + drivers/nvdimm/pmem.c | 4 ++-- + include/linux/pmem.h | 15 +++++++++------ + 3 files changed, 20 insertions(+), 8 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 0e632ce76e70 Merge remote-tracking branch 'coresight/next' +Merging next-20160324 version of nvdimm +$ git merge -m next-20160324/nvdimm 489011652a2d5555901def04c24d68874e8ba9a1 +Already up-to-date. +Merging akpm-current/current (c0b923091eea ipc/msg.c: use freezable blocking call) +$ git merge --no-ff akpm-current/current +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/vm/ksm.txt | 63 ++++ + MAINTAINERS | 1 - + arch/arm/include/asm/page.h | 2 + + arch/x86/kernel/machine_kexec_64.c | 46 +++ + block/genhd.c | 2 +- + fs/ext4/fsync.c | 5 +- + fs/ocfs2/alloc.c | 3 +- + fs/ocfs2/cluster/heartbeat.c | 180 ++++++++- + fs/ocfs2/ocfs2_fs.h | 2 +- + include/linux/bootmem.h | 16 +- + include/linux/compiler-gcc.h | 1 + + include/linux/compiler.h | 4 + + include/linux/crc64_ecma.h | 56 +++ + include/linux/device.h | 12 +- + include/linux/kasan.h | 30 +- + include/linux/kernel.h | 4 +- + include/linux/kexec.h | 4 + + include/linux/mempool.h | 3 +- + include/linux/nodemask.h | 18 +- + include/linux/sem.h | 1 + + include/linux/slab.h | 16 +- + include/linux/string.h | 3 +- + include/linux/swap.h | 1 + + include/trace/events/huge_memory.h | 38 +- + init/main.c | 9 +- + ipc/msg.c | 5 +- + ipc/sem.c | 124 ++++--- + kernel/cpuset.c | 8 +- + kernel/kexec.c | 119 +++--- + kernel/kexec_core.c | 6 + + kernel/kexec_file.c | 8 +- + lib/Kconfig | 7 + + lib/Makefile | 1 + + lib/crc64_ecma.c | 341 +++++++++++++++++ + lib/test_kasan.c | 29 ++ + mm/backing-dev.c | 20 +- + mm/huge_memory.c | 88 ++++- + mm/hugetlb.c | 4 +- + mm/internal.h | 4 + + mm/kasan/Makefile | 4 + + mm/kasan/kasan.c | 71 +++- + mm/kasan/kasan.h | 11 +- + mm/kasan/quarantine.c | 289 +++++++++++++++ + mm/kasan/report.c | 1 + + mm/ksm.c | 733 +++++++++++++++++++++++++++++++++---- + mm/memblock.c | 3 + + mm/memcontrol.c | 4 +- + mm/memory.c | 2 +- + mm/mempolicy.c | 8 +- + mm/mempool.c | 7 +- + mm/page_alloc.c | 124 ++++++- + mm/page_isolation.c | 9 +- + mm/slab.c | 28 +- + mm/slab.h | 2 + + mm/slab_common.c | 2 + + mm/slub.c | 4 +- + mm/util.c | 30 ++ + mm/vmscan.c | 25 +- + 58 files changed, 2304 insertions(+), 337 deletions(-) + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 lib/crc64_ecma.c + create mode 100644 mm/kasan/quarantine.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression +Applying: staging/goldfish: use 6-arg get_user_pages() +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 783991918044...5c6227b4cce4 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (5c6227b4cce4 staging/goldfish: use 6-arg get_user_pages()) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 3 +-- + drivers/platform/goldfish/goldfish_pipe.c | 3 +-- + 2 files changed, 2 insertions(+), 4 deletions(-) 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..7c1ca6bc071f --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20160327 |