Add linux-next specific files for 20150507
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 0000000..c5ef1e9
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,216 @@
+Name SHA1
+---- ----
+origin 0e1dc4274828f64fcb56fc7b950acdc5ff7a395f
+fixes b94d525e58dc9638dd3f98094cb468bcfb262039
+kbuild-current c517d838eb7d07bbe9507871fab3931deccff539
+arc-current e4140819dadc3624accac8294881bca8a3cba4ed
+arm-current 3b8786ff7a1b31645ae2c26a2ec32dbd42ac1094
+m68k-current b24f670b7f5b2058b95370caa9f104b3cefb9f1d
+metag-fixes 0164a711c97b0beeb7994b7d32ccddf586b6d81a
+mips-fixes 1795cd9b3a91d4b5473c97f491d63892442212ab
+powerpc-merge-mpe 0aab3747091db309b8a484cfd382a41644552aa3
+powerpc-merge c517d838eb7d07bbe9507871fab3931deccff539
+sparc acc455cffa75070d55e74fc7802b49edbc080e92
+net 31ccd0e66d41f73cfc21a8de976e713455205228
+ipsec bdddbf6996c0b9299efc97b8f66e06286f3aa8c9
+sound-current 2c674fac5b1603c6a2aacc88116e3fbc75ebd799
+pci-current 5ebe6afaf0057ac3eaeb98defd5456894b446d22
+wireless-drivers f673821864899153142365aca888435815ac93f0
+driver-core.current b787f68c36d49bb1d9236f403813641efa74a031
+tty.current 5ebe6afaf0057ac3eaeb98defd5456894b446d22
+usb.current 0d3bba0287d4e284c3ec7d3397e81eec920d5e7e
+usb-gadget-fixes c94e289f195e0e13cf34d27f9338d28221a85751
+usb-serial-fixes 82ee3aeb9295c5fc37fd2ddf20f13ac2b40ec97d
+staging.current b787f68c36d49bb1d9236f403813641efa74a031
+char-misc.current f26443a8ab768e475c53843882566ad317dbc283
+input-current 48853389f206b689260ddfd3006816779ca7a52a
+crypto-current f440c4ee3e53f767974fe60bcbc0b6687a5fb53f
+ide d681f1166919d6829083c069a83edcd59bfd5e34
+devicetree-current 41d9489319f28f06cf51731131bc353d5a6bce59
+rr-fixes f476893459318cb2eff3ecd2a05d4ceacf82e73e
+vfio-fixes db7d4d7f40215843000cb9d441c9149fd42ea36b
+kselftest-fixes b787f68c36d49bb1d9236f403813641efa74a031
+drm-intel-fixes 9fcb1704d1d51b12e2f03c78bca013d0cbbb7c98
+asm-generic 643165c8bbc8617d8222cb50c89e34fe64d226cf
+arc b787f68c36d49bb1d9236f403813641efa74a031
+arm 12f8e5bcab3f38308268f14ccf5674cd33cfc66c
+arm-perf b787f68c36d49bb1d9236f403813641efa74a031
+arm-soc 0f0175702e2e16f05577bf71aa70cf4409d6f0b4
+at91 da80a9f204eb215f4ef5c730d07e5b421aea7353
+bcm2835 b2776bf7149bddd1f4161f14f79520f17fc1d71d
+rpi 31fd7fe00b0d81f0d1707d1685df4bbe1df886ee
+berlin 4412971984ea1270c6009b3ba92eb32a43aab608
+cortex-m e799b6f37e6ccd7b97e3e2df62a30f1c5b211290
+imx-mxs 4df4d2a00e9cfbbec9931c716e09054c8c1e2ee5
+keystone b17275a4a6cc61e0b7da40558ff5c7250fb80917
+mvebu ae142bd9976532aa5232ab0b00e621690d8bfe6a
+omap e7309c2673a389a495fcfad70376d3bae8b9bc89
+omap-pending 30aa18d3bea5f9470af5aa48ab8df88bde97c795
+renesas 572fe7d849cecd2c2810075b606a42c5b9cd3bf6
+samsung 5d5443b9c3bac7231ae473c01bcfe4c7650b13c5
+sunxi fe1880278d83866ba7857fba2c40905753b2c9d8
+tegra 4fd17a72612679a3a9ce10f5bfafa7c6ca121c63
+arm64 6d1966dfd6e0ad2f8aa4b664ae1a62e33abe1998
+blackfin d91e14b3b9e1d8e1d552f4d6aff45551bbb410b1
+c6x 3083ca2376a76072dc0071fb211de80b0ac44bd1
+cris d939b52abe0cee9cc3167f554da6b864db86d3f2
+hexagon 8914d7e857807e1e60975000cba3750c9b2643e8
+ia64 62f269ef819156889b121ae27998e928b784c219
+m68k 2b8520f1f256cdbec68b6c29bfeecc6538ad81f7
+m68knommu 5ebe6afaf0057ac3eaeb98defd5456894b446d22
+metag 40346a0327fed526baeea701a707b65ceeea71ed
+microblaze c2219eda547813c0c50dba90d9e989ae36cc3ab8
+mips 3e20a26b02bd4f24945c87407df51948dd488620
+nios2 1a70db49a735350f221959bf26e9a12f63a743bc
+parisc-hd 5fec97d0e3d93717f1d6a958a03e579078088861
+powerpc-mpe b787f68c36d49bb1d9236f403813641efa74a031
+powerpc 65e7bb2a34fe7b5fc3ae4532308150c600188118
+fsl d41444daba1fd65e5a998c83398f44524f638d07
+mpc5xxx 9e813308a5c18c58f9ccae1ec72ed4e14eaf9025
+s390 6f469dae3aac85b337f7b54787e7f3c45be9741c
+sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc
+tile 148dae7e838a9b852de0014e724fe2d0fa7f73b1
+uml fe205bdd1321f95f8f3c35d243ea7cb22af8fbe1
+unicore32 d670878e2c9adb86b37e42b0937b2d4825bd2b39
+xtensa 06a631433460646b4537ca7a8137a84470adbd45
+btrfs e082f56313f374d723b0366978ddb062c8fe79ea
+ceph 84b54fefaa051ac625ada7740bb260a77c35b9b7
+cifs be4a8e38d68f71c5079ffaa55f0f623e0a64f6cf
+ecryptfs 6d65261a09adaa374c05de807f73a144d783669e
+ext3 3adc12e9648291149a1e3f354d0ad158fc2571e7
+ext4 2c869b262a10ca99cb866d04087d75311587a30c
+f2fs 68def41a3fde6248d98c509805453e630e3ff691
+fscache b00c2ae2ed3c0c40e0740549fe0e42e234a97dc2
+fuse 94e4fe2cab3d43b3ba7c3f721743006a8c9d913a
+gfs2 1272574bf94874a644ea82fad321034c15b157ac
+jfs 7d2ac45611b072a24e5014a56a65e6be31c1f884
+nfs b787f68c36d49bb1d9236f403813641efa74a031
+nfsd 72faedae8bc3504ee4252cebf14737a23677cb8f
+overlayfs 71cbad7e694ee81233b3be3a38b81c3d5872cc6f
+squashfs 62421645bb702c077ee5a462815525106cb53bcf
+v9fs 3d99e3fe13d473ac4578c37f477a59b829530764
+ubifs 502690674281a047abd45f81e64c498bc23a8bb3
+xfs 5ebe6afaf0057ac3eaeb98defd5456894b446d22
+file-locks 7505256626b0b3d11ea5a3ec1a89046d07c3c366
+vfs e1a9e9dd8594b9805efaf49ab0293cbaec0dc77c
+pci 5ebe6afaf0057ac3eaeb98defd5456894b446d22
+hid daa19c2afa6dbcd66195faf3972403647149c9c2
+i2c b787f68c36d49bb1d9236f403813641efa74a031
+jdelvare-hwmon 26bc420b59a38e4e6685a73345a0def461136dce
+dmi 9432bf142f77c23e81298a6e9b6e663aa1e1dc41
+hwmon-staging 0f8b11419e2f7d196dae7f8124cbc77c4b6b274e
+v4l-dvb e7f8fd8aa7f207dc58583750fe511b09f197b060
+kbuild d1809fd6c20c79cf4cfa23b1c1262acb0cadce99
+kconfig bfa76d49576599a4b9f9b7a71f23d73d6dcff735
+libata 236c810081dd58a44fec1e16495481f412cb3145
+pm 812f73d500b29194a044d0d3ab6c9704fef229a2
+idle 64887b6882de36069c18ef2d9623484d6db7cd3a
+apm 53675abbd1e54a30e621a9744bf9cce0712ddd6c
+thermal 7964293a1ebf88f9a08b27634caa6c9f1d0e9bde
+thermal-soc 488c7455d74ce0c354ea833c7fbbb6ba0a2330e9
+ieee1394 d71e6a11737f4b3d857425a1d6f893231cbd1296
+dlm 2ab4bd8ea3a6954bc79a9bbeb291cd6c2d6213a7
+swiotlb 8e0629c1d4ce86ce7d98ca8756f42769bb17a3c8
+slave-dma 428d96e91ee224eb9933b0a209c06baa9f6fb390
+net-next 239fb791d4ee194740e69fe9694f58ec404d1689
+ipsec-next de2ad486cb6cfdf3ef79a96a18d78bb1b135c0e0
+wireless-drivers-next 73b25f66dcae45d74e1641c52a3d96d041788e4e
+bluetooth 1add15646672ff4e7fe59bec2afcb5a0c80c5e49
+infiniband c1c2fef6cfb04cf30a56bb37cff40d3498d7edbf
+mtd b787f68c36d49bb1d9236f403813641efa74a031
+l2-mtd b787f68c36d49bb1d9236f403813641efa74a031
+crypto 09e217844a2e2d02a950bc9c129f6fe423e426e0
+drm cec32a47010647e8b0603726ebb75b990a4057a4
+drm-panel 1c550fa193d08920255240743f57731d4d57cd4d
+drm-intel 64354738ebab0327799dbf8ad94949a15c35aaac
+drm-tegra 535a65db484ff4e4654a037f2ea7e1ff21431b77
+drm-misc 8b80c007b40eed22b6af215eb3dfac42d8276b09
+drm-exynos 7b025c687af7429b33dfce952f8f386cbb9fff67
+drm-msm d5af49c92a8aff8236e7b0bb35e9af364000c017
+sound 3b90f4072730c619809a0cbf597bf1b3bf76a2ec
+sound-asoc 2cb4062164093a5de3aa231fac9842a900f4d96f
+modules 4a3893d069b788f3570c19c12d9e986e8e15870f
+input c615dcb6d13e6db3083507114fa3696be98d5211
+block fd42026fcd4bb34dda22d9d5070093a9959bdad0
+device-mapper cb31ef485dd4c6a205d1064b42027f82076d00c8
+mmc 11bc9381b277a65ea4b3fe994e658f4a78512139
+mmc-uh 75f65952d431aee8b97a20a9df2de1341ca8da01
+kgdb 2d289f14f00a0da6bae7c8415fc8dd9d030458b8
+md 9ffc8f7cb9647b13dfe4d1ad0d5e1427bb8b46d6
+mfd f4ed1f14b7c9114b56837124344124f3ec41d4df
+backlight b1f85c0fec20e6cde2a511345f24f6133f247e70
+battery 8ebb7e9c1a502cfc300618c19c3c6f06fc76d237
+omap_dss2 72fc8b7187cd846be08d3bc0fec9380fdad29b45
+regulator 5e803d489fb643b8ec04d75e173d04bde6aabfac
+security b787f68c36d49bb1d9236f403813641efa74a031
+integrity 0ce8300ef0d45d8a6da2649097ea95e4d5256d64
+selinux 6a878464e21a8a393559fee259dae26cbdc4b20d
+lblnet b2776bf7149bddd1f4161f14f79520f17fc1d71d
+watchdog fe92a2e3572742e6ff24bae0db00ccdc9bcff30f
+iommu 7f65ef01e131650d455875598099cd06fea6096b
+dwmw2-iommu 03ecc32c5274962b9b1904d7a730e71c95bac05f
+vfio 5a0ff17741c1785b27229a16b5ab77470d71b170
+osd 1fa3a002b2546c42c343c77c144871285896ced5
+jc_docs 197175427a221fe3200f7727ea35e261727e7228
+trivial 0e4f93e5017d9d8080bbd34db17836e090eb46fe
+audit 39a8804455fb23f09157341d3ba7db6d7ae6ee76
+devicetree a2166ca5f3204794e8b59f01c93a0f1564e3e138
+dt-rh 4760597116e34bd58f670d008ae7323653268fb4
+mailbox ee23d66af9219dfe2407a9b08ef9a165dbe6f994
+spi f32a0fa48ab151b499e8eb80233a1595433c8f46
+tip ea169fd39a682ca92f9b24850ed83863bfb01bb3
+clockevents 4c8305221193e14752e0fa833a38f856bbe1d22b
+edac fec53af531dd040e41fe358abe00b33747af2688
+edac-amd 7e52a03646af6fb45dd37c5375607858d65e9364
+irqchip a8bcdc32fafbeb236910e6ddc0161003a458ffc1
+tiny f114040e3ea6e07372334ade75d1ee0775c355e1
+ftrace c4b00d27e405a4c421c170d322b68380737af660
+rcu 7182f6825ff274cdc9ac7a6cc33af2d4117a4384
+kvm 2fa462f826210bbec65f8ed06d5ef4e0cd4f5450
+kvm-arm 2fa462f826210bbec65f8ed06d5ef4e0cd4f5450
+kvm-ppc b79013b2449c23f1f505bdf39c5a6c330338b244
+kvms390 816c7667ea97c61884e014cfeedaede5b67b0e58
+xen-tip 0b97b03d88b40bfbd7ff0e069186a137d9786d43
+percpu 4c907baf36d8339f393bb576d0bab29194d0e6ad
+workqueues 6888c6f279a742a3190e186f44de70951b3491fd
+drivers-x86 b787f68c36d49bb1d9236f403813641efa74a031
+chrome-platform 96cba9b00e297303774bec59e192064d20adeb3d
+regmap 637733e01bd43a9c6193397836d11a2f586ed181
+hsi 265ef3ee9575e6d150f485d28dbe153a50d27f4c
+leds a221e5c87ae291ddef9a3db9d4244544cb9b62a8
+ipmi 47995a38d8a137eed5d95450759e2f80f03cadf5
+driver-core b787f68c36d49bb1d9236f403813641efa74a031
+tty c1c325d703d347d967242efb8fef6a1c91a31aac
+usb b787f68c36d49bb1d9236f403813641efa74a031
+usb-gadget b787f68c36d49bb1d9236f403813641efa74a031
+usb-serial b787f68c36d49bb1d9236f403813641efa74a031
+staging fd5e2fd053e1042b12343fb6649449081ec1bab4
+char-misc b787f68c36d49bb1d9236f403813641efa74a031
+extcon 1401512465b865f1f05812ab0150a8e3a420007f
+kdbus 9fb9cd0f4434a23487b6ef3237e733afae90e336
+cgroup d0f702e648dc365070f1868ec291264ad27e65d8
+scsi 118c855b5623f3e2e6204f02623d88c09e0c34de
+target-updates cce0b8f8b7cfaf13dc512444ebf2ab9c243d500d
+target-merge b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed
+pinctrl 5e2742959a1c8a90812cabafedf59f82e7d534a6
+vhost f4aaa799cf9aed1467918743ad0f0823c880ce39
+remoteproc 172e6ab1caffcd2dd2910b44d88d096f2c6985fa
+rpmsg b1b9891441fa33fd0d49b5cb3aa7f04bca1cc1db
+gpio 10fc7f870b720479b0e7dba556d9d2040f0d6484
+dma-mapping 5ebe6afaf0057ac3eaeb98defd5456894b446d22
+pwm efb0de55b6a2ec15fc424e660601f22ae2fa487a
+dma-buf 5ebe6afaf0057ac3eaeb98defd5456894b446d22
+userns e0c9c0afd2fc958ffa34b697972721d81df8a56f
+ktest 7c2c49eceb79eb4738f38a00270830057b5bfb76
+clk 6aeec8abd0e8db6ff1571a195d64fda8313a2199
+random 7185ad2672a7d50bc384de0e38d90b75d99f3d82
+aio 5f785de588735306ec4d7c875caf9d28481c8b21
+llvmlinux 25d4aee23af28a6ef04d70a1028c012665384df1
+kselftest 5c6c3e612ef54f1e2bd3e8939933b59b4c8a7471
+y2038 ed8c2241c1ae1b64e4a783ae7a2c685c93142a8d
+luto-misc a6c5170d1edea97c538c81e377e56c7b5c5b7e63
+access_once bc465aa9d045feb0e13b4a8f32cc33c1943f62d6
+livepatching fd683e86d17e498fc2104b92fab9fefdd6b0ee13
+coresight 48582dcacc6b3af45aee8cdbf8fb1ac0c5d329d7
+akpm-current a3980f9598c603bdfe65a109d2557d53b838cc1c
+akpm 650c607ebdbe2ac1088ff3d5167911e301203714
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 0000000..40de82d
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,218 @@
+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
+mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips.git#mips-fixes
+powerpc-merge-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.git#fixes
+powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge
+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
+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
+wireless-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master
+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
+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
+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 git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-next
+rpi git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-rpi-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
+renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next
+samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.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
+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.rocketboards.org/linux-socfpga-next.git#nios2-next
+parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next
+powerpc-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.git#next
+powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.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
+ceph git git://github.com/ceph/ceph-client.git#master
+cifs git git://git.samba.org/sfrench/cifs-2.6.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
+overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next
+squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git#master
+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
+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
+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
+apm git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git#for-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
+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
+infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.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
+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
+mmc git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next
+mmc-uh git git://git.linaro.org/people/ulf.hansson/mmc.git#next
+kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next
+md git git://neil.brown.name/md#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
+selinux git git://git.infradead.org/users/pcmoore/selinux#next
+lblnet git git://git.infradead.org/users/pcmoore/lblnet#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
+osd git git://git.open-osd.org/linux-open-osd.git#linux-next
+jc_docs git git://git.lwn.net/linux-2.6.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
+tiny git git://git.kernel.org/pub/scm/linux/kernel/git/josh/linux.git#tiny/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
+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
+regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.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/cooloney/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
+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
+kdbus git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#kdbus
+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://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.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
+random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev
+aio git git://git.kvack.org/~bcrl/aio-next.git#master
+llvmlinux git git://git.linuxfoundation.org/llvmlinux/kernel.git#for-next
+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
+access_once 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
+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 0000000..3093f72b5
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,3918 @@
+$ date
+Thursday 7 May 10:22:12 AEST 2015
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at d9cee5d4f66e Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
+Merging origin/master (0e1dc4274828 Merge tag 'for-linus-4.1b-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip)
+$ git merge origin/master
+Updating d9cee5d4f66e..0e1dc4274828
+Fast-forward
+ Documentation/IPMI.txt | 5 +-
+ .../devicetree/bindings/rtc/abracon,abx80x.txt | 30 ++
+ Documentation/kasan.txt | 8 +-
+ MAINTAINERS | 2 +
+ arch/arm/include/asm/xen/page.h | 1 +
+ arch/arm/xen/mm.c | 15 +
+ arch/x86/boot/compressed/eboot.c | 2 +
+ arch/x86/include/asm/hypervisor.h | 2 +-
+ arch/x86/include/asm/spinlock.h | 2 +-
+ arch/x86/include/asm/xen/page.h | 5 +
+ arch/x86/kernel/cpu/hypervisor.c | 4 +-
+ arch/x86/kernel/cpu/perf_event_intel.c | 66 +++--
+ arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c | 12 +
+ arch/x86/kernel/process.c | 14 +-
+ arch/x86/mm/ioremap.c | 14 +-
+ arch/x86/xen/enlighten.c | 27 +-
+ arch/x86/xen/suspend.c | 10 +
+ drivers/block/xen-blkback/blkback.c | 35 +--
+ drivers/block/zram/zram_drv.c | 23 ++
+ drivers/char/ipmi/ipmi_msghandler.c | 4 +-
+ drivers/char/ipmi/ipmi_si_intf.c | 16 +-
+ drivers/char/ipmi/ipmi_ssif.c | 213 +++++++++++---
+ drivers/firmware/efi/runtime-map.c | 6 +-
+ drivers/platform/x86/ideapad-laptop.c | 7 +
+ drivers/platform/x86/thinkpad_acpi.c | 2 +-
+ drivers/rtc/Kconfig | 10 +
+ drivers/rtc/Makefile | 1 +
+ drivers/rtc/rtc-abx80x.c | 307 +++++++++++++++++++++
+ drivers/rtc/rtc-armada38x.c | 24 +-
+ drivers/tty/hvc/hvc_xen.c | 18 +-
+ drivers/xen/events/events_2l.c | 10 +
+ drivers/xen/events/events_base.c | 7 +-
+ drivers/xen/gntdev.c | 28 +-
+ drivers/xen/grant-table.c | 28 ++
+ drivers/xen/manage.c | 9 +-
+ drivers/xen/swiotlb-xen.c | 2 +-
+ drivers/xen/xen-pciback/conf_space.c | 6 +-
+ drivers/xen/xen-pciback/conf_space.h | 2 +-
+ drivers/xen/xen-pciback/conf_space_header.c | 2 +-
+ drivers/xen/xenbus/xenbus_probe.c | 29 ++
+ fs/configfs/mount.c | 2 +-
+ fs/efivarfs/super.c | 2 +-
+ fs/nilfs2/btree.c | 2 +-
+ fs/ocfs2/dlm/dlmmaster.c | 13 +
+ include/linux/nilfs2_fs.h | 2 +-
+ include/linux/pci_ids.h | 4 -
+ include/linux/util_macros.h | 2 +-
+ include/xen/grant_table.h | 1 +
+ include/xen/xen-ops.h | 1 +
+ kernel/rcu/tree.c | 16 +-
+ lib/Kconfig.debug | 1 +
+ lib/Kconfig.kasan | 8 +-
+ lib/find_last_bit.c | 41 ---
+ mm/hwpoison-inject.c | 13 +-
+ mm/memory-failure.c | 16 +-
+ tools/lib/api/Makefile | 2 +-
+ tools/lib/traceevent/event-parse.c | 2 +-
+ tools/perf/bench/futex-requeue.c | 15 +-
+ tools/perf/bench/numa.c | 12 +-
+ tools/perf/builtin-kmem.c | 58 ++--
+ tools/perf/builtin-report.c | 2 +-
+ tools/perf/builtin-top.c | 2 +-
+ tools/perf/builtin-trace.c | 10 +-
+ tools/perf/util/probe-event.c | 2 +
+ tools/perf/util/probe-finder.c | 4 +-
+ 65 files changed, 945 insertions(+), 296 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/rtc/abracon,abx80x.txt
+ create mode 100644 drivers/rtc/rtc-abx80x.c
+ delete mode 100644 lib/find_last_bit.c
+Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
+$ git merge fixes/master
+Already up-to-date.
+Merging kbuild-current/rc-fixes (c517d838eb7d Linux 4.0-rc1)
+$ git merge kbuild-current/rc-fixes
+Already up-to-date.
+Merging arc-current/for-curr (e4140819dadc ARC: signal handling robustify)
+$ git merge arc-current/for-curr
+Already up-to-date.
+Merging arm-current/fixes (3b8786ff7a1b ARM: 8352/1: perf: Fix the pmu node name in warning message)
+$ git merge arm-current/fixes
+Merge made by the 'recursive' strategy.
+ arch/arm/include/asm/dma-iommu.h | 2 +-
+ arch/arm/kernel/perf_event_cpu.c | 9 +++++++--
+ arch/arm/mm/dma-mapping.c | 13 +++++--------
+ arch/arm/mm/proc-arm1020.S | 2 --
+ arch/arm/mm/proc-arm1020e.S | 2 --
+ arch/arm/mm/proc-arm925.S | 3 ---
+ arch/arm/mm/proc-feroceon.S | 1 -
+ 7 files changed, 13 insertions(+), 19 deletions(-)
+Merging m68k-current/for-linus (b24f670b7f5b m68k/mac: Fix out-of-bounds array index in OSS IRQ source initialization)
+$ 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 mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
+$ git merge mips-fixes/mips-fixes
+Already up-to-date.
+Merging powerpc-merge-mpe/fixes (0aab3747091d powerpc/powernv: Restore non-volatile CRs after nap)
+$ git merge powerpc-merge-mpe/fixes
+Already up-to-date.
+Merging powerpc-merge/merge (c517d838eb7d Linux 4.0-rc1)
+$ git merge powerpc-merge/merge
+Already up-to-date.
+Merging sparc/master (acc455cffa75 sparc64: Setup sysfs to mark LDOM sockets, cores and threads correctly)
+$ git merge sparc/master
+Merge made by the 'recursive' strategy.
+ arch/sparc/include/asm/cpudata_64.h | 3 +-
+ arch/sparc/include/asm/topology_64.h | 3 +-
+ arch/sparc/kernel/mdesc.c | 136 ++++++++++++++++++++++++++++-------
+ arch/sparc/kernel/smp_64.c | 13 ++++
+ 4 files changed, 127 insertions(+), 28 deletions(-)
+Merging net/master (31ccd0e66d41 tcp_westwood: fix tcp_westwood_info())
+$ git merge net/master
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 5 +-
+ drivers/bluetooth/bt3c_cs.c | 3 -
+ drivers/bluetooth/btbcm.c | 148 ++++----
+ drivers/bluetooth/btbcm.h | 6 +
+ drivers/bluetooth/btusb.c | 403 ++++++++++++++++++++-
+ drivers/bluetooth/hci_ath.c | 98 +++--
+ drivers/net/can/xilinx_can.c | 7 +-
+ drivers/net/dsa/mv88e6xxx.c | 3 +
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 10 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_main.c | 4 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx4/en_port.c | 2 +-
+ .../net/ethernet/mellanox/mlx4/resource_tracker.c | 14 +-
+ drivers/net/ethernet/realtek/r8169.c | 4 +-
+ drivers/net/ethernet/smsc/smc91x.c | 20 +-
+ drivers/net/ethernet/smsc/smsc911x.c | 12 +-
+ .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 1 +
+ drivers/net/hyperv/netvsc.c | 9 +-
+ drivers/net/ieee802154/at86rf230.c | 390 ++++++++++----------
+ drivers/net/macvlan.c | 15 +
+ drivers/net/wireless/ath/ath9k/xmit.c | 52 ++-
+ drivers/net/wireless/iwlwifi/iwl-fw-file.h | 2 +
+ drivers/net/wireless/iwlwifi/iwl-trans.h | 41 ++-
+ drivers/net/wireless/iwlwifi/mvm/d3.c | 2 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api-power.h | 34 ++
+ drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 44 +--
+ drivers/net/wireless/iwlwifi/mvm/fw-api.h | 13 -
+ drivers/net/wireless/iwlwifi/mvm/fw.c | 54 ++-
+ drivers/net/wireless/iwlwifi/mvm/mac80211.c | 26 +-
+ drivers/net/wireless/iwlwifi/mvm/mvm.h | 1 -
+ drivers/net/wireless/iwlwifi/mvm/ops.c | 10 +
+ drivers/net/wireless/iwlwifi/mvm/rx.c | 5 +
+ drivers/net/wireless/iwlwifi/mvm/scan.c | 2 +-
+ drivers/net/wireless/iwlwifi/pcie/trans.c | 17 +-
+ drivers/net/wireless/rtlwifi/usb.c | 2 +-
+ include/linux/tcp.h | 8 +
+ include/net/cfg802154.h | 2 +
+ include/net/codel.h | 10 +-
+ include/net/mac80211.h | 2 +
+ include/net/mac802154.h | 94 ++++-
+ include/net/tcp.h | 7 +-
+ include/uapi/linux/inet_diag.h | 4 +
+ include/uapi/linux/mpls.h | 10 +
+ include/uapi/linux/tcp.h | 3 +
+ net/core/dev.c | 2 +-
+ net/core/sock.c | 2 +-
+ net/ieee802154/Makefile | 4 +-
+ net/ieee802154/nl-phy.c | 5 +-
+ net/ieee802154/nl802154.c | 2 +-
+ net/ieee802154/rdev-ops.h | 85 ++++-
+ net/ieee802154/trace.c | 7 +
+ net/ieee802154/trace.h | 247 +++++++++++++
+ net/ipv4/inet_diag.c | 8 +-
+ net/ipv4/tcp.c | 28 +-
+ net/ipv4/tcp_dctcp.c | 20 +-
+ net/ipv4/tcp_fastopen.c | 1 +
+ net/ipv4/tcp_illinois.c | 21 +-
+ net/ipv4/tcp_input.c | 36 +-
+ net/ipv4/tcp_vegas.c | 19 +-
+ net/ipv4/tcp_vegas.h | 3 +-
+ net/ipv4/tcp_westwood.c | 15 +-
+ net/mac80211/iface.c | 12 +-
+ net/mac80211/sta_info.c | 19 +-
+ net/mac802154/cfg.c | 9 +-
+ net/mac802154/ieee802154_i.h | 3 +-
+ net/mac802154/iface.c | 5 +-
+ net/mac802154/main.c | 3 +-
+ net/mpls/af_mpls.c | 18 +-
+ net/mpls/internal.h | 10 -
+ net/netlink/af_netlink.c | 1 -
+ net/rds/ib_cm.c | 13 +-
+ net/sched/sch_codel.c | 2 +-
+ net/sched/sch_fq_codel.c | 2 +-
+ 73 files changed, 1608 insertions(+), 595 deletions(-)
+ create mode 100644 net/ieee802154/trace.c
+ create mode 100644 net/ieee802154/trace.h
+Merging ipsec/master (bdddbf6996c0 xfrm: fix a race in xfrm_state_lookup_byspi)
+$ git merge ipsec/master
+Merge made by the 'recursive' strategy.
+ net/xfrm/xfrm_state.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging sound-current/for-linus (2c674fac5b16 ALSA: hda/realtek - Add ALC298 alias name for Dell)
+$ git merge sound-current/for-linus
+Merge made by the 'recursive' strategy.
+ sound/pci/hda/patch_realtek.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+Merging pci-current/for-linus (5ebe6afaf005 Linux 4.1-rc2)
+$ git merge pci-current/for-linus
+Already up-to-date.
+Merging wireless-drivers/master (f67382186489 ath9k: fix per-packet tx power configuration)
+$ git merge wireless-drivers/master
+Already up-to-date.
+Merging driver-core.current/driver-core-linus (b787f68c36d4 Linux 4.1-rc1)
+$ git merge driver-core.current/driver-core-linus
+Already up-to-date.
+Merging tty.current/tty-linus (5ebe6afaf005 Linux 4.1-rc2)
+$ git merge tty.current/tty-linus
+Already up-to-date.
+Merging usb.current/usb-linus (0d3bba0287d4 cdc-acm: prevent infinite loop when parsing CDC headers.)
+$ git merge usb.current/usb-linus
+Already up-to-date.
+Merging usb-gadget-fixes/fixes (c94e289f195e usb: gadget: remove incorrect __init/__exit annotations)
+$ git merge usb-gadget-fixes/fixes
+Merge made by the 'recursive' strategy.
+ drivers/usb/dwc3/dwc3-omap.c | 94 +++++++++++++++---------------
+ drivers/usb/gadget/configfs.c | 1 +
+ drivers/usb/gadget/function/f_hid.c | 16 ++++-
+ drivers/usb/gadget/function/u_serial.c | 5 +-
+ drivers/usb/gadget/legacy/acm_ms.c | 10 ++--
+ drivers/usb/gadget/legacy/audio.c | 10 ++--
+ drivers/usb/gadget/legacy/cdc2.c | 10 ++--
+ drivers/usb/gadget/legacy/dbgp.c | 4 +-
+ drivers/usb/gadget/legacy/ether.c | 12 ++--
+ drivers/usb/gadget/legacy/g_ffs.c | 2 +-
+ drivers/usb/gadget/legacy/gmidi.c | 10 ++--
+ drivers/usb/gadget/legacy/hid.c | 12 ++--
+ drivers/usb/gadget/legacy/mass_storage.c | 6 +-
+ drivers/usb/gadget/legacy/multi.c | 10 ++--
+ drivers/usb/gadget/legacy/ncm.c | 10 ++--
+ drivers/usb/gadget/legacy/nokia.c | 10 ++--
+ drivers/usb/gadget/legacy/printer.c | 8 +--
+ drivers/usb/gadget/legacy/serial.c | 4 +-
+ drivers/usb/gadget/legacy/tcm_usb_gadget.c | 2 +-
+ drivers/usb/gadget/legacy/webcam.c | 8 +--
+ drivers/usb/gadget/legacy/zero.c | 4 +-
+ drivers/usb/gadget/udc/at91_udc.c | 4 +-
+ drivers/usb/gadget/udc/atmel_usba_udc.c | 4 +-
+ drivers/usb/gadget/udc/fsl_udc_core.c | 4 +-
+ drivers/usb/gadget/udc/fusb300_udc.c | 4 +-
+ drivers/usb/gadget/udc/m66592-udc.c | 4 +-
+ drivers/usb/gadget/udc/r8a66597-udc.c | 4 +-
+ drivers/usb/gadget/udc/udc-xilinx.c | 4 +-
+ drivers/usb/phy/phy-isp1301-omap.c | 2 +-
+ 29 files changed, 147 insertions(+), 131 deletions(-)
+Merging usb-serial-fixes/usb-linus (82ee3aeb9295 USB: visor: Match I330 phone more precisely)
+$ git merge usb-serial-fixes/usb-linus
+Merge made by the 'recursive' strategy.
+ drivers/usb/serial/cp210x.c | 1 +
+ drivers/usb/serial/pl2303.c | 1 -
+ drivers/usb/serial/pl2303.h | 4 ----
+ drivers/usb/serial/visor.c | 2 +-
+ 4 files changed, 2 insertions(+), 6 deletions(-)
+Merging staging.current/staging-linus (b787f68c36d4 Linux 4.1-rc1)
+$ git merge staging.current/staging-linus
+Already up-to-date.
+Merging char-misc.current/char-misc-linus (f26443a8ab76 Merge tag 'extcon-fixes-for-4.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-linus)
+$ git merge char-misc.current/char-misc-linus
+Auto-merging drivers/hwmon/dell-smm-hwmon.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 4 +-
+ arch/x86/Kconfig | 25 ++--
+ drivers/char/Makefile | 1 -
+ drivers/extcon/extcon-usb-gpio.c | 24 ++--
+ drivers/hwmon/Kconfig | 11 ++
+ drivers/hwmon/Makefile | 1 +
+ drivers/{char/i8k.c => hwmon/dell-smm-hwmon.c} | 156 ++++++++++++++-----------
+ 7 files changed, 124 insertions(+), 98 deletions(-)
+ rename drivers/{char/i8k.c => hwmon/dell-smm-hwmon.c} (96%)
+Merging input-current/for-linus (48853389f206 Merge branch 'next' into for-linus)
+$ git merge input-current/for-linus
+Already up-to-date.
+Merging crypto-current/master (f440c4ee3e53 hwrng: bcm63xx - Fix driver compilation)
+$ git merge crypto-current/master
+Already up-to-date.
+Merging ide/master (d681f1166919 ide: remove deprecated use of pci api)
+$ git merge ide/master
+Already up-to-date.
+Merging devicetree-current/devicetree/merge (41d9489319f2 drivers/of: Add empty ranges quirk for PA-Semi)
+$ git merge devicetree-current/devicetree/merge
+Already up-to-date.
+Merging rr-fixes/fixes (f47689345931 lguest: update help text.)
+$ git merge rr-fixes/fixes
+Already up-to-date.
+Merging vfio-fixes/for-linus (db7d4d7f4021 vfio: Fix runaway interruptible timeout)
+$ git merge vfio-fixes/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/vfio/pci/vfio_pci.c | 8 +++++++-
+ drivers/vfio/vfio.c | 21 ++++++++++++++++++---
+ 2 files changed, 25 insertions(+), 4 deletions(-)
+Merging kselftest-fixes/fixes (b787f68c36d4 Linux 4.1-rc1)
+$ git merge kselftest-fixes/fixes
+Already up-to-date.
+Merging drm-intel-fixes/for-linux-next-fixes (9fcb1704d1d5 drm/i915/dp: there is no audio on port A)
+$ git merge drm-intel-fixes/for-linux-next-fixes
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/i915/intel_dp.c | 6 +++---
+ drivers/gpu/drm/i915/intel_lvds.c | 26 ++++++++++++++++++++++++--
+ 2 files changed, 27 insertions(+), 5 deletions(-)
+Merging asm-generic/master (643165c8bbc8 Merge tag 'uaccess_for_upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost into asm-generic)
+$ git merge asm-generic/master
+Already up-to-date.
+Merging arc/for-next (b787f68c36d4 Linux 4.1-rc1)
+$ git merge arc/for-next
+Already up-to-date.
+Merging arm/for-next (12f8e5bcab3f Merge branches 'clk', 'misc' and 'fixes' into for-next)
+$ git merge arm/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/Kconfig | 17 ++-
+ arch/arm/Makefile | 4 +
+ arch/arm/include/asm/io.h | 27 ++--
+ arch/arm/include/asm/module.h | 12 +-
+ arch/arm/kernel/Makefile | 1 +
+ arch/arm/kernel/entry-v7m.S | 13 +-
+ arch/arm/kernel/module-plts.c | 181 +++++++++++++++++++++++++++
+ arch/arm/kernel/module.c | 32 ++++-
+ arch/arm/kernel/module.lds | 4 +
+ arch/arm/mach-davinci/da850.c | 1 +
+ arch/arm/mach-lpc32xx/clock.c | 5 +-
+ arch/arm/mach-omap1/board-nokia770.c | 2 +-
+ arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 12 +-
+ arch/arm/mach-omap2/omap_device.c | 24 ++--
+ arch/arm/mach-pxa/eseries.c | 1 +
+ arch/arm/mach-pxa/lubbock.c | 1 +
+ arch/arm/mach-pxa/tosa.c | 1 +
+ arch/arm/mach-sa1100/irq.c | 2 +-
+ arch/arm/mm/Kconfig | 15 +++
+ arch/arm/mm/proc-v7-2level.S | 6 +-
+ arch/arm/plat-orion/common.c | 6 +-
+ arch/sh/kernel/cpu/sh4a/clock-sh7734.c | 3 +-
+ arch/sh/kernel/cpu/sh4a/clock-sh7757.c | 4 +-
+ arch/sh/kernel/cpu/sh4a/clock-sh7785.c | 4 +-
+ arch/sh/kernel/cpu/sh4a/clock-sh7786.c | 4 +-
+ arch/sh/kernel/cpu/sh4a/clock-shx3.c | 4 +-
+ drivers/clk/clk-s2mps11.c | 4 +-
+ drivers/clk/clkdev.c | 83 ++++++++----
+ include/linux/clk.h | 27 ++--
+ include/linux/clkdev.h | 6 +-
+ sound/soc/sh/migor.c | 3 +-
+ 31 files changed, 397 insertions(+), 112 deletions(-)
+ create mode 100644 arch/arm/kernel/module-plts.c
+ create mode 100644 arch/arm/kernel/module.lds
+Merging arm-perf/for-next/perf (b787f68c36d4 Linux 4.1-rc1)
+$ git merge arm-perf/for-next/perf
+Already up-to-date.
+Merging arm-soc/for-next (0f0175702e2e arm-soc: document merges)
+$ git merge arm-soc/for-next
+Resolved 'MAINTAINERS' using previous resolution.
+Resolved 'drivers/bus/Makefile' using previous resolution.
+Auto-merging drivers/bus/Makefile
+CONFLICT (content): Merge conflict in drivers/bus/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 1f6c94c24677] Merge remote-tracking branch 'arm-soc/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/arm-soc-for-next-contents.txt | 243 +++++++++++++++++++++++++++++++++
+ 1 file changed, 243 insertions(+)
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+Merging at91/at91-next (da80a9f204eb Merge branch 'at91-4.2-dt' into at91-next)
+$ git merge at91/at91-next
+Removing arch/arm/boot/dts/kizbox.dts
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/Makefile | 2 +-
+ arch/arm/boot/dts/at91-kizbox.dts | 159 ++++++++++++++++++++++++++++++++++++++
+ arch/arm/boot/dts/kizbox.dts | 150 -----------------------------------
+ 3 files changed, 160 insertions(+), 151 deletions(-)
+ create mode 100644 arch/arm/boot/dts/at91-kizbox.dts
+ delete mode 100644 arch/arm/boot/dts/kizbox.dts
+Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
+$ git merge bcm2835/for-next
+Already up-to-date.
+Merging rpi/for-rpi-next (31fd7fe00b0d ARM: bcm2835: Drop the init_irq() hook)
+$ git merge rpi/for-rpi-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/bcm/brcm,bcm2835.txt | 31 ++++++++++++++++++++--
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 4 +--
+ arch/arm/boot/dts/bcm2835-rpi-b.dts | 4 +--
+ arch/arm/boot/dts/bcm2835-rpi.dtsi | 8 +++---
+ arch/arm/boot/dts/bcm2835.dtsi | 5 ++--
+ arch/arm/mach-bcm/board_bcm2835.c | 18 -------------
+ include/dt-bindings/pinctrl/bcm2835.h | 27 +++++++++++++++++++
+ 8 files changed, 68 insertions(+), 30 deletions(-)
+ create mode 100644 include/dt-bindings/pinctrl/bcm2835.h
+Merging berlin/berlin/for-next (4412971984ea Merge branches 'berlin/soc', 'berlin/driver' and 'berlin/dt' into berlin/for-next)
+$ git merge berlin/berlin/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/marvell,berlin.txt | 100 +++----------
+ .../devicetree/bindings/clock/marvell,berlin.txt | 31 +++++
+ .../devicetree/bindings/pinctrl/berlin,pinctrl.txt | 43 ++++++
+ .../devicetree/bindings/reset/berlin,reset.txt | 23 +++
+ arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts | 34 ++++-
+ arch/arm/boot/dts/berlin2.dtsi | 125 +++++++++++------
+ arch/arm/boot/dts/berlin2cd-google-chromecast.dts | 34 ++++-
+ arch/arm/boot/dts/berlin2cd.dtsi | 103 ++++++++++----
+ arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 34 ++++-
+ arch/arm/boot/dts/berlin2q.dtsi | 155 +++++++++++++--------
+ arch/arm/mach-berlin/Kconfig | 1 +
+ drivers/clk/berlin/bg2.c | 7 +-
+ drivers/clk/berlin/bg2q.c | 7 +-
+ drivers/pinctrl/berlin/berlin-bg2.c | 26 +---
+ drivers/pinctrl/berlin/berlin-bg2cd.c | 26 +---
+ drivers/pinctrl/berlin/berlin-bg2q.c | 26 +---
+ drivers/pinctrl/berlin/berlin.c | 9 +-
+ drivers/reset/reset-berlin.c | 71 ++++------
+ 18 files changed, 518 insertions(+), 337 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/marvell,berlin.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/berlin,pinctrl.txt
+ create mode 100644 Documentation/devicetree/bindings/reset/berlin,reset.txt
+Merging cortex-m/for-next (e799b6f37e6c ARM: zImage: add support for ARMv7-M)
+$ git merge cortex-m/for-next
+Merge made by the 'recursive' strategy.
+Merging imx-mxs/for-next (4df4d2a00e9c Merge branch 'imx/clk-move' into for-next)
+$ git merge imx-mxs/for-next
+Auto-merging drivers/clk/imx/clk.h
+Auto-merging drivers/clk/imx/clk-pllv1.c
+Auto-merging drivers/clk/imx/clk-imx6sx.c
+Auto-merging drivers/clk/imx/clk-imx6sl.c
+Auto-merging drivers/clk/imx/clk-imx6q.c
+Auto-merging drivers/clk/imx/clk-imx51-imx53.c
+Auto-merging drivers/clk/imx/clk-imx35.c
+Auto-merging drivers/clk/imx/clk-imx31.c
+Auto-merging drivers/clk/imx/clk-imx27.c
+Auto-merging drivers/clk/imx/clk-imx25.c
+Auto-merging drivers/clk/imx/clk-imx21.c
+Auto-merging drivers/clk/imx/clk-imx1.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/dma/fsl-mxs-dma.txt | 2 +-
+ MAINTAINERS | 2 +
+ arch/arm/boot/dts/imx23-olinuxino.dts | 10 +++-
+ arch/arm/boot/dts/imx23.dtsi | 40 +++++++++++++++-
+ arch/arm/boot/dts/imx25.dtsi | 1 +
+ arch/arm/boot/dts/imx28.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 1 -
+ arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 2 +
+ arch/arm/boot/dts/imx6qdl.dtsi | 56 +++++++++++-----------
+ arch/arm/mach-imx/Makefile | 27 +++++------
+ arch/arm/mach-imx/common.h | 12 ++---
+ arch/arm/mach-imx/cpuidle-imx6q.c | 4 +-
+ arch/arm/mach-imx/cpuidle-imx6sl.c | 4 +-
+ arch/arm/mach-imx/cpuidle-imx6sx.c | 4 +-
+ .../mach-imx/devices/platform-sdhci-esdhc-imx.c | 2 +-
+ arch/arm/mach-imx/hardware.h | 1 +
+ arch/arm/mach-imx/mach-imx6q.c | 1 +
+ arch/arm/mach-imx/mach-imx6sl.c | 1 +
+ arch/arm/mach-imx/mach-imx6sx.c | 1 +
+ arch/arm/mach-imx/mmdc.c | 2 +
+ arch/arm/mach-imx/mx27.h | 4 --
+ arch/arm/mach-imx/mx3x.h | 7 ---
+ arch/arm/mach-imx/mxc.h | 16 -------
+ arch/arm/mach-imx/pm-imx5.c | 9 ++--
+ arch/arm/mach-imx/pm-imx6.c | 38 ++++++++++-----
+ arch/arm/mach-imx/time.c | 5 +-
+ drivers/clk/Makefile | 1 +
+ drivers/clk/imx/Makefile | 25 ++++++++++
+ {arch/arm/mach-imx => drivers/clk/imx}/clk-busy.c | 0
+ {arch/arm/mach-imx => drivers/clk/imx}/clk-cpu.c | 0
+ .../mach-imx => drivers/clk/imx}/clk-fixup-div.c | 0
+ .../mach-imx => drivers/clk/imx}/clk-fixup-mux.c | 0
+ .../clk/imx}/clk-gate-exclusive.c | 0
+ {arch/arm/mach-imx => drivers/clk/imx}/clk-gate2.c | 0
+ {arch/arm/mach-imx => drivers/clk/imx}/clk-imx1.c | 16 ++++---
+ {arch/arm/mach-imx => drivers/clk/imx}/clk-imx21.c | 13 +++--
+ {arch/arm/mach-imx => drivers/clk/imx}/clk-imx25.c | 6 +--
+ {arch/arm/mach-imx => drivers/clk/imx}/clk-imx27.c | 14 ++++--
+ {arch/arm/mach-imx => drivers/clk/imx}/clk-imx31.c | 34 +++++++++----
+ {arch/arm/mach-imx => drivers/clk/imx}/clk-imx35.c | 35 +++++++++-----
+ .../mach-imx => drivers/clk/imx}/clk-imx51-imx53.c | 5 +-
+ {arch/arm/mach-imx => drivers/clk/imx}/clk-imx6q.c | 34 +++++++------
+ .../arm/mach-imx => drivers/clk/imx}/clk-imx6sl.c | 7 ---
+ .../arm/mach-imx => drivers/clk/imx}/clk-imx6sx.c | 6 ---
+ {arch/arm/mach-imx => drivers/clk/imx}/clk-pfd.c | 0
+ {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv1.c | 33 +++++++++----
+ {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv2.c | 0
+ {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv3.c | 0
+ {arch/arm/mach-imx => drivers/clk/imx}/clk-vf610.c | 0
+ {arch/arm/mach-imx => drivers/clk/imx}/clk.c | 0
+ {arch/arm/mach-imx => drivers/clk/imx}/clk.h | 20 +++++++-
+ include/soc/imx/revision.h | 37 ++++++++++++++
+ 52 files changed, 345 insertions(+), 195 deletions(-)
+ create mode 100644 drivers/clk/imx/Makefile
+ rename {arch/arm/mach-imx => drivers/clk/imx}/clk-busy.c (100%)
+ rename {arch/arm/mach-imx => drivers/clk/imx}/clk-cpu.c (100%)
+ rename {arch/arm/mach-imx => drivers/clk/imx}/clk-fixup-div.c (100%)
+ rename {arch/arm/mach-imx => drivers/clk/imx}/clk-fixup-mux.c (100%)
+ rename {arch/arm/mach-imx => drivers/clk/imx}/clk-gate-exclusive.c (100%)
+ rename {arch/arm/mach-imx => drivers/clk/imx}/clk-gate2.c (100%)
+ rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx1.c (92%)
+ rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx21.c (96%)
+ rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx25.c (98%)
+ rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx27.c (97%)
+ rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx31.c (92%)
+ rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx35.c (94%)
+ rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx51-imx53.c (99%)
+ rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx6q.c (98%)
+ rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx6sl.c (99%)
+ rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx6sx.c (99%)
+ rename {arch/arm/mach-imx => drivers/clk/imx}/clk-pfd.c (100%)
+ rename {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv1.c (75%)
+ rename {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv2.c (100%)
+ rename {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv3.c (100%)
+ rename {arch/arm/mach-imx => drivers/clk/imx}/clk-vf610.c (100%)
+ rename {arch/arm/mach-imx => drivers/clk/imx}/clk.c (100%)
+ rename {arch/arm/mach-imx => drivers/clk/imx}/clk.h (89%)
+ create mode 100644 include/soc/imx/revision.h
+Merging keystone/next (b17275a4a6cc Merge branch 'for_3.19/soc' into next)
+$ git merge keystone/next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging mvebu/for-next (ae142bd99765 ARM: mvebu: Fix the main PLL frequency on Armada 375, 38x and 39x SoCs)
+$ git merge mvebu/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/armada-375.dtsi | 2 +-
+ arch/arm/boot/dts/armada-38x.dtsi | 2 +-
+ arch/arm/boot/dts/armada-39x.dtsi | 2 +-
+ arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 4 ++++
+ 4 files changed, 7 insertions(+), 3 deletions(-)
+Merging omap/for-next (e7309c2673a3 bus: omap_l3_noc: Fix master id address decoding for OMAP5)
+$ git merge omap/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/omap/l3-noc.txt | 1 +
+ arch/arm/boot/dts/am437x-sk-evm.dts | 4 +-
+ arch/arm/boot/dts/am57xx-beagle-x15.dts | 11 +++--
+ arch/arm/boot/dts/dra7.dtsi | 10 ++--
+ arch/arm/boot/dts/omap3-n900.dts | 4 ++
+ arch/arm/boot/dts/omap3.dtsi | 2 +
+ arch/arm/boot/dts/omap5.dtsi | 2 +-
+ arch/arm/configs/omap2plus_defconfig | 2 +-
+ arch/arm/mach-omap2/prm-regbits-34xx.h | 1 +
+ arch/arm/mach-omap2/prm-regbits-44xx.h | 1 +
+ arch/arm/mach-omap2/vc.c | 12 ++++-
+ arch/arm/mach-omap2/vc.h | 2 +
+ arch/arm/mach-omap2/vc3xxx_data.c | 1 +
+ arch/arm/mach-omap2/vc44xx_data.c | 1 +
+ drivers/bus/omap_l3_noc.c | 5 +-
+ drivers/bus/omap_l3_noc.h | 54 ++++++++++++++++------
+ 16 files changed, 81 insertions(+), 32 deletions(-)
+Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data)
+$ git merge omap-pending/for-next
+Resolved 'arch/arm/mach-omap2/omap_hwmod_43xx_data.c' using previous resolution.
+Auto-merging arch/arm/mach-omap2/omap_hwmod_43xx_data.c
+CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master a3cc7617796f] Merge remote-tracking branch 'omap-pending/for-next'
+$ git diff -M --stat --summary HEAD^..
+Merging renesas/next (572fe7d849ce Merge branches 'heads/fixes-for-v4.1', 'heads/dt-for-v4.2' and 'heads/defconfig-for-v4.2' into next)
+$ git merge renesas/next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/spi/sh-msiof.txt | 2 +-
+ arch/arm/boot/dts/emev2-kzm9d.dts | 4 ++--
+ arch/arm/boot/dts/r8a73a4-ape6evm.dts | 2 +-
+ arch/arm/boot/dts/r8a73a4.dtsi | 11 +++++++----
+ arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 +-
+ arch/arm/boot/dts/r8a7740.dtsi | 10 +++++-----
+ arch/arm/boot/dts/r8a7778-bockw-reference.dts | 2 +-
+ arch/arm/boot/dts/r8a7778-bockw.dts | 4 ++--
+ arch/arm/boot/dts/r8a7778.dtsi | 2 +-
+ arch/arm/boot/dts/r8a7779-marzen.dts | 6 +++---
+ arch/arm/boot/dts/r8a7779.dtsi | 2 +-
+ arch/arm/boot/dts/r8a7790-lager.dts | 4 ++--
+ arch/arm/boot/dts/r8a7790.dtsi | 19 ++++++++++++++-----
+ arch/arm/boot/dts/r8a7791-henninger.dts | 2 +-
+ arch/arm/boot/dts/r8a7791-koelsch.dts | 6 +++---
+ arch/arm/boot/dts/r8a7791.dtsi | 17 +++++++++++++----
+ arch/arm/boot/dts/r8a7794.dtsi | 9 +++++++++
+ arch/arm/boot/dts/sh73a0.dtsi | 10 +++++-----
+ arch/arm/configs/shmobile_defconfig | 4 ++--
+ include/dt-bindings/clock/r8a73a4-clock.h | 1 +
+ include/dt-bindings/clock/r8a7790-clock.h | 3 +++
+ include/dt-bindings/clock/r8a7791-clock.h | 3 +++
+ include/dt-bindings/clock/r8a7794-clock.h | 3 +++
+ 23 files changed, 84 insertions(+), 44 deletions(-)
+Merging samsung/for-next (5d5443b9c3ba Merge branch 'v4.1-next/mach-samsung' into for-next)
+$ git merge samsung/for-next
+Resolved 'arch/arm/mach-exynos/platsmp.c' using previous resolution.
+Auto-merging arch/arm/mach-exynos/platsmp.c
+CONFLICT (content): Merge conflict in arch/arm/mach-exynos/platsmp.c
+Auto-merging Documentation/devicetree/bindings/arm/samsung/pmu.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 86d6c3896800] Merge remote-tracking branch 'samsung/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/arm/samsung/pmu.txt | 1 +
+ arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi | 698 +++++++++++++++
+ .../dts/exynos/exynos5433-tmu-sensor-conf.dtsi | 22 +
+ arch/arm64/boot/dts/exynos/exynos5433-tmu.dtsi | 231 +++++
+ arch/arm64/boot/dts/exynos/exynos5433.dtsi | 931 +++++++++++++++++++++
+ 5 files changed, 1883 insertions(+)
+ create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi
+ create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tmu-sensor-conf.dtsi
+ create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tmu.dtsi
+ create mode 100644 arch/arm64/boot/dts/exynos/exynos5433.dtsi
+Merging sunxi/sunxi/for-next (fe1880278d83 Merge branches 'sunxi/core-for-4.2', 'sunxi/defconfig-for-4.2', 'sunxi/drivers-for-4.2', 'sunxi/dt-for-4.2' and 'sunxi/clocks-for-4.2' into sunxi/for-next)
+$ git merge sunxi/sunxi/for-next
+Auto-merging arch/arm/boot/dts/Makefile
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/cpus.txt | 1 +
+ .../devicetree/bindings/soc/sunxi/sram.txt | 64 +++
+ .../devicetree/bindings/vendor-prefixes.txt | 2 +
+ arch/arm/boot/dts/Makefile | 23 +-
+ arch/arm/boot/dts/sun4i-a10-a1000.dts | 202 +++----
+ arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 176 +++---
+ arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 35 ++
+ arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 216 +++----
+ arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 176 ++++++
+ arch/arm/boot/dts/sun4i-a10-hackberry.dts | 191 +++----
+ arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts | 8 +
+ arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 118 ++--
+ arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 194 +++++++
+ arch/arm/boot/dts/sun4i-a10-marsboard.dts | 8 +
+ arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 144 ++---
+ arch/arm/boot/dts/sun4i-a10-mk802.dts | 8 +
+ arch/arm/boot/dts/sun4i-a10-mk802ii.dts | 8 +
+ arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 219 ++++----
+ arch/arm/boot/dts/sun4i-a10-pcduino.dts | 180 +++---
+ arch/arm/boot/dts/sun4i-a10.dtsi | 110 +++-
+ arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 159 ++++++
+ arch/arm/boot/dts/sun5i-a10s-mk802.dts | 8 +
+ arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 319 +++++------
+ arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 134 ++---
+ arch/arm/boot/dts/sun5i-a10s.dtsi | 620 +++------------------
+ arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 138 ++---
+ arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 150 ++---
+ arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 240 ++++----
+ arch/arm/boot/dts/sun5i-a13-utoo-p66.dts | 231 ++++++++
+ arch/arm/boot/dts/sun5i-a13.dtsi | 594 +++-----------------
+ arch/arm/boot/dts/sun5i.dtsi | 617 ++++++++++++++++++++
+ arch/arm/boot/dts/sun6i-a31-app4-evb1.dts | 58 +-
+ arch/arm/boot/dts/sun6i-a31-colombus.dts | 140 ++---
+ arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 103 +++-
+ arch/arm/boot/dts/sun6i-a31-i7.dts | 154 +++++
+ arch/arm/boot/dts/sun6i-a31-m9.dts | 154 ++---
+ arch/arm/boot/dts/sun6i-a31.dtsi | 96 +++-
+ arch/arm/boot/dts/sun6i-a31s-cs908.dts | 43 +-
+ arch/arm/boot/dts/sun7i-a20-bananapi.dts | 264 ++++-----
+ arch/arm/boot/dts/sun7i-a20-bananapro.dts | 12 +-
+ arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 200 +++----
+ arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 326 +++++------
+ arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 430 +++++++-------
+ arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 262 ++++-----
+ arch/arm/boot/dts/sun7i-a20-m3.dts | 186 ++++---
+ arch/arm/boot/dts/sun7i-a20-mk808c.dts | 148 +++++
+ arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 192 +++----
+ arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 296 +++++-----
+ arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 414 +++++++-------
+ arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 255 +++++++++
+ arch/arm/boot/dts/sun7i-a20-orangepi.dts | 233 ++++++++
+ arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 199 +++++++
+ arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 212 +++----
+ arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 188 +++++++
+ arch/arm/boot/dts/sun7i-a20.dtsi | 79 ++-
+ arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts | 112 ++--
+ arch/arm/boot/dts/sun8i-a23.dtsi | 22 +
+ arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 99 ++++
+ arch/arm/boot/dts/sun9i-a80-optimus.dts | 67 ++-
+ arch/arm/boot/dts/sun9i-a80.dtsi | 132 +++++
+ arch/arm/configs/multi_v7_defconfig | 1 -
+ arch/arm/configs/sunxi_defconfig | 6 +-
+ arch/arm/mach-sunxi/platsmp.c | 69 +++
+ drivers/clk/sunxi/clk-sun9i-core.c | 10 +-
+ drivers/clk/sunxi/clk-sunxi.c | 2 +
+ drivers/soc/Kconfig | 1 +
+ drivers/soc/Makefile | 1 +
+ drivers/soc/sunxi/Kconfig | 10 +
+ drivers/soc/sunxi/Makefile | 1 +
+ drivers/soc/sunxi/sunxi_sram.c | 236 ++++++++
+ include/linux/soc/sunxi/sunxi_sram.h | 24 +
+ 71 files changed, 6861 insertions(+), 3869 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/soc/sunxi/sram.txt
+ create mode 100644 arch/arm/boot/dts/sun4i-a10-gemei-g9.dts
+ create mode 100644 arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts
+ create mode 100644 arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
+ create mode 100644 arch/arm/boot/dts/sun5i-a13-utoo-p66.dts
+ create mode 100644 arch/arm/boot/dts/sun5i.dtsi
+ create mode 100644 arch/arm/boot/dts/sun6i-a31-i7.dts
+ create mode 100644 arch/arm/boot/dts/sun7i-a20-mk808c.dts
+ create mode 100644 arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
+ create mode 100644 arch/arm/boot/dts/sun7i-a20-orangepi.dts
+ create mode 100644 arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts
+ create mode 100644 arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts
+ create mode 100644 arch/arm/boot/dts/sun9i-a80-cubieboard4.dts
+ create mode 100644 drivers/soc/sunxi/Kconfig
+ create mode 100644 drivers/soc/sunxi/Makefile
+ create mode 100644 drivers/soc/sunxi/sunxi_sram.c
+ create mode 100644 include/linux/soc/sunxi/sunxi_sram.h
+Merging tegra/for-next (4fd17a726126 Merge branch for-4.2/defconfig into for-next)
+$ git merge tegra/for-next
+Merge made by the 'recursive' strategy.
+ .../bindings/clock/nvidia,tegra124-car.txt | 44 +-
+ .../bindings/fuse/nvidia,tegra20-fuse.txt | 2 +-
+ .../memory-controllers/nvidia,tegra-mc.txt | 84 +-
+ .../bindings/memory-controllers/tegra-emc.txt | 374 +++++++
+ .../bindings/misc/nvidia,tegra20-apbmisc.txt | 2 +
+ arch/arm/boot/dts/tegra124-jetson-tk1.dts | 4 +
+ arch/arm/boot/dts/tegra124-venice2.dts | 3 +
+ arch/arm/boot/dts/tegra124.dtsi | 14 +-
+ arch/arm/boot/dts/tegra20-seaboard.dts | 12 +
+ arch/arm/boot/dts/tegra20.dtsi | 2 +-
+ arch/arm/boot/dts/tegra30-cardhu.dtsi | 30 +-
+ arch/arm/boot/dts/tegra30.dtsi | 15 +
+ arch/arm/configs/tegra_defconfig | 10 +
+ arch/arm/mach-tegra/cpuidle-tegra20.c | 5 +-
+ arch/arm/mach-tegra/reset-handler.S | 10 +-
+ arch/arm/mach-tegra/reset.h | 4 +
+ arch/arm/mach-tegra/sleep-tegra20.S | 37 +-
+ arch/arm/mach-tegra/sleep-tegra30.S | 2 +-
+ arch/arm/mach-tegra/sleep.h | 4 +
+ arch/arm/mach-tegra/tegra.c | 1 -
+ drivers/clk/Kconfig | 1 +
+ drivers/clk/clk.c | 8 +
+ drivers/clk/tegra/Kconfig | 3 +
+ drivers/clk/tegra/Makefile | 1 +
+ drivers/clk/tegra/clk-emc.c | 538 +++++++++
+ drivers/clk/tegra/clk-tegra124.c | 19 +-
+ drivers/clk/tegra/clk-tegra30.c | 2 +-
+ drivers/clk/tegra/clk.h | 12 +
+ drivers/iommu/Kconfig | 2 +-
+ drivers/iommu/tegra-smmu.c | 109 ++
+ drivers/memory/tegra/Kconfig | 10 +
+ drivers/memory/tegra/Makefile | 3 +
+ drivers/memory/tegra/mc.c | 143 ++-
+ drivers/memory/tegra/mc.h | 4 +
+ drivers/memory/tegra/tegra114.c | 32 +-
+ drivers/memory/tegra/tegra124-emc.c | 1140 ++++++++++++++++++++
+ drivers/memory/tegra/tegra124.c | 123 ++-
+ drivers/memory/tegra/tegra30.c | 32 +-
+ drivers/soc/tegra/fuse/fuse-tegra20.c | 6 +-
+ drivers/soc/tegra/fuse/tegra-apbmisc.c | 21 +
+ drivers/soc/tegra/pmc.c | 23 +-
+ include/linux/clk-provider.h | 1 +
+ include/soc/tegra/emc.h | 19 +
+ include/soc/tegra/fuse.h | 1 +
+ include/soc/tegra/mc.h | 20 +-
+ include/soc/tegra/pmc.h | 2 -
+ 46 files changed, 2813 insertions(+), 121 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/memory-controllers/tegra-emc.txt
+ create mode 100644 drivers/clk/tegra/Kconfig
+ create mode 100644 drivers/clk/tegra/clk-emc.c
+ create mode 100644 drivers/memory/tegra/tegra124-emc.c
+ create mode 100644 include/soc/tegra/emc.h
+Merging arm64/for-next/core (6d1966dfd6e0 arm64: fix midr range for Cortex-A57 erratum 832075)
+$ git merge arm64/for-next/core
+Already up-to-date.
+Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
+$ git merge blackfin/for-linus
+Already up-to-date.
+Merging c6x/for-linux-next (3083ca2376a7 c6x: platforms: cache: Export symbol L1P_cache_block_invalidate and L1D_cache_block_writeback)
+$ git merge c6x/for-linux-next
+Already up-to-date.
+Merging cris/for-next (d939b52abe0c cris: fix integer overflow in ELF_ET_DYN_BASE)
+$ git merge cris/for-next
+Already up-to-date.
+Merging hexagon/linux-next (8914d7e85780 Hexagon: fix signal delivery for debug traps)
+$ git merge hexagon/linux-next
+Already up-to-date.
+Merging ia64/next (62f269ef8191 pstore: Fix the ramoops module parameters update)
+$ git merge ia64/next
+Already up-to-date.
+Merging m68k/for-next (2b8520f1f256 m68k: Use for_each_sg())
+$ git merge m68k/for-next
+Merge made by the 'recursive' strategy.
+ arch/m68k/configs/amiga_defconfig | 9 +++++++--
+ arch/m68k/configs/apollo_defconfig | 9 +++++++--
+ arch/m68k/configs/atari_defconfig | 9 +++++++--
+ arch/m68k/configs/bvme6000_defconfig | 9 +++++++--
+ arch/m68k/configs/hp300_defconfig | 9 +++++++--
+ arch/m68k/configs/mac_defconfig | 9 +++++++--
+ arch/m68k/configs/multi_defconfig | 9 +++++++--
+ arch/m68k/configs/mvme147_defconfig | 9 +++++++--
+ arch/m68k/configs/mvme16x_defconfig | 9 +++++++--
+ arch/m68k/configs/q40_defconfig | 9 +++++++--
+ arch/m68k/configs/sun3_defconfig | 9 +++++++--
+ arch/m68k/configs/sun3x_defconfig | 9 +++++++--
+ arch/m68k/kernel/dma.c | 19 ++++++++++++-------
+ 13 files changed, 96 insertions(+), 31 deletions(-)
+Merging m68knommu/for-next (5ebe6afaf005 Linux 4.1-rc2)
+$ git merge m68knommu/for-next
+Already up-to-date.
+Merging metag/for-next (40346a0327fe metag: copy_thread(): rename 'arg' argument to 'kthread_arg')
+$ git merge metag/for-next
+Already up-to-date.
+Merging microblaze/next (c2219eda5478 microblaze: Fix syscall error recovery for invalid syscall IDs)
+$ git merge microblaze/next
+Already up-to-date.
+Merging mips/mips-for-linux-next (3e20a26b02bd Merge branch '4.0-fixes' into mips-for-linux-next)
+$ git merge mips/mips-for-linux-next
+Already up-to-date.
+Merging nios2/nios2-next (1a70db49a735 nios2: rework cache)
+$ git merge nios2/nios2-next
+Already up-to-date.
+Merging parisc-hd/for-next (5fec97d0e3d9 parisc: copy_thread(): rename 'arg' argument to 'kthread_arg')
+$ git merge parisc-hd/for-next
+Merge made by the 'recursive' strategy.
+ arch/parisc/kernel/process.c | 10 ++++++----
+ drivers/parisc/superio.c | 2 +-
+ 2 files changed, 7 insertions(+), 5 deletions(-)
+Merging powerpc-mpe/next (b787f68c36d4 Linux 4.1-rc1)
+$ git merge powerpc-mpe/next
+Already up-to-date.
+Merging powerpc/next (65e7bb2a34fe Merge branch 'next-sriov' into next)
+$ git merge powerpc/next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging fsl/next (d41444daba1f powerpc/corenet: enable CONFIG_I2C_MUX and CONFIG_I2C_MUX_PCA954x)
+$ git merge fsl/next
+Already up-to-date.
+Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate)
+$ git merge mpc5xxx/next
+Already up-to-date.
+Merging s390/features (6f469dae3aac zcrypt: fixed ap poll timer behavior)
+$ git merge s390/features
+Merge made by the 'recursive' strategy.
+ arch/s390/net/bpf_jit_comp.c | 14 ++++++--------
+ drivers/s390/crypto/ap_bus.c | 16 +++++++---------
+ 2 files changed, 13 insertions(+), 17 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 (148dae7e838a tile: set up initial stack top to honor STACK_TOP_DELTA)
+$ git merge tile/master
+Auto-merging arch/tile/kernel/setup.c
+Merge made by the 'recursive' strategy.
+ arch/tile/Kconfig | 2 +
+ arch/tile/include/asm/irq.h | 5 ++
+ arch/tile/include/asm/spinlock_32.h | 6 +-
+ arch/tile/include/asm/spinlock_64.h | 5 +-
+ arch/tile/include/asm/traps.h | 8 +++
+ arch/tile/include/asm/uaccess.h | 66 ++++-----------------
+ arch/tile/include/asm/word-at-a-time.h | 36 ++++++++++++
+ arch/tile/include/hv/hypervisor.h | 60 +++++++++++++++++++-
+ arch/tile/kernel/hvglue.S | 3 +-
+ arch/tile/kernel/hvglue_trace.c | 4 ++
+ arch/tile/kernel/intvec_64.S | 6 ++
+ arch/tile/kernel/process.c | 101 +++++++++++++++++++++++++++++++++
+ arch/tile/kernel/setup.c | 2 +-
+ arch/tile/kernel/traps.c | 12 ++++
+ arch/tile/lib/exports.c | 2 -
+ arch/tile/lib/spinlock_32.c | 11 +++-
+ arch/tile/lib/spinlock_64.c | 11 +++-
+ arch/tile/lib/usercopy_32.S | 46 ---------------
+ arch/tile/lib/usercopy_64.S | 46 ---------------
+ drivers/tty/hvc/hvc_tile.c | 3 +-
+ 20 files changed, 277 insertions(+), 158 deletions(-)
+ create mode 100644 arch/tile/include/asm/word-at-a-time.h
+Merging uml/linux-next (fe205bdd1321 um: Print minimum physical memory requirement)
+$ 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 (06a631433460 xtensa: Provide dummy dma_alloc_attrs() and dma_free_attrs())
+$ git merge xtensa/for_next
+Merge made by the 'recursive' strategy.
+ arch/xtensa/include/asm/dma-mapping.h | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+Merging btrfs/next (e082f56313f3 btrfs: quota: Update quota tree after qgroup relationship change.)
+$ git merge btrfs/next
+Already up-to-date.
+Merging ceph/master (84b54fefaa05 libceph: announce support for straw2 buckets)
+$ git merge ceph/master
+Merge made by the 'recursive' strategy.
+Merging cifs/for-next (be4a8e38d68f Update negotiate protocol for SMB3.1 dialect)
+$ git merge cifs/for-next
+Auto-merging fs/cifs/smb2ops.c
+Auto-merging fs/cifs/smb1ops.c
+Auto-merging fs/cifs/readdir.c
+Auto-merging fs/cifs/link.c
+Auto-merging fs/cifs/inode.c
+Auto-merging fs/cifs/file.c
+Auto-merging fs/cifs/dir.c
+Auto-merging fs/cifs/connect.c
+Auto-merging fs/cifs/cifssmb.c
+Auto-merging fs/cifs/cifsfs.c
+Auto-merging fs/cifs/cifs_dfs_ref.c
+Merge made by the 'recursive' strategy.
+ fs/cifs/Kconfig | 9 +++++++
+ fs/cifs/cifs_dfs_ref.c | 3 ++-
+ fs/cifs/cifsfs.c | 2 ++
+ fs/cifs/cifsglob.h | 7 ++++++
+ fs/cifs/cifsproto.h | 4 ++--
+ fs/cifs/cifssmb.c | 21 +++++++++--------
+ fs/cifs/connect.c | 10 ++++++++
+ fs/cifs/dir.c | 3 +--
+ fs/cifs/file.c | 3 +--
+ fs/cifs/inode.c | 6 ++---
+ fs/cifs/link.c | 3 ++-
+ fs/cifs/readdir.c | 2 ++
+ fs/cifs/smb1ops.c | 3 ++-
+ fs/cifs/smb2ops.c | 22 +++++++++++++++++
+ fs/cifs/smb2pdu.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++---
+ fs/cifs/smb2pdu.h | 50 ++++++++++++++++++++++++++++++++-------
+ 16 files changed, 178 insertions(+), 34 deletions(-)
+Merging ecryptfs/next (6d65261a09ad eCryptfs: don't pass fs-specific ioctl commands through)
+$ git merge ecryptfs/next
+Already up-to-date.
+Merging ext3/for_next (3adc12e96482 udf: Update ctime and mtime when directory is modified)
+$ git merge ext3/for_next
+Already up-to-date.
+Merging ext4/dev (ef8a5d07c606 ext4 crypto: reorganize how we store keys in the inode)
+$ git merge ext4/dev
+Merge made by the 'recursive' strategy.
+ fs/ext4/crypto.c | 19 +-
+ fs/ext4/crypto_fname.c | 502 ++++++++++++++----------------------------------
+ fs/ext4/crypto_key.c | 87 ++++++---
+ fs/ext4/crypto_policy.c | 76 ++++----
+ fs/ext4/dir.c | 24 ++-
+ fs/ext4/ext4.h | 103 ++++++----
+ fs/ext4/ext4_crypto.h | 31 +--
+ fs/ext4/file.c | 4 +-
+ fs/ext4/inline.c | 31 ++-
+ fs/ext4/namei.c | 340 ++++++++++++--------------------
+ fs/ext4/super.c | 5 +-
+ fs/ext4/symlink.c | 16 +-
+ 12 files changed, 509 insertions(+), 729 deletions(-)
+$ git reset --hard HEAD^
+HEAD is now at fee08cdbf185 Merge remote-tracking branch 'cifs/for-next'
+Merging next-20150506 version of ext4
+$ git merge -m next-20150506/ext4 2c869b262a10ca99cb866d04087d75311587a30c
+Already up-to-date.
+Merging f2fs/dev (68def41a3fde f2fs: don not re-lookup nat cache with same nid)
+$ git merge f2fs/dev
+Merge made by the 'recursive' strategy.
+ fs/f2fs/acl.c | 48 +++--
+ fs/f2fs/checkpoint.c | 23 ++-
+ fs/f2fs/data.c | 431 +++++++++++++++++++++++++++++---------------
+ fs/f2fs/debug.c | 2 +-
+ fs/f2fs/dir.c | 2 +-
+ fs/f2fs/f2fs.h | 109 +++++++++--
+ fs/f2fs/file.c | 43 +++--
+ fs/f2fs/gc.c | 33 ++--
+ fs/f2fs/hash.c | 3 +-
+ fs/f2fs/inline.c | 17 +-
+ fs/f2fs/namei.c | 49 +++--
+ fs/f2fs/node.c | 46 ++---
+ fs/f2fs/node.h | 22 ---
+ fs/f2fs/recovery.c | 6 +-
+ fs/f2fs/segment.c | 100 ++++++----
+ fs/f2fs/segment.h | 1 +
+ fs/f2fs/super.c | 27 ++-
+ fs/f2fs/trace.c | 6 +-
+ fs/f2fs/trace.h | 4 +-
+ include/linux/f2fs_fs.h | 6 +
+ include/trace/events/f2fs.h | 33 ++--
+ 21 files changed, 652 insertions(+), 359 deletions(-)
+Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
+$ git merge fscache/fscache
+Auto-merging fs/cachefiles/namei.c
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/caching/backend-api.txt | 23 ++
+ Documentation/filesystems/caching/fscache.txt | 7 +-
+ fs/cachefiles/internal.h | 1 -
+ fs/cachefiles/namei.c | 33 ++-
+ fs/fscache/cookie.c | 8 +-
+ fs/fscache/internal.h | 12 +-
+ fs/fscache/netfs.c | 38 ++--
+ fs/fscache/object.c | 69 +++++-
+ fs/fscache/operation.c | 254 ++++++++++++++--------
+ fs/fscache/page.c | 86 ++++----
+ fs/fscache/stats.c | 14 +-
+ include/linux/fscache-cache.h | 55 +++--
+ 12 files changed, 396 insertions(+), 204 deletions(-)
+Merging fuse/for-next (94e4fe2cab3d fuse: explicitly set /dev/fuse file's private_data)
+$ git merge fuse/for-next
+Already up-to-date.
+Merging gfs2/for-next (1272574bf948 gfs2: kerneldoc warning fixes)
+$ git merge gfs2/for-next
+Auto-merging fs/gfs2/ops_fstype.c
+Auto-merging fs/gfs2/inode.c
+Auto-merging fs/gfs2/file.c
+Auto-merging fs/gfs2/aops.c
+Merge made by the 'recursive' strategy.
+ fs/gfs2/aops.c | 12 ++-
+ fs/gfs2/file.c | 2 +-
+ fs/gfs2/inode.c | 209 ++++++++++++++++++++++++++++++++++++++++++++++-----
+ fs/gfs2/ops_fstype.c | 1 +
+ fs/gfs2/rgrp.c | 21 ++++--
+ fs/gfs2/sys.c | 66 +++++++++++-----
+ 6 files changed, 264 insertions(+), 47 deletions(-)
+Merging jfs/jfs-next (7d2ac45611b0 jfs: %pf is only for function pointers)
+$ git merge jfs/jfs-next
+Already up-to-date.
+Merging nfs/linux-next (b787f68c36d4 Linux 4.1-rc1)
+$ git merge nfs/linux-next
+Already up-to-date.
+Merging nfsd/nfsd-next (72faedae8bc3 Documentation: remove overloads-avoided counter from knfsd-stats.txt)
+$ git merge nfsd/nfsd-next
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/nfs/knfsd-stats.txt | 44 +-------
+ fs/nfsd/blocklayout.c | 11 ++
+ fs/nfsd/nfs4callback.c | 119 ++++++++++----------
+ fs/nfsd/nfs4state.c | 149 ++++++++++++++++++++++----
+ fs/nfsd/state.h | 19 +++-
+ fs/nfsd/vfs.c | 19 +---
+ fs/nfsd/vfs.h | 1 -
+ fs/nfsd/xdr4.h | 1 +
+ net/sunrpc/auth_gss/gss_rpc_xdr.c | 23 ++--
+ 9 files changed, 238 insertions(+), 148 deletions(-)
+Merging overlayfs/overlayfs-next (71cbad7e694e ovl: upper fs should not be R/O)
+$ git merge overlayfs/overlayfs-next
+Already up-to-date.
+Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option)
+$ git merge squashfs/master
+Already up-to-date.
+Merging v9fs/for-next (3d99e3fe13d4 Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile)
+$ git merge v9fs/for-next
+Already up-to-date.
+Merging ubifs/linux-next (502690674281 UBI: power cut emulation for testing)
+$ git merge ubifs/linux-next
+Already up-to-date.
+Merging xfs/for-next (5ebe6afaf005 Linux 4.1-rc2)
+$ git merge xfs/for-next
+Already up-to-date.
+Merging file-locks/linux-next (7505256626b0 Merge tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux)
+$ git merge file-locks/linux-next
+Already up-to-date.
+Merging vfs/for-next (e1a9e9dd8594 don't pass nameidata to ->follow_link())
+$ git merge vfs/for-next
+Recorded preimage for 'fs/f2fs/namei.c'
+Removing fs/sysv/symlink.c
+Auto-merging fs/gfs2/inode.c
+Auto-merging fs/f2fs/namei.c
+CONFLICT (content): Merge conflict in fs/f2fs/namei.c
+Removing fs/exofs/symlink.c
+Auto-merging fs/cifs/link.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'fs/f2fs/namei.c'.
+[master 6d9541bd4e70] Merge remote-tracking branch 'vfs/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/filesystems/Locking | 4 +-
+ Documentation/filesystems/vfs.txt | 4 +-
+ drivers/staging/lustre/lustre/llite/symlink.c | 26 +-
+ fs/9p/v9fs.h | 2 -
+ fs/9p/vfs_inode.c | 122 +----
+ fs/9p/vfs_inode_dotl.c | 36 +-
+ fs/autofs4/symlink.c | 5 +-
+ fs/befs/linuxvfs.c | 57 +-
+ fs/ceph/inode.c | 11 +-
+ fs/cifs/cifsfs.h | 2 +-
+ fs/cifs/link.c | 28 +-
+ fs/configfs/symlink.c | 28 +-
+ fs/debugfs/file.c | 12 -
+ fs/debugfs/inode.c | 6 +-
+ fs/ecryptfs/inode.c | 8 +-
+ fs/exofs/Kbuild | 2 +-
+ fs/exofs/exofs.h | 4 -
+ fs/exofs/inode.c | 9 +-
+ fs/exofs/namei.c | 5 +-
+ fs/exofs/symlink.c | 55 --
+ fs/ext2/inode.c | 1 +
+ fs/ext2/namei.c | 3 +-
+ fs/ext2/symlink.c | 10 +-
+ fs/ext3/inode.c | 1 +
+ fs/ext3/namei.c | 3 +-
+ fs/ext3/symlink.c | 10 +-
+ fs/ext4/ext4.h | 1 +
+ fs/ext4/inode.c | 7 +-
+ fs/ext4/namei.c | 11 +-
+ fs/ext4/symlink.c | 48 +-
+ fs/f2fs/namei.c | 18 +-
+ fs/freevxfs/vxfs_extern.h | 3 -
+ fs/freevxfs/vxfs_immed.c | 34 --
+ fs/freevxfs/vxfs_inode.c | 7 +-
+ fs/fuse/dir.c | 19 +-
+ fs/gfs2/inode.c | 10 +-
+ fs/hostfs/hostfs_kern.c | 15 +-
+ fs/hppfs/hppfs.c | 9 +-
+ fs/inode.c | 1 +
+ fs/jffs2/dir.c | 1 +
+ fs/jffs2/fs.c | 1 +
+ fs/jffs2/symlink.c | 45 +-
+ fs/jfs/inode.c | 3 +-
+ fs/jfs/namei.c | 5 +-
+ fs/jfs/symlink.c | 10 +-
+ fs/kernfs/symlink.c | 22 +-
+ fs/libfs.c | 19 +-
+ fs/logfs/dir.c | 1 +
+ fs/namei.c | 753 ++++++++++++++------------
+ fs/nfs/symlink.c | 19 +-
+ fs/overlayfs/inode.c | 35 +-
+ fs/proc/base.c | 4 +-
+ fs/proc/inode.c | 9 +-
+ fs/proc/namespaces.c | 4 +-
+ fs/proc/self.c | 24 +-
+ fs/proc/thread_self.c | 22 +-
+ fs/sysv/Makefile | 2 +-
+ fs/sysv/inode.c | 5 +-
+ fs/sysv/symlink.c | 20 -
+ fs/sysv/sysv.h | 1 -
+ fs/ubifs/dir.c | 1 +
+ fs/ubifs/file.c | 11 +-
+ fs/ubifs/super.c | 1 +
+ fs/ufs/inode.c | 5 +-
+ fs/ufs/namei.c | 3 +-
+ fs/ufs/symlink.c | 13 +-
+ fs/xfs/xfs_iops.c | 11 +-
+ include/linux/debugfs.h | 1 -
+ include/linux/fs.h | 13 +-
+ include/linux/namei.h | 6 +-
+ include/linux/sched.h | 2 +-
+ include/linux/security.h | 9 +-
+ mm/shmem.c | 32 +-
+ security/capability.c | 3 +-
+ security/security.c | 4 +-
+ security/selinux/hooks.c | 2 +-
+ 76 files changed, 714 insertions(+), 1045 deletions(-)
+ delete mode 100644 fs/exofs/symlink.c
+ delete mode 100644 fs/sysv/symlink.c
+Merging pci/next (5ebe6afaf005 Linux 4.1-rc2)
+$ git merge pci/next
+Already up-to-date.
+Merging hid/for-next (daa19c2afa6d Merge branch 'for-4.2/wacom' into for-next)
+$ git merge hid/for-next
+Merge made by the 'recursive' strategy.
+ drivers/hid/hid-ids.h | 7 +++
+ drivers/hid/hid-lenovo.c | 19 ++++++
+ drivers/hid/i2c-hid/i2c-hid.c | 5 +-
+ drivers/hid/usbhid/hid-quirks.c | 3 +
+ drivers/hid/wacom.h | 2 +-
+ drivers/hid/wacom_sys.c | 129 ++++++++++++++++++++++------------------
+ drivers/hid/wacom_wac.c | 41 +++++++++++--
+ drivers/hid/wacom_wac.h | 12 ++--
+ 8 files changed, 146 insertions(+), 72 deletions(-)
+Merging i2c/i2c/for-next (b787f68c36d4 Linux 4.1-rc1)
+$ git merge i2c/i2c/for-next
+Already up-to-date.
+Merging jdelvare-hwmon/master (26bc420b59a3 Linux 3.19-rc6)
+$ git merge jdelvare-hwmon/master
+Already up-to-date.
+Merging dmi/master (9432bf142f77 firmware: dmi: List my quilt tree)
+$ git merge dmi/master
+Auto-merging MAINTAINERS
+Auto-merging Documentation/ABI/testing/sysfs-firmware-dmi-entries
+Merge made by the 'recursive' strategy.
+ ...sfs-firmware-dmi => sysfs-firmware-dmi-entries} | 2 +-
+ .../ABI/testing/sysfs-firmware-dmi-tables | 22 ++++
+ MAINTAINERS | 2 +
+ drivers/firmware/dmi-sysfs.c | 17 ++-
+ drivers/firmware/dmi_scan.c | 115 ++++++++++++++++++---
+ include/linux/dmi.h | 2 +
+ 6 files changed, 134 insertions(+), 26 deletions(-)
+ rename Documentation/ABI/testing/{sysfs-firmware-dmi => sysfs-firmware-dmi-entries} (99%)
+ create mode 100644 Documentation/ABI/testing/sysfs-firmware-dmi-tables
+Merging hwmon-staging/hwmon-next (0f8b11419e2f hwmon: Allow compile test of GPIO consumers if !GPIOLIB)
+$ git merge hwmon-staging/hwmon-next
+Auto-merging drivers/hwmon/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/hwmon/ntc_thermistor.txt | 1 +
+ Documentation/hwmon/ntc_thermistor | 6 ++-
+ MAINTAINERS | 2 +-
+ drivers/hwmon/Kconfig | 8 ++--
+ drivers/hwmon/max197.c | 2 +-
+ drivers/hwmon/ntc_thermistor.c | 44 ++++++++++++++++++++++
+ drivers/hwmon/sht15.c | 2 +-
+ include/linux/platform_data/ntc_thermistor.h | 1 +
+ 8 files changed, 57 insertions(+), 9 deletions(-)
+Merging v4l-dvb/master (e7f8fd8aa7f2 Merge branch 'patchwork' into to_next)
+$ git merge v4l-dvb/master
+Removing drivers/staging/media/dt3155v4l/dt3155v4l.c
+Removing drivers/staging/media/dt3155v4l/Makefile
+Removing drivers/staging/media/dt3155v4l/Kconfig
+Auto-merging drivers/media/pci/dt3155/dt3155.h
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/media/v4l/controls.xml | 4 +-
+ .../DocBook/media/v4l/media-func-open.xml | 2 +-
+ Documentation/DocBook/media/v4l/vidioc-g-edid.xml | 7 +
+ .../devicetree/bindings/media/i2c/adp1653.txt | 37 +
+ Documentation/video4linux/v4l2-pci-skeleton.c | 2 -
+ MAINTAINERS | 8 +
+ drivers/input/touchscreen/Kconfig | 3 +-
+ drivers/media/dvb-frontends/af9013.c | 4 +
+ drivers/media/dvb-frontends/bcm3510.c | 4 +-
+ drivers/media/dvb-frontends/cx24116.c | 8 +-
+ drivers/media/dvb-frontends/cx24117.c | 2 +-
+ drivers/media/dvb-frontends/cx24123.h | 2 +-
+ drivers/media/dvb-frontends/dib0070.c | 575 ++++++------
+ drivers/media/dvb-frontends/dib3000mc.c | 18 +-
+ drivers/media/dvb-frontends/dib8000.h | 2 +-
+ drivers/media/dvb-frontends/drx39xyj/drxj.c | 38 +-
+ drivers/media/dvb-frontends/lgdt3306a.c | 2 +-
+ drivers/media/dvb-frontends/mb86a20s.h | 2 +-
+ drivers/media/dvb-frontends/s5h1420.c | 20 +-
+ drivers/media/dvb-frontends/s921.h | 2 +-
+ drivers/media/dvb-frontends/stv0288.c | 28 +-
+ drivers/media/dvb-frontends/stv0297.c | 8 +-
+ drivers/media/dvb-frontends/stv0900_sw.c | 6 +-
+ drivers/media/dvb-frontends/tda1004x.c | 2 +-
+ drivers/media/dvb-frontends/tda10086.c | 4 +-
+ drivers/media/dvb-frontends/zl10353.c | 10 +-
+ drivers/media/i2c/adp1653.c | 100 ++-
+ drivers/media/i2c/adv7170.c | 42 +-
+ drivers/media/i2c/adv7175.c | 42 +-
+ drivers/media/i2c/adv7183.c | 61 +-
+ drivers/media/i2c/adv7604.c | 69 +-
+ drivers/media/i2c/adv7842.c | 25 +-
+ drivers/media/i2c/ak881x.c | 39 +-
+ drivers/media/i2c/cx25840/cx25840-core.c | 17 +-
+ drivers/media/i2c/ml86v7667.c | 29 +-
+ drivers/media/i2c/mt9v011.c | 53 +-
+ drivers/media/i2c/ov2659.c | 2 +-
+ drivers/media/i2c/ov7670.c | 65 +-
+ drivers/media/i2c/s5c73m3/s5c73m3-core.c | 2 +-
+ drivers/media/i2c/s5k5baf.c | 2 +-
+ drivers/media/i2c/s5k6aa.c | 2 +-
+ drivers/media/i2c/saa6752hs.c | 42 +-
+ drivers/media/i2c/saa7115.c | 16 +-
+ drivers/media/i2c/saa717x.c | 20 +-
+ drivers/media/i2c/smiapp/smiapp-core.c | 38 +-
+ drivers/media/i2c/soc_camera/imx074.c | 66 +-
+ drivers/media/i2c/soc_camera/mt9m001.c | 43 +-
+ drivers/media/i2c/soc_camera/mt9m111.c | 57 +-
+ drivers/media/i2c/soc_camera/mt9t031.c | 74 +-
+ drivers/media/i2c/soc_camera/mt9t112.c | 41 +-
+ drivers/media/i2c/soc_camera/mt9v022.c | 43 +-
+ drivers/media/i2c/soc_camera/ov2640.c | 62 +-
+ drivers/media/i2c/soc_camera/ov5642.c | 60 +-
+ drivers/media/i2c/soc_camera/ov6650.c | 43 +-
+ drivers/media/i2c/soc_camera/ov772x.c | 41 +-
+ drivers/media/i2c/soc_camera/ov9640.c | 32 +-
+ drivers/media/i2c/soc_camera/ov9740.c | 35 +-
+ drivers/media/i2c/soc_camera/rj54n1cb0c.c | 66 +-
+ drivers/media/i2c/soc_camera/tw9910.c | 41 +-
+ drivers/media/i2c/sr030pc30.c | 62 +-
+ drivers/media/i2c/tvp514x.c | 55 +-
+ drivers/media/i2c/tvp5150.c | 30 +-
+ drivers/media/i2c/tvp7002.c | 48 -
+ drivers/media/i2c/vs6624.c | 55 +-
+ drivers/media/pci/Kconfig | 1 +
+ drivers/media/pci/Makefile | 1 +
+ drivers/media/pci/bt8xx/bttv-audio-hook.c | 443 ++++++----
+ drivers/media/pci/bt8xx/bttv-driver.c | 5 +-
+ drivers/media/pci/cx18/cx18-av-core.c | 16 +-
+ drivers/media/pci/cx18/cx18-controls.c | 13 +-
+ drivers/media/pci/cx18/cx18-driver.c | 4 +-
+ drivers/media/pci/cx18/cx18-ioctl.c | 12 +-
+ drivers/media/pci/cx18/cx18-streams.c | 1 +
+ drivers/media/pci/cx23885/altera-ci.c | 2 +-
+ drivers/media/pci/cx23885/cx23885-video.c | 12 +-
+ drivers/media/pci/cx88/cx88-core.c | 2 +
+ drivers/media/pci/cx88/cx88-mpeg.c | 6 +-
+ drivers/media/pci/cx88/cx88-vbi.c | 6 +-
+ drivers/media/pci/cx88/cx88-video.c | 7 +-
+ drivers/media/pci/cx88/cx88.h | 1 -
+ drivers/media/pci/dt3155/Kconfig | 13 +
+ drivers/media/pci/dt3155/Makefile | 1 +
+ drivers/media/pci/dt3155/dt3155.c | 632 +++++++++++++
+ .../dt3155v4l.h => media/pci/dt3155/dt3155.h} | 64 +-
+ drivers/media/pci/ivtv/ivtv-controls.c | 12 +-
+ drivers/media/pci/ivtv/ivtv-driver.c | 4 +-
+ drivers/media/pci/ivtv/ivtv-ioctl.c | 12 +-
+ drivers/media/pci/mantis/mantis_cards.c | 3 -
+ drivers/media/pci/ngene/ngene-core.c | 10 +-
+ drivers/media/pci/saa7134/saa7134-cards.c | 19 +-
+ drivers/media/pci/saa7134/saa7134-dvb.c | 2 +-
+ drivers/media/pci/saa7134/saa7134-empress.c | 32 +-
+ drivers/media/pci/saa7164/saa7164-api.c | 22 +-
+ drivers/media/pci/saa7164/saa7164-buffer.c | 2 +-
+ drivers/media/pci/saa7164/saa7164-bus.c | 2 +-
+ drivers/media/pci/saa7164/saa7164-cards.c | 188 +++-
+ drivers/media/pci/saa7164/saa7164-cmd.c | 2 +-
+ drivers/media/pci/saa7164/saa7164-core.c | 16 +-
+ drivers/media/pci/saa7164/saa7164-dvb.c | 238 ++++-
+ drivers/media/pci/saa7164/saa7164-encoder.c | 13 +-
+ drivers/media/pci/saa7164/saa7164-fw.c | 2 +-
+ drivers/media/pci/saa7164/saa7164-i2c.c | 9 +-
+ drivers/media/pci/saa7164/saa7164-reg.h | 2 +-
+ drivers/media/pci/saa7164/saa7164-types.h | 2 +-
+ drivers/media/pci/saa7164/saa7164-vbi.c | 13 +-
+ drivers/media/pci/saa7164/saa7164.h | 7 +-
+ drivers/media/pci/zoran/zoran_device.c | 13 +-
+ drivers/media/platform/am437x/am437x-vpfe.c | 32 +-
+ drivers/media/platform/blackfin/bfin_capture.c | 40 +-
+ drivers/media/platform/davinci/vpfe_capture.c | 19 +-
+ drivers/media/platform/m2m-deinterlace.c | 1 -
+ drivers/media/platform/marvell-ccic/cafe-driver.c | 13 +-
+ drivers/media/platform/marvell-ccic/mcam-core.c | 471 ++++------
+ drivers/media/platform/marvell-ccic/mcam-core.h | 3 +-
+ drivers/media/platform/marvell-ccic/mmp-driver.c | 1 +
+ drivers/media/platform/s3c-camif/camif-capture.c | 13 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc.c | 2 -
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 2 +-
+ drivers/media/platform/s5p-tv/hdmi_drv.c | 12 +-
+ drivers/media/platform/s5p-tv/mixer_drv.c | 15 +-
+ drivers/media/platform/s5p-tv/sdo_drv.c | 14 +-
+ drivers/media/platform/sh_vou.c | 61 +-
+ drivers/media/platform/soc_camera/atmel-isi.c | 74 +-
+ drivers/media/platform/soc_camera/mx2_camera.c | 113 +--
+ drivers/media/platform/soc_camera/mx3_camera.c | 105 ++-
+ drivers/media/platform/soc_camera/omap1_camera.c | 106 ++-
+ drivers/media/platform/soc_camera/pxa_camera.c | 99 ++-
+ drivers/media/platform/soc_camera/rcar_vin.c | 109 ++-
+ .../platform/soc_camera/sh_mobile_ceu_camera.c | 115 +--
+ drivers/media/platform/soc_camera/sh_mobile_csi2.c | 35 +-
+ drivers/media/platform/soc_camera/soc_camera.c | 30 +-
+ .../platform/soc_camera/soc_camera_platform.c | 24 +-
+ drivers/media/platform/soc_camera/soc_scale_crop.c | 37 +-
+ drivers/media/platform/via-camera.c | 19 +-
+ drivers/media/platform/vim2m.c | 4 -
+ drivers/media/platform/vivid/vivid-core.c | 13 +-
+ drivers/media/platform/vivid/vivid-core.h | 1 -
+ drivers/media/platform/vivid/vivid-radio-rx.c | 2 +
+ drivers/media/platform/vivid/vivid-tpg.c | 109 ++-
+ drivers/media/platform/vivid/vivid-tpg.h | 1 +
+ drivers/media/platform/vivid/vivid-vid-cap.c | 17 +-
+ drivers/media/platform/vivid/vivid-vid-common.c | 50 --
+ drivers/media/platform/vivid/vivid-vid-out.c | 3 +-
+ drivers/media/platform/xilinx/Kconfig | 2 +-
+ drivers/media/radio/radio-si476x.c | 4 +-
+ drivers/media/radio/radio-timb.c | 4 +-
+ drivers/media/radio/si4713/si4713.c | 4 +-
+ drivers/media/radio/wl128x/fmdrv.h | 2 +-
+ drivers/media/rc/ir-sony-decoder.c | 28 +-
+ drivers/media/rc/rc-main.c | 2 +-
+ drivers/media/rc/redrat3.c | 2 +-
+ drivers/media/tuners/qt1010.c | 8 +-
+ drivers/media/tuners/r820t.c | 4 +-
+ drivers/media/usb/as102/as102_drv.c | 1 +
+ drivers/media/usb/cx231xx/cx231xx-417.c | 18 +-
+ drivers/media/usb/cx231xx/cx231xx-avcore.c | 44 +-
+ drivers/media/usb/cx231xx/cx231xx-core.c | 30 +-
+ drivers/media/usb/cx231xx/cx231xx-video.c | 23 +-
+ drivers/media/usb/dvb-usb/af9005-fe.c | 2 +-
+ drivers/media/usb/dvb-usb/dib0700_devices.c | 32 +-
+ drivers/media/usb/dvb-usb/dw2102.c | 2 +-
+ drivers/media/usb/dvb-usb/vp702x.c | 7 +-
+ drivers/media/usb/em28xx/em28xx-camera.c | 12 +-
+ drivers/media/usb/go7007/go7007-driver.c | 3 +-
+ drivers/media/usb/go7007/go7007-usb.c | 4 +
+ drivers/media/usb/go7007/go7007-v4l2.c | 12 +-
+ drivers/media/usb/go7007/s2250-board.c | 18 +-
+ drivers/media/usb/gspca/benq.c | 4 +-
+ drivers/media/usb/gspca/sonixj.c | 2 +-
+ drivers/media/usb/gspca/stk014.c | 2 +-
+ drivers/media/usb/gspca/xirlink_cit.c | 12 +-
+ drivers/media/usb/gspca/zc3xx.c | 16 +-
+ drivers/media/usb/pvrusb2/pvrusb2-context.c | 3 +-
+ drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 35 +-
+ drivers/media/usb/pvrusb2/pvrusb2-io.c | 30 +-
+ drivers/media/usb/pvrusb2/pvrusb2-ioread.c | 24 +-
+ drivers/media/usb/ttusb-dec/ttusb_dec.c | 4 +-
+ drivers/media/usb/usbtv/usbtv-video.c | 12 +-
+ drivers/media/usb/usbvision/usbvision-core.c | 4 +-
+ drivers/media/v4l2-core/Kconfig | 2 +-
+ drivers/media/v4l2-core/v4l2-dv-timings.c | 29 +-
+ drivers/media/v4l2-core/v4l2-ioctl.c | 199 ++++-
+ drivers/media/v4l2-core/v4l2-of.c | 92 +-
+ drivers/media/v4l2-core/videobuf2-core.c | 2 -
+ drivers/media/v4l2-core/videobuf2-dma-contig.c | 7 +
+ drivers/media/v4l2-core/videobuf2-dma-sg.c | 6 +
+ drivers/media/v4l2-core/videobuf2-vmalloc.c | 6 +-
+ drivers/staging/media/Kconfig | 2 -
+ drivers/staging/media/Makefile | 1 -
+ drivers/staging/media/bcm2048/radio-bcm2048.c | 3 +-
+ drivers/staging/media/dt3155v4l/Kconfig | 29 -
+ drivers/staging/media/dt3155v4l/Makefile | 1 -
+ drivers/staging/media/dt3155v4l/dt3155v4l.c | 981 ---------------------
+ include/media/adp1653.h | 8 +-
+ include/media/v4l2-of.h | 20 +-
+ include/media/v4l2-subdev.h | 16 -
+ 196 files changed, 4424 insertions(+), 3448 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/media/i2c/adp1653.txt
+ create mode 100644 drivers/media/pci/dt3155/Kconfig
+ create mode 100644 drivers/media/pci/dt3155/Makefile
+ create mode 100644 drivers/media/pci/dt3155/dt3155.c
+ rename drivers/{staging/media/dt3155v4l/dt3155v4l.h => media/pci/dt3155/dt3155.h} (82%)
+ delete mode 100644 drivers/staging/media/dt3155v4l/Kconfig
+ delete mode 100644 drivers/staging/media/dt3155v4l/Makefile
+ delete mode 100644 drivers/staging/media/dt3155v4l/dt3155v4l.c
+Merging kbuild/for-next (d1809fd6c20c Merge branch 'kbuild/misc' into kbuild/for-next)
+$ git merge kbuild/for-next
+Auto-merging lib/Kconfig.debug
+Auto-merging arch/x86/Kconfig
+Auto-merging Makefile
+Merge made by the 'recursive' strategy.
+ Documentation/lto-build | 173 +++++++++++++++++++++++++++++++++++++++++++++++
+ Makefile | 35 +++++++---
+ arch/x86/Kconfig | 2 +-
+ init/Kconfig | 73 ++++++++++++++++++++
+ kernel/gcov/Kconfig | 2 +-
+ lib/Kconfig.debug | 2 +-
+ scripts/Makefile.lto | 84 +++++++++++++++++++++++
+ scripts/Makefile.modpost | 7 +-
+ scripts/link-vmlinux.sh | 2 +-
+ scripts/package/builddeb | 24 +++++--
+ scripts/package/mkspec | 4 +-
+ 11 files changed, 381 insertions(+), 27 deletions(-)
+ create mode 100644 Documentation/lto-build
+ create mode 100644 scripts/Makefile.lto
+Merging kconfig/for-next (bfa76d495765 Linux 3.19)
+$ git merge kconfig/for-next
+Already up-to-date.
+Merging libata/for-next (236c810081dd Merge branch 'for-4.2' into for-next)
+$ git merge libata/for-next
+Removing drivers/ide/scc_pata.c
+Removing drivers/ata/pata_scc.c
+Auto-merging Documentation/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-ata | 11 +
+ Documentation/kernel-parameters.txt | 2 +
+ drivers/ata/Kconfig | 10 +-
+ drivers/ata/Makefile | 1 -
+ drivers/ata/ahci_st.c | 49 +-
+ drivers/ata/libahci.c | 3 +-
+ drivers/ata/libata-core.c | 36 +-
+ drivers/ata/libata-eh.c | 15 +-
+ drivers/ata/libata-transport.c | 22 +
+ drivers/ata/pata_samsung_cf.c | 2 +-
+ drivers/ata/pata_scc.c | 1110 -----------------------------------
+ drivers/ide/Kconfig | 9 -
+ drivers/ide/Makefile | 1 -
+ drivers/ide/scc_pata.c | 887 ----------------------------
+ include/linux/ata.h | 12 +-
+ include/linux/libata.h | 11 +
+ 16 files changed, 133 insertions(+), 2048 deletions(-)
+ delete mode 100644 drivers/ata/pata_scc.c
+ delete mode 100644 drivers/ide/scc_pata.c
+Merging pm/linux-next (812f73d500b2 Merge branch 'powercap' into linux-next)
+$ git merge pm/linux-next
+Merge made by the 'recursive' strategy.
+ Documentation/acpi/enumeration.txt | 2 +-
+ Documentation/acpi/gpio-properties.txt | 6 +-
+ arch/x86/pci/acpi.c | 24 ++++++-
+ drivers/acpi/acpi_pnp.c | 2 +
+ drivers/acpi/apei/ghes.c | 108 ++++++++++++++++---------------
+ drivers/acpi/resource.c | 2 +-
+ drivers/acpi/sbshc.c | 22 +++++++
+ drivers/cpufreq/arm_big_little.c | 13 +++-
+ drivers/cpufreq/intel_pstate.c | 31 ++++++---
+ drivers/cpufreq/pxa2xx-cpufreq.c | 20 +++---
+ drivers/cpuidle/cpuidle.c | 6 +-
+ drivers/cpuidle/cpuidle.h | 2 +
+ drivers/cpuidle/governors/menu.c | 4 +-
+ drivers/powercap/intel_rapl.c | 50 +++++++++++---
+ include/trace/events/power.h | 25 ++++---
+ kernel/sched/idle.c | 115 +++++++++++++++++----------------
+ 16 files changed, 273 insertions(+), 159 deletions(-)
+Merging idle/next (64887b6882de Merge branch 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
+$ git merge idle/next
+Already up-to-date.
+Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
+$ git merge apm/for-next
+Already up-to-date.
+Merging thermal/next (7964293a1ebf Merge branches 'for-rc' and 'thermal_intel' of .git into next)
+$ git merge thermal/next
+Merge made by the 'recursive' strategy.
+ drivers/thermal/Kconfig | 24 +-
+ drivers/thermal/Makefile | 2 +
+ .../int340x_thermal/processor_thermal_device.c | 59 ++-
+ drivers/thermal/intel_powerclamp.c | 10 +-
+ drivers/thermal/intel_quark_dts_thermal.c | 473 ++++++++++++++++++++
+ drivers/thermal/intel_soc_dts_iosf.c | 478 +++++++++++++++++++++
+ drivers/thermal/intel_soc_dts_iosf.h | 62 +++
+ drivers/thermal/intel_soc_dts_thermal.c | 430 +-----------------
+ drivers/thermal/thermal_core.h | 2 +-
+ drivers/thermal/user_space.c | 13 +-
+ 10 files changed, 1136 insertions(+), 417 deletions(-)
+ create mode 100644 drivers/thermal/intel_quark_dts_thermal.c
+ create mode 100644 drivers/thermal/intel_soc_dts_iosf.c
+ create mode 100644 drivers/thermal/intel_soc_dts_iosf.h
+Merging thermal-soc/next (488c7455d74c thermal: exynos: Add the support for Exynos5433 TMU)
+$ git merge thermal-soc/next
+Auto-merging drivers/thermal/thermal_core.h
+Auto-merging drivers/thermal/Makefile
+Auto-merging drivers/thermal/Kconfig
+Merge made by the 'recursive' strategy.
+ .../bindings/thermal/qcom-spmi-temp-alarm.txt | 57 ++
+ .../devicetree/bindings/thermal/thermal.txt | 9 +
+ Documentation/thermal/cpu-cooling-api.txt | 156 +++++-
+ Documentation/thermal/power_allocator.txt | 247 +++++++++
+ Documentation/thermal/sysfs-api.txt | 83 ++-
+ drivers/acpi/thermal.c | 9 +-
+ drivers/platform/x86/acerhdf.c | 3 +-
+ drivers/thermal/Kconfig | 36 ++
+ drivers/thermal/Makefile | 2 +
+ drivers/thermal/cpu_cooling.c | 585 ++++++++++++++++++++-
+ drivers/thermal/db8500_thermal.c | 2 +-
+ drivers/thermal/fair_share.c | 41 +-
+ drivers/thermal/imx_thermal.c | 3 +-
+ drivers/thermal/of-thermal.c | 15 +-
+ drivers/thermal/power_allocator.c | 538 +++++++++++++++++++
+ drivers/thermal/qcom-spmi-temp-alarm.c | 309 +++++++++++
+ drivers/thermal/samsung/exynos_tmu.c | 187 ++++++-
+ drivers/thermal/samsung/exynos_tmu.h | 1 +
+ drivers/thermal/thermal_core.c | 310 ++++++++++-
+ drivers/thermal/thermal_core.h | 11 +
+ drivers/thermal/ti-soc-thermal/ti-bandgap.c | 104 ++--
+ drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 5 +-
+ drivers/thermal/x86_pkg_temp_thermal.c | 2 +-
+ include/linux/cpu_cooling.h | 39 ++
+ include/linux/thermal.h | 86 ++-
+ include/trace/events/thermal.h | 58 ++
+ include/trace/events/thermal_power_allocator.h | 87 +++
+ 27 files changed, 2850 insertions(+), 135 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/thermal/qcom-spmi-temp-alarm.txt
+ create mode 100644 Documentation/thermal/power_allocator.txt
+ create mode 100644 drivers/thermal/power_allocator.c
+ create mode 100644 drivers/thermal/qcom-spmi-temp-alarm.c
+ create mode 100644 include/trace/events/thermal_power_allocator.h
+Merging ieee1394/for-next (d71e6a11737f firewire: core: use correct vendor/model IDs)
+$ git merge ieee1394/for-next
+Already up-to-date.
+Merging dlm/next (2ab4bd8ea3a6 dlm: adopt orphan locks)
+$ git merge dlm/next
+Already up-to-date.
+Merging swiotlb/linux-next (8e0629c1d4ce swiotlb: don't assume PA 0 is invalid)
+$ git merge swiotlb/linux-next
+Already up-to-date.
+Merging slave-dma/next (428d96e91ee2 dmaengine: s3c24xx: Constify platform_device_id)
+$ git merge slave-dma/next
+Merge made by the 'recursive' strategy.
+ drivers/dma/ep93xx_dma.c | 2 +-
+ drivers/dma/imx-dma.c | 2 +-
+ drivers/dma/imx-sdma.c | 2 +-
+ drivers/dma/mxs-dma.c | 2 +-
+ drivers/dma/nbpfaxi.c | 2 +-
+ drivers/dma/omap-dma.c | 51 +++++++++++++++++++++++++++++++++++++++++++++--
+ drivers/dma/s3c24xx-dma.c | 2 +-
+ 7 files changed, 55 insertions(+), 8 deletions(-)
+Merging net-next/master (239fb791d4ee vxlan: Correctly set flow*i_mark and flow4i_proto in route lookups)
+$ git merge net-next/master
+Auto-merging net/sched/sch_fq_codel.c
+Auto-merging net/core/dev.c
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-class-net | 19 ++
+ Documentation/networking/ip-sysctl.txt | 8 +
+ Documentation/networking/tc-actions-env-rules.txt | 2 -
+ drivers/net/ethernet/apm/xgene/Makefile | 2 +-
+ drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 36 ++-
+ drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 8 +-
+ drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 207 ++++++++++++----
+ drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 30 ++-
+ drivers/net/ethernet/apm/xgene/xgene_enet_ring2.c | 200 +++++++++++++++
+ drivers/net/ethernet/apm/xgene/xgene_enet_ring2.h | 49 ++++
+ drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c | 62 +++--
+ drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 1 -
+ drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h | 20 ++
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 26 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 11 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 1 +
+ drivers/net/ethernet/chelsio/cxgb4/sge.c | 160 ++++++------
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 133 +++++++++-
+ drivers/net/ethernet/chelsio/cxgb4/t4_values.h | 9 +
+ drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 3 +
+ drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 15 +-
+ drivers/net/ethernet/emulex/benet/be_main.c | 2 +
+ drivers/net/ethernet/ibm/ibmveth.c | 41 ++-
+ drivers/net/ethernet/ibm/ibmveth.h | 5 +-
+ drivers/net/ethernet/intel/e100.c | 2 +-
+ drivers/net/ethernet/intel/e1000e/82571.c | 2 +-
+ drivers/net/ethernet/intel/e1000e/ich8lan.c | 23 +-
+ drivers/net/ethernet/intel/e1000e/netdev.c | 32 ++-
+ drivers/net/ethernet/intel/igb/igb_main.c | 27 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 10 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 4 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 8 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 106 +++++---
+ drivers/net/ethernet/rocker/rocker.c | 4 +-
+ drivers/net/ethernet/via/via-rhine.c | 249 ++++++++++++-------
+ drivers/net/ethernet/xilinx/xilinx_axienet.h | 108 ++++----
+ drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 288 ++++++++++++----------
+ drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | 30 +--
+ drivers/net/ipvlan/ipvlan.h | 5 +
+ drivers/net/ipvlan/ipvlan_core.c | 138 +++++++----
+ drivers/net/ipvlan/ipvlan_main.c | 25 +-
+ drivers/net/vxlan.c | 3 +
+ include/linux/etherdevice.h | 42 +++-
+ include/linux/if_vlan.h | 2 +-
+ include/linux/igmp.h | 1 +
+ include/linux/skbuff.h | 5 +
+ include/linux/tcp.h | 8 +
+ include/net/addrconf.h | 1 +
+ include/net/dst.h | 6 -
+ include/net/flow_keys.h | 16 ++
+ include/net/ip6_fib.h | 41 +--
+ include/net/ipv6.h | 9 +-
+ include/net/netns/ipv6.h | 1 +
+ include/net/request_sock.h | 4 +-
+ include/net/sch_generic.h | 2 -
+ include/uapi/linux/pkt_cls.h | 5 +
+ include/uapi/linux/tcp.h | 2 +
+ lib/rhashtable.c | 8 +-
+ lib/test_bpf.c | 12 +-
+ lib/test_rhashtable.c | 215 +++++++++-------
+ net/bridge/br_multicast.c | 238 +++---------------
+ net/bridge/br_private.h | 4 +-
+ net/bridge/netfilter/ebtables.c | 2 +-
+ net/core/dev.c | 11 -
+ net/core/flow_dissector.c | 65 ++++-
+ net/core/skbuff.c | 87 +++++++
+ net/ethernet/eth.c | 7 +-
+ net/ipv4/fib_semantics.c | 4 -
+ net/ipv4/igmp.c | 162 ++++++++++++
+ net/ipv4/ip_tunnel_core.c | 2 +-
+ net/ipv4/route.c | 23 +-
+ net/ipv4/tcp.c | 35 +++
+ net/ipv4/tcp_input.c | 104 ++++----
+ net/ipv4/tcp_ipv4.c | 1 +
+ net/ipv4/tcp_minisocks.c | 3 +
+ net/ipv6/Makefile | 1 +
+ net/ipv6/addrconf.c | 2 +
+ net/ipv6/af_inet6.c | 1 +
+ net/ipv6/ip6_flowlabel.c | 4 +
+ net/ipv6/mcast_snoop.c | 213 ++++++++++++++++
+ net/ipv6/route.c | 176 ++++++-------
+ net/ipv6/sysctl_net_ipv6.c | 8 +
+ net/ipv6/xfrm6_policy.c | 14 --
+ net/openvswitch/datapath.c | 2 +-
+ net/openvswitch/flow.c | 4 +-
+ net/openvswitch/flow_netlink.c | 2 +-
+ net/sched/act_api.c | 5 -
+ net/sched/act_pedit.c | 5 +-
+ net/sched/sch_choke.c | 14 +-
+ net/sched/sch_fq_codel.c | 11 +-
+ net/sched/sch_hhf.c | 19 +-
+ net/sched/sch_ingress.c | 5 +-
+ net/sched/sch_sfb.c | 24 +-
+ net/sched/sch_sfq.c | 27 +-
+ net/tipc/core.c | 4 +-
+ net/tipc/name_table.c | 34 +--
+ net/tipc/server.c | 4 +
+ net/tipc/subscr.c | 242 +++++++++---------
+ net/tipc/subscr.h | 18 +-
+ 100 files changed, 2655 insertions(+), 1430 deletions(-)
+ create mode 100644 drivers/net/ethernet/apm/xgene/xgene_enet_ring2.c
+ create mode 100644 drivers/net/ethernet/apm/xgene/xgene_enet_ring2.h
+ create mode 100644 net/ipv6/mcast_snoop.c
+Merging ipsec-next/master (de2ad486cb6c xfrm: move the checking for old xfrm_policy hold_queue to beginning)
+$ git merge ipsec-next/master
+Auto-merging net/xfrm/xfrm_state.c
+Merge made by the 'recursive' strategy.
+ net/xfrm/xfrm_input.c | 12 ++++++------
+ net/xfrm/xfrm_policy.c | 31 ++++++++++++-------------------
+ net/xfrm/xfrm_state.c | 4 ++--
+ 3 files changed, 20 insertions(+), 27 deletions(-)
+Merging wireless-drivers-next/master (73b25f66dcae Merge ath-next from ath.git)
+$ git merge wireless-drivers-next/master
+Merge made by the 'recursive' strategy.
+ drivers/net/wireless/ath/ath10k/Makefile | 4 +-
+ drivers/net/wireless/ath/ath10k/core.c | 161 +-
+ drivers/net/wireless/ath/ath10k/core.h | 48 +-
+ drivers/net/wireless/ath/ath10k/debug.c | 127 +-
+ drivers/net/wireless/ath/ath10k/htc.c | 50 +-
+ drivers/net/wireless/ath/ath10k/htt.c | 98 +
+ drivers/net/wireless/ath/ath10k/htt.h | 132 +-
+ drivers/net/wireless/ath/ath10k/htt_rx.c | 194 +-
+ drivers/net/wireless/ath/ath10k/htt_tx.c | 34 +-
+ drivers/net/wireless/ath/ath10k/hw.h | 53 +-
+ drivers/net/wireless/ath/ath10k/mac.c | 2826 +++++++++++++++++------
+ drivers/net/wireless/ath/ath10k/mac.h | 29 +
+ drivers/net/wireless/ath/ath10k/p2p.c | 156 ++
+ drivers/net/wireless/ath/ath10k/p2p.h | 28 +
+ drivers/net/wireless/ath/ath10k/pci.c | 101 +-
+ drivers/net/wireless/ath/ath10k/rx_desc.h | 22 +
+ drivers/net/wireless/ath/ath10k/thermal.c | 134 +-
+ drivers/net/wireless/ath/ath10k/thermal.h | 10 +-
+ drivers/net/wireless/ath/ath10k/trace.h | 22 +-
+ drivers/net/wireless/ath/ath10k/txrx.c | 9 +-
+ drivers/net/wireless/ath/ath10k/wmi-ops.h | 194 +-
+ drivers/net/wireless/ath/ath10k/wmi-tlv.c | 579 ++++-
+ drivers/net/wireless/ath/ath10k/wmi-tlv.h | 168 ++
+ drivers/net/wireless/ath/ath10k/wmi.c | 272 +--
+ drivers/net/wireless/ath/ath10k/wmi.h | 230 +-
+ drivers/net/wireless/ath/ath10k/wow.c | 321 +++
+ drivers/net/wireless/ath/ath10k/wow.h | 40 +
+ drivers/net/wireless/ath/dfs_pattern_detector.c | 72 +-
+ drivers/net/wireless/ath/dfs_pattern_detector.h | 4 +
+ drivers/net/wireless/ath/dfs_pri_detector.c | 4 +
+ 30 files changed, 4884 insertions(+), 1238 deletions(-)
+ create mode 100644 drivers/net/wireless/ath/ath10k/p2p.c
+ create mode 100644 drivers/net/wireless/ath/ath10k/p2p.h
+ create mode 100644 drivers/net/wireless/ath/ath10k/wow.c
+ create mode 100644 drivers/net/wireless/ath/ath10k/wow.h
+Merging bluetooth/master (1add15646672 ieee802154: trace: fix endian convertion)
+$ git merge bluetooth/master
+Already up-to-date.
+Merging infiniband/for-next (c1c2fef6cfb0 Merge branches 'cve-fixup', 'ipoib', 'iser', 'misc-4.1', 'or-mlx4' and 'srp' into for-4.1)
+$ git merge infiniband/for-next
+Already up-to-date.
+Merging mtd/master (b787f68c36d4 Linux 4.1-rc1)
+$ git merge mtd/master
+Already up-to-date.
+Merging l2-mtd/master (b787f68c36d4 Linux 4.1-rc1)
+$ git merge l2-mtd/master
+Already up-to-date.
+Merging crypto/master (09e217844a2e crypto: testmgr - Wrap the LHS in expressions of the form !x == y)
+$ git merge crypto/master
+Auto-merging drivers/crypto/Kconfig
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/crypto/fsl-sec2.txt | 6 +-
+ arch/arm64/crypto/aes-ce-ccm-glue.c | 2 +-
+ arch/x86/crypto/sha-mb/sha1_mb.c | 3 +-
+ crypto/ablkcipher.c | 2 +-
+ crypto/aead.c | 2 +-
+ crypto/algapi.c | 14 +-
+ crypto/algif_aead.c | 1 +
+ crypto/algif_rng.c | 2 +-
+ crypto/ansi_cprng.c | 88 ++-
+ crypto/drbg.c | 380 ++++-------
+ crypto/fips.c | 53 +-
+ crypto/internal.h | 3 +-
+ crypto/krng.c | 33 +-
+ crypto/pcompress.c | 7 +-
+ crypto/proc.c | 41 --
+ crypto/rng.c | 105 ++-
+ crypto/shash.c | 7 +-
+ crypto/tcrypt.c | 9 +-
+ crypto/testmgr.c | 2 +
+ crypto/testmgr.h | 8 +-
+ crypto/zlib.c | 4 +-
+ drivers/crypto/Kconfig | 18 +
+ drivers/crypto/caam/caamalg.c | 4 -
+ drivers/crypto/mv_cesa.c | 2 +-
+ drivers/crypto/nx/nx-sha256.c | 84 ++-
+ drivers/crypto/nx/nx-sha512.c | 85 ++-
+ drivers/crypto/nx/nx.c | 69 +-
+ drivers/crypto/nx/nx.h | 2 -
+ drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 2 +-
+ drivers/crypto/talitos.c | 727 +++++++++++++++------
+ drivers/crypto/talitos.h | 153 +++--
+ include/crypto/compress.h | 8 +-
+ include/crypto/drbg.h | 54 +-
+ include/crypto/internal/rng.h | 12 +-
+ include/crypto/rng.h | 100 ++-
+ include/linux/crypto.h | 42 --
+ include/linux/module.h | 12 +
+ net/mac80211/aes_ccm.c | 3 +-
+ net/mac80211/aes_gcm.c | 3 +-
+ net/mac80211/aes_gmac.c | 2 +-
+ net/mac802154/llsec.c | 3 +-
+ 41 files changed, 1245 insertions(+), 912 deletions(-)
+Merging drm/drm-next (cec32a470106 media-bus: Fixup RGB444_1X12, RGB565_1X16, and YUV8_1X24 media bus format)
+$ git merge drm/drm-next
+Already up-to-date.
+Merging drm-panel/drm/panel/for-next (1c550fa193d0 drm/panel: Add support for Ampire AM-800480R3TMQW-A1H 800x480 7" panel)
+$ git merge drm-panel/drm/panel/for-next
+Already up-to-date.
+Merging drm-intel/for-linux-next (64354738ebab drm/i915/skl: Fix WaDisableChickenBitTSGBarrierAckForFFSliceCS)
+$ git merge drm-intel/for-linux-next
+Resolved 'drivers/gpu/drm/i915/i915_drv.c' using previous resolution.
+Auto-merging include/drm/drm_crtc.h
+Auto-merging drivers/gpu/drm/i915/intel_uncore.c
+Auto-merging drivers/gpu/drm/i915/intel_sdvo.c
+Auto-merging drivers/gpu/drm/i915/intel_panel.c
+Auto-merging drivers/gpu/drm/i915/intel_lvds.c
+Auto-merging drivers/gpu/drm/i915/intel_lrc.c
+Auto-merging drivers/gpu/drm/i915/intel_i2c.c
+Auto-merging drivers/gpu/drm/i915/intel_hdmi.c
+Auto-merging drivers/gpu/drm/i915/intel_dvo.c
+Auto-merging drivers/gpu/drm/i915/intel_drv.h
+Auto-merging drivers/gpu/drm/i915/intel_dp_mst.c
+Auto-merging drivers/gpu/drm/i915/intel_dp.c
+Auto-merging drivers/gpu/drm/i915/intel_display.c
+Auto-merging drivers/gpu/drm/i915/intel_ddi.c
+Auto-merging drivers/gpu/drm/i915/intel_crt.c
+Auto-merging drivers/gpu/drm/i915/i915_trace.h
+Auto-merging drivers/gpu/drm/i915/i915_reg.h
+Auto-merging drivers/gpu/drm/i915/i915_irq.c
+Auto-merging drivers/gpu/drm/i915/i915_gem.c
+Auto-merging drivers/gpu/drm/i915/i915_drv.h
+Auto-merging drivers/gpu/drm/i915/i915_drv.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c
+Auto-merging drivers/gpu/drm/drm_crtc.c
+Auto-merging Documentation/DocBook/drm.tmpl
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 369fe47befa6] Merge remote-tracking branch 'drm-intel/for-linux-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/DocBook/drm.tmpl | 4 +-
+ arch/x86/kernel/early-quirks.c | 1 +
+ drivers/gpu/drm/drm_crtc.c | 23 +
+ drivers/gpu/drm/i915/Makefile | 3 +-
+ drivers/gpu/drm/i915/dvo_ivch.c | 21 +-
+ drivers/gpu/drm/i915/dvo_ns2501.c | 670 ++++++------
+ drivers/gpu/drm/i915/i915_cmd_parser.c | 12 +-
+ drivers/gpu/drm/i915/i915_debugfs.c | 485 ++++++---
+ drivers/gpu/drm/i915/i915_dma.c | 281 ++---
+ drivers/gpu/drm/i915/i915_drv.c | 104 +-
+ drivers/gpu/drm/i915/i915_drv.h | 200 ++--
+ drivers/gpu/drm/i915/i915_gem.c | 237 +++--
+ drivers/gpu/drm/i915/i915_gem_batch_pool.c | 84 +-
+ drivers/gpu/drm/i915/i915_gem_batch_pool.h | 42 +
+ drivers/gpu/drm/i915/i915_gem_context.c | 37 +-
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 51 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 1045 ++++++++++---------
+ drivers/gpu/drm/i915/i915_gem_gtt.h | 101 +-
+ drivers/gpu/drm/i915/i915_gem_shrinker.c | 8 +-
+ drivers/gpu/drm/i915/i915_gem_stolen.c | 2 +-
+ drivers/gpu/drm/i915/i915_gem_tiling.c | 2 +-
+ drivers/gpu/drm/i915/i915_gpu_error.c | 11 +-
+ drivers/gpu/drm/i915/i915_irq.c | 282 ++++--
+ drivers/gpu/drm/i915/i915_params.c | 8 +
+ drivers/gpu/drm/i915/i915_reg.h | 560 +++++++++-
+ drivers/gpu/drm/i915/i915_trace.h | 44 +-
+ drivers/gpu/drm/i915/intel_atomic.c | 176 ++++
+ drivers/gpu/drm/i915/intel_atomic_plane.c | 24 +
+ drivers/gpu/drm/i915/intel_audio.c | 24 +-
+ drivers/gpu/drm/i915/intel_bios.c | 39 +-
+ drivers/gpu/drm/i915/intel_bios.h | 4 +-
+ drivers/gpu/drm/i915/intel_crt.c | 2 +-
+ drivers/gpu/drm/i915/intel_csr.c | 414 ++++++++
+ drivers/gpu/drm/i915/intel_ddi.c | 791 ++++++++++++---
+ drivers/gpu/drm/i915/intel_display.c | 1519 ++++++++++++++++++++++------
+ drivers/gpu/drm/i915/intel_dp.c | 275 ++++-
+ drivers/gpu/drm/i915/intel_dp_mst.c | 14 +-
+ drivers/gpu/drm/i915/intel_drv.h | 121 ++-
+ drivers/gpu/drm/i915/intel_dvo.c | 27 +-
+ drivers/gpu/drm/i915/intel_frontbuffer.c | 2 +
+ drivers/gpu/drm/i915/intel_hdmi.c | 30 +-
+ drivers/gpu/drm/i915/intel_i2c.c | 97 +-
+ drivers/gpu/drm/i915/intel_lrc.c | 509 +++++-----
+ drivers/gpu/drm/i915/intel_lrc.h | 5 +-
+ drivers/gpu/drm/i915/intel_lvds.c | 4 +-
+ drivers/gpu/drm/i915/intel_overlay.c | 66 +-
+ drivers/gpu/drm/i915/intel_panel.c | 87 +-
+ drivers/gpu/drm/i915/intel_pm.c | 134 ++-
+ drivers/gpu/drm/i915/intel_psr.c | 118 ++-
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 135 +--
+ drivers/gpu/drm/i915/intel_ringbuffer.h | 10 +
+ drivers/gpu/drm/i915/intel_runtime_pm.c | 322 +++++-
+ drivers/gpu/drm/i915/intel_sdvo.c | 11 +-
+ drivers/gpu/drm/i915/intel_sprite.c | 191 ++--
+ drivers/gpu/drm/i915/intel_uncore.c | 98 +-
+ include/drm/drm_crtc.h | 1 +
+ include/drm/i915_pciids.h | 6 +
+ include/uapi/drm/i915_drm.h | 1 +
+ 58 files changed, 6931 insertions(+), 2644 deletions(-)
+ create mode 100644 drivers/gpu/drm/i915/i915_gem_batch_pool.h
+ create mode 100644 drivers/gpu/drm/i915/intel_csr.c
+Merging drm-tegra/drm/tegra/for-next (535a65db484f drm/tegra: sor: Reset during initialization)
+$ git merge drm-tegra/drm/tegra/for-next
+Already up-to-date.
+Merging drm-misc/topic/drm-misc (8b80c007b40e drm/edid: Add DMT modes with ID > 0x50)
+$ git merge drm-misc/topic/drm-misc
+Auto-merging drivers/gpu/drm/i915/intel_atomic_plane.c
+Auto-merging drivers/gpu/drm/drm_probe_helper.c
+Auto-merging drivers/gpu/drm/drm_atomic_helper.c
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/drm_atomic_helper.c | 9 +-
+ drivers/gpu/drm/drm_auth.c | 178 ++++++--------------------
+ drivers/gpu/drm/drm_dp_helper.c | 12 +-
+ drivers/gpu/drm/drm_drv.c | 20 +--
+ drivers/gpu/drm/drm_edid.c | 202 +++++++++++++++++-------------
+ drivers/gpu/drm/drm_fops.c | 7 +-
+ drivers/gpu/drm/drm_internal.h | 1 -
+ drivers/gpu/drm/drm_irq.c | 103 ++++++++-------
+ drivers/gpu/drm/drm_modeset_lock.c | 8 +-
+ drivers/gpu/drm/drm_probe_helper.c | 4 +-
+ drivers/gpu/drm/i915/intel_atomic_plane.c | 4 -
+ drivers/gpu/drm/qxl/qxl_drv.c | 2 +-
+ include/drm/drmP.h | 14 ++-
+ 13 files changed, 249 insertions(+), 315 deletions(-)
+Merging drm-exynos/exynos-drm/for-next (7b025c687af7 drm/exynos: mixer: Constify platform_device_id)
+$ git merge drm-exynos/exynos-drm/for-next
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/exynos/exynos_drm_fb.c | 39 +---------------------
+ drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 +-
+ drivers/gpu/drm/exynos/exynos_mixer.c | 55 ++++++++++++++++---------------
+ 3 files changed, 31 insertions(+), 65 deletions(-)
+Merging drm-msm/msm-next (d5af49c92a8a drm/msm/mdp5: Enable DSI connector in msm drm driver)
+$ git merge drm-msm/msm-next
+Already up-to-date.
+Merging sound/for-next (3b90f4072730 ALSA: hda/tegra - Fix oops)
+$ git merge sound/for-next
+Auto-merging drivers/gpu/drm/i915/intel_audio.c
+Auto-merging drivers/gpu/drm/i915/i915_reg.h
+Merge made by the 'recursive' strategy.
+ Documentation/sound/alsa/Jack-Controls.txt | 43 +
+ drivers/gpu/drm/i915/i915_reg.h | 3 +
+ drivers/gpu/drm/i915/intel_audio.c | 27 +
+ include/drm/i915_component.h | 1 +
+ include/sound/control.h | 2 +-
+ include/sound/core.h | 4 -
+ include/sound/hda_register.h | 152 ++++
+ include/sound/hdaudio.h | 290 +++++-
+ include/sound/info.h | 29 +-
+ include/sound/jack.h | 13 +-
+ include/sound/pcm.h | 5 +-
+ sound/core/Kconfig | 3 -
+ sound/core/Makefile | 11 +-
+ sound/core/ctljack.c | 41 +-
+ sound/core/info.c | 779 +++++++---------
+ sound/core/info_oss.c | 29 +-
+ sound/core/init.c | 33 +-
+ sound/core/jack.c | 142 ++-
+ sound/core/seq/Makefile | 3 +-
+ sound/core/seq/seq_info.c | 19 +-
+ sound/core/sound.c | 24 +-
+ sound/core/sound_oss.c | 30 +-
+ sound/hda/Kconfig | 3 +
+ sound/hda/Makefile | 2 +-
+ sound/hda/hdac_bus.c | 20 +-
+ sound/hda/hdac_controller.c | 507 +++++++++++
+ sound/hda/hdac_device.c | 315 +++++++
+ sound/hda/hdac_stream.c | 686 ++++++++++++++
+ sound/pci/ad1889.c | 4 +-
+ sound/pci/ali5451/ali5451.c | 4 +-
+ sound/pci/als300.c | 4 +-
+ sound/pci/als4000.c | 4 +-
+ sound/pci/au88x0/au88x0.c | 4 +-
+ sound/pci/aw2/aw2-alsa.c | 4 +-
+ sound/pci/azt3328.c | 4 +-
+ sound/pci/ca0106/ca0106_main.c | 4 +-
+ sound/pci/cs5535audio/cs5535audio.c | 4 +-
+ sound/pci/ctxfi/cthw20k1.c | 4 +-
+ sound/pci/ctxfi/cthw20k2.c | 4 +-
+ sound/pci/emu10k1/emu10k1_main.c | 4 +-
+ sound/pci/es1938.c | 4 +-
+ sound/pci/es1968.c | 4 +-
+ sound/pci/hda/Kconfig | 13 +-
+ sound/pci/hda/Makefile | 3 +-
+ sound/pci/hda/hda_codec.c | 425 +--------
+ sound/pci/hda/hda_codec.h | 82 +-
+ sound/pci/hda/hda_controller.c | 1341 ++++++----------------------
+ sound/pci/hda/hda_controller.h | 272 +-----
+ sound/pci/hda/hda_i915.c | 39 +-
+ sound/pci/hda/hda_intel.c | 309 ++++---
+ sound/pci/hda/hda_intel.h | 10 +-
+ sound/pci/hda/hda_intel_trace.h | 4 +-
+ sound/pci/hda/hda_jack.c | 90 +-
+ sound/pci/hda/hda_jack.h | 5 +-
+ sound/pci/hda/hda_tegra.c | 76 +-
+ sound/pci/hda/patch_ca0132.c | 7 +-
+ sound/pci/hda/patch_hdmi.c | 13 +-
+ sound/pci/ice1712/ice1712.c | 4 +-
+ sound/pci/lx6464es/lx6464es.c | 2 +-
+ sound/pci/maestro3.c | 4 +-
+ sound/pci/mixart/mixart.c | 2 +-
+ sound/pci/oxygen/xonar_wm87x6.c | 2 +-
+ sound/pci/pcxhr/pcxhr.c | 2 +-
+ sound/pci/sis7019.c | 10 +-
+ sound/pci/sonicvibes.c | 4 +-
+ sound/pci/trident/trident_main.c | 4 +-
+ sound/soc/soc-jack.c | 3 +-
+ 67 files changed, 3306 insertions(+), 2692 deletions(-)
+ create mode 100644 Documentation/sound/alsa/Jack-Controls.txt
+ create mode 100644 include/sound/hda_register.h
+ create mode 100644 sound/hda/hdac_controller.c
+ create mode 100644 sound/hda/hdac_stream.c
+Merging sound-asoc/for-next (2cb406216409 Merge remote-tracking branches 'asoc/topic/ssm4567' and 'asoc/topic/tas571x' into asoc-next)
+$ git merge sound-asoc/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/sound/adi,adau1701.txt | 4 +
+ .../devicetree/bindings/sound/renesas,rsnd.txt | 2 +-
+ .../devicetree/bindings/sound/tas571x.txt | 41 +
+ MAINTAINERS | 6 +
+ include/sound/dmaengine_pcm.h | 5 -
+ include/sound/rt5645.h | 3 -
+ include/sound/soc-dapm.h | 39 +
+ include/sound/soc.h | 104 +-
+ sound/soc/atmel/atmel-pcm-dma.c | 3 +-
+ sound/soc/atmel/sam9g20_wm8731.c | 10 +-
+ sound/soc/au1x/db1200.c | 2 +-
+ sound/soc/cirrus/ep93xx-pcm.c | 1 -
+ sound/soc/codecs/88pm860x-codec.c | 1 -
+ sound/soc/codecs/Kconfig | 7 +-
+ sound/soc/codecs/Makefile | 2 +
+ sound/soc/codecs/ad1836.c | 2 +-
+ sound/soc/codecs/adau1373.c | 1 -
+ sound/soc/codecs/adau1701.c | 126 ++-
+ sound/soc/codecs/adau1761.c | 27 +-
+ sound/soc/codecs/adau1781.c | 10 +-
+ sound/soc/codecs/adau17x1.c | 20 +-
+ sound/soc/codecs/adau1977.c | 14 +-
+ sound/soc/codecs/adav80x.c | 11 +-
+ sound/soc/codecs/ak4535.c | 1 -
+ sound/soc/codecs/ak4641.c | 1 -
+ sound/soc/codecs/ak4642.c | 1 -
+ sound/soc/codecs/ak4671.c | 1 -
+ sound/soc/codecs/alc5623.c | 1 -
+ sound/soc/codecs/alc5632.c | 1 -
+ sound/soc/codecs/arizona.h | 4 +-
+ sound/soc/codecs/bt-sco.c | 2 +-
+ sound/soc/codecs/cq93vc.c | 1 -
+ sound/soc/codecs/cs35l32.c | 1 -
+ sound/soc/codecs/cs4265.c | 1 -
+ sound/soc/codecs/cs42l52.c | 1 -
+ sound/soc/codecs/cs42l56.c | 1 -
+ sound/soc/codecs/cs42l73.c | 1 -
+ sound/soc/codecs/cx20442.c | 2 -
+ sound/soc/codecs/da7213.c | 1 -
+ sound/soc/codecs/da732x.c | 2 -
+ sound/soc/codecs/da9055.c | 1 -
+ sound/soc/codecs/es8328.c | 1 -
+ sound/soc/codecs/isabelle.c | 2 -
+ sound/soc/codecs/jz4740.c | 2 -
+ sound/soc/codecs/lm4857.c | 114 +-
+ sound/soc/codecs/lm49453.c | 2 -
+ sound/soc/codecs/max98088.c | 1 -
+ sound/soc/codecs/max98090.c | 1 -
+ sound/soc/codecs/max98095.c | 5 +-
+ sound/soc/codecs/max9850.c | 1 -
+ sound/soc/codecs/mc13783.c | 4 +-
+ sound/soc/codecs/ml26124.c | 1 -
+ sound/soc/codecs/pcm512x.c | 2 -
+ sound/soc/codecs/rt286.c | 1 -
+ sound/soc/codecs/rt5631.c | 1 -
+ sound/soc/codecs/rt5640.c | 5 +-
+ sound/soc/codecs/rt5645.c | 810 +++++++++++---
+ sound/soc/codecs/rt5645.h | 30 +-
+ sound/soc/codecs/rt5651.c | 3 +-
+ sound/soc/codecs/rt5670.c | 1 -
+ sound/soc/codecs/rt5677.c | 33 +-
+ sound/soc/codecs/rt5677.h | 14 +
+ sound/soc/codecs/sgtl5000.c | 54 +-
+ sound/soc/codecs/sn95031.c | 1 -
+ sound/soc/codecs/ssm2518.c | 9 +-
+ sound/soc/codecs/ssm2602.c | 5 +-
+ sound/soc/codecs/ssm4567.c | 9 +-
+ sound/soc/codecs/sta32x.c | 3 +-
+ sound/soc/codecs/sta350.c | 3 +-
+ sound/soc/codecs/sta529.c | 6 -
+ sound/soc/codecs/stac9766.c | 1 -
+ sound/soc/codecs/tas571x.c | 514 +++++++++
+ sound/soc/codecs/tas571x.h | 33 +
+ sound/soc/codecs/tlv320aic23.c | 1 -
+ sound/soc/codecs/tlv320aic31xx.c | 1 -
+ sound/soc/codecs/tlv320aic32x4.c | 1 -
+ sound/soc/codecs/tlv320aic3x.c | 1 -
+ sound/soc/codecs/tlv320dac33.c | 1 -
+ sound/soc/codecs/twl4030.c | 1 -
+ sound/soc/codecs/twl6040.c | 4 +-
+ sound/soc/codecs/uda134x.c | 1 -
+ sound/soc/codecs/uda1380.c | 3 +-
+ sound/soc/codecs/wm0010.c | 2 -
+ sound/soc/codecs/wm1250-ev1.c | 2 -
+ sound/soc/codecs/wm8350.c | 1 -
+ sound/soc/codecs/wm8400.c | 1 -
+ sound/soc/codecs/wm8510.c | 1 -
+ sound/soc/codecs/wm8523.c | 1 -
+ sound/soc/codecs/wm8580.c | 1 -
+ sound/soc/codecs/wm8711.c | 1 -
+ sound/soc/codecs/wm8728.c | 1 -
+ sound/soc/codecs/wm8731.c | 3 +-
+ sound/soc/codecs/wm8737.c | 3 +-
+ sound/soc/codecs/wm8750.c | 1 -
+ sound/soc/codecs/wm8753.c | 1 -
+ sound/soc/codecs/wm8770.c | 1 -
+ sound/soc/codecs/wm8776.c | 1 -
+ sound/soc/codecs/wm8900.c | 7 +-
+ sound/soc/codecs/wm8903.c | 2 -
+ sound/soc/codecs/wm8904.c | 1 -
+ sound/soc/codecs/wm8940.c | 4 +-
+ sound/soc/codecs/wm8955.c | 3 +-
+ sound/soc/codecs/wm8960.c | 4 -
+ sound/soc/codecs/wm8961.c | 2 -
+ sound/soc/codecs/wm8962.c | 1 -
+ sound/soc/codecs/wm8971.c | 1 -
+ sound/soc/codecs/wm8974.c | 1 -
+ sound/soc/codecs/wm8978.c | 5 +-
+ sound/soc/codecs/wm8983.c | 1 -
+ sound/soc/codecs/wm8985.c | 1 -
+ sound/soc/codecs/wm8988.c | 1 -
+ sound/soc/codecs/wm8990.c | 3 +-
+ sound/soc/codecs/wm8991.c | 1 -
+ sound/soc/codecs/wm8993.c | 6 +-
+ sound/soc/codecs/wm8994.c | 4 +-
+ sound/soc/codecs/wm8995.c | 1 -
+ sound/soc/codecs/wm8996.c | 2 -
+ sound/soc/codecs/wm9081.c | 2 -
+ sound/soc/codecs/wm9090.c | 2 -
+ sound/soc/codecs/wm9712.c | 3 +-
+ sound/soc/codecs/wm9713.c | 3 +-
+ sound/soc/codecs/wm_adsp.c | 1132 ++++++++++++--------
+ sound/soc/codecs/wm_adsp.h | 6 +-
+ sound/soc/codecs/wmfw.h | 44 +-
+ sound/soc/davinci/davinci-mcasp.c | 169 +--
+ sound/soc/fsl/fsl_sai.c | 3 +-
+ sound/soc/fsl/imx-audmux.c | 2 +-
+ sound/soc/generic/simple-card.c | 16 +-
+ sound/soc/intel/Kconfig | 16 +-
+ sound/soc/intel/atom/sst-atom-controls.c | 167 ++-
+ sound/soc/intel/atom/sst-atom-controls.h | 9 +-
+ sound/soc/intel/atom/sst-mfld-platform-pcm.c | 47 +-
+ sound/soc/intel/atom/sst-mfld-platform.h | 2 +
+ sound/soc/intel/atom/sst/sst_acpi.c | 4 +
+ sound/soc/intel/boards/Makefile | 2 +
+ sound/soc/intel/boards/cht_bsw_max98090_ti.c | 318 ++++++
+ sound/soc/intel/boards/cht_bsw_rt5645.c | 118 +-
+ sound/soc/omap/omap-twl4030.c | 3 +-
+ sound/soc/qcom/lpass-cpu.c | 10 +-
+ sound/soc/qcom/lpass-platform.c | 6 -
+ sound/soc/samsung/Kconfig | 15 +-
+ sound/soc/samsung/i2s.c | 2 +-
+ sound/soc/samsung/lowland.c | 2 +-
+ sound/soc/samsung/smartq_wm8987.c | 6 +-
+ sound/soc/samsung/smdk_wm8994.c | 3 +-
+ sound/soc/samsung/speyside.c | 2 +-
+ sound/soc/sh/rcar/core.c | 34 +-
+ sound/soc/sh/rcar/ssi.c | 52 +-
+ sound/soc/soc-dapm.c | 259 ++++-
+ sound/soc/soc-generic-dmaengine-pcm.c | 25 +-
+ sound/soc/ux500/ux500_pcm.c | 1 -
+ 151 files changed, 3486 insertions(+), 1222 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sound/tas571x.txt
+ create mode 100644 sound/soc/codecs/tas571x.c
+ create mode 100644 sound/soc/codecs/tas571x.h
+ create mode 100644 sound/soc/intel/boards/cht_bsw_max98090_ti.c
+Merging modules/modules-next (4a3893d069b7 modpost: don't emit section mismatch warnings for compiler optimizations)
+$ git merge modules/modules-next
+Already up-to-date.
+Merging input/next (c615dcb6d13e Input: adp5589-keys - fix event count mask)
+$ git merge input/next
+Merge made by the 'recursive' strategy.
+ drivers/input/keyboard/adp5589-keys.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+Merging block/for-next (fd42026fcd4b Merge branch 'for-4.2/sg' into for-next)
+$ git merge block/for-next
+Removing include/asm-generic/scatterlist.h
+Merge made by the 'recursive' strategy.
+ arch/alpha/include/asm/pci.h | 2 +-
+ arch/arm/include/asm/dma.h | 2 +-
+ arch/arm/mach-footbridge/dma.c | 2 +-
+ arch/blackfin/include/asm/pci.h | 2 +-
+ arch/cris/include/asm/dma-mapping.h | 2 +-
+ arch/cris/include/asm/pci.h | 2 +-
+ arch/frv/include/asm/dma-mapping.h | 2 +-
+ arch/frv/include/asm/pci.h | 2 +-
+ arch/ia64/include/asm/pci.h | 2 +-
+ arch/microblaze/include/asm/pci.h | 2 +-
+ arch/mips/include/asm/dma-mapping.h | 2 +-
+ arch/mips/include/asm/pci.h | 2 +-
+ arch/mn10300/include/asm/pci.h | 2 +-
+ arch/parisc/include/asm/dma-mapping.h | 2 +-
+ arch/parisc/include/asm/pci.h | 2 +-
+ arch/powerpc/include/asm/pci.h | 2 +-
+ arch/powerpc/include/asm/vio.h | 2 +-
+ arch/sparc/kernel/iommu_common.h | 2 +-
+ arch/x86/include/asm/pci.h | 2 +-
+ arch/xtensa/include/asm/pci.h | 2 +-
+ block/bio.c | 56 +++++++++++++++++++++++++----------
+ block/blk-core.c | 1 +
+ block/blk-exec.c | 10 -------
+ block/blk.h | 2 --
+ drivers/block/loop.c | 30 +++++++++----------
+ drivers/block/loop.h | 1 +
+ drivers/block/nbd.c | 50 +++++++++++++++----------------
+ drivers/block/paride/pd.c | 4 +--
+ drivers/block/sx8.c | 4 +--
+ drivers/block/virtio_blk.c | 6 ++--
+ drivers/ide/ide-atapi.c | 10 +++----
+ drivers/ide/ide-cd.c | 10 +++----
+ drivers/ide/ide-cd_ioctl.c | 2 +-
+ drivers/ide/ide-devsets.c | 2 +-
+ drivers/ide/ide-eh.c | 4 +--
+ drivers/ide/ide-floppy.c | 8 ++---
+ drivers/ide/ide-io.c | 12 ++++----
+ drivers/ide/ide-ioctls.c | 2 +-
+ drivers/ide/ide-park.c | 4 +--
+ drivers/ide/ide-pm.c | 56 +++++++++++++++++++++++++++--------
+ drivers/ide/ide-tape.c | 6 ++--
+ drivers/ide/ide-taskfile.c | 2 +-
+ drivers/md/bcache/request.c | 2 +-
+ drivers/md/dm-cache-target.c | 2 +-
+ drivers/md/dm-raid1.c | 2 +-
+ drivers/md/dm-snap.c | 2 +-
+ drivers/md/dm-thin.c | 4 +--
+ drivers/mmc/host/android-goldfish.c | 2 +-
+ fs/btrfs/volumes.c | 2 +-
+ fs/xfs/xfs_aops.c | 1 -
+ include/asm-generic/scatterlist.h | 34 ---------------------
+ include/linux/bio.h | 27 ++++++++++++++++-
+ include/linux/blk_types.h | 6 ++--
+ include/linux/blkdev.h | 37 +++--------------------
+ include/linux/dmapool.h | 2 +-
+ include/linux/ide.h | 27 +++++++++++++++++
+ include/linux/scatterlist.h | 39 +++++++++++++++++++-----
+ include/uapi/linux/nbd.h | 2 --
+ lib/swiotlb.c | 2 +-
+ 59 files changed, 284 insertions(+), 231 deletions(-)
+ delete mode 100644 include/asm-generic/scatterlist.h
+Merging device-mapper/for-next (cb31ef485dd4 init: fix regression by supporting devices with major:minor:offset format)
+$ git merge device-mapper/for-next
+Merge made by the 'recursive' strategy.
+ drivers/md/dm-crypt.c | 12 ++++++------
+ init/do_mounts.c | 5 +++--
+ 2 files changed, 9 insertions(+), 8 deletions(-)
+Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
+$ git merge mmc/mmc-next
+Already up-to-date.
+Merging mmc-uh/next (75f65952d431 Merge branch 'fixes' into next)
+$ git merge mmc-uh/next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mmc/arasan,sdhci.txt | 3 +-
+ .../devicetree/bindings/mmc/mmc-pwrseq-simple.txt | 4 +-
+ MAINTAINERS | 2 +-
+ drivers/mmc/card/block.c | 12 +++
+ drivers/mmc/card/queue.c | 2 +-
+ drivers/mmc/card/queue.h | 2 +
+ drivers/mmc/core/core.c | 1 +
+ drivers/mmc/core/sdio.c | 7 ++
+ drivers/mmc/host/Kconfig | 1 +
+ drivers/mmc/host/davinci_mmc.c | 2 +-
+ drivers/mmc/host/mxs-mmc.c | 2 +-
+ drivers/mmc/host/rtsx_pci_sdmmc.c | 2 +-
+ drivers/mmc/host/rtsx_usb_sdmmc.c | 2 +-
+ drivers/mmc/host/s3cmci.c | 2 +-
+ drivers/mmc/host/sdhci-esdhc-imx.c | 6 +-
+ drivers/mmc/host/sdhci-of-arasan.c | 7 ++
+ drivers/mmc/host/sdhci-of-esdhc.c | 4 +-
+ drivers/mmc/host/sdhci-pxav2.c | 4 +-
+ drivers/mmc/host/sdhci-pxav3.c | 4 +-
+ drivers/mmc/host/sdhci-s3c.c | 2 +-
+ drivers/mmc/host/sdhci-sirf.c | 44 ++++++++++-
+ drivers/mmc/host/sdhci_f_sdh30.c | 9 +--
+ drivers/mmc/host/sh_mmcif.c | 92 +++++++++++-----------
+ drivers/mmc/host/tmio_mmc.c | 10 ++-
+ drivers/mmc/host/tmio_mmc_pio.c | 5 +-
+ 25 files changed, 148 insertions(+), 83 deletions(-)
+Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value)
+$ git merge kgdb/kgdb-next
+Merge made by the 'recursive' strategy.
+ kernel/debug/kdb/kdb_io.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging md/for-next (9ffc8f7cb964 md/raid5: don't do chunk aligned read on degraded array.)
+$ git merge md/for-next
+Already up-to-date.
+Merging mfd/for-mfd-next (f4ed1f14b7c9 mfd: documentation: dt: max77686: Fix typo)
+$ git merge mfd/for-mfd-next
+Auto-merging drivers/rtc/Makefile
+Auto-merging drivers/rtc/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/mfd/max77686.txt | 2 +-
+ Documentation/devicetree/bindings/mfd/max77693.txt | 67 ++++
+ .../devicetree/bindings/rtc/rtc-st-lpc.txt | 25 ++
+ .../devicetree/bindings/watchdog/st_lpc_wdt.txt | 38 +++
+ MAINTAINERS | 2 +
+ drivers/mfd/88pm860x-core.c | 2 +-
+ drivers/mfd/ab8500-core.c | 2 +-
+ drivers/mfd/arizona-core.c | 8 -
+ drivers/mfd/arizona-irq.c | 2 +-
+ drivers/mfd/da9052-irq.c | 4 +-
+ drivers/mfd/da9055-core.c | 6 +-
+ drivers/mfd/da9063-irq.c | 4 +-
+ drivers/mfd/da9150-core.c | 4 +-
+ drivers/mfd/db8500-prcmu.c | 2 +-
+ drivers/mfd/intel_soc_pmic_core.h | 2 +-
+ drivers/mfd/intel_soc_pmic_crc.c | 2 +-
+ drivers/mfd/lp8788-irq.c | 2 +-
+ drivers/mfd/max8925-core.c | 2 +-
+ drivers/mfd/max8997-irq.c | 2 +-
+ drivers/mfd/max8998-irq.c | 2 +-
+ drivers/mfd/mt6397-core.c | 2 +-
+ drivers/mfd/stmpe.c | 2 +-
+ drivers/mfd/tc3589x.c | 2 +-
+ drivers/mfd/tps6586x.c | 2 +-
+ drivers/mfd/twl6030-irq.c | 2 +-
+ drivers/mfd/wm831x-irq.c | 2 +-
+ drivers/mfd/wm8994-irq.c | 6 +-
+ drivers/rtc/Kconfig | 11 +
+ drivers/rtc/Makefile | 1 +
+ drivers/rtc/rtc-st-lpc.c | 354 +++++++++++++++++++++
+ drivers/watchdog/Kconfig | 12 +
+ drivers/watchdog/Makefile | 1 +
+ drivers/watchdog/st_lpc_wdt.c | 344 ++++++++++++++++++++
+ include/dt-bindings/mfd/st-lpc.h | 15 +
+ include/linux/mfd/da9055/core.h | 2 +-
+ 35 files changed, 900 insertions(+), 38 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/rtc/rtc-st-lpc.txt
+ create mode 100644 Documentation/devicetree/bindings/watchdog/st_lpc_wdt.txt
+ create mode 100644 drivers/rtc/rtc-st-lpc.c
+ create mode 100644 drivers/watchdog/st_lpc_wdt.c
+ create mode 100644 include/dt-bindings/mfd/st-lpc.h
+Merging backlight/for-backlight-next (b1f85c0fec20 backlight: da9052_bl: Terminate da9052_wled_ids array with empty element)
+$ git merge backlight/for-backlight-next
+Already up-to-date.
+Merging battery/master (8ebb7e9c1a50 power: bq27x00_battery: Add missing MODULE_ALIAS)
+$ git merge battery/master
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 11 +++++++++++
+ drivers/power/axp288_fuel_gauge.c | 1 +
+ drivers/power/bq27x00_battery.c | 8 ++++++++
+ drivers/power/collie_battery.c | 2 +-
+ drivers/power/reset/Kconfig | 1 +
+ drivers/power/reset/at91-reset.c | 4 ++--
+ drivers/power/reset/ltc2952-poweroff.c | 18 +++---------------
+ 7 files changed, 27 insertions(+), 18 deletions(-)
+Merging omap_dss2/for-next (72fc8b7187cd Merge branches '4.1/fbdev' and '4.1/omapdss' into for-next)
+$ git merge omap_dss2/for-next
+Merge made by the 'recursive' strategy.
+ drivers/video/fbdev/omap2/dss/hdmi4.c | 50 +++++++++++++++++++++++++++++++++++
+ drivers/video/fbdev/omap2/dss/hdmi5.c | 50 +++++++++++++++++++++++++++++++++++
+ 2 files changed, 100 insertions(+)
+Merging regulator/for-next (5e803d489fb6 Merge remote-tracking branches 'regulator/topic/max77693', 'regulator/topic/max77843' and 'regulator/topic/max8973' into regulator-next)
+$ git merge regulator/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/regulator/regulator.txt | 2 +-
+ drivers/regulator/88pm8607.c | 2 +-
+ drivers/regulator/Kconfig | 2 +-
+ drivers/regulator/helpers.c | 2 +-
+ drivers/regulator/max14577.c | 128 ++++++++-------------
+ drivers/regulator/max77686.c | 2 +-
+ drivers/regulator/max77693.c | 17 +--
+ drivers/regulator/max77843.c | 68 ++++-------
+ drivers/regulator/max8973-regulator.c | 6 +-
+ drivers/regulator/of_regulator.c | 2 +-
+ drivers/regulator/s2mps11.c | 10 +-
+ 11 files changed, 87 insertions(+), 154 deletions(-)
+Merging security/next (b787f68c36d4 Linux 4.1-rc1)
+$ git merge security/next
+Already up-to-date.
+Merging integrity/next (0ce8300ef0d4 KEYS: fix "ca_keys=" partial key matching)
+$ git merge integrity/next
+Auto-merging security/integrity/evm/evm_main.c
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/ima_policy | 3 +++
+ crypto/asymmetric_keys/asymmetric_keys.h | 3 +++
+ crypto/asymmetric_keys/asymmetric_type.c | 20 ++++++++++++++------
+ crypto/asymmetric_keys/x509_public_key.c | 27 +++++++++++++++++++++++----
+ security/integrity/evm/evm_main.c | 11 +++++++++++
+ security/integrity/ima/ima_policy.c | 16 +++++++---------
+ 6 files changed, 61 insertions(+), 19 deletions(-)
+Merging selinux/next (6a878464e21a signals: don't abuse __flush_signals() in selinux_bprm_committed_creds())
+$ git merge selinux/next
+Auto-merging security/selinux/hooks.c
+Auto-merging kernel/signal.c
+Auto-merging include/linux/sched.h
+Merge made by the 'recursive' strategy.
+ include/linux/sched.h | 1 -
+ kernel/signal.c | 13 ++++---------
+ security/selinux/hooks.c | 11 +++++++----
+ 3 files changed, 11 insertions(+), 14 deletions(-)
+Merging lblnet/next (b2776bf7149b Linux 3.18)
+$ git merge lblnet/next
+Already up-to-date.
+Merging watchdog/master (fe92a2e35727 watchdog: octeon: use fixed length string for register names)
+$ git merge watchdog/master
+Merge made by the 'recursive' strategy.
+Merging iommu/next (7f65ef01e131 Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'arm/smmu', 'arm/tegra' and 'core' into next)
+$ git merge iommu/next
+Already up-to-date.
+Merging dwmw2-iommu/master (03ecc32c5274 iommu/vt-d: support extended root and context entries)
+$ git merge dwmw2-iommu/master
+Already up-to-date.
+Merging vfio/next (5a0ff17741c1 vfio-pci: Fix use after free)
+$ git merge vfio/next
+Already up-to-date.
+Merging osd/linux-next (1fa3a002b254 Boaz Harrosh - fix email in Documentation)
+$ git merge osd/linux-next
+Already up-to-date.
+Merging jc_docs/docs-next (197175427a22 Documentation/memcg: update memcg/kmem status)
+$ git merge jc_docs/docs-next
+Already up-to-date.
+Merging trivial/for-next (0e4f93e5017d goldfish: goldfish_tty_probe() is not using 'i' any more)
+$ git merge trivial/for-next
+Already up-to-date.
+Merging audit/next (39a8804455fb Linux 4.0)
+$ git merge audit/next
+Already up-to-date.
+Merging devicetree/devicetree/next (a2166ca5f320 Merge remote-tracking branch 'robh/for-next' into devicetree/next)
+$ git merge devicetree/devicetree/next
+Already up-to-date.
+Merging dt-rh/for-next (4760597116e3 scripts/dtc: Update to upstream version 9d3649bd3be245c9)
+$ git merge dt-rh/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/compressed/libfdt_env.h | 4 +
+ arch/powerpc/boot/libfdt_env.h | 4 +
+ arch/powerpc/boot/of.h | 2 +
+ include/linux/libfdt_env.h | 4 +
+ scripts/dtc/checks.c | 31 +-
+ scripts/dtc/data.c | 12 +-
+ scripts/dtc/dtc-lexer.l | 65 +-
+ scripts/dtc/dtc-lexer.lex.c_shipped | 516 +++++-----
+ scripts/dtc/dtc-parser.tab.c_shipped | 1773 ++++++++++++++++-----------------
+ scripts/dtc/dtc-parser.tab.h_shipped | 114 +--
+ scripts/dtc/dtc-parser.y | 147 +--
+ scripts/dtc/dtc.c | 14 +-
+ scripts/dtc/dtc.h | 18 +-
+ scripts/dtc/flattree.c | 4 +-
+ scripts/dtc/fstree.c | 17 +-
+ scripts/dtc/libfdt/Makefile.libfdt | 3 +-
+ scripts/dtc/libfdt/fdt.c | 30 +-
+ scripts/dtc/libfdt/fdt.h | 93 +-
+ scripts/dtc/libfdt/fdt_empty_tree.c | 1 +
+ scripts/dtc/libfdt/fdt_ro.c | 29 +-
+ scripts/dtc/libfdt/fdt_rw.c | 10 +-
+ scripts/dtc/libfdt/fdt_sw.c | 36 +-
+ scripts/dtc/libfdt/fdt_wip.c | 2 +-
+ scripts/dtc/libfdt/libfdt.h | 148 ++-
+ scripts/dtc/libfdt/libfdt_env.h | 104 +-
+ scripts/dtc/libfdt/libfdt_internal.h | 6 +-
+ scripts/dtc/livetree.c | 4 +-
+ scripts/dtc/srcpos.c | 49 +-
+ scripts/dtc/srcpos.h | 15 +-
+ scripts/dtc/treesource.c | 15 +-
+ scripts/dtc/update-dtc-source.sh | 9 +
+ scripts/dtc/util.c | 18 +-
+ scripts/dtc/util.h | 4 +-
+ scripts/dtc/version_gen.h | 2 +-
+ 34 files changed, 1768 insertions(+), 1535 deletions(-)
+Merging mailbox/mailbox-for-next (ee23d66af921 mailbox: arm_mhu: add driver for ARM MHU controller)
+$ git merge mailbox/mailbox-for-next
+Already up-to-date.
+Merging spi/for-next (f32a0fa48ab1 Merge remote-tracking branch 'spi/topic/spidev' into spi-next)
+$ git merge spi/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/spi/spi-ath79.txt | 24 +++
+ .../include/asm/mach-ath79/ath79_spi_platform.h | 4 -
+ drivers/spi/Kconfig | 13 +-
+ drivers/spi/Makefile | 1 +
+ drivers/spi/spi-ath79.c | 34 ++--
+ drivers/spi/spi-bcm2835.c | 88 +++++----
+ drivers/spi/spi-bitbang.c | 17 +-
+ drivers/spi/spi-fsl-cpm.c | 40 ++--
+ drivers/spi/spi-fsl-dspi.c | 2 +-
+ drivers/spi/spi-fsl-espi.c | 45 +++--
+ drivers/spi/spi-imx.c | 2 +-
+ drivers/spi/spi-omap2-mcspi.c | 16 +-
+ drivers/spi/spi-rb4xx.c | 210 +++++++++++++++++++++
+ drivers/spi/spi-rspi.c | 2 +-
+ drivers/spi/spi-s3c64xx.c | 2 +-
+ drivers/spi/spi-sh-msiof.c | 2 +-
+ drivers/spi/spi-sirf.c | 58 ++++--
+ drivers/spi/spi.c | 9 +
+ drivers/spi/spidev.c | 30 +--
+ 19 files changed, 455 insertions(+), 144 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/spi/spi-ath79.txt
+ create mode 100644 drivers/spi/spi-rb4xx.c
+Merging tip/auto-latest (ea169fd39a68 Merge branch 'x86/urgent')
+$ git merge tip/auto-latest
+Removing include/linux/platform_data/irq-renesas-irqc.h
+Auto-merging drivers/power/reset/ltc2952-poweroff.c
+Auto-merging arch/x86/xen/enlighten.c
+Auto-merging arch/x86/include/asm/pci.h
+Auto-merging arch/x86/Kconfig
+Auto-merging Makefile
+Merge made by the 'recursive' strategy.
+ Makefile | 5 +-
+ arch/ia64/include/asm/irq_remapping.h | 2 -
+ arch/ia64/kernel/msi_ia64.c | 30 +-
+ arch/x86/Kconfig | 8 +-
+ arch/x86/Makefile | 3 +
+ arch/x86/ia32/ia32entry.S | 48 +-
+ arch/x86/include/asm/alternative-asm.h | 18 +
+ arch/x86/include/asm/amd_nb.h | 11 +
+ arch/x86/include/asm/atomic.h | 16 +-
+ arch/x86/include/asm/atomic64_64.h | 8 +-
+ arch/x86/include/asm/dma-mapping.h | 46 +-
+ arch/x86/include/asm/hpet.h | 16 +-
+ arch/x86/include/asm/hw_irq.h | 98 +-
+ arch/x86/include/asm/io_apic.h | 114 +-
+ arch/x86/include/asm/irq_remapping.h | 69 +-
+ arch/x86/include/asm/irq_vectors.h | 18 +-
+ arch/x86/include/asm/irqdomain.h | 63 +
+ arch/x86/include/asm/microcode.h | 8 +-
+ arch/x86/include/asm/microcode_amd.h | 4 +-
+ arch/x86/include/asm/microcode_intel.h | 8 +-
+ arch/x86/include/asm/msi.h | 7 +
+ arch/x86/include/asm/paravirt_types.h | 7 +-
+ arch/x86/include/asm/pci.h | 5 -
+ arch/x86/include/asm/uaccess_32.h | 4 +
+ arch/x86/include/asm/x86_init.h | 21 -
+ arch/x86/kernel/acpi/boot.c | 71 +-
+ arch/x86/kernel/acpi/wakeup_64.S | 6 +-
+ arch/x86/kernel/amd_nb.c | 4 +-
+ arch/x86/kernel/apb_timer.c | 4 -
+ arch/x86/kernel/aperture_64.c | 8 +-
+ arch/x86/kernel/apic/htirq.c | 173 ++-
+ arch/x86/kernel/apic/io_apic.c | 1303 +++++++++----------
+ arch/x86/kernel/apic/msi.c | 416 +++---
+ arch/x86/kernel/apic/vector.c | 438 ++++---
+ arch/x86/kernel/apic/x2apic_phys.c | 2 +
+ arch/x86/kernel/asm-offsets.c | 21 +
+ arch/x86/kernel/asm-offsets_32.c | 18 -
+ arch/x86/kernel/asm-offsets_64.c | 21 -
+ arch/x86/kernel/cpu/amd.c | 12 +-
+ arch/x86/kernel/cpu/microcode/amd_early.c | 19 +-
+ arch/x86/kernel/cpu/microcode/core_early.c | 23 +-
+ arch/x86/kernel/cpu/microcode/intel_early.c | 30 +-
+ arch/x86/kernel/cpu/microcode/intel_lib.c | 8 +-
+ arch/x86/kernel/cpu/perf_event_intel_rapl.c | 5 +-
+ arch/x86/kernel/cpu/perf_event_intel_uncore.c | 5 +-
+ arch/x86/kernel/devicetree.c | 41 +-
+ arch/x86/kernel/entry_64.S | 46 +-
+ arch/x86/kernel/hpet.c | 57 +-
+ arch/x86/kernel/mpparse.c | 7 +-
+ arch/x86/kernel/paravirt.c | 4 +-
+ arch/x86/kernel/paravirt_patch_64.c | 1 -
+ arch/x86/kernel/pci-dma.c | 45 +
+ arch/x86/kernel/setup.c | 3 +-
+ arch/x86/kernel/smpboot.c | 61 +-
+ arch/x86/kernel/x86_init.c | 9 -
+ arch/x86/pci/intel_mid_pci.c | 6 +-
+ .../platform/intel-mid/device_libs/platform_wdt.c | 5 +-
+ arch/x86/platform/intel-mid/intel-mid.c | 18 +-
+ arch/x86/platform/intel-mid/sfi.c | 30 +-
+ arch/x86/platform/sfi/sfi.c | 7 +-
+ arch/x86/platform/uv/uv_irq.c | 298 ++---
+ arch/x86/power/hibernate_asm_64.S | 8 +-
+ arch/x86/xen/enlighten.c | 3 +-
+ arch/x86/xen/xen-asm_64.S | 16 -
+ arch/x86/xen/xen-ops.h | 2 +
+ drivers/clocksource/asm9260_timer.c | 2 +-
+ drivers/clocksource/timer-integrator-ap.c | 2 +-
+ drivers/clocksource/timer-sun5i.c | 2 +-
+ drivers/iommu/amd_iommu.c | 477 ++++---
+ drivers/iommu/amd_iommu_init.c | 4 +
+ drivers/iommu/amd_iommu_proto.h | 9 +
+ drivers/iommu/amd_iommu_types.h | 5 +
+ drivers/iommu/dmar.c | 19 +-
+ drivers/iommu/intel_irq_remapping.c | 573 ++++-----
+ drivers/iommu/irq_remapping.c | 242 +---
+ drivers/iommu/irq_remapping.h | 36 +-
+ drivers/irqchip/exynos-combiner.c | 2 +-
+ drivers/irqchip/irq-armada-370-xp.c | 2 +-
+ drivers/irqchip/irq-bcm2835.c | 2 +-
+ drivers/irqchip/irq-gic.c | 71 +-
+ drivers/irqchip/irq-keystone.c | 2 +-
+ drivers/irqchip/irq-mips-gic.c | 2 +-
+ drivers/irqchip/irq-mtk-sysirq.c | 2 +-
+ drivers/irqchip/irq-mxs.c | 2 +-
+ drivers/irqchip/irq-renesas-intc-irqpin.c | 2 +-
+ drivers/irqchip/irq-renesas-irqc.c | 19 +-
+ drivers/irqchip/irq-s3c24xx.c | 4 +-
+ drivers/irqchip/irq-sun4i.c | 2 +-
+ drivers/irqchip/irq-versatile-fpga.c | 2 +-
+ drivers/irqchip/irq-vf610-mscm-ir.c | 5 +-
+ drivers/irqchip/irq-vic.c | 2 +-
+ drivers/irqchip/irq-vt8500.c | 2 +-
+ drivers/pci/htirq.c | 48 +-
+ drivers/pci/quirks.c | 7 -
+ drivers/power/reset/ltc2952-poweroff.c | 1 -
+ include/linux/alarmtimer.h | 4 +-
+ include/linux/clocksource.h | 1 -
+ include/linux/dmar.h | 3 +-
+ include/linux/hrtimer.h | 118 +-
+ include/linux/htirq.h | 22 +-
+ include/linux/intel-iommu.h | 4 +
+ include/linux/interrupt.h | 9 +-
+ include/linux/irqchip/arm-gic.h | 2 -
+ include/linux/platform_data/irq-renesas-irqc.h | 27 -
+ include/linux/rcupdate.h | 6 +-
+ include/linux/rcutree.h | 2 +-
+ include/linux/timekeeper_internal.h | 2 +
+ include/linux/timer.h | 7 -
+ include/linux/timerqueue.h | 8 +-
+ kernel/events/core.c | 96 +-
+ kernel/futex.c | 5 +-
+ kernel/irq/dummychip.c | 1 +
+ kernel/irq/irqdesc.c | 4 +-
+ kernel/irq/msi.c | 2 +-
+ kernel/locking/rtmutex.c | 5 +-
+ kernel/rcu/tree_plugin.h | 14 +-
+ kernel/sched/auto_group.c | 4 -
+ kernel/sched/core.c | 37 +-
+ kernel/sched/deadline.c | 12 +-
+ kernel/sched/debug.c | 2 -
+ kernel/sched/fair.c | 61 +-
+ kernel/sched/rt.c | 14 +-
+ kernel/sched/sched.h | 4 +-
+ kernel/time/alarmtimer.c | 17 +-
+ kernel/time/clockevents.c | 6 +-
+ kernel/time/hrtimer.c | 545 +++-----
+ kernel/time/posix-timers.c | 17 +-
+ kernel/time/tick-broadcast-hrtimer.c | 18 +-
+ kernel/time/tick-broadcast.c | 81 +-
+ kernel/time/tick-common.c | 10 +
+ kernel/time/tick-internal.h | 2 +
+ kernel/time/tick-sched.c | 288 ++---
+ kernel/time/tick-sched.h | 2 +-
+ kernel/time/timekeeping.c | 55 +-
+ kernel/time/timekeeping.h | 11 +-
+ kernel/time/timer.c | 81 +-
+ kernel/time/timer_list.c | 43 +-
+ lib/timerqueue.c | 10 +-
+ net/core/pktgen.c | 2 -
+ net/sched/sch_api.c | 5 +-
+ sound/core/hrtimer.c | 9 +-
+ sound/drivers/pcsp/pcsp.c | 15 +-
+ tools/Makefile | 20 +-
+ tools/lib/traceevent/event-parse.c | 6 +-
+ tools/lib/traceevent/event-parse.h | 1 +
+ .../callchain-overhead-calculation.txt | 108 ++
+ tools/perf/Documentation/perf-inject.txt | 27 +
+ tools/perf/Documentation/perf-kmem.txt | 11 +-
+ tools/perf/Documentation/perf-probe.txt | 11 +-
+ tools/perf/Documentation/perf-record.txt | 9 +
+ tools/perf/Documentation/perf-report.txt | 32 +
+ tools/perf/Documentation/perf-script.txt | 37 +-
+ tools/perf/Documentation/perf-top.txt | 3 +-
+ tools/perf/Documentation/perf-trace.txt | 2 +-
+ tools/perf/Makefile | 2 +-
+ tools/perf/Makefile.perf | 2 +
+ tools/perf/arch/powerpc/util/Build | 1 +
+ tools/perf/arch/powerpc/util/sym-handling.c | 82 ++
+ tools/perf/bench/numa.c | 32 +-
+ tools/perf/builtin-buildid-list.c | 9 +
+ tools/perf/builtin-inject.c | 174 ++-
+ tools/perf/builtin-kmem.c | 981 ++++++++++++--
+ tools/perf/builtin-probe.c | 167 +--
+ tools/perf/builtin-record.c | 274 +++-
+ tools/perf/builtin-report.c | 11 +
+ tools/perf/builtin-script.c | 74 +-
+ tools/perf/builtin-stat.c | 146 ++-
+ tools/perf/builtin-trace.c | 7 +-
+ tools/perf/config/Makefile | 5 +
+ tools/perf/perf.h | 5 +
+ tools/perf/tests/code-reading.c | 2 +-
+ tools/perf/tests/evsel-roundtrip-name.c | 4 +-
+ tools/perf/tests/hists_cumulate.c | 2 +-
+ tools/perf/tests/hists_filter.c | 4 +-
+ tools/perf/tests/hists_link.c | 4 +-
+ tools/perf/tests/hists_output.c | 2 +-
+ tools/perf/tests/keep-tracking.c | 4 +-
+ tools/perf/tests/make | 18 +-
+ tools/perf/tests/parse-events.c | 2 +-
+ tools/perf/tests/perf-time-to-tsc.c | 2 +-
+ tools/perf/tests/pmu.c | 3 +-
+ tools/perf/tests/switch-tracking.c | 8 +-
+ tools/perf/ui/browsers/hists.c | 633 +++++----
+ tools/perf/util/Build | 3 +-
+ tools/perf/util/auxtrace.c | 1352 ++++++++++++++++++++
+ tools/perf/util/auxtrace.h | 643 ++++++++++
+ tools/perf/util/callchain.h | 4 +
+ tools/perf/util/data-convert-bt.c | 410 +++++-
+ tools/perf/util/dso.c | 2 +
+ tools/perf/util/dso.h | 3 +
+ tools/perf/util/event.c | 42 +
+ tools/perf/util/event.h | 70 +
+ tools/perf/util/evlist.c | 73 +-
+ tools/perf/util/evlist.h | 6 +
+ tools/perf/util/evsel.c | 1 +
+ tools/perf/util/header.c | 37 +
+ tools/perf/util/header.h | 1 +
+ tools/perf/util/hist.c | 2 +-
+ tools/perf/util/machine.c | 21 +
+ tools/perf/util/machine.h | 4 +
+ tools/perf/util/map.c | 5 +
+ tools/perf/util/map.h | 3 +-
+ tools/perf/util/parse-events.c | 194 ++-
+ tools/perf/util/parse-events.h | 36 +-
+ tools/perf/util/parse-events.l | 41 +-
+ tools/perf/util/parse-events.y | 48 +-
+ tools/perf/util/parse-options.h | 4 +
+ tools/perf/util/pmu.c | 57 +-
+ tools/perf/util/pmu.h | 6 +-
+ tools/perf/util/probe-event.c | 159 ++-
+ tools/perf/util/probe-event.h | 7 +-
+ tools/perf/util/pstack.c | 7 +
+ tools/perf/util/pstack.h | 1 +
+ tools/perf/util/record.c | 15 +-
+ tools/perf/util/session.c | 184 ++-
+ tools/perf/util/session.h | 6 +
+ tools/perf/util/sort.h | 38 +-
+ tools/perf/util/strfilter.c | 107 ++
+ tools/perf/util/strfilter.h | 35 +
+ tools/perf/util/symbol-elf.c | 13 +-
+ tools/perf/util/symbol.c | 25 +-
+ tools/perf/util/symbol.h | 12 +-
+ tools/perf/util/tool.h | 12 +-
+ 223 files changed, 9145 insertions(+), 4605 deletions(-)
+ create mode 100644 arch/x86/include/asm/irqdomain.h
+ create mode 100644 arch/x86/include/asm/msi.h
+ delete mode 100644 include/linux/platform_data/irq-renesas-irqc.h
+ create mode 100644 tools/perf/Documentation/callchain-overhead-calculation.txt
+ create mode 100644 tools/perf/arch/powerpc/util/sym-handling.c
+ create mode 100644 tools/perf/util/auxtrace.c
+ create mode 100644 tools/perf/util/auxtrace.h
+Merging clockevents/clockevents/next (4c8305221193 clocksource: Driver for Conexant Digicolor SoC timer)
+$ git merge clockevents/clockevents/next
+Recorded preimage for 'drivers/clocksource/asm9260_timer.c'
+Resolved 'arch/arm/mach-rockchip/Kconfig' using previous resolution.
+Resolved 'drivers/clocksource/Kconfig' using previous resolution.
+Resolved 'drivers/clocksource/rockchip_timer.c' using previous resolution.
+Auto-merging drivers/clocksource/rockchip_timer.c
+CONFLICT (add/add): Merge conflict in drivers/clocksource/rockchip_timer.c
+Auto-merging drivers/clocksource/asm9260_timer.c
+CONFLICT (add/add): Merge conflict in drivers/clocksource/asm9260_timer.c
+Auto-merging drivers/clocksource/Kconfig
+CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig
+Auto-merging arch/arm/mach-rockchip/Kconfig
+CONFLICT (content): Merge conflict in arch/arm/mach-rockchip/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/clocksource/asm9260_timer.c'.
+[master eb09fefee610] Merge remote-tracking branch 'clockevents/clockevents/next'
+$ git diff -M --stat --summary HEAD^..
+Merging edac/linux_next (fec53af531dd sb_edac: Fix typo computing number of banks)
+$ git merge edac/linux_next
+Already up-to-date.
+Merging edac-amd/for-next (7e52a03646af EDAC, altera: Do not build it as a module)
+$ git merge edac-amd/for-next
+Merge made by the 'recursive' strategy.
+ drivers/edac/Kconfig | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging irqchip/irqchip/for-next (a8bcdc32fafb Merge branch 'irqchip/core' into irqchip/for-next)
+$ git merge irqchip/irqchip/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1)
+$ git merge tiny/tiny/next
+Already up-to-date.
+Merging ftrace/for-next (c4b00d27e405 Merge branch 'for-next/ftrace/core' into trace/for-next)
+$ git merge ftrace/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging rcu/rcu/next (7182f6825ff2 netfilter: Fix list_entry_rcu usage.)
+$ git merge rcu/rcu/next
+Recorded preimage for 'include/linux/rcupdate.h'
+Recorded preimage for 'include/linux/rcutree.h'
+Recorded preimage for 'kernel/rcu/tree_plugin.h'
+Resolved 'kernel/rcu/tree.c' using previous resolution.
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/rcu/tree_plugin.h
+CONFLICT (content): Merge conflict in kernel/rcu/tree_plugin.h
+Auto-merging kernel/rcu/tree.c
+CONFLICT (content): Merge conflict in kernel/rcu/tree.c
+Auto-merging init/Kconfig
+Auto-merging include/linux/rcutree.h
+CONFLICT (content): Merge conflict in include/linux/rcutree.h
+Auto-merging include/linux/rcupdate.h
+CONFLICT (content): Merge conflict in include/linux/rcupdate.h
+Auto-merging include/linux/compiler.h
+Auto-merging Documentation/kernel-parameters.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'include/linux/rcupdate.h'.
+Recorded resolution for 'include/linux/rcutree.h'.
+Recorded resolution for 'kernel/rcu/tree_plugin.h'.
+[master 4a2fc9141944] Merge remote-tracking branch 'rcu/rcu/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/RCU/arrayRCU.txt | 20 +-
+ Documentation/RCU/lockdep.txt | 10 -
+ Documentation/RCU/rcu_dereference.txt | 38 +-
+ Documentation/RCU/whatisRCU.txt | 6 +-
+ Documentation/kernel-parameters.txt | 27 +-
+ Documentation/memory-barriers.txt | 62 +--
+ arch/arm/kernel/smp.c | 6 +-
+ arch/arm64/kernel/smp.c | 6 +-
+ arch/powerpc/include/asm/barrier.h | 1 +
+ arch/x86/kernel/cpu/mcheck/mce.c | 15 +-
+ drivers/md/bitmap.c | 2 +-
+ include/linux/compiler.h | 16 +
+ include/linux/rculist.h | 15 +-
+ include/linux/rcupdate.h | 70 +---
+ include/linux/rcutiny.h | 16 +
+ include/linux/rcutree.h | 7 +-
+ include/linux/spinlock.h | 2 +-
+ init/Kconfig | 72 ++--
+ kernel/cpu.c | 4 +-
+ kernel/events/ring_buffer.c | 2 +-
+ kernel/locking/locktorture.c | 14 +-
+ kernel/rcu/rcutorture.c | 103 +++--
+ kernel/rcu/srcu.c | 10 +-
+ kernel/rcu/tiny.c | 33 --
+ kernel/rcu/tiny_plugin.h | 12 +-
+ kernel/rcu/tree.c | 431 +++++++++++----------
+ kernel/rcu/tree.h | 63 +--
+ kernel/rcu/tree_plugin.h | 220 ++++++-----
+ kernel/rcu/tree_trace.c | 6 +-
+ kernel/rcu/update.c | 30 +-
+ kernel/torture.c | 26 +-
+ lib/Kconfig.debug | 55 ++-
+ net/netfilter/core.c | 2 +-
+ .../testing/selftests/rcutorture/bin/configinit.sh | 2 +-
+ .../selftests/rcutorture/bin/kvm-recheck.sh | 4 +
+ .../selftests/rcutorture/configs/rcu/CFcommon | 2 +
+ .../selftests/rcutorture/configs/rcu/SRCU-N | 1 +
+ .../selftests/rcutorture/configs/rcu/SRCU-P | 1 +
+ .../selftests/rcutorture/configs/rcu/SRCU-P.boot | 2 +-
+ .../selftests/rcutorture/configs/rcu/TASKS01 | 5 +-
+ .../selftests/rcutorture/configs/rcu/TASKS02 | 1 -
+ .../selftests/rcutorture/configs/rcu/TASKS03 | 2 +-
+ .../selftests/rcutorture/configs/rcu/TINY02 | 2 +-
+ .../selftests/rcutorture/configs/rcu/TINY02.boot | 1 +
+ .../selftests/rcutorture/configs/rcu/TREE01 | 1 +
+ .../selftests/rcutorture/configs/rcu/TREE02 | 2 +-
+ .../selftests/rcutorture/configs/rcu/TREE02-T | 1 -
+ .../selftests/rcutorture/configs/rcu/TREE03 | 8 +-
+ .../selftests/rcutorture/configs/rcu/TREE03.boot | 1 +
+ .../selftests/rcutorture/configs/rcu/TREE04 | 8 +-
+ .../selftests/rcutorture/configs/rcu/TREE05 | 4 +-
+ .../selftests/rcutorture/configs/rcu/TREE06 | 4 +-
+ .../selftests/rcutorture/configs/rcu/TREE06.boot | 1 +
+ .../selftests/rcutorture/configs/rcu/TREE07 | 4 +-
+ .../selftests/rcutorture/configs/rcu/TREE08 | 6 +-
+ .../selftests/rcutorture/configs/rcu/TREE08-T | 1 -
+ .../selftests/rcutorture/configs/rcu/TREE08-T.boot | 1 +
+ .../selftests/rcutorture/configs/rcu/TREE08.boot | 1 +
+ .../selftests/rcutorture/configs/rcu/TREE09 | 1 +
+ .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 36 +-
+ 60 files changed, 816 insertions(+), 689 deletions(-)
+ create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE03.boot
+ create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE08-T.boot
+Merging kvm/linux-next (2fa462f82621 Merge tag 'kvm-arm-for-4.1-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master)
+$ git merge kvm/linux-next
+Already up-to-date.
+Merging kvm-arm/next (2fa462f82621 Merge tag 'kvm-arm-for-4.1-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master)
+$ git merge kvm-arm/next
+Already up-to-date.
+Merging kvm-ppc/kvm-ppc-next (b79013b2449c Merge tag 'staging-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging)
+$ git merge kvm-ppc/kvm-ppc-next
+Already up-to-date.
+Merging kvms390/next (816c7667ea97 KVM: s390: migrate vcpu interrupt state)
+$ git merge kvms390/next
+Already up-to-date.
+Merging xen-tip/linux-next (0b97b03d88b4 xen/pci: Try harder to get PXM information for Xen)
+$ git merge xen-tip/linux-next
+Already up-to-date.
+Merging percpu/for-next (4c907baf36d8 percpu_ref: implement percpu_ref_is_dying())
+$ git merge percpu/for-next
+Already up-to-date.
+Merging workqueues/for-next (6888c6f279a7 workqueue: fix trivial typo in Documentation/workqueue.txt)
+$ git merge workqueues/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/workqueue.txt | 2 +-
+ include/linux/workqueue.h | 1 +
+ kernel/workqueue.c | 351 ++++++++++++++++++++++++++++++++------------
+ 3 files changed, 260 insertions(+), 94 deletions(-)
+Merging drivers-x86/for-next (b787f68c36d4 Linux 4.1-rc1)
+$ git merge drivers-x86/for-next
+Already up-to-date.
+Merging chrome-platform/for-next (96cba9b00e29 platform/chrome: chromeos_laptop - instantiate Atmel at primary address)
+$ git merge chrome-platform/for-next
+Already up-to-date.
+Merging regmap/for-next (637733e01bd4 Merge remote-tracking branches 'regmap/topic/defaults' and 'regmap/topic/irq' into regmap-next)
+$ git merge regmap/for-next
+Merge made by the 'recursive' strategy.
+ drivers/base/regmap/internal.h | 3 +++
+ drivers/base/regmap/regcache.c | 45 ++++++++++++++++++++++++++--------------
+ drivers/base/regmap/regmap-irq.c | 2 +-
+ 3 files changed, 34 insertions(+), 16 deletions(-)
+Merging hsi/for-next (265ef3ee9575 HSI: cmt_speech: fix error return code)
+$ git merge hsi/for-next
+Already up-to-date.
+Merging leds/for-next (a221e5c87ae2 Documentation: leds: Add description of v4l2-flash sub-device)
+$ git merge leds/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/leds/leds-aat1290.txt | 41 +
+ .../devicetree/bindings/leds/leds-bcm6328.txt | 309 +++++++
+ .../devicetree/bindings/leds/leds-tlc591xx.txt | 40 +
+ Documentation/leds/leds-class-flash.txt | 47 +
+ drivers/leds/Kconfig | 34 +
+ drivers/leds/Makefile | 4 +
+ drivers/leds/leds-aat1290.c | 451 ++++++++++
+ drivers/leds/leds-bcm6328.c | 413 +++++++++
+ drivers/leds/leds-gpio.c | 11 +-
+ drivers/leds/leds-max77693.c | 980 +++++++++++++++++++++
+ drivers/leds/leds-tlc591xx.c | 300 +++++++
+ drivers/leds/leds.h | 24 -
+ include/linux/leds.h | 25 +
+ 13 files changed, 2651 insertions(+), 28 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/leds/leds-aat1290.txt
+ create mode 100644 Documentation/devicetree/bindings/leds/leds-bcm6328.txt
+ create mode 100644 Documentation/devicetree/bindings/leds/leds-tlc591xx.txt
+ create mode 100644 drivers/leds/leds-aat1290.c
+ create mode 100644 drivers/leds/leds-bcm6328.c
+ create mode 100644 drivers/leds/leds-max77693.c
+ create mode 100644 drivers/leds/leds-tlc591xx.c
+Merging ipmi/for-next (47995a38d8a1 ipmi: Add a comment in how messages are delivered from the lower layer)
+$ git merge ipmi/for-next
+Merge made by the 'recursive' strategy.
+ drivers/char/ipmi/ipmi_msghandler.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+Merging driver-core/driver-core-next (b787f68c36d4 Linux 4.1-rc1)
+$ git merge driver-core/driver-core-next
+Already up-to-date.
+Merging tty/tty-next (c1c325d703d3 tty: serial: 8250_mtk: Add support for bus clock)
+$ git merge tty/tty-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/serial/mtk-uart.txt | 12 ++-
+ .../devicetree/bindings/serial/sirf-uart.txt | 15 +--
+ arch/alpha/include/asm/serial.h | 2 +-
+ arch/arm/common/edma.c | 3 +
+ arch/blackfin/include/asm/bfin_serial.h | 8 +-
+ arch/m68k/include/asm/serial.h | 2 +-
+ arch/mn10300/include/asm/serial.h | 4 +-
+ arch/x86/include/asm/serial.h | 2 +-
+ drivers/dma/edma.c | 7 +-
+ drivers/input/serio/serport.c | 5 +-
+ drivers/tty/amiserial.c | 8 +-
+ drivers/tty/cyclades.c | 8 +-
+ drivers/tty/n_gsm.c | 3 +-
+ drivers/tty/n_tty.c | 7 +-
+ drivers/tty/serial/8250/8250_core.c | 13 ---
+ drivers/tty/serial/8250/8250_mtk.c | 104 ++++++++++--------
+ drivers/tty/serial/8250/8250_omap.c | 65 +++++++++---
+ drivers/tty/serial/Kconfig | 2 +-
+ drivers/tty/serial/altera_jtaguart.c | 2 +-
+ drivers/tty/serial/altera_uart.c | 2 +-
+ drivers/tty/serial/amba-pl011.c | 118 +++++----------------
+ drivers/tty/serial/atmel_serial.c | 13 +--
+ drivers/tty/serial/bfin_uart.c | 24 ++---
+ drivers/tty/serial/crisv10.c | 94 ++--------------
+ drivers/tty/serial/ifx6x60.c | 19 ++--
+ drivers/tty/serial/imx.c | 16 ++-
+ drivers/tty/serial/kgdb_nmi.c | 6 +-
+ drivers/tty/serial/mcf.c | 2 +-
+ drivers/tty/serial/meson_uart.c | 2 +-
+ drivers/tty/serial/mpc52xx_uart.c | 2 +-
+ drivers/tty/serial/serial_core.c | 4 +-
+ drivers/tty/serial/sh-sci.h | 1 -
+ drivers/tty/serial/sirfsoc_uart.c | 27 +----
+ drivers/tty/serial/sirfsoc_uart.h | 4 -
+ drivers/tty/tty_io.c | 34 +++---
+ drivers/tty/tty_ioctl.c | 4 +-
+ drivers/tty/tty_ldisc.c | 8 +-
+ include/linux/serial_core.h | 2 +-
+ include/linux/tty.h | 2 +-
+ 39 files changed, 241 insertions(+), 415 deletions(-)
+Merging usb/usb-next (b787f68c36d4 Linux 4.1-rc1)
+$ git merge usb/usb-next
+Already up-to-date.
+Merging usb-gadget/next (b787f68c36d4 Linux 4.1-rc1)
+$ git merge usb-gadget/next
+Already up-to-date.
+Merging usb-serial/usb-next (b787f68c36d4 Linux 4.1-rc1)
+$ git merge usb-serial/usb-next
+Already up-to-date.
+Merging staging/staging-next (fd5e2fd053e1 staging: lustre: llite: fix ifnullfree.cocci warnings)
+$ git merge staging/staging-next
+Removing drivers/staging/unisys/virtpci/virtpci.h
+Removing drivers/staging/unisys/virtpci/virtpci.c
+Removing drivers/staging/unisys/virtpci/Makefile
+Removing drivers/staging/unisys/virtpci/Kconfig
+Removing drivers/staging/unisys/virthba/virthba.h
+Removing drivers/staging/unisys/virthba/virthba.c
+Removing drivers/staging/unisys/virthba/Makefile
+Removing drivers/staging/unisys/virthba/Kconfig
+Removing drivers/staging/unisys/uislib/uisutils.c
+Removing drivers/staging/unisys/uislib/uisthread.c
+Removing drivers/staging/unisys/uislib/uisqueue.c
+Removing drivers/staging/unisys/uislib/uislib.c
+Removing drivers/staging/unisys/uislib/Makefile
+Removing drivers/staging/unisys/uislib/Kconfig
+Merge made by the 'recursive' strategy.
+ drivers/staging/comedi/comedi_fops.c | 41 +-
+ drivers/staging/comedi/comedi_internal.h | 1 +
+ drivers/staging/comedi/comedidev.h | 18 +-
+ drivers/staging/comedi/drivers.c | 2 +-
+ .../staging/comedi/drivers/amplc_dio200_common.c | 6 +-
+ drivers/staging/comedi/drivers/cb_pcimdda.c | 6 +-
+ drivers/staging/comedi/drivers/comedi_bond.c | 3 +-
+ drivers/staging/comedi/drivers/daqboard2000.c | 58 +-
+ drivers/staging/comedi/drivers/ni_mio_common.c | 4 +
+ drivers/staging/comedi/drivers/serial2002.c | 2 +-
+ drivers/staging/emxx_udc/emxx_udc.c | 37 +-
+ drivers/staging/fbtft/fb_st7735r.c | 8 +-
+ drivers/staging/fbtft/fb_tls8204.c | 1 +
+ drivers/staging/fbtft/fbtft-core.c | 7 +-
+ drivers/staging/fbtft/internal.h | 2 +-
+ drivers/staging/i2o/iop.c | 59 +-
+ drivers/staging/iio/iio_simple_dummy_events.c | 2 +
+ drivers/staging/lustre/lustre/llite/dcache.c | 6 +-
+ drivers/staging/lustre/lustre/llite/dir.c | 35 +-
+ drivers/staging/lustre/lustre/llite/file.c | 36 +-
+ drivers/staging/lustre/lustre/llite/llite_close.c | 6 +-
+ .../staging/lustre/lustre/llite/llite_internal.h | 4 -
+ drivers/staging/lustre/lustre/llite/llite_lib.c | 41 +-
+ drivers/staging/lustre/lustre/llite/llite_nfs.c | 2 +-
+ drivers/staging/lustre/lustre/llite/llite_rmtacl.c | 4 +-
+ drivers/staging/lustre/lustre/llite/lloop.c | 8 +-
+ drivers/staging/lustre/lustre/llite/namei.c | 2 +-
+ drivers/staging/lustre/lustre/llite/rw26.c | 20 -
+ drivers/staging/lustre/lustre/llite/statahead.c | 20 +-
+ drivers/staging/lustre/lustre/llite/xattr_cache.c | 6 +-
+ drivers/staging/lustre/lustre/lov/lov_dev.c | 18 +-
+ drivers/staging/lustre/lustre/lov/lov_io.c | 5 +-
+ drivers/staging/lustre/lustre/lov/lov_obd.c | 22 +-
+ drivers/staging/lustre/lustre/lov/lov_pool.c | 18 +-
+ drivers/staging/lustre/lustre/lov/lov_request.c | 35 +-
+ drivers/staging/lustre/lustre/lov/lovsub_dev.c | 4 +-
+ drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 2 +-
+ drivers/staging/octeon-usb/octeon-hcd.c | 12 +-
+ drivers/staging/octeon/ethernet-defines.h | 62 +-
+ drivers/staging/octeon/ethernet-mdio.c | 48 +-
+ drivers/staging/octeon/ethernet-mdio.h | 24 +-
+ drivers/staging/octeon/ethernet-mem.c | 30 +-
+ drivers/staging/octeon/ethernet-mem.h | 23 +-
+ drivers/staging/octeon/ethernet-rgmii.c | 306 ++--
+ drivers/staging/octeon/ethernet-rx.c | 38 +-
+ drivers/staging/octeon/ethernet-rx.h | 24 +-
+ drivers/staging/octeon/ethernet-sgmii.c | 112 +-
+ drivers/staging/octeon/ethernet-spi.c | 237 ++-
+ drivers/staging/octeon/ethernet-tx.c | 28 +-
+ drivers/staging/octeon/ethernet-tx.h | 23 +-
+ drivers/staging/octeon/ethernet-util.h | 23 +-
+ drivers/staging/octeon/ethernet-xaui.c | 114 +-
+ drivers/staging/octeon/ethernet.c | 115 +-
+ drivers/staging/octeon/octeon-ethernet.h | 35 +-
+ drivers/staging/panel/panel.c | 14 -
+ drivers/staging/unisys/Kconfig | 3 -
+ drivers/staging/unisys/Makefile | 3 -
+ drivers/staging/unisys/uislib/Kconfig | 10 -
+ drivers/staging/unisys/uislib/Makefile | 12 -
+ drivers/staging/unisys/uislib/uislib.c | 1372 -----------------
+ drivers/staging/unisys/uislib/uisqueue.c | 322 ----
+ drivers/staging/unisys/uislib/uisthread.c | 69 -
+ drivers/staging/unisys/uislib/uisutils.c | 137 --
+ drivers/staging/unisys/virthba/Kconfig | 13 -
+ drivers/staging/unisys/virthba/Makefile | 12 -
+ drivers/staging/unisys/virthba/virthba.c | 1572 --------------------
+ drivers/staging/unisys/virthba/virthba.h | 27 -
+ drivers/staging/unisys/virtpci/Kconfig | 10 -
+ drivers/staging/unisys/virtpci/Makefile | 10 -
+ drivers/staging/unisys/virtpci/virtpci.c | 1394 -----------------
+ drivers/staging/unisys/virtpci/virtpci.h | 103 --
+ .../unisys/visorchannel/visorchannel_funcs.c | 6 +-
+ drivers/staging/unisys/visorchipset/file.c | 6 +-
+ drivers/staging/unisys/visorchipset/globals.h | 1 -
+ drivers/staging/unisys/visorchipset/parser.c | 40 +-
+ drivers/staging/unisys/visorchipset/parser.h | 10 +-
+ drivers/staging/unisys/visorchipset/visorchipset.h | 42 +-
+ .../unisys/visorchipset/visorchipset_main.c | 200 ++-
+ drivers/staging/vt6655/device_main.c | 21 +-
+ 79 files changed, 753 insertions(+), 6461 deletions(-)
+ delete mode 100644 drivers/staging/unisys/uislib/Kconfig
+ delete mode 100644 drivers/staging/unisys/uislib/Makefile
+ delete mode 100644 drivers/staging/unisys/uislib/uislib.c
+ delete mode 100644 drivers/staging/unisys/uislib/uisqueue.c
+ delete mode 100644 drivers/staging/unisys/uislib/uisthread.c
+ delete mode 100644 drivers/staging/unisys/uislib/uisutils.c
+ delete mode 100644 drivers/staging/unisys/virthba/Kconfig
+ delete mode 100644 drivers/staging/unisys/virthba/Makefile
+ delete mode 100644 drivers/staging/unisys/virthba/virthba.c
+ delete mode 100644 drivers/staging/unisys/virthba/virthba.h
+ delete mode 100644 drivers/staging/unisys/virtpci/Kconfig
+ delete mode 100644 drivers/staging/unisys/virtpci/Makefile
+ delete mode 100644 drivers/staging/unisys/virtpci/virtpci.c
+ delete mode 100644 drivers/staging/unisys/virtpci/virtpci.h
+Merging char-misc/char-misc-next (b787f68c36d4 Linux 4.1-rc1)
+$ git merge char-misc/char-misc-next
+Already up-to-date.
+Merging extcon/extcon-next (1401512465b8 extcon: Allow compile test of GPIO consumers if !GPIOLIB)
+$ git merge extcon/extcon-next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/mfd/arizona.txt | 6 +
+ drivers/extcon/Kconfig | 25 +-
+ drivers/extcon/Makefile | 1 +
+ drivers/extcon/extcon-adc-jack.c | 12 -
+ drivers/extcon/extcon-arizona.c | 50 ++-
+ drivers/extcon/extcon-axp288.c | 385 ++++++++++++++++++++++
+ drivers/extcon/extcon-max14577.c | 19 +-
+ drivers/extcon/extcon-max77693.c | 66 ++--
+ drivers/extcon/extcon-max77843.c | 43 +--
+ drivers/extcon/extcon-max8997.c | 10 +-
+ drivers/extcon/extcon-rt8973a.c | 22 +-
+ drivers/extcon/extcon-usb-gpio.c | 1 +
+ drivers/extcon/extcon.c | 27 +-
+ include/dt-bindings/mfd/arizona.h | 4 +
+ include/linux/extcon.h | 11 +-
+ include/linux/mfd/arizona/pdata.h | 3 +
+ include/linux/mfd/axp20x.h | 5 +
+ 17 files changed, 530 insertions(+), 160 deletions(-)
+ create mode 100644 drivers/extcon/extcon-axp288.c
+Merging kdbus/kdbus (9fb9cd0f4434 kdbus: avoid the use of struct timespec)
+$ git merge kdbus/kdbus
+Resolved 'Documentation/Makefile' using previous resolution.
+Auto-merging tools/testing/selftests/Makefile
+Auto-merging init/Kconfig
+Auto-merging include/uapi/linux/magic.h
+Auto-merging include/uapi/linux/Kbuild
+Auto-merging Makefile
+Auto-merging MAINTAINERS
+Auto-merging Documentation/ioctl/ioctl-number.txt
+Auto-merging Documentation/Makefile
+CONFLICT (content): Merge conflict in Documentation/Makefile
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master cc7171eff772] Merge remote-tracking branch 'kdbus/kdbus'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/Makefile | 2 +-
+ Documentation/ioctl/ioctl-number.txt | 1 +
+ Documentation/kdbus/.gitignore | 2 +
+ Documentation/kdbus/Makefile | 40 +
+ Documentation/kdbus/kdbus.bus.xml | 359 ++++
+ Documentation/kdbus/kdbus.connection.xml | 1250 ++++++++++++
+ Documentation/kdbus/kdbus.endpoint.xml | 429 ++++
+ Documentation/kdbus/kdbus.fs.xml | 124 ++
+ Documentation/kdbus/kdbus.item.xml | 839 ++++++++
+ Documentation/kdbus/kdbus.match.xml | 555 ++++++
+ Documentation/kdbus/kdbus.message.xml | 1276 ++++++++++++
+ Documentation/kdbus/kdbus.name.xml | 711 +++++++
+ Documentation/kdbus/kdbus.policy.xml | 406 ++++
+ Documentation/kdbus/kdbus.pool.xml | 326 +++
+ Documentation/kdbus/kdbus.xml | 1012 ++++++++++
+ Documentation/kdbus/stylesheet.xsl | 16 +
+ MAINTAINERS | 13 +
+ Makefile | 1 +
+ include/uapi/linux/Kbuild | 1 +
+ include/uapi/linux/kdbus.h | 979 +++++++++
+ include/uapi/linux/magic.h | 2 +
+ init/Kconfig | 13 +
+ ipc/Makefile | 2 +-
+ ipc/kdbus/Makefile | 22 +
+ ipc/kdbus/bus.c | 560 ++++++
+ ipc/kdbus/bus.h | 101 +
+ ipc/kdbus/connection.c | 2214 +++++++++++++++++++++
+ ipc/kdbus/connection.h | 257 +++
+ ipc/kdbus/domain.c | 296 +++
+ ipc/kdbus/domain.h | 77 +
+ ipc/kdbus/endpoint.c | 275 +++
+ ipc/kdbus/endpoint.h | 67 +
+ ipc/kdbus/fs.c | 510 +++++
+ ipc/kdbus/fs.h | 28 +
+ ipc/kdbus/handle.c | 617 ++++++
+ ipc/kdbus/handle.h | 85 +
+ ipc/kdbus/item.c | 339 ++++
+ ipc/kdbus/item.h | 64 +
+ ipc/kdbus/limits.h | 64 +
+ ipc/kdbus/main.c | 125 ++
+ ipc/kdbus/match.c | 559 ++++++
+ ipc/kdbus/match.h | 35 +
+ ipc/kdbus/message.c | 616 ++++++
+ ipc/kdbus/message.h | 133 ++
+ ipc/kdbus/metadata.c | 1159 +++++++++++
+ ipc/kdbus/metadata.h | 57 +
+ ipc/kdbus/names.c | 772 +++++++
+ ipc/kdbus/names.h | 74 +
+ ipc/kdbus/node.c | 910 +++++++++
+ ipc/kdbus/node.h | 84 +
+ ipc/kdbus/notify.c | 248 +++
+ ipc/kdbus/notify.h | 30 +
+ ipc/kdbus/policy.c | 489 +++++
+ ipc/kdbus/policy.h | 51 +
+ ipc/kdbus/pool.c | 728 +++++++
+ ipc/kdbus/pool.h | 46 +
+ ipc/kdbus/queue.c | 678 +++++++
+ ipc/kdbus/queue.h | 92 +
+ ipc/kdbus/reply.c | 257 +++
+ ipc/kdbus/reply.h | 68 +
+ ipc/kdbus/util.c | 201 ++
+ ipc/kdbus/util.h | 74 +
+ samples/Kconfig | 7 +
+ samples/Makefile | 3 +-
+ samples/kdbus/.gitignore | 1 +
+ samples/kdbus/Makefile | 9 +
+ samples/kdbus/kdbus-api.h | 114 ++
+ samples/kdbus/kdbus-workers.c | 1326 ++++++++++++
+ tools/testing/selftests/Makefile | 1 +
+ tools/testing/selftests/kdbus/.gitignore | 1 +
+ tools/testing/selftests/kdbus/Makefile | 48 +
+ tools/testing/selftests/kdbus/kdbus-enum.c | 94 +
+ tools/testing/selftests/kdbus/kdbus-enum.h | 14 +
+ tools/testing/selftests/kdbus/kdbus-test.c | 923 +++++++++
+ tools/testing/selftests/kdbus/kdbus-test.h | 85 +
+ tools/testing/selftests/kdbus/kdbus-util.c | 1615 +++++++++++++++
+ tools/testing/selftests/kdbus/kdbus-util.h | 222 +++
+ tools/testing/selftests/kdbus/test-activator.c | 318 +++
+ tools/testing/selftests/kdbus/test-attach-flags.c | 750 +++++++
+ tools/testing/selftests/kdbus/test-benchmark.c | 451 +++++
+ tools/testing/selftests/kdbus/test-bus.c | 175 ++
+ tools/testing/selftests/kdbus/test-chat.c | 122 ++
+ tools/testing/selftests/kdbus/test-connection.c | 616 ++++++
+ tools/testing/selftests/kdbus/test-daemon.c | 65 +
+ tools/testing/selftests/kdbus/test-endpoint.c | 341 ++++
+ tools/testing/selftests/kdbus/test-fd.c | 789 ++++++++
+ tools/testing/selftests/kdbus/test-free.c | 64 +
+ tools/testing/selftests/kdbus/test-match.c | 441 ++++
+ tools/testing/selftests/kdbus/test-message.c | 731 +++++++
+ tools/testing/selftests/kdbus/test-metadata-ns.c | 506 +++++
+ tools/testing/selftests/kdbus/test-monitor.c | 176 ++
+ tools/testing/selftests/kdbus/test-names.c | 194 ++
+ tools/testing/selftests/kdbus/test-policy-ns.c | 632 ++++++
+ tools/testing/selftests/kdbus/test-policy-priv.c | 1269 ++++++++++++
+ tools/testing/selftests/kdbus/test-policy.c | 80 +
+ tools/testing/selftests/kdbus/test-sync.c | 369 ++++
+ tools/testing/selftests/kdbus/test-timeout.c | 99 +
+ 97 files changed, 34069 insertions(+), 3 deletions(-)
+ create mode 100644 Documentation/kdbus/.gitignore
+ create mode 100644 Documentation/kdbus/Makefile
+ create mode 100644 Documentation/kdbus/kdbus.bus.xml
+ create mode 100644 Documentation/kdbus/kdbus.connection.xml
+ create mode 100644 Documentation/kdbus/kdbus.endpoint.xml
+ create mode 100644 Documentation/kdbus/kdbus.fs.xml
+ create mode 100644 Documentation/kdbus/kdbus.item.xml
+ create mode 100644 Documentation/kdbus/kdbus.match.xml
+ create mode 100644 Documentation/kdbus/kdbus.message.xml
+ create mode 100644 Documentation/kdbus/kdbus.name.xml
+ create mode 100644 Documentation/kdbus/kdbus.policy.xml
+ create mode 100644 Documentation/kdbus/kdbus.pool.xml
+ create mode 100644 Documentation/kdbus/kdbus.xml
+ create mode 100644 Documentation/kdbus/stylesheet.xsl
+ create mode 100644 include/uapi/linux/kdbus.h
+ create mode 100644 ipc/kdbus/Makefile
+ create mode 100644 ipc/kdbus/bus.c
+ create mode 100644 ipc/kdbus/bus.h
+ create mode 100644 ipc/kdbus/connection.c
+ create mode 100644 ipc/kdbus/connection.h
+ create mode 100644 ipc/kdbus/domain.c
+ create mode 100644 ipc/kdbus/domain.h
+ create mode 100644 ipc/kdbus/endpoint.c
+ create mode 100644 ipc/kdbus/endpoint.h
+ create mode 100644 ipc/kdbus/fs.c
+ create mode 100644 ipc/kdbus/fs.h
+ create mode 100644 ipc/kdbus/handle.c
+ create mode 100644 ipc/kdbus/handle.h
+ create mode 100644 ipc/kdbus/item.c
+ create mode 100644 ipc/kdbus/item.h
+ create mode 100644 ipc/kdbus/limits.h
+ create mode 100644 ipc/kdbus/main.c
+ create mode 100644 ipc/kdbus/match.c
+ create mode 100644 ipc/kdbus/match.h
+ create mode 100644 ipc/kdbus/message.c
+ create mode 100644 ipc/kdbus/message.h
+ create mode 100644 ipc/kdbus/metadata.c
+ create mode 100644 ipc/kdbus/metadata.h
+ create mode 100644 ipc/kdbus/names.c
+ create mode 100644 ipc/kdbus/names.h
+ create mode 100644 ipc/kdbus/node.c
+ create mode 100644 ipc/kdbus/node.h
+ create mode 100644 ipc/kdbus/notify.c
+ create mode 100644 ipc/kdbus/notify.h
+ create mode 100644 ipc/kdbus/policy.c
+ create mode 100644 ipc/kdbus/policy.h
+ create mode 100644 ipc/kdbus/pool.c
+ create mode 100644 ipc/kdbus/pool.h
+ create mode 100644 ipc/kdbus/queue.c
+ create mode 100644 ipc/kdbus/queue.h
+ create mode 100644 ipc/kdbus/reply.c
+ create mode 100644 ipc/kdbus/reply.h
+ create mode 100644 ipc/kdbus/util.c
+ create mode 100644 ipc/kdbus/util.h
+ create mode 100644 samples/kdbus/.gitignore
+ create mode 100644 samples/kdbus/Makefile
+ create mode 100644 samples/kdbus/kdbus-api.h
+ create mode 100644 samples/kdbus/kdbus-workers.c
+ create mode 100644 tools/testing/selftests/kdbus/.gitignore
+ create mode 100644 tools/testing/selftests/kdbus/Makefile
+ create mode 100644 tools/testing/selftests/kdbus/kdbus-enum.c
+ create mode 100644 tools/testing/selftests/kdbus/kdbus-enum.h
+ create mode 100644 tools/testing/selftests/kdbus/kdbus-test.c
+ create mode 100644 tools/testing/selftests/kdbus/kdbus-test.h
+ create mode 100644 tools/testing/selftests/kdbus/kdbus-util.c
+ create mode 100644 tools/testing/selftests/kdbus/kdbus-util.h
+ create mode 100644 tools/testing/selftests/kdbus/test-activator.c
+ create mode 100644 tools/testing/selftests/kdbus/test-attach-flags.c
+ create mode 100644 tools/testing/selftests/kdbus/test-benchmark.c
+ create mode 100644 tools/testing/selftests/kdbus/test-bus.c
+ create mode 100644 tools/testing/selftests/kdbus/test-chat.c
+ create mode 100644 tools/testing/selftests/kdbus/test-connection.c
+ create mode 100644 tools/testing/selftests/kdbus/test-daemon.c
+ create mode 100644 tools/testing/selftests/kdbus/test-endpoint.c
+ create mode 100644 tools/testing/selftests/kdbus/test-fd.c
+ create mode 100644 tools/testing/selftests/kdbus/test-free.c
+ create mode 100644 tools/testing/selftests/kdbus/test-match.c
+ create mode 100644 tools/testing/selftests/kdbus/test-message.c
+ create mode 100644 tools/testing/selftests/kdbus/test-metadata-ns.c
+ create mode 100644 tools/testing/selftests/kdbus/test-monitor.c
+ create mode 100644 tools/testing/selftests/kdbus/test-names.c
+ create mode 100644 tools/testing/selftests/kdbus/test-policy-ns.c
+ create mode 100644 tools/testing/selftests/kdbus/test-policy-priv.c
+ create mode 100644 tools/testing/selftests/kdbus/test-policy.c
+ create mode 100644 tools/testing/selftests/kdbus/test-sync.c
+ create mode 100644 tools/testing/selftests/kdbus/test-timeout.c
+Merging cgroup/for-next (d0f702e648dc cgroup: fix some comment typos)
+$ git merge cgroup/for-next
+Merge made by the 'recursive' strategy.
+ kernel/cgroup.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging scsi/for-next (118c855b5623 3w-9xxx: fix command completion race)
+$ git merge scsi/for-next
+Already up-to-date.
+Merging target-updates/for-next (cce0b8f8b7cf target: target_core_configfs.h is not needed in fabric drivers)
+$ git merge target-updates/for-next
+Auto-merging drivers/usb/gadget/legacy/tcm_usb_gadget.c
+Merge made by the 'recursive' strategy.
+ Documentation/target/tcm_mod_builder.py | 277 +-----------------------
+ Documentation/target/tcm_mod_builder.txt | 4 +-
+ Documentation/target/tcmu-design.txt | 2 +-
+ drivers/infiniband/ulp/isert/ib_isert.c | 6 +-
+ drivers/infiniband/ulp/srpt/ib_srpt.c | 181 +++-------------
+ drivers/infiniband/ulp/srpt/ib_srpt.h | 23 +-
+ drivers/scsi/qla2xxx/qla_target.c | 52 ++---
+ drivers/scsi/qla2xxx/qla_target.h | 1 -
+ drivers/scsi/qla2xxx/tcm_qla2xxx.c | 219 ++-----------------
+ drivers/scsi/qla2xxx/tcm_qla2xxx.h | 6 +-
+ drivers/target/iscsi/iscsi_target.c | 37 ++--
+ drivers/target/iscsi/iscsi_target_configfs.c | 136 +++---------
+ drivers/target/iscsi/iscsi_target_erl0.c | 53 -----
+ drivers/target/iscsi/iscsi_target_erl0.h | 1 -
+ drivers/target/iscsi/iscsi_target_login.c | 58 +----
+ drivers/target/iscsi/iscsi_target_login.h | 1 -
+ drivers/target/iscsi/iscsi_target_parameters.c | 267 +----------------------
+ drivers/target/iscsi/iscsi_target_parameters.h | 11 +-
+ drivers/target/iscsi/iscsi_target_tpg.c | 4 +-
+ drivers/target/iscsi/iscsi_target_util.c | 53 +----
+ drivers/target/iscsi/iscsi_target_util.h | 1 -
+ drivers/target/loopback/tcm_loop.c | 177 +---------------
+ drivers/target/loopback/tcm_loop.h | 9 -
+ drivers/target/sbp/sbp_target.c | 173 +--------------
+ drivers/target/sbp/sbp_target.h | 9 -
+ drivers/target/target_core_alua.c | 1 -
+ drivers/target/target_core_configfs.c | 97 +++------
+ drivers/target/target_core_device.c | 30 +--
+ drivers/target/target_core_fabric_configfs.c | 102 ++++-----
+ drivers/target/target_core_fabric_lib.c | 283 ++++++++++++-------------
+ drivers/target/target_core_file.c | 136 +++---------
+ drivers/target/target_core_file.h | 6 -
+ drivers/target/target_core_hba.c | 1 -
+ drivers/target/target_core_internal.h | 17 +-
+ drivers/target/target_core_pr.c | 90 +++-----
+ drivers/target/target_core_rd.c | 20 +-
+ drivers/target/target_core_sbc.c | 230 +++++++++-----------
+ drivers/target/target_core_spc.c | 24 +--
+ drivers/target/target_core_stat.c | 1 -
+ drivers/target/target_core_tmr.c | 24 +--
+ drivers/target/target_core_tpg.c | 206 +++++++-----------
+ drivers/target/target_core_transport.c | 133 +++++++-----
+ drivers/target/target_core_ua.c | 1 -
+ drivers/target/target_core_user.c | 221 +++++++++++--------
+ drivers/target/target_core_xcopy.c | 23 +-
+ drivers/target/tcm_fc/tcm_fc.h | 3 +-
+ drivers/target/tcm_fc/tfc_cmd.c | 11 +-
+ drivers/target/tcm_fc/tfc_conf.c | 105 ++-------
+ drivers/target/tcm_fc/tfc_io.c | 1 -
+ drivers/target/tcm_fc/tfc_sess.c | 1 -
+ drivers/usb/gadget/legacy/tcm_usb_gadget.c | 212 ++----------------
+ drivers/usb/gadget/legacy/tcm_usb_gadget.h | 12 --
+ drivers/vhost/scsi.c | 225 +-------------------
+ drivers/xen/xen-scsiback.c | 159 +-------------
+ include/linux/crc-t10dif.h | 1 +
+ include/target/iscsi/iscsi_target_core.h | 12 +-
+ include/target/target_core_backend.h | 8 +-
+ include/target/target_core_base.h | 26 +--
+ include/target/target_core_configfs.h | 59 ++----
+ include/target/target_core_fabric.h | 62 +-----
+ lib/crc-t10dif.c | 13 +-
+ 61 files changed, 978 insertions(+), 3339 deletions(-)
+Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2)
+$ git merge target-merge/for-next-merge
+Already up-to-date.
+Merging pinctrl/for-next (5e2742959a1c Merge branch 'devel' into for-next)
+$ git merge pinctrl/for-next
+Merge made by the 'recursive' strategy.
+ .../bindings/pinctrl/img,pistachio-pinctrl.txt | 217 ++++
+ .../bindings/pinctrl/nxp,lpc1850-scu.txt | 57 +
+ .../bindings/pinctrl/xlnx,zynq-pinctrl.txt | 7 +-
+ Documentation/pinctrl.txt | 11 +
+ drivers/gpio/gpio-bcm-kona.c | 2 +-
+ drivers/gpio/gpio-em.c | 2 +-
+ drivers/gpio/gpio-grgpio.c | 2 +-
+ drivers/gpio/gpio-mpc8xxx.c | 2 +-
+ drivers/gpio/gpio-sa1100.c | 2 +-
+ drivers/gpio/gpio-sodaville.c | 2 +-
+ drivers/pinctrl/Kconfig | 9 +
+ drivers/pinctrl/Makefile | 1 +
+ drivers/pinctrl/core.c | 10 +-
+ drivers/pinctrl/core.h | 2 +-
+ drivers/pinctrl/devicetree.c | 2 +-
+ drivers/pinctrl/freescale/Kconfig | 7 +
+ drivers/pinctrl/freescale/Makefile | 1 +
+ drivers/pinctrl/freescale/pinctrl-imx.c | 55 +-
+ drivers/pinctrl/freescale/pinctrl-imx7d.c | 385 +++++++
+ drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 2 +
+ drivers/pinctrl/mvebu/pinctrl-armada-370.c | 2 +-
+ drivers/pinctrl/nomadik/pinctrl-abx500.c | 1 +
+ drivers/pinctrl/nomadik/pinctrl-nomadik.c | 62 +-
+ drivers/pinctrl/pinctrl-adi2.c | 1 +
+ drivers/pinctrl/pinctrl-at91.c | 16 +
+ drivers/pinctrl/pinctrl-lpc18xx.c | 1144 ++++++++++++++++++++
+ drivers/pinctrl/pinctrl-single.c | 2 +-
+ drivers/pinctrl/pinctrl-zynq.c | 70 +-
+ drivers/pinctrl/pinmux.c | 13 +
+ drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 1 +
+ drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 10 +-
+ include/linux/pinctrl/consumer.h | 2 +-
+ include/linux/pinctrl/pinmux.h | 4 +
+ 33 files changed, 2035 insertions(+), 71 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/img,pistachio-pinctrl.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/nxp,lpc1850-scu.txt
+ create mode 100644 drivers/pinctrl/freescale/pinctrl-imx7d.c
+ create mode 100644 drivers/pinctrl/pinctrl-lpc18xx.c
+Merging vhost/linux-next (f4aaa799cf9a tun, macvtap: higher order allocations for skbs)
+$ git merge vhost/linux-next
+Auto-merging include/linux/pci.h
+Auto-merging drivers/pci/quirks.c
+Auto-merging drivers/pci/probe.c
+Auto-merging drivers/pci/pci.h
+Auto-merging drivers/pci/pci.c
+Auto-merging drivers/net/tun.c
+Auto-merging drivers/net/macvtap.c
+Merge made by the 'recursive' strategy.
+ drivers/net/macvtap.c | 2 +-
+ drivers/net/tun.c | 2 +-
+ drivers/ntb/ntb_hw.c | 2 --
+ drivers/pci/msi.c | 57 ++++++++------------------------------
+ drivers/pci/pci-driver.c | 2 --
+ drivers/pci/pci.c | 33 ----------------------
+ drivers/pci/pci.h | 21 ++++++++++++++
+ drivers/pci/probe.c | 18 ++++++++++++
+ drivers/pci/quirks.c | 2 --
+ drivers/virtio/virtio_pci_common.c | 3 --
+ include/linux/pci.h | 5 ----
+ 11 files changed, 53 insertions(+), 94 deletions(-)
+Merging remoteproc/for-next (172e6ab1caff remoteproc: fix various checkpatch warnings)
+$ git merge remoteproc/for-next
+Merge made by the 'recursive' strategy.
+ drivers/remoteproc/da8xx_remoteproc.c | 3 +--
+ drivers/remoteproc/remoteproc_core.c | 27 +++++++++------------------
+ drivers/remoteproc/remoteproc_internal.h | 2 +-
+ drivers/remoteproc/ste_modem_rproc.c | 4 ++--
+ 4 files changed, 13 insertions(+), 23 deletions(-)
+Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small)
+$ git merge rpmsg/for-next
+Already up-to-date.
+Merging gpio/for-next (10fc7f870b72 Merge branch 'devel' into for-next)
+$ git merge gpio/for-next
+Auto-merging drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
+Auto-merging drivers/gpio/gpio-bcm-kona.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/gpio/gpio-xlp.txt | 47 +++
+ .../devicetree/bindings/gpio/nxp,lpc1850-gpio.txt | 39 ++
+ drivers/gpio/Kconfig | 21 +-
+ drivers/gpio/Makefile | 2 +
+ drivers/gpio/gpio-bcm-kona.c | 26 +-
+ drivers/gpio/gpio-lpc18xx.c | 180 +++++++++
+ drivers/gpio/gpio-max732x.c | 21 +-
+ drivers/gpio/gpio-omap.c | 72 ++--
+ drivers/gpio/gpio-xlp.c | 425 +++++++++++++++++++++
+ drivers/gpio/gpiolib-acpi.c | 2 +-
+ drivers/gpio/gpiolib-sysfs.c | 19 +
+ drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 13 +-
+ include/linux/platform_data/gpio-omap.h | 12 +-
+ 13 files changed, 813 insertions(+), 66 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/gpio/gpio-xlp.txt
+ create mode 100644 Documentation/devicetree/bindings/gpio/nxp,lpc1850-gpio.txt
+ create mode 100644 drivers/gpio/gpio-lpc18xx.c
+ create mode 100644 drivers/gpio/gpio-xlp.c
+Merging dma-mapping/dma-mapping-next (5ebe6afaf005 Linux 4.1-rc2)
+$ git merge dma-mapping/dma-mapping-next
+Already up-to-date.
+Merging pwm/for-next (efb0de55b6a2 pwm: Add support to remove registered consumer lookup tables)
+$ git merge pwm/for-next
+Merge made by the 'recursive' strategy.
+ drivers/pwm/core.c | 17 +++++++++++++++++
+ include/linux/pwm.h | 5 +++++
+ 2 files changed, 22 insertions(+)
+Merging dma-buf/for-next (5ebe6afaf005 Linux 4.1-rc2)
+$ git merge dma-buf/for-next
+Already up-to-date.
+Merging userns/for-next (e0c9c0afd2fc mnt: Update detach_mounts to leave mounts connected)
+$ git merge userns/for-next
+Already up-to-date.
+Merging ktest/for-next (7c2c49eceb79 ktest: Place quotes around item variable)
+$ git merge ktest/for-next
+Already up-to-date.
+Merging clk/clk-next (6aeec8abd0e8 clk: emev2: Use generic names for device nodes)
+$ git merge clk/clk-next
+Auto-merging include/linux/clk-provider.h
+Auto-merging drivers/clk/clk.c
+Auto-merging drivers/clk/Makefile
+Merge made by the 'recursive' strategy.
+ .../bindings/arm/mediatek/mediatek,apmixedsys.txt | 23 +
+ .../bindings/arm/mediatek/mediatek,infracfg.txt | 30 +
+ .../bindings/arm/mediatek/mediatek,pericfg.txt | 30 +
+ .../bindings/arm/mediatek/mediatek,topckgen.txt | 23 +
+ .../devicetree/bindings/clock/emev2-clock.txt | 2 +-
+ drivers/clk/Makefile | 1 +
+ drivers/clk/at91/pmc.c | 2 +-
+ drivers/clk/clk-cdce706.c | 4 +-
+ drivers/clk/clk-composite.c | 2 +-
+ drivers/clk/clk-ls1x.c | 6 +-
+ drivers/clk/clk-mux.c | 6 +-
+ drivers/clk/clk.c | 1819 ++++++++++----------
+ drivers/clk/mediatek/Makefile | 4 +
+ drivers/clk/mediatek/clk-gate.c | 137 ++
+ drivers/clk/mediatek/clk-gate.h | 49 +
+ drivers/clk/mediatek/clk-mt8135.c | 644 +++++++
+ drivers/clk/mediatek/clk-mt8173.c | 830 +++++++++
+ drivers/clk/mediatek/clk-mtk.c | 220 +++
+ drivers/clk/mediatek/clk-mtk.h | 169 ++
+ drivers/clk/mediatek/clk-pll.c | 332 ++++
+ drivers/clk/mediatek/reset.c | 97 ++
+ drivers/clk/qcom/gcc-msm8916.c | 4 +-
+ drivers/clk/rockchip/clk-rk3188.c | 2 +-
+ drivers/clk/rockchip/clk-rk3288.c | 2 +-
+ drivers/clk/samsung/clk-exynos5260.c | 74 +-
+ drivers/clk/samsung/clk-exynos5420.c | 10 +-
+ drivers/clk/samsung/clk-s3c2410-dclk.c | 6 +-
+ drivers/clk/sirf/clk-common.c | 12 +-
+ drivers/clk/ux500/u8500_clk.c | 7 +-
+ drivers/clk/ux500/u8500_of_clk.c | 4 +-
+ include/dt-bindings/clock/mt8135-clk.h | 194 +++
+ include/dt-bindings/clock/mt8173-clk.h | 235 +++
+ .../dt-bindings/reset-controller/mt8135-resets.h | 64 +
+ .../dt-bindings/reset-controller/mt8173-resets.h | 63 +
+ include/linux/clk-provider.h | 10 +-
+ 35 files changed, 4121 insertions(+), 996 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,apmixedsys.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,infracfg.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,topckgen.txt
+ create mode 100644 drivers/clk/mediatek/Makefile
+ create mode 100644 drivers/clk/mediatek/clk-gate.c
+ create mode 100644 drivers/clk/mediatek/clk-gate.h
+ create mode 100644 drivers/clk/mediatek/clk-mt8135.c
+ create mode 100644 drivers/clk/mediatek/clk-mt8173.c
+ create mode 100644 drivers/clk/mediatek/clk-mtk.c
+ create mode 100644 drivers/clk/mediatek/clk-mtk.h
+ create mode 100644 drivers/clk/mediatek/clk-pll.c
+ create mode 100644 drivers/clk/mediatek/reset.c
+ create mode 100644 include/dt-bindings/clock/mt8135-clk.h
+ create mode 100644 include/dt-bindings/clock/mt8173-clk.h
+ create mode 100644 include/dt-bindings/reset-controller/mt8135-resets.h
+ create mode 100644 include/dt-bindings/reset-controller/mt8173-resets.h
+Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data)
+$ git merge random/dev
+Already up-to-date.
+Merging aio/master (5f785de58873 aio: Skip timer for io_getevents if timeout=0)
+$ git merge aio/master
+Already up-to-date.
+Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu)
+$ git merge llvmlinux/for-next
+Merge made by the 'recursive' strategy.
+Merging kselftest/next (5c6c3e612ef5 selftests/exec: do not install subdir as it is already created)
+$ git merge kselftest/next
+Merge made by the 'recursive' strategy.
+ tools/testing/selftests/exec/Makefile | 2 +-
+ tools/testing/selftests/ftrace/Makefile | 1 +
+ tools/testing/selftests/lib.mk | 3 +
+ tools/testing/selftests/mount/Makefile | 7 +-
+ tools/testing/selftests/timers/.gitignore | 18 +++
+ tools/testing/selftests/vm/Makefile | 7 +-
+ tools/testing/selftests/vm/compaction_test.c | 225 +++++++++++++++++++++++++++
+ tools/testing/selftests/vm/run_vmtests | 12 ++
+ 8 files changed, 272 insertions(+), 3 deletions(-)
+ create mode 100644 tools/testing/selftests/timers/.gitignore
+ create mode 100644 tools/testing/selftests/vm/compaction_test.c
+Merging y2038/y2038 (ed8c2241c1ae coredump: Use 64bit time for unix time of coredump)
+$ git merge y2038/y2038
+Resolved 'drivers/staging/media/lirc/lirc_parallel.c' using previous resolution.
+Auto-merging kernel/cpuset.c
+Auto-merging fs/coredump.c
+Auto-merging drivers/staging/media/lirc/lirc_serial.c
+Auto-merging drivers/staging/media/lirc/lirc_sasem.c
+Auto-merging drivers/staging/media/lirc/lirc_parallel.c
+CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_parallel.c
+Auto-merging drivers/staging/gdm72xx/gdm_sdio.c
+Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
+Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
+Auto-merging drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 93961f489531] Merge remote-tracking branch 'y2038/y2038'
+$ git diff -M --stat --summary HEAD^..
+ drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 4 +-
+ drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 4 +-
+ drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 4 +-
+ drivers/staging/ft1000/ft1000.h | 4 +-
+ drivers/staging/gdm72xx/gdm_sdio.c | 13 +++---
+ drivers/staging/gdm72xx/gdm_sdio.h | 4 +-
+ drivers/staging/media/lirc/lirc_parallel.c | 35 +++++++----------
+ drivers/staging/media/lirc/lirc_sasem.c | 20 +++++-----
+ drivers/staging/media/lirc/lirc_serial.c | 50 ++++++++----------------
+ fs/coredump.c | 8 ++--
+ kernel/cpuset.c | 12 ++++--
+ 11 files changed, 68 insertions(+), 90 deletions(-)
+Merging luto-misc/next (a6c5170d1ede Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux)
+$ git merge luto-misc/next
+Already up-to-date.
+Merging access_once/linux-next (bc465aa9d045 Linux 4.0-rc5)
+$ git merge access_once/linux-next
+Already up-to-date.
+Merging livepatching/for-next (fd683e86d17e Merge branch 'for-4.2/kaslr' into for-next)
+$ git merge livepatching/for-next
+Auto-merging arch/x86/kernel/setup.c
+Merge made by the 'recursive' strategy.
+ arch/x86/include/asm/livepatch.h | 1 +
+ arch/x86/include/asm/setup.h | 7 +++++++
+ arch/x86/kernel/machine_kexec_64.c | 3 ++-
+ arch/x86/kernel/setup.c | 2 +-
+ kernel/livepatch/core.c | 5 +++--
+ 5 files changed, 14 insertions(+), 4 deletions(-)
+Merging coresight/next (48582dcacc6b coresight: fix typo in of_coresight.c)
+$ git merge coresight/next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/coresight.txt | 13 ++-
+ drivers/hwtracing/coresight/coresight-etb10.c | 79 +++++++++------
+ drivers/hwtracing/coresight/coresight-etm.h | 4 +-
+ drivers/hwtracing/coresight/coresight-etm3x.c | 112 ++++++++++-----------
+ drivers/hwtracing/coresight/coresight-funnel.c | 61 +++++++----
+ drivers/hwtracing/coresight/coresight-replicator.c | 71 ++++++++++++-
+ drivers/hwtracing/coresight/coresight-tmc.c | 31 ++----
+ drivers/hwtracing/coresight/coresight-tpiu.c | 60 ++++++++---
+ drivers/hwtracing/coresight/of_coresight.c | 2 +-
+ 9 files changed, 281 insertions(+), 152 deletions(-)
+Merging akpm-current/current (a3980f9598c6 lib/scatterlist: mark input buffer parameters as 'const')
+$ git merge --no-ff akpm-current/current
+Recorded preimage for 'Documentation/devicetree/bindings/rtc/abracon,abx80x.txt'
+Recorded preimage for 'drivers/block/zram/zram_drv.c'
+Resolved 'arch/x86/kernel/machine_kexec_64.c' using previous resolution.
+Auto-merging mm/shmem.c
+Auto-merging mm/memory-failure.c
+Auto-merging include/linux/scatterlist.h
+Removing include/linux/compiler-gcc5.h
+Removing include/linux/compiler-gcc4.h
+Removing include/linux/compiler-gcc3.h
+Auto-merging fs/ocfs2/dlm/dlmmaster.c
+Auto-merging fs/cifs/file.c
+Auto-merging drivers/block/zram/zram_drv.c
+CONFLICT (content): Merge conflict in drivers/block/zram/zram_drv.c
+Auto-merging arch/xtensa/include/asm/dma-mapping.h
+Auto-merging arch/x86/kernel/machine_kexec_64.c
+CONFLICT (content): Merge conflict in arch/x86/kernel/machine_kexec_64.c
+Auto-merging arch/x86/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/rtc/abracon,abx80x.txt
+CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/rtc/abracon,abx80x.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'Documentation/devicetree/bindings/rtc/abracon,abx80x.txt'.
+Recorded resolution for 'drivers/block/zram/zram_drv.c'.
+[master 530ccbb416f8] Merge branch 'akpm-current/current'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-class-zram | 24 +
+ Documentation/blockdev/zram.txt | 29 +-
+ Documentation/filesystems/vfat.txt | 10 +
+ Documentation/lockup-watchdogs.txt | 18 +
+ Documentation/printk-formats.txt | 8 +
+ Documentation/sysctl/kernel.txt | 21 +
+ MAINTAINERS | 23 +-
+ arch/alpha/include/asm/mm-arch-hooks.h | 15 +
+ arch/alpha/include/uapi/asm/mman.h | 1 +
+ arch/arc/include/asm/dma-mapping.h | 12 +-
+ arch/arc/include/asm/mm-arch-hooks.h | 15 +
+ arch/arm/include/asm/hugetlb.h | 4 -
+ arch/arm/include/asm/mm-arch-hooks.h | 15 +
+ arch/arm/include/asm/pgtable-3level.h | 1 +
+ arch/arm/mm/hugetlbpage.c | 5 -
+ arch/arm64/include/asm/hugetlb.h | 4 -
+ arch/arm64/include/asm/mm-arch-hooks.h | 15 +
+ arch/arm64/include/asm/pgtable.h | 2 +
+ arch/arm64/mm/hugetlbpage.c | 7 -
+ arch/avr32/include/asm/dma-mapping.h | 19 +-
+ arch/avr32/include/asm/mm-arch-hooks.h | 15 +
+ arch/blackfin/include/asm/mm-arch-hooks.h | 15 +
+ arch/c6x/include/asm/mm-arch-hooks.h | 15 +
+ arch/cris/include/asm/mm-arch-hooks.h | 15 +
+ arch/frv/include/asm/mm-arch-hooks.h | 15 +
+ arch/frv/include/asm/sections.h | 6 -
+ arch/frv/mb93090-mb00/pci-dma-nommu.c | 10 +-
+ arch/frv/mb93090-mb00/pci-dma.c | 7 +-
+ arch/hexagon/include/asm/mm-arch-hooks.h | 15 +
+ arch/ia64/include/asm/hugetlb.h | 4 -
+ arch/ia64/include/asm/mm-arch-hooks.h | 15 +
+ arch/ia64/mm/hugetlbpage.c | 5 -
+ arch/ia64/mm/numa.c | 19 +-
+ arch/m32r/include/asm/mm-arch-hooks.h | 15 +
+ arch/m68k/include/asm/mm-arch-hooks.h | 15 +
+ arch/metag/include/asm/hugetlb.h | 4 -
+ arch/metag/include/asm/mm-arch-hooks.h | 15 +
+ arch/metag/mm/hugetlbpage.c | 5 -
+ arch/microblaze/include/asm/mm-arch-hooks.h | 15 +
+ arch/mips/include/asm/hugetlb.h | 4 -
+ arch/mips/include/asm/mm-arch-hooks.h | 15 +
+ arch/mips/include/uapi/asm/mman.h | 1 +
+ arch/mips/mm/dma-default.c | 30 +-
+ arch/mips/mm/hugetlbpage.c | 5 -
+ arch/mn10300/include/asm/mm-arch-hooks.h | 15 +
+ arch/nios2/include/asm/mm-arch-hooks.h | 15 +
+ arch/openrisc/include/asm/mm-arch-hooks.h | 15 +
+ arch/parisc/include/asm/mm-arch-hooks.h | 15 +
+ arch/parisc/include/uapi/asm/mman.h | 1 +
+ arch/parisc/kernel/pci-dma.c | 27 +-
+ arch/powerpc/include/asm/hugetlb.h | 5 -
+ arch/powerpc/include/asm/mm-arch-hooks.h | 28 +
+ arch/powerpc/include/asm/mmu_context.h | 23 +-
+ arch/powerpc/include/asm/pgtable-ppc64.h | 2 +
+ arch/powerpc/kernel/vio.c | 10 +-
+ arch/powerpc/mm/hugetlbpage.c | 5 -
+ arch/s390/include/asm/hugetlb.h | 1 -
+ arch/s390/include/asm/mm-arch-hooks.h | 15 +
+ arch/s390/mm/hugetlbpage.c | 5 -
+ arch/score/include/asm/mm-arch-hooks.h | 15 +
+ arch/sh/include/asm/hugetlb.h | 3 -
+ arch/sh/include/asm/mm-arch-hooks.h | 15 +
+ arch/sh/mm/hugetlbpage.c | 5 -
+ arch/sparc/include/asm/hugetlb.h | 4 -
+ arch/sparc/include/asm/mm-arch-hooks.h | 15 +
+ arch/sparc/include/asm/pgtable_64.h | 9 +
+ arch/sparc/kernel/ldc.c | 8 +-
+ arch/sparc/mm/hugetlbpage.c | 5 -
+ arch/tile/include/asm/hugetlb.h | 4 -
+ arch/tile/include/asm/mm-arch-hooks.h | 15 +
+ arch/tile/mm/hugetlbpage.c | 5 -
+ arch/um/include/asm/mm-arch-hooks.h | 15 +
+ arch/unicore32/include/asm/mm-arch-hooks.h | 15 +
+ arch/x86/Kconfig | 3 +-
+ arch/x86/include/asm/hugetlb.h | 3 -
+ arch/x86/include/asm/mm-arch-hooks.h | 15 +
+ arch/x86/include/asm/mtrr.h | 7 +-
+ arch/x86/include/asm/pgtable.h | 5 +
+ arch/x86/include/uapi/asm/mtrr.h | 12 +-
+ arch/x86/kernel/cpu/mtrr/generic.c | 192 +++--
+ arch/x86/kernel/machine_kexec_64.c | 1 +
+ arch/x86/mm/pat.c | 4 +-
+ arch/x86/mm/pgtable.c | 53 +-
+ arch/xtensa/include/asm/dma-mapping.h | 19 +-
+ arch/xtensa/include/asm/mm-arch-hooks.h | 15 +
+ arch/xtensa/include/uapi/asm/mman.h | 1 +
+ block/genhd.c | 2 +-
+ drivers/base/node.c | 6 +-
+ drivers/block/zram/Kconfig | 10 +-
+ drivers/block/zram/zram_drv.c | 1020 +++++++++++++++------------
+ drivers/block/zram/zram_drv.h | 10 +-
+ drivers/memstick/host/jmb38x_ms.c | 12 +-
+ drivers/memstick/host/r592.c | 10 +-
+ drivers/rtc/class.c | 24 +
+ drivers/rtc/interface.c | 13 +-
+ drivers/rtc/rtc-ds1307.c | 12 +-
+ drivers/rtc/rtc-omap.c | 14 +-
+ fs/adfs/super.c | 2 +-
+ fs/affs/amigaffs.c | 2 +-
+ fs/affs/inode.c | 2 +-
+ fs/befs/btree.c | 6 +-
+ fs/cifs/file.c | 8 +-
+ fs/configfs/item.c | 3 +-
+ fs/efs/super.c | 2 +-
+ fs/ext4/fsync.c | 5 +-
+ fs/fat/cache.c | 79 ++-
+ fs/fat/dir.c | 2 +-
+ fs/fat/fat.h | 6 +-
+ fs/fat/file.c | 61 ++
+ fs/fat/inode.c | 75 +-
+ fs/hugetlbfs/inode.c | 1 -
+ fs/jbd2/journal.c | 11 +-
+ fs/jbd2/transaction.c | 20 +-
+ fs/kernfs/dir.c | 9 +-
+ fs/minix/inode.c | 2 +-
+ fs/mpage.c | 23 +-
+ fs/ocfs2/alloc.c | 282 +++++---
+ fs/ocfs2/aops.c | 37 +-
+ fs/ocfs2/buffer_head_io.c | 6 +
+ fs/ocfs2/cluster/heartbeat.c | 49 +-
+ fs/ocfs2/cluster/masklog.c | 34 +
+ fs/ocfs2/cluster/masklog.h | 42 +-
+ fs/ocfs2/dir.c | 90 ++-
+ fs/ocfs2/dlm/dlmcommon.h | 1 -
+ fs/ocfs2/dlm/dlmmaster.c | 22 +-
+ fs/ocfs2/dlm/dlmthread.c | 10 +
+ fs/ocfs2/extent_map.c | 22 +-
+ fs/ocfs2/inode.c | 40 +-
+ fs/ocfs2/journal.c | 49 +-
+ fs/ocfs2/localalloc.c | 3 +-
+ fs/ocfs2/move_extents.c | 8 +-
+ fs/ocfs2/namei.c | 46 +-
+ fs/ocfs2/namei.h | 4 +-
+ fs/ocfs2/ocfs2.h | 2 +
+ fs/ocfs2/quota_local.c | 3 +-
+ fs/ocfs2/refcounttree.c | 81 +--
+ fs/ocfs2/suballoc.c | 90 +--
+ fs/ocfs2/super.c | 67 +-
+ fs/ocfs2/super.h | 8 +-
+ fs/ocfs2/xattr.c | 51 +-
+ fs/posix_acl.c | 46 +-
+ fs/proc/array.c | 8 +
+ fs/reiserfs/super.c | 3 +-
+ include/linux/bootmem.h | 8 +-
+ include/linux/compiler-gcc.h | 207 ++++--
+ include/linux/compiler-gcc3.h | 23 -
+ include/linux/compiler-gcc4.h | 91 ---
+ include/linux/compiler-gcc5.h | 67 --
+ include/linux/configfs.h | 1 -
+ include/linux/crc64_ecma.h | 56 ++
+ include/linux/gfp.h | 2 +
+ include/linux/huge_mm.h | 4 +
+ include/linux/kexec.h | 2 +
+ include/linux/memblock.h | 18 +
+ include/linux/memcontrol.h | 4 +
+ include/linux/mm-arch-hooks.h | 25 +
+ include/linux/mm.h | 48 +-
+ include/linux/mmzone.h | 23 +-
+ include/linux/nmi.h | 3 +
+ include/linux/page-flags.h | 237 ++++---
+ include/linux/pagemap.h | 25 +-
+ include/linux/poison.h | 4 +
+ include/linux/rmap.h | 9 +-
+ include/linux/rtc.h | 4 +
+ include/linux/scatterlist.h | 4 +-
+ include/linux/slab.h | 36 +-
+ include/linux/smpboot.h | 5 +
+ include/linux/string.h | 1 +
+ include/linux/swap.h | 1 +
+ include/linux/vm_event_item.h | 1 +
+ include/uapi/asm-generic/mman-common.h | 1 +
+ ipc/msg.c | 3 +-
+ kernel/exit.c | 2 +-
+ kernel/smpboot.c | 60 +-
+ kernel/sysctl.c | 7 +
+ kernel/watchdog.c | 66 +-
+ lib/Kconfig | 7 +
+ lib/Makefile | 1 +
+ lib/bitmap.c | 32 +-
+ lib/crc64_ecma.c | 341 +++++++++
+ lib/scatterlist.c | 12 +-
+ lib/sort.c | 21 +-
+ lib/test-hexdump.c | 6 +-
+ lib/vsprintf.c | 20 +-
+ mm/Kconfig | 18 +
+ mm/bootmem.c | 13 +-
+ mm/compaction.c | 25 +-
+ mm/filemap.c | 15 +-
+ mm/huge_memory.c | 41 +-
+ mm/hugetlb.c | 5 +
+ mm/internal.h | 33 +-
+ mm/kasan/kasan.h | 1 -
+ mm/kmemleak.c | 3 +-
+ mm/ksm.c | 2 +-
+ mm/madvise.c | 176 +++++
+ mm/memblock.c | 34 +-
+ mm/memory-failure.c | 17 +-
+ mm/memory.c | 2 +-
+ mm/memory_hotplug.c | 11 +-
+ mm/migrate.c | 2 +-
+ mm/mm_init.c | 9 +-
+ mm/mprotect.c | 11 +
+ mm/mremap.c | 17 +-
+ mm/nobootmem.c | 7 +-
+ mm/page_alloc.c | 423 +++++++++--
+ mm/page_isolation.c | 10 +-
+ mm/rmap.c | 46 +-
+ mm/shmem.c | 4 +-
+ mm/slab.c | 14 +
+ mm/slab.h | 10 +
+ mm/slab_common.c | 121 +++-
+ mm/slob.c | 13 +
+ mm/slub.c | 69 ++
+ mm/swap.c | 44 ++
+ mm/swap_state.c | 4 +-
+ mm/util.c | 40 +-
+ mm/vmscan.c | 126 +++-
+ mm/vmstat.c | 1 +
+ mm/zsmalloc.c | 4 -
+ mm/zswap.c | 4 +-
+ scripts/get_maintainer.pl | 32 +
+ 221 files changed, 4603 insertions(+), 2021 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-class-zram
+ create mode 100644 arch/alpha/include/asm/mm-arch-hooks.h
+ create mode 100644 arch/arc/include/asm/mm-arch-hooks.h
+ create mode 100644 arch/arm/include/asm/mm-arch-hooks.h
+ create mode 100644 arch/arm64/include/asm/mm-arch-hooks.h
+ create mode 100644 arch/avr32/include/asm/mm-arch-hooks.h
+ create mode 100644 arch/blackfin/include/asm/mm-arch-hooks.h
+ create mode 100644 arch/c6x/include/asm/mm-arch-hooks.h
+ create mode 100644 arch/cris/include/asm/mm-arch-hooks.h
+ create mode 100644 arch/frv/include/asm/mm-arch-hooks.h
+ create mode 100644 arch/hexagon/include/asm/mm-arch-hooks.h
+ create mode 100644 arch/ia64/include/asm/mm-arch-hooks.h
+ create mode 100644 arch/m32r/include/asm/mm-arch-hooks.h
+ create mode 100644 arch/m68k/include/asm/mm-arch-hooks.h
+ create mode 100644 arch/metag/include/asm/mm-arch-hooks.h
+ create mode 100644 arch/microblaze/include/asm/mm-arch-hooks.h
+ create mode 100644 arch/mips/include/asm/mm-arch-hooks.h
+ create mode 100644 arch/mn10300/include/asm/mm-arch-hooks.h
+ create mode 100644 arch/nios2/include/asm/mm-arch-hooks.h
+ create mode 100644 arch/openrisc/include/asm/mm-arch-hooks.h
+ create mode 100644 arch/parisc/include/asm/mm-arch-hooks.h
+ create mode 100644 arch/powerpc/include/asm/mm-arch-hooks.h
+ create mode 100644 arch/s390/include/asm/mm-arch-hooks.h
+ create mode 100644 arch/score/include/asm/mm-arch-hooks.h
+ create mode 100644 arch/sh/include/asm/mm-arch-hooks.h
+ create mode 100644 arch/sparc/include/asm/mm-arch-hooks.h
+ create mode 100644 arch/tile/include/asm/mm-arch-hooks.h
+ create mode 100644 arch/um/include/asm/mm-arch-hooks.h
+ create mode 100644 arch/unicore32/include/asm/mm-arch-hooks.h
+ create mode 100644 arch/x86/include/asm/mm-arch-hooks.h
+ create mode 100644 arch/xtensa/include/asm/mm-arch-hooks.h
+ delete mode 100644 include/linux/compiler-gcc3.h
+ delete mode 100644 include/linux/compiler-gcc4.h
+ delete mode 100644 include/linux/compiler-gcc5.h
+ create mode 100644 include/linux/crc64_ecma.h
+ create mode 100644 include/linux/mm-arch-hooks.h
+ create mode 100644 lib/crc64_ecma.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: arch/unicore32/kernel/fpu-ucf64.c: remove unnecessary KERN_ERR
+Applying: printk: improve the description of /dev/kmsg line format
+Applying: include/linux/sched.h: fix a misaligned load inside ptrace_attach()
+Applying: include/linux/wait.h: change wait_on_bit*() to take an unsigned long*, not a void*
+Applying: include/linux/sched.h: change all uses of JOBCTL_* from int to long
+Applying: drivers/w1/w1_int.c: call put_device if device_register fails
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + c5ce14b22482...650c607ebdbe akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (650c607ebdbe drivers/w1/w1_int.c: call put_device if device_register fails)
+$ git merge --no-ff akpm/master
+Merge made by the 'recursive' strategy.
+ arch/unicore32/kernel/fpu-ucf64.c | 4 ++--
+ drivers/w1/w1_int.c | 3 +--
+ include/linux/sched.h | 20 ++++++++++----------
+ include/linux/wait.h | 17 ++++++++++-------
+ kernel/printk/printk.c | 8 ++++----
+ kernel/signal.c | 6 +++---
+ 6 files changed, 30 insertions(+), 28 deletions(-)
diff --git a/Next/quilt-import.log b/Next/quilt-import.log
new file mode 100644
index 0000000..6fd5257
--- /dev/null
+++ b/Next/quilt-import.log
@@ -0,0 +1,4 @@
+Importing jdelvare-hwmon based on 3.19-rc6
+Unchanged quilt series jdelvare-hwmon
+Importing dmi based on 4.1-rc1
+Unchanged quilt series dmi
diff --git a/localversion-next b/localversion-next
new file mode 100644
index 0000000..02c5d58
--- /dev/null
+++ b/localversion-next
@@ -0,0 +1 @@
+-next-20150507
