diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-02-14 16:12:48 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-02-14 16:12:48 +1100 |
| commit | da8d308fbdb8360078786b3e125238122c4fc611 (patch) | |
| tree | 1ba444bb323e2f2a35ae1cac6726c2f579de3b3b | |
| parent | a990311023812458c449c276e8c0a73ef2a4e1e1 (diff) | |
Add linux-next specific files for 20140214next-20140214
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 210 | ||||
| -rw-r--r-- | Next/Trees | 212 | ||||
| -rw-r--r-- | Next/merge.log | 4153 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 4578 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..910af6571f81 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,210 @@ +Name SHA1 +---- ---- +origin 4675348e78fab420e70f9144b320d9c063c7cee8 +fixes b0031f227e47919797dc0e1c1990f3ef151ff0cc +kbuild-current 38dbfb59d1175ef458d006556061adeaa8751b72 +arc-current 7e22e91102c6b9df7c4ae2168910e19d2bb14cd6 +arm-current b027df048500d7fbf1d897f701c1bf14b73a3de4 +m68k-current 7247f55381d54645a1eb47588de51bb26fa7cb7a +metag-fixes 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b +powerpc-merge cd15b048445d0a54f7147c35a86c5a16ef231554 +sparc 738b52bb9845da183b6ff46a8f685b56a63379d1 +net 219e288e8900fac65211e0a23e2a1037fd521af1 +ipsec 738b52bb9845da183b6ff46a8f685b56a63379d1 +sound-current 2078600b1f8fc68b02f6ebdda1759fb0c9f51afb +pci-current 3ce4e860e578f843db36a1f7357ba00aeaa7610f +wireless 6b6ee88774ae4d01fd72f25d323c9ff28fd0dabf +driver-core.current 9e1ccb4a7700fcb3ddfe2767e0bbb6131f8ab54e +tty.current 0930b0950a8996aa88b0d2ba4bb2bab27cc36bc7 +usb.current 3635c7e2d59f7861afa6fa5e87e2a58860ff514d +staging.current ddf5eb564d97c94e114b45e84c89ce0e7024a9ac +char-misc.current 3b1cc9b9622a022208ec95b1259b05bbdf712eb7 +input-current 55df811f2066fcaec2548248f0a1a6a0c12dc6b8 +md-current d47648fcf0611812286f68131b40251c6fa54f5e +crypto-current ee97dc7db4cbda33e4241c2d85b42d1835bc8a35 +ide 738b52bb9845da183b6ff46a8f685b56a63379d1 +dwmw2 5950f0803ca9d396ab79b7fe6789351f96e1d8d5 +devicetree-current 6f041e99fc7ba00e7e65a431527f9235d6b16463 +rr-fixes 7122c3e9154b5d9a7422f68f02d8acf050fad2b0 +mfd-fixes 73beb63d290f961c299526852884846b0d868840 +vfio-fixes 239a87020b263fe7e70adc5803cb157955023d3c +drm-intel-fixes f51a44b9a6c4982cc25bfb3727de9bb893621ebc +asm-generic fb9de7ebc3a2eb7ddb83c92e288447a0c313bced +arc c61e2aee0c55c4649d6b1e9f01a6f1f01db24b74 +arm 41212aaf943230fd4a7c58c010290867661c698a +arm-perf a1d711938959935436e935ebb4ea6199bceb021d +arm-soc 0ef783f632e37a3ed4b5e2aef0bc9f45fdf2eed9 +bcm2835 c06213a754f57e71a1be2d009b4276c073db8eb5 +cortex-m f41bfc9423aac4e589d2b3bedf26b3c249c61146 +ep93xx bfb0709fd17b13498d99592bbe12c91130e35a55 +imx-mxs 6e5dad1f97b2ec7ce05ac12d7598e774a544e61c +ixp4xx 19f949f52599ba7c3f67a5897ac6be14bfcb1200 +msm 81cf1e061d001fab44dbaa85fc4fbfb6da6713a1 +mvebu cebfcb84217e4a03a1326d49e7cb246377af36ad +renesas 2a42ac1c36b84964df8e65bd0627fae5d6180132 +samsung 38dbfb59d1175ef458d006556061adeaa8751b72 +tegra c3a8d073b74a12c979b408ed5a96047ca276ffb9 +arm64 38dbfb59d1175ef458d006556061adeaa8751b72 +blackfin 58095fdaaf1cee12d8e01aa20f94b976e3137d27 +c6x 546153d75a488f234709c009faf9fafbe34e1ba0 +cris cd065a010a97e3c330d1ded9af551664c9689b19 +hexagon 44eb66c228fe5617a15535dc3ad2b8965661c426 +ia64 d52eefb47d4eb6fe40d4c92bc711dd34a8ce1747 +m68k 7247f55381d54645a1eb47588de51bb26fa7cb7a +m68knommu 72a8ab3cb2a5e94f50fd7a2173b65e63be882010 +metag e9a1d0165bbda4398d4a5d71736cf6390fb42c6f +microblaze 45f7fdc2ffb9d5af4dab593843e89da70d1259e3 +mips c162646dd29e1978d4156174617c7bf73ba5f5c0 +openrisc 548dafe880ad84d0accc0a5596c26e3348b103e1 +parisc 6c700d71f7faecb540b3fa4303edb5323a2768c1 +parisc-hd 38dbfb59d1175ef458d006556061adeaa8751b72 +powerpc f878f84373aefda7f041a74b24a83b8b7dec1cf0 +mpc5xxx bc75059422338197ce487d338ac9c898761e1e61 +galak 9e2ecdbba3b0745f9ed454ab86961e3ccf9dc224 +s390 3e79a93fe888fc0d5ab79f5d21bca78d599b0c82 +sparc-next 049ffa8ab33a63b3bff672d1a0ee6a35ad253fe8 +tile 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 +uml 989e59fa41c5464ab77bf0bf82f32f721430544e +unicore32 c284464658acab50c67ff65ff3dc9215a0231ad2 +xtensa c0e50d41126e4786d9cf1105bdf783e55c99f915 +btrfs cf93da7bcf450cb4595055d491a0519cb39e68ed +ceph 125d725c923527a85876c031028c7f55c28b74b3 +cifs 4a5c80d7b5615be8098f9d5da97d166afc318abc +configfs b930c26416c4ea6855726fd977145ccea9afbdda +ecryptfs 9e78d14a9f641c0476f733f6fc559ba5cac6f52b +ext3 4ea7772f828a2f1cf6fbf96a3e6f99ae149d2724 +ext4 2d21448cf5004772a70c939d25c7033260ce7bc4 +f2fs c86f36c6458ce7d72232d2e3d389c4ac76d8f107 +fscache fe02fb3ec10932ce07406b1581e28326181fc9d8 +fuse b2ec2778df9d2f3c8a4925f0d1903719427a5e88 +gfs2 c2b0b30eddf6be6866bd1d225c331b37c5dc5b02 +jfs 844fa1b5f8493cff4b976fa7a5b9ebeeafdd75cc +logfs 339466142b3f58fe0ee4dea7e8c5f3d33099e89c +nfs a699d65ec4ff82245d2c4fdfb8ed1d64776d756e +nfsd 2ec197db1a56c9269d75e965f14c344b58b2a4f6 +omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84 +squashfs 6d565409503f4e1f74ac30de14e8c91a2b826cd8 +v9fs 38dbfb59d1175ef458d006556061adeaa8751b72 +ubifs 5547fec74a566e1f5e00a937b9a367f7c6a94a8b +xfs a64b760771e85f54e0921fb05ac48b0585adccec +file-private-locks 1ed1950c412f1b1a1c445b37df1c2710244cdc81 +vfs 527d1511310a89650000081869260394e20c7013 +pci 17f2d86f5d53d61b12085812a650ae12a76eaa69 +hid f1523dbb7e9080d077df0a43154bb3c8ef218f63 +i2c 9b0cd304f26b9fca140de15deeac2bf357d1f388 +jdelvare-hwmon f1cf5deb331c562d98f2faa710d3afef24eb7d23 +hwmon-staging 72f13a7e13288f2aa229d12b98c46f979d1e429a +v4l-dvb b215621049bd57221455990880fb6b906f7dac21 +kbuild ff6b9bdb62633f4509a9049f713a2ef0fce6a8fe +kconfig 95edca5c523c4b404dd60baa0a1bea0e4c38fd72 +libata 1bc18086231c130895b87ec049be8ddcdab552b8 +pm d7d9d77b617ec6f4bd910114a6de172244490d9c +idle 2d6e532279ddf30188d5fbdaf00171cd311bc8a2 +apm 158204397034f088bfd505eeee281f7072da1c24 +cpupowerutils f16603386b38c28979f4df1cafdc2fe73fa87d37 +thermal 262afa97587b4a9714a8ebccd63b5095523ca0e7 +ieee1394 fcd46b34425da52703fe65b7f08850c509dcb0ed +dlm ece35848c1847cdf3dd07954578d3e99238ebbae +swiotlb 0cb637bff80d5ba2b916bb19f19ffd59cd4079fd +slave-dma 24066813d55bb4ea058fd4a8fbc3538dfe032782 +dmaengine 77873803363c9e831fc1d1e6895c084279090c22 +net-next d4f2fa6ad61ec1db713569a179183df4d0fc6ae7 +ipsec-next 0f24558e91563888d51e9be5b70981da920c37ac +wireless-next 35582ad9d342025653aaf28ed321bf5352488d7f +bluetooth 4292f1f3370193fd3f2e4f849211fd9596ce832f +infiniband 1ab1ecef1031911a6f0f101c856ed403578c18b9 +mtd 0e47c969c65e213421450c31043353ebe3c67e0c +l2-mtd a67acac040615562058322528bfa9811fd5ed3de +crypto 883619a931e9f54fca7495321b339669f11cc727 +drm ef64cf9d06049e4e9df661f3be60b217e476bee1 +drm-intel b6ae3c7c60161a9b1e15b1ccd6412fad65b7d9cf +drm-tegra 13411ddd319057ae334a4084ebcf2c741b317f34 +sound c4d1489390aa0be73104fc502a1e3107511c8926 +sound-asoc 24d356e65fb1aa6d3b23fd68e18d34ecad41c7ec +modules 917307b09ad53bcb473e67266b89786aa05be237 +virtio 6f0317058f436d1daff3c6477f74449ae7acebcd +input e5fcd269c4599c4d224333b20e3ffd5e910d4db3 +input-mt 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 +block 2a53fee6859b71ddd767485cd41fac6f0acf25bd +device-mapper a17e5c12cde09512341808e8cf8bdf7bebd38e85 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 80af9e6d7ae633309cc5bca96aee6a45117e7c98 +mmc 38dbfb59d1175ef458d006556061adeaa8751b72 +kgdb 6bedf31c25dd93c4f70a28e9ab94a239a5fb592c +slab 26e4f2057516f1c457e0e95346a00303f983ad53 +uclinux 6dbe51c251a327e012439c4772097a13df43c5b8 +md 789b5e0315284463617e106baad360cb9e8db3ac +mfd 90b128ed1557c2f523995a379a53e5105891ecf8 +mfd-lj 4d0621451ff2b8ce8a4aed66b98d66121a048fc3 +battery ac323d8d807060f7c95a685a9fe861e7b6300993 +fbdev 718b90ac4c21c81f42b6db062ca0867f3cac7648 +viafb 838ac785d521e091bd8b5f6a2b545166f5f32b77 +omap_dss2 c4a41bcc17260759645be6833ac7a99a9fb4c363 +regulator 5b08f0782945519e1922a40d54b30842b0d45b1e +security e0238b4ced90cb8562fbc030b73d10626c745215 +selinux 81c94e76ce8e14a487bca210b3fd92ca661516ac +lblnet d8ec26d7f8287f5788a494f56e8814210f0e64be +watchdog 41c91d637e86df0cc544430e81e7ecaac8aebdf8 +dwmw2-iommu e5d0c874391a500be7643d3eef9fb07171eee129 +iommu dd1a175695edf662615e422d1c85eae875a411b2 +vfio 3be3a074cf5ba641529d8fdae0e05ca642f23e12 +osd 19350e7627a6f3b0f662cbd2eb1128c9961a41fe +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +trivial 8cc7212a036118fcb5cfbbdb013c5032677bbd23 +audit f3411cb2b2e396a41ed3a439863f028db7140a34 +fsnotify 1ca39ab9d21ac93f94b9e3eb364ea9a5cf2aba06 +devicetree b66548e2a9baf65ccebeb3750f0ab9ddbef500f6 +dt-rh 860a445c25aa2f99aa5881603a1f4ed2cec64025 +spi 6b11fbdc77905dd0859f9227f1e67b27c44f0d0a +tip 47e0b4a158d4efa600ca31d92ad17db59b993ead +clockevents 00e2bcd6d35f59fce7fa0e76e24d08f74c6a8506 +edac 3e45588825c1c9c7b561102dd878d23af1b46bb9 +edac-amd 9d0e8d8348d54d60005c6c938b87b94648005d1c +ftrace 3132e107d608f8753240d82d61303c500fd515b4 +rcu a9b5bb435cced3a94abc4a3a23bc93dfbc3beeca +uprobes 0326f5a94ddea33fa331b2519f4172f4fb387baa +kvm b73117c49364551ff789db7c424a115ac5b77850 +kvm-arm b73117c49364551ff789db7c424a115ac5b77850 +kvm-ppc b73117c49364551ff789db7c424a115ac5b77850 +oprofile 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae +fw-nohz 74876a98a87a115254b3a66a14b27320b7f0acaa +xen-tip b1f5d76c5d9bba9f465b0b22f9a52f1645ca56b6 +percpu d5f2deed588b8d53f9667d2b0508ca146f70e176 +workqueues 38dbfb59d1175ef458d006556061adeaa8751b72 +drivers-x86 b4b0b4a9e0392dbd00e5f033e1329ce61ed06fef +chrome-platform 2b8454a75b90d7cd1ac325a0baba77244733354f +sysctl 4e474a00d7ff746ed177ddae14fa8b2d4bad7a00 +regmap e6e5c7bb7c6b28e5615a4d46d0c2a05706ea5309 +hsi 43139a61fc68f4b0af7327a0e63f340a7c81c69a +leds 59e35a9e531532d4f15e7f8af83ce009d2757a5f +driver-core a8fa94e0f2ab665f9aa665195618178b61ed8304 +tty 86a41c46c7b5a1335b849f5e48d20184e4a905e1 +usb e8fcbb61405997f03b9e127806db620c7cfb9909 +usb-gadget 836a2164491b19dcd4f29d574e548bcadd421a6a +staging 84f7a542f9e0191b6f7ab87881a050889576a5c4 +char-misc 7841b647b9c1b118ae4eed33a0af934818e60553 +cgroup 32a59a5d33ce478067fbac76d60d2e64f8bc161b +scsi 3ce438df106826edde7ad724f3819716a3f0cf56 +target-updates 5259a06ef97068b710f45d092a587e8d740f750f +target-merge 374b105797c3d4f29c685f3be535c35f5689b30e +writeback f9b0e058cbd04ada76b13afffa7e1df830543c24 +hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad +pinctrl 97e00faaf16a0642cac47937e26f437651a6b4a4 +vhost d3d665a654a35c47463d2aa6353bac3ce293f4f5 +remoteproc b9777859ec015a78dae1476e317d04f851bfdd0d +rpmsg 397944df3290ddc46dcc6a08cd71fb560700431b +gpio a3485d088516be4c2ae2890e8ad64321481f2857 +dma-mapping d8ec26d7f8287f5788a494f56e8814210f0e64be +pwm 6691a19966f04dd81e60505f9630c1a7cf148507 +dma-buf c0b00a525c127d0055c1df6283300e17f601a1a1 +userns f58437f1f9161847c636e4fed5569ed5b908af36 +ktest 961d9caceea2d5350a15c17b7d3ffc24c08c9b09 +signal 20b4fb485227404329e41ad15588afad3df23050 +clk fd3fdaf09f26cd4f53fd4d7cdfe8e3dbb55a4dda +random a9f069e38cc36d6c4ab3c831bc4bef2ae1a16e96 +lzo-update 42b775abafafdf811ef300e869a4e1480ef1cf95 +arm64-hugepages af07484863e0c20796081e57093886c22dc16705 +aio 4675348e78fab420e70f9144b320d9c063c7cee8 +akpm-current c28515337902a7f0807e6acc8eac9ceaf9113202 +akpm 3f9eef9678d0174b40c872328c95090e0f79cdf8 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..92a98773d4f6 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,212 @@ +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 +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 +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.linaro.org/people/shawnguo/linux-2.6.git#for-next +ixp4xx git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux.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 +mpc5xxx git git://git.denx.de/linux-2.6-agust.git#next +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.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/users/dedekind/l2-mtd-2.6.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-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/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 +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.linaro.org/people/ljones/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 +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 +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +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 +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://github.com/columbia/linux-kvm-arm.git#kvm-arm-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://gitorious.org/kernel-hsi/kernel-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 +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 +arm64-hugepages git git://git.linaro.org/people/stevecapper/linux.git#for-next/hugepages +aio git git://git.kvack.org/~bcrl/aio-next.git#master +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..0ba1650a32a3 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4153 @@ +$ date +Friday 14 February 10:55:48 EST 2014 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 9398a10cd964 Merge tag 'regulator-v3.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator +Merging origin/master (4675348e78fa Merge tag 'stable/for-linus-3.14-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip) +$ git merge origin/master +Updating 9398a10cd964..4675348e78fa +Fast-forward + drivers/xen/Makefile | 1 - + drivers/xen/events/events_base.c | 2 + + drivers/xen/xencomm.c | 219 -------------------------------------- + include/uapi/xen/Kbuild | 2 + + include/{ => uapi}/xen/gntalloc.h | 0 + include/{ => uapi}/xen/gntdev.h | 0 + include/xen/interface/xencomm.h | 41 ------- + include/xen/xencomm.h | 77 -------------- + 8 files changed, 4 insertions(+), 338 deletions(-) + delete mode 100644 drivers/xen/xencomm.c + rename include/{ => uapi}/xen/gntalloc.h (100%) + rename include/{ => uapi}/xen/gntdev.h (100%) + delete mode 100644 include/xen/interface/xencomm.h + delete mode 100644 include/xen/xencomm.h +Merging fixes/master (b0031f227e47 Merge tag 's2mps11-build' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (38dbfb59d117 Linus 3.14-rc1) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (7e22e91102c6 Linux 3.13-rc8) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (b027df048500 ARM: 7957/1: add DSB after icache flush in __flush_icache_all()) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/imx6dl-hummingboard.dts | 10 +++------- + arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 10 +++------- + arch/arm/include/asm/cacheflush.h | 1 + + arch/arm/include/asm/pgtable-3level.h | 15 +++++++++------ + arch/arm/include/asm/spinlock.h | 15 +++------------ + arch/arm/kernel/setup.c | 2 +- + arch/arm/mm/mm.h | 1 + + arch/arm/mm/mmu.c | 7 ++++++- + arch/arm/mm/proc-v6.S | 3 ++- + arch/arm/mm/proc-v7.S | 2 +- + drivers/mmc/card/queue.c | 2 +- + drivers/scsi/scsi_lib.c | 2 +- + 12 files changed, 32 insertions(+), 38 deletions(-) +Merging m68k-current/for-linus (7247f55381d5 m68k: Wire up sched_setattr and sched_getattr) +$ git merge m68k-current/for-linus +Removing arch/m68k/include/asm/barrier.h +Merge made by the 'recursive' strategy. + arch/m68k/include/asm/Kbuild | 6 +++--- + arch/m68k/include/asm/barrier.h | 8 -------- + arch/m68k/include/asm/unistd.h | 2 +- + arch/m68k/include/uapi/asm/unistd.h | 2 ++ + arch/m68k/kernel/syscalltable.S | 2 ++ + 5 files changed, 8 insertions(+), 12 deletions(-) + delete mode 100644 arch/m68k/include/asm/barrier.h +Merging metag-fixes/fixes (3b2f64d00c46 Linux 3.11-rc2) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging powerpc-merge/merge (cd15b048445d powerpc/powernv: Add iommu DMA bypass support for IODA2) +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc/master (738b52bb9845 Merge tag 'microblaze-3.14-rc3' of git://git.monstr.eu/linux-2.6-microblaze) +$ git merge sparc/master +Already up-to-date. +Merging net/master (219e288e8900 net: sched: Cleanup PIE comments) +$ git merge net/master +Removing Documentation/networking/3c505.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/sti-dwmac.txt | 58 ++++ + Documentation/networking/3c505.txt | 45 --- + drivers/net/Kconfig | 2 +- + drivers/net/bonding/bond_main.c | 7 + + drivers/net/can/usb/kvaser_usb.c | 2 + + drivers/net/ethernet/stmicro/stmmac/Kconfig | 11 + + drivers/net/ethernet/stmicro/stmmac/Makefile | 1 + + drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 330 +++++++++++++++++++++ + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 3 + + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 5 + + drivers/net/ethernet/ti/cpsw.c | 5 + + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 13 +- + drivers/net/macvlan.c | 5 +- + drivers/net/usb/qmi_wwan.c | 1 + + include/linux/netdevice.h | 7 +- + include/linux/skbuff.h | 17 ++ + net/core/dev.c | 22 +- + net/core/rtnetlink.c | 19 +- + net/ipv4/ip_forward.c | 71 ++++- + net/ipv6/ip6_output.c | 17 +- + net/sched/sch_pie.c | 21 +- + net/sctp/sysctl.c | 18 +- + net/tipc/core.h | 1 + + net/tipc/link.c | 7 + + 24 files changed, 602 insertions(+), 86 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/sti-dwmac.txt + delete mode 100644 Documentation/networking/3c505.txt + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c +Merging ipsec/master (738b52bb9845 Merge tag 'microblaze-3.14-rc3' of git://git.monstr.eu/linux-2.6-microblaze) +$ git merge ipsec/master +Already up-to-date. +Merging sound-current/for-linus (2078600b1f8f ALSA: Revert "ALSA: hda/realtek - Avoid invalid COEFs for ALC271X") +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/hda/hda_codec.c | 34 +++++++++++++++++----------------- + sound/pci/hda/hda_generic.c | 8 ++++---- + sound/pci/hda/hda_generic.h | 1 + + sound/pci/hda/hda_intel.c | 2 +- + sound/pci/hda/patch_conexant.c | 3 ++- + sound/pci/hda/patch_realtek.c | 14 ++++++++------ + sound/pci/hda/patch_sigmatel.c | 27 +++++++++++++++++---------- + sound/pci/hda/thinkpad_helper.c | 1 + + 8 files changed, 51 insertions(+), 39 deletions(-) +Merging pci-current/for-linus (3ce4e860e578 PCI/MSI: Add pci_enable_msi_exact() and pci_enable_msix_exact()) +$ git merge pci-current/for-linus +Merge made by the 'recursive' strategy. + Documentation/PCI/MSI-HOWTO.txt | 119 ++++++++++++++++++++++++++++++++++++---- + drivers/pci/host/pci-mvebu.c | 11 +--- + drivers/pci/msi.c | 10 +++- + include/linux/pci.h | 20 +++++++ + 4 files changed, 139 insertions(+), 21 deletions(-) +Merging wireless/master (6b6ee88774ae bcma: gpio: register all 32 GPIOs) +$ git merge wireless/master +Recorded preimage for 'drivers/bcma/driver_gpio.c' +Auto-merging drivers/bcma/driver_gpio.c +CONFLICT (content): Merge conflict in drivers/bcma/driver_gpio.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/bcma/driver_gpio.c'. +[master a7bea8c3d320] Merge remote-tracking branch 'wireless/master' +$ git diff -M --stat --summary HEAD^.. + drivers/bcma/driver_gpio.c | 2 +- + drivers/net/wireless/ath/ath5k/phy.c | 2 +- + drivers/net/wireless/hostap/hostap_proc.c | 2 +- + drivers/net/wireless/iwlwifi/dvm/mac80211.c | 22 ++++++++++++++++++++-- + drivers/net/wireless/iwlwifi/iwl-drv.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-modparams.h | 11 +++++++---- + drivers/net/wireless/iwlwifi/mvm/mac80211.c | 22 ++++++++++++++++++++-- + drivers/net/wireless/rtl818x/rtl8187/rtl8187.h | 10 ++++++++-- + drivers/net/wireless/rtlwifi/ps.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 18 ++++++++++++++++-- + 10 files changed, 76 insertions(+), 17 deletions(-) +Merging driver-core.current/driver-core-linus (9e1ccb4a7700 drivers/base: fix devres handling for master device) +$ git merge driver-core.current/driver-core-linus +Merge made by the 'recursive' strategy. + drivers/base/component.c | 8 ++++++++ + 1 file changed, 8 insertions(+) +Merging tty.current/tty-linus (0930b0950a89 vt: Fix secure clear screen) +$ git merge tty.current/tty-linus +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-tty | 3 ++- + drivers/tty/hvc/hvc_opal.c | 8 +------- + drivers/tty/hvc/hvc_rtas.c | 12 +----------- + drivers/tty/hvc/hvc_udbg.c | 9 +-------- + drivers/tty/hvc/hvc_xen.c | 17 +---------------- + drivers/tty/n_gsm.c | 11 +++++++++++ + drivers/tty/n_tty.c | 14 ++++++++------ + drivers/tty/serial/8250/8250_core.c | 18 ++++++++++++++++++ + drivers/tty/serial/8250/8250_dw.c | 4 ++-- + drivers/tty/serial/8250/8250_pci.c | 3 ++- + drivers/tty/serial/omap-serial.c | 11 +++++++---- + drivers/tty/serial/sirfsoc_uart.c | 4 +++- + drivers/tty/tty_io.c | 25 ++++++++++++++++++------- + drivers/tty/vt/vt.c | 2 ++ + 14 files changed, 77 insertions(+), 64 deletions(-) +Merging usb.current/usb-linus (3635c7e2d59f usb: option: blacklist ZTE MF667 net interface) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/core/driver.c | 24 ++++++++---- + drivers/usb/core/hcd.c | 1 - + drivers/usb/core/hub.c | 7 +--- + drivers/usb/core/usb.h | 1 - + drivers/usb/dwc2/core.c | 2 +- + drivers/usb/dwc2/hcd.c | 11 ------ + drivers/usb/dwc2/platform.c | 3 ++ + drivers/usb/host/xhci-dbg.c | 6 +-- + drivers/usb/host/xhci-mem.c | 14 +++---- + drivers/usb/host/xhci-pci.c | 5 +++ + drivers/usb/host/xhci-ring.c | 68 +++++----------------------------- + drivers/usb/host/xhci.c | 38 +++++++++++-------- + drivers/usb/host/xhci.h | 41 ++++++++++++++------ + drivers/usb/phy/phy.c | 8 ++-- + drivers/usb/serial/ftdi_sio.c | 3 ++ + drivers/usb/serial/ftdi_sio_ids.h | 7 ++++ + drivers/usb/serial/option.c | 3 +- + drivers/usb/serial/qcserial.c | 3 ++ + drivers/usb/serial/usb-serial-simple.c | 3 +- + drivers/usb/storage/Kconfig | 4 +- + drivers/usb/storage/scsiglue.c | 6 +++ + drivers/usb/storage/unusual_cypress.h | 2 +- + drivers/usb/storage/unusual_devs.h | 7 ++++ + include/linux/usb.h | 2 - + scripts/mod/file2alias.c | 4 +- + 25 files changed, 138 insertions(+), 135 deletions(-) +Merging staging.current/staging-linus (ddf5eb564d97 staging/rtl8821ae: fix build, depends on MAC80211) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/iio/accel/bma180.c | 16 +- + drivers/iio/adc/max1363.c | 2 +- + drivers/iio/imu/adis16400.h | 1 + + drivers/iio/imu/adis16400_core.c | 10 +- + drivers/iio/light/tsl2563.c | 16 +- + drivers/iio/magnetometer/ak8975.c | 16 +- + drivers/iio/magnetometer/mag3110.c | 8 +- + drivers/staging/android/ashmem.c | 45 +-- + drivers/staging/android/ion/compat_ion.c | 26 +- + drivers/staging/android/ion/ion_dummy_driver.c | 12 +- + drivers/staging/android/ion/ion_heap.c | 2 +- + drivers/staging/android/ion/ion_priv.h | 1 + + drivers/staging/android/ion/ion_system_heap.c | 6 +- + drivers/staging/android/sw_sync.h | 17 ++ + drivers/staging/android/sync.c | 14 +- + drivers/staging/comedi/drivers.c | 2 - + drivers/staging/comedi/drivers/adv_pci1710.c | 17 +- + drivers/staging/comedi/drivers/usbduxsigma.c | 6 +- + drivers/staging/dgrp/dgrp_net_ops.c | 330 ++++++++++----------- + drivers/staging/gdm72xx/gdm_usb.c | 3 + + drivers/staging/iio/Documentation/iio_utils.h | 6 +- + drivers/staging/iio/adc/ad799x_core.c | 13 +- + drivers/staging/iio/adc/mxs-lradc.c | 6 +- + drivers/staging/iio/impedance-analyzer/ad5933.c | 2 +- + drivers/staging/imx-drm/imx-drm-core.c | 55 ++-- + drivers/staging/imx-drm/imx-hdmi.c | 22 +- + drivers/staging/lustre/TODO | 5 +- + .../include/linux/libcfs/libcfs_kernelcomm.h | 2 + + .../lustre/include/linux/libcfs/libcfs_private.h | 2 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 2 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 5 +- + .../lustre/lustre/include/lustre/lustre_user.h | 3 +- + drivers/staging/lustre/lustre/llite/dir.c | 2 +- + drivers/staging/lustre/lustre/mdc/mdc_request.c | 6 +- + drivers/staging/netlogic/xlr_net.c | 5 + + drivers/staging/octeon-usb/octeon-hcd.c | 273 ++++++++--------- + drivers/staging/ozwpan/ozproto.c | 3 +- + drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 22 +- + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 12 +- + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 2 +- + drivers/staging/rtl8821ae/Kconfig | 2 +- + drivers/staging/rtl8821ae/wifi.h | 2 +- + drivers/staging/usbip/userspace/libsrc/names.c | 8 +- + drivers/staging/usbip/vhci_sysfs.c | 3 +- + drivers/staging/wlags49_h2/wl_wext.c | 2 +- + 45 files changed, 506 insertions(+), 509 deletions(-) +Merging char-misc.current/char-misc-linus (3b1cc9b9622a misc: mic: fix possible signed underflow (undefined behavior) in userspace API) +$ git merge char-misc.current/char-misc-linus +Auto-merging arch/arm/boot/dts/sun5i-a10s.dtsi +Auto-merging arch/arm/boot/dts/sun4i-a10.dtsi +Merge made by the 'recursive' strategy. + .../bindings/misc/allwinner,sunxi-sid.txt | 5 +- + Documentation/zh_CN/arm64/booting.txt | 65 +++++++++++++++------- + Documentation/zh_CN/arm64/memory.txt | 46 +++++++++++++-- + Documentation/zh_CN/arm64/tagged-pointers.txt | 52 +++++++++++++++++ + arch/arm/boot/dts/sun4i-a10.dtsi | 2 +- + arch/arm/boot/dts/sun5i-a10s.dtsi | 2 +- + arch/arm/boot/dts/sun5i-a13.dtsi | 2 +- + drivers/char/Kconfig | 1 + + drivers/char/raw.c | 2 +- + drivers/hv/connection.c | 13 +---- + drivers/misc/eeprom/sunxi_sid.c | 5 +- + drivers/misc/genwqe/card_dev.c | 1 + + drivers/misc/mei/client.c | 11 +++- + drivers/misc/mic/host/mic_virtio.c | 3 +- + drivers/vme/bridges/vme_ca91cx42.c | 4 +- + drivers/vme/bridges/vme_tsi148.c | 4 +- + include/linux/hyperv.h | 2 +- + include/uapi/linux/mic_ioctl.h | 2 +- + 18 files changed, 171 insertions(+), 51 deletions(-) + create mode 100644 Documentation/zh_CN/arm64/tagged-pointers.txt +Merging input-current/for-linus (55df811f2066 Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up-to-date. +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 (ee97dc7db4cb crypto: s390 - fix des and des3_ede ctr concurrency issue) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (738b52bb9845 Merge tag 'microblaze-3.14-rc3' of git://git.monstr.eu/linux-2.6-microblaze) +$ git merge ide/master +Already up-to-date. +Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) +$ git merge dwmw2/master +Already up-to-date. +Merging devicetree-current/devicetree/merge (6f041e99fc7b of: Fix NULL dereference in unflatten_and_copy()) +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging rr-fixes/fixes (7122c3e9154b scripts/link-vmlinux.sh: only filter kernel symbols for arm) +$ 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 (f51a44b9a6c4 drm/i915/dp: add native aux defer retry limit) +$ git merge drm-intel-fixes/for-linux-next-fixes +Auto-merging drivers/gpu/drm/i915/intel_display.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/intel_display.c | 14 ++++++++++++++ + drivers/gpu/drm/i915/intel_dp.c | 19 +++++++++++++------ + drivers/gpu/drm/i915/intel_ringbuffer.c | 21 +++++++++++++++++++++ + drivers/gpu/drm/i915/intel_ringbuffer.h | 1 + + 4 files changed, 49 insertions(+), 6 deletions(-) +Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu) +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (c61e2aee0c55 ARC: Remove ARC_HAS_COH_RTSC) +$ git merge arc/for-next +Merge made by the 'recursive' strategy. + arch/arc/boot/.gitignore | 1 + + arch/arc/include/asm/linkage.h | 14 ----------- + arch/arc/kernel/ctx_sw_asm.S | 2 +- + arch/arc/kernel/entry.S | 52 ++++++++++++++++++++-------------------- + arch/arc/lib/memcmp.S | 6 ++--- + arch/arc/lib/memcpy-700.S | 6 ++--- + arch/arc/lib/memset.S | 10 ++++---- + arch/arc/lib/strchr-700.S | 6 ++--- + arch/arc/lib/strcmp.S | 6 ++--- + arch/arc/lib/strcpy-700.S | 6 ++--- + arch/arc/lib/strlen.S | 6 ++--- + arch/arc/mm/init.c | 27 +++++++++++++++++++++ + arch/arc/mm/tlbex.S | 10 ++++---- + arch/arc/plat-arcfpga/Kconfig | 1 - + arch/arc/plat-arcfpga/platform.c | 6 ++--- + 15 files changed, 85 insertions(+), 74 deletions(-) +Merging arm/for-next (41212aaf9432 Merge branches 'fixes', 'misc', 'mmci', 'unstable/omap-dma' and 'unstable/sa11x0' into for-next) +$ git merge arm/for-next +Merge made by the 'recursive' strategy. + arch/arm/include/asm/cputype.h | 1 + + arch/arm/include/asm/futex.h | 6 - + arch/arm/include/asm/hw_breakpoint.h | 1 + + arch/arm/include/asm/pgtable-2level.h | 1 + + arch/arm/include/asm/uaccess.h | 2 +- + arch/arm/kernel/hw_breakpoint.c | 3 +- + arch/arm/mach-footbridge/dc21285-timer.c | 4 +- + arch/arm/mach-omap1/dma.c | 191 ++++----- + arch/arm/mach-omap2/dma.c | 183 ++++---- + arch/arm/mach-sa1100/collie.c | 33 ++ + arch/arm/mach-sa1100/h3100.c | 7 - + arch/arm/mach-sa1100/h3600.c | 7 - + arch/arm/mach-sa1100/h3xxx.c | 58 ++- + arch/arm/mach-sa1100/include/mach/collie.h | 2 +- + arch/arm/mach-sa1100/include/mach/h3xxx.h | 11 - + arch/arm/mm/Kconfig | 3 +- + arch/arm/mm/cache-feroceon-l2.c | 4 +- + arch/arm/mm/mmu.c | 10 + + arch/arm/mm/proc-macros.S | 19 +- + arch/arm/mm/proc-v7-2level.S | 7 - + arch/arm/mm/proc-v7.S | 11 + + arch/arm/plat-omap/dma.c | 17 +- + drivers/dma/omap-dma.c | 659 ++++++++++++++++++++++++++--- + drivers/mmc/host/mmci.h | 9 +- + include/linux/omap-dma.h | 25 +- + 25 files changed, 889 insertions(+), 385 deletions(-) +Merging arm-perf/for-next/perf (a1d711938959 ARM: dts: msm: Add krait-pmu to platforms with Krait CPUs) +$ git merge arm-perf/for-next/perf +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/pmu.txt | 9 +- + arch/arm/boot/dts/qcom-msm8960-cdp.dts | 6 + + arch/arm/boot/dts/qcom-msm8974.dtsi | 5 + + arch/arm/include/asm/pmu.h | 2 + + arch/arm/kernel/perf_event.c | 16 +- + arch/arm/kernel/perf_event_cpu.c | 103 +++-- + arch/arm/kernel/perf_event_v7.c | 559 ++++++++++++++++++++++++++ + 7 files changed, 666 insertions(+), 34 deletions(-) +Merging arm-soc/for-next (0ef783f632e3 Merge branch 'fixes' into for-next) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/atmel-hsmci.txt | 5 + + .../devicetree/bindings/spi/spi_atmel.txt | 5 + + Documentation/phy.txt | 26 ++- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/at91-sama5d3_xplained.dts | 229 +++++++++++++++++++++ + arch/arm/boot/dts/at91sam9263.dtsi | 2 +- + arch/arm/boot/dts/at91sam9n12ek.dts | 4 + + arch/arm/boot/dts/sama5d3.dtsi | 2 +- + arch/arm/boot/dts/ste-href.dtsi | 1 - + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/mach-hisi/Kconfig | 2 +- + arch/arm/mach-imx/clk-imx6q.c | 3 + + arch/arm/mach-imx/clk-imx6sl.c | 3 + + arch/arm/mach-imx/pm-imx6q.c | 2 - + arch/arm/mach-moxart/Kconfig | 1 - + arch/arm/mach-omap2/Kconfig | 2 +- + arch/arm/mach-pxa/am300epd.c | 1 + + arch/arm/mach-pxa/include/mach/balloon3.h | 2 + + arch/arm/mach-pxa/include/mach/corgi.h | 1 + + arch/arm/mach-pxa/include/mach/csb726.h | 2 + + arch/arm/mach-pxa/include/mach/gumstix.h | 1 + + arch/arm/mach-pxa/include/mach/idp.h | 1 + + arch/arm/mach-pxa/include/mach/palmld.h | 2 + + arch/arm/mach-pxa/include/mach/palmt5.h | 2 + + arch/arm/mach-pxa/include/mach/palmtc.h | 2 + + arch/arm/mach-pxa/include/mach/palmtx.h | 2 + + arch/arm/mach-pxa/include/mach/pcm027.h | 2 + + arch/arm/mach-pxa/include/mach/pcm990_baseboard.h | 1 + + arch/arm/mach-pxa/include/mach/poodle.h | 2 + + arch/arm/mach-pxa/include/mach/spitz.h | 2 +- + arch/arm/mach-pxa/include/mach/tosa.h | 2 + + arch/arm/mach-pxa/include/mach/trizeps4.h | 2 + + arch/arm/mach-shmobile/Kconfig | 2 +- + arch/arm/mach-zynq/common.c | 14 ++ + drivers/ata/sata_mv.c | 8 +- + drivers/dma/Kconfig | 1 + + drivers/dma/mv_xor.c | 24 +-- + drivers/phy/phy-core.c | 62 +++++- + include/linux/phy/phy.h | 14 ++ + 39 files changed, 408 insertions(+), 33 deletions(-) + create mode 100644 arch/arm/boot/dts/at91-sama5d3_xplained.dts +Merging bcm2835/for-next (c06213a754f5 Merge branch 'for-3.15/dt' into for-next) +$ git merge bcm2835/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/bcm2835.dtsi | 85 +++++++++++++++++++++++++++++------------- + 1 file changed, 60 insertions(+), 25 deletions(-) +Merging cortex-m/for-next (f41bfc9423aa Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4) +$ 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 (6e5dad1f97b2 Merge branch 'imx/dt' into for-next) +$ git merge imx-mxs/for-next +Auto-merging arch/arm/mach-imx/pm-imx6q.c +Removing arch/arm/mach-imx/devices/platform-mxc_pwm.c +Auto-merging arch/arm/mach-imx/clk-imx6sl.c +Auto-merging arch/arm/mach-imx/clk-imx6q.c +Removing arch/arm/boot/dts/imx53-evk.dts +Auto-merging arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/vendor-prefixes.txt | 3 + + arch/arm/boot/dts/Makefile | 30 +- + arch/arm/boot/dts/imx23-evk.dts | 8 +- + arch/arm/boot/dts/imx23-olinuxino.dts | 5 +- + arch/arm/boot/dts/imx23-stmp378x_devb.dts | 5 +- + arch/arm/boot/dts/imx23.dtsi | 8 +- + arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi | 73 ++ + .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 174 ++++ + arch/arm/boot/dts/imx25-pinfunc.h | 494 +++++++++++ + arch/arm/boot/dts/imx25.dtsi | 18 +- + arch/arm/boot/dts/imx27-apf27.dts | 38 + + arch/arm/boot/dts/imx27-apf27dev.dts | 149 +++- + arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts | 75 +- + arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts | 63 +- + arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 97 ++- + ...ycore-som.dts => imx27-phytec-phycore-som.dtsi} | 95 ++- + arch/arm/boot/dts/imx27-pinfunc.h | 526 ++++++++++++ + arch/arm/boot/dts/imx27.dtsi | 151 ++-- + arch/arm/boot/dts/imx28-apf28dev.dts | 29 +- + arch/arm/boot/dts/imx28-apx4devkit.dts | 5 +- + arch/arm/boot/dts/imx28-cfa10036.dts | 2 + + arch/arm/boot/dts/imx28-cfa10037.dts | 7 +- + arch/arm/boot/dts/imx28-cfa10049.dts | 31 +- + arch/arm/boot/dts/imx28-cfa10057.dts | 7 +- + arch/arm/boot/dts/imx28-cfa10058.dts | 7 +- + arch/arm/boot/dts/imx28-duckbill.dts | 121 +++ + arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts | 71 ++ + arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts | 50 ++ + arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi | 326 +++++++ + arch/arm/boot/dts/imx28-evk.dts | 24 +- + arch/arm/boot/dts/imx28-m28cu3.dts | 17 +- + arch/arm/boot/dts/imx28-m28evk.dts | 18 +- + arch/arm/boot/dts/imx28-sps1.dts | 7 +- + arch/arm/boot/dts/imx28-tx28.dts | 24 +- + arch/arm/boot/dts/imx28.dtsi | 65 +- + arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi | 81 ++ + .../boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts | 143 ++++ + arch/arm/boot/dts/imx35.dtsi | 359 ++++++++ + arch/arm/boot/dts/imx50-evk.dts | 119 +++ + arch/arm/boot/dts/imx50-pinfunc.h | 923 ++++++++++++++++++++ + arch/arm/boot/dts/imx50.dtsi | 478 +++++++++++ + arch/arm/boot/dts/imx51-apf51.dts | 40 +- + arch/arm/boot/dts/imx51-apf51dev.dts | 102 ++- + arch/arm/boot/dts/imx51-babbage.dts | 255 +++++- + arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi | 93 ++ + .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 175 ++++ + arch/arm/boot/dts/imx51.dtsi | 459 ++-------- + arch/arm/boot/dts/imx53-ard.dts | 33 +- + arch/arm/boot/dts/imx53-evk.dts | 126 --- + arch/arm/boot/dts/imx53-m53evk.dts | 232 ++++- + arch/arm/boot/dts/imx53-mba53.dts | 39 +- + arch/arm/boot/dts/imx53-qsb-common.dtsi | 336 ++++++++ + arch/arm/boot/dts/imx53-qsb.dts | 210 +---- + arch/arm/boot/dts/imx53-qsrb.dts | 158 ++++ + arch/arm/boot/dts/imx53-smd.dts | 119 ++- + arch/arm/boot/dts/imx53-tqma53.dtsi | 175 +++- + arch/arm/boot/dts/imx53-tx53-x03x.dts | 315 +++++++ + arch/arm/boot/dts/imx53-tx53-x13x.dts | 243 ++++++ + arch/arm/boot/dts/imx53-tx53.dtsi | 510 ++++++++++- + arch/arm/boot/dts/imx53-voipac-bsb.dts | 159 ++++ + arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi | 277 ++++++ + arch/arm/boot/dts/imx53.dtsi | 663 +++------------ + arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts | 23 + + arch/arm/boot/dts/imx6dl-gw51xx.dts | 19 + + arch/arm/boot/dts/imx6dl-gw52xx.dts | 19 + + arch/arm/boot/dts/imx6dl-gw53xx.dts | 19 + + arch/arm/boot/dts/imx6dl-gw54xx.dts | 19 + + arch/arm/boot/dts/imx6dl-nitrogen6x.dts | 21 + + arch/arm/boot/dts/imx6dl-pinfunc.h | 2 + + arch/arm/boot/dts/imx6dl-sabrelite.dts | 20 + + arch/arm/boot/dts/imx6dl.dtsi | 29 +- + arch/arm/boot/dts/imx6q-arm2.dts | 140 ++- + arch/arm/boot/dts/imx6q-cm-fx6.dts | 107 +++ + arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts | 23 + + arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 372 ++++++++ + arch/arm/boot/dts/imx6q-gk802.dts | 171 ++++ + arch/arm/boot/dts/imx6q-gw51xx.dts | 19 + + arch/arm/boot/dts/imx6q-gw52xx.dts | 23 + + arch/arm/boot/dts/imx6q-gw53xx.dts | 23 + + arch/arm/boot/dts/imx6q-gw5400-a.dts | 546 ++++++++++++ + arch/arm/boot/dts/imx6q-gw54xx.dts | 23 + + arch/arm/boot/dts/imx6q-nitrogen6x.dts | 25 + + arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi | 85 +- + arch/arm/boot/dts/imx6q-pinfunc.h | 2 + + arch/arm/boot/dts/imx6q-sabrelite.dts | 178 +--- + arch/arm/boot/dts/imx6q-sbc6x.dts | 58 +- + arch/arm/boot/dts/imx6q-udoo.dts | 54 +- + arch/arm/boot/dts/imx6q.dtsi | 21 +- + arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi | 199 +++++ + arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 374 ++++++++ + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 490 +++++++++++ + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 553 ++++++++++++ + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 580 +++++++++++++ + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 422 +++++++++ + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 359 +++++++- + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 423 ++++++++++ + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 277 +++++- + arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 131 ++- + arch/arm/boot/dts/imx6qdl.dtsi | 938 +++------------------ + arch/arm/boot/dts/imx6sl-evk.dts | 426 +++++++++- + arch/arm/boot/dts/imx6sl.dtsi | 385 +++------ + arch/arm/boot/dts/vf610-cosmic.dts | 29 +- + arch/arm/boot/dts/vf610-twr.dts | 66 +- + arch/arm/boot/dts/vf610.dtsi | 207 +---- + arch/arm/configs/imx_v4_v5_defconfig | 1 + + arch/arm/configs/imx_v6_v7_defconfig | 6 + + arch/arm/mach-imx/Kconfig | 8 +- + arch/arm/mach-imx/Makefile | 6 +- + arch/arm/mach-imx/clk-imx21.c | 1 - + arch/arm/mach-imx/clk-imx25.c | 8 - + arch/arm/mach-imx/clk-imx27.c | 1 - + arch/arm/mach-imx/clk-imx51-imx53.c | 2 - + arch/arm/mach-imx/clk-imx6q.c | 7 +- + arch/arm/mach-imx/clk-imx6sl.c | 88 +- + arch/arm/mach-imx/clk-vf610.c | 36 +- + arch/arm/mach-imx/common.h | 11 +- + arch/arm/mach-imx/cpuidle-imx6q.c | 4 +- + arch/arm/mach-imx/cpuidle-imx6sl.c | 57 ++ + arch/arm/mach-imx/cpuidle.h | 5 + + arch/arm/mach-imx/devices-imx25.h | 4 - + arch/arm/mach-imx/devices-imx51.h | 4 - + arch/arm/mach-imx/devices/Kconfig | 3 - + arch/arm/mach-imx/devices/Makefile | 1 - + arch/arm/mach-imx/devices/devices-common.h | 9 - + arch/arm/mach-imx/devices/platform-mxc_pwm.c | 69 -- + arch/arm/mach-imx/hardware.h | 4 +- + arch/arm/mach-imx/mach-imx6q.c | 38 +- + arch/arm/mach-imx/mach-imx6sl.c | 6 +- + arch/arm/mach-imx/pm-imx6q.c | 327 ++++++- + arch/arm/mach-imx/suspend-imx6.S | 328 +++++++ + arch/arm/mach-imx/time.c | 12 + + arch/arm/mach-mxs/mach-mxs.c | 33 + + 132 files changed, 15323 insertions(+), 3301 deletions(-) + create mode 100644 arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi + create mode 100644 arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts + create mode 100644 arch/arm/boot/dts/imx25-pinfunc.h + rename arch/arm/boot/dts/{imx27-phytec-phycore-som.dts => imx27-phytec-phycore-som.dtsi} (61%) + create mode 100644 arch/arm/boot/dts/imx27-pinfunc.h + create mode 100644 arch/arm/boot/dts/imx28-duckbill.dts + create mode 100644 arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts + create mode 100644 arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts + create mode 100644 arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi + create mode 100644 arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi + create mode 100644 arch/arm/boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts + create mode 100644 arch/arm/boot/dts/imx35.dtsi + create mode 100644 arch/arm/boot/dts/imx50-evk.dts + create mode 100644 arch/arm/boot/dts/imx50-pinfunc.h + create mode 100644 arch/arm/boot/dts/imx50.dtsi + create mode 100644 arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi + create mode 100644 arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts + delete mode 100644 arch/arm/boot/dts/imx53-evk.dts + create mode 100644 arch/arm/boot/dts/imx53-qsb-common.dtsi + create mode 100644 arch/arm/boot/dts/imx53-qsrb.dts + create mode 100644 arch/arm/boot/dts/imx53-tx53-x03x.dts + create mode 100644 arch/arm/boot/dts/imx53-tx53-x13x.dts + create mode 100644 arch/arm/boot/dts/imx53-voipac-bsb.dts + create mode 100644 arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi + create mode 100644 arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts + create mode 100644 arch/arm/boot/dts/imx6dl-gw51xx.dts + create mode 100644 arch/arm/boot/dts/imx6dl-gw52xx.dts + create mode 100644 arch/arm/boot/dts/imx6dl-gw53xx.dts + create mode 100644 arch/arm/boot/dts/imx6dl-gw54xx.dts + create mode 100644 arch/arm/boot/dts/imx6dl-nitrogen6x.dts + create mode 100644 arch/arm/boot/dts/imx6dl-sabrelite.dts + create mode 100644 arch/arm/boot/dts/imx6q-cm-fx6.dts + create mode 100644 arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts + create mode 100644 arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts + create mode 100644 arch/arm/boot/dts/imx6q-gk802.dts + create mode 100644 arch/arm/boot/dts/imx6q-gw51xx.dts + create mode 100644 arch/arm/boot/dts/imx6q-gw52xx.dts + create mode 100644 arch/arm/boot/dts/imx6q-gw53xx.dts + create mode 100644 arch/arm/boot/dts/imx6q-gw5400-a.dts + create mode 100644 arch/arm/boot/dts/imx6q-gw54xx.dts + create mode 100644 arch/arm/boot/dts/imx6q-nitrogen6x.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-gw51xx.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-gw52xx.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-gw53xx.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-gw54xx.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-sabrelite.dtsi + create mode 100644 arch/arm/mach-imx/cpuidle-imx6sl.c + delete mode 100644 arch/arm/mach-imx/devices/platform-mxc_pwm.c + create mode 100644 arch/arm/mach-imx/suspend-imx6.S +Merging ixp4xx/next (19f949f52599 Linux 3.8) +$ git merge ixp4xx/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 (cebfcb84217e Merge branch 'old/mvebu/irqchip' into for-next) +$ git merge mvebu/for-next +Auto-merging drivers/irqchip/Makefile +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../interrupt-controller/marvell,dove-pmu-intc.txt | 17 ++ + arch/arm/boot/dts/Makefile | 7 +- + arch/arm/boot/dts/armada-370-mirabox.dts | 7 +- + arch/arm/boot/dts/armada-370-rd.dts | 6 +- + arch/arm/boot/dts/armada-xp-axpwifiap.dts | 6 +- + arch/arm/boot/dts/armada-xp-mv78260.dtsi | 3 +- + arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 12 +- + arch/arm/boot/dts/kirkwood-b3.dts | 204 +++++++++++++++++++++ + arch/arm/boot/dts/kirkwood-ts419-6281.dts | 20 ++ + arch/arm/boot/dts/kirkwood-ts419-6282.dts | 32 ++++ + arch/arm/boot/dts/kirkwood-ts419.dtsi | 75 ++++++++ + arch/arm/configs/dove_defconfig | 1 - + .../{mvebu_defconfig => mvebu_v7_defconfig} | 0 + arch/arm/mach-mvebu/Makefile | 3 +- + arch/arm/mach-mvebu/armada-370-xp.c | 6 - + arch/arm/mach-mvebu/system-controller.c | 9 +- + drivers/bus/mvebu-mbus.c | 3 +- + drivers/clk/mvebu/armada-370.c | 21 +-- + drivers/clk/mvebu/armada-xp.c | 20 +- + drivers/clk/mvebu/dove.c | 19 +- + drivers/clk/mvebu/kirkwood.c | 34 ++-- + drivers/irqchip/Makefile | 1 + + drivers/irqchip/irq-dove.c | 126 +++++++++++++ + drivers/irqchip/irq-orion.c | 22 ++- + 24 files changed, 570 insertions(+), 84 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/marvell,dove-pmu-intc.txt + create mode 100644 arch/arm/boot/dts/kirkwood-b3.dts + create mode 100644 arch/arm/boot/dts/kirkwood-ts419-6281.dts + create mode 100644 arch/arm/boot/dts/kirkwood-ts419-6282.dts + create mode 100644 arch/arm/boot/dts/kirkwood-ts419.dtsi + rename arch/arm/configs/{mvebu_defconfig => mvebu_v7_defconfig} (100%) + create mode 100644 drivers/irqchip/irq-dove.c +Merging renesas/next (2a42ac1c36b8 Merge branches 'heads/defconfig-for-v3.15', 'heads/soc-for-v3.15', 'heads/boards-for-v3.15' and 'heads/dt-for-v3.15' into devel) +$ git merge renesas/next +Auto-merging arch/arm/mach-shmobile/Kconfig +Removing arch/arm/boot/dts/r8a7791-koelsch-reference.dts +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/r7s72100-genmai-reference.dts | 2 +- + arch/arm/boot/dts/r7s72100.dtsi | 75 ++++ + arch/arm/boot/dts/r8a7778-bockw-reference.dts | 4 +- + arch/arm/boot/dts/r8a7778.dtsi | 40 -- + arch/arm/boot/dts/r8a7790-lager.dts | 118 ++++++ + arch/arm/boot/dts/r8a7790.dtsi | 166 +++++++- + arch/arm/boot/dts/r8a7791-koelsch-reference.dts | 115 ------ + arch/arm/boot/dts/r8a7791-koelsch.dts | 101 ++++- + arch/arm/boot/dts/r8a7791.dtsi | 222 ++++++++++- + arch/arm/configs/ape6evm_defconfig | 2 + + arch/arm/configs/armadillo800eva_defconfig | 2 + + arch/arm/configs/bockw_defconfig | 2 + + arch/arm/configs/genmai_defconfig | 4 + + arch/arm/configs/koelsch_defconfig | 12 +- + arch/arm/configs/kzm9d_defconfig | 2 + + arch/arm/configs/kzm9g_defconfig | 2 + + arch/arm/configs/lager_defconfig | 21 + + arch/arm/configs/mackerel_defconfig | 2 + + arch/arm/configs/marzen_defconfig | 2 + + arch/arm/mach-shmobile/Kconfig | 17 +- + arch/arm/mach-shmobile/Makefile | 3 +- + arch/arm/mach-shmobile/board-bockw.c | 24 +- + arch/arm/mach-shmobile/board-genmai.c | 64 ++++ + arch/arm/mach-shmobile/board-koelsch-reference.c | 4 +- + arch/arm/mach-shmobile/board-koelsch.c | 286 ++++++++++++++ + arch/arm/mach-shmobile/board-kzm9d-reference.c | 5 +- + arch/arm/mach-shmobile/board-lager-reference.c | 4 +- + arch/arm/mach-shmobile/board-lager.c | 423 ++++++++++++++++++++- + arch/arm/mach-shmobile/clock-r7s72100.c | 34 +- + arch/arm/mach-shmobile/clock-r8a7778.c | 4 + + arch/arm/mach-shmobile/clock-r8a7779.c | 27 +- + arch/arm/mach-shmobile/clock-r8a7790.c | 171 +++++---- + arch/arm/mach-shmobile/clock-r8a7791.c | 143 +++++-- + arch/arm/mach-shmobile/include/mach/common.h | 1 - + arch/arm/mach-shmobile/include/mach/head-kzm9g.txt | 410 ++++++++++++++++++++ + arch/arm/mach-shmobile/include/mach/pm-rcar.h | 15 + + arch/arm/mach-shmobile/include/mach/r8a7779.h | 13 +- + arch/arm/mach-shmobile/include/mach/r8a7790.h | 26 ++ + arch/arm/mach-shmobile/include/mach/zboot.h | 3 + + arch/arm/mach-shmobile/include/mach/zboot_macros.h | 43 +++ + arch/arm/mach-shmobile/pm-r8a7779.c | 131 +------ + arch/arm/mach-shmobile/pm-r8a7790.c | 45 +++ + arch/arm/mach-shmobile/pm-rcar.c | 142 +++++++ + arch/arm/mach-shmobile/setup-emev2.c | 2 +- + arch/arm/mach-shmobile/setup-r8a7790.c | 90 +++++ + arch/arm/mach-shmobile/smp-r8a7779.c | 17 +- + arch/arm/mach-shmobile/smp-r8a7790.c | 17 + + drivers/sh/clk/cpg.c | 38 ++ + include/dt-bindings/clock/r8a7790-clock.h | 4 +- + include/linux/sh_clk.h | 19 +- + 50 files changed, 2674 insertions(+), 445 deletions(-) + delete mode 100644 arch/arm/boot/dts/r8a7791-koelsch-reference.dts + create mode 100644 arch/arm/mach-shmobile/include/mach/head-kzm9g.txt + create mode 100644 arch/arm/mach-shmobile/include/mach/pm-rcar.h + create mode 100644 arch/arm/mach-shmobile/pm-r8a7790.c + create mode 100644 arch/arm/mach-shmobile/pm-rcar.c +Merging samsung/for-next (38dbfb59d117 Linus 3.14-rc1) +$ git merge samsung/for-next +Already up-to-date. +Merging tegra/for-next (c3a8d073b74a Merge branch for-3.15/defconfig into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/tegra114-dalmore.dts | 5 ++++ + arch/arm/boot/dts/tegra124-venice2.dts | 2 ++ + arch/arm/boot/dts/tegra20-paz00.dts | 46 +++++++++++++++++++++++++++- + arch/arm/boot/dts/tegra20-seaboard.dts | 55 +++++++++++++++++++++++++++++++++- + arch/arm/boot/dts/tegra20-ventana.dts | 39 ++++++++++++++++++++++-- + arch/arm/boot/dts/tegra30-cardhu.dtsi | 7 +++++ + arch/arm/boot/dts/tegra30.dtsi | 2 +- + arch/arm/configs/tegra_defconfig | 2 ++ + arch/arm/mach-tegra/platsmp.c | 2 +- + drivers/amba/tegra-ahb.c | 2 -- + 10 files changed, 153 insertions(+), 9 deletions(-) +Merging arm64/for-next/core (38dbfb59d117 Linus 3.14-rc1) +$ git merge arm64/for-next/core +Already up-to-date. +Merging blackfin/for-linus (58095fdaaf1c From: Eunbong Song <eunb.song@samsung.com>) +$ git merge blackfin/for-linus +Already up-to-date. +Merging c6x/for-linux-next (546153d75a48 c6x: fix build failure caused by cache.h) +$ git merge c6x/for-linux-next +Merge made by the 'recursive' strategy. + arch/c6x/include/asm/cache.h | 1 + + 1 file changed, 1 insertion(+) +Merging cris/for-next (cd065a010a97 CRISv10: Readd missing header) +$ git merge cris/for-next +Already up-to-date. +Merging hexagon/linux-next (44eb66c228fe Hexagon: update CR year for elf.h) +$ git merge hexagon/linux-next +Merge made by the 'recursive' strategy. + arch/hexagon/Kconfig | 1 + + arch/hexagon/include/asm/Kbuild | 4 +- + arch/hexagon/include/asm/atomic.h | 15 ++++++- + arch/hexagon/include/asm/delay.h | 1 + + arch/hexagon/include/asm/dma-mapping.h | 1 - + arch/hexagon/include/asm/elf.h | 4 +- + arch/hexagon/include/asm/hexagon_vm.h | 72 +++++++++++++++---------------- + arch/hexagon/include/asm/io.h | 2 + + arch/hexagon/include/asm/kgdb.h | 5 ++- + arch/hexagon/include/asm/pgalloc.h | 2 +- + arch/hexagon/include/asm/smp.h | 1 - + arch/hexagon/include/uapi/asm/registers.h | 4 +- + arch/hexagon/include/uapi/asm/setup.h | 5 +++ + arch/hexagon/kernel/Makefile | 2 + + arch/hexagon/kernel/hexagon_ksyms.c | 24 +++++++++-- + arch/hexagon/kernel/kgdb.c | 2 + + arch/hexagon/kernel/ptrace.c | 1 + + arch/hexagon/kernel/reset.c | 5 +-- + arch/hexagon/kernel/screen_info.c | 3 ++ + arch/hexagon/kernel/smp.c | 6 +-- + arch/hexagon/kernel/time.c | 12 ++++-- + 21 files changed, 109 insertions(+), 63 deletions(-) + create mode 100644 arch/hexagon/kernel/screen_info.c +Merging ia64/next (d52eefb47d4e ia64/xen: Remove Xen support for ia64) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (7247f55381d5 m68k: Wire up sched_setattr and sched_getattr) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (72a8ab3cb2a5 m68knommu: fix arg types for outs* functions) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/configs/m5208evb_defconfig | 1 - + arch/m68k/configs/m5249evb_defconfig | 1 - + arch/m68k/configs/m5272c3_defconfig | 1 - + arch/m68k/configs/m5275evb_defconfig | 1 - + arch/m68k/configs/m5307c3_defconfig | 1 - + arch/m68k/configs/m5407c3_defconfig | 1 - + arch/m68k/include/asm/io_no.h | 6 +++--- + 7 files changed, 3 insertions(+), 9 deletions(-) +Merging metag/for-next (e9a1d0165bbd metag/smp: Make boot_secondary() static) +$ git merge metag/for-next +Already up-to-date. +Merging microblaze/next (45f7fdc2ffb9 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (c162646dd29e Merge branch '3.14-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Removing arch/mips/include/asm/gcmpregs.h +Merge made by the 'recursive' strategy. + arch/mips/Kconfig | 69 +++- + arch/mips/Makefile | 5 + + arch/mips/bcm47xx/setup.c | 2 +- + arch/mips/include/asm/asmmacro-32.h | 128 +++---- + arch/mips/include/asm/asmmacro.h | 330 ++++++++++++++---- + arch/mips/include/asm/cpu-features.h | 6 + + arch/mips/include/asm/cpu-info.h | 1 + + arch/mips/include/asm/cpu-type.h | 1 + + arch/mips/include/asm/cpu.h | 4 +- + arch/mips/include/asm/fpu.h | 2 +- + arch/mips/include/asm/gcmpregs.h | 125 ------- + arch/mips/include/asm/gic.h | 3 + + arch/mips/include/asm/idle.h | 14 + + arch/mips/include/asm/mips-boards/malta.h | 5 + + arch/mips/include/asm/mips-cm.h | 322 ++++++++++++++++++ + arch/mips/include/asm/mips-cpc.h | 150 ++++++++ + arch/mips/include/asm/mipsregs.h | 22 ++ + arch/mips/include/asm/msa.h | 199 +++++++++++ + arch/mips/include/asm/processor.h | 45 ++- + arch/mips/include/asm/ptrace.h | 2 +- + arch/mips/include/asm/sigcontext.h | 2 + + arch/mips/include/asm/smp-cps.h | 33 ++ + arch/mips/include/asm/smp-ops.h | 17 + + arch/mips/include/asm/switch_to.h | 22 +- + arch/mips/include/asm/syscall.h | 38 ++- + arch/mips/include/asm/thread_info.h | 7 +- + arch/mips/include/asm/uasm.h | 7 + + arch/mips/include/uapi/asm/inst.h | 15 +- + arch/mips/include/uapi/asm/sigcontext.h | 8 + + arch/mips/kernel/Makefile | 5 + + arch/mips/kernel/asm-offsets.c | 82 +++++ + arch/mips/kernel/cps-vec.S | 191 +++++++++++ + arch/mips/kernel/cpu-probe.c | 45 ++- + arch/mips/kernel/genex.S | 2 + + arch/mips/kernel/idle.c | 22 +- + arch/mips/kernel/irq-gic.c | 1 - + arch/mips/kernel/mips-cm.c | 121 +++++++ + arch/mips/kernel/mips-cpc.c | 52 +++ + arch/mips/kernel/perf_event_mipsxx.c | 6 + + arch/mips/kernel/proc.c | 1 + + arch/mips/kernel/process.c | 23 +- + arch/mips/kernel/ptrace.c | 96 ++++-- + arch/mips/kernel/ptrace32.c | 25 +- + arch/mips/kernel/r4k_fpu.S | 213 ++++++++++++ + arch/mips/kernel/r4k_switch.S | 58 +++- + arch/mips/kernel/scall32-o32.S | 15 +- + arch/mips/kernel/scall64-64.S | 5 +- + arch/mips/kernel/scall64-n32.S | 5 +- + arch/mips/kernel/scall64-o32.S | 17 +- + arch/mips/kernel/signal.c | 138 ++++++-- + arch/mips/kernel/signal32.c | 137 ++++++-- + arch/mips/kernel/smp-cmp.c | 52 +-- + arch/mips/kernel/smp-cps.c | 329 ++++++++++++++++++ + arch/mips/kernel/smp-gic.c | 53 +++ + arch/mips/kernel/spram.c | 2 + + arch/mips/kernel/traps.c | 115 ++++++- + arch/mips/math-emu/cp1emu.c | 58 +++- + arch/mips/math-emu/kernel_linkage.c | 76 +---- + arch/mips/mm/c-r4k.c | 17 +- + arch/mips/mm/sc-mips.c | 2 + + arch/mips/mm/tlbex.c | 2 + + arch/mips/mm/uasm-micromips.c | 3 + + arch/mips/mm/uasm-mips.c | 5 + + arch/mips/mm/uasm.c | 25 +- + arch/mips/mti-malta/malta-init.c | 17 +- + arch/mips/mti-malta/malta-int.c | 70 +--- + arch/mips/mti-malta/malta-setup.c | 4 +- + arch/mips/oprofile/common.c | 2 + + arch/mips/oprofile/op_model_mipsxx.c | 5 + + arch/mips/pci/pci-malta.c | 22 +- + drivers/cpuidle/Kconfig | 5 + + drivers/cpuidle/Kconfig.mips | 14 + + drivers/cpuidle/Makefile | 4 + + drivers/cpuidle/cpuidle-mips-cps.c | 545 ++++++++++++++++++++++++++++++ + include/linux/cpuidle.h | 1 + + 75 files changed, 3635 insertions(+), 637 deletions(-) + delete mode 100644 arch/mips/include/asm/gcmpregs.h + create mode 100644 arch/mips/include/asm/mips-cm.h + create mode 100644 arch/mips/include/asm/mips-cpc.h + create mode 100644 arch/mips/include/asm/msa.h + create mode 100644 arch/mips/include/asm/smp-cps.h + create mode 100644 arch/mips/kernel/cps-vec.S + create mode 100644 arch/mips/kernel/mips-cm.c + create mode 100644 arch/mips/kernel/mips-cpc.c + create mode 100644 arch/mips/kernel/smp-cps.c + create mode 100644 arch/mips/kernel/smp-gic.c + create mode 100644 drivers/cpuidle/Kconfig.mips + create mode 100644 drivers/cpuidle/cpuidle-mips-cps.c +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 (38dbfb59d117 Linus 3.14-rc1) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc/next (f878f84373ae powerpc: Wire up sched_setattr and sched_getattr syscalls) +$ git merge powerpc/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 galak/next (9e2ecdbba3b0 powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4) +$ git merge galak/next +Already up-to-date. +Merging s390/features (3e79a93fe888 s390/kvm: set guest page states to stable on re-ipl) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/include/asm/ccwdev.h | 4 +- + arch/s390/include/asm/futex.h | 13 +-- + arch/s390/include/asm/kvm_host.h | 5 +- + arch/s390/include/asm/mmu_context.h | 39 +++++++- + arch/s390/include/asm/pgalloc.h | 1 + + arch/s390/include/asm/pgtable.h | 86 ++++++++++++----- + arch/s390/include/asm/setup.h | 3 - + arch/s390/include/asm/thread_info.h | 2 + + arch/s390/include/asm/uaccess.h | 172 +++++++++++++++------------------- + arch/s390/kernel/compat_wrapper.S | 2 +- + arch/s390/kernel/early.c | 2 - + arch/s390/kernel/entry.S | 9 +- + arch/s390/kernel/entry64.S | 9 +- + arch/s390/kernel/setup.c | 17 ---- + arch/s390/kvm/diag.c | 3 + + arch/s390/kvm/kvm-s390.c | 25 +++++ + arch/s390/kvm/kvm-s390.h | 2 + + arch/s390/kvm/priv.c | 41 ++++++++ + arch/s390/lib/Makefile | 3 +- + arch/s390/lib/uaccess.h | 8 +- + arch/s390/lib/uaccess_mvcos.c | 116 ++++++++++++++++++----- + arch/s390/lib/uaccess_pt.c | 69 ++++++-------- + arch/s390/mm/maccess.c | 4 +- + arch/s390/mm/pgtable.c | 149 +++++++++++++++++++++++++++++ + drivers/s390/char/con3215.c | 8 +- + drivers/s390/char/con3270.c | 6 +- + drivers/s390/char/raw3270.c | 17 +++- + drivers/s390/char/raw3270.h | 2 +- + drivers/s390/cio/device.c | 52 ++++++---- + drivers/s390/crypto/zcrypt_msgtype6.c | 24 ++++- + include/asm-generic/pgtable.h | 13 +++ + kernel/sched/core.c | 4 +- + mm/mmu_context.c | 3 + + mm/rmap.c | 10 ++ + 34 files changed, 655 insertions(+), 268 deletions(-) +Merging sparc-next/master (049ffa8ab33a Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (5e01dc7b26d9 Linux 3.12) +$ git merge tile/master +Already up-to-date. +Merging uml/next (989e59fa41c5 um: Include generic barrier.h) +$ git merge uml/next +Resolved 'arch/um/include/asm/Kbuild' using previous resolution. +Removing arch/x86/um/shared/sysdep/skas_ptrace.h +Removing arch/um/sys-ppc/shared/sysdep/skas_ptrace.h +Removing arch/um/sys-ia64/sysdep/skas_ptrace.h +Removing arch/um/include/shared/skas_ptrace.h +Removing arch/um/include/shared/skas/proc_mm.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 270b5afadf9a] 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 (c284464658ac arch/unicore32: remove CONFIG_EXPERIMENTAL) +$ git merge unicore32/unicore32 +Already up-to-date. +Merging xtensa/for_next (c0e50d41126e xtensa: fix fast_syscall_spill_registers) +$ git merge xtensa/for_next +Merge made by the 'recursive' strategy. + arch/xtensa/include/asm/io.h | 2 +- + arch/xtensa/include/asm/traps.h | 44 ++-- + arch/xtensa/include/asm/vectors.h | 2 +- + arch/xtensa/kernel/entry.S | 449 ++++++++++++++++++++------------------ + arch/xtensa/kernel/time.c | 1 + + arch/xtensa/kernel/vectors.S | 2 +- + arch/xtensa/kernel/xtensa_ksyms.c | 2 - + arch/xtensa/mm/mmu.c | 2 +- + 8 files changed, 264 insertions(+), 240 deletions(-) +Merging btrfs/next (cf93da7bcf45 Btrfs: fix spin_unlock in check_ref_cleanup) +$ git merge btrfs/next +Already up-to-date. +Merging ceph/master (125d725c9235 ceph: cast PAGE_SIZE to size_t in ceph_sync_write()) +$ git merge ceph/master +Already up-to-date. +Merging cifs/for-next (4a5c80d7b561 [CIFS] clean up page array when uncached write send fails) +$ git merge cifs/for-next +Already up-to-date. +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 +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 (4ea7772f828a udf: Fix lockdep warning from udf_symlink()) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (2d21448cf500 jbd2: mark file-local functions as static) +$ git merge ext4/dev +Merge made by the 'recursive' strategy. + fs/ext4/extents.c | 1 + + fs/ext4/ioctl.c | 27 ++++++-------------- + fs/ext4/move_extent.c | 3 +-- + fs/ext4/super.c | 70 ++++++++++++++++++++++++++++----------------------- + fs/jbd2/journal.c | 6 ++--- + 5 files changed, 52 insertions(+), 55 deletions(-) +Merging f2fs/dev (c86f36c6458c f2fs: introduce ra_meta_pages to readahead CP/NAT/SIT pages) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + fs/f2fs/checkpoint.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++----- + fs/f2fs/data.c | 25 +++++------- + fs/f2fs/dir.c | 15 ++++--- + fs/f2fs/f2fs.h | 26 ++++++++++++- + fs/f2fs/file.c | 5 +++ + fs/f2fs/gc.c | 9 ++--- + fs/f2fs/inode.c | 23 ++++++----- + fs/f2fs/node.c | 78 +++++++++++++++++++------------------ + fs/f2fs/recovery.c | 25 ++++++------ + fs/f2fs/segment.c | 78 +++++++------------------------------ + fs/f2fs/segment.h | 3 ++ + 11 files changed, 236 insertions(+), 159 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. + fs/fscache/object-list.c | 5 +++++ + fs/fscache/object.c | 3 +++ + 2 files changed, 8 insertions(+) +Merging fuse/for-next (b2ec2778df9d fuse: Turn writeback cache on) +$ git merge fuse/for-next +Auto-merging fs/fuse/file.c +Merge made by the 'recursive' strategy. + fs/fuse/cuse.c | 5 +- + fs/fuse/dir.c | 119 +++++++++++++++++---- + fs/fuse/file.c | 257 ++++++++++++++++++++++++++++++++++++---------- + fs/fuse/fuse_i.h | 22 +++- + fs/fuse/inode.c | 29 ++++-- + include/uapi/linux/fuse.h | 5 + + 6 files changed, 355 insertions(+), 82 deletions(-) +Merging gfs2/master (c2b0b30eddf6 GFS2: Mark functions as static in gfs2/rgrp.c) +$ git merge gfs2/master +Merge made by the 'recursive' strategy. + fs/fs-writeback.c | 2 + + fs/gfs2/aops.c | 132 ++++++++++++++++++++++++++++----------- + fs/gfs2/dir.c | 9 +++ + fs/gfs2/file.c | 13 ++-- + fs/gfs2/inode.c | 50 ++++++++++++--- + fs/gfs2/log.c | 4 ++ + fs/gfs2/rgrp.c | 6 +- + include/trace/events/writeback.h | 1 + + include/uapi/linux/gfs2_ondisk.h | 12 +++- + 9 files changed, 176 insertions(+), 53 deletions(-) +Merging jfs/jfs-next (844fa1b5f849 jfs: set i_ctime when setting ACL) +$ git merge jfs/jfs-next +Merge made by the 'recursive' strategy. + fs/jfs/acl.c | 2 ++ + 1 file changed, 2 insertions(+) +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 (a699d65ec4ff SUNRPC: Don't create a gss auth cache unless rpc.gssd is running) +$ git merge nfs/linux-next +Merge made by the 'recursive' strategy. + fs/nfs/inode.c | 14 ++++++++++---- + fs/nfs/internal.h | 9 +++++++++ + net/sunrpc/auth_gss/auth_gss.c | 2 ++ + 3 files changed, 21 insertions(+), 4 deletions(-) +Merging nfsd/nfsd-next (2ec197db1a56 lockd: send correct lock when granting a delayed lock.) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + fs/lockd/svclock.c | 8 ++++++++ + fs/nfsd/nfs4acl.c | 9 +++------ + 2 files changed, 11 insertions(+), 6 deletions(-) +Merging omfs/for-next (976d167615b6 Linux 3.1-rc9) +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master (6d565409503f Squashfs: fix failure to unlock pages on decompress error) +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next (38dbfb59d117 Linus 3.14-rc1) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (5547fec74a56 UBI: fix some use after free bugs) +$ git merge ubifs/linux-next +Merge made by the 'recursive' strategy. + drivers/mtd/ubi/fastmap.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +Merging xfs/for-next (a64b760771e8 Merge branch 'xfs-async-aio-extend' into for-next) +$ git merge xfs/for-next +Auto-merging include/linux/fs.h +Merge made by the 'recursive' strategy. + fs/direct-io.c | 18 ++++++++++++------ + fs/xfs/xfs_acl.c | 2 +- + fs/xfs/xfs_aops.c | 3 ++- + fs/xfs/xfs_buf_item.c | 19 ------------------- + fs/xfs/xfs_dquot.c | 2 +- + fs/xfs/xfs_iomap.c | 10 +++------- + fs/xfs/xfs_iops.c | 16 ++++++++-------- + fs/xfs/xfs_log.h | 2 +- + fs/xfs/xfs_log_cil.c | 22 ++++++++++++++++------ + fs/xfs/xfs_rtalloc.c | 2 +- + fs/xfs/xfs_sb.c | 3 ++- + fs/xfs/xfs_trans.c | 12 ++---------- + fs/xfs/xfs_trans_resv.c | 6 ++---- + fs/xfs/xfs_trans_resv.h | 1 - + include/linux/fs.h | 3 +++ + 15 files changed, 54 insertions(+), 67 deletions(-) +Merging file-private-locks/linux-next (1ed1950c412f locks: add new fcntl cmd values for handling file private locks) +$ git merge file-private-locks/linux-next +Auto-merging include/linux/fs.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 + + arch/arm/kernel/sys_oabi-compat.c | 3 + + fs/compat.c | 35 +++- + fs/fcntl.c | 37 ++-- + fs/file_table.c | 2 +- + fs/locks.c | 349 +++++++++++++++++++++++--------------- + include/linux/fs.h | 21 ++- + include/uapi/asm-generic/fcntl.h | 19 ++- + security/selinux/hooks.c | 3 + + 9 files changed, 303 insertions(+), 168 deletions(-) +Merging vfs/for-next (527d1511310a Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc) +$ git merge vfs/for-next +Already up-to-date. +Merging pci/next (17f2d86f5d53 Merge branch 'pci/numa-cleanup' into next) +$ git merge pci/next +Merge made by the 'recursive' strategy. + arch/ia64/hp/common/sba_iommu.c | 32 ++++------ + arch/ia64/include/asm/pci.h | 2 +- + arch/ia64/kernel/acpi.c | 28 +++------ + arch/ia64/pci/pci.c | 10 +--- + arch/x86/include/asm/pci.h | 7 +-- + arch/x86/include/asm/topology.h | 14 +---- + arch/x86/pci/acpi.c | 29 ++------- + arch/x86/pci/amd_bus.c | 10 ---- + arch/x86/pci/bus_numa.c | 13 +++- + arch/x86/pci/common.c | 128 +++++----------------------------------- + arch/x86/pci/fixup.c | 6 +- + arch/x86/pci/irq.c | 6 +- + arch/x86/pci/legacy.c | 4 +- + arch/x86/pci/numaq_32.c | 6 +- + arch/x86/pci/visws.c | 4 +- + drivers/acpi/numa.c | 16 ++--- + include/acpi/acpi_numa.h | 1 - + include/linux/acpi.h | 9 +-- + 18 files changed, 75 insertions(+), 250 deletions(-) +Merging hid/for-next (f1523dbb7e90 Merge branch 'for-3.15/sony' into for-next) +$ git merge hid/for-next +Auto-merging drivers/hid/i2c-hid/i2c-hid.c +Auto-merging drivers/hid/hid-ids.h +Auto-merging drivers/hid/hid-core.c +Merge made by the 'recursive' strategy. + drivers/hid/Kconfig | 10 +- + drivers/hid/hid-core.c | 1 + + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-input.c | 3 + + drivers/hid/hid-microsoft.c | 74 ++++++++++++- + drivers/hid/hid-sony.c | 249 ++++++++++++++++++++++++++++++++++++++++-- + drivers/hid/i2c-hid/i2c-hid.c | 68 ++++++++++-- + drivers/hid/uhid.c | 27 +++++ + drivers/hid/usbhid/hid-core.c | 78 +++++++++++++ + include/linux/hid.h | 8 +- + net/bluetooth/hidp/core.c | 90 +++++++++++++++ + 11 files changed, 582 insertions(+), 27 deletions(-) +Merging i2c/i2c/for-next (9b0cd304f26b Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux) +$ git merge i2c/i2c/for-next +Already up-to-date. +Merging jdelvare-hwmon/master (f1cf5deb331c hwmon: Avoid initializing the same field twice) +$ git merge jdelvare-hwmon/master +Merge made by the 'recursive' strategy. + drivers/hwmon/adm1021.c | 70 +++++++-------------- + drivers/hwmon/asc7621.c | 1 - + drivers/hwmon/atxp1.c | 2 - + drivers/hwmon/f71805f.c | 2 +- + drivers/hwmon/lm63.c | 157 +++++++++++++++++++--------------------------- + drivers/hwmon/lm77.c | 1 - + drivers/hwmon/lm80.c | 70 +++++++-------------- + drivers/hwmon/lm83.c | 1 - + drivers/hwmon/lm87.c | 1 - + drivers/hwmon/lm92.c | 1 - + drivers/hwmon/lm93.c | 1 - + drivers/hwmon/max1619.c | 1 - + drivers/hwmon/pc87360.c | 12 ++-- + drivers/hwmon/w83792d.c | 1 - + drivers/hwmon/w83l785ts.c | 4 -- + 15 files changed, 114 insertions(+), 211 deletions(-) +Merging hwmon-staging/hwmon-next (72f13a7e1328 hwmon: (lm95245) Avoid initializing the same field twice) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + Documentation/hwmon/ltc2945 | 84 +++++++ + Documentation/hwmon/ltc4260 | 56 +++++ + drivers/hwmon/Kconfig | 36 +++ + drivers/hwmon/Makefile | 3 + + drivers/hwmon/emc2103.c | 2 +- + drivers/hwmon/iio_hwmon.c | 37 +-- + drivers/hwmon/jz4740-hwmon.c | 25 +-- + drivers/hwmon/lm95241.c | 93 +++----- + drivers/hwmon/lm95245.c | 111 ++++----- + drivers/hwmon/ltc2945.c | 519 +++++++++++++++++++++++++++++++++++++++++++ + drivers/hwmon/ltc4222.c | 237 ++++++++++++++++++++ + drivers/hwmon/ltc4260.c | 200 +++++++++++++++++ + drivers/hwmon/smm665.c | 2 +- + 13 files changed, 1231 insertions(+), 174 deletions(-) + create mode 100644 Documentation/hwmon/ltc2945 + create mode 100644 Documentation/hwmon/ltc4260 + create mode 100644 drivers/hwmon/ltc2945.c + create mode 100644 drivers/hwmon/ltc4222.c + create mode 100644 drivers/hwmon/ltc4260.c +Merging v4l-dvb/master (b215621049bd Merge branch 'v4l_for_linus' into to_next) +$ git merge v4l-dvb/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging kbuild/for-next (ff6b9bdb6263 Merge branch 'kbuild/misc' into kbuild/for-next) +$ git merge kbuild/for-next +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 5 +++-- + scripts/tags.sh | 9 ++++----- + 2 files changed, 7 insertions(+), 7 deletions(-) +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 (1bc18086231c ata: delete non-required instances of include <linux/init.h>) +$ git merge libata/for-next +Merge made by the 'recursive' strategy. + drivers/ata/acard-ahci.c | 1 - + drivers/ata/ahci.c | 1 - + drivers/ata/ahci_platform.c | 1 - + drivers/ata/ata_generic.c | 1 - + drivers/ata/libahci.c | 1 - + drivers/ata/pata_acpi.c | 1 - + drivers/ata/pata_amd.c | 1 - + drivers/ata/pata_artop.c | 1 - + drivers/ata/pata_at91.c | 1 - + drivers/ata/pata_atiixp.c | 1 - + drivers/ata/pata_atp867x.c | 1 - + drivers/ata/pata_cmd640.c | 1 - + drivers/ata/pata_cmd64x.c | 1 - + drivers/ata/pata_cs5520.c | 1 - + drivers/ata/pata_cs5530.c | 1 - + drivers/ata/pata_cs5535.c | 1 - + drivers/ata/pata_cs5536.c | 1 - + drivers/ata/pata_cypress.c | 1 - + drivers/ata/pata_efar.c | 1 - + drivers/ata/pata_ep93xx.c | 1 - + drivers/ata/pata_hpt366.c | 1 - + drivers/ata/pata_hpt37x.c | 1 - + drivers/ata/pata_hpt3x2n.c | 1 - + drivers/ata/pata_hpt3x3.c | 1 - + drivers/ata/pata_imx.c | 1 - + drivers/ata/pata_it8213.c | 1 - + drivers/ata/pata_it821x.c | 1 - + drivers/ata/pata_jmicron.c | 1 - + drivers/ata/pata_marvell.c | 1 - + drivers/ata/pata_mpiix.c | 1 - + drivers/ata/pata_netcell.c | 1 - + drivers/ata/pata_ninja32.c | 1 - + drivers/ata/pata_ns87410.c | 1 - + drivers/ata/pata_ns87415.c | 1 - + drivers/ata/pata_oldpiix.c | 1 - + drivers/ata/pata_opti.c | 1 - + drivers/ata/pata_optidma.c | 1 - + drivers/ata/pata_pcmcia.c | 1 - + drivers/ata/pata_pdc2027x.c | 1 - + drivers/ata/pata_pdc202xx_old.c | 1 - + drivers/ata/pata_piccolo.c | 1 - + drivers/ata/pata_platform.c | 1 - + drivers/ata/pata_pxa.c | 1 - + drivers/ata/pata_radisys.c | 1 - + drivers/ata/pata_rdc.c | 1 - + drivers/ata/pata_rz1000.c | 1 - + drivers/ata/pata_sc1200.c | 1 - + drivers/ata/pata_scc.c | 1 - + drivers/ata/pata_sch.c | 1 - + drivers/ata/pata_serverworks.c | 1 - + drivers/ata/pata_sil680.c | 1 - + drivers/ata/pata_sis.c | 1 - + drivers/ata/pata_sl82c105.c | 1 - + drivers/ata/pata_triflex.c | 1 - + drivers/ata/pata_via.c | 1 - + drivers/ata/pdc_adma.c | 1 - + drivers/ata/sata_dwc_460ex.c | 1 - + drivers/ata/sata_highbank.c | 1 - + drivers/ata/sata_nv.c | 1 - + drivers/ata/sata_promise.c | 1 - + drivers/ata/sata_qstor.c | 1 - + drivers/ata/sata_sil.c | 1 - + drivers/ata/sata_sis.c | 1 - + drivers/ata/sata_svw.c | 1 - + drivers/ata/sata_sx4.c | 1 - + drivers/ata/sata_uli.c | 1 - + drivers/ata/sata_via.c | 1 - + drivers/ata/sata_vsc.c | 1 - + 68 files changed, 68 deletions(-) +Merging pm/linux-next (d7d9d77b617e Merge branch 'pm-qos' into linux-next) +$ git merge pm/linux-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-devices-power | 27 +- + Documentation/power/pm_qos_interface.txt | 82 +++-- + Documentation/trace/events-power.txt | 2 +- + MAINTAINERS | 2 +- + drivers/acpi/Kconfig | 13 + + drivers/acpi/acpi_lpss.c | 71 ++++- + drivers/acpi/acpica/Makefile | 4 +- + drivers/acpi/acpica/accommon.h | 2 +- + drivers/acpi/acpica/acdebug.h | 4 +- + drivers/acpi/acpica/acdispat.h | 2 +- + drivers/acpi/acpica/acevents.h | 2 +- + drivers/acpi/acpica/acglobal.h | 2 +- + drivers/acpi/acpica/achware.h | 2 +- + drivers/acpi/acpica/acinterp.h | 2 +- + drivers/acpi/acpica/aclocal.h | 2 +- + drivers/acpi/acpica/acmacros.h | 16 +- + drivers/acpi/acpica/acnamesp.h | 2 +- + drivers/acpi/acpica/acobject.h | 2 +- + drivers/acpi/acpica/acopcode.h | 2 +- + drivers/acpi/acpica/acparser.h | 2 +- + drivers/acpi/acpica/acpredef.h | 2 +- + drivers/acpi/acpica/acresrc.h | 2 +- + drivers/acpi/acpica/acstruct.h | 2 +- + drivers/acpi/acpica/actables.h | 2 +- + drivers/acpi/acpica/acutils.h | 4 +- + drivers/acpi/acpica/amlcode.h | 2 +- + drivers/acpi/acpica/amlresrc.h | 2 +- + drivers/acpi/acpica/dsargs.c | 2 +- + drivers/acpi/acpica/dscontrol.c | 2 +- + drivers/acpi/acpica/dsfield.c | 2 +- + drivers/acpi/acpica/dsinit.c | 2 +- + drivers/acpi/acpica/dsmethod.c | 2 +- + drivers/acpi/acpica/dsmthdat.c | 2 +- + drivers/acpi/acpica/dsobject.c | 2 +- + drivers/acpi/acpica/dsopcode.c | 2 +- + drivers/acpi/acpica/dsutils.c | 2 +- + drivers/acpi/acpica/dswexec.c | 2 +- + drivers/acpi/acpica/dswload.c | 2 +- + drivers/acpi/acpica/dswload2.c | 2 +- + drivers/acpi/acpica/dswscope.c | 2 +- + drivers/acpi/acpica/dswstate.c | 2 +- + drivers/acpi/acpica/evevent.c | 2 +- + drivers/acpi/acpica/evglock.c | 2 +- + drivers/acpi/acpica/evgpe.c | 2 +- + drivers/acpi/acpica/evgpeblk.c | 2 +- + drivers/acpi/acpica/evgpeinit.c | 2 +- + drivers/acpi/acpica/evgpeutil.c | 2 +- + drivers/acpi/acpica/evhandler.c | 2 +- + drivers/acpi/acpica/evmisc.c | 2 +- + drivers/acpi/acpica/evregion.c | 2 +- + drivers/acpi/acpica/evrgnini.c | 2 +- + drivers/acpi/acpica/evsci.c | 2 +- + drivers/acpi/acpica/evxface.c | 2 +- + drivers/acpi/acpica/evxfevnt.c | 2 +- + drivers/acpi/acpica/evxfgpe.c | 21 +- + drivers/acpi/acpica/evxfregn.c | 2 +- + drivers/acpi/acpica/exconfig.c | 2 +- + drivers/acpi/acpica/exconvrt.c | 2 +- + drivers/acpi/acpica/excreate.c | 2 +- + drivers/acpi/acpica/exdebug.c | 2 +- + drivers/acpi/acpica/exdump.c | 2 +- + drivers/acpi/acpica/exfield.c | 2 +- + drivers/acpi/acpica/exfldio.c | 2 +- + drivers/acpi/acpica/exmisc.c | 2 +- + drivers/acpi/acpica/exmutex.c | 2 +- + drivers/acpi/acpica/exnames.c | 2 +- + drivers/acpi/acpica/exoparg1.c | 2 +- + drivers/acpi/acpica/exoparg2.c | 2 +- + drivers/acpi/acpica/exoparg3.c | 2 +- + drivers/acpi/acpica/exoparg6.c | 2 +- + drivers/acpi/acpica/exprep.c | 2 +- + drivers/acpi/acpica/exregion.c | 2 +- + drivers/acpi/acpica/exresnte.c | 2 +- + drivers/acpi/acpica/exresolv.c | 2 +- + drivers/acpi/acpica/exresop.c | 2 +- + drivers/acpi/acpica/exstore.c | 2 +- + drivers/acpi/acpica/exstoren.c | 2 +- + drivers/acpi/acpica/exstorob.c | 2 +- + drivers/acpi/acpica/exsystem.c | 2 +- + drivers/acpi/acpica/exutils.c | 2 +- + drivers/acpi/acpica/hwacpi.c | 2 +- + drivers/acpi/acpica/hwesleep.c | 2 +- + drivers/acpi/acpica/hwgpe.c | 2 +- + drivers/acpi/acpica/hwpci.c | 2 +- + drivers/acpi/acpica/hwregs.c | 2 +- + drivers/acpi/acpica/hwsleep.c | 2 +- + drivers/acpi/acpica/hwtimer.c | 2 +- + drivers/acpi/acpica/hwvalid.c | 2 +- + drivers/acpi/acpica/hwxface.c | 2 +- + drivers/acpi/acpica/hwxfsleep.c | 2 +- + drivers/acpi/acpica/nsaccess.c | 2 +- + drivers/acpi/acpica/nsalloc.c | 2 +- + drivers/acpi/acpica/nsarguments.c | 2 +- + drivers/acpi/acpica/nsconvert.c | 2 +- + drivers/acpi/acpica/nsdump.c | 2 +- + drivers/acpi/acpica/nsdumpdv.c | 2 +- + drivers/acpi/acpica/nseval.c | 2 +- + drivers/acpi/acpica/nsinit.c | 2 +- + drivers/acpi/acpica/nsload.c | 2 +- + drivers/acpi/acpica/nsnames.c | 2 +- + drivers/acpi/acpica/nsobject.c | 2 +- + drivers/acpi/acpica/nsparse.c | 2 +- + drivers/acpi/acpica/nspredef.c | 2 +- + drivers/acpi/acpica/nsprepkg.c | 2 +- + drivers/acpi/acpica/nsrepair.c | 2 +- + drivers/acpi/acpica/nsrepair2.c | 2 +- + drivers/acpi/acpica/nssearch.c | 2 +- + drivers/acpi/acpica/nsutils.c | 2 +- + drivers/acpi/acpica/nswalk.c | 2 +- + drivers/acpi/acpica/nsxfeval.c | 35 ++- + drivers/acpi/acpica/nsxfname.c | 2 +- + drivers/acpi/acpica/nsxfobj.c | 2 +- + drivers/acpi/acpica/psargs.c | 2 +- + drivers/acpi/acpica/psloop.c | 2 +- + drivers/acpi/acpica/psobject.c | 2 +- + drivers/acpi/acpica/psopcode.c | 2 +- + drivers/acpi/acpica/psopinfo.c | 2 +- + drivers/acpi/acpica/psparse.c | 2 +- + drivers/acpi/acpica/psscope.c | 2 +- + drivers/acpi/acpica/pstree.c | 2 +- + drivers/acpi/acpica/psutils.c | 2 +- + drivers/acpi/acpica/pswalk.c | 2 +- + drivers/acpi/acpica/psxface.c | 2 +- + drivers/acpi/acpica/rsaddr.c | 2 +- + drivers/acpi/acpica/rscalc.c | 2 +- + drivers/acpi/acpica/rscreate.c | 2 +- + drivers/acpi/acpica/rsdump.c | 5 +- + drivers/acpi/acpica/rsdumpinfo.c | 4 +- + drivers/acpi/acpica/rsinfo.c | 6 +- + drivers/acpi/acpica/rsio.c | 2 +- + drivers/acpi/acpica/rsirq.c | 2 +- + drivers/acpi/acpica/rslist.c | 2 +- + drivers/acpi/acpica/rsmemory.c | 2 +- + drivers/acpi/acpica/rsmisc.c | 2 +- + drivers/acpi/acpica/rsserial.c | 2 +- + drivers/acpi/acpica/rsutils.c | 2 +- + drivers/acpi/acpica/rsxface.c | 2 +- + drivers/acpi/acpica/tbfadt.c | 2 +- + drivers/acpi/acpica/tbfind.c | 2 +- + drivers/acpi/acpica/tbinstal.c | 17 +- + drivers/acpi/acpica/tbprint.c | 22 +- + drivers/acpi/acpica/tbutils.c | 2 +- + drivers/acpi/acpica/tbxface.c | 2 +- + drivers/acpi/acpica/tbxfload.c | 2 +- + drivers/acpi/acpica/tbxfroot.c | 2 +- + drivers/acpi/acpica/utaddress.c | 2 +- + drivers/acpi/acpica/utalloc.c | 2 +- + drivers/acpi/acpica/utbuffer.c | 2 +- + drivers/acpi/acpica/utcache.c | 2 +- + drivers/acpi/acpica/utcopy.c | 8 +- + drivers/acpi/acpica/utdebug.c | 2 +- + drivers/acpi/acpica/utdecode.c | 2 +- + drivers/acpi/acpica/utdelete.c | 2 +- + drivers/acpi/acpica/uterror.c | 2 +- + drivers/acpi/acpica/uteval.c | 2 +- + drivers/acpi/acpica/utexcep.c | 2 +- + drivers/acpi/acpica/utglobal.c | 2 +- + drivers/acpi/acpica/utids.c | 2 +- + drivers/acpi/acpica/utinit.c | 2 +- + drivers/acpi/acpica/utlock.c | 2 +- + drivers/acpi/acpica/utmath.c | 2 +- + drivers/acpi/acpica/utmisc.c | 2 +- + drivers/acpi/acpica/utmutex.c | 2 +- + drivers/acpi/acpica/utobject.c | 2 +- + drivers/acpi/acpica/utosi.c | 2 +- + drivers/acpi/acpica/utownerid.c | 2 +- + drivers/acpi/acpica/utpredef.c | 2 +- + drivers/acpi/acpica/utresrc.c | 5 +- + drivers/acpi/acpica/utstate.c | 2 +- + drivers/acpi/acpica/utstring.c | 2 +- + drivers/acpi/acpica/uttrack.c | 5 +- + drivers/acpi/acpica/utxface.c | 2 +- + drivers/acpi/acpica/utxferror.c | 2 +- + drivers/acpi/acpica/utxfinit.c | 2 +- + drivers/acpi/acpica/utxfmutex.c | 2 +- + drivers/acpi/bus.c | 61 ++-- + drivers/acpi/container.c | 5 +- + drivers/acpi/dock.c | 5 +- + drivers/acpi/glue.c | 12 + + drivers/acpi/internal.h | 1 + + drivers/acpi/pci_root.c | 2 +- + drivers/acpi/scan.c | 190 ++++++------ + drivers/base/power/main.c | 245 ++++++++++++--- + drivers/base/power/power.h | 4 +- + drivers/base/power/qos.c | 220 ++++++++++---- + drivers/base/power/sysfs.c | 97 ++++-- + drivers/cpufreq/intel_pstate.c | 9 - + drivers/input/touchscreen/st1232.c | 3 +- + drivers/mtd/nand/sh_flctl.c | 2 +- + drivers/pci/hotplug/acpiphp.h | 16 +- + drivers/pci/hotplug/acpiphp_glue.c | 420 +++++++++----------------- + include/acpi/acbuffer.h | 2 +- + include/acpi/acconfig.h | 2 +- + include/acpi/acexcep.h | 2 +- + include/acpi/acnames.h | 2 +- + include/acpi/acoutput.h | 2 +- + include/acpi/acpi.h | 5 +- + include/acpi/acpi_bus.h | 29 +- + include/acpi/acpiosxf.h | 2 +- + include/acpi/acpixf.h | 8 +- + include/acpi/acrestyp.h | 2 +- + include/acpi/actbl.h | 2 +- + include/acpi/actbl1.h | 2 +- + include/acpi/actbl2.h | 2 +- + include/acpi/actbl3.h | 2 +- + include/acpi/actypes.h | 2 +- + include/acpi/platform/acenv.h | 2 +- + include/acpi/platform/acgcc.h | 2 +- + include/acpi/platform/aclinux.h | 8 +- + include/linux/pci-acpi.h | 4 +- + include/linux/pm.h | 3 + + include/linux/pm_qos.h | 34 ++- + include/trace/events/power.h | 11 +- + kernel/power/qos.c | 18 +- + 214 files changed, 1288 insertions(+), 815 deletions(-) +Merging idle/next (2d6e532279dd tools/power turbostat: simplify output, add Avg_MHz) +$ git merge idle/next +Merge made by the 'recursive' strategy. + tools/power/x86/turbostat/turbostat.8 | 127 +++++++------------ + tools/power/x86/turbostat/turbostat.c | 228 ++++++++++++++++------------------ + 2 files changed, 152 insertions(+), 203 deletions(-) +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 (262afa97587b Merge branches 'soc-eduardo', 'soc', 'misc' and 'int3404-thermal' of .git into next) +$ git merge thermal/next +Resolved 'drivers/thermal/Kconfig' using previous resolution. +Auto-merging drivers/thermal/Kconfig +CONFLICT (content): Merge conflict in drivers/thermal/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 96c835054cd2] Merge remote-tracking branch 'thermal/next' +$ git diff -M --stat --summary HEAD^.. + drivers/thermal/Kconfig | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) +Merging ieee1394/for-next (fcd46b34425d firewire: Enable remote DMA above 4 GB) +$ git merge ieee1394/for-next +Already up-to-date. +Merging dlm/next (ece35848c184 dlm: set zero linger time on sctp socket) +$ 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 (24066813d55b dma: dw: add a PCI ID for Intel Haswell SoC) +$ git merge slave-dma/next +Auto-merging drivers/dma/Kconfig +Merge made by the 'recursive' strategy. + drivers/dma/Kconfig | 2 +- + drivers/dma/acpi-dma.c | 17 +++++++++-------- + drivers/dma/dmaengine.c | 9 ++------- + drivers/dma/dw/pci.c | 3 +++ + include/linux/acpi_dma.h | 5 +++-- + 5 files changed, 18 insertions(+), 18 deletions(-) +Merging dmaengine/next (77873803363c net_dma: mark broken) +$ git merge dmaengine/next +Already up-to-date. +Merging net-next/master (d4f2fa6ad61e ipv4: ip_forward: perform skb->pkt_type check at the beginning) +$ git merge net-next/master +Auto-merging net/tipc/link.c +Auto-merging net/ipv4/ip_forward.c +Removing drivers/net/can/sja1000/sja1000_of_platform.c +Auto-merging drivers/net/bonding/bond_main.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-mdio | 20 + + .../devicetree/bindings/net/can/sja1000.txt | 4 + + Documentation/networking/tcp.txt | 2 +- + drivers/net/bonding/bond_main.c | 8 - + drivers/net/bonding/bond_options.c | 3 +- + drivers/net/can/at91_can.c | 9 +- + drivers/net/can/dev.c | 24 ++ + drivers/net/can/sja1000/Kconfig | 13 +- + drivers/net/can/sja1000/Makefile | 1 - + drivers/net/can/sja1000/sja1000.c | 3 +- + drivers/net/can/sja1000/sja1000_of_platform.c | 220 ----------- + drivers/net/can/sja1000/sja1000_platform.c | 194 ++++++--- + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 24 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 18 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 3 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 8 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h | 1 - + drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 164 ++++---- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 155 +++++--- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 21 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 253 +++++++----- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 13 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 127 +++++- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.h | 22 ++ + drivers/net/ethernet/emulex/benet/be.h | 14 +- + drivers/net/ethernet/emulex/benet/be_cmds.c | 22 +- + drivers/net/ethernet/emulex/benet/be_cmds.h | 38 +- + drivers/net/ethernet/emulex/benet/be_ethtool.c | 2 +- + drivers/net/ethernet/emulex/benet/be_hw.h | 6 +- + drivers/net/ethernet/emulex/benet/be_main.c | 171 +++++--- + drivers/net/ethernet/emulex/benet/be_roce.c | 2 +- + drivers/net/ethernet/emulex/benet/be_roce.h | 2 +- + drivers/net/ethernet/intel/i40e/i40e_adminq.c | 5 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 28 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 32 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 1 + + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 8 +- + drivers/net/ethernet/intel/i40evf/i40e_type.h | 4 +- + drivers/net/ethernet/intel/i40evf/i40evf.h | 42 +- + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 155 ++++++-- + .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 15 +- + drivers/net/ethernet/renesas/sh_eth.c | 4 +- + drivers/net/ethernet/renesas/sh_eth.h | 3 +- + drivers/net/ethernet/sfc/ef10.c | 4 +- + drivers/net/ethernet/sfc/ef10_regs.h | 61 --- + drivers/net/ethernet/sfc/efx.c | 6 +- + drivers/net/ethernet/sfc/efx.h | 2 +- + drivers/net/ethernet/sfc/ethtool.c | 21 +- + drivers/net/ethernet/sfc/falcon.c | 4 +- + drivers/net/ethernet/sfc/farch.c | 2 - + drivers/net/ethernet/sfc/net_driver.h | 1 - + drivers/net/ethernet/sfc/nic.c | 1 - + drivers/net/ethernet/sfc/ptp.c | 92 ++--- + drivers/net/ethernet/sfc/tx.c | 21 +- + drivers/net/loopback.c | 2 + + drivers/net/phy/mdio_bus.c | 20 + + drivers/net/phy/phy.c | 46 ++- + drivers/net/phy/phy_device.c | 18 + + drivers/of/of_net.c | 26 +- + include/linux/can/dev.h | 2 + + include/linux/ethtool.h | 3 + + include/linux/phy.h | 47 +++ + include/net/act_api.h | 22 +- + include/net/tc_act/tc_csum.h | 4 +- + include/net/tc_act/tc_defact.h | 4 +- + include/net/tc_act/tc_gact.h | 4 +- + include/net/tc_act/tc_ipt.h | 4 +- + include/net/tc_act/tc_mirred.h | 4 +- + include/net/tc_act/tc_nat.h | 4 +- + include/net/tc_act/tc_pedit.h | 4 +- + include/net/tc_act/tc_skbedit.h | 4 +- + include/net/tcp.h | 3 - + include/uapi/linux/can.h | 32 ++ + include/uapi/linux/ethtool.h | 439 +++++++++++++++------ + net/batman-adv/gateway_client.c | 2 - + net/ceph/osd_client.c | 2 - + net/core/request_sock.c | 1 - + net/ipv4/ip_forward.c | 7 +- + net/ipv4/route.c | 1 - + net/ipv4/tcp_cong.c | 10 - + net/ipv4/tcp_highspeed.c | 1 - + net/ipv4/tcp_hybla.c | 1 - + net/ipv4/tcp_illinois.c | 1 - + net/ipv4/tcp_lp.c | 1 - + net/ipv4/tcp_output.c | 1 - + net/ipv4/tcp_scalable.c | 1 - + net/ipv4/tcp_vegas.c | 1 - + net/ipv4/tcp_westwood.c | 1 - + net/ipv4/tcp_yeah.c | 1 - + net/ipx/af_ipx.c | 28 +- + net/l2tp/l2tp_core.c | 2 - + net/l2tp/l2tp_ppp.c | 3 - + net/mac802154/mib.c | 4 - + net/mac802154/rx.c | 1 - + net/sched/act_api.c | 142 ++++--- + net/sched/act_csum.c | 31 +- + net/sched/act_gact.c | 34 +- + net/sched/act_ipt.c | 68 +--- + net/sched/act_mirred.c | 56 +-- + net/sched/act_nat.c | 33 +- + net/sched/act_pedit.c | 45 +-- + net/sched/act_police.c | 22 +- + net/sched/act_simple.c | 64 +-- + net/sched/act_skbedit.c | 36 +- + net/sctp/transport.c | 1 - + net/socket.c | 13 +- + net/tipc/addr.h | 2 + + net/tipc/bcast.c | 7 +- + net/tipc/bearer.c | 42 +- + net/tipc/bearer.h | 7 +- + net/tipc/core.c | 2 +- + net/tipc/link.c | 432 +++++++++++--------- + net/tipc/link.h | 34 +- + net/tipc/node.c | 8 +- + net/wireless/chan.c | 2 - + 117 files changed, 2196 insertions(+), 1730 deletions(-) + delete mode 100644 drivers/net/can/sja1000/sja1000_of_platform.c +Merging ipsec-next/master (0f24558e9156 xfrm: avoid creating temporary SA when there are no listeners) +$ git merge ipsec-next/master +Auto-merging include/linux/skbuff.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + include/linux/skbuff.h | 2 + + include/net/flow.h | 5 +- + include/net/flowcache.h | 25 ++++++++ + include/net/netns/xfrm.h | 11 ++++ + include/net/xfrm.h | 15 +++++ + net/core/flow.c | 127 ++++++++++++++++++---------------------- + net/core/skbuff.c | 26 ++++++++ + net/ipv4/ah4.c | 53 +++++++++++++---- + net/ipv6/ah6.c | 56 ++++++++++++++---- + net/key/af_key.c | 19 ++++++ + net/xfrm/xfrm_policy.c | 7 ++- + net/xfrm/xfrm_state.c | 31 ++++++++++ + net/xfrm/xfrm_user.c | 9 ++- + security/selinux/include/xfrm.h | 5 +- + 15 files changed, 292 insertions(+), 100 deletions(-) + create mode 100644 include/net/flowcache.h +Merging wireless-next/master (35582ad9d342 Staging: rtl8812ae: remove modules field of rate_control_ops) +$ git merge wireless-next/master +Auto-merging net/wireless/chan.c +Removing drivers/net/wireless/iwlwifi/mvm/power_legacy.c +Auto-merging drivers/net/wireless/iwlwifi/mvm/mac80211.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-drv.c +Removing drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h +Removing drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c +Removing drivers/net/wireless/ath/ath9k/rc.h +Removing drivers/net/wireless/ath/ath9k/rc.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath.h | 2 + + drivers/net/wireless/ath/ath10k/txrx.c | 4 +- + drivers/net/wireless/ath/ath6kl/cfg80211.c | 27 +- + drivers/net/wireless/ath/ath9k/Kconfig | 12 - + drivers/net/wireless/ath/ath9k/Makefile | 1 - + drivers/net/wireless/ath/ath9k/ar9003_calib.c | 235 ++- + drivers/net/wireless/ath/ath9k/ath9k.h | 11 +- + drivers/net/wireless/ath/ath9k/beacon.c | 29 +- + drivers/net/wireless/ath/ath9k/common.c | 244 ++++ + drivers/net/wireless/ath/ath9k/common.h | 19 + + drivers/net/wireless/ath/ath9k/debug.h | 1 - + drivers/net/wireless/ath/ath9k/dfs_debug.h | 2 + + drivers/net/wireless/ath/ath9k/hif_usb.c | 2 + + drivers/net/wireless/ath/ath9k/htc.h | 1 - + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 1 + + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 1 + + drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 176 +-- + drivers/net/wireless/ath/ath9k/htc_hst.c | 36 + + drivers/net/wireless/ath/ath9k/htc_hst.h | 12 + + drivers/net/wireless/ath/ath9k/hw.c | 1 - + drivers/net/wireless/ath/ath9k/init.c | 16 +- + drivers/net/wireless/ath/ath9k/mac.h | 9 +- + drivers/net/wireless/ath/ath9k/main.c | 16 +- + drivers/net/wireless/ath/ath9k/rc.c | 1495 -------------------- + drivers/net/wireless/ath/ath9k/rc.h | 248 ---- + drivers/net/wireless/ath/ath9k/recv.c | 266 +--- + drivers/net/wireless/ath/ath9k/xmit.c | 2 +- + drivers/net/wireless/ath/wcn36xx/dxe.c | 10 +- + drivers/net/wireless/ath/wcn36xx/dxe.h | 4 +- + drivers/net/wireless/ath/wcn36xx/hal.h | 4 +- + drivers/net/wireless/ath/wcn36xx/main.c | 72 +- + drivers/net/wireless/ath/wcn36xx/smd.c | 64 +- + drivers/net/wireless/ath/wcn36xx/smd.h | 5 +- + drivers/net/wireless/ath/wcn36xx/txrx.c | 7 +- + drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 10 +- + drivers/net/wireless/b43/main.h | 35 - + drivers/net/wireless/b43/xmit.c | 12 +- + drivers/net/wireless/brcm80211/brcmfmac/Makefile | 4 +- + drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 8 +- + drivers/net/wireless/brcm80211/brcmfmac/chip.c | 1029 ++++++++++++++ + drivers/net/wireless/brcm80211/brcmfmac/chip.h | 91 ++ + drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 536 ++++--- + drivers/net/wireless/brcm80211/brcmfmac/fwil.c | 5 +- + drivers/net/wireless/brcm80211/brcmfmac/fwil.h | 2 +- + .../net/wireless/brcm80211/brcmfmac/sdio_chip.c | 972 ------------- + .../net/wireless/brcm80211/brcmfmac/sdio_chip.h | 231 --- + .../net/wireless/brcm80211/brcmfmac/sdio_host.h | 89 ++ + .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 83 +- + .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 3 +- + drivers/net/wireless/iwlegacy/3945-rs.c | 3 +- + drivers/net/wireless/iwlegacy/4965-rs.c | 3 +- + drivers/net/wireless/iwlwifi/Kconfig | 14 + + drivers/net/wireless/iwlwifi/Makefile | 2 +- + drivers/net/wireless/iwlwifi/dvm/rs.c | 23 +- + drivers/net/wireless/iwlwifi/dvm/rs.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-7000.c | 23 +- + drivers/net/wireless/iwlwifi/iwl-8000.c | 132 ++ + drivers/net/wireless/iwlwifi/iwl-config.h | 18 + + drivers/net/wireless/iwlwifi/iwl-csr.h | 32 - + drivers/net/wireless/iwlwifi/iwl-debug.h | 2 + + drivers/net/wireless/iwlwifi/iwl-drv.c | 5 +- + drivers/net/wireless/iwlwifi/iwl-fw.h | 7 +- + drivers/net/wireless/iwlwifi/iwl-io.c | 15 + + drivers/net/wireless/iwlwifi/iwl-io.h | 2 + + drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 6 +- + drivers/net/wireless/iwlwifi/iwl-op-mode.h | 24 +- + drivers/net/wireless/iwlwifi/iwl-phy-db.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-prph.h | 46 + + drivers/net/wireless/iwlwifi/iwl-trans.h | 38 + + drivers/net/wireless/iwlwifi/mvm/Makefile | 2 +- + drivers/net/wireless/iwlwifi/mvm/bt-coex.c | 138 +- + drivers/net/wireless/iwlwifi/mvm/constants.h | 4 + + drivers/net/wireless/iwlwifi/mvm/d3.c | 31 +- + drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c | 112 +- + drivers/net/wireless/iwlwifi/mvm/debugfs.c | 285 +++- + drivers/net/wireless/iwlwifi/mvm/fw-api-bt-coex.h | 17 +- + drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h | 6 +- + drivers/net/wireless/iwlwifi/mvm/fw-api-power.h | 33 +- + drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h | 31 +- + drivers/net/wireless/iwlwifi/mvm/fw-api.h | 128 +- + drivers/net/wireless/iwlwifi/mvm/fw.c | 67 +- + drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 76 +- + drivers/net/wireless/iwlwifi/mvm/mac80211.c | 476 ++++++- + drivers/net/wireless/iwlwifi/mvm/mvm.h | 168 ++- + drivers/net/wireless/iwlwifi/mvm/nvm.c | 34 +- + drivers/net/wireless/iwlwifi/mvm/ops.c | 257 +++- + drivers/net/wireless/iwlwifi/mvm/power.c | 385 +++-- + drivers/net/wireless/iwlwifi/mvm/power_legacy.c | 319 ----- + drivers/net/wireless/iwlwifi/mvm/quota.c | 119 +- + drivers/net/wireless/iwlwifi/mvm/rs.c | 29 +- + drivers/net/wireless/iwlwifi/mvm/rs.h | 2 +- + drivers/net/wireless/iwlwifi/mvm/rx.c | 12 +- + drivers/net/wireless/iwlwifi/mvm/scan.c | 15 +- + drivers/net/wireless/iwlwifi/mvm/sta.c | 203 ++- + drivers/net/wireless/iwlwifi/mvm/sta.h | 62 +- + drivers/net/wireless/iwlwifi/mvm/time-event.c | 2 + + drivers/net/wireless/iwlwifi/mvm/tt.c | 7 +- + drivers/net/wireless/iwlwifi/mvm/tx.c | 23 + + drivers/net/wireless/iwlwifi/mvm/utils.c | 99 +- + drivers/net/wireless/iwlwifi/pcie/drv.c | 82 ++ + drivers/net/wireless/iwlwifi/pcie/rx.c | 3 +- + drivers/net/wireless/iwlwifi/pcie/trans.c | 267 ++-- + drivers/net/wireless/iwlwifi/pcie/tx.c | 5 +- + drivers/net/wireless/libertas/cfg.c | 3 +- + drivers/net/wireless/mac80211_hwsim.c | 90 +- + drivers/net/wireless/mac80211_hwsim.h | 2 + + drivers/net/wireless/mwifiex/11ac.c | 192 ++- + drivers/net/wireless/mwifiex/11ac.h | 2 + + drivers/net/wireless/mwifiex/11n.c | 51 +- + drivers/net/wireless/mwifiex/11n.h | 44 +- + drivers/net/wireless/mwifiex/11n_rxreorder.c | 27 +- + drivers/net/wireless/mwifiex/Makefile | 1 + + drivers/net/wireless/mwifiex/cfg80211.c | 184 ++- + drivers/net/wireless/mwifiex/cfp.c | 203 ++- + drivers/net/wireless/mwifiex/cmdevt.c | 54 +- + drivers/net/wireless/mwifiex/decl.h | 23 + + drivers/net/wireless/mwifiex/fw.h | 181 ++- + drivers/net/wireless/mwifiex/init.c | 5 + + drivers/net/wireless/mwifiex/ioctl.h | 22 +- + drivers/net/wireless/mwifiex/join.c | 14 +- + drivers/net/wireless/mwifiex/main.h | 90 +- + drivers/net/wireless/mwifiex/pcie.c | 138 +- + drivers/net/wireless/mwifiex/scan.c | 598 +++++--- + drivers/net/wireless/mwifiex/sta_cmd.c | 373 ++++- + drivers/net/wireless/mwifiex/sta_cmdresp.c | 112 +- + drivers/net/wireless/mwifiex/sta_event.c | 12 + + drivers/net/wireless/mwifiex/sta_ioctl.c | 40 +- + drivers/net/wireless/mwifiex/sta_rx.c | 13 +- + drivers/net/wireless/mwifiex/sta_tx.c | 3 + + drivers/net/wireless/mwifiex/tdls.c | 1044 ++++++++++++++ + drivers/net/wireless/mwifiex/uap_event.c | 118 -- + drivers/net/wireless/mwifiex/util.c | 114 ++ + drivers/net/wireless/mwifiex/util.h | 20 +- + drivers/net/wireless/mwifiex/wmm.c | 96 +- + drivers/net/wireless/mwifiex/wmm.h | 18 + + drivers/net/wireless/rndis_wlan.c | 4 +- + drivers/net/wireless/rt2x00/rt2800usb.c | 10 +- + drivers/net/wireless/rtl818x/rtl8180/dev.c | 8 +- + drivers/net/wireless/rtl818x/rtl8187/dev.c | 14 +- + drivers/net/wireless/rtl818x/rtl818x.h | 10 +- + drivers/net/wireless/rtlwifi/rc.c | 3 +- + drivers/net/wireless/rtlwifi/rtl8188ee/trx.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8723ae/trx.c | 2 +- + drivers/net/wireless/ti/wl12xx/main.c | 67 +- + drivers/net/wireless/ti/wl12xx/wl12xx.h | 53 + + drivers/net/wireless/ti/wl18xx/main.c | 85 +- + drivers/net/wireless/ti/wl18xx/tx.c | 4 +- + drivers/net/wireless/ti/wl18xx/wl18xx.h | 62 +- + drivers/net/wireless/ti/wlcore/acx.c | 7 +- + drivers/net/wireless/ti/wlcore/acx.h | 6 +- + drivers/net/wireless/ti/wlcore/cmd.c | 24 +- + drivers/net/wireless/ti/wlcore/cmd.h | 9 +- + drivers/net/wireless/ti/wlcore/event.c | 4 +- + drivers/net/wireless/ti/wlcore/hw_ops.h | 9 + + drivers/net/wireless/ti/wlcore/init.c | 6 +- + drivers/net/wireless/ti/wlcore/io.h | 8 +- + drivers/net/wireless/ti/wlcore/main.c | 192 +-- + drivers/net/wireless/ti/wlcore/ps.c | 6 +- + drivers/net/wireless/ti/wlcore/rx.c | 19 +- + drivers/net/wireless/ti/wlcore/rx.h | 2 +- + drivers/net/wireless/ti/wlcore/tx.c | 45 +- + drivers/net/wireless/ti/wlcore/tx.h | 1 + + drivers/net/wireless/ti/wlcore/wlcore.h | 27 +- + drivers/net/wireless/ti/wlcore/wlcore_i.h | 86 +- + drivers/staging/rtl8821ae/rc.c | 1 - + include/linux/ieee80211.h | 199 ++- + include/net/cfg80211.h | 43 +- + include/net/ieee80211_radiotap.h | 4 + + include/net/mac80211.h | 52 +- + include/uapi/linux/nl80211.h | 52 +- + net/mac80211/agg-tx.c | 2 +- + net/mac80211/cfg.c | 198 ++- + net/mac80211/cfg.h | 2 +- + net/mac80211/chan.c | 2 + + net/mac80211/debugfs_sta.c | 2 +- + net/mac80211/ht.c | 2 +- + net/mac80211/ibss.c | 28 +- + net/mac80211/ieee80211_i.h | 14 +- + net/mac80211/iface.c | 2 + + net/mac80211/main.c | 9 +- + net/mac80211/mesh.c | 96 +- + net/mac80211/mlme.c | 41 +- + net/mac80211/rate.c | 46 +- + net/mac80211/rate.h | 2 +- + net/mac80211/rc80211_minstrel.c | 2 +- + net/mac80211/rc80211_minstrel.h | 2 +- + net/mac80211/rc80211_minstrel_ht.c | 7 +- + net/mac80211/rc80211_pid_algo.c | 2 +- + net/mac80211/rx.c | 101 +- + net/mac80211/sta_info.h | 2 + + net/mac80211/status.c | 3 +- + net/mac80211/tx.c | 33 +- + net/mac80211/util.c | 42 +- + net/mac80211/vht.c | 26 +- + net/mac80211/wpa.c | 9 +- + net/rfkill/core.c | 9 +- + net/wireless/ap.c | 3 +- + net/wireless/chan.c | 23 +- + net/wireless/core.c | 2 +- + net/wireless/core.h | 7 +- + net/wireless/ibss.c | 19 +- + net/wireless/mesh.c | 6 +- + net/wireless/mlme.c | 2 +- + net/wireless/nl80211.c | 229 ++- + net/wireless/nl80211.h | 2 + + net/wireless/reg.c | 188 ++- + net/wireless/reg.h | 2 + + net/wireless/trace.h | 23 +- + net/wireless/util.c | 5 +- + 211 files changed, 9921 insertions(+), 6336 deletions(-) + delete mode 100644 drivers/net/wireless/ath/ath9k/rc.c + delete mode 100644 drivers/net/wireless/ath/ath9k/rc.h + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/chip.c + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/chip.h + delete mode 100644 drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c + delete mode 100644 drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-8000.c + delete mode 100644 drivers/net/wireless/iwlwifi/mvm/power_legacy.c + create mode 100644 drivers/net/wireless/mwifiex/tdls.c +Merging bluetooth/master (4292f1f33701 Bluetooth: Use connection parameters if any) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/ath3k.c | 4 + + drivers/bluetooth/btusb.c | 2 + + include/net/bluetooth/bluetooth.h | 1 + + include/net/bluetooth/hci.h | 47 +++- + include/net/bluetooth/hci_core.h | 67 ++++- + include/net/bluetooth/l2cap.h | 6 +- + include/net/bluetooth/mgmt.h | 22 +- + include/net/bluetooth/rfcomm.h | 1 + + net/bluetooth/a2mp.c | 8 +- + net/bluetooth/hci_conn.c | 70 +++-- + net/bluetooth/hci_core.c | 246 ++++++++++++++--- + net/bluetooth/hci_event.c | 162 ++++++++--- + net/bluetooth/hci_sysfs.c | 18 +- + net/bluetooth/l2cap_core.c | 559 ++++++++++++++++++++------------------ + net/bluetooth/l2cap_sock.c | 33 ++- + net/bluetooth/mgmt.c | 286 ++++++++++++++++--- + net/bluetooth/rfcomm/core.c | 4 +- + net/bluetooth/rfcomm/sock.c | 15 +- + net/bluetooth/smp.c | 7 +- + 19 files changed, 1116 insertions(+), 442 deletions(-) +Merging infiniband/for-next (1ab1ecef1031 Merge branches 'cma', 'cxgb4', 'iser', 'misc', 'mlx4', 'mlx5', 'nes', 'ocrdma', 'qib' and 'usnic' into for-next) +$ git merge infiniband/for-next +Merge made by the 'recursive' strategy. + drivers/infiniband/hw/amso1100/c2.c | 4 +- + drivers/infiniband/hw/amso1100/c2_rnic.c | 3 +- + drivers/infiniband/hw/cxgb4/cm.c | 1 + + drivers/infiniband/hw/mlx4/main.c | 185 +++++++++++++++++------- + drivers/infiniband/hw/mlx5/Kconfig | 2 +- + drivers/infiniband/hw/mlx5/main.c | 22 ++- + drivers/infiniband/hw/mlx5/qp.c | 18 ++- + drivers/infiniband/hw/mlx5/user.h | 7 + + drivers/infiniband/hw/nes/nes.c | 5 +- + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 2 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 4 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 5 + + drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c | 9 +- + drivers/infiniband/ulp/iser/iser_initiator.c | 3 +- + drivers/infiniband/ulp/iser/iser_verbs.c | 10 +- + drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 2 +- + include/linux/mlx5/driver.h | 1 + + include/rdma/ib_verbs.h | 3 +- + 18 files changed, 212 insertions(+), 74 deletions(-) +Merging mtd/master (0e47c969c65e Merge tag 'for-linus-20140127' of git://git.infradead.org/linux-mtd) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (a67acac04061 mtd: gen_probe: Remove unnecessary OOM messages) +$ git merge l2-mtd/master +Auto-merging drivers/mtd/nand/mpc5121_nfc.c +Merge made by the 'recursive' strategy. + drivers/mtd/chips/cfi_cmdset_0001.c | 9 ++--- + drivers/mtd/chips/cfi_cmdset_0002.c | 9 ++--- + drivers/mtd/chips/cfi_cmdset_0020.c | 3 -- + drivers/mtd/chips/cfi_probe.c | 4 +-- + drivers/mtd/chips/cfi_util.c | 4 +-- + drivers/mtd/chips/gen_probe.c | 2 -- + drivers/mtd/devices/block2mtd.c | 13 ++++--- + drivers/mtd/devices/elm.c | 6 ++-- + drivers/mtd/devices/m25p80.c | 33 ++++++++++++------ + drivers/mtd/devices/mtd_dataflash.c | 1 - + drivers/mtd/devices/phram.c | 41 ++++++++++++++++++---- + drivers/mtd/devices/pmc551.c | 7 +--- + drivers/mtd/devices/spear_smi.c | 2 -- + drivers/mtd/devices/sst25l.c | 1 - + drivers/mtd/inftlmount.c | 1 - + drivers/mtd/lpddr/lpddr_cmds.c | 4 +-- + drivers/mtd/lpddr/qinfo_probe.c | 5 +-- + drivers/mtd/maps/bfin-async-flash.c | 1 - + drivers/mtd/maps/gpio-addr-flash.c | 1 - + drivers/mtd/maps/intel_vr_nor.c | 1 - + drivers/mtd/maps/ixp4xx.c | 1 - + drivers/mtd/maps/lantiq-flash.c | 1 - + drivers/mtd/maps/latch-addr-flash.c | 1 - + drivers/mtd/maps/pci.c | 1 - + drivers/mtd/maps/physmap_of.c | 1 - + drivers/mtd/maps/plat-ram.c | 2 -- + drivers/mtd/maps/pxa2xx-flash.c | 1 - + drivers/mtd/maps/rbtx4939-flash.c | 1 - + drivers/mtd/maps/scb2_flash.c | 1 - + drivers/mtd/maps/sun_uflash.c | 1 - + drivers/mtd/mtd_blkdevs.c | 1 - + drivers/mtd/nand/Kconfig | 2 ++ + drivers/mtd/nand/ams-delta.c | 1 - + drivers/mtd/nand/atmel_nand.c | 11 +++--- + drivers/mtd/nand/au1550nd.c | 4 +-- + drivers/mtd/nand/bf5xx_nand.c | 1 - + drivers/mtd/nand/cafe_nand.c | 68 +++++++++++++++++++++++++------------ + drivers/mtd/nand/davinci_nand.c | 1 - + drivers/mtd/nand/diskonchip.c | 3 +- + drivers/mtd/nand/fsl_elbc_nand.c | 1 - + drivers/mtd/nand/fsl_ifc_nand.c | 1 - + drivers/mtd/nand/gpio.c | 1 - + drivers/mtd/nand/mpc5121_nfc.c | 1 - + drivers/mtd/nand/nand_base.c | 41 ++++++++++++---------- + drivers/mtd/nand/nand_ids.c | 3 ++ + drivers/mtd/nand/nuc900_nand.c | 4 +-- + drivers/mtd/nand/pasemi_nand.c | 1 - + drivers/mtd/nand/s3c2410.c | 1 - + drivers/mtd/onenand/generic.c | 1 - + drivers/mtd/onenand/omap2.c | 1 - + drivers/mtd/onenand/onenand_base.c | 8 +---- + drivers/mtd/onenand/samsung.c | 4 +-- + drivers/mtd/sm_ftl.c | 11 +++--- + drivers/mtd/tests/mtd_test.c | 1 - + drivers/mtd/ubi/ubi.h | 1 - + include/linux/mtd/nand.h | 30 ++++++++-------- + 56 files changed, 184 insertions(+), 178 deletions(-) +Merging crypto/master (883619a931e9 crypto: caam - fix ERA retrieval function) +$ git merge crypto/master +Merge made by the 'recursive' strategy. + drivers/char/hw_random/core.c | 10 +- + drivers/crypto/caam/ctrl.c | 61 +++-------- + drivers/crypto/caam/ctrl.h | 2 +- + drivers/crypto/ccp/ccp-crypto-main.c | 201 +++++++++++++---------------------- + drivers/crypto/ccp/ccp-crypto-sha.c | 130 +++++----------------- + drivers/crypto/ccp/ccp-crypto.h | 8 +- + drivers/crypto/ccp/ccp-dev.c | 21 +++- + drivers/crypto/ccp/ccp-ops.c | 108 ++++++++++++++++++- + drivers/crypto/mxs-dcp.c | 40 +++---- + drivers/crypto/talitos.c | 4 +- + include/linux/ccp.h | 7 ++ + 11 files changed, 275 insertions(+), 317 deletions(-) +Merging drm/drm-next (ef64cf9d0604 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-intel/for-linux-next (b6ae3c7c6016 drm/i915: don't reference null pointer at i915_sink_crc) +$ git merge drm-intel/for-linux-next +Resolved 'drivers/gpu/drm/i915/intel_dp.c' using previous resolution. +Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.h +Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.c +Auto-merging drivers/gpu/drm/i915/intel_dp.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_dp.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/i915_irq.c +Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c +Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8368552482e0] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/drm_crtc.c | 23 + + drivers/gpu/drm/drm_fb_helper.c | 6 +- + drivers/gpu/drm/i915/Makefile | 1 + + drivers/gpu/drm/i915/i915_debugfs.c | 463 +++++++++++++++++- + drivers/gpu/drm/i915/i915_dma.c | 87 +++- + drivers/gpu/drm/i915/i915_drv.c | 182 +++---- + drivers/gpu/drm/i915/i915_drv.h | 441 +++++++++++------ + drivers/gpu/drm/i915/i915_gem.c | 448 ++++++++---------- + drivers/gpu/drm/i915/i915_gem_context.c | 435 ++++++++++++----- + drivers/gpu/drm/i915/i915_gem_evict.c | 49 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 164 +++---- + drivers/gpu/drm/i915/i915_gem_gtt.c | 732 +++++++++++++++++++++-------- + drivers/gpu/drm/i915/i915_gem_tiling.c | 2 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 442 ++++++++++++----- + drivers/gpu/drm/i915/i915_irq.c | 419 +++++++++++------ + drivers/gpu/drm/i915/i915_params.c | 159 +++++++ + drivers/gpu/drm/i915/i915_reg.h | 481 ++++++++++--------- + drivers/gpu/drm/i915/i915_suspend.c | 40 +- + drivers/gpu/drm/i915/i915_sysfs.c | 10 + + drivers/gpu/drm/i915/i915_ums.c | 8 + + drivers/gpu/drm/i915/intel_bios.c | 4 +- + drivers/gpu/drm/i915/intel_crt.c | 2 + + drivers/gpu/drm/i915/intel_ddi.c | 103 +++- + drivers/gpu/drm/i915/intel_display.c | 455 +++++++++++------- + drivers/gpu/drm/i915/intel_dp.c | 367 ++++++++++----- + drivers/gpu/drm/i915/intel_drv.h | 40 +- + drivers/gpu/drm/i915/intel_dsi.c | 2 +- + drivers/gpu/drm/i915/intel_fbdev.c | 175 ++++++- + drivers/gpu/drm/i915/intel_hdmi.c | 37 +- + drivers/gpu/drm/i915/intel_lvds.c | 16 +- + drivers/gpu/drm/i915/intel_overlay.c | 8 +- + drivers/gpu/drm/i915/intel_panel.c | 21 +- + drivers/gpu/drm/i915/intel_pm.c | 343 ++++++++------ + drivers/gpu/drm/i915/intel_ringbuffer.c | 40 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 2 + + drivers/gpu/drm/i915/intel_sprite.c | 18 +- + drivers/gpu/drm/i915/intel_tv.c | 8 +- + drivers/gpu/drm/i915/intel_uncore.c | 8 +- + include/drm/drm_crtc.h | 1 + + include/drm/drm_dp_helper.h | 10 + + include/drm/drm_fb_helper.h | 6 + + 41 files changed, 4224 insertions(+), 2034 deletions(-) + create mode 100644 drivers/gpu/drm/i915/i915_params.c +Merging drm-tegra/drm/for-next (13411ddd3190 drm/tegra: Obtain head number from DT) +$ git merge drm-tegra/drm/for-next +Already up-to-date. +Merging sound/for-next (c4d1489390aa Merge branch 'for-linus' into for-next) +$ git merge sound/for-next +Auto-merging sound/pci/hda/patch_realtek.c +Merge made by the 'recursive' strategy. + sound/core/control.c | 2 +- + sound/core/info.c | 4 +- + sound/core/init.c | 8 +- + sound/core/pcm.c | 10 +- + sound/core/pcm_native.c | 4 +- + sound/core/rawmidi.c | 2 +- + sound/core/rtctimer.c | 4 +- + sound/core/sound_oss.c | 2 +- + sound/core/timer.c | 4 +- + sound/drivers/opl3/opl3_synth.c | 2 +- + sound/drivers/pcsp/pcsp_input.c | 1 + + sound/oss/pas2.h | 3 + + sound/oss/pas2_card.c | 2 - + sound/pci/hda/hda_generic.c | 6 +- + sound/pci/hda/hda_generic.h | 1 - + sound/pci/hda/hda_intel.c | 25 +- + sound/pci/hda/patch_cmedia.c | 31 +- + sound/pci/hda/patch_conexant.c | 810 +++++++++++++++++++--------------------- + sound/pci/hda/patch_realtek.c | 78 +++- + sound/pci/hda/patch_via.c | 8 +- + sound/pci/lx6464es/lx_core.c | 84 ----- + sound/usb/card.c | 18 +- + sound/usb/mixer.c | 99 ++++- + sound/usb/mixer.h | 7 +- + 24 files changed, 608 insertions(+), 607 deletions(-) +Merging sound-asoc/for-next (24d356e65fb1 Merge remote-tracking branches 'asoc/topic/wm8988', 'asoc/topic/wm8991' and 'asoc/topic/wm8995' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging sound/soc/intel/sst-mfld-platform.h +Auto-merging sound/soc/intel/sst-mfld-platform.c +Auto-merging sound/soc/intel/sst-mfld-dsp.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/trivial-devices.txt | 1 + + .../devicetree/bindings/misc/atmel-ssc.txt | 8 + + Documentation/devicetree/bindings/sound/da9055.txt | 22 + + .../bindings/sound/davinci-evm-audio.txt | 9 +- + .../devicetree/bindings/sound/fsl,esai.txt | 5 + + .../devicetree/bindings/sound/fsl,spdif.txt | 5 + + .../devicetree/bindings/sound/mvebu-audio.txt | 1 + + .../devicetree/bindings/sound/pcm512x.txt | 30 + + .../devicetree/bindings/sound/simple-card.txt | 12 +- + .../devicetree/bindings/sound/tlv320aic32x4.txt | 18 + + .../devicetree/bindings/sound/widgets.txt | 20 + + MAINTAINERS | 7 + + drivers/mfd/da9055-i2c.c | 12 +- + drivers/misc/atmel-ssc.c | 6 + + include/linux/atmel-ssc.h | 1 + + include/linux/platform_data/davinci_asp.h | 4 +- + include/sound/rcar_snd.h | 7 + + include/sound/simple_card.h | 4 - + include/sound/soc.h | 17 + + sound/soc/atmel/atmel_ssc_dai.c | 13 +- + sound/soc/blackfin/Kconfig | 11 +- + sound/soc/codecs/Kconfig | 106 ++- + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/ak4671.c | 226 +++---- + sound/soc/codecs/ak4671.h | 2 - + sound/soc/codecs/cs4271.c | 1 - + sound/soc/codecs/cs42l51.c | 70 +- + sound/soc/codecs/cs42l73.c | 19 +- + sound/soc/codecs/da9055.c | 19 +- + sound/soc/codecs/max98090.c | 20 +- + sound/soc/codecs/pcm1681.c | 15 +- + sound/soc/codecs/pcm1792a.c | 33 +- + sound/soc/codecs/pcm512x.c | 707 +++++++++++++++++++++ + sound/soc/codecs/pcm512x.h | 162 +++++ + sound/soc/codecs/rt5640.c | 1 + + sound/soc/codecs/ssm2602.c | 6 +- + sound/soc/codecs/tlv320aic32x4.c | 55 +- + sound/soc/codecs/twl6040.c | 6 +- + sound/soc/codecs/wm5102.c | 17 +- + sound/soc/codecs/wm5110.c | 17 +- + sound/soc/codecs/wm8741.c | 34 +- + sound/soc/codecs/wm8962.c | 31 +- + sound/soc/codecs/wm8988.c | 14 +- + sound/soc/codecs/wm8991.c | 3 - + sound/soc/codecs/wm8995.c | 2 - + sound/soc/codecs/wm8997.c | 17 +- + sound/soc/codecs/wm_adsp.c | 2 + + sound/soc/davinci/davinci-evm.c | 59 +- + sound/soc/davinci/davinci-mcasp.c | 233 +++---- + sound/soc/fsl/fsl_esai.c | 36 +- + sound/soc/fsl/fsl_esai.h | 2 +- + sound/soc/fsl/fsl_spdif.c | 9 +- + sound/soc/fsl/imx-mc13783.c | 1 - + sound/soc/fsl/imx-sgtl5000.c | 10 +- + sound/soc/fsl/imx-wm8962.c | 11 +- + sound/soc/generic/simple-card.c | 216 ++++--- + sound/soc/intel/Kconfig | 4 +- + sound/soc/intel/Makefile | 4 +- + sound/soc/intel/{sst_dsp.h => sst-mfld-dsp.h} | 8 +- + .../intel/{sst_platform.c => sst-mfld-platform.c} | 8 +- + .../intel/{sst_platform.h => sst-mfld-platform.h} | 4 +- + sound/soc/kirkwood/Kconfig | 2 +- + sound/soc/kirkwood/kirkwood-i2s.c | 1 + + sound/soc/samsung/Kconfig | 6 +- + sound/soc/samsung/h1940_uda1380.c | 7 +- + sound/soc/samsung/rx1950_uda1380.c | 5 - + sound/soc/samsung/smdk_wm8994.c | 2 +- + sound/soc/samsung/tobermory.c | 2 + + sound/soc/sh/rcar/adg.c | 215 ++++++- + sound/soc/sh/rcar/core.c | 70 +- + sound/soc/sh/rcar/gen.c | 39 +- + sound/soc/sh/rcar/rsnd.h | 74 ++- + sound/soc/sh/rcar/scu.c | 609 +++++++++++++----- + sound/soc/sh/rcar/ssi.c | 222 ++----- + sound/soc/soc-core.c | 157 ++++- + sound/soc/soc-dapm.c | 9 +- + 76 files changed, 2834 insertions(+), 991 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/da9055.txt + create mode 100644 Documentation/devicetree/bindings/sound/pcm512x.txt + create mode 100644 Documentation/devicetree/bindings/sound/tlv320aic32x4.txt + create mode 100644 Documentation/devicetree/bindings/sound/widgets.txt + create mode 100644 sound/soc/codecs/pcm512x.c + create mode 100644 sound/soc/codecs/pcm512x.h + rename sound/soc/intel/{sst_dsp.h => sst-mfld-dsp.h} (96%) + rename sound/soc/intel/{sst_platform.c => sst-mfld-platform.c} (99%) + rename sound/soc/intel/{sst_platform.h => sst-mfld-platform.h} (97%) +Merging modules/modules-next (917307b09ad5 module: remove MODULE_GENERIC_TABLE) +$ git merge modules/modules-next +Auto-merging scripts/mod/file2alias.c +Merge made by the 'recursive' strategy. + include/linux/isapnp.h | 4 ---- + include/linux/module.h | 19 ++++++++----------- + kernel/module.c | 6 +++--- + scripts/mod/file2alias.c | 14 +++++++++----- + 4 files changed, 20 insertions(+), 23 deletions(-) +Merging virtio/virtio-next (6f0317058f43 tools/virtio: add a missing )) +$ git merge virtio/virtio-next +Merge made by the 'recursive' strategy. + drivers/virtio/virtio_ring.c | 1 + + tools/virtio/linux/kmemleak.h | 3 +++ + tools/virtio/linux/virtio.h | 4 ++-- + tools/virtio/virtio_test.c | 2 +- + 4 files changed, 7 insertions(+), 3 deletions(-) + create mode 100644 tools/virtio/linux/kmemleak.h +Merging input/next (e5fcd269c459 Input: ims-pcu - add commands supported by the new version of the FW) +$ git merge input/next +Auto-merging drivers/input/touchscreen/zforce_ts.c +Merge made by the 'recursive' strategy. + .../bindings/input/touchscreen/zforce_ts.txt | 30 +++ + drivers/input/misc/ims-pcu.c | 258 ++++++++++++++++++++- + drivers/input/misc/uinput.c | 97 +++++--- + drivers/input/misc/wistron_btns.c | 19 ++ + drivers/input/tablet/gtco.c | 2 +- + drivers/input/touchscreen/zforce_ts.c | 95 ++++++-- + include/linux/uinput.h | 2 + + include/uapi/linux/uinput.h | 13 +- + 8 files changed, 460 insertions(+), 56 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt +Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) +$ git merge input-mt/for-next +Already up-to-date. +Merging block/for-next (2a53fee6859b Merge branch 'for-3.14/core' into for-next) +$ git merge block/for-next +Auto-merging lib/percpu_ida.c +Merge made by the 'recursive' strategy. + block/blk-flush.c | 8 +++++--- + block/blk-mq.c | 46 ++++++++++++++++++++++++++++++---------------- + include/linux/blk-mq.h | 3 +++ + lib/percpu_ida.c | 7 ++----- + 4 files changed, 40 insertions(+), 24 deletions(-) +Merging device-mapper/for-next (a17e5c12cde0 dm io: fix I/O to multiple destinations) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + drivers/md/dm-cache-target.c | 8 +++++--- + drivers/md/dm-io.c | 23 +++++++++++------------ + drivers/md/dm-thin-metadata.c | 17 +++++++++++++++++ + drivers/md/dm-thin-metadata.h | 2 ++ + drivers/md/dm-thin.c | 3 ++- + 5 files changed, 37 insertions(+), 16 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 (38dbfb59d117 Linus 3.14-rc1) +$ git merge mmc/mmc-next +Already up-to-date. +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 (26e4f2057516 slub: Fix possible format string bug.) +$ git merge slab/for-next +Already up-to-date. +Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1) +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next (789b5e031528 md/raid5: Fix CPU hotplug callback registration) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + drivers/md/raid1.c | 13 ++++++-- + drivers/md/raid5.c | 90 ++++++++++++++++++++++++++---------------------------- + 2 files changed, 54 insertions(+), 49 deletions(-) +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 (e77bb5297293 mfd: max665x: Differentiate between MAX665X devices) +$ git merge mfd-lj/for-mfd-next +Merge made by the 'recursive' strategy. + drivers/mfd/88pm800.c | 3 +- + drivers/mfd/88pm860x-core.c | 6 + + drivers/mfd/Kconfig | 48 ++++-- + drivers/mfd/Makefile | 2 + + drivers/mfd/adp5520.c | 1 - + drivers/mfd/cs5535-mfd.c | 1 - + drivers/mfd/da9052-core.c | 3 + + drivers/mfd/janz-cmodio.c | 1 - + drivers/mfd/lpc_ich.c | 1 - + drivers/mfd/lpc_sch.c | 1 - + drivers/mfd/max14577.c | 5 +- + drivers/mfd/max665x.c | 94 +++++++++++ + drivers/mfd/max77686.c | 4 + + drivers/mfd/max77693.c | 12 +- + drivers/mfd/max8925-i2c.c | 9 ++ + drivers/mfd/max8997.c | 18 +++ + drivers/mfd/max8998.c | 4 + + drivers/mfd/mcp-sa11x0.c | 1 - + drivers/mfd/omap-usb-tll.c | 2 +- + drivers/mfd/pcf50633-adc.c | 1 - + drivers/mfd/rc5t583-irq.c | 1 - + drivers/mfd/rdc321x-southbridge.c | 1 - + drivers/mfd/retu-mfd.c | 1 - + drivers/mfd/sec-core.c | 4 + + drivers/mfd/smsc-ece1099.c | 1 - + drivers/mfd/stmpe.c | 2 +- + drivers/mfd/tc3589x.c | 84 +++++++--- + drivers/mfd/ti-ssp.c | 1 - + drivers/mfd/ti_am335x_tscadc.c | 24 +-- + drivers/mfd/tps65218.c | 281 +++++++++++++++++++++++++++++++++ + drivers/mfd/tps65912-core.c | 1 - + drivers/mfd/tps65912-irq.c | 1 - + drivers/mfd/twl4030-irq.c | 1 - + drivers/mfd/twl4030-madc.c | 1 - + drivers/mfd/twl6030-irq.c | 1 - + drivers/mfd/vexpress-config.c | 1 - + drivers/mfd/wm5102-tables.c | 35 +++++ + drivers/mfd/wm5110-tables.c | 168 ++++++++++++++++++++ + drivers/mfd/wm8350-core.c | 1 - + drivers/mfd/wm8350-irq.c | 1 - + include/linux/mfd/arizona/registers.h | 84 ++++++++++ + include/linux/mfd/max14577-private.h | 8 - + include/linux/mfd/max14577.h | 5 - + include/linux/mfd/max665x-private.h | 39 +++++ + include/linux/mfd/tps65218.h | 284 ++++++++++++++++++++++++++++++++++ + 45 files changed, 1153 insertions(+), 95 deletions(-) + create mode 100644 drivers/mfd/max665x.c + create mode 100644 drivers/mfd/tps65218.c + create mode 100644 include/linux/mfd/max665x-private.h + create mode 100644 include/linux/mfd/tps65218.h +$ git reset --hard HEAD^ +HEAD is now at 9828f68a3a6b Merge remote-tracking branch 'md/for-next' +Merging next-20140210 version of mfd-lj +$ git merge -m next-20140210/mfd-lj 4d0621451ff2b8ce8a4aed66b98d66121a048fc3 +Merge made by the 'recursive' strategy. + drivers/mfd/Kconfig | 6 +- + drivers/mfd/max14577.c | 5 +- + drivers/mfd/wm5102-tables.c | 35 +++++++ + drivers/mfd/wm5110-tables.c | 168 ++++++++++++++++++++++++++++++++++ + include/linux/mfd/arizona/registers.h | 84 +++++++++++++++++ + include/linux/mfd/max14577-private.h | 8 -- + include/linux/mfd/max14577.h | 5 - + 7 files changed, 294 insertions(+), 17 deletions(-) +Merging battery/master (ac323d8d8070 power: max17040: Fix NULL pointer dereference when there is no platform_data) +$ git merge battery/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/power/bq2415x.txt | 47 ++++++++++++++++++++++ + drivers/power/ds2782_battery.c | 2 +- + drivers/power/isp1704_charger.c | 2 - + drivers/power/max17040_battery.c | 5 ++- + 4 files changed, 51 insertions(+), 5 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/bq2415x.txt +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 (c4a41bcc1726 video: xilinxfb: Move xilinxfb_platform_data directly to the driver) +$ git merge omap_dss2/for-next +Removing include/linux/xilinxfb.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/video/fsl,imx-fb.txt | 1 + + arch/arm/mach-imx/mach-mx27ads.c | 55 +++- + drivers/video/aty/atyfb_base.c | 7 +- + drivers/video/aty/mach64_accel.c | 3 +- + drivers/video/aty/mach64_cursor.c | 22 +- + drivers/video/cfbcopyarea.c | 153 +++++------ + drivers/video/console/fbcon.c | 27 +- + drivers/video/imxfb.c | 71 ++++- + drivers/video/matrox/matroxfb_accel.c | 38 ++- + drivers/video/matrox/matroxfb_base.c | 3 +- + drivers/video/matrox/matroxfb_base.h | 2 + + drivers/video/tgafb.c | 288 +++++---------------- + drivers/video/xilinxfb.c | 15 +- + include/linux/platform_data/video-imxfb.h | 1 - + include/linux/xilinxfb.h | 30 --- + 15 files changed, 353 insertions(+), 363 deletions(-) + delete mode 100644 include/linux/xilinxfb.h +Merging regulator/for-next (5b08f0782945 Merge remote-tracking branches 'regulator/topic/ti-abb' and 'regulator/topic/tps6507x' into regulator-next) +$ git merge regulator/for-next +Auto-merging include/linux/of.h +Merge made by the 'recursive' strategy. + .../bindings/regulator/gpio-regulator.txt | 4 + + .../bindings/regulator/s5m8767-regulator.txt | 13 ++- + .../bindings/regulator/ti-abb-regulator.txt | 6 +- + drivers/base/devres.c | 26 +++++ + drivers/of/base.c | 32 +++++ + drivers/regulator/as3711-regulator.c | 9 +- + drivers/regulator/core.c | 14 +++ + drivers/regulator/da9055-regulator.c | 69 ++++++++++- + drivers/regulator/da9063-regulator.c | 4 +- + drivers/regulator/fixed.c | 42 ++----- + drivers/regulator/gpio-regulator.c | 29 +++-- + drivers/regulator/max14577.c | 8 +- + drivers/regulator/pfuze100-regulator.c | 2 +- + drivers/regulator/rc5t583-regulator.c | 9 +- + drivers/regulator/s2mps11.c | 4 +- + drivers/regulator/s5m8767.c | 87 +++++++++++++- + drivers/regulator/ti-abb-regulator.c | 129 ++++++++++++--------- + drivers/regulator/tps6507x-regulator.c | 18 +-- + include/linux/device.h | 1 + + include/linux/mfd/samsung/core.h | 3 +- + include/linux/mfd/samsung/s5m8767.h | 7 ++ + include/linux/of.h | 76 ++++++++++++ + 22 files changed, 449 insertions(+), 143 deletions(-) +Merging security/next (e0238b4ced90 selinux: fix the output of ./scripts/get_maintainer.pl for SELinux) +$ git merge security/next +Auto-merging security/selinux/hooks.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 5 ++--- + security/apparmor/lsm.c | 2 +- + security/integrity/ima/ima_policy.c | 6 +++--- + security/integrity/integrity_audit.c | 2 +- + security/keys/encrypted-keys/encrypted.c | 2 +- + security/keys/trusted.c | 6 +++--- + security/selinux/hooks.c | 4 ++-- + security/selinux/selinuxfs.c | 2 +- + 8 files changed, 14 insertions(+), 15 deletions(-) +Merging selinux/next (81c94e76ce8e selinux: fix the output of ./scripts/get_maintainer.pl for SELinux) +$ git merge selinux/next +Merge made by the 'recursive' strategy. +Merging lblnet/next (d8ec26d7f828 Linux 3.13) +$ git merge lblnet/next +Already up-to-date. +Merging watchdog/master (41c91d637e86 watchdog: w83697hf_wdt: return ENODEV if no device was found) +$ git merge watchdog/master +Merge made by the 'recursive' strategy. + drivers/watchdog/w83697hf_wdt.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging dwmw2-iommu/master (e5d0c874391a Merge tag 'iommu-updates-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging iommu/next (dd1a175695ed Merge branches 'arm/smmu', 'core', 'x86/vt-d', 'arm/shmobile', 'x86/amd', 'ppc/pamu', 'iommu/fixes' and 'arm/msm' into next) +$ git merge iommu/next +Already up-to-date. +Merging vfio/next (3be3a074cf5b vfio-pci: Don't use device_lock around AER interrupt setup) +$ git merge vfio/next +Already up-to-date. +Merging osd/linux-next (19350e7627a6 exofs: Print less in r4w) +$ 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 (8cc7212a0361 idr: remove unused prototype of idr_free()) +$ git merge trivial/for-next +Merge made by the 'recursive' strategy. + include/linux/idr.h | 1 - + 1 file changed, 1 deletion(-) +Merging audit/master (f3411cb2b2e3 audit: whitespace fix in kernel-parameters.txt) +$ git merge audit/master +Already up-to-date. +Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls) +$ git merge fsnotify/for-next +Already up-to-date. +Merging devicetree/devicetree/next (b66548e2a9ba of: Increase MAX_PHANDLE_ARGS) +$ git merge devicetree/devicetree/next +Recorded preimage for 'drivers/of/of_net.c' +Auto-merging include/linux/of.h +Auto-merging drivers/of/of_net.c +CONFLICT (content): Merge conflict in drivers/of/of_net.c +Auto-merging drivers/of/base.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/of/of_net.c'. +[master 6cb187154960] Merge remote-tracking branch 'devicetree/devicetree/next' +$ git diff -M --stat --summary HEAD^.. + drivers/of/base.c | 75 +++--- + drivers/of/of_net.c | 7 +- + include/linux/of.h | 22 +- + scripts/dtc/dtc-parser.tab.c_shipped | 469 +++++++++++++++-------------------- + scripts/dtc/dtc-parser.tab.h_shipped | 36 ++- + scripts/dtc/dtc.c | 119 +++++---- + scripts/dtc/dtc.h | 1 - + scripts/dtc/srcpos.c | 6 +- + scripts/dtc/update-dtc-source.sh | 54 ++++ + scripts/dtc/util.c | 141 ++++++++++- + scripts/dtc/util.h | 107 +++++++- + scripts/dtc/version_gen.h | 2 +- + 12 files changed, 635 insertions(+), 404 deletions(-) + create mode 100755 scripts/dtc/update-dtc-source.sh +$ git am -3 ../patches/0001-net-of-merges-fix-for-a-moved-comment.patch +Applying: net: of: merges fix for a moved comment +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/phy.h +$ git add -A . +$ git commit -v -a --amend +[master 16af830af77f] Merge remote-tracking branch 'devicetree/devicetree/next' +Merging dt-rh/for-next (860a445c25aa DT: Add vendor prefix for Spansion Inc.) +$ git merge dt-rh/for-next +Already up-to-date. +Merging spi/for-next (6b11fbdc7790 Merge remote-tracking branches 'spi/topic/sunxi', 'spi/topic/tegra114', 'spi/topic/txx9' and 'spi/topic/xfer' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/spi/spi-rspi.txt | 59 ++ + .../devicetree/bindings/spi/spi-sun6i.txt | 24 + + drivers/spi/Kconfig | 11 +- + drivers/spi/Makefile | 1 + + drivers/spi/spi-altera.c | 1 - + drivers/spi/spi-ath79.c | 1 - + drivers/spi/spi-atmel.c | 8 - + drivers/spi/spi-bcm63xx-hsspi.c | 3 +- + drivers/spi/spi-bcm63xx.c | 4 +- + drivers/spi/spi-bfin-sport.c | 1 - + drivers/spi/spi-bfin-v3.c | 3 +- + drivers/spi/spi-bitbang.c | 1 - + drivers/spi/spi-clps711x.c | 82 +- + drivers/spi/spi-coldfire-qspi.c | 6 - + drivers/spi/spi-davinci.c | 14 +- + drivers/spi/spi-dw-mmio.c | 2 +- + drivers/spi/spi-efm32.c | 3 +- + drivers/spi/spi-falcon.c | 3 - + drivers/spi/spi-fsl-spi.c | 20 +- + drivers/spi/spi-gpio.c | 3 +- + drivers/spi/spi-imx.c | 3 +- + drivers/spi/spi-mpc512x-psc.c | 1 - + drivers/spi/spi-mpc52xx-psc.c | 1 - + drivers/spi/spi-mpc52xx.c | 4 - + drivers/spi/spi-mxs.c | 5 +- + drivers/spi/spi-nuc900.c | 1 - + drivers/spi/spi-oc-tiny.c | 1 - + drivers/spi/spi-octeon.c | 6 +- + drivers/spi/spi-omap-100k.c | 16 - + drivers/spi/spi-omap-uwire.c | 6 - + drivers/spi/spi-omap2-mcspi.c | 51 +- + drivers/spi/spi-orion.c | 69 +- + drivers/spi/spi-pl022.c | 21 +- + drivers/spi/spi-ppc4xx.c | 1 - + drivers/spi/spi-pxa2xx-dma.c | 1 - + drivers/spi/spi-pxa2xx-pxadma.c | 1 - + drivers/spi/spi-rspi.c | 845 ++++++++++++++------- + drivers/spi/spi-s3c24xx.c | 1 - + drivers/spi/spi-s3c64xx.c | 417 +++------- + drivers/spi/spi-sc18is602.c | 16 +- + drivers/spi/spi-sh-msiof.c | 1 - + drivers/spi/spi-sh-sci.c | 1 - + drivers/spi/spi-sirf.c | 21 +- + drivers/spi/spi-sun6i.c | 483 ++++++++++++ + drivers/spi/spi-tegra114.c | 26 +- + drivers/spi/spi-tegra20-sflash.c | 25 +- + drivers/spi/spi-tegra20-slink.c | 19 +- + drivers/spi/spi-ti-qspi.c | 3 +- + drivers/spi/spi-txx9.c | 12 +- + drivers/spi/spi-xcomm.c | 1 - + drivers/spi/spi-xilinx.c | 1 - + drivers/spi/spi.c | 195 ++++- + include/linux/spi/spi.h | 31 + + 53 files changed, 1621 insertions(+), 915 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/spi-rspi.txt + create mode 100644 Documentation/devicetree/bindings/spi/spi-sun6i.txt + create mode 100644 drivers/spi/spi-sun6i.c +Merging tip/auto-latest (47e0b4a158d4 Merge branch 'x86/x32') +$ git merge tip/auto-latest +Auto-merging kernel/sched/core.c +Removing kernel/cpu/Makefile +Auto-merging fs/compat.c +Auto-merging arch/powerpc/platforms/pseries/setup.c +Auto-merging arch/m68k/include/asm/Kbuild +Auto-merging arch/hexagon/include/asm/Kbuild +Merge made by the 'recursive' strategy. + Documentation/sysctl/kernel.txt | 15 +- + arch/alpha/include/asm/Kbuild | 7 +- + arch/arc/include/asm/Kbuild | 7 +- + arch/arm/include/asm/Kbuild | 5 +- + arch/arm/kernel/process.c | 16 +- + arch/arm64/include/asm/Kbuild | 7 +- + arch/avr32/include/asm/Kbuild | 41 ++- + arch/blackfin/include/asm/Kbuild | 7 +- + arch/c6x/include/asm/Kbuild | 5 +- + arch/cris/include/asm/Kbuild | 3 +- + arch/frv/include/asm/Kbuild | 5 +- + arch/hexagon/include/asm/Kbuild | 5 +- + arch/ia64/include/asm/Kbuild | 5 +- + arch/m32r/include/asm/Kbuild | 5 +- + arch/m68k/include/asm/Kbuild | 3 +- + arch/metag/include/asm/Kbuild | 5 +- + arch/microblaze/include/asm/Kbuild | 5 +- + arch/mips/include/asm/Kbuild | 5 +- + arch/mn10300/include/asm/Kbuild | 3 +- + arch/openrisc/include/asm/Kbuild | 11 +- + arch/parisc/include/asm/Kbuild | 32 +- + arch/powerpc/include/asm/Kbuild | 5 +- + arch/powerpc/platforms/cell/spufs/sched.c | 1 - + arch/powerpc/platforms/pseries/setup.c | 34 +- + arch/s390/include/asm/Kbuild | 5 +- + arch/score/include/asm/Kbuild | 5 +- + arch/sh/include/asm/Kbuild | 9 +- + arch/sh/kernel/idle.c | 4 +- + arch/sparc/include/asm/Kbuild | 11 +- + arch/tile/include/asm/Kbuild | 5 +- + arch/um/include/asm/Kbuild | 34 +- + arch/unicore32/include/asm/Kbuild | 5 +- + arch/x86/Makefile | 4 +- + arch/x86/include/asm/Kbuild | 1 + + arch/x86/include/asm/apic.h | 14 +- + arch/x86/include/asm/nmi.h | 3 + + arch/x86/kernel/apic/apic.c | 9 +- + arch/x86/kernel/apic/apic_flat_64.c | 4 +- + arch/x86/kernel/apic/apic_noop.c | 3 +- + arch/x86/kernel/apic/apic_numachip.c | 2 +- + arch/x86/kernel/apic/bigsmp_32.c | 3 +- + arch/x86/kernel/apic/es7000_32.c | 12 +- + arch/x86/kernel/apic/numaq_32.c | 3 +- + arch/x86/kernel/apic/probe_32.c | 3 +- + arch/x86/kernel/apic/summit_32.c | 3 +- + arch/x86/kernel/apic/x2apic_cluster.c | 2 +- + arch/x86/kernel/apic/x2apic_phys.c | 2 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 2 +- + arch/x86/kernel/cpu/perf_event.c | 8 +- + arch/x86/kernel/cpu/perf_event.h | 1 + + arch/x86/kernel/cpu/perf_event_p4.c | 34 +- + arch/x86/kernel/cpu/perf_event_p6.c | 48 ++- + arch/x86/kernel/early-quirks.c | 211 +++++++++-- + arch/x86/kernel/nmi.c | 37 +- + arch/x86/kernel/process.c | 5 +- + arch/x86/kernel/smpboot.c | 5 +- + arch/x86/kernel/tsc.c | 4 +- + arch/x86/mm/srat.c | 12 +- + arch/xtensa/include/asm/Kbuild | 5 +- + drivers/clocksource/bcm_kona_timer.c | 54 +-- + drivers/cpuidle/cpuidle-pseries.c | 6 + + drivers/cpuidle/cpuidle.c | 14 +- + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 2 +- + drivers/tty/tty_ldsem.c | 15 +- + fs/compat.c | 6 +- + include/asm-generic/bitops/const_hweight.h | 17 +- + include/asm-generic/mcs_spinlock.h | 13 + + include/drm/i915_drm.h | 20 + + include/linux/clockchips.h | 16 +- + include/linux/compat.h | 23 +- + include/linux/interrupt.h | 5 + + include/linux/irq_work.h | 2 + + include/linux/lockdep.h | 27 +- + include/linux/mcs_spinlock.h | 114 ++++++ + include/linux/mutex.h | 5 +- + include/linux/rcupdate.h | 2 +- + include/linux/sched.h | 41 ++- + include/linux/sched/prio.h | 40 ++ + include/linux/sched/rt.h | 19 +- + include/linux/wait.h | 6 +- + ipc/compat.c | 12 +- + ipc/compat_mq.c | 19 +- + kernel/Makefile | 1 - + kernel/compat.c | 112 +++--- + kernel/cpu/Makefile | 1 - + kernel/cpu/idle.c | 7 +- + kernel/events/core.c | 28 +- + kernel/futex_compat.c | 2 +- + kernel/irq/devres.c | 45 +++ + kernel/irq/irqdesc.c | 1 + + kernel/locking/lockdep.c | 17 +- + kernel/locking/mutex.c | 60 +-- + kernel/sched/Makefile | 2 +- + kernel/sched/core.c | 79 ++-- + kernel/sched/cputime.c | 4 +- + kernel/sched/deadline.c | 22 +- + kernel/sched/debug.c | 7 +- + kernel/sched/fair.c | 503 ++++++++++++++++++++------ + kernel/sched/idle.c | 144 ++++++++ + kernel/sched/idle_task.c | 27 +- + kernel/sched/rt.c | 43 ++- + kernel/sched/sched.h | 29 +- + kernel/sched/stop_task.c | 16 +- + kernel/sysctl.c | 7 - + kernel/time/Makefile | 5 +- + kernel/time/clockevents.c | 40 +- + kernel/time/jiffies.c | 6 + + kernel/time/ntp.c | 5 +- + kernel/time/tick-broadcast-hrtimer.c | 106 ++++++ + kernel/time/tick-broadcast.c | 85 ++++- + kernel/time/tick-internal.h | 11 +- + mm/mempolicy.c | 74 +--- + 112 files changed, 1848 insertions(+), 874 deletions(-) + create mode 100644 include/asm-generic/mcs_spinlock.h + create mode 100644 include/linux/mcs_spinlock.h + create mode 100644 include/linux/sched/prio.h + delete mode 100644 kernel/cpu/Makefile + create mode 100644 kernel/sched/idle.c + create mode 100644 kernel/time/tick-broadcast-hrtimer.c +Merging clockevents/clockevents/next (00e2bcd6d35f clocksource: Timer-sun5i: Switch to sched_clock_register()) +$ git merge clockevents/clockevents/next +Already up-to-date. +Merging edac/linux_next (3e45588825c1 cell_edac: fix missing of_node_put) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (9d0e8d8348d5 amd64_edac: Fix logic to determine channel for F15 M30h processors) +$ git merge edac-amd/for-next +Merge made by the 'recursive' strategy. + drivers/edac/amd64_edac.c | 14 +++++++++++--- + drivers/edac/e752x_edac.c | 2 +- + drivers/edac/i3200_edac.c | 2 ++ + drivers/edac/i5400_edac.c | 2 ++ + drivers/edac/mpc85xx_edac.c | 6 +++--- + 5 files changed, 19 insertions(+), 7 deletions(-) +Merging ftrace/for-next (3132e107d608 tracing: Check if tracing is enabled in trace_puts()) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (a9b5bb435cce locktorture: Add kvm-recheck.sh plug-in for locktorture) +$ git merge rcu/rcu/next +Resolved 'mm/slub.c' using previous resolution. +Auto-merging tools/testing/selftests/rcutorture/configs/rcu/ver_functions.sh +Auto-merging tools/testing/selftests/rcutorture/configs/rcu/v3.5/ver_functions.sh +Auto-merging tools/testing/selftests/rcutorture/configs/rcu/v3.3/ver_functions.sh +Auto-merging tools/testing/selftests/rcutorture/configs/rcu/v0.0/ver_functions.sh +Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TREE09 +Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TREE08-T +Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TREE08 +Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TREE07 +Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TREE06 +Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TREE05 +Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TREE04 +Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TREE03 +Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TREE02 +Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TREE01 +Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TINY02 +Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TINY01 +Auto-merging tools/testing/selftests/rcutorture/configs/rcu/SRCU-P +Auto-merging tools/testing/selftests/rcutorture/configs/rcu/SRCU-N +Auto-merging tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh +Auto-merging mm/slub.c +CONFLICT (content): Merge conflict in mm/slub.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/rcu/rcutorture.c +Auto-merging kernel/Makefile +Auto-merging include/linux/rcupdate.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9c0267ed1088] Merge remote-tracking branch 'rcu/rcu/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/RCU/checklist.txt | 19 +- + Documentation/memory-barriers.txt | 17 + + include/linux/rculist.h | 17 +- + include/linux/rcupdate.h | 92 +- + include/linux/rcutiny.h | 10 +- + include/linux/rcutree.h | 6 +- + include/linux/srcu.h | 4 +- + include/linux/torture.h | 100 +++ + kernel/Makefile | 1 + + kernel/locking/Makefile | 1 + + kernel/locking/locktorture.c | 421 +++++++++ + kernel/rcu/Makefile | 2 +- + kernel/rcu/rcu.h | 4 +- + kernel/rcu/{torture.c => rcutorture.c} | 986 +++++---------------- + kernel/rcu/srcu.c | 4 +- + kernel/rcu/tiny.c | 4 +- + kernel/rcu/tiny_plugin.h | 4 +- + kernel/rcu/tree.c | 16 +- + kernel/rcu/tree.h | 4 +- + kernel/rcu/tree_plugin.h | 17 +- + kernel/rcu/tree_trace.c | 6 +- + kernel/rcu/update.c | 4 +- + kernel/torture.c | 719 +++++++++++++++ + lib/Kconfig.debug | 25 + + .../testing/selftests/rcutorture/bin/functions.sh | 1 + + .../selftests/rcutorture/bin/kvm-recheck-lock.sh | 51 ++ + .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 51 ++ + .../selftests/rcutorture/bin/kvm-recheck.sh | 13 +- + .../bin/{kvm-test-1-rcu.sh => kvm-test-1-run.sh} | 53 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 268 +++++- + .../selftests/rcutorture/configs/lock/BUSTED | 6 + + .../selftests/rcutorture/configs/lock/BUSTED.boot | 1 + + .../selftests/rcutorture/configs/lock/CFLIST | 1 + + .../selftests/rcutorture/configs/lock/CFcommon | 2 + + .../selftests/rcutorture/configs/lock/LOCK01 | 6 + + .../rcutorture/configs/lock/ver_functions.sh | 43 + + .../selftests/rcutorture/configs/rcu/BUSTED | 7 + + .../selftests/rcutorture/configs/rcu/BUSTED.boot | 1 + + .../selftests/rcutorture/configs/{ => rcu}/CFLIST | 0 + .../selftests/rcutorture/configs/rcu/CFcommon | 2 + + .../selftests/rcutorture/configs/{ => rcu}/SRCU-N | 3 +- + .../rcutorture/configs/{ => rcu}/SRCU-N.boot | 0 + .../selftests/rcutorture/configs/{ => rcu}/SRCU-P | 1 - + .../rcutorture/configs/{ => rcu}/SRCU-P.boot | 0 + .../selftests/rcutorture/configs/{ => rcu}/TINY01 | 1 - + .../selftests/rcutorture/configs/{ => rcu}/TINY02 | 1 - + .../selftests/rcutorture/configs/{ => rcu}/TREE01 | 1 - + .../rcutorture/configs/{ => rcu}/TREE01.boot | 0 + .../selftests/rcutorture/configs/{ => rcu}/TREE02 | 3 +- + .../selftests/rcutorture/configs/{ => rcu}/TREE03 | 1 - + .../selftests/rcutorture/configs/{ => rcu}/TREE04 | 1 - + .../rcutorture/configs/{ => rcu}/TREE04.boot | 0 + .../selftests/rcutorture/configs/{ => rcu}/TREE05 | 1 - + .../rcutorture/configs/{ => rcu}/TREE05.boot | 0 + .../selftests/rcutorture/configs/{ => rcu}/TREE06 | 1 - + .../selftests/rcutorture/configs/{ => rcu}/TREE07 | 1 - + .../selftests/rcutorture/configs/{ => rcu}/TREE08 | 1 - + .../rcutorture/configs/{ => rcu}/TREE08-T | 1 - + .../selftests/rcutorture/configs/{ => rcu}/TREE09 | 1 - + .../rcutorture/configs/{ => rcu}/v0.0/CFLIST | 0 + .../configs/{ => rcu}/v0.0/N1-S-T-NH-SD-SMP-HP | 0 + .../configs/{ => rcu}/v0.0/N2-2-t-nh-sd-SMP-hp | 0 + .../configs/{ => rcu}/v0.0/N3-3-T-nh-SD-SMP-hp | 0 + .../configs/{ => rcu}/v0.0/N4-A-t-NH-sd-SMP-HP | 0 + .../configs/{ => rcu}/v0.0/N5-U-T-NH-sd-SMP-hp | 0 + .../rcutorture/configs/{ => rcu}/v0.0/NT1-nh | 0 + .../rcutorture/configs/{ => rcu}/v0.0/NT3-NH | 0 + .../configs/{ => rcu}/v0.0/P1-S-T-NH-SD-SMP-HP | 0 + .../configs/{ => rcu}/v0.0/P2-2-t-nh-sd-SMP-hp | 0 + .../configs/{ => rcu}/v0.0/P3-3-T-nh-SD-SMP-hp | 0 + .../configs/{ => rcu}/v0.0/P4-A-t-NH-sd-SMP-HP | 0 + .../configs/{ => rcu}/v0.0/P5-U-T-NH-sd-SMP-hp | 0 + .../rcutorture/configs/{ => rcu}/v0.0/PT1-nh | 0 + .../rcutorture/configs/{ => rcu}/v0.0/PT2-NH | 0 + .../configs/{ => rcu}/v0.0/ver_functions.sh | 22 +- + .../rcutorture/configs/{ => rcu}/v3.12/CFLIST | 0 + .../configs/{ => rcu}/v3.12/N1-S-T-NH-SD-SMP-HP | 0 + .../configs/{ => rcu}/v3.12/N2-2-t-nh-sd-SMP-hp | 0 + .../configs/{ => rcu}/v3.12/N3-3-T-nh-SD-SMP-hp | 0 + .../configs/{ => rcu}/v3.12/N4-A-t-NH-sd-SMP-HP | 0 + .../configs/{ => rcu}/v3.12/N5-U-T-NH-sd-SMP-hp | 0 + .../configs/{ => rcu}/v3.12/N6---t-nh-SD-smp-hp | 0 + .../configs/{ => rcu}/v3.12/N7-4-T-NH-SD-SMP-HP | 0 + .../configs/{ => rcu}/v3.12/N8-2-T-NH-SD-SMP-HP | 0 + .../rcutorture/configs/{ => rcu}/v3.12/NT1-nh | 0 + .../rcutorture/configs/{ => rcu}/v3.12/NT3-NH | 0 + .../configs/{ => rcu}/v3.12/P1-S-T-NH-SD-SMP-HP | 0 + .../configs/{ => rcu}/v3.12/P2-2-t-nh-sd-SMP-hp | 0 + .../configs/{ => rcu}/v3.12/P3-3-T-nh-SD-SMP-hp | 0 + .../configs/{ => rcu}/v3.12/P4-A-t-NH-sd-SMP-HP | 0 + .../configs/{ => rcu}/v3.12/P5-U-T-NH-sd-SMP-hp | 0 + .../configs/{ => rcu}/v3.12/P6---t-nh-SD-smp-hp | 0 + .../configs/{ => rcu}/v3.12/P7-4-T-NH-SD-SMP-HP | 0 + .../{ => rcu}/v3.12/P7-4-T-NH-SD-SMP-HP-all | 0 + .../{ => rcu}/v3.12/P7-4-T-NH-SD-SMP-HP-none | 0 + .../configs/{ => rcu}/v3.12/P7-4-T-NH-SD-SMP-hp | 0 + .../rcutorture/configs/{ => rcu}/v3.12/PT1-nh | 0 + .../rcutorture/configs/{ => rcu}/v3.12/PT2-NH | 0 + .../rcutorture/configs/{ => rcu}/v3.3/CFLIST | 0 + .../configs/{ => rcu}/v3.3/N1-S-T-NH-SD-SMP-HP | 0 + .../configs/{ => rcu}/v3.3/N2-2-t-nh-sd-SMP-hp | 0 + .../configs/{ => rcu}/v3.3/N3-3-T-nh-SD-SMP-hp | 0 + .../configs/{ => rcu}/v3.3/N4-A-t-NH-sd-SMP-HP | 0 + .../configs/{ => rcu}/v3.3/N5-U-T-NH-sd-SMP-hp | 0 + .../rcutorture/configs/{ => rcu}/v3.3/NT1-nh | 0 + .../rcutorture/configs/{ => rcu}/v3.3/NT3-NH | 0 + .../configs/{ => rcu}/v3.3/P1-S-T-NH-SD-SMP-HP | 0 + .../configs/{ => rcu}/v3.3/P2-2-t-nh-sd-SMP-hp | 0 + .../configs/{ => rcu}/v3.3/P3-3-T-nh-SD-SMP-hp | 0 + .../configs/{ => rcu}/v3.3/P4-A-t-NH-sd-SMP-HP | 0 + .../configs/{ => rcu}/v3.3/P5-U-T-NH-sd-SMP-hp | 0 + .../rcutorture/configs/{ => rcu}/v3.3/PT1-nh | 0 + .../rcutorture/configs/{ => rcu}/v3.3/PT2-NH | 0 + .../configs/{ => rcu/v3.3}/ver_functions.sh | 28 +- + .../rcutorture/configs/{ => rcu}/v3.5/CFLIST | 0 + .../configs/{ => rcu}/v3.5/N1-S-T-NH-SD-SMP-HP | 0 + .../configs/{ => rcu}/v3.5/N2-2-t-nh-sd-SMP-hp | 0 + .../configs/{ => rcu}/v3.5/N3-3-T-nh-SD-SMP-hp | 0 + .../configs/{ => rcu}/v3.5/N4-A-t-NH-sd-SMP-HP | 0 + .../configs/{ => rcu}/v3.5/N5-U-T-NH-sd-SMP-hp | 0 + .../rcutorture/configs/{ => rcu}/v3.5/NT1-nh | 0 + .../rcutorture/configs/{ => rcu}/v3.5/NT3-NH | 0 + .../configs/{ => rcu}/v3.5/P1-S-T-NH-SD-SMP-HP | 0 + .../configs/{ => rcu}/v3.5/P2-2-t-nh-sd-SMP-hp | 0 + .../configs/{ => rcu}/v3.5/P3-3-T-nh-SD-SMP-hp | 0 + .../configs/{ => rcu}/v3.5/P4-A-t-NH-sd-SMP-HP | 0 + .../configs/{ => rcu}/v3.5/P5-U-T-NH-sd-SMP-hp | 0 + .../rcutorture/configs/{ => rcu}/v3.5/PT1-nh | 0 + .../rcutorture/configs/{ => rcu}/v3.5/PT2-NH | 0 + .../configs/{ => rcu}/v3.5/ver_functions.sh | 23 +- + .../configs/{v3.3 => rcu}/ver_functions.sh | 26 +- + 131 files changed, 2117 insertions(+), 989 deletions(-) + create mode 100644 include/linux/torture.h + create mode 100644 kernel/locking/locktorture.c + rename kernel/rcu/{torture.c => rcutorture.c} (59%) + create mode 100644 kernel/torture.c + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-lock.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-rcu.sh + rename tools/testing/selftests/rcutorture/bin/{kvm-test-1-rcu.sh => kvm-test-1-run.sh} (79%) + create mode 100644 tools/testing/selftests/rcutorture/configs/lock/BUSTED + create mode 100644 tools/testing/selftests/rcutorture/configs/lock/BUSTED.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/lock/CFLIST + create mode 100644 tools/testing/selftests/rcutorture/configs/lock/CFcommon + create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK01 + create mode 100644 tools/testing/selftests/rcutorture/configs/lock/ver_functions.sh + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/BUSTED + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/BUSTED.boot + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/CFLIST (100%) + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/CFcommon + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/SRCU-N (75%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/SRCU-N.boot (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/SRCU-P (86%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/SRCU-P.boot (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TINY01 (92%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TINY02 (92%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE01 (96%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE01.boot (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE02 (92%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE03 (96%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE04 (96%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE04.boot (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE05 (96%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE05.boot (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE06 (96%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE07 (96%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE08 (96%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE08-T (96%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE09 (95%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/CFLIST (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/N1-S-T-NH-SD-SMP-HP (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/N2-2-t-nh-sd-SMP-hp (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/N3-3-T-nh-SD-SMP-hp (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/N4-A-t-NH-sd-SMP-HP (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/N5-U-T-NH-sd-SMP-hp (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/NT1-nh (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/NT3-NH (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/P1-S-T-NH-SD-SMP-HP (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/P2-2-t-nh-sd-SMP-hp (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/P3-3-T-nh-SD-SMP-hp (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/P4-A-t-NH-sd-SMP-HP (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/P5-U-T-NH-sd-SMP-hp (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/PT1-nh (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/PT2-NH (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/ver_functions.sh (70%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/CFLIST (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/N1-S-T-NH-SD-SMP-HP (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/N2-2-t-nh-sd-SMP-hp (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/N3-3-T-nh-SD-SMP-hp (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/N4-A-t-NH-sd-SMP-HP (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/N5-U-T-NH-sd-SMP-hp (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/N6---t-nh-SD-smp-hp (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/N7-4-T-NH-SD-SMP-HP (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/N8-2-T-NH-SD-SMP-HP (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/NT1-nh (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/NT3-NH (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P1-S-T-NH-SD-SMP-HP (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P2-2-t-nh-sd-SMP-hp (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P3-3-T-nh-SD-SMP-hp (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P4-A-t-NH-sd-SMP-HP (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P5-U-T-NH-sd-SMP-hp (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P6---t-nh-SD-smp-hp (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P7-4-T-NH-SD-SMP-HP (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P7-4-T-NH-SD-SMP-HP-all (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P7-4-T-NH-SD-SMP-HP-none (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P7-4-T-NH-SD-SMP-hp (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/PT1-nh (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/PT2-NH (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/CFLIST (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/N1-S-T-NH-SD-SMP-HP (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/N2-2-t-nh-sd-SMP-hp (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/N3-3-T-nh-SD-SMP-hp (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/N4-A-t-NH-sd-SMP-HP (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/N5-U-T-NH-sd-SMP-hp (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/NT1-nh (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/NT3-NH (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/P1-S-T-NH-SD-SMP-HP (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/P2-2-t-nh-sd-SMP-hp (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/P3-3-T-nh-SD-SMP-hp (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/P4-A-t-NH-sd-SMP-HP (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/P5-U-T-NH-sd-SMP-hp (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/PT1-nh (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/PT2-NH (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu/v3.3}/ver_functions.sh (72%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/CFLIST (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/N1-S-T-NH-SD-SMP-HP (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/N2-2-t-nh-sd-SMP-hp (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/N3-3-T-nh-SD-SMP-hp (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/N4-A-t-NH-sd-SMP-HP (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/N5-U-T-NH-sd-SMP-hp (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/NT1-nh (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/NT3-NH (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/P1-S-T-NH-SD-SMP-HP (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/P2-2-t-nh-sd-SMP-hp (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/P3-3-T-nh-SD-SMP-hp (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/P4-A-t-NH-sd-SMP-HP (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/P5-U-T-NH-sd-SMP-hp (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/PT1-nh (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/PT2-NH (100%) + rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/ver_functions.sh (69%) + rename tools/testing/selftests/rcutorture/configs/{v3.3 => rcu}/ver_functions.sh (66%) +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 (b73117c49364 Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue) +$ git merge kvm/linux-next +Already up-to-date. +Merging kvm-arm/kvm-arm-next (b73117c49364 Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue) +$ git merge kvm-arm/kvm-arm-next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (b73117c49364 Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue) +$ 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 (b1f5d76c5d9b Merge branch 'devel/for-linus-3.15' into linux-next) +$ git merge xen-tip/linux-next +Merge made by the 'recursive' strategy. + arch/arm/include/asm/xen/page.h | 20 +++- + arch/x86/include/asm/xen/page.h | 7 +- + arch/x86/xen/mmu.c | 52 +-------- + arch/x86/xen/p2m.c | 206 +++++++++++++++++++++++------------- + arch/x86/xen/setup.c | 15 ++- + drivers/block/xen-blkback/blkback.c | 15 ++- + drivers/xen/gntdev.c | 13 ++- + drivers/xen/grant-table.c | 74 ++++++++++--- + drivers/xen/pcpu.c | 1 + + drivers/xen/platform-pci.c | 2 +- + include/xen/grant_table.h | 8 +- + 11 files changed, 259 insertions(+), 154 deletions(-) +Merging percpu/for-next (d5f2deed588b Merge branch 'for-3.14' into for-next) +$ git merge percpu/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging workqueues/for-next (38dbfb59d117 Linus 3.14-rc1) +$ git merge workqueues/for-next +Already up-to-date. +Merging drivers-x86/linux-next (b4b0b4a9e039 ipc: add intel-mid's pci id macros) +$ 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 (e6e5c7bb7c6b Merge remote-tracking branch 'regmap/topic/irq' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regcache.c | 4 ++-- + drivers/base/regmap/regmap-debugfs.c | 2 +- + drivers/base/regmap/regmap-irq.c | 2 +- + drivers/base/regmap/regmap.c | 3 +++ + 4 files changed, 7 insertions(+), 4 deletions(-) +Merging hsi/for-next (43139a61fc68 HSI: hsi_char: Update ioctl-number.txt) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (59e35a9e5315 drivers/leds: delete non-required instances of include <linux/init.h>) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-gpio.txt | 12 ++ + Documentation/devicetree/bindings/mfd/mc13xxx.txt | 47 +++++ + drivers/leds/Kconfig | 2 +- + drivers/leds/led-core.c | 6 +- + drivers/leds/led-triggers.c | 1 - + drivers/leds/leds-88pm860x.c | 1 - + drivers/leds/leds-adp5520.c | 1 - + drivers/leds/leds-asic3.c | 1 - + drivers/leds/leds-blinkm.c | 1 - + drivers/leds/leds-cobalt-qube.c | 1 - + drivers/leds/leds-da903x.c | 1 - + drivers/leds/leds-da9052.c | 1 - + drivers/leds/leds-fsg.c | 1 - + drivers/leds/leds-gpio.c | 4 +- + drivers/leds/leds-hp6xx.c | 1 - + drivers/leds/leds-lm3533.c | 1 - + drivers/leds/leds-lp5521.c | 1 - + drivers/leds/leds-lp5523.c | 1 - + drivers/leds/leds-lp5562.c | 1 - + drivers/leds/leds-lt3593.c | 1 - + drivers/leds/leds-mc13783.c | 223 ++++++++++++++------- + drivers/leds/leds-netxbig.c | 1 - + drivers/leds/leds-ns2.c | 1 - + drivers/leds/leds-ot200.c | 1 - + drivers/leds/leds-pwm.c | 1 - + drivers/leds/leds-s3c24xx.c | 1 - + drivers/leds/leds-wm831x-status.c | 1 - + drivers/leds/leds-wm8350.c | 1 - + drivers/leds/trigger/ledtrig-cpu.c | 24 +++ + include/linux/mfd/mc13xxx.h | 6 + + 30 files changed, 243 insertions(+), 103 deletions(-) +Merging driver-core/driver-core-next (a8fa94e0f2ab Merge branch 'master' into driver-core-next-test-merge-rc2) +$ git merge driver-core/driver-core-next +Auto-merging include/linux/device.h +Merge made by the 'recursive' strategy. + arch/s390/include/asm/ccwgroup.h | 1 + + arch/s390/pci/pci_sysfs.c | 18 +- + dir.c | 1248 ++++++++++++++++++++++++ + drivers/base/core.c | 50 +- + drivers/base/dma-buf.c | 18 +- + drivers/gpu/drm/drm_prime.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_dmabuf.c | 2 +- + drivers/media/v4l2-core/videobuf2-dma-contig.c | 2 +- + drivers/pci/pci-sysfs.c | 17 +- + drivers/s390/block/dcssblk.c | 14 +- + drivers/s390/cio/ccwgroup.c | 26 +- + drivers/scsi/scsi_sysfs.c | 15 +- + fs/Kconfig | 1 + + fs/Makefile | 3 +- + fs/kernfs/Kconfig | 7 + + fs/kernfs/dir.c | 750 ++++++++++---- + fs/kernfs/file.c | 55 +- + fs/kernfs/kernfs-internal.h | 14 +- + fs/kernfs/mount.c | 37 + + fs/kernfs/symlink.c | 6 +- + fs/sysfs/Kconfig | 1 + + fs/sysfs/dir.c | 44 +- + fs/sysfs/file.c | 115 +-- + fs/sysfs/mount.c | 2 +- + include/linux/device.h | 13 +- + include/linux/kernfs.h | 108 +- + include/linux/sysfs.h | 23 +- + lib/kobject.c | 2 +- + 28 files changed, 2091 insertions(+), 503 deletions(-) + create mode 100644 dir.c + create mode 100644 fs/kernfs/Kconfig +Merging tty/tty-next (86a41c46c7b5 serial: max310x: Fix build error) +$ git merge tty/tty-next +Removing include/linux/platform_data/max310x.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/serial/maxim,max310x.txt | 36 ++ + .../bindings/serial/renesas,sci-serial.txt | 2 +- + arch/arm/boot/dts/atlas6.dtsi | 17 +- + arch/arm/boot/dts/prima2.dtsi | 20 +- + drivers/tty/hvc/hvc_console.c | 6 +- + drivers/tty/n_tty.c | 11 +- + drivers/tty/serial/Kconfig | 4 +- + drivers/tty/serial/amba-pl011.c | 21 +- + drivers/tty/serial/atmel_serial.c | 3 - + drivers/tty/serial/imx.c | 3 +- + drivers/tty/serial/max310x.c | 418 ++++++++++++--------- + drivers/tty/serial/msm_serial.c | 140 ++++++- + drivers/tty/serial/msm_serial.h | 9 + + drivers/tty/serial/pch_uart.c | 2 + + drivers/tty/serial/samsung.c | 40 +- + drivers/tty/serial/sh-sci.c | 2 +- + drivers/tty/serial/sirfsoc_uart.c | 195 +++------- + drivers/tty/serial/sirfsoc_uart.h | 5 - + include/linux/platform_data/max310x.h | 64 ---- + 19 files changed, 539 insertions(+), 459 deletions(-) + create mode 100644 Documentation/devicetree/bindings/serial/maxim,max310x.txt + delete mode 100644 include/linux/platform_data/max310x.h +Merging usb/usb-next (e8fcbb614059 usb/misc/usbled: Add Riso Kagaku Webmail Notifier) +$ git merge usb/usb-next +Auto-merging drivers/usb/core/driver.c +Removing Documentation/devicetree/bindings/usb/vt8500-ehci.txt +Removing Documentation/devicetree/bindings/usb/via,vt8500-ehci.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/usb/usb-ehci.txt | 27 ++- + Documentation/devicetree/bindings/usb/usb-ohci.txt | 25 +++ + .../devicetree/bindings/usb/via,vt8500-ehci.txt | 15 -- + .../devicetree/bindings/usb/vt8500-ehci.txt | 12 -- + drivers/usb/core/driver.c | 4 +- + drivers/usb/core/hub.c | 19 +- + drivers/usb/dwc2/core_intr.c | 25 ++- + drivers/usb/gadget/Kconfig | 2 +- + drivers/usb/host/Kconfig | 1 - + drivers/usb/host/ehci-platform.c | 182 ++++++++++++++++--- + drivers/usb/host/ohci-platform.c | 199 ++++++++++++++++++--- + drivers/usb/misc/Kconfig | 1 - + drivers/usb/misc/usbled.c | 34 ++++ + drivers/usb/phy/phy-msm-usb.c | 3 +- + 14 files changed, 447 insertions(+), 102 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/usb-ohci.txt + delete mode 100644 Documentation/devicetree/bindings/usb/via,vt8500-ehci.txt + delete mode 100644 Documentation/devicetree/bindings/usb/vt8500-ehci.txt +Merging usb-gadget/next (836a2164491b usb: phy: keystone: remove redundant return value check of platform_get_resource()) +$ git merge usb-gadget/next +Already up-to-date. +Merging staging/staging-next (84f7a542f9e0 staging/bcm: move IOCTL_BCM_TIME_SINCE_NET_ENTRY case out to its own function.) +$ git merge staging/staging-next +Auto-merging include/linux/usb.h +Removing drivers/staging/rtl8192u/r819xU_HTType.h +Removing drivers/staging/rtl8192u/r819xU_HTGen.h +Removing drivers/staging/rtl8192u/ieee80211/scatterwalk.h +Removing drivers/staging/rtl8192u/ieee80211/scatterwalk.c +Removing drivers/staging/rtl8192u/ieee80211/rtl_crypto.h +Removing drivers/staging/rtl8192u/ieee80211/proc.c +Removing drivers/staging/rtl8192u/ieee80211/michael_mic.c +Removing drivers/staging/rtl8192u/ieee80211/internal.h +Removing drivers/staging/rtl8192u/ieee80211/digest.c +Removing drivers/staging/rtl8192u/ieee80211/crypto_compat.h +Removing drivers/staging/rtl8192u/ieee80211/compress.c +Removing drivers/staging/rtl8192u/ieee80211/cipher.c +Removing drivers/staging/rtl8192u/ieee80211/autoload.c +Removing drivers/staging/rtl8192u/ieee80211/arc4.c +Removing drivers/staging/rtl8192u/ieee80211/aes.c +Removing drivers/staging/rtl8192u/ieee80211/EndianFree.h +Removing drivers/staging/rtl8188eu/include/ip.h +Removing drivers/staging/rtl8188eu/include/ioctl_cfg80211.h +Removing drivers/staging/rtl8188eu/include/if_ether.h +Removing drivers/staging/rtl8188eu/include/ethernet.h +Removing drivers/staging/rtl8188eu/hal/odm_interface.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/atmel-adc.txt | 5 + + MAINTAINERS | 6 + + drivers/iio/adc/max1363.c | 10 +- + drivers/iio/adc/ti_am335x_adc.c | 1 - + drivers/iio/adc/twl6030-gpadc.c | 1 - + drivers/iio/adc/viperboard_adc.c | 2 - + drivers/iio/dac/ad7303.c | 2 +- + drivers/iio/dac/max517.c | 1 - + drivers/iio/dac/mcp4725.c | 1 - + drivers/iio/humidity/Kconfig | 10 + + drivers/iio/humidity/Makefile | 1 + + drivers/iio/humidity/si7005.c | 189 ++ + drivers/iio/imu/Kconfig | 4 +- + drivers/iio/imu/adis16400_core.c | 2 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 3 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 38 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c | 1 - + drivers/iio/light/Kconfig | 12 + + drivers/iio/light/Makefile | 1 + + drivers/iio/light/adjd_s311.c | 3 - + drivers/iio/light/ltr501.c | 445 +++ + drivers/iio/light/tcs3472.c | 2 - + drivers/iio/magnetometer/ak8975.c | 1 + + drivers/iio/pressure/mpl3115.c | 2 +- + drivers/staging/Kconfig | 4 + + drivers/staging/Makefile | 2 + + drivers/staging/android/binder.h | 10 +- + drivers/staging/android/ion/ion.c | 14 +- + drivers/staging/android/ion/ion_dummy_driver.c | 12 +- + drivers/staging/android/ion/ion_heap.c | 2 +- + drivers/staging/android/ion/ion_priv.h | 26 +- + drivers/staging/android/sync.h | 2 +- + drivers/staging/android/timed_output.h | 4 +- + drivers/staging/bcm/Bcmchar.c | 3212 +++++++++++--------- + drivers/staging/bcm/DDRInit.c | 28 +- + drivers/staging/ced1401/ced_ioc.c | 151 +- + drivers/staging/ced1401/usb1401.c | 188 +- + drivers/staging/comedi/comedi_fops.c | 8 +- + drivers/staging/comedi/drivers/8255_pci.c | 3 - + drivers/staging/comedi/drivers/adl_pci7x3x.c | 3 - + drivers/staging/comedi/drivers/adl_pci9111.c | 2 - + drivers/staging/comedi/drivers/adl_pci9118.c | 23 - + drivers/staging/comedi/drivers/adv_pci1710.c | 3 - + drivers/staging/comedi/drivers/adv_pci1723.c | 2 - + drivers/staging/comedi/drivers/adv_pci_dio.c | 10 +- + drivers/staging/comedi/drivers/aio_aio12_8.c | 3 - + drivers/staging/comedi/drivers/aio_iiro_16.c | 2 +- + .../staging/comedi/drivers/amplc_dio200_common.c | 2 +- + drivers/staging/comedi/drivers/amplc_pc236.c | 35 +- + drivers/staging/comedi/drivers/amplc_pc263.c | 2 - + drivers/staging/comedi/drivers/amplc_pci224.c | 17 +- + drivers/staging/comedi/drivers/amplc_pci230.c | 8 +- + drivers/staging/comedi/drivers/amplc_pci263.c | 2 - + drivers/staging/comedi/drivers/cb_das16_cs.c | 4 - + drivers/staging/comedi/drivers/cb_pcidas.c | 3 - + drivers/staging/comedi/drivers/cb_pcidas64.c | 13 +- + drivers/staging/comedi/drivers/cb_pcidda.c | 2 - + drivers/staging/comedi/drivers/cb_pcimdas.c | 6 +- + drivers/staging/comedi/drivers/cb_pcimdda.c | 4 +- + drivers/staging/comedi/drivers/comedi_bond.c | 5 +- + drivers/staging/comedi/drivers/contec_pci_dio.c | 2 - + drivers/staging/comedi/drivers/daqboard2000.c | 3 - + drivers/staging/comedi/drivers/das08.c | 7 +- + drivers/staging/comedi/drivers/dt3000.c | 2 - + drivers/staging/comedi/drivers/dyna_pci10xx.c | 2 - + drivers/staging/comedi/drivers/fl512.c | 2 +- + drivers/staging/comedi/drivers/icp_multi.c | 3 - + drivers/staging/comedi/drivers/jr3_pci.c | 2 +- + drivers/staging/comedi/drivers/ke_counter.c | 3 - + drivers/staging/comedi/drivers/me_daq.c | 3 - + drivers/staging/comedi/drivers/mpc624.c | 2 +- + drivers/staging/comedi/drivers/ni_660x.c | 2 +- + drivers/staging/comedi/drivers/ni_670x.c | 3 - + drivers/staging/comedi/drivers/ni_atmio16d.c | 9 +- + drivers/staging/comedi/drivers/ni_daq_700.c | 5 - + drivers/staging/comedi/drivers/ni_mio_common.c | 23 +- + drivers/staging/comedi/drivers/ni_pcimio.c | 2 +- + drivers/staging/comedi/drivers/pcl711.c | 5 +- + drivers/staging/comedi/drivers/pcm3724.c | 6 +- + drivers/staging/comedi/drivers/rtd520.c | 2 - + drivers/staging/comedi/drivers/s526.c | 2 +- + drivers/staging/comedi/drivers/s626.c | 2 - + drivers/staging/comedi/drivers/skel.c | 2 - + drivers/staging/comedi/drivers/ssv_dnp.c | 3 +- + drivers/staging/crystalhd/crystalhd_hw.c | 8 +- + drivers/staging/cxt1e1/functions.c | 9 - + drivers/staging/cxt1e1/pmc93x6_eeprom.c | 6 +- + drivers/staging/cxt1e1/pmcc4.h | 1 - + drivers/staging/dgap/dgap_downld.h | 4 +- + drivers/staging/dgap/dgap_driver.c | 40 +- + drivers/staging/dgap/dgap_driver.h | 27 +- + drivers/staging/dgap/dgap_fep5.c | 37 +- + drivers/staging/dgap/dgap_fep5.h | 46 +- + drivers/staging/dgap/dgap_parse.c | 16 +- + drivers/staging/dgap/dgap_sysfs.c | 14 +- + drivers/staging/dgap/dgap_sysfs.h | 2 +- + drivers/staging/dgap/dgap_tty.c | 26 +- + drivers/staging/dgap/digi.h | 24 +- + drivers/staging/et131x/et131x.c | 10 +- + drivers/staging/gs_fpgaboot/Kconfig | 8 + + drivers/staging/gs_fpgaboot/Makefile | 4 + + drivers/staging/gs_fpgaboot/README | 71 + + drivers/staging/gs_fpgaboot/TODO | 7 + + drivers/staging/gs_fpgaboot/gs_fpgaboot.c | 425 +++ + drivers/staging/gs_fpgaboot/gs_fpgaboot.h | 56 + + drivers/staging/gs_fpgaboot/io.c | 294 ++ + drivers/staging/gs_fpgaboot/io.h | 90 + + drivers/staging/iio/accel/sca3000.h | 26 +- + drivers/staging/iio/accel/sca3000_core.c | 172 +- + drivers/staging/iio/adc/mxs-lradc.c | 4 - + drivers/staging/imx-drm/imx-hdmi.c | 21 +- + .../staging/lustre/include/linux/libcfs/curproc.h | 9 - + drivers/staging/lustre/lustre/include/lclient.h | 2 +- + .../lustre/lustre/include/lustre/lustre_idl.h | 49 +- + .../lustre/lustre/include/lustre/lustre_user.h | 18 +- + drivers/staging/lustre/lustre/include/lustre_cfg.h | 2 + + .../staging/lustre/lustre/include/lustre_disk.h | 2 + + .../lustre/lustre/include/lustre_dlm_flags.h | 14 +- + drivers/staging/lustre/lustre/include/lustre_mdc.h | 11 + + drivers/staging/lustre/lustre/include/obd_class.h | 9 +- + drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 41 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 2 - + .../lustre/lustre/libcfs/linux/linux-curproc.c | 57 +- + .../lustre/lustre/libcfs/linux/linux-module.c | 4 +- + drivers/staging/lustre/lustre/llite/dcache.c | 40 +- + drivers/staging/lustre/lustre/llite/dir.c | 31 +- + drivers/staging/lustre/lustre/llite/file.c | 35 +- + .../staging/lustre/lustre/llite/llite_internal.h | 24 +- + drivers/staging/lustre/lustre/llite/llite_lib.c | 22 +- + drivers/staging/lustre/lustre/llite/llite_nfs.c | 6 +- + drivers/staging/lustre/lustre/llite/namei.c | 44 +- + drivers/staging/lustre/lustre/llite/rw.c | 2 +- + drivers/staging/lustre/lustre/llite/statahead.c | 12 +- + drivers/staging/lustre/lustre/llite/vvp_io.c | 31 +- + drivers/staging/lustre/lustre/llite/xattr.c | 31 +- + drivers/staging/lustre/lustre/llite/xattr_cache.c | 117 +- + drivers/staging/lustre/lustre/lov/lov_object.c | 10 +- + drivers/staging/lustre/lustre/lov/lovsub_dev.c | 4 + + drivers/staging/lustre/lustre/mdc/mdc_internal.h | 2 +- + drivers/staging/lustre/lustre/mdc/mdc_lib.c | 2 +- + drivers/staging/lustre/lustre/mdc/mdc_locks.c | 9 +- + drivers/staging/lustre/lustre/mdc/mdc_reint.c | 2 +- + drivers/staging/lustre/lustre/mdc/mdc_request.c | 30 +- + drivers/staging/lustre/lustre/mgc/mgc_request.c | 90 +- + .../lustre/lustre/obdclass/linux/linux-module.c | 2 +- + drivers/staging/lustre/lustre/obdclass/llog_cat.c | 6 +- + .../lustre/lustre/obdclass/lprocfs_status.c | 1 + + .../staging/lustre/lustre/obdclass/obd_config.c | 47 +- + drivers/staging/lustre/lustre/obdclass/obdo.c | 4 +- + .../staging/lustre/lustre/obdecho/echo_client.c | 16 +- + drivers/staging/lustre/lustre/osc/osc_cache.c | 4 +- + drivers/staging/lustre/lustre/osc/osc_io.c | 2 +- + drivers/staging/lustre/lustre/osc/osc_page.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/client.c | 32 +- + drivers/staging/lustre/lustre/ptlrpc/events.c | 2 +- + .../lustre/lustre/ptlrpc/gss/gss_cli_upcall.c | 2 +- + .../staging/lustre/lustre/ptlrpc/gss/gss_keyring.c | 2 +- + .../lustre/lustre/ptlrpc/gss/gss_krb5_mech.c | 1 - + .../staging/lustre/lustre/ptlrpc/gss/gss_pipefs.c | 4 +- + .../lustre/lustre/ptlrpc/gss/gss_svc_upcall.c | 4 +- + drivers/staging/lustre/lustre/ptlrpc/gss/sec_gss.c | 14 +- + drivers/staging/lustre/lustre/ptlrpc/import.c | 4 +- + drivers/staging/lustre/lustre/ptlrpc/layout.c | 5 +- + .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 4 +- + drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 4 +- + drivers/staging/lustre/lustre/ptlrpc/nrs.c | 4 +- + .../staging/lustre/lustre/ptlrpc/pack_generic.c | 14 +- + drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 4 +- + drivers/staging/lustre/lustre/ptlrpc/sec.c | 14 +- + drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/service.c | 12 +- + drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 2 + + drivers/staging/nokia_h4p/Kconfig | 9 + + drivers/staging/nokia_h4p/Makefile | 6 + + drivers/staging/nokia_h4p/TODO | 140 + + drivers/staging/nokia_h4p/hci_h4p.h | 228 ++ + drivers/staging/nokia_h4p/nokia_core.c | 1205 ++++++++ + drivers/staging/nokia_h4p/nokia_fw-bcm.c | 147 + + drivers/staging/nokia_h4p/nokia_fw-csr.c | 150 + + drivers/staging/nokia_h4p/nokia_fw-ti1273.c | 110 + + drivers/staging/nokia_h4p/nokia_fw.c | 195 ++ + drivers/staging/nokia_h4p/nokia_uart.c | 199 ++ + drivers/staging/olpc_dcon/olpc_dcon.h | 2 +- + drivers/staging/ozwpan/ozproto.c | 42 +- + drivers/staging/rtl8188eu/Kconfig | 4 +- + drivers/staging/rtl8188eu/Makefile | 1 - + drivers/staging/rtl8188eu/core/rtw_ap.c | 64 +- + drivers/staging/rtl8188eu/core/rtw_cmd.c | 114 +- + drivers/staging/rtl8188eu/core/rtw_debug.c | 6 +- + drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 55 +- + drivers/staging/rtl8188eu/core/rtw_io.c | 28 - + drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 31 +- + drivers/staging/rtl8188eu/core/rtw_mlme.c | 228 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 90 +- + drivers/staging/rtl8188eu/core/rtw_mp.c | 5 +- + drivers/staging/rtl8188eu/core/rtw_mp_ioctl.c | 78 - + drivers/staging/rtl8188eu/core/rtw_p2p.c | 50 +- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 25 - + drivers/staging/rtl8188eu/core/rtw_recv.c | 170 +- + drivers/staging/rtl8188eu/core/rtw_security.c | 75 +- + drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 83 +- + drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 44 +- + drivers/staging/rtl8188eu/core/rtw_xmit.c | 123 +- + .../staging/rtl8188eu/hal/Hal8188ERateAdaptive.c | 13 +- + drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c | 37 +- + drivers/staging/rtl8188eu/hal/hal_intf.c | 4 - + drivers/staging/rtl8188eu/hal/odm.c | 15 +- + drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c | 4 +- + drivers/staging/rtl8188eu/hal/odm_interface.c | 101 - + drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 12 - + drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 2 - + drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 7 +- + drivers/staging/rtl8188eu/hal/rtl8188e_mp.c | 4 +- + drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c | 4 +- + drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 3 - + drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 6 +- + drivers/staging/rtl8188eu/hal/usb_halinit.c | 10 - + drivers/staging/rtl8188eu/hal/usb_ops_linux.c | 23 +- + drivers/staging/rtl8188eu/include/ethernet.h | 42 - + drivers/staging/rtl8188eu/include/if_ether.h | 111 - + drivers/staging/rtl8188eu/include/ioctl_cfg80211.h | 107 - + drivers/staging/rtl8188eu/include/ip.h | 126 - + drivers/staging/rtl8188eu/include/odm_interface.h | 23 - + drivers/staging/rtl8188eu/include/osdep_service.h | 16 - + drivers/staging/rtl8188eu/include/rtw_debug.h | 14 - + drivers/staging/rtl8188eu/include/rtw_io.h | 44 - + drivers/staging/rtl8188eu/include/rtw_ioctl.h | 2 - + drivers/staging/rtl8188eu/include/rtw_mlme.h | 32 - + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 143 +- + drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 9 +- + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 4 - + drivers/staging/rtl8188eu/os_dep/osdep_service.c | 35 +- + drivers/staging/rtl8188eu/os_dep/recv_linux.c | 8 +- + drivers/staging/rtl8188eu/os_dep/rtw_android.c | 1 - + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 19 +- + drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 5 - + drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 17 +- + drivers/staging/rtl8192u/ieee80211/EndianFree.h | 194 -- + drivers/staging/rtl8192u/ieee80211/aes.c | 468 --- + drivers/staging/rtl8192u/ieee80211/arc4.c | 103 - + drivers/staging/rtl8192u/ieee80211/autoload.c | 40 - + drivers/staging/rtl8192u/ieee80211/cipher.c | 298 -- + drivers/staging/rtl8192u/ieee80211/compress.c | 64 - + drivers/staging/rtl8192u/ieee80211/crypto_compat.h | 58 - + drivers/staging/rtl8192u/ieee80211/digest.c | 108 - + drivers/staging/rtl8192u/ieee80211/internal.h | 81 - + drivers/staging/rtl8192u/ieee80211/michael_mic.c | 194 -- + drivers/staging/rtl8192u/ieee80211/proc.c | 112 - + drivers/staging/rtl8192u/ieee80211/rtl_crypto.h | 398 --- + drivers/staging/rtl8192u/ieee80211/scatterwalk.c | 117 - + drivers/staging/rtl8192u/ieee80211/scatterwalk.h | 51 - + drivers/staging/rtl8192u/r819xU_HTGen.h | 12 - + drivers/staging/rtl8192u/r819xU_HTType.h | 379 --- + drivers/staging/rtl8821ae/base.c | 140 +- + drivers/staging/rtl8821ae/btcoexist/halbtcoutsrc.c | 10 - + drivers/staging/rtl8821ae/pci.c | 250 +- + drivers/staging/rtl8821ae/regd.h | 4 +- + drivers/staging/rtl8821ae/rtl8821ae/trx.c | 2 +- + drivers/staging/rtl8821ae/wifi.h | 450 +-- + drivers/staging/sbe-2t3e3/module.c | 2 +- + drivers/staging/silicom/bp_mod.h | 2 - + drivers/staging/silicom/bpctl_mod.c | 604 +--- + drivers/staging/silicom/bypasslib/bp_ioctl.h | 4 +- + drivers/staging/slicoss/README | 40 - + drivers/staging/slicoss/TODO | 38 + + drivers/staging/slicoss/slicoss.c | 2 +- + drivers/staging/usbip/stub.h | 2 +- + drivers/staging/usbip/stub_dev.c | 150 +- + drivers/staging/usbip/stub_main.c | 6 +- + drivers/staging/usbip/stub_rx.c | 2 +- + drivers/staging/usbip/usbip_common.c | 22 +- + .../staging/usbip/userspace/libsrc/usbip_common.c | 2 + + .../staging/usbip/userspace/libsrc/usbip_common.h | 8 +- + .../usbip/userspace/libsrc/usbip_host_driver.c | 45 +- + drivers/staging/usbip/userspace/src/usbip_bind.c | 142 +- + drivers/staging/usbip/userspace/src/usbip_list.c | 19 +- + drivers/staging/usbip/userspace/src/usbip_unbind.c | 51 +- + drivers/staging/usbip/userspace/src/usbipd.c | 15 - + drivers/staging/usbip/vhci_hcd.c | 2 - + drivers/staging/usbip/vhci_sysfs.c | 5 +- + drivers/staging/vt6656/main_usb.c | 2 +- + drivers/usb/core/generic.c | 1 + + drivers/usb/core/message.c | 1 + + include/linux/platform_data/bt-nokia-h4p.h | 38 + + include/linux/usb.h | 4 + + 286 files changed, 7999 insertions(+), 8538 deletions(-) + create mode 100644 drivers/iio/humidity/si7005.c + create mode 100644 drivers/iio/light/ltr501.c + create mode 100644 drivers/staging/gs_fpgaboot/Kconfig + create mode 100644 drivers/staging/gs_fpgaboot/Makefile + create mode 100644 drivers/staging/gs_fpgaboot/README + create mode 100644 drivers/staging/gs_fpgaboot/TODO + create mode 100644 drivers/staging/gs_fpgaboot/gs_fpgaboot.c + create mode 100644 drivers/staging/gs_fpgaboot/gs_fpgaboot.h + create mode 100644 drivers/staging/gs_fpgaboot/io.c + create mode 100644 drivers/staging/gs_fpgaboot/io.h + create mode 100644 drivers/staging/nokia_h4p/Kconfig + create mode 100644 drivers/staging/nokia_h4p/Makefile + create mode 100644 drivers/staging/nokia_h4p/TODO + create mode 100644 drivers/staging/nokia_h4p/hci_h4p.h + create mode 100644 drivers/staging/nokia_h4p/nokia_core.c + create mode 100644 drivers/staging/nokia_h4p/nokia_fw-bcm.c + create mode 100644 drivers/staging/nokia_h4p/nokia_fw-csr.c + create mode 100644 drivers/staging/nokia_h4p/nokia_fw-ti1273.c + create mode 100644 drivers/staging/nokia_h4p/nokia_fw.c + create mode 100644 drivers/staging/nokia_h4p/nokia_uart.c + delete mode 100644 drivers/staging/rtl8188eu/hal/odm_interface.c + delete mode 100644 drivers/staging/rtl8188eu/include/ethernet.h + delete mode 100644 drivers/staging/rtl8188eu/include/if_ether.h + delete mode 100644 drivers/staging/rtl8188eu/include/ioctl_cfg80211.h + delete mode 100644 drivers/staging/rtl8188eu/include/ip.h + delete mode 100644 drivers/staging/rtl8192u/ieee80211/EndianFree.h + delete mode 100644 drivers/staging/rtl8192u/ieee80211/aes.c + delete mode 100644 drivers/staging/rtl8192u/ieee80211/arc4.c + delete mode 100644 drivers/staging/rtl8192u/ieee80211/autoload.c + delete mode 100644 drivers/staging/rtl8192u/ieee80211/cipher.c + delete mode 100644 drivers/staging/rtl8192u/ieee80211/compress.c + delete mode 100644 drivers/staging/rtl8192u/ieee80211/crypto_compat.h + delete mode 100644 drivers/staging/rtl8192u/ieee80211/digest.c + delete mode 100644 drivers/staging/rtl8192u/ieee80211/internal.h + delete mode 100644 drivers/staging/rtl8192u/ieee80211/michael_mic.c + delete mode 100644 drivers/staging/rtl8192u/ieee80211/proc.c + delete mode 100644 drivers/staging/rtl8192u/ieee80211/rtl_crypto.h + delete mode 100644 drivers/staging/rtl8192u/ieee80211/scatterwalk.c + delete mode 100644 drivers/staging/rtl8192u/ieee80211/scatterwalk.h + delete mode 100644 drivers/staging/rtl8192u/r819xU_HTGen.h + delete mode 100644 drivers/staging/rtl8192u/r819xU_HTType.h + create mode 100644 drivers/staging/slicoss/TODO + create mode 100644 include/linux/platform_data/bt-nokia-h4p.h +Merging char-misc/char-misc-next (7841b647b9c1 Revert ds1wm.c from "w1: hold bus_mutex in netlink and search") +$ git merge char-misc/char-misc-next +Auto-merging include/linux/hyperv.h +Auto-merging drivers/misc/eeprom/sunxi_sid.c +Auto-merging drivers/char/hw_random/core.c +Merge made by the 'recursive' strategy. + Documentation/DocBook/Makefile | 2 +- + Documentation/DocBook/w1.tmpl | 101 +++ + Documentation/connector/cn_test.c | 2 +- + Documentation/w1/masters/ds2490 | 2 - + Documentation/w1/w1.netlink | 8 +- + drivers/char/agp/frontend.c | 1 - + drivers/char/agp/generic.c | 1 - + drivers/char/agp/intel-gtt.c | 1 - + drivers/char/agp/sgi-agp.c | 1 - + drivers/char/hw_random/bcm2835-rng.c | 1 - + drivers/char/hw_random/core.c | 1 - + drivers/char/hw_random/exynos-rng.c | 1 - + drivers/char/hw_random/n2-drv.c | 1 - + drivers/char/hw_random/nomadik-rng.c | 1 - + drivers/char/hw_random/octeon-rng.c | 1 - + drivers/char/ipmi/ipmi_si_intf.c | 1 - + drivers/char/mwave/3780i.c | 1 - + drivers/char/tile-srom.c | 1 - + drivers/char/tpm/tpm_i2c_infineon.c | 1 - + drivers/char/tpm/tpm_i2c_stm_st33.c | 1 - + drivers/connector/cn_proc.c | 18 +- + drivers/connector/connector.c | 20 +- + drivers/hv/channel.c | 42 +- + drivers/hv/hv_kvp.c | 4 +- + drivers/hv/hv_snapshot.c | 2 +- + drivers/hv/hyperv_vmbus.h | 4 +- + drivers/hv/ring_buffer.c | 17 +- + drivers/hv/vmbus_drv.c | 45 +- + drivers/md/dm-log-userspace-transfer.c | 2 +- + drivers/misc/ad525x_dpot.c | 1 - + drivers/misc/apds9802als.c | 1 - + drivers/misc/bmp085.c | 1 - + drivers/misc/carma/carma-fpga.c | 1 - + drivers/misc/ds1682.c | 1 - + drivers/misc/eeprom/at25.c | 1 - + drivers/misc/eeprom/eeprom.c | 1 - + drivers/misc/eeprom/eeprom_93xx46.c | 1 - + drivers/misc/eeprom/max6875.c | 1 - + drivers/misc/eeprom/sunxi_sid.c | 1 - + drivers/misc/genwqe/card_debugfs.c | 1 - + drivers/misc/hmc6352.c | 1 - + drivers/misc/isl29003.c | 1 - + drivers/misc/isl29020.c | 1 - + drivers/misc/lattice-ecp3-config.c | 1 - + drivers/misc/lis3lv02d/lis3lv02d.c | 1 - + drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 1 - + drivers/misc/lis3lv02d/lis3lv02d_spi.c | 1 - + drivers/misc/mei/Kconfig | 9 + + drivers/misc/mei/Makefile | 6 +- + drivers/misc/mei/amthif.c | 1 - + drivers/misc/mei/debugfs.c | 54 ++ + drivers/misc/mei/hbm.c | 2 +- + drivers/misc/mei/hw-me.c | 2 +- + drivers/misc/mei/hw-txe-regs.h | 294 +++++++++ + drivers/misc/mei/hw-txe.c | 1106 ++++++++++++++++++++++++++++++++ + drivers/misc/mei/hw-txe.h | 71 ++ + drivers/misc/mei/hw.h | 4 +- + drivers/misc/mei/init.c | 40 +- + drivers/misc/mei/pci-me.c | 1 - + drivers/misc/mei/pci-txe.c | 293 +++++++++ + drivers/misc/sram.c | 2 - + drivers/misc/ti-st/st_core.c | 1 - + drivers/misc/ti_dac7512.c | 1 - + drivers/misc/tsl2550.c | 1 - + drivers/video/uvesafb.c | 4 +- + drivers/w1/masters/ds2490.c | 155 +++-- + drivers/w1/slaves/w1_therm.c | 21 +- + drivers/w1/w1.c | 269 ++++++-- + drivers/w1/w1.h | 186 ++++-- + drivers/w1/w1_family.c | 8 + + drivers/w1/w1_family.h | 13 + + drivers/w1/w1_int.c | 25 +- + drivers/w1/w1_io.c | 102 +-- + drivers/w1/w1_netlink.c | 359 ++++++++--- + drivers/w1/w1_netlink.h | 33 +- + include/linux/connector.h | 2 +- + include/linux/hyperv.h | 340 +--------- + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/hyperv.h | 344 ++++++++++ + 79 files changed, 3308 insertions(+), 744 deletions(-) + create mode 100644 Documentation/DocBook/w1.tmpl + create mode 100644 drivers/misc/mei/hw-txe-regs.h + create mode 100644 drivers/misc/mei/hw-txe.c + create mode 100644 drivers/misc/mei/hw-txe.h + create mode 100644 drivers/misc/mei/pci-txe.c + create mode 100644 include/uapi/linux/hyperv.h +Merging cgroup/for-next (32a59a5d33ce Merge branch 'for-3.15' into for-next) +$ git merge cgroup/for-next +Auto-merging mm/memory-failure.c +Auto-merging kernel/sched/debug.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/events/core.c +Auto-merging fs/kernfs/dir.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 + + arch/arm/mach-tegra/pm.c | 1 + + arch/sparc/kernel/leon_pci_grpci2.c | 1 + + arch/sparc/kernel/sun4m_irq.c | 2 + + block/blk-cgroup.c | 11 +- + block/blk-cgroup.h | 14 +- + block/blk-throttle.c | 4 - + block/cfq-iosched.c | 3 - + fs/bio.c | 2 +- + fs/kernfs/dir.c | 1 + + fs/nfs/nfs3proc.c | 1 + + include/linux/cgroup.h | 223 ++- + include/linux/cgroup_subsys.h | 30 +- + include/linux/hugetlb_cgroup.h | 2 +- + include/linux/memcontrol.h | 2 +- + include/net/cls_cgroup.h | 2 +- + include/net/netprio_cgroup.h | 17 +- + init/Kconfig | 1 + + kernel/cgroup.c | 2880 ++++++++++++----------------------- + kernel/cgroup_freezer.c | 10 +- + kernel/cpuset.c | 236 +-- + kernel/events/core.c | 25 +- + kernel/power/console.c | 1 + + kernel/sched/core.c | 10 +- + kernel/sched/cpuacct.c | 6 +- + kernel/sched/debug.c | 3 +- + mm/hugetlb_cgroup.c | 9 +- + mm/memcontrol.c | 106 +- + mm/memory-failure.c | 8 +- + mm/vmpressure.c | 1 + + net/Kconfig | 2 +- + net/core/netclassid_cgroup.c | 15 +- + net/core/netprio_cgroup.c | 39 +- + net/ipv4/tcp_memcontrol.c | 2 +- + security/device_cgroup.c | 8 +- + 35 files changed, 1287 insertions(+), 2393 deletions(-) +Merging scsi/for-next (3ce438df1068 [SCSI] hpsa: allow SCSI mid layer to handle unit attention) +$ git merge scsi/for-next +Already up-to-date. +Merging target-updates/for-next (5259a06ef970 target: Fix percpu_ref_put race in transport_lun_remove_cmd) +$ git merge target-updates/for-next +Already up-to-date. +Merging target-merge/for-next-merge (374b105797c3 Linux 3.13-rc3) +$ 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 (97e00faaf16a pinctrl: sh-pfc: r8a7790: Break out USB0 OVC/VBUS) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pinctrl/pinctrl-single.txt | 7 + + .../devicetree/bindings/pinctrl/pinctrl-st.txt | 73 ++++- + .../bindings/pinctrl/samsung-pinctrl.txt | 1 + + arch/blackfin/include/asm/irq.h | 9 - + drivers/pinctrl/pinctrl-adi2.c | 19 +- + drivers/pinctrl/pinctrl-at91.c | 27 ++ + drivers/pinctrl/pinctrl-exynos.c | 82 +++++ + drivers/pinctrl/pinctrl-msm.c | 27 ++ + drivers/pinctrl/pinctrl-samsung.c | 2 + + drivers/pinctrl/pinctrl-samsung.h | 1 + + drivers/pinctrl/pinctrl-single.c | 3 + + drivers/pinctrl/pinctrl-st.c | 337 ++++++++++++++++++++- + drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 9 + + drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 63 ++++ + drivers/pinctrl/sirf/pinctrl-atlas6.c | 43 +++ + 15 files changed, 683 insertions(+), 20 deletions(-) +Merging vhost/linux-next (d3d665a654a3 vhost-scsi: whitespace tweak) +$ git merge vhost/linux-next +Already up-to-date. +Merging remoteproc/for-next (b9777859ec01 remoteproc: fix kconfig dependencies for VIRTIO) +$ 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 (a3485d088516 gpio: consumer.h: Move forward declarations outside #ifdef) +$ git merge gpio/for-next +Already up-to-date. +Merging dma-mapping/dma-mapping-next (d8ec26d7f828 Linux 3.13) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (6691a19966f0 pwm: tiecap: Remove duplicate put_sync call) +$ git merge pwm/for-next +Already up-to-date. +Merging dma-buf/for-next (c0b00a525c12 dma-buf: update debugfs output) +$ git merge dma-buf/for-next +Auto-merging drivers/base/dma-buf.c +Merge made by the 'recursive' strategy. + drivers/base/dma-buf.c | 25 ++++++++++++------------- + include/linux/dma-buf.h | 2 +- + 2 files changed, 13 insertions(+), 14 deletions(-) +Merging userns/for-next (f58437f1f916 MIPS: VPE: Remove vpe_getuid and vpe_getgid) +$ git merge userns/for-next +Already up-to-date. +Merging ktest/for-next (961d9caceea2 ktest: Add BISECT_TRIES to bisect test) +$ git merge ktest/for-next +Already up-to-date. +Merging signal/for-next (20b4fb485227 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge signal/for-next +Already up-to-date. +Merging clk/clk-next (fd3fdaf09f26 clk: sort Makefile) +$ git merge clk/clk-next +Already up-to-date. +Merging random/dev (a9f069e38cc3 random: use the architectural HWRNG for the SHA's IV in extract_buf()) +$ git merge random/dev +Merge made by the 'recursive' strategy. + drivers/char/random.c | 192 ++++++++++++++++++++++---------------------------- + 1 file changed, 84 insertions(+), 108 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 arm64-hugepages/for-next/hugepages (af07484863e0 ARM64: mm: THP support.) +$ git merge arm64-hugepages/for-next/hugepages +Already up-to-date. +Merging aio/master (4675348e78fa Merge tag 'stable/for-linus-3.14-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip) +$ git merge aio/master +Already up-to-date. +Merging akpm-current/current (c28515337902 drivers/misc/sgi-gru/grukdump.c: cleanup gru_dump_context() a little) +$ git merge --no-ff akpm-current/current +Recorded preimage for 'kernel/cpuset.c' +Recorded preimage for 'mm/memcontrol.c' +Auto-merging net/core/rtnetlink.c +Auto-merging mm/mempolicy.c +Auto-merging mm/memcontrol.c +CONFLICT (content): Merge conflict in mm/memcontrol.c +Auto-merging kernel/sysctl.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/cpuset.c +CONFLICT (content): Merge conflict in kernel/cpuset.c +Auto-merging include/linux/fs.h +Auto-merging fs/nfs/inode.c +Auto-merging fs/fuse/inode.c +Auto-merging fs/f2fs/inode.c +Auto-merging drivers/staging/lustre/lustre/llite/llite_lib.c +Auto-merging drivers/misc/ti-st/st_core.c +Auto-merging drivers/leds/Kconfig +Removing arch/arm/include/asm/system.h +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'kernel/cpuset.c'. +Recorded resolution for 'mm/memcontrol.c'. +[master 6575bab5dff8] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-block-zram | 24 +- + Documentation/DocBook/kernel-hacking.tmpl | 2 +- + Documentation/blockdev/zram.txt | 8 +- + Documentation/filesystems/nilfs2.txt | 7 + + Documentation/filesystems/porting | 6 +- + Documentation/filesystems/vfat.txt | 10 + + Documentation/irqflags-tracing.txt | 7 - + Documentation/leds/leds-class.txt | 3 - + Documentation/printk-formats.txt | 6 + + Documentation/scheduler/sched-arch.txt | 2 +- + Documentation/sysctl/vm.txt | 33 +- + MAINTAINERS | 6 +- + arch/arm/include/asm/fixmap.h | 29 +- + arch/arm/include/asm/jump_label.h | 1 - + arch/arm/include/asm/sync_bitops.h | 1 - + arch/arm/include/asm/system.h | 7 - + arch/arm/mach-gemini/idle.c | 2 +- + arch/arm/mach-omap2/am35xx-emac.c | 1 - + arch/arm/mm/init.c | 2 +- + arch/powerpc/include/asm/fadump.h | 1 - + arch/powerpc/mm/subpage-prot.c | 6 +- + arch/um/kernel/process.c | 2 +- + block/genhd.c | 2 +- + drivers/block/zram/zram_drv.c | 175 +++------ + drivers/block/zram/zram_drv.h | 10 +- + drivers/fmc/fmc-write-eeprom.c | 2 +- + drivers/input/Kconfig | 9 + + drivers/input/Makefile | 3 + + drivers/input/input.c | 6 + + drivers/input/leds.c | 249 ++++++++++++ + drivers/iommu/omap-iommu-debug.c | 4 +- + drivers/leds/Kconfig | 3 - + drivers/misc/sgi-gru/grukdump.c | 6 +- + drivers/misc/ti-st/st_core.c | 2 +- + drivers/net/irda/donauboe.c | 15 +- + drivers/pps/pps.c | 57 +-- + drivers/rtc/rtc-at32ap700x.c | 4 +- + drivers/rtc/rtc-coh901331.c | 18 +- + drivers/rtc/rtc-da9052.c | 4 +- + drivers/rtc/rtc-davinci.c | 33 +- + drivers/rtc/rtc-ds1390.c | 5 +- + drivers/rtc/rtc-imxdi.c | 4 +- + drivers/rtc/rtc-isl12057.c | 1 - + drivers/rtc/rtc-jz4740.c | 25 +- + drivers/rtc/rtc-lpc32xx.c | 5 +- + drivers/rtc/rtc-moxart.c | 4 +- + drivers/rtc/rtc-nuc900.c | 5 +- + drivers/rtc/rtc-pm8xxx.c | 4 +- + drivers/rtc/rtc-rx8025.c | 1 - + drivers/rtc/rtc-sirfsoc.c | 6 +- + drivers/rtc/rtc-spear.c | 4 +- + drivers/rtc/rtc-vt8500.c | 28 +- + drivers/sbus/char/jsflash.c | 4 +- + drivers/scsi/megaraid/megaraid_mm.c | 2 + + drivers/staging/lustre/lustre/llite/llite_lib.c | 2 +- + drivers/tty/Kconfig | 4 + + drivers/tty/vt/keyboard.c | 110 ++++-- + drivers/usb/gadget/lpc32xx_udc.c | 1 - + drivers/video/backlight/aat2870_bl.c | 2 - + drivers/video/backlight/adp8860_bl.c | 4 +- + drivers/video/backlight/adp8870_bl.c | 4 +- + drivers/video/backlight/backlight.c | 30 +- + drivers/video/backlight/corgi_lcd.c | 4 +- + drivers/video/backlight/hx8357.c | 4 +- + drivers/video/backlight/ili922x.c | 4 +- + drivers/video/backlight/ili9320.c | 4 +- + drivers/video/backlight/l4f00242t03.c | 5 +- + drivers/video/backlight/lm3533_bl.c | 5 +- + drivers/video/backlight/lms283gf05.c | 4 +- + drivers/video/backlight/platform_lcd.c | 4 +- + drivers/video/backlight/tps65217_bl.c | 5 +- + fs/9p/vfs_inode.c | 2 +- + fs/adfs/super.c | 2 +- + fs/affs/inode.c | 2 +- + fs/afs/inode.c | 2 +- + fs/bfs/inode.c | 2 +- + fs/binfmt_elf.c | 21 +- + fs/block_dev.c | 4 +- + fs/btrfs/compression.c | 2 +- + fs/btrfs/inode.c | 2 +- + fs/cachefiles/rdwr.c | 33 +- + fs/cifs/cifsfs.c | 4 +- + fs/coda/inode.c | 2 +- + fs/cramfs/inode.c | 3 +- + fs/drop_caches.c | 16 +- + fs/ecryptfs/super.c | 2 +- + fs/efs/super.c | 2 +- + fs/exofs/inode.c | 2 +- + fs/ext2/inode.c | 2 +- + fs/ext3/inode.c | 2 +- + fs/ext4/inode.c | 4 +- + fs/f2fs/inode.c | 2 +- + fs/fat/cache.c | 19 +- + fs/fat/fat.h | 6 +- + fs/fat/file.c | 78 +++- + fs/fat/inode.c | 59 ++- + fs/freevxfs/vxfs_inode.c | 2 +- + fs/fuse/inode.c | 2 +- + fs/gfs2/super.c | 2 +- + fs/hfs/inode.c | 2 +- + fs/hfsplus/catalog.c | 41 ++ + fs/hfsplus/hfsplus_fs.h | 1 + + fs/hfsplus/hfsplus_raw.h | 6 +- + fs/hfsplus/inode.c | 9 + + fs/hfsplus/super.c | 2 +- + fs/hostfs/hostfs_kern.c | 2 +- + fs/hpfs/inode.c | 2 +- + fs/hugetlbfs/inode.c | 17 +- + fs/inode.c | 4 +- + fs/jffs2/fs.c | 13 +- + fs/jffs2/nodemgmt.c | 14 +- + fs/jffs2/readinode.c | 3 + + fs/jfs/inode.c | 4 +- + fs/kernfs/inode.c | 2 +- + fs/logfs/readwrite.c | 2 +- + fs/minix/inode.c | 4 +- + fs/ncpfs/dir.c | 65 ++-- + fs/ncpfs/file.c | 24 +- + fs/ncpfs/getopt.c | 12 +- + fs/ncpfs/inode.c | 34 +- + fs/ncpfs/ioctl.c | 17 +- + fs/ncpfs/mmap.c | 2 +- + fs/ncpfs/ncp_fs.h | 30 +- + fs/ncpfs/ncplib_kernel.c | 28 +- + fs/ncpfs/sock.c | 49 +-- + fs/ncpfs/symlink.c | 2 +- + fs/nfs/blocklayout/blocklayout.c | 2 +- + fs/nfs/inode.c | 2 +- + fs/nfs/nfs4super.c | 2 +- + fs/nilfs2/inode.c | 6 +- + fs/nilfs2/ioctl.c | 92 +++++ + fs/nilfs2/sufile.c | 131 +++++++ + fs/nilfs2/sufile.h | 1 + + fs/notify/fanotify/fanotify.c | 58 ++- + fs/notify/fanotify/fanotify.h | 31 +- + fs/notify/fanotify/fanotify_user.c | 190 ++++------ + fs/ntfs/inode.c | 2 +- + fs/ocfs2/cluster/tcp.c | 35 +- + fs/ocfs2/dlm/dlmdomain.c | 6 +- + fs/ocfs2/file.c | 11 +- + fs/ocfs2/inode.c | 4 +- + fs/ocfs2/namei.c | 109 +++++- + fs/omfs/inode.c | 2 +- + fs/proc/inode.c | 2 +- + fs/proc/task_mmu.c | 267 ++++++------- + fs/proc/vmcore.c | 1 - + fs/reiserfs/inode.c | 2 +- + fs/reiserfs/reiserfs.h | 1 + + fs/reiserfs/super.c | 1 - + fs/sysv/inode.c | 2 +- + fs/ubifs/super.c | 2 +- + fs/udf/inode.c | 4 +- + fs/udf/super.c | 2 +- + fs/ufs/balloc.c | 42 +- + fs/ufs/ialloc.c | 21 +- + fs/ufs/inode.c | 2 +- + fs/ufs/super.c | 21 +- + fs/ufs/ufs.h | 1 - + fs/xfs/xfs_super.c | 2 +- + include/linux/backlight.h | 6 + + include/linux/cpuset.h | 27 +- + include/linux/crash_dump.h | 1 + + include/linux/crc64_ecma.h | 56 +++ + include/linux/fs.h | 1 + + include/linux/fsnotify_backend.h | 2 +- + include/linux/hugetlb.h | 10 + + include/linux/input.h | 21 + + include/linux/ipc_namespace.h | 2 - + include/linux/kthread.h | 1 + + include/linux/list_lru.h | 8 +- + include/linux/mm.h | 35 +- + include/linux/mm_types.h | 3 +- + include/linux/mmzone.h | 6 + + include/linux/nilfs2_fs.h | 44 +++ + include/linux/pagemap.h | 43 ++- + include/linux/pagevec.h | 3 + + include/linux/radix-tree.h | 55 ++- + include/linux/shmem_fs.h | 1 + + include/linux/string.h | 1 + + include/linux/swap.h | 36 ++ + include/linux/syscalls.h | 2 + + include/linux/vm_event_item.h | 1 + + include/linux/vmstat.h | 17 +- + init/do_mounts.c | 4 +- + ipc/mq_sysctl.c | 18 +- + ipc/mqueue.c | 6 +- + kernel/cpuset.c | 2 +- + kernel/fork.c | 3 +- + kernel/hung_task.c | 3 +- + kernel/kallsyms.c | 11 +- + kernel/kexec.c | 9 +- + kernel/kmod.c | 11 +- + kernel/ksysfs.c | 5 +- + kernel/kthread.c | 13 +- + kernel/panic.c | 13 +- + kernel/power/power.h | 3 +- + kernel/power/snapshot.c | 3 +- + kernel/power/suspend.c | 5 +- + kernel/power/swap.c | 2 +- + kernel/profile.c | 2 +- + kernel/sched/clock.c | 3 +- + kernel/sched/core.c | 3 +- + kernel/sched/stats.c | 2 +- + kernel/signal.c | 4 +- + kernel/sysctl.c | 4 +- + kernel/time/sched_clock.c | 4 + + kernel/time/timekeeping.c | 5 +- + kernel/trace/trace.h | 3 +- + kernel/user.c | 3 +- + kernel/user_namespace.c | 2 +- + kernel/watchdog.c | 26 +- + lib/Kconfig | 7 + + lib/Makefile | 1 + + lib/crc64_ecma.c | 341 +++++++++++++++++ + lib/devres.c | 12 +- + lib/radix-tree.c | 383 +++++++++---------- + lib/vsprintf.c | 65 ++-- + mm/Makefile | 2 +- + mm/compaction.c | 12 +- + mm/filemap.c | 485 ++++++++++++++++++++---- + mm/huge_memory.c | 88 +---- + mm/hugetlb.c | 294 ++++++++------ + mm/list_lru.c | 16 +- + mm/madvise.c | 43 +-- + mm/memcontrol.c | 77 ++-- + mm/memory.c | 412 ++++++++++---------- + mm/mempolicy.c | 267 +++++-------- + mm/mincore.c | 20 +- + mm/mmap.c | 2 +- + mm/nobootmem.c | 2 +- + mm/page_alloc.c | 12 +- + mm/page_cgroup.c | 12 +- + mm/pagewalk.c | 372 +++++++++++------- + mm/process_vm_access.c | 2 +- + mm/readahead.c | 28 +- + mm/shmem.c | 122 ++---- + mm/slab.c | 8 +- + mm/slob.c | 10 +- + mm/slub.c | 16 +- + mm/swap.c | 50 +++ + mm/truncate.c | 147 ++++++- + mm/util.c | 30 ++ + mm/vmscan.c | 122 +++--- + mm/vmstat.c | 6 + + mm/workingset.c | 414 ++++++++++++++++++++ + mm/zswap.c | 8 +- + net/core/rtnetlink.c | 2 +- + scripts/checkpatch.pl | 91 ++++- + 248 files changed, 4811 insertions(+), 2515 deletions(-) + delete mode 100644 arch/arm/include/asm/system.h + create mode 100644 drivers/input/leds.c + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 lib/crc64_ecma.c + create mode 100644 mm/workingset.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/spi/spi.c: fix max() warning +Using index info to reconstruct a base tree... +M drivers/spi/spi.c +Falling back to patching base and 3-way merge... +Auto-merging drivers/spi/spi.c +CONFLICT (content): Merge conflict in drivers/spi/spi.c +Failed to merge in the changes. +Patch failed at 0001 drivers/spi/spi.c: fix max() warning +The copy of the patch that failed is found in: + /home/sfr/kernels/next/rebase-tmp/.git/rebase-apply/patch + +When you have resolved this problem, run "git rebase --continue". +If you prefer to skip this patch, run "git rebase --skip" instead. +To check out the original branch and stop rebasing, run "git rebase --abort". + +$ git rebase --continue +Applying: drivers/w1/w1_int.c: call put_device if device_register fails +Applying: arm: move arm_dma_limit to setup_dma_zone +Applying: mm: add strictlimit knob +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + f8ed6953b12c...3f9eef9678d0 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (3f9eef9678d0 mm: add strictlimit knob) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-bdi | 8 +++++++ + arch/arm/mm/init.c | 6 ++++-- + arch/arm/mm/mm.h | 2 -- + drivers/spi/spi.c | 5 ++--- + drivers/w1/w1_int.c | 5 ++--- + mm/backing-dev.c | 35 +++++++++++++++++++++++++++++++ + 6 files changed, 51 insertions(+), 10 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..52a41d3ddc77 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing jdelvare-hwmon based on 494479038d97f1b9f76fc633a360a681acdf035c +Unchanged quilt series jdelvare-hwmon diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..ef14cdcaca84 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20140214 |