From 24300f9f5981f38f9be88546a3da60fbebbb0f05 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Tue, 13 Dec 2011 18:08:46 +1100 Subject: [PATCH] Add linux-next specific files for 20111213 Signed-off-by: Stephen Rothwell --- Next/SHA1s | 206 + Next/Trees | 208 + Next/merge.log | 10677 ++++++++++++++++++++++++++++++++++++++++ Next/quilt-import.log | 12 + localversion-next | 1 + 5 files changed, 11104 insertions(+) create mode 100644 Next/SHA1s create mode 100644 Next/Trees create mode 100644 Next/merge.log create mode 100644 Next/quilt-import.log create mode 100644 localversion-next diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..6279441b1a6b --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,206 @@ +Name SHA1 +---- ---- +origin dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 +fixes aaa0b4f00729d5530b7d983930e60255574b347b +kbuild-current 44656fa03926e7363ab41c565619800a4b3b1322 +arm-current 6bd054096dce061560cee0e016e292e588dc438f +m68k-current 5bf1e97dc34bf09643815ed48be3d1761a5985e1 +powerpc-merge 49e44064d7e3f24f874a51dd513b83ef9994aa8a +52xx-and-virtex-current c49f8789f532ae39019135ca038e9bc0d15aaa4a +sparc dbf2b92d54e73e4a2524b90d29bd498ecc4aa593 +scsi-rc-fixes c4189d64c5c64b6a1c7a470dd69978a18fe8cc28 +net 72b36015ba43a3cca5303f5534d2c3e1899eae29 +sound-current 1c89fe3b51a2f8068f2f9faa9c48584151416583 +pci-current 8c4519456713628cbb457c77bf06684aace67f69 +wireless 10636bc2d60942254bda149827b922c41f4cb4af +driver-core.current dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 +tty.current caca6a03d365883564885f2c1da3e88dcf65d139 +usb.current 6abff5dc4d5a2c90e597137ce8987e7fd439259b +staging.current dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 +char-misc.current caca6a03d365883564885f2c1da3e88dcf65d139 +cpufreq-current 5983fe2b29df5885880d7fa3b91aca306c7564ef +input-current 8521478f67e95ada4e87970c7b41e504c724b2cf +md-current 5d8c71f9e5fbdd95650be00294d238e27a363b5c +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current 274252862f386b7868f35bf5ceaa5391a8ccfdf3 +ide 0ab3d8b3213c8bb55370b11fcc5321ee4f2c5e92 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +sh-current 21d41f2b312231536cf981c960c83cc4493c0293 +rmobile-current a408baea3cdd2a7b5ad3d70080dff454b8883f62 +devicetree-current f88e1ae8acb8affac29034ed79d4fff95ac8c29d +spi-current 940ab88962bc1aff3273a8356d64577a6e386736 +arm 4697d8896fc85bb6bcd835df60094c17742cbfa8 +arm-soc 6d311e46f19d9510223df122d98b07e90dd8d351 +arm-perf dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 +at91 8748dfae379573cdbea4e765b55e608a1764f918 +davinci fe0d42203cb5616eeff68b14576a0f7e2dd56625 +i.MX 5788f4d617769d5f5b8ffa88d6015f4390229855 +linux-spec 5111711d3ed8f4f1012cac3ec3f2b463b549fbfd +omap 322a8b034003c0d46d39af85bf24fee27b902f48 +pxa 19d6c13b56a78b3757e747f469285c2a546d634a +samsung 9edb240696bacd53f4331119d2dfd13d4cd4852f +s5p 57894d3915d9d3940f2ad273aadf02070f396888 +tegra 2e35cf8e395cd42174a68ef6c9c3ea31ecadd712 +xilinx b85a3ef4ac65169b65fd2fe9bec7912bbf475ba4 +blackfin e5fd47bfab2df0c2184cc0bf4245d8e1bb7724fb +c6x 2141355fcd4d2c95132226434d38f1c6ffff4105 +cris ea78f5b898555ddfbab494c7755130362fe3cf46 +hexagon 110b3723837f231b7dda418df975bcc09e780825 +ia64 2174f6df7891fa331800beb72634c969f017900b +m68k 0c51a0c6a3bc974d42d6ea5e15c0a00e1eb87fc2 +m68knommu 4a7c080c3e53e9e0a29b3d7e2ef5a65fb0d94d92 +microblaze 7f80850d3f9fd8fda23a317044aef3a6bafab06b +mips 1fc140c2367e941a314a309ee5702ff144bdf64a +openrisc b6fd41e29dea9c6753b1843a77e50433e6123bcb +parisc fc99a914318c60cc9fa9c7347529f4e07dec67d8 +powerpc 7c637b04fba553897f0de77d185e5263b06df06f +4xx 228d55053397e6d5325ca179c7ffe331de2846d3 +52xx-and-virtex c1395f4cf4a1944236f0f28cdf718c4aacc88f2d +galak fa8cbaaf5a68f62db3f9a8444ecbb940b47984cb +s390 b4c1eb9af70534dddace71bb6efd0ad447e313da +sh b9a3acf46afdafc601947136f63e9dd228cd86e8 +rmobile b58c580d996655658975aa8042b43b7d579f3986 +sparc-next 3ee72ca99288f1de95ec9c570e43f531c8799f06 +tile 0c90547b4a3fcee184db4d54ffc1a4fb17fd54d6 +unicore32 ed96dfbcfea92233d27db9d3c77fc91a58c959bf +xtensa 29aced688a9321e3da04a45ad94407dfe7c903f7 +ceph 339573406737461cfb17bebabf7ba536a302d841 +cifs 8def5f51b012efb00e77ba2d04696cc0aadd0609 +configfs b930c26416c4ea6855726fd977145ccea9afbdda +ecryptfs aaef29d01a3b9038b0c40ccd17a43993816969fb +ext3 ed47a7d00c22b326fc4c97342a73ecd15929732e +ext4 4c81f045c0bd2cbb78cc6446a4cd98038fe11a2e +fatfs 710d4403a45c4040a9aa86971d50958f5ae6ed40 +fuse 7818d5e9869d231934a3a362f1997cf8d393fd82 +gfs2 46cc1e5fce46e71f27e542125e045827a6bb776e +hfsplus 6596528e391ad978a6a120142cba97a1d7324cb6 +jfs 1c8007b0769d37aa5fcb343b383b0af89ade2f71 +logfs 21f3eb832ba8902a29746a602015410b0b471622 +nfs 652f89f64fabcdae9143ee2b4253cfa838fb0279 +nfsd f5c8593b94190aabdcf207a544f082c7816c4fe6 +nilfs2 93ee7a9340d64f20295aacc3fb6a22b759323280 +ocfs2 939255798a468e1a92f03546de6e87be7b491e57 +omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84 +squashfs 7657cacf478940b995c2c73fdff981c13cc62c5c +v9fs 883381d9f1c5a6329bbb796e23ae52c939940310 +ubifs eaecf43a6970c8d0ef54a31427c82a99e4863fe8 +xfs 9f9c19ec1a59422c7687b11847ed3408128aa0d6 +vfs 206b1d09a56dcd2db1052245c4131879c410eaf8 +vfs-scale 32385c7cf60a78375b63afc4f02001df84dfd1a0 +pci dcdef61f832de52b72c159249f25d7218d3ced18 +hid 92a0db578da54f5fe9b9e5b3f53a33cf0abe1cc4 +i2c a682833a169dbe4a9657d48ce856fd04d886b424 +bjdooks-i2c f8420b7bf6ce1a3c483cbc0a5a48ee82715224a0 +jdelvare-hwmon 4a96f1aafb556ff5070085e48f45c4b58b59246c +hwmon-staging 55f5bfd8393a30c05958fc918f041dd0b3c334a1 +kernel-doc c3b92c8787367a8bb53d57d9789b558f1295cc96 +docs 5c24d8b2bf99ee93049a6f8154ef9cd7897a6e36 +v4l-dvb 6dd938014cb771c92d10518b9ea8239adb8ff6ad +kbuild ddb550d2c97dfa9fa3fccd2b41cfbfa9fd95afa0 +kconfig eae1c36aea9cfe4d123b8af3ffe54109c6579810 +libata 318072d4036e03ec225786eeb6aecb96f7fe9566 +infiniband 5611cc4572e889b62a7b4c72a413536bf6a9c416 +acpi efb90582c575084723cc14302c1300cb26c7e01f +cpupowerutils 498ca793d90aef8ad38a852a969c257f62832738 +ieee1394 a572e688cf5d99d2382016c7241ec37b523b0137 +ubi c55d7436b0d084af11b71b8ba4a58bb8b290c250 +dlm 9beb3bf5a92bb8fc6503f844bf0772df29f14a02 +scsi 7061bba1da7acb837d6a982648a8306ddc9d7409 +target-updates 5bda90c8f20f0af93375721533f4081a40fa6f41 +target-merge e0d85e51564055cf6b527c121f561228308359f5 +ibft 5611cc4572e889b62a7b4c72a413536bf6a9c416 +slave-dma 3506c0d507144d9b0f19efd5a56d289f70611179 +async_tx 21ef4b8b7a7d59a995bf44382de38c95587767d4 +net-next 08e34eb14fe4cfd934b5c169a7682a969457c4ea +wireless-next b6a27d1e6b8e163dee054c9cd03639c62756c2e2 +bluetooth 5a13b09531420d230616bd524b68a5b0c23cd487 +mtd 7148b7999277e2794cec90d8cb47d2a238e0bd0d +l2-mtd a4699233f927738db633687a2276a9f3e127d799 +crypto 741e8c2d8177eca656bc015ef83ab84d817edf8c +sound 96ef593005bc428551a2b345e6a78c91b53117ed +sound-asoc 43a95197581ac58081772eab3bd5f114da87f98b +cpufreq 21f2e3c86b3746aaa462f9a2734363f4f41a641c +rr 25706332fca3197f905feb3e855500ace1436484 +input 246835fccdc0dadeda20cd51f7ec868031fa8142 +input-mt 02f8c6aee8df3cdc935e9bdd4f2d020306035dbe +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block 629baa771f62d55223c8486bcff09813404d74e4 +device-mapper 94956eed14b4b16d401c8ad36d68df0608f968cb +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 74411c04540404a1ff29d254584ef393e150aeda +battery 00a159a5567232fbe1dd85bc611c55f53943b0fc +mmc ed945919a6e0556acbcd92d39f3bec4d6d290b11 +kgdb 880ba694f6161ce4b8e14fb7be64f3d446dd5ae6 +slab 7436099b3ca8c213ddda401c1dc4500ee6f28bc1 +uclinux 5e442a493fc59fa536c76db1fff5b49ca36a88c5 +md 5ce1a37f5b30212d3fd7647040776894c1c9bd1d +mfd 0b3480438a3ad3da68d632b8e83f701b9da9a92c +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm 32faa34dc5ed121a1e927753dcbf0ad395d3a956 +fbdev f940b88d3a57594289455ea99a93a8ddc5c4af06 +viafb 4ce36bbb0497bdd3d6b8682175e5c58745b7acdd +omap_dss2 3e28189038bb831512cf4f8313e1aead97c3e63f +regulator 2f288efd2f9dd04e9a601364153d465fdd9a49bb +security 735e93c70434614bffac4a914ca1da72e37d43c0 +selinux ded509880f6a0213b09f8ae7bef84acb16eaccbf +lblnet 7e27d6e778cd87b6f2415515d7127eba53fe5d02 +watchdog 80fee40f40ad324c076c74e1be0d7a90b8a11b63 +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu c3b92c8787367a8bb53d57d9789b558f1295cc96 +iommu 3a4786b016fe49b17fbe141ac62659b0c1be514c +cputime c5927fe412bf8c71f2fcf03c33b083a8370b712a +osd dde406e58cd91b10233c40fa5ea86c1261a4d043 +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +nommu 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d +trivial 3f865490698871bf77eebce05208fd08e9b45aeb +audit def57543418a5f47debae28a0a9dea2effc11692 +pm 87c1952662151923e2d218a5658beae71d3a17fd +apm 282e5aaba2a0cdfde4d2c2e34bc7438cd6f7a00f +fsnotify ef9bf3b7144bee6ce1da5616015cabc8771206af +irda 94d57c4cfaa43e29ca5fa5ff874048cfc67276f5 +edac 4d096ca7e65584dd5845e64c6400f920e694f672 +edac-amd ed8ccfab5539f930b3b5a954cd4a65414a49baa8 +devicetree ae97159aed6eff68f4ac86472b018985f071fed5 +spi 940ab88962bc1aff3273a8356d64577a6e386736 +gpio 19384a3147252f3a838fc13f24a89b266544b7c6 +tip e416e72660af37ea27486065a6edc257e7c38321 +rcu afe24b122eb6edb5f1cb942570ac8d766105c7fc +uprobes b23a3473554fcba1cbf4e1b866bad8bab9b36f44 +cgroup a34815b96f9a21b3a2e2912dfd0d994acd2855e3 +kmemleak 029aeff5db879afd7760f11214b6fea45f76b58e +kvm a3e06bbe8445f57eb949e6474c5a9b30f24d2057 +oprofile 8685bbc0fc97bd2212fab72c9eb88c216bc8e71a +xen ec8161f0607c014eb27e65340edcda7edebb545a +xen-two 54e6a3c0579f6bc6dcf7af57d1439b5b1a29dd07 +xen-pvhvm b056b6a0144de90707cd22cf7b4f60bf69c86d59 +percpu a34815b96f9a21b3a2e2912dfd0d994acd2855e3 +workqueues 9c5a2ba70251ecaab18c7a83e38b3c620223476c +sfi 5b026c4e3af52fda22c9313a3388344f82f3ba15 +asm-generic 35dbc0e020c6587f78a6c17693beca73aead7b54 +drivers-x86 15b956a0b5651bbb1217ec374fdd67291dabb2af +hwpoison 46e387bbd82d438b9131e237e6e2cb55a825da49 +sysctl c2f5631aceb700224d0cfe0465cee18df564a29e +namespace 7e05c935c50ab5c9ee488c411252076825ec2919 +regmap 681ba97d9fbff59f67c71f1d9a88ad0b8ef49d25 +hsi a8b4deae8a7ed58fbc4d17e4a2374675be89724c +driver-core 175cad266774d09c57a62c65baa6b4e1edafdf3a +tty 9deaa53ac7fa373623123aa4f18828dd62292b1a +usb a1016ce33ce23296ad030e5276fcfdf9cb27cb6a +staging 6b02a17ee5cd5d200dbe4a285a4e750f70884967 +char-misc 7f3379de9cd91e52c40a48b8c01ebdb2d2eec5cf +bkl-config 4ba8216cd90560bc402f52076f64d8546e8aefcb +tmem 665c1e6acbfb4c3b1476a299e383e68c54867cca +writeback d2c3f73b5c59152cb6acfdc6324931793a98d91f +arm-dt ede338f4ce2fb5ee99d18751df32fbd3b10df268 +hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad +pinctrl 4cea6912c63118b6dbfb5c27a7e5d5b33f3a759a +moduleh 6aec187a90aeb883533c9180e2acac1e54c87f7d +vhost 193a667fba76b3df482cbf865228e26ee246e889 +kmap_atomic 7b8fa32e4a6e4b030530220e875644eec6524c74 +xshm 429471bfdc25b4773e157bb2aca02cb0033c824b +memblock 7bd0b0f0da3b1ec11cbcc798eb0ef747a1184077 +remoteproc d275b1bfd2a7ecb180174cc8ac9bcc9497cb8e27 +kvmtool c5fa2dfd9e563e21be0174e884680a95ef5aec7e +scsi-post-merge 65112dccf8a113737684366349d7f9ec373ddc47 +akpm 7d6a38eb21b681e025621897645a544465573e4c diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..795b89a1fbcb --- /dev/null +++ b/Next/Trees @@ -0,0 +1,208 @@ +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://repo.or.cz/linux-kbuild.git#rc-fixes +arm-current git http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +52xx-and-virtex-current git git://git.secretlab.ca/git/linux-2.6#powerpc/merge +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +scsi-rc-fixes git git://bedivere.hansenpartnership.com/git/scsi-rc-fixes-2.6.git#master +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.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/jbarnes/pci#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 +cpufreq-current git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#fixes +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 +audit-current git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-linus +crypto-current git git://github.com/herbertx/crypto.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 +sh-current git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#sh-fixes-for-linus +rmobile-current git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#rmobile-fixes-for-linus +devicetree-current git git://git.secretlab.ca/git/linux-2.6#devicetree/merge +spi-current git git://git.secretlab.ca/git/linux-2.6#spi/merge +arm git http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm#for-next +arm-soc git git://git.linaro.org/people/arnd/arm-soc.git#for-next +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +at91 git git://github.com/at91linux/linux-2.6-at91.git#at91-next +davinci git git://gitorious.org/linux-davinci/linux-davinci.git#davinci-next +i.MX git git://git.pengutronix.de/git/imx/linux-2.6.git#for-next +linux-spec git http://git.kernel.org/pub/scm/linux/kernel/git/dwalker/linux-spec#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git#for-next +pxa git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git#for-next +samsung git git://git.fluff.org/bjdooks/linux.git#next-samsung +s5p 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/olof/tegra.git#for-next +xilinx git git://git.xilinx.com/linux-2.6-xlnx.git#arm-next +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin.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 quilt https://www.codeaurora.org/patches/quic/hlk/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 +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 +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +4xx git git://git.infradead.org/users/jwboyer/powerpc-4xx.git#next +52xx-and-virtex git git://git.secretlab.ca/git/linux-2.6#powerpc/next +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#next +s390 git git://git390.marist.edu/pub/scm/linux-2.6.git#features +sh git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#sh-latest +rmobile git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#rmobile-latest +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 +unicore32 git git://github.com/gxt/linux.git#unicore32 +xtensa git git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-next.git#master +ceph git git://github.com/NewDreamNetwork/ceph-client.git#for-next +cifs git git://git.samba.org/sfrench/cifs-2.6.git#master +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 +fatfs git git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6.git#master +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 +hfsplus git git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus.git#for-next +jfs git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#next +logfs git git://github.com/prasad-joshi/logfs.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 +nilfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2.git#for-next +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git#linux-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#master +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +vfs-scale git git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin.git#vfs-scale-working +pci git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci#linux-next +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c quilt http://khali.linux-fr.org/devel/linux-3/jdelvare-i2c/ +bjdooks-i2c git git://git.fluff.org/bjdooks/linux.git#next-i2c +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 +kernel-doc quilt http://www.xenotime.net/kernel-doc-patches/current/ +docs git git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs.git#docs-move +v4l-dvb git git://linuxtv.org/mchehab/media-next.git#master +kbuild git git://repo.or.cz/linux-kbuild.git#for-next +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig.git#for-next +libata git git://github.com/jgarzik/libata-dev.git#NEXT +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +acpi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +cpupowerutils git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils.git#master +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +ubi git git://git.infradead.org/ubi-2.6.git#linux-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +scsi git git://bedivere.hansenpartnership.com/git/scsi-misc-2.6.git#master +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 +ibft git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft.git#linux-next +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next +async_tx git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git#next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-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/padovan/bluetooth-next.git#master +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://github.com/herbertx/cryptodev.git#master +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 +cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next +rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/ +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +input-mt git git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.git#next +lsm git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next +block git git://git.kernel.dk/linux-2.6-block.git#for-next +device-mapper quilt http://people.redhat.com/agk/patches/linux/editing/ +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-2.6.git#master +battery git git://git.infradead.org/battery-2.6.git#master +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next +kgdb git git://github.com/jwessel/linux-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.infradead.org/users/sameo/mfd-2.6.git#for-next +hdlc git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6.git#hdlc-next +drm git git://people.freedesktop.org/~airlied/linux.git#drm-next +fbdev git git://github.com/schandinat/linux-2.6.git#fbdev-next +viafb git git://github.com/schandinat/linux-2.6.git#viafb-next +omap_dss2 git git://gitorious.org/linux-omap-dss2/linux.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://selinuxproject.org/~jmorris/linux-security#next +selinux git git://git.infradead.org/users/eparis/selinux.git#master +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master +watchdog git git://www.linux-watchdog.org/linux-watchdog.git#linux-next +bdev git git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev.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 +cputime git git://git390.marist.edu/pub/scm/linux-2.6.git#cputime +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 +nommu git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-nommu.git#master +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-next +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +apm git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git#for-next +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next +irda git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git#for-next +edac git git://git.infradead.org/users/mchehab/edac.git#linux_next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +devicetree git git://git.secretlab.ca/git/linux-2.6#devicetree/next +spi git git://git.secretlab.ca/git/linux-2.6#spi/next +gpio git git://git.secretlab.ca/git/linux-2.6#gpio/next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +rcu git git://github.com/paulmckrcu/linux#rcu/next +uprobes git git://github.com/srikard/linux.git#for-next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +kmemleak git git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux.git#kmemleak +kvm git git://github.com/avikivity/kvm.git#kvm-updates/3.2 +oprofile git git://amd64.org/linux/rric.git#for-next +xen git git://github.com/jsgf/linux-xen.git#upstream/xen +xen-two git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git#linux-next +xen-pvhvm git git://xenbits.xen.org/people/sstabellini/linux-pvhvm.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 +sfi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git#sfi-test +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic#next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86#linux-next +hwpoison git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git#hwpoison +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl.git#master +namespace git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/linux-2.6-nsfd.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 +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 +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 +bkl-config git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl.git#config +tmem git git://oss.oracle.com/git/djm/tmem.git#tmem +writeback git git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux.git#writeback-for-next +arm-dt git git://git.secretlab.ca/git/linux-2.6#devicetree/arm-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 +moduleh git git://openlinux.windriver.com/people/paulg/linux-next#for-sfr +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +kmap_atomic git git://github.com/congwang/linux.git#kmap_atomic +xshm git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git#xshm-for-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git#memblock-kill-early_node_map +remoteproc git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git#for-next +kvmtool git git://github.com/penberg/linux-kvm.git#master +scsi-post-merge git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master +akpm mmotm http://userweb.kernel.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..c9e389ce080c --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,10677 @@ +$ date +Tue Dec 13 11:30:29 EST 2011 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at dc47ce9 Linux 3.2-rc5 +Merging origin/master (dc47ce9 Linux 3.2-rc5) +$ git merge origin/master +Already up-to-date. +Merging fixes/master (aaa0b4f iio: iio_event_getfd -- fix ev_int build failure) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (44656fa kbuild: Fix missing system calls check on mips.) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arm-current/fixes (6bd0540 ARM: 7185/1: perf: don't assign platform_device on unsupported CPUs) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 3 +- + arch/arm/include/asm/unwind.h | 16 +---- + arch/arm/kernel/perf_event.c | 3 + + arch/arm/kernel/setup.c | 2 - + arch/arm/kernel/unwind.c | 129 ++++++++++++++++++++++++++-------------- + 5 files changed, 93 insertions(+), 60 deletions(-) +Merging m68k-current/for-linus (5bf1e97 m68k: Wire up process_vm_{read,write}v) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge (49e4406 powerpc/44x: Add mtd ndfc to the ppx44x defconfig) +$ git merge powerpc-merge/merge +Already up-to-date. +Merging 52xx-and-virtex-current/powerpc/merge (c49f878 dtc/powerpc: remove obsolete .gitignore entries) +$ git merge 52xx-and-virtex-current/powerpc/merge +Already up-to-date. +Merging sparc/master (dbf2b92 sbus: convert drivers/sbus/char/* to use module_platform_driver()) +$ git merge sparc/master +Merge made by the 'recursive' strategy. + arch/sparc/kernel/ds.c | 6 ++---- + arch/sparc/kernel/prom_common.c | 4 +--- + drivers/sbus/char/bbc_i2c.c | 27 +++++---------------------- + drivers/sbus/char/display7seg.c | 13 +------------ + drivers/sbus/char/envctrl.c | 12 +----------- + drivers/sbus/char/flash.c | 12 +----------- + drivers/sbus/char/uctrl.c | 12 +----------- + 7 files changed, 12 insertions(+), 74 deletions(-) +Merging scsi-rc-fixes/master (c4189d6 [SCSI] qla4xxx: check for failed conn setup) +$ git merge scsi-rc-fixes/master +Merge made by the 'recursive' strategy. + drivers/s390/scsi/zfcp_scsi.c | 4 + + drivers/scsi/fcoe/fcoe.c | 1 + + drivers/scsi/mpt2sas/mpt2sas_scsih.c | 2 +- + drivers/scsi/qla2xxx/qla_attr.c | 27 +- + drivers/scsi/qla2xxx/qla_dbg.c | 8 +- + drivers/scsi/qla2xxx/qla_gbl.h | 1 + + drivers/scsi/qla2xxx/qla_init.c | 3 +- + drivers/scsi/qla2xxx/qla_iocb.c | 14 +- + drivers/scsi/qla2xxx/qla_isr.c | 2 +- + drivers/scsi/qla2xxx/qla_mbx.c | 25 +- + drivers/scsi/qla2xxx/qla_nx.c | 42 +- + drivers/scsi/qla2xxx/qla_nx.h | 4 + + drivers/scsi/qla2xxx/qla_os.c | 86 +--- + drivers/scsi/qla2xxx/qla_version.h | 2 +- + drivers/scsi/qla4xxx/ql4_def.h | 55 ++- + drivers/scsi/qla4xxx/ql4_fw.h | 8 + + drivers/scsi/qla4xxx/ql4_glbl.h | 16 +- + drivers/scsi/qla4xxx/ql4_init.c | 243 +++++++-- + drivers/scsi/qla4xxx/ql4_mbx.c | 11 + + drivers/scsi/qla4xxx/ql4_os.c | 1084 ++++++++++++++++++++++++++++++++-- + drivers/scsi/qla4xxx/ql4_version.h | 2 +- + 21 files changed, 1429 insertions(+), 211 deletions(-) +Merging net/master (72b3601 ipip, sit: copy parms.name after register_netdevice) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/Kconfig | 6 +- + drivers/bluetooth/btmrvl_sdio.c | 15 ++++- + drivers/bluetooth/btusb.c | 3 +- + drivers/net/ethernet/freescale/fec.c | 11 ++- + drivers/net/ethernet/freescale/fsl_pq_mdio.c | 53 +++------------- + drivers/net/ppp/pptp.c | 4 +- + drivers/net/wireless/ath/ath9k/main.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ce/phy.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192cu/phy.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192de/phy.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192se/phy.c | 2 +- + drivers/ssb/driver_pcicore.c | 8 ++- + net/batman-adv/translation-table.c | 27 +++++++-- + net/bluetooth/bnep/core.c | 8 +-- + net/bluetooth/cmtp/core.c | 5 +- + net/bluetooth/hci_event.c | 2 +- + net/ipv4/ipip.c | 7 ++- + net/ipv6/addrconf.c | 3 +- + net/ipv6/sit.c | 7 ++- + net/mac80211/agg-tx.c | 86 ++++++++++++------------- + 20 files changed, 128 insertions(+), 127 deletions(-) +Merging sound-current/for-linus (1c89fe3 ALSA: HDA: Set position fix to LPIB for an Atom/Poulsbo based device) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/hda/hda_intel.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) +Merging pci-current/for-linus (8c45194 PCI: fix ats compile failure) +$ git merge pci-current/for-linus +Merge made by the 'recursive' strategy. + drivers/pci/ats.c | 1 + + drivers/pci/iov.c | 7 +++++++ + drivers/pci/pci.c | 2 +- + 3 files changed, 9 insertions(+), 1 deletions(-) +Merging wireless/master (10636bc ath9k: fix max phy rate at rate control init) +$ git merge wireless/master +Auto-merging net/nfc/nci/core.c +Auto-merging drivers/net/wireless/ath/ath9k/rc.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath9k/rc.c | 4 +++- + drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 5 ++++- + net/nfc/nci/core.c | 2 +- + 3 files changed, 8 insertions(+), 3 deletions(-) +Merging driver-core.current/driver-core-linus (dc47ce9 Linux 3.2-rc5) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (caca6a0 Linux 3.2-rc3) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (6abff5d USB: cdc-acm: add IDs for Motorola H24 HSPA USB module.) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/class/cdc-acm.c | 10 ++++++++++ + drivers/usb/gadget/f_mass_storage.c | 1 + + drivers/usb/renesas_usbhs/mod.c | 2 +- + drivers/usb/renesas_usbhs/mod_host.c | 1 + + drivers/usb/serial/option.c | 3 +++ + 5 files changed, 16 insertions(+), 1 deletions(-) +Merging staging.current/staging-linus (dc47ce9 Linux 3.2-rc5) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (caca6a0 Linux 3.2-rc3) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging cpufreq-current/fixes (5983fe2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus (8521478 Input: synaptics - fix touchpad not working after S2R on Vostro V13) +$ git merge input-current/for-linus +Auto-merging drivers/input/misc/cma3000_d0x.c +Merge made by the 'recursive' strategy. + drivers/input/misc/cma3000_d0x.c | 4 ++-- + drivers/input/mouse/synaptics.c | 11 +++++++++++ + drivers/input/tablet/wacom_wac.c | 4 ++++ + 3 files changed, 17 insertions(+), 2 deletions(-) +Merging md-current/for-linus (5d8c71f md: raid5 crash during degradation) +$ git merge md-current/for-linus +Already up-to-date. +Merging audit-current/for-linus (def5754 Audit: remove spaces from audit_log_d_path) +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master (2742528 crypto: mv_cesa - fix hashing of chunks > 1920 bytes) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (0ab3d8b cy82c693: fix PCI device selection) +$ git merge ide/master +Already up-to-date. +Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6) +$ git merge dwmw2/master +Already up-to-date. +Merging sh-current/sh-fixes-for-linus (21d41f2 sh: fix the compile error in setup-sh7757.c) +$ git merge sh-current/sh-fixes-for-linus +Already up-to-date. +Merging rmobile-current/rmobile-fixes-for-linus (a408bae ARM: mach-shmobile: sh7372 CMT3 and CMT4 clock support) +$ git merge rmobile-current/rmobile-fixes-for-linus +Already up-to-date. +Merging devicetree-current/devicetree/merge (f88e1ae dt/device: Fix auxdata matching to handle entries without a name override) +$ git merge devicetree-current/devicetree/merge +Merge made by the 'recursive' strategy. + drivers/of/platform.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging spi-current/spi/merge (940ab88 drivercore: Add helper macro for platform_driver boilerplate) +$ git merge spi-current/spi/merge +Already up-to-date. +Merging arm/for-next (4697d88 Merge branch 'restart' into for-next) +$ git merge arm/for-next +Auto-merging mm/vmalloc.c +Removing arch/arm/plat-tcc/include/mach/vmalloc.h +Removing arch/arm/plat-spear/include/plat/vmalloc.h +Removing arch/arm/plat-omap/io.c +Removing arch/arm/plat-mxc/include/mach/vmalloc.h +Removing arch/arm/plat-mxc/gic.c +Removing arch/arm/plat-iop/io.c +Removing arch/arm/mach-zynq/include/mach/vmalloc.h +Removing arch/arm/mach-w90x900/include/mach/vmalloc.h +Removing arch/arm/mach-vt8500/include/mach/vmalloc.h +Removing arch/arm/mach-vexpress/include/mach/vmalloc.h +Removing arch/arm/mach-versatile/include/mach/vmalloc.h +Removing arch/arm/mach-ux500/include/mach/vmalloc.h +Removing arch/arm/mach-u300/include/mach/vmalloc.h +Removing arch/arm/mach-tegra/include/mach/vmalloc.h +Removing arch/arm/mach-spear6xx/include/mach/vmalloc.h +Removing arch/arm/mach-spear3xx/include/mach/vmalloc.h +Removing arch/arm/mach-shmobile/include/mach/vmalloc.h +Removing arch/arm/mach-shmobile/entry-gic.S +Removing arch/arm/mach-shark/include/mach/vmalloc.h +Removing arch/arm/mach-sa1100/include/mach/vmalloc.h +Removing arch/arm/mach-s5pv210/include/mach/vmalloc.h +Removing arch/arm/mach-s5pc100/include/mach/vmalloc.h +Removing arch/arm/mach-s5p64x0/include/mach/vmalloc.h +Removing arch/arm/mach-s3c64xx/include/mach/vmalloc.h +Removing arch/arm/mach-s3c2410/include/mach/vmalloc.h +Removing arch/arm/mach-rpc/include/mach/vmalloc.h +Removing arch/arm/mach-realview/include/mach/vmalloc.h +Removing arch/arm/mach-pxa/include/mach/vmalloc.h +Auto-merging arch/arm/mach-prima2/prima2.c +Removing arch/arm/mach-prima2/include/mach/vmalloc.h +Removing arch/arm/mach-pnx4008/include/mach/vmalloc.h +Removing arch/arm/mach-picoxcell/include/mach/vmalloc.h +Removing arch/arm/mach-orion5x/include/mach/vmalloc.h +Removing arch/arm/mach-omap2/include/mach/vmalloc.h +Removing arch/arm/mach-omap2/include/mach/omap4-common.h +Removing arch/arm/mach-omap1/include/mach/vmalloc.h +Removing arch/arm/mach-nomadik/include/mach/vmalloc.h +Removing arch/arm/mach-netx/include/mach/vmalloc.h +Auto-merging arch/arm/mach-mxs/mach-stmp378x_devb.c +CONFLICT (content): Merge conflict in arch/arm/mach-mxs/mach-stmp378x_devb.c +Auto-merging arch/arm/mach-mxs/mach-m28evk.c +CONFLICT (content): Merge conflict in arch/arm/mach-mxs/mach-m28evk.c +Removing arch/arm/mach-mxs/include/mach/vmalloc.h +Auto-merging arch/arm/mach-mx5/imx53-dt.c +Auto-merging arch/arm/mach-mx5/imx51-dt.c +Removing arch/arm/mach-mv78xx0/include/mach/vmalloc.h +Removing arch/arm/mach-msm/include/mach/vmalloc.h +Removing arch/arm/mach-msm/include/mach/entry-macro-vic.S +Removing arch/arm/mach-msm/include/mach/entry-macro-qgic.S +Removing arch/arm/mach-mmp/include/mach/vmalloc.h +Removing arch/arm/mach-lpc32xx/include/mach/vmalloc.h +Removing arch/arm/mach-ks8695/include/mach/vmalloc.h +Removing arch/arm/mach-kirkwood/include/mach/vmalloc.h +Removing arch/arm/mach-ixp4xx/include/mach/vmalloc.h +Removing arch/arm/mach-ixp23xx/include/mach/vmalloc.h +Removing arch/arm/mach-ixp2000/include/mach/vmalloc.h +Removing arch/arm/mach-iop33x/include/mach/vmalloc.h +Removing arch/arm/mach-iop32x/include/mach/vmalloc.h +Removing arch/arm/mach-iop13xx/include/mach/vmalloc.h +Removing arch/arm/mach-integrator/include/mach/vmalloc.h +Auto-merging arch/arm/mach-imx/mach-imx6q.c +Removing arch/arm/mach-highbank/include/mach/vmalloc.h +Removing arch/arm/mach-h720x/include/mach/vmalloc.h +Removing arch/arm/mach-gemini/include/mach/vmalloc.h +Removing arch/arm/mach-footbridge/include/mach/vmalloc.h +Removing arch/arm/mach-exynos/include/mach/vmalloc.h +Removing arch/arm/mach-ep93xx/include/mach/vmalloc.h +Removing arch/arm/mach-ebsa110/include/mach/vmalloc.h +Removing arch/arm/mach-dove/include/mach/vmalloc.h +Removing arch/arm/mach-davinci/io.c +Removing arch/arm/mach-davinci/include/mach/vmalloc.h +Auto-merging arch/arm/mach-davinci/dm646x.c +Auto-merging arch/arm/mach-davinci/board-dm646x-evm.c +Auto-merging arch/arm/mach-davinci/board-dm365-evm.c +Auto-merging arch/arm/mach-davinci/board-da850-evm.c +Removing arch/arm/mach-cns3xxx/include/mach/vmalloc.h +Removing arch/arm/mach-clps711x/time.c +Removing arch/arm/mach-clps711x/mm.c +Removing arch/arm/mach-clps711x/include/mach/vResolved 'arch/arm/mach-mxs/mach-m28evk.c' using previous resolution. +Resolved 'arch/arm/mach-mxs/mach-stmp378x_devb.c' using previous resolution. +malloc.h +Auto-merging arch/arm/mach-clps711x/common.c +Removing arch/arm/mach-bcmring/include/mach/vmalloc.h +Removing arch/arm/mach-at91/include/mach/vmalloc.h +Auto-merging arch/arm/mach-at91/at91sam9260.c +Removing arch/arm/include/asm/hardware/entry-macro-gic.S +Removing arch/arm/include/asm/entry-macro-vic2.S +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fd4a222] Merge remote-tracking branch 'arm/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/arm/memory.txt | 11 +- + Documentation/devicetree/bindings/arm/gic.txt | 4 + + Documentation/devicetree/bindings/arm/vic.txt | 29 + + arch/arm/Kconfig | 2 +- + arch/arm/boot/compressed/head.S | 1 + + arch/arm/common/Kconfig | 6 + + arch/arm/common/gic.c | 165 ++++- + arch/arm/common/vic.c | 148 ++++- + arch/arm/include/asm/assembler.h | 11 + + arch/arm/include/asm/cti.h | 179 +++++ + arch/arm/include/asm/edac.h | 48 ++ + arch/arm/include/asm/entry-macro-vic2.S | 57 -- + arch/arm/include/asm/hardirq.h | 17 - + arch/arm/include/asm/hardware/entry-macro-gic.S | 60 -- + arch/arm/include/asm/hardware/gic.h | 26 +- + arch/arm/include/asm/hardware/iop3xx.h | 1 + + arch/arm/include/asm/hardware/vic.h | 10 +- + arch/arm/include/asm/idmap.h | 14 + + arch/arm/include/asm/mach/arch.h | 9 +- + arch/arm/include/asm/page.h | 4 + + arch/arm/include/asm/perf_event.h | 3 - + arch/arm/include/asm/pgalloc.h | 26 +- + arch/arm/include/asm/pgtable-2level.h | 41 ++ + arch/arm/include/asm/pgtable-3level-hwdef.h | 77 +++ + arch/arm/include/asm/pgtable-3level-types.h | 70 ++ + arch/arm/include/asm/pgtable-3level.h | 155 +++++ + arch/arm/include/asm/pgtable-hwdef.h | 4 + + arch/arm/include/asm/pgtable.h | 60 +-- + arch/arm/include/asm/pmu.h | 15 +- + arch/arm/include/asm/proc-fns.h | 21 + + arch/arm/include/asm/processor.h | 2 + + arch/arm/include/asm/swab.h | 5 +- + arch/arm/include/asm/system.h | 10 +- + arch/arm/include/asm/tlb.h | 12 +- + arch/arm/kernel/entry-armv.S | 7 +- + arch/arm/kernel/head.S | 65 ++- + arch/arm/kernel/hw_breakpoint.c | 8 +- + arch/arm/kernel/machine_kexec.c | 4 +- + arch/arm/kernel/perf_event.c | 19 +- + arch/arm/kernel/perf_event_v6.c | 32 +- + arch/arm/kernel/perf_event_v7.c | 401 +++++------- + arch/arm/kernel/perf_event_xscale.c | 16 +- + arch/arm/kernel/process.c | 31 +- + arch/arm/kernel/setup.c | 15 +- + arch/arm/kernel/sleep.S | 4 + + arch/arm/kernel/smp.c | 32 +- + arch/arm/kernel/suspend.c | 18 +- + arch/arm/kernel/vmlinux.lds.S | 7 + + arch/arm/mach-at91/at91cap9.c | 4 +- + arch/arm/mach-at91/at91rm9200.c | 4 +- + arch/arm/mach-at91/at91sam9260.c | 2 +- + arch/arm/mach-at91/at91sam9261.c | 2 +- + arch/arm/mach-at91/at91sam9263.c | 2 +- + arch/arm/mach-at91/at91sam9_alt_reset.S | 9 +- + arch/arm/mach-at91/at91sam9g45.c | 4 +- + arch/arm/mach-at91/at91sam9rl.c | 2 +- + arch/arm/mach-at91/generic.h | 3 +- + arch/arm/mach-at91/include/mach/io.h | 8 - + arch/arm/mach-at91/include/mach/system.h | 9 - + arch/arm/mach-at91/include/mach/vmalloc.h | 28 - + arch/arm/mach-at91/setup.c | 18 - + arch/arm/mach-bcmring/arch.c | 25 +- + arch/arm/mach-bcmring/dma.c | 2 +- + arch/arm/mach-bcmring/include/mach/system.h | 26 - + arch/arm/mach-bcmring/include/mach/vmalloc.h | 25 - + arch/arm/mach-clps711x/Makefile | 2 +- + arch/arm/mach-clps711x/autcpu12.c | 1 + + arch/arm/mach-clps711x/cdb89712.c | 1 + + arch/arm/mach-clps711x/ceiva.c | 1 + + arch/arm/mach-clps711x/clep7312.c | 1 + + arch/arm/mach-clps711x/{irq.c => common.c} | 100 +++- + arch/arm/mach-clps711x/edb7211-arch.c | 1 + + arch/arm/mach-clps711x/fortunet.c | 1 + + arch/arm/mach-clps711x/include/mach/system.h | 5 - + arch/arm/mach-clps711x/include/mach/vmalloc.h | 20 - + arch/arm/mach-clps711x/mm.c | 48 -- + arch/arm/mach-clps711x/p720t.c | 1 + + arch/arm/mach-clps711x/time.c | 84 --- + arch/arm/mach-cns3xxx/cns3420vb.c | 3 + + arch/arm/mach-cns3xxx/core.h | 1 + + arch/arm/mach-cns3xxx/include/mach/entry-macro.S | 2 - + arch/arm/mach-cns3xxx/include/mach/system.h | 3 - + arch/arm/mach-cns3xxx/include/mach/vmalloc.h | 11 - + arch/arm/mach-cns3xxx/pm.c | 4 +- + arch/arm/mach-davinci/Makefile | 2 +- + arch/arm/mach-davinci/board-da830-evm.c | 1 + + arch/arm/mach-davinci/board-da850-evm.c | 1 + + arch/arm/mach-davinci/board-dm355-evm.c | 1 + + arch/arm/mach-davinci/board-dm355-leopard.c | 1 + + arch/arm/mach-davinci/board-dm365-evm.c | 1 + + arch/arm/mach-davinci/board-dm644x-evm.c | 1 + + arch/arm/mach-davinci/board-dm646x-evm.c | 2 + + arch/arm/mach-davinci/board-mityomapl138.c | 1 + + arch/arm/mach-davinci/board-neuros-osd2.c | 1 + + arch/arm/mach-davinci/board-omapl138-hawk.c | 1 + + arch/arm/mach-davinci/board-sffsdr.c | 1 + + arch/arm/mach-davinci/board-tnetv107x-evm.c | 1 + + arch/arm/mach-davinci/common.c | 3 - + arch/arm/mach-davinci/da830.c | 1 - + arch/arm/mach-davinci/da850.c | 1 - + arch/arm/mach-davinci/devices-da8xx.c | 5 + + arch/arm/mach-davinci/devices.c | 5 + + arch/arm/mach-davinci/dm355.c | 1 - + arch/arm/mach-davinci/dm365.c | 1 - + arch/arm/mach-davinci/dm644x.c | 1 - + arch/arm/mach-davinci/dm646x.c | 1 - + arch/arm/mach-davinci/include/mach/common.h | 3 +- + arch/arm/mach-davinci/include/mach/da8xx.h | 1 + + arch/arm/mach-davinci/include/mach/io.h | 8 - + arch/arm/mach-davinci/include/mach/system.h | 6 - + arch/arm/mach-davinci/include/mach/tnetv107x.h | 1 + + arch/arm/mach-davinci/include/mach/vmalloc.h | 14 - + arch/arm/mach-davinci/io.c | 48 -- + arch/arm/mach-davinci/tnetv107x.c | 7 +- + arch/arm/mach-dove/cm-a510.c | 1 + + arch/arm/mach-dove/common.c | 16 + + arch/arm/mach-dove/common.h | 1 + + arch/arm/mach-dove/dove-db-setup.c | 1 + + arch/arm/mach-dove/include/mach/dove.h | 2 - + arch/arm/mach-dove/include/mach/system.h | 19 - + arch/arm/mach-dove/include/mach/vmalloc.h | 5 - + arch/arm/mach-ebsa110/core.c | 8 +- + arch/arm/mach-ebsa110/include/mach/system.h | 2 - + arch/arm/mach-ebsa110/include/mach/vmalloc.h | 10 - + arch/arm/mach-ep93xx/adssphere.c | 3 + + arch/arm/mach-ep93xx/core.c | 12 + + arch/arm/mach-ep93xx/edb93xx.c | 17 + + arch/arm/mach-ep93xx/gesbc9312.c | 3 + + arch/arm/mach-ep93xx/include/mach/entry-macro.S | 42 -- + arch/arm/mach-ep93xx/include/mach/platform.h | 2 + + arch/arm/mach-ep93xx/include/mach/system.h | 17 - + arch/arm/mach-ep93xx/include/mach/vmalloc.h | 5 - + arch/arm/mach-ep93xx/micro9.c | 9 + + arch/arm/mach-ep93xx/simone.c | 3 + + arch/arm/mach-ep93xx/snappercl15.c | 3 + + arch/arm/mach-ep93xx/ts72xx.c | 3 + + arch/arm/mach-ep93xx/vision_ep9307.c | 1 + + arch/arm/mach-exynos/cpu.c | 20 +- + arch/arm/mach-exynos/include/mach/entry-macro.S | 75 -- + arch/arm/mach-exynos/include/mach/vmalloc.h | 22 - + arch/arm/mach-exynos/mach-armlex4210.c | 2 + + arch/arm/mach-exynos/mach-nuri.c | 2 + + arch/arm/mach-exynos/mach-origen.c | 2 + + arch/arm/mach-exynos/mach-smdk4x12.c | 3 + + arch/arm/mach-exynos/mach-smdkv310.c | 3 + + arch/arm/mach-exynos/mach-universal_c210.c | 2 + + arch/arm/mach-exynos/platsmp.c | 28 +- + arch/arm/mach-footbridge/cats-hw.c | 3 +- + arch/arm/mach-footbridge/common.c | 27 + + arch/arm/mach-footbridge/common.h | 1 + + arch/arm/mach-footbridge/ebsa285.c | 1 + + arch/arm/mach-footbridge/include/mach/system.h | 56 -- + arch/arm/mach-footbridge/include/mach/vmalloc.h | 10 - + arch/arm/mach-footbridge/netwinder-hw.c | 27 + + arch/arm/mach-footbridge/personal.c | 1 + + arch/arm/mach-gemini/include/mach/system.h | 1 + + arch/arm/mach-gemini/include/mach/vmalloc.h | 10 - + arch/arm/mach-h720x/common.c | 5 + + arch/arm/mach-h720x/common.h | 1 + + arch/arm/mach-h720x/h7201-eval.c | 1 + + arch/arm/mach-h720x/h7202-eval.c | 1 + + arch/arm/mach-h720x/include/mach/system.h | 6 - + arch/arm/mach-h720x/include/mach/vmalloc.h | 10 - + arch/arm/mach-highbank/core.h | 1 + + arch/arm/mach-highbank/highbank.c | 2 + + arch/arm/mach-highbank/include/mach/entry-macro.S | 2 - + arch/arm/mach-highbank/include/mach/system.h | 2 - + arch/arm/mach-highbank/include/mach/vmalloc.h | 1 - + arch/arm/mach-highbank/system.c | 2 +- + arch/arm/mach-imx/clock-imx6q.c | 2 - + arch/arm/mach-imx/mach-apf9328.c | 1 + + arch/arm/mach-imx/mach-armadillo5x0.c | 1 + + arch/arm/mach-imx/mach-bug.c | 1 + + arch/arm/mach-imx/mach-cpuimx27.c | 1 + + arch/arm/mach-imx/mach-cpuimx35.c | 1 + + arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 1 + + arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 1 + + arch/arm/mach-imx/mach-imx27ipcam.c | 1 + + arch/arm/mach-imx/mach-imx27lite.c | 1 + + arch/arm/mach-imx/mach-imx6q.c | 34 + + arch/arm/mach-imx/mach-kzm_arm11_01.c | 1 + + arch/arm/mach-imx/mach-mx1ads.c | 2 + + arch/arm/mach-imx/mach-mx21ads.c | 1 + + arch/arm/mach-imx/mach-mx25_3ds.c | 1 + + arch/arm/mach-imx/mach-mx27_3ds.c | 1 + + arch/arm/mach-imx/mach-mx27ads.c | 1 + + arch/arm/mach-imx/mach-mx31_3ds.c | 1 + + arch/arm/mach-imx/mach-mx31ads.c | 1 + + arch/arm/mach-imx/mach-mx31lilly.c | 1 + + arch/arm/mach-imx/mach-mx31lite.c | 1 + + arch/arm/mach-imx/mach-mx31moboard.c | 1 + + arch/arm/mach-imx/mach-mx35_3ds.c | 1 + + arch/arm/mach-imx/mach-mxt_td60.c | 1 + + arch/arm/mach-imx/mach-pca100.c | 1 + + arch/arm/mach-imx/mach-pcm037.c | 1 + + arch/arm/mach-imx/mach-pcm038.c | 1 + + arch/arm/mach-imx/mach-pcm043.c | 1 + + arch/arm/mach-imx/mach-qong.c | 1 + + arch/arm/mach-imx/mach-scb9328.c | 1 + + arch/arm/mach-imx/mach-vpr200.c | 1 + + arch/arm/mach-imx/src.c | 23 + + arch/arm/mach-integrator/common.h | 1 + + arch/arm/mach-integrator/core.c | 8 + + arch/arm/mach-integrator/include/mach/system.h | 11 - + arch/arm/mach-integrator/include/mach/vmalloc.h | 20 - + arch/arm/mach-integrator/integrator_ap.c | 1 + + arch/arm/mach-integrator/integrator_cp.c | 1 + + arch/arm/mach-iop13xx/include/mach/iop13xx.h | 1 + + arch/arm/mach-iop13xx/include/mach/system.h | 14 - + arch/arm/mach-iop13xx/include/mach/vmalloc.h | 4 - + arch/arm/mach-iop13xx/iq81340mc.c | 1 + + arch/arm/mach-iop13xx/iq81340sc.c | 1 + + arch/arm/mach-iop13xx/setup.c | 11 + + arch/arm/mach-iop32x/em7210.c | 1 + + arch/arm/mach-iop32x/glantank.c | 1 + + arch/arm/mach-iop32x/include/mach/io.h | 7 - + arch/arm/mach-iop32x/include/mach/system.h | 21 - + arch/arm/mach-iop32x/include/mach/vmalloc.h | 5 - + arch/arm/mach-iop32x/iq31244.c | 2 + + arch/arm/mach-iop32x/iq80321.c | 1 + + arch/arm/mach-iop32x/n2100.c | 9 + + arch/arm/mach-iop33x/include/mach/io.h | 7 - + arch/arm/mach-iop33x/include/mach/system.h | 10 - + arch/arm/mach-iop33x/include/mach/vmalloc.h | 5 - + arch/arm/mach-iop33x/iq80331.c | 1 + + arch/arm/mach-iop33x/iq80332.c | 1 + + arch/arm/mach-ixp2000/core.c | 4 + + arch/arm/mach-ixp2000/enp2611.c | 1 + + arch/arm/mach-ixp2000/include/mach/platform.h | 1 + + arch/arm/mach-ixp2000/include/mach/system.h | 35 - + arch/arm/mach-ixp2000/include/mach/vmalloc.h | 20 - + arch/arm/mach-ixp2000/ixdp2400.c | 1 + + arch/arm/mach-ixp2000/ixdp2800.c | 1 + + arch/arm/mach-ixp2000/ixdp2x01.c | 32 + + arch/arm/mach-ixp23xx/core.c | 6 + + arch/arm/mach-ixp23xx/espresso.c | 1 + + arch/arm/mach-ixp23xx/include/mach/io.h | 29 - + arch/arm/mach-ixp23xx/include/mach/platform.h | 1 + + arch/arm/mach-ixp23xx/include/mach/system.h | 17 - + arch/arm/mach-ixp23xx/include/mach/vmalloc.h | 10 - + arch/arm/mach-ixp23xx/ixdp2351.c | 12 + + arch/arm/mach-ixp23xx/roadrunner.c | 1 + + arch/arm/mach-ixp4xx/avila-setup.c | 2 + + arch/arm/mach-ixp4xx/common.c | 20 + + arch/arm/mach-ixp4xx/coyote-setup.c | 2 + + arch/arm/mach-ixp4xx/dsmg600-setup.c | 1 + + arch/arm/mach-ixp4xx/fsg-setup.c | 1 + + arch/arm/mach-ixp4xx/gateway7001-setup.c | 1 + + arch/arm/mach-ixp4xx/goramo_mlr.c | 1 + + arch/arm/mach-ixp4xx/gtwx5715-setup.c | 1 + + arch/arm/mach-ixp4xx/include/mach/platform.h | 1 + + arch/arm/mach-ixp4xx/include/mach/system.h | 25 - + arch/arm/mach-ixp4xx/include/mach/vmalloc.h | 5 - + arch/arm/mach-ixp4xx/ixdp425-setup.c | 1 + + arch/arm/mach-ixp4xx/nas100d-setup.c | 1 + + arch/arm/mach-ixp4xx/nslu2-setup.c | 1 + + arch/arm/mach-ixp4xx/omixp-setup.c | 3 + + arch/arm/mach-ixp4xx/vulcan-setup.c | 1 + + arch/arm/mach-ixp4xx/wg302v2-setup.c | 1 + + arch/arm/mach-kirkwood/common.c | 16 + + arch/arm/mach-kirkwood/common.h | 1 + + arch/arm/mach-kirkwood/d2net_v2-setup.c | 1 + + arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 1 + + arch/arm/mach-kirkwood/dockstar-setup.c | 1 + + arch/arm/mach-kirkwood/guruplug-setup.c | 1 + + arch/arm/mach-kirkwood/include/mach/io.h | 25 - + arch/arm/mach-kirkwood/include/mach/system.h | 19 - + arch/arm/mach-kirkwood/include/mach/vmalloc.h | 5 - + arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c | 1 + + arch/arm/mach-kirkwood/netspace_v2-setup.c | 3 + + arch/arm/mach-kirkwood/netxbig_v2-setup.c | 2 + + arch/arm/mach-kirkwood/openrd-setup.c | 3 + + arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 1 + + arch/arm/mach-kirkwood/rd88f6281-setup.c | 1 + + arch/arm/mach-kirkwood/sheevaplug-setup.c | 8 +- + arch/arm/mach-kirkwood/t5325-setup.c | 1 + + arch/arm/mach-kirkwood/ts219-setup.c | 1 + + arch/arm/mach-kirkwood/ts41x-setup.c | 1 + + arch/arm/mach-ks8695/board-acs5k.c | 1 + + arch/arm/mach-ks8695/board-dsm320.c | 1 + + arch/arm/mach-ks8695/board-micrel.c | 1 + + arch/arm/mach-ks8695/generic.h | 1 + + arch/arm/mach-ks8695/include/mach/system.h | 21 - + arch/arm/mach-ks8695/include/mach/vmalloc.h | 19 - + arch/arm/mach-ks8695/time.c | 18 + + arch/arm/mach-lpc32xx/common.c | 20 +- + arch/arm/mach-lpc32xx/common.h | 2 + + arch/arm/mach-lpc32xx/include/mach/system.h | 25 - + arch/arm/mach-lpc32xx/include/mach/vmalloc.h | 24 - + arch/arm/mach-lpc32xx/phy3250.c | 1 + + arch/arm/mach-mmp/aspenite.c | 2 + + arch/arm/mach-mmp/avengers_lite.c | 1 + + arch/arm/mach-mmp/brownstone.c | 1 + + arch/arm/mach-mmp/common.c | 5 + + arch/arm/mach-mmp/common.h | 1 + + arch/arm/mach-mmp/flint.c | 1 + + arch/arm/mach-mmp/gplugd.c | 1 + + arch/arm/mach-mmp/include/mach/pxa168.h | 1 + + arch/arm/mach-mmp/include/mach/system.h | 10 - + arch/arm/mach-mmp/include/mach/vmalloc.h | 5 - + arch/arm/mach-mmp/jasper.c | 1 + + arch/arm/mach-mmp/pxa168.c | 5 + + arch/arm/mach-mmp/tavorevb.c | 1 + + arch/arm/mach-mmp/teton_bga.c | 1 + + arch/arm/mach-mmp/ttc_dkb.c | 1 + + arch/arm/mach-msm/board-msm8960.c | 2 + + arch/arm/mach-msm/board-msm8x60.c | 4 + + arch/arm/mach-msm/include/mach/entry-macro-qgic.S | 17 - + arch/arm/mach-msm/include/mach/entry-macro-vic.S | 37 - + arch/arm/mach-msm/include/mach/entry-macro.S | 27 +- + arch/arm/mach-msm/include/mach/system.h | 8 - + arch/arm/mach-msm/include/mach/vmalloc.h | 22 - + arch/arm/mach-mv78xx0/buffalo-wxl-setup.c | 1 + + arch/arm/mach-mv78xx0/common.c | 16 + + arch/arm/mach-mv78xx0/common.h | 1 + + arch/arm/mach-mv78xx0/db78x00-bp-setup.c | 1 + + arch/arm/mach-mv78xx0/include/mach/system.h | 19 - + arch/arm/mach-mv78xx0/include/mach/vmalloc.h | 5 - + arch/arm/mach-mv78xx0/rd78x00-masa-setup.c | 1 + + arch/arm/mach-mx5/board-cpuimx51.c | 1 + + arch/arm/mach-mx5/board-cpuimx51sd.c | 1 + + arch/arm/mach-mx5/board-mx50_rdp.c | 1 + + arch/arm/mach-mx5/board-mx51_3ds.c | 1 + + arch/arm/mach-mx5/board-mx51_babbage.c | 1 + + arch/arm/mach-mx5/board-mx51_efikamx.c | 3 +- + arch/arm/mach-mx5/board-mx51_efikasb.c | 1 + + arch/arm/mach-mx5/board-mx53_ard.c | 1 + + arch/arm/mach-mx5/board-mx53_evk.c | 1 + + arch/arm/mach-mx5/board-mx53_loco.c | 1 + + arch/arm/mach-mx5/board-mx53_smd.c | 1 + + arch/arm/mach-mx5/imx51-dt.c | 1 + + arch/arm/mach-mx5/imx53-dt.c | 1 + + arch/arm/mach-mxs/include/mach/common.h | 1 + + arch/arm/mach-mxs/include/mach/system.h | 2 - + arch/arm/mach-mxs/include/mach/vmalloc.h | 22 - + arch/arm/mach-mxs/mach-m28evk.c | 1 + + arch/arm/mach-mxs/mach-mx23evk.c | 1 + + arch/arm/mach-mxs/mach-mx28evk.c | 1 + + arch/arm/mach-mxs/mach-stmp378x_devb.c | 1 + + arch/arm/mach-mxs/mach-tx28.c | 1 + + arch/arm/mach-mxs/system.c | 4 +- + arch/arm/mach-netx/generic.c | 5 + + arch/arm/mach-netx/generic.h | 1 + + arch/arm/mach-netx/include/mach/entry-macro.S | 13 - + arch/arm/mach-netx/include/mach/system.h | 10 - + arch/arm/mach-netx/include/mach/vmalloc.h | 19 - + arch/arm/mach-netx/nxdb500.c | 3 + + arch/arm/mach-netx/nxdkn.c | 3 + + arch/arm/mach-netx/nxeb500hmi.c | 3 + + arch/arm/mach-nomadik/board-nhk8815.c | 5 + + arch/arm/mach-nomadik/cpu-8815.c | 12 + + arch/arm/mach-nomadik/cpu-8815.h | 4 + + arch/arm/mach-nomadik/include/mach/entry-macro.S | 30 - + arch/arm/mach-nomadik/include/mach/setup.h | 3 - + arch/arm/mach-nomadik/include/mach/system.h | 13 - + arch/arm/mach-nomadik/include/mach/vmalloc.h | 2 - + arch/arm/mach-omap1/board-ams-delta.c | 3 +- + arch/arm/mach-omap1/board-fsample.c | 3 +- + arch/arm/mach-omap1/board-generic.c | 3 +- + arch/arm/mach-omap1/board-h2.c | 3 +- + arch/arm/mach-omap1/board-h3.c | 3 +- + arch/arm/mach-omap1/board-htcherald.c | 3 +- + arch/arm/mach-omap1/board-innovator.c | 3 +- + arch/arm/mach-omap1/board-nokia770.c | 3 +- + arch/arm/mach-omap1/board-osk.c | 3 +- + arch/arm/mach-omap1/board-palmte.c | 3 +- + arch/arm/mach-omap1/board-palmtt.c | 3 +- + arch/arm/mach-omap1/board-palmz71.c | 3 +- + arch/arm/mach-omap1/board-perseus2.c | 3 +- + arch/arm/mach-omap1/board-sx1.c | 3 +- + arch/arm/mach-omap1/board-voiceblue.c | 8 +- + arch/arm/mach-omap1/common.h | 62 ++ + arch/arm/mach-omap1/devices.c | 2 +- + arch/arm/mach-omap1/include/mach/vmalloc.h | 20 - + arch/arm/mach-omap1/io.c | 1 - + arch/arm/mach-omap1/reset.c | 5 +- + arch/arm/mach-omap1/time.c | 2 +- + arch/arm/mach-omap1/timer32k.c | 2 +- + arch/arm/mach-omap2/Kconfig | 2 + + arch/arm/mach-omap2/board-2430sdp.c | 4 +- + arch/arm/mach-omap2/board-3430sdp.c | 4 +- + arch/arm/mach-omap2/board-3630sdp.c | 4 +- + arch/arm/mach-omap2/board-4430sdp.c | 6 +- + arch/arm/mach-omap2/board-am3517crane.c | 4 +- + arch/arm/mach-omap2/board-am3517evm.c | 4 +- + arch/arm/mach-omap2/board-apollon.c | 4 +- + arch/arm/mach-omap2/board-cm-t35.c | 6 +- + arch/arm/mach-omap2/board-cm-t3517.c | 4 +- + arch/arm/mach-omap2/board-devkit8000.c | 4 +- + arch/arm/mach-omap2/board-generic.c | 8 +- + arch/arm/mach-omap2/board-h4.c | 4 +- + arch/arm/mach-omap2/board-igep0020.c | 6 +- + arch/arm/mach-omap2/board-ldp.c | 4 +- + arch/arm/mach-omap2/board-n8x0.c | 8 +- + arch/arm/mach-omap2/board-omap3beagle.c | 4 +- + arch/arm/mach-omap2/board-omap3evm.c | 4 +- + arch/arm/mach-omap2/board-omap3logic.c | 6 +- + arch/arm/mach-omap2/board-omap3pandora.c | 4 +- + arch/arm/mach-omap2/board-omap3stalker.c | 4 +- + arch/arm/mach-omap2/board-omap3touchbook.c | 4 +- + arch/arm/mach-omap2/board-omap4panda.c | 6 +- + arch/arm/mach-omap2/board-overo.c | 4 +- + arch/arm/mach-omap2/board-rm680.c | 4 +- + arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +- + arch/arm/mach-omap2/board-rx51.c | 4 +- + arch/arm/mach-omap2/board-ti8168evm.c | 3 +- + arch/arm/mach-omap2/board-zoom-peripherals.c | 2 +- + arch/arm/mach-omap2/board-zoom.c | 6 +- + arch/arm/mach-omap2/cm2xxx_3xxx.c | 2 +- + arch/arm/mach-omap2/cm44xx.c | 2 +- + arch/arm/mach-omap2/cminst44xx.c | 2 +- + arch/arm/mach-omap2/common.c | 2 +- + arch/arm/mach-omap2/common.h | 186 +++++ + arch/arm/mach-omap2/control.c | 2 +- + arch/arm/mach-omap2/cpuidle34xx.c | 1 + + arch/arm/mach-omap2/display.c | 3 +- + arch/arm/mach-omap2/i2c.c | 2 +- + arch/arm/mach-omap2/id.c | 2 +- + arch/arm/mach-omap2/include/mach/entry-macro.S | 137 ---- + arch/arm/mach-omap2/include/mach/omap4-common.h | 43 -- + arch/arm/mach-omap2/include/mach/vmalloc.h | 20 - + arch/arm/mach-omap2/io.c | 8 +- + arch/arm/mach-omap2/irq.c | 51 ++ + arch/arm/mach-omap2/omap-hotplug.c | 3 +- + arch/arm/mach-omap2/omap-smp.c | 3 +- + arch/arm/mach-omap2/omap4-common.c | 9 +- + arch/arm/mach-omap2/omap_hwmod.c | 2 +- + arch/arm/mach-omap2/pm.c | 2 +- + arch/arm/mach-omap2/pm24xx.c | 1 + + arch/arm/mach-omap2/pm34xx.c | 1 + + arch/arm/mach-omap2/pm44xx.c | 2 +- + arch/arm/mach-omap2/prcm.c | 7 +- + arch/arm/mach-omap2/prcm_mpu44xx.c | 2 +- + arch/arm/mach-omap2/prm2xxx_3xxx.c | 2 +- + arch/arm/mach-omap2/prm44xx.c | 2 +- + arch/arm/mach-omap2/prminst44xx.c | 2 +- + arch/arm/mach-omap2/sdram-nokia.c | 2 +- + arch/arm/mach-omap2/sdrc.c | 2 +- + arch/arm/mach-omap2/sdrc2xxx.c | 2 +- + arch/arm/mach-omap2/serial.c | 2 +- + arch/arm/mach-omap2/smartreflex.c | 2 +- + arch/arm/mach-omap2/timer.c | 2 +- + arch/arm/mach-omap2/vc3xxx_data.c | 2 +- + arch/arm/mach-omap2/vc44xx_data.c | 2 +- + arch/arm/mach-omap2/voltage.c | 2 +- + arch/arm/mach-omap2/voltagedomains3xxx_data.c | 2 +- + arch/arm/mach-omap2/voltagedomains44xx_data.c | 2 +- + arch/arm/mach-omap2/vp.c | 2 +- + arch/arm/mach-omap2/vp3xxx_data.c | 2 +- + arch/arm/mach-omap2/vp44xx_data.c | 2 +- + arch/arm/mach-orion5x/common.c | 12 + + arch/arm/mach-orion5x/common.h | 1 + + arch/arm/mach-orion5x/d2net-setup.c | 2 + + arch/arm/mach-orion5x/db88f5281-setup.c | 1 + + arch/arm/mach-orion5x/dns323-setup.c | 1 + + arch/arm/mach-orion5x/edmini_v2-setup.c | 1 + + arch/arm/mach-orion5x/include/mach/io.h | 25 - + arch/arm/mach-orion5x/include/mach/system.h | 14 - + arch/arm/mach-orion5x/include/mach/vmalloc.h | 5 - + arch/arm/mach-orion5x/kurobox_pro-setup.c | 2 + + arch/arm/mach-orion5x/ls-chl-setup.c | 3 +- + arch/arm/mach-orion5x/ls_hgl-setup.c | 3 +- + arch/arm/mach-orion5x/lsmini-setup.c | 3 +- + arch/arm/mach-orion5x/mss2-setup.c | 3 +- + arch/arm/mach-orion5x/mv2120-setup.c | 3 +- + arch/arm/mach-orion5x/net2big-setup.c | 1 + + arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 1 + + arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 1 + + arch/arm/mach-orion5x/rd88f5182-setup.c | 1 + + arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 1 + + arch/arm/mach-orion5x/terastation_pro2-setup.c | 1 + + arch/arm/mach-orion5x/ts209-setup.c | 3 +- + arch/arm/mach-orion5x/ts409-setup.c | 1 + + arch/arm/mach-orion5x/ts78xx-setup.c | 1 + + arch/arm/mach-orion5x/wnr854t-setup.c | 1 + + arch/arm/mach-orion5x/wrt350n-v2-setup.c | 1 + + arch/arm/mach-picoxcell/common.c | 9 +- + arch/arm/mach-picoxcell/include/mach/entry-macro.S | 11 +- + arch/arm/mach-picoxcell/include/mach/system.h | 5 - + arch/arm/mach-picoxcell/include/mach/vmalloc.h | 14 - + arch/arm/mach-pnx4008/core.c | 6 + + arch/arm/mach-pnx4008/include/mach/system.h | 9 - + arch/arm/mach-pnx4008/include/mach/vmalloc.h | 20 - + arch/arm/mach-prima2/common.h | 1 + + arch/arm/mach-prima2/include/mach/map.h | 6 +- + arch/arm/mach-prima2/include/mach/system.h | 12 - + arch/arm/mach-prima2/include/mach/vmalloc.h | 16 - + arch/arm/mach-prima2/prima2.c | 1 + + arch/arm/mach-prima2/rstc.c | 7 + + arch/arm/mach-pxa/balloon3.c | 1 + + arch/arm/mach-pxa/capc7117.c | 3 +- + arch/arm/mach-pxa/cm-x2xx.c | 1 + + arch/arm/mach-pxa/cm-x300.c | 1 + + arch/arm/mach-pxa/colibri-pxa270.c | 2 + + arch/arm/mach-pxa/colibri-pxa300.c | 1 + + arch/arm/mach-pxa/colibri-pxa320.c | 1 + + arch/arm/mach-pxa/corgi.c | 8 +- + arch/arm/mach-pxa/csb726.c | 1 + + arch/arm/mach-pxa/em-x270.c | 2 + + arch/arm/mach-pxa/eseries.c | 6 + + arch/arm/mach-pxa/ezx.c | 6 + + arch/arm/mach-pxa/generic.h | 2 + + arch/arm/mach-pxa/gumstix.c | 1 + + arch/arm/mach-pxa/h5000.c | 1 + + arch/arm/mach-pxa/himalaya.c | 1 + + arch/arm/mach-pxa/hx4700.c | 1 + + arch/arm/mach-pxa/icontrol.c | 3 +- + arch/arm/mach-pxa/idp.c | 1 + + arch/arm/mach-pxa/include/mach/entry-macro.S | 36 - + arch/arm/mach-pxa/include/mach/system.h | 8 - + arch/arm/mach-pxa/include/mach/vmalloc.h | 11 - + arch/arm/mach-pxa/littleton.c | 1 + + arch/arm/mach-pxa/lpd270.c | 1 + + arch/arm/mach-pxa/lubbock.c | 1 + + arch/arm/mach-pxa/magician.c | 1 + + arch/arm/mach-pxa/mainstone.c | 1 + + arch/arm/mach-pxa/mioa701.c | 7 +- + arch/arm/mach-pxa/mp900.c | 1 + + arch/arm/mach-pxa/palmld.c | 3 +- + arch/arm/mach-pxa/palmt5.c | 3 +- + arch/arm/mach-pxa/palmtc.c | 3 +- + arch/arm/mach-pxa/palmte2.c | 3 +- + arch/arm/mach-pxa/palmtreo.c | 2 + + arch/arm/mach-pxa/palmtx.c | 3 +- + arch/arm/mach-pxa/palmz72.c | 3 +- + arch/arm/mach-pxa/pcm027.c | 1 + + arch/arm/mach-pxa/poodle.c | 9 +- + arch/arm/mach-pxa/raumfeld.c | 3 + + arch/arm/mach-pxa/reset.c | 7 +- + arch/arm/mach-pxa/saar.c | 1 + + arch/arm/mach-pxa/saarb.c | 1 + + arch/arm/mach-pxa/spitz.c | 9 +- + arch/arm/mach-pxa/stargate2.c | 2 + + arch/arm/mach-pxa/tavorevb.c | 1 + + arch/arm/mach-pxa/tavorevb3.c | 1 + + arch/arm/mach-pxa/tosa.c | 5 +- + arch/arm/mach-pxa/trizeps4.c | 2 + + arch/arm/mach-pxa/viper.c | 1 + + arch/arm/mach-pxa/vpac270.c | 3 +- + arch/arm/mach-pxa/xcep.c | 1 + + arch/arm/mach-pxa/z2.c | 1 + + arch/arm/mach-pxa/zeus.c | 1 + + arch/arm/mach-pxa/zylonite.c | 1 + + arch/arm/mach-realview/core.h | 1 - + arch/arm/mach-realview/include/mach/entry-macro.S | 2 - + arch/arm/mach-realview/include/mach/system.h | 17 - + arch/arm/mach-realview/include/mach/vmalloc.h | 21 - + arch/arm/mach-realview/realview_eb.c | 10 +- + arch/arm/mach-realview/realview_pb1176.c | 6 +- + arch/arm/mach-realview/realview_pb11mp.c | 6 +- + arch/arm/mach-realview/realview_pba8.c | 6 +- + arch/arm/mach-realview/realview_pbx.c | 10 +- + arch/arm/mach-rpc/include/mach/system.h | 14 - + arch/arm/mach-rpc/include/mach/vmalloc.h | 10 - + arch/arm/mach-rpc/riscpc.c | 12 + + arch/arm/mach-s3c2410/include/mach/system-reset.h | 5 +- + arch/arm/mach-s3c2410/include/mach/vmalloc.h | 20 - + arch/arm/mach-s3c64xx/include/mach/entry-macro.S | 7 +- + arch/arm/mach-s3c64xx/include/mach/system.h | 3 +- + arch/arm/mach-s3c64xx/include/mach/vmalloc.h | 20 - + arch/arm/mach-s3c64xx/mach-anw6410.c | 2 + + arch/arm/mach-s3c64xx/mach-crag6410.c | 2 + + arch/arm/mach-s3c64xx/mach-hmt.c | 2 + + arch/arm/mach-s3c64xx/mach-mini6410.c | 2 + + arch/arm/mach-s3c64xx/mach-ncp.c | 2 + + arch/arm/mach-s3c64xx/mach-real6410.c | 2 + + arch/arm/mach-s3c64xx/mach-smartq5.c | 2 + + arch/arm/mach-s3c64xx/mach-smartq7.c | 2 + + arch/arm/mach-s3c64xx/mach-smdk6400.c | 2 + + arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 + + arch/arm/mach-s5p64x0/include/mach/entry-macro.S | 7 +- + arch/arm/mach-s5p64x0/include/mach/vmalloc.h | 20 - + arch/arm/mach-s5p64x0/mach-smdk6440.c | 2 + + arch/arm/mach-s5p64x0/mach-smdk6450.c | 2 + + arch/arm/mach-s5pc100/include/mach/entry-macro.S | 25 - + arch/arm/mach-s5pc100/include/mach/vmalloc.h | 17 - + arch/arm/mach-s5pc100/mach-smdkc100.c | 2 + + arch/arm/mach-s5pv210/include/mach/entry-macro.S | 37 - + arch/arm/mach-s5pv210/include/mach/vmalloc.h | 22 - + arch/arm/mach-s5pv210/mach-aquila.c | 2 + + arch/arm/mach-s5pv210/mach-goni.c | 2 + + arch/arm/mach-s5pv210/mach-smdkc110.c | 2 + + arch/arm/mach-s5pv210/mach-smdkv210.c | 2 + + arch/arm/mach-s5pv210/mach-torbreck.c | 2 + + arch/arm/mach-sa1100/assabet.c | 1 + + arch/arm/mach-sa1100/badge4.c | 1 + + arch/arm/mach-sa1100/cerf.c | 1 + + arch/arm/mach-sa1100/collie.c | 1 + + arch/arm/mach-sa1100/generic.c | 11 + + arch/arm/mach-sa1100/generic.h | 1 + + arch/arm/mach-sa1100/h3100.c | 1 + + arch/arm/mach-sa1100/h3600.c | 1 + + arch/arm/mach-sa1100/hackkit.c | 1 + + arch/arm/mach-sa1100/include/mach/system.h | 13 - + arch/arm/mach-sa1100/include/mach/vmalloc.h | 4 - + arch/arm/mach-sa1100/jornada720.c | 1 + + arch/arm/mach-sa1100/lart.c | 1 + + arch/arm/mach-sa1100/nanoengine.c | 1 + + arch/arm/mach-sa1100/pleb.c | 1 + + arch/arm/mach-sa1100/shannon.c | 1 + + arch/arm/mach-sa1100/simpad.c | 1 + + arch/arm/mach-shark/core.c | 4 +- + arch/arm/mach-shark/include/mach/system.h | 3 - + arch/arm/mach-shark/include/mach/vmalloc.h | 4 - + arch/arm/mach-shmobile/Makefile | 1 - + arch/arm/mach-shmobile/board-ag5evm.c | 2 +- + arch/arm/mach-shmobile/board-kota2.c | 2 +- + arch/arm/mach-shmobile/entry-gic.S | 18 - + arch/arm/mach-shmobile/include/mach/common.h | 1 - + arch/arm/mach-shmobile/include/mach/entry-macro.S | 9 - + arch/arm/mach-shmobile/include/mach/system.h | 3 +- + arch/arm/mach-shmobile/include/mach/vmalloc.h | 7 - + arch/arm/mach-spear3xx/include/mach/entry-macro.S | 27 - + arch/arm/mach-spear3xx/include/mach/generic.h | 2 + + arch/arm/mach-spear3xx/include/mach/vmalloc.h | 19 - + arch/arm/mach-spear3xx/spear300_evb.c | 3 + + arch/arm/mach-spear3xx/spear310_evb.c | 3 + + arch/arm/mach-spear3xx/spear320_evb.c | 3 + + arch/arm/mach-spear6xx/include/mach/entry-macro.S | 36 - + arch/arm/mach-spear6xx/include/mach/generic.h | 2 + + arch/arm/mach-spear6xx/include/mach/vmalloc.h | 19 - + arch/arm/mach-spear6xx/spear600_evb.c | 3 + + arch/arm/mach-tegra/board-dt.c | 3 + + arch/arm/mach-tegra/board-harmony.c | 3 + + arch/arm/mach-tegra/board-paz00.c | 3 + + arch/arm/mach-tegra/board-seaboard.c | 7 + + arch/arm/mach-tegra/board-trimslice.c | 3 + + arch/arm/mach-tegra/common.c | 2 - + arch/arm/mach-tegra/include/mach/entry-macro.S | 22 +- + arch/arm/mach-tegra/include/mach/io.h | 6 - + arch/arm/mach-tegra/include/mach/system.h | 4 - + arch/arm/mach-tegra/include/mach/vmalloc.h | 28 - + arch/arm/mach-tegra/io.c | 21 - + arch/arm/mach-u300/core.c | 20 + + arch/arm/mach-u300/include/mach/entry-macro.S | 24 - + arch/arm/mach-u300/include/mach/platform.h | 1 + + arch/arm/mach-u300/include/mach/system.h | 28 - + arch/arm/mach-u300/include/mach/vmalloc.h | 12 - + arch/arm/mach-u300/u300.c | 3 + + arch/arm/mach-ux500/board-mop500.c | 4 + + arch/arm/mach-ux500/board-u5500.c | 2 + + arch/arm/mach-ux500/include/mach/entry-macro.S | 2 - + arch/arm/mach-ux500/include/mach/system.h | 5 - + arch/arm/mach-ux500/include/mach/vmalloc.h | 18 - + arch/arm/mach-versatile/core.c | 18 +- + arch/arm/mach-versatile/core.h | 1 + + arch/arm/mach-versatile/include/mach/entry-macro.S | 30 - + arch/arm/mach-versatile/include/mach/system.h | 16 - + arch/arm/mach-versatile/include/mach/vmalloc.h | 21 - + arch/arm/mach-versatile/versatile_ab.c | 3 + + arch/arm/mach-versatile/versatile_dt.c | 3 + + arch/arm/mach-versatile/versatile_pb.c | 3 + + arch/arm/mach-vexpress/include/mach/entry-macro.S | 2 - + arch/arm/mach-vexpress/include/mach/system.h | 4 - + arch/arm/mach-vexpress/include/mach/vmalloc.h | 21 - + arch/arm/mach-vexpress/v2m.c | 4 +- + arch/arm/mach-vt8500/include/mach/system.h | 1 + + arch/arm/mach-vt8500/include/mach/vmalloc.h | 20 - + arch/arm/mach-w90x900/cpu.c | 16 + + arch/arm/mach-w90x900/include/mach/system.h | 22 - + arch/arm/mach-w90x900/include/mach/vmalloc.h | 23 - + arch/arm/mach-w90x900/irq.c | 2 + + arch/arm/mach-w90x900/mach-nuc910evb.c | 1 + + arch/arm/mach-w90x900/mach-nuc950evb.c | 1 + + arch/arm/mach-w90x900/mach-nuc960evb.c | 1 + + arch/arm/mach-w90x900/nuc910.h | 9 +- + arch/arm/mach-w90x900/nuc950.h | 9 +- + arch/arm/mach-w90x900/nuc960.h | 9 +- + arch/arm/mach-w90x900/nuc9xx.h | 24 + + arch/arm/mach-w90x900/time.c | 2 + + arch/arm/mach-zynq/common.c | 1 + + arch/arm/mach-zynq/include/mach/entry-macro.S | 3 - + arch/arm/mach-zynq/include/mach/system.h | 5 - + arch/arm/mach-zynq/include/mach/vmalloc.h | 20 - + arch/arm/mm/Kconfig | 17 + + arch/arm/mm/alignment.c | 2 +- + arch/arm/mm/context.c | 19 +- + arch/arm/mm/fault.c | 169 ++--- + arch/arm/mm/fault.h | 27 +- + arch/arm/mm/fsr-2level.c | 78 +++ + arch/arm/mm/fsr-3level.c | 68 ++ + arch/arm/mm/idmap.c | 93 ++- + arch/arm/mm/init.c | 40 +- + arch/arm/mm/ioremap.c | 119 ++-- + arch/arm/mm/mm.h | 14 + + arch/arm/mm/mmap.c | 173 +++++- + arch/arm/mm/mmu.c | 97 +++- + arch/arm/mm/nommu.c | 4 +- + arch/arm/mm/pgd.c | 51 ++- + arch/arm/mm/proc-arm1020.S | 3 + + arch/arm/mm/proc-arm1020e.S | 3 + + arch/arm/mm/proc-arm1022.S | 3 + + arch/arm/mm/proc-arm1026.S | 3 + + arch/arm/mm/proc-arm6_7.S | 4 + + arch/arm/mm/proc-arm720.S | 3 + + arch/arm/mm/proc-arm740.S | 3 + + arch/arm/mm/proc-arm7tdmi.S | 3 + + arch/arm/mm/proc-arm920.S | 3 + + arch/arm/mm/proc-arm922.S | 3 + + arch/arm/mm/proc-arm925.S | 3 + + arch/arm/mm/proc-arm926.S | 3 + + arch/arm/mm/proc-arm940.S | 3 + + arch/arm/mm/proc-arm946.S | 3 + + arch/arm/mm/proc-arm9tdmi.S | 3 + + arch/arm/mm/proc-fa526.S | 3 + + arch/arm/mm/proc-feroceon.S | 3 + + arch/arm/mm/proc-macros.S | 5 +- + arch/arm/mm/proc-mohawk.S | 3 + + arch/arm/mm/proc-sa110.S | 3 + + arch/arm/mm/proc-sa1100.S | 3 + + arch/arm/mm/proc-v6.S | 3 + + arch/arm/mm/proc-v7-2level.S | 171 +++++ + arch/arm/mm/proc-v7-3level.S | 150 ++++ + arch/arm/mm/proc-v7.S | 190 +----- + arch/arm/mm/proc-xsc3.S | 3 + + arch/arm/mm/proc-xscale.S | 3 + + arch/arm/plat-iop/Makefile | 4 +- + arch/arm/plat-iop/io.c | 59 -- + arch/arm/plat-iop/restart.c | 19 + + arch/arm/plat-mxc/Makefile | 1 - + arch/arm/plat-mxc/gic.c | 41 -- + arch/arm/plat-mxc/include/mach/common.h | 4 +- + arch/arm/plat-mxc/include/mach/entry-macro.S | 11 - + arch/arm/plat-mxc/include/mach/mx1.h | 2 - + arch/arm/plat-mxc/include/mach/system.h | 2 - + arch/arm/plat-mxc/include/mach/vmalloc.h | 22 - + arch/arm/plat-mxc/system.c | 11 +- + arch/arm/plat-omap/Makefile | 2 +- + arch/arm/plat-omap/common.c | 8 + + arch/arm/plat-omap/include/plat/common.h | 82 --- + arch/arm/plat-omap/include/plat/io.h | 76 --- + arch/arm/plat-omap/include/plat/irqs.h | 14 - + arch/arm/plat-omap/include/plat/system.h | 2 - + arch/arm/plat-omap/io.c | 159 ----- + arch/arm/plat-s3c24xx/cpu.c | 23 - + arch/arm/plat-s5p/Kconfig | 1 + + arch/arm/plat-samsung/include/plat/system-reset.h | 1 + + arch/arm/plat-spear/Makefile | 2 +- + arch/arm/plat-spear/include/plat/system.h | 15 - + arch/arm/plat-spear/include/plat/vmalloc.h | 19 - + arch/arm/plat-spear/restart.c | 27 + + arch/arm/plat-tcc/include/mach/system.h | 1 + + arch/arm/plat-tcc/include/mach/vmalloc.h | 10 - + arch/arm/tools/mach-types | 713 +++++++++++--------- + include/linux/vmalloc.h | 1 + + mm/vmalloc.c | 29 +- + 746 files changed, 4641 insertions(+), 4671 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/vic.txt + create mode 100644 arch/arm/include/asm/cti.h + create mode 100644 arch/arm/include/asm/edac.h + delete mode 100644 arch/arm/include/asm/entry-macro-vic2.S + delete mode 100644 arch/arm/include/asm/hardware/entry-macro-gic.S + create mode 100644 arch/arm/include/asm/idmap.h + create mode 100644 arch/arm/include/asm/pgtable-3level-hwdef.h + create mode 100644 arch/arm/include/asm/pgtable-3level-types.h + create mode 100644 arch/arm/include/asm/pgtable-3level.h + delete mode 100644 arch/arm/mach-at91/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-bcmring/include/mach/vmalloc.h + rename arch/arm/mach-clps711x/{irq.c => common.c} (58%) + delete mode 100644 arch/arm/mach-clps711x/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-clps711x/mm.c + delete mode 100644 arch/arm/mach-clps711x/time.c + delete mode 100644 arch/arm/mach-cns3xxx/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-davinci/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-davinci/io.c + delete mode 100644 arch/arm/mach-dove/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-ebsa110/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-ep93xx/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-exynos/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-footbridge/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-gemini/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-h720x/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-highbank/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-integrator/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-iop13xx/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-iop32x/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-iop33x/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-ixp2000/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-ixp23xx/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-ixp4xx/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-kirkwood/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-ks8695/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-lpc32xx/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-mmp/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-msm/include/mach/entry-macro-qgic.S + delete mode 100644 arch/arm/mach-msm/include/mach/entry-macro-vic.S + delete mode 100644 arch/arm/mach-msm/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-mv78xx0/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-mxs/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-netx/include/mach/vmalloc.h + create mode 100644 arch/arm/mach-nomadik/cpu-8815.h + delete mode 100644 arch/arm/mach-nomadik/include/mach/vmalloc.h + create mode 100644 arch/arm/mach-omap1/common.h + delete mode 100644 arch/arm/mach-omap1/include/mach/vmalloc.h + create mode 100644 arch/arm/mach-omap2/common.h + delete mode 100644 arch/arm/mach-omap2/include/mach/omap4-common.h + delete mode 100644 arch/arm/mach-omap2/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-orion5x/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-picoxcell/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-pnx4008/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-prima2/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-pxa/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-realview/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-rpc/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-s3c2410/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-s5p64x0/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-s5pc100/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-s5pv210/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-sa1100/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-shark/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-shmobile/entry-gic.S + delete mode 100644 arch/arm/mach-shmobile/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-spear3xx/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-spear6xx/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-tegra/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-u300/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-ux500/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-versatile/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-vexpress/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-vt8500/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-w90x900/include/mach/vmalloc.h + create mode 100644 arch/arm/mach-w90x900/nuc9xx.h + delete mode 100644 arch/arm/mach-zynq/include/mach/vmalloc.h + create mode 100644 arch/arm/mm/fsr-2level.c + create mode 100644 arch/arm/mm/fsr-3level.c + create mode 100644 arch/arm/mm/proc-v7-2level.S + create mode 100644 arch/arm/mm/proc-v7-3level.S + delete mode 100644 arch/arm/plat-iop/io.c + create mode 100644 arch/arm/plat-iop/restart.c + delete mode 100644 arch/arm/plat-mxc/gic.c + delete mode 100644 arch/arm/plat-mxc/include/mach/vmalloc.h + delete mode 100644 arch/arm/plat-omap/io.c + delete mode 100644 arch/arm/plat-spear/include/plat/vmalloc.h + create mode 100644 arch/arm/plat-spear/restart.c + delete mode 100644 arch/arm/plat-tcc/include/mach/vmalloc.h +Merging arm-soc/for-next (6d311e4 Merge branch 'next/pm' into for-next) +$ git merge arm-soc/for-next +Resolved 'arch/arm/mach-at91/at91cap9.c' using previous resolution. +Resolved 'arch/arm/mach-at91/at91sam9260.c' using previous resolution. +Resolved 'arch/arm/mach-at91/at91sam9261.c' using previous resolution. +Resolved 'arch/arm/mach-at91/at91sam9263.c' using previous resolution. +Resolved 'arch/arm/mach-at91/at91sam9g45.c' using previous resolution. +Resolved 'arch/arm/mach-at91/at91sam9rl.c' using previous resolution. +Resolved 'arch/arm/mach-mxs/include/mach/common.h' using previous resolution. +Auto-merging drivers/gpio/Makefile +Removing arch/arm/plat-pxa/include/plat/gpio.h +Removing arch/arm/plat-pxa/include/plat/gpio-pxa.h +Auto-merging arch/arm/mach-pxa/zylonite.c +Auto-merging arch/arm/mach-pxa/zeus.c +Auto-merging arch/arm/mach-pxa/z2.c +Auto-merging arch/arm/mach-pxa/vpac270.c +Auto-merging arch/arm/mach-pxa/viper.c +Auto-merging arch/arm/mach-pxa/tosa.c +Auto-merging arch/arm/mach-pxa/tavorevb3.c +Auto-merging arch/arm/mach-pxa/tavorevb.c +Auto-merging arch/arm/mach-pxa/stargate2.c +Auto-merging arch/arm/mach-pxa/spitz.c +Auto-merging arch/arm/mach-pxa/saarb.c +Auto-merging arch/arm/mach-pxa/saar.c +Auto-merging arch/arm/mach-pxa/raumfeld.c +Auto-merging arch/arm/mach-pxa/poodle.c +Auto-merging arch/arm/mach-pxa/mioa701.c +Auto-merging arch/arm/mach-pxa/mainstone.c +Auto-merging arch/arm/mach-pxa/magician.c +Auto-merging arch/arm/mach-pxa/lubbock.c +Auto-merging arch/arm/mach-pxa/lpd270.c +Auto-merging arch/arm/mach-pxa/littleton.c +Removing arch/arm/mach-pxa/include/mach/gpio-pxa.h +Auto-merging arch/arm/mach-pxa/idp.c +Auto-merging arch/arm/mach-pxa/icontrol.c +Auto-merging arch/arm/mach-pxa/hx4700.c +Auto-merging arch/arm/mach-pxa/eseries.c +Auto-merging arch/arm/mach-pxa/em-x270.c +Auto-merging arch/arm/mach-pxa/corgi.c +Auto-merging arch/arm/mach-pxa/colibri-pxa320.c +Auto-merging arch/arm/mach-pxa/colibri-pxa300.c +Auto-merging arch/arm/mach-pxa/colibri-pxa270.c +Auto-merging arch/arm/mach-pxa/cm-x300.c +Auto-merging arch/arm/mach-pxa/cm-x2xx.c +Auto-merging arch/arm/mach-pxa/capc7117.c +Auto-merging arch/arm/mach-pxa/balloon3.c +Auto-merging arch/arm/mach-omap2/omap-smc.S +Auto-merging arch/arm/mach-omap2/common.h +Auto-merging arch/arm/mach-mxs/mach-mx28evk.c +Auto-merging arch/arm/mach-mxs/include/mach/common.h +CONFLICT (content): Merge conflict in arch/arm/mach-mxs/include/mach/common.h +Removing arch/arm/mach-mx5/pm-imx5.c +Removing arch/arm/mach-mx5/Makefile.boot +Removing arch/arm/mach-mx5/Makefile +Removing arch/arm/mach-mx5/Kconfig +Auto-merging arch/arm/mach-mmp/ttc_dkb.c +Auto-merging arch/arm/mach-mmp/teton_bga.c +Auto-merging arch/arm/mach-mmp/tavorevb.c +Auto-merging arch/arm/mach-mmp/pxa168.c +Auto-merging arch/arm/mach-mmp/include/mach/pxa168.h +Auto-merging arch/arm/mach-mmp/gplugd.c +Auto-merging arch/arm/mach-mmp/flint.c +Auto-merging arch/arm/mach-mmp/brownstone.c +Auto-merging arch/arm/mach-mmp/avengers_lite.c +Auto-merging arch/arm/mach-mmp/aspenite.c +Auto-merging arch/arm/mach-imx/pm-imx5.c +Auto-merging arch/arm/mach-imx/mach-mx53_smd.c +Auto-merging arch/arm/mach-imx/mach-mx53_loco.c +Auto-merging arch/arm/mach-imx/mach-mx53_evk.c +Auto-merging arch/arm/mach-imx/mach-mx53_ard.c +Auto-merging arch/arm/mach-imx/clock-mx51-mx53.c +Auto-merging arch/arm/mach-at91/generic.h +Auto-merging arch/arm/mach-at91/at91sam9rl.c +CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9rl.c +Auto-merging arch/arm/mach-at91/at91sam9g45.c +CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9g45.c +Auto-merging arch/arm/mach-at91/at91sam9263.c +CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9263.c +Auto-merging arch/arm/mach-at91/at91sam9261.c +CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9261.c +Auto-merging arch/arm/mach-at91/at91sam9260.c +CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9260.c +Auto-merging arch/arm/mach-at91/at91rm9200.c +Auto-merging arch/arm/mach-at91/at91cap9.c +CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91cap9.c +Removing arch/arm/configs/mx3_defconfig +Auto-merging arch/arm/configs/imx_v6_v7_defconfig +Auto-merging arch/arm/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 70c61a5] Merge remote-tracking branch 'arm-soc/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/Kconfig | 2 + + arch/arm/Kconfig.debug | 45 +++ + arch/arm/Makefile | 1 - + arch/arm/arm-soc-for-next-contents.txt | 19 + + .../configs/{mx5_defconfig => imx_v6_v7_defconfig} | 61 ++-- + arch/arm/configs/mx3_defconfig | 144 ------- + arch/arm/configs/omap1_defconfig | 1 - + arch/arm/mach-at91/Kconfig | 24 ++- + arch/arm/mach-at91/at91cap9.c | 40 +- + arch/arm/mach-at91/at91cap9_devices.c | 49 ++- + arch/arm/mach-at91/at91rm9200.c | 24 +- + arch/arm/mach-at91/at91rm9200_devices.c | 48 ++- + arch/arm/mach-at91/at91rm9200_time.c | 8 +- + arch/arm/mach-at91/at91sam9260.c | 36 +- + arch/arm/mach-at91/at91sam9260_devices.c | 55 ++-- + arch/arm/mach-at91/at91sam9261.c | 32 +- + arch/arm/mach-at91/at91sam9261_devices.c | 33 +- + arch/arm/mach-at91/at91sam9263.c | 45 ++- + arch/arm/mach-at91/at91sam9263_devices.c | 59 ++-- + arch/arm/mach-at91/at91sam926x_time.c | 38 ++- + arch/arm/mach-at91/at91sam9g45.c | 44 ++- + arch/arm/mach-at91/at91sam9g45_devices.c | 69 +++-- + arch/arm/mach-at91/at91sam9rl.c | 36 +- + arch/arm/mach-at91/at91sam9rl_devices.c | 43 ++- + arch/arm/mach-at91/board-1arm.c | 4 +- + arch/arm/mach-at91/board-afeb-9260v1.c | 10 +- + arch/arm/mach-at91/board-cam60.c | 8 +- + arch/arm/mach-at91/board-cap9adk.c | 21 +- + arch/arm/mach-at91/board-carmeva.c | 9 +- + arch/arm/mach-at91/board-cpu9krea.c | 14 +- + arch/arm/mach-at91/board-cpuat91.c | 7 +- + arch/arm/mach-at91/board-csb337.c | 7 +- + arch/arm/mach-at91/board-csb637.c | 4 +- + arch/arm/mach-at91/board-dt.c | 3 +- + arch/arm/mach-at91/board-eb9200.c | 11 +- + arch/arm/mach-at91/board-ecbat91.c | 7 +- + arch/arm/mach-at91/board-eco920.c | 7 +- + arch/arm/mach-at91/board-flexibity.c | 5 +- + arch/arm/mach-at91/board-foxg20.c | 9 +- + arch/arm/mach-at91/board-gsia18s.c | 7 +- + arch/arm/mach-at91/board-kafa.c | 4 +- + arch/arm/mach-at91/board-kb9202.c | 8 +- + arch/arm/mach-at91/board-neocore926.c | 9 +- + arch/arm/mach-at91/board-pcontrol-g20.c | 8 +- + arch/arm/mach-at91/board-picotux200.c | 5 +- + arch/arm/mach-at91/board-qil-a9260.c | 18 +- + arch/arm/mach-at91/board-rm9200dk.c | 13 +- + arch/arm/mach-at91/board-rm9200ek.c | 5 +- + arch/arm/mach-at91/board-rsi-ews.c | 4 +- + arch/arm/mach-at91/board-sam9-l9260.c | 12 +- + arch/arm/mach-at91/board-sam9260ek.c | 16 +- + arch/arm/mach-at91/board-sam9261ek.c | 13 +- + arch/arm/mach-at91/board-sam9263ek.c | 12 +- + arch/arm/mach-at91/board-sam9g20ek.c | 13 +- + arch/arm/mach-at91/board-sam9m10g45ek.c | 8 +- + arch/arm/mach-at91/board-sam9rlek.c | 9 +- + arch/arm/mach-at91/board-snapper9260.c | 10 +- + arch/arm/mach-at91/board-stamp9g20.c | 16 +- + arch/arm/mach-at91/board-usb-a926x.c | 14 +- + arch/arm/mach-at91/board-yl-9200.c | 9 +- + arch/arm/mach-at91/generic.h | 7 +- + arch/arm/mach-at91/gpio.c | 85 +++-- + arch/arm/mach-at91/include/mach/at91_aic.h | 48 ++- + arch/arm/mach-at91/include/mach/at91_dbgu.h | 2 +- + arch/arm/mach-at91/include/mach/at91_pit.h | 8 +- + arch/arm/mach-at91/include/mach/at91_rtc.h | 24 +- + arch/arm/mach-at91/include/mach/at91_shdwc.h | 16 +- + arch/arm/mach-at91/include/mach/at91cap9.h | 27 +- + arch/arm/mach-at91/include/mach/at91rm9200.h | 14 +- + arch/arm/mach-at91/include/mach/at91sam9260.h | 23 +- + arch/arm/mach-at91/include/mach/at91sam9261.h | 20 +- + arch/arm/mach-at91/include/mach/at91sam9263.h | 33 +- + arch/arm/mach-at91/include/mach/at91sam9_smc.h | 17 +- + arch/arm/mach-at91/include/mach/at91sam9g45.h | 30 +- + arch/arm/mach-at91/include/mach/at91sam9rl.h | 29 +- + arch/arm/mach-at91/include/mach/at91x40.h | 1 - + arch/arm/mach-at91/include/mach/board.h | 42 +-- + arch/arm/mach-at91/include/mach/debug-macro.S | 10 +- + arch/arm/mach-at91/include/mach/entry-macro.S | 11 +- + arch/arm/mach-at91/include/mach/gpio.h | 336 ++++++++--------- + arch/arm/mach-at91/include/mach/hardware.h | 12 + + arch/arm/mach-at91/include/mach/irqs.h | 2 +- + arch/arm/mach-at91/include/mach/timex.h | 65 +--- + arch/arm/mach-at91/include/mach/uncompress.h | 6 +- + arch/arm/mach-at91/irq.c | 38 ++- + arch/arm/mach-at91/pm.c | 11 +- + arch/arm/mach-at91/sam9_smc.c | 62 ++- + arch/arm/mach-at91/sam9_smc.h | 3 +- + arch/arm/mach-at91/setup.c | 26 +- + arch/arm/mach-at91/soc.h | 1 + + arch/arm/mach-imx/Kconfig | 239 ++++++++++++ + arch/arm/mach-imx/Makefile | 21 + + arch/arm/mach-imx/Makefile.boot | 12 + + arch/arm/{mach-mx5 => mach-imx}/clock-mx51-mx53.c | 2 +- + arch/arm/{mach-mx5/cpu.c => mach-imx/cpu-imx5.c} | 0 + arch/arm/{mach-mx5 => mach-imx}/cpu_op-mx51.c | 0 + arch/arm/{mach-mx5 => mach-imx}/cpu_op-mx51.h | 0 + .../crm_regs.h => mach-imx/crm-regs-imx5.h} | 0 + arch/arm/{mach-mx5 => mach-imx}/devices-imx50.h | 0 + arch/arm/{mach-mx5 => mach-imx}/devices-imx51.h | 0 + arch/arm/{mach-mx5 => mach-imx}/devices-imx53.h | 0 + arch/arm/{mach-mx5 => mach-imx}/efika.h | 0 + arch/arm/{mach-mx5/ehci.c => mach-imx/ehci-imx5.c} | 0 + .../eukrea_mbimx51-baseboard.c | 0 + .../eukrea_mbimxsd-baseboard.c | 0 + arch/arm/{mach-mx5 => mach-imx}/imx51-dt.c | 0 + arch/arm/{mach-mx5 => mach-imx}/imx53-dt.c | 0 + .../board-cpuimx51.c => mach-imx/mach-cpuimx51.c} | 0 + .../mach-cpuimx51sd.c} | 0 + .../board-mx50_rdp.c => mach-imx/mach-mx50_rdp.c} | 0 + .../board-mx51_3ds.c => mach-imx/mach-mx51_3ds.c} | 0 + .../mach-mx51_babbage.c} | 0 + .../mach-mx51_efikamx.c} | 0 + .../mach-mx51_efikasb.c} | 0 + .../board-mx53_ard.c => mach-imx/mach-mx53_ard.c} | 1 - + .../board-mx53_evk.c => mach-imx/mach-mx53_evk.c} | 1 - + .../mach-mx53_loco.c} | 1 - + .../board-mx53_smd.c => mach-imx/mach-mx53_smd.c} | 1 - + arch/arm/{mach-mx5/mm.c => mach-imx/mm-imx5.c} | 0 + arch/arm/{mach-mx5 => mach-imx}/mx51_efika.c | 0 + arch/arm/{mach-mx5/system.c => mach-imx/pm-imx5.c} | 89 ++++- + arch/arm/mach-mmp/aspenite.c | 5 +- + arch/arm/mach-mmp/avengers_lite.c | 1 + + arch/arm/mach-mmp/brownstone.c | 1 + + arch/arm/mach-mmp/flint.c | 5 +- + arch/arm/mach-mmp/gplugd.c | 1 + + arch/arm/mach-mmp/include/mach/gpio-pxa.h | 3 +- + arch/arm/mach-mmp/include/mach/gpio.h | 7 +- + arch/arm/mach-mmp/include/mach/irqs.h | 6 +- + arch/arm/mach-mmp/include/mach/mmp2.h | 2 + + arch/arm/mach-mmp/include/mach/pxa168.h | 2 + + arch/arm/mach-mmp/include/mach/pxa910.h | 2 + + arch/arm/mach-mmp/mmp2.c | 39 +- + arch/arm/mach-mmp/pxa168.c | 40 ++- + arch/arm/mach-mmp/pxa910.c | 40 ++- + arch/arm/mach-mmp/tavorevb.c | 6 +- + arch/arm/mach-mmp/teton_bga.c | 3 +- + arch/arm/mach-mmp/ttc_dkb.c | 8 +- + arch/arm/mach-msm/Kconfig | 35 +-- + arch/arm/mach-msm/include/mach/debug-macro.S | 51 ++- + arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | 12 - + arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 12 - + arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 5 + + arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | 12 - + arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 5 + + arch/arm/mach-msm/include/mach/msm_iomap.h | 12 + + arch/arm/mach-msm/include/mach/uncompress.h | 39 ++- + arch/arm/mach-msm/io.c | 15 +- + arch/arm/mach-msm/platsmp.c | 2 +- + arch/arm/mach-msm/timer.c | 347 ++++++----------- + arch/arm/mach-mx5/Kconfig | 244 ------------ + arch/arm/mach-mx5/Makefile | 26 -- + arch/arm/mach-mx5/Makefile.boot | 9 - + arch/arm/mach-mx5/pm-imx5.c | 83 ---- + arch/arm/mach-mxs/clock-mx28.c | 38 ++ + arch/arm/mach-mxs/devices-mx28.h | 3 +- + arch/arm/mach-mxs/devices/platform-mxs-saif.c | 5 +- + arch/arm/mach-mxs/include/mach/common.h | 1 + + arch/arm/mach-mxs/include/mach/devices-common.h | 4 +- + arch/arm/mach-mxs/include/mach/digctl.h | 21 + + arch/arm/mach-mxs/mach-mx28evk.c | 18 +- + arch/arm/mach-omap1/Kconfig | 64 ---- + arch/arm/mach-omap1/clock.c | 14 +- + arch/arm/mach-omap1/clock.h | 3 + + arch/arm/mach-omap1/clock_data.c | 19 +- + arch/arm/mach-omap1/opp.h | 1 + + arch/arm/mach-omap1/opp_data.c | 63 ++-- + arch/arm/mach-omap2/Kconfig | 21 + + arch/arm/mach-omap2/Makefile | 16 +- + arch/arm/mach-omap2/common.h | 64 +++- + arch/arm/mach-omap2/cpuidle34xx.c | 15 + + arch/arm/mach-omap2/cpuidle44xx.c | 245 ++++++++++++ + arch/arm/mach-omap2/include/mach/barriers.h | 31 ++ + arch/arm/mach-omap2/include/mach/omap-secure.h | 57 +++ + arch/arm/mach-omap2/include/mach/omap-wakeupgen.h | 39 ++ + arch/arm/mach-omap2/io.c | 9 + + arch/arm/mach-omap2/omap-headsmp.S | 5 - + arch/arm/mach-omap2/omap-hotplug.c | 14 +- + arch/arm/mach-omap2/omap-mpuss-lowpower.c | 398 ++++++++++++++++++++ + arch/arm/mach-omap2/omap-secure.c | 81 ++++ + arch/arm/mach-omap2/{omap44xx-smc.S => omap-smc.S} | 23 ++ + arch/arm/mach-omap2/omap-smp.c | 45 +++ + arch/arm/mach-omap2/omap-wakeupgen.c | 389 +++++++++++++++++++ + arch/arm/mach-omap2/omap4-common.c | 94 +++++- + arch/arm/mach-omap2/omap4-sar-layout.h | 50 +++ + arch/arm/mach-omap2/pm.h | 1 + + arch/arm/mach-omap2/pm44xx.c | 153 ++++++++- + arch/arm/mach-omap2/sleep44xx.S | 379 +++++++++++++++++++ + arch/arm/mach-pxa/am200epd.c | 4 +- + arch/arm/mach-pxa/am300epd.c | 4 +- + arch/arm/mach-pxa/balloon3.c | 2 +- + arch/arm/mach-pxa/capc7117.c | 12 +- + arch/arm/mach-pxa/cm-x270.c | 4 +- + arch/arm/mach-pxa/cm-x2xx.c | 4 +- + arch/arm/mach-pxa/cm-x300.c | 6 +- + arch/arm/mach-pxa/colibri-pxa270.c | 6 +- + arch/arm/mach-pxa/colibri-pxa300.c | 4 +- + arch/arm/mach-pxa/colibri-pxa320.c | 4 +- + arch/arm/mach-pxa/corgi.c | 2 +- + arch/arm/mach-pxa/corgi_pm.c | 21 +- + arch/arm/mach-pxa/devices.c | 30 ++ + arch/arm/mach-pxa/devices.h | 1 + + arch/arm/mach-pxa/em-x270.c | 6 +- + arch/arm/mach-pxa/eseries.c | 4 +- + arch/arm/mach-pxa/hx4700.c | 18 +- + arch/arm/mach-pxa/icontrol.c | 8 +- + arch/arm/mach-pxa/idp.c | 4 +- + arch/arm/mach-pxa/include/mach/balloon3.h | 6 +- + arch/arm/mach-pxa/include/mach/corgi.h | 26 +- + arch/arm/mach-pxa/include/mach/csb726.h | 4 +- + arch/arm/mach-pxa/include/mach/gpio-pxa.h | 133 ------- + arch/arm/mach-pxa/include/mach/gpio.h | 20 +- + arch/arm/mach-pxa/include/mach/gumstix.h | 20 +- + arch/arm/mach-pxa/include/mach/hx4700.h | 2 +- + arch/arm/mach-pxa/include/mach/idp.h | 16 +- + arch/arm/mach-pxa/include/mach/irqs.h | 8 +- + arch/arm/mach-pxa/include/mach/littleton.h | 4 +- + arch/arm/mach-pxa/include/mach/magician.h | 2 +- + arch/arm/mach-pxa/include/mach/palmld.h | 8 +- + arch/arm/mach-pxa/include/mach/palmt5.h | 8 +- + arch/arm/mach-pxa/include/mach/palmtc.h | 4 +- + arch/arm/mach-pxa/include/mach/palmtx.h | 8 +- + arch/arm/mach-pxa/include/mach/pcm027.h | 8 +- + arch/arm/mach-pxa/include/mach/pcm990_baseboard.h | 14 +- + arch/arm/mach-pxa/include/mach/poodle.h | 26 +- + arch/arm/mach-pxa/include/mach/spitz.h | 40 +- + arch/arm/mach-pxa/include/mach/tosa.h | 54 ++-- + arch/arm/mach-pxa/include/mach/trizeps4.h | 16 +- + arch/arm/mach-pxa/irq.c | 61 +--- + arch/arm/mach-pxa/littleton.c | 6 +- + arch/arm/mach-pxa/lpd270.c | 4 +- + arch/arm/mach-pxa/lubbock.c | 4 +- + arch/arm/mach-pxa/magician.c | 8 +- + arch/arm/mach-pxa/mainstone.c | 4 +- + arch/arm/mach-pxa/mfp-pxa2xx.c | 6 +- + arch/arm/mach-pxa/mioa701.c | 8 +- + arch/arm/mach-pxa/mxm8x10.c | 4 +- + arch/arm/mach-pxa/pcm990-baseboard.c | 6 +- + arch/arm/mach-pxa/poodle.c | 6 +- + arch/arm/mach-pxa/pxa25x.c | 6 +- + arch/arm/mach-pxa/pxa27x.c | 6 +- + arch/arm/mach-pxa/pxa3xx.c | 8 +- + arch/arm/mach-pxa/pxa95x.c | 5 +- + arch/arm/mach-pxa/raumfeld.c | 8 +- + arch/arm/mach-pxa/saar.c | 6 +- + arch/arm/mach-pxa/saarb.c | 2 +- + arch/arm/mach-pxa/sharpsl_pm.c | 24 +- + arch/arm/mach-pxa/spitz.c | 2 +- + arch/arm/mach-pxa/spitz_pm.c | 11 +- + arch/arm/mach-pxa/stargate2.c | 26 +- + arch/arm/mach-pxa/tavorevb.c | 4 +- + arch/arm/mach-pxa/tavorevb3.c | 2 +- + arch/arm/mach-pxa/tosa.c | 4 +- + arch/arm/mach-pxa/viper.c | 12 +- + arch/arm/mach-pxa/vpac270.c | 10 +- + arch/arm/mach-pxa/z2.c | 2 +- + arch/arm/mach-pxa/zeus.c | 20 +- + arch/arm/mach-pxa/zylonite.c | 4 +- + arch/arm/mach-pxa/zylonite_pxa300.c | 4 +- + arch/arm/plat-mxc/Kconfig | 15 +- + arch/arm/plat-omap/common.c | 3 + + arch/arm/plat-omap/include/plat/clkdev_omap.h | 1 + + arch/arm/plat-omap/include/plat/omap-secure.h | 13 + + arch/arm/plat-omap/include/plat/omap44xx.h | 1 + + arch/arm/plat-omap/include/plat/sram.h | 6 +- + arch/arm/plat-omap/sram.c | 17 +- + arch/arm/plat-pxa/include/plat/gpio-pxa.h | 44 --- + arch/arm/plat-pxa/include/plat/gpio.h | 30 -- + arch/avr32/boards/atngw100/setup.c | 2 +- + arch/avr32/boards/atstk1000/atstk1002.c | 2 +- + arch/avr32/boards/favr-32/setup.c | 2 +- + arch/avr32/boards/hammerhead/setup.c | 2 +- + arch/avr32/boards/merisc/setup.c | 2 +- + arch/avr32/boards/mimc200/setup.c | 2 +- + arch/avr32/mach-at32ap/at32ap700x.c | 8 +- + arch/avr32/mach-at32ap/include/mach/board.h | 7 +- + drivers/ata/pata_at91.c | 6 +- + drivers/gpio/Kconfig | 6 + + drivers/gpio/Makefile | 2 +- + drivers/gpio/gpio-pxa.c | 377 ++++++++++++++++--- + drivers/ide/at91_ide.c | 2 +- + drivers/mmc/host/at91_mci.c | 30 +- + drivers/mtd/nand/atmel_nand.c | 8 +- + drivers/net/ethernet/Makefile | 2 +- + drivers/net/ethernet/cadence/Kconfig | 16 +- + drivers/net/ethernet/cadence/at91_ether.c | 3 +- + drivers/net/ethernet/cadence/at91_ether.h | 4 +- + drivers/net/ethernet/cadence/macb.c | 344 +++++++++++------ + drivers/net/ethernet/cadence/macb.h | 150 ++++++++- + drivers/pcmcia/pxa2xx_cm_x255.c | 16 +- + drivers/pcmcia/pxa2xx_cm_x270.c | 9 +- + drivers/rtc/rtc-at91rm9200.c | 101 +++-- + drivers/usb/gadget/at91_udc.c | 14 +- + drivers/usb/host/ohci-at91.c | 12 +- + drivers/watchdog/at91sam9_wdt.c | 22 +- + drivers/watchdog/at91sam9_wdt.h | 6 +- + include/linux/gpio-pxa.h | 16 + + include/linux/platform_data/macb.h | 17 + + include/sound/saif.h | 4 +- + sound/soc/mxs/mxs-saif.c | 20 +- + 300 files changed, 5465 insertions(+), 2867 deletions(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + rename arch/arm/configs/{mx5_defconfig => imx_v6_v7_defconfig} (80%) + delete mode 100644 arch/arm/configs/mx3_defconfig + rename arch/arm/{mach-mx5 => mach-imx}/clock-mx51-mx53.c (99%) + rename arch/arm/{mach-mx5/cpu.c => mach-imx/cpu-imx5.c} (100%) + rename arch/arm/{mach-mx5 => mach-imx}/cpu_op-mx51.c (100%) + rename arch/arm/{mach-mx5 => mach-imx}/cpu_op-mx51.h (100%) + rename arch/arm/{mach-mx5/crm_regs.h => mach-imx/crm-regs-imx5.h} (100%) + rename arch/arm/{mach-mx5 => mach-imx}/devices-imx50.h (100%) + rename arch/arm/{mach-mx5 => mach-imx}/devices-imx51.h (100%) + rename arch/arm/{mach-mx5 => mach-imx}/devices-imx53.h (100%) + rename arch/arm/{mach-mx5 => mach-imx}/efika.h (100%) + rename arch/arm/{mach-mx5/ehci.c => mach-imx/ehci-imx5.c} (100%) + rename arch/arm/{mach-mx5 => mach-imx}/eukrea_mbimx51-baseboard.c (100%) + rename arch/arm/{mach-mx5 => mach-imx}/eukrea_mbimxsd-baseboard.c (100%) + rename arch/arm/{mach-mx5 => mach-imx}/imx51-dt.c (100%) + rename arch/arm/{mach-mx5 => mach-imx}/imx53-dt.c (100%) + rename arch/arm/{mach-mx5/board-cpuimx51.c => mach-imx/mach-cpuimx51.c} (100%) + rename arch/arm/{mach-mx5/board-cpuimx51sd.c => mach-imx/mach-cpuimx51sd.c} (100%) + rename arch/arm/{mach-mx5/board-mx50_rdp.c => mach-imx/mach-mx50_rdp.c} (100%) + rename arch/arm/{mach-mx5/board-mx51_3ds.c => mach-imx/mach-mx51_3ds.c} (100%) + rename arch/arm/{mach-mx5/board-mx51_babbage.c => mach-imx/mach-mx51_babbage.c} (100%) + rename arch/arm/{mach-mx5/board-mx51_efikamx.c => mach-imx/mach-mx51_efikamx.c} (100%) + rename arch/arm/{mach-mx5/board-mx51_efikasb.c => mach-imx/mach-mx51_efikasb.c} (100%) + rename arch/arm/{mach-mx5/board-mx53_ard.c => mach-imx/mach-mx53_ard.c} (99%) + rename arch/arm/{mach-mx5/board-mx53_evk.c => mach-imx/mach-mx53_evk.c} (99%) + rename arch/arm/{mach-mx5/board-mx53_loco.c => mach-imx/mach-mx53_loco.c} (99%) + rename arch/arm/{mach-mx5/board-mx53_smd.c => mach-imx/mach-mx53_smd.c} (99%) + rename arch/arm/{mach-mx5/mm.c => mach-imx/mm-imx5.c} (100%) + rename arch/arm/{mach-mx5 => mach-imx}/mx51_efika.c (100%) + rename arch/arm/{mach-mx5/system.c => mach-imx/pm-imx5.c} (58%) + delete mode 100644 arch/arm/mach-mx5/Kconfig + delete mode 100644 arch/arm/mach-mx5/Makefile + delete mode 100644 arch/arm/mach-mx5/Makefile.boot + delete mode 100644 arch/arm/mach-mx5/pm-imx5.c + create mode 100644 arch/arm/mach-mxs/include/mach/digctl.h + create mode 100644 arch/arm/mach-omap2/cpuidle44xx.c + create mode 100644 arch/arm/mach-omap2/include/mach/barriers.h + create mode 100644 arch/arm/mach-omap2/include/mach/omap-secure.h + create mode 100644 arch/arm/mach-omap2/include/mach/omap-wakeupgen.h + create mode 100644 arch/arm/mach-omap2/omap-mpuss-lowpower.c + create mode 100644 arch/arm/mach-omap2/omap-secure.c + rename arch/arm/mach-omap2/{omap44xx-smc.S => omap-smc.S} (70%) + create mode 100644 arch/arm/mach-omap2/omap-wakeupgen.c + create mode 100644 arch/arm/mach-omap2/omap4-sar-layout.h + create mode 100644 arch/arm/mach-omap2/sleep44xx.S + delete mode 100644 arch/arm/mach-pxa/include/mach/gpio-pxa.h + create mode 100644 arch/arm/plat-omap/include/plat/omap-secure.h + delete mode 100644 arch/arm/plat-pxa/include/plat/gpio-pxa.h + delete mode 100644 arch/arm/plat-pxa/include/plat/gpio.h + create mode 100644 include/linux/gpio-pxa.h + create mode 100644 include/linux/platform_data/macb.h +Merging arm-perf/for-next/perf (dc47ce9 Linux 3.2-rc5) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging at91/at91-next (8748dfa Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux) +$ git merge at91/at91-next +Already up-to-date. +Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6) +$ git merge davinci/davinci-next +Already up-to-date. +Merging i.MX/for-next (5788f4d Merge branches 'imx-fixes', 'imx-cleanup' and 'imx-features' into master) +$ git merge i.MX/for-next +Resolved 'arch/arm/mach-imx/clock-mx51-mx53.c' using previous resolution. +Resolved 'arch/arm/mach-imx/devices-imx53.h' using previous resolution. +Resolved 'arch/arm/mach-imx/mm-imx5.c' using previous resolution. +Resolved 'arch/arm/plat-mxc/include/mach/hardware.h' using previous resolution. +Auto-merging arch/arm/plat-mxc/include/mach/hardware.h +CONFLICT (content): Merge conflict in arch/arm/plat-mxc/include/mach/hardware.h +Auto-merging arch/arm/mach-mxs/clock-mx28.c +CONFLICT (modify/delete): arch/arm/mach-mx5/pm-imx5.c deleted in HEAD and modified in i.MX/for-next. Version i.MX/for-next of arch/arm/mach-mx5/pm-imx5.c left in tree. +CONFLICT (modify/delete): arch/arm/mach-mx5/Makefile deleted in HEAD and modified in i.MX/for-next. Version i.MX/for-next of arch/arm/mach-mx5/Makefile left in tree. +CONFLICT (modify/delete): arch/arm/mach-mx5/Kconfig deleted in HEAD and modified in i.MX/for-next. Version i.MX/for-next of arch/arm/mach-mx5/Kconfig left in tree. +Auto-merging arch/arm/mach-imx/mm-imx5.c +CONFLICT (content): Merge conflict in arch/arm/mach-imx/mm-imx5.c +Auto-merging arch/arm/mach-imx/devices-imx53.h +CONFLICT (content): Merge conflict in arch/arm/mach-imx/devices-imx53.h +Auto-merging arch/arm/mach-imx/clock-mx51-mx53.c +CONFLICT (content): Merge conflict in arch/arm/mach-imx/clock-mx51-mx53.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/arm/mach-mx5/pm-imx5.c arch/arm/mach-mx5/Makefile arch/arm/mach-mx5/Kconfig +arch/arm/mach-imx/clock-mx51-mx53.c: needs merge +arch/arm/mach-imx/devices-imx53.h: needs merge +arch/arm/mach-imx/mm-imx5.c: needs merge +arch/arm/mach-mx5/Kconfig: needs merge +arch/arm/mach-mx5/Makefile: needs merge +arch/arm/mach-mx5/pm-imx5.c: needs merge +arch/arm/plat-mxc/include/mach/hardware.h: needs merge +rm 'arch/arm/mach-mx5/Kconfig' +rm 'arch/arm/mach-mx5/Makefile' +rm 'arch/arm/mach-mx5/pm-imx5.c' +$ git commit -v -a +[master a900acd] Merge remote-tracking branch 'i.MX/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-mxs/clock-mx28.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) +Merging linux-spec/for-next (5111711 Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux) +$ git merge linux-spec/for-next +Already up-to-date. +Merging omap/for-next (322a8b0 Linux 3.1-rc1) +$ git merge omap/for-next +Already up-to-date. +Merging pxa/for-next (19d6c13 [ARM] pxa/hx4700: actually use platform_lcd driver) +$ git merge pxa/for-next +Already up-to-date. +Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers) +$ git merge samsung/next-samsung +Already up-to-date. +Merging s5p/for-next (57894d3 Merge branch 'next-samsung-devel' into for-next) +$ git merge s5p/for-next +Resolved 'arch/arm/mach-exynos/cpu.c' using previous resolution. +Resolved 'arch/arm/mach-exynos/include/mach/entry-macro.S' using previous resolution. +Resolved 'arch/arm/mach-s3c64xx/mach-crag6410.c' using previous resolution. +Removing drivers/tty/serial/s5pv210.c +Removing drivers/tty/serial/s3c6400.c +Removing drivers/tty/serial/s3c2440.c +Removing drivers/tty/serial/s3c2412.c +Removing drivers/tty/serial/s3c2410.c +Auto-merging drivers/rtc/rtc-s3c.c +Removing arch/arm/mach-s5pv210/setup-sdhci.c +Auto-merging arch/arm/mach-s5pv210/mach-smdkv210.c +Removing arch/arm/mach-s5pc100/setup-sdhci.c +Removing arch/arm/mach-s3c64xx/setup-sdhci.c +Auto-merging arch/arm/mach-s3c64xx/mach-crag6410.c +CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-crag6410.c +Removing arch/arm/mach-s3c2416/setup-sdhci.c +Removing arch/arm/mach-exynos/setup-sdhci.c +Auto-merging arch/arm/mach-exynos/mach-origen.c +Auto-merging arch/arm/mach-exynos/include/mach/entry-macro.S +CONFLICT (content): Merge conflict in arch/arm/mach-exynos/include/mach/entry-macro.S +Auto-merging arch/arm/mach-exynos/cpu.c +CONFLICT (content): Merge conflict in arch/arm/mach-exynos/cpu.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 183e156] Merge remote-tracking branch 's5p/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/arm/insignal-boards.txt | 8 + + .../devicetree/bindings/arm/samsung-boards.txt | 8 + + .../devicetree/bindings/dma/arm-pl330.txt | 30 + + .../devicetree/bindings/gpio/gpio-samsung.txt | 40 ++ + .../devicetree/bindings/input/samsung-keypad.txt | 88 +++ + Documentation/devicetree/bindings/rtc/s3c-rtc.txt | 20 + + .../devicetree/bindings/serial/samsung_uart.txt | 14 + + arch/arm/boot/dts/exynos4210-origen.dts | 137 +++++ + arch/arm/boot/dts/exynos4210-smdkv310.dts | 182 ++++++ + arch/arm/boot/dts/exynos4210.dtsi | 397 ++++++++++++ + arch/arm/mach-exynos/Kconfig | 24 + + arch/arm/mach-exynos/Makefile | 6 +- + arch/arm/mach-exynos/clock.c | 237 +++++--- + arch/arm/mach-exynos/cpu.c | 38 ++- + arch/arm/mach-exynos/dma.c | 264 ++++----- + arch/arm/mach-exynos/include/mach/io.h | 5 + + arch/arm/mach-exynos/include/mach/irqs.h | 10 +- + arch/arm/mach-exynos/include/mach/map.h | 3 +- + arch/arm/mach-exynos/init.c | 21 +- + arch/arm/mach-exynos/mach-exynos4-dt.c | 85 +++ + arch/arm/mach-exynos/mach-origen.c | 34 + + arch/arm/mach-exynos/mct.c | 13 +- + arch/arm/mach-exynos/pm.c | 24 +- + arch/arm/mach-exynos/setup-sdhci.c | 22 - + arch/arm/mach-s3c2410/mach-bast.c | 22 - + arch/arm/mach-s3c2410/mach-vr1000.c | 24 - + arch/arm/mach-s3c2410/s3c2410.c | 6 + + arch/arm/mach-s3c2412/clock.c | 7 + + arch/arm/mach-s3c2416/Makefile | 1 - + arch/arm/mach-s3c2416/clock.c | 68 ++- + arch/arm/mach-s3c2416/setup-sdhci.c | 24 - + arch/arm/mach-s3c2440/clock.c | 44 ++ + arch/arm/mach-s3c2440/mach-anubis.c | 22 +- + arch/arm/mach-s3c2440/mach-at2440evb.c | 22 +- + arch/arm/mach-s3c2440/mach-mini2440.c | 18 + + arch/arm/mach-s3c2440/mach-osiris.c | 24 +- + arch/arm/mach-s3c2440/mach-rx1950.c | 18 +- + arch/arm/mach-s3c2440/mach-rx3715.c | 19 +- + arch/arm/mach-s3c64xx/Kconfig | 6 +- + arch/arm/mach-s3c64xx/Makefile | 1 - + arch/arm/mach-s3c64xx/clock.c | 263 +++++--- + arch/arm/mach-s3c64xx/dev-spi.c | 7 - + arch/arm/mach-s3c64xx/include/mach/crag6410.h | 6 +- + arch/arm/mach-s3c64xx/include/mach/gpio.h | 2 +- + arch/arm/mach-s3c64xx/include/mach/irqs.h | 2 +- + arch/arm/mach-s3c64xx/mach-crag6410-module.c | 56 ++- + arch/arm/mach-s3c64xx/mach-crag6410.c | 39 ++- + arch/arm/mach-s3c64xx/pm.c | 15 + + arch/arm/mach-s3c64xx/setup-sdhci.c | 24 - + arch/arm/mach-s5p64x0/clock-s5p6440.c | 93 ++-- + arch/arm/mach-s5p64x0/clock-s5p6450.c | 81 ++- + arch/arm/mach-s5p64x0/dev-spi.c | 6 - + arch/arm/mach-s5p64x0/dma.c | 227 ++----- + arch/arm/mach-s5p64x0/include/mach/irqs.h | 2 + + arch/arm/mach-s5p64x0/init.c | 31 - + arch/arm/mach-s5pc100/Makefile | 1 - + arch/arm/mach-s5pc100/clock.c | 287 ++++++---- + arch/arm/mach-s5pc100/dev-spi.c | 7 - + arch/arm/mach-s5pc100/dma.c | 247 +++------ + arch/arm/mach-s5pc100/include/mach/irqs.h | 2 + + arch/arm/mach-s5pc100/setup-sdhci.c | 23 - + arch/arm/mach-s5pv210/Makefile | 1 - + arch/arm/mach-s5pv210/clock.c | 324 ++++++---- + arch/arm/mach-s5pv210/dev-spi.c | 6 - + arch/arm/mach-s5pv210/dma.c | 241 +++------ + arch/arm/mach-s5pv210/include/mach/irqs.h | 2 + + arch/arm/mach-s5pv210/init.c | 19 - + arch/arm/mach-s5pv210/mach-smdkv210.c | 1 + + arch/arm/mach-s5pv210/setup-sdhci.c | 22 - + arch/arm/plat-s3c24xx/dma.c | 3 +- + arch/arm/plat-s3c24xx/s3c2443-clock.c | 39 +- + arch/arm/plat-samsung/Kconfig | 8 + + arch/arm/plat-samsung/dev-backlight.c | 1 - + arch/arm/plat-samsung/dma-ops.c | 15 +- + arch/arm/plat-samsung/include/plat/dma-ops.h | 1 + + arch/arm/plat-samsung/include/plat/dma-pl330.h | 11 +- + arch/arm/plat-samsung/include/plat/irqs.h | 3 +- + arch/arm/plat-samsung/include/plat/regs-serial.h | 45 +- + arch/arm/plat-samsung/include/plat/s3c64xx-spi.h | 2 - + arch/arm/plat-samsung/include/plat/sdhci.h | 31 - + drivers/dma/pl330.c | 99 ++-- + drivers/gpio/gpio-samsung.c | 72 +++ + drivers/input/keyboard/samsung-keypad.c | 174 +++++- + drivers/mmc/host/sdhci-s3c.c | 7 +- + drivers/rtc/rtc-s3c.c | 21 +- + drivers/spi/spi-s3c64xx.c | 14 +- + drivers/tty/serial/Kconfig | 45 +-- + drivers/tty/serial/Makefile | 5 - + drivers/tty/serial/s3c2410.c | 115 ---- + drivers/tty/serial/s3c2412.c | 149 ----- + drivers/tty/serial/s3c2440.c | 178 ------ + drivers/tty/serial/s3c6400.c | 149 ----- + drivers/tty/serial/s5pv210.c | 158 ----- + drivers/tty/serial/samsung.c | 639 ++++++++++++-------- + drivers/tty/serial/samsung.h | 32 +- + include/linux/amba/pl330.h | 15 +- + 96 files changed, 3277 insertions(+), 2827 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/insignal-boards.txt + create mode 100644 Documentation/devicetree/bindings/arm/samsung-boards.txt + create mode 100644 Documentation/devicetree/bindings/dma/arm-pl330.txt + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-samsung.txt + create mode 100644 Documentation/devicetree/bindings/input/samsung-keypad.txt + create mode 100644 Documentation/devicetree/bindings/rtc/s3c-rtc.txt + create mode 100644 Documentation/devicetree/bindings/serial/samsung_uart.txt + create mode 100644 arch/arm/boot/dts/exynos4210-origen.dts + create mode 100644 arch/arm/boot/dts/exynos4210-smdkv310.dts + create mode 100644 arch/arm/boot/dts/exynos4210.dtsi + create mode 100644 arch/arm/mach-exynos/mach-exynos4-dt.c + delete mode 100644 arch/arm/mach-exynos/setup-sdhci.c + delete mode 100644 arch/arm/mach-s3c2416/setup-sdhci.c + delete mode 100644 arch/arm/mach-s3c64xx/setup-sdhci.c + delete mode 100644 arch/arm/mach-s5pc100/setup-sdhci.c + delete mode 100644 arch/arm/mach-s5pv210/setup-sdhci.c + delete mode 100644 drivers/tty/serial/s3c2410.c + delete mode 100644 drivers/tty/serial/s3c2412.c + delete mode 100644 drivers/tty/serial/s3c2440.c + delete mode 100644 drivers/tty/serial/s3c6400.c + delete mode 100644 drivers/tty/serial/s5pv210.c +Merging tegra/for-next (2e35cf8 Merge branch 'for-3.3/cleanup' into for-next) +$ git merge tegra/for-next +Resolved 'arch/arm/mach-tegra/board-dt.c' using previous resolution. +Resolved 'arch/arm/mach-tegra/include/mach/entry-macro.S' using previous resolution. +Auto-merging arch/arm/mach-tegra/include/mach/entry-macro.S +CONFLICT (content): Merge conflict in arch/arm/mach-tegra/include/mach/entry-macro.S +Auto-merging arch/arm/mach-tegra/board-paz00.c +Auto-merging arch/arm/mach-tegra/board-dt.c +CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-dt.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master abeb3e8] Merge remote-tracking branch 'tegra/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/usb/tegra-usb.txt | 13 ++++ + arch/arm/boot/dts/tegra-harmony.dts | 29 ++++++-- + arch/arm/boot/dts/tegra-paz00.dts | 77 ++++++++++++++++++++ + arch/arm/boot/dts/tegra-seaboard.dts | 49 +++++++++++-- + arch/arm/boot/dts/tegra-trimslice.dts | 65 +++++++++++++++++ + arch/arm/boot/dts/tegra-ventana.dts | 45 ++++++++++-- + arch/arm/boot/dts/tegra20.dtsi | 69 ++++++++++++------ + arch/arm/mach-tegra/Makefile | 28 ++++---- + arch/arm/mach-tegra/Makefile.boot | 2 + + arch/arm/mach-tegra/board-dt.c | 47 +++++++++---- + arch/arm/mach-tegra/board-paz00-pinmux.c | 2 +- + arch/arm/mach-tegra/board-paz00.c | 27 +++++++ + arch/arm/mach-tegra/board-paz00.h | 3 + + arch/arm/mach-tegra/include/mach/entry-macro.S | 20 +----- + arch/arm/mach-tegra/irq.c | 14 ++-- + arch/arm/mach-tegra/timer.c | 12 ++- + drivers/usb/host/ehci-tegra.c | 71 ++++++++++++++++++ + 17 files changed, 478 insertions(+), 95 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/tegra-usb.txt + create mode 100644 arch/arm/boot/dts/tegra-paz00.dts + create mode 100644 arch/arm/boot/dts/tegra-trimslice.dts +Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support) +$ git merge xilinx/arm-next +Already up-to-date. +Merging blackfin/for-linus (e5fd47b xen/pm_idle: Make pm_idle be default_idle under Xen.) +$ git merge blackfin/for-linus +Already up-to-date. +Merging c6x/for-linux-next (2141355 C6X: MAINTAINERS) +$ git merge c6x/for-linux-next +Auto-merging include/asm-generic/page.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/c6x/clocks.txt | 40 + + Documentation/devicetree/bindings/c6x/dscr.txt | 127 +++ + Documentation/devicetree/bindings/c6x/emifa.txt | 62 ++ + .../devicetree/bindings/c6x/interrupt.txt | 104 +++ + Documentation/devicetree/bindings/c6x/soc.txt | 28 + + Documentation/devicetree/bindings/c6x/timer64.txt | 26 + + MAINTAINERS | 8 + + arch/c6x/Kconfig | 174 +++++ + arch/c6x/Makefile | 60 ++ + arch/c6x/boot/Makefile | 30 + + arch/c6x/boot/dts/dsk6455.dts | 62 ++ + arch/c6x/boot/dts/evmc6457.dts | 48 ++ + arch/c6x/boot/dts/evmc6472.dts | 73 ++ + arch/c6x/boot/dts/evmc6474.dts | 58 ++ + arch/c6x/boot/dts/tms320c6455.dtsi | 96 +++ + arch/c6x/boot/dts/tms320c6457.dtsi | 68 ++ + arch/c6x/boot/dts/tms320c6472.dtsi | 134 ++++ + arch/c6x/boot/dts/tms320c6474.dtsi | 89 +++ + arch/c6x/boot/linked_dtb.S | 2 + + arch/c6x/configs/dsk6455_defconfig | 44 ++ + arch/c6x/configs/evmc6457_defconfig | 41 + + arch/c6x/configs/evmc6472_defconfig | 42 + + arch/c6x/configs/evmc6474_defconfig | 42 + + arch/c6x/include/asm/Kbuild | 54 ++ + arch/c6x/include/asm/asm-offsets.h | 1 + + arch/c6x/include/asm/bitops.h | 105 +++ + arch/c6x/include/asm/byteorder.h | 12 + + arch/c6x/include/asm/cache.h | 90 +++ + arch/c6x/include/asm/cacheflush.h | 65 ++ + arch/c6x/include/asm/checksum.h | 34 + + arch/c6x/include/asm/clkdev.h | 22 + + arch/c6x/include/asm/clock.h | 148 ++++ + arch/c6x/include/asm/delay.h | 67 ++ + arch/c6x/include/asm/dma-mapping.h | 91 +++ + arch/c6x/include/asm/dscr.h | 34 + + arch/c6x/include/asm/elf.h | 113 +++ + arch/c6x/include/asm/ftrace.h | 6 + + arch/c6x/include/asm/hardirq.h | 20 + + arch/c6x/include/asm/irq.h | 302 ++++++++ + arch/c6x/include/asm/irqflags.h | 72 ++ + arch/c6x/include/asm/linkage.h | 30 + + arch/c6x/include/asm/megamod-pic.h | 9 + + arch/c6x/include/asm/memblock.h | 4 + + arch/c6x/include/asm/mmu.h | 18 + + arch/c6x/include/asm/module.h | 33 + + arch/c6x/include/asm/mutex.h | 6 + + arch/c6x/include/asm/page.h | 11 + + arch/c6x/include/asm/pgtable.h | 81 ++ + arch/c6x/include/asm/processor.h | 132 ++++ + arch/c6x/include/asm/procinfo.h | 28 + + arch/c6x/include/asm/prom.h | 1 + + arch/c6x/include/asm/ptrace.h | 174 +++++ + arch/c6x/include/asm/sections.h | 12 + + arch/c6x/include/asm/setup.h | 32 + + arch/c6x/include/asm/sigcontext.h | 80 ++ + arch/c6x/include/asm/signal.h | 17 + + arch/c6x/include/asm/soc.h | 35 + + arch/c6x/include/asm/string.h | 21 + + arch/c6x/include/asm/swab.h | 54 ++ + arch/c6x/include/asm/syscall.h | 123 +++ + arch/c6x/include/asm/syscalls.h | 55 ++ + arch/c6x/include/asm/system.h | 168 ++++ + arch/c6x/include/asm/thread_info.h | 121 +++ + arch/c6x/include/asm/timer64.h | 6 + + arch/c6x/include/asm/timex.h | 33 + + arch/c6x/include/asm/tlb.h | 8 + + arch/c6x/include/asm/traps.h | 36 + + arch/c6x/include/asm/uaccess.h | 107 +++ + arch/c6x/include/asm/unaligned.h | 170 +++++ + arch/c6x/include/asm/unistd.h | 26 + + arch/c6x/kernel/Makefile | 12 + + arch/c6x/kernel/asm-offsets.c | 123 +++ + arch/c6x/kernel/c6x_ksyms.c | 66 ++ + arch/c6x/kernel/devicetree.c | 53 ++ + arch/c6x/kernel/dma.c | 153 ++++ + arch/c6x/kernel/entry.S | 803 ++++++++++++++++++++ + arch/c6x/kernel/head.S | 84 ++ + arch/c6x/kernel/irq.c | 728 ++++++++++++++++++ + arch/c6x/kernel/module.c | 123 +++ + arch/c6x/kernel/process.c | 263 +++++++ + arch/c6x/kernel/ptrace.c | 187 +++++ + arch/c6x/kernel/setup.c | 498 ++++++++++++ + arch/c6x/kernel/signal.c | 377 +++++++++ + arch/c6x/kernel/soc.c | 91 +++ + arch/c6x/kernel/switch_to.S | 74 ++ + arch/c6x/kernel/sys_c6x.c | 74 ++ + arch/c6x/kernel/time.c | 65 ++ + arch/c6x/kernel/traps.c | 423 ++++++++++ + arch/c6x/kernel/vectors.S | 81 ++ + arch/c6x/kernel/vmlinux.lds.S | 162 ++++ + arch/c6x/lib/Makefile | 7 + + arch/c6x/lib/checksum.c | 36 + + arch/c6x/lib/csum_64plus.S | 419 ++++++++++ + arch/c6x/lib/divi.S | 53 ++ + arch/c6x/lib/divremi.S | 46 ++ + arch/c6x/lib/divremu.S | 87 +++ + arch/c6x/lib/divu.S | 98 +++ + arch/c6x/lib/llshl.S | 37 + + arch/c6x/lib/llshr.S | 38 + + arch/c6x/lib/llshru.S | 38 + + arch/c6x/lib/memcpy_64plus.S | 46 ++ + arch/c6x/lib/mpyll.S | 49 ++ + arch/c6x/lib/negll.S | 31 + + arch/c6x/lib/pop_rts.S | 32 + + arch/c6x/lib/push_rts.S | 31 + + arch/c6x/lib/remi.S | 64 ++ + arch/c6x/lib/remu.S | 82 ++ + arch/c6x/lib/strasgi.S | 89 +++ + arch/c6x/lib/strasgi_64plus.S | 39 + + arch/c6x/mm/Makefile | 5 + + arch/c6x/mm/dma-coherent.c | 143 ++++ + arch/c6x/mm/init.c | 113 +++ + arch/c6x/platforms/Kconfig | 16 + + arch/c6x/platforms/Makefile | 12 + + arch/c6x/platforms/cache.c | 445 +++++++++++ + arch/c6x/platforms/dscr.c | 598 +++++++++++++++ + arch/c6x/platforms/emif.c | 88 +++ + arch/c6x/platforms/megamod-pic.c | 349 +++++++++ + arch/c6x/platforms/platform.c | 17 + + arch/c6x/platforms/pll.c | 444 +++++++++++ + arch/c6x/platforms/plldata.c | 404 ++++++++++ + arch/c6x/platforms/timer64.c | 236 ++++++ + include/asm-generic/io.h | 2 +- + include/asm-generic/page.h | 10 +- + include/asm-generic/uaccess.h | 7 +- + include/linux/elf-em.h | 1 + + 126 files changed, 12972 insertions(+), 5 deletions(-) + create mode 100644 Documentation/devicetree/bindings/c6x/clocks.txt + create mode 100644 Documentation/devicetree/bindings/c6x/dscr.txt + create mode 100644 Documentation/devicetree/bindings/c6x/emifa.txt + create mode 100644 Documentation/devicetree/bindings/c6x/interrupt.txt + create mode 100644 Documentation/devicetree/bindings/c6x/soc.txt + create mode 100644 Documentation/devicetree/bindings/c6x/timer64.txt + create mode 100644 arch/c6x/Kconfig + create mode 100644 arch/c6x/Makefile + create mode 100644 arch/c6x/boot/Makefile + create mode 100644 arch/c6x/boot/dts/dsk6455.dts + create mode 100644 arch/c6x/boot/dts/evmc6457.dts + create mode 100644 arch/c6x/boot/dts/evmc6472.dts + create mode 100644 arch/c6x/boot/dts/evmc6474.dts + create mode 100644 arch/c6x/boot/dts/tms320c6455.dtsi + create mode 100644 arch/c6x/boot/dts/tms320c6457.dtsi + create mode 100644 arch/c6x/boot/dts/tms320c6472.dtsi + create mode 100644 arch/c6x/boot/dts/tms320c6474.dtsi + create mode 100644 arch/c6x/boot/linked_dtb.S + create mode 100644 arch/c6x/configs/dsk6455_defconfig + create mode 100644 arch/c6x/configs/evmc6457_defconfig + create mode 100644 arch/c6x/configs/evmc6472_defconfig + create mode 100644 arch/c6x/configs/evmc6474_defconfig + create mode 100644 arch/c6x/include/asm/Kbuild + create mode 100644 arch/c6x/include/asm/asm-offsets.h + create mode 100644 arch/c6x/include/asm/bitops.h + create mode 100644 arch/c6x/include/asm/byteorder.h + create mode 100644 arch/c6x/include/asm/cache.h + create mode 100644 arch/c6x/include/asm/cacheflush.h + create mode 100644 arch/c6x/include/asm/checksum.h + create mode 100644 arch/c6x/include/asm/clkdev.h + create mode 100644 arch/c6x/include/asm/clock.h + create mode 100644 arch/c6x/include/asm/delay.h + create mode 100644 arch/c6x/include/asm/dma-mapping.h + create mode 100644 arch/c6x/include/asm/dscr.h + create mode 100644 arch/c6x/include/asm/elf.h + create mode 100644 arch/c6x/include/asm/ftrace.h + create mode 100644 arch/c6x/include/asm/hardirq.h + create mode 100644 arch/c6x/include/asm/irq.h + create mode 100644 arch/c6x/include/asm/irqflags.h + create mode 100644 arch/c6x/include/asm/linkage.h + create mode 100644 arch/c6x/include/asm/megamod-pic.h + create mode 100644 arch/c6x/include/asm/memblock.h + create mode 100644 arch/c6x/include/asm/mmu.h + create mode 100644 arch/c6x/include/asm/module.h + create mode 100644 arch/c6x/include/asm/mutex.h + create mode 100644 arch/c6x/include/asm/page.h + create mode 100644 arch/c6x/include/asm/pgtable.h + create mode 100644 arch/c6x/include/asm/processor.h + create mode 100644 arch/c6x/include/asm/procinfo.h + create mode 100644 arch/c6x/include/asm/prom.h + create mode 100644 arch/c6x/include/asm/ptrace.h + create mode 100644 arch/c6x/include/asm/sections.h + create mode 100644 arch/c6x/include/asm/setup.h + create mode 100644 arch/c6x/include/asm/sigcontext.h + create mode 100644 arch/c6x/include/asm/signal.h + create mode 100644 arch/c6x/include/asm/soc.h + create mode 100644 arch/c6x/include/asm/string.h + create mode 100644 arch/c6x/include/asm/swab.h + create mode 100644 arch/c6x/include/asm/syscall.h + create mode 100644 arch/c6x/include/asm/syscalls.h + create mode 100644 arch/c6x/include/asm/system.h + create mode 100644 arch/c6x/include/asm/thread_info.h + create mode 100644 arch/c6x/include/asm/timer64.h + create mode 100644 arch/c6x/include/asm/timex.h + create mode 100644 arch/c6x/include/asm/tlb.h + create mode 100644 arch/c6x/include/asm/traps.h + create mode 100644 arch/c6x/include/asm/uaccess.h + create mode 100644 arch/c6x/include/asm/unaligned.h + create mode 100644 arch/c6x/include/asm/unistd.h + create mode 100644 arch/c6x/kernel/Makefile + create mode 100644 arch/c6x/kernel/asm-offsets.c + create mode 100644 arch/c6x/kernel/c6x_ksyms.c + create mode 100644 arch/c6x/kernel/devicetree.c + create mode 100644 arch/c6x/kernel/dma.c + create mode 100644 arch/c6x/kernel/entry.S + create mode 100644 arch/c6x/kernel/head.S + create mode 100644 arch/c6x/kernel/irq.c + create mode 100644 arch/c6x/kernel/module.c + create mode 100644 arch/c6x/kernel/process.c + create mode 100644 arch/c6x/kernel/ptrace.c + create mode 100644 arch/c6x/kernel/setup.c + create mode 100644 arch/c6x/kernel/signal.c + create mode 100644 arch/c6x/kernel/soc.c + create mode 100644 arch/c6x/kernel/switch_to.S + create mode 100644 arch/c6x/kernel/sys_c6x.c + create mode 100644 arch/c6x/kernel/time.c + create mode 100644 arch/c6x/kernel/traps.c + create mode 100644 arch/c6x/kernel/vectors.S + create mode 100644 arch/c6x/kernel/vmlinux.lds.S + create mode 100644 arch/c6x/lib/Makefile + create mode 100644 arch/c6x/lib/checksum.c + create mode 100644 arch/c6x/lib/csum_64plus.S + create mode 100644 arch/c6x/lib/divi.S + create mode 100644 arch/c6x/lib/divremi.S + create mode 100644 arch/c6x/lib/divremu.S + create mode 100644 arch/c6x/lib/divu.S + create mode 100644 arch/c6x/lib/llshl.S + create mode 100644 arch/c6x/lib/llshr.S + create mode 100644 arch/c6x/lib/llshru.S + create mode 100644 arch/c6x/lib/memcpy_64plus.S + create mode 100644 arch/c6x/lib/mpyll.S + create mode 100644 arch/c6x/lib/negll.S + create mode 100644 arch/c6x/lib/pop_rts.S + create mode 100644 arch/c6x/lib/push_rts.S + create mode 100644 arch/c6x/lib/remi.S + create mode 100644 arch/c6x/lib/remu.S + create mode 100644 arch/c6x/lib/strasgi.S + create mode 100644 arch/c6x/lib/strasgi_64plus.S + create mode 100644 arch/c6x/mm/Makefile + create mode 100644 arch/c6x/mm/dma-coherent.c + create mode 100644 arch/c6x/mm/init.c + create mode 100644 arch/c6x/platforms/Kconfig + create mode 100644 arch/c6x/platforms/Makefile + create mode 100644 arch/c6x/platforms/cache.c + create mode 100644 arch/c6x/platforms/dscr.c + create mode 100644 arch/c6x/platforms/emif.c + create mode 100644 arch/c6x/platforms/megamod-pic.c + create mode 100644 arch/c6x/platforms/platform.c + create mode 100644 arch/c6x/platforms/pll.c + create mode 100644 arch/c6x/platforms/plldata.c + create mode 100644 arch/c6x/platforms/timer64.c +Merging cris/for-next (ea78f5b CRIS: Update documentation) +$ git merge cris/for-next +Auto-merging drivers/net/cris/eth_v10.c +Auto-merging arch/cris/arch-v32/drivers/cryptocop.c +Merge made by the 'recursive' strategy. + Documentation/cris/README | 62 +++++++++++++++--------------- + arch/cris/arch-v32/drivers/cryptocop.c | 6 +-- + arch/cris/arch-v32/kernel/ptrace.c | 2 - + arch/cris/include/arch-v32/arch/cache.h | 2 +- + drivers/net/cris/eth_v10.c | 1 - + 5 files changed, 34 insertions(+), 39 deletions(-) +Merging quilt/hexagon (110b372 Remove unneeded include of version.h from arch/hexagon/include/asm/spinlock_types.h) +$ git merge quilt/hexagon +Merge made by the 'recursive' strategy. + arch/hexagon/Kconfig | 23 ++++------------------- + arch/hexagon/Makefile | 4 ---- + arch/hexagon/include/asm/spinlock_types.h | 2 -- + arch/hexagon/kernel/dma.c | 1 + + arch/hexagon/kernel/ptrace.c | 1 + + arch/hexagon/kernel/time.c | 7 +++---- + arch/hexagon/kernel/vdso.c | 1 + + 7 files changed, 10 insertions(+), 29 deletions(-) +Merging ia64/next (2174f6d pstore: gracefully handle NULL pstore_info functions) +$ git merge ia64/next +Auto-merging drivers/firmware/efivars.c +Merge made by the 'recursive' strategy. + drivers/acpi/apei/erst.c | 6 ++++-- + drivers/firmware/efivars.c | 8 +++++--- + fs/pstore/inode.c | 3 ++- + fs/pstore/platform.c | 36 ++++-------------------------------- + include/linux/pstore.h | 12 +++++------- + 5 files changed, 20 insertions(+), 45 deletions(-) +Merging m68k/for-next (0c51a0c m68k: Don't comment out syscalls used by glibc) +$ git merge m68k/for-next +Merge made by the 'recursive' strategy. + arch/m68k/Kconfig.debug | 11 ++ + arch/m68k/Kconfig.devices | 2 +- + arch/m68k/atari/ataints.c | 2 - + arch/m68k/atari/debug.c | 1 - + arch/m68k/configs/multi_defconfig | 1 - + arch/m68k/configs/mvme16x_defconfig | 1 - + arch/m68k/emu/nfeth.c | 2 +- + arch/m68k/hp300/config.c | 3 +- + arch/m68k/include/asm/atarihw.h | 2 + + arch/m68k/include/asm/blinken.h | 8 +- + arch/m68k/include/asm/mac_baboon.h | 6 + + arch/m68k/include/asm/mac_iop.h | 2 + + arch/m68k/include/asm/mac_oss.h | 23 +--- + arch/m68k/include/asm/mac_psc.h | 4 + + arch/m68k/include/asm/mac_via.h | 9 ++ + arch/m68k/include/asm/macintosh.h | 10 +- + arch/m68k/include/asm/macints.h | 6 +- + arch/m68k/include/asm/serial.h | 2 + + arch/m68k/include/asm/unistd.h | 10 +- + arch/m68k/kernel/head.S | 117 ++++++++-------- + arch/m68k/mac/baboon.c | 41 +----- + arch/m68k/mac/config.c | 93 +++++++++----- + arch/m68k/mac/iop.c | 8 +- + arch/m68k/mac/macints.c | 197 +++++++-------------------- + arch/m68k/mac/oss.c | 157 +++++++-------------- + arch/m68k/mac/psc.c | 17 --- + arch/m68k/mac/via.c | 255 +++++++++++++++++------------------ + arch/m68k/mvme16x/config.c | 160 ++++++++++++++++++++++ + drivers/block/swim.c | 1 - + drivers/scsi/mac_esp.c | 3 +- + 30 files changed, 574 insertions(+), 580 deletions(-) +Merging m68knommu/for-next (4a7c080 m68knommu: remove unused anchor.h include file) +$ git merge m68knommu/for-next +Resolved 'arch/m68k/Kconfig.debug' using previous resolution. +Removing arch/m68k/lib/checksum_no.c +Removing arch/m68k/include/asm/anchor.h +Auto-merging arch/m68k/Kconfig.debug +CONFLICT (content): Merge conflict in arch/m68k/Kconfig.debug +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master de57a6f] Merge remote-tracking branch 'm68knommu/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/m68k/Kconfig | 7 +- + arch/m68k/Kconfig.cpu | 8 ++ + arch/m68k/Kconfig.debug | 16 ++-- + arch/m68k/include/asm/anchor.h | 112 ------------------- + arch/m68k/include/asm/checksum.h | 31 +----- + arch/m68k/include/asm/div64.h | 8 +- + arch/m68k/include/asm/gpio.h | 3 +- + arch/m68k/include/asm/processor.h | 2 - + arch/m68k/include/asm/sigcontext.h | 4 - + arch/m68k/include/asm/thread_info.h | 30 ----- + arch/m68k/include/asm/traps.h | 1 + + arch/m68k/include/asm/ucontext.h | 4 - + arch/m68k/kernel/Makefile | 7 +- + arch/m68k/kernel/asm-offsets.c | 3 +- + arch/m68k/kernel/entry_mm.S | 31 ++++-- + arch/m68k/kernel/entry_no.S | 6 - + arch/m68k/kernel/init_task.c | 3 +- + arch/m68k/kernel/m68k_ksyms.c | 2 +- + arch/m68k/kernel/process_mm.c | 16 --- + arch/m68k/kernel/setup_mm.c | 4 + + arch/m68k/kernel/setup_no.c | 1 - + arch/m68k/kernel/time_no.c | 3 + + arch/m68k/kernel/vmlinux-std.lds | 2 + + arch/m68k/kernel/vmlinux-sun3.lds | 2 + + arch/m68k/lib/Makefile | 10 +- + arch/m68k/lib/{checksum_mm.c => checksum.c} | 0 + arch/m68k/lib/checksum_no.c | 156 --------------------------- + arch/m68k/mm/init_mm.c | 34 ++++++ + arch/m68k/platform/68328/timers.c | 4 +- + arch/m68k/platform/coldfire/dma_timer.c | 5 +- + arch/m68k/platform/coldfire/entry.S | 1 - + arch/m68k/platform/coldfire/head.S | 6 +- + arch/m68k/platform/coldfire/pit.c | 4 +- + arch/m68k/platform/coldfire/sltimers.c | 13 ++- + arch/m68k/platform/coldfire/timers.c | 4 +- + 35 files changed, 125 insertions(+), 418 deletions(-) + delete mode 100644 arch/m68k/include/asm/anchor.h + rename arch/m68k/lib/{checksum_mm.c => checksum.c} (100%) + delete mode 100644 arch/m68k/lib/checksum_no.c +Merging microblaze/next (7f80850 Merge branch 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (1fc140c Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/cavium', 'next/generic', 'next/kprobes', 'next/lantiq', 'next/perf' and 'next/raza' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Auto-merging drivers/tty/serial/Makefile +Auto-merging drivers/tty/serial/Kconfig +Removing drivers/staging/octeon/cvmx-smix-defs.h +Removing drivers/staging/octeon/cvmx-packet.h +Auto-merging drivers/spi/Kconfig +Removing drivers/pcmcia/au1000_pb1x00.c +Removing drivers/pcmcia/au1000_generic.h +Removing drivers/pcmcia/au1000_generic.c +Removing drivers/net/irda/au1000_ircc.h +Auto-merging arch/mips/netlogic/xlr/wakeup.c +Removing arch/mips/netlogic/xlr/irq.c +Auto-merging arch/mips/netlogic/common/time.c +Auto-merging arch/mips/netlogic/common/smp.c +Auto-merging arch/mips/kernel/perf_event_mipsxx.c +CONFLICT (content): Merge conflict in arch/mips/kernel/perf_event_mipsxx.c +Auto-merging arch/mips/include/asm/octeon/cvmx-helper.h +Auto-merging arch/mips/include/asm/octeon/cvmx-helper-xaui.h +Auto-merging arch/mips/include/asm/octeon/cvmx-helper-spi.h +Auto-merging arch/mips/include/asm/octeon/cvmx-helper-sgmii.h +Auto-merging arch/mips/include/asm/octeon/cvmx-helper-rgmii.h +Auto-merging arch/mips/include/asm/octeon/cvmx-helper-npi.h +Auto-merging arch/mips/include/asm/octeon/cvmx-helper-loop.h +Auto-merging arch/mips/include/asm/octeon/cvmx-helper-board.h +Auto-merging arch/mips/include/asm/octeon/cvmx-config.h +Auto-merging arch/mips/include/asm/netlogic/xlp-hal/xlp.h +Removing arch/mips/include/asm/mach-pb1x00/pb1550.h +Removing arch/mips/include/asm/mach-pb1x00/pb1200.h +Removing arch/mips/include/asm/mach-pb1x00/pb1000.h +Removing arch/mips/include/asm/mach-pb1x00/mc146818rtc.h +Removing arch/mips/include/asm/mach-db1x00/db1x00.h +Removing arch/mips/configs/pb1200_defconfig +Removing arch/mips/configs/db1500_defconfig +Removing arch/mips/configs/db1100_defconfig +Auto-merging arch/mips/cavium-octeon/executive/cvmx-spi.c +Auto-merging arch/mips/cavium-octeon/executive/cvmx-pko.c +Auto-merging arch/mips/cavium-octeon/executive/cvmx-interrupt-rsl.c +Auto-merging arch/mips/cavium-octeon/executive/cvmx-interrupt-decodes.c +Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper.c +Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c +Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-util.c +Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-spi.c +Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c +Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-rgmii.c +Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-npi.c +Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-loop.c +Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-board.c +Auto-merging arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c +Auto-merging arch/mips/ath79/dev-usb.h +Removing arch/mips/ath79/dev-ar913x-wmac.c +Removing arch/mips/alchemy/xxs1500/platform.c +Removing arch/mips/alchemy/xxs1500/init.c +Removing arch/mips/alchemy/xxs1500/board_setup.c +Removing arch/mips/alchemy/xxs1500/Makefile +Removing arch/mips/alchemy/mtx-1/init.c +Removing arch/mips/alchemy/mtx-1/board_setup.c +Removing arch/mips/alchemy/mtx-1/Makefile +Removing arch/mips/alchemy/gpr/init.c +Removing arch/mips/alchemy/gpr/board_setup.c +Removing arch/mips/alchemy/gpr/Makefile +Removing arch/mips/alchemy/devboards/pb1550/board_setup.c +Removing arch/mips/alchemy/devboards/pb1550/Makefile +Auto-merging arch/mips/alchemy/devboards/pb1550.c +Removing arch/mips/alchemy/devboards/pb1500/platform.c +Removing arch/mips/alchemy/devboards/pb1500/Makefile +Auto-merging arch/mips/alchemy/devboards/pb1500.c +Removing arch/mips/alchemy/devboards/pb1200/platform.c +Removing arch/mips/alchemy/devboards/pb1200/board_setup.c +Removing arch/mips/alchemy/devboards/pb1200/Makefile +Removing arch/mips/alchemy/devboards/pb1100/platform.c +Removing arch/mips/alchemy/devboards/pb1100/Makefile +Auto-merging arch/mips/alchemy/devboards/pb1100.c +Removing arch/mips/alchemy/devboards/pb1000/board_setup.c +Removing arch/mips/alchemy/devboards/pb1000/Makefile +Removing arch/mips/alchemy/devboards/db1x00/platform.c +Removing arch/mips/alchemy/devboards/db1x00/board_setup.c +Removing arch/mips/alchemy/devboards/db1x00/Makefile +Removing arch/mips/alchemy/devboards/db1200/setup.c +Removing arch/mips/alchemy/devboarResolved 'arch/mips/kernel/perf_event_mipsxx.c' using previous resolution. +ds/db1200/Makefile +Auto-merging arch/mips/alchemy/devboards/db1200.c +Auto-merging arch/mips/alchemy/board-mtx1.c +Auto-merging arch/mips/alchemy/board-gpr.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c38d489] Merge remote-tracking branch 'mips/mips-for-linux-next' +$ git diff -M --stat --summary HEAD^.. + arch/mips/Kconfig | 84 +- + arch/mips/Makefile | 1 + + arch/mips/alchemy/Kconfig | 60 +- + arch/mips/alchemy/Makefile | 3 + + arch/mips/alchemy/Platform | 58 +- + arch/mips/alchemy/{gpr/platform.c => board-gpr.c} | 81 +- + .../alchemy/{mtx-1/platform.c => board-mtx1.c} | 93 +- + arch/mips/alchemy/board-xxs1500.c | 154 ++ + arch/mips/alchemy/common/Makefile | 4 +- + arch/mips/alchemy/common/dbdma.c | 49 +- + arch/mips/alchemy/common/gpiolib.c | 42 + + arch/mips/alchemy/common/irq.c | 875 ++++++--- + arch/mips/alchemy/common/platform.c | 31 +- + arch/mips/alchemy/common/power.c | 3 + + arch/mips/alchemy/common/sleeper.S | 73 + + arch/mips/alchemy/common/time.c | 3 +- + arch/mips/alchemy/common/vss.c | 84 + + arch/mips/alchemy/devboards/Makefile | 19 +- + arch/mips/alchemy/devboards/bcsr.c | 11 +- + arch/mips/alchemy/devboards/db1000.c | 565 +++++ + .../devboards/{db1200/platform.c => db1200.c} | 401 +++- + arch/mips/alchemy/devboards/db1200/Makefile | 1 - + arch/mips/alchemy/devboards/db1200/setup.c | 81 - + arch/mips/alchemy/devboards/db1300.c | 785 +++++++ + arch/mips/alchemy/devboards/db1550.c | 498 +++++ + arch/mips/alchemy/devboards/db1x00/Makefile | 8 - + arch/mips/alchemy/devboards/db1x00/board_setup.c | 229 -- + arch/mips/alchemy/devboards/db1x00/platform.c | 316 --- + arch/mips/alchemy/devboards/pb1000/Makefile | 8 - + arch/mips/alchemy/devboards/pb1000/board_setup.c | 209 -- + .../devboards/{pb1100/board_setup.c => pb1100.c} | 92 +- + arch/mips/alchemy/devboards/pb1100/Makefile | 8 - + arch/mips/alchemy/devboards/pb1100/platform.c | 77 - + arch/mips/alchemy/devboards/pb1200/Makefile | 5 - + arch/mips/alchemy/devboards/pb1200/board_setup.c | 174 -- + arch/mips/alchemy/devboards/pb1200/platform.c | 339 --- + .../devboards/{pb1500/board_setup.c => pb1500.c} | 113 +- + arch/mips/alchemy/devboards/pb1500/Makefile | 8 - + arch/mips/alchemy/devboards/pb1500/platform.c | 94 - + .../devboards/{pb1550/platform.c => pb1550.c} | 112 +- + arch/mips/alchemy/devboards/pb1550/Makefile | 8 - + arch/mips/alchemy/devboards/pb1550/board_setup.c | 80 - + arch/mips/alchemy/devboards/platform.c | 13 +- + arch/mips/alchemy/devboards/prom.c | 11 +- + arch/mips/alchemy/gpr/Makefile | 8 - + arch/mips/alchemy/gpr/board_setup.c | 75 - + arch/mips/alchemy/gpr/init.c | 63 - + arch/mips/alchemy/mtx-1/Makefile | 9 - + arch/mips/alchemy/mtx-1/board_setup.c | 94 - + arch/mips/alchemy/mtx-1/init.c | 66 - + arch/mips/alchemy/xxs1500/Makefile | 8 - + arch/mips/alchemy/xxs1500/board_setup.c | 93 - + arch/mips/alchemy/xxs1500/init.c | 63 - + arch/mips/alchemy/xxs1500/platform.c | 63 - + arch/mips/ar7/gpio.c | 2 +- + arch/mips/ar7/platform.c | 39 +- + arch/mips/ar7/prom.c | 4 +- + arch/mips/ar7/setup.c | 2 +- + arch/mips/ath79/Kconfig | 38 +- + arch/mips/ath79/Makefile | 5 +- + arch/mips/ath79/clock.c | 55 + + arch/mips/ath79/common.c | 5 + + arch/mips/ath79/dev-ar913x-wmac.c | 60 - + arch/mips/ath79/dev-common.c | 38 +- + arch/mips/ath79/dev-usb.c | 197 ++ + arch/mips/ath79/{dev-ar913x-wmac.h => dev-usb.h} | 10 +- + arch/mips/ath79/dev-wmac.c | 109 + + arch/mips/ath79/dev-wmac.h | 17 + + arch/mips/ath79/early_printk.c | 76 +- + arch/mips/ath79/gpio.c | 2 + + arch/mips/ath79/irq.c | 17 +- + arch/mips/ath79/mach-ap121.c | 92 + + arch/mips/ath79/mach-ap81.c | 6 +- + arch/mips/ath79/mach-pb44.c | 2 + + arch/mips/ath79/mach-ubnt-xm.c | 119 ++ + arch/mips/ath79/machtypes.h | 2 + + arch/mips/ath79/setup.c | 22 +- + arch/mips/bcm47xx/setup.c | 4 +- + arch/mips/bcm63xx/Kconfig | 4 + + arch/mips/bcm63xx/boards/board_bcm963xx.c | 46 +- + arch/mips/bcm63xx/clk.c | 70 +- + arch/mips/bcm63xx/cpu.c | 261 +-- + arch/mips/bcm63xx/dev-uart.c | 2 +- + arch/mips/bcm63xx/gpio.c | 41 +- + arch/mips/bcm63xx/irq.c | 403 +++- + arch/mips/bcm63xx/prom.c | 7 +- + arch/mips/bcm63xx/setup.c | 32 +- + arch/mips/boot/compressed/uart-alchemy.c | 5 +- + arch/mips/cavium-octeon/Kconfig | 4 - + arch/mips/cavium-octeon/dma-octeon.c | 23 +- + arch/mips/cavium-octeon/executive/Makefile | 7 +- + .../mips/cavium-octeon/executive}/cvmx-cmd-queue.c | 8 +- + .../mips/cavium-octeon/executive}/cvmx-fpa.c | 0 + .../cavium-octeon/executive}/cvmx-helper-board.c | 38 +- + .../cavium-octeon/executive}/cvmx-helper-fpa.c | 0 + .../cavium-octeon/executive}/cvmx-helper-loop.c | 6 +- + .../cavium-octeon/executive}/cvmx-helper-npi.c | 6 +- + .../cavium-octeon/executive}/cvmx-helper-rgmii.c | 17 +- + .../cavium-octeon/executive}/cvmx-helper-sgmii.c | 18 +- + .../cavium-octeon/executive}/cvmx-helper-spi.c | 20 +- + .../cavium-octeon/executive}/cvmx-helper-util.c | 16 +- + .../cavium-octeon/executive}/cvmx-helper-xaui.c | 32 +- + .../mips/cavium-octeon/executive}/cvmx-helper.c | 120 +- + .../executive}/cvmx-interrupt-decodes.c | 10 +- + .../cavium-octeon/executive}/cvmx-interrupt-rsl.c | 4 +- + .../mips/cavium-octeon/executive}/cvmx-pko.c | 8 +- + .../mips/cavium-octeon/executive}/cvmx-spi.c | 12 +- + arch/mips/cavium-octeon/executive/octeon-model.c | 119 +- + arch/mips/cavium-octeon/setup.c | 14 +- + arch/mips/cavium-octeon/smp.c | 2 +- + arch/mips/configs/db1000_defconfig | 369 +++- + arch/mips/configs/db1100_defconfig | 122 -- + arch/mips/configs/db1300_defconfig | 391 ++++ + arch/mips/configs/db1500_defconfig | 128 -- + arch/mips/configs/db1550_defconfig | 288 ++- + arch/mips/configs/nlm_xlp_defconfig | 570 +++++ + arch/mips/configs/nlm_xlr_defconfig | 16 +- + arch/mips/configs/pb1200_defconfig | 170 -- + arch/mips/dec/setup.c | 1 - + arch/mips/include/asm/bmips.h | 110 + + arch/mips/include/asm/bootinfo.h | 1 + + arch/mips/include/asm/branch.h | 5 + + arch/mips/include/asm/cpu.h | 6 +- + arch/mips/include/asm/gio_device.h | 56 + + arch/mips/include/asm/hazards.h | 7 +- + arch/mips/include/asm/hugetlb.h | 2 +- + arch/mips/include/asm/kprobes.h | 5 + + arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 81 +- + arch/mips/include/asm/mach-ath79/ar933x_uart.h | 67 + + .../include/asm/mach-ath79/ar933x_uart_platform.h | 18 + + arch/mips/include/asm/mach-ath79/ath79.h | 11 +- + arch/mips/include/asm/mach-ath79/irq.h | 8 +- + arch/mips/include/asm/mach-ath79/pci-ath724x.h | 21 + + arch/mips/include/asm/mach-au1x00/au1000.h | 273 ++- + arch/mips/include/asm/mach-au1x00/au1100_mmc.h | 2 + + arch/mips/include/asm/mach-au1x00/au1200fb.h | 14 + + arch/mips/include/asm/mach-au1x00/au1550nd.h | 16 + + arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h | 31 + + .../asm/mach-au1x00/cpu-feature-overrides.h | 3 + + arch/mips/include/asm/mach-au1x00/gpio-au1300.h | 241 +++ + arch/mips/include/asm/mach-au1x00/gpio.h | 3 + + arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 597 ++++-- + arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h | 2 + + arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h | 2 + + arch/mips/include/asm/mach-bcm63xx/bcm63xx_irq.h | 12 +- + arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 231 ++- + arch/mips/include/asm/mach-bcm63xx/ioremap.h | 42 + + arch/mips/include/asm/mach-bcm63xx/irq.h | 7 + + arch/mips/include/asm/mach-db1x00/bcsr.h | 36 +- + arch/mips/include/asm/mach-db1x00/db1200.h | 11 +- + arch/mips/include/asm/mach-db1x00/db1300.h | 40 + + arch/mips/include/asm/mach-db1x00/db1x00.h | 79 - + arch/mips/include/asm/mach-db1x00/irq.h | 23 + + arch/mips/include/asm/mach-generic/floppy.h | 2 +- + arch/mips/include/asm/mach-jazz/floppy.h | 2 +- + .../asm/mach-netlogic/cpu-feature-overrides.h | 23 +- + arch/mips/include/asm/mach-pb1x00/mc146818rtc.h | 34 - + arch/mips/include/asm/mach-pb1x00/pb1000.h | 87 - + arch/mips/include/asm/mach-pb1x00/pb1200.h | 139 -- + arch/mips/include/asm/mach-pb1x00/pb1550.h | 73 - + arch/mips/include/asm/mipsregs.h | 9 +- + arch/mips/include/asm/module.h | 6 +- + arch/mips/include/asm/netlogic/common.h | 76 + + arch/mips/include/asm/netlogic/haldefs.h | 163 ++ + arch/mips/include/asm/netlogic/xlp-hal/bridge.h | 187 ++ + .../mips/include/asm/netlogic/xlp-hal/cpucontrol.h | 83 + + arch/mips/include/asm/netlogic/xlp-hal/iomap.h | 153 ++ + arch/mips/include/asm/netlogic/xlp-hal/pic.h | 411 ++++ + arch/mips/include/asm/netlogic/xlp-hal/sys.h | 129 ++ + arch/mips/include/asm/netlogic/xlp-hal/uart.h | 191 ++ + .../asm/netlogic/xlp-hal/xlp.h} | 25 +- + arch/mips/include/asm/netlogic/xlr/iomap.h | 22 - + arch/mips/include/asm/netlogic/xlr/msidef.h | 84 + + arch/mips/include/asm/netlogic/xlr/pic.h | 69 +- + arch/mips/include/asm/netlogic/xlr/xlr.h | 13 +- + .../mips/include/asm}/octeon/cvmx-address.h | 0 + .../mips/include/asm}/octeon/cvmx-asxx-defs.h | 0 + arch/mips/include/asm/octeon/cvmx-bootinfo.h | 82 +- + .../mips/include/asm}/octeon/cvmx-cmd-queue.h | 0 + .../mips/include/asm}/octeon/cvmx-config.h | 1 - + .../mips/include/asm}/octeon/cvmx-dbg-defs.h | 0 + arch/mips/include/asm/octeon/cvmx-dpi-defs.h | 643 ++++++ + .../mips/include/asm}/octeon/cvmx-fau.h | 0 + .../mips/include/asm}/octeon/cvmx-fpa-defs.h | 0 + .../mips/include/asm}/octeon/cvmx-fpa.h | 0 + .../mips/include/asm}/octeon/cvmx-gmxx-defs.h | 0 + .../mips/include/asm}/octeon/cvmx-helper-board.h | 6 + + .../mips/include/asm}/octeon/cvmx-helper-fpa.h | 0 + .../mips/include/asm}/octeon/cvmx-helper-loop.h | 1 + + .../mips/include/asm}/octeon/cvmx-helper-npi.h | 1 + + .../mips/include/asm}/octeon/cvmx-helper-rgmii.h | 1 + + .../mips/include/asm}/octeon/cvmx-helper-sgmii.h | 1 + + .../mips/include/asm}/octeon/cvmx-helper-spi.h | 1 + + .../mips/include/asm}/octeon/cvmx-helper-util.h | 0 + .../mips/include/asm}/octeon/cvmx-helper-xaui.h | 1 + + .../mips/include/asm}/octeon/cvmx-helper.h | 1 + + .../mips/include/asm}/octeon/cvmx-ipd.h | 0 + .../mips/include/asm}/octeon/cvmx-mdio.h | 0 + arch/mips/include/asm/octeon/cvmx-mio-defs.h | 1033 +++++++++- + arch/mips/include/asm/octeon/cvmx-npei-defs.h | 4 +- + arch/mips/include/asm/octeon/cvmx-pciercx-defs.h | 609 +++++- + .../mips/include/asm}/octeon/cvmx-pcsx-defs.h | 0 + .../mips/include/asm}/octeon/cvmx-pcsxx-defs.h | 0 + arch/mips/include/asm/octeon/cvmx-pemx-defs.h | 509 +++++ + arch/mips/include/asm/octeon/cvmx-pexp-defs.h | 19 +- + .../mips/include/asm}/octeon/cvmx-pip-defs.h | 0 + .../mips/include/asm}/octeon/cvmx-pip.h | 0 + .../mips/include/asm}/octeon/cvmx-pko-defs.h | 0 + .../mips/include/asm}/octeon/cvmx-pko.h | 0 + .../mips/include/asm}/octeon/cvmx-pow.h | 0 + .../mips/include/asm}/octeon/cvmx-scratch.h | 0 + arch/mips/include/asm/octeon/cvmx-sli-defs.h | 2172 ++++++++++++++++++++ + .../mips/include/asm}/octeon/cvmx-spi.h | 0 + .../mips/include/asm}/octeon/cvmx-spxx-defs.h | 0 + arch/mips/include/asm/octeon/cvmx-sriox-defs.h | 1036 ++++++++++ + .../mips/include/asm}/octeon/cvmx-srxx-defs.h | 0 + .../mips/include/asm}/octeon/cvmx-stxx-defs.h | 0 + .../mips/include/asm}/octeon/cvmx-wqe.h | 0 + arch/mips/include/asm/octeon/cvmx.h | 42 +- + arch/mips/include/asm/octeon/octeon-feature.h | 114 +- + arch/mips/include/asm/octeon/octeon-model.h | 215 +-- + arch/mips/include/asm/octeon/pci-octeon.h | 3 +- + arch/mips/include/asm/pgtable-32.h | 18 +- + arch/mips/include/asm/tlbmisc.h | 10 + + arch/mips/include/asm/traps.h | 13 + + arch/mips/jazz/irq.c | 3 +- + arch/mips/jazz/setup.c | 1 + + arch/mips/jz4740/board-qi_lb60.c | 2 +- + arch/mips/kernel/Makefile | 2 + + arch/mips/kernel/bmips_vec.S | 255 +++ + arch/mips/kernel/branch.c | 128 +- + arch/mips/kernel/cevt-bcm1480.c | 2 +- + arch/mips/kernel/cevt-ds1287.c | 2 +- + arch/mips/kernel/cevt-gt641xx.c | 2 +- + arch/mips/kernel/cevt-r4k.c | 2 +- + arch/mips/kernel/cevt-sb1250.c | 2 +- + arch/mips/kernel/cevt-txx9.c | 2 +- + arch/mips/kernel/cpu-probe.c | 28 +- + arch/mips/kernel/i8253.c | 2 +- + arch/mips/kernel/kprobes.c | 177 ++- + arch/mips/kernel/perf_event_mipsxx.c | 72 +- + arch/mips/kernel/rtlx.c | 1 - + arch/mips/kernel/setup.c | 43 +- + arch/mips/kernel/smp-bmips.c | 458 ++++ + arch/mips/kernel/smtc.c | 6 +- + arch/mips/kernel/traps.c | 16 +- + arch/mips/lantiq/clk.c | 4 +- + arch/mips/lantiq/irq.c | 13 +- + arch/mips/lantiq/xway/dma.c | 6 +- + arch/mips/lantiq/xway/ebu.c | 6 +- + arch/mips/lantiq/xway/pmu.c | 8 +- + arch/mips/lantiq/xway/reset.c | 6 +- + arch/mips/lib/Makefile | 1 + + arch/mips/loongson/common/cs5536/cs5536_mfgpt.c | 2 +- + arch/mips/math-emu/cp1emu.c | 2 +- + arch/mips/mm/Makefile | 5 +- + arch/mips/mm/c-octeon.c | 2 +- + arch/mips/mm/c-r4k.c | 3 + + arch/mips/mm/gup.c | 315 +++ + arch/mips/mm/init.c | 9 +- + arch/mips/mm/tlb-r3k.c | 1 + + arch/mips/mm/tlb-r4k.c | 68 +- + arch/mips/mti-malta/malta-int.c | 4 +- + arch/mips/netlogic/Kconfig | 3 - + arch/mips/netlogic/Makefile | 3 + + arch/mips/netlogic/Platform | 13 +- + arch/mips/netlogic/common/Makefile | 3 + + arch/mips/netlogic/common/earlycons.c | 60 + + arch/mips/netlogic/common/irq.c | 238 +++ + arch/mips/netlogic/{xlr => common}/smp.c | 152 +- + arch/mips/netlogic/common/smpboot.S | 272 +++ + arch/mips/netlogic/{xlr => common}/time.c | 6 +- + arch/mips/netlogic/xlp/Makefile | 2 + + arch/mips/netlogic/xlp/nlm_hal.c | 111 + + arch/mips/netlogic/xlp/platform.c | 108 + + arch/mips/netlogic/xlp/setup.c | 105 + + arch/mips/netlogic/xlp/wakeup.c | 102 + + arch/mips/netlogic/xlr/Makefile | 7 +- + arch/mips/netlogic/xlr/irq.c | 300 --- + arch/mips/netlogic/xlr/platform.c | 31 +- + arch/mips/netlogic/xlr/setup.c | 31 +- + arch/mips/netlogic/xlr/{smpboot.S => wakeup.c} | 80 +- + arch/mips/pci/Makefile | 3 +- + arch/mips/pci/msi-octeon.c | 2 +- + arch/mips/pci/ops-pmcmsp.c | 2 +- + arch/mips/pci/ops-tx3927.c | 2 +- + arch/mips/pci/pci-alchemy.c | 138 +- + arch/mips/pci/pci-ath724x.c | 174 ++ + arch/mips/pci/pci-bcm63xx.c | 4 +- + arch/mips/pci/pci-octeon.c | 26 +- + arch/mips/pci/pci-tx4927.c | 2 +- + arch/mips/pci/pci-tx4938.c | 2 +- + arch/mips/pci/pci-tx4939.c | 2 +- + arch/mips/pci/pci-xlr.c | 128 ++- + arch/mips/pci/pci.c | 29 +- + arch/mips/pci/pcie-octeon.c | 1349 +++++++++--- + arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c | 2 +- + arch/mips/pmc-sierra/msp71xx/msp_setup.c | 2 +- + arch/mips/pmc-sierra/msp71xx/msp_smp.c | 4 +- + arch/mips/pnx8550/common/int.c | 4 +- + arch/mips/pnx8550/common/time.c | 4 +- + arch/mips/sgi-ip22/Makefile | 2 +- + arch/mips/sgi-ip22/ip22-gio.c | 428 ++++ + arch/mips/sgi-ip22/ip22-int.c | 10 +- + arch/mips/sgi-ip22/ip22-mc.c | 10 +- + arch/mips/sgi-ip22/ip22-setup.c | 21 - + arch/mips/sgi-ip27/ip27-irq.c | 6 +- + arch/mips/sgi-ip27/ip27-timer.c | 2 +- + arch/mips/sgi-ip32/ip32-irq.c | 2 - + arch/mips/sni/irq.c | 2 +- + arch/mips/sni/time.c | 2 +- + arch/mips/txx9/generic/pci.c | 2 +- + drivers/i2c/busses/Kconfig | 4 +- + drivers/mmc/host/au1xmmc.c | 45 +- + drivers/mtd/nand/au1550nd.c | 308 ++-- + drivers/net/irda/Kconfig | 6 +- + drivers/net/irda/au1000_ircc.h | 125 -- + drivers/net/irda/au1k_ir.c | 1229 ++++++----- + drivers/pcmcia/Kconfig | 8 +- + drivers/pcmcia/Makefile | 4 - + drivers/pcmcia/au1000_generic.c | 545 ----- + drivers/pcmcia/au1000_generic.h | 135 -- + drivers/pcmcia/au1000_pb1x00.c | 294 --- + drivers/pcmcia/db1xxx_ss.c | 26 +- + drivers/spi/Kconfig | 4 +- + drivers/staging/octeon/Makefile | 5 - + drivers/staging/octeon/cvmx-packet.h | 65 - + drivers/staging/octeon/cvmx-smix-defs.h | 178 -- + drivers/staging/octeon/ethernet-defines.h | 2 +- + drivers/staging/octeon/ethernet-mdio.c | 4 +- + drivers/staging/octeon/ethernet-mem.c | 2 +- + drivers/staging/octeon/ethernet-rgmii.c | 4 +- + drivers/staging/octeon/ethernet-rx.c | 16 +- + drivers/staging/octeon/ethernet-rx.h | 2 +- + drivers/staging/octeon/ethernet-sgmii.c | 4 +- + drivers/staging/octeon/ethernet-spi.c | 6 +- + drivers/staging/octeon/ethernet-tx.c | 12 +- + drivers/staging/octeon/ethernet-xaui.c | 4 +- + drivers/staging/octeon/ethernet.c | 16 +- + drivers/tty/serial/Kconfig | 23 + + drivers/tty/serial/Makefile | 1 + + drivers/tty/serial/ar933x_uart.c | 688 +++++++ + drivers/usb/host/Kconfig | 2 +- + drivers/usb/host/alchemy-common.c | 277 +++ + drivers/usb/host/ehci-ath79.c | 4 + + drivers/usb/host/ohci-au1xxx.c | 13 +- + drivers/video/Kconfig | 8 +- + drivers/video/au1100fb.c | 12 - + drivers/video/au1200fb.c | 273 ++-- + drivers/video/console/newport_con.c | 63 +- + include/linux/serial_core.h | 4 + + sound/soc/au1x/Kconfig | 14 +- + sound/soc/au1x/db1200.c | 73 +- + 353 files changed, 23184 insertions(+), 8396 deletions(-) + create mode 100644 arch/mips/alchemy/Makefile + rename arch/mips/alchemy/{gpr/platform.c => board-gpr.c} (75%) + rename arch/mips/alchemy/{mtx-1/platform.c => board-mtx1.c} (71%) + create mode 100644 arch/mips/alchemy/board-xxs1500.c + create mode 100644 arch/mips/alchemy/common/vss.c + create mode 100644 arch/mips/alchemy/devboards/db1000.c + rename arch/mips/alchemy/devboards/{db1200/platform.c => db1200.c} (62%) + delete mode 100644 arch/mips/alchemy/devboards/db1200/Makefile + delete mode 100644 arch/mips/alchemy/devboards/db1200/setup.c + create mode 100644 arch/mips/alchemy/devboards/db1300.c + create mode 100644 arch/mips/alchemy/devboards/db1550.c + delete mode 100644 arch/mips/alchemy/devboards/db1x00/Makefile + delete mode 100644 arch/mips/alchemy/devboards/db1x00/board_setup.c + delete mode 100644 arch/mips/alchemy/devboards/db1x00/platform.c + delete mode 100644 arch/mips/alchemy/devboards/pb1000/Makefile + delete mode 100644 arch/mips/alchemy/devboards/pb1000/board_setup.c + rename arch/mips/alchemy/devboards/{pb1100/board_setup.c => pb1100.c} (55%) + delete mode 100644 arch/mips/alchemy/devboards/pb1100/Makefile + delete mode 100644 arch/mips/alchemy/devboards/pb1100/platform.c + delete mode 100644 arch/mips/alchemy/devboards/pb1200/Makefile + delete mode 100644 arch/mips/alchemy/devboards/pb1200/board_setup.c + delete mode 100644 arch/mips/alchemy/devboards/pb1200/platform.c + rename arch/mips/alchemy/devboards/{pb1500/board_setup.c => pb1500.c} (51%) + delete mode 100644 arch/mips/alchemy/devboards/pb1500/Makefile + delete mode 100644 arch/mips/alchemy/devboards/pb1500/platform.c + rename arch/mips/alchemy/devboards/{pb1550/platform.c => pb1550.c} (61%) + delete mode 100644 arch/mips/alchemy/devboards/pb1550/Makefile + delete mode 100644 arch/mips/alchemy/devboards/pb1550/board_setup.c + delete mode 100644 arch/mips/alchemy/gpr/Makefile + delete mode 100644 arch/mips/alchemy/gpr/board_setup.c + delete mode 100644 arch/mips/alchemy/gpr/init.c + delete mode 100644 arch/mips/alchemy/mtx-1/Makefile + delete mode 100644 arch/mips/alchemy/mtx-1/board_setup.c + delete mode 100644 arch/mips/alchemy/mtx-1/init.c + delete mode 100644 arch/mips/alchemy/xxs1500/Makefile + delete mode 100644 arch/mips/alchemy/xxs1500/board_setup.c + delete mode 100644 arch/mips/alchemy/xxs1500/init.c + delete mode 100644 arch/mips/alchemy/xxs1500/platform.c + delete mode 100644 arch/mips/ath79/dev-ar913x-wmac.c + create mode 100644 arch/mips/ath79/dev-usb.c + rename arch/mips/ath79/{dev-ar913x-wmac.h => dev-usb.h} (61%) + create mode 100644 arch/mips/ath79/dev-wmac.c + create mode 100644 arch/mips/ath79/dev-wmac.h + create mode 100644 arch/mips/ath79/mach-ap121.c + create mode 100644 arch/mips/ath79/mach-ubnt-xm.c + rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-cmd-queue.c (98%) + rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-fpa.c (100%) + rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-board.c (96%) + rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-fpa.c (100%) + rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-loop.c (95%) + rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-npi.c (96%) + rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-rgmii.c (97%) + rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-sgmii.c (98%) + rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-spi.c (94%) + rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-util.c (97%) + rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-xaui.c (97%) + rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper.c (93%) + rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-interrupt-decodes.c (98%) + rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-interrupt-rsl.c (97%) + rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-pko.c (98%) + rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-spi.c (99%) + delete mode 100644 arch/mips/configs/db1100_defconfig + create mode 100644 arch/mips/configs/db1300_defconfig + delete mode 100644 arch/mips/configs/db1500_defconfig + create mode 100644 arch/mips/configs/nlm_xlp_defconfig + delete mode 100644 arch/mips/configs/pb1200_defconfig + create mode 100644 arch/mips/include/asm/bmips.h + create mode 100644 arch/mips/include/asm/gio_device.h + create mode 100644 arch/mips/include/asm/mach-ath79/ar933x_uart.h + create mode 100644 arch/mips/include/asm/mach-ath79/ar933x_uart_platform.h + create mode 100644 arch/mips/include/asm/mach-ath79/pci-ath724x.h + create mode 100644 arch/mips/include/asm/mach-au1x00/au1200fb.h + create mode 100644 arch/mips/include/asm/mach-au1x00/au1550nd.h + create mode 100644 arch/mips/include/asm/mach-au1x00/gpio-au1300.h + create mode 100644 arch/mips/include/asm/mach-bcm63xx/ioremap.h + create mode 100644 arch/mips/include/asm/mach-bcm63xx/irq.h + create mode 100644 arch/mips/include/asm/mach-db1x00/db1300.h + delete mode 100644 arch/mips/include/asm/mach-db1x00/db1x00.h + create mode 100644 arch/mips/include/asm/mach-db1x00/irq.h + delete mode 100644 arch/mips/include/asm/mach-pb1x00/mc146818rtc.h + delete mode 100644 arch/mips/include/asm/mach-pb1x00/pb1000.h + delete mode 100644 arch/mips/include/asm/mach-pb1x00/pb1200.h + delete mode 100644 arch/mips/include/asm/mach-pb1x00/pb1550.h + create mode 100644 arch/mips/include/asm/netlogic/common.h + create mode 100644 arch/mips/include/asm/netlogic/haldefs.h + create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/bridge.h + create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/cpucontrol.h + create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/iomap.h + create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/pic.h + create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/sys.h + create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/uart.h + rename arch/mips/{netlogic/xlr/xlr_console.c => include/asm/netlogic/xlp-hal/xlp.h} (82%) + create mode 100644 arch/mips/include/asm/netlogic/xlr/msidef.h + rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-address.h (100%) + rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-asxx-defs.h (100%) + rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-cmd-queue.h (100%) + rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-config.h (99%) + rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-dbg-defs.h (100%) + create mode 100644 arch/mips/include/asm/octeon/cvmx-dpi-defs.h + rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-fau.h (100%) + rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-fpa-defs.h (100%) + rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-fpa.h (100%) + rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-gmxx-defs.h (100%) + rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-board.h (96%) + rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-fpa.h (100%) + rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-loop.h (96%) + rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-npi.h (96%) + rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-rgmii.h (98%) + rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-sgmii.h (98%) + rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-spi.h (98%) + rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-util.h (100%) + rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-xaui.h (98%) + rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper.h (99%) + rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-ipd.h (100%) + rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-mdio.h (100%) + rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-pcsx-defs.h (100%) + rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-pcsxx-defs.h (100%) + create mode 100644 arch/mips/include/asm/octeon/cvmx-pemx-defs.h + rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-pip-defs.h (100%) + rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-pip.h (100%) + rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-pko-defs.h (100%) + rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-pko.h (100%) + rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-pow.h (100%) + rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-scratch.h (100%) + create mode 100644 arch/mips/include/asm/octeon/cvmx-sli-defs.h + rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-spi.h (100%) + rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-spxx-defs.h (100%) + create mode 100644 arch/mips/include/asm/octeon/cvmx-sriox-defs.h + rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-srxx-defs.h (100%) + rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-stxx-defs.h (100%) + rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-wqe.h (100%) + create mode 100644 arch/mips/include/asm/tlbmisc.h + create mode 100644 arch/mips/kernel/bmips_vec.S + create mode 100644 arch/mips/kernel/smp-bmips.c + create mode 100644 arch/mips/mm/gup.c + create mode 100644 arch/mips/netlogic/Makefile + create mode 100644 arch/mips/netlogic/common/Makefile + create mode 100644 arch/mips/netlogic/common/earlycons.c + create mode 100644 arch/mips/netlogic/common/irq.c + rename arch/mips/netlogic/{xlr => common}/smp.c (65%) + create mode 100644 arch/mips/netlogic/common/smpboot.S + rename arch/mips/netlogic/{xlr => common}/time.c (93%) + create mode 100644 arch/mips/netlogic/xlp/Makefile + create mode 100644 arch/mips/netlogic/xlp/nlm_hal.c + create mode 100644 arch/mips/netlogic/xlp/platform.c + create mode 100644 arch/mips/netlogic/xlp/setup.c + create mode 100644 arch/mips/netlogic/xlp/wakeup.c + delete mode 100644 arch/mips/netlogic/xlr/irq.c + rename arch/mips/netlogic/xlr/{smpboot.S => wakeup.c} (60%) + create mode 100644 arch/mips/pci/pci-ath724x.c + create mode 100644 arch/mips/sgi-ip22/ip22-gio.c + delete mode 100644 drivers/net/irda/au1000_ircc.h + delete mode 100644 drivers/pcmcia/au1000_generic.c + delete mode 100644 drivers/pcmcia/au1000_generic.h + delete mode 100644 drivers/pcmcia/au1000_pb1x00.c + delete mode 100644 drivers/staging/octeon/cvmx-packet.h + delete mode 100644 drivers/staging/octeon/cvmx-smix-defs.h + create mode 100644 drivers/tty/serial/ar933x_uart.c +Merging openrisc/for-upstream (b6fd41e Linux 3.1-rc6) +$ git merge openrisc/for-upstream +Already up-to-date. +Merging parisc/for-next (fc99a91 futex: Use same lock set as lws calls) +$ git merge parisc/for-next +Merge made by the 'recursive' strategy. + arch/parisc/include/asm/futex.h | 31 +++++++++++++++++++++++++++---- + 1 files changed, 27 insertions(+), 4 deletions(-) +Merging powerpc/next (7c637b0 powerpc: Enable squashfs as a module) +$ git merge powerpc/next +Auto-merging arch/powerpc/mm/hugetlbpage.c +Removing arch/powerpc/boot/dts/p5020si.dtsi +Removing arch/powerpc/boot/dts/p4080si.dtsi +Removing arch/powerpc/boot/dts/p3060si.dtsi +Removing arch/powerpc/boot/dts/p3041si.dtsi +Removing arch/powerpc/boot/dts/p2041si.dtsi +Removing arch/powerpc/boot/dts/p2020si.dtsi +Removing arch/powerpc/boot/dts/p1020si.dtsi +Removing arch/powerpc/boot/dts/p1010si.dtsi +Merge made by the 'recursive' strategy. + .../devicetree/bindings/powerpc/fsl/srio-rmu.txt | 163 +++ + .../devicetree/bindings/powerpc/fsl/srio.txt | 103 ++ + arch/powerpc/Kconfig | 1 + + arch/powerpc/Kconfig.debug | 12 + + arch/powerpc/Makefile | 5 +- + arch/powerpc/boot/Makefile | 7 + + arch/powerpc/boot/dts/fsl/mpc8536si-post.dtsi | 248 ++++ + arch/powerpc/boot/dts/fsl/mpc8536si-pre.dtsi | 63 + + arch/powerpc/boot/dts/fsl/mpc8544si-post.dtsi | 191 +++ + arch/powerpc/boot/dts/fsl/mpc8544si-pre.dtsi | 63 + + arch/powerpc/boot/dts/fsl/mpc8548si-post.dtsi | 143 ++ + arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi | 62 + + arch/powerpc/boot/dts/fsl/mpc8568si-post.dtsi | 270 ++++ + arch/powerpc/boot/dts/fsl/mpc8568si-pre.dtsi | 65 + + arch/powerpc/boot/dts/fsl/mpc8569si-post.dtsi | 304 ++++ + arch/powerpc/boot/dts/fsl/mpc8569si-pre.dtsi | 64 + + arch/powerpc/boot/dts/fsl/mpc8572si-post.dtsi | 196 +++ + arch/powerpc/boot/dts/fsl/mpc8572si-pre.dtsi | 70 + + arch/powerpc/boot/dts/fsl/p1010si-post.dtsi | 198 +++ + arch/powerpc/boot/dts/fsl/p1010si-pre.dtsi | 64 + + arch/powerpc/boot/dts/fsl/p1020si-post.dtsi | 174 +++ + arch/powerpc/boot/dts/fsl/p1020si-pre.dtsi | 68 + + arch/powerpc/boot/dts/fsl/p1021si-post.dtsi | 225 +++ + arch/powerpc/boot/dts/fsl/p1021si-pre.dtsi | 68 + + arch/powerpc/boot/dts/fsl/p1022si-post.dtsi | 235 +++ + arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi | 68 + + arch/powerpc/boot/dts/fsl/p1023si-post.dtsi | 224 +++ + arch/powerpc/boot/dts/fsl/p1023si-pre.dtsi | 76 + + arch/powerpc/boot/dts/fsl/p2020si-post.dtsi | 194 +++ + arch/powerpc/boot/dts/fsl/p2020si-pre.dtsi | 69 + + arch/powerpc/boot/dts/fsl/p2041si-post.dtsi | 325 +++++ + arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi | 111 ++ + arch/powerpc/boot/dts/fsl/p3041si-post.dtsi | 352 +++++ + arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi | 112 ++ + arch/powerpc/boot/dts/fsl/p3060si-post.dtsi | 296 ++++ + arch/powerpc/boot/dts/fsl/p3060si-pre.dtsi | 125 ++ + arch/powerpc/boot/dts/fsl/p4080si-post.dtsi | 350 +++++ + arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi | 143 ++ + arch/powerpc/boot/dts/fsl/p5020si-post.dtsi | 355 +++++ + arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi | 96 ++ + arch/powerpc/boot/dts/fsl/pq3-dma-0.dtsi | 66 + + arch/powerpc/boot/dts/fsl/pq3-dma-1.dtsi | 66 + + arch/powerpc/boot/dts/fsl/pq3-duart-0.dtsi | 51 + + arch/powerpc/boot/dts/fsl/pq3-esdhc-0.dtsi | 41 + + arch/powerpc/boot/dts/fsl/pq3-espi-0.dtsi | 41 + + arch/powerpc/boot/dts/fsl/pq3-etsec1-0.dtsi | 53 + + arch/powerpc/boot/dts/fsl/pq3-etsec1-1.dtsi | 53 + + arch/powerpc/boot/dts/fsl/pq3-etsec1-2.dtsi | 53 + + arch/powerpc/boot/dts/fsl/pq3-etsec1-3.dtsi | 53 + + arch/powerpc/boot/dts/fsl/pq3-etsec1-timer-0.dtsi | 39 + + arch/powerpc/boot/dts/fsl/pq3-etsec2-0.dtsi | 60 + + arch/powerpc/boot/dts/fsl/pq3-etsec2-1.dtsi | 60 + + arch/powerpc/boot/dts/fsl/pq3-etsec2-2.dtsi | 59 + + arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-0.dtsi | 42 + + arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-1.dtsi | 42 + + arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-2.dtsi | 42 + + arch/powerpc/boot/dts/fsl/pq3-gpio-0.dtsi | 41 + + arch/powerpc/boot/dts/fsl/pq3-i2c-0.dtsi | 43 + + arch/powerpc/boot/dts/fsl/pq3-i2c-1.dtsi | 43 + + arch/powerpc/boot/dts/fsl/pq3-mpic-timer-B.dtsi | 42 + + arch/powerpc/boot/dts/fsl/pq3-mpic.dtsi | 66 + + arch/powerpc/boot/dts/fsl/pq3-rmu-0.dtsi | 68 + + arch/powerpc/boot/dts/fsl/pq3-sata2-0.dtsi | 40 + + arch/powerpc/boot/dts/fsl/pq3-sata2-1.dtsi | 40 + + arch/powerpc/boot/dts/fsl/pq3-sec2.1-0.dtsi | 43 + + arch/powerpc/boot/dts/fsl/pq3-sec3.0-0.dtsi | 45 + + arch/powerpc/boot/dts/fsl/pq3-sec3.1-0.dtsi | 45 + + arch/powerpc/boot/dts/fsl/pq3-sec3.3-0.dtsi | 45 + + arch/powerpc/boot/dts/fsl/pq3-sec4.4-0.dtsi | 65 + + arch/powerpc/boot/dts/fsl/pq3-usb2-dr-0.dtsi | 41 + + arch/powerpc/boot/dts/fsl/pq3-usb2-dr-1.dtsi | 41 + + arch/powerpc/boot/dts/fsl/qoriq-dma-0.dtsi | 66 + + arch/powerpc/boot/dts/fsl/qoriq-dma-1.dtsi | 66 + + arch/powerpc/boot/dts/fsl/qoriq-duart-0.dtsi | 51 + + arch/powerpc/boot/dts/fsl/qoriq-duart-1.dtsi | 51 + + arch/powerpc/boot/dts/fsl/qoriq-esdhc-0.dtsi | 40 + + arch/powerpc/boot/dts/fsl/qoriq-espi-0.dtsi | 41 + + arch/powerpc/boot/dts/fsl/qoriq-gpio-0.dtsi | 41 + + arch/powerpc/boot/dts/fsl/qoriq-i2c-0.dtsi | 53 + + arch/powerpc/boot/dts/fsl/qoriq-i2c-1.dtsi | 53 + + arch/powerpc/boot/dts/fsl/qoriq-mpic.dtsi | 106 ++ + arch/powerpc/boot/dts/fsl/qoriq-rmu-0.dtsi | 68 + + arch/powerpc/boot/dts/fsl/qoriq-sata2-0.dtsi | 39 + + arch/powerpc/boot/dts/fsl/qoriq-sata2-1.dtsi | 39 + + arch/powerpc/boot/dts/fsl/qoriq-sec4.0-0.dtsi | 100 ++ + arch/powerpc/boot/dts/fsl/qoriq-sec4.1-0.dtsi | 109 ++ + arch/powerpc/boot/dts/fsl/qoriq-sec4.2-0.dtsi | 109 ++ + arch/powerpc/boot/dts/fsl/qoriq-usb2-dr-0.dtsi | 41 + + arch/powerpc/boot/dts/fsl/qoriq-usb2-mph-0.dtsi | 41 + + arch/powerpc/boot/dts/mpc8536ds.dts | 456 +------ + arch/powerpc/boot/dts/mpc8536ds.dtsi | 141 ++ + arch/powerpc/boot/dts/mpc8536ds_36b.dts | 410 +----- + arch/powerpc/boot/dts/mpc8544ds.dts | 473 +------ + arch/powerpc/boot/dts/mpc8544ds.dtsi | 161 +++ + arch/powerpc/boot/dts/mpc8548cds.dts | 505 ++----- + arch/powerpc/boot/dts/mpc8568mds.dts | 482 +------ + arch/powerpc/boot/dts/mpc8569mds.dts | 414 +----- + arch/powerpc/boot/dts/mpc8572ds.dts | 757 +---------- + arch/powerpc/boot/dts/mpc8572ds.dtsi | 397 +++++ + arch/powerpc/boot/dts/mpc8572ds_36b.dts | 746 +---------- + arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts | 487 +------ + arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts | 245 +--- + arch/powerpc/boot/dts/mpc8641_hpcn.dts | 69 +- + arch/powerpc/boot/dts/obs600.dts | 314 ++++ + arch/powerpc/boot/dts/p1010rdb.dts | 228 +--- + arch/powerpc/boot/dts/p1010rdb.dtsi | 229 +++ + arch/powerpc/boot/dts/p1010rdb_36b.dts | 89 ++ + arch/powerpc/boot/dts/p1010si.dtsi | 374 ----- + arch/powerpc/boot/dts/p1020rdb.dts | 262 +---- + arch/powerpc/boot/dts/p1020rdb.dtsi | 242 ++++ + arch/powerpc/boot/dts/p1020rdb_36b.dts | 66 + + arch/powerpc/boot/dts/p1020rdb_camp_core0.dts | 154 +-- + arch/powerpc/boot/dts/p1020rdb_camp_core1.dts | 11 +- + arch/powerpc/boot/dts/p1020si.dtsi | 377 ----- + arch/powerpc/boot/dts/p1021mds.dts | 421 +----- + arch/powerpc/boot/dts/p1022ds.dts | 449 +------ + arch/powerpc/boot/dts/p1023rds.dts | 380 +----- + arch/powerpc/boot/dts/p2020ds.dts | 353 +----- + arch/powerpc/boot/dts/p2020ds.dtsi | 316 ++++ + arch/powerpc/boot/dts/p2020rdb.dts | 63 +- + arch/powerpc/boot/dts/p2020rdb_camp_core0.dts | 141 +-- + arch/powerpc/boot/dts/p2020rdb_camp_core1.dts | 107 +-- + arch/powerpc/boot/dts/p2020si.dtsi | 382 ----- + arch/powerpc/boot/dts/p2041rdb.dts | 22 +- + arch/powerpc/boot/dts/p2041si.dtsi | 692 --------- + arch/powerpc/boot/dts/p3041ds.dts | 23 +- + arch/powerpc/boot/dts/p3041si.dtsi | 729 ---------- + arch/powerpc/boot/dts/p3060qds.dts | 12 +- + arch/powerpc/boot/dts/p3060si.dtsi | 719 --------- + arch/powerpc/boot/dts/p4080ds.dts | 24 +- + arch/powerpc/boot/dts/p4080si.dtsi | 755 ---------- + arch/powerpc/boot/dts/p5020ds.dts | 24 +- + arch/powerpc/boot/dts/p5020si.dtsi | 716 --------- + arch/powerpc/boot/wrapper | 22 +- + arch/powerpc/configs/40x/obs600_defconfig | 83 ++ + arch/powerpc/configs/chroma_defconfig | 307 ++++ + arch/powerpc/configs/corenet32_smp_defconfig | 1 + + arch/powerpc/configs/corenet64_smp_defconfig | 1 + + arch/powerpc/configs/mpc85xx_defconfig | 1 + + arch/powerpc/configs/mpc85xx_smp_defconfig | 1 + + arch/powerpc/configs/ppc64_defconfig | 5 + + arch/powerpc/configs/pseries_defconfig | 5 + + arch/powerpc/include/asm/cputable.h | 2 +- + arch/powerpc/include/asm/fsl_lbc.h | 7 +- + arch/powerpc/include/asm/hugetlb.h | 38 +- + arch/powerpc/include/asm/machdep.h | 3 + + arch/powerpc/include/asm/mmu-book3e.h | 11 + + arch/powerpc/include/asm/mpic.h | 14 +- + arch/powerpc/include/asm/opal.h | 131 ++- + arch/powerpc/include/asm/paca.h | 1 + + arch/powerpc/include/asm/page.h | 1 + + arch/powerpc/include/asm/page_64.h | 2 + + arch/powerpc/include/asm/pci-bridge.h | 6 +- + arch/powerpc/include/asm/pci.h | 2 - + arch/powerpc/include/asm/pgtable.h | 3 + + arch/powerpc/include/asm/reg_booke.h | 4 + + arch/powerpc/include/asm/rtas.h | 18 + + arch/powerpc/include/asm/tce.h | 10 +- + arch/powerpc/include/asm/time.h | 2 + + arch/powerpc/kernel/asm-offsets.c | 1 + + arch/powerpc/kernel/cpu_setup_a2.S | 10 +- + arch/powerpc/kernel/exceptions-64s.S | 2 +- + arch/powerpc/kernel/idle_power7.S | 4 + + arch/powerpc/kernel/irq.c | 24 +- + arch/powerpc/kernel/pci-common.c | 78 +- + arch/powerpc/kernel/pci_dn.c | 3 + + arch/powerpc/kernel/process.c | 22 +- + arch/powerpc/kernel/prom_init.c | 16 +- + arch/powerpc/kernel/rtas_flash.c | 6 + + arch/powerpc/kernel/rtasd.c | 7 + + arch/powerpc/kernel/setup_64.c | 10 + + arch/powerpc/kernel/smp.c | 3 +- + arch/powerpc/kernel/sysfs.c | 8 + + arch/powerpc/kernel/time.c | 95 +- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 3 + + arch/powerpc/mm/Makefile | 2 + + arch/powerpc/mm/fault.c | 17 + + arch/powerpc/mm/hugetlbpage-book3e.c | 21 +- + arch/powerpc/mm/hugetlbpage.c | 116 +- + arch/powerpc/mm/icswx.c | 273 ++++ + arch/powerpc/mm/icswx.h | 62 + + arch/powerpc/mm/icswx_pid.c | 87 ++ + arch/powerpc/mm/mem.c | 23 +- + arch/powerpc/mm/mmap_64.c | 14 +- + arch/powerpc/mm/mmu_context_hash64.c | 195 +--- + arch/powerpc/mm/tlb_low_64e.S | 36 +- + arch/powerpc/mm/tlb_nohash.c | 2 +- + arch/powerpc/platforms/40x/Kconfig | 10 + + arch/powerpc/platforms/40x/ppc40x_simple.c | 3 +- + arch/powerpc/platforms/44x/iss4xx.c | 2 +- + arch/powerpc/platforms/83xx/asp834x.c | 35 +- + arch/powerpc/platforms/83xx/km83xx.c | 58 +- + arch/powerpc/platforms/83xx/misc.c | 77 + + arch/powerpc/platforms/83xx/mpc830x_rdb.c | 40 +- + arch/powerpc/platforms/83xx/mpc831x_rdb.c | 43 +- + arch/powerpc/platforms/83xx/mpc832x_mds.c | 53 +- + arch/powerpc/platforms/83xx/mpc832x_rdb.c | 56 +- + arch/powerpc/platforms/83xx/mpc834x_itx.c | 30 +- + arch/powerpc/platforms/83xx/mpc834x_mds.c | 42 +- + arch/powerpc/platforms/83xx/mpc836x_mds.c | 53 +- + arch/powerpc/platforms/83xx/mpc836x_rdk.c | 48 +- + arch/powerpc/platforms/83xx/mpc837x_mds.c | 46 +- + arch/powerpc/platforms/83xx/mpc837x_rdb.c | 47 +- + arch/powerpc/platforms/83xx/mpc83xx.h | 16 + + arch/powerpc/platforms/83xx/sbc834x.c | 45 +- + arch/powerpc/platforms/85xx/Makefile | 2 + + arch/powerpc/platforms/85xx/common.c | 66 + + arch/powerpc/platforms/85xx/corenet_ds.c | 28 +- + arch/powerpc/platforms/85xx/ksi8560.c | 69 +- + arch/powerpc/platforms/85xx/mpc8536_ds.c | 38 +- + arch/powerpc/platforms/85xx/mpc85xx.h | 11 + + arch/powerpc/platforms/85xx/mpc85xx_ads.c | 74 +- + arch/powerpc/platforms/85xx/mpc85xx_cds.c | 42 +- + arch/powerpc/platforms/85xx/mpc85xx_ds.c | 50 +- + arch/powerpc/platforms/85xx/mpc85xx_mds.c | 73 +- + arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 49 +- + arch/powerpc/platforms/85xx/p1010rdb.c | 36 +- + arch/powerpc/platforms/85xx/p1022_ds.c | 37 +- + arch/powerpc/platforms/85xx/p1023_rds.c | 46 +- + arch/powerpc/platforms/85xx/sbc8548.c | 43 +- + arch/powerpc/platforms/85xx/sbc8560.c | 74 +- + arch/powerpc/platforms/85xx/smp.c | 1 + + arch/powerpc/platforms/85xx/smp.h | 15 + + arch/powerpc/platforms/85xx/socrates.c | 33 +- + arch/powerpc/platforms/85xx/stx_gp3.c | 73 +- + arch/powerpc/platforms/85xx/tqm85xx.c | 73 +- + arch/powerpc/platforms/85xx/xes_mpc85xx.c | 48 +- + arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 2 +- + arch/powerpc/platforms/86xx/pic.c | 18 +- + arch/powerpc/platforms/Kconfig.cputype | 25 +- + arch/powerpc/platforms/cell/iommu.c | 2 + + arch/powerpc/platforms/cell/setup.c | 25 +- + arch/powerpc/platforms/chrp/setup.c | 3 +- + arch/powerpc/platforms/embedded6xx/holly.c | 23 +- + arch/powerpc/platforms/embedded6xx/linkstation.c | 20 +- + arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 24 +- + arch/powerpc/platforms/embedded6xx/storcenter.c | 26 +- + arch/powerpc/platforms/maple/pci.c | 55 + + arch/powerpc/platforms/maple/setup.c | 2 +- + arch/powerpc/platforms/pasemi/setup.c | 4 +- + arch/powerpc/platforms/powermac/pic.c | 46 +- + arch/powerpc/platforms/powermac/setup.c | 8 +- + arch/powerpc/platforms/powermac/smp.c | 4 +- + arch/powerpc/platforms/powernv/Makefile | 2 +- + arch/powerpc/platforms/powernv/opal-wrappers.S | 8 + + arch/powerpc/platforms/powernv/pci-ioda.c | 1330 +++++++++++++++++ + arch/powerpc/platforms/powernv/pci-p5ioc2.c | 1 + + arch/powerpc/platforms/powernv/pci.c | 228 +++- + arch/powerpc/platforms/powernv/pci.h | 100 ++ + arch/powerpc/platforms/powernv/smp.c | 2 +- + arch/powerpc/platforms/pseries/iommu.c | 61 +- + arch/powerpc/platforms/pseries/nvram.c | 7 + + arch/powerpc/platforms/pseries/setup.c | 3 +- + arch/powerpc/platforms/wsp/Kconfig | 12 +- + arch/powerpc/platforms/wsp/Makefile | 8 +- + arch/powerpc/platforms/wsp/chroma.c | 56 + + arch/powerpc/platforms/wsp/h8.c | 134 ++ + arch/powerpc/platforms/wsp/opb_pic.c | 3 +- + arch/powerpc/platforms/wsp/psr2.c | 56 +- + arch/powerpc/platforms/wsp/wsp.c | 115 ++ + arch/powerpc/platforms/wsp/wsp.h | 16 +- + arch/powerpc/sysdev/Makefile | 2 +- + arch/powerpc/sysdev/fsl_lbc.c | 36 + + arch/powerpc/sysdev/fsl_msi.c | 39 + + arch/powerpc/sysdev/fsl_msi.h | 3 + + arch/powerpc/sysdev/fsl_rio.c | 1519 ++++---------------- + arch/powerpc/sysdev/fsl_rio.h | 135 ++ + arch/powerpc/sysdev/fsl_rmu.c | 1103 ++++++++++++++ + arch/powerpc/sysdev/mpic.c | 201 ++- + arch/powerpc/sysdev/xics/icp-hv.c | 38 +- + arch/powerpc/sysdev/xics/xics-common.c | 2 +- + arch/powerpc/xmon/xmon.c | 16 +- + arch/sparc/kernel/sys_sparc_64.c | 6 +- + drivers/tty/serial/pmac_zilog.c | 102 +- + drivers/tty/serial/ucc_uart.c | 3 + + tools/perf/arch/powerpc/util/dwarf-regs.c | 3 + + 276 files changed, 16976 insertions(+), 15185 deletions(-) + create mode 100644 Documentation/devicetree/bindings/powerpc/fsl/srio-rmu.txt + create mode 100644 Documentation/devicetree/bindings/powerpc/fsl/srio.txt + create mode 100644 arch/powerpc/boot/dts/fsl/mpc8536si-post.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/mpc8536si-pre.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/mpc8544si-post.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/mpc8544si-pre.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/mpc8548si-post.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/mpc8568si-post.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/mpc8568si-pre.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/mpc8569si-post.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/mpc8569si-pre.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/mpc8572si-post.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/mpc8572si-pre.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/p1010si-post.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/p1010si-pre.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/p1020si-post.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/p1020si-pre.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/p1021si-post.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/p1021si-pre.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/p1022si-post.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/p1023si-post.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/p1023si-pre.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/p2020si-post.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/p2020si-pre.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/p2041si-post.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/p3041si-post.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/p3060si-post.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/p3060si-pre.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/p4080si-post.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/p5020si-post.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/pq3-dma-0.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/pq3-dma-1.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/pq3-duart-0.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/pq3-esdhc-0.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/pq3-espi-0.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec1-0.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec1-1.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec1-2.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec1-3.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec1-timer-0.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec2-0.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec2-1.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec2-2.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-0.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-1.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-2.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/pq3-gpio-0.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/pq3-i2c-0.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/pq3-i2c-1.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/pq3-mpic-timer-B.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/pq3-mpic.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/pq3-rmu-0.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/pq3-sata2-0.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/pq3-sata2-1.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/pq3-sec2.1-0.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/pq3-sec3.0-0.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/pq3-sec3.1-0.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/pq3-sec3.3-0.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/pq3-sec4.4-0.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/pq3-usb2-dr-0.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/pq3-usb2-dr-1.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-dma-0.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-dma-1.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-duart-0.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-duart-1.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-esdhc-0.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-espi-0.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-gpio-0.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-i2c-0.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-i2c-1.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-mpic.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-rmu-0.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-sata2-0.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-sata2-1.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-sec4.0-0.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-sec4.1-0.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-sec4.2-0.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-usb2-dr-0.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-usb2-mph-0.dtsi + create mode 100644 arch/powerpc/boot/dts/mpc8536ds.dtsi + create mode 100644 arch/powerpc/boot/dts/mpc8544ds.dtsi + create mode 100644 arch/powerpc/boot/dts/mpc8572ds.dtsi + create mode 100644 arch/powerpc/boot/dts/obs600.dts + create mode 100644 arch/powerpc/boot/dts/p1010rdb.dtsi + create mode 100644 arch/powerpc/boot/dts/p1010rdb_36b.dts + delete mode 100644 arch/powerpc/boot/dts/p1010si.dtsi + create mode 100644 arch/powerpc/boot/dts/p1020rdb.dtsi + create mode 100644 arch/powerpc/boot/dts/p1020rdb_36b.dts + delete mode 100644 arch/powerpc/boot/dts/p1020si.dtsi + create mode 100644 arch/powerpc/boot/dts/p2020ds.dtsi + delete mode 100644 arch/powerpc/boot/dts/p2020si.dtsi + delete mode 100644 arch/powerpc/boot/dts/p2041si.dtsi + delete mode 100644 arch/powerpc/boot/dts/p3041si.dtsi + delete mode 100644 arch/powerpc/boot/dts/p3060si.dtsi + delete mode 100644 arch/powerpc/boot/dts/p4080si.dtsi + delete mode 100644 arch/powerpc/boot/dts/p5020si.dtsi + create mode 100644 arch/powerpc/configs/40x/obs600_defconfig + create mode 100644 arch/powerpc/configs/chroma_defconfig + create mode 100644 arch/powerpc/mm/icswx.c + create mode 100644 arch/powerpc/mm/icswx.h + create mode 100644 arch/powerpc/mm/icswx_pid.c + create mode 100644 arch/powerpc/platforms/85xx/common.c + create mode 100644 arch/powerpc/platforms/85xx/mpc85xx.h + create mode 100644 arch/powerpc/platforms/85xx/smp.h + create mode 100644 arch/powerpc/platforms/powernv/pci-ioda.c + create mode 100644 arch/powerpc/platforms/wsp/chroma.c + create mode 100644 arch/powerpc/platforms/wsp/h8.c + create mode 100644 arch/powerpc/platforms/wsp/wsp.c + create mode 100644 arch/powerpc/sysdev/fsl_rio.h + create mode 100644 arch/powerpc/sysdev/fsl_rmu.c +Merging 4xx/next (228d550 powerpc/47x: Add support for the new IBM currituck platform) +$ git merge 4xx/next +Resolved 'arch/powerpc/platforms/40x/ppc40x_simple.c' using previous resolution. +Auto-merging arch/powerpc/platforms/40x/ppc40x_simple.c +CONFLICT (content): Merge conflict in arch/powerpc/platforms/40x/ppc40x_simple.c +Auto-merging arch/powerpc/platforms/40x/Kconfig +Auto-merging arch/powerpc/boot/wrapper +Auto-merging arch/powerpc/boot/Makefile +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 052e678] Merge remote-tracking branch '4xx/next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 2 +- + arch/powerpc/boot/Makefile | 5 +- + arch/powerpc/boot/dcr.h | 6 + + arch/powerpc/boot/div64.S | 52 ++++++ + arch/powerpc/boot/dts/currituck.dts | 237 ++++++++++++++++++++++++++ + arch/powerpc/boot/dts/klondike.dts | 227 ++++++++++++++++++++++++ + arch/powerpc/boot/treeboot-currituck.c | 119 +++++++++++++ + arch/powerpc/boot/wrapper | 3 + + arch/powerpc/configs/40x/klondike_defconfig | 55 ++++++ + arch/powerpc/configs/44x/currituck_defconfig | 110 ++++++++++++ + arch/powerpc/include/asm/reg.h | 1 + + arch/powerpc/kernel/cputable.c | 27 +++ + arch/powerpc/kernel/head_44x.S | 2 + + arch/powerpc/mm/44x_mmu.c | 4 - + arch/powerpc/platforms/40x/Kconfig | 11 ++ + arch/powerpc/platforms/40x/ppc40x_simple.c | 1 + + arch/powerpc/platforms/44x/Kconfig | 14 ++ + arch/powerpc/platforms/44x/Makefile | 1 + + arch/powerpc/platforms/44x/currituck.c | 204 ++++++++++++++++++++++ + arch/powerpc/sysdev/ppc4xx_pci.c | 85 +++++++++- + arch/powerpc/sysdev/ppc4xx_pci.h | 7 + + 21 files changed, 1159 insertions(+), 14 deletions(-) + create mode 100644 arch/powerpc/boot/dts/currituck.dts + create mode 100644 arch/powerpc/boot/dts/klondike.dts + create mode 100644 arch/powerpc/boot/treeboot-currituck.c + create mode 100644 arch/powerpc/configs/40x/klondike_defconfig + create mode 100644 arch/powerpc/configs/44x/currituck_defconfig + create mode 100644 arch/powerpc/platforms/44x/currituck.c +Merging 52xx-and-virtex/powerpc/next (c1395f4 dtc/powerpc: remove obsolete .gitignore entries) +$ git merge 52xx-and-virtex/powerpc/next +Merge made by the 'recursive' strategy. +Merging galak/next (fa8cbaa powerpc+sparc64/mm: Remove hack in mmap randomize layout) +$ git merge galak/next +Already up-to-date. +Merging s390/features (b4c1eb9 [S390] cleanup trap handling) +$ git merge s390/features +Merge made by the 'recursive' strategy. + Documentation/dontdiff | 1 - + Documentation/s390/Debugging390.txt | 34 -- + arch/s390/Kbuild | 13 +- + arch/s390/Kconfig | 11 +- + arch/s390/Makefile | 1 - + arch/s390/boot/Makefile | 2 +- + arch/s390/include/asm/kdebug.h | 2 +- + arch/s390/include/asm/lowcore.h | 142 +++--- + arch/s390/include/asm/pgtable.h | 23 +- + arch/s390/include/asm/processor.h | 2 - + arch/s390/include/asm/ptrace.h | 3 +- + arch/s390/include/asm/smp.h | 1 - + arch/s390/include/asm/sparsemem.h | 4 +- + arch/s390/include/asm/syscall.h | 2 +- + arch/s390/include/asm/topology.h | 40 ++- + arch/s390/kernel/Makefile | 3 +- + arch/s390/kernel/asm-offsets.c | 8 +- + arch/s390/kernel/base.S | 16 +- + arch/s390/kernel/compat_signal.c | 8 +- + arch/s390/kernel/entry.S | 1103 +++++++++++++++-------------------- + arch/s390/kernel/entry.h | 10 +- + arch/s390/kernel/entry64.S | 976 ++++++++++++++----------------- + arch/s390/kernel/head.S | 4 +- + arch/s390/kernel/mem_detect.c | 122 +++-- + arch/s390/kernel/reipl64.S | 4 +- + arch/s390/kernel/setup.c | 69 ++- + arch/s390/kernel/signal.c | 20 +- + arch/s390/kernel/smp.c | 121 +--- + arch/s390/kernel/topology.c | 275 ++++++--- + arch/s390/kernel/traps.c | 168 ++---- + arch/s390/mm/fault.c | 104 ++-- + arch/s390/mm/init.c | 16 +- + arch/s390/mm/pgtable.c | 11 - + drivers/s390/cio/qdio_setup.c | 7 +- + 34 files changed, 1540 insertions(+), 1786 deletions(-) +Merging sh/sh-latest (b9a3acf Merge branch 'sh/stable-updates' into sh-latest) +$ git merge sh/sh-latest +Already up-to-date. +Merging rmobile/rmobile-latest (b58c580 Merge branch 'rmobile-fixes-for-linus' into rmobile-latest) +$ git merge rmobile/rmobile-latest +Already up-to-date. +Merging sparc-next/master (3ee72ca Merge git://github.com/davem330/net) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (0c90547 arch/tile: use new generic {enable,disable}_percpu_irq() routines) +$ git merge tile/master +Already up-to-date. +Merging unicore32/unicore32 (ed96dfb unicore32, exec: remove redundant set_fs(USER_DS)) +$ git merge unicore32/unicore32 +Already up-to-date. +Merging xtensa/master (29aced6 xtensa: remove defining register numbers) +$ git merge xtensa/master +Merge made by the 'recursive' strategy. + arch/xtensa/include/asm/irqflags.h | 1 + + arch/xtensa/include/asm/regs.h | 91 ++++++++++++++++++--------------- + arch/xtensa/include/asm/timex.h | 4 +- + arch/xtensa/include/asm/uaccess.h | 2 +- + arch/xtensa/kernel/align.S | 14 +++--- + arch/xtensa/kernel/coprocessor.S | 10 ++-- + arch/xtensa/kernel/entry.S | 98 ++++++++++++++++++------------------ + arch/xtensa/kernel/head.S | 12 ++-- + arch/xtensa/kernel/irq.c | 5 ++ + arch/xtensa/kernel/traps.c | 4 +- + arch/xtensa/kernel/vectors.S | 22 ++++---- + arch/xtensa/kernel/vmlinux.lds.S | 1 + + 12 files changed, 139 insertions(+), 125 deletions(-) +Merging ceph/for-next (3395734 libceph: fix double-free of page vector) +$ git merge ceph/for-next +Already up-to-date. +Merging cifs/master (8def5f5 Merge git://git.samba.org/sfrench/cifs-2.6) +$ git merge cifs/master +Already up-to-date. +Merging configfs/linux-next (b930c26 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 (aaef29d eCryptfs: Flush file in vma close) +$ git merge ecryptfs/next +Merge made by the 'recursive' strategy. +Merging ext3/for_next (ed47a7d udf: Cleanup metadata flags handling) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (4c81f04 ext4: fix racy use-after-free in ext4_end_io_dio()) +$ git merge ext4/dev +Already up-to-date. +Merging fatfs/master (710d440 fat: fat16 support maximum 4GB file/vol size as WinXP or 7.) +$ git merge fatfs/master +Already up-to-date. +Merging fuse/for-next (7818d5e cuse: implement memory mapping) +$ git merge fuse/for-next +Merge made by the 'recursive' strategy. + fs/fuse/cuse.c | 426 +++++++++++++++++++++++++++++++++++++++++++++++++- + fs/fuse/dev.c | 205 ++++++++----------------- + fs/fuse/dir.c | 58 +++++++- + fs/fuse/file.c | 10 +- + fs/fuse/fuse_i.h | 45 +++++- + fs/fuse/inode.c | 167 +++++++++++++++++++- + include/linux/fuse.h | 41 +++++- + 7 files changed, 794 insertions(+), 158 deletions(-) +Merging gfs2/master (46cc1e5 GFS2: local functions should be static) +$ git merge gfs2/master +Merge made by the 'recursive' strategy. + fs/gfs2/acl.c | 14 +-- + fs/gfs2/aops.c | 18 ++-- + fs/gfs2/bmap.c | 26 ++--- + fs/gfs2/dir.c | 64 ++++++++++- + fs/gfs2/dir.h | 2 +- + fs/gfs2/export.c | 3 +- + fs/gfs2/file.c | 34 +++--- + fs/gfs2/incore.h | 20 ++-- + fs/gfs2/inode.c | 72 +++++++------ + fs/gfs2/log.c | 2 +- + fs/gfs2/main.c | 3 +- + fs/gfs2/meta_io.c | 4 +- + fs/gfs2/ops_fstype.c | 2 +- + fs/gfs2/quota.c | 87 ++++++--------- + fs/gfs2/rgrp.c | 293 +++++++++++++++++++++++++++---------------------- + fs/gfs2/rgrp.h | 16 ++-- + fs/gfs2/super.c | 14 ++-- + fs/gfs2/trans.h | 6 +- + fs/gfs2/xattr.c | 48 ++++----- + 19 files changed, 394 insertions(+), 334 deletions(-) +Merging hfsplus/for-next (6596528 hfsplus: ensure bio requests are not smaller than the hardware sectors) +$ git merge hfsplus/for-next +Already up-to-date. +Merging jfs/next (1c8007b jfs: flush journal completely before releasing metadata inodes) +$ git merge jfs/next +Already up-to-date. +Merging logfs/master (21f3eb8 logfs: update page reference count for pined pages) +$ git merge logfs/master +Resolved 'fs/logfs/file.c' using previous resolution. +Auto-merging fs/logfs/super.c +Auto-merging fs/logfs/readwrite.c +Auto-merging fs/logfs/logfs.h +Auto-merging fs/logfs/inode.c +Auto-merging fs/logfs/file.c +CONFLICT (content): Merge conflict in fs/logfs/file.c +Auto-merging fs/logfs/dir.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 51778ba] Merge remote-tracking branch 'logfs/master' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 1 + + fs/logfs/dev_mtd.c | 26 +++++++++++------------- + fs/logfs/dir.c | 2 +- + fs/logfs/file.c | 2 + + fs/logfs/gc.c | 2 +- + fs/logfs/inode.c | 4 ++- + fs/logfs/journal.c | 1 - + fs/logfs/logfs.h | 5 +++- + fs/logfs/readwrite.c | 51 +++++++++++++++++++++++++++++++++---------------- + fs/logfs/segment.c | 51 ++++++++++++++++++++++++++++++++++++++----------- + fs/logfs/super.c | 3 +- + 11 files changed, 99 insertions(+), 49 deletions(-) +Merging nfs/linux-next (652f89f NFSv4: Do not accept delegated opens when a delegation recall is in effect) +$ git merge nfs/linux-next +Merge made by the 'recursive' strategy. + fs/nfs/nfs4proc.c | 24 ++++++++++++++++-------- + fs/nfs/nfs4state.c | 33 +++++++++++++++++++++------------ + net/sunrpc/sched.c | 30 +++++++++++++++++++++++------- + net/sunrpc/xprt.c | 10 ++++------ + 4 files changed, 64 insertions(+), 33 deletions(-) +Merging nfsd/nfsd-next (f5c8593b NFSd: use network-namespace-aware cache registering routines) +$ git merge nfsd/nfsd-next +Auto-merging MAINTAINERS +Auto-merging CREDITS +Merge made by the 'recursive' strategy. + CREDITS | 5 + + Documentation/filesystems/nfs/00-INDEX | 2 + + Documentation/filesystems/nfs/fault_injection.txt | 69 +++++ + MAINTAINERS | 1 - + fs/nfsd/Kconfig | 10 + + fs/nfsd/Makefile | 1 + + fs/nfsd/export.c | 12 +- + fs/nfsd/fault_inject.c | 91 ++++++ + fs/nfsd/fault_inject.h | 28 ++ + fs/nfsd/nfs4idmap.c | 11 +- + fs/nfsd/nfs4proc.c | 7 +- + fs/nfsd/nfs4state.c | 307 +++++++++++++++------ + fs/nfsd/nfs4xdr.c | 3 +- + fs/nfsd/nfsctl.c | 10 +- + fs/nfsd/nfsd.h | 20 +- + fs/nfsd/state.h | 1 + + include/linux/sunrpc/svc_xprt.h | 3 +- + include/linux/sunrpc/svcsock.h | 2 +- + net/sunrpc/cache.c | 2 + + net/sunrpc/svc.c | 21 +- + net/sunrpc/svc_xprt.c | 62 +++-- + net/sunrpc/svcsock.c | 8 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 2 +- + tools/nfsd/inject_fault.sh | 49 ++++ + 24 files changed, 579 insertions(+), 148 deletions(-) + create mode 100644 Documentation/filesystems/nfs/fault_injection.txt + create mode 100644 fs/nfsd/fault_inject.c + create mode 100644 fs/nfsd/fault_inject.h + create mode 100755 tools/nfsd/inject_fault.sh +Merging nilfs2/for-next (93ee7a9 Linux 3.1-rc2) +$ git merge nilfs2/for-next +Already up-to-date. +Merging ocfs2/linux-next (9392557 ocfs2: avoid unaligned access to dqc_bitmap) +$ git merge ocfs2/linux-next +Already up-to-date. +Merging omfs/for-next (976d167 Linux 3.1-rc9) +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master (7657cac Squashfs: Add an option to set dev block size to 4K) +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next (883381d Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (eaecf43 UBIFS: Use kmemdup rather than duplicating its implementation) +$ git merge ubifs/linux-next +Merge made by the 'recursive' strategy. + fs/ubifs/lpt.c | 6 ++---- + fs/ubifs/tnc.c | 3 +-- + fs/ubifs/xattr.c | 6 ++---- + 3 files changed, 5 insertions(+), 10 deletions(-) +Merging xfs/master (9f9c19e xfs: fix the logspace waiting algorithm) +$ git merge xfs/master +Already up-to-date. +Merging vfs/for-next (206b1d0 Fix POSIX ACL permission check) +$ git merge vfs/for-next +Already up-to-date. +Merging vfs-scale/vfs-scale-working (32385c7 kernel: fix hlist_bl again) +$ git merge vfs-scale/vfs-scale-working +Already up-to-date. +Merging pci/linux-next (dcdef61 PCI: kconfig: English typo in pci/pcie/Kconfig) +$ git merge pci/linux-next +Auto-merging arch/tile/kernel/pci.c +Auto-merging arch/powerpc/kernel/pci-common.c +Auto-merging arch/powerpc/include/asm/pci.h +Auto-merging arch/powerpc/include/asm/pci-bridge.h +Auto-merging arch/mips/pci/pci.c +Auto-merging arch/arm/mach-ixp2000/enp2611.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-pci | 18 ++++ + Documentation/feature-removal-schedule.txt | 12 ++ + arch/alpha/kernel/pci.c | 37 ++++--- + arch/arm/common/it8152.c | 9 +- + arch/arm/common/via82c505.c | 3 +- + arch/arm/include/asm/mach/pci.h | 2 +- + arch/arm/include/asm/pci.h | 12 -- + arch/arm/kernel/bios32.c | 34 +++---- + arch/arm/mach-cns3xxx/pcie.c | 8 +- + arch/arm/mach-dove/pcie.c | 9 +- + arch/arm/mach-footbridge/dc21285.c | 8 +- + arch/arm/mach-integrator/pci_v3.c | 19 ++-- + arch/arm/mach-iop13xx/pci.c | 17 ++-- + arch/arm/mach-ixp2000/enp2611.c | 3 +- + arch/arm/mach-ixp2000/pci.c | 8 +- + arch/arm/mach-ixp23xx/pci.c | 8 +- + arch/arm/mach-ixp4xx/common-pci.c | 8 +- + arch/arm/mach-kirkwood/pcie.c | 8 +- + arch/arm/mach-ks8695/pci.c | 8 +- + arch/arm/mach-mv78xx0/pcie.c | 8 +- + arch/arm/mach-orion5x/pci.c | 16 ++-- + arch/arm/mach-sa1100/pci-nanoengine.c | 9 +- + arch/arm/mach-tegra/pcie.c | 9 +- + arch/arm/mach-versatile/pci.c | 19 ++-- + arch/arm/plat-iop/pci.c | 8 +- + arch/blackfin/include/asm/pci.h | 4 - + arch/frv/mb93090-mb00/pci-frv.c | 20 ---- + arch/frv/mb93090-mb00/pci-frv.h | 2 - + arch/frv/mb93090-mb00/pci-vdk.c | 11 +- + arch/h8300/include/asm/pci.h | 5 - + arch/ia64/include/asm/pci.h | 6 - + arch/ia64/pci/pci.c | 43 ++++---- + arch/microblaze/include/asm/pci-bridge.h | 1 - + arch/microblaze/include/asm/pci.h | 5 - + arch/microblaze/pci/pci-common.c | 43 ++++---- + arch/mips/pci/pci.c | 38 ++----- + arch/mn10300/unit-asb2305/pci-asb2305.c | 22 ---- + arch/mn10300/unit-asb2305/pci-asb2305.h | 2 - + arch/mn10300/unit-asb2305/pci.c | 12 +- + arch/powerpc/include/asm/pci-bridge.h | 1 - + arch/powerpc/include/asm/pci.h | 5 - + arch/powerpc/kernel/pci-common.c | 30 ++++-- + arch/powerpc/kernel/pci_64.c | 40 ++++---- + arch/sh/drivers/pci/pci.c | 41 ++------ + arch/sparc/include/asm/pci_32.h | 5 - + arch/sparc/include/asm/pci_64.h | 5 - + arch/sparc/kernel/leon_pci.c | 25 ++--- + arch/sparc/kernel/pci.c | 22 ++-- + arch/tile/include/asm/pci.h | 7 -- + arch/tile/kernel/pci.c | 5 + + arch/unicore32/include/asm/pci.h | 5 - + arch/unicore32/kernel/pci.c | 5 + + arch/x86/include/asm/pci_x86.h | 2 - + arch/x86/include/asm/topology.h | 2 +- + arch/x86/pci/acpi.c | 46 ++++++--- + arch/x86/pci/amd_bus.c | 1 - + arch/x86/pci/broadcom_bus.c | 62 +++++++---- + arch/x86/pci/bus_numa.c | 31 ++++--- + arch/x86/pci/common.c | 19 ++-- + arch/x86/pci/i386.c | 20 ---- + arch/x86/pci/legacy.c | 3 - + arch/x86/pci/numaq_32.c | 2 - + arch/xtensa/include/asm/pci.h | 5 - + arch/xtensa/kernel/pci.c | 90 +++++++++-------- + drivers/acpi/pci_irq.c | 10 +- + drivers/acpi/pci_root.c | 7 ++ + drivers/parisc/dino.c | 47 ++++----- + drivers/parisc/lba_pci.c | 72 +++++++------ + drivers/pci/access.c | 76 +++++++++----- + drivers/pci/ats.c | 20 ++-- + drivers/pci/bus.c | 32 +++++- + drivers/pci/hotplug/acpiphp_glue.c | 4 +- + drivers/pci/hotplug/pciehp.h | 1 - + drivers/pci/hotplug/pciehp_core.c | 11 +-- + drivers/pci/hotplug/pciehp_ctrl.c | 4 +- + drivers/pci/hotplug/pciehp_hpc.c | 1 - + drivers/pci/iov.c | 16 ++-- + drivers/pci/msi.c | 121 ++++++++++++++++++++++ + drivers/pci/pci-acpi.c | 13 ++- + drivers/pci/pci-driver.c | 3 +- + drivers/pci/pci.c | 152 +++++++++++++++++++++++++++- + drivers/pci/pci.h | 2 + + drivers/pci/pcie/Kconfig | 2 +- + drivers/pci/pcie/aspm.c | 58 +++++++---- + drivers/pci/probe.c | 67 +++++++++++-- + drivers/pci/remove.c | 10 ++- + drivers/pci/setup-res.c | 6 +- + drivers/scsi/ipr.c | 67 +++++++++++-- + drivers/scsi/ipr.h | 1 + + drivers/uio/uio_pci_generic.c | 78 ++------------- + include/linux/acpi.h | 4 + + include/linux/msi.h | 3 + + include/linux/pci-aspm.h | 4 +- + include/linux/pci.h | 43 +++++--- + include/linux/pci_regs.h | 6 +- + 95 files changed, 1119 insertions(+), 815 deletions(-) +Merging hid/for-next (92a0db5 Merge branch 'roccat' into for-next) +$ git merge hid/for-next +Auto-merging drivers/hid/hid-wiimote-core.c +Removing drivers/hid/hid-quanta.c +Auto-merging drivers/hid/hid-hyperv.c +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-driver-hid-multitouch | 9 + + .../ABI/testing/sysfs-driver-hid-roccat-isku | 135 ++++ + Documentation/ABI/testing/sysfs-driver-hid-wiimote | 12 + + drivers/hid/Kconfig | 34 +- + drivers/hid/Makefile | 11 +- + drivers/hid/hid-core.c | 18 +- + drivers/hid/hid-debug.c | 8 + + .../{staging/hv/hv_mouse.c => hid/hid-hyperv.c} | 303 ++++---- + drivers/hid/hid-ids.h | 22 +- + drivers/hid/hid-input.c | 117 +++ + drivers/hid/hid-lg4ff.c | 2 +- + drivers/hid/hid-multitouch.c | 161 +++-- + drivers/hid/hid-picolcd.c | 4 +- + drivers/hid/hid-quanta.c | 261 ------- + drivers/hid/hid-roccat-common.c | 4 +- + drivers/hid/hid-roccat-isku.c | 487 +++++++++++++ + drivers/hid/hid-roccat-isku.h | 147 ++++ + drivers/hid/hid-roccat-kone.c | 4 +- + drivers/hid/hid-wacom.c | 179 ++++- + drivers/hid/{hid-wiimote.c => hid-wiimote-core.c} | 246 +++---- + drivers/hid/hid-wiimote-debug.c | 227 ++++++ + drivers/hid/hid-wiimote-ext.c | 752 ++++++++++++++++++++ + drivers/hid/hid-wiimote.h | 208 ++++++ + drivers/hid/usbhid/usbkbd.c | 64 ++- + drivers/staging/hv/Kconfig | 6 - + drivers/staging/hv/Makefile | 1 - + drivers/usb/misc/usbled.c | 2 + + include/linux/hid.h | 16 + + 28 files changed, 2777 insertions(+), 663 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-multitouch + create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-isku + rename drivers/{staging/hv/hv_mouse.c => hid/hid-hyperv.c} (75%) + delete mode 100644 drivers/hid/hid-quanta.c + create mode 100644 drivers/hid/hid-roccat-isku.c + create mode 100644 drivers/hid/hid-roccat-isku.h + rename drivers/hid/{hid-wiimote.c => hid-wiimote-core.c} (89%) + create mode 100644 drivers/hid/hid-wiimote-debug.c + create mode 100644 drivers/hid/hid-wiimote-ext.c + create mode 100644 drivers/hid/hid-wiimote.h +Merging quilt/i2c (a682833 i2c-ali1535: enable SPARC support) +$ git merge quilt/i2c +Merge made by the 'recursive' strategy. + drivers/i2c/busses/i2c-ali1535.c | 38 +++++++++++++++++++++++++++----------- + drivers/i2c/busses/i2c-nforce2.c | 2 +- + drivers/i2c/busses/i2c-sis5595.c | 4 ++-- + drivers/i2c/busses/i2c-sis630.c | 6 +++++- + drivers/i2c/busses/i2c-viapro.c | 7 +++++-- + 5 files changed, 40 insertions(+), 17 deletions(-) +Merging bjdooks-i2c/next-i2c (f8420b7 fixup merge) +$ git merge bjdooks-i2c/next-i2c +Resolved 'drivers/i2c/busses/i2c-designware-platdrv.c' using previous resolution. +Auto-merging drivers/i2c/busses/i2c-designware-platdrv.c +CONFLICT (add/add): Merge conflict in drivers/i2c/busses/i2c-designware-platdrv.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1984afc] Merge remote-tracking branch 'bjdooks-i2c/next-i2c' +$ git diff -M --stat --summary HEAD^.. + drivers/i2c/busses/i2c-designware-platdrv.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging quilt/jdelvare-hwmon (4a96f1a hwmon: (coretemp) Add missing section annotations) +$ git merge quilt/jdelvare-hwmon +Merge made by the 'recursive' strategy. + Documentation/hwmon/lm63 | 8 +++ + drivers/hwmon/Kconfig | 4 +- + drivers/hwmon/coretemp.c | 26 +++++---- + drivers/hwmon/lm63.c | 131 +++++++++++++++++++++++++++++++++++---------- + drivers/hwmon/max1111.c | 15 +++-- + 5 files changed, 136 insertions(+), 48 deletions(-) +Merging hwmon-staging/hwmon-next (55f5bfd hwmon: (f75375s) Disable setting DC fan control mode for F75373) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + Documentation/hwmon/pmbus | 5 +- + Documentation/hwmon/zl6100 | 15 ++++ + drivers/hwmon/f75375s.c | 158 ++++++++++++++++++++++++++++++---------- + drivers/hwmon/jz4740-hwmon.c | 4 +- + drivers/hwmon/pmbus/Kconfig | 9 ++- + drivers/hwmon/pmbus/adm1275.c | 71 +++++++++++++------ + drivers/hwmon/pmbus/pmbus.c | 2 - + drivers/hwmon/pmbus/zl6100.c | 43 +++++++++-- + 8 files changed, 228 insertions(+), 79 deletions(-) +Merging quilt/kernel-doc (c3b92c8 Linux 3.1) +$ git merge quilt/kernel-doc +Already up-to-date. +Merging docs/docs-move (5c24d8b Merge branch 'docs/docbook/drm' of git://github.com/mfwitten/linux into docs-move) +$ git merge docs/docs-move +Already up-to-date. +Merging v4l-dvb/master (6dd9380 Merge /home/v4l/v4l/patchwork) +$ git merge v4l-dvb/master +Resolved 'drivers/staging/media/as102/as102_drv.h' using previous resolution. +Auto-merging drivers/staging/media/as102/as102_drv.h +CONFLICT (content): Merge conflict in drivers/staging/media/as102/as102_drv.h +Auto-merging drivers/staging/media/as102/as102_drv.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ed54697] Merge remote-tracking branch 'v4l-dvb/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/media/dvb/dvbproperty.xml | 4 + + Documentation/DocBook/media/v4l/biblio.xml | 8 - + Documentation/DocBook/media/v4l/common.xml | 8 - + Documentation/DocBook/media/v4l/compat.xml | 10 +- + Documentation/DocBook/media/v4l/controls.xml | 8 - + Documentation/DocBook/media/v4l/dev-capture.xml | 8 - + Documentation/DocBook/media/v4l/dev-codec.xml | 8 - + Documentation/DocBook/media/v4l/dev-effect.xml | 8 - + Documentation/DocBook/media/v4l/dev-event.xml | 8 - + Documentation/DocBook/media/v4l/dev-osd.xml | 8 - + Documentation/DocBook/media/v4l/dev-output.xml | 8 - + Documentation/DocBook/media/v4l/dev-overlay.xml | 8 - + Documentation/DocBook/media/v4l/dev-radio.xml | 8 - + Documentation/DocBook/media/v4l/dev-raw-vbi.xml | 8 - + Documentation/DocBook/media/v4l/dev-rds.xml | 16 +- + Documentation/DocBook/media/v4l/dev-sliced-vbi.xml | 9 - + Documentation/DocBook/media/v4l/dev-teletext.xml | 8 - + Documentation/DocBook/media/v4l/driver.xml | 8 - + Documentation/DocBook/media/v4l/func-close.xml | 8 - + Documentation/DocBook/media/v4l/func-ioctl.xml | 8 - + Documentation/DocBook/media/v4l/func-mmap.xml | 8 - + Documentation/DocBook/media/v4l/func-munmap.xml | 8 - + Documentation/DocBook/media/v4l/func-open.xml | 8 - + Documentation/DocBook/media/v4l/func-poll.xml | 8 - + Documentation/DocBook/media/v4l/func-read.xml | 8 - + Documentation/DocBook/media/v4l/func-select.xml | 8 - + Documentation/DocBook/media/v4l/func-write.xml | 8 - + Documentation/DocBook/media/v4l/io.xml | 8 - + Documentation/DocBook/media/v4l/libv4l.xml | 7 - + Documentation/DocBook/media/v4l/pixfmt-grey.xml | 8 - + Documentation/DocBook/media/v4l/pixfmt-m420.xml | 8 - + Documentation/DocBook/media/v4l/pixfmt-nv12.xml | 8 - + Documentation/DocBook/media/v4l/pixfmt-nv12m.xml | 8 - + Documentation/DocBook/media/v4l/pixfmt-nv12mt.xml | 8 - + Documentation/DocBook/media/v4l/pixfmt-nv16.xml | 8 - + .../DocBook/media/v4l/pixfmt-packed-rgb.xml | 8 - + .../DocBook/media/v4l/pixfmt-packed-yuv.xml | 8 - + Documentation/DocBook/media/v4l/pixfmt-sbggr16.xml | 8 - + Documentation/DocBook/media/v4l/pixfmt-sbggr8.xml | 8 - + Documentation/DocBook/media/v4l/pixfmt-sgbrg8.xml | 8 - + Documentation/DocBook/media/v4l/pixfmt-sgrbg8.xml | 8 - + Documentation/DocBook/media/v4l/pixfmt-uyvy.xml | 8 - + Documentation/DocBook/media/v4l/pixfmt-vyuy.xml | 8 - + Documentation/DocBook/media/v4l/pixfmt-y16.xml | 8 - + Documentation/DocBook/media/v4l/pixfmt-y41p.xml | 8 - + Documentation/DocBook/media/v4l/pixfmt-yuv410.xml | 8 - + Documentation/DocBook/media/v4l/pixfmt-yuv411p.xml | 8 - + Documentation/DocBook/media/v4l/pixfmt-yuv420.xml | 8 - + Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml | 8 - + Documentation/DocBook/media/v4l/pixfmt-yuv422p.xml | 8 - + Documentation/DocBook/media/v4l/pixfmt-yuyv.xml | 8 - + Documentation/DocBook/media/v4l/pixfmt-yvyu.xml | 8 - + Documentation/DocBook/media/v4l/pixfmt.xml | 8 - + .../DocBook/media/v4l/vidioc-enum-dv-presets.xml | 8 - + .../DocBook/media/v4l/vidioc-enum-fmt.xml | 8 - + .../DocBook/media/v4l/vidioc-enuminput.xml | 8 - + .../DocBook/media/v4l/vidioc-enumoutput.xml | 8 - + Documentation/DocBook/media/v4l/vidioc-enumstd.xml | 8 - + Documentation/DocBook/media/v4l/vidioc-g-ctrl.xml | 8 - + .../DocBook/media/v4l/vidioc-g-ext-ctrls.xml | 7 - + Documentation/DocBook/media/v4l/vidioc-g-fbuf.xml | 14 +- + .../DocBook/media/v4l/vidioc-g-frequency.xml | 8 - + .../DocBook/media/v4l/vidioc-g-modulator.xml | 8 - + .../DocBook/media/v4l/vidioc-g-priority.xml | 8 - + Documentation/DocBook/media/v4l/vidioc-g-std.xml | 8 - + Documentation/DocBook/media/v4l/vidioc-g-tuner.xml | 18 +- + .../DocBook/media/v4l/vidioc-querybuf.xml | 8 - + .../DocBook/media/v4l/vidioc-queryctrl.xml | 8 - + .../DocBook/media/v4l/vidioc-s-hw-freq-seek.xml | 8 - + Documentation/dvb/get_dvb_firmware | 42 +- + Documentation/video4linux/CARDLIST.bttv | 2 +- + Documentation/video4linux/CARDLIST.cx23885 | 2 + + Documentation/video4linux/CARDLIST.cx88 | 2 + + Documentation/video4linux/CARDLIST.em28xx | 6 +- + Documentation/video4linux/CARDLIST.saa7134 | 1 + + Documentation/video4linux/CARDLIST.saa7164 | 2 + + Documentation/video4linux/v4l2-framework.txt | 11 + + MAINTAINERS | 10 + + drivers/media/common/tuners/mt2060.c | 9 +- + drivers/media/common/tuners/mxl5007t.c | 52 +- + drivers/media/common/tuners/qt1010.c | 9 +- + drivers/media/common/tuners/tda18212.c | 66 +- + drivers/media/common/tuners/tda18212.h | 4 + + drivers/media/common/tuners/tda18218.c | 18 +- + drivers/media/common/tuners/tda18218_priv.h | 2 + + drivers/media/common/tuners/tda18271-fe.c | 10 + + drivers/media/common/tuners/tda18271-priv.h | 2 + + drivers/media/common/tuners/tuner-simple.c | 11 + + drivers/media/common/tuners/tuner-xc2028.c | 2 +- + drivers/media/common/tuners/xc5000.c | 47 +- + drivers/media/dvb/dvb-core/dvb_frontend.c | 2 + + drivers/media/dvb/dvb-usb/Kconfig | 5 +- + drivers/media/dvb/dvb-usb/af9015.c | 97 ++ + drivers/media/dvb/dvb-usb/af9015.h | 7 + + drivers/media/dvb/dvb-usb/anysee.c | 411 +++++++-- + drivers/media/dvb/dvb-usb/anysee.h | 6 + + drivers/media/dvb/dvb-usb/dib0700_devices.c | 676 ++++++++++++- + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 5 + + drivers/media/dvb/dvb-usb/dw2102.c | 15 +- + drivers/media/dvb/dvb-usb/it913x.c | 282 ++++-- + drivers/media/dvb/dvb-usb/mxl111sf-tuner.c | 56 +- + drivers/media/dvb/dvb-usb/ttusb2.c | 19 +- + drivers/media/dvb/firewire/firedtv-avc.c | 3 +- + drivers/media/dvb/frontends/af9013.c | 41 +- + drivers/media/dvb/frontends/au8522_dig.c | 31 +- + drivers/media/dvb/frontends/cxd2820r.h | 13 - + drivers/media/dvb/frontends/cxd2820r_c.c | 13 +- + drivers/media/dvb/frontends/cxd2820r_t.c | 55 +- + drivers/media/dvb/frontends/cxd2820r_t2.c | 62 +- + drivers/media/dvb/frontends/dib0090.c | 163 +++- + drivers/media/dvb/frontends/dib0090.h | 54 +- + drivers/media/dvb/frontends/dib7000p.c | 332 ++++--- + drivers/media/dvb/frontends/dib7000p.h | 16 +- + drivers/media/dvb/frontends/dib8000.c | 1061 ++++++++++++++++++-- + drivers/media/dvb/frontends/dib8000.h | 42 +- + drivers/media/dvb/frontends/dibx000_common.h | 7 + + drivers/media/dvb/frontends/drxd_hard.c | 3 +- + drivers/media/dvb/frontends/drxk.h | 2 + + drivers/media/dvb/frontends/drxk_hard.c | 18 +- + drivers/media/dvb/frontends/drxk_hard.h | 2 + + drivers/media/dvb/frontends/it913x-fe-priv.h | 742 +++++++++++++- + drivers/media/dvb/frontends/it913x-fe.c | 198 +++- + drivers/media/dvb/frontends/it913x-fe.h | 33 +- + drivers/media/dvb/frontends/s5h1409.c | 31 +- + drivers/media/dvb/frontends/s5h1411.c | 31 +- + drivers/media/dvb/frontends/tda18271c2dd.c | 32 +- + drivers/media/dvb/ttpci/av7110.c | 2 +- + drivers/media/radio/Kconfig | 297 +++--- + drivers/media/radio/tef6862.c | 8 +- + drivers/media/radio/wl128x/fmdrv_v4l2.c | 1 + + drivers/media/rc/Kconfig | 10 + + drivers/media/rc/Makefile | 1 + + drivers/media/rc/ati_remote.c | 111 +-- + drivers/media/rc/ir-nec-decoder.c | 4 +- + drivers/media/rc/ir-raw.c | 1 + + drivers/media/rc/ir-rc6-decoder.c | 67 +- + drivers/media/rc/ir-sanyo-decoder.c | 205 ++++ + drivers/media/rc/keymaps/rc-ati-x10.c | 96 +- + drivers/media/rc/keymaps/rc-hauppauge.c | 51 + + drivers/media/rc/keymaps/rc-medion-x10.c | 128 ++-- + drivers/media/rc/keymaps/rc-snapstream-firefly.c | 114 ++-- + drivers/media/rc/rc-core-priv.h | 12 + + drivers/media/rc/rc-main.c | 1 + + drivers/media/rc/redrat3.c | 52 +- + drivers/media/video/Kconfig | 412 +++++---- + drivers/media/video/Makefile | 2 + + drivers/media/video/adv7170.c | 62 ++ + drivers/media/video/atmel-isi.c | 2 +- + drivers/media/video/au0828/au0828-cards.c | 7 + + drivers/media/video/au0828/au0828-i2c.c | 2 +- + drivers/media/video/bt8xx/bt848.h | 5 +- + drivers/media/video/bt8xx/bttv-cards.c | 58 +- + drivers/media/video/bt8xx/bttv-driver.c | 1 + + drivers/media/video/bt8xx/bttv-i2c.c | 2 +- + drivers/media/video/bt8xx/bttv.h | 3 +- + drivers/media/video/cx18/cx18-i2c.c | 2 +- + drivers/media/video/cx18/cx18-i2c.h | 2 +- + drivers/media/video/cx231xx/Kconfig | 4 +- + drivers/media/video/cx23885/cx23885-cards.c | 36 + + drivers/media/video/cx23885/cx23885-i2c.c | 2 +- + drivers/media/video/cx23885/cx23885-video.c | 3 +- + drivers/media/video/cx23885/cx23885.h | 1 + + drivers/media/video/cx25821/cx25821-alsa.c | 73 +- + .../media/video/cx25821/cx25821-audio-upstream.c | 113 +-- + drivers/media/video/cx25821/cx25821-audio.h | 39 +- + drivers/media/video/cx25821/cx25821-cards.c | 2 +- + drivers/media/video/cx25821/cx25821-core.c | 57 +- + drivers/media/video/cx25821/cx25821-i2c.c | 12 +- + .../media/video/cx25821/cx25821-medusa-defines.h | 6 +- + drivers/media/video/cx25821/cx25821-medusa-reg.h | 518 +++++----- + drivers/media/video/cx25821/cx25821-medusa-video.c | 410 +++----- + .../video/cx25821/cx25821-video-upstream-ch2.c | 138 ++-- + .../media/video/cx25821/cx25821-video-upstream.c | 156 ++-- + drivers/media/video/cx25821/cx25821-video.c | 145 ++-- + drivers/media/video/cx25821/cx25821.h | 4 +- + drivers/media/video/cx88/Kconfig | 10 +- + drivers/media/video/cx88/cx88-i2c.c | 2 +- + drivers/media/video/davinci/vpbe_display.c | 5 +- + drivers/media/video/em28xx/em28xx-cards.c | 62 ++- + drivers/media/video/em28xx/em28xx-dvb.c | 135 +++- + drivers/media/video/em28xx/em28xx-input.c | 7 +- + drivers/media/video/em28xx/em28xx.h | 3 + + drivers/media/video/gspca/benq.c | 7 +- + drivers/media/video/gspca/gl860/gl860.c | 1 - + drivers/media/video/gspca/gspca.c | 3 +- + drivers/media/video/gspca/gspca.h | 2 - + drivers/media/video/gspca/konica.c | 3 - + drivers/media/video/gspca/mars.c | 1 - + drivers/media/video/gspca/nw80x.c | 1 - + drivers/media/video/gspca/ov519.c | 1 - + drivers/media/video/gspca/pac207.c | 10 +- + drivers/media/video/gspca/se401.c | 10 +- + drivers/media/video/gspca/sonixj.c | 18 +- + drivers/media/video/gspca/spca561.c | 1 - + drivers/media/video/gspca/topro.c | 2 +- + drivers/media/video/gspca/xirlink_cit.c | 2 - + drivers/media/video/gspca/zc3xx.c | 117 +-- + drivers/media/video/ivtv/ivtv-fileops.c | 6 +- + drivers/media/video/ivtv/ivtv-i2c.h | 2 +- + drivers/media/video/m5mols/m5mols.h | 2 - + drivers/media/video/m5mols/m5mols_core.c | 22 +- + drivers/media/video/mt9m001.c | 5 +- + drivers/media/video/mt9m111.c | 8 +- + drivers/media/video/mt9p031.c | 5 +- + drivers/media/video/mt9t001.c | 5 +- + drivers/media/video/mt9t031.c | 5 +- + drivers/media/video/mt9t112.c | 4 +- + drivers/media/video/mt9v022.c | 5 +- + drivers/media/video/mt9v032.c | 8 +- + drivers/media/video/omap/omap_vout.c | 196 ++-- + drivers/media/video/omap/omap_voutdef.h | 2 +- + drivers/media/video/omap1_camera.c | 1 + + drivers/media/video/omap24xxcam-dma.c | 2 +- + drivers/media/video/omap3isp/ispvideo.c | 1 + + drivers/media/video/ov6650.c | 2 +- + drivers/media/video/pwc/pwc-ctrl.c | 137 ++-- + drivers/media/video/pwc/pwc-dec23.c | 7 + + drivers/media/video/pwc/pwc-dec23.h | 2 + + drivers/media/video/pwc/pwc-if.c | 155 ++-- + drivers/media/video/pwc/pwc-v4l.c | 155 ++- + drivers/media/video/pwc/pwc.h | 11 +- + drivers/media/video/s5p-fimc/fimc-capture.c | 14 +- + drivers/media/video/s5p-fimc/fimc-core.c | 24 +- + drivers/media/video/s5p-fimc/fimc-core.h | 2 + + drivers/media/video/s5p-fimc/fimc-mdevice.c | 43 +- + drivers/media/video/s5p-fimc/fimc-reg.c | 15 +- + drivers/media/video/s5p-g2d/Makefile | 3 + + drivers/media/video/s5p-g2d/g2d-hw.c | 104 ++ + drivers/media/video/s5p-g2d/g2d-regs.h | 115 +++ + drivers/media/video/s5p-g2d/g2d.c | 824 +++++++++++++++ + drivers/media/video/s5p-g2d/g2d.h | 83 ++ + drivers/media/video/s5p-mfc/s5p_mfc_enc.c | 2 +- + drivers/media/video/s5p-tv/mixer_video.c | 1 + + drivers/media/video/saa7134/saa7134-cards.c | 33 + + drivers/media/video/saa7134/saa7134.h | 1 + + drivers/media/video/saa7164/saa7164-bus.c | 4 +- + drivers/media/video/sh_mobile_ceu_camera.c | 34 +- + drivers/media/video/sh_mobile_csi2.c | 4 +- + drivers/media/video/soc_camera.c | 3 +- + drivers/media/video/tm6000/Kconfig | 6 +- + drivers/media/video/tm6000/tm6000-alsa.c | 21 +- + drivers/media/video/tm6000/tm6000-cards.c | 33 + + drivers/media/video/tm6000/tm6000-core.c | 74 +-- + drivers/media/video/tm6000/tm6000-dvb.c | 16 +- + drivers/media/video/tm6000/tm6000-input.c | 407 ++++---- + drivers/media/video/tm6000/tm6000-regs.h | 14 +- + drivers/media/video/tm6000/tm6000-stds.c | 89 +- + drivers/media/video/tm6000/tm6000-video.c | 21 +- + drivers/media/video/tm6000/tm6000.h | 3 + + drivers/media/video/tvp5150.c | 14 +- + drivers/media/video/usbvision/usbvision-i2c.c | 46 +- + drivers/media/video/uvc/Kconfig | 1 + + drivers/media/video/uvc/Makefile | 2 +- + drivers/media/video/uvc/uvc_ctrl.c | 17 +- + drivers/media/video/uvc/uvc_debugfs.c | 136 +++ + drivers/media/video/uvc/uvc_driver.c | 30 +- + drivers/media/video/uvc/uvc_isight.c | 10 +- + drivers/media/video/uvc/uvc_queue.c | 564 +++-------- + drivers/media/video/uvc/uvc_v4l2.c | 29 +- + drivers/media/video/uvc/uvc_video.c | 625 +++++++++++- + drivers/media/video/uvc/uvcvideo.h | 128 ++- + drivers/media/video/v4l2-dev.c | 10 +- + drivers/media/video/via-camera.c | 10 +- + drivers/media/video/videobuf-core.c | 3 +- + drivers/media/video/videobuf2-core.c | 48 +- + drivers/media/video/vino.c | 2 +- + drivers/media/video/vivi.c | 9 +- + drivers/staging/media/as102/Kconfig | 1 + + drivers/staging/media/as102/Makefile | 2 +- + drivers/staging/media/as102/as102_drv.c | 126 +-- + drivers/staging/media/as102/as102_drv.h | 59 +- + drivers/staging/media/as102/as102_fe.c | 4 - + drivers/staging/media/as102/as102_fw.c | 44 +- + drivers/staging/media/as102/as102_fw.h | 10 +- + drivers/staging/media/as102/as102_usb_drv.c | 36 +- + drivers/staging/media/as102/as102_usb_drv.h | 6 +- + drivers/staging/media/as102/as10x_cmd.c | 139 ++-- + drivers/staging/media/as102/as10x_cmd.h | 895 ++++++++--------- + drivers/staging/media/as102/as10x_cmd_cfg.c | 66 +- + drivers/staging/media/as102/as10x_cmd_stream.c | 56 +- + drivers/staging/media/as102/as10x_handle.h | 26 +- + drivers/staging/media/as102/as10x_types.h | 250 +++--- + drivers/staging/media/easycap/easycap.h | 93 +-- + drivers/staging/media/easycap/easycap_ioctl.c | 60 +- + drivers/staging/media/easycap/easycap_low.c | 273 +---- + drivers/staging/media/easycap/easycap_main.c | 379 +++----- + drivers/staging/media/easycap/easycap_settings.c | 2 +- + drivers/staging/media/easycap/easycap_sound.c | 340 +++---- + drivers/staging/media/go7007/go7007-usb.c | 8 +- + drivers/staging/media/lirc/lirc_imon.c | 4 +- + drivers/staging/media/lirc/lirc_serial.c | 113 +-- + drivers/staging/media/solo6x10/Makefile | 2 +- + .../media/solo6x10/{jpeg.h => solo6x10-jpeg.h} | 0 + drivers/staging/media/solo6x10/v4l2-enc.c | 2 +- + fs/eventpoll.c | 18 +- + fs/select.c | 38 +- + include/linux/dvb/frontend.h | 2 + + include/linux/poll.h | 13 +- + include/media/rc-map.h | 8 +- + include/media/soc_camera.h | 7 +- + 300 files changed, 10907 insertions(+), 5892 deletions(-) + create mode 100644 drivers/media/rc/ir-sanyo-decoder.c + create mode 100644 drivers/media/video/s5p-g2d/Makefile + create mode 100644 drivers/media/video/s5p-g2d/g2d-hw.c + create mode 100644 drivers/media/video/s5p-g2d/g2d-regs.h + create mode 100644 drivers/media/video/s5p-g2d/g2d.c + create mode 100644 drivers/media/video/s5p-g2d/g2d.h + create mode 100644 drivers/media/video/uvc/uvc_debugfs.c + rename drivers/staging/media/solo6x10/{jpeg.h => solo6x10-jpeg.h} (100%) +Merging kbuild/for-next (ddb550d Merge branch 'kbuild/misc' into kbuild/for-next) +$ git merge kbuild/for-next +Merge made by the 'recursive' strategy. + scripts/tags.sh | 46 ++++++++++++++++++++++++++++++++++++++++++++-- + 1 files changed, 44 insertions(+), 2 deletions(-) +Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next) +$ git merge kconfig/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging libata/NEXT (318072d SATA/PATA: convert drivers/ata/* to use module_platform_driver()) +$ git merge libata/NEXT +Auto-merging drivers/ata/pata_at91.c +Merge made by the 'recursive' strategy. + drivers/ata/libahci.c | 5 +- + drivers/ata/libata-core.c | 154 ++++++++++++++++++++++------------------ + drivers/ata/libata-scsi.c | 3 +- + drivers/ata/libata-sff.c | 4 +- + drivers/ata/libata-transport.c | 5 ++ + drivers/ata/libata.h | 1 + + drivers/ata/pata_arasan_cf.c | 12 +--- + drivers/ata/pata_at91.c | 15 +---- + drivers/ata/pata_cs5536.c | 99 +++++++++++--------------- + drivers/ata/pata_imx.c | 12 +--- + drivers/ata/pata_ixp4xx_cf.c | 13 +--- + drivers/ata/pata_mpc52xx.c | 21 +----- + drivers/ata/pata_of_platform.c | 12 +--- + drivers/ata/pata_palmld.c | 13 +--- + drivers/ata/pata_platform.c | 12 +--- + drivers/ata/pata_pxa.c | 13 +--- + drivers/ata/pata_rb532_cf.c | 21 +----- + drivers/ata/sata_dwc_460ex.c | 13 +--- + drivers/ata/sata_fsl.c | 14 +---- + drivers/scsi/scsi_error.c | 5 +- + drivers/scsi/scsi_pm.c | 16 ++++- + drivers/scsi/sd.c | 5 ++ + include/scsi/scsi_host.h | 3 + + 23 files changed, 176 insertions(+), 295 deletions(-) +Merging infiniband/for-next (5611cc45 Linux 3.2-rc4) +$ git merge infiniband/for-next +Already up-to-date. +Merging acpi/next (efb9058 Merge branches 'acpi', 'idle', 'mrst-pmu' and 'pm-tools' into next) +$ git merge acpi/next +Already up-to-date. +Merging cpupowerutils/master (498ca79 cpupower: use man(1) when calling "cpupower help subcommand") +$ git merge cpupowerutils/master +Already up-to-date. +Merging ieee1394/for-next (a572e68 firewire: ohci: fix isochronous DMA synchronization) +$ git merge ieee1394/for-next +Already up-to-date. +Merging ubi/linux-next (c55d743 UBI: fix missing scrub when there is a bit-flip) +$ git merge ubi/linux-next +Merge made by the 'recursive' strategy. + drivers/mtd/ubi/eba.c | 6 ++++-- + drivers/mtd/ubi/ubi.h | 2 ++ + drivers/mtd/ubi/wl.c | 5 ++++- + 3 files changed, 10 insertions(+), 3 deletions(-) +Merging dlm/next (9beb3bf dlm: convert rsb list to rb_tree) +$ git merge dlm/next +Merge made by the 'recursive' strategy. + fs/dlm/debug_fs.c | 28 ++++++++------- + fs/dlm/dlm_internal.h | 9 +++-- + fs/dlm/lock.c | 87 +++++++++++++++++++++++++++++++++++++++--------- + fs/dlm/lockspace.c | 23 +++++-------- + fs/dlm/recover.c | 21 +++++++---- + 5 files changed, 113 insertions(+), 55 deletions(-) +Merging scsi/master (7061bba [SCSI] bfa: fix endian and bit field check bug) +$ git merge scsi/master +Merge made by the 'recursive' strategy. + drivers/scsi/bfa/bfa_defs.h | 4 +- + drivers/scsi/bfa/bfa_defs_svc.h | 437 ++++++++++++++------------- + drivers/scsi/bfa/bfa_ioc.c | 6 +- + drivers/scsi/bfa/bfad_debugfs.c | 3 +- + drivers/scsi/device_handler/scsi_dh.c | 58 ---- + drivers/scsi/device_handler/scsi_dh_emc.c | 19 ++ + drivers/scsi/device_handler/scsi_dh_hp_sw.c | 19 ++ + drivers/scsi/device_handler/scsi_dh_rdac.c | 19 ++ + drivers/scsi/scsi_priv.h | 1 - + include/scsi/scsi_device.h | 1 - + 10 files changed, 283 insertions(+), 284 deletions(-) +Merging target-updates/for-next (5bda90c target: use ->exectute_task for all CDB emulation) +$ git merge target-updates/for-next +Already up-to-date. +Merging target-merge/for-next-merge (e0d85e5 ib_srpt: Initial SRP Target merge for v3.2-rc1) +$ git merge target-merge/for-next-merge +Merge made by the 'recursive' strategy. + drivers/infiniband/Kconfig | 1 + + drivers/infiniband/Makefile | 1 + + drivers/infiniband/ulp/srpt/Kconfig | 12 + + drivers/infiniband/ulp/srpt/Makefile | 2 + + drivers/infiniband/ulp/srpt/ib_dm_mad.h | 139 ++ + drivers/infiniband/ulp/srpt/ib_srpt.c | 4081 +++++++++++++++++++++++++++++++ + drivers/infiniband/ulp/srpt/ib_srpt.h | 444 ++++ + 7 files changed, 4680 insertions(+), 0 deletions(-) + create mode 100644 drivers/infiniband/ulp/srpt/Kconfig + create mode 100644 drivers/infiniband/ulp/srpt/Makefile + create mode 100644 drivers/infiniband/ulp/srpt/ib_dm_mad.h + create mode 100644 drivers/infiniband/ulp/srpt/ib_srpt.c + create mode 100644 drivers/infiniband/ulp/srpt/ib_srpt.h +Merging ibft/linux-next (5611cc45 Linux 3.2-rc4) +$ git merge ibft/linux-next +Already up-to-date. +Merging slave-dma/next (3506c0d DMA: PL330: Remove pm_runtime_xxx calls from pl330 probe/remove) +$ git merge slave-dma/next +Resolved 'drivers/dma/pl330.c' using previous resolution. +Auto-merging drivers/usb/renesas_usbhs/fifo.c +Auto-merging drivers/tty/serial/sh-sci.c +Auto-merging drivers/tty/serial/pch_uart.c +Auto-merging drivers/spi/spi-pl022.c +Auto-merging drivers/misc/carma/carma-fpga-program.c +Auto-merging drivers/dma/pl330.c +CONFLICT (content): Merge conflict in drivers/dma/pl330.c +Auto-merging arch/arm/plat-samsung/include/plat/dma-ops.h +Auto-merging arch/arm/plat-samsung/dma-ops.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2d46324] Merge remote-tracking branch 'slave-dma/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/dma/atmel-dma.txt | 14 + + Documentation/dmaengine.txt | 8 + + MAINTAINERS | 1 + + arch/arm/mach-ep93xx/include/mach/dma.h | 6 +- + arch/arm/plat-mxc/include/mach/mx3fb.h | 15 + + arch/arm/plat-nomadik/include/plat/ste_dma40.h | 11 +- + arch/arm/plat-samsung/dma-ops.c | 4 +- + arch/arm/plat-samsung/include/plat/dma-ops.h | 4 +- + drivers/dma/Kconfig | 27 +- + drivers/dma/Makefile | 1 + + drivers/dma/amba-pl08x.c | 41 +- + drivers/dma/at_hdmac.c | 103 +++- + drivers/dma/at_hdmac_regs.h | 1 + + drivers/dma/coh901318.c | 12 +- + drivers/dma/coh901318_lli.c | 23 +- + drivers/dma/coh901318_lli.h | 4 +- + drivers/dma/dmaengine.c | 4 +- + drivers/dma/dw_dmac.c | 83 ++- + drivers/dma/dw_dmac_regs.h | 1 + + drivers/dma/ep93xx_dma.c | 90 ++- + drivers/dma/fsldma.c | 4 +- + drivers/dma/imx-dma.c | 10 +- + drivers/dma/imx-sdma.c | 22 +- + drivers/dma/intel_mid_dma.c | 14 +- + drivers/dma/intel_mid_dma_regs.h | 2 +- + drivers/dma/iop-adma.c | 16 +- + drivers/dma/ipu/ipu_idmac.c | 29 +- + drivers/dma/mpc512x_dma.c | 12 +- + drivers/dma/mxs-dma.c | 8 +- + drivers/dma/pch_dma.c | 20 +- + drivers/dma/pl330.c | 35 +- + drivers/dma/shdma.c | 25 +- + drivers/dma/sirf-dma.c | 707 ++++++++++++++++++++ + drivers/dma/ste_dma40.c | 437 +++++++++++-- + drivers/dma/ste_dma40_ll.h | 11 + + drivers/dma/timb_dma.c | 30 +- + drivers/dma/txx9dmac.c | 12 +- + drivers/media/video/mx3_camera.c | 2 +- + drivers/media/video/timblogiw.c | 2 +- + drivers/misc/carma/carma-fpga-program.c | 2 +- + drivers/mmc/host/atmel-mci.c | 10 +- + drivers/mmc/host/mmci.c | 11 +- + drivers/mmc/host/mxcmmc.c | 10 +- + drivers/mmc/host/mxs-mmc.c | 7 +- + drivers/mmc/host/sh_mmcif.c | 4 +- + drivers/mmc/host/tmio_mmc_dma.c | 4 +- + drivers/net/ethernet/micrel/ks8842.c | 4 +- + drivers/spi/spi-dw-mid.c | 8 +- + drivers/spi/spi-ep93xx.c | 9 +- + drivers/spi/spi-pl022.c | 8 +- + drivers/spi/spi-topcliff-pch.c | 4 +- + drivers/tty/serial/amba-pl011.c | 8 +- + drivers/tty/serial/pch_uart.c | 4 +- + drivers/tty/serial/sh-sci.c | 4 +- + drivers/usb/musb/ux500_dma.c | 4 +- + drivers/usb/renesas_usbhs/fifo.c | 4 +- + drivers/video/mx3fb.c | 65 +-- + include/linux/amba/pl08x.h | 4 +- + include/linux/dmaengine.h | 98 +++- + include/linux/dw_dmac.h | 2 +- + include/linux/sh_dma.h | 2 +- + include/linux/sirfsoc_dma.h | 6 + + sound/atmel/abdac.c | 2 +- + sound/atmel/ac97c.c | 10 +- + sound/soc/ep93xx/ep93xx-pcm.c | 4 +- + sound/soc/imx/imx-pcm-dma-mx2.c | 6 +- + sound/soc/samsung/dma.c | 4 +- + sound/soc/sh/siu_pcm.c | 4 +- + sound/soc/txx9/txx9aclc.c | 2 +- + 69 files changed, 1709 insertions(+), 456 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/atmel-dma.txt + create mode 100644 drivers/dma/sirf-dma.c + create mode 100644 include/linux/sirfsoc_dma.h +Merging async_tx/next (21ef4b8 dmaengine: use DEFINE_IDR for static initialization) +$ git merge async_tx/next +Already up-to-date. +Merging net-next/master (08e34eb xen-netfront: delay gARP until backend switches to Connected) +$ git merge net-next/master +Auto-merging net/sunrpc/svcsock.c +Auto-merging net/sunrpc/svc_xprt.c +Auto-merging net/sunrpc/svc.c +Auto-merging net/nfc/nci/core.c +Auto-merging net/mac80211/agg-tx.c +Auto-merging net/ipv6/sit.c +Auto-merging net/ipv6/addrconf.c +Auto-merging net/ipv4/ipip.c +Auto-merging net/batman-adv/translation-table.c +Removing drivers/net/wireless/wl12xx/sdio_test.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-ucode.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-testmode.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn-tx.c +Auto-merging drivers/net/wireless/iwlegacy/prph.h +Removing drivers/net/wireless/iwlegacy/iwl4965-base.c +Removing drivers/net/wireless/iwlegacy/iwl3945-base.c +Removing drivers/net/wireless/iwlegacy/iwl-tx.c +Removing drivers/net/wireless/iwlegacy/iwl-sta.h +Removing drivers/net/wireless/iwlegacy/iwl-scan.c +Removing drivers/net/wireless/iwlegacy/iwl-rx.c +Removing drivers/net/wireless/iwlegacy/iwl-power.h +Removing drivers/net/wireless/iwlegacy/iwl-power.c +Removing drivers/net/wireless/iwlegacy/iwl-legacy-rs.h +Removing drivers/net/wireless/iwlegacy/iwl-led.h +Removing drivers/net/wireless/iwlegacy/iwl-led.c +Removing drivers/net/wireless/iwlegacy/iwl-io.h +Removing drivers/net/wireless/iwlegacy/iwl-helpers.h +Removing drivers/net/wireless/iwlegacy/iwl-hcmd.c +Removing drivers/net/wireless/iwlegacy/iwl-fh.h +Removing drivers/net/wireless/iwlegacy/iwl-eeprom.h +Removing drivers/net/wireless/iwlegacy/iwl-eeprom.c +Removing drivers/net/wireless/iwlegacy/iwl-devtrace.h +Removing drivers/net/wireless/iwlegacy/iwl-devtrace.c +Removing drivers/net/wireless/iwlegacy/iwl-dev.h +Removing drivers/net/wireless/iwlegacy/iwl-debugfs.c +Removing drivers/net/wireless/iwlegacy/iwl-debug.h +Removing drivers/net/wireless/iwlegacy/iwl-core.h +Removing drivers/net/wireless/iwlegacy/iwl-core.c +Removing drivers/net/wireless/iwlegacy/iwl-4965.h +Removing drivers/net/wireless/iwlegacy/iwl-4965.c +Removing drivers/net/wireless/iwlegacy/iwl-4965-ucode.c +Removing drivers/net/wireless/iwlegacy/iwl-4965-tx.c +Removing drivers/net/wireless/iwlegacy/iwl-4965-sta.c +Removing drivers/net/wireless/iwlegacy/iwl-4965-rx.c +Removing drivers/net/wireless/iwlegacy/iwl-4965-rs.c +Removing drivers/net/wireless/iwlegacy/iwl-4965-lib.c +Removing drivers/net/wireless/iwlegacy/iwl-4965-led.h +Removing drivers/net/wireless/iwlegacy/iwl-4965-led.c +Removing drivers/net/wireless/iwlegacy/iwl-4965-hw.h +Removing drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c +Removing drivers/net/wireless/iwlegacy/iwl-4965-debugfs.h +Removing drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c +Removing drivers/net/wireless/iwlegacy/iwl-4965-calib.h +Removing drivers/net/wireless/iwlegacy/iwl-3945.h +Removing drivers/net/wireless/iwlegacy/iwl-3945.c +Removing drivers/net/wireless/iwlegacy/iwl-3945-rs.c +Removing drivers/net/wireless/iwlegacy/iwl-3945-led.h +Removing drivers/net/wireless/iwlegacy/iwl-3945-led.c +Removing drivers/net/wireless/iwlegacy/iwl-3945-hw.h +Removing drivers/net/wireless/iwlegacy/iwl-3945-fh.h +Removing drivers/net/wireless/iwlegacy/iwl-3945-debugfs.h +Removing drivers/net/wireless/iwlegacy/iwl-3945-debugfs.c +Auto-merging drivers/net/wireless/iwlegacy/csr.h +Auto-merging drivers/net/wireless/iwlegacy/commands.h +Auto-merging drivers/net/wireless/iwlegacy/4965-calib.c +Removing drivers/net/wireless/brcm80211/brcmfmac/bcmchip.h +Auto-merging drivers/net/wireless/ath/ath9k/main.c +Removing drivers/net/wireless/ath/ath6kl/htc_hif.h +Auto-merging drivers/net/wireless/ath/ath6kl/hif.c +Auto-merging drivers/net/ppp/pptp.c +Auto-merging drivers/net/ethernet/micrel/ks8842.c +Auto-merging drivers/net/ethernet/freescale/fsl_pq_mdio.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/freescale/fsl_pq_mdio.c +Auto-merging drivers/net/ethernet/freescale/fec.c +Auto-merging drivers/net/ethernet/Makefile +Auto-merging drivers/net/dsa/mv88e6xxx.h +Auto-merging drivers/net/dsa/mv88e6xxx.c +Auto-merging drivers/net/dsa/mv88e6131.c +Auto-merging drivers/net/dsa/mv88e6123_61_65.c +Auto-merging drivers/net/dsa/mv88e6060.c +Removing drivers/net/bonding/bond_ipv6.c +Auto-merging MAINTAINERS +Auto-merging Documentation/feature-removaResolved 'drivers/net/ethernet/freescale/fsl_pq_mdio.c' using previous resolution. +l-schedule.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2d3b2ab] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/cgroups/net_prio.txt | 53 + + .../devicetree/bindings/net/calxeda-xgmac.txt | 15 + + .../devicetree/bindings/net/can/cc770.txt | 53 + + Documentation/feature-removal-schedule.txt | 3 +- + Documentation/networking/00-INDEX | 2 + + Documentation/networking/ieee802154.txt | 27 + + Documentation/networking/ifenslave.c | 2 + + Documentation/networking/ip-sysctl.txt | 13 + + Documentation/networking/openvswitch.txt | 195 + + Documentation/networking/team.txt | 2 + + MAINTAINERS | 15 + + arch/alpha/include/asm/socket.h | 3 + + arch/arm/include/asm/socket.h | 3 + + arch/avr32/include/asm/socket.h | 3 + + arch/cris/include/asm/socket.h | 3 + + arch/frv/include/asm/socket.h | 3 + + arch/h8300/include/asm/socket.h | 3 + + arch/ia64/include/asm/socket.h | 3 + + arch/m32r/include/asm/socket.h | 3 + + arch/m68k/include/asm/socket.h | 3 + + arch/mips/include/asm/socket.h | 3 + + arch/mn10300/include/asm/socket.h | 3 + + arch/parisc/include/asm/socket.h | 3 + + arch/powerpc/boot/dts/tqm8548-bigflash.dts | 19 +- + arch/powerpc/boot/dts/tqm8548.dts | 19 +- + arch/powerpc/boot/dts/tqm8xx.dts | 25 + + arch/powerpc/include/asm/socket.h | 3 + + arch/s390/include/asm/socket.h | 3 + + arch/sparc/include/asm/socket.h | 3 + + arch/xtensa/include/asm/socket.h | 3 + + drivers/atm/iphase.c | 4 +- + drivers/bcma/host_pci.c | 32 +- + drivers/bluetooth/ath3k.c | 15 +- + drivers/bluetooth/bfusb.c | 4 +- + drivers/bluetooth/bluecard_cs.c | 4 +- + drivers/bluetooth/bt3c_cs.c | 4 +- + drivers/bluetooth/btuart_cs.c | 4 +- + drivers/bluetooth/btusb.c | 16 +- + drivers/bluetooth/dtl1_cs.c | 4 +- + drivers/bluetooth/hci_vhci.c | 13 +- + drivers/ieee802154/fakehard.c | 2 +- + drivers/infiniband/core/addr.c | 53 +- + drivers/infiniband/core/cma.c | 8 +- + drivers/infiniband/hw/cxgb3/iwch_cm.c | 15 +- + drivers/infiniband/hw/cxgb4/cm.c | 220 +- + drivers/infiniband/hw/nes/nes_cm.c | 14 +- + drivers/infiniband/hw/nes/nes_nic.c | 6 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 32 +- + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 4 +- + drivers/isdn/gigaset/i4l.c | 3 +- + drivers/lguest/lguest_device.c | 6 + + drivers/misc/eeprom/eeprom_93cx6.c | 88 + + drivers/misc/sgi-xp/xpnet.c | 2 +- + drivers/net/Kconfig | 4 + + drivers/net/Makefile | 2 + + drivers/net/bonding/bond_ipv6.c | 225 - + drivers/net/bonding/bond_main.c | 74 +- + drivers/net/caif/caif_hsi.c | 13 +- + drivers/net/caif/caif_serial.c | 4 +- + drivers/net/caif/caif_shmcore.c | 27 +- + drivers/net/caif/caif_spi.c | 176 +- + drivers/net/can/Kconfig | 2 + + drivers/net/can/Makefile | 1 + + drivers/net/can/at91_can.c | 13 +- + drivers/net/can/bfin_can.c | 12 +- + drivers/net/can/c_can/c_can_platform.c | 12 +- + drivers/net/can/cc770/Kconfig | 21 + + drivers/net/can/cc770/Makefile | 9 + + drivers/net/can/cc770/cc770.c | 881 +++ + drivers/net/can/cc770/cc770.h | 203 + + drivers/net/can/cc770/cc770_isa.c | 367 ++ + drivers/net/can/cc770/cc770_platform.c | 272 + + drivers/net/can/dev.c | 2 +- + drivers/net/can/flexcan.c | 15 +- + drivers/net/can/janz-ican3.c | 13 +- + drivers/net/can/mscan/mpc5xxx_can.c | 12 +- + drivers/net/can/mscan/mscan.c | 8 +- + drivers/net/can/sja1000/Kconfig | 1 - + drivers/net/can/sja1000/sja1000_isa.c | 118 +- + drivers/net/can/sja1000/sja1000_of_platform.c | 12 +- + drivers/net/can/sja1000/sja1000_platform.c | 13 +- + drivers/net/can/slcan.c | 2 +- + drivers/net/can/softing/softing_main.c | 16 +- + drivers/net/can/ti_hecc.c | 15 +- + drivers/net/dsa/Kconfig | 36 + + drivers/net/dsa/Makefile | 9 + + {net => drivers/net}/dsa/mv88e6060.c | 7 +- + {net => drivers/net}/dsa/mv88e6123_61_65.c | 19 +- + {net => drivers/net}/dsa/mv88e6131.c | 20 +- + {net => drivers/net}/dsa/mv88e6xxx.c | 29 +- + {net => drivers/net}/dsa/mv88e6xxx.h | 3 + + drivers/net/dummy.c | 2 +- + drivers/net/ethernet/3com/3c589_cs.c | 7 +- + drivers/net/ethernet/3com/3c59x.c | 12 +- + drivers/net/ethernet/3com/typhoon.c | 16 +- + drivers/net/ethernet/8390/8390.h | 2 - + drivers/net/ethernet/8390/apne.c | 2 +- + drivers/net/ethernet/8390/ax88796.c | 18 +- + drivers/net/ethernet/8390/es3210.c | 2 +- + drivers/net/ethernet/8390/hp-plus.c | 2 +- + drivers/net/ethernet/8390/hp.c | 2 +- + drivers/net/ethernet/8390/hydra.c | 2 +- + drivers/net/ethernet/8390/lne390.c | 4 +- + drivers/net/ethernet/8390/ne-h8300.c | 2 +- + drivers/net/ethernet/8390/ne.c | 4 +- + drivers/net/ethernet/8390/ne2.c | 2 +- + drivers/net/ethernet/8390/ne2k-pci.c | 6 +- + drivers/net/ethernet/8390/ne3210.c | 2 +- + drivers/net/ethernet/8390/stnic.c | 2 +- + drivers/net/ethernet/8390/zorro8390.c | 2 +- + drivers/net/ethernet/Kconfig | 1 + + drivers/net/ethernet/Makefile | 1 + + drivers/net/ethernet/adaptec/starfire.c | 14 +- + drivers/net/ethernet/aeroflex/greth.c | 13 +- + drivers/net/ethernet/amd/amd8111e.c | 15 +- + drivers/net/ethernet/amd/amd8111e.h | 1 - + drivers/net/ethernet/amd/au1000_eth.c | 15 +- + drivers/net/ethernet/amd/nmclan_cs.c | 19 +- + drivers/net/ethernet/amd/pcnet32.c | 10 +- + drivers/net/ethernet/amd/sunlance.c | 15 +- + drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c | 1 - + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 13 +- + drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c | 10 +- + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 13 +- + drivers/net/ethernet/atheros/atlx/atl1.c | 1 - + drivers/net/ethernet/atheros/atlx/atl2.c | 23 +- + drivers/net/ethernet/atheros/atlx/atlx.c | 13 +- + drivers/net/ethernet/broadcom/bnx2.c | 188 +- + drivers/net/ethernet/broadcom/bnx2.h | 17 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 70 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 345 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 116 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 61 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h | 4 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 37 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 217 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 1060 ++-- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 443 ++- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h | 69 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 35 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 13 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 112 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h | 6 + + drivers/net/ethernet/broadcom/cnic.c | 55 +- + drivers/net/ethernet/broadcom/cnic_if.h | 9 + + drivers/net/ethernet/broadcom/sb1250-mac.c | 16 +- + drivers/net/ethernet/broadcom/tg3.c | 437 +- + drivers/net/ethernet/broadcom/tg3.h | 13 +- + drivers/net/ethernet/brocade/bna/bnad.c | 12 +- + drivers/net/ethernet/brocade/bna/bnad_ethtool.c | 11 +- + drivers/net/ethernet/brocade/bna/cna.h | 3 +- + drivers/net/ethernet/calxeda/Kconfig | 7 + + drivers/net/ethernet/calxeda/Makefile | 1 + + drivers/net/ethernet/calxeda/xgmac.c | 1928 ++++++ + drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 15 +- + drivers/net/ethernet/chelsio/cxgb/sge.c | 2 +- + drivers/net/ethernet/chelsio/cxgb/sge.h | 2 +- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 21 +- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 26 +- + drivers/net/ethernet/chelsio/cxgb3/l2t.c | 27 +- + drivers/net/ethernet/chelsio/cxgb3/l2t.h | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 23 +- + drivers/net/ethernet/chelsio/cxgb4/sge.c | 6 +- + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 15 +- + drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 5 +- + drivers/net/ethernet/cisco/enic/enic_dev.c | 14 +- + drivers/net/ethernet/cisco/enic/enic_dev.h | 4 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 10 +- + drivers/net/ethernet/davicom/dm9000.c | 5 +- + drivers/net/ethernet/dec/tulip/de2104x.c | 6 +- + drivers/net/ethernet/dec/tulip/dmfe.c | 7 +- + drivers/net/ethernet/dec/tulip/tulip_core.c | 6 +- + drivers/net/ethernet/dec/tulip/uli526x.c | 7 +- + drivers/net/ethernet/dec/tulip/winbond-840.c | 6 +- + drivers/net/ethernet/dlink/sundance.c | 6 +- + drivers/net/ethernet/dnet.c | 19 +- + drivers/net/ethernet/emulex/benet/be.h | 16 +- + drivers/net/ethernet/emulex/benet/be_cmds.c | 218 +- + drivers/net/ethernet/emulex/benet/be_cmds.h | 77 +- + drivers/net/ethernet/emulex/benet/be_ethtool.c | 102 +- + drivers/net/ethernet/emulex/benet/be_main.c | 396 +- + drivers/net/ethernet/ethoc.c | 13 +- + drivers/net/ethernet/fealnx.c | 6 +- + drivers/net/ethernet/freescale/Kconfig | 2 +- + drivers/net/ethernet/freescale/fec.c | 64 +- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 15 +- + .../net/ethernet/freescale/fs_enet/mii-bitbang.c | 13 +- + drivers/net/ethernet/freescale/fs_enet/mii-fec.c | 13 +- + drivers/net/ethernet/freescale/fsl_pq_mdio.c | 23 +- + drivers/net/ethernet/freescale/gianfar.c | 28 +- + drivers/net/ethernet/freescale/gianfar.h | 7 +- + drivers/net/ethernet/freescale/gianfar_ethtool.c | 7 +- + drivers/net/ethernet/freescale/gianfar_ptp.c | 16 +- + drivers/net/ethernet/freescale/ucc_geth.c | 2 +- + drivers/net/ethernet/freescale/ucc_geth.h | 6 +- + drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 7 +- + drivers/net/ethernet/i825xx/eepro.c | 7 +- + drivers/net/ethernet/ibm/ehea/ehea_main.c | 21 +- + drivers/net/ethernet/ibm/emac/core.c | 3 + + drivers/net/ethernet/ibm/ibmveth.c | 6 +- + drivers/net/ethernet/icplus/ipg.c | 13 +- + drivers/net/ethernet/intel/e100.c | 8 +- + drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 12 +- + drivers/net/ethernet/intel/e1000/e1000_hw.h | 1 - + drivers/net/ethernet/intel/e1000/e1000_main.c | 28 +- + drivers/net/ethernet/intel/e1000e/e1000.h | 1 + + drivers/net/ethernet/intel/e1000e/ethtool.c | 18 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 441 +- + drivers/net/ethernet/intel/igb/e1000_82575.c | 5 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 15 +- + drivers/net/ethernet/intel/igb/igb_main.c | 217 +- + drivers/net/ethernet/intel/igbvf/ethtool.c | 10 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 37 +- + drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c | 10 +- + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 20 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c | 96 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 16 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 16 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h | 1 - + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 8 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 18 +- + drivers/net/ethernet/intel/ixgbevf/defines.h | 1 - + drivers/net/ethernet/intel/ixgbevf/ethtool.c | 16 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 40 +- + drivers/net/ethernet/intel/ixgbevf/vf.c | 4 +- + drivers/net/ethernet/jme.c | 16 +- + drivers/net/ethernet/korina.c | 13 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 14 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 13 +- + drivers/net/ethernet/marvell/skge.c | 8 +- + drivers/net/ethernet/marvell/sky2.c | 39 +- + drivers/net/ethernet/mellanox/mlx4/en_cq.c | 7 +- + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 31 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 26 +- + drivers/net/ethernet/mellanox/mlx4/en_resources.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 16 +- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 76 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 13 +- + drivers/net/ethernet/micrel/Kconfig | 2 + + drivers/net/ethernet/micrel/ks8842.c | 13 +- + drivers/net/ethernet/micrel/ks8851.c | 513 +- + drivers/net/ethernet/micrel/ks8851.h | 15 +- + drivers/net/ethernet/micrel/ks8851_mll.c | 16 +- + drivers/net/ethernet/micrel/ksz884x.c | 75 +- + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 5 +- + drivers/net/ethernet/natsemi/jazzsonic.c | 13 +- + drivers/net/ethernet/natsemi/macsonic.c | 13 +- + drivers/net/ethernet/natsemi/natsemi.c | 6 +- + drivers/net/ethernet/natsemi/ns83820.c | 6 +- + drivers/net/ethernet/natsemi/xtsonic.c | 13 +- + drivers/net/ethernet/neterion/s2io.c | 11 +- + drivers/net/ethernet/neterion/vxge/vxge-main.c | 15 +- + drivers/net/ethernet/nuvoton/w90p910_ether.c | 13 +- + drivers/net/ethernet/nvidia/forcedeth.c | 503 ++- + .../ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c | 8 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 5 +- + .../ethernet/qlogic/netxen/netxen_nic_ethtool.c | 12 +- + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 6 +- + drivers/net/ethernet/qlogic/qla3xxx.c | 9 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 5 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 13 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 9 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 12 +- + drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c | 11 +- + drivers/net/ethernet/qlogic/qlge/qlge_main.c | 48 +- + drivers/net/ethernet/realtek/8139cp.c | 8 +- + drivers/net/ethernet/realtek/8139too.c | 6 +- + drivers/net/ethernet/realtek/r8169.c | 22 +- + drivers/net/ethernet/renesas/sh_eth.c | 13 +- + drivers/net/ethernet/seeq/sgiseeq.c | 18 +- + drivers/net/ethernet/sfc/efx.c | 2 +- + drivers/net/ethernet/sfc/net_driver.h | 2 +- + drivers/net/ethernet/sfc/rx.c | 2 +- + drivers/net/ethernet/sfc/selftest.c | 4 +- + drivers/net/ethernet/sfc/tx.c | 29 +- + drivers/net/ethernet/sgi/meth.c | 19 +- + drivers/net/ethernet/sis/sis190.c | 15 +- + drivers/net/ethernet/sis/sis900.c | 7 +- + drivers/net/ethernet/smsc/epic100.c | 6 +- + drivers/net/ethernet/smsc/smc911x.c | 13 +- + drivers/net/ethernet/smsc/smc91c92_cs.c | 4 +- + drivers/net/ethernet/smsc/smc91x.c | 13 +- + drivers/net/ethernet/smsc/smsc911x.c | 111 +- + drivers/net/ethernet/smsc/smsc9420.c | 7 +- + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 5 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 27 +- + drivers/net/ethernet/sun/cassini.c | 7 +- + drivers/net/ethernet/sun/niu.c | 42 +- + drivers/net/ethernet/sun/sunbmac.c | 13 +- + drivers/net/ethernet/sun/sungem.c | 6 +- + drivers/net/ethernet/sun/sunhme.c | 9 +- + drivers/net/ethernet/tehuti/tehuti.c | 6 +- + drivers/net/ethernet/tundra/tsi108_eth.c | 20 +- + drivers/net/ethernet/via/via-rhine.c | 16 +- + drivers/net/ethernet/via/via-velocity.c | 12 +- + drivers/net/ethernet/xilinx/ll_temac_main.c | 28 +- + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 22 +- + drivers/net/ethernet/xircom/xirc2ps_cs.c | 2 +- + drivers/net/ifb.c | 2 +- + drivers/net/irda/bfin_sir.c | 13 +- + drivers/net/irda/pxaficp_ir.c | 13 +- + drivers/net/irda/sh_irda.c | 13 +- + drivers/net/irda/sh_sir.c | 13 +- + drivers/net/loopback.c | 2 +- + drivers/net/macvlan.c | 14 +- + drivers/net/macvtap.c | 8 +- + drivers/net/mii.c | 53 +- + drivers/net/phy/mdio-bitbang.c | 9 + + drivers/net/phy/mdio-gpio.c | 1 + + drivers/net/phy/phy_device.c | 20 +- + drivers/net/ppp/pptp.c | 2 +- + drivers/net/team/Kconfig | 43 + + drivers/net/team/Makefile | 7 + + drivers/net/team/team.c | 1684 +++++ + drivers/net/team/team_mode_activebackup.c | 136 + + drivers/net/team/team_mode_roundrobin.c | 107 + + drivers/net/tun.c | 16 +- + drivers/net/usb/cdc-phonet.c | 10 +- + drivers/net/usb/cdc_ncm.c | 4 +- + drivers/net/usb/smsc75xx.c | 3 +- + drivers/net/usb/smsc95xx.c | 3 +- + drivers/net/veth.c | 9 +- + drivers/net/virtio_net.c | 22 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 8 +- + drivers/net/vmxnet3/vmxnet3_ethtool.c | 9 +- + drivers/net/vmxnet3/vmxnet3_int.h | 2 +- + drivers/net/wireless/Makefile | 8 +- + drivers/net/wireless/airo.c | 4 +- + drivers/net/wireless/ath/ath.h | 1 + + drivers/net/wireless/ath/ath5k/ahb.c | 4 +- + drivers/net/wireless/ath/ath5k/ani.c | 91 +- + drivers/net/wireless/ath/ath5k/ani.h | 32 +- + drivers/net/wireless/ath/ath5k/ath5k.h | 569 ++- + drivers/net/wireless/ath/ath5k/attach.c | 16 +- + drivers/net/wireless/ath/ath5k/base.c | 287 +- + drivers/net/wireless/ath/ath5k/caps.c | 27 +- + drivers/net/wireless/ath/ath5k/desc.c | 217 +- + drivers/net/wireless/ath/ath5k/desc.h | 124 +- + drivers/net/wireless/ath/ath5k/dma.c | 370 +- + drivers/net/wireless/ath/ath5k/gpio.c | 81 +- + drivers/net/wireless/ath/ath5k/initvals.c | 75 +- + drivers/net/wireless/ath/ath5k/pci.c | 2 +- + drivers/net/wireless/ath/ath5k/pcu.c | 222 +- + drivers/net/wireless/ath/ath5k/phy.c | 853 ++- + drivers/net/wireless/ath/ath5k/qcu.c | 143 +- + drivers/net/wireless/ath/ath5k/reg.h | 27 +- + drivers/net/wireless/ath/ath5k/reset.c | 230 +- + drivers/net/wireless/ath/ath5k/rfbuffer.h | 59 +- + drivers/net/wireless/ath/ath5k/rfgain.h | 22 +- + drivers/net/wireless/ath/ath6kl/Makefile | 2 +- + drivers/net/wireless/ath/ath6kl/bmi.c | 7 +- + drivers/net/wireless/ath/ath6kl/bmi.h | 2 + + drivers/net/wireless/ath/ath6kl/cfg80211.c | 1431 ++++-- + drivers/net/wireless/ath/ath6kl/cfg80211.h | 30 +- + drivers/net/wireless/ath/ath6kl/common.h | 16 +- + drivers/net/wireless/ath/ath6kl/core.h | 202 +- + drivers/net/wireless/ath/ath6kl/debug.c | 849 +++- + drivers/net/wireless/ath/ath6kl/debug.h | 34 +- + drivers/net/wireless/ath/ath6kl/hif-ops.h | 49 +- + .../net/wireless/ath/ath6kl/{htc_hif.c => hif.c} | 150 +- + drivers/net/wireless/ath/ath6kl/hif.h | 61 +- + drivers/net/wireless/ath/ath6kl/htc.c | 725 ++- + drivers/net/wireless/ath/ath6kl/htc.h | 18 +- + drivers/net/wireless/ath/ath6kl/htc_hif.h | 92 - + drivers/net/wireless/ath/ath6kl/init.c | 675 +- + drivers/net/wireless/ath/ath6kl/main.c | 668 +-- + drivers/net/wireless/ath/ath6kl/sdio.c | 335 +- + drivers/net/wireless/ath/ath6kl/target.h | 3 + + drivers/net/wireless/ath/ath6kl/txrx.c | 221 +- + drivers/net/wireless/ath/ath6kl/wmi.c | 688 ++- + drivers/net/wireless/ath/ath6kl/wmi.h | 243 +- + drivers/net/wireless/ath/ath9k/Kconfig | 1 + + drivers/net/wireless/ath/ath9k/Makefile | 4 +- + drivers/net/wireless/ath/ath9k/ar9002_calib.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9003_calib.c | 47 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 143 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 10 +- + drivers/net/wireless/ath/ath9k/ar9003_mac.c | 36 +- + drivers/net/wireless/ath/ath9k/ar9003_mci.c | 1464 +++++ + drivers/net/wireless/ath/ath9k/ar9003_mci.h | 102 + + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 4 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.h | 5 + + .../net/wireless/ath/ath9k/ar9462_2p0_initvals.h | 60 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 7 +- + drivers/net/wireless/ath/ath9k/btcoex.c | 109 +- + drivers/net/wireless/ath/ath9k/btcoex.h | 41 +- + drivers/net/wireless/ath/ath9k/debug.c | 13 +- + drivers/net/wireless/ath/ath9k/eeprom.h | 3 +- + drivers/net/wireless/ath/ath9k/eeprom_4k.c | 6 +- + drivers/net/wireless/ath/ath9k/eeprom_9287.c | 3 +- + drivers/net/wireless/ath/ath9k/eeprom_def.c | 6 +- + drivers/net/wireless/ath/ath9k/gpio.c | 9 +- + drivers/net/wireless/ath/ath9k/htc_drv_gpio.c | 2 + + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 5 +- + drivers/net/wireless/ath/ath9k/hw.c | 188 +- + drivers/net/wireless/ath/ath9k/hw.h | 199 +- + drivers/net/wireless/ath/ath9k/init.c | 38 + + drivers/net/wireless/ath/ath9k/mac.c | 17 +- + drivers/net/wireless/ath/ath9k/main.c | 225 +- + drivers/net/wireless/ath/ath9k/mci.c | 673 ++ + drivers/net/wireless/ath/ath9k/mci.h | 138 + + drivers/net/wireless/ath/ath9k/pci.c | 21 +- + drivers/net/wireless/ath/ath9k/recv.c | 34 +- + drivers/net/wireless/ath/ath9k/reg.h | 321 +- + drivers/net/wireless/ath/ath9k/xmit.c | 20 +- + drivers/net/wireless/ath/carl9170/main.c | 12 +- + drivers/net/wireless/ath/carl9170/tx.c | 4 +- + drivers/net/wireless/brcm80211/brcmfmac/Makefile | 3 +- + drivers/net/wireless/brcm80211/brcmfmac/bcmchip.h | 32 - + drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 148 +- + .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 211 +- + drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 49 +- + drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 19 +- + drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c | 6 +- + .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 20 +- + .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 378 +- + drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 1019 +--- + .../net/wireless/brcm80211/brcmfmac/sdio_chip.c | 622 ++ + .../net/wireless/brcm80211/brcmfmac/sdio_chip.h | 136 + + .../net/wireless/brcm80211/brcmfmac/sdio_host.h | 30 +- + .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 50 +- + .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 9 - + drivers/net/wireless/brcm80211/brcmsmac/aiutils.c | 14 +- + drivers/net/wireless/brcm80211/brcmsmac/aiutils.h | 76 - + drivers/net/wireless/brcm80211/brcmsmac/ampdu.c | 6 +- + drivers/net/wireless/brcm80211/brcmsmac/channel.c | 118 - + drivers/net/wireless/brcm80211/brcmsmac/dma.c | 246 +- + drivers/net/wireless/brcm80211/brcmsmac/dma.h | 3 +- + .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 162 +- + .../net/wireless/brcm80211/brcmsmac/mac80211_if.h | 2 + + drivers/net/wireless/brcm80211/brcmsmac/main.c | 706 +-- + drivers/net/wireless/brcm80211/brcmsmac/main.h | 25 +- + .../net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c | 12 +- + .../net/wireless/brcm80211/brcmsmac/phy/phy_int.h | 5 - + .../net/wireless/brcm80211/brcmsmac/phy/phy_n.c | 38 +- + drivers/net/wireless/brcm80211/brcmsmac/pmu.c | 1 + + drivers/net/wireless/brcm80211/brcmsmac/pub.h | 38 +- + drivers/net/wireless/brcm80211/brcmsmac/rate.h | 5 +- + drivers/net/wireless/brcm80211/brcmsmac/srom.c | 469 +-- + drivers/net/wireless/brcm80211/brcmsmac/srom.h | 5 - + drivers/net/wireless/brcm80211/brcmutil/utils.c | 218 +- + .../net/wireless/brcm80211/include/brcmu_utils.h | 30 +- + drivers/net/wireless/brcm80211/include/defs.h | 1 - + drivers/net/wireless/brcm80211/include/soc.h | 12 +- + drivers/net/wireless/hostap/hostap_cs.c | 3 + + drivers/net/wireless/hostap/hostap_ioctl.c | 4 +- + drivers/net/wireless/ipw2x00/ipw2100.c | 7 +- + drivers/net/wireless/ipw2x00/ipw2200.c | 15 +- + drivers/net/wireless/ipw2x00/libipw.h | 8 - + drivers/net/wireless/iwlegacy/3945-debug.c | 505 ++ + drivers/net/wireless/iwlegacy/3945-mac.c | 3977 ++++++++++++ + drivers/net/wireless/iwlegacy/3945-rs.c | 995 +++ + drivers/net/wireless/iwlegacy/3945.c | 2751 ++++++++ + drivers/net/wireless/iwlegacy/3945.h | 626 ++ + .../iwlegacy/{iwl-4965-calib.c => 4965-calib.c} | 613 +- + drivers/net/wireless/iwlegacy/4965-debug.c | 746 +++ + drivers/net/wireless/iwlegacy/4965-mac.c | 6536 ++++++++++++++++++++ + drivers/net/wireless/iwlegacy/4965-rs.c | 2860 +++++++++ + drivers/net/wireless/iwlegacy/4965.c | 2421 ++++++++ + drivers/net/wireless/iwlegacy/4965.h | 1309 ++++ + drivers/net/wireless/iwlegacy/Kconfig | 43 +- + drivers/net/wireless/iwlegacy/Makefile | 24 +- + .../iwlegacy/{iwl-commands.h => commands.h} | 1134 ++-- + drivers/net/wireless/iwlegacy/common.c | 5706 +++++++++++++++++ + drivers/net/wireless/iwlegacy/common.h | 3424 ++++++++++ + drivers/net/wireless/iwlegacy/{iwl-csr.h => csr.h} | 93 +- + drivers/net/wireless/iwlegacy/debug.c | 1411 +++++ + drivers/net/wireless/iwlegacy/iwl-3945-debugfs.c | 523 -- + drivers/net/wireless/iwlegacy/iwl-3945-debugfs.h | 60 - + drivers/net/wireless/iwlegacy/iwl-3945-fh.h | 187 - + drivers/net/wireless/iwlegacy/iwl-3945-hw.h | 291 - + drivers/net/wireless/iwlegacy/iwl-3945-led.c | 63 - + drivers/net/wireless/iwlegacy/iwl-3945-led.h | 32 - + drivers/net/wireless/iwlegacy/iwl-3945-rs.c | 996 --- + drivers/net/wireless/iwlegacy/iwl-3945.c | 2741 -------- + drivers/net/wireless/iwlegacy/iwl-3945.h | 308 - + drivers/net/wireless/iwlegacy/iwl-4965-calib.h | 75 - + drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c | 774 --- + drivers/net/wireless/iwlegacy/iwl-4965-debugfs.h | 59 - + drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c | 154 - + drivers/net/wireless/iwlegacy/iwl-4965-hw.h | 811 --- + drivers/net/wireless/iwlegacy/iwl-4965-led.c | 73 - + drivers/net/wireless/iwlegacy/iwl-4965-led.h | 33 - + drivers/net/wireless/iwlegacy/iwl-4965-lib.c | 1194 ---- + drivers/net/wireless/iwlegacy/iwl-4965-rs.c | 2871 --------- + drivers/net/wireless/iwlegacy/iwl-4965-rx.c | 215 - + drivers/net/wireless/iwlegacy/iwl-4965-sta.c | 721 --- + drivers/net/wireless/iwlegacy/iwl-4965-tx.c | 1378 ----- + drivers/net/wireless/iwlegacy/iwl-4965-ucode.c | 166 - + drivers/net/wireless/iwlegacy/iwl-4965.c | 2183 ------- + drivers/net/wireless/iwlegacy/iwl-4965.h | 282 - + drivers/net/wireless/iwlegacy/iwl-core.c | 2661 -------- + drivers/net/wireless/iwlegacy/iwl-core.h | 636 -- + drivers/net/wireless/iwlegacy/iwl-debug.h | 198 - + drivers/net/wireless/iwlegacy/iwl-debugfs.c | 1314 ---- + drivers/net/wireless/iwlegacy/iwl-dev.h | 1364 ---- + drivers/net/wireless/iwlegacy/iwl-devtrace.c | 42 - + drivers/net/wireless/iwlegacy/iwl-devtrace.h | 210 - + drivers/net/wireless/iwlegacy/iwl-eeprom.c | 553 -- + drivers/net/wireless/iwlegacy/iwl-eeprom.h | 344 - + drivers/net/wireless/iwlegacy/iwl-fh.h | 513 -- + drivers/net/wireless/iwlegacy/iwl-hcmd.c | 271 - + drivers/net/wireless/iwlegacy/iwl-helpers.h | 196 - + drivers/net/wireless/iwlegacy/iwl-io.h | 545 -- + drivers/net/wireless/iwlegacy/iwl-led.c | 205 - + drivers/net/wireless/iwlegacy/iwl-led.h | 56 - + drivers/net/wireless/iwlegacy/iwl-legacy-rs.h | 456 -- + drivers/net/wireless/iwlegacy/iwl-power.c | 165 - + drivers/net/wireless/iwlegacy/iwl-power.h | 55 - + drivers/net/wireless/iwlegacy/iwl-rx.c | 282 - + drivers/net/wireless/iwlegacy/iwl-scan.c | 550 -- + drivers/net/wireless/iwlegacy/iwl-spectrum.h | 4 +- + drivers/net/wireless/iwlegacy/iwl-sta.c | 540 +- + drivers/net/wireless/iwlegacy/iwl-sta.h | 148 - + drivers/net/wireless/iwlegacy/iwl-tx.c | 659 -- + drivers/net/wireless/iwlegacy/iwl3945-base.c | 4016 ------------ + drivers/net/wireless/iwlegacy/iwl4965-base.c | 3281 ---------- + .../net/wireless/iwlegacy/{iwl-prph.h => prph.h} | 133 +- + drivers/net/wireless/iwlwifi/Makefile | 6 +- + drivers/net/wireless/iwlwifi/iwl-1000.c | 9 - + drivers/net/wireless/iwlwifi/iwl-2000.c | 34 - + drivers/net/wireless/iwlwifi/iwl-5000.c | 16 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 32 +- + drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 68 +- + drivers/net/wireless/iwlwifi/iwl-agn-calib.h | 3 +- + drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 383 ++- + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 8 +- + drivers/net/wireless/iwlwifi/iwl-agn-rx.c | 66 +- + drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 19 +- + drivers/net/wireless/iwlwifi/iwl-agn-sta.c | 78 +- + drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 23 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 1812 +----- + drivers/net/wireless/iwlwifi/iwl-agn.h | 51 +- + drivers/net/wireless/iwlwifi/iwl-cfg.h | 6 - + drivers/net/wireless/iwlwifi/iwl-commands.h | 27 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 322 +- + drivers/net/wireless/iwlwifi/iwl-core.h | 19 +- + drivers/net/wireless/iwlwifi/iwl-csr.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-debug.h | 102 +- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 11 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 97 +- + drivers/net/wireless/iwlwifi/iwl-devtrace.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-devtrace.h | 23 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.c | 142 +- + drivers/net/wireless/iwlwifi/iwl-io.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-mac80211.c | 1639 +++++ + drivers/net/wireless/iwlwifi/iwl-pci.c | 20 +- + drivers/net/wireless/iwlwifi/iwl-scan.c | 50 +- + drivers/net/wireless/iwlwifi/iwl-shared.h | 78 +- + .../iwlwifi/{iwl-sv-open.c => iwl-testmode.c} | 209 +- + drivers/net/wireless/iwlwifi/iwl-testmode.h | 52 +- + drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h | 40 +- + drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c | 12 +- + drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c | 56 +- + drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 47 +- + drivers/net/wireless/iwlwifi/iwl-trans.h | 43 +- + .../iwlwifi/{iwl-agn-ucode.c => iwl-ucode.c} | 351 +- + drivers/net/wireless/iwmc3200wifi/cfg80211.c | 15 +- + drivers/net/wireless/libertas/cfg.c | 25 +- + drivers/net/wireless/libertas/ethtool.c | 7 +- + drivers/net/wireless/libertas/if_spi.c | 1 - + drivers/net/wireless/mac80211_hwsim.c | 2 + + drivers/net/wireless/mwifiex/11n_rxreorder.c | 18 +- + drivers/net/wireless/mwifiex/Kconfig | 4 +- + drivers/net/wireless/mwifiex/cfg80211.c | 7 +- + drivers/net/wireless/mwifiex/cfp.c | 38 +- + drivers/net/wireless/mwifiex/fw.h | 3 +- + drivers/net/wireless/mwifiex/init.c | 4 +- + drivers/net/wireless/mwifiex/join.c | 96 +- + drivers/net/wireless/mwifiex/main.h | 3 +- + drivers/net/wireless/mwifiex/pcie.c | 11 +- + drivers/net/wireless/mwifiex/scan.c | 7 +- + drivers/net/wireless/mwifiex/sdio.c | 21 +- + drivers/net/wireless/mwifiex/sdio.h | 1 + + drivers/net/wireless/mwifiex/sta_cmdresp.c | 2 +- + drivers/net/wireless/mwifiex/sta_ioctl.c | 4 +- + drivers/net/wireless/mwifiex/sta_rx.c | 12 +- + drivers/net/wireless/orinoco/scan.c | 16 +- + drivers/net/wireless/p54/p54spi.c | 7 +- + drivers/net/wireless/p54/txrx.c | 4 +- + drivers/net/wireless/prism54/isl_ioctl.c | 333 - + drivers/net/wireless/prism54/isl_ioctl.h | 2 - + drivers/net/wireless/prism54/islpci_dev.c | 5 +- + drivers/net/wireless/ray_cs.c | 4 +- + drivers/net/wireless/rayctl.h | 4 +- + drivers/net/wireless/rndis_wlan.c | 109 +- + drivers/net/wireless/rt2x00/rt2800lib.c | 6 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 4 +- + drivers/net/wireless/rtlwifi/base.c | 6 +- + drivers/net/wireless/rtlwifi/base.h | 2 +- + drivers/net/wireless/rtlwifi/pci.c | 10 +- + drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 62 +- + drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h | 23 +- + drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 9 +- + drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | 1 + + drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 36 +- + drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 2 +- + drivers/net/wireless/rtlwifi/usb.c | 55 +- + drivers/net/wireless/rtlwifi/wifi.h | 7 +- + drivers/net/wireless/wl1251/spi.c | 1 - + drivers/net/wireless/wl12xx/Kconfig | 10 - + drivers/net/wireless/wl12xx/Makefile | 3 - + drivers/net/wireless/wl12xx/acx.c | 146 +- + drivers/net/wireless/wl12xx/acx.h | 83 +- + drivers/net/wireless/wl12xx/boot.c | 15 + + drivers/net/wireless/wl12xx/cmd.c | 368 +- + drivers/net/wireless/wl12xx/cmd.h | 50 +- + drivers/net/wireless/wl12xx/conf.h | 4 + + drivers/net/wireless/wl12xx/debug.h | 101 + + drivers/net/wireless/wl12xx/debugfs.c | 141 +- + drivers/net/wireless/wl12xx/event.c | 214 +- + drivers/net/wireless/wl12xx/event.h | 3 - + drivers/net/wireless/wl12xx/init.c | 458 +- + drivers/net/wireless/wl12xx/init.h | 7 +- + drivers/net/wireless/wl12xx/io.c | 12 +- + drivers/net/wireless/wl12xx/io.h | 23 +- + drivers/net/wireless/wl12xx/main.c | 1967 ++++--- + drivers/net/wireless/wl12xx/ps.c | 56 +- + drivers/net/wireless/wl12xx/ps.h | 9 +- + drivers/net/wireless/wl12xx/reg.h | 2 +- + drivers/net/wireless/wl12xx/rx.c | 34 +- + drivers/net/wireless/wl12xx/scan.c | 102 +- + drivers/net/wireless/wl12xx/scan.h | 8 +- + drivers/net/wireless/wl12xx/sdio.c | 259 +- + drivers/net/wireless/wl12xx/sdio_test.c | 543 -- + drivers/net/wireless/wl12xx/spi.c | 215 +- + drivers/net/wireless/wl12xx/testmode.c | 76 +- + drivers/net/wireless/wl12xx/tx.c | 373 +- + drivers/net/wireless/wl12xx/tx.h | 11 +- + drivers/net/wireless/wl12xx/wl12xx.h | 377 +- + drivers/net/wireless/wl12xx/wl12xx_80211.h | 5 - + drivers/net/wireless/wl12xx/wl12xx_platform_data.c | 4 +- + drivers/net/xen-netback/interface.c | 3 +- + drivers/net/xen-netback/netback.c | 6 +- + drivers/net/xen-netfront.c | 12 +- + drivers/nfc/pn533.c | 2 +- + drivers/s390/kvm/kvm_virtio.c | 6 + + drivers/s390/net/qeth_l2_main.c | 18 +- + drivers/s390/net/qeth_l3_main.c | 19 +- + drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 2 +- + drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 8 +- + drivers/scsi/cxgbi/libcxgbi.c | 10 +- + drivers/usb/gadget/f_phonet.c | 11 +- + drivers/virtio/virtio_mmio.c | 6 + + drivers/virtio/virtio_pci.c | 8 + + fs/dlm/lowcomms.c | 2 +- + include/asm-generic/socket.h | 3 + + include/linux/Kbuild | 1 + + include/linux/atmdev.h | 10 - + include/linux/can/platform/cc770.h | 33 + + include/linux/cgroup_subsys.h | 8 + + include/linux/dynamic_queue_limits.h | 97 + + include/linux/eeprom_93cx6.h | 8 + + include/linux/errqueue.h | 7 +- + include/linux/ethtool.h | 53 - + include/linux/genetlink.h | 24 + + include/linux/ieee80211.h | 23 + + include/linux/if.h | 1 + + include/linux/if_ether.h | 1 + + include/linux/if_team.h | 242 + + include/linux/if_vlan.h | 80 +- + include/linux/inet_diag.h | 42 +- + include/linux/ipv6.h | 4 +- + include/linux/lockd/lockd.h | 6 +- + include/linux/mdio-bitbang.h | 2 + + include/linux/mdio-gpio.h | 2 + + include/linux/mii.h | 200 + + include/linux/mlx4/device.h | 3 +- + include/linux/mlx4/qp.h | 28 + + include/linux/neighbour.h | 1 + + include/linux/netdev_features.h | 146 + + include/linux/netdevice.h | 309 +- + include/linux/netfilter.h | 26 +- + include/linux/netlink.h | 4 +- + include/linux/nl80211.h | 163 + + include/linux/openvswitch.h | 452 ++ + include/linux/phonet.h | 2 + + include/linux/pkt_sched.h | 13 +- + include/linux/skbuff.h | 68 +- + include/linux/sock_diag.h | 23 + + include/linux/sunrpc/clnt.h | 8 +- + include/linux/virtio_config.h | 14 + + include/linux/wl12xx.h | 5 +- + include/net/atmclip.h | 7 - + include/net/bluetooth/bluetooth.h | 34 +- + include/net/bluetooth/hci.h | 60 + + include/net/bluetooth/hci_core.h | 148 +- + include/net/bluetooth/l2cap.h | 409 ++- + include/net/bluetooth/mgmt.h | 92 +- + include/net/caif/caif_dev.h | 21 + + include/net/caif/caif_layer.h | 4 - + include/net/caif/caif_spi.h | 4 +- + include/net/caif/cfcnfg.h | 23 +- + include/net/caif/cfserl.h | 4 +- + include/net/cfg80211.h | 225 +- + include/net/dsa.h | 144 +- + include/net/dst.h | 6 +- + include/net/flow.h | 5 +- + include/net/flow_keys.h | 16 + + include/net/genetlink.h | 2 + + include/net/icmp.h | 4 +- + include/net/ieee80211_radiotap.h | 8 - + include/net/ieee802154.h | 6 + + include/net/inet6_hashtables.h | 4 +- + include/net/inet_connection_sock.h | 6 +- + include/net/inet_sock.h | 6 +- + include/net/inetpeer.h | 2 +- + include/net/ip.h | 8 +- + include/net/ip6_route.h | 4 +- + include/net/ip_vs.h | 8 +- + include/net/ipv6.h | 22 +- + include/net/mac80211.h | 57 +- + include/net/ndisc.h | 9 - + include/net/neighbour.h | 11 +- + include/net/net_namespace.h | 2 +- + include/net/netfilter/nf_tproxy_core.h | 2 +- + include/net/netns/mib.h | 6 +- + include/net/netns/xfrm.h | 2 +- + include/net/netprio_cgroup.h | 57 + + include/net/nfc/nci.h | 171 +- + include/net/nfc/nci_core.h | 13 +- + include/net/protocol.h | 12 +- + include/net/red.h | 109 +- + include/net/regulatory.h | 6 + + include/net/sctp/sctp.h | 4 +- + include/net/sctp/structs.h | 3 +- + include/net/snmp.h | 4 +- + include/net/sock.h | 19 +- + include/net/tcp.h | 17 +- + include/net/udp.h | 13 +- + include/net/xfrm.h | 12 +- + lib/Kconfig | 3 + + lib/Makefile | 2 + + lib/dynamic_queue_limits.c | 133 + + lib/reciprocal_div.c | 2 + + lib/vsprintf.c | 19 + + net/8021q/vlan.c | 126 +- + net/8021q/vlan.h | 43 +- + net/8021q/vlan_core.c | 266 +- + net/8021q/vlan_dev.c | 140 +- + net/8021q/vlan_gvrp.c | 4 +- + net/8021q/vlan_netlink.c | 10 +- + net/8021q/vlanproc.c | 42 +- + net/Kconfig | 14 + + net/Makefile | 1 + + net/atm/atm_misc.c | 2 +- + net/atm/br2684.c | 38 +- + net/atm/clip.c | 159 +- + net/atm/common.c | 34 +- + net/atm/common.h | 1 + + net/atm/pppoatm.c | 4 + + net/ax25/af_ax25.c | 17 +- + net/batman-adv/bat_sysfs.c | 4 +- + net/batman-adv/bitarray.c | 2 +- + net/batman-adv/gateway_client.c | 153 +- + net/batman-adv/gateway_client.h | 5 +- + net/batman-adv/gateway_common.c | 4 +- + net/batman-adv/hash.c | 4 +- + net/batman-adv/hash.h | 13 +- + net/batman-adv/main.h | 2 +- + net/batman-adv/originator.c | 13 +- + net/batman-adv/originator.h | 2 +- + net/batman-adv/routing.c | 22 +- + net/batman-adv/soft-interface.c | 43 +- + net/batman-adv/translation-table.c | 100 +- + net/batman-adv/vis.c | 17 +- + net/bluetooth/bnep/core.c | 13 +- + net/bluetooth/cmtp/core.c | 13 +- + net/bluetooth/hci_conn.c | 71 +- + net/bluetooth/hci_core.c | 430 +- + net/bluetooth/hci_event.c | 345 +- + net/bluetooth/hci_sysfs.c | 40 +- + net/bluetooth/hidp/core.c | 157 +- + net/bluetooth/l2cap_core.c | 1036 +++- + net/bluetooth/l2cap_sock.c | 106 +- + net/bluetooth/mgmt.c | 1088 +++-- + net/bluetooth/rfcomm/core.c | 65 +- + net/bluetooth/rfcomm/sock.c | 2 + + net/bluetooth/rfcomm/tty.c | 45 +- + net/bluetooth/smp.c | 35 +- + net/bridge/br_device.c | 14 +- + net/bridge/br_fdb.c | 100 +- + net/bridge/br_forward.c | 2 +- + net/bridge/br_if.c | 5 +- + net/bridge/br_multicast.c | 45 +- + net/bridge/br_netfilter.c | 2 +- + net/bridge/br_private.h | 6 +- + net/bridge/netfilter/ebt_ip6.c | 3 +- + net/bridge/netfilter/ebt_log.c | 3 +- + net/caif/Kconfig | 11 + + net/caif/Makefile | 1 + + net/caif/caif_dev.c | 273 +- + net/caif/caif_usb.c | 208 + + net/caif/cfcnfg.c | 47 +- + net/caif/cfpkt_skbuff.c | 15 +- + net/caif/cfrfml.c | 2 +- + net/caif/cfserl.c | 3 +- + net/core/Makefile | 6 +- + net/core/dev.c | 307 +- + net/core/dst.c | 2 +- + net/core/ethtool.c | 556 +-- + net/core/flow_dissector.c | 143 + + net/core/neighbour.c | 209 +- + net/core/net-sysfs.c | 279 +- + net/core/netpoll.c | 10 +- + net/core/netprio_cgroup.c | 344 + + net/core/pktgen.c | 17 +- + net/core/secure_seq.c | 4 +- + net/core/skbuff.c | 82 +- + net/core/sock.c | 69 +- + net/core/sock_diag.c | 150 + + net/core/sysctl_net_core.c | 9 +- + net/dccp/dccp.h | 2 +- + net/dccp/diag.c | 20 +- + net/dccp/ipv4.c | 5 +- + net/dccp/ipv6.c | 42 +- + net/dccp/minisocks.c | 8 +- + net/dccp/probe.c | 14 +- + net/decnet/dn_neigh.c | 4 +- + net/decnet/dn_route.c | 8 +- + net/dsa/Kconfig | 38 +- + net/dsa/Makefile | 19 +- + net/dsa/dsa.c | 51 +- + net/dsa/dsa_priv.h | 127 +- + net/dsa/tag_dsa.c | 15 +- + net/dsa/tag_edsa.c | 15 +- + net/dsa/tag_trailer.c | 15 +- + net/econet/af_econet.c | 7 +- + net/ieee802154/6lowpan.c | 374 ++- + net/ieee802154/6lowpan.h | 23 + + net/ieee802154/dgram.c | 7 +- + net/ieee802154/raw.c | 7 +- + net/ipv4/Kconfig | 4 + + net/ipv4/Makefile | 1 + + net/ipv4/af_inet.c | 11 +- + net/ipv4/arp.c | 34 +- + net/ipv4/igmp.c | 17 +- + net/ipv4/inet_connection_sock.c | 19 +- + net/ipv4/inet_diag.c | 466 +- + net/ipv4/ip_gre.c | 14 +- + net/ipv4/ip_output.c | 23 +- + net/ipv4/ip_sockglue.c | 41 +- + net/ipv4/ipconfig.c | 15 +- + net/ipv4/ipip.c | 2 +- + net/ipv4/ipmr.c | 4 +- + net/ipv4/netfilter/ip_queue.c | 6 +- + net/ipv4/proc.c | 9 +- + net/ipv4/raw.c | 10 +- + net/ipv4/route.c | 12 +- + net/ipv4/tcp.c | 46 +- + net/ipv4/tcp_cong.c | 2 +- + net/ipv4/tcp_diag.c | 20 +- + net/ipv4/tcp_input.c | 48 +- + net/ipv4/tcp_ipv4.c | 1 + + net/ipv4/tcp_minisocks.c | 12 +- + net/ipv4/tcp_output.c | 25 +- + net/ipv4/tcp_timer.c | 2 +- + net/ipv4/tunnel4.c | 10 +- + net/ipv4/udp.c | 9 +- + net/ipv4/udp_diag.c | 201 + + net/ipv4/xfrm4_tunnel.c | 6 +- + net/ipv6/addrconf.c | 12 +- + net/ipv6/af_inet6.c | 27 +- + net/ipv6/ah6.c | 12 +- + net/ipv6/anycast.c | 6 +- + net/ipv6/datagram.c | 36 +- + net/ipv6/exthdrs.c | 18 +- + net/ipv6/exthdrs_core.c | 11 +- + net/ipv6/fib6_rules.c | 2 +- + net/ipv6/icmp.c | 25 +- + net/ipv6/inet6_connection_sock.c | 12 +- + net/ipv6/ip6_fib.c | 206 +- + net/ipv6/ip6_flowlabel.c | 2 +- + net/ipv6/ip6_input.c | 3 +- + net/ipv6/ip6_output.c | 35 +- + net/ipv6/ip6_tunnel.c | 14 +- + net/ipv6/ip6mr.c | 12 +- + net/ipv6/ipv6_sockglue.c | 8 +- + net/ipv6/mcast.c | 40 +- + net/ipv6/mip6.c | 4 +- + net/ipv6/ndisc.c | 35 +- + net/ipv6/netfilter/ip6_queue.c | 5 +- + net/ipv6/netfilter/ip6t_REJECT.c | 11 +- + net/ipv6/proc.c | 15 +- + net/ipv6/raw.c | 19 +- + net/ipv6/reassembly.c | 4 +- + net/ipv6/route.c | 177 +- + net/ipv6/sit.c | 10 +- + net/ipv6/syncookies.c | 8 +- + net/ipv6/tcp_ipv6.c | 46 +- + net/ipv6/udp.c | 17 +- + net/ipv6/xfrm6_mode_beet.c | 8 +- + net/ipv6/xfrm6_mode_tunnel.c | 4 +- + net/ipv6/xfrm6_output.c | 4 +- + net/ipv6/xfrm6_policy.c | 4 +- + net/ipv6/xfrm6_state.c | 4 +- + net/irda/irttp.c | 4 +- + net/key/af_key.c | 20 +- + net/mac80211/Kconfig | 12 - + net/mac80211/Makefile | 4 +- + net/mac80211/agg-rx.c | 16 +- + net/mac80211/agg-tx.c | 75 +- + net/mac80211/cfg.c | 187 +- + net/mac80211/debugfs.c | 37 +- + net/mac80211/debugfs_netdev.c | 3 + + net/mac80211/debugfs_sta.c | 4 +- + net/mac80211/driver-ops.h | 90 +- + net/mac80211/driver-trace.h | 11 - + net/mac80211/ht.c | 90 +- + net/mac80211/ibss.c | 104 +- + net/mac80211/ieee80211_i.h | 113 +- + net/mac80211/iface.c | 61 +- + net/mac80211/key.c | 9 +- + net/mac80211/main.c | 91 +- + net/mac80211/mesh.c | 71 +- + net/mac80211/mesh.h | 9 + + net/mac80211/mesh_hwmp.c | 195 +- + net/mac80211/mesh_pathtbl.c | 59 +- + net/mac80211/mesh_plink.c | 51 +- + net/mac80211/mlme.c | 120 +- + net/mac80211/offchannel.c | 13 +- + net/mac80211/pm.c | 2 +- + net/mac80211/rc80211_minstrel.c | 7 +- + net/mac80211/rc80211_minstrel_ht.c | 62 +- + net/mac80211/rx.c | 190 +- + net/mac80211/scan.c | 199 +- + net/mac80211/sta_info.c | 4 - + net/mac80211/sta_info.h | 13 +- + net/mac80211/status.c | 87 +- + net/mac80211/tx.c | 375 +- + net/mac80211/util.c | 306 +- + net/mac80211/wep.c | 5 +- + net/mac80211/wme.c | 38 +- + net/mac80211/wme.h | 3 + + net/mac80211/work.c | 153 +- + net/mac80211/wpa.c | 34 +- + net/netfilter/core.c | 13 +- + net/netfilter/ipset/ip_set_getport.c | 4 +- + net/netfilter/ipset/ip_set_hash_ip.c | 2 +- + net/netfilter/ipset/ip_set_hash_net.c | 2 +- + net/netfilter/ipvs/ip_vs_core.c | 2 +- + net/netfilter/ipvs/ip_vs_sync.c | 6 +- + net/netfilter/ipvs/ip_vs_xmit.c | 10 +- + net/netfilter/nf_conntrack_h323_main.c | 4 +- + net/netfilter/xt_AUDIT.c | 3 +- + net/netfilter/xt_TCPMSS.c | 5 +- + net/netfilter/xt_TCPOPTSTRIP.c | 3 +- + net/netfilter/xt_TEE.c | 9 +- + net/netfilter/xt_addrtype.c | 2 +- + net/netfilter/xt_hashlimit.c | 3 +- + net/netfilter/xt_socket.c | 4 +- + net/netlabel/netlabel_addrlist.c | 8 +- + net/netlabel/netlabel_addrlist.h | 2 +- + net/netlabel/netlabel_domainhash.c | 20 +- + net/netlabel/netlabel_domainhash.h | 2 +- + net/netlabel/netlabel_kapi.c | 22 +- + net/netlabel/netlabel_mgmt.c | 10 +- + net/netlabel/netlabel_unlabeled.c | 30 +- + net/netlink/genetlink.c | 21 + + net/netrom/af_netrom.c | 3 +- + net/netrom/nr_route.c | 11 +- + net/nfc/core.c | 60 +- + net/nfc/nci/core.c | 102 +- + net/nfc/nci/data.c | 35 +- + net/nfc/nci/lib.c | 8 +- + net/nfc/nci/ntf.c | 187 +- + net/nfc/nci/rsp.c | 137 +- + net/nfc/netlink.c | 32 +- + net/nfc/nfc.h | 7 - + net/nfc/rawsock.c | 28 +- + net/openvswitch/Kconfig | 28 + + net/openvswitch/Makefile | 14 + + net/openvswitch/actions.c | 415 ++ + net/openvswitch/datapath.c | 1912 ++++++ + net/openvswitch/datapath.h | 125 + + net/openvswitch/dp_notify.c | 66 + + net/openvswitch/flow.c | 1346 ++++ + net/openvswitch/flow.h | 199 + + net/openvswitch/vport-internal_dev.c | 241 + + net/openvswitch/vport-internal_dev.h | 28 + + net/openvswitch/vport-netdev.c | 198 + + net/openvswitch/vport-netdev.h | 42 + + net/openvswitch/vport.c | 398 ++ + net/openvswitch/vport.h | 205 + + net/packet/af_packet.c | 21 +- + net/phonet/pep.c | 106 +- + net/rfkill/core.c | 4 +- + net/rfkill/rfkill-gpio.c | 13 +- + net/rfkill/rfkill-regulator.c | 12 +- + net/rxrpc/ar-key.c | 6 +- + net/sched/cls_flow.c | 180 +- + net/sched/sch_choke.c | 121 +- + net/sched/sch_generic.c | 9 +- + net/sched/sch_gred.c | 22 +- + net/sched/sch_multiq.c | 6 +- + net/sched/sch_netem.c | 43 + + net/sched/sch_red.c | 30 +- + net/sched/sch_sfb.c | 17 +- + net/sched/sch_sfq.c | 65 +- + net/sched/sch_teql.c | 8 +- + net/sctp/input.c | 2 +- + net/sctp/ipv6.c | 40 +- + net/sctp/protocol.c | 2 +- + net/sctp/sm_make_chunk.c | 4 +- + net/sctp/sm_sideeffect.c | 8 +- + net/sctp/socket.c | 6 +- + net/sctp/transport.c | 16 + + net/socket.c | 20 + + net/sunrpc/addr.c | 8 +- + net/sunrpc/svc.c | 8 +- + net/sunrpc/svc_xprt.c | 8 +- + net/sunrpc/svcauth_unix.c | 8 +- + net/sunrpc/svcsock.c | 4 +- + net/wireless/Kconfig | 7 +- + net/wireless/chan.c | 12 +- + net/wireless/core.c | 4 + + net/wireless/core.h | 14 +- + net/wireless/mesh.c | 2 + + net/wireless/mlme.c | 72 +- + net/wireless/nl80211.c | 614 ++- + net/wireless/nl80211.h | 5 + + net/wireless/reg.c | 39 + + net/wireless/reg.h | 1 + + net/wireless/scan.c | 117 +- + net/wireless/sme.c | 7 +- + net/wireless/util.c | 186 +- + net/wireless/wext-compat.c | 12 + + net/xfrm/xfrm_policy.c | 12 +- + net/xfrm/xfrm_state.c | 12 +- + net/xfrm/xfrm_user.c | 12 +- + security/lsm_audit.c | 7 +- + security/selinux/hooks.c | 11 +- + security/selinux/netnode.c | 2 +- + 1035 files changed, 84328 insertions(+), 59437 deletions(-) + create mode 100644 Documentation/cgroups/net_prio.txt + create mode 100644 Documentation/devicetree/bindings/net/calxeda-xgmac.txt + create mode 100644 Documentation/devicetree/bindings/net/can/cc770.txt + create mode 100644 Documentation/networking/openvswitch.txt + create mode 100644 Documentation/networking/team.txt + delete mode 100644 drivers/net/bonding/bond_ipv6.c + create mode 100644 drivers/net/can/cc770/Kconfig + create mode 100644 drivers/net/can/cc770/Makefile + create mode 100644 drivers/net/can/cc770/cc770.c + create mode 100644 drivers/net/can/cc770/cc770.h + create mode 100644 drivers/net/can/cc770/cc770_isa.c + create mode 100644 drivers/net/can/cc770/cc770_platform.c + create mode 100644 drivers/net/dsa/Kconfig + create mode 100644 drivers/net/dsa/Makefile + rename {net => drivers/net}/dsa/mv88e6060.c (96%) + rename {net => drivers/net}/dsa/mv88e6123_61_65.c (96%) + rename {net => drivers/net}/dsa/mv88e6131.c (96%) + rename {net => drivers/net}/dsa/mv88e6xxx.c (93%) + rename {net => drivers/net}/dsa/mv88e6xxx.h (95%) + create mode 100644 drivers/net/ethernet/calxeda/Kconfig + create mode 100644 drivers/net/ethernet/calxeda/Makefile + create mode 100644 drivers/net/ethernet/calxeda/xgmac.c + create mode 100644 drivers/net/team/Kconfig + create mode 100644 drivers/net/team/Makefile + create mode 100644 drivers/net/team/team.c + create mode 100644 drivers/net/team/team_mode_activebackup.c + create mode 100644 drivers/net/team/team_mode_roundrobin.c + rename drivers/net/wireless/ath/ath6kl/{htc_hif.c => hif.c} (80%) + delete mode 100644 drivers/net/wireless/ath/ath6kl/htc_hif.h + create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_mci.c + create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_mci.h + create mode 100644 drivers/net/wireless/ath/ath9k/mci.c + create mode 100644 drivers/net/wireless/ath/ath9k/mci.h + delete mode 100644 drivers/net/wireless/brcm80211/brcmfmac/bcmchip.h + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h + create mode 100644 drivers/net/wireless/iwlegacy/3945-debug.c + create mode 100644 drivers/net/wireless/iwlegacy/3945-mac.c + create mode 100644 drivers/net/wireless/iwlegacy/3945-rs.c + create mode 100644 drivers/net/wireless/iwlegacy/3945.c + create mode 100644 drivers/net/wireless/iwlegacy/3945.h + rename drivers/net/wireless/iwlegacy/{iwl-4965-calib.c => 4965-calib.c} (55%) + create mode 100644 drivers/net/wireless/iwlegacy/4965-debug.c + create mode 100644 drivers/net/wireless/iwlegacy/4965-mac.c + create mode 100644 drivers/net/wireless/iwlegacy/4965-rs.c + create mode 100644 drivers/net/wireless/iwlegacy/4965.c + create mode 100644 drivers/net/wireless/iwlegacy/4965.h + rename drivers/net/wireless/iwlegacy/{iwl-commands.h => commands.h} (79%) + create mode 100644 drivers/net/wireless/iwlegacy/common.c + create mode 100644 drivers/net/wireless/iwlegacy/common.h + rename drivers/net/wireless/iwlegacy/{iwl-csr.h => csr.h} (84%) + create mode 100644 drivers/net/wireless/iwlegacy/debug.c + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945-debugfs.c + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945-debugfs.h + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945-fh.h + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945-hw.h + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945-led.c + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945-led.h + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945-rs.c + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945.c + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945.h + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-calib.h + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-debugfs.h + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-hw.h + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-led.c + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-led.h + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-lib.c + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-rs.c + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-rx.c + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-sta.c + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-tx.c + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-ucode.c + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965.c + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965.h + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-core.c + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-core.h + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-debug.h + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-debugfs.c + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-dev.h + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-devtrace.c + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-devtrace.h + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-eeprom.c + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-eeprom.h + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-fh.h + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-hcmd.c + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-helpers.h + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-io.h + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-led.c + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-led.h + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-legacy-rs.h + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-power.c + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-power.h + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-rx.c + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-scan.c + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-sta.h + delete mode 100644 drivers/net/wireless/iwlegacy/iwl-tx.c + delete mode 100644 drivers/net/wireless/iwlegacy/iwl3945-base.c + delete mode 100644 drivers/net/wireless/iwlegacy/iwl4965-base.c + rename drivers/net/wireless/iwlegacy/{iwl-prph.h => prph.h} (83%) + create mode 100644 drivers/net/wireless/iwlwifi/iwl-mac80211.c + rename drivers/net/wireless/iwlwifi/{iwl-sv-open.c => iwl-testmode.c} (78%) + rename drivers/net/wireless/iwlwifi/{iwl-agn-ucode.c => iwl-ucode.c} (64%) + create mode 100644 drivers/net/wireless/wl12xx/debug.h + delete mode 100644 drivers/net/wireless/wl12xx/sdio_test.c + create mode 100644 include/linux/can/platform/cc770.h + create mode 100644 include/linux/dynamic_queue_limits.h + create mode 100644 include/linux/if_team.h + create mode 100644 include/linux/netdev_features.h + create mode 100644 include/linux/openvswitch.h + create mode 100644 include/linux/sock_diag.h + create mode 100644 include/net/flow_keys.h + create mode 100644 include/net/netprio_cgroup.h + create mode 100644 lib/dynamic_queue_limits.c + create mode 100644 net/caif/caif_usb.c + create mode 100644 net/core/flow_dissector.c + create mode 100644 net/core/netprio_cgroup.c + create mode 100644 net/core/sock_diag.c + create mode 100644 net/ipv4/udp_diag.c + create mode 100644 net/openvswitch/Kconfig + create mode 100644 net/openvswitch/Makefile + create mode 100644 net/openvswitch/actions.c + create mode 100644 net/openvswitch/datapath.c + create mode 100644 net/openvswitch/datapath.h + create mode 100644 net/openvswitch/dp_notify.c + create mode 100644 net/openvswitch/flow.c + create mode 100644 net/openvswitch/flow.h + create mode 100644 net/openvswitch/vport-internal_dev.c + create mode 100644 net/openvswitch/vport-internal_dev.h + create mode 100644 net/openvswitch/vport-netdev.c + create mode 100644 net/openvswitch/vport-netdev.h + create mode 100644 net/openvswitch/vport.c + create mode 100644 net/openvswitch/vport.h +Merging wireless-next/master (b6a27d1 iwlwifi regression in 20111205 merge) +$ git merge wireless-next/master +Already up-to-date. +Merging bluetooth/master (5a13b09 Bluetooth: trivial: correct check for LMP version) +$ git merge bluetooth/master +Already up-to-date. +Merging mtd/master (7148b79 mtd: pxa2xx-flash.c: It used to fall back to provided table.) +$ git merge mtd/master +Merge made by the 'recursive' strategy. + drivers/mtd/maps/pxa2xx-flash.c | 2 +- + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 2 +- + drivers/mtd/nand/ndfc.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) +Merging l2-mtd/master (a469923 mtd: document that MEMWRITE ioctl is NAND-specific) +$ git merge l2-mtd/master +Resolved 'drivers/mtd/bcm63xxpart.c' using previous resolution. +Auto-merging drivers/mtd/nand/ndfc.c +Auto-merging drivers/mtd/maps/pxa2xx-flash.c +Auto-merging drivers/mtd/bcm63xxpart.c +CONFLICT (content): Merge conflict in drivers/mtd/bcm63xxpart.c +Auto-merging arch/mips/bcm63xx/boards/board_bcm963xx.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a7de8e0] Merge remote-tracking branch 'l2-mtd/master' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-devices-platform-docg3 | 34 + + arch/mips/bcm63xx/boards/board_bcm963xx.c | 3 + + drivers/mtd/Kconfig | 8 + + drivers/mtd/Makefile | 1 + + .../mtd/{maps/bcm963xx-flash.c => bcm63xxpart.c} | 190 +-- + drivers/mtd/chips/cfi_cmdset_0020.c | 5 +- + drivers/mtd/devices/Kconfig | 9 + + drivers/mtd/devices/docg3.c | 1466 +++++++++++++++++--- + drivers/mtd/devices/docg3.h | 65 +- + drivers/mtd/devices/m25p80.c | 1 - + drivers/mtd/devices/mtd_dataflash.c | 1 - + drivers/mtd/devices/sst25l.c | 1 - + drivers/mtd/maps/Kconfig | 9 - + drivers/mtd/maps/Makefile | 1 - + drivers/mtd/maps/bfin-async-flash.c | 12 +- + drivers/mtd/maps/gpio-addr-flash.c | 12 +- + drivers/mtd/maps/ixp2000.c | 12 +- + drivers/mtd/maps/ixp4xx.c | 14 +- + drivers/mtd/maps/latch-addr-flash.c | 12 +- + drivers/mtd/maps/physmap.c | 5 +- + drivers/mtd/maps/physmap_of.c | 13 +- + drivers/mtd/maps/pxa2xx-flash.c | 13 +- + drivers/mtd/maps/rbtx4939-flash.c | 13 +- + drivers/mtd/maps/sa1100-flash.c | 13 +- + drivers/mtd/maps/sun_uflash.c | 13 +- + drivers/mtd/mtd_blkdevs.c | 3 +- + drivers/mtd/mtdoops.c | 5 +- + drivers/mtd/nand/Kconfig | 2 +- + drivers/mtd/nand/ams-delta.c | 12 +- + drivers/mtd/nand/bcm_umi_nand.c | 13 +- + drivers/mtd/nand/davinci_nand.c | 4 +- + drivers/mtd/nand/fsl_elbc_nand.c | 47 +- + drivers/mtd/nand/fsl_upm.c | 12 +- + drivers/mtd/nand/jz4740_nand.c | 12 +- + drivers/mtd/nand/mpc5121_nfc.c | 14 +- + drivers/mtd/nand/nand_base.c | 7 +- + drivers/mtd/nand/nand_ids.c | 4 +- + drivers/mtd/nand/ndfc.c | 13 +- + drivers/mtd/nand/nomadik_nand.c | 14 +- + drivers/mtd/nand/nuc900_nand.c | 13 +- + drivers/mtd/nand/omap2.c | 15 +- + drivers/mtd/nand/pasemi_nand.c | 12 +- + drivers/mtd/nand/plat_nand.c | 13 +- + drivers/mtd/nand/pxa3xx_nand.c | 12 +- + drivers/mtd/nand/sharpsl.c | 12 +- + drivers/mtd/nand/socrates_nand.c | 13 +- + drivers/mtd/nand/tmio_nand.c | 13 +- + drivers/mtd/onenand/generic.c | 16 +- + drivers/mtd/onenand/samsung.c | 13 +- + drivers/mtd/tests/mtd_stresstest.c | 7 + + fs/jffs2/fs.c | 1 - + include/linux/mtd/cfi.h | 16 +- + include/linux/mtd/cfi_endian.h | 76 +- + include/linux/mtd/map.h | 1 + + include/linux/mtd/nand.h | 1 + + include/linux/mtd/physmap.h | 1 + + include/mtd/mtd-abi.h | 3 +- + 57 files changed, 1531 insertions(+), 795 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-devices-platform-docg3 + rename drivers/mtd/{maps/bcm963xx-flash.c => bcm63xxpart.c} (54%) +Merging crypto/master (741e8c2 crypto: convert drivers/crypto/* to use module_platform_driver()) +$ git merge crypto/master +Auto-merging drivers/crypto/mv_cesa.c +Removing crypto/serpent.c +Auto-merging crypto/crypto_user.c +Merge made by the 'recursive' strategy. + arch/x86/crypto/Makefile | 4 + + arch/x86/crypto/serpent-sse2-i586-asm_32.S | 638 ++++++ + arch/x86/crypto/serpent-sse2-x86_64-asm_64.S | 761 +++++++ + arch/x86/crypto/serpent_sse2_glue.c | 1110 ++++++++++ + arch/x86/crypto/twofish_glue_3way.c | 250 +++ + arch/x86/include/asm/serpent.h | 63 + + crypto/Kconfig | 38 +- + crypto/Makefile | 2 +- + crypto/algapi.c | 29 + + crypto/ansi_cprng.c | 8 + + crypto/crypto_user.c | 2 +- + crypto/lrw.c | 156 +- + crypto/serpent.c | 587 ----- + crypto/serpent_generic.c | 684 ++++++ + crypto/tcrypt.c | 310 +++ + crypto/tcrypt.h | 2 + + crypto/testmgr.c | 150 ++ + crypto/testmgr.h | 3029 ++++++++++++++++++++++++-- + crypto/twofish_common.c | 13 +- + crypto/xts.c | 79 +- + drivers/char/hw_random/atmel-rng.c | 12 +- + drivers/char/hw_random/n2-drv.c | 13 +- + drivers/char/hw_random/octeon-rng.c | 13 +- + drivers/char/hw_random/pasemi-rng.c | 12 +- + drivers/char/hw_random/picoxcell-rng.c | 12 +- + drivers/char/hw_random/ppc4xx-rng.c | 12 +- + drivers/char/hw_random/timeriomem-rng.c | 13 +- + drivers/crypto/amcc/crypto4xx_core.c | 13 +- + drivers/crypto/caam/caamalg.c | 57 + + drivers/crypto/caam/compat.h | 1 + + drivers/crypto/caam/ctrl.c | 13 +- + drivers/crypto/mv_cesa.c | 12 +- + drivers/crypto/picoxcell_crypto.c | 12 +- + drivers/crypto/s5p-sss.c | 13 +- + drivers/crypto/talitos.c | 490 ++++- + drivers/crypto/talitos.h | 45 +- + include/crypto/algapi.h | 1 + + include/crypto/lrw.h | 43 + + include/crypto/serpent.h | 27 + + include/crypto/twofish.h | 2 + + include/crypto/xts.h | 27 + + 41 files changed, 7738 insertions(+), 1020 deletions(-) + create mode 100644 arch/x86/crypto/serpent-sse2-i586-asm_32.S + create mode 100644 arch/x86/crypto/serpent-sse2-x86_64-asm_64.S + create mode 100644 arch/x86/crypto/serpent_sse2_glue.c + create mode 100644 arch/x86/include/asm/serpent.h + delete mode 100644 crypto/serpent.c + create mode 100644 crypto/serpent_generic.c + create mode 100644 include/crypto/lrw.h + create mode 100644 include/crypto/serpent.h + create mode 100644 include/crypto/xts.h +Merging sound/for-next (96ef593 Merge branch 'topic/misc' into for-next) +$ git merge sound/for-next +Resolved 'arch/arm/mach-s3c64xx/mach-crag6410.c' using previous resolution. +Auto-merging sound/soc/txx9/txx9aclc.c +Auto-merging sound/soc/samsung/tobermory.c +Auto-merging sound/soc/samsung/dma.c +Auto-merging sound/soc/nuc900/nuc900-ac97.c +Auto-merging sound/soc/mxs/mxs-saif.c +Auto-merging sound/soc/imx/imx-pcm-dma-mx2.c +Auto-merging sound/soc/ep93xx/ep93xx-pcm.c +Auto-merging sound/soc/codecs/sigmadsp.c +Auto-merging sound/soc/au1x/db1200.c +Removing sound/pci/hda/alc262_quirks.c +Removing include/linux/sigma.h +Auto-merging arch/arm/mach-shmobile/board-ap4evb.c +Auto-merging arch/arm/mach-s3c64xx/mach-crag6410.c +CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-crag6410.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a7d3fdd] Merge remote-tracking branch 'sound/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/sound/tegra20-das.txt | 12 + + .../devicetree/bindings/sound/tegra20-i2s.txt | 17 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + Documentation/sound/alsa/HD-Audio-Models.txt | 14 +- + MAINTAINERS | 1 + + arch/arm/mach-s3c64xx/mach-crag6410.c | 6 +- + arch/arm/mach-shmobile/board-ap4evb.c | 15 +- + arch/arm/mach-shmobile/board-mackerel.c | 14 +- + arch/sh/boards/mach-se/7724/setup.c | 14 +- + drivers/base/regmap/internal.h | 1 + + drivers/base/regmap/regcache.c | 19 + + drivers/base/regmap/regmap.c | 4 +- + drivers/firmware/Kconfig | 12 - + drivers/firmware/Makefile | 1 - + include/linux/mfd/wm8994/pdata.h | 23 + + include/linux/mfd/wm8994/registers.h | 16 + + include/linux/regmap.h | 1 + + include/linux/sigma.h | 55 - + include/sound/sh_fsi.h | 12 + + include/sound/soc-dapm.h | 5 + + include/sound/soc.h | 10 +- + include/sound/sta32x.h | 35 + + sound/arm/pxa2xx-ac97.c | 13 +- + sound/drivers/ml403-ac97cr.c | 13 +- + sound/mips/hal2.c | 13 +- + sound/mips/sgio2audio.c | 13 +- + sound/pci/asihpi/hpicmn.c | 2 +- + sound/pci/ctxfi/ctsrc.c | 2 +- + sound/pci/hda/alc262_quirks.c | 875 ------ + sound/pci/hda/alc880_quirks.c | 193 -- + sound/pci/hda/alc882_quirks.c | 2933 +------------------- + sound/pci/hda/hda_codec.c | 6 + + sound/pci/hda/hda_codec.h | 3 - + sound/pci/hda/hda_intel.c | 48 +- + sound/pci/hda/patch_hdmi.c | 20 +- + sound/pci/hda/patch_realtek.c | 607 ++++- + sound/pci/sis7019.c | 29 +- + sound/sh/sh_dac_audio.c | 13 +- + sound/soc/Kconfig | 15 - + sound/soc/atmel/atmel-pcm.c | 12 +- + sound/soc/atmel/atmel_ssc_dai.c | 14 +- + sound/soc/au1x/ac97c.c | 2 +- + sound/soc/au1x/db1000.c | 13 +- + sound/soc/au1x/db1200.c | 13 +- + sound/soc/au1x/dbdma2.c | 13 +- + sound/soc/au1x/dma.c | 13 +- + sound/soc/au1x/i2sc.c | 13 +- + sound/soc/au1x/psc-ac97.c | 2 +- + sound/soc/au1x/psc-i2s.c | 15 +- + sound/soc/blackfin/bf5xx-ac97-pcm.c | 12 +- + sound/soc/blackfin/bf5xx-ac97.c | 13 +- + sound/soc/blackfin/bf5xx-i2s-pcm.c | 12 +- + sound/soc/blackfin/bf5xx-i2s.c | 15 +- + sound/soc/blackfin/bf5xx-tdm-pcm.c | 12 +- + sound/soc/blackfin/bf5xx-tdm.c | 14 +- + sound/soc/blackfin/bfin-eval-adau1373.c | 12 +- + sound/soc/blackfin/bfin-eval-adau1701.c | 12 +- + sound/soc/blackfin/bfin-eval-adav80x.c | 12 +- + sound/soc/codecs/88pm860x-codec.c | 16 +- + sound/soc/codecs/Kconfig | 25 +- + sound/soc/codecs/Makefile | 20 +- + sound/soc/codecs/ac97.c | 16 +- + sound/soc/codecs/ad1836.c | 4 +- + sound/soc/codecs/ad193x.c | 190 +- + sound/soc/codecs/ad193x.h | 17 +- + sound/soc/codecs/ad1980.c | 12 +- + sound/soc/codecs/ad73311.c | 12 +- + sound/soc/codecs/adau1373.c | 2 +- + sound/soc/codecs/adau1701.c | 2 +- + sound/soc/codecs/adav80x.c | 2 +- + sound/soc/codecs/ads117x.c | 12 +- + sound/soc/codecs/ak4104.c | 2 +- + sound/soc/codecs/ak4535.c | 5 +- + sound/soc/codecs/ak4641.c | 7 +- + sound/soc/codecs/ak4642.c | 142 +- + sound/soc/codecs/ak4671.c | 2 +- + sound/soc/codecs/alc5623.c | 5 +- + sound/soc/codecs/alc5632.c | 1159 ++++++++ + sound/soc/codecs/alc5632.h | 251 ++ + sound/soc/codecs/cq93vc.c | 14 +- + sound/soc/codecs/cs4270.c | 5 +- + sound/soc/codecs/cs4271.c | 4 +- + sound/soc/codecs/cs42l51.c | 16 +- + sound/soc/codecs/cs42l73.c | 1453 ++++++++++ + sound/soc/codecs/cs42l73.h | 227 ++ + sound/soc/codecs/cx20442.c | 12 +- + sound/soc/codecs/da7210.c | 7 +- + sound/soc/codecs/dfbmcs320.c | 12 +- + sound/soc/codecs/dmic.c | 12 +- + sound/soc/codecs/jz4740.c | 16 +- + sound/soc/codecs/max98088.c | 7 +- + sound/soc/codecs/max98095.c | 9 +- + sound/soc/codecs/max9850.c | 4 +- + sound/soc/codecs/pcm3008.c | 14 +- + sound/soc/codecs/rt5631.c | 5 +- + sound/soc/codecs/sgtl5000.c | 5 +- + .../sigma.c => sound/soc/codecs/sigmadsp.c | 121 +- + sound/soc/codecs/sigmadsp.h | 21 + + sound/soc/codecs/sn95031.c | 22 +- + sound/soc/codecs/spdif_transciever.c | 13 +- + sound/soc/codecs/ssm2602.c | 5 +- + sound/soc/codecs/sta32x.c | 89 +- + sound/soc/codecs/stac9766.c | 21 +- + sound/soc/codecs/tlv320aic23.c | 6 +- + sound/soc/codecs/tlv320aic26.c | 2 +- + sound/soc/codecs/tlv320aic32x4.c | 5 +- + sound/soc/codecs/tlv320aic3x.c | 52 +- + sound/soc/codecs/tlv320dac33.c | 5 +- + sound/soc/codecs/twl4030.c | 18 +- + sound/soc/codecs/twl6040.c | 16 +- + sound/soc/codecs/uda134x.c | 17 +- + sound/soc/codecs/uda1380.c | 36 +- + sound/soc/codecs/wl1273.c | 14 +- + sound/soc/codecs/wm1250-ev1.c | 10 +- + sound/soc/codecs/wm2000.c | 227 +- + sound/soc/codecs/wm2000.h | 7 - + sound/soc/codecs/wm5100-tables.c | 1489 +++++------ + sound/soc/codecs/wm5100.c | 406 ++-- + sound/soc/codecs/wm5100.h | 7 +- + sound/soc/codecs/wm8350.c | 63 +- + sound/soc/codecs/wm8400.c | 60 +- + sound/soc/codecs/wm8510.c | 30 +- + sound/soc/codecs/wm8523.c | 5 +- + sound/soc/codecs/wm8580.c | 29 +- + sound/soc/codecs/wm8711.c | 10 +- + sound/soc/codecs/wm8727.c | 14 +- + sound/soc/codecs/wm8728.c | 9 +- + sound/soc/codecs/wm8731.c | 10 +- + sound/soc/codecs/wm8737.c | 5 +- + sound/soc/codecs/wm8741.c | 43 +- + sound/soc/codecs/wm8750.c | 40 +- + sound/soc/codecs/wm8753.c | 31 +- + sound/soc/codecs/wm8770.c | 5 +- + sound/soc/codecs/wm8776.c | 21 +- + sound/soc/codecs/wm8782.c | 12 +- + sound/soc/codecs/wm8804.c | 4 +- + sound/soc/codecs/wm8900.c | 11 +- + sound/soc/codecs/wm8903.c | 485 ++-- + sound/soc/codecs/wm8904.c | 9 +- + sound/soc/codecs/wm8940.c | 11 +- + sound/soc/codecs/wm8955.c | 7 +- + sound/soc/codecs/wm8958-dsp2.c | 3 +- + sound/soc/codecs/wm8960.c | 17 +- + sound/soc/codecs/wm8961.c | 9 +- + sound/soc/codecs/wm8962.c | 1627 ++++++------ + sound/soc/codecs/wm8971.c | 9 +- + sound/soc/codecs/wm8974.c | 9 +- + sound/soc/codecs/wm8978.c | 5 +- + sound/soc/codecs/wm8983.c | 7 +- + sound/soc/codecs/wm8985.c | 7 +- + sound/soc/codecs/wm8988.c | 9 +- + sound/soc/codecs/wm8990.c | 11 +- + sound/soc/codecs/wm8991.c | 9 +- + sound/soc/codecs/wm8993.c | 6 +- + sound/soc/codecs/wm8994.c | 524 +++- + sound/soc/codecs/wm8994.h | 11 +- + sound/soc/codecs/wm8995.c | 731 ++++- + sound/soc/codecs/wm8996.c | 919 ++++--- + sound/soc/codecs/wm9081.c | 369 ++- + sound/soc/codecs/wm9090.c | 9 +- + sound/soc/codecs/wm9705.c | 16 +- + sound/soc/codecs/wm9712.c | 19 +- + sound/soc/codecs/wm9713.c | 21 +- + sound/soc/codecs/wm_hubs.c | 8 +- + sound/soc/davinci/davinci-i2s.c | 14 +- + sound/soc/davinci/davinci-mcasp.c | 14 +- + sound/soc/davinci/davinci-pcm.c | 12 +- + sound/soc/davinci/davinci-vcif.c | 14 +- + sound/soc/ep93xx/edb93xx.c | 12 +- + sound/soc/ep93xx/ep93xx-ac97.c | 14 +- + sound/soc/ep93xx/ep93xx-i2s.c | 15 +- + sound/soc/ep93xx/ep93xx-pcm.c | 13 +- + sound/soc/ep93xx/simone.c | 12 +- + sound/soc/ep93xx/snappercl15.c | 13 +- + sound/soc/fsl/fsl_dma.c | 15 +- + sound/soc/fsl/fsl_ssi.c | 17 +- + sound/soc/fsl/mpc5200_dma.c | 12 +- + sound/soc/fsl/mpc5200_psc_ac97.c | 20 +- + sound/soc/fsl/mpc5200_psc_i2s.c | 18 +- + sound/soc/fsl/mpc8610_hpcd.c | 13 +- + sound/soc/fsl/p1022_ds.c | 49 +- + sound/soc/imx/imx-pcm-dma-mx2.c | 12 +- + sound/soc/imx/imx-pcm-fiq.c | 12 +- + sound/soc/imx/imx-ssi.c | 15 +- + sound/soc/jz4740/jz4740-i2s.c | 14 +- + sound/soc/jz4740/jz4740-pcm.c | 12 +- + sound/soc/kirkwood/kirkwood-dma.c | 12 +- + sound/soc/kirkwood/kirkwood-i2s.c | 14 +- + sound/soc/mid-x86/Kconfig | 1 - + sound/soc/mid-x86/mfld_machine.c | 14 +- + sound/soc/mid-x86/sst_platform.c | 144 +- + sound/soc/mid-x86/sst_platform.h | 82 +- + sound/soc/mxs/mxs-pcm.c | 12 +- + sound/soc/mxs/mxs-saif.c | 14 +- + sound/soc/mxs/mxs-sgtl5000.c | 12 +- + sound/soc/nuc900/nuc900-ac97.c | 15 +- + sound/soc/nuc900/nuc900-pcm.c | 12 +- + sound/soc/omap/Kconfig | 5 + + sound/soc/omap/Makefile | 2 + + sound/soc/omap/ams-delta.c | 2 +- + sound/soc/omap/omap-dmic.c | 549 ++++ + sound/soc/omap/omap-dmic.h | 69 + + sound/soc/omap/omap-hdmi.c | 14 +- + sound/soc/omap/omap-mcbsp.c | 14 +- + sound/soc/omap/omap-mcpdm.c | 14 +- + sound/soc/omap/omap-pcm.c | 12 +- + sound/soc/omap/omap4-hdmi-card.c | 12 +- + sound/soc/omap/sdp4430.c | 85 +- + sound/soc/pxa/e740_wm9705.c | 20 +- + sound/soc/pxa/hx4700.c | 13 +- + sound/soc/pxa/mioa701_wm9713.c | 13 +- + sound/soc/pxa/palm27x.c | 13 +- + sound/soc/pxa/pxa-ssp.c | 14 +- + sound/soc/pxa/pxa2xx-ac97.c | 18 +- + sound/soc/pxa/pxa2xx-i2s.c | 2 +- + sound/soc/pxa/pxa2xx-pcm.c | 12 +- + sound/soc/s6000/s6000-i2s.c | 14 +- + sound/soc/s6000/s6000-pcm.c | 12 +- + sound/soc/samsung/Kconfig | 18 +- + sound/soc/samsung/Makefile | 8 +- + sound/soc/samsung/ac97.c | 16 +- + sound/soc/samsung/dma.c | 12 +- + sound/soc/samsung/i2s.c | 16 +- + sound/soc/samsung/idma.c | 14 +- + sound/soc/samsung/idma.h | 2 +- + sound/soc/samsung/littlemill.c | 252 ++ + sound/soc/samsung/lowland.c | 236 ++ + sound/soc/samsung/pcm.c | 14 +- + sound/soc/samsung/s3c2412-i2s.c | 14 +- + sound/soc/samsung/s3c24xx-i2s.c | 14 +- + sound/soc/samsung/s3c24xx_simtec_hermes.c | 16 +- + sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c | 16 +- + sound/soc/samsung/s3c24xx_uda134x.c | 14 +- + sound/soc/samsung/smdk_wm8580pcm.c | 14 +- + sound/soc/samsung/smdk_wm8994pcm.c | 14 +- + sound/soc/samsung/spdif.c | 14 +- + sound/soc/samsung/speyside.c | 15 +- + .../soc/samsung/{speyside_wm8962.c => tobermory.c} | 77 +- + sound/soc/sh/dma-sh7760.c | 12 +- + sound/soc/sh/fsi-ak4642.c | 127 +- + sound/soc/sh/fsi-hdmi.c | 13 +- + sound/soc/sh/fsi.c | 36 +- + sound/soc/sh/hac.c | 14 +- + sound/soc/sh/siu_dai.c | 15 +- + sound/soc/sh/ssi.c | 14 +- + sound/soc/soc-cache.c | 384 --- + sound/soc/soc-core.c | 8 +- + sound/soc/soc-dapm.c | 80 + + sound/soc/soc-pcm.c | 3 +- + sound/soc/tegra/tegra_das.c | 53 +- + sound/soc/tegra/tegra_i2s.c | 164 +- + sound/soc/tegra/tegra_i2s.h | 1 + + sound/soc/tegra/tegra_pcm.c | 13 +- + sound/soc/tegra/tegra_spdif.c | 14 +- + sound/soc/tegra/tegra_wm8903.c | 79 +- + sound/soc/tegra/trimslice.c | 45 +- + sound/soc/txx9/txx9aclc-ac97.c | 13 +- + sound/soc/txx9/txx9aclc.c | 12 +- + sound/sparc/cs4231.c | 13 +- + sound/sparc/dbri.c | 14 +- + sound/usb/quirks-table.h | 10 + + 261 files changed, 10348 insertions(+), 10081 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/tegra20-das.txt + create mode 100644 Documentation/devicetree/bindings/sound/tegra20-i2s.txt + delete mode 100644 include/linux/sigma.h + create mode 100644 include/sound/sta32x.h + delete mode 100644 sound/pci/hda/alc262_quirks.c + create mode 100644 sound/soc/codecs/alc5632.c + create mode 100644 sound/soc/codecs/alc5632.h + create mode 100644 sound/soc/codecs/cs42l73.c + create mode 100644 sound/soc/codecs/cs42l73.h + rename drivers/firmware/sigma.c => sound/soc/codecs/sigmadsp.c (53%) + create mode 100644 sound/soc/codecs/sigmadsp.h + create mode 100644 sound/soc/omap/omap-dmic.c + create mode 100644 sound/soc/omap/omap-dmic.h + create mode 100644 sound/soc/samsung/littlemill.c + create mode 100644 sound/soc/samsung/lowland.c + rename sound/soc/samsung/{speyside_wm8962.c => tobermory.c} (69%) +Merging sound-asoc/for-next (1dfb6ef ASoC: Remove rbtree register cache) +$ git merge sound-asoc/for-next +Removing sound/soc/codecs/wm8994-tables.c +Auto-merging arch/arm/mach-tegra/board-seaboard.c +Auto-merging arch/arm/mach-tegra/board-harmony.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/wm8903.txt | 50 + + Documentation/devicetree/bindings/sound/wm8994.txt | 18 + + arch/arm/mach-tegra/board-harmony.c | 8 +- + arch/arm/mach-tegra/board-seaboard.c | 8 +- + drivers/base/regmap/Kconfig | 3 + + drivers/base/regmap/Makefile | 1 + + drivers/base/regmap/regcache-lzo.c | 2 +- + drivers/base/regmap/regmap-irq.c | 302 ++ + drivers/base/regmap/regmap.c | 33 + + drivers/mfd/Kconfig | 1 + + drivers/mfd/Makefile | 2 +- + drivers/mfd/wm8994-core.c | 142 +- + drivers/mfd/wm8994-irq.c | 206 +-- + drivers/mfd/wm8994-regmap.c | 1238 ++++++++ + drivers/mfd/wm8994.h | 25 + + include/linux/mfd/wm8994/core.h | 7 +- + include/linux/mfd/wm8994/pdata.h | 8 +- + include/linux/mfd/wm8994/registers.h | 96 + + include/linux/regmap.h | 52 +- + include/sound/soc.h | 1 - + include/sound/wm8903.h | 7 +- + sound/soc/codecs/Kconfig | 2 +- + sound/soc/codecs/Makefile | 2 +- + sound/soc/codecs/jz4740.c | 1 + + sound/soc/codecs/wm8770.c | 13 +- + sound/soc/codecs/wm8776.c | 14 +- + sound/soc/codecs/wm8804.c | 7 +- + sound/soc/codecs/wm8900.c | 24 +- + sound/soc/codecs/wm8903.c | 165 +- + sound/soc/codecs/wm8958-dsp2.c | 2 + + sound/soc/codecs/wm8960.c | 67 +- + sound/soc/codecs/wm8961.c | 4 +- + sound/soc/codecs/wm8994-tables.c | 3147 -------------------- + sound/soc/codecs/wm8994.c | 153 +- + sound/soc/codecs/wm8994.h | 10 - + sound/soc/codecs/wm8996.c | 1 + + sound/soc/imx/imx-pcm-fiq.c | 2 + + sound/soc/mxs/mxs-pcm.c | 3 + + sound/soc/mxs/mxs-sgtl5000.c | 1 + + sound/soc/omap/omap-dmic.c | 5 +- + sound/soc/omap/omap-mcpdm.c | 5 - + sound/soc/pxa/e750_wm9705.c | 14 +- + sound/soc/pxa/e800_wm9712.c | 20 +- + sound/soc/pxa/hx4700.c | 5 +- + sound/soc/samsung/i2s.c | 20 +- + sound/soc/samsung/jive_wm8750.c | 3 +- + sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c | 4 +- + sound/soc/samsung/smdk2443_wm9710.c | 1 + + sound/soc/samsung/speyside.c | 7 +- + sound/soc/soc-cache.c | 381 --- + sound/soc/soc-core.c | 54 +- + sound/soc/soc-dapm.c | 7 + + sound/soc/soc-pcm.c | 15 + + sound/soc/tegra/tegra_das.c | 13 + + sound/soc/tegra/tegra_wm8903.c | 13 - + sound/soc/tegra/trimslice.c | 23 - + 56 files changed, 2239 insertions(+), 4179 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/wm8903.txt + create mode 100644 Documentation/devicetree/bindings/sound/wm8994.txt + create mode 100644 drivers/base/regmap/regmap-irq.c + create mode 100644 drivers/mfd/wm8994-regmap.c + create mode 100644 drivers/mfd/wm8994.h + delete mode 100644 sound/soc/codecs/wm8994-tables.c +$ git reset --hard HEAD^ +HEAD is now at a7d3fdd Merge remote-tracking branch 'sound/for-next' +Merging refs/next/20111212/sound-asoc +$ git merge refs/next/20111212/sound-asoc +Auto-merging arch/arm/mach-tegra/board-seaboard.c +Auto-merging arch/arm/mach-tegra/board-harmony.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/wm8903.txt | 50 ++++++ + arch/arm/mach-tegra/board-harmony.c | 8 +- + arch/arm/mach-tegra/board-seaboard.c | 8 +- + include/sound/wm8903.h | 7 +- + sound/soc/codecs/Kconfig | 2 +- + sound/soc/codecs/jz4740.c | 1 + + sound/soc/codecs/wm8770.c | 13 +-- + sound/soc/codecs/wm8776.c | 14 +- + sound/soc/codecs/wm8804.c | 7 +- + sound/soc/codecs/wm8900.c | 24 +-- + sound/soc/codecs/wm8903.c | 165 +++++++++++++++----- + sound/soc/codecs/wm8960.c | 67 +++------ + sound/soc/codecs/wm8961.c | 4 +- + sound/soc/codecs/wm8994.c | 7 +- + sound/soc/codecs/wm8996.c | 1 + + sound/soc/mxs/mxs-pcm.c | 3 + + sound/soc/mxs/mxs-sgtl5000.c | 1 + + sound/soc/omap/omap-dmic.c | 5 +- + sound/soc/omap/omap-mcpdm.c | 5 - + sound/soc/pxa/e750_wm9705.c | 14 +-- + sound/soc/pxa/e800_wm9712.c | 20 +-- + sound/soc/samsung/i2s.c | 20 +-- + sound/soc/samsung/jive_wm8750.c | 3 +- + sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c | 4 +- + sound/soc/samsung/smdk2443_wm9710.c | 1 + + sound/soc/soc-core.c | 54 ++++--- + sound/soc/soc-dapm.c | 7 + + sound/soc/soc-pcm.c | 15 ++ + sound/soc/tegra/tegra_das.c | 13 ++ + sound/soc/tegra/tegra_wm8903.c | 13 -- + sound/soc/tegra/trimslice.c | 23 --- + 31 files changed, 332 insertions(+), 247 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/wm8903.txt +Merging cpufreq/next (21f2e3c [CPUFREQ] Remove wall variable from cpufreq_gov_dbs_init()) +$ git merge cpufreq/next +Removing arch/arm/plat-omap/cpu-omap.c +Auto-merging arch/arm/plat-omap/Makefile +Merge made by the 'recursive' strategy. + arch/arm/plat-omap/Makefile | 1 - + arch/arm/plat-omap/cpu-omap.c | 171 ----------------- + drivers/cpufreq/Makefile | 1 + + drivers/cpufreq/cpufreq_ondemand.c | 3 +- + drivers/cpufreq/exynos4210-cpufreq.c | 340 +++++++++++----------------------- + drivers/cpufreq/omap-cpufreq.c | 274 +++++++++++++++++++++++++++ + drivers/cpufreq/s3c64xx-cpufreq.c | 35 +++-- + 7 files changed, 403 insertions(+), 422 deletions(-) + delete mode 100644 arch/arm/plat-omap/cpu-omap.c + create mode 100644 drivers/cpufreq/omap-cpufreq.c +Merging quilt/rr (2570633 kernel/params: replace DEBUGP with pr_debug) +$ git merge quilt/rr +Auto-merging tools/lguest/lguest.c +Auto-merging drivers/net/virtio_net.c +Merge made by the 'recursive' strategy. + drivers/block/virtio_blk.c | 2 +- + drivers/char/hw_random/virtio-rng.c | 2 +- + drivers/char/virtio_console.c | 6 +- + drivers/lguest/Makefile | 2 +- + drivers/lguest/segments.c | 28 ++- + drivers/net/virtio_net.c | 12 +- + drivers/virtio/virtio_balloon.c | 13 +- + drivers/virtio/virtio_ring.c | 213 +++++++++++++++++-- + include/linux/virtio.h | 70 +------ + kernel/module.c | 104 ++++------ + kernel/params.c | 14 +- + net/9p/trans_virtio.c | 6 +- + {Documentation/virtual => tools}/lguest/.gitignore | 0 + {Documentation/virtual => tools}/lguest/Makefile | 0 + {Documentation/virtual => tools}/lguest/extract | 0 + {Documentation/virtual => tools}/lguest/lguest.c | 2 +- + {Documentation/virtual => tools}/lguest/lguest.txt | 0 + tools/virtio/linux/virtio.h | 21 +-- + tools/virtio/virtio_test.c | 3 +- + 19 files changed, 294 insertions(+), 204 deletions(-) + rename {Documentation/virtual => tools}/lguest/.gitignore (100%) + rename {Documentation/virtual => tools}/lguest/Makefile (100%) + rename {Documentation/virtual => tools}/lguest/extract (100%) + rename {Documentation/virtual => tools}/lguest/lguest.c (99%) + rename {Documentation/virtual => tools}/lguest/lguest.txt (100%) +Merging input/next (246835f Input: wacom - add LED support for Cintiq 24HD) +$ git merge input/next +Resolved 'drivers/input/keyboard/samsung-keypad.c' using previous resolution. +Auto-merging drivers/input/tablet/wacom_wac.c +Auto-merging drivers/input/mouse/synaptics.c +Auto-merging drivers/input/keyboard/samsung-keypad.c +CONFLICT (content): Merge conflict in drivers/input/keyboard/samsung-keypad.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9594be4] Merge remote-tracking branch 'input/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-driver-wacom | 17 +- + Documentation/input/alps.txt | 188 +++++ + Documentation/input/gpio-tilt.txt | 103 +++ + arch/arm/plat-samsung/include/plat/keypad.h | 27 +- + drivers/input/input-polldev.c | 8 +- + drivers/input/keyboard/Kconfig | 21 +- + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/adp5520-keys.c | 13 +- + drivers/input/keyboard/amikbd.c | 15 +- + drivers/input/keyboard/atkbd.c | 40 +- + drivers/input/keyboard/bf54x-keys.c | 16 +- + drivers/input/keyboard/davinci_keyscan.c | 13 +- + drivers/input/keyboard/ep93xx_keypad.c | 14 +- + drivers/input/keyboard/gpio_keys_polled.c | 14 +- + drivers/input/keyboard/imx_keypad.c | 14 +- + drivers/input/keyboard/jornada680_kbd.c | 14 +- + drivers/input/keyboard/jornada720_kbd.c | 14 +- + drivers/input/keyboard/lm8323.c | 11 +- + drivers/input/keyboard/matrix_keypad.c | 14 +- + drivers/input/keyboard/nomadik-ske-keypad.c | 15 +- + drivers/input/keyboard/omap-keypad.c | 15 +- + drivers/input/keyboard/omap4-keypad.c | 13 +- + drivers/input/keyboard/opencores-kbd.c | 13 +- + drivers/input/keyboard/pmic8xxx-keypad.c | 13 +- + drivers/input/keyboard/pxa27x_keypad.c | 14 +- + drivers/input/keyboard/pxa930_rotary.c | 13 +- + drivers/input/keyboard/samsung-keypad.c | 28 +- + drivers/input/keyboard/sh_keysc.c | 14 +- + drivers/input/keyboard/spear-keyboard.c | 13 +- + drivers/input/keyboard/stmpe-keypad.c | 13 +- + drivers/input/keyboard/tc3589x-keypad.c | 13 +- + drivers/input/keyboard/tca8418_keypad.c | 430 +++++++++++ + drivers/input/keyboard/tegra-kbc.c | 13 +- + drivers/input/keyboard/tnetv107x-keypad.c | 14 +- + drivers/input/keyboard/twl4030_keypad.c | 13 +- + drivers/input/keyboard/w90p910_keypad.c | 14 +- + drivers/input/misc/88pm860x_onkey.c | 13 +- + drivers/input/misc/Kconfig | 25 + + drivers/input/misc/Makefile | 2 + + drivers/input/misc/ab8500-ponkey.c | 13 +- + drivers/input/misc/adxl34x-spi.c | 1 - + drivers/input/misc/adxl34x.c | 16 +- + drivers/input/misc/ati_remote2.c | 19 +- + drivers/input/misc/bfin_rotary.c | 13 +- + drivers/input/misc/cobalt_btns.c | 14 +- + drivers/input/misc/dm355evm_keys.c | 13 +- + drivers/input/misc/gp2ap002a00f.c | 299 ++++++++ + drivers/input/misc/gpio_tilt_polled.c | 213 ++++++ + drivers/input/misc/ixp4xx-beeper.c | 13 +- + drivers/input/misc/max8925_onkey.c | 13 +- + drivers/input/misc/mc13783-pwrbutton.c | 14 +- + drivers/input/misc/pcap_keys.c | 14 +- + drivers/input/misc/pcf50633-input.c | 13 +- + drivers/input/misc/pcspkr.c | 14 +- + drivers/input/misc/pm8xxx-vibrator.c | 13 +- + drivers/input/misc/pmic8xxx-pwrkey.c | 13 +- + drivers/input/misc/pwm-beeper.c | 13 +- + drivers/input/misc/rb532_button.c | 14 +- + drivers/input/misc/rotary_encoder.c | 14 +- + drivers/input/misc/sgi_btns.c | 13 +- + drivers/input/misc/twl4030-pwrbutton.c | 15 +- + drivers/input/misc/twl4030-vibra.c | 14 +- + drivers/input/misc/twl6040-vibra.c | 13 +- + drivers/input/misc/wm831x-on.c | 13 +- + drivers/input/mouse/alps.c | 1036 ++++++++++++++++++++++++-- + drivers/input/mouse/alps.h | 19 + + drivers/input/mouse/amimouse.c | 16 +- + drivers/input/mouse/elantech.c | 80 ++- + drivers/input/mouse/elantech.h | 2 + + drivers/input/mouse/gpio_mouse.c | 13 +- + drivers/input/mouse/hgpk.c | 18 +- + drivers/input/mouse/logips2pp.c | 9 +- + drivers/input/mouse/psmouse-base.c | 36 +- + drivers/input/mouse/psmouse.h | 3 + + drivers/input/mouse/pxa930_trkball.c | 14 +- + drivers/input/mouse/sentelic.c | 43 +- + drivers/input/mouse/synaptics.c | 197 ++++-- + drivers/input/mouse/synaptics.h | 5 + + drivers/input/mouse/trackpoint.c | 17 +- + drivers/input/serio/altera_ps2.c | 13 +- + drivers/input/serio/at32psif.c | 14 +- + drivers/input/serio/i8042.c | 23 +- + drivers/input/serio/rpckbd.c | 14 +- + drivers/input/serio/xilinx_ps2.c | 14 +- + drivers/input/tablet/aiptek.c | 34 +- + drivers/input/tablet/wacom_sys.c | 101 +++- + drivers/input/tablet/wacom_wac.c | 187 +++++- + drivers/input/tablet/wacom_wac.h | 5 +- + drivers/input/touchscreen/88pm860x-ts.c | 13 +- + drivers/input/touchscreen/Kconfig | 16 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/ad7877.c | 17 +- + drivers/input/touchscreen/ad7879-i2c.c | 31 +- + drivers/input/touchscreen/ad7879-spi.c | 27 +- + drivers/input/touchscreen/ad7879.c | 23 +- + drivers/input/touchscreen/ad7879.h | 4 +- + drivers/input/touchscreen/ads7846.c | 9 +- + drivers/input/touchscreen/atmel-wm97xx.c | 13 +- + drivers/input/touchscreen/atmel_tsadcc.c | 15 +- + drivers/input/touchscreen/da9034-ts.c | 13 +- + drivers/input/touchscreen/egalax_ts.c | 303 ++++++++ + drivers/input/touchscreen/htcpen.c | 7 +- + drivers/input/touchscreen/intel-mid-touch.c | 13 +- + drivers/input/touchscreen/jornada720_ts.c | 14 +- + drivers/input/touchscreen/lpc32xx_ts.c | 13 +- + drivers/input/touchscreen/mainstone-wm97xx.c | 14 +- + drivers/input/touchscreen/mc13783_ts.c | 13 +- + drivers/input/touchscreen/migor_ts.c | 117 ++-- + drivers/input/touchscreen/pcap_ts.c | 14 +- + drivers/input/touchscreen/s3c2410_ts.c | 14 +- + drivers/input/touchscreen/stmpe-ts.c | 15 +- + drivers/input/touchscreen/tnetv107x-ts.c | 14 +- + drivers/input/touchscreen/tps6507x-ts.c | 13 +- + drivers/input/touchscreen/ucb1400_ts.c | 14 +- + drivers/input/touchscreen/usbtouchscreen.c | 36 + + drivers/input/touchscreen/w90p910_ts.c | 14 +- + drivers/input/touchscreen/wm831x-ts.c | 13 +- + drivers/input/touchscreen/zylonite-wm97xx.c | 14 +- + include/linux/input/gp2ap002a00f.h | 22 + + include/linux/input/gpio_tilt.h | 73 ++ + include/linux/input/samsung-keypad.h | 43 ++ + include/linux/input/tca8418_keypad.h | 44 ++ + 122 files changed, 3636 insertions(+), 1371 deletions(-) + create mode 100644 Documentation/input/alps.txt + create mode 100644 Documentation/input/gpio-tilt.txt + create mode 100644 drivers/input/keyboard/tca8418_keypad.c + create mode 100644 drivers/input/misc/gp2ap002a00f.c + create mode 100644 drivers/input/misc/gpio_tilt_polled.c + create mode 100644 drivers/input/touchscreen/egalax_ts.c + create mode 100644 include/linux/input/gp2ap002a00f.h + create mode 100644 include/linux/input/gpio_tilt.h + create mode 100644 include/linux/input/samsung-keypad.h + create mode 100644 include/linux/input/tca8418_keypad.h +Merging input-mt/next (02f8c6a Linux 3.0) +$ git merge input-mt/next +Already up-to-date. +Merging lsm/for-next (ca05a99 capabilities: remain source compatible with 32-bit raw legacy capability support.) +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next (629baa7 Merge branch 'for-linus' into for-next) +$ git merge block/for-next +Merge made by the 'recursive' strategy. + block/blk-core.c | 14 +- + block/cfq-iosched.c | 16 +- + drivers/block/Kconfig | 2 + + drivers/block/Makefile | 1 + + drivers/block/cciss.c | 6 +- + drivers/block/loop.c | 4 +- + drivers/block/mtip32xx/Kconfig | 9 + + drivers/block/mtip32xx/Makefile | 5 + + drivers/block/mtip32xx/mtip32xx.c | 3627 +++++++++++++++++++++++++++++++++++++ + drivers/block/mtip32xx/mtip32xx.h | 422 +++++ + include/linux/blkdev.h | 3 - + 11 files changed, 4089 insertions(+), 20 deletions(-) + create mode 100644 drivers/block/mtip32xx/Kconfig + create mode 100644 drivers/block/mtip32xx/Makefile + create mode 100644 drivers/block/mtip32xx/mtip32xx.c + create mode 100644 drivers/block/mtip32xx/mtip32xx.h +Merging quilt/device-mapper (94956ee Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge quilt/device-mapper +Already up-to-date. +Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence) +$ git merge embedded/master +Already up-to-date. +Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3) +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master (74411c0 smc91c92_cs.c: fix bogus compiler warning) +$ git merge pcmcia/master +Already up-to-date. +Merging battery/master (00a159a max8925_power: Check at probe time if power to set online) +$ git merge battery/master +Auto-merging drivers/power/power_supply_sysfs.c +Auto-merging drivers/power/max8998_charger.c +Auto-merging drivers/power/max8997_charger.c +Auto-merging drivers/power/max8903_charger.c +Auto-merging drivers/power/max17042_battery.c +Auto-merging drivers/power/ds2780_battery.c +Merge made by the 'recursive' strategy. + .../bindings/power_supply/olpc_battery.txt | 5 + + .../bindings/power_supply/ti_bq20z75.txt | 23 +++ + drivers/mfd/max8925-core.c | 15 -- + drivers/power/bq20z75.c | 77 +++++++ + drivers/power/bq27x00_battery.c | 210 +++++++++++++------- + drivers/power/collie_battery.c | 53 ++---- + drivers/power/ds2760_battery.c | 6 +- + drivers/power/ds2780_battery.c | 2 +- + drivers/power/max17042_battery.c | 94 ++++++--- + drivers/power/max8903_charger.c | 2 +- + drivers/power/max8925_power.c | 63 ++++--- + drivers/power/max8997_charger.c | 3 +- + drivers/power/max8998_charger.c | 2 + + drivers/power/olpc_battery.c | 81 +++++--- + drivers/power/pda_power.c | 74 ++++++- + drivers/power/power_supply_sysfs.c | 4 +- + drivers/power/tosa_battery.c | 66 ++----- + drivers/power/wm831x_power.c | 44 +++-- + drivers/power/wm97xx_battery.c | 2 +- + drivers/power/z2_battery.c | 4 +- + include/linux/mfd/max8925.h | 7 +- + include/linux/pda_power.h | 2 + + 22 files changed, 542 insertions(+), 297 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power_supply/olpc_battery.txt + create mode 100644 Documentation/devicetree/bindings/power_supply/ti_bq20z75.txt +Merging mmc/mmc-next (ed94591 mmc: core: Fixup delayed work clock gating patch) +$ git merge mmc/mmc-next +Auto-merging drivers/mmc/host/sh_mmcif.c +Auto-merging drivers/mmc/host/sdhci-s3c.c +Auto-merging drivers/mmc/host/mxs-mmc.c +Auto-merging drivers/mmc/host/mxcmmc.c +Auto-merging drivers/mmc/host/mmci.c +Auto-merging drivers/mmc/host/at91_mci.c +Auto-merging arch/arm/plat-samsung/include/plat/sdhci.h +Merge made by the 'recursive' strategy. + Documentation/mmc/mmc-dev-attrs.txt | 10 + + Documentation/mmc/mmc-dev-parts.txt | 13 + + arch/arm/plat-samsung/include/plat/sdhci.h | 1 + + arch/arm/plat-samsung/platformdata.c | 2 + + drivers/mmc/card/block.c | 236 +++++++++++++++----- + drivers/mmc/card/mmc_test.c | 1 + + drivers/mmc/core/bus.c | 2 +- + drivers/mmc/core/core.c | 149 +++++++++--- + drivers/mmc/core/core.h | 3 + + drivers/mmc/core/debugfs.c | 2 + + drivers/mmc/core/host.c | 53 ++++- + drivers/mmc/core/mmc.c | 38 +++- + drivers/mmc/core/sd.c | 18 ++- + drivers/mmc/core/sdio.c | 340 +++++++++++++++++++++++++-- + drivers/mmc/core/sdio_io.c | 8 +- + drivers/mmc/core/sdio_ops.c | 14 +- + drivers/mmc/host/at91_mci.c | 8 +- + drivers/mmc/host/bfin_sdh.c | 12 +- + drivers/mmc/host/cb710-mmc.c | 13 +- + drivers/mmc/host/jz4740_mmc.c | 12 +- + drivers/mmc/host/mmc_spi.c | 1 - + drivers/mmc/host/mmci.c | 1 + + drivers/mmc/host/msm_sdcc.c | 19 +-- + drivers/mmc/host/mxcmmc.c | 14 +- + drivers/mmc/host/mxs-mmc.c | 13 +- + drivers/mmc/host/omap_hsmmc.c | 7 +- + drivers/mmc/host/pxamci.c | 13 +- + drivers/mmc/host/s3cmci.c | 13 +- + drivers/mmc/host/sdhci-cns3xxx.c | 18 +-- + drivers/mmc/host/sdhci-dove.c | 17 +-- + drivers/mmc/host/sdhci-esdhc-imx.c | 17 +-- + drivers/mmc/host/sdhci-esdhc.h | 2 +- + drivers/mmc/host/sdhci-of-esdhc.c | 17 +-- + drivers/mmc/host/sdhci-of-hlwd.c | 17 +-- + drivers/mmc/host/sdhci-pci.c | 64 +++--- + drivers/mmc/host/sdhci-pltfm.c | 18 +- + drivers/mmc/host/sdhci-pltfm.h | 6 +- + drivers/mmc/host/sdhci-pxav2.c | 17 +-- + drivers/mmc/host/sdhci-pxav3.c | 17 +-- + drivers/mmc/host/sdhci-s3c.c | 39 ++-- + drivers/mmc/host/sdhci-spear.c | 52 ++++- + drivers/mmc/host/sdhci-tegra.c | 17 +-- + drivers/mmc/host/sdhci.c | 16 +- + drivers/mmc/host/sdhci.h | 2 +- + drivers/mmc/host/sh_mmcif.c | 19 +-- + drivers/mmc/host/sh_mobile_sdhi.c | 13 +- + drivers/mmc/host/tifm_sd.c | 16 +- + drivers/mmc/host/tmio_mmc.c | 14 +- + drivers/mmc/host/tmio_mmc.h | 4 +- + drivers/mmc/host/tmio_mmc_pio.c | 2 +- + include/linux/amba/mmci.h | 2 + + include/linux/mmc/card.h | 26 ++- + include/linux/mmc/core.h | 2 + + include/linux/mmc/host.h | 7 +- + include/linux/mmc/mmc.h | 6 + + include/linux/mmc/sdio.h | 29 +++- + 56 files changed, 990 insertions(+), 502 deletions(-) +Merging kgdb/kgdb-next (880ba69 lib: rename pack_hex_byte() to hex_byte_pack()) +$ git merge kgdb/kgdb-next +Merge made by the 'recursive' strategy. +Merging slab/for-next (7436099 Merge branch 'slab/next' into for-next) +$ git merge slab/for-next +Auto-merging mm/slab.c +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 6 +++++ + Documentation/vm/slub.txt | 2 +- + mm/slab.c | 39 ++++++++++++++++++++++++---------- + mm/slub.c | 9 +++++-- + 4 files changed, 40 insertions(+), 16 deletions(-) +Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**") +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next (5ce1a37 md/raid1: Mark device replaceable when we see a write error.) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + Documentation/md.txt | 22 ++- + drivers/md/bitmap.c | 2 +- + drivers/md/md.c | 100 ++++++-- + drivers/md/md.h | 82 ++++--- + drivers/md/multipath.c | 7 +- + drivers/md/raid1.c | 171 ++++++++++---- + drivers/md/raid1.h | 7 +- + drivers/md/raid10.c | 580 ++++++++++++++++++++++++++++++++++++--------- + drivers/md/raid10.h | 61 +++-- + drivers/md/raid5.c | 493 ++++++++++++++++++++++++++++++-------- + drivers/md/raid5.h | 98 +++++---- + include/linux/raid/md_p.h | 7 +- + 12 files changed, 1230 insertions(+), 400 deletions(-) +Merging mfd/for-next (0b34804 mfd: Add device tree probe support for mc13xxx) +$ git merge mfd/for-next +Auto-merging include/linux/mfd/wm8994/pdata.h +Auto-merging arch/arm/mach-sa1100/simpad.c +Auto-merging arch/arm/mach-sa1100/shannon.c +Auto-merging arch/arm/mach-sa1100/lart.c +Auto-merging arch/arm/mach-sa1100/generic.c +Auto-merging arch/arm/mach-sa1100/collie.c +Auto-merging arch/arm/mach-sa1100/cerf.c +Auto-merging arch/arm/mach-sa1100/assabet.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/mc13xxx.txt | 53 ++ + Documentation/devicetree/bindings/sound/wm8994.txt | 18 + + arch/arm/mach-sa1100/assabet.c | 12 + + arch/arm/mach-sa1100/cerf.c | 11 + + arch/arm/mach-sa1100/collie.c | 18 +- + arch/arm/mach-sa1100/generic.c | 7 +- + arch/arm/mach-sa1100/include/mach/mcp.h | 2 + + arch/arm/mach-sa1100/lart.c | 10 + + arch/arm/mach-sa1100/shannon.c | 11 + + arch/arm/mach-sa1100/simpad.c | 18 +- + drivers/mfd/88pm860x-i2c.c | 240 ++++---- + drivers/mfd/Kconfig | 1 + + drivers/mfd/intel_msic.c | 12 +- + drivers/mfd/jz4740-adc.c | 12 +- + drivers/mfd/mc13xxx-core.c | 111 +++- + drivers/mfd/mcp-core.c | 44 ++- + drivers/mfd/mcp-sa11x0.c | 182 ++++-- + drivers/mfd/pcf50633-adc.c | 12 +- + drivers/mfd/stmpe.c | 36 +- + drivers/mfd/t7l66xb.c | 16 +- + drivers/mfd/tc6387xb.c | 14 +- + drivers/mfd/ti-ssp.c | 12 +- + drivers/mfd/tps65910.c | 2 +- + drivers/mfd/tps65912-spi.c | 1 - + drivers/mfd/twl4030-audio.c | 12 +- + drivers/mfd/twl4030-irq.c | 21 +- + drivers/mfd/twl4030-madc.c | 14 +- + drivers/mfd/twl6040-core.c | 13 +- + drivers/mfd/ucb1x00-core.c | 48 ++- + drivers/mfd/ucb1x00-ts.c | 2 +- + drivers/mfd/wm831x-core.c | 2 - + drivers/mfd/wm831x-i2c.c | 3 +- + drivers/mfd/wm831x-spi.c | 4 +- + drivers/mfd/wm8350-core.c | 2 + + drivers/mfd/wm8350-i2c.c | 4 +- + drivers/mfd/wm8994-core.c | 36 +- + drivers/misc/Kconfig | 8 + + drivers/misc/Makefile | 1 + + drivers/misc/max8997-muic.c | 634 ++++++++++++++++++++ + include/linux/mfd/88pm860x.h | 3 +- + include/linux/mfd/max8997.h | 58 ++- + include/linux/mfd/mc13xxx.h | 8 + + include/linux/mfd/mcp.h | 7 +- + include/linux/mfd/stmpe.h | 7 + + include/linux/mfd/ucb1x00.h | 5 +- + include/linux/mfd/wm8994/pdata.h | 6 + + include/linux/mod_devicetable.h | 11 + + scripts/mod/file2alias.c | 13 + + 48 files changed, 1399 insertions(+), 378 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/mc13xxx.txt + create mode 100644 Documentation/devicetree/bindings/sound/wm8994.txt + create mode 100644 drivers/misc/max8997-muic.c +Merging hdlc/hdlc-next (4a6908a Linux 2.6.28) +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next (32faa34 drm/Merge branch 'drm-ttm-glisse' of ../drm-radeon-next into drm-core-next) +$ git merge drm/drm-next +Resolved 'drivers/gpu/drm/nouveau/nouveau_sgdma.c' using previous resolution. +Auto-merging include/drm/drm_mode.h +Auto-merging include/drm/drmP.h +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +Auto-merging drivers/gpu/drm/radeon/radeon_drv.c +Auto-merging drivers/gpu/drm/radeon/radeon_device.c +Auto-merging drivers/gpu/drm/radeon/radeon.h +Auto-merging drivers/gpu/drm/nouveau/nouveau_sgdma.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/nouveau/nouveau_sgdma.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_fbcon.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_drv.h +Auto-merging drivers/gpu/drm/nouveau/nouveau_drv.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_display.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_bo.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/drm_drv.c +Auto-merging drivers/gpu/drm/drm_crtc_helper.c +Auto-merging drivers/gpu/drm/drm_crtc.c +Auto-merging drivers/gpu/drm/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master bcb51bb] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/Kconfig | 3 + + drivers/gpu/drm/Makefile | 1 + + drivers/gpu/drm/drm_crtc.c | 441 ++++++++- + drivers/gpu/drm/drm_crtc_helper.c | 10 +- + drivers/gpu/drm/drm_drv.c | 4 + + drivers/gpu/drm/drm_fb_helper.c | 7 + + drivers/gpu/drm/drm_fops.c | 2 +- + drivers/gpu/drm/gma500/Kconfig | 26 + + drivers/gpu/drm/gma500/Makefile | 39 + + drivers/gpu/drm/gma500/accel_2d.c | 364 +++++++ + drivers/gpu/drm/gma500/backlight.c | 49 + + drivers/gpu/drm/gma500/cdv_device.c | 350 ++++++ + drivers/gpu/drm/gma500/cdv_device.h | 36 + + drivers/gpu/drm/gma500/cdv_intel_crt.c | 326 ++++++ + drivers/gpu/drm/gma500/cdv_intel_display.c | 1508 ++++++++++++++++++++++++++ + drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 376 +++++++ + drivers/gpu/drm/gma500/cdv_intel_lvds.c | 721 ++++++++++++ + drivers/gpu/drm/gma500/framebuffer.c | 831 ++++++++++++++ + drivers/gpu/drm/gma500/framebuffer.h | 47 + + drivers/gpu/drm/gma500/gem.c | 292 +++++ + drivers/gpu/drm/gma500/gem_glue.c | 89 ++ + drivers/gpu/drm/gma500/gem_glue.h | 2 + + drivers/gpu/drm/gma500/gtt.c | 553 ++++++++++ + drivers/gpu/drm/gma500/gtt.h | 64 ++ + drivers/gpu/drm/gma500/intel_bios.c | 303 ++++++ + drivers/gpu/drm/gma500/intel_bios.h | 430 ++++++++ + drivers/gpu/drm/gma500/intel_i2c.c | 169 +++ + drivers/gpu/drm/gma500/intel_opregion.c | 81 ++ + drivers/gpu/drm/gma500/mid_bios.c | 249 +++++ + drivers/gpu/drm/gma500/mid_bios.h | 21 + + drivers/gpu/drm/gma500/mmu.c | 858 +++++++++++++++ + drivers/gpu/drm/gma500/oaktrail.h | 252 +++++ + drivers/gpu/drm/gma500/oaktrail_crtc.c | 604 +++++++++++ + drivers/gpu/drm/gma500/oaktrail_device.c | 512 +++++++++ + drivers/gpu/drm/gma500/oaktrail_hdmi.c | 852 +++++++++++++++ + drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c | 328 ++++++ + drivers/gpu/drm/gma500/oaktrail_lvds.c | 423 ++++++++ + drivers/gpu/drm/gma500/power.c | 316 ++++++ + drivers/gpu/drm/gma500/power.h | 67 ++ + drivers/gpu/drm/gma500/psb_device.c | 321 ++++++ + drivers/gpu/drm/gma500/psb_drv.c | 708 ++++++++++++ + drivers/gpu/drm/gma500/psb_drv.h | 928 ++++++++++++++++ + drivers/gpu/drm/gma500/psb_intel_display.c | 1431 ++++++++++++++++++++++++ + drivers/gpu/drm/gma500/psb_intel_display.h | 28 + + drivers/gpu/drm/gma500/psb_intel_drv.h | 228 ++++ + drivers/gpu/drm/gma500/psb_intel_lvds.c | 854 +++++++++++++++ + drivers/gpu/drm/gma500/psb_intel_modes.c | 77 ++ + drivers/gpu/drm/gma500/psb_intel_reg.h | 1235 +++++++++++++++++++++ + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 1293 ++++++++++++++++++++++ + drivers/gpu/drm/gma500/psb_intel_sdvo_regs.h | 338 ++++++ + drivers/gpu/drm/gma500/psb_irq.c | 564 ++++++++++ + drivers/gpu/drm/gma500/psb_irq.h | 45 + + drivers/gpu/drm/gma500/psb_lid.c | 88 ++ + drivers/gpu/drm/gma500/psb_reg.h | 582 ++++++++++ + drivers/gpu/drm/i810/i810_drv.c | 23 +- + drivers/gpu/drm/i915/i915_drv.c | 31 +- + drivers/gpu/drm/i915/intel_display.c | 41 +- + drivers/gpu/drm/i915/intel_drv.h | 2 +- + drivers/gpu/drm/i915/intel_fb.c | 11 +- + drivers/gpu/drm/mga/mga_drv.c | 29 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 98 ++- + drivers/gpu/drm/nouveau/nouveau_debugfs.c | 1 + + drivers/gpu/drm/nouveau/nouveau_display.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_drv.c | 31 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 5 +- + drivers/gpu/drm/nouveau/nouveau_fb.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 13 +- + drivers/gpu/drm/nouveau/nouveau_mem.c | 6 + + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 179 +--- + drivers/gpu/drm/r128/r128_drv.c | 30 +- + drivers/gpu/drm/radeon/radeon.h | 1 - + drivers/gpu/drm/radeon/radeon_device.c | 6 + + drivers/gpu/drm/radeon/radeon_display.c | 8 +- + drivers/gpu/drm/radeon/radeon_drv.c | 60 +- + drivers/gpu/drm/radeon/radeon_fb.c | 20 +- + drivers/gpu/drm/radeon/radeon_gart.c | 29 +- + drivers/gpu/drm/radeon/radeon_mode.h | 2 +- + drivers/gpu/drm/radeon/radeon_object.c | 8 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 302 +++--- + drivers/gpu/drm/savage/savage_drv.c | 23 +- + drivers/gpu/drm/sis/sis_drv.c | 23 +- + drivers/gpu/drm/tdfx/tdfx_drv.c | 23 +- + drivers/gpu/drm/ttm/Makefile | 4 + + drivers/gpu/drm/ttm/ttm_agp_backend.c | 88 +- + drivers/gpu/drm/ttm/ttm_bo.c | 90 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 32 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 9 +- + drivers/gpu/drm/ttm/ttm_memory.c | 2 + + drivers/gpu/drm/ttm/ttm_page_alloc.c | 184 +++- + drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 1137 +++++++++++++++++++ + drivers/gpu/drm/ttm/ttm_tt.c | 322 +----- + drivers/gpu/drm/via/via_drv.c | 23 +- + drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 71 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 30 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 22 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 35 +- + drivers/staging/gma500/framebuffer.c | 39 +- + drivers/staging/gma500/psb_drv.c | 23 +- + drivers/xen/swiotlb-xen.c | 2 +- + include/drm/drm.h | 4 + + include/drm/drmP.h | 2 +- + include/drm/drm_crtc.h | 208 ++++- + include/drm/drm_crtc_helper.h | 2 +- + include/drm/drm_fourcc.h | 130 +++ + include/drm/drm_mode.h | 74 ++- + include/drm/gma_drm.h | 91 ++ + include/drm/ttm/ttm_bo_api.h | 24 +- + include/drm/ttm/ttm_bo_driver.h | 201 ++-- + include/drm/ttm/ttm_page_alloc.h | 77 +- + include/linux/swiotlb.h | 2 +- + lib/swiotlb.c | 5 +- + 112 files changed, 23030 insertions(+), 1243 deletions(-) + create mode 100644 drivers/gpu/drm/gma500/Kconfig + create mode 100644 drivers/gpu/drm/gma500/Makefile + create mode 100644 drivers/gpu/drm/gma500/accel_2d.c + create mode 100644 drivers/gpu/drm/gma500/backlight.c + create mode 100644 drivers/gpu/drm/gma500/cdv_device.c + create mode 100644 drivers/gpu/drm/gma500/cdv_device.h + create mode 100644 drivers/gpu/drm/gma500/cdv_intel_crt.c + create mode 100644 drivers/gpu/drm/gma500/cdv_intel_display.c + create mode 100644 drivers/gpu/drm/gma500/cdv_intel_hdmi.c + create mode 100644 drivers/gpu/drm/gma500/cdv_intel_lvds.c + create mode 100644 drivers/gpu/drm/gma500/framebuffer.c + create mode 100644 drivers/gpu/drm/gma500/framebuffer.h + create mode 100644 drivers/gpu/drm/gma500/gem.c + create mode 100644 drivers/gpu/drm/gma500/gem_glue.c + create mode 100644 drivers/gpu/drm/gma500/gem_glue.h + create mode 100644 drivers/gpu/drm/gma500/gtt.c + create mode 100644 drivers/gpu/drm/gma500/gtt.h + create mode 100644 drivers/gpu/drm/gma500/intel_bios.c + create mode 100644 drivers/gpu/drm/gma500/intel_bios.h + create mode 100644 drivers/gpu/drm/gma500/intel_i2c.c + create mode 100644 drivers/gpu/drm/gma500/intel_opregion.c + create mode 100644 drivers/gpu/drm/gma500/mid_bios.c + create mode 100644 drivers/gpu/drm/gma500/mid_bios.h + create mode 100644 drivers/gpu/drm/gma500/mmu.c + create mode 100644 drivers/gpu/drm/gma500/oaktrail.h + create mode 100644 drivers/gpu/drm/gma500/oaktrail_crtc.c + create mode 100644 drivers/gpu/drm/gma500/oaktrail_device.c + create mode 100644 drivers/gpu/drm/gma500/oaktrail_hdmi.c + create mode 100644 drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c + create mode 100644 drivers/gpu/drm/gma500/oaktrail_lvds.c + create mode 100644 drivers/gpu/drm/gma500/power.c + create mode 100644 drivers/gpu/drm/gma500/power.h + create mode 100644 drivers/gpu/drm/gma500/psb_device.c + create mode 100644 drivers/gpu/drm/gma500/psb_drv.c + create mode 100644 drivers/gpu/drm/gma500/psb_drv.h + create mode 100644 drivers/gpu/drm/gma500/psb_intel_display.c + create mode 100644 drivers/gpu/drm/gma500/psb_intel_display.h + create mode 100644 drivers/gpu/drm/gma500/psb_intel_drv.h + create mode 100644 drivers/gpu/drm/gma500/psb_intel_lvds.c + create mode 100644 drivers/gpu/drm/gma500/psb_intel_modes.c + create mode 100644 drivers/gpu/drm/gma500/psb_intel_reg.h + create mode 100644 drivers/gpu/drm/gma500/psb_intel_sdvo.c + create mode 100644 drivers/gpu/drm/gma500/psb_intel_sdvo_regs.h + create mode 100644 drivers/gpu/drm/gma500/psb_irq.c + create mode 100644 drivers/gpu/drm/gma500/psb_irq.h + create mode 100644 drivers/gpu/drm/gma500/psb_lid.c + create mode 100644 drivers/gpu/drm/gma500/psb_reg.h + create mode 100644 drivers/gpu/drm/ttm/ttm_page_alloc_dma.c + create mode 100644 include/drm/drm_fourcc.h + create mode 100644 include/drm/gma_drm.h +Merging fbdev/fbdev-next (f940b88 video: s3c2410: fix checkpatch error and warnings) +$ git merge fbdev/fbdev-next +Removing include/linux/display.h +Removing drivers/video/display/display-sysfs.c +Removing drivers/video/display/Makefile +Removing drivers/video/display/Kconfig +Auto-merging drivers/video/Kconfig +Auto-merging arch/arm/mach-shmobile/board-ap4evb.c +Auto-merging arch/arm/mach-shmobile/board-ag5evm.c +Auto-merging arch/arm/mach-at91/board-sam9rlek.c +Auto-merging arch/arm/mach-at91/board-sam9m10g45ek.c +Auto-merging arch/arm/mach-at91/board-sam9263ek.c +Auto-merging arch/arm/mach-at91/board-sam9261ek.c +Auto-merging arch/arm/mach-at91/board-neocore926.c +Auto-merging arch/arm/mach-at91/board-cap9adk.c +Merge made by the 'recursive' strategy. + arch/arm/mach-at91/board-cap9adk.c | 2 +- + arch/arm/mach-at91/board-neocore926.c | 2 +- + arch/arm/mach-at91/board-sam9261ek.c | 4 +- + arch/arm/mach-at91/board-sam9263ek.c | 2 +- + arch/arm/mach-at91/board-sam9m10g45ek.c | 2 +- + arch/arm/mach-at91/board-sam9rlek.c | 2 +- + arch/arm/mach-shmobile/board-ag5evm.c | 41 +- + arch/arm/mach-shmobile/board-ap4evb.c | 28 + + arch/arm/mach-shmobile/clock-sh7372.c | 4 +- + arch/arm/mach-shmobile/clock-sh73a0.c | 4 +- + drivers/video/Kconfig | 1 - + drivers/video/Makefile | 2 +- + drivers/video/amifb.c | 5012 ++++++++++---------- + drivers/video/atmel_lcdfb.c | 41 +- + drivers/video/cirrusfb.c | 268 +- + drivers/video/controlfb.c | 2 +- + drivers/video/display/Kconfig | 24 - + drivers/video/display/Makefile | 6 - + drivers/video/display/display-sysfs.c | 219 - + drivers/video/mxsfb.c | 13 +- + drivers/video/nuc900fb.c | 13 +- + drivers/video/omap/lcd_mipid.c | 1 - + drivers/video/omap2/displays/panel-acx565akm.c | 1 - + drivers/video/omap2/displays/panel-n8x0.c | 1 - + .../omap2/displays/panel-nec-nl8048hl11-01b.c | 1 - + .../video/omap2/displays/panel-tpo-td043mtea1.c | 1 - + drivers/video/pxa168fb.c | 12 +- + drivers/video/pxa3xx-gcu.c | 15 +- + drivers/video/s3c-fb.c | 91 +- + drivers/video/s3c2410fb.c | 29 +- + drivers/video/sbuslib.c | 2 +- + drivers/video/sh7760fb.c | 13 +- + drivers/video/sh_mipi_dsi.c | 218 +- + drivers/video/sh_mobile_lcdcfb.c | 15 +- + drivers/video/sh_mobile_meram.c | 13 +- + drivers/video/sm501fb.c | 13 +- + drivers/video/vt8500lcdfb.c | 13 +- + drivers/video/w100fb.c | 13 +- + drivers/video/wm8505fb.c | 13 +- + drivers/video/wmt_ge_rops.c | 13 +- + drivers/video/xilinxfb.c | 20 +- + include/linux/display.h | 61 - + include/linux/zorro_ids.h | 4 +- + include/video/sh_mipi_dsi.h | 21 +- + 44 files changed, 2935 insertions(+), 3341 deletions(-) + delete mode 100644 drivers/video/display/Kconfig + delete mode 100644 drivers/video/display/Makefile + delete mode 100644 drivers/video/display/display-sysfs.c + delete mode 100644 include/linux/display.h +Merging viafb/viafb-next (4ce36bb viafb: replace strict_strtoul to kstrto* and check return value) +$ git merge viafb/viafb-next +Already up-to-date. +Merging omap_dss2/for-next (3e28189 OMAPDSS: picodlp: add missing #include ) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (2f288ef Merge branch 'topic/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-next) +$ git merge regulator/for-next +Auto-merging sound/soc/codecs/sgtl5000.c +Merge made by the 'recursive' strategy. + .../bindings/regulator/fixed-regulator.txt | 29 ++++ + .../devicetree/bindings/regulator/regulator.txt | 54 +++++++ + Documentation/power/regulator/regulator.txt | 2 +- + drivers/regulator/88pm8607.c | 2 +- + drivers/regulator/Kconfig | 1 + + drivers/regulator/Makefile | 1 + + drivers/regulator/aat2870-regulator.c | 4 +- + drivers/regulator/ab3100.c | 2 +- + drivers/regulator/ab8500.c | 2 +- + drivers/regulator/ad5398.c | 2 +- + drivers/regulator/bq24022.c | 2 +- + drivers/regulator/core.c | 126 ++++++++++++---- + drivers/regulator/da903x.c | 2 +- + drivers/regulator/db8500-prcmu.c | 2 +- + drivers/regulator/dummy.c | 2 +- + drivers/regulator/fixed.c | 83 ++++++++++- + drivers/regulator/gpio-regulator.c | 2 +- + drivers/regulator/isl6271a-regulator.c | 2 +- + drivers/regulator/lp3971.c | 2 +- + drivers/regulator/lp3972.c | 2 +- + drivers/regulator/max1586.c | 2 +- + drivers/regulator/max8649.c | 157 +++++++------------- + drivers/regulator/max8660.c | 2 +- + drivers/regulator/max8925-regulator.c | 2 +- + drivers/regulator/max8952.c | 2 +- + drivers/regulator/max8997.c | 2 +- + drivers/regulator/max8998.c | 2 +- + drivers/regulator/mc13783-regulator.c | 2 +- + drivers/regulator/mc13892-regulator.c | 2 +- + drivers/regulator/of_regulator.c | 87 +++++++++++ + drivers/regulator/pcap-regulator.c | 2 +- + drivers/regulator/pcf50633-regulator.c | 2 +- + drivers/regulator/tps6105x-regulator.c | 3 +- + drivers/regulator/tps65023-regulator.c | 89 ++++------- + drivers/regulator/tps6507x-regulator.c | 2 +- + drivers/regulator/tps6524x-regulator.c | 2 +- + drivers/regulator/tps6586x-regulator.c | 2 +- + drivers/regulator/tps65910-regulator.c | 39 ++---- + drivers/regulator/tps65912-regulator.c | 2 +- + drivers/regulator/twl-regulator.c | 2 +- + drivers/regulator/userspace-consumer.c | 13 +-- + drivers/regulator/virtual.c | 12 +-- + drivers/regulator/wm831x-dcdc.c | 8 +- + drivers/regulator/wm831x-isink.c | 2 +- + drivers/regulator/wm831x-ldo.c | 6 +- + drivers/regulator/wm8350-regulator.c | 2 +- + drivers/regulator/wm8400-regulator.c | 2 +- + drivers/regulator/wm8994-regulator.c | 2 +- + include/linux/mfd/tps65910.h | 30 ++++- + include/linux/regulator/driver.h | 4 +- + include/linux/regulator/of_regulator.h | 22 +++ + sound/soc/codecs/sgtl5000.c | 2 +- + 52 files changed, 547 insertions(+), 287 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/fixed-regulator.txt + create mode 100644 Documentation/devicetree/bindings/regulator/regulator.txt + create mode 100644 drivers/regulator/of_regulator.c + create mode 100644 include/linux/regulator/of_regulator.h +Merging security/next (735e93c Security: tomoyo: add .gitignore file) +$ git merge security/next +Resolved 'lib/Makefile' using previous resolution. +Auto-merging lib/Makefile +CONFLICT (content): Merge conflict in lib/Makefile +Auto-merging lib/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2230164] Merge remote-tracking branch 'security/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/digsig.txt | 96 ++ + Documentation/security/00-INDEX | 2 + + Documentation/security/LSM.txt | 34 + + Documentation/security/credentials.txt | 6 +- + drivers/char/tpm/Kconfig | 2 + + drivers/char/tpm/tpm.c | 137 +++- + drivers/char/tpm/tpm.h | 9 +- + drivers/char/tpm/tpm_tis.c | 84 +-- + include/linux/digsig.h | 64 ++ + include/linux/key-type.h | 1 + + include/linux/mpi.h | 146 ++++ + include/linux/security.h | 2 +- + lib/Kconfig | 25 + + lib/Makefile | 3 + + lib/digsig.c | 284 ++++++ + lib/mpi/Makefile | 32 + + lib/mpi/generic_mpi-asm-defs.h | 4 + + lib/mpi/generic_mpih-add1.c | 61 ++ + lib/mpi/generic_mpih-lshift.c | 63 ++ + lib/mpi/generic_mpih-mul1.c | 57 ++ + lib/mpi/generic_mpih-mul2.c | 60 ++ + lib/mpi/generic_mpih-mul3.c | 61 ++ + lib/mpi/generic_mpih-rshift.c | 63 ++ + lib/mpi/generic_mpih-sub1.c | 60 ++ + lib/mpi/longlong.h | 1478 ++++++++++++++++++++++++++++++++ + lib/mpi/mpi-add.c | 234 +++++ + lib/mpi/mpi-bit.c | 236 +++++ + lib/mpi/mpi-cmp.c | 68 ++ + lib/mpi/mpi-div.c | 333 +++++++ + lib/mpi/mpi-gcd.c | 59 ++ + lib/mpi/mpi-inline.c | 31 + + lib/mpi/mpi-inline.h | 122 +++ + lib/mpi/mpi-internal.h | 261 ++++++ + lib/mpi/mpi-inv.c | 187 ++++ + lib/mpi/mpi-mpow.c | 134 +++ + lib/mpi/mpi-mul.c | 194 +++++ + lib/mpi/mpi-pow.c | 323 +++++++ + lib/mpi/mpi-scan.c | 136 +++ + lib/mpi/mpicoder.c | 365 ++++++++ + lib/mpi/mpih-cmp.c | 56 ++ + lib/mpi/mpih-div.c | 541 ++++++++++++ + lib/mpi/mpih-mul.c | 527 ++++++++++++ + lib/mpi/mpiutil.c | 208 +++++ + security/apparmor/audit.c | 2 +- + security/integrity/Kconfig | 14 + + security/integrity/Makefile | 1 + + security/integrity/digsig.c | 48 + + security/integrity/evm/evm.h | 12 + + security/integrity/evm/evm_crypto.c | 81 ++- + security/integrity/evm/evm_main.c | 94 ++- + security/integrity/integrity.h | 21 + + security/keys/key.c | 3 + + security/selinux/selinuxfs.c | 14 +- + security/tomoyo/.gitignore | 2 + + security/tomoyo/common.h | 2 +- + 55 files changed, 7014 insertions(+), 129 deletions(-) + create mode 100644 Documentation/digsig.txt + create mode 100644 Documentation/security/LSM.txt + create mode 100644 include/linux/digsig.h + create mode 100644 include/linux/mpi.h + create mode 100644 lib/digsig.c + create mode 100644 lib/mpi/Makefile + create mode 100644 lib/mpi/generic_mpi-asm-defs.h + create mode 100644 lib/mpi/generic_mpih-add1.c + create mode 100644 lib/mpi/generic_mpih-lshift.c + create mode 100644 lib/mpi/generic_mpih-mul1.c + create mode 100644 lib/mpi/generic_mpih-mul2.c + create mode 100644 lib/mpi/generic_mpih-mul3.c + create mode 100644 lib/mpi/generic_mpih-rshift.c + create mode 100644 lib/mpi/generic_mpih-sub1.c + create mode 100644 lib/mpi/longlong.h + create mode 100644 lib/mpi/mpi-add.c + create mode 100644 lib/mpi/mpi-bit.c + create mode 100644 lib/mpi/mpi-cmp.c + create mode 100644 lib/mpi/mpi-div.c + create mode 100644 lib/mpi/mpi-gcd.c + create mode 100644 lib/mpi/mpi-inline.c + create mode 100644 lib/mpi/mpi-inline.h + create mode 100644 lib/mpi/mpi-internal.h + create mode 100644 lib/mpi/mpi-inv.c + create mode 100644 lib/mpi/mpi-mpow.c + create mode 100644 lib/mpi/mpi-mul.c + create mode 100644 lib/mpi/mpi-pow.c + create mode 100644 lib/mpi/mpi-scan.c + create mode 100644 lib/mpi/mpicoder.c + create mode 100644 lib/mpi/mpih-cmp.c + create mode 100644 lib/mpi/mpih-div.c + create mode 100644 lib/mpi/mpih-mul.c + create mode 100644 lib/mpi/mpiutil.c + create mode 100644 security/integrity/digsig.c + create mode 100644 security/tomoyo/.gitignore +Merging selinux/master (ded5098 SELinux: skip file_name_trans_write() when policy downgraded.) +$ git merge selinux/master +Already up-to-date. +Merging lblnet/master (7e27d6e Linux 2.6.35-rc3) +$ git merge lblnet/master +Already up-to-date. +Merging watchdog/linux-next (80fee40 watchdog: move coh901327 state holders) +$ git merge watchdog/linux-next +Merge made by the 'recursive' strategy. + Documentation/watchdog/watchdog-kernel-api.txt | 10 +++++++++- + drivers/watchdog/ar7_wdt.c | 17 ++--------------- + drivers/watchdog/bcm63xx_wdt.c | 13 +------------ + drivers/watchdog/coh901327_wdt.c | 6 ++++-- + drivers/watchdog/cpu5wdt.c | 3 +-- + drivers/watchdog/cpwd.c | 13 +------------ + drivers/watchdog/davinci_wdt.c | 13 +------------ + drivers/watchdog/dw_wdt.c | 12 +----------- + drivers/watchdog/eurotechwdt.c | 4 +--- + drivers/watchdog/ibmasr.c | 4 +--- + drivers/watchdog/indydog.c | 4 +--- + drivers/watchdog/iop_wdt.c | 5 +---- + drivers/watchdog/ixp2000_wdt.c | 3 +-- + drivers/watchdog/ixp4xx_wdt.c | 1 - + drivers/watchdog/jz4740_wdt.c | 13 +------------ + drivers/watchdog/ks8695_wdt.c | 3 +-- + drivers/watchdog/max63xx_wdt.c | 13 +------------ + drivers/watchdog/mtx-1_wdt.c | 13 +------------ + drivers/watchdog/nuc900_wdt.c | 13 +------------ + drivers/watchdog/of_xilinx_wdt.c | 13 +------------ + drivers/watchdog/omap_wdt.c | 16 ++-------------- + drivers/watchdog/orion_wdt.c | 16 ++-------------- + drivers/watchdog/pnx4008_wdt.c | 13 +------------ + drivers/watchdog/rc32434_wdt.c | 13 +------------ + drivers/watchdog/rdc321x_wdt.c | 13 +------------ + drivers/watchdog/riowd.c | 13 +------------ + drivers/watchdog/s3c2410_wdt.c | 2 ++ + drivers/watchdog/stmp3xxx_wdt.c | 13 +------------ + drivers/watchdog/ts72xx_wdt.c | 12 +----------- + drivers/watchdog/twl4030_wdt.c | 12 +----------- + drivers/watchdog/wm831x_wdt.c | 16 ++-------------- + drivers/watchdog/wm8350_wdt.c | 12 +----------- + include/linux/watchdog.h | 21 ++++++++++++++++----- + 33 files changed, 63 insertions(+), 285 deletions(-) +Merging bdev/master (feaf384 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block) +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master (c3b92c8 Linux 3.1) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging iommu/next (3a4786b Merge branches 'iommu/fixes', 'arm/omap', 'iommu/page-sizes' and 'iommu/group-id' into next) +$ git merge iommu/next +Auto-merging drivers/media/video/omap3isp/ispvideo.c +Auto-merging drivers/iommu/intel-iommu.c +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 4 +- + arch/arm/mach-omap2/devices.c | 7 ++ + arch/arm/plat-omap/include/plat/iommu.h | 31 +++++- + arch/arm/plat-omap/include/plat/iovmm.h | 12 +- + arch/ia64/include/asm/iommu.h | 2 + + arch/ia64/kernel/pci-dma.c | 1 + + arch/x86/include/asm/iommu.h | 1 + + arch/x86/kernel/pci-dma.c | 11 ++ + drivers/iommu/amd_iommu.c | 53 ++++++++-- + drivers/iommu/intel-iommu.c | 79 +++++++++++++-- + drivers/iommu/iommu.c | 177 +++++++++++++++++++++++++++++-- + drivers/iommu/msm_iommu.c | 25 ++--- + drivers/iommu/omap-iommu.c | 80 +++++++-------- + drivers/iommu/omap-iovmm.c | 48 +++++---- + drivers/media/video/omap3isp/isp.c | 30 +----- + drivers/media/video/omap3isp/isp.h | 2 - + drivers/media/video/omap3isp/ispccdc.c | 18 ++-- + drivers/media/video/omap3isp/ispstat.c | 8 +- + drivers/media/video/omap3isp/ispvideo.c | 4 +- + include/linux/iommu.h | 33 +++++- + virt/kvm/iommu.c | 8 +- + 21 files changed, 468 insertions(+), 166 deletions(-) +Merging cputime/cputime (c5927fe [S390] cputime: add sparse checking and cleanup) +$ git merge cputime/cputime +Auto-merging kernel/sched.c +Auto-merging kernel/fork.c +Auto-merging include/linux/sched.h +Auto-merging fs/proc/stat.c +Auto-merging drivers/cpufreq/cpufreq_ondemand.c +Merge made by the 'recursive' strategy. + arch/ia64/include/asm/cputime.h | 69 +++++++--------- + arch/powerpc/include/asm/cputime.h | 70 ++++++---------- + arch/s390/include/asm/cputime.h | 140 ++++++++++++++----------------- + drivers/cpufreq/cpufreq_conservative.c | 29 +++---- + drivers/cpufreq/cpufreq_ondemand.c | 33 ++++---- + drivers/cpufreq/cpufreq_stats.c | 5 +- + drivers/macintosh/rack-meter.c | 11 +-- + fs/proc/array.c | 8 +- + fs/proc/stat.c | 27 +++--- + fs/proc/uptime.c | 4 +- + include/asm-generic/cputime.h | 62 +++++++-------- + include/linux/sched.h | 4 +- + kernel/acct.c | 4 +- + kernel/cpu.c | 3 +- + kernel/exit.c | 22 ++---- + kernel/fork.c | 14 +-- + kernel/itimer.c | 15 ++-- + kernel/posix-cpu-timers.c | 132 ++++++++++++------------------ + kernel/sched.c | 80 ++++++++---------- + kernel/sched_stats.h | 6 +- + kernel/signal.c | 6 +- + kernel/sys.c | 6 +- + kernel/tsacct.c | 2 +- + 23 files changed, 323 insertions(+), 429 deletions(-) +Merging osd/linux-next (dde406e pnfs-obj: Support for RAID5 read-4-write interface.) +$ git merge osd/linux-next +Merge made by the 'recursive' strategy. +Merging jc_docs/docs-next (5c050fb docs: update the development process document) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging nommu/master (0ce790e Linux 2.6.39-rc1) +$ git merge nommu/master +Already up-to-date. +Merging trivial/for-next (3f86549 mac80211: drop spelling fix) +$ git merge trivial/for-next +Resolved 'arch/powerpc/platforms/40x/Kconfig' using previous resolution. +Auto-merging net/ipv4/Kconfig +Auto-merging mm/page_alloc.c +Auto-merging lib/Kconfig +Auto-merging kernel/irq/manage.c +Auto-merging include/net/mac80211.h +Auto-merging include/linux/security.h +Auto-merging include/drm/drmP.h +Auto-merging fs/ocfs2/file.c +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/namespace.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/btrfs/inode.c +Auto-merging drivers/usb/gadget/Kconfig +Auto-merging drivers/tty/serial/Kconfig +Auto-merging drivers/spi/Kconfig +Auto-merging drivers/scsi/qla4xxx/ql4_fw.h +Auto-merging drivers/scsi/qla2xxx/qla_nx.c +Auto-merging drivers/net/ethernet/chelsio/cxgb4vf/sge.c +Auto-merging drivers/mtd/nand/Kconfig +Auto-merging drivers/gpio/Kconfig +Auto-merging crypto/Kconfig +Auto-merging arch/s390/Kconfig +Auto-merging arch/powerpc/platforms/44x/Kconfig +Auto-merging arch/powerpc/platforms/40x/Kconfig +CONFLICT (content): Merge conflict in arch/powerpc/platforms/40x/Kconfig +Auto-merging arch/mips/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e9f38cf] Merge remote-tracking branch 'trivial/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/cpu-freq/governors.txt | 4 +- + Documentation/devices.txt | 2 +- + Documentation/scsi/53c700.txt | 21 +---------- + MAINTAINERS | 19 +++++---- + arch/arm/Kconfig | 3 +- + arch/arm/mach-pxa/colibri-pxa270-income.c | 2 +- + arch/arm/plat-omap/include/plat/serial.h | 2 +- + arch/cris/Kconfig.debug | 1 - + arch/frv/Kconfig | 10 ----- + arch/mips/Kconfig | 5 -- + arch/mips/sgi-ip27/Kconfig | 6 --- + arch/mips/sibyte/Kconfig | 1 - + arch/powerpc/include/asm/io.h | 2 +- + arch/powerpc/include/asm/keylargo.h | 2 +- + arch/powerpc/mm/numa.c | 2 +- + arch/powerpc/platforms/40x/Kconfig | 40 -------------------- + arch/powerpc/platforms/44x/Kconfig | 18 +-------- + arch/powerpc/platforms/512x/Kconfig | 1 - + arch/s390/Kconfig | 1 - + arch/sparc/kernel/smp_64.c | 2 +- + arch/x86/pci/pcbios.c | 2 +- + crypto/Kconfig | 2 - + drivers/acpi/acpica/hwxface.c | 2 +- + drivers/block/xen-blkback/xenbus.c | 2 +- + drivers/char/ipmi/ipmi_bt_sm.c | 2 +- + drivers/edac/i82975x_edac.c | 30 +++++++++----- + drivers/edac/ppc4xx_edac.c | 2 +- + drivers/gpio/Kconfig | 2 +- + drivers/leds/Kconfig | 3 +- + drivers/media/rc/ene_ir.c | 2 +- + drivers/media/rc/ene_ir.h | 2 +- + drivers/media/video/zoran/zoran_driver.c | 2 +- + drivers/message/fusion/lsi/mpi_ioc.h | 2 +- + drivers/mtd/nand/Kconfig | 1 - + drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 2 +- + drivers/net/ethernet/sis/sis900.h | 2 +- + drivers/net/irda/nsc-ircc.c | 2 +- + drivers/net/irda/via-ircc.c | 4 +- + drivers/net/irda/w83977af_ir.c | 2 +- + drivers/net/wimax/i2400m/i2400m.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192de/hw.c | 4 +- + drivers/parisc/Kconfig | 7 --- + drivers/parport/parport_mfc3.c | 2 +- + drivers/scsi/aic7xxx/aicasm/aicasm.c | 2 +- + drivers/scsi/gdth.h | 2 +- + drivers/scsi/ips.c | 2 +- + drivers/scsi/qla2xxx/qla_nx.c | 2 +- + drivers/scsi/qla4xxx/ql4_fw.h | 2 +- + drivers/scsi/vmw_pvscsi.c | 2 +- + drivers/spi/Kconfig | 3 +- + .../comedi/drivers/addi-data/hwdrv_apci3200.c | 2 +- + drivers/staging/cxt1e1/libsbew.h | 2 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 4 +- + drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 2 +- + drivers/staging/iio/industrialio-trigger.c | 2 +- + drivers/staging/sep/sep_driver.c | 2 +- + drivers/staging/tidspbridge/Kconfig | 2 +- + drivers/staging/tidspbridge/rmgr/dbdcd.c | 2 +- + drivers/tty/serial/Kconfig | 2 +- + drivers/usb/gadget/Kconfig | 1 - + drivers/usb/host/hwa-hc.c | 2 +- + drivers/usb/host/imx21-hcd.c | 2 +- + drivers/usb/musb/cppi_dma.c | 2 +- + drivers/usb/otg/fsl_otg.c | 2 +- + drivers/uwb/i1480/dfu/usb.c | 2 +- + drivers/video/bf54x-lq043fb.c | 2 +- + drivers/video/bfin-t350mcqb-fb.c | 2 +- + drivers/video/console/Kconfig | 2 - + fs/btrfs/inode.c | 2 +- + fs/ext3/inode.c | 2 +- + fs/ext4/inode.c | 4 +- + fs/jbd/checkpoint.c | 2 +- + fs/jbd2/checkpoint.c | 2 +- + fs/namespace.c | 2 - + fs/nfsd/nfs4state.c | 2 +- + fs/ocfs2/file.c | 2 +- + fs/qnx4/inode.c | 7 ++- + fs/xfs/xfs_buf.c | 2 +- + fs/xfs/xfs_file.c | 6 +- + fs/xfs/xfs_log_cil.c | 2 +- + include/drm/drmP.h | 2 +- + include/linux/cordic.h | 4 +- + include/linux/security.h | 26 ++++++------ + include/linux/types.h | 2 +- + include/linux/wanrouter.h | 2 +- + include/net/mac80211.h | 2 +- + kernel/irq/manage.c | 2 +- + kernel/time/Kconfig | 2 +- + lib/Kconfig | 7 +-- + lib/cordic.c | 2 +- + lib/decompress_bunzip2.c | 5 +- + lib/decompress_unlzma.c | 2 +- + mm/page_alloc.c | 4 +- + net/ipv4/Kconfig | 2 - + net/ipv4/ip_fragment.c | 2 +- + net/ipv4/netfilter/nf_nat_core.c | 2 +- + net/netfilter/ipvs/Kconfig | 1 - + net/sctp/endpointola.c | 2 +- + scripts/package/Makefile | 2 +- + sound/aoa/codecs/Kconfig | 8 ---- + sound/core/Kconfig | 1 - + sound/oss/Kconfig | 2 +- + 102 files changed, 139 insertions(+), 259 deletions(-) +Merging audit/for-next (def5754 Audit: remove spaces from audit_log_d_path) +$ git merge audit/for-next +Already up-to-date. +Merging pm/linux-next (87c1952 Merge branch 'pm-domains' into linux-next) +$ git merge pm/linux-next +Auto-merging net/sunrpc/sched.c +Auto-merging kernel/fork.c +Auto-merging kernel/exit.c +Auto-merging kernel/cpu.c +Auto-merging include/linux/sched.h +Auto-merging fs/xfs/xfs_buf.c +Auto-merging fs/nfs/nfs4proc.c +Auto-merging fs/gfs2/quota.c +Auto-merging fs/gfs2/log.c +Auto-merging arch/m68k/include/asm/thread_info.h +Auto-merging arch/arm/mach-s3c64xx/pm.c +Auto-merging arch/arm/mach-s3c64xx/mach-crag6410.c +Auto-merging arch/arm/mach-s3c64xx/Kconfig +Auto-merging Documentation/feature-removal-schedule.txt +Merge made by the 'recursive' strategy. + Documentation/feature-removal-schedule.txt | 11 - + Documentation/power/freezing-of-tasks.txt | 39 ++- + arch/alpha/include/asm/thread_info.h | 2 - + arch/arm/include/asm/thread_info.h | 2 - + arch/arm/mach-s3c64xx/Kconfig | 1 + + arch/arm/mach-s3c64xx/mach-crag6410.c | 2 +- + arch/arm/mach-s3c64xx/pm.c | 174 +++++++++- + arch/arm/mach-shmobile/pm-sh7372.c | 64 +++- + arch/arm/plat-samsung/include/plat/pm.h | 6 + + arch/avr32/include/asm/thread_info.h | 2 - + arch/blackfin/include/asm/thread_info.h | 2 - + arch/cris/include/asm/thread_info.h | 2 - + arch/frv/include/asm/thread_info.h | 2 - + arch/h8300/include/asm/thread_info.h | 2 - + arch/ia64/include/asm/thread_info.h | 2 - + arch/m32r/include/asm/thread_info.h | 2 - + arch/m68k/include/asm/thread_info.h | 1 - + arch/microblaze/include/asm/thread_info.h | 2 - + arch/mips/include/asm/thread_info.h | 2 - + arch/mn10300/include/asm/thread_info.h | 2 - + arch/parisc/include/asm/thread_info.h | 2 - + arch/powerpc/include/asm/thread_info.h | 2 - + arch/s390/include/asm/thread_info.h | 2 - + arch/sh/include/asm/thread_info.h | 2 - + arch/sparc/include/asm/thread_info_32.h | 2 - + arch/sparc/include/asm/thread_info_64.h | 2 - + arch/um/include/asm/thread_info.h | 2 - + arch/unicore32/include/asm/thread_info.h | 2 - + arch/x86/include/asm/thread_info.h | 2 - + arch/xtensa/include/asm/thread_info.h | 2 - + drivers/acpi/sleep.c | 16 + + drivers/base/firmware_class.c | 4 + + drivers/base/power/Makefile | 2 +- + drivers/base/power/domain.c | 539 ++++++++++++++++++++-------- + drivers/base/power/domain_governor.c | 156 ++++++++ + drivers/base/power/main.c | 147 ++------ + drivers/base/power/qos.c | 24 +- + drivers/base/power/runtime.c | 148 +++++++- + drivers/bluetooth/btmrvl_main.c | 2 - + drivers/devfreq/devfreq.c | 15 +- + drivers/dma/dmatest.c | 46 ++- + drivers/mfd/twl6030-irq.c | 2 - + drivers/net/irda/stir4200.c | 2 +- + drivers/platform/x86/thinkpad_acpi.c | 15 +- + drivers/staging/rts_pstor/rtsx.c | 2 - + drivers/usb/storage/usb.c | 13 +- + fs/btrfs/async-thread.c | 2 +- + fs/btrfs/disk-io.c | 8 +- + fs/ext4/super.c | 3 +- + fs/fs-writeback.c | 4 +- + fs/gfs2/log.c | 4 +- + fs/gfs2/quota.c | 4 +- + fs/jbd/journal.c | 2 +- + fs/jbd2/journal.c | 2 +- + fs/jfs/jfs_logmgr.c | 2 +- + fs/jfs/jfs_txnmgr.c | 4 +- + fs/nfs/inode.c | 3 +- + fs/nfs/nfs3proc.c | 3 +- + fs/nfs/nfs4proc.c | 5 +- + fs/nfs/proc.c | 3 +- + fs/nilfs2/segment.c | 2 +- + fs/xfs/xfs_buf.c | 2 +- + include/linux/freezer.h | 157 ++++----- + include/linux/kmod.h | 2 + + include/linux/kthread.h | 1 + + include/linux/pm.h | 2 + + include/linux/pm_domain.h | 103 +++++- + include/linux/pm_qos.h | 3 + + include/linux/pm_runtime.h | 5 + + include/linux/sched.h | 4 +- + include/linux/suspend.h | 35 +- + kernel/cgroup_freezer.c | 63 ++-- + kernel/cpu.c | 4 +- + kernel/exit.c | 3 +- + kernel/fork.c | 1 - + kernel/freezer.c | 203 ++++++----- + kernel/kexec.c | 4 +- + kernel/kmod.c | 27 ++- + kernel/kthread.c | 27 ++- + kernel/power/hibernate.c | 92 ++---- + kernel/power/main.c | 10 +- + kernel/power/power.h | 2 + + kernel/power/process.c | 77 ++--- + kernel/power/suspend.c | 12 +- + kernel/power/user.c | 120 +------ + mm/backing-dev.c | 8 +- + mm/oom_kill.c | 2 +- + net/sunrpc/sched.c | 3 +- + 88 files changed, 1566 insertions(+), 932 deletions(-) + create mode 100644 drivers/base/power/domain_governor.c +Merging apm/for-next (282e5aa x86: Kconfig: drop unknown symbol 'APM_MODULE') +$ git merge apm/for-next +Auto-merging arch/x86/Kconfig +Merge made by the 'recursive' strategy. + arch/x86/Kconfig | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging fsnotify/for-next (ef9bf3b fanotify: only destroy a mark if both its mask and its ignored_mask are cleared) +$ git merge fsnotify/for-next +Auto-merging include/linux/fsnotify_backend.h +Auto-merging fs/notify/mark.c +Auto-merging fs/notify/group.c +Auto-merging fs/notify/fanotify/fanotify_user.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/cachefiles/namei.c +Merge made by the 'recursive' strategy. + fs/cachefiles/namei.c | 1 - + fs/cachefiles/xattr.c | 1 - + fs/nfsd/vfs.c | 3 - + fs/notify/dnotify/dnotify.c | 15 +++--- + fs/notify/fanotify/fanotify.c | 24 +++++---- + fs/notify/fanotify/fanotify_user.c | 101 +++++++++++++++++++++++++----------- + fs/notify/group.c | 1 + + fs/notify/mark.c | 36 +++++-------- + include/linux/fanotify.h | 5 ++- + include/linux/fsnotify_backend.h | 14 ++++- + 10 files changed, 121 insertions(+), 80 deletions(-) +Merging irda/for-next (94d57c4 enic: Update MAINTAINERS) +$ git merge irda/for-next +Already up-to-date. +Merging edac/linux_next (4d096ca MAINTAINERS: add an entry for Edac Sandy Bridge driver) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (ed8ccfa Merge branch '3.3-edac-scrubrate' into edac-for-next) +$ git merge edac-amd/for-next +Merge made by the 'recursive' strategy. + Documentation/edac.txt | 4 ++-- + drivers/edac/amd64_edac.c | 32 ++++++++++++++++++++++++++++---- + drivers/edac/edac_mc_sysfs.c | 4 ++-- + 3 files changed, 32 insertions(+), 8 deletions(-) +Merging devicetree/devicetree/next (ae97159 of_mdio: Don't phy_scan_fixups() twice) +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging spi/spi/next (940ab88 drivercore: Add helper macro for platform_driver boilerplate) +$ git merge spi/spi/next +Already up-to-date. +Merging gpio/gpio/next (19384a3 gpio: Add Linus Walleij as gpio co-maintainer) +$ git merge gpio/gpio/next +Auto-merging drivers/gpio/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + arch/arm/boot/dts/testcases/tests-phandle.dtsi | 37 ++++++ + arch/arm/boot/dts/testcases/tests.dtsi | 1 + + arch/arm/boot/dts/versatile-pb.dts | 2 + + arch/microblaze/kernel/reset.c | 43 +------- + arch/powerpc/sysdev/qe_lib/gpio.c | 42 ++------ + drivers/gpio/Kconfig | 11 +- + drivers/gpio/gpio-adp5588.c | 5 +- + drivers/gpio/gpio-bt8xx.c | 3 - + drivers/gpio/gpio-cs5535.c | 1 - + drivers/gpio/gpio-janz-ttl.c | 2 - + drivers/gpio/gpio-nomadik.c | 4 +- + drivers/gpio/gpio-pcf857x.c | 5 +- + drivers/gpio/gpio-pch.c | 7 +- + drivers/gpio/gpio-xilinx.c | 1 - + drivers/gpio/gpiolib.c | 6 +- + drivers/of/Kconfig | 9 ++ + drivers/of/Makefile | 1 + + drivers/of/base.c | 146 ++++++++++++------------ + drivers/of/gpio.c | 45 +++---- + drivers/of/selftest.c | 139 ++++++++++++++++++++++ + include/asm-generic/gpio.h | 6 +- + include/linux/of.h | 11 ++- + include/linux/of_gpio.h | 10 +- + 24 files changed, 333 insertions(+), 205 deletions(-) + create mode 100644 arch/arm/boot/dts/testcases/tests-phandle.dtsi + create mode 100644 arch/arm/boot/dts/testcases/tests.dtsi + create mode 100644 drivers/of/selftest.c +Merging tip/auto-latest (e416e72 Merge branch 'x86/syscall' into auto-latest) +$ git merge tip/auto-latest +Resolved 'drivers/cpufreq/cpufreq_conservative.c' using previous resolution. +Resolved 'drivers/cpufreq/cpufreq_ondemand.c' using previous resolution. +Resolved 'drivers/macintosh/rack-meter.c' using previous resolution. +Resolved 'fs/proc/stat.c' using previous resolution. +Resolved 'fs/proc/uptime.c' using previous resolution. +Resolved 'kernel/sched/core.c' using previous resolution. +Auto-merging kernel/sched/stop_task.c +Auto-merging kernel/sched/stats.h +Auto-merging kernel/sched/rt.c +Auto-merging kernel/sched/idle_task.c +Auto-merging kernel/sched/features.h +Auto-merging kernel/sched/fair.c +Auto-merging kernel/sched/debug.c +Auto-merging kernel/sched/cpupri.c +Auto-merging kernel/sched/core.c +CONFLICT (content): Merge conflict in kernel/sched/core.c +Auto-merging kernel/sched/auto_group.h +Auto-merging kernel/sched/auto_group.c +Auto-merging include/linux/sched.h +Auto-merging fs/proc/uptime.c +CONFLICT (content): Merge conflict in fs/proc/uptime.c +Auto-merging fs/proc/stat.c +CONFLICT (content): Merge conflict in fs/proc/stat.c +Auto-merging drivers/macintosh/rack-meter.c +CONFLICT (content): Merge conflict in drivers/macintosh/rack-meter.c +Auto-merging drivers/cpufreq/cpufreq_ondemand.c +CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq_ondemand.c +Auto-merging drivers/cpufreq/cpufreq_conservative.c +CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq_conservative.c +Removing arch/x86/um/sys_call_table_32.S +Removing arch/x86/oprofile/nmi_timer_int.c +Removing arch/x86/kernel/syscall_table_32.S +Removing arch/x86/include/asm/unistd_64.h +Removing arch/x86/include/asm/unistd_32.h +Auto-merging arch/x86/include/asm/topology.h +Auto-merging arch/x86/include/asm/thread_info.h +Auto-merging arch/x86/Kconfig +Auto-merging Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3fa4b99] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/debugobjects.tmpl | 50 + + Documentation/kbuild/makefiles.txt | 50 +- + Documentation/kernel-parameters.txt | 14 +- + Documentation/sysctl/kernel.txt | 14 + + Documentation/trace/events.txt | 2 - + MAINTAINERS | 13 +- + Makefile | 9 +- + arch/Kconfig | 4 + + arch/cris/arch-v32/kernel/time.c | 4 +- + arch/parisc/kernel/time.c | 6 +- + arch/s390/appldata/appldata_os.c | 16 +- + arch/um/Makefile | 9 +- + arch/um/kernel/time.c | 6 +- + arch/x86/Kconfig | 32 +- + arch/x86/Kconfig.debug | 25 +- + arch/x86/Makefile | 6 + + arch/x86/ia32/Makefile | 1 + + arch/x86/ia32/ia32entry.S | 402 +---- + arch/x86/ia32/nosyscall.c | 7 + + arch/x86/ia32/syscall_ia32.c | 25 + + arch/x86/include/asm/Kbuild | 5 +- + arch/x86/include/asm/apic_flat_64.h | 7 + + arch/x86/include/asm/cmpxchg.h | 140 +- + arch/x86/include/asm/div64.h | 22 +- + arch/x86/include/asm/i387.h | 2 +- + arch/x86/include/asm/ia32_unistd.h | 13 +- + arch/x86/include/asm/init.h | 2 + + arch/x86/include/asm/insn.h | 7 + + arch/x86/include/asm/mach_timer.h | 2 +- + arch/x86/include/asm/numachip/numachip_csr.h | 167 ++ + arch/x86/include/asm/perf_event.h | 29 + + arch/x86/include/asm/processor-flags.h | 1 + + arch/x86/include/asm/smp.h | 6 + + arch/x86/include/asm/spinlock.h | 15 +- + arch/x86/include/asm/thread_info.h | 9 +- + arch/x86/include/asm/topology.h | 2 - + arch/x86/include/asm/tsc.h | 2 + + arch/x86/include/asm/uaccess.h | 2 +- + arch/x86/include/asm/unistd.h | 54 +- + arch/x86/include/asm/unistd_32.h | 401 ---- + arch/x86/include/asm/unistd_64.h | 732 ------- + arch/x86/include/asm/x86_init.h | 3 + + arch/x86/kernel/Makefile | 4 +- + arch/x86/kernel/apic/Makefile | 1 + + arch/x86/kernel/apic/apic_flat_64.c | 2 +- + arch/x86/kernel/apic/apic_numachip.c | 294 +++ + arch/x86/kernel/asm-offsets_32.c | 8 + + arch/x86/kernel/asm-offsets_64.c | 19 +- + arch/x86/kernel/cpu/amd.c | 7 + + arch/x86/kernel/cpu/common.c | 11 + + arch/x86/kernel/cpu/cpu.h | 5 +- + arch/x86/kernel/cpu/perf_event.c | 254 ++- + arch/x86/kernel/cpu/perf_event.h | 51 +- + arch/x86/kernel/cpu/perf_event_amd.c | 2 +- + arch/x86/kernel/cpu/perf_event_intel.c | 72 +- + arch/x86/kernel/e820.c | 59 +- + arch/x86/kernel/early_printk.c | 2 +- + arch/x86/kernel/entry_32.S | 41 +- + arch/x86/kernel/entry_64.S | 31 +- + arch/x86/kernel/hpet.c | 7 +- + arch/x86/kernel/irq_32.c | 5 + + arch/x86/kernel/irq_64.c | 35 +- + arch/x86/kernel/jump_label.c | 2 +- + arch/x86/kernel/nmi_selftest.c | 180 ++ + arch/x86/kernel/process.c | 2 +- + arch/x86/kernel/process_64.c | 5 +- + arch/x86/kernel/ptrace.c | 3 +- + arch/x86/kernel/smp.c | 72 +- + arch/x86/kernel/smpboot.c | 17 +- + arch/x86/kernel/syscall_32.c | 25 + + arch/x86/kernel/syscall_64.c | 20 +- + arch/x86/kernel/syscall_table_32.S | 350 ---- + arch/x86/kernel/traps.c | 7 +- + arch/x86/kernel/tsc.c | 26 +- + arch/x86/kernel/tsc_sync.c | 4 +- + arch/x86/kernel/vsyscall_64.c | 77 +- + arch/x86/kernel/x86_init.c | 1 + + arch/x86/lib/inat.c | 9 +- + arch/x86/lib/insn.c | 4 +- + arch/x86/lib/x86-opcode-map.txt | 606 +++--- + arch/x86/mm/extable.c | 2 +- + arch/x86/mm/fault.c | 22 +- + arch/x86/mm/init.c | 23 + + arch/x86/mm/init_32.c | 29 +- + arch/x86/mm/init_64.c | 11 +- + arch/x86/mm/mmap.c | 4 +- + arch/x86/mm/numa.c | 10 +- + arch/x86/mm/pageattr.c | 8 +- + arch/x86/oprofile/Makefile | 3 +- + arch/x86/oprofile/init.c | 30 +- + arch/x86/oprofile/nmi_int.c | 27 +- + arch/x86/oprofile/nmi_timer_int.c | 50 - + arch/x86/platform/efi/efi.c | 3 +- + arch/x86/platform/mrst/Makefile | 2 +- + arch/x86/platform/mrst/mrst.c | 3 +- + arch/x86/syscalls/Makefile | 43 + + arch/x86/syscalls/syscall_32.tbl | 357 ++++ + arch/x86/syscalls/syscall_64.tbl | 320 +++ + arch/x86/syscalls/syscallhdr.sh | 27 + + arch/x86/syscalls/syscalltbl.sh | 15 + + arch/x86/tools/Makefile | 11 +- + arch/x86/tools/gen-insn-attr-x86.awk | 21 +- + arch/x86/tools/insn_sanity.c | 275 +++ + arch/x86/um/Makefile | 3 +- + arch/x86/um/sys_call_table_32.S | 26 - + arch/x86/um/sys_call_table_32.c | 55 + + arch/x86/um/sys_call_table_64.c | 33 +- + arch/x86/um/user-offsets.c | 15 + + arch/xtensa/kernel/time.c | 13 +- + drivers/clocksource/acpi_pm.c | 2 +- + drivers/clocksource/i8253.c | 6 +- + drivers/clocksource/tcb_clksrc.c | 4 +- + drivers/cpufreq/cpufreq_conservative.c | 39 +- + drivers/cpufreq/cpufreq_ondemand.c | 39 +- + drivers/lguest/x86/core.c | 2 +- + drivers/macintosh/rack-meter.c | 7 +- + drivers/oprofile/nmi_timer_int.c | 173 ++ + drivers/oprofile/oprof.c | 30 +- + drivers/oprofile/oprof.h | 9 + + drivers/oprofile/timer_int.c | 30 +- + drivers/pci/Kconfig | 4 +- + drivers/pci/ioapic.c | 15 +- + fs/proc/stat.c | 52 +- + fs/proc/uptime.c | 4 +- + include/linux/bitops.h | 10 +- + include/linux/debugobjects.h | 6 + + include/linux/jump_label.h | 27 + + include/linux/kernel.h | 1 + + include/linux/kernel_stat.h | 36 +- + include/linux/latencytop.h | 3 +- + include/linux/lockdep.h | 4 + + include/linux/mm.h | 10 - + include/linux/perf_event.h | 7 +- + include/linux/sched.h | 15 + + include/trace/events/sched.h | 7 + + init/calibrate.c | 15 + + init/main.c | 8 +- + kernel/Makefile | 20 +- + kernel/events/Makefile | 2 +- + kernel/events/callchain.c | 191 ++ + kernel/events/core.c | 296 +--- + kernel/events/internal.h | 39 +- + kernel/jump_label.c | 49 +- + kernel/lockdep.c | 61 +- + kernel/panic.c | 17 +- + kernel/printk.c | 9 +- + kernel/rtmutex-debug.c | 1 + + kernel/sched/Makefile | 20 + + kernel/{sched_autogroup.c => sched/auto_group.c} | 33 +- + kernel/{sched_autogroup.h => sched/auto_group.h} | 26 +- + kernel/{sched_clock.c => sched/clock.c} | 0 + kernel/{sched.c => sched/core.c} | 2180 +++----------------- + kernel/{sched_cpupri.c => sched/cpupri.c} | 4 +- + kernel/{sched_cpupri.h => sched/cpupri.h} | 0 + kernel/{sched_debug.c => sched/debug.c} | 6 +- + kernel/{sched_fair.c => sched/fair.c} | 929 +++++++-- + kernel/{sched_features.h => sched/features.h} | 30 +- + kernel/{sched_idletask.c => sched/idle_task.c} | 4 +- + kernel/{sched_rt.c => sched/rt.c} | 218 ++- + kernel/sched/sched.h | 1136 ++++++++++ + kernel/sched/stats.c | 111 + + kernel/{sched_stats.h => sched/stats.h} | 103 - + kernel/{sched_stoptask.c => sched/stop_task.c} | 4 +- + kernel/sysctl.c | 9 + + kernel/time/tick-sched.c | 9 + + kernel/time/timekeeping.c | 10 +- + kernel/timer.c | 62 +- + kernel/trace/trace.c | 105 +- + kernel/trace/trace.h | 2 + + kernel/trace/trace_events_filter.c | 26 +- + kernel/trace/trace_irqsoff.c | 13 +- + kernel/trace/trace_output.c | 16 +- + kernel/trace/trace_sched_wakeup.c | 13 +- + kernel/trace/trace_syscalls.c | 1 + + lib/debugobjects.c | 54 +- + mm/debug-pagealloc.c | 3 - + scripts/Makefile.headersinst | 10 +- + scripts/checksyscalls.sh | 15 +- + tools/perf/Documentation/perf-annotate.txt | 2 +- + tools/perf/Documentation/perf-report.txt | 4 +- + tools/perf/Documentation/perf-script.txt | 7 +- + tools/perf/Documentation/perf-test.txt | 8 +- + tools/perf/Makefile | 1 + + tools/perf/builtin-annotate.c | 133 +- + tools/perf/builtin-diff.c | 21 +- + tools/perf/builtin-inject.c | 118 +- + tools/perf/builtin-kmem.c | 14 +- + tools/perf/builtin-lock.c | 10 +- + tools/perf/builtin-probe.c | 1 - + tools/perf/builtin-record.c | 585 +++--- + tools/perf/builtin-report.c | 225 ++- + tools/perf/builtin-sched.c | 198 +- + tools/perf/builtin-script.c | 50 +- + tools/perf/builtin-stat.c | 43 +- + tools/perf/builtin-test.c | 418 ++++- + tools/perf/builtin-timechart.c | 34 +- + tools/perf/builtin-top.c | 557 +++--- + tools/perf/perf.c | 33 +- + tools/perf/perf.h | 23 + + tools/perf/util/annotate.c | 6 +- + tools/perf/util/annotate.h | 5 +- + tools/perf/util/build-id.c | 26 +- + tools/perf/util/build-id.h | 2 +- + tools/perf/util/callchain.h | 3 + + tools/perf/util/cgroup.c | 15 +- + tools/perf/util/debugfs.c | 35 +- + tools/perf/util/debugfs.h | 31 +- + tools/perf/util/event.c | 243 ++- + tools/perf/util/event.h | 65 +- + tools/perf/util/evlist.c | 293 +++- + tools/perf/util/evlist.h | 43 +- + tools/perf/util/evsel.c | 70 + + tools/perf/util/evsel.h | 8 + + tools/perf/util/header.c | 75 +- + tools/perf/util/header.h | 45 +- + tools/perf/util/hist.h | 3 +- + tools/perf/util/map.c | 4 + + tools/perf/util/map.h | 19 + + tools/perf/util/parse-events.c | 28 +- + tools/perf/util/parse-events.h | 1 - + tools/perf/util/probe-finder.h | 1 - + .../perf/util/scripting-engines/trace-event-perl.c | 4 +- + .../util/scripting-engines/trace-event-python.c | 4 +- + tools/perf/util/session.c | 326 ++-- + tools/perf/util/session.h | 62 +- + tools/perf/util/setup.py | 3 +- + tools/perf/util/symbol.h | 1 + + tools/perf/util/thread.c | 6 +- + tools/perf/util/thread.h | 14 +- + tools/perf/util/tool.h | 50 + + tools/perf/util/top.h | 20 +- + tools/perf/util/trace-event-info.c | 28 +- + tools/perf/util/trace-event-scripting.c | 2 +- + tools/perf/util/trace-event.h | 8 +- + tools/perf/util/ui/browsers/annotate.c | 16 +- + tools/perf/util/ui/browsers/hists.c | 2 +- + tools/perf/util/ui/progress.c | 3 + + 237 files changed, 9382 insertions(+), 7154 deletions(-) + create mode 100644 arch/x86/ia32/nosyscall.c + create mode 100644 arch/x86/ia32/syscall_ia32.c + create mode 100644 arch/x86/include/asm/apic_flat_64.h + create mode 100644 arch/x86/include/asm/numachip/numachip_csr.h + delete mode 100644 arch/x86/include/asm/unistd_32.h + delete mode 100644 arch/x86/include/asm/unistd_64.h + create mode 100644 arch/x86/kernel/apic/apic_numachip.c + create mode 100644 arch/x86/kernel/nmi_selftest.c + create mode 100644 arch/x86/kernel/syscall_32.c + delete mode 100644 arch/x86/kernel/syscall_table_32.S + delete mode 100644 arch/x86/oprofile/nmi_timer_int.c + create mode 100644 arch/x86/syscalls/Makefile + create mode 100644 arch/x86/syscalls/syscall_32.tbl + create mode 100644 arch/x86/syscalls/syscall_64.tbl + create mode 100644 arch/x86/syscalls/syscallhdr.sh + create mode 100644 arch/x86/syscalls/syscalltbl.sh + create mode 100644 arch/x86/tools/insn_sanity.c + delete mode 100644 arch/x86/um/sys_call_table_32.S + create mode 100644 arch/x86/um/sys_call_table_32.c + create mode 100644 drivers/oprofile/nmi_timer_int.c + create mode 100644 kernel/events/callchain.c + create mode 100644 kernel/sched/Makefile + rename kernel/{sched_autogroup.c => sched/auto_group.c} (88%) + rename kernel/{sched_autogroup.h => sched/auto_group.h} (66%) + rename kernel/{sched_clock.c => sched/clock.c} (100%) + rename kernel/{sched.c => sched/core.c} (80%) + rename kernel/{sched_cpupri.c => sched/cpupri.c} (99%) + rename kernel/{sched_cpupri.h => sched/cpupri.h} (100%) + rename kernel/{sched_debug.c => sched/debug.c} (99%) + rename kernel/{sched_fair.c => sched/fair.c} (87%) + rename kernel/{sched_features.h => sched/features.h} (75%) + rename kernel/{sched_idletask.c => sched/idle_task.c} (96%) + rename kernel/{sched_rt.c => sched/rt.c} (90%) + create mode 100644 kernel/sched/sched.h + create mode 100644 kernel/sched/stats.c + rename kernel/{sched_stats.h => sched/stats.h} (71%) + rename kernel/{sched_stoptask.c => sched/stop_task.c} (97%) + create mode 100644 tools/perf/util/tool.h +Merging rcu/rcu/next (afe24b1 rcu: Move propagation of ->completed from rcu_start_gp() to rcu_report_qs_rsp()) +$ git merge rcu/rcu/next +Already up-to-date. +Merging uprobes/for-next (b23a347 x86: skip singlestep where possible) +$ git merge uprobes/for-next +Auto-merging tools/perf/util/symbol.h +Auto-merging tools/perf/builtin-probe.c +Auto-merging kernel/trace/trace.h +Auto-merging kernel/signal.c +Auto-merging kernel/fork.c +Auto-merging kernel/Makefile +Auto-merging include/linux/sched.h +Auto-merging arch/x86/kernel/Makefile +Auto-merging arch/x86/include/asm/thread_info.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/Kconfig +Merge made by the 'recursive' strategy. + Documentation/trace/uprobetracer.txt | 93 ++ + arch/Kconfig | 3 + + arch/x86/Kconfig | 5 +- + arch/x86/include/asm/thread_info.h | 2 + + arch/x86/include/asm/uprobes.h | 59 ++ + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/signal.c | 6 + + arch/x86/kernel/uprobes.c | 651 ++++++++++++++ + include/linux/mm_types.h | 5 + + include/linux/sched.h | 4 + + include/linux/srcu.h | 50 + + include/linux/uprobes.h | 180 ++++ + kernel/Makefile | 1 + + kernel/fork.c | 15 + + kernel/signal.c | 3 + + kernel/srcu.c | 3 +- + kernel/trace/Kconfig | 20 + + kernel/trace/Makefile | 2 + + kernel/trace/trace.h | 5 + + kernel/trace/trace_kprobe.c | 899 +------------------ + kernel/trace/trace_probe.c | 785 ++++++++++++++++ + kernel/trace/trace_probe.h | 161 ++++ + kernel/trace/trace_uprobe.c | 768 ++++++++++++++++ + kernel/uprobes.c | 1500 +++++++++++++++++++++++++++++++ + mm/mmap.c | 33 +- + tools/perf/Documentation/perf-probe.txt | 14 + + tools/perf/builtin-probe.c | 49 +- + tools/perf/util/probe-event.c | 411 +++++++-- + tools/perf/util/probe-event.h | 12 +- + tools/perf/util/symbol.c | 8 + + tools/perf/util/symbol.h | 1 + + 31 files changed, 4767 insertions(+), 982 deletions(-) + create mode 100644 Documentation/trace/uprobetracer.txt + create mode 100644 arch/x86/include/asm/uprobes.h + create mode 100644 arch/x86/kernel/uprobes.c + create mode 100644 include/linux/uprobes.h + create mode 100644 kernel/trace/trace_probe.c + create mode 100644 kernel/trace/trace_probe.h + create mode 100644 kernel/trace/trace_uprobe.c + create mode 100644 kernel/uprobes.c +Merging cgroup/for-next (a34815b Merge branch 'for-3.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup) +$ git merge cgroup/for-next +Already up-to-date. +Merging kmemleak/kmemleak (029aeff kmemleak: Add support for memory hotplug) +$ git merge kmemleak/kmemleak +Merge made by the 'recursive' strategy. + Documentation/kmemleak.txt | 3 + + include/linux/kmemleak.h | 8 ++ + lib/Kconfig.debug | 2 +- + mm/kmemleak.c | 158 ++++++++++++++++++++++++++++++++++++------- + mm/percpu.c | 12 +++- + 5 files changed, 155 insertions(+), 28 deletions(-) +Merging kvm/kvm-updates/3.2 (a3e06bb KVM: emulate lapic tsc deadline timer for guest) +$ git merge kvm/kvm-updates/3.2 +Already up-to-date. +Merging oprofile/for-next (8685bbc Merge branch 'oprofile/urgent' into oprofile/master) +$ git merge oprofile/for-next +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 2 + + arch/s390/oprofile/hwsampler.c | 7 +- + arch/s390/oprofile/init.c | 373 ++++++++++++++++++++++++++++++++--- + arch/s390/oprofile/op_counter.h | 23 +++ + drivers/oprofile/oprof.h | 1 - + 5 files changed, 374 insertions(+), 32 deletions(-) + create mode 100644 arch/s390/oprofile/op_counter.h +Merging xen/upstream/xen (ec8161f Merge branch 'upstream/microcode' into upstream/xen) +$ git merge xen/upstream/xen +Resolved 'arch/x86/xen/Kconfig' using previous resolution. +Auto-merging arch/x86/xen/Kconfig +CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig +Auto-merging arch/x86/kernel/microcode_core.c +Auto-merging arch/x86/kernel/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8411cf6] Merge remote-tracking branch 'xen/upstream/xen' +$ git diff -M --stat --summary HEAD^.. + arch/x86/include/asm/microcode.h | 9 ++ + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/microcode_core.c | 5 +- + arch/x86/kernel/microcode_xen.c | 198 ++++++++++++++++++++++++++++++++++++++ + arch/x86/xen/Kconfig | 4 + + 5 files changed, 216 insertions(+), 1 deletions(-) + create mode 100644 arch/x86/kernel/microcode_xen.c +Merging xen-two/linux-next (54e6a3c Merge branch 'stable/for-linus-3.3' into linux-next) +$ git merge xen-two/linux-next +Resolved 'arch/x86/xen/Kconfig' using previous resolution. +Auto-merging arch/x86/xen/Kconfig +CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7860360] Merge remote-tracking branch 'xen-two/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/stable/sysfs-bus-xen-backend | 75 ++++ + .../ABI/stable/sysfs-devices-system-xen_memory | 77 +++++ + arch/ia64/include/asm/xen/interface.h | 2 +- + arch/x86/xen/Kconfig | 3 +- + arch/x86/xen/grant-table.c | 44 +++- + drivers/xen/events.c | 74 ++++- + drivers/xen/evtchn.c | 2 +- + drivers/xen/gntalloc.c | 62 +++-- + drivers/xen/gntdev.c | 31 ++- + drivers/xen/grant-table.c | 354 +++++++++++++++++--- + include/xen/events.h | 7 + + include/xen/grant_table.h | 10 +- + include/xen/interface/grant_table.h | 167 +++++++++- + include/xen/interface/xen.h | 2 + + 14 files changed, 828 insertions(+), 82 deletions(-) + create mode 100644 Documentation/ABI/stable/sysfs-bus-xen-backend + create mode 100644 Documentation/ABI/stable/sysfs-devices-system-xen_memory +Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend) +$ git merge xen-pvhvm/linux-next +Already up-to-date. +Merging percpu/for-next (a34815b Merge branch 'for-3.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup) +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next (9c5a2ba workqueue: separate out drain_workqueue() from destroy_workqueue()) +$ git merge workqueues/for-next +Already up-to-date. +Merging sfi/sfi-test (5b026c4 SFI: use ioremap_cache() instead of ioremap()) +$ git merge sfi/sfi-test +Already up-to-date. +Merging asm-generic/next (35dbc0e asm-generic/io.h: allow people to override individual funcs) +$ git merge asm-generic/next +Already up-to-date. +Merging drivers-x86/linux-next (15b956a acer-wmi: support Lenovo ideapad S205 wifi switch) +$ git merge drivers-x86/linux-next +Already up-to-date. +Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison) +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master (c2f5631 sysctl: remove impossible condition check) +$ git merge sysctl/master +Auto-merging fs/proc/proc_sysctl.c +Merge made by the 'recursive' strategy. + fs/proc/proc_sysctl.c | 14 ++------------ + 1 files changed, 2 insertions(+), 12 deletions(-) +Merging namespace/master (7e05c93 proc: Fix the proc access checks to namespace files.) +$ git merge namespace/master +Auto-merging fs/proc/inode.c +Merge made by the 'recursive' strategy. + fs/proc/inode.c | 6 +- + fs/proc/namespaces.c | 160 +++++++++++++++++++++++++++++++++++++++++++------- + 2 files changed, 142 insertions(+), 24 deletions(-) +Merging regmap/for-next (681ba97 Merge branch 'regmap/irq' into regmap-next) +$ git merge regmap/for-next +Removing drivers/base/regmap/regcache-indexed.c +Merge made by the 'recursive' strategy. + drivers/base/regmap/Kconfig | 3 + + drivers/base/regmap/Makefile | 4 +- + drivers/base/regmap/internal.h | 5 +- + drivers/base/regmap/regcache-indexed.c | 64 ------- + drivers/base/regmap/regcache-lzo.c | 21 ++- + drivers/base/regmap/regcache-rbtree.c | 61 +++++++- + drivers/base/regmap/regcache.c | 68 ++++--- + drivers/base/regmap/regmap-irq.c | 302 ++++++++++++++++++++++++++++++++ + drivers/base/regmap/regmap.c | 175 ++++++++++++++----- + include/linux/regmap.h | 58 ++++++- + include/trace/events/regmap.h | 9 + + 11 files changed, 615 insertions(+), 155 deletions(-) + delete mode 100644 drivers/base/regmap/regcache-indexed.c + create mode 100644 drivers/base/regmap/regmap-irq.c +Merging hsi/for-next (a8b4dea HSI: hsi_char: Update ioctl-number.txt) +$ git merge hsi/for-next +Auto-merging include/linux/Kbuild +Auto-merging drivers/Makefile +Auto-merging drivers/Kconfig +Merge made by the 'recursive' strategy. + Documentation/DocBook/device-drivers.tmpl | 17 + + Documentation/ioctl/ioctl-number.txt | 1 + + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/hsi/Kconfig | 19 + + drivers/hsi/Makefile | 6 + + drivers/hsi/clients/Kconfig | 13 + + drivers/hsi/clients/Makefile | 5 + + drivers/hsi/clients/hsi_char.c | 802 +++++++++++++++++++++++++++++ + drivers/hsi/hsi.c | 494 ++++++++++++++++++ + drivers/hsi/hsi_boardinfo.c | 62 +++ + drivers/hsi/hsi_core.h | 35 ++ + include/linux/Kbuild | 1 + + include/linux/hsi/Kbuild | 1 + + include/linux/hsi/hsi.h | 410 +++++++++++++++ + include/linux/hsi/hsi_char.h | 63 +++ + 16 files changed, 1932 insertions(+), 0 deletions(-) + create mode 100644 drivers/hsi/Kconfig + create mode 100644 drivers/hsi/Makefile + create mode 100644 drivers/hsi/clients/Kconfig + create mode 100644 drivers/hsi/clients/Makefile + create mode 100644 drivers/hsi/clients/hsi_char.c + create mode 100644 drivers/hsi/hsi.c + create mode 100644 drivers/hsi/hsi_boardinfo.c + create mode 100644 drivers/hsi/hsi_core.h + create mode 100644 include/linux/hsi/Kbuild + create mode 100644 include/linux/hsi/hsi.h + create mode 100644 include/linux/hsi/hsi_char.h +Merging driver-core/driver-core-next (175cad2 Drivers: hv: Get rid of an unnecessary check in hv.c) +$ git merge driver-core/driver-core-next +Auto-merging include/linux/i2c.h +Auto-merging include/linux/device.h +Auto-merging drivers/uwb/i1480/dfu/usb.c +Auto-merging drivers/usb/storage/ene_ub6250.c +Auto-merging drivers/usb/misc/usbled.c +Auto-merging drivers/usb/host/hwa-hc.c +Auto-merging drivers/staging/media/lirc/lirc_imon.c +Auto-merging drivers/staging/media/go7007/go7007-usb.c +Auto-merging drivers/nfc/pn533.c +Auto-merging drivers/net/wireless/rtlwifi/rtl8192cu/sw.c +Auto-merging drivers/net/wireless/rt2x00/rt2800usb.c +Auto-merging drivers/net/wireless/rndis_wlan.c +Auto-merging drivers/net/usb/smsc95xx.c +Auto-merging drivers/net/usb/smsc75xx.c +Auto-merging drivers/net/usb/lg-vl600.c +Auto-merging drivers/net/usb/cdc_ncm.c +Auto-merging drivers/net/usb/cdc_ether.c +Auto-merging drivers/net/usb/cdc-phonet.c +Auto-merging drivers/net/usb/asix.c +Auto-merging drivers/net/irda/stir4200.c +Auto-merging drivers/media/video/tm6000/tm6000-cards.c +Auto-merging drivers/media/video/gspca/zc3xx.c +Auto-merging drivers/media/video/gspca/xirlink_cit.c +Auto-merging drivers/media/video/gspca/topro.c +Auto-merging drivers/media/video/gspca/spca561.c +Auto-merging drivers/media/video/gspca/sonixj.c +Auto-merging drivers/media/video/gspca/se401.c +Auto-merging drivers/media/video/gspca/pac207.c +Auto-merging drivers/media/video/gspca/ov519.c +Auto-merging drivers/media/video/gspca/nw80x.c +Auto-merging drivers/media/video/gspca/mars.c +Auto-merging drivers/media/video/gspca/konica.c +Auto-merging drivers/media/video/gspca/gl860/gl860.c +Auto-merging drivers/media/video/gspca/benq.c +Auto-merging drivers/media/video/em28xx/em28xx-cards.c +Auto-merging drivers/media/rc/redrat3.c +Auto-merging drivers/media/rc/ati_remote.c +Auto-merging drivers/media/dvb/dvb-usb/ttusb2.c +Auto-merging drivers/media/dvb/dvb-usb/it913x.c +Auto-merging drivers/media/dvb/dvb-usb/dw2102.c +Auto-merging drivers/media/dvb/dvb-usb/anysee.c +Auto-merging drivers/media/dvb/dvb-usb/af9015.c +Auto-merging drivers/input/touchscreen/usbtouchscreen.c +Auto-merging drivers/input/tablet/wacom_sys.c +Auto-merging drivers/input/tablet/aiptek.c +Auto-merging drivers/input/misc/ati_remote2.c +Auto-merging drivers/hid/usbhid/usbkbd.c +Auto-merging drivers/bluetooth/btusb.c +Auto-merging drivers/bluetooth/bfusb.c +Auto-merging drivers/bluetooth/ath3k.c +Auto-merging drivers/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/HOWTO | 4 +- + Documentation/development-process/5.Posting | 8 +- + Documentation/driver-model/devres.txt | 1 + + Documentation/filesystems/debugfs.txt | 32 +++++++- + MAINTAINERS | 2 +- + drivers/Kconfig | 4 +- + drivers/base/Makefile | 4 +- + drivers/base/devtmpfs.c | 3 +- + drivers/base/platform.c | 2 +- + drivers/bluetooth/ath3k.c | 14 +--- + drivers/bluetooth/bcm203x.c | 21 +----- + drivers/bluetooth/bfusb.c | 21 +----- + drivers/bluetooth/bpa10x.c | 15 +--- + drivers/bluetooth/btusb.c | 15 +--- + drivers/firmware/google/gsmi.c | 3 +- + drivers/hid/usbhid/usbkbd.c | 17 +---- + drivers/hid/usbhid/usbmouse.c | 17 +---- + drivers/hv/Kconfig | 4 +- + drivers/hv/channel_mgmt.c | 12 +++ + drivers/hv/hv.c | 8 +- + drivers/hv/hyperv_vmbus.h | 1 + + drivers/hv/vmbus_drv.c | 29 +++++++- + drivers/i2c/busses/i2c-diolan-u2c.c | 15 +--- + drivers/i2c/busses/i2c-tiny-usb.c | 15 +--- + drivers/input/joystick/xpad.c | 13 +--- + drivers/input/misc/ati_remote2.c | 21 +----- + drivers/input/misc/keyspan_remote.c | 21 +----- + drivers/input/misc/powermate.c | 13 +--- + drivers/input/misc/yealink.c | 17 +---- + drivers/input/mouse/appletouch.c | 13 +--- + drivers/input/mouse/bcm5974.c | 14 +--- + drivers/input/tablet/acecad.c | 17 +---- + drivers/input/tablet/aiptek.c | 19 +---- + drivers/input/tablet/gtco.c | 28 +------ + drivers/input/tablet/hanwang.c | 13 +--- + drivers/input/tablet/kbtab.c | 20 +----- + drivers/input/tablet/wacom_sys.c | 19 +---- + drivers/input/touchscreen/usbtouchscreen.c | 13 +--- + drivers/isdn/hardware/mISDN/hfcsusb.c | 28 +------ + drivers/media/dvb/b2c2/flexcop-usb.c | 20 +----- + drivers/media/dvb/dvb-usb/a800.c | 21 +----- + drivers/media/dvb/dvb-usb/af9015.c | 20 +----- + drivers/media/dvb/dvb-usb/anysee.c | 21 +----- + drivers/media/dvb/dvb-usb/au6610.c | 21 +----- + drivers/media/dvb/dvb-usb/az6027.c | 23 +----- + drivers/media/dvb/dvb-usb/ce6230.c | 22 +----- + drivers/media/dvb/dvb-usb/cinergyT2-core.c | 20 +----- + drivers/media/dvb/dvb-usb/cxusb.c | 21 +----- + drivers/media/dvb/dvb-usb/dib0700_core.c | 22 +----- + drivers/media/dvb/dvb-usb/dibusb-mb.c | 21 +----- + drivers/media/dvb/dvb-usb/dibusb-mc.c | 21 +----- + drivers/media/dvb/dvb-usb/digitv.c | 21 +----- + drivers/media/dvb/dvb-usb/dtt200u.c | 21 +----- + drivers/media/dvb/dvb-usb/dtv5100.c | 21 +----- + drivers/media/dvb/dvb-usb/dw2102.c | 17 +---- + drivers/media/dvb/dvb-usb/ec168.c | 22 +----- + drivers/media/dvb/dvb-usb/friio.c | 23 +----- + drivers/media/dvb/dvb-usb/gl861.c | 21 +----- + drivers/media/dvb/dvb-usb/gp8psk.c | 21 +----- + drivers/media/dvb/dvb-usb/it913x.c | 21 +----- + drivers/media/dvb/dvb-usb/lmedm04.c | 21 +----- + drivers/media/dvb/dvb-usb/m920x.c | 22 +----- + drivers/media/dvb/dvb-usb/mxl111sf.c | 19 +---- + drivers/media/dvb/dvb-usb/nova-t-usb2.c | 21 +----- + drivers/media/dvb/dvb-usb/opera1.c | 17 +---- + drivers/media/dvb/dvb-usb/pctv452e.c | 17 +---- + drivers/media/dvb/dvb-usb/technisat-usb2.c | 20 +----- + drivers/media/dvb/dvb-usb/ttusb2.c | 21 +----- + drivers/media/dvb/dvb-usb/umt-010.c | 21 +----- + drivers/media/dvb/dvb-usb/vp702x.c | 21 +----- + drivers/media/dvb/dvb-usb/vp7045.c | 21 +----- + drivers/media/dvb/siano/smsusb.c | 21 +----- + drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 21 +----- + drivers/media/dvb/ttusb-dec/ttusb_dec.c | 21 +----- + drivers/media/radio/dsbr100.c | 16 +---- + drivers/media/radio/radio-mr800.c | 23 +----- + drivers/media/radio/si470x/radio-si470x-usb.c | 28 +------ + drivers/media/rc/ati_remote.c | 33 +------- + drivers/media/rc/imon.c | 21 +----- + drivers/media/rc/mceusb.c | 20 +----- + drivers/media/rc/redrat3.c | 20 +----- + drivers/media/rc/streamzap.c | 28 +------ + drivers/media/video/cx231xx/cx231xx-cards.c | 24 +----- + drivers/media/video/em28xx/em28xx-cards.c | 24 +----- + drivers/media/video/et61x251/et61x251_core.c | 25 +------ + drivers/media/video/gspca/benq.c | 13 +--- + drivers/media/video/gspca/conex.c | 13 +--- + drivers/media/video/gspca/cpia1.c | 13 +--- + drivers/media/video/gspca/etoms.c | 14 +--- + drivers/media/video/gspca/finepix.c | 14 +--- + drivers/media/video/gspca/gl860/gl860.c | 17 +---- + drivers/media/video/gspca/jeilinj.c | 14 +--- + drivers/media/video/gspca/kinect.c | 14 +--- + drivers/media/video/gspca/konica.c | 13 +--- + drivers/media/video/gspca/m5602/m5602_core.c | 14 +--- + drivers/media/video/gspca/mars.c | 13 +--- + drivers/media/video/gspca/mr97310a.c | 13 +--- + drivers/media/video/gspca/nw80x.c | 13 +--- + drivers/media/video/gspca/ov519.c | 13 +--- + drivers/media/video/gspca/ov534.c | 14 +--- + drivers/media/video/gspca/ov534_9.c | 14 +--- + drivers/media/video/gspca/pac207.c | 13 +--- + drivers/media/video/gspca/pac7302.c | 13 +--- + drivers/media/video/gspca/pac7311.c | 13 +--- + drivers/media/video/gspca/se401.c | 13 +--- + drivers/media/video/gspca/sn9c2028.c | 14 +--- + drivers/media/video/gspca/sn9c20x.c | 13 +--- + drivers/media/video/gspca/sonixb.c | 13 +--- + drivers/media/video/gspca/sonixj.c | 13 +--- + drivers/media/video/gspca/spca1528.c | 13 +--- + drivers/media/video/gspca/spca500.c | 13 +--- + drivers/media/video/gspca/spca501.c | 13 +--- + drivers/media/video/gspca/spca505.c | 13 +--- + drivers/media/video/gspca/spca506.c | 19 +---- + drivers/media/video/gspca/spca508.c | 13 +--- + drivers/media/video/gspca/spca561.c | 13 +--- + drivers/media/video/gspca/sq905.c | 14 +--- + drivers/media/video/gspca/sq905c.c | 14 +--- + drivers/media/video/gspca/sq930x.c | 13 +--- + drivers/media/video/gspca/stk014.c | 13 +--- + drivers/media/video/gspca/stv0680.c | 13 +--- + drivers/media/video/gspca/stv06xx/stv06xx.c | 13 +--- + drivers/media/video/gspca/sunplus.c | 13 +--- + drivers/media/video/gspca/t613.c | 13 +--- + drivers/media/video/gspca/topro.c | 13 +--- + drivers/media/video/gspca/tv8532.c | 14 +--- + drivers/media/video/gspca/vc032x.c | 13 +--- + drivers/media/video/gspca/vicam.c | 14 +--- + drivers/media/video/gspca/xirlink_cit.c | 13 +--- + drivers/media/video/gspca/zc3xx.c | 13 +--- + drivers/media/video/hdpvr/hdpvr-core.c | 21 +----- + drivers/media/video/s2255drv.c | 20 +----- + drivers/media/video/sn9c102/sn9c102_core.c | 25 +------ + drivers/media/video/stk-webcam.c | 23 +----- + drivers/media/video/tm6000/tm6000-cards.c | 26 +------ + drivers/media/video/zr364xx.c | 23 +----- + drivers/mmc/host/ushc.c | 12 +--- + drivers/mtd/nand/alauda.c | 13 +--- + drivers/net/can/usb/ems_usb.c | 26 +------ + drivers/net/can/usb/esd_usb2.c | 23 +----- + drivers/net/irda/irda-usb.c | 35 +-------- + drivers/net/irda/kingsun-sir.c | 19 +---- + drivers/net/irda/ks959-sir.c | 21 +----- + drivers/net/irda/ksdazzle-sir.c | 21 +----- + drivers/net/irda/mcs7780.c | 23 +----- + drivers/net/irda/stir4200.c | 19 +---- + drivers/net/usb/asix.c | 12 +--- + drivers/net/usb/catc.c | 17 +---- + drivers/net/usb/cdc-phonet.c | 13 +--- + drivers/net/usb/cdc_eem.c | 13 +--- + drivers/net/usb/cdc_ether.c | 19 +---- + drivers/net/usb/cdc_ncm.c | 15 +--- + drivers/net/usb/cdc_subset.c | 12 +--- + drivers/net/usb/cx82310_eth.c | 12 +--- + drivers/net/usb/dm9601.c | 13 +--- + drivers/net/usb/gl620a.c | 12 +--- + drivers/net/usb/int51x1.c | 12 +--- + drivers/net/usb/ipheth.c | 20 +----- + drivers/net/usb/kalmia.c | 12 +--- + drivers/net/usb/kaweth.c | 30 +------- + drivers/net/usb/lg-vl600.c | 12 +--- + drivers/net/usb/mcs7830.c | 12 +--- + drivers/net/usb/net1080.c | 12 +--- + drivers/net/usb/plusb.c | 12 +--- + drivers/net/usb/rndis_host.c | 12 +--- + drivers/net/usb/rtl8150.c | 15 +--- + drivers/net/usb/sierra_net.c | 19 +---- + drivers/net/usb/smsc75xx.c | 12 +--- + drivers/net/usb/smsc95xx.c | 12 +--- + drivers/net/usb/zaurus.c | 12 +--- + drivers/net/wireless/ath/carl9170/usb.c | 13 +--- + drivers/net/wireless/libertas/if_usb.c | 24 +----- + drivers/net/wireless/libertas_tf/if_usb.c | 22 +----- + drivers/net/wireless/orinoco/orinoco_usb.c | 27 +------ + drivers/net/wireless/p54/p54usb.c | 13 +--- + drivers/net/wireless/rndis_wlan.c | 12 +--- + drivers/net/wireless/rt2x00/rt2500usb.c | 13 +--- + drivers/net/wireless/rt2x00/rt2800usb.c | 13 +--- + drivers/net/wireless/rt2x00/rt73usb.c | 13 +--- + drivers/net/wireless/rtl818x/rtl8187/dev.c | 13 +--- + drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 13 +--- + drivers/net/wireless/zd1201.c | 13 +--- + drivers/nfc/pn533.c | 19 +---- + drivers/staging/frontier/alphatrack.c | 28 +------ + drivers/staging/frontier/tranzport.c | 27 +------ + drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 22 +----- + drivers/staging/iio/accel/adis16201_core.c | 13 +--- + drivers/staging/iio/accel/adis16203_core.c | 13 +--- + drivers/staging/iio/accel/adis16204_core.c | 13 +--- + drivers/staging/iio/accel/adis16209_core.c | 13 +--- + drivers/staging/iio/accel/adis16220_core.c | 13 +--- + drivers/staging/iio/accel/adis16240_core.c | 13 +--- + drivers/staging/iio/accel/kxsd9.c | 13 +--- + drivers/staging/iio/accel/lis3l02dq_core.c | 13 +--- + drivers/staging/iio/accel/sca3000_core.c | 13 +--- + drivers/staging/iio/adc/ad7192.c | 13 +--- + drivers/staging/iio/adc/ad7280a.c | 13 +--- + drivers/staging/iio/adc/ad7291.c | 14 +--- + drivers/staging/iio/adc/ad7298_core.c | 13 +--- + drivers/staging/iio/adc/ad7476_core.c | 13 +--- + drivers/staging/iio/adc/ad7606_spi.c | 13 +--- + drivers/staging/iio/adc/ad7780.c | 13 +--- + drivers/staging/iio/adc/ad7793.c | 13 +--- + drivers/staging/iio/adc/ad7816.c | 14 +--- + drivers/staging/iio/adc/ad7887_core.c | 13 +--- + drivers/staging/iio/adc/ad799x_core.c | 14 +--- + drivers/staging/iio/adc/adt7310.c | 14 +--- + drivers/staging/iio/adc/adt7410.c | 14 +--- + drivers/staging/iio/adc/max1363_core.c | 14 +--- + drivers/staging/iio/addac/adt7316-i2c.c | 14 +--- + drivers/staging/iio/addac/adt7316-spi.c | 14 +--- + drivers/staging/iio/cdc/ad7150.c | 14 +--- + drivers/staging/iio/cdc/ad7152.c | 14 +--- + drivers/staging/iio/cdc/ad7746.c | 14 +--- + drivers/staging/iio/dac/ad5064.c | 13 +--- + drivers/staging/iio/dac/ad5360.c | 13 +--- + drivers/staging/iio/dac/ad5446.c | 13 +--- + drivers/staging/iio/dac/ad5504.c | 13 +--- + drivers/staging/iio/dac/ad5624r_spi.c | 13 +--- + drivers/staging/iio/dac/ad5686.c | 13 +--- + drivers/staging/iio/dac/ad5791.c | 13 +--- + drivers/staging/iio/dac/max517.c | 14 +--- + drivers/staging/iio/dds/ad5930.c | 13 +--- + drivers/staging/iio/dds/ad9832.c | 13 +--- + drivers/staging/iio/dds/ad9834.c | 13 +--- + drivers/staging/iio/dds/ad9850.c | 13 +--- + drivers/staging/iio/dds/ad9852.c | 13 +--- + drivers/staging/iio/dds/ad9910.c | 13 +--- + drivers/staging/iio/dds/ad9951.c | 13 +--- + drivers/staging/iio/gyro/adis16080_core.c | 13 +--- + drivers/staging/iio/gyro/adis16130_core.c | 13 +--- + drivers/staging/iio/gyro/adis16260_core.c | 13 +--- + drivers/staging/iio/gyro/adxrs450_core.c | 13 +--- + drivers/staging/iio/impedance-analyzer/ad5933.c | 13 +--- + drivers/staging/iio/imu/adis16400_core.c | 13 +--- + drivers/staging/iio/light/isl29018.c | 14 +--- + drivers/staging/iio/light/tsl2563.c | 14 +--- + drivers/staging/iio/light/tsl2583.c | 14 +--- + drivers/staging/iio/magnetometer/ak8975.c | 14 +--- + drivers/staging/iio/magnetometer/hmc5843.c | 14 +--- + drivers/staging/iio/meter/ade7753.c | 13 +--- + drivers/staging/iio/meter/ade7754.c | 13 +--- + drivers/staging/iio/meter/ade7758_core.c | 13 +--- + drivers/staging/iio/meter/ade7759.c | 13 +--- + drivers/staging/iio/meter/ade7854-i2c.c | 14 +--- + drivers/staging/iio/meter/ade7854-spi.c | 13 +--- + drivers/staging/iio/resolver/ad2s1200.c | 13 +--- + drivers/staging/iio/resolver/ad2s1210.c | 13 +--- + drivers/staging/iio/resolver/ad2s90.c | 13 +--- + drivers/staging/keucr/usb.c | 24 +----- + drivers/staging/media/go7007/go7007-usb.c | 15 +--- + drivers/staging/media/lirc/lirc_igorplugusb.c | 21 +----- + drivers/staging/media/lirc/lirc_imon.c | 24 +----- + drivers/staging/media/lirc/lirc_sasem.c | 25 +------ + drivers/staging/media/lirc/lirc_ttusbir.c | 22 +----- + drivers/staging/rts5139/rts51x.c | 32 +------- + drivers/staging/vt6656/main_usb.c | 14 +--- + drivers/staging/winbond/wbusb.c | 13 +--- + drivers/staging/wlan-ng/prism2usb.c | 14 +--- + drivers/uio/uio_pdrv.c | 12 +--- + drivers/uio/uio_pdrv_genirq.c | 13 +--- + drivers/uio/uio_pruss.c | 14 +--- + drivers/usb/atm/cxacru.c | 13 +--- + drivers/usb/atm/speedtch.c | 17 +---- + drivers/usb/atm/ueagle-atm.c | 31 +------- + drivers/usb/class/cdc-wdm.c | 19 +---- + drivers/usb/class/usblp.c | 13 +--- + drivers/usb/class/usbtmc.c | 17 +---- + drivers/usb/dwc3/debugfs.c | 16 +--- + drivers/usb/host/hwa-hc.c | 13 +--- + drivers/usb/image/microtek.c | 14 +--- + drivers/usb/misc/adutux.c | 35 +-------- + drivers/usb/misc/cypress_cy7c63.c | 22 +----- + drivers/usb/misc/cytherm.c | 26 +------ + drivers/usb/misc/emi26.c | 13 +--- + drivers/usb/misc/emi62.c | 17 +---- + drivers/usb/misc/idmouse.c | 24 +----- + drivers/usb/misc/iowarrior.c | 13 +--- + drivers/usb/misc/isight_firmware.c | 13 +--- + drivers/usb/misc/ldusb.c | 27 +------ + drivers/usb/misc/legousbtower.c | 46 +---------- + drivers/usb/misc/rio500.c | 28 +------ + drivers/usb/misc/trancevibrator.c | 21 +----- + drivers/usb/misc/usblcd.c | 20 +----- + drivers/usb/misc/usbled.c | 18 +---- + drivers/usb/misc/usbsevseg.c | 18 +---- + drivers/usb/misc/yurex.c | 22 +----- + drivers/usb/storage/alauda.c | 13 +--- + drivers/usb/storage/cypress_atacb.c | 13 +--- + drivers/usb/storage/datafab.c | 13 +--- + drivers/usb/storage/ene_ub6250.c | 13 +--- + drivers/usb/storage/freecom.c | 13 +--- + drivers/usb/storage/isd200.c | 13 +--- + drivers/usb/storage/jumpshot.c | 13 +--- + drivers/usb/storage/karma.c | 13 +--- + drivers/usb/storage/onetouch.c | 13 +--- + drivers/usb/storage/realtek_cr.c | 13 +--- + drivers/usb/storage/sddr09.c | 13 +--- + drivers/usb/storage/sddr55.c | 13 +--- + drivers/usb/storage/shuttle_usbat.c | 13 +--- + drivers/usb/storage/uas.c | 13 +--- + drivers/usb/usb-skeleton.c | 21 +----- + drivers/usb/wusbcore/cbaf.c | 12 +--- + drivers/uwb/hwa-rc.c | 12 +--- + drivers/uwb/i1480/dfu/usb.c | 20 +----- + drivers/video/smscufx.c | 19 +---- + drivers/video/udlfb.c | 19 +---- + drivers/w1/masters/ds2490.c | 21 +----- + drivers/w1/slaves/w1_therm.c | 36 +++++++- + drivers/w1/w1.c | 10 +++ + drivers/watchdog/pcwd_usb.c | 35 +-------- + fs/debugfs/file.c | 91 +++++++++++++++++++++ + include/linux/debugfs.h | 26 ++++++ + include/linux/device.h | 24 ++++++ + include/linux/i2c.h | 13 +++ + include/linux/platform_device.h | 14 +--- + include/linux/spi/spi.h | 11 +++ + include/linux/usb.h | 12 +++ + lib/devres.c | 55 ++++++++++++- + lib/kobject_uevent.c | 3 + + sound/usb/6fire/chip.c | 15 +--- + sound/usb/caiaq/device.c | 13 +--- + sound/usb/misc/ua101.c | 14 +--- + sound/usb/usx2y/us122l.c | 14 +--- + sound/usb/usx2y/usbusx2y.c | 13 +--- + 325 files changed, 679 insertions(+), 4729 deletions(-) +Merging tty/tty-next (9deaa53 serial: add irq handler for Freescale 16550 errata.) +$ git merge tty/tty-next +Resolved 'drivers/tty/serial/Kconfig' using previous resolution. +Resolved 'drivers/tty/serial/Makefile' using previous resolution. +Auto-merging include/linux/serial_core.h +Auto-merging drivers/tty/serial/pch_uart.c +Auto-merging drivers/tty/serial/Makefile +CONFLICT (content): Merge conflict in drivers/tty/serial/Makefile +Auto-merging drivers/tty/serial/Kconfig +CONFLICT (content): Merge conflict in drivers/tty/serial/Kconfig +Auto-merging arch/x86/kernel/early_printk.c +Auto-merging arch/x86/include/asm/mrst.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 70b3fb6] Merge remote-tracking branch 'tty/tty-next' +$ git diff -M --stat --summary HEAD^.. + arch/powerpc/kernel/legacy_serial.c | 3 + + arch/x86/include/asm/mrst.h | 2 +- + arch/x86/kernel/early_printk.c | 2 +- + arch/x86/platform/mrst/early_printk_mrst.c | 16 +- + drivers/parport/parport_ax88796.c | 13 +- + drivers/parport/parport_sunbpp.c | 13 +- + drivers/tty/n_hdlc.c | 6 +- + drivers/tty/n_tty.c | 8 +- + drivers/tty/pty.c | 26 +- + drivers/tty/serial/8250.c | 98 ++--- + drivers/tty/serial/8250.h | 26 + + drivers/tty/serial/8250_dw.c | 12 +- + drivers/tty/serial/8250_fsl.c | 63 +++ + drivers/tty/serial/8250_pci.c | 31 ++- + drivers/tty/serial/Kconfig | 38 ++- + drivers/tty/serial/Makefile | 2 + + drivers/tty/serial/atmel_serial.c | 7 +- + drivers/tty/serial/bfin_sport_uart.c | 22 +- + drivers/tty/serial/bfin_sport_uart.h | 5 +- + drivers/tty/serial/bfin_uart.c | 47 +-- + drivers/tty/serial/ifx6x60.c | 1 - + drivers/tty/serial/imx.c | 2 +- + drivers/tty/serial/max3100.c | 1 - + drivers/tty/serial/max3107-aava.c | 1 - + drivers/tty/serial/max3107.c | 1 - + drivers/tty/serial/mfd.c | 18 +- + drivers/tty/serial/mrst_max3110.c | 1 - + drivers/tty/serial/msm_serial_hs.c | 23 +- + drivers/tty/serial/mxs-auart.c | 5 +- + drivers/tty/serial/omap-serial.c | 2 +- + drivers/tty/serial/pch_uart.c | 160 ++++++- + drivers/tty/serial/sc26xx.c | 14 +- + drivers/tty/serial/serial_core.c | 323 +++++++----- + drivers/tty/serial/serial_cs.c | 8 +- + drivers/tty/serial/sirfsoc_uart.c | 783 ++++++++++++++++++++++++++++ + drivers/tty/serial/sirfsoc_uart.h | 185 +++++++ + drivers/tty/serial/timbuart.c | 15 +- + drivers/tty/serial/vr41xx_siu.c | 13 +- + drivers/tty/tty_io.c | 309 +++++++----- + drivers/tty/tty_ldisc.c | 22 +- + include/linux/serial_8250.h | 5 + + include/linux/serial_core.h | 100 +--- + 42 files changed, 1810 insertions(+), 622 deletions(-) + create mode 100644 drivers/tty/serial/8250_fsl.c + create mode 100644 drivers/tty/serial/sirfsoc_uart.c + create mode 100644 drivers/tty/serial/sirfsoc_uart.h +Merging usb/usb-next (a1016ce Merge branch 'for-next/musb' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next) +$ git merge usb/usb-next +Auto-merging include/linux/usb.h +Auto-merging drivers/usb/storage/shuttle_usbat.c +Auto-merging drivers/usb/storage/sddr55.c +Auto-merging drivers/usb/storage/sddr09.c +Auto-merging drivers/usb/storage/realtek_cr.c +Auto-merging drivers/usb/storage/onetouch.c +Auto-merging drivers/usb/storage/karma.c +Auto-merging drivers/usb/storage/jumpshot.c +Auto-merging drivers/usb/storage/isd200.c +Auto-merging drivers/usb/storage/freecom.c +Auto-merging drivers/usb/storage/ene_ub6250.c +Auto-merging drivers/usb/storage/datafab.c +Auto-merging drivers/usb/storage/cypress_atacb.c +Auto-merging drivers/usb/storage/alauda.c +Removing drivers/usb/serial/ChangeLog.history +Auto-merging drivers/usb/renesas_usbhs/mod_host.c +Auto-merging drivers/usb/otg/fsl_otg.c +Auto-merging drivers/usb/musb/ux500_dma.c +Auto-merging drivers/usb/misc/isight_firmware.c +Auto-merging drivers/usb/host/ohci-au1xxx.c +Auto-merging drivers/usb/host/imx21-hcd.c +Auto-merging drivers/usb/host/hwa-hc.c +Auto-merging drivers/usb/gadget/Kconfig +Auto-merging drivers/usb/dwc3/debugfs.c +Auto-merging drivers/usb/class/cdc-acm.c +Auto-merging arch/arm/mach-omap2/board-n8x0.c +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-usb | 25 + + Documentation/kernel-parameters.txt | 4 + + arch/arm/mach-omap2/board-n8x0.c | 2 +- + drivers/hv/hv_kvp.c | 10 +- + drivers/usb/Makefile | 3 +- + drivers/usb/c67x00/c67x00-drv.c | 15 +- + drivers/usb/c67x00/c67x00-hcd.c | 1 - + drivers/usb/class/cdc-acm.c | 334 ++++++++------ + drivers/usb/class/cdc-acm.h | 1 + + drivers/usb/core/devio.c | 186 ++++++--- + drivers/usb/core/driver.c | 8 +- + drivers/usb/core/hcd-pci.c | 4 - + drivers/usb/core/hcd.c | 31 +- + drivers/usb/core/hub.c | 89 ++-- + drivers/usb/core/usb.h | 14 - + drivers/usb/dwc3/Kconfig | 5 +- + drivers/usb/dwc3/Makefile | 6 +- + drivers/usb/dwc3/core.c | 209 ++++++++-- + drivers/usb/dwc3/core.h | 62 +++- + drivers/usb/dwc3/debugfs.c | 83 ++++- + drivers/usb/dwc3/dwc3-omap.c | 43 +- + drivers/usb/dwc3/dwc3-pci.c | 49 +-- + drivers/usb/dwc3/ep0.c | 160 +++++--- + drivers/usb/dwc3/gadget.c | 197 +++++++--- + drivers/usb/dwc3/gadget.h | 29 +-- + drivers/usb/dwc3/host.c | 102 +++++ + drivers/usb/dwc3/io.h | 2 +- + drivers/usb/gadget/Kconfig | 13 +- + drivers/usb/gadget/fsl_qe_udc.c | 15 +- + drivers/usb/gadget/mv_udc_core.c | 19 +- + drivers/usb/gadget/s3c-hsotg.c | 13 +- + drivers/usb/gadget/s3c-hsudc.c | 15 +- + drivers/usb/gadget/usbstring.c | 73 +--- + drivers/usb/host/ehci-au1xxx.c | 1 + + drivers/usb/host/ehci-hcd.c | 64 +++- + drivers/usb/host/ehci-octeon.c | 2 + + drivers/usb/host/ehci-omap.c | 2 + + drivers/usb/host/ehci-ps3.c | 30 ++ + drivers/usb/host/ehci-pxa168.c | 2 +- + drivers/usb/host/ehci-q.c | 13 +- + drivers/usb/host/ehci-s5p.c | 4 +- + drivers/usb/host/ehci-vt8500.c | 2 + + drivers/usb/host/ehci-w90x900.c | 2 + + drivers/usb/host/ehci-xls.c | 2 +- + drivers/usb/host/fhci-hcd.c | 12 +- + drivers/usb/host/fsl-mph-dr-of.c | 12 +- + drivers/usb/host/hwa-hc.c | 1 - + drivers/usb/host/imx21-hcd.c | 13 +- + drivers/usb/host/isp1760-hcd.c | 74 ++-- + drivers/usb/host/isp1760-if.c | 6 +- + drivers/usb/host/ohci-au1xxx.c | 5 +- + drivers/usb/host/ohci-dbg.c | 18 +- + drivers/usb/host/ohci-ep93xx.c | 2 - + drivers/usb/host/ohci-hcd.c | 28 +- + drivers/usb/host/ohci-hub.c | 7 +- + drivers/usb/host/ohci-omap.c | 1 - + drivers/usb/host/ohci-pci.c | 5 +- + drivers/usb/host/ohci-pxa27x.c | 2 - + drivers/usb/host/ohci-q.c | 8 +- + drivers/usb/host/ohci-s3c2410.c | 55 +++- + drivers/usb/host/ohci-sh.c | 1 - + drivers/usb/host/ohci-sm501.c | 1 - + drivers/usb/host/ohci-spear.c | 1 - + drivers/usb/host/ohci-tmio.c | 3 - + drivers/usb/host/ohci-xls.c | 2 +- + drivers/usb/host/ohci.h | 14 +- + drivers/usb/host/oxu210hp-hcd.c | 19 +- + drivers/usb/host/uhci-q.c | 2 +- + drivers/usb/host/whci/qset.c | 4 +- + drivers/usb/host/xhci-hub.c | 18 +- + drivers/usb/host/xhci-ring.c | 16 +- + drivers/usb/misc/isight_firmware.c | 6 +- + drivers/usb/misc/usbtest.c | 1 - + drivers/usb/musb/Kconfig | 59 ++- + drivers/usb/musb/Makefile | 26 +- + drivers/usb/musb/musb_core.c | 6 +- + drivers/usb/musb/musb_core.h | 4 +- + drivers/usb/musb/musb_debugfs.c | 8 - + drivers/usb/musb/musb_gadget.c | 2 - + drivers/usb/musb/musb_gadget_ep0.c | 1 - + drivers/usb/musb/musb_io.h | 2 +- + drivers/usb/musb/omap2430.c | 24 +- + drivers/usb/musb/tusb6010.c | 1 + + drivers/usb/musb/ux500_dma.c | 39 +-- + drivers/usb/otg/fsl_otg.c | 13 +- + drivers/usb/renesas_usbhs/common.c | 13 +- + drivers/usb/renesas_usbhs/mod_host.c | 2 +- + drivers/usb/serial/ChangeLog.history | 730 ------------------------------- + drivers/usb/serial/belkin_sa.c | 43 -- + drivers/usb/serial/ch341.c | 3 +- + drivers/usb/serial/cp210x.c | 58 ++- + drivers/usb/serial/cyberjack.c | 33 +-- + drivers/usb/serial/cypress_m8.c | 29 -- + drivers/usb/serial/digi_acceleport.c | 227 +---------- + drivers/usb/serial/ftdi_sio.c | 4 + + drivers/usb/serial/garmin_gps.c | 9 - + drivers/usb/serial/generic.c | 83 +++- + drivers/usb/serial/io_edgeport.c | 3 - + drivers/usb/serial/io_ti.c | 28 +- + drivers/usb/serial/ipaq.c | 34 -- + drivers/usb/serial/ir-usb.c | 32 -- + drivers/usb/serial/iuu_phoenix.c | 3 +- + drivers/usb/serial/keyspan.c | 90 ---- + drivers/usb/serial/keyspan_pda.c | 66 +--- + drivers/usb/serial/kobil_sct.c | 25 - + drivers/usb/serial/mct_u232.c | 46 -- + drivers/usb/serial/mos7720.c | 18 - + drivers/usb/serial/mos7840.c | 4 - + drivers/usb/serial/omninet.c | 51 +-- + drivers/usb/serial/opticon.c | 1 - + drivers/usb/serial/oti6858.c | 23 +- + drivers/usb/serial/pl2303.c | 17 +- + drivers/usb/serial/sierra.c | 1 - + drivers/usb/serial/symbolserial.c | 1 - + drivers/usb/serial/ti_usb_3410_5052.c | 13 +- + drivers/usb/serial/usb-serial.c | 98 +++-- + drivers/usb/serial/usb_debug.c | 13 +- + drivers/usb/serial/whiteheat.c | 58 --- + drivers/usb/storage/alauda.c | 2 +- + drivers/usb/storage/cypress_atacb.c | 2 +- + drivers/usb/storage/datafab.c | 2 +- + drivers/usb/storage/ene_ub6250.c | 12 +- + drivers/usb/storage/freecom.c | 2 +- + drivers/usb/storage/isd200.c | 2 +- + drivers/usb/storage/jumpshot.c | 2 +- + drivers/usb/storage/karma.c | 2 +- + drivers/usb/storage/onetouch.c | 2 +- + drivers/usb/storage/realtek_cr.c | 14 +- + drivers/usb/storage/sddr09.c | 2 +- + drivers/usb/storage/sddr55.c | 2 +- + drivers/usb/storage/shuttle_usbat.c | 2 +- + drivers/usb/wusbcore/security.c | 2 +- + drivers/uwb/est.c | 2 +- + fs/fat/namei_vfat.c | 3 +- + fs/nls/nls_base.c | 73 ++- + include/linux/nls.h | 5 +- + include/linux/usb.h | 14 + + include/linux/usb/ch11.h | 31 +- + include/linux/usb/hcd.h | 2 - + include/linux/usb/serial.h | 11 +- + 140 files changed, 1780 insertions(+), 2738 deletions(-) + create mode 100644 drivers/usb/dwc3/host.c + delete mode 100644 drivers/usb/serial/ChangeLog.history +Merging staging/staging-next (6b02a17 staging: line6: fixed ALSA/PCM interaction) +$ git merge staging/staging-next +Removing drivers/staging/xgifb/vb_ext.h +Removing drivers/staging/xgifb/vb_ext.c +Auto-merging drivers/staging/vt6656/main_usb.c +Removing drivers/staging/spectra/spectraswconfig.h +Removing drivers/staging/spectra/nand_regs.h +Removing drivers/staging/spectra/lld_nand.h +Removing drivers/staging/spectra/lld_nand.c +Removing drivers/staging/spectra/lld_mtd.h +Removing drivers/staging/spectra/lld_mtd.c +Removing drivers/staging/spectra/lld_emu.h +Removing drivers/staging/spectra/lld_emu.c +Removing drivers/staging/spectra/lld_cdma.h +Removing drivers/staging/spectra/lld_cdma.c +Removing drivers/staging/spectra/lld.h +Removing drivers/staging/spectra/lld.c +Removing drivers/staging/spectra/flash.h +Removing drivers/staging/spectra/flash.c +Removing drivers/staging/spectra/ffsport.h +Removing drivers/staging/spectra/ffsport.c +Removing drivers/staging/spectra/ffsdefs.h +Removing drivers/staging/spectra/README +Removing drivers/staging/spectra/Makefile +Removing drivers/staging/spectra/Kconfig +Auto-merging drivers/staging/sep/sep_driver.c +Removing drivers/staging/rtl8192u/ieee80211/api.c +Removing drivers/staging/rtl8192e/rtl_debug.h +Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_ps.h +Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_pm.h +Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_pm.c +Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_pci.h +Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_debug.c +Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_core.h +Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_core.c +Auto-merging drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +Removing drivers/staging/intel_sst/intelmid_v2_control.c +Removing drivers/staging/intel_sst/intelmid_v1_control.c +Removing drivers/staging/intel_sst/intelmid_v0_control.c +Removing drivers/staging/intel_sst/intelmid_snd_control.h +Removing drivers/staging/intel_sst/intelmid_pvt.c +Removing drivers/staging/intel_sst/intelmid_msic_control.c +Removing drivers/staging/intel_sst/intelmid_ctrl.c +Removing drivers/staging/intel_sst/intelmid_adc_control.h +Removing drivers/staging/intel_sst/intelmid.h +Removing drivers/staging/intel_sst/intelmid.c +Removing drivers/staging/intel_sst/intel_sst_stream_encoded.c +Removing drivers/staging/intel_sst/intel_sst_stream.c +Removing drivers/staging/intel_sst/intel_sst_pvt.c +Removing drivers/staging/intel_sst/intel_sst_ipc.c +Removing drivers/staging/intel_sst/intel_sst_ioctl.h +Removing drivers/staging/intel_sst/intel_sst_fw_ipc.h +Removing drivers/staging/intel_sst/intel_sst_dsp.c +Removing drivers/staging/intel_sst/intel_sst_drv_interface.c +Removing drivers/staging/intel_sst/intel_sst_common.h +Removing drivers/staging/intel_sst/intel_sst_app_interface.c +Removing drivers/staging/intel_sst/intel_sst.h +Removing drivers/staging/intel_sst/intel_sst.c +Removing drivers/staging/intel_sst/TODO +Removing drivers/staging/intel_sst/Makefile +Removing drivers/staging/intel_sst/Kconfig +Auto-merging drivers/staging/iio/resolver/ad2s90.c +Auto-merging drivers/staging/iio/resolver/ad2s1210.c +Auto-merging drivers/staging/iio/resolver/ad2s1200.c +Auto-merging drivers/staging/iio/meter/ade7854-spi.c +Auto-merging drivers/staging/iio/meter/ade7759.c +Auto-merging drivers/staging/iio/meter/ade7758_core.c +Auto-merging drivers/staging/iio/meter/ade7754.c +Auto-merging drivers/staging/iio/meter/ade7753.c +Auto-merging drivers/staging/iio/magnetometer/hmc5843.c +Auto-merging drivers/staging/iio/magnetometer/ak8975.c +Auto-merging drivers/staging/iio/light/tsl2583.c +Auto-merging drivers/staging/iio/light/tsl2563.c +Auto-merging drivers/staging/iio/light/isl29018.c +Auto-merging drivers/staging/iio/industrialio-trigger.c +Auto-merging drivers/staging/iio/imu/adis16400_core.c +Auto-merging drivers/staging/iio/impedance-analyzer/ad5933.c +Auto-merging drivers/staging/iio/gyro/adxrs450_core.c +Auto-merging drivers/staging/iio/gyro/adis16260_core.c +Auto-merging drivers/staging/iio/gyro/adis16130_core.c +Auto-merging drivers/staging/iio/gyro/adis16080_core.c +Auto-merging drivers/staging/iio/dds/ad9951.c +Auto-merging drivers/staging/iio/dds/Resolved 'drivers/staging/hv/Kconfig' using previous resolution. +Resolved 'drivers/staging/hv/Makefile' using previous resolution. +Resolved 'drivers/staging/iio/adc/ad799x_core.c' using previous resolution. +ad9910.c +Auto-merging drivers/staging/iio/dds/ad9852.c +Auto-merging drivers/staging/iio/dds/ad9850.c +Auto-merging drivers/staging/iio/dds/ad9834.c +Auto-merging drivers/staging/iio/dds/ad9832.c +Auto-merging drivers/staging/iio/dds/ad5930.c +Auto-merging drivers/staging/iio/dac/ad5791.c +Auto-merging drivers/staging/iio/dac/ad5686.c +Auto-merging drivers/staging/iio/dac/ad5624r_spi.c +Auto-merging drivers/staging/iio/dac/ad5504.c +Auto-merging drivers/staging/iio/dac/ad5446.c +Auto-merging drivers/staging/iio/dac/ad5360.c +Auto-merging drivers/staging/iio/dac/ad5064.c +Removing drivers/staging/iio/chrdev.h +Auto-merging drivers/staging/iio/cdc/ad7746.c +Auto-merging drivers/staging/iio/cdc/ad7152.c +Auto-merging drivers/staging/iio/cdc/ad7150.c +Auto-merging drivers/staging/iio/buffer.h +Auto-merging drivers/staging/iio/addac/adt7316-spi.c +Auto-merging drivers/staging/iio/adc/max1363_core.c +Auto-merging drivers/staging/iio/adc/adt7410.c +Auto-merging drivers/staging/iio/adc/adt7310.c +Auto-merging drivers/staging/iio/adc/ad799x_core.c +CONFLICT (content): Merge conflict in drivers/staging/iio/adc/ad799x_core.c +Auto-merging drivers/staging/iio/adc/ad7887_core.c +Auto-merging drivers/staging/iio/adc/ad7816.c +Auto-merging drivers/staging/iio/adc/ad7793.c +Auto-merging drivers/staging/iio/adc/ad7780.c +Auto-merging drivers/staging/iio/adc/ad7606_spi.c +Auto-merging drivers/staging/iio/adc/ad7476_core.c +Auto-merging drivers/staging/iio/adc/ad7298_core.c +Auto-merging drivers/staging/iio/adc/ad7291.c +Auto-merging drivers/staging/iio/adc/ad7280a.c +Auto-merging drivers/staging/iio/adc/ad7192.c +Auto-merging drivers/staging/iio/accel/sca3000_core.c +Auto-merging drivers/staging/iio/accel/lis3l02dq_core.c +Auto-merging drivers/staging/iio/accel/kxsd9.c +Auto-merging drivers/staging/iio/accel/adis16240_core.c +Auto-merging drivers/staging/iio/accel/adis16220_core.c +Auto-merging drivers/staging/iio/accel/adis16209_core.c +Auto-merging drivers/staging/iio/accel/adis16204_core.c +Auto-merging drivers/staging/iio/accel/adis16203_core.c +Auto-merging drivers/staging/iio/accel/adis16201_core.c +Auto-merging drivers/staging/hv/Makefile +CONFLICT (content): Merge conflict in drivers/staging/hv/Makefile +Auto-merging drivers/staging/hv/Kconfig +CONFLICT (content): Merge conflict in drivers/staging/hv/Kconfig +Auto-merging drivers/staging/frontier/tranzport.c +Auto-merging drivers/staging/cxt1e1/libsbew.h +Auto-merging drivers/net/hyperv/rndis_filter.c +Auto-merging drivers/net/hyperv/netvsc_drv.c +Auto-merging drivers/net/hyperv/netvsc.c +Auto-merging drivers/net/hyperv/hyperv_net.h +Auto-merging drivers/net/Makefile +Auto-merging drivers/net/Kconfig +CONFLICT (rename/delete): drivers/hid/hid-hyperv.c deleted in staging/staging-next and renamed in HEAD. Version HEAD of drivers/hid/hid-hyperv.c left in tree. +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0067bb5] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/nvec/nvec_nvidia.txt | 9 + + MAINTAINERS | 7 + + drivers/net/Kconfig | 2 + + drivers/net/Makefile | 2 + + drivers/net/hyperv/Kconfig | 5 + + drivers/net/hyperv/Makefile | 3 + + drivers/{staging/hv => net/hyperv}/hyperv_net.h | 24 + + drivers/{staging/hv => net/hyperv}/netvsc.c | 27 +- + drivers/{staging/hv => net/hyperv}/netvsc_drv.c | 70 +- + drivers/{staging/hv => net/hyperv}/rndis_filter.c | 23 +- + drivers/staging/Kconfig | 8 +- + drivers/staging/Makefile | 4 +- + drivers/staging/android/Kconfig | 95 + + drivers/staging/android/Makefile | 6 + + drivers/staging/android/TODO | 10 + + drivers/staging/android/binder.c | 3600 ++++++++++++++++ + drivers/staging/android/binder.h | 330 ++ + drivers/staging/android/logger.c | 616 +++ + drivers/staging/android/logger.h | 49 + + drivers/staging/android/lowmemorykiller.c | 219 + + drivers/staging/android/ram_console.c | 443 ++ + drivers/staging/android/ram_console.h | 22 + + drivers/staging/android/timed_gpio.c | 176 + + drivers/staging/android/timed_gpio.h | 33 + + drivers/staging/android/timed_output.c | 123 + + drivers/staging/android/timed_output.h | 37 + + drivers/staging/asus_oled/asus_oled.c | 4 +- + drivers/staging/bcm/Bcmchar.c | 366 +- + drivers/staging/bcm/InterfaceDld.c | 12 +- + drivers/staging/bcm/InterfaceIdleMode.c | 33 +- + drivers/staging/bcm/InterfaceInit.c | 12 +- + drivers/staging/bcm/InterfaceMisc.c | 24 +- + drivers/staging/bcm/Misc.c | 32 +- + drivers/staging/bcm/hostmibs.c | 178 +- + drivers/staging/bcm/led_control.c | 1131 +++--- + drivers/staging/bcm/nvm.c | 95 +- + drivers/staging/comedi/comedi_fops.c | 62 +- + .../staging/comedi/drivers/addi-data/addi_common.c | 137 +- + drivers/staging/comedi/drivers/adl_pci7230.c | 10 +- + drivers/staging/comedi/drivers/adl_pci7296.c | 6 +- + drivers/staging/comedi/drivers/adl_pci7432.c | 6 +- + drivers/staging/comedi/drivers/adl_pci8164.c | 6 +- + drivers/staging/comedi/drivers/adl_pci9111.c | 6 +- + drivers/staging/comedi/drivers/adv_pci1710.c | 32 +- + drivers/staging/comedi/drivers/adv_pci_dio.c | 23 +- + drivers/staging/comedi/drivers/amplc_dio200.c | 9 +- + drivers/staging/comedi/drivers/amplc_pc236.c | 6 +- + drivers/staging/comedi/drivers/amplc_pc263.c | 6 +- + drivers/staging/comedi/drivers/amplc_pci224.c | 9 +- + drivers/staging/comedi/drivers/amplc_pci230.c | 9 +- + drivers/staging/comedi/drivers/cb_das16_cs.c | 20 +- + drivers/staging/comedi/drivers/cb_pcidas.c | 17 +- + drivers/staging/comedi/drivers/cb_pcidda.c | 18 +- + drivers/staging/comedi/drivers/cb_pcidio.c | 23 +- + drivers/staging/comedi/drivers/cb_pcimdas.c | 50 +- + drivers/staging/comedi/drivers/cb_pcimdda.c | 30 +- + drivers/staging/comedi/drivers/contec_pci_dio.c | 7 +- + drivers/staging/comedi/drivers/daqboard2000.c | 40 +- + drivers/staging/comedi/drivers/das08.c | 6 +- + drivers/staging/comedi/drivers/das08_cs.c | 8 +- + drivers/staging/comedi/drivers/das16m1.c | 37 +- + drivers/staging/comedi/drivers/das6402.c | 23 +- + drivers/staging/comedi/drivers/das800.c | 43 +- + drivers/staging/comedi/drivers/dt3000.c | 2 +- + drivers/staging/comedi/drivers/jr3_pci.c | 18 +- + drivers/staging/comedi/drivers/ke_counter.c | 6 +- + drivers/staging/comedi/drivers/me_daq.c | 9 +- + drivers/staging/comedi/drivers/ni_daq_dio24.c | 19 +- + drivers/staging/comedi/drivers/ni_labpc_cs.c | 2 +- + drivers/staging/comedi/drivers/ni_pcimio.c | 29 +- + drivers/staging/comedi/drivers/pcl816.c | 4 +- + drivers/staging/comedi/drivers/pcl818.c | 108 +- + drivers/staging/comedi/drivers/pcmmio.c | 26 +- + drivers/staging/comedi/drivers/pcmuio.c | 10 +- + drivers/staging/comedi/drivers/serial2002.c | 7 +- + drivers/staging/comedi/drivers/usbduxsigma.c | 16 +- + drivers/staging/cxt1e1/comet.h | 22 - + drivers/staging/cxt1e1/comet_tables.c | 24 - + drivers/staging/cxt1e1/comet_tables.h | 24 - + drivers/staging/cxt1e1/libsbew.h | 32 - + drivers/staging/cxt1e1/musycc.c | 49 - + drivers/staging/cxt1e1/musycc.h | 31 - + drivers/staging/cxt1e1/ossiRelease.c | 10 - + drivers/staging/cxt1e1/pmc93x6_eeprom.h | 21 - + drivers/staging/cxt1e1/pmcc4.h | 42 - + drivers/staging/cxt1e1/pmcc4_cpld.h | 33 - + drivers/staging/cxt1e1/pmcc4_defs.h | 14 - + drivers/staging/cxt1e1/pmcc4_drv.c | 70 - + drivers/staging/cxt1e1/pmcc4_ioctls.h | 16 - + drivers/staging/cxt1e1/sbe_bid.h | 14 - + drivers/staging/cxt1e1/sbe_promformat.h | 27 - + drivers/staging/cxt1e1/sbecom_inline_linux.h | 20 - + drivers/staging/cxt1e1/sbeproc.h | 20 - + drivers/staging/cxt1e1/sbew_ioc.h | 55 - + drivers/staging/et131x/et131x.c | 370 +- + drivers/staging/frontier/tranzport.c | 2 +- + drivers/staging/gma500/Kconfig | 2 +- + drivers/staging/hv/Kconfig | 6 - + drivers/staging/hv/Makefile | 2 - + drivers/staging/hv/TODO | 4 +- + drivers/staging/hv/storvsc_drv.c | 310 +- + drivers/staging/iio/Documentation/generic_buffer.c | 8 + + drivers/staging/iio/Documentation/iio_utils.h | 26 +- + drivers/staging/iio/Documentation/sysfs-bus-iio | 10 + + drivers/staging/iio/Kconfig | 1 - + drivers/staging/iio/accel/adis16201_core.c | 36 +- + drivers/staging/iio/accel/adis16201_ring.c | 14 +- + drivers/staging/iio/accel/adis16203_core.c | 24 +- + drivers/staging/iio/accel/adis16203_ring.c | 14 +- + drivers/staging/iio/accel/adis16204_core.c | 35 +- + drivers/staging/iio/accel/adis16204_ring.c | 14 +- + drivers/staging/iio/accel/adis16209_core.c | 32 +- + drivers/staging/iio/accel/adis16209_ring.c | 9 +- + drivers/staging/iio/accel/adis16220_core.c | 27 +- + drivers/staging/iio/accel/adis16240_core.c | 32 +- + drivers/staging/iio/accel/adis16240_ring.c | 9 +- + drivers/staging/iio/accel/kxsd9.c | 10 +- + drivers/staging/iio/accel/lis3l02dq.h | 12 - + drivers/staging/iio/accel/lis3l02dq_core.c | 35 +- + drivers/staging/iio/accel/lis3l02dq_ring.c | 61 +- + drivers/staging/iio/accel/sca3000_core.c | 24 +- + drivers/staging/iio/accel/sca3000_ring.c | 17 +- + drivers/staging/iio/adc/ad7192.c | 73 +- + drivers/staging/iio/adc/ad7280a.c | 28 +- + drivers/staging/iio/adc/ad7291.c | 39 +- + drivers/staging/iio/adc/ad7298.h | 5 - + drivers/staging/iio/adc/ad7298_core.c | 67 +- + drivers/staging/iio/adc/ad7298_ring.c | 45 +- + drivers/staging/iio/adc/ad7476.h | 5 - + drivers/staging/iio/adc/ad7476_core.c | 25 +- + drivers/staging/iio/adc/ad7476_ring.c | 31 +- + drivers/staging/iio/adc/ad7606.h | 1 - + drivers/staging/iio/adc/ad7606_core.c | 6 +- + drivers/staging/iio/adc/ad7606_par.c | 1 - + drivers/staging/iio/adc/ad7606_ring.c | 30 +- + drivers/staging/iio/adc/ad7606_spi.c | 3 +- + drivers/staging/iio/adc/ad7780.c | 8 +- + drivers/staging/iio/adc/ad7793.c | 89 +- + drivers/staging/iio/adc/ad7816.c | 2 +- + drivers/staging/iio/adc/ad7887.h | 5 - + drivers/staging/iio/adc/ad7887_core.c | 13 +- + drivers/staging/iio/adc/ad7887_ring.c | 46 +- + drivers/staging/iio/adc/ad799x.h | 6 - + drivers/staging/iio/adc/ad799x_core.c | 9 +- + drivers/staging/iio/adc/ad799x_ring.c | 47 +- + drivers/staging/iio/adc/adt7310.c | 3 +- + drivers/staging/iio/adc/adt7410.c | 1 + + drivers/staging/iio/adc/max1363.h | 14 +- + drivers/staging/iio/adc/max1363_core.c | 78 +- + drivers/staging/iio/adc/max1363_ring.c | 92 +- + drivers/staging/iio/addac/adt7316-spi.c | 1 - + drivers/staging/iio/addac/adt7316.c | 1 + + drivers/staging/iio/{buffer_generic.h => buffer.h} | 69 +- + drivers/staging/iio/cdc/ad7150.c | 8 +- + drivers/staging/iio/cdc/ad7152.c | 38 +- + drivers/staging/iio/cdc/ad7746.c | 50 +- + drivers/staging/iio/chrdev.h | 25 - + drivers/staging/iio/dac/Kconfig | 39 +- + drivers/staging/iio/dac/Makefile | 3 + + drivers/staging/iio/dac/ad5064.c | 6 +- + drivers/staging/iio/dac/ad5360.c | 24 +- + drivers/staging/iio/dac/ad5380.c | 676 +++ + drivers/staging/iio/dac/ad5421.c | 555 +++ + drivers/staging/iio/dac/ad5421.h | 32 + + drivers/staging/iio/dac/ad5446.c | 184 +- + drivers/staging/iio/dac/ad5446.h | 10 +- + drivers/staging/iio/dac/ad5504.c | 132 +- + drivers/staging/iio/dac/ad5504.h | 5 +- + drivers/staging/iio/dac/ad5624r.h | 4 +- + drivers/staging/iio/dac/ad5624r_spi.c | 127 +- + drivers/staging/iio/dac/ad5686.c | 5 +- + drivers/staging/iio/dac/ad5764.c | 393 ++ + drivers/staging/iio/dac/ad5791.c | 15 +- + drivers/staging/iio/dds/ad5930.c | 1 + + drivers/staging/iio/dds/ad9832.c | 5 +- + drivers/staging/iio/dds/ad9834.c | 7 +- + drivers/staging/iio/dds/ad9850.c | 1 + + drivers/staging/iio/dds/ad9852.c | 1 + + drivers/staging/iio/dds/ad9910.c | 1 + + drivers/staging/iio/dds/ad9951.c | 1 + + drivers/staging/iio/events.h | 103 + + drivers/staging/iio/gyro/adis16060_core.c | 8 +- + drivers/staging/iio/gyro/adis16080_core.c | 1 + + drivers/staging/iio/gyro/adis16130_core.c | 1 + + drivers/staging/iio/gyro/adis16260_core.c | 45 +- + drivers/staging/iio/gyro/adis16260_ring.c | 9 +- + drivers/staging/iio/gyro/adxrs450_core.c | 9 +- + drivers/staging/iio/iio.h | 141 +- + drivers/staging/iio/iio_core.h | 2 +- + drivers/staging/iio/iio_core_trigger.h | 3 +- + drivers/staging/iio/iio_dummy_evgen.c | 4 + + drivers/staging/iio/iio_simple_dummy.c | 49 +- + drivers/staging/iio/iio_simple_dummy_buffer.c | 12 +- + drivers/staging/iio/iio_simple_dummy_events.c | 1 + + drivers/staging/iio/impedance-analyzer/ad5933.c | 30 +- + drivers/staging/iio/imu/adis16400.h | 2 + + drivers/staging/iio/imu/adis16400_core.c | 269 +- + drivers/staging/iio/imu/adis16400_ring.c | 23 +- + drivers/staging/iio/industrialio-buffer.c | 298 +- + drivers/staging/iio/industrialio-core.c | 59 +- + drivers/staging/iio/industrialio-trigger.c | 34 +- + drivers/staging/iio/kfifo_buf.c | 13 +- + drivers/staging/iio/kfifo_buf.h | 2 +- + drivers/staging/iio/light/isl29018.c | 7 +- + drivers/staging/iio/light/tsl2563.c | 11 +- + drivers/staging/iio/light/tsl2583.c | 17 +- + drivers/staging/iio/magnetometer/ak8975.c | 4 +- + drivers/staging/iio/magnetometer/hmc5843.c | 5 +- + drivers/staging/iio/meter/ade7753.c | 1 + + drivers/staging/iio/meter/ade7754.c | 1 + + drivers/staging/iio/meter/ade7758_core.c | 37 +- + drivers/staging/iio/meter/ade7758_ring.c | 10 +- + drivers/staging/iio/meter/ade7759.c | 1 + + drivers/staging/iio/meter/ade7854-spi.c | 1 + + drivers/staging/iio/resolver/ad2s1200.c | 1 + + drivers/staging/iio/resolver/ad2s1210.c | 1 + + drivers/staging/iio/resolver/ad2s90.c | 1 + + drivers/staging/iio/ring_sw.c | 95 +- + drivers/staging/iio/ring_sw.h | 2 +- + drivers/staging/iio/sysfs.h | 43 - + drivers/staging/iio/types.h | 49 + + drivers/staging/intel_sst/Kconfig | 19 - + drivers/staging/intel_sst/Makefile | 7 - + drivers/staging/intel_sst/TODO | 13 - + drivers/staging/intel_sst/intel_sst.c | 649 --- + drivers/staging/intel_sst/intel_sst.h | 162 - + .../staging/intel_sst/intel_sst_app_interface.c | 1460 ------- + drivers/staging/intel_sst/intel_sst_common.h | 623 --- + .../staging/intel_sst/intel_sst_drv_interface.c | 564 --- + drivers/staging/intel_sst/intel_sst_dsp.c | 496 --- + drivers/staging/intel_sst/intel_sst_fw_ipc.h | 416 -- + drivers/staging/intel_sst/intel_sst_ioctl.h | 440 -- + drivers/staging/intel_sst/intel_sst_ipc.c | 774 ---- + drivers/staging/intel_sst/intel_sst_pvt.c | 313 -- + drivers/staging/intel_sst/intel_sst_stream.c | 583 --- + .../staging/intel_sst/intel_sst_stream_encoded.c | 1273 ------ + drivers/staging/intel_sst/intelmid.c | 1022 ----- + drivers/staging/intel_sst/intelmid.h | 209 - + drivers/staging/intel_sst/intelmid_adc_control.h | 193 - + drivers/staging/intel_sst/intelmid_ctrl.c | 921 ----- + drivers/staging/intel_sst/intelmid_msic_control.c | 1047 ----- + drivers/staging/intel_sst/intelmid_pvt.c | 173 - + drivers/staging/intel_sst/intelmid_snd_control.h | 123 - + drivers/staging/intel_sst/intelmid_v0_control.c | 866 ---- + drivers/staging/intel_sst/intelmid_v1_control.c | 978 ----- + drivers/staging/intel_sst/intelmid_v2_control.c | 1156 ------ + drivers/staging/line6/Makefile | 3 +- + drivers/staging/line6/capture.c | 44 +- + drivers/staging/line6/capture.h | 2 + + drivers/staging/line6/driver.c | 74 +- + drivers/staging/line6/driver.h | 10 +- + drivers/staging/line6/midi.c | 37 +- + drivers/staging/line6/midi.h | 4 +- + drivers/staging/line6/pcm.c | 115 +- + drivers/staging/line6/pcm.h | 8 - + drivers/staging/line6/playback.c | 53 +- + drivers/staging/line6/playback.h | 2 + + drivers/staging/line6/pod.c | 6 +- + drivers/staging/line6/podhd.c | 154 + + drivers/staging/line6/podhd.h | 30 + + drivers/staging/line6/revision.h | 2 +- + drivers/staging/line6/toneport.c | 6 +- + drivers/staging/line6/usbdefs.h | 91 +- + drivers/staging/line6/variax.c | 6 +- + drivers/staging/mei/init.c | 34 +- + drivers/staging/mei/interrupt.c | 296 +- + drivers/staging/mei/iorw.c | 58 +- + drivers/staging/mei/main.c | 561 +-- + drivers/staging/mei/mei.txt | 226 +- + drivers/staging/mei/mei_dev.h | 8 - + drivers/staging/mei/wd.c | 4 +- + drivers/staging/nvec/nvec.c | 30 +- + drivers/staging/olpc_dcon/olpc_dcon.c | 18 +- + drivers/staging/olpc_dcon/olpc_dcon.h | 2 +- + drivers/staging/olpc_dcon/olpc_dcon_xo_1.c | 10 +- + drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c | 10 +- + drivers/staging/omapdrm/Kconfig | 25 + + drivers/staging/omapdrm/Makefile | 20 + + drivers/staging/omapdrm/TODO | 38 + + drivers/staging/omapdrm/omap_connector.c | 371 ++ + drivers/staging/omapdrm/omap_crtc.c | 327 ++ + drivers/staging/omapdrm/omap_dmm_priv.h | 187 + + drivers/staging/omapdrm/omap_dmm_tiler.c | 672 +++ + drivers/staging/omapdrm/omap_dmm_tiler.h | 130 + + drivers/staging/omapdrm/omap_drm.h | 123 + + drivers/staging/omapdrm/omap_drv.c | 817 ++++ + drivers/staging/omapdrm/omap_drv.h | 127 + + drivers/staging/omapdrm/omap_encoder.c | 172 + + drivers/staging/omapdrm/omap_fb.c | 261 ++ + drivers/staging/omapdrm/omap_fbdev.c | 304 ++ + drivers/staging/omapdrm/omap_gem.c | 1138 ++++++ + drivers/staging/omapdrm/omap_gem_helpers.c | 169 + + drivers/staging/omapdrm/omap_priv.h | 47 + + drivers/staging/omapdrm/tcm-sita.c | 703 ++++ + drivers/staging/omapdrm/tcm-sita.h | 95 + + drivers/staging/omapdrm/tcm.h | 326 ++ + drivers/staging/phison/phison.c | 2 +- + drivers/staging/rtl8192e/Kconfig | 58 +- + drivers/staging/rtl8192e/Makefile | 47 +- + drivers/staging/rtl8192e/dot11d.c | 4 +- + drivers/staging/rtl8192e/dot11d.h | 2 +- + drivers/staging/rtl8192e/rtl8192e/Kconfig | 9 + + drivers/staging/rtl8192e/rtl8192e/Makefile | 21 + + .../staging/rtl8192e/{ => }/rtl8192e/r8190P_def.h | 0 + .../rtl8192e/{ => }/rtl8192e/r8190P_rtl8256.c | 0 + .../rtl8192e/{ => }/rtl8192e/r8190P_rtl8256.h | 0 + .../rtl8192e/{ => }/rtl8192e/r8192E_cmdpkt.c | 0 + .../rtl8192e/{ => }/rtl8192e/r8192E_cmdpkt.h | 0 + .../staging/rtl8192e/{ => }/rtl8192e/r8192E_dev.c | 0 + .../staging/rtl8192e/{ => }/rtl8192e/r8192E_dev.h | 0 + .../rtl8192e/{ => }/rtl8192e/r8192E_firmware.c | 0 + .../rtl8192e/{ => }/rtl8192e/r8192E_firmware.h | 0 + .../staging/rtl8192e/{ => }/rtl8192e/r8192E_hw.h | 0 + .../rtl8192e/{ => }/rtl8192e/r8192E_hwimg.c | 0 + .../rtl8192e/{ => }/rtl8192e/r8192E_hwimg.h | 0 + .../staging/rtl8192e/{ => }/rtl8192e/r8192E_phy.c | 3 +- + .../staging/rtl8192e/{ => }/rtl8192e/r8192E_phy.h | 0 + .../rtl8192e/{ => }/rtl8192e/r8192E_phyreg.h | 0 + .../rtl8192e/{ => }/rtl8192e/r819xE_phyreg.h | 0 + drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_cam.c | 0 + drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_cam.h | 0 + .../staging/rtl8192e/{ => }/rtl8192e/rtl_core.c | 68 +- + .../staging/rtl8192e/{ => }/rtl8192e/rtl_core.h | 52 +- + .../staging/rtl8192e/{ => }/rtl8192e/rtl_crypto.h | 0 + .../staging/rtl8192e/{ => }/rtl8192e/rtl_debug.c | 79 - + drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_dm.c | 0 + drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_dm.h | 0 + .../staging/rtl8192e/{ => }/rtl8192e/rtl_eeprom.c | 0 + .../staging/rtl8192e/{ => }/rtl8192e/rtl_eeprom.h | 0 + .../staging/rtl8192e/{ => }/rtl8192e/rtl_ethtool.c | 0 + drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_pci.c | 0 + drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_pci.h | 1 - + drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_pm.c | 2 - + drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_pm.h | 4 - + drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_ps.c | 0 + drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_ps.h | 2 +- + drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_wx.c | 1 - + drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_wx.h | 0 + drivers/staging/rtl8192e/rtl819x_BAProc.c | 1 - + drivers/staging/rtl8192e/rtl819x_HTProc.c | 5 +- + drivers/staging/rtl8192e/rtl819x_TSProc.c | 1 + + drivers/staging/rtl8192e/rtl_debug.h | 299 -- + drivers/staging/rtl8192e/rtllib.h | 9 +- + drivers/staging/rtl8192e/rtllib_crypt.c | 17 +- + drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 13 +- + drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 12 +- + drivers/staging/rtl8192e/rtllib_crypt_wep.c | 12 +- + drivers/staging/rtl8192e/rtllib_debug.h | 86 + + drivers/staging/rtl8192e/rtllib_module.c | 15 +- + drivers/staging/rtl8192e/rtllib_rx.c | 6 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 29 +- + drivers/staging/rtl8192e/rtllib_softmac_wx.c | 19 +- + drivers/staging/rtl8192e/rtllib_tx.c | 1 + + drivers/staging/rtl8192e/rtllib_wx.c | 16 +- + drivers/staging/rtl8192u/ieee80211/api.c | 244 -- + drivers/staging/rtl8712/rtl871x_mlme.c | 2 +- + drivers/staging/sep/sep_driver.c | 2 + + drivers/staging/serial/68360serial.c | 4 +- + drivers/staging/sm7xx/smtcfb.c | 6 +- + drivers/staging/speakup/kobjects.c | 3 +- + drivers/staging/speakup/main.c | 5 +- + drivers/staging/spectra/Kconfig | 41 - + drivers/staging/spectra/Makefile | 11 - + drivers/staging/spectra/README | 29 - + drivers/staging/spectra/ffsdefs.h | 58 - + drivers/staging/spectra/ffsport.c | 834 ---- + drivers/staging/spectra/ffsport.h | 85 - + drivers/staging/spectra/flash.c | 4305 -------------------- + drivers/staging/spectra/flash.h | 198 - + drivers/staging/spectra/lld.c | 339 -- + drivers/staging/spectra/lld.h | 111 - + drivers/staging/spectra/lld_cdma.c | 910 ----- + drivers/staging/spectra/lld_cdma.h | 123 - + drivers/staging/spectra/lld_emu.c | 776 ---- + drivers/staging/spectra/lld_emu.h | 51 - + drivers/staging/spectra/lld_mtd.c | 683 ---- + drivers/staging/spectra/lld_mtd.h | 51 - + drivers/staging/spectra/lld_nand.c | 2619 ------------ + drivers/staging/spectra/lld_nand.h | 131 - + drivers/staging/spectra/nand_regs.h | 619 --- + drivers/staging/spectra/spectraswconfig.h | 82 - + drivers/staging/tidspbridge/core/dsp-clock.c | 15 +- + drivers/staging/tidspbridge/rmgr/drv_interface.c | 4 - + drivers/staging/vme/TODO | 67 +- + drivers/staging/vme/bridges/vme_ca91cx42.c | 31 +- + drivers/staging/vme/bridges/vme_tsi148.c | 36 +- + drivers/staging/vme/devices/Kconfig | 12 + + drivers/staging/vme/devices/Makefile | 3 + + drivers/staging/vme/devices/vme_pio2.h | 249 ++ + drivers/staging/vme/devices/vme_pio2_cntr.c | 71 + + drivers/staging/vme/devices/vme_pio2_core.c | 524 +++ + drivers/staging/vme/devices/vme_pio2_gpio.c | 232 ++ + drivers/staging/vme/devices/vme_user.h | 10 +- + drivers/staging/vme/vme.c | 69 +- + drivers/staging/vme/vme.h | 38 +- + drivers/staging/vme/vme_api.txt | 61 +- + drivers/staging/vme/vme_bridge.h | 38 +- + drivers/staging/vt6655/device_main.c | 6 +- + drivers/staging/vt6655/ioctl.c | 8 + + drivers/staging/vt6655/iwctl.c | 12 - + drivers/staging/vt6655/iwctl.h | 5 - + drivers/staging/vt6656/80211mgr.c | 35 +- + drivers/staging/vt6656/baseband.c | 61 +- + drivers/staging/vt6656/bssdb.c | 100 +- + drivers/staging/vt6656/card.c | 4 +- + drivers/staging/vt6656/card.h | 2 +- + drivers/staging/vt6656/ioctl.c | 8 + + drivers/staging/vt6656/iwctl.c | 12 - + drivers/staging/vt6656/iwctl.h | 5 - + drivers/staging/vt6656/main_usb.c | 12 +- + drivers/staging/wlags49_h2/wl_pci.c | 13 +- + drivers/staging/xgifb/Makefile | 2 +- + drivers/staging/xgifb/XGI_main.h | 13 +- + drivers/staging/xgifb/XGI_main_26.c | 158 +- + drivers/staging/xgifb/XGIfb.h | 3 + + drivers/staging/xgifb/vb_ext.c | 444 -- + drivers/staging/xgifb/vb_ext.h | 9 - + drivers/staging/xgifb/vb_init.c | 276 +- + drivers/staging/xgifb/vb_setmode.c | 1003 ++---- + drivers/staging/xgifb/vb_setmode.h | 52 +- + drivers/staging/xgifb/vb_struct.h | 4 +- + drivers/staging/xgifb/vb_table.h | 27 - + drivers/staging/xgifb/vgatypes.h | 2 - + drivers/staging/zcache/zcache-main.c | 6 +- + drivers/staging/zram/zram_drv.c | 3 +- + drivers/staging/zram/zram_sysfs.c | 6 +- + drivers/video/omap2/omapfb/Kconfig | 2 +- + 427 files changed, 20224 insertions(+), 34184 deletions(-) + create mode 100644 Documentation/devicetree/bindings/nvec/nvec_nvidia.txt + create mode 100644 drivers/net/hyperv/Kconfig + create mode 100644 drivers/net/hyperv/Makefile + rename drivers/{staging/hv => net/hyperv}/hyperv_net.h (98%) + rename drivers/{staging/hv => net/hyperv}/netvsc.c (98%) + rename drivers/{staging/hv => net/hyperv}/netvsc_drv.c (91%) + rename drivers/{staging/hv => net/hyperv}/rndis_filter.c (97%) + create mode 100644 drivers/staging/android/Kconfig + create mode 100644 drivers/staging/android/Makefile + create mode 100644 drivers/staging/android/TODO + create mode 100644 drivers/staging/android/binder.c + create mode 100644 drivers/staging/android/binder.h + create mode 100644 drivers/staging/android/logger.c + create mode 100644 drivers/staging/android/logger.h + create mode 100644 drivers/staging/android/lowmemorykiller.c + create mode 100644 drivers/staging/android/ram_console.c + create mode 100644 drivers/staging/android/ram_console.h + create mode 100644 drivers/staging/android/timed_gpio.c + create mode 100644 drivers/staging/android/timed_gpio.h + create mode 100644 drivers/staging/android/timed_output.c + create mode 100644 drivers/staging/android/timed_output.h + rename drivers/staging/iio/{buffer_generic.h => buffer.h} (77%) + delete mode 100644 drivers/staging/iio/chrdev.h + create mode 100644 drivers/staging/iio/dac/ad5380.c + create mode 100644 drivers/staging/iio/dac/ad5421.c + create mode 100644 drivers/staging/iio/dac/ad5421.h + create mode 100644 drivers/staging/iio/dac/ad5764.c + create mode 100644 drivers/staging/iio/events.h + create mode 100644 drivers/staging/iio/types.h + delete mode 100644 drivers/staging/intel_sst/Kconfig + delete mode 100644 drivers/staging/intel_sst/Makefile + delete mode 100644 drivers/staging/intel_sst/TODO + delete mode 100644 drivers/staging/intel_sst/intel_sst.c + delete mode 100644 drivers/staging/intel_sst/intel_sst.h + delete mode 100644 drivers/staging/intel_sst/intel_sst_app_interface.c + delete mode 100644 drivers/staging/intel_sst/intel_sst_common.h + delete mode 100644 drivers/staging/intel_sst/intel_sst_drv_interface.c + delete mode 100644 drivers/staging/intel_sst/intel_sst_dsp.c + delete mode 100644 drivers/staging/intel_sst/intel_sst_fw_ipc.h + delete mode 100644 drivers/staging/intel_sst/intel_sst_ioctl.h + delete mode 100644 drivers/staging/intel_sst/intel_sst_ipc.c + delete mode 100644 drivers/staging/intel_sst/intel_sst_pvt.c + delete mode 100644 drivers/staging/intel_sst/intel_sst_stream.c + delete mode 100644 drivers/staging/intel_sst/intel_sst_stream_encoded.c + delete mode 100644 drivers/staging/intel_sst/intelmid.c + delete mode 100644 drivers/staging/intel_sst/intelmid.h + delete mode 100644 drivers/staging/intel_sst/intelmid_adc_control.h + delete mode 100644 drivers/staging/intel_sst/intelmid_ctrl.c + delete mode 100644 drivers/staging/intel_sst/intelmid_msic_control.c + delete mode 100644 drivers/staging/intel_sst/intelmid_pvt.c + delete mode 100644 drivers/staging/intel_sst/intelmid_snd_control.h + delete mode 100644 drivers/staging/intel_sst/intelmid_v0_control.c + delete mode 100644 drivers/staging/intel_sst/intelmid_v1_control.c + delete mode 100644 drivers/staging/intel_sst/intelmid_v2_control.c + create mode 100644 drivers/staging/line6/podhd.c + create mode 100644 drivers/staging/line6/podhd.h + create mode 100644 drivers/staging/omapdrm/Kconfig + create mode 100644 drivers/staging/omapdrm/Makefile + create mode 100644 drivers/staging/omapdrm/TODO + create mode 100644 drivers/staging/omapdrm/omap_connector.c + create mode 100644 drivers/staging/omapdrm/omap_crtc.c + create mode 100644 drivers/staging/omapdrm/omap_dmm_priv.h + create mode 100644 drivers/staging/omapdrm/omap_dmm_tiler.c + create mode 100644 drivers/staging/omapdrm/omap_dmm_tiler.h + create mode 100644 drivers/staging/omapdrm/omap_drm.h + create mode 100644 drivers/staging/omapdrm/omap_drv.c + create mode 100644 drivers/staging/omapdrm/omap_drv.h + create mode 100644 drivers/staging/omapdrm/omap_encoder.c + create mode 100644 drivers/staging/omapdrm/omap_fb.c + create mode 100644 drivers/staging/omapdrm/omap_fbdev.c + create mode 100644 drivers/staging/omapdrm/omap_gem.c + create mode 100644 drivers/staging/omapdrm/omap_gem_helpers.c + create mode 100644 drivers/staging/omapdrm/omap_priv.h + create mode 100644 drivers/staging/omapdrm/tcm-sita.c + create mode 100644 drivers/staging/omapdrm/tcm-sita.h + create mode 100644 drivers/staging/omapdrm/tcm.h + create mode 100644 drivers/staging/rtl8192e/rtl8192e/Kconfig + create mode 100644 drivers/staging/rtl8192e/rtl8192e/Makefile + rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8190P_def.h (100%) + rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8190P_rtl8256.c (100%) + rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8190P_rtl8256.h (100%) + rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_cmdpkt.c (100%) + rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_cmdpkt.h (100%) + rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_dev.c (100%) + rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_dev.h (100%) + rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_firmware.c (100%) + rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_firmware.h (100%) + rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_hw.h (100%) + rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_hwimg.c (100%) + rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_hwimg.h (100%) + rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_phy.c (99%) + rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_phy.h (100%) + rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_phyreg.h (100%) + rename drivers/staging/rtl8192e/{ => }/rtl8192e/r819xE_phyreg.h (100%) + rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_cam.c (100%) + rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_cam.h (100%) + rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_core.c (98%) + rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_core.h (97%) + rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_crypto.h (100%) + rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_debug.c (94%) + rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_dm.c (100%) + rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_dm.h (100%) + rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_eeprom.c (100%) + rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_eeprom.h (100%) + rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_ethtool.c (100%) + rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_pci.c (100%) + rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_pci.h (99%) + rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_pm.c (99%) + rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_pm.h (97%) + rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_ps.c (100%) + rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_ps.h (98%) + rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_wx.c (99%) + rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_wx.h (100%) + delete mode 100644 drivers/staging/rtl8192e/rtl_debug.h + create mode 100644 drivers/staging/rtl8192e/rtllib_debug.h + delete mode 100644 drivers/staging/rtl8192u/ieee80211/api.c + delete mode 100644 drivers/staging/spectra/Kconfig + delete mode 100644 drivers/staging/spectra/Makefile + delete mode 100644 drivers/staging/spectra/README + delete mode 100644 drivers/staging/spectra/ffsdefs.h + delete mode 100644 drivers/staging/spectra/ffsport.c + delete mode 100644 drivers/staging/spectra/ffsport.h + delete mode 100644 drivers/staging/spectra/flash.c + delete mode 100644 drivers/staging/spectra/flash.h + delete mode 100644 drivers/staging/spectra/lld.c + delete mode 100644 drivers/staging/spectra/lld.h + delete mode 100644 drivers/staging/spectra/lld_cdma.c + delete mode 100644 drivers/staging/spectra/lld_cdma.h + delete mode 100644 drivers/staging/spectra/lld_emu.c + delete mode 100644 drivers/staging/spectra/lld_emu.h + delete mode 100644 drivers/staging/spectra/lld_mtd.c + delete mode 100644 drivers/staging/spectra/lld_mtd.h + delete mode 100644 drivers/staging/spectra/lld_nand.c + delete mode 100644 drivers/staging/spectra/lld_nand.h + delete mode 100644 drivers/staging/spectra/nand_regs.h + delete mode 100644 drivers/staging/spectra/spectraswconfig.h + create mode 100644 drivers/staging/vme/devices/vme_pio2.h + create mode 100644 drivers/staging/vme/devices/vme_pio2_cntr.c + create mode 100644 drivers/staging/vme/devices/vme_pio2_core.c + create mode 100644 drivers/staging/vme/devices/vme_pio2_gpio.c + delete mode 100644 drivers/staging/xgifb/vb_ext.c + delete mode 100644 drivers/staging/xgifb/vb_ext.h +Merging char-misc/char-misc-next (7f3379d misc: ad525x_dpot: Add support for SPI module device table matching) +$ git merge char-misc/char-misc-next +Auto-merging drivers/misc/ad525x_dpot.h +Merge made by the 'recursive' strategy. + drivers/misc/ad525x_dpot-i2c.c | 10 +--- + drivers/misc/ad525x_dpot-spi.c | 97 ++++++++++++++++------------------------ + drivers/misc/ad525x_dpot.c | 24 +++++----- + drivers/misc/ad525x_dpot.h | 8 +--- + 4 files changed, 53 insertions(+), 86 deletions(-) +Merging bkl-config/config (4ba8216 BKL: That's all, folks) +$ git merge bkl-config/config +Already up-to-date. +Merging tmem/tmem (665c1e6 mm: cleancache: Use __read_mostly as appropiate.) +$ git merge tmem/tmem +Resolved 'mm/swapfile.c' using previous resolution. +Auto-merging mm/truncate.c +Auto-merging mm/swapfile.c +CONFLICT (content): Merge conflict in mm/swapfile.c +Auto-merging mm/filemap.c +Auto-merging mm/Makefile +Auto-merging mm/Kconfig +Auto-merging include/linux/swap.h +Auto-merging fs/super.c +Auto-merging fs/buffer.c +Auto-merging drivers/staging/zcache/zcache-main.c +Removing Documentation/ABI/testing/sysfs-kernel-mm-cleancache +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 664a4db] Merge remote-tracking branch 'tmem/tmem' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-kernel-mm-cleancache | 11 - + Documentation/vm/cleancache.txt | 41 ++-- + Documentation/vm/frontswap.txt | 210 +++++++++++++++ + drivers/staging/zcache/zcache-main.c | 10 +- + drivers/xen/tmem.c | 10 +- + fs/buffer.c | 2 +- + fs/super.c | 2 +- + include/linux/cleancache.h | 24 +- + include/linux/frontswap.h | 126 +++++++++ + include/linux/swap.h | 4 + + include/linux/swapfile.h | 13 + + mm/Kconfig | 17 ++ + mm/Makefile | 1 + + mm/cleancache.c | 98 +++----- + mm/filemap.c | 2 +- + mm/frontswap.c | 273 ++++++++++++++++++++ + mm/page_io.c | 12 + + mm/swapfile.c | 64 ++++- + mm/truncate.c | 10 +- + 19 files changed, 796 insertions(+), 134 deletions(-) + delete mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-cleancache + create mode 100644 Documentation/vm/frontswap.txt + create mode 100644 include/linux/frontswap.h + create mode 100644 include/linux/swapfile.h + create mode 100644 mm/frontswap.c +Merging writeback/writeback-for-next (d2c3f73 writeback: Include all dirty inodes in background writeback) +$ git merge writeback/writeback-for-next +Auto-merging mm/filemap.c +Auto-merging kernel/fork.c +Auto-merging kernel/exit.c +Auto-merging include/linux/sched.h +Auto-merging fs/fs-writeback.c +Merge made by the 'recursive' strategy. + fs/btrfs/file.c | 3 +- + fs/fs-writeback.c | 15 ++++- + include/linux/sched.h | 1 + + include/linux/writeback.h | 4 + + include/trace/events/writeback.h | 14 +++- + kernel/exit.c | 3 + + kernel/fork.c | 1 + + mm/filemap.c | 6 +- + mm/page-writeback.c | 132 +++++++++++++++++++++++++++++++++----- + 9 files changed, 155 insertions(+), 24 deletions(-) +Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface) +$ git merge arm-dt/devicetree/arm-next +Already up-to-date. +Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries) +$ git merge hwspinlock/linux-next +Already up-to-date. +Merging pinctrl/for-next (4cea691 pinctrl: Don't create a device for each pin controller) +$ git merge pinctrl/for-next +Auto-merging drivers/pinctrl/pinctrl-coh901.c +Auto-merging drivers/gpio/Makefile +Auto-merging drivers/gpio/Kconfig +Auto-merging arch/arm/mach-u300/core.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/pinctrl.txt | 256 ++++++++++++------ + MAINTAINERS | 2 +- + arch/arm/mach-u300/Kconfig | 2 +- + arch/arm/mach-u300/core.c | 14 +- + arch/arm/mach-u300/include/mach/gpio-u300.h | 115 -------- + arch/arm/mach-u300/include/mach/irqs.h | 2 +- + arch/arm/mach-u300/mmc.c | 2 +- + arch/arm/mach-u300/u300-gpio.h | 114 ++++++++ + drivers/gpio/Kconfig | 9 - + drivers/gpio/Makefile | 1 - + drivers/pinctrl/Kconfig | 14 +- + drivers/pinctrl/Makefile | 4 +- + drivers/pinctrl/core.c | 115 ++++++--- + drivers/pinctrl/core.h | 11 +- + drivers/pinctrl/pinconf.c | 288 ++++++++++++++++++++ + drivers/pinctrl/pinconf.h | 32 +++ + .../{gpio/gpio-u300.c => pinctrl/pinctrl-coh901.c} | 21 ++ + drivers/pinctrl/pinmux-sirf.c | 8 +- + drivers/pinctrl/pinmux-u300.c | 46 +++- + drivers/pinctrl/pinmux.c | 252 +++++++++++------- + include/linux/pinctrl/machine.h | 25 +-- + include/linux/pinctrl/pinconf.h | 96 +++++++ + include/linux/pinctrl/pinctrl.h | 12 +- + include/linux/pinctrl/pinmux.h | 29 ++- + 24 files changed, 1081 insertions(+), 389 deletions(-) + create mode 100644 arch/arm/mach-u300/u300-gpio.h + create mode 100644 drivers/pinctrl/pinconf.c + create mode 100644 drivers/pinctrl/pinconf.h + rename drivers/{gpio/gpio-u300.c => pinctrl/pinctrl-coh901.c} (98%) + create mode 100644 include/linux/pinctrl/pinconf.h +Merging moduleh/for-sfr (6aec187 drivers/media: video/a5k6aa is a module and so needs module.h) +$ git merge moduleh/for-sfr +Already up-to-date. +Merging vhost/linux-next (193a667 alpha: drop pci_iomap/pci_iounmap from pci-noop.c) +$ git merge vhost/linux-next +Resolved 'arch/hexagon/Kconfig' using previous resolution. +Resolved 'arch/m68k/Kconfig' using previous resolution. +Auto-merging lib/Makefile +Auto-merging lib/Kconfig +Auto-merging include/asm-generic/io.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/tile/kernel/pci.c +Auto-merging arch/tile/include/asm/pci.h +Auto-merging arch/sh/drivers/pci/pci.c +Auto-merging arch/powerpc/Kconfig +Removing arch/mn10300/unit-asb2305/pci-iomap.c +Auto-merging arch/mips/Kconfig +Auto-merging arch/m68k/Kconfig +CONFLICT (content): Merge conflict in arch/m68k/Kconfig +Auto-merging arch/hexagon/Kconfig +CONFLICT (content): Merge conflict in arch/hexagon/Kconfig +Removing arch/frv/mb93090-mb00/pci-iomap.c +Auto-merging arch/frv/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging arch/alpha/kernel/pci.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2f1d1c7] Merge remote-tracking branch 'vhost/linux-next' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/Kconfig | 5 +--- + arch/alpha/kernel/pci-noop.c | 12 -------- + arch/alpha/kernel/pci.c | 26 +----------------- + arch/arm/Kconfig | 1 + + arch/arm/include/asm/io.h | 2 +- + arch/arm/mm/iomap.c | 21 -------------- + arch/cris/Kconfig | 5 +--- + arch/frv/Kconfig | 1 + + arch/frv/include/asm/io.h | 2 +- + arch/frv/mb93090-mb00/Makefile | 2 +- + arch/frv/mb93090-mb00/pci-iomap.c | 29 -------------------- + arch/hexagon/Kconfig | 4 +-- + arch/ia64/Kconfig | 5 +--- + arch/m68k/Kconfig | 4 +-- + arch/microblaze/Kconfig | 1 + + arch/microblaze/pci/iomap.c | 19 ------------- + arch/mips/Kconfig | 1 + + arch/mips/lib/iomap-pci.c | 26 ------------------ + arch/mn10300/Kconfig | 1 + + arch/mn10300/include/asm/io.h | 17 +++++------ + arch/mn10300/unit-asb2305/Makefile | 2 +- + arch/mn10300/unit-asb2305/pci-iomap.c | 31 --------------------- + arch/openrisc/Kconfig | 3 -- + arch/parisc/Kconfig | 1 + + arch/parisc/lib/iomap.c | 23 --------------- + arch/powerpc/Kconfig | 1 + + arch/powerpc/kernel/iomap.c | 19 ------------- + arch/powerpc/platforms/Kconfig | 3 -- + arch/score/Kconfig | 4 +-- + arch/sh/Kconfig | 4 +-- + arch/sh/drivers/pci/pci.c | 23 --------------- + arch/sparc/Kconfig | 1 + + arch/sparc/include/asm/io_32.h | 2 +- + arch/sparc/include/asm/io_64.h | 2 +- + arch/sparc/lib/iomap.c | 23 --------------- + arch/tile/Kconfig | 1 + + arch/tile/include/asm/io.h | 3 +- + arch/tile/include/asm/pci.h | 2 +- + arch/tile/kernel/pci.c | 21 -------------- + arch/unicore32/Kconfig | 4 +-- + arch/x86/Kconfig | 4 +-- + include/asm-generic/io.h | 4 +- + include/asm-generic/iomap.h | 9 ++---- + include/asm-generic/pci_iomap.h | 25 +++++++++++++++++ + lib/Kconfig | 7 +++++ + lib/Makefile | 1 + + lib/iomap.c | 38 +------------------------ + lib/pci_iomap.c | 48 +++++++++++++++++++++++++++++++++ + 48 files changed, 124 insertions(+), 369 deletions(-) + delete mode 100644 arch/frv/mb93090-mb00/pci-iomap.c + delete mode 100644 arch/mn10300/unit-asb2305/pci-iomap.c + create mode 100644 include/asm-generic/pci_iomap.h + create mode 100644 lib/pci_iomap.c +Merging kmap_atomic/kmap_atomic (7b8fa32 feature-removal-schedule.txt: add the deprecated form of kmap_atomic()) +$ git merge kmap_atomic/kmap_atomic +Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution. +Auto-merging mm/vmalloc.c +Auto-merging mm/swapfile.c +Auto-merging mm/filemap.c +Auto-merging lib/swiotlb.c +Auto-merging fs/nfs/nfs4proc.c +Auto-merging fs/logfs/segment.c +Auto-merging fs/logfs/readwrite.c +Auto-merging fs/logfs/dir.c +Auto-merging fs/jbd2/journal.c +Auto-merging fs/jbd/journal.c +Auto-merging fs/gfs2/quota.c +Auto-merging fs/gfs2/aops.c +Auto-merging fs/fuse/file.c +Auto-merging fs/fuse/dev.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging drivers/target/target_core_transport.c +Auto-merging drivers/staging/zram/zram_drv.c +Auto-merging drivers/staging/zcache/zcache-main.c +Removing drivers/staging/rtl8192u/ieee80211/kmap_types.h +Auto-merging drivers/staging/hv/storvsc_drv.c +Auto-merging drivers/scsi/ips.c +Auto-merging drivers/scsi/fcoe/fcoe.c +Auto-merging drivers/scsi/cxgbi/libcxgbi.c +Auto-merging drivers/net/hyperv/rndis_filter.c +Auto-merging drivers/net/hyperv/netvsc_drv.c +Auto-merging drivers/net/ethernet/sun/cassini.c +Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c +Auto-merging drivers/net/ethernet/intel/e1000/e1000_main.c +Auto-merging drivers/md/bitmap.c +Auto-merging drivers/gpu/drm/ttm/ttm_tt.c +Auto-merging drivers/block/loop.c +Auto-merging drivers/ata/libata-sff.c +Auto-merging arch/powerpc/mm/mem.c +Auto-merging arch/powerpc/mm/hugetlbpage.c +Auto-merging arch/mips/mm/init.c +Auto-merging arch/mips/mm/c-r4k.c +Auto-merging Documentation/feature-removal-schedule.txt +CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 48d66b1] Merge remote-tracking branch 'kmap_atomic/kmap_atomic' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 8 ++ + arch/arm/include/asm/highmem.h | 2 +- + arch/arm/mm/copypage-fa.c | 12 ++-- + arch/arm/mm/copypage-feroceon.c | 12 ++-- + arch/arm/mm/copypage-v3.c | 12 ++-- + arch/arm/mm/copypage-v4mc.c | 8 +- + arch/arm/mm/copypage-v4wb.c | 12 ++-- + arch/arm/mm/copypage-v4wt.c | 12 ++-- + arch/arm/mm/copypage-v6.c | 12 ++-- + arch/arm/mm/copypage-xsc3.c | 12 ++-- + arch/arm/mm/copypage-xscale.c | 8 +- + arch/arm/mm/highmem.c | 4 +- + arch/frv/include/asm/highmem.h | 2 +- + arch/frv/mm/highmem.c | 4 +- + arch/mips/include/asm/highmem.h | 2 +- + arch/mips/mm/c-r4k.c | 4 +- + arch/mips/mm/highmem.c | 4 +- + arch/mips/mm/init.c | 8 +- + arch/mn10300/include/asm/highmem.h | 2 +- + arch/parisc/include/asm/cacheflush.h | 2 +- + arch/powerpc/include/asm/highmem.h | 2 +- + arch/powerpc/kvm/book3s_pr.c | 4 +- + arch/powerpc/mm/dma-noncoherent.c | 5 +- + arch/powerpc/mm/hugetlbpage.c | 4 +- + arch/powerpc/mm/mem.c | 4 +- + arch/sh/mm/cache-sh4.c | 4 +- + arch/sh/mm/cache.c | 12 ++-- + arch/sparc/include/asm/highmem.h | 2 +- + arch/sparc/mm/highmem.c | 4 +- + arch/tile/include/asm/highmem.h | 2 +- + arch/tile/mm/highmem.c | 4 +- + arch/um/kernel/skas/uaccess.c | 4 +- + arch/x86/crypto/aesni-intel_glue.c | 24 +++--- + arch/x86/include/asm/highmem.h | 2 +- + arch/x86/kernel/crash_dump_32.c | 6 +- + arch/x86/kvm/lapic.c | 8 +- + arch/x86/kvm/paging_tmpl.h | 4 +- + arch/x86/kvm/x86.c | 8 +- + arch/x86/lib/usercopy_32.c | 4 +- + arch/x86/mm/highmem_32.c | 4 +- + crypto/ahash.c | 4 +- + crypto/async_tx/async_memcpy.c | 8 +- + crypto/blkcipher.c | 8 +- + crypto/ccm.c | 4 +- + crypto/scatterwalk.c | 8 +- + crypto/shash.c | 8 +- + drivers/ata/libata-sff.c | 8 +- + drivers/block/brd.c | 20 +++--- + drivers/block/drbd/drbd_bitmap.c | 50 ++++++------ + drivers/block/drbd/drbd_nl.c | 4 +- + drivers/block/loop.c | 16 ++-- + drivers/block/pktcdvd.c | 8 +- + drivers/crypto/hifn_795x.c | 10 +- + drivers/edac/edac_mc.c | 4 +- + drivers/gpu/drm/drm_cache.c | 8 +- + drivers/gpu/drm/ttm/ttm_tt.c | 16 ++-- + drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c | 6 +- + drivers/ide/ide-taskfile.c | 4 +- + drivers/infiniband/ulp/iser/iser_memory.c | 8 +- + drivers/md/bitmap.c | 42 +++++----- + drivers/md/dm-crypt.c | 8 +- + drivers/media/video/ivtv/ivtv-udma.c | 4 +- + drivers/memstick/host/jmb38x_ms.c | 4 +- + drivers/memstick/host/tifm_ms.c | 4 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 6 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 10 +-- + drivers/net/ethernet/sun/cassini.c | 4 +- + drivers/net/hyperv/netvsc_drv.c | 5 +- + drivers/net/hyperv/rndis_filter.c | 4 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 8 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 5 +- + drivers/scsi/cxgbi/libcxgbi.c | 5 +- + drivers/scsi/fcoe/fcoe.c | 4 +- + drivers/scsi/fcoe/fcoe_transport.c | 5 +- + drivers/scsi/gdth.c | 4 +- + drivers/scsi/ips.c | 6 +- + drivers/scsi/isci/request.c | 16 ++-- + drivers/scsi/libfc/fc_fcp.c | 8 +- + drivers/scsi/libfc/fc_libfc.c | 8 +- + drivers/scsi/libfc/fc_libfc.h | 2 +- + drivers/scsi/libfc/fc_lport.c | 2 +- + drivers/scsi/libiscsi_tcp.c | 4 +- + drivers/scsi/libsas/sas_host_smp.c | 8 +- + drivers/scsi/megaraid.c | 4 +- + drivers/scsi/mvsas/mv_sas.c | 4 +- + drivers/scsi/scsi_debug.c | 24 +++--- + drivers/scsi/scsi_lib.c | 4 +- + drivers/scsi/sd_dif.c | 12 ++-- + drivers/staging/gma500/mmu.c | 30 ++++---- + drivers/staging/hv/storvsc_drv.c | 31 +++---- + drivers/staging/pohmelfs/inode.c | 8 +- + drivers/staging/rtl8192u/ieee80211/cipher.c | 8 +- + drivers/staging/rtl8192u/ieee80211/digest.c | 8 +- + drivers/staging/rtl8192u/ieee80211/internal.h | 17 ---- + drivers/staging/rtl8192u/ieee80211/kmap_types.h | 20 ----- + drivers/staging/rtl8192u/ieee80211/scatterwalk.c | 19 +--- + drivers/staging/zcache/zcache-main.c | 16 ++-- + drivers/staging/zram/xvmalloc.c | 39 +++++----- + drivers/staging/zram/zram_drv.c | 44 +++++----- + drivers/target/target_core_transport.c | 4 +- + drivers/target/tcm_fc/tfc_io.c | 10 +-- + drivers/vhost/vhost.c | 4 +- + fs/afs/fsclient.c | 8 +- + fs/afs/mntpt.c | 4 +- + fs/aio.c | 30 ++++---- + fs/bio-integrity.c | 10 +- + fs/btrfs/compression.c | 12 ++-- + fs/btrfs/extent_io.c | 16 ++-- + fs/btrfs/file-item.c | 4 +- + fs/btrfs/inode.c | 26 +++--- + fs/btrfs/lzo.c | 4 +- + fs/btrfs/scrub.c | 8 +- + fs/btrfs/zlib.c | 4 +- + fs/ecryptfs/mmap.c | 4 +- + fs/ecryptfs/read_write.c | 8 +- + fs/exec.c | 4 +- + fs/exofs/dir.c | 4 +- + fs/ext2/dir.c | 4 +- + fs/fuse/dev.c | 4 +- + fs/fuse/file.c | 4 +- + fs/gfs2/aops.c | 12 ++-- + fs/gfs2/lops.c | 8 +- + fs/gfs2/quota.c | 4 +- + fs/jbd/journal.c | 12 ++-- + fs/jbd/transaction.c | 4 +- + fs/jbd2/commit.c | 4 +- + fs/jbd2/journal.c | 12 ++-- + fs/jbd2/transaction.c | 4 +- + fs/logfs/dir.c | 18 ++-- + fs/logfs/readwrite.c | 38 +++++----- + fs/logfs/segment.c | 4 +- + fs/minix/dir.c | 4 +- + fs/namei.c | 4 +- + fs/nfs/dir.c | 8 +- + fs/nfs/nfs4proc.c | 4 +- + fs/nilfs2/cpfile.c | 94 +++++++++++----------- + fs/nilfs2/dat.c | 38 +++++----- + fs/nilfs2/dir.c | 4 +- + fs/nilfs2/ifile.c | 4 +- + fs/nilfs2/mdt.c | 4 +- + fs/nilfs2/page.c | 8 +- + fs/nilfs2/recovery.c | 4 +- + fs/nilfs2/segbuf.c | 4 +- + fs/nilfs2/sufile.c | 68 ++++++++-------- + fs/ntfs/aops.c | 20 +++--- + fs/ntfs/attrib.c | 20 +++--- + fs/ntfs/file.c | 16 ++-- + fs/ntfs/super.c | 8 +- + fs/ocfs2/aops.c | 16 ++-- + fs/pipe.c | 8 +- + fs/reiserfs/stree.c | 4 +- + fs/reiserfs/tail_conversion.c | 4 +- + fs/splice.c | 7 +- + fs/squashfs/file.c | 8 +- + fs/squashfs/symlink.c | 4 +- + fs/ubifs/file.c | 4 +- + fs/udf/file.c | 4 +- + include/crypto/scatterwalk.h | 28 +------ + include/linux/bio.h | 8 +- + include/linux/highmem.h | 79 +++++++++++++----- + kernel/debug/kdb/kdb_support.c | 4 +- + kernel/power/snapshot.c | 28 +++--- + lib/scatterlist.c | 4 +- + lib/swiotlb.c | 5 +- + mm/bounce.c | 4 +- + mm/filemap.c | 8 +- + mm/ksm.c | 12 ++-- + mm/memory.c | 4 +- + mm/shmem.c | 4 +- + mm/swapfile.c | 30 ++++---- + mm/vmalloc.c | 8 +- + net/core/kmap_skb.h | 4 +- + net/rds/ib_recv.c | 7 +- + net/rds/info.c | 6 +- + net/rds/iw_recv.c | 7 +- + net/rds/loop.c | 2 +- + net/rds/rds.h | 2 +- + net/rds/recv.c | 2 +- + net/rds/tcp_recv.c | 11 +-- + net/sunrpc/auth_gss/gss_krb5_wrap.c | 4 +- + net/sunrpc/socklib.c | 4 +- + net/sunrpc/xdr.c | 20 +++--- + net/sunrpc/xprtrdma/rpc_rdma.c | 8 +- + security/tomoyo/domain.c | 4 +- + 184 files changed, 921 insertions(+), 972 deletions(-) + delete mode 100644 drivers/staging/rtl8192u/ieee80211/kmap_types.h +Merging xshm/xshm-for-next (429471b Fixup build by default-building dummy genio) +$ git merge xshm/xshm-for-next +Auto-merging include/linux/Kbuild +Auto-merging drivers/Makefile +Auto-merging drivers/Kconfig +Merge made by the 'recursive' strategy. + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/net/caif/Kconfig | 10 + + drivers/net/caif/Makefile | 1 + + drivers/net/caif/caif_xshm.c | 935 +++++++++++++++++++++++++++ + drivers/xshm/Kconfig | 17 + + drivers/xshm/Makefile | 3 + + drivers/xshm/genio_dummy.c | 61 ++ + drivers/xshm/xshm_boot.c | 1187 ++++++++++++++++++++++++++++++++++ + drivers/xshm/xshm_chr.c | 1269 +++++++++++++++++++++++++++++++++++++ + drivers/xshm/xshm_dev.c | 468 ++++++++++++++ + include/linux/Kbuild | 1 + + include/linux/c2c_genio.h | 195 ++++++ + include/linux/xshm/Kbuild | 1 + + include/linux/xshm/xshm_ipctoc.h | 160 +++++ + include/linux/xshm/xshm_netlink.h | 95 +++ + include/linux/xshm/xshm_pdev.h | 188 ++++++ + 17 files changed, 4594 insertions(+), 0 deletions(-) + create mode 100644 drivers/net/caif/caif_xshm.c + create mode 100644 drivers/xshm/Kconfig + create mode 100644 drivers/xshm/Makefile + create mode 100644 drivers/xshm/genio_dummy.c + create mode 100644 drivers/xshm/xshm_boot.c + create mode 100644 drivers/xshm/xshm_chr.c + create mode 100644 drivers/xshm/xshm_dev.c + create mode 100644 include/linux/c2c_genio.h + create mode 100644 include/linux/xshm/Kbuild + create mode 100644 include/linux/xshm/xshm_ipctoc.h + create mode 100644 include/linux/xshm/xshm_netlink.h + create mode 100644 include/linux/xshm/xshm_pdev.h +Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator) +$ git merge memblock/memblock-kill-early_node_map +Resolved 'arch/arm/mm/init.c' using previous resolution. +Resolved 'arch/score/Kconfig' using previous resolution. +Auto-merging mm/page_alloc.c +Auto-merging mm/Kconfig +Auto-merging kernel/printk.c +Auto-merging include/linux/mm.h +Auto-merging drivers/iommu/intel-iommu.c +Auto-merging arch/x86/xen/setup.c +Auto-merging arch/x86/platform/efi/efi.c +Auto-merging arch/x86/mm/numa.c +Removing arch/x86/mm/memblock.c +Auto-merging arch/x86/mm/init_64.c +Auto-merging arch/x86/mm/init_32.c +Auto-merging arch/x86/mm/init.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/x86/kernel/mpparse.c +Auto-merging arch/x86/kernel/e820.c +Removing arch/x86/include/asm/memblock.h +Auto-merging arch/x86/include/asm/e820.h +Auto-merging arch/x86/Kconfig +Removing arch/sparc/include/asm/memblock.h +Auto-merging arch/sparc/Kconfig +Removing arch/sh/include/asm/memblock.h +Auto-merging arch/sh/Kconfig +Auto-merging arch/score/Kconfig +CONFLICT (content): Merge conflict in arch/score/Kconfig +Auto-merging arch/s390/kernel/setup.c +Auto-merging arch/s390/Kconfig +Auto-merging arch/powerpc/mm/tlb_nohash.c +Auto-merging arch/powerpc/mm/numa.c +Auto-merging arch/powerpc/mm/mem.c +Removing arch/powerpc/include/asm/memblock.h +Auto-merging arch/powerpc/Kconfig +Removing arch/openrisc/include/asm/memblock.h +Auto-merging arch/mips/kernel/setup.c +Auto-merging arch/mips/Kconfig +Removing arch/microblaze/include/asm/memblock.h +Auto-merging arch/ia64/Kconfig +Auto-merging arch/arm/mm/init.c +CONFLICT (content): Merge conflict in arch/arm/mm/init.c +Auto-merging arch/arm/kernel/setup.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fe411f2] Merge remote-tracking branch 'memblock/memblock-kill-early_node_map' +$ git diff -M --stat --summary HEAD^.. + arch/arm/kernel/setup.c | 1 + + arch/arm/mm/init.c | 4 +- + arch/ia64/Kconfig | 6 +- + arch/ia64/mm/contig.c | 3 +- + arch/ia64/mm/init.c | 4 +- + arch/microblaze/include/asm/memblock.h | 14 - + arch/microblaze/kernel/prom.c | 3 +- + arch/mips/Kconfig | 6 +- + arch/mips/kernel/setup.c | 3 +- + arch/mips/sgi-ip27/ip27-memory.c | 5 +- + arch/openrisc/include/asm/memblock.h | 24 - + arch/openrisc/kernel/prom.c | 3 +- + arch/powerpc/Kconfig | 4 +- + arch/powerpc/include/asm/memblock.h | 8 - + arch/powerpc/kernel/machine_kexec.c | 3 - + arch/powerpc/kernel/prom.c | 20 +- + arch/powerpc/mm/init_32.c | 4 +- + arch/powerpc/mm/mem.c | 2 +- + arch/powerpc/mm/numa.c | 60 +-- + arch/powerpc/mm/tlb_nohash.c | 1 - + arch/powerpc/platforms/embedded6xx/wii.c | 23 +- + arch/powerpc/platforms/ps3/mm.c | 1 - + arch/s390/Kconfig | 6 +- + arch/s390/kernel/setup.c | 4 +- + arch/score/Kconfig | 6 +- + arch/score/kernel/setup.c | 4 +- + arch/sh/Kconfig | 1 + + arch/sh/include/asm/memblock.h | 4 - + arch/sh/kernel/machine_kexec.c | 3 - + arch/sh/kernel/setup.c | 3 +- + arch/sh/mm/Kconfig | 3 - + arch/sh/mm/init.c | 3 +- + arch/sparc/Kconfig | 4 +- + arch/sparc/include/asm/memblock.h | 8 - + arch/sparc/mm/init_64.c | 32 +- + arch/unicore32/kernel/setup.c | 1 + + arch/unicore32/mm/init.c | 4 +- + arch/unicore32/mm/mmu.c | 1 + + arch/x86/Kconfig | 5 +- + arch/x86/include/asm/e820.h | 2 +- + arch/x86/include/asm/memblock.h | 23 - + arch/x86/kernel/aperture_64.c | 4 +- + arch/x86/kernel/check.c | 34 +- + arch/x86/kernel/e820.c | 58 +- + arch/x86/kernel/head.c | 2 +- + arch/x86/kernel/head32.c | 7 +- + arch/x86/kernel/head64.c | 7 +- + arch/x86/kernel/mpparse.c | 12 +- + arch/x86/kernel/setup.c | 21 +- + arch/x86/kernel/trampoline.c | 4 +- + arch/x86/mm/Makefile | 2 - + arch/x86/mm/init.c | 8 +- + arch/x86/mm/init_32.c | 36 +- + arch/x86/mm/init_64.c | 2 +- + arch/x86/mm/memblock.c | 348 ----------- + arch/x86/mm/memtest.c | 33 +- + arch/x86/mm/numa.c | 37 +- + arch/x86/mm/numa_32.c | 10 +- + arch/x86/mm/numa_64.c | 2 +- + arch/x86/mm/numa_emulation.c | 36 +- + arch/x86/platform/efi/efi.c | 9 +- + arch/x86/xen/enlighten.c | 2 - + arch/x86/xen/mmu.c | 12 +- + arch/x86/xen/setup.c | 7 +- + drivers/iommu/intel-iommu.c | 25 +- + include/linux/bootmem.h | 2 +- + include/linux/memblock.h | 170 ++++-- + include/linux/mm.h | 34 +- + include/linux/mmzone.h | 8 +- + include/linux/poison.h | 6 - + kernel/printk.c | 2 +- + mm/Kconfig | 6 + + mm/memblock.c | 961 ++++++++++++++++------------- + mm/nobootmem.c | 45 +- + mm/page_alloc.c | 508 +++------------- + 75 files changed, 1032 insertions(+), 1747 deletions(-) + delete mode 100644 arch/microblaze/include/asm/memblock.h + delete mode 100644 arch/openrisc/include/asm/memblock.h + delete mode 100644 arch/powerpc/include/asm/memblock.h + delete mode 100644 arch/sh/include/asm/memblock.h + delete mode 100644 arch/sparc/include/asm/memblock.h + delete mode 100644 arch/x86/include/asm/memblock.h + delete mode 100644 arch/x86/mm/memblock.c +Merging remoteproc/for-next (d275b1b samples/rpmsg: add an rpmsg driver sample) +$ git merge remoteproc/for-next +Auto-merging include/linux/mod_devicetable.h +Auto-merging drivers/Makefile +Auto-merging drivers/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-rpmsg | 75 ++ + Documentation/remoteproc.txt | 324 ++++++ + Documentation/rpmsg.txt | 293 ++++++ + MAINTAINERS | 7 + + arch/arm/plat-omap/include/plat/remoteproc.h | 57 + + drivers/Kconfig | 4 + + drivers/Makefile | 2 + + drivers/remoteproc/Kconfig | 24 + + drivers/remoteproc/Makefile | 9 + + drivers/remoteproc/omap_remoteproc.c | 249 +++++ + drivers/remoteproc/omap_remoteproc.h | 69 ++ + drivers/remoteproc/remoteproc_core.c | 1410 ++++++++++++++++++++++++++ + drivers/remoteproc/remoteproc_debugfs.c | 179 ++++ + drivers/remoteproc/remoteproc_internal.h | 44 + + drivers/remoteproc/remoteproc_rpmsg.c | 295 ++++++ + drivers/rpmsg/Kconfig | 5 + + drivers/rpmsg/Makefile | 1 + + drivers/rpmsg/virtio_rpmsg_bus.c | 1026 +++++++++++++++++++ + include/linux/mod_devicetable.h | 9 + + include/linux/remoteproc.h | 265 +++++ + include/linux/rpmsg.h | 326 ++++++ + include/linux/virtio_ids.h | 1 + + samples/Kconfig | 8 + + samples/Makefile | 2 +- + samples/rpmsg/Makefile | 1 + + samples/rpmsg/rpmsg_client_sample.c | 100 ++ + 26 files changed, 4784 insertions(+), 1 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-rpmsg + create mode 100644 Documentation/remoteproc.txt + create mode 100644 Documentation/rpmsg.txt + create mode 100644 arch/arm/plat-omap/include/plat/remoteproc.h + create mode 100644 drivers/remoteproc/Kconfig + create mode 100644 drivers/remoteproc/Makefile + create mode 100644 drivers/remoteproc/omap_remoteproc.c + create mode 100644 drivers/remoteproc/omap_remoteproc.h + create mode 100644 drivers/remoteproc/remoteproc_core.c + create mode 100644 drivers/remoteproc/remoteproc_debugfs.c + create mode 100644 drivers/remoteproc/remoteproc_internal.h + create mode 100644 drivers/remoteproc/remoteproc_rpmsg.c + create mode 100644 drivers/rpmsg/Kconfig + create mode 100644 drivers/rpmsg/Makefile + create mode 100644 drivers/rpmsg/virtio_rpmsg_bus.c + create mode 100644 include/linux/remoteproc.h + create mode 100644 include/linux/rpmsg.h + create mode 100644 samples/rpmsg/Makefile + create mode 100644 samples/rpmsg/rpmsg_client_sample.c +Merging kvmtool/master (c5fa2df kvm tools: remove duplicated code) +$ git merge kvmtool/master +Resolved 'include/net/9p/9p.h' using previous resolution. +Resolved 'scripts/kconfig/Makefile' using previous resolution. +Auto-merging scripts/kconfig/Makefile +CONFLICT (content): Merge conflict in scripts/kconfig/Makefile +Auto-merging include/net/9p/9p.h +CONFLICT (content): Merge conflict in include/net/9p/9p.h +Auto-merging arch/x86/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 4753e29] Merge remote-tracking branch 'kvmtool/master' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 8 + + arch/x86/Kconfig | 30 + + scripts/kconfig/Makefile | 6 +- + tools/kvm/.gitignore | 11 + + tools/kvm/CREDITS-Git | 30 + + tools/kvm/Documentation/kernel-debugging.txt | 15 + + tools/kvm/Documentation/kvm-balloon.txt | 24 + + tools/kvm/Documentation/kvm-debug.txt | 16 + + tools/kvm/Documentation/kvm-list.txt | 16 + + tools/kvm/Documentation/kvm-pause.txt | 16 + + tools/kvm/Documentation/kvm-resume.txt | 16 + + tools/kvm/Documentation/kvm-run.txt | 62 ++ + tools/kvm/Documentation/kvm-sandbox.txt | 16 + + tools/kvm/Documentation/kvm-setup.txt | 15 + + tools/kvm/Documentation/kvm-stat.txt | 19 + + tools/kvm/Documentation/kvm-stop.txt | 16 + + tools/kvm/Documentation/kvm-version.txt | 21 + + tools/kvm/Documentation/virtio-console.txt | 41 + + tools/kvm/Makefile | 349 ++++++ + tools/kvm/README | 109 ++ + tools/kvm/builtin-balloon.c | 90 ++ + tools/kvm/builtin-debug.c | 100 ++ + tools/kvm/builtin-help.c | 62 ++ + tools/kvm/builtin-list.c | 156 +++ + tools/kvm/builtin-pause.c | 78 ++ + tools/kvm/builtin-resume.c | 78 ++ + tools/kvm/builtin-run.c | 1132 ++++++++++++++++++++ + tools/kvm/builtin-sandbox.c | 9 + + tools/kvm/builtin-setup.c | 242 +++++ + tools/kvm/builtin-stat.c | 131 +++ + tools/kvm/builtin-stop.c | 78 ++ + tools/kvm/builtin-version.c | 15 + + tools/kvm/code16gcc.h | 15 + + tools/kvm/command-list.txt | 15 + + tools/kvm/config/feature-tests.mak | 168 +++ + tools/kvm/config/utilities.mak | 188 ++++ + tools/kvm/disk/blk.c | 39 + + tools/kvm/disk/core.c | 242 +++++ + tools/kvm/disk/qcow.c | 1454 ++++++++++++++++++++++++++ + tools/kvm/disk/raw.c | 140 +++ + tools/kvm/framebuffer.c | 68 ++ + tools/kvm/guest/init.c | 38 + + tools/kvm/guest/init_stage2.c | 45 + + tools/kvm/guest/passwd | 1 + + tools/kvm/guest_compat.c | 99 ++ + tools/kvm/hw/i8042.c | 348 ++++++ + tools/kvm/hw/pci-shmem.c | 262 +++++ + tools/kvm/hw/rtc.c | 118 +++ + tools/kvm/hw/serial.c | 357 +++++++ + tools/kvm/hw/vesa.c | 78 ++ + tools/kvm/include/asm/hweight.h | 8 + + tools/kvm/include/bios/memcpy.h | 9 + + tools/kvm/include/kvm/8250-serial.h | 10 + + tools/kvm/include/kvm/apic.h | 17 + + tools/kvm/include/kvm/brlock.h | 41 + + tools/kvm/include/kvm/builtin-balloon.h | 7 + + tools/kvm/include/kvm/builtin-debug.h | 23 + + tools/kvm/include/kvm/builtin-help.h | 6 + + tools/kvm/include/kvm/builtin-list.h | 7 + + tools/kvm/include/kvm/builtin-pause.h | 7 + + tools/kvm/include/kvm/builtin-resume.h | 7 + + tools/kvm/include/kvm/builtin-run.h | 9 + + tools/kvm/include/kvm/builtin-sandbox.h | 6 + + tools/kvm/include/kvm/builtin-setup.h | 9 + + tools/kvm/include/kvm/builtin-stat.h | 7 + + tools/kvm/include/kvm/builtin-stop.h | 7 + + tools/kvm/include/kvm/builtin-version.h | 6 + + tools/kvm/include/kvm/compiler.h | 6 + + tools/kvm/include/kvm/disk-image.h | 81 ++ + tools/kvm/include/kvm/e820.h | 12 + + tools/kvm/include/kvm/framebuffer.h | 34 + + tools/kvm/include/kvm/guest_compat.h | 9 + + tools/kvm/include/kvm/i8042.h | 12 + + tools/kvm/include/kvm/ioeventfd.h | 27 + + tools/kvm/include/kvm/ioport.h | 66 ++ + tools/kvm/include/kvm/irq.h | 31 + + tools/kvm/include/kvm/kvm-cmd.h | 17 + + tools/kvm/include/kvm/kvm-cpu.h | 24 + + tools/kvm/include/kvm/kvm-ipc.h | 27 + + tools/kvm/include/kvm/kvm.h | 82 ++ + tools/kvm/include/kvm/mutex.h | 33 + + tools/kvm/include/kvm/parse-options.h | 213 ++++ + tools/kvm/include/kvm/pci-shmem.h | 28 + + tools/kvm/include/kvm/pci.h | 94 ++ + tools/kvm/include/kvm/qcow.h | 133 +++ + tools/kvm/include/kvm/rbtree-interval.h | 27 + + tools/kvm/include/kvm/read-write.h | 43 + + tools/kvm/include/kvm/rtc.h | 6 + + tools/kvm/include/kvm/rwsem.h | 39 + + tools/kvm/include/kvm/sdl.h | 17 + + tools/kvm/include/kvm/segment.h | 21 + + tools/kvm/include/kvm/strbuf.h | 19 + + tools/kvm/include/kvm/symbol.h | 22 + + tools/kvm/include/kvm/term.h | 20 + + tools/kvm/include/kvm/threadpool.h | 37 + + tools/kvm/include/kvm/types.h | 7 + + tools/kvm/include/kvm/uip.h | 358 +++++++ + tools/kvm/include/kvm/util.h | 68 ++ + tools/kvm/include/kvm/vesa.h | 18 + + tools/kvm/include/kvm/virtio-9p.h | 74 ++ + tools/kvm/include/kvm/virtio-balloon.h | 8 + + tools/kvm/include/kvm/virtio-blk.h | 13 + + tools/kvm/include/kvm/virtio-console.h | 9 + + tools/kvm/include/kvm/virtio-net.h | 23 + + tools/kvm/include/kvm/virtio-pci-dev.h | 37 + + tools/kvm/include/kvm/virtio-pci.h | 48 + + tools/kvm/include/kvm/virtio-rng.h | 9 + + tools/kvm/include/kvm/virtio-trans.h | 43 + + tools/kvm/include/kvm/virtio.h | 67 ++ + tools/kvm/include/kvm/vnc.h | 14 + + tools/kvm/include/linux/bitops.h | 33 + + tools/kvm/include/linux/byteorder.h | 7 + + tools/kvm/include/linux/kernel.h | 39 + + tools/kvm/include/linux/module.h | 6 + + tools/kvm/include/linux/prefetch.h | 6 + + tools/kvm/include/linux/types.h | 50 + + tools/kvm/ioeventfd.c | 128 +++ + tools/kvm/ioport.c | 138 +++ + tools/kvm/kvm-cmd.c | 93 ++ + tools/kvm/kvm-cpu.c | 162 +++ + tools/kvm/kvm-ipc.c | 171 +++ + tools/kvm/kvm.c | 519 +++++++++ + tools/kvm/main.c | 19 + + tools/kvm/mmio.c | 132 +++ + tools/kvm/net/uip/arp.c | 30 + + tools/kvm/net/uip/buf.c | 114 ++ + tools/kvm/net/uip/core.c | 190 ++++ + tools/kvm/net/uip/csum.c | 92 ++ + tools/kvm/net/uip/dhcp.c | 203 ++++ + tools/kvm/net/uip/icmp.c | 29 + + tools/kvm/net/uip/ipv4.c | 29 + + tools/kvm/net/uip/tcp.c | 317 ++++++ + tools/kvm/net/uip/udp.c | 236 +++++ + tools/kvm/pci.c | 185 ++++ + tools/kvm/symbol.c | 98 ++ + tools/kvm/term.c | 167 +++ + tools/kvm/tests/Makefile | 19 + + tools/kvm/tests/boot/Makefile | 13 + + tools/kvm/tests/boot/init.c | 11 + + tools/kvm/tests/kernel/.gitignore | 2 + + tools/kvm/tests/kernel/Makefile | 20 + + tools/kvm/tests/kernel/README | 16 + + tools/kvm/tests/kernel/kernel.S | 8 + + tools/kvm/tests/pit/.gitignore | 2 + + tools/kvm/tests/pit/Makefile | 20 + + tools/kvm/tests/pit/README | 16 + + tools/kvm/tests/pit/tick.S | 109 ++ + tools/kvm/ui/sdl.c | 280 +++++ + tools/kvm/ui/vnc.c | 218 ++++ + tools/kvm/util/KVMTOOLS-VERSION-GEN | 40 + + tools/kvm/util/generate-cmdlist.sh | 23 + + tools/kvm/util/kvm-ifup-vbr0 | 6 + + tools/kvm/util/parse-options.c | 577 ++++++++++ + tools/kvm/util/rbtree-interval.c | 90 ++ + tools/kvm/util/read-write.c | 344 ++++++ + tools/kvm/util/set_private_br.sh | 51 + + tools/kvm/util/strbuf.c | 39 + + tools/kvm/util/threadpool.c | 145 +++ + tools/kvm/util/util.c | 76 ++ + tools/kvm/virtio/9p-pdu.c | 287 +++++ + tools/kvm/virtio/9p.c | 1320 +++++++++++++++++++++++ + tools/kvm/virtio/balloon.c | 268 +++++ + tools/kvm/virtio/blk.c | 273 +++++ + tools/kvm/virtio/console.c | 204 ++++ + tools/kvm/virtio/core.c | 159 +++ + tools/kvm/virtio/net.c | 556 ++++++++++ + tools/kvm/virtio/pci.c | 347 ++++++ + tools/kvm/virtio/rng.c | 189 ++++ + tools/kvm/virtio/trans.c | 22 + + tools/kvm/x86/bios.c | 174 +++ + tools/kvm/x86/bios/.gitignore | 3 + + tools/kvm/x86/bios/bios-rom.S | 12 + + tools/kvm/x86/bios/e820.c | 72 ++ + tools/kvm/x86/bios/entry.S | 92 ++ + tools/kvm/x86/bios/gen-offsets.sh | 14 + + tools/kvm/x86/bios/int10.c | 110 ++ + tools/kvm/x86/bios/int15.c | 18 + + tools/kvm/x86/bios/local.S | 7 + + tools/kvm/x86/bios/macro.S | 25 + + tools/kvm/x86/bios/memcpy.c | 23 + + tools/kvm/x86/bios/rom.ld.S | 17 + + tools/kvm/x86/cpuid.c | 55 + + tools/kvm/x86/include/kvm/assembly.h | 24 + + tools/kvm/x86/include/kvm/barrier.h | 16 + + tools/kvm/x86/include/kvm/bios-export.h | 13 + + tools/kvm/x86/include/kvm/bios.h | 88 ++ + tools/kvm/x86/include/kvm/boot-protocol.h | 16 + + tools/kvm/x86/include/kvm/cpufeature.h | 41 + + tools/kvm/x86/include/kvm/interrupt.h | 26 + + tools/kvm/x86/include/kvm/kvm-arch.h | 64 ++ + tools/kvm/x86/include/kvm/kvm-cpu-arch.h | 34 + + tools/kvm/x86/include/kvm/mptable.h | 8 + + tools/kvm/x86/interrupt.c | 27 + + tools/kvm/x86/ioport.c | 59 + + tools/kvm/x86/irq.c | 193 ++++ + tools/kvm/x86/kvm-cpu.c | 423 ++++++++ + tools/kvm/x86/kvm.c | 356 +++++++ + tools/kvm/x86/mptable.c | 284 +++++ + 198 files changed, 20080 insertions(+), 1 deletions(-) + create mode 100644 tools/kvm/.gitignore + create mode 100644 tools/kvm/CREDITS-Git + create mode 100644 tools/kvm/Documentation/kernel-debugging.txt + create mode 100644 tools/kvm/Documentation/kvm-balloon.txt + create mode 100644 tools/kvm/Documentation/kvm-debug.txt + create mode 100644 tools/kvm/Documentation/kvm-list.txt + create mode 100644 tools/kvm/Documentation/kvm-pause.txt + create mode 100644 tools/kvm/Documentation/kvm-resume.txt + create mode 100644 tools/kvm/Documentation/kvm-run.txt + create mode 100644 tools/kvm/Documentation/kvm-sandbox.txt + create mode 100644 tools/kvm/Documentation/kvm-setup.txt + create mode 100644 tools/kvm/Documentation/kvm-stat.txt + create mode 100644 tools/kvm/Documentation/kvm-stop.txt + create mode 100644 tools/kvm/Documentation/kvm-version.txt + create mode 100644 tools/kvm/Documentation/virtio-console.txt + create mode 100644 tools/kvm/Makefile + create mode 100644 tools/kvm/README + create mode 100644 tools/kvm/builtin-balloon.c + create mode 100644 tools/kvm/builtin-debug.c + create mode 100644 tools/kvm/builtin-help.c + create mode 100644 tools/kvm/builtin-list.c + create mode 100644 tools/kvm/builtin-pause.c + create mode 100644 tools/kvm/builtin-resume.c + create mode 100644 tools/kvm/builtin-run.c + create mode 100644 tools/kvm/builtin-sandbox.c + create mode 100644 tools/kvm/builtin-setup.c + create mode 100644 tools/kvm/builtin-stat.c + create mode 100644 tools/kvm/builtin-stop.c + create mode 100644 tools/kvm/builtin-version.c + create mode 100644 tools/kvm/code16gcc.h + create mode 100644 tools/kvm/command-list.txt + create mode 100644 tools/kvm/config/feature-tests.mak + create mode 100644 tools/kvm/config/utilities.mak + create mode 100644 tools/kvm/disk/blk.c + create mode 100644 tools/kvm/disk/core.c + create mode 100644 tools/kvm/disk/qcow.c + create mode 100644 tools/kvm/disk/raw.c + create mode 100644 tools/kvm/framebuffer.c + create mode 100644 tools/kvm/guest/init.c + create mode 100644 tools/kvm/guest/init_stage2.c + create mode 100644 tools/kvm/guest/passwd + create mode 100644 tools/kvm/guest_compat.c + create mode 100644 tools/kvm/hw/i8042.c + create mode 100644 tools/kvm/hw/pci-shmem.c + create mode 100644 tools/kvm/hw/rtc.c + create mode 100644 tools/kvm/hw/serial.c + create mode 100644 tools/kvm/hw/vesa.c + create mode 100644 tools/kvm/include/asm/hweight.h + create mode 100644 tools/kvm/include/bios/memcpy.h + create mode 100644 tools/kvm/include/kvm/8250-serial.h + create mode 100644 tools/kvm/include/kvm/apic.h + create mode 100644 tools/kvm/include/kvm/brlock.h + create mode 100644 tools/kvm/include/kvm/builtin-balloon.h + create mode 100644 tools/kvm/include/kvm/builtin-debug.h + create mode 100644 tools/kvm/include/kvm/builtin-help.h + create mode 100644 tools/kvm/include/kvm/builtin-list.h + create mode 100644 tools/kvm/include/kvm/builtin-pause.h + create mode 100644 tools/kvm/include/kvm/builtin-resume.h + create mode 100644 tools/kvm/include/kvm/builtin-run.h + create mode 100644 tools/kvm/include/kvm/builtin-sandbox.h + create mode 100644 tools/kvm/include/kvm/builtin-setup.h + create mode 100644 tools/kvm/include/kvm/builtin-stat.h + create mode 100644 tools/kvm/include/kvm/builtin-stop.h + create mode 100644 tools/kvm/include/kvm/builtin-version.h + create mode 100644 tools/kvm/include/kvm/compiler.h + create mode 100644 tools/kvm/include/kvm/disk-image.h + create mode 100644 tools/kvm/include/kvm/e820.h + create mode 100644 tools/kvm/include/kvm/framebuffer.h + create mode 100644 tools/kvm/include/kvm/guest_compat.h + create mode 100644 tools/kvm/include/kvm/i8042.h + create mode 100644 tools/kvm/include/kvm/ioeventfd.h + create mode 100644 tools/kvm/include/kvm/ioport.h + create mode 100644 tools/kvm/include/kvm/irq.h + create mode 100644 tools/kvm/include/kvm/kvm-cmd.h + create mode 100644 tools/kvm/include/kvm/kvm-cpu.h + create mode 100644 tools/kvm/include/kvm/kvm-ipc.h + create mode 100644 tools/kvm/include/kvm/kvm.h + create mode 100644 tools/kvm/include/kvm/mutex.h + create mode 100644 tools/kvm/include/kvm/parse-options.h + create mode 100644 tools/kvm/include/kvm/pci-shmem.h + create mode 100644 tools/kvm/include/kvm/pci.h + create mode 100644 tools/kvm/include/kvm/qcow.h + create mode 100644 tools/kvm/include/kvm/rbtree-interval.h + create mode 100644 tools/kvm/include/kvm/read-write.h + create mode 100644 tools/kvm/include/kvm/rtc.h + create mode 100644 tools/kvm/include/kvm/rwsem.h + create mode 100644 tools/kvm/include/kvm/sdl.h + create mode 100644 tools/kvm/include/kvm/segment.h + create mode 100644 tools/kvm/include/kvm/strbuf.h + create mode 100644 tools/kvm/include/kvm/symbol.h + create mode 100644 tools/kvm/include/kvm/term.h + create mode 100644 tools/kvm/include/kvm/threadpool.h + create mode 100644 tools/kvm/include/kvm/types.h + create mode 100644 tools/kvm/include/kvm/uip.h + create mode 100644 tools/kvm/include/kvm/util.h + create mode 100644 tools/kvm/include/kvm/vesa.h + create mode 100644 tools/kvm/include/kvm/virtio-9p.h + create mode 100644 tools/kvm/include/kvm/virtio-balloon.h + create mode 100644 tools/kvm/include/kvm/virtio-blk.h + create mode 100644 tools/kvm/include/kvm/virtio-console.h + create mode 100644 tools/kvm/include/kvm/virtio-net.h + create mode 100644 tools/kvm/include/kvm/virtio-pci-dev.h + create mode 100644 tools/kvm/include/kvm/virtio-pci.h + create mode 100644 tools/kvm/include/kvm/virtio-rng.h + create mode 100644 tools/kvm/include/kvm/virtio-trans.h + create mode 100644 tools/kvm/include/kvm/virtio.h + create mode 100644 tools/kvm/include/kvm/vnc.h + create mode 100644 tools/kvm/include/linux/bitops.h + create mode 100644 tools/kvm/include/linux/byteorder.h + create mode 100644 tools/kvm/include/linux/kernel.h + create mode 100644 tools/kvm/include/linux/module.h + create mode 100644 tools/kvm/include/linux/prefetch.h + create mode 100644 tools/kvm/include/linux/types.h + create mode 100644 tools/kvm/ioeventfd.c + create mode 100644 tools/kvm/ioport.c + create mode 100644 tools/kvm/kvm-cmd.c + create mode 100644 tools/kvm/kvm-cpu.c + create mode 100644 tools/kvm/kvm-ipc.c + create mode 100644 tools/kvm/kvm.c + create mode 100644 tools/kvm/main.c + create mode 100644 tools/kvm/mmio.c + create mode 100644 tools/kvm/net/uip/arp.c + create mode 100644 tools/kvm/net/uip/buf.c + create mode 100644 tools/kvm/net/uip/core.c + create mode 100644 tools/kvm/net/uip/csum.c + create mode 100644 tools/kvm/net/uip/dhcp.c + create mode 100644 tools/kvm/net/uip/icmp.c + create mode 100644 tools/kvm/net/uip/ipv4.c + create mode 100644 tools/kvm/net/uip/tcp.c + create mode 100644 tools/kvm/net/uip/udp.c + create mode 100644 tools/kvm/pci.c + create mode 100644 tools/kvm/symbol.c + create mode 100644 tools/kvm/term.c + create mode 100644 tools/kvm/tests/Makefile + create mode 100644 tools/kvm/tests/boot/Makefile + create mode 100644 tools/kvm/tests/boot/init.c + create mode 100644 tools/kvm/tests/kernel/.gitignore + create mode 100644 tools/kvm/tests/kernel/Makefile + create mode 100644 tools/kvm/tests/kernel/README + create mode 100644 tools/kvm/tests/kernel/kernel.S + create mode 100644 tools/kvm/tests/pit/.gitignore + create mode 100644 tools/kvm/tests/pit/Makefile + create mode 100644 tools/kvm/tests/pit/README + create mode 100644 tools/kvm/tests/pit/tick.S + create mode 100644 tools/kvm/ui/sdl.c + create mode 100644 tools/kvm/ui/vnc.c + create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN + create mode 100755 tools/kvm/util/generate-cmdlist.sh + create mode 100755 tools/kvm/util/kvm-ifup-vbr0 + create mode 100644 tools/kvm/util/parse-options.c + create mode 100644 tools/kvm/util/rbtree-interval.c + create mode 100644 tools/kvm/util/read-write.c + create mode 100755 tools/kvm/util/set_private_br.sh + create mode 100644 tools/kvm/util/strbuf.c + create mode 100644 tools/kvm/util/threadpool.c + create mode 100644 tools/kvm/util/util.c + create mode 100644 tools/kvm/virtio/9p-pdu.c + create mode 100644 tools/kvm/virtio/9p.c + create mode 100644 tools/kvm/virtio/balloon.c + create mode 100644 tools/kvm/virtio/blk.c + create mode 100644 tools/kvm/virtio/console.c + create mode 100644 tools/kvm/virtio/core.c + create mode 100644 tools/kvm/virtio/net.c + create mode 100644 tools/kvm/virtio/pci.c + create mode 100644 tools/kvm/virtio/rng.c + create mode 100644 tools/kvm/virtio/trans.c + create mode 100644 tools/kvm/x86/bios.c + create mode 100644 tools/kvm/x86/bios/.gitignore + create mode 100644 tools/kvm/x86/bios/bios-rom.S + create mode 100644 tools/kvm/x86/bios/e820.c + create mode 100644 tools/kvm/x86/bios/entry.S + create mode 100644 tools/kvm/x86/bios/gen-offsets.sh + create mode 100644 tools/kvm/x86/bios/int10.c + create mode 100644 tools/kvm/x86/bios/int15.c + create mode 100644 tools/kvm/x86/bios/local.S + create mode 100644 tools/kvm/x86/bios/macro.S + create mode 100644 tools/kvm/x86/bios/memcpy.c + create mode 100644 tools/kvm/x86/bios/rom.ld.S + create mode 100644 tools/kvm/x86/cpuid.c + create mode 100644 tools/kvm/x86/include/kvm/assembly.h + create mode 100644 tools/kvm/x86/include/kvm/barrier.h + create mode 100644 tools/kvm/x86/include/kvm/bios-export.h + create mode 100644 tools/kvm/x86/include/kvm/bios.h + create mode 100644 tools/kvm/x86/include/kvm/boot-protocol.h + create mode 100644 tools/kvm/x86/include/kvm/cpufeature.h + create mode 100644 tools/kvm/x86/include/kvm/interrupt.h + create mode 100644 tools/kvm/x86/include/kvm/kvm-arch.h + create mode 100644 tools/kvm/x86/include/kvm/kvm-cpu-arch.h + create mode 100644 tools/kvm/x86/include/kvm/mptable.h + create mode 100644 tools/kvm/x86/interrupt.c + create mode 100644 tools/kvm/x86/ioport.c + create mode 100644 tools/kvm/x86/irq.c + create mode 100644 tools/kvm/x86/kvm-cpu.c + create mode 100644 tools/kvm/x86/kvm.c + create mode 100644 tools/kvm/x86/mptable.c +Merging scsi-post-merge/merge-base:master () +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git fetch --no-tags ../next refs/heads/quilt/akpm:akpm +From ../next + * [new branch] quilt/akpm -> akpm +$ git fetch --no-tags ../next refs/heads/quilt/akpm-base:akpm-base +From ../next + * [new branch] quilt/akpm-base -> akpm-base +$ git checkout akpm +Switched to branch 'akpm' +$ git rebase --onto master akpm-base +First, rewinding head to replay your work on top of it... +Applying: cpusets: stall when updating mems_allowed for mempolicy or disjoint nodemask +Applying: cpusets-stall-when-updating-mems_allowed-for-mempolicy-or-disjoint-nodemask-fix +Applying: net/netfilter/nf_conntrack_netlink.c: fix Oops on container destroy +Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314 +Applying: acerhdf: add support for new hardware +Applying: acerhdf: lowered default temp fanon/fanoff values +Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver +Applying: x86, olpc-xo15-sci: enable lid close wakeup control through sysfs +Applying: x86-olpc-xo15-sci-enable-lid-close-wakeup-control-through-sysfs-fix +Applying: x86-olpc-xo15-sci-enable-lid-close-wakeup-control-through-sysfs-v2 +Applying: mm/vmalloc.c: eliminate extra loop in pcpu_get_vm_areas error path +Applying: mm-vmallocc-eliminate-extra-loop-in-pcpu_get_vm_areas-error-path-fix +Applying: x86, olpc: add debugfs interface for EC commands +Applying: drivers/platform/x86/sony-laptop.c: fix scancodes +Applying: drivers-platform-x86-sony-laptopc-fix-scancodes-checkpatch-fixes +Applying: drivers-platform-x86-sony-laptopc-fix-scancodes-v2 +Applying: drivers-platform-x86-sony-laptopc-fix-scancodes-v2-checkpatch-fixes +Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file +Applying: arm, exec: remove redundant set_fs(USER_DS) +Applying: hrtimers: Special-case zero length sleeps +Applying: tick-sched: add specific do_timer_cpu value for nohz off mode +Applying: ia64, exec: remove redundant set_fs(USER_DS) +Applying: kconfig: add merge_config.sh script +Applying: merge_config.sh: use signal names compatible with dash and bash +Applying: merge_config.sh: whitespace cleanup +Applying: merge_config.sh: fix bug in final check +Applying: ctags: remove struct forward declarations +Applying: ipc/mqueue: cleanup definition names and locations +Applying: ipc/mqueue: switch back to using non-max values on create +Applying: ipc/mqueue: enforce hard limits +Applying: ipc/mqueue: update maximums for the mqueue subsystem +Applying: ipc-mqueue-update-maximums-for-the-mqueue-subsystem-fix +Applying: ipc-mqueue-update-maximums-for-the-mqueue-subsystem-checkpatch-fixes +Applying: ext4: use proper little-endian bitops +Applying: parisc, exec: remove redundant set_fs(USER_DS) +Applying: scsi: fix a header to include linux/types.h +Applying: drivers/scsi/megaraid.c: fix sparse warnings +Applying: drivers/scsi/aacraid/commctrl.c: fix mem leak in aac_send_raw_srb() +Applying: drivers/scsi/sg.c: convert to kstrtoul_from_user() +Applying: drivers/scsi/mpt2sas/mpt2sas_base.c: fix mismatch in mpt2sas_base_hard_reset_handler() mutex lock-unlock +Applying: drivers/message/fusion/mptbase.c: ensure NUL-termination of MptCallbacksName elements +Applying: fs: remove unneeded plug in mpage_readpages() +Applying: MAINTAINERS: Staging: cx25821: Add L: linux-media +Applying: mm/page-writeback.c: make determine_dirtyable_memory static again +Applying: vmscan: promote shared file mapped pages +Applying: vmscan: activate executable pages after first usage +Applying: mm: add free_hot_cold_page_list() helper +Applying: mm-add-free_hot_cold_page_list-helper-v2 +Applying: mm-add-free_hot_cold_page_list-helper-v3 +Applying: mm: remove unused pagevec_free +Applying: mm-tracepoint: rename page-free events +Applying: mm-tracepoint: fix documentation and examples +Applying: mm: fix page-faults detection in swap-token logic +Applying: mm: add extra free kbytes tunable +Applying: mm-add-extra-free-kbytes-tunable-update +Applying: mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes +Applying: mm: migrate: one less atomic operation +Applying: mm: do not stall in synchronous compaction for THP allocations +Applying: mm-do-not-stall-in-synchronous-compaction-for-thp-allocations-v3 +Applying: mm: reduce the amount of work done when updating min_free_kbytes +Applying: mm-reduce-the-amount-of-work-done-when-updating-min_free_kbytes-checkpatch-fixes +Applying: mm: avoid livelock on !__GFP_FS allocations +Applying: mm: account reaped page cache on inode cache pruning +Applying: hugetlb: detect race upon page allocation failure during COW +Applying: hugetlb: clarify hugetlb_instantiation_mutex usage +Applying: mm/hugetlb.c: fix virtual address handling in hugetlb fault +Applying: mm-hugetlbc-fix-virtual-address-handling-in-hugetlb-fault-fix +Applying: kernel.h: add BUILD_BUG() macro +Applying: kernel.h: Add BUILD_BUG() macro. +Applying: hugetlb: replace BUG() with BUILD_BUG() for dummy definitions +Applying: mm: more intensive memory corruption debugging +Applying: mm-more-intensive-memory-corruption-debug-fix +Applying: PM/Hibernate: do not count debug pages as savable +Applying: slub: min order when debug_guardpage_minorder > 0 +Applying: fadvise: only initiate writeback for specified range with FADV_DONTNEED +Applying: mm, debug: test for online nid when allocating on single node +Applying: vmscan: add task name to warn_scan_unevictable() messages +Applying: mm: exclude reserved pages from dirtyable memory +Applying: mm-exclude-reserved-pages-from-dirtyable-memory-fix +Applying: mm: writeback: cleanups in preparation for per-zone dirty limits +Applying: mm: try to distribute dirty pages fairly across zones +Applying: mm: filemap: pass __GFP_WRITE from grab_cache_page_write_begin() +Applying: Btrfs: pass __GFP_WRITE for buffered write page allocations +Applying: mm: compaction: push isolate search base of compact control one pfn ahead +Applying: mm: fix off-by-two in __zone_watermark_ok() +Applying: hpet: factor timer allocate from open +Applying: intel_idle: fix API misuse +Applying: intel_idle: disable auto_demotion for hotplugged CPUs +Applying: kernel.h: neaten panic prototype +Applying: include/linux/linkage.h: remove unused NORET_AND macro +Applying: treewide: remove useless NORET_TYPE macro and uses +Applying: treewide: convert uses of ATTRIB_NORETURN to __noreturn +Applying: treewide-convert-uses-of-attrib_noreturn-to-__noreturn-checkpatch-fixes +Applying: include/linux/linkage.h: remove unused ATTRIB_NORET macro +Applying: mm,slub,x86: decouple size of struct page from CONFIG_CMPXCHG_LOCAL +Applying: mm,x86,um: move CMPXCHG_LOCAL config option +Applying: mm,x86,um: move CMPXCHG_DOUBLE config option +Applying: audit: always follow va_copy() with va_end() +Applying: brlocks/lglocks: clean up code +Applying: brlocks-lglocks-clean-up-code-checkpatch-fixes +Applying: include/log2.h: fix rounddown_pow_of_two(1) +Applying: get_maintainers.pl: follow renames when looking up commit signers +Applying: backlight: remove ADX backlight device support +Applying: backlight: convert drivers/video/backlight/* to use module_platform_driver() +Applying: leds: convert led platform drivers to module_platform_driver +Applying: leds: convert led i2c drivers to module_i2c_driver +Applying: leds: convert leds-dac124s085 to module_spi_driver +Applying: drivers/leds/leds-lp5523.c: remove unneeded forward declaration +Applying: drivers/leds/leds-bd2802.c: use gpio_request_one() +Applying: drivers/leds/leds-netxbig.c: use gpio_request_one() +Applying: checkpatch: update signature "might be better as" warning +Applying: checkpatch: prefer __printf over __attribute__((format(printf,...))) +Applying: checkpatch: correctly track the end of preprocessor commands in context +Applying: checkpatch: fix up complex macros context format +Applying: checkpatch: check for common memset parameter issues against statments +Applying: checkpatch: improve memset and min/max with cast checking +Applying: checkpatch-improve-memset-and-min-max-with-cast-checking-fix +Applying: checkpatch: ## is not a valid modifier +Applying: checkpatch: optimise statement scanner when mid-statement +Applying: checkpatch: only apply kconfig help checks for options which prompt +Applying: checkpatch: fix EXPORT_SYMBOL handling following a function +Applying: checkpatch: complex macro should allow the empty do while loop +Applying: checkpatch: fix 'return is not a function' square bracket handling +Applying: checkpatch: fix complex macros handling of square brackets +Applying: checkpatch: ensure cast type is unique in the context parser +Applying: checkpatch: typeof may have more complex arguments +Applying: checkpatch: catch all occurances of type and cast spacing errors per line +Applying: checkpatch-catch-all-occurances-of-type-and-cast-spacing-errors-per-line-checkpatch-fixes +Applying: crc32: optimize inner loop +Applying: epoll: limit paths +Applying: fs: binfmt_elf: create Kconfig variable for PIE randomization +Applying: MIPS: randomize PIE load address +Applying: init/do_mounts.c: create /root if it does not exist +Applying: drivers/rtc/rtc-cmos.c: fix broken NVRAM bank 2 writing +Applying: drivers/rtc/rtc-mxc.c: fix setting time for MX1 SoC +Applying: drivers-rtc-rtc-mxcc-fix-setting-time-for-mx1-soc-fix +Applying: drivers/rtc/rtc-mxc.c: make alarm work +Applying: drivers-rtc-rtc-mxcc-make-alarm-work-fix +Applying: rtc/ab8500: don't disable IRQ:s when suspending +Applying: rtc/ab8500: set can_wake flag +Applying: drivers/rtc/rtc-ab8500.c: change msleep() to usleep_range() +Applying: rtc/ab8500: add calibration attribute to AB8500 RTC +Applying: rtc-ab8500-add-calibration-attribute-to-ab8500-rtc-checkpatch-fixes +Applying: rtc-ab8500-add-calibration-attribute-to-ab8500-rtc-v3 +Applying: rtc-ab8500-add-calibration-attribute-to-ab8500-rtc-v3-checkpatch-fixes +Applying: drivers/rtc/rtc-wm831x.c: remove unused period IRQ handler +Applying: drivers/rtc/rtc-wm831x.c: convert to devm_kzalloc() +Applying: reiserfs: delete comments refering to the BKL +Applying: reiserfs: delay reiserfs lock until journal initialization +Applying: reiserfs: don't lock journal_init() +Applying: reiserfs: don't lock root inode searching +Applying: cpusets, cgroups: disallow attaching kthreadd +Applying: cgroups: add res_counter_write_u64() API +Applying: cgroups: new resource counter inheritance API +Applying: cgroups: add previous cgroup in can_attach_task/attach_task callbacks +Applying: cgroups: new cancel_attach_task() subsystem callback +Applying: cgroups: ability to stop res charge propagation on bounded ancestor +Applying: cgroups: add res counter common ancestor searching +Applying: res_counter: allow charge failure pointer to be null +Applying: cgroups: pull up res counter charge failure interpretation to caller +Applying: cgroups: allow subsystems to cancel a fork +Applying: cgroups: add a task counter subsystem +Applying: cgroups: ERR_PTR needs err.h +Applying: cgroup: Fix task counter common ancestor logic +Applying: cgroup-fix-task-counter-common-ancestor-logic-checkpatch-fixes +Applying: mm: memcg: consolidate hierarchy iteration primitives +Applying: mm: vmscan: distinguish global reclaim from global LRU scanning +Applying: mm: vmscan: distinguish between memcg triggering reclaim and memcg being scanned +Applying: mm-vmscan-distinguish-between-memcg-triggering-reclaim-and-memcg-being-scanned-checkpatch-fixes +Applying: mm: memcg: per-priority per-zone hierarchy scan generations +Applying: mm: move memcg hierarchy reclaim to generic reclaim code +Applying: mm: memcg: remove optimization of keeping the root_mem_cgroup LRU lists empty +Applying: mm: vmscan: convert global reclaim to per-memcg LRU lists +Applying: mm: collect LRU list heads into struct lruvec +Applying: mm: make per-memcg LRU lists exclusive +Applying: mm: memcg: remove unused node/section info from pc->flags +Applying: mm: memcg: remove unused node/section info from pc->flags fix +Applying: memcg: make mem_cgroup_split_huge_fixup() more efficient +Applying: memcg-make-mem_cgroup_split_huge_fixup-more-efficient-fix +Applying: mm: memcg: shorten preempt-disabled section around event checks +Applying: Documentation/cgroups/memory.txt: fix typo +Applying: memcg: fix pgpgin/pgpgout documentation +Applying: mm: oom_kill: remove memcg argument from oom_kill_task() +Applying: mm: unify remaining mem_cont, mem, etc. variable names to memcg +Applying: mm: memcg: clean up fault accounting +Applying: mm: memcg: lookup_page_cgroup (almost) never returns NULL +Applying: mm: page_cgroup: check page_cgroup arrays in lookup_page_cgroup() only when necessary +Applying: mm: memcg: remove unneeded checks from newpage_charge() +Applying: mm: memcg: remove unneeded checks from uncharge_page() +Applying: thp: improve the error code path +Applying: thp: remove unnecessary tlb flush for mprotect +Applying: thp: add tlb_remove_pmd_tlb_entry +Applying: thp: improve order in lru list for split huge page +Applying: procfs: make proc_get_link to use dentry instead of inode +Applying: procfs: introduce the /proc//map_files/ directory +Applying: procfs-introduce-the-proc-pid-map_files-directory-checkpatch-fixes +Applying: procfs: parse mount options +Applying: procfs: add hidepid= and gid= mount options +Applying: procfs: remove superfluous debug output +Applying: workqueue: make alloc_workqueue() take printf fmt and args for name +Applying: workqueue-make-alloc_workqueue-take-printf-fmt-and-args-for-name-fix +Applying: cpumask: update setup_node_to_cpumask_map() comments +Applying: kexec: remove KMSG_DUMP_KEXEC +Applying: kdump: add missing RAM resource in crash_shrink_memory() +Applying: kdump: add udev events for memory online/offline +Applying: kdump: crashk_res init check for /sys/kernel/kexec_crash_size +Applying: kdump: fix crash_kexec()/smp_send_stop() race in panic() +Applying: ipc/mqueue: simplify reading msgqueue limit +Applying: ipc/sem.c: alternatives to preempt_disable() +Applying: sysctl: add the kernel.ns_last_pid control +Applying: user namespace: make signal.c respect user namespaces +Applying: __send_signal: pass q->info, not info, to userns_fixup_signal_uid (v2) +Applying: ipc/mqueue: lock() => unlock() typo +Applying: drivers/memstick: use kmemdup rather than duplicating its implementation +Applying: fs/direct-io.c: calculate fs_count correctly in get_more_blocks() +Applying: vfs: cache request_queue in struct block_device +Applying: dio: optimize cache misses in the submission path +Applying: dio-optimize-cache-misses-in-the-submission-path-v2-checkpatch-fixes +Applying: dio: using prefetch requires including prefetch.h +Applying: ramoops: fix use of rounddown_pow_of_two() +Applying: ramoops: update parameters only after successful init +Applying: unlzo: Fix input buffer free +Applying: cpusets-stall-when-updating-mems_allowed-for-mempolicy-or-disjoint-nodemask-fix-2 +Applying: linux-next: build failure after merge of the akpm tree +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm +From ../rebase-tmp + + f1bf6c8...7d6a38e akpm -> akpm (forced update) +$ rm -rf ../rebase-tmp +Merging akpm (7d6a38e linux-next: build failure after merge of the akpm tree) +$ git merge --no-ff akpm +Removing drivers/video/backlight/adx_bl.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/debugfs-olpc | 16 + + .../sysfs-class-rtc-rtc0-device-rtc_calibration | 12 + + .../ABI/testing/sysfs-devices-system-timekeeping | 16 + + Documentation/cgroups/cgroups.txt | 14 +- + Documentation/cgroups/memory.txt | 9 +- + Documentation/cgroups/resource_counter.txt | 20 +- + Documentation/cgroups/task_counter.txt | 153 ++++ + Documentation/filesystems/proc.txt | 39 + + Documentation/kernel-parameters.txt | 19 + + Documentation/laptops/sony-laptop.txt | 5 + + Documentation/sysctl/kernel.txt | 8 + + Documentation/sysctl/vm.txt | 16 + + Documentation/trace/events-kmem.txt | 12 +- + .../postprocess/trace-pagealloc-postprocess.pl | 20 +- + Documentation/trace/tracepoint-analysis.txt | 40 +- + MAINTAINERS | 5 + + arch/Kconfig | 14 + + arch/arm/Kconfig | 1 + + arch/arm/include/asm/processor.h | 1 - + arch/arm/mach-ux500/mbox-db5500.c | 2 +- + arch/avr32/include/asm/system.h | 2 +- + arch/avr32/kernel/traps.c | 2 +- + arch/ia64/include/asm/processor.h | 1 - + arch/ia64/kernel/machine_kexec.c | 4 +- + arch/m68k/amiga/config.c | 3 +- + arch/mips/Kconfig | 1 + + arch/mips/include/asm/ptrace.h | 2 +- + arch/mips/kernel/traps.c | 2 +- + arch/mn10300/include/asm/exceptions.h | 2 +- + arch/parisc/include/asm/processor.h | 2 - + arch/parisc/kernel/process.c | 1 - + arch/powerpc/kernel/machine_kexec_32.c | 4 +- + arch/powerpc/kernel/machine_kexec_64.c | 6 +- + arch/powerpc/mm/numa.c | 2 +- + arch/powerpc/platforms/pseries/nvram.c | 1 - + arch/s390/include/asm/processor.h | 2 +- + arch/s390/kernel/nmi.c | 2 +- + arch/sh/kernel/process_32.c | 2 +- + arch/sh/kernel/process_64.c | 2 +- + arch/tile/kernel/machine_kexec.c | 6 +- + arch/x86/Kconfig | 4 + + arch/x86/Kconfig.cpu | 6 - + arch/x86/mm/numa.c | 2 +- + arch/x86/platform/iris/iris.c | 67 ++- + arch/x86/platform/olpc/olpc-xo15-sci.c | 67 ++ + arch/x86/platform/olpc/olpc.c | 86 ++ + arch/x86/um/Kconfig | 8 - + block/blk-cgroup.c | 12 +- + drivers/base/memory.c | 17 +- + drivers/base/sys.c | 10 +- + drivers/char/hpet.c | 56 ++- + drivers/char/ramoops.c | 24 +- + drivers/idle/intel_idle.c | 59 +- + drivers/leds/leds-88pm860x.c | 12 +- + drivers/leds/leds-adp5520.c | 12 +- + drivers/leds/leds-ams-delta.c | 13 +- + drivers/leds/leds-asic3.c | 16 +- + drivers/leds/leds-atmel-pwm.c | 17 +- + drivers/leds/leds-bd2802.c | 15 +- + drivers/leds/leds-cobalt-qube.c | 17 +- + drivers/leds/leds-da903x.c | 12 +- + drivers/leds/leds-dac124s085.c | 13 +- + drivers/leds/leds-fsg.c | 15 +- + drivers/leds/leds-gpio.c | 16 +- + drivers/leds/leds-hp6xx.c | 17 +- + drivers/leds/leds-lm3530.c | 13 +- + drivers/leds/leds-lp3944.c | 13 +- + drivers/leds/leds-lp5521.c | 20 +- + drivers/leds/leds-lp5523.c | 22 +- + drivers/leds/leds-lt3593.c | 16 +- + drivers/leds/leds-mc13783.c | 12 +- + drivers/leds/leds-netxbig.c | 39 +- + drivers/leds/leds-ns2.c | 15 +- + drivers/leds/leds-pca9532.c | 14 +- + drivers/leds/leds-pca955x.c | 13 +- + drivers/leds/leds-pwm.c | 13 +- + drivers/leds/leds-rb532.c | 16 +- + drivers/leds/leds-regulator.c | 12 +- + drivers/leds/leds-renesas-tpu.c | 13 +- + drivers/leds/leds-s3c24xx.c | 13 +- + drivers/leds/leds-wm831x-status.c | 12 +- + drivers/leds/leds-wm8350.c | 12 +- + drivers/memstick/core/mspro_block.c | 3 +- + drivers/message/fusion/mptbase.c | 7 +- + drivers/message/fusion/mptbase.h | 1 + + drivers/mtd/mtdoops.c | 3 +- + drivers/platform/x86/acerhdf.c | 67 +- + drivers/platform/x86/sony-laptop.c | 16 +- + drivers/rtc/rtc-ab8500.c | 124 +++- + drivers/rtc/rtc-cmos.c | 2 +- + drivers/rtc/rtc-mxc.c | 123 ++-- + drivers/rtc/rtc-wm831x.c | 24 +- + drivers/scsi/aacraid/commctrl.c | 1 + + drivers/scsi/megaraid.c | 8 +- + drivers/scsi/mpt2sas/mpt2sas_base.c | 3 +- + drivers/scsi/sg.c | 25 +- + drivers/video/backlight/88pm860x_bl.c | 12 +- + drivers/video/backlight/Kconfig | 8 - + drivers/video/backlight/Makefile | 1 - + drivers/video/backlight/adp5520_bl.c | 12 +- + drivers/video/backlight/adx_bl.c | 182 ---- + drivers/video/backlight/da903x_bl.c | 12 +- + drivers/video/backlight/ep93xx_bl.c | 12 +- + drivers/video/backlight/generic_bl.c | 13 +- + drivers/video/backlight/jornada720_bl.c | 13 +- + drivers/video/backlight/jornada720_lcd.c | 13 +- + drivers/video/backlight/max8925_bl.c | 12 +- + drivers/video/backlight/omap1_bl.c | 13 +- + drivers/video/backlight/pcf50633-backlight.c | 12 +- + drivers/video/backlight/platform_lcd.c | 13 +- + drivers/video/backlight/pwm_bl.c | 12 +- + drivers/video/backlight/wm831x_bl.c | 12 +- + fs/Kconfig.binfmt | 3 + + fs/binfmt_elf.c | 2 +- + fs/block_dev.c | 3 + + fs/btrfs/file.c | 2 +- + fs/dcache.c | 10 +- + fs/direct-io.c | 57 +- + fs/eventpoll.c | 226 +++++- + fs/ext4/ext4.h | 7 +- + fs/ext4/ialloc.c | 4 +- + fs/file_table.c | 23 +- + fs/inode.c | 2 + + fs/internal.h | 3 +- + fs/mpage.c | 4 - + fs/namei.c | 26 +- + fs/namespace.c | 124 ++-- + fs/pnode.c | 4 +- + fs/proc/base.c | 433 +++++++++- + fs/proc/inode.c | 18 + + fs/proc/internal.h | 1 + + fs/proc/root.c | 70 ++- + fs/reiserfs/bitmap.c | 3 - + fs/reiserfs/journal.c | 64 +- + fs/reiserfs/super.c | 54 +- + include/asm-generic/tlb.h | 14 + + include/linux/cgroup.h | 28 +- + include/linux/cgroup_subsys.h | 6 + + include/linux/compiler-gcc4.h | 1 + + include/linux/compiler.h | 4 +- + include/linux/eventpoll.h | 1 + + include/linux/fs.h | 3 + + include/linux/gfp.h | 34 +- + include/linux/hpet.h | 1 + + include/linux/huge_mm.h | 10 +- + include/linux/hugetlb.h | 14 +- + include/linux/ipc_namespace.h | 40 +- + include/linux/kernel.h | 29 +- + include/linux/kmsg_dump.h | 1 - + include/linux/lglock.h | 152 +--- + include/linux/linkage.h | 4 - + include/linux/log2.h | 2 +- + include/linux/memcontrol.h | 94 ++- + include/linux/mm.h | 29 + + include/linux/mm_inline.h | 21 +- + include/linux/mm_types.h | 10 +- + include/linux/mmzone.h | 18 +- + include/linux/oom.h | 2 +- + include/linux/page-debug-flags.h | 4 +- + include/linux/page_cgroup.h | 34 - + include/linux/pagevec.h | 7 - + include/linux/pid_namespace.h | 2 + + include/linux/proc_fs.h | 2 +- + include/linux/res_counter.h | 27 +- + include/linux/rmap.h | 4 +- + include/linux/sched.h | 2 +- + include/linux/swap.h | 37 + + include/linux/sysdev.h | 2 + + include/linux/workqueue.h | 47 +- + include/linux/writeback.h | 3 +- + include/scsi/scsi_netlink.h | 2 +- + include/trace/events/kmem.h | 4 +- + init/Kconfig | 9 + + init/do_mounts.c | 3 + + ipc/mq_sysctl.c | 31 +- + ipc/mqueue.c | 34 +- + ipc/sem.c | 250 ++++-- + kernel/Makefile | 3 +- + kernel/audit.c | 5 +- + kernel/cgroup.c | 89 ++- + kernel/cgroup_freezer.c | 9 +- + kernel/cgroup_task_counter.c | 243 ++++++ + kernel/cpuset.c | 40 +- + kernel/events/core.c | 5 +- + kernel/exit.c | 8 +- + kernel/fork.c | 8 +- + kernel/hrtimer.c | 8 + + kernel/kexec.c | 25 +- + kernel/lglock.c | 101 +++ + kernel/panic.c | 20 +- + kernel/pid.c | 4 +- + kernel/pid_namespace.c | 31 + + kernel/power/snapshot.c | 6 + + kernel/res_counter.c | 97 ++- + kernel/sched/core.c | 16 +- + kernel/signal.c | 43 +- + kernel/sysctl.c | 11 +- + kernel/time/tick-sched.c | 67 ++ + kernel/workqueue.c | 32 +- + lib/crc32.c | 21 +- + lib/decompress_unlzo.c | 2 +- + mm/Kconfig.debug | 5 + + mm/compaction.c | 4 +- + mm/fadvise.c | 3 +- + mm/filemap.c | 5 +- + mm/huge_memory.c | 83 ++- + mm/hugetlb.c | 14 +- + mm/memcontrol.c | 896 +++++++++----------- + mm/memory.c | 17 +- + mm/migrate.c | 10 +- + mm/oom_kill.c | 42 +- + mm/page-writeback.c | 290 ++++--- + mm/page_alloc.c | 268 +++++-- + mm/page_cgroup.c | 78 +-- + mm/rmap.c | 23 +- + mm/slub.c | 12 +- + mm/swap.c | 38 +- + mm/swapfile.c | 15 +- + mm/vmalloc.c | 9 +- + mm/vmscan.c | 430 ++++++---- + mm/vmstat.c | 2 +- + net/netfilter/nf_conntrack_netlink.c | 5 + + scripts/checkpatch.pl | 236 +++--- + scripts/get_maintainer.pl | 2 +- + scripts/kconfig/merge_config.sh | 117 +++ + scripts/tags.sh | 2 + + tools/perf/Documentation/examples.txt | 34 +- + 227 files changed, 4936 insertions(+), 2854 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-olpc + create mode 100644 Documentation/ABI/testing/sysfs-class-rtc-rtc0-device-rtc_calibration + create mode 100644 Documentation/ABI/testing/sysfs-devices-system-timekeeping + create mode 100644 Documentation/cgroups/task_counter.txt + delete mode 100644 drivers/video/backlight/adx_bl.c + create mode 100644 kernel/cgroup_task_counter.c + create mode 100644 kernel/lglock.c + create mode 100644 scripts/kconfig/merge_config.sh diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..f49e462e237b --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,12 @@ +Importing hexagon based on v3.2-rc2 +Unchanged quilt series hexagon +Importing i2c based on 3.2-rc5 +Unchanged quilt series i2c +Importing jdelvare-hwmon based on 3.2-rc5 +Unchanged quilt series jdelvare-hwmon +Importing kernel-doc based on 3.1 +Unchanged quilt series kernel-doc +Importing rr based on v3.2-rc4 +Unchanged quilt series rr +Importing device-mapper based on v3.1-10674-g94956ee +Unchanged quilt series device-mapper diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..ca2537de9542 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20111213 -- 2.39.2