diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-06-18 13:59:20 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-06-18 13:59:20 +1000 |
| commit | 4ca1fbc122fcb09efa2bb1448bff8b71b46434c8 (patch) | |
| tree | 2d400814c2ad6f4fedc88d41a84bf01fad2127bf | |
| parent | 2854a11e7f83dd99c89d2261508c80358cf18183 (diff) | |
Add linux-next specific files for 20140618next-20140618
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 221 | ||||
| -rw-r--r-- | Next/Trees | 223 | ||||
| -rw-r--r-- | Next/merge.log | 2095 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 2544 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..1e173f13a9df --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,221 @@ +Name SHA1 +---- ---- +origin ebe06187bf2aec10d537ce4595e416035367d703 +fixes 4b660a7f5c8099d88d1a43d8ae138965112592c7 +kbuild-current 7171511eaec5bf23fb06078f59784a3a0626b38f +arc-current 89ca3b881987f5a4be4c5dbaa7f0df12bbdde2fd +arm-current 870cbe8cb2043d63dc5f110731df57599075f53d +m68k-current e8d6dc5ad26eb027c19cfb44825f038734be2cb3 +metag-fixes ffe6902b66aaa4ca6694bc19639259c16d84ddb1 +powerpc-merge 68986c9f0f4552c34c248501eb0c690553866d6e +sparc 8ecc1bad4c9b485ceb47182d282980d0b0fe20ac +net bc56151d07eab55437ff7b47c4cb3278d476ea6b +ipsec 7171511eaec5bf23fb06078f59784a3a0626b38f +sound-current 74b0c2d75fb4cc89173944e6d8f9eb47aca0c343 +pci-current 7171511eaec5bf23fb06078f59784a3a0626b38f +wireless 616a8394b5df8c88f4dd416f4527439a4e365034 +driver-core.current 7171511eaec5bf23fb06078f59784a3a0626b38f +tty.current 7171511eaec5bf23fb06078f59784a3a0626b38f +usb.current 7171511eaec5bf23fb06078f59784a3a0626b38f +usb-gadget-fixes 886c7c426d465732ec9d1b2bbdda5642fc2e7e05 +staging.current c44b33b72133aeb6c3972847444cc45f18642259 +char-misc.current b29f680c4fe305902d02c1d5aa4968fe13a45fe6 +input-current 31972f6e517d82a4f60de4994908724b7b47e337 +md-current d47648fcf0611812286f68131b40251c6fa54f5e +crypto-current 3901c1124ec5099254a9396085f7798153a7293f +ide 5b40dd30bbfaa7fcba0cd945a4852a146c552ea7 +dwmw2 5950f0803ca9d396ab79b7fe6789351f96e1d8d5 +devicetree-current 4b660a7f5c8099d88d1a43d8ae138965112592c7 +rr-fixes 79465d2fd48e68940c2bdecddbdecd45bbba06fe +mfd-fixes 73beb63d290f961c299526852884846b0d868840 +vfio-fixes 239a87020b263fe7e70adc5803cb157955023d3c +drm-intel-fixes 15d24aa5602fb87c7b1358cfabcfeb9b26db290f +asm-generic fb9de7ebc3a2eb7ddb83c92e288447a0c313bced +arc 230a15f171ba24226486664fc44542b175107ab7 +arm a6d997d18aa49884b625c8b9732388718ef31099 +arm-perf 7171511eaec5bf23fb06078f59784a3a0626b38f +arm-soc f2592714cddc723fcd89d7a7656f1765fd7d2e5c +bcm2835 fa389e220254c69ffae0d403eac4146171062d08 +berlin 251f72d06c5992f6712d44b1c13b4a3eec15fd92 +cortex-m f0d7515372ff0ea53fd66099533d3c8e0464cbbf +ep93xx bfb0709fd17b13498d99592bbe12c91130e35a55 +imx-mxs ba0ec8db354342362fa97d009bce4c83a21d2fed +ixp4xx 19f949f52599ba7c3f67a5897ac6be14bfcb1200 +keystone c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 +msm 81cf1e061d001fab44dbaa85fc4fbfb6da6713a1 +mvebu 0a847a5b6ebe8e39b926b3f891623df66ce44d0f +renesas 94da9af459c15e4352b9fd5d9803173826c94d39 +samsung c0c3c3590d0d178cd461f0c29aca0e83294c4bc4 +tegra 78d401aefcbb860996bd0cdec389a50aa048a2ab +arm64 9358d755bd5cba8965ea79f2a446e689323409f9 +blackfin 51fdc6bf98802eb7019ec94dfd82f0e6cd1c82a8 +c6x ae72758f1dd93bd367dc7719702f24a9bfb3bad9 +cris cd065a010a97e3c330d1ded9af551664c9689b19 +hexagon a9a44fdf329668125042055c569656aa83d8cccb +ia64 e32634f5d57f1dce88624b70a6d625915f6ea09e +m68k e8d6dc5ad26eb027c19cfb44825f038734be2cb3 +m68knommu 83c6bdb827c9422fe6e02130d9546800143304c1 +metag 8bc613befaec184b59bf3405e8d06fafdc209484 +microblaze 225fba216261b0e24273f5f4eee504e3c7bd0255 +mips 3dae4934815d5cdadc73afaaefee6f3ab08ad2d1 +openrisc 548dafe880ad84d0accc0a5596c26e3348b103e1 +parisc 6c700d71f7faecb540b3fa4303edb5323a2768c1 +parisc-hd 455c6fdbd219161bd09b1165f11699d6d73de11c +powerpc 68986c9f0f4552c34c248501eb0c690553866d6e +fsl e83eb028bb980cecc85b050aa626df384723aff2 +mpc5xxx bc75059422338197ce487d338ac9c898761e1e61 +s390 fa73eb4738fc75317a481aa95cd472d0d6d057c3 +sparc-next 311b8935ad4e13bac5880ae3f0c269b0c253d25f +tile 8dfb6948f7d8208a7f03fafaeeec10b8a79911c5 +uml 989e59fa41c5464ab77bf0bf82f32f721430544e +unicore32 8c76c188d498a85c5b1a1f10840da57129a108a0 +xtensa 55b441be5cd600bf645a01b14900880a09941d4c +btrfs c7548af69d9ef71512eb52d8009521eba3e768fd +ceph 437f2c0d0c01ad731e5ffbaea5027c2edbf0d932 +cifs a1d0b84c308d7fdfb67eb76498116a6c2fdda507 +configfs b930c26416c4ea6855726fd977145ccea9afbdda +ecryptfs 9e78d14a9f641c0476f733f6fc559ba5cac6f52b +ext3 19ef1229bc2e2468bdf4ea594a57e4287ffa1e6b +ext4 f8409abdc592e13cefbe4e4a24a84b3d5741e85f +f2fs 395fd909452432b965182db4dd04191cf3c8f7cc +fscache fe02fb3ec10932ce07406b1581e28326181fc9d8 +fuse 1560c974dcd40a8d3f193283acd7cc6aee13dc13 +gfs2 0e48e055a7dfc0cf17bbabe4d9b523ee0b1a9ed6 +jfs bb5e50aaa80564268f950d1b2f764455afbfea82 +logfs 339466142b3f58fe0ee4dea7e8c5f3d33099e89c +nfs 886023c676af7a191fca9c88d4dd5ebaaaf92080 +nfsd 48385408b45523d9a432c66292d47ef43efcbb94 +omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84 +squashfs 6d565409503f4e1f74ac30de14e8c91a2b826cd8 +v9fs f15844e0777fec936f87a87f97394f83911dacd3 +ubifs 380347e9ca76828ee9bac63cfc338ca99cdee4f3 +xfs 7691283d0561a350b7517be94818669fb5e3d910 +file-private-locks 7dfeba1f206f736c54121e75bec040024d1a67d1 +vfs 9bd0bc947d9549d13ecfc03454638f7c5c66154a +pci 7171511eaec5bf23fb06078f59784a3a0626b38f +hid 81ba992689ce1ab223e1df7673d4bab1e257ba11 +i2c f0b1f6442b5090fed3529cb39f3acf8c91693d3d +jdelvare-hwmon c7208164e66f63e3ec1759b98087849286410741 +hwmon-staging 2a3c653051b1984f1c8e78cff7bc34523030736c +v4l-dvb 656111f4b9cbc5a9b86cc2d6ac54dea0855209f0 +kbuild d54578541a3647068abdc332aae1b4ed20daa308 +kconfig 95edca5c523c4b404dd60baa0a1bea0e4c38fd72 +libata 341434ff1abc771706faa1d400481441d43ae295 +pm 8d2cc5713760215cc7e6fc77f99f61eb6ffef5df +idle 23a299cd93781a190cdca0d7d16034837b7dfd86 +apm 158204397034f088bfd505eeee281f7072da1c24 +cpupowerutils f16603386b38c28979f4df1cafdc2fe73fa87d37 +thermal 63745aa72ed16154b82a0c9ed22a88001d6ea0fa +ieee1394 165d560bb267db05b63e650c2cebc43c501b44c4 +dlm 883854c5457a97190f7b0ee20f03bcd9664fc0c2 +swiotlb 0cb637bff80d5ba2b916bb19f19ffd59cd4079fd +slave-dma 7171511eaec5bf23fb06078f59784a3a0626b38f +dmaengine fbeec99ad5c03060ba71c470ac373e24e23a80e0 +net-next e0f802fbcaa3bffe4728e37a8fa1279b5d554173 +ipsec-next 7171511eaec5bf23fb06078f59784a3a0626b38f +wireless-next 7171511eaec5bf23fb06078f59784a3a0626b38f +bluetooth 07a3b8c84c2cc66167c78b4ebcc8e5fb9a2cef5b +infiniband eeaddf3670d4974e17268ec78a576ad397e2dcd9 +mtd 7171511eaec5bf23fb06078f59784a3a0626b38f +l2-mtd 7171511eaec5bf23fb06078f59784a3a0626b38f +crypto 5208ed2ca16526cdbec25abe594a3cc3aea210f4 +drm bc1dfff04a5d4064ba0db1fab13f84ab4f333d2b +drm-panel 7e40b5162b3cbd4efe786f874abfbe60b691f0e1 +drm-intel 27b6c122512ca30399bb1b39cc42eda83901f304 +drm-tegra 1f64ae7c5af0d65b2491af30ce7a295569e452c9 +sound 74b0c2d75fb4cc89173944e6d8f9eb47aca0c343 +sound-asoc e1f422c43498a10f9686c4658670f9e6ce821680 +modules 4982223e51e8ea9d09bb33c8323b5ec1877b2b51 +virtio c77fba9ab058d1e96ed51d4215e56905c9ef8d2a +input 68807a0c2015cb40df4869e16651f0ce5cc14d52 +input-mt 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 +block a2d445d440003f2d70ee4cd4970ea82ace616fee +device-mapper a27595b04b918f87718d69b7507a5214aed3849a +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 80af9e6d7ae633309cc5bca96aee6a45117e7c98 +mmc 11bc9381b277a65ea4b3fe994e658f4a78512139 +mmc-uh 2e9c22fc6471dd77f5e1e60a7f265bed12e103b8 +kgdb 6bedf31c25dd93c4f70a28e9ab94a239a5fb592c +slab 201ed0edb7123017f84d5e9e07a434a3a904d474 +uclinux 6dbe51c251a327e012439c4772097a13df43c5b8 +md 053f5b6525ae32da397e6c47721961f800d2c924 +mfd 90b128ed1557c2f523995a379a53e5105891ecf8 +mfd-lj 7171511eaec5bf23fb06078f59784a3a0626b38f +battery ac323d8d807060f7c95a685a9fe861e7b6300993 +fbdev 718b90ac4c21c81f42b6db062ca0867f3cac7648 +viafb 838ac785d521e091bd8b5f6a2b545166f5f32b77 +omap_dss2 7171511eaec5bf23fb06078f59784a3a0626b38f +regulator b753a93f74376bc025936344d61877d664be7f35 +security 2fd4e6698f0863f47558e63b67c7c3a026513541 +integrity 0430e49b6e7c6b5e076be8fefdee089958c9adad +selinux 5c7001b84be55917a99c35ce96df7e67b3c40cea +lblnet d8ec26d7f8287f5788a494f56e8814210f0e64be +watchdog 7171511eaec5bf23fb06078f59784a3a0626b38f +iommu c0981b863a31a1891aa2719957983f4297770f87 +dwmw2-iommu 1860e379875dfe7271c649058aeddffe5afd9d0d +vfio fd49c81f080a997aad4b0e73541cd42772b6a772 +osd ce5d36aac26cc395fe3bc45525cdbad3644f01e5 +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +trivial 31789538e3ba7dd164e063d4978c96af1894be4c +audit 3efe33f5d2da8bb38f4ca93d12ae4f69fedde32a +fsnotify 1ca39ab9d21ac93f94b9e3eb364ea9a5cf2aba06 +devicetree 3c19ca6ae6a4f2a9acb2258fc8f241ba3eb0e8de +dt-rh 99de64984c3a7c9bf56a50e6dcc51006c9485620 +spi 0d6c97f4e58522ecfb559a4be77a22dc496a06aa +tip 01e47cc270606e13db270dc442e3f75a9c3be136 +clockevents 2529c3a330797000d699d70c9a65b8525c6652de +edac 49856dc973cd95d85ac1cab6c70410d8331e5c04 +edac-amd aa2064d7dd35ac5812645780d2f22a7899e7c6e1 +irqchip 3203bea715131b377d05714b63212b49c184289f +ftrace da9c3413a27be5ba6f996e90495c836dd30b8841 +rcu 61f38db3e3c0e4c3be0858750e2cabeadaecac0c +uprobes 0326f5a94ddea33fa331b2519f4172f4fb387baa +kvm 5c02c392cd2320e8d612376d6b72b6548a680923 +kvm-arm 1252b3313642c3d0dff5b951b625468bf0dcd059 +kvm-ppc 5c02c392cd2320e8d612376d6b72b6548a680923 +oprofile 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae +fw-nohz 74876a98a87a115254b3a66a14b27320b7f0acaa +xen-tip 77945ca73e9a66cae25882fcab33ae0c6692763f +percpu 6fbc07bbe2b5a898532f970c5a397f8789ace0d5 +workqueues 015af06e103fa47af29ada0f564301c81d4973b2 +drivers-x86 f82bdd0d77b6bf0dea08a1d957ab45d503f328b1 +chrome-platform 2b8454a75b90d7cd1ac325a0baba77244733354f +sysctl 4e474a00d7ff746ed177ddae14fa8b2d4bad7a00 +regmap 7171511eaec5bf23fb06078f59784a3a0626b38f +hsi b357d7b58f379ebe8038cd97b6204f2f5c52220d +leds 0c9a03b68511daf078256367e7a98d7ff3b7dfcb +driver-core 7171511eaec5bf23fb06078f59784a3a0626b38f +tty 7171511eaec5bf23fb06078f59784a3a0626b38f +usb 7171511eaec5bf23fb06078f59784a3a0626b38f +usb-gadget 7751b6fb05869bcb318e74420148c06577adf894 +staging 25da2290ea9cab53d7865b4aaa3d7a31f2a65a94 +char-misc 7171511eaec5bf23fb06078f59784a3a0626b38f +cgroup 99bae5f94185c2cc65701e95c54e31e2f4345b88 +scsi 11a5dc7ff2fb61d64df70cefb56ee2cf5f11e735 +scsi-core 63ff05910d9652f8a0c4dbb6c7772cfca5364f12 +scsi-drivers e90b25fa40a43f63fc9a035c11ba9ca3e4e60949 +target-updates 0ed6e189e3f6ac3a25383ed5cc8b0ac24c9b97b7 +target-merge b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed +writeback f9b0e058cbd04ada76b13afffa7e1df830543c24 +hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad +pinctrl ff4e41904b429ba29539eaf93d1218ece089bdb6 +vhost 970379f59d81edf78a319f9cdc1234730bcbe6b2 +remoteproc bd88acba5f9809af48f66267bb16024b9e33cf2b +rpmsg 397944df3290ddc46dcc6a08cd71fb560700431b +gpio 06fc3b70f1dc9c53070fa63a528830f54afc3c38 +dma-mapping f70e3c4f8b6ab61f713e040822ec51f5de498146 +pwm 39fd3f99aba3f7683fc9b62e916e4c886a1cb6b0 +dma-buf dfb945473ae8528fd885607b6fa843c676745e0c +userns 3efe1ac78e996da8e141b86667cc15758aad4366 +ktest 4c16b1d6d5e0ca0612de65596a3d1ead8a3372fb +signal 20b4fb485227404329e41ad15588afad3df23050 +clk b640a6037c9ecd1f0ad23a8e9b4ca5f5b4112508 +random 5458c2fecbb8941d9b775f2d064ecd29c48a0dc3 +lzo-update 42b775abafafdf811ef300e869a4e1480ef1cf95 +aio fa88b6f8803c87c4ced5aac11261ced7cedaa05e +llvmlinux f9da455b93f6ba076935b4ef4589f61e529ae046 +powernv-cpuidle 0888839c5b62c44a55ac9d28acc273ba663c65ea +rd-docs 93df5e1c88f7a6dcb8e2e6e12a4bc63e05997980 +akpm-current 8e4b408a34b457e631b09565937f82881df78ae1 +akpm 522474ad8130cb802912d2d3e72d19fab55b50a0 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..6af0d235e158 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,223 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#rc-fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +metag-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#fixes +powerpc-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 +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 +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes.git#master +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 +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.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://oss.sgi.com/xfs/xfs.git#for-next +file-private-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 +slab git git://github.com/penberg/linux.git#for-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/sameo/mfd-next.git#master +mfd-lj git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-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 +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 +scsi-core git git://git.infradead.org/users/hch/scsi-queue.git#core-for-3.16 +scsi-drivers git git://git.infradead.org/users/hch/scsi-queue.git#drivers-for-3.16 +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/ +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..fd3f28fa4f3c --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2095 @@ +$ date +Wednesday 18 June 09:58:17 EST 2014 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 7171511eaec5 Linux 3.16-rc1 +Merging origin/master (ebe06187bf2a epoll: fix use-after-free in eventpoll_release_file) +$ git merge origin/master +Updating 7171511eaec5..ebe06187bf2a +Fast-forward + drivers/video/fbdev/offb.c | 11 +---------- + fs/eventpoll.c | 4 ++-- + 2 files changed, 3 insertions(+), 12 deletions(-) +Merging fixes/master (4b660a7f5c80 Linux 3.15-rc6) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (7171511eaec5 Linux 3.16-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 (870cbe8cb204 ARM: 8069/1: Make thread_save_fp macro aware of THUMB2 mode) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/common/scoop.c | 1 - + arch/arm/include/asm/thread_info.h | 6 ++++++ + 2 files changed, 6 insertions(+), 1 deletion(-) +Merging m68k-current/for-linus (e8d6dc5ad26e m68k/hp300: Convert printk to pr_foo()) +$ 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 powerpc-merge/merge (68986c9f0f45 Revert "offb: Add palette hack for little endian") +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc/master (8ecc1bad4c9b sparc64: fix format string mismatch in arch/sparc/kernel/sysfs.c) +$ git merge sparc/master +Already up-to-date. +Merging net/master (bc56151d07ea ptp: ptp_pch depends on x86_32) +$ git merge net/master +Merge made by the 'recursive' strategy. + Documentation/ptp/testptp.c | 5 ++++- + drivers/isdn/hisax/Kconfig | 11 +---------- + drivers/net/can/slcan.c | 37 +++++++++++++++++++++++++---------- + drivers/net/ethernet/tile/tilegx.c | 1 - + drivers/net/hyperv/netvsc.c | 2 +- + drivers/net/slip/slip.c | 36 ++++++++++++++++++++++++---------- + drivers/net/slip/slip.h | 1 + + drivers/net/vmxnet3/vmxnet3_drv.c | 7 +++++-- + drivers/net/vmxnet3/vmxnet3_ethtool.c | 12 ++++++++---- + drivers/net/vmxnet3/vmxnet3_int.h | 5 +++++ + drivers/ptp/Kconfig | 2 +- + net/ipv4/tcp_fastopen.c | 2 +- + 12 files changed, 80 insertions(+), 41 deletions(-) +Merging ipsec/master (7171511eaec5 Linux 3.16-rc1) +$ git merge ipsec/master +Already up-to-date. +Merging sound-current/for-linus (74b0c2d75fb4 drm/i915, HD-audio: Don't continue probing when nomodeset is given) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/intel_pm.c | 14 ++++++++------ + include/drm/i915_powerwell.h | 4 ++-- + sound/pci/hda/hda_i915.c | 12 ++++++------ + sound/pci/hda/hda_i915.h | 4 ++-- + sound/pci/hda/hda_intel.c | 7 ++++++- + 5 files changed, 24 insertions(+), 17 deletions(-) +Merging pci-current/for-linus (7171511eaec5 Linux 3.16-rc1) +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless/master (616a8394b5df rt2x00: fix rfkill regression on rt2500pci) +$ git merge wireless/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/b43/Kconfig | 2 +- + drivers/net/wireless/b43/main.c | 1 + + drivers/net/wireless/b43/xmit.c | 10 ++- + drivers/net/wireless/mwifiex/pcie.c | 4 +- + drivers/net/wireless/mwifiex/util.h | 43 ++++++++++--- + drivers/net/wireless/rt2x00/rt2500pci.c | 7 ++- + drivers/net/wireless/rt2x00/rt2800usb.c | 39 +++++++++++- + drivers/net/wireless/rt2x00/rt2x00.h | 1 + + drivers/net/wireless/rt2x00/rt2x00dev.c | 24 +++++++- + drivers/net/wireless/rt2x00/rt2x00mac.c | 2 + + drivers/net/wireless/rt2x00/rt2x00usb.h | 1 + + net/bluetooth/hci_conn.c | 7 +-- + net/bluetooth/hci_event.c | 17 +++++- + net/bluetooth/l2cap_core.c | 8 ++- + net/bluetooth/l2cap_sock.c | 5 -- + net/bluetooth/mgmt.c | 104 +++++++++++++++++--------------- + net/bluetooth/smp.c | 9 ++- + 17 files changed, 196 insertions(+), 88 deletions(-) +Merging driver-core.current/driver-core-linus (7171511eaec5 Linux 3.16-rc1) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (7171511eaec5 Linux 3.16-rc1) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (7171511eaec5 Linux 3.16-rc1) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (886c7c426d46 usb: gadget: at91-udc: fix irq and iomem resource retrieval) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging staging.current/staging-linus (c44b33b72133 staging: rtl8723au: Reference correct firmwarefiles with MODULE_FIRMWARE()) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c | 2 +- + drivers/staging/rtl8723au/os_dep/os_intfs.c | 4 +++- + 2 files changed, 4 insertions(+), 2 deletions(-) +Merging char-misc.current/char-misc-linus (b29f680c4fe3 Revert "uio: fix vma io range check in mmap") +$ git merge char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + drivers/uio/uio.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging input-current/for-linus (31972f6e517d Input: ti_am335x_tsc - warn about incorrect spelling) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + drivers/input/tablet/wacom_wac.c | 28 +++++++--------------------- + drivers/input/touchscreen/ti_am335x_tsc.c | 5 ++++- + 2 files changed, 11 insertions(+), 22 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 (3901c1124ec5 crypto: s390 - fix aes,des ctr mode concurrency finding.) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (5b40dd30bbfa ide: Fix SC1200 dependencies) +$ git merge ide/master +Merge made by the 'recursive' strategy. + drivers/ide/Kconfig | 5 ++++- + drivers/ide/ide-probe.c | 8 +++++--- + 2 files changed, 9 insertions(+), 4 deletions(-) +Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) +$ git merge dwmw2/master +Already up-to-date. +Merging devicetree-current/devicetree/merge (4b660a7f5c80 Linux 3.15-rc6) +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging rr-fixes/fixes (79465d2fd48e module: remove warning about waiting module removal.) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging mfd-fixes/master (73beb63d290f mfd: rtsx_pcr: Disable interrupts before cancelling delayed works) +$ git merge mfd-fixes/master +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 (15d24aa5602f drm/i915: BDW: Adding missing cursor offsets.) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up-to-date. +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 (230a15f171ba ARC: remove checks for CONFIG_ARC_MMU_V4) +$ git merge arc/for-next +Merge made by the 'recursive' strategy. + arch/arc/include/asm/cache.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging arm/for-next (a6d997d18aa4 Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Auto-merging arch/arm/boot/compressed/vmlinux.lds.S +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/l2cc.txt | 3 +++ + arch/arm/boot/compressed/Makefile | 7 ++--- + arch/arm/boot/compressed/head.S | 7 ++--- + .../compressed/{vmlinux.lds.in => vmlinux.lds.S} | 14 ++++++++++ + arch/arm/mm/cache-l2x0.c | 31 ++++++++++++++++++++++ + arch/arm/plat-omap/dma.c | 2 ++ + 6 files changed, 56 insertions(+), 8 deletions(-) + rename arch/arm/boot/compressed/{vmlinux.lds.in => vmlinux.lds.S} (82%) +Merging arm-perf/for-next/perf (7171511eaec5 Linux 3.16-rc1) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (f2592714cddc ARM: use menuconfig for sub-arch menus) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 20 +-------------- + arch/arm/boot/dts/armada-375-db.dts | 2 ++ + arch/arm/boot/dts/armada-385-db.dts | 2 ++ + arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 2 +- + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/configs/omap2plus_defconfig | 1 + + arch/arm/mach-bcm/Kconfig | 7 +++--- + arch/arm/mach-berlin/Kconfig | 6 +---- + arch/arm/mach-cns3xxx/Kconfig | 7 +++--- + arch/arm/mach-davinci/Kconfig | 1 - + arch/arm/mach-exynos/Kconfig | 7 +----- + arch/arm/mach-exynos/common.h | 1 + + arch/arm/mach-exynos/exynos.c | 31 +++++++++++++++++++++++- + arch/arm/mach-exynos/platsmp.c | 26 ++------------------ + arch/arm/mach-highbank/Kconfig | 1 - + arch/arm/mach-imx/Kconfig | 10 +++----- + arch/arm/mach-integrator/Kconfig | 2 +- + arch/arm/mach-integrator/impd1.c | 12 ++++++++- + arch/arm/mach-keystone/Kconfig | 1 + + arch/arm/mach-moxart/Kconfig | 2 +- + arch/arm/mach-mvebu/Kconfig | 8 ++---- + arch/arm/mach-mvebu/pmsu.c | 9 ++++++- + arch/arm/mach-nomadik/Kconfig | 4 +-- + arch/arm/mach-omap2/Kconfig | 7 ++++-- + arch/arm/mach-omap2/common.h | 7 ++++++ + arch/arm/mach-prima2/Kconfig | 6 ++--- + arch/arm/mach-qcom/Kconfig | 6 +---- + arch/arm/mach-s3c24xx/Kconfig | 2 +- + arch/arm/mach-s3c64xx/Kconfig | 4 +-- + arch/arm/mach-s5p64x0/Kconfig | 6 +++-- + arch/arm/mach-s5pc100/Kconfig | 3 ++- + arch/arm/mach-s5pv210/Kconfig | 3 ++- + arch/arm/mach-shmobile/Kconfig | 6 ++--- + arch/arm/mach-spear/Kconfig | 1 - + arch/arm/mach-sti/Kconfig | 2 +- + arch/arm/mach-tegra/Kconfig | 8 +++--- + arch/arm/mach-u300/Kconfig | 6 +---- + arch/arm/mach-ux500/Kconfig | 7 +----- + arch/arm/mach-vexpress/Kconfig | 8 +++--- + arch/arm/mach-vt8500/Kconfig | 1 - + arch/arm/mach-zynq/Kconfig | 1 - + arch/arm/plat-samsung/Kconfig | 28 ++++++--------------- + drivers/bus/Kconfig | 2 +- + drivers/misc/vexpress-syscfg.c | 12 ++++++--- + drivers/remoteproc/Kconfig | 2 +- + 45 files changed, 132 insertions(+), 159 deletions(-) +Merging bcm2835/for-next (fa389e220254 Linux 3.14-rc6) +$ git merge bcm2835/for-next +Already up-to-date. +Merging berlin/berlin/for-next (251f72d06c59 Merge branch 'berlin/soc' into berlin/for-next) +$ git merge berlin/berlin/for-next +Auto-merging arch/arm/mach-berlin/Kconfig +Merge made by the 'recursive' strategy. + .../arm/cpu-enable-method/marvell,berlin-smp | 41 +++++++++ + .../devicetree/bindings/arm/marvell,berlin.txt | 16 ++++ + arch/arm/boot/dts/berlin2.dtsi | 6 ++ + arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 8 ++ + arch/arm/boot/dts/berlin2q.dtsi | 80 +++++++++++++++++ + arch/arm/mach-berlin/Kconfig | 3 + + arch/arm/mach-berlin/Makefile | 3 +- + arch/arm/mach-berlin/headsmp.S | 30 +++++++ + arch/arm/mach-berlin/platsmp.c | 99 ++++++++++++++++++++++ + 9 files changed, 285 insertions(+), 1 deletion(-) + create mode 100644 Documentation/devicetree/bindings/arm/cpu-enable-method/marvell,berlin-smp + create mode 100644 arch/arm/mach-berlin/headsmp.S + create mode 100644 arch/arm/mach-berlin/platsmp.c +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 (ba0ec8db3543 Merge branch 'imx/dt' into for-next) +$ git merge imx-mxs/for-next +Resolved 'arch/arm/mach-imx/Kconfig' using previous resolution. +Removing include/linux/platform_data/usb-imx_udc.h +Removing arch/arm/mach-imx/mx53.h +Removing arch/arm/mach-imx/mx51.h +Removing arch/arm/mach-imx/mm-imx5.c +Auto-merging arch/arm/mach-imx/mach-imx51.c +Removing arch/arm/mach-imx/iomux-mx51.h +Removing arch/arm/mach-imx/ehci-imx5.c +Removing arch/arm/mach-imx/devices/platform-imx_udc.c +Removing arch/arm/mach-imx/devices-imx51.h +Removing arch/arm/mach-imx/crm-regs-imx5.h +Auto-merging arch/arm/mach-imx/Kconfig +CONFLICT (content): Merge conflict in arch/arm/mach-imx/Kconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 97dc178830b8] Merge remote-tracking branch 'imx-mxs/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/clock/imx1-clock.txt | 26 + + arch/arm/boot/dts/Makefile | 5 + + .../imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts | 72 + + .../imx25-eukrea-mbimxsd25-baseboard-dvi-svga.dts | 45 + + .../imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dts | 45 + + arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi | 296 ++++ + .../boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts | 274 ++++ + arch/arm/boot/dts/imx28-cfa10036.dts | 22 + + arch/arm/boot/dts/imx35.dtsi | 8 + + arch/arm/boot/dts/imx51-babbage.dts | 1 + + arch/arm/boot/dts/imx6dl-gw51xx.dts | 2 +- + arch/arm/boot/dts/imx6dl-gw52xx.dts | 2 +- + arch/arm/boot/dts/imx6dl-gw53xx.dts | 2 +- + arch/arm/boot/dts/imx6dl-gw54xx.dts | 2 +- + arch/arm/boot/dts/imx6q-gw51xx.dts | 4 +- + arch/arm/boot/dts/imx6q-gw52xx.dts | 2 +- + arch/arm/boot/dts/imx6q-gw53xx.dts | 2 +- + arch/arm/boot/dts/imx6q-gw5400-a.dts | 4 +- + arch/arm/boot/dts/imx6q-gw54xx.dts | 2 +- + arch/arm/boot/dts/imx6q-udoo.dts | 32 + + arch/arm/boot/dts/imx6q.dtsi | 8 + + arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 8 +- + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 1 + + arch/arm/boot/dts/imx6qdl.dtsi | 10 + + arch/arm/boot/dts/imx6sl-evk.dts | 16 +- + arch/arm/boot/dts/imx6sl.dtsi | 2 +- + arch/arm/boot/dts/imx6sx-pinfunc.h | 1544 ++++++++++++++++++++ + arch/arm/boot/dts/imx6sx-sdb.dts | 210 +++ + arch/arm/boot/dts/imx6sx.dtsi | 1202 +++++++++++++++ + arch/arm/configs/imx_v4_v5_defconfig | 1 + + arch/arm/configs/imx_v6_v7_defconfig | 3 +- + arch/arm/configs/multi_v7_defconfig | 2 +- + arch/arm/configs/mxs_defconfig | 1 + + arch/arm/mach-imx/Kconfig | 25 +- + arch/arm/mach-imx/Makefile | 4 +- + arch/arm/mach-imx/clk-imx1.c | 152 +- + arch/arm/mach-imx/clk-imx25.c | 5 +- + arch/arm/mach-imx/clk-imx27.c | 86 +- + arch/arm/mach-imx/clk-imx51-imx53.c | 146 +- + arch/arm/mach-imx/clk-imx6q.c | 2 - + arch/arm/mach-imx/clk-imx6sl.c | 4 +- + arch/arm/mach-imx/clk-imx6sx.c | 3 - + arch/arm/mach-imx/clk.h | 3 +- + arch/arm/mach-imx/common.h | 23 +- + arch/arm/mach-imx/cpu-imx5.c | 25 +- + arch/arm/mach-imx/crm-regs-imx5.h | 600 -------- + arch/arm/mach-imx/devices-imx51.h | 66 - + arch/arm/mach-imx/devices/Kconfig | 6 +- + arch/arm/mach-imx/devices/Makefile | 1 - + arch/arm/mach-imx/devices/devices-common.h | 16 - + arch/arm/mach-imx/devices/platform-fec.c | 12 - + arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c | 5 - + arch/arm/mach-imx/devices/platform-imx-i2c.c | 26 - + arch/arm/mach-imx/devices/platform-imx-keypad.c | 10 - + arch/arm/mach-imx/devices/platform-imx-ssi.c | 20 - + arch/arm/mach-imx/devices/platform-imx-uart.c | 22 - + arch/arm/mach-imx/devices/platform-imx2-wdt.c | 18 - + arch/arm/mach-imx/devices/platform-imx_udc.c | 75 - + arch/arm/mach-imx/devices/platform-mxc-ehci.c | 9 - + arch/arm/mach-imx/devices/platform-mxc_nand.c | 5 - + arch/arm/mach-imx/devices/platform-pata_imx.c | 10 - + .../mach-imx/devices/platform-sdhci-esdhc-imx.c | 24 - + arch/arm/mach-imx/devices/platform-spi_imx.c | 27 - + arch/arm/mach-imx/ehci-imx25.c | 1 + + arch/arm/mach-imx/ehci-imx27.c | 1 + + arch/arm/mach-imx/ehci-imx31.c | 1 + + arch/arm/mach-imx/ehci-imx35.c | 1 + + arch/arm/mach-imx/ehci-imx5.c | 171 --- + arch/arm/mach-imx/ehci.h | 43 + + arch/arm/mach-imx/hardware.h | 2 - + arch/arm/mach-imx/imx27-dt.c | 6 - + arch/arm/mach-imx/iomux-mx51.h | 827 ----------- + arch/arm/mach-imx/mach-armadillo5x0.c | 1 + + arch/arm/mach-imx/mach-cpuimx27.c | 1 + + arch/arm/mach-imx/mach-cpuimx35.c | 1 + + arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 1 + + arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 1 + + arch/arm/mach-imx/mach-imx50.c | 3 +- + arch/arm/mach-imx/{imx51-dt.c => mach-imx51.c} | 43 +- + arch/arm/mach-imx/mach-imx53.c | 15 +- + arch/arm/mach-imx/mach-mx25_3ds.c | 1 + + arch/arm/mach-imx/mach-mx27_3ds.c | 1 + + arch/arm/mach-imx/mach-mx31_3ds.c | 1 + + arch/arm/mach-imx/mach-mx31lilly.c | 1 + + arch/arm/mach-imx/mach-mx31lite.c | 1 + + arch/arm/mach-imx/mach-mx31moboard.c | 1 + + arch/arm/mach-imx/mach-mx35_3ds.c | 1 + + arch/arm/mach-imx/mach-pca100.c | 1 + + arch/arm/mach-imx/mach-pcm037.c | 1 + + arch/arm/mach-imx/mach-pcm038.c | 1 + + arch/arm/mach-imx/mach-pcm043.c | 1 + + arch/arm/mach-imx/mach-vpr200.c | 1 + + arch/arm/mach-imx/mm-imx5.c | 155 -- + arch/arm/mach-imx/mx31moboard-devboard.c | 1 + + arch/arm/mach-imx/mx31moboard-marxbot.c | 1 + + arch/arm/mach-imx/mx31moboard-smartbot.c | 1 + + arch/arm/mach-imx/mx51.h | 346 ----- + arch/arm/mach-imx/mx53.h | 342 ----- + arch/arm/mach-imx/pm-imx5.c | 98 +- + arch/arm/mach-imx/time.c | 42 +- + arch/arm/mach-imx/tzic.c | 9 +- + include/dt-bindings/clock/imx1-clock.h | 40 + + include/dt-bindings/clock/imx6sl-clock.h | 3 +- + include/linux/platform_data/usb-ehci-mxc.h | 46 - + include/linux/platform_data/usb-imx_udc.h | 23 - + 109 files changed, 4399 insertions(+), 3138 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/imx1-clock.txt + create mode 100644 arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts + create mode 100644 arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-dvi-svga.dts + create mode 100644 arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dts + create mode 100644 arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi + create mode 100644 arch/arm/boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts + create mode 100755 arch/arm/boot/dts/imx6sx-pinfunc.h + create mode 100644 arch/arm/boot/dts/imx6sx-sdb.dts + create mode 100644 arch/arm/boot/dts/imx6sx.dtsi + delete mode 100644 arch/arm/mach-imx/crm-regs-imx5.h + delete mode 100644 arch/arm/mach-imx/devices-imx51.h + delete mode 100644 arch/arm/mach-imx/devices/platform-imx_udc.c + delete mode 100644 arch/arm/mach-imx/ehci-imx5.c + create mode 100644 arch/arm/mach-imx/ehci.h + delete mode 100644 arch/arm/mach-imx/iomux-mx51.h + rename arch/arm/mach-imx/{imx51-dt.c => mach-imx51.c} (54%) + delete mode 100644 arch/arm/mach-imx/mm-imx5.c + delete mode 100644 arch/arm/mach-imx/mx51.h + delete mode 100644 arch/arm/mach-imx/mx53.h + create mode 100644 include/dt-bindings/clock/imx1-clock.h + delete mode 100644 include/linux/platform_data/usb-imx_udc.h +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 (0a847a5b6ebe Merge branch 'mvebu/dt' into mvebu/for-next) +$ git merge mvebu/for-next +Merge made by the 'recursive' strategy. +Merging renesas/next (94da9af459c1 Merge branch 'sh-drivers-for-v3.16' into next) +$ git merge renesas/next +Resolved 'arch/arm/boot/dts/r8a7790-lager.dts' using previous resolution. +Auto-merging arch/arm/boot/dts/r8a7790-lager.dts +CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a7790-lager.dts +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 235764f72fae] Merge remote-tracking branch 'renesas/next' +$ git diff -M --stat --summary HEAD^.. +Merging samsung/for-next (c0c3c3590d0d ARM: EXYNOS: fix pm code to check for cortex A9 rather than the SoC) +$ git merge samsung/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos4.dtsi | 2 +- + arch/arm/mach-exynos/hotplug.c | 8 +------- + arch/arm/mach-exynos/pm.c | 15 +++++++++------ + drivers/clocksource/exynos_mct.c | 9 +++------ + 4 files changed, 14 insertions(+), 20 deletions(-) +Merging tegra/for-next (78d401aefcbb Merge branch for-3.17/defconfig into for-next) +$ git merge tegra/for-next +Auto-merging drivers/misc/fuse/tegra/speedo-tegra30.c +Auto-merging drivers/misc/fuse/tegra/speedo-tegra20.c +Auto-merging drivers/misc/fuse/tegra/speedo-tegra114.c +Removing arch/arm/mach-tegra/fuse.h +Removing arch/arm/mach-tegra/fuse.c +Removing arch/arm/mach-tegra/apbio.h +Removing arch/arm/mach-tegra/apbio.c +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-driver-tegra-fuse | 11 + + Documentation/devicetree/bindings/arm/tegra.txt | 2 + + .../bindings/fuse/nvidia,tegra20-fuse.txt | 40 ++ + .../bindings/misc/nvidia,tegra20-apbmisc.txt | 13 + + .../bindings/pci/nvidia,tegra20-pcie.txt | 30 +- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/cros-ec-keyboard.dtsi | 105 ++++ + arch/arm/boot/dts/exynos5250-snow.dts | 93 +-- + arch/arm/boot/dts/tegra114.dtsi | 15 + + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 1 + + arch/arm/boot/dts/tegra124-venice2.dts | 122 +--- + arch/arm/boot/dts/tegra124.dtsi | 30 + + arch/arm/boot/dts/tegra20-harmony.dts | 8 +- + arch/arm/boot/dts/tegra20-tamonten.dtsi | 7 +- + arch/arm/boot/dts/tegra20-trimslice.dts | 8 +- + arch/arm/boot/dts/tegra20.dtsi | 15 + + arch/arm/boot/dts/tegra30-apalis-eval.dts | 260 ++++++++ + arch/arm/boot/dts/tegra30-apalis.dtsi | 673 +++++++++++++++++++++ + arch/arm/boot/dts/tegra30-beaver.dts | 12 +- + arch/arm/boot/dts/tegra30-cardhu.dtsi | 11 +- + arch/arm/boot/dts/tegra30.dtsi | 15 + + arch/arm/configs/tegra_defconfig | 16 +- + arch/arm/lib/delay.c | 26 +- + arch/arm/mach-tegra/Makefile | 5 - + arch/arm/mach-tegra/apbio.c | 206 ------- + arch/arm/mach-tegra/apbio.h | 22 - + arch/arm/mach-tegra/cpuidle.c | 2 +- + arch/arm/mach-tegra/flowctrl.c | 2 +- + arch/arm/mach-tegra/fuse.c | 252 -------- + arch/arm/mach-tegra/fuse.h | 79 --- + arch/arm/mach-tegra/hotplug.c | 2 +- + arch/arm/mach-tegra/platsmp.c | 2 +- + arch/arm/mach-tegra/pm.c | 2 +- + arch/arm/mach-tegra/pmc.c | 15 +- + arch/arm/mach-tegra/pmc.h | 13 + + arch/arm/mach-tegra/powergate.c | 42 +- + arch/arm/mach-tegra/reset-handler.S | 2 +- + arch/arm/mach-tegra/reset.c | 2 +- + arch/arm/mach-tegra/sleep-tegra30.S | 2 +- + arch/arm/mach-tegra/tegra.c | 7 +- + drivers/clocksource/tegra20_timer.c | 13 + + drivers/misc/Makefile | 1 + + drivers/misc/fuse/Makefile | 1 + + drivers/misc/fuse/tegra/Makefile | 8 + + drivers/misc/fuse/tegra/fuse-tegra.c | 154 +++++ + drivers/misc/fuse/tegra/fuse-tegra20.c | 214 +++++++ + drivers/misc/fuse/tegra/fuse-tegra30.c | 223 +++++++ + drivers/misc/fuse/tegra/fuse.h | 71 +++ + .../misc/fuse/tegra/speedo-tegra114.c | 53 +- + drivers/misc/fuse/tegra/speedo-tegra124.c | 167 +++++ + .../misc/fuse/tegra/speedo-tegra20.c | 42 +- + .../misc/fuse/tegra/speedo-tegra30.c | 173 +++--- + drivers/misc/fuse/tegra/tegra-apbmisc.c | 110 ++++ + drivers/pci/host/pci-tegra.c | 148 +++-- + include/linux/tegra-soc.h | 42 ++ + init/calibrate.c | 11 + + 56 files changed, 2583 insertions(+), 1019 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-tegra-fuse + create mode 100644 Documentation/devicetree/bindings/fuse/nvidia,tegra20-fuse.txt + create mode 100644 Documentation/devicetree/bindings/misc/nvidia,tegra20-apbmisc.txt + create mode 100644 arch/arm/boot/dts/cros-ec-keyboard.dtsi + create mode 100644 arch/arm/boot/dts/tegra30-apalis-eval.dts + create mode 100644 arch/arm/boot/dts/tegra30-apalis.dtsi + delete mode 100644 arch/arm/mach-tegra/apbio.c + delete mode 100644 arch/arm/mach-tegra/apbio.h + delete mode 100644 arch/arm/mach-tegra/fuse.c + delete mode 100644 arch/arm/mach-tegra/fuse.h + create mode 100644 drivers/misc/fuse/Makefile + create mode 100644 drivers/misc/fuse/tegra/Makefile + create mode 100644 drivers/misc/fuse/tegra/fuse-tegra.c + create mode 100644 drivers/misc/fuse/tegra/fuse-tegra20.c + create mode 100644 drivers/misc/fuse/tegra/fuse-tegra30.c + create mode 100644 drivers/misc/fuse/tegra/fuse.h + rename arch/arm/mach-tegra/tegra114_speedo.c => drivers/misc/fuse/tegra/speedo-tegra114.c (55%) + create mode 100644 drivers/misc/fuse/tegra/speedo-tegra124.c + rename arch/arm/mach-tegra/tegra20_speedo.c => drivers/misc/fuse/tegra/speedo-tegra20.c (67%) + rename arch/arm/mach-tegra/tegra30_speedo.c => drivers/misc/fuse/tegra/speedo-tegra30.c (52%) + create mode 100644 drivers/misc/fuse/tegra/tegra-apbmisc.c +Merging arm64/for-next/core (9358d755bd5c arm64: kernel: initialize broadcast hrtimer based clock event device) +$ git merge arm64/for-next/core +Already up-to-date. +Merging blackfin/for-linus (51fdc6bf9880 blackfin: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)) +$ git merge blackfin/for-linus +Already up-to-date. +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 (e32634f5d57f pstore: Fix memory leak when decompress using big_oops_buf) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (e8d6dc5ad26e m68k/hp300: Convert printk to pr_foo()) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (83c6bdb827c9 m68knommu: Implement gpio support for m54xx.) +$ git merge m68knommu/for-next +Already up-to-date. +Merging metag/for-next (8bc613befaec metag: hugetlbpage: Remove null pointer checks that could never happen) +$ git merge metag/for-next +Merge made by the 'recursive' strategy. + arch/metag/mm/hugetlbpage.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging microblaze/next (225fba216261 microblaze: Fix typo in head.S s/substract/subtract/) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (3dae4934815d Merge branch '3.16-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Merge made by the 'recursive' strategy. + arch/mips/kernel/pm-cps.c | 4 ++-- + arch/mips/kernel/smp-cps.c | 2 +- + arch/mips/math-emu/ieee754.c | 18 +++++++++++++++--- + 3 files changed, 18 insertions(+), 6 deletions(-) +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 (455c6fdbd219 Linux 3.14) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc/next (68986c9f0f45 Revert "offb: Add palette hack for little endian") +$ git merge powerpc/next +Already up-to-date. +Merging fsl/next (e83eb028bb98 powerpc/fsl: Add fsl,portid-mapping to corenet1-cf chips) +$ 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 (fa73eb4738fc s390/ccwgroup: use ccwgroup_ungroup wrapper) +$ git merge s390/features +Auto-merging drivers/watchdog/Makefile +Auto-merging drivers/watchdog/Kconfig +Removing drivers/s390/char/vmwatchdog.c +Merge made by the 'recursive' strategy. + arch/s390/configs/default_defconfig | 5 +- + arch/s390/configs/gcov_defconfig | 5 +- + arch/s390/configs/performance_defconfig | 5 +- + arch/s390/configs/zfcpdump_defconfig | 3 +- + arch/s390/defconfig | 8 +- + arch/s390/include/asm/mmu_context.h | 33 ++-- + arch/s390/include/asm/switch_to.h | 4 - + arch/s390/include/uapi/asm/ucontext.h | 8 +- + arch/s390/kernel/compat_linux.h | 4 +- + drivers/s390/block/dcssblk.c | 2 +- + drivers/s390/char/Makefile | 1 - + drivers/s390/char/sclp_vt220.c | 2 - + drivers/s390/char/vmlogrdr.c | 2 +- + drivers/s390/char/vmwatchdog.c | 338 -------------------------------- + drivers/s390/cio/airq.c | 13 +- + drivers/s390/cio/ccwgroup.c | 28 ++- + drivers/s390/cio/cio.c | 2 + + drivers/s390/cio/device.c | 71 +++---- + drivers/s390/cio/qdio_debug.c | 79 +++++++- + drivers/s390/cio/qdio_debug.h | 2 +- + drivers/s390/cio/qdio_main.c | 16 +- + drivers/s390/crypto/ap_bus.c | 4 +- + drivers/s390/crypto/zcrypt_api.c | 2 +- + drivers/watchdog/Kconfig | 7 +- + drivers/watchdog/Makefile | 1 + + drivers/watchdog/diag288_wdt.c | 316 +++++++++++++++++++++++++++++ + 26 files changed, 505 insertions(+), 456 deletions(-) + delete mode 100644 drivers/s390/char/vmwatchdog.c + create mode 100644 drivers/watchdog/diag288_wdt.c +Merging sparc-next/master (311b8935ad4e Merge branch 'sparc_sparse_fixes') +$ git merge sparc-next/master +Resolved 'arch/sparc/include/asm/pgtable_64.h' using previous resolution. +Auto-merging kernel/sysctl.c +Auto-merging arch/sparc/mm/tsb.c +Removing arch/sparc/mm/srmmu.h +Auto-merging arch/sparc/mm/init_64.c +Auto-merging arch/sparc/mm/fault_64.c +Auto-merging arch/sparc/kernel/unaligned_64.c +Removing arch/sparc/kernel/tadpole.c +Auto-merging arch/sparc/kernel/smp_64.c +Auto-merging arch/sparc/kernel/pci.c +Auto-merging arch/sparc/include/asm/pgtable_64.h +CONFLICT (content): Merge conflict in arch/sparc/include/asm/pgtable_64.h +Auto-merging arch/sparc/include/asm/pci_64.h +Auto-merging arch/sparc/include/asm/checksum_64.h +Auto-merging arch/sparc/include/asm/checksum_32.h +Auto-merging arch/sparc/include/asm/bitops_64.h +Auto-merging arch/sparc/include/asm/bitops_32.h +Auto-merging arch/sparc/include/asm/atomic_64.h +Auto-merging arch/sparc/include/asm/atomic_32.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 930da508e60b] Merge remote-tracking branch 'sparc-next/master' +$ git diff -M --stat --summary HEAD^.. + arch/sparc/crypto/aes_glue.c | 6 +- + arch/sparc/include/asm/atomic_32.h | 8 +- + arch/sparc/include/asm/atomic_64.h | 18 +- + arch/sparc/include/asm/auxio.h | 7 + + arch/sparc/include/asm/auxio_32.h | 6 +- + arch/sparc/include/asm/auxio_64.h | 6 +- + arch/sparc/include/asm/bitext.h | 6 +- + arch/sparc/include/asm/bitops_32.h | 6 +- + arch/sparc/include/asm/bitops_64.h | 24 +-- + arch/sparc/include/asm/btext.h | 2 +- + arch/sparc/include/asm/bug.h | 4 +- + arch/sparc/include/asm/cacheflush_32.h | 8 +- + arch/sparc/include/asm/cacheflush_64.h | 24 +-- + arch/sparc/include/asm/checksum_32.h | 4 +- + arch/sparc/include/asm/checksum_64.h | 32 ++-- + arch/sparc/include/asm/cmpxchg_32.h | 6 +- + arch/sparc/include/asm/cmpxchg_64.h | 4 +- + arch/sparc/include/asm/cpudata.h | 10 + + arch/sparc/include/asm/cpudata_64.h | 5 - + arch/sparc/include/asm/delay_32.h | 4 +- + arch/sparc/include/asm/delay_64.h | 4 +- + arch/sparc/include/asm/device.h | 2 +- + arch/sparc/include/asm/dma-mapping.h | 2 +- + arch/sparc/include/asm/ebus_dma.h | 16 +- + arch/sparc/include/asm/floppy_32.h | 14 +- + arch/sparc/include/asm/floppy_64.h | 2 +- + arch/sparc/include/asm/ftrace.h | 6 +- + arch/sparc/include/asm/highmem.h | 10 +- + arch/sparc/include/asm/hvtramp.h | 2 +- + arch/sparc/include/asm/hypervisor.h | 325 ++++++++++++++++---------------- + arch/sparc/include/asm/idprom.h | 2 +- + arch/sparc/include/asm/io-unit.h | 2 +- + arch/sparc/include/asm/io_32.h | 299 ++++++----------------------- + arch/sparc/include/asm/io_64.h | 21 +-- + arch/sparc/include/asm/iommu_32.h | 10 +- + arch/sparc/include/asm/iommu_64.h | 6 +- + arch/sparc/include/asm/irq_32.h | 3 +- + arch/sparc/include/asm/irq_64.h | 44 ++--- + arch/sparc/include/asm/irqflags_32.h | 6 +- + arch/sparc/include/asm/kdebug_64.h | 2 +- + arch/sparc/include/asm/kgdb.h | 5 +- + arch/sparc/include/asm/kprobes.h | 8 +- + arch/sparc/include/asm/ldc.h | 66 +++---- + arch/sparc/include/asm/leon.h | 54 +++--- + arch/sparc/include/asm/leon_pci.h | 4 +- + arch/sparc/include/asm/mc146818rtc.h | 5 + + arch/sparc/include/asm/mdesc.h | 32 ++-- + arch/sparc/include/asm/mmu_64.h | 6 +- + arch/sparc/include/asm/mmu_context_64.h | 24 +-- + arch/sparc/include/asm/nmi.h | 10 +- + arch/sparc/include/asm/oplib_32.h | 68 +++---- + arch/sparc/include/asm/oplib_64.h | 112 +++++------ + arch/sparc/include/asm/page.h | 3 + + arch/sparc/include/asm/page_64.h | 8 +- + arch/sparc/include/asm/pci_64.h | 14 +- + arch/sparc/include/asm/pcic.h | 8 +- + arch/sparc/include/asm/pcr.h | 6 +- + arch/sparc/include/asm/pgalloc_32.h | 2 + + arch/sparc/include/asm/pgalloc_64.h | 16 +- + arch/sparc/include/asm/pgtable_32.h | 11 +- + arch/sparc/include/asm/pgtable_64.h | 58 +++--- + arch/sparc/include/asm/processor_32.h | 5 +- + arch/sparc/include/asm/processor_64.h | 6 +- + arch/sparc/include/asm/prom.h | 24 +-- + arch/sparc/include/asm/ptrace.h | 2 +- + arch/sparc/include/asm/setup.h | 39 +++- + arch/sparc/include/asm/sfp-machine_32.h | 28 +-- + arch/sparc/include/asm/smp_32.h | 6 +- + arch/sparc/include/asm/smp_64.h | 24 ++- + arch/sparc/include/asm/spitfire.h | 2 +- + arch/sparc/include/asm/stacktrace.h | 2 +- + arch/sparc/include/asm/starfire.h | 8 +- + arch/sparc/include/asm/string_32.h | 12 +- + arch/sparc/include/asm/string_64.h | 12 +- + arch/sparc/include/asm/switch_to_32.h | 6 +- + arch/sparc/include/asm/switch_to_64.h | 4 +- + arch/sparc/include/asm/syscalls.h | 8 +- + arch/sparc/include/asm/timer_32.h | 6 +- + arch/sparc/include/asm/timer_64.h | 6 +- + arch/sparc/include/asm/tlb_64.h | 8 +- + arch/sparc/include/asm/tlbflush_64.h | 22 +-- + arch/sparc/include/asm/topology_64.h | 2 +- + arch/sparc/include/asm/trap_block.h | 6 +- + arch/sparc/include/asm/uaccess.h | 2 +- + arch/sparc/include/asm/uaccess_32.h | 14 +- + arch/sparc/include/asm/uaccess_64.h | 50 ++--- + arch/sparc/include/asm/vio.h | 36 ++-- + arch/sparc/include/asm/visasm.h | 3 +- + arch/sparc/include/asm/xor_64.h | 28 +-- + arch/sparc/kernel/Makefile | 1 - + arch/sparc/kernel/audit.c | 8 +- + arch/sparc/kernel/auxio_32.c | 9 +- + arch/sparc/kernel/btext.c | 2 +- + arch/sparc/kernel/compat_audit.c | 1 + + arch/sparc/kernel/cpu.c | 1 + + arch/sparc/kernel/cpumap.h | 4 +- + arch/sparc/kernel/devices.c | 12 +- + arch/sparc/kernel/entry.h | 259 +++++++++++++------------ + arch/sparc/kernel/iommu.c | 3 +- + arch/sparc/kernel/iommu_common.h | 14 +- + arch/sparc/kernel/ioport.c | 6 +- + arch/sparc/kernel/irq.h | 11 +- + arch/sparc/kernel/irq_32.c | 1 + + arch/sparc/kernel/kernel.h | 124 ++++++++++-- + arch/sparc/kernel/kgdb_64.c | 2 + + arch/sparc/kernel/kprobes.c | 5 +- + arch/sparc/kernel/leon_kernel.c | 10 +- + arch/sparc/kernel/leon_pci.c | 79 -------- + arch/sparc/kernel/leon_pci_grpci1.c | 16 +- + arch/sparc/kernel/leon_pci_grpci2.c | 22 +-- + arch/sparc/kernel/leon_pmc.c | 8 +- + arch/sparc/kernel/leon_smp.c | 13 +- + arch/sparc/kernel/of_device_common.c | 4 +- + arch/sparc/kernel/pci.c | 1 + + arch/sparc/kernel/pci_impl.h | 30 +-- + arch/sparc/kernel/pci_sun4v.h | 156 +++++++-------- + arch/sparc/kernel/pcic.c | 116 +----------- + arch/sparc/kernel/perf_event.c | 23 ++- + arch/sparc/kernel/process_32.c | 12 +- + arch/sparc/kernel/process_64.c | 2 +- + arch/sparc/kernel/prom.h | 2 +- + arch/sparc/kernel/prom_64.c | 5 +- + arch/sparc/kernel/psycho_common.h | 22 +-- + arch/sparc/kernel/ptrace_32.c | 2 + + arch/sparc/kernel/setup_32.c | 4 +- + arch/sparc/kernel/signal32.c | 56 ++---- + arch/sparc/kernel/signal_32.c | 11 +- + arch/sparc/kernel/signal_64.c | 6 +- + arch/sparc/kernel/smp_32.c | 13 +- + arch/sparc/kernel/smp_64.c | 16 +- + arch/sparc/kernel/sun4d_irq.c | 17 +- + arch/sparc/kernel/sys_sparc32.c | 2 + + arch/sparc/kernel/sys_sparc_32.c | 10 +- + arch/sparc/kernel/sys_sparc_64.c | 1 + + arch/sparc/kernel/systbls.h | 124 +++++++++--- + arch/sparc/kernel/tadpole.c | 126 ------------- + arch/sparc/kernel/time_32.c | 8 +- + arch/sparc/kernel/traps_32.c | 4 +- + arch/sparc/kernel/traps_64.c | 11 +- + arch/sparc/kernel/unaligned_32.c | 4 + + arch/sparc/kernel/unaligned_64.c | 2 + + arch/sparc/kernel/windows.c | 3 + + arch/sparc/lib/Makefile | 2 +- + arch/sparc/math-emu/sfp-util_32.h | 20 +- + arch/sparc/math-emu/sfp-util_64.h | 12 +- + arch/sparc/mm/fault_32.c | 9 +- + arch/sparc/mm/fault_64.c | 4 +- + arch/sparc/mm/init_32.c | 7 +- + arch/sparc/mm/init_64.c | 9 +- + arch/sparc/mm/init_64.h | 4 +- + arch/sparc/mm/io-unit.c | 21 ++- + arch/sparc/mm/iommu.c | 25 ++- + arch/sparc/mm/leon_mm.c | 4 +- + arch/sparc/mm/mm_32.h | 24 +++ + arch/sparc/mm/srmmu.c | 13 +- + arch/sparc/mm/srmmu.h | 4 - + arch/sparc/mm/tsb.c | 1 + + arch/sparc/prom/misc_64.c | 5 - + include/linux/profile.h | 1 + + kernel/sysctl.c | 4 - + 160 files changed, 1579 insertions(+), 1853 deletions(-) + delete mode 100644 arch/sparc/kernel/tadpole.c + create mode 100644 arch/sparc/mm/mm_32.h + delete mode 100644 arch/sparc/mm/srmmu.h +Merging tile/master (8dfb6948f7d8 tile: use ARRAY_SIZE) +$ git merge tile/master +Merge made by the 'recursive' strategy. + arch/tile/kernel/traps.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 +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 7e85c411f359] 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 (8c76c188d498 unicore32: Remove ARCH_HAS_CPUFREQ config option) +$ git merge unicore32/unicore32 +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 +-- + arch/unicore32/Kconfig | 6 ---- + arch/unicore32/include/asm/io.h | 27 +++++++++++++++++ + arch/unicore32/include/asm/pgtable.h | 10 +++---- + arch/unicore32/include/asm/ptrace.h | 1 + + arch/unicore32/kernel/clock.c | 8 ++--- + arch/unicore32/kernel/ksyms.c | 41 ++----------------------- + arch/unicore32/kernel/ksyms.h | 2 -- + arch/unicore32/kernel/module.c | 11 ++----- + arch/unicore32/kernel/process.c | 1 + + arch/unicore32/kernel/setup.c | 4 +++ + arch/unicore32/mm/alignment.c | 1 + + arch/unicore32/mm/proc-syms.c | 2 ++ + drivers/rtc/rtc-puv3.c | 4 +-- + drivers/scsi/mvsas/mv_94xx.c | 10 +++---- + drivers/scsi/mvsas/mv_94xx.h | 58 ++++++++++++++++++------------------ + 16 files changed, 88 insertions(+), 102 deletions(-) +Merging xtensa/for_next (55b441be5cd6 xtensa: ISS: don't depend on CONFIG_TTY) +$ git merge xtensa/for_next +Already up-to-date. +Merging btrfs/next (c7548af69d9e Btrfs: convert smp_mb__{before,after}_clear_bit) +$ git merge btrfs/next +Already up-to-date. +Merging ceph/master (437f2c0d0c01 rbd: fix ida/idr memory leak) +$ git merge ceph/master +Auto-merging fs/dcache.c +Merge made by the 'recursive' strategy. + fs/dcache.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging cifs/for-next (a1d0b84c308d fs/cifs: fix regression in cifs_create_mf_symlink()) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/link.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (9e78d14a9f64 Use %pd in eCryptFS) +$ 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 | 12 ++++++------ + 2 files changed, 8 insertions(+), 8 deletions(-) +Merging ext3/for_next (19ef1229bc2e reiserfs: Fix compilation breakage with CONFIG_REISERFS_CHECK) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (f8409abdc592 Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (395fd9094524 f2fs: avoid to truncate non-updated page partially) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + fs/f2fs/data.c | 24 ++++++++++++++++++------ + fs/f2fs/f2fs.h | 6 ++---- + fs/f2fs/file.c | 22 ++++++++++++++-------- + fs/f2fs/inode.c | 1 + + fs/f2fs/segment.c | 2 -- + fs/f2fs/super.c | 4 +--- + 6 files changed, 36 insertions(+), 23 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 (1560c974dcd4 fuse: add renameat2 support) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master (0e48e055a7df GFS2: Prevent recovery before the local journal is set) +$ git merge gfs2/master +Already up-to-date. +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 (886023c676af NFSv4: test SECINFO RPC_AUTH_GSS pseudoflavors for support) +$ git merge nfs/linux-next +Merge made by the 'recursive' strategy. + fs/nfs/blocklayout/blocklayout.c | 99 ++++++++-------- + fs/nfs/direct.c | 33 ++---- + fs/nfs/filelayout/filelayout.c | 180 +++++++++++++--------------- + fs/nfs/internal.h | 11 +- + fs/nfs/nfs3proc.c | 21 ++-- + fs/nfs/nfs4_fs.h | 8 +- + fs/nfs/nfs4namespace.c | 102 +++++++++------- + fs/nfs/nfs4proc.c | 107 +++++++++-------- + fs/nfs/nfs4trace.h | 28 ++--- + fs/nfs/objlayout/objio_osd.c | 24 ++-- + fs/nfs/objlayout/objlayout.c | 81 ++++++------- + fs/nfs/objlayout/objlayout.h | 8 +- + fs/nfs/pagelist.c | 248 ++++++++++++++++++--------------------- + fs/nfs/pnfs.c | 161 +++++++------------------ + fs/nfs/pnfs.h | 18 ++- + fs/nfs/proc.c | 27 +++-- + fs/nfs/read.c | 48 ++++---- + fs/nfs/write.c | 80 ++++++------- + include/linux/nfs_page.h | 15 ++- + include/linux/nfs_xdr.h | 33 ++---- + net/sunrpc/auth.c | 1 + + 21 files changed, 604 insertions(+), 729 deletions(-) +Merging nfsd/nfsd-next (48385408b455 nfsd4: fix FREE_STATEID lockowner leak) +$ git merge nfsd/nfsd-next +Already up-to-date. +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 (380347e9ca76 UBIFS: Add an assertion for clean_zn_cnt) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (7691283d0561 Merge branch 'xfs-misc-fixes-3-for-3.16' into for-next) +$ git merge xfs/for-next +Already up-to-date. +Merging file-private-locks/linux-next (7dfeba1f206f locks: set fl_owner for leases back to current->files) +$ git merge file-private-locks/linux-next +Auto-merging include/linux/fs.h +Merge made by the 'recursive' strategy. + fs/locks.c | 2 +- + include/linux/fs.h | 6 ++++++ + 2 files changed, 7 insertions(+), 1 deletion(-) +Merging vfs/for-next (9bd0bc947d95 kill generic_file_splice_write()) +$ git merge vfs/for-next +Resolved 'fs/splice.c' using previous resolution. +Auto-merging fs/splice.c +CONFLICT (content): Merge conflict in fs/splice.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f33a6c7e9121] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging pci/next (7171511eaec5 Linux 3.16-rc1) +$ git merge pci/next +Already up-to-date. +Merging hid/for-next (81ba992689ce HID: usbhid: remove unneeded initialization of quirks_param[]) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/usbhid/hid-core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging i2c/i2c/for-next (f0b1f6442b50 Merge tag 'v3.16-rc1' into i2c/for-next) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/i2c/i2c-rk3x.txt | 42 ++ + .../devicetree/bindings/i2c/i2c-sunxi-p2wi.txt | 41 ++ + drivers/i2c/busses/Kconfig | 23 + + drivers/i2c/busses/Makefile | 2 + + drivers/i2c/busses/i2c-rk3x.c | 763 +++++++++++++++++++++ + drivers/i2c/busses/i2c-sun6i-p2wi.c | 345 ++++++++++ + 6 files changed, 1216 insertions(+) + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-rk3x.txt + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-sunxi-p2wi.txt + create mode 100644 drivers/i2c/busses/i2c-rk3x.c + create mode 100644 drivers/i2c/busses/i2c-sun6i-p2wi.c +Merging jdelvare-hwmon/master (c7208164e66f Linux 3.15-rc7) +$ git merge jdelvare-hwmon/master +Already up-to-date. +Merging hwmon-staging/hwmon-next (2a3c653051b1 hwmon: (gpio-fan) Convert to devm_hwmon_device_register_with_groups) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + Documentation/hwmon/powr1220 | 45 +++++ + drivers/hwmon/Kconfig | 12 ++ + drivers/hwmon/Makefile | 1 + + drivers/hwmon/gpio-fan.c | 17 +- + drivers/hwmon/powr1220.c | 391 +++++++++++++++++++++++++++++++++++++ + drivers/hwmon/twl4030-madc-hwmon.c | 38 +--- + 6 files changed, 459 insertions(+), 45 deletions(-) + create mode 100644 Documentation/hwmon/powr1220 + create mode 100644 drivers/hwmon/powr1220.c +Merging v4l-dvb/master (656111f4b9cb Merge branch 'topic/omap3isp' into to_next) +$ git merge v4l-dvb/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging kbuild/for-next (d54578541a36 Merge v3.16-rc1 into kbuild/for-next) +$ git merge kbuild/for-next +Merge made by the 'recursive' strategy. + Documentation/lto-build | 173 +++++++++++++++++++++++++++++++++++++++++++++++ + Makefile | 19 +++++- + arch/x86/Kconfig | 2 +- + init/Kconfig | 73 ++++++++++++++++++++ + kernel/gcov/Kconfig | 2 +- + lib/Kconfig.debug | 2 +- + scripts/Makefile.lto | 84 +++++++++++++++++++++++ + scripts/Makefile.modpost | 7 +- + scripts/link-vmlinux.sh | 2 +- + 9 files changed, 356 insertions(+), 8 deletions(-) + create mode 100644 Documentation/lto-build + create mode 100644 scripts/Makefile.lto +Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings) +$ git merge kconfig/for-next +Already up-to-date. +Merging libata/for-next (341434ff1abc Merge branch 'for-3.17' into for-next) +$ git merge libata/for-next +Merge made by the 'recursive' strategy. + drivers/ata/ahci_xgene.c | 10 ---------- + drivers/ata/libahci_platform.c | 20 +++++++++++++++++++- + drivers/ata/sata_fsl.c | 5 ++--- + 3 files changed, 21 insertions(+), 14 deletions(-) +Merging pm/linux-next (8d2cc5713760 Merge branch 'pm-sleep') +$ git merge pm/linux-next +Auto-merging arch/x86/Kconfig +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 14 +++++--- + arch/ia64/hp/common/sba_iommu.c | 64 +++++++++++++++++++++---------------- + arch/x86/Kconfig | 1 - + arch/x86/boot/compressed/aslr.c | 9 +++++- + drivers/acpi/acpi_extlog.c | 14 ++++---- + drivers/acpi/apei/apei-internal.h | 10 +++--- + drivers/acpi/apei/ghes.c | 32 +++++++++---------- + drivers/cpufreq/Kconfig | 2 ++ + drivers/firmware/efi/cper.c | 20 ++++++------ + include/acpi/actbl1.h | 14 ++++---- + include/acpi/ghes.h | 2 +- + include/linux/suspend.h | 2 ++ + kernel/power/hibernate.c | 37 ++++++++++++++++++++- + kernel/power/main.c | 6 ++-- + kernel/power/user.c | 3 ++ + 15 files changed, 146 insertions(+), 84 deletions(-) +Merging idle/next (23a299cd9378 Merge branches 'turbostat' and 'intel_idle' into release) +$ git merge idle/next +Already up-to-date. +Merging apm/for-next (158204397034 apm-emulation: add hibernation APM events to support suspend2disk) +$ 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 (63745aa72ed1 Merge branches 'armada-375-380-soc-support', 'eduardo-thermal-soc-fixes', 'intel-soc-dts-thermal' and 'thermal-soc-fixes' of .git into next) +$ git merge thermal/next +Already up-to-date. +Merging ieee1394/for-next (165d560bb267 Merge branch 'master' into for-next) +$ git merge ieee1394/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging dlm/next (883854c5457a dlm: keep listening connection alive with sctp mode) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (0cb637bff80d swiotlb: Don't DoS us with 'swiotlb buffer is full' (v2)) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging slave-dma/next (7171511eaec5 Linux 3.16-rc1) +$ git merge slave-dma/next +Already up-to-date. +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 (e0f802fbcaa3 tcp: move ir_mark initialization to tcp_openreq_init) +$ git merge net-next/master +Merge made by the 'recursive' strategy. + drivers/net/ieee802154/mrf24j40.c | 115 +++++++++++++++++++++++++++++--------- + include/net/tcp.h | 3 +- + net/core/dev.c | 6 +- + net/ipv4/tcp_ipv4.c | 3 +- + net/ipv6/tcp_ipv6.c | 3 +- + 5 files changed, 94 insertions(+), 36 deletions(-) +Merging ipsec-next/master (7171511eaec5 Linux 3.16-rc1) +$ git merge ipsec-next/master +Already up-to-date. +Merging wireless-next/master (7171511eaec5 Linux 3.16-rc1) +$ git merge wireless-next/master +Already up-to-date. +Merging bluetooth/master (07a3b8c84c2c Bluetooth: Fix validating IO capability values in mgmt commands) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/Kconfig | 12 ++--- + drivers/bluetooth/ath3k.c | 4 +- + include/net/bluetooth/bluetooth.h | 18 +++---- + include/net/bluetooth/hci.h | 9 ---- + include/net/bluetooth/hci_core.h | 2 +- + include/net/bluetooth/l2cap.h | 6 +-- + net/bluetooth/a2mp.c | 7 +-- + net/bluetooth/hci_conn.c | 12 ++++- + net/bluetooth/hci_core.c | 19 +++---- + net/bluetooth/hci_event.c | 7 +-- + net/bluetooth/l2cap_core.c | 33 +++++------- + net/bluetooth/l2cap_sock.c | 9 ++-- + net/bluetooth/mgmt.c | 15 ++++-- + net/bluetooth/smp.c | 105 +++++++++++++++++++++++++------------- + net/bluetooth/smp.h | 7 +++ + 15 files changed, 156 insertions(+), 109 deletions(-) +Merging infiniband/for-next (eeaddf3670d4 Merge branches 'core', 'cxgb3', 'cxgb4', 'iser', 'iwpm', 'misc', 'mlx4', 'mlx5', 'noio', 'ocrdma', 'qib', 'srp' and 'usnic' into for-next) +$ git merge infiniband/for-next +Already up-to-date. +Merging mtd/master (7171511eaec5 Linux 3.16-rc1) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (7171511eaec5 Linux 3.16-rc1) +$ git merge l2-mtd/master +Already up-to-date. +Merging crypto/master (5208ed2ca165 crypto: testmgr - add aead cbc des, des3_ede tests) +$ git merge crypto/master +Already up-to-date. +Merging drm/drm-next (bc1dfff04a5d Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next) +$ git merge drm/drm-next +Already up-to-date. +Merging drm-panel/drm/panel/for-next (7e40b5162b3c drm/panel: make DRM_PANEL_LD9040 depend on SPI) +$ git merge drm-panel/drm/panel/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/panel/Kconfig | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) +Merging drm-intel/for-linux-next (27b6c122512c drm/i915/chv: Ack interrupts before handling them (CHV)) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/i915_irq.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_crtc.c | 357 ++++++++++----- + drivers/gpu/drm/i915/i915_cmd_parser.c | 3 + + drivers/gpu/drm/i915/i915_debugfs.c | 50 +- + drivers/gpu/drm/i915/i915_dma.c | 34 +- + drivers/gpu/drm/i915/i915_drv.c | 8 +- + drivers/gpu/drm/i915/i915_drv.h | 32 +- + drivers/gpu/drm/i915/i915_gem.c | 70 +-- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 54 ++- + drivers/gpu/drm/i915/i915_gem_gtt.h | 5 +- + drivers/gpu/drm/i915/i915_gem_render_state.c | 161 +++---- + drivers/gpu/drm/i915/i915_gem_stolen.c | 21 +- + drivers/gpu/drm/i915/i915_irq.c | 213 +++++---- + drivers/gpu/drm/i915/i915_params.c | 5 + + drivers/gpu/drm/i915/i915_reg.h | 442 ++++++++++-------- + drivers/gpu/drm/i915/intel_ddi.c | 4 +- + drivers/gpu/drm/i915/intel_display.c | 632 +++++++++++++++++++++++--- + drivers/gpu/drm/i915/intel_dp.c | 279 ++++++++---- + drivers/gpu/drm/i915/intel_drv.h | 14 +- + drivers/gpu/drm/i915/intel_dsi.c | 26 +- + drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 8 +- + drivers/gpu/drm/i915/intel_dvo.c | 8 + + drivers/gpu/drm/i915/intel_fbdev.c | 2 +- + drivers/gpu/drm/i915/intel_hdmi.c | 65 +++ + drivers/gpu/drm/i915/intel_pm.c | 350 ++++++++++---- + drivers/gpu/drm/i915/intel_renderstate.h | 2 - + drivers/gpu/drm/i915/intel_renderstate_gen6.c | 1 + + drivers/gpu/drm/i915/intel_renderstate_gen7.c | 1 + + drivers/gpu/drm/i915/intel_renderstate_gen8.c | 1 + + drivers/gpu/drm/i915/intel_ringbuffer.c | 10 +- + drivers/gpu/drm/i915/intel_sprite.c | 2 + + drivers/gpu/drm/i915/intel_uncore.c | 181 ++++++-- + include/drm/drm_crtc.h | 6 +- + 33 files changed, 2185 insertions(+), 864 deletions(-) +Merging drm-tegra/drm/tegra/for-next (1f64ae7c5af0 drm/tegra: sor - Remove obsolete comment) +$ git merge drm-tegra/drm/tegra/for-next +Already up-to-date. +Merging sound/for-next (74b0c2d75fb4 drm/i915, HD-audio: Don't continue probing when nomodeset is given) +$ git merge sound/for-next +Already up-to-date. +Merging sound-asoc/for-next (e1f422c43498 Merge remote-tracking branches 'asoc/topic/spdif', 'asoc/topic/wm8904' and 'asoc/topic/wm8985' into asoc-next) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/wm8904.txt | 33 ++++++ + include/linux/mfd/arizona/core.h | 6 ++ + sound/arm/pxa2xx-ac97-lib.c | 12 +-- + sound/soc/atmel/atmel_wm8904.c | 50 --------- + sound/soc/codecs/Kconfig | 14 ++- + sound/soc/codecs/Makefile | 4 + + sound/soc/codecs/arizona.c | 112 +++++++++++++++++++-- + sound/soc/codecs/rl6231.c | 19 ---- + sound/soc/codecs/rt5677.c | 47 +-------- + sound/soc/codecs/sigmadsp-i2c.c | 35 +++++++ + sound/soc/codecs/sigmadsp-regmap.c | 36 +++++++ + sound/soc/codecs/sigmadsp.c | 65 +----------- + sound/soc/codecs/sigmadsp.h | 20 ++++ + sound/soc/codecs/spdif_transmitter.c | 2 +- + sound/soc/codecs/wm5102.c | 62 ++++++++++++ + sound/soc/codecs/wm8904.c | 11 ++ + sound/soc/codecs/wm8985.c | 3 - + sound/soc/codecs/wm8994.c | 9 +- + sound/soc/fsl/fsl_dma.c | 4 +- + sound/soc/fsl/fsl_spdif.c | 92 +++++++++-------- + sound/soc/fsl/fsl_spdif.h | 10 +- + sound/soc/fsl/fsl_ssi.c | 4 +- + sound/soc/intel/byt-rt5640.c | 1 + + sound/soc/intel/sst-baytrail-ipc.c | 30 ++++++ + sound/soc/pxa/Kconfig | 11 +- + sound/soc/samsung/Kconfig | 2 +- + sound/soc/sh/rcar/core.c | 2 +- + sound/soc/soc-dapm.c | 29 +++--- + 28 files changed, 457 insertions(+), 268 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/wm8904.txt + create mode 100644 sound/soc/codecs/sigmadsp-i2c.c + create mode 100644 sound/soc/codecs/sigmadsp-regmap.c +Merging modules/modules-next (4982223e51e8 module: set nx before marking module MODULE_STATE_COMING.) +$ git merge modules/modules-next +Already up-to-date. +Merging virtio/virtio-next (c77fba9ab058 virtio_scsi: don't call virtqueue_add_sgs(... GFP_NOIO) holding spinlock.) +$ git merge virtio/virtio-next +Already up-to-date. +Merging input/next (68807a0c2015 Input: atmel_mxt_ts - fix invalid return from mxt_get_bootloader_version) +$ git merge input/next +Already up-to-date. +Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) +$ git merge input-mt/for-next +Already up-to-date. +Merging block/for-next (a2d445d44000 block: add __init to blkcg_policy_register) +$ git merge block/for-next +Already up-to-date. +Merging device-mapper/for-next (a27595b04b91 dm crypt: sort writes) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + block/bio.c | 3 +- + drivers/md/dm-crypt.c | 405 ++++++++++++++++++++++++++------------------------ + 2 files changed, 214 insertions(+), 194 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 (2e9c22fc6471 mmc: core: Fix DT documentation of eMMC high-speed DDR 1.8/1.2V bindings) +$ git merge mmc-uh/next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mmc/mmc.txt | 4 +- + .../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 54 ++++ + drivers/mmc/core/bus.c | 10 +- + drivers/mmc/core/quirks.c | 2 +- + drivers/mmc/core/sd_ops.c | 3 + + drivers/mmc/host/dw_mmc.c | 10 +- + drivers/mmc/host/mmci.c | 127 ++++++++- + drivers/mmc/host/mmci.h | 20 ++ + drivers/mmc/host/moxart-mmc.c | 1 - + drivers/mmc/host/omap_hsmmc.c | 283 +++++++++++++++++++-- + drivers/mmc/host/sdhci.c | 104 +++----- + drivers/mmc/host/sh_mmcif.c | 83 ++---- + drivers/mmc/host/wmt-sdmmc.c | 33 ++- + include/linux/mmc/sdhci.h | 3 - + include/linux/platform_data/mmc-omap.h | 1 + + 15 files changed, 546 insertions(+), 192 deletions(-) +Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command) +$ git merge kgdb/kgdb-next +Merge made by the 'recursive' strategy. +Merging slab/for-next (201ed0edb712 Merge branch 'slab/next' into for-next) +$ git merge slab/for-next +Auto-merging mm/slub.c +Auto-merging mm/slab_common.c +Merge made by the 'recursive' strategy. + mm/slab_common.c | 2 +- + mm/slub.c | 16 +++++++++------- + 2 files changed, 10 insertions(+), 8 deletions(-) +Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1) +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next (053f5b6525ae raid5: speedup sync_request processing) +$ git merge md/for-next +Already up-to-date. +Merging mfd/master (90b128ed1557 Merge tag 'mfd-lee-3.13-3' of git://git.linaro.org/people/ljones/mfd) +$ git merge mfd/master +Already up-to-date. +Merging mfd-lj/for-mfd-next (7171511eaec5 Linux 3.16-rc1) +$ git merge mfd-lj/for-mfd-next +Already up-to-date. +Merging battery/master (ac323d8d8070 power: max17040: Fix NULL pointer dereference when there is no platform_data) +$ 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 (7171511eaec5 Linux 3.16-rc1) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (b753a93f7437 Merge remote-tracking branch 'regulator/topic/tps6586x' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + drivers/regulator/88pm800.c | 1 - + drivers/regulator/as3722-regulator.c | 2 + + drivers/regulator/bcm590xx-regulator.c | 16 +--- + drivers/regulator/core.c | 8 +- + drivers/regulator/ltc3589.c | 2 +- + drivers/regulator/mc13xxx-regulator-core.c | 37 ++------- + drivers/regulator/mc13xxx.h | 1 - + drivers/regulator/palmas-regulator.c | 2 + + drivers/regulator/tps6586x-regulator.c | 129 +++++++++++++++-------------- + include/linux/regulator/consumer.h | 5 ++ + 10 files changed, 95 insertions(+), 108 deletions(-) +Merging security/next (2fd4e6698f08 Merge branch 'smack-for-3.16' of git://git.gitorious.org/smack-next/kernel into next) +$ git merge security/next +Already up-to-date. +Merging integrity/next (0430e49b6e7c ima: introduce ima_kernel_read()) +$ git merge integrity/next +Already up-to-date. +Merging selinux/next (5c7001b84be5 SELinux: use ARRAY_SIZE) +$ git merge selinux/next +Merge made by the 'recursive' strategy. + scripts/selinux/genheaders/Makefile | 1 - + scripts/selinux/mdp/Makefile | 2 +- + security/selinux/ss/policydb.c | 8 ++++---- + 3 files changed, 5 insertions(+), 6 deletions(-) +Merging lblnet/next (d8ec26d7f828 Linux 3.13) +$ git merge lblnet/next +Already up-to-date. +Merging watchdog/master (7171511eaec5 Linux 3.16-rc1) +$ git merge watchdog/master +Already up-to-date. +Merging iommu/next (c0981b863a31 Merge branches 'iommu/fixes', 'arm/omap', 'arm/smmu', 'arm/shmobile', 'x86/amd', 'arm/exynos', 'arm/renesas', 'ppc/pamu' and 'arm/msm' into next) +$ git merge iommu/next +Already up-to-date. +Merging dwmw2-iommu/master (1860e379875d Linux 3.15) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (fd49c81f080a drivers/vfio/pci: Fix wrong MSI interrupt count) +$ 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 (31789538e3ba staging: go7007: remove reference to CONFIG_KMOD) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/master (3efe33f5d2da audit: x86: drop arch from __audit_syscall_entry() interface) +$ git merge audit/master +Resolved 'arch/mips/include/asm/syscall.h' using previous resolution. +Resolved 'arch/mips/kernel/ptrace.c' using previous resolution. +Resolved 'arch/x86/Kconfig' using previous resolution. +Resolved 'kernel/audit.c' using previous resolution. +Auto-merging kernel/auditsc.c +Auto-merging kernel/audit.c +CONFLICT (content): Merge conflict in kernel/audit.c +Auto-merging include/uapi/linux/audit.h +Auto-merging arch/x86/kernel/ptrace.c +Auto-merging arch/x86/kernel/entry_64.S +Auto-merging arch/x86/kernel/entry_32.S +Auto-merging arch/x86/Kconfig +CONFLICT (content): Merge conflict in arch/x86/Kconfig +Auto-merging arch/um/kernel/ptrace.c +Auto-merging arch/s390/kernel/ptrace.c +Auto-merging arch/mips/kernel/ptrace.c +CONFLICT (content): Merge conflict in arch/mips/kernel/ptrace.c +Auto-merging arch/mips/include/asm/syscall.h +CONFLICT (content): Merge conflict in arch/mips/include/asm/syscall.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master dc820b8f7ff2] Merge remote-tracking branch 'audit/master' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/include/asm/syscall.h | 11 +++++++++++ + arch/alpha/kernel/ptrace.c | 2 +- + arch/arm/kernel/ptrace.c | 4 ++-- + arch/ia64/include/asm/syscall.h | 6 ++++++ + arch/ia64/kernel/ptrace.c | 2 +- + arch/microblaze/include/asm/syscall.h | 5 +++++ + arch/microblaze/kernel/ptrace.c | 3 +-- + arch/mips/include/asm/syscall.h | 2 +- + arch/mips/kernel/ptrace.c | 4 +--- + arch/openrisc/include/asm/syscall.h | 5 +++++ + arch/openrisc/kernel/ptrace.c | 3 +-- + arch/parisc/include/asm/syscall.h | 11 +++++++++++ + arch/parisc/kernel/ptrace.c | 9 +++------ + arch/powerpc/include/asm/syscall.h | 6 ++++++ + arch/powerpc/kernel/ptrace.c | 7 ++----- + arch/s390/kernel/ptrace.c | 4 +--- + arch/sh/include/asm/syscall_32.h | 10 ++++++++++ + arch/sh/include/asm/syscall_64.h | 14 ++++++++++++++ + arch/sh/kernel/ptrace_32.c | 14 +------------- + arch/sh/kernel/ptrace_64.c | 17 +---------------- + arch/sparc/include/asm/syscall.h | 7 +++++++ + arch/sparc/include/asm/thread_info_32.h | 2 ++ + arch/sparc/include/asm/thread_info_64.h | 2 ++ + arch/sparc/kernel/ptrace_64.c | 9 ++------- + arch/um/kernel/ptrace.c | 3 +-- + arch/x86/ia32/ia32entry.S | 12 ++++++------ + arch/x86/kernel/entry_32.S | 11 +++++------ + arch/x86/kernel/entry_64.S | 11 +++++------ + arch/x86/kernel/ptrace.c | 8 ++------ + arch/x86/um/asm/ptrace.h | 4 ---- + arch/x86/um/asm/syscall.h | 15 +++++++++++++++ + arch/xtensa/kernel/ptrace.c | 2 +- + include/asm-generic/syscall.h | 2 +- + include/linux/audit.h | 11 ++++++----- + include/uapi/linux/audit.h | 14 +------------- + kernel/auditsc.c | 17 +++++++---------- + 36 files changed, 147 insertions(+), 122 deletions(-) + create mode 100644 arch/alpha/include/asm/syscall.h + create mode 100644 arch/x86/um/asm/syscall.h +Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls) +$ git merge fsnotify/for-next +Already up-to-date. +Merging devicetree/devicetree/next (3c19ca6ae6a4 of: handle NULL node in next_child iterators) +$ git merge devicetree/devicetree/next +Merge made by the 'recursive' strategy. +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 +Merge made by the 'recursive' strategy. + drivers/of/base.c | 7 ++++--- + drivers/of/platform.c | 4 ---- + 2 files changed, 4 insertions(+), 7 deletions(-) +Merging spi/for-next (0d6c97f4e585 Merge remote-tracking branches 'spi/topic/cleanup' and 'spi/topic/rspi' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + drivers/spi/spi-cadence.c | 2 +- + drivers/spi/spi-clps711x.c | 2 -- + drivers/spi/spi-falcon.c | 2 -- + drivers/spi/spi-fsl-spi.c | 2 +- + drivers/spi/spi-omap-100k.c | 2 -- + drivers/spi/spi-pxa2xx-dma.c | 2 +- + drivers/spi/spi-pxa2xx.c | 8 ++++++-- + drivers/spi/spi-rspi.c | 15 +++++++-------- + drivers/spi/spi-sh-hspi.c | 2 +- + drivers/spi/spi-sh-msiof.c | 2 -- + drivers/spi/spi-sh-sci.c | 4 ++-- + 11 files changed, 19 insertions(+), 24 deletions(-) +Merging tip/auto-latest (01e47cc27060 Merge branch 'x86/xsave') +$ git merge tip/auto-latest +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 15 + + arch/x86/Makefile | 9 +- + arch/x86/boot/code16gcc.h | 24 +- + arch/x86/include/asm/alternative.h | 14 + + arch/x86/include/asm/cpufeature.h | 370 +++++++++++---------- + arch/x86/include/asm/fpu-internal.h | 9 +- + arch/x86/include/asm/processor.h | 4 +- + arch/x86/include/asm/uv/uv_bau.h | 19 +- + arch/x86/include/asm/xsave.h | 223 +++++++++---- + arch/x86/include/uapi/asm/msr-index.h | 2 + + arch/x86/kernel/cpu/common.c | 17 + + arch/x86/kernel/cpu/scattered.c | 1 - + arch/x86/kernel/i387.c | 2 +- + arch/x86/kernel/process.c | 1 + + arch/x86/kernel/traps.c | 7 +- + arch/x86/kernel/xsave.c | 118 ++++++- + arch/x86/mm/fault.c | 6 + + arch/x86/platform/uv/tlb_uv.c | 69 ++-- + include/uapi/linux/perf_event.h | 1 + + kernel/context_tracking.c | 3 + + kernel/events/core.c | 37 ++- + kernel/locking/rtmutex-debug.h | 5 + + kernel/locking/rtmutex.c | 128 +++++-- + kernel/locking/rtmutex.h | 5 + + tools/lib/traceevent/event-parse.c | 113 +++++++ + tools/lib/traceevent/event-parse.h | 25 +- + tools/lib/traceevent/event-plugin.c | 203 ++++++++++- + tools/lib/traceevent/plugin_function.c | 43 ++- + tools/perf/Documentation/perf-report.txt | 23 ++ + tools/perf/Documentation/perf-timechart.txt | 41 ++- + tools/perf/Makefile.perf | 6 +- + tools/perf/builtin-inject.c | 2 +- + tools/perf/builtin-probe.c | 23 +- + tools/perf/config/Makefile | 6 +- + tools/perf/perf.c | 1 + + tools/perf/tests/builtin-test.c | 42 ++- + tools/perf/tests/dso-data.c | 214 +++++++++++- + tools/perf/tests/dwarf-unwind.c | 2 +- + tools/perf/tests/make | 7 +- + tools/perf/tests/tests.h | 2 + + tools/perf/util/dso.c | 279 ++++++++++++++-- + tools/perf/util/dso.h | 50 ++- + tools/perf/util/event.c | 57 +++- + tools/perf/util/event.h | 7 + + tools/perf/util/evsel.c | 5 +- + tools/perf/util/hist.c | 9 +- + tools/perf/util/hist.h | 1 + + tools/perf/util/machine.c | 4 +- + tools/perf/util/map.c | 4 +- + tools/perf/util/map.h | 4 +- + tools/perf/util/perf_regs.c | 10 +- + tools/perf/util/perf_regs.h | 4 +- + tools/perf/util/probe-event.c | 13 +- + tools/perf/util/probe-finder.c | 11 +- + .../perf/util/scripting-engines/trace-event-perl.c | 1 + + .../util/scripting-engines/trace-event-python.c | 2 + + tools/perf/util/sort.c | 107 ++++++ + tools/perf/util/sort.h | 2 + + tools/perf/util/unwind-libunwind.c | 2 - + tools/perf/util/util.c | 1 + + tools/perf/util/util.h | 1 + + 61 files changed, 1949 insertions(+), 467 deletions(-) +Merging clockevents/clockevents/next (2529c3a33079 clocksource: Add Freescale FlexTimer Module (FTM) timer support) +$ git merge clockevents/clockevents/next +Already up-to-date. +Merging edac/linux_next (49856dc973cd sb_edac: mark MCE messages as KERN_DEBUG) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (aa2064d7dd35 EDAC: Fix MC scrub mode comparsion bug for correctable errors) +$ git merge edac-amd/for-next +Already up-to-date. +Merging irqchip/irqchip/for-next (3203bea71513 Documentation: add Broadcom STB Level-2 interrupt controller binding) +$ git merge irqchip/irqchip/for-next +Merge made by the 'recursive' strategy. +Merging ftrace/for-next (da9c3413a27b tracing: Fix check of ftrace_trace_arrays list_empty() check) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (61f38db3e3c0 rcu: Provide API to suppress stall warnings while sysrc runs) +$ git merge rcu/rcu/next +Already up-to-date. +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 (5c02c392cd23 Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux) +$ git merge kvm/linux-next +Already up-to-date. +Merging kvm-arm/next (1252b3313642 arm64: KVM: Enable minimalistic support for Cortex-A53) +$ git merge kvm-arm/next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (5c02c392cd23 Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux) +$ 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 (77945ca73e9a x86/xen: map foreign pfns for autotranslated guests) +$ git merge xen-tip/linux-next +Already up-to-date. +Merging percpu/for-next (6fbc07bbe2b5 percpu: invoke __verify_pcpu_ptr() from the generic part of accessors and operations) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. + arch/x86/include/asm/percpu.h | 3 +- + include/asm-generic/percpu.h | 410 +++++++++++++++++++++---- + include/linux/percpu-defs.h | 380 +++++++++++++++++++++++- + include/linux/percpu.h | 673 ------------------------------------------ + 4 files changed, 719 insertions(+), 747 deletions(-) +Merging workqueues/for-next (015af06e103f kernel/workqueue.c: pr_warning/pr_warn & printk/pr_info) +$ git merge workqueues/for-next +Already up-to-date. +Merging drivers-x86/linux-next (f82bdd0d77b6 hp-wmi: Enable hotkeys on some systems) +$ git merge drivers-x86/linux-next +Already up-to-date. +Merging chrome-platform/for-next (2b8454a75b90 platform/chrome: unregister platform driver/device when module exit) +$ 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 (7171511eaec5 Linux 3.16-rc1) +$ git merge regmap/for-next +Already up-to-date. +Merging hsi/for-next (b357d7b58f37 hsi: omap_ssi_port: use normal module refcounting) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (0c9a03b68511 leds: Remove duplicated OOM message for individual driver) +$ git merge leds/for-next +Already up-to-date. +Merging driver-core/driver-core-next (7171511eaec5 Linux 3.16-rc1) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (7171511eaec5 Linux 3.16-rc1) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (7171511eaec5 Linux 3.16-rc1) +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (7751b6fb0586 usb: musb: tusb6010: Use musb->tusb_revision instead of tusb_get_revision call.) +$ git merge usb-gadget/next +Already up-to-date. +Merging staging/staging-next (25da2290ea9c staging: usbip: usbip_host_driver.c: fix line over 80 characters) +$ git merge staging/staging-next +Merge made by the 'recursive' strategy. + drivers/staging/rtl8723au/core/rtw_ap.c | 22 ++++++-- + drivers/staging/rtl8723au/core/rtw_ieee80211.c | 64 +++------------------- + drivers/staging/rtl8723au/core/rtw_mlme.c | 13 ++--- + drivers/staging/rtl8723au/core/rtw_mlme_ext.c | 42 ++++++++------ + drivers/staging/rtl8723au/include/ieee80211.h | 7 +-- + drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 49 ++++++++--------- + .../usbip/userspace/libsrc/usbip_host_driver.c | 7 ++- + 7 files changed, 84 insertions(+), 120 deletions(-) +Merging char-misc/char-misc-next (7171511eaec5 Linux 3.16-rc1) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging cgroup/for-next (99bae5f94185 cgroup: fix broken css_has_online_children()) +$ git merge cgroup/for-next +Merge made by the 'recursive' strategy. + kernel/cgroup.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging scsi/for-next (11a5dc7ff2fb Merge remote-tracking branch 'scsi-queue/drivers-for-3.16-2' into for-next) +$ git merge scsi/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging scsi-core/core-for-3.16 (63ff05910d96 include/scsi/osd_protocol.h: remove unnecessary __constant) +$ git merge scsi-core/core-for-3.16 +Already up-to-date. +Merging scsi-drivers/drivers-for-3.16 (e90b25fa40a4 mvsas: Recognise device/subsystem 9485/9485 as 88SE9485) +$ git merge scsi-drivers/drivers-for-3.16 +Already up-to-date. +Merging target-updates/for-next (0ed6e189e3f6 target: Fix NULL pointer dereference for XCOPY in target_put_sess_cmd) +$ git merge target-updates/for-next +Already up-to-date. +Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging writeback/writeback-for-next (f9b0e058cbd0 writeback: Fix data corruption on NFS) +$ git merge writeback/writeback-for-next +Already up-to-date. +Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries) +$ git merge hwspinlock/linux-next +Already up-to-date. +Merging pinctrl/for-next (ff4e41904b42 pinctrl: sunxi: Fix potential null pointer dereference) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 4 ++++ + 1 file changed, 4 insertions(+) +Merging vhost/linux-next (970379f59d81 vhost: move memory pointer to VQs) +$ git merge vhost/linux-next +Merge made by the 'recursive' strategy. +Merging remoteproc/for-next (bd88acba5f98 remoteproc/ste_modem: staticize local symbols) +$ 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 (06fc3b70f1dc gpio: of: Fix handling for deferred probe for -gpio suffix) +$ git merge gpio/for-next +Already up-to-date. +Merging dma-mapping/dma-mapping-next (f70e3c4f8b6a CMA: correct unlock target) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (39fd3f99aba3 pwm: fsl-ftm: set pwm_chip can_sleep flag) +$ git merge pwm/for-next +Already up-to-date. +Merging dma-buf/for-next (dfb945473ae8 Merge git://www.linux-watchdog.org/linux-watchdog) +$ git merge dma-buf/for-next +Already up-to-date. +Merging userns/for-next (3efe1ac78e99 vfs: Block intuitively in the case of BSD accounting files) +$ git merge userns/for-next +Resolved 'fs/btrfs/ioctl.c' using previous resolution. +Resolved 'fs/dcache.c' using previous resolution. +Resolved 'fs/namei.c' using previous resolution. +Resolved 'fs/namespace.c' using previous resolution. +Auto-merging kernel/acct.c +Auto-merging include/linux/dcache.h +Auto-merging fs/proc/fd.c +Auto-merging fs/proc/base.c +Auto-merging fs/nfs/dir.c +Auto-merging fs/namespace.c +CONFLICT (content): Merge conflict in fs/namespace.c +Auto-merging fs/namei.c +CONFLICT (content): Merge conflict in fs/namei.c +Auto-merging fs/mount.h +Auto-merging fs/kernfs/dir.c +Auto-merging fs/fuse/dir.c +Auto-merging fs/dcache.c +CONFLICT (content): Merge conflict in fs/dcache.c +Auto-merging fs/ceph/dir.c +Auto-merging fs/btrfs/ioctl.c +CONFLICT (content): Merge conflict in fs/btrfs/ioctl.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 87afb1b6035f] Merge remote-tracking branch 'userns/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/afs/dir.c | 5 -- + fs/btrfs/ioctl.c | 6 +-- + fs/ceph/dir.c | 1 - + fs/cifs/readdir.c | 6 +-- + fs/dcache.c | 140 ++++++++++++++++++------------------------------- + fs/fuse/dir.c | 7 +-- + fs/gfs2/dentry.c | 3 -- + fs/kernfs/dir.c | 11 ---- + fs/mount.h | 22 ++++++++ + fs/namei.c | 22 ++++---- + fs/namespace.c | 130 +++++++++++++++++++++++++++++++++++++++++---- + fs/nfs/dir.c | 7 +-- + fs/proc/base.c | 10 +--- + fs/proc/fd.c | 2 - + include/linux/dcache.h | 3 +- + kernel/acct.c | 25 +++++++-- + 16 files changed, 232 insertions(+), 168 deletions(-) +Merging ktest/for-next (4c16b1d6d5e0 ktest: Update documentation on config_bisect) +$ git merge ktest/for-next +Merge made by the 'recursive' strategy. + tools/testing/ktest/ktest.pl | 581 +++++++++++++++++++--------------------- + tools/testing/ktest/sample.conf | 65 ++--- + 2 files changed, 297 insertions(+), 349 deletions(-) +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 (b640a6037c9e Merge tag 'sunxi-clk-for-3.16-2' of https://github.com/mripard/linux into clk-next) +$ git merge clk/clk-next +Already up-to-date. +Merging random/dev (5458c2fecbb8 hw_random: fix sparse warning (NULL vs 0 for pointer)) +$ git merge random/dev +Auto-merging drivers/char/random.c +Merge made by the 'recursive' strategy. + drivers/char/hw_random/core.c | 78 +++++++++++++- + drivers/char/random.c | 234 ++++++++++++++++++++++++++---------------- + include/linux/hw_random.h | 5 + + 3 files changed, 225 insertions(+), 92 deletions(-) +Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access) +$ git merge lzo-update/lzo-update +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 (fa88b6f8803c aio: cleanup: flatten kill_ioctx()) +$ git merge aio/master +Already up-to-date. +Merging llvmlinux/for-next (f9da455b93f6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next) +$ git merge llvmlinux/for-next +Already up-to-date. +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 (93df5e1c88f7 These days most people use git to send patches so I have added a section about that.) +$ git merge rd-docs/master +Auto-merging MAINTAINERS +Auto-merging Documentation/email-clients.txt +Merge made by the 'recursive' strategy. + Documentation/email-clients.txt | 11 +++++++++++ + MAINTAINERS | 3 +++ + 2 files changed, 14 insertions(+) +Merging akpm-current/current (8e4b408a34b4 fix build error of v3.15-mmotm-2014-06-12-16-38) +$ git merge --no-ff akpm-current/current +Resolved 'Makefile' using previous resolution. +Resolved 'arch/x86/vdso/vdso2c.h' using previous resolution. +Resolved 'fs/ocfs2/file.c' using previous resolution. +Auto-merging net/xfrm/xfrm_policy.c +Auto-merging net/bridge/br_multicast.c +Auto-merging mm/vmscan.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging lib/Kconfig +Auto-merging kernel/sysctl.c +Auto-merging fs/ocfs2/file.c +CONFLICT (content): Merge conflict in fs/ocfs2/file.c +Auto-merging fs/namespace.c +Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c +Auto-merging drivers/net/ethernet/intel/i40e/i40e_ethtool.c +Auto-merging drivers/leds/Kconfig +Auto-merging arch/x86/vdso/vdso2c.h +CONFLICT (content): Merge conflict in arch/x86/vdso/vdso2c.h +Removing arch/x86/include/asm/scatterlist.h +Auto-merging arch/x86/Kconfig +Removing arch/sparc/include/asm/scatterlist.h +Removing arch/score/include/asm/scatterlist.h +Removing arch/s390/include/asm/scatterlist.h +Removing arch/powerpc/include/asm/scatterlist.h +Removing arch/mn10300/include/asm/scatterlist.h +Removing arch/microblaze/include/asm/scatterlist.h +Removing arch/m32r/include/asm/scatterlist.h +Removing arch/ia64/include/asm/scatterlist.h +Removing arch/frv/include/asm/scatterlist.h +Removing arch/cris/include/asm/scatterlist.h +Removing arch/arm/include/asm/scatterlist.h +Auto-merging arch/arm/Kconfig +Removing arch/alpha/include/asm/scatterlist.h +Auto-merging Makefile +CONFLICT (content): Merge conflict in Makefile +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ad5157a45d59] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + CREDITS | 7 + + Documentation/RCU/whatisRCU.txt | 2 +- + Documentation/accounting/getdelays.c | 1 + + Documentation/leds/leds-class.txt | 3 - + Documentation/memory-hotplug.txt | 15 +- + Documentation/printk-formats.txt | 6 + + Documentation/sysctl/vm.txt | 3 +- + MAINTAINERS | 5 +- + Makefile | 3 + + arch/alpha/include/asm/Kbuild | 1 + + arch/alpha/include/asm/scatterlist.h | 6 - + arch/arm/Kconfig | 1 + + arch/arm/include/asm/Kbuild | 1 + + arch/arm/include/asm/scatterlist.h | 12 - + arch/arm64/Kconfig | 1 + + arch/cris/include/asm/Kbuild | 1 + + arch/cris/include/asm/scatterlist.h | 6 - + arch/frv/include/asm/Kbuild | 1 + + arch/frv/include/asm/scatterlist.h | 6 - + arch/ia64/Kconfig | 1 + + arch/ia64/include/asm/Kbuild | 1 + + arch/ia64/include/asm/scatterlist.h | 7 - + arch/m32r/include/asm/Kbuild | 1 + + arch/m32r/include/asm/scatterlist.h | 6 - + arch/m68k/kernel/sys_m68k.c | 18 +- + arch/microblaze/include/asm/Kbuild | 1 + + arch/microblaze/include/asm/scatterlist.h | 1 - + arch/mn10300/include/asm/Kbuild | 1 + + arch/mn10300/include/asm/scatterlist.h | 16 - + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/Kbuild | 1 + + arch/powerpc/include/asm/scatterlist.h | 17 - + arch/powerpc/mm/dma-noncoherent.c | 1 + + arch/powerpc/mm/subpage-prot.c | 16 +- + arch/powerpc/platforms/44x/warp.c | 1 + + arch/powerpc/platforms/52xx/efika.c | 1 + + arch/powerpc/platforms/amigaone/setup.c | 1 + + arch/s390/Kconfig | 1 + + arch/s390/include/asm/Kbuild | 1 + + arch/s390/include/asm/scatterlist.h | 3 - + arch/score/include/asm/Kbuild | 1 + + arch/score/include/asm/scatterlist.h | 6 - + arch/sparc/Kconfig | 1 + + arch/sparc/include/asm/Kbuild | 1 + + arch/sparc/include/asm/scatterlist.h | 8 - + arch/um/include/asm/Kbuild | 1 + + arch/x86/Kconfig | 1 + + arch/x86/include/asm/Kbuild | 3 +- + arch/x86/include/asm/scatterlist.h | 8 - + block/genhd.c | 2 +- + drivers/ata/Kconfig | 1 + + drivers/ata/libata-core.c | 72 +---- + drivers/base/memory.c | 26 +- + drivers/gpu/drm/drm_hashtab.c | 2 +- + drivers/input/Kconfig | 9 + + drivers/input/Makefile | 3 + + drivers/input/input.c | 6 + + drivers/input/leds.c | 249 ++++++++++++++ + drivers/leds/Kconfig | 3 - + drivers/memstick/host/rtsx_pci_ms.c | 1 + + drivers/misc/ti-st/st_core.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 2 +- + drivers/net/irda/donauboe.c | 15 +- + drivers/rtc/rtc-ds1343.c | 75 ++++- + drivers/staging/lustre/lustre/libcfs/hash.c | 4 +- + drivers/tty/Kconfig | 4 + + drivers/tty/vt/keyboard.c | 110 +++++-- + drivers/video/backlight/backlight.c | 2 - + fs/binfmt_elf.c | 21 +- + fs/cachefiles/bind.c | 6 +- + fs/cachefiles/daemon.c | 6 +- + fs/cifs/cifsacl.c | 2 +- + fs/cifs/cifssmb.c | 20 +- + fs/cifs/sess.c | 2 +- + fs/cifs/smb2misc.c | 38 +-- + fs/cifs/smb2ops.c | 2 +- + fs/cifs/smb2pdu.c | 2 +- + fs/cifs/smb2pdu.h | 28 +- + fs/compat.c | 2 +- + 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/isofs/Makefile | 2 + + fs/isofs/compress.c | 17 +- + fs/isofs/export.c | 11 +- + fs/isofs/inode.c | 88 +++-- + fs/isofs/namei.c | 5 +- + fs/isofs/rock.c | 44 ++- + fs/mpage.c | 23 +- + fs/namespace.c | 2 +- + fs/nilfs2/super.c | 2 +- + fs/notify/inode_mark.c | 2 +- + fs/notify/vfsmount_mark.c | 2 +- + fs/ocfs2/alloc.c | 15 +- + fs/ocfs2/dlm/dlmcommon.h | 4 + + fs/ocfs2/dlm/dlmdomain.c | 5 +- + fs/ocfs2/dlm/dlmmaster.c | 57 +++- + fs/ocfs2/dlm/dlmrecovery.c | 3 +- + fs/ocfs2/dlm/dlmthread.c | 11 +- + fs/ocfs2/dlm/dlmunlock.c | 18 +- + fs/ocfs2/file.c | 20 +- + fs/ocfs2/inode.c | 10 +- + fs/ocfs2/ioctl.c | 129 +++----- + fs/ocfs2/move_extents.c | 2 +- + fs/ocfs2/namei.c | 145 ++++++++- + fs/ocfs2/ocfs2_fs.h | 2 +- + fs/ocfs2/refcounttree.c | 2 +- + fs/ocfs2/super.c | 8 +- + fs/proc/kcore.c | 2 +- + fs/proc/proc_sysctl.c | 2 +- + fs/proc/task_mmu.c | 376 +++++++++++----------- + fs/qnx6/Makefile | 1 + + fs/qnx6/dir.c | 26 +- + fs/qnx6/inode.c | 99 +++--- + fs/qnx6/namei.c | 6 +- + fs/qnx6/qnx6.h | 12 +- + fs/qnx6/super_mmi.c | 22 +- + include/linux/crc64_ecma.h | 56 ++++ + include/linux/gfp.h | 2 +- + include/linux/glob.h | 10 + + include/linux/hugetlb.h | 7 - + include/linux/hugetlb_inline.h | 7 + + include/linux/input.h | 21 ++ + include/linux/klist.h | 2 +- + include/linux/list.h | 14 +- + include/linux/memblock.h | 4 +- + include/linux/memory_hotplug.h | 9 +- + include/linux/mm.h | 39 ++- + include/linux/page-flags.h | 3 + + include/linux/pagemap.h | 28 ++ + include/linux/rculist.h | 8 +- + include/linux/scatterlist.h | 2 +- + include/linux/string.h | 1 + + include/linux/sysctl.h | 2 - + include/scsi/scsi.h | 2 +- + kernel/auditfilter.c | 4 +- + kernel/kexec.c | 1 + + kernel/posix-timers.c | 57 ++-- + kernel/smp.c | 56 +++- + kernel/sysctl.c | 3 +- + kernel/test_kprobes.c | 87 ++--- + lib/Kconfig | 47 +++ + lib/Kconfig.debug | 4 +- + lib/Makefile | 3 + + lib/crc64_ecma.c | 341 ++++++++++++++++++++ + lib/glob.c | 287 +++++++++++++++++ + lib/klist.c | 6 +- + lib/scatterlist.c | 4 +- + lib/vsprintf.c | 20 +- + mm/compaction.c | 17 +- + mm/huge_memory.c | 22 +- + mm/hugetlb.c | 1 + + mm/madvise.c | 54 ++-- + mm/memcontrol.c | 230 ++++++------- + mm/memory-failure.c | 15 +- + mm/memory.c | 10 +- + mm/memory_hotplug.c | 17 +- + mm/mempolicy.c | 256 ++++++--------- + mm/mincore.c | 206 +++++------- + mm/nommu.c | 2 +- + mm/page_alloc.c | 43 ++- + mm/pagewalk.c | 393 +++++++++++++++-------- + mm/readahead.c | 3 +- + mm/rmap.c | 10 +- + mm/slab.c | 4 +- + mm/util.c | 30 ++ + mm/vmalloc.c | 6 +- + mm/vmscan.c | 28 +- + mm/zswap.c | 4 +- + net/batman-adv/fragmentation.c | 2 +- + net/bridge/br_multicast.c | 2 +- + net/ipv4/fib_trie.c | 2 +- + net/ipv6/addrlabel.c | 2 +- + net/xfrm/xfrm_policy.c | 4 +- + scripts/checkpatch.pl | 33 +- + 178 files changed, 3033 insertions(+), 1715 deletions(-) + delete mode 100644 arch/alpha/include/asm/scatterlist.h + delete mode 100644 arch/arm/include/asm/scatterlist.h + delete mode 100644 arch/cris/include/asm/scatterlist.h + delete mode 100644 arch/frv/include/asm/scatterlist.h + delete mode 100644 arch/ia64/include/asm/scatterlist.h + delete mode 100644 arch/m32r/include/asm/scatterlist.h + delete mode 100644 arch/microblaze/include/asm/scatterlist.h + delete mode 100644 arch/mn10300/include/asm/scatterlist.h + delete mode 100644 arch/powerpc/include/asm/scatterlist.h + delete mode 100644 arch/s390/include/asm/scatterlist.h + delete mode 100644 arch/score/include/asm/scatterlist.h + delete mode 100644 arch/sparc/include/asm/scatterlist.h + delete mode 100644 arch/x86/include/asm/scatterlist.h + create mode 100644 drivers/input/leds.c + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 include/linux/glob.h + create mode 100644 lib/crc64_ecma.c + create mode 100644 lib/glob.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: drivers/gpio/gpio-zevio.c: fix build +Applying: mm/page_io.c: work around gcc bug +Applying: init/main.c: code clean-up +Applying: kernel/kprobes.c: convert printk to pr_foo() +Applying: memcg, mm: introduce lowlimit reclaim +Applying: memcg-mm-introduce-lowlimit-reclaim-fix +Applying: memcg-mm-introduce-lowlimit-reclaim-fix2.patch +Applying: memcg: allow setting low_limit +Applying: memcg, doc: clarify global vs. limit reclaims +Applying: memcg-doc-clarify-global-vs-limit-reclaims-fix +Applying: memcg: document memory.low_limit_in_bytes +Applying: vmscan: memcg: check whether the low limit should be ignored +Applying: mm: replace remap_file_pages() syscall with emulation +Applying: mm-replace-remap_file_pages-syscall-with-emulation-fix +Applying: mm: remap_file_pages: initialize populate before usage +Applying: mm: remap_file_pages: grab file ref to prevent race while mmaping +Applying: memcg: deprecate memory.force_empty knob +Applying: memcg-deprecate-memoryforce_empty-knob-fix +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: nmi: provide the option to issue an NMI back trace to every cpu but current +Applying: nmi-provide-the-option-to-issue-an-nmi-back-trace-to-every-cpu-but-current-fix +Applying: kernel/watchdog.c: print traces for all cpus on lockup detection +Applying: kernel-watchdogc-print-traces-for-all-cpus-on-lockup-detection-fix +Applying: kernel-watchdogc-print-traces-for-all-cpus-on-lockup-detection-fix-2 +Applying: kernel/watchdog.c: convert printk/pr_warning to pr_foo() +Applying: bio: modify __bio_add_page() to accept pages that don't start a new segment +Applying: drivers/w1/w1_int.c: call put_device if device_register fails +Applying: mm: add strictlimit knob +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 8cfa21de2292...522474ad8130 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (522474ad8130 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/cgroups/memory.txt | 41 +++-- + Documentation/filesystems/vfat.txt | 10 ++ + Documentation/kernel-parameters.txt | 5 + + Documentation/sysctl/kernel.txt | 17 ++ + Documentation/vm/remap_file_pages.txt | 7 +- + arch/sparc/include/asm/irq_64.h | 2 +- + arch/sparc/kernel/process_64.c | 18 +- + arch/x86/include/asm/irq.h | 2 +- + arch/x86/kernel/apic/hw_nmi.c | 18 +- + block/bio.c | 48 ++--- + drivers/gpio/gpio-zevio.c | 4 + + drivers/w1/w1_int.c | 5 +- + 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/memcontrol.h | 14 ++ + include/linux/nmi.h | 12 +- + include/linux/res_counter.h | 40 +++++ + init/main.c | 23 +-- + kernel/kprobes.c | 36 ++-- + kernel/res_counter.c | 2 + + kernel/sysctl.c | 11 ++ + kernel/watchdog.c | 49 +++++- + mm/Makefile | 2 +- + mm/backing-dev.c | 35 ++++ + mm/fremap.c | 283 ------------------------------ + mm/memcontrol.c | 72 +++++++- + mm/mmap.c | 69 ++++++++ + mm/nommu.c | 8 - + mm/page_io.c | 3 + + mm/vmscan.c | 48 ++++- + 34 files changed, 732 insertions(+), 409 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..3c926ef18dcf --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,4 @@ +Importing jdelvare-hwmon based on 3.15-rc7 +Unchanged quilt series jdelvare-hwmon +Importing rd-docs based on 3.15-rc5 +Unchanged quilt series rd-docs diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..d0363f3b880a --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20140618 |