diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-17 17:22:34 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-17 17:22:34 +1000 |
| commit | 36efbdff85370263b2262022687c19ac7e7fe83e (patch) | |
| tree | 6c40c38bf7b06843079324f3439e74a2e0002a1b | |
| parent | e9cad4bbaa1f6703264ed272476fb2c7e2404c85 (diff) | |
Add linux-next specific files for 20140417next-20140417
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 217 | ||||
| -rw-r--r-- | Next/Trees | 218 | ||||
| -rw-r--r-- | Next/merge.log | 3404 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 3844 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..1d3bd1bdfe81 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,217 @@ +Name SHA1 +---- ---- +origin 6ca2a88ad820af56535ed1e6936e0490cb6ec6dc +fixes b0031f227e47919797dc0e1c1990f3ef151ff0cc +kbuild-current 38dbfb59d1175ef458d006556061adeaa8751b72 +arc-current 0409726a81f22f0b95571afa6bb1669b8a441ee4 +arm-current c9d347e0277696c80496161cbef47393b850a0aa +m68k-current 50be9eba831da114e1979726f4119d342698e651 +metag-fixes 0414855fdc4a40da05221fc6062cccbc0c30f169 +powerpc-merge cc4f265ad9a37bdb1846c45eebe454c382f31d67 +sparc 455c6fdbd219161bd09b1165f11699d6d73de11c +net 0acf07d240a84069c4a6651e6030cf35d30c7159 +ipsec a32452366b7250c42e96a18ffc3ad8db9e0ca3c2 +sound-current 8dc9abb93dde94e7f2bc719032fe16f5713df05c +pci-current f5d3352b2751f8de7e06e23a04ac0b4c474075e9 +wireless f8d2b9209ad648a8e9aa973d32fb64aa2ab01d00 +driver-core.current 98b0f811aade1b7c6e7806c86aa0befd5919d65f +tty.current 1e7da0530423a232747d64c2113ace55b01e5754 +usb.current 94d72f008909610710bb1841d665eeeb010a0be1 +staging.current 33c84bc14c25074ac14644cf7db75a57e9abaf1a +char-misc.current 03367ef5ea811475187a0732aada068919e14d61 +input-current 692d96552c9a86a919fe6b5b82288a6c77c015a5 +md-current d47648fcf0611812286f68131b40251c6fa54f5e +crypto-current eb4a5346e777784f1b5ae9fd0c29b96344bdc3ae +ide 5b40dd30bbfaa7fcba0cd945a4852a146c552ea7 +dwmw2 5950f0803ca9d396ab79b7fe6789351f96e1d8d5 +devicetree-current 1f42e5dd5065963979bb53daadf5d4f1e71f0c5f +rr-fixes 7122c3e9154b5d9a7422f68f02d8acf050fad2b0 +mfd-fixes 73beb63d290f961c299526852884846b0d868840 +vfio-fixes 239a87020b263fe7e70adc5803cb157955023d3c +drm-intel-fixes b6842feb63a23a6a988f4e1ffb93408d8ff6931e +asm-generic fb9de7ebc3a2eb7ddb83c92e288447a0c313bced +arc c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 +arm 98f07013149d4be18ff16cfc5b43218f3a70afd6 +arm-kvm-cpuresume 91a3f6af430d81c5f855f3f1ff0f3715e064f342 +arm-perf c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 +arm-soc 2bf73dd61a84cdf27e49f48e08739af6ba70ace1 +bcm2835 fa389e220254c69ffae0d403eac4146171062d08 +berlin e49c50df1e18481f8c62f0e7ee44c1c39f9b77b1 +cortex-m f0d7515372ff0ea53fd66099533d3c8e0464cbbf +ep93xx bfb0709fd17b13498d99592bbe12c91130e35a55 +imx-mxs 1e9dfe21eca865ecc67ae3b4a00383738e115074 +ixp4xx 19f949f52599ba7c3f67a5897ac6be14bfcb1200 +keystone 47fc77cc704ea0ff839f8240894ed8e0be398adf +msm 81cf1e061d001fab44dbaa85fc4fbfb6da6713a1 +mvebu 6412d6635b676c8fc862f5c71bc1eb3be9ddf7b6 +renesas 47a0013abaeefa18b442eceb150553f114ce44c8 +samsung c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 +tegra 628d56b42d351f2a4820bd8d89921c87ec4b4a9d +arm64 ebf81a938dade3b450eb11c57fa744cfac4b523f +blackfin c4a2c58d20953ff1080f50f705cdd952f6d301b2 +c6x ae72758f1dd93bd367dc7719702f24a9bfb3bad9 +cris cd065a010a97e3c330d1ded9af551664c9689b19 +hexagon a9a44fdf329668125042055c569656aa83d8cccb +ia64 e32634f5d57f1dce88624b70a6d625915f6ea09e +m68k 50be9eba831da114e1979726f4119d342698e651 +m68knommu 2bf0787b4b42e61c3a366446b6b24cdfd6165028 +metag 2aca46ce1b5c4b7d76566de72b16640ec674c008 +microblaze a66a626538af65cbfc611e2b2fce500ed3f24518 +mips 0c61dd849d8cf9b8eea3557bc4ac7558cecaa437 +openrisc 548dafe880ad84d0accc0a5596c26e3348b103e1 +parisc 6c700d71f7faecb540b3fa4303edb5323a2768c1 +parisc-hd ab3e55b119c9653b19ea4edffb86f04db867ac98 +powerpc cd427485357c0c4b99f69719251baacf25946e11 +mpc5xxx bc75059422338197ce487d338ac9c898761e1e61 +galak 9e2ecdbba3b0745f9ed454ab86961e3ccf9dc224 +s390 4c0fda1613464d7a0f769713088807fa302e1843 +sparc-next 049ffa8ab33a63b3bff672d1a0ee6a35ad253fe8 +tile 5eb0bdf84433eb7b7ad4ba92a80aac57ad4b46ea +uml 989e59fa41c5464ab77bf0bf82f32f721430544e +unicore32 c284464658acab50c67ff65ff3dc9215a0231ad2 +xtensa cfe8255f0afcf5d2d1dbfa093223cafe38773fa7 +btrfs 00fdf13a2e9f313a044288aa59d3b8ec29ff904a +ceph a30be7cb2ccb995ad5e67fd4b548f11fe37fc8b1 +cifs a5a64da8c4e584450bb1485463ce343316426e22 +configfs b930c26416c4ea6855726fd977145ccea9afbdda +ecryptfs 9e78d14a9f641c0476f733f6fc559ba5cac6f52b +ext3 01d8885785a60ae8f4c37b0ed75bdc96d0fc6a44 +ext4 dd346d66aa92865e01b2511eff937f3e9a3af613 +f2fs 350ca07320d4fb28e9ac2ad792dbb6c8853ee759 +fscache fe02fb3ec10932ce07406b1581e28326181fc9d8 +fuse f3846266f593595632a07242fcbc6c24bc2ade68 +gfs2 c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 +jfs 24e4a0f3de21ad715c9235367e241554c64b9adb +logfs 339466142b3f58fe0ee4dea7e8c5f3d33099e89c +nfs 1f2edbe3fe2111a59fcd1bb3b9725066bc9ed686 +nfsd 06f9cc12caa862f5bc86ebdb4f77568a4bef0167 +omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84 +squashfs 6d565409503f4e1f74ac30de14e8c91a2b826cd8 +v9fs c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 +ubifs d56030ac25d383218045c5d87e98e0494d6af3ad +xfs 330033d697ed8d296fa52b5303db9d802ad901cc +file-private-locks f1c6bb2cb8b81013e8979806f8e15e3d53efb96d +vfs 527d1511310a89650000081869260394e20c7013 +pci c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 +hid 12e5706a47c23cdd84c351e59da01ef9e33737f3 +i2c 9e897e13bd46fa03485468609741974259a8c573 +jdelvare-hwmon 455c6fdbd219161bd09b1165f11699d6d73de11c +hwmon-staging 046f3ea7c6af596a8d913154687c5e457410046e +v4l-dvb b40dfe97cc3a171f036c9e3a9fcb5831c502da1e +kbuild de71647f7af0cd00b50265498a21b4376955797d +kconfig 95edca5c523c4b404dd60baa0a1bea0e4c38fd72 +libata 73ff0e9080ed7e5fd0d03b5b8cd12529fb6c58fc +pm 19ce7f3f31103d7a5b0e93ba9de3ebb4b9d66701 +idle 23a299cd93781a190cdca0d7d16034837b7dfd86 +apm 158204397034f088bfd505eeee281f7072da1c24 +cpupowerutils f16603386b38c28979f4df1cafdc2fe73fa87d37 +thermal 9477165ec525d47abb1cb6523698e0cd89d65ddb +ieee1394 0ca49345b6f489e95f8d6edeb0b092e257475b2a +dlm 075f01775f53640af4a2ca3ed8cbc71de6e37582 +swiotlb 0cb637bff80d5ba2b916bb19f19ffd59cd4079fd +slave-dma 8edc51c197b8f409bef7b21755254e6f3ce7ed23 +dmaengine b9bf6d2e84b736eeed2cf0f387771c7793a1c465 +net-next cd6362befe4cc7bf589a5236d2a780af2d47bcc9 +ipsec-next cd6362befe4cc7bf589a5236d2a780af2d47bcc9 +wireless-next 321d03c86732e45f5f33ad0db5b68e2e1364acb9 +bluetooth 899704633969526114ae63fa72a3f0a8d7ea5dab +infiniband 5ae2866f5264fd51ac2ff6c95d02156a7c1f073c +mtd c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 +l2-mtd 6189cccbe8d16d0ef175bd0dca18e3824ca01174 +crypto f51f593b3eb194d01d8980316e6bb1f7d72f567a +drm c39b06951f1dc2e384650288676c5b7dcc0ec92c +drm-intel c79057922ed6c2c6df1214e6ab4414fea1b23db2 +drm-tegra 3d1c1474386e3714c05beef07abe3142e0dd822d +sound 00d90154404ae6218730068d25bf2faad3186631 +sound-asoc df9a50e93aa5ff53e54ce04b7487c2aa07c041f3 +modules 22c9bcad859d5c969289b3b37084a96c621f8f2c +virtio fc4324b4597c4eb8907207e82f9a6acec84dd335 +input e2c3ecf0ea8e87c5209371af7da107ebc47a5639 +input-mt 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 +block 926912e06e3b9cf2bbc2596d1a7ad19f69fe304e +device-mapper ec052772958d3102fd8bab838a5d88f224973a0c +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 80af9e6d7ae633309cc5bca96aee6a45117e7c98 +mmc c67480173f72e883235dd0ad09d90156c8f87600 +kgdb 6bedf31c25dd93c4f70a28e9ab94a239a5fb592c +slab 34bf6ef94a835a8f1d8abd3e7d38c6c08d205867 +uclinux 6dbe51c251a327e012439c4772097a13df43c5b8 +md e2f23b606b94f28a8febd5aa715df697d80b018e +mfd 90b128ed1557c2f523995a379a53e5105891ecf8 +mfd-lj 2d28ca731b9bb6262f7711241628c7844b0cf7dc +battery ac323d8d807060f7c95a685a9fe861e7b6300993 +fbdev 718b90ac4c21c81f42b6db062ca0867f3cac7648 +viafb 838ac785d521e091bd8b5f6a2b545166f5f32b77 +omap_dss2 d754589d80447da9ed23426d3861e33df43dbda7 +regulator 053ed78e189f97212fa3533b1424d82d1718b606 +security fab71a90eddaf4d5f654fdd0ea7c46315c8da4a4 +selinux 6d32c850621b0be75777b9102b14f6268bbd9f0f +lblnet d8ec26d7f8287f5788a494f56e8814210f0e64be +watchdog c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 +iommu e172b81222548b856ecbe59b305d2cb733d512c4 +dwmw2-iommu 5ae0566a0fffa09a77ac5996e3854fe91cd87167 +vfio 4379d2ae152860e023b42257fd60b5e235047f63 +osd f1f6630b53e702648a248fecd881f3df5968a31a +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +trivial c800bcd5f53fd9455fc6c68f1a34306e5aa4f79a +audit 4daa06f4d8b05ebbff7f18ddfdb43e8449ca4190 +fsnotify 1ca39ab9d21ac93f94b9e3eb364ea9a5cf2aba06 +devicetree d88cf7d7b4240b8df170ba105e414e476fb51cce +dt-rh e7a62df8e8b4a5ecbbf4339b5b3671ae6582e50a +spi 5db6f05a77a00968e345e9a6ddda6050870f0d16 +tip 7b8bfcc693cf7b039201f020c0d5faa52ae01f2b +clockevents 09e15176ded1faa7bd685b3b5b1213cf0240566e +edac 49856dc973cd95d85ac1cab6c70410d8331e5c04 +edac-amd c045ebdf6079b79ac4b4dd16ff37f93ae0bd5190 +ftrace 17a280ea8111c66791c18c0353b7986aafcb24fe +rcu 765a3f4fed708ae429ee095914a7897acb3a65bd +uprobes 0326f5a94ddea33fa331b2519f4172f4fb387baa +kvm 0f689a33ad17845363acdc6d52783befd6ad116c +kvm-arm b73117c49364551ff789db7c424a115ac5b77850 +kvm-ppc 7227fc0666606b0df2c0d2966a7f4859b01bdf74 +oprofile 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae +fw-nohz 74876a98a87a115254b3a66a14b27320b7f0acaa +xen-tip 0a25e113b480694a0af716f33d2edd243b6a8764 +percpu 4abee313c9a8fc8ce0c8276e5c6a5c57ab410a7f +workqueues 77f300b198f93328c26191b52655ce1b62e202cf +drivers-x86 7a70906e55bf3b78a10f749cebb6ab0b4026b76e +chrome-platform 2b8454a75b90d7cd1ac325a0baba77244733354f +sysctl 4e474a00d7ff746ed177ddae14fa8b2d4bad7a00 +regmap b94f4fe06dd8d3f6d17950cffcc53695b5f2c07d +hsi 43139a61fc68f4b0af7327a0e63f340a7c81c69a +leds 95d33e9fcc7eec018bd19c196315c4c788399499 +driver-core c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 +tty c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 +usb c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 +usb-gadget c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 +staging dff222670ebebf1a7f147a23ccb5fc0312f2ae7e +char-misc c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 +cgroup 49957f8e2a43035a97d05bddefa394492a969c0d +scsi b908a5a97b7f6355d2b1028f92c796f822df5aa8 +target-updates b076808051f2c80d38e03fb2f1294f525c7a446d +target-merge b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed +writeback f9b0e058cbd04ada76b13afffa7e1df830543c24 +hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad +pinctrl cc17609e18558931eb5823a1d64151fdc705004f +vhost d3d665a654a35c47463d2aa6353bac3ce293f4f5 +remoteproc bd88acba5f9809af48f66267bb16024b9e33cf2b +rpmsg 397944df3290ddc46dcc6a08cd71fb560700431b +gpio da150898c98287d36a05edec6910cb2a04550f95 +dma-mapping 68efd7d2fb32c2606f1da318b6a851d933813f27 +pwm 2ae69a460413615c82381b240df3800a909100d3 +dma-buf dcb99fd9b08cfe1afe426af4d8d3cbc429190f15 +userns 3efe1ac78e996da8e141b86667cc15758aad4366 +ktest 62183dcac539a14ed0a820b8392db353d72a7d7e +signal 20b4fb485227404329e41ad15588afad3df23050 +clk 31c2c4b8e9115844858bbf0d441fde46545528fd +random 7b878d4b48c4e04b936918bb83836a107ba453b3 +lzo-update 42b775abafafdf811ef300e869a4e1480ef1cf95 +arm64-hugepages af07484863e0c20796081e57093886c22dc16705 +aio e02ba72aabfade4c9cd6e3263e9b57bf890ad25c +llvmlinux 40e9963e622cf28ecef258e3dddb04457b65681c +powernv-cpuidle 0888839c5b62c44a55ac9d28acc273ba663c65ea +rd-docs 596d80c7ceb61b28e2583ffbac69460c61435167 +akpm-current 7b5f689823ab9b3bbb07aa4a57ea9aa9db6f09c5 +akpm-current 7b5f689823ab9b3bbb07aa4a57ea9aa9db6f09c5 +akpm 4c3d768413b4c96a9001e8e6b0a545dc72ad572c diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..a795417b26f5 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,218 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#rc-fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +metag-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#fixes +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-kvm-cpuresume git git://linux-arm.org/linux-2.6-lp.git#arm-kvm-cpuresume +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next +bcm2835 git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git#for-next +berlin git git://github.com/shesselba/linux-berlin.git#berlin/for-next +cortex-m git git://git.pengutronix.de/git/ukl/linux.git#for-next +ep93xx git git://github.com/RyanMallon/linux-ep93xx.git#ep93xx-for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +ixp4xx git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux.git#next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +msm git git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git#for-next +mvebu git git://git.infradead.org/linux-mvebu.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +blackfin git http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux.git#for-linus +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +cris git git://www.jni.nu/cris.git#for-next +hexagon git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git#linux-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +metag git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/ralf/upstream-sfr.git#mips-for-linux-next +openrisc git git://openrisc.net/jonas/linux#for-upstream +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +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.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +battery git git://git.infradead.org/battery-2.6.git#master +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/plagnioj/linux-fbdev.git#for-next +viafb git git://github.com/schandinat/linux-2.6.git#viafb-next +omap_dss2 git git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next +selinux git git://git.infradead.org/users/pcmoore/selinux#next +lblnet git git://git.infradead.org/users/pcmoore/lblnet#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +vfio git git://github.com/awilliam/linux-vfio.git#next +osd git git://git.open-osd.org/linux-open-osd.git#linux-next +jc_docs git git://git.lwn.net/linux-2.6.git#docs-next +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.infradead.org/users/eparis/audit.git#master +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next +devicetree git git://git.secretlab.ca/git/linux-2.6#devicetree/next +dt-rh git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#clockevents/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git#linux_next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +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 +llvmlinux git git://git.linuxfoundation.org/llvmlinux/kernel.git#for-next +powernv-cpuidle git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#powernv-cpuidle +rd-docs quilt http://www.infradead.org/~rdunlap/Doc/patches/ +akpm-current mmotm http://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm http://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..31a4d507efda --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3404 @@ +$ date +Thursday 17 April 11:11:49 EST 2014 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 55101e2d6ce1 Merge git://git.kernel.org/pub/scm/virt/kvm/kvm +Merging origin/master (6ca2a88ad820 Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge origin/master +Updating 55101e2d6ce1..6ca2a88ad820 +Fast-forward + .../bindings/pinctrl/brcm,bcm11351-pinctrl.txt | 2 +- + MAINTAINERS | 2 +- + arch/arm/configs/bcm_defconfig | 2 +- + arch/ia64/kernel/head.S | 2 +- + arch/ia64/kernel/ivt.S | 2 +- + arch/ia64/kvm/vmm_ivt.S | 2 +- + arch/s390/include/asm/sigp.h | 19 + + arch/s390/include/asm/smp.h | 13 +- + arch/s390/include/uapi/asm/unistd.h | 3 +- + arch/s390/kernel/compat_wrapper.c | 3 +- + arch/s390/kernel/dumpstack.c | 8 +- + arch/s390/kernel/ptrace.c | 2 +- + arch/s390/kernel/setup.c | 32 + + arch/s390/kernel/smp.c | 15 - + arch/s390/kernel/syscalls.S | 1 + + arch/s390/lib/uaccess.c | 5 +- + arch/s390/mm/fault.c | 140 +- + arch/x86/Makefile | 4 +- + arch/x86/kernel/cpu/perf_event_intel_rapl.c | 33 +- + arch/x86/kernel/early-quirks.c | 2 +- + arch/x86/kernel/reboot.c | 72 +- + arch/x86/syscalls/Makefile | 2 + + arch/x86/syscalls/syscall_32.tbl | 1 + + arch/x86/tools/Makefile | 2 + + drivers/irqchip/irq-vic.c | 6 + + drivers/net/ethernet/broadcom/bnx2.c | 2 +- + drivers/net/ethernet/cadence/Kconfig | 6 +- + drivers/net/ethernet/chelsio/cxgb4/l2t.c | 4 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 2 +- + drivers/net/ethernet/emulex/benet/be.h | 1 + + drivers/net/ethernet/emulex/benet/be_main.c | 17 +- + drivers/net/ethernet/marvell/mvneta.c | 41 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 181 +-- + drivers/net/ethernet/mellanox/mlx4/mlx4.h | 1 + + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 21 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 3 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.c | 2 - + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 33 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c | 10 + + drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 31 +- + drivers/net/ieee802154/at86rf230.c | 10 +- + drivers/net/vxlan.c | 4 +- + drivers/net/wan/cosa.c | 4 - + drivers/pinctrl/Kconfig | 8 +- + drivers/pinctrl/Makefile | 2 +- + drivers/pinctrl/pinctrl-bcm281xx.c | 1461 ++++++++++++++++++++ + drivers/pinctrl/pinctrl-capri.c | 1454 ------------------- + drivers/pinctrl/pinctrl-msm.c | 6 +- + drivers/pinctrl/pinctrl-msm.h | 1 + + drivers/pinctrl/pinctrl-nomadik.c | 1 - + drivers/pinctrl/pinctrl-rockchip.c | 48 +- + drivers/s390/char/sclp.c | 2 +- + drivers/s390/char/sclp_cmd.c | 2 +- + drivers/s390/char/sclp_vt220.c | 14 +- + drivers/video/Kconfig | 2 + + drivers/video/bf54x-lq043fb.c | 2 +- + drivers/video/da8xx-fb.c | 10 +- + drivers/video/omap2/dss/dispc.c | 67 +- + drivers/video/omap2/dss/dsi.c | 20 + + drivers/video/omap2/dss/dss.c | 4 +- + drivers/video/omap2/dss/dss.h | 6 - + drivers/video/omap2/dss/hdmi_common.c | 8 +- + include/linux/filter.h | 1 - + include/linux/netfilter/nf_conntrack_proto_gre.h | 1 - + include/linux/reboot.h | 14 +- + include/net/dst.h | 14 +- + include/net/inet6_connection_sock.h | 2 +- + include/net/inet_connection_sock.h | 2 +- + include/net/ip.h | 13 +- + include/net/ip6_route.h | 5 + + include/net/ip_tunnels.h | 2 +- + include/net/ipv6.h | 2 +- + include/net/netfilter/nf_tables_core.h | 10 + + include/net/sctp/structs.h | 14 +- + include/net/xfrm.h | 6 +- + kernel/locking/mutex-debug.c | 19 +- + kernel/seccomp.c | 17 +- + net/core/dev.c | 2 +- + net/core/dst.c | 15 +- + net/core/filter.c | 9 +- + net/dccp/output.c | 2 +- + net/decnet/dn_route.c | 16 +- + net/ipv4/ip_output.c | 16 +- + net/ipv4/ip_tunnel.c | 2 +- + net/ipv4/ip_tunnel_core.c | 4 +- + net/ipv4/ping.c | 15 +- + net/ipv4/route.c | 6 +- + net/ipv4/tcp_output.c | 2 +- + net/ipv4/xfrm4_output.c | 2 +- + net/ipv6/inet6_connection_sock.c | 3 +- + net/ipv6/ip6_gre.c | 10 + + net/ipv6/ip6_output.c | 2 +- + net/ipv6/route.c | 19 +- + net/ipv6/sit.c | 5 +- + net/ipv6/xfrm6_output.c | 2 +- + net/l2tp/l2tp_core.c | 4 +- + net/l2tp/l2tp_ip.c | 2 +- + net/netfilter/nf_conntrack_core.c | 1 + + net/netfilter/nf_conntrack_pptp.c | 20 +- + net/netfilter/nf_conntrack_proto_gre.c | 3 +- + net/netfilter/nf_tables_core.c | 3 +- + net/netfilter/nft_cmp.c | 2 +- + net/openvswitch/vport-gre.c | 2 +- + net/sctp/associola.c | 82 +- + net/sctp/protocol.c | 2 +- + net/sctp/sm_statefuns.c | 2 +- + net/sctp/socket.c | 6 + + net/sctp/ulpevent.c | 8 +- + net/xfrm/xfrm_policy.c | 2 +- + tools/lib/lockdep/Makefile | 15 +- + tools/lib/lockdep/uinclude/linux/lockdep.h | 3 + + tools/lib/traceevent/event-parse.c | 109 +- + tools/perf/Documentation/perf-bench.txt | 22 + + tools/perf/Documentation/perf-top.txt | 1 - + tools/perf/Makefile.perf | 4 +- + tools/perf/bench/numa.c | 4 + + tools/perf/builtin-stat.c | 11 +- + tools/perf/config/Makefile | 7 +- + tools/perf/tests/code-reading.c | 1 + + tools/perf/util/probe-finder.c | 15 +- + 120 files changed, 2503 insertions(+), 1948 deletions(-) + create mode 100644 drivers/pinctrl/pinctrl-bcm281xx.c + delete mode 100644 drivers/pinctrl/pinctrl-capri.c +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 (0409726a81f2 ARC: fix mmuv2 warning) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/include/asm/irq.h | 2 -- + arch/arc/kernel/irq.c | 18 ------------------ + arch/arc/mm/cache_arc700.c | 4 ++++ + arch/arc/plat-arcfpga/Makefile | 2 +- + arch/arc/plat-arcfpga/platform.c | 4 ++-- + arch/arc/plat-arcfpga/smp.c | 18 ++++++++++++++++++ + 6 files changed, 25 insertions(+), 23 deletions(-) +Merging arm-current/fixes (c9d347e02776 ARM: 8009/1: dcscb.c: remove call to outer_flush_all()) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (50be9eba831d m68k: Update defconfigs for v3.14-rc1) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (0414855fdc4a Linux 3.14-rc5) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging powerpc-merge/merge (cc4f265ad9a3 powerpc/powernv Adapt opal-elog and opal-dump to new sysfs_remove_file_self) +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc/master (455c6fdbd219 Linux 3.14) +$ git merge sparc/master +Already up-to-date. +Merging net/master (0acf07d240a8 seccomp: fix memory leak on filter attach) +$ git merge net/master +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/net/ethernet.txt | 2 +- + drivers/isdn/icn/icn.c | 11 ++-- + drivers/net/ethernet/marvell/mvneta.c | 73 ++++++++++------------ + drivers/net/ethernet/mellanox/mlx4/en_cq.c | 1 - + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 6 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 1 - + drivers/net/ethernet/sfc/ef10.c | 12 +++- + drivers/net/ethernet/sfc/efx.c | 19 +++++- + drivers/net/ethernet/sfc/enum.h | 23 ++++--- + drivers/net/ethernet/sfc/falcon.c | 4 ++ + drivers/net/ethernet/sfc/farch.c | 22 +++++++ + drivers/net/ethernet/sfc/mcdi.c | 55 ++++++++++++---- + drivers/net/ethernet/sfc/mcdi.h | 13 ++++ + drivers/net/ethernet/sfc/net_driver.h | 4 ++ + drivers/net/ethernet/sfc/nic.h | 1 + + drivers/net/ethernet/sfc/siena.c | 2 + + drivers/net/phy/mdio-gpio.c | 68 +++++++++++++------- + include/linux/mdio-gpio.h | 5 ++ + include/linux/phy.h | 3 + + include/net/flow.h | 10 ++- + include/net/net_namespace.h | 9 +-- + kernel/seccomp.c | 2 + + net/ipv4/fib_frontend.c | 2 +- + net/ipv4/fib_semantics.c | 1 + + net/ipv4/ip_tunnel.c | 15 +++-- + net/ipv4/ipmr.c | 2 +- + net/ipv4/netfilter/ipt_rpfilter.c | 5 +- + net/ipv4/route.c | 3 +- + net/ipv6/ip6_tunnel.c | 8 +-- + net/ipv6/ip6mr.c | 2 +- + net/ipv6/sit.c | 17 ++--- + net/socket.c | 4 +- + 32 files changed, 264 insertions(+), 141 deletions(-) +Merging ipsec/master (a32452366b72 vti4: Don't count header length twice.) +$ git merge ipsec/master +Recorded preimage for 'net/ipv4/ip_vti.c' +Auto-merging net/ipv6/xfrm6_output.c +Auto-merging net/ipv4/xfrm4_output.c +Auto-merging net/ipv4/ip_vti.c +CONFLICT (content): Merge conflict in net/ipv4/ip_vti.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'net/ipv4/ip_vti.c'. +[master 09f4582d3e5c] Merge remote-tracking branch 'ipsec/master' +$ git diff -M --stat --summary HEAD^.. + net/ipv4/ip_vti.c | 1 - + net/ipv4/xfrm4_output.c | 32 ++++++++++++++++++-------------- + net/ipv6/xfrm6_output.c | 22 +++++++++++++--------- + 3 files changed, 31 insertions(+), 24 deletions(-) +Merging sound-current/for-linus (8dc9abb93dde ALSA: hda/realtek - Add headset Mic support for Dell machine) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/isa/es18xx.c | 10 +++++----- + sound/pci/hda/patch_realtek.c | 5 +++++ + 2 files changed, 10 insertions(+), 5 deletions(-) +Merging pci-current/for-linus (f5d3352b2751 PCI: tegra: Use new OF interrupt mapping when possible) +$ git merge pci-current/for-linus +Merge made by the 'recursive' strategy. + arch/powerpc/kernel/pci_64.c | 10 ++++++---- + drivers/pci/host/pci-rcar-gen2.c | 8 +++++++- + drivers/pci/host/pci-tegra.c | 7 ++++++- + drivers/pci/host/pcie-designware.c | 20 +++++++++++++------- + 4 files changed, 32 insertions(+), 13 deletions(-) +Merging wireless/master (f8d2b9209ad6 mwifiex: fix hung task on command timeout) +$ git merge wireless/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/cw1200/debug.c | 2 + + drivers/net/wireless/iwlwifi/iwl-7000.c | 5 +- + drivers/net/wireless/iwlwifi/mvm/coex.c | 18 +- + drivers/net/wireless/iwlwifi/mvm/mac80211.c | 1 + + drivers/net/wireless/iwlwifi/mvm/rs.c | 261 ++++++++++++++++++---------- + drivers/net/wireless/iwlwifi/mvm/rs.h | 14 +- + drivers/net/wireless/iwlwifi/mvm/sf.c | 3 +- + drivers/net/wireless/iwlwifi/pcie/drv.c | 2 + + drivers/net/wireless/mwifiex/main.c | 12 +- + drivers/net/wireless/mwifiex/sta_ioctl.c | 7 +- + drivers/net/wireless/rsi/rsi_91x_core.c | 2 +- + drivers/net/wireless/rsi/rsi_91x_mgmt.c | 21 +-- + drivers/net/wireless/ti/wl18xx/event.h | 20 +++ + drivers/net/wireless/ti/wlcore/event.c | 5 + + net/mac80211/chan.c | 11 +- + net/mac80211/main.c | 4 +- + net/mac80211/offchannel.c | 1 + + net/mac80211/status.c | 1 + + 18 files changed, 258 insertions(+), 132 deletions(-) +Merging driver-core.current/driver-core-linus (98b0f811aade Documentation: Update stable address in Chinese and Japanese translations) +$ git merge driver-core.current/driver-core-linus +Merge made by the 'recursive' strategy. + Documentation/ja_JP/HOWTO | 2 +- + Documentation/ja_JP/stable_kernel_rules.txt | 6 +- + Documentation/stable_kernel_rules.txt | 2 +- + Documentation/zh_CN/HOWTO | 2 +- + Documentation/zh_CN/io_ordering.txt | 67 +++++++++++++++++++++ + Documentation/zh_CN/stable_kernel_rules.txt | 2 +- + drivers/base/core.c | 33 ----------- + drivers/base/topology.c | 3 +- + fs/kernfs/inode.c | 14 +++-- + fs/super.c | 5 +- + fs/sysfs/file.c | 92 ----------------------------- + include/linux/device.h | 11 +--- + include/linux/sysfs.h | 9 --- + 13 files changed, 90 insertions(+), 158 deletions(-) + create mode 100644 Documentation/zh_CN/io_ordering.txt +Merging tty.current/tty-linus (1e7da0530423 serial: amba-pl011: fix regression, causing an Oops on rmmod) +$ git merge tty.current/tty-linus +Removing Documentation/serial/sx.txt +Removing Documentation/serial/specialix.txt +Removing Documentation/serial/riscom8.txt +Removing Documentation/serial/digiepca.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/serial/efm32-uart.txt | 4 +- + Documentation/kernel-parameters.txt | 13 - + Documentation/magic-number.txt | 12 - + Documentation/serial/00-INDEX | 8 - + Documentation/serial/digiepca.txt | 98 ------ + Documentation/serial/riscom8.txt | 36 -- + Documentation/serial/specialix.txt | 383 --------------------- + Documentation/serial/sx.txt | 294 ---------------- + Documentation/zh_CN/magic-number.txt | 12 - + drivers/char/Kconfig | 2 +- + drivers/char/pcmcia/Kconfig | 2 +- + drivers/char/ttyprintk.c | 15 +- + drivers/tty/serial/8250/8250_core.c | 3 +- + drivers/tty/serial/Kconfig | 1 + + drivers/tty/serial/amba-pl011.c | 8 +- + drivers/tty/serial/clps711x.c | 20 +- + drivers/tty/serial/efm32-uart.c | 3 + + drivers/tty/serial/omap-serial.c | 30 +- + drivers/tty/serial/serial_core.c | 5 +- + drivers/tty/serial/st-asc.c | 4 +- + drivers/tty/tty_io.c | 4 +- + firmware/WHENCE | 10 - + 22 files changed, 58 insertions(+), 909 deletions(-) + delete mode 100644 Documentation/serial/digiepca.txt + delete mode 100644 Documentation/serial/riscom8.txt + delete mode 100644 Documentation/serial/specialix.txt + delete mode 100644 Documentation/serial/sx.txt +Merging usb.current/usb-linus (94d72f008909 uas: fix deadlocky memory allocations) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/class/cdc-acm.c | 34 +++++++++++++++++++++++++--------- + drivers/usb/core/hcd-pci.c | 2 +- + drivers/usb/host/ehci-exynos.c | 2 ++ + drivers/usb/host/ehci-platform.c | 2 ++ + drivers/usb/host/ehci-tegra.c | 23 +++++++++++++++++++++++ + drivers/usb/host/ohci-jz4740.c | 6 +++--- + drivers/usb/serial/cp210x.c | 1 + + drivers/usb/serial/ftdi_sio.c | 33 +++++++++++++++++++++++++++++++++ + drivers/usb/serial/ftdi_sio_ids.h | 37 +++++++++++++++++++++++++++++++++++++ + drivers/usb/serial/option.c | 2 ++ + drivers/usb/serial/pl2303.c | 3 +++ + drivers/usb/serial/pl2303.h | 5 ++++- + drivers/usb/serial/sierra.c | 1 - + drivers/usb/serial/usb_wwan.c | 9 +++------ + drivers/usb/storage/uas.c | 13 +++++++------ + drivers/usb/usb-common.c | 2 +- + drivers/uwb/drp.c | 5 ++++- + 17 files changed, 151 insertions(+), 29 deletions(-) +Merging staging.current/staging-linus (33c84bc14c25 staging: r8188eu: Fix case where ethtype was never obtained and always be checked against 0) +$ git merge staging.current/staging-linus +Removing drivers/staging/rtl8187se/r8185b_init.c +Removing drivers/staging/rtl8187se/r8180_wx.h +Removing drivers/staging/rtl8187se/r8180_wx.c +Removing drivers/staging/rtl8187se/r8180_rtl8225z2.c +Removing drivers/staging/rtl8187se/r8180_rtl8225.h +Removing drivers/staging/rtl8187se/r8180_hw.h +Removing drivers/staging/rtl8187se/r8180_dm.h +Removing drivers/staging/rtl8187se/r8180_dm.c +Removing drivers/staging/rtl8187se/r8180_core.c +Removing drivers/staging/rtl8187se/r8180_93cx6.h +Removing drivers/staging/rtl8187se/r8180.h +Removing drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c +Removing drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c +Removing drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c +Removing drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c +Removing drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c +Removing drivers/staging/rtl8187se/ieee80211/ieee80211_module.c +Removing drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c +Removing drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_tkip.c +Removing drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c +Removing drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.h +Removing drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.c +Removing drivers/staging/rtl8187se/ieee80211/ieee80211.h +Removing drivers/staging/rtl8187se/ieee80211/dot11d.h +Removing drivers/staging/rtl8187se/ieee80211/dot11d.c +Removing drivers/staging/rtl8187se/TODO +Removing drivers/staging/rtl8187se/Module.symvers +Removing drivers/staging/rtl8187se/Makefile +Removing drivers/staging/rtl8187se/Kconfig +Merge made by the 'recursive' strategy. + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/comedi/comedi_buf.c | 37 +- + drivers/staging/comedi/comedi_fops.c | 18 +- + drivers/staging/comedi/comedi_internal.h | 2 + + drivers/staging/goldfish/goldfish_audio.c | 1 + + drivers/staging/gs_fpgaboot/Makefile | 2 - + drivers/staging/gs_fpgaboot/gs_fpgaboot.c | 1 - + drivers/staging/rtl8187se/Kconfig | 10 - + drivers/staging/rtl8187se/Makefile | 38 - + drivers/staging/rtl8187se/Module.symvers | 0 + drivers/staging/rtl8187se/TODO | 13 - + drivers/staging/rtl8187se/ieee80211/dot11d.c | 189 - + drivers/staging/rtl8187se/ieee80211/dot11d.h | 71 - + drivers/staging/rtl8187se/ieee80211/ieee80211.h | 1496 -------- + .../staging/rtl8187se/ieee80211/ieee80211_crypt.c | 240 -- + .../staging/rtl8187se/ieee80211/ieee80211_crypt.h | 86 - + .../rtl8187se/ieee80211/ieee80211_crypt_ccmp.c | 455 --- + .../rtl8187se/ieee80211/ieee80211_crypt_tkip.c | 740 ---- + .../rtl8187se/ieee80211/ieee80211_crypt_wep.c | 277 -- + .../staging/rtl8187se/ieee80211/ieee80211_module.c | 203 -- + drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 1486 -------- + .../rtl8187se/ieee80211/ieee80211_softmac.c | 2711 -------------- + .../rtl8187se/ieee80211/ieee80211_softmac_wx.c | 567 --- + drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | 591 --- + drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 713 ---- + drivers/staging/rtl8187se/r8180.h | 640 ---- + drivers/staging/rtl8187se/r8180_93cx6.h | 54 - + drivers/staging/rtl8187se/r8180_core.c | 3775 -------------------- + drivers/staging/rtl8187se/r8180_dm.c | 1139 ------ + drivers/staging/rtl8187se/r8180_dm.h | 23 - + drivers/staging/rtl8187se/r8180_hw.h | 588 --- + drivers/staging/rtl8187se/r8180_rtl8225.h | 34 - + drivers/staging/rtl8187se/r8180_rtl8225z2.c | 811 ----- + drivers/staging/rtl8187se/r8180_wx.c | 1409 -------- + drivers/staging/rtl8187se/r8180_wx.h | 21 - + drivers/staging/rtl8187se/r8185b_init.c | 1464 -------- + drivers/staging/rtl8188eu/core/rtw_recv.c | 19 +- + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 74 +- + drivers/staging/rtl8712/rtl871x_recv.c | 13 +- + drivers/staging/rtl8723au/core/rtw_ieee80211.c | 46 +- + drivers/staging/rtl8723au/core/rtw_mlme_ext.c | 2 +- + drivers/staging/rtl8723au/core/rtw_p2p.c | 4 +- + drivers/staging/rtl8723au/core/rtw_wlan_util.c | 4 +- + drivers/staging/rtl8821ae/base.c | 10 +- + drivers/staging/speakup/main.c | 18 +- + drivers/staging/unisys/uislib/uislib.c | 4 +- + drivers/staging/unisys/visorchipset/visorchipset.h | 4 +- + .../unisys/visorchipset/visorchipset_main.c | 8 +- + .../usbip/userspace/libsrc/usbip_host_driver.c | 7 +- + drivers/staging/usbip/vhci_sysfs.c | 2 +- + drivers/staging/vme/devices/vme_user.c | 9 +- + 52 files changed, 154 insertions(+), 19978 deletions(-) + delete mode 100644 drivers/staging/rtl8187se/Kconfig + delete mode 100644 drivers/staging/rtl8187se/Makefile + delete mode 100644 drivers/staging/rtl8187se/Module.symvers + delete mode 100644 drivers/staging/rtl8187se/TODO + delete mode 100644 drivers/staging/rtl8187se/ieee80211/dot11d.c + delete mode 100644 drivers/staging/rtl8187se/ieee80211/dot11d.h + delete mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211.h + delete mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.c + delete mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.h + delete mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c + delete mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_tkip.c + delete mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c + delete mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211_module.c + delete mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c + delete mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c + delete mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c + delete mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c + delete mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c + delete mode 100644 drivers/staging/rtl8187se/r8180.h + delete mode 100644 drivers/staging/rtl8187se/r8180_93cx6.h + delete mode 100644 drivers/staging/rtl8187se/r8180_core.c + delete mode 100644 drivers/staging/rtl8187se/r8180_dm.c + delete mode 100644 drivers/staging/rtl8187se/r8180_dm.h + delete mode 100644 drivers/staging/rtl8187se/r8180_hw.h + delete mode 100644 drivers/staging/rtl8187se/r8180_rtl8225.h + delete mode 100644 drivers/staging/rtl8187se/r8180_rtl8225z2.c + delete mode 100644 drivers/staging/rtl8187se/r8180_wx.c + delete mode 100644 drivers/staging/rtl8187se/r8180_wx.h + delete mode 100644 drivers/staging/rtl8187se/r8185b_init.c +Merging char-misc.current/char-misc-linus (03367ef5ea81 Drivers: hv: vmbus: Negotiate version 3.0 when running on ws2012r2 hosts) +$ git merge char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + drivers/hv/connection.c | 5 +- + drivers/mcb/mcb-parse.c | 1 + + drivers/misc/Kconfig | 4 +- + drivers/misc/genwqe/card_base.h | 58 ++++++++---- + drivers/misc/genwqe/card_ddcb.c | 6 +- + drivers/misc/genwqe/card_dev.c | 44 ++++------ + drivers/misc/genwqe/card_utils.c | 170 +++++++++++++++++++++++++++--------- + drivers/misc/genwqe/genwqe_driver.h | 2 +- + drivers/misc/mei/hw-me-regs.h | 5 ++ + drivers/misc/mei/interrupt.c | 3 +- + drivers/misc/mei/main.c | 3 +- + drivers/misc/mei/pci-me.c | 30 +++++-- + drivers/vme/bridges/vme_tsi148.c | 22 +++-- + drivers/w1/w1.c | 32 ++----- + drivers/w1/w1_netlink.c | 44 ++++++---- + include/linux/hyperv.h | 4 +- + include/uapi/linux/hyperv.h | 1 + + tools/hv/hv_fcopy_daemon.c | 4 +- + 18 files changed, 280 insertions(+), 158 deletions(-) +Merging input-current/for-linus (692d96552c9a 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 (eb4a5346e777 hwrng: bcm2835 - fix oops when rng h/w is accessed during registration) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (5b40dd30bbfa ide: Fix SC1200 dependencies) +$ git merge ide/master +Merge made by the 'recursive' strategy. + drivers/ide/Kconfig | 5 ++++- + drivers/ide/ide-probe.c | 8 +++++--- + 2 files changed, 9 insertions(+), 4 deletions(-) +Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) +$ git merge dwmw2/master +Already up-to-date. +Merging devicetree-current/devicetree/merge (1f42e5dd5065 of: Add self test for of_match_node()) +$ 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 (b6842feb63a2 drm/i915: Allow user modes to exceed DVI 165MHz limit) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_mm.c | 2 - + drivers/gpu/drm/i915/i915_drv.h | 9 +- + drivers/gpu/drm/i915/i915_gem.c | 2 +- + drivers/gpu/drm/i915/i915_gem_context.c | 218 ++++++++++++----------------- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- + drivers/gpu/drm/i915/intel_bios.c | 10 ++ + drivers/gpu/drm/i915/intel_bios.h | 3 + + drivers/gpu/drm/i915/intel_hdmi.c | 9 +- + drivers/gpu/drm/i915/intel_panel.c | 5 + + drivers/gpu/drm/i915/intel_pm.c | 10 ++ + 10 files changed, 127 insertions(+), 143 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 (c9eaa447e77e Linux 3.15-rc1) +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (98f07013149d Merge branch 'devel-stable' into for-next) +$ git merge arm/for-next +Already up-to-date. +Merging arm-kvm-cpuresume/arm-kvm-cpuresume (91a3f6af430d arm: kernel: sleep: restore HYP mode configuration in cpu_resume) +$ git merge arm-kvm-cpuresume/arm-kvm-cpuresume +Auto-merging arch/arm/include/asm/assembler.h +Merge made by the 'recursive' strategy. + arch/arm/include/asm/assembler.h | 2 +- + arch/arm/kernel/sleep.S | 5 ++++- + 2 files changed, 5 insertions(+), 2 deletions(-) +Merging arm-perf/for-next/perf (c9eaa447e77e Linux 3.15-rc1) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (2bf73dd61a84 Merge tag 'tags/cleanup2-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) +$ git merge arm-soc/for-next +Already up-to-date. +Merging bcm2835/for-next (fa389e220254 Linux 3.14-rc6) +$ git merge bcm2835/for-next +Already up-to-date. +Merging berlin/berlin/for-next (e49c50df1e18 Merge branch 'berlin/dt' into berlin/for-next) +$ git merge berlin/berlin/for-next +Merge made by the 'recursive' strategy. + Documentation/arm/Marvell/README | 5 + + .../devicetree/bindings/arm/marvell,berlin.txt | 1 + + arch/arm/boot/dts/Makefile | 3 +- + arch/arm/boot/dts/berlin2.dtsi | 10 + + arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 28 ++ + arch/arm/boot/dts/berlin2q.dtsi | 336 +++++++++++++++++++++ + arch/arm/mach-berlin/Kconfig | 8 + + 7 files changed, 390 insertions(+), 1 deletion(-) + create mode 100644 arch/arm/boot/dts/berlin2q-marvell-dmp.dts + create mode 100644 arch/arm/boot/dts/berlin2q.dtsi +Merging cortex-m/for-next (f0d7515372ff ARM: v7m: add trivial suspend support) +$ git merge cortex-m/for-next +Already up-to-date. +Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next) +$ git merge ep93xx/ep93xx-for-next +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (1e9dfe21eca8 Merge branch 'imx/dt' into for-next) +$ git merge imx-mxs/for-next +Removing arch/arm/mach-imx/mach-mx51_babbage.c +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/imx25-clock.txt | 3 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/Kconfig.debug | 9 + + arch/arm/boot/dts/Makefile | 3 + + .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 13 + + arch/arm/boot/dts/imx25-pdk.dts | 217 ++++++++++- + arch/arm/boot/dts/imx25.dtsi | 40 +- + arch/arm/boot/dts/imx27-apf27.dts | 1 + + arch/arm/boot/dts/imx27-pdk.dts | 48 ++- + arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 77 +++- + arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi | 20 +- + arch/arm/boot/dts/imx27.dtsi | 2 + + arch/arm/boot/dts/imx28-duckbill.dts | 12 +- + arch/arm/boot/dts/imx28.dtsi | 1 + + arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi | 15 + + .../boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts | 22 ++ + arch/arm/boot/dts/imx35-pdk.dts | 67 ++++ + arch/arm/boot/dts/imx35.dtsi | 25 +- + arch/arm/boot/dts/imx50.dtsi | 5 + + arch/arm/boot/dts/imx51-babbage.dts | 62 +++ + arch/arm/boot/dts/imx51-digi-connectcore-jsk.dts | 108 ++++++ + arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi | 379 ++++++++++++++++++ + arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi | 11 + + .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 58 +++ + arch/arm/boot/dts/imx51.dtsi | 5 + + arch/arm/boot/dts/imx53-m53evk.dts | 23 +- + arch/arm/boot/dts/imx53-qsb-common.dtsi | 3 +- + arch/arm/boot/dts/imx53-tx53-x03x.dts | 11 +- + arch/arm/boot/dts/imx53.dtsi | 9 +- + arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 48 ++- + arch/arm/boot/dts/imx6q-gw5400-a.dts | 3 - + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 3 - + arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi | 22 +- + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 19 + + arch/arm/boot/dts/imx6qdl.dtsi | 14 +- + arch/arm/boot/dts/imx6sl-evk.dts | 1 + + arch/arm/boot/dts/imx6sl.dtsi | 5 +- + arch/arm/boot/dts/vf610-colibri.dts | 123 ++++++ + arch/arm/boot/dts/vf610-twr.dts | 38 ++ + arch/arm/boot/dts/vf610.dtsi | 28 +- + arch/arm/configs/imx_v4_v5_defconfig | 6 + + arch/arm/configs/imx_v6_v7_defconfig | 10 +- + arch/arm/configs/mxs_defconfig | 5 +- + arch/arm/include/debug/vf.S | 15 +- + arch/arm/mach-imx/Kconfig | 15 - + arch/arm/mach-imx/Makefile | 1 - + arch/arm/mach-imx/clk-imx25.c | 24 +- + arch/arm/mach-imx/clk-imx51-imx53.c | 20 +- + arch/arm/mach-imx/clk-imx6q.c | 12 +- + arch/arm/mach-imx/clk-imx6sl.c | 6 +- + arch/arm/mach-imx/common.h | 2 + + arch/arm/mach-imx/mach-mx21ads.c | 173 +++++---- + arch/arm/mach-imx/mach-mx51_babbage.c | 428 --------------------- + arch/arm/mach-imx/time.c | 15 + + 54 files changed, 1628 insertions(+), 658 deletions(-) + create mode 100644 arch/arm/boot/dts/imx35-pdk.dts + create mode 100644 arch/arm/boot/dts/imx51-digi-connectcore-jsk.dts + create mode 100644 arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi + create mode 100644 arch/arm/boot/dts/vf610-colibri.dts + delete mode 100644 arch/arm/mach-imx/mach-mx51_babbage.c +Merging ixp4xx/next (19f949f52599 Linux 3.8) +$ git merge ixp4xx/next +Already up-to-date. +Merging keystone/next (47fc77cc704e Merge branch 'for_3.15/fixes' into next) +$ git merge keystone/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix) +$ git merge msm/for-next +Already up-to-date. +Merging mvebu/for-next (6412d6635b67 Merge branch 'mvebu/dt-fixes-non-critical' into for-next) +$ git merge mvebu/for-next +Resolved 'arch/arm/boot/dts/Makefile' using previous resolution. +Auto-merging arch/arm/boot/dts/Makefile +CONFLICT (content): Merge conflict in arch/arm/boot/dts/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2d1726721171] Merge remote-tracking branch 'mvebu/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/boot/dts/Makefile | 5 ++++- + arch/arm/boot/dts/armada-370-xp.dtsi | 1 + + arch/arm/boot/dts/armada-38x.dtsi | 1 + + arch/arm/boot/dts/kirkwood-b3.dts | 2 +- + arch/arm/boot/dts/kirkwood-cloudbox.dts | 2 +- + arch/arm/boot/dts/kirkwood-dreamplug.dts | 2 +- + arch/arm/boot/dts/kirkwood-laplug.dts | 2 +- + arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 2 +- + arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 4 ++-- + arch/arm/boot/dts/kirkwood-nsa310.dts | 2 +- + arch/arm/boot/dts/kirkwood-nsa310a.dts | 2 +- + arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 2 +- + arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 2 +- + 13 files changed, 17 insertions(+), 12 deletions(-) +Merging renesas/next (47a0013abaee Merge branches 'heads/next', 'heads/boards-for-v3.16' and 'heads/dt-for-v3.16' into devel) +$ git merge renesas/next +Removing arch/arm/mach-shmobile/include/mach/emev2.h +Removing arch/arm/mach-shmobile/clock-emev2.c +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 3 +- + .../boot/dts/r8a7740-armadillo800eva-reference.dts | 27 ++- + arch/arm/boot/dts/r8a7740.dtsi | 9 +- + arch/arm/boot/dts/r8a7778-bockw-reference.dts | 14 ++ + arch/arm/boot/dts/r8a7778.dtsi | 18 +- + arch/arm/boot/dts/r8a7779.dtsi | 18 +- + arch/arm/boot/dts/r8a7790-lager.dts | 67 +++++- + arch/arm/boot/dts/r8a7790.dtsi | 122 +++++++++-- + arch/arm/boot/dts/r8a7791-koelsch.dts | 84 ++++++-- + arch/arm/boot/dts/r8a7791.dtsi | 109 ++++++++-- + arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 15 +- + arch/arm/boot/dts/sh73a0.dtsi | 1 - + arch/arm/configs/shmobile_defconfig | 14 ++ + arch/arm/mach-shmobile/Kconfig | 17 +- + arch/arm/mach-shmobile/Makefile | 3 +- + arch/arm/mach-shmobile/board-armadillo800eva.c | 1 + + arch/arm/mach-shmobile/board-bockw.c | 63 ++++-- + arch/arm/mach-shmobile/board-koelsch-reference.c | 86 ++++---- + arch/arm/mach-shmobile/board-koelsch.c | 2 +- + arch/arm/mach-shmobile/board-lager-reference.c | 79 ++++--- + arch/arm/mach-shmobile/board-lager.c | 33 +-- + arch/arm/mach-shmobile/clock-emev2.c | 231 --------------------- + arch/arm/mach-shmobile/clock-r8a7778.c | 22 +- + arch/arm/mach-shmobile/clock-r8a7790.c | 32 ++- + arch/arm/mach-shmobile/clock-r8a7791.c | 23 +- + arch/arm/mach-shmobile/clock.c | 28 +++ + arch/arm/mach-shmobile/include/mach/clock.h | 16 ++ + arch/arm/mach-shmobile/include/mach/common.h | 1 + + arch/arm/mach-shmobile/include/mach/emev2.h | 9 - + arch/arm/mach-shmobile/setup-emev2.c | 11 +- + arch/arm/mach-shmobile/setup-r8a7790.c | 12 +- + arch/arm/mach-shmobile/setup-r8a7791.c | 2 +- + arch/arm/mach-shmobile/setup-rcar-gen2.c | 16 +- + arch/arm/mach-shmobile/smp-emev2.c | 1 - + arch/arm/mach-shmobile/smp-r8a7791.c | 15 +- + arch/arm/mach-shmobile/timer.c | 28 +++ + include/dt-bindings/clock/r8a7790-clock.h | 7 +- + include/dt-bindings/clock/r8a7791-clock.h | 5 +- + 38 files changed, 714 insertions(+), 530 deletions(-) + delete mode 100644 arch/arm/mach-shmobile/clock-emev2.c + delete mode 100644 arch/arm/mach-shmobile/include/mach/emev2.h +Merging samsung/for-next (c9eaa447e77e Linux 3.15-rc1) +$ git merge samsung/for-next +Already up-to-date. +Merging tegra/for-next (628d56b42d35 Merge branch for-3.16/defconfig into for-next) +$ git merge tegra/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 1791 +++++++++++++++++++++++++++++ + arch/arm/boot/dts/tegra124-venice2.dts | 4 +- + arch/arm/configs/tegra_defconfig | 1 + + 4 files changed, 1796 insertions(+), 1 deletion(-) + create mode 100644 arch/arm/boot/dts/tegra124-jetson-tk1.dts +Merging arm64/for-next/core (ebf81a938dad arm64: Fix DMA range invalidation for cache line unaligned buffers) +$ git merge arm64/for-next/core +Already up-to-date. +Merging blackfin/for-linus (c4a2c58d2095 blackfin: cleanup board files) +$ git merge blackfin/for-linus +Already up-to-date. +Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by cache.h) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (cd065a010a97 CRISv10: Readd missing header) +$ git merge cris/for-next +Already up-to-date. +Merging hexagon/linux-next (a9a44fdf3296 Hexagon: update CR year for elf.h) +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (e32634f5d57f pstore: Fix memory leak when decompress using big_oops_buf) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (50be9eba831d m68k: Update defconfigs for v3.14-rc1) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (2bf0787b4b42 m68k: fix a compiler warning when building for DragonBall) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/kernel/setup_no.c | 13 ++++++------- + arch/m68k/platform/68000/m68EZ328.c | 3 ++- + arch/m68k/platform/68000/m68VZ328.c | 1 + + 3 files changed, 9 insertions(+), 8 deletions(-) +Merging metag/for-next (2aca46ce1b5c sched: remove unused SCHED_INIT_NODE) +$ git merge metag/for-next +Already up-to-date. +Merging microblaze/next (a66a626538af microblaze: Use asm-generic/io.h) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (0c61dd849d8c Merge branch '3.15-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Removing arch/mips/include/asm/rm9k-ocd.h +Removing arch/mips/dec/prom/call_o32.S +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 + + arch/mips/dec/ecc-berr.c | 1 + + arch/mips/dec/kn02xa-berr.c | 1 + + arch/mips/dec/prom/Makefile | 1 - + arch/mips/dec/prom/call_o32.S | 89 -------- + arch/mips/fw/lib/call_o32.S | 57 +++-- + arch/mips/fw/sni/sniprom.c | 3 +- + arch/mips/include/asm/branch.h | 12 + + arch/mips/include/asm/dec/prom.h | 48 ++-- + arch/mips/include/asm/rm9k-ocd.h | 56 ----- + arch/mips/include/uapi/asm/bitfield.h | 29 +++ + arch/mips/include/uapi/asm/inst.h | 414 ++++++++++++++++------------------ + arch/mips/kernel/proc.c | 9 +- + arch/mips/lib/csum_partial.S | 9 + + arch/mips/lib/delay.c | 14 +- + arch/mips/lib/strncpy_user.S | 13 +- + arch/mips/loongson/Kconfig | 1 - + arch/mips/loongson/lemote-2f/clock.c | 5 +- + arch/mips/math-emu/Makefile | 2 + + arch/mips/math-emu/cp1emu.c | 185 ++++++--------- + arch/mips/math-emu/dp_add.c | 2 +- + arch/mips/math-emu/dp_cmp.c | 2 +- + arch/mips/math-emu/dp_div.c | 2 +- + arch/mips/math-emu/dp_fint.c | 4 +- + arch/mips/math-emu/dp_flong.c | 4 +- + arch/mips/math-emu/dp_frexp.c | 2 +- + arch/mips/math-emu/dp_fsp.c | 2 +- + arch/mips/math-emu/dp_logb.c | 2 +- + arch/mips/math-emu/dp_modf.c | 2 +- + arch/mips/math-emu/dp_mul.c | 2 +- + arch/mips/math-emu/dp_scalb.c | 4 +- + arch/mips/math-emu/dp_simple.c | 10 +- + arch/mips/math-emu/dp_sqrt.c | 4 +- + arch/mips/math-emu/dp_sub.c | 2 +- + arch/mips/math-emu/dp_tint.c | 7 +- + arch/mips/math-emu/dp_tlong.c | 6 +- + arch/mips/math-emu/dsemul.c | 26 +-- + arch/mips/math-emu/ieee754.c | 9 +- + arch/mips/math-emu/ieee754.h | 267 ++++++++++------------ + arch/mips/math-emu/ieee754d.c | 7 +- + arch/mips/math-emu/ieee754dp.c | 19 +- + arch/mips/math-emu/ieee754dp.h | 43 ++-- + arch/mips/math-emu/ieee754int.h | 146 ++++++------ + arch/mips/math-emu/ieee754m.c | 12 +- + arch/mips/math-emu/ieee754sp.c | 22 +- + arch/mips/math-emu/ieee754sp.h | 58 ++--- + arch/mips/math-emu/ieee754xcpt.c | 5 +- + arch/mips/math-emu/kernel_linkage.c | 7 +- + arch/mips/math-emu/me-debugfs.c | 62 +++++ + arch/mips/math-emu/sp_add.c | 2 +- + arch/mips/math-emu/sp_cmp.c | 2 +- + arch/mips/math-emu/sp_div.c | 2 +- + arch/mips/math-emu/sp_fdp.c | 4 +- + arch/mips/math-emu/sp_fint.c | 4 +- + arch/mips/math-emu/sp_flong.c | 4 +- + arch/mips/math-emu/sp_frexp.c | 2 +- + arch/mips/math-emu/sp_logb.c | 2 +- + arch/mips/math-emu/sp_modf.c | 2 +- + arch/mips/math-emu/sp_mul.c | 2 +- + arch/mips/math-emu/sp_scalb.c | 4 +- + arch/mips/math-emu/sp_simple.c | 10 +- + arch/mips/math-emu/sp_sqrt.c | 2 +- + arch/mips/math-emu/sp_sub.c | 2 +- + arch/mips/math-emu/sp_tint.c | 7 +- + arch/mips/math-emu/sp_tlong.c | 6 +- + drivers/cpufreq/loongson2_cpufreq.c | 4 +- + 66 files changed, 807 insertions(+), 946 deletions(-) + delete mode 100644 arch/mips/dec/prom/call_o32.S + delete mode 100644 arch/mips/include/asm/rm9k-ocd.h + create mode 100644 arch/mips/include/uapi/asm/bitfield.h + create mode 100644 arch/mips/math-emu/me-debugfs.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 (ab3e55b119c9 parisc: fix epoll_pwait syscall on compat kernel) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/include/asm/shmparam.h | 5 ++--- + arch/parisc/kernel/cache.c | 3 ++- + arch/parisc/kernel/sys_parisc.c | 14 +++++++------- + arch/parisc/kernel/syscall_table.S | 2 +- + arch/parisc/lib/memcpy.c | 2 +- + arch/parisc/mm/fault.c | 2 +- + 6 files changed, 14 insertions(+), 14 deletions(-) +Merging powerpc/next (cd427485357c Merge remote-tracking branch 'scott/next' into next) +$ 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 (4c0fda161346 s390/cmma: remove "cmma disable" code in case of dump again) +$ git merge s390/features +Auto-merging arch/s390/Kconfig +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 13 +- + arch/s390/include/asm/lowcore.h | 5 +- + arch/s390/include/asm/setup.h | 16 +- + arch/s390/include/asm/spinlock.h | 134 ++++++---- + arch/s390/include/asm/spinlock_types.h | 23 +- + arch/s390/kernel/crash_dump.c | 83 +++--- + arch/s390/kernel/early.c | 6 + + arch/s390/kernel/head31.S | 1 - + arch/s390/kernel/setup.c | 455 ++++++++++++--------------------- + arch/s390/kernel/smp.c | 3 + + arch/s390/kernel/topology.c | 4 +- + arch/s390/lib/spinlock.c | 147 ++++++++--- + arch/s390/mm/mem_detect.c | 130 +++------- + arch/s390/mm/page-states.c | 10 - + arch/s390/mm/vmem.c | 30 +-- + drivers/s390/char/zcore.c | 44 +--- + include/linux/memblock.h | 79 +++++- + mm/Kconfig | 3 + + mm/memblock.c | 205 ++++++++++----- + 19 files changed, 714 insertions(+), 677 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 (5eb0bdf84433 arch/tile: remove unused variable 'devcap') +$ 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 b9933913e5e8] 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 (cfe8255f0afc xtensa: xt2000: drop redundant sysmem initialization) +$ git merge xtensa/for_next +Auto-merging arch/xtensa/Kconfig +Merge made by the 'recursive' strategy. + arch/xtensa/Kconfig | 19 ++ + arch/xtensa/boot/dts/kc705.dts | 11 + + arch/xtensa/boot/dts/xtfpga-flash-128m.dtsi | 28 +++ + arch/xtensa/boot/dts/xtfpga-flash-16m.dtsi | 48 ++--- + arch/xtensa/boot/dts/xtfpga-flash-4m.dtsi | 32 +-- + arch/xtensa/boot/dts/xtfpga.dtsi | 37 ++-- + arch/xtensa/include/asm/bootparam.h | 13 +- + arch/xtensa/include/asm/fixmap.h | 58 ++++++ + arch/xtensa/include/asm/highmem.h | 45 ++++- + arch/xtensa/include/asm/pgtable.h | 4 + + arch/xtensa/include/asm/sysmem.h | 38 ++++ + arch/xtensa/include/asm/tlbflush.h | 11 +- + arch/xtensa/kernel/setup.c | 46 +---- + arch/xtensa/kernel/smp.c | 15 ++ + arch/xtensa/kernel/xtensa_ksyms.c | 7 + + arch/xtensa/mm/Makefile | 1 + + arch/xtensa/mm/cache.c | 7 +- + arch/xtensa/mm/highmem.c | 72 +++++++ + arch/xtensa/mm/init.c | 299 +++++++++++++++++++++++----- + arch/xtensa/mm/mmu.c | 36 ++++ + arch/xtensa/mm/tlb.c | 15 ++ + arch/xtensa/platforms/xt2000/setup.c | 12 +- + scripts/sortextable.c | 5 + + 23 files changed, 694 insertions(+), 165 deletions(-) + create mode 100644 arch/xtensa/boot/dts/kc705.dts + create mode 100644 arch/xtensa/boot/dts/xtfpga-flash-128m.dtsi + create mode 100644 arch/xtensa/include/asm/fixmap.h + create mode 100644 arch/xtensa/include/asm/sysmem.h + create mode 100644 arch/xtensa/mm/highmem.c +Merging btrfs/next (00fdf13a2e9f Btrfs: fix a crash of clone with inline extents's split) +$ git merge btrfs/next +Already up-to-date. +Merging ceph/master (a30be7cb2ccb ceph: skip invalid dentry during dcache readdir) +$ git merge ceph/master +Already up-to-date. +Merging cifs/for-next (a5a64da8c4e5 fs: cifs: remove unused variable.) +$ git merge cifs/for-next +Auto-merging fs/cifs/file.c +Auto-merging fs/cifs/cifsfs.c +Merge made by the 'recursive' strategy. + fs/cifs/cifsfs.c | 14 +++++++++- + fs/cifs/cifsglob.h | 8 ++++++ + fs/cifs/cifsproto.h | 3 +++ + fs/cifs/cifssmb.c | 3 +++ + fs/cifs/file.c | 31 +++++++++++++++++++--- + fs/cifs/misc.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++-- + fs/cifs/smb1ops.c | 11 ++++++++ + fs/cifs/smb2misc.c | 18 ++++++++++--- + fs/cifs/smb2ops.c | 14 ++++++++++ + fs/cifs/smb2pdu.c | 2 -- + 10 files changed, 167 insertions(+), 11 deletions(-) +Merging configfs/linux-next (b930c26416c4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs) +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next (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 (01d8885785a6 reiserfs: fix race in readdir) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (dd346d66aa92 i386: add renameat2 syscall) +$ git merge ext4/dev +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/open.c +Auto-merging fs/ext4/file.c +Auto-merging fs/ceph/file.c +Merge made by the 'recursive' strategy. + fs/ceph/file.c | 3 - + fs/ext4/balloc.c | 2 +- + fs/ext4/ext4.h | 43 ++---- + fs/ext4/ext4_extents.h | 22 ++-- + fs/ext4/extents.c | 309 +++++++++++++++++++++++++------------------- + fs/ext4/extents_status.c | 4 +- + fs/ext4/file.c | 152 +++++++++++----------- + fs/ext4/inode.c | 118 +++++++++-------- + fs/ext4/mballoc.c | 18 ++- + fs/ext4/move_extent.c | 38 +++--- + fs/ext4/namei.c | 3 +- + fs/ext4/page-io.c | 5 +- + fs/ext4/super.c | 54 ++++---- + fs/ext4/xattr.c | 23 +++- + fs/open.c | 21 ++- + fs/xfs/xfs_file.c | 10 +- + include/trace/events/ext4.h | 18 +-- + 17 files changed, 449 insertions(+), 394 deletions(-) +Merging f2fs/dev (350ca07320d4 f2fs: remove costly dirty_dir_inode operations) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + fs/f2fs/checkpoint.c | 63 +++++++++++++++++----------------------------------- + fs/f2fs/data.c | 10 +++------ + fs/f2fs/f2fs.h | 4 +++- + fs/f2fs/inline.c | 13 ++++++----- + fs/f2fs/node.c | 5 +---- + fs/f2fs/recovery.c | 18 ++++++++------- + fs/f2fs/segment.c | 25 +++++++++++++++------ + fs/f2fs/super.c | 4 ++-- + 8 files changed, 64 insertions(+), 78 deletions(-) +Merging fscache/fscache (fe02fb3ec109 FS-Cache: Handle removal of unadded object to the fscache_object_list rb tree) +$ git merge fscache/fscache +Merge made by the 'recursive' strategy. +Merging fuse/for-next (f3846266f593 fuse: fix "uninitialized variable" warning) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master (c9eaa447e77e Linux 3.15-rc1) +$ git merge gfs2/master +Already up-to-date. +Merging jfs/jfs-next (24e4a0f3de21 fs/jfs/jfs_inode.c: atomically set inode->i_flags) +$ git merge jfs/jfs-next +Merge made by the 'recursive' strategy. + fs/jfs/jfs_inode.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) +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 (1f2edbe3fe21 NFS: Don't ignore suid/sgid bit changes after a successful write) +$ git merge nfs/linux-next +Merge made by the 'recursive' strategy. + fs/nfs/getroot.c | 3 ++- + fs/nfs/inode.c | 26 +++++++++++++++++--------- + fs/nfs/write.c | 35 +++++++++++++++++++++++++++++++++-- + 3 files changed, 52 insertions(+), 12 deletions(-) +Merging nfsd/nfsd-next (06f9cc12caa8 nfsd4: don't create unnecessary mask acl) +$ git merge nfsd/nfsd-next +Already up-to-date. +Merging omfs/for-next (976d167615b6 Linux 3.1-rc9) +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master (6d565409503f Squashfs: fix failure to unlock pages on decompress error) +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next (c9eaa447e77e Linux 3.15-rc1) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (d56030ac25d3 UBI: block: Remove __initdata from ubiblock_param_ops) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (330033d697ed xfs: fix tmpfile/selinux deadlock and initialize security) +$ git merge xfs/for-next +Auto-merging fs/xfs/xfs_file.c +Merge made by the 'recursive' strategy. + fs/xfs/xfs_aops.c | 51 ++++++++++++++++++++++++++++++++++++++++++------ + fs/xfs/xfs_bmap.c | 17 ++++++++++------ + fs/xfs/xfs_bmap_util.c | 13 ++++++++++++- + fs/xfs/xfs_buf.c | 16 +++++++++++---- + fs/xfs/xfs_file.c | 2 +- + fs/xfs/xfs_inode.c | 5 +++-- + fs/xfs/xfs_inode.h | 2 +- + fs/xfs/xfs_iops.c | 20 ++++++++++++++++--- + fs/xfs/xfs_log.c | 53 +++++++++++++++++++++++++++++++++++++++++--------- + fs/xfs/xfs_trace.h | 1 + + 10 files changed, 147 insertions(+), 33 deletions(-) +Merging file-private-locks/linux-next (f1c6bb2cb8b8 locks: allow __break_lease to sleep even when break_time is 0) +$ git merge file-private-locks/linux-next +Merge made by the 'recursive' strategy. + fs/locks.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 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 (c9eaa447e77e Linux 3.15-rc1) +$ git merge pci/next +Already up-to-date. +Merging hid/for-next (12e5706a47c2 Merge branch 'for-3.16/rmi4' into for-next) +$ git merge hid/for-next +Auto-merging drivers/leds/Kconfig +Removing Documentation/ABI/testing/sysfs-driver-hid-thingm +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-driver-hid-thingm | 23 - + drivers/hid/Kconfig | 8 + + drivers/hid/Makefile | 1 + + drivers/hid/hid-core.c | 2 + + drivers/hid/hid-rmi.c | 888 ++++++++++++++++++++++ + drivers/hid/hid-thingm.c | 361 +++++---- + drivers/leds/Kconfig | 2 + + include/linux/hid.h | 2 + + 8 files changed, 1104 insertions(+), 183 deletions(-) + delete mode 100644 Documentation/ABI/testing/sysfs-driver-hid-thingm + create mode 100644 drivers/hid/hid-rmi.c +Merging i2c/i2c/for-next (9e897e13bd46 Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd) +$ git merge i2c/i2c/for-next +Already up-to-date. +Merging jdelvare-hwmon/master (455c6fdbd219 Linux 3.14) +$ git merge jdelvare-hwmon/master +Already up-to-date. +Merging hwmon-staging/hwmon-next (046f3ea7c6af hwmon: (lm77) Drop FSF mailing address) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + drivers/hwmon/lm70.c | 62 ++++------------- + drivers/hwmon/lm77.c | 177 ++++++++++++++++++++++--------------------------- + drivers/hwmon/tmp102.c | 62 ++++++++--------- + drivers/hwmon/tmp421.c | 47 +++++-------- + 4 files changed, 138 insertions(+), 210 deletions(-) +Merging v4l-dvb/master (b40dfe97cc3a Merge branch 'v4l_for_linus' into to_next) +$ git merge v4l-dvb/master +Merge made by the 'recursive' strategy. + drivers/media/i2c/s5c73m3/s5c73m3-core.c | 2 +- + drivers/media/platform/davinci/vpbe_display.c | 16 +++++++- + drivers/media/platform/davinci/vpfe_capture.c | 2 + + drivers/media/platform/davinci/vpif_capture.c | 34 +++++++++++------ + drivers/media/platform/davinci/vpif_display.c | 35 +++++++++++------ + drivers/media/platform/exynos4-is/fimc-core.c | 2 +- + drivers/media/usb/dvb-usb-v2/Makefile | 1 - + drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 48 +++++++++++++++++++++--- + drivers/media/usb/gspca/sonixb.c | 2 - + drivers/staging/media/davinci_vpfe/vpfe_video.c | 13 ++++++- + drivers/staging/media/sn9c102/sn9c102_devtable.h | 2 - + 11 files changed, 119 insertions(+), 38 deletions(-) +Merging kbuild/for-next (de71647f7af0 Merge branch 'kbuild/kbuild' into kbuild/for-next) +$ git merge kbuild/for-next +Merge made by the 'recursive' strategy. + .gitignore | 4 +- + Documentation/lto-build | 173 +++++++++++++++++++++++++++++++++++++++++++++ + Makefile | 25 +++++-- + arch/x86/Kconfig | 2 +- + init/Kconfig | 73 +++++++++++++++++++ + kernel/gcov/Kconfig | 2 +- + lib/Kconfig.debug | 2 +- + scripts/Makefile.build | 61 ---------------- + scripts/Makefile.extrawarn | 67 ++++++++++++++++++ + scripts/Makefile.lto | 84 ++++++++++++++++++++++ + scripts/Makefile.modpost | 7 +- + scripts/link-vmlinux.sh | 2 +- + scripts/tags.sh | 6 +- + 13 files changed, 431 insertions(+), 77 deletions(-) + create mode 100644 Documentation/lto-build + create mode 100644 scripts/Makefile.extrawarn + create mode 100644 scripts/Makefile.lto +Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings) +$ git merge kconfig/for-next +Already up-to-date. +Merging libata/for-next (73ff0e9080ed Merge branch 'for-3.15-fixes' into for-next) +$ git merge libata/for-next +Merge made by the 'recursive' strategy. + drivers/ata/Kconfig | 5 ++--- + drivers/ata/ahci.c | 12 ++++------- + drivers/ata/libata-core.c | 6 ++++-- + drivers/ata/pata_arasan_cf.c | 7 ++++-- + drivers/ata/pata_at91.c | 11 +++++----- + drivers/ata/pata_octeon_cf.c | 50 +++++++++++++++---------------------------- + drivers/ata/pata_samsung_cf.c | 10 ++++++--- + 7 files changed, 45 insertions(+), 56 deletions(-) +Merging pm/linux-next (19ce7f3f3110 Merge branch 'acpi-config') +$ git merge pm/linux-next +Already up-to-date. +Merging idle/next (23a299cd9378 Merge branches 'turbostat' and 'intel_idle' into release) +$ git merge idle/next +Already up-to-date. +Merging apm/for-next (158204397034 apm-emulation: add hibernation APM events to support suspend2disk) +$ git merge apm/for-next +Already up-to-date. +Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles) +$ git merge cpupowerutils/master +Already up-to-date. +Merging thermal/next (9477165ec525 thermal: rcar-thermal: update thermal zone only when temperature changes) +$ git merge thermal/next +Already up-to-date. +Merging ieee1394/for-next (0ca49345b6f4 firewire: ohci: fix probe failure with Agere/LSI controllers) +$ git merge ieee1394/for-next +Already up-to-date. +Merging dlm/next (075f01775f53 dlm: use INFO for recovery messages) +$ 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 (8edc51c197b8 dma: fix eDMA driver as a subsys_initcall) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. + drivers/dma/Kconfig | 2 +- + drivers/dma/edma.c | 6 ++++-- + drivers/dma/fsl-edma.c | 12 +++++++++++- + drivers/dma/sirf-dma.c | 2 +- + drivers/media/platform/Kconfig | 2 +- + 5 files changed, 18 insertions(+), 6 deletions(-) +Merging dmaengine/next (b9bf6d2e84b7 dma: mv_xor: Flush descriptors before activating a channel) +$ git merge dmaengine/next +Auto-merging include/linux/dmaengine.h +Auto-merging drivers/dma/dmaengine.c +Merge made by the 'recursive' strategy. + drivers/dma/dmaengine.c | 2 ++ + drivers/dma/ioat/dca.c | 13 +++---- + drivers/dma/ioat/dma.c | 2 +- + drivers/dma/ioat/dma_v3.c | 6 ++-- + drivers/dma/mv_xor.c | 88 +++++++++++++++++++++++++++++++++++------------ + include/linux/dmaengine.h | 1 + + 6 files changed, 80 insertions(+), 32 deletions(-) +Merging net-next/master (cd6362befe4c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next) +$ git merge net-next/master +Already up-to-date. +Merging ipsec-next/master (cd6362befe4c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next) +$ git merge ipsec-next/master +Already up-to-date. +Merging wireless-next/master (321d03c86732 Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild) +$ git merge wireless-next/master +Already up-to-date. +Merging bluetooth/master (899704633969 Bluetooth: Fix redundant encryption request for reauthentication) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/btmrvl_drv.h | 2 + + drivers/bluetooth/btmrvl_main.c | 17 +++ + drivers/bluetooth/btmrvl_sdio.c | 103 ++++++++++++---- + drivers/bluetooth/btmrvl_sdio.h | 3 + + include/net/bluetooth/hci.h | 1 + + include/net/bluetooth/hci_core.h | 13 +- + net/bluetooth/hci_conn.c | 90 ++++++++++++-- + net/bluetooth/hci_core.c | 20 ++-- + net/bluetooth/hci_event.c | 252 +++++++++++++++++++++++++++++---------- + net/bluetooth/lib.c | 1 + + net/bluetooth/mgmt.c | 36 +++--- + 11 files changed, 416 insertions(+), 122 deletions(-) +Merging infiniband/for-next (5ae2866f5264 Merge branches 'cxgb4', 'misc', 'mlx5' and 'qib' into for-next) +$ git merge infiniband/for-next +Merge made by the 'recursive' strategy. + drivers/infiniband/hw/cxgb4/cm.c | 89 ++++++++++++++++++++------------ + drivers/infiniband/hw/cxgb4/cq.c | 24 ++++----- + drivers/infiniband/hw/cxgb4/device.c | 41 ++++++++++++--- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 2 + + drivers/infiniband/hw/cxgb4/mem.c | 6 ++- + drivers/infiniband/hw/cxgb4/provider.c | 2 +- + drivers/infiniband/hw/cxgb4/qp.c | 70 +++++++++++++++---------- + drivers/infiniband/hw/cxgb4/resource.c | 10 ++-- + drivers/infiniband/hw/cxgb4/t4.h | 72 ++++++++++++++++++++++++-- + drivers/infiniband/hw/mlx5/main.c | 2 + + drivers/infiniband/hw/mlx5/qp.c | 12 +++++ + drivers/infiniband/hw/mthca/mthca_main.c | 8 +-- + drivers/infiniband/hw/qib/qib_pcie.c | 55 ++++++++++---------- + include/linux/mlx5/device.h | 1 + + include/linux/mlx5/qp.h | 1 + + 15 files changed, 270 insertions(+), 125 deletions(-) +Merging mtd/master (c9eaa447e77e Linux 3.15-rc1) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (6189cccbe8d1 mtd: gpmi: add gpmi_devdata{} to simplify the code) +$ git merge l2-mtd/master +Merge made by the 'recursive' strategy. + drivers/mtd/mtd_blkdevs.c | 6 ++++ + drivers/mtd/nand/davinci_nand.c | 6 ++++ + drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 5 +--- + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 53 ++++++++++++++++++---------------- + drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 28 +++++++++++------- + drivers/mtd/nand/nand_base.c | 3 +- + drivers/mtd/nand/nand_ecc.c | 2 +- + drivers/mtd/nand/omap2.c | 2 +- + 8 files changed, 61 insertions(+), 44 deletions(-) +Merging crypto/master (f51f593b3eb1 crypto: omap-des - handle error of pm_runtime_get_sync) +$ git merge crypto/master +Recorded preimage for 'drivers/char/hw_random/Kconfig' +CONFLICT (rename/delete): drivers/crypto/bfin_crc.h deleted in HEAD and renamed in crypto/master. Version crypto/master of drivers/crypto/bfin_crc.h left in tree. +Removing drivers/char/hw_random/picoxcell-rng.c +Auto-merging drivers/char/hw_random/Kconfig +CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/char/hw_random/Kconfig'. +[master 37c6149f0de5] Merge remote-tracking branch 'crypto/master' +$ git diff -M --stat --summary HEAD^.. + arch/x86/crypto/ghash-clmulni-intel_asm.S | 4 +- + arch/x86/crypto/ghash-clmulni-intel_glue.c | 12 +- + crypto/testmgr.h | 775 ++++++++++++++++++++++++++++- + drivers/char/hw_random/Kconfig | 103 ++-- + drivers/char/hw_random/Makefile | 1 - + drivers/char/hw_random/picoxcell-rng.c | 181 ------- + drivers/crypto/bfin_crc.c | 103 ++-- + drivers/crypto/bfin_crc.h | 125 +++++ + drivers/crypto/ccp/ccp-pci.c | 7 +- + drivers/crypto/nx/nx-842.c | 4 +- + drivers/crypto/omap-des.c | 33 +- + 11 files changed, 1036 insertions(+), 312 deletions(-) + delete mode 100644 drivers/char/hw_random/picoxcell-rng.c + create mode 100644 drivers/crypto/bfin_crc.h +Merging drm/drm-next (c39b06951f1d DRM: armada: fix corruption while loading cursors) +$ git merge drm/drm-next +Already up-to-date. +Merging drm-intel/for-linux-next (c79057922ed6 drm/i915: Remove vblank wait from haswell_write_eld) +$ git merge drm-intel/for-linux-next +Resolved 'drivers/gpu/drm/i915/i915_gem_context.c' using previous resolution. +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_panel.c +Auto-merging drivers/gpu/drm/i915/intel_hdmi.c +Auto-merging drivers/gpu/drm/i915/intel_bios.h +Auto-merging drivers/gpu/drm/i915/intel_bios.c +Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/i915_gem_context.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_context.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/Kconfig +Auto-merging drivers/gpu/drm/drm_cache.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master bc5524d06a9e] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/drm_cache.c | 4 +- + drivers/gpu/drm/i915/Kconfig | 2 +- + drivers/gpu/drm/i915/dvo_ch7xxx.c | 2 +- + drivers/gpu/drm/i915/dvo_ivch.c | 2 +- + drivers/gpu/drm/i915/dvo_ns2501.c | 24 +- + drivers/gpu/drm/i915/dvo_sil164.c | 2 +- + drivers/gpu/drm/i915/dvo_tfp410.c | 2 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 616 +++++++++++++++++++++++++---- + drivers/gpu/drm/i915/i915_debugfs.c | 25 +- + drivers/gpu/drm/i915/i915_dma.c | 3 + + drivers/gpu/drm/i915/i915_drv.c | 53 ++- + drivers/gpu/drm/i915/i915_drv.h | 265 +++---------- + drivers/gpu/drm/i915/i915_gem.c | 5 +- + drivers/gpu/drm/i915/i915_gem_context.c | 18 +- + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 6 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 3 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 75 +--- + drivers/gpu/drm/i915/i915_gem_gtt.h | 283 +++++++++++++ + drivers/gpu/drm/i915/i915_gpu_error.c | 23 +- + drivers/gpu/drm/i915/i915_irq.c | 504 +++++++++++------------ + drivers/gpu/drm/i915/i915_params.c | 8 +- + drivers/gpu/drm/i915/i915_reg.h | 117 +++++- + drivers/gpu/drm/i915/intel_bios.c | 242 +++++++++++- + drivers/gpu/drm/i915/intel_bios.h | 60 +++ + drivers/gpu/drm/i915/intel_display.c | 283 ++++++------- + drivers/gpu/drm/i915/intel_dp.c | 197 ++++++++- + drivers/gpu/drm/i915/intel_drv.h | 35 +- + drivers/gpu/drm/i915/intel_dsi.c | 125 ++++-- + drivers/gpu/drm/i915/intel_dsi.h | 4 +- + drivers/gpu/drm/i915/intel_dsi_cmd.c | 4 +- + drivers/gpu/drm/i915/intel_dsi_cmd.h | 5 +- + drivers/gpu/drm/i915/intel_hdmi.c | 38 +- + drivers/gpu/drm/i915/intel_lvds.c | 7 - + drivers/gpu/drm/i915/intel_panel.c | 8 +- + drivers/gpu/drm/i915/intel_pm.c | 219 ++++++---- + drivers/gpu/drm/i915/intel_ringbuffer.c | 75 ++-- + drivers/gpu/drm/i915/intel_ringbuffer.h | 5 +- + drivers/gpu/drm/i915/intel_sdvo.c | 4 +- + drivers/gpu/drm/i915/intel_sideband.c | 8 + + drivers/gpu/drm/i915/intel_uncore.c | 24 +- + include/drm/drmP.h | 2 +- + include/uapi/drm/i915_drm.h | 1 + + 42 files changed, 2354 insertions(+), 1034 deletions(-) + create mode 100644 drivers/gpu/drm/i915/i915_gem_gtt.h +Merging drm-tegra/drm/for-next (3d1c1474386e drm/tegra: Use standard GPL v2 license text) +$ git merge drm-tegra/drm/for-next +Merge made by the 'recursive' strategy. +Merging sound/for-next (00d90154404a ALSA: pcm: 'BUG:' message unnecessarily triggers kerneloops) +$ git merge sound/for-next +Merge made by the 'recursive' strategy. + include/sound/atmel-ac97c.h | 2 - + sound/atmel/ac97c.c | 15 +- + sound/core/pcm_lib.c | 2 +- + sound/usb/Kconfig | 13 ++ + sound/usb/Makefile | 2 +- + sound/usb/bcd2000/Makefile | 3 + + sound/usb/bcd2000/bcd2000.c | 461 ++++++++++++++++++++++++++++++++++++++++++++ + 7 files changed, 481 insertions(+), 17 deletions(-) + create mode 100644 sound/usb/bcd2000/Makefile + create mode 100644 sound/usb/bcd2000/bcd2000.c +Merging sound-asoc/for-next (df9a50e93aa5 Merge remote-tracking branches 'asoc/topic/rt5640', 'asoc/topic/sirf', 'asoc/topic/sta350' and 'asoc/topic/tmp-of' into asoc-next) +$ git merge sound-asoc/for-next +Removing sound/soc/sirf/sirf-audio-port.h +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/ak5386.txt | 4 + + .../devicetree/bindings/sound/fsl-sai.txt | 11 +- + Documentation/devicetree/bindings/sound/rt5640.txt | 13 +- + .../devicetree/bindings/sound/st,sta350.txt | 107 ++ + include/linux/of.h | 5 + + include/sound/rt5640.h | 4 + + include/sound/soc-dapm.h | 12 - + include/sound/soc.h | 68 +- + include/sound/sta350.h | 52 + + sound/soc/codecs/88pm860x-codec.c | 20 +- + sound/soc/codecs/Kconfig | 11 +- + sound/soc/codecs/Makefile | 4 + + sound/soc/codecs/ab8500-codec.c | 12 +- + sound/soc/codecs/adau1373.c | 7 +- + sound/soc/codecs/adav80x.c | 12 +- + sound/soc/codecs/ak4641.c | 4 +- + sound/soc/codecs/ak5386.c | 50 + + sound/soc/codecs/alc5623.c | 2 +- + sound/soc/codecs/arizona.h | 4 +- + sound/soc/codecs/cq93vc.c | 10 +- + sound/soc/codecs/cs4270.c | 2 +- + sound/soc/codecs/cs4271.c | 4 +- + sound/soc/codecs/cs42l51-i2c.c | 59 + + sound/soc/codecs/cs42l51.c | 79 +- + sound/soc/codecs/cs42l51.h | 5 + + sound/soc/codecs/da7210.c | 4 +- + sound/soc/codecs/da7213.c | 4 +- + sound/soc/codecs/da732x.c | 4 +- + sound/soc/codecs/da9055.c | 2 +- + sound/soc/codecs/hdmi.c | 1 + + sound/soc/codecs/lm4857.c | 4 +- + sound/soc/codecs/max9768.c | 4 +- + sound/soc/codecs/max98088.c | 12 +- + sound/soc/codecs/max98090.c | 10 +- + sound/soc/codecs/max98095.c | 16 +- + sound/soc/codecs/mc13783.c | 22 +- + sound/soc/codecs/pcm1681.c | 4 +- + sound/soc/codecs/pcm512x.c | 4 +- + sound/soc/codecs/rt5631.c | 4 +- + sound/soc/codecs/rt5640.c | 417 ++++--- + sound/soc/codecs/rt5640.h | 6 +- + sound/soc/codecs/sgtl5000.c | 4 +- + sound/soc/codecs/si476x.c | 14 +- + sound/soc/codecs/sirf-audio-codec.c | 74 +- + sound/soc/codecs/sirf-audio-codec.h | 50 + + sound/soc/codecs/sta32x.c | 4 +- + sound/soc/codecs/sta350.c | 1266 ++++++++++++++++++++ + sound/soc/codecs/sta350.h | 228 ++++ + sound/soc/codecs/tas5086.c | 4 +- + sound/soc/codecs/tlv320aic23-i2c.c | 1 + + sound/soc/codecs/tlv320aic23.c | 4 +- + sound/soc/codecs/tlv320aic31xx.c | 1 + + sound/soc/codecs/tlv320aic3x.c | 9 +- + sound/soc/codecs/tlv320dac33.c | 4 +- + sound/soc/codecs/tpa6130a2.c | 1 + + sound/soc/codecs/twl4030.c | 10 +- + sound/soc/codecs/twl6040.c | 8 +- + sound/soc/codecs/wl1273.c | 12 +- + sound/soc/codecs/wm2000.c | 8 +- + sound/soc/codecs/wm2200.c | 4 +- + sound/soc/codecs/wm5100.c | 4 +- + sound/soc/codecs/wm5102.c | 26 +- + sound/soc/codecs/wm5110.c | 35 +- + sound/soc/codecs/wm8350.c | 14 +- + sound/soc/codecs/wm8400.c | 12 +- + sound/soc/codecs/wm8580.c | 2 +- + sound/soc/codecs/wm8731.c | 4 +- + sound/soc/codecs/wm8753.c | 4 +- + sound/soc/codecs/wm8804.c | 4 +- + sound/soc/codecs/wm8903.c | 4 +- + sound/soc/codecs/wm8904.c | 14 +- + sound/soc/codecs/wm8955.c | 4 +- + sound/soc/codecs/wm8958-dsp2.c | 32 +- + sound/soc/codecs/wm8960.c | 4 +- + sound/soc/codecs/wm8962.c | 8 +- + sound/soc/codecs/wm8983.c | 4 +- + sound/soc/codecs/wm8985.c | 4 +- + sound/soc/codecs/wm8988.c | 8 +- + sound/soc/codecs/wm8990.c | 2 +- + sound/soc/codecs/wm8991.c | 2 +- + sound/soc/codecs/wm8994.c | 32 +- + sound/soc/codecs/wm8995.c | 10 +- + sound/soc/codecs/wm8996.c | 4 +- + sound/soc/codecs/wm8997.c | 25 +- + sound/soc/codecs/wm9081.c | 4 +- + sound/soc/codecs/wm_adsp.c | 4 +- + sound/soc/codecs/wm_hubs.c | 2 +- + sound/soc/davinci/davinci-mcasp.c | 217 ++-- + sound/soc/davinci/davinci-mcasp.h | 1 + + sound/soc/davinci/davinci-pcm.h | 10 + + sound/soc/fsl/Kconfig | 57 +- + sound/soc/fsl/fsl_esai.c | 9 +- + sound/soc/fsl/fsl_sai.c | 255 ++-- + sound/soc/fsl/fsl_sai.h | 16 + + sound/soc/fsl/fsl_spdif.c | 9 +- + sound/soc/fsl/fsl_ssi.c | 150 +-- + sound/soc/intel/sst-firmware.c | 4 +- + sound/soc/intel/sst-haswell-ipc.c | 3 +- + sound/soc/intel/sst-haswell-pcm.c | 8 +- + sound/soc/omap/ams-delta.c | 64 +- + sound/soc/omap/omap3pandora.c | 31 +- + sound/soc/omap/rx51.c | 47 +- + sound/soc/sh/rcar/src.c | 4 +- + sound/soc/sh/rcar/ssi.c | 4 +- + sound/soc/sirf/sirf-audio-port.c | 107 -- + sound/soc/sirf/sirf-audio-port.h | 62 - + sound/soc/soc-cache.c | 2 - + sound/soc/soc-core.c | 541 ++++----- + sound/soc/soc-io.c | 153 ++- + 109 files changed, 3354 insertions(+), 1457 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/st,sta350.txt + create mode 100644 include/sound/sta350.h + create mode 100644 sound/soc/codecs/cs42l51-i2c.c + create mode 100644 sound/soc/codecs/sta350.c + create mode 100644 sound/soc/codecs/sta350.h + delete mode 100644 sound/soc/sirf/sirf-audio-port.h +Merging modules/modules-next (22c9bcad859d staging: fix up speakup kobject mode) +$ git merge modules/modules-next +Already up-to-date. +Merging virtio/virtio-next (fc4324b4597c virtio-blk: base queue-depth on virtqueue ringsize or module param) +$ git merge virtio/virtio-next +Already up-to-date. +Merging input/next (e2c3ecf0ea8e Input: edt-ft5x06 - add a missing condition) +$ git merge input/next +Already up-to-date. +Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) +$ git merge input-mt/for-next +Already up-to-date. +Merging block/for-next (926912e06e3b Merge branch 'for-3.16/drivers' into for-next) +$ git merge block/for-next +Auto-merging drivers/mtd/mtd_blkdevs.c +Merge made by the 'recursive' strategy. + block/blk-core.c | 45 ++-- + block/blk-flush.c | 26 +-- + block/blk-map.c | 3 - + block/blk-mq-cpumap.c | 6 +- + block/blk-mq-sysfs.c | 8 +- + block/blk-mq-tag.c | 14 -- + block/blk-mq-tag.h | 19 +- + block/blk-mq.c | 494 +++++++++++++++++++++++++------------------ + block/blk-mq.h | 8 +- + block/blk-timeout.c | 15 +- + block/bsg.c | 2 +- + block/cfq-iosched.c | 2 +- + drivers/block/amiflop.c | 2 +- + drivers/block/ataflop.c | 2 +- + drivers/block/floppy.c | 18 +- + drivers/block/hd.c | 10 +- + drivers/block/mg_disk.c | 12 +- + drivers/block/null_blk.c | 96 +++++---- + drivers/block/paride/pcd.c | 2 +- + drivers/block/paride/pd.c | 4 +- + drivers/block/paride/pf.c | 4 +- + drivers/block/skd_main.c | 5 +- + drivers/block/swim.c | 2 +- + drivers/block/swim3.c | 6 +- + drivers/block/virtio_blk.c | 73 ++++--- + drivers/block/xen-blkfront.c | 4 +- + drivers/block/xsysace.c | 4 +- + drivers/block/z2ram.c | 6 +- + drivers/cdrom/gdrom.c | 2 +- + drivers/ide/ide-disk.c | 5 +- + drivers/md/dm.c | 1 - + drivers/mtd/mtd_blkdevs.c | 3 +- + drivers/mtd/ubi/block.c | 2 +- + drivers/sbus/char/jsflash.c | 2 +- + drivers/scsi/scsi_lib.c | 5 +- + drivers/scsi/sd.c | 10 +- + include/linux/blk-mq.h | 59 +++--- + include/linux/blkdev.h | 21 +- + 38 files changed, 568 insertions(+), 434 deletions(-) +Merging device-mapper/for-next (ec052772958d Merge branch 'for-3.15' into for-next) +$ git merge device-mapper/for-next +Auto-merging fs/bio.c +Merge made by the 'recursive' strategy. + drivers/md/dm-crypt.c | 427 +++++++++++++++++++++++++------------------------ + drivers/md/dm-thin.c | 75 ++++++++- + drivers/md/dm-verity.c | 15 +- + fs/bio.c | 3 +- + 4 files changed, 297 insertions(+), 223 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 (c67480173f72 mmc: sdhci-acpi: Intel SDIO has broken card detect) +$ 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 (34bf6ef94a83 mm: slab/slub: use page->list consistently instead of page->lru) +$ 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 (e2f23b606b94 md: avoid oops on unload if some process is in poll or select.) +$ git merge md/for-next +Already up-to-date. +Merging mfd/master (90b128ed1557 Merge tag 'mfd-lee-3.13-3' of git://git.linaro.org/people/ljones/mfd) +$ git merge mfd/master +Already up-to-date. +Merging mfd-lj/for-mfd-next (2d28ca731b9b mfd: wm5110: Correct default for HEADPHONE_DETECT_1) +$ git merge mfd-lj/for-mfd-next +Already up-to-date. +Merging battery/master (ac323d8d8070 power: max17040: Fix NULL pointer dereference when there is no platform_data) +$ git merge battery/master +Already up-to-date. +Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path) +$ git merge fbdev/for-next +Already up-to-date. +Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par) +$ git merge viafb/viafb-next +Already up-to-date. +Merging omap_dss2/for-next (d754589d8044 OMAPDSS: add missing __init for dss_init_ports) +$ git merge omap_dss2/for-next +Recorded preimage for 'drivers/video/Kconfig' +Resolved 'drivers/video/Makefile' using previous resolution. +Removing drivers/video/omap2/Kconfig +Auto-merging drivers/video/fbdev/wmt_ge_rops.c +CONFLICT (rename/delete): drivers/video/fbdev/sgivwfb.c deleted in HEAD and renamed in omap_dss2/for-next. Version omap_dss2/for-next of drivers/video/fbdev/sgivwfb.c left in tree. +Auto-merging drivers/video/fbdev/mmp/Kconfig +Auto-merging drivers/video/fbdev/core/fbmon.c +Auto-merging drivers/video/fbdev/core/fb_ddc.c +Auto-merging drivers/video/fbdev/aty/mach64_cursor.c +Auto-merging drivers/video/Makefile +CONFLICT (content): Merge conflict in drivers/video/Makefile +Auto-merging drivers/video/Kconfig +CONFLICT (content): Merge conflict in drivers/video/Kconfig +CONFLICT (rename/rename): Rename "drivers/video/exynos/exynos_dp_reg.h"->"drivers/gpu/drm/exynos/exynos_dp_reg.h" in branch "HEAD" rename "drivers/video/exynos/exynos_dp_reg.h"->"drivers/video/fbdev/exynos/exynos_dp_reg.h" in "omap_dss2/for-next" +CONFLICT (rename/rename): Rename "drivers/video/exynos/exynos_dp_reg.c"->"drivers/gpu/drm/exynos/exynos_dp_reg.c" in branch "HEAD" rename "drivers/video/exynos/exynos_dp_reg.c"->"drivers/video/fbdev/exynos/exynos_dp_reg.c" in "omap_dss2/for-next" +CONFLICT (rename/rename): Rename "drivers/video/exynos/exynos_dp_core.h"->"drivers/gpu/drm/exynos/exynos_dp_core.h" in branch "HEAD" rename "drivers/video/exynos/exynos_dp_core.h"->"drivers/video/fbdev/exynos/exynos_dp_core.h" in "omap_dss2/for-next" +CONFLICT (rename/rename): Rename "drivers/video/exynos/exynos_dp_core.c"->"drivers/gpu/drm/exynos/exynos_dp_core.c" in branch "HEAD" rename "drivers/video/exynos/exynos_dp_core.c"->"drivers/video/fbdev/exynos/exynos_dp_core.c" in "omap_dss2/for-next" +Auto-merging drivers/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/video/fbdev/exynos/exynos_dp_core.c drivers/video/fbdev/exynos/exynos_dp_core.h drivers/video/fbdev/exynos/exynos_dp_reg.c drivers/video/fbdev/exynos/exynos_dp_reg.h drivers/video/exynos/exynos_dp_core.c drivers/video/exynos/exynos_dp_core.h drivers/video/exynos/exynos_dp_reg.c drivers/video/exynos/exynos_dp_reg.h +drivers/video/exynos/exynos_dp_core.c: needs merge +drivers/video/exynos/exynos_dp_core.h: needs merge +drivers/video/exynos/exynos_dp_reg.c: needs merge +drivers/video/exynos/exynos_dp_reg.h: needs merge +drivers/video/fbdev/exynos/exynos_dp_core.c: needs merge +drivers/video/fbdev/exynos/exynos_dp_core.h: needs merge +drivers/video/fbdev/exynos/exynos_dp_reg.c: needs merge +drivers/video/fbdev/exynos/exynos_dp_reg.h: needs merge +rm 'drivers/video/exynos/exynos_dp_core.c' +rm 'drivers/video/exynos/exynos_dp_core.h' +rm 'drivers/video/exynos/exynos_dp_reg.c' +rm 'drivers/video/exynos/exynos_dp_reg.h' +rm 'drivers/video/fbdev/exynos/exynos_dp_core.c' +rm 'drivers/video/fbdev/exynos/exynos_dp_core.h' +rm 'drivers/video/fbdev/exynos/exynos_dp_reg.c' +rm 'drivers/video/fbdev/exynos/exynos_dp_reg.h' +$ git rm -f drivers/video/fbdev/sgivwfb.c +drivers/video/fbdev/sgivwfb.c: needs merge +rm 'drivers/video/fbdev/sgivwfb.c' +$ git commit -v -a +Recorded resolution for 'drivers/video/Kconfig'. +[master a27f49932d0b] Merge remote-tracking branch 'omap_dss2/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/device-drivers.tmpl | 10 +- + drivers/Makefile | 4 +- + drivers/staging/xgifb/vb_def.h | 2 +- + drivers/staging/xgifb/vb_struct.h | 2 +- + drivers/staging/xgifb/vgatypes.h | 4 +- + drivers/video/Kconfig | 2480 +------------------ + drivers/video/Makefile | 166 +- + drivers/video/console/sticon.c | 2 +- + drivers/video/console/sticore.c | 2 +- + drivers/video/{ => fbdev}/68328fb.c | 0 + drivers/video/fbdev/Kconfig | 2481 ++++++++++++++++++++ + drivers/video/fbdev/Makefile | 153 ++ + drivers/video/{ => fbdev}/acornfb.c | 0 + drivers/video/{ => fbdev}/acornfb.h | 0 + drivers/video/{ => fbdev}/amba-clcd.c | 0 + drivers/video/{ => fbdev}/amifb.c | 0 + drivers/video/{ => fbdev}/arcfb.c | 0 + drivers/video/{ => fbdev}/arkfb.c | 0 + drivers/video/{ => fbdev}/asiliantfb.c | 0 + drivers/video/{ => fbdev}/atafb.c | 0 + drivers/video/{ => fbdev}/atafb.h | 0 + drivers/video/{ => fbdev}/atafb_iplan2p2.c | 0 + drivers/video/{ => fbdev}/atafb_iplan2p4.c | 0 + drivers/video/{ => fbdev}/atafb_iplan2p8.c | 0 + drivers/video/{ => fbdev}/atafb_mfb.c | 0 + drivers/video/{ => fbdev}/atafb_utils.h | 0 + drivers/video/{ => fbdev}/atmel_lcdfb.c | 0 + drivers/video/{ => fbdev}/aty/Makefile | 0 + drivers/video/{ => fbdev}/aty/ati_ids.h | 0 + drivers/video/{ => fbdev}/aty/aty128fb.c | 0 + drivers/video/{ => fbdev}/aty/atyfb.h | 0 + drivers/video/{ => fbdev}/aty/atyfb_base.c | 0 + drivers/video/{ => fbdev}/aty/mach64_accel.c | 0 + drivers/video/{ => fbdev}/aty/mach64_ct.c | 0 + drivers/video/{ => fbdev}/aty/mach64_cursor.c | 2 +- + drivers/video/{ => fbdev}/aty/mach64_gx.c | 0 + drivers/video/{ => fbdev}/aty/radeon_accel.c | 0 + drivers/video/{ => fbdev}/aty/radeon_backlight.c | 0 + drivers/video/{ => fbdev}/aty/radeon_base.c | 0 + drivers/video/{ => fbdev}/aty/radeon_i2c.c | 0 + drivers/video/{ => fbdev}/aty/radeon_monitor.c | 0 + drivers/video/{ => fbdev}/aty/radeon_pm.c | 0 + drivers/video/{ => fbdev}/aty/radeonfb.h | 0 + drivers/video/{ => fbdev}/au1100fb.c | 0 + drivers/video/{ => fbdev}/au1100fb.h | 0 + drivers/video/{ => fbdev}/au1200fb.c | 0 + drivers/video/{ => fbdev}/au1200fb.h | 0 + drivers/video/{ => fbdev}/auo_k1900fb.c | 0 + drivers/video/{ => fbdev}/auo_k1901fb.c | 0 + drivers/video/{ => fbdev}/auo_k190x.c | 0 + drivers/video/{ => fbdev}/auo_k190x.h | 0 + drivers/video/{ => fbdev}/bf537-lq035.c | 0 + drivers/video/{ => fbdev}/bf54x-lq043fb.c | 0 + drivers/video/{ => fbdev}/bfin-lq035q1-fb.c | 0 + drivers/video/{ => fbdev}/bfin-t350mcqb-fb.c | 0 + drivers/video/{ => fbdev}/bfin_adv7393fb.c | 0 + drivers/video/{ => fbdev}/bfin_adv7393fb.h | 0 + drivers/video/{ => fbdev}/broadsheetfb.c | 0 + drivers/video/{ => fbdev}/bt431.h | 0 + drivers/video/{ => fbdev}/bt455.h | 0 + drivers/video/{ => fbdev}/bw2.c | 0 + drivers/video/{ => fbdev}/c2p.h | 0 + drivers/video/{ => fbdev}/c2p_core.h | 0 + drivers/video/{ => fbdev}/c2p_iplan2.c | 0 + drivers/video/{ => fbdev}/c2p_planar.c | 0 + drivers/video/{ => fbdev}/carminefb.c | 0 + drivers/video/{ => fbdev}/carminefb.h | 0 + drivers/video/{ => fbdev}/carminefb_regs.h | 0 + drivers/video/{ => fbdev}/cg14.c | 0 + drivers/video/{ => fbdev}/cg3.c | 0 + drivers/video/{ => fbdev}/cg6.c | 0 + drivers/video/{ => fbdev}/chipsfb.c | 0 + drivers/video/{ => fbdev}/cirrusfb.c | 0 + drivers/video/{ => fbdev}/clps711xfb.c | 0 + drivers/video/{ => fbdev}/cobalt_lcdfb.c | 0 + drivers/video/{ => fbdev}/controlfb.c | 0 + drivers/video/{ => fbdev}/controlfb.h | 0 + drivers/video/fbdev/core/Makefile | 16 + + drivers/video/{ => fbdev/core}/cfbcopyarea.c | 0 + drivers/video/{ => fbdev/core}/cfbfillrect.c | 0 + drivers/video/{ => fbdev/core}/cfbimgblt.c | 0 + drivers/video/{ => fbdev/core}/fb_ddc.c | 2 +- + drivers/video/{ => fbdev/core}/fb_defio.c | 0 + drivers/video/{ => fbdev/core}/fb_draw.h | 0 + drivers/video/{ => fbdev/core}/fb_notify.c | 0 + drivers/video/{ => fbdev/core}/fb_sys_fops.c | 0 + drivers/video/{ => fbdev/core}/fbcmap.c | 0 + drivers/video/{ => fbdev/core}/fbcvt.c | 0 + drivers/video/{ => fbdev/core}/fbmem.c | 0 + drivers/video/{ => fbdev/core}/fbmon.c | 2 +- + drivers/video/{ => fbdev/core}/fbsysfs.c | 0 + drivers/video/{ => fbdev/core}/modedb.c | 0 + drivers/video/{ => fbdev/core}/svgalib.c | 0 + drivers/video/{ => fbdev/core}/syscopyarea.c | 0 + drivers/video/{ => fbdev/core}/sysfillrect.c | 0 + drivers/video/{ => fbdev/core}/sysimgblt.c | 0 + drivers/video/{ => fbdev}/cyber2000fb.c | 0 + drivers/video/{ => fbdev}/cyber2000fb.h | 0 + drivers/video/{ => fbdev}/da8xx-fb.c | 0 + drivers/video/{ => fbdev}/dnfb.c | 0 + drivers/video/{ => fbdev}/edid.h | 0 + drivers/video/{ => fbdev}/efifb.c | 0 + drivers/video/{ => fbdev}/ep93xx-fb.c | 0 + drivers/video/{ => fbdev}/exynos/Kconfig | 0 + drivers/video/{ => fbdev}/exynos/Makefile | 0 + drivers/video/{ => fbdev}/exynos/exynos_mipi_dsi.c | 0 + .../{ => fbdev}/exynos/exynos_mipi_dsi_common.c | 0 + .../{ => fbdev}/exynos/exynos_mipi_dsi_common.h | 0 + .../{ => fbdev}/exynos/exynos_mipi_dsi_lowlevel.c | 0 + .../{ => fbdev}/exynos/exynos_mipi_dsi_lowlevel.h | 0 + .../{ => fbdev}/exynos/exynos_mipi_dsi_regs.h | 0 + drivers/video/{ => fbdev}/exynos/s6e8ax0.c | 0 + drivers/video/{ => fbdev}/fb-puv3.c | 0 + drivers/video/{ => fbdev}/ffb.c | 0 + drivers/video/{ => fbdev}/fm2fb.c | 0 + drivers/video/{ => fbdev}/fsl-diu-fb.c | 0 + drivers/video/{ => fbdev}/g364fb.c | 0 + drivers/video/{ => fbdev}/gbefb.c | 0 + drivers/video/{ => fbdev}/geode/Kconfig | 0 + drivers/video/{ => fbdev}/geode/Makefile | 0 + drivers/video/{ => fbdev}/geode/display_gx.c | 0 + drivers/video/{ => fbdev}/geode/display_gx1.c | 0 + drivers/video/{ => fbdev}/geode/display_gx1.h | 0 + drivers/video/{ => fbdev}/geode/geodefb.h | 0 + drivers/video/{ => fbdev}/geode/gx1fb_core.c | 0 + drivers/video/{ => fbdev}/geode/gxfb.h | 0 + drivers/video/{ => fbdev}/geode/gxfb_core.c | 0 + drivers/video/{ => fbdev}/geode/lxfb.h | 0 + drivers/video/{ => fbdev}/geode/lxfb_core.c | 0 + drivers/video/{ => fbdev}/geode/lxfb_ops.c | 0 + drivers/video/{ => fbdev}/geode/suspend_gx.c | 0 + drivers/video/{ => fbdev}/geode/video_cs5530.c | 0 + drivers/video/{ => fbdev}/geode/video_cs5530.h | 0 + drivers/video/{ => fbdev}/geode/video_gx.c | 0 + drivers/video/{ => fbdev}/goldfishfb.c | 0 + drivers/video/{ => fbdev}/grvga.c | 0 + drivers/video/{ => fbdev}/gxt4500.c | 0 + drivers/video/{ => fbdev}/hecubafb.c | 0 + drivers/video/{ => fbdev}/hgafb.c | 0 + drivers/video/{ => fbdev}/hitfb.c | 0 + drivers/video/{ => fbdev}/hpfb.c | 0 + drivers/video/{ => fbdev}/hyperv_fb.c | 0 + drivers/video/{ => fbdev}/i740_reg.h | 0 + drivers/video/{ => fbdev}/i740fb.c | 0 + drivers/video/{ => fbdev}/i810/Makefile | 0 + drivers/video/{ => fbdev}/i810/i810-i2c.c | 0 + drivers/video/{ => fbdev}/i810/i810.h | 0 + drivers/video/{ => fbdev}/i810/i810_accel.c | 0 + drivers/video/{ => fbdev}/i810/i810_dvt.c | 0 + drivers/video/{ => fbdev}/i810/i810_gtf.c | 0 + drivers/video/{ => fbdev}/i810/i810_main.c | 0 + drivers/video/{ => fbdev}/i810/i810_main.h | 0 + drivers/video/{ => fbdev}/i810/i810_regs.h | 0 + drivers/video/{ => fbdev}/igafb.c | 0 + drivers/video/{ => fbdev}/imsttfb.c | 0 + drivers/video/{ => fbdev}/imxfb.c | 0 + drivers/video/{ => fbdev}/intelfb/Makefile | 0 + drivers/video/{ => fbdev}/intelfb/intelfb.h | 0 + drivers/video/{ => fbdev}/intelfb/intelfb_i2c.c | 0 + drivers/video/{ => fbdev}/intelfb/intelfbdrv.c | 0 + drivers/video/{ => fbdev}/intelfb/intelfbhw.c | 0 + drivers/video/{ => fbdev}/intelfb/intelfbhw.h | 0 + drivers/video/{ => fbdev}/jz4740_fb.c | 0 + drivers/video/{ => fbdev}/kyro/Makefile | 0 + drivers/video/{ => fbdev}/kyro/STG4000InitDevice.c | 0 + drivers/video/{ => fbdev}/kyro/STG4000Interface.h | 0 + .../video/{ => fbdev}/kyro/STG4000OverlayDevice.c | 0 + drivers/video/{ => fbdev}/kyro/STG4000Ramdac.c | 0 + drivers/video/{ => fbdev}/kyro/STG4000Reg.h | 0 + drivers/video/{ => fbdev}/kyro/STG4000VTG.c | 0 + drivers/video/{ => fbdev}/kyro/fbdev.c | 0 + drivers/video/{ => fbdev}/leo.c | 0 + drivers/video/{ => fbdev}/macfb.c | 0 + drivers/video/{ => fbdev}/macmodes.c | 0 + drivers/video/{ => fbdev}/macmodes.h | 0 + drivers/video/{ => fbdev}/matrox/Makefile | 0 + drivers/video/{ => fbdev}/matrox/g450_pll.c | 0 + drivers/video/{ => fbdev}/matrox/g450_pll.h | 0 + drivers/video/{ => fbdev}/matrox/i2c-matroxfb.c | 0 + .../video/{ => fbdev}/matrox/matroxfb_DAC1064.c | 0 + .../video/{ => fbdev}/matrox/matroxfb_DAC1064.h | 0 + drivers/video/{ => fbdev}/matrox/matroxfb_Ti3026.c | 0 + drivers/video/{ => fbdev}/matrox/matroxfb_Ti3026.h | 0 + drivers/video/{ => fbdev}/matrox/matroxfb_accel.c | 0 + drivers/video/{ => fbdev}/matrox/matroxfb_accel.h | 0 + drivers/video/{ => fbdev}/matrox/matroxfb_base.c | 0 + drivers/video/{ => fbdev}/matrox/matroxfb_base.h | 0 + drivers/video/{ => fbdev}/matrox/matroxfb_crtc2.c | 0 + drivers/video/{ => fbdev}/matrox/matroxfb_crtc2.h | 0 + drivers/video/{ => fbdev}/matrox/matroxfb_g450.c | 0 + drivers/video/{ => fbdev}/matrox/matroxfb_g450.h | 0 + drivers/video/{ => fbdev}/matrox/matroxfb_maven.c | 0 + drivers/video/{ => fbdev}/matrox/matroxfb_maven.h | 0 + drivers/video/{ => fbdev}/matrox/matroxfb_misc.c | 0 + drivers/video/{ => fbdev}/matrox/matroxfb_misc.h | 0 + drivers/video/{ => fbdev}/maxinefb.c | 0 + drivers/video/{ => fbdev}/mb862xx/Makefile | 0 + drivers/video/{ => fbdev}/mb862xx/mb862xx-i2c.c | 0 + drivers/video/{ => fbdev}/mb862xx/mb862xx_reg.h | 0 + drivers/video/{ => fbdev}/mb862xx/mb862xxfb.h | 0 + .../video/{ => fbdev}/mb862xx/mb862xxfb_accel.c | 0 + .../video/{ => fbdev}/mb862xx/mb862xxfb_accel.h | 0 + drivers/video/{ => fbdev}/mb862xx/mb862xxfbdrv.c | 0 + drivers/video/{ => fbdev}/mbx/Makefile | 0 + drivers/video/{ => fbdev}/mbx/mbxdebugfs.c | 0 + drivers/video/{ => fbdev}/mbx/mbxfb.c | 0 + drivers/video/{ => fbdev}/mbx/reg_bits.h | 0 + drivers/video/{ => fbdev}/mbx/regs.h | 0 + drivers/video/{ => fbdev}/metronomefb.c | 0 + drivers/video/{ => fbdev}/mmp/Kconfig | 6 +- + drivers/video/{ => fbdev}/mmp/Makefile | 0 + drivers/video/{ => fbdev}/mmp/core.c | 0 + drivers/video/{ => fbdev}/mmp/fb/Kconfig | 0 + drivers/video/{ => fbdev}/mmp/fb/Makefile | 0 + drivers/video/{ => fbdev}/mmp/fb/mmpfb.c | 0 + drivers/video/{ => fbdev}/mmp/fb/mmpfb.h | 0 + drivers/video/{ => fbdev}/mmp/hw/Kconfig | 0 + drivers/video/{ => fbdev}/mmp/hw/Makefile | 0 + drivers/video/{ => fbdev}/mmp/hw/mmp_ctrl.c | 0 + drivers/video/{ => fbdev}/mmp/hw/mmp_ctrl.h | 0 + drivers/video/{ => fbdev}/mmp/hw/mmp_spi.c | 0 + drivers/video/{ => fbdev}/mmp/panel/Kconfig | 0 + drivers/video/{ => fbdev}/mmp/panel/Makefile | 0 + .../video/{ => fbdev}/mmp/panel/tpo_tj032md01bw.c | 0 + drivers/video/{ => fbdev}/msm/Makefile | 0 + drivers/video/{ => fbdev}/msm/mddi.c | 0 + drivers/video/{ => fbdev}/msm/mddi_client_dummy.c | 0 + .../video/{ => fbdev}/msm/mddi_client_nt35399.c | 0 + .../video/{ => fbdev}/msm/mddi_client_toshiba.c | 0 + drivers/video/{ => fbdev}/msm/mddi_hw.h | 0 + drivers/video/{ => fbdev}/msm/mdp.c | 0 + drivers/video/{ => fbdev}/msm/mdp_csc_table.h | 0 + drivers/video/{ => fbdev}/msm/mdp_hw.h | 0 + drivers/video/{ => fbdev}/msm/mdp_ppp.c | 0 + drivers/video/{ => fbdev}/msm/mdp_scale_tables.c | 0 + drivers/video/{ => fbdev}/msm/mdp_scale_tables.h | 0 + drivers/video/{ => fbdev}/msm/msm_fb.c | 0 + drivers/video/{ => fbdev}/mx3fb.c | 0 + drivers/video/{ => fbdev}/mxsfb.c | 0 + drivers/video/{ => fbdev}/n411.c | 0 + drivers/video/{ => fbdev}/neofb.c | 0 + drivers/video/{ => fbdev}/nuc900fb.c | 0 + drivers/video/{ => fbdev}/nuc900fb.h | 0 + drivers/video/{ => fbdev}/nvidia/Makefile | 0 + drivers/video/{ => fbdev}/nvidia/nv_accel.c | 0 + drivers/video/{ => fbdev}/nvidia/nv_backlight.c | 0 + drivers/video/{ => fbdev}/nvidia/nv_dma.h | 0 + drivers/video/{ => fbdev}/nvidia/nv_hw.c | 0 + drivers/video/{ => fbdev}/nvidia/nv_i2c.c | 0 + drivers/video/{ => fbdev}/nvidia/nv_local.h | 0 + drivers/video/{ => fbdev}/nvidia/nv_of.c | 0 + drivers/video/{ => fbdev}/nvidia/nv_proto.h | 0 + drivers/video/{ => fbdev}/nvidia/nv_setup.c | 0 + drivers/video/{ => fbdev}/nvidia/nv_type.h | 0 + drivers/video/{ => fbdev}/nvidia/nvidia.c | 0 + drivers/video/{ => fbdev}/ocfb.c | 0 + drivers/video/{ => fbdev}/offb.c | 0 + drivers/video/{ => fbdev}/omap/Kconfig | 0 + drivers/video/{ => fbdev}/omap/Makefile | 0 + drivers/video/{ => fbdev}/omap/hwa742.c | 0 + drivers/video/{ => fbdev}/omap/lcd_ams_delta.c | 0 + drivers/video/{ => fbdev}/omap/lcd_h3.c | 0 + drivers/video/{ => fbdev}/omap/lcd_htcherald.c | 0 + drivers/video/{ => fbdev}/omap/lcd_inn1510.c | 0 + drivers/video/{ => fbdev}/omap/lcd_inn1610.c | 0 + drivers/video/{ => fbdev}/omap/lcd_mipid.c | 0 + drivers/video/{ => fbdev}/omap/lcd_osk.c | 0 + drivers/video/{ => fbdev}/omap/lcd_palmte.c | 0 + drivers/video/{ => fbdev}/omap/lcd_palmtt.c | 0 + drivers/video/{ => fbdev}/omap/lcd_palmz71.c | 0 + drivers/video/{ => fbdev}/omap/lcdc.c | 0 + drivers/video/{ => fbdev}/omap/lcdc.h | 0 + drivers/video/{ => fbdev}/omap/omapfb.h | 0 + drivers/video/{ => fbdev}/omap/omapfb_main.c | 0 + drivers/video/{ => fbdev}/omap/sossi.c | 0 + drivers/video/fbdev/omap2/Kconfig | 10 + + drivers/video/{ => fbdev}/omap2/Makefile | 0 + .../video/{ => fbdev}/omap2/displays-new/Kconfig | 0 + .../video/{ => fbdev}/omap2/displays-new/Makefile | 0 + .../omap2/displays-new/connector-analog-tv.c | 0 + .../{ => fbdev}/omap2/displays-new/connector-dvi.c | 0 + .../omap2/displays-new/connector-hdmi.c | 0 + .../omap2/displays-new/encoder-tfp410.c | 0 + .../omap2/displays-new/encoder-tpd12s015.c | 0 + .../{ => fbdev}/omap2/displays-new/panel-dpi.c | 0 + .../{ => fbdev}/omap2/displays-new/panel-dsi-cm.c | 0 + .../omap2/displays-new/panel-lgphilips-lb035q02.c | 0 + .../omap2/displays-new/panel-nec-nl8048hl11.c | 0 + .../omap2/displays-new/panel-sharp-ls037v7dw01.c | 0 + .../omap2/displays-new/panel-sony-acx565akm.c | 0 + .../omap2/displays-new/panel-tpo-td028ttec1.c | 0 + .../omap2/displays-new/panel-tpo-td043mtea1.c | 0 + drivers/video/{ => fbdev}/omap2/dss/Kconfig | 0 + drivers/video/{ => fbdev}/omap2/dss/Makefile | 0 + drivers/video/{ => fbdev}/omap2/dss/apply.c | 0 + drivers/video/{ => fbdev}/omap2/dss/core.c | 0 + drivers/video/{ => fbdev}/omap2/dss/dispc-compat.c | 0 + drivers/video/{ => fbdev}/omap2/dss/dispc-compat.h | 0 + drivers/video/{ => fbdev}/omap2/dss/dispc.c | 0 + drivers/video/{ => fbdev}/omap2/dss/dispc.h | 0 + drivers/video/{ => fbdev}/omap2/dss/dispc_coefs.c | 0 + .../video/{ => fbdev}/omap2/dss/display-sysfs.c | 0 + drivers/video/{ => fbdev}/omap2/dss/display.c | 0 + drivers/video/{ => fbdev}/omap2/dss/dpi.c | 0 + drivers/video/{ => fbdev}/omap2/dss/dsi.c | 0 + drivers/video/{ => fbdev}/omap2/dss/dss-of.c | 0 + drivers/video/{ => fbdev}/omap2/dss/dss.c | 0 + drivers/video/{ => fbdev}/omap2/dss/dss.h | 0 + drivers/video/{ => fbdev}/omap2/dss/dss_features.c | 0 + drivers/video/{ => fbdev}/omap2/dss/dss_features.h | 0 + drivers/video/{ => fbdev}/omap2/dss/hdmi.h | 0 + drivers/video/{ => fbdev}/omap2/dss/hdmi4.c | 0 + drivers/video/{ => fbdev}/omap2/dss/hdmi4_core.c | 0 + drivers/video/{ => fbdev}/omap2/dss/hdmi4_core.h | 0 + drivers/video/{ => fbdev}/omap2/dss/hdmi_common.c | 0 + drivers/video/{ => fbdev}/omap2/dss/hdmi_phy.c | 0 + drivers/video/{ => fbdev}/omap2/dss/hdmi_pll.c | 0 + drivers/video/{ => fbdev}/omap2/dss/hdmi_wp.c | 0 + .../video/{ => fbdev}/omap2/dss/manager-sysfs.c | 0 + drivers/video/{ => fbdev}/omap2/dss/manager.c | 0 + drivers/video/{ => fbdev}/omap2/dss/output.c | 0 + .../video/{ => fbdev}/omap2/dss/overlay-sysfs.c | 0 + drivers/video/{ => fbdev}/omap2/dss/overlay.c | 0 + drivers/video/{ => fbdev}/omap2/dss/rfbi.c | 0 + drivers/video/{ => fbdev}/omap2/dss/sdi.c | 0 + drivers/video/{ => fbdev}/omap2/dss/venc.c | 0 + drivers/video/{ => fbdev}/omap2/dss/venc_panel.c | 0 + drivers/video/{ => fbdev}/omap2/omapfb/Kconfig | 0 + drivers/video/{ => fbdev}/omap2/omapfb/Makefile | 0 + .../video/{ => fbdev}/omap2/omapfb/omapfb-ioctl.c | 0 + .../video/{ => fbdev}/omap2/omapfb/omapfb-main.c | 0 + .../video/{ => fbdev}/omap2/omapfb/omapfb-sysfs.c | 0 + drivers/video/{ => fbdev}/omap2/omapfb/omapfb.h | 0 + drivers/video/{ => fbdev}/omap2/vrfb.c | 0 + drivers/video/{ => fbdev}/p9100.c | 0 + drivers/video/{ => fbdev}/platinumfb.c | 0 + drivers/video/{ => fbdev}/platinumfb.h | 0 + drivers/video/{ => fbdev}/pm2fb.c | 0 + drivers/video/{ => fbdev}/pm3fb.c | 0 + drivers/video/{ => fbdev}/pmag-aa-fb.c | 0 + drivers/video/{ => fbdev}/pmag-ba-fb.c | 0 + drivers/video/{ => fbdev}/pmagb-b-fb.c | 0 + drivers/video/{ => fbdev}/ps3fb.c | 0 + drivers/video/{ => fbdev}/pvr2fb.c | 0 + drivers/video/{ => fbdev}/pxa168fb.c | 0 + drivers/video/{ => fbdev}/pxa168fb.h | 0 + drivers/video/{ => fbdev}/pxa3xx-gcu.c | 0 + drivers/video/{ => fbdev}/pxa3xx-gcu.h | 0 + drivers/video/{ => fbdev}/pxafb.c | 0 + drivers/video/{ => fbdev}/pxafb.h | 0 + drivers/video/{ => fbdev}/q40fb.c | 0 + drivers/video/{ => fbdev}/riva/Makefile | 0 + drivers/video/{ => fbdev}/riva/fbdev.c | 0 + drivers/video/{ => fbdev}/riva/nv_driver.c | 0 + drivers/video/{ => fbdev}/riva/nv_type.h | 0 + drivers/video/{ => fbdev}/riva/nvreg.h | 0 + drivers/video/{ => fbdev}/riva/riva_hw.c | 0 + drivers/video/{ => fbdev}/riva/riva_hw.h | 0 + drivers/video/{ => fbdev}/riva/riva_tbl.h | 0 + drivers/video/{ => fbdev}/riva/rivafb-i2c.c | 0 + drivers/video/{ => fbdev}/riva/rivafb.h | 0 + drivers/video/{ => fbdev}/s1d13xxxfb.c | 0 + drivers/video/{ => fbdev}/s3c-fb.c | 0 + drivers/video/{ => fbdev}/s3c2410fb.c | 0 + drivers/video/{ => fbdev}/s3c2410fb.h | 0 + drivers/video/{ => fbdev}/s3fb.c | 0 + drivers/video/{ => fbdev}/sa1100fb.c | 0 + drivers/video/{ => fbdev}/sa1100fb.h | 0 + drivers/video/{ => fbdev}/savage/Makefile | 0 + drivers/video/{ => fbdev}/savage/savagefb-i2c.c | 0 + drivers/video/{ => fbdev}/savage/savagefb.h | 0 + drivers/video/{ => fbdev}/savage/savagefb_accel.c | 0 + drivers/video/{ => fbdev}/savage/savagefb_driver.c | 0 + drivers/video/{ => fbdev}/sbuslib.c | 0 + drivers/video/{ => fbdev}/sbuslib.h | 0 + drivers/video/{ => fbdev}/sh7760fb.c | 0 + drivers/video/{ => fbdev}/sh_mipi_dsi.c | 0 + drivers/video/{ => fbdev}/sh_mobile_hdmi.c | 0 + drivers/video/{ => fbdev}/sh_mobile_lcdcfb.c | 0 + drivers/video/{ => fbdev}/sh_mobile_lcdcfb.h | 0 + drivers/video/{ => fbdev}/sh_mobile_meram.c | 0 + drivers/video/{ => fbdev}/simplefb.c | 0 + drivers/video/{ => fbdev}/sis/300vtbl.h | 0 + drivers/video/{ => fbdev}/sis/310vtbl.h | 0 + drivers/video/{ => fbdev}/sis/Makefile | 0 + drivers/video/{ => fbdev}/sis/init.c | 0 + drivers/video/{ => fbdev}/sis/init.h | 0 + drivers/video/{ => fbdev}/sis/init301.c | 0 + drivers/video/{ => fbdev}/sis/init301.h | 0 + drivers/video/{ => fbdev}/sis/initdef.h | 0 + drivers/video/{ => fbdev}/sis/initextlfb.c | 0 + drivers/video/{ => fbdev}/sis/oem300.h | 0 + drivers/video/{ => fbdev}/sis/oem310.h | 0 + drivers/video/{ => fbdev}/sis/sis.h | 0 + drivers/video/{ => fbdev}/sis/sis_accel.c | 0 + drivers/video/{ => fbdev}/sis/sis_accel.h | 0 + drivers/video/{ => fbdev}/sis/sis_main.c | 0 + drivers/video/{ => fbdev}/sis/sis_main.h | 0 + drivers/video/{ => fbdev}/sis/vgatypes.h | 0 + drivers/video/{ => fbdev}/sis/vstruct.h | 0 + drivers/video/{ => fbdev}/skeletonfb.c | 0 + drivers/video/{ => fbdev}/sm501fb.c | 0 + drivers/video/{ => fbdev}/smscufx.c | 0 + drivers/video/{ => fbdev}/ssd1307fb.c | 0 + drivers/video/{ => fbdev}/sstfb.c | 0 + drivers/video/{ => fbdev}/sticore.h | 0 + drivers/video/{ => fbdev}/stifb.c | 0 + drivers/video/{ => fbdev}/sunxvr1000.c | 0 + drivers/video/{ => fbdev}/sunxvr2500.c | 0 + drivers/video/{ => fbdev}/sunxvr500.c | 0 + drivers/video/{ => fbdev}/tcx.c | 0 + drivers/video/{ => fbdev}/tdfxfb.c | 0 + drivers/video/{ => fbdev}/tgafb.c | 0 + drivers/video/{ => fbdev}/tmiofb.c | 0 + drivers/video/{ => fbdev}/tridentfb.c | 0 + drivers/video/{ => fbdev}/udlfb.c | 0 + drivers/video/{ => fbdev}/uvesafb.c | 0 + drivers/video/{ => fbdev}/valkyriefb.c | 0 + drivers/video/{ => fbdev}/valkyriefb.h | 0 + drivers/video/{ => fbdev}/vermilion/Makefile | 0 + drivers/video/{ => fbdev}/vermilion/cr_pll.c | 0 + drivers/video/{ => fbdev}/vermilion/vermilion.c | 0 + drivers/video/{ => fbdev}/vermilion/vermilion.h | 0 + drivers/video/{ => fbdev}/vesafb.c | 0 + drivers/video/{ => fbdev}/vfb.c | 0 + drivers/video/{ => fbdev}/vga16fb.c | 0 + drivers/video/{ => fbdev}/via/Makefile | 0 + drivers/video/{ => fbdev}/via/accel.c | 0 + drivers/video/{ => fbdev}/via/accel.h | 0 + drivers/video/{ => fbdev}/via/chip.h | 0 + drivers/video/{ => fbdev}/via/debug.h | 0 + drivers/video/{ => fbdev}/via/dvi.c | 0 + drivers/video/{ => fbdev}/via/dvi.h | 0 + drivers/video/{ => fbdev}/via/global.c | 0 + drivers/video/{ => fbdev}/via/global.h | 0 + drivers/video/{ => fbdev}/via/hw.c | 0 + drivers/video/{ => fbdev}/via/hw.h | 0 + drivers/video/{ => fbdev}/via/ioctl.c | 0 + drivers/video/{ => fbdev}/via/ioctl.h | 0 + drivers/video/{ => fbdev}/via/lcd.c | 0 + drivers/video/{ => fbdev}/via/lcd.h | 0 + drivers/video/{ => fbdev}/via/share.h | 0 + drivers/video/{ => fbdev}/via/tblDPASetting.c | 0 + drivers/video/{ => fbdev}/via/tblDPASetting.h | 0 + drivers/video/{ => fbdev}/via/via-core.c | 0 + drivers/video/{ => fbdev}/via/via-gpio.c | 0 + drivers/video/{ => fbdev}/via/via_aux.c | 0 + drivers/video/{ => fbdev}/via/via_aux.h | 0 + drivers/video/{ => fbdev}/via/via_aux_ch7301.c | 0 + drivers/video/{ => fbdev}/via/via_aux_edid.c | 0 + drivers/video/{ => fbdev}/via/via_aux_sii164.c | 0 + drivers/video/{ => fbdev}/via/via_aux_vt1621.c | 0 + drivers/video/{ => fbdev}/via/via_aux_vt1622.c | 0 + drivers/video/{ => fbdev}/via/via_aux_vt1625.c | 0 + drivers/video/{ => fbdev}/via/via_aux_vt1631.c | 0 + drivers/video/{ => fbdev}/via/via_aux_vt1632.c | 0 + drivers/video/{ => fbdev}/via/via_aux_vt1636.c | 0 + drivers/video/{ => fbdev}/via/via_clock.c | 0 + drivers/video/{ => fbdev}/via/via_clock.h | 0 + drivers/video/{ => fbdev}/via/via_i2c.c | 0 + drivers/video/{ => fbdev}/via/via_modesetting.c | 0 + drivers/video/{ => fbdev}/via/via_modesetting.h | 0 + drivers/video/{ => fbdev}/via/via_utility.c | 0 + drivers/video/{ => fbdev}/via/via_utility.h | 0 + drivers/video/{ => fbdev}/via/viafbdev.c | 0 + drivers/video/{ => fbdev}/via/viafbdev.h | 0 + drivers/video/{ => fbdev}/via/viamode.c | 0 + drivers/video/{ => fbdev}/via/viamode.h | 0 + drivers/video/{ => fbdev}/via/vt1636.c | 0 + drivers/video/{ => fbdev}/via/vt1636.h | 0 + drivers/video/{ => fbdev}/vt8500lcdfb.c | 0 + drivers/video/{ => fbdev}/vt8500lcdfb.h | 0 + drivers/video/{ => fbdev}/vt8623fb.c | 0 + drivers/video/{ => fbdev}/w100fb.c | 0 + drivers/video/{ => fbdev}/w100fb.h | 0 + drivers/video/{ => fbdev}/wm8505fb.c | 0 + drivers/video/{ => fbdev}/wm8505fb_regs.h | 0 + drivers/video/{ => fbdev}/wmt_ge_rops.c | 2 +- + drivers/video/{ => fbdev}/wmt_ge_rops.h | 0 + drivers/video/{ => fbdev}/xen-fbfront.c | 0 + drivers/video/{ => fbdev}/xilinxfb.c | 0 + drivers/video/omap2/Kconfig | 10 - + 482 files changed, 2690 insertions(+), 2666 deletions(-) + rename drivers/video/{ => fbdev}/68328fb.c (100%) + create mode 100644 drivers/video/fbdev/Kconfig + create mode 100644 drivers/video/fbdev/Makefile + rename drivers/video/{ => fbdev}/acornfb.c (100%) + rename drivers/video/{ => fbdev}/acornfb.h (100%) + rename drivers/video/{ => fbdev}/amba-clcd.c (100%) + rename drivers/video/{ => fbdev}/amifb.c (100%) + rename drivers/video/{ => fbdev}/arcfb.c (100%) + rename drivers/video/{ => fbdev}/arkfb.c (100%) + rename drivers/video/{ => fbdev}/asiliantfb.c (100%) + rename drivers/video/{ => fbdev}/atafb.c (100%) + rename drivers/video/{ => fbdev}/atafb.h (100%) + rename drivers/video/{ => fbdev}/atafb_iplan2p2.c (100%) + rename drivers/video/{ => fbdev}/atafb_iplan2p4.c (100%) + rename drivers/video/{ => fbdev}/atafb_iplan2p8.c (100%) + rename drivers/video/{ => fbdev}/atafb_mfb.c (100%) + rename drivers/video/{ => fbdev}/atafb_utils.h (100%) + rename drivers/video/{ => fbdev}/atmel_lcdfb.c (100%) + rename drivers/video/{ => fbdev}/aty/Makefile (100%) + rename drivers/video/{ => fbdev}/aty/ati_ids.h (100%) + rename drivers/video/{ => fbdev}/aty/aty128fb.c (100%) + rename drivers/video/{ => fbdev}/aty/atyfb.h (100%) + rename drivers/video/{ => fbdev}/aty/atyfb_base.c (100%) + rename drivers/video/{ => fbdev}/aty/mach64_accel.c (100%) + rename drivers/video/{ => fbdev}/aty/mach64_ct.c (100%) + rename drivers/video/{ => fbdev}/aty/mach64_cursor.c (99%) + rename drivers/video/{ => fbdev}/aty/mach64_gx.c (100%) + rename drivers/video/{ => fbdev}/aty/radeon_accel.c (100%) + rename drivers/video/{ => fbdev}/aty/radeon_backlight.c (100%) + rename drivers/video/{ => fbdev}/aty/radeon_base.c (100%) + rename drivers/video/{ => fbdev}/aty/radeon_i2c.c (100%) + rename drivers/video/{ => fbdev}/aty/radeon_monitor.c (100%) + rename drivers/video/{ => fbdev}/aty/radeon_pm.c (100%) + rename drivers/video/{ => fbdev}/aty/radeonfb.h (100%) + rename drivers/video/{ => fbdev}/au1100fb.c (100%) + rename drivers/video/{ => fbdev}/au1100fb.h (100%) + rename drivers/video/{ => fbdev}/au1200fb.c (100%) + rename drivers/video/{ => fbdev}/au1200fb.h (100%) + rename drivers/video/{ => fbdev}/auo_k1900fb.c (100%) + rename drivers/video/{ => fbdev}/auo_k1901fb.c (100%) + rename drivers/video/{ => fbdev}/auo_k190x.c (100%) + rename drivers/video/{ => fbdev}/auo_k190x.h (100%) + rename drivers/video/{ => fbdev}/bf537-lq035.c (100%) + rename drivers/video/{ => fbdev}/bf54x-lq043fb.c (100%) + rename drivers/video/{ => fbdev}/bfin-lq035q1-fb.c (100%) + rename drivers/video/{ => fbdev}/bfin-t350mcqb-fb.c (100%) + rename drivers/video/{ => fbdev}/bfin_adv7393fb.c (100%) + rename drivers/video/{ => fbdev}/bfin_adv7393fb.h (100%) + rename drivers/video/{ => fbdev}/broadsheetfb.c (100%) + rename drivers/video/{ => fbdev}/bt431.h (100%) + rename drivers/video/{ => fbdev}/bt455.h (100%) + rename drivers/video/{ => fbdev}/bw2.c (100%) + rename drivers/video/{ => fbdev}/c2p.h (100%) + rename drivers/video/{ => fbdev}/c2p_core.h (100%) + rename drivers/video/{ => fbdev}/c2p_iplan2.c (100%) + rename drivers/video/{ => fbdev}/c2p_planar.c (100%) + rename drivers/video/{ => fbdev}/carminefb.c (100%) + rename drivers/video/{ => fbdev}/carminefb.h (100%) + rename drivers/video/{ => fbdev}/carminefb_regs.h (100%) + rename drivers/video/{ => fbdev}/cg14.c (100%) + rename drivers/video/{ => fbdev}/cg3.c (100%) + rename drivers/video/{ => fbdev}/cg6.c (100%) + rename drivers/video/{ => fbdev}/chipsfb.c (100%) + rename drivers/video/{ => fbdev}/cirrusfb.c (100%) + rename drivers/video/{ => fbdev}/clps711xfb.c (100%) + rename drivers/video/{ => fbdev}/cobalt_lcdfb.c (100%) + rename drivers/video/{ => fbdev}/controlfb.c (100%) + rename drivers/video/{ => fbdev}/controlfb.h (100%) + create mode 100644 drivers/video/fbdev/core/Makefile + rename drivers/video/{ => fbdev/core}/cfbcopyarea.c (100%) + rename drivers/video/{ => fbdev/core}/cfbfillrect.c (100%) + rename drivers/video/{ => fbdev/core}/cfbimgblt.c (100%) + rename drivers/video/{ => fbdev/core}/fb_ddc.c (99%) + rename drivers/video/{ => fbdev/core}/fb_defio.c (100%) + rename drivers/video/{ => fbdev/core}/fb_draw.h (100%) + rename drivers/video/{ => fbdev/core}/fb_notify.c (100%) + rename drivers/video/{ => fbdev/core}/fb_sys_fops.c (100%) + rename drivers/video/{ => fbdev/core}/fbcmap.c (100%) + rename drivers/video/{ => fbdev/core}/fbcvt.c (100%) + rename drivers/video/{ => fbdev/core}/fbmem.c (100%) + rename drivers/video/{ => fbdev/core}/fbmon.c (99%) + rename drivers/video/{ => fbdev/core}/fbsysfs.c (100%) + rename drivers/video/{ => fbdev/core}/modedb.c (100%) + rename drivers/video/{ => fbdev/core}/svgalib.c (100%) + rename drivers/video/{ => fbdev/core}/syscopyarea.c (100%) + rename drivers/video/{ => fbdev/core}/sysfillrect.c (100%) + rename drivers/video/{ => fbdev/core}/sysimgblt.c (100%) + rename drivers/video/{ => fbdev}/cyber2000fb.c (100%) + rename drivers/video/{ => fbdev}/cyber2000fb.h (100%) + rename drivers/video/{ => fbdev}/da8xx-fb.c (100%) + rename drivers/video/{ => fbdev}/dnfb.c (100%) + rename drivers/video/{ => fbdev}/edid.h (100%) + rename drivers/video/{ => fbdev}/efifb.c (100%) + rename drivers/video/{ => fbdev}/ep93xx-fb.c (100%) + rename drivers/video/{ => fbdev}/exynos/Kconfig (100%) + rename drivers/video/{ => fbdev}/exynos/Makefile (100%) + rename drivers/video/{ => fbdev}/exynos/exynos_mipi_dsi.c (100%) + rename drivers/video/{ => fbdev}/exynos/exynos_mipi_dsi_common.c (100%) + rename drivers/video/{ => fbdev}/exynos/exynos_mipi_dsi_common.h (100%) + rename drivers/video/{ => fbdev}/exynos/exynos_mipi_dsi_lowlevel.c (100%) + rename drivers/video/{ => fbdev}/exynos/exynos_mipi_dsi_lowlevel.h (100%) + rename drivers/video/{ => fbdev}/exynos/exynos_mipi_dsi_regs.h (100%) + rename drivers/video/{ => fbdev}/exynos/s6e8ax0.c (100%) + rename drivers/video/{ => fbdev}/fb-puv3.c (100%) + rename drivers/video/{ => fbdev}/ffb.c (100%) + rename drivers/video/{ => fbdev}/fm2fb.c (100%) + rename drivers/video/{ => fbdev}/fsl-diu-fb.c (100%) + rename drivers/video/{ => fbdev}/g364fb.c (100%) + rename drivers/video/{ => fbdev}/gbefb.c (100%) + rename drivers/video/{ => fbdev}/geode/Kconfig (100%) + rename drivers/video/{ => fbdev}/geode/Makefile (100%) + rename drivers/video/{ => fbdev}/geode/display_gx.c (100%) + rename drivers/video/{ => fbdev}/geode/display_gx1.c (100%) + rename drivers/video/{ => fbdev}/geode/display_gx1.h (100%) + rename drivers/video/{ => fbdev}/geode/geodefb.h (100%) + rename drivers/video/{ => fbdev}/geode/gx1fb_core.c (100%) + rename drivers/video/{ => fbdev}/geode/gxfb.h (100%) + rename drivers/video/{ => fbdev}/geode/gxfb_core.c (100%) + rename drivers/video/{ => fbdev}/geode/lxfb.h (100%) + rename drivers/video/{ => fbdev}/geode/lxfb_core.c (100%) + rename drivers/video/{ => fbdev}/geode/lxfb_ops.c (100%) + rename drivers/video/{ => fbdev}/geode/suspend_gx.c (100%) + rename drivers/video/{ => fbdev}/geode/video_cs5530.c (100%) + rename drivers/video/{ => fbdev}/geode/video_cs5530.h (100%) + rename drivers/video/{ => fbdev}/geode/video_gx.c (100%) + rename drivers/video/{ => fbdev}/goldfishfb.c (100%) + rename drivers/video/{ => fbdev}/grvga.c (100%) + rename drivers/video/{ => fbdev}/gxt4500.c (100%) + rename drivers/video/{ => fbdev}/hecubafb.c (100%) + rename drivers/video/{ => fbdev}/hgafb.c (100%) + rename drivers/video/{ => fbdev}/hitfb.c (100%) + rename drivers/video/{ => fbdev}/hpfb.c (100%) + rename drivers/video/{ => fbdev}/hyperv_fb.c (100%) + rename drivers/video/{ => fbdev}/i740_reg.h (100%) + rename drivers/video/{ => fbdev}/i740fb.c (100%) + rename drivers/video/{ => fbdev}/i810/Makefile (100%) + rename drivers/video/{ => fbdev}/i810/i810-i2c.c (100%) + rename drivers/video/{ => fbdev}/i810/i810.h (100%) + rename drivers/video/{ => fbdev}/i810/i810_accel.c (100%) + rename drivers/video/{ => fbdev}/i810/i810_dvt.c (100%) + rename drivers/video/{ => fbdev}/i810/i810_gtf.c (100%) + rename drivers/video/{ => fbdev}/i810/i810_main.c (100%) + rename drivers/video/{ => fbdev}/i810/i810_main.h (100%) + rename drivers/video/{ => fbdev}/i810/i810_regs.h (100%) + rename drivers/video/{ => fbdev}/igafb.c (100%) + rename drivers/video/{ => fbdev}/imsttfb.c (100%) + rename drivers/video/{ => fbdev}/imxfb.c (100%) + rename drivers/video/{ => fbdev}/intelfb/Makefile (100%) + rename drivers/video/{ => fbdev}/intelfb/intelfb.h (100%) + rename drivers/video/{ => fbdev}/intelfb/intelfb_i2c.c (100%) + rename drivers/video/{ => fbdev}/intelfb/intelfbdrv.c (100%) + rename drivers/video/{ => fbdev}/intelfb/intelfbhw.c (100%) + rename drivers/video/{ => fbdev}/intelfb/intelfbhw.h (100%) + rename drivers/video/{ => fbdev}/jz4740_fb.c (100%) + rename drivers/video/{ => fbdev}/kyro/Makefile (100%) + rename drivers/video/{ => fbdev}/kyro/STG4000InitDevice.c (100%) + rename drivers/video/{ => fbdev}/kyro/STG4000Interface.h (100%) + rename drivers/video/{ => fbdev}/kyro/STG4000OverlayDevice.c (100%) + rename drivers/video/{ => fbdev}/kyro/STG4000Ramdac.c (100%) + rename drivers/video/{ => fbdev}/kyro/STG4000Reg.h (100%) + rename drivers/video/{ => fbdev}/kyro/STG4000VTG.c (100%) + rename drivers/video/{ => fbdev}/kyro/fbdev.c (100%) + rename drivers/video/{ => fbdev}/leo.c (100%) + rename drivers/video/{ => fbdev}/macfb.c (100%) + rename drivers/video/{ => fbdev}/macmodes.c (100%) + rename drivers/video/{ => fbdev}/macmodes.h (100%) + rename drivers/video/{ => fbdev}/matrox/Makefile (100%) + rename drivers/video/{ => fbdev}/matrox/g450_pll.c (100%) + rename drivers/video/{ => fbdev}/matrox/g450_pll.h (100%) + rename drivers/video/{ => fbdev}/matrox/i2c-matroxfb.c (100%) + rename drivers/video/{ => fbdev}/matrox/matroxfb_DAC1064.c (100%) + rename drivers/video/{ => fbdev}/matrox/matroxfb_DAC1064.h (100%) + rename drivers/video/{ => fbdev}/matrox/matroxfb_Ti3026.c (100%) + rename drivers/video/{ => fbdev}/matrox/matroxfb_Ti3026.h (100%) + rename drivers/video/{ => fbdev}/matrox/matroxfb_accel.c (100%) + rename drivers/video/{ => fbdev}/matrox/matroxfb_accel.h (100%) + rename drivers/video/{ => fbdev}/matrox/matroxfb_base.c (100%) + rename drivers/video/{ => fbdev}/matrox/matroxfb_base.h (100%) + rename drivers/video/{ => fbdev}/matrox/matroxfb_crtc2.c (100%) + rename drivers/video/{ => fbdev}/matrox/matroxfb_crtc2.h (100%) + rename drivers/video/{ => fbdev}/matrox/matroxfb_g450.c (100%) + rename drivers/video/{ => fbdev}/matrox/matroxfb_g450.h (100%) + rename drivers/video/{ => fbdev}/matrox/matroxfb_maven.c (100%) + rename drivers/video/{ => fbdev}/matrox/matroxfb_maven.h (100%) + rename drivers/video/{ => fbdev}/matrox/matroxfb_misc.c (100%) + rename drivers/video/{ => fbdev}/matrox/matroxfb_misc.h (100%) + rename drivers/video/{ => fbdev}/maxinefb.c (100%) + rename drivers/video/{ => fbdev}/mb862xx/Makefile (100%) + rename drivers/video/{ => fbdev}/mb862xx/mb862xx-i2c.c (100%) + rename drivers/video/{ => fbdev}/mb862xx/mb862xx_reg.h (100%) + rename drivers/video/{ => fbdev}/mb862xx/mb862xxfb.h (100%) + rename drivers/video/{ => fbdev}/mb862xx/mb862xxfb_accel.c (100%) + rename drivers/video/{ => fbdev}/mb862xx/mb862xxfb_accel.h (100%) + rename drivers/video/{ => fbdev}/mb862xx/mb862xxfbdrv.c (100%) + rename drivers/video/{ => fbdev}/mbx/Makefile (100%) + rename drivers/video/{ => fbdev}/mbx/mbxdebugfs.c (100%) + rename drivers/video/{ => fbdev}/mbx/mbxfb.c (100%) + rename drivers/video/{ => fbdev}/mbx/reg_bits.h (100%) + rename drivers/video/{ => fbdev}/mbx/regs.h (100%) + rename drivers/video/{ => fbdev}/metronomefb.c (100%) + rename drivers/video/{ => fbdev}/mmp/Kconfig (61%) + rename drivers/video/{ => fbdev}/mmp/Makefile (100%) + rename drivers/video/{ => fbdev}/mmp/core.c (100%) + rename drivers/video/{ => fbdev}/mmp/fb/Kconfig (100%) + rename drivers/video/{ => fbdev}/mmp/fb/Makefile (100%) + rename drivers/video/{ => fbdev}/mmp/fb/mmpfb.c (100%) + rename drivers/video/{ => fbdev}/mmp/fb/mmpfb.h (100%) + rename drivers/video/{ => fbdev}/mmp/hw/Kconfig (100%) + rename drivers/video/{ => fbdev}/mmp/hw/Makefile (100%) + rename drivers/video/{ => fbdev}/mmp/hw/mmp_ctrl.c (100%) + rename drivers/video/{ => fbdev}/mmp/hw/mmp_ctrl.h (100%) + rename drivers/video/{ => fbdev}/mmp/hw/mmp_spi.c (100%) + rename drivers/video/{ => fbdev}/mmp/panel/Kconfig (100%) + rename drivers/video/{ => fbdev}/mmp/panel/Makefile (100%) + rename drivers/video/{ => fbdev}/mmp/panel/tpo_tj032md01bw.c (100%) + rename drivers/video/{ => fbdev}/msm/Makefile (100%) + rename drivers/video/{ => fbdev}/msm/mddi.c (100%) + rename drivers/video/{ => fbdev}/msm/mddi_client_dummy.c (100%) + rename drivers/video/{ => fbdev}/msm/mddi_client_nt35399.c (100%) + rename drivers/video/{ => fbdev}/msm/mddi_client_toshiba.c (100%) + rename drivers/video/{ => fbdev}/msm/mddi_hw.h (100%) + rename drivers/video/{ => fbdev}/msm/mdp.c (100%) + rename drivers/video/{ => fbdev}/msm/mdp_csc_table.h (100%) + rename drivers/video/{ => fbdev}/msm/mdp_hw.h (100%) + rename drivers/video/{ => fbdev}/msm/mdp_ppp.c (100%) + rename drivers/video/{ => fbdev}/msm/mdp_scale_tables.c (100%) + rename drivers/video/{ => fbdev}/msm/mdp_scale_tables.h (100%) + rename drivers/video/{ => fbdev}/msm/msm_fb.c (100%) + rename drivers/video/{ => fbdev}/mx3fb.c (100%) + rename drivers/video/{ => fbdev}/mxsfb.c (100%) + rename drivers/video/{ => fbdev}/n411.c (100%) + rename drivers/video/{ => fbdev}/neofb.c (100%) + rename drivers/video/{ => fbdev}/nuc900fb.c (100%) + rename drivers/video/{ => fbdev}/nuc900fb.h (100%) + rename drivers/video/{ => fbdev}/nvidia/Makefile (100%) + rename drivers/video/{ => fbdev}/nvidia/nv_accel.c (100%) + rename drivers/video/{ => fbdev}/nvidia/nv_backlight.c (100%) + rename drivers/video/{ => fbdev}/nvidia/nv_dma.h (100%) + rename drivers/video/{ => fbdev}/nvidia/nv_hw.c (100%) + rename drivers/video/{ => fbdev}/nvidia/nv_i2c.c (100%) + rename drivers/video/{ => fbdev}/nvidia/nv_local.h (100%) + rename drivers/video/{ => fbdev}/nvidia/nv_of.c (100%) + rename drivers/video/{ => fbdev}/nvidia/nv_proto.h (100%) + rename drivers/video/{ => fbdev}/nvidia/nv_setup.c (100%) + rename drivers/video/{ => fbdev}/nvidia/nv_type.h (100%) + rename drivers/video/{ => fbdev}/nvidia/nvidia.c (100%) + rename drivers/video/{ => fbdev}/ocfb.c (100%) + rename drivers/video/{ => fbdev}/offb.c (100%) + rename drivers/video/{ => fbdev}/omap/Kconfig (100%) + rename drivers/video/{ => fbdev}/omap/Makefile (100%) + rename drivers/video/{ => fbdev}/omap/hwa742.c (100%) + rename drivers/video/{ => fbdev}/omap/lcd_ams_delta.c (100%) + rename drivers/video/{ => fbdev}/omap/lcd_h3.c (100%) + rename drivers/video/{ => fbdev}/omap/lcd_htcherald.c (100%) + rename drivers/video/{ => fbdev}/omap/lcd_inn1510.c (100%) + rename drivers/video/{ => fbdev}/omap/lcd_inn1610.c (100%) + rename drivers/video/{ => fbdev}/omap/lcd_mipid.c (100%) + rename drivers/video/{ => fbdev}/omap/lcd_osk.c (100%) + rename drivers/video/{ => fbdev}/omap/lcd_palmte.c (100%) + rename drivers/video/{ => fbdev}/omap/lcd_palmtt.c (100%) + rename drivers/video/{ => fbdev}/omap/lcd_palmz71.c (100%) + rename drivers/video/{ => fbdev}/omap/lcdc.c (100%) + rename drivers/video/{ => fbdev}/omap/lcdc.h (100%) + rename drivers/video/{ => fbdev}/omap/omapfb.h (100%) + rename drivers/video/{ => fbdev}/omap/omapfb_main.c (100%) + rename drivers/video/{ => fbdev}/omap/sossi.c (100%) + create mode 100644 drivers/video/fbdev/omap2/Kconfig + rename drivers/video/{ => fbdev}/omap2/Makefile (100%) + rename drivers/video/{ => fbdev}/omap2/displays-new/Kconfig (100%) + rename drivers/video/{ => fbdev}/omap2/displays-new/Makefile (100%) + rename drivers/video/{ => fbdev}/omap2/displays-new/connector-analog-tv.c (100%) + rename drivers/video/{ => fbdev}/omap2/displays-new/connector-dvi.c (100%) + rename drivers/video/{ => fbdev}/omap2/displays-new/connector-hdmi.c (100%) + rename drivers/video/{ => fbdev}/omap2/displays-new/encoder-tfp410.c (100%) + rename drivers/video/{ => fbdev}/omap2/displays-new/encoder-tpd12s015.c (100%) + rename drivers/video/{ => fbdev}/omap2/displays-new/panel-dpi.c (100%) + rename drivers/video/{ => fbdev}/omap2/displays-new/panel-dsi-cm.c (100%) + rename drivers/video/{ => fbdev}/omap2/displays-new/panel-lgphilips-lb035q02.c (100%) + rename drivers/video/{ => fbdev}/omap2/displays-new/panel-nec-nl8048hl11.c (100%) + rename drivers/video/{ => fbdev}/omap2/displays-new/panel-sharp-ls037v7dw01.c (100%) + rename drivers/video/{ => fbdev}/omap2/displays-new/panel-sony-acx565akm.c (100%) + rename drivers/video/{ => fbdev}/omap2/displays-new/panel-tpo-td028ttec1.c (100%) + rename drivers/video/{ => fbdev}/omap2/displays-new/panel-tpo-td043mtea1.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/Kconfig (100%) + rename drivers/video/{ => fbdev}/omap2/dss/Makefile (100%) + rename drivers/video/{ => fbdev}/omap2/dss/apply.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/core.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/dispc-compat.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/dispc-compat.h (100%) + rename drivers/video/{ => fbdev}/omap2/dss/dispc.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/dispc.h (100%) + rename drivers/video/{ => fbdev}/omap2/dss/dispc_coefs.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/display-sysfs.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/display.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/dpi.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/dsi.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/dss-of.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/dss.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/dss.h (100%) + rename drivers/video/{ => fbdev}/omap2/dss/dss_features.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/dss_features.h (100%) + rename drivers/video/{ => fbdev}/omap2/dss/hdmi.h (100%) + rename drivers/video/{ => fbdev}/omap2/dss/hdmi4.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/hdmi4_core.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/hdmi4_core.h (100%) + rename drivers/video/{ => fbdev}/omap2/dss/hdmi_common.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/hdmi_phy.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/hdmi_pll.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/hdmi_wp.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/manager-sysfs.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/manager.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/output.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/overlay-sysfs.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/overlay.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/rfbi.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/sdi.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/venc.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/venc_panel.c (100%) + rename drivers/video/{ => fbdev}/omap2/omapfb/Kconfig (100%) + rename drivers/video/{ => fbdev}/omap2/omapfb/Makefile (100%) + rename drivers/video/{ => fbdev}/omap2/omapfb/omapfb-ioctl.c (100%) + rename drivers/video/{ => fbdev}/omap2/omapfb/omapfb-main.c (100%) + rename drivers/video/{ => fbdev}/omap2/omapfb/omapfb-sysfs.c (100%) + rename drivers/video/{ => fbdev}/omap2/omapfb/omapfb.h (100%) + rename drivers/video/{ => fbdev}/omap2/vrfb.c (100%) + rename drivers/video/{ => fbdev}/p9100.c (100%) + rename drivers/video/{ => fbdev}/platinumfb.c (100%) + rename drivers/video/{ => fbdev}/platinumfb.h (100%) + rename drivers/video/{ => fbdev}/pm2fb.c (100%) + rename drivers/video/{ => fbdev}/pm3fb.c (100%) + rename drivers/video/{ => fbdev}/pmag-aa-fb.c (100%) + rename drivers/video/{ => fbdev}/pmag-ba-fb.c (100%) + rename drivers/video/{ => fbdev}/pmagb-b-fb.c (100%) + rename drivers/video/{ => fbdev}/ps3fb.c (100%) + rename drivers/video/{ => fbdev}/pvr2fb.c (100%) + rename drivers/video/{ => fbdev}/pxa168fb.c (100%) + rename drivers/video/{ => fbdev}/pxa168fb.h (100%) + rename drivers/video/{ => fbdev}/pxa3xx-gcu.c (100%) + rename drivers/video/{ => fbdev}/pxa3xx-gcu.h (100%) + rename drivers/video/{ => fbdev}/pxafb.c (100%) + rename drivers/video/{ => fbdev}/pxafb.h (100%) + rename drivers/video/{ => fbdev}/q40fb.c (100%) + rename drivers/video/{ => fbdev}/riva/Makefile (100%) + rename drivers/video/{ => fbdev}/riva/fbdev.c (100%) + rename drivers/video/{ => fbdev}/riva/nv_driver.c (100%) + rename drivers/video/{ => fbdev}/riva/nv_type.h (100%) + rename drivers/video/{ => fbdev}/riva/nvreg.h (100%) + rename drivers/video/{ => fbdev}/riva/riva_hw.c (100%) + rename drivers/video/{ => fbdev}/riva/riva_hw.h (100%) + rename drivers/video/{ => fbdev}/riva/riva_tbl.h (100%) + rename drivers/video/{ => fbdev}/riva/rivafb-i2c.c (100%) + rename drivers/video/{ => fbdev}/riva/rivafb.h (100%) + rename drivers/video/{ => fbdev}/s1d13xxxfb.c (100%) + rename drivers/video/{ => fbdev}/s3c-fb.c (100%) + rename drivers/video/{ => fbdev}/s3c2410fb.c (100%) + rename drivers/video/{ => fbdev}/s3c2410fb.h (100%) + rename drivers/video/{ => fbdev}/s3fb.c (100%) + rename drivers/video/{ => fbdev}/sa1100fb.c (100%) + rename drivers/video/{ => fbdev}/sa1100fb.h (100%) + rename drivers/video/{ => fbdev}/savage/Makefile (100%) + rename drivers/video/{ => fbdev}/savage/savagefb-i2c.c (100%) + rename drivers/video/{ => fbdev}/savage/savagefb.h (100%) + rename drivers/video/{ => fbdev}/savage/savagefb_accel.c (100%) + rename drivers/video/{ => fbdev}/savage/savagefb_driver.c (100%) + rename drivers/video/{ => fbdev}/sbuslib.c (100%) + rename drivers/video/{ => fbdev}/sbuslib.h (100%) + rename drivers/video/{ => fbdev}/sh7760fb.c (100%) + rename drivers/video/{ => fbdev}/sh_mipi_dsi.c (100%) + rename drivers/video/{ => fbdev}/sh_mobile_hdmi.c (100%) + rename drivers/video/{ => fbdev}/sh_mobile_lcdcfb.c (100%) + rename drivers/video/{ => fbdev}/sh_mobile_lcdcfb.h (100%) + rename drivers/video/{ => fbdev}/sh_mobile_meram.c (100%) + rename drivers/video/{ => fbdev}/simplefb.c (100%) + rename drivers/video/{ => fbdev}/sis/300vtbl.h (100%) + rename drivers/video/{ => fbdev}/sis/310vtbl.h (100%) + rename drivers/video/{ => fbdev}/sis/Makefile (100%) + rename drivers/video/{ => fbdev}/sis/init.c (100%) + rename drivers/video/{ => fbdev}/sis/init.h (100%) + rename drivers/video/{ => fbdev}/sis/init301.c (100%) + rename drivers/video/{ => fbdev}/sis/init301.h (100%) + rename drivers/video/{ => fbdev}/sis/initdef.h (100%) + rename drivers/video/{ => fbdev}/sis/initextlfb.c (100%) + rename drivers/video/{ => fbdev}/sis/oem300.h (100%) + rename drivers/video/{ => fbdev}/sis/oem310.h (100%) + rename drivers/video/{ => fbdev}/sis/sis.h (100%) + rename drivers/video/{ => fbdev}/sis/sis_accel.c (100%) + rename drivers/video/{ => fbdev}/sis/sis_accel.h (100%) + rename drivers/video/{ => fbdev}/sis/sis_main.c (100%) + rename drivers/video/{ => fbdev}/sis/sis_main.h (100%) + rename drivers/video/{ => fbdev}/sis/vgatypes.h (100%) + rename drivers/video/{ => fbdev}/sis/vstruct.h (100%) + rename drivers/video/{ => fbdev}/skeletonfb.c (100%) + rename drivers/video/{ => fbdev}/sm501fb.c (100%) + rename drivers/video/{ => fbdev}/smscufx.c (100%) + rename drivers/video/{ => fbdev}/ssd1307fb.c (100%) + rename drivers/video/{ => fbdev}/sstfb.c (100%) + rename drivers/video/{ => fbdev}/sticore.h (100%) + rename drivers/video/{ => fbdev}/stifb.c (100%) + rename drivers/video/{ => fbdev}/sunxvr1000.c (100%) + rename drivers/video/{ => fbdev}/sunxvr2500.c (100%) + rename drivers/video/{ => fbdev}/sunxvr500.c (100%) + rename drivers/video/{ => fbdev}/tcx.c (100%) + rename drivers/video/{ => fbdev}/tdfxfb.c (100%) + rename drivers/video/{ => fbdev}/tgafb.c (100%) + rename drivers/video/{ => fbdev}/tmiofb.c (100%) + rename drivers/video/{ => fbdev}/tridentfb.c (100%) + rename drivers/video/{ => fbdev}/udlfb.c (100%) + rename drivers/video/{ => fbdev}/uvesafb.c (100%) + rename drivers/video/{ => fbdev}/valkyriefb.c (100%) + rename drivers/video/{ => fbdev}/valkyriefb.h (100%) + rename drivers/video/{ => fbdev}/vermilion/Makefile (100%) + rename drivers/video/{ => fbdev}/vermilion/cr_pll.c (100%) + rename drivers/video/{ => fbdev}/vermilion/vermilion.c (100%) + rename drivers/video/{ => fbdev}/vermilion/vermilion.h (100%) + rename drivers/video/{ => fbdev}/vesafb.c (100%) + rename drivers/video/{ => fbdev}/vfb.c (100%) + rename drivers/video/{ => fbdev}/vga16fb.c (100%) + rename drivers/video/{ => fbdev}/via/Makefile (100%) + rename drivers/video/{ => fbdev}/via/accel.c (100%) + rename drivers/video/{ => fbdev}/via/accel.h (100%) + rename drivers/video/{ => fbdev}/via/chip.h (100%) + rename drivers/video/{ => fbdev}/via/debug.h (100%) + rename drivers/video/{ => fbdev}/via/dvi.c (100%) + rename drivers/video/{ => fbdev}/via/dvi.h (100%) + rename drivers/video/{ => fbdev}/via/global.c (100%) + rename drivers/video/{ => fbdev}/via/global.h (100%) + rename drivers/video/{ => fbdev}/via/hw.c (100%) + rename drivers/video/{ => fbdev}/via/hw.h (100%) + rename drivers/video/{ => fbdev}/via/ioctl.c (100%) + rename drivers/video/{ => fbdev}/via/ioctl.h (100%) + rename drivers/video/{ => fbdev}/via/lcd.c (100%) + rename drivers/video/{ => fbdev}/via/lcd.h (100%) + rename drivers/video/{ => fbdev}/via/share.h (100%) + rename drivers/video/{ => fbdev}/via/tblDPASetting.c (100%) + rename drivers/video/{ => fbdev}/via/tblDPASetting.h (100%) + rename drivers/video/{ => fbdev}/via/via-core.c (100%) + rename drivers/video/{ => fbdev}/via/via-gpio.c (100%) + rename drivers/video/{ => fbdev}/via/via_aux.c (100%) + rename drivers/video/{ => fbdev}/via/via_aux.h (100%) + rename drivers/video/{ => fbdev}/via/via_aux_ch7301.c (100%) + rename drivers/video/{ => fbdev}/via/via_aux_edid.c (100%) + rename drivers/video/{ => fbdev}/via/via_aux_sii164.c (100%) + rename drivers/video/{ => fbdev}/via/via_aux_vt1621.c (100%) + rename drivers/video/{ => fbdev}/via/via_aux_vt1622.c (100%) + rename drivers/video/{ => fbdev}/via/via_aux_vt1625.c (100%) + rename drivers/video/{ => fbdev}/via/via_aux_vt1631.c (100%) + rename drivers/video/{ => fbdev}/via/via_aux_vt1632.c (100%) + rename drivers/video/{ => fbdev}/via/via_aux_vt1636.c (100%) + rename drivers/video/{ => fbdev}/via/via_clock.c (100%) + rename drivers/video/{ => fbdev}/via/via_clock.h (100%) + rename drivers/video/{ => fbdev}/via/via_i2c.c (100%) + rename drivers/video/{ => fbdev}/via/via_modesetting.c (100%) + rename drivers/video/{ => fbdev}/via/via_modesetting.h (100%) + rename drivers/video/{ => fbdev}/via/via_utility.c (100%) + rename drivers/video/{ => fbdev}/via/via_utility.h (100%) + rename drivers/video/{ => fbdev}/via/viafbdev.c (100%) + rename drivers/video/{ => fbdev}/via/viafbdev.h (100%) + rename drivers/video/{ => fbdev}/via/viamode.c (100%) + rename drivers/video/{ => fbdev}/via/viamode.h (100%) + rename drivers/video/{ => fbdev}/via/vt1636.c (100%) + rename drivers/video/{ => fbdev}/via/vt1636.h (100%) + rename drivers/video/{ => fbdev}/vt8500lcdfb.c (100%) + rename drivers/video/{ => fbdev}/vt8500lcdfb.h (100%) + rename drivers/video/{ => fbdev}/vt8623fb.c (100%) + rename drivers/video/{ => fbdev}/w100fb.c (100%) + rename drivers/video/{ => fbdev}/w100fb.h (100%) + rename drivers/video/{ => fbdev}/wm8505fb.c (100%) + rename drivers/video/{ => fbdev}/wm8505fb_regs.h (100%) + rename drivers/video/{ => fbdev}/wmt_ge_rops.c (99%) + rename drivers/video/{ => fbdev}/wmt_ge_rops.h (100%) + rename drivers/video/{ => fbdev}/xen-fbfront.c (100%) + rename drivers/video/{ => fbdev}/xilinxfb.c (100%) + delete mode 100644 drivers/video/omap2/Kconfig +$ git am -3 ../patches/0001-video-fbdev-fix-up-fro-removal-of-SGI-Visual-Worksta.patch +Applying: video: fbdev: fix up fro removal of SGI Visual Workstation +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/video/fbdev/Kconfig +M drivers/video/fbdev/Makefile +$ git add -A . +$ git commit -v -a --amend +[master 466a7c428695] Merge remote-tracking branch 'omap_dss2/for-next' +$ git am -3 ../patches/0001-video-imxfb-Select-LCD_CLASS_DEVICE-unconditionally-.patch +Applying: video: imxfb: Select LCD_CLASS_DEVICE unconditionally - fix +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/video/fbdev/Kconfig +$ git add -A . +$ git commit -v -a --amend +[master df3568bed10a] Merge remote-tracking branch 'omap_dss2/for-next' +Merging regulator/for-next (053ed78e189f Merge remote-tracking branches 'regulator/topic/axp20', 'regulator/topic/of', 'regulator/topic/pbias', 'regulator/topic/s2mps11' and 'regulator/topic/s5m8767' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/s2mps11.txt | 14 ++ + drivers/regulator/Kconfig | 7 + + drivers/regulator/Makefile | 1 + + drivers/regulator/axp20x-regulator.c | 285 ++++++++++++++++++++++ + drivers/regulator/core.c | 3 +- + drivers/regulator/of_regulator.c | 26 +- + drivers/regulator/pbias-regulator.c | 89 ++----- + drivers/regulator/s2mps11.c | 98 +++++++- + drivers/regulator/s5m8767.c | 17 +- + include/linux/mfd/samsung/s2mps14.h | 2 + + include/linux/regulator/of_regulator.h | 7 + + 11 files changed, 451 insertions(+), 98 deletions(-) + create mode 100644 drivers/regulator/axp20x-regulator.c +Merging security/next (fab71a90edda security: Convert use of typedef ctl_table to struct ctl_table) +$ git merge security/next +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging include/linux/security.h +Merge made by the 'recursive' strategy. + include/linux/key.h | 11 +++++++++++ + include/linux/security.h | 6 +++--- + security/capability.c | 2 +- + security/keys/internal.h | 11 +---------- + security/keys/key.c | 6 +++--- + security/keys/keyctl.c | 44 ++++++++++++++++++++++---------------------- + security/keys/keyring.c | 8 ++++---- + security/keys/permission.c | 4 ++-- + security/keys/persistent.c | 4 ++-- + security/keys/proc.c | 2 +- + security/keys/sysctl.c | 2 +- + security/security.c | 2 +- + security/selinux/hooks.c | 2 +- + security/smack/smack_lsm.c | 9 +++++++-- + 14 files changed, 60 insertions(+), 53 deletions(-) +Merging selinux/next (6d32c850621b Merge tag 'v3.14' into next) +$ 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 (c9eaa447e77e Linux 3.15-rc1) +$ git merge watchdog/master +Already up-to-date. +Merging iommu/next (e172b8122254 Merge branches 'iommu/fixes', 'arm/smmu', 'x86/amd', 'arm/omap', 'arm/shmobile' and 'x86/vt-d' into next) +$ git merge iommu/next +Already up-to-date. +Merging dwmw2-iommu/master (5ae0566a0fff iommu/vt-d: fix bug in matching PCI devices with DRHD/RMRR descriptors) +$ git merge dwmw2-iommu/master +Merge made by the 'recursive' strategy. + drivers/iommu/dmar.c | 3 ++- + drivers/iommu/intel-iommu.c | 10 +++++++--- + 2 files changed, 9 insertions(+), 4 deletions(-) +Merging vfio/next (4379d2ae1528 vfio: always select ANON_INODES) +$ git merge vfio/next +Already up-to-date. +Merging osd/linux-next (f1f6630b53e7 MAINTAINERS: Update email address for bhalevy) +$ 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 (c800bcd5f53f sparse: fix comment) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/master (4daa06f4d8b0 syscall.h: fix doc text for syscall_get_arch()) +$ git merge audit/master +Resolved 'arch/mips/include/asm/syscall.h' using previous resolution. +Resolved 'arch/x86/Kconfig' using previous resolution. +Resolved 'kernel/audit.c' using previous resolution. +Auto-merging kernel/audit.c +CONFLICT (content): Merge conflict in kernel/audit.c +Auto-merging arch/x86/Kconfig +CONFLICT (content): Merge conflict in arch/x86/Kconfig +Auto-merging arch/mips/include/asm/syscall.h +CONFLICT (content): Merge conflict in arch/mips/include/asm/syscall.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 81a2874ea686] Merge remote-tracking branch 'audit/master' +$ git diff -M --stat --summary HEAD^.. + include/asm-generic/syscall.h | 2 +- + include/uapi/linux/audit.h | 13 ------------- + 2 files changed, 1 insertion(+), 14 deletions(-) +Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls) +$ git merge fsnotify/for-next +Already up-to-date. +Merging devicetree/devicetree/next (d88cf7d7b424 Merge remote-tracking branch 'robh/for-next' into devicetree/next) +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging dt-rh/for-next (e7a62df8e8b4 of: Clean up of_update_property) +$ git merge dt-rh/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/marvell,kirkwood.txt | 97 ++++++++++++++++++++++ + .../devicetree/bindings/i2c/trivial-devices.txt | 16 ++++ + .../devicetree/bindings/vendor-prefixes.txt | 18 +++- + drivers/of/base.c | 10 +-- + drivers/of/fdt.c | 2 +- + 5 files changed, 134 insertions(+), 9 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/marvell,kirkwood.txt +Merging spi/for-next (5db6f05a77a0 Merge remote-tracking branches 'spi/topic/s3c24xx', 'spi/topic/sirf' and 'spi/topic/workqueue' into spi-next) +$ git merge spi/for-next +Auto-merging include/linux/spi/adi_spi3.h +Auto-merging drivers/spi/spi-adi-v3.c +Auto-merging arch/arm/mach-shmobile/clock-r8a7778.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/spi/fsl-spi.txt | 6 + + Documentation/devicetree/bindings/spi/spi-bus.txt | 2 + + .../devicetree/bindings/spi/spi-cadence.txt | 31 + + arch/arm/mach-shmobile/clock-r8a7778.c | 2 +- + arch/blackfin/mach-bf609/boards/ezkit.c | 22 +- + arch/blackfin/mach-bf609/clock.c | 7 + + drivers/spi/Kconfig | 11 +- + drivers/spi/Makefile | 3 +- + drivers/spi/{spi-bfin-v3.c => spi-adi-v3.c} | 433 ++++++------- + drivers/spi/spi-ath79.c | 1 - + drivers/spi/spi-atmel.c | 4 +- + drivers/spi/spi-bcm63xx-hsspi.c | 1 - + drivers/spi/spi-bcm63xx.c | 1 - + drivers/spi/spi-bfin5xx.c | 1 + + drivers/spi/spi-cadence.c | 673 +++++++++++++++++++++ + drivers/spi/spi-falcon.c | 1 - + drivers/spi/spi-fsl-espi.c | 36 +- + drivers/spi/spi-fsl-lib.c | 6 - + drivers/spi/spi-fsl-lib.h | 1 - + drivers/spi/spi-fsl-spi.c | 2 +- + drivers/spi/spi-nuc900.c | 1 - + drivers/spi/spi-omap-uwire.c | 1 - + drivers/spi/spi-pxa2xx.c | 1 - + drivers/spi/spi-s3c24xx.c | 11 +- + drivers/spi/spi-s3c64xx.c | 1 - + drivers/spi/spi-sh-hspi.c | 4 +- + drivers/spi/spi-sh-sci.c | 1 - + drivers/spi/spi-sirf.c | 268 ++++---- + drivers/spi/spi-sun4i.c | 1 - + drivers/spi/spi-sun6i.c | 1 - + drivers/spi/spi.c | 4 +- + .../bfin_spi3.h => include/linux/spi/adi_spi3.h | 20 +- + 32 files changed, 1177 insertions(+), 381 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/spi-cadence.txt + rename drivers/spi/{spi-bfin-v3.c => spi-adi-v3.c} (60%) + create mode 100644 drivers/spi/spi-cadence.c + rename arch/blackfin/include/asm/bfin_spi3.h => include/linux/spi/adi_spi3.h (97%) +Merging tip/auto-latest (7b8bfcc693cf Merge branch 'x86/vdso') +$ git merge tip/auto-latest +Merge made by the 'recursive' strategy. + arch/x86/include/asm/hw_irq.h | 4 ++-- + arch/x86/include/asm/uv/uv_hub.h | 12 +---------- + arch/x86/include/asm/uv/uv_mmrs.h | 42 +++++++++++++++++++++++++++++++++++++- + arch/x86/kernel/apic/x2apic_uv_x.c | 26 ++++++++++++++++++----- + arch/x86/kernel/cpu/mshyperv.c | 9 -------- + arch/x86/kernel/i8259.c | 20 +++++++++++++++++- + arch/x86/mm/pgtable.c | 21 ++++++++++++------- + arch/x86/realmode/rm/Makefile | 3 ++- + arch/x86/vdso/vdso-layout.lds.S | 19 ++++++++--------- + drivers/misc/sgi-gru/grufile.c | 11 +++++++--- + include/linux/compiler-intel.h | 3 --- + include/linux/smp.h | 11 ++++++++++ + include/linux/tick.h | 2 ++ + kernel/sched/core.c | 5 +---- + kernel/sched/fair.c | 13 ++++++------ + kernel/sched/sched.h | 11 +++++++++- + kernel/smp.c | 42 ++++++++++++++++++++++++++++++++++++++ + kernel/time/tick-common.c | 2 +- + kernel/time/tick-sched.c | 26 ++++++++++++++++++++++- + 19 files changed, 215 insertions(+), 67 deletions(-) +Merging clockevents/clockevents/next (09e15176ded1 clocksource: exynos_mct: silence a static checker warning) +$ git merge clockevents/clockevents/next +Already up-to-date. +Merging edac/linux_next (49856dc973cd sb_edac: mark MCE messages as KERN_DEBUG) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (c045ebdf6079 Merge branch 'edac-for-3.15' into for-next) +$ git merge edac-amd/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging ftrace/for-next (17a280ea8111 tracing: Add missing function triggers dump and cpudump to README) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (765a3f4fed70 rcu: Provide grace-period piggybacking API) +$ git merge rcu/rcu/next +Already up-to-date. +Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions) +$ git merge uprobes/for-next +Already up-to-date. +Merging kvm/linux-next (0f689a33ad17 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) +$ 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 (7227fc066660 Merge branch 'kvm-ppchv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into kvm-next) +$ 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 (0a25e113b480 Merge branch 'devel/for-linus-3.15' into linux-next) +$ git merge xen-tip/linux-next +Merge made by the 'recursive' strategy. + drivers/xen/xen-acpi-processor.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging percpu/for-next (4abee313c9a8 Merge branch 'for-3.16' into for-next) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. + include/linux/percpu.h | 2 +- + mm/percpu.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging workqueues/for-next (77f300b198f9 workqueue: fix bugs in wq_update_unbound_numa() failure path) +$ git merge workqueues/for-next +Merge made by the 'recursive' strategy. + kernel/workqueue.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging drivers-x86/linux-next (7a70906e55bf alienware-wmi: cover some scenarios where memory allocations would fail) +$ git merge drivers-x86/linux-next +Merge made by the 'recursive' strategy. +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 (b94f4fe06dd8 Merge remote-tracking branches 'regmap/topic/le', 'regmap/topic/mmio' and 'regmap/topic/rbtree' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regcache-rbtree.c | 8 +++--- + drivers/base/regmap/regmap-mmio.c | 29 +++++++++++++++---- + drivers/base/regmap/regmap.c | 52 +++++++++++++++++++++++++++++++++++ + 3 files changed, 80 insertions(+), 9 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 (95d33e9fcc7e leds: leds-pwm: add DT support for LEDs wired to supply) +$ git merge leds/for-next +Removing include/linux/platform_data/leds-pca9685.h +Removing drivers/leds/leds-pca9685.c +Auto-merging drivers/leds/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-pwm.txt | 2 + + drivers/leds/Kconfig | 10 - + drivers/leds/Makefile | 1 - + drivers/leds/dell-led.c | 171 ++++++++++++++++- + drivers/leds/leds-pca9685.c | 213 --------------------- + drivers/leds/leds-pwm.c | 144 +++++++------- + include/linux/dell-led.h | 10 + + include/linux/platform_data/leds-pca9685.h | 35 ---- + 8 files changed, 246 insertions(+), 340 deletions(-) + delete mode 100644 drivers/leds/leds-pca9685.c + create mode 100644 include/linux/dell-led.h + delete mode 100644 include/linux/platform_data/leds-pca9685.h +Merging driver-core/driver-core-next (c9eaa447e77e Linux 3.15-rc1) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (c9eaa447e77e Linux 3.15-rc1) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (c9eaa447e77e Linux 3.15-rc1) +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (c9eaa447e77e Linux 3.15-rc1) +$ git merge usb-gadget/next +Already up-to-date. +Merging staging/staging-next (dff222670ebe staging: rtl8723au: Make _rtw_free_network23() static) +$ git merge staging/staging-next +Recorded preimage for 'drivers/staging/rtl8723au/core/rtw_ieee80211.c' +Recorded preimage for 'drivers/staging/rtl8723au/core/rtw_mlme_ext.c' +Recorded preimage for 'drivers/staging/rtl8723au/core/rtw_wlan_util.c' +Removing drivers/staging/rtl8723au/include/rtw_p2p.h +Removing drivers/staging/rtl8723au/include/ethernet.h +Auto-merging drivers/staging/rtl8723au/core/rtw_wlan_util.c +CONFLICT (content): Merge conflict in drivers/staging/rtl8723au/core/rtw_wlan_util.c +CONFLICT (modify/delete): drivers/staging/rtl8723au/core/rtw_p2p.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rtl8723au/core/rtw_p2p.c left in tree. +Auto-merging drivers/staging/rtl8723au/core/rtw_mlme_ext.c +CONFLICT (content): Merge conflict in drivers/staging/rtl8723au/core/rtw_mlme_ext.c +Auto-merging drivers/staging/rtl8723au/core/rtw_ieee80211.c +CONFLICT (content): Merge conflict in drivers/staging/rtl8723au/core/rtw_ieee80211.c +Auto-merging drivers/staging/comedi/comedi_fops.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/rtl8723au/core/rtw_p2p.c +drivers/staging/rtl8723au/core/rtw_p2p.c: needs merge +rm 'drivers/staging/rtl8723au/core/rtw_p2p.c' +$ git commit -v -a +Recorded resolution for 'drivers/staging/rtl8723au/core/rtw_ieee80211.c'. +Recorded resolution for 'drivers/staging/rtl8723au/core/rtw_mlme_ext.c'. +Recorded resolution for 'drivers/staging/rtl8723au/core/rtw_wlan_util.c'. +[master d2084840d8e4] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + drivers/staging/bcm/CmHost.c | 50 +- + drivers/staging/bcm/Qos.c | 174 +- + drivers/staging/bcm/hostmibs.c | 51 +- + drivers/staging/comedi/comedi_fops.c | 9 +- + drivers/staging/comedi/drivers.c | 1 + + drivers/staging/comedi/drivers/addi_apci_1032.c | 2 +- + drivers/staging/comedi/drivers/addi_apci_1500.c | 2 +- + drivers/staging/comedi/drivers/addi_apci_1564.c | 2 +- + drivers/staging/comedi/drivers/addi_apci_2032.c | 2 +- + drivers/staging/comedi/drivers/addi_apci_3120.c | 2 +- + drivers/staging/comedi/drivers/adl_pci9118.c | 6 +- + drivers/staging/comedi/drivers/das6402.c | 2 +- + drivers/staging/comedi/drivers/pcl812.c | 3 +- + drivers/staging/comedi/drivers/s626.c | 36 +- + drivers/staging/dgap/dgap.c | 191 +- + drivers/staging/dgap/dgap.h | 423 +- + drivers/staging/iio/light/tsl2583.c | 38 +- + .../staging/iio/trigger/iio-trig-periodic-rtc.c | 3 +- + drivers/staging/rtl8188eu/include/xmit_osdep.h | 4 - + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 6 +- + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 29 - + drivers/staging/rtl8723au/Kconfig | 8 - + drivers/staging/rtl8723au/Makefile | 1 - + drivers/staging/rtl8723au/core/rtw_ap.c | 196 +- + drivers/staging/rtl8723au/core/rtw_cmd.c | 76 +- + drivers/staging/rtl8723au/core/rtw_ieee80211.c | 732 +-- + drivers/staging/rtl8723au/core/rtw_ioctl_set.c | 17 +- + drivers/staging/rtl8723au/core/rtw_mlme.c | 1362 ++--- + drivers/staging/rtl8723au/core/rtw_mlme_ext.c | 5835 +++++--------------- + drivers/staging/rtl8723au/core/rtw_p2p.c | 4001 -------------- + drivers/staging/rtl8723au/core/rtw_pwrctrl.c | 78 +- + drivers/staging/rtl8723au/core/rtw_recv.c | 40 +- + drivers/staging/rtl8723au/core/rtw_sreset.c | 22 +- + drivers/staging/rtl8723au/core/rtw_wlan_util.c | 454 +- + drivers/staging/rtl8723au/core/rtw_xmit.c | 177 +- + drivers/staging/rtl8723au/hal/hal_com.c | 111 +- + drivers/staging/rtl8723au/hal/hal_intf.c | 12 - + .../staging/rtl8723au/hal/rtl8723a_bt-coexist.c | 18 +- + drivers/staging/rtl8723au/hal/rtl8723a_cmd.c | 91 +- + drivers/staging/rtl8723au/hal/rtl8723a_dm.c | 11 +- + drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c | 303 +- + drivers/staging/rtl8723au/hal/rtl8723au_recv.c | 11 +- + drivers/staging/rtl8723au/hal/usb_halinit.c | 53 +- + drivers/staging/rtl8723au/include/drv_types.h | 26 - + drivers/staging/rtl8723au/include/ethernet.h | 22 - + drivers/staging/rtl8723au/include/hal_com.h | 13 +- + drivers/staging/rtl8723au/include/hal_intf.h | 90 +- + drivers/staging/rtl8723au/include/ieee80211.h | 148 +- + drivers/staging/rtl8723au/include/mlme_osdep.h | 4 - + drivers/staging/rtl8723au/include/osdep_service.h | 21 - + drivers/staging/rtl8723au/include/recv_osdep.h | 9 - + drivers/staging/rtl8723au/include/rtl8723a_cmd.h | 4 - + drivers/staging/rtl8723au/include/rtl8723a_hal.h | 15 - + drivers/staging/rtl8723au/include/rtw_ap.h | 2 - + drivers/staging/rtl8723au/include/rtw_cmd.h | 3 - + drivers/staging/rtl8723au/include/rtw_mlme.h | 131 - + drivers/staging/rtl8723au/include/rtw_mlme_ext.h | 54 +- + drivers/staging/rtl8723au/include/rtw_p2p.h | 158 - + drivers/staging/rtl8723au/include/rtw_security.h | 17 - + drivers/staging/rtl8723au/include/wifi.h | 219 +- + drivers/staging/rtl8723au/include/xmit_osdep.h | 19 - + drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 981 +--- + drivers/staging/rtl8723au/os_dep/mlme_linux.c | 105 - + drivers/staging/rtl8723au/os_dep/os_intfs.c | 63 +- + drivers/staging/rtl8723au/os_dep/osdep_service.c | 11 - + drivers/staging/rtl8723au/os_dep/recv_linux.c | 58 - + drivers/staging/rtl8723au/os_dep/usb_intf.c | 28 +- + drivers/staging/rtl8723au/os_dep/xmit_linux.c | 41 - + drivers/staging/rtl8821ae/rtl8821ae/hw.h | 35 +- + 69 files changed, 3042 insertions(+), 13880 deletions(-) + delete mode 100644 drivers/staging/rtl8723au/core/rtw_p2p.c + delete mode 100644 drivers/staging/rtl8723au/include/ethernet.h + delete mode 100644 drivers/staging/rtl8723au/include/rtw_p2p.h +Merging char-misc/char-misc-next (c9eaa447e77e Linux 3.15-rc1) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging cgroup/for-next (49957f8e2a43 cgroup: newly created dirs and files should be owned by the creator) +$ git merge cgroup/for-next +Already up-to-date. +Merging scsi/for-next (b908a5a97b7f [SCSI] hpsa: fix NULL dereference in hpsa_put_ctlr_into_performant_mode()) +$ git merge scsi/for-next +Merge made by the 'recursive' strategy. + drivers/scsi/hpsa.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +Merging target-updates/for-next (b076808051f2 ib_srpt: Use correct ib_sg_dma primitives) +$ git merge target-updates/for-next +Already up-to-date. +Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging writeback/writeback-for-next (f9b0e058cbd0 writeback: Fix data corruption on NFS) +$ git merge writeback/writeback-for-next +Already up-to-date. +Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries) +$ git merge hwspinlock/linux-next +Already up-to-date. +Merging pinctrl/for-next (cc17609e1855 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/qcom,apq8064-pinctrl.txt | 88 ++++ + drivers/pinctrl/Kconfig | 11 +- + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/pinctrl-adi2.c | 2 +- + drivers/pinctrl/pinctrl-apq8064.c | 566 +++++++++++++++++++++ + drivers/pinctrl/pinctrl-lantiq.h | 1 + + drivers/pinctrl/pinctrl-msm.c | 4 +- + drivers/pinctrl/pinctrl-msm.h | 3 +- + drivers/pinctrl/pinctrl-msm8x74.c | 3 +- + drivers/pinctrl/pinctrl-st.c | 130 ++--- + drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 37 +- + 11 files changed, 733 insertions(+), 113 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt + create mode 100644 drivers/pinctrl/pinctrl-apq8064.c +Merging vhost/linux-next (d3d665a654a3 vhost-scsi: whitespace tweak) +$ git merge vhost/linux-next +Already up-to-date. +Merging remoteproc/for-next (bd88acba5f98 remoteproc/ste_modem: staticize local symbols) +$ git merge remoteproc/for-next +Already up-to-date. +Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO) +$ git merge rpmsg/for-next +Already up-to-date. +Merging gpio/for-next (da150898c982 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/gpio/driver.txt | 59 +++++++++++++++++ + MAINTAINERS | 1 + + drivers/gpio/Kconfig | 11 +++- + drivers/gpio/Makefile | 2 +- + drivers/gpio/gpio-dwapb.c | 3 - + drivers/gpio/gpio-omap.c | 128 ++++++++++++++++++------------------ + drivers/gpio/gpio-tc3589x.c | 148 +++++++++--------------------------------- + drivers/gpio/gpio-zevio.c | 2 +- + drivers/gpio/gpiolib-acpi.c | 12 +++- + drivers/gpio/gpiolib.c | 14 +++- + include/linux/gpio/driver.h | 5 +- + include/linux/mfd/tc3589x.h | 1 - + 12 files changed, 193 insertions(+), 193 deletions(-) +Merging dma-mapping/dma-mapping-next (68efd7d2fb32 arm: dma-mapping: remove order parameter from arm_iommu_create_mapping()) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (2ae69a460413 pwm: pxa: Constify OF match table) +$ git merge pwm/for-next +Already up-to-date. +Merging dma-buf/for-next (dcb99fd9b08c Linux 3.14-rc7) +$ git merge dma-buf/for-next +Already up-to-date. +Merging userns/for-next (3efe1ac78e99 vfs: Block intuitively in the case of BSD accounting files) +$ git merge userns/for-next +Recorded preimage for 'fs/namespace.c' +Resolved 'fs/dcache.c' using previous resolution. +Resolved 'fs/namei.c' using previous resolution. +Auto-merging include/linux/dcache.h +Auto-merging fs/proc/fd.c +Auto-merging fs/proc/base.c +Auto-merging fs/nfs/dir.c +Auto-merging fs/namespace.c +CONFLICT (content): Merge conflict in fs/namespace.c +Auto-merging fs/namei.c +CONFLICT (content): Merge conflict in fs/namei.c +Auto-merging fs/mount.h +Auto-merging fs/kernfs/dir.c +Auto-merging fs/fuse/dir.c +Auto-merging fs/dcache.c +CONFLICT (content): Merge conflict in fs/dcache.c +Auto-merging fs/ceph/dir.c +Auto-merging fs/btrfs/ioctl.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/namespace.c'. +[master d90734d818ac] Merge remote-tracking branch 'userns/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/afs/dir.c | 5 -- + fs/btrfs/ioctl.c | 5 +- + fs/ceph/dir.c | 1 - + fs/cifs/readdir.c | 6 +-- + fs/dcache.c | 140 ++++++++++++++++++------------------------------- + fs/fuse/dir.c | 7 +-- + fs/gfs2/dentry.c | 3 -- + fs/kernfs/dir.c | 11 ---- + fs/mount.h | 22 ++++++++ + fs/namei.c | 22 ++++---- + fs/namespace.c | 130 +++++++++++++++++++++++++++++++++++++++++---- + fs/nfs/dir.c | 7 +-- + fs/proc/base.c | 10 +--- + fs/proc/fd.c | 2 - + include/linux/dcache.h | 3 +- + kernel/acct.c | 25 +++++++-- + 16 files changed, 231 insertions(+), 168 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 12f81a13da6d Merge remote-tracking branch 'gpio/for-next' +Merging ktest/for-next (62183dcac539 ktest: Set CLOSE_CONSOLE_SIGNAL in the kvm.conf) +$ 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 (31c2c4b8e911 clk: bcm281xx: don't use unnamed structs or unions) +$ git merge clk/clk-next +Merge made by the 'recursive' strategy. + drivers/clk/bcm/clk-kona-setup.c | 33 +++++++++++---------- + drivers/clk/bcm/clk-kona.c | 64 +++++++++++++++++++++------------------- + drivers/clk/bcm/clk-kona.h | 28 +++++++++--------- + 3 files changed, 64 insertions(+), 61 deletions(-) +Merging random/dev (7b878d4b48c4 random: Add arch_has_random[_seed]()) +$ git merge random/dev +Already up-to-date. +Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access) +$ git merge lzo-update/lzo-update +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 (e02ba72aabfa aio: block io_destroy() until all context requests are completed) +$ git merge aio/master +Merge made by the 'recursive' strategy. + fs/aio.c | 36 ++++++++++++++++++++++++++++++++---- + 1 file changed, 32 insertions(+), 4 deletions(-) +Merging llvmlinux/for-next (40e9963e622c Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge llvmlinux/for-next +Already up-to-date. +Merging powernv-cpuidle/powernv-cpuidle (0888839c5b62 cpuidle/powernv: Parse device tree to setup idle states) +$ git merge powernv-cpuidle/powernv-cpuidle +Already up-to-date. +Merging rd-docs/master (596d80c7ceb6 The sample wrapper currently fails on some Java 7 .class files. This updates the wrapper to properly handle those files.) +$ git merge rd-docs/master +Merge made by the 'recursive' strategy. + Documentation/email-clients.txt | 15 +++++---------- + Documentation/java.txt | 8 ++++++++ + 2 files changed, 13 insertions(+), 10 deletions(-) +Merging akpm-current/current (7b5f689823ab lib/scatterlist: clean up useless architecture versions of scatterlist.h) +$ git merge --no-ff akpm-current/current +Auto-merging lib/Kconfig.debug +Auto-merging init/Kconfig +Auto-merging drivers/leds/Kconfig +Removing arch/x86/include/asm/scatterlist.h +Auto-merging arch/x86/Kconfig +Removing arch/sparc/include/asm/scatterlist.h +Removing arch/score/include/asm/scatterlist.h +Removing arch/s390/include/asm/scatterlist.h +Auto-merging arch/s390/Kconfig +Removing arch/powerpc/include/asm/scatterlist.h +Removing arch/mn10300/include/asm/scatterlist.h +Removing arch/microblaze/include/asm/scatterlist.h +Removing arch/m32r/include/asm/scatterlist.h +Removing arch/ia64/include/asm/scatterlist.h +Removing arch/frv/include/asm/scatterlist.h +Removing arch/cris/include/asm/scatterlist.h +Removing arch/arm/include/asm/scatterlist.h +Removing arch/alpha/include/asm/scatterlist.h +Auto-merging MAINTAINERS +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + CREDITS | 7 + + Documentation/SubmittingPatches | 22 +- + .../devicetree/bindings/rtc/xgene-rtc.txt | 28 ++ + Documentation/filesystems/vfat.txt | 10 + + Documentation/kernel-parameters.txt | 4 + + Documentation/leds/leds-class.txt | 3 - + Documentation/printk-formats.txt | 6 + + MAINTAINERS | 5 +- + arch/alpha/include/asm/Kbuild | 1 + + arch/alpha/include/asm/scatterlist.h | 6 - + arch/arm/Kconfig | 1 + + arch/arm/include/asm/Kbuild | 1 + + arch/arm/include/asm/fixmap.h | 29 +- + arch/arm/include/asm/scatterlist.h | 12 - + arch/arm/mm/init.c | 2 +- + arch/arm64/Kconfig | 1 + + arch/arm64/boot/dts/apm-storm.dtsi | 21 ++ + arch/cris/include/asm/Kbuild | 1 + + arch/cris/include/asm/scatterlist.h | 6 - + arch/frv/include/asm/Kbuild | 1 + + arch/frv/include/asm/scatterlist.h | 6 - + arch/ia64/Kconfig | 1 + + arch/ia64/include/asm/Kbuild | 1 + + arch/ia64/include/asm/scatterlist.h | 7 - + arch/m32r/include/asm/Kbuild | 1 + + arch/m32r/include/asm/scatterlist.h | 6 - + arch/m68k/include/asm/signal.h | 9 - + arch/microblaze/include/asm/Kbuild | 1 + + arch/microblaze/include/asm/scatterlist.h | 1 - + arch/mips/mm/cache.c | 4 +- + arch/mn10300/include/asm/Kbuild | 1 + + arch/mn10300/include/asm/scatterlist.h | 16 - + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/Kbuild | 1 + + arch/powerpc/include/asm/pgtable.h | 11 + + arch/powerpc/include/asm/scatterlist.h | 17 - + arch/powerpc/mm/dma-noncoherent.c | 1 + + arch/powerpc/mm/subpage-prot.c | 6 +- + arch/powerpc/platforms/44x/warp.c | 1 + + arch/powerpc/platforms/52xx/efika.c | 1 + + arch/powerpc/platforms/amigaone/setup.c | 1 + + arch/s390/Kconfig | 1 + + arch/s390/include/asm/Kbuild | 1 + + arch/s390/include/asm/scatterlist.h | 3 - + arch/score/include/asm/Kbuild | 1 + + arch/score/include/asm/scatterlist.h | 6 - + arch/sparc/Kconfig | 1 + + arch/sparc/include/asm/Kbuild | 1 + + arch/sparc/include/asm/scatterlist.h | 8 - + arch/um/include/asm/Kbuild | 1 + + arch/x86/Kconfig | 3 +- + arch/x86/include/asm/Kbuild | 3 +- + arch/x86/include/asm/pgtable.h | 14 +- + arch/x86/include/asm/pgtable_64.h | 8 + + arch/x86/include/asm/pgtable_types.h | 66 ++-- + arch/x86/include/asm/scatterlist.h | 8 - + arch/x86/include/asm/signal.h | 6 - + arch/x86/mm/pageattr-test.c | 2 +- + block/genhd.c | 2 +- + drivers/input/Kconfig | 9 + + drivers/input/Makefile | 3 + + drivers/input/input.c | 6 + + drivers/input/leds.c | 249 ++++++++++++++ + drivers/input/misc/da9055_onkey.c | 1 - + drivers/leds/Kconfig | 3 - + drivers/misc/ti-st/st_core.c | 2 +- + drivers/net/irda/donauboe.c | 15 +- + drivers/pps/pps.c | 57 ++-- + drivers/rtc/Kconfig | 9 + + drivers/rtc/Makefile | 1 + + drivers/rtc/interface.c | 15 +- + drivers/rtc/rtc-xgene.c | 278 +++++++++++++++ + drivers/tty/Kconfig | 4 + + drivers/tty/vt/keyboard.c | 110 ++++-- + drivers/video/backlight/backlight.c | 2 - + fs/befs/linuxvfs.c | 5 +- + fs/binfmt_elf.c | 21 +- + fs/fat/cache.c | 70 +++- + fs/fat/fat.h | 6 +- + fs/fat/file.c | 78 ++++- + fs/fat/inode.c | 87 ++++- + fs/hfsplus/catalog.c | 89 +++-- + fs/hfsplus/dir.c | 11 +- + fs/hfsplus/hfsplus_fs.h | 4 +- + fs/hfsplus/super.c | 4 +- + fs/jffs2/background.c | 12 +- + fs/mpage.c | 23 +- + fs/ntfs/compress.c | 2 +- + fs/ntfs/super.c | 4 +- + fs/ntfs/sysctl.c | 2 +- + fs/ocfs2/cluster/tcp.c | 33 +- + fs/ocfs2/dlm/dlmdebug.c | 2 +- + fs/ocfs2/dlm/dlmlock.c | 2 +- + fs/ocfs2/dlm/dlmmaster.c | 20 +- + fs/ocfs2/namei.c | 123 ++++++- + fs/ocfs2/stackglue.c | 2 +- + fs/ocfs2/super.c | 8 +- + fs/ocfs2/uptodate.c | 2 +- + fs/proc/task_mmu.c | 287 +++++++--------- + include/asm-generic/pgtable.h | 35 +- + include/linux/crc64_ecma.h | 56 +++ + include/linux/gfp.h | 10 +- + include/linux/hugetlb.h | 7 - + include/linux/hugetlb_inline.h | 7 + + include/linux/input.h | 21 ++ + include/linux/memcontrol.h | 17 +- + include/linux/mm.h | 24 +- + include/linux/pagemap.h | 28 ++ + include/linux/scatterlist.h | 2 +- + include/linux/sched.h | 3 - + include/linux/signal.h | 21 +- + include/linux/slab.h | 11 +- + include/linux/string.h | 1 + + include/linux/swapops.h | 2 +- + include/linux/thread_info.h | 2 - + include/linux/vm_event_item.h | 4 + + include/linux/vmstat.h | 6 + + include/linux/wait.h | 14 +- + include/scsi/scsi.h | 2 +- + include/trace/events/gfpflags.h | 1 - + init/Kconfig | 24 +- + init/main.c | 72 +++- + ipc/msg.c | 9 +- + ipc/sem.c | 10 +- + ipc/shm.c | 10 +- + ipc/util.c | 8 +- + ipc/util.h | 2 +- + kernel/exit.c | 39 --- + kernel/fork.c | 6 +- + kernel/kmod.c | 5 +- + kernel/signal.c | 90 +++-- + kernel/time/sched_clock.c | 4 + + kernel/watchdog.c | 10 +- + lib/Kconfig | 14 + + lib/Kconfig.debug | 13 +- + lib/Makefile | 1 + + lib/crc64_ecma.c | 341 +++++++++++++++++++ + lib/scatterlist.c | 4 +- + lib/string.c | 8 +- + lib/vsprintf.c | 20 +- + lib/xz/Kconfig | 24 +- + mm/compaction.c | 17 +- + mm/fremap.c | 7 +- + mm/huge_memory.c | 2 +- + mm/hugetlb.c | 2 + + mm/memcontrol.c | 86 ++--- + mm/memory-failure.c | 6 +- + mm/memory.c | 25 +- + mm/mempolicy.c | 259 ++++++-------- + mm/page_alloc.c | 56 +-- + mm/pagewalk.c | 375 +++++++++++++-------- + mm/rmap.c | 14 +- + mm/slab.c | 7 +- + mm/slab.h | 29 ++ + mm/slab_common.c | 19 +- + mm/slub.c | 30 +- + mm/util.c | 30 ++ + mm/vmacache.c | 19 +- + mm/vmscan.c | 68 ++-- + mm/vmstat.c | 4 + + scripts/checkpatch.pl | 40 ++- + usr/Kconfig | 77 ----- + 162 files changed, 2942 insertions(+), 1275 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/xgene-rtc.txt + delete mode 100644 arch/alpha/include/asm/scatterlist.h + delete mode 100644 arch/arm/include/asm/scatterlist.h + delete mode 100644 arch/cris/include/asm/scatterlist.h + delete mode 100644 arch/frv/include/asm/scatterlist.h + delete mode 100644 arch/ia64/include/asm/scatterlist.h + delete mode 100644 arch/m32r/include/asm/scatterlist.h + delete mode 100644 arch/microblaze/include/asm/scatterlist.h + delete mode 100644 arch/mn10300/include/asm/scatterlist.h + delete mode 100644 arch/powerpc/include/asm/scatterlist.h + delete mode 100644 arch/s390/include/asm/scatterlist.h + delete mode 100644 arch/score/include/asm/scatterlist.h + delete mode 100644 arch/sparc/include/asm/scatterlist.h + delete mode 100644 arch/x86/include/asm/scatterlist.h + create mode 100644 drivers/input/leds.c + create mode 100644 drivers/rtc/rtc-xgene.c + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 lib/crc64_ecma.c +$ git am -3 ../patches/0001-Revert-x86-define-_PAGE_NUMA-by-reusing-software-bit.patch +Applying: Revert "x86: define _PAGE_NUMA by reusing software bits on the PMD and PTE levels -fix" +$ git reset HEAD^ +Unstaged changes after reset: +M arch/powerpc/include/asm/pgtable.h +$ git add -A . +$ git commit -v -a --amend +[master 02f07c3ccc07] Merge branch 'akpm-current/current' +$ git am -3 ../patches/0002-Revert-x86-define-_PAGE_NUMA-by-reusing-software-bit.patch +Applying: Revert "x86: define _PAGE_NUMA by reusing software bits on the PMD and PTE levels" +$ git reset HEAD^ +Unstaged changes after reset: +M arch/powerpc/include/asm/pgtable.h +M arch/x86/include/asm/pgtable.h +M arch/x86/include/asm/pgtable_64.h +M arch/x86/include/asm/pgtable_types.h +M arch/x86/mm/pageattr-test.c +M include/asm-generic/pgtable.h +M include/linux/swapops.h +M mm/memory.c +$ git add -A . +$ git commit -v -a --amend +[master 50e056db0177] Merge branch 'akpm-current/current' +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: drivers/gpio/gpio-zevio.c: fix build +Applying: drivers/w1/w1_int.c: call put_device if device_register fails +Applying: arm: move arm_dma_limit to setup_dma_zone +Applying: ufs: sb mutex merge + mutex_destroy +Applying: mm: add strictlimit knob +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + fa3cfb65368e...4c3d768413b4 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (4c3d768413b4 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/gpio/gpio-zevio.c | 4 ++++ + drivers/w1/w1_int.c | 5 ++--- + fs/ufs/balloc.c | 30 +++++++++++++------------- + fs/ufs/ialloc.c | 17 +++++++-------- + fs/ufs/super.c | 28 +++++++++---------------- + fs/ufs/ufs.h | 1 - + mm/backing-dev.c | 35 +++++++++++++++++++++++++++++++ + 10 files changed, 86 insertions(+), 50 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..55d907fe9732 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,4 @@ +Importing jdelvare-hwmon based on 3.14 +Unchanged quilt series jdelvare-hwmon +Importing rd-docs based on 3.14 +Unchanged quilt series rd-docs diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..b5f1ae67c438 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20140417 |