Add linux-next specific files for 20150112
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 0000000..7030f60
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,236 @@
+Name SHA1
+---- ----
+origin eaa27f34e91a14cdceed26ed6c6793ec1d186115
+fixes b94d525e58dc9638dd3f98094cb468bcfb262039
+kbuild-current a16c5f99a28c9945165c46da27fff8e6f26f8736
+arc-current 2ce7598c9a453e0acd0e07be7be3f5eb39608ebd
+arm-current 1e3479225acbb7ae048ac30fb7c6090fa7f0df02
+m68k-current f27bd5bfeda5881ce283aa06408c8fa99fb950fa
+metag-fixes ffe6902b66aaa4ca6694bc19639259c16d84ddb1
+mips-fixes 1795cd9b3a91d4b5473c97f491d63892442212ab
+powerpc-merge 31345e1a071e4e5f2fa8b6be5ca7d1cbce20cfca
+powerpc-merge-mpe 1be6f10f6f9caade3a053938cb80a2eed237e262
+sparc 66d0f7ec9f1038452178b1993fc07fd96d30fd38
+net 0c8185944a125621a1766615585238a3563ccac3
+ipsec f855691975bb06373a98711e4cfe2c224244b536
+sound-current 92cb46584e104e2f4b14a44959109ffe13524a26
+pci-current 97bf6af1f928216fd6c5a66e8a57bfa95a659672
+wireless-drivers c702674f99e612a22cf6e8f9b4bec341257970c0
+driver-core.current 72392ed0eb6fde96826cb9d66bd4f50a7ba61450
+tty.current 31ec77aca72ee5920ed3ec3d047734dc0bc43342
+usb.current 9c9d82492b73991e8e13a6c0af06e44816c31438
+usb-gadget-fixes 5fb694f96e7c19e66b1c55124b98812e32e3efa5
+usb-serial-fixes 32a4bf2e81ec378e5925d4e069e0677a6c86a6ad
+staging.current 8ecb55b849b74dff026681b41266970072b207dd
+char-misc.current 7b7c54914f73966976893747ee8e2ca58166a627
+input-current 9333caeaeae4f831054e0e127a6ed3948b604d3e
+md-current d47648fcf0611812286f68131b40251c6fa54f5e
+crypto-current 0b8c960cf6defc56b3aa1a71b5af95872b6dff2b
+ide f96fe225677b3efb74346ebd56fafe3997b02afa
+dwmw2 5950f0803ca9d396ab79b7fe6789351f96e1d8d5
+devicetree-current 094cb98179f19b75acf9ff471daabf3948ce98e6
+rr-fixes 574732c73d155320f9358d9ee5d84beb0f4ecee2
+vfio-fixes 7c2e211f3c95b91912a92a8c6736343690042e2e
+kselftest-fixes f5db310d77ef1742e40bfc303b8625584c55f9e3
+drm-intel-fixes e3e6efcd638d3caa18d9e89f235c7d6fc32c1f0b
+asm-generic cb61f6769b8836081940ba26249f1b756400c7df
+arc 5840adceb9628adbafe428d3ac76b6fc09dffd00
+arm 1e3479225acbb7ae048ac30fb7c6090fa7f0df02
+arm-perf 97bf6af1f928216fd6c5a66e8a57bfa95a659672
+arm-soc eec9908b4c8e25eccb650f72923d60560439482f
+bcm2835 b2776bf7149bddd1f4161f14f79520f17fc1d71d
+berlin 8553bf8fd181df974bc4e028c9f880a62829783e
+cortex-m e799b6f37e6ccd7b97e3e2df62a30f1c5b211290
+ep93xx bfb0709fd17b13498d99592bbe12c91130e35a55
+imx-mxs bc8127e027df7a27efb2a9dccfa6073b1388067d
+ixp4xx 19f949f52599ba7c3f67a5897ac6be14bfcb1200
+keystone b17275a4a6cc61e0b7da40558ff5c7250fb80917
+msm 81cf1e061d001fab44dbaa85fc4fbfb6da6713a1
+mvebu 82e1ad0bcd248e32691da56147e5672dcbc97dfb
+omap c99e7d84d810ffdad6f305828681fd4e2fe05d0c
+omap-pending 99d076b747455449b2eec9e37f3fb0bfdf51af32
+renesas 57816675569d201616fa48f94c7ccf8b4a0f064b
+samsung 4ac72232f810a0b04b1c3c39e14e915d248f9b02
+sunxi 1363ad23197bd38e0e2c75a6b9a95854346da815
+tegra 4fd40ac7148059c1f7eda5d2578b3d1b51d229c5
+arm64 fb59d007a0e44e2304e4fc8cf5c20b6fda7890f3
+blackfin 275f5a8573e7832d0cf344a1b29da357c7038870
+c6x ae72758f1dd93bd367dc7719702f24a9bfb3bad9
+cris 21bd887cd7c485214bbdbf6a52ce9a74ac85c844
+hexagon 8914d7e857807e1e60975000cba3750c9b2643e8
+ia64 0fd2468fd035039c7493d28b60664ab7276f5005
+m68k 2e874d178c9e8cb048bfc1075ec0e93582c0e124
+m68knommu 9ebaf8bb9107c5ac17dd88f9bc5583df6cfed48e
+metag f93125ae17d1d259b5aba84016db260903822194
+microblaze 132d5dfc04698e4226ca9787214bd4e277ed39f2
+mips a682437a894dc879cd06bb11b556759a5557df98
+nios2 1b0f44923e186b2f9383b3260f6b5fbfc77b9e4a
+openrisc 548dafe880ad84d0accc0a5596c26e3348b103e1
+parisc 6c700d71f7faecb540b3fa4303edb5323a2768c1
+parisc-hd b2776bf7149bddd1f4161f14f79520f17fc1d71d
+powerpc d557b09800dab5dd6804e5b79324069abcf0be11
+powerpc-mpe 9a4fc4eaf111ca960c9f524b850598e9dbc9697f
+fsl 76f3e2929bb6b476fb02b519ad953e2e29ee7bd5
+mpc5xxx 9e813308a5c18c58f9ccae1ec72ed4e14eaf9025
+s390 d97d929f06d0e072cd36fba6bd9d25b29bae34fd
+sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc
+tile c47b15c4928c46b889a1ea2e9b54f4110514e1c3
+uml 989e59fa41c5464ab77bf0bf82f32f721430544e
+unicore32 d670878e2c9adb86b37e42b0937b2d4825bd2b39
+xtensa 1f2fdbd0078cb2ad4251768e8c0e0bb652a2cbd6
+btrfs 1edb647bb95439d90c0017e9ca23c4ecf00a0409
+ceph 388cfdc9bc19cc189b86770dba55910018e8e0fc
+cifs 0891605dd763cfbd61cf83b94dd690e994dc77ad
+configfs b930c26416c4ea6855726fd977145ccea9afbdda
+ecryptfs 942080643bce061c3dd9d5718d3b745dcb39a8bc
+ext3 e4a93be6cb281fb3dbbd41b22aee02cb0e551ba8
+ext4 4033d19d28ab5c7ab0311349e840eca4b96f307b
+f2fs ebb0d36e21a01fa9e26b049cd9e176e21c9db2a9
+fscache 1a8ed18fb7db48c916c2ccd484e04bd4dd737834
+fuse 9759bd51899458af4f4bcc11046f01285642ca10
+gfs2 8f6cb409f016e52b753a93e393622770556d1ab9
+jfs e1f1fe798d2f2eab904624125ba924d08205f960
+logfs 339466142b3f58fe0ee4dea7e8c5f3d33099e89c
+nfs 4e379d36c050b0117b5d10048be63a44f5036115
+nfsd 0ec016e3e02fe07e7250b87daffab611f219e7f1
+omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84
+overlayfs 4330397e4e8a662f36d101659e2a59ce32e76ff4
+squashfs 62421645bb702c077ee5a462815525106cb53bcf
+v9fs f15844e0777fec936f87a87f97394f83911dacd3
+ubifs f38aed975c0c3645bbdfc5ebe35726e64caaf588
+xfs ad7df6e858efe516e5f0d85832140307e8bb2966
+file-locks 50b80aaa6589f08ba5e8fc5db173e4882ed39944
+vfs 88174fd2c8fbf06e06ccbc008e8e7e0947aa974f
+pci 75f30c3d9949aab82d5d63bc9b32665cb2e5df7c
+hid c27320a55b83c71f4833e70ac99427cd7cc56e8f
+i2c 523c5b89640e147abc7c70466f55327df8559d0a
+jdelvare-hwmon ae530d4403e9a22363c275a82b46ecd95f939a04
+hwmon-staging c2681f7fc9eeb702b52ba9ed22f1926a046f899d
+v4l-dvb 2ea3258b238cc194173fe4ed000c87f47267bada
+kbuild 5ea04a1a086061adf3c1d6096d27da9506cff21d
+kconfig 95edca5c523c4b404dd60baa0a1bea0e4c38fd72
+libata ca7cb20937151e7d6bc4211f902cb9f987918861
+pm 794c3a0a9380d46cebff14b0d9b409ecb7687480
+idle f7c0e22f2d14b9ad8400ee17061822e33c1d5e2f
+apm 53675abbd1e54a30e621a9744bf9cce0712ddd6c
+cpupowerutils f16603386b38c28979f4df1cafdc2fe73fa87d37
+thermal 783f0e5a024e23b754f6a138fbc1026d3638c6e3
+thermal-soc 9477e18dd5d6c575ed972d81b7d9d6ff8a83746b
+ieee1394 d737d7da8e7e931360282199341f44ac0803c837
+dlm 2ab4bd8ea3a6954bc79a9bbeb291cd6c2d6213a7
+swiotlb 8e0629c1d4ce86ce7d98ca8756f42769bb17a3c8
+slave-dma 3e8ec65e62df9ea72d23043723b78f0e0fcbc190
+net-next fb57720daf6e56ba453414b5e8dd9cb3c0c80257
+ipsec-next fbe68ee87522f6eaa10f9076c0a7117e1613f2f7
+wireless-drivers-next 350b193ebd50f6c70ba4a82541300cf236c904d8
+bluetooth bc6efeeeb5a2fa968532b9d666e8b7f823b1940f
+infiniband a7cfef21e3d066343bec14d3113a9f9c92d1c2a8
+mtd 97bf6af1f928216fd6c5a66e8a57bfa95a659672
+l2-mtd 6958024ad5cdd78deae4da47a8722b06317dff45
+crypto 8155330aad477c5b1337895a6922df76817f0874
+drm adc31849b27fefeca6c225d3895143a2ec6970fa
+drm-panel 54cbc4e298ea68035618b46894aed1e439121e56
+drm-intel 985850bd145655d10dfcd5a03a3fc38540794ca7
+drm-tegra 7e0180e3570cc791e95e6b6cd5fbeb0aedc62776
+drm-misc b710d754bd4f80be922c40d8c1231d20f8e55e09
+sound 12c243b833c2c441f46dc592ab410fdccb5e056b
+sound-asoc 41debc82537aee13a4b027a148a33998400e852c
+modules 97bf6af1f928216fd6c5a66e8a57bfa95a659672
+virtio 97bf6af1f928216fd6c5a66e8a57bfa95a659672
+input f17effbe891624fe1ec2dcfa68625ed1c98ebe3a
+input-mt 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52
+block 177ccd2f8f3976b2a591988dfc9bc5327f169ec0
+device-mapper af66c8489d6dc69a356897b3b85c1e9a8480184f
+embedded 4744b43431e8613f920c5cba88346756f53c5165
+firmware 6e03a201bbe8137487f340d26aa662110e324b20
+pcmcia 80af9e6d7ae633309cc5bca96aee6a45117e7c98
+mmc 11bc9381b277a65ea4b3fe994e658f4a78512139
+mmc-uh 60000f69a57afd19140220958add8ecfb3711964
+kgdb c7d9ebf81c456dc185c8eae9e293bfdccf2a65f5
+uclinux 6dbe51c251a327e012439c4772097a13df43c5b8
+md f851b60db0fd83a10034c5cc9d9e58c758457b1c
+mfd a3b63979f8a32af9e975a793fd0f612d42072740
+backlight 3d6969a641d01cc9b6aa199a6f01eb1802522baf
+battery 02088e3ed79f0639d71caeb3dd49d42f88746c88
+fbdev 718b90ac4c21c81f42b6db062ca0867f3cac7648
+viafb 838ac785d521e091bd8b5f6a2b545166f5f32b77
+omap_dss2 574d54112fdac339627939ca94851a09f0fe0cfa
+regulator 2de4cd54a7a1dd8229233dba38715aacc4538981
+security b2d1965dcea148100ffc4e7199470bf5fad13871
+integrity 63a0eb7891bdf3ef32ecb6b01eb09106df646c10
+selinux 566075875a84e90e262ecab5996719a09d822fc4
+lblnet d8ec26d7f8287f5788a494f56e8814210f0e64be
+watchdog e0c3e00f40456259441dbec519f9790edc1f5f30
+iommu 2c0ee8b85aae427fa8432788ddf05c8a87510657
+dwmw2-iommu 1860e379875dfe7271c649058aeddffe5afd9d0d
+vfio 5e9f36c59a4883c6d8db4a3c097e4fc2234742de
+osd 1fa3a002b2546c42c343c77c144871285896ced5
+jc_docs 174236285cf849f85a31b3da875c2e939d7cdb15
+trivial 231821d4c3fa72de8fd9981e608323529ac9ad70
+audit 0f7e94ee40d06f7a04e039392dfee8244bd8a7e0
+fsnotify 1ca39ab9d21ac93f94b9e3eb364ea9a5cf2aba06
+devicetree c46ca3c8310b61d253a39ff1375ea97912794cd1
+dt-rh a0e27f51ba8a04125c22a95c4d3e98297a7191de
+mailbox 9f3e3cacb2ffdefe28c7cf490bf543e4dcb2770a
+spi 52052f9b7ea1bedaded393f1b04216cf9c8b884f
+tip caa523dc22421c0dfa283da019782c69b7e6f77b
+clockevents b0ad5917960ca80f96baeb427ec64a12c57f0c36
+edac fec53af531dd040e41fe358abe00b33747af2688
+edac-amd ae9b56e3996dadbb59c727018f45486c06844261
+irqchip 91d1179212161f220938198b742c328ad38fd0a3
+tiny f114040e3ea6e07372334ade75d1ee0775c355e1
+ftrace d716ff71dd12bc6328f84a9ec1c3647daf01c827
+rcu 7de789ec4f915766048119ee5d36c0b23408c15d
+uprobes 0326f5a94ddea33fa331b2519f4172f4fb387baa
+kvm bab5bb398273bb37547a185f7b344b37c700d0b9
+kvm-arm bab5bb398273bb37547a185f7b344b37c700d0b9
+kvm-ppc 2c4aa55a6af070262cca425745e8e54310e96b8d
+oprofile 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae
+fw-nohz 74876a98a87a115254b3a66a14b27320b7f0acaa
+xen-tip 2e917175e1ef147a527a9158b9f09773ec94c0bd
+percpu 4c907baf36d8339f393bb576d0bab29194d0e6ad
+workqueues 9da7dae94fb8adab5cc5f395640e30736a66e910
+drivers-x86 200db647112d9a0f1dce273604f949f916bd2426
+chrome-platform 5502486a2077e4280c618b82e8a77ed35932956f
+sysctl 4e474a00d7ff746ed177ddae14fa8b2d4bad7a00
+regmap 270ded427d7b70972e492501d64ad42e09da5ea5
+hsi 67e9a2ce6e070b1e5db2dfe9c61890fc30ae954d
+leds 7f95adda052d5b1726b4fda1cd952f3a6f24c8ec
+ipmi 1421c935df159c8b893e82dd81b329b8977c4e86
+driver-core b7392d2247cfe6771f95d256374f1a8e6a6f48d6
+tty b7392d2247cfe6771f95d256374f1a8e6a6f48d6
+usb b7392d2247cfe6771f95d256374f1a8e6a6f48d6
+usb-gadget b1940cd21c0f4abdce101253e860feff547291b0
+usb-serial b7392d2247cfe6771f95d256374f1a8e6a6f48d6
+staging b7392d2247cfe6771f95d256374f1a8e6a6f48d6
+char-misc b7392d2247cfe6771f95d256374f1a8e6a6f48d6
+cgroup f3ba53802eff25e3eedb60d7afe5262710e20bd5
+scsi 0000709efc6647beccf841615e5c485757edb929
+target-updates 97bf6af1f928216fd6c5a66e8a57bfa95a659672
+target-merge b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed
+writeback f9b0e058cbd04ada76b13afffa7e1df830543c24
+hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad
+pinctrl fce7fcc785998d91a4e2293ec6c0fa7a4677999b
+vhost c6c856d33dda47ba2535cafd35f9e4764f005231
+remoteproc 9a3c4145af32125c5ee39c0272662b47307a8323
+rpmsg b1b9891441fa33fd0d49b5cb3aa7f04bca1cc1db
+gpio 9c5e7b941de17973a02bad757f1b9999644d1f03
+dma-mapping dda02fd6278d9e995850b3c1dba484f17cbe4de4
+pwm 39e046f2c1dd0742976d7ee6e464744cf2122f41
+dma-buf 101e31050bf174e5bcca72bdb9d0bd392aa4f966
+userns db86da7cb76f797a1a8b445166a15cb922c6ff85
+ktest 17150fef4ab1f48d838008657cdaa168453a9fa6
+signal 20b4fb485227404329e41ad15588afad3df23050
+clk f1e9203e2366164b832d8a6ce10134de8c575178
+random 7185ad2672a7d50bc384de0e38d90b75d99f3d82
+lzo-update 42b775abafafdf811ef300e869a4e1480ef1cf95
+aio 5f785de588735306ec4d7c875caf9d28481c8b21
+llvmlinux 25d4aee23af28a6ef04d70a1028c012665384df1
+documentation 0415447aa3b4decc2c05dfc45a0aa34a5eb4fc54
+kselftest 97bf6af1f928216fd6c5a66e8a57bfa95a659672
+y2038 45446a99cef65aba81c0e59279f100bdb5624acd
+luto-misc d4812e169de44f4ab53ff671c6193c67de24da62
+access_once 29bde09065b72cbf92a7a696b79b0776745829d2
+livepatching 99590ba565a22c9f58f7528a94881d0455eef018
+akpm-current 1d9e76e2eb3f743709e3500fad0c456d05b3aea2
+akpm 415f7f4d10bfb6bcf03fcacfcb6b78bfc012de04
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 0000000..836950f
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,238 @@
+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 git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge
+powerpc-merge-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.git#fixes
+sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master
+net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master
+ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master
+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
+md-current git git://neil.brown.name/md#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
+dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.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
+bcm2835 git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-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
+ep93xx git git://github.com/RyanMallon/linux-ep93xx.git#ep93xx-for-next
+imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next
+ixp4xx git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux.git#next
+keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next
+msm git git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git#for-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
+openrisc git git://openrisc.net/jonas/linux#for-upstream
+parisc git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git#for-next
+parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next
+powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next
+powerpc-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.git#next
+fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next
+mpc5xxx git git://git.denx.de/linux-denx-agust.git#next
+s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features
+sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master
+tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master
+uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#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
+configfs git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git#linux-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/steve/gfs2-3.0-nmw.git#master
+jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next
+logfs git git://github.com/prasad-joshi/logfs_upstream.git#master
+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
+omfs git git://github.com/bcopeland/omfs.git#for-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-3/jdelvare-hwmon/
+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
+cpupowerutils git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils.git#master
+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/core-stuff
+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
+virtio git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#virtio-next
+input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next
+input-mt git git://github.com/rydberg/linux.git#for-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
+embedded git git://git.infradead.org/embedded-2.6.git#master
+firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master
+pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git#master
+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
+uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-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
+fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/plagnioj/linux-fbdev.git#for-next
+viafb git git://github.com/schandinat/linux-2.6.git#viafb-next
+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
+fsnotify git git://git.infradead.org/users/eparis/notify.git#for-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
+uprobes git git://github.com/srikard/linux.git#for-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
+oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next
+fw-nohz git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git#nohz/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
+sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl.git#master
+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
+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
+writeback git git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux.git#writeback-for-next
+hwspinlock git git://github.com/ohadbc/hwspinlock-next.git#linux-next
+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
+signal git git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal.git#for-next
+clk git git://git.linaro.org/people/mturquette/linux.git#clk-next
+random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev
+lzo-update git git://github.com/markus-oberhumer/linux.git#lzo-update
+aio git git://git.kvack.org/~bcrl/aio-next.git#master
+llvmlinux git git://git.linuxfoundation.org/llvmlinux/kernel.git#for-next
+documentation git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/doc.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
+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..66b4a3e
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,3758 @@
+$ date
+Monday 12 January 10:34:48 AEDT 2015
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at 11c8f01b423b Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
+Merging origin/master (eaa27f34e91a linux 3.19-rc4)
+$ git merge origin/master
+Updating 11c8f01b423b..eaa27f34e91a
+Fast-forward
+ .mailmap | 1 +
+ MAINTAINERS | 13 +-
+ Makefile | 2 +-
+ arch/arm/include/uapi/asm/unistd.h | 1 +
+ arch/arm/kernel/calls.S | 1 +
+ arch/arm/kernel/perf_regs.c | 8 +
+ arch/arm/mm/dump.c | 9 +-
+ arch/arm/mm/init.c | 4 +-
+ arch/arm/mm/mmu.c | 4 +-
+ arch/arm64/include/asm/arch_timer.h | 1 +
+ arch/arm64/include/asm/cpu.h | 5 +
+ arch/arm64/include/asm/processor.h | 4 +-
+ arch/arm64/include/asm/unistd.h | 2 +-
+ arch/arm64/kernel/cpuinfo.c | 10 +
+ arch/arm64/kernel/efi.c | 2 +-
+ arch/arm64/kernel/module.c | 1 +
+ arch/arm64/kernel/perf_regs.c | 8 +
+ arch/arm64/kernel/setup.c | 1 +
+ arch/arm64/kernel/smp_spin_table.c | 1 +
+ arch/blackfin/mach-bf533/boards/stamp.c | 1 +
+ arch/x86/boot/Makefile | 1 +
+ arch/x86/include/asm/vgtod.h | 6 +-
+ arch/x86/kernel/cpu/Makefile | 1 +
+ arch/x86/kernel/cpu/mkcapflags.sh | 2 +-
+ arch/x86/kernel/cpu/perf_event_intel_uncore.h | 2 +-
+ .../x86/kernel/cpu/perf_event_intel_uncore_snbep.c | 17 ++
+ arch/x86/kernel/perf_regs.c | 90 ++++++
+ arch/x86/lib/insn.c | 2 +-
+ arch/x86/mm/init.c | 37 ++-
+ arch/x86/vdso/vma.c | 45 +--
+ drivers/Makefile | 6 +-
+ drivers/gpu/drm/Makefile | 2 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 316 +++++++++++----------
+ .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 28 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 2 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_pasid.c | 2 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 18 ++
+ drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 2 +-
+ drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 2 +-
+ drivers/gpu/drm/i915/i915_drv.h | 2 -
+ drivers/gpu/drm/i915/i915_gem.c | 8 +-
+ drivers/gpu/drm/i915/i915_irq.c | 6 +-
+ drivers/gpu/drm/i915/intel_display.c | 8 +-
+ drivers/gpu/drm/i915/intel_runtime_pm.c | 27 --
+ drivers/gpu/drm/nouveau/core/core/event.c | 4 +-
+ drivers/gpu/drm/nouveau/core/core/notify.c | 2 +-
+ drivers/gpu/drm/nouveau/core/engine/device/nve0.c | 33 +++
+ .../gpu/drm/nouveau/core/subdev/bios/shadowramin.c | 6 +-
+ drivers/gpu/drm/nouveau/core/subdev/fb/ramnvaa.c | 65 ++++-
+ drivers/gpu/drm/nouveau/core/subdev/mc/nv4c.c | 8 -
+ drivers/gpu/drm/nouveau/nouveau_bo.c | 4 +-
+ drivers/gpu/drm/nouveau/nouveau_gem.c | 35 ++-
+ drivers/gpu/drm/radeon/atombios_crtc.c | 8 +-
+ drivers/gpu/drm/radeon/atombios_dp.c | 4 +
+ drivers/gpu/drm/radeon/cikd.h | 2 +
+ drivers/gpu/drm/radeon/dce3_1_afmt.c | 2 +-
+ drivers/gpu/drm/radeon/kv_dpm.c | 10 +-
+ drivers/gpu/drm/radeon/radeon_kfd.c | 23 +-
+ drivers/gpu/drm/radeon/radeon_state.c | 2 +-
+ drivers/hid/Kconfig | 3 +-
+ drivers/hid/hid-core.c | 1 +
+ drivers/hid/hid-ids.h | 1 +
+ drivers/hid/hid-input.c | 3 +
+ drivers/hid/hid-kye.c | 4 +
+ drivers/hid/hid-logitech-dj.c | 16 +-
+ drivers/hid/hid-logitech-hidpp.c | 41 +++
+ drivers/hid/hid-roccat-pyra.c | 8 +-
+ drivers/hid/i2c-hid/i2c-hid.c | 5 -
+ drivers/hid/usbhid/hid-quirks.c | 1 +
+ drivers/scsi/qla2xxx/qla_os.c | 4 +-
+ drivers/vfio/pci/vfio_pci.c | 4 +-
+ fs/btrfs/backref.c | 13 +-
+ fs/btrfs/delayed-inode.c | 8 +
+ fs/btrfs/extent-tree.c | 12 +-
+ fs/btrfs/inode.c | 4 +-
+ fs/btrfs/scrub.c | 2 +-
+ fs/ceph/addr.c | 2 +-
+ fs/fcntl.c | 5 +-
+ fs/nfsd/nfs4state.c | 2 +-
+ fs/notify/fanotify/fanotify_user.c | 10 +-
+ fs/ocfs2/dlm/dlmrecovery.c | 5 +-
+ fs/ocfs2/namei.c | 43 ++-
+ include/linux/ceph/osd_client.h | 4 +-
+ include/linux/fs.h | 2 +-
+ include/linux/kdb.h | 62 +++-
+ include/linux/perf_event.h | 12 +-
+ include/linux/perf_regs.h | 16 ++
+ include/linux/rmap.h | 10 +
+ include/linux/writeback.h | 1 -
+ include/uapi/asm-generic/fcntl.h | 2 +-
+ include/uapi/linux/kfd_ioctl.h | 37 ++-
+ kernel/debug/debug_core.c | 52 ++--
+ kernel/debug/kdb/kdb_bp.c | 37 ++-
+ kernel/debug/kdb/kdb_debugger.c | 4 +
+ kernel/debug/kdb/kdb_main.c | 267 ++++++++++-------
+ kernel/debug/kdb/kdb_private.h | 3 +-
+ kernel/events/core.c | 19 +-
+ kernel/exit.c | 12 +-
+ kernel/locking/mutex-debug.c | 2 +-
+ kernel/sched/core.c | 13 +-
+ kernel/sched/deadline.c | 25 +-
+ kernel/sched/fair.c | 6 +-
+ kernel/trace/trace_kdb.c | 4 +-
+ lib/Kconfig.kgdb | 25 ++
+ mm/Kconfig.debug | 9 -
+ mm/memcontrol.c | 17 +-
+ mm/memory.c | 27 +-
+ mm/mmap.c | 13 +-
+ mm/page-writeback.c | 43 +--
+ mm/rmap.c | 42 ++-
+ mm/vmscan.c | 24 +-
+ net/ceph/auth_x.c | 2 +-
+ net/ceph/mon_client.c | 2 +-
+ net/sunrpc/xdr.c | 6 +-
+ sound/firewire/fireworks/fireworks_transaction.c | 2 +-
+ sound/pci/hda/patch_hdmi.c | 2 +
+ sound/pci/hda/patch_sigmatel.c | 4 +-
+ sound/usb/caiaq/audio.c | 2 +-
+ tools/lib/lockdep/preload.c | 4 +-
+ tools/perf/builtin-annotate.c | 2 +-
+ tools/perf/builtin-diff.c | 46 ++-
+ tools/perf/builtin-list.c | 13 +-
+ tools/perf/builtin-report.c | 24 +-
+ tools/perf/builtin-top.c | 4 +-
+ tools/perf/tests/hists_cumulate.c | 66 ++---
+ tools/perf/tests/hists_filter.c | 2 +-
+ tools/perf/tests/hists_output.c | 10 +-
+ tools/perf/ui/browsers/hists.c | 2 +-
+ tools/perf/ui/hist.c | 3 +
+ tools/perf/ui/tui/setup.c | 26 +-
+ tools/perf/util/callchain.c | 30 ++
+ tools/perf/util/callchain.h | 2 +
+ tools/perf/util/hist.c | 18 +-
+ tools/perf/util/hist.h | 2 +-
+ tools/perf/util/probe-event.c | 6 +-
+ tools/perf/util/probe-finder.c | 18 +-
+ 136 files changed, 1482 insertions(+), 722 deletions(-)
+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 (a16c5f99a28c kbuild: Fix removal of the debian/ directory)
+$ git merge kbuild-current/rc-fixes
+Already up-to-date.
+Merging arc-current/for-curr (2ce7598c9a45 Linux 3.17-rc4)
+$ git merge arc-current/for-curr
+Already up-to-date.
+Merging arm-current/fixes (1e3479225acb ARM: 8275/1: mm: fix PMD_SECT_RDONLY undeclared compile error)
+$ git merge arm-current/fixes
+Already up-to-date.
+Merging m68k-current/for-linus (f27bd5bfeda5 m68k: Wire up execveat)
+$ git merge m68k-current/for-linus
+Merge made by the 'recursive' strategy.
+ arch/m68k/include/asm/unistd.h | 2 +-
+ arch/m68k/include/uapi/asm/unistd.h | 1 +
+ arch/m68k/kernel/syscalltable.S | 1 +
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX)
+$ 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/merge (31345e1a071e powerpc/pci: Remove unused force_32bit_msi quirk)
+$ git merge powerpc-merge/merge
+Already up-to-date.
+Merging powerpc-merge-mpe/fixes (1be6f10f6f9c Revert "powerpc: Secondary CPUs must set cpu_callin_map after setting active and online")
+$ git merge powerpc-merge-mpe/fixes
+Already up-to-date.
+Merging sparc/master (66d0f7ec9f10 sparc32: destroy_context() and switch_mm() needs to disable interrupts.)
+$ git merge sparc/master
+Already up-to-date.
+Merging net/master (0c8185944a12 net: fec: fix NULL pointer dereference in fec_enet_timeout_work)
+$ git merge net/master
+Merge made by the 'recursive' strategy.
+ drivers/net/ethernet/freescale/fec_main.c | 1 +
+ drivers/net/ethernet/intel/i40e/i40e_txrx.c | 104 +++++++++++++++++++---------
+ drivers/net/ethernet/intel/i40e/i40e_txrx.h | 1 +
+ drivers/net/ethernet/renesas/sh_eth.c | 9 ++-
+ drivers/net/ethernet/renesas/sh_eth.h | 5 ++
+ 5 files changed, 87 insertions(+), 33 deletions(-)
+Merging ipsec/master (f855691975bb xfrm6: Fix the nexthdr offset in _decode_session6.)
+$ git merge ipsec/master
+Merge made by the 'recursive' strategy.
+ net/ipv6/xfrm6_policy.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+Merging sound-current/for-linus (92cb46584e10 ALSA: fireworks: fix an endianness bug for transaction length)
+$ git merge sound-current/for-linus
+Already up-to-date.
+Merging pci-current/for-linus (97bf6af1f928 Linux 3.19-rc1)
+$ git merge pci-current/for-linus
+Already up-to-date.
+Merging wireless-drivers/master (c702674f99e6 Merge tag 'iwlwifi-for-kalle-2015-01-05' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
+$ git merge wireless-drivers/master
+Merge made by the 'recursive' strategy.
+ drivers/net/wireless/iwlwifi/iwl-7000.c | 6 ++---
+ drivers/net/wireless/iwlwifi/iwl-8000.c | 2 +-
+ drivers/net/wireless/iwlwifi/iwl-fw-file.h | 4 ++++
+ drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 2 ++
+ drivers/net/wireless/iwlwifi/mvm/scan.c | 19 +++++++++++----
+ drivers/net/wireless/iwlwifi/mvm/tx.c | 8 +++++--
+ drivers/net/wireless/iwlwifi/mvm/utils.c | 2 +-
+ drivers/net/wireless/iwlwifi/pcie/drv.c | 4 +++-
+ drivers/net/wireless/rtlwifi/pci.c | 32 +++++++++++++++++++-------
+ 9 files changed, 58 insertions(+), 21 deletions(-)
+Merging driver-core.current/driver-core-linus (72392ed0eb6f kernfs: Fix kernfs_name_compare)
+$ git merge driver-core.current/driver-core-linus
+Merge made by the 'recursive' strategy.
+ fs/kernfs/dir.c | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+Merging tty.current/tty-linus (31ec77aca72e serial: samsung: Add the support for Exynos5433 SoC)
+$ git merge tty.current/tty-linus
+Merge made by the 'recursive' strategy.
+ drivers/tty/n_tty.c | 9 ++----
+ drivers/tty/serial/8250/8250_pci.c | 29 ++++++++++++++++++--
+ drivers/tty/serial/samsung.c | 56 ++++++++++++++++++++++++--------------
+ drivers/tty/serial/serial_core.c | 4 ++-
+ drivers/tty/tty_io.c | 7 ++---
+ 5 files changed, 70 insertions(+), 35 deletions(-)
+Merging usb.current/usb-linus (9c9d82492b73 usb: phy: Fix deferred probing)
+$ git merge usb.current/usb-linus
+Merge made by the 'recursive' strategy.
+ drivers/phy/phy-miphy28lp.c | 3 ++-
+ drivers/phy/phy-omap-control.c | 7 +++--
+ drivers/phy/phy-sun4i-usb.c | 3 ++-
+ drivers/phy/phy-ti-pipe3.c | 10 ++++---
+ drivers/usb/chipidea/core.c | 2 +-
+ drivers/usb/chipidea/host.c | 1 +
+ drivers/usb/dwc2/gadget.c | 10 ++++---
+ drivers/usb/dwc3/dwc3-pci.c | 4 +++
+ drivers/usb/gadget/function/f_hid.c | 5 ++--
+ drivers/usb/gadget/function/f_midi.c | 2 +-
+ drivers/usb/gadget/function/f_uac1.c | 2 +-
+ drivers/usb/gadget/legacy/inode.c | 1 +
+ drivers/usb/gadget/udc/atmel_usba_udc.c | 7 +++--
+ drivers/usb/gadget/udc/bdc/bdc_ep.c | 3 ++-
+ drivers/usb/host/ehci-sched.c | 14 +++++-----
+ drivers/usb/host/ehci-tegra.c | 2 +-
+ drivers/usb/host/pci-quirks.c | 18 ++++++++++---
+ drivers/usb/host/xhci-pci.c | 2 ++
+ drivers/usb/host/xhci.c | 9 +++++++
+ drivers/usb/musb/Kconfig | 4 +++
+ drivers/usb/musb/blackfin.c | 2 +-
+ drivers/usb/musb/musb_cppi41.c | 4 +--
+ drivers/usb/musb/musb_debugfs.c | 34 ++++++++++++------------
+ drivers/usb/musb/musb_host.c | 1 -
+ drivers/usb/phy/phy.c | 6 ++---
+ drivers/usb/storage/uas-detect.h | 33 +++++++++++++++++++----
+ drivers/usb/storage/unusual_uas.h | 46 +++++++++++++++++++++++++++------
+ include/linux/phy/omap_control_phy.h | 6 ++---
+ 28 files changed, 168 insertions(+), 73 deletions(-)
+Merging usb-gadget-fixes/fixes (5fb694f96e7c usb: gadget: udc: atmel: fix possible oops when unloading module)
+$ git merge usb-gadget-fixes/fixes
+Recorded preimage for 'drivers/usb/phy/phy.c'
+Auto-merging drivers/usb/phy/phy.c
+CONFLICT (content): Merge conflict in drivers/usb/phy/phy.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/usb/phy/phy.c'.
+[master 93a42b9582d3] Merge remote-tracking branch 'usb-gadget-fixes/fixes'
+$ git diff -M --stat --summary HEAD^..
+ drivers/usb/gadget/legacy/inode.c | 1 +
+ drivers/usb/gadget/udc/atmel_usba_udc.c | 12 +++++++++++-
+ drivers/usb/phy/phy.c | 12 +++++++++---
+ 3 files changed, 21 insertions(+), 4 deletions(-)
+Merging usb-serial-fixes/usb-linus (32a4bf2e81ec USB: console: fix potential use after free)
+$ git merge usb-serial-fixes/usb-linus
+Merge made by the 'recursive' strategy.
+ drivers/usb/serial/console.c | 16 +++++++++++-----
+ drivers/usb/serial/cp210x.c | 4 +++-
+ drivers/usb/serial/keyspan.c | 20 +++++++++++++++-----
+ drivers/usb/serial/option.c | 11 ++++++++++-
+ drivers/usb/serial/qcserial.c | 1 -
+ 5 files changed, 39 insertions(+), 13 deletions(-)
+Merging staging.current/staging-linus (8ecb55b849b7 Merge tag 'iio-fixes-for-3.19a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
+$ git merge staging.current/staging-linus
+Merge made by the 'recursive' strategy.
+ drivers/iio/adc/ad799x.c | 15 +++++++++++++--
+ drivers/iio/inkern.c | 3 +++
+ 2 files changed, 16 insertions(+), 2 deletions(-)
+Merging char-misc.current/char-misc-linus (7b7c54914f73 mcb: mcb-pci: Only remap the 1st 0x200 bytes of BAR 0)
+$ git merge char-misc.current/char-misc-linus
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-class-mei | 15 +++++++++++++++
+ drivers/mcb/mcb-internal.h | 1 +
+ drivers/mcb/mcb-pci.c | 27 ++++++++++++++++++---------
+ drivers/misc/mei/hw-me.c | 12 ++++++++++++
+ 4 files changed, 46 insertions(+), 9 deletions(-)
+Merging input-current/for-linus (9333caeaeae4 Input: I8042 - add Acer Aspire 7738 to the nomux list)
+$ git merge input-current/for-linus
+Auto-merging drivers/input/serio/i8042.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ Documentation/kernel-parameters.txt | 1 +
+ MAINTAINERS | 1 -
+ drivers/input/mouse/elantech.c | 2 ++
+ drivers/input/serio/i8042-x86ia64io.h | 39 +++++++++++++++++++++++++++++++++++
+ drivers/input/serio/i8042.c | 14 +++++++++++++
+ 5 files changed, 56 insertions(+), 1 deletion(-)
+Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe)
+$ git merge md-current/for-linus
+Already up-to-date.
+Merging crypto-current/master (0b8c960cf6de crypto: sha-mb - Add avx2_supported check.)
+$ git merge crypto-current/master
+Already up-to-date.
+Merging ide/master (f96fe225677b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
+$ git merge ide/master
+Already up-to-date.
+Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff)
+$ git merge dwmw2/master
+Already up-to-date.
+Merging devicetree-current/devicetree/merge (094cb98179f1 of/fdt: memblock_reserve /memreserve/ regions in the case of partial overlap)
+$ git merge devicetree-current/devicetree/merge
+Already up-to-date.
+Merging rr-fixes/fixes (574732c73d15 param: initialize store function to NULL if not available.)
+$ git merge rr-fixes/fixes
+Merge made by the 'recursive' strategy.
+ kernel/params.c | 2 ++
+ 1 file changed, 2 insertions(+)
+Merging vfio-fixes/for-linus (7c2e211f3c95 vfio-pci: Fix the check on pci device type in vfio_pci_probe())
+$ git merge vfio-fixes/for-linus
+Already up-to-date.
+Merging kselftest-fixes/fixes (f5db310d77ef selftests/vm: fix link error for transhuge-stress test)
+$ git merge kselftest-fixes/fixes
+Merge made by the 'recursive' strategy.
+ tools/testing/selftests/exec/execveat.c | 19 +++++++++++++------
+ tools/testing/selftests/mqueue/mq_perf_tests.c | 3 +--
+ tools/testing/selftests/vm/Makefile | 2 +-
+ 3 files changed, 15 insertions(+), 9 deletions(-)
+Merging drm-intel-fixes/for-linux-next-fixes (e3e6efcd638d drm/i915: Fix mutex->owner inspection race under DEBUG_MUTEXES)
+$ git merge drm-intel-fixes/for-linux-next-fixes
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/i915/i915_gem.c | 2 +-
+ drivers/gpu/drm/i915/i915_irq.c | 20 ++++++++++++++++++--
+ drivers/gpu/drm/i915/intel_display.c | 2 +-
+ drivers/gpu/drm/i915/intel_drv.h | 1 +
+ drivers/gpu/drm/i915/intel_pm.c | 14 +++-----------
+ 5 files changed, 24 insertions(+), 15 deletions(-)
+Merging asm-generic/master (cb61f6769b88 ARM64: use GENERIC_PCI_IOMAP)
+$ git merge asm-generic/master
+Already up-to-date.
+Merging arc/for-next (5840adceb962 arc: Remove unused prepare_to_copy())
+$ git merge arc/for-next
+Merge made by the 'recursive' strategy.
+ arch/arc/include/asm/processor.h | 3 ---
+ arch/arc/kernel/entry.S | 14 +++++++++-----
+ arch/arc/kernel/setup.c | 7 ++++++-
+ arch/arc/kernel/smp.c | 2 +-
+ 4 files changed, 16 insertions(+), 10 deletions(-)
+Merging arm/for-next (1e3479225acb ARM: 8275/1: mm: fix PMD_SECT_RDONLY undeclared compile error)
+$ git merge arm/for-next
+Already up-to-date.
+Merging arm-perf/for-next/perf (97bf6af1f928 Linux 3.19-rc1)
+$ git merge arm-perf/for-next/perf
+Already up-to-date.
+Merging arm-soc/for-next (eec9908b4c8e Merge branch 'fixes' into for-next)
+$ git merge arm-soc/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 2 +
+ arch/arm/boot/dts/berlin2q.dtsi | 63 +++++++++++++++---------------
+ arch/arm/boot/dts/dra7-evm.dts | 10 ++---
+ arch/arm/boot/dts/imx25.dtsi | 2 +-
+ arch/arm/boot/dts/imx51-babbage.dts | 22 +++--------
+ arch/arm/boot/dts/imx6qdl.dtsi | 4 +-
+ arch/arm/boot/dts/ls1021a.dtsi | 1 +
+ arch/arm/boot/dts/omap3-n900.dts | 4 +-
+ arch/arm/boot/dts/rk3288-evb.dtsi | 30 ++++++++++++++
+ arch/arm/boot/dts/ste-nomadik-nhk15.dts | 8 ++--
+ arch/arm/configs/omap2plus_defconfig | 2 +-
+ arch/arm/mach-imx/clk-imx6q.c | 2 +-
+ arch/arm/mach-imx/clk-imx6sx.c | 3 ++
+ arch/arm/mach-omap2/board-generic.c | 18 +++++++++
+ arch/arm/mach-omap2/common.h | 1 +
+ arch/arm/mach-omap2/control.h | 4 ++
+ arch/arm/mach-omap2/omap-headsmp.S | 21 ++++++++++
+ arch/arm/mach-omap2/omap-smp.c | 13 +++++-
+ arch/arm/mach-omap2/timer.c | 44 ++++++++++++++++++---
+ drivers/leds/leds-netxbig.c | 12 +++---
+ 20 files changed, 187 insertions(+), 79 deletions(-)
+Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
+$ git merge bcm2835/for-next
+Already up-to-date.
+Merging berlin/berlin/for-next (8553bf8fd181 Merge branch 'berlin/dt' into berlin/for-next)
+$ git merge berlin/berlin/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/berlin2.dtsi | 2 +-
+ arch/arm/boot/dts/berlin2cd.dtsi | 7 ++++++-
+ arch/arm/boot/dts/berlin2q.dtsi | 10 +++++++++-
+ 3 files changed, 16 insertions(+), 3 deletions(-)
+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.
+ arch/arm/boot/compressed/head.S | 33 +++++++++++++++++++++++++++------
+ arch/arm/include/asm/unified.h | 8 ++++++++
+ 2 files changed, 35 insertions(+), 6 deletions(-)
+Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next)
+$ git merge ep93xx/ep93xx-for-next
+Merge made by the 'recursive' strategy.
+Merging imx-mxs/for-next (bc8127e027df Merge branch 'imx/defconfig' into for-next)
+$ git merge imx-mxs/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/fsl.txt | 12 +++
+ arch/arm/boot/dts/Makefile | 2 +
+ arch/arm/boot/dts/imx27-apf27dev.dts | 21 ++++
+ arch/arm/boot/dts/imx27.dtsi | 2 +-
+ arch/arm/boot/dts/imx28-evk.dts | 1 -
+ arch/arm/boot/dts/imx51-apf51dev.dts | 14 +++
+ arch/arm/boot/dts/imx53.dtsi | 11 +-
+ arch/arm/boot/dts/imx6dl-udoo.dts | 18 ++++
+ arch/arm/boot/dts/imx6dl.dtsi | 2 +-
+ arch/arm/boot/dts/imx6q-udoo.dts | 124 +---------------------
+ arch/arm/boot/dts/imx6q.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 33 ++++++
+ arch/arm/boot/dts/imx6qdl-udoo.dtsi | 134 +++++++++++++++++++++++
+ arch/arm/boot/dts/imx6qdl.dtsi | 5 +-
+ arch/arm/boot/dts/imx6sx-sabreauto.dts | 146 ++++++++++++++++++++++++++
+ arch/arm/boot/dts/imx6sx-sdb.dts | 39 +++++++
+ arch/arm/boot/dts/vf-colibri.dtsi | 1 +
+ arch/arm/boot/dts/vf500.dtsi | 9 ++
+ arch/arm/boot/dts/vfxxx.dtsi | 14 ++-
+ arch/arm/configs/imx_v6_v7_defconfig | 9 +-
+ arch/arm/mach-imx/Makefile | 3 +-
+ arch/arm/mach-imx/clk-gate2.c | 23 +++-
+ arch/arm/mach-imx/clk-pllv3.c | 10 +-
+ arch/arm/mach-imx/clk-vf610.c | 4 +-
+ arch/arm/mach-imx/clk.h | 1 +
+ arch/arm/mach-imx/common.h | 4 +
+ arch/arm/mach-imx/cpuidle-imx6sx.c | 105 ++++++++++++++++++
+ arch/arm/mach-imx/cpuidle.h | 5 +
+ arch/arm/mach-imx/gpc.c | 25 ++++-
+ arch/arm/mach-imx/mach-imx6sx.c | 2 +-
+ arch/arm/mach-imx/mach-vf610.c | 5 +-
+ arch/arm/mach-imx/pm-imx6.c | 7 +-
+ 32 files changed, 638 insertions(+), 155 deletions(-)
+ create mode 100644 arch/arm/boot/dts/imx6dl-udoo.dts
+ create mode 100644 arch/arm/boot/dts/imx6qdl-udoo.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6sx-sabreauto.dts
+ create mode 100644 arch/arm/mach-imx/cpuidle-imx6sx.c
+Merging ixp4xx/next (19f949f52599 Linux 3.8)
+$ git merge ixp4xx/next
+Already up-to-date.
+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 msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix)
+$ git merge msm/for-next
+Already up-to-date.
+Merging mvebu/for-next (82e1ad0bcd24 Merge branch 'mvebu/dt' into mvebu/for-next)
+$ git merge mvebu/for-next
+Auto-merging arch/arm/boot/dts/armada-388-rd.dts
+Auto-merging arch/arm/boot/dts/armada-388-db.dts
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/armada-38x.txt | 7 +
+ .../devicetree/bindings/bus/mvebu-mbus.txt | 4 +-
+ arch/arm/Kconfig.debug | 35 ++-
+ arch/arm/boot/dts/Makefile | 7 +-
+ arch/arm/boot/dts/armada-375.dtsi | 2 +-
+ arch/arm/boot/dts/armada-380.dtsi | 3 +-
+ arch/arm/boot/dts/armada-385-db-ap.dts | 178 +++++++++++++
+ arch/arm/boot/dts/armada-385.dtsi | 3 +-
+ .../dts/{armada-385-db.dts => armada-388-db.dts} | 9 +-
+ arch/arm/boot/dts/armada-388-gp.dts | 288 +++++++++++++++++++++
+ .../dts/{armada-385-rd.dts => armada-388-rd.dts} | 9 +-
+ arch/arm/boot/dts/armada-388.dtsi | 70 +++++
+ arch/arm/boot/dts/armada-38x.dtsi | 96 ++++++-
+ arch/arm/boot/dts/kirkwood-6192.dtsi | 2 +
+ arch/arm/boot/dts/kirkwood-blackarmor-nas220.dts | 173 +++++++++++++
+ arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 8 +-
+ arch/arm/configs/mvebu_v7_defconfig | 1 +
+ arch/arm/mach-mvebu/mvebu-soc-id.h | 18 ++
+ drivers/bus/mvebu-mbus.c | 258 ++++++++++++++----
+ 19 files changed, 1084 insertions(+), 87 deletions(-)
+ create mode 100644 arch/arm/boot/dts/armada-385-db-ap.dts
+ rename arch/arm/boot/dts/{armada-385-db.dts => armada-388-db.dts} (92%)
+ create mode 100644 arch/arm/boot/dts/armada-388-gp.dts
+ rename arch/arm/boot/dts/{armada-385-rd.dts => armada-388-rd.dts} (88%)
+ create mode 100644 arch/arm/boot/dts/armada-388.dtsi
+ create mode 100644 arch/arm/boot/dts/kirkwood-blackarmor-nas220.dts
+Merging omap/for-next (c99e7d84d810 Merge branch 'omap-for-v3.20/defconfig' into for-next)
+$ git merge omap/for-next
+Removing arch/arm/mach-omap2/clkt2xxx_apll.c
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/am4372.dtsi | 16 ++
+ arch/arm/boot/dts/am437x-gp-evm.dts | 106 +++++++++
+ arch/arm/boot/dts/am437x-idk-evm.dts | 405 ++++++++++++++++++++++++++++++++
+ arch/arm/boot/dts/am437x-sk-evm.dts | 217 ++++++++++++-----
+ arch/arm/boot/dts/am43x-epos-evm.dts | 53 +++++
+ arch/arm/boot/dts/am57xx-beagle-x15.dts | 120 ++++++++++
+ arch/arm/boot/dts/dra7.dtsi | 2 -
+ arch/arm/boot/dts/omap3-n900.dts | 3 +-
+ arch/arm/boot/dts/omap3-n950-n9.dtsi | 5 +
+ arch/arm/configs/omap2plus_defconfig | 116 +++++----
+ arch/arm/mach-omap1/irq.c | 5 -
+ arch/arm/mach-omap1/timer32k.c | 5 -
+ arch/arm/mach-omap2/Makefile | 1 -
+ arch/arm/mach-omap2/clkt2xxx_apll.c | 142 -----------
+ arch/arm/mach-omap2/clock.h | 1 -
+ arch/arm/mach-omap2/clock2xxx.h | 11 -
+ arch/arm/mach-omap2/cm2xxx.c | 10 -
+ arch/arm/mach-omap2/cm2xxx.h | 2 -
+ arch/arm/mach-omap2/cm33xx.c | 21 --
+ arch/arm/mach-omap2/dpll44xx.c | 20 --
+ arch/arm/mach-omap2/omap-pm-noop.c | 196 ----------------
+ arch/arm/mach-omap2/omap-pm.h | 192 ---------------
+ arch/arm/mach-omap2/omap_hwmod.c | 232 ------------------
+ arch/arm/mach-omap2/omap_hwmod.h | 16 --
+ arch/arm/mach-omap2/powerdomain.c | 82 -------
+ arch/arm/mach-omap2/powerdomain.h | 5 -
+ arch/arm/mach-omap2/prm3xxx.h | 1 -
+ arch/arm/mach-omap2/prm44xx_54xx.h | 1 -
+ arch/arm/mach-omap2/voltage.c | 110 ---------
+ arch/arm/mach-omap2/voltage.h | 13 -
+ arch/arm/plat-omap/dma.c | 8 -
+ 32 files changed, 933 insertions(+), 1185 deletions(-)
+ create mode 100644 arch/arm/boot/dts/am437x-idk-evm.dts
+ delete mode 100644 arch/arm/mach-omap2/clkt2xxx_apll.c
+Merging omap-pending/for-next (99d076b74745 MAINTAINERS: add maintainer for OMAP hwmod data)
+$ git merge omap-pending/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 6 ++++++
+ arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 2 ++
+ arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 2 ++
+ 3 files changed, 10 insertions(+)
+Merging renesas/next (57816675569d Merge branch 'heads/dt-for-v3.20' into next)
+$ git merge renesas/next
+Removing arch/arm/mach-shmobile/clock-r8a7790.c
+Removing arch/arm/mach-shmobile/board-lager.c
+Removing arch/arm/mach-shmobile/board-lager-reference.c
+Removing arch/arm/configs/lager_defconfig
+Auto-merging arch/arm/boot/dts/Makefile
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../bindings/clock/renesas,sh73a0-cpg-clocks.txt | 35 +
+ .../bindings/power/renesas,sysc-rmobile.txt | 98 +++
+ MAINTAINERS | 1 -
+ arch/arm/boot/dts/Makefile | 2 +-
+ arch/arm/boot/dts/r7s72100-genmai.dts | 2 +-
+ arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 2 +-
+ arch/arm/boot/dts/r8a73a4-ape6evm.dts | 173 ++++-
+ arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 4 +-
+ arch/arm/boot/dts/r8a7740.dtsi | 109 ++-
+ arch/arm/boot/dts/r8a7779.dtsi | 39 +-
+ arch/arm/boot/dts/r8a7790-lager.dts | 21 +-
+ arch/arm/boot/dts/r8a7790.dtsi | 42 +-
+ arch/arm/boot/dts/r8a7791-henninger.dts | 4 +-
+ arch/arm/boot/dts/r8a7791-koelsch.dts | 23 +-
+ arch/arm/boot/dts/r8a7791.dtsi | 49 +-
+ arch/arm/boot/dts/r8a7794-alt.dts | 4 +-
+ arch/arm/boot/dts/r8a7794.dtsi | 82 +-
+ arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 48 +-
+ arch/arm/boot/dts/sh73a0-kzm9g.dts | 2 +-
+ arch/arm/boot/dts/sh73a0.dtsi | 404 +++++++++-
+ arch/arm/configs/kzm9g_defconfig | 2 +-
+ arch/arm/configs/lager_defconfig | 150 ----
+ arch/arm/configs/shmobile_defconfig | 31 +-
+ arch/arm/mach-shmobile/Kconfig | 28 +-
+ arch/arm/mach-shmobile/Makefile | 3 -
+ arch/arm/mach-shmobile/Makefile.boot | 1 -
+ arch/arm/mach-shmobile/board-lager-reference.c | 39 -
+ arch/arm/mach-shmobile/board-lager.c | 827 ---------------------
+ arch/arm/mach-shmobile/clock-r8a7790.c | 459 ------------
+ arch/arm/mach-shmobile/clock-sh73a0.c | 10 +
+ arch/arm/mach-shmobile/pm-r8a7740.c | 14 +
+ arch/arm/mach-shmobile/pm-rmobile.c | 273 ++++++-
+ arch/arm/mach-shmobile/pm-rmobile.h | 3 +-
+ arch/arm/mach-shmobile/pm-sh7372.c | 11 +
+ arch/arm/mach-shmobile/r8a7790.h | 28 -
+ arch/arm/mach-shmobile/setup-r8a7740.c | 7 +
+ arch/arm/mach-shmobile/setup-r8a7790.c | 284 +------
+ arch/arm/mach-shmobile/setup-rcar-gen2.c | 4 +-
+ arch/arm/mach-shmobile/setup-sh73a0.c | 8 +-
+ arch/arm/mach-shmobile/smp-r8a7779.c | 2 +-
+ drivers/clk/shmobile/Makefile | 1 +
+ drivers/clk/shmobile/clk-sh73a0.c | 218 ++++++
+ drivers/sh/pm_runtime.c | 2 +
+ include/dt-bindings/clock/r8a7790-clock.h | 1 +
+ include/dt-bindings/clock/r8a7791-clock.h | 2 +
+ include/dt-bindings/clock/r8a7794-clock.h | 17 +
+ include/dt-bindings/clock/sh73a0-clock.h | 82 ++
+ 47 files changed, 1685 insertions(+), 1966 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/renesas,sh73a0-cpg-clocks.txt
+ create mode 100644 Documentation/devicetree/bindings/power/renesas,sysc-rmobile.txt
+ delete mode 100644 arch/arm/configs/lager_defconfig
+ delete mode 100644 arch/arm/mach-shmobile/board-lager-reference.c
+ delete mode 100644 arch/arm/mach-shmobile/board-lager.c
+ delete mode 100644 arch/arm/mach-shmobile/clock-r8a7790.c
+ create mode 100644 drivers/clk/shmobile/clk-sh73a0.c
+ create mode 100644 include/dt-bindings/clock/sh73a0-clock.h
+Merging samsung/for-next (4ac72232f810 Merge branch 'samsung-fixes' into for-next)
+$ git merge samsung/for-next
+Removing arch/arm/mach-exynos/regs-sys.h
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/samsung/pmu.txt | 1 +
+ arch/arm/boot/dts/exynos5250.dtsi | 2 +-
+ arch/arm/boot/dts/exynos5420.dtsi | 4 +-
+ arch/arm/configs/exynos_defconfig | 18 +-
+ arch/arm/mach-exynos/exynos.c | 39 +-
+ arch/arm/mach-exynos/include/mach/map.h | 3 -
+ arch/arm/mach-exynos/pm.c | 3 +-
+ arch/arm/mach-exynos/regs-sys.h | 22 -
+ arch/arm/mach-exynos/suspend.c | 7 -
+ arch/arm/plat-samsung/cpu.c | 4 +
+ arch/arm64/Kconfig | 17 +
+ arch/arm64/boot/dts/Makefile | 1 +
+ arch/arm64/boot/dts/exynos/Makefile | 5 +
+ arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 84 +++
+ arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi | 588 +++++++++++++++++++++
+ arch/arm64/boot/dts/exynos/exynos7.dtsi | 530 +++++++++++++++++++
+ 16 files changed, 1254 insertions(+), 74 deletions(-)
+ delete mode 100644 arch/arm/mach-exynos/regs-sys.h
+ create mode 100644 arch/arm64/boot/dts/exynos/Makefile
+ create mode 100644 arch/arm64/boot/dts/exynos/exynos7-espresso.dts
+ create mode 100644 arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi
+ create mode 100644 arch/arm64/boot/dts/exynos/exynos7.dtsi
+Merging sunxi/sunxi/for-next (1363ad23197b Merge branches 'sunxi/dt-for-3.20', 'sunxi/clocks-for-3.20' and 'sunxi/defconfig-for-3.20' into sunxi/for-next)
+$ git merge sunxi/sunxi/for-next
+Auto-merging arch/arm/configs/multi_v7_defconfig
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ Documentation/arm/sunxi/README | 1 -
+ Documentation/devicetree/bindings/clock/sunxi.txt | 2 +-
+ arch/arm/boot/dts/Makefile | 3 +-
+ arch/arm/boot/dts/sun4i-a10-a1000.dts | 23 +-
+ arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 10 +-
+ arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 23 +-
+ arch/arm/boot/dts/sun4i-a10-hackberry.dts | 21 +-
+ arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 8 +-
+ arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 11 +-
+ arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 21 +-
+ arch/arm/boot/dts/sun4i-a10-pcduino.dts | 8 +-
+ arch/arm/boot/dts/sun4i-a10.dtsi | 124 +++++++---
+ arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 72 ++++--
+ arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 25 +-
+ arch/arm/boot/dts/sun5i-a10s.dtsi | 62 +++--
+ arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 13 +-
+ arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 25 +-
+ arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 66 +++++-
+ arch/arm/boot/dts/sun5i-a13.dtsi | 68 ++++--
+ arch/arm/boot/dts/sun6i-a31-app4-evb1.dts | 13 +-
+ arch/arm/boot/dts/sun6i-a31-colombus.dts | 21 +-
+ arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 24 +-
+ arch/arm/boot/dts/sun6i-a31-m9.dts | 31 ++-
+ arch/arm/boot/dts/sun6i-a31.dtsi | 171 ++++++++------
+ arch/arm/boot/dts/sun6i-a31s-cs908.dts | 104 +++++++++
+ arch/arm/boot/dts/sun6i-a31s.dtsi | 58 +++++
+ arch/arm/boot/dts/sun7i-a20-bananapi.dts | 28 ++-
+ arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 20 +-
+ arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 44 ++--
+ arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 38 ++--
+ arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 40 ++--
+ arch/arm/boot/dts/sun7i-a20-m3.dts | 18 +-
+ arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 24 +-
+ arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 24 +-
+ arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 79 ++++++-
+ arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 21 +-
+ arch/arm/boot/dts/sun7i-a20.dtsi | 265 ++++++++++++----------
+ arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts | 17 +-
+ arch/arm/boot/dts/sun8i-a23.dtsi | 121 +++++-----
+ arch/arm/boot/dts/sun9i-a80-optimus.dts | 17 +-
+ arch/arm/boot/dts/sun9i-a80.dtsi | 68 +++---
+ arch/arm/boot/dts/sunxi-common-regulators.dtsi | 27 ++-
+ arch/arm/configs/multi_v7_defconfig | 5 +
+ arch/arm/configs/sunxi_defconfig | 10 +-
+ arch/arm/mach-sunxi/platsmp.c | 2 +-
+ arch/arm/mach-sunxi/sunxi.c | 1 +
+ drivers/clk/sunxi/clk-factors.c | 10 +-
+ drivers/clk/sunxi/clk-factors.h | 7 +-
+ drivers/clk/sunxi/clk-mod0.c | 63 ++++-
+ drivers/clk/sunxi/clk-sun8i-mbus.c | 13 +-
+ drivers/clk/sunxi/clk-sun9i-core.c | 62 ++++-
+ drivers/clk/sunxi/clk-sunxi.c | 223 +++++++++++++++++-
+ include/dt-bindings/dma/sun4i-a10.h | 56 +++++
+ include/dt-bindings/pinctrl/sun4i-a10.h | 62 +++++
+ 54 files changed, 1711 insertions(+), 662 deletions(-)
+ create mode 100644 arch/arm/boot/dts/sun6i-a31s-cs908.dts
+ create mode 100644 arch/arm/boot/dts/sun6i-a31s.dtsi
+ create mode 100644 include/dt-bindings/dma/sun4i-a10.h
+ create mode 100644 include/dt-bindings/pinctrl/sun4i-a10.h
+Merging tegra/for-next (4fd40ac71480 Merge branch for-3.20/soc into for-next)
+$ git merge tegra/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/tegra124-nyan-big.dts | 2 ++
+ arch/arm/boot/dts/tegra20.dtsi | 10 +++++-----
+ arch/arm/boot/dts/tegra30-cardhu.dtsi | 2 +-
+ arch/arm/boot/dts/tegra30.dtsi | 2 +-
+ arch/arm/configs/tegra_defconfig | 2 --
+ drivers/soc/tegra/pmc.c | 7 +++++--
+ include/soc/tegra/pm.h | 2 +-
+ 7 files changed, 15 insertions(+), 12 deletions(-)
+Merging arm64/for-next/core (fb59d007a0e4 arm64: mm: dump: don't skip final region)
+$ git merge arm64/for-next/core
+Already up-to-date.
+Merging blackfin/for-linus (275f5a8573e7 blackfin: defconfigs: cleanup unused CONFIG_MTD_CHAR, add MTD_SPI_NOR for BF537-STAMP)
+$ git merge blackfin/for-linus
+Merge made by the 'recursive' strategy.
+ arch/blackfin/configs/BF518F-EZBRD_defconfig | 1 -
+ arch/blackfin/configs/BF527-TLL6527M_defconfig | 1 -
+ arch/blackfin/configs/BF533-EZKIT_defconfig | 1 -
+ arch/blackfin/configs/BF533-STAMP_defconfig | 1 -
+ arch/blackfin/configs/BF537-STAMP_defconfig | 3 ++-
+ arch/blackfin/configs/BF538-EZKIT_defconfig | 1 -
+ arch/blackfin/configs/BF561-ACVILON_defconfig | 1 -
+ arch/blackfin/configs/BF561-EZKIT-SMP_defconfig | 1 -
+ arch/blackfin/configs/BF561-EZKIT_defconfig | 1 -
+ arch/blackfin/configs/CM-BF527_defconfig | 1 -
+ arch/blackfin/configs/CM-BF533_defconfig | 1 -
+ arch/blackfin/configs/CM-BF537E_defconfig | 1 -
+ arch/blackfin/configs/CM-BF537U_defconfig | 1 -
+ arch/blackfin/configs/CM-BF548_defconfig | 1 -
+ arch/blackfin/configs/CM-BF561_defconfig | 1 -
+ arch/blackfin/configs/DNP5370_defconfig | 1 -
+ arch/blackfin/configs/IP0X_defconfig | 1 -
+ arch/blackfin/configs/PNAV-10_defconfig | 1 -
+ arch/blackfin/configs/SRV1_defconfig | 1 -
+ arch/blackfin/configs/TCM-BF518_defconfig | 1 -
+ arch/blackfin/configs/TCM-BF537_defconfig | 1 -
+ arch/blackfin/kernel/kgdb.c | 12 ++++--------
+ arch/blackfin/mach-bf609/boards/ezkit.c | 8 ++++----
+ 23 files changed, 10 insertions(+), 33 deletions(-)
+Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by cache.h)
+$ git merge c6x/for-linux-next
+Already up-to-date.
+Merging cris/for-next (21bd887cd7c4 CRISv32: Remove last remnants of ETRAX_SPI_MMC_BOARD)
+$ git merge cris/for-next
+Merge made by the 'recursive' strategy.
+Merging hexagon/linux-next (8914d7e85780 Hexagon: fix signal delivery for debug traps)
+$ git merge hexagon/linux-next
+Already up-to-date.
+Merging ia64/next (0fd2468fd035 Merge branch 'misc-3.19' into next)
+$ git merge ia64/next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging m68k/for-next (2e874d178c9e m68k/mac: Fix scsi_type for Mac LC and similar models)
+$ git merge m68k/for-next
+Removing arch/m68k/include/asm/futex.h
+Merge made by the 'recursive' strategy.
+ arch/m68k/atari/atakeyb.c | 66 ---------------------------
+ arch/m68k/include/asm/Kbuild | 1 +
+ arch/m68k/include/asm/futex.h | 94 ---------------------------------------
+ arch/m68k/include/asm/macintosh.h | 2 +-
+ arch/m68k/mac/config.c | 32 ++++++-------
+ arch/m68k/mvme147/config.c | 46 -------------------
+ arch/m68k/mvme16x/rtc.c | 2 +-
+ 7 files changed, 20 insertions(+), 223 deletions(-)
+ delete mode 100644 arch/m68k/include/asm/futex.h
+Merging m68knommu/for-next (9ebaf8bb9107 arch: m68k: 68360: config: Remove unused function)
+$ git merge m68knommu/for-next
+Merge made by the 'recursive' strategy.
+ arch/m68k/68360/commproc.c | 8 ++++----
+ arch/m68k/68360/config.c | 13 -------------
+ arch/m68k/include/asm/commproc.h | 24 +-----------------------
+ 3 files changed, 5 insertions(+), 40 deletions(-)
+Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check)
+$ git merge metag/for-next
+Already up-to-date.
+Merging microblaze/next (132d5dfc0469 microblaze: whitespace fix)
+$ git merge microblaze/next
+Removing arch/microblaze/kernel/prom_parse.c
+Merge made by the 'recursive' strategy.
+ arch/microblaze/include/asm/delay.h | 4 +--
+ arch/microblaze/include/asm/kgdb.h | 3 +++
+ arch/microblaze/include/asm/linkage.h | 16 +-----------
+ arch/microblaze/include/asm/pgalloc.h | 14 +++++------
+ arch/microblaze/include/asm/syscall.h | 2 +-
+ arch/microblaze/include/asm/uaccess.h | 6 ++---
+ arch/microblaze/include/asm/unistd.h | 2 +-
+ arch/microblaze/include/uapi/asm/unistd.h | 1 +
+ arch/microblaze/kernel/Makefile | 2 +-
+ arch/microblaze/kernel/cpu/cache.c | 6 ++---
+ arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c | 2 +-
+ arch/microblaze/kernel/cpu/cpuinfo-static.c | 2 +-
+ arch/microblaze/kernel/cpu/cpuinfo.c | 7 ++++++
+ arch/microblaze/kernel/intc.c | 8 +++---
+ arch/microblaze/kernel/kgdb.c | 10 +++++---
+ arch/microblaze/kernel/prom_parse.c | 35 ---------------------------
+ arch/microblaze/kernel/ptrace.c | 4 +--
+ arch/microblaze/kernel/reset.c | 1 -
+ arch/microblaze/kernel/signal.c | 4 +--
+ arch/microblaze/kernel/syscall_table.S | 1 +
+ arch/microblaze/kernel/unwind.c | 2 +-
+ 21 files changed, 48 insertions(+), 84 deletions(-)
+ delete mode 100644 arch/microblaze/kernel/prom_parse.c
+Merging mips/mips-for-linux-next (a682437a894d Merge branch '3.19-fixes' into mips-for-linux-next)
+$ git merge mips/mips-for-linux-next
+Merge made by the 'recursive' strategy.
+ arch/mips/Kconfig | 23 +++++++++-----------
+ arch/mips/configs/malta_defconfig | 16 ++++----------
+ arch/mips/fw/arc/misc.c | 26 +++++++++++++---------
+ arch/mips/include/asm/checksum.h | 40 ++++++++++++----------------------
+ arch/mips/include/asm/fpu.h | 43 ++++++++++++++++++++++---------------
+ arch/mips/include/asm/mips-cm.h | 4 ++--
+ arch/mips/include/asm/sgialib.h | 8 +++++--
+ arch/mips/include/uapi/asm/unistd.h | 15 +++++++------
+ arch/mips/jz4740/irq.c | 3 +++
+ arch/mips/kernel/scall32-o32.S | 1 +
+ arch/mips/kernel/scall64-64.S | 1 +
+ arch/mips/kernel/scall64-n32.S | 1 +
+ arch/mips/kernel/scall64-o32.S | 1 +
+ arch/mips/sgi-ip27/ip27-reset.c | 7 +++---
+ arch/mips/sgi-ip32/ip32-reset.c | 7 +++---
+ 15 files changed, 102 insertions(+), 94 deletions(-)
+Merging nios2/nios2-next (1b0f44923e18 nios2: Use preempt_schedule_irq)
+$ git merge nios2/nios2-next
+Already up-to-date.
+Merging openrisc/for-upstream (548dafe880ad openrisc: Use get_signal() signal_setup_done())
+$ git merge openrisc/for-upstream
+Already up-to-date.
+Merging parisc/for-next (6c700d71f7fa [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve())
+$ git merge parisc/for-next
+Already up-to-date.
+Merging parisc-hd/for-next (b2776bf7149b Linux 3.18)
+$ git merge parisc-hd/for-next
+Already up-to-date.
+Merging powerpc/next (d557b09800da powerpc/mm/thp: Use tlbiel if possible)
+$ git merge powerpc/next
+Already up-to-date.
+Merging powerpc-mpe/next (9a4fc4eaf111 powerpc/kvm: Create proper names for the kvm_host_state PMU fields)
+$ git merge powerpc-mpe/next
+Merge made by the 'recursive' strategy.
+ arch/powerpc/kernel/asm-offsets.c | 15 +++++++++++++--
+ arch/powerpc/kvm/book3s_hv_interrupts.S | 26 +++++++++++++-------------
+ arch/powerpc/kvm/book3s_hv_rmhandlers.S | 28 ++++++++++++++--------------
+ arch/powerpc/lib/Makefile | 3 +--
+ arch/powerpc/platforms/44x/Kconfig | 1 -
+ arch/powerpc/platforms/pseries/Kconfig | 20 ++++++++++----------
+ arch/powerpc/sysdev/ppc4xx_hsta_msi.c | 2 +-
+ arch/powerpc/xmon/xmon.c | 14 ++------------
+ drivers/misc/cxl/cxl.h | 7 +++++++
+ drivers/misc/cxl/fault.c | 6 ++++++
+ drivers/misc/cxl/file.c | 4 +++-
+ drivers/misc/cxl/native.c | 1 +
+ drivers/misc/cxl/pci.c | 2 +-
+ 13 files changed, 72 insertions(+), 57 deletions(-)
+Merging fsl/next (76f3e2929bb6 powerpc/config: Enable memory driver)
+$ 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 (d97d929f06d0 s390: move cacheinfo sysfs to generic cacheinfo infrastructure)
+$ git merge s390/features
+Auto-merging arch/s390/mm/pgtable.c
+Merge made by the 'recursive' strategy.
+ arch/s390/Kconfig | 2 +-
+ arch/s390/boot/compressed/misc.c | 3 +-
+ arch/s390/crypto/aes_s390.c | 4 +-
+ arch/s390/hypfs/hypfs_vm.c | 2 +-
+ arch/s390/include/asm/irqflags.h | 2 +-
+ arch/s390/include/asm/sclp.h | 2 +
+ arch/s390/include/asm/timex.h | 10 +-
+ arch/s390/include/uapi/asm/unistd.h | 3 +-
+ arch/s390/kernel/cache.c | 388 +++++++++---------------------------
+ arch/s390/kernel/dis.c | 1 -
+ arch/s390/kernel/entry.h | 4 +-
+ arch/s390/kernel/ftrace.c | 95 ++++-----
+ arch/s390/kernel/sclp.S | 3 +-
+ arch/s390/kernel/syscalls.S | 1 +
+ arch/s390/kernel/vtime.c | 2 -
+ arch/s390/mm/fault.c | 2 +-
+ arch/s390/mm/pgtable.c | 11 +-
+ arch/s390/pci/pci_mmio.c | 4 +-
+ drivers/s390/cio/idset.c | 20 --
+ drivers/s390/cio/idset.h | 2 -
+ drivers/s390/crypto/ap_bus.c | 10 +-
+ 21 files changed, 179 insertions(+), 392 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 (c47b15c4928c arch/tile: update MAINTAINERS email to EZchip)
+$ git merge tile/master
+Already up-to-date.
+Merging uml/next (989e59fa41c5 um: Include generic barrier.h)
+$ git merge uml/next
+Resolved 'arch/um/include/asm/Kbuild' using previous resolution.
+Removing arch/x86/um/shared/sysdep/skas_ptrace.h
+Removing arch/um/sys-ppc/shared/sysdep/skas_ptrace.h
+Removing arch/um/sys-ia64/sysdep/skas_ptrace.h
+Auto-merging arch/um/os-Linux/skas/process.c
+Auto-merging arch/um/kernel/um_arch.c
+Auto-merging arch/um/kernel/trap.c
+Auto-merging arch/um/kernel/ptrace.c
+Removing arch/um/include/shared/skas_ptrace.h
+Removing arch/um/include/shared/skas/proc_mm.h
+Auto-merging arch/um/include/shared/os.h
+Auto-merging arch/um/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master e74d8adb509e] Merge remote-tracking branch 'uml/next'
+$ git diff -M --stat --summary HEAD^..
+ arch/um/include/shared/os.h | 2 -
+ arch/um/include/shared/skas/proc_mm.h | 44 ------
+ arch/um/include/shared/skas/skas.h | 3 -
+ arch/um/include/shared/skas_ptrace.h | 14 --
+ arch/um/kernel/ptrace.c | 32 ----
+ arch/um/kernel/reboot.c | 35 ++---
+ arch/um/kernel/skas/mmu.c | 68 +++------
+ arch/um/kernel/skas/process.c | 27 ----
+ arch/um/kernel/trap.c | 2 +-
+ arch/um/kernel/um_arch.c | 10 --
+ arch/um/os-Linux/process.c | 16 --
+ arch/um/os-Linux/skas/mem.c | 100 ++----------
+ arch/um/os-Linux/skas/process.c | 200 ++++++------------------
+ arch/um/os-Linux/start_up.c | 154 -------------------
+ arch/um/sys-ia64/sysdep/skas_ptrace.h | 22 ---
+ arch/um/sys-ppc/shared/sysdep/skas_ptrace.h | 22 ---
+ arch/x86/um/ldt.c | 227 ++++++----------------------
+ arch/x86/um/shared/sysdep/faultinfo_32.h | 3 -
+ arch/x86/um/shared/sysdep/faultinfo_64.h | 3 -
+ arch/x86/um/shared/sysdep/skas_ptrace.h | 22 ---
+ 20 files changed, 148 insertions(+), 858 deletions(-)
+ delete mode 100644 arch/um/include/shared/skas/proc_mm.h
+ delete mode 100644 arch/um/include/shared/skas_ptrace.h
+ delete mode 100644 arch/um/sys-ia64/sysdep/skas_ptrace.h
+ delete mode 100644 arch/um/sys-ppc/shared/sysdep/skas_ptrace.h
+ delete mode 100644 arch/x86/um/shared/sysdep/skas_ptrace.h
+Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
+$ git merge unicore32/unicore32
+Already up-to-date.
+Merging xtensa/for_next (1f2fdbd0078c xtensa: disable link optimization)
+$ git merge xtensa/for_next
+Already up-to-date.
+Merging btrfs/next (1edb647bb954 Btrfs: remove non-sense btrfs_error_discard_extent() function)
+$ git merge btrfs/next
+Already up-to-date.
+Merging ceph/master (388cfdc9bc19 libceph: require cephx message signature by default)
+$ git merge ceph/master
+Recorded preimage for 'net/ceph/auth_x.c'
+Resolved 'fs/ceph/snap.c' using previous resolution.
+Resolved 'fs/ceph/super.c' using previous resolution.
+Resolved 'fs/ceph/super.h' using previous resolution.
+Auto-merging net/ceph/auth_x.c
+CONFLICT (content): Merge conflict in net/ceph/auth_x.c
+Auto-merging fs/ceph/super.h
+CONFLICT (content): Merge conflict in fs/ceph/super.h
+Auto-merging fs/ceph/super.c
+CONFLICT (content): Merge conflict in fs/ceph/super.c
+Auto-merging fs/ceph/snap.c
+CONFLICT (content): Merge conflict in fs/ceph/snap.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'net/ceph/auth_x.c'.
+[master c8a88381e2c3] Merge remote-tracking branch 'ceph/master'
+$ git diff -M --stat --summary HEAD^..
+Merging cifs/for-next (0891605dd763 Initialize salt value for negotiate context)
+$ git merge cifs/for-next
+Merge made by the 'recursive' strategy.
+ fs/cifs/Kconfig | 9 ++++++++
+ fs/cifs/cifsglob.h | 7 ++++++
+ fs/cifs/connect.c | 10 +++++++++
+ fs/cifs/smb2ops.c | 22 +++++++++++++++++++
+ fs/cifs/smb2pdu.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++---
+ fs/cifs/smb2pdu.h | 50 +++++++++++++++++++++++++++++++++++-------
+ 6 files changed, 151 insertions(+), 11 deletions(-)
+Merging configfs/linux-next (b930c26416c4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
+$ git merge configfs/linux-next
+Already up-to-date.
+Merging ecryptfs/next (942080643bce eCryptfs: Remove buggy and unnecessary write in file name decode routine)
+$ git merge ecryptfs/next
+Already up-to-date.
+Merging ext3/for_next (e4a93be6cb28 isofs: Fix bug in the way to check if the year is a leap year)
+$ git merge ext3/for_next
+Merge made by the 'recursive' strategy.
+ fs/ext3/super.c | 2 ++
+ fs/isofs/util.c | 18 ++++--------------
+ fs/udf/Kconfig | 10 ++++++----
+ 3 files changed, 12 insertions(+), 18 deletions(-)
+Merging ext4/dev (4033d19d28ab ext4: add optimization for the lazytime mount option)
+$ git merge ext4/dev
+Auto-merging include/linux/fs.h
+Merge made by the 'recursive' strategy.
+ fs/ext4/inode.c | 71 ++++++++++++++++++++++++--
+ fs/ext4/super.c | 10 ++++
+ fs/fs-writeback.c | 62 +++++++++++++++++++----
+ fs/gfs2/file.c | 4 +-
+ fs/inode.c | 106 +++++++++++++++++++++++++++++++++------
+ fs/jfs/file.c | 2 +-
+ fs/libfs.c | 2 +-
+ fs/proc_namespace.c | 1 +
+ fs/sync.c | 8 +++
+ include/linux/backing-dev.h | 1 +
+ include/linux/fs.h | 10 ++++
+ include/trace/events/ext4.h | 30 +++++++++++
+ include/trace/events/writeback.h | 60 +++++++++++++++++++++-
+ include/uapi/linux/fs.h | 4 +-
+ mm/backing-dev.c | 10 +++-
+ 15 files changed, 343 insertions(+), 38 deletions(-)
+Merging f2fs/dev (ebb0d36e21a0 f2fs: pids_lock can be static)
+$ git merge f2fs/dev
+Merge made by the 'recursive' strategy.
+ fs/f2fs/Kconfig | 10 +++
+ fs/f2fs/Makefile | 1 +
+ fs/f2fs/acl.c | 4 +-
+ fs/f2fs/checkpoint.c | 47 +++++++------
+ fs/f2fs/data.c | 127 +++++++++++++++++++----------------
+ fs/f2fs/debug.c | 14 ++--
+ fs/f2fs/dir.c | 3 +-
+ fs/f2fs/f2fs.h | 52 ++++++++++-----
+ fs/f2fs/file.c | 82 ++++++++++++++++++++---
+ fs/f2fs/gc.c | 20 +-----
+ fs/f2fs/gc.h | 7 +-
+ fs/f2fs/inline.c | 7 +-
+ fs/f2fs/inode.c | 37 +++++------
+ fs/f2fs/node.c | 114 ++++++++++++++-----------------
+ fs/f2fs/node.h | 45 +++++++++----
+ fs/f2fs/recovery.c | 3 +-
+ fs/f2fs/segment.c | 144 +++++++++++++++++++++------------------
+ fs/f2fs/super.c | 13 ++--
+ fs/f2fs/trace.c | 159 ++++++++++++++++++++++++++++++++++++++++++++
+ fs/f2fs/trace.h | 46 +++++++++++++
+ include/linux/f2fs_fs.h | 2 +
+ include/trace/events/f2fs.h | 134 +++++++++++++++++--------------------
+ 22 files changed, 689 insertions(+), 382 deletions(-)
+ create mode 100644 fs/f2fs/trace.c
+ create mode 100644 fs/f2fs/trace.h
+Merging fscache/fscache (1a8ed18fb7db cachefiles: remove two unused pagevecs.)
+$ git merge fscache/fscache
+Resolved 'fs/fscache/object.c' using previous resolution.
+Auto-merging fs/fscache/object.c
+CONFLICT (content): Merge conflict in fs/fscache/object.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master c9e9494187d4] Merge remote-tracking branch 'fscache/fscache'
+$ git diff -M --stat --summary HEAD^..
+Merging fuse/for-next (9759bd518994 fuse: add memory barrier to INIT)
+$ git merge fuse/for-next
+Merge made by the 'recursive' strategy.
+ fs/fuse/dev.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
+ fs/fuse/dir.c | 31 +++++++------------------------
+ fs/fuse/fuse_i.h | 2 ++
+ fs/fuse/inode.c | 5 ++---
+ 4 files changed, 60 insertions(+), 29 deletions(-)
+Merging gfs2/master (8f6cb409f016 GFS2: Eliminate __gfs2_glock_remove_from_lru)
+$ git merge gfs2/master
+Merge made by the 'recursive' strategy.
+ fs/gfs2/glock.c | 13 +++----------
+ 1 file changed, 3 insertions(+), 10 deletions(-)
+Merging jfs/jfs-next (e1f1fe798d2f jfs: get rid of homegrown endianness helpers)
+$ git merge jfs/jfs-next
+Removing fs/jfs/endian24.h
+Merge made by the 'recursive' strategy.
+ fs/jfs/endian24.h | 49 ------------------------------------------------
+ fs/jfs/jfs_dtree.c | 4 ++--
+ fs/jfs/jfs_types.h | 55 ++++++++++++++++++++++++++++++++----------------------
+ fs/jfs/jfs_xtree.h | 25 +++++++++----------------
+ 4 files changed, 44 insertions(+), 89 deletions(-)
+ delete mode 100644 fs/jfs/endian24.h
+Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found)
+$ git merge logfs/master
+Auto-merging fs/logfs/super.c
+Merge made by the 'recursive' strategy.
+ fs/logfs/dev_mtd.c | 2 +-
+ fs/logfs/super.c | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+Merging nfs/linux-next (4e379d36c050 NFSv4: Remove incorrect check in can_open_delegated())
+$ git merge nfs/linux-next
+Merge made by the 'recursive' strategy.
+ fs/lockd/svc.c | 8 ++++----
+ fs/nfs/nfs4client.c | 42 +++++++++++++++++++++++++++---------------
+ fs/nfs/nfs4proc.c | 21 +++++++++++++++------
+ include/linux/nfs_fs_sb.h | 3 +++
+ 4 files changed, 49 insertions(+), 25 deletions(-)
+Merging nfsd/nfsd-next (0ec016e3e02f nfsd4: tweak rd_dircount accounting)
+$ git merge nfsd/nfsd-next
+Merge made by the 'recursive' strategy.
+ fs/nfsd/nfs4state.c | 8 ++++----
+ fs/nfsd/nfs4xdr.c | 7 ++++---
+ fs/nfsd/state.h | 2 +-
+ 3 files changed, 9 insertions(+), 8 deletions(-)
+Merging omfs/for-next (976d167615b6 Linux 3.1-rc9)
+$ git merge omfs/for-next
+Already up-to-date.
+Merging overlayfs/overlayfs-next (4330397e4e8a ovl: discard independent cursor in readdir())
+$ git merge overlayfs/overlayfs-next
+Auto-merging fs/overlayfs/readdir.c
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/overlayfs.txt | 28 ++
+ fs/overlayfs/copy_up.c | 5 +-
+ fs/overlayfs/dir.c | 28 +-
+ fs/overlayfs/inode.c | 12 +-
+ fs/overlayfs/overlayfs.h | 18 +-
+ fs/overlayfs/readdir.c | 181 +++++-----
+ fs/overlayfs/super.c | 564 +++++++++++++++++++++-----------
+ 7 files changed, 517 insertions(+), 319 deletions(-)
+Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option)
+$ git merge squashfs/master
+Already up-to-date.
+Merging v9fs/for-next (f15844e0777f 9P: fix return value in v9fs_fid_xattr_set)
+$ git merge v9fs/for-next
+Already up-to-date.
+Merging ubifs/linux-next (f38aed975c0c UBI: Fix invalid vfree())
+$ git merge ubifs/linux-next
+Already up-to-date.
+Merging xfs/for-next (ad7df6e858ef Merge branch 'xfs-sb-logging-rework' into for-next)
+$ git merge xfs/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/xfs.txt | 17 +-
+ fs/xfs/libxfs/xfs_attr_leaf.c | 2 +-
+ fs/xfs/libxfs/xfs_bmap.c | 14 +-
+ fs/xfs/libxfs/xfs_bmap.h | 33 ++++
+ fs/xfs/libxfs/xfs_format.h | 24 +--
+ fs/xfs/{ => libxfs}/xfs_fs.h | 0
+ fs/xfs/libxfs/xfs_sb.c | 333 ++++++++++++++++----------------------
+ fs/xfs/libxfs/xfs_sb.h | 11 +-
+ fs/xfs/libxfs/xfs_shared.h | 33 ++--
+ fs/xfs/libxfs/xfs_trans_resv.c | 14 --
+ fs/xfs/libxfs/xfs_trans_resv.h | 1 -
+ fs/xfs/{ => libxfs}/xfs_types.h | 0
+ fs/xfs/xfs_bmap_util.h | 37 +----
+ fs/xfs/xfs_buf_item.c | 2 +-
+ fs/xfs/xfs_dquot.h | 2 +-
+ fs/xfs/xfs_fsops.c | 33 +---
+ fs/xfs/xfs_inode.c | 134 ++++++++++++++-
+ fs/xfs/xfs_inode.h | 2 +-
+ fs/xfs/xfs_iomap.c | 2 +-
+ fs/xfs/xfs_iomap.h | 2 +-
+ fs/xfs/xfs_iops.c | 21 ++-
+ fs/xfs/xfs_log.c | 28 +++-
+ fs/xfs/xfs_mount.c | 107 +++---------
+ fs/xfs/xfs_mount.h | 5 +-
+ fs/xfs/xfs_qm.c | 43 +----
+ fs/xfs/xfs_qm.h | 1 -
+ fs/xfs/xfs_qm_syscalls.c | 14 +-
+ fs/xfs/xfs_super.c | 15 +-
+ fs/xfs/xfs_sysctl.c | 18 ---
+ 29 files changed, 433 insertions(+), 515 deletions(-)
+ rename fs/xfs/{ => libxfs}/xfs_fs.h (100%)
+ rename fs/xfs/{ => libxfs}/xfs_types.h (100%)
+Merging file-locks/linux-next (50b80aaa6589 locks: keep a count of locks on the flctx lists)
+$ git merge file-locks/linux-next
+Auto-merging include/linux/fs.h
+Auto-merging fs/nfsd/nfs4state.c
+Auto-merging fs/inode.c
+Merge made by the 'recursive' strategy.
+ fs/ceph/locks.c | 64 +++---
+ fs/ceph/mds_client.c | 4 -
+ fs/cifs/file.c | 34 +---
+ fs/inode.c | 3 +-
+ fs/lockd/svcsubs.c | 26 ++-
+ fs/locks.c | 556 +++++++++++++++++++++++++++------------------------
+ fs/nfs/delegation.c | 23 ++-
+ fs/nfs/nfs4state.c | 70 ++++---
+ fs/nfs/pagelist.c | 6 +-
+ fs/nfs/write.c | 41 +++-
+ fs/nfsd/nfs4state.c | 21 +-
+ fs/read_write.c | 2 +-
+ include/linux/fs.h | 33 ++-
+ 13 files changed, 487 insertions(+), 396 deletions(-)
+Merging vfs/for-next (88174fd2c8fb kill d_validate())
+$ git merge vfs/for-next
+Merge made by the 'recursive' strategy.
+ fs/dcache.c | 31 --------------
+ fs/ncpfs/dir.c | 98 +++++++++++++++++++++++---------------------
+ fs/ncpfs/ncp_fs_i.h | 1 +
+ fs/ncpfs/ncplib_kernel.h | 30 --------------
+ include/linux/dcache.h | 3 --
+ security/selinux/selinuxfs.c | 52 ++---------------------
+ 6 files changed, 55 insertions(+), 160 deletions(-)
+Merging pci/next (75f30c3d9949 Merge branches 'pci/host-keystone', 'pci/host-layerscape', 'pci/host-rcar' and 'pci/host-tegra' into next)
+$ git merge pci/next
+Merge made by the 'recursive' strategy.
+ arch/arm/Kconfig | 3 ++
+ arch/arm/include/asm/mach/pci.h | 6 ----
+ arch/arm/include/asm/pci.h | 7 -----
+ arch/arm/kernel/bios32.c | 3 --
+ arch/arm/mach-cns3xxx/pcie.c | 40 ++++++++++++---------------
+ arch/arm64/kernel/pci.c | 22 ---------------
+ drivers/pci/host/pci-keystone.c | 2 +-
+ drivers/pci/host/pci-layerscape.c | 1 -
+ drivers/pci/host/pci-mvebu.c | 15 ++--------
+ drivers/pci/host/pci-tegra.c | 13 ---------
+ drivers/pci/host/pcie-designware.c | 3 --
+ drivers/pci/host/pcie-rcar.c | 7 ++---
+ drivers/pci/hotplug/cpci_hotplug_core.c | 3 +-
+ drivers/pci/pci.c | 49 +++++++++++++++++++++++++++++++++
+ 14 files changed, 75 insertions(+), 99 deletions(-)
+Merging hid/for-next (c27320a55b83 Merge branch 'for-3.20/logitech' into for-next)
+$ git merge hid/for-next
+Auto-merging drivers/hid/usbhid/hid-quirks.c
+Auto-merging drivers/hid/hid-logitech-hidpp.c
+Auto-merging drivers/hid/hid-input.c
+Auto-merging drivers/hid/hid-ids.h
+Auto-merging drivers/hid/hid-core.c
+Auto-merging drivers/hid/Kconfig
+Merge made by the 'recursive' strategy.
+ drivers/hid/Kconfig | 12 ++-
+ drivers/hid/Makefile | 1 +
+ drivers/hid/hid-betopff.c | 160 +++++++++++++++++++++++++++++++++++++++
+ drivers/hid/hid-core.c | 30 ++++++--
+ drivers/hid/hid-ids.h | 6 ++
+ drivers/hid/hid-input.c | 26 ++++++-
+ drivers/hid/hid-lenovo.c | 79 ++++++++++++++++++-
+ drivers/hid/hid-logitech-hidpp.c | 81 +++++++++++++-------
+ drivers/hid/hid-microsoft.c | 2 +
+ drivers/hid/hid-rmi.c | 93 ++++++++++++++++++-----
+ drivers/hid/usbhid/hid-quirks.c | 1 +
+ drivers/hid/wacom_sys.c | 6 +-
+ drivers/hid/wacom_wac.c | 8 --
+ drivers/hid/wacom_wac.h | 9 +++
+ include/linux/hid.h | 4 +-
+ 15 files changed, 451 insertions(+), 67 deletions(-)
+ create mode 100644 drivers/hid/hid-betopff.c
+Merging i2c/i2c/for-next (523c5b89640e i2c: Remove support for legacy PM)
+$ git merge i2c/i2c/for-next
+Merge made by the 'recursive' strategy.
+ drivers/i2c/i2c-core.c | 118 -------------------------------------------------
+ include/linux/i2c.h | 4 --
+ 2 files changed, 122 deletions(-)
+Merging jdelvare-hwmon/master (ae530d4403e9 hwmon: (i5500_temp) Convert to use ATTRIBUTE_GROUPS macro)
+$ git merge jdelvare-hwmon/master
+Auto-merging drivers/hwmon/Makefile
+Auto-merging drivers/hwmon/Kconfig
+Merge made by the 'recursive' strategy.
+ drivers/hwmon/Kconfig | 10 +++
+ drivers/hwmon/Makefile | 1 +
+ drivers/hwmon/i5500_temp.c | 149 +++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 160 insertions(+)
+ create mode 100644 drivers/hwmon/i5500_temp.c
+Merging hwmon-staging/hwmon-next (c2681f7fc9ee hwmon: (ina2xx) implement update_interval attribute for ina226)
+$ git merge hwmon-staging/hwmon-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/gpio/gpio-fan.txt | 13 +
+ Documentation/hwmon/ina2xx | 12 +-
+ drivers/hwmon/gpio-fan.c | 83 +++++-
+ drivers/hwmon/ina2xx.c | 332 ++++++++++++++++++---
+ drivers/hwmon/nct7802.c | 2 +-
+ 5 files changed, 391 insertions(+), 51 deletions(-)
+Merging v4l-dvb/master (2ea3258b238c Merge branch 'patchwork' into to_next)
+$ git merge v4l-dvb/master
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging kbuild/for-next (5ea04a1a0860 Merge branch 'kbuild/kbuild' into kbuild/for-next)
+$ git merge kbuild/for-next
+Auto-merging drivers/hwmon/Kconfig
+Auto-merging Makefile
+Merge made by the 'recursive' strategy.
+ Documentation/kbuild/makefiles.txt | 20 ++---
+ Documentation/lto-build | 173 ++++++++++++++++++++++++++++++++++++
+ Kbuild | 61 +++++--------
+ Makefile | 23 ++++-
+ arch/mips/pmcs-msp71xx/Kconfig | 6 +-
+ arch/parisc/Makefile | 2 +-
+ arch/powerpc/Makefile | 6 +-
+ arch/x86/Kconfig | 2 +-
+ arch/x86/Makefile.um | 2 +-
+ drivers/connector/Kconfig | 2 +-
+ drivers/hwmon/Kconfig | 2 +-
+ drivers/hwmon/pmbus/Kconfig | 2 +-
+ drivers/i2c/Kconfig | 4 +-
+ drivers/iio/Kconfig | 4 +-
+ drivers/isdn/hardware/mISDN/Kconfig | 2 +-
+ drivers/md/Kconfig | 4 +-
+ drivers/md/persistent-data/Kconfig | 2 +-
+ drivers/net/ethernet/ti/Kconfig | 4 +-
+ drivers/net/usb/Kconfig | 12 +--
+ drivers/net/wireless/rt2x00/Kconfig | 6 +-
+ drivers/pci/pcie/aer/Kconfig | 2 +-
+ drivers/rtc/Kconfig | 8 +-
+ drivers/spi/Kconfig | 6 +-
+ drivers/staging/board/Kconfig | 2 +-
+ drivers/staging/emxx_udc/Kconfig | 2 +-
+ drivers/staging/iio/Kconfig | 4 +-
+ drivers/tty/serial/Kconfig | 2 +-
+ drivers/usb/gadget/Kconfig | 34 +++----
+ drivers/usb/gadget/legacy/Kconfig | 2 +-
+ drivers/usb/gadget/udc/Kconfig | 4 +-
+ drivers/usb/phy/Kconfig | 2 +-
+ init/Kconfig | 81 ++++++++++++++++-
+ kernel/gcov/Kconfig | 2 +-
+ kernel/gcov/Makefile | 36 ++------
+ lib/Kconfig | 30 +++----
+ lib/Kconfig.debug | 2 +-
+ mm/Kconfig | 22 ++---
+ net/Kconfig | 14 +--
+ net/sched/Kconfig | 2 +-
+ net/switchdev/Kconfig | 2 +-
+ scripts/Kbuild.include | 7 +-
+ scripts/Makefile.clean | 3 -
+ scripts/Makefile.lto | 84 +++++++++++++++++
+ scripts/Makefile.modpost | 7 +-
+ scripts/kconfig/merge_config.sh | 5 ++
+ scripts/link-vmlinux.sh | 2 +-
+ scripts/package/builddeb | 17 +++-
+ security/integrity/Kconfig | 4 +-
+ security/integrity/evm/Kconfig | 2 +-
+ 49 files changed, 521 insertions(+), 208 deletions(-)
+ create mode 100644 Documentation/lto-build
+ create mode 100644 scripts/Makefile.lto
+Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings)
+$ git merge kconfig/for-next
+Already up-to-date.
+Merging libata/for-next (ca7cb2093715 Merge branch 'for-3.20' into for-next)
+$ git merge libata/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 75 ++++++++++--------
+ drivers/ata/Kconfig | 2 +-
+ drivers/ata/ahci_xgene.c | 185 ++++++++++++++++++++++++++++++++++++++++++-
+ drivers/ata/libahci.c | 2 +-
+ drivers/ata/libata-core.c | 58 +++++++-------
+ drivers/ata/libata-eh.c | 2 +-
+ drivers/ata/libata-scsi.c | 14 ++--
+ drivers/ata/libata.h | 1 -
+ drivers/ata/sata_dwc_460ex.c | 142 ++++++++++++++++-----------------
+ include/linux/ata.h | 2 +-
+ include/linux/libata.h | 1 +
+ 11 files changed, 331 insertions(+), 153 deletions(-)
+Merging pm/linux-next (794c3a0a9380 Merge branches 'acpi-pm', 'acpi-processor' and 'acpi-video')
+$ git merge pm/linux-next
+Already up-to-date.
+Merging idle/next (f7c0e22f2d14 Merge branch 'turbostat' into release)
+$ git merge idle/next
+Resolved 'arch/x86/include/uapi/asm/msr-index.h' using previous resolution.
+Auto-merging drivers/cpufreq/Makefile
+Auto-merging arch/x86/include/uapi/asm/msr-index.h
+CONFLICT (content): Merge conflict in arch/x86/include/uapi/asm/msr-index.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master fbee93a5d8c4] Merge remote-tracking branch 'idle/next'
+$ git diff -M --stat --summary HEAD^..
+ arch/x86/include/uapi/asm/msr-index.h | 5 +
+ drivers/cpufreq/Kconfig.x86 | 10 ++
+ drivers/cpufreq/Makefile | 1 +
+ drivers/cpufreq/sfi-cpufreq.c | 136 ++++++++++++++++++++++++++
+ drivers/sfi/sfi_core.c | 4 +-
+ tools/power/x86/turbostat/turbostat.c | 179 +++++++++++++++++++++++++++++++---
+ 6 files changed, 321 insertions(+), 14 deletions(-)
+ create mode 100644 drivers/cpufreq/sfi-cpufreq.c
+Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
+$ git merge apm/for-next
+Already up-to-date.
+Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles)
+$ git merge cpupowerutils/master
+Already up-to-date.
+Merging thermal/next (783f0e5a024e Merge branches 'for-rc', 'int340x-enhancement' and 'int3406-thermal' of .git into next)
+$ git merge thermal/next
+Auto-merging drivers/acpi/video.c
+Merge made by the 'recursive' strategy.
+ drivers/acpi/int340x_thermal.c | 11 +-
+ drivers/acpi/video.c | 79 ++++---
+ drivers/thermal/Kconfig | 26 +--
+ drivers/thermal/int340x_thermal/Kconfig | 41 ++++
+ drivers/thermal/int340x_thermal/Makefile | 2 +
+ drivers/thermal/int340x_thermal/acpi_thermal_rel.c | 16 +-
+ drivers/thermal/int340x_thermal/int3402_thermal.c | 208 +++--------------
+ drivers/thermal/int340x_thermal/int3403_thermal.c | 208 +----------------
+ drivers/thermal/int340x_thermal/int3406_thermal.c | 229 ++++++++++++++++++
+ .../thermal/int340x_thermal/int340x_thermal_zone.c | 255 +++++++++++++++++++++
+ .../thermal/int340x_thermal/int340x_thermal_zone.h | 65 ++++++
+ .../int340x_thermal/processor_thermal_device.c | 92 ++++++++
+ drivers/video/backlight/backlight.c | 40 ++--
+ include/acpi/video.h | 20 ++
+ include/linux/backlight.h | 3 +-
+ 15 files changed, 835 insertions(+), 460 deletions(-)
+ create mode 100644 drivers/thermal/int340x_thermal/Kconfig
+ create mode 100644 drivers/thermal/int340x_thermal/int3406_thermal.c
+ create mode 100644 drivers/thermal/int340x_thermal/int340x_thermal_zone.c
+ create mode 100644 drivers/thermal/int340x_thermal/int340x_thermal_zone.h
+Merging thermal-soc/next (9477e18dd5d6 Documentation: thermal: document of_cpufreq_cooling_register())
+$ git merge thermal-soc/next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/thermal/cpu-cooling-api.txt | 15 +++++++++++++--
+ MAINTAINERS | 3 ++-
+ drivers/thermal/imx_thermal.c | 2 ++
+ drivers/thermal/of-thermal.c | 2 +-
+ drivers/thermal/thermal_core.h | 4 ++--
+ 5 files changed, 20 insertions(+), 6 deletions(-)
+Merging ieee1394/for-next (d737d7da8e7e firewire: sbp2: replace card lock by target lock)
+$ 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 (3e8ec65e62df Merge branch 'topic/rcar' into next)
+$ git merge slave-dma/next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 3 -
+ Documentation/dmaengine/provider.txt | 97 +-
+ MAINTAINERS | 2 +-
+ drivers/crypto/ux500/cryp/cryp_core.c | 4 +-
+ drivers/crypto/ux500/hash/hash_core.c | 2 +-
+ drivers/dma/Makefile | 2 +-
+ drivers/dma/amba-pl08x.c | 156 +-
+ drivers/dma/at_hdmac.c | 121 +-
+ drivers/dma/at_hdmac_regs.h | 3 +-
+ drivers/dma/at_xdmac.c | 127 +-
+ drivers/dma/bcm2835-dma.c | 46 +-
+ drivers/dma/coh901318.c | 137 +-
+ drivers/dma/cppi41.c | 30 +-
+ drivers/dma/dma-jz4740.c | 20 +-
+ drivers/dma/dmaengine.c | 51 +-
+ drivers/dma/dw/core.c | 82 +-
+ drivers/dma/dw/regs.h | 2 +-
+ drivers/dma/edma.c | 70 +-
+ drivers/dma/ep93xx_dma.c | 43 +-
+ drivers/dma/fsl-edma.c | 123 +-
+ drivers/dma/fsldma.c | 91 +-
+ drivers/dma/imx-dma.c | 108 +-
+ drivers/dma/imx-sdma.c | 84 +-
+ drivers/dma/intel_mid_dma.c | 25 +-
+ drivers/dma/ioat/dma_v3.c | 11 +
+ drivers/dma/ipu/ipu_idmac.c | 96 +-
+ drivers/dma/k3dma.c | 197 ++-
+ drivers/dma/mmp_pdma.c | 109 +-
+ drivers/dma/mmp_tdma.c | 82 +-
+ drivers/dma/moxart-dma.c | 25 +-
+ drivers/dma/mpc512x_dma.c | 111 +-
+ drivers/dma/mv_xor.c | 9 -
+ drivers/dma/mxs-dma.c | 61 +-
+ drivers/dma/nbpfaxi.c | 112 +-
+ drivers/dma/omap-dma.c | 69 +-
+ drivers/dma/pch_dma.c | 8 +-
+ drivers/dma/pl330.c | 134 +-
+ drivers/dma/qcom_bam_dma.c | 85 +-
+ drivers/dma/s3c24xx-dma.c | 75 +-
+ drivers/dma/sa11x0-dma.c | 158 +-
+ drivers/dma/sh/Kconfig | 14 +-
+ drivers/dma/sh/Makefile | 1 +
+ drivers/dma/sh/rcar-dmac.c | 1747 ++++++++++++++++++++
+ drivers/dma/sh/shdma-base.c | 72 +-
+ drivers/dma/sirf-dma.c | 59 +-
+ drivers/dma/ste_dma40.c | 63 +-
+ drivers/dma/sun6i-dma.c | 160 +-
+ drivers/dma/tegra20-apb-dma.c | 27 +-
+ drivers/dma/timb_dma.c | 8 +-
+ drivers/dma/txx9dmac.c | 9 +-
+ drivers/dma/xilinx/xilinx_vdma.c | 29 +-
+ drivers/rapidio/devices/tsi721_dma.c | 8 +-
+ include/linux/dmaengine.h | 124 +-
+ sound/soc/soc-generic-dmaengine-pcm.c | 2 +-
+ 54 files changed, 3315 insertions(+), 1779 deletions(-)
+ create mode 100644 drivers/dma/sh/rcar-dmac.c
+Merging net-next/master (fb57720daf6e Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge)
+$ git merge net-next/master
+Auto-merging drivers/net/ethernet/freescale/fec_main.c
+Auto-merging arch/arm/boot/dts/rk3288-evb.dtsi
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/net/fsl-fec.txt | 2 +
+ .../devicetree/bindings/net/rockchip-dwmac.txt | 67 +
+ .../networking/timestamping/txtimestamp.c | 8 -
+ MAINTAINERS | 3 +-
+ arch/arm/boot/dts/rk3288-evb-rk808.dts | 23 +
+ arch/arm/boot/dts/rk3288-evb.dtsi | 17 +
+ arch/arm/boot/dts/rk3288.dtsi | 54 +
+ arch/arm/mach-sa1100/assabet.c | 2 +-
+ arch/arm/mach-sa1100/collie.c | 2 +-
+ arch/arm/mach-sa1100/h3100.c | 2 +-
+ arch/arm/mach-sa1100/h3600.c | 2 +-
+ arch/microblaze/kernel/timer.c | 1 +
+ drivers/bluetooth/bfusb.c | 2 +
+ drivers/bluetooth/btusb.c | 34 +-
+ drivers/clk/rockchip/clk-rk3288.c | 14 +-
+ drivers/clocksource/arm_arch_timer.c | 1 +
+ drivers/infiniband/hw/cxgb4/t4.h | 26 +-
+ drivers/isdn/hisax/hfc4s8s_l1.c | 21 -
+ drivers/net/ethernet/amd/xgbe/xgbe-ptp.c | 8 +-
+ drivers/net/ethernet/amd/xgbe/xgbe.h | 2 +-
+ drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 94 +-
+ drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 97 +-
+ drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 3 +
+ drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 5 +-
+ drivers/net/ethernet/atheros/atlx/atl2.c | 10 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 2 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 8 +-
+ drivers/net/ethernet/chelsio/cxgb3/mc5.c | 16 -
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 16 +
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 524 ++++
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.h | 12 +
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 292 +-
+ drivers/net/ethernet/chelsio/cxgb4/l2t.c | 9 +-
+ drivers/net/ethernet/chelsio/cxgb4/sge.c | 174 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 1115 ++++----
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.h | 19 +
+ drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h | 1 +
+ drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 2892 +++++++++++++-------
+ drivers/net/ethernet/chelsio/cxgb4/t4_values.h | 118 +
+ drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 81 +
+ .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 40 +-
+ drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 47 +-
+ drivers/net/ethernet/chelsio/cxgb4vf/t4vf_defs.h | 4 +-
+ drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 43 +-
+ drivers/net/ethernet/cisco/enic/enic.h | 16 +-
+ drivers/net/ethernet/cisco/enic/enic_dev.c | 56 -
+ drivers/net/ethernet/cisco/enic/enic_dev.h | 5 -
+ drivers/net/ethernet/cisco/enic/enic_ethtool.c | 19 +-
+ drivers/net/ethernet/cisco/enic/enic_main.c | 169 +-
+ drivers/net/ethernet/cisco/enic/vnic_stats.h | 5 +
+ drivers/net/ethernet/cisco/enic/vnic_wq.c | 3 +
+ drivers/net/ethernet/cisco/enic/vnic_wq.h | 1 +
+ drivers/net/ethernet/emulex/benet/be.h | 4 +-
+ drivers/net/ethernet/emulex/benet/be_ethtool.c | 2 -
+ drivers/net/ethernet/emulex/benet/be_hw.h | 5 +
+ drivers/net/ethernet/emulex/benet/be_main.c | 238 +-
+ drivers/net/ethernet/freescale/Kconfig | 3 +-
+ drivers/net/ethernet/freescale/fec.h | 3 +
+ drivers/net/ethernet/freescale/fec_main.c | 104 +-
+ drivers/net/ethernet/freescale/fec_ptp.c | 16 +-
+ drivers/net/ethernet/freescale/gianfar.c | 11 +-
+ drivers/net/ethernet/freescale/gianfar.h | 2 +-
+ drivers/net/ethernet/freescale/xgmac_mdio.c | 82 +-
+ drivers/net/ethernet/intel/e1000e/e1000.h | 2 +-
+ drivers/net/ethernet/intel/e1000e/netdev.c | 2 +-
+ drivers/net/ethernet/intel/e1000e/ptp.c | 5 +-
+ drivers/net/ethernet/intel/igb/igb.h | 2 +-
+ drivers/net/ethernet/intel/igb/igb_ptp.c | 11 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe.h | 2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 13 +-
+ drivers/net/ethernet/mellanox/mlx4/en_clock.c | 10 +-
+ drivers/net/ethernet/micrel/ksz884x.c | 4 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 17 +-
+ drivers/net/ethernet/realtek/r8169.c | 12 +-
+ drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 10 +-
+ drivers/net/ethernet/stmicro/stmmac/Makefile | 2 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 459 ++++
+ .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 1 +
+ .../net/ethernet/stmicro/stmmac/stmmac_platform.h | 1 +
+ drivers/net/ethernet/ti/cpts.c | 5 +-
+ drivers/net/ethernet/ti/cpts.h | 1 +
+ drivers/net/fddi/skfp/smt.c | 12 -
+ drivers/net/ieee802154/at86rf230.c | 82 +-
+ drivers/net/ieee802154/cc2520.c | 27 +-
+ drivers/net/ieee802154/mrf24j40.c | 6 +-
+ drivers/net/irda/sa1100_ir.c | 2 +-
+ drivers/net/tun.c | 4 +-
+ drivers/net/virtio_net.c | 2 +
+ drivers/net/vmxnet3/vmxnet3_defs.h | 1 +
+ drivers/net/vmxnet3/vmxnet3_drv.c | 6 +-
+ drivers/net/vmxnet3/vmxnet3_ethtool.c | 27 +-
+ drivers/net/vmxnet3/vmxnet3_int.h | 6 +-
+ drivers/net/vxlan.c | 53 +-
+ drivers/net/wireless/ath/ath9k/debug.c | 71 +
+ drivers/net/wireless/ath/ath9k/hw.c | 3 +
+ drivers/net/wireless/ath/ath9k/xmit.c | 2 +-
+ drivers/net/wireless/ath/dfs_pattern_detector.c | 2 +-
+ drivers/net/wireless/rsi/rsi_91x_sdio_ops.c | 4 +-
+ drivers/net/wireless/rtlwifi/base.c | 156 +-
+ drivers/net/wireless/rtlwifi/base.h | 4 +-
+ drivers/net/wireless/rtlwifi/core.c | 24 +-
+ drivers/net/wireless/rtlwifi/core.h | 1 +
+ drivers/net/wireless/rtlwifi/rtl8188ee/trx.c | 162 +-
+ drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h | 1 +
+ drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 165 +-
+ drivers/net/wireless/rtlwifi/rtl8192ce/phy.c | 5 +-
+ drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 30 +-
+ drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 13 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | 4 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 28 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 20 +-
+ drivers/net/wireless/rtlwifi/rtl8192de/fw.c | 17 -
+ drivers/net/wireless/rtlwifi/rtl8192de/fw.h | 1 -
+ drivers/net/wireless/rtlwifi/rtl8192de/sw.c | 30 +-
+ drivers/net/wireless/rtlwifi/rtl8192de/trx.c | 27 +-
+ drivers/net/wireless/rtlwifi/rtl8192ee/trx.c | 196 +-
+ drivers/net/wireless/rtlwifi/rtl8192ee/trx.h | 9 +-
+ drivers/net/wireless/rtlwifi/rtl8192se/def.h | 8 +-
+ drivers/net/wireless/rtlwifi/rtl8192se/sw.c | 30 +-
+ drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 23 +-
+ drivers/net/wireless/rtlwifi/rtl8723ae/trx.c | 162 +-
+ drivers/net/wireless/rtlwifi/rtl8723be/phy.c | 25 -
+ drivers/net/wireless/rtlwifi/rtl8723be/phy.h | 2 -
+ drivers/net/wireless/rtlwifi/rtl8723be/trx.c | 162 +-
+ drivers/net/wireless/rtlwifi/rtl8821ae/def.h | 54 -
+ drivers/net/wireless/rtlwifi/rtl8821ae/pwrseq.h | 4 +-
+ drivers/net/wireless/rtlwifi/rtl8821ae/sw.c | 74 +-
+ drivers/net/wireless/rtlwifi/rtl8821ae/trx.c | 232 +-
+ drivers/net/wireless/rtlwifi/wifi.h | 96 +-
+ drivers/scsi/csiostor/csio_hw.c | 792 +++---
+ drivers/scsi/csiostor/csio_hw.h | 13 +-
+ drivers/scsi/csiostor/csio_hw_chip.h | 65 +-
+ drivers/scsi/csiostor/csio_hw_t4.c | 144 +-
+ drivers/scsi/csiostor/csio_hw_t5.c | 150 +-
+ drivers/scsi/csiostor/csio_isr.c | 2 +-
+ drivers/scsi/csiostor/csio_mb.c | 53 +-
+ drivers/scsi/csiostor/csio_wr.c | 154 +-
+ include/clocksource/arm_arch_timer.h | 2 +-
+ include/dt-bindings/clock/rk3288-cru.h | 3 +
+ include/linux/clocksource.h | 102 -
+ include/linux/etherdevice.h | 4 +
+ include/linux/fec.h | 1 +
+ include/linux/list_nulls.h | 6 +-
+ include/linux/mlx4/device.h | 2 +-
+ include/linux/phy.h | 9 +
+ .../linux/platform_data/irda-sa11x0.h | 0
+ include/linux/rhashtable.h | 262 +-
+ include/linux/spinlock.h | 8 +
+ include/linux/spinlock_api_smp.h | 2 +
+ include/linux/spinlock_api_up.h | 1 +
+ include/linux/timecounter.h | 139 +
+ include/linux/types.h | 3 +
+ include/linux/udp.h | 16 +-
+ include/net/bluetooth/hci.h | 53 +
+ include/net/bluetooth/hci_core.h | 35 +-
+ include/net/bluetooth/l2cap.h | 1 +
+ include/net/bluetooth/rfcomm.h | 2 -
+ include/net/cfg802154.h | 10 +-
+ include/net/geneve.h | 5 +-
+ include/net/ieee802154_netdev.h | 4 +-
+ include/net/inet_connection_sock.h | 3 +-
+ include/net/inet_sock.h | 29 +-
+ include/net/ip.h | 7 +-
+ include/net/ip6_fib.h | 10 +-
+ include/net/ip_fib.h | 50 +-
+ include/net/mac802154.h | 5 +-
+ include/net/netlink.h | 4 +-
+ include/net/nl802154.h | 45 +-
+ include/net/tcp.h | 22 +-
+ include/uapi/linux/in.h | 1 +
+ include/uapi/linux/ipv6.h | 5 +-
+ include/uapi/linux/l2tp.h | 1 +
+ include/uapi/linux/libc-compat.h | 6 +
+ include/uapi/linux/rtnetlink.h | 2 +
+ kernel/locking/spinlock.c | 8 +
+ kernel/time/Makefile | 2 +-
+ kernel/time/clocksource.c | 76 -
+ kernel/time/timecounter.c | 112 +
+ lib/rhashtable.c | 707 +++--
+ net/batman-adv/Kconfig | 1 +
+ net/batman-adv/bat_iv_ogm.c | 15 +-
+ net/batman-adv/bitarray.c | 1 -
+ net/batman-adv/bitarray.h | 3 +-
+ net/batman-adv/bridge_loop_avoidance.c | 17 +-
+ net/batman-adv/debugfs.c | 2 +-
+ net/batman-adv/distributed-arp-table.c | 1 +
+ net/batman-adv/distributed-arp-table.h | 4 +-
+ net/batman-adv/fragmentation.c | 1 -
+ net/batman-adv/fragmentation.h | 3 +-
+ net/batman-adv/gateway_client.c | 1 +
+ net/batman-adv/main.c | 10 +-
+ net/batman-adv/main.h | 15 +-
+ net/batman-adv/multicast.h | 3 -
+ net/batman-adv/network-coding.c | 3 +-
+ net/batman-adv/originator.c | 1 -
+ net/batman-adv/originator.h | 1 -
+ net/batman-adv/packet.h | 5 +-
+ net/batman-adv/routing.c | 3 +-
+ net/batman-adv/soft-interface.c | 1 -
+ net/batman-adv/sysfs.c | 1 -
+ net/batman-adv/translation-table.c | 8 +-
+ net/batman-adv/types.h | 4 +-
+ net/bluetooth/Kconfig | 27 +
+ net/bluetooth/Makefile | 4 +-
+ net/bluetooth/af_bluetooth.c | 6 +
+ net/bluetooth/hci_conn.c | 4 +
+ net/bluetooth/hci_core.c | 1640 +----------
+ net/bluetooth/hci_debugfs.c | 1076 ++++++++
+ net/bluetooth/hci_debugfs.h | 26 +
+ net/bluetooth/hci_event.c | 71 +-
+ net/bluetooth/hci_request.c | 555 ++++
+ net/bluetooth/hci_request.h | 54 +
+ net/bluetooth/mgmt.c | 265 +-
+ net/bluetooth/rfcomm/core.c | 4 +-
+ net/bluetooth/selftest.c | 244 ++
+ net/bluetooth/selftest.h | 45 +
+ net/bluetooth/smp.c | 335 ++-
+ net/bluetooth/smp.h | 13 +
+ net/bridge/br_fdb.c | 7 +-
+ net/core/ethtool.c | 45 +-
+ net/core/rtnetlink.c | 20 +-
+ net/core/skbuff.c | 7 -
+ net/decnet/dn_fib.c | 3 +-
+ net/decnet/dn_table.c | 4 +-
+ net/ethernet/eth.c | 92 +
+ net/ieee802154/nl-mac.c | 4 +-
+ net/ieee802154/nl802154.c | 46 +-
+ net/ieee802154/rdev-ops.h | 7 +
+ net/ieee802154/sysfs.c | 2 +-
+ net/ipv4/fib_frontend.c | 29 +-
+ net/ipv4/fib_rules.c | 22 +-
+ net/ipv4/fib_semantics.c | 14 +-
+ net/ipv4/fib_trie.c | 1916 ++++++-------
+ net/ipv4/fou.c | 2 +-
+ net/ipv4/geneve.c | 198 +-
+ net/ipv4/ip_gre.c | 1 +
+ net/ipv4/ip_sockglue.c | 108 +-
+ net/ipv4/tcp_cong.c | 121 +-
+ net/ipv4/tcp_ipv4.c | 2 +
+ net/ipv4/tcp_minisocks.c | 30 +-
+ net/ipv4/tcp_output.c | 21 +
+ net/ipv4/udp.c | 4 +-
+ net/ipv4/udp_tunnel.c | 2 +-
+ net/ipv6/ip6_fib.c | 68 +-
+ net/ipv6/route.c | 72 +-
+ net/ipv6/tcp_ipv6.c | 2 +
+ net/ipv6/udp.c | 2 +-
+ net/l2tp/l2tp_netlink.c | 101 +-
+ net/mac802154/cfg.c | 21 +
+ net/mac802154/driver-ops.h | 5 +-
+ net/mac802154/iface.c | 100 +-
+ net/mac802154/mac_cmd.c | 6 +-
+ net/netfilter/nft_hash.c | 92 +-
+ net/netlink/af_netlink.c | 64 +-
+ net/netlink/af_netlink.h | 1 +
+ net/netlink/diag.c | 4 +-
+ net/tipc/Kconfig | 12 -
+ net/tipc/config.c | 24 +-
+ net/tipc/core.c | 10 +-
+ net/tipc/core.h | 3 -
+ net/tipc/link.c | 2 +-
+ net/tipc/socket.c | 480 ++--
+ net/tipc/socket.h | 4 +-
+ sound/pci/hda/hda_priv.h | 2 +-
+ virt/kvm/arm/arch_timer.c | 3 +-
+ 265 files changed, 12318 insertions(+), 8369 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/net/rockchip-dwmac.txt
+ create mode 100644 drivers/net/ethernet/chelsio/cxgb4/t4_values.h
+ create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
+ rename arch/arm/include/asm/mach/irda.h => include/linux/platform_data/irda-sa11x0.h (100%)
+ create mode 100644 include/linux/timecounter.h
+ create mode 100644 kernel/time/timecounter.c
+ create mode 100644 net/bluetooth/hci_debugfs.c
+ create mode 100644 net/bluetooth/hci_debugfs.h
+ create mode 100644 net/bluetooth/hci_request.c
+ create mode 100644 net/bluetooth/hci_request.h
+ create mode 100644 net/bluetooth/selftest.c
+ create mode 100644 net/bluetooth/selftest.h
+$ git am -3 ../patches/0001-Revert-doc-fix-the-compile-error-of-txtimestamp.c.patch
+Applying: Revert "doc: fix the compile error of txtimestamp.c"
+$ git reset HEAD^
+Unstaged changes after reset:
+M Documentation/networking/timestamping/txtimestamp.c
+$ git add -A .
+$ git commit -v -a --amend
+[master e353d5c31eee] Merge remote-tracking branch 'net-next/master'
+ Date: Mon Jan 12 13:35:34 2015 +1100
+Merging ipsec-next/master (fbe68ee87522 vti6: Add a lookup method for tunnels with wildcard endpoints.)
+$ git merge ipsec-next/master
+Already up-to-date.
+Merging wireless-drivers-next/master (350b193ebd50 Merge ath-next from ath.git)
+$ git merge wireless-drivers-next/master
+Auto-merging drivers/net/wireless/iwlwifi/mvm/utils.c
+Auto-merging drivers/net/wireless/iwlwifi/mvm/tx.c
+Auto-merging drivers/net/wireless/iwlwifi/mvm/scan.c
+Auto-merging drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h
+Auto-merging drivers/net/wireless/iwlwifi/iwl-fw-file.h
+Auto-merging drivers/net/wireless/iwlwifi/iwl-8000.c
+Auto-merging drivers/net/wireless/iwlwifi/iwl-7000.c
+Merge made by the 'recursive' strategy.
+ .../bindings/net/wireless/qcom,ath10k.txt | 30 +
+ drivers/net/wireless/ath/ath10k/Makefile | 2 +
+ drivers/net/wireless/ath/ath10k/ce.c | 2 +
+ drivers/net/wireless/ath/ath10k/core.c | 250 ++-
+ drivers/net/wireless/ath/ath10k/core.h | 21 +-
+ drivers/net/wireless/ath/ath10k/debug.c | 88 +-
+ drivers/net/wireless/ath/ath10k/htt_tx.c | 5 -
+ drivers/net/wireless/ath/ath10k/hw.h | 30 +
+ drivers/net/wireless/ath/ath10k/mac.c | 192 +-
+ drivers/net/wireless/ath/ath10k/pci.c | 31 +
+ drivers/net/wireless/ath/ath10k/pci.h | 5 +
+ drivers/net/wireless/ath/ath10k/spectral.c | 1 +
+ drivers/net/wireless/ath/ath10k/testmode.c | 5 +-
+ drivers/net/wireless/ath/ath10k/thermal.c | 243 +++
+ drivers/net/wireless/ath/ath10k/thermal.h | 58 +
+ drivers/net/wireless/ath/ath10k/wmi-ops.h | 860 ++++++++
+ drivers/net/wireless/ath/ath10k/wmi-tlv.c | 2222 ++++++++++++++++++++
+ drivers/net/wireless/ath/ath10k/wmi-tlv.h | 1380 ++++++++++++
+ drivers/net/wireless/ath/ath10k/wmi.c | 1737 ++++++++++-----
+ drivers/net/wireless/ath/ath10k/wmi.h | 302 ++-
+ drivers/net/wireless/ath/ath5k/ahb.c | 1 -
+ drivers/net/wireless/ath/wil6210/debugfs.c | 4 +-
+ drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 20 +-
+ drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c | 176 +-
+ drivers/net/wireless/brcm80211/brcmfmac/cfg80211.h | 5 +
+ drivers/net/wireless/brcm80211/brcmfmac/chip.c | 15 +-
+ drivers/net/wireless/brcm80211/brcmfmac/common.c | 3 +
+ drivers/net/wireless/brcm80211/brcmfmac/common.h | 20 +
+ drivers/net/wireless/brcm80211/brcmfmac/core.c | 3 +-
+ drivers/net/wireless/brcm80211/brcmfmac/core.h | 4 +-
+ drivers/net/wireless/brcm80211/brcmfmac/flowring.c | 6 +-
+ drivers/net/wireless/brcm80211/brcmfmac/fwil.h | 4 +
+ .../net/wireless/brcm80211/brcmfmac/fwil_types.h | 14 +
+ drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c | 24 +-
+ drivers/net/wireless/brcm80211/brcmfmac/pcie.c | 10 +-
+ drivers/net/wireless/brcm80211/brcmfmac/sdio.c | 7 +-
+ .../net/wireless/brcm80211/include/brcm_hw_ids.h | 12 +-
+ drivers/net/wireless/cw1200/main.c | 5 +-
+ drivers/net/wireless/cw1200/pm.c | 5 +-
+ drivers/net/wireless/cw1200/queue.c | 4 +-
+ drivers/net/wireless/iwlegacy/3945-mac.c | 4 +-
+ drivers/net/wireless/iwlegacy/4965-mac.c | 9 +-
+ drivers/net/wireless/iwlwifi/dvm/main.c | 24 +-
+ drivers/net/wireless/iwlwifi/dvm/tt.c | 13 +-
+ drivers/net/wireless/iwlwifi/iwl-7000.c | 23 +-
+ drivers/net/wireless/iwlwifi/iwl-8000.c | 17 +-
+ drivers/net/wireless/iwlwifi/iwl-config.h | 10 +-
+ drivers/net/wireless/iwlwifi/iwl-csr.h | 1 +
+ drivers/net/wireless/iwlwifi/iwl-drv.c | 81 +-
+ drivers/net/wireless/iwlwifi/iwl-drv.h | 1 -
+ drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h | 22 +-
+ drivers/net/wireless/iwlwifi/iwl-fw-file.h | 1 +
+ drivers/net/wireless/iwlwifi/iwl-fw.h | 4 +
+ drivers/net/wireless/iwlwifi/iwl-modparams.h | 2 +
+ drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 6 +
+ drivers/net/wireless/iwlwifi/iwl-prph.h | 5 +
+ drivers/net/wireless/iwlwifi/iwl-trans.h | 21 +
+ drivers/net/wireless/iwlwifi/mvm/coex.c | 4 +-
+ drivers/net/wireless/iwlwifi/mvm/coex_legacy.c | 4 +-
+ drivers/net/wireless/iwlwifi/mvm/constants.h | 28 +
+ drivers/net/wireless/iwlwifi/mvm/d3.c | 51 +-
+ drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c | 2 +-
+ drivers/net/wireless/iwlwifi/mvm/debugfs.c | 56 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 7 +-
+ drivers/net/wireless/iwlwifi/mvm/fw.c | 31 +-
+ drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 2 +-
+ drivers/net/wireless/iwlwifi/mvm/mac80211.c | 102 +-
+ drivers/net/wireless/iwlwifi/mvm/mvm.h | 34 +
+ drivers/net/wireless/iwlwifi/mvm/ops.c | 41 +-
+ drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c | 2 +-
+ drivers/net/wireless/iwlwifi/mvm/rs.c | 169 +-
+ drivers/net/wireless/iwlwifi/mvm/rs.h | 39 -
+ drivers/net/wireless/iwlwifi/mvm/scan.c | 28 +-
+ drivers/net/wireless/iwlwifi/mvm/sta.c | 16 +-
+ drivers/net/wireless/iwlwifi/mvm/tt.c | 7 +-
+ drivers/net/wireless/iwlwifi/mvm/tx.c | 2 +-
+ drivers/net/wireless/iwlwifi/mvm/utils.c | 4 +-
+ drivers/net/wireless/iwlwifi/pcie/internal.h | 8 +
+ drivers/net/wireless/iwlwifi/pcie/trans.c | 64 +-
+ drivers/net/wireless/iwlwifi/pcie/tx.c | 34 +-
+ drivers/net/wireless/mwifiex/11n.h | 14 +-
+ drivers/net/wireless/mwifiex/11n_aggr.c | 15 +-
+ drivers/net/wireless/mwifiex/11n_rxreorder.c | 6 +-
+ drivers/net/wireless/mwifiex/Makefile | 2 +
+ drivers/net/wireless/mwifiex/cfg80211.c | 99 +-
+ drivers/net/wireless/mwifiex/cfp.c | 18 +
+ drivers/net/wireless/mwifiex/cmdevt.c | 6 -
+ drivers/net/wireless/mwifiex/debugfs.c | 281 +--
+ drivers/net/wireless/mwifiex/decl.h | 34 +-
+ drivers/net/wireless/mwifiex/ethtool.c | 16 +-
+ drivers/net/wireless/mwifiex/fw.h | 3 +
+ drivers/net/wireless/mwifiex/init.c | 23 +
+ drivers/net/wireless/mwifiex/ioctl.h | 11 +-
+ drivers/net/wireless/mwifiex/main.c | 133 +-
+ drivers/net/wireless/mwifiex/main.h | 24 +-
+ drivers/net/wireless/mwifiex/pcie.c | 5 +-
+ drivers/net/wireless/mwifiex/sdio.c | 104 +-
+ drivers/net/wireless/mwifiex/sdio.h | 26 +
+ drivers/net/wireless/mwifiex/sta_cmd.c | 7 +-
+ drivers/net/wireless/mwifiex/sta_cmdresp.c | 2 +
+ drivers/net/wireless/mwifiex/sta_event.c | 7 +
+ drivers/net/wireless/mwifiex/sta_ioctl.c | 6 +-
+ drivers/net/wireless/mwifiex/sta_rx.c | 9 +
+ drivers/net/wireless/mwifiex/sta_tx.c | 19 +-
+ drivers/net/wireless/mwifiex/tdls.c | 35 +-
+ drivers/net/wireless/mwifiex/uap_event.c | 2 +
+ drivers/net/wireless/mwifiex/uap_txrx.c | 28 +-
+ drivers/net/wireless/mwifiex/usb.c | 11 +-
+ drivers/net/wireless/mwifiex/usb.h | 7 -
+ drivers/net/wireless/mwifiex/util.c | 220 ++
+ drivers/net/wireless/mwifiex/util.h | 20 +
+ drivers/net/wireless/orinoco/orinoco_usb.c | 4 +-
+ drivers/net/wireless/rt2x00/rt2x00config.c | 4 +-
+ drivers/net/wireless/rt2x00/rt2x00dev.c | 18 +-
+ drivers/net/wireless/rt2x00/rt2x00firmware.c | 2 +-
+ drivers/net/wireless/rt2x00/rt2x00mac.c | 2 +-
+ drivers/net/wireless/rt2x00/rt2x00queue.c | 18 +-
+ drivers/net/wireless/rt2x00/rt2x00usb.c | 8 +-
+ drivers/net/wireless/rtlwifi/core.c | 37 +
+ drivers/net/wireless/rtlwifi/core.h | 41 +
+ drivers/net/wireless/rtlwifi/rtl8188ee/dm.c | 36 +-
+ drivers/net/wireless/rtlwifi/rtl8188ee/dm.h | 41 -
+ drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 45 +-
+ drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h | 38 -
+ drivers/net/wireless/rtlwifi/rtl8192ce/dm.c | 1 +
+ drivers/net/wireless/rtlwifi/rtl8192ce/dm.h | 13 -
+ drivers/net/wireless/rtlwifi/rtl8192de/dm.c | 33 +-
+ drivers/net/wireless/rtlwifi/rtl8192de/dm.h | 38 -
+ drivers/net/wireless/rtlwifi/rtl8192ee/dm.c | 55 +-
+ drivers/net/wireless/rtlwifi/rtl8192ee/dm.h | 16 -
+ drivers/net/wireless/rtlwifi/rtl8192se/dm.c | 7 +-
+ drivers/net/wireless/rtlwifi/rtl8192se/dm.h | 28 -
+ drivers/net/wireless/rtlwifi/rtl8723ae/dm.c | 42 +-
+ drivers/net/wireless/rtlwifi/rtl8723ae/dm.h | 38 -
+ drivers/net/wireless/rtlwifi/rtl8723be/dm.c | 55 +-
+ drivers/net/wireless/rtlwifi/rtl8723be/dm.h | 33 -
+ drivers/net/wireless/rtlwifi/rtl8723be/sw.c | 10 +-
+ drivers/net/wireless/rtlwifi/rtl8821ae/dm.c | 58 +-
+ drivers/net/wireless/rtlwifi/rtl8821ae/dm.h | 41 -
+ drivers/net/wireless/rtlwifi/wifi.h | 2 -
+ drivers/net/wireless/ti/wl12xx/main.c | 4 +
+ drivers/net/wireless/ti/wl18xx/acx.c | 88 +
+ drivers/net/wireless/ti/wl18xx/acx.h | 46 +-
+ drivers/net/wireless/ti/wl18xx/cmd.c | 93 +-
+ drivers/net/wireless/ti/wl18xx/cmd.h | 27 +
+ drivers/net/wireless/ti/wl18xx/conf.h | 23 +-
+ drivers/net/wireless/ti/wl18xx/debugfs.c | 43 +
+ drivers/net/wireless/ti/wl18xx/event.c | 21 +
+ drivers/net/wireless/ti/wl18xx/event.h | 14 +-
+ drivers/net/wireless/ti/wl18xx/main.c | 37 +-
+ drivers/net/wireless/ti/wl18xx/wl18xx.h | 4 +-
+ drivers/net/wireless/ti/wlcore/cmd.c | 20 +-
+ drivers/net/wireless/ti/wlcore/cmd.h | 8 +
+ drivers/net/wireless/ti/wlcore/conf.h | 7 +-
+ drivers/net/wireless/ti/wlcore/debugfs.c | 9 +-
+ drivers/net/wireless/ti/wlcore/event.c | 11 +-
+ drivers/net/wireless/ti/wlcore/hw_ops.h | 48 +-
+ drivers/net/wireless/ti/wlcore/init.c | 8 +-
+ drivers/net/wireless/ti/wlcore/main.c | 381 +++-
+ drivers/net/wireless/ti/wlcore/ps.c | 8 +-
+ drivers/net/wireless/ti/wlcore/vendor_cmd.c | 2 +-
+ drivers/net/wireless/ti/wlcore/wlcore.h | 12 +-
+ drivers/net/wireless/ti/wlcore/wlcore_i.h | 7 +
+ include/linux/mmc/sdio_ids.h | 6 +-
+ 164 files changed, 9551 insertions(+), 2118 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt
+ create mode 100644 drivers/net/wireless/ath/ath10k/thermal.c
+ create mode 100644 drivers/net/wireless/ath/ath10k/thermal.h
+ create mode 100644 drivers/net/wireless/ath/ath10k/wmi-ops.h
+ create mode 100644 drivers/net/wireless/ath/ath10k/wmi-tlv.c
+ create mode 100644 drivers/net/wireless/ath/ath10k/wmi-tlv.h
+ create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/common.h
+Merging bluetooth/master (bc6efeeeb5a2 ieee802154: 6lowpan: fix Makefile entry)
+$ git merge bluetooth/master
+Removing net/ieee802154/reassembly.h
+Removing net/ieee802154/raw.c
+Removing net/ieee802154/dgram.c
+Removing net/ieee802154/af_ieee802154.c
+Removing net/ieee802154/af802154.h
+Removing net/ieee802154/6lowpan_rtnl.c
+Auto-merging net/ieee802154/6lowpan/reassembly.c
+Merge made by the 'recursive' strategy.
+ drivers/bluetooth/btmrvl_drv.h | 5 +-
+ drivers/bluetooth/btmrvl_main.c | 32 +-
+ drivers/bluetooth/btmrvl_sdio.c | 6 +-
+ drivers/bluetooth/btusb.c | 11 +-
+ include/net/bluetooth/hci.h | 15 +-
+ include/net/bluetooth/hci_core.h | 3 +-
+ net/bluetooth/hci_core.c | 67 +-
+ net/bluetooth/hci_debugfs.c | 143 +---
+ net/bluetooth/l2cap_core.c | 2 +-
+ net/bluetooth/mgmt.c | 11 +-
+ net/bluetooth/smp.c | 80 +-
+ net/ieee802154/6lowpan/6lowpan_i.h | 72 ++
+ net/ieee802154/6lowpan/Kconfig | 5 +
+ net/ieee802154/6lowpan/Makefile | 3 +
+ net/ieee802154/6lowpan/core.c | 304 ++++++++
+ net/ieee802154/{ => 6lowpan}/reassembly.c | 2 +-
+ net/ieee802154/6lowpan/rx.c | 171 +++++
+ net/ieee802154/6lowpan/tx.c | 271 +++++++
+ net/ieee802154/6lowpan_rtnl.c | 729 -------------------
+ net/ieee802154/Kconfig | 18 +-
+ net/ieee802154/Makefile | 8 +-
+ net/ieee802154/af802154.h | 33 -
+ net/ieee802154/af_ieee802154.c | 369 ----------
+ net/ieee802154/dgram.c | 549 --------------
+ net/ieee802154/raw.c | 270 -------
+ net/ieee802154/reassembly.h | 41 --
+ net/ieee802154/socket.c | 1125 +++++++++++++++++++++++++++++
+ net/mac802154/cfg.c | 5 +-
+ 28 files changed, 2153 insertions(+), 2197 deletions(-)
+ create mode 100644 net/ieee802154/6lowpan/6lowpan_i.h
+ create mode 100644 net/ieee802154/6lowpan/Kconfig
+ create mode 100644 net/ieee802154/6lowpan/Makefile
+ create mode 100644 net/ieee802154/6lowpan/core.c
+ rename net/ieee802154/{ => 6lowpan}/reassembly.c (99%)
+ create mode 100644 net/ieee802154/6lowpan/rx.c
+ create mode 100644 net/ieee802154/6lowpan/tx.c
+ delete mode 100644 net/ieee802154/6lowpan_rtnl.c
+ delete mode 100644 net/ieee802154/af802154.h
+ delete mode 100644 net/ieee802154/af_ieee802154.c
+ delete mode 100644 net/ieee802154/dgram.c
+ delete mode 100644 net/ieee802154/raw.c
+ delete mode 100644 net/ieee802154/reassembly.h
+ create mode 100644 net/ieee802154/socket.c
+Merging infiniband/for-next (a7cfef21e3d0 Merge branches 'core', 'cxgb4', 'ipoib', 'iser', 'mlx4', 'ocrdma', 'odp' and 'srp' into for-next)
+$ git merge infiniband/for-next
+Already up-to-date.
+Merging mtd/master (97bf6af1f928 Linux 3.19-rc1)
+$ git merge mtd/master
+Already up-to-date.
+Merging l2-mtd/master (6958024ad5cd mtd: map_rom: Support UBI on ROM)
+$ git merge l2-mtd/master
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mtd/fsl-quadspi.txt | 2 +-
+ .../devicetree/bindings/mtd/gpmi-nand.txt | 2 +-
+ .../devicetree/bindings/mtd/mtd-physmap.txt | 5 ++
+ drivers/mtd/bcm47xxpart.c | 43 ++++++++++++---
+ drivers/mtd/chips/map_ram.c | 1 +
+ drivers/mtd/chips/map_rom.c | 13 ++++-
+ drivers/mtd/maps/physmap_of.c | 10 ++++
+ drivers/mtd/mtdblock.c | 10 ----
+ drivers/mtd/mtdcore.c | 20 +++++++
+ drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 9 ----
+ drivers/mtd/nand/nand_base.c | 12 ++++-
+ drivers/mtd/nftlmount.c | 18 ++++---
+ drivers/mtd/spi-nor/spi-nor.c | 62 +++++++++++++++++++---
+ include/linux/mtd/mtd.h | 1 +
+ include/linux/mtd/spi-nor.h | 7 +++
+ 15 files changed, 171 insertions(+), 44 deletions(-)
+Merging crypto/master (8155330aad47 lib: memzero_explicit: add comment for its usage)
+$ git merge crypto/master
+Auto-merging drivers/crypto/ux500/cryp/cryp_core.c
+Merge made by the 'recursive' strategy.
+ arch/mips/cavium-octeon/Makefile | 1 +
+ arch/mips/cavium-octeon/crypto/Makefile | 7 +
+ arch/mips/cavium-octeon/crypto/octeon-crypto.c | 66 +++
+ arch/mips/cavium-octeon/crypto/octeon-crypto.h | 75 +++
+ arch/mips/cavium-octeon/crypto/octeon-md5.c | 216 ++++++++
+ arch/mips/cavium-octeon/executive/octeon-model.c | 6 +
+ arch/mips/include/asm/octeon/octeon-feature.h | 17 +-
+ arch/mips/include/asm/octeon/octeon.h | 5 -
+ crypto/Kconfig | 18 +
+ crypto/Makefile | 1 +
+ crypto/ablkcipher.c | 8 +-
+ crypto/aead.c | 3 +-
+ crypto/af_alg.c | 11 +-
+ crypto/ahash.c | 1 +
+ crypto/algapi.c | 1 +
+ crypto/algif_rng.c | 192 +++++++
+ crypto/algif_skcipher.c | 8 +
+ crypto/drbg.c | 34 +-
+ drivers/char/hw_random/core.c | 215 +++++---
+ drivers/crypto/amcc/crypto4xx_sa.c | 23 -
+ drivers/crypto/atmel-sha.c | 50 +-
+ drivers/crypto/bfin_crc.c | 2 +-
+ drivers/crypto/omap-des.c | 4 +-
+ drivers/crypto/qat/qat_common/icp_qat_hw.h | 2 +-
+ drivers/crypto/qat/qat_common/qat_algs.c | 625 +++++++++++++++++------
+ drivers/crypto/qat/qat_common/qat_crypto.h | 16 +-
+ drivers/crypto/ux500/cryp/cryp_core.c | 8 +-
+ include/crypto/if_alg.h | 1 +
+ include/linux/crypto.h | 3 +
+ include/linux/hw_random.h | 4 +
+ lib/string.c | 5 +
+ 31 files changed, 1298 insertions(+), 330 deletions(-)
+ create mode 100644 arch/mips/cavium-octeon/crypto/Makefile
+ create mode 100644 arch/mips/cavium-octeon/crypto/octeon-crypto.c
+ create mode 100644 arch/mips/cavium-octeon/crypto/octeon-crypto.h
+ create mode 100644 arch/mips/cavium-octeon/crypto/octeon-md5.c
+ create mode 100644 crypto/algif_rng.c
+Merging drm/drm-next (adc31849b27f Merge tag 'drm-intel-next-2014-12-19' of git://anongit.freedesktop.org/drm-intel into drm-next)
+$ git merge drm/drm-next
+Resolved 'drivers/gpu/drm/i915/intel_runtime_pm.c' using previous resolution.
+Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_runtime_pm.c
+Auto-merging drivers/gpu/drm/i915/intel_pm.c
+Auto-merging drivers/gpu/drm/i915/intel_drv.h
+Auto-merging drivers/gpu/drm/i915/intel_display.c
+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
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 62bbfd5c016f] Merge remote-tracking branch 'drm/drm-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/DocBook/drm.tmpl | 109 +++-
+ drivers/gpu/drm/armada/armada_crtc.c | 5 -
+ drivers/gpu/drm/bochs/bochs_kms.c | 5 -
+ drivers/gpu/drm/drm_atomic.c | 730 ++++++++++++++++++++-
+ drivers/gpu/drm/drm_atomic_helper.c | 106 ++-
+ drivers/gpu/drm/drm_cache.c | 13 +-
+ drivers/gpu/drm/drm_crtc.c | 466 +++++++++-----
+ drivers/gpu/drm/drm_crtc_helper.c | 2 +
+ drivers/gpu/drm/drm_crtc_internal.h | 6 +
+ drivers/gpu/drm/drm_drv.c | 4 +
+ drivers/gpu/drm/drm_info.c | 24 -
+ drivers/gpu/drm/drm_internal.h | 1 -
+ drivers/gpu/drm/drm_ioctl.c | 13 +
+ drivers/gpu/drm/drm_irq.c | 11 +-
+ drivers/gpu/drm/drm_modes.c | 82 ++-
+ drivers/gpu/drm/drm_plane_helper.c | 18 +-
+ drivers/gpu/drm/drm_probe_helper.c | 43 +-
+ drivers/gpu/drm/i915/Makefile | 2 +
+ drivers/gpu/drm/i915/i915_cmd_parser.c | 131 +++-
+ drivers/gpu/drm/i915/i915_debugfs.c | 232 +++++--
+ drivers/gpu/drm/i915/i915_dma.c | 12 +-
+ drivers/gpu/drm/i915/i915_drv.c | 9 +-
+ drivers/gpu/drm/i915/i915_drv.h | 255 +++++++-
+ drivers/gpu/drm/i915/i915_gem.c | 535 +++++++--------
+ drivers/gpu/drm/i915/i915_gem_batch_pool.c | 137 ++++
+ drivers/gpu/drm/i915/i915_gem_context.c | 43 +-
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 117 +++-
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 170 +++--
+ drivers/gpu/drm/i915/i915_gem_gtt.h | 35 +-
+ drivers/gpu/drm/i915/i915_gem_render_state.c | 2 +-
+ drivers/gpu/drm/i915/i915_gem_tiling.c | 2 +-
+ drivers/gpu/drm/i915/i915_gpu_error.c | 91 +--
+ drivers/gpu/drm/i915/i915_irq.c | 30 +-
+ drivers/gpu/drm/i915/i915_params.c | 9 +-
+ drivers/gpu/drm/i915/i915_reg.h | 378 ++++++-----
+ drivers/gpu/drm/i915/i915_suspend.c | 2 +-
+ drivers/gpu/drm/i915/i915_trace.h | 69 +-
+ drivers/gpu/drm/i915/intel_bios.c | 65 ++
+ drivers/gpu/drm/i915/intel_bios.h | 36 +-
+ drivers/gpu/drm/i915/intel_ddi.c | 25 +-
+ drivers/gpu/drm/i915/intel_display.c | 895 ++++++++++++--------------
+ drivers/gpu/drm/i915/intel_dp.c | 21 +-
+ drivers/gpu/drm/i915/intel_drv.h | 36 +-
+ drivers/gpu/drm/i915/intel_dsi.c | 483 ++++++++------
+ drivers/gpu/drm/i915/intel_dsi.h | 26 +
+ drivers/gpu/drm/i915/intel_dsi_cmd.c | 141 ++--
+ drivers/gpu/drm/i915/intel_dsi_cmd.h | 46 +-
+ drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 58 +-
+ drivers/gpu/drm/i915/intel_dsi_pll.c | 12 +-
+ drivers/gpu/drm/i915/intel_fbc.c | 701 ++++++++++++++++++++
+ drivers/gpu/drm/i915/intel_lrc.c | 178 ++---
+ drivers/gpu/drm/i915/intel_lrc.h | 2 +-
+ drivers/gpu/drm/i915/intel_overlay.c | 44 +-
+ drivers/gpu/drm/i915/intel_pm.c | 817 +----------------------
+ drivers/gpu/drm/i915/intel_psr.c | 246 +++++--
+ drivers/gpu/drm/i915/intel_renderstate_gen6.c | 25 +
+ drivers/gpu/drm/i915/intel_renderstate_gen7.c | 25 +
+ drivers/gpu/drm/i915/intel_renderstate_gen8.c | 25 +
+ drivers/gpu/drm/i915/intel_renderstate_gen9.c | 25 +
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 226 ++++---
+ drivers/gpu/drm/i915/intel_ringbuffer.h | 23 +-
+ drivers/gpu/drm/i915/intel_runtime_pm.c | 2 +-
+ drivers/gpu/drm/i915/intel_sprite.c | 183 +-----
+ drivers/gpu/drm/i915/intel_uncore.c | 15 +-
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 5 -
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 5 -
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 1 +
+ drivers/gpu/drm/msm/msm_atomic.c | 20 +
+ drivers/gpu/drm/msm/msm_drv.c | 2 +-
+ drivers/gpu/drm/msm/msm_drv.h | 2 +
+ drivers/gpu/drm/sti/sti_drm_crtc.c | 6 -
+ drivers/gpu/drm/tegra/dc.c | 5 -
+ include/drm/drmP.h | 8 +-
+ include/drm/drm_atomic.h | 13 +-
+ include/drm/drm_atomic_helper.h | 4 +
+ include/drm/drm_crtc.h | 74 ++-
+ include/drm/drm_crtc_helper.h | 32 +-
+ include/drm/drm_modes.h | 9 +-
+ include/uapi/drm/drm.h | 8 +
+ include/uapi/drm/drm_mode.h | 38 +-
+ 80 files changed, 5363 insertions(+), 3149 deletions(-)
+ create mode 100644 drivers/gpu/drm/i915/i915_gem_batch_pool.c
+ create mode 100644 drivers/gpu/drm/i915/intel_fbc.c
+Merging drm-panel/drm/panel/for-next (54cbc4e298ea drm/mipi-dsi: Avoid potential NULL pointer dereference)
+$ git merge drm-panel/drm/panel/for-next
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/drm_mipi_dsi.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+Merging drm-intel/for-linux-next (985850bd1456 drm/i915: remove unused power_well/get_cdclk_freq api)
+$ git merge drm-intel/for-linux-next
+Auto-merging sound/pci/hda/hda_intel.c
+Removing sound/pci/hda/hda_i915.h
+Removing include/drm/i915_powerwell.h
+Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.c
+Auto-merging drivers/gpu/drm/i915/intel_pm.c
+Auto-merging drivers/gpu/drm/i915/intel_drv.h
+Auto-merging drivers/gpu/drm/i915/intel_display.c
+Auto-merging drivers/gpu/drm/i915/i915_reg.h
+Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_context.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
+Auto-merging Documentation/DocBook/drm.tmpl
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/drm.tmpl | 11 +++
+ drivers/gpu/drm/i915/i915_dma.c | 9 ++
+ drivers/gpu/drm/i915/i915_drv.c | 9 +-
+ drivers/gpu/drm/i915/i915_drv.h | 18 +++-
+ drivers/gpu/drm/i915/i915_gem.c | 65 +++++++-----
+ drivers/gpu/drm/i915/i915_gem_context.c | 71 +++++++++++++
+ drivers/gpu/drm/i915/i915_gem_evict.c | 11 ++-
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +
+ drivers/gpu/drm/i915/i915_reg.h | 1 +
+ drivers/gpu/drm/i915/intel_audio.c | 110 +++++++++++++++++++++
+ drivers/gpu/drm/i915/intel_bios.c | 20 ----
+ drivers/gpu/drm/i915/intel_bios.h | 11 ---
+ drivers/gpu/drm/i915/intel_display.c | 42 ++++----
+ drivers/gpu/drm/i915/intel_drv.h | 2 +
+ drivers/gpu/drm/i915/intel_pm.c | 4 +
+ drivers/gpu/drm/i915/intel_runtime_pm.c | 56 -----------
+ include/drm/i915_component.h | 38 +++++++
+ include/drm/i915_powerwell.h | 37 -------
+ include/uapi/drm/i915_drm.h | 21 ++++
+ sound/pci/hda/hda_i915.c | 154 ++++++++++++++++++++---------
+ sound/pci/hda/hda_i915.h | 37 -------
+ sound/pci/hda/hda_intel.c | 60 ++++-------
+ sound/pci/hda/hda_intel.h | 71 +++++++++++++
+ 23 files changed, 553 insertions(+), 307 deletions(-)
+ create mode 100644 include/drm/i915_component.h
+ delete mode 100644 include/drm/i915_powerwell.h
+ delete mode 100644 sound/pci/hda/hda_i915.h
+ create mode 100644 sound/pci/hda/hda_intel.h
+Merging drm-tegra/drm/tegra/for-next (7e0180e3570c drm/tegra: gem: Check before freeing CMA memory)
+$ git merge drm-tegra/drm/tegra/for-next
+Already up-to-date.
+Merging drm-misc/topic/core-stuff (b710d754bd4f drm: Make drm_read() more robust against multithreaded races)
+$ git merge drm-misc/topic/core-stuff
+Auto-merging include/drm/drm_fb_helper.h
+Auto-merging drivers/gpu/drm/radeon/radeon_fb.c
+Auto-merging drivers/gpu/drm/nouveau/nouveau_fbcon.c
+Auto-merging drivers/gpu/drm/msm/msm_fbdev.c
+Auto-merging drivers/gpu/drm/drm_fb_helper.c
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/ast/ast_fb.c | 21 +++++---
+ drivers/gpu/drm/bochs/bochs_fbdev.c | 14 +++++-
+ drivers/gpu/drm/cirrus/cirrus_fbdev.c | 12 ++---
+ drivers/gpu/drm/drm_fb_helper.c | 2 +-
+ drivers/gpu/drm/drm_fops.c | 89 ++++++++++++++++-----------------
+ drivers/gpu/drm/gma500/framebuffer.c | 22 ++++++--
+ drivers/gpu/drm/mgag200/mgag200_fb.c | 12 ++++-
+ drivers/gpu/drm/msm/msm_fbdev.c | 10 +++-
+ drivers/gpu/drm/nouveau/nouveau_fbcon.c | 21 +++++---
+ drivers/gpu/drm/omapdrm/omap_fbdev.c | 10 +++-
+ drivers/gpu/drm/qxl/qxl_fb.c | 22 +++++---
+ drivers/gpu/drm/radeon/radeon_fb.c | 21 +++++---
+ drivers/gpu/drm/udl/udl_fb.c | 22 +++++---
+ include/drm/drm_fb_helper.h | 2 +-
+ 14 files changed, 182 insertions(+), 98 deletions(-)
+Merging sound/for-next (12c243b833c2 ALSA: fm801: remove FSF address)
+$ git merge sound/for-next
+Auto-merging sound/pci/hda/hda_intel.c
+Removing sound/isa/gus/gus_instr.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/sound/pcm512x.txt | 3 +-
+ include/sound/ad1816a.h | 5 +-
+ include/sound/emu10k1.h | 14 +-
+ include/sound/es1688.h | 3 +-
+ include/sound/gus.h | 4 +-
+ include/sound/pcm.h | 11 +-
+ include/sound/pcm_params.h | 96 +++++-----
+ include/sound/sb.h | 6 +-
+ include/sound/soc-dapm.h | 1 -
+ include/sound/wss.h | 6 +-
+ include/uapi/sound/asound.h | 1 +
+ sound/aoa/soundbus/i2sbus/core.c | 19 +-
+ sound/arm/aaci.c | 4 +-
+ sound/atmel/ac97c.c | 51 +++++-
+ sound/core/oss/pcm_oss.c | 6 +-
+ sound/core/pcm_lib.c | 15 +-
+ sound/core/pcm_native.c | 10 +-
+ sound/core/seq/oss/seq_oss_midi.c | 6 +-
+ sound/core/seq/seq_midi.c | 3 +-
+ sound/drivers/ml403-ac97cr.c | 12 +-
+ sound/isa/ad1816a/ad1816a.c | 5 +-
+ sound/isa/ad1816a/ad1816a_lib.c | 9 +-
+ sound/isa/ad1848/ad1848.c | 7 +-
+ sound/isa/als100.c | 2 +-
+ sound/isa/azt2320.c | 4 +-
+ sound/isa/cmi8328.c | 4 +-
+ sound/isa/cs423x/cs4231.c | 9 +-
+ sound/isa/cs423x/cs4236.c | 13 +-
+ sound/isa/cs423x/cs4236_lib.c | 9 +-
+ sound/isa/es1688/es1688.c | 7 +-
+ sound/isa/es1688/es1688_lib.c | 6 +-
+ sound/isa/es18xx.c | 10 +-
+ sound/isa/galaxy/galaxy.c | 4 +-
+ sound/isa/gus/gus_instr.c | 172 ------------------
+ sound/isa/gus/gus_pcm.c | 6 +-
+ sound/isa/gus/gus_uart.c | 6 +-
+ sound/isa/gus/gusclassic.c | 4 +-
+ sound/isa/gus/gusextreme.c | 4 +-
+ sound/isa/gus/gusmax.c | 8 +-
+ sound/isa/gus/interwave.c | 14 +-
+ sound/isa/msnd/msnd.c | 6 +-
+ sound/isa/msnd/msnd.h | 2 +-
+ sound/isa/msnd/msnd_pinnacle.c | 5 +-
+ sound/isa/opl3sa2.c | 4 +-
+ sound/isa/opti9xx/miro.c | 12 +-
+ sound/isa/opti9xx/opti92x-ad1848.c | 13 +-
+ sound/isa/sb/emu8000_synth.c | 3 +-
+ sound/isa/sb/jazz16.c | 2 +-
+ sound/isa/sb/sb16.c | 2 +-
+ sound/isa/sb/sb16_main.c | 8 +-
+ sound/isa/sb/sb8.c | 4 +-
+ sound/isa/sb/sb8_main.c | 6 +-
+ sound/isa/sb/sb8_midi.c | 6 +-
+ sound/isa/sc6000.c | 2 +-
+ sound/isa/sscape.c | 5 +-
+ sound/isa/wavefront/wavefront.c | 4 +-
+ sound/isa/wss/wss_lib.c | 8 +-
+ sound/oss/pss.c | 2 +-
+ sound/oss/trix.c | 2 +-
+ sound/parisc/harmony.c | 4 +-
+ sound/pci/ad1889.c | 15 +-
+ sound/pci/ali5451/ali5451.c | 15 --
+ sound/pci/als300.c | 15 --
+ sound/pci/als4000.c | 15 --
+ sound/pci/asihpi/asihpi.c | 9 +-
+ sound/pci/asihpi/hpi6000.c | 7 +-
+ sound/pci/asihpi/hpioctl.c | 8 +-
+ sound/pci/atiixp.c | 18 +-
+ sound/pci/atiixp_modem.c | 18 +-
+ sound/pci/aw2/aw2-alsa.c | 4 +-
+ sound/pci/azt3328.c | 15 --
+ sound/pci/bt87x.c | 3 +-
+ sound/pci/ca0106/ca0106_main.c | 16 --
+ sound/pci/cmipci.c | 15 --
+ sound/pci/cs4281.c | 39 +----
+ sound/pci/cs46xx/cs46xx.c | 10 +-
+ sound/pci/cs46xx/cs46xx.h | 10 +-
+ sound/pci/cs46xx/cs46xx_lib.c | 59 +------
+ sound/pci/cs5530.c | 2 +-
+ sound/pci/cs5535audio/cs5535audio_pm.c | 18 --
+ sound/pci/ctxfi/cthw20k1.c | 14 +-
+ sound/pci/ctxfi/cthw20k2.c | 17 +-
+ sound/pci/echoaudio/echoaudio.c | 11 +-
+ sound/pci/emu10k1/emu10k1.c | 27 +--
+ sound/pci/emu10k1/emu10k1x.c | 19 +-
+ sound/pci/emu10k1/emufx.c | 7 +-
+ sound/pci/emu10k1/emupcm.c | 33 +---
+ sound/pci/emu10k1/p16v.c | 14 +-
+ sound/pci/ens1370.c | 52 +-----
+ sound/pci/es1938.c | 12 --
+ sound/pci/es1968.c | 16 --
+ sound/pci/fm801.c | 66 ++-----
+ sound/pci/hda/hda_auto_parser.c | 18 +-
+ sound/pci/hda/hda_intel.c | 16 +-
+ sound/pci/hda/patch_analog.c | 33 ----
+ sound/pci/hda/patch_realtek.c | 87 +++++++++
+ sound/pci/ice1712/ice1712.c | 42 +----
+ sound/pci/ice1712/ice1724.c | 16 --
+ sound/pci/ice1712/wm8776.c | 15 --
+ sound/pci/ice1712/wm8776.h | 3 -
+ sound/pci/intel8x0.c | 15 --
+ sound/pci/intel8x0m.c | 12 --
+ sound/pci/lola/lola.c | 6 +-
+ sound/pci/maestro3.c | 15 --
+ sound/pci/mixart/mixart.c | 7 +-
+ sound/pci/nm256/nm256.c | 20 +--
+ sound/pci/oxygen/oxygen_lib.c | 18 +-
+ sound/pci/oxygen/oxygen_pcm.c | 8 -
+ sound/pci/riptide/riptide.c | 23 +--
+ sound/pci/rme96.c | 13 --
+ sound/pci/rme9652/hdsp.c | 4 +-
+ sound/pci/rme9652/hdspm.c | 4 +-
+ sound/pci/rme9652/rme9652.c | 3 +-
+ sound/pci/sis7019.c | 18 +-
+ sound/pci/sonicvibes.c | 7 +-
+ sound/pci/trident/trident.c | 6 +-
+ sound/pci/trident/trident.h | 6 +-
+ sound/pci/trident/trident_main.c | 36 +---
+ sound/pci/via82xx.c | 14 --
+ sound/pci/via82xx_modem.c | 15 --
+ sound/pci/vx222/vx222.c | 17 +-
+ sound/pci/ymfpci/ymfpci.c | 8 +-
+ sound/pci/ymfpci/ymfpci.h | 8 +-
+ sound/pci/ymfpci/ymfpci_main.c | 53 +-----
+ sound/ppc/pmac.c | 15 +-
+ sound/ppc/snd_ps3.c | 4 +-
+ sound/soc/codecs/pcm512x-i2c.c | 4 +
+ sound/soc/codecs/pcm512x-spi.c | 4 +
+ sound/soc/codecs/rt5670.c | 38 ++++
+ sound/soc/codecs/rt5677.c | 195 +++++++++++++++++++--
+ sound/soc/codecs/wm8750.c | 2 +-
+ sound/soc/dwc/designware_i2s.c | 86 +++++----
+ sound/soc/intel/Kconfig | 4 +-
+ sound/soc/intel/bytcr_dpcm_rt5640.c | 1 -
+ sound/soc/intel/cht_bsw_rt5672.c | 1 -
+ sound/soc/intel/sst-firmware.c | 1 +
+ sound/soc/intel/sst/sst_acpi.c | 5 +-
+ sound/soc/omap/omap-hdmi-audio.c | 1 -
+ sound/soc/pxa/spitz.c | 1 -
+ sound/soc/rockchip/rockchip_i2s.c | 4 +
+ sound/soc/samsung/arndale_rt5631.c | 1 -
+ sound/soc/soc-core.c | 3 -
+ sound/soc/soc-dapm.c | 105 ++---------
+ sound/soc/soc-pcm.c | 33 +---
+ sound/synth/emux/emux.c | 6 +-
+ sound/usb/quirks-table.h | 22 +++
+ 146 files changed, 801 insertions(+), 1579 deletions(-)
+ delete mode 100644 sound/isa/gus/gus_instr.c
+Merging sound-asoc/for-next (41debc82537a Merge remote-tracking branch 'asoc/topic/xtfpga' into asoc-next)
+$ git merge sound-asoc/for-next
+Auto-merging sound/soc/soc-generic-dmaengine-pcm.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/sound/cdns,xtfpga-i2s.txt | 18 +
+ .../devicetree/bindings/sound/designware-i2s.txt | 31 +
+ .../bindings/sound/nvidia,tegra-audio-rt5677.txt | 67 ++
+ MAINTAINERS | 1 +
+ include/sound/rt5677.h | 3 +
+ include/sound/soc.h | 3 +
+ sound/soc/Kconfig | 1 +
+ sound/soc/Makefile | 1 +
+ sound/soc/adi/axi-i2s.c | 2 +
+ sound/soc/atmel/sam9g20_wm8731.c | 31 +-
+ sound/soc/au1x/db1200.c | 19 +-
+ sound/soc/au1x/dbdma2.c | 6 -
+ sound/soc/au1x/dma.c | 6 -
+ sound/soc/codecs/alc5632.c | 4 +-
+ sound/soc/codecs/cs35l32.c | 4 +-
+ sound/soc/codecs/cs42l52.c | 4 +-
+ sound/soc/codecs/cs42l56.c | 4 +-
+ sound/soc/codecs/cs42l73.c | 4 +-
+ sound/soc/codecs/pcm512x.c | 2 +-
+ sound/soc/codecs/rt5670.c | 83 +++
+ sound/soc/codecs/rt5670.h | 80 ++-
+ sound/soc/codecs/rt5677.c | 23 +-
+ sound/soc/codecs/ts3a227e.c | 6 +
+ sound/soc/codecs/wm5102.c | 6 +-
+ sound/soc/codecs/wm8804.c | 4 +-
+ sound/soc/codecs/wm8960.c | 2 +-
+ sound/soc/codecs/wm8988.c | 4 +-
+ sound/soc/codecs/wm8995.c | 6 +-
+ sound/soc/davinci/davinci-mcasp.c | 30 +
+ sound/soc/dwc/Kconfig | 1 +
+ sound/soc/dwc/designware_i2s.c | 283 +++++++--
+ sound/soc/fsl/eukrea-tlv320.c | 21 +-
+ sound/soc/fsl/fsl_asrc.c | 5 +-
+ sound/soc/fsl/fsl_asrc.h | 3 -
+ sound/soc/fsl/fsl_esai.c | 2 +-
+ sound/soc/fsl/fsl_esai.h | 2 +-
+ sound/soc/fsl/fsl_sai.c | 2 +-
+ sound/soc/fsl/fsl_spdif.c | 17 +-
+ sound/soc/fsl/fsl_ssi.c | 4 +-
+ sound/soc/fsl/mx27vis-aic32x4.c | 12 +-
+ sound/soc/fsl/wm1133-ev1.c | 12 +-
+ sound/soc/intel/broadwell.c | 10 -
+ sound/soc/intel/byt-rt5640.c | 12 +-
+ sound/soc/intel/cht_bsw_rt5672.c | 14 +
+ sound/soc/intel/sst-baytrail-pcm.c | 6 -
+ sound/soc/intel/sst-dsp.c | 3 +-
+ sound/soc/intel/sst-firmware.c | 13 +-
+ sound/soc/intel/sst-haswell-dsp.c | 17 +-
+ sound/soc/intel/sst-haswell-ipc.c | 30 +
+ sound/soc/intel/sst-haswell-pcm.c | 105 ++--
+ sound/soc/intel/sst-mfld-platform-pcm.c | 7 -
+ sound/soc/intel/sst/sst_loader.c | 3 +-
+ sound/soc/mxs/mxs-saif.c | 10 +-
+ sound/soc/mxs/mxs-saif.h | 1 -
+ sound/soc/mxs/mxs-sgtl5000.c | 27 +-
+ sound/soc/nuc900/nuc900-pcm.c | 6 -
+ sound/soc/omap/ams-delta.c | 18 +-
+ sound/soc/omap/omap-twl4030.c | 20 +-
+ sound/soc/pxa/corgi.c | 16 +-
+ sound/soc/pxa/e740_wm9705.c | 20 +-
+ sound/soc/pxa/e750_wm9705.c | 20 +-
+ sound/soc/pxa/hx4700.c | 8 +-
+ sound/soc/pxa/magician.c | 21 +-
+ sound/soc/pxa/palm27x.c | 15 +-
+ sound/soc/pxa/raumfeld.c | 35 +-
+ sound/soc/pxa/spitz.c | 22 +-
+ sound/soc/pxa/ttc-dkb.c | 4 -
+ sound/soc/pxa/zylonite.c | 12 +-
+ sound/soc/samsung/goni_wm8994.c | 23 +-
+ sound/soc/samsung/h1940_uda1380.c | 15 +-
+ sound/soc/samsung/i2s.c | 1 -
+ sound/soc/samsung/jive_wm8750.c | 16 +-
+ sound/soc/samsung/neo1973_wm8753.c | 25 +-
+ sound/soc/samsung/rx1950_uda1380.c | 15 +-
+ sound/soc/samsung/s3c24xx_simtec.c | 20 +-
+ sound/soc/samsung/s3c24xx_uda134x.c | 12 +-
+ sound/soc/samsung/smartq_wm8987.c | 16 +-
+ sound/soc/samsung/smdk_wm8580.c | 21 +-
+ sound/soc/samsung/smdk_wm8580pcm.c | 19 +-
+ sound/soc/samsung/smdk_wm8994pcm.c | 16 +-
+ sound/soc/sh/dma-sh7760.c | 6 -
+ sound/soc/sh/fsi.c | 15 +-
+ sound/soc/sh/migor.c | 12 +-
+ sound/soc/sh/rcar/core.c | 6 -
+ sound/soc/sh/siu_pcm.c | 1 -
+ sound/soc/soc-core.c | 126 ++--
+ sound/soc/soc-dapm.c | 4 +-
+ sound/soc/soc-generic-dmaengine-pcm.c | 15 +-
+ sound/soc/tegra/Kconfig | 10 +
+ sound/soc/tegra/Makefile | 2 +
+ sound/soc/tegra/tegra_rt5677.c | 347 +++++++++++
+ sound/soc/txx9/txx9aclc.c | 6 -
+ sound/soc/ux500/mop500_ab8500.c | 16 +-
+ sound/soc/xtensa/Kconfig | 7 +
+ sound/soc/xtensa/Makefile | 3 +
+ sound/soc/xtensa/xtfpga-i2s.c | 675 +++++++++++++++++++++
+ 96 files changed, 1905 insertions(+), 839 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sound/cdns,xtfpga-i2s.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/designware-i2s.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5677.txt
+ create mode 100644 sound/soc/tegra/tegra_rt5677.c
+ create mode 100644 sound/soc/xtensa/Kconfig
+ create mode 100644 sound/soc/xtensa/Makefile
+ create mode 100644 sound/soc/xtensa/xtfpga-i2s.c
+Merging modules/modules-next (97bf6af1f928 Linux 3.19-rc1)
+$ git merge modules/modules-next
+Already up-to-date.
+Merging virtio/virtio-next (97bf6af1f928 Linux 3.19-rc1)
+$ git merge virtio/virtio-next
+Already up-to-date.
+Merging input/next (f17effbe8916 MAINTAINERS: add info for e3x0-button driver)
+$ git merge input/next
+Auto-merging drivers/input/mouse/synaptics.c
+Auto-merging drivers/input/mouse/psmouse-base.c
+Auto-merging drivers/input/keyboard/imx_keypad.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Merge made by the 'recursive' strategy.
+ .../ABI/testing/sysfs-driver-input-axp-pek | 11 +
+ .../devicetree/bindings/input/e3x0-button.txt | 25 ++
+ .../devicetree/bindings/input/regulator-haptic.txt | 21 +
+ .../devicetree/bindings/input/sun4i-lradc-keys.txt | 62 +++
+ .../bindings/input/tps65218-pwrbutton.txt | 17 +
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ MAINTAINERS | 15 +
+ drivers/input/input.c | 38 +-
+ drivers/input/keyboard/Kconfig | 10 +
+ drivers/input/keyboard/Makefile | 1 +
+ drivers/input/keyboard/imx_keypad.c | 3 +-
+ drivers/input/keyboard/sun4i-lradc-keys.c | 286 ++++++++++++++
+ drivers/input/misc/Kconfig | 43 ++
+ drivers/input/misc/Makefile | 4 +
+ drivers/input/misc/axp20x-pek.c | 290 ++++++++++++++
+ drivers/input/misc/e3x0-button.c | 157 ++++++++
+ drivers/input/misc/regulator-haptic.c | 279 +++++++++++++
+ drivers/input/misc/tps65218-pwrbutton.c | 126 ++++++
+ drivers/input/mouse/Kconfig | 10 +
+ drivers/input/mouse/focaltech.c | 408 ++++++++++++++++++-
+ drivers/input/mouse/focaltech.h | 2 +
+ drivers/input/mouse/psmouse-base.c | 32 +-
+ drivers/input/mouse/psmouse.h | 1 +
+ drivers/input/mouse/synaptics.c | 435 ++-------------------
+ drivers/input/mouse/synaptics.h | 18 +-
+ drivers/input/touchscreen/elants_i2c.c | 2 -
+ include/linux/platform_data/regulator-haptic.h | 29 ++
+ 27 files changed, 1871 insertions(+), 455 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-driver-input-axp-pek
+ create mode 100644 Documentation/devicetree/bindings/input/e3x0-button.txt
+ create mode 100644 Documentation/devicetree/bindings/input/regulator-haptic.txt
+ create mode 100644 Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt
+ create mode 100644 Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt
+ create mode 100644 drivers/input/keyboard/sun4i-lradc-keys.c
+ create mode 100644 drivers/input/misc/axp20x-pek.c
+ create mode 100644 drivers/input/misc/e3x0-button.c
+ create mode 100644 drivers/input/misc/regulator-haptic.c
+ create mode 100644 drivers/input/misc/tps65218-pwrbutton.c
+ create mode 100644 include/linux/platform_data/regulator-haptic.h
+Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12)
+$ git merge input-mt/for-next
+Already up-to-date.
+Merging block/for-next (177ccd2f8f39 Merge branch 'for-3.20/drivers' into for-next)
+$ git merge block/for-next
+Merge made by the 'recursive' strategy.
+ block/blk-core.c | 21 ++-
+ block/blk-mq-tag.c | 14 +-
+ block/blk-mq-tag.h | 1 +
+ block/blk-mq.c | 21 ++-
+ block/blk-mq.h | 1 +
+ drivers/block/loop.c | 416 ++++++++++++++++++++++-----------------------
+ drivers/block/loop.h | 18 +-
+ drivers/block/null_blk.c | 2 +-
+ drivers/block/nvme-core.c | 19 ++-
+ drivers/block/virtio_blk.c | 2 +-
+ include/linux/blk-mq.h | 3 +
+ 11 files changed, 284 insertions(+), 234 deletions(-)
+Merging device-mapper/for-next (af66c8489d6d dm table: train hybrid target type detection to select blk-mq if appropriate)
+$ git merge device-mapper/for-next
+Auto-merging block/blk-mq.c
+Auto-merging block/blk-core.c
+Merge made by the 'recursive' strategy.
+ block/blk-core.c | 9 +-
+ block/blk-mq.c | 1 +
+ drivers/md/dm-mpath.c | 62 ++++++--
+ drivers/md/dm-table.c | 59 +++++--
+ drivers/md/dm-target.c | 15 +-
+ drivers/md/dm.c | 346 +++++++++++++++++++++++++++++-------------
+ drivers/md/dm.h | 11 +-
+ include/linux/blkdev.h | 1 +
+ include/linux/device-mapper.h | 10 +-
+ include/uapi/linux/dm-ioctl.h | 4 +-
+ 10 files changed, 370 insertions(+), 148 deletions(-)
+Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator precedence)
+$ git merge embedded/master
+Already up-to-date.
+Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware(), v3)
+$ git merge firmware/master
+Already up-to-date.
+Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usage)
+$ git merge pcmcia/master
+Already up-to-date.
+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 (60000f69a57a mmc: Add SDIO function devicetree subnode parsing)
+$ git merge mmc-uh/next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/mmc/mmc.txt | 48 ++-
+ arch/arm/mach-omap2/board-omap3pandora.c | 14 +-
+ drivers/mmc/core/bus.c | 4 +
+ drivers/mmc/core/core.c | 28 ++
+ drivers/mmc/core/core.h | 3 +
+ drivers/mmc/core/host.c | 61 ++-
+ drivers/mmc/core/mmc.c | 38 +-
+ drivers/mmc/core/mmc_ops.c | 30 ++
+ drivers/mmc/core/sd.c | 7 +-
+ drivers/mmc/core/sdio_bus.c | 11 +
+ drivers/mmc/core/slot-gpio.c | 164 ++------
+ drivers/mmc/core/slot-gpio.h | 13 +
+ drivers/mmc/host/dw_mmc-exynos.c | 111 +-----
+ drivers/mmc/host/dw_mmc-exynos.h | 56 +++
+ drivers/mmc/host/dw_mmc.c | 114 +++---
+ drivers/mmc/host/dw_mmc.h | 9 +-
+ drivers/mmc/host/mmci.c | 2 +-
+ drivers/mmc/host/moxart-mmc.c | 4 +-
+ drivers/mmc/host/mvsdio.c | 10 -
+ drivers/mmc/host/mxs-mmc.c | 3 +-
+ drivers/mmc/host/omap_hsmmc.c | 50 ---
+ drivers/mmc/host/rtsx_pci_sdmmc.c | 522 ++++++++++++++------------
+ drivers/mmc/host/sdhci-acpi.c | 9 +-
+ drivers/mmc/host/sdhci-bcm-kona.c | 4 +-
+ drivers/mmc/host/sdhci-esdhc-imx.c | 17 +-
+ drivers/mmc/host/sdhci-of-esdhc.c | 20 +-
+ drivers/mmc/host/sdhci-pci.c | 32 +-
+ drivers/mmc/host/sdhci-pci.h | 3 +
+ drivers/mmc/host/sdhci-pxav3.c | 15 +-
+ drivers/mmc/host/sdhci-s3c.c | 4 +-
+ drivers/mmc/host/sdhci-sirf.c | 74 +++-
+ drivers/mmc/host/sdhci-st.c | 4 +-
+ drivers/mmc/host/sdhci.c | 177 ++++++---
+ drivers/mmc/host/sunxi-mmc.c | 29 +-
+ drivers/mmc/host/toshsd.c | 17 +-
+ include/linux/mmc/dw_mmc.h | 6 +
+ include/linux/mmc/host.h | 2 -
+ include/linux/mmc/mmc.h | 5 -
+ include/linux/mmc/sdhci.h | 7 +
+ include/linux/mmc/slot-gpio.h | 3 -
+ include/linux/platform_data/mmc-omap.h | 4 -
+ 41 files changed, 934 insertions(+), 800 deletions(-)
+ create mode 100644 drivers/mmc/core/slot-gpio.h
+ create mode 100644 drivers/mmc/host/dw_mmc-exynos.h
+Merging kgdb/kgdb-next (c7d9ebf81c45 kdb: Fix off by one error in kdb_cpu())
+$ git merge kgdb/kgdb-next
+Merge made by the 'recursive' strategy.
+ kernel/debug/debug_core.c | 2 +-
+ kernel/debug/kdb/kdb_main.c | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1)
+$ git merge uclinux/for-next
+Already up-to-date.
+Merging md/for-next (f851b60db0fd md: Check MD_RECOVERY_RUNNING as well as ->sync_thread.)
+$ git merge md/for-next
+Already up-to-date.
+Merging mfd/for-mfd-next (a3b63979f8a3 mfd: rtsx: Add func to split u32 into register)
+$ git merge mfd/for-mfd-next
+Already up-to-date.
+Merging backlight/for-backlight-next (3d6969a641d0 MAINTAINERS: Remove my name from Backlight subsystem)
+$ git merge backlight/for-backlight-next
+Already up-to-date.
+Merging battery/master (02088e3ed79f power: reset: augment versatile driver for integrator)
+$ git merge battery/master
+Merge made by the 'recursive' strategy.
+ drivers/power/reset/arm-versatile-reboot.c | 32 +++++++++++++++++++++++++++---
+ 1 file changed, 29 insertions(+), 3 deletions(-)
+Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path)
+$ git merge fbdev/for-next
+Already up-to-date.
+Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par)
+$ git merge viafb/viafb-next
+Already up-to-date.
+Merging omap_dss2/for-next (574d54112fda Merge branches '3.19/omapdss' and '3.19/simplefb' into for-next)
+$ git merge omap_dss2/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging regulator/for-next (2de4cd54a7a1 Merge remote-tracking branches 'regulator/topic/rk808', 'regulator/topic/rt5033' and 'regulator/topic/tps65023' into regulator-next)
+$ git merge regulator/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/mfd/max77686.txt | 14 +
+ .../devicetree/bindings/regulator/isl9305.txt | 4 +-
+ .../bindings/regulator/mt6397-regulator.txt | 217 ++++++++++++++
+ .../devicetree/bindings/regulator/pfuze100.txt | 94 +++++-
+ drivers/regulator/Kconfig | 9 +
+ drivers/regulator/Makefile | 1 +
+ drivers/regulator/axp20x-regulator.c | 93 +++---
+ drivers/regulator/core.c | 30 +-
+ drivers/regulator/fan53555.c | 4 +-
+ drivers/regulator/internal.h | 2 +
+ drivers/regulator/isl9305.c | 6 +-
+ drivers/regulator/max14577.c | 62 +---
+ drivers/regulator/max77686.c | 70 ++++-
+ drivers/regulator/max8649.c | 4 +-
+ drivers/regulator/mt6397-regulator.c | 332 +++++++++++++++++++++
+ drivers/regulator/of_regulator.c | 11 +
+ drivers/regulator/pfuze100-regulator.c | 134 ++++++++-
+ drivers/regulator/rk808-regulator.c | 6 +-
+ drivers/regulator/rt5033-regulator.c | 8 +-
+ drivers/regulator/s2mps11.c | 42 ++-
+ drivers/regulator/tps65023-regulator.c | 6 +-
+ include/linux/mfd/samsung/s2mps13.h | 2 +
+ include/linux/regulator/driver.h | 13 +
+ include/linux/regulator/mt6397-regulator.h | 49 +++
+ include/linux/regulator/pfuze100.h | 14 +
+ 25 files changed, 1081 insertions(+), 146 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/regulator/mt6397-regulator.txt
+ create mode 100644 drivers/regulator/mt6397-regulator.c
+ create mode 100644 include/linux/regulator/mt6397-regulator.h
+Merging security/next (b2d1965dcea1 Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next)
+$ git merge security/next
+Already up-to-date.
+Merging integrity/next (63a0eb7891bd ima: Fix build failure on powerpc when TCG_IBMVTPM dependencies are not met)
+$ git merge integrity/next
+Already up-to-date.
+Merging selinux/next (566075875a84 selinux: Remove unused function avc_sidcmp())
+$ git merge selinux/next
+Merge made by the 'recursive' strategy.
+ security/selinux/avc.c | 5 -----
+ 1 file changed, 5 deletions(-)
+Merging lblnet/next (d8ec26d7f828 Linux 3.13)
+$ git merge lblnet/next
+Already up-to-date.
+Merging watchdog/master (e0c3e00f4045 watchdog: drop owner assignment from platform_drivers)
+$ git merge watchdog/master
+Merge made by the 'recursive' strategy.
+ drivers/watchdog/cadence_wdt.c | 1 -
+ drivers/watchdog/imx2_wdt.c | 40 +++++++++++++++++++++++++++++++---------
+ drivers/watchdog/meson_wdt.c | 1 -
+ 3 files changed, 31 insertions(+), 11 deletions(-)
+Merging iommu/next (2c0ee8b85aae iommu/rockchip: Drop owner assignment from platform_drivers)
+$ git merge iommu/next
+Already up-to-date.
+Merging dwmw2-iommu/master (1860e379875d Linux 3.15)
+$ git merge dwmw2-iommu/master
+Already up-to-date.
+Merging vfio/next (5e9f36c59a48 drivers/vfio: allow type-1 IOMMU instantiation on top of an ARM SMMU)
+$ 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 (174236285cf8 Merge branch 'doc/sp-update' into docs-next)
+$ git merge jc_docs/docs-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/00-INDEX | 28 +--
+ Documentation/Changes | 6 +-
+ Documentation/SubmittingPatches | 438 ++++++++++++++++-----------------
+ Documentation/arm/00-INDEX | 12 +-
+ Documentation/cgroups/00-INDEX | 2 +
+ Documentation/dmaengine/00-INDEX | 8 +
+ Documentation/driver-model/bus.txt | 2 +-
+ Documentation/filesystems/seq_file.txt | 12 +-
+ Documentation/locking/00-INDEX | 16 ++
+ Documentation/networking/00-INDEX | 8 +-
+ MAINTAINERS | 1 +
+ 11 files changed, 277 insertions(+), 256 deletions(-)
+ create mode 100644 Documentation/dmaengine/00-INDEX
+ create mode 100644 Documentation/locking/00-INDEX
+Merging trivial/for-next (231821d4c3fa dynamic_debug: fix comment)
+$ git merge trivial/for-next
+Auto-merging lib/dynamic_debug.c
+Auto-merging arch/x86/mm/init.c
+Merge made by the 'recursive' strategy.
+ Documentation/usb/usbmon.txt | 2 +-
+ arch/x86/mm/init.c | 2 +-
+ lib/dynamic_debug.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+Merging audit/next (0f7e94ee40d0 Merge branch 'next' into upstream for v3.19)
+$ git merge audit/next
+Already up-to-date.
+Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls)
+$ git merge fsnotify/for-next
+Already up-to-date.
+Merging devicetree/devicetree/next (c46ca3c8310b of: Delete unnecessary check before calling "of_node_put()")
+$ git merge devicetree/devicetree/next
+Already up-to-date.
+Merging dt-rh/for-next (a0e27f51ba8a documentation: pinctrl bindings: Fix trivial typo 'abitrary')
+$ git merge dt-rh/for-next
+Already up-to-date.
+Merging mailbox/mailbox-for-next (9f3e3cacb2ff dt: mailbox: add generic bindings)
+$ git merge mailbox/mailbox-for-next
+Already up-to-date.
+Merging spi/for-next (52052f9b7ea1 Merge remote-tracking branches 'spi/topic/pxa2xx', 'spi/topic/qup', 'spi/topic/sirf' and 'spi/topic/st-ssc' into spi-next)
+$ git merge spi/for-next
+Auto-merging sound/soc/rockchip/rockchip_i2s.c
+Auto-merging drivers/spi/Kconfig
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/spi/sh-msiof.txt | 16 +
+ .../devicetree/bindings/spi/spi-st-ssc.txt | 40 +
+ arch/x86/pci/intel_mid_pci.c | 1 -
+ drivers/spi/Kconfig | 21 +-
+ drivers/spi/Makefile | 2 +
+ drivers/spi/spi-au1550.c | 4 -
+ drivers/spi/spi-bcm2835.c | 4 -
+ drivers/spi/spi-bcm63xx.c | 4 -
+ drivers/spi/spi-bitbang.c | 4 -
+ drivers/spi/spi-butterfly.c | 4 -
+ drivers/spi/spi-coldfire-qspi.c | 5 -
+ drivers/spi/spi-davinci.c | 4 -
+ drivers/spi/spi-dln2.c | 881 +++++++++++++++++++++
+ drivers/spi/spi-dw-mid.c | 3 -
+ drivers/spi/spi-dw-pci.c | 38 +-
+ drivers/spi/spi-dw.c | 15 +-
+ drivers/spi/spi-falcon.c | 12 -
+ drivers/spi/spi-fsl-cpm.c | 9 +
+ drivers/spi/spi-fsl-lib.c | 16 +-
+ drivers/spi/spi-fsl-lib.h | 4 +-
+ drivers/spi/spi-gpio.c | 8 +-
+ drivers/spi/spi-img-spfi.c | 49 +-
+ drivers/spi/spi-imx.c | 13 +-
+ drivers/spi/spi-lm70llp.c | 4 -
+ drivers/spi/spi-meson-spifc.c | 2 +-
+ drivers/spi/spi-omap-100k.c | 5 -
+ drivers/spi/spi-omap-uwire.c | 4 -
+ drivers/spi/spi-omap2-mcspi.c | 5 -
+ drivers/spi/spi-pxa2xx-dma.c | 17 +-
+ drivers/spi/spi-pxa2xx-pxadma.c | 33 +-
+ drivers/spi/spi-pxa2xx.c | 206 ++---
+ drivers/spi/spi-pxa2xx.h | 34 +-
+ drivers/spi/spi-qup.c | 11 +-
+ drivers/spi/spi-rspi.c | 5 -
+ drivers/spi/spi-s3c64xx.c | 4 -
+ drivers/spi/spi-sc18is602.c | 4 -
+ drivers/spi/spi-sh-hspi.c | 5 -
+ drivers/spi/spi-sh-msiof.c | 51 +-
+ drivers/spi/spi-sh.c | 5 -
+ drivers/spi/spi-sirf.c | 1 -
+ drivers/spi/spi-st-ssc4.c | 510 ++++++++++++
+ drivers/spi/spi-topcliff-pch.c | 4 -
+ drivers/spi/spi.c | 118 ++-
+ drivers/spi/spidev.c | 4 -
+ include/linux/pxa2xx_ssp.h | 1 +
+ include/linux/spi/at86rf230.h | 4 -
+ include/linux/spi/l4f00242t03.h | 4 -
+ include/linux/spi/lms283gf05.h | 4 -
+ include/linux/spi/mxs-spi.h | 4 -
+ include/linux/spi/pxa2xx_spi.h | 4 -
+ include/linux/spi/rspi.h | 5 -
+ include/linux/spi/sh_hspi.h | 4 -
+ include/linux/spi/sh_msiof.h | 2 +
+ include/linux/spi/spi.h | 6 +-
+ include/linux/spi/tle62x0.h | 4 -
+ include/linux/spi/tsc2005.h | 5 -
+ sound/soc/rockchip/rockchip_i2s.c | 1 +
+ 57 files changed, 1841 insertions(+), 396 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/spi/spi-st-ssc.txt
+ create mode 100644 drivers/spi/spi-dln2.c
+ create mode 100644 drivers/spi/spi-st-ssc4.c
+Merging tip/auto-latest (caa523dc2242 Merge branch 'x86/urgent')
+$ git merge tip/auto-latest
+Auto-merging arch/x86/include/uapi/asm/msr-index.h
+Merge made by the 'recursive' strategy.
+ arch/x86/include/asm/cpufeature.h | 2 ++
+ arch/x86/include/asm/debugreg.h | 5 +++
+ arch/x86/include/asm/hw_breakpoint.h | 1 +
+ arch/x86/include/uapi/asm/msr-index.h | 4 +++
+ arch/x86/kernel/cpu/amd.c | 19 +++++++++++
+ arch/x86/kernel/hw_breakpoint.c | 45 ++++++++++---------------
+ tools/perf/Documentation/perf-record.txt | 7 ++--
+ tools/perf/tests/parse-events.c | 58 ++++++++++++++++++++++++++++++++
+ tools/perf/util/parse-events.c | 21 ++++++------
+ tools/perf/util/parse-events.h | 2 +-
+ tools/perf/util/parse-events.l | 1 +
+ tools/perf/util/parse-events.y | 26 ++++++++++++--
+ 12 files changed, 148 insertions(+), 43 deletions(-)
+Merging clockevents/clockevents/next (b0ad5917960c ARM/ARM64: arch-timer: fix arch_timer_probed logic)
+$ git merge clockevents/clockevents/next
+Merge made by the 'recursive' strategy.
+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 (ae9b56e3996d EDAC, synps: Add EDAC support for zynq ddr ecc controller)
+$ git merge edac-amd/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 1 +
+ drivers/edac/Kconfig | 7 +
+ drivers/edac/Makefile | 1 +
+ drivers/edac/mce_amd_inj.c | 2 +-
+ drivers/edac/mpc85xx_edac.c | 2 +-
+ drivers/edac/mpc85xx_edac.h | 2 +-
+ drivers/edac/synopsys_edac.c | 535 +++++++++++++++++++++++++++++++++++++++++++
+ 7 files changed, 547 insertions(+), 3 deletions(-)
+ create mode 100644 drivers/edac/synopsys_edac.c
+Merging irqchip/irqchip/for-next (91d117921216 irqchip: atmel-aic-common: Prevent clobbering of priority when changing IRQ type)
+$ git merge irqchip/irqchip/for-next
+Merge made by the 'recursive' strategy.
+ drivers/irqchip/irq-atmel-aic-common.c | 4 ++--
+ drivers/irqchip/irq-gic-v3-its.c | 2 +-
+ drivers/irqchip/irq-hip04.c | 2 +-
+ drivers/irqchip/irq-mtk-sysirq.c | 4 ++--
+ drivers/irqchip/irq-omap-intc.c | 26 +++++++++++++++++++++-----
+ 5 files changed, 27 insertions(+), 11 deletions(-)
+Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1)
+$ git merge tiny/tiny/next
+Already up-to-date.
+Merging ftrace/for-next (d716ff71dd12 tracing: Remove taking of trace_types_lock in pipe files)
+$ git merge ftrace/for-next
+Merge made by the 'recursive' strategy.
+ kernel/trace/trace.c | 126 ++++++++++++++++++---------------------------------
+ kernel/trace/trace.h | 1 +
+ 2 files changed, 44 insertions(+), 83 deletions(-)
+Merging rcu/rcu/next (7de789ec4f91 Merge branches 'doc.2015.01.07a', 'fixes.2015.01.11a', 'preempt.2015.01.06a', 'srcu.2015.01.06a', 'stall.2015.01.06a' and 'torture.2015.01.11a' into HEAD)
+$ git merge rcu/rcu/next
+Auto-merging mm/Kconfig
+Auto-merging lib/Kconfig.debug
+Auto-merging init/Kconfig
+Auto-merging drivers/md/Kconfig
+Auto-merging arch/x86/Kconfig
+Merge made by the 'recursive' strategy.
+ Documentation/RCU/stallwarn.txt | 16 +-
+ Documentation/RCU/trace.txt | 32 +-
+ Documentation/memory-barriers.txt | 46 ++-
+ arch/arm/kvm/Kconfig | 1 +
+ arch/arm64/kvm/Kconfig | 1 +
+ arch/mips/kvm/Kconfig | 1 +
+ arch/powerpc/kvm/Kconfig | 1 +
+ arch/s390/kvm/Kconfig | 1 +
+ arch/tile/kvm/Kconfig | 1 +
+ arch/x86/Kconfig | 1 +
+ arch/x86/kvm/Kconfig | 1 +
+ drivers/clk/Kconfig | 1 +
+ drivers/cpufreq/Kconfig | 1 +
+ drivers/devfreq/Kconfig | 1 +
+ drivers/md/Kconfig | 1 +
+ drivers/net/Kconfig | 1 +
+ fs/btrfs/Kconfig | 1 +
+ fs/notify/Kconfig | 1 +
+ fs/quota/Kconfig | 1 +
+ include/linux/compiler.h | 2 +-
+ include/linux/rculist.h | 16 +-
+ include/linux/rcupdate.h | 13 +-
+ include/linux/rcutiny.h | 45 ++-
+ include/linux/rcutree.h | 11 +-
+ include/linux/srcu.h | 14 +-
+ init/Kconfig | 12 +-
+ kernel/cpu.c | 56 ++--
+ kernel/notifier.c | 3 +
+ kernel/power/Kconfig | 1 +
+ kernel/rcu/Makefile | 3 +-
+ kernel/rcu/rcu.h | 6 +
+ kernel/rcu/rcutorture.c | 66 ++--
+ kernel/rcu/srcu.c | 2 +-
+ kernel/rcu/tiny.c | 113 +------
+ kernel/rcu/tiny_plugin.h | 9 +-
+ kernel/rcu/tree.c | 341 +++++++++++++++------
+ kernel/rcu/tree.h | 62 +---
+ kernel/rcu/tree_plugin.h | 271 +++++-----------
+ kernel/rcu/tree_trace.c | 8 +-
+ kernel/softirq.c | 3 +-
+ lib/Kconfig.debug | 3 +-
+ mm/Kconfig | 1 +
+ security/tomoyo/Kconfig | 1 +
+ tools/testing/selftests/rcutorture/bin/cpus2use.sh | 2 +-
+ .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 18 ++
+ .../selftests/rcutorture/bin/kvm-test-1-run.sh | 9 +-
+ .../selftests/rcutorture/bin/parse-build.sh | 20 +-
+ .../selftests/rcutorture/bin/parse-console.sh | 2 +-
+ 48 files changed, 639 insertions(+), 584 deletions(-)
+Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions)
+$ git merge uprobes/for-next
+Already up-to-date.
+Merging kvm/linux-next (bab5bb398273 kvm: x86: Remove kvm_make_request from lapic.c)
+$ git merge kvm/linux-next
+Auto-merging arch/x86/include/uapi/asm/msr-index.h
+Merge made by the 'recursive' strategy.
+ arch/x86/include/asm/kvm_host.h | 1 +
+ arch/x86/include/uapi/asm/msr-index.h | 3 +
+ arch/x86/include/uapi/asm/vmx.h | 5 +
+ arch/x86/kvm/emulate.c | 138 ++++++++++++--------
+ arch/x86/kvm/lapic.c | 73 +++++++++--
+ arch/x86/kvm/lapic.h | 3 +
+ arch/x86/kvm/mmu.c | 92 ++++++--------
+ arch/x86/kvm/mmu.h | 5 +-
+ arch/x86/kvm/svm.c | 4 +-
+ arch/x86/kvm/trace.h | 20 +++
+ arch/x86/kvm/vmx.c | 230 +++++++++++++++++++++++++++++++---
+ arch/x86/kvm/x86.c | 15 +++
+ arch/x86/kvm/x86.h | 3 +
+ virt/kvm/kvm_main.c | 1 +
+ 14 files changed, 457 insertions(+), 136 deletions(-)
+Merging kvm-arm/next (bab5bb398273 kvm: x86: Remove kvm_make_request from lapic.c)
+$ git merge kvm-arm/next
+Already up-to-date.
+Merging kvm-ppc/kvm-ppc-next (2c4aa55a6af0 Merge tag 'signed-kvm-ppc-next' of git://github.com/agraf/linux-2.6 into HEAD)
+$ git merge kvm-ppc/kvm-ppc-next
+Already up-to-date.
+Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1)
+$ git merge oprofile/for-next
+Already up-to-date.
+Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work)
+$ git merge fw-nohz/nohz/next
+Already up-to-date.
+Merging xen-tip/linux-next (2e917175e1ef xen: Speed up set_phys_to_machine() by using read-only mappings)
+$ 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
+Merge made by the 'recursive' strategy.
+ include/linux/percpu-refcount.h | 34 +++++++++++++++++++++++++++++++---
+ 1 file changed, 31 insertions(+), 3 deletions(-)
+Merging workqueues/for-next (9da7dae94fb8 workqueue.h: remove loops of single statement macros)
+$ git merge workqueues/for-next
+Merge made by the 'recursive' strategy.
+ include/linux/workqueue.h | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+Merging drivers-x86/for-next (200db647112d platform/x86/acerhdf: Still depends on THERMAL)
+$ git merge drivers-x86/for-next
+Already up-to-date.
+Merging chrome-platform/for-next (5502486a2077 platform/chrome: chromeos_laptop - Add a limit for deferred retries)
+$ git merge chrome-platform/for-next
+Already up-to-date.
+Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away)
+$ git merge sysctl/master
+Already up-to-date.
+Merging regmap/for-next (270ded427d7b Merge remote-tracking branch 'regmap/topic/core' into regmap-next)
+$ git merge regmap/for-next
+Merge made by the 'recursive' strategy.
+ drivers/base/regmap/internal.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+Merging hsi/for-next (67e9a2ce6e07 hsi: nokia-modem: fix uninitialized device pointer)
+$ git merge hsi/for-next
+Merge made by the 'recursive' strategy.
+ drivers/hsi/clients/nokia-modem.c | 1 +
+ 1 file changed, 1 insertion(+)
+Merging leds/for-next (7f95adda052d leds: Use setup_timer)
+$ git merge leds/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/leds/common.txt | 16 ++++++++++++++++
+ drivers/leds/led-class.c | 5 ++---
+ drivers/leds/leds.h | 3 ++-
+ 3 files changed, 20 insertions(+), 4 deletions(-)
+Merging ipmi/for-next (1421c935df15 ipmi: Fix compile warning with tv_usec)
+$ git merge ipmi/for-next
+Already up-to-date.
+Merging driver-core/driver-core-next (b7392d2247cf Linux 3.19-rc2)
+$ git merge driver-core/driver-core-next
+Already up-to-date.
+Merging tty/tty-next (b7392d2247cf Linux 3.19-rc2)
+$ git merge tty/tty-next
+Already up-to-date.
+Merging usb/usb-next (b7392d2247cf Linux 3.19-rc2)
+$ git merge usb/usb-next
+Already up-to-date.
+Merging usb-gadget/next (b1940cd21c0f Linux 3.19-rc3)
+$ git merge usb-gadget/next
+Already up-to-date.
+Merging usb-serial/usb-next (b7392d2247cf Linux 3.19-rc2)
+$ git merge usb-serial/usb-next
+Already up-to-date.
+Merging staging/staging-next (b7392d2247cf Linux 3.19-rc2)
+$ git merge staging/staging-next
+Already up-to-date.
+Merging char-misc/char-misc-next (b7392d2247cf Linux 3.19-rc2)
+$ git merge char-misc/char-misc-next
+Already up-to-date.
+Merging cgroup/for-next (f3ba53802eff cgroup: add dummy css_put() for !CONFIG_CGROUPS)
+$ git merge cgroup/for-next
+Merge made by the 'recursive' strategy.
+ include/linux/cgroup.h | 4 ++++
+ include/linux/cgroup_subsys.h | 8 ++++----
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+Merging scsi/for-next (0000709efc66 Merge branch 'misc' into for-next)
+$ git merge scsi/for-next
+Auto-merging drivers/ata/libata-eh.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 3 +-
+ drivers/ata/libata-eh.c | 17 +-
+ drivers/misc/enclosure.c | 108 +++++-
+ drivers/scsi/3w-9xxx.c | 3 +-
+ drivers/scsi/Kconfig | 4 +-
+ drivers/scsi/Makefile | 6 +-
+ drivers/scsi/ch.c | 6 +-
+ drivers/scsi/constants.c | 275 ++--------------
+ drivers/scsi/esp_scsi.c | 2 -
+ drivers/scsi/lpfc/lpfc_els.c | 9 +
+ drivers/scsi/megaraid/megaraid_sas.h | 66 +++-
+ drivers/scsi/megaraid/megaraid_sas_base.c | 188 +++++++----
+ drivers/scsi/megaraid/megaraid_sas_fp.c | 17 +-
+ drivers/scsi/megaraid/megaraid_sas_fusion.c | 109 ++++---
+ drivers/scsi/megaraid/megaraid_sas_fusion.h | 9 +-
+ drivers/scsi/mpt2sas/mpt2sas_base.c | 8 +-
+ drivers/scsi/mpt3sas/mpt3sas_base.c | 8 +-
+ drivers/scsi/scsi.c | 11 +-
+ drivers/scsi/scsi_debug.c | 128 +++++++-
+ drivers/scsi/scsi_error.c | 50 ++-
+ drivers/scsi/scsi_lib.c | 3 +-
+ drivers/scsi/scsi_logging.c | 489 ++++++++++++++++++++++++++++
+ drivers/scsi/scsi_scan.c | 54 +--
+ drivers/scsi/sd.c | 7 +-
+ drivers/scsi/ses.c | 148 +++++++--
+ drivers/scsi/sr_ioctl.c | 13 +-
+ drivers/scsi/storvsc_drv.c | 190 ++++-------
+ drivers/scsi/ufs/ufshcd.c | 6 +-
+ drivers/xen/xen-scsiback.c | 1 +
+ include/linux/enclosure.h | 13 +-
+ include/scsi/scsi.h | 3 +
+ include/scsi/scsi_dbg.h | 74 ++++-
+ include/scsi/scsi_device.h | 21 +-
+ 33 files changed, 1359 insertions(+), 690 deletions(-)
+ create mode 100644 drivers/scsi/scsi_logging.c
+Merging target-updates/for-next (97bf6af1f928 Linux 3.19-rc1)
+$ git merge target-updates/for-next
+Already up-to-date.
+Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2)
+$ git merge target-merge/for-next-merge
+Already up-to-date.
+Merging writeback/writeback-for-next (f9b0e058cbd0 writeback: Fix data corruption on NFS)
+$ git merge writeback/writeback-for-next
+Already up-to-date.
+Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries)
+$ git merge hwspinlock/linux-next
+Already up-to-date.
+Merging pinctrl/for-next (b42180a041eb Merge branch 'devel' into for-next)
+$ git merge pinctrl/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/pinctrl/ste,nomadik.txt | 35 +-
+ .../bindings/pinctrl/xlnx,zynq-pinctrl.txt | 104 ++
+ drivers/pinctrl/Kconfig | 8 +
+ drivers/pinctrl/Makefile | 3 +-
+ drivers/pinctrl/intel/pinctrl-cherryview.c | 105 +-
+ drivers/pinctrl/mvebu/pinctrl-armada-38x.c | 6 +-
+ drivers/pinctrl/nomadik/pinctrl-abx500.c | 2 +-
+ drivers/pinctrl/pinconf-generic.c | 199 ++--
+ drivers/pinctrl/pinconf.c | 4 +-
+ drivers/pinctrl/pinconf.h | 22 +-
+ drivers/pinctrl/pinctrl-rockchip.c | 47 +-
+ drivers/pinctrl/pinctrl-tz1090-pdc.c | 2 +-
+ drivers/pinctrl/pinctrl-tz1090.c | 2 +-
+ drivers/pinctrl/pinctrl-zynq.c | 1176 ++++++++++++++++++++
+ drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 125 +--
+ drivers/pinctrl/sh-pfc/pinctrl.c | 2 +-
+ include/linux/pinctrl/pinconf-generic.h | 29 +
+ include/linux/pinctrl/pinctrl.h | 9 +
+ 18 files changed, 1615 insertions(+), 265 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/xlnx,zynq-pinctrl.txt
+ create mode 100644 drivers/pinctrl/pinctrl-zynq.c
+$ git reset --hard HEAD^
+HEAD is now at 4741f683fa36 Merge remote-tracking branch 'scsi/for-next'
+Merging next-20150109 version of pinctrl
+$ git merge -m next-20150109/pinctrl fce7fcc785998d91a4e2293ec6c0fa7a4677999b
+Already up-to-date.
+Merging vhost/linux-next (c6c856d33dda virtio_pci: drop virtio_config dependency)
+$ git merge vhost/linux-next
+Removing arch/mn10300/unit-asb2305/pci-iomap.c
+Merge made by the 'recursive' strategy.
+ arch/alpha/include/asm/uaccess.h | 86 ++--
+ arch/arm/include/asm/uaccess.h | 96 ++---
+ arch/arm64/include/asm/uaccess.h | 4 +-
+ arch/avr32/include/asm/uaccess.h | 24 +-
+ arch/blackfin/include/asm/uaccess.h | 32 +-
+ arch/cris/include/asm/uaccess.h | 117 +++---
+ arch/frv/include/asm/segment.h | 2 +-
+ arch/ia64/include/asm/uaccess.h | 11 +-
+ arch/m32r/include/asm/uaccess.h | 88 ++---
+ arch/m68k/include/asm/segment.h | 2 +-
+ arch/m68k/include/asm/uaccess_mm.h | 40 +-
+ arch/metag/include/asm/uaccess.h | 25 +-
+ arch/mn10300/unit-asb2305/pci-iomap.c | 35 --
+ arch/openrisc/include/asm/uaccess.h | 4 +-
+ arch/parisc/include/asm/uaccess.h | 116 +++---
+ arch/s390/include/asm/pci_io.h | 1 +
+ arch/s390/pci/pci.c | 34 +-
+ arch/sh/include/asm/segment.h | 2 +-
+ arch/sh/include/asm/uaccess.h | 4 +-
+ arch/sh/include/asm/uaccess_64.h | 8 +-
+ arch/sparc/include/asm/uaccess_32.h | 339 +++++++++-------
+ arch/sparc/include/asm/uaccess_64.h | 222 ++++++-----
+ arch/tile/include/asm/uaccess.h | 6 +-
+ arch/x86/include/asm/uaccess.h | 2 +-
+ arch/xtensa/include/asm/uaccess.h | 90 ++---
+ drivers/virtio/Makefile | 2 +-
+ drivers/virtio/virtio_pci_common.c | 13 +-
+ drivers/virtio/virtio_pci_common.h | 29 +-
+ drivers/virtio/virtio_pci_modern.c | 716 ++++++++++++++++++++++++++++++++++
+ include/asm-generic/pci_iomap.h | 10 +
+ include/uapi/linux/virtio_pci.h | 94 ++++-
+ lib/pci_iomap.c | 35 +-
+ 32 files changed, 1621 insertions(+), 668 deletions(-)
+ delete mode 100644 arch/mn10300/unit-asb2305/pci-iomap.c
+ create mode 100644 drivers/virtio/virtio_pci_modern.c
+Merging remoteproc/for-next (9a3c4145af32 Linux 3.16-rc6)
+$ git merge remoteproc/for-next
+Already up-to-date.
+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 (9c5e7b941de1 Merge branch 'devel' into for-next)
+$ git merge gpio/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-gpio | 1 +
+ Documentation/gpio/sysfs.txt | 8 ++
+ drivers/gpio/Kconfig | 2 +
+ drivers/gpio/gpio-dln2.c | 156 ++++++++++--------------
+ drivers/gpio/gpio-grgpio.c | 3 +-
+ drivers/gpio/gpio-moxart.c | 101 +++++----------
+ drivers/gpio/gpio-sx150x.c | 229 ++++++++++++++++++++---------------
+ drivers/gpio/gpiolib-sysfs.c | 77 +++++++++++-
+ 8 files changed, 312 insertions(+), 265 deletions(-)
+Merging dma-mapping/dma-mapping-next (dda02fd6278d mm, cma: make parameters order consistent in func declaration and definition)
+$ git merge dma-mapping/dma-mapping-next
+Already up-to-date.
+Merging pwm/for-next (39e046f2c1dd pwm: atmel-hlcdc: add at91sam9x5 and sama5d3 errata handling)
+$ git merge pwm/for-next
+Already up-to-date.
+Merging dma-buf/for-next (101e31050bf1 dma-buf/fence: Fix one more kerneldoc warning)
+$ git merge dma-buf/for-next
+Merge made by the 'recursive' strategy.
+Merging userns/for-next (db86da7cb76f userns: Unbreak the unprivileged remount tests)
+$ git merge userns/for-next
+Already up-to-date.
+Merging ktest/for-next (17150fef4ab1 ktest: Add back "tail -1" to kernelrelease make)
+$ git merge ktest/for-next
+Already up-to-date.
+Merging signal/for-next (20b4fb485227 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
+$ git merge signal/for-next
+Already up-to-date.
+Merging clk/clk-next (f1e9203e2366 clk: samsung: Fix Exynos 5420 pinctrl setup and clock disable failure due to domain being gated)
+$ git merge clk/clk-next
+Already up-to-date.
+Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data)
+$ git merge random/dev
+Already up-to-date.
+Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access)
+$ git merge lzo-update/lzo-update
+Auto-merging lib/lzo/lzo1x_decompress_safe.c
+Merge made by the 'recursive' strategy.
+ lib/lzo/lzo1x_decompress_safe.c | 4 ++++
+ lib/lzo/lzodefs.h | 6 ++++++
+ 2 files changed, 10 insertions(+)
+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 documentation/for-next (0415447aa3b4 Documentation: fix broken v4l-utils URL)
+$ git merge documentation/for-next
+Already up-to-date.
+Merging kselftest/next (97bf6af1f928 Linux 3.19-rc1)
+$ git merge kselftest/next
+Already up-to-date.
+Merging y2038/y2038 (45446a99cef6 staging: media: lirc: Replace timeval with ktime_t in lirc_parallel.c)
+$ git merge y2038/y2038
+Resolved 'drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c' using previous resolution.
+Resolved 'drivers/staging/ft1000/ft1000-usb/ft1000_debug.c' using previous resolution.
+Resolved 'drivers/staging/media/lirc/lirc_sasem.c' using previous resolution.
+Auto-merging kernel/cpuset.c
+Auto-merging drivers/staging/media/lirc/lirc_serial.c
+Auto-merging drivers/staging/media/lirc/lirc_sasem.c
+CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_sasem.c
+Auto-merging drivers/staging/media/lirc/lirc_parallel.c
+Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
+Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
+CONFLICT (content): Merge conflict in drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
+Auto-merging drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
+CONFLICT (content): Merge conflict in drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master e90603a21883] Merge remote-tracking branch 'y2038/y2038'
+$ git diff -M --stat --summary HEAD^..
+ drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 6 +--
+ drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 6 +--
+ drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 6 +--
+ 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 ++++++++----------------
+ kernel/cpuset.c | 12 ++++--
+ 10 files changed, 69 insertions(+), 87 deletions(-)
+Merging luto-misc/next (d4812e169de4 x86, mce: Get rid of TIF_MCE_NOTIFY and associated mce tricks)
+$ git merge luto-misc/next
+Merge made by the 'recursive' strategy.
+ Documentation/x86/entry_64.txt | 18 ++++--
+ Documentation/x86/x86_64/kernel-stacks | 8 ++-
+ arch/x86/include/asm/mce.h | 1 -
+ arch/x86/include/asm/thread_info.h | 15 ++++-
+ arch/x86/include/asm/traps.h | 6 ++
+ arch/x86/kernel/cpu/mcheck/mce.c | 114 +++++++++------------------------
+ arch/x86/kernel/cpu/mcheck/p5.c | 6 ++
+ arch/x86/kernel/cpu/mcheck/winchip.c | 5 ++
+ arch/x86/kernel/entry_64.S | 86 +++++++++++++------------
+ arch/x86/kernel/irq_32.c | 13 +---
+ arch/x86/kernel/signal.c | 6 --
+ arch/x86/kernel/traps.c | 108 ++++++++++++++++++++++++-------
+ 12 files changed, 208 insertions(+), 178 deletions(-)
+Merging access_once/linux-next (29bde09065b7 next: sh: Fix compile error)
+$ git merge access_once/linux-next
+Auto-merging include/linux/compiler.h
+Merge made by the 'recursive' strategy.
+ arch/powerpc/kvm/book3s_hv_rm_xics.c | 8 ++++----
+ arch/powerpc/kvm/book3s_xics.c | 16 ++++++++--------
+ arch/powerpc/mm/hugetlbpage.c | 4 ++--
+ arch/sh/mm/gup.c | 2 +-
+ arch/x86/include/asm/spinlock.h | 2 +-
+ arch/x86/xen/p2m.c | 2 +-
+ include/linux/compiler.h | 21 ++++++++++++++++-----
+ mm/gup.c | 2 +-
+ 8 files changed, 34 insertions(+), 23 deletions(-)
+Merging livepatching/for-next (99590ba565a2 livepatch: fix deferred module patching order)
+$ git merge livepatching/for-next
+Auto-merging arch/x86/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-kernel-livepatch | 44 ++
+ Documentation/oops-tracing.txt | 2 +
+ Documentation/sysctl/kernel.txt | 1 +
+ MAINTAINERS | 15 +
+ arch/x86/Kconfig | 3 +
+ arch/x86/include/asm/livepatch.h | 46 ++
+ arch/x86/kernel/Makefile | 1 +
+ arch/x86/kernel/livepatch.c | 90 +++
+ include/linux/kernel.h | 1 +
+ include/linux/livepatch.h | 133 ++++
+ kernel/Makefile | 1 +
+ kernel/livepatch/Kconfig | 18 +
+ kernel/livepatch/Makefile | 3 +
+ kernel/livepatch/core.c | 937 +++++++++++++++++++++++
+ kernel/panic.c | 2 +
+ samples/Kconfig | 7 +
+ samples/Makefile | 2 +-
+ samples/livepatch/Makefile | 1 +
+ samples/livepatch/livepatch-sample.c | 91 +++
+ 19 files changed, 1397 insertions(+), 1 deletion(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-kernel-livepatch
+ create mode 100644 arch/x86/include/asm/livepatch.h
+ create mode 100644 arch/x86/kernel/livepatch.c
+ create mode 100644 include/linux/livepatch.h
+ create mode 100644 kernel/livepatch/Kconfig
+ create mode 100644 kernel/livepatch/Makefile
+ create mode 100644 kernel/livepatch/core.c
+ create mode 100644 samples/livepatch/Makefile
+ create mode 100644 samples/livepatch/livepatch-sample.c
+Merging akpm-current/current (1d9e76e2eb3f fs/affs/file.c: replace if/BUG by BUG_ON)
+$ git merge --no-ff akpm-current/current
+Recorded preimage for 'mm/memory.c'
+Auto-merging mm/vmscan.c
+Auto-merging mm/rmap.c
+Auto-merging mm/page-writeback.c
+Auto-merging mm/mmap.c
+Auto-merging mm/memory.c
+CONFLICT (content): Merge conflict in mm/memory.c
+Auto-merging mm/memcontrol.c
+Auto-merging mm/gup.c
+Removing mm/fremap.c
+Auto-merging mm/Kconfig
+Auto-merging lib/string.c
+Auto-merging lib/Kconfig.debug
+Auto-merging lib/Kconfig
+Auto-merging init/Kconfig
+Auto-merging include/linux/rmap.h
+Auto-merging include/linux/fs.h
+Auto-merging fs/ocfs2/namei.c
+Auto-merging fs/ocfs2/dlm/dlmrecovery.c
+Auto-merging fs/notify/fanotify/fanotify_user.c
+Auto-merging fs/inode.c
+Auto-merging fs/gfs2/file.c
+Auto-merging fs/f2fs/file.c
+Auto-merging fs/cifs/file.c
+Auto-merging fs/ceph/addr.c
+Auto-merging drivers/input/input.c
+Auto-merging arch/x86/kernel/signal.c
+Auto-merging arch/x86/include/asm/thread_info.h
+Auto-merging arch/microblaze/kernel/signal.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'mm/memory.c'.
+[master 8e41b250fed4] Merge branch 'akpm-current/current'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/cachetlb.txt | 8 +-
+ .../devicetree/bindings/rtc/isil,isl12057.txt | 78 +++++
+ .../devicetree/bindings/rtc/nxp,rtc-2123.txt | 16 +
+ Documentation/filesystems/fiemap.txt | 3 +-
+ Documentation/filesystems/ocfs2.txt | 4 +
+ Documentation/filesystems/proc.txt | 6 +-
+ Documentation/filesystems/vfat.txt | 10 +
+ Documentation/leds/leds-class.txt | 3 -
+ Documentation/printk-formats.txt | 6 +
+ Documentation/vm/pagemap.txt | 8 +
+ Documentation/vm/remap_file_pages.txt | 7 +-
+ arch/alpha/include/asm/pgtable.h | 7 -
+ arch/alpha/include/asm/thread_info.h | 5 -
+ arch/alpha/include/uapi/asm/mman.h | 1 +
+ arch/alpha/kernel/signal.c | 2 +-
+ arch/arc/include/asm/pgtable.h | 13 +-
+ arch/arc/include/asm/thread_info.h | 4 -
+ arch/arc/kernel/signal.c | 2 +-
+ arch/arm/boot/dts/armada-370-netgear-rn102.dts | 1 +
+ arch/arm/boot/dts/armada-370-netgear-rn104.dts | 1 +
+ arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 1 +
+ arch/arm/include/asm/pgtable-2level.h | 1 -
+ arch/arm/include/asm/pgtable-3level.h | 2 +-
+ arch/arm/include/asm/pgtable-nommu.h | 2 -
+ arch/arm/include/asm/pgtable.h | 20 +-
+ arch/arm/include/asm/thread_info.h | 4 -
+ arch/arm/kernel/signal.c | 4 +-
+ arch/arm/mm/proc-macros.S | 2 +-
+ arch/arm64/include/asm/pgtable.h | 24 +-
+ arch/arm64/include/asm/thread_info.h | 4 -
+ arch/arm64/kernel/signal.c | 2 +-
+ arch/arm64/kernel/signal32.c | 4 +-
+ arch/avr32/include/asm/pgtable.h | 25 --
+ arch/avr32/include/asm/thread_info.h | 4 -
+ arch/avr32/kernel/asm-offsets.c | 1 -
+ arch/avr32/kernel/signal.c | 2 +-
+ arch/blackfin/include/asm/pgtable.h | 5 -
+ arch/blackfin/include/asm/thread_info.h | 4 -
+ arch/blackfin/kernel/signal.c | 2 +-
+ arch/c6x/include/asm/pgtable.h | 5 -
+ arch/c6x/include/asm/thread_info.h | 4 -
+ arch/c6x/kernel/signal.c | 2 +-
+ arch/cris/arch-v10/kernel/signal.c | 2 +-
+ arch/cris/arch-v32/kernel/signal.c | 2 +-
+ arch/cris/include/arch-v10/arch/mmu.h | 3 -
+ arch/cris/include/arch-v32/arch/mmu.h | 3 -
+ arch/cris/include/asm/pgtable.h | 4 -
+ arch/cris/include/asm/thread_info.h | 4 -
+ arch/frv/include/asm/pgtable.h | 27 +-
+ arch/frv/include/asm/string.h | 1 -
+ arch/frv/include/asm/thread_info.h | 4 -
+ arch/frv/kernel/asm-offsets.c | 1 -
+ arch/frv/kernel/signal.c | 2 +-
+ arch/frv/mm/extable.c | 23 --
+ arch/hexagon/include/asm/pgtable.h | 60 +---
+ arch/hexagon/include/asm/thread_info.h | 4 -
+ arch/hexagon/kernel/signal.c | 2 +-
+ arch/ia64/include/asm/pgtable.h | 25 +-
+ arch/ia64/include/asm/thread_info.h | 4 -
+ arch/ia64/kernel/signal.c | 2 +-
+ arch/m32r/include/asm/pgtable-2level.h | 4 -
+ arch/m32r/include/asm/pgtable.h | 11 -
+ arch/m32r/include/asm/thread_info.h | 5 -
+ arch/m32r/kernel/signal.c | 2 +-
+ arch/m68k/include/asm/mcf_pgtable.h | 23 +-
+ arch/m68k/include/asm/motorola_pgtable.h | 15 -
+ arch/m68k/include/asm/pgtable_no.h | 2 -
+ arch/m68k/include/asm/sun3_pgtable.h | 15 -
+ arch/m68k/include/asm/thread_info.h | 4 -
+ arch/m68k/kernel/signal.c | 4 +-
+ arch/metag/include/asm/pgtable.h | 6 -
+ arch/metag/include/asm/thread_info.h | 6 +-
+ arch/metag/kernel/signal.c | 2 +-
+ arch/microblaze/include/asm/pgtable.h | 11 -
+ arch/microblaze/include/asm/thread_info.h | 4 -
+ arch/microblaze/kernel/signal.c | 2 +-
+ arch/mips/include/asm/pgtable-32.h | 36 ---
+ arch/mips/include/asm/pgtable-64.h | 9 -
+ arch/mips/include/asm/pgtable-bits.h | 9 -
+ arch/mips/include/asm/pgtable.h | 2 -
+ arch/mips/include/asm/thread_info.h | 4 -
+ arch/mips/include/uapi/asm/mman.h | 1 +
+ arch/mips/kernel/asm-offsets.c | 1 -
+ arch/mips/kernel/signal.c | 2 +-
+ arch/mips/kernel/signal32.c | 2 +-
+ arch/mn10300/include/asm/pgtable.h | 17 +-
+ arch/mn10300/include/asm/thread_info.h | 4 -
+ arch/mn10300/kernel/asm-offsets.c | 1 -
+ arch/mn10300/kernel/signal.c | 2 +-
+ arch/nios2/include/asm/pgtable-bits.h | 1 -
+ arch/nios2/include/asm/pgtable.h | 10 +-
+ arch/openrisc/include/asm/pgtable.h | 8 -
+ arch/openrisc/include/asm/thread_info.h | 4 -
+ arch/openrisc/kernel/head.S | 5 -
+ arch/openrisc/kernel/signal.c | 2 +-
+ arch/parisc/include/asm/pgtable.h | 10 -
+ arch/parisc/include/asm/thread_info.h | 4 -
+ arch/parisc/include/uapi/asm/mman.h | 1 +
+ arch/parisc/kernel/signal.c | 2 +-
+ arch/powerpc/include/asm/pgtable-ppc32.h | 9 +-
+ arch/powerpc/include/asm/pgtable-ppc64.h | 7 +-
+ arch/powerpc/include/asm/pgtable.h | 1 -
+ arch/powerpc/include/asm/pte-40x.h | 1 -
+ arch/powerpc/include/asm/pte-44x.h | 5 -
+ arch/powerpc/include/asm/pte-8xx.h | 1 -
+ arch/powerpc/include/asm/pte-book3e.h | 1 -
+ arch/powerpc/include/asm/pte-fsl-booke.h | 3 -
+ arch/powerpc/include/asm/pte-hash32.h | 1 -
+ arch/powerpc/include/asm/pte-hash64.h | 1 -
+ arch/powerpc/include/asm/thread_info.h | 4 -
+ arch/powerpc/kernel/signal_32.c | 4 +-
+ arch/powerpc/kernel/signal_64.c | 2 +-
+ arch/powerpc/mm/pgtable_64.c | 2 +-
+ arch/s390/include/asm/pgtable.h | 29 +-
+ arch/s390/include/asm/string.h | 1 -
+ arch/s390/include/asm/thread_info.h | 4 -
+ arch/s390/kernel/compat_signal.c | 2 +-
+ arch/s390/kernel/signal.c | 2 +-
+ arch/score/include/asm/pgtable-bits.h | 1 -
+ arch/score/include/asm/pgtable.h | 18 +-
+ arch/score/include/asm/thread_info.h | 4 -
+ arch/score/kernel/asm-offsets.c | 1 -
+ arch/score/kernel/signal.c | 2 +-
+ arch/sh/include/asm/pgtable_32.h | 30 +-
+ arch/sh/include/asm/pgtable_64.h | 9 +-
+ arch/sh/include/asm/thread_info.h | 4 -
+ arch/sh/kernel/asm-offsets.c | 1 -
+ arch/sh/kernel/signal_32.c | 4 +-
+ arch/sh/kernel/signal_64.c | 4 +-
+ arch/sparc/include/asm/pgtable_32.h | 24 --
+ arch/sparc/include/asm/pgtable_64.h | 49 +--
+ arch/sparc/include/asm/pgtsrmmu.h | 14 +-
+ arch/sparc/include/asm/thread_info_32.h | 6 -
+ arch/sparc/include/asm/thread_info_64.h | 12 +-
+ arch/sparc/kernel/signal32.c | 4 +-
+ arch/sparc/kernel/signal_32.c | 2 +-
+ arch/sparc/kernel/signal_64.c | 2 +-
+ arch/sparc/kernel/traps_64.c | 2 -
+ arch/tile/include/asm/pgtable.h | 11 -
+ arch/tile/include/asm/thread_info.h | 4 -
+ arch/tile/kernel/signal.c | 2 +-
+ arch/tile/mm/homecache.c | 4 -
+ arch/um/include/asm/pgtable-2level.h | 9 -
+ arch/um/include/asm/pgtable-3level.h | 20 --
+ arch/um/include/asm/pgtable.h | 9 -
+ arch/um/include/asm/thread_info.h | 4 -
+ arch/unicore32/include/asm/pgtable-hwdef.h | 1 -
+ arch/unicore32/include/asm/pgtable.h | 14 -
+ arch/unicore32/include/asm/thread_info.h | 4 -
+ arch/unicore32/kernel/signal.c | 2 +-
+ arch/x86/ia32/ia32_signal.c | 2 +-
+ arch/x86/include/asm/pgtable-2level.h | 38 +--
+ arch/x86/include/asm/pgtable-3level.h | 12 -
+ arch/x86/include/asm/pgtable.h | 25 +-
+ arch/x86/include/asm/pgtable_64.h | 6 +-
+ arch/x86/include/asm/pgtable_types.h | 3 -
+ arch/x86/include/asm/thread_info.h | 4 -
+ arch/x86/kernel/machine_kexec_64.c | 1 +
+ arch/x86/kernel/signal.c | 2 +-
+ arch/x86/um/signal.c | 2 +-
+ arch/xtensa/include/asm/pgtable.h | 10 -
+ arch/xtensa/include/asm/thread_info.h | 5 -
+ arch/xtensa/include/uapi/asm/mman.h | 1 +
+ arch/xtensa/kernel/signal.c | 2 +-
+ block/genhd.c | 2 +-
+ drivers/block/zram/zram_drv.c | 22 +-
+ drivers/char/Kconfig | 9 +
+ drivers/char/mem.c | 18 +-
+ drivers/gpu/drm/drm_vma_manager.c | 3 +-
+ drivers/input/Kconfig | 9 +
+ drivers/input/Makefile | 3 +
+ drivers/input/input.c | 9 +
+ drivers/input/leds.c | 272 ++++++++++++++++
+ drivers/leds/Kconfig | 3 -
+ drivers/misc/ti-st/st_core.c | 2 +-
+ drivers/rtc/class.c | 24 ++
+ drivers/rtc/interface.c | 13 +-
+ drivers/rtc/rtc-at91sam9.c | 2 +-
+ drivers/rtc/rtc-imxdi.c | 50 ++-
+ drivers/rtc/rtc-isl12057.c | 348 ++++++++++++++++++++-
+ drivers/rtc/rtc-pcf2123.c | 10 +
+ drivers/tty/Kconfig | 4 +
+ drivers/tty/vt/keyboard.c | 110 +++++--
+ fs/9p/vfs_file.c | 2 -
+ fs/affs/amigaffs.c | 6 +-
+ fs/affs/dir.c | 8 +-
+ fs/affs/file.c | 42 ++-
+ fs/affs/inode.c | 5 +-
+ fs/affs/namei.c | 18 +-
+ fs/befs/linuxvfs.c | 6 +-
+ fs/btrfs/file.c | 1 -
+ fs/ceph/addr.c | 1 -
+ fs/cifs/file.c | 1 -
+ fs/coda/dir.c | 138 ++++----
+ fs/ext4/file.c | 1 -
+ fs/ext4/fsync.c | 5 +-
+ fs/f2fs/file.c | 1 -
+ fs/fat/cache.c | 79 +++--
+ fs/fat/dir.c | 2 +-
+ fs/fat/fat.h | 6 +-
+ fs/fat/file.c | 61 ++++
+ fs/fat/inode.c | 77 ++++-
+ fs/fuse/file.c | 1 -
+ fs/gfs2/file.c | 1 -
+ fs/inode.c | 1 -
+ fs/ioctl.c | 5 +
+ fs/jffs2/scan.c | 5 +
+ fs/mpage.c | 23 +-
+ fs/nfs/file.c | 1 -
+ fs/nilfs2/file.c | 1 -
+ fs/notify/fanotify/fanotify.c | 2 +-
+ fs/notify/fanotify/fanotify_user.c | 35 ++-
+ fs/ocfs2/acl.c | 14 +-
+ fs/ocfs2/aops.c | 258 ++++++++++++++-
+ fs/ocfs2/cluster/tcp_internal.h | 12 +-
+ fs/ocfs2/dlm/dlmast.c | 6 +-
+ fs/ocfs2/dlm/dlmmaster.c | 10 -
+ fs/ocfs2/dlm/dlmrecovery.c | 7 +
+ fs/ocfs2/dlm/dlmthread.c | 10 +
+ fs/ocfs2/file.c | 110 +++----
+ fs/ocfs2/file.h | 9 +
+ fs/ocfs2/inode.h | 2 +
+ fs/ocfs2/journal.c | 115 +++++--
+ fs/ocfs2/journal.h | 5 +
+ fs/ocfs2/mmap.c | 1 -
+ fs/ocfs2/namei.c | 348 +++++++++++++++++++++
+ fs/ocfs2/namei.h | 5 +
+ fs/ocfs2/ocfs2.h | 17 +
+ fs/ocfs2/ocfs2_fs.h | 5 +-
+ fs/ocfs2/ocfs2_trace.h | 3 +
+ fs/ocfs2/super.c | 19 ++
+ fs/proc/generic.c | 2 +-
+ fs/proc/inode.c | 2 +-
+ fs/proc/meminfo.c | 2 +-
+ fs/proc/page.c | 16 +-
+ fs/proc/task_mmu.c | 32 +-
+ fs/proc/vmcore.c | 8 +-
+ fs/reiserfs/inode.c | 2 +-
+ fs/select.c | 2 +-
+ fs/ubifs/file.c | 1 -
+ fs/ufs/super.c | 4 +-
+ fs/xfs/xfs_file.c | 1 -
+ include/asm-generic/pgtable.h | 15 -
+ include/linux/bitmap.h | 52 +--
+ include/linux/cpumask.h | 22 +-
+ include/linux/crc64_ecma.h | 56 ++++
+ include/linux/cryptohash.h | 2 +
+ include/linux/fs.h | 6 +-
+ include/linux/huge_mm.h | 16 +
+ include/linux/hugetlb.h | 2 +-
+ include/linux/init_task.h | 3 +
+ include/linux/input.h | 28 ++
+ include/linux/kexec.h | 4 +-
+ include/linux/memcontrol.h | 19 +-
+ include/linux/mm.h | 44 ++-
+ include/linux/mm_types.h | 20 +-
+ include/linux/mmzone.h | 2 +-
+ include/linux/nodemask.h | 26 +-
+ include/linux/oom.h | 5 -
+ include/linux/printk.h | 6 +-
+ include/linux/rbtree.h | 2 +-
+ include/linux/rmap.h | 11 +-
+ include/linux/rtc.h | 4 +
+ include/linux/sched.h | 2 +
+ include/linux/slab.h | 7 +-
+ include/linux/string.h | 4 +-
+ include/linux/string_helpers.h | 4 +-
+ include/linux/swap.h | 15 -
+ include/linux/swapops.h | 4 +-
+ include/linux/vm_event_item.h | 1 +
+ include/linux/zpool.h | 5 +-
+ include/linux/zsmalloc.h | 2 +-
+ include/uapi/asm-generic/mman-common.h | 1 +
+ include/uapi/linux/kernel-page-flags.h | 1 +
+ init/Kconfig | 16 -
+ init/main.c | 5 -
+ kernel/compat.c | 5 +-
+ kernel/fork.c | 8 +-
+ kernel/futex.c | 2 +-
+ kernel/kexec.c | 6 +-
+ kernel/printk/printk.c | 12 +-
+ kernel/ptrace.c | 1 -
+ kernel/signal.c | 2 +-
+ kernel/sysctl.c | 3 -
+ kernel/time/alarmtimer.c | 2 +-
+ kernel/time/hrtimer.c | 2 +-
+ kernel/time/posix-cpu-timers.c | 3 +-
+ lib/Kconfig | 7 +
+ lib/Kconfig.debug | 3 +
+ lib/Makefile | 5 +-
+ lib/bitmap.c | 138 ++++----
+ lib/crc64_ecma.c | 341 ++++++++++++++++++++
+ lib/dynamic_queue_limits.c | 4 +-
+ lib/gen_crc32table.c | 6 +-
+ lib/genalloc.c | 3 +-
+ lib/halfmd4.c | 2 +-
+ lib/hexdump.c | 105 ++++---
+ lib/idr.c | 1 -
+ lib/interval_tree.c | 4 +-
+ lib/kobject_uevent.c | 1 -
+ lib/lcm.c | 2 +-
+ lib/list_sort.c | 7 +-
+ lib/llist.c | 1 -
+ lib/md5.c | 2 +-
+ lib/nlattr.c | 1 -
+ lib/percpu_ida.c | 3 -
+ lib/plist.c | 1 -
+ lib/radix-tree.c | 2 +-
+ lib/show_mem.c | 1 -
+ lib/sort.c | 6 +-
+ lib/stmp_device.c | 3 +-
+ lib/string.c | 8 -
+ lib/string_helpers.c | 26 +-
+ lib/strncpy_from_user.c | 3 +-
+ lib/test-hexdump.c | 180 +++++++++++
+ lib/vsprintf.c | 20 +-
+ mm/Kconfig | 10 +
+ mm/Makefile | 2 +-
+ mm/debug.c | 1 -
+ mm/filemap.c | 1 -
+ mm/filemap_xip.c | 1 -
+ mm/fremap.c | 283 -----------------
+ mm/gup.c | 2 +-
+ mm/huge_memory.c | 42 ++-
+ mm/hugetlb.c | 2 +-
+ mm/interval_tree.c | 34 +-
+ mm/ksm.c | 2 +-
+ mm/madvise.c | 163 +++++++++-
+ mm/memcontrol.c | 252 ++++-----------
+ mm/memory.c | 278 +++++-----------
+ mm/memory_hotplug.c | 11 +-
+ mm/migrate.c | 32 --
+ mm/mincore.c | 9 +-
+ mm/mmap.c | 93 +++++-
+ mm/mprotect.c | 2 +-
+ mm/mremap.c | 2 -
+ mm/msync.c | 5 +-
+ mm/nommu.c | 8 -
+ mm/oom_kill.c | 13 +-
+ mm/page-writeback.c | 12 +-
+ mm/page_alloc.c | 147 +++------
+ mm/page_isolation.c | 7 +-
+ mm/rmap.c | 283 +++--------------
+ mm/shmem.c | 3 +-
+ mm/slab.h | 4 +-
+ mm/slab_common.c | 149 ++++++---
+ mm/swap.c | 4 +-
+ mm/util.c | 30 ++
+ mm/vmscan.c | 66 +++-
+ mm/vmstat.c | 1 +
+ mm/zbud.c | 3 +-
+ mm/zpool.c | 6 +-
+ mm/zsmalloc.c | 239 +++++++++++++-
+ mm/zswap.c | 5 +-
+ scripts/checkpatch.pl | 22 +-
+ tools/vm/page-types.c | 1 +
+ 356 files changed, 4304 insertions(+), 2951 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/rtc/isil,isl12057.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/nxp,rtc-2123.txt
+ create mode 100644 drivers/input/leds.c
+ create mode 100644 include/linux/crc64_ecma.h
+ create mode 100644 lib/crc64_ecma.c
+ create mode 100644 lib/test-hexdump.c
+ delete mode 100644 mm/fremap.c
+$ git clone -s -l -n -q . ../rebase-tmp
+$ cd ../rebase-tmp
+$ git checkout -b akpm remotes/origin/akpm/master
+Switched to a new branch 'akpm'
+$ git rebase --onto master remotes/origin/akpm/master-base
+First, rewinding head to replay your work on top of it...
+Applying: drivers/gpio/gpio-zevio.c: fix build
+Applying: dt-bindings: use isil prefix for Intersil
+Applying: rtc: isl12022: deprecate use of isl in compatible string for isil
+Applying: rtc: isl12057: deprecate use of isl in compatible string for isil
+Applying: staging: iio: isl29028: deprecate use of isl in compatible string for isil
+Applying: arm: dts: zynq: update isl9305 compatible string to use isil vendor prefix
+Applying: drivers/w1/w1_int.c: call put_device if device_register fails
+Applying: mm: add strictlimit knob
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + b6bc02ba0876...415f7f4d10bf akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (415f7f4d10bf mm: add strictlimit knob)
+$ git merge --no-ff akpm/master
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-class-bdi | 8 +++++
+ .../devicetree/bindings/i2c/trivial-devices.txt | 5 ++--
+ .../devicetree/bindings/vendor-prefixes.txt | 3 +-
+ arch/arm/boot/dts/zynq-parallella.dts | 2 +-
+ drivers/gpio/gpio-zevio.c | 4 +++
+ drivers/rtc/rtc-isl12022.c | 3 +-
+ drivers/rtc/rtc-isl12057.c | 3 +-
+ drivers/staging/iio/light/isl29028.c | 4 +--
+ drivers/w1/w1_int.c | 3 +-
+ mm/backing-dev.c | 35 ++++++++++++++++++++++
+ 10 files changed, 58 insertions(+), 12 deletions(-)
diff --git a/Next/quilt-import.log b/Next/quilt-import.log
new file mode 100644
index 0000000..82c37e0
--- /dev/null
+++ b/Next/quilt-import.log
@@ -0,0 +1,2 @@
+Importing jdelvare-hwmon based on 3.17
+Unchanged quilt series jdelvare-hwmon
diff --git a/localversion-next b/localversion-next
new file mode 100644
index 0000000..7b299f0
--- /dev/null
+++ b/localversion-next
@@ -0,0 +1 @@
+-next-20150112
