diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-29 15:00:51 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-29 15:00:51 +1000 |
| commit | d7cf2b3139909a354a71e2885c942e21a60ea062 (patch) | |
| tree | 6a1caebc3e101276c70128b74187b2d3bedd7b80 | |
| parent | c9d7e84b6d252b7a4c496ab49ae4f673b74cdd6b (diff) | |
Add linux-next specific files for 20140829next-20140829
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 222 | ||||
| -rw-r--r-- | Next/Trees | 224 | ||||
| -rw-r--r-- | Next/merge.log | 4011 | ||||
| -rw-r--r-- | Next/quilt-import.log | 27 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 4485 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..a1190e465b2b --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,222 @@ +Name SHA1 +---- ---- +origin 59753a805499f1ffbca4ac0a24b3dff67bf00001 +fixes 23cf8d3ca0fd2cabd0e441fe09a4e8c58b9a0563 +kbuild-current 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 +arc-current 89ca3b881987f5a4be4c5dbaa7f0df12bbdde2fd +arm-current eba1c71819d210f5e0d522571f9b8abce94fe9c5 +m68k-current 9117710a5997eb078035052800a31b77d47e0e5a +metag-fixes ffe6902b66aaa4ca6694bc19639259c16d84ddb1 +mips-fixes 1795cd9b3a91d4b5473c97f491d63892442212ab +powerpc-merge 396a34340cdf7373c00e3977db27d1a20ea65ebc +sparc 451fd72219dd6f3355e2d036c598544c760ee532 +net 7a4cecf74c165653b2d01301b301a8659438217e +ipsec 2d39d120781a5770573dc6ed672a5a562f541aea +sound-current 1a22e7758eabc431d6d8af085dc6e4c5031779a6 +pci-current 8d7004a6904cf089e0ebfe5a27e9674cee5db9dc +wireless c66517165610b911e4c6d268f28d8c640832dbd1 +driver-core.current 52addcf9d6669fa439387610bc65c92fa0980cef +tty.current 52addcf9d6669fa439387610bc65c92fa0980cef +usb.current a9ef803d740bfadf5e505fbc57efa57692e27025 +usb-gadget-fixes 5d19703822da2a8e9161302aa918c8e45a4c5eee +usb-serial-fixes 646907f5bfb0782c731ae9ff6fb63471a3566132 +staging.current a2fa6721c7237b5a666f16f732628c0c09c0b954 +char-misc.current 72ad366f687d45f30a82d8b6e70ce757b21b5aab +input-current a2418fc4a13b5da8d007a038c0a6a50a54edfabd +md-current d47648fcf0611812286f68131b40251c6fa54f5e +crypto-current ce5481d01f67ad304908ec2113515440c0fa86eb +ide a53dae49b2fea43d8f4ec5aeca0e288bbc8d6895 +dwmw2 5950f0803ca9d396ab79b7fe6789351f96e1d8d5 +devicetree-current 5a12a597a8627b91fd9d94365853f9f69a4f399c +rr-fixes ff7e0055bb5ddbbb320cdd8dfd3e18672bddd2ad +vfio-fixes 239a87020b263fe7e70adc5803cb157955023d3c +drm-intel-fixes bbe1c2740d3a25aa1dbe5d842d2ff09cddcdde0a +asm-generic fb9de7ebc3a2eb7ddb83c92e288447a0c313bced +arc 2a5e95d4181c3f177a41b7c141a816859478c4d7 +arm 6f3df165025314cbfc5d1d3f6b44dd356f97475b +arm-perf 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 +arm-soc 1351b6a0c76096b7b8669be78cd7f63dcac3e2a6 +bcm2835 fa389e220254c69ffae0d403eac4146171062d08 +berlin 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 +cortex-m f0d7515372ff0ea53fd66099533d3c8e0464cbbf +ep93xx bfb0709fd17b13498d99592bbe12c91130e35a55 +imx-mxs db8ddc19e4388d8c0f28f1f97eea2e8df172a5ae +ixp4xx 19f949f52599ba7c3f67a5897ac6be14bfcb1200 +keystone c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 +msm 81cf1e061d001fab44dbaa85fc4fbfb6da6713a1 +mvebu 74328d67b0018aa6293d57bc9f4798312105a888 +renesas 78bfd01a29757b65218453c04018cf5043304a92 +samsung 213e1f6f5f0bdd314222c4cf49f94045d74c40ec +sunxi 779b646c810244c5ed0aa5c59800efddd2053c1a +tegra ed2451e40bd170669cb2e7409e66b9a6a3f7b766 +arm64 ea1719672f59eeb85829073b567495c4f472ac9f +blackfin 275f5a8573e7832d0cf344a1b29da357c7038870 +c6x ae72758f1dd93bd367dc7719702f24a9bfb3bad9 +cris cd065a010a97e3c330d1ded9af551664c9689b19 +hexagon a9a44fdf329668125042055c569656aa83d8cccb +ia64 6b15075c2c3662dbe1ac41404c6a2013b24efa1d +m68k 9117710a5997eb078035052800a31b77d47e0e5a +m68knommu 8ab25ce231d59560e3ba01d6b7fa956ccdd1ba33 +metag f93125ae17d1d259b5aba84016db260903822194 +microblaze 83c43c498a0a269e8334e53994c75dad8824cca2 +mips 739c25724af0db4d28e6e3a25ad5e78e20cf7a40 +openrisc 548dafe880ad84d0accc0a5596c26e3348b103e1 +parisc 6c700d71f7faecb540b3fa4303edb5323a2768c1 +parisc-hd c90f06943e05519a87140dc407cf589c220aeedf +powerpc 9e813308a5c18c58f9ccae1ec72ed4e14eaf9025 +fsl 78eb9094ca08a40b8f9d3e113a2b88e0b7dbad1d +mpc5xxx bc75059422338197ce487d338ac9c898761e1e61 +s390 ccc3317f511eb8137083ac52bf7439dfc0b6f52c +sparc-next 451fd72219dd6f3355e2d036c598544c760ee532 +tile ed93567c6fbcd2265ccbf5beea5aacf6c2f83d0f +uml 989e59fa41c5464ab77bf0bf82f32f721430544e +unicore32 d670878e2c9adb86b37e42b0937b2d4825bd2b39 +xtensa e792290be763932d1b8cdf8a36d7015482a49d07 +btrfs 8d875f95da43c6a8f18f77869f2ef26e9594fecc +ceph 5f740d7e1531099b888410e6bab13f68da9b1a4d +cifs ca5d13fc33cc56f7405004574d18172ddbdea2ef +configfs b930c26416c4ea6855726fd977145ccea9afbdda +ecryptfs 04ec5f5c0022ee941615e304bc75853fe1bc94ba +ext3 e6d8fb340f20bc5275ceed86133d1823dec9478d +ext4 ea14f0fa1db6fc0d0278427bf8b69b26c8743be9 +f2fs 922cedbd00b68e506eb6f37cbe07cdf399a37b27 +fscache fe02fb3ec10932ce07406b1581e28326181fc9d8 +fuse d7afaec0b564f0609e116f562983b8e72fc3e9c9 +gfs2 2ddfbdd6848d496d8088b28992d257fd02e58c9d +jfs bb5e50aaa80564268f950d1b2f764455afbfea82 +logfs 339466142b3f58fe0ee4dea7e8c5f3d33099e89c +nfs f87d928f6d98644d39809a013a22f981d39017cf +nfsd e40ee075fa7fa406ab06a18ffd440e864390a5d3 +omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84 +squashfs 6d565409503f4e1f74ac30de14e8c91a2b826cd8 +v9fs f15844e0777fec936f87a87f97394f83911dacd3 +ubifs 25601a3c9737fed554169759582c690b98ead5d4 +xfs 52addcf9d6669fa439387610bc65c92fa0980cef +file-locks 24b496fa31b837f12bfe13f65a2e1babfab6cdf0 +vfs 22a43db4f2a3deed2b7d44f98d8cb54407e90b6a +pci 981c191778a4f92bc82456205a444d522843a630 +hid 683a4771504906a8cfb7626ef284a1229918b63d +i2c 52addcf9d6669fa439387610bc65c92fa0980cef +jdelvare-hwmon c7208164e66f63e3ec1759b98087849286410741 +hwmon-staging 123ce11c850ca74a1eefe9c3a7d12bbd7ae4ac69 +v4l-dvb d1352f268415182f9bfc06b142fb50083e5f6479 +kbuild c7377ed8b9ebc59eabd35f398e9d65c7467cbdd4 +kconfig 95edca5c523c4b404dd60baa0a1bea0e4c38fd72 +libata e87fafe928c06478f8969b1a7794885a76cc1b12 +pm 0b4f58b7cebd74ede19d13b81fb43a7eaeba10a3 +idle e7c95ff32d0075736cbdd8d38d954fb4ed6ced9b +apm 53675abbd1e54a30e621a9744bf9cce0712ddd6c +cpupowerutils f16603386b38c28979f4df1cafdc2fe73fa87d37 +thermal 47d104ba5879790c7c91c3390b0b08399e168efe +ieee1394 d584a66279949561418c82b12bb4c055e6c25836 +dlm 883854c5457a97190f7b0ee20f03bcd9664fc0c2 +swiotlb 8e0629c1d4ce86ce7d98ca8756f42769bb17a3c8 +slave-dma bebbbb764e5baea061ee05f6f00114f3d840d5fc +dmaengine fbeec99ad5c03060ba71c470ac373e24e23a80e0 +net-next a3bf5c429eb5f5ec4d364d51dfa8855efcc005f8 +ipsec-next a3d1214688d5259a200414def4d38f1e4531febd +wireless-next 6a5d088a923854569e20eac4f3f569926d5911ec +bluetooth cf0ba860a91ed2f912f5598a331e3fbd40688f8d +infiniband d087f6ad724dfbcdc3df8e0191b80d9d8d839e71 +mtd b25046b1e5e3f1423434da77ccc859f2f779d1ce +l2-mtd 5b49ab3e03f68eb49db4bce6290e5707b7f6c6f3 +crypto b9347aff91ce4789619168539f08202d8d6a1177 +drm 04cd214516d8a6f0f8c0116185d6e360df0860d2 +drm-panel 9746c61960b63d2cea41333bca00c60f032052bb +drm-intel be71eabebaf9f142612d34d42292b454e984dcb5 +drm-tegra ef70728c7a6571a1a7115031e932b811f1740b2e +sound 890b13a308b9df78ad05fc57eb440b32399be35e +sound-asoc 847a985b2670fcc7ef34f2a8becdd1705cde57aa +modules 480cadc2b7e0fa2bbab20141efb547dfe0c3707c +virtio 480cadc2b7e0fa2bbab20141efb547dfe0c3707c +input 6ba694560caeb3531dbedd5b3a37af037ef2a833 +input-mt 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 +block f37513ea97f9f6b9780f7fe068ab0b21e93aabe7 +device-mapper e8531a5cbbd9f7aec0bed35d1360e15f4c867006 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 80af9e6d7ae633309cc5bca96aee6a45117e7c98 +mmc 11bc9381b277a65ea4b3fe994e658f4a78512139 +mmc-uh 7afa863f166e1d9dbf453d72425e01a0f2231eb3 +kgdb 662bfa325be19ac98af0bc6b31fe142f09033301 +uclinux 6dbe51c251a327e012439c4772097a13df43c5b8 +md 90c25a429b6202262135499a03c6d0ae4c28733d +mfd 6b84006621ac5e43b09f3fa9758982fcdf6ca89b +backlight 964a1c4e0e22cf2da7c35e7d57e61fcd7ba8ee21 +battery 5e37195f30cc31e6a1052cbc282254e127c1b8c7 +fbdev 718b90ac4c21c81f42b6db062ca0867f3cac7648 +viafb 838ac785d521e091bd8b5f6a2b545166f5f32b77 +omap_dss2 be92abea827b82957450dd4ac7f997d5e8173d60 +regulator 3a4bd490bfbcac84780e9a3cae5a6a4a1b11487e +security 478d085524c57cf4283699f529d5a4c22188ea69 +integrity e27319cdf468ce1dd16d3f754180c15c8efc518a +selinux aa9e0de81b5b257f6dae48efe2ed5f255f066497 +lblnet d8ec26d7f8287f5788a494f56e8814210f0e64be +watchdog 8083baba5e9ca5c3a06dace475307f14498604e3 +iommu 0fdb6739098d049397b6bacadd6b8d28063308a1 +dwmw2-iommu 1860e379875dfe7271c649058aeddffe5afd9d0d +vfio 9b936c960f22954bfb89f2fefd8f96916bb42908 +osd ce5d36aac26cc395fe3bc45525cdbad3644f01e5 +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +trivial 307b28b95ce9717680b5980d67ef0b060c8fde3b +audit 451fd72219dd6f3355e2d036c598544c760ee532 +fsnotify 1ca39ab9d21ac93f94b9e3eb364ea9a5cf2aba06 +devicetree a9ecdc0fdc54aa499604dbd43132988effcac9b4 +dt-rh 99de64984c3a7c9bf56a50e6dcc51006c9485620 +spi f256a7b37b5403cd6a8882820dc2d13be7579d1a +tip 1fa0c237b921ae4d08efb52a15d48cd1b7d41b5e +clockevents 3252a646aa2cf706b2a26433a8bd9cb2e5dce410 +edac 50d1bb93672fa2f42cec6e06ce799fbe864f57e9 +edac-amd eba4bfb34d45a2219d1d7534905c026eea6fcd49 +irqchip 289eb96601f35afee92250def53b62eb72ea8514 +ftrace 4ce97dbf50245227add17c83d87dc838e7ca79d0 +rcu 11ed7f934cb807f26da09547b5946c2e534d1dac +uprobes 0326f5a94ddea33fa331b2519f4172f4fb387baa +kvm 54ad89b05ec49b90790de814647b244d3d2cc5ca +kvm-arm 7b46268d29543e313e731606d845e65c17f232e4 +kvm-ppc c77dcacb397519b6ade8f08201a4a90a7f4f751e +oprofile 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae +fw-nohz 74876a98a87a115254b3a66a14b27320b7f0acaa +xen-tip e38230eb3789d9c0ee4e8a32f6638c3036107422 +percpu 9734c78e3b96dca878b01add91a62b63a56d3f37 +workqueues ebb48ccd98d184cc7cd04aace4a64ed46da44ea9 +drivers-x86 770235f68ab61c2106f21a673d869aa35126a2bd +chrome-platform 5502486a2077e4280c618b82e8a77ed35932956f +sysctl 4e474a00d7ff746ed177ddae14fa8b2d4bad7a00 +regmap 1a2b9b19049b2c89c0a57d9b40d2047df36906ce +hsi 3fd276e9c0d75538c3b5ed96d0ce36d227fdca95 +leds 3f6815f711efffb357fc97fa2a7c96489b38e641 +driver-core 52addcf9d6669fa439387610bc65c92fa0980cef +tty 52addcf9d6669fa439387610bc65c92fa0980cef +usb 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 +usb-gadget 8913dc0bb913ac3dc83ed5c10bac2f4e55431981 +usb-serial 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 +staging e4a73e9c6198b0751460edcabf2415ce79518c5c +char-misc 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 +cgroup 549cb2747e0fdb95fa0ce27d4819796812d5f178 +scsi 0d409610d59721382fd8b45181af37768a5d3446 +target-updates 4ca7ea3ceeb94819b01988d94ab593e07485b444 +target-merge b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed +writeback f9b0e058cbd04ada76b13afffa7e1df830543c24 +hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad +pinctrl 0252d6a2ac2ad9961dace28e4c8c9abe6f2a0472 +vhost 970379f59d81edf78a319f9cdc1234730bcbe6b2 +remoteproc 9a3c4145af32125c5ee39c0272662b47307a8323 +rpmsg 397944df3290ddc46dcc6a08cd71fb560700431b +gpio 24f5796e788173e0d6e8c59697bbfa9215ac3d14 +dma-mapping b4bbb107d73bbc0d92c9ae7fd8e69580aa9381e7 +pwm 137fd45ffec15db14034990ceac890975cae7a32 +dma-buf 101e31050bf174e5bcca72bdb9d0bd392aa4f966 +userns a1998908ba46526ac5cbbb9aae610cb234bd9f33 +ktest 4c16b1d6d5e0ca0612de65596a3d1ead8a3372fb +signal 20b4fb485227404329e41ad15588afad3df23050 +clk b11a6face1b6d5518319f797a74e22bb4309daa9 +random e02b876597777ab26288dd2611a97b597d14d661 +lzo-update 42b775abafafdf811ef300e869a4e1480ef1cf95 +aio 7be141d0554921751db103b54e9f794956aa4f65 +llvmlinux 7380100aa7cec1aa2397df27665c8760ff9084ea +powernv-cpuidle 0888839c5b62c44a55ac9d28acc273ba663c65ea +rd-docs 1f65b1aaaa0a5fc2fc4fd231e434e1c245c32503 +signal-cleanup b9f0fb2d4a7a034ee24f0a3d596fb731eb9bba72 +akpm-current 1b16511b903562b8b49b521094d9f2d77377162c +akpm 9d52a2c50ec17ee08a0a4bee67f261e1059304b2 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..edfc17991242 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,224 @@ +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 +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 git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.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.secretlab.ca/git/linux-2.6#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 +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/swarren/linux-rpi.git#for-next +berlin git git://github.com/shesselba/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 +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://www.jni.nu/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 +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 +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next +mpc5xxx git git://git.denx.de/linux-2.6-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 +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://khali.linux-fr.org/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 +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 +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine.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-next git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-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 +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/eparis/audit.git#master +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next +devicetree git git://git.secretlab.ca/git/linux-2.6#devicetree/next +dt-rh git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#clockevents/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git#linux_next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +irqchip git git://git.infradead.org/users/jcooper/linux.git#irqchip/for-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +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://cavan.codon.org.uk/platform-drivers-x86.git#linux-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 +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 +powernv-cpuidle git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#powernv-cpuidle +rd-docs quilt http://www.infradead.org/~rdunlap/Doc/patches/ +signal-cleanup git git://git.kernel.org/pub/scm/linux/kernel/git/rw/misc.git#signal_v4 +akpm-current mmotm http://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm http://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..fb84f431f031 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4011 @@ +$ date +Friday 29 August 09:53:51 AEST 2014 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at ff0c57ac7043 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid +Merging origin/master (59753a805499 Merge tag 'backlight-fixes-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight) +$ git merge origin/master +Updating ff0c57ac7043..59753a805499 +Fast-forward + Documentation/devicetree/bindings/mfd/tc3589x.txt | 107 +++++++++++++++++++++ + .../bindings/pinctrl/qcom,apq8064-pinctrl.txt | 2 +- + Documentation/dma-buf-sharing.txt | 14 +-- + arch/arm/boot/dts/omap3-n900.dts | 2 +- + drivers/dma-buf/fence.c | 2 +- + drivers/gpu/drm/ast/ast_tables.h | 1 + + drivers/gpu/drm/drm_crtc.c | 3 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 2 + + drivers/gpu/drm/msm/msm_drv.c | 3 +- + drivers/gpu/drm/msm/msm_fbdev.c | 2 +- + drivers/gpu/drm/msm/msm_iommu.c | 4 +- + drivers/gpu/drm/radeon/cik.c | 26 +++-- + drivers/gpu/drm/radeon/ni.c | 9 +- + drivers/gpu/drm/radeon/r600.c | 26 ++--- + drivers/gpu/drm/radeon/radeon.h | 2 + + drivers/gpu/drm/radeon/rv770.c | 23 ++--- + drivers/gpu/drm/radeon/si.c | 21 +++- + drivers/gpu/drm/sti/Kconfig | 1 + + drivers/gpu/drm/sti/sti_drm_drv.c | 4 +- + drivers/gpu/drm/sti/sti_hda.c | 10 +- + drivers/gpu/drm/sti/sti_hdmi.c | 10 +- + drivers/gpu/drm/sti/sti_tvout.c | 6 +- + drivers/mfd/ab8500-core.c | 2 +- + drivers/mfd/htc-i2cpld.c | 2 +- + drivers/mfd/omap-usb-host.c | 2 +- + drivers/mfd/twl4030-power.c | 20 ++-- + drivers/pinctrl/nomadik/pinctrl-abx500.c | 3 +- + drivers/pinctrl/pinctrl-at91.c | 4 +- + drivers/pinctrl/pinctrl-rockchip.c | 15 +-- + drivers/pinctrl/pinctrl-tegra-xusb.c | 5 +- + drivers/pinctrl/samsung/pinctrl-exynos.c | 69 +++++++++++-- + drivers/pinctrl/samsung/pinctrl-samsung.h | 1 + + drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 8 +- + drivers/video/backlight/pwm_bl.c | 1 + + include/linux/seqno-fence.h | 1 + + lib/Kconfig.debug | 4 + + security/tomoyo/realpath.c | 5 +- + sound/core/info.c | 4 +- + sound/core/pcm_misc.c | 4 +- + sound/pci/ctxfi/ct20k1reg.h | 4 +- + sound/pci/hda/ca0132_regs.h | 2 +- + sound/pci/hda/patch_realtek.c | 18 ++++ + 42 files changed, 335 insertions(+), 119 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/tc3589x.txt +Merging fixes/master (23cf8d3ca0fd powerpc: Fix "attempt to move .org backwards" error) +$ git merge fixes/master +Merge made by the 'recursive' strategy. +Merging kbuild-current/rc-fixes (7d1311b93e58 Linux 3.17-rc1) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (89ca3b881987 Linux 3.15-rc4) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (eba1c71819d2 ARM: 8130/1: cpuidle/cpuidle-big_little: fix reading cpu id part number) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/include/asm/cacheflush.h | 1 - + arch/arm/include/asm/cputype.h | 3 ++- + arch/arm/include/asm/elf.h | 1 + + arch/arm/include/asm/smp_plat.h | 15 +++++++++++++++ + arch/arm/kernel/entry-header.S | 29 +++++++++++++++-------------- + arch/arm/kernel/module.c | 1 + + arch/arm/mach-exynos/mcpm-exynos.c | 1 - + arch/arm/mm/abort-ev6.S | 6 ------ + arch/arm/mm/abort-ev7.S | 6 ------ + drivers/cpuidle/cpuidle-big_little.c | 13 +++---------- + 10 files changed, 37 insertions(+), 39 deletions(-) +Merging m68k-current/for-linus (9117710a5997 m68k/sun3: Remove define statement no longer needed) +$ git merge m68k-current/for-linus +Already up-to-date. +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 (396a34340cdf powerpc: Fix endianness of flash_block_list in rtas_flash) +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc/master (451fd72219dd Merge tag 'pwm/for-3.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm) +$ git merge sparc/master +Already up-to-date. +Merging net/master (7a4cecf74c16 phy: fix EEE checks inside the phy_init_eee.) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/brocade/bna/bnad.c | 7 ++- + drivers/net/ethernet/ibm/ehea/ehea_main.c | 2 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 19 +++--- + drivers/net/ethernet/intel/e1000e/netdev.c | 21 +++---- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 2 +- + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 2 +- + drivers/net/ethernet/marvell/mvneta.c | 8 ++- + drivers/net/ethernet/moxa/moxart_ether.c | 34 +++++----- + drivers/net/ethernet/qlogic/qlge/qlge_main.c | 5 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 13 ++-- + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 1 + + drivers/net/phy/phy.c | 18 +++--- + drivers/net/vxlan.c | 8 +-- + drivers/net/xen-netback/interface.c | 6 +- + net/core/dev.c | 77 +++++++++++++++++++++-- + 15 files changed, 148 insertions(+), 75 deletions(-) +Merging ipsec/master (2d39d120781a mvneta: Add missing if_vlan.h include.) +$ git merge ipsec/master +Already up-to-date. +Merging sound-current/for-linus (1a22e7758eab ALSA: hda - Set up initial pins for Acer Aspire V5) +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus (8d7004a6904c PCI: spear: Remove module option) +$ git merge pci-current/for-linus +Auto-merging drivers/pci/host/Kconfig +Merge made by the 'recursive' strategy. + drivers/pci/host/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging wireless/master (c66517165610 rtlwifi: rtl8192cu: Add new ID) +$ git merge wireless/master +Merge made by the 'recursive' strategy. + drivers/bcma/host_pci.c | 1 + + drivers/net/wireless/at76c50x-usb.c | 3 +-- + drivers/net/wireless/ath/ath9k/spectral.c | 2 +- + drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 1 + + drivers/ssb/b43_pci_bridge.c | 1 + + include/net/bluetooth/hci_core.h | 2 ++ + include/net/netns/ieee802154_6lowpan.h | 1 - + net/bluetooth/hci_conn.c | 8 ++++++++ + net/bluetooth/hci_core.c | 14 ++++++++++++-- + net/bluetooth/hci_event.c | 17 +++++++++++++++-- + net/ieee802154/6lowpan_rtnl.c | 4 ++-- + net/ieee802154/reassembly.c | 15 +++------------ + net/mac802154/wpan.c | 6 +++++- + net/rfkill/rfkill-gpio.c | 1 + + 15 files changed, 54 insertions(+), 24 deletions(-) +Merging driver-core.current/driver-core-linus (52addcf9d666 Linux 3.17-rc2) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (52addcf9d666 Linux 3.17-rc2) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (a9ef803d740b USB: fix build error with CONFIG_PM_RUNTIME disabled) +$ git merge usb.current/usb-linus +Auto-merging drivers/usb/usbip/usbip_common.h +Auto-merging drivers/usb/usbip/stub_dev.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 8 ++ + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/usb/Kconfig | 2 + + drivers/usb/Makefile | 2 + + drivers/usb/core/hub.c | 16 ++-- + drivers/usb/dwc2/gadget.c | 2 +- + drivers/usb/dwc3/dwc3-omap.c | 2 +- + drivers/usb/gadget/Makefile | 2 +- + drivers/usb/gadget/function/Makefile | 4 +- + drivers/usb/gadget/function/u_ether.c | 3 - + drivers/usb/gadget/function/uvc_video.c | 3 + + drivers/usb/gadget/legacy/Makefile | 6 +- + drivers/usb/gadget/legacy/dbgp.c | 2 + + drivers/usb/gadget/legacy/inode.c | 2 +- + drivers/usb/gadget/udc/Kconfig | 3 +- + drivers/usb/gadget/udc/atmel_usba_udc.c | 2 +- + drivers/usb/gadget/udc/fusb300_udc.c | 8 +- + drivers/usb/gadget/udc/pch_udc.c | 22 ++++- + drivers/usb/gadget/udc/r8a66597-udc.c | 4 +- + drivers/usb/host/ehci-hub.c | 2 +- + drivers/usb/host/xhci-pci.c | 9 ++ + drivers/usb/host/xhci-ring.c | 104 ++++++++------------- + drivers/usb/host/xhci.c | 3 + + drivers/usb/misc/sisusbvga/sisusb.c | 1 + + drivers/usb/musb/ux500_dma.c | 2 +- + drivers/usb/phy/phy-gpio-vbus-usb.c | 4 +- + drivers/usb/phy/phy-msm-usb.c | 4 +- + drivers/usb/phy/phy-samsung-usb.h | 2 +- + drivers/usb/phy/phy.c | 3 + + drivers/usb/serial/ftdi_sio.c | 3 + + drivers/usb/serial/ftdi_sio_ids.h | 7 ++ + drivers/usb/serial/option.c | 31 +++++- + drivers/usb/serial/pl2303.c | 1 + + drivers/usb/serial/pl2303.h | 1 + + drivers/usb/serial/usb-serial.c | 37 ++++++-- + drivers/usb/serial/whiteheat.c | 7 +- + drivers/usb/serial/zte_ev.c | 20 ---- + drivers/usb/storage/unusual_devs.h | 6 ++ + drivers/{staging => usb}/usbip/Kconfig | 0 + drivers/{staging => usb}/usbip/Makefile | 0 + drivers/{staging => usb}/usbip/README | 0 + drivers/{staging => usb}/usbip/stub.h | 0 + drivers/{staging => usb}/usbip/stub_dev.c | 27 ------ + drivers/{staging => usb}/usbip/stub_main.c | 0 + drivers/{staging => usb}/usbip/stub_rx.c | 0 + drivers/{staging => usb}/usbip/stub_tx.c | 0 + drivers/{staging => usb}/usbip/usbip_common.c | 0 + drivers/{staging => usb}/usbip/usbip_common.h | 2 +- + drivers/{staging => usb}/usbip/usbip_event.c | 0 + drivers/{staging => usb}/usbip/usbip_protocol.txt | 0 + drivers/{staging => usb}/usbip/vhci.h | 0 + drivers/{staging => usb}/usbip/vhci_hcd.c | 0 + drivers/{staging => usb}/usbip/vhci_rx.c | 0 + drivers/{staging => usb}/usbip/vhci_sysfs.c | 0 + drivers/{staging => usb}/usbip/vhci_tx.c | 0 + drivers/usb/wusbcore/wa-xfer.c | 3 +- + .../usbip/uapi => include/uapi/linux}/usbip.h | 0 + .../usbip/userspace => tools/usb/usbip}/.gitignore | 0 + .../usbip/userspace => tools/usb/usbip}/AUTHORS | 0 + .../usbip/userspace => tools/usb/usbip}/COPYING | 0 + .../usbip/userspace => tools/usb/usbip}/INSTALL | 0 + .../userspace => tools/usb/usbip}/Makefile.am | 0 + .../usbip/userspace => tools/usb/usbip}/README | 0 + .../usbip/userspace => tools/usb/usbip}/autogen.sh | 0 + .../usbip/userspace => tools/usb/usbip}/cleanup.sh | 0 + .../userspace => tools/usb/usbip}/configure.ac | 0 + .../userspace => tools/usb/usbip}/doc/usbip.8 | 0 + .../userspace => tools/usb/usbip}/doc/usbipd.8 | 0 + .../usb/usbip}/libsrc/Makefile.am | 0 + .../userspace => tools/usb/usbip}/libsrc/list.h | 0 + .../userspace => tools/usb/usbip}/libsrc/names.c | 0 + .../userspace => tools/usb/usbip}/libsrc/names.h | 0 + .../usb/usbip}/libsrc/sysfs_utils.c | 0 + .../usb/usbip}/libsrc/sysfs_utils.h | 0 + .../usb/usbip}/libsrc/usbip_common.c | 0 + .../usb/usbip}/libsrc/usbip_common.h | 0 + .../usb/usbip}/libsrc/usbip_host_driver.c | 0 + .../usb/usbip}/libsrc/usbip_host_driver.h | 0 + .../usb/usbip}/libsrc/vhci_driver.c | 0 + .../usb/usbip}/libsrc/vhci_driver.h | 0 + .../userspace => tools/usb/usbip}/src/Makefile.am | 0 + .../userspace => tools/usb/usbip}/src/usbip.c | 0 + .../userspace => tools/usb/usbip}/src/usbip.h | 0 + .../usb/usbip}/src/usbip_attach.c | 0 + .../userspace => tools/usb/usbip}/src/usbip_bind.c | 0 + .../usb/usbip}/src/usbip_detach.c | 0 + .../userspace => tools/usb/usbip}/src/usbip_list.c | 0 + .../usb/usbip}/src/usbip_network.c | 0 + .../usb/usbip}/src/usbip_network.h | 0 + .../userspace => tools/usb/usbip}/src/usbip_port.c | 0 + .../usb/usbip}/src/usbip_unbind.c | 0 + .../userspace => tools/usb/usbip}/src/usbipd.c | 0 + .../userspace => tools/usb/usbip}/src/utils.c | 0 + .../userspace => tools/usb/usbip}/src/utils.h | 0 + 95 files changed, 210 insertions(+), 165 deletions(-) + rename drivers/{staging => usb}/usbip/Kconfig (100%) + rename drivers/{staging => usb}/usbip/Makefile (100%) + rename drivers/{staging => usb}/usbip/README (100%) + rename drivers/{staging => usb}/usbip/stub.h (100%) + rename drivers/{staging => usb}/usbip/stub_dev.c (90%) + rename drivers/{staging => usb}/usbip/stub_main.c (100%) + rename drivers/{staging => usb}/usbip/stub_rx.c (100%) + rename drivers/{staging => usb}/usbip/stub_tx.c (100%) + rename drivers/{staging => usb}/usbip/usbip_common.c (100%) + rename drivers/{staging => usb}/usbip/usbip_common.h (99%) + rename drivers/{staging => usb}/usbip/usbip_event.c (100%) + rename drivers/{staging => usb}/usbip/usbip_protocol.txt (100%) + rename drivers/{staging => usb}/usbip/vhci.h (100%) + rename drivers/{staging => usb}/usbip/vhci_hcd.c (100%) + rename drivers/{staging => usb}/usbip/vhci_rx.c (100%) + rename drivers/{staging => usb}/usbip/vhci_sysfs.c (100%) + rename drivers/{staging => usb}/usbip/vhci_tx.c (100%) + rename {drivers/staging/usbip/uapi => include/uapi/linux}/usbip.h (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/.gitignore (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/AUTHORS (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/COPYING (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/INSTALL (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/Makefile.am (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/README (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/autogen.sh (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/cleanup.sh (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/configure.ac (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/doc/usbip.8 (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/doc/usbipd.8 (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/Makefile.am (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/list.h (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/names.c (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/names.h (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/sysfs_utils.c (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/sysfs_utils.h (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/usbip_common.c (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/usbip_common.h (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/usbip_host_driver.c (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/usbip_host_driver.h (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/vhci_driver.c (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/vhci_driver.h (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/Makefile.am (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip.c (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip.h (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip_attach.c (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip_bind.c (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip_detach.c (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip_list.c (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip_network.c (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip_network.h (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip_port.c (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip_unbind.c (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbipd.c (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/utils.c (100%) + rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/utils.h (100%) +Merging usb-gadget-fixes/fixes (5d19703822da usb: gadget: remove $(PWD) in ccflags-y) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (646907f5bfb0 USB: ftdi_sio: Added PID for new ekey device) +$ git merge usb-serial-fixes/usb-linus +Already up-to-date. +Merging staging.current/staging-linus (a2fa6721c723 staging: r8188eu: Add new USB ID) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/staging/android/logger.c | 5 +- + drivers/staging/et131x/et131x.c | 68 +++++++++------------- + drivers/staging/lustre/lustre/libcfs/workitem.c | 1 + + drivers/staging/lustre/lustre/obdclass/class_obd.c | 2 +- + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 2 + + 5 files changed, 35 insertions(+), 43 deletions(-) +Merging char-misc.current/char-misc-linus (72ad366f687d thunderbolt: Clear hops before overwriting) +$ git merge char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + drivers/misc/mei/client.c | 1 + + drivers/misc/mei/nfc.c | 11 +++++------ + drivers/thunderbolt/path.c | 21 ++++++++++++++++++++- + 3 files changed, 26 insertions(+), 7 deletions(-) +Merging input-current/for-linus (a2418fc4a13b Input: elantech - add support for trackpoint found on some v3 models) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/atmel,maxtouch.txt | 11 ++ + drivers/input/input-mt.c | 30 +++-- + drivers/input/mouse/alps.c | 4 +- + drivers/input/mouse/elantech.c | 137 +++++++++++++++++++-- + drivers/input/mouse/elantech.h | 3 + + drivers/input/serio/i8042-sparcio.h | 3 +- + 6 files changed, 164 insertions(+), 24 deletions(-) +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 (ce5481d01f67 crypto: drbg - fix failure of generating multiple of 2**16 bytes) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (a53dae49b2fe ide: use module_platform_driver()) +$ 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 (5a12a597a862 arm: Add devicetree fixup machine function) +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging rr-fixes/fixes (ff7e0055bb5d module: Clean up ro/nx after early module load failures) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging vfio-fixes/for-linus (239a87020b26 Merge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into for-linus) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (bbe1c2740d3a drm/i915: Remove bogus __init annotation from DMI callbacks) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/intel_bios.c | 2 +- + drivers/gpu/drm/i915/intel_crt.c | 2 +- + drivers/gpu/drm/i915/intel_display.c | 34 ++++++++++++++++++++++++++++++---- + drivers/gpu/drm/i915/intel_lvds.c | 2 +- + drivers/gpu/drm/i915/intel_panel.c | 8 ++++---- + 5 files changed, 37 insertions(+), 11 deletions(-) +Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu) +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (2a5e95d4181c mm, arc: remove obsolete pagefault oom killer comment) +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (6f3df1650253 Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Merge made by the 'recursive' strategy. + arch/arm/crypto/sha1-armv7-neon.S | 39 ++++++++++++++++++++++----------------- + arch/arm/include/asm/smp.h | 6 ------ + arch/arm/kernel/smp.c | 12 ++++-------- + crypto/Kconfig | 4 ++-- + 4 files changed, 28 insertions(+), 33 deletions(-) +Merging arm-perf/for-next/perf (7d1311b93e58 Linux 3.17-rc1) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (1351b6a0c760 Merge branch 'fixes' into for-next) +$ git merge arm-soc/for-next +Removing arch/arm/mach-bcm/platsmp-brcmstb.c +Removing arch/arm/mach-bcm/headsmp-brcmstb.S +Removing arch/arm/mach-bcm/brcmstb.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/gpmc-nand.txt | 2 +- + MAINTAINERS | 5 + + arch/arm/arm-soc-for-next-contents.txt | 25 ++ + arch/arm/boot/dts/dra7.dtsi | 16 +- + arch/arm/boot/dts/imx53-qsrb.dts | 8 + + arch/arm/boot/dts/imx6dl-hummingboard.dts | 4 +- + arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 19 +- + arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi | 2 +- + arch/arm/boot/dts/omap3-beagle.dts | 1 + + arch/arm/boot/dts/omap3430-sdp.dts | 2 +- + arch/arm/boot/dts/omap54xx-clocks.dtsi | 16 +- + arch/arm/boot/dts/twl6030.dtsi | 4 - + arch/arm/configs/multi_v7_defconfig | 11 + + arch/arm/mach-bcm/Makefile | 1 - + arch/arm/mach-bcm/brcmstb.h | 19 -- + arch/arm/mach-bcm/headsmp-brcmstb.S | 33 -- + arch/arm/mach-bcm/platsmp-brcmstb.c | 363 --------------------- + arch/arm/mach-omap2/board-flash.c | 2 +- + arch/arm/mach-omap2/gpmc-nand.c | 3 +- + arch/arm/mach-omap2/gpmc.c | 7 +- + arch/arm/mach-omap2/id.c | 2 +- + arch/arm/mach-omap2/omap_device.c | 2 +- + arch/arm/mach-omap2/omap_hwmod.c | 4 + + arch/arm/mach-shmobile/clock-r8a7790.c | 4 +- + arch/arm/mach-shmobile/clock-r8a7791.c | 2 +- + arch/arm/mach-shmobile/clock-sh73a0.c | 2 +- + drivers/mtd/nand/omap2.c | 16 +- + include/linux/platform_data/mtd-nand-omap2.h | 13 +- + 28 files changed, 129 insertions(+), 459 deletions(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + delete mode 100644 arch/arm/mach-bcm/brcmstb.h + delete mode 100644 arch/arm/mach-bcm/headsmp-brcmstb.S + delete mode 100644 arch/arm/mach-bcm/platsmp-brcmstb.c +Merging bcm2835/for-next (fa389e220254 Linux 3.14-rc6) +$ git merge bcm2835/for-next +Already up-to-date. +Merging berlin/berlin/for-next (7d1311b93e58 Linux 3.17-rc1) +$ git merge berlin/berlin/for-next +Already up-to-date. +Merging cortex-m/for-next (f0d7515372ff ARM: v7m: add trivial suspend support) +$ git merge cortex-m/for-next +Already up-to-date. +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 (db8ddc19e438 Merge branch 'imx/dt' into for-next) +$ git merge imx-mxs/for-next +Removing arch/arm/mach-imx/pcm970-baseboard.c +Removing arch/arm/mach-imx/mach-pcm038.c +Removing arch/arm/mach-imx/mach-cpuimx27.c +Removing arch/arm/mach-imx/eukrea_mbimx27-baseboard.c +Removing arch/arm/mach-imx/board-pcm038.h +Auto-merging arch/arm/boot/dts/vf610-colibri.dtsi +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 6 +- + arch/arm/boot/dts/imx1-ads.dts | 152 +++++++++ + arch/arm/boot/dts/imx1-pinfunc.h | 302 +++++++++++++++++ + arch/arm/boot/dts/imx1.dtsi | 266 +++++++++++++++ + arch/arm/boot/dts/imx25-pinfunc.h | 33 +- + arch/arm/boot/dts/imx25.dtsi | 4 +- + arch/arm/boot/dts/imx28.dtsi | 43 +++ + arch/arm/boot/dts/imx35.dtsi | 1 + + arch/arm/boot/dts/imx50.dtsi | 2 + + arch/arm/boot/dts/imx51.dtsi | 3 + + arch/arm/boot/dts/imx53.dtsi | 8 + + arch/arm/boot/dts/imx6dl-gw552x.dts | 20 ++ + arch/arm/boot/dts/imx6dl-hummingboard.dts | 203 +----------- + arch/arm/boot/dts/imx6q-gw552x.dts | 24 ++ + arch/arm/boot/dts/imx6q-hummingboard.dts | 21 ++ + arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 267 +++++++++++++++ + arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 200 ++++++++++++ + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 38 +++ + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 19 ++ + arch/arm/boot/dts/imx6qdl.dtsi | 3 + + arch/arm/boot/dts/imx6sl-evk.dts | 104 +++++- + arch/arm/boot/dts/imx6sl.dtsi | 19 +- + arch/arm/boot/dts/imx6sx.dtsi | 3 + + arch/arm/boot/dts/vf610-colibri-eval-v3.dts | 46 +++ + .../dts/{vf610-colibri.dts => vf610-colibri.dtsi} | 22 +- + arch/arm/boot/dts/vf610-twr.dts | 25 +- + arch/arm/boot/dts/vf610.dtsi | 60 +++- + arch/arm/configs/imx_v4_v5_defconfig | 4 - + arch/arm/mach-imx/Kconfig | 88 +---- + arch/arm/mach-imx/Makefile | 5 +- + arch/arm/mach-imx/anatop.c | 13 + + arch/arm/mach-imx/board-pcm038.h | 36 --- + arch/arm/mach-imx/clk-imx6q.c | 7 +- + arch/arm/mach-imx/clk-imx6sl.c | 14 +- + arch/arm/mach-imx/clk-vf610.c | 21 +- + arch/arm/mach-imx/eukrea-baseboards.h | 10 +- + arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 351 -------------------- + arch/arm/mach-imx/imx1-dt.c | 26 ++ + arch/arm/mach-imx/iomux-imx31.c | 7 - + arch/arm/mach-imx/iomux-v1.c | 2 - + arch/arm/mach-imx/iomux-v3.c | 2 - + arch/arm/mach-imx/mach-cpuimx27.c | 321 ------------------ + arch/arm/mach-imx/mach-imx6sx.c | 3 + + arch/arm/mach-imx/mach-pcm038.c | 358 --------------------- + arch/arm/mach-imx/mxc.h | 2 + + arch/arm/mach-imx/pcm970-baseboard.c | 231 ------------- + include/dt-bindings/clock/imx6qdl-clock.h | 7 +- + include/dt-bindings/clock/vf610-clock.h | 5 +- + 48 files changed, 1765 insertions(+), 1642 deletions(-) + create mode 100644 arch/arm/boot/dts/imx1-ads.dts + create mode 100644 arch/arm/boot/dts/imx1-pinfunc.h + create mode 100644 arch/arm/boot/dts/imx1.dtsi + create mode 100644 arch/arm/boot/dts/imx6dl-gw552x.dts + create mode 100644 arch/arm/boot/dts/imx6q-gw552x.dts + create mode 100644 arch/arm/boot/dts/imx6q-hummingboard.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-gw552x.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-hummingboard.dtsi + create mode 100644 arch/arm/boot/dts/vf610-colibri-eval-v3.dts + rename arch/arm/boot/dts/{vf610-colibri.dts => vf610-colibri.dtsi} (92%) + delete mode 100644 arch/arm/mach-imx/board-pcm038.h + delete mode 100644 arch/arm/mach-imx/eukrea_mbimx27-baseboard.c + create mode 100644 arch/arm/mach-imx/imx1-dt.c + delete mode 100644 arch/arm/mach-imx/mach-cpuimx27.c + delete mode 100644 arch/arm/mach-imx/mach-pcm038.c + delete mode 100644 arch/arm/mach-imx/pcm970-baseboard.c +Merging ixp4xx/next (19f949f52599 Linux 3.8) +$ git merge ixp4xx/next +Already up-to-date. +Merging keystone/next (c9eaa447e77e Linux 3.15-rc1) +$ git merge keystone/next +Already up-to-date. +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 (74328d67b001 Merge branch 'mvebu/defconfig' into mvebu/for-next) +$ git merge mvebu/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/armada-370-db.dts | 6 +++ + arch/arm/boot/dts/armada-370-mirabox.dts | 6 +++ + arch/arm/boot/dts/armada-370-netgear-rn102.dts | 4 ++ + arch/arm/boot/dts/armada-370-netgear-rn104.dts | 6 +++ + arch/arm/boot/dts/armada-370-rd.dts | 4 ++ + arch/arm/boot/dts/armada-370.dtsi | 19 ++++++++ + arch/arm/boot/dts/armada-375.dtsi | 6 +++ + arch/arm/configs/mvebu_v7_defconfig | 67 ++++++++++++-------------- + 8 files changed, 82 insertions(+), 36 deletions(-) +Merging renesas/next (78bfd01a2975 Merge branch 'heads/dt-cleanup-for-v3.18' into next) +$ git merge renesas/next +Removing arch/arm/mach-shmobile/r7s72100.h +Removing arch/arm/mach-shmobile/clock-r7s72100.c +Removing arch/arm/mach-shmobile/board-genmai.c +Removing arch/arm/mach-shmobile/board-genmai-reference.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 - + arch/arm/Kconfig | 2 + + arch/arm/boot/dts/r7s72100-genmai.dts | 4 + + arch/arm/boot/dts/r7s72100.dtsi | 10 + + arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 2 +- + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 2 +- + .../boot/dts/r8a7740-armadillo800eva-reference.dts | 17 ++ + arch/arm/boot/dts/r8a7740.dtsi | 220 +++++++++++++++++++- + arch/arm/boot/dts/r8a7778.dtsi | 6 + + arch/arm/boot/dts/r8a7779-marzen.dts | 4 + + arch/arm/boot/dts/r8a7779.dtsi | 48 ++++- + arch/arm/boot/dts/r8a7790-lager.dts | 42 +++- + arch/arm/boot/dts/r8a7790.dtsi | 159 +++++++++++++- + arch/arm/boot/dts/r8a7791-henninger.dts | 37 +++- + arch/arm/boot/dts/r8a7791-koelsch.dts | 41 +++- + arch/arm/boot/dts/r8a7791.dtsi | 140 ++++++++++++- + arch/arm/boot/dts/sh7372.dtsi | 1 + + arch/arm/boot/dts/sh73a0.dtsi | 26 +-- + arch/arm/configs/ape6evm_defconfig | 9 +- + arch/arm/configs/bockw_defconfig | 3 +- + arch/arm/configs/koelsch_defconfig | 17 ++ + arch/arm/configs/kzm9g_defconfig | 1 + + arch/arm/configs/lager_defconfig | 8 +- + arch/arm/configs/marzen_defconfig | 1 + + arch/arm/configs/shmobile_defconfig | 3 + + arch/arm/mach-shmobile/Kconfig | 95 ++++----- + arch/arm/mach-shmobile/Makefile | 35 ++-- + arch/arm/mach-shmobile/Makefile.boot | 1 - + arch/arm/mach-shmobile/board-ape6evm-reference.c | 4 +- + arch/arm/mach-shmobile/board-ape6evm.c | 3 +- + .../board-armadillo800eva-reference.c | 5 +- + arch/arm/mach-shmobile/board-armadillo800eva.c | 40 ++-- + arch/arm/mach-shmobile/board-bockw-reference.c | 3 +- + arch/arm/mach-shmobile/board-bockw.c | 2 +- + arch/arm/mach-shmobile/board-genmai-reference.c | 55 ----- + arch/arm/mach-shmobile/board-genmai.c | 161 -------------- + arch/arm/mach-shmobile/board-koelsch-reference.c | 2 - + arch/arm/mach-shmobile/board-kzm9g-reference.c | 4 +- + arch/arm/mach-shmobile/board-kzm9g.c | 2 +- + arch/arm/mach-shmobile/board-lager-reference.c | 2 - + arch/arm/mach-shmobile/board-mackerel.c | 1 + + arch/arm/mach-shmobile/board-marzen-reference.c | 12 +- + arch/arm/mach-shmobile/clock-r7s72100.c | 231 --------------------- + arch/arm/mach-shmobile/common.h | 2 - + arch/arm/mach-shmobile/dma-register.h | 4 +- + arch/arm/mach-shmobile/intc.h | 5 + + arch/arm/mach-shmobile/irqs.h | 8 +- + arch/arm/mach-shmobile/pm-r8a7740.c | 5 +- + arch/arm/mach-shmobile/pm-rcar.c | 4 - + arch/arm/mach-shmobile/pm-rmobile.c | 2 - + arch/arm/mach-shmobile/pm-rmobile.h | 4 +- + arch/arm/mach-shmobile/r7s72100.h | 7 - + arch/arm/mach-shmobile/r8a73a4.h | 1 - + arch/arm/mach-shmobile/r8a7740.h | 5 +- + arch/arm/mach-shmobile/r8a7779.h | 1 - + arch/arm/mach-shmobile/r8a7790.h | 1 - + arch/arm/mach-shmobile/r8a7791.h | 1 - + arch/arm/mach-shmobile/setup-r7s72100.c | 24 +-- + arch/arm/mach-shmobile/setup-r8a73a4.c | 10 +- + arch/arm/mach-shmobile/setup-r8a7740.c | 26 +-- + arch/arm/mach-shmobile/setup-r8a7778.c | 5 +- + arch/arm/mach-shmobile/setup-r8a7779.c | 20 +- + arch/arm/mach-shmobile/setup-r8a7790.c | 7 +- + arch/arm/mach-shmobile/setup-r8a7791.c | 7 +- + arch/arm/mach-shmobile/setup-sh7372.c | 4 +- + arch/arm/mach-shmobile/setup-sh73a0.c | 10 +- + arch/arm/mach-shmobile/timer.c | 21 +- + drivers/clk/shmobile/Makefile | 1 + + include/dt-bindings/clock/r8a7740-clock.h | 77 +++++++ + include/dt-bindings/clock/r8a7790-clock.h | 1 + + include/dt-bindings/clock/r8a7791-clock.h | 1 + + 71 files changed, 960 insertions(+), 766 deletions(-) + delete mode 100644 arch/arm/mach-shmobile/board-genmai-reference.c + delete mode 100644 arch/arm/mach-shmobile/board-genmai.c + delete mode 100644 arch/arm/mach-shmobile/clock-r7s72100.c + delete mode 100644 arch/arm/mach-shmobile/r7s72100.h + create mode 100644 include/dt-bindings/clock/r8a7740-clock.h +Merging samsung/for-next (213e1f6f5f0b Merge branch 'v3.18-next/dt-samsung' into for-next) +$ git merge samsung/for-next +Auto-merging arch/arm/mach-s5pv210/regs-clock.h +Removing arch/arm/mach-exynos/include/mach/memory.h +Removing arch/arm/boot/dts/exynos5250-cros-common.dtsi +Auto-merging arch/arm/boot/dts/exynos4412-odroid-common.dtsi +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 8 +- + arch/arm/boot/dts/exynos4412-origen.dts | 8 +- + arch/arm/boot/dts/exynos4412-trats2.dts | 8 +- + arch/arm/boot/dts/exynos5250-arndale.dts | 18 +-- + arch/arm/boot/dts/exynos5250-cros-common.dtsi | 164 --------------------- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 18 +-- + arch/arm/boot/dts/exynos5250-snow.dts | 154 ++++++++++++++++--- + arch/arm/boot/dts/exynos5260-xyref5260.dts | 18 +-- + arch/arm/boot/dts/exynos5410-smdk5410.dts | 18 +-- + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 16 +- + arch/arm/boot/dts/exynos5420-peach-pit.dts | 28 ++-- + arch/arm/boot/dts/exynos5420-smdk5420.dts | 16 +- + arch/arm/boot/dts/exynos5800-peach-pi.dts | 28 ++-- + arch/arm/configs/exynos_defconfig | 1 + + arch/arm/mach-exynos/include/mach/memory.h | 26 ---- + arch/arm/mach-s5pv210/pm.c | 3 +- + .../mach-s5pv210/{include/mach => }/regs-clock.h | 3 +- + arch/arm/mach-s5pv210/s5pv210.c | 2 +- + 18 files changed, 191 insertions(+), 346 deletions(-) + delete mode 100644 arch/arm/boot/dts/exynos5250-cros-common.dtsi + delete mode 100644 arch/arm/mach-exynos/include/mach/memory.h + rename arch/arm/mach-s5pv210/{include/mach => }/regs-clock.h (99%) +Merging sunxi/sunxi/for-next (779b646c8102 Merge branch 'sunxi/dt-for-3.18' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/sun6i-a31.dtsi +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/sun4i-a10.dtsi | 19 ++- + arch/arm/boot/dts/sun5i-a10s.dtsi | 17 ++- + arch/arm/boot/dts/sun5i-a13.dtsi | 17 ++- + arch/arm/boot/dts/sun6i-a31.dtsi | 10 +- + arch/arm/boot/dts/sun7i-a20.dtsi | 21 +++- + arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts | 41 +++++++ + arch/arm/boot/dts/sun8i-a23.dtsi | 172 ++++++++++++++++++++++++++++ + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/configs/sunxi_defconfig | 3 + + 9 files changed, 283 insertions(+), 18 deletions(-) +Merging tegra/for-next (ed2451e40bd1 Merge branch for-3.18/defconfig into for-next) +$ git merge tegra/for-next +Removing include/linux/platform_data/tegra_emc.h +Merge made by the 'recursive' strategy. + .../bindings/arm/tegra/nvidia,tegra20-flowctrl.txt | 12 ++++ + arch/arm/boot/dts/tegra114.dtsi | 5 ++ + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 70 ++++++++++++++++++++++ + arch/arm/boot/dts/tegra124.dtsi | 30 ++++++++++ + arch/arm/boot/dts/tegra20.dtsi | 5 ++ + arch/arm/boot/dts/tegra30.dtsi | 5 ++ + arch/arm/configs/tegra_defconfig | 3 + + arch/arm/mach-tegra/flowctrl.c | 44 +++++++++++--- + arch/arm/mach-tegra/flowctrl.h | 2 + + arch/arm/mach-tegra/tegra.c | 2 + + include/linux/platform_data/tegra_emc.h | 34 ----------- + 11 files changed, 171 insertions(+), 41 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-flowctrl.txt + delete mode 100644 include/linux/platform_data/tegra_emc.h +Merging arm64/for-next/core (ea1719672f59 arm64: add newline to I-cache policy string) +$ 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 (cd065a010a97 CRISv10: Readd missing header) +$ git merge cris/for-next +Already up-to-date. +Merging hexagon/linux-next (a9a44fdf3296 Hexagon: update CR year for elf.h) +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (6b15075c2c36 [IA64] sn: Do not needlessly convert between pointers and integers) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (9117710a5997 m68k/sun3: Remove define statement no longer needed) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (8ab25ce231d5 m68k: fix crufty 68000 and 68360 intro comments) +$ git merge m68knommu/for-next +Removing arch/m68k/platform/Makefile +Auto-merging arch/m68k/coldfire/vectors.c +Auto-merging arch/m68k/coldfire/m54xx.c +Auto-merging arch/m68k/coldfire/m5407.c +Auto-merging arch/m68k/coldfire/m5307.c +Auto-merging arch/m68k/coldfire/m528x.c +Auto-merging arch/m68k/coldfire/m527x.c +Auto-merging arch/m68k/coldfire/m5272.c +Auto-merging arch/m68k/coldfire/m525x.c +Auto-merging arch/m68k/coldfire/m5249.c +Auto-merging arch/m68k/coldfire/m523x.c +Auto-merging arch/m68k/coldfire/m520x.c +Auto-merging arch/m68k/coldfire/m5206.c +Auto-merging arch/m68k/coldfire/entry.S +Auto-merging arch/m68k/68360/ints.c +Auto-merging arch/m68k/68360/head-rom.S +Auto-merging arch/m68k/68360/head-ram.S +Auto-merging arch/m68k/68360/entry.S +Auto-merging arch/m68k/68360/config.c +Auto-merging arch/m68k/68360/Makefile +Auto-merging arch/m68k/68000/entry.S +Merge made by the 'recursive' strategy. + arch/m68k/{platform => }/68000/Makefile | 0 + arch/m68k/{platform => }/68000/bootlogo-vz.h | 0 + arch/m68k/{platform => }/68000/bootlogo.h | 0 + arch/m68k/{platform => }/68000/entry.S | 2 +- + arch/m68k/{platform => }/68000/head.S | 0 + arch/m68k/{platform => }/68000/ints.c | 0 + arch/m68k/{platform => }/68000/m68328.c | 0 + arch/m68k/{platform => }/68000/m68EZ328.c | 0 + arch/m68k/{platform => }/68000/m68VZ328.c | 0 + arch/m68k/{platform => }/68000/romvec.S | 0 + arch/m68k/{platform => }/68000/timers.c | 0 + arch/m68k/{platform => }/68360/Makefile | 2 +- + arch/m68k/{platform => }/68360/commproc.c | 0 + arch/m68k/{platform => }/68360/config.c | 2 +- + arch/m68k/{platform => }/68360/entry.S | 2 +- + arch/m68k/{platform => }/68360/head-ram.S | 5 ++--- + arch/m68k/{platform => }/68360/head-rom.S | 5 ++--- + arch/m68k/{platform => }/68360/ints.c | 2 +- + arch/m68k/Makefile | 12 ++++++------ + arch/m68k/{platform => }/coldfire/Makefile | 0 + arch/m68k/{platform => }/coldfire/cache.c | 0 + arch/m68k/{platform => }/coldfire/clk.c | 0 + arch/m68k/{platform => }/coldfire/device.c | 0 + arch/m68k/{platform => }/coldfire/dma.c | 0 + arch/m68k/{platform => }/coldfire/dma_timer.c | 0 + arch/m68k/{platform => }/coldfire/entry.S | 2 +- + arch/m68k/{platform => }/coldfire/firebee.c | 0 + arch/m68k/{platform => }/coldfire/gpio.c | 0 + arch/m68k/{platform => }/coldfire/head.S | 0 + arch/m68k/{platform => }/coldfire/intc-2.c | 0 + arch/m68k/{platform => }/coldfire/intc-5249.c | 0 + arch/m68k/{platform => }/coldfire/intc-525x.c | 0 + arch/m68k/{platform => }/coldfire/intc-5272.c | 0 + arch/m68k/{platform => }/coldfire/intc-simr.c | 0 + arch/m68k/{platform => }/coldfire/intc.c | 0 + arch/m68k/{platform => }/coldfire/m5206.c | 2 +- + arch/m68k/{platform => }/coldfire/m520x.c | 2 +- + arch/m68k/{platform => }/coldfire/m523x.c | 2 +- + arch/m68k/{platform => }/coldfire/m5249.c | 2 +- + arch/m68k/{platform => }/coldfire/m525x.c | 2 +- + arch/m68k/{platform => }/coldfire/m5272.c | 2 +- + arch/m68k/{platform => }/coldfire/m527x.c | 4 ++-- + arch/m68k/{platform => }/coldfire/m528x.c | 2 +- + arch/m68k/{platform => }/coldfire/m5307.c | 2 +- + arch/m68k/{platform => }/coldfire/m53xx.c | 0 + arch/m68k/{platform => }/coldfire/m5407.c | 2 +- + arch/m68k/{platform => }/coldfire/m5441x.c | 0 + arch/m68k/{platform => }/coldfire/m54xx.c | 2 +- + arch/m68k/{platform => }/coldfire/mcf8390.c | 0 + arch/m68k/{platform => }/coldfire/nettel.c | 0 + arch/m68k/{platform => }/coldfire/pci.c | 0 + arch/m68k/{platform => }/coldfire/pit.c | 0 + arch/m68k/{platform => }/coldfire/reset.c | 0 + arch/m68k/{platform => }/coldfire/sltimers.c | 0 + arch/m68k/{platform => }/coldfire/timers.c | 0 + arch/m68k/{platform => }/coldfire/vectors.c | 2 +- + arch/m68k/platform/Makefile | 3 --- + 57 files changed, 29 insertions(+), 34 deletions(-) + rename arch/m68k/{platform => }/68000/Makefile (100%) + rename arch/m68k/{platform => }/68000/bootlogo-vz.h (100%) + rename arch/m68k/{platform => }/68000/bootlogo.h (100%) + rename arch/m68k/{platform => }/68000/entry.S (98%) + rename arch/m68k/{platform => }/68000/head.S (100%) + rename arch/m68k/{platform => }/68000/ints.c (100%) + rename arch/m68k/{platform => }/68000/m68328.c (100%) + rename arch/m68k/{platform => }/68000/m68EZ328.c (100%) + rename arch/m68k/{platform => }/68000/m68VZ328.c (100%) + rename arch/m68k/{platform => }/68000/romvec.S (100%) + rename arch/m68k/{platform => }/68000/timers.c (100%) + rename arch/m68k/{platform => }/68360/Makefile (81%) + rename arch/m68k/{platform => }/68360/commproc.c (100%) + rename arch/m68k/{platform => }/68360/config.c (98%) + rename arch/m68k/{platform => }/68360/entry.S (98%) + rename arch/m68k/{platform => }/68360/head-ram.S (99%) + rename arch/m68k/{platform => }/68360/head-rom.S (99%) + rename arch/m68k/{platform => }/68360/ints.c (98%) + rename arch/m68k/{platform => }/coldfire/Makefile (100%) + rename arch/m68k/{platform => }/coldfire/cache.c (100%) + rename arch/m68k/{platform => }/coldfire/clk.c (100%) + rename arch/m68k/{platform => }/coldfire/device.c (100%) + rename arch/m68k/{platform => }/coldfire/dma.c (100%) + rename arch/m68k/{platform => }/coldfire/dma_timer.c (100%) + rename arch/m68k/{platform => }/coldfire/entry.S (98%) + rename arch/m68k/{platform => }/coldfire/firebee.c (100%) + rename arch/m68k/{platform => }/coldfire/gpio.c (100%) + rename arch/m68k/{platform => }/coldfire/head.S (100%) + rename arch/m68k/{platform => }/coldfire/intc-2.c (100%) + rename arch/m68k/{platform => }/coldfire/intc-5249.c (100%) + rename arch/m68k/{platform => }/coldfire/intc-525x.c (100%) + rename arch/m68k/{platform => }/coldfire/intc-5272.c (100%) + rename arch/m68k/{platform => }/coldfire/intc-simr.c (100%) + rename arch/m68k/{platform => }/coldfire/intc.c (100%) + rename arch/m68k/{platform => }/coldfire/m5206.c (96%) + rename arch/m68k/{platform => }/coldfire/m520x.c (98%) + rename arch/m68k/{platform => }/coldfire/m523x.c (97%) + rename arch/m68k/{platform => }/coldfire/m5249.c (97%) + rename arch/m68k/{platform => }/coldfire/m525x.c (97%) + rename arch/m68k/{platform => }/coldfire/m5272.c (98%) + rename arch/m68k/{platform => }/coldfire/m527x.c (97%) + rename arch/m68k/{platform => }/coldfire/m528x.c (98%) + rename arch/m68k/{platform => }/coldfire/m5307.c (97%) + rename arch/m68k/{platform => }/coldfire/m53xx.c (100%) + rename arch/m68k/{platform => }/coldfire/m5407.c (95%) + rename arch/m68k/{platform => }/coldfire/m5441x.c (100%) + rename arch/m68k/{platform => }/coldfire/m54xx.c (98%) + rename arch/m68k/{platform => }/coldfire/mcf8390.c (100%) + rename arch/m68k/{platform => }/coldfire/nettel.c (100%) + rename arch/m68k/{platform => }/coldfire/pci.c (100%) + rename arch/m68k/{platform => }/coldfire/pit.c (100%) + rename arch/m68k/{platform => }/coldfire/reset.c (100%) + rename arch/m68k/{platform => }/coldfire/sltimers.c (100%) + rename arch/m68k/{platform => }/coldfire/timers.c (100%) + rename arch/m68k/{platform => }/coldfire/vectors.c (96%) + delete mode 100644 arch/m68k/platform/Makefile +Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check) +$ git merge metag/for-next +Already up-to-date. +Merging microblaze/next (83c43c498a0a microblaze: Wire-up memfd_create syscall) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (739c25724af0 Merge branch '3.17-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Auto-merging include/asm-generic/dma-contiguous.h +Removing arch/mips/ralink/dts/Makefile +Removing arch/mips/netlogic/dts/Makefile +Removing arch/mips/lantiq/dts/Makefile +Auto-merging arch/mips/kernel/scall64-o32.S +Auto-merging arch/mips/include/asm/pgtable.h +Removing arch/mips/cavium-octeon/.gitignore +Removing arch/arm64/include/asm/dma-contiguous.h +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/Kbuild | 1 + + arch/arm64/include/asm/dma-contiguous.h | 28 ----------- + arch/mips/Kconfig | 9 ++++ + arch/mips/Makefile | 11 ++++ + arch/mips/alchemy/devboards/db1300.c | 47 +++++++++++++++++- + arch/mips/alchemy/devboards/db1550.c | 9 ++-- + arch/mips/alchemy/devboards/platform.c | 3 ++ + arch/mips/bcm63xx/irq.c | 4 +- + arch/mips/boot/.gitignore | 1 + + arch/mips/boot/compressed/decompress.c | 1 + + arch/mips/boot/dts/Makefile | 20 ++++++++ + arch/mips/{lantiq => boot}/dts/danube.dtsi | 0 + arch/mips/{lantiq => boot}/dts/easy50712.dts | 0 + arch/mips/{ralink => boot}/dts/mt7620a.dtsi | 0 + arch/mips/{ralink => boot}/dts/mt7620a_eval.dts | 0 + .../{cavium-octeon => boot/dts}/octeon_3xxx.dts | 0 + .../{cavium-octeon => boot/dts}/octeon_68xx.dts | 0 + arch/mips/{ralink => boot}/dts/rt2880.dtsi | 0 + arch/mips/{ralink => boot}/dts/rt2880_eval.dts | 0 + arch/mips/{ralink => boot}/dts/rt3050.dtsi | 0 + arch/mips/{ralink => boot}/dts/rt3052_eval.dts | 0 + arch/mips/{ralink => boot}/dts/rt3883.dtsi | 0 + arch/mips/{ralink => boot}/dts/rt3883_eval.dts | 0 + arch/mips/{mti-sead3 => boot/dts}/sead3.dts | 0 + arch/mips/{netlogic => boot}/dts/xlp_evp.dts | 0 + arch/mips/{netlogic => boot}/dts/xlp_fvp.dts | 0 + arch/mips/{netlogic => boot}/dts/xlp_gvp.dts | 0 + arch/mips/{netlogic => boot}/dts/xlp_svp.dts | 0 + arch/mips/cavium-octeon/.gitignore | 2 - + arch/mips/cavium-octeon/Makefile | 10 ---- + arch/mips/configs/sead3_defconfig | 2 +- + arch/mips/configs/sead3micro_defconfig | 2 +- + arch/mips/include/asm/Kbuild | 1 + + arch/mips/include/asm/cop2.h | 18 +++---- + arch/mips/include/asm/cpu-features.h | 10 ++++ + arch/mips/include/asm/cpu-info.h | 5 ++ + .../asm/mach-au1x00/cpu-feature-overrides.h | 12 +++++ + .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 1 + + arch/mips/include/asm/mach-ip28/spaces.h | 7 --- + .../asm/mach-loongson/cpu-feature-overrides.h | 2 + + arch/mips/include/asm/page.h | 5 +- + arch/mips/include/asm/pgtable-bits.h | 44 ++++++++++------ + arch/mips/include/asm/pgtable.h | 10 ++++ + arch/mips/include/asm/switch_to.h | 4 +- + arch/mips/include/uapi/asm/swab.h | 18 +++++-- + arch/mips/include/uapi/asm/unistd.h | 18 ++++--- + arch/mips/kernel/cpu-probe.c | 21 ++++++++ + arch/mips/kernel/machine_kexec.c | 8 ++- + arch/mips/kernel/scall32-o32.S | 2 + + arch/mips/kernel/scall64-64.S | 2 + + arch/mips/kernel/scall64-n32.S | 2 + + arch/mips/kernel/scall64-o32.S | 2 + + arch/mips/kernel/setup.c | 9 ++++ + arch/mips/lantiq/Kconfig | 1 + + arch/mips/lantiq/Makefile | 2 - + arch/mips/lantiq/dts/Makefile | 1 - + arch/mips/lib/csum_partial.S | 10 +++- + arch/mips/mm/dma-default.c | 37 +++++++++----- + arch/mips/mti-sead3/Makefile | 4 -- + arch/mips/net/bpf_jit.c | 58 +++++++++------------- + arch/mips/netlogic/Kconfig | 4 ++ + arch/mips/netlogic/Makefile | 1 - + arch/mips/netlogic/dts/Makefile | 4 -- + arch/mips/ralink/Kconfig | 4 ++ + arch/mips/ralink/Makefile | 2 - + arch/mips/ralink/dts/Makefile | 4 -- + arch/x86/include/asm/Kbuild | 1 + + .../asm => include/asm-generic}/dma-contiguous.h | 7 +-- + 68 files changed, 322 insertions(+), 169 deletions(-) + delete mode 100644 arch/arm64/include/asm/dma-contiguous.h + create mode 100644 arch/mips/boot/dts/Makefile + rename arch/mips/{lantiq => boot}/dts/danube.dtsi (100%) + rename arch/mips/{lantiq => boot}/dts/easy50712.dts (100%) + rename arch/mips/{ralink => boot}/dts/mt7620a.dtsi (100%) + rename arch/mips/{ralink => boot}/dts/mt7620a_eval.dts (100%) + rename arch/mips/{cavium-octeon => boot/dts}/octeon_3xxx.dts (100%) + rename arch/mips/{cavium-octeon => boot/dts}/octeon_68xx.dts (100%) + rename arch/mips/{ralink => boot}/dts/rt2880.dtsi (100%) + rename arch/mips/{ralink => boot}/dts/rt2880_eval.dts (100%) + rename arch/mips/{ralink => boot}/dts/rt3050.dtsi (100%) + rename arch/mips/{ralink => boot}/dts/rt3052_eval.dts (100%) + rename arch/mips/{ralink => boot}/dts/rt3883.dtsi (100%) + rename arch/mips/{ralink => boot}/dts/rt3883_eval.dts (100%) + rename arch/mips/{mti-sead3 => boot/dts}/sead3.dts (100%) + rename arch/mips/{netlogic => boot}/dts/xlp_evp.dts (100%) + rename arch/mips/{netlogic => boot}/dts/xlp_fvp.dts (100%) + rename arch/mips/{netlogic => boot}/dts/xlp_gvp.dts (100%) + rename arch/mips/{netlogic => boot}/dts/xlp_svp.dts (100%) + delete mode 100644 arch/mips/cavium-octeon/.gitignore + delete mode 100644 arch/mips/lantiq/dts/Makefile + delete mode 100644 arch/mips/netlogic/dts/Makefile + delete mode 100644 arch/mips/ralink/dts/Makefile + rename {arch/x86/include/asm => include/asm-generic}/dma-contiguous.h (57%) +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 (c90f06943e05 parisc: Wire up seccomp, getrandom and memfd_create syscalls) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/Kconfig | 16 ++++++++++++++++ + arch/parisc/hpux/sys_hpux.c | 2 +- + arch/parisc/include/asm/seccomp.h | 16 ++++++++++++++++ + arch/parisc/include/asm/thread_info.h | 5 ++++- + arch/parisc/include/uapi/asm/unistd.h | 5 ++++- + arch/parisc/kernel/ptrace.c | 6 ++++++ + arch/parisc/kernel/syscall_table.S | 3 +++ + drivers/parisc/dino.c | 2 +- + 8 files changed, 51 insertions(+), 4 deletions(-) + create mode 100644 arch/parisc/include/asm/seccomp.h +Merging powerpc/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate) +$ git merge powerpc/next +Already up-to-date. +Merging fsl/next (78eb9094ca08 powerpc/t2080rdb: Add T2080RDB board support) +$ git merge fsl/next +Already up-to-date. +Merging mpc5xxx/next (bc7505942233 powerpc/512x: dts: add MPC5125 clock specs) +$ git merge mpc5xxx/next +Already up-to-date. +Merging s390/features (ccc3317f511e Documentation/kprobes: add s390 to list of supported architectures) +$ git merge s390/features +Merge made by the 'recursive' strategy. + Documentation/kprobes.txt | 1 + + arch/s390/include/asm/ipl.h | 8 +-- + arch/s390/include/asm/setup.h | 3 - + arch/s390/kernel/early.c | 2 - + arch/s390/kernel/ipl.c | 128 ++++++++++++++++++++++++++------------- + drivers/s390/block/dasd_devmap.c | 2 +- + 6 files changed, 91 insertions(+), 53 deletions(-) +Merging sparc-next/master (451fd72219dd Merge tag 'pwm/for-3.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (ed93567c6fbc tile: Remove tile-specific _sinitdata and _einitdata) +$ git merge tile/master +Merge made by the 'recursive' strategy. + arch/tile/include/asm/sections.h | 3 --- + arch/tile/kernel/traps.c | 2 +- + arch/tile/kernel/vmlinux.lds.S | 2 -- + arch/tile/mm/init.c | 12 ++++++------ + 4 files changed, 7 insertions(+), 12 deletions(-) +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/trap.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 61c3e91b4c93] 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 (e792290be763 Merge tag 'xtensa-for-next-20140815' into for_next) +$ git merge xtensa/for_next +Merge made by the 'recursive' strategy. + arch/xtensa/Kconfig | 92 +++++++++++++++++++----- + arch/xtensa/Makefile | 7 +- + arch/xtensa/boot/dts/kc705.dts | 5 +- + arch/xtensa/configs/common_defconfig | 1 - + arch/xtensa/configs/iss_defconfig | 3 +- + arch/xtensa/configs/s6105_defconfig | 1 - + arch/xtensa/include/asm/cacheflush.h | 2 + + arch/xtensa/include/asm/fixmap.h | 30 ++++++-- + arch/xtensa/include/asm/highmem.h | 40 ++++++++++- + arch/xtensa/include/asm/page.h | 14 +++- + arch/xtensa/include/asm/pgtable.h | 7 +- + arch/xtensa/include/asm/uaccess.h | 5 ++ + arch/xtensa/include/uapi/asm/ioctls.h | 19 ++--- + arch/xtensa/include/uapi/asm/unistd.h | 5 +- + arch/xtensa/kernel/align.S | 128 +++++++++++++++++++++------------- + arch/xtensa/kernel/entry.S | 54 ++++++++++---- + arch/xtensa/kernel/pci-dma.c | 12 ++-- + arch/xtensa/kernel/traps.c | 5 +- + arch/xtensa/kernel/vectors.S | 8 ++- + arch/xtensa/kernel/vmlinux.lds.S | 4 +- + arch/xtensa/mm/cache.c | 77 +++++++++++++++++--- + arch/xtensa/mm/highmem.c | 41 ++++++++--- + arch/xtensa/mm/misc.S | 116 ++++++++++++++---------------- + arch/xtensa/mm/mmu.c | 38 +++++----- + 24 files changed, 497 insertions(+), 217 deletions(-) +Merging btrfs/next (8d875f95da43 btrfs: disable strict file flushes for renames and truncates) +$ git merge btrfs/next +Already up-to-date. +Merging ceph/master (5f740d7e1531 libceph: set last_piece in ceph_msg_data_pages_cursor_init() correctly) +$ git merge ceph/master +Already up-to-date. +Merging cifs/for-next (ca5d13fc33cc Clarify Kconfig help text for CIFS and SMB2/SMB3) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/Kconfig | 35 +++++++++++++++++++++++------------ + fs/cifs/cifsglob.h | 5 ----- + fs/cifs/connect.c | 21 ++------------------- + fs/cifs/dir.c | 8 ++++++++ + fs/cifs/file.c | 8 ++++++++ + fs/cifs/inode.c | 5 ++++- + fs/cifs/readdir.c | 4 ++-- + fs/cifs/sess.c | 7 ++++--- + fs/cifs/smb2file.c | 2 +- + fs/cifs/smb2inode.c | 2 +- + fs/cifs/smb2ops.c | 4 ++-- + fs/cifs/smb2pdu.c | 7 +++---- + 12 files changed, 58 insertions(+), 50 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 (04ec5f5c0022 ecryptfs: remove unnecessary break after goto) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/inode.c +Auto-merging fs/ecryptfs/file.c +Merge made by the 'recursive' strategy. + fs/ecryptfs/file.c | 4 ++-- + fs/ecryptfs/inode.c | 16 +++++++--------- + fs/ecryptfs/keystore.c | 2 -- + fs/ecryptfs/messaging.c | 3 +-- + 4 files changed, 10 insertions(+), 15 deletions(-) +Merging ext3/for_next (e6d8fb340f20 ext3: Count internal journal as bsddf overhead in ext3_statfs) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (ea14f0fa1db6 ext4: fix same-dir rename when inline data directory overflows) +$ git merge ext4/dev +Merge made by the 'recursive' strategy. + fs/ext4/ext4.h | 18 ++++++++++- + fs/ext4/extents.c | 88 ++++++++++++++++++++++++++-------------------------- + fs/ext4/inode.c | 44 ++++++++++---------------- + fs/ext4/mballoc.c | 5 +++ + fs/ext4/namei.c | 56 ++++++++++++++++++++++++++++++--- + fs/ext4/super.c | 5 +-- + fs/jbd2/commit.c | 21 +++++++------ + fs/jbd2/journal.c | 56 +++++++++++++++++++++------------ + fs/jbd2/recovery.c | 33 ++++++++++++-------- + fs/jbd2/revoke.c | 6 ++-- + include/linux/jbd2.h | 30 +++++++++++++++--- + 11 files changed, 233 insertions(+), 129 deletions(-) +Merging f2fs/dev (922cedbd00b6 f2fs: simplify by using a literal) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + fs/f2fs/Kconfig | 4 +-- + fs/f2fs/checkpoint.c | 80 +++++++++++++++++++++++++++++++------------------ + fs/f2fs/data.c | 19 ++++++++---- + fs/f2fs/debug.c | 4 +-- + fs/f2fs/dir.c | 6 ++-- + fs/f2fs/f2fs.h | 26 ++++++++-------- + fs/f2fs/file.c | 60 +++++++++++++++++++++++-------------- + fs/f2fs/gc.c | 6 ++-- + fs/f2fs/gc.h | 2 +- + fs/f2fs/inline.c | 38 +++++++++++++---------- + fs/f2fs/namei.c | 3 +- + fs/f2fs/node.c | 80 +++++++++++++++++++++++-------------------------- + fs/f2fs/recovery.c | 30 ++++++++++++++----- + fs/f2fs/segment.c | 53 ++------------------------------ + fs/f2fs/segment.h | 2 +- + fs/f2fs/super.c | 32 ++++++++++++++------ + fs/f2fs/xattr.c | 2 +- + include/linux/f2fs_fs.h | 16 ++++++++-- + 18 files changed, 251 insertions(+), 212 deletions(-) +Merging fscache/fscache (fe02fb3ec109 FS-Cache: Handle removal of unadded object to the fscache_object_list rb tree) +$ git merge fscache/fscache +Merge made by the 'recursive' strategy. +Merging fuse/for-next (d7afaec0b564 fuse: add FUSE_NO_OPEN_SUPPORT flag to INIT) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master (2ddfbdd6848d GFS2: Request demote when a "try" flock fails) +$ git merge gfs2/master +Merge made by the 'recursive' strategy. + fs/gfs2/bmap.c | 9 +++++---- + fs/gfs2/file.c | 15 ++++++++++++--- + fs/gfs2/super.c | 20 ++++++++++---------- + 3 files changed, 27 insertions(+), 17 deletions(-) +Merging jfs/jfs-next (bb5e50aaa805 fs/jfs/super.c: convert simple_str to kstr) +$ git merge jfs/jfs-next +Already up-to-date. +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 (f87d928f6d98 NFSv3: Fix another acl regression) +$ git merge nfs/linux-next +Merge made by the 'recursive' strategy. + fs/nfs/nfs3acl.c | 5 ++++- + fs/nfs/nfs4proc.c | 26 +++++++++++++++++--------- + 2 files changed, 21 insertions(+), 10 deletions(-) +Merging nfsd/nfsd-next (e40ee075fa7f SUNRPC: current_task should be current) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + fs/dlm/plock.c | 8 +- + fs/lockd/svc.c | 2 + + fs/lockd/svclock.c | 12 +-- + fs/nfs/callback.c | 1 + + fs/nfsd/cache.h | 1 - + fs/nfsd/export.c | 1 + + fs/nfsd/nfs3proc.c | 13 ++- + fs/nfsd/nfs4state.c | 32 +++--- + fs/nfsd/nfs4xdr.c | 15 +-- + fs/nfsd/nfscache.c | 214 +++++++++++++++++++++------------------ + include/linux/fs.h | 2 +- + include/linux/sunrpc/svc.h | 1 - + include/uapi/linux/nfsd/export.h | 5 +- + net/sunrpc/svc.c | 2 - + net/sunrpc/svc_xprt.c | 85 +++++++--------- + net/sunrpc/svcsock.c | 23 ++--- + 16 files changed, 206 insertions(+), 211 deletions(-) +Merging omfs/for-next (976d167615b6 Linux 3.1-rc9) +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master (6d565409503f Squashfs: fix failure to unlock pages on decompress error) +$ 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 (25601a3c9737 UBIFS: Add log overlap assertions) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (52addcf9d666 Linux 3.17-rc2) +$ git merge xfs/for-next +Already up-to-date. +Merging file-locks/linux-next (24b496fa31b8 locks: remove lock_may_read and lock_may_write) +$ git merge file-locks/linux-next +Auto-merging include/linux/fs.h +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/lockd/svclock.c +Merge made by the 'recursive' strategy. + fs/lockd/svclock.c | 56 +++---------------- + fs/locks.c | 130 +++++++++----------------------------------- + fs/nfsd/nfs4state.c | 57 ++++++++++++------- + include/linux/fs.h | 20 ++----- + include/linux/lockd/lockd.h | 1 - + 5 files changed, 75 insertions(+), 189 deletions(-) +Merging vfs/for-next (22a43db4f2a3 switch /dev/kmsg to ->write_iter()) +$ git merge vfs/for-next +Auto-merging kernel/printk/printk.c +Auto-merging include/linux/fs.h +Auto-merging fs/nfs/dir.c +Auto-merging fs/cifs/readdir.c +Auto-merging fs/cifs/inode.c +Auto-merging fs/cifs/file.c +Auto-merging fs/cifs/dir.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging drivers/staging/android/logger.c +Auto-merging drivers/block/rsxx/core.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/vfs.txt | 2 +- + arch/x86/ia32/ia32_aout.c | 21 +-- + drivers/block/rsxx/core.c | 81 +++-------- + drivers/bluetooth/hci_vhci.c | 22 ++- + drivers/char/mem.c | 56 ++------ + drivers/dma-buf/dma-buf.c | 2 +- + drivers/misc/carma/carma-fpga-program.c | 30 +--- + drivers/staging/android/ashmem.c | 2 +- + drivers/staging/android/logger.c | 103 ++++---------- + drivers/staging/vme/devices/vme_user.c | 28 +--- + fs/9p/fid.c | 4 +- + fs/9p/vfs_addr.c | 4 +- + fs/9p/vfs_dentry.c | 8 +- + fs/9p/vfs_dir.c | 4 +- + fs/9p/vfs_file.c | 8 +- + fs/9p/vfs_inode.c | 32 ++--- + fs/9p/vfs_inode_dotl.c | 8 +- + fs/afs/dir.c | 5 - + fs/binfmt_aout.c | 25 +--- + fs/binfmt_elf.c | 25 +--- + fs/binfmt_elf_fdpic.c | 24 ++-- + fs/btrfs/ioctl.c | 5 +- + fs/buffer.c | 5 + + fs/cachefiles/rdwr.c | 48 +++---- + fs/ceph/dir.c | 1 - + fs/cifs/dir.c | 14 +- + fs/cifs/file.c | 12 +- + fs/cifs/inode.c | 12 +- + fs/cifs/readdir.c | 6 +- + fs/dcache.c | 174 +++++++++-------------- + fs/exec.c | 17 ++- + fs/fuse/dir.c | 7 +- + fs/gfs2/dentry.c | 3 - + fs/jffs2/jffs2_fs_sb.h | 2 - + fs/jffs2/wbuf.c | 17 +-- + fs/kernfs/dir.c | 11 -- + fs/mount.h | 25 +++- + fs/namei.c | 22 +-- + fs/namespace.c | 162 ++++++++++++++++++--- + fs/nfs/dir.c | 7 +- + fs/pnode.c | 1 + + fs/proc/base.c | 10 +- + fs/proc/fd.c | 2 - + fs/read_write.c | 2 + + fs/super.c | 2 + + include/linux/dcache.h | 3 +- + include/linux/fs.h | 2 +- + include/linux/uio.h | 3 + + kernel/printk/printk.c | 20 +-- + mm/iov_iter.c | 240 ++++++++++++++++++++++++++++++-- + 50 files changed, 674 insertions(+), 655 deletions(-) +Merging pci/next (981c191778a4 Merge branches 'pci/host-designware', 'pci/host-mvebu' and 'pci/host-tegra' into next) +$ git merge pci/next +Already up-to-date. +Merging hid/for-next (683a47715049 Merge branch 'for-3.18/picolcd' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-class-hid-driver-gt683r | 14 + + Documentation/hid/uhid.txt | 179 +++++----- + drivers/hid/hid-input.c | 6 + + drivers/hid/hid-logitech-dj.c | 35 +- + drivers/hid/hid-picolcd_core.c | 4 +- + drivers/hid/uhid.c | 394 ++++++++++++--------- + include/uapi/linux/uhid.h | 120 +++++-- + 7 files changed, 441 insertions(+), 311 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-hid-driver-gt683r +Merging i2c/i2c/for-next (52addcf9d666 Linux 3.17-rc2) +$ git merge i2c/i2c/for-next +Already up-to-date. +Merging jdelvare-hwmon/master (c7208164e66f Linux 3.15-rc7) +$ git merge jdelvare-hwmon/master +Already up-to-date. +Merging hwmon-staging/hwmon-next (123ce11c850c MAINTAINERS: add entry for the PWM fan driver) +$ git merge hwmon-staging/hwmon-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/hwmon/k10temp | 2 +- + MAINTAINERS | 8 +++ + drivers/hwmon/Kconfig | 4 +- + drivers/hwmon/ads1015.c | 21 +++--- + drivers/hwmon/da9052-hwmon.c | 54 +++------------ + drivers/hwmon/da9055-hwmon.c | 52 +++----------- + drivers/hwmon/k10temp.c | 157 ++++++++++++++++++++++--------------------- + 7 files changed, 116 insertions(+), 182 deletions(-) +Merging v4l-dvb/master (d1352f268415 Merge two fixes from branch 'patchwork' into to_next) +$ git merge v4l-dvb/master +Merge made by the 'recursive' strategy. + drivers/media/dvb-frontends/si2168.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging kbuild/for-next (c7377ed8b9eb Merge branch 'kbuild/misc' into kbuild/for-next) +$ git merge kbuild/for-next +Auto-merging lib/Kconfig.debug +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/kbuild/makefiles.txt | 94 ++++++---------- + Documentation/lto-build | 173 +++++++++++++++++++++++++++++ + Makefile | 19 +++- + arch/x86/Kconfig | 2 +- + init/Kconfig | 73 ++++++++++++ + kernel/gcov/Kconfig | 2 +- + lib/Kconfig.debug | 2 +- + scripts/Makefile.build | 10 +- + scripts/Makefile.host | 6 +- + scripts/Makefile.lib | 9 ++ + scripts/Makefile.lto | 84 ++++++++++++++ + scripts/Makefile.modpost | 7 +- + scripts/bootgraph.pl | 0 + scripts/export_report.pl | 0 + scripts/gcc-goto.sh | 0 + scripts/gcc-ld | 0 + scripts/gcc-version.sh | 0 + scripts/gcc-x86_32-has-stack-protector.sh | 0 + scripts/gcc-x86_64-has-stack-protector.sh | 0 + scripts/gen_initramfs_list.sh | 0 + scripts/headers_check.pl | 0 + scripts/headers_install.sh | 0 + scripts/kconfig/Makefile | 38 +------ + scripts/kconfig/lxdialog/check-lxdialog.sh | 0 + scripts/kconfig/lxdialog/dialog.h | 2 +- + scripts/kconfig/streamline_config.pl | 0 + scripts/link-vmlinux.sh | 2 +- + scripts/markup_oops.pl | 0 + scripts/mkmakefile | 0 + scripts/mksysmap | 0 + scripts/package/builddeb | 22 ++-- + scripts/package/buildtar | 0 + scripts/profile2linkerlist.pl | 0 + scripts/rt-tester/rt-tester.py | 0 + scripts/selinux/install_policy.sh | 0 + scripts/tags.sh | 10 +- + scripts/tracing/draw_functrace.py | 0 + scripts/xz_wrap.sh | 0 + 38 files changed, 425 insertions(+), 130 deletions(-) + create mode 100644 Documentation/lto-build + create mode 100644 scripts/Makefile.lto + mode change 100644 => 100755 scripts/bootgraph.pl + mode change 100644 => 100755 scripts/export_report.pl + mode change 100644 => 100755 scripts/gcc-goto.sh + mode change 100644 => 100755 scripts/gcc-ld + mode change 100644 => 100755 scripts/gcc-version.sh + mode change 100644 => 100755 scripts/gcc-x86_32-has-stack-protector.sh + mode change 100644 => 100755 scripts/gcc-x86_64-has-stack-protector.sh + mode change 100644 => 100755 scripts/gen_initramfs_list.sh + mode change 100644 => 100755 scripts/headers_check.pl + mode change 100644 => 100755 scripts/headers_install.sh + mode change 100644 => 100755 scripts/kconfig/lxdialog/check-lxdialog.sh + mode change 100644 => 100755 scripts/kconfig/streamline_config.pl + mode change 100644 => 100755 scripts/link-vmlinux.sh + mode change 100644 => 100755 scripts/markup_oops.pl + mode change 100644 => 100755 scripts/mkmakefile + mode change 100644 => 100755 scripts/mksysmap + mode change 100644 => 100755 scripts/package/builddeb + mode change 100644 => 100755 scripts/package/buildtar + mode change 100644 => 100755 scripts/profile2linkerlist.pl + mode change 100644 => 100755 scripts/rt-tester/rt-tester.py + mode change 100644 => 100755 scripts/selinux/install_policy.sh + mode change 100644 => 100755 scripts/tracing/draw_functrace.py + mode change 100644 => 100755 scripts/xz_wrap.sh +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 (e87fafe928c0 Merge branch 'for-3.17-fixes' into for-next) +$ git merge libata/for-next +Merge made by the 'recursive' strategy. + arch/blackfin/mach-bf537/boards/cm_bf537e.c | 3 +-- + arch/blackfin/mach-bf537/boards/cm_bf537u.c | 3 +-- + arch/blackfin/mach-bf537/boards/stamp.c | 3 +-- + arch/blackfin/mach-bf537/boards/tcm_bf537.c | 3 +-- + arch/blackfin/mach-bf561/boards/cm_bf561.c | 3 +-- + drivers/ata/ahci.c | 8 ++++++++ + drivers/ata/ahci_platform.c | 18 +----------------- + drivers/ata/ahci_tegra.c | 14 ++++++++++---- + drivers/ata/ata_piix.c | 8 ++++++++ + drivers/ata/libahci_platform.c | 23 ----------------------- + drivers/ata/libata-core.c | 2 +- + drivers/ata/pata_of_platform.c | 24 ++++++------------------ + drivers/ata/pata_platform.c | 4 +--- + include/linux/ahci_platform.h | 13 ------------- + include/linux/ata_platform.h | 5 ----- + 15 files changed, 40 insertions(+), 94 deletions(-) +Merging pm/linux-next (0b4f58b7cebd Merge branch 'pm-cpufreq') +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + drivers/acpi/acpi_lpss.c | 17 +++++++++++++++++ + drivers/acpi/ec.c | 21 ++++++++++++++++++--- + drivers/acpi/scan.c | 17 +++++++++++------ + drivers/cpufreq/intel_pstate.c | 3 ++- + drivers/cpufreq/s5pv210-cpufreq.c | 2 +- + 5 files changed, 49 insertions(+), 11 deletions(-) +Merging idle/next (e7c95ff32d00 tools/power turbostat: tweak whitespace in output format) +$ git merge idle/next +Already up-to-date. +Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) +$ git merge apm/for-next +Already up-to-date. +Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles) +$ git merge cpupowerutils/master +Already up-to-date. +Merging thermal/next (47d104ba5879 Merge branches 'exynos-fix', 'for-rc', 'int3403-fix', 'misc', 'rcar-thermal' and 'sti-thermal' of .git into next) +$ git merge thermal/next +Already up-to-date. +Merging ieee1394/for-next (d584a6627994 firewire: ohci: disable MSI for VIA VT6315 again) +$ git merge ieee1394/for-next +Already up-to-date. +Merging dlm/next (883854c5457a dlm: keep listening connection alive with sctp mode) +$ 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 (bebbbb764e5b Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/dma/rcar-audmapp.txt | 6 +- + .../devicetree/bindings/dma/xilinx/xilinx_dma.txt | 65 ++++++++++++++++++++++ + Documentation/dmaengine.txt | 4 +- + drivers/dma/imx-sdma.c | 33 ++++++++--- + drivers/dma/sh/rcar-audmapp.c | 15 +++-- + drivers/dma/xilinx/xilinx_vdma.c | 1 - + 6 files changed, 106 insertions(+), 18 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/xilinx/xilinx_dma.txt +Merging dmaengine/next (fbeec99ad5c0 dma: mv_xor: Rename __mv_xor_slot_cleanup() to mv_xor_slot_cleanup()) +$ git merge dmaengine/next +Auto-merging drivers/dma/mv_xor.c +Merge made by the 'recursive' strategy. + drivers/dma/ioat/dca.c | 13 ++++---- + drivers/dma/ioat/dma.c | 2 +- + drivers/dma/ioat/dma_v3.c | 6 ++-- + drivers/dma/mv_xor.c | 80 +++++++++++++++++++++++++++++++++++++---------- + 4 files changed, 74 insertions(+), 27 deletions(-) +Merging net-next/master (a3bf5c429eb5 r8169: add missing MODULE_FIRMWARE.) +$ git merge net-next/master +Removing net/tipc/ref.h +Removing net/tipc/ref.c +Removing net/tipc/port.h +Removing net/tipc/port.c +Auto-merging net/core/dev.c +Auto-merging drivers/net/phy/phy.c +Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +Auto-merging drivers/net/ethernet/intel/i40evf/i40e_txrx.c +Auto-merging drivers/net/ethernet/intel/i40e/i40e_txrx.c +Merge made by the 'recursive' strategy. + .../bindings/net/broadcom-mdio-unimac.txt | 39 + + .../devicetree/bindings/net/broadcom-sf2.txt | 78 ++ + .../devicetree/bindings/net/can/m_can.txt | 67 ++ + .../devicetree/bindings/net/can/rcar_can.txt | 43 + + Documentation/devicetree/bindings/net/dsa/dsa.txt | 17 + + .../devicetree/bindings/net/socfpga-dwmac.txt | 4 + + Documentation/networking/ip-sysctl.txt | 6 + + arch/x86/net/bpf_jit_comp.c | 42 + + drivers/isdn/gigaset/bas-gigaset.c | 2 +- + drivers/isdn/gigaset/usb-gigaset.c | 2 +- + drivers/net/bonding/bond_alb.c | 2 +- + drivers/net/bonding/bond_options.c | 2 + + drivers/net/can/Kconfig | 2 + + drivers/net/can/Makefile | 3 +- + drivers/net/can/c_can/Makefile | 2 - + drivers/net/can/cc770/Makefile | 2 - + drivers/net/can/dev.c | 3 +- + drivers/net/can/flexcan.c | 111 +- + drivers/net/can/m_can/Kconfig | 4 + + drivers/net/can/m_can/Makefile | 5 + + drivers/net/can/m_can/m_can.c | 1202 ++++++++++++++++++++ + drivers/net/can/mscan/Makefile | 2 - + drivers/net/can/rcar_can.c | 66 +- + drivers/net/can/sja1000/Makefile | 2 - + drivers/net/can/softing/Makefile | 2 - + drivers/net/can/spi/Makefile | 2 - + drivers/net/can/spi/mcp251x.c | 16 +- + drivers/net/can/usb/Makefile | 2 - + drivers/net/dsa/Kconfig | 11 + + drivers/net/dsa/Makefile | 1 + + drivers/net/dsa/bcm_sf2.c | 626 ++++++++++ + drivers/net/dsa/bcm_sf2.h | 140 +++ + drivers/net/dsa/bcm_sf2_regs.h | 227 ++++ + drivers/net/ethernet/arc/Kconfig | 8 +- + drivers/net/ethernet/arc/Makefile | 3 +- + drivers/net/ethernet/arc/emac.h | 6 +- + drivers/net/ethernet/arc/emac_arc.c | 95 ++ + drivers/net/ethernet/arc/emac_main.c | 128 +-- + drivers/net/ethernet/arc/emac_mdio.c | 7 +- + drivers/net/ethernet/broadcom/Kconfig | 1 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 40 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 128 ++- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 5 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 5 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_dump.h | 14 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 42 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h | 222 ++-- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 221 +++- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 844 ++++++++++++-- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h | 178 ++- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 116 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 62 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 48 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 3 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 10 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 9 - + drivers/net/ethernet/broadcom/cnic.c | 6 +- + drivers/net/ethernet/dec/tulip/dmfe.c | 152 +-- + drivers/net/ethernet/ec_bhf.c | 101 +- + drivers/net/ethernet/intel/i40e/i40e.h | 8 + + drivers/net/ethernet/intel/i40e/i40e_adminq.c | 8 +- + drivers/net/ethernet/intel/i40e/i40e_common.c | 8 +- + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 3 + + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 15 + + drivers/net/ethernet/intel/i40e/i40e_main.c | 216 +++- + drivers/net/ethernet/intel/i40e/i40e_prototype.h | 6 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 88 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 1 + + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 14 +- + drivers/net/ethernet/intel/i40evf/i40e_adminq.c | 9 +- + drivers/net/ethernet/intel/i40evf/i40e_common.c | 8 +- + drivers/net/ethernet/intel/i40evf/i40e_prototype.h | 6 +- + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 6 +- + drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 1 + + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 2 +- + drivers/net/ethernet/intel/igb/igb_main.c | 87 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 66 +- + drivers/net/ethernet/realtek/r8169.c | 472 +++++++- + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 63 + + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 18 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 2 +- + drivers/net/ethernet/sun/sungem.c | 34 +- + drivers/net/hyperv/hyperv_net.h | 4 +- + drivers/net/hyperv/netvsc.c | 16 +- + drivers/net/phy/Kconfig | 8 + + drivers/net/phy/Makefile | 1 + + drivers/net/phy/bcm7xxx.c | 116 +- + drivers/net/phy/broadcom.c | 122 -- + drivers/net/phy/dp83640.c | 23 +- + drivers/net/phy/fixed.c | 11 + + drivers/net/phy/mdio-bcm-unimac.c | 212 ++++ + drivers/net/phy/phy.c | 12 +- + drivers/net/phy/phy_device.c | 4 +- + drivers/net/sungem_phy.c | 304 ++--- + drivers/net/team/team.c | 44 +- + drivers/net/usb/r8152.c | 70 +- + drivers/net/virtio_net.c | 4 +- + drivers/net/wan/dlci.c | 2 +- + drivers/usb/gadget/function/f_ncm.c | 8 + + include/linux/brcmphy.h | 132 ++- + include/linux/mlx4/device.h | 3 +- + include/linux/netdevice.h | 117 +- + include/linux/phy.h | 27 + + include/linux/phy_fixed.h | 17 +- + include/linux/random.h | 4 +- + include/linux/skbuff.h | 22 +- + include/linux/tcp.h | 2 +- + include/net/codel.h | 2 +- + include/net/dsa.h | 43 +- + include/net/flow_keys.h | 14 +- + include/net/ip.h | 8 + + include/net/ip6_checksum.h | 8 + + include/net/pkt_sched.h | 2 +- + include/net/udp.h | 18 + + include/uapi/linux/if_ether.h | 1 + + kernel/crash_dump.c | 1 + + lib/random32.c | 39 +- + lib/test_bpf.c | 38 + + net/atm/mpc.c | 2 +- + net/bridge/br_multicast.c | 2 +- + net/core/dev.c | 42 +- + net/core/flow_dissector.c | 69 +- + net/core/netpoll.c | 3 +- + net/core/pktgen.c | 4 +- + net/core/secure_seq.c | 6 +- + net/core/sock.c | 8 - + net/decnet/af_decnet.c | 3 +- + net/decnet/dn_dev.c | 3 +- + net/decnet/dn_timer.c | 3 +- + net/dsa/Kconfig | 3 + + net/dsa/Makefile | 1 + + net/dsa/dsa.c | 48 +- + net/dsa/dsa_priv.h | 16 +- + net/dsa/slave.c | 165 ++- + net/dsa/tag_brcm.c | 173 +++ + net/dsa/tag_dsa.c | 8 +- + net/dsa/tag_edsa.c | 8 +- + net/dsa/tag_trailer.c | 8 +- + net/ethernet/eth.c | 7 +- + net/ipv4/fib_frontend.c | 14 +- + net/ipv4/gre_demux.c | 1 + + net/ipv4/gre_offload.c | 43 +- + net/ipv4/igmp.c | 2 +- + net/ipv4/inet_hashtables.c | 2 +- + net/ipv4/ipconfig.c | 3 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 2 +- + net/ipv4/syncookies.c | 2 +- + net/ipv4/tcp_input.c | 26 +- + net/ipv4/tcp_offload.c | 27 +- + net/ipv4/udp.c | 7 +- + net/ipv4/udp_offload.c | 61 +- + net/ipv6/addrconf.c | 12 +- + net/ipv6/af_inet6.c | 12 +- + net/ipv6/ah6.c | 21 +- + net/ipv6/datagram.c | 8 +- + net/ipv6/esp6.c | 15 +- + net/ipv6/exthdrs.c | 2 +- + net/ipv6/icmp.c | 10 +- + net/ipv6/inet6_connection_sock.c | 6 +- + net/ipv6/inet6_hashtables.c | 7 +- + net/ipv6/ip6_flowlabel.c | 19 +- + net/ipv6/ip6_icmp.c | 2 +- + net/ipv6/ip6_input.c | 6 +- + net/ipv6/ip6_offload.c | 2 +- + net/ipv6/ip6_output.c | 21 +- + net/ipv6/ip6_tunnel.c | 32 +- + net/ipv6/ip6mr.c | 4 +- + net/ipv6/ipcomp6.c | 6 +- + net/ipv6/ipv6_sockglue.c | 26 +- + net/ipv6/mcast.c | 100 +- + net/ipv6/mip6.c | 10 +- + net/ipv6/ndisc.c | 17 +- + net/ipv6/output_core.c | 2 +- + net/ipv6/proc.c | 2 +- + net/ipv6/raw.c | 8 +- + net/ipv6/reassembly.c | 12 +- + net/ipv6/route.c | 22 +- + net/ipv6/sit.c | 12 +- + net/ipv6/syncookies.c | 2 +- + net/ipv6/tcpv6_offload.c | 26 +- + net/ipv6/tunnel6.c | 4 +- + net/ipv6/udp.c | 22 +- + net/ipv6/udp_offload.c | 33 + + net/ipv6/xfrm6_input.c | 6 +- + net/ipv6/xfrm6_output.c | 1 - + net/ipv6/xfrm6_policy.c | 22 +- + net/ipv6/xfrm6_state.c | 14 +- + net/ipv6/xfrm6_tunnel.c | 4 +- + net/netfilter/nf_conntrack_core.c | 4 +- + net/netfilter/nf_conntrack_expect.c | 3 +- + net/netfilter/nf_conntrack_netlink.c | 2 +- + net/netfilter/nf_conntrack_standalone.c | 2 +- + net/netfilter/nf_nat_core.c | 5 +- + net/netfilter/xt_HMARK.c | 2 +- + net/netfilter/xt_cluster.c | 3 +- + net/netfilter/xt_hashlimit.c | 2 +- + net/openvswitch/flow.c | 2 +- + net/packet/af_packet.c | 3 +- + net/rxrpc/ar-input.c | 9 +- + net/sched/act_police.c | 4 +- + net/sched/sch_fq.c | 4 +- + net/sched/sch_fq_codel.c | 3 +- + net/sched/sch_htb.c | 6 +- + net/sched/sch_tbf.c | 6 +- + net/sched/sch_teql.c | 3 +- + net/tipc/Makefile | 2 +- + net/tipc/bcast.c | 8 +- + net/tipc/config.c | 4 +- + net/tipc/core.c | 9 +- + net/tipc/core.h | 5 +- + net/tipc/link.c | 120 +- + net/tipc/link.h | 7 +- + net/tipc/msg.c | 38 +- + net/tipc/msg.h | 5 + + net/tipc/name_table.c | 1 - + net/tipc/net.c | 3 +- + net/tipc/node.c | 90 ++ + net/tipc/node.h | 7 +- + net/tipc/port.c | 514 --------- + net/tipc/port.h | 190 ---- + net/tipc/ref.c | 266 ----- + net/tipc/ref.h | 48 - + net/tipc/socket.c | 884 +++++++++++--- + net/tipc/socket.h | 55 +- + net/tipc/subscr.c | 1 - + 226 files changed, 8161 insertions(+), 3252 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/broadcom-mdio-unimac.txt + create mode 100644 Documentation/devicetree/bindings/net/broadcom-sf2.txt + create mode 100644 Documentation/devicetree/bindings/net/can/m_can.txt + create mode 100644 Documentation/devicetree/bindings/net/can/rcar_can.txt + create mode 100644 drivers/net/can/m_can/Kconfig + create mode 100644 drivers/net/can/m_can/Makefile + create mode 100644 drivers/net/can/m_can/m_can.c + create mode 100644 drivers/net/dsa/bcm_sf2.c + create mode 100644 drivers/net/dsa/bcm_sf2.h + create mode 100644 drivers/net/dsa/bcm_sf2_regs.h + create mode 100644 drivers/net/ethernet/arc/emac_arc.c + create mode 100644 drivers/net/phy/mdio-bcm-unimac.c + create mode 100644 net/dsa/tag_brcm.c + delete mode 100644 net/tipc/port.c + delete mode 100644 net/tipc/port.h + delete mode 100644 net/tipc/ref.c + delete mode 100644 net/tipc/ref.h +Merging ipsec-next/master (a3d1214688d5 neigh: document gc_thresh2) +$ git merge ipsec-next/master +Already up-to-date. +Merging wireless-next/master (6a5d088a9238 carl9170: tx: Replace rcu_assign_pointer() with RCU_INIT_POINTER()) +$ git merge wireless-next/master +Auto-merging net/mac802154/wpan.c +Auto-merging net/ieee802154/6lowpan_rtnl.c +Auto-merging net/bluetooth/hci_event.c +Auto-merging net/bluetooth/hci_core.c +Auto-merging include/net/bluetooth/hci_core.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 11 +- + drivers/bcma/host_soc.c | 4 + + drivers/bcma/scan.c | 11 +- + drivers/bluetooth/ath3k.c | 2 + + drivers/bluetooth/bluecard_cs.c | 35 +- + drivers/bluetooth/bt3c_cs.c | 27 +- + drivers/bluetooth/btuart_cs.c | 27 +- + drivers/bluetooth/btusb.c | 1 + + drivers/bluetooth/dtl1_cs.c | 36 +- + drivers/bluetooth/hci_h5.c | 2 +- + drivers/net/wireless/ath/ath.h | 1 + + drivers/net/wireless/ath/ath10k/Kconfig | 1 + + drivers/net/wireless/ath/ath10k/Makefile | 1 + + drivers/net/wireless/ath/ath10k/bmi.c | 52 +- + drivers/net/wireless/ath/ath10k/ce.c | 185 ++- + drivers/net/wireless/ath/ath10k/ce.h | 28 +- + drivers/net/wireless/ath/ath10k/core.c | 246 ++-- + drivers/net/wireless/ath/ath10k/core.h | 66 +- + drivers/net/wireless/ath/ath10k/debug.c | 339 +++++- + drivers/net/wireless/ath/ath10k/debug.h | 34 +- + drivers/net/wireless/ath/ath10k/htc.c | 115 +- + drivers/net/wireless/ath/ath10k/htc.h | 7 +- + drivers/net/wireless/ath/ath10k/htt.c | 9 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 171 ++- + drivers/net/wireless/ath/ath10k/htt_tx.c | 46 +- + drivers/net/wireless/ath/ath10k/hw.h | 5 +- + drivers/net/wireless/ath/ath10k/mac.c | 717 +++++++----- + drivers/net/wireless/ath/ath10k/mac.h | 6 +- + drivers/net/wireless/ath/ath10k/pci.c | 1537 +++++++++++-------------- + drivers/net/wireless/ath/ath10k/pci.h | 104 +- + drivers/net/wireless/ath/ath10k/spectral.c | 561 +++++++++ + drivers/net/wireless/ath/ath10k/spectral.h | 90 ++ + drivers/net/wireless/ath/ath10k/txrx.c | 17 +- + drivers/net/wireless/ath/ath10k/wmi.c | 1089 ++++++++++++++---- + drivers/net/wireless/ath/ath10k/wmi.h | 699 +++++++++-- + drivers/net/wireless/ath/ath5k/attach.c | 3 +- + drivers/net/wireless/ath/ath5k/base.c | 2 +- + drivers/net/wireless/ath/ath5k/led.c | 1 + + drivers/net/wireless/ath/ath6kl/init.c | 2 +- + drivers/net/wireless/ath/ath6kl/main.c | 2 +- + drivers/net/wireless/ath/ath6kl/sdio.c | 1 + + drivers/net/wireless/ath/ath6kl/usb.c | 21 +- + drivers/net/wireless/ath/ath9k/Kconfig | 9 + + drivers/net/wireless/ath/ath9k/ath9k.h | 136 ++- + drivers/net/wireless/ath/ath9k/beacon.c | 59 +- + drivers/net/wireless/ath/ath9k/channel.c | 1291 +++++++++++++++------ + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 2 + + drivers/net/wireless/ath/ath9k/init.c | 83 +- + drivers/net/wireless/ath/ath9k/main.c | 462 ++------ + drivers/net/wireless/ath/ath9k/recv.c | 13 +- + drivers/net/wireless/ath/ath9k/spectral.h | 71 +- + drivers/net/wireless/ath/ath9k/wow.c | 3 +- + drivers/net/wireless/ath/ath9k/xmit.c | 7 +- + drivers/net/wireless/ath/carl9170/main.c | 11 +- + drivers/net/wireless/ath/carl9170/tx.c | 2 +- + drivers/net/wireless/ath/spectral_common.h | 113 ++ + drivers/net/wireless/ath/wil6210/cfg80211.c | 6 +- + drivers/net/wireless/ath/wil6210/debugfs.c | 331 ++++-- + drivers/net/wireless/ath/wil6210/interrupt.c | 2 +- + drivers/net/wireless/ath/wil6210/main.c | 30 +- + drivers/net/wireless/ath/wil6210/netdev.c | 8 +- + drivers/net/wireless/ath/wil6210/pcie_bus.c | 7 +- + drivers/net/wireless/ath/wil6210/rx_reorder.c | 16 + + drivers/net/wireless/ath/wil6210/txrx.c | 3 +- + drivers/net/wireless/ath/wil6210/txrx.h | 2 +- + drivers/net/wireless/ath/wil6210/wil6210.h | 17 +- + drivers/net/wireless/ath/wil6210/wmi.c | 47 +- + drivers/net/wireless/ath/wil6210/wmi.h | 4 +- + drivers/net/wireless/atmel_cs.c | 22 +- + drivers/net/wireless/b43/Makefile | 1 + + drivers/net/wireless/b43/b43.h | 18 + + drivers/net/wireless/b43/bus.c | 10 + + drivers/net/wireless/b43/bus.h | 15 + + drivers/net/wireless/b43/main.c | 17 +- + drivers/net/wireless/b43/phy_a.c | 4 +- + drivers/net/wireless/b43/phy_common.c | 25 +- + drivers/net/wireless/b43/phy_g.c | 8 +- + drivers/net/wireless/b43/phy_ht.c | 20 +- + drivers/net/wireless/b43/phy_lcn.c | 20 +- + drivers/net/wireless/b43/phy_lp.c | 20 +- + drivers/net/wireless/b43/phy_n.c | 128 +- + drivers/net/wireless/b43/phy_n.h | 4 + + drivers/net/wireless/b43/ppr.c | 199 ++++ + drivers/net/wireless/b43/ppr.h | 45 + + drivers/net/wireless/b43/tables_nphy.c | 128 +- + drivers/net/wireless/b43/tables_nphy.h | 2 + + drivers/net/wireless/cw1200/cw1200_spi.c | 4 +- + drivers/net/wireless/ipw2x00/ipw2200.c | 6 +- + drivers/net/wireless/mwifiex/cfg80211.c | 2 +- + drivers/net/wireless/mwifiex/cmdevt.c | 29 +- + drivers/net/wireless/mwifiex/fw.h | 9 +- + drivers/net/wireless/mwifiex/init.c | 4 +- + drivers/net/wireless/mwifiex/main.h | 2 +- + drivers/net/wireless/mwifiex/sta_cmd.c | 2 +- + drivers/net/wireless/mwifiex/sta_cmdresp.c | 2 +- + drivers/net/wireless/mwifiex/sta_ioctl.c | 4 +- + drivers/net/wireless/orinoco/orinoco_usb.c | 10 +- + drivers/net/wireless/ray_cs.h | 5 +- + drivers/net/wireless/rayctl.h | 5 +- + drivers/net/wireless/rt2x00/rt2800.h | 4 +- + drivers/net/wireless/rt2x00/rt2800lib.c | 6 + + drivers/net/wireless/ti/wl1251/spi.c | 1 - + drivers/net/wireless/ti/wlcore/spi.c | 20 +- + include/net/bluetooth/hci_core.h | 8 +- + include/net/bluetooth/l2cap.h | 33 +- + net/bluetooth/6lowpan.c | 10 +- + net/bluetooth/hci_core.c | 71 +- + net/bluetooth/hci_event.c | 11 +- + net/bluetooth/l2cap_core.c | 309 +++-- + net/bluetooth/l2cap_sock.c | 15 +- + net/bluetooth/mgmt.c | 124 +- + net/bluetooth/smp.c | 726 ++++++++---- + net/bluetooth/smp.h | 10 +- + net/ieee802154/6lowpan_rtnl.c | 8 - + net/mac802154/rx.c | 5 +- + net/mac802154/tx.c | 15 +- + net/mac802154/wpan.c | 10 +- + net/wireless/core.c | 7 +- + 118 files changed, 7241 insertions(+), 3971 deletions(-) + create mode 100644 drivers/net/wireless/ath/ath10k/spectral.c + create mode 100644 drivers/net/wireless/ath/ath10k/spectral.h + create mode 100644 drivers/net/wireless/ath/spectral_common.h + create mode 100644 drivers/net/wireless/b43/ppr.c + create mode 100644 drivers/net/wireless/b43/ppr.h +Merging bluetooth/master (cf0ba860a91e Bluetooth: Move clock offset reading into hci_disconnect()) +$ git merge bluetooth/master +Resolved 'net/bluetooth/hci_conn.c' using previous resolution. +Resolved 'net/bluetooth/hci_core.c' using previous resolution. +Resolved 'net/bluetooth/hci_event.c' using previous resolution. +Auto-merging net/bluetooth/hci_event.c +CONFLICT (content): Merge conflict in net/bluetooth/hci_event.c +Auto-merging net/bluetooth/hci_core.c +CONFLICT (content): Merge conflict in net/bluetooth/hci_core.c +Auto-merging net/bluetooth/hci_conn.c +CONFLICT (content): Merge conflict in net/bluetooth/hci_conn.c +Auto-merging include/net/bluetooth/hci_core.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 204bf75c03a8] Merge remote-tracking branch 'bluetooth/master' +$ git diff -M --stat --summary HEAD^.. + include/net/bluetooth/hci_core.h | 10 +++++--- + include/net/bluetooth/l2cap.h | 7 ++---- + net/bluetooth/hci_conn.c | 49 +++++++++++++++++++----------------- + net/bluetooth/hci_core.c | 29 +++++++++++---------- + net/bluetooth/hci_event.c | 16 ++++++------ + net/bluetooth/hidp/core.c | 10 +++----- + net/bluetooth/l2cap_core.c | 54 +++++++++++++--------------------------- + net/bluetooth/l2cap_sock.c | 8 ++++++ + net/bluetooth/mgmt.c | 18 +++++++------- + net/bluetooth/smp.c | 17 ++++++------- + 10 files changed, 104 insertions(+), 114 deletions(-) +Merging infiniband/for-next (d087f6ad724d Merge branches 'core', 'cxgb4', 'ipoib', 'iser', 'iwcm', 'mad', 'misc', 'mlx4', 'mlx5', 'ocrdma' and 'srp' into for-next) +$ git merge infiniband/for-next +Already up-to-date. +Merging mtd/master (b25046b1e5e3 mtd: nand: fix DocBook warnings on nand_sdr_timings doc) +$ git merge mtd/master +Merge made by the 'recursive' strategy. + drivers/mtd/chips/cfi_cmdset_0002.c | 4 ++++ + include/linux/mtd/nand.h | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) +Merging l2-mtd/master (5b49ab3e03f6 Merge l2-mtd/next into l2-mtd/master) +$ git merge l2-mtd/master +Merge made by the 'recursive' strategy. + drivers/mtd/chips/cfi_cmdset_0002.c | 2 ++ + drivers/mtd/devices/docg3.c | 26 +++++++++++----------- + drivers/mtd/maps/Kconfig | 2 +- + drivers/mtd/maps/gpio-addr-flash.c | 42 +++++++++++++++++++++++------------ + drivers/mtd/maps/pcmciamtd.c | 2 +- + drivers/mtd/mtdchar.c | 3 +++ + drivers/mtd/mtdcore.c | 39 +++++++++++++++----------------- + drivers/mtd/mtdswap.c | 8 +++---- + drivers/mtd/nand/atmel_nand.c | 44 ++++++++++++++++++------------------- + drivers/mtd/nand/denali.c | 7 +++--- + drivers/mtd/nand/nand_base.c | 22 +++++++++++++++++-- + drivers/mtd/nand/nand_timings.c | 2 +- + drivers/mtd/nand/nandsim.c | 2 +- + drivers/mtd/nand/ndfc.c | 3 ++- + drivers/mtd/nand/sm_common.h | 2 +- + drivers/mtd/sm_ftl.c | 2 +- + drivers/mtd/spi-nor/spi-nor.c | 9 ++------ + drivers/mtd/tests/mtd_test.c | 4 ++-- + drivers/mtd/tests/nandbiterrs.c | 2 +- + drivers/mtd/tests/oobtest.c | 8 +++---- + drivers/mtd/tests/pagetest.c | 4 ++-- + drivers/mtd/tests/readtest.c | 2 +- + drivers/mtd/tests/speedtest.c | 14 ++++++------ + drivers/mtd/tests/subpagetest.c | 10 ++++----- + include/linux/mtd/cfi.h | 22 +++++++++---------- + include/linux/mtd/nand.h | 1 + + 26 files changed, 157 insertions(+), 127 deletions(-) +Merging crypto/master (b9347aff91ce crypto: drbg - fix maximum value checks on 32 bit systems) +$ git merge crypto/master +Auto-merging crypto/Kconfig +Merge made by the 'recursive' strategy. + arch/x86/crypto/Makefile | 1 + + arch/x86/crypto/sha-mb/Makefile | 11 + + arch/x86/crypto/sha-mb/sha1_mb.c | 935 +++++++++++++++++++++++ + arch/x86/crypto/sha-mb/sha1_mb_mgr_datastruct.S | 287 +++++++ + arch/x86/crypto/sha-mb/sha1_mb_mgr_flush_avx2.S | 327 ++++++++ + arch/x86/crypto/sha-mb/sha1_mb_mgr_init_avx2.c | 64 ++ + arch/x86/crypto/sha-mb/sha1_mb_mgr_submit_avx2.S | 228 ++++++ + arch/x86/crypto/sha-mb/sha1_x8_avx2.S | 472 ++++++++++++ + arch/x86/crypto/sha-mb/sha_mb_ctx.h | 136 ++++ + arch/x86/crypto/sha-mb/sha_mb_mgr.h | 110 +++ + crypto/Kconfig | 30 + + crypto/Makefile | 1 + + crypto/ahash.c | 12 +- + crypto/drbg.c | 130 +--- + crypto/mcryptd.c | 705 +++++++++++++++++ + crypto/testmgr.c | 934 +++++++++++----------- + drivers/crypto/caam/caamhash.c | 28 +- + drivers/crypto/caam/ctrl.c | 24 +- + drivers/crypto/caam/regs.h | 13 +- + drivers/crypto/caam/sg_sw_sec4.h | 54 -- + drivers/crypto/qat/qat_common/adf_ctl_drv.c | 2 +- + include/crypto/drbg.h | 32 +- + include/crypto/internal/hash.h | 9 + + include/crypto/mcryptd.h | 112 +++ + include/linux/sched.h | 1 + + kernel/sched/core.c | 12 + + 26 files changed, 4009 insertions(+), 661 deletions(-) + create mode 100644 arch/x86/crypto/sha-mb/Makefile + create mode 100644 arch/x86/crypto/sha-mb/sha1_mb.c + create mode 100644 arch/x86/crypto/sha-mb/sha1_mb_mgr_datastruct.S + create mode 100644 arch/x86/crypto/sha-mb/sha1_mb_mgr_flush_avx2.S + create mode 100644 arch/x86/crypto/sha-mb/sha1_mb_mgr_init_avx2.c + create mode 100644 arch/x86/crypto/sha-mb/sha1_mb_mgr_submit_avx2.S + create mode 100644 arch/x86/crypto/sha-mb/sha1_x8_avx2.S + create mode 100644 arch/x86/crypto/sha-mb/sha_mb_ctx.h + create mode 100644 arch/x86/crypto/sha-mb/sha_mb_mgr.h + create mode 100644 crypto/mcryptd.c + create mode 100644 include/crypto/mcryptd.h +Merging drm/drm-next (04cd214516d8 Merge branch 'drm-next-3.18' of git://people.freedesktop.org/~agd5f/linux into drm-next) +$ git merge drm/drm-next +Auto-merging drivers/gpu/drm/radeon/radeon.h +Auto-merging drivers/gpu/drm/radeon/r600.c +Auto-merging drivers/gpu/drm/radeon/cik.c +Auto-merging drivers/gpu/drm/i915/intel_lvds.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/intel_bios.c +Auto-merging drivers/gpu/drm/drm_crtc.c +Merge made by the 'recursive' strategy. + Documentation/DocBook/drm.tmpl | 1 + + drivers/gpu/drm/Kconfig | 2 + + drivers/gpu/drm/ast/ast_drv.h | 2 +- + drivers/gpu/drm/ast/ast_ttm.c | 20 +- + drivers/gpu/drm/bochs/bochs.h | 2 +- + drivers/gpu/drm/bochs/bochs_mm.c | 20 +- + drivers/gpu/drm/cirrus/cirrus_drv.h | 2 +- + drivers/gpu/drm/cirrus/cirrus_ttm.c | 17 +- + drivers/gpu/drm/drm_crtc.c | 306 ++++++++------- + drivers/gpu/drm/drm_dp_mst_topology.c | 3 +- + drivers/gpu/drm/drm_edid.c | 2 +- + drivers/gpu/drm/drm_fb_helper.c | 85 +---- + drivers/gpu/drm/drm_fops.c | 2 + + drivers/gpu/drm/drm_irq.c | 68 ++++ + drivers/gpu/drm/drm_modes.c | 1 + + drivers/gpu/drm/drm_modeset_lock.c | 213 ++++++++++- + drivers/gpu/drm/drm_probe_helper.c | 17 + + drivers/gpu/drm/i915/i915_debugfs.c | 45 ++- + drivers/gpu/drm/i915/i915_dma.c | 3 + + drivers/gpu/drm/i915/i915_drv.h | 22 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 11 - + drivers/gpu/drm/i915/i915_gem_gtt.h | 1 - + drivers/gpu/drm/i915/i915_irq.c | 15 +- + drivers/gpu/drm/i915/i915_reg.h | 234 ++++++++---- + drivers/gpu/drm/i915/intel_bios.c | 13 +- + drivers/gpu/drm/i915/intel_bios.h | 3 +- + drivers/gpu/drm/i915/intel_ddi.c | 171 ++++++--- + drivers/gpu/drm/i915/intel_display.c | 340 +++++++++++------ + drivers/gpu/drm/i915/intel_dp.c | 50 +-- + drivers/gpu/drm/i915/intel_drv.h | 9 +- + drivers/gpu/drm/i915/intel_dsi.c | 40 +- + drivers/gpu/drm/i915/intel_dsi.h | 2 + + drivers/gpu/drm/i915/intel_dsi_cmd.c | 2 +- + drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 38 +- + drivers/gpu/drm/i915/intel_dsi_pll.c | 17 +- + drivers/gpu/drm/i915/intel_hdmi.c | 8 +- + drivers/gpu/drm/i915/intel_lvds.c | 3 +- + drivers/gpu/drm/i915/intel_pm.c | 528 +++++++++++++++++++++++--- + drivers/gpu/drm/i915/intel_ringbuffer.c | 4 +- + drivers/gpu/drm/i915/intel_sprite.c | 98 ++++- + drivers/gpu/drm/mgag200/mgag200_drv.h | 2 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 21 +- + drivers/gpu/drm/mgag200/mgag200_ttm.c | 20 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 52 ++- + drivers/gpu/drm/nouveau/nouveau_bo.h | 4 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 9 +- + drivers/gpu/drm/qxl/qxl_drv.h | 2 +- + drivers/gpu/drm/qxl/qxl_object.c | 17 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 8 +- + drivers/gpu/drm/radeon/Makefile | 2 +- + drivers/gpu/drm/radeon/cik.c | 6 +- + drivers/gpu/drm/radeon/r600.c | 132 +++++++ + drivers/gpu/drm/radeon/r600d.h | 41 +- + drivers/gpu/drm/radeon/radeon.h | 33 +- + drivers/gpu/drm/radeon/radeon_asic.c | 25 +- + drivers/gpu/drm/radeon/radeon_asic.h | 3 + + drivers/gpu/drm/radeon/radeon_cs.c | 41 +- + drivers/gpu/drm/radeon/radeon_device.c | 60 ++- + drivers/gpu/drm/radeon/radeon_display.c | 4 +- + drivers/gpu/drm/radeon/radeon_drv.c | 5 +- + drivers/gpu/drm/radeon/radeon_fence.c | 267 +++++++------ + drivers/gpu/drm/radeon/radeon_gem.c | 97 +++++ + drivers/gpu/drm/radeon/radeon_ib.c | 1 + + drivers/gpu/drm/radeon/radeon_irq_kms.c | 18 - + drivers/gpu/drm/radeon/radeon_kms.c | 1 + + drivers/gpu/drm/radeon/radeon_mn.c | 272 +++++++++++++ + drivers/gpu/drm/radeon/radeon_object.c | 80 ++-- + drivers/gpu/drm/radeon/radeon_prime.c | 10 + + drivers/gpu/drm/radeon/radeon_ttm.c | 180 ++++++++- + drivers/gpu/drm/radeon/radeon_uvd.c | 150 ++++---- + drivers/gpu/drm/radeon/radeon_vm.c | 3 + + drivers/gpu/drm/radeon/uvd_v1_0.c | 107 +++++- + drivers/gpu/drm/radeon/uvd_v2_2.c | 4 + + drivers/gpu/drm/ttm/ttm_bo.c | 93 ++--- + drivers/gpu/drm/ttm/ttm_bo_manager.c | 9 +- + drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 136 ++++--- + drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c | 22 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 3 +- + drivers/video/fbdev/Kconfig | 4 + + drivers/video/fbdev/core/Makefile | 1 + + drivers/video/fbdev/core/fb_cmdline.c | 110 ++++++ + drivers/video/fbdev/core/fbmem.c | 92 ----- + drivers/video/fbdev/core/modedb.c | 3 - + include/drm/drmP.h | 13 + + include/drm/drm_crtc.h | 23 +- + include/drm/drm_fb_helper.h | 1 - + include/drm/drm_modeset_lock.h | 16 + + include/drm/ttm/ttm_bo_api.h | 40 +- + include/drm/ttm/ttm_bo_driver.h | 3 +- + include/uapi/drm/radeon_drm.h | 19 + + 91 files changed, 3446 insertions(+), 1249 deletions(-) + create mode 100644 drivers/gpu/drm/radeon/radeon_mn.c + create mode 100644 drivers/video/fbdev/core/fb_cmdline.c +Merging drm-panel/drm/panel/for-next (9746c61960b6 drm/panel: simple: Use devm_gpiod_get_optional()) +$ git merge drm-panel/drm/panel/for-next +Already up-to-date. +Merging drm-intel/for-linux-next (be71eabebaf9 Revert "drm/i915: Enable semaphores on BDW") +$ git merge drm-intel/for-linux-next +Already up-to-date. +Merging drm-tegra/drm/tegra/for-next (ef70728c7a65 drm/tegra: add MODULE_DEVICE_TABLEs) +$ git merge drm-tegra/drm/tegra/for-next +Already up-to-date. +Merging sound/for-next (890b13a308b9 ALSA: ice1712: Replacing hex with #defines) +$ git merge sound/for-next +Auto-merging sound/pci/hda/patch_realtek.c +Merge made by the 'recursive' strategy. + sound/pci/ctxfi/ctamixer.c | 4 +- + sound/pci/ctxfi/ctatc.c | 26 +- + sound/pci/ctxfi/ctdaio.c | 2 +- + sound/pci/ctxfi/cthw20k1.c | 11 +- + sound/pci/ctxfi/cthw20k2.c | 21 +- + sound/pci/ctxfi/ctmixer.c | 6 +- + sound/pci/ctxfi/ctpcm.c | 6 +- + sound/pci/ctxfi/ctresource.c | 20 +- + sound/pci/ctxfi/ctsrc.c | 4 +- + sound/pci/ctxfi/ctvmem.c | 6 +- + sound/pci/ctxfi/xfi.c | 10 +- + sound/pci/hda/hda_codec.c | 115 ------ + sound/pci/hda/hda_codec.h | 2 - + sound/pci/hda/hda_local.h | 6 - + sound/pci/hda/patch_realtek.c | 846 +++++++++++++++++++----------------------- + sound/pci/ice1712/ice1712.c | 2 +- + 16 files changed, 443 insertions(+), 644 deletions(-) +Merging sound-asoc/for-next (847a985b2670 Merge remote-tracking branches 'asoc/topic/wm8978' and 'asoc/topic/wm8994' into asoc-next) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regmap/regmap.txt | 47 ++ + .../devicetree/bindings/sound/adi,axi-spdif-tx.txt | 2 +- + .../devicetree/bindings/sound/cs35l32.txt | 62 ++ + Documentation/devicetree/bindings/sound/es8328.txt | 38 ++ + .../devicetree/bindings/sound/fsl-asoc-card.txt | 82 +++ + .../devicetree/bindings/sound/fsl-sai.txt | 22 +- + .../devicetree/bindings/sound/imx-audio-es8328.txt | 60 ++ + .../devicetree/bindings/vendor-prefixes.txt | 1 + + drivers/base/regmap/regmap-i2c.c | 2 + + drivers/base/regmap/regmap-spi.c | 2 + + drivers/base/regmap/regmap.c | 74 +- + include/dt-bindings/sound/cs35l32.h | 26 + + include/sound/rt5677.h | 8 + + include/sound/soc.h | 76 ++- + sound/soc/codecs/Kconfig | 22 +- + sound/soc/codecs/Makefile | 8 + + sound/soc/codecs/ab8500-codec.c | 11 +- + sound/soc/codecs/ac97.c | 15 - + sound/soc/codecs/cs35l32.c | 632 +++++++++++++++++ + sound/soc/codecs/cs35l32.h | 93 +++ + sound/soc/codecs/cs4265.c | 13 +- + sound/soc/codecs/cs42l52.c | 4 +- + sound/soc/codecs/cs42l56.c | 7 +- + sound/soc/codecs/da732x.h | 2 +- + sound/soc/codecs/es8328-i2c.c | 60 ++ + sound/soc/codecs/es8328-spi.c | 49 ++ + sound/soc/codecs/es8328.c | 756 +++++++++++++++++++++ + sound/soc/codecs/es8328.h | 314 +++++++++ + sound/soc/codecs/rt5640.c | 1 + + sound/soc/codecs/rt5677.c | 65 +- + sound/soc/codecs/rt5677.h | 10 + + sound/soc/codecs/tas2552.c | 68 +- + sound/soc/codecs/wm8994.c | 18 +- + sound/soc/davinci/edma-pcm.c | 2 + + sound/soc/fsl/Kconfig | 29 + + sound/soc/fsl/Makefile | 4 + + sound/soc/fsl/fsl-asoc-card.c | 574 ++++++++++++++++ + sound/soc/fsl/fsl_asrc.c | 6 +- + sound/soc/fsl/fsl_esai.c | 19 +- + sound/soc/fsl/fsl_esai.h | 8 +- + sound/soc/fsl/fsl_sai.c | 52 +- + sound/soc/fsl/fsl_sai.h | 6 +- + sound/soc/fsl/fsl_spdif.c | 5 +- + sound/soc/fsl/fsl_ssi.c | 33 +- + sound/soc/fsl/imx-es8328.c | 232 +++++++ + sound/soc/generic/simple-card.c | 2 +- + sound/soc/intel/Makefile | 3 +- + sound/soc/intel/sst-atom-controls.c | 39 ++ + sound/soc/intel/sst-atom-controls.h | 286 +++++++- + sound/soc/intel/sst-mfld-platform-compress.c | 38 +- + sound/soc/intel/sst-mfld-platform-pcm.c | 34 +- + sound/soc/intel/sst-mfld-platform.h | 57 +- + sound/soc/samsung/idma.c | 4 +- + sound/soc/samsung/odroidx2_max98090.c | 4 +- + sound/soc/samsung/speyside.c | 6 +- + sound/soc/sh/fsi.c | 7 +- + sound/soc/sh/rcar/core.c | 6 +- + sound/soc/sh/rcar/gen.c | 2 +- + sound/soc/sh/siu_pcm.c | 4 +- + sound/soc/sirf/sirf-usp.c | 24 +- + sound/soc/soc-core.c | 671 +++++++++--------- + sound/soc/soc-generic-dmaengine-pcm.c | 4 +- + sound/soc/soc-io.c | 28 - + sound/soc/tegra/tegra_asoc_utils.h | 2 +- + sound/soc/txx9/txx9aclc.c | 14 +- + 65 files changed, 4227 insertions(+), 628 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regmap/regmap.txt + create mode 100644 Documentation/devicetree/bindings/sound/cs35l32.txt + create mode 100644 Documentation/devicetree/bindings/sound/es8328.txt + create mode 100644 Documentation/devicetree/bindings/sound/fsl-asoc-card.txt + create mode 100644 Documentation/devicetree/bindings/sound/imx-audio-es8328.txt + create mode 100644 include/dt-bindings/sound/cs35l32.h + create mode 100644 sound/soc/codecs/cs35l32.c + create mode 100644 sound/soc/codecs/cs35l32.h + create mode 100644 sound/soc/codecs/es8328-i2c.c + create mode 100644 sound/soc/codecs/es8328-spi.c + create mode 100644 sound/soc/codecs/es8328.c + create mode 100644 sound/soc/codecs/es8328.h + create mode 100644 sound/soc/fsl/fsl-asoc-card.c + create mode 100644 sound/soc/fsl/imx-es8328.c + create mode 100644 sound/soc/intel/sst-atom-controls.c +Merging modules/modules-next (480cadc2b7e0 scsi: Fix qemu boot hang problem) +$ git merge modules/modules-next +Already up-to-date. +Merging virtio/virtio-next (480cadc2b7e0 scsi: Fix qemu boot hang problem) +$ git merge virtio/virtio-next +Already up-to-date. +Merging input/next (6ba694560cae Input: drv260x - fix binding document) +$ git merge input/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/ti,drv260x.txt | 50 ++ + drivers/input/misc/Kconfig | 11 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/drv260x.c | 741 +++++++++++++++++++++ + include/dt-bindings/input/ti-drv260x.h | 36 + + include/linux/platform_data/drv260x-pdata.h | 28 + + 6 files changed, 867 insertions(+) + create mode 100644 Documentation/devicetree/bindings/input/ti,drv260x.txt + create mode 100644 drivers/input/misc/drv260x.c + create mode 100644 include/dt-bindings/input/ti-drv260x.h + create mode 100644 include/linux/platform_data/drv260x-pdata.h +Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) +$ git merge input-mt/for-next +Already up-to-date. +Merging block/for-next (f37513ea97f9 Merge branch 'for-linus' into for-next) +$ git merge block/for-next +Merge made by the 'recursive' strategy. + block/bio-integrity.c | 2 +- + block/blk-core.c | 1 - + block/blk-mq.c | 36 ++++++++++++++++++++++-------------- + block/cfq-iosched.c | 19 ++++++++++++++++--- + block/scsi_ioctl.c | 40 +++++++++++++++++++++++++++------------- + drivers/block/brd.c | 6 +++++- + drivers/block/xsysace.c | 1 - + drivers/scsi/scsi_lib.c | 1 - + include/linux/blk-mq.h | 7 +++---- + 9 files changed, 74 insertions(+), 39 deletions(-) +Merging device-mapper/for-next (e8531a5cbbd9 dm crypt: sort writes) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + drivers/md/dm-crypt.c | 393 ++++++++++++++++++++++++++------------------------ + 1 file changed, 205 insertions(+), 188 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 (7afa863f166e mmc: tmio: add actual clock support as option) +$ git merge mmc-uh/next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mmc/mmc.txt | 2 + + .../devicetree/bindings/mmc/rockchip-dw-mshc.txt | 6 +- + drivers/mmc/core/core.c | 32 +-- + drivers/mmc/core/host.c | 8 + + drivers/mmc/core/mmc.c | 8 + + drivers/mmc/core/mmc_ops.c | 20 ++ + drivers/mmc/core/mmc_ops.h | 1 + + drivers/mmc/core/sd.c | 8 + + drivers/mmc/core/sdio.c | 12 +- + drivers/mmc/core/sdio_irq.c | 4 +- + drivers/mmc/host/Kconfig | 14 +- + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/atmel-mci.c | 1 + + drivers/mmc/host/au1xmmc.c | 5 +- + drivers/mmc/host/dw_mmc-pci.c | 3 - + drivers/mmc/host/dw_mmc-pltfm.c | 59 ++++- + drivers/mmc/host/dw_mmc.c | 46 ++++ + drivers/mmc/host/jz4740_mmc.c | 269 ++++++++++++++++++++- + drivers/mmc/host/mmci.c | 18 +- + drivers/mmc/host/mmci_qcom_dml.c | 177 ++++++++++++++ + drivers/mmc/host/mmci_qcom_dml.h | 31 +++ + drivers/mmc/host/moxart-mmc.c | 1 - + drivers/mmc/host/mxcmmc.c | 1 - + drivers/mmc/host/mxs-mmc.c | 1 - + drivers/mmc/host/omap.c | 1 - + drivers/mmc/host/omap_hsmmc.c | 1 - + drivers/mmc/host/pxamci.c | 1 - + drivers/mmc/host/rtsx_pci_sdmmc.c | 8 +- + drivers/mmc/host/rtsx_usb_sdmmc.c | 8 +- + drivers/mmc/host/s3cmci.c | 1 - + drivers/mmc/host/sdhci-acpi.c | 11 +- + drivers/mmc/host/sdhci-bcm-kona.c | 1 - + drivers/mmc/host/sdhci-bcm2835.c | 1 - + drivers/mmc/host/sdhci-cns3xxx.c | 1 - + drivers/mmc/host/sdhci-dove.c | 1 - + drivers/mmc/host/sdhci-esdhc-imx.c | 1 - + drivers/mmc/host/sdhci-msm.c | 1 - + drivers/mmc/host/sdhci-of-arasan.c | 1 - + drivers/mmc/host/sdhci-of-esdhc.c | 1 - + drivers/mmc/host/sdhci-of-hlwd.c | 1 - + drivers/mmc/host/sdhci-pci.c | 11 +- + drivers/mmc/host/sdhci-pltfm.c | 10 +- + drivers/mmc/host/sdhci-pxav2.c | 1 - + drivers/mmc/host/sdhci-pxav3.c | 4 +- + drivers/mmc/host/sdhci-s3c.c | 5 +- + drivers/mmc/host/sdhci-sirf.c | 1 - + drivers/mmc/host/sdhci-spear.c | 1 - + drivers/mmc/host/sdhci-tegra.c | 1 - + drivers/mmc/host/sdhci.c | 15 +- + drivers/mmc/host/sh_mmcif.c | 1 - + drivers/mmc/host/sh_mobile_sdhi.c | 30 ++- + drivers/mmc/host/sunxi-mmc.c | 1 - + drivers/mmc/host/tmio_mmc.c | 7 +- + drivers/mmc/host/tmio_mmc.h | 31 +-- + drivers/mmc/host/tmio_mmc_dma.c | 8 +- + drivers/mmc/host/tmio_mmc_pio.c | 232 ++++++++++-------- + include/linux/atmel-mci.h | 2 + + include/linux/mfd/tmio.h | 22 ++ + include/linux/mmc/card.h | 8 +- + include/linux/mmc/host.h | 3 + + 60 files changed, 912 insertions(+), 250 deletions(-) + create mode 100644 drivers/mmc/host/mmci_qcom_dml.c + create mode 100644 drivers/mmc/host/mmci_qcom_dml.h +Merging kgdb/kgdb-next (662bfa325be1 kernel/debug/debug_core.c: Logging clean-up) +$ git merge kgdb/kgdb-next +Merge made by the 'recursive' strategy. + kernel/debug/debug_core.c | 43 +++++++++++++++++++++---------------------- + 1 file changed, 21 insertions(+), 22 deletions(-) +Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1) +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next (90c25a429b62 md/raid5: fix init_stripe() inconsistencies) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + drivers/md/raid1.c | 2 +- + drivers/md/raid10.c | 10 ++++++---- + drivers/md/raid5.c | 6 ++---- + 3 files changed, 9 insertions(+), 9 deletions(-) +Merging mfd/for-mfd-next (6b84006621ac mfd: max77693: Improve support for the flash cell) +$ git merge mfd/for-mfd-next +Merge made by the 'recursive' strategy. + drivers/mfd/Kconfig | 4 +-- + drivers/mfd/arizona-core.c | 3 +- + drivers/mfd/arizona-irq.c | 4 +-- + drivers/mfd/da9052-i2c.c | 7 ---- + drivers/mfd/lpc_ich.c | 6 ++++ + drivers/mfd/max77693.c | 5 ++- + drivers/mfd/menelaus.c | 11 +++---- + drivers/mfd/rtsx_usb.c | 2 +- + drivers/mfd/twl6040.c | 1 + + drivers/mfd/wm5102-tables.c | 12 +++++-- + drivers/mfd/wm5110-tables.c | 6 ++-- + drivers/mfd/wm8994-irq.c | 2 ++ + drivers/mfd/wm8994-regmap.c | 4 +++ + include/linux/mfd/arizona/registers.h | 1 + + include/linux/mfd/max77693-private.h | 61 ++++++++++++++++++++++++++++++++++- + include/linux/mfd/max77693.h | 40 +++++++++++++++++++++++ + 16 files changed, 141 insertions(+), 28 deletions(-) +Merging backlight/for-backlight-next (964a1c4e0e22 backlight: generic_bl: Remove unused function) +$ git merge backlight/for-backlight-next +Auto-merging drivers/video/backlight/pwm_bl.c +Merge made by the 'recursive' strategy. + drivers/video/backlight/88pm860x_bl.c | 1 - + drivers/video/backlight/aat2870_bl.c | 1 - + drivers/video/backlight/adp5520_bl.c | 1 - + drivers/video/backlight/as3711_bl.c | 1 - + drivers/video/backlight/da903x_bl.c | 1 - + drivers/video/backlight/da9052_bl.c | 1 - + drivers/video/backlight/ep93xx_bl.c | 1 - + drivers/video/backlight/generic_bl.c | 18 ------------------ + drivers/video/backlight/gpio_backlight.c | 1 - + drivers/video/backlight/lm3533_bl.c | 1 - + drivers/video/backlight/lp8788_bl.c | 1 - + drivers/video/backlight/max8925_bl.c | 1 - + drivers/video/backlight/ot200_bl.c | 1 - + drivers/video/backlight/pandora_bl.c | 1 - + drivers/video/backlight/platform_lcd.c | 1 - + drivers/video/backlight/pwm_bl.c | 1 - + drivers/video/backlight/tps65217_bl.c | 1 - + drivers/video/backlight/wm831x_bl.c | 1 - + 18 files changed, 35 deletions(-) +Merging battery/master (5e37195f30cc ipaq_micro_battery: fix sparse non static symbol warning) +$ git merge battery/master +Already up-to-date. +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 (be92abea827b Merge branch '3.17/hdmi-infoframe' into for-next) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (3a4bd490bfbc Merge remote-tracking branches 'regulator/topic/rk808', 'regulator/topic/samsung', 'regulator/topic/sky81452' and 'regulator/topic/tps65910' into regulator-next) +$ git merge regulator/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regulator/da9211.txt | 63 ++ + .../devicetree/bindings/regulator/max77802.txt | 53 ++ + .../bindings/regulator/sky81452-regulator.txt | 16 + + .../devicetree/bindings/regulator/tps65090.txt | 4 +- + Documentation/power/regulator/consumer.txt | 7 +- + Documentation/power/regulator/design.txt | 8 +- + Documentation/power/regulator/machine.txt | 4 +- + Documentation/power/regulator/overview.txt | 6 +- + Documentation/power/regulator/regulator.txt | 6 +- + MAINTAINERS | 1 + + drivers/mfd/tps65910.c | 5 + + drivers/regulator/Kconfig | 49 +- + drivers/regulator/Makefile | 4 + + drivers/regulator/core.c | 137 +++-- + drivers/regulator/da9211-regulator.c | 176 +++++- + drivers/regulator/da9211-regulator.h | 7 +- + drivers/regulator/hi6421-regulator.c | 634 +++++++++++++++++++++ + drivers/regulator/max77802.c | 586 +++++++++++++++++++ + drivers/regulator/mc13892-regulator.c | 11 +- + drivers/regulator/rk808-regulator.c | 395 +++++++++++++ + drivers/regulator/s2mpa01.c | 144 ++--- + drivers/regulator/s2mps11.c | 269 +++------ + drivers/regulator/sky81452-regulator.c | 130 +++++ + drivers/regulator/tps65023-regulator.c | 3 - + drivers/regulator/tps65910-regulator.c | 13 +- + include/linux/mfd/samsung/core.h | 21 + + include/linux/mfd/samsung/s2mpa01.h | 12 - + include/linux/mfd/samsung/s2mps11.h | 9 - + include/linux/mfd/samsung/s2mps14.h | 10 - + include/linux/regulator/da9211.h | 9 +- + include/linux/regulator/driver.h | 10 +- + include/linux/regulator/machine.h | 1 + + 32 files changed, 2372 insertions(+), 431 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/da9211.txt + create mode 100644 Documentation/devicetree/bindings/regulator/max77802.txt + create mode 100644 Documentation/devicetree/bindings/regulator/sky81452-regulator.txt + create mode 100644 drivers/regulator/hi6421-regulator.c + create mode 100644 drivers/regulator/max77802.c + create mode 100644 drivers/regulator/rk808-regulator.c + create mode 100644 drivers/regulator/sky81452-regulator.c +Merging security/next (478d085524c5 Merge tag 'keys-next-20140805' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next) +$ git merge security/next +Already up-to-date. +Merging integrity/next (e27319cdf468 ima: provide double buffering for hash calculation) +$ git merge integrity/next +Resolved 'Documentation/kernel-parameters.txt' using previous resolution. +Resolved 'crypto/asymmetric_keys/x509_public_key.c' using previous resolution. +Resolved 'include/linux/key.h' using previous resolution. +Auto-merging include/linux/key.h +CONFLICT (content): Merge conflict in include/linux/key.h +Auto-merging crypto/asymmetric_keys/x509_public_key.c +CONFLICT (content): Merge conflict in crypto/asymmetric_keys/x509_public_key.c +Auto-merging Documentation/kernel-parameters.txt +CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1189b3531237] Merge remote-tracking branch 'integrity/next' +$ git diff -M --stat --summary HEAD^.. +Merging selinux/next (aa9e0de81b5b Merge tag 'v3.16' into next) +$ git merge selinux/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging lblnet/next (d8ec26d7f828 Linux 3.13) +$ git merge lblnet/next +Already up-to-date. +Merging watchdog/master (8083baba5e9c wdt: sunxi: Move restart code to the watchdog driver) +$ git merge watchdog/master +Merge made by the 'recursive' strategy. +Merging iommu/next (0fdb6739098d Merge branches 'iommu/fixes', 'arm/exynos' and 'x86/vt-d' into next) +$ git merge iommu/next +Merge made by the 'recursive' strategy. + drivers/iommu/dmar.c | 2 +- + drivers/iommu/exynos-iommu.c | 51 +++++++++++++++++++------------------ + drivers/iommu/intel_irq_remapping.c | 3 +-- + 3 files changed, 28 insertions(+), 28 deletions(-) +Merging dwmw2-iommu/master (1860e379875d Linux 3.15) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (9b936c960f22 drivers/vfio: Enable VFIO if EEH is not supported) +$ git merge vfio/next +Already up-to-date. +Merging osd/linux-next (ce5d36aac26c ore: Support for raid 6) +$ git merge osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next (5c050fb96380 docs: update the development process document) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging trivial/for-next (307b28b95ce9 genirq: fix reference in devm_request_threaded_irq comment) +$ git merge trivial/for-next +Auto-merging scripts/checkstack.pl +Auto-merging net/mac802154/wpan.c +Auto-merging lib/rhashtable.c +Auto-merging init/do_mounts.c +Auto-merging include/linux/pagemap.h +Auto-merging fs/btrfs/tree-log.c +Auto-merging drivers/i2c/busses/i2c-s3c2410.c +Auto-merging drivers/gpu/drm/i915/intel_bios.c +Auto-merging arch/powerpc/platforms/pseries/hotplug-memory.c +Auto-merging Documentation/devicetree/bindings/video/atmel,lcdc.txt +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Auto-merging Documentation/devicetree/bindings/mtd/gpmc-nand.txt +Auto-merging Documentation/devicetree/bindings/mfd/s2mps11.txt +Auto-merging Documentation/devicetree/bindings/clock/arm-integrator.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-net | 2 +- + Documentation/CodingStyle | 2 +- + Documentation/block/null_blk.txt | 4 ++-- + Documentation/block/queue-sysfs.txt | 6 +++--- + Documentation/devicetree/bindings/clock/arm-integrator.txt | 2 +- + Documentation/devicetree/bindings/crypto/fsl-sec6.txt | 2 +- + Documentation/devicetree/bindings/iio/adc/vf610-adc.txt | 2 +- + Documentation/devicetree/bindings/mfd/s2mps11.txt | 2 +- + Documentation/devicetree/bindings/mtd/gpmc-nand.txt | 6 +++--- + Documentation/devicetree/bindings/net/samsung-sxgbe.txt | 2 +- + Documentation/devicetree/bindings/net/stmmac.txt | 2 +- + Documentation/devicetree/bindings/pci/host-generic-pci.txt | 2 +- + Documentation/devicetree/bindings/phy/phy-bindings.txt | 2 +- + Documentation/devicetree/bindings/power_supply/charger-manager.txt | 2 +- + Documentation/devicetree/bindings/sound/st,sta350.txt | 2 +- + Documentation/devicetree/bindings/vendor-prefixes.txt | 2 +- + Documentation/devicetree/bindings/video/atmel,lcdc.txt | 4 ++-- + Documentation/devicetree/bindings/video/fsl,imx-fb.txt | 2 +- + Documentation/kmemleak.txt | 2 +- + Documentation/lockup-watchdogs.txt | 2 +- + Documentation/mips/AU1xxx_IDE.README | 2 +- + Documentation/serial/serial-rs485.txt | 2 +- + arch/blackfin/mach-common/ints-priority.c | 2 +- + arch/powerpc/boot/simpleboot.c | 2 +- + arch/powerpc/platforms/pseries/hotplug-memory.c | 4 ++-- + drivers/block/paride/pcd.c | 4 ++-- + drivers/gpu/drm/i915/intel_bios.c | 2 +- + drivers/i2c/busses/i2c-s3c2410.c | 2 +- + drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c | 2 +- + drivers/media/i2c/cx25840/cx25840-ir.c | 2 +- + drivers/media/pci/cx23885/cx23888-ir.c | 2 +- + drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c | 2 +- + drivers/net/bonding/bond_sysfs_slave.c | 2 +- + drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c | 2 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 2 +- + drivers/net/wireless/libertas_tf/main.c | 2 +- + drivers/scsi/aic7xxx/Kconfig.aic79xx | 2 +- + drivers/scsi/nsp32.c | 2 +- + drivers/scsi/pcmcia/nsp_cs.c | 2 +- + drivers/scsi/qla2xxx/qla_nx2.c | 2 +- + fs/btrfs/tree-log.c | 3 ++- + fs/stack.c | 2 +- + include/linux/pagemap.h | 2 +- + include/linux/percpu-refcount.h | 2 +- + init/do_mounts.c | 3 ++- + kernel/irq/devres.c | 2 +- + lib/rhashtable.c | 4 ++-- + net/mac802154/wpan.c | 2 +- + net/rds/af_rds.c | 2 +- + scripts/checkstack.pl | 7 +++++-- + 50 files changed, 65 insertions(+), 60 deletions(-) +Merging audit/master (451fd72219dd Merge tag 'pwm/for-3.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm) +$ git merge audit/master +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 (a9ecdc0fdc54 of/irq: Fix lookup to use 'interrupts-extended' property first) +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging dt-rh/for-next (99de64984c3a OF: fix of_find_node_by_path() assumption that of_allnodes is root) +$ git merge dt-rh/for-next +Already up-to-date. +Merging spi/for-next (f256a7b37b54 Merge remote-tracking branches 'spi/topic/pxa2xx', 'spi/topic/rspi' and 'spi/topic/xilinx' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/spi/sh-msiof.txt | 23 +- + .../devicetree/bindings/spi/spi-fsl-dspi.txt | 7 +- + Documentation/devicetree/bindings/spi/spi-rspi.txt | 10 +- + drivers/spi/Kconfig | 8 +- + drivers/spi/Makefile | 1 + + drivers/spi/spi-au1550.c | 2 +- + drivers/spi/spi-bcm53xx.c | 295 +++++++++++++++++++++ + drivers/spi/spi-bcm53xx.h | 72 +++++ + drivers/spi/spi-cadence.c | 1 - + drivers/spi/spi-davinci.c | 16 +- + drivers/spi/spi-dw-pci.c | 2 + + drivers/spi/spi-dw.c | 2 +- + drivers/spi/spi-fsl-dspi.c | 3 - + drivers/spi/spi-omap-100k.c | 4 - + drivers/spi/spi-omap2-mcspi.c | 3 +- + drivers/spi/spi-pxa2xx-pci.c | 20 +- + drivers/spi/spi-pxa2xx.c | 1 + + drivers/spi/spi-rockchip.c | 2 +- + drivers/spi/spi-rspi.c | 149 +++++++---- + drivers/spi/spi-sh-msiof.c | 106 +++++--- + drivers/spi/spi-xilinx.c | 1 - + drivers/spi/spi.c | 45 ++-- + include/linux/spi/spi.h | 7 + + 23 files changed, 632 insertions(+), 148 deletions(-) + create mode 100644 drivers/spi/spi-bcm53xx.c + create mode 100644 drivers/spi/spi-bcm53xx.h +Merging tip/auto-latest (1fa0c237b921 Merge branch 'x86/uv') +$ git merge tip/auto-latest +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sched/core.c +Auto-merging drivers/gpu/drm/drm_modeset_lock.c +Auto-merging MAINTAINERS +Auto-merging Documentation/locking/spinlocks.txt +Auto-merging Documentation/locking/mutex-design.txt +Auto-merging Documentation/locking/lockstat.txt +Merge made by the 'recursive' strategy. + Documentation/00-INDEX | 2 + + Documentation/DocBook/kernel-locking.tmpl | 2 +- + Documentation/{ => locking}/lockdep-design.txt | 0 + Documentation/{ => locking}/lockstat.txt | 2 +- + Documentation/{ => locking}/mutex-design.txt | 6 +- + Documentation/{ => locking}/rt-mutex-design.txt | 0 + Documentation/{ => locking}/rt-mutex.txt | 0 + Documentation/{ => locking}/spinlocks.txt | 14 +- + Documentation/{ => locking}/ww-mutex-design.txt | 0 + MAINTAINERS | 4 +- + arch/alpha/include/asm/atomic.h | 213 +- + arch/arc/include/asm/atomic.h | 184 +- + arch/arm/include/asm/atomic.h | 305 +- + arch/arm64/include/asm/atomic.h | 197 +- + arch/avr32/include/asm/atomic.h | 123 +- + arch/cris/include/asm/atomic.h | 57 +- + arch/hexagon/include/asm/atomic.h | 68 +- + arch/ia64/include/asm/atomic.h | 188 +- + arch/m32r/include/asm/atomic.h | 143 +- + arch/m68k/include/asm/atomic.h | 109 +- + arch/metag/include/asm/atomic_lnkget.h | 121 +- + arch/metag/include/asm/atomic_lock1.h | 76 +- + arch/mips/include/asm/atomic.h | 557 ++-- + arch/mn10300/include/asm/atomic.h | 125 +- + arch/parisc/include/asm/atomic.h | 113 +- + arch/powerpc/include/asm/atomic.h | 198 +- + arch/sh/include/asm/atomic-grb.h | 119 +- + arch/sh/include/asm/atomic-irq.h | 62 +- + arch/sh/include/asm/atomic-llsc.h | 101 +- + arch/sparc/include/asm/atomic_32.h | 17 +- + arch/sparc/include/asm/atomic_64.h | 45 +- + arch/sparc/kernel/smp_64.c | 2 +- + arch/sparc/lib/atomic32.c | 29 +- + arch/sparc/lib/atomic_64.S | 163 +- + arch/sparc/lib/ksyms.c | 25 +- + arch/x86/include/asm/atomic.h | 15 - + arch/x86/include/asm/microcode_intel.h | 2 +- + arch/x86/include/asm/perf_event.h | 8 + + arch/x86/include/uapi/asm/e820.h | 5 - + arch/x86/kernel/apic/io_apic.c | 15 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 2 - + arch/x86/kernel/cpu/Makefile | 4 +- + arch/x86/kernel/cpu/microcode/amd_early.c | 2 +- + arch/x86/kernel/cpu/microcode/intel.c | 4 +- + arch/x86/kernel/cpu/microcode/intel_early.c | 10 +- + arch/x86/kernel/cpu/perf_event.c | 2 +- + arch/x86/kernel/cpu/perf_event.h | 48 +- + arch/x86/kernel/cpu/perf_event_intel.c | 53 +- + arch/x86/kernel/cpu/perf_event_intel_ds.c | 183 +- + arch/x86/kernel/cpu/perf_event_intel_uncore.c | 3269 +------------------- + arch/x86/kernel/cpu/perf_event_intel_uncore.h | 437 +-- + .../x86/kernel/cpu/perf_event_intel_uncore_nhmex.c | 1221 ++++++++ + arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c | 603 ++++ + .../x86/kernel/cpu/perf_event_intel_uncore_snbep.c | 1645 ++++++++++ + arch/x86/kernel/irqinit.c | 2 +- + arch/x86/kernel/kprobes/opt.c | 4 +- + arch/x86/kernel/time.c | 2 + + arch/xtensa/include/asm/atomic.h | 233 +- + drivers/gpu/drm/drm_modeset_lock.c | 2 +- + fs/timerfd.c | 3 +- + include/asm-generic/atomic.h | 192 +- + include/asm-generic/atomic64.h | 20 +- + include/linux/atomic.h | 36 - + include/linux/bitops.h | 20 - + include/linux/jump_label.h | 17 +- + include/linux/lockdep.h | 12 +- + include/linux/mutex.h | 4 +- + include/linux/perf_event.h | 14 +- + include/linux/rwsem.h | 2 +- + include/linux/spinlock.h | 8 +- + kernel/events/core.c | 135 +- + kernel/irq/chip.c | 1 + + kernel/locking/lockdep.c | 6 + + kernel/locking/mcs_spinlock.h | 3 - + kernel/locking/mutex.c | 416 +-- + kernel/locking/mutex.h | 2 +- + kernel/locking/rtmutex.c | 2 +- + kernel/sched/auto_group.c | 5 +- + kernel/sched/core.c | 155 +- + kernel/sched/cputime.c | 10 +- + kernel/sched/deadline.c | 15 +- + kernel/sched/debug.c | 6 +- + kernel/sched/fair.c | 268 +- + kernel/sched/rt.c | 16 +- + kernel/sched/sched.h | 15 +- + kernel/sched/stop_task.c | 2 +- + kernel/time/tick-sched.c | 8 + + kernel/watchdog.c | 10 +- + lib/Kconfig.debug | 4 +- + lib/atomic64.c | 83 +- + lib/locking-selftest.c | 56 +- + tools/perf/Documentation/perf-report.txt | 2 +- + tools/perf/Documentation/perf-top.txt | 6 + + tools/perf/Makefile.perf | 3 + + tools/perf/arch/arm64/include/perf_regs.h | 2 + + tools/perf/arch/common.c | 9 + + tools/perf/arch/powerpc/util/skip-callchain-idx.c | 1 + + tools/perf/builtin-annotate.c | 77 +- + tools/perf/builtin-buildid-cache.c | 44 +- + tools/perf/builtin-diff.c | 4 +- + tools/perf/builtin-help.c | 20 +- + tools/perf/builtin-inject.c | 33 +- + tools/perf/builtin-kmem.c | 56 +- + tools/perf/builtin-kvm.c | 47 +- + tools/perf/builtin-lock.c | 5 +- + tools/perf/builtin-mem.c | 4 +- + tools/perf/builtin-probe.c | 5 +- + tools/perf/builtin-record.c | 10 +- + tools/perf/builtin-report.c | 19 +- + tools/perf/builtin-sched.c | 9 +- + tools/perf/builtin-script.c | 72 +- + tools/perf/builtin-stat.c | 2 +- + tools/perf/builtin-timechart.c | 6 +- + tools/perf/builtin-top.c | 73 +- + tools/perf/builtin-trace.c | 42 +- + tools/perf/config/Makefile | 40 +- + tools/perf/config/feature-checks/Makefile | 18 +- + tools/perf/perf.c | 10 +- + tools/perf/tests/builtin-test.c | 10 +- + tools/perf/tests/mmap-basic.c | 7 +- + tools/perf/tests/open-syscall-all-cpus.c | 5 +- + tools/perf/tests/open-syscall-tp-fields.c | 7 +- + tools/perf/tests/open-syscall.c | 3 +- + tools/perf/tests/perf-record.c | 13 +- + tools/perf/tests/rdpmc.c | 6 +- + tools/perf/tests/sw-clock.c | 6 +- + tools/perf/tests/switch-tracking.c | 572 ++++ + tools/perf/tests/task-exit.c | 6 +- + tools/perf/tests/tests.h | 1 + + tools/perf/ui/browsers/hists.c | 387 +-- + tools/perf/ui/gtk/hists.c | 18 +- + tools/perf/ui/hist.c | 284 +- + tools/perf/ui/stdio/hist.c | 4 +- + tools/perf/util/annotate.c | 21 +- + tools/perf/util/cache.h | 1 + + tools/perf/util/callchain.c | 95 +- + tools/perf/util/cloexec.c | 35 +- + tools/perf/util/color.c | 16 + + tools/perf/util/color.h | 1 + + tools/perf/util/comm.c | 7 +- + tools/perf/util/comm.h | 6 +- + tools/perf/util/config.c | 24 + + tools/perf/util/data.c | 8 +- + tools/perf/util/debug.c | 36 +- + tools/perf/util/debug.h | 11 + + tools/perf/util/dso.c | 36 +- + tools/perf/util/event.c | 6 +- + tools/perf/util/event.h | 2 + + tools/perf/util/evlist.c | 131 +- + tools/perf/util/evlist.h | 5 + + tools/perf/util/evsel.c | 56 +- + tools/perf/util/evsel.h | 2 + + tools/perf/util/hist.c | 22 + + tools/perf/util/hist.h | 18 +- + tools/perf/util/machine.c | 71 +- + tools/perf/util/machine.h | 21 + + tools/perf/util/map.c | 1 + + tools/perf/util/ordered-events.c | 245 ++ + tools/perf/util/ordered-events.h | 51 + + tools/perf/util/parse-events.c | 5 +- + tools/perf/util/pmu.c | 4 +- + tools/perf/util/pmu.h | 6 +- + tools/perf/util/probe-event.c | 169 +- + tools/perf/util/probe-finder.c | 7 +- + tools/perf/util/record.c | 40 +- + tools/perf/util/run-command.c | 9 +- + .../perf/util/scripting-engines/trace-event-perl.c | 6 + + .../util/scripting-engines/trace-event-python.c | 120 +- + tools/perf/util/session.c | 298 +- + tools/perf/util/session.h | 30 +- + tools/perf/util/sort.c | 82 +- + tools/perf/util/sort.h | 1 + + tools/perf/util/symbol-elf.c | 9 +- + tools/perf/util/symbol.c | 34 +- + tools/perf/util/symbol.h | 13 +- + tools/perf/util/thread.c | 24 +- + tools/perf/util/thread.h | 10 +- + tools/perf/util/tool.h | 2 +- + tools/perf/util/trace-event-scripting.c | 7 + + tools/perf/util/trace-event.h | 1 + + tools/perf/util/util.c | 54 +- + tools/perf/util/util.h | 19 + + 182 files changed, 8873 insertions(+), 7640 deletions(-) + rename Documentation/{ => locking}/lockdep-design.txt (100%) + rename Documentation/{ => locking}/lockstat.txt (99%) + rename Documentation/{ => locking}/mutex-design.txt (97%) + rename Documentation/{ => locking}/rt-mutex-design.txt (100%) + rename Documentation/{ => locking}/rt-mutex.txt (100%) + rename Documentation/{ => locking}/spinlocks.txt (98%) + rename Documentation/{ => locking}/ww-mutex-design.txt (100%) + create mode 100644 arch/x86/kernel/cpu/perf_event_intel_uncore_nhmex.c + create mode 100644 arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c + create mode 100644 arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c + create mode 100644 tools/perf/tests/switch-tracking.c + create mode 100644 tools/perf/util/ordered-events.c + create mode 100644 tools/perf/util/ordered-events.h +Merging clockevents/clockevents/next (3252a646aa2c clocksource: exynos_mct: Only use 32-bits where possible) +$ git merge clockevents/clockevents/next +Already up-to-date. +Merging edac/linux_next (50d1bb93672f sb_edac: add support for Haswell based systems) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (eba4bfb34d45 EDAC, MCE, AMD: Add MCE decoding for F15h M60h) +$ git merge edac-amd/for-next +Already up-to-date. +Merging irqchip/irqchip/for-next (289eb96601f3 Merge branch 'irqchip/core' into irqchip/for-next) +$ git merge irqchip/irqchip/for-next +Merge made by the 'recursive' strategy. + .../interrupt-controller/ti,keystone-irq.txt | 36 ++ + drivers/irqchip/Kconfig | 7 + + drivers/irqchip/Makefile | 2 + + drivers/irqchip/irq-crossbar.c | 4 +- + drivers/irqchip/irq-gic-common.c | 15 +- + drivers/irqchip/irq-gic-v3.c | 36 +- + drivers/irqchip/irq-gic.c | 46 ++- + drivers/irqchip/irq-hip04.c | 424 +++++++++++++++++++++ + drivers/irqchip/irq-keystone.c | 232 +++++++++++ + drivers/irqchip/irq-renesas-intc-irqpin.c | 4 +- + include/linux/irqchip/arm-gic.h | 16 + + 11 files changed, 780 insertions(+), 42 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,keystone-irq.txt + create mode 100644 drivers/irqchip/irq-hip04.c + create mode 100644 drivers/irqchip/irq-keystone.c +Merging ftrace/for-next (4ce97dbf5024 trace: Fix epoll hang when we race with new entries) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (11ed7f934cb8 rcu: Make nocb leader kthreads process pending callbacks after spawning) +$ git merge rcu/rcu/next +Merge made by the 'recursive' strategy. + kernel/rcu/tree.h | 2 +- + kernel/rcu/tree_plugin.h | 22 +++++++++++----------- + 2 files changed, 12 insertions(+), 12 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 (54ad89b05ec4 kvm: x86: fix tracing for 32-bit) +$ git merge kvm/linux-next +Merge made by the 'recursive' strategy. + arch/arm/kvm/arm.c | 4 ++ + arch/mips/kvm/mips.c | 4 ++ + arch/powerpc/kvm/powerpc.c | 4 ++ + arch/s390/kvm/kvm-s390.c | 17 ++--- + arch/s390/mm/pgtable.c | 10 +++ + arch/x86/include/asm/kvm_host.h | 3 +- + arch/x86/kvm/cpuid.c | 4 +- + arch/x86/kvm/emulate.c | 15 +++-- + arch/x86/kvm/lapic.c | 30 +++++---- + arch/x86/kvm/pmu.c | 24 ++++--- + arch/x86/kvm/svm.c | 7 +- + arch/x86/kvm/trace.h | 30 +++++++++ + arch/x86/kvm/vmx.c | 142 +++++++++++++++++++++++++++++++++++----- + arch/x86/kvm/x86.c | 33 +++++++++- + include/linux/kvm_host.h | 2 + + virt/kvm/kvm_main.c | 5 +- + 16 files changed, 272 insertions(+), 62 deletions(-) +Merging kvm-arm/next (7b46268d2954 KVM: trace kvm_ple_window grow/shrink) +$ git merge kvm-arm/next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (c77dcacb3975 KVM: Move more code under CONFIG_HAVE_KVM_IRQFD) +$ 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 (e38230eb3789 xen/pciback: Remove tons of dereferences) +$ git merge xen-tip/linux-next +Auto-merging include/linux/device.h +Auto-merging drivers/xen/xen-pciback/pci_stub.c +Merge made by the 'recursive' strategy. + drivers/xen/xen-pciback/passthrough.c | 14 +++++++++--- + drivers/xen/xen-pciback/pci_stub.c | 42 +++++++++++++++++++---------------- + drivers/xen/xen-pciback/pciback.h | 7 +++--- + drivers/xen/xen-pciback/vpci.c | 14 +++++++++--- + drivers/xen/xen-pciback/xenbus.c | 4 ++-- + include/linux/device.h | 5 +++++ + 6 files changed, 56 insertions(+), 30 deletions(-) +Merging percpu/for-next (9734c78e3b96 Merge branch 'for-3.18-consistent-ops' into for-next) +$ git merge percpu/for-next +Auto-merging net/ipv6/syncookies.c +Auto-merging net/ipv4/syncookies.c +Auto-merging net/core/dev.c +Auto-merging kernel/watchdog.c +Auto-merging kernel/time/tick-sched.c +Auto-merging kernel/sched/sched.h +Auto-merging kernel/printk/printk.c +Auto-merging kernel/irq/chip.c +Auto-merging kernel/events/core.c +Auto-merging fs/ext4/mballoc.c +Auto-merging drivers/irqchip/irq-gic.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx.c +Auto-merging arch/x86/kvm/svm.c +Auto-merging arch/x86/kernel/cpu/perf_event_intel_ds.c +Auto-merging arch/x86/kernel/cpu/perf_event_intel.c +Auto-merging arch/x86/kernel/cpu/perf_event.c +Auto-merging arch/tile/mm/init.c +Auto-merging arch/mips/kernel/perf_event_mipsxx.c +Auto-merging arch/blackfin/mach-common/ints-priority.c +Merge made by the 'recursive' strategy. + arch/alpha/kernel/perf_event.c | 16 +++++----- + arch/alpha/kernel/time.c | 6 ++-- + arch/arm/kernel/smp_twd.c | 12 ++++---- + arch/avr32/kernel/kprobes.c | 2 +- + arch/blackfin/include/asm/ipipe.h | 2 +- + arch/blackfin/kernel/perf_event.c | 10 +++---- + arch/blackfin/mach-common/ints-priority.c | 8 ++--- + arch/blackfin/mach-common/smp.c | 2 +- + arch/ia64/include/asm/hw_irq.h | 2 +- + arch/ia64/include/asm/sn/arch.h | 4 +-- + arch/ia64/include/asm/sn/nodepda.h | 2 +- + arch/ia64/include/asm/switch_to.h | 2 +- + arch/ia64/include/asm/uv/uv_hub.h | 2 +- + arch/ia64/kernel/irq.c | 2 +- + arch/ia64/kernel/irq_ia64.c | 4 +-- + arch/ia64/kernel/kprobes.c | 6 ++-- + arch/ia64/kernel/mca.c | 16 +++++----- + arch/ia64/kernel/process.c | 6 ++-- + arch/ia64/kernel/traps.c | 2 +- + arch/ia64/sn/kernel/sn2/sn2_smp.c | 28 +++++++++--------- + arch/metag/kernel/perf/perf_event.c | 14 ++++----- + arch/mips/cavium-octeon/octeon-irq.c | 30 +++++++++---------- + arch/mips/include/asm/fpu_emulator.h | 24 +++++++-------- + arch/mips/kernel/kprobes.c | 6 ++-- + arch/mips/kernel/perf_event_mipsxx.c | 14 ++++----- + arch/mips/kernel/smp-bmips.c | 2 +- + arch/mips/loongson/loongson-3/smp.c | 6 ++-- + arch/powerpc/include/asm/cputime.h | 6 ++-- + arch/s390/include/asm/cputime.h | 2 +- + arch/s390/include/asm/irq.h | 2 +- + arch/s390/include/asm/percpu.h | 16 +++++----- + arch/s390/kernel/irq.c | 2 +- + arch/s390/kernel/kprobes.c | 8 ++--- + arch/s390/kernel/nmi.c | 10 +++++-- + arch/s390/kernel/perf_cpum_cf.c | 22 +++++++------- + arch/s390/kernel/perf_cpum_sf.c | 16 +++++----- + arch/s390/kernel/processor.c | 4 +-- + arch/s390/kernel/time.c | 6 ++-- + arch/s390/kernel/vtime.c | 2 +- + arch/s390/oprofile/hwsampler.c | 2 +- + arch/sparc/include/asm/cpudata_32.h | 2 +- + arch/sparc/include/asm/cpudata_64.h | 2 +- + arch/sparc/kernel/kprobes.c | 6 ++-- + arch/sparc/kernel/leon_smp.c | 2 +- + arch/sparc/kernel/nmi.c | 16 +++++----- + arch/sparc/kernel/pci_sun4v.c | 8 ++--- + arch/sparc/kernel/perf_event.c | 26 ++++++++-------- + arch/sparc/kernel/sun4d_smp.c | 2 +- + arch/sparc/kernel/time_64.c | 2 +- + arch/sparc/mm/tlb.c | 4 +-- + arch/tile/include/asm/irqflags.h | 4 +-- + arch/tile/include/asm/mmu_context.h | 6 ++-- + arch/tile/kernel/irq.c | 14 ++++----- + arch/tile/kernel/messaging.c | 4 +-- + arch/tile/kernel/perf_event.c | 12 ++++---- + arch/tile/kernel/process.c | 2 +- + arch/tile/kernel/setup.c | 3 +- + arch/tile/kernel/single_step.c | 4 +-- + arch/tile/kernel/smp.c | 2 +- + arch/tile/kernel/smpboot.c | 6 ++-- + arch/tile/kernel/time.c | 8 ++--- + arch/tile/mm/highmem.c | 2 +- + arch/tile/mm/init.c | 4 +-- + arch/x86/include/asm/debugreg.h | 4 +-- + arch/x86/include/asm/uv/uv_hub.h | 12 ++++---- + arch/x86/kernel/apb_timer.c | 4 +-- + arch/x86/kernel/apic/apic.c | 4 +-- + arch/x86/kernel/cpu/common.c | 6 ++-- + arch/x86/kernel/cpu/mcheck/mce-inject.c | 6 ++-- + arch/x86/kernel/cpu/mcheck/mce.c | 46 ++++++++++++++--------------- + arch/x86/kernel/cpu/mcheck/mce_amd.c | 2 +- + arch/x86/kernel/cpu/mcheck/mce_intel.c | 22 +++++++------- + arch/x86/kernel/cpu/perf_event.c | 22 +++++++------- + arch/x86/kernel/cpu/perf_event_amd.c | 4 +-- + arch/x86/kernel/cpu/perf_event_intel.c | 18 +++++------ + arch/x86/kernel/cpu/perf_event_intel_ds.c | 20 ++++++------- + arch/x86/kernel/cpu/perf_event_intel_lbr.c | 12 ++++---- + arch/x86/kernel/cpu/perf_event_intel_rapl.c | 12 ++++---- + arch/x86/kernel/cpu/perf_event_knc.c | 2 +- + arch/x86/kernel/cpu/perf_event_p4.c | 6 ++-- + arch/x86/kernel/hw_breakpoint.c | 8 ++--- + arch/x86/kernel/irq_64.c | 6 ++-- + arch/x86/kernel/kvm.c | 22 +++++++------- + arch/x86/kvm/svm.c | 6 ++-- + arch/x86/kvm/vmx.c | 10 +++---- + arch/x86/kvm/x86.c | 2 +- + arch/x86/mm/kmemcheck/kmemcheck.c | 14 ++++----- + arch/x86/oprofile/nmi_int.c | 8 ++--- + arch/x86/platform/uv/uv_nmi.c | 40 ++++++++++++------------- + arch/x86/platform/uv/uv_time.c | 2 +- + arch/x86/xen/enlighten.c | 4 +-- + arch/x86/xen/multicalls.c | 8 ++--- + arch/x86/xen/spinlock.c | 2 +- + arch/x86/xen/time.c | 10 +++---- + drivers/char/random.c | 2 +- + drivers/clocksource/dummy_timer.c | 2 +- + drivers/clocksource/metag_generic.c | 2 +- + drivers/clocksource/qcom-timer.c | 2 +- + drivers/cpuidle/governors/ladder.c | 4 +-- + drivers/cpuidle/governors/menu.c | 6 ++-- + drivers/irqchip/irq-gic.c | 10 +++---- + drivers/md/dm-stats.c | 2 +- + drivers/net/ethernet/tile/tilegx.c | 22 +++++++------- + drivers/net/ethernet/tile/tilepro.c | 8 ++--- + drivers/oprofile/cpu_buffer.c | 10 +++---- + drivers/oprofile/timer_int.c | 2 +- + drivers/s390/cio/ccwreq.c | 2 +- + drivers/s390/cio/chsc_sch.c | 2 +- + drivers/s390/cio/cio.c | 6 ++-- + drivers/s390/cio/device_fsm.c | 4 +-- + drivers/s390/cio/eadm_sch.c | 2 +- + fs/ext4/mballoc.c | 2 +- + include/linux/kernel_stat.h | 4 +-- + include/linux/percpu-defs.h | 3 -- + include/net/netfilter/nf_conntrack.h | 2 +- + include/net/snmp.h | 6 ++-- + kernel/events/callchain.c | 4 +-- + kernel/events/core.c | 24 +++++++-------- + kernel/irq/chip.c | 2 +- + kernel/irq_work.c | 12 ++++---- + kernel/printk/printk.c | 4 +-- + kernel/sched/clock.c | 2 +- + kernel/sched/sched.h | 4 +-- + kernel/smp.c | 6 ++-- + kernel/softirq.c | 4 +-- + kernel/taskstats.c | 2 +- + kernel/time/hrtimer.c | 22 +++++++------- + kernel/time/tick-broadcast.c | 2 +- + kernel/time/tick-common.c | 6 ++-- + kernel/time/tick-oneshot.c | 2 +- + kernel/time/tick-sched.c | 24 +++++++-------- + kernel/time/timer.c | 2 +- + kernel/user-return-notifier.c | 4 +-- + kernel/watchdog.c | 12 ++++---- + mm/percpu-vm.c | 22 ++++++++++---- + mm/percpu.c | 2 ++ + net/core/dev.c | 14 ++++----- + net/core/drop_monitor.c | 2 +- + net/core/skbuff.c | 2 +- + net/ipv4/route.c | 4 +-- + net/ipv4/syncookies.c | 2 +- + net/ipv4/tcp.c | 2 +- + net/ipv4/tcp_output.c | 2 +- + net/ipv6/syncookies.c | 2 +- + net/rds/ib_rdma.c | 2 +- + 145 files changed, 563 insertions(+), 549 deletions(-) +Merging workqueues/for-next (ebb48ccd98d1 Merge branch 'for-3.17' into for-next) +$ git merge workqueues/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging drivers-x86/linux-next (770235f68ab6 platform/x86: Enable build support for toshiba_haps) +$ git merge drivers-x86/linux-next +Auto-merging drivers/platform/x86/toshiba_acpi.c +Merge made by the 'recursive' strategy. + drivers/platform/x86/toshiba_acpi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (1a2b9b19049b Merge remote-tracking branch 'regmap/topic/dt-endian' into regmap-next) +$ git merge regmap/for-next +Auto-merging drivers/base/regmap/regmap.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/base/regmap/Kconfig | 3 +++ + drivers/base/regmap/internal.h | 3 +++ + drivers/base/regmap/regcache-rbtree.c | 9 +++------ + drivers/base/regmap/regcache.c | 2 +- + drivers/base/regmap/regmap-debugfs.c | 3 +++ + drivers/base/regmap/regmap.c | 2 +- + 7 files changed, 15 insertions(+), 8 deletions(-) +Merging hsi/for-next (3fd276e9c0d7 HSI: omap_ssi: Fix return value check in ssi_debug_add_ctrl()) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (3f6815f711ef leds: lp3944: fix sparse warning) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + drivers/leds/led-class.c | 16 ++++++++-------- + drivers/leds/led-core.c | 2 +- + drivers/leds/leds-lp3944.c | 3 ++- + include/linux/leds.h | 6 +++--- + 4 files changed, 14 insertions(+), 13 deletions(-) +Merging driver-core/driver-core-next (52addcf9d666 Linux 3.17-rc2) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (52addcf9d666 Linux 3.17-rc2) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (7d1311b93e58 Linux 3.17-rc1) +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (8913dc0bb913 usb: gadget: document a usb_ep_dequeue() requirement) +$ git merge usb-gadget/next +Resolved 'drivers/usb/phy/phy-samsung-usb.h' using previous resolution. +Auto-merging drivers/usb/phy/phy-samsung-usb.h +CONFLICT (content): Merge conflict in drivers/usb/phy/phy-samsung-usb.h +Auto-merging drivers/usb/phy/phy-msm-usb.c +Auto-merging drivers/usb/gadget/udc/r8a66597-udc.c +Auto-merging drivers/usb/gadget/function/uvc_video.c +Auto-merging drivers/usb/gadget/function/Makefile +Auto-merging drivers/usb/dwc3/dwc3-omap.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 52a53bec90f6] Merge remote-tracking branch 'usb-gadget/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/configfs-usb-gadget-uac1 | 12 + + Documentation/ABI/testing/configfs-usb-gadget-uac2 | 12 + + drivers/usb/dwc3/core.c | 9 +- + drivers/usb/dwc3/dwc3-exynos.c | 4 +- + drivers/usb/dwc3/dwc3-omap.c | 4 +- + drivers/usb/dwc3/dwc3-pci.c | 4 +- + drivers/usb/dwc3/gadget.c | 11 +- + drivers/usb/gadget/Kconfig | 6 + + drivers/usb/gadget/function/Makefile | 4 + + drivers/usb/gadget/function/f_uac1.c | 337 +++++++++++++++---- + drivers/usb/gadget/function/f_uac2.c | 359 ++++++++++++++------- + drivers/usb/gadget/function/f_uvc.c | 5 +- + drivers/usb/gadget/function/u_uac1.c | 38 +-- + drivers/usb/gadget/function/u_uac1.h | 31 +- + drivers/usb/gadget/function/u_uac2.h | 42 +++ + drivers/usb/gadget/function/uvc.h | 3 - + drivers/usb/gadget/function/uvc_queue.c | 2 +- + drivers/usb/gadget/function/uvc_v4l2.c | 2 +- + drivers/usb/gadget/function/uvc_video.c | 2 +- + drivers/usb/gadget/legacy/Kconfig | 2 + + drivers/usb/gadget/legacy/audio.c | 149 ++++++++- + drivers/usb/gadget/udc/r8a66597-udc.c | 4 +- + drivers/usb/phy/phy-msm-usb.c | 2 +- + drivers/usb/phy/phy-samsung-usb.h | 36 +-- + include/linux/usb/gadget.h | 9 +- + 25 files changed, 808 insertions(+), 281 deletions(-) + create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-uac1 + create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-uac2 + create mode 100644 drivers/usb/gadget/function/u_uac2.h +Merging usb-serial/usb-next (7d1311b93e58 Linux 3.17-rc1) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging staging/staging-next (e4a73e9c6198 drivers/staging/unisys: fix build) +$ git merge staging/staging-next +Removing drivers/staging/unisys/include/commontypes.h +Removing drivers/staging/rtl8188eu/include/odm_RegConfig8188E.h +Removing drivers/staging/rtl8188eu/include/HalHWImg8188E_RF.h +Removing drivers/staging/rtl8188eu/include/HalHWImg8188E_MAC.h +Removing drivers/staging/rtl8188eu/include/HalHWImg8188E_BB.h +Removing drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c +Removing drivers/staging/iio/frequency/ad9951.c +Removing drivers/staging/iio/frequency/ad9910.c +Removing drivers/staging/iio/frequency/ad9852.c +Removing drivers/staging/iio/frequency/ad9850.c +Removing drivers/staging/iio/frequency/ad5930.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-bus-iio-accel-bmc150 | 7 + + .../devicetree/bindings/arm/samsung/exynos-adc.txt | 18 +- + .../devicetree/bindings/iio/dac/max5821.txt | 14 + + MAINTAINERS | 14 + + drivers/iio/accel/Kconfig | 13 + + drivers/iio/accel/Makefile | 1 + + drivers/iio/accel/bmc150-accel.c | 1307 ++++++++++++++++++++ + drivers/iio/accel/kxcjk-1013.c | 294 ++++- + drivers/iio/adc/Kconfig | 22 +- + drivers/iio/adc/Makefile | 2 + + drivers/iio/adc/exynos_adc.c | 137 +- + drivers/iio/adc/rockchip_saradc.c | 317 +++++ + drivers/iio/adc/ti-adc128s052.c | 179 +++ + drivers/iio/adc/xilinx-xadc-core.c | 9 +- + drivers/iio/dac/Kconfig | 8 + + drivers/iio/dac/Makefile | 1 + + drivers/iio/dac/max5821.c | 405 ++++++ + drivers/iio/industrialio-buffer.c | 63 +- + drivers/iio/magnetometer/hid-sensor-magn-3d.c | 7 +- + drivers/staging/android/ion/ion.c | 2 +- + drivers/staging/android/ion/ion_carveout_heap.c | 1 - + drivers/staging/android/ion/ion_chunk_heap.c | 1 - + drivers/staging/android/ion/ion_dummy_driver.c | 4 +- + drivers/staging/android/ion/ion_system_heap.c | 1 - + drivers/staging/android/sw_sync.c | 2 + + drivers/staging/android/uapi/binder.h | 2 +- + drivers/staging/bcm/Bcmchar.c | 537 ++++---- + drivers/staging/bcm/vendorspecificextn.c | 19 +- + drivers/staging/comedi/Kconfig | 11 + + drivers/staging/comedi/drivers/8255.c | 198 +-- + drivers/staging/comedi/drivers/8255.h | 31 +- + drivers/staging/comedi/drivers/8255_pci.c | 29 +- + drivers/staging/comedi/drivers/Makefile | 1 + + .../comedi/drivers/addi-data/hwdrv_apci1564.c | 158 +-- + drivers/staging/comedi/drivers/addi_apci_1564.c | 20 +- + drivers/staging/comedi/drivers/adv_pci_dio.c | 4 +- + drivers/staging/comedi/drivers/aio_aio12_8.c | 3 +- + drivers/staging/comedi/drivers/amplc_dio200.c | 121 +- + drivers/staging/comedi/drivers/amplc_dio200.h | 34 +- + .../staging/comedi/drivers/amplc_dio200_common.c | 414 ++----- + drivers/staging/comedi/drivers/amplc_dio200_pci.c | 162 ++- + .../staging/comedi/drivers/amplc_pc236_common.c | 2 +- + drivers/staging/comedi/drivers/amplc_pci224.c | 661 ++++------ + drivers/staging/comedi/drivers/amplc_pci230.c | 162 ++- + drivers/staging/comedi/drivers/cb_pcidas.c | 10 +- + drivers/staging/comedi/drivers/cb_pcidas64.c | 29 +- + drivers/staging/comedi/drivers/cb_pcidda.c | 27 +- + drivers/staging/comedi/drivers/cb_pcimdas.c | 16 +- + drivers/staging/comedi/drivers/cb_pcimdda.c | 3 +- + drivers/staging/comedi/drivers/comedi_test.c | 8 +- + drivers/staging/comedi/drivers/daqboard2000.c | 13 +- + drivers/staging/comedi/drivers/das08.c | 3 +- + drivers/staging/comedi/drivers/das16.c | 3 +- + drivers/staging/comedi/drivers/das16m1.c | 2 +- + drivers/staging/comedi/drivers/ni_atmio16d.c | 2 +- + drivers/staging/comedi/drivers/ni_daq_dio24.c | 2 +- + drivers/staging/comedi/drivers/ni_labpc.c | 18 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 12 +- + drivers/staging/comedi/drivers/ni_usb6501.c | 425 +++++++ + drivers/staging/comedi/drivers/pcl724.c | 10 +- + drivers/staging/comedi/drivers/pcm3724.c | 27 +- + drivers/staging/dgap/dgap.c | 561 ++++----- + drivers/staging/dgap/dgap.h | 6 - + drivers/staging/dgnc/Makefile | 3 +- + drivers/staging/dgnc/TODO | 5 - + drivers/staging/dgnc/dgnc_cls.c | 9 +- + drivers/staging/dgnc/dgnc_driver.c | 304 ++--- + drivers/staging/dgnc/dgnc_driver.h | 13 - + drivers/staging/dgnc/dgnc_neo.c | 17 +- + drivers/staging/dgnc/dgnc_sysfs.c | 19 - + drivers/staging/dgnc/dgnc_tty.c | 17 +- + drivers/staging/dgnc/dgnc_utils.c | 70 ++ + drivers/staging/dgnc/dgnc_utils.h | 7 + + drivers/staging/iio/accel/adis16201_core.c | 5 +- + drivers/staging/iio/accel/adis16203_core.c | 2 + + drivers/staging/iio/accel/adis16204_core.c | 1 + + drivers/staging/iio/accel/adis16209_core.c | 1 + + drivers/staging/iio/accel/adis16240_core.c | 1 + + drivers/staging/iio/accel/lis3l02dq_core.c | 4 + + drivers/staging/iio/accel/lis3l02dq_ring.c | 1 + + drivers/staging/iio/accel/sca3000_core.c | 4 +- + drivers/staging/iio/frequency/Kconfig | 35 - + drivers/staging/iio/frequency/Makefile | 5 - + drivers/staging/iio/frequency/ad5930.c | 140 --- + drivers/staging/iio/frequency/ad9850.c | 120 -- + drivers/staging/iio/frequency/ad9852.c | 253 ---- + drivers/staging/iio/frequency/ad9910.c | 371 ------ + drivers/staging/iio/frequency/ad9951.c | 209 ---- + drivers/staging/iio/gyro/adis16060_core.c | 1 + + drivers/staging/iio/impedance-analyzer/ad5933.c | 10 +- + drivers/staging/iio/light/isl29018.c | 2 +- + drivers/staging/iio/magnetometer/hmc5843_core.c | 6 +- + drivers/staging/iio/resolver/ad2s1210.c | 4 +- + drivers/staging/imx-drm/imx-drm-core.c | 5 +- + drivers/staging/imx-drm/imx-tve.c | 2 + + drivers/staging/imx-drm/parallel-display.c | 2 + + drivers/staging/lustre/lnet/lnet/config.c | 59 +- + drivers/staging/lustre/lustre/fid/fid_request.c | 6 +- + drivers/staging/lustre/lustre/fld/fld_cache.c | 16 +- + drivers/staging/lustre/lustre/fld/fld_internal.h | 2 +- + drivers/staging/lustre/lustre/fld/fld_request.c | 9 +- + drivers/staging/lustre/lustre/include/cl_object.h | 4 +- + drivers/staging/lustre/lustre/include/lclient.h | 2 +- + .../lustre/lustre/include/linux/obd_class.h | 6 +- + drivers/staging/lustre/lustre/include/lu_object.h | 6 +- + .../lustre/lustre/include/lustre/lustre_idl.h | 124 +- + .../lustre/lustre/include/lustre/lustre_user.h | 23 +- + drivers/staging/lustre/lustre/include/lustre_fid.h | 2 +- + drivers/staging/lustre/lustre/include/lustre_fld.h | 5 +- + drivers/staging/lustre/lustre/include/lustre_lib.h | 8 +- + .../staging/lustre/lustre/include/lustre_lite.h | 2 +- + drivers/staging/lustre/lustre/include/md_object.h | 2 +- + drivers/staging/lustre/lustre/include/obd.h | 50 +- + drivers/staging/lustre/lustre/include/obd_cksum.h | 6 +- + drivers/staging/lustre/lustre/include/obd_class.h | 24 +- + drivers/staging/lustre/lustre/include/obd_ost.h | 2 +- + .../staging/lustre/lustre/include/obd_support.h | 1 + + drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 4 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 50 +- + drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 15 +- + drivers/staging/lustre/lustre/libcfs/debug.c | 11 +- + drivers/staging/lustre/lustre/llite/dir.c | 4 +- + drivers/staging/lustre/lustre/llite/file.c | 48 +- + .../staging/lustre/lustre/llite/llite_internal.h | 10 +- + drivers/staging/lustre/lustre/llite/llite_lib.c | 2 +- + drivers/staging/lustre/lustre/llite/llite_mmap.c | 8 +- + drivers/staging/lustre/lustre/llite/llite_rmtacl.c | 2 +- + drivers/staging/lustre/lustre/llite/lloop.c | 2 +- + drivers/staging/lustre/lustre/llite/remote_perm.c | 2 +- + drivers/staging/lustre/lustre/llite/vvp_io.c | 1 + + drivers/staging/lustre/lustre/lmv/lmv_fld.c | 2 +- + drivers/staging/lustre/lustre/lmv/lmv_internal.h | 10 +- + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 16 +- + .../staging/lustre/lustre/lov/lov_cl_internal.h | 4 +- + drivers/staging/lustre/lustre/lov/lov_ea.c | 8 +- + drivers/staging/lustre/lustre/lov/lov_internal.h | 28 +- + drivers/staging/lustre/lustre/lov/lov_io.c | 8 +- + drivers/staging/lustre/lustre/lov/lov_lock.c | 24 +- + drivers/staging/lustre/lustre/lov/lov_merge.c | 14 +- + drivers/staging/lustre/lustre/lov/lov_obd.c | 44 +- + drivers/staging/lustre/lustre/lov/lov_offset.c | 29 +- + drivers/staging/lustre/lustre/lov/lov_pack.c | 4 +- + drivers/staging/lustre/lustre/lov/lov_page.c | 2 +- + drivers/staging/lustre/lustre/lov/lov_request.c | 18 +- + drivers/staging/lustre/lustre/lov/lovsub_dev.c | 2 +- + drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 10 +- + drivers/staging/lustre/lustre/mdc/mdc_internal.h | 4 +- + drivers/staging/lustre/lustre/mdc/mdc_lib.c | 48 +- + drivers/staging/lustre/lustre/mdc/mdc_locks.c | 71 +- + drivers/staging/lustre/lustre/mdc/mdc_reint.c | 8 +- + drivers/staging/lustre/lustre/mdc/mdc_request.c | 97 +- + drivers/staging/lustre/lustre/mgc/mgc_request.c | 4 +- + drivers/staging/lustre/lustre/obdclass/cl_io.c | 9 +- + .../lustre/lustre/obdclass/linux/linux-obdo.c | 8 +- + drivers/staging/lustre/lustre/obdclass/llog_swab.c | 52 +- + .../staging/lustre/lustre/obdclass/local_storage.c | 2 +- + drivers/staging/lustre/lustre/obdclass/obdo.c | 12 +- + drivers/staging/lustre/lustre/obdecho/echo.c | 21 +- + .../staging/lustre/lustre/obdecho/echo_client.c | 58 +- + drivers/staging/lustre/lustre/osc/lproc_osc.c | 2 +- + drivers/staging/lustre/lustre/osc/osc_cache.c | 2 +- + .../staging/lustre/lustre/osc/osc_cl_internal.h | 2 +- + drivers/staging/lustre/lustre/osc/osc_internal.h | 6 +- + drivers/staging/lustre/lustre/osc/osc_io.c | 2 +- + drivers/staging/lustre/lustre/osc/osc_quota.c | 8 +- + drivers/staging/lustre/lustre/osc/osc_request.c | 46 +- + drivers/staging/lustre/lustre/ptlrpc/client.c | 14 +- + drivers/staging/lustre/lustre/ptlrpc/connection.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/import.c | 15 +- + drivers/staging/lustre/lustre/ptlrpc/layout.c | 4 +- + .../staging/lustre/lustre/ptlrpc/pack_generic.c | 6 +- + drivers/staging/mt29f_spinand/mt29f_spinand.c | 26 +- + drivers/staging/nokia_h4p/nokia_core.c | 2 +- + drivers/staging/nokia_h4p/nokia_fw.c | 2 - + drivers/staging/ozwpan/ozcdev.c | 31 +- + drivers/staging/ozwpan/ozeltbuf.c | 129 +- + drivers/staging/ozwpan/ozeltbuf.h | 7 +- + drivers/staging/ozwpan/ozhcd.c | 166 +-- + drivers/staging/ozwpan/ozmain.c | 4 +- + drivers/staging/ozwpan/ozpd.c | 305 ++--- + drivers/staging/ozwpan/ozpd.h | 9 +- + drivers/staging/ozwpan/ozproto.c | 36 +- + drivers/staging/ozwpan/ozproto.h | 8 +- + drivers/staging/ozwpan/ozprotocol.h | 2 - + drivers/staging/ozwpan/ozusbsvc.c | 30 +- + drivers/staging/ozwpan/ozusbsvc1.c | 12 +- + drivers/staging/rtl8188eu/Makefile | 2 +- + drivers/staging/rtl8188eu/core/rtw_efuse.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_iol.c | 164 --- + drivers/staging/rtl8188eu/hal/HalHWImg8188E_BB.c | 474 ++++--- + drivers/staging/rtl8188eu/hal/HalHWImg8188E_MAC.c | 120 +- + drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c | 269 ++-- + drivers/staging/rtl8188eu/hal/fw.c | 236 ++++ + drivers/staging/rtl8188eu/hal/hal_intf.c | 10 - + drivers/staging/rtl8188eu/hal/odm_HWConfig.c | 36 - + drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c | 138 --- + drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 371 ------ + drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c | 277 ----- + drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c | 96 -- + drivers/staging/rtl8188eu/hal/rtl8188e_xmit.c | 1 + + drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 25 +- + drivers/staging/rtl8188eu/hal/usb_halinit.c | 39 +- + drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h | 14 - + .../staging/rtl8188eu/include/HalHWImg8188E_BB.h | 44 - + .../staging/rtl8188eu/include/HalHWImg8188E_MAC.h | 30 - + .../staging/rtl8188eu/include/HalHWImg8188E_RF.h | 30 - + drivers/staging/rtl8188eu/include/drv_types.h | 7 - + drivers/staging/rtl8188eu/include/fw.h | 59 + + drivers/staging/rtl8188eu/include/hal_intf.h | 7 - + drivers/staging/rtl8188eu/include/odm_HWConfig.h | 6 - + .../staging/rtl8188eu/include/odm_RegConfig8188E.h | 43 - + drivers/staging/rtl8188eu/include/odm_precomp.h | 5 - + drivers/staging/rtl8188eu/include/phy.h | 3 + + drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 48 +- + drivers/staging/rtl8188eu/include/rtl8188e_rf.h | 1 - + drivers/staging/rtl8188eu/include/rtw_efuse.h | 1 - + drivers/staging/rtl8188eu/include/rtw_iol.h | 54 - + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 7 +- + drivers/staging/rtl8192ee/base.c | 76 +- + drivers/staging/rtl8192ee/btcoexist/rtl_btc.c | 9 +- + drivers/staging/rtl8192ee/cam.c | 75 +- + drivers/staging/rtl8192ee/core.c | 154 ++- + drivers/staging/rtl8192ee/debug.c | 88 +- + drivers/staging/rtl8192ee/debug.h | 20 +- + drivers/staging/rtl8192ee/efuse.c | 29 +- + drivers/staging/rtl8192ee/pci.c | 223 ++-- + drivers/staging/rtl8192ee/ps.c | 61 +- + drivers/staging/rtl8192ee/rc.c | 2 +- + drivers/staging/rtl8192ee/regd.c | 12 +- + drivers/staging/rtl8192ee/rtl8192ee/dm.c | 46 +- + drivers/staging/rtl8192ee/rtl8192ee/fw.c | 128 +- + drivers/staging/rtl8192ee/rtl8192ee/hw.c | 180 ++- + drivers/staging/rtl8192ee/rtl8192ee/led.c | 16 +- + drivers/staging/rtl8192ee/rtl8192ee/phy.c | 279 ++--- + drivers/staging/rtl8192ee/rtl8192ee/pwrseqcmd.c | 31 +- + drivers/staging/rtl8192ee/rtl8192ee/rf.c | 10 +- + drivers/staging/rtl8192ee/rtl8192ee/sw.c | 9 +- + drivers/staging/rtl8192ee/rtl8192ee/trx.c | 26 +- + drivers/staging/rtl8192u/Makefile | 3 - + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 4 + + drivers/staging/rtl8192u/r8192U_core.c | 504 +------- + drivers/staging/rtl8192u/r8192U_wx.c | 3 +- + drivers/staging/rtl8192u/r819xU_phyreg.h | 189 +-- + drivers/staging/rtl8723au/core/rtw_efuse.c | 34 +- + drivers/staging/rtl8821ae/pci.c | 6 +- + drivers/staging/rts5208/Kconfig | 7 - + drivers/staging/rts5208/ms.c | 5 +- + drivers/staging/rts5208/rtsx_chip.c | 6 +- + drivers/staging/rts5208/rtsx_scsi.c | 7 +- + drivers/staging/rts5208/sd.c | 11 +- + drivers/staging/rts5208/trace.h | 8 - + drivers/staging/slicoss/slicoss.c | 2 + + drivers/staging/unisys/channels/channel.c | 12 +- + .../unisys/common-spar/include/channels/channel.h | 43 +- + .../include/channels/controlframework.h | 2 +- + .../include/channels/controlvmchannel.h | 4 +- + .../common-spar/include/channels/diagchannel.h | 2 +- + .../common-spar/include/channels/iochannel.h | 43 +- + .../common-spar/include/channels/vbuschannel.h | 1 - + .../include/controlvmcompletionstatus.h | 16 +- + .../unisys/common-spar/include/iovmcall_gnuc.h | 30 +- + .../unisys/common-spar/include/vbusdeviceinfo.h | 3 +- + drivers/staging/unisys/include/commontypes.h | 72 -- + drivers/staging/unisys/include/timskmod.h | 54 +- + drivers/staging/unisys/include/uisqueue.h | 15 - + drivers/staging/unisys/include/uisutils.h | 2 + + drivers/staging/unisys/uislib/uislib.c | 113 +- + drivers/staging/unisys/uislib/uisqueue.c | 6 +- + drivers/staging/unisys/uislib/uisthread.c | 1 + + drivers/staging/unisys/uislib/uisutils.c | 56 +- + drivers/staging/unisys/virthba/virthba.c | 8 +- + drivers/staging/unisys/virtpci/virtpci.c | 4 +- + drivers/staging/unisys/visorchannel/visorchannel.h | 1 - + .../unisys/visorchannel/visorchannel_funcs.c | 4 +- + drivers/staging/unisys/visorchipset/file.c | 1 + + drivers/staging/unisys/visorchipset/parser.c | 2 + + .../unisys/visorchipset/visorchipset_main.c | 58 +- + drivers/staging/vt6655/80211mgr.c | 41 +- + drivers/staging/vt6655/80211mgr.h | 6 +- + drivers/staging/vt6655/baseband.c | 92 +- + drivers/staging/vt6655/baseband.h | 17 +- + drivers/staging/vt6655/bssdb.c | 99 +- + drivers/staging/vt6655/bssdb.h | 8 +- + drivers/staging/vt6655/card.c | 290 ++--- + drivers/staging/vt6655/card.h | 91 +- + drivers/staging/vt6655/channel.c | 17 +- + drivers/staging/vt6655/datarate.c | 15 +- + drivers/staging/vt6655/desc.h | 11 - + drivers/staging/vt6655/device.h | 30 +- + drivers/staging/vt6655/device_main.c | 399 +++--- + drivers/staging/vt6655/dpc.c | 161 +-- + drivers/staging/vt6655/dpc.h | 2 +- + drivers/staging/vt6655/hostap.c | 146 +-- + drivers/staging/vt6655/hostap.h | 4 +- + drivers/staging/vt6655/ioctl.c | 84 +- + drivers/staging/vt6655/ioctl.h | 2 +- + drivers/staging/vt6655/iowpa.h | 4 +- + drivers/staging/vt6655/iwctl.c | 162 +-- + drivers/staging/vt6655/key.c | 144 ++- + drivers/staging/vt6655/key.h | 8 +- + drivers/staging/vt6655/mac.c | 65 +- + drivers/staging/vt6655/mib.c | 54 +- + drivers/staging/vt6655/power.c | 28 +- + drivers/staging/vt6655/rf.c | 8 +- + drivers/staging/vt6655/rf.h | 8 +- + drivers/staging/vt6655/rxtx.c | 247 ++-- + drivers/staging/vt6655/rxtx.h | 39 +- + drivers/staging/vt6655/ttype.h | 27 - + drivers/staging/vt6655/upc.h | 39 +- + drivers/staging/vt6655/wcmd.c | 143 +-- + drivers/staging/vt6655/wcmd.h | 3 +- + drivers/staging/vt6655/wctl.c | 8 +- + drivers/staging/vt6655/wctl.h | 6 +- + drivers/staging/vt6655/wmgr.c | 366 +++--- + drivers/staging/vt6655/wmgr.h | 2 +- + drivers/staging/vt6655/wpa.c | 28 +- + drivers/staging/vt6655/wpa2.c | 20 +- + drivers/staging/vt6655/wpactl.c | 118 +- + drivers/staging/vt6655/wpactl.h | 6 +- + drivers/staging/vt6655/wroute.c | 14 +- + drivers/staging/vt6655/wroute.h | 3 +- + drivers/staging/vt6656/rxtx.c | 3 +- + drivers/staging/vt6656/usbpipe.c | 5 +- + drivers/staging/wlan-ng/prism2fw.c | 93 +- + drivers/staging/wlan-ng/prism2mgmt.c | 19 +- + 325 files changed, 8922 insertions(+), 9934 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-accel-bmc150 + create mode 100644 Documentation/devicetree/bindings/iio/dac/max5821.txt + create mode 100644 drivers/iio/accel/bmc150-accel.c + create mode 100644 drivers/iio/adc/rockchip_saradc.c + create mode 100644 drivers/iio/adc/ti-adc128s052.c + create mode 100644 drivers/iio/dac/max5821.c + create mode 100644 drivers/staging/comedi/drivers/ni_usb6501.c + create mode 100644 drivers/staging/dgnc/dgnc_utils.c + create mode 100644 drivers/staging/dgnc/dgnc_utils.h + delete mode 100644 drivers/staging/iio/frequency/ad5930.c + delete mode 100644 drivers/staging/iio/frequency/ad9850.c + delete mode 100644 drivers/staging/iio/frequency/ad9852.c + delete mode 100644 drivers/staging/iio/frequency/ad9910.c + delete mode 100644 drivers/staging/iio/frequency/ad9951.c + create mode 100644 drivers/staging/rtl8188eu/hal/fw.c + delete mode 100644 drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c + delete mode 100644 drivers/staging/rtl8188eu/include/HalHWImg8188E_BB.h + delete mode 100644 drivers/staging/rtl8188eu/include/HalHWImg8188E_MAC.h + delete mode 100644 drivers/staging/rtl8188eu/include/HalHWImg8188E_RF.h + create mode 100644 drivers/staging/rtl8188eu/include/fw.h + delete mode 100644 drivers/staging/rtl8188eu/include/odm_RegConfig8188E.h + create mode 100644 drivers/staging/rtl8188eu/include/phy.h + delete mode 100644 drivers/staging/unisys/include/commontypes.h +$ git am -3 ../patches/0001-staging-rtl8188eu-using-unique-names-is-good.patch +Applying: staging: rtl8188eu: using unique names is good +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/staging/rtl8188eu/hal/HalHWImg8188E_BB.c +M drivers/staging/rtl8188eu/hal/HalHWImg8188E_MAC.c +M drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c +M drivers/staging/rtl8188eu/hal/fw.c +M drivers/staging/rtl8188eu/hal/usb_halinit.c +M drivers/staging/rtl8188eu/include/fw.h +M drivers/staging/rtl8188eu/include/phy.h +$ git add -A . +$ git commit -v -a --amend +[master 937c09a4fafa] Merge remote-tracking branch 'staging/staging-next' + Date: Fri Aug 29 12:52:43 2014 +1000 +Merging char-misc/char-misc-next (7d1311b93e58 Linux 3.17-rc1) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging cgroup/for-next (549cb2747e0f Merge branch 'for-3.18' into for-next) +$ git merge cgroup/for-next +Merge made by the 'recursive' strategy. + kernel/cgroup.c | 22 ++++++++++++++++++---- + 1 file changed, 18 insertions(+), 4 deletions(-) +Merging scsi/for-next (0d409610d597 Merge remote-tracking branch 'scsi-queue/drivers-for-3.18' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/nsp32.c +Merge made by the 'recursive' strategy. + Documentation/scsi/ChangeLog.megaraid_sas | 14 ++ + drivers/message/fusion/mptbase.c | 8 +- + drivers/message/fusion/mptctl.c | 7 +- + drivers/scsi/aacraid/linit.c | 1 + + drivers/scsi/be2iscsi/be.h | 2 +- + drivers/scsi/be2iscsi/be_cmds.c | 40 +++- + drivers/scsi/be2iscsi/be_cmds.h | 24 +- + drivers/scsi/be2iscsi/be_iscsi.c | 31 ++- + drivers/scsi/be2iscsi/be_iscsi.h | 2 +- + drivers/scsi/be2iscsi/be_main.c | 40 +++- + drivers/scsi/be2iscsi/be_main.h | 8 +- + drivers/scsi/be2iscsi/be_mgmt.c | 2 +- + drivers/scsi/be2iscsi/be_mgmt.h | 2 +- + drivers/scsi/csiostor/csio_hw.h | 2 +- + drivers/scsi/csiostor/csio_isr.c | 24 +- + drivers/scsi/cxgbi/libcxgbi.c | 2 +- + drivers/scsi/dpt_i2o.c | 1 + + drivers/scsi/eata.c | 9 - + drivers/scsi/hpsa.c | 70 +++--- + drivers/scsi/megaraid/megaraid_sas.h | 9 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 348 ++++++++++++++++++---------- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 1 + + drivers/scsi/mpt2sas/mpt2sas_base.c | 6 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 4 +- + drivers/scsi/nsp32.c | 2 +- + drivers/scsi/pm8001/pm8001_ctl.c | 4 +- + drivers/scsi/pm8001/pm8001_hwi.c | 8 + + drivers/scsi/pmcraid.c | 14 +- + drivers/scsi/qla2xxx/qla_dbg.c | 2 +- + drivers/scsi/qla2xxx/qla_isr.c | 37 ++- + drivers/scsi/qla2xxx/qla_mbx.c | 2 +- + drivers/scsi/qla2xxx/qla_target.c | 2 +- + drivers/scsi/scsi_debug.c | 103 ++++---- + drivers/scsi/scsi_error.c | 27 +-- + drivers/scsi/scsi_lib.c | 24 +- + drivers/scsi/sd.c | 6 +- + include/scsi/scsi_host.h | 1 + + 37 files changed, 542 insertions(+), 347 deletions(-) +Merging target-updates/for-next (4ca7ea3ceeb9 iscsi-target: Ignore ICF_GOT_LAST_DATAOUT during Data-Out ITT lookup) +$ git merge target-updates/for-next +Auto-merging drivers/target/iscsi/iscsi_target_util.c +Merge made by the 'recursive' strategy. + drivers/infiniband/ulp/isert/ib_isert.c | 20 +++++++++++--------- + drivers/target/iscsi/iscsi_target_util.c | 2 ++ + drivers/target/target_core_fabric_configfs.c | 3 +-- + 3 files changed, 14 insertions(+), 11 deletions(-) +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 (0252d6a2ac2a pinctrl: qcom: apq8064: Correct interrupts in example) +$ git merge pinctrl/for-next +Already up-to-date. +Merging vhost/linux-next (970379f59d81 vhost: move memory pointer to VQs) +$ git merge vhost/linux-next +Resolved 'drivers/vhost/net.c' using previous resolution. +Auto-merging drivers/vhost/net.c +CONFLICT (content): Merge conflict in drivers/vhost/net.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8e78a686f31b] Merge remote-tracking branch 'vhost/linux-next' +$ git diff -M --stat --summary HEAD^.. +Merging remoteproc/for-next (9a3c4145af32 Linux 3.16-rc6) +$ git merge remoteproc/for-next +Already up-to-date. +Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO) +$ git merge rpmsg/for-next +Already up-to-date. +Merging gpio/for-next (24f5796e7881 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-pca953x.txt | 39 ++++++++++++++++ + drivers/gpio/gpio-pca953x.c | 54 ++-------------------- + 2 files changed, 42 insertions(+), 51 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-pca953x.txt +Merging dma-mapping/dma-mapping-next (b4bbb107d73b dma-mapping: Provide write-combine allocations) +$ git merge dma-mapping/dma-mapping-next +Merge made by the 'recursive' strategy. + arch/arm/include/asm/dma-mapping.h | 16 ---------------- + arch/s390/Kconfig | 5 +---- + arch/s390/include/asm/dma-mapping.h | 31 +++++++++++++++++++++---------- + include/asm-generic/dma-mapping-common.h | 8 -------- + include/linux/dma-mapping.h | 26 ++++++++++++++++++++++++++ + 5 files changed, 48 insertions(+), 38 deletions(-) +Merging pwm/for-next (137fd45ffec1 pwm: imx: Avoid sample FIFO overflow for i.MX PWM version2) +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pwm/pwm-fsl-ftm.txt | 19 ++- + drivers/pwm/Kconfig | 21 +++- + drivers/pwm/Makefile | 2 + + drivers/pwm/core.c | 2 +- + drivers/pwm/pwm-fsl-ftm.c | 90 +++++++------- + drivers/pwm/pwm-imx.c | 71 ++++++++--- + drivers/pwm/pwm-lpss-pci.c | 64 ++++++++++ + drivers/pwm/pwm-lpss-platform.c | 68 ++++++++++ + drivers/pwm/pwm-lpss.c | 137 +++------------------ + drivers/pwm/pwm-lpss.h | 32 +++++ + 10 files changed, 323 insertions(+), 183 deletions(-) + create mode 100644 drivers/pwm/pwm-lpss-pci.c + create mode 100644 drivers/pwm/pwm-lpss-platform.c + create mode 100644 drivers/pwm/pwm-lpss.h +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 (a1998908ba46 nfs: fix kernel warning when removing proc entry) +$ git merge userns/for-next +Auto-merging fs/nfs/client.c +Auto-merging fs/namespace.c +Merge made by the 'recursive' strategy. + fs/namespace.c | 9 ++++ + fs/nfs/client.c | 4 +- + .../selftests/mount/unprivileged-remount-test.c | 51 ++++++++++++---------- + 3 files changed, 38 insertions(+), 26 deletions(-) +Merging ktest/for-next (4c16b1d6d5e0 ktest: Update documentation on config_bisect) +$ 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 (b11a6face1b6 clk: Add missing of_clk_set_defaults export) +$ git merge clk/clk-next +Already up-to-date. +Merging random/dev (e02b87659777 hwrng: Pass entropy to add_hwgenerator_randomness() in bits, not bytes) +$ 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 (7be141d05549 Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge aio/master +Already up-to-date. +Merging llvmlinux/for-next (7380100aa7ce arm64: LLVMLinux: Use current_stack_pointer in kernel/traps.c) +$ git merge llvmlinux/for-next +Auto-merging arch/arm64/kernel/traps.c +Auto-merging arch/arm64/include/asm/thread_info.h +Auto-merging arch/arm/kernel/unwind.c +Auto-merging arch/arm/include/asm/thread_info.h +Auto-merging arch/arm/include/asm/ptrace.h +Merge made by the 'recursive' strategy. + arch/arm/include/asm/ptrace.h | 5 ++--- + arch/arm/include/asm/thread_info.h | 9 +++++++-- + arch/arm/kernel/return_address.c | 3 +-- + arch/arm/kernel/stacktrace.c | 4 +--- + arch/arm/kernel/unwind.c | 3 +-- + arch/arm64/include/asm/thread_info.h | 9 +++++++-- + arch/arm64/kernel/stacktrace.c | 3 +-- + arch/arm64/kernel/traps.c | 3 +-- + 8 files changed, 21 insertions(+), 18 deletions(-) +Merging powernv-cpuidle/powernv-cpuidle (0888839c5b62 cpuidle/powernv: Parse device tree to setup idle states) +$ git merge powernv-cpuidle/powernv-cpuidle +Already up-to-date. +Merging rd-docs/master (1f65b1aaaa0a seq_file: Document seq_open_private(), seq_release_private()) +$ git merge rd-docs/master +Removing Documentation/ptp/testptp.mk +Merge made by the 'recursive' strategy. + Documentation/Makefile | 7 +++-- + Documentation/SubmittingPatches | 1 + + Documentation/accounting/Makefile | 3 -- + Documentation/arm/Makefile | 1 + + Documentation/arm/SH-Mobile/Makefile | 11 ++++---- + Documentation/arm/SH-Mobile/vrl4.c | 6 ++-- + Documentation/auxdisplay/Makefile | 3 -- + Documentation/blackfin/Makefile | 7 ++--- + Documentation/filesystems/Makefile | 3 +- + Documentation/filesystems/seq_file.txt | 33 ++++++++++++++++++++++ + Documentation/i2c/dev-interface | 10 +++---- + Documentation/ia64/Makefile | 3 -- + Documentation/laptops/Makefile | 5 +--- + Documentation/mic/Makefile | 1 + + Documentation/mic/mpssd/Makefile | 24 ++++++++-------- + Documentation/mic/mpssd/mpssd.c | 4 +-- + Documentation/misc-devices/Makefile | 1 + + Documentation/misc-devices/mei/Makefile | 3 -- + Documentation/networking/Makefile | 8 +----- + Documentation/networking/timestamping/Makefile | 8 +----- + Documentation/pcmcia/Makefile | 3 -- + Documentation/prctl/Makefile | 8 ++++++ + .../prctl/disable-tsc-ctxt-sw-stress-test.c | 11 ++++---- + .../prctl/disable-tsc-on-off-stress-test.c | 7 +++-- + Documentation/prctl/disable-tsc-test.c | 5 ++-- + Documentation/ptp/Makefile | 8 ++++++ + Documentation/ptp/testptp.c | 6 ++-- + Documentation/ptp/testptp.mk | 33 ---------------------- + Documentation/spi/Makefile | 3 -- + Documentation/timers/Makefile | 3 -- + Documentation/vDSO/Makefile | 9 ++++++ + Documentation/video4linux/Makefile | 1 + + Documentation/watchdog/Makefile | 1 + + Documentation/watchdog/src/Makefile | 3 -- + drivers/media/v4l2-core/Kconfig | 8 ++++++ + 35 files changed, 125 insertions(+), 126 deletions(-) + create mode 100644 Documentation/arm/Makefile + create mode 100644 Documentation/mic/Makefile + create mode 100644 Documentation/misc-devices/Makefile + create mode 100644 Documentation/prctl/Makefile + create mode 100644 Documentation/ptp/Makefile + delete mode 100644 Documentation/ptp/testptp.mk + create mode 100644 Documentation/vDSO/Makefile + create mode 100644 Documentation/video4linux/Makefile + create mode 100644 Documentation/watchdog/Makefile +Merging signal-cleanup/signal_v4 (b9f0fb2d4a7a powerpc: Use sigsp()) +$ git merge signal-cleanup/signal_v4 +Merge made by the 'recursive' strategy. +Merging akpm-current/current (1b16511b9035 scripts/headers_install.sh: fix error handling) +$ git merge --no-ff akpm-current/current +Auto-merging scripts/headers_install.sh +Auto-merging lib/Kconfig.debug +Auto-merging kernel/printk/printk.c +Auto-merging kernel/debug/debug_core.c +Auto-merging init/Kconfig +Auto-merging include/asm-generic/dma-mapping-common.h +Auto-merging fs/proc/base.c +Auto-merging fs/cifs/smb2pdu.c +Auto-merging fs/cifs/smb2ops.c +Auto-merging fs/cifs/smb2file.c +Auto-merging fs/cifs/sess.c +Auto-merging fs/cifs/file.c +Auto-merging fs/buffer.c +Auto-merging block/bio-integrity.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/tile/kernel/smp.c +Auto-merging arch/sh/Kconfig +Auto-merging arch/s390/Kconfig +Auto-merging arch/mips/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-devices-memory | 8 + + Documentation/devicetree/bindings/rtc/s3c-rtc.txt | 3 + + Documentation/kdump/kdump.txt | 36 +- + Documentation/leds/leds-class.txt | 3 - + Documentation/memory-hotplug.txt | 4 +- + Documentation/printk-formats.txt | 6 + + MAINTAINERS | 11 +- + arch/arc/mm/cache_arc700.c | 1 + + arch/arm/Kconfig | 3 +- + arch/arm/boot/dts/exynos3250.dtsi | 2 +- + arch/arm/mm/dma-mapping.c | 210 ++---- + arch/arm64/Kconfig | 1 + + arch/arm64/mm/dma-mapping.c | 164 +++- + arch/hexagon/mm/cache.c | 1 + + arch/ia64/Kconfig | 2 - + arch/m68k/Kconfig | 2 - + arch/m68k/kernel/sys_m68k.c | 21 +- + arch/mips/Kconfig | 2 - + arch/powerpc/Kconfig | 2 - + arch/powerpc/include/asm/pgtable.h | 57 +- + arch/powerpc/include/asm/pte-common.h | 5 + + arch/s390/Kconfig | 2 - + arch/sh/Kconfig | 2 - + arch/sh/mm/cache.c | 1 + + arch/tile/Kconfig | 2 - + arch/tile/kernel/smp.c | 1 + + arch/x86/Kbuild | 4 +- + arch/x86/Kconfig | 19 +- + arch/x86/Makefile | 6 +- + arch/x86/include/asm/numa.h | 1 - + arch/x86/include/asm/pgtable.h | 9 +- + arch/x86/include/asm/pgtable_64.h | 3 +- + arch/x86/include/asm/pgtable_types.h | 14 + + arch/x86/kernel/Makefile | 2 +- + arch/x86/kernel/crash.c | 6 +- + arch/x86/kernel/machine_kexec_64.c | 11 + + arch/x86/mm/fault.c | 2 +- + arch/x86/mm/init_64.c | 36 +- + arch/x86/mm/numa.c | 123 ++- + arch/x86/platform/efi/efi-bgrt.c | 36 +- + arch/x86/purgatory/Makefile | 6 +- + arch/xtensa/kernel/smp.c | 1 + + block/bio-integrity.c | 2 - + block/genhd.c | 2 +- + drivers/base/dma-mapping.c | 68 ++ + drivers/base/memory.c | 66 ++ + drivers/block/zram/zram_drv.c | 10 +- + drivers/block/zram/zram_drv.h | 2 +- + drivers/input/Kconfig | 9 + + drivers/input/Makefile | 3 + + drivers/input/input.c | 6 + + drivers/input/leds.c | 249 +++++++ + drivers/leds/Kconfig | 3 - + drivers/misc/ti-st/st_core.c | 2 +- + drivers/rtc/rtc-s3c.c | 869 ++++++++++++++-------- + drivers/rtc/rtc-s5m.c | 21 +- + drivers/tty/Kconfig | 4 + + drivers/tty/vt/keyboard.c | 110 ++- + drivers/video/backlight/backlight.c | 2 - + fs/befs/btree.c | 53 +- + fs/block_dev.c | 7 + + fs/buffer.c | 26 +- + fs/cifs/cifsacl.c | 2 +- + fs/cifs/cifssmb.c | 20 +- + fs/cifs/file.c | 4 +- + fs/cifs/sess.c | 2 +- + fs/cifs/smb2file.c | 4 +- + fs/cifs/smb2misc.c | 38 +- + fs/cifs/smb2ops.c | 2 +- + fs/cifs/smb2pdu.c | 2 +- + fs/cifs/smb2pdu.h | 28 +- + fs/ext4/fsync.c | 5 +- + fs/hfsplus/catalog.c | 89 ++- + fs/hfsplus/dir.c | 11 +- + fs/hfsplus/hfsplus_fs.h | 4 +- + fs/hfsplus/super.c | 4 +- + fs/internal.h | 5 + + fs/mpage.c | 25 +- + fs/ocfs2/alloc.c | 28 +- + fs/ocfs2/alloc.h | 2 +- + fs/ocfs2/aops.c | 37 +- + fs/ocfs2/cluster/quorum.c | 13 +- + fs/ocfs2/cluster/tcp.c | 45 +- + fs/ocfs2/cluster/tcp.h | 1 + + fs/ocfs2/dir.c | 2 +- + fs/ocfs2/dlm/dlmast.c | 6 +- + fs/ocfs2/dlm/dlmmaster.c | 22 +- + fs/ocfs2/dlm/dlmthread.c | 10 + + fs/ocfs2/file.c | 2 +- + fs/ocfs2/inode.c | 10 +- + fs/ocfs2/ioctl.c | 129 ++-- + fs/ocfs2/stack_user.c | 2 +- + fs/proc/base.c | 36 +- + fs/proc/internal.h | 3 + + fs/proc/task_mmu.c | 216 +++--- + fs/proc/task_nommu.c | 66 +- + include/asm-generic/dma-mapping-common.h | 9 + + include/asm-generic/pgtable.h | 27 +- + include/linux/compaction.h | 24 +- + include/linux/crc64_ecma.h | 56 ++ + include/linux/genalloc.h | 7 + + include/linux/gfp.h | 2 +- + include/linux/input.h | 21 + + include/linux/kernel.h | 32 +- + include/linux/memory_hotplug.h | 1 + + include/linux/mm.h | 15 + + include/linux/string.h | 1 + + include/uapi/linux/prctl.h | 25 + + include/uapi/linux/xattr.h | 2 +- + init/Kconfig | 12 +- + init/main.c | 3 +- + ipc/ipc_sysctl.c | 3 +- + kernel/async.c | 8 +- + kernel/debug/debug_core.c | 9 +- + kernel/debug/kdb/kdb_debugger.c | 4 + + kernel/debug/kdb/kdb_main.c | 4 +- + kernel/kexec.c | 11 + + kernel/printk/printk.c | 7 +- + kernel/resource.c | 11 +- + kernel/sys.c | 243 +++++- + kernel/time/posix-timers.c | 57 +- + lib/Kconfig | 7 + + lib/Kconfig.debug | 7 +- + lib/Makefile | 1 + + lib/crc64_ecma.c | 341 +++++++++ + lib/genalloc.c | 49 ++ + lib/vsprintf.c | 20 +- + mm/compaction.c | 651 ++++++++++------ + mm/huge_memory.c | 20 +- + mm/hugetlb_cgroup.c | 2 +- + mm/internal.h | 26 +- + mm/memblock.c | 7 +- + mm/memory.c | 15 +- + mm/memory_hotplug.c | 2 +- + mm/mmap.c | 44 +- + mm/nobootmem.c | 2 + + mm/page_alloc.c | 156 ++-- + mm/pgtable-generic.c | 2 +- + mm/slab_common.c | 4 +- + mm/util.c | 30 + + mm/vmscan.c | 14 +- + mm/vmstat.c | 141 +++- + mm/zbud.c | 1 + + mm/zpool.c | 2 +- + mm/zsmalloc.c | 1 + + scripts/checkpatch.pl | 6 +- + scripts/headers_install.sh | 4 +- + tools/testing/selftests/ipc/Makefile | 6 +- + tools/testing/selftests/kcmp/Makefile | 6 +- + tools/testing/selftests/memfd/Makefile | 10 +- + 150 files changed, 3729 insertions(+), 1662 deletions(-) + create mode 100644 drivers/input/leds.c + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 lib/crc64_ecma.c +$ git am -3 ../patches/prctl-pr_set_mm-introduce-pr_set_mm_map-operation-v4-fix.patch +Applying: headers: prctl.h -- Add missing linux/types.h +$ git reset HEAD^ +Unstaged changes after reset: +M include/uapi/linux/prctl.h +$ git add -A . +$ git commit -v -a --amend +[master b73c34b4b61c] Merge branch 'akpm-current/current' + Date: Fri Aug 29 14:06:04 2014 +1000 +$ git am -3 ../patches/common-dma-mapping-introduce-common-remapping-functions-fix.patch +Applying: common: dma-mapping: Swap function order +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/base/dma-mapping.c +$ git add -A . +$ git commit -v -a --amend +[master a425339df6a8] Merge branch 'akpm-current/current' + Date: Fri Aug 29 14:06:04 2014 +1000 +$ git am -3 ../patches/common-dma-mapping-introduce-common-remapping-functions-fix-2.patch +Applying: common: dma-mapping: Protect remapping functions with CONFIG_MMU +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/base/dma-mapping.c +$ git add -A . +$ git commit -v -a --amend +[master 720806a1e887] Merge branch 'akpm-current/current' + Date: Fri Aug 29 14:06:04 2014 +1000 +$ 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: x86, vdso: fix vdso2c's special_pages error checking +Applying: include/linux: remove strict_strto* definitions +Applying: mm: replace remap_file_pages() syscall with emulation +Applying: fat: add i_disksize to represent uninitialized size +Applying: fat: add fat_fallocate operation +Applying: fat: zero out seek range on _fat_get_block +Applying: fat: fallback to buffered write in case of fallocated region on direct IO +Applying: fat: permit to return phy block number by fibmap in fallocated region +Applying: Documentation/filesystems/vfat.txt: update the limitation for fat fallocate +Applying: drivers/w1/w1_int.c: call put_device if device_register fails +Applying: softlockup: make detector be aware of task switch of processes hogging cpu +Applying: kernel/watchdog.c: control hard lockup detection default +Applying: watchdog-control-hard-lockup-detection-default-fix +Applying: watchdog, nmi: Fix compile issues on sparc +Applying: kvm: ensure hard lockup detection is disabled by default +Applying: mm: add strictlimit knob +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 2176e3f84826...9d52a2c50ec1 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (9d52a2c50ec1 mm: add strictlimit knob) +$ git merge --no-ff akpm/master +Removing mm/fremap.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-bdi | 8 + + Documentation/filesystems/vfat.txt | 10 ++ + Documentation/vm/remap_file_pages.txt | 7 +- + arch/x86/kernel/kvm.c | 8 + + arch/x86/vdso/vdso2c.h | 12 +- + drivers/gpio/gpio-zevio.c | 4 + + drivers/w1/w1_int.c | 3 +- + fs/fat/cache.c | 70 ++++++-- + fs/fat/fat.h | 6 +- + fs/fat/file.c | 78 +++++++- + fs/fat/inode.c | 87 ++++++++- + include/linux/fs.h | 8 +- + include/linux/kernel.h | 4 - + include/linux/nmi.h | 13 ++ + kernel/watchdog.c | 70 +++++++- + mm/Makefile | 2 +- + mm/backing-dev.c | 35 ++++ + mm/fremap.c | 283 ------------------------------ + mm/mmap.c | 69 ++++++++ + mm/nommu.c | 8 - + 20 files changed, 450 insertions(+), 335 deletions(-) + delete mode 100644 mm/fremap.c diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..298f105c9350 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,27 @@ +Importing jdelvare-hwmon based on 3.15-rc7 +Unchanged quilt series jdelvare-hwmon +Importing rd-docs based on 3.17-rc1 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 +HEAD is now at 7d1311b93e58 Linux 3.17-rc1 +$ git am --patch-format=mbox ../quilt/rd-docs/001-docum-use-subdiry-avoid-builtin.patch +Applying: Documentation: use subdir-y to avoid unnecessary built-in.o files +$ git am --patch-format=mbox ../quilt/rd-docs/002-docum-add-make-more-targets.patch +Applying: Documentation: add makefiles for more targets +$ git am --patch-format=mbox ../quilt/rd-docs/003-docum-funcs-static.patch +Applying: Documentation: make functions static to avoid prototype warnings +$ git am --patch-format=mbox ../quilt/rd-docs/004-docum-misc-warnings.patch +Applying: Documentation: fix misc. warnings +$ git am --patch-format=mbox ../quilt/rd-docs/docum-submit-patches-add-gregkh-page.patch +Applying: new page link in SubmittingPatches +$ git am --patch-format=mbox ../quilt/rd-docs/media-v4l2-pci-skel-dep-pci.patch +Applying: v4l2-pci-skeleton: Only build if PCI is available +$ git am --patch-format=mbox ../quilt/rd-docs/docum-i2c-fix-interface-example.patch +Applying: i2c documentation: rename variable "register" to "reg" +$ git am --patch-format=mbox ../quilt/rd-docs/docum-fs-seq-open-release-private.patch +Applying: seq_file: Document seq_open_private(), seq_release_private() +$ cd /home/sfr/kernels/next/next +$ git fetch -f ../quilt-tmp master:rd-docs/master +From ../quilt-tmp + + 167b9fb21bc9...0ee08868a30b master -> rd-docs/master (forced update) diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..f85e558e5620 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20140829 |