diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-29 16:12:55 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-29 16:12:55 +1100 |
| commit | 21b881d9071c6c96d130238e7181fbb7c7b30349 (patch) | |
| tree | ba85f40dcf8dd9e50acc0bf098a511d94c80f270 | |
| parent | 5e95ec9b85ca46b9cbed200c1f3c568a2882d3c1 (diff) | |
Add linux-next specific files for 20140129next-20140129
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 210 | ||||
| -rw-r--r-- | Next/Trees | 212 | ||||
| -rw-r--r-- | Next/merge.log | 5855 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 6280 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..0926aa2ec21f --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,210 @@ +Name SHA1 +---- ---- +origin d891ea23d5203e5c47439b2a174f86a00b356a6c +fixes b0031f227e47919797dc0e1c1990f3ef151ff0cc +kbuild-current 19514fc665ffbce624785f76ee7ad0ea6378a527 +arc-current 7e22e91102c6b9df7c4ae2168910e19d2bb14cd6 +arm-current d326b65c57d64208646206d0bfd4e2d19d6df38c +m68k-current 56931d73697c99ecf7aba6ae86c94d3a2d15d596 +metag-fixes 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b +powerpc-merge b3084f4db3aeb991c507ca774337c7e7893ed04f +sparc ef350bb7c5e0748f7d17f1d70c6b0eec5f64f446 +net 77c14e512f5361e2b859c2ad05a54b5679b0f2d8 +ipsec 965cdea825693c821d200e38fac9402cde6dce6a +sound-current e7729a415315fcd9516912050d85d5aaebcededc +pci-current f0b75693cbb26439ba959ba7d3b4f43e2fcf3da6 +wireless 7d0d46da750a252371cb747b48ddda27d1047881 +driver-core.current 90804ed61f24712975fa12f8a1fc12cd46ef7d59 +tty.current 413541dd66d51f791a0b169d9b9014e4f56be13c +usb.current 90804ed61f24712975fa12f8a1fc12cd46ef7d59 +staging.current 77d143de75812596a58d126606f42d1214e09dde +char-misc.current 90804ed61f24712975fa12f8a1fc12cd46ef7d59 +input-current 55df811f2066fcaec2548248f0a1a6a0c12dc6b8 +md-current d47648fcf0611812286f68131b40251c6fa54f5e +crypto-current 79ba451d66ca8402c8d052ceb50e359ddc5e1161 +ide c2f7d1e103ef1b5f3bd6a8a09aebf5eac7df4aca +dwmw2 5950f0803ca9d396ab79b7fe6789351f96e1d8d5 +devicetree-current 6f041e99fc7ba00e7e65a431527f9235d6b16463 +rr-fixes 7122c3e9154b5d9a7422f68f02d8acf050fad2b0 +mfd-fixes 73beb63d290f961c299526852884846b0d868840 +vfio-fixes 239a87020b263fe7e70adc5803cb157955023d3c +drm-intel-fixes 09f2344d0896eb458a639b922224c7a202c11599 +asm-generic fb9de7ebc3a2eb7ddb83c92e288447a0c313bced +arc e57d339a6264355df8c98948f05a46ff2bc5d504 +arm 58b9ef24dc72da807de79990ac1928fa8fe26071 +arm-perf 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae +arm-soc 57f319bc4fb85bb5b8227ee02278d15820e0abe2 +bcm2835 413541dd66d51f791a0b169d9b9014e4f56be13c +cortex-m f41bfc9423aac4e589d2b3bedf26b3c249c61146 +ep93xx bfb0709fd17b13498d99592bbe12c91130e35a55 +imx-mxs c2335e6bb0751d01d9eb13ea67f44630e33c55b4 +ixp4xx 19f949f52599ba7c3f67a5897ac6be14bfcb1200 +msm 81cf1e061d001fab44dbaa85fc4fbfb6da6713a1 +mvebu a76f86614bab1499c5542decf51aca1241ac1db1 +renesas 88c499f14016f620be971c95d03d911fb3c0a473 +samsung 8109c477487aa859c341c88479e38bef2861afb5 +tegra 95e770a5ad96cc91aae2da2220a54be4abe7fe9b +arm64 883c057367014d20a14b5054e4eb0d81ce3bea5c +blackfin d8ec26d7f8287f5788a494f56e8814210f0e64be +c6x 546153d75a488f234709c009faf9fafbe34e1ba0 +cris cd065a010a97e3c330d1ded9af551664c9689b19 +hexagon de44443a45e36b7467af2518d3bf7ec6ec909549 +ia64 d52eefb47d4eb6fe40d4c92bc711dd34a8ce1747 +m68k 56931d73697c99ecf7aba6ae86c94d3a2d15d596 +m68knommu a695b9c8911ed48240e89e2a09f268f1722cb01a +metag e9a1d0165bbda4398d4a5d71736cf6390fb42c6f +microblaze c0d68cea2db34a510f4d67b90aab1c48bc47461e +mips b26a21c1eacdb7daf22a304fa857413df2650cfe +openrisc 548dafe880ad84d0accc0a5596c26e3348b103e1 +parisc 6c700d71f7faecb540b3fa4303edb5323a2768c1 +parisc-hd 7d1c153ab373a5c07feb97eaf4e4bcad5bfc262e +powerpc 7179ba52889bef7e5e23f72908270e1ab2b7fc6f +mpc5xxx bc75059422338197ce487d338ac9c898761e1e61 +galak 9e2ecdbba3b0745f9ed454ab86961e3ccf9dc224 +s390 07be0382097027cde68d9268cc628741069b5762 +sparc-next 049ffa8ab33a63b3bff672d1a0ee6a35ad253fe8 +tile 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 +uml 989e59fa41c5464ab77bf0bf82f32f721430544e +unicore32 c284464658acab50c67ff65ff3dc9215a0231ad2 +xtensa 9ed82c6866e2ab671935a75ea454047e8bddb177 +btrfs 56817eda3c10f7047e4ddfaf7de2f6abe5f85552 +ceph 125d725c923527a85876c031028c7f55c28b74b3 +cifs d81b8a40e2ece0a9ab57b1fe1798e291e75bf8fc +configfs b930c26416c4ea6855726fd977145ccea9afbdda +ecryptfs 9e78d14a9f641c0476f733f6fc559ba5cac6f52b +ext3 4ea7772f828a2f1cf6fbf96a3e6f99ae149d2724 +ext4 d7092ae2973f20a39fee786c47e5edf18ced088f +f2fs bf39c00a9a7f3cdb5ce7d6695d9f044daf8f0b53 +fscache 7c604e5d6e565f34d0156608be6e63fed5fad5c9 +fuse b2ec2778df9d2f3c8a4925f0d1903719427a5e88 +gfs2 d57b9c9a999a8f4475fe73fba629c964245800ca +jfs 0439e091e3b1fe41a350540c84857a573fde3d72 +logfs 339466142b3f58fe0ee4dea7e8c5f3d33099e89c +nfs 4db72b40fdbc706f8957e9773ae73b1574b8c694 +nfsd ed47b062ce9546fbe1eebf9da6937df4c5035372 +omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84 +squashfs 6d565409503f4e1f74ac30de14e8c91a2b826cd8 +v9fs 98009cb25d6bc43de2f962ae86bec867060ea7e4 +ubifs c23e9b75ccd0edba81a506c7d97e0af626489256 +xfs 7c71ee78031c248dca13fc94dea9a4cc217db6cf +vfs 27ac0ffeac80ba6b9580529568d06144df044366 +pci cef09b808e584c13b7126b83dc37c80b00234137 +hid fd7e37af337b234a94b0a80c771553b315e50d3a +i2c 6ff4b105163223741f5a82804f9695221017ae42 +jdelvare-hwmon 68d5516b35c7e116a289925f29f907cc1342ba16 +hwmon-staging d303b1b5fbb688282bbf72a534b9dfed7af9fe4f +v4l-dvb e26d710a8cdf3575ab79849a56a9e0b8028e5af9 +kbuild 853e265ed4aaada2782c34f17ce775d1c4f9a008 +kconfig 95edca5c523c4b404dd60baa0a1bea0e4c38fd72 +libata f939ad10650ca1dddaa0d4f763b2eb2f6e06c3bb +pm 009c8e1b92999c9f69e492943484fde8b23babcf +idle 5c56be9a25bad1af44d25a892a5de3dec03babc7 +apm 158204397034f088bfd505eeee281f7072da1c24 +cpupowerutils f16603386b38c28979f4df1cafdc2fe73fa87d37 +thermal 262afa97587b4a9714a8ebccd63b5095523ca0e7 +ieee1394 fcd46b34425da52703fe65b7f08850c509dcb0ed +dlm ece35848c1847cdf3dd07954578d3e99238ebbae +swiotlb 0cb637bff80d5ba2b916bb19f19ffd59cd4079fd +slave-dma ab05d8be5a2e54398f7dac8bb97a82a9ae817f27 +dmaengine 77873803363c9e831fc1d1e6895c084279090c22 +net-next 77d143de75812596a58d126606f42d1214e09dde +ipsec-next abfce3ef58b6a6c95de389f9d20047a05b10e484 +wireless-next a64e1a45060f41423c89768f4f7bef3283678539 +bluetooth 7b63bbf4e465f7edaca830e9f06a2ed0a3d9b2f1 +infiniband fb1b5034e4987b158179a62732fb6dfb8f7ec88e +mtd 0ff76a920e3558307567b45aa0a91fb914924bfc +l2-mtd 0ff76a920e3558307567b45aa0a91fb914924bfc +crypto 79ba451d66ca8402c8d052ceb50e359ddc5e1161 +drm 76f4f415e502e4dfaf409edd0d4ed0dd3a0a0419 +drm-intel ec14ba47791965d2c08e0a681ff44eacbf3c4553 +drm-tegra 13411ddd319057ae334a4084ebcf2c741b317f34 +sound e7729a415315fcd9516912050d85d5aaebcededc +sound-asoc 024531999da9cafeb0a1f8b169e6e55ad54bfea6 +modules 22e669568d5195af10bd2f404f9c1809541ad77b +virtio 05c54de8c88c02bd0a44de8316d5e276b856632e +input 6f2e6c9b451b907b693b7fe3db3792e57796ffea +input-mt 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 +cgroup f446b64bccabd122695d4c6efa5e605597f4a15c +block 2a53fee6859b71ddd767485cd41fac6f0acf25bd +device-mapper 5066a4df1f427faac8372d20494483bb09a4a1cd +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 80af9e6d7ae633309cc5bca96aee6a45117e7c98 +mmc 945be38caa287b177b8c17ffaae7754cab6a658f +kgdb 6bedf31c25dd93c4f70a28e9ab94a239a5fb592c +slab 26e4f2057516f1c457e0e95346a00303f983ad53 +uclinux 6dbe51c251a327e012439c4772097a13df43c5b8 +md 7da9d450ab2843bf1db378c156acc6304dbc1c2b +mfd 90b128ed1557c2f523995a379a53e5105891ecf8 +mfd-lj 02915661dbb91b25b621ab3f387ab55311bded7f +battery 4f8dd2c10bec8a6c1928c3ce00ac68dba5a5d667 +fbdev 718b90ac4c21c81f42b6db062ca0867f3cac7648 +viafb 838ac785d521e091bd8b5f6a2b545166f5f32b77 +omap_dss2 cb1fbad7ec250ac408a4682d38b205958a17a02b +regulator dab396310a0355cb6b3f344d99df3b95e7ce3078 +security 923b49ff69fcbffe6f8b2739de218c45544392a7 +selinux 41be702a542a0d14bb0b1c16e824fa9ed27616ec +lblnet 07bc9dc1b01bad7084fed3d2659e5d83317869bc +watchdog c5321c4916062041f2655f07bb6192d7e530f821 +dwmw2-iommu e5d0c874391a500be7643d3eef9fb07171eee129 +iommu dd1a175695edf662615e422d1c85eae875a411b2 +vfio 3be3a074cf5ba641529d8fdae0e05ca642f23e12 +osd 19350e7627a6f3b0f662cbd2eb1128c9961a41fe +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +trivial c04e7da0133fbe7f799b9356982371d228df9994 +audit f3411cb2b2e396a41ed3a439863f028db7140a34 +fsnotify 1ca39ab9d21ac93f94b9e3eb364ea9a5cf2aba06 +devicetree 2a9330010bea5982a5c6593824bc036bf62d67b7 +dt-rh e48ca29d30a10556eb7abd8d91980b8a57dabf10 +spi 629a6a9c349e64107cdf0d9e4ee4726300c9f40f +tip 5a0c401955b2dc10ea364f08caf52fe082c08eb4 +clockevents 00e2bcd6d35f59fce7fa0e76e24d08f74c6a8506 +edac 3e45588825c1c9c7b561102dd878d23af1b46bb9 +edac-amd 881f0fcef9993992c24f5b649a3fb67fd4208f8f +ftrace 3132e107d608f8753240d82d61303c500fd515b4 +rcu 98cbc61863d3f8dccf93e8ff90321a690c996a5d +uprobes 0326f5a94ddea33fa331b2519f4172f4fb387baa +kvm c760f5e29d92adf5184589f1e616a4be146fb57c +kvm-arm 31ac1ca80d75d7a7be2dda8761524936b3130c62 +kvm-ppc 27025a602cb9d8b0fa5162b465334ef059a503b6 +oprofile 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae +fw-nohz 74876a98a87a115254b3a66a14b27320b7f0acaa +xen-tip c9f6e9977e38de15da96b732a8dec0ef56cbf977 +percpu d5f2deed588b8d53f9667d2b0508ca146f70e176 +workqueues 9af16df84f0cc252cd71b78c16027aec1a5a6ee8 +drivers-x86 b4b0b4a9e0392dbd00e5f033e1329ce61ed06fef +chrome-platform 2b8454a75b90d7cd1ac325a0baba77244733354f +sysctl 4e474a00d7ff746ed177ddae14fa8b2d4bad7a00 +regmap afda06ac277145fabc27c6972bd2697a7a1b866f +hsi 43139a61fc68f4b0af7327a0e63f340a7c81c69a +leds 3cb6f44aedf519dce4a9106dec675b94d675c539 +driver-core 90804ed61f24712975fa12f8a1fc12cd46ef7d59 +tty 4fbd269f1f9f8020dd9474b60e55c4f34d267b08 +usb 90804ed61f24712975fa12f8a1fc12cd46ef7d59 +usb-gadget 836a2164491b19dcd4f29d574e548bcadd421a6a +staging d7216f8f02da54f8f235c5cca562a55b7f52210d +char-misc 90804ed61f24712975fa12f8a1fc12cd46ef7d59 +scsi 3ce438df106826edde7ad724f3819716a3f0cf56 +target-updates 9037c8332432e1982ac663b2acfe9e0c2610603b +target-merge 374b105797c3d4f29c685f3be535c35f5689b30e +writeback f9b0e058cbd04ada76b13afffa7e1df830543c24 +hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad +pinctrl cf8400ce6fe610dec5121b1f2a13066802a3836a +vhost d3d665a654a35c47463d2aa6353bac3ce293f4f5 +remoteproc b9777859ec015a78dae1476e317d04f851bfdd0d +rpmsg 397944df3290ddc46dcc6a08cd71fb560700431b +gpio 3a54bb21f21929b63b0d81e05bb44b0bfaa57df5 +dma-mapping 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 +pwm 6691a19966f04dd81e60505f9630c1a7cf148507 +dma-buf 17b2112f332db7c2bac56926c9e627807bce3615 +userns f58437f1f9161847c636e4fed5569ed5b908af36 +ktest 961d9caceea2d5350a15c17b7d3ffc24c08c9b09 +signal 20b4fb485227404329e41ad15588afad3df23050 +clk 051c8d0b667400b00dc0e53c3cf61ad6991bfefb +random a9f069e38cc36d6c4ab3c831bc4bef2ae1a16e96 +lzo-update 42b775abafafdf811ef300e869a4e1480ef1cf95 +arm64-hugepages af07484863e0c20796081e57093886c22dc16705 +aio 8e321fefb0e60bae4e2a28d20fc4fa30758d27c6 +akpm-current 0fc6f4e2e3d58ccf7439a0bdda8f6fb9cecc2d5d +akpm f7368f57a264a0f525d72feb7898bc4c2e733848 +init 575b5e885d4bf2917fd0f448ee3684dc00086885 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..4819136d2de0 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,212 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#rc-fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +metag-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#fixes +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git#master +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +md-current git git://neil.brown.name/md#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master +devicetree-current git git://git.secretlab.ca/git/linux-2.6#devicetree/merge +rr-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +drm-intel-fixes git git://people.freedesktop.org/~danvet/drm-intel#for-linux-next-fixes +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git#for-next +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next +bcm2835 git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git#for-next +cortex-m git git://git.pengutronix.de/git/ukl/linux.git#for-next +ep93xx git git://github.com/RyanMallon/linux-ep93xx.git#ep93xx-for-next +imx-mxs git git://git.linaro.org/people/shawnguo/linux-2.6.git#for-next +ixp4xx git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux.git#next +msm git git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git#for-next +mvebu git git://git.infradead.org/linux-mvebu.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +blackfin git http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux.git#for-linus +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +cris git git://www.jni.nu/cris.git#for-next +hexagon git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git#linux-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +metag git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/ralf/upstream-sfr.git#mips-for-linux-next +openrisc git git://openrisc.net/jonas/linux#for-upstream +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +mpc5xxx git git://git.denx.de/linux-2.6-agust.git#next +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#next +unicore32 git git://github.com/gxt/linux.git#unicore32 +xtensa git git://github.com/czankel/xtensa-linux.git#for_next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git#linux-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw.git#master +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +logfs git git://github.com/prasad-joshi/logfs_upstream.git#master +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +omfs git git://github.com/bcopeland/omfs.git#for-next +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git#master +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://oss.sgi.com/xfs/xfs.git#for-next +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://people.freedesktop.org/~danvet/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 +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git#master +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next +slab git git://github.com/penberg/linux.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next.git#master +mfd-lj git git://git.linaro.org/people/ljones/mfd.git#for-mfd-next +battery git git://git.infradead.org/battery-2.6.git#master +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/plagnioj/linux-fbdev.git#for-next +viafb git git://github.com/schandinat/linux-2.6.git#viafb-next +omap_dss2 git git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next +selinux git git://git.infradead.org/users/pcmoore/selinux#next +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +vfio git git://github.com/awilliam/linux-vfio.git#next +osd git git://git.open-osd.org/linux-open-osd.git#linux-next +jc_docs git git://git.lwn.net/linux-2.6.git#docs-next +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.infradead.org/users/eparis/audit.git#master +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next +devicetree git git://git.secretlab.ca/git/linux-2.6#devicetree/next +dt-rh git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#clockevents/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git#linux_next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +uprobes git git://github.com/srikard/linux.git#for-next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +kvm-arm git git://github.com/columbia/linux-kvm-arm.git#kvm-arm-next +kvm-ppc git git://github.com/agraf/linux-2.6.git#kvm-ppc-next +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next +fw-nohz git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git#nohz/next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://cavan.codon.org.uk/platform-drivers-x86.git#linux-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform.git#for-next +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl.git#master +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +hsi git git://gitorious.org/kernel-hsi/kernel-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next +target-merge git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next-merge +writeback git git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux.git#writeback-for-next +hwspinlock git git://github.com/ohadbc/hwspinlock-next.git#linux-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +remoteproc git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git#for-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +dma-mapping git git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git#dma-mapping-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +dma-buf git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +signal git git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal.git#for-next +clk git git://git.linaro.org/people/mturquette/linux.git#clk-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +lzo-update git git://github.com/markus-oberhumer/linux.git#lzo-update +arm64-hugepages git git://git.linaro.org/people/stevecapper/linux.git#for-next/hugepages +aio git git://git.kvack.org/~bcrl/aio-next.git#master +akpm-current mmotm http://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm http://www.ozlabs.org/~akpm/mmotm/ +init init git://git.kernel.org/pub/scm/linux/kernel/git/paulg/init.git diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..5581695a3bbb --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,5855 @@ +$ date +Wednesday 29 January 10:42:56 EST 2014 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at ba635f8cd20e Merge tag 'trace-fixes-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace +Merging origin/master (d891ea23d520 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client) +$ git merge origin/master +Updating ba635f8cd20e..d891ea23d520 +Fast-forward + Documentation/ABI/testing/sysfs-bus-rbd | 26 ++ + .../devicetree/bindings/video/ssd1289fb.txt | 13 + + Documentation/ioctl/ioctl-number.txt | 1 + + Documentation/kmsg/s390/zcrypt | 20 - + MAINTAINERS | 2 +- + arch/arm/kernel/setup.c | 2 +- + arch/blackfin/kernel/setup.c | 2 +- + arch/cris/arch-v10/kernel/process.c | 1 + + arch/cris/arch-v32/drivers/axisflashmap.c | 2 - + arch/microblaze/Kconfig | 2 + + arch/microblaze/Makefile | 2 + + arch/microblaze/include/asm/cpuinfo.h | 9 +- + arch/microblaze/include/asm/io.h | 8 + + arch/microblaze/include/asm/sections.h | 1 - + arch/microblaze/include/uapi/asm/Kbuild | 3 +- + arch/microblaze/include/uapi/asm/types.h | 1 - + arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c | 3 - + arch/microblaze/kernel/cpu/cpuinfo-static.c | 2 - + arch/microblaze/kernel/cpu/cpuinfo.c | 24 +- + arch/microblaze/kernel/head.S | 4 + + arch/microblaze/kernel/hw_exception_handler.S | 49 ++- + arch/microblaze/kernel/setup.c | 10 +- + arch/microblaze/kernel/timer.c | 51 +-- + arch/microblaze/kernel/vmlinux.lds.S | 1 + + arch/powerpc/Kconfig | 15 +- + arch/powerpc/boot/.gitignore | 1 + + arch/powerpc/boot/Makefile | 7 +- + arch/powerpc/boot/dts/fsl/elo3-dma-2.dtsi | 82 ++++ + arch/powerpc/boot/dts/fsl/p1020si-post.dtsi | 3 +- + arch/powerpc/boot/dts/fsl/p1021si-post.dtsi | 3 +- + arch/powerpc/boot/dts/fsl/p1022si-post.dtsi | 3 +- + arch/powerpc/boot/dts/fsl/p1023si-post.dtsi | 3 +- + arch/powerpc/boot/dts/kilauea.dts | 2 +- + arch/powerpc/boot/dts/mvme5100.dts | 185 +++++++++ + arch/powerpc/boot/dts/p1010rdb-pa.dts | 23 ++ + arch/powerpc/boot/dts/p1010rdb-pa.dtsi | 85 ++++ + .../dts/{p1010rdb_36b.dts => p1010rdb-pa_36b.dts} | 47 +-- + arch/powerpc/boot/dts/p1010rdb-pb.dts | 35 ++ + arch/powerpc/boot/dts/p1010rdb-pb_36b.dts | 58 +++ + arch/powerpc/boot/dts/p1010rdb.dts | 66 ---- + arch/powerpc/boot/dts/p1010rdb.dtsi | 43 +- + arch/powerpc/boot/dts/p1010rdb_32b.dtsi | 79 ++++ + arch/powerpc/boot/dts/p1010rdb_36b.dtsi | 79 ++++ + arch/powerpc/boot/dts/p1022ds.dtsi | 3 +- + arch/powerpc/boot/dts/p1025twr.dts | 95 +++++ + arch/powerpc/boot/dts/p1025twr.dtsi | 280 +++++++++++++ + arch/powerpc/boot/dts/virtex440-ml507.dts | 2 + + arch/powerpc/boot/mvme5100.c | 27 ++ + arch/powerpc/boot/wrapper | 4 + + arch/powerpc/configs/85xx/p1023_defconfig | 188 --------- + arch/powerpc/configs/adder875_defconfig | 1 + + arch/powerpc/configs/ep88xc_defconfig | 1 + + arch/powerpc/configs/mpc85xx_defconfig | 3 + + arch/powerpc/configs/mpc85xx_smp_defconfig | 3 + + arch/powerpc/configs/mpc866_ads_defconfig | 1 + + arch/powerpc/configs/mpc885_ads_defconfig | 1 + + arch/powerpc/configs/mvme5100_defconfig | 144 +++++++ + arch/powerpc/configs/ppc64_defconfig | 1 + + arch/powerpc/configs/tqm8xx_defconfig | 1 + + arch/powerpc/include/asm/bitops.h | 5 + + arch/powerpc/include/asm/cache.h | 14 +- + arch/powerpc/include/asm/cmpxchg.h | 1 + + arch/powerpc/include/asm/code-patching.h | 7 + + arch/powerpc/include/asm/cputable.h | 12 + + arch/powerpc/include/asm/eeh.h | 14 +- + arch/powerpc/include/asm/exception-64s.h | 21 +- + arch/powerpc/include/asm/fsl_lbc.h | 2 +- + arch/powerpc/include/asm/hardirq.h | 3 +- + arch/powerpc/include/asm/io.h | 16 + + arch/powerpc/include/asm/iommu.h | 54 ++- + arch/powerpc/include/asm/kvm_asm.h | 1 + + arch/powerpc/include/asm/lppaca.h | 2 - + arch/powerpc/include/asm/mce.h | 197 ++++++++++ + arch/powerpc/include/asm/mmu-book3e.h | 13 + + arch/powerpc/include/asm/mmu.h | 21 +- + arch/powerpc/include/asm/opal.h | 108 ++++- + arch/powerpc/include/asm/paca.h | 16 +- + arch/powerpc/include/asm/pgtable-ppc64.h | 14 + + arch/powerpc/include/asm/pgtable.h | 66 +++- + arch/powerpc/include/asm/ppc_asm.h | 14 +- + arch/powerpc/include/asm/processor.h | 8 +- + arch/powerpc/include/asm/ps3.h | 1 - + arch/powerpc/include/asm/pte-hash64.h | 8 +- + arch/powerpc/include/asm/reg.h | 2 + + arch/powerpc/include/asm/reg_booke.h | 10 + + arch/powerpc/include/asm/spinlock.h | 12 +- + arch/powerpc/include/asm/thread_info.h | 9 +- + arch/powerpc/include/asm/tm.h | 1 + + arch/powerpc/include/asm/topology.h | 10 +- + arch/powerpc/include/asm/vio.h | 1 - + arch/powerpc/kernel/Makefile | 1 + + arch/powerpc/kernel/asm-offsets.c | 13 + + arch/powerpc/kernel/cacheinfo.c | 1 - + arch/powerpc/kernel/cpu_setup_fsl_booke.S | 54 +++ + arch/powerpc/kernel/cpu_setup_power.S | 38 +- + arch/powerpc/kernel/cputable.c | 16 + + arch/powerpc/kernel/crash.c | 1 - + arch/powerpc/kernel/dma-iommu.c | 4 +- + arch/powerpc/kernel/eeh.c | 17 +- + arch/powerpc/kernel/eeh_driver.c | 166 ++++---- + arch/powerpc/kernel/eeh_pe.c | 4 +- + arch/powerpc/kernel/entry_64.S | 12 +- + arch/powerpc/kernel/exceptions-64e.S | 27 +- + arch/powerpc/kernel/exceptions-64s.S | 242 ++++++++++-- + arch/powerpc/kernel/fpu.S | 16 + + arch/powerpc/kernel/fsl_booke_entry_mapping.S | 2 + + arch/powerpc/kernel/head_64.S | 1 + + arch/powerpc/kernel/head_fsl_booke.S | 266 +++++++++++-- + arch/powerpc/kernel/hw_breakpoint.c | 1 - + arch/powerpc/kernel/idle_power7.S | 1 + + arch/powerpc/kernel/iomap.c | 1 - + arch/powerpc/kernel/iommu.c | 145 +++---- + arch/powerpc/kernel/irq.c | 12 +- + arch/powerpc/kernel/kgdb.c | 1 - + arch/powerpc/kernel/mce.c | 352 +++++++++++++++++ + arch/powerpc/kernel/mce_power.c | 284 +++++++++++++ + arch/powerpc/kernel/misc_32.S | 4 +- + arch/powerpc/kernel/misc_64.S | 6 + + arch/powerpc/kernel/paca.c | 37 +- + arch/powerpc/kernel/process.c | 177 ++++++++- + arch/powerpc/kernel/prom.c | 41 +- + arch/powerpc/kernel/setup_64.c | 47 ++- + arch/powerpc/kernel/signal.c | 3 +- + arch/powerpc/kernel/signal_32.c | 21 +- + arch/powerpc/kernel/signal_64.c | 14 +- + arch/powerpc/kernel/smp-tbsync.c | 1 - + arch/powerpc/kernel/smp.c | 9 +- + arch/powerpc/kernel/swsusp_booke.S | 32 +- + arch/powerpc/kernel/syscalls.c | 1 - + arch/powerpc/kernel/sysfs.c | 388 ++++++++++++++++-- + arch/powerpc/kernel/time.c | 14 +- + arch/powerpc/kernel/traps.c | 72 +++- + arch/powerpc/kernel/vdso32/vdso32_wrapper.S | 1 - + arch/powerpc/kernel/vdso64/vdso64_wrapper.S | 1 - + arch/powerpc/kernel/vector.S | 10 + + arch/powerpc/kernel/vio.c | 31 +- + arch/powerpc/kvm/book3s_hv_ras.c | 50 ++- + arch/powerpc/kvm/bookehv_interrupts.S | 2 + + arch/powerpc/lib/code-patching.c | 15 + + arch/powerpc/lib/crtsavres.S | 186 +++++++++ + arch/powerpc/math-emu/math_efp.c | 316 +++++++++++---- + arch/powerpc/mm/fsl_booke_mmu.c | 80 +++- + arch/powerpc/mm/hash_low_64.S | 15 +- + arch/powerpc/mm/hash_utils_64.c | 7 +- + arch/powerpc/mm/hugepage-hash64.c | 6 +- + arch/powerpc/mm/hugetlbpage-book3e.c | 54 ++- + arch/powerpc/mm/hugetlbpage-hash64.c | 4 + + arch/powerpc/mm/mem.c | 8 +- + arch/powerpc/mm/mmu_decl.h | 2 + + arch/powerpc/mm/numa.c | 96 ++++- + arch/powerpc/mm/pgtable.c | 3 +- + arch/powerpc/mm/pgtable_32.c | 1 + + arch/powerpc/mm/pgtable_64.c | 15 +- + arch/powerpc/mm/tlb_hash64.c | 1 - + arch/powerpc/mm/tlb_low_64e.S | 174 +++++++- + arch/powerpc/mm/tlb_nohash.c | 112 +++--- + arch/powerpc/mm/tlb_nohash_low.S | 4 +- + arch/powerpc/oprofile/op_model_7450.c | 1 - + arch/powerpc/oprofile/op_model_cell.c | 1 - + arch/powerpc/oprofile/op_model_fsl_emb.c | 1 - + arch/powerpc/oprofile/op_model_pa6t.c | 1 - + arch/powerpc/oprofile/op_model_power4.c | 1 - + arch/powerpc/oprofile/op_model_rs64.c | 1 - + arch/powerpc/platforms/83xx/Kconfig | 1 - + arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c | 1 - + arch/powerpc/platforms/83xx/suspend.c | 1 - + arch/powerpc/platforms/85xx/Kconfig | 6 + + arch/powerpc/platforms/85xx/Makefile | 1 + + arch/powerpc/platforms/85xx/common.c | 38 ++ + arch/powerpc/platforms/85xx/mpc85xx.h | 6 + + arch/powerpc/platforms/85xx/mpc85xx_mds.c | 29 +- + arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 25 +- + arch/powerpc/platforms/85xx/sgy_cts1000.c | 1 - + arch/powerpc/platforms/85xx/smp.c | 17 +- + arch/powerpc/platforms/85xx/twr_p102x.c | 147 +++++++ + arch/powerpc/platforms/8xx/Kconfig | 1 - + arch/powerpc/platforms/Kconfig.cputype | 1 + + arch/powerpc/platforms/cell/beat_htab.c | 4 +- + arch/powerpc/platforms/cell/iommu.c | 14 +- + arch/powerpc/platforms/chrp/smp.c | 1 - + arch/powerpc/platforms/embedded6xx/Kconfig | 13 +- + arch/powerpc/platforms/embedded6xx/Makefile | 1 + + arch/powerpc/platforms/embedded6xx/hlwd-pic.c | 1 - + arch/powerpc/platforms/embedded6xx/mvme5100.c | 221 +++++++++++ + arch/powerpc/platforms/pasemi/dma_lib.c | 1 - + arch/powerpc/platforms/pasemi/iommu.c | 5 +- + arch/powerpc/platforms/powermac/pfunc_core.c | 1 - + arch/powerpc/platforms/powernv/Kconfig | 5 - + arch/powerpc/platforms/powernv/Makefile | 1 + + arch/powerpc/platforms/powernv/eeh-ioda.c | 223 +++-------- + arch/powerpc/platforms/powernv/eeh-powernv.c | 24 +- + arch/powerpc/platforms/powernv/opal-flash.c | 35 +- + .../powerpc/platforms/powernv/opal-memory-errors.c | 146 +++++++ + arch/powerpc/platforms/powernv/opal-rtc.c | 6 +- + arch/powerpc/platforms/powernv/opal-wrappers.S | 3 + + arch/powerpc/platforms/powernv/opal.c | 267 +++++++------ + arch/powerpc/platforms/powernv/pci-ioda.c | 11 +- + arch/powerpc/platforms/powernv/pci-p5ioc2.c | 2 +- + arch/powerpc/platforms/powernv/pci.c | 230 ++++++++--- + arch/powerpc/platforms/powernv/pci.h | 3 + + arch/powerpc/platforms/powernv/setup.c | 6 +- + arch/powerpc/platforms/ps3/spu.c | 2 +- + arch/powerpc/platforms/pseries/Kconfig | 2 +- + arch/powerpc/platforms/pseries/cmm.c | 1 - + arch/powerpc/platforms/pseries/dtl.c | 1 - + arch/powerpc/platforms/pseries/eeh_pseries.c | 4 +- + arch/powerpc/platforms/pseries/iommu.c | 167 ++------ + arch/powerpc/platforms/pseries/lpar.c | 5 +- + arch/powerpc/platforms/pseries/processor_idle.c | 3 - + arch/powerpc/platforms/pseries/setup.c | 4 +- + arch/powerpc/platforms/wsp/wsp_pci.c | 11 +- + arch/powerpc/sysdev/Kconfig | 2 +- + arch/powerpc/sysdev/cpm2_pic.c | 1 - + arch/powerpc/sysdev/fsl_ifc.c | 1 - + arch/powerpc/sysdev/fsl_lbc.c | 31 +- + arch/powerpc/sysdev/fsl_pci.c | 5 +- + arch/powerpc/sysdev/ge/ge_pic.h | 1 - + arch/powerpc/sysdev/i8259.c | 1 - + arch/powerpc/sysdev/indirect_pci.c | 6 +- + arch/powerpc/sysdev/mpc8xx_pic.c | 1 - + arch/powerpc/sysdev/mpic_timer.c | 10 +- + arch/powerpc/sysdev/qe_lib/qe_io.c | 1 - + arch/powerpc/sysdev/qe_lib/ucc.c | 1 - + arch/powerpc/sysdev/qe_lib/ucc_fast.c | 1 - + arch/powerpc/sysdev/qe_lib/ucc_slow.c | 1 - + arch/powerpc/sysdev/udbg_memcons.c | 1 - + arch/powerpc/sysdev/xics/icp-hv.c | 1 - + arch/powerpc/xmon/xmon.c | 4 + + arch/s390/Kconfig | 2 +- + arch/s390/hypfs/Makefile | 2 +- + arch/s390/hypfs/hypfs.h | 7 + + arch/s390/hypfs/hypfs_dbfs.c | 16 + + arch/s390/hypfs/hypfs_sprp.c | 141 +++++++ + arch/s390/hypfs/inode.c | 15 +- + arch/s390/include/asm/cmpxchg.h | 5 +- + arch/s390/include/asm/sclp.h | 1 + + arch/s390/include/uapi/asm/hypfs.h | 25 ++ + arch/s390/include/uapi/asm/statfs.h | 10 +- + arch/s390/include/uapi/asm/unistd.h | 2 + + arch/s390/kernel/compat_wrapper.S | 11 + + arch/s390/kernel/syscalls.S | 2 + + arch/s390/lib/uaccess.h | 9 - + arch/s390/lib/uaccess_pt.c | 14 +- + arch/unicore32/kernel/early_printk.c | 8 +- + arch/x86/include/asm/page_types.h | 4 +- + arch/x86/kernel/setup.c | 2 +- + drivers/block/rbd.c | 303 +++++++++----- + drivers/firmware/google/Kconfig | 3 +- + drivers/macintosh/windfarm_lm75_sensor.c | 2 +- + drivers/macintosh/windfarm_max6690_sensor.c | 2 +- + drivers/net/ethernet/ibm/ibmveth.c | 12 +- + drivers/s390/block/xpram.c | 5 +- + drivers/s390/char/sclp_cmd.c | 5 + + drivers/s390/char/vmur.c | 4 +- + drivers/tty/Kconfig | 2 +- + drivers/tty/hvc/hvc_iucv.c | 103 ++++- + drivers/vfio/vfio_iommu_spapr_tce.c | 28 +- + fs/9p/acl.c | 4 +- + fs/Kconfig | 6 +- + fs/Makefile | 3 +- + fs/affs/super.c | 57 ++- + fs/afs/internal.h | 1 - + fs/afs/proc.c | 122 ++---- + fs/befs/linuxvfs.c | 4 +- + fs/btrfs/acl.c | 142 +------ + fs/btrfs/ctree.h | 7 +- + fs/btrfs/inode.c | 7 +- + fs/btrfs/ioctl.c | 70 ++-- + fs/btrfs/xattr.c | 5 +- + fs/btrfs/xattr.h | 2 - + fs/ceph/Kconfig | 13 + + fs/ceph/Makefile | 1 + + fs/ceph/acl.c | 332 ++++++++++++++++ + fs/ceph/addr.c | 93 ++++- + fs/ceph/cache.h | 13 + + fs/ceph/caps.c | 338 ++++++++++------ + fs/ceph/dir.c | 16 +- + fs/ceph/file.c | 437 +++++++++++++++------ + fs/ceph/inode.c | 33 +- + fs/ceph/ioctl.c | 8 +- + fs/ceph/mds_client.c | 132 ++++--- + fs/ceph/mds_client.h | 2 + + fs/ceph/strings.c | 2 + + fs/ceph/super.c | 9 +- + fs/ceph/super.h | 45 ++- + fs/ceph/xattr.c | 60 ++- + fs/cramfs/inode.c | 50 ++- + include/linux/cramfs_fs.h => fs/cramfs/internal.h | 6 - + fs/cramfs/uncompress.c | 2 +- + fs/dcache.c | 10 +- + fs/ecryptfs/inode.c | 29 +- + fs/efs/super.c | 39 +- + fs/eventfd.c | 13 +- + fs/exofs/inode.c | 31 +- + fs/exofs/ore.c | 45 ++- + fs/ext2/acl.c | 188 +-------- + fs/ext2/acl.h | 8 +- + fs/ext2/file.c | 1 + + fs/ext2/inode.c | 2 +- + fs/ext2/namei.c | 2 + + fs/ext2/xattr.c | 8 +- + fs/ext2/xattr.h | 2 - + fs/ext3/acl.c | 223 ++--------- + fs/ext3/acl.h | 9 +- + fs/ext3/file.c | 1 + + fs/ext3/inode.c | 2 +- + fs/ext3/namei.c | 2 + + fs/ext3/xattr.c | 8 +- + fs/ext3/xattr.h | 2 - + fs/ext4/acl.c | 223 ++--------- + fs/ext4/acl.h | 9 +- + fs/ext4/extents.c | 2 +- + fs/ext4/file.c | 1 + + fs/ext4/inline.c | 26 +- + fs/ext4/inode.c | 13 +- + fs/ext4/ioctl.c | 6 +- + fs/ext4/namei.c | 7 +- + fs/ext4/xattr.c | 8 +- + fs/ext4/xattr.h | 2 - + fs/f2fs/acl.c | 174 +------- + fs/f2fs/acl.h | 7 +- + fs/f2fs/f2fs.h | 4 + + fs/f2fs/file.c | 3 +- + fs/f2fs/namei.c | 2 + + fs/f2fs/xattr.c | 9 +- + fs/f2fs/xattr.h | 2 - + fs/file.c | 98 ++--- + fs/fuse/file.c | 3 + + fs/generic_acl.c | 184 --------- + fs/gfs2/acl.c | 234 ++--------- + fs/gfs2/acl.h | 4 +- + fs/gfs2/inode.c | 34 +- + fs/gfs2/xattr.c | 4 +- + fs/hfsplus/acl.h | 9 +- + fs/hfsplus/dir.c | 1 + + fs/hfsplus/inode.c | 3 +- + fs/hfsplus/posix_acl.c | 168 +------- + fs/hfsplus/xattr.c | 92 +---- + fs/hfsplus/xattr.h | 2 - + fs/jffs2/acl.c | 141 +------ + fs/jffs2/acl.h | 7 +- + fs/jffs2/dir.c | 1 + + fs/jffs2/file.c | 1 + + fs/jffs2/fs.c | 7 +- + fs/jffs2/symlink.c | 1 - + fs/jffs2/xattr.c | 9 +- + fs/jfs/acl.c | 105 ++--- + fs/jfs/file.c | 4 +- + fs/jfs/jfs_acl.h | 7 +- + fs/jfs/jfs_xattr.h | 2 + + fs/jfs/namei.c | 1 + + fs/jfs/super.c | 2 + + fs/jfs/xattr.c | 108 ++--- + fs/mount.h | 2 +- + fs/namei.c | 24 +- + fs/nfs/dir.c | 18 +- + fs/nfs/direct.c | 279 +++++++------ + fs/nfs/file.c | 6 +- + fs/nfs/inode.c | 52 ++- + fs/nfs/nfs3acl.c | 291 +++----------- + fs/nfs/nfs3proc.c | 76 ++-- + fs/nfs/nfs3super.c | 3 + + fs/nfs/nfs4client.c | 25 +- + fs/nfs/nfs4filelayout.c | 16 +- + fs/nfs/nfs4filelayoutdev.c | 2 +- + fs/nfs/nfs4proc.c | 43 +- + fs/nfs/nfs4state.c | 4 +- + fs/nfs/nfs4super.c | 14 +- + fs/nfs/nfs4xdr.c | 47 ++- + fs/nfs/pnfs.c | 67 ++-- + fs/nfs/pnfs.h | 16 + + fs/nfs/read.c | 12 +- + fs/nfs/write.c | 19 +- + fs/nfsd/acl.h | 16 +- + fs/nfsd/nfs2acl.c | 72 ++-- + fs/nfsd/nfs3acl.c | 62 +-- + fs/nfsd/nfs4acl.c | 120 ++++-- + fs/nfsd/nfs4proc.c | 1 + + fs/nfsd/vfs.c | 241 ------------ + fs/nfsd/vfs.h | 8 - + fs/nls/mac-celtic.c | 1 - + fs/nls/mac-centeuro.c | 1 - + fs/nls/mac-croatian.c | 1 - + fs/nls/mac-cyrillic.c | 1 - + fs/nls/mac-gaelic.c | 1 - + fs/nls/mac-greek.c | 1 - + fs/nls/mac-iceland.c | 1 - + fs/nls/mac-inuit.c | 1 - + fs/nls/mac-roman.c | 1 - + fs/nls/mac-romanian.c | 1 - + fs/nls/mac-turkish.c | 1 - + fs/nls/nls_ascii.c | 1 - + fs/nls/nls_base.c | 5 +- + fs/nls/nls_cp1250.c | 1 - + fs/nls/nls_cp1251.c | 1 - + fs/nls/nls_cp1255.c | 1 - + fs/nls/nls_cp437.c | 1 - + fs/nls/nls_cp737.c | 1 - + fs/nls/nls_cp775.c | 1 - + fs/nls/nls_cp850.c | 1 - + fs/nls/nls_cp852.c | 1 - + fs/nls/nls_cp855.c | 1 - + fs/nls/nls_cp857.c | 1 - + fs/nls/nls_cp860.c | 1 - + fs/nls/nls_cp861.c | 1 - + fs/nls/nls_cp862.c | 1 - + fs/nls/nls_cp863.c | 1 - + fs/nls/nls_cp864.c | 1 - + fs/nls/nls_cp865.c | 1 - + fs/nls/nls_cp866.c | 1 - + fs/nls/nls_cp869.c | 1 - + fs/nls/nls_cp874.c | 1 - + fs/nls/nls_cp932.c | 1 - + fs/nls/nls_cp936.c | 1 - + fs/nls/nls_cp949.c | 1 - + fs/nls/nls_cp950.c | 1 - + fs/nls/nls_euc-jp.c | 1 - + fs/nls/nls_iso8859-1.c | 1 - + fs/nls/nls_iso8859-13.c | 1 - + fs/nls/nls_iso8859-14.c | 1 - + fs/nls/nls_iso8859-15.c | 1 - + fs/nls/nls_iso8859-2.c | 1 - + fs/nls/nls_iso8859-3.c | 1 - + fs/nls/nls_iso8859-4.c | 1 - + fs/nls/nls_iso8859-5.c | 1 - + fs/nls/nls_iso8859-6.c | 1 - + fs/nls/nls_iso8859-7.c | 1 - + fs/nls/nls_iso8859-9.c | 1 - + fs/nls/nls_koi8-r.c | 1 - + fs/nls/nls_koi8-ru.c | 1 - + fs/nls/nls_koi8-u.c | 1 - + fs/nls/nls_utf8.c | 1 - + fs/notify/fanotify/fanotify_user.c | 4 +- + fs/ocfs2/acl.c | 234 +---------- + fs/ocfs2/acl.h | 13 +- + fs/ocfs2/file.c | 4 +- + fs/ocfs2/namei.c | 27 +- + fs/ocfs2/refcounttree.c | 19 +- + fs/ocfs2/xattr.c | 21 +- + fs/ocfs2/xattr.h | 6 +- + fs/posix_acl.c | 428 +++++++++++++++++++- + fs/qnx4/inode.c | 63 ++- + fs/qnx4/qnx4.h | 2 - + fs/reiserfs/acl.h | 4 +- + fs/reiserfs/file.c | 1 + + fs/reiserfs/namei.c | 4 +- + fs/reiserfs/procfs.c | 4 +- + fs/reiserfs/reiserfs.h | 8 - + fs/reiserfs/super.c | 8 +- + fs/reiserfs/xattr.c | 5 +- + fs/reiserfs/xattr_acl.c | 190 ++------- + fs/xattr_acl.c | 180 --------- + fs/xfs/xfs_acl.c | 151 +------ + fs/xfs/xfs_acl.h | 9 +- + fs/xfs/xfs_iops.c | 55 ++- + fs/xfs/xfs_iops.h | 2 +- + fs/xfs/xfs_xattr.c | 4 +- + include/asm-generic/pgtable.h | 12 + + include/linux/bootmem.h | 37 ++ + include/linux/ceph/buffer.h | 1 - + include/linux/ceph/ceph_features.h | 101 +++-- + include/linux/ceph/ceph_fs.h | 36 +- + include/linux/ceph/libceph.h | 19 +- + include/linux/ceph/messenger.h | 13 +- + include/linux/ceph/osd_client.h | 19 +- + include/linux/ceph/osdmap.h | 66 ++-- + include/linux/ceph/rados.h | 4 + + include/linux/cramfs_fs_sb.h | 20 - + include/linux/crush/crush.h | 20 +- + include/linux/crush/mapper.h | 3 +- + include/linux/fdtable.h | 35 +- + include/linux/fs.h | 1 + + include/linux/generic_acl.h | 14 - + include/linux/interrupt.h | 2 +- + include/linux/ipc.h | 2 +- + include/linux/ipc_namespace.h | 1 - + include/linux/mm.h | 2 +- + include/linux/msg.h | 2 +- + include/linux/nfs_fs.h | 24 +- + include/linux/nls.h | 3 +- + include/linux/of_fdt.h | 1 + + include/linux/posix_acl.h | 43 +- + include/linux/posix_acl_xattr.h | 3 + + include/linux/rcupdate.h | 2 - + include/linux/shm.h | 2 +- + include/linux/splice.h | 3 +- + include/linux/sunrpc/rpc_pipe_fs.h | 5 +- + include/math-emu/op-common.h | 9 +- + include/scsi/osd_ore.h | 1 + + include/trace/events/sunrpc.h | 1 + + init/do_mounts_rd.c | 2 +- + init/main.c | 2 - + ipc/compat.c | 30 +- + ipc/compat_mq.c | 2 +- + ipc/ipc_sysctl.c | 14 +- + ipc/mqueue.c | 22 +- + ipc/msg.c | 44 ++- + ipc/sem.c | 178 +++++---- + ipc/shm.c | 49 ++- + ipc/util.c | 290 +++++++------- + ipc/util.h | 28 +- + kernel/kexec.c | 2 +- + kernel/rcu/update.c | 11 - + kernel/softirq.c | 72 ++-- + lib/dynamic_debug.c | 14 +- + lib/swiotlb.c | 4 +- + mm/filemap.c | 42 +- + mm/huge_memory.c | 14 +- + mm/memblock.c | 6 - + mm/mempolicy.c | 5 +- + mm/migrate.c | 2 - + mm/mm_init.c | 2 +- + mm/shmem.c | 57 ++- + mm/vmalloc.c | 20 +- + net/ceph/buffer.c | 22 +- + net/ceph/ceph_common.c | 24 +- + net/ceph/crush/crush.c | 7 +- + net/ceph/crush/mapper.c | 336 ++++++++++++---- + net/ceph/debugfs.c | 3 +- + net/ceph/messenger.c | 32 +- + net/ceph/mon_client.c | 8 +- + net/ceph/osd_client.c | 283 +++++++++++-- + net/ceph/osdmap.c | 78 +++- + net/sunrpc/auth_gss/auth_gss.c | 17 +- + net/sunrpc/clnt.c | 15 +- + net/sunrpc/netns.h | 3 +- + net/sunrpc/rpc_pipe.c | 169 +++++++- + net/sunrpc/sunrpc_syms.c | 8 +- + net/sunrpc/xprt.c | 5 + + net/sunrpc/xprtsock.c | 42 +- + scripts/checkpatch.pl | 9 + + scripts/mod/modpost.c | 8 +- + 532 files changed, 11585 insertions(+), 7052 deletions(-) + create mode 100644 Documentation/devicetree/bindings/video/ssd1289fb.txt + delete mode 100644 Documentation/kmsg/s390/zcrypt + delete mode 100644 arch/microblaze/include/uapi/asm/types.h + create mode 100644 arch/powerpc/boot/dts/fsl/elo3-dma-2.dtsi + create mode 100644 arch/powerpc/boot/dts/mvme5100.dts + create mode 100644 arch/powerpc/boot/dts/p1010rdb-pa.dts + create mode 100644 arch/powerpc/boot/dts/p1010rdb-pa.dtsi + rename arch/powerpc/boot/dts/{p1010rdb_36b.dts => p1010rdb-pa_36b.dts} (64%) + create mode 100644 arch/powerpc/boot/dts/p1010rdb-pb.dts + create mode 100644 arch/powerpc/boot/dts/p1010rdb-pb_36b.dts + delete mode 100644 arch/powerpc/boot/dts/p1010rdb.dts + create mode 100644 arch/powerpc/boot/dts/p1010rdb_32b.dtsi + create mode 100644 arch/powerpc/boot/dts/p1010rdb_36b.dtsi + create mode 100644 arch/powerpc/boot/dts/p1025twr.dts + create mode 100644 arch/powerpc/boot/dts/p1025twr.dtsi + create mode 100644 arch/powerpc/boot/mvme5100.c + delete mode 100644 arch/powerpc/configs/85xx/p1023_defconfig + create mode 100644 arch/powerpc/configs/mvme5100_defconfig + create mode 100644 arch/powerpc/include/asm/mce.h + create mode 100644 arch/powerpc/kernel/mce.c + create mode 100644 arch/powerpc/kernel/mce_power.c + create mode 100644 arch/powerpc/platforms/85xx/twr_p102x.c + create mode 100644 arch/powerpc/platforms/embedded6xx/mvme5100.c + create mode 100644 arch/powerpc/platforms/powernv/opal-memory-errors.c + create mode 100644 arch/s390/hypfs/hypfs_sprp.c + create mode 100644 arch/s390/include/uapi/asm/hypfs.h + create mode 100644 fs/ceph/acl.c + rename include/linux/cramfs_fs.h => fs/cramfs/internal.h (70%) + delete mode 100644 fs/generic_acl.c + delete mode 100644 fs/xattr_acl.c + delete mode 100644 include/linux/cramfs_fs_sb.h + delete mode 100644 include/linux/generic_acl.h +Merging fixes/master (b0031f227e47 Merge tag 's2mps11-build' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator) +$ git merge fixes/master +Already up-to-date. +$ git am -3 ../patches/ceph_merge_fixup-1.patch +Applying: Ceph updates for -rc1 +Merging kbuild-current/rc-fixes (19514fc665ff arm, kbuild: make "make install" not depend on vmlinux) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (7e22e91102c6 Linux 3.13-rc8) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (d326b65c57d6 ARM: fix building with gcc 4.6.4) +$ git merge arm-current/fixes +Auto-merging arch/arm/mm/init.c +Auto-merging arch/arm/Makefile +Merge made by the 'recursive' strategy. + arch/arm/Makefile | 2 +- + arch/arm/kernel/entry-armv.S | 2 ++ + arch/arm/kernel/head.S | 3 ++- + arch/arm/mm/init.c | 3 ++- + 4 files changed, 7 insertions(+), 3 deletions(-) +Merging m68k-current/for-linus (56931d73697c m68k/mac: Make SCC reset work more reliably) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (3b2f64d00c46 Linux 3.11-rc2) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging powerpc-merge/merge (b3084f4db3ae powerpc/thp: Fix crash on mremap) +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc/master (ef350bb7c5e0 Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4) +$ git merge sparc/master +Already up-to-date. +Merging net/master (77c14e512f53 Merge branch 'qlcnic') +$ git merge net/master +Merge made by the 'recursive' strategy. + Documentation/networking/ip-sysctl.txt | 6 ++ + Documentation/networking/packet_mmap.txt | 1 + + drivers/hv/channel.c | 14 ++-- + drivers/net/bonding/bond_main.c | 67 +++++++++------- + drivers/net/ethernet/8390/apne.c | 1 - + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 3 +- + drivers/net/ethernet/marvell/sky2.c | 4 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 19 +++-- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 9 +-- + .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 11 ++- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +- + drivers/net/hyperv/hyperv_net.h | 2 +- + drivers/net/hyperv/netvsc.c | 7 +- + drivers/net/xen-netfront.c | 88 +++++++--------------- + include/linux/skbuff.h | 1 + + net/core/skbuff.c | 25 ++++++ + net/ieee802154/6lowpan_iphc.c | 2 +- + net/ipv4/ip_gre.c | 2 +- + net/ipv4/ip_input.c | 2 +- + net/ipv4/ip_tunnel.c | 3 +- + net/ipv6/ip6_input.c | 2 +- + net/sched/sch_tbf.c | 13 +--- + 23 files changed, 146 insertions(+), 146 deletions(-) +Merging ipsec/master (965cdea82569 dccp: catch failed request_module call in dccp_probe init) +$ git merge ipsec/master +Already up-to-date. +Merging sound-current/for-linus (e7729a415315 ALSA: hda - Fix silent output on MacBook Air 1,1) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/core/init.c | 57 +++++++++++++++++++++++-------------------- + sound/pci/cs46xx/cs46xx_lib.c | 1 + + sound/pci/hda/patch_realtek.c | 33 +++++++++++++++++++++++-- + 3 files changed, 62 insertions(+), 29 deletions(-) +Merging pci-current/for-linus (f0b75693cbb2 MAINTAINERS: Add DesignWare, i.MX6, Armada, R-Car PCI host maintainers) +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless/master (7d0d46da750a Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge wireless/master +Already up-to-date. +Merging driver-core.current/driver-core-linus (90804ed61f24 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (413541dd66d5 Linux 3.13-rc5) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (90804ed61f24 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging staging.current/staging-linus (77d143de7581 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (90804ed61f24 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (55df811f2066 Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up-to-date. +Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe) +$ git merge md-current/for-linus +Already up-to-date. +Merging crypto-current/master (79ba451d66ca crypto: aesni - fix build on x86 (32bit)) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (c2f7d1e103ef ide: pmac: remove unnecessary pci_set_drvdata()) +$ git merge ide/master +Already up-to-date. +Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) +$ git merge dwmw2/master +Already up-to-date. +Merging devicetree-current/devicetree/merge (6f041e99fc7b of: Fix NULL dereference in unflatten_and_copy()) +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging rr-fixes/fixes (7122c3e9154b scripts/link-vmlinux.sh: only filter kernel symbols for arm) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging mfd-fixes/master (73beb63d290f mfd: rtsx_pcr: Disable interrupts before cancelling delayed works) +$ git merge mfd-fixes/master +Already up-to-date. +Merging vfio-fixes/for-linus (239a87020b26 Merge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into for-linus) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (09f2344d0896 drm/i915/bdw: make sure south port interrupts are enabled properly v2) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up-to-date. +Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu) +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (e57d339a6264 ARC: [cmdline] support External Device Trees from u-boot) +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (58b9ef24dc72 Merge branch 'cubox-i-init' into for-next) +$ git merge arm/for-next +Auto-merging arch/arm/mach-imx/mach-imx6q.c +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 3 + + arch/arm/boot/dts/imx6dl-cubox-i.dts | 12 ++ + arch/arm/boot/dts/imx6dl-hummingboard.dts | 167 +++++++++++++++++++++++++ + arch/arm/boot/dts/imx6q-cubox-i.dts | 16 +++ + arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 143 +++++++++++++++++++++ + arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi | 62 +++++++++ + arch/arm/boot/dts/imx6qdl-microsom.dtsi | 33 +++++ + arch/arm/include/asm/io.h | 6 + + arch/arm/kernel/io.c | 35 ++++++ + arch/arm/mach-imx/mach-imx6q.c | 35 ++++++ + 10 files changed, 512 insertions(+) + create mode 100644 arch/arm/boot/dts/imx6dl-cubox-i.dts + create mode 100644 arch/arm/boot/dts/imx6dl-hummingboard.dts + create mode 100644 arch/arm/boot/dts/imx6q-cubox-i.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-cubox-i.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-microsom.dtsi +Merging arm-perf/for-next/perf (6ce4eac1f600 Linux 3.13-rc1) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (57f319bc4fb8 Merge branch 'late/misc' into for-next) +$ git merge arm-soc/for-next +Resolved 'arch/arm/boot/dts/bcm11351.dtsi' using previous resolution. +Auto-merging drivers/clocksource/bcm_kona_timer.c +Auto-merging drivers/clk/Makefile +Auto-merging drivers/clk/Kconfig +Auto-merging arch/arm/boot/dts/bcm11351.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/bcm11351.dtsi +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a21fccc87e37] Merge remote-tracking branch 'arm-soc/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/arm/bcm/kona-timer.txt | 7 +- + .../devicetree/bindings/clock/bcm-kona-clock.txt | 93 ++ + .../devicetree/bindings/mmc/kona-sdhci.txt | 4 + + arch/arm/arm-soc-for-next-contents.txt | 281 ++++++ + arch/arm/boot/dts/bcm11351-brt.dts | 6 + + arch/arm/boot/dts/bcm11351.dtsi | 170 +++- + arch/arm/boot/dts/bcm28155-ap.dts | 28 + + arch/arm/boot/dts/moxart-uc7112lx.dts | 8 + + arch/arm/boot/dts/moxart.dtsi | 6 - + arch/arm/configs/multi_v7_defconfig | 153 ++- + drivers/clk/Kconfig | 1 + + drivers/clk/Makefile | 1 + + drivers/clk/bcm/Kconfig | 8 + + drivers/clk/bcm/Makefile | 3 + + drivers/clk/bcm/clk-bcm281xx.c | 416 ++++++++ + drivers/clk/bcm/clk-kona-setup.c | 769 +++++++++++++++ + drivers/clk/bcm/clk-kona.c | 1033 ++++++++++++++++++++ + drivers/clk/bcm/clk-kona.h | 416 ++++++++ + drivers/clocksource/bcm_kona_timer.c | 14 +- + include/dt-bindings/clock/bcm281xx.h | 65 ++ + 20 files changed, 3456 insertions(+), 26 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/bcm-kona-clock.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 drivers/clk/bcm/Kconfig + create mode 100644 drivers/clk/bcm/Makefile + create mode 100644 drivers/clk/bcm/clk-bcm281xx.c + create mode 100644 drivers/clk/bcm/clk-kona-setup.c + create mode 100644 drivers/clk/bcm/clk-kona.c + create mode 100644 drivers/clk/bcm/clk-kona.h + create mode 100644 include/dt-bindings/clock/bcm281xx.h +Merging bcm2835/for-next (413541dd66d5 Linux 3.13-rc5) +$ git merge bcm2835/for-next +Already up-to-date. +Merging cortex-m/for-next (f41bfc9423aa Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4) +$ git merge cortex-m/for-next +Already up-to-date. +Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next) +$ git merge ep93xx/ep93xx-for-next +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (c2335e6bb075 Merge branch 'imx/dt' into for-next) +$ git merge imx-mxs/for-next +Recorded preimage for 'arch/arm/boot/dts/Makefile' +Auto-merging arch/arm/mach-imx/mach-imx6q.c +Removing arch/arm/mach-imx/devices/platform-mxc_pwm.c +Auto-merging arch/arm/mach-imx/Kconfig +Removing arch/arm/boot/dts/imx53-evk.dts +Auto-merging arch/arm/boot/dts/imx28.dtsi +Auto-merging arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi +Auto-merging arch/arm/boot/dts/imx23.dtsi +Auto-merging arch/arm/boot/dts/Makefile +CONFLICT (content): Merge conflict in arch/arm/boot/dts/Makefile +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'Documentation/devicetree/bindings/vendor-prefixes.txt'. +Recorded resolution for 'arch/arm/boot/dts/Makefile'. +[master 3830c98fb7cc] Merge remote-tracking branch 'imx-mxs/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/vendor-prefixes.txt | 3 + + arch/arm/boot/dts/Makefile | 30 +- + arch/arm/boot/dts/imx23-evk.dts | 8 +- + arch/arm/boot/dts/imx23-olinuxino.dts | 5 +- + arch/arm/boot/dts/imx23-stmp378x_devb.dts | 5 +- + arch/arm/boot/dts/imx23.dtsi | 8 +- + arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi | 73 ++ + .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 174 ++++ + arch/arm/boot/dts/imx25-pinfunc.h | 494 +++++++++++ + arch/arm/boot/dts/imx25.dtsi | 18 +- + arch/arm/boot/dts/imx27-apf27.dts | 38 + + arch/arm/boot/dts/imx27-apf27dev.dts | 149 +++- + arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts | 61 +- + arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts | 42 +- + arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 97 ++- + ...ycore-som.dts => imx27-phytec-phycore-som.dtsi} | 95 ++- + arch/arm/boot/dts/imx27-pinfunc.h | 526 ++++++++++++ + arch/arm/boot/dts/imx27.dtsi | 151 ++-- + arch/arm/boot/dts/imx28-apf28dev.dts | 29 +- + arch/arm/boot/dts/imx28-apx4devkit.dts | 5 +- + arch/arm/boot/dts/imx28-cfa10036.dts | 2 + + arch/arm/boot/dts/imx28-cfa10037.dts | 7 +- + arch/arm/boot/dts/imx28-cfa10049.dts | 31 +- + arch/arm/boot/dts/imx28-cfa10057.dts | 7 +- + arch/arm/boot/dts/imx28-cfa10058.dts | 7 +- + arch/arm/boot/dts/imx28-duckbill.dts | 121 +++ + arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts | 71 ++ + arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts | 50 ++ + arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi | 326 +++++++ + arch/arm/boot/dts/imx28-evk.dts | 24 +- + arch/arm/boot/dts/imx28-m28cu3.dts | 16 +- + arch/arm/boot/dts/imx28-m28evk.dts | 18 +- + arch/arm/boot/dts/imx28-sps1.dts | 7 +- + arch/arm/boot/dts/imx28-tx28.dts | 23 +- + arch/arm/boot/dts/imx28.dtsi | 65 +- + arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi | 81 ++ + .../boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts | 143 ++++ + arch/arm/boot/dts/imx35.dtsi | 359 ++++++++ + arch/arm/boot/dts/imx50-evk.dts | 119 +++ + arch/arm/boot/dts/imx50-pinfunc.h | 923 ++++++++++++++++++++ + arch/arm/boot/dts/imx50.dtsi | 478 +++++++++++ + arch/arm/boot/dts/imx51-apf51.dts | 40 +- + arch/arm/boot/dts/imx51-apf51dev.dts | 102 ++- + arch/arm/boot/dts/imx51-babbage.dts | 248 +++++- + arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi | 93 ++ + .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 174 ++++ + arch/arm/boot/dts/imx51.dtsi | 459 ++-------- + arch/arm/boot/dts/imx53-ard.dts | 33 +- + arch/arm/boot/dts/imx53-evk.dts | 126 --- + arch/arm/boot/dts/imx53-m53evk.dts | 233 ++++- + arch/arm/boot/dts/imx53-mba53.dts | 40 +- + arch/arm/boot/dts/imx53-qsb-common.dtsi | 336 ++++++++ + arch/arm/boot/dts/imx53-qsb.dts | 210 +---- + arch/arm/boot/dts/imx53-qsrb.dts | 158 ++++ + arch/arm/boot/dts/imx53-smd.dts | 119 ++- + arch/arm/boot/dts/imx53-tqma53.dtsi | 175 +++- + arch/arm/boot/dts/imx53-tx53-x03x.dts | 315 +++++++ + arch/arm/boot/dts/imx53-tx53-x13x.dts | 243 ++++++ + arch/arm/boot/dts/imx53-tx53.dtsi | 511 ++++++++++- + arch/arm/boot/dts/imx53-voipac-bsb.dts | 159 ++++ + arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi | 277 ++++++ + arch/arm/boot/dts/imx53.dtsi | 663 +++------------ + arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts | 23 + + arch/arm/boot/dts/imx6dl-gw51xx.dts | 19 + + arch/arm/boot/dts/imx6dl-gw52xx.dts | 19 + + arch/arm/boot/dts/imx6dl-gw53xx.dts | 19 + + arch/arm/boot/dts/imx6dl-gw54xx.dts | 19 + + arch/arm/boot/dts/imx6dl-nitrogen6x.dts | 21 + + arch/arm/boot/dts/imx6dl-pinfunc.h | 2 + + arch/arm/boot/dts/imx6dl-sabrelite.dts | 20 + + arch/arm/boot/dts/imx6dl.dtsi | 29 +- + arch/arm/boot/dts/imx6q-arm2.dts | 140 ++- + arch/arm/boot/dts/imx6q-cm-fx6.dts | 107 +++ + arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts | 23 + + arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 372 ++++++++ + arch/arm/boot/dts/imx6q-gk802.dts | 171 ++++ + arch/arm/boot/dts/imx6q-gw51xx.dts | 19 + + arch/arm/boot/dts/imx6q-gw52xx.dts | 23 + + arch/arm/boot/dts/imx6q-gw53xx.dts | 23 + + arch/arm/boot/dts/imx6q-gw5400-a.dts | 546 ++++++++++++ + arch/arm/boot/dts/imx6q-gw54xx.dts | 23 + + arch/arm/boot/dts/imx6q-nitrogen6x.dts | 25 + + arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi | 85 +- + arch/arm/boot/dts/imx6q-pinfunc.h | 2 + + arch/arm/boot/dts/imx6q-sabrelite.dts | 178 +--- + arch/arm/boot/dts/imx6q-sbc6x.dts | 58 +- + arch/arm/boot/dts/imx6q-udoo.dts | 54 +- + arch/arm/boot/dts/imx6q.dtsi | 21 +- + arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi | 199 +++++ + arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 374 ++++++++ + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 490 +++++++++++ + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 553 ++++++++++++ + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 580 +++++++++++++ + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 422 +++++++++ + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 246 +++++- + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 423 ++++++++++ + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 272 +++++- + arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 128 ++- + arch/arm/boot/dts/imx6qdl.dtsi | 938 +++------------------ + arch/arm/boot/dts/imx6sl-evk.dts | 210 ++++- + arch/arm/boot/dts/imx6sl.dtsi | 385 +++------ + arch/arm/boot/dts/vf610-cosmic.dts | 29 +- + arch/arm/boot/dts/vf610-twr.dts | 66 +- + arch/arm/boot/dts/vf610.dtsi | 207 +---- + arch/arm/configs/imx_v6_v7_defconfig | 5 + + arch/arm/mach-imx/Kconfig | 8 +- + arch/arm/mach-imx/Makefile | 6 +- + arch/arm/mach-imx/clk-imx21.c | 1 - + arch/arm/mach-imx/clk-imx25.c | 8 - + arch/arm/mach-imx/clk-imx27.c | 1 - + arch/arm/mach-imx/clk-imx51-imx53.c | 2 - + arch/arm/mach-imx/clk-imx6sl.c | 77 +- + arch/arm/mach-imx/clk-vf610.c | 36 +- + arch/arm/mach-imx/common.h | 11 +- + arch/arm/mach-imx/cpuidle-imx6q.c | 4 +- + arch/arm/mach-imx/cpuidle-imx6sl.c | 57 ++ + arch/arm/mach-imx/cpuidle.h | 5 + + arch/arm/mach-imx/devices-imx25.h | 4 - + arch/arm/mach-imx/devices-imx51.h | 4 - + arch/arm/mach-imx/devices/Kconfig | 3 - + arch/arm/mach-imx/devices/Makefile | 1 - + arch/arm/mach-imx/devices/devices-common.h | 9 - + arch/arm/mach-imx/devices/platform-mxc_pwm.c | 69 -- + arch/arm/mach-imx/hardware.h | 4 +- + arch/arm/mach-imx/mach-imx6q.c | 2 +- + arch/arm/mach-imx/mach-imx6sl.c | 6 +- + arch/arm/mach-imx/pm-imx6q.c | 327 ++++++- + arch/arm/mach-imx/suspend-imx6.S | 328 +++++++ + arch/arm/mach-mxs/mach-mxs.c | 33 + + 129 files changed, 14887 insertions(+), 3290 deletions(-) + create mode 100644 arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi + create mode 100644 arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts + create mode 100644 arch/arm/boot/dts/imx25-pinfunc.h + rename arch/arm/boot/dts/{imx27-phytec-phycore-som.dts => imx27-phytec-phycore-som.dtsi} (61%) + create mode 100644 arch/arm/boot/dts/imx27-pinfunc.h + create mode 100644 arch/arm/boot/dts/imx28-duckbill.dts + create mode 100644 arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts + create mode 100644 arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts + create mode 100644 arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi + create mode 100644 arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi + create mode 100644 arch/arm/boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts + create mode 100644 arch/arm/boot/dts/imx35.dtsi + create mode 100644 arch/arm/boot/dts/imx50-evk.dts + create mode 100644 arch/arm/boot/dts/imx50-pinfunc.h + create mode 100644 arch/arm/boot/dts/imx50.dtsi + create mode 100644 arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi + create mode 100644 arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts + delete mode 100644 arch/arm/boot/dts/imx53-evk.dts + create mode 100644 arch/arm/boot/dts/imx53-qsb-common.dtsi + create mode 100644 arch/arm/boot/dts/imx53-qsrb.dts + create mode 100644 arch/arm/boot/dts/imx53-tx53-x03x.dts + create mode 100644 arch/arm/boot/dts/imx53-tx53-x13x.dts + create mode 100644 arch/arm/boot/dts/imx53-voipac-bsb.dts + create mode 100644 arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi + create mode 100644 arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts + create mode 100644 arch/arm/boot/dts/imx6dl-gw51xx.dts + create mode 100644 arch/arm/boot/dts/imx6dl-gw52xx.dts + create mode 100644 arch/arm/boot/dts/imx6dl-gw53xx.dts + create mode 100644 arch/arm/boot/dts/imx6dl-gw54xx.dts + create mode 100644 arch/arm/boot/dts/imx6dl-nitrogen6x.dts + create mode 100644 arch/arm/boot/dts/imx6dl-sabrelite.dts + create mode 100644 arch/arm/boot/dts/imx6q-cm-fx6.dts + create mode 100644 arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts + create mode 100644 arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts + create mode 100644 arch/arm/boot/dts/imx6q-gk802.dts + create mode 100644 arch/arm/boot/dts/imx6q-gw51xx.dts + create mode 100644 arch/arm/boot/dts/imx6q-gw52xx.dts + create mode 100644 arch/arm/boot/dts/imx6q-gw53xx.dts + create mode 100644 arch/arm/boot/dts/imx6q-gw5400-a.dts + create mode 100644 arch/arm/boot/dts/imx6q-gw54xx.dts + create mode 100644 arch/arm/boot/dts/imx6q-nitrogen6x.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-gw51xx.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-gw52xx.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-gw53xx.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-gw54xx.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-sabrelite.dtsi + create mode 100644 arch/arm/mach-imx/cpuidle-imx6sl.c + delete mode 100644 arch/arm/mach-imx/devices/platform-mxc_pwm.c + create mode 100644 arch/arm/mach-imx/suspend-imx6.S +Merging ixp4xx/next (19f949f52599 Linux 3.8) +$ git merge ixp4xx/next +Already up-to-date. +Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix) +$ git merge msm/for-next +Already up-to-date. +Merging mvebu/for-next (a76f86614bab Merge branch 'mvebu/dt' into for-next) +$ git merge mvebu/for-next +Auto-merging drivers/irqchip/Makefile +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../interrupt-controller/marvell,dove-pmu-intc.txt | 17 ++ + arch/arm/boot/dts/Makefile | 7 +- + arch/arm/boot/dts/armada-xp-mv78260.dtsi | 3 +- + arch/arm/boot/dts/kirkwood-b3.dts | 204 +++++++++++++++++++++ + arch/arm/boot/dts/kirkwood-ts419-6281.dts | 20 ++ + arch/arm/boot/dts/kirkwood-ts419-6282.dts | 32 ++++ + arch/arm/boot/dts/kirkwood-ts419.dtsi | 75 ++++++++ + arch/arm/mach-kirkwood/pm.c | 4 +- + arch/arm/mach-mvebu/mvebu-soc-id.c | 2 +- + arch/arm/plat-orion/irq.c | 47 +++++ + drivers/irqchip/Makefile | 1 + + drivers/irqchip/irq-dove.c | 126 +++++++++++++ + 12 files changed, 532 insertions(+), 6 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/marvell,dove-pmu-intc.txt + create mode 100644 arch/arm/boot/dts/kirkwood-b3.dts + create mode 100644 arch/arm/boot/dts/kirkwood-ts419-6281.dts + create mode 100644 arch/arm/boot/dts/kirkwood-ts419-6282.dts + create mode 100644 arch/arm/boot/dts/kirkwood-ts419.dtsi + create mode 100644 drivers/irqchip/irq-dove.c +Merging renesas/next (88c499f14016 Merge branch 'heads/dt-fixes' into next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/r8a7790.dtsi | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +Merging samsung/for-next (8109c477487a Merge branch 'v3.14-next/dt-exynos-3' into for-next) +$ git merge samsung/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging tegra/for-next (95e770a5ad96 Merge branch for-3.14/defconfig into for-next) +$ git merge tegra/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (883c05736701 arm64: fix typo in entry.S) +$ git merge arm64/for-next/core +Already up-to-date. +Merging blackfin/for-linus (d8ec26d7f828 Linux 3.13) +$ git merge blackfin/for-linus +Already up-to-date. +Merging c6x/for-linux-next (546153d75a48 c6x: fix build failure caused by cache.h) +$ git merge c6x/for-linux-next +Merge made by the 'recursive' strategy. + arch/c6x/include/asm/cache.h | 1 + + 1 file changed, 1 insertion(+) +Merging cris/for-next (cd065a010a97 CRISv10: Readd missing header) +$ git merge cris/for-next +Already up-to-date. +Merging hexagon/linux-next (de44443a45e3 HEXAGON: Remove non existent reference to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD) +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (d52eefb47d4e ia64/xen: Remove Xen support for ia64) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (56931d73697c m68k/mac: Make SCC reset work more reliably) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (a695b9c8911e m68k : Kill CONFIG_MTD_PARTITIONS) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/configs/m5208evb_defconfig | 1 - + arch/m68k/configs/m5249evb_defconfig | 1 - + arch/m68k/configs/m5272c3_defconfig | 1 - + arch/m68k/configs/m5275evb_defconfig | 1 - + arch/m68k/configs/m5307c3_defconfig | 1 - + arch/m68k/configs/m5407c3_defconfig | 1 - + 6 files changed, 6 deletions(-) +Merging metag/for-next (e9a1d0165bbd metag/smp: Make boot_secondary() static) +$ git merge metag/for-next +Already up-to-date. +Merging microblaze/next (c0d68cea2db3 microblaze: Add missing v8.50.a version) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (b26a21c1eacd mips: select ARCH_MIGHT_HAVE_PC_SERIO) +$ git merge mips/mips-for-linux-next +Resolved 'arch/mips/Kconfig' using previous resolution. +Resolved 'arch/mips/bcm47xx/setup.c' using previous resolution. +Resolved 'arch/mips/include/asm/vpe.h' using previous resolution. +Resolved 'arch/mips/kernel/vpe.c' using previous resolution. +Resolved 'arch/mips/netlogic/xlp/setup.c' using previous resolution. +Auto-merging arch/mips/netlogic/xlr/setup.c +Auto-merging arch/mips/netlogic/xlp/setup.c +CONFLICT (content): Merge conflict in arch/mips/netlogic/xlp/setup.c +Removing arch/mips/mti-malta/malta-console.c +Auto-merging arch/mips/mm/c-r4k.c +Auto-merging arch/mips/kernel/vpe.c +CONFLICT (content): Merge conflict in arch/mips/kernel/vpe.c +Auto-merging arch/mips/include/asm/vpe.h +CONFLICT (content): Merge conflict in arch/mips/include/asm/vpe.h +Removing arch/mips/bcm47xx/wgt634u.c +Auto-merging arch/mips/bcm47xx/setup.c +CONFLICT (content): Merge conflict in arch/mips/bcm47xx/setup.c +Auto-merging arch/mips/Makefile +Auto-merging arch/mips/Kconfig +CONFLICT (content): Merge conflict in arch/mips/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2423521b7488] Merge remote-tracking branch 'mips/mips-for-linux-next' +$ git diff -M --stat --summary HEAD^.. + arch/mips/Kconfig | 221 ++++-- + arch/mips/Makefile | 2 +- + arch/mips/alchemy/common/power.c | 1 - + arch/mips/ar7/time.c | 1 - + arch/mips/ath79/common.h | 1 - + arch/mips/bcm47xx/Kconfig | 4 + + arch/mips/bcm47xx/Makefile | 3 +- + arch/mips/bcm47xx/bcm47xx_private.h | 12 + + arch/mips/bcm47xx/board.c | 34 +- + arch/mips/bcm47xx/buttons.c | 531 +++++++++++++ + arch/mips/bcm47xx/irq.c | 25 +- + arch/mips/bcm47xx/leds.c | 542 +++++++++++++ + arch/mips/bcm47xx/nvram.c | 3 +- + arch/mips/bcm47xx/prom.c | 127 +-- + arch/mips/bcm47xx/serial.c | 6 +- + arch/mips/bcm47xx/setup.c | 35 + + arch/mips/bcm47xx/sprom.c | 18 +- + arch/mips/bcm47xx/wgt634u.c | 174 ---- + arch/mips/bcm63xx/Kconfig | 8 + + arch/mips/bcm63xx/Makefile | 4 +- + arch/mips/bcm63xx/boards/board_bcm963xx.c | 3 + + arch/mips/bcm63xx/clk.c | 42 + + arch/mips/bcm63xx/cpu.c | 6 +- + arch/mips/bcm63xx/dev-hsspi.c | 47 ++ + arch/mips/bcm63xx/early_printk.c | 3 +- + arch/mips/bcm63xx/prom.c | 14 +- + arch/mips/boot/compressed/Makefile | 4 +- + arch/mips/boot/compressed/dbg.c | 1 - + arch/mips/boot/compressed/decompress.c | 22 - + arch/mips/boot/compressed/string.c | 28 + + arch/mips/boot/compressed/uart-16550.c | 5 +- + arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c | 1 + + .../cavium-octeon/executive/cvmx-helper-board.c | 27 + + .../cavium-octeon/executive/cvmx-helper-util.c | 4 + + arch/mips/cavium-octeon/executive/cvmx-helper.c | 10 +- + arch/mips/cavium-octeon/executive/cvmx-pko.c | 3 +- + arch/mips/cavium-octeon/executive/cvmx-spi.c | 1 + + arch/mips/cavium-octeon/octeon-platform.c | 38 +- + arch/mips/cavium-octeon/octeon_3xxx.dts | 19 + + arch/mips/cavium-octeon/smp.c | 1 - + arch/mips/configs/ar7_defconfig | 1 - + arch/mips/configs/bcm47xx_defconfig | 623 +-------------- + arch/mips/configs/bcm63xx_defconfig | 1 - + arch/mips/configs/cobalt_defconfig | 1 - + arch/mips/configs/gpr_defconfig | 1 - + arch/mips/configs/jmr3927_defconfig | 1 - + arch/mips/configs/lasat_defconfig | 1 - + arch/mips/configs/maltasmvp_defconfig | 3 +- + arch/mips/configs/markeins_defconfig | 1 - + arch/mips/configs/mtx1_defconfig | 1 - + arch/mips/configs/pnx8335_stb225_defconfig | 1 - + arch/mips/configs/qi_lb60_defconfig | 188 +++++ + arch/mips/configs/rb532_defconfig | 1 - + arch/mips/configs/rbtx49xx_defconfig | 1 - + arch/mips/fw/arc/file.c | 1 - + arch/mips/include/asm/amon.h | 15 +- + arch/mips/include/asm/asmmacro-32.h | 42 - + arch/mips/include/asm/asmmacro-64.h | 96 --- + arch/mips/include/asm/asmmacro.h | 107 +++ + arch/mips/include/asm/bmips.h | 29 +- + arch/mips/include/asm/cpu-features.h | 7 + + arch/mips/include/asm/cpu-info.h | 3 + + arch/mips/include/asm/cpu-type.h | 15 +- + arch/mips/include/asm/cpu.h | 12 +- + arch/mips/include/asm/dma-coherence.h | 9 + + arch/mips/include/asm/elf.h | 31 +- + arch/mips/include/asm/fpu.h | 104 ++- + arch/mips/include/asm/highmem.h | 1 - + arch/mips/include/asm/kvm_host.h | 7 - + arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 1 - + arch/mips/include/asm/mach-bcm47xx/bcm47xx.h | 2 + + arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h | 1 + + .../asm/mach-bcm47xx/cpu-feature-overrides.h | 82 ++ + arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 18 + + .../include/asm/mach-bcm63xx/bcm63xx_dev_hsspi.h | 8 + + arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 120 --- + arch/mips/include/asm/mach-generic/dma-coherence.h | 4 - + arch/mips/include/asm/mach-generic/floppy.h | 1 - + arch/mips/include/asm/mach-generic/ide.h | 6 +- + arch/mips/include/asm/mach-jazz/floppy.h | 1 - + arch/mips/include/asm/mach-jz4740/platform.h | 1 + + arch/mips/include/asm/mach-netlogic/irq.h | 3 +- + arch/mips/include/asm/mach-netlogic/multi-node.h | 33 +- + arch/mips/include/asm/mach-netlogic/topology.h | 20 + + arch/mips/include/asm/mips-boards/piix4.h | 7 + + arch/mips/include/asm/mipsregs.h | 85 +- + arch/mips/include/asm/netlogic/common.h | 24 +- + arch/mips/include/asm/netlogic/mips-extns.h | 7 +- + arch/mips/include/asm/netlogic/xlp-hal/bridge.h | 69 +- + arch/mips/include/asm/netlogic/xlp-hal/iomap.h | 48 +- + arch/mips/include/asm/netlogic/xlp-hal/pcibus.h | 41 +- + arch/mips/include/asm/netlogic/xlp-hal/pic.h | 77 +- + arch/mips/include/asm/netlogic/xlp-hal/sys.h | 18 +- + arch/mips/include/asm/netlogic/xlp-hal/uart.h | 3 +- + arch/mips/include/asm/netlogic/xlp-hal/xlp.h | 38 +- + arch/mips/include/asm/netlogic/xlr/xlr.h | 5 - + arch/mips/include/asm/octeon/cvmx-helper-board.h | 9 + + arch/mips/include/asm/page.h | 25 + + arch/mips/include/asm/rtlx.h | 49 +- + arch/mips/include/asm/switch_to.h | 16 +- + arch/mips/include/asm/syscall.h | 2 +- + arch/mips/include/asm/thread_info.h | 4 +- + arch/mips/include/asm/tlb.h | 4 + + arch/mips/include/asm/vpe.h | 131 ++- + arch/mips/include/uapi/asm/inst.h | 7 +- + arch/mips/jz4740/board-qi_lb60.c | 1 + + arch/mips/jz4740/platform.c | 41 +- + arch/mips/kernel/Makefile | 5 + + arch/mips/kernel/binfmt_elfo32.c | 14 + + arch/mips/kernel/bmips_vec.S | 56 +- + arch/mips/kernel/cpu-probe.c | 103 ++- + arch/mips/kernel/crash.c | 1 - + arch/mips/kernel/genex.S | 1 + + arch/mips/kernel/idle.c | 2 + + arch/mips/kernel/proc.c | 48 +- + arch/mips/kernel/process.c | 6 +- + arch/mips/kernel/ptrace.c | 60 +- + arch/mips/kernel/ptrace32.c | 53 +- + arch/mips/kernel/r4k_fpu.S | 74 +- + arch/mips/kernel/r4k_switch.S | 45 +- + arch/mips/kernel/rtlx-cmp.c | 116 +++ + arch/mips/kernel/rtlx-mt.c | 148 ++++ + arch/mips/kernel/rtlx.c | 273 ++----- + arch/mips/kernel/segment.c | 110 +++ + arch/mips/kernel/signal.c | 10 +- + arch/mips/kernel/signal32.c | 10 +- + arch/mips/kernel/smp-bmips.c | 312 +++++--- + arch/mips/kernel/smp-cmp.c | 3 + + arch/mips/kernel/smp-mt.c | 28 + + arch/mips/kernel/spram.c | 3 +- + arch/mips/kernel/sync-r4k.c | 1 - + arch/mips/kernel/traps.c | 71 +- + arch/mips/kernel/vpe-cmp.c | 180 +++++ + arch/mips/kernel/vpe-mt.c | 523 ++++++++++++ + arch/mips/kernel/vpe.c | 882 +++------------------ + arch/mips/kvm/kvm_mips.c | 1 - + arch/mips/kvm/kvm_tlb.c | 135 +--- + arch/mips/lantiq/xway/clk.c | 1 - + arch/mips/lantiq/xway/dma.c | 4 - + arch/mips/lasat/at93c.c | 1 - + arch/mips/lasat/picvue.c | 1 - + arch/mips/lib/uncached.c | 1 - + arch/mips/loongson/lemote-2f/clock.c | 1 - + arch/mips/math-emu/cp1emu.c | 42 +- + arch/mips/math-emu/kernel_linkage.c | 6 +- + arch/mips/mm/c-octeon.c | 1 - + arch/mips/mm/c-r3k.c | 1 - + arch/mips/mm/c-r4k.c | 26 +- + arch/mips/mm/cache.c | 1 - + arch/mips/mm/cex-sb1.S | 1 - + arch/mips/mm/dma-default.c | 2 + + arch/mips/mm/hugetlbpage.c | 1 - + arch/mips/mm/init.c | 2 - + arch/mips/mm/page.c | 1 - + arch/mips/mm/sc-mips.c | 2 + + arch/mips/mm/sc-rm7k.c | 1 - + arch/mips/mm/tlb-r3k.c | 1 - + arch/mips/mm/tlb-r4k.c | 48 +- + arch/mips/mm/tlb-r8k.c | 1 - + arch/mips/mm/tlbex.c | 2 +- + arch/mips/mm/uasm-micromips.c | 1 - + arch/mips/mm/uasm-mips.c | 1 - + arch/mips/mti-malta/Makefile | 2 - + arch/mips/mti-malta/malta-amon.c | 49 +- + arch/mips/mti-malta/malta-console.c | 47 -- + arch/mips/mti-malta/malta-init.c | 58 +- + arch/mips/mti-malta/malta-int.c | 127 +-- + arch/mips/mti-malta/malta-platform.c | 2 + + arch/mips/mti-malta/malta-time.c | 16 +- + arch/mips/mti-sead3/Makefile | 2 + + arch/mips/mti-sead3/sead3-pic32-bus.c | 1 - + arch/mips/mti-sead3/sead3-setup.c | 84 +- + arch/mips/mti-sead3/sead3-time.c | 4 - + arch/mips/mti-sead3/sead3.dts | 4 - + arch/mips/netlogic/Kconfig | 9 + + arch/mips/netlogic/common/earlycons.c | 2 + + arch/mips/netlogic/common/irq.c | 72 +- + arch/mips/netlogic/common/reset.S | 63 +- + arch/mips/netlogic/common/smp.c | 8 +- + arch/mips/netlogic/common/smpboot.S | 4 +- + arch/mips/netlogic/dts/Makefile | 1 + + arch/mips/netlogic/dts/xlp_gvp.dts | 76 ++ + arch/mips/netlogic/xlp/dt.c | 7 +- + arch/mips/netlogic/xlp/nlm_hal.c | 71 +- + arch/mips/netlogic/xlp/setup.c | 25 +- + arch/mips/netlogic/xlp/usb-init-xlp2.c | 88 +- + arch/mips/netlogic/xlp/wakeup.c | 92 ++- + arch/mips/netlogic/xlr/platform.c | 4 +- + arch/mips/netlogic/xlr/setup.c | 20 - + arch/mips/netlogic/xlr/wakeup.c | 3 +- + arch/mips/oprofile/common.c | 2 + + arch/mips/oprofile/op_model_mipsxx.c | 8 + + arch/mips/pci/Makefile | 1 + + arch/mips/pci/fixup-malta.c | 11 + + arch/mips/pci/fixup-rc32434.c | 1 - + arch/mips/pci/fixup-sb1250.c | 1 - + arch/mips/pci/msi-xlp.c | 494 ++++++++++++ + arch/mips/pci/ops-bcm63xx.c | 1 - + arch/mips/pci/ops-bonito64.c | 1 - + arch/mips/pci/ops-lantiq.c | 1 - + arch/mips/pci/ops-loongson2.c | 1 - + arch/mips/pci/ops-mace.c | 1 - + arch/mips/pci/ops-msc.c | 1 - + arch/mips/pci/ops-nile4.c | 1 - + arch/mips/pci/ops-rc32434.c | 1 - + arch/mips/pci/pci-ip27.c | 1 - + arch/mips/pci/pci-malta.c | 6 +- + arch/mips/pci/pci-rt3883.c | 3 - + arch/mips/pci/pci-xlp.c | 110 ++- + arch/mips/pmcs-msp71xx/Kconfig | 1 + + arch/mips/ralink/Kconfig | 1 + + arch/mips/sgi-ip27/ip27-console.c | 1 - + arch/mips/sgi-ip27/ip27-irq-pci.c | 1 - + arch/mips/sgi-ip27/ip27-klconfig.c | 1 - + arch/mips/sgi-ip27/ip27-xtalk.c | 1 - + drivers/bcma/Kconfig | 1 + + drivers/bcma/driver_gpio.c | 137 +++- + drivers/ssb/Kconfig | 1 + + drivers/ssb/driver_gpio.c | 306 ++++++- + drivers/ssb/main.c | 12 +- + drivers/tty/serial/bcm63xx_uart.c | 9 +- + include/linux/bcma/bcma_driver_chipcommon.h | 1 + + include/linux/serial_bcm63xx.h | 119 +++ + include/linux/ssb/ssb.h | 1 + + 224 files changed, 6635 insertions(+), 3316 deletions(-) + create mode 100644 arch/mips/bcm47xx/bcm47xx_private.h + create mode 100644 arch/mips/bcm47xx/buttons.c + create mode 100644 arch/mips/bcm47xx/leds.c + delete mode 100644 arch/mips/bcm47xx/wgt634u.c + create mode 100644 arch/mips/bcm63xx/dev-hsspi.c + create mode 100644 arch/mips/boot/compressed/string.c + create mode 100644 arch/mips/configs/qi_lb60_defconfig + create mode 100644 arch/mips/include/asm/mach-bcm47xx/cpu-feature-overrides.h + create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_hsspi.h + create mode 100644 arch/mips/include/asm/mach-netlogic/topology.h + create mode 100644 arch/mips/kernel/rtlx-cmp.c + create mode 100644 arch/mips/kernel/rtlx-mt.c + create mode 100644 arch/mips/kernel/segment.c + create mode 100644 arch/mips/kernel/vpe-cmp.c + create mode 100644 arch/mips/kernel/vpe-mt.c + delete mode 100644 arch/mips/mti-malta/malta-console.c + create mode 100644 arch/mips/netlogic/dts/xlp_gvp.dts + create mode 100644 arch/mips/pci/msi-xlp.c + create mode 100644 include/linux/serial_bcm63xx.h +Merging openrisc/for-upstream (548dafe880ad openrisc: Use get_signal() signal_setup_done()) +$ git merge openrisc/for-upstream +Merge made by the 'recursive' strategy. + arch/openrisc/kernel/entry.S | 59 ++++++----- + arch/openrisc/kernel/signal.c | 233 +++++++++++++++++++++--------------------- + 2 files changed, 149 insertions(+), 143 deletions(-) +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 (7d1c153ab373 Merge branch 'parisc-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc/next (7179ba52889b powerpc: Implement arch_spin_is_locked() using arch_spin_value_unlocked()) +$ git merge powerpc/next +Already up-to-date. +Merging mpc5xxx/next (bc7505942233 powerpc/512x: dts: add MPC5125 clock specs) +$ git merge mpc5xxx/next +Resolved 'drivers/spi/spi-mpc512x-psc.c' using previous resolution. +Auto-merging include/linux/clk-provider.h +Auto-merging drivers/spi/spi-mpc512x-psc.c +CONFLICT (content): Merge conflict in drivers/spi/spi-mpc512x-psc.c +Auto-merging drivers/net/can/mscan/mpc5xxx_can.c +Removing arch/powerpc/platforms/512x/clock.c +Removing arch/powerpc/kernel/clock.c +Removing arch/powerpc/include/asm/clk_interface.h +Auto-merging arch/powerpc/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master de68278adcf3] Merge remote-tracking branch 'mpc5xxx/next' +$ git diff -M --stat --summary HEAD^.. + arch/powerpc/Kconfig | 5 - + arch/powerpc/boot/dts/ac14xx.dts | 7 + + arch/powerpc/boot/dts/mpc5121.dtsi | 113 ++- + arch/powerpc/boot/dts/mpc5125twr.dts | 53 +- + arch/powerpc/include/asm/clk_interface.h | 20 - + arch/powerpc/include/asm/mpc5121.h | 7 +- + arch/powerpc/kernel/Makefile | 1 - + arch/powerpc/kernel/clock.c | 82 -- + arch/powerpc/platforms/512x/Kconfig | 2 +- + arch/powerpc/platforms/512x/Makefile | 3 +- + arch/powerpc/platforms/512x/clock-commonclk.c | 1221 +++++++++++++++++++++++++ + arch/powerpc/platforms/512x/clock.c | 754 --------------- + arch/powerpc/platforms/512x/mpc512x_shared.c | 169 ++-- + arch/powerpc/platforms/52xx/Kconfig | 2 +- + drivers/media/platform/fsl-viu.c | 2 +- + drivers/mtd/nand/mpc5121_nfc.c | 2 +- + drivers/net/can/mscan/mpc5xxx_can.c | 270 +++--- + drivers/spi/spi-mpc512x-psc.c | 26 +- + drivers/tty/serial/mpc52xx_uart.c | 90 +- + drivers/usb/host/fsl-mph-dr-of.c | 13 +- + include/dt-bindings/clock/mpc512x-clock.h | 76 ++ + include/linux/clk-provider.h | 16 + + 22 files changed, 1840 insertions(+), 1094 deletions(-) + delete mode 100644 arch/powerpc/include/asm/clk_interface.h + delete mode 100644 arch/powerpc/kernel/clock.c + create mode 100644 arch/powerpc/platforms/512x/clock-commonclk.c + delete mode 100644 arch/powerpc/platforms/512x/clock.c + create mode 100644 include/dt-bindings/clock/mpc512x-clock.h +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 (07be03820970 s390/hypfs: add interface for diagnose 0x304) +$ git merge s390/features +Already up-to-date. +Merging sparc-next/master (049ffa8ab33a Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (5e01dc7b26d9 Linux 3.12) +$ git merge tile/master +Already up-to-date. +Merging uml/next (989e59fa41c5 um: Include generic barrier.h) +$ git merge uml/next +Resolved 'arch/um/include/asm/Kbuild' using previous resolution. +Removing arch/x86/um/shared/sysdep/skas_ptrace.h +Removing arch/um/sys-ppc/shared/sysdep/skas_ptrace.h +Removing arch/um/sys-ia64/sysdep/skas_ptrace.h +Removing arch/um/include/shared/skas_ptrace.h +Removing arch/um/include/shared/skas/proc_mm.h +Auto-merging arch/um/include/asm/Kbuild +CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master acf534063637] 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 (9ed82c6866e2 xtensa: implement ndelay) +$ git merge xtensa/for_next +Already up-to-date. +Merging btrfs/next (56817eda3c10 Btrfs: introduce the delayed inode ref deletion for the single link inode) +$ git merge btrfs/next +Recorded preimage for 'fs/btrfs/acl.c' +Auto-merging lib/kobject.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/ctree.h +Auto-merging fs/btrfs/acl.c +CONFLICT (content): Merge conflict in fs/btrfs/acl.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/btrfs/acl.c'. +[master b2b5418f05cb] Merge remote-tracking branch 'btrfs/next' +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/backref.c | 63 ++--- + fs/btrfs/btrfs_inode.h | 3 + + fs/btrfs/check-integrity.c | 12 +- + fs/btrfs/compression.c | 12 +- + fs/btrfs/ctree.c | 482 +++++++++++++++++++++++++-------- + fs/btrfs/ctree.h | 55 +++- + fs/btrfs/delayed-inode.c | 208 +++++++++------ + fs/btrfs/delayed-inode.h | 8 +- + fs/btrfs/delayed-ref.c | 133 ++++++---- + fs/btrfs/delayed-ref.h | 5 + + fs/btrfs/dev-replace.c | 56 ++-- + fs/btrfs/dir-item.c | 8 +- + fs/btrfs/disk-io.c | 144 +++++----- + fs/btrfs/extent-tree.c | 120 +++++++-- + fs/btrfs/extent_io.c | 228 +++++++++------- + fs/btrfs/extent_io.h | 9 +- + fs/btrfs/extent_map.c | 74 +++--- + fs/btrfs/file-item.c | 4 +- + fs/btrfs/file.c | 156 +++++++---- + fs/btrfs/free-space-cache.c | 23 +- + fs/btrfs/inode-item.c | 65 ----- + fs/btrfs/inode.c | 270 ++++++++++++++----- + fs/btrfs/ioctl.c | 248 +++++++++++++++-- + fs/btrfs/lzo.c | 6 +- + fs/btrfs/ordered-data.c | 15 +- + fs/btrfs/orphan.c | 20 -- + fs/btrfs/print-tree.c | 4 +- + fs/btrfs/qgroup.c | 39 ++- + fs/btrfs/reada.c | 9 +- + fs/btrfs/relocation.c | 83 +++--- + fs/btrfs/root-tree.c | 19 +- + fs/btrfs/scrub.c | 126 ++++----- + fs/btrfs/send.c | 319 +++++++++++++++------- + fs/btrfs/struct-funcs.c | 4 +- + fs/btrfs/super.c | 104 ++++---- + fs/btrfs/sysfs.c | 617 +++++++++++++++++++++++++++++++++++++++++++ + fs/btrfs/sysfs.h | 64 +++++ + fs/btrfs/tests/btrfs-tests.h | 2 +- + fs/btrfs/transaction.c | 21 +- + fs/btrfs/transaction.h | 2 - + fs/btrfs/tree-log.c | 175 +++++++++++- + fs/btrfs/uuid-tree.c | 13 +- + fs/btrfs/volumes.c | 89 +++---- + fs/btrfs/zlib.c | 8 +- + include/trace/events/btrfs.h | 23 +- + include/uapi/linux/btrfs.h | 13 + + lib/kobject.c | 1 + + 47 files changed, 2958 insertions(+), 1204 deletions(-) + create mode 100644 fs/btrfs/sysfs.h +Merging ceph/master (125d725c9235 ceph: cast PAGE_SIZE to size_t in ceph_sync_write()) +$ git merge ceph/master +Already up-to-date. +Merging cifs/for-next (d81b8a40e2ec CIFS: Cleanup cifs open codepath) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifsacl.c | 40 +++++-- + fs/cifs/cifsglob.h | 8 +- + fs/cifs/cifsproto.h | 22 ++-- + fs/cifs/cifssmb.c | 158 ++++++++++++++----------- + fs/cifs/dir.c | 59 +++++----- + fs/cifs/file.c | 2 +- + fs/cifs/inode.c | 178 ++++++++++++++++------------- + fs/cifs/link.c | 323 +++++++++++++++++++++++++--------------------------- + fs/cifs/readdir.c | 2 +- + fs/cifs/smb1ops.c | 126 ++++++++++++++------ + 10 files changed, 517 insertions(+), 401 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 (4ea7772f828a udf: Fix lockdep warning from udf_symlink()) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (d7092ae2973f ext4: delete "set but not used" variables) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (bf39c00a9a7f f2fs: drop obsolete node page when it is truncated) +$ git merge f2fs/dev +Already up-to-date. +Merging fscache/fscache (7c604e5d6e56 FS-Cache: Fix handling of an attempt to store a page that is now beyond EOF) +$ git merge fscache/fscache +Merge made by the 'recursive' strategy. + fs/fscache/page.c | 37 ++++++++++++++++++++++++++++++++++++- + 1 file changed, 36 insertions(+), 1 deletion(-) +Merging fuse/for-next (b2ec2778df9d fuse: Turn writeback cache on) +$ git merge fuse/for-next +Auto-merging fs/fuse/file.c +Merge made by the 'recursive' strategy. + fs/fuse/cuse.c | 5 +- + fs/fuse/dir.c | 119 +++++++++++++++++---- + fs/fuse/file.c | 257 ++++++++++++++++++++++++++++++++++++---------- + fs/fuse/fuse_i.h | 22 +++- + fs/fuse/inode.c | 29 ++++-- + include/uapi/linux/fuse.h | 5 + + 6 files changed, 355 insertions(+), 82 deletions(-) +Merging gfs2/master (d57b9c9a999a GFS2: revert "GFS2: d_splice_alias() can't return error") +$ git merge gfs2/master +Already up-to-date. +Merging jfs/jfs-next (0439e091e3b1 jfs: fix xattr value size overflow in __jfs_setxattr) +$ git merge jfs/jfs-next +Auto-merging fs/jfs/xattr.c +Merge made by the 'recursive' strategy. + fs/jfs/xattr.c | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) +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 (4db72b40fdbc nfs: add memory barriers around NFS_INO_INVALID_DATA and NFS_INO_INVALIDATING) +$ git merge nfs/linux-next +Auto-merging include/linux/nfs_fs.h +Auto-merging fs/nfs/inode.c +Merge made by the 'recursive' strategy. + fs/nfs/dir.c | 13 +++++++++-- + fs/nfs/inode.c | 51 +++++++++++++++++++++++++++++++++++------- + fs/nfs/nfs4client.c | 5 +---- + fs/nfs/nfs4proc.c | 7 +++--- + fs/nfs/nfstrace.h | 1 + + fs/nfs/write.c | 7 +++++- + include/linux/nfs_fs.h | 1 + + net/sunrpc/auth_gss/auth_gss.c | 8 +------ + 8 files changed, 67 insertions(+), 26 deletions(-) +Merging nfsd/nfsd-next (ed47b062ce95 nfsd: consider CLAIM_FH when handing out delegation) +$ git merge nfsd/nfsd-next +Recorded preimage for 'fs/nfsd/nfs4acl.c' +Auto-merging net/sunrpc/xprtsock.c +Auto-merging net/sunrpc/netns.h +Auto-merging net/sunrpc/cache.c +Auto-merging fs/nfsd/vfs.h +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/nfsd/nfs4proc.c +Auto-merging fs/nfsd/nfs4acl.c +CONFLICT (content): Merge conflict in fs/nfsd/nfs4acl.c +Auto-merging fs/nfsd/acl.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/nfsd/nfs4acl.c'. +[master 000724163c30] Merge remote-tracking branch 'nfsd/nfsd-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/nfs/nfs41-server.txt | 42 ++---- + fs/nfsd/acl.h | 2 +- + fs/nfsd/cache.h | 8 -- + fs/nfsd/idmap.h | 4 +- + fs/nfsd/netns.h | 1 + + fs/nfsd/nfs3xdr.c | 14 +- + fs/nfsd/nfs4acl.c | 20 ++- + fs/nfsd/nfs4idmap.c | 50 ++++--- + fs/nfsd/nfs4proc.c | 57 ++++---- + fs/nfsd/nfs4state.c | 40 +++--- + fs/nfsd/nfs4xdr.c | 178 +++++++++---------------- + fs/nfsd/nfscache.c | 36 +---- + fs/nfsd/nfssvc.c | 30 ++++- + fs/nfsd/nfsxdr.c | 2 +- + fs/nfsd/vfs.c | 40 +----- + fs/nfsd/vfs.h | 2 - + fs/nfsd/xdr3.h | 3 + + fs/nfsd/xdr4.h | 4 +- + include/linux/sunrpc/svc.h | 6 +- + net/sunrpc/auth_gss/gss_krb5_keys.c | 17 +-- + net/sunrpc/auth_gss/gss_rpc_upcall.c | 2 - + net/sunrpc/auth_gss/svcauth_gss.c | 82 +++--------- + net/sunrpc/cache.c | 4 +- + net/sunrpc/netns.h | 1 - + net/sunrpc/svc.c | 25 ++-- + net/sunrpc/xprtsock.c | 7 +- + 26 files changed, 284 insertions(+), 393 deletions(-) +Merging omfs/for-next (976d167615b6 Linux 3.1-rc9) +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master (6d565409503f Squashfs: fix failure to unlock pages on decompress error) +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next (98009cb25d6b 9p: update documentation) +$ git merge v9fs/for-next +Merge made by the 'recursive' strategy. +Merging ubifs/linux-next (c23e9b75ccd0 UBIFS: remove invalid warn msg with tst_recovery enabled) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (7c71ee78031c xfs: allow logical-sector sized O_DIRECT) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + fs/xfs/xfs_buf.c | 14 +++++++++----- + fs/xfs/xfs_buf.h | 20 +++++++++++++++++--- + fs/xfs/xfs_file.c | 7 +++++-- + fs/xfs/xfs_ioctl.c | 2 +- + 4 files changed, 32 insertions(+), 11 deletions(-) +Merging vfs/for-next (27ac0ffeac80 locks: break delegations on any attribute modification) +$ git merge vfs/for-next +Already up-to-date. +Merging pci/next (cef09b808e58 Merge branch 'eisa' into next) +$ git merge pci/next +Already up-to-date. +Merging hid/for-next (fd7e37af337b Merge branch 'for-3.14/sony' into for-next) +$ git merge hid/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging i2c/i2c/for-next (6ff4b1051632 i2c: rcar: fix NACK error code) +$ git merge i2c/i2c/for-next +Auto-merging drivers/i2c/i2c-core.c +Merge made by the 'recursive' strategy. + Documentation/i2c/busses/i2c-piix4 | 2 +- + drivers/i2c/algos/i2c-algo-bit.c | 1 - + drivers/i2c/algos/i2c-algo-pca.c | 1 - + drivers/i2c/algos/i2c-algo-pcf.c | 1 - + drivers/i2c/busses/Kconfig | 1 + + drivers/i2c/busses/i2c-acorn.c | 2 +- + drivers/i2c/busses/i2c-ali1535.c | 1 - + drivers/i2c/busses/i2c-ali1563.c | 1 - + drivers/i2c/busses/i2c-ali15x3.c | 1 - + drivers/i2c/busses/i2c-amd756.c | 1 - + drivers/i2c/busses/i2c-amd8111.c | 1 - + drivers/i2c/busses/i2c-au1550.c | 1 - + drivers/i2c/busses/i2c-cbus-gpio.c | 1 - + drivers/i2c/busses/i2c-cpm.c | 1 - + drivers/i2c/busses/i2c-eg20t.c | 1 - + drivers/i2c/busses/i2c-exynos5.c | 1 - + drivers/i2c/busses/i2c-highlander.c | 1 - + drivers/i2c/busses/i2c-hydra.c | 1 - + drivers/i2c/busses/i2c-ibm_iic.c | 1 - + drivers/i2c/busses/i2c-iop3xx.c | 1 - + drivers/i2c/busses/i2c-isch.c | 1 - + drivers/i2c/busses/i2c-ismt.c | 1 - + drivers/i2c/busses/i2c-mpc.c | 1 - + drivers/i2c/busses/i2c-nforce2.c | 1 - + drivers/i2c/busses/i2c-ocores.c | 1 - + drivers/i2c/busses/i2c-octeon.c | 1 - + drivers/i2c/busses/i2c-pca-platform.c | 1 - + drivers/i2c/busses/i2c-piix4.c | 44 +++++++++++++++++++++--------- + drivers/i2c/busses/i2c-pmcmsp.c | 1 - + drivers/i2c/busses/i2c-powermac.c | 1 - + drivers/i2c/busses/i2c-puv3.c | 1 - + drivers/i2c/busses/i2c-rcar.c | 22 +++++++-------- + drivers/i2c/busses/i2c-scmi.c | 1 - + drivers/i2c/busses/i2c-sh7760.c | 1 - + drivers/i2c/busses/i2c-simtec.c | 1 - + drivers/i2c/busses/i2c-sis630.c | 1 - + drivers/i2c/busses/i2c-sis96x.c | 1 - + drivers/i2c/busses/i2c-via.c | 1 - + drivers/i2c/busses/i2c-xiic.c | 1 - + drivers/i2c/busses/i2c-xlr.c | 1 - + drivers/i2c/busses/scx200_i2c.c | 1 - + drivers/i2c/i2c-core.c | 13 +++------ + drivers/i2c/muxes/i2c-arb-gpio-challenge.c | 1 - + drivers/i2c/muxes/i2c-mux-gpio.c | 1 - + drivers/i2c/muxes/i2c-mux-pca9541.c | 1 - + drivers/i2c/muxes/i2c-mux-pca954x.c | 1 - + drivers/i2c/muxes/i2c-mux-pinctrl.c | 1 - + include/linux/i2c.h | 16 ++++++++++- + 48 files changed, 64 insertions(+), 77 deletions(-) +Merging jdelvare-hwmon/master (68d5516b35c7 hwmon: (it87) Print proper names for the IT8771E and IT8772E) +$ git merge jdelvare-hwmon/master +Merge made by the 'recursive' strategy. + Documentation/hwmon/it87 | 27 ++++++++---- + drivers/hwmon/Kconfig | 4 +- + drivers/hwmon/it87.c | 104 +++++++++++++++++++++++++++++++++++++++-------- + 3 files changed, 107 insertions(+), 28 deletions(-) +Merging hwmon-staging/hwmon-next (d303b1b5fbb6 hwmon: (k10temp) Add support for Kaveri CPUs) +$ git merge hwmon-staging/hwmon-next +Already up-to-date. +Merging v4l-dvb/master (e26d710a8cdf Merge branch 'patchwork' into to_next) +$ git merge v4l-dvb/master +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'drivers/staging/media/go7007/go7007-usb.c' using previous resolution. +Removing include/media/saa6752hs.h +Auto-merging drivers/staging/media/sn9c102/Kconfig +Auto-merging drivers/staging/media/omap24xx/v4l2-int-device.c +Auto-merging drivers/staging/media/omap24xx/tcm825x.h +Auto-merging drivers/staging/media/omap24xx/tcm825x.c +Auto-merging drivers/staging/media/omap24xx/omap24xxcam.h +Auto-merging drivers/staging/media/lirc/lirc_serial.c +Auto-merging drivers/staging/media/go7007/go7007-usb.c +CONFLICT (content): Merge conflict in drivers/staging/media/go7007/go7007-usb.c +Auto-merging drivers/staging/media/as102/as102_drv.c +Auto-merging drivers/media/radio/si4713/si4713.h +Auto-merging drivers/media/radio/si4713/si4713.c +Auto-merging drivers/media/platform/ti-vpe/vpdma.c +Auto-merging drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c +Auto-merging drivers/media/platform/omap3isp/isp.h +Auto-merging drivers/media/platform/omap3isp/isp.c +Auto-merging drivers/media/i2c/saa6752hs.c +Auto-merging drivers/hid/hid-ids.h +Auto-merging drivers/hid/hid-core.c +Auto-merging arch/blackfin/mach-bf609/boards/ezkit.c +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging Documentation/cgroups/resource_counter.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master dae768c962a6] Merge remote-tracking branch 'v4l-dvb/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/media/v4l/compat.xml | 12 + + Documentation/DocBook/media/v4l/controls.xml | 41 + + Documentation/DocBook/media/v4l/dev-overlay.xml | 9 +- + .../DocBook/media/v4l/media-ioc-enum-links.xml | 9 + + Documentation/DocBook/media/v4l/subdev-formats.xml | 163 +- + Documentation/DocBook/media/v4l/v4l2.xml | 10 +- + Documentation/DocBook/media/v4l/vidioc-cropcap.xml | 10 +- + .../DocBook/media/v4l/vidioc-streamon.xml | 2 +- + Documentation/cgroups/resource_counter.txt | 2 +- + .../bindings/media/exynos-jpeg-codec.txt | 11 + + .../devicetree/bindings/media/samsung-s5k5baf.txt | 58 + + Documentation/video4linux/omap4_camera.txt | 60 + + Documentation/video4linux/si476x.txt | 2 +- + MAINTAINERS | 50 +- + arch/arm/mach-omap2/board-rx51-peripherals.c | 7 + + arch/blackfin/mach-bf609/boards/ezkit.c | 4 +- + arch/score/lib/checksum.S | 2 +- + drivers/hid/hid-core.c | 1 + + drivers/hid/hid-ids.h | 2 + + drivers/media/Kconfig | 3 + + drivers/media/dvb-core/dvb-usb-ids.h | 3 + + drivers/media/dvb-frontends/Kconfig | 7 + + drivers/media/dvb-frontends/Makefile | 1 + + drivers/media/dvb-frontends/a8293.c | 2 + + drivers/media/dvb-frontends/cx24117.c | 121 +- + drivers/media/dvb-frontends/dib8000.c | 590 ++++- + drivers/media/dvb-frontends/m88ds3103.c | 1311 ++++++++++ + drivers/media/dvb-frontends/m88ds3103.h | 114 + + drivers/media/dvb-frontends/m88ds3103_priv.h | 215 ++ + drivers/media/dvb-frontends/m88rs2000.c | 172 +- + drivers/media/dvb-frontends/m88rs2000.h | 2 + + drivers/media/dvb-frontends/nxt200x.c | 2 +- + drivers/media/i2c/Kconfig | 27 +- + drivers/media/i2c/Makefile | 3 +- + drivers/media/i2c/ad9389b.c | 277 +- + drivers/media/i2c/adv7511.c | 64 +- + drivers/media/i2c/adv7604.c | 645 +++-- + drivers/media/i2c/adv7842.c | 646 +++-- + drivers/media/i2c/lm3560.c | 34 +- + drivers/media/i2c/mt9m032.c | 16 +- + drivers/media/i2c/mt9p031.c | 28 +- + drivers/media/i2c/mt9t001.c | 26 +- + drivers/media/i2c/mt9v032.c | 264 +- + drivers/media/i2c/s5k5baf.c | 2045 +++++++++++++++ + drivers/media/i2c/saa6588.c | 50 +- + drivers/media/{pci/saa7134 => i2c}/saa6752hs.c | 19 +- + drivers/media/i2c/smiapp/smiapp-core.c | 9 +- + drivers/media/i2c/soc_camera/mt9m111.c | 4 +- + drivers/media/i2c/tvp5150.c | 40 +- + drivers/media/i2c/vs6624.c | 2 + + drivers/media/media-entity.c | 41 +- + drivers/media/pci/bt8xx/bttv-driver.c | 10 +- + drivers/media/pci/cx18/cx18-driver.c | 5 +- + drivers/media/pci/cx25821/cx25821-alsa.c | 2 +- + drivers/media/pci/cx25821/cx25821-core.c | 2 +- + drivers/media/pci/cx88/cx88-alsa.c | 4 +- + drivers/media/pci/saa7134/Kconfig | 1 + + drivers/media/pci/saa7134/Makefile | 2 +- + drivers/media/pci/saa7134/saa7134-core.c | 11 +- + drivers/media/pci/saa7134/saa7134-empress.c | 359 +-- + drivers/media/pci/saa7134/saa7134-vbi.c | 11 +- + drivers/media/pci/saa7134/saa7134-video.c | 781 ++---- + drivers/media/pci/saa7134/saa7134.h | 66 +- + drivers/media/pci/sta2x11/sta2x11_vip.c | 2 +- + drivers/media/platform/Kconfig | 10 +- + drivers/media/platform/Makefile | 3 - + drivers/media/platform/davinci/vpbe_display.c | 2 +- + drivers/media/platform/davinci/vpif_capture.c | 2 +- + drivers/media/platform/davinci/vpif_display.c | 2 +- + drivers/media/platform/exynos4-is/Kconfig | 2 +- + drivers/media/platform/exynos4-is/fimc-capture.c | 2 +- + drivers/media/platform/exynos4-is/fimc-core.c | 29 +- + drivers/media/platform/exynos4-is/fimc-core.h | 2 - + drivers/media/platform/exynos4-is/fimc-is-regs.c | 36 +- + drivers/media/platform/exynos4-is/fimc-is-regs.h | 1 - + drivers/media/platform/exynos4-is/fimc-is.c | 29 +- + drivers/media/platform/exynos4-is/fimc-lite-reg.c | 4 +- + drivers/media/platform/exynos4-is/fimc-lite.c | 26 +- + drivers/media/platform/exynos4-is/fimc-m2m.c | 148 +- + drivers/media/platform/exynos4-is/mipi-csis.c | 13 +- + drivers/media/platform/mem2mem_testdev.c | 152 +- + drivers/media/platform/omap3isp/isp.c | 78 +- + drivers/media/platform/omap3isp/isp.h | 5 +- + drivers/media/platform/omap3isp/ispccdc.c | 5 +- + drivers/media/platform/omap3isp/ispccp2.c | 3 +- + drivers/media/platform/omap3isp/ispcsi2.c | 3 +- + drivers/media/platform/omap3isp/isppreview.c | 3 +- + drivers/media/platform/omap3isp/ispqueue.c | 2 + + drivers/media/platform/omap3isp/ispresizer.c | 18 +- + drivers/media/platform/omap3isp/ispstat.c | 2 +- + drivers/media/platform/omap3isp/ispvideo.c | 106 +- + drivers/media/platform/omap3isp/ispvideo.h | 2 + + drivers/media/platform/s5p-g2d/g2d.c | 124 +- + drivers/media/platform/s5p-g2d/g2d.h | 1 - + drivers/media/platform/s5p-jpeg/Makefile | 2 +- + drivers/media/platform/s5p-jpeg/jpeg-core.c | 1329 +++++++--- + drivers/media/platform/s5p-jpeg/jpeg-core.h | 69 +- + drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c | 279 ++ + drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.h | 42 + + .../platform/s5p-jpeg/{jpeg-hw.h => jpeg-hw-s5p.c} | 82 +- + drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.h | 63 + + drivers/media/platform/s5p-jpeg/jpeg-regs.h | 209 +- + drivers/media/platform/s5p-mfc/s5p_mfc.c | 28 +- + drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 14 +- + drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 57 +- + drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 26 +- + drivers/media/platform/s5p-tv/mixer_drv.c | 34 +- + drivers/media/platform/s5p-tv/mixer_video.c | 2 +- + drivers/media/platform/s5p-tv/sdo_drv.c | 39 +- + drivers/media/platform/sh_vou.c | 16 +- + drivers/media/platform/soc_camera/atmel-isi.c | 179 +- + drivers/media/platform/soc_camera/mx2_camera.c | 2 +- + drivers/media/platform/soc_camera/rcar_vin.c | 7 +- + drivers/media/platform/soc_camera/soc_scale_crop.c | 4 +- + drivers/media/platform/ti-vpe/Makefile | 2 +- + drivers/media/platform/ti-vpe/csc.c | 196 ++ + drivers/media/platform/ti-vpe/csc.h | 68 + + drivers/media/platform/ti-vpe/sc.c | 311 +++ + drivers/media/platform/ti-vpe/sc.h | 208 ++ + drivers/media/platform/ti-vpe/sc_coeff.h | 1342 ++++++++++ + drivers/media/platform/ti-vpe/vpdma.c | 40 +- + drivers/media/platform/ti-vpe/vpdma.h | 12 +- + drivers/media/platform/ti-vpe/vpdma_priv.h | 2 +- + drivers/media/platform/ti-vpe/vpe.c | 327 ++- + drivers/media/platform/ti-vpe/vpe_regs.h | 187 -- + drivers/media/platform/vsp1/Makefile | 3 +- + drivers/media/platform/vsp1/vsp1.h | 7 + + drivers/media/platform/vsp1/vsp1_drv.c | 39 + + drivers/media/platform/vsp1/vsp1_entity.c | 7 + + drivers/media/platform/vsp1/vsp1_entity.h | 4 + + drivers/media/platform/vsp1/vsp1_hsit.c | 222 ++ + drivers/media/platform/vsp1/vsp1_hsit.h | 38 + + drivers/media/platform/vsp1/vsp1_lut.c | 252 ++ + drivers/media/platform/vsp1/vsp1_lut.h | 38 + + drivers/media/platform/vsp1/vsp1_regs.h | 16 + + drivers/media/platform/vsp1/vsp1_rpf.c | 34 +- + drivers/media/platform/vsp1/vsp1_rwpf.c | 96 + + drivers/media/platform/vsp1/vsp1_rwpf.h | 10 + + drivers/media/platform/vsp1/vsp1_sru.c | 356 +++ + drivers/media/platform/vsp1/vsp1_sru.h | 41 + + drivers/media/platform/vsp1/vsp1_video.c | 13 + + drivers/media/platform/vsp1/vsp1_wpf.c | 17 +- + drivers/media/radio/Kconfig | 43 +- + drivers/media/radio/Makefile | 4 +- + drivers/media/radio/radio-raremono.c | 387 +++ + drivers/media/radio/si470x/radio-si470x-usb.c | 81 +- + drivers/media/radio/si470x/radio-si470x.h | 1 + + drivers/media/radio/si4713/Kconfig | 40 + + drivers/media/radio/si4713/Makefile | 7 + + .../radio-platform-si4713.c} | 0 + drivers/media/radio/si4713/radio-usb-si4713.c | 540 ++++ + .../media/radio/{si4713-i2c.c => si4713/si4713.c} | 279 +- + .../media/radio/{si4713-i2c.h => si4713/si4713.h} | 4 +- + drivers/media/radio/tea575x.c | 2 +- + drivers/media/rc/imon.c | 8 +- + drivers/media/rc/keymaps/Makefile | 3 +- + drivers/media/rc/keymaps/rc-su3000.c | 75 + + drivers/media/rc/mceusb.c | 10 + + drivers/media/tuners/Kconfig | 7 + + drivers/media/tuners/Makefile | 1 + + drivers/media/tuners/e4000.c | 16 +- + drivers/media/tuners/m88ts2022.c | 674 +++++ + drivers/media/tuners/m88ts2022.h | 54 + + drivers/media/tuners/m88ts2022_priv.h | 34 + + drivers/media/tuners/tuner-xc2028.c | 38 +- + drivers/media/usb/Kconfig | 1 - + drivers/media/usb/Makefile | 1 - + drivers/media/usb/au0828/au0828-core.c | 13 +- + drivers/media/usb/au0828/au0828-dvb.c | 116 +- + drivers/media/usb/au0828/au0828.h | 6 + + drivers/media/usb/cx231xx/Kconfig | 2 + + drivers/media/usb/cx231xx/cx231xx-cards.c | 2 + + drivers/media/usb/cx231xx/cx231xx-i2c.c | 23 +- + drivers/media/usb/dvb-usb-v2/anysee.c | 3 +- + drivers/media/usb/dvb-usb-v2/az6007.c | 59 + + drivers/media/usb/dvb-usb-v2/ec168.c | 2 +- + drivers/media/usb/dvb-usb-v2/it913x.c | 3 + + drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 2 + + drivers/media/usb/dvb-usb/cxusb.c | 21 +- + drivers/media/usb/dvb-usb/dw2102.c | 455 ++-- + drivers/media/usb/em28xx/Kconfig | 8 +- + drivers/media/usb/em28xx/Makefile | 5 +- + drivers/media/usb/em28xx/em28xx-audio.c | 373 ++- + drivers/media/usb/em28xx/em28xx-camera.c | 1 + + drivers/media/usb/em28xx/em28xx-cards.c | 496 ++-- + drivers/media/usb/em28xx/em28xx-core.c | 412 +-- + drivers/media/usb/em28xx/em28xx-dvb.c | 80 +- + drivers/media/usb/em28xx/em28xx-i2c.c | 199 +- + drivers/media/usb/em28xx/em28xx-input.c | 207 +- + drivers/media/usb/em28xx/em28xx-reg.h | 11 +- + drivers/media/usb/em28xx/em28xx-v4l.h | 20 + + drivers/media/usb/em28xx/em28xx-vbi.c | 1 + + drivers/media/usb/em28xx/em28xx-video.c | 560 +++- + drivers/media/usb/em28xx/em28xx.h | 115 +- + drivers/media/usb/pwc/pwc-if.c | 1 - + drivers/media/v4l2-core/Kconfig | 11 - + drivers/media/v4l2-core/Makefile | 1 - + drivers/media/v4l2-core/v4l2-ctrls.c | 5 + + drivers/media/v4l2-core/v4l2-dev.c | 2 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 9 + + drivers/media/v4l2-core/v4l2-mem2mem.c | 126 + + drivers/media/v4l2-core/v4l2-of.c | 10 +- + drivers/media/v4l2-core/videobuf2-core.c | 480 ++-- + drivers/media/v4l2-core/videobuf2-dma-sg.c | 53 +- + drivers/staging/media/Kconfig | 8 + + drivers/staging/media/Makefile | 5 + + drivers/staging/media/as102/as102_drv.c | 10 - + drivers/staging/media/as102/as102_drv.h | 8 - + drivers/staging/media/as102/as102_fe.c | 26 - + drivers/staging/media/as102/as102_fw.c | 16 +- + drivers/staging/media/as102/as102_usb_drv.c | 36 +- + drivers/staging/media/as102/as10x_cmd.c | 21 - + drivers/staging/media/as102/as10x_cmd_cfg.c | 9 - + drivers/staging/media/as102/as10x_cmd_stream.c | 12 - + drivers/staging/media/bcm2048/Kconfig | 13 + + drivers/staging/media/bcm2048/Makefile | 1 + + drivers/staging/media/bcm2048/TODO | 24 + + drivers/staging/media/bcm2048/radio-bcm2048.c | 2744 ++++++++++++++++++++ + drivers/staging/media/bcm2048/radio-bcm2048.h | 30 + + drivers/staging/media/davinci_vpfe/dm365_isif.c | 3 +- + drivers/staging/media/davinci_vpfe/vpfe_video.c | 4 +- + drivers/staging/media/go7007/go7007-usb.c | 2 + + drivers/staging/media/lirc/lirc_parallel.c | 4 +- + drivers/staging/media/lirc/lirc_serial.c | 4 +- + drivers/staging/media/omap24xx/Kconfig | 35 + + drivers/staging/media/omap24xx/Makefile | 5 + + .../media/omap24xx}/omap24xxcam-dma.c | 0 + .../media/omap24xx}/omap24xxcam.c | 0 + .../media/omap24xx}/omap24xxcam.h | 2 +- + .../i2c => staging/media/omap24xx}/tcm825x.c | 2 +- + .../i2c => staging/media/omap24xx}/tcm825x.h | 2 +- + .../media/omap24xx}/v4l2-int-device.c | 2 +- + .../staging/media/omap24xx}/v4l2-int-device.h | 0 + drivers/staging/media/omap4iss/Kconfig | 12 + + drivers/staging/media/omap4iss/Makefile | 6 + + drivers/staging/media/omap4iss/TODO | 4 + + drivers/staging/media/omap4iss/iss.c | 1563 +++++++++++ + drivers/staging/media/omap4iss/iss.h | 236 ++ + drivers/staging/media/omap4iss/iss_csi2.c | 1343 ++++++++++ + drivers/staging/media/omap4iss/iss_csi2.h | 158 ++ + drivers/staging/media/omap4iss/iss_csiphy.c | 279 ++ + drivers/staging/media/omap4iss/iss_csiphy.h | 51 + + drivers/staging/media/omap4iss/iss_ipipe.c | 570 ++++ + drivers/staging/media/omap4iss/iss_ipipe.h | 67 + + drivers/staging/media/omap4iss/iss_ipipeif.c | 849 ++++++ + drivers/staging/media/omap4iss/iss_ipipeif.h | 92 + + drivers/staging/media/omap4iss/iss_regs.h | 901 +++++++ + drivers/staging/media/omap4iss/iss_resizer.c | 893 +++++++ + drivers/staging/media/omap4iss/iss_resizer.h | 75 + + drivers/staging/media/omap4iss/iss_video.c | 1226 +++++++++ + drivers/staging/media/omap4iss/iss_video.h | 204 ++ + .../{media/usb => staging/media}/sn9c102/Kconfig | 9 +- + .../{media/usb => staging/media}/sn9c102/Makefile | 0 + .../{media/usb => staging/media}/sn9c102/sn9c102.h | 0 + .../staging/media/sn9c102}/sn9c102.txt | 0 + .../usb => staging/media}/sn9c102/sn9c102_config.h | 0 + .../usb => staging/media}/sn9c102/sn9c102_core.c | 0 + .../media}/sn9c102/sn9c102_devtable.h | 0 + .../media}/sn9c102/sn9c102_hv7131d.c | 0 + .../media}/sn9c102/sn9c102_hv7131r.c | 0 + .../usb => staging/media}/sn9c102/sn9c102_mi0343.c | 0 + .../usb => staging/media}/sn9c102/sn9c102_mi0360.c | 0 + .../media}/sn9c102/sn9c102_mt9v111.c | 0 + .../usb => staging/media}/sn9c102/sn9c102_ov7630.c | 0 + .../usb => staging/media}/sn9c102/sn9c102_ov7660.c | 0 + .../media}/sn9c102/sn9c102_pas106b.c | 0 + .../media}/sn9c102/sn9c102_pas202bcb.c | 0 + .../usb => staging/media}/sn9c102/sn9c102_sensor.h | 0 + .../media}/sn9c102/sn9c102_tas5110c1b.c | 0 + .../media}/sn9c102/sn9c102_tas5110d.c | 0 + .../media}/sn9c102/sn9c102_tas5130d1b.c | 0 + drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c | 2 +- + drivers/staging/media/solo6x10/solo6x10-v4l2.c | 7 +- + drivers/staging/media/solo6x10/solo6x10.h | 2 +- + include/linux/platform_data/vsp1.h | 2 + + include/media/adv7604.h | 38 +- + include/media/adv7842.h | 59 +- + include/media/atmel-isi.h | 2 + + include/media/media-entity.h | 1 + + include/media/omap4iss.h | 65 + + include/media/rc-map.h | 1 + + include/media/saa6588.h | 2 +- + include/media/saa6752hs.h | 26 - + include/media/si4713.h | 2 + + include/media/v4l2-fh.h | 4 + + include/media/v4l2-mem2mem.h | 24 + + include/media/v4l2-of.h | 6 +- + include/media/videobuf2-core.h | 18 +- + include/trace/events/v4l2.h | 157 ++ + include/uapi/linux/media.h | 1 + + include/uapi/linux/v4l2-controls.h | 9 + + include/uapi/linux/v4l2-mediabus.h | 3 + + include/uapi/linux/videodev2.h | 4 +- + include/uapi/linux/vsp1.h | 34 + + 294 files changed, 28956 insertions(+), 4962 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/exynos-jpeg-codec.txt + create mode 100644 Documentation/devicetree/bindings/media/samsung-s5k5baf.txt + create mode 100644 Documentation/video4linux/omap4_camera.txt + create mode 100644 drivers/media/dvb-frontends/m88ds3103.c + create mode 100644 drivers/media/dvb-frontends/m88ds3103.h + create mode 100644 drivers/media/dvb-frontends/m88ds3103_priv.h + create mode 100644 drivers/media/i2c/s5k5baf.c + rename drivers/media/{pci/saa7134 => i2c}/saa6752hs.c (98%) + create mode 100644 drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c + create mode 100644 drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.h + rename drivers/media/platform/s5p-jpeg/{jpeg-hw.h => jpeg-hw-s5p.c} (70%) + create mode 100644 drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.h + create mode 100644 drivers/media/platform/ti-vpe/csc.c + create mode 100644 drivers/media/platform/ti-vpe/csc.h + create mode 100644 drivers/media/platform/ti-vpe/sc.c + create mode 100644 drivers/media/platform/ti-vpe/sc.h + create mode 100644 drivers/media/platform/ti-vpe/sc_coeff.h + create mode 100644 drivers/media/platform/vsp1/vsp1_hsit.c + create mode 100644 drivers/media/platform/vsp1/vsp1_hsit.h + create mode 100644 drivers/media/platform/vsp1/vsp1_lut.c + create mode 100644 drivers/media/platform/vsp1/vsp1_lut.h + create mode 100644 drivers/media/platform/vsp1/vsp1_sru.c + create mode 100644 drivers/media/platform/vsp1/vsp1_sru.h + create mode 100644 drivers/media/radio/radio-raremono.c + create mode 100644 drivers/media/radio/si4713/Kconfig + create mode 100644 drivers/media/radio/si4713/Makefile + rename drivers/media/radio/{radio-si4713.c => si4713/radio-platform-si4713.c} (100%) + create mode 100644 drivers/media/radio/si4713/radio-usb-si4713.c + rename drivers/media/radio/{si4713-i2c.c => si4713/si4713.c} (86%) + rename drivers/media/radio/{si4713-i2c.h => si4713/si4713.h} (98%) + create mode 100644 drivers/media/rc/keymaps/rc-su3000.c + create mode 100644 drivers/media/tuners/m88ts2022.c + create mode 100644 drivers/media/tuners/m88ts2022.h + create mode 100644 drivers/media/tuners/m88ts2022_priv.h + create mode 100644 drivers/media/usb/em28xx/em28xx-v4l.h + create mode 100644 drivers/staging/media/bcm2048/Kconfig + create mode 100644 drivers/staging/media/bcm2048/Makefile + create mode 100644 drivers/staging/media/bcm2048/TODO + create mode 100644 drivers/staging/media/bcm2048/radio-bcm2048.c + create mode 100644 drivers/staging/media/bcm2048/radio-bcm2048.h + create mode 100644 drivers/staging/media/omap24xx/Kconfig + create mode 100644 drivers/staging/media/omap24xx/Makefile + rename drivers/{media/platform => staging/media/omap24xx}/omap24xxcam-dma.c (100%) + rename drivers/{media/platform => staging/media/omap24xx}/omap24xxcam.c (100%) + rename drivers/{media/platform => staging/media/omap24xx}/omap24xxcam.h (99%) + rename drivers/{media/i2c => staging/media/omap24xx}/tcm825x.c (99%) + rename drivers/{media/i2c => staging/media/omap24xx}/tcm825x.h (99%) + rename drivers/{media/v4l2-core => staging/media/omap24xx}/v4l2-int-device.c (99%) + rename {include/media => drivers/staging/media/omap24xx}/v4l2-int-device.h (100%) + create mode 100644 drivers/staging/media/omap4iss/Kconfig + create mode 100644 drivers/staging/media/omap4iss/Makefile + create mode 100644 drivers/staging/media/omap4iss/TODO + create mode 100644 drivers/staging/media/omap4iss/iss.c + create mode 100644 drivers/staging/media/omap4iss/iss.h + create mode 100644 drivers/staging/media/omap4iss/iss_csi2.c + create mode 100644 drivers/staging/media/omap4iss/iss_csi2.h + create mode 100644 drivers/staging/media/omap4iss/iss_csiphy.c + create mode 100644 drivers/staging/media/omap4iss/iss_csiphy.h + create mode 100644 drivers/staging/media/omap4iss/iss_ipipe.c + create mode 100644 drivers/staging/media/omap4iss/iss_ipipe.h + create mode 100644 drivers/staging/media/omap4iss/iss_ipipeif.c + create mode 100644 drivers/staging/media/omap4iss/iss_ipipeif.h + create mode 100644 drivers/staging/media/omap4iss/iss_regs.h + create mode 100644 drivers/staging/media/omap4iss/iss_resizer.c + create mode 100644 drivers/staging/media/omap4iss/iss_resizer.h + create mode 100644 drivers/staging/media/omap4iss/iss_video.c + create mode 100644 drivers/staging/media/omap4iss/iss_video.h + rename drivers/{media/usb => staging/media}/sn9c102/Kconfig (52%) + rename drivers/{media/usb => staging/media}/sn9c102/Makefile (100%) + rename drivers/{media/usb => staging/media}/sn9c102/sn9c102.h (100%) + rename {Documentation/video4linux => drivers/staging/media/sn9c102}/sn9c102.txt (100%) + rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_config.h (100%) + rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_core.c (100%) + rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_devtable.h (100%) + rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_hv7131d.c (100%) + rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_hv7131r.c (100%) + rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_mi0343.c (100%) + rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_mi0360.c (100%) + rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_mt9v111.c (100%) + rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_ov7630.c (100%) + rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_ov7660.c (100%) + rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_pas106b.c (100%) + rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_pas202bcb.c (100%) + rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_sensor.h (100%) + rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_tas5110c1b.c (100%) + rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_tas5110d.c (100%) + rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_tas5130d1b.c (100%) + create mode 100644 include/media/omap4iss.h + delete mode 100644 include/media/saa6752hs.h + create mode 100644 include/trace/events/v4l2.h + create mode 100644 include/uapi/linux/vsp1.h +Merging kbuild/for-next (853e265ed4aa Merge branch 'kbuild/kbuild' into kbuild/for-next) +$ git merge kbuild/for-next +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 8 ++- + arch/arc/include/asm/linkage.h | 2 + + arch/frv/Makefile | 7 -- + arch/mn10300/Makefile | 8 --- + include/linux/linkage.h | 19 ++++-- + scripts/coccinelle/api/pm_runtime.cocci | 109 ++++++++++++++++++++++++++++++++ + scripts/package/builddeb | 25 +++++--- + scripts/setlocalversion | 3 +- + 8 files changed, 149 insertions(+), 32 deletions(-) + create mode 100644 scripts/coccinelle/api/pm_runtime.cocci +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 (f939ad10650c Merge branch 'for-3.14' into for-next) +$ git merge libata/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging pm/linux-next (009c8e1b9299 Merge branches 'pm-devfreq-next' and 'pm-cpufreq-next' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + drivers/acpi/acpi_processor.c | 2 +- + drivers/acpi/acpica/acglobal.h | 2 +- + drivers/acpi/bus.c | 9 +++++++++ + drivers/acpi/device_pm.c | 24 ++++++------------------ + drivers/acpi/processor_core.c | 26 +++++++++++++------------- + drivers/acpi/scan.c | 1 + + drivers/acpi/sysfs.c | 2 +- + drivers/cpufreq/acpi-cpufreq.c | 7 ++++--- + drivers/devfreq/Kconfig | 2 +- + include/acpi/acpixf.h | 2 +- + 10 files changed, 38 insertions(+), 39 deletions(-) +Merging idle/next (5c56be9a25ba turbostat: Add option to report joules consumed per sample) +$ git merge idle/next +Merge made by the 'recursive' strategy. + tools/power/x86/turbostat/.gitignore | 1 + + tools/power/x86/turbostat/Makefile | 2 +- + tools/power/x86/turbostat/turbostat.c | 343 ++++++++++++++++++---------------- + 3 files changed, 179 insertions(+), 167 deletions(-) + create mode 100644 tools/power/x86/turbostat/.gitignore +Merging apm/for-next (158204397034 apm-emulation: add hibernation APM events to support suspend2disk) +$ git merge apm/for-next +Already up-to-date. +Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles) +$ git merge cpupowerutils/master +Already up-to-date. +Merging thermal/next (262afa97587b Merge branches 'soc-eduardo', 'soc', 'misc' and 'int3404-thermal' of .git into next) +$ git merge thermal/next +Resolved 'drivers/thermal/Kconfig' using previous resolution. +Auto-merging drivers/thermal/Kconfig +CONFLICT (content): Merge conflict in drivers/thermal/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ab5549194991] Merge remote-tracking branch 'thermal/next' +$ git diff -M --stat --summary HEAD^.. + drivers/thermal/Kconfig | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) +Merging ieee1394/for-next (fcd46b34425d firewire: Enable remote DMA above 4 GB) +$ git merge ieee1394/for-next +Already up-to-date. +Merging dlm/next (ece35848c184 dlm: set zero linger time on sctp socket) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (0cb637bff80d swiotlb: Don't DoS us with 'swiotlb buffer is full' (v2)) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging slave-dma/next (ab05d8be5a2e Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Resolved 'sound/soc/fsl/fsl_ssi.c' using previous resolution. +Auto-merging sound/soc/fsl/fsl_ssi.c +CONFLICT (content): Merge conflict in sound/soc/fsl/fsl_ssi.c +Auto-merging include/linux/dmaengine.h +Auto-merging drivers/dma/tegra20-apb-dma.c +Auto-merging drivers/dma/ppc4xx/adma.c +Auto-merging drivers/dma/pl330.c +Auto-merging drivers/dma/dmatest.c +Auto-merging drivers/dma/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d1b541251d0f] Merge remote-tracking branch 'slave-dma/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/dma/bcm2835-dma.txt | 57 ++ + .../devicetree/bindings/dma/fsl-imx-sdma.txt | 1 + + .../devicetree/bindings/dma/moxa,moxart-dma.txt | 45 ++ + drivers/dma/Kconfig | 14 + + drivers/dma/Makefile | 2 + + drivers/dma/acpi-dma.c | 36 +- + drivers/dma/amba-pl08x.c | 4 +- + drivers/dma/bcm2835-dma.c | 707 +++++++++++++++++++++ + drivers/dma/cppi41.c | 4 +- + drivers/dma/dmatest.c | 4 +- + drivers/dma/dw/core.c | 35 +- + drivers/dma/edma.c | 6 +- + drivers/dma/fsldma.h | 2 +- + drivers/dma/imx-sdma.c | 23 +- + drivers/dma/k3dma.c | 4 +- + drivers/dma/mmp_pdma.c | 203 +++--- + drivers/dma/mmp_tdma.c | 28 +- + drivers/dma/moxart-dma.c | 699 ++++++++++++++++++++ + drivers/dma/omap-dma.c | 4 +- + drivers/dma/pl330.c | 65 +- + drivers/dma/ppc4xx/adma.c | 1 + + drivers/dma/sirf-dma.c | 20 + + drivers/dma/tegra20-apb-dma.c | 62 +- + drivers/dma/virt-dma.h | 4 +- + include/linux/dmaengine.h | 15 +- + include/linux/platform_data/dma-imx-sdma.h | 5 + + include/linux/platform_data/dma-imx.h | 1 + + include/linux/platform_data/dma-mmp_tdma.h | 8 +- + include/linux/platform_data/dma-mv_xor.h | 6 +- + sound/soc/fsl/fsl_ssi.c | 27 +- + 30 files changed, 1891 insertions(+), 201 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/bcm2835-dma.txt + create mode 100644 Documentation/devicetree/bindings/dma/moxa,moxart-dma.txt + create mode 100644 drivers/dma/bcm2835-dma.c + create mode 100644 drivers/dma/moxart-dma.c +Merging dmaengine/next (77873803363c net_dma: mark broken) +$ git merge dmaengine/next +Already up-to-date. +Merging net-next/master (77d143de7581 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml) +$ git merge net-next/master +Already up-to-date. +Merging ipsec-next/master (abfce3ef58b6 sctp: remove the unnecessary assignment) +$ git merge ipsec-next/master +Already up-to-date. +Merging wireless-next/master (a64e1a45060f ath9k: Fix RX interrupt mitigation) +$ git merge wireless-next/master +Already up-to-date. +Merging bluetooth/master (7b63bbf4e465 Bluetooth: Remove unnecessary check for chan->psm) +$ git merge bluetooth/master +Auto-merging net/bluetooth/l2cap_sock.c +Auto-merging drivers/bluetooth/btusb.c +Auto-merging drivers/bluetooth/ath3k.c +Merge made by the 'recursive' strategy. + drivers/bluetooth/ath3k.c | 4 + + drivers/bluetooth/btusb.c | 2 + + include/net/bluetooth/bluetooth.h | 1 + + include/net/bluetooth/hci.h | 43 ++- + include/net/bluetooth/hci_core.h | 32 ++- + include/net/bluetooth/l2cap.h | 6 +- + include/net/bluetooth/mgmt.h | 17 ++ + include/net/bluetooth/rfcomm.h | 1 + + net/bluetooth/a2mp.c | 8 +- + net/bluetooth/hci_conn.c | 20 +- + net/bluetooth/hci_core.c | 118 +++++++- + net/bluetooth/hci_event.c | 105 +++++-- + net/bluetooth/hci_sysfs.c | 18 +- + net/bluetooth/l2cap_core.c | 559 ++++++++++++++++++++------------------ + net/bluetooth/l2cap_sock.c | 33 ++- + net/bluetooth/mgmt.c | 205 ++++++++++++-- + net/bluetooth/rfcomm/core.c | 4 +- + net/bluetooth/rfcomm/sock.c | 15 +- + 18 files changed, 842 insertions(+), 349 deletions(-) +Merging infiniband/for-next (fb1b5034e498 Merge branch 'ip-roce' into for-next) +$ git merge infiniband/for-next +Already up-to-date. +Merging mtd/master (0ff76a920e35 mtd: gpmi: add sanity check when mapping DMA for read_buf/write_buf) +$ git merge mtd/master +Auto-merging drivers/mtd/nand/mpc5121_nfc.c +Auto-merging drivers/mtd/maps/pxa2xx-flash.c +Removing arch/arm/plat-samsung/include/plat/regs-nand.h +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/arm/davinci/nand.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/davinci/nand.txt | 46 -- + .../devicetree/bindings/mtd/davinci-nand.txt | 94 +++ + .../devicetree/bindings/mtd/gpmi-nand.txt | 8 + + .../devicetree/bindings/mtd/pxa3xx-nand.txt | 6 +- + Documentation/mtd/nand/pxa3xx-nand.txt | 113 ++++ + MAINTAINERS | 9 +- + arch/arm/plat-samsung/include/plat/regs-nand.h | 123 ---- + drivers/mtd/Kconfig | 7 +- + drivers/mtd/afs.c | 3 +- + drivers/mtd/ar7part.c | 3 +- + drivers/mtd/bcm47xxpart.c | 27 +- + drivers/mtd/bcm63xxpart.c | 3 +- + drivers/mtd/cmdlinepart.c | 3 +- + drivers/mtd/devices/docg3.c | 20 +- + drivers/mtd/devices/m25p80.c | 226 ++++++- + drivers/mtd/devices/ms02-nv.c | 2 +- + drivers/mtd/devices/mtd_dataflash.c | 5 +- + drivers/mtd/devices/mtdram.c | 2 +- + drivers/mtd/lpddr/lpddr_cmds.c | 32 +- + drivers/mtd/maps/ixp4xx.c | 28 +- + drivers/mtd/maps/lantiq-flash.c | 37 +- + drivers/mtd/maps/pxa2xx-flash.c | 2 +- + drivers/mtd/maps/sun_uflash.c | 2 +- + drivers/mtd/mtdcore.c | 10 +- + drivers/mtd/mtdpart.c | 9 +- + drivers/mtd/nand/Kconfig | 14 +- + drivers/mtd/nand/atmel_nand.c | 8 +- + drivers/mtd/nand/au1550nd.c | 6 +- + drivers/mtd/nand/bf5xx_nand.c | 1 - + drivers/mtd/nand/cafe_nand.c | 4 +- + drivers/mtd/nand/cmx270_nand.c | 1 - + drivers/mtd/nand/cs553x_nand.c | 1 - + drivers/mtd/nand/davinci_nand.c | 93 +-- + drivers/mtd/nand/denali.c | 53 +- + drivers/mtd/nand/denali.h | 4 +- + drivers/mtd/nand/denali_dt.c | 4 +- + drivers/mtd/nand/denali_pci.c | 3 +- + drivers/mtd/nand/diskonchip.c | 13 +- + drivers/mtd/nand/fsl_elbc_nand.c | 3 +- + drivers/mtd/nand/fsl_ifc_nand.c | 3 +- + drivers/mtd/nand/fsmc_nand.c | 16 +- + drivers/mtd/nand/gpio.c | 12 +- + drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 127 ++-- + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 207 +++--- + drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 2 - + drivers/mtd/nand/jz4740_nand.c | 4 +- + drivers/mtd/nand/lpc32xx_mlc.c | 26 +- + drivers/mtd/nand/lpc32xx_slc.c | 19 +- + drivers/mtd/nand/mpc5121_nfc.c | 10 +- + drivers/mtd/nand/mxc_nand.c | 25 +- + drivers/mtd/nand/nand_base.c | 183 +++++- + drivers/mtd/nand/nand_ids.c | 2 + + drivers/mtd/nand/nuc900_nand.c | 54 +- + drivers/mtd/nand/omap2.c | 8 +- + drivers/mtd/nand/orion_nand.c | 4 +- + drivers/mtd/nand/pasemi_nand.c | 2 +- + drivers/mtd/nand/plat_nand.c | 40 +- + drivers/mtd/nand/pxa3xx_nand.c | 713 +++++++++++++++++---- + drivers/mtd/nand/s3c2410.c | 38 +- + drivers/mtd/nand/sh_flctl.c | 55 +- + drivers/mtd/nand/sharpsl.c | 6 +- + drivers/mtd/nand/tmio_nand.c | 46 +- + drivers/mtd/nand/txx9ndfmc.c | 5 +- + drivers/mtd/ofpart.c | 19 +- + drivers/mtd/onenand/generic.c | 2 +- + drivers/mtd/redboot.c | 3 +- + drivers/mtd/tests/mtd_nandecctest.c | 2 +- + fs/jffs2/malloc.c | 4 + + include/linux/mtd/mtdram.h | 2 +- + include/linux/mtd/nand.h | 41 +- + include/linux/mtd/partitions.h | 8 +- + include/linux/of_mtd.h | 2 +- + include/linux/platform_data/mtd-nand-omap2.h | 2 - + include/linux/platform_data/mtd-nand-pxa3xx.h | 3 + + include/linux/platform_data/mtd-onenand-omap2.h | 2 - + include/linux/platform_data/mtd-orion_nand.h | 6 +- + 76 files changed, 1688 insertions(+), 1043 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/davinci/nand.txt + create mode 100644 Documentation/devicetree/bindings/mtd/davinci-nand.txt + create mode 100644 Documentation/mtd/nand/pxa3xx-nand.txt + delete mode 100644 arch/arm/plat-samsung/include/plat/regs-nand.h +Merging l2-mtd/master (0ff76a920e35 mtd: gpmi: add sanity check when mapping DMA for read_buf/write_buf) +$ git merge l2-mtd/master +Already up-to-date. +Merging crypto/master (79ba451d66ca crypto: aesni - fix build on x86 (32bit)) +$ git merge crypto/master +Already up-to-date. +Merging drm/drm-next (76f4f415e502 Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next) +$ git merge drm/drm-next +Auto-merging drivers/video/fbmem.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_acpi.c +Removing drivers/gpu/drm/msm/mdp4/mdp4_irq.c +Auto-merging drivers/gpu/drm/msm/mdp/mdp_format.c +Auto-merging drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c +Auto-merging drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h +Auto-merging drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c +Auto-merging drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c +Auto-merging drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c +Auto-merging drivers/gpu/drm/msm/mdp/mdp4/mdp4.xml.h +Auto-merging drivers/gpu/drm/i915/intel_opregion.c +Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/Makefile +Auto-merging drivers/gpu/drm/exynos/exynos_drm_gem.h +Auto-merging drivers/gpu/drm/exynos/exynos_drm_gem.c +Auto-merging drivers/char/agp/intel-gtt.c +Auto-merging drivers/char/agp/intel-agp.c +Auto-merging drivers/char/Makefile +Merge made by the 'recursive' strategy. + .../bindings/gpu/nvidia,tegra20-host1x.txt | 16 +- + .../devicetree/bindings/mipi/dsi/mipi-dsi-bus.txt | 98 ++ + .../bindings/mipi/nvidia,tegra114-mipi.txt | 41 + + .../devicetree/bindings/panel/auo,b101aw03.txt | 7 + + .../bindings/panel/chunghwa,claa101wb03.txt | 7 + + .../bindings/panel/panasonic,vvx10f004b00.txt | 7 + + .../devicetree/bindings/panel/simple-panel.txt | 21 + + drivers/char/Makefile | 2 +- + drivers/char/agp/Kconfig | 5 + + drivers/char/agp/Makefile | 2 +- + drivers/char/agp/intel-agp.c | 5 - + drivers/char/agp/intel-gtt.c | 18 + + drivers/gpu/drm/Kconfig | 8 + + drivers/gpu/drm/Makefile | 4 + + drivers/gpu/drm/armada/armada_drv.c | 3 +- + drivers/gpu/drm/ast/ast_main.c | 49 +- + drivers/gpu/drm/ast/ast_mode.c | 20 +- + drivers/gpu/drm/ast/ast_ttm.c | 6 +- + drivers/gpu/drm/bochs/Kconfig | 11 + + drivers/gpu/drm/bochs/Makefile | 4 + + drivers/gpu/drm/bochs/bochs.h | 164 ++ + drivers/gpu/drm/bochs/bochs_drv.c | 178 +++ + drivers/gpu/drm/bochs/bochs_fbdev.c | 215 +++ + drivers/gpu/drm/bochs/bochs_hw.c | 177 +++ + drivers/gpu/drm/bochs/bochs_kms.c | 294 ++++ + drivers/gpu/drm/bochs/bochs_mm.c | 546 +++++++ + drivers/gpu/drm/cirrus/cirrus_drv.h | 2 +- + drivers/gpu/drm/cirrus/cirrus_fbdev.c | 3 + + drivers/gpu/drm/cirrus/cirrus_main.c | 2 +- + drivers/gpu/drm/cirrus/cirrus_mode.c | 12 +- + drivers/gpu/drm/cirrus/cirrus_ttm.c | 26 +- + drivers/gpu/drm/drm_agpsupport.c | 35 +- + drivers/gpu/drm/drm_buffer.c | 2 +- + drivers/gpu/drm/drm_bufs.c | 10 +- + drivers/gpu/drm/drm_crtc.c | 2 - + drivers/gpu/drm/drm_crtc_helper.c | 2 +- + drivers/gpu/drm/drm_drv.c | 4 - + drivers/gpu/drm/drm_edid.c | 289 ++-- + drivers/gpu/drm/drm_edid_load.c | 4 +- + drivers/gpu/drm/drm_fb_helper.c | 6 + + drivers/gpu/drm/drm_fops.c | 11 +- + drivers/gpu/drm/drm_gem.c | 45 +- + drivers/gpu/drm/drm_info.c | 16 +- + drivers/gpu/drm/drm_irq.c | 119 +- + drivers/gpu/drm/drm_memory.c | 15 +- + drivers/gpu/drm/drm_mipi_dsi.c | 315 ++++ + drivers/gpu/drm/drm_panel.c | 100 ++ + drivers/gpu/drm/drm_pci.c | 38 +- + drivers/gpu/drm/drm_platform.c | 12 - + drivers/gpu/drm/drm_stub.c | 31 +- + drivers/gpu/drm/drm_usb.c | 2 +- + drivers/gpu/drm/drm_vm.c | 10 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 25 +- + drivers/gpu/drm/exynos/exynos_drm_drv.h | 1 + + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 6 +- + drivers/gpu/drm/exynos/exynos_drm_gem.c | 74 +- + drivers/gpu/drm/exynos/exynos_drm_gem.h | 3 + + drivers/gpu/drm/exynos/exynos_mixer.c | 6 +- + drivers/gpu/drm/gma500/accel_2d.c | 2 +- + drivers/gpu/drm/gma500/cdv_intel_dp.c | 37 +- + drivers/gpu/drm/gma500/psb_drv.h | 8 +- + drivers/gpu/drm/gma500/psb_intel_drv.h | 5 - + drivers/gpu/drm/gma500/psb_irq.c | 19 +- + drivers/gpu/drm/gma500/psb_irq.h | 2 +- + drivers/gpu/drm/i810/i810_dma.c | 4 + + drivers/gpu/drm/i810/i810_drv.c | 2 +- + drivers/gpu/drm/i915/Kconfig | 32 +- + drivers/gpu/drm/i915/Makefile | 3 +- + drivers/gpu/drm/i915/dvo_ns2501.c | 73 +- + drivers/gpu/drm/i915/i915_debugfs.c | 288 +++- + drivers/gpu/drm/i915/i915_dma.c | 52 +- + drivers/gpu/drm/i915/i915_drv.c | 94 +- + drivers/gpu/drm/i915/i915_drv.h | 163 +- + drivers/gpu/drm/i915/i915_gem.c | 81 +- + drivers/gpu/drm/i915/i915_gem_context.c | 45 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 55 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 54 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 1 + + drivers/gpu/drm/i915/i915_gpu_error.c | 12 +- + drivers/gpu/drm/i915/i915_irq.c | 161 +- + drivers/gpu/drm/i915/i915_reg.h | 322 ++-- + drivers/gpu/drm/i915/i915_suspend.c | 49 +- + drivers/gpu/drm/i915/i915_sysfs.c | 49 +- + drivers/gpu/drm/i915/i915_ums.c | 27 + + drivers/gpu/drm/i915/intel_bios.c | 37 +- + drivers/gpu/drm/i915/intel_bios.h | 64 +- + drivers/gpu/drm/i915/intel_crt.c | 5 +- + drivers/gpu/drm/i915/intel_ddi.c | 148 +- + drivers/gpu/drm/i915/intel_display.c | 534 +++++-- + drivers/gpu/drm/i915/intel_dp.c | 121 +- + drivers/gpu/drm/i915/intel_drv.h | 46 +- + drivers/gpu/drm/i915/intel_dsi.c | 193 +-- + drivers/gpu/drm/i915/intel_dsi.h | 21 + + drivers/gpu/drm/i915/intel_dsi_pll.c | 119 +- + drivers/gpu/drm/i915/intel_dvo.c | 5 +- + drivers/gpu/drm/i915/intel_fbdev.c | 65 +- + drivers/gpu/drm/i915/intel_hdmi.c | 87 +- + drivers/gpu/drm/i915/intel_i2c.c | 15 +- + drivers/gpu/drm/i915/intel_lvds.c | 90 +- + drivers/gpu/drm/i915/intel_opregion.c | 51 +- + drivers/gpu/drm/i915/intel_overlay.c | 2 +- + drivers/gpu/drm/i915/intel_panel.c | 954 +++++++---- + drivers/gpu/drm/i915/intel_pm.c | 1671 ++++++++------------ + drivers/gpu/drm/i915/intel_ringbuffer.c | 44 +- + drivers/gpu/drm/i915/intel_sdvo.c | 62 +- + drivers/gpu/drm/i915/intel_sdvo_regs.h | 40 +- + drivers/gpu/drm/i915/intel_sideband.c | 43 +- + drivers/gpu/drm/i915/intel_sprite.c | 68 +- + drivers/gpu/drm/i915/intel_uncore.c | 317 +++- + drivers/gpu/drm/mga/mga_dma.c | 4 +- + drivers/gpu/drm/mga/mga_drv.h | 4 +- + drivers/gpu/drm/mga/mga_ioc32.c | 1 + + drivers/gpu/drm/mga/mga_irq.c | 8 +- + drivers/gpu/drm/mga/mga_state.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_cursor.c | 8 +- + drivers/gpu/drm/mgag200/mgag200_fb.c | 7 +- + drivers/gpu/drm/mgag200/mgag200_main.c | 7 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 6 +- + drivers/gpu/drm/mgag200/mgag200_ttm.c | 6 +- + drivers/gpu/drm/msm/Kconfig | 3 +- + drivers/gpu/drm/msm/Makefile | 21 +- + drivers/gpu/drm/msm/NOTES | 20 +- + drivers/gpu/drm/msm/adreno/a2xx.xml.h | 125 +- + drivers/gpu/drm/msm/adreno/a3xx.xml.h | 116 +- + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 190 ++- + drivers/gpu/drm/msm/adreno/a3xx_gpu.h | 4 + + drivers/gpu/drm/msm/adreno/adreno_common.xml.h | 171 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 25 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 9 + + drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h | 30 +- + drivers/gpu/drm/msm/dsi/dsi.xml.h | 8 +- + drivers/gpu/drm/msm/dsi/mmss_cc.xml.h | 8 +- + drivers/gpu/drm/msm/dsi/sfpb.xml.h | 8 +- + drivers/gpu/drm/msm/hdmi/hdmi.c | 201 ++- + drivers/gpu/drm/msm/hdmi/hdmi.h | 38 +- + drivers/gpu/drm/msm/hdmi/hdmi.xml.h | 83 +- + drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 71 + + drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 139 +- + drivers/gpu/drm/msm/hdmi/hdmi_phy_8x74.c | 157 ++ + drivers/gpu/drm/msm/hdmi/qfprom.xml.h | 8 +- + drivers/gpu/drm/msm/{ => mdp}/mdp4/mdp4.xml.h | 88 +- + drivers/gpu/drm/msm/{ => mdp}/mdp4/mdp4_crtc.c | 26 +- + .../gpu/drm/msm/{ => mdp}/mdp4/mdp4_dtv_encoder.c | 6 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_irq.c | 93 ++ + drivers/gpu/drm/msm/{ => mdp}/mdp4/mdp4_kms.c | 61 +- + drivers/gpu/drm/msm/{ => mdp}/mdp4/mdp4_kms.h | 56 +- + drivers/gpu/drm/msm/{ => mdp}/mdp4/mdp4_plane.c | 6 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h | 1036 ++++++++++++ + drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 569 +++++++ + drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c | 258 +++ + drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c | 111 ++ + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 350 ++++ + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 213 +++ + drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 389 +++++ + drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.c | 173 ++ + drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.h | 41 + + drivers/gpu/drm/msm/mdp/mdp_common.xml.h | 78 + + .../msm/{mdp4/mdp4_format.c => mdp/mdp_format.c} | 13 +- + drivers/gpu/drm/msm/mdp/mdp_kms.c | 144 ++ + drivers/gpu/drm/msm/mdp/mdp_kms.h | 97 ++ + drivers/gpu/drm/msm/mdp4/mdp4_irq.c | 203 --- + drivers/gpu/drm/msm/msm_drv.c | 132 +- + drivers/gpu/drm/msm/msm_drv.h | 64 +- + drivers/gpu/drm/msm/msm_fb.c | 1 + + drivers/gpu/drm/msm/msm_gem.c | 170 +- + drivers/gpu/drm/msm/msm_gem.h | 5 + + drivers/gpu/drm/msm/msm_gpu.c | 39 +- + drivers/gpu/drm/msm/msm_gpu.h | 6 +- + drivers/gpu/drm/msm/msm_iommu.c | 148 ++ + drivers/gpu/drm/msm/msm_kms.h | 68 + + drivers/gpu/drm/msm/msm_mmu.h | 47 + + drivers/gpu/drm/nouveau/Makefile | 7 + + drivers/gpu/drm/nouveau/core/core/engine.c | 23 +- + drivers/gpu/drm/nouveau/core/engine/copy/nvc0.c | 6 - + drivers/gpu/drm/nouveau/core/engine/copy/nve0.c | 6 - + drivers/gpu/drm/nouveau/core/engine/device/nv04.c | 8 +- + drivers/gpu/drm/nouveau/core/engine/device/nv10.c | 32 +- + drivers/gpu/drm/nouveau/core/engine/device/nv20.c | 16 +- + drivers/gpu/drm/nouveau/core/engine/device/nv30.c | 20 +- + drivers/gpu/drm/nouveau/core/engine/device/nv40.c | 64 +- + drivers/gpu/drm/nouveau/core/engine/device/nv50.c | 56 +- + drivers/gpu/drm/nouveau/core/engine/device/nvc0.c | 36 +- + drivers/gpu/drm/nouveau/core/engine/device/nve0.c | 28 +- + drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c | 3 - + drivers/gpu/drm/nouveau/core/engine/disp/nve0.c | 3 - + drivers/gpu/drm/nouveau/core/engine/disp/nvf0.c | 3 - + drivers/gpu/drm/nouveau/core/engine/disp/vga.c | 9 +- + drivers/gpu/drm/nouveau/core/engine/falcon.c | 20 +- + drivers/gpu/drm/nouveau/core/engine/fifo/nv108.c | 37 + + drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c | 1 + + drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c | 414 +++-- + drivers/gpu/drm/nouveau/core/engine/fifo/nve0.h | 17 + + .../gpu/drm/nouveau/core/engine/graph/ctxnv108.c | 1408 +++++++++++++++++ + .../gpu/drm/nouveau/core/engine/graph/ctxnvf0.c | 7 +- + .../gpu/drm/nouveau/core/engine/graph/fuc/com.fuc | 138 +- + .../gpu/drm/nouveau/core/engine/graph/fuc/gpc.fuc | 137 +- + .../nouveau/core/engine/graph/fuc/gpcnv108.fuc5 | 42 + + .../nouveau/core/engine/graph/fuc/gpcnv108.fuc5.h | 473 ++++++ + .../nouveau/core/engine/graph/fuc/gpcnvc0.fuc.h | 704 +++++---- + .../nouveau/core/engine/graph/fuc/gpcnvd7.fuc.h | 766 ++++----- + .../nouveau/core/engine/graph/fuc/gpcnve0.fuc.h | 766 ++++----- + .../nouveau/core/engine/graph/fuc/gpcnvf0.fuc.h | 766 ++++----- + .../gpu/drm/nouveau/core/engine/graph/fuc/hub.fuc | 382 ++--- + .../nouveau/core/engine/graph/fuc/hubnv108.fuc5 | 40 + + .../nouveau/core/engine/graph/fuc/hubnv108.fuc5.h | 916 +++++++++++ + .../nouveau/core/engine/graph/fuc/hubnvc0.fuc.h | 1238 ++++++++------- + .../nouveau/core/engine/graph/fuc/hubnvd7.fuc.h | 1238 ++++++++------- + .../nouveau/core/engine/graph/fuc/hubnve0.fuc.h | 1202 +++++++------- + .../nouveau/core/engine/graph/fuc/hubnvf0.fuc.h | 1202 +++++++------- + .../drm/nouveau/core/engine/graph/fuc/macros.fuc | 141 +- + drivers/gpu/drm/nouveau/core/engine/graph/nv108.c | 236 +++ + drivers/gpu/drm/nouveau/core/engine/graph/nv50.c | 166 +- + drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c | 3 + + drivers/gpu/drm/nouveau/core/engine/graph/nvc0.h | 10 + + drivers/gpu/drm/nouveau/core/engine/graph/nvf0.c | 10 +- + drivers/gpu/drm/nouveau/core/include/core/device.h | 4 +- + drivers/gpu/drm/nouveau/core/include/engine/fifo.h | 1 + + .../gpu/drm/nouveau/core/include/engine/graph.h | 1 + + drivers/gpu/drm/nouveau/core/include/subdev/bar.h | 23 +- + .../drm/nouveau/core/include/subdev/bios/ramcfg.h | 66 + + .../drm/nouveau/core/include/subdev/bios/rammap.h | 26 +- + .../drm/nouveau/core/include/subdev/bios/timing.h | 12 +- + .../gpu/drm/nouveau/core/include/subdev/devinit.h | 39 +- + drivers/gpu/drm/nouveau/core/include/subdev/fb.h | 13 + + .../gpu/drm/nouveau/core/include/subdev/instmem.h | 34 +- + drivers/gpu/drm/nouveau/core/include/subdev/vm.h | 4 - + drivers/gpu/drm/nouveau/core/subdev/bar/base.c | 6 +- + drivers/gpu/drm/nouveau/core/subdev/bar/nv50.c | 3 +- + drivers/gpu/drm/nouveau/core/subdev/bar/nvc0.c | 3 +- + drivers/gpu/drm/nouveau/core/subdev/bar/priv.h | 26 + + drivers/gpu/drm/nouveau/core/subdev/bios/init.c | 48 +- + drivers/gpu/drm/nouveau/core/subdev/bios/ramcfg.c | 67 + + drivers/gpu/drm/nouveau/core/subdev/bios/rammap.c | 107 +- + drivers/gpu/drm/nouveau/core/subdev/bios/timing.c | 70 +- + drivers/gpu/drm/nouveau/core/subdev/clock/base.c | 9 +- + drivers/gpu/drm/nouveau/core/subdev/clock/nv04.c | 2 +- + drivers/gpu/drm/nouveau/core/subdev/clock/nve0.c | 2 +- + drivers/gpu/drm/nouveau/core/subdev/devinit/base.c | 34 +- + drivers/gpu/drm/nouveau/core/subdev/devinit/nv04.c | 36 +- + drivers/gpu/drm/nouveau/core/subdev/devinit/nv04.h | 23 + + drivers/gpu/drm/nouveau/core/subdev/devinit/nv05.c | 41 +- + drivers/gpu/drm/nouveau/core/subdev/devinit/nv10.c | 41 +- + drivers/gpu/drm/nouveau/core/subdev/devinit/nv1a.c | 37 +- + drivers/gpu/drm/nouveau/core/subdev/devinit/nv20.c | 41 +- + drivers/gpu/drm/nouveau/core/subdev/devinit/nv50.c | 32 +- + drivers/gpu/drm/nouveau/core/subdev/devinit/nv50.h | 18 + + drivers/gpu/drm/nouveau/core/subdev/devinit/nv84.c | 63 + + drivers/gpu/drm/nouveau/core/subdev/devinit/nv98.c | 62 + + drivers/gpu/drm/nouveau/core/subdev/devinit/nva3.c | 50 +- + drivers/gpu/drm/nouveau/core/subdev/devinit/nvaf.c | 63 + + drivers/gpu/drm/nouveau/core/subdev/devinit/nvc0.c | 44 +- + drivers/gpu/drm/nouveau/core/subdev/devinit/priv.h | 38 +- + drivers/gpu/drm/nouveau/core/subdev/fb/gddr5.c | 72 +- + drivers/gpu/drm/nouveau/core/subdev/fb/nvc0.c | 16 + + drivers/gpu/drm/nouveau/core/subdev/fb/priv.h | 2 +- + drivers/gpu/drm/nouveau/core/subdev/fb/ramnv50.c | 18 +- + drivers/gpu/drm/nouveau/core/subdev/fb/ramnva3.c | 22 +- + drivers/gpu/drm/nouveau/core/subdev/fb/ramnvc0.c | 24 +- + drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c | 614 ++++--- + drivers/gpu/drm/nouveau/core/subdev/instmem/base.c | 135 +- + drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.c | 140 +- + drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.h | 4 +- + drivers/gpu/drm/nouveau/core/subdev/instmem/nv40.c | 44 +- + drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c | 117 +- + drivers/gpu/drm/nouveau/core/subdev/instmem/priv.h | 56 + + drivers/gpu/drm/nouveau/core/subdev/mc/nvc0.c | 2 + + .../gpu/drm/nouveau/core/subdev/pwr/fuc/i2c_.fuc | 393 +++++ + .../gpu/drm/nouveau/core/subdev/pwr/fuc/kernel.fuc | 32 +- + .../gpu/drm/nouveau/core/subdev/pwr/fuc/macros.fuc | 53 + + .../gpu/drm/nouveau/core/subdev/pwr/fuc/nv108.fuc | 3 + + .../drm/nouveau/core/subdev/pwr/fuc/nv108.fuc.h | 467 +++++- + .../gpu/drm/nouveau/core/subdev/pwr/fuc/nva3.fuc | 3 + + .../gpu/drm/nouveau/core/subdev/pwr/fuc/nva3.fuc.h | 484 +++++- + .../gpu/drm/nouveau/core/subdev/pwr/fuc/nvc0.fuc | 3 + + .../gpu/drm/nouveau/core/subdev/pwr/fuc/nvc0.fuc.h | 484 +++++- + .../gpu/drm/nouveau/core/subdev/pwr/fuc/nvd0.fuc | 3 + + .../gpu/drm/nouveau/core/subdev/pwr/fuc/nvd0.fuc.h | 533 +++++-- + drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/os.h | 19 + + drivers/gpu/drm/nouveau/core/subdev/vm/base.c | 22 +- + drivers/gpu/drm/nouveau/dispnv04/disp.c | 5 - + drivers/gpu/drm/nouveau/dispnv04/disp.h | 1 - + drivers/gpu/drm/nouveau/dispnv04/overlay.c | 183 ++- + drivers/gpu/drm/nouveau/nouveau_acpi.c | 6 + + drivers/gpu/drm/nouveau/nouveau_bo.c | 197 +-- + drivers/gpu/drm/nouveau/nouveau_display.c | 51 +- + drivers/gpu/drm/nouveau/nouveau_display.h | 1 + + drivers/gpu/drm/nouveau/nouveau_dma.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_dma.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_drm.h | 1 + + drivers/gpu/drm/nouveau/nouveau_fence.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 10 +- + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 17 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 1 + + drivers/gpu/drm/nouveau/nv50_display.c | 22 +- + drivers/gpu/drm/omapdrm/omap_debugfs.c | 2 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 4 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 2 +- + drivers/gpu/drm/omapdrm/omap_fb.c | 4 + + drivers/gpu/drm/omapdrm/omap_irq.c | 4 +- + drivers/gpu/drm/panel/Kconfig | 19 + + drivers/gpu/drm/panel/Makefile | 1 + + drivers/gpu/drm/panel/panel-simple.c | 497 ++++++ + drivers/gpu/drm/qxl/qxl_display.c | 9 +- + drivers/gpu/drm/qxl/qxl_drv.h | 2 +- + drivers/gpu/drm/qxl/qxl_ioctl.c | 4 +- + drivers/gpu/drm/qxl/qxl_irq.c | 2 +- + drivers/gpu/drm/qxl/qxl_kms.c | 2 +- + drivers/gpu/drm/r128/r128_cce.c | 4 +- + drivers/gpu/drm/r128/r128_drv.h | 4 +- + drivers/gpu/drm/r128/r128_ioc32.c | 1 + + drivers/gpu/drm/r128/r128_irq.c | 2 +- + drivers/gpu/drm/r128/r128_state.c | 66 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 32 +- + drivers/gpu/drm/radeon/atombios_dp.c | 54 +- + drivers/gpu/drm/radeon/atombios_i2c.c | 2 - + drivers/gpu/drm/radeon/btc_dpm.c | 20 +- + drivers/gpu/drm/radeon/ci_dpm.c | 70 +- + drivers/gpu/drm/radeon/ci_smc.c | 1 + + drivers/gpu/drm/radeon/cik.c | 363 ++++- + drivers/gpu/drm/radeon/cik_sdma.c | 112 +- + drivers/gpu/drm/radeon/cikd.h | 11 + + drivers/gpu/drm/radeon/cypress_dpm.c | 15 - + drivers/gpu/drm/radeon/evergreen.c | 95 +- + drivers/gpu/drm/radeon/evergreen_cs.c | 5 +- + drivers/gpu/drm/radeon/evergreen_reg.h | 1 + + drivers/gpu/drm/radeon/evergreend.h | 4 + + drivers/gpu/drm/radeon/kv_dpm.c | 48 +- + drivers/gpu/drm/radeon/ni.c | 135 +- + drivers/gpu/drm/radeon/ni_dma.c | 69 + + drivers/gpu/drm/radeon/ni_dpm.c | 21 +- + drivers/gpu/drm/radeon/nid.h | 1 + + drivers/gpu/drm/radeon/pptable.h | 4 +- + drivers/gpu/drm/radeon/r100.c | 38 +- + drivers/gpu/drm/radeon/r300.c | 7 + + drivers/gpu/drm/radeon/r300_cmdbuf.c | 8 +- + drivers/gpu/drm/radeon/r420.c | 7 + + drivers/gpu/drm/radeon/r520.c | 5 + + drivers/gpu/drm/radeon/r600.c | 137 +- + drivers/gpu/drm/radeon/r600_cp.c | 4 +- + drivers/gpu/drm/radeon/r600_cs.c | 7 +- + drivers/gpu/drm/radeon/r600_dma.c | 13 +- + drivers/gpu/drm/radeon/r600_dpm.c | 20 +- + drivers/gpu/drm/radeon/r600_dpm.h | 2 - + drivers/gpu/drm/radeon/r600_hdmi.c | 2 +- + drivers/gpu/drm/radeon/r600d.h | 8 + + drivers/gpu/drm/radeon/radeon.h | 17 +- + drivers/gpu/drm/radeon/radeon_asic.c | 85 +- + drivers/gpu/drm/radeon/radeon_asic.h | 64 +- + drivers/gpu/drm/radeon/radeon_atombios.c | 42 +- + drivers/gpu/drm/radeon/radeon_combios.c | 16 - + drivers/gpu/drm/radeon/radeon_connectors.c | 9 - + drivers/gpu/drm/radeon/radeon_cp.c | 6 +- + drivers/gpu/drm/radeon/radeon_cs.c | 10 +- + drivers/gpu/drm/radeon/radeon_device.c | 23 +- + drivers/gpu/drm/radeon/radeon_display.c | 46 +- + drivers/gpu/drm/radeon/radeon_drv.c | 7 +- + drivers/gpu/drm/radeon/radeon_drv.h | 2 +- + drivers/gpu/drm/radeon/radeon_fence.c | 2 + + drivers/gpu/drm/radeon/radeon_gem.c | 2 +- + drivers/gpu/drm/radeon/radeon_i2c.c | 3 + + drivers/gpu/drm/radeon/radeon_irq.c | 10 +- + drivers/gpu/drm/radeon/radeon_irq_kms.c | 4 +- + drivers/gpu/drm/radeon/radeon_kms.c | 24 +- + drivers/gpu/drm/radeon/radeon_mem.c | 2 +- + drivers/gpu/drm/radeon/radeon_mode.h | 36 + + drivers/gpu/drm/radeon/radeon_object.c | 2 +- + drivers/gpu/drm/radeon/radeon_pm.c | 158 +- + drivers/gpu/drm/radeon/radeon_ring.c | 94 +- + drivers/gpu/drm/radeon/radeon_sa.c | 6 +- + drivers/gpu/drm/radeon/radeon_state.c | 18 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 197 ++- + drivers/gpu/drm/radeon/radeon_uvd.c | 3 + + drivers/gpu/drm/radeon/rs400.c | 7 + + drivers/gpu/drm/radeon/rs600.c | 7 + + drivers/gpu/drm/radeon/rs690.c | 7 + + drivers/gpu/drm/radeon/rs780_dpm.c | 8 - + drivers/gpu/drm/radeon/rv515.c | 7 + + drivers/gpu/drm/radeon/rv6xx_dpm.c | 10 - + drivers/gpu/drm/radeon/rv770.c | 55 +- + drivers/gpu/drm/radeon/rv770_dpm.c | 35 +- + drivers/gpu/drm/radeon/rv770_dpm.h | 4 - + drivers/gpu/drm/radeon/rv770d.h | 7 + + drivers/gpu/drm/radeon/si.c | 155 +- + drivers/gpu/drm/radeon/si_dpm.c | 64 +- + drivers/gpu/drm/radeon/si_smc.c | 1 + + drivers/gpu/drm/radeon/sid.h | 7 + + drivers/gpu/drm/radeon/sislands_smc.h | 2 - + drivers/gpu/drm/radeon/sumo_dpm.c | 21 +- + drivers/gpu/drm/radeon/sumo_smc.c | 1 - + drivers/gpu/drm/radeon/trinity_dpm.c | 21 +- + drivers/gpu/drm/radeon/trinity_smc.c | 3 - + drivers/gpu/drm/radeon/uvd_v2_2.c | 1 + + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 3 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 28 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.h | 14 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 4 +- + drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c | 28 +- + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 21 +- + drivers/gpu/drm/savage/savage_bci.c | 10 +- + drivers/gpu/drm/savage/savage_state.c | 8 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 18 +- + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 4 +- + drivers/gpu/drm/sis/sis_drv.c | 2 +- + drivers/gpu/drm/sis/sis_mm.c | 2 +- + drivers/gpu/drm/tegra/Kconfig | 24 +- + drivers/gpu/drm/tegra/Makefile | 2 + + drivers/gpu/drm/tegra/bus.c | 1 - + drivers/gpu/drm/tegra/dc.c | 66 +- + drivers/gpu/drm/tegra/dc.h | 9 + + drivers/gpu/drm/tegra/drm.c | 21 +- + drivers/gpu/drm/tegra/drm.h | 12 + + drivers/gpu/drm/tegra/dsi.c | 971 ++++++++++++ + drivers/gpu/drm/tegra/dsi.h | 134 ++ + drivers/gpu/drm/tegra/fb.c | 45 +- + drivers/gpu/drm/tegra/gem.c | 183 ++- + drivers/gpu/drm/tegra/gem.h | 9 +- + drivers/gpu/drm/tegra/hdmi.c | 60 +- + drivers/gpu/drm/tegra/mipi-phy.c | 138 ++ + drivers/gpu/drm/tegra/mipi-phy.h | 65 + + drivers/gpu/drm/tegra/output.c | 44 +- + drivers/gpu/drm/tegra/rgb.c | 45 + + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 6 +- + drivers/gpu/drm/ttm/ttm_bo.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 6 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 32 +- + drivers/gpu/drm/ttm/ttm_lock.c | 8 - + drivers/gpu/drm/ttm/ttm_object.c | 90 +- + drivers/gpu/drm/ttm/ttm_tt.c | 27 +- + drivers/gpu/drm/udl/udl_fb.c | 12 +- + drivers/gpu/drm/via/via_dma.c | 12 +- + drivers/gpu/drm/via/via_dmablit.c | 20 +- + drivers/gpu/drm/via/via_drv.c | 2 +- + drivers/gpu/drm/via/via_drv.h | 2 +- + drivers/gpu/drm/via/via_irq.c | 10 +- + drivers/gpu/drm/via/via_video.c | 8 +- + drivers/gpu/drm/vmwgfx/Makefile | 2 +- + drivers/gpu/drm/vmwgfx/svga3d_reg.h | 718 ++++++++- + drivers/gpu/drm/vmwgfx/svga_reg.h | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 182 ++- + drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 531 +++++++ + drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 211 ++- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 213 ++- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 872 +++++++++- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 9 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 107 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c | 160 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 15 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 39 +- + drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 38 +- + drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 652 ++++++++ + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 195 ++- + drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 441 ++++++ + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 471 +++++- + drivers/gpu/host1x/Kconfig | 2 +- + drivers/gpu/host1x/Makefile | 4 +- + drivers/gpu/host1x/bus.c | 2 + + drivers/gpu/host1x/channel.c | 5 + + drivers/gpu/host1x/debug.c | 13 +- + drivers/gpu/host1x/dev.c | 28 +- + drivers/gpu/host1x/dev.h | 2 + + drivers/gpu/host1x/hw/host1x02.c | 4 +- + drivers/gpu/host1x/hw/host1x02_hardware.h | 142 ++ + drivers/gpu/host1x/hw/host1x04.c | 42 + + drivers/gpu/host1x/hw/host1x04.h | 26 + + drivers/gpu/host1x/hw/host1x04_hardware.h | 142 ++ + drivers/gpu/host1x/hw/hw_host1x02_uclass.h | 6 + + drivers/gpu/host1x/hw/hw_host1x04_channel.h | 121 ++ + drivers/gpu/host1x/hw/hw_host1x04_sync.h | 243 +++ + drivers/gpu/host1x/hw/hw_host1x04_uclass.h | 181 +++ + drivers/gpu/host1x/job.c | 6 + + drivers/gpu/host1x/mipi.c | 275 ++++ + drivers/gpu/host1x/syncpt.c | 9 + + drivers/video/fbmem.c | 31 +- + include/drm/drmP.h | 81 +- + include/drm/drm_agpsupport.h | 33 +- + include/drm/drm_crtc.h | 4 +- + include/drm/drm_crtc_helper.h | 4 +- + include/drm/drm_dp_helper.h | 35 +- + include/drm/drm_mipi_dsi.h | 158 ++ + include/drm/drm_os_linux.h | 37 - + include/drm/drm_panel.h | 82 + + include/drm/ttm/ttm_bo_driver.h | 9 + + include/drm/ttm/ttm_object.h | 18 +- + include/linux/fb.h | 4 +- + include/linux/host1x.h | 6 + + include/uapi/drm/drm.h | 1 - + include/uapi/drm/i915_drm.h | 19 + + include/uapi/drm/radeon_drm.h | 2 + + include/uapi/drm/vmwgfx_drm.h | 260 +++ + 491 files changed, 34756 insertions(+), 11638 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mipi/dsi/mipi-dsi-bus.txt + create mode 100644 Documentation/devicetree/bindings/mipi/nvidia,tegra114-mipi.txt + create mode 100644 Documentation/devicetree/bindings/panel/auo,b101aw03.txt + create mode 100644 Documentation/devicetree/bindings/panel/chunghwa,claa101wb03.txt + create mode 100644 Documentation/devicetree/bindings/panel/panasonic,vvx10f004b00.txt + create mode 100644 Documentation/devicetree/bindings/panel/simple-panel.txt + create mode 100644 drivers/gpu/drm/bochs/Kconfig + create mode 100644 drivers/gpu/drm/bochs/Makefile + create mode 100644 drivers/gpu/drm/bochs/bochs.h + create mode 100644 drivers/gpu/drm/bochs/bochs_drv.c + create mode 100644 drivers/gpu/drm/bochs/bochs_fbdev.c + create mode 100644 drivers/gpu/drm/bochs/bochs_hw.c + create mode 100644 drivers/gpu/drm/bochs/bochs_kms.c + create mode 100644 drivers/gpu/drm/bochs/bochs_mm.c + create mode 100644 drivers/gpu/drm/drm_mipi_dsi.c + create mode 100644 drivers/gpu/drm/drm_panel.c + create mode 100644 drivers/gpu/drm/msm/hdmi/hdmi_phy_8x74.c + rename drivers/gpu/drm/msm/{ => mdp}/mdp4/mdp4.xml.h (94%) + rename drivers/gpu/drm/msm/{ => mdp}/mdp4/mdp4_crtc.c (96%) + rename drivers/gpu/drm/msm/{ => mdp}/mdp4/mdp4_dtv_encoder.c (98%) + create mode 100644 drivers/gpu/drm/msm/mdp/mdp4/mdp4_irq.c + rename drivers/gpu/drm/msm/{ => mdp}/mdp4/mdp4_kms.c (89%) + rename drivers/gpu/drm/msm/{ => mdp}/mdp4/mdp4_kms.h (79%) + rename drivers/gpu/drm/msm/{ => mdp}/mdp4/mdp4_plane.c (98%) + create mode 100644 drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h + create mode 100644 drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c + create mode 100644 drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c + create mode 100644 drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c + create mode 100644 drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c + create mode 100644 drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h + create mode 100644 drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c + create mode 100644 drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.c + create mode 100644 drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.h + create mode 100644 drivers/gpu/drm/msm/mdp/mdp_common.xml.h + rename drivers/gpu/drm/msm/{mdp4/mdp4_format.c => mdp/mdp_format.c} (85%) + create mode 100644 drivers/gpu/drm/msm/mdp/mdp_kms.c + create mode 100644 drivers/gpu/drm/msm/mdp/mdp_kms.h + delete mode 100644 drivers/gpu/drm/msm/mdp4/mdp4_irq.c + create mode 100644 drivers/gpu/drm/msm/msm_iommu.c + create mode 100644 drivers/gpu/drm/msm/msm_kms.h + create mode 100644 drivers/gpu/drm/msm/msm_mmu.h + create mode 100644 drivers/gpu/drm/nouveau/core/engine/fifo/nv108.c + create mode 100644 drivers/gpu/drm/nouveau/core/engine/fifo/nve0.h + create mode 100644 drivers/gpu/drm/nouveau/core/engine/graph/ctxnv108.c + create mode 100644 drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnv108.fuc5 + create mode 100644 drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnv108.fuc5.h + create mode 100644 drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnv108.fuc5 + create mode 100644 drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnv108.fuc5.h + create mode 100644 drivers/gpu/drm/nouveau/core/engine/graph/nv108.c + create mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/bios/ramcfg.h + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/bar/priv.h + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/bios/ramcfg.c + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/devinit/nv04.h + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/devinit/nv50.h + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/devinit/nv84.c + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/devinit/nv98.c + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/devinit/nvaf.c + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/instmem/priv.h + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/i2c_.fuc + create mode 100644 drivers/gpu/drm/panel/Kconfig + create mode 100644 drivers/gpu/drm/panel/Makefile + create mode 100644 drivers/gpu/drm/panel/panel-simple.c + create mode 100644 drivers/gpu/drm/tegra/dsi.c + create mode 100644 drivers/gpu/drm/tegra/dsi.h + create mode 100644 drivers/gpu/drm/tegra/mipi-phy.c + create mode 100644 drivers/gpu/drm/tegra/mipi-phy.h + create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_mob.c + create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_shader.c + create mode 100644 drivers/gpu/host1x/hw/host1x02_hardware.h + create mode 100644 drivers/gpu/host1x/hw/host1x04.c + create mode 100644 drivers/gpu/host1x/hw/host1x04.h + create mode 100644 drivers/gpu/host1x/hw/host1x04_hardware.h + create mode 100644 drivers/gpu/host1x/hw/hw_host1x04_channel.h + create mode 100644 drivers/gpu/host1x/hw/hw_host1x04_sync.h + create mode 100644 drivers/gpu/host1x/hw/hw_host1x04_uclass.h + create mode 100644 drivers/gpu/host1x/mipi.c + create mode 100644 include/drm/drm_mipi_dsi.h + create mode 100644 include/drm/drm_panel.h +Merging drm-intel/for-linux-next (ec14ba477919 drm/i915: Fix the offset issue for the stolen GEM objects) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/intel_opregion.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_dma.c | 1 + + drivers/gpu/drm/i915/i915_drv.c | 14 +++++++--- + drivers/gpu/drm/i915/i915_drv.h | 1 + + drivers/gpu/drm/i915/i915_gem.c | 42 ++++++++++++++++++----------- + drivers/gpu/drm/i915/i915_gem_evict.c | 27 ++++++++++++++----- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 14 +++++----- + drivers/gpu/drm/i915/i915_gem_stolen.c | 2 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 22 ++++++++++----- + drivers/gpu/drm/i915/i915_reg.h | 15 ++++++----- + drivers/gpu/drm/i915/intel_display.c | 32 +++++++++++++++++++--- + drivers/gpu/drm/i915/intel_dp.c | 43 +++++++++++++++++++----------- + drivers/gpu/drm/i915/intel_drv.h | 1 + + drivers/gpu/drm/i915/intel_opregion.c | 10 ++----- + drivers/gpu/drm/i915/intel_panel.c | 6 ++--- + drivers/gpu/drm/i915/intel_ringbuffer.c | 10 ++++--- + drivers/gpu/drm/i915/intel_sprite.c | 18 ++++++------- + drivers/gpu/drm/i915/intel_uncore.c | 2 +- + include/uapi/drm/i915_drm.h | 2 +- + 18 files changed, 170 insertions(+), 92 deletions(-) +Merging drm-tegra/drm/for-next (13411ddd3190 drm/tegra: Obtain head number from DT) +$ git merge drm-tegra/drm/for-next +Auto-merging include/drm/drm_crtc.h +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/drm_crtc_helper.c +Auto-merging drivers/gpu/drm/drm_crtc.c +Merge made by the 'recursive' strategy. + .../bindings/gpu/nvidia,tegra20-host1x.txt | 3 ++ + .../bindings/panel/chunghwa,claa101wa01a.txt | 7 +++ + .../bindings/panel/samsung,ltn101nt05.txt | 7 +++ + drivers/gpu/drm/drm_crtc.c | 23 ++++++++++ + drivers/gpu/drm/drm_crtc_helper.c | 29 ------------ + drivers/gpu/drm/i915/intel_display.c | 26 +---------- + drivers/gpu/drm/panel/panel-simple.c | 51 ++++++++++++++++++++++ + drivers/gpu/drm/tegra/dc.c | 41 ++++++++++++++++- + drivers/gpu/drm/tegra/hdmi.c | 3 -- + drivers/gpu/drm/tegra/output.c | 7 ++- + drivers/gpu/drm/tegra/rgb.c | 2 +- + drivers/gpu/host1x/hw/intr_hw.c | 1 - + include/drm/drm_crtc.h | 26 +++++++++++ + 13 files changed, 164 insertions(+), 62 deletions(-) + create mode 100644 Documentation/devicetree/bindings/panel/chunghwa,claa101wa01a.txt + create mode 100644 Documentation/devicetree/bindings/panel/samsung,ltn101nt05.txt +Merging sound/for-next (e7729a415315 ALSA: hda - Fix silent output on MacBook Air 1,1) +$ git merge sound/for-next +Already up-to-date. +Merging sound-asoc/for-next (024531999da9 Merge remote-tracking branches 'asoc/fix/arizona', 'asoc/fix/fsl', 'asoc/fix/omap', 'asoc/fix/samsung', 'asoc/fix/simple' and 'asoc/fix/wm5100' into asoc-linus) +$ git merge sound-asoc/for-next +Auto-merging sound/soc/fsl/fsl_ssi.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/simple-card.txt | 2 +- + sound/soc/codecs/wm5100.c | 2 + + sound/soc/codecs/wm5110.c | 48 ++++++++++++++++++++++ + sound/soc/fsl/fsl_ssi.c | 9 +--- + sound/soc/omap/Kconfig | 1 + + sound/soc/samsung/Kconfig | 4 +- + sound/soc/samsung/h1940_uda1380.c | 1 + + sound/soc/samsung/i2s.c | 5 +-- + sound/soc/samsung/neo1973_wm8753.c | 1 + + sound/soc/samsung/rx1950_uda1380.c | 1 + + sound/soc/samsung/s3c-i2s-v2.c | 6 +-- + sound/soc/samsung/s3c2412-i2s.c | 2 + + sound/soc/samsung/s3c24xx-i2s.c | 2 + + sound/soc/samsung/smartq_wm8987.c | 1 + + sound/soc/samsung/smdk_wm8994.c | 4 +- + 15 files changed, 70 insertions(+), 19 deletions(-) +Merging modules/modules-next (22e669568d51 module: Add missing newline in printk call.) +$ git merge modules/modules-next +Already up-to-date. +Merging virtio/virtio-next (05c54de8c88c drivers: virtio: Mark function virtballoon_migratepage() as static in virtio_balloon.c) +$ git merge virtio/virtio-next +Already up-to-date. +Merging input/next (6f2e6c9b451b Input: zforce - add devicetree support) +$ git merge input/next +Auto-merging drivers/input/touchscreen/zforce_ts.c +Merge made by the 'recursive' strategy. + .../bindings/input/touchscreen/zforce_ts.txt | 30 +++++++ + drivers/input/misc/wistron_btns.c | 19 +++++ + drivers/input/tablet/gtco.c | 2 +- + drivers/input/touchscreen/zforce_ts.c | 95 ++++++++++++++++++---- + 4 files changed, 127 insertions(+), 19 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt +Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) +$ git merge input-mt/for-next +Already up-to-date. +Merging cgroup/for-next (f446b64bccab Merge branch 'for-3.14' into for-next) +$ git merge cgroup/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging block/for-next (2a53fee6859b Merge branch 'for-3.14/core' into for-next) +$ git merge block/for-next +Resolved 'drivers/md/dm-thin.c' using previous resolution. +Resolved 'drivers/md/raid1.c' using previous resolution. +Resolved 'drivers/md/raid10.c' using previous resolution. +Resolved 'fs/btrfs/extent_io.c' using previous resolution. +Resolved 'fs/f2fs/data.c' using previous resolution. +Resolved 'fs/f2fs/segment.c' using previous resolution. +Resolved 'include/trace/events/f2fs.h' using previous resolution. +Auto-merging net/ceph/messenger.c +Auto-merging mm/page_io.c +Auto-merging include/trace/events/f2fs.h +CONFLICT (content): Merge conflict in include/trace/events/f2fs.h +Auto-merging include/linux/ceph/messenger.h +Auto-merging fs/xfs/xfs_buf.c +Auto-merging fs/xfs/xfs_aops.c +Auto-merging fs/gfs2/ops_fstype.c +Auto-merging fs/gfs2/lops.c +Auto-merging fs/f2fs/segment.c +CONFLICT (content): Merge conflict in fs/f2fs/segment.c +Auto-merging fs/f2fs/data.c +CONFLICT (content): Merge conflict in fs/f2fs/data.c +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/scrub.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/file-item.c +Auto-merging fs/btrfs/extent_io.c +CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/compression.c +Auto-merging fs/btrfs/check-integrity.c +Auto-merging drivers/staging/lustre/lustre/llite/lloop.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/s390/block/xpram.c +Auto-merging drivers/md/raid5.c +Auto-merging drivers/md/raid10.c +CONFLICT (content): Merge conflict in drivers/md/raid10.c +Auto-merging drivers/md/raid1.c +CONFLICT (content): Merge conflict in drivers/md/raid1.c +Auto-merging drivers/md/md.c +Auto-merging drivers/md/dm.c +Auto-merging drivers/md/dm-thin.c +CONFLICT (content): Merge conflict in drivers/md/dm-thin.c +Auto-merging drivers/md/dm-snap.c +Auto-merging drivers/md/dm-delay.c +Auto-merging drivers/md/dm-cache-target.c +Auto-merging drivers/md/dm-cache-policy-mq.c +Auto-merging drivers/md/dm-bufio.c +Auto-merging drivers/md/bcache/request.c +Auto-merging drivers/block/xen-blkfront.c +Auto-merging drivers/block/rbd.c +Auto-merging drivers/block/null_blk.c +Auto-merging block/blk-throttle.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 76b3ea92808d] Merge remote-tracking branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/block/biodoc.txt | 7 +- + Documentation/block/biovecs.txt | 111 ++++ + arch/m68k/emu/nfblock.c | 13 +- + arch/powerpc/sysdev/axonram.c | 21 +- + block/blk-core.c | 61 +- + block/blk-exec.c | 4 + + block/blk-flush.c | 10 +- + block/blk-integrity.c | 40 +- + block/blk-lib.c | 12 +- + block/blk-map.c | 6 +- + block/blk-merge.c | 66 +- + block/blk-mq-cpu.c | 37 +- + block/blk-mq.c | 169 +++--- + block/blk-mq.h | 3 +- + block/blk-settings.c | 4 + + block/blk-sysfs.c | 1 + + block/blk-throttle.c | 14 +- + block/cmdline-parser.c | 18 +- + block/elevator.c | 2 +- + block/scsi_ioctl.c | 6 +- + drivers/block/aoe/aoe.h | 10 +- + drivers/block/aoe/aoecmd.c | 153 ++--- + drivers/block/brd.c | 16 +- + drivers/block/cciss.c | 4 +- + drivers/block/drbd/drbd_actlog.c | 2 +- + drivers/block/drbd/drbd_bitmap.c | 2 +- + drivers/block/drbd/drbd_main.c | 27 +- + drivers/block/drbd/drbd_receiver.c | 19 +- + drivers/block/drbd/drbd_req.c | 6 +- + drivers/block/drbd/drbd_req.h | 2 +- + drivers/block/drbd/drbd_worker.c | 8 +- + drivers/block/floppy.c | 52 +- + drivers/block/loop.c | 29 +- + drivers/block/mtip32xx/mtip32xx.c | 270 +++++---- + drivers/block/mtip32xx/mtip32xx.h | 14 +- + drivers/block/nbd.c | 14 +- + drivers/block/null_blk.c | 5 + + drivers/block/nvme-core.c | 142 +---- + drivers/block/paride/pg.c | 2 +- + drivers/block/pktcdvd.c | 186 +++--- + drivers/block/ps3disk.c | 17 +- + drivers/block/ps3vram.c | 12 +- + drivers/block/rbd.c | 91 +-- + drivers/block/rsxx/dev.c | 6 +- + drivers/block/rsxx/dma.c | 15 +- + drivers/block/sx8.c | 16 +- + drivers/block/umem.c | 53 +- + drivers/block/xen-blkback/blkback.c | 2 +- + drivers/block/xen-blkfront.c | 2 +- + drivers/cdrom/gdrom.c | 4 +- + drivers/md/bcache/Makefile | 5 +- + drivers/md/bcache/alloc.c | 89 ++- + drivers/md/bcache/bcache.h | 84 ++- + drivers/md/bcache/bset.c | 904 ++++++++++++++++------------ + drivers/md/bcache/bset.h | 440 +++++++++----- + drivers/md/bcache/btree.c | 682 ++++++++------------- + drivers/md/bcache/btree.h | 62 +- + drivers/md/bcache/closure.c | 90 +-- + drivers/md/bcache/closure.h | 355 ++++------- + drivers/md/bcache/debug.c | 268 +++------ + drivers/md/bcache/debug.h | 27 +- + drivers/md/bcache/extents.c | 616 +++++++++++++++++++ + drivers/md/bcache/extents.h | 13 + + drivers/md/bcache/io.c | 196 +----- + drivers/md/bcache/journal.c | 87 +-- + drivers/md/bcache/journal.h | 1 + + drivers/md/bcache/movinggc.c | 6 +- + drivers/md/bcache/request.c | 197 +++--- + drivers/md/bcache/request.h | 21 +- + drivers/md/bcache/super.c | 123 ++-- + drivers/md/bcache/sysfs.c | 79 +-- + drivers/md/bcache/util.c | 4 +- + drivers/md/bcache/util.h | 8 + + drivers/md/bcache/writeback.c | 6 +- + drivers/md/bcache/writeback.h | 2 +- + drivers/md/dm-bio-record.h | 37 +- + drivers/md/dm-bufio.c | 2 +- + drivers/md/dm-cache-policy-mq.c | 4 +- + drivers/md/dm-cache-target.c | 28 +- + drivers/md/dm-crypt.c | 64 +- + drivers/md/dm-delay.c | 7 +- + drivers/md/dm-flakey.c | 7 +- + drivers/md/dm-io.c | 37 +- + drivers/md/dm-linear.c | 3 +- + drivers/md/dm-raid1.c | 20 +- + drivers/md/dm-region-hash.c | 3 +- + drivers/md/dm-snap.c | 19 +- + drivers/md/dm-stripe.c | 13 +- + drivers/md/dm-switch.c | 4 +- + drivers/md/dm-thin.c | 30 +- + drivers/md/dm-verity.c | 62 +- + drivers/md/dm.c | 189 +----- + drivers/md/faulty.c | 19 +- + drivers/md/linear.c | 96 +-- + drivers/md/md.c | 12 +- + drivers/md/multipath.c | 13 +- + drivers/md/raid0.c | 79 +-- + drivers/md/raid1.c | 73 +-- + drivers/md/raid10.c | 194 +++--- + drivers/md/raid5.c | 85 +-- + drivers/message/fusion/mptsas.c | 8 +- + drivers/s390/block/dasd_diag.c | 10 +- + drivers/s390/block/dasd_eckd.c | 48 +- + drivers/s390/block/dasd_fba.c | 26 +- + drivers/s390/block/dcssblk.c | 21 +- + drivers/s390/block/scm_blk.c | 8 +- + drivers/s390/block/scm_blk_cluster.c | 4 +- + drivers/s390/block/xpram.c | 19 +- + drivers/scsi/libsas/sas_expander.c | 8 +- + drivers/scsi/mpt2sas/mpt2sas_transport.c | 41 +- + drivers/scsi/mpt3sas/mpt3sas_transport.c | 39 +- + drivers/scsi/osd/osd_initiator.c | 2 +- + drivers/scsi/sd.c | 2 +- + drivers/scsi/sd_dif.c | 30 +- + drivers/staging/lustre/lustre/llite/lloop.c | 26 +- + drivers/staging/zram/zram_drv.c | 33 +- + drivers/target/target_core_iblock.c | 2 +- + fs/bio-integrity.c | 170 ++---- + fs/bio.c | 502 +++++++-------- + fs/btrfs/check-integrity.c | 8 +- + fs/btrfs/compression.c | 27 +- + fs/btrfs/disk-io.c | 13 +- + fs/btrfs/extent_io.c | 49 +- + fs/btrfs/file-item.c | 19 +- + fs/btrfs/inode.c | 37 +- + fs/btrfs/raid56.c | 22 +- + fs/btrfs/scrub.c | 12 +- + fs/btrfs/volumes.c | 19 +- + fs/buffer.c | 14 +- + fs/direct-io.c | 4 +- + fs/ext4/page-io.c | 8 +- + fs/f2fs/data.c | 31 +- + fs/gfs2/lops.c | 2 +- + fs/gfs2/ops_fstype.c | 2 +- + fs/hfsplus/wrapper.c | 2 +- + fs/jfs/jfs_logmgr.c | 12 +- + fs/jfs/jfs_metapage.c | 9 +- + fs/logfs/dev_bdev.c | 38 +- + fs/mpage.c | 19 +- + fs/nfs/blocklayout/blocklayout.c | 43 +- + fs/nilfs2/segbuf.c | 3 +- + fs/ocfs2/cluster/heartbeat.c | 2 +- + fs/xfs/xfs_aops.c | 2 +- + fs/xfs/xfs_buf.c | 4 +- + include/linux/bio.h | 283 +++++---- + include/linux/blk-mq.h | 16 +- + include/linux/blk_types.h | 24 +- + include/linux/blkdev.h | 10 +- + include/linux/ceph/messenger.h | 4 +- + include/linux/cmdline-parser.h | 8 +- + include/linux/dm-io.h | 4 +- + include/trace/events/bcache.h | 36 +- + include/trace/events/block.h | 26 +- + include/trace/events/f2fs.h | 4 +- + include/uapi/linux/bcache.h | 3 +- + include/uapi/linux/fd.h | 3 +- + kernel/power/block_io.c | 2 +- + kernel/trace/blktrace.c | 15 +- + lib/percpu_ida.c | 7 +- + mm/bounce.c | 44 +- + mm/page_io.c | 10 +- + net/ceph/messenger.c | 43 +- + 162 files changed, 4607 insertions(+), 4586 deletions(-) + create mode 100644 Documentation/block/biovecs.txt + create mode 100644 drivers/md/bcache/extents.c + create mode 100644 drivers/md/bcache/extents.h +Merging device-mapper/for-next (5066a4df1f42 dm log userspace: allow mark requests to piggyback on flush requests) +$ git merge device-mapper/for-next +Already up-to-date. +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 (945be38caa28 mmc: sdhci-pci: Fix possibility of chip->fixes being null) +$ git merge mmc/mmc-next +Already up-to-date. +Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command) +$ git merge kgdb/kgdb-next +Resolved 'kernel/debug/debug_core.h' using previous resolution. +Auto-merging kernel/debug/debug_core.h +CONFLICT (content): Merge conflict in kernel/debug/debug_core.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fcb4f04bce17] Merge remote-tracking branch 'kgdb/kgdb-next' +$ git diff -M --stat --summary HEAD^.. +Merging slab/for-next (26e4f2057516 slub: Fix possible format string bug.) +$ git merge slab/for-next +Auto-merging mm/slub.c +Merge made by the 'recursive' strategy. + mm/slub.c | 50 ++++++++++++++++++++++++++++---------------------- + 1 file changed, 28 insertions(+), 22 deletions(-) +Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1) +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next (7da9d450ab28 md/raid5: close recently introduced race in stripe_head management.) +$ 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 (02915661dbb9 mfd: wm5110: Add register patch for rev D chip) +$ git merge mfd-lj/for-mfd-next +Already up-to-date. +Merging battery/master (4f8dd2c10bec dt: binding documentation for bq2415x charger) +$ git merge battery/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/power/bq2415x.txt | 47 ++++++++++++++++++++++ + drivers/power/ds2782_battery.c | 2 +- + drivers/power/isp1704_charger.c | 2 - + 3 files changed, 48 insertions(+), 3 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/bq2415x.txt +Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path) +$ git merge fbdev/for-next +Already up-to-date. +Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par) +$ git merge viafb/viafb-next +Already up-to-date. +Merging omap_dss2/for-next (cb1fbad7ec25 Merge branches '3.14/fbdev', '3.14/dss-misc' and '3.14/dss-fclk' into for-next) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (dab396310a03 Merge remote-tracking branch 'regulator/fix/ab3100' into regulator-linus) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + drivers/regulator/ab3100.c | 4 ++-- + drivers/regulator/core.c | 9 ++++++++- + 2 files changed, 10 insertions(+), 3 deletions(-) +Merging security/next (923b49ff69fc Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into next) +$ git merge security/next +Already up-to-date. +Merging selinux/next (41be702a542a Merge tag 'v3.13' into next) +$ git merge selinux/next +Merge made by the 'recursive' strategy. +Merging lblnet/master (07bc9dc1b01b Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc) +$ git merge lblnet/master +Already up-to-date. +Merging watchdog/master (c5321c491606 watchdog: w83627hf_wdt: Reset watchdog trigger during initialization) +$ git merge watchdog/master +Resolved 'arch/arm/configs/bcm_defconfig' using previous resolution. +Auto-merging drivers/watchdog/davinci_wdt.c +Auto-merging arch/arm/configs/bcm_defconfig +CONFLICT (content): Merge conflict in arch/arm/configs/bcm_defconfig +Auto-merging arch/arm/boot/dts/sama5d3.dtsi +Auto-merging arch/arm/boot/dts/at91sam9x5.dtsi +Auto-merging arch/arm/boot/dts/at91sam9n12.dtsi +Auto-merging arch/arm/boot/dts/at91sam9g45.dtsi +Auto-merging arch/arm/boot/dts/at91sam9263.dtsi +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0e6b7974d3bc] Merge remote-tracking branch 'watchdog/master' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/watchdog/atmel-wdt.txt | 30 +- + .../devicetree/bindings/watchdog/davinci-wdt.txt | 16 +- + .../devicetree/bindings/watchdog/gpio-wdt.txt | 23 ++ + .../devicetree/bindings/watchdog/samsung-wdt.txt | 21 +- + arch/arm/boot/dts/at91sam9260.dtsi | 5 + + arch/arm/boot/dts/at91sam9263.dtsi | 5 + + arch/arm/boot/dts/at91sam9g45.dtsi | 5 + + arch/arm/boot/dts/at91sam9n12.dtsi | 5 + + arch/arm/boot/dts/at91sam9x5.dtsi | 5 + + arch/arm/boot/dts/kizbox.dts | 6 + + arch/arm/boot/dts/sama5d3.dtsi | 5 + + arch/arm/configs/bcm_defconfig | 3 + + drivers/watchdog/Kconfig | 59 +++- + drivers/watchdog/Makefile | 2 + + drivers/watchdog/alim1535_wdt.c | 2 +- + drivers/watchdog/alim7101_wdt.c | 2 +- + drivers/watchdog/at91sam9_wdt.c | 320 +++++++++++++----- + drivers/watchdog/bcm_kona_wdt.c | 368 +++++++++++++++++++++ + drivers/watchdog/davinci_wdt.c | 221 ++++++------- + drivers/watchdog/dw_wdt.c | 2 +- + drivers/watchdog/gpio_wdt.c | 254 ++++++++++++++ + drivers/watchdog/hpwdt.c | 13 +- + drivers/watchdog/i6300esb.c | 2 +- + drivers/watchdog/imx2_wdt.c | 4 + + drivers/watchdog/moxart_wdt.c | 15 + + drivers/watchdog/mpc8xxx_wdt.c | 110 +++--- + drivers/watchdog/nv_tco.c | 2 +- + drivers/watchdog/pcwd_pci.c | 2 +- + drivers/watchdog/s3c2410_wdt.c | 203 +++++++++++- + drivers/watchdog/sirfsoc_wdt.c | 2 +- + drivers/watchdog/sp5100_tco.c | 2 +- + drivers/watchdog/via_wdt.c | 2 +- + drivers/watchdog/w83627hf_wdt.c | 234 +++++++++++-- + drivers/watchdog/watchdog_core.c | 4 +- + drivers/watchdog/wdt_pci.c | 2 +- + 35 files changed, 1598 insertions(+), 358 deletions(-) + create mode 100644 Documentation/devicetree/bindings/watchdog/gpio-wdt.txt + create mode 100644 drivers/watchdog/bcm_kona_wdt.c + create mode 100644 drivers/watchdog/gpio_wdt.c +Merging dwmw2-iommu/master (e5d0c874391a Merge tag 'iommu-updates-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging iommu/next (dd1a175695ed Merge branches 'arm/smmu', 'core', 'x86/vt-d', 'arm/shmobile', 'x86/amd', 'ppc/pamu', 'iommu/fixes' and 'arm/msm' into next) +$ git merge iommu/next +Resolved 'drivers/gpu/drm/msm/Kconfig' using previous resolution. +Auto-merging drivers/iommu/intel_irq_remapping.c +Auto-merging drivers/iommu/intel-iommu.c +Auto-merging drivers/gpu/drm/msm/Kconfig +CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7ce6cffd1d0c] Merge remote-tracking branch 'iommu/next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/msm/Kconfig | 1 + + drivers/iommu/Kconfig | 1 + + drivers/iommu/amd_iommu.c | 4 +- + drivers/iommu/arm-smmu.c | 33 ++++-- + drivers/iommu/dmar.c | 135 +++++++++++++--------- + drivers/iommu/fsl_pamu_domain.c | 6 +- + drivers/iommu/intel-iommu.c | 216 +++++++++++++++--------------------- + drivers/iommu/intel_irq_remapping.c | 105 ++++++++---------- + drivers/iommu/irq_remapping.c | 6 +- + drivers/iommu/of_iommu.c | 1 + + drivers/iommu/shmobile-iommu.c | 3 +- + drivers/iommu/shmobile-ipmmu.c | 10 +- + drivers/iommu/shmobile-ipmmu.h | 2 +- + include/linux/dma_remapping.h | 4 - + include/linux/dmar.h | 13 ++- + include/linux/intel-iommu.h | 3 +- + include/linux/iommu.h | 16 ++- + 17 files changed, 279 insertions(+), 280 deletions(-) +Merging vfio/next (3be3a074cf5b vfio-pci: Don't use device_lock around AER interrupt setup) +$ git merge vfio/next +Already up-to-date. +Merging osd/linux-next (19350e7627a6 exofs: Print less in r4w) +$ git merge osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next (5c050fb96380 docs: update the development process document) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging trivial/for-next (c04e7da0133f neighbour.h: fix comment) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/master (f3411cb2b2e3 audit: whitespace fix in kernel-parameters.txt) +$ git merge audit/master +Already up-to-date. +Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls) +$ git merge fsnotify/for-next +Already up-to-date. +Merging devicetree/devicetree/next (2a9330010bea dt/bindings: submitting patches and ABI documents) +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging dt-rh/for-next (e48ca29d30a1 dt-bindings: add rockchip vendor prefix) +$ git merge dt-rh/for-next +Already up-to-date. +Merging spi/for-next (629a6a9c349e Merge remote-tracking branch 'spi/fix/rspi' into spi-linus) +$ git merge spi/for-next +Auto-merging drivers/spi/spi.c +Auto-merging drivers/spi/Kconfig +Merge made by the 'recursive' strategy. + Documentation/spi/spi-summary | 17 ++++++++++++++++- + drivers/spi/Kconfig | 4 ++-- + drivers/spi/spi-nuc900.c | 2 ++ + drivers/spi/spi.c | 4 +--- + include/linux/spi/spi.h | 7 +++++-- + 5 files changed, 26 insertions(+), 8 deletions(-) +Merging tip/auto-latest (5a0c401955b2 Merge branch 'x86/x32') +$ git merge tip/auto-latest +Resolved 'Documentation/sysctl/kernel.txt' using previous resolution. +Auto-merging kernel/sysctl.c +Auto-merging kernel/softirq.c +Auto-merging kernel/sched/core.c +Auto-merging include/linux/sched/sysctl.h +Auto-merging drivers/irqchip/Makefile +Auto-merging arch/x86/mm/srat.c +Auto-merging arch/x86/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/sysctl/kernel.txt +CONFLICT (content): Merge conflict in Documentation/sysctl/kernel.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ae0e1099781d] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + .../interrupt-controller/lsi,zevio-intc.txt | 18 +++ + Documentation/sysctl/kernel.txt | 42 +++++++ + MAINTAINERS | 13 +++ + arch/x86/Kconfig | 7 +- + arch/x86/Makefile | 14 +++ + arch/x86/boot/Makefile | 15 +-- + arch/x86/boot/video.h | 2 +- + arch/x86/include/asm/amd_nb.h | 2 +- + arch/x86/include/asm/tlbflush.h | 6 +- + arch/x86/include/asm/uv/uv.h | 2 - + arch/x86/include/uapi/asm/sembuf.h | 10 +- + arch/x86/kernel/amd_nb.c | 2 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 1 - + arch/x86/kernel/cpu/amd.c | 5 +- + arch/x86/kernel/cpu/intel.c | 10 +- + arch/x86/kernel/cpu/mtrr/generic.c | 4 +- + arch/x86/kernel/quirks.c | 37 ++++++ + arch/x86/mm/srat.c | 16 ++- + arch/x86/mm/tlb.c | 52 +++------ + arch/x86/platform/intel-mid/intel_mid_weak_decls.h | 6 +- + arch/x86/platform/intel-mid/mfld.c | 6 +- + arch/x86/platform/intel-mid/mrfl.c | 2 +- + arch/x86/platform/uv/uv_nmi.c | 65 ++++++++--- + arch/x86/realmode/rm/Makefile | 17 +-- + arch/x86/tools/relocs.c | 30 ++++- + arch/x86/tools/relocs.h | 7 +- + arch/x86/tools/relocs_common.c | 16 ++- + drivers/irqchip/Makefile | 1 + + drivers/irqchip/irq-armada-370-xp.c | 4 +- + drivers/irqchip/irq-zevio.c | 127 +++++++++++++++++++++ + include/linux/jiffies.h | 6 + + include/linux/kgdb.h | 3 +- + include/linux/sched/sysctl.h | 2 +- + include/linux/tick.h | 6 +- + include/linux/vm_event_item.h | 4 +- + include/linux/vmstat.h | 8 ++ + include/uapi/asm-generic/ipcbuf.h | 4 +- + include/uapi/asm-generic/msgbuf.h | 10 +- + include/uapi/asm-generic/shmbuf.h | 24 ++-- + include/uapi/linux/mqueue.h | 10 +- + include/uapi/linux/msg.h | 4 +- + include/uapi/linux/resource.h | 32 +++--- + include/uapi/linux/shm.h | 10 +- + include/uapi/linux/timex.h | 34 +++--- + kernel/debug/debug_core.c | 5 +- + kernel/debug/debug_core.h | 2 - + kernel/hung_task.c | 6 +- + kernel/sched/core.c | 2 +- + kernel/softirq.c | 2 +- + kernel/sysctl.c | 7 +- + kernel/time/tick-sched.c | 27 ++--- + mm/vmstat.c | 4 +- + tools/perf/design.txt | 1 - + 53 files changed, 520 insertions(+), 232 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/lsi,zevio-intc.txt + create mode 100644 drivers/irqchip/irq-zevio.c +Merging clockevents/clockevents/next (00e2bcd6d35f clocksource: Timer-sun5i: Switch to sched_clock_register()) +$ git merge clockevents/clockevents/next +Already up-to-date. +Merging edac/linux_next (3e45588825c1 cell_edac: fix missing of_node_put) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (881f0fcef999 EDAC: Don't try to cancel workqueue when it's never setup) +$ git merge edac-amd/for-next +Already up-to-date. +Merging ftrace/for-next (3132e107d608 tracing: Check if tracing is enabled in trace_puts()) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (98cbc61863d3 Merge commit '0d3c55bc9fd58393bd3bd9974991ec1f815e1326' into HEAD) +$ git merge rcu/rcu/next +Auto-merging include/linux/rcupdate.h +Merge made by the 'recursive' strategy. + Documentation/memory-barriers.txt | 17 +++++++++++++++++ + include/linux/rcupdate.h | 8 ++------ + 2 files changed, 19 insertions(+), 6 deletions(-) +Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions) +$ git merge uprobes/for-next +Already up-to-date. +Merging kvm/linux-next (c760f5e29d92 Merge tag 'kvm-s390-20140117' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-queue) +$ git merge kvm/linux-next +Merge made by the 'recursive' strategy. + arch/s390/include/asm/kvm_host.h | 15 ++++++++++++++- + arch/s390/kvm/intercept.c | 11 +++++++++++ + arch/s390/kvm/kvm-s390.c | 17 +++++++++++------ + arch/s390/kvm/kvm-s390.h | 6 ++++++ + drivers/s390/kvm/virtio_ccw.c | 11 +++++++++-- + 5 files changed, 51 insertions(+), 9 deletions(-) +Merging kvm-arm/kvm-arm-next (31ac1ca80d75 KVM: Specify byte order for KVM_EXIT_MMIO) +$ git merge kvm-arm/kvm-arm-next +Merge made by the 'recursive' strategy. + Documentation/virtual/kvm/api.txt | 4 ++++ + 1 file changed, 4 insertions(+) +Merging kvm-ppc/kvm-ppc-next (27025a602cb9 powerpc: kvm: optimize "sc 1" as fast return) +$ git merge kvm-ppc/kvm-ppc-next +Auto-merging arch/powerpc/kvm/book3s_hv_rmhandlers.S +Auto-merging arch/powerpc/kvm/book3s_hv.c +Merge made by the 'recursive' strategy. + arch/powerpc/kvm/book3s_hv.c | 10 ++++------ + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 19 ++++++++++++++++++- + 2 files changed, 22 insertions(+), 7 deletions(-) +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 (c9f6e9977e38 xen/pvh: Set X86_CR0_WP and others in CR0 (v2)) +$ git merge xen-tip/linux-next +Already up-to-date. +Merging percpu/for-next (d5f2deed588b Merge branch 'for-3.14' into for-next) +$ git merge percpu/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging workqueues/for-next (9af16df84f0c Merge branch 'for-3.14' into for-next) +$ git merge workqueues/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging drivers-x86/linux-next (b4b0b4a9e039 ipc: add intel-mid's pci id macros) +$ git merge drivers-x86/linux-next +Resolved 'drivers/platform/x86/mxm-wmi.c' using previous resolution. +Auto-merging drivers/platform/x86/toshiba_acpi.c +Auto-merging drivers/platform/x86/sony-laptop.c +Auto-merging drivers/platform/x86/mxm-wmi.c +CONFLICT (content): Merge conflict in drivers/platform/x86/mxm-wmi.c +Auto-merging drivers/platform/x86/hp_accel.c +Auto-merging drivers/platform/x86/eeepc-laptop.c +Auto-merging drivers/platform/x86/asus-wmi.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 919213119a96] Merge remote-tracking branch 'drivers-x86/linux-next' +$ git diff -M --stat --summary HEAD^.. + drivers/platform/x86/Kconfig | 19 +++ + drivers/platform/x86/Makefile | 2 + + drivers/platform/x86/asus-wmi.c | 48 ++------ + drivers/platform/x86/compal-laptop.c | 121 +++++++++--------- + drivers/platform/x86/dell-laptop.c | 78 ++++++------ + drivers/platform/x86/eeepc-laptop.c | 52 ++------ + drivers/platform/x86/fujitsu-laptop.c | 15 ++- + drivers/platform/x86/hp-wireless.c | 132 ++++++++++++++++++++ + drivers/platform/x86/hp_accel.c | 7 +- + drivers/platform/x86/intel_baytrail.c | 224 ++++++++++++++++++++++++++++++++++ + drivers/platform/x86/intel_baytrail.h | 90 ++++++++++++++ + drivers/platform/x86/intel_scu_ipc.c | 87 ++++++------- + drivers/platform/x86/mxm-wmi.c | 1 + + drivers/platform/x86/sony-laptop.c | 2 +- + drivers/platform/x86/toshiba_acpi.c | 1 + + 15 files changed, 642 insertions(+), 237 deletions(-) + create mode 100644 drivers/platform/x86/hp-wireless.c + create mode 100644 drivers/platform/x86/intel_baytrail.c + create mode 100644 drivers/platform/x86/intel_baytrail.h +Merging chrome-platform/for-next (2b8454a75b90 platform/chrome: unregister platform driver/device when module exit) +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. + drivers/platform/chrome/Kconfig | 14 ++ + drivers/platform/chrome/Makefile | 1 + + drivers/platform/chrome/chromeos_laptop.c | 298 +++++++++++++++++++++--------- + drivers/platform/chrome/chromeos_pstore.c | 101 ++++++++++ + 4 files changed, 323 insertions(+), 91 deletions(-) + create mode 100644 drivers/platform/chrome/chromeos_pstore.c +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 (afda06ac2771 Merge remote-tracking branch 'regmap/fix/block' into regmap-linus) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regcache.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging hsi/for-next (43139a61fc68 HSI: hsi_char: Update ioctl-number.txt) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (3cb6f44aedf5 leds: s3c24xx: Remove hardware.h inclusion) +$ git merge leds/for-next +Resolved 'drivers/leds/leds-s3c24xx.c' using previous resolution. +Auto-merging include/linux/mfd/mc13xxx.h +Auto-merging drivers/leds/leds-s3c24xx.c +CONFLICT (content): Merge conflict in drivers/leds/leds-s3c24xx.c +Auto-merging drivers/leds/leds-lp5523.c +Auto-merging drivers/leds/leds-lp5521.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 323809ef2026] Merge remote-tracking branch 'leds/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/leds/tca6507.txt | 16 ++ + Documentation/leds/leds-lp55xx.txt | 10 +- + arch/arm/mach-imx/mach-mx31moboard.c | 16 +- + drivers/leds/led-triggers.c | 15 +- + drivers/leds/leds-lp5521.c | 18 +- + drivers/leds/leds-lp5523.c | 20 +- + drivers/leds/leds-lp55xx-common.c | 2 + + drivers/leds/leds-mc13783.c | 89 +-------- + drivers/leds/leds-pwm.c | 9 +- + drivers/leds/leds-s3c24xx.c | 3 +- + drivers/leds/leds-tca6507.c | 207 ++++++++++++--------- + include/linux/mfd/mc13xxx.h | 37 +++- + .../linux/platform_data/leds-kirkwood-netxbig.h | 8 +- + include/linux/platform_data/leds-kirkwood-ns2.h | 8 +- + 14 files changed, 227 insertions(+), 231 deletions(-) +Merging driver-core/driver-core-next (90804ed61f24 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (4fbd269f1f9f Merge branch 'fixes' into tty-next) +$ git merge tty/tty-next +Merge made by the 'recursive' strategy. + drivers/tty/serial/icom.c | 4 ++-- + drivers/tty/serial/pch_uart.c | 10 +++++++--- + drivers/tty/serial/samsung.c | 8 +++++++- + 3 files changed, 16 insertions(+), 6 deletions(-) +Merging usb/usb-next (90804ed61f24 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs) +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (836a2164491b usb: phy: keystone: remove redundant return value check of platform_get_resource()) +$ git merge usb-gadget/next +Already up-to-date. +Merging staging/staging-next (d7216f8f02da staging: r8821ae: Enable build by reverting BROKEN marking) +$ git merge staging/staging-next +Merge made by the 'recursive' strategy. + drivers/staging/Kconfig | 2 + + drivers/staging/Makefile | 1 + + drivers/staging/rtl8821ae/Kconfig | 11 + + drivers/staging/rtl8821ae/Makefile | 35 + + drivers/staging/rtl8821ae/TODO | 10 + + drivers/staging/rtl8821ae/base.c | 1873 +++++++ + drivers/staging/rtl8821ae/base.h | 159 + + .../staging/rtl8821ae/btcoexist/HalBtc8812a1Ant.c | 3976 ++++++++++++++ + .../staging/rtl8821ae/btcoexist/HalBtc8812a1Ant.h | 205 + + .../staging/rtl8821ae/btcoexist/habtc8723a1ant.c | 1614 ++++++ + .../staging/rtl8821ae/btcoexist/habtc8723a1ant.h | 176 + + .../staging/rtl8821ae/btcoexist/halbt_precomp.h | 99 + + .../staging/rtl8821ae/btcoexist/halbtc8192e1ant.c | 3891 ++++++++++++++ + .../staging/rtl8821ae/btcoexist/halbtc8192e1ant.h | 226 + + .../staging/rtl8821ae/btcoexist/halbtc8192e2ant.c | 4242 +++++++++++++++ + .../staging/rtl8821ae/btcoexist/halbtc8192e2ant.h | 162 + + .../staging/rtl8821ae/btcoexist/halbtc8723a2ant.c | 3780 +++++++++++++ + .../staging/rtl8821ae/btcoexist/halbtc8723a2ant.h | 179 + + .../staging/rtl8821ae/btcoexist/halbtc8723b1ant.c | 4104 +++++++++++++++ + .../staging/rtl8821ae/btcoexist/halbtc8723b1ant.h | 175 + + .../staging/rtl8821ae/btcoexist/halbtc8723b2ant.c | 4185 +++++++++++++++ + .../staging/rtl8821ae/btcoexist/halbtc8723b2ant.h | 145 + + drivers/staging/rtl8821ae/btcoexist/halbtcoutsrc.c | 1181 +++++ + drivers/staging/rtl8821ae/btcoexist/halbtcoutsrc.h | 549 ++ + drivers/staging/rtl8821ae/btcoexist/rtl_btc.c | 236 + + drivers/staging/rtl8821ae/btcoexist/rtl_btc.h | 66 + + drivers/staging/rtl8821ae/cam.c | 354 ++ + drivers/staging/rtl8821ae/cam.h | 56 + + drivers/staging/rtl8821ae/compat.h | 125 + + drivers/staging/rtl8821ae/core.c | 1464 ++++++ + drivers/staging/rtl8821ae/core.h | 43 + + drivers/staging/rtl8821ae/debug.c | 988 ++++ + drivers/staging/rtl8821ae/debug.h | 227 + + drivers/staging/rtl8821ae/efuse.c | 1285 +++++ + drivers/staging/rtl8821ae/efuse.h | 130 + + drivers/staging/rtl8821ae/pci.c | 2549 +++++++++ + drivers/staging/rtl8821ae/pci.h | 353 ++ + drivers/staging/rtl8821ae/ps.c | 1025 ++++ + drivers/staging/rtl8821ae/ps.h | 55 + + drivers/staging/rtl8821ae/rc.c | 309 ++ + drivers/staging/rtl8821ae/rc.h | 47 + + drivers/staging/rtl8821ae/regd.c | 503 ++ + drivers/staging/rtl8821ae/regd.h | 75 + + drivers/staging/rtl8821ae/rtl8821ae/btc.h | 87 + + drivers/staging/rtl8821ae/rtl8821ae/def.h | 442 ++ + drivers/staging/rtl8821ae/rtl8821ae/dm.c | 3045 +++++++++++ + drivers/staging/rtl8821ae/rtl8821ae/dm.h | 426 ++ + drivers/staging/rtl8821ae/rtl8821ae/fw.c | 1349 +++++ + drivers/staging/rtl8821ae/rtl8821ae/fw.h | 321 ++ + .../staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c | 519 ++ + .../staging/rtl8821ae/rtl8821ae/hal_bt_coexist.h | 169 + + drivers/staging/rtl8821ae/rtl8821ae/hal_btc.c | 2069 ++++++++ + drivers/staging/rtl8821ae/rtl8821ae/hal_btc.h | 160 + + drivers/staging/rtl8821ae/rtl8821ae/hw.c | 3346 ++++++++++++ + drivers/staging/rtl8821ae/rtl8821ae/hw.h | 75 + + drivers/staging/rtl8821ae/rtl8821ae/led.c | 239 + + drivers/staging/rtl8821ae/rtl8821ae/led.h | 40 + + drivers/staging/rtl8821ae/rtl8821ae/phy.c | 5525 ++++++++++++++++++++ + drivers/staging/rtl8821ae/rtl8821ae/phy.h | 258 + + drivers/staging/rtl8821ae/rtl8821ae/pwrseq.c | 199 + + drivers/staging/rtl8821ae/rtl8821ae/pwrseq.h | 413 ++ + drivers/staging/rtl8821ae/rtl8821ae/pwrseqcmd.c | 140 + + drivers/staging/rtl8821ae/rtl8821ae/pwrseqcmd.h | 71 + + drivers/staging/rtl8821ae/rtl8821ae/reg.h | 2427 +++++++++ + drivers/staging/rtl8821ae/rtl8821ae/rf.c | 464 ++ + drivers/staging/rtl8821ae/rtl8821ae/rf.h | 46 + + drivers/staging/rtl8821ae/rtl8821ae/sw.c | 499 ++ + drivers/staging/rtl8821ae/rtl8821ae/sw.h | 39 + + drivers/staging/rtl8821ae/rtl8821ae/table.c | 4002 ++++++++++++++ + drivers/staging/rtl8821ae/rtl8821ae/table.h | 62 + + drivers/staging/rtl8821ae/rtl8821ae/trx.c | 1050 ++++ + drivers/staging/rtl8821ae/rtl8821ae/trx.h | 641 +++ + drivers/staging/rtl8821ae/stats.c | 283 + + drivers/staging/rtl8821ae/stats.h | 46 + + drivers/staging/rtl8821ae/wifi.h | 2532 +++++++++ + 75 files changed, 71854 insertions(+) + create mode 100644 drivers/staging/rtl8821ae/Kconfig + create mode 100644 drivers/staging/rtl8821ae/Makefile + create mode 100644 drivers/staging/rtl8821ae/TODO + create mode 100644 drivers/staging/rtl8821ae/base.c + create mode 100644 drivers/staging/rtl8821ae/base.h + create mode 100644 drivers/staging/rtl8821ae/btcoexist/HalBtc8812a1Ant.c + create mode 100644 drivers/staging/rtl8821ae/btcoexist/HalBtc8812a1Ant.h + create mode 100644 drivers/staging/rtl8821ae/btcoexist/habtc8723a1ant.c + create mode 100644 drivers/staging/rtl8821ae/btcoexist/habtc8723a1ant.h + create mode 100644 drivers/staging/rtl8821ae/btcoexist/halbt_precomp.h + create mode 100644 drivers/staging/rtl8821ae/btcoexist/halbtc8192e1ant.c + create mode 100644 drivers/staging/rtl8821ae/btcoexist/halbtc8192e1ant.h + create mode 100644 drivers/staging/rtl8821ae/btcoexist/halbtc8192e2ant.c + create mode 100644 drivers/staging/rtl8821ae/btcoexist/halbtc8192e2ant.h + create mode 100644 drivers/staging/rtl8821ae/btcoexist/halbtc8723a2ant.c + create mode 100644 drivers/staging/rtl8821ae/btcoexist/halbtc8723a2ant.h + create mode 100644 drivers/staging/rtl8821ae/btcoexist/halbtc8723b1ant.c + create mode 100644 drivers/staging/rtl8821ae/btcoexist/halbtc8723b1ant.h + create mode 100644 drivers/staging/rtl8821ae/btcoexist/halbtc8723b2ant.c + create mode 100644 drivers/staging/rtl8821ae/btcoexist/halbtc8723b2ant.h + create mode 100644 drivers/staging/rtl8821ae/btcoexist/halbtcoutsrc.c + create mode 100644 drivers/staging/rtl8821ae/btcoexist/halbtcoutsrc.h + create mode 100644 drivers/staging/rtl8821ae/btcoexist/rtl_btc.c + create mode 100644 drivers/staging/rtl8821ae/btcoexist/rtl_btc.h + create mode 100644 drivers/staging/rtl8821ae/cam.c + create mode 100644 drivers/staging/rtl8821ae/cam.h + create mode 100644 drivers/staging/rtl8821ae/compat.h + create mode 100644 drivers/staging/rtl8821ae/core.c + create mode 100644 drivers/staging/rtl8821ae/core.h + create mode 100644 drivers/staging/rtl8821ae/debug.c + create mode 100644 drivers/staging/rtl8821ae/debug.h + create mode 100644 drivers/staging/rtl8821ae/efuse.c + create mode 100644 drivers/staging/rtl8821ae/efuse.h + create mode 100644 drivers/staging/rtl8821ae/pci.c + create mode 100644 drivers/staging/rtl8821ae/pci.h + create mode 100644 drivers/staging/rtl8821ae/ps.c + create mode 100644 drivers/staging/rtl8821ae/ps.h + create mode 100644 drivers/staging/rtl8821ae/rc.c + create mode 100644 drivers/staging/rtl8821ae/rc.h + create mode 100644 drivers/staging/rtl8821ae/regd.c + create mode 100644 drivers/staging/rtl8821ae/regd.h + create mode 100644 drivers/staging/rtl8821ae/rtl8821ae/btc.h + create mode 100644 drivers/staging/rtl8821ae/rtl8821ae/def.h + create mode 100644 drivers/staging/rtl8821ae/rtl8821ae/dm.c + create mode 100644 drivers/staging/rtl8821ae/rtl8821ae/dm.h + create mode 100644 drivers/staging/rtl8821ae/rtl8821ae/fw.c + create mode 100644 drivers/staging/rtl8821ae/rtl8821ae/fw.h + create mode 100644 drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c + create mode 100644 drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.h + create mode 100644 drivers/staging/rtl8821ae/rtl8821ae/hal_btc.c + create mode 100644 drivers/staging/rtl8821ae/rtl8821ae/hal_btc.h + create mode 100644 drivers/staging/rtl8821ae/rtl8821ae/hw.c + create mode 100644 drivers/staging/rtl8821ae/rtl8821ae/hw.h + create mode 100644 drivers/staging/rtl8821ae/rtl8821ae/led.c + create mode 100644 drivers/staging/rtl8821ae/rtl8821ae/led.h + create mode 100644 drivers/staging/rtl8821ae/rtl8821ae/phy.c + create mode 100644 drivers/staging/rtl8821ae/rtl8821ae/phy.h + create mode 100644 drivers/staging/rtl8821ae/rtl8821ae/pwrseq.c + create mode 100644 drivers/staging/rtl8821ae/rtl8821ae/pwrseq.h + create mode 100644 drivers/staging/rtl8821ae/rtl8821ae/pwrseqcmd.c + create mode 100644 drivers/staging/rtl8821ae/rtl8821ae/pwrseqcmd.h + create mode 100644 drivers/staging/rtl8821ae/rtl8821ae/reg.h + create mode 100644 drivers/staging/rtl8821ae/rtl8821ae/rf.c + create mode 100644 drivers/staging/rtl8821ae/rtl8821ae/rf.h + create mode 100644 drivers/staging/rtl8821ae/rtl8821ae/sw.c + create mode 100644 drivers/staging/rtl8821ae/rtl8821ae/sw.h + create mode 100644 drivers/staging/rtl8821ae/rtl8821ae/table.c + create mode 100644 drivers/staging/rtl8821ae/rtl8821ae/table.h + create mode 100644 drivers/staging/rtl8821ae/rtl8821ae/trx.c + create mode 100644 drivers/staging/rtl8821ae/rtl8821ae/trx.h + create mode 100644 drivers/staging/rtl8821ae/stats.c + create mode 100644 drivers/staging/rtl8821ae/stats.h + create mode 100644 drivers/staging/rtl8821ae/wifi.h +Merging char-misc/char-misc-next (90804ed61f24 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging scsi/for-next (3ce438df1068 [SCSI] hpsa: allow SCSI mid layer to handle unit attention) +$ git merge scsi/for-next +Already up-to-date. +Merging target-updates/for-next (9037c8332432 target/iscsi: Fix network portal creation race) +$ git merge target-updates/for-next +Resolved 'drivers/scsi/qla2xxx/qla_target.c' using previous resolution. +Resolved 'drivers/target/target_core_tpg.c' using previous resolution. +Auto-merging lib/percpu_ida.c +Auto-merging include/target/target_core_base.h +Auto-merging drivers/vhost/scsi.c +Auto-merging drivers/target/target_core_tpg.c +CONFLICT (content): Merge conflict in drivers/target/target_core_tpg.c +Auto-merging drivers/target/target_core_iblock.c +Auto-merging drivers/target/target_core_file.h +Auto-merging drivers/target/target_core_file.c +Auto-merging drivers/target/target_core_device.c +Auto-merging drivers/target/iscsi/iscsi_target.c +Auto-merging drivers/scsi/qla2xxx/qla_target.c +CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_target.c +Auto-merging drivers/scsi/qla2xxx/qla_def.h +Auto-merging drivers/scsi/qla2xxx/qla_attr.c +Auto-merging drivers/infiniband/ulp/isert/ib_isert.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fbb7c4c9ad15] Merge remote-tracking branch 'target-updates/for-next' +$ git diff -M --stat --summary HEAD^.. + block/blk-mq-tag.c | 6 +- + drivers/infiniband/ulp/isert/ib_isert.c | 222 ++++++----- + drivers/infiniband/ulp/isert/ib_isert.h | 10 +- + drivers/scsi/qla2xxx/qla_attr.c | 2 + + drivers/scsi/qla2xxx/qla_def.h | 12 +- + drivers/scsi/qla2xxx/qla_target.c | 171 ++++---- + drivers/scsi/qla2xxx/qla_target.h | 4 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 180 ++++++--- + drivers/scsi/qla2xxx/tcm_qla2xxx.h | 4 - + drivers/target/Kconfig | 2 + + drivers/target/iscsi/iscsi_target.c | 46 ++- + drivers/target/iscsi/iscsi_target_nego.c | 2 +- + drivers/target/iscsi/iscsi_target_util.c | 9 +- + drivers/target/iscsi/iscsi_target_util.h | 2 +- + drivers/target/loopback/tcm_loop.c | 20 +- + drivers/target/target_core_alua.c | 558 ++++++++++++++++++++++----- + drivers/target/target_core_alua.h | 15 +- + drivers/target/target_core_configfs.c | 194 +++++++++- + drivers/target/target_core_device.c | 108 +++++- + drivers/target/target_core_fabric_configfs.c | 2 +- + drivers/target/target_core_file.c | 256 +++++++++++- + drivers/target/target_core_file.h | 9 + + drivers/target/target_core_iblock.c | 93 ++++- + drivers/target/target_core_internal.h | 8 +- + drivers/target/target_core_pr.h | 5 + + drivers/target/target_core_rd.c | 252 +++++++++--- + drivers/target/target_core_rd.h | 4 + + drivers/target/target_core_sbc.c | 252 +++++++++++- + drivers/target/target_core_spc.c | 114 +++++- + drivers/target/target_core_tpg.c | 10 +- + drivers/target/target_core_transport.c | 90 ++++- + drivers/target/target_core_ua.c | 1 - + drivers/target/target_core_xcopy.c | 4 - + drivers/target/tcm_fc/tfc_cmd.c | 2 +- + drivers/target/tcm_fc/tfc_conf.c | 6 +- + drivers/vhost/scsi.c | 4 +- + include/linux/percpu_ida.h | 3 +- + include/scsi/scsi.h | 1 + + include/target/iscsi/iscsi_transport.h | 2 +- + include/target/target_core_backend.h | 7 + + include/target/target_core_base.h | 80 +++- + include/target/target_core_fabric.h | 3 +- + lib/percpu_ida.c | 21 +- + 43 files changed, 2295 insertions(+), 501 deletions(-) +$ git am -3 ../patches/0001-tagtet-iblock-merge-for-for-bvec_iter-changes.patch +Applying: tagtet/iblock: merge for for bvec_iter changes +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/target/target_core_iblock.c +$ git add -A . +$ git commit -v -a --amend +[master 164508b712dc] Merge remote-tracking branch 'target-updates/for-next' +Merging target-merge/for-next-merge (374b105797c3 Linux 3.13-rc3) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging writeback/writeback-for-next (f9b0e058cbd0 writeback: Fix data corruption on NFS) +$ git merge writeback/writeback-for-next +Already up-to-date. +Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries) +$ git merge hwspinlock/linux-next +Already up-to-date. +Merging pinctrl/for-next (cf8400ce6fe6 imx27: pinctrl: fix wrong offset to ICONFB) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + drivers/pinctrl/pinctrl-at91.c | 10 +++++----- + drivers/pinctrl/pinctrl-imx1-core.c | 8 ++++---- + 2 files changed, 9 insertions(+), 9 deletions(-) +Merging vhost/linux-next (d3d665a654a3 vhost-scsi: whitespace tweak) +$ git merge vhost/linux-next +Already up-to-date. +Merging remoteproc/for-next (b9777859ec01 remoteproc: fix kconfig dependencies for VIRTIO) +$ git merge remoteproc/for-next +Already up-to-date. +Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO) +$ git merge rpmsg/for-next +Already up-to-date. +Merging gpio/for-next (3a54bb21f219 gpio: xtensa: fix build when XCHAL_HAVE_CP is 0) +$ git merge gpio/for-next +Merge made by the 'recursive' strategy. + drivers/gpio/gpio-xtensa.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) +Merging dma-mapping/dma-mapping-next (5e01dc7b26d9 Linux 3.12) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (6691a19966f0 pwm: tiecap: Remove duplicate put_sync call) +$ git merge pwm/for-next +Already up-to-date. +Merging dma-buf/for-next (17b2112f332d Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc) +$ git merge dma-buf/for-next +Already up-to-date. +Merging userns/for-next (f58437f1f916 MIPS: VPE: Remove vpe_getuid and vpe_getgid) +$ git merge userns/for-next +Already up-to-date. +Merging ktest/for-next (961d9caceea2 ktest: Add BISECT_TRIES to bisect test) +$ git merge ktest/for-next +Already up-to-date. +Merging signal/for-next (20b4fb485227 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge signal/for-next +Already up-to-date. +Merging clk/clk-next (fd3fdaf09f26 clk: sort Makefile) +$ git merge clk/clk-next +Recorded preimage for 'drivers/clk/Makefile' +Auto-merging include/linux/clk-provider.h +Auto-merging drivers/clk/Makefile +CONFLICT (content): Merge conflict in drivers/clk/Makefile +Auto-merging arch/arm/mach-omap2/timer.c +Auto-merging arch/arm/mach-omap2/omap_hwmod.c +Auto-merging arch/arm/mach-omap2/io.c +Auto-merging arch/arm/mach-omap2/common.h +Removing arch/arm/mach-omap2/cclock44xx_data.c +Removing arch/arm/mach-omap2/cclock33xx_data.c +Auto-merging arch/arm/mach-omap2/Makefile +Auto-merging arch/arm/mach-omap2/Kconfig +Auto-merging arch/arm/boot/dts/omap5.dtsi +Auto-merging arch/arm/boot/dts/omap4460.dtsi +Auto-merging arch/arm/boot/dts/omap443x.dtsi +Auto-merging arch/arm/boot/dts/omap36xx.dtsi +Auto-merging arch/arm/boot/dts/omap34xx.dtsi +Auto-merging arch/arm/boot/dts/omap3.dtsi +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/clk/Makefile'. +[master 8eb952606870] Merge remote-tracking branch 'clk/clk-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/clock/ti/apll.txt | 31 + + .../devicetree/bindings/clock/ti/autoidle.txt | 39 + + .../devicetree/bindings/clock/ti/clockdomain.txt | 24 + + .../devicetree/bindings/clock/ti/composite.txt | 54 + + .../devicetree/bindings/clock/ti/divider.txt | 114 ++ + .../devicetree/bindings/clock/ti/dpll.txt | 75 + + .../bindings/clock/ti/fixed-factor-clock.txt | 43 + + .../devicetree/bindings/clock/ti/gate.txt | 85 + + .../devicetree/bindings/clock/ti/interface.txt | 54 + + Documentation/devicetree/bindings/clock/ti/mux.txt | 76 + + arch/arm/boot/dts/am33xx-clocks.dtsi | 664 +++++++ + arch/arm/boot/dts/am33xx.dtsi | 28 + + arch/arm/boot/dts/am3517.dtsi | 3 + + arch/arm/boot/dts/am35xx-clocks.dtsi | 128 ++ + arch/arm/boot/dts/am4372.dtsi | 28 + + arch/arm/boot/dts/am43xx-clocks.dtsi | 656 +++++++ + arch/arm/boot/dts/dra7.dtsi | 41 + + arch/arm/boot/dts/dra7xx-clocks.dtsi | 2015 ++++++++++++++++++++ + arch/arm/boot/dts/omap3.dtsi | 41 + + arch/arm/boot/dts/omap3430es1-clocks.dtsi | 208 ++ + arch/arm/boot/dts/omap34xx-omap36xx-clocks.dtsi | 268 +++ + arch/arm/boot/dts/omap34xx.dtsi | 4 + + .../omap36xx-am35xx-omap3430es2plus-clocks.dtsi | 242 +++ + arch/arm/boot/dts/omap36xx-clocks.dtsi | 90 + + .../boot/dts/omap36xx-omap3430es2plus-clocks.dtsi | 198 ++ + arch/arm/boot/dts/omap36xx.dtsi | 5 + + arch/arm/boot/dts/omap3xxx-clocks.dtsi | 1660 ++++++++++++++++ + arch/arm/boot/dts/omap4.dtsi | 54 + + arch/arm/boot/dts/omap443x-clocks.dtsi | 18 + + arch/arm/boot/dts/omap443x.dtsi | 2 + + arch/arm/boot/dts/omap4460.dtsi | 2 + + arch/arm/boot/dts/omap446x-clocks.dtsi | 27 + + arch/arm/boot/dts/omap44xx-clocks.dtsi | 1651 ++++++++++++++++ + arch/arm/boot/dts/omap5.dtsi | 54 + + arch/arm/boot/dts/omap54xx-clocks.dtsi | 1399 ++++++++++++++ + arch/arm/mach-omap2/Kconfig | 18 +- + arch/arm/mach-omap2/Makefile | 7 +- + arch/arm/mach-omap2/cclock33xx_data.c | 1064 ----------- + arch/arm/mach-omap2/cclock44xx_data.c | 1735 ----------------- + arch/arm/mach-omap2/clkt_clksel.c | 10 +- + arch/arm/mach-omap2/clkt_dpll.c | 6 +- + arch/arm/mach-omap2/clkt_iclk.c | 20 +- + arch/arm/mach-omap2/clock.c | 57 +- + arch/arm/mach-omap2/clock.h | 179 +- + arch/arm/mach-omap2/clock36xx.c | 7 +- + arch/arm/mach-omap2/clock3xxx.h | 3 - + arch/arm/mach-omap2/common.h | 2 +- + arch/arm/mach-omap2/dpll3xxx.c | 37 +- + arch/arm/mach-omap2/dpll44xx.c | 12 +- + arch/arm/mach-omap2/io.c | 44 +- + arch/arm/mach-omap2/omap_hwmod.c | 5 +- + arch/arm/mach-omap2/prm.h | 1 + + arch/arm/mach-omap2/prm_common.c | 66 + + arch/arm/mach-omap2/timer.c | 6 +- + drivers/clk/Makefile | 78 +- + drivers/clk/clk-si5351.c | 28 +- + drivers/clk/clk-si5351.h | 14 + + drivers/clk/clk.c | 11 +- + drivers/clk/qcom/Makefile | 12 +- + drivers/clk/samsung/clk-pll.c | 2 +- + drivers/clk/sunxi/clk-sunxi.c | 2 +- + drivers/clk/ti/Makefile | 11 + + drivers/clk/ti/apll.c | 223 +++ + drivers/clk/ti/autoidle.c | 133 ++ + drivers/clk/ti/clk-33xx.c | 161 ++ + drivers/clk/ti/clk-3xxx.c | 401 ++++ + drivers/clk/ti/clk-43xx.c | 118 ++ + drivers/clk/ti/clk-44xx.c | 316 +++ + drivers/clk/ti/clk-54xx.c | 255 +++ + drivers/clk/ti/clk-7xx.c | 332 ++++ + drivers/clk/ti/clk.c | 167 ++ + drivers/clk/ti/clockdomain.c | 70 + + drivers/clk/ti/composite.c | 269 +++ + drivers/clk/ti/divider.c | 487 +++++ + drivers/clk/ti/dpll.c | 558 ++++++ + drivers/clk/ti/fixed-factor.c | 66 + + drivers/clk/ti/gate.c | 249 +++ + drivers/clk/ti/interface.c | 125 ++ + drivers/clk/ti/mux.c | 246 +++ + include/dt-bindings/clock/qcom,mmcc-msm8974.h | 2 +- + include/linux/clk-provider.h | 2 + + include/linux/clk/ti.h | 298 +++ + include/linux/platform_data/si5351.h | 16 - + 83 files changed, 14874 insertions(+), 3138 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/ti/apll.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti/autoidle.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti/clockdomain.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti/composite.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti/divider.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti/dpll.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti/fixed-factor-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti/gate.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti/interface.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti/mux.txt + create mode 100644 arch/arm/boot/dts/am33xx-clocks.dtsi + create mode 100644 arch/arm/boot/dts/am35xx-clocks.dtsi + create mode 100644 arch/arm/boot/dts/am43xx-clocks.dtsi + create mode 100644 arch/arm/boot/dts/dra7xx-clocks.dtsi + create mode 100644 arch/arm/boot/dts/omap3430es1-clocks.dtsi + create mode 100644 arch/arm/boot/dts/omap34xx-omap36xx-clocks.dtsi + create mode 100644 arch/arm/boot/dts/omap36xx-am35xx-omap3430es2plus-clocks.dtsi + create mode 100644 arch/arm/boot/dts/omap36xx-clocks.dtsi + create mode 100644 arch/arm/boot/dts/omap36xx-omap3430es2plus-clocks.dtsi + create mode 100644 arch/arm/boot/dts/omap3xxx-clocks.dtsi + create mode 100644 arch/arm/boot/dts/omap443x-clocks.dtsi + create mode 100644 arch/arm/boot/dts/omap446x-clocks.dtsi + create mode 100644 arch/arm/boot/dts/omap44xx-clocks.dtsi + create mode 100644 arch/arm/boot/dts/omap54xx-clocks.dtsi + delete mode 100644 arch/arm/mach-omap2/cclock33xx_data.c + delete mode 100644 arch/arm/mach-omap2/cclock44xx_data.c + create mode 100644 drivers/clk/ti/Makefile + create mode 100644 drivers/clk/ti/apll.c + create mode 100644 drivers/clk/ti/autoidle.c + create mode 100644 drivers/clk/ti/clk-33xx.c + create mode 100644 drivers/clk/ti/clk-3xxx.c + create mode 100644 drivers/clk/ti/clk-43xx.c + create mode 100644 drivers/clk/ti/clk-44xx.c + create mode 100644 drivers/clk/ti/clk-54xx.c + create mode 100644 drivers/clk/ti/clk-7xx.c + create mode 100644 drivers/clk/ti/clk.c + create mode 100644 drivers/clk/ti/clockdomain.c + create mode 100644 drivers/clk/ti/composite.c + create mode 100644 drivers/clk/ti/divider.c + create mode 100644 drivers/clk/ti/dpll.c + create mode 100644 drivers/clk/ti/fixed-factor.c + create mode 100644 drivers/clk/ti/gate.c + create mode 100644 drivers/clk/ti/interface.c + create mode 100644 drivers/clk/ti/mux.c + create mode 100644 include/linux/clk/ti.h +$ git reset --hard HEAD^ +HEAD is now at 2cd03fb9e5af Merge remote-tracking branch 'gpio/for-next' +Merging next-20140128 version of clk +$ git merge -m next-20140128/clk 051c8d0b667400b00dc0e53c3cf61ad6991bfefb +Auto-merging include/linux/clk-provider.h +Auto-merging drivers/clk/Makefile +Auto-merging arch/arm/mach-omap2/timer.c +Auto-merging arch/arm/mach-omap2/omap_hwmod.c +Auto-merging arch/arm/mach-omap2/io.c +Auto-merging arch/arm/mach-omap2/common.h +Removing arch/arm/mach-omap2/cclock44xx_data.c +Removing arch/arm/mach-omap2/cclock33xx_data.c +Auto-merging arch/arm/mach-omap2/Makefile +Auto-merging arch/arm/mach-omap2/Kconfig +Auto-merging arch/arm/boot/dts/omap5.dtsi +Auto-merging arch/arm/boot/dts/omap4460.dtsi +Auto-merging arch/arm/boot/dts/omap443x.dtsi +Auto-merging arch/arm/boot/dts/omap36xx.dtsi +Auto-merging arch/arm/boot/dts/omap34xx.dtsi +Auto-merging arch/arm/boot/dts/omap3.dtsi +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/ti/apll.txt | 31 + + .../devicetree/bindings/clock/ti/autoidle.txt | 39 + + .../devicetree/bindings/clock/ti/clockdomain.txt | 24 + + .../devicetree/bindings/clock/ti/composite.txt | 54 + + .../devicetree/bindings/clock/ti/divider.txt | 114 ++ + .../devicetree/bindings/clock/ti/dpll.txt | 75 + + .../bindings/clock/ti/fixed-factor-clock.txt | 43 + + .../devicetree/bindings/clock/ti/gate.txt | 85 + + .../devicetree/bindings/clock/ti/interface.txt | 54 + + Documentation/devicetree/bindings/clock/ti/mux.txt | 76 + + arch/arm/boot/dts/am33xx-clocks.dtsi | 664 +++++++ + arch/arm/boot/dts/am33xx.dtsi | 28 + + arch/arm/boot/dts/am3517.dtsi | 3 + + arch/arm/boot/dts/am35xx-clocks.dtsi | 128 ++ + arch/arm/boot/dts/am4372.dtsi | 28 + + arch/arm/boot/dts/am43xx-clocks.dtsi | 656 +++++++ + arch/arm/boot/dts/dra7.dtsi | 41 + + arch/arm/boot/dts/dra7xx-clocks.dtsi | 2015 ++++++++++++++++++++ + arch/arm/boot/dts/omap3.dtsi | 41 + + arch/arm/boot/dts/omap3430es1-clocks.dtsi | 208 ++ + arch/arm/boot/dts/omap34xx-omap36xx-clocks.dtsi | 268 +++ + arch/arm/boot/dts/omap34xx.dtsi | 4 + + .../omap36xx-am35xx-omap3430es2plus-clocks.dtsi | 242 +++ + arch/arm/boot/dts/omap36xx-clocks.dtsi | 90 + + .../boot/dts/omap36xx-omap3430es2plus-clocks.dtsi | 198 ++ + arch/arm/boot/dts/omap36xx.dtsi | 5 + + arch/arm/boot/dts/omap3xxx-clocks.dtsi | 1660 ++++++++++++++++ + arch/arm/boot/dts/omap4.dtsi | 54 + + arch/arm/boot/dts/omap443x-clocks.dtsi | 18 + + arch/arm/boot/dts/omap443x.dtsi | 2 + + arch/arm/boot/dts/omap4460.dtsi | 2 + + arch/arm/boot/dts/omap446x-clocks.dtsi | 27 + + arch/arm/boot/dts/omap44xx-clocks.dtsi | 1651 ++++++++++++++++ + arch/arm/boot/dts/omap5.dtsi | 54 + + arch/arm/boot/dts/omap54xx-clocks.dtsi | 1399 ++++++++++++++ + arch/arm/mach-omap2/Kconfig | 18 +- + arch/arm/mach-omap2/Makefile | 7 +- + arch/arm/mach-omap2/cclock33xx_data.c | 1064 ----------- + arch/arm/mach-omap2/cclock44xx_data.c | 1735 ----------------- + arch/arm/mach-omap2/clkt_clksel.c | 10 +- + arch/arm/mach-omap2/clkt_dpll.c | 6 +- + arch/arm/mach-omap2/clkt_iclk.c | 20 +- + arch/arm/mach-omap2/clock.c | 57 +- + arch/arm/mach-omap2/clock.h | 179 +- + arch/arm/mach-omap2/clock36xx.c | 7 +- + arch/arm/mach-omap2/clock3xxx.h | 3 - + arch/arm/mach-omap2/common.h | 2 +- + arch/arm/mach-omap2/dpll3xxx.c | 37 +- + arch/arm/mach-omap2/dpll44xx.c | 12 +- + arch/arm/mach-omap2/io.c | 44 +- + arch/arm/mach-omap2/omap_hwmod.c | 5 +- + arch/arm/mach-omap2/prm.h | 1 + + arch/arm/mach-omap2/prm_common.c | 66 + + arch/arm/mach-omap2/timer.c | 6 +- + drivers/clk/Makefile | 1 + + drivers/clk/clk.c | 4 +- + drivers/clk/qcom/Makefile | 12 +- + drivers/clk/ti/Makefile | 11 + + drivers/clk/ti/apll.c | 223 +++ + drivers/clk/ti/autoidle.c | 133 ++ + drivers/clk/ti/clk-33xx.c | 161 ++ + drivers/clk/ti/clk-3xxx.c | 401 ++++ + drivers/clk/ti/clk-43xx.c | 118 ++ + drivers/clk/ti/clk-44xx.c | 316 +++ + drivers/clk/ti/clk-54xx.c | 255 +++ + drivers/clk/ti/clk-7xx.c | 332 ++++ + drivers/clk/ti/clk.c | 167 ++ + drivers/clk/ti/clockdomain.c | 70 + + drivers/clk/ti/composite.c | 269 +++ + drivers/clk/ti/divider.c | 487 +++++ + drivers/clk/ti/dpll.c | 558 ++++++ + drivers/clk/ti/fixed-factor.c | 66 + + drivers/clk/ti/gate.c | 249 +++ + drivers/clk/ti/interface.c | 125 ++ + drivers/clk/ti/mux.c | 246 +++ + include/linux/clk-provider.h | 2 + + include/linux/clk/ti.h | 298 +++ + 77 files changed, 14801 insertions(+), 3063 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/ti/apll.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti/autoidle.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti/clockdomain.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti/composite.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti/divider.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti/dpll.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti/fixed-factor-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti/gate.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti/interface.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti/mux.txt + create mode 100644 arch/arm/boot/dts/am33xx-clocks.dtsi + create mode 100644 arch/arm/boot/dts/am35xx-clocks.dtsi + create mode 100644 arch/arm/boot/dts/am43xx-clocks.dtsi + create mode 100644 arch/arm/boot/dts/dra7xx-clocks.dtsi + create mode 100644 arch/arm/boot/dts/omap3430es1-clocks.dtsi + create mode 100644 arch/arm/boot/dts/omap34xx-omap36xx-clocks.dtsi + create mode 100644 arch/arm/boot/dts/omap36xx-am35xx-omap3430es2plus-clocks.dtsi + create mode 100644 arch/arm/boot/dts/omap36xx-clocks.dtsi + create mode 100644 arch/arm/boot/dts/omap36xx-omap3430es2plus-clocks.dtsi + create mode 100644 arch/arm/boot/dts/omap3xxx-clocks.dtsi + create mode 100644 arch/arm/boot/dts/omap443x-clocks.dtsi + create mode 100644 arch/arm/boot/dts/omap446x-clocks.dtsi + create mode 100644 arch/arm/boot/dts/omap44xx-clocks.dtsi + create mode 100644 arch/arm/boot/dts/omap54xx-clocks.dtsi + delete mode 100644 arch/arm/mach-omap2/cclock33xx_data.c + delete mode 100644 arch/arm/mach-omap2/cclock44xx_data.c + create mode 100644 drivers/clk/ti/Makefile + create mode 100644 drivers/clk/ti/apll.c + create mode 100644 drivers/clk/ti/autoidle.c + create mode 100644 drivers/clk/ti/clk-33xx.c + create mode 100644 drivers/clk/ti/clk-3xxx.c + create mode 100644 drivers/clk/ti/clk-43xx.c + create mode 100644 drivers/clk/ti/clk-44xx.c + create mode 100644 drivers/clk/ti/clk-54xx.c + create mode 100644 drivers/clk/ti/clk-7xx.c + create mode 100644 drivers/clk/ti/clk.c + create mode 100644 drivers/clk/ti/clockdomain.c + create mode 100644 drivers/clk/ti/composite.c + create mode 100644 drivers/clk/ti/divider.c + create mode 100644 drivers/clk/ti/dpll.c + create mode 100644 drivers/clk/ti/fixed-factor.c + create mode 100644 drivers/clk/ti/gate.c + create mode 100644 drivers/clk/ti/interface.c + create mode 100644 drivers/clk/ti/mux.c + create mode 100644 include/linux/clk/ti.h +Merging random/dev (a9f069e38cc3 random: use the architectural HWRNG for the SHA's IV in extract_buf()) +$ git merge random/dev +Merge made by the 'recursive' strategy. + drivers/char/random.c | 192 ++++++++++++++++++++++---------------------------- + 1 file changed, 84 insertions(+), 108 deletions(-) +Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access) +$ git merge lzo-update/lzo-update +Merge made by the 'recursive' strategy. + lib/lzo/lzo1x_decompress_safe.c | 4 ++++ + lib/lzo/lzodefs.h | 6 ++++++ + 2 files changed, 10 insertions(+) +Merging arm64-hugepages/for-next/hugepages (af07484863e0 ARM64: mm: THP support.) +$ git merge arm64-hugepages/for-next/hugepages +Already up-to-date. +Merging aio/master (8e321fefb0e6 aio/migratepages: make aio migrate pages sane) +$ git merge aio/master +Already up-to-date. +Merging akpm-current/current (0fc6f4e2e3d5 splice: fix unexpected size truncation) +$ git merge --no-ff akpm-current/current +Recorded preimage for 'arch/arm/kernel/setup.c' +Recorded preimage for 'fs/afs/proc.c' +Recorded preimage for 'fs/posix_acl.c' +Recorded preimage for 'include/linux/bootmem.h' +Recorded preimage for 'include/linux/posix_acl.h' +Recorded preimage for 'ipc/util.c' +Recorded preimage for 'lib/swiotlb.c' +Recorded preimage for 'mm/memblock.c' +Recorded preimage for 'mm/mm_init.c' +Resolved 'Documentation/devicetree/bindings/vendor-prefixes.txt' using previous resolution. +Resolved 'Documentation/kernel-parameters.txt' using previous resolution. +Resolved 'Documentation/sysctl/kernel.txt' using previous resolution. +Resolved 'arch/x86/mm/srat.c' using previous resolution. +Resolved 'include/linux/vm_event_item.h' using previous resolution. +Resolved 'lib/percpu_counter.c' using previous resolution. +Resolved 'lib/vsprintf.c' using previous resolution. +Resolved 'mm/memcontrol.c' using previous resolution. +Resolved 'mm/nobootmem.c' using previous resolution. +Resolved 'mm/oom_kill.c' using previous resolution. +Resolved 'mm/page_alloc.c' using previous resolution. +Resolved 'mm/rmap.c' using previous resolution. +Auto-merging mm/vmscan.c +Auto-merging mm/swapfile.c +Auto-merging mm/swap_state.c +Auto-merging mm/rmap.c +CONFLICT (content): Merge conflict in mm/rmap.c +Auto-merging mm/page_alloc.c +CONFLICT (content): Merge conflict in mm/page_alloc.c +Auto-merging mm/oom_kill.c +CONFLICT (content): Merge conflict in mm/oom_kill.c +Auto-merging mm/nobootmem.c +CONFLICT (content): Merge conflict in mm/nobootmem.c +Auto-merging mm/mm_init.c +CONFLICT (content): Merge conflict in mm/mm_init.c +Auto-merging mm/mlock.c +Auto-merging mm/memcontrol.c +CONFLICT (content): Merge conflict in mm/memcontrol.c +Auto-merging mm/memblock.c +CONFLICT (content): Merge conflict in mm/memblock.c +Auto-merging lib/vsprintf.c +CONFLICT (content): Merge conflict in lib/vsprintf.c +Auto-merging lib/swiotlb.c +CONFLICT (content): Merge conflict in lib/swiotlb.c +Auto-merging lib/percpu_counter.c +CONFLICT (content): Merge conflict in lib/percpu_counter.c +Auto-merging lib/Makefile +Auto-merging kernel/time/sched_clock.c +Auto-merging kernel/kexec.c +Auto-merging kernel/hung_task.c +Auto-merging ipc/util.c +CONFLICT (content): Merge conflict in ipc/util.c +Auto-merging include/linux/vm_event_item.h +CONFLICT (content): Merge conflict in include/linux/vm_event_item.h +Auto-merging include/linux/posix_acl.h +CONFLICT (content): Merge conflict in include/linux/posix_acl.h +Auto-merging include/linux/page-flags.h +Auto-merging include/linux/bootmem.h +CONFLICT (content): Merge conflict in include/linux/bootmem.h +Auto-merging fs/posix_acl.c +CONFLICT (content): Merge conflict in fs/posix_acl.c +Auto-merging fs/ocfs2/namei.c +Auto-merging fs/ocfs2/file.c +Auto-merging fs/ocfs2/alloc.c +Auto-merging fs/jffs2/fs.c +Auto-merging fs/binfmt_elf.c +Auto-merging fs/afs/proc.c +CONFLICT (content): Merge conflict in fs/afs/proc.c +Auto-merging drivers/tty/Kconfig +Auto-merging drivers/misc/ti-st/st_core.c +Auto-merging drivers/input/input.c +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging arch/x86/mm/srat.c +CONFLICT (content): Merge conflict in arch/x86/mm/srat.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/arm/mm/init.c +Auto-merging arch/arm/kernel/setup.c +CONFLICT (content): Merge conflict in arch/arm/kernel/setup.c +Auto-merging Documentation/sysctl/kernel.txt +CONFLICT (content): Merge conflict in Documentation/sysctl/kernel.txt +Auto-merging Documentation/printk-formats.txt +Auto-merging Documentation/kernel-parameters.txt +CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/arm/kernel/setup.c'. +Recorded resolution for 'fs/afs/proc.c'. +Recorded resolution for 'fs/posix_acl.c'. +Recorded resolution for 'include/linux/bootmem.h'. +Recorded resolution for 'include/linux/posix_acl.h'. +Recorded resolution for 'ipc/util.c'. +Recorded resolution for 'lib/swiotlb.c'. +Recorded resolution for 'mm/memblock.c'. +Recorded resolution for 'mm/mm_init.c'. +[master 0d31f1880698] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/vfat.txt | 10 ++ + Documentation/leds/leds-class.txt | 3 - + Documentation/printk-formats.txt | 6 + + arch/arm/include/asm/fixmap.h | 29 +-- + arch/arm/mm/init.c | 2 +- + arch/x86/include/asm/page_types.h | 4 +- + arch/x86/kernel/setup.c | 2 +- + block/genhd.c | 2 +- + drivers/gpu/drm/drm_fb_helper.c | 8 + + drivers/input/Kconfig | 9 + + drivers/input/Makefile | 3 + + drivers/input/input.c | 6 + + drivers/input/leds.c | 249 ++++++++++++++++++++++++++ + drivers/leds/Kconfig | 3 - + drivers/misc/ti-st/st_core.c | 2 +- + drivers/net/irda/donauboe.c | 15 +- + drivers/pps/pps.c | 57 +++--- + drivers/scsi/megaraid/megaraid_mm.c | 2 + + drivers/tty/Kconfig | 4 + + drivers/tty/vt/keyboard.c | 110 +++++++++--- + drivers/video/backlight/backlight.c | 2 - + fs/afs/proc.c | 4 +- + fs/binfmt_elf.c | 21 ++- + fs/fat/cache.c | 19 +- + fs/fat/fat.h | 6 +- + fs/fat/file.c | 78 ++++++++- + fs/fat/inode.c | 57 +++++- + fs/jffs2/fs.c | 9 +- + fs/ocfs2/alloc.c | 40 ++++- + fs/ocfs2/cluster/tcp.c | 35 +++- + fs/ocfs2/file.c | 63 +++++-- + fs/ocfs2/localalloc.c | 40 +++++ + fs/ocfs2/localalloc.h | 6 + + fs/ocfs2/namei.c | 122 ++++++++++++- + fs/ufs/balloc.c | 30 ++-- + fs/ufs/ialloc.c | 17 +- + fs/ufs/super.c | 13 +- + fs/ufs/ufs.h | 1 - + include/linux/crc64_ecma.h | 56 ++++++ + include/linux/input.h | 21 +++ + include/linux/kthread.h | 1 + + include/linux/page-flags.h | 4 +- + ipc/util.c | 60 ++++--- + kernel/hung_task.c | 3 +- + kernel/kexec.c | 4 +- + kernel/kmod.c | 11 +- + kernel/kthread.c | 9 + + kernel/profile.c | 2 +- + kernel/sched/stats.c | 2 +- + kernel/time/sched_clock.c | 4 + + kernel/user.c | 3 +- + kernel/user_namespace.c | 2 +- + kernel/watchdog.c | 26 +-- + lib/Kconfig | 7 + + lib/Makefile | 1 + + lib/crc64_ecma.c | 341 ++++++++++++++++++++++++++++++++++++ + lib/vsprintf.c | 20 ++- + mm/memcontrol.c | 3 +- + mm/mlock.c | 2 - + mm/nobootmem.c | 6 + + mm/page_alloc.c | 17 +- + mm/swap_state.c | 63 ++++++- + mm/swapfile.c | 11 +- + mm/vmalloc.c | 20 +-- + mm/vmscan.c | 72 +++----- + 65 files changed, 1557 insertions(+), 303 deletions(-) + create mode 100644 drivers/input/leds.c + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 lib/crc64_ecma.c +$ git am -3 ../patches/0001-nobootmem-fix-mismerge.patch +Applying: nobootmem: fix mismerge +$ git reset HEAD^ +Unstaged changes after reset: +M mm/nobootmem.c +$ git add -A . +$ git commit -v -a --amend +[master ddc035fd80a2] Merge branch 'akpm-current/current' +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: zsmalloc: move it under mm +Applying: zram: promote zram from staging +Applying: drivers/w1/w1_int.c: call put_device if device_register fails +Applying: drivers/video/backlight/lcd.c: call put_device if device_register fails +Applying: drivers/net/phy/mdio_bus.c: call put_device on device_register() failure +Applying: zram: remove old private project comment +Applying: zram: add copyright +Applying: zsmalloc: add copyright +Applying: zram: add zram maintainers +Applying: zsmalloc: add maintainers +Applying: kernel: use lockless list for smp_call_function_single +Applying: kernel/smp.c: remove cpumask_ipi +Applying: arm: move arm_dma_limit to setup_dma_zone +Applying: zram: fix race between reset and flushing pending work +Applying: zram: delay pending free request in read path +Applying: zram: remove unnecessary free +Applying: zram: use atomic operation for stat +Applying: zram: introduce zram->tb_lock +Applying: zram: remove workqueue for freeing removed pending slot +Applying: zram: remove zram->lock in read path and change it with mutex +Applying: mm: add strictlimit knob +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + b59dc266e32b...f7368f57a264 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (f7368f57a264 mm: add strictlimit knob) +$ git merge --no-ff akpm/master +Auto-merging mm/zsmalloc.c +Auto-merging include/linux/zsmalloc.h +Removing drivers/staging/zsmalloc/Makefile +Removing drivers/staging/zsmalloc/Kconfig +Auto-merging drivers/block/zram/zram_drv.h +Auto-merging drivers/block/zram/zram_drv.c +Auto-merging drivers/block/zram/Kconfig +Auto-merging Documentation/blockdev/zram.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-bdi | 8 ++ + .../zram => Documentation/blockdev}/zram.txt | 6 - + MAINTAINERS | 16 +++ + arch/arm/mm/init.c | 6 +- + arch/arm/mm/mm.h | 2 - + drivers/block/Kconfig | 2 + + drivers/block/Makefile | 1 + + drivers/{staging => block}/zram/Kconfig | 1 - + drivers/{staging => block}/zram/Makefile | 0 + drivers/{staging => block}/zram/zram_drv.c | 128 ++++++++------------- + drivers/{staging => block}/zram/zram_drv.h | 32 ++---- + drivers/net/phy/mdio_bus.c | 1 + + drivers/staging/Kconfig | 4 - + drivers/staging/Makefile | 2 - + drivers/staging/zsmalloc/Kconfig | 24 ---- + drivers/staging/zsmalloc/Makefile | 3 - + drivers/video/backlight/lcd.c | 2 +- + drivers/w1/w1_int.c | 5 +- + include/linux/blkdev.h | 5 +- + include/linux/smp.h | 6 +- + .../staging/zsmalloc => include/linux}/zsmalloc.h | 1 + + kernel/smp.c | 68 +++-------- + mm/Kconfig | 25 ++++ + mm/Makefile | 1 + + mm/backing-dev.c | 35 ++++++ + .../zsmalloc/zsmalloc-main.c => mm/zsmalloc.c | 4 +- + 26 files changed, 173 insertions(+), 215 deletions(-) + rename {drivers/staging/zram => Documentation/blockdev}/zram.txt (90%) + rename drivers/{staging => block}/zram/Kconfig (93%) + rename drivers/{staging => block}/zram/Makefile (100%) + rename drivers/{staging => block}/zram/zram_drv.c (90%) + rename drivers/{staging => block}/zram/zram_drv.h (74%) + delete mode 100644 drivers/staging/zsmalloc/Kconfig + delete mode 100644 drivers/staging/zsmalloc/Makefile + rename {drivers/staging/zsmalloc => include/linux}/zsmalloc.h (97%) + rename drivers/staging/zsmalloc/zsmalloc-main.c => mm/zsmalloc.c (99%) +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b init remotes/origin/init/master +Switched to a new branch 'init' +$ git rebase --onto master remotes/origin/init/master-base +First, rewinding head to replay your work on top of it... +Applying: init: delete the __cpuinit related stubs +Applying: mm: replace module_init usages with subsys_initcall in nommu.c +Applying: fs/notify: don't use module_init for non-modular inotify_user code +Applying: netfilter: don't use module_init/exit in core IPV4 code +Applying: x86: don't use module_init in non-modular intel_mid_vrtc.c +Applying: x86: don't use module_init for non-modular core bootflag code +Applying: x86: replace __init_or_module with __init in non-modular vsmp_64.c +Applying: x86: don't use module_init in non-modular devicetree.c code +Applying: drivers/tty/hvc: don't use module_init in non-modular hyp. console code +Applying: staging: don't use module_init in non-modular ion_dummy_driver.c +Applying: powerpc: use device_initcall for registering rtc devices +Applying: powerpc: book3s KVM can be modular so it should use module.h +Applying: powerpc: kvm e500/44x is not modular, so don't use module_init +Applying: powerpc: use subsys_initcall for Freescale Local Bus +Applying: powerpc: don't use module_init for non-modular core hugetlb code +Applying: powerpc: don't use module_init in non-modular 83xx suspend code +Applying: arm: include module.h in drivers/bus/omap_l3_smx.c +Applying: arm: fix implicit module.h use in mach-at91 gpio.h +Applying: arm: fix implicit #include <linux/init.h> in entry asm. +Applying: arm: mach-s3c64xx mach-crag6410-module.c is not modular +Applying: arm: use subsys_initcall in non-modular pl320 IPC code +Applying: arm: don't use module_init in non-modular mach-vexpress/spc.c code +Applying: alpha: don't use module_init for non-modular core code +Applying: sparc: don't use module_init in non-modular pci.c code +Applying: m68k: don't use module_init in non-modular mvme16x/rtc.c code +Applying: ia64: don't use module_init for non-modular core kernel/mca.c code +Applying: ia64: don't use module_init in non-modular sim/simscsi.c code +Applying: mips: make loongsoon serial driver explicitly modular +Applying: mips: don't use module_init in non-modular sead3-mtd.c code +Applying: cris: don't use module_init for non-modular core intmem.c code +Applying: parisc: don't use module_init for non-modular core pdc_cons code +Applying: parisc64: don't use module_init for non-modular core perf code +Applying: mn10300: don't use module_init in non-modular flash.c code +Applying: sh: don't use module_init in non-modular psw.c code +Applying: sh: mach-highlander/psw.c is tristate and should use module.h +Applying: xtensa: don't use module_init for non-modular core network.c code +Applying: drivers/clk: don't use module_init in clk-nomadik.c which is non-modular +Applying: cpuidle: don't use modular platform register in non-modular ARM drivers +Applying: drivers/platform: don't use modular register in non-modular pdev_bus.c +Applying: module: relocate module_init from init.h to module.h +Applying: logo: emit "#include <linux/init.h> in autogenerated C file +Applying: arm: delete non-required instances of include <linux/init.h> +Applying: mips: restore init.h usage to arch/mips/ar7/time.c +Applying: sparc: delete non-required instances of include <linux/init.h> +Applying: s390: delete non-required instances of include <linux/init.h> +Applying: alpha: delete non-required instances of <linux/init.h> +Applying: blackfin: delete non-required instances of <linux/init.h> +Applying: powerpc: delete another unrequired instance of <linux/init.h> +Applying: arm64: delete non-required instances of <linux/init.h> +Applying: watchdog: delete non-required instances of include <linux/init.h> +Applying: video: delete non-required instances of include <linux/init.h> +Applying: rtc: delete non-required instances of include <linux/init.h> +Applying: scsi: delete non-required instances of include <linux/init.h> +Applying: spi: delete non-required instances of include <linux/init.h> +Applying: acpi: delete non-required instances of include <linux/init.h> +Applying: drivers/power: delete non-required instances of include <linux/init.h> +Applying: drivers/media: delete non-required instances of include <linux/init.h> +Applying: drivers/ata: delete non-required instances of include <linux/init.h> +Applying: drivers/mtd: delete non-required instances of include <linux/init.h> +Applying: drivers/hwmon: delete non-required instances of include <linux/init.h> +Applying: drivers/pinctrl: delete non-required instances of include <linux/init.h> +Applying: drivers/isdn: delete non-required instances of include <linux/init.h> +Applying: drivers/leds: delete non-required instances of include <linux/init.h> +Applying: drivers/pcmcia: delete non-required instances of include <linux/init.h> +Applying: drivers/char: delete non-required instances of include <linux/init.h> +Applying: drivers/infiniband: delete non-required instances of include <linux/init.h> +Applying: drivers/mfd: delete non-required instances of include <linux/init.h> +Applying: drivers/gpio: delete non-required instances of include <linux/init.h> +Applying: drivers/bluetooth: delete non-required instances of include <linux/init.h> +Applying: drivers/mmc: delete non-required instances of include <linux/init.h> +Applying: drivers/crypto: delete non-required instances of include <linux/init.h> +Applying: drivers/platform: delete non-required instances of include <linux/init.h> +Applying: drivers/misc: delete non-required instances of include <linux/init.h> +Applying: drivers/edac: delete non-required instances of include <linux/init.h> +Applying: drivers/macintosh: delete non-required instances of include <linux/init.h> +Applying: drivers/base: delete non-required instances of include <linux/init.h> +Applying: drivers/cpufreq: delete non-required instances of <linux/init.h> +Applying: drivers/pci: delete non-required instances of <linux/init.h> +Applying: drivers/dma: delete non-required instances of <linux/init.h> +Applying: drivers/gpu: delete non-required instances of <linux/init.h> +Applying: drivers: delete remaining non-required instances of <linux/init.h> +Applying: include: remove needless instances of <linux/init.h> +$ cd ../next +$ git fetch -f ../rebase-tmp init:init/master +From ../rebase-tmp + + 609c06fe19e6...575b5e885d4b init -> init/master (forced update) +$ rm -rf ../rebase-tmp +Merging init/master (575b5e885d4b include: remove needless instances of <linux/init.h>) +$ git merge --no-ff init/master +Merge made by the 'recursive' strategy. + arch/alpha/kernel/err_ev6.c | 1 - + arch/alpha/kernel/irq.c | 1 - + arch/alpha/kernel/srmcons.c | 3 +- + arch/alpha/kernel/traps.c | 1 - + arch/alpha/oprofile/op_model_ev4.c | 1 - + arch/alpha/oprofile/op_model_ev5.c | 1 - + arch/alpha/oprofile/op_model_ev6.c | 1 - + arch/alpha/oprofile/op_model_ev67.c | 1 - + arch/arm/common/dmabounce.c | 1 - + arch/arm/firmware/trusted_foundations.c | 1 - + arch/arm/include/asm/arch_timer.h | 1 - + arch/arm/kernel/entry-armv.S | 2 + + arch/arm/kernel/entry-header.S | 1 - + arch/arm/kernel/hyp-stub.S | 1 - + arch/arm/kernel/suspend.c | 1 - + arch/arm/kernel/unwind.c | 1 - + arch/arm/mach-at91/include/mach/gpio.h | 1 + + arch/arm/mach-cns3xxx/pm.c | 1 - + arch/arm/mach-exynos/headsmp.S | 1 - + arch/arm/mach-footbridge/personal.c | 1 - + arch/arm/mach-imx/headsmp.S | 1 - + arch/arm/mach-imx/iomux-v3.c | 1 - + arch/arm/mach-iop33x/uart.c | 1 - + arch/arm/mach-msm/headsmp.S | 1 - + arch/arm/mach-msm/proc_comm.h | 1 - + arch/arm/mach-mvebu/headsmp.S | 1 - + arch/arm/mach-netx/fb.c | 1 - + arch/arm/mach-netx/pfifo.c | 1 - + arch/arm/mach-netx/xc.c | 1 - + arch/arm/mach-nspire/clcd.c | 1 - + arch/arm/mach-omap1/fpga.c | 1 - + arch/arm/mach-omap1/include/mach/serial.h | 1 - + arch/arm/mach-omap2/omap-headsmp.S | 1 - + arch/arm/mach-omap2/omap3-restart.c | 1 - + arch/arm/mach-omap2/vc3xxx_data.c | 1 - + arch/arm/mach-omap2/vc44xx_data.c | 1 - + arch/arm/mach-omap2/vp3xxx_data.c | 1 - + arch/arm/mach-omap2/vp44xx_data.c | 1 - + arch/arm/mach-prima2/headsmp.S | 1 - + arch/arm/mach-pxa/clock-pxa2xx.c | 1 - + arch/arm/mach-pxa/clock-pxa3xx.c | 1 - + arch/arm/mach-pxa/corgi_pm.c | 1 - + arch/arm/mach-pxa/mfp-pxa3xx.c | 1 - + arch/arm/mach-pxa/spitz_pm.c | 1 - + arch/arm/mach-s3c24xx/clock-s3c244x.c | 1 - + arch/arm/mach-s3c24xx/iotiming-s3c2410.c | 1 - + arch/arm/mach-s3c24xx/iotiming-s3c2412.c | 1 - + arch/arm/mach-s3c24xx/irq-pm.c | 1 - + arch/arm/mach-s3c24xx/pm.c | 1 - + arch/arm/mach-s3c64xx/mach-crag6410-module.c | 2 +- + arch/arm/mach-s5p64x0/clock.c | 1 - + arch/arm/mach-sa1100/ssp.c | 1 - + arch/arm/mach-shmobile/headsmp-scu.S | 1 - + arch/arm/mach-shmobile/headsmp.S | 1 - + arch/arm/mach-shmobile/platsmp.c | 1 - + arch/arm/mach-shmobile/sleep-sh7372.S | 1 - + arch/arm/mach-socfpga/headsmp.S | 1 - + arch/arm/mach-sti/headsmp.S | 1 - + arch/arm/mach-sunxi/headsmp.S | 1 - + arch/arm/mach-tegra/flowctrl.c | 1 - + arch/arm/mach-tegra/headsmp.S | 1 - + arch/arm/mach-tegra/reset-handler.S | 1 - + arch/arm/mach-u300/dummyspichip.c | 1 - + arch/arm/mach-ux500/board-mop500-audio.c | 1 - + arch/arm/mach-ux500/headsmp.S | 1 - + arch/arm/mach-versatile/versatile_ab.c | 1 - + arch/arm/mach-vexpress/spc.c | 2 +- + arch/arm/mach-zynq/headsmp.S | 1 - + arch/arm/mm/hugetlbpage.c | 1 - + arch/arm/plat-iop/i2c.c | 1 - + arch/arm/plat-samsung/pm-check.c | 1 - + arch/arm/plat-samsung/pm-gpio.c | 1 - + arch/arm/plat-samsung/s5p-irq-pm.c | 1 - + arch/arm/plat-versatile/headsmp.S | 1 - + arch/arm/plat-versatile/platsmp.c | 1 - + arch/arm/vfp/entry.S | 2 + + arch/arm64/include/asm/arch_timer.h | 1 - + arch/arm64/kernel/cputable.c | 2 - + arch/arm64/kernel/entry.S | 1 - + arch/arm64/kernel/hyp-stub.S | 1 - + arch/arm64/kernel/process.c | 1 - + arch/arm64/kernel/ptrace.c | 1 - + arch/arm64/kernel/smp_spin_table.c | 1 - + arch/arm64/kernel/vdso/vdso.S | 1 - + arch/arm64/lib/delay.c | 1 - + arch/arm64/mm/cache.S | 1 - + arch/arm64/mm/proc.S | 1 - + arch/blackfin/mach-common/cache-c.c | 1 - + arch/blackfin/mach-common/clocks-init.c | 1 - + arch/blackfin/mach-common/scb-init.c | 1 - + arch/cris/arch-v32/mm/intmem.c | 3 +- + arch/ia64/hp/sim/simscsi.c | 11 +--- + arch/ia64/sn/kernel/mca.c | 3 +- + arch/m68k/mvme16x/rtc.c | 2 +- + arch/mips/ar7/time.c | 1 + + arch/mips/loongson/common/serial.c | 9 ++- + arch/mips/mti-sead3/sead3-mtd.c | 3 +- + arch/mn10300/unit-asb2303/flash.c | 3 +- + arch/parisc/kernel/pdc_cons.c | 3 +- + arch/parisc/kernel/perf.c | 3 +- + arch/powerpc/include/asm/kvm_ppc.h | 1 - + arch/powerpc/kernel/time.c | 2 +- + arch/powerpc/kvm/44x.c | 10 +-- + arch/powerpc/kvm/book3s.c | 2 +- + arch/powerpc/kvm/booke.c | 6 -- + arch/powerpc/kvm/e500.c | 10 +-- + arch/powerpc/kvm/e500mc.c | 10 +-- + arch/powerpc/mm/hugetlbpage.c | 2 +- + arch/powerpc/platforms/83xx/suspend.c | 3 +- + arch/powerpc/platforms/ps3/time.c | 3 +- + arch/powerpc/sysdev/fsl_lbc.c | 2 +- + arch/powerpc/sysdev/indirect_pci.c | 1 - + arch/sh/boards/mach-highlander/psw.c | 2 +- + arch/sh/boards/mach-landisk/psw.c | 2 +- + arch/sparc/kernel/cpumap.c | 1 - + arch/sparc/kernel/ebus.c | 1 - + arch/sparc/kernel/hvtramp.S | 1 - + arch/sparc/kernel/of_device_common.c | 1 - + arch/sparc/kernel/pci.c | 3 +- + arch/sparc/kernel/pci_common.c | 1 - + arch/sparc/kernel/process_32.c | 1 - + arch/sparc/kernel/sparc_ksyms_32.c | 1 - + arch/sparc/kernel/sparc_ksyms_64.c | 1 - + arch/sparc/kernel/trampoline_32.S | 1 - + arch/sparc/kernel/trampoline_64.S | 1 - + arch/sparc/mm/hugetlbpage.c | 1 - + arch/sparc/mm/tlb.c | 1 - + arch/sparc/prom/p1275.c | 1 - + arch/x86/kernel/bootflag.c | 2 +- + arch/x86/kernel/devicetree.c | 2 +- + arch/x86/kernel/vsmp_64.c | 2 +- + arch/x86/platform/intel-mid/intel_mid_vrtc.c | 3 +- + arch/xtensa/platforms/iss/network.c | 4 +- + drivers/acpi/apei/apei-base.c | 1 - + drivers/acpi/button.c | 1 - + drivers/acpi/fan.c | 1 - + drivers/acpi/hed.c | 1 - + drivers/acpi/pci_irq.c | 1 - + drivers/acpi/power.c | 1 - + drivers/acpi/processor_perflib.c | 1 - + drivers/acpi/processor_thermal.c | 1 - + drivers/acpi/processor_throttling.c | 1 - + drivers/acpi/utils.c | 1 - + drivers/ata/acard-ahci.c | 1 - + drivers/ata/ahci.c | 1 - + drivers/ata/ahci_platform.c | 1 - + drivers/ata/ata_generic.c | 1 - + drivers/ata/libahci.c | 1 - + drivers/ata/pata_acpi.c | 1 - + drivers/ata/pata_amd.c | 1 - + drivers/ata/pata_artop.c | 1 - + drivers/ata/pata_at91.c | 1 - + drivers/ata/pata_atiixp.c | 1 - + drivers/ata/pata_atp867x.c | 1 - + drivers/ata/pata_cmd640.c | 1 - + drivers/ata/pata_cmd64x.c | 1 - + drivers/ata/pata_cs5520.c | 1 - + drivers/ata/pata_cs5530.c | 1 - + drivers/ata/pata_cs5535.c | 1 - + drivers/ata/pata_cs5536.c | 1 - + drivers/ata/pata_cypress.c | 1 - + drivers/ata/pata_efar.c | 1 - + drivers/ata/pata_ep93xx.c | 1 - + drivers/ata/pata_hpt366.c | 1 - + drivers/ata/pata_hpt37x.c | 1 - + drivers/ata/pata_hpt3x2n.c | 1 - + drivers/ata/pata_hpt3x3.c | 1 - + drivers/ata/pata_imx.c | 1 - + drivers/ata/pata_it8213.c | 1 - + drivers/ata/pata_it821x.c | 1 - + drivers/ata/pata_jmicron.c | 1 - + drivers/ata/pata_marvell.c | 1 - + drivers/ata/pata_mpiix.c | 1 - + drivers/ata/pata_netcell.c | 1 - + drivers/ata/pata_ninja32.c | 1 - + drivers/ata/pata_ns87410.c | 1 - + drivers/ata/pata_ns87415.c | 1 - + drivers/ata/pata_oldpiix.c | 1 - + drivers/ata/pata_opti.c | 1 - + drivers/ata/pata_optidma.c | 1 - + drivers/ata/pata_pcmcia.c | 1 - + drivers/ata/pata_pdc2027x.c | 1 - + drivers/ata/pata_pdc202xx_old.c | 1 - + drivers/ata/pata_piccolo.c | 1 - + drivers/ata/pata_platform.c | 1 - + drivers/ata/pata_pxa.c | 1 - + drivers/ata/pata_radisys.c | 1 - + drivers/ata/pata_rdc.c | 1 - + drivers/ata/pata_rz1000.c | 1 - + drivers/ata/pata_sc1200.c | 1 - + drivers/ata/pata_scc.c | 1 - + drivers/ata/pata_sch.c | 1 - + drivers/ata/pata_serverworks.c | 1 - + drivers/ata/pata_sil680.c | 1 - + drivers/ata/pata_sis.c | 1 - + drivers/ata/pata_sl82c105.c | 1 - + drivers/ata/pata_triflex.c | 1 - + drivers/ata/pata_via.c | 1 - + drivers/ata/pdc_adma.c | 1 - + drivers/ata/sata_dwc_460ex.c | 1 - + drivers/ata/sata_highbank.c | 1 - + drivers/ata/sata_nv.c | 1 - + drivers/ata/sata_promise.c | 1 - + drivers/ata/sata_qstor.c | 1 - + drivers/ata/sata_sil.c | 1 - + drivers/ata/sata_sis.c | 1 - + drivers/ata/sata_svw.c | 1 - + drivers/ata/sata_sx4.c | 1 - + drivers/ata/sata_uli.c | 1 - + drivers/ata/sata_via.c | 1 - + drivers/ata/sata_vsc.c | 1 - + drivers/atm/idt77105.c | 1 - + drivers/atm/suni.c | 1 - + drivers/base/attribute_container.c | 1 - + drivers/base/power/clock_ops.c | 1 - + drivers/base/power/common.c | 1 - + drivers/base/power/domain.c | 1 - + drivers/base/power/domain_governor.c | 1 - + drivers/base/power/opp.c | 1 - + drivers/base/regmap/regmap-i2c.c | 1 - + drivers/base/regmap/regmap-mmio.c | 1 - + drivers/base/regmap/regmap-spi.c | 1 - + drivers/base/topology.c | 1 - + drivers/block/nvme-scsi.c | 1 - + drivers/bluetooth/ath3k.c | 1 - + drivers/bluetooth/bcm203x.c | 1 - + drivers/bluetooth/bfusb.c | 1 - + drivers/bluetooth/bluecard_cs.c | 1 - + drivers/bluetooth/bpa10x.c | 1 - + drivers/bluetooth/bt3c_cs.c | 1 - + drivers/bluetooth/btuart_cs.c | 1 - + drivers/bluetooth/dtl1_cs.c | 1 - + drivers/bus/omap_l3_smx.c | 1 + + drivers/char/agp/frontend.c | 1 - + drivers/char/agp/generic.c | 1 - + drivers/char/agp/intel-gtt.c | 1 - + drivers/char/agp/sgi-agp.c | 1 - + drivers/char/hw_random/bcm2835-rng.c | 1 - + drivers/char/hw_random/core.c | 1 - + drivers/char/hw_random/exynos-rng.c | 1 - + drivers/char/hw_random/n2-drv.c | 1 - + drivers/char/hw_random/nomadik-rng.c | 1 - + drivers/char/hw_random/octeon-rng.c | 1 - + drivers/char/ipmi/ipmi_si_intf.c | 1 - + drivers/char/mwave/3780i.c | 1 - + drivers/char/tile-srom.c | 1 - + drivers/char/tpm/tpm_i2c_infineon.c | 1 - + drivers/char/tpm/tpm_i2c_stm_st33.c | 1 - + drivers/clk/clk-nomadik.c | 3 +- + drivers/clk/mxs/clk-ssp.c | 1 - + drivers/cpufreq/omap-cpufreq.c | 1 - + drivers/cpufreq/powernow-k8.c | 1 - + drivers/cpufreq/s3c2412-cpufreq.c | 1 - + drivers/cpufreq/s3c2440-cpufreq.c | 1 - + drivers/cpufreq/spear-cpufreq.c | 1 - + drivers/cpufreq/speedstep-lib.c | 1 - + drivers/cpuidle/cpuidle-calxeda.c | 6 +- + drivers/cpuidle/cpuidle-kirkwood.c | 1 - + drivers/cpuidle/cpuidle-zynq.c | 6 +- + drivers/crypto/atmel-aes.c | 1 - + drivers/crypto/atmel-sha.c | 1 - + drivers/crypto/atmel-tdes.c | 1 - + drivers/crypto/nx/nx_debugfs.c | 1 - + drivers/crypto/omap-aes.c | 1 - + drivers/crypto/omap-sham.c | 1 - + drivers/crypto/picoxcell_crypto.c | 1 - + drivers/crypto/s5p-sss.c | 1 - + drivers/crypto/tegra-aes.c | 1 - + drivers/dma/bcm2835-dma.c | 1 - + drivers/dma/dma-jz4740.c | 1 - + drivers/dma/dw/core.c | 1 - + drivers/dma/ioat/dma.c | 1 - + drivers/dma/ioat/dma.h | 1 - + drivers/dma/ioat/dma_v2.c | 1 - + drivers/dma/iop-adma.c | 1 - + drivers/dma/k3dma.c | 1 - + drivers/dma/mmp_pdma.c | 1 - + drivers/dma/mmp_tdma.c | 1 - + drivers/dma/omap-dma.c | 1 - + drivers/dma/pch_dma.c | 1 - + drivers/dma/pl330.c | 1 - + drivers/dma/sh/rcar-hpbdma.c | 1 - + drivers/dma/sh/sudmac.c | 1 - + drivers/dma/tegra20-apb-dma.c | 1 - + drivers/dma/timb_dma.c | 1 - + drivers/edac/amd64_edac.h | 1 - + drivers/edac/edac_device.c | 1 - + drivers/edac/edac_mc.c | 1 - + drivers/edac/edac_pci.c | 1 - + drivers/edac/octeon_edac-l2c.c | 1 - + drivers/edac/octeon_edac-lmc.c | 1 - + drivers/edac/octeon_edac-pc.c | 1 - + drivers/edac/octeon_edac-pci.c | 1 - + drivers/extcon/extcon-gpio.c | 1 - + drivers/firewire/nosy.c | 1 - + drivers/firewire/ohci.c | 1 - + drivers/firmware/efi/vars.c | 1 - + drivers/fmc/fmc-chardev.c | 1 - + drivers/fmc/fmc-core.c | 1 - + drivers/fmc/fmc-fakedev.c | 1 - + drivers/fmc/fmc-trivial.c | 1 - + drivers/fmc/fmc-write-eeprom.c | 1 - + drivers/gpio/gpio-74x164.c | 1 - + drivers/gpio/gpio-adp5520.c | 1 - + drivers/gpio/gpio-adp5588.c | 1 - + drivers/gpio/gpio-generic.c | 1 - + drivers/gpio/gpio-grgpio.c | 1 - + drivers/gpio/gpio-janz-ttl.c | 1 - + drivers/gpio/gpio-kempld.c | 1 - + drivers/gpio/gpio-lpc32xx.c | 1 - + drivers/gpio/gpio-max730x.c | 1 - + drivers/gpio/gpio-moxart.c | 1 - + drivers/gpio/gpio-msm-v2.c | 1 - + drivers/gpio/gpio-rcar.c | 1 - + drivers/gpio/gpio-rdc321x.c | 1 - + drivers/gpio/gpio-sch.c | 1 - + drivers/gpio/gpio-sodaville.c | 1 - + drivers/gpio/gpio-twl6040.c | 1 - + drivers/gpio/gpio-vr41xx.c | 1 - + drivers/gpu/drm/ast/ast_fb.c | 1 - + drivers/gpu/drm/drm_dp_helper.c | 1 - + drivers/gpu/drm/gma500/accel_2d.c | 1 - + drivers/gpu/drm/gma500/framebuffer.c | 1 - + drivers/gpu/drm/i915/intel_fbdev.c | 1 - + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 1 - + drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 1 - + drivers/hid/usbhid/hiddev.c | 1 - + drivers/hid/usbhid/usbkbd.c | 1 - + drivers/hid/usbhid/usbmouse.c | 1 - + drivers/hwmon/adcxx.c | 1 - + drivers/hwmon/adm1021.c | 1 - + drivers/hwmon/adm1025.c | 1 - + drivers/hwmon/adm1026.c | 1 - + drivers/hwmon/adm1029.c | 1 - + drivers/hwmon/adm1031.c | 1 - + drivers/hwmon/adm9240.c | 1 - + drivers/hwmon/ads1015.c | 1 - + drivers/hwmon/ads7828.c | 1 - + drivers/hwmon/ads7871.c | 1 - + drivers/hwmon/adt7310.c | 1 - + drivers/hwmon/adt7410.c | 1 - + drivers/hwmon/adt7411.c | 1 - + drivers/hwmon/adt7475.c | 1 - + drivers/hwmon/adt7x10.c | 1 - + drivers/hwmon/amc6821.c | 1 - + drivers/hwmon/asb100.c | 1 - + drivers/hwmon/atxp1.c | 1 - + drivers/hwmon/da9052-hwmon.c | 1 - + drivers/hwmon/da9055-hwmon.c | 1 - + drivers/hwmon/ds1621.c | 1 - + drivers/hwmon/ds620.c | 1 - + drivers/hwmon/emc1403.c | 1 - + drivers/hwmon/emc2103.c | 1 - + drivers/hwmon/emc6w201.c | 1 - + drivers/hwmon/fam15h_power.c | 1 - + drivers/hwmon/fschmd.c | 1 - + drivers/hwmon/g760a.c | 1 - + drivers/hwmon/g762.c | 1 - + drivers/hwmon/gl518sm.c | 1 - + drivers/hwmon/gl520sm.c | 1 - + drivers/hwmon/gpio-fan.c | 1 - + drivers/hwmon/hih6130.c | 1 - + drivers/hwmon/ina209.c | 1 - + drivers/hwmon/ina2xx.c | 1 - + drivers/hwmon/jc42.c | 1 - + drivers/hwmon/k10temp.c | 1 - + drivers/hwmon/k8temp.c | 1 - + drivers/hwmon/lineage-pem.c | 1 - + drivers/hwmon/lm63.c | 1 - + drivers/hwmon/lm70.c | 1 - + drivers/hwmon/lm73.c | 1 - + drivers/hwmon/lm75.c | 1 - + drivers/hwmon/lm77.c | 1 - + drivers/hwmon/lm80.c | 1 - + drivers/hwmon/lm83.c | 1 - + drivers/hwmon/lm85.c | 1 - + drivers/hwmon/lm87.c | 1 - + drivers/hwmon/lm90.c | 1 - + drivers/hwmon/lm92.c | 1 - + drivers/hwmon/lm93.c | 1 - + drivers/hwmon/lm95234.c | 1 - + drivers/hwmon/lm95241.c | 1 - + drivers/hwmon/lm95245.c | 1 - + drivers/hwmon/ltc4151.c | 1 - + drivers/hwmon/ltc4215.c | 1 - + drivers/hwmon/ltc4245.c | 1 - + drivers/hwmon/ltc4261.c | 1 - + drivers/hwmon/max1111.c | 1 - + drivers/hwmon/max16065.c | 1 - + drivers/hwmon/max1619.c | 1 - + drivers/hwmon/max1668.c | 1 - + drivers/hwmon/max197.c | 1 - + drivers/hwmon/max6639.c | 1 - + drivers/hwmon/max6642.c | 1 - + drivers/hwmon/max6650.c | 1 - + drivers/hwmon/max6697.c | 1 - + drivers/hwmon/pmbus/adm1275.c | 1 - + drivers/hwmon/pmbus/lm25066.c | 1 - + drivers/hwmon/pmbus/ltc2978.c | 1 - + drivers/hwmon/pmbus/max16064.c | 1 - + drivers/hwmon/pmbus/max34440.c | 1 - + drivers/hwmon/pmbus/max8688.c | 1 - + drivers/hwmon/pmbus/pmbus.c | 1 - + drivers/hwmon/pmbus/pmbus_core.c | 1 - + drivers/hwmon/pmbus/ucd9000.c | 1 - + drivers/hwmon/pmbus/ucd9200.c | 1 - + drivers/hwmon/pmbus/zl6100.c | 1 - + drivers/hwmon/s3c-hwmon.c | 1 - + drivers/hwmon/sch5627.c | 1 - + drivers/hwmon/sch5636.c | 1 - + drivers/hwmon/sht15.c | 1 - + drivers/hwmon/sht21.c | 1 - + drivers/hwmon/smm665.c | 1 - + drivers/hwmon/smsc47m192.c | 1 - + drivers/hwmon/thmc50.c | 1 - + drivers/hwmon/tmp102.c | 1 - + drivers/hwmon/tmp401.c | 1 - + drivers/hwmon/tmp421.c | 1 - + drivers/hwmon/twl4030-madc-hwmon.c | 1 - + drivers/hwmon/w83791d.c | 1 - + drivers/hwmon/w83792d.c | 1 - + drivers/hwmon/w83793.c | 1 - + drivers/hwmon/w83795.c | 1 - + drivers/hwmon/w83l785ts.c | 1 - + drivers/hwmon/w83l786ng.c | 1 - + drivers/ide/delkin_cb.c | 1 - + drivers/ide/ide-io.c | 1 - + drivers/ide/setup-pci.c | 1 - + drivers/infiniband/hw/amso1100/c2.c | 1 - + drivers/infiniband/hw/amso1100/c2_pd.c | 1 - + drivers/infiniband/hw/amso1100/c2_provider.c | 1 - + drivers/infiniband/hw/amso1100/c2_rnic.c | 1 - + drivers/infiniband/hw/mlx4/alias_GUID.c | 1 - + drivers/infiniband/hw/nes/nes_cm.c | 1 - + drivers/infiniband/hw/nes/nes_utils.c | 1 - + drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 1 - + drivers/isdn/hardware/avm/avm_cs.c | 1 - + drivers/isdn/hardware/eicon/platform.h | 1 - + drivers/isdn/hisax/amd7930_fn.c | 1 - + drivers/isdn/hisax/asuscom.c | 1 - + drivers/isdn/hisax/avm_a1.c | 1 - + drivers/isdn/hisax/avm_a1p.c | 1 - + drivers/isdn/hisax/avma1_cs.c | 1 - + drivers/isdn/hisax/bkm_a4t.c | 1 - + drivers/isdn/hisax/bkm_a8.c | 1 - + drivers/isdn/hisax/diva.c | 1 - + drivers/isdn/hisax/elsa.c | 1 - + drivers/isdn/hisax/elsa_cs.c | 1 - + drivers/isdn/hisax/enternow_pci.c | 1 - + drivers/isdn/hisax/fsm.c | 1 - + drivers/isdn/hisax/gazel.c | 1 - + drivers/isdn/hisax/hfc_2bds0.c | 1 - + drivers/isdn/hisax/hfc_2bs0.c | 1 - + drivers/isdn/hisax/hfc_pci.c | 1 - + drivers/isdn/hisax/hfc_sx.c | 1 - + drivers/isdn/hisax/hfcscard.c | 1 - + drivers/isdn/hisax/hscx.c | 1 - + drivers/isdn/hisax/icc.c | 1 - + drivers/isdn/hisax/ipacx.c | 1 - + drivers/isdn/hisax/isac.c | 1 - + drivers/isdn/hisax/isar.c | 1 - + drivers/isdn/hisax/isurf.c | 1 - + drivers/isdn/hisax/ix1_micro.c | 1 - + drivers/isdn/hisax/jade.c | 1 - + drivers/isdn/hisax/mic.c | 1 - + drivers/isdn/hisax/netjet.c | 1 - + drivers/isdn/hisax/niccy.c | 1 - + drivers/isdn/hisax/nj_s.c | 1 - + drivers/isdn/hisax/nj_u.c | 1 - + drivers/isdn/hisax/s0box.c | 1 - + drivers/isdn/hisax/saphir.c | 1 - + drivers/isdn/hisax/sedlbauer.c | 1 - + drivers/isdn/hisax/sedlbauer_cs.c | 1 - + drivers/isdn/hisax/sportster.c | 1 - + drivers/isdn/hisax/st5481_b.c | 1 - + drivers/isdn/hisax/st5481_usb.c | 1 - + drivers/isdn/hisax/teleint.c | 1 - + drivers/isdn/hisax/teles0.c | 1 - + drivers/isdn/hisax/teles3.c | 1 - + drivers/isdn/hisax/teles_cs.c | 1 - + drivers/isdn/hisax/telespci.c | 1 - + drivers/isdn/hisax/w6692.c | 1 - + drivers/isdn/i4l/isdnhdlc.c | 1 - + drivers/leds/led-triggers.c | 1 - + drivers/leds/leds-88pm860x.c | 1 - + drivers/leds/leds-adp5520.c | 1 - + drivers/leds/leds-asic3.c | 1 - + drivers/leds/leds-blinkm.c | 1 - + drivers/leds/leds-cobalt-qube.c | 1 - + drivers/leds/leds-da903x.c | 1 - + drivers/leds/leds-da9052.c | 1 - + drivers/leds/leds-fsg.c | 1 - + drivers/leds/leds-gpio.c | 1 - + drivers/leds/leds-hp6xx.c | 1 - + drivers/leds/leds-lm3533.c | 1 - + drivers/leds/leds-lp5521.c | 1 - + drivers/leds/leds-lp5523.c | 1 - + drivers/leds/leds-lp5562.c | 1 - + drivers/leds/leds-lt3593.c | 1 - + drivers/leds/leds-mc13783.c | 1 - + drivers/leds/leds-netxbig.c | 1 - + drivers/leds/leds-ns2.c | 1 - + drivers/leds/leds-ot200.c | 1 - + drivers/leds/leds-pwm.c | 1 - + drivers/leds/leds-s3c24xx.c | 1 - + drivers/leds/leds-wm831x-status.c | 1 - + drivers/leds/leds-wm8350.c | 1 - + drivers/lguest/lg.h | 1 - + drivers/macintosh/adb-iop.c | 1 - + drivers/macintosh/ams/ams-input.c | 1 - + drivers/macintosh/macio-adb.c | 1 - + drivers/macintosh/via-macii.c | 1 - + drivers/macintosh/via-pmu68k.c | 1 - + drivers/macintosh/windfarm_ad7417_sensor.c | 1 - + drivers/macintosh/windfarm_fcu_controls.c | 1 - + drivers/macintosh/windfarm_lm75_sensor.c | 1 - + drivers/macintosh/windfarm_max6690_sensor.c | 1 - + drivers/macintosh/windfarm_smu_sat.c | 1 - + drivers/mailbox/pl320-ipc.c | 2 +- + drivers/md/bitmap.c | 1 - + drivers/md/dm-region-hash.c | 1 - + drivers/media/common/btcx-risc.c | 1 - + drivers/media/common/cx2341x.c | 1 - + drivers/media/common/siano/smsdvb-debugfs.c | 1 - + drivers/media/common/tveeprom.c | 1 - + drivers/media/dvb-frontends/au8522_dig.c | 1 - + drivers/media/dvb-frontends/au8522_priv.h | 1 - + drivers/media/dvb-frontends/bcm3510.c | 1 - + drivers/media/dvb-frontends/cx22700.c | 1 - + drivers/media/dvb-frontends/cx22702.c | 1 - + drivers/media/dvb-frontends/cx24110.c | 1 - + drivers/media/dvb-frontends/cx24113.c | 1 - + drivers/media/dvb-frontends/cx24116.c | 1 - + drivers/media/dvb-frontends/cx24117.c | 1 - + drivers/media/dvb-frontends/cx24123.c | 1 - + drivers/media/dvb-frontends/dib3000mb.c | 1 - + drivers/media/dvb-frontends/drxd_hard.c | 1 - + drivers/media/dvb-frontends/drxk_hard.c | 1 - + drivers/media/dvb-frontends/ds3000.c | 1 - + drivers/media/dvb-frontends/dvb_dummy_fe.c | 1 - + drivers/media/dvb-frontends/isl6405.c | 1 - + drivers/media/dvb-frontends/isl6421.c | 1 - + drivers/media/dvb-frontends/isl6423.c | 1 - + drivers/media/dvb-frontends/it913x-fe.c | 1 - + drivers/media/dvb-frontends/l64781.c | 1 - + drivers/media/dvb-frontends/lgdt330x.c | 1 - + drivers/media/dvb-frontends/lgs8gl5.c | 1 - + drivers/media/dvb-frontends/lnbp21.c | 1 - + drivers/media/dvb-frontends/lnbp22.c | 1 - + drivers/media/dvb-frontends/m88rs2000.c | 1 - + drivers/media/dvb-frontends/mb86a16.c | 1 - + drivers/media/dvb-frontends/mt312.c | 1 - + drivers/media/dvb-frontends/mt352.c | 1 - + drivers/media/dvb-frontends/nxt200x.c | 1 - + drivers/media/dvb-frontends/nxt6000.c | 1 - + drivers/media/dvb-frontends/or51132.c | 1 - + drivers/media/dvb-frontends/s5h1409.c | 1 - + drivers/media/dvb-frontends/s5h1411.c | 1 - + drivers/media/dvb-frontends/s5h1420.c | 1 - + drivers/media/dvb-frontends/s5h1432.c | 1 - + drivers/media/dvb-frontends/si21xx.c | 1 - + drivers/media/dvb-frontends/sp8870.c | 1 - + drivers/media/dvb-frontends/sp887x.c | 1 - + drivers/media/dvb-frontends/stb0899_drv.c | 1 - + drivers/media/dvb-frontends/stb6100.c | 1 - + drivers/media/dvb-frontends/stv0288.c | 1 - + drivers/media/dvb-frontends/stv0297.c | 1 - + drivers/media/dvb-frontends/stv0299.c | 1 - + drivers/media/dvb-frontends/stv090x.c | 1 - + drivers/media/dvb-frontends/stv6110x.c | 1 - + drivers/media/dvb-frontends/tda10021.c | 1 - + drivers/media/dvb-frontends/tda10023.c | 1 - + drivers/media/dvb-frontends/tda10048.c | 1 - + drivers/media/dvb-frontends/tda1004x.c | 1 - + drivers/media/dvb-frontends/tda10086.c | 1 - + drivers/media/dvb-frontends/tda18271c2dd.c | 1 - + drivers/media/dvb-frontends/tda665x.c | 1 - + drivers/media/dvb-frontends/tda8083.c | 1 - + drivers/media/dvb-frontends/tda8261.c | 1 - + drivers/media/dvb-frontends/ves1820.c | 1 - + drivers/media/dvb-frontends/ves1x93.c | 1 - + drivers/media/dvb-frontends/zl10039.c | 1 - + drivers/media/dvb-frontends/zl10353.c | 1 - + drivers/media/i2c/adv7180.c | 1 - + drivers/media/i2c/adv7183.c | 1 - + drivers/media/i2c/adv7343.c | 1 - + drivers/media/i2c/adv7393.c | 1 - + drivers/media/i2c/ak881x.c | 1 - + drivers/media/i2c/ir-kbd-i2c.c | 1 - + drivers/media/i2c/ks0127.c | 1 - + drivers/media/i2c/ml86v7667.c | 1 - + drivers/media/i2c/mt9m032.c | 1 - + drivers/media/i2c/ov7640.c | 1 - + drivers/media/i2c/ov7670.c | 1 - + drivers/media/i2c/s5c73m3/s5c73m3-core.c | 1 - + drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c | 1 - + drivers/media/i2c/s5c73m3/s5c73m3-spi.c | 1 - + drivers/media/i2c/saa6588.c | 1 - + drivers/media/i2c/saa6752hs.c | 1 - + drivers/media/i2c/saa7110.c | 1 - + drivers/media/i2c/saa7191.c | 1 - + drivers/media/i2c/soc_camera/mt9t112.c | 1 - + drivers/media/i2c/soc_camera/ov2640.c | 1 - + drivers/media/i2c/soc_camera/ov772x.c | 1 - + drivers/media/i2c/soc_camera/ov9640.c | 1 - + drivers/media/i2c/soc_camera/ov9740.c | 1 - + drivers/media/i2c/soc_camera/tw9910.c | 1 - + drivers/media/i2c/sony-btf-mpx.c | 1 - + drivers/media/i2c/tda7432.c | 1 - + drivers/media/i2c/tvaudio.c | 1 - + drivers/media/i2c/tw2804.c | 1 - + drivers/media/i2c/tw9903.c | 1 - + drivers/media/i2c/tw9906.c | 1 - + drivers/media/i2c/uda1342.c | 1 - + drivers/media/i2c/vpx3220.c | 1 - + drivers/media/i2c/vs6624.c | 1 - + drivers/media/pci/bt8xx/bttv-gpio.c | 1 - + drivers/media/pci/bt8xx/bttv-i2c.c | 1 - + drivers/media/pci/bt8xx/bttv-if.c | 1 - + drivers/media/pci/bt8xx/bttv-input.c | 1 - + drivers/media/pci/bt8xx/bttv-risc.c | 1 - + drivers/media/pci/bt8xx/dst.c | 1 - + drivers/media/pci/bt8xx/dst_ca.c | 1 - + drivers/media/pci/cx18/cx18-alsa-pcm.c | 1 - + drivers/media/pci/cx18/cx18-driver.h | 1 - + drivers/media/pci/cx23885/cx23885-417.c | 1 - + drivers/media/pci/cx23885/cx23885-alsa.c | 1 - + drivers/media/pci/cx23885/cx23885-cards.c | 1 - + drivers/media/pci/cx23885/cx23885-dvb.c | 1 - + drivers/media/pci/cx23885/cx23885-i2c.c | 1 - + drivers/media/pci/cx23885/cx23885-vbi.c | 1 - + drivers/media/pci/cx23885/cx23885-video.c | 1 - + drivers/media/pci/cx25821/cx25821-alsa.c | 1 - + drivers/media/pci/cx25821/cx25821-audio-upstream.c | 1 - + drivers/media/pci/cx25821/cx25821-cards.c | 1 - + drivers/media/pci/cx25821/cx25821-video-upstream.c | 1 - + drivers/media/pci/cx25821/cx25821-video.h | 1 - + drivers/media/pci/cx88/cx88-alsa.c | 1 - + drivers/media/pci/cx88/cx88-cards.c | 1 - + drivers/media/pci/cx88/cx88-core.c | 1 - + drivers/media/pci/cx88/cx88-i2c.c | 1 - + drivers/media/pci/cx88/cx88-input.c | 1 - + drivers/media/pci/cx88/cx88-mpeg.c | 1 - + drivers/media/pci/cx88/cx88-tvaudio.c | 1 - + drivers/media/pci/cx88/cx88-vbi.c | 1 - + drivers/media/pci/cx88/cx88-video.c | 1 - + drivers/media/pci/cx88/cx88-vp3054-i2c.c | 1 - + drivers/media/pci/dm1105/dm1105.c | 1 - + drivers/media/pci/ivtv/ivtv-alsa-pcm.c | 1 - + drivers/media/pci/ivtv/ivtv-driver.h | 1 - + drivers/media/pci/mantis/mantis_pci.c | 1 - + drivers/media/pci/ngene/ngene-core.c | 1 - + drivers/media/pci/ngene/ngene-dvb.c | 1 - + drivers/media/pci/ngene/ngene-i2c.c | 1 - + drivers/media/pci/pluto2/pluto2.c | 1 - + drivers/media/pci/saa7134/saa7134-alsa.c | 1 - + drivers/media/pci/saa7134/saa7134-cards.c | 1 - + drivers/media/pci/saa7134/saa7134-i2c.c | 1 - + drivers/media/pci/saa7134/saa7134-input.c | 1 - + drivers/media/pci/saa7134/saa7134-ts.c | 1 - + drivers/media/pci/saa7134/saa7134-tvaudio.c | 1 - + drivers/media/pci/saa7134/saa7134-vbi.c | 1 - + drivers/media/pci/saa7134/saa7134-video.c | 1 - + drivers/media/pci/saa7164/saa7164-cards.c | 1 - + drivers/media/pci/saa7164/saa7164-i2c.c | 1 - + drivers/media/pci/ttpci/av7110_ir.c | 1 - + drivers/media/pci/ttpci/ttpci-eeprom.c | 1 - + drivers/media/pci/zoran/zoran_driver.c | 1 - + drivers/media/platform/blackfin/bfin_capture.c | 1 - + drivers/media/platform/davinci/vpbe.c | 1 - + drivers/media/platform/davinci/vpbe_display.c | 1 - + drivers/media/platform/davinci/vpbe_venc.c | 1 - + drivers/media/platform/davinci/vpfe_capture.c | 1 - + drivers/media/platform/fsl-viu.c | 1 - + drivers/media/platform/indycam.c | 1 - + drivers/media/platform/sh_vou.c | 1 - + drivers/media/platform/soc_camera/atmel-isi.c | 1 - + drivers/media/platform/soc_camera/mx2_camera.c | 1 - + drivers/media/platform/soc_camera/mx3_camera.c | 1 - + drivers/media/platform/soc_camera/pxa_camera.c | 1 - + drivers/media/platform/soc_camera/soc_camera.c | 1 - + .../platform/soc_camera/soc_camera_platform.c | 1 - + drivers/media/radio/dsbr100.c | 1 - + drivers/media/radio/radio-isa.c | 1 - + drivers/media/radio/radio-ma901.c | 1 - + drivers/media/radio/radio-maxiradio.c | 1 - + drivers/media/radio/radio-mr800.c | 1 - + drivers/media/radio/radio-raremono.c | 1 - + drivers/media/radio/radio-shark.c | 1 - + drivers/media/radio/radio-shark2.c | 1 - + drivers/media/radio/radio-tea5764.c | 1 - + drivers/media/radio/radio-tea5777.c | 1 - + drivers/media/radio/saa7706h.c | 1 - + drivers/media/radio/si470x/radio-si470x.h | 1 - + drivers/media/radio/si4713/radio-platform-si4713.c | 1 - + drivers/media/radio/si4713/radio-usb-si4713.c | 1 - + drivers/media/radio/tef6862.c | 1 - + drivers/media/rc/ati_remote.c | 1 - + drivers/media/rc/gpio-ir-recv.c | 1 - + drivers/media/rc/imon.c | 1 - + drivers/media/tuners/mt2063.c | 1 - + drivers/media/tuners/mxl5005s.c | 1 - + drivers/media/tuners/tda9887.c | 1 - + drivers/media/usb/au0828/au0828-dvb.c | 1 - + drivers/media/usb/au0828/au0828-i2c.c | 1 - + drivers/media/usb/au0828/au0828-vbi.c | 1 - + drivers/media/usb/au0828/au0828-video.c | 1 - + drivers/media/usb/cx231xx/cx231xx-417.c | 1 - + drivers/media/usb/cx231xx/cx231xx-avcore.c | 1 - + drivers/media/usb/cx231xx/cx231xx-cards.c | 1 - + drivers/media/usb/cx231xx/cx231xx-core.c | 1 - + drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h | 1 - + drivers/media/usb/cx231xx/cx231xx-vbi.c | 1 - + drivers/media/usb/cx231xx/cx231xx-video.c | 1 - + drivers/media/usb/dvb-usb/friio-fe.c | 1 - + drivers/media/usb/em28xx/em28xx-cards.c | 1 - + drivers/media/usb/em28xx/em28xx-core.c | 1 - + drivers/media/usb/em28xx/em28xx-vbi.c | 1 - + drivers/media/usb/em28xx/em28xx-video.c | 1 - + drivers/media/usb/hdpvr/hdpvr-control.c | 1 - + drivers/media/usb/hdpvr/hdpvr-core.c | 1 - + drivers/media/usb/hdpvr/hdpvr-video.c | 1 - + drivers/media/usb/pwc/pwc-if.c | 1 - + drivers/media/usb/pwc/pwc-v4l.c | 1 - + drivers/media/usb/siano/smsusb.c | 1 - + drivers/media/usb/stk1160/stk1160-core.c | 1 - + drivers/media/usb/stkwebcam/stk-webcam.c | 1 - + drivers/media/usb/tlg2300/pd-alsa.c | 1 - + drivers/media/usb/tlg2300/pd-radio.c | 1 - + drivers/media/usb/tm6000/tm6000-cards.c | 1 - + drivers/media/usb/tm6000/tm6000-input.c | 1 - + drivers/media/usb/tm6000/tm6000-video.c | 1 - + drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c | 1 - + drivers/media/usb/ttusb-dec/ttusb_dec.c | 1 - + drivers/media/usb/usbtv/usbtv.c | 1 - + drivers/media/usb/usbvision/usbvision-core.c | 1 - + drivers/media/usb/usbvision/usbvision-i2c.c | 1 - + drivers/media/usb/zr364xx/zr364xx.c | 1 - + drivers/media/v4l2-core/tuner-core.c | 1 - + drivers/media/v4l2-core/videobuf-core.c | 1 - + drivers/media/v4l2-core/videobuf-dma-contig.c | 1 - + drivers/media/v4l2-core/videobuf-dma-sg.c | 1 - + drivers/media/v4l2-core/videobuf-dvb.c | 1 - + drivers/media/v4l2-core/videobuf-vmalloc.c | 1 - + drivers/message/fusion/mptlan.h | 1 - + drivers/message/fusion/mptscsih.c | 1 - + drivers/mfd/adp5520.c | 1 - + drivers/mfd/cs5535-mfd.c | 1 - + drivers/mfd/janz-cmodio.c | 1 - + drivers/mfd/lpc_ich.c | 1 - + drivers/mfd/lpc_sch.c | 1 - + drivers/mfd/mcp-sa11x0.c | 1 - + drivers/mfd/pcf50633-adc.c | 1 - + drivers/mfd/rc5t583-irq.c | 1 - + drivers/mfd/rdc321x-southbridge.c | 1 - + drivers/mfd/retu-mfd.c | 1 - + drivers/mfd/smsc-ece1099.c | 1 - + drivers/mfd/ti-ssp.c | 1 - + drivers/mfd/ti_am335x_tscadc.c | 1 - + drivers/mfd/tps65912-core.c | 1 - + drivers/mfd/tps65912-irq.c | 1 - + drivers/mfd/twl4030-irq.c | 1 - + drivers/mfd/twl4030-madc.c | 1 - + drivers/mfd/twl6030-irq.c | 1 - + drivers/mfd/vexpress-config.c | 1 - + drivers/mfd/wm8350-core.c | 1 - + drivers/mfd/wm8350-irq.c | 1 - + drivers/misc/ad525x_dpot.c | 1 - + drivers/misc/apds9802als.c | 1 - + drivers/misc/bmp085.c | 1 - + drivers/misc/carma/carma-fpga.c | 1 - + drivers/misc/ds1682.c | 1 - + drivers/misc/eeprom/at25.c | 1 - + drivers/misc/eeprom/eeprom.c | 1 - + drivers/misc/eeprom/eeprom_93xx46.c | 1 - + drivers/misc/eeprom/max6875.c | 1 - + drivers/misc/eeprom/sunxi_sid.c | 1 - + drivers/misc/genwqe/card_debugfs.c | 1 - + drivers/misc/hmc6352.c | 1 - + drivers/misc/isl29003.c | 1 - + drivers/misc/isl29020.c | 1 - + drivers/misc/lattice-ecp3-config.c | 1 - + drivers/misc/lis3lv02d/lis3lv02d.c | 1 - + drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 1 - + drivers/misc/lis3lv02d/lis3lv02d_spi.c | 1 - + drivers/misc/mei/amthif.c | 1 - + drivers/misc/mei/pci-me.c | 1 - + drivers/misc/ti-st/st_core.c | 1 - + drivers/misc/ti_dac7512.c | 1 - + drivers/misc/tsl2550.c | 1 - + drivers/mmc/host/android-goldfish.c | 1 - + drivers/mmc/host/bfin_sdh.c | 1 - + drivers/mmc/host/mmci.c | 1 - + drivers/mmc/host/msm_sdcc.c | 1 - + drivers/mmc/host/mxcmmc.c | 1 - + drivers/mmc/host/mxs-mmc.c | 1 - + drivers/mmc/host/omap.c | 1 - + drivers/mmc/host/omap_hsmmc.c | 1 - + drivers/mmc/host/pxamci.c | 1 - + drivers/mmc/host/sdhci-acpi.c | 1 - + drivers/mmc/host/sdhci-pxav2.c | 1 - + drivers/mmc/host/sdhci-pxav3.c | 1 - + drivers/mmc/host/sdhci-tegra.c | 1 - + drivers/mmc/host/wmt-sdmmc.c | 1 - + drivers/mtd/chips/cfi_cmdset_0001.c | 1 - + drivers/mtd/chips/cfi_cmdset_0002.c | 1 - + drivers/mtd/chips/cfi_cmdset_0020.c | 1 - + drivers/mtd/devices/m25p80.c | 1 - + drivers/mtd/devices/mtd_dataflash.c | 1 - + drivers/mtd/devices/sst25l.c | 1 - + drivers/mtd/inftlmount.c | 1 - + drivers/mtd/maps/bfin-async-flash.c | 1 - + drivers/mtd/maps/gpio-addr-flash.c | 1 - + drivers/mtd/maps/intel_vr_nor.c | 1 - + drivers/mtd/maps/ixp4xx.c | 1 - + drivers/mtd/maps/lantiq-flash.c | 1 - + drivers/mtd/maps/latch-addr-flash.c | 1 - + drivers/mtd/maps/pci.c | 1 - + drivers/mtd/maps/physmap_of.c | 1 - + drivers/mtd/maps/plat-ram.c | 1 - + drivers/mtd/maps/pxa2xx-flash.c | 1 - + drivers/mtd/maps/rbtx4939-flash.c | 1 - + drivers/mtd/maps/sa1100-flash.c | 1 - + drivers/mtd/maps/scb2_flash.c | 1 - + drivers/mtd/maps/sun_uflash.c | 1 - + drivers/mtd/mtd_blkdevs.c | 1 - + drivers/mtd/nand/ams-delta.c | 1 - + drivers/mtd/nand/au1550nd.c | 1 - + drivers/mtd/nand/bf5xx_nand.c | 1 - + drivers/mtd/nand/davinci_nand.c | 1 - + drivers/mtd/nand/fsl_elbc_nand.c | 1 - + drivers/mtd/nand/fsl_ifc_nand.c | 1 - + drivers/mtd/nand/gpio.c | 1 - + drivers/mtd/nand/mpc5121_nfc.c | 1 - + drivers/mtd/nand/nuc900_nand.c | 1 - + drivers/mtd/nand/pasemi_nand.c | 1 - + drivers/mtd/nand/s3c2410.c | 1 - + drivers/mtd/onenand/generic.c | 1 - + drivers/mtd/onenand/omap2.c | 1 - + drivers/mtd/onenand/onenand_base.c | 1 - + drivers/mtd/tests/mtd_test.c | 1 - + drivers/mtd/ubi/ubi.h | 1 - + drivers/ntb/ntb_hw.c | 1 - + drivers/of/device.c | 1 - + drivers/oprofile/timer_int.c | 1 - + drivers/parisc/eisa_enumerator.c | 1 - + drivers/parport/parport_cs.c | 1 - + drivers/parport/parport_gsc.c | 1 - + drivers/parport/parport_sunbpp.c | 1 - + drivers/pci/bus.c | 1 - + drivers/pci/host-bridge.c | 1 - + drivers/pci/hotplug/acpiphp_glue.c | 1 - + drivers/pci/hotplug/cpqphp_nvram.c | 1 - + drivers/pci/hotplug/s390_pci_hpc.c | 1 - + drivers/pci/msi.c | 1 - + drivers/pci/search.c | 1 - + drivers/pci/setup-irq.c | 1 - + drivers/pci/setup-res.c | 1 - + drivers/pcmcia/bfin_cf_pcmcia.c | 1 - + drivers/pcmcia/electra_cf.c | 1 - + drivers/pcmcia/i82092.c | 1 - + drivers/pcmcia/pd6729.c | 1 - + drivers/pcmcia/pxa2xx_viper.c | 1 - + drivers/pcmcia/sa1100_assabet.c | 1 - + drivers/pcmcia/sa1100_cerf.c | 1 - + drivers/pcmcia/sa1100_h3600.c | 1 - + drivers/pcmcia/sa1100_nanoengine.c | 1 - + drivers/pcmcia/sa1100_shannon.c | 1 - + drivers/pcmcia/sa1100_simpad.c | 1 - + drivers/pcmcia/sa1111_jornada720.c | 1 - + drivers/pcmcia/sa1111_lubbock.c | 1 - + drivers/pcmcia/sa1111_neponset.c | 1 - + drivers/pcmcia/soc_common.c | 1 - + drivers/pcmcia/socket_sysfs.c | 1 - + drivers/pcmcia/vrc4171_card.c | 1 - + drivers/pcmcia/vrc4173_cardu.c | 1 - + drivers/pinctrl/mvebu/pinctrl-armada-370.c | 1 - + drivers/pinctrl/mvebu/pinctrl-armada-xp.c | 1 - + drivers/pinctrl/mvebu/pinctrl-dove.c | 1 - + drivers/pinctrl/mvebu/pinctrl-kirkwood.c | 1 - + drivers/pinctrl/pinconf-generic.c | 1 - + drivers/pinctrl/pinconf.c | 1 - + drivers/pinctrl/pinctrl-imx.c | 1 - + drivers/pinctrl/pinctrl-mxs.c | 1 - + drivers/pinctrl/pinctrl-single.c | 1 - + drivers/pinctrl/pinctrl-tegra.c | 1 - + drivers/pinctrl/pinmux.c | 1 - + drivers/pinctrl/sh-pfc/gpio.c | 1 - + drivers/pinctrl/sh-pfc/pfc-sh7722.c | 1 - + drivers/pinctrl/sh-pfc/pfc-sh7723.c | 1 - + drivers/pinctrl/sh-pfc/pfc-sh7724.c | 1 - + drivers/pinctrl/sh-pfc/pfc-sh7734.c | 1 - + drivers/pinctrl/sh-pfc/pfc-sh7757.c | 1 - + drivers/pinctrl/sh-pfc/pfc-sh7785.c | 1 - + drivers/pinctrl/sh-pfc/pfc-sh7786.c | 1 - + drivers/pinctrl/sh-pfc/pfc-shx3.c | 1 - + drivers/pinctrl/sh-pfc/pinctrl.c | 1 - + drivers/platform/goldfish/pdev_bus.c | 16 ++--- + drivers/platform/x86/classmate-laptop.c | 1 - + drivers/platform/x86/hp_accel.c | 1 - + drivers/platform/x86/ideapad-laptop.c | 1 - + drivers/platform/x86/intel-rst.c | 1 - + drivers/platform/x86/intel-smartconnect.c | 1 - + drivers/platform/x86/intel_mid_powerbtn.c | 1 - + drivers/platform/x86/intel_mid_thermal.c | 1 - + drivers/platform/x86/panasonic-laptop.c | 1 - + drivers/platform/x86/pvpanic.c | 1 - + drivers/platform/x86/topstar-laptop.c | 1 - + drivers/platform/x86/toshiba_bluetooth.c | 1 - + drivers/platform/x86/xo15-ebook.c | 1 - + drivers/pnp/manager.c | 1 - + drivers/pnp/pnpbios/bioscalls.c | 1 - + drivers/power/abx500_chargalg.c | 1 - + drivers/power/da9030_battery.c | 1 - + drivers/power/generic-adc-battery.c | 1 - + drivers/power/gpio-charger.c | 1 - + drivers/power/intel_mid_battery.c | 1 - + drivers/power/isp1704_charger.c | 1 - + drivers/power/max17040_battery.c | 1 - + drivers/power/max17042_battery.c | 1 - + drivers/power/pcf50633-charger.c | 1 - + drivers/power/reset/gpio-poweroff.c | 1 - + drivers/power/reset/restart-poweroff.c | 1 - + drivers/power/s3c_adc_battery.c | 1 - + drivers/power/sbs-battery.c | 1 - + drivers/power/smb347-charger.c | 1 - + drivers/power/tps65090-charger.c | 1 - + drivers/power/wm97xx_battery.c | 1 - + drivers/pps/clients/pps-gpio.c | 1 - + drivers/pps/kapi.c | 1 - + drivers/pps/kc.c | 1 - + drivers/pwm/pwm-atmel-tcb.c | 1 - + drivers/pwm/pwm-renesas-tpu.c | 1 - + drivers/rapidio/devices/tsi721_dma.c | 1 - + drivers/rapidio/rio.c | 1 - + drivers/regulator/ab8500-ext.c | 1 - + drivers/regulator/arizona-ldo1.c | 1 - + drivers/regulator/arizona-micsupp.c | 1 - + drivers/regulator/mc13xxx-regulator-core.c | 1 - + drivers/regulator/wm8994-regulator.c | 1 - + drivers/rtc/rtc-ab8500.c | 1 - + drivers/rtc/rtc-au1xxx.c | 1 - + drivers/rtc/rtc-bfin.c | 1 - + drivers/rtc/rtc-bq32k.c | 1 - + drivers/rtc/rtc-bq4802.c | 1 - + drivers/rtc/rtc-dm355evm.c | 1 - + drivers/rtc/rtc-ds1305.c | 1 - + drivers/rtc/rtc-ds1307.c | 1 - + drivers/rtc/rtc-ds1390.c | 1 - + drivers/rtc/rtc-ds1511.c | 1 - + drivers/rtc/rtc-ds1553.c | 1 - + drivers/rtc/rtc-ds2404.c | 1 - + drivers/rtc/rtc-ds3234.c | 1 - + drivers/rtc/rtc-lpc32xx.c | 1 - + drivers/rtc/rtc-ls1x.c | 1 - + drivers/rtc/rtc-m41t80.c | 1 - + drivers/rtc/rtc-m48t59.c | 1 - + drivers/rtc/rtc-max6902.c | 1 - + drivers/rtc/rtc-mpc5121.c | 1 - + drivers/rtc/rtc-mrst.c | 1 - + drivers/rtc/rtc-palmas.c | 1 - + drivers/rtc/rtc-pcf2123.c | 1 - + drivers/rtc/rtc-pcf50633.c | 1 - + drivers/rtc/rtc-pcf8583.c | 1 - + drivers/rtc/rtc-pl030.c | 1 - + drivers/rtc/rtc-pl031.c | 1 - + drivers/rtc/rtc-pm8xxx.c | 1 - + drivers/rtc/rtc-puv3.c | 1 - + drivers/rtc/rtc-r9701.c | 1 - + drivers/rtc/rtc-rc5t583.c | 1 - + drivers/rtc/rtc-rs5c348.c | 1 - + drivers/rtc/rtc-rx4581.c | 1 - + drivers/rtc/rtc-rx8025.c | 1 - + drivers/rtc/rtc-s3c.c | 1 - + drivers/rtc/rtc-sa1100.c | 1 - + drivers/rtc/rtc-snvs.c | 1 - + drivers/rtc/rtc-spear.c | 1 - + drivers/rtc/rtc-stk17ta8.c | 1 - + drivers/rtc/rtc-stmp3xxx.c | 1 - + drivers/rtc/rtc-tps6586x.c | 1 - + drivers/rtc/rtc-tps65910.c | 1 - + drivers/rtc/rtc-tps80031.c | 1 - + drivers/rtc/rtc-twl.c | 1 - + drivers/rtc/rtc-v3020.c | 1 - + drivers/rtc/rtc-vr41xx.c | 1 - + drivers/rtc/rtc-vt8500.c | 1 - + drivers/s390/block/dasd_erp.c | 1 - + drivers/s390/char/tape_34xx.c | 1 - + drivers/s390/char/tape_3590.c | 1 - + drivers/s390/char/tape_class.h | 1 - + drivers/s390/char/tape_core.c | 1 - + drivers/s390/cio/airq.c | 1 - + drivers/s390/cio/device_ops.c | 1 - + drivers/s390/cio/device_status.c | 1 - + drivers/s390/net/ctcm_dbug.c | 1 - + drivers/s390/net/ctcm_fsms.c | 1 - + drivers/s390/net/ctcm_fsms.h | 1 - + drivers/s390/net/ctcm_mpc.c | 1 - + drivers/s390/scsi/zfcp_def.h | 1 - + drivers/sbus/char/bbc_i2c.c | 1 - + drivers/sbus/char/display7seg.c | 1 - + drivers/sbus/char/envctrl.c | 1 - + drivers/sbus/char/flash.c | 1 - + drivers/sbus/char/uctrl.c | 1 - + drivers/scsi/aacraid/aachba.c | 1 - + drivers/scsi/aacraid/commctrl.c | 1 - + drivers/scsi/aacraid/comminit.c | 1 - + drivers/scsi/aacraid/commsup.c | 1 - + drivers/scsi/aacraid/dpcsup.c | 1 - + drivers/scsi/aacraid/rx.c | 1 - + drivers/scsi/aacraid/sa.c | 1 - + drivers/scsi/aacraid/src.c | 1 - + drivers/scsi/arcmsr/arcmsr_attr.c | 1 - + drivers/scsi/arm/msgqueue.c | 1 - + drivers/scsi/arm/queue.c | 1 - + drivers/scsi/bnx2fc/bnx2fc.h | 1 - + drivers/scsi/csiostor/csio_attr.c | 1 - + drivers/scsi/fdomain.c | 1 - + drivers/scsi/fnic/fnic_scsi.c | 1 - + drivers/scsi/hosts.c | 1 - + drivers/scsi/mpt2sas/mpt2sas_base.c | 1 - + drivers/scsi/mpt2sas/mpt2sas_config.c | 1 - + drivers/scsi/mpt2sas/mpt2sas_ctl.c | 1 - + drivers/scsi/mpt2sas/mpt2sas_transport.c | 1 - + drivers/scsi/mpt3sas/mpt3sas_base.c | 1 - + drivers/scsi/mpt3sas/mpt3sas_config.c | 1 - + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 1 - + drivers/scsi/mpt3sas/mpt3sas_transport.c | 1 - + drivers/scsi/mpt3sas/mpt3sas_trigger_diag.c | 1 - + drivers/scsi/qla2xxx/qla_def.h | 1 - + drivers/scsi/qla4xxx/ql4_def.h | 1 - + drivers/scsi/scsi_scan.c | 1 - + drivers/scsi/scsi_sysfs.c | 1 - + drivers/scsi/ufs/ufshcd.h | 1 - + drivers/scsi/wd33c93.c | 1 - + drivers/spi/spi-altera.c | 1 - + drivers/spi/spi-ath79.c | 1 - + drivers/spi/spi-atmel.c | 1 - + drivers/spi/spi-bcm63xx.c | 1 - + drivers/spi/spi-bfin-sport.c | 1 - + drivers/spi/spi-bitbang.c | 1 - + drivers/spi/spi-clps711x.c | 1 - + drivers/spi/spi-gpio.c | 1 - + drivers/spi/spi-imx.c | 1 - + drivers/spi/spi-mpc512x-psc.c | 1 - + drivers/spi/spi-mpc52xx-psc.c | 1 - + drivers/spi/spi-mpc52xx.c | 1 - + drivers/spi/spi-mxs.c | 1 - + drivers/spi/spi-nuc900.c | 1 - + drivers/spi/spi-oc-tiny.c | 1 - + drivers/spi/spi-octeon.c | 1 - + drivers/spi/spi-omap2-mcspi.c | 1 - + drivers/spi/spi-orion.c | 1 - + drivers/spi/spi-ppc4xx.c | 1 - + drivers/spi/spi-pxa2xx-dma.c | 1 - + drivers/spi/spi-pxa2xx-pxadma.c | 1 - + drivers/spi/spi-s3c24xx.c | 1 - + drivers/spi/spi-sh-msiof.c | 1 - + drivers/spi/spi-sh-sci.c | 1 - + drivers/spi/spi-tegra114.c | 1 - + drivers/spi/spi-tegra20-sflash.c | 1 - + drivers/spi/spi-tegra20-slink.c | 1 - + drivers/spi/spi-xcomm.c | 1 - + drivers/spi/spi-xilinx.c | 1 - + drivers/staging/android/ion/ion_dummy_driver.c | 7 +- + drivers/target/target_core_fabric_configfs.c | 1 - + drivers/target/tcm_fc/tfc_cmd.c | 1 - + drivers/target/tcm_fc/tfc_io.c | 1 - + drivers/target/tcm_fc/tfc_sess.c | 1 - + drivers/thermal/ti-soc-thermal/ti-bandgap.c | 1 - + drivers/tty/hvc/hvc_opal.c | 8 +-- + drivers/tty/hvc/hvc_rtas.c | 12 +--- + drivers/tty/hvc/hvc_udbg.c | 9 +-- + drivers/tty/hvc/hvc_xen.c | 17 +---- + drivers/uio/uio_aec.c | 1 - + drivers/uwb/beacon.c | 1 - + drivers/uwb/hwa-rc.c | 1 - + drivers/video/aty/aty128fb.c | 1 - + drivers/video/aty/mach64_cursor.c | 1 - + drivers/video/auo_k1900fb.c | 1 - + drivers/video/auo_k1901fb.c | 1 - + drivers/video/backlight/88pm860x_bl.c | 1 - + drivers/video/backlight/adp5520_bl.c | 1 - + drivers/video/backlight/adp8860_bl.c | 1 - + drivers/video/backlight/adp8870_bl.c | 1 - + drivers/video/backlight/corgi_lcd.c | 1 - + drivers/video/backlight/da903x_bl.c | 1 - + drivers/video/backlight/generic_bl.c | 1 - + drivers/video/backlight/ili922x.c | 1 - + drivers/video/backlight/ili9320.c | 1 - + drivers/video/backlight/lm3533_bl.c | 1 - + drivers/video/backlight/ltv350qv.c | 1 - + drivers/video/backlight/max8925_bl.c | 1 - + drivers/video/backlight/omap1_bl.c | 1 - + drivers/video/backlight/pwm_bl.c | 1 - + drivers/video/backlight/tdo24m.c | 1 - + drivers/video/backlight/vgg2432a4.c | 1 - + drivers/video/backlight/wm831x_bl.c | 1 - + drivers/video/bfin-lq035q1-fb.c | 1 - + drivers/video/clps711xfb.c | 1 - + drivers/video/console/dummycon.c | 1 - + drivers/video/console/sticore.c | 1 - + drivers/video/goldfishfb.c | 1 - + drivers/video/i810/i810_main.c | 1 - + drivers/video/intelfb/intelfbhw.c | 1 - + drivers/video/matrox/matroxfb_base.h | 1 - + drivers/video/mb862xx/mb862xxfb_accel.c | 1 - + drivers/video/mb862xx/mb862xxfbdrv.c | 1 - + drivers/video/mbx/mbxfb.c | 1 - + drivers/video/nuc900fb.c | 1 - + drivers/video/nvidia/nvidia.c | 1 - + drivers/video/pxa168fb.c | 1 - + drivers/video/riva/fbdev.c | 1 - + drivers/video/s3c-fb.c | 1 - + drivers/video/sh_mobile_lcdcfb.c | 1 - + drivers/video/sm501fb.c | 1 - + drivers/video/smscufx.c | 1 - + drivers/video/sstfb.c | 1 - + drivers/video/tgafb.c | 1 - + drivers/video/udlfb.c | 1 - + drivers/video/uvesafb.c | 1 - + drivers/video/via/global.h | 1 - + drivers/video/vt8500lcdfb.c | 1 - + drivers/video/w100fb.c | 1 - + drivers/video/wm8505fb.c | 1 - + drivers/video/xilinxfb.c | 1 - + drivers/vlynq/vlynq.c | 1 - + drivers/w1/masters/ds2482.c | 1 - + drivers/w1/masters/w1-gpio.c | 1 - + drivers/watchdog/ar7_wdt.c | 1 - + drivers/watchdog/ath79_wdt.c | 1 - + drivers/watchdog/bcm47xx_wdt.c | 1 - + drivers/watchdog/bcm63xx_wdt.c | 1 - + drivers/watchdog/cpu5wdt.c | 1 - + drivers/watchdog/cpwd.c | 1 - + drivers/watchdog/davinci_wdt.c | 1 - + drivers/watchdog/hpwdt.c | 1 - + drivers/watchdog/i6300esb.c | 1 - + drivers/watchdog/jz4740_wdt.c | 1 - + drivers/watchdog/max63xx_wdt.c | 1 - + drivers/watchdog/mtx-1_wdt.c | 1 - + drivers/watchdog/nuc900_wdt.c | 1 - + drivers/watchdog/of_xilinx_wdt.c | 1 - + drivers/watchdog/omap_wdt.c | 1 - + drivers/watchdog/orion_wdt.c | 1 - + drivers/watchdog/pnx4008_wdt.c | 1 - + drivers/watchdog/rdc321x_wdt.c | 1 - + drivers/watchdog/retu_wdt.c | 1 - + drivers/watchdog/riowd.c | 1 - + drivers/watchdog/s3c2410_wdt.c | 1 - + drivers/watchdog/sp805_wdt.c | 1 - + drivers/watchdog/stmp3xxx_rtc_wdt.c | 1 - + drivers/watchdog/wdt_pci.c | 1 - + drivers/xen/xen-stub.c | 1 - + fs/notify/inotify/inotify_user.c | 4 +- + include/drm/drmP.h | 1 - + include/linux/fb.h | 1 - + include/linux/ide.h | 1 - + include/linux/init.h | 77 ---------------------- + include/linux/kdb.h | 1 - + include/linux/linux_logo.h | 3 - + include/linux/lsm_audit.h | 1 - + include/linux/module.h | 72 ++++++++++++++++++++ + include/linux/moduleparam.h | 1 - + include/linux/netfilter.h | 1 - + include/linux/nls.h | 2 +- + include/linux/percpu_ida.h | 1 - + include/linux/profile.h | 1 - + include/linux/pstore_ram.h | 1 - + include/linux/usb/gadget.h | 1 - + include/xen/xenbus.h | 1 - + mm/nommu.c | 4 +- + net/ipv4/netfilter.c | 9 +-- + scripts/pnmtologo.c | 1 + + scripts/tags.sh | 2 +- + 1175 files changed, 146 insertions(+), 1360 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..b66be6c9ec58 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing jdelvare-hwmon based on 3.13-rc4 +Unchanged quilt series jdelvare-hwmon diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..25dbccb78f91 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20140129 |