diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-14 12:00:56 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-14 12:00:56 +1000 |
| commit | a0c72b652592791c2271237d88110208c8b1cf35 (patch) | |
| tree | 93e214a5cc76c9ee08a430c4e2998d3b92c30732 | |
| parent | 61b33bf36c2d90f7ddd98395a900589c8519d563 (diff) | |
Add linux-next specific files for 20140414next-20140414
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 213 | ||||
| -rw-r--r-- | Next/Trees | 217 | ||||
| -rw-r--r-- | Next/merge.log | 2653 | ||||
| -rw-r--r-- | Next/quilt-import.log | 5 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 3089 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..01baa2d3e532 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,213 @@ +Name SHA1 +---- ---- +origin c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 +fixes b0031f227e47919797dc0e1c1990f3ef151ff0cc +kbuild-current 38dbfb59d1175ef458d006556061adeaa8751b72 +arc-current 61fb4bfc010b0d2940f7fd87acbce6a0f03217cb +arm-current c9d347e0277696c80496161cbef47393b850a0aa +m68k-current 50be9eba831da114e1979726f4119d342698e651 +metag-fixes 0414855fdc4a40da05221fc6062cccbc0c30f169 +powerpc-merge cc4f265ad9a37bdb1846c45eebe454c382f31d67 +sparc 455c6fdbd219161bd09b1165f11699d6d73de11c +net eda43ce03919f2b929a884fddbefa98cfb04fec9 +ipsec 5596732fa8c14139018ecda8356eabbfb599d830 +sound-current a5065eb6da55b226661456e6a7435f605df98111 +pci-current 707d4eefbdb31f8e588277157056b0ce637d6c68 +wireless 5869e795e07ded955744ab99765d0f183f825f97 +driver-core.current b33ce442993865180292df2a314ee5251ba38b50 +tty.current b33ce442993865180292df2a314ee5251ba38b50 +usb.current b33ce442993865180292df2a314ee5251ba38b50 +staging.current 4ba85265790ba3681deeaf73f018c0eb829a7341 +char-misc.current b33ce442993865180292df2a314ee5251ba38b50 +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 9db32cb625a500acf5849be352fb9d8b9709c529 +asm-generic fb9de7ebc3a2eb7ddb83c92e288447a0c313bced +arc b098d6726bbfb94c06d6e1097466187afddae61f +arm 98f07013149d4be18ff16cfc5b43218f3a70afd6 +arm-kvm-cpuresume 91a3f6af430d81c5f855f3f1ff0f3715e064f342 +arm-perf 6d0abeca3242a88cab8232e4acd7e2bf088f3bc2 +arm-soc 2bf73dd61a84cdf27e49f48e08739af6ba70ace1 +bcm2835 fa389e220254c69ffae0d403eac4146171062d08 +cortex-m f0d7515372ff0ea53fd66099533d3c8e0464cbbf +ep93xx bfb0709fd17b13498d99592bbe12c91130e35a55 +imx-mxs cf73d79a7670f216633c73a09badc57a32cc246a +ixp4xx 19f949f52599ba7c3f67a5897ac6be14bfcb1200 +keystone 47fc77cc704ea0ff839f8240894ed8e0be398adf +msm 81cf1e061d001fab44dbaa85fc4fbfb6da6713a1 +mvebu 6412d6635b676c8fc862f5c71bc1eb3be9ddf7b6 +renesas 9ee9b9ddb17fe81035b3c9b1859ab3e3dfb2f0d8 +samsung 82cd4473bde8d91951b608a0e4c4f3445928f277 +tegra dcb99fd9b08cfe1afe426af4d8d3cbc429190f15 +arm64 ebf81a938dade3b450eb11c57fa744cfac4b523f +blackfin c4a2c58d20953ff1080f50f705cdd952f6d301b2 +c6x ae72758f1dd93bd367dc7719702f24a9bfb3bad9 +cris cd065a010a97e3c330d1ded9af551664c9689b19 +hexagon a9a44fdf329668125042055c569656aa83d8cccb +ia64 e32634f5d57f1dce88624b70a6d625915f6ea09e +m68k 50be9eba831da114e1979726f4119d342698e651 +m68knommu 4dc5aa2172373fe7ccc25bc22fc21fcf150a66c5 +metag 2aca46ce1b5c4b7d76566de72b16640ec674c008 +microblaze a66a626538af65cbfc611e2b2fce500ed3f24518 +mips 06785279ce3218e1ee9b3c844679c30e00e681f2 +openrisc 548dafe880ad84d0accc0a5596c26e3348b103e1 +parisc 6c700d71f7faecb540b3fa4303edb5323a2768c1 +parisc-hd ab3e55b119c9653b19ea4edffb86f04db867ac98 +powerpc cd427485357c0c4b99f69719251baacf25946e11 +mpc5xxx bc75059422338197ce487d338ac9c898761e1e61 +galak 9e2ecdbba3b0745f9ed454ab86961e3ccf9dc224 +s390 7b536de7294c26194d16366f567820944fccd1c8 +sparc-next 049ffa8ab33a63b3bff672d1a0ee6a35ad253fe8 +tile 5eb0bdf84433eb7b7ad4ba92a80aac57ad4b46ea +uml 989e59fa41c5464ab77bf0bf82f32f721430544e +unicore32 c284464658acab50c67ff65ff3dc9215a0231ad2 +xtensa cfe8255f0afcf5d2d1dbfa093223cafe38773fa7 +btrfs 00fdf13a2e9f313a044288aa59d3b8ec29ff904a +ceph a30be7cb2ccb995ad5e67fd4b548f11fe37fc8b1 +cifs a5a64da8c4e584450bb1485463ce343316426e22 +configfs b930c26416c4ea6855726fd977145ccea9afbdda +ecryptfs 9e78d14a9f641c0476f733f6fc559ba5cac6f52b +ext3 01d8885785a60ae8f4c37b0ed75bdc96d0fc6a44 +ext4 021b5a00821aafbe5374a82b4602946f450e6f84 +f2fs 9e897e13bd46fa03485468609741974259a8c573 +fscache fe02fb3ec10932ce07406b1581e28326181fc9d8 +fuse f3846266f593595632a07242fcbc6c24bc2ade68 +gfs2 1b2ad41214c9bf6e8befa000f0522629194bf540 +jfs 844fa1b5f8493cff4b976fa7a5b9ebeeafdd75cc +logfs 339466142b3f58fe0ee4dea7e8c5f3d33099e89c +nfs c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 +nfsd 06f9cc12caa862f5bc86ebdb4f77568a4bef0167 +omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84 +squashfs 6d565409503f4e1f74ac30de14e8c91a2b826cd8 +v9fs 8a5daf1e2c199746767d94b4036638ba11d528b3 +ubifs d56030ac25d383218045c5d87e98e0494d6af3ad +xfs a6cf33bc566c5fe888bfa9cf6448037c90661f67 +file-private-locks 18a1a7a1d862ae0794a0179473d08a414dd49234 +vfs 527d1511310a89650000081869260394e20c7013 +pci 30723cbf6f7aec2ab4810bdc4bf12c5749a09e33 +hid d1443c96d663037846fca3faa165a96135c9566a +i2c 9e897e13bd46fa03485468609741974259a8c573 +jdelvare-hwmon 455c6fdbd219161bd09b1165f11699d6d73de11c +hwmon-staging 39de65aa2c3eee901db020a4f1396998e09602a3 +v4l-dvb 3f52fc47bbb324df5c40425fd9d32c37269605d3 +kbuild 2eea5bbcd396d83b69868de4f47182be0c29d60f +kconfig 95edca5c523c4b404dd60baa0a1bea0e4c38fd72 +libata f5f85ee065f2e243f4165d7dd7d1a4a95daa1801 +pm 19ce7f3f31103d7a5b0e93ba9de3ebb4b9d66701 +idle 23a299cd93781a190cdca0d7d16034837b7dfd86 +apm 158204397034f088bfd505eeee281f7072da1c24 +cpupowerutils f16603386b38c28979f4df1cafdc2fe73fa87d37 +thermal 9477165ec525d47abb1cb6523698e0cd89d65ddb +ieee1394 0ca49345b6f489e95f8d6edeb0b092e257475b2a +dlm 075f01775f53640af4a2ca3ed8cbc71de6e37582 +swiotlb 0cb637bff80d5ba2b916bb19f19ffd59cd4079fd +slave-dma 420598e2a08818d04b320358ac251ad15941460d +dmaengine b9bf6d2e84b736eeed2cf0f387771c7793a1c465 +net-next cd6362befe4cc7bf589a5236d2a780af2d47bcc9 +ipsec-next cd6362befe4cc7bf589a5236d2a780af2d47bcc9 +wireless-next cd6362befe4cc7bf589a5236d2a780af2d47bcc9 +bluetooth 899704633969526114ae63fa72a3f0a8d7ea5dab +infiniband 5ae2866f5264fd51ac2ff6c95d02156a7c1f073c +mtd 4a4163caccae97a23d97c29032664ee7b7a498d0 +l2-mtd 4a4163caccae97a23d97c29032664ee7b7a498d0 +crypto 0ea481466d1c7cbd9d8f70ddc17a443a6c6fc09b +drm c39b06951f1dc2e384650288676c5b7dcc0ec92c +drm-intel b6842feb63a23a6a988f4e1ffb93408d8ff6931e +drm-tegra 3d1c1474386e3714c05beef07abe3142e0dd822d +sound de9481cb40339d9bfc1104b53649876fc5f3d432 +sound-asoc 81ac5e18f3ec62a1c050690de817e4f75a5c4cb5 +modules 22c9bcad859d5c969289b3b37084a96c621f8f2c +virtio fc4324b4597c4eb8907207e82f9a6acec84dd335 +input e2c3ecf0ea8e87c5209371af7da107ebc47a5639 +input-mt 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 +block cf81ae32fef12793f3ee2b3f730287f46353a24f +device-mapper 7eb0e608b4e1356966607ffdfdb7b1e243cc1a20 +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 039df7a7cbccb4ea5527c92134b4535fb5bf9671 +security f64410ec665479d7b4b77b7519e814253ed0f686 +selinux eee3094683fbc7fe6bcdaef58c1ef31f8460cdca +lblnet d8ec26d7f8287f5788a494f56e8814210f0e64be +watchdog fa62c102a75e7f55ef74f9a5fd8885cf5228e27c +iommu e172b81222548b856ecbe59b305d2cb733d512c4 +dwmw2-iommu 7713ec066ae8adc49dd8daa02a73e6b60af6ee5f +vfio 4379d2ae152860e023b42257fd60b5e235047f63 +osd f1f6630b53e702648a248fecd881f3df5968a31a +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +trivial c800bcd5f53fd9455fc6c68f1a34306e5aa4f79a +audit 312103d64d0fcadb332899a2c84b357ddb18f4e3 +fsnotify 1ca39ab9d21ac93f94b9e3eb364ea9a5cf2aba06 +devicetree d88cf7d7b4240b8df170ba105e414e476fb51cce +dt-rh 6f976267da0e2c873c4b4aaacaf08266d1d1797d +spi 6ec5bdc4059f5c6004f0b089affadb1b3a92c660 +tip 309ba7457356b8a364f2be304f5058a54f170abe +clockevents 09e15176ded1faa7bd685b3b5b1213cf0240566e +edac 49856dc973cd95d85ac1cab6c70410d8331e5c04 +edac-amd c045ebdf6079b79ac4b4dd16ff37f93ae0bd5190 +ftrace 17a280ea8111c66791c18c0353b7986aafcb24fe +rcu 765a3f4fed708ae429ee095914a7897acb3a65bd +uprobes 0326f5a94ddea33fa331b2519f4172f4fb387baa +kvm 7cbb39d4d4d530dff12f2ff06ed6c85c504ba91a +kvm-arm b73117c49364551ff789db7c424a115ac5b77850 +kvm-ppc 7227fc0666606b0df2c0d2966a7f4859b01bdf74 +oprofile 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae +fw-nohz 74876a98a87a115254b3a66a14b27320b7f0acaa +xen-tip 0a25e113b480694a0af716f33d2edd243b6a8764 +percpu 21ddfd38ee9aac804d22beaceed4c7b903cca234 +workqueues c4b75dadde829d3cbdb55bab88b67c1fb5cde3cc +drivers-x86 7a70906e55bf3b78a10f749cebb6ab0b4026b76e +chrome-platform 2b8454a75b90d7cd1ac325a0baba77244733354f +sysctl 4e474a00d7ff746ed177ddae14fa8b2d4bad7a00 +regmap 5bbfbdcc429f39d4d69c909c7c24a7b13b68db92 +hsi 43139a61fc68f4b0af7327a0e63f340a7c81c69a +leds 14f5716bc23cebb627b40a2808e9f04eb77ab206 +driver-core b33ce442993865180292df2a314ee5251ba38b50 +tty b33ce442993865180292df2a314ee5251ba38b50 +usb b33ce442993865180292df2a314ee5251ba38b50 +usb-gadget 4b76e14d95f7b69e71eabc002dcb0dcb9ebb5340 +staging 4ba85265790ba3681deeaf73f018c0eb829a7341 +char-misc b33ce442993865180292df2a314ee5251ba38b50 +cgroup 49957f8e2a43035a97d05bddefa394492a969c0d +scsi b2bff6ceb61a9a21294f04057d30c9bb4910a88f +target-updates b076808051f2c80d38e03fb2f1294f525c7a446d +target-merge b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed +writeback f9b0e058cbd04ada76b13afffa7e1df830543c24 +hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad +pinctrl 2188f1c4fcd04e9597af7e39ef674c7a31534bd1 +vhost d3d665a654a35c47463d2aa6353bac3ce293f4f5 +remoteproc bd88acba5f9809af48f66267bb16024b9e33cf2b +rpmsg 397944df3290ddc46dcc6a08cd71fb560700431b +gpio c0159a2247d89efb15cf5eef96c95dac05ca9faf +dma-mapping 68efd7d2fb32c2606f1da318b6a851d933813f27 +pwm 2ae69a460413615c82381b240df3800a909100d3 +dma-buf dcb99fd9b08cfe1afe426af4d8d3cbc429190f15 +userns 0d7d90f86f83f29a442b37c78172870f8ee28c58 +ktest 62183dcac539a14ed0a820b8392db353d72a7d7e +signal 20b4fb485227404329e41ad15588afad3df23050 +clk e44df332f30bf3040c60c1ed6674d1431fdb48b9 +random 7b878d4b48c4e04b936918bb83836a107ba453b3 +lzo-update 42b775abafafdf811ef300e869a4e1480ef1cf95 +arm64-hugepages af07484863e0c20796081e57093886c22dc16705 +aio fa8a53c39f3fdde98c9eace6a9b412143f0f6ed6 +llvmlinux fbc151c073f42fd5c5f12b61a1a246ab5721e741 +powernv-cpuidle 0888839c5b62c44a55ac9d28acc273ba663c65ea +rd-docs c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..e9b5201b655c --- /dev/null +++ b/Next/Trees @@ -0,0 +1,217 @@ +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 +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..b23f646f2184 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2653 @@ +$ date +Monday 14 April 10:33:48 EST 2014 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 4ba85265790b Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86 +Merging origin/master (c9eaa447e77e Linux 3.15-rc1) +$ git merge origin/master +Updating 4ba85265790b..c9eaa447e77e +Fast-forward + Documentation/ABI/testing/sysfs-devices-power | 46 +- + .../devicetree/bindings/spi/efm32-spi.txt | 8 +- + Documentation/dontdiff | 3 + + Documentation/filesystems/Locking | 2 +- + Documentation/filesystems/vfs.txt | 2 +- + Documentation/kernel-parameters.txt | 7 + + MAINTAINERS | 2 +- + Makefile | 41 +- + arch/alpha/Kconfig | 1 + + arch/arm/Kconfig | 1 + + arch/arm/include/asm/assembler.h | 42 ++ + arch/arm/include/asm/cputype.h | 19 + + arch/arm/include/asm/syscall.h | 5 +- + arch/arm/kernel/crash_dump.c | 2 +- + arch/arm/kernel/entry-header.S | 11 - + arch/arm/kernel/kprobes-common.c | 4 +- + arch/arm/kernel/kprobes-test-arm.c | 603 +++++++-------- + arch/arm/kernel/kprobes-test-thumb.c | 447 +++++------ + arch/arm/kernel/kprobes-test.c | 13 +- + arch/arm/kernel/kprobes-test.h | 2 +- + arch/arm/kernel/kprobes-thumb.c | 20 +- + arch/arm/kernel/kprobes.c | 9 +- + arch/arm/kernel/pj4-cp0.c | 4 + + arch/arm/kernel/probes.c | 15 +- + arch/arm/kernel/process.c | 3 +- + arch/arm/kernel/traps.c | 1 + + arch/arm/mach-vexpress/dcscb.c | 13 +- + arch/arm/mm/dump.c | 47 +- + arch/arm/vfp/entry.S | 25 +- + arch/arm/vfp/vfphw.S | 19 +- + arch/blackfin/Kconfig | 12 +- + arch/blackfin/include/asm/bfin_crc.h | 125 ---- + arch/blackfin/include/asm/dma.h | 2 - + arch/blackfin/include/asm/portmux.h | 10 +- + arch/blackfin/kernel/irqchip.c | 39 +- + arch/blackfin/mach-bf518/boards/ezbrd.c | 87 ++- + arch/blackfin/mach-bf518/boards/tcm-bf518.c | 64 +- + arch/blackfin/mach-bf527/boards/ad7160eval.c | 71 +- + arch/blackfin/mach-bf527/boards/cm_bf527.c | 91 ++- + arch/blackfin/mach-bf527/boards/ezbrd.c | 76 +- + arch/blackfin/mach-bf527/boards/ezkit.c | 139 ++-- + arch/blackfin/mach-bf527/boards/tll6527m.c | 91 +-- + arch/blackfin/mach-bf533/boards/H8606.c | 46 +- + arch/blackfin/mach-bf533/boards/blackstamp.c | 44 +- + arch/blackfin/mach-bf533/boards/cm_bf533.c | 54 +- + arch/blackfin/mach-bf533/boards/ezkit.c | 56 +- + arch/blackfin/mach-bf533/boards/ip0x.c | 26 +- + arch/blackfin/mach-bf533/boards/stamp.c | 118 ++- + arch/blackfin/mach-bf537/boards/cm_bf537e.c | 82 +- + arch/blackfin/mach-bf537/boards/cm_bf537u.c | 70 +- + arch/blackfin/mach-bf537/boards/dnp5370.c | 32 +- + arch/blackfin/mach-bf537/boards/minotaur.c | 50 +- + arch/blackfin/mach-bf537/boards/pnav10.c | 55 +- + arch/blackfin/mach-bf537/boards/stamp.c | 425 +++++------ + arch/blackfin/mach-bf537/boards/tcm_bf537.c | 70 +- + arch/blackfin/mach-bf538/boards/ezkit.c | 62 +- + arch/blackfin/mach-bf548/boards/cm_bf548.c | 78 +- + arch/blackfin/mach-bf548/boards/ezkit.c | 136 ++-- + arch/blackfin/mach-bf548/include/mach/defBF544.h | 30 - + arch/blackfin/mach-bf548/include/mach/defBF547.h | 30 - + arch/blackfin/mach-bf561/boards/acvilon.c | 28 +- + arch/blackfin/mach-bf561/boards/cm_bf561.c | 56 +- + arch/blackfin/mach-bf561/boards/ezkit.c | 74 +- + arch/blackfin/mach-bf561/boards/tepla.c | 8 +- + arch/blackfin/mach-bf609/boards/ezkit.c | 131 ++-- + arch/blackfin/mach-bf609/clock.c | 18 - + arch/blackfin/mach-bf609/pm.c | 2 +- + arch/ia64/Kconfig | 1 + + arch/microblaze/Kconfig | 54 +- + arch/microblaze/{platform => }/Kconfig.platform | 55 +- + arch/microblaze/Makefile | 1 - + arch/microblaze/boot/dts/system.dts | 367 ++++++++- + arch/microblaze/include/asm/io.h | 302 +------- + arch/microblaze/include/asm/processor.h | 2 +- + arch/microblaze/include/asm/setup.h | 6 +- + arch/microblaze/include/uapi/asm/unistd.h | 6 +- + arch/microblaze/kernel/Makefile | 2 +- + arch/microblaze/kernel/heartbeat.c | 4 +- + arch/microblaze/kernel/intc.c | 51 +- + arch/microblaze/{platform => kernel}/platform.c | 0 + arch/microblaze/kernel/process.c | 1 + + arch/microblaze/kernel/signal.c | 2 +- + arch/microblaze/kernel/syscall_table.S | 8 +- + arch/microblaze/kernel/timer.c | 66 +- + arch/microblaze/mm/consistent.c | 2 +- + arch/microblaze/mm/init.c | 2 +- + arch/microblaze/mm/pgtable.c | 5 +- + arch/microblaze/platform/Makefile | 6 - + arch/microblaze/platform/generic/Kconfig.auto | 61 -- + arch/microblaze/platform/generic/Makefile | 3 - + arch/microblaze/platform/generic/system.dts | 366 --------- + arch/mips/include/asm/syscall.h | 7 +- + arch/mips/kernel/ptrace.c | 2 +- + arch/mips/loongson/lemote-2f/clock.c | 20 +- + arch/mn10300/include/asm/highmem.h | 4 +- + arch/parisc/Kconfig | 1 + + arch/powerpc/Kconfig | 1 + + arch/powerpc/configs/ppc6xx_defconfig | 1 - + arch/powerpc/configs/ps3_defconfig | 1 - + arch/powerpc/configs/pseries_defconfig | 1 + + arch/powerpc/configs/pseries_le_defconfig | 1 + + arch/powerpc/include/asm/reg.h | 4 + + arch/powerpc/kernel/setup_64.c | 3 +- + arch/powerpc/platforms/powernv/Kconfig | 6 + + arch/s390/Kconfig | 1 + + arch/s390/configs/default_defconfig | 1 - + arch/s390/include/asm/syscall.h | 7 +- + arch/sh/Kconfig | 1 + + arch/sh/configs/rsk7203_defconfig | 1 - + arch/sparc/Kconfig | 1 + + arch/um/Kconfig.common | 1 + + arch/x86/Kconfig | 1 + + arch/x86/Makefile | 2 +- + arch/x86/boot/compressed/eboot.c | 19 +- + arch/x86/boot/compressed/head_32.S | 8 +- + arch/x86/boot/compressed/head_64.S | 9 +- + arch/x86/include/asm/syscall.h | 10 +- + arch/x86/kernel/acpi/cstate.c | 4 +- + arch/x86/kernel/apic/apic.c | 3 +- + arch/x86/kernel/cpu/mcheck/mce.c | 18 +- + arch/x86/kernel/cpu/mcheck/mce_intel.c | 19 +- + arch/x86/kernel/early-quirks.c | 211 +++++- + arch/x86/kernel/irq.c | 2 +- + arch/x86/kernel/ldt.c | 11 + + arch/x86/kernel/pci-calgary_64.c | 31 +- + arch/xtensa/configs/iss_defconfig | 1 - + arch/xtensa/configs/s6105_defconfig | 1 - + block/blk-map.c | 2 +- + drivers/acpi/Kconfig | 8 +- + drivers/acpi/dock.c | 6 - + drivers/acpi/osl.c | 3 +- + drivers/acpi/thermal.c | 2 +- + drivers/acpi/utils.c | 3 +- + drivers/acpi/video.c | 8 + + drivers/base/power/domain.c | 13 + + drivers/base/regmap/regmap.c | 3 +- + drivers/block/drbd/drbd_receiver.c | 12 +- + drivers/block/nbd.c | 48 +- + drivers/block/nvme-core.c | 684 ++++++++++++----- + drivers/block/nvme-scsi.c | 43 +- + drivers/char/virtio_console.c | 4 +- + drivers/cpufreq/Kconfig.arm | 6 +- + drivers/cpufreq/Kconfig.powerpc | 8 + + drivers/cpufreq/Makefile | 1 + + drivers/cpufreq/acpi-cpufreq.c | 2 +- + drivers/cpufreq/at32ap-cpufreq.c | 2 +- + drivers/cpufreq/cris-artpec3-cpufreq.c | 6 +- + drivers/cpufreq/cris-etraxfs-cpufreq.c | 6 +- + drivers/cpufreq/elanfreq.c | 18 +- + drivers/cpufreq/exynos4210-cpufreq.c | 12 +- + drivers/cpufreq/exynos4x12-cpufreq.c | 30 +- + drivers/cpufreq/exynos5250-cpufreq.c | 34 +- + drivers/cpufreq/freq_table.c | 11 +- + drivers/cpufreq/ia64-acpi-cpufreq.c | 3 +- + drivers/cpufreq/kirkwood-cpufreq.c | 6 +- + drivers/cpufreq/longhaul.c | 2 +- + drivers/cpufreq/loongson2_cpufreq.c | 2 +- + drivers/cpufreq/maple-cpufreq.c | 6 +- + drivers/cpufreq/p4-clockmod.c | 20 +- + drivers/cpufreq/pasemi-cpufreq.c | 12 +- + drivers/cpufreq/pmac32-cpufreq.c | 6 +- + drivers/cpufreq/pmac64-cpufreq.c | 6 +- + drivers/cpufreq/powernow-k6.c | 18 +- + drivers/cpufreq/powernow-k8.c | 5 +- + drivers/cpufreq/powernv-cpufreq.c | 341 +++++++++ + drivers/cpufreq/ppc-corenet-cpufreq.c | 1 - + drivers/cpufreq/ppc_cbe_cpufreq.c | 18 +- + drivers/cpufreq/s3c2416-cpufreq.c | 20 +- + drivers/cpufreq/s3c24xx-cpufreq.c | 4 +- + drivers/cpufreq/s3c64xx-cpufreq.c | 26 +- + drivers/cpufreq/s5pv210-cpufreq.c | 12 +- + drivers/cpufreq/sc520_freq.c | 6 +- + drivers/cpufreq/spear-cpufreq.c | 7 +- + drivers/cpufreq/speedstep-ich.c | 6 +- + drivers/cpufreq/speedstep-smi.c | 6 +- + drivers/cpufreq/unicore2-cpufreq.c | 2 +- + drivers/cpuidle/sysfs.c | 3 + + drivers/firmware/efi/efi-stub-helper.c | 6 +- + drivers/idle/intel_idle.c | 204 ++++- + drivers/infiniband/ulp/isert/ib_isert.c | 828 ++++++++++++++++----- + drivers/infiniband/ulp/isert/ib_isert.h | 38 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 27 +- + drivers/md/bitmap.c | 1 - + drivers/md/md.c | 65 +- + drivers/md/md.h | 1 - + drivers/md/raid1.c | 17 +- + drivers/md/raid5.c | 28 +- + drivers/media/dvb-frontends/drx39xyj/Kconfig | 2 +- + drivers/media/dvb-frontends/lgdt3305.c | 1 + + drivers/media/dvb-frontends/m88rs2000.c | 8 +- + drivers/media/platform/ti-vpe/vpe.c | 45 +- + drivers/media/rc/img-ir/img-ir-hw.c | 15 +- + drivers/media/rc/img-ir/img-ir-nec.c | 27 +- + drivers/media/rc/ir-nec-decoder.c | 5 +- + drivers/media/rc/keymaps/rc-tivo.c | 86 +-- + drivers/media/rc/rc-main.c | 98 ++- + drivers/media/tuners/r820t.c | 3 +- + drivers/media/tuners/tuner-xc2028.c | 1 + + drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 2 - + drivers/media/usb/gspca/jpeg.h | 4 +- + drivers/media/usb/stk1160/stk1160-ac97.c | 2 +- + drivers/net/bonding/bond_main.c | 1 + + drivers/net/ethernet/8390/apne.c | 4 +- + drivers/net/ethernet/allwinner/sun4i-emac.c | 30 +- + drivers/net/ethernet/intel/e1000/e1000_hw.c | 124 --- + drivers/net/ethernet/intel/e1000/e1000_main.c | 11 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 10 +- + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 10 +- + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 20 +- + drivers/net/ethernet/intel/igb/igb.h | 16 +- + drivers/net/ethernet/intel/igb/igb_main.c | 13 +- + drivers/net/ethernet/intel/igb/igb_ptp.c | 14 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 16 +- + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 10 +- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 1 + + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 28 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 1 + + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 20 +- + drivers/net/ethernet/ti/cpsw.c | 17 +- + drivers/net/hyperv/hyperv_net.h | 1 + + drivers/net/hyperv/netvsc.c | 2 +- + drivers/net/hyperv/netvsc_drv.c | 30 +- + drivers/net/hyperv/rndis_filter.c | 12 +- + drivers/net/ntb_netdev.c | 27 +- + drivers/net/phy/phy.c | 6 +- + drivers/net/usb/r8152.c | 48 ++ + drivers/net/wireless/ath/ath9k/ar5008_phy.c | 4 +- + drivers/net/wireless/ath/ath9k/beacon.c | 7 +- + drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 5 +- + drivers/net/wireless/ath/ath9k/init.c | 2 + + drivers/net/wireless/b43/phy_n.c | 14 +- + drivers/net/wireless/rsi/rsi_91x_core.c | 6 +- + drivers/net/wireless/rsi/rsi_91x_debugfs.c | 35 +- + drivers/net/wireless/rsi/rsi_91x_mgmt.c | 8 +- + drivers/net/wireless/rsi/rsi_91x_sdio.c | 5 +- + drivers/net/wireless/rsi/rsi_91x_sdio_ops.c | 6 +- + drivers/net/wireless/rsi/rsi_91x_usb.c | 26 +- + .../net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c | 10 - + drivers/net/xen-netfront.c | 2 +- + drivers/ntb/ntb_hw.c | 192 ++--- + drivers/ntb/ntb_hw.h | 8 +- + drivers/ntb/ntb_transport.c | 20 +- + drivers/regulator/bcm590xx-regulator.c | 1 + + drivers/regulator/s2mpa01.c | 12 +- + drivers/regulator/s2mps11.c | 12 +- + drivers/regulator/s5m8767.c | 1 + + drivers/remoteproc/da8xx_remoteproc.c | 16 +- + drivers/remoteproc/ste_modem_rproc.c | 4 +- + drivers/scsi/Kconfig | 3 + + drivers/scsi/iscsi_tcp.c | 2 +- + drivers/scsi/iscsi_tcp.h | 2 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 18 +- + drivers/scsi/scsi.c | 9 + + drivers/scsi/scsi_pm.c | 128 +++- + drivers/scsi/scsi_priv.h | 2 + + drivers/scsi/scsi_scan.c | 2 +- + drivers/scsi/sd.c | 1 + + drivers/scsi/sym53c8xx_2/sym_hipd.c | 4 + + drivers/spi/Kconfig | 2 +- + drivers/spi/spi-fsl-espi.c | 3 +- + drivers/spi/spi-fsl-spi.c | 3 +- + drivers/spi/spi-mpc512x-psc.c | 3 +- + drivers/spi/spi-mpc52xx-psc.c | 3 +- + drivers/spi/spi-mpc52xx.c | 6 +- + drivers/spi/spi-omap2-mcspi.c | 26 +- + drivers/spi/spi-sh.c | 6 +- + drivers/spi/spi-txx9.c | 3 +- + .../lustre/lnet/klnds/socklnd/socklnd_lib-linux.c | 64 +- + .../lustre/lustre/libcfs/linux/linux-tcpip.c | 24 +- + drivers/staging/lustre/lustre/llite/symlink.c | 23 +- + drivers/staging/media/msi3101/msi001.c | 2 +- + drivers/staging/media/msi3101/sdr-msi3101.c | 15 +- + drivers/staging/usbip/stub_dev.c | 8 +- + drivers/staging/usbip/usbip_common.c | 25 - + drivers/staging/usbip/usbip_common.h | 1 - + drivers/staging/usbip/vhci_hcd.c | 4 +- + drivers/staging/usbip/vhci_sysfs.c | 6 +- + drivers/target/iscsi/iscsi_target.c | 33 +- + drivers/target/iscsi/iscsi_target_configfs.c | 14 + + drivers/target/iscsi/iscsi_target_core.h | 7 +- + drivers/target/iscsi/iscsi_target_login.c | 4 +- + drivers/target/iscsi/iscsi_target_nego.c | 2 +- + drivers/target/iscsi/iscsi_target_tpg.c | 21 + + drivers/target/iscsi/iscsi_target_tpg.h | 1 + + drivers/target/iscsi/iscsi_target_util.c | 4 +- + drivers/target/iscsi/iscsi_target_util.h | 1 + + drivers/target/loopback/tcm_loop.c | 12 +- + drivers/target/sbp/sbp_target.c | 8 +- + drivers/target/target_core_alua.c | 95 ++- + drivers/target/target_core_configfs.c | 4 + + drivers/target/target_core_file.c | 40 +- + drivers/target/target_core_iblock.c | 5 +- + drivers/target/target_core_rd.c | 14 +- + drivers/target/target_core_sbc.c | 178 ++++- + drivers/target/target_core_spc.c | 49 +- + drivers/target/target_core_tmr.c | 23 +- + drivers/target/target_core_transport.c | 92 ++- + drivers/target/tcm_fc/tcm_fc.h | 13 +- + drivers/target/tcm_fc/tfc_cmd.c | 5 + + drivers/target/tcm_fc/tfc_conf.c | 76 +- + drivers/target/tcm_fc/tfc_sess.c | 10 +- + drivers/tty/tty_audit.c | 3 +- + drivers/usb/gadget/tcm_usb_gadget.c | 8 +- + drivers/vhost/net.c | 14 +- + drivers/vhost/scsi.c | 9 +- + fs/aio.c | 120 +-- + fs/bio.c | 10 +- + fs/block_dev.c | 2 +- + fs/btrfs/async-thread.c | 2 + + fs/btrfs/backref.c | 33 +- + fs/btrfs/ctree.c | 94 +-- + fs/btrfs/ctree.h | 13 +- + fs/btrfs/disk-io.c | 23 +- + fs/btrfs/extent-tree.c | 35 +- + fs/btrfs/extent_io.c | 8 +- + fs/btrfs/extent_io.h | 1 + + fs/btrfs/file.c | 21 +- + fs/btrfs/inode-map.c | 14 +- + fs/btrfs/inode.c | 36 +- + fs/btrfs/ioctl.c | 35 +- + fs/btrfs/relocation.c | 21 - + fs/btrfs/scrub.c | 108 ++- + fs/btrfs/send.c | 117 ++- + fs/btrfs/super.c | 22 + + fs/btrfs/transaction.c | 48 +- + fs/btrfs/transaction.h | 3 + + fs/btrfs/volumes.c | 35 +- + fs/buffer.c | 6 +- + fs/cachefiles/bind.c | 1 - + fs/cachefiles/namei.c | 3 +- + fs/ceph/file.c | 12 +- + fs/ceph/ioctl.c | 3 +- + fs/cifs/cifsfs.c | 1 - + fs/cifs/file.c | 128 ++-- + fs/dlm/lowcomms.c | 2 +- + fs/exec.c | 2 +- + fs/exofs/ore_raid.c | 4 +- + fs/exofs/super.c | 2 +- + fs/ext4/file.c | 2 +- + fs/file.c | 11 +- + fs/file_table.c | 43 +- + fs/fuse/dev.c | 14 +- + fs/fuse/file.c | 5 +- + fs/mount.h | 5 +- + fs/namei.c | 67 +- + fs/namespace.c | 56 +- + fs/ncpfs/inode.c | 50 +- + fs/ncpfs/ncp_fs_sb.h | 6 +- + fs/ncpfs/sock.c | 4 +- + fs/ntfs/inode.c | 2 - + fs/ocfs2/cluster/tcp.c | 64 +- + fs/ocfs2/cluster/tcp_internal.h | 2 +- + fs/ocfs2/file.c | 9 +- + fs/open.c | 68 +- + fs/pipe.c | 133 +--- + fs/pnode.c | 198 +++-- + fs/pnode.h | 3 + + fs/proc/base.c | 36 +- + fs/proc/namespaces.c | 14 +- + fs/proc/self.c | 2 +- + fs/proc_namespace.c | 1 + + fs/splice.c | 126 +--- + fs/udf/file.c | 2 +- + fs/xfs/xfs_file.c | 13 +- + fs/xfs/xfs_ioctl.c | 28 +- + include/asm-generic/cmpxchg-local.h | 3 +- + include/asm-generic/syscall.h | 4 +- + include/drm/i915_drm.h | 20 + + include/linux/audit.h | 14 + + include/linux/bio.h | 5 +- + include/linux/blkdev.h | 4 +- + include/linux/buffer_head.h | 4 +- + include/linux/compiler-clang.h | 12 + + include/linux/compiler.h | 7 + + include/linux/cpufreq.h | 9 +- + include/linux/fdtable.h | 2 - + include/linux/fs.h | 97 +-- + include/linux/ftrace_event.h | 22 +- + include/linux/mm.h | 1 + + include/linux/mm_types.h | 3 +- + include/linux/mod_devicetable.h | 5 + + include/linux/mount.h | 3 + + include/linux/nbd.h | 3 +- + include/linux/ntb.h | 19 +- + include/linux/nvme.h | 21 +- + include/linux/pipe_fs_i.h | 19 - + include/linux/sched.h | 20 +- + include/linux/slab.h | 11 + + include/linux/sunrpc/svcsock.h | 2 +- + include/linux/syscalls.h | 8 +- + include/linux/tracepoint.h | 49 +- + include/linux/uio.h | 52 ++ + include/media/rc-core.h | 8 +- + include/net/9p/client.h | 6 +- + include/net/9p/transport.h | 3 + + include/net/sctp/sctp.h | 2 +- + include/net/sock.h | 2 +- + include/target/iscsi/iscsi_transport.h | 2 + + include/target/target_core_backend.h | 2 + + include/target/target_core_base.h | 33 +- + include/target/target_core_fabric.h | 6 +- + include/trace/events/syscalls.h | 3 - + include/trace/ftrace.h | 15 +- + include/uapi/linux/audit.h | 3 +- + include/uapi/linux/capability.h | 4 + + include/uapi/linux/nvme.h | 1 + + include/uapi/linux/v4l2-common.h | 2 + + init/Kconfig | 5 +- + kernel/audit.c | 27 +- + kernel/audit.h | 6 + + kernel/auditfilter.c | 33 +- + kernel/auditsc.c | 133 +++- + kernel/futex.c | 32 +- + kernel/relay.c | 4 +- + kernel/seccomp.c | 4 +- + kernel/trace/trace.c | 10 +- + kernel/trace/trace_events.c | 55 +- + kernel/trace/trace_events_trigger.c | 2 +- + kernel/trace/trace_export.c | 6 +- + kernel/trace/trace_kprobe.c | 21 +- + kernel/trace/trace_output.c | 2 +- + kernel/trace/trace_uprobe.c | 20 +- + kernel/tracepoint.c | 516 ++++++------- + lib/Kconfig | 9 + + lib/Kconfig.debug | 10 - + lib/Makefile | 1 + + lib/audit.c | 15 +- + lib/compat_audit.c | 50 ++ + mm/Makefile | 3 +- + mm/filemap.c | 344 ++------- + mm/iov_iter.c | 224 ++++++ + mm/process_vm_access.c | 250 ++----- + mm/shmem.c | 79 +- + mm/slab.c | 183 +++-- + mm/slob.c | 10 +- + mm/slub.c | 5 +- + mm/util.c | 48 ++ + net/9p/client.c | 25 +- + net/9p/trans_fd.c | 110 ++- + net/9p/trans_rdma.c | 26 +- + net/9p/trans_virtio.c | 3 +- + net/atm/clip.c | 2 +- + net/atm/lec.c | 10 +- + net/atm/mpc.c | 6 +- + net/atm/raw.c | 2 +- + net/atm/signaling.c | 2 +- + net/ax25/ax25_in.c | 2 +- + net/bluetooth/l2cap_sock.c | 6 +- + net/bluetooth/rfcomm/core.c | 4 +- + net/bluetooth/rfcomm/sock.c | 4 +- + net/bluetooth/sco.c | 2 +- + net/bridge/br_input.c | 2 +- + net/bridge/br_vlan.c | 7 +- + net/caif/caif_socket.c | 4 +- + net/ceph/messenger.c | 2 +- + net/core/pktgen.c | 8 +- + net/core/skbuff.c | 16 +- + net/core/sock.c | 4 +- + net/dccp/input.c | 2 +- + net/dccp/minisocks.c | 2 +- + net/decnet/dn_nsp_in.c | 4 +- + net/ipv4/ip_gre.c | 2 +- + net/ipv4/ip_vti.c | 2 +- + net/ipv4/tcp_input.c | 10 +- + net/ipv4/tcp_ipv4.c | 2 +- + net/ipv4/tcp_minisocks.c | 2 +- + net/ipv6/tcp_ipv6.c | 2 +- + net/iucv/af_iucv.c | 4 +- + net/key/af_key.c | 2 +- + net/l2tp/l2tp_ppp.c | 4 +- + net/netlink/af_netlink.c | 4 +- + net/netrom/af_netrom.c | 2 +- + net/nfc/llcp_core.c | 2 +- + net/packet/af_packet.c | 6 +- + net/phonet/pep-gprs.c | 4 +- + net/phonet/pep.c | 8 +- + net/rds/tcp.h | 4 +- + net/rds/tcp_listen.c | 6 +- + net/rds/tcp_recv.c | 8 +- + net/rose/af_rose.c | 2 +- + net/rxrpc/ar-input.c | 6 +- + net/rxrpc/ar-internal.h | 2 +- + net/sctp/socket.c | 8 +- + net/sctp/ulpqueue.c | 4 +- + net/sunrpc/svcsock.c | 12 +- + net/sunrpc/xprtsock.c | 8 +- + net/tipc/server.c | 4 +- + net/tipc/socket.c | 6 +- + net/unix/af_unix.c | 6 +- + net/vmw_vsock/vmci_transport_notify.c | 2 +- + net/vmw_vsock/vmci_transport_notify_qstate.c | 4 +- + net/x25/af_x25.c | 2 +- + net/x25/x25_in.c | 2 +- + scripts/Makefile.build | 12 +- + scripts/bootgraph.pl | 42 +- + scripts/coccinelle/api/ptr_ret.cocci | 14 +- + scripts/coccinelle/misc/memcpy-assign.cocci | 103 --- + scripts/mkcompile_h | 2 +- + scripts/objdiff | 141 ++++ + scripts/tags.sh | 9 +- + security/integrity/evm/evm_crypto.c | 2 +- + security/integrity/evm/evm_main.c | 2 +- + security/integrity/integrity_audit.c | 2 +- + security/lsm_audit.c | 11 +- + security/tomoyo/realpath.c | 4 +- + tools/power/x86/turbostat/turbostat.8 | 127 ++-- + tools/power/x86/turbostat/turbostat.c | 240 +++--- + virt/kvm/arm/arch_timer.c | 2 +- + virt/kvm/arm/vgic.c | 2 +- + 509 files changed, 8946 insertions(+), 7544 deletions(-) + delete mode 100644 arch/blackfin/include/asm/bfin_crc.h + rename arch/microblaze/{platform => }/Kconfig.platform (51%) + mode change 120000 => 100644 arch/microblaze/boot/dts/system.dts + rename arch/microblaze/{platform => kernel}/platform.c (100%) + delete mode 100644 arch/microblaze/platform/Makefile + delete mode 100644 arch/microblaze/platform/generic/Kconfig.auto + delete mode 100644 arch/microblaze/platform/generic/Makefile + delete mode 100644 arch/microblaze/platform/generic/system.dts + create mode 100644 drivers/cpufreq/powernv-cpufreq.c + create mode 100644 include/linux/compiler-clang.h + create mode 100644 lib/compat_audit.c + create mode 100644 mm/iov_iter.c + delete mode 100644 scripts/coccinelle/misc/memcpy-assign.cocci + create mode 100755 scripts/objdiff +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 (61fb4bfc010b ARC: [nsimosci] Unbork console) +$ git merge arc-current/for-curr +Already up-to-date. +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 (eda43ce03919 Merge branch 'tunnels') +$ git merge net/master +Already up-to-date. +Merging ipsec/master (5596732fa8c1 xfrm: Fix crash with ipv6 IPsec tunnel and NAT.) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/ipv4/xfrm4_output.c | 32 ++++++++++++++++++-------------- + net/ipv6/xfrm6_output.c | 22 +++++++++++++--------- + 2 files changed, 31 insertions(+), 23 deletions(-) +Merging sound-current/for-linus (a5065eb6da55 ALSA: usb-audio: Suppress repetitive debug messages from retire_playback_urb()) +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus (707d4eefbdb3 Revert "[PATCH] Insert GART region into resource map") +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless/master (5869e795e07d ath9k: fix a scheduling while atomic bug in CSA handling) +$ git merge wireless/master +Already up-to-date. +Merging driver-core.current/driver-core-linus (b33ce4429938 Merge branch 'for-3.15/drivers' of git://git.kernel.dk/linux-block) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (b33ce4429938 Merge branch 'for-3.15/drivers' of git://git.kernel.dk/linux-block) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (b33ce4429938 Merge branch 'for-3.15/drivers' of git://git.kernel.dk/linux-block) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging staging.current/staging-linus (4ba85265790b Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (b33ce4429938 Merge branch 'for-3.15/drivers' of git://git.kernel.dk/linux-block) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +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 +Merge made by the 'recursive' strategy. + drivers/char/hw_random/bcm2835-rng.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) +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 (9db32cb625a5 drm/i915: Undo gtt scratch pte unmapping again) +$ git merge drm-intel-fixes/for-linux-next-fixes +Resolved 'drivers/gpu/drm/i915/i915_gem_gtt.c' using previous resolution. +Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_gtt.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master acb0d8d8aa8c] Merge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes' +$ git diff -M --stat --summary HEAD^.. +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 (b098d6726bbf Linux 3.14-rc8) +$ 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 (6d0abeca3242 Linux 3.14-rc3) +$ 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 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 (cf73d79a7670 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/imx6qdl.dtsi +Auto-merging arch/arm/boot/dts/imx53.dtsi +Auto-merging arch/arm/boot/dts/imx53-qsb-common.dtsi +Auto-merging arch/arm/boot/dts/imx53-m53evk.dts +Auto-merging arch/arm/boot/dts/imx51.dtsi +Auto-merging arch/arm/boot/dts/imx51-babbage.dts +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/Kconfig.debug +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +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 | 2 + + .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 13 + + arch/arm/boot/dts/imx25-pdk.dts | 217 ++++++++++- + arch/arm/boot/dts/imx25.dtsi | 39 +- + arch/arm/boot/dts/imx27-pdk.dts | 2 +- + arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 75 ++++ + arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi | 16 + + arch/arm/boot/dts/imx27.dtsi | 1 + + arch/arm/boot/dts/imx28-duckbill.dts | 12 +- + arch/arm/boot/dts/imx28.dtsi | 1 + + .../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 | 1 + + arch/arm/boot/dts/imx51-babbage.dts | 62 +++ + .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 58 +++ + arch/arm/boot/dts/imx51.dtsi | 1 + + arch/arm/boot/dts/imx53-m53evk.dts | 23 +- + arch/arm/boot/dts/imx53-qsb-common.dtsi | 3 +- + arch/arm/boot/dts/imx53.dtsi | 3 +- + arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 48 ++- + arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi | 22 +- + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 19 + + arch/arm/boot/dts/imx6qdl.dtsi | 11 +- + arch/arm/boot/dts/imx6sl.dtsi | 3 +- + arch/arm/boot/dts/vf610-colibri.dts | 123 ++++++ + arch/arm/boot/dts/vf610-twr.dts | 36 ++ + arch/arm/boot/dts/vf610.dtsi | 24 ++ + arch/arm/configs/imx_v4_v5_defconfig | 6 + + arch/arm/configs/imx_v6_v7_defconfig | 4 + + 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 + + 45 files changed, 1026 insertions(+), 642 deletions(-) + create mode 100644 arch/arm/boot/dts/imx35-pdk.dts + 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 623077be156e] 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 (9ee9b9ddb17f Merge branch 'heads/dt-for-v3.15' into next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/r8a7790-lager.dts | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging samsung/for-next (82cd4473bde8 Merge branch 'v3.15-next/cleanup-exynos' into for-next) +$ git merge samsung/for-next +Resolved 'arch/arm/mach-exynos/exynos.c' using previous resolution. +Removing arch/arm/mach-s3c24xx/common-s3c2443.c +Removing arch/arm/mach-s3c24xx/clock-s3c2443.c +Removing arch/arm/mach-s3c24xx/clock-s3c2416.c +Removing arch/arm/mach-s3c24xx/clock-s3c2412.c +Auto-merging arch/arm/mach-s3c24xx/Kconfig +Auto-merging arch/arm/mach-exynos/exynos.c +CONFLICT (content): Merge conflict in arch/arm/mach-exynos/exynos.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 97eaf0ec59bf] Merge remote-tracking branch 'samsung/for-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/clock/samsung,s3c2412-clock.txt | 50 ++ + .../bindings/clock/samsung,s3c2443-clock.txt | 56 ++ + arch/arm/boot/dts/s3c2416-smdk2416.dts | 13 + + arch/arm/boot/dts/s3c2416.dtsi | 42 ++ + arch/arm/mach-s3c24xx/Kconfig | 24 +- + arch/arm/mach-s3c24xx/Makefile | 7 +- + arch/arm/mach-s3c24xx/clock-s3c2412.c | 760 --------------------- + arch/arm/mach-s3c24xx/clock-s3c2416.c | 171 ----- + arch/arm/mach-s3c24xx/clock-s3c2443.c | 212 ------ + arch/arm/mach-s3c24xx/common-s3c2443.c | 675 ------------------ + arch/arm/mach-s3c24xx/common.c | 27 +- + arch/arm/mach-s3c24xx/common.h | 10 + + arch/arm/mach-s3c24xx/mach-jive.c | 9 +- + arch/arm/mach-s3c24xx/mach-s3c2416-dt.c | 38 +- + arch/arm/mach-s3c24xx/mach-smdk2413.c | 9 +- + arch/arm/mach-s3c24xx/mach-smdk2416.c | 9 +- + arch/arm/mach-s3c24xx/mach-smdk2443.c | 9 +- + arch/arm/mach-s3c24xx/mach-vstms.c | 9 +- + arch/arm/mach-s3c24xx/pm.c | 13 +- + arch/arm/mach-s3c24xx/s3c2412.c | 43 -- + drivers/clk/samsung/Makefile | 2 + + drivers/clk/samsung/clk-pll.c | 266 +++++++- + drivers/clk/samsung/clk-pll.h | 6 + + drivers/clk/samsung/clk-s3c2412.c | 269 ++++++++ + drivers/clk/samsung/clk-s3c2443.c | 462 +++++++++++++ + include/dt-bindings/clock/s3c2412.h | 73 ++ + include/dt-bindings/clock/s3c2443.h | 92 +++ + 27 files changed, 1428 insertions(+), 1928 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/samsung,s3c2412-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/samsung,s3c2443-clock.txt + delete mode 100644 arch/arm/mach-s3c24xx/clock-s3c2412.c + delete mode 100644 arch/arm/mach-s3c24xx/clock-s3c2416.c + delete mode 100644 arch/arm/mach-s3c24xx/clock-s3c2443.c + delete mode 100644 arch/arm/mach-s3c24xx/common-s3c2443.c + create mode 100644 drivers/clk/samsung/clk-s3c2412.c + create mode 100644 drivers/clk/samsung/clk-s3c2443.c + create mode 100644 include/dt-bindings/clock/s3c2412.h + create mode 100644 include/dt-bindings/clock/s3c2443.h +Merging tegra/for-next (dcb99fd9b08c Linux 3.14-rc7) +$ git merge tegra/for-next +Already up-to-date. +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 (4dc5aa217237 m68knommu: fix arg types for outs* functions) +$ git merge m68knommu/for-next +Already up-to-date. +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 (06785279ce32 Merge branch '3.15-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Auto-merging drivers/cpufreq/loongson2_cpufreq.c +Auto-merging arch/mips/loongson/lemote-2f/clock.c +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/dec/prom.h | 48 +++++++++---------- + 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 +- + drivers/cpufreq/loongson2_cpufreq.c | 4 +- + 15 files changed, 97 insertions(+), 161 deletions(-) + delete mode 100644 arch/mips/dec/prom/call_o32.S +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 (7b536de7294c 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/sigp.h | 19 ++ + arch/s390/include/asm/smp.h | 13 +- + arch/s390/include/asm/spinlock.h | 134 +++++---- + arch/s390/include/asm/spinlock_types.h | 23 +- + arch/s390/include/uapi/asm/unistd.h | 3 +- + arch/s390/kernel/compat_wrapper.c | 3 +- + arch/s390/kernel/crash_dump.c | 83 +++--- + arch/s390/kernel/dumpstack.c | 8 +- + arch/s390/kernel/early.c | 6 + + arch/s390/kernel/head31.S | 1 - + arch/s390/kernel/ptrace.c | 2 +- + arch/s390/kernel/setup.c | 487 +++++++++++++-------------------- + arch/s390/kernel/smp.c | 18 +- + arch/s390/kernel/syscalls.S | 1 + + arch/s390/kernel/topology.c | 4 +- + arch/s390/lib/spinlock.c | 147 +++++++--- + arch/s390/lib/uaccess.c | 5 +- + arch/s390/mm/fault.c | 140 +++++++++- + arch/s390/mm/mem_detect.c | 130 ++------- + arch/s390/mm/page-states.c | 10 - + arch/s390/mm/vmem.c | 30 +- + drivers/s390/char/sclp.c | 2 +- + drivers/s390/char/sclp_cmd.c | 2 +- + drivers/s390/char/sclp_vt220.c | 14 +- + drivers/s390/char/zcore.c | 44 +-- + include/linux/memblock.h | 79 +++++- + mm/Kconfig | 3 + + mm/memblock.c | 205 +++++++++----- + 31 files changed, 937 insertions(+), 713 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 1ef0b877337f] 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 (021b5a00821a ext4: add fallocate mode blocking for debugging purposes) +$ 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/ext4.h | 17 ---------- + fs/ext4/extents.c | 83 ++++++++++++++++++++++++++++++++++++------------ + fs/ext4/extents_status.c | 2 +- + fs/ext4/file.c | 2 +- + fs/ext4/inode.c | 52 ++++++++++++++++-------------- + fs/ext4/mballoc.c | 18 ++++++++--- + fs/ext4/page-io.c | 5 +-- + fs/ext4/super.c | 51 +++++++++++++++-------------- + fs/ext4/xattr.c | 23 +++++++++++--- + fs/open.c | 22 ++++++------- + fs/xfs/xfs_file.c | 10 +++++- + 12 files changed, 176 insertions(+), 112 deletions(-) +Merging f2fs/dev (9e897e13bd46 Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd) +$ git merge f2fs/dev +Already up-to-date. +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 (1b2ad41214c9 GFS2: Fix address space from page function) +$ git merge gfs2/master +Already up-to-date. +Merging jfs/jfs-next (844fa1b5f849 jfs: set i_ctime when setting ACL) +$ git merge jfs/jfs-next +Already up-to-date. +Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found) +$ git merge logfs/master +Auto-merging fs/logfs/super.c +Merge made by the 'recursive' strategy. + fs/logfs/dev_mtd.c | 2 +- + fs/logfs/super.c | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging nfs/linux-next (c9eaa447e77e Linux 3.15-rc1) +$ git merge nfs/linux-next +Already up-to-date. +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 (8a5daf1e2c19 9pnet_rdma: check token type before int conversion) +$ 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 (a6cf33bc566c Merge branch 'xfs-bug-fixes-for-3.15-3' into for-next) +$ git merge xfs/for-next +Already up-to-date. +Merging file-private-locks/linux-next (18a1a7a1d862 Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile) +$ git merge file-private-locks/linux-next +Already up-to-date. +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 (30723cbf6f7a Merge branch 'pci/resource' into next) +$ git merge pci/next +Already up-to-date. +Merging hid/for-next (d1443c96d663 Merge branch 'for-3.15/sony' into for-next) +$ git merge hid/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +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 (39de65aa2c3e Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge hwmon-staging/hwmon-next +Already up-to-date. +Merging v4l-dvb/master (3f52fc47bbb3 Merge branch 'v4l_for_linus' into to_next) +$ git merge v4l-dvb/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging kbuild/for-next (2eea5bbcd396 Merge branch 'kbuild/misc' into kbuild/for-next) +$ git merge kbuild/for-next +Auto-merging scripts/link-vmlinux.sh +Auto-merging lib/Kconfig.debug +Auto-merging init/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/lto-build | 173 +++++++++++++++++++++++++++++++++++++++++++++++ + Makefile | 20 +++++- + arch/x86/Kconfig | 2 +- + init/Kconfig | 73 ++++++++++++++++++++ + kernel/gcov/Kconfig | 2 +- + lib/Kconfig.debug | 2 +- + scripts/Makefile.lto | 84 +++++++++++++++++++++++ + scripts/Makefile.modpost | 7 +- + scripts/link-vmlinux.sh | 2 +- + 9 files changed, 357 insertions(+), 8 deletions(-) + create mode 100644 Documentation/lto-build + create mode 100644 scripts/Makefile.lto +Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings) +$ git merge kconfig/for-next +Already up-to-date. +Merging libata/for-next (f5f85ee065f2 ata: fix i.MX AHCI driver dependencies) +$ git merge libata/for-next +Auto-merging drivers/ata/libata-core.c +Merge made by the 'recursive' strategy. + drivers/ata/Kconfig | 5 ++--- + drivers/ata/libata-core.c | 6 ++++-- + drivers/ata/pata_at91.c | 11 ++++++----- + 3 files changed, 12 insertions(+), 10 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 (420598e2a088 Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Already up-to-date! +Merge made by the 'recursive' strategy. +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 (cd6362befe4c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next) +$ 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 (4a4163caccae Fix index regression in nand_read_subpage) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (4a4163caccae Fix index regression in nand_read_subpage) +$ git merge l2-mtd/master +Already up-to-date. +Merging crypto/master (0ea481466d1c crypto: ghash-clmulni-intel - Use u128 instead of be128 for internal key) +$ git merge crypto/master +Merge made by the 'recursive' strategy. + arch/x86/crypto/ghash-clmulni-intel_asm.S | 4 ++-- + arch/x86/crypto/ghash-clmulni-intel_glue.c | 12 ++++++------ + 2 files changed, 8 insertions(+), 8 deletions(-) +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 (b6842feb63a2 drm/i915: Allow user modes to exceed DVI 165MHz limit) +$ git merge drm-intel/for-linux-next +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 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 (de9481cb4033 ALSA: hda/realtek - Improve HP depop when system change power state on Chromebook) +$ git merge sound/for-next +Already up-to-date. +Merging sound-asoc/for-next (81ac5e18f3ec Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + sound/soc/sh/rcar/src.c | 4 ++-- + sound/soc/sh/rcar/ssi.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) +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 (cf81ae32fef1 Merge branch 'for-linus' into for-next) +$ git merge block/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging device-mapper/for-next (7eb0e608b4e1 Merge branch 'for-3.15-dm-crypt' 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 ++++++++- + fs/bio.c | 3 +- + 3 files changed, 288 insertions(+), 217 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 +Resolved 'drivers/video/Kconfig' using previous resolution. +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 +[master 314210f80bb2] 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 | 2478 +------------------ + 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(+), 2664 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 2f0cab6955eb] Merge remote-tracking branch 'omap_dss2/for-next' +Merging regulator/for-next (039df7a7cbcc Merge remote-tracking branches 'regulator/fix/bcm590xx', 'regulator/fix/s2m' and 'regulator/fix/s5m8767' into regulator-linus) +$ git merge regulator/for-next +Already up-to-date. +Merging security/next (f64410ec6654 selinux: correctly label /proc inodes in use before the policy is loaded) +$ git merge security/next +Already up-to-date. +Merging selinux/next (eee3094683fb selinux: correctly label /proc inodes in use before the policy is loaded) +$ 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 (fa62c102a75e watchdog: Fix Elan SC520 dependencies) +$ git merge watchdog/master +Resolved 'drivers/watchdog/Kconfig' using previous resolution. +Resolved 'drivers/watchdog/orion_wdt.c' using previous resolution. +Auto-merging drivers/watchdog/orion_wdt.c +CONFLICT (content): Merge conflict in drivers/watchdog/orion_wdt.c +Auto-merging drivers/watchdog/Kconfig +CONFLICT (content): Merge conflict in drivers/watchdog/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7c6a179d25e3] Merge remote-tracking branch 'watchdog/master' +$ git diff -M --stat --summary HEAD^.. +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 (7713ec066ae8 iommu/vt-d: Fix error handling in ANDD processing) +$ git merge dwmw2-iommu/master +Already up-to-date. +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 (312103d64d0f AUDIT: make audit_is_compat depend on CONFIG_AUDIT_COMPAT_GENERIC) +$ git merge audit/master +Already up-to-date. +Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls) +$ git merge fsnotify/for-next +Already up-to-date. +Merging devicetree/devicetree/next (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 (6f976267da0e of: add missing major vendors) +$ git merge dt-rh/for-next +Already up-to-date. +Merging spi/for-next (6ec5bdc4059f Merge remote-tracking branches 'spi/fix/complete', 'spi/fix/efm32', 'spi/fix/omap2-mcspi' and 'spi/fix/qup' into spi-linus) +$ git merge spi/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging tip/auto-latest (309ba7457356 Merge branch 'x86/x32') +$ git merge tip/auto-latest +Resolved 'arch/x86/kernel/early-quirks.c' using previous resolution. +Auto-merging arch/x86/kernel/early-quirks.c +CONFLICT (content): Merge conflict in arch/x86/kernel/early-quirks.c +Auto-merging arch/x86/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3a5fbe81fc2e] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + arch/x86/Kconfig | 5 +++-- + arch/x86/include/asm/iosf_mbi.h | 33 +++++++++++++++++++++++++++++++++ + arch/x86/kernel/iosf_mbi.c | 6 ++++++ + 3 files changed, 42 insertions(+), 2 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 (7cbb39d4d4d5 Merge tag 'kvm-3.15-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm) +$ 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 (21ddfd38ee9a percpu: renew the max_contig if we merge the head and previous block) +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next (c4b75dadde82 Merge branch 'for-3.15' into for-next) +$ git merge workqueues/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +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 (5bbfbdcc429f Merge remote-tracking branch 'regmap/fix/nodev' into regmap-linus) +$ git merge regmap/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +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 (14f5716bc23c leds: make sure we unregister a trigger only once) +$ git merge leds/for-next +Already up-to-date. +Merging driver-core/driver-core-next (b33ce4429938 Merge branch 'for-3.15/drivers' of git://git.kernel.dk/linux-block) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (b33ce4429938 Merge branch 'for-3.15/drivers' of git://git.kernel.dk/linux-block) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (b33ce4429938 Merge branch 'for-3.15/drivers' of git://git.kernel.dk/linux-block) +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (4b76e14d95f7 phy: ti-pipe3: Add SATA compatible to Documentation binding) +$ git merge usb-gadget/next +Already up-to-date. +Merging staging/staging-next (4ba85265790b Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86) +$ git merge staging/staging-next +Already up-to-date. +Merging char-misc/char-misc-next (b33ce4429938 Merge branch 'for-3.15/drivers' of git://git.kernel.dk/linux-block) +$ 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 (b2bff6ceb61a [SCSI] sd: Quiesce mode sense error messages) +$ git merge scsi/for-next +Already up-to-date. +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 (2188f1c4fcd0 pinctrl: fix typo in bindings documentation) +$ git merge pinctrl/for-next +Removing drivers/pinctrl/pinctrl-capri.c +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/brcm,bcm11351-pinctrl.txt | 2 +- + arch/arm/configs/bcm_defconfig | 2 +- + 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 +- + 10 files changed, 1514 insertions(+), 1471 deletions(-) + create mode 100644 drivers/pinctrl/pinctrl-bcm281xx.c + delete mode 100644 drivers/pinctrl/pinctrl-capri.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 (c0159a2247d8 gpio / ACPI: Prevent potential wrap of GPIO value on OpRegion read) +$ git merge gpio/for-next +Merge made by the 'recursive' strategy. + drivers/gpio/gpiolib-acpi.c | 12 +++++++++--- + drivers/gpio/gpiolib.c | 2 +- + 2 files changed, 10 insertions(+), 4 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 (0d7d90f86f83 proc: Update proc_flush_task_mnt to use d_invalidate) +$ git merge userns/for-next +Resolved 'fs/dcache.c' using previous resolution. +Resolved 'fs/namei.c' using previous resolution. +Resolved 'fs/namespace.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 +[master d561e32c75e6] 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 | 20 +++++++ + fs/namei.c | 22 ++++---- + fs/namespace.c | 87 ++++++++++++++++++++++++++++-- + fs/nfs/dir.c | 7 +-- + fs/proc/base.c | 10 +--- + fs/proc/fd.c | 2 - + include/linux/dcache.h | 3 +- + 15 files changed, 174 insertions(+), 155 deletions(-) +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 (e44df332f30b clk: shmobile: fix setting paretn clock rate) +$ git merge clk/clk-next +Already up-to-date. +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 (fa8a53c39f3f aio: v4 ensure access to ctx->ring_pages is correctly serialised for migration) +$ git merge aio/master +Already up-to-date. +Merging llvmlinux/for-next (fbc151c073f4 x86: LLVMLinux: Fix "incomplete type const struct x86cpu_device_id") +$ git merge llvmlinux/for-next +Merge made by the 'recursive' strategy. +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 (c9eaa447e77e Linux 3.15-rc1) +$ git merge rd-docs/master +Already up-to-date. diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..6001b67b148e --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,5 @@ +Importing jdelvare-hwmon based on 3.14 +Unchanged quilt series jdelvare-hwmon +Importing rd-docs based on origin/master + quilt series is empty +$ git branch -f rd-docs/master c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..d80e43337b4b --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20140414 |