diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-06-21 15:29:27 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-06-21 15:29:27 +1000 |
| commit | 775ad651d08a8b9439f0b3aef610663b7ce24161 (patch) | |
| tree | cc3269bb1343e09e465828c4a42c276c560038f3 | |
| parent | 0ea2a56be8334bdaf42ba76c7cbbf37b99db5f4f (diff) | |
Add linux-next specific files for 20110621next-20110621
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 196 | ||||
| -rw-r--r-- | Next/Trees | 198 | ||||
| -rw-r--r-- | Next/merge.log | 5162 | ||||
| -rw-r--r-- | Next/quilt-import.log | 10 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 5567 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..b32ab770673e --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,196 @@ +Name SHA1 +---- ---- +origin ef46222e7b56e728e423527d430cb2013c595491 +fixes 5c6cce92bc8aee751aafe82c5d9caf7553226a3d +kbuild-current 569658dddf276ceb0780776e7f5d61d9f8d8cb88 +arm-current 19a1166fa2352f9c07a5ab34a3c2aab462cff35d +m68k-current 659e6ed55ff8d617c895c10288644e3e6107834e +powerpc-merge 307cfe715344e15eda12dad3bb14f794115ca823 +52xx-and-virtex-current c49f8789f532ae39019135ca038e9bc0d15aaa4a +sparc-current 10f0d07c51516bd24b040016c6d4304eef05f115 +scsi-rc-fixes e73e079bf128d68284efedeba1fbbc18d78610f9 +net-current 384420409d9b5d4443940abace49363d26135412 +sound-current ad2409413d09fca763be1ac5161f2a9d82367903 +pci-current 6e33a852a37dee02979ec9d82bea26c07cee5bce +wireless-current fa7ccfb17033bfb5bca86f6b909cab0b807efbc0 +driver-core.current 663dd6dcaf7e95526e469e91f41972a9c0cca30c +tty.current 3bc46b312b1486b1fe2db4246a34a30160d26d8d +usb.current 0af212ba8f123c2eba151af7726c34a50b127962 +staging.current 2c53b436a30867eb6b47dd7bab23ba638d1fb0d2 +cpufreq-current fbb5b89eabea5ae7d621b7861863159560d8faa4 +input-current cca23d0b5350c9ca0473625c3f5879422ba534a6 +md-current fcde90759a985d8bfa4391346a821cc12fc16207 +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current 9c129165af0225c63c37d1896ac9b0d34e48b69f +ide-curent 3307d0d83b7bf636dc6dd2aa4a584d0f52cc185b +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +sh-current 261a9af671a79b750cb170bac620601d686535c1 +rmobile-current 05a7929f31a0d516a9c19012bf27a1ea5058dc7a +fbdev-current d521dd944e461371cb309c7c3568483cd2b6f5f2 +devicetree-current 35d2045f6a73b57287df8c1f226bb0113d9339f1 +spi-current e479c60456ef22b0869432887216186aabaed086 +arm 0827a88b166bccaf0d2d927b6c8c97c291852c22 +arm-lpae 1e9a909b12952c35aaf002410c3a4490a18110d4 +at91 37fe554e7c673132488e7e4e701db50bc1ff4dbd +davinci 7e9f1945213cdd7cd11f29346ded07a81854b5af +i.MX 954548c68c2d478bf8ec0ca9d9eea2a7c45a4fcd +linux-spec 5111711d3ed8f4f1012cac3ec3f2b463b549fbfd +msm f2ba30560a71b39b4ad3230f5deb96fefaaa6417 +omap b8ce9fb8e18af7466e0b915bb5979322cdace322 +pxa 19d6c13b56a78b3757e747f469285c2a546d634a +samsung 9edb240696bacd53f4331119d2dfd13d4cd4852f +s5p 8ddb2ab235e972704f3d750d3de51b2dc5ee63d9 +tegra 84abf6084704673ae80a2105bf63ece5eee3edd5 +ux500-core 40f232f72cfba1c106186265617a245496bcffa8 +xilinx b85a3ef4ac65169b65fd2fe9bec7912bbf475ba4 +blackfin 1ea974b6f4412eed376fd49def1c4506b9b6747d +cris ea78f5b898555ddfbab494c7755130362fe3cf46 +ia64 e6ab04dff11b7f3b7adb4a57bef6bee59907e981 +m68k 8337ad1dad0d8869a7d4a935032e9b9a1861c79f +m68knommu f6b0c2a01e6e9463b59b1cb2feca2ccf6e0e26e8 +microblaze 06e86849cf4019945a106913adb9ff0abcc01770 +mips 1b956e1f9c23da7c11f92a25bca815df97705496 +parisc 54a6067ece30c11c8b340b94ecc5a01bb0bd9317 +powerpc dc28518f7d7dfd93cd44edb44f9b8e961f5a5c1b +4xx 3f5785ec31adcb7cafa9135087297a38d9698cf8 +52xx-and-virtex c1395f4cf4a1944236f0f28cdf718c4aacc88f2d +galak 9824986b6207600b7af7d53fb039655a2378c52a +s390 a60de3818d53d4633b3c914ece4bb4e36261f566 +sh d0459e1afa58a225f074d85226bf0d7b9e54eff3 +rmobile 05a7929f31a0d516a9c19012bf27a1ea5058dc7a +sparc 1fa7b6a29c61358cc2ca6f64cef4aa0e1a7ca74c +tile 93ea927eb15b736fa4a431f789b1097318129d2a +unicore32 900f08a979f1f4e71e6deb6d223de9637cd1d58f +xtensa 944afcb4c53f3b841d63ce337fe37b71cea2f52f +ceph b71622e7f92a491da4f48b63c7bf8016a883b7cd +cifs ada9c93312f7ec49514c68c211595ce2601cebae +configfs 420118caa32c8ccdf9fce5a623b9de3f951573c5 +ecryptfs 9a842dd9dd9d0df0abb97452244b0bb60a147157 +ext3 b94b83df9fac93fafb37a89e47641f728dfe2f28 +ext4 c03f8aa9abdd517477c2021ea1251939b4da49e6 +fatfs 1adffbae22332bb558c2a29de19d9aca391869f6 +fuse d24339059d640f108c08ba99ef30e3bafa10f8e4 +gfs2 033a01b7c3861bbfa57f3a0069b08f79dcff5edc +hfsplus 99943814ce60e4cd0165f19781abbfcc826f8d87 +jfs ecc90462b428db2ad2ee5081c45496ed10f3a633 +logfs ddbb5dd99c40a695d5d75645b5a18bef394acb16 +nfs 16cec0bc31bfc818a4234ee0301b2ffbf55afedd +nfsd 2c53b436a30867eb6b47dd7bab23ba638d1fb0d2 +nilfs2 1860b44d6777a9d89e93e12cb56077c4fad6b365 +ocfs2 730e663bd82c1a10a85ff00728d34152a5a67ec8 +omfs 31be83aeaee22fa165862ad449c7131ceaf1cf91 +squashfs d5b72ce15ea99a0b8f0d1973074c584daf92d70e +udf 6f644e5f97cc8dcb8dc7133562159cc20d27c38f +v9fs ff783e67d36ab8f971ee863ffcd467c5b8c74e8e +ubifs 098011940a2549ae7182db4bf101c3e3d2b4e6df +xfs a27a263bae072a499acc77b632238a6dacccf888 +vfs c6b69db99fbec42ebc4f6b97cba255bbbfac2a0d +vfs-scale 32385c7cf60a78375b63afc4f02001df84dfd1a0 +pci 5f59beff618e6f73c3414f0cf8ca3e21a6df994c +of-pci ef3b4f8cc20e80c767e47b848fb7512770ab80d7 +hid f35e51ad2576d90d123b31e985f9d3e56679337e +i2c 06055ef927bf8f7c61bad8ecef72e70a4fa40b48 +bjdooks-i2c 5bdfdfeed5eed599a3ddc455f7c254a209ceae8d +jdelvare-hwmon 3f5725fdf41ac542b5cf83c31d11023c3bd0d10d +hwmon-staging cdfd1d85060586fde2feca5b17fdd0beccfa629b +kernel-doc 59c5f46fbe01a00eedf54a23789634438bb80603 +docs 2f3e4af471e38e0658e701973238ae4b5e50fcd6 +v4l-dvb 00c4526f58c1a5ccc0c76bb73ba115e72fe3a1fb +kbuild 7f16329397817435158bd6f45161a7db6dbe2d5f +kconfig eae1c36aea9cfe4d123b8af3ffe54109c6579810 +ide 56a210526adb2854d5b7c398a40260720390ee05 +libata 62661645410af3f37fbb992fbddfc49bf60e70cb +infiniband c7d74b090913102e7917dd02bb574ef060e1e930 +acpi 55922c9d1b84b89cb946c777fddccb3247e7df2c +idle-test 8a27ef90237ff6377e11b0218acebae0ec0b939e +powertools a829eb4d7e08b316e2d48880ecab3630497f300f +cpupowerutils 9cd581865c6ad25348b6b6d61859a1773c1728bf +ieee1394 dd6254e5c0efe01ad255188898cb3dadf98cb56d +ubi 4788b60a5faf9f9c9aec10fb7f6b36d9e0f9fa4c +dlm 901025d2f3194b4868980c8ba80df4cc0aa1282c +swiotlb 25b84fa6892ba6517f292a6254bed39de77da1b5 +ibft f1b1e067b999aa141229a2a524b7be080f999795 +scsi 1fa7b6a29c61358cc2ca6f64cef4aa0e1a7ca74c +slave-dma e2f5e5a71dfe6bf155590de0fdd6d748ac79bf76 +async_tx 19d78a61be6dd707dcec298c486303d4ba2c840a +net 306ff6eb8e9c18bcafb8ca5be4be3c78dfe45475 +wireless e10542c447abf7c840931ff12f7d0dee976ca2ea +bluetooth e13e21dc5d06bd9ed4a88daf057b8dbe80c220de +mtd 3f303103b884ca577908d3e5c0650ad12e40c586 +l2-mtd 3e1643b282542cf524d30cfab4cfe38f6b2afa99 +crypto af56dea1740f188dac90404d264150096f540d01 +sound 4456038b2e7bcf32a61c102f594ee8fb423441a7 +sound-asoc c20974090e9093b8b69b37543cba381336c41ab7 +cpufreq a3502293f66a9afdc235c353eb9ac79967c1a160 +rr 8c391e1afa7f9e35a815ba238f327284cff02be5 +input 9d2e173644bb5c42ff1b280fbdda3f195a7cf1f7 +input-mt a6360dd37e1a144ed11e6548371bade559a1e4df +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block bceeaef7d0669e8cc0c9d814f8b1dabb205dc514 +device-mapper 61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 4ef7e71444b48cc89152cbc499ed94dde50515ee +battery 906649de0eacde7a643b5a0750de6207441ad54f +leds a4b4433c511cf4361bb0afabba69e16632002d32 +backlight 67e67df8da723debf24f7763605776891203e8d5 +mmc 6e65b739716b78ed0e271b264ec8761aa5f66341 +kgdb 18bcd0c8cb7d85a9063b88ec810dc1cdc0974518 +slab d8ab36404a06cf06fa55050aa823f7e4a74ec977 +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md fcde90759a985d8bfa4391346a821cc12fc16207 +mfd e9fa92fe231f758f0e06aa49f13ba76c87a6f15e +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm fb0b760605d1f3bb7afc83ffd7a770f92bb62fca +fbdev 181b74ef794e198df36fbc8c962126a11a01d395 +viafb d933990c57b498c092ceef591c7c5d69dbfe9f30 +omap_dss2 b295d6e593e02168fdafc5db11464b6d51cf239d +voltage 7d51a0dbe51282f3ed13cadf6e7f13a974374be2 +security-testing 4d67431f80b1b822f0286afc9123ee453eac7334 +selinux ded509880f6a0213b09f8ae7bef84acb16eaccbf +lblnet 7e27d6e778cd87b6f2415515d7127eba53fe5d02 +agp 7f32e2e05c240201b42b58dec1b4a072e2127792 +watchdog c36faa4fe03d9956904b13416afd807ed716d7ea +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu f0f52a9463839c52a63c05d6e7d4a330d94a9794 +cputime 96830a57de1197519b62af6a4c9ceea556c18c3d +osd 61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +nommu 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d +trivial e44ba033c5654dbfda53461c9b1f7dd9bd1d198f +audit def57543418a5f47debae28a0a9dea2effc11692 +suspend c216312698c1678e310569a9419e1b0187b978fe +apm d762f4383100c2a87b1a3f2d678cd3b5425655b4 +fsnotify ef9bf3b7144bee6ce1da5616015cabc8771206af +irda 94d57c4cfaa43e29ca5fa5ff874048cfc67276f5 +i7core_edac 24c70a0e06fbadbe66fbb26f41b64153c5c1efbd +i7300_edac bbab9984d7e65f08d3083814103b91b3dd382381 +devicetree 900b1202c590f3786c1d688bad9999bfbc1e28bc +spi a2274cedc4b33a29be6583cd757bdc0b436851ec +gpio 33300571b1111264fd0c5701733f7576323f3e35 +tip 0b251ee3e2dc6e09ac357fa65f3e0963a1176e1a +rcu e140bd357cf995df06d3c687c219fcd2b916231c +kvm 738878352bf7373e77dddf6e7e1f3da72cc52599 +oprofile 5f307491f3a0c8551cedf5d90d660d656e0d56ec +ptrace 544b2c91a9f14f9565af1972203438b7f49afd48 +xen 61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf +xen-two 8c637e4ebedc2c13d58c90d61c74a916f9ecc1a9 +xen-pvhvm b056b6a0144de90707cd22cf7b4f60bf69c86d59 +edac-amd a9f0fbe2bbf328f869fc5ee5a12c6a4118c32689 +percpu e1e7bfd5048a848cc03164b5893865a573dd0014 +workqueues 9c5a2ba70251ecaab18c7a83e38b3c620223476c +sfi 5b026c4e3af52fda22c9313a3388344f82f3ba15 +asm-generic 35dbc0e020c6587f78a6c17693beca73aead7b54 +drivers-x86 987dfbaa65b2c3568b85e29d2598da08a011ee09 +hwpoison 46e387bbd82d438b9131e237e6e2cb55a825da49 +sysctl c2f5631aceb700224d0cfe0465cee18df564a29e +namespace b20c223833c931700f88ec53a54e2f95d0e01052 +driver-core b6badddcccf9d48a01e9a9b33c47922976291ab6 +tty e7328ae1848966181a7ac47e8ae6cddbd2cf55f3 +usb 664a51a81f6ba39db30cd7b7de61577ca0b2d20d +staging dc5a18941b4226846f0c5994e4f45bc685f7bcfe +bkl-config 4ba8216cd90560bc402f52076f64d8546e8aefcb +tmem ac33c46b42baa80a7ed7420cf960d1fdd4f5a7c3 +writeback e84d0a4f8e39a73003a6ec9a11b07702745f4c1f +arm-dt ede338f4ce2fb5ee99d18751df32fbd3b10df268 +scsi-post-merge c66ac9db8d4ad9994a02b3e933ea2ccc643e1fe5 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..f1193e49605f --- /dev/null +++ b/Next/Trees @@ -0,0 +1,198 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git#master +fixes git -#fixes +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git#rc-fixes +arm-current git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#master +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-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git#master +scsi-rc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git#master +net-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#for-linus +wireless-current git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git#master +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git#usb-linus +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git#staging-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://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6#master +ide-curent git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6.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 +fbdev-current git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git#fbdev-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 ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#for-next +arm-lpae git git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-2.6-cm.git#for-next +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 +msm git git://codeaurora.org/quic/kernel/davidb/linux-msm.git#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://android.git.kernel.org/kernel/tegra.git#for-next +ux500-core git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git#ux500-core +xilinx git git://git.xilinx.com/linux-2.6-xlnx.git#arm-next +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin.git#for-linus +cris git git://www.jni.nu/cris.git#for-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git#test +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/upstream-sfr.git#mips-for-linux-next +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.kernel.org/pub/scm/linux/kernel/git/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 git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git#master +tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master +unicore32 git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git#unicore32 +xtensa git git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-next.git#master +ceph git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git#for-next +cifs git git://git.kernel.org/pub/scm/linux/kernel/git/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/ecryptfs/ecryptfs-2.6.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6.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-2.6-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://git.kernel.org/pub/scm/linux/kernel/git/joern/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://git.kernel.org/pub/scm/linux/kernel/git/bcopeland/omfs.git#for-next +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus.git#master +udf git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6.git#for_next +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-2.6#linux-next +of-pci git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#of-pci +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c quilt http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/ +bjdooks-i2c git git://git.fluff.org/bjdooks/linux.git#next-i2c +jdelvare-hwmon quilt http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +kernel-doc quilt http://oss.oracle.com/~rdunlap/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://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next.git#master +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git#for-next +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig.git#for-next +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6.git#master +libata git git://git.kernel.org/pub/scm/linux/kernel/git/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-acpi-2.6.git#test +idle-test git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git#idle-test +powertools git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6.git#tools-test +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-2.6.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/dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6.git#master +ibft git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6.git#master +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git#master +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 git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6.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://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6#master +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.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://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/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 +leds git git://git.o-hand.com/linux-rpurdie-leds#for-mm +backlight git git://git.o-hand.com/linux-rpurdie-backlight#for-mm +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb#kgdb-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-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://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git#drm-next +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git#master +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 +voltage git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git#for-next +security-testing git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git#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 +agp git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6.git#agp-next +watchdog git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog-next.git#master +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 +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 +suspend git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6.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 +i7core_edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core.git#linux_next +i7300_edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/edac.git#linux_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/linux-2.6-tip.git#auto-latest +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git#linux-next +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next +ptrace git git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc.git#ptrace +xen git git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/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 +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-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-2.6.git#master +namespace git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/linux-2.6-nsfd.git#master +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git#driver-core-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git#tty-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git#usb-next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git#staging-next +bkl-config git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl.git#config +tmem git git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem.git#linux-next +writeback git git://git.kernel.org/pub/scm/linux/kernel/git/wfg/writeback.git#next +arm-dt git git://git.secretlab.ca/git/linux-2.6#devicetree/arm-next +scsi-post-merge git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..796baaa7a76a --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,5162 @@ +$ date +Tue Jun 21 10:11:52 EST 2011 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at de505e7 Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging +Merging origin/master +$ git merge origin/master +Updating de505e7..ef46222 +Fast-forward + Documentation/filesystems/proc.txt | 1 + + MAINTAINERS | 7 + + arch/x86/include/asm/memblock.h | 2 +- + arch/x86/include/asm/pvclock.h | 9 +- + arch/x86/kvm/mmu.c | 2 +- + arch/x86/kvm/paging_tmpl.h | 2 +- + arch/x86/kvm/vmx.c | 3 +- + arch/x86/mm/memblock.c | 4 +- + arch/x86/platform/efi/efi.c | 29 ++- + arch/x86/xen/enlighten.c | 9 +- + arch/x86/xen/mmu.c | 12 +- + arch/x86/xen/setup.c | 10 +- + arch/x86/xen/smp.c | 7 + + drivers/input/evdev.c | 3 +- + drivers/input/input.c | 2 +- + drivers/input/keyboard/omap-keypad.c | 1 + + drivers/input/keyboard/sh_keysc.c | 2 +- + drivers/input/mousedev.c | 4 +- + drivers/xen/events.c | 2 +- + fs/btrfs/ctree.h | 15 ++- + fs/btrfs/delayed-inode.c | 32 +++- + fs/btrfs/delayed-inode.h | 5 +- + fs/btrfs/disk-io.c | 12 +- + fs/btrfs/extent-tree.c | 4 - + fs/btrfs/inode.c | 1 + + fs/btrfs/ioctl.c | 2 + + fs/btrfs/relocation.c | 30 ++- + fs/btrfs/sysfs.c | 146 ------------ + fs/btrfs/transaction.c | 114 ++++++++-- + fs/btrfs/tree-log.c | 2 +- + fs/timerfd.c | 5 +- + include/linux/clocksource.h | 1 + + include/linux/input/sh_keysc.h | 2 +- + include/linux/interrupt.h | 1 + + include/linux/smp.h | 5 +- + include/trace/events/irq.h | 3 +- + init/main.c | 1 + + kernel/rcutree.c | 398 ++------------------------------ + kernel/rcutree.h | 12 +- + kernel/rcutree_plugin.h | 419 +++++++++++++++++++++++++++++++++- + kernel/rcutree_trace.c | 32 ++- + kernel/smp.c | 5 +- + kernel/softirq.c | 2 +- + kernel/time/clocksource.c | 24 +- + kernel/trace/trace_printk.c | 5 +- + tools/perf/Makefile | 2 +- + tools/perf/util/trace-event-parse.c | 1 + + 47 files changed, 752 insertions(+), 640 deletions(-) +Merging fixes/fixes +$ git merge fixes/fixes +Already up-to-date. +Merging kbuild-current/rc-fixes +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arm-current/master +$ git merge arm-current/master +Already up-to-date. +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging 52xx-and-virtex-current/powerpc/merge +$ git merge 52xx-and-virtex-current/powerpc/merge +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net-current/master +$ git merge net-current/master +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 3 +- + drivers/bluetooth/btmrvl_debugfs.c | 12 + + drivers/isdn/gigaset/interface.c | 4 +- + drivers/misc/sgi-xp/xpnet.c | 6 +- + drivers/net/3c503.c | 3 +- + drivers/net/bfin_mac.c | 20 +- + drivers/net/bonding/bond_main.c | 1 + + drivers/net/fs_enet/mac-fcc.c | 2 +- + drivers/net/hp100.c | 4 +- + drivers/net/hplance.c | 2 +- + drivers/net/netxen/netxen_nic_main.c | 4 +- + drivers/net/phy/Kconfig | 1 + + drivers/net/phy/dp83640.c | 24 +- + drivers/net/ppp_async.c | 4 +- + drivers/net/pxa168_eth.c | 2 +- + drivers/net/r8169.c | 10 +- + drivers/net/tun.c | 24 ++- + drivers/net/usb/Kconfig | 10 + + drivers/net/usb/Makefile | 1 + + drivers/net/usb/kalmia.c | 384 ++++++++++++++++++++++++ + drivers/net/wan/farsync.c | 4 +- + drivers/net/wireless/mwifiex/cfg80211.c | 2 + + drivers/net/wireless/mwl8k.c | 4 +- + include/net/netfilter/nf_conntrack.h | 6 + + net/8021q/vlan.c | 2 +- + net/bluetooth/hci_event.c | 18 +- + net/bluetooth/l2cap_sock.c | 1 + + net/bluetooth/rfcomm/sock.c | 1 + + net/bluetooth/sco.c | 13 +- + net/bridge/br_device.c | 1 + + net/bridge/br_multicast.c | 4 +- + net/caif/cfmuxl.c | 2 +- + net/ieee802154/nl-phy.c | 3 +- + net/ipv4/af_inet.c | 1 + + net/ipv4/inet_diag.c | 14 +- + net/ipv4/netfilter/ip_queue.c | 3 +- + net/ipv4/netfilter/ip_tables.c | 2 +- + net/ipv4/netfilter/ipt_ecn.c | 7 +- + net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 4 +- + net/ipv4/ping.c | 1 - + net/ipv4/route.c | 4 +- + net/ipv4/tcp_ipv4.c | 1 + + net/ipv6/netfilter/ip6_queue.c | 3 +- + net/ipv6/tcp_ipv6.c | 1 + + net/netfilter/ipvs/ip_vs_conn.c | 10 +- + net/netfilter/ipvs/ip_vs_core.c | 1 + + net/netfilter/nfnetlink_log.c | 3 +- + net/netfilter/nfnetlink_queue.c | 3 +- + 48 files changed, 563 insertions(+), 77 deletions(-) + create mode 100644 drivers/net/usb/kalmia.c +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Auto-merging drivers/pci/pci.c +Merge made by recursive. + arch/x86/pci/acpi.c | 2 +- + drivers/pci/pci.c | 2 +- + drivers/pci/probe.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) +Merging wireless-current/master +$ git merge wireless-current/master +Merge made by recursive. + drivers/net/wireless/rtlwifi/pci.c | 13 ++++++++++++- + net/bluetooth/hci_conn.c | 6 +++--- + net/bluetooth/l2cap_core.c | 21 +++++++++++++++------ + 3 files changed, 30 insertions(+), 10 deletions(-) +Merging driver-core.current/driver-core-linus +$ git merge driver-core.current/driver-core-linus +Merge made by recursive. + drivers/base/platform.c | 2 +- + drivers/connector/connector.c | 1 + + drivers/firmware/google/Kconfig | 1 + + drivers/misc/pti.c | 11 +++++++---- + drivers/misc/ti-st/st_core.c | 2 +- + drivers/misc/ti-st/st_kim.c | 8 ++++++-- + include/linux/connector.h | 2 +- + 7 files changed, 18 insertions(+), 9 deletions(-) +Merging tty.current/tty-linus +$ git merge tty.current/tty-linus +Merge made by recursive. + arch/arm/mach-exynos4/init.c | 1 + + arch/arm/mach-ux500/board-mop500-pins.c | 16 ++- + arch/arm/mach-ux500/board-mop500.c | 54 ++++++++++ + arch/arm/plat-samsung/include/plat/regs-serial.h | 2 + + drivers/tty/n_gsm.c | 26 ++++- + drivers/tty/n_tty.c | 1 + + drivers/tty/serial/8250.c | 1 + + drivers/tty/serial/8250_pci.c | 61 +++++++++++- + drivers/tty/serial/amba-pl011.c | 123 +++++++++++++++++++++- + drivers/tty/serial/bcm63xx_uart.c | 18 +++- + drivers/tty/serial/jsm/jsm_driver.c | 2 +- + drivers/tty/serial/s5pv210.c | 4 +- + drivers/tty/tty_ldisc.c | 4 +- + include/linux/amba/serial.h | 3 + + 14 files changed, 296 insertions(+), 20 deletions(-) +Merging usb.current/usb-linus +$ git merge usb.current/usb-linus +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 6 ++++-- + drivers/usb/core/driver.c | 11 ++++++++++- + drivers/usb/core/hub.c | 13 ++++++++----- + drivers/usb/host/ehci-hcd.c | 4 ++++ + drivers/usb/host/ohci-hcd.c | 4 +++- + drivers/usb/musb/musb_gadget.c | 6 ++++++ + drivers/usb/musb/musb_host.c | 2 +- + drivers/usb/serial/ti_usb_3410_5052.c | 1 + + 8 files changed, 37 insertions(+), 10 deletions(-) +Merging staging.current/staging-linus +$ git merge staging.current/staging-linus +Already up-to-date. +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Already up-to-date. +Merging md-current/for-linus +$ git merge md-current/for-linus +Already up-to-date. +Merging audit-current/for-linus +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master +$ git merge crypto-current/master +Merge made by recursive. + drivers/crypto/picoxcell_crypto.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging ide-curent/master +$ git merge ide-curent/master +Already up-to-date. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging sh-current/sh-fixes-for-linus +$ git merge sh-current/sh-fixes-for-linus +Already up-to-date. +Merging rmobile-current/rmobile-fixes-for-linus +$ git merge rmobile-current/rmobile-fixes-for-linus +Already up-to-date. +Merging fbdev-current/fbdev-fixes-for-linus +$ git merge fbdev-current/fbdev-fixes-for-linus +Already up-to-date. +Merging devicetree-current/devicetree/merge +$ git merge devicetree-current/devicetree/merge +Merge made by recursive. + include/linux/of_address.h | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) +Merging spi-current/spi/merge +$ git merge spi-current/spi/merge +Already up-to-date. +Merging arm/for-next +$ git merge arm/for-next +Merge made by recursive. + arch/arm/Kconfig | 3 + + arch/arm/include/asm/dma-mapping.h | 3 +- + arch/arm/include/asm/mach/map.h | 2 + + arch/arm/include/asm/memory.h | 7 + + arch/arm/include/asm/pgalloc.h | 2 +- + arch/arm/include/asm/pgtable.h | 23 ++-- + arch/arm/include/asm/scatterlist.h | 4 + + arch/arm/include/asm/tlb.h | 1 + + arch/arm/kernel/sleep.S | 70 +++----- + arch/arm/mach-exynos4/sleep.S | 10 +- + arch/arm/mach-pxa/sleep.S | 48 +++--- + arch/arm/mach-s3c64xx/sleep.S | 11 +- + arch/arm/mach-s5pv210/sleep.S | 10 +- + arch/arm/mach-sa1100/sleep.S | 17 +-- + arch/arm/mm/dma-mapping.c | 314 +++++++++++++++++++----------------- + arch/arm/mm/init.c | 1 + + arch/arm/mm/mm.h | 2 + + arch/arm/mm/mmu.c | 24 +++ + arch/arm/plat-s3c24xx/sleep.S | 12 +- + 19 files changed, 292 insertions(+), 272 deletions(-) +Merging arm-lpae/for-next +$ git merge arm-lpae/for-next +Resolved 'arch/arm/include/asm/pgalloc.h' using previous resolution. +Resolved 'arch/arm/include/asm/pgtable.h' using previous resolution. +Resolved 'arch/arm/include/asm/tlb.h' using previous resolution. +Resolved 'arch/arm/mm/context.c' using previous resolution. +Resolved 'arch/arm/mm/dma-mapping.c' using previous resolution. +Resolved 'arch/arm/mm/proc-v7.S' using previous resolution. +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/boot/compressed/head.S +Auto-merging arch/arm/include/asm/memory.h +Auto-merging arch/arm/include/asm/pgalloc.h +CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h +Auto-merging arch/arm/include/asm/pgtable.h +CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h +Auto-merging arch/arm/include/asm/tlb.h +CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h +Auto-merging arch/arm/kernel/sleep.S +Auto-merging arch/arm/mm/context.c +CONFLICT (content): Merge conflict in arch/arm/mm/context.c +Auto-merging arch/arm/mm/dma-mapping.c +CONFLICT (content): Merge conflict in arch/arm/mm/dma-mapping.c +Auto-merging arch/arm/mm/mm.h +Auto-merging arch/arm/mm/mmu.c +Auto-merging arch/arm/mm/proc-v7.S +CONFLICT (content): Merge conflict in arch/arm/mm/proc-v7.S +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 16b41eb] Merge remote-tracking branch 'arm-lpae/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/Kconfig | 2 +- + arch/arm/boot/compressed/head.S | 1 + + arch/arm/include/asm/assembler.h | 11 + + arch/arm/include/asm/memory.h | 4 +- + arch/arm/include/asm/page.h | 44 +--- + arch/arm/include/asm/pgalloc.h | 28 ++- + arch/arm/include/asm/pgtable-2level-hwdef.h | 93 ++++++ + arch/arm/include/asm/pgtable-2level-types.h | 69 +++++ + arch/arm/include/asm/pgtable-2level.h | 143 +++++++++ + arch/arm/include/asm/pgtable-3level-hwdef.h | 82 ++++++ + arch/arm/include/asm/pgtable-3level-types.h | 71 +++++ + arch/arm/include/asm/pgtable-3level.h | 107 +++++++ + arch/arm/include/asm/pgtable-hwdef.h | 81 +----- + arch/arm/include/asm/pgtable.h | 211 +++++--------- + arch/arm/include/asm/proc-fns.h | 25 ++ + arch/arm/include/asm/setup.h | 8 + + arch/arm/include/asm/tlb.h | 11 +- + arch/arm/include/asm/tlbflush.h | 4 +- + arch/arm/include/asm/types.h | 11 +- + arch/arm/kernel/head.S | 119 ++++++--- + arch/arm/kernel/module.c | 2 +- + arch/arm/kernel/setup.c | 10 + + arch/arm/kernel/sleep.S | 2 + + arch/arm/mm/Kconfig | 13 + + arch/arm/mm/Makefile | 4 + + arch/arm/mm/alignment.c | 8 +- + arch/arm/mm/context.c | 19 +- + arch/arm/mm/fault.c | 82 +++++- + arch/arm/mm/idmap.c | 36 +++- + arch/arm/mm/ioremap.c | 17 +- + arch/arm/mm/mm.h | 4 +- + arch/arm/mm/mmu.c | 51 +++- + arch/arm/mm/pgd.c | 51 +++- + arch/arm/mm/proc-macros.S | 5 +- + arch/arm/mm/proc-v7.S | 10 +- + arch/arm/mm/proc-v7lpae.S | 422 +++++++++++++++++++++++++++ + 36 files changed, 1516 insertions(+), 345 deletions(-) + create mode 100644 arch/arm/include/asm/pgtable-2level-hwdef.h + create mode 100644 arch/arm/include/asm/pgtable-2level-types.h + create mode 100644 arch/arm/include/asm/pgtable-2level.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 + create mode 100644 arch/arm/mm/proc-v7lpae.S +Merging at91/at91-next +$ git merge at91/at91-next +Merge made by recursive. + arch/arm/mach-at91/Makefile | 2 +- + arch/arm/mach-at91/at91cap9.c | 45 +--- + arch/arm/mach-at91/at91rm9200.c | 47 +--- + arch/arm/mach-at91/at91sam9260.c | 100 ++------- + arch/arm/mach-at91/at91sam9261.c | 62 +----- + arch/arm/mach-at91/at91sam9263.c | 51 +---- + arch/arm/mach-at91/at91sam9g45.c | 45 +--- + arch/arm/mach-at91/at91sam9rl.c | 59 +---- + arch/arm/mach-at91/board-1arm.c | 11 +- + arch/arm/mach-at91/board-afeb-9260v1.c | 12 +- + arch/arm/mach-at91/board-cam60.c | 12 +- + arch/arm/mach-at91/board-cap9adk.c | 12 +- + arch/arm/mach-at91/board-carmeva.c | 11 +- + arch/arm/mach-at91/board-cpu9krea.c | 11 +- + arch/arm/mach-at91/board-cpuat91.c | 11 +- + arch/arm/mach-at91/board-csb337.c | 11 +- + arch/arm/mach-at91/board-csb637.c | 11 +- + arch/arm/mach-at91/board-eb9200.c | 11 +- + arch/arm/mach-at91/board-ecbat91.c | 11 +- + arch/arm/mach-at91/board-eco920.c | 11 +- + arch/arm/mach-at91/board-flexibity.c | 11 +- + arch/arm/mach-at91/board-foxg20.c | 12 +- + arch/arm/mach-at91/board-gsia18s.c | 7 +- + arch/arm/mach-at91/board-kafa.c | 11 +- + arch/arm/mach-at91/board-kb9202.c | 11 +- + arch/arm/mach-at91/board-neocore926.c | 12 +- + arch/arm/mach-at91/board-pcontrol-g20.c | 9 +- + arch/arm/mach-at91/board-picotux200.c | 11 +- + arch/arm/mach-at91/board-qil-a9260.c | 12 +- + arch/arm/mach-at91/board-rm9200dk.c | 11 +- + arch/arm/mach-at91/board-rm9200ek.c | 11 +- + arch/arm/mach-at91/board-sam9-l9260.c | 12 +- + arch/arm/mach-at91/board-sam9260ek.c | 12 +- + arch/arm/mach-at91/board-sam9261ek.c | 12 +- + arch/arm/mach-at91/board-sam9263ek.c | 12 +- + arch/arm/mach-at91/board-sam9g20ek.c | 16 +- + arch/arm/mach-at91/board-sam9m10g45ek.c | 12 +- + arch/arm/mach-at91/board-sam9rlek.c | 12 +- + arch/arm/mach-at91/board-snapper9260.c | 11 +- + arch/arm/mach-at91/board-stamp9g20.c | 12 +- + arch/arm/mach-at91/board-usb-a9260.c | 12 +- + arch/arm/mach-at91/board-usb-a9263.c | 12 +- + arch/arm/mach-at91/board-yl-9200.c | 12 +- + arch/arm/mach-at91/generic.h | 34 +-- + arch/arm/mach-at91/include/mach/at91_dbgu.h | 27 ++- + arch/arm/mach-at91/include/mach/at91cap9.h | 1 - + arch/arm/mach-at91/include/mach/at91rm9200.h | 1 - + arch/arm/mach-at91/include/mach/at91sam9260.h | 1 - + arch/arm/mach-at91/include/mach/at91sam9261.h | 1 - + arch/arm/mach-at91/include/mach/at91sam9263.h | 1 - + arch/arm/mach-at91/include/mach/at91sam9g45.h | 1 - + arch/arm/mach-at91/include/mach/at91sam9rl.h | 1 - + arch/arm/mach-at91/include/mach/cpu.h | 159 ++++++++------ + arch/arm/mach-at91/include/mach/debug-macro.S | 14 +- + arch/arm/mach-at91/include/mach/hardware.h | 14 ++ + arch/arm/mach-at91/include/mach/io.h | 16 ++- + arch/arm/mach-at91/setup.c | 295 +++++++++++++++++++++++++ + arch/arm/mach-at91/soc.h | 59 +++++ + 58 files changed, 695 insertions(+), 741 deletions(-) + create mode 100644 arch/arm/mach-at91/setup.c + create mode 100644 arch/arm/mach-at91/soc.h +Merging davinci/davinci-next +$ git merge davinci/davinci-next +Already up-to-date. +Merging i.MX/for-next +$ git merge i.MX/for-next +Auto-merging arch/arm/Kconfig +Removing arch/arm/mach-mxs/gpio.h +Removing arch/arm/plat-mxc/include/mach/iomux.h +Auto-merging drivers/gpio/Kconfig +Auto-merging drivers/gpio/gpio-mxc.c +Auto-merging drivers/gpio/gpio-mxs.c +Merge made by recursive. + arch/arm/Kconfig | 1 + + arch/arm/configs/mx51_defconfig | 3 +- + arch/arm/configs/mxs_defconfig | 4 +- + arch/arm/mach-imx/Kconfig | 5 + + arch/arm/mach-imx/dma-v1.c | 25 +-- + arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 23 +-- + arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 15 +- + arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 13 +- + arch/arm/mach-imx/mach-apf9328.c | 9 +- + arch/arm/mach-imx/mach-armadillo5x0.c | 2 + + arch/arm/mach-imx/mach-bug.c | 2 + + arch/arm/mach-imx/mach-cpuimx27.c | 2 + + arch/arm/mach-imx/mach-cpuimx35.c | 2 + + arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 2 + + arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 4 +- + arch/arm/mach-imx/mach-imx27ipcam.c | 2 + + arch/arm/mach-imx/mach-imx27lite.c | 2 + + arch/arm/mach-imx/mach-kzm_arm11_01.c | 2 + + arch/arm/mach-imx/mach-mx1ads.c | 2 + + arch/arm/mach-imx/mach-mx21ads.c | 2 + + arch/arm/mach-imx/mach-mx25_3ds.c | 2 + + arch/arm/mach-imx/mach-mx27_3ds.c | 4 +- + arch/arm/mach-imx/mach-mx27ads.c | 2 + + arch/arm/mach-imx/mach-mx31_3ds.c | 2 + + arch/arm/mach-imx/mach-mx31ads.c | 2 + + arch/arm/mach-imx/mach-mx31lilly.c | 2 + + arch/arm/mach-imx/mach-mx31lite.c | 2 + + arch/arm/mach-imx/mach-mx31moboard.c | 16 +- + arch/arm/mach-imx/mach-mx35_3ds.c | 4 +- + arch/arm/mach-imx/mach-mxt_td60.c | 2 + + arch/arm/mach-imx/mach-pca100.c | 2 + + arch/arm/mach-imx/mach-pcm037.c | 2 + + arch/arm/mach-imx/mach-pcm038.c | 2 + + arch/arm/mach-imx/mach-pcm043.c | 2 + + arch/arm/mach-imx/mach-qong.c | 2 + + arch/arm/mach-imx/mach-scb9328.c | 2 + + arch/arm/mach-imx/mach-vpr200.c | 2 + + arch/arm/mach-imx/mm-imx1.c | 17 +- + arch/arm/mach-imx/mm-imx21.c | 21 +- + arch/arm/mach-imx/mm-imx25.c | 16 +- + arch/arm/mach-imx/mm-imx27.c | 21 +- + arch/arm/mach-imx/mm-imx31.c | 15 +- + arch/arm/mach-imx/mm-imx35.c | 15 +- + arch/arm/mach-imx/mx31lite-db.c | 15 +- + arch/arm/mach-mx5/Kconfig | 14 + + arch/arm/mach-mx5/Makefile | 1 + + arch/arm/mach-mx5/board-cpuimx51.c | 14 +- + arch/arm/mach-mx5/board-cpuimx51sd.c | 2 + + arch/arm/mach-mx5/board-mx50_rdp.c | 2 + + arch/arm/mach-mx5/board-mx51_3ds.c | 5 +- + arch/arm/mach-mx5/board-mx51_babbage.c | 58 +++-- + arch/arm/mach-mx5/board-mx51_efikamx.c | 17 +- + arch/arm/mach-mx5/board-mx51_efikasb.c | 18 +- + arch/arm/mach-mx5/board-mx53_ard.c | 176 +++++++++++++ + arch/arm/mach-mx5/board-mx53_evk.c | 19 ++ + arch/arm/mach-mx5/board-mx53_loco.c | 37 +++- + arch/arm/mach-mx5/board-mx53_smd.c | 2 + + arch/arm/mach-mx5/devices.c | 64 ----- + arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c | 24 +-- + arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c | 19 +-- + arch/arm/mach-mx5/mm-mx50.c | 21 +- + arch/arm/mach-mx5/mm.c | 25 ++- + arch/arm/mach-mxs/Kconfig | 2 + + arch/arm/mach-mxs/Makefile | 2 +- + arch/arm/mach-mxs/devices.c | 11 + + arch/arm/mach-mxs/devices/Makefile | 1 + + arch/arm/mach-mxs/devices/platform-gpio-mxs.c | 53 ++++ + arch/arm/mach-mxs/gpio.h | 34 --- + arch/arm/mach-mxs/include/mach/devices-common.h | 2 + + arch/arm/mach-mxs/mach-mx28evk.c | 22 ++- + arch/arm/mach-mxs/mach-tx28.c | 5 +- + arch/arm/mach-mxs/mm-mx23.c | 1 - + arch/arm/mach-mxs/mm-mx28.c | 1 - + arch/arm/plat-mxc/Makefile | 2 +- + arch/arm/plat-mxc/avic.c | 12 +- + arch/arm/plat-mxc/devices.c | 11 + + arch/arm/plat-mxc/devices/Makefile | 1 + + arch/arm/plat-mxc/devices/platform-gpio-mxc.c | 32 +++ + arch/arm/plat-mxc/include/mach/common.h | 12 +- + arch/arm/plat-mxc/include/mach/devices-common.h | 2 + + arch/arm/plat-mxc/include/mach/gpio.h | 27 -- + arch/arm/plat-mxc/include/mach/hardware.h | 28 +-- + arch/arm/plat-mxc/include/mach/iomux-mx53.h | 10 +- + arch/arm/plat-mxc/include/mach/iomux-v1.h | 3 - + arch/arm/plat-mxc/include/mach/iomux.h | 26 -- + arch/arm/plat-mxc/include/mach/mx53.h | 16 +- + arch/arm/plat-mxc/include/mach/mxc.h | 8 +- + arch/arm/plat-mxc/include/mach/timex.h | 13 +- + arch/arm/plat-mxc/include/mach/uncompress.h | 1 + + arch/arm/plat-mxc/irq-common.c | 13 +- + arch/arm/plat-mxc/pwm.c | 8 +- + arch/arm/plat-mxc/tzic.c | 99 ++------ + drivers/gpio/Kconfig | 9 + + drivers/gpio/Makefile | 2 + + .../arm/plat-mxc/gpio.c => drivers/gpio/gpio-mxc.c | 266 +++++++++++--------- + .../arm/mach-mxs/gpio.c => drivers/gpio/gpio-mxs.c | 227 ++++++++++------- + 96 files changed, 1001 insertions(+), 773 deletions(-) + create mode 100644 arch/arm/mach-mx5/board-mx53_ard.c + create mode 100644 arch/arm/mach-mxs/devices/platform-gpio-mxs.c + delete mode 100644 arch/arm/mach-mxs/gpio.h + create mode 100644 arch/arm/plat-mxc/devices/platform-gpio-mxc.c + delete mode 100644 arch/arm/plat-mxc/include/mach/iomux.h + rename arch/arm/plat-mxc/gpio.c => drivers/gpio/gpio-mxc.c (60%) + rename arch/arm/mach-mxs/gpio.c => drivers/gpio/gpio-mxs.c (58%) +Merging linux-spec/for-next +$ git merge linux-spec/for-next +Already up-to-date. +Merging msm/for-next +$ git merge msm/for-next +Auto-merging arch/arm/mach-msm/acpuclock-arm11.c +Merge made by recursive. + arch/arm/mach-msm/Makefile | 5 +- + arch/arm/mach-msm/acpuclock-arm11.c | 2 +- + arch/arm/mach-msm/board-halibut.c | 1 + + arch/arm/mach-msm/board-mahimahi.c | 1 + + arch/arm/mach-msm/board-msm7x30.c | 1 + + arch/arm/mach-msm/board-msm8960.c | 18 + + arch/arm/mach-msm/board-msm8x60.c | 9 +- + arch/arm/mach-msm/board-qsd8x50.c | 1 + + arch/arm/mach-msm/board-trout.c | 1 + + arch/arm/mach-msm/clock-dummy.c | 81 +++++ + arch/arm/mach-msm/clock.h | 11 + + arch/arm/mach-msm/devices-msm7x00.c | 21 ++- + arch/arm/mach-msm/devices-msm7x30.c | 21 ++- + arch/arm/mach-msm/devices-msm8960.c | 181 +++++++++++ + arch/arm/mach-msm/devices-msm8x60.c | 56 ++++ + arch/arm/mach-msm/devices-qsd8x50.c | 21 ++- + arch/arm/mach-msm/devices.h | 8 + + arch/arm/mach-msm/dma.c | 391 ++++++++++++++++++----- + arch/arm/mach-msm/include/mach/dma.h | 84 +++--- + arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | 5 +- + arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 5 +- + arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 3 + + arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | 5 +- + arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 6 + + arch/arm/mach-msm/io.c | 3 - + 25 files changed, 808 insertions(+), 133 deletions(-) + create mode 100644 arch/arm/mach-msm/clock-dummy.c + create mode 100644 arch/arm/mach-msm/devices-msm8x60.c +Merging omap/for-next +$ git merge omap/for-next +Already up-to-date. +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging samsung/next-samsung +$ git merge samsung/next-samsung +Already up-to-date. +Merging s5p/for-next +$ git merge s5p/for-next +Auto-merging arch/arm/Kconfig +Auto-merging drivers/tty/serial/s5pv210.c +Merge made by recursive. + arch/arm/Kconfig | 6 + + arch/arm/mach-exynos4/clock.c | 341 +++++++++----- + arch/arm/mach-exynos4/cpu.c | 7 +- + arch/arm/mach-exynos4/dev-audio.c | 5 + + arch/arm/mach-exynos4/include/mach/clkdev.h | 7 + + arch/arm/mach-exynos4/include/mach/map.h | 3 + + arch/arm/mach-exynos4/include/mach/pm-core.h | 10 + + arch/arm/mach-exynos4/include/mach/regs-audss.h | 25 + + arch/arm/mach-exynos4/mach-smdkc210.c | 7 + + arch/arm/mach-exynos4/mach-smdkv310.c | 7 + + arch/arm/mach-exynos4/time.c | 2 + + arch/arm/mach-s3c2410/include/mach/pm-core.h | 3 + + arch/arm/mach-s3c2412/clock.c | 36 +-- + arch/arm/mach-s3c2416/clock.c | 10 +- + arch/arm/mach-s3c2440/clock.c | 3 - + arch/arm/mach-s3c2443/clock.c | 16 +- + arch/arm/mach-s3c64xx/Kconfig | 23 + + arch/arm/mach-s3c64xx/Makefile | 1 + + arch/arm/mach-s3c64xx/clock.c | 86 +--- + arch/arm/mach-s3c64xx/include/mach/clkdev.h | 7 + + arch/arm/mach-s3c64xx/include/mach/irqs.h | 4 +- + arch/arm/mach-s3c64xx/include/mach/pm-core.h | 19 +- + arch/arm/mach-s3c64xx/irq.c | 12 +- + arch/arm/mach-s3c64xx/mach-crag6410.c | 574 +++++++++++++++++++++++ + arch/arm/mach-s3c64xx/mach-smdk6410.c | 26 +- + arch/arm/mach-s5p64x0/clock-s5p6440.c | 74 +--- + arch/arm/mach-s5p64x0/clock-s5p6450.c | 68 +-- + arch/arm/mach-s5p64x0/include/mach/clkdev.h | 7 + + arch/arm/mach-s5pc100/clock.c | 163 ++----- + arch/arm/mach-s5pc100/include/mach/clkdev.h | 7 + + arch/arm/mach-s5pv210/clock.c | 130 ++---- + arch/arm/mach-s5pv210/include/mach/clkdev.h | 7 + + arch/arm/mach-s5pv210/include/mach/pm-core.h | 3 + + arch/arm/plat-s3c24xx/clock-dclk.c | 4 - + arch/arm/plat-s3c24xx/include/mach/clkdev.h | 7 + + arch/arm/plat-s3c24xx/s3c2410-clock.c | 21 +- + arch/arm/plat-s3c24xx/s3c2443-clock.c | 39 +-- + arch/arm/plat-s5p/Kconfig | 1 + + arch/arm/plat-s5p/include/plat/map-s5p.h | 1 + + arch/arm/plat-s5p/s5p-time.c | 9 + + arch/arm/plat-samsung/clock.c | 98 +---- + arch/arm/plat-samsung/include/plat/audio.h | 8 + + arch/arm/plat-samsung/include/plat/clock.h | 3 + + arch/arm/plat-samsung/pm.c | 2 + + arch/arm/plat-samsung/pwm-clock.c | 10 + + arch/arm/plat-samsung/time.c | 2 + + drivers/tty/serial/s3c2400.c | 2 - + drivers/tty/serial/s3c2410.c | 2 - + drivers/tty/serial/s3c2412.c | 2 - + drivers/tty/serial/s3c2440.c | 2 - + drivers/tty/serial/s3c24a0.c | 2 - + drivers/tty/serial/s3c6400.c | 2 - + drivers/tty/serial/s5pv210.c | 7 - + drivers/tty/serial/samsung.c | 9 +- + drivers/tty/serial/samsung.h | 19 - + 55 files changed, 1182 insertions(+), 769 deletions(-) + create mode 100644 arch/arm/mach-exynos4/include/mach/clkdev.h + create mode 100644 arch/arm/mach-exynos4/include/mach/regs-audss.h + create mode 100644 arch/arm/mach-s3c64xx/include/mach/clkdev.h + create mode 100644 arch/arm/mach-s3c64xx/mach-crag6410.c + create mode 100644 arch/arm/mach-s5p64x0/include/mach/clkdev.h + create mode 100644 arch/arm/mach-s5pc100/include/mach/clkdev.h + create mode 100644 arch/arm/mach-s5pv210/include/mach/clkdev.h + create mode 100644 arch/arm/plat-s3c24xx/include/mach/clkdev.h +Merging tegra/for-next +$ git merge tegra/for-next +Already up-to-date. +Merging ux500-core/ux500-core +$ git merge ux500-core/ux500-core +Auto-merging arch/arm/mach-ux500/board-mop500.c +Merge made by recursive. + arch/arm/configs/u8500_defconfig | 6 +++- + arch/arm/mach-ux500/Kconfig | 8 ++++- + arch/arm/mach-ux500/board-mop500-regulators.c | 9 +++++- + arch/arm/mach-ux500/board-mop500-sdi.c | 42 +++++++++++++++++------- + arch/arm/mach-ux500/board-mop500.c | 3 ++ + arch/arm/mach-ux500/cpu-db5500.c | 1 + + 6 files changed, 54 insertions(+), 15 deletions(-) +Merging xilinx/arm-next +$ git merge xilinx/arm-next +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/mm/Kconfig +Merge made by recursive. + Documentation/devicetree/bindings/arm/xilinx.txt | 7 + + arch/arm/Kconfig | 14 + + arch/arm/Makefile | 2 + + arch/arm/boot/dts/zynq-ep107.dts | 52 ++++ + arch/arm/mach-zynq/Makefile | 6 + + arch/arm/mach-zynq/Makefile.boot | 3 + + arch/arm/mach-zynq/board_dt.c | 37 +++ + arch/arm/mach-zynq/common.c | 102 ++++++++ + arch/arm/mach-zynq/common.h | 29 ++ + arch/arm/mach-zynq/include/mach/clkdev.h | 32 +++ + arch/arm/mach-zynq/include/mach/debug-macro.S | 36 +++ + arch/arm/mach-zynq/include/mach/entry-macro.S | 30 +++ + arch/arm/mach-zynq/include/mach/hardware.h | 18 ++ + arch/arm/mach-zynq/include/mach/io.h | 33 +++ + arch/arm/mach-zynq/include/mach/irqs.h | 21 ++ + arch/arm/mach-zynq/include/mach/memory.h | 22 ++ + arch/arm/mach-zynq/include/mach/system.h | 28 ++ + arch/arm/mach-zynq/include/mach/timex.h | 23 ++ + arch/arm/mach-zynq/include/mach/uart.h | 25 ++ + arch/arm/mach-zynq/include/mach/uncompress.h | 51 ++++ + arch/arm/mach-zynq/include/mach/vmalloc.h | 20 ++ + arch/arm/mach-zynq/include/mach/zynq_soc.h | 48 ++++ + arch/arm/mach-zynq/timer.c | 298 ++++++++++++++++++++++ + arch/arm/mm/Kconfig | 2 +- + 24 files changed, 938 insertions(+), 1 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/xilinx.txt + create mode 100644 arch/arm/boot/dts/zynq-ep107.dts + create mode 100644 arch/arm/mach-zynq/Makefile + create mode 100644 arch/arm/mach-zynq/Makefile.boot + create mode 100644 arch/arm/mach-zynq/board_dt.c + create mode 100644 arch/arm/mach-zynq/common.c + create mode 100644 arch/arm/mach-zynq/common.h + create mode 100644 arch/arm/mach-zynq/include/mach/clkdev.h + create mode 100644 arch/arm/mach-zynq/include/mach/debug-macro.S + create mode 100644 arch/arm/mach-zynq/include/mach/entry-macro.S + create mode 100644 arch/arm/mach-zynq/include/mach/hardware.h + create mode 100644 arch/arm/mach-zynq/include/mach/io.h + create mode 100644 arch/arm/mach-zynq/include/mach/irqs.h + create mode 100644 arch/arm/mach-zynq/include/mach/memory.h + create mode 100644 arch/arm/mach-zynq/include/mach/system.h + create mode 100644 arch/arm/mach-zynq/include/mach/timex.h + create mode 100644 arch/arm/mach-zynq/include/mach/uart.h + create mode 100644 arch/arm/mach-zynq/include/mach/uncompress.h + create mode 100644 arch/arm/mach-zynq/include/mach/vmalloc.h + create mode 100644 arch/arm/mach-zynq/include/mach/zynq_soc.h + create mode 100644 arch/arm/mach-zynq/timer.c +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Merge made by recursive. + arch/blackfin/Kconfig | 10 + + arch/blackfin/configs/BF561-EZKIT_defconfig | 8 +- + arch/blackfin/include/asm/gptimers.h | 19 ++ + arch/blackfin/include/asm/mutex.h | 77 +-------- + arch/blackfin/include/asm/pda.h | 10 + + arch/blackfin/kernel/Makefile | 1 + + arch/blackfin/kernel/asm-offsets.c | 10 + + arch/blackfin/kernel/debug-mmrs.c | 56 ++++-- + arch/blackfin/kernel/gptimers.c | 93 +++++------ + arch/blackfin/kernel/process.c | 1 - + arch/blackfin/kernel/pwm.c | 100 ++++++++++ + arch/blackfin/kernel/setup.c | 16 +- + arch/blackfin/kernel/time.c | 4 +- + arch/blackfin/kernel/vmlinux.lds.S | 1 + + arch/blackfin/mach-bf518/boards/ezbrd.c | 50 ----- + arch/blackfin/mach-bf518/boards/tcm-bf518.c | 38 ---- + arch/blackfin/mach-bf518/include/mach/anomaly.h | 24 ++- + arch/blackfin/mach-bf527/boards/ad7160eval.c | 10 - + arch/blackfin/mach-bf527/boards/cm_bf527.c | 37 ---- + arch/blackfin/mach-bf527/boards/ezbrd.c | 53 ------ + arch/blackfin/mach-bf527/boards/ezkit.c | 56 +------ + arch/blackfin/mach-bf527/boards/tll6527m.c | 70 ------- + arch/blackfin/mach-bf527/include/mach/anomaly.h | 34 +++-- + arch/blackfin/mach-bf533/boards/H8606.c | 20 -- + arch/blackfin/mach-bf533/boards/blackstamp.c | 10 - + arch/blackfin/mach-bf533/boards/cm_bf533.c | 21 --- + arch/blackfin/mach-bf533/boards/ezkit.c | 28 --- + arch/blackfin/mach-bf533/boards/ip0x.c | 1 - + arch/blackfin/mach-bf533/boards/stamp.c | 70 +++++--- + arch/blackfin/mach-bf533/include/mach/anomaly.h | 19 ++- + arch/blackfin/mach-bf537/boards/cm_bf537e.c | 43 +++--- + arch/blackfin/mach-bf537/boards/cm_bf537u.c | 55 ++++--- + arch/blackfin/mach-bf537/boards/dnp5370.c | 2 - + arch/blackfin/mach-bf537/boards/minotaur.c | 2 - + arch/blackfin/mach-bf537/boards/pnav10.c | 29 --- + arch/blackfin/mach-bf537/boards/stamp.c | 125 +++----------- + arch/blackfin/mach-bf537/boards/tcm_bf537.c | 43 +++--- + arch/blackfin/mach-bf537/include/mach/anomaly.h | 34 +++-- + arch/blackfin/mach-bf538/boards/ezkit.c | 25 --- + arch/blackfin/mach-bf538/include/mach/anomaly.h | 38 +++-- + arch/blackfin/mach-bf548/boards/cm_bf548.c | 15 -- + arch/blackfin/mach-bf548/boards/ezkit.c | 23 --- + arch/blackfin/mach-bf548/include/mach/anomaly.h | 220 ++++++++++++----------- + arch/blackfin/mach-bf561/boards/acvilon.c | 9 - + arch/blackfin/mach-bf561/boards/cm_bf561.c | 50 +++--- + arch/blackfin/mach-bf561/boards/ezkit.c | 32 +++- + arch/blackfin/mach-bf561/include/mach/anomaly.h | 132 ++++++++------ + arch/blackfin/mach-bf561/secondary.S | 152 ++++++---------- + arch/blackfin/mach-common/head.S | 36 ++--- + arch/blackfin/mach-common/smp.c | 17 +- + 50 files changed, 805 insertions(+), 1224 deletions(-) + create mode 100644 arch/blackfin/kernel/pwm.c +Merging cris/for-next +$ git merge cris/for-next +Auto-merging drivers/net/cris/eth_v10.c +Merge made by recursive. + 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 ia64/test +$ git merge ia64/test +Merge made by recursive. + arch/ia64/Kconfig | 4 +++ + arch/ia64/include/asm/gpio.h | 55 ++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 59 insertions(+), 0 deletions(-) + create mode 100644 arch/ia64/include/asm/gpio.h +Merging m68k/for-next +$ git merge m68k/for-next +Merge made by recursive. + arch/m68k/amiga/chipram.c | 136 ++++++++++++++++++++----------------------- + arch/sparc/kernel/ioport.c | 32 ++-------- + include/linux/ioport.h | 1 + + kernel/resource.c | 21 +++++++ + 4 files changed, 92 insertions(+), 98 deletions(-) +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Removing arch/m68k/include/asm/bitops_mm.h +Removing arch/m68k/include/asm/bitops_no.h +Removing arch/m68k/include/asm/hardirq_mm.h +Removing arch/m68k/include/asm/hardirq_no.h +Removing arch/m68k/include/asm/system_mm.h +Removing arch/m68k/include/asm/system_no.h +Removing arch/m68k/kernel/module_mm.c +Removing arch/m68k/kernel/module_no.c +Removing arch/m68k/platform/5206e/Makefile +Removing arch/m68k/platform/5206e/config.c +Removing arch/m68k/platform/5206e/gpio.c +Merge made by recursive. + arch/m68k/Makefile_no | 2 +- + arch/m68k/include/asm/bitops.h | 522 ++++++++++++++++++++++++++++++++++- + arch/m68k/include/asm/bitops_mm.h | 501 --------------------------------- + arch/m68k/include/asm/bitops_no.h | 333 ---------------------- + arch/m68k/include/asm/entry_no.h | 12 +- + arch/m68k/include/asm/hardirq.h | 35 +++- + arch/m68k/include/asm/hardirq_mm.h | 16 - + arch/m68k/include/asm/hardirq_no.h | 19 -- + arch/m68k/include/asm/irq.h | 9 - + arch/m68k/include/asm/module.h | 31 +-- + arch/m68k/include/asm/system.h | 194 +++++++++++++- + arch/m68k/include/asm/system_mm.h | 193 ------------- + arch/m68k/include/asm/system_no.h | 153 ---------- + arch/m68k/kernel/module.c | 157 ++++++++++- + arch/m68k/kernel/module_mm.c | 155 ----------- + arch/m68k/kernel/module_no.c | 126 --------- + arch/m68k/platform/5206/config.c | 6 + + arch/m68k/platform/5206e/Makefile | 18 -- + arch/m68k/platform/5206e/config.c | 127 --------- + arch/m68k/platform/5206e/gpio.c | 49 ---- + arch/m68k/platform/68328/entry.S | 13 +- + arch/m68k/platform/68360/entry.S | 13 +- + arch/m68k/platform/coldfire/entry.S | 24 +- + 23 files changed, 947 insertions(+), 1761 deletions(-) + delete mode 100644 arch/m68k/include/asm/bitops_mm.h + delete mode 100644 arch/m68k/include/asm/bitops_no.h + delete mode 100644 arch/m68k/include/asm/hardirq_mm.h + delete mode 100644 arch/m68k/include/asm/hardirq_no.h + delete mode 100644 arch/m68k/include/asm/system_mm.h + delete mode 100644 arch/m68k/include/asm/system_no.h + delete mode 100644 arch/m68k/kernel/module_mm.c + delete mode 100644 arch/m68k/kernel/module_no.c + delete mode 100644 arch/m68k/platform/5206e/Makefile + delete mode 100644 arch/m68k/platform/5206e/config.c + delete mode 100644 arch/m68k/platform/5206e/gpio.c +Merging microblaze/next +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 3 +- + arch/mips/Kbuild.platforms | 1 + + arch/mips/Makefile | 12 -- + arch/mips/ar7/clock.c | 2 +- + arch/mips/include/asm/fixmap.h | 10 +- + arch/mips/include/asm/gt64120.h | 2 - + arch/mips/include/asm/irq.h | 1 - + arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 1 - + arch/mips/include/asm/mach-bcm63xx/spaces.h | 17 ++ + arch/mips/include/asm/mach-generic/dma-coherence.h | 1 - + arch/mips/include/asm/mach-generic/spaces.h | 4 + + arch/mips/include/asm/mach-ip27/dma-coherence.h | 1 - + arch/mips/include/asm/mach-jazz/dma-coherence.h | 1 - + .../mips/include/asm/mach-loongson/dma-coherence.h | 1 - + .../include/asm/mach-malta/cpu-feature-overrides.h | 2 + + .../asm/mach-mipssim/cpu-feature-overrides.h | 2 + + .../asm/mach-powertv/cpu-feature-overrides.h | 59 ++++++ + arch/mips/include/asm/mach-powertv/dma-coherence.h | 1 - + arch/mips/include/asm/mach-tx39xx/spaces.h | 17 ++ + arch/mips/include/asm/mach-tx49xx/spaces.h | 17 ++ + arch/mips/include/asm/pgtable.h | 1 + + arch/mips/include/asm/smp-ops.h | 43 ++++- + arch/mips/include/asm/smtc.h | 1 + + arch/mips/include/asm/unistd.h | 21 ++- + arch/mips/kernel/cpu-probe.c | 1 - + arch/mips/kernel/i8259.c | 22 +-- + arch/mips/kernel/irq_cpu.c | 14 +- + arch/mips/kernel/perf_event.c | 2 - + arch/mips/kernel/scall32-o32.S | 1 + + arch/mips/kernel/scall64-64.S | 1 + + arch/mips/kernel/scall64-n32.S | 1 + + arch/mips/kernel/scall64-o32.S | 1 + + arch/mips/lantiq/clk.c | 13 ++ + arch/mips/loongson/lemote-2f/ec_kb3310b.c | 2 - + arch/mips/mipssim/sim_setup.c | 18 +- + arch/mips/mm/c-r4k.c | 4 + + arch/mips/mm/dma-default.c | 114 +++++++----- + arch/mips/mm/init.c | 8 +- + arch/mips/mm/mmap.c | 193 +++++++++++++++++--- + arch/mips/mm/pgtable-32.c | 2 +- + arch/mips/mm/pgtable-64.c | 2 +- + arch/mips/mti-malta/malta-init.c | 14 +- + arch/mips/mti-malta/malta-smtc.c | 2 +- + arch/mips/netlogic/Platform | 11 + + arch/mips/netlogic/xlr/irq.c | 2 +- + arch/mips/netlogic/xlr/smp.c | 13 +- + arch/mips/nxp/pnx8550/common/setup.c | 2 - + arch/mips/pci/ops-nile4.c | 1 - + arch/mips/pmc-sierra/msp71xx/msp_setup.c | 8 +- + arch/mips/pnx8550/common/setup.c | 2 - + arch/mips/rb532/devices.c | 24 +-- + arch/mips/sibyte/sb1250/irq.c | 8 + + 52 files changed, 505 insertions(+), 202 deletions(-) + create mode 100644 arch/mips/include/asm/mach-bcm63xx/spaces.h + create mode 100644 arch/mips/include/asm/mach-powertv/cpu-feature-overrides.h + create mode 100644 arch/mips/include/asm/mach-tx39xx/spaces.h + create mode 100644 arch/mips/include/asm/mach-tx49xx/spaces.h + create mode 100644 arch/mips/netlogic/Platform +Merging parisc/for-next +$ git merge parisc/for-next +Already up-to-date! +Merge made by recursive. +Merging powerpc/next +$ git merge powerpc/next +Auto-merging arch/powerpc/kernel/prom.c +Merge made by recursive. + Documentation/kernel-parameters.txt | 5 +++++ + arch/powerpc/include/asm/dbell.h | 2 +- + arch/powerpc/include/asm/smp.h | 2 +- + arch/powerpc/kernel/head_64.S | 2 +- + arch/powerpc/kernel/prom.c | 8 ++++++++ + arch/powerpc/kernel/setup_32.c | 1 - + arch/powerpc/kernel/setup_64.c | 6 +++--- + arch/powerpc/kernel/smp.c | 18 ++++++++++++++---- + arch/powerpc/mm/tlb_nohash.c | 4 ++-- + arch/powerpc/platforms/85xx/smp.c | 2 +- + arch/powerpc/platforms/iseries/smp.c | 2 +- + arch/powerpc/platforms/powermac/smp.c | 2 +- + arch/powerpc/platforms/pseries/smp.c | 2 +- + arch/powerpc/platforms/wsp/smp.c | 2 +- + arch/powerpc/sysdev/mpic.c | 2 +- + 15 files changed, 41 insertions(+), 19 deletions(-) +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging 52xx-and-virtex/powerpc/next +$ git merge 52xx-and-virtex/powerpc/next +Merge made by recursive. + arch/powerpc/boot/dts/charon.dts | 236 ++++++++++++++++++++++++++ + arch/powerpc/configs/52xx/tqm5200_defconfig | 20 ++- + arch/powerpc/platforms/52xx/mpc5200_simple.c | 1 + + 3 files changed, 249 insertions(+), 8 deletions(-) + create mode 100644 arch/powerpc/boot/dts/charon.dts +Merging galak/next +$ git merge galak/next +Recorded preimage for 'arch/powerpc/sysdev/mpic.c' +Resolved 'arch/powerpc/boot/dts/p2020ds.dts' using previous resolution. +Resolved 'arch/powerpc/boot/dts/p2020rdb.dts' using previous resolution. +Auto-merging arch/powerpc/boot/dts/p2020ds.dts +CONFLICT (content): Merge conflict in arch/powerpc/boot/dts/p2020ds.dts +Auto-merging arch/powerpc/boot/dts/p2020rdb.dts +CONFLICT (content): Merge conflict in arch/powerpc/boot/dts/p2020rdb.dts +Auto-merging arch/powerpc/sysdev/fsl_lbc.c +Auto-merging arch/powerpc/sysdev/mpic.c +CONFLICT (content): Merge conflict in arch/powerpc/sysdev/mpic.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/powerpc/sysdev/mpic.c'. +[master 4e08fd9] Merge remote-tracking branch 'galak/next' +$ git diff -M --stat --summary HEAD^.. + arch/powerpc/sysdev/fsl_lbc.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) +Merging s390/features +$ git merge s390/features +Removing arch/s390/kvm/sie64a.S +Merge made by recursive. + arch/s390/Kconfig | 1 + + arch/s390/boot/compressed/head31.S | 4 +- + arch/s390/boot/compressed/head64.S | 4 +- + arch/s390/include/asm/kvm_host.h | 1 + + arch/s390/include/asm/linkage.h | 5 +- + arch/s390/include/asm/lowcore.h | 2 +- + arch/s390/include/asm/mmu.h | 4 +- + arch/s390/include/asm/pgalloc.h | 7 +- + arch/s390/include/asm/pgtable.h | 42 ++ + arch/s390/include/asm/processor.h | 1 + + arch/s390/include/asm/thread_info.h | 2 + + arch/s390/include/asm/tlbflush.h | 2 +- + arch/s390/kernel/asm-offsets.c | 2 +- + arch/s390/kernel/base.S | 25 +- + arch/s390/kernel/compat_wrapper.S | 836 ++++++++++++---------------------- + arch/s390/kernel/entry.S | 32 +- + arch/s390/kernel/entry.h | 7 +- + arch/s390/kernel/entry64.S | 111 ++++-- + arch/s390/kernel/head.S | 7 +- + arch/s390/kernel/head31.S | 11 +- + arch/s390/kernel/head64.S | 11 +- + arch/s390/kernel/mcount.S | 16 +- + arch/s390/kernel/mcount64.S | 16 +- + arch/s390/kernel/reipl.S | 5 +- + arch/s390/kernel/reipl64.S | 5 +- + arch/s390/kernel/relocate_kernel.S | 6 +- + arch/s390/kernel/relocate_kernel64.S | 6 +- + arch/s390/kernel/s390_ksyms.c | 4 + + arch/s390/kernel/sclp.S | 5 +- + arch/s390/kernel/switch_cpu.S | 8 +- + arch/s390/kernel/switch_cpu64.S | 8 +- + arch/s390/kernel/swsusp_asm64.S | 8 +- + arch/s390/kernel/traps.c | 13 +- + arch/s390/kvm/Makefile | 2 +- + arch/s390/kvm/intercept.c | 1 + + arch/s390/kvm/kvm-s390.c | 1 + + arch/s390/kvm/kvm-s390.h | 1 + + arch/s390/kvm/priv.c | 49 ++ + arch/s390/kvm/sie64a.S | 98 ---- + arch/s390/lib/qrnnd.S | 5 +- + arch/s390/mm/fault.c | 17 +- + arch/s390/mm/hugetlbpage.c | 2 +- + arch/s390/mm/pgtable.c | 418 ++++++++++++++++- + arch/s390/mm/vmem.c | 8 +- + arch/s390/oprofile/init.c | 8 +- + 45 files changed, 992 insertions(+), 835 deletions(-) + delete mode 100644 arch/s390/kvm/sie64a.S +Merging sh/sh-latest +$ git merge sh/sh-latest +Merge made by recursive. + arch/sh/Makefile | 1 + + arch/sh/include/cpu-sh3/cpu/serial.h | 10 + + arch/sh/include/cpu-sh4a/cpu/serial.h | 7 + + arch/sh/kernel/cpu/sh3/Makefile | 18 +- + arch/sh/kernel/cpu/sh3/serial-sh770x.c | 33 ++ + arch/sh/kernel/cpu/sh3/serial-sh7710.c | 20 ++ + arch/sh/kernel/cpu/sh3/serial-sh7720.c | 36 ++ + arch/sh/kernel/cpu/sh3/setup-sh7705.c | 5 + + arch/sh/kernel/cpu/sh3/setup-sh770x.c | 9 + + arch/sh/kernel/cpu/sh3/setup-sh7720.c | 5 + + arch/sh/kernel/cpu/sh4/setup-sh7750.c | 4 +- + arch/sh/kernel/cpu/sh4/setup-sh7760.c | 4 + + arch/sh/kernel/cpu/sh4a/Makefile | 2 +- + arch/sh/kernel/cpu/sh4a/serial-sh7722.c | 23 ++ + arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 1 + + arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 6 + + arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 9 + + arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 9 + + arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 3 + + arch/sh/kernel/cpu/sh4a/setup-sh7780.c | 3 +- + arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 8 +- + arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 8 +- + drivers/dma/shdma.c | 22 +- + drivers/dma/shdma.h | 2 + + drivers/tty/serial/Kconfig | 2 +- + drivers/tty/serial/sh-sci.c | 564 +++++++++++++++++++------------ + drivers/tty/serial/sh-sci.h | 434 +----------------------- + include/linux/serial_sci.h | 68 ++++ + 28 files changed, 635 insertions(+), 681 deletions(-) + create mode 100644 arch/sh/include/cpu-sh3/cpu/serial.h + create mode 100644 arch/sh/include/cpu-sh4a/cpu/serial.h + create mode 100644 arch/sh/kernel/cpu/sh3/serial-sh770x.c + create mode 100644 arch/sh/kernel/cpu/sh3/serial-sh7710.c + create mode 100644 arch/sh/kernel/cpu/sh3/serial-sh7720.c + create mode 100644 arch/sh/kernel/cpu/sh4a/serial-sh7722.c +Merging rmobile/rmobile-latest +$ git merge rmobile/rmobile-latest +Already up-to-date. +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging tile/master +$ git merge tile/master +Removing arch/tile/include/asm/bug.h +Removing arch/tile/include/asm/bugs.h +Removing arch/tile/include/asm/cputime.h +Removing arch/tile/include/asm/device.h +Removing arch/tile/include/asm/div64.h +Removing arch/tile/include/asm/emergency-restart.h +Removing arch/tile/include/asm/errno.h +Removing arch/tile/include/asm/fb.h +Removing arch/tile/include/asm/fcntl.h +Removing arch/tile/include/asm/ioctl.h +Removing arch/tile/include/asm/ioctls.h +Removing arch/tile/include/asm/ipc.h +Removing arch/tile/include/asm/ipcbuf.h +Removing arch/tile/include/asm/irq_regs.h +Removing arch/tile/include/asm/kdebug.h +Removing arch/tile/include/asm/local.h +Removing arch/tile/include/asm/module.h +Removing arch/tile/include/asm/msgbuf.h +Removing arch/tile/include/asm/mutex.h +Removing arch/tile/include/asm/param.h +Removing arch/tile/include/asm/parport.h +Removing arch/tile/include/asm/poll.h +Removing arch/tile/include/asm/posix_types.h +Removing arch/tile/include/asm/resource.h +Removing arch/tile/include/asm/scatterlist.h +Removing arch/tile/include/asm/sembuf.h +Removing arch/tile/include/asm/serial.h +Removing arch/tile/include/asm/shmbuf.h +Removing arch/tile/include/asm/shmparam.h +Removing arch/tile/include/asm/socket.h +Removing arch/tile/include/asm/sockios.h +Removing arch/tile/include/asm/statfs.h +Removing arch/tile/include/asm/termbits.h +Removing arch/tile/include/asm/termios.h +Removing arch/tile/include/asm/types.h +Removing arch/tile/include/asm/ucontext.h +Removing arch/tile/include/asm/xor.h +Merge made by recursive. + Documentation/ioctl/ioctl-number.txt | 1 + + arch/tile/include/asm/Kbuild | 38 +++ + arch/tile/include/asm/bug.h | 1 - + arch/tile/include/asm/bugs.h | 1 - + arch/tile/include/asm/cputime.h | 1 - + arch/tile/include/asm/device.h | 1 - + arch/tile/include/asm/div64.h | 1 - + arch/tile/include/asm/emergency-restart.h | 1 - + arch/tile/include/asm/errno.h | 1 - + arch/tile/include/asm/fb.h | 1 - + arch/tile/include/asm/fcntl.h | 1 - + arch/tile/include/asm/ioctl.h | 1 - + arch/tile/include/asm/ioctls.h | 1 - + arch/tile/include/asm/ipc.h | 1 - + arch/tile/include/asm/ipcbuf.h | 1 - + arch/tile/include/asm/irq_regs.h | 1 - + arch/tile/include/asm/kdebug.h | 1 - + arch/tile/include/asm/local.h | 1 - + arch/tile/include/asm/module.h | 1 - + arch/tile/include/asm/msgbuf.h | 1 - + arch/tile/include/asm/mutex.h | 1 - + arch/tile/include/asm/param.h | 1 - + arch/tile/include/asm/parport.h | 1 - + arch/tile/include/asm/poll.h | 1 - + arch/tile/include/asm/posix_types.h | 1 - + arch/tile/include/asm/resource.h | 1 - + arch/tile/include/asm/scatterlist.h | 1 - + arch/tile/include/asm/sembuf.h | 1 - + arch/tile/include/asm/serial.h | 1 - + arch/tile/include/asm/shmbuf.h | 1 - + arch/tile/include/asm/shmparam.h | 1 - + arch/tile/include/asm/socket.h | 1 - + arch/tile/include/asm/sockios.h | 1 - + arch/tile/include/asm/statfs.h | 1 - + arch/tile/include/asm/termbits.h | 1 - + arch/tile/include/asm/termios.h | 1 - + arch/tile/include/asm/types.h | 1 - + arch/tile/include/asm/ucontext.h | 1 - + arch/tile/include/asm/xor.h | 1 - + arch/tile/include/hv/drv_srom_intf.h | 41 +++ + arch/tile/kernel/time.c | 5 +- + drivers/char/Kconfig | 11 + + drivers/char/Makefile | 2 + + drivers/char/tile-srom.c | 481 +++++++++++++++++++++++++++++ + 44 files changed, 575 insertions(+), 41 deletions(-) + delete mode 100644 arch/tile/include/asm/bug.h + delete mode 100644 arch/tile/include/asm/bugs.h + delete mode 100644 arch/tile/include/asm/cputime.h + delete mode 100644 arch/tile/include/asm/device.h + delete mode 100644 arch/tile/include/asm/div64.h + delete mode 100644 arch/tile/include/asm/emergency-restart.h + delete mode 100644 arch/tile/include/asm/errno.h + delete mode 100644 arch/tile/include/asm/fb.h + delete mode 100644 arch/tile/include/asm/fcntl.h + delete mode 100644 arch/tile/include/asm/ioctl.h + delete mode 100644 arch/tile/include/asm/ioctls.h + delete mode 100644 arch/tile/include/asm/ipc.h + delete mode 100644 arch/tile/include/asm/ipcbuf.h + delete mode 100644 arch/tile/include/asm/irq_regs.h + delete mode 100644 arch/tile/include/asm/kdebug.h + delete mode 100644 arch/tile/include/asm/local.h + delete mode 100644 arch/tile/include/asm/module.h + delete mode 100644 arch/tile/include/asm/msgbuf.h + delete mode 100644 arch/tile/include/asm/mutex.h + delete mode 100644 arch/tile/include/asm/param.h + delete mode 100644 arch/tile/include/asm/parport.h + delete mode 100644 arch/tile/include/asm/poll.h + delete mode 100644 arch/tile/include/asm/posix_types.h + delete mode 100644 arch/tile/include/asm/resource.h + delete mode 100644 arch/tile/include/asm/scatterlist.h + delete mode 100644 arch/tile/include/asm/sembuf.h + delete mode 100644 arch/tile/include/asm/serial.h + delete mode 100644 arch/tile/include/asm/shmbuf.h + delete mode 100644 arch/tile/include/asm/shmparam.h + delete mode 100644 arch/tile/include/asm/socket.h + delete mode 100644 arch/tile/include/asm/sockios.h + delete mode 100644 arch/tile/include/asm/statfs.h + delete mode 100644 arch/tile/include/asm/termbits.h + delete mode 100644 arch/tile/include/asm/termios.h + delete mode 100644 arch/tile/include/asm/types.h + delete mode 100644 arch/tile/include/asm/ucontext.h + delete mode 100644 arch/tile/include/asm/xor.h + create mode 100644 arch/tile/include/hv/drv_srom_intf.h + create mode 100644 drivers/char/tile-srom.c +Merging unicore32/unicore32 +$ git merge unicore32/unicore32 +Merge made by recursive. + arch/unicore32/include/asm/bitops.h | 12 ++++++------ + arch/unicore32/kernel/ksyms.c | 4 ++-- + arch/unicore32/lib/findbit.S | 14 ++++++++------ + 3 files changed, 16 insertions(+), 14 deletions(-) +Merging xtensa/master +$ git merge xtensa/master +Resolved 'arch/xtensa/configs/iss_defconfig' using previous resolution. +Auto-merging arch/xtensa/Kconfig +Auto-merging arch/xtensa/Makefile +Auto-merging arch/xtensa/boot/Makefile +Auto-merging arch/xtensa/configs/iss_defconfig +CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig +Auto-merging arch/xtensa/include/asm/coprocessor.h +Auto-merging arch/xtensa/kernel/Makefile +Auto-merging arch/xtensa/kernel/time.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 14a7258] Merge remote-tracking branch 'xtensa/master' +$ git diff -M --stat --summary HEAD^.. + arch/xtensa/Kconfig | 17 +- + arch/xtensa/Makefile | 5 +- + arch/xtensa/boot/Makefile | 1 + + arch/xtensa/include/asm/coprocessor.h | 9 +- + arch/xtensa/include/asm/io.h | 40 ++-- + arch/xtensa/include/asm/irq.h | 7 +- + arch/xtensa/include/asm/serial.h | 12 +- + arch/xtensa/kernel/Makefile | 4 +- + arch/xtensa/kernel/time.c | 2 +- + arch/xtensa/platforms/xtavnet/Makefile | 10 + + .../platforms/xtavnet/include/platform/hardware.h | 85 ++++++ + .../platforms/xtavnet/include/platform/lcd.h | 22 ++ + .../platforms/xtavnet/include/platform/serial.h | 1 + + arch/xtensa/platforms/xtavnet/lcd.c | 79 ++++++ + arch/xtensa/platforms/xtavnet/setup.c | 269 ++++++++++++++++++++ + 15 files changed, 526 insertions(+), 37 deletions(-) + create mode 100644 arch/xtensa/platforms/xtavnet/Makefile + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/hardware.h + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/lcd.h + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/serial.h + create mode 100644 arch/xtensa/platforms/xtavnet/lcd.c + create mode 100644 arch/xtensa/platforms/xtavnet/setup.c +Merging ceph/for-next +$ git merge ceph/for-next +Resolved 'fs/ceph/export.c' using previous resolution. +Auto-merging fs/ceph/export.c +CONFLICT (content): Merge conflict in fs/ceph/export.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 16728ff] Merge remote-tracking branch 'ceph/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging cifs/master +$ git merge cifs/master +Already up-to-date. +Merging configfs/linux-next +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next +$ git merge ecryptfs/next +Merge made by recursive. +Merging ext3/for_next +$ git merge ext3/for_next +Merge made by recursive. + fs/ext3/balloc.c | 34 +- + fs/ext3/file.c | 1 - + fs/ext3/fsync.c | 15 +- + fs/ext3/ialloc.c | 4 + + fs/ext3/inode.c | 56 ++- + fs/ext3/namei.c | 3 + + fs/ext3/super.c | 13 + + fs/ext3/xattr.c | 12 +- + fs/jbd/checkpoint.c | 4 + + fs/jbd/commit.c | 11 + + fs/jbd/journal.c | 4 + + fs/jbd/transaction.c | 10 +- + include/linux/ext3_fs.h | 2 +- + include/trace/events/ext3.h | 864 +++++++++++++++++++++++++++++++++++++++++++ + include/trace/events/jbd.h | 203 ++++++++++ + 15 files changed, 1197 insertions(+), 39 deletions(-) + create mode 100644 include/trace/events/ext3.h + create mode 100644 include/trace/events/jbd.h +Merging ext4/dev +$ git merge ext4/dev +Merge made by recursive. + fs/ext4/ext4_extents.h | 9 ++++++--- + fs/ext4/extents.c | 42 ++++++++++++++++++++---------------------- + fs/ext4/mballoc.c | 2 +- + fs/ext4/move_extent.c | 10 +++++----- + fs/ext4/super.c | 15 ++++++++++++--- + 5 files changed, 44 insertions(+), 34 deletions(-) +Merging fatfs/master +$ git merge fatfs/master +Already up-to-date. +Merging fuse/for-next +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Merge made by recursive. + fs/gfs2/dir.c | 221 +++++++++++++++++++++++++------------------------- + fs/gfs2/dir.h | 1 + + fs/gfs2/file.c | 4 +- + fs/gfs2/glock.c | 39 +++++++--- + fs/gfs2/glock.h | 6 ++ + fs/gfs2/glops.c | 11 ++- + fs/gfs2/incore.h | 3 +- + fs/gfs2/main.c | 1 + + fs/gfs2/ops_fstype.c | 1 + + fs/gfs2/super.c | 2 +- + 10 files changed, 160 insertions(+), 129 deletions(-) +Merging hfsplus/for-next +$ git merge hfsplus/for-next +Merge made by recursive. + fs/hfsplus/extents.c | 9 ++++++--- + fs/hfsplus/super.c | 9 +++++++++ + fs/hfsplus/unicode.c | 35 +++++++++++++++++++++++++++-------- + fs/hfsplus/wrapper.c | 9 +++------ + 4 files changed, 45 insertions(+), 17 deletions(-) +Merging jfs/next +$ git merge jfs/next +Merge made by recursive. + fs/jfs/file.c | 6 +++--- + fs/jfs/jfs_imap.c | 12 +++++------- + fs/jfs/jfs_incore.h | 3 ++- + fs/jfs/resize.c | 2 +- + 4 files changed, 11 insertions(+), 12 deletions(-) +Merging logfs/master +$ git merge logfs/master +Resolved 'fs/logfs/logfs.h' using previous resolution. +Auto-merging fs/logfs/logfs.h +CONFLICT (content): Merge conflict in fs/logfs/logfs.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7191378] Merge remote-tracking branch 'logfs/master' +$ git diff -M --stat --summary HEAD^.. +Merging nfs/linux-next +$ git merge nfs/linux-next +Merge made by recursive. + fs/lockd/clntproc.c | 17 ++- + fs/nfs/callback_proc.c | 57 ++++-- + fs/nfs/client.c | 5 +- + fs/nfs/inode.c | 6 +- + fs/nfs/internal.h | 20 ++ + fs/nfs/namespace.c | 2 +- + fs/nfs/nfs4_fs.h | 5 + + fs/nfs/nfs4filelayout.c | 100 ++++++++-- + fs/nfs/nfs4filelayout.h | 17 ++- + fs/nfs/nfs4filelayoutdev.c | 452 ++++++++++++++++++++++++++++++---------- + fs/nfs/nfs4proc.c | 258 +++++++++++++++++++++-- + fs/nfs/nfs4state.c | 9 +- + fs/nfs/nfs4xdr.c | 273 +++++++++++++++++++++++-- + fs/nfs/objlayout/objio_osd.c | 16 ++- + fs/nfs/objlayout/objlayout.c | 2 +- + fs/nfs/pagelist.c | 15 +- + fs/nfs/pnfs.c | 135 +++++++++--- + fs/nfs/pnfs.h | 55 +++--- + fs/nfs/pnfs_dev.c | 81 ++++---- + fs/nfs/read.c | 60 ++++-- + fs/nfs/write.c | 46 +++-- + include/linux/nfs4.h | 3 + + include/linux/nfs_fs_sb.h | 5 +- + include/linux/nfs_page.h | 18 ++- + include/linux/nfs_xdr.h | 33 +++- + include/linux/pnfs_osd_xdr.h | 31 +--- + include/linux/sunrpc/sched.h | 3 +- + net/sunrpc/auth_gss/auth_gss.c | 4 +- + net/sunrpc/clnt.c | 8 +- + net/sunrpc/sched.c | 1 + + 30 files changed, 1352 insertions(+), 385 deletions(-) +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Already up-to-date. +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Merge made by recursive. + Documentation/filesystems/nilfs2.txt | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Auto-merging fs/ocfs2/super.c +Merge made by recursive. + fs/ocfs2/dlmglue.c | 21 +++++++++++++++------ + fs/ocfs2/ioctl.c | 8 ++++---- + fs/ocfs2/move_extents.c | 2 +- + fs/ocfs2/ocfs2.h | 4 ++-- + fs/ocfs2/super.c | 3 ++- + 5 files changed, 24 insertions(+), 14 deletions(-) +Merging omfs/for-next +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master +$ git merge squashfs/master +Already up-to-date. +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Merge made by recursive. + fs/9p/vfs_inode.c | 5 ----- + include/net/9p/9p.h | 6 ++++++ + net/9p/client.c | 39 ++++++++++++++++++++------------------- + net/9p/protocol.c | 44 +++++++++++++++++--------------------------- + 4 files changed, 43 insertions(+), 51 deletions(-) +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Already up-to-date. +Merging vfs/for-next +$ git merge vfs/for-next +Auto-merging fs/exec.c +Merge made by recursive. + fs/bad_inode.c | 3 - + fs/binfmt_elf.c | 3 +- + fs/binfmt_elf_fdpic.c | 3 +- + fs/binfmt_misc.c | 3 +- + fs/cifs/cifs_fs_sb.h | 1 + + fs/cifs/cifsfs.c | 159 +++++++++++++++++------------------------ + fs/cifs/cifsproto.h | 8 +- + fs/cifs/connect.c | 49 +++++++------ + fs/coda/pioctl.c | 2 - + fs/dcache.c | 34 ++++++++- + fs/exec.c | 14 +++- + fs/logfs/dir.c | 8 -- + fs/namei.c | 135 ++++++++++++++++++++++------------- + fs/nilfs2/inode.c | 7 +-- + fs/proc/base.c | 6 +-- + fs/proc/proc_sysctl.c | 3 - + fs/reiserfs/xattr.c | 2 - + fs/super.c | 36 +++++++++ + fs/ubifs/super.c | 1 + + fs/udf/file.c | 2 +- + include/linux/binfmts.h | 1 + + include/linux/dcache.h | 7 ++ + include/linux/device_cgroup.h | 10 +++- + include/linux/fs.h | 3 +- + kernel/cgroup.c | 3 +- + security/device_cgroup.c | 8 +-- + 26 files changed, 290 insertions(+), 221 deletions(-) +Merging vfs-scale/vfs-scale-working +$ git merge vfs-scale/vfs-scale-working +Already up-to-date. +Merging pci/linux-next +$ git merge pci/linux-next +Merge made by recursive. + arch/x86/Kconfig | 2 +- + drivers/pci/hotplug/acpi_pcihp.c | 6 +- + drivers/pci/pcie/aer/aerdrv_core.c | 76 +++++++++++++++++++++++++++++--- + drivers/pci/pcie/aer/aerdrv_errprint.c | 3 +- + include/linux/aer.h | 3 + + 5 files changed, 78 insertions(+), 12 deletions(-) +Merging of-pci/of-pci +$ git merge of-pci/of-pci +Removing arch/microblaze/pci/pci_32.c +Auto-merging arch/sparc/include/asm/pci_32.h +Auto-merging arch/x86/kernel/devicetree.c +Auto-merging drivers/pci/Makefile +Auto-merging drivers/pci/probe.c +Merge made by recursive. + arch/microblaze/include/asm/pci-bridge.h | 13 - + arch/microblaze/include/asm/pci.h | 3 +- + arch/microblaze/include/asm/prom.h | 15 - + arch/microblaze/pci/Makefile | 2 +- + arch/microblaze/pci/pci-common.c | 112 ++++++++ + arch/microblaze/pci/pci_32.c | 432 ------------------------------ + arch/powerpc/include/asm/pci-bridge.h | 29 +-- + arch/powerpc/include/asm/pci.h | 3 +- + arch/powerpc/include/asm/prom.h | 14 - + arch/powerpc/kernel/pci-common.c | 11 +- + arch/powerpc/kernel/pci_32.c | 150 +---------- + arch/powerpc/kernel/pci_dn.c | 47 ---- + arch/powerpc/kernel/pci_of_scan.c | 9 +- + arch/powerpc/platforms/powermac/pci.c | 3 +- + arch/sparc/include/asm/pci_32.h | 3 - + arch/sparc/include/asm/pci_64.h | 3 - + arch/sparc/kernel/pci.c | 8 +- + arch/sparc/kernel/pcic.c | 8 - + arch/x86/include/asm/prom.h | 11 - + arch/x86/kernel/devicetree.c | 60 ++--- + drivers/of/Kconfig | 8 +- + drivers/of/Makefile | 1 + + drivers/of/of_pci.c | 112 ++------ + drivers/of/of_pci_irq.c | 92 +++++++ + drivers/pci/Makefile | 2 + + drivers/pci/hotplug/rpadlpar_core.c | 2 +- + drivers/pci/of.c | 61 +++++ + drivers/pci/probe.c | 7 +- + include/linux/of_pci.h | 5 + + include/linux/pci.h | 28 ++ + 30 files changed, 395 insertions(+), 859 deletions(-) + delete mode 100644 arch/microblaze/pci/pci_32.c + create mode 100644 drivers/of/of_pci_irq.c + create mode 100644 drivers/pci/of.c +Merging hid/for-next +$ git merge hid/for-next +Auto-merging drivers/hid/Kconfig +Auto-merging drivers/hid/hid-core.c +Auto-merging drivers/hid/hid-ids.h +Merge made by recursive. + .../ABI/testing/sysfs-driver-hid-roccat-koneplus | 8 ++ + drivers/hid/Kconfig | 23 +++-- + drivers/hid/Makefile | 1 + + drivers/hid/hid-core.c | 8 ++- + drivers/hid/hid-ids.h | 4 + + drivers/hid/hid-lg.c | 74 ++++++++++++++++- + drivers/hid/hid-microsoft.c | 2 + + drivers/hid/hid-roccat-arvo.c | 21 +++-- + drivers/hid/hid-roccat-arvo.h | 13 --- + drivers/hid/hid-roccat-common.c | 20 +++-- + drivers/hid/hid-roccat-common.h | 4 +- + drivers/hid/hid-roccat-kone.c | 56 +++++++++++-- + drivers/hid/hid-roccat-kone.h | 2 +- + drivers/hid/hid-roccat-koneplus.c | 49 ++++++++---- + drivers/hid/hid-roccat-koneplus.h | 23 ++--- + drivers/hid/hid-roccat-kovaplus.c | 25 +++--- + drivers/hid/hid-roccat-kovaplus.h | 9 -- + drivers/hid/hid-roccat-pyra.c | 25 +++--- + drivers/hid/hid-roccat-pyra.h | 9 -- + drivers/hid/hid-sony.c | 35 ++++++++ + drivers/hid/hid-speedlink.c | 89 ++++++++++++++++++++ + drivers/hid/usbhid/hid-core.c | 2 + + include/linux/hid.h | 3 +- + 23 files changed, 384 insertions(+), 121 deletions(-) + create mode 100644 drivers/hid/hid-speedlink.c +Merging quilt/i2c +$ git merge quilt/i2c +Merge made by recursive. + drivers/i2c/busses/i2c-taos-evm.c | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) +Merging bjdooks-i2c/next-i2c +$ git merge bjdooks-i2c/next-i2c +Already up-to-date. +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Merge made by recursive. + Documentation/hwmon/f71882fg | 4 + + Documentation/hwmon/k10temp | 8 +- + Documentation/hwmon/sch5636 | 31 +++ + drivers/hwmon/Kconfig | 22 ++- + drivers/hwmon/Makefile | 2 + + drivers/hwmon/emc6w201.c | 58 ++++- + drivers/hwmon/f71882fg.c | 19 ++- + drivers/hwmon/hwmon-vid.c | 2 +- + drivers/hwmon/sch5627.c | 336 ++----------------------- + drivers/hwmon/sch5636.c | 539 ++++++++++++++++++++++++++++++++++++++++ + drivers/hwmon/sch56xx-common.c | 340 +++++++++++++++++++++++++ + drivers/hwmon/sch56xx-common.h | 24 ++ + 12 files changed, 1053 insertions(+), 332 deletions(-) + create mode 100644 Documentation/hwmon/sch5636 + create mode 100644 drivers/hwmon/sch5636.c + create mode 100644 drivers/hwmon/sch56xx-common.c + create mode 100644 drivers/hwmon/sch56xx-common.h +Merging hwmon-staging/hwmon-next +$ git merge hwmon-staging/hwmon-next +Auto-merging MAINTAINERS +Auto-merging drivers/hwmon/Kconfig +Auto-merging drivers/hwmon/Makefile +Merge made by recursive. + Documentation/hwmon/max1668 | 60 +++++ + MAINTAINERS | 7 + + drivers/hwmon/Kconfig | 10 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/max1668.c | 502 +++++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 580 insertions(+), 0 deletions(-) + create mode 100644 Documentation/hwmon/max1668 + create mode 100644 drivers/hwmon/max1668.c +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Already up-to-date. +Merging docs/docs-move +$ git merge docs/docs-move +Already up-to-date. +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Removing Documentation/DocBook/dvb/frontend.h.xml +Removing Documentation/DocBook/media-entities.tmpl +Removing Documentation/DocBook/media-indices.tmpl +Auto-merging Documentation/DocBook/media/v4l/vidioc-g-ctrl.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml +Removing Documentation/DocBook/v4l/videodev2.h.xml +Merge made by recursive. + Documentation/DocBook/.gitignore | 11 +- + Documentation/DocBook/Makefile | 30 +- + Documentation/DocBook/dvb/frontend.h.xml | 428 ----- + Documentation/DocBook/media-entities.tmpl | 464 ----- + Documentation/DocBook/media-indices.tmpl | 89 - + Documentation/DocBook/media/Makefile | 259 +++ + Documentation/DocBook/{ => media}/dvb/.gitignore | 0 + Documentation/DocBook/{ => media}/dvb/audio.xml | 0 + Documentation/DocBook/{ => media}/dvb/ca.xml | 0 + Documentation/DocBook/{ => media}/dvb/demux.xml | 0 + Documentation/DocBook/{ => media}/dvb/dvbapi.xml | 0 + .../DocBook/{ => media}/dvb/dvbproperty.xml | 0 + Documentation/DocBook/{ => media}/dvb/dvbstb.pdf | Bin 1881 -> 1881 bytes + Documentation/DocBook/{ => media}/dvb/dvbstb.png | Bin 22655 -> 22655 bytes + Documentation/DocBook/{ => media}/dvb/examples.xml | 0 + Documentation/DocBook/{ => media}/dvb/frontend.xml | 0 + Documentation/DocBook/{ => media}/dvb/intro.xml | 0 + Documentation/DocBook/{ => media}/dvb/kdapi.xml | 0 + Documentation/DocBook/{ => media}/dvb/net.xml | 0 + Documentation/DocBook/{ => media}/dvb/video.xml | 0 + Documentation/DocBook/{ => media}/v4l/.gitignore | 0 + Documentation/DocBook/{ => media}/v4l/bayer.pdf | Bin 12116 -> 12116 bytes + Documentation/DocBook/{ => media}/v4l/bayer.png | Bin 9725 -> 9725 bytes + Documentation/DocBook/{ => media}/v4l/biblio.xml | 0 + .../DocBook/{ => media}/v4l/capture.c.xml | 0 + Documentation/DocBook/{ => media}/v4l/common.xml | 0 + Documentation/DocBook/{ => media}/v4l/compat.xml | 0 + Documentation/DocBook/{ => media}/v4l/controls.xml | 0 + Documentation/DocBook/{ => media}/v4l/crop.gif | Bin 5967 -> 5967 bytes + Documentation/DocBook/{ => media}/v4l/crop.pdf | Bin 5846 -> 5846 bytes + .../DocBook/{ => media}/v4l/dev-capture.xml | 0 + .../DocBook/{ => media}/v4l/dev-codec.xml | 0 + .../DocBook/{ => media}/v4l/dev-effect.xml | 0 + .../DocBook/{ => media}/v4l/dev-event.xml | 0 + Documentation/DocBook/{ => media}/v4l/dev-osd.xml | 0 + .../DocBook/{ => media}/v4l/dev-output.xml | 0 + .../DocBook/{ => media}/v4l/dev-overlay.xml | 0 + .../DocBook/{ => media}/v4l/dev-radio.xml | 0 + .../DocBook/{ => media}/v4l/dev-raw-vbi.xml | 0 + Documentation/DocBook/{ => media}/v4l/dev-rds.xml | 0 + .../DocBook/{ => media}/v4l/dev-sliced-vbi.xml | 0 + .../DocBook/{ => media}/v4l/dev-subdev.xml | 0 + .../DocBook/{ => media}/v4l/dev-teletext.xml | 0 + Documentation/DocBook/{ => media}/v4l/driver.xml | 0 + .../DocBook/{ => media}/v4l/fdl-appendix.xml | 0 + .../DocBook/{ => media}/v4l/fieldseq_bt.gif | Bin 25430 -> 25430 bytes + .../DocBook/{ => media}/v4l/fieldseq_bt.pdf | Bin 9185 -> 9185 bytes + .../DocBook/{ => media}/v4l/fieldseq_tb.gif | Bin 25323 -> 25323 bytes + .../DocBook/{ => media}/v4l/fieldseq_tb.pdf | Bin 9173 -> 9173 bytes + .../DocBook/{ => media}/v4l/func-close.xml | 0 + .../DocBook/{ => media}/v4l/func-ioctl.xml | 0 + .../DocBook/{ => media}/v4l/func-mmap.xml | 0 + .../DocBook/{ => media}/v4l/func-munmap.xml | 0 + .../DocBook/{ => media}/v4l/func-open.xml | 0 + .../DocBook/{ => media}/v4l/func-poll.xml | 0 + .../DocBook/{ => media}/v4l/func-read.xml | 0 + .../DocBook/{ => media}/v4l/func-select.xml | 0 + .../DocBook/{ => media}/v4l/func-write.xml | 0 + Documentation/DocBook/{ => media}/v4l/io.xml | 0 + .../DocBook/{ => media}/v4l/keytable.c.xml | 0 + Documentation/DocBook/{ => media}/v4l/libv4l.xml | 0 + .../{ => media}/v4l/lirc_device_interface.xml | 0 + .../DocBook/{ => media}/v4l/media-controller.xml | 0 + .../DocBook/{ => media}/v4l/media-func-close.xml | 0 + .../DocBook/{ => media}/v4l/media-func-ioctl.xml | 0 + .../DocBook/{ => media}/v4l/media-func-open.xml | 0 + .../{ => media}/v4l/media-ioc-device-info.xml | 0 + .../{ => media}/v4l/media-ioc-enum-entities.xml | 0 + .../{ => media}/v4l/media-ioc-enum-links.xml | 0 + .../{ => media}/v4l/media-ioc-setup-link.xml | 0 + Documentation/DocBook/{ => media}/v4l/nv12mt.gif | Bin 2108 -> 2108 bytes + .../DocBook/{ => media}/v4l/nv12mt_example.gif | Bin 6858 -> 6858 bytes + Documentation/DocBook/{ => media}/v4l/pipeline.pdf | Bin 20276 -> 20276 bytes + Documentation/DocBook/{ => media}/v4l/pipeline.png | Bin 12130 -> 12130 bytes + .../DocBook/{ => media}/v4l/pixfmt-grey.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-m420.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-nv12.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-nv12m.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-nv12mt.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-nv16.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-packed-rgb.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-packed-yuv.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-sbggr16.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-sbggr8.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-sgbrg8.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-sgrbg8.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-srggb10.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-srggb12.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-srggb8.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-uyvy.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-vyuy.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-y10.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-y10b.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-y12.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-y16.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-y41p.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-yuv410.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-yuv411p.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-yuv420.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-yuv420m.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-yuv422p.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-yuyv.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-yvyu.xml | 0 + Documentation/DocBook/{ => media}/v4l/pixfmt.xml | 0 + .../DocBook/{ => media}/v4l/planar-apis.xml | 0 + .../DocBook/{ => media}/v4l/remote_controllers.xml | 0 + .../DocBook/{ => media}/v4l/subdev-formats.xml | 0 + Documentation/DocBook/{ => media}/v4l/v4l2.xml | 0 + .../DocBook/{ => media}/v4l/v4l2grab.c.xml | 0 + Documentation/DocBook/{ => media}/v4l/vbi_525.gif | Bin 4741 -> 4741 bytes + Documentation/DocBook/{ => media}/v4l/vbi_525.pdf | Bin 3395 -> 3395 bytes + Documentation/DocBook/{ => media}/v4l/vbi_625.gif | Bin 5095 -> 5095 bytes + Documentation/DocBook/{ => media}/v4l/vbi_625.pdf | Bin 3683 -> 3683 bytes + .../DocBook/{ => media}/v4l/vbi_hsync.gif | Bin 2400 -> 2400 bytes + .../DocBook/{ => media}/v4l/vbi_hsync.pdf | Bin 7405 -> 7405 bytes + .../DocBook/{ => media}/v4l/vidioc-cropcap.xml | 0 + .../{ => media}/v4l/vidioc-dbg-g-chip-ident.xml | 0 + .../{ => media}/v4l/vidioc-dbg-g-register.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-dqevent.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-encoder-cmd.xml | 0 + .../{ => media}/v4l/vidioc-enum-dv-presets.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-enum-fmt.xml | 0 + .../{ => media}/v4l/vidioc-enum-frameintervals.xml | 0 + .../{ => media}/v4l/vidioc-enum-framesizes.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-enumaudio.xml | 0 + .../{ => media}/v4l/vidioc-enumaudioout.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-enuminput.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-enumoutput.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-enumstd.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-g-audio.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-g-audioout.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-g-crop.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-g-ctrl.xml | 7 + + .../DocBook/{ => media}/v4l/vidioc-g-dv-preset.xml | 0 + .../{ => media}/v4l/vidioc-g-dv-timings.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-g-enc-index.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-g-ext-ctrls.xml | 7 + + .../DocBook/{ => media}/v4l/vidioc-g-fbuf.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-g-fmt.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-g-frequency.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-g-input.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-g-jpegcomp.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-g-modulator.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-g-output.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-g-parm.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-g-priority.xml | 0 + .../{ => media}/v4l/vidioc-g-sliced-vbi-cap.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-g-std.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-g-tuner.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-log-status.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-overlay.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-qbuf.xml | 0 + .../{ => media}/v4l/vidioc-query-dv-preset.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-querybuf.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-querycap.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-queryctrl.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-querystd.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-reqbufs.xml | 0 + .../{ => media}/v4l/vidioc-s-hw-freq-seek.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-streamon.xml | 0 + .../v4l/vidioc-subdev-enum-frame-interval.xml | 0 + .../v4l/vidioc-subdev-enum-frame-size.xml | 0 + .../v4l/vidioc-subdev-enum-mbus-code.xml | 0 + .../{ => media}/v4l/vidioc-subdev-g-crop.xml | 0 + .../{ => media}/v4l/vidioc-subdev-g-fmt.xml | 0 + .../v4l/vidioc-subdev-g-frame-interval.xml | 0 + .../{ => media}/v4l/vidioc-subscribe-event.xml | 0 + .../DocBook/{media.tmpl => media_api.tmpl} | 0 + Documentation/DocBook/v4l/videodev2.h.xml | 1946 -------------------- + Documentation/video4linux/CARDLIST.cx23885 | 2 + + Documentation/video4linux/CARDLIST.cx88 | 1 + + Documentation/video4linux/CARDLIST.em28xx | 2 + + Documentation/video4linux/CARDLIST.saa7134 | 4 + + Documentation/video4linux/CARDLIST.tuner | 1 + + Documentation/video4linux/CARDLIST.usbvision | 2 + + drivers/media/Kconfig | 12 +- + drivers/media/dvb/dvb-core/Makefile | 4 +- + drivers/media/dvb/dvb-core/dvb_net.h | 21 +- + drivers/media/dvb/dvb-usb/anysee.c | 69 +- + drivers/media/dvb/dvb-usb/anysee.h | 16 +- + drivers/media/dvb/dvb-usb/dvb-usb.h | 2 +- + drivers/media/dvb/frontends/cx24113.c | 20 +- + drivers/media/dvb/frontends/cxd2820r.h | 4 +- + drivers/media/dvb/frontends/cxd2820r_core.c | 22 +- + drivers/media/dvb/frontends/cxd2820r_priv.h | 4 +- + drivers/media/dvb/frontends/itd1000.c | 25 +- + drivers/media/radio/radio-sf16fmr2.c | 531 ++---- + drivers/media/radio/si470x/radio-si470x-usb.c | 4 +- + drivers/media/video/cx23885/cx23885-input.c | 3 + + drivers/media/video/em28xx/em28xx-cards.c | 12 +- + drivers/media/video/em28xx/em28xx-dvb.c | 2 +- + drivers/media/video/em28xx/em28xx-input.c | 1 + + drivers/media/video/em28xx/em28xx.h | 2 +- + drivers/media/video/gspca/ov519.c | 109 +- + drivers/media/video/saa7164/saa7164-encoder.c | 6 +- + drivers/media/video/saa7164/saa7164-vbi.c | 6 +- + drivers/media/video/v4l2-ioctl.c | 4 +- + drivers/media/video/videobuf-dma-sg.c | 5 +- + drivers/media/video/videobuf2-dma-sg.c | 8 +- + drivers/media/video/videobuf2-memops.c | 6 +- + include/sound/tea575x-tuner.h | 6 +- + sound/i2c/other/tea575x-tuner.c | 106 +- + sound/pci/Kconfig | 4 +- + 203 files changed, 749 insertions(+), 3518 deletions(-) + delete mode 100644 Documentation/DocBook/dvb/frontend.h.xml + delete mode 100644 Documentation/DocBook/media-entities.tmpl + delete mode 100644 Documentation/DocBook/media-indices.tmpl + create mode 100644 Documentation/DocBook/media/Makefile + rename Documentation/DocBook/{ => media}/dvb/.gitignore (100%) + rename Documentation/DocBook/{ => media}/dvb/audio.xml (100%) + rename Documentation/DocBook/{ => media}/dvb/ca.xml (100%) + rename Documentation/DocBook/{ => media}/dvb/demux.xml (100%) + rename Documentation/DocBook/{ => media}/dvb/dvbapi.xml (100%) + rename Documentation/DocBook/{ => media}/dvb/dvbproperty.xml (100%) + rename Documentation/DocBook/{ => media}/dvb/dvbstb.pdf (100%) + rename Documentation/DocBook/{ => media}/dvb/dvbstb.png (100%) + rename Documentation/DocBook/{ => media}/dvb/examples.xml (100%) + rename Documentation/DocBook/{ => media}/dvb/frontend.xml (100%) + rename Documentation/DocBook/{ => media}/dvb/intro.xml (100%) + rename Documentation/DocBook/{ => media}/dvb/kdapi.xml (100%) + rename Documentation/DocBook/{ => media}/dvb/net.xml (100%) + rename Documentation/DocBook/{ => media}/dvb/video.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/.gitignore (100%) + rename Documentation/DocBook/{ => media}/v4l/bayer.pdf (100%) + rename Documentation/DocBook/{ => media}/v4l/bayer.png (100%) + rename Documentation/DocBook/{ => media}/v4l/biblio.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/capture.c.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/common.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/compat.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/controls.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/crop.gif (100%) + rename Documentation/DocBook/{ => media}/v4l/crop.pdf (100%) + rename Documentation/DocBook/{ => media}/v4l/dev-capture.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/dev-codec.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/dev-effect.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/dev-event.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/dev-osd.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/dev-output.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/dev-overlay.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/dev-radio.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/dev-raw-vbi.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/dev-rds.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/dev-sliced-vbi.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/dev-subdev.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/dev-teletext.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/driver.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/fdl-appendix.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/fieldseq_bt.gif (100%) + rename Documentation/DocBook/{ => media}/v4l/fieldseq_bt.pdf (100%) + rename Documentation/DocBook/{ => media}/v4l/fieldseq_tb.gif (100%) + rename Documentation/DocBook/{ => media}/v4l/fieldseq_tb.pdf (100%) + rename Documentation/DocBook/{ => media}/v4l/func-close.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/func-ioctl.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/func-mmap.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/func-munmap.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/func-open.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/func-poll.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/func-read.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/func-select.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/func-write.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/io.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/keytable.c.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/libv4l.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/lirc_device_interface.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/media-controller.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/media-func-close.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/media-func-ioctl.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/media-func-open.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/media-ioc-device-info.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/media-ioc-enum-entities.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/media-ioc-enum-links.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/media-ioc-setup-link.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/nv12mt.gif (100%) + rename Documentation/DocBook/{ => media}/v4l/nv12mt_example.gif (100%) + rename Documentation/DocBook/{ => media}/v4l/pipeline.pdf (100%) + rename Documentation/DocBook/{ => media}/v4l/pipeline.png (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-grey.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-m420.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-nv12.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-nv12m.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-nv12mt.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-nv16.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-packed-rgb.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-packed-yuv.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-sbggr16.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-sbggr8.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-sgbrg8.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-sgrbg8.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-srggb10.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-srggb12.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-srggb8.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-uyvy.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-vyuy.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-y10.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-y10b.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-y12.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-y16.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-y41p.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuv410.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuv411p.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuv420.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuv420m.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuv422p.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuyv.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-yvyu.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/planar-apis.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/remote_controllers.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/subdev-formats.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/v4l2.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/v4l2grab.c.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vbi_525.gif (100%) + rename Documentation/DocBook/{ => media}/v4l/vbi_525.pdf (100%) + rename Documentation/DocBook/{ => media}/v4l/vbi_625.gif (100%) + rename Documentation/DocBook/{ => media}/v4l/vbi_625.pdf (100%) + rename Documentation/DocBook/{ => media}/v4l/vbi_hsync.gif (100%) + rename Documentation/DocBook/{ => media}/v4l/vbi_hsync.pdf (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-cropcap.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-dbg-g-chip-ident.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-dbg-g-register.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-dqevent.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-encoder-cmd.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-enum-dv-presets.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-enum-fmt.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-enum-frameintervals.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-enum-framesizes.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-enumaudio.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-enumaudioout.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-enuminput.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-enumoutput.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-enumstd.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-audio.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-audioout.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-crop.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-ctrl.xml (94%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-dv-preset.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-dv-timings.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-enc-index.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-ext-ctrls.xml (98%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-fbuf.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-fmt.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-frequency.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-input.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-jpegcomp.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-modulator.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-output.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-parm.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-priority.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-sliced-vbi-cap.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-std.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-tuner.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-log-status.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-overlay.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-qbuf.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-query-dv-preset.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-querybuf.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-querycap.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-queryctrl.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-querystd.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-reqbufs.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-s-hw-freq-seek.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-streamon.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-enum-frame-interval.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-enum-frame-size.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-enum-mbus-code.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-g-crop.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-g-fmt.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-g-frame-interval.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-subscribe-event.xml (100%) + rename Documentation/DocBook/{media.tmpl => media_api.tmpl} (100%) + delete mode 100644 Documentation/DocBook/v4l/videodev2.h.xml +Merging kbuild/for-next +$ git merge kbuild/for-next +Removing scripts/kconfig/kconfig_load.c +Merge made by recursive. + scripts/Makefile.modpost | 2 +- + scripts/kconfig/Makefile | 23 +++++++------------- + scripts/kconfig/conf.c | 5 +++- + scripts/kconfig/confdata.c | 36 +++++++++++++++++++++++++++++++- + scripts/kconfig/expr.c | 1 - + scripts/kconfig/expr.h | 3 -- + scripts/kconfig/gconf.c | 38 +---------------------------------- + scripts/kconfig/kconfig_load.c | 35 -------------------------------- + scripts/kconfig/kxgettext.c | 1 - + scripts/kconfig/lex.zconf.c_shipped | 1 - + scripts/kconfig/lkc.h | 5 ---- + scripts/kconfig/mconf.c | 2 +- + scripts/kconfig/menu.c | 3 +- + scripts/kconfig/nconf.c | 2 +- + scripts/kconfig/qconf.cc | 4 --- + scripts/kconfig/symbol.c | 1 - + scripts/kconfig/util.c | 2 + + scripts/kconfig/zconf.l | 1 - + scripts/kconfig/zconf.tab.c_shipped | 1 - + scripts/kconfig/zconf.y | 1 - + 20 files changed, 54 insertions(+), 113 deletions(-) + delete mode 100644 scripts/kconfig/kconfig_load.c +Merging kconfig/for-next +$ git merge kconfig/for-next +Already up-to-date! +Merge made by recursive. +Merging ide/master +$ git merge ide/master +Already up-to-date. +Merging libata/NEXT +$ git merge libata/NEXT +Merge made by recursive. + drivers/ata/acard-ahci.c | 27 ++-- + drivers/ata/ahci.c | 53 +++--- + drivers/ata/ata_generic.c | 5 +- + drivers/ata/ata_piix.c | 44 +++--- + drivers/ata/libahci.c | 95 +++++------ + drivers/ata/libata-acpi.c | 66 +++---- + drivers/ata/libata-core.c | 400 +++++++++++++++++++++++------------------ + drivers/ata/libata-eh.c | 154 ++++++++-------- + drivers/ata/libata-pmp.c | 123 ++++++------- + drivers/ata/libata-scsi.c | 22 +-- + drivers/ata/libata-sff.c | 52 +++--- + drivers/ata/pata_ali.c | 8 +- + drivers/ata/pata_amd.c | 8 +- + drivers/ata/pata_artop.c | 5 +- + drivers/ata/pata_atp867x.c | 13 +- + drivers/ata/pata_bf54x.c | 4 +- + drivers/ata/pata_cs5520.c | 3 +- + drivers/ata/pata_efar.c | 5 +- + drivers/ata/pata_hpt3x3.c | 4 +- + drivers/ata/pata_icside.c | 4 +- + drivers/ata/pata_it8213.c | 5 +- + drivers/ata/pata_it821x.c | 14 +- + drivers/ata/pata_ixp4xx_cf.c | 4 +- + drivers/ata/pata_legacy.c | 2 +- + drivers/ata/pata_macio.c | 10 +- + drivers/ata/pata_mpiix.c | 4 +- + drivers/ata/pata_netcell.c | 5 +- + drivers/ata/pata_ns87410.c | 2 +- + drivers/ata/pata_ns87415.c | 5 +- + drivers/ata/pata_octeon_cf.c | 8 +- + drivers/ata/pata_oldpiix.c | 5 +- + drivers/ata/pata_opti.c | 4 +- + drivers/ata/pata_optidma.c | 4 +- + drivers/ata/pata_pcmcia.c | 5 +- + drivers/ata/pata_pdc2027x.c | 6 +- + drivers/ata/pata_platform.c | 2 +- + drivers/ata/pata_radisys.c | 5 +- + drivers/ata/pata_rdc.c | 5 +- + drivers/ata/pata_rz1000.c | 4 +- + drivers/ata/pata_samsung_cf.c | 2 +- + drivers/ata/pata_scc.c | 8 +- + drivers/ata/pata_sch.c | 5 +- + drivers/ata/pata_sil680.c | 4 +- + drivers/ata/pata_sis.c | 5 +- + drivers/ata/pata_sl82c105.c | 6 +- + drivers/ata/pata_triflex.c | 4 +- + drivers/ata/pata_via.c | 8 +- + drivers/ata/pdc_adma.c | 10 +- + drivers/ata/sata_fsl.c | 43 ++--- + drivers/ata/sata_inic162x.c | 31 ++-- + drivers/ata/sata_mv.c | 94 +++++------ + drivers/ata/sata_nv.c | 79 ++++----- + drivers/ata/sata_promise.c | 6 +- + drivers/ata/sata_qstor.c | 13 +- + drivers/ata/sata_sil.c | 21 +-- + drivers/ata/sata_sil24.c | 43 ++--- + drivers/ata/sata_sis.c | 26 ++-- + drivers/ata/sata_svw.c | 4 +- + drivers/ata/sata_sx4.c | 4 +- + drivers/ata/sata_uli.c | 4 +- + drivers/ata/sata_via.c | 42 ++--- + drivers/ata/sata_vsc.c | 9 +- + include/linux/libata.h | 68 ++++++-- + 63 files changed, 831 insertions(+), 902 deletions(-) +Merging infiniband/for-next +$ git merge infiniband/for-next +Merge made by recursive. + drivers/infiniband/hw/cxgb4/cm.c | 46 +++++++++++++++++++++++++------ + drivers/infiniband/hw/cxgb4/cq.c | 4 +++ + drivers/infiniband/hw/cxgb4/mem.c | 2 +- + drivers/infiniband/hw/cxgb4/qp.c | 5 +--- + drivers/infiniband/hw/qib/qib_iba7322.c | 25 ++++++++++++----- + drivers/infiniband/hw/qib/qib_intr.c | 6 +++- + 6 files changed, 66 insertions(+), 22 deletions(-) +Merging acpi/test +$ git merge acpi/test +Already up-to-date. +Merging idle-test/idle-test +$ git merge idle-test/idle-test +Resolved 'arch/x86/kernel/process.c' using previous resolution. +Auto-merging arch/x86/kernel/process.c +CONFLICT (content): Merge conflict in arch/x86/kernel/process.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master eaf9b32] Merge remote-tracking branch 'idle-test/idle-test' +$ git diff -M --stat --summary HEAD^.. + arch/x86/kernel/process.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging powertools/tools-test +$ git merge powertools/tools-test +Already up-to-date. +Merging cpupowerutils/master +$ git merge cpupowerutils/master +Auto-merging CREDITS +Auto-merging MAINTAINERS +Merge made by recursive. + CREDITS | 17 +- + MAINTAINERS | 6 + + tools/power/cpupower/.gitignore | 22 + + tools/power/cpupower/Makefile | 279 ++++++ + tools/power/cpupower/README | 49 + + tools/power/cpupower/ToDo | 11 + + tools/power/cpupower/bench/Makefile | 29 + + tools/power/cpupower/bench/README-BENCH | 124 +++ + tools/power/cpupower/bench/benchmark.c | 194 ++++ + tools/power/cpupower/bench/benchmark.h | 29 + + tools/power/cpupower/bench/config.h | 36 + + tools/power/cpupower/bench/cpufreq-bench_plot.sh | 104 +++ + tools/power/cpupower/bench/cpufreq-bench_script.sh | 101 ++ + tools/power/cpupower/bench/example.cfg | 11 + + tools/power/cpupower/bench/main.c | 202 ++++ + tools/power/cpupower/bench/parse.c | 225 +++++ + tools/power/cpupower/bench/parse.h | 53 ++ + tools/power/cpupower/bench/system.c | 191 ++++ + tools/power/cpupower/bench/system.h | 29 + + tools/power/cpupower/debug/i386/Makefile | 20 + + tools/power/cpupower/debug/i386/centrino-decode.c | 113 +++ + tools/power/cpupower/debug/i386/dump_psb.c | 196 ++++ + tools/power/cpupower/debug/i386/intel_gsic.c | 78 ++ + .../power/cpupower/debug/i386/powernow-k8-decode.c | 96 ++ + tools/power/cpupower/debug/kernel/Makefile | 23 + + .../power/cpupower/debug/kernel/cpufreq-test_tsc.c | 113 +++ + tools/power/cpupower/debug/x86_64/Makefile | 14 + + .../power/cpupower/debug/x86_64/centrino-decode.c | 1 + + .../cpupower/debug/x86_64/powernow-k8-decode.c | 1 + + tools/power/cpupower/lib/cpufreq.c | 208 +++++ + tools/power/cpupower/lib/cpufreq.h | 223 +++++ + tools/power/cpupower/lib/sysfs.c | 672 ++++++++++++++ + tools/power/cpupower/lib/sysfs.h | 31 + + tools/power/cpupower/man/cpupower-frequency-info.1 | 76 ++ + tools/power/cpupower/man/cpupower-frequency-set.1 | 54 ++ + tools/power/cpupower/man/cpupower-info.1 | 19 + + tools/power/cpupower/man/cpupower-monitor.1 | 179 ++++ + tools/power/cpupower/man/cpupower-set.1 | 103 +++ + tools/power/cpupower/man/cpupower.1 | 72 ++ + tools/power/cpupower/po/cs.po | 944 +++++++++++++++++++ + tools/power/cpupower/po/de.po | 961 ++++++++++++++++++++ + tools/power/cpupower/po/fr.po | 947 +++++++++++++++++++ + tools/power/cpupower/po/it.po | 961 ++++++++++++++++++++ + tools/power/cpupower/po/pt.po | 957 +++++++++++++++++++ + tools/power/cpupower/utils/builtin.h | 18 + + tools/power/cpupower/utils/cpufreq-info.c | 678 ++++++++++++++ + tools/power/cpupower/utils/cpufreq-set.c | 358 ++++++++ + tools/power/cpupower/utils/cpuidle-info.c | 244 +++++ + tools/power/cpupower/utils/cpupower-info.c | 153 ++++ + tools/power/cpupower/utils/cpupower-set.c | 153 ++++ + tools/power/cpupower/utils/cpupower.c | 203 ++++ + tools/power/cpupower/utils/helpers/amd.c | 137 +++ + tools/power/cpupower/utils/helpers/bitmask.c | 292 ++++++ + tools/power/cpupower/utils/helpers/bitmask.h | 33 + + tools/power/cpupower/utils/helpers/cpuid.c | 143 +++ + tools/power/cpupower/utils/helpers/helpers.h | 180 ++++ + tools/power/cpupower/utils/helpers/misc.c | 35 + + tools/power/cpupower/utils/helpers/msr.c | 122 +++ + tools/power/cpupower/utils/helpers/pci.c | 44 + + tools/power/cpupower/utils/helpers/sysfs.c | 358 ++++++++ + tools/power/cpupower/utils/helpers/sysfs.h | 28 + + tools/power/cpupower/utils/helpers/topology.c | 108 +++ + .../cpupower/utils/idle_monitor/amd_fam14h_idle.c | 338 +++++++ + .../cpupower/utils/idle_monitor/cpuidle_sysfs.c | 196 ++++ + .../cpupower/utils/idle_monitor/cpupower-monitor.c | 448 +++++++++ + .../cpupower/utils/idle_monitor/cpupower-monitor.h | 68 ++ + .../cpupower/utils/idle_monitor/idle_monitors.def | 7 + + .../cpupower/utils/idle_monitor/idle_monitors.h | 18 + + .../cpupower/utils/idle_monitor/mperf_monitor.c | 255 ++++++ + tools/power/cpupower/utils/idle_monitor/nhm_idle.c | 216 +++++ + tools/power/cpupower/utils/idle_monitor/snb_idle.c | 190 ++++ + tools/power/cpupower/utils/version-gen.sh | 35 + + 72 files changed, 13831 insertions(+), 1 deletions(-) + create mode 100644 tools/power/cpupower/.gitignore + create mode 100644 tools/power/cpupower/Makefile + create mode 100644 tools/power/cpupower/README + create mode 100644 tools/power/cpupower/ToDo + create mode 100644 tools/power/cpupower/bench/Makefile + create mode 100644 tools/power/cpupower/bench/README-BENCH + create mode 100644 tools/power/cpupower/bench/benchmark.c + create mode 100644 tools/power/cpupower/bench/benchmark.h + create mode 100644 tools/power/cpupower/bench/config.h + create mode 100644 tools/power/cpupower/bench/cpufreq-bench_plot.sh + create mode 100644 tools/power/cpupower/bench/cpufreq-bench_script.sh + create mode 100644 tools/power/cpupower/bench/example.cfg + create mode 100644 tools/power/cpupower/bench/main.c + create mode 100644 tools/power/cpupower/bench/parse.c + create mode 100644 tools/power/cpupower/bench/parse.h + create mode 100644 tools/power/cpupower/bench/system.c + create mode 100644 tools/power/cpupower/bench/system.h + create mode 100644 tools/power/cpupower/debug/i386/Makefile + create mode 100644 tools/power/cpupower/debug/i386/centrino-decode.c + create mode 100644 tools/power/cpupower/debug/i386/dump_psb.c + create mode 100644 tools/power/cpupower/debug/i386/intel_gsic.c + create mode 100644 tools/power/cpupower/debug/i386/powernow-k8-decode.c + create mode 100644 tools/power/cpupower/debug/kernel/Makefile + create mode 100644 tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c + create mode 100644 tools/power/cpupower/debug/x86_64/Makefile + create mode 120000 tools/power/cpupower/debug/x86_64/centrino-decode.c + create mode 120000 tools/power/cpupower/debug/x86_64/powernow-k8-decode.c + create mode 100644 tools/power/cpupower/lib/cpufreq.c + create mode 100644 tools/power/cpupower/lib/cpufreq.h + create mode 100644 tools/power/cpupower/lib/sysfs.c + create mode 100644 tools/power/cpupower/lib/sysfs.h + create mode 100644 tools/power/cpupower/man/cpupower-frequency-info.1 + create mode 100644 tools/power/cpupower/man/cpupower-frequency-set.1 + create mode 100644 tools/power/cpupower/man/cpupower-info.1 + create mode 100644 tools/power/cpupower/man/cpupower-monitor.1 + create mode 100644 tools/power/cpupower/man/cpupower-set.1 + create mode 100644 tools/power/cpupower/man/cpupower.1 + create mode 100644 tools/power/cpupower/po/cs.po + create mode 100644 tools/power/cpupower/po/de.po + create mode 100644 tools/power/cpupower/po/fr.po + create mode 100644 tools/power/cpupower/po/it.po + create mode 100644 tools/power/cpupower/po/pt.po + create mode 100644 tools/power/cpupower/utils/builtin.h + create mode 100644 tools/power/cpupower/utils/cpufreq-info.c + create mode 100644 tools/power/cpupower/utils/cpufreq-set.c + create mode 100644 tools/power/cpupower/utils/cpuidle-info.c + create mode 100644 tools/power/cpupower/utils/cpupower-info.c + create mode 100644 tools/power/cpupower/utils/cpupower-set.c + create mode 100644 tools/power/cpupower/utils/cpupower.c + create mode 100644 tools/power/cpupower/utils/helpers/amd.c + create mode 100644 tools/power/cpupower/utils/helpers/bitmask.c + create mode 100644 tools/power/cpupower/utils/helpers/bitmask.h + create mode 100644 tools/power/cpupower/utils/helpers/cpuid.c + create mode 100644 tools/power/cpupower/utils/helpers/helpers.h + create mode 100644 tools/power/cpupower/utils/helpers/misc.c + create mode 100644 tools/power/cpupower/utils/helpers/msr.c + create mode 100644 tools/power/cpupower/utils/helpers/pci.c + create mode 100644 tools/power/cpupower/utils/helpers/sysfs.c + create mode 100644 tools/power/cpupower/utils/helpers/sysfs.h + create mode 100644 tools/power/cpupower/utils/helpers/topology.c + create mode 100644 tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c + create mode 100644 tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c + create mode 100644 tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c + create mode 100644 tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h + create mode 100644 tools/power/cpupower/utils/idle_monitor/idle_monitors.def + create mode 100644 tools/power/cpupower/utils/idle_monitor/idle_monitors.h + create mode 100644 tools/power/cpupower/utils/idle_monitor/mperf_monitor.c + create mode 100644 tools/power/cpupower/utils/idle_monitor/nhm_idle.c + create mode 100644 tools/power/cpupower/utils/idle_monitor/snb_idle.c + create mode 100755 tools/power/cpupower/utils/version-gen.sh +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Merge made by recursive. + drivers/firewire/net.c | 5 +++-- + drivers/firewire/ohci.c | 14 +++++--------- + 2 files changed, 8 insertions(+), 11 deletions(-) +Merging ubi/linux-next +$ git merge ubi/linux-next +Merge made by recursive. + drivers/mtd/ubi/build.c | 28 +++++- + drivers/mtd/ubi/debug.c | 269 +++++++++++++++++++++++++++++++++++++++++++++-- + drivers/mtd/ubi/debug.h | 113 ++++++++++++-------- + drivers/mtd/ubi/io.c | 20 ++-- + drivers/mtd/ubi/scan.c | 2 +- + drivers/mtd/ubi/ubi.h | 8 ++- + drivers/mtd/ubi/vmt.c | 2 +- + drivers/mtd/ubi/vtbl.c | 18 +--- + drivers/mtd/ubi/wl.c | 42 ++++--- + 9 files changed, 398 insertions(+), 104 deletions(-) +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/master +$ git merge swiotlb/master +Merge made by recursive. +Merging ibft/master +$ git merge ibft/master +Merge made by recursive. +Merging scsi/master +$ git merge scsi/master +Already up-to-date. +Merging slave-dma/next +$ git merge slave-dma/next +Auto-merging arch/arm/mach-ep93xx/core.c +Removing arch/arm/mach-ep93xx/dma-m2p.c +Merge made by recursive. + Documentation/spi/ep93xx_spi | 10 + + arch/arm/mach-ep93xx/Makefile | 4 +- + arch/arm/mach-ep93xx/core.c | 6 +- + arch/arm/mach-ep93xx/dma-m2p.c | 411 ------- + arch/arm/mach-ep93xx/dma.c | 108 ++ + arch/arm/mach-ep93xx/include/mach/dma.h | 190 ++--- + arch/arm/mach-ep93xx/include/mach/ep93xx_spi.h | 2 + + drivers/dma/Kconfig | 7 + + drivers/dma/Makefile | 1 + + drivers/dma/at_hdmac.c | 4 +- + drivers/dma/ep93xx_dma.c | 1355 ++++++++++++++++++++++++ + drivers/dma/ipu/ipu_idmac.c | 6 +- + drivers/dma/pch_dma.c | 69 +- + drivers/spi/ep93xx_spi.c | 303 +++++- + sound/soc/ep93xx/ep93xx-ac97.c | 4 +- + sound/soc/ep93xx/ep93xx-i2s.c | 4 +- + sound/soc/ep93xx/ep93xx-pcm.c | 137 ++-- + 17 files changed, 1989 insertions(+), 632 deletions(-) + delete mode 100644 arch/arm/mach-ep93xx/dma-m2p.c + create mode 100644 arch/arm/mach-ep93xx/dma.c + create mode 100644 drivers/dma/ep93xx_dma.c +Merging async_tx/next +$ git merge async_tx/next +Already up-to-date. +Merging net/master +$ git merge net/master +Resolved 'drivers/net/wireless/iwlwifi/iwl-agn-rxon.c' using previous resolution. +Resolved 'drivers/net/wireless/rtlwifi/pci.c' using previous resolution. +Resolved 'net/netfilter/ipvs/ip_vs_core.c' using previous resolution. +Auto-merging drivers/net/3c503.c +Auto-merging drivers/net/arm/ep93xx_eth.c +Auto-merging drivers/net/bonding/bond_main.c +Auto-merging drivers/net/gianfar.c +Auto-merging drivers/net/gianfar_ethtool.c +Auto-merging drivers/net/igb/igb_main.c +Removing drivers/net/myri_sbus.c +Removing drivers/net/myri_sbus.h +Auto-merging drivers/net/netxen/netxen_nic_main.c +Auto-merging drivers/net/ppp_async.c +Auto-merging drivers/net/r8169.c +Auto-merging drivers/net/tun.c +Auto-merging drivers/net/wan/farsync.c +Auto-merging drivers/net/wireless/iwlegacy/iwl-4965.c +Auto-merging drivers/net/wireless/iwlegacy/iwl-dev.h +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn-rxon.c +CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-agn-rxon.c +Auto-merging drivers/net/wireless/mwl8k.c +Auto-merging drivers/net/wireless/rtlwifi/pci.c +CONFLICT (content): Merge conflict in drivers/net/wireless/rtlwifi/pci.c +Auto-merging drivers/staging/brcm80211/brcmfmac/wl_iw.c +Auto-merging include/linux/ethtool.h +Auto-merging include/linux/netdevice.h +Auto-merging include/linux/skbuff.h +Auto-merging net/8021q/vlan.c +Auto-merging net/core/dev.c +Auto-merging net/ipv4/af_inet.c +Auto-merging net/ipv4/inet_diag.c +Auto-merging net/ipv4/route.c +Auto-merging net/ipv4/tcp_ipv4.c +Auto-merging net/ipv6/tcp_ipv6.c +Auto-merging net/irda/iriap.c +Auto-merging net/netfilter/ipset/ip_set_core.c +Auto-merging net/netfilter/ipset/ip_set_hash_ipportnet.c +Auto-merging net/netfilter/ipset/ip_set_hash_net.c +Auto-merging net/netfilter/ipset/ip_set_hash_netport.c +Auto-merging net/netfilter/ipvs/ip_vs_conn.c +Auto-merging net/netfilter/ipvs/ip_vs_core.c +CONFLICT (content): Merge conflict in net/netfilter/ipvs/ip_vs_core.c +Auto-merging net/packet/af_packet.c +Auto-merging net/wireless/nl80211.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9a98690] Merge remote-tracking branch 'net/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/networking/ip-sysctl.txt | 10 - + arch/m68k/emu/nfeth.c | 1 + + drivers/atm/eni.h | 1 + + drivers/atm/firestream.c | 1 + + drivers/atm/horizon.c | 1 + + drivers/atm/idt77252.c | 1 + + drivers/atm/iphase.c | 1 + + drivers/atm/zatm.c | 1 + + drivers/bcma/Kconfig | 5 + + drivers/bcma/Makefile | 2 +- + drivers/bcma/bcma_private.h | 3 + + drivers/bcma/driver_pci.c | 23 + + drivers/bcma/host_pci.c | 52 + + drivers/bcma/main.c | 9 + + drivers/bcma/sprom.c | 162 + + drivers/infiniband/core/netlink.c | 2 +- + drivers/infiniband/hw/amso1100/c2.c | 1 + + drivers/infiniband/ulp/iser/iscsi_iser.h | 1 + + drivers/isdn/hardware/mISDN/avmfritz.c | 1 + + drivers/isdn/hardware/mISDN/hfcmulti.c | 1 + + drivers/isdn/hardware/mISDN/hfcpci.c | 1 + + drivers/isdn/hardware/mISDN/mISDNinfineon.c | 1 + + drivers/isdn/hardware/mISDN/mISDNipac.c | 1 + + drivers/isdn/hardware/mISDN/netjet.c | 1 + + drivers/isdn/hardware/mISDN/speedfax.c | 1 + + drivers/isdn/hardware/mISDN/w6692.c | 1 + + drivers/isdn/hisax/hisax.h | 1 + + drivers/isdn/hisax/hisax_fcpcipnp.c | 1 + + drivers/media/dvb/b2c2/flexcop-common.h | 1 + + drivers/media/dvb/dm1105/dm1105.c | 1 + + drivers/media/dvb/mantis/mantis_common.h | 1 + + drivers/media/dvb/pluto2/pluto2.c | 1 + + drivers/net/3c503.c | 1 + + drivers/net/8139cp.c | 1 + + drivers/net/8139too.c | 1 + + drivers/net/8390.h | 1 + + drivers/net/Kconfig | 19 +- + drivers/net/Makefile | 2 +- + drivers/net/ac3200.c | 1 + + drivers/net/acenic.h | 1 + + drivers/net/amd8111e.c | 3 +- + drivers/net/apne.c | 1 + + drivers/net/arcnet/arc-rimi.c | 1 + + drivers/net/arcnet/com20020-isa.c | 1 + + drivers/net/arcnet/com20020-pci.c | 1 + + drivers/net/arcnet/com20020.c | 1 + + drivers/net/arcnet/com90io.c | 1 + + drivers/net/arcnet/com90xx.c | 1 + + drivers/net/arm/at91_ether.c | 1 + + drivers/net/arm/ep93xx_eth.c | 1 + + drivers/net/arm/ks8695net.c | 1 + + drivers/net/atl1c/atl1c.h | 1 + + drivers/net/atl1e/atl1e.h | 1 + + drivers/net/b44.c | 1 + + drivers/net/bcm63xx_enet.c | 1 + + drivers/net/benet/be.h | 13 +- + drivers/net/benet/be_cmds.c | 65 +- + drivers/net/benet/be_cmds.h | 8 + + drivers/net/benet/be_ethtool.c | 50 +- + drivers/net/benet/be_main.c | 241 +- + drivers/net/bmac.c | 1 + + drivers/net/bnx2.c | 7 + + drivers/net/bnx2x/Makefile | 2 +- + drivers/net/bnx2x/bnx2x.h | 919 ++-- + drivers/net/bnx2x/bnx2x_cmn.c | 1105 +++-- + drivers/net/bnx2x/bnx2x_cmn.h | 568 ++- + drivers/net/bnx2x/bnx2x_dcb.c | 671 ++- + drivers/net/bnx2x/bnx2x_dcb.h | 30 +- + drivers/net/bnx2x/bnx2x_dump.h | 913 ++-- + drivers/net/bnx2x/bnx2x_ethtool.c | 456 +- + drivers/net/bnx2x/bnx2x_fw_defs.h | 519 +- + drivers/net/bnx2x/bnx2x_hsi.h | 5479 +++++++++++------ + drivers/net/bnx2x/bnx2x_init.h | 327 +- + drivers/net/bnx2x/bnx2x_init_ops.h | 194 +- + drivers/net/bnx2x/bnx2x_link.c | 6159 +++++++++++++++---- + drivers/net/bnx2x/bnx2x_link.h | 181 +- + drivers/net/bnx2x/bnx2x_main.c | 5444 ++++++++++------- + drivers/net/bnx2x/bnx2x_reg.h | 906 +++- + drivers/net/bnx2x/bnx2x_sp.c | 5333 ++++++++++++++++ + drivers/net/bnx2x/bnx2x_sp.h | 1235 ++++ + drivers/net/bnx2x/bnx2x_stats.c | 868 ++-- + drivers/net/bnx2x/bnx2x_stats.h | 228 +- + drivers/net/bonding/bond_3ad.c | 40 +- + drivers/net/bonding/bond_3ad.h | 8 +- + drivers/net/bonding/bond_main.c | 22 +- + drivers/net/bonding/bond_sysfs.c | 1 + + drivers/net/bonding/bonding.h | 1 - + drivers/net/caif/Kconfig | 9 + + drivers/net/caif/Makefile | 3 + + drivers/net/caif/caif_hsi.c | 1220 ++++ + drivers/net/caif/caif_serial.c | 1 + + drivers/net/can/Kconfig | 5 +- + drivers/net/can/at91_can.c | 366 +- + drivers/net/can/sja1000/sja1000.h | 1 + + drivers/net/cassini.c | 1 + + drivers/net/cnic.c | 303 +- + drivers/net/cnic.h | 40 +- + drivers/net/cnic_defs.h | 6488 +++++++++++--------- + drivers/net/cnic_if.h | 8 +- + drivers/net/cpmac.c | 1 + + drivers/net/cxgb4/cxgb4_main.c | 2 +- + drivers/net/cxgb4vf/adapter.h | 1 + + drivers/net/davinci_emac.c | 6 +- + drivers/net/dm9000.c | 27 +- + drivers/net/dnet.c | 3 + + drivers/net/e100.c | 2 + + drivers/net/e1000/e1000_hw.c | 7 +- + drivers/net/e1000e/e1000.h | 42 +- + drivers/net/e1000e/es2lan.c | 8 + + drivers/net/e1000e/ethtool.c | 1 + + drivers/net/e1000e/hw.h | 21 +- + drivers/net/e1000e/ich8lan.c | 191 +- + drivers/net/e1000e/netdev.c | 132 +- + drivers/net/e1000e/phy.c | 352 +- + drivers/net/e2100.c | 1 + + drivers/net/enic/enic.h | 3 +- + drivers/net/enic/enic_main.c | 97 +- + drivers/net/enic/enic_res.c | 23 +- + drivers/net/enic/vnic_cq.c | 2 + + drivers/net/enic/vnic_cq.h | 1 + + drivers/net/enic/vnic_enet.h | 7 + + drivers/net/es3210.c | 1 + + drivers/net/ethoc.c | 2 + + drivers/net/fec.c | 5 +- + drivers/net/fec_mpc52xx.c | 1 + + drivers/net/ftgmac100.c | 1365 ++++ + drivers/net/ftgmac100.h | 246 + + drivers/net/gianfar.c | 113 +- + drivers/net/gianfar_ethtool.c | 21 +- + drivers/net/greth.c | 1 + + drivers/net/hamradio/baycom_ser_fdx.c | 1 + + drivers/net/hamradio/baycom_ser_hdx.c | 1 + + drivers/net/hp-plus.c | 1 + + drivers/net/hp.c | 1 + + drivers/net/ibmveth.c | 1 + + drivers/net/ifb.c | 1 + + drivers/net/igb/igb_main.c | 3 +- + drivers/net/igbvf/netdev.c | 2 +- + drivers/net/ipg.c | 1 + + drivers/net/irda/ali-ircc.c | 1 + + drivers/net/irda/donauboe.c | 1 + + drivers/net/irda/nsc-ircc.c | 1 + + drivers/net/irda/pxaficp_ir.c | 1 + + drivers/net/irda/sir_dev.c | 1 + + drivers/net/irda/smsc-ircc2.c | 1 + + drivers/net/irda/via-ircc.c | 1 + + drivers/net/irda/via-ircc.h | 2 +- + drivers/net/irda/vlsi_ir.c | 1 + + drivers/net/irda/w83977af_ir.c | 1 + + drivers/net/iseries_veth.c | 4 +- + drivers/net/ixgbe/ixgbe_82599.c | 4 +- + drivers/net/ixgbe/ixgbe_common.c | 4 +- + drivers/net/ixgbe/ixgbe_ethtool.c | 1 + + drivers/net/ixgbe/ixgbe_main.c | 1 + + drivers/net/ixgbevf/ixgbevf_main.c | 2 +- + drivers/net/ixp2000/ixpdev.c | 1 + + drivers/net/jme.h | 1 + + drivers/net/ks8842.c | 1 + + drivers/net/ks8851.c | 1 + + drivers/net/ks8851_mll.c | 1 + + drivers/net/ksz884x.c | 1 + + drivers/net/ll_temac_main.c | 1 + + drivers/net/lne390.c | 1 + + drivers/net/macb.c | 1 + + drivers/net/mace.c | 1 + + drivers/net/macvlan.c | 39 +- + drivers/net/macvtap.c | 2 + + drivers/net/mipsnet.c | 1 + + drivers/net/myri10ge/myri10ge.c | 26 +- + drivers/net/myri_sbus.c | 1187 ---- + drivers/net/myri_sbus.h | 311 - + drivers/net/netx-eth.c | 1 + + drivers/net/netxen/netxen_nic_hw.c | 6 + + drivers/net/netxen/netxen_nic_init.c | 2 +- + drivers/net/netxen/netxen_nic_main.c | 9 +- + drivers/net/niu.c | 37 +- + drivers/net/ns83820.c | 1 + + drivers/net/octeon/octeon_mgmt.c | 1 + + drivers/net/phy/icplus.c | 6 +- + drivers/net/ppp_async.c | 1 + + drivers/net/ppp_synctty.c | 1 + + drivers/net/ps3_gelic_net.c | 3 +- + drivers/net/qlge/qlge.h | 1 + + drivers/net/qlge/qlge_ethtool.c | 2 - + drivers/net/r6040.c | 3 + + drivers/net/r8169.c | 218 +- + drivers/net/sc92031.c | 1 + + drivers/net/sfc/nic.c | 1 + + drivers/net/sis190.c | 1 + + drivers/net/skge.h | 1 + + drivers/net/sky2.c | 1 + + drivers/net/slhc.c | 2 +- + drivers/net/smc-mca.c | 1 + + drivers/net/smc-ultra.c | 1 + + drivers/net/smsc911x.c | 1 + + drivers/net/smsc9420.c | 3 + + drivers/net/spider_net.c | 1 + + drivers/net/starfire.c | 1 + + drivers/net/stmmac/stmmac_ethtool.c | 1 + + drivers/net/stmmac/stmmac_main.c | 2 + + drivers/net/sungem.c | 891 ++-- + drivers/net/sungem.h | 25 - + drivers/net/tg3.c | 316 +- + drivers/net/tg3.h | 17 +- + drivers/net/tlan.c | 2 + + drivers/net/tokenring/3c359.c | 6 +- + drivers/net/tokenring/ibmtr.c | 3 +- + drivers/net/tsi108_eth.c | 1 + + drivers/net/tulip/de2104x.c | 1 + + drivers/net/tulip/pnic.c | 1 + + drivers/net/tulip/tulip_core.c | 1 + + drivers/net/tun.c | 32 +- + drivers/net/usb/ipheth.c | 15 +- + drivers/net/veth.c | 70 +- + drivers/net/via-velocity.c | 2 +- + drivers/net/virtio_net.c | 2 + + drivers/net/vmxnet3/vmxnet3_drv.c | 4 +- + drivers/net/vmxnet3/vmxnet3_ethtool.c | 44 +- + drivers/net/vmxnet3/vmxnet3_int.h | 5 +- + drivers/net/vxge/vxge-config.h | 1 + + drivers/net/vxge/vxge-main.c | 1 + + drivers/net/wan/cycx_main.c | 1 + + drivers/net/wan/dscc4.c | 1 + + drivers/net/wan/farsync.c | 1 + + drivers/net/wan/wanxl.c | 1 + + drivers/net/wireless/adm8211.c | 1 + + drivers/net/wireless/ath/ath.h | 1 + + drivers/net/wireless/ath/ath9k/ar9002_mac.c | 6 - + drivers/net/wireless/ath/ath9k/ar9003_mac.c | 8 - + drivers/net/wireless/ath/ath9k/ar9003_paprd.c | 24 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 9 +- + drivers/net/wireless/ath/ath9k/beacon.c | 21 +- + drivers/net/wireless/ath/ath9k/debug.c | 59 +- + drivers/net/wireless/ath/ath9k/debug.h | 1 + + drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 8 +- + drivers/net/wireless/ath/ath9k/hw-ops.h | 5 - + drivers/net/wireless/ath/ath9k/hw.c | 6 +- + drivers/net/wireless/ath/ath9k/hw.h | 2 - + drivers/net/wireless/ath/ath9k/init.c | 2 +- + drivers/net/wireless/ath/ath9k/main.c | 150 +- + drivers/net/wireless/ath/ath9k/xmit.c | 338 +- + drivers/net/wireless/atmel.c | 1 + + drivers/net/wireless/b43/Kconfig | 5 + + drivers/net/wireless/b43/Makefile | 1 + + drivers/net/wireless/b43/b43.h | 51 +- + drivers/net/wireless/b43/bus.c | 122 + + drivers/net/wireless/b43/bus.h | 62 + + drivers/net/wireless/b43/dma.c | 38 +- + drivers/net/wireless/b43/leds.c | 15 +- + drivers/net/wireless/b43/lo.c | 6 +- + drivers/net/wireless/b43/main.c | 236 +- + drivers/net/wireless/b43/main.h | 2 +- + drivers/net/wireless/b43/phy_a.c | 21 +- + drivers/net/wireless/b43/phy_common.c | 8 +- + drivers/net/wireless/b43/phy_g.c | 92 +- + drivers/net/wireless/b43/phy_lp.c | 135 +- + drivers/net/wireless/b43/phy_n.c | 37 +- + drivers/net/wireless/b43/pio.c | 10 +- + drivers/net/wireless/b43/rfkill.c | 9 +- + drivers/net/wireless/b43/sdio.c | 4 +- + drivers/net/wireless/b43/sysfs.c | 4 +- + drivers/net/wireless/b43/tables_lpphy.c | 15 +- + drivers/net/wireless/b43/wa.c | 24 +- + drivers/net/wireless/b43/xmit.c | 2 +- + drivers/net/wireless/b43legacy/dma.c | 10 +- + drivers/net/wireless/b43legacy/main.c | 10 +- + drivers/net/wireless/b43legacy/xmit.c | 2 - + drivers/net/wireless/hostap/hostap_wlan.h | 1 + + drivers/net/wireless/ipw2x00/ipw2200.h | 1 + + drivers/net/wireless/ipw2x00/libipw_wx.c | 1 + + drivers/net/wireless/iwlegacy/iwl-4965-rs.c | 3 + + drivers/net/wireless/iwlegacy/iwl-4965.c | 6 +- + drivers/net/wireless/iwlegacy/iwl-dev.h | 1 + + drivers/net/wireless/iwlegacy/iwl-eeprom.c | 1 - + drivers/net/wireless/iwlwifi/iwl-1000.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-2000.c | 1 - + drivers/net/wireless/iwlwifi/iwl-5000.c | 2 - + drivers/net/wireless/iwlwifi/iwl-6000.c | 2 - + drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 3 - + drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 7 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 72 +- + drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 10 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 207 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 7 +- + drivers/net/wireless/iwlwifi/iwl-core.h | 14 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 1 + + drivers/net/wireless/iwlwifi/iwl-scan.c | 10 +- + drivers/net/wireless/iwlwifi/iwl-tx.c | 6 +- + drivers/net/wireless/iwmc3200wifi/fw.c | 2 +- + drivers/net/wireless/libertas/cfg.c | 1 + + drivers/net/wireless/libertas/cmd.c | 1 + + drivers/net/wireless/libertas/cmdresp.c | 1 + + drivers/net/wireless/libertas/debugfs.c | 1 + + drivers/net/wireless/libertas/ethtool.c | 1 + + drivers/net/wireless/libertas/if_spi.c | 2 + + drivers/net/wireless/libertas/main.c | 1 + + drivers/net/wireless/libertas/mesh.c | 1 + + drivers/net/wireless/libertas/rx.c | 1 + + drivers/net/wireless/libertas/tx.c | 1 + + drivers/net/wireless/libertas_tf/cmd.c | 1 + + drivers/net/wireless/libertas_tf/main.c | 1 + + drivers/net/wireless/mac80211_hwsim.c | 462 ++- + drivers/net/wireless/mac80211_hwsim.h | 133 + + drivers/net/wireless/mwifiex/11n_aggr.c | 54 +- + drivers/net/wireless/mwifiex/main.c | 18 +- + drivers/net/wireless/mwifiex/main.h | 12 +- + drivers/net/wireless/mwifiex/sdio.c | 8 +- + drivers/net/wireless/mwifiex/sdio.h | 2 + + drivers/net/wireless/mwifiex/wmm.c | 30 +- + drivers/net/wireless/mwl8k.c | 1 + + drivers/net/wireless/orinoco/main.c | 2 +- + drivers/net/wireless/p54/p54pci.h | 1 + + drivers/net/wireless/prism54/islpci_dev.c | 1 + + drivers/net/wireless/prism54/islpci_dev.h | 1 + + drivers/net/wireless/prism54/islpci_hotplug.c | 1 + + drivers/net/wireless/rt2x00/Kconfig | 9 +- + drivers/net/wireless/rt2x00/rt2800.h | 16 + + drivers/net/wireless/rt2x00/rt2800lib.c | 378 +- + drivers/net/wireless/rt2x00/rt2800lib.h | 1 - + drivers/net/wireless/rt2x00/rt2800pci.c | 6 +- + drivers/net/wireless/rt2x00/rt2800usb.c | 83 +- + drivers/net/wireless/rt2x00/rt2x00.h | 1 + + drivers/net/wireless/rt2x00/rt2x00queue.c | 5 +- + drivers/net/wireless/rtl818x/rtl8180/dev.c | 1 + + drivers/net/wireless/rtlwifi/base.c | 4 - + drivers/net/wireless/rtlwifi/efuse.c | 6 +- + drivers/net/wireless/rtlwifi/pci.c | 39 +- + drivers/net/wireless/rtlwifi/ps.c | 48 +- + drivers/net/wireless/rtlwifi/regd.c | 18 - + drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 2 - + drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c | 12 +- + drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 9 +- + drivers/net/wireless/rtlwifi/rtl8192ce/phy.c | 14 +- + drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 4 +- + drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | 2 - + drivers/net/wireless/rtlwifi/rtl8192cu/phy.c | 2 - + drivers/net/wireless/rtlwifi/rtl8192se/dm.c | 5 - + drivers/net/wireless/rtlwifi/rtl8192se/fw.c | 2 - + drivers/net/wireless/rtlwifi/rtl8192se/hw.c | 12 +- + drivers/net/wireless/rtlwifi/rtl8192se/phy.c | 18 +- + drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 6 +- + drivers/net/wireless/rtlwifi/wifi.h | 2 +- + drivers/net/wireless/wl1251/sdio.c | 1 + + drivers/net/wireless/wl1251/spi.c | 1 + + drivers/net/wireless/wl12xx/boot.c | 3 +- + drivers/net/wireless/wl12xx/event.c | 23 + + drivers/net/wireless/wl12xx/event.h | 17 +- + drivers/net/wireless/wl12xx/init.c | 1 + + drivers/net/wireless/wl12xx/io.h | 1 + + drivers/net/wireless/wl12xx/main.c | 5 +- + drivers/net/wireless/wl12xx/spi.c | 1 + + drivers/net/wireless/wl12xx/wl12xx.h | 1 + + drivers/net/xilinx_emaclite.c | 1 + + drivers/net/znet.c | 2 +- + drivers/s390/net/ctcm_mpc.h | 1 + + drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h | 1162 ++-- + drivers/scsi/bnx2fc/bnx2fc.h | 10 +- + drivers/scsi/bnx2fc/bnx2fc_constants.h | 139 +- + drivers/scsi/bnx2fc/bnx2fc_els.c | 7 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 4 +- + drivers/scsi/bnx2fc/bnx2fc_hwi.c | 442 +- + drivers/scsi/bnx2fc/bnx2fc_io.c | 23 +- + drivers/scsi/bnx2fc/bnx2fc_tgt.c | 24 +- + drivers/scsi/bnx2i/57xx_iscsi_hsi.h | 12 +- + drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 2 + + drivers/staging/brcm80211/brcmfmac/wl_iw.c | 1 + + drivers/staging/brcm80211/brcmsmac/wl_mac80211.c | 1 + + drivers/staging/brcm80211/brcmsmac/wl_mac80211.h | 2 + + drivers/staging/rtl8187se/ieee80211/ieee80211.h | 1 + + .../rtl8187se/ieee80211/ieee80211_softmac.c | 1 + + drivers/staging/rtl8187se/r8180.h | 1 + + drivers/staging/rtl8187se/r8180_core.c | 1 + + drivers/staging/rtl8192e/ieee80211/ieee80211.h | 1 + + drivers/staging/rtl8192e/r8192E.h | 1 + + drivers/staging/rtl8192e/r8192E_core.c | 2 + + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 1 + + include/linux/arcdevice.h | 1 + + include/linux/bcma/bcma.h | 25 + + include/linux/bcma/bcma_driver_chipcommon.h | 1 + + include/linux/cordic.h | 48 + + include/linux/crc8.h | 101 + + include/linux/dccp.h | 1 + + include/linux/ethtool.h | 19 +- + include/linux/mii.h | 2 + + include/linux/netdevice.h | 4 - + include/linux/netfilter/ipset/ip_set.h | 50 +- + include/linux/netfilter/ipset/ip_set_ahash.h | 48 +- + include/linux/netfilter/ipset/ip_set_hash.h | 4 + + include/linux/netfilter/ipset/ip_set_timeout.h | 5 +- + include/linux/netfilter/ipset/pfxlen.h | 11 +- + include/linux/netfilter/xt_set.h | 15 +- + include/linux/netlink.h | 6 +- + include/linux/skbuff.h | 3 +- + include/linux/tcp.h | 1 + + include/linux/virtio_net.h | 1 + + include/net/bluetooth/hci_core.h | 1 + + include/net/caif/caif_hsi.h | 145 + + include/net/cfg80211.h | 11 + + include/net/inetpeer.h | 26 +- + include/net/ip.h | 2 - + include/net/ip_vs.h | 34 +- + include/net/mac80211.h | 21 + + include/net/rtnetlink.h | 7 +- + include/net/sctp/sctp.h | 15 +- + include/net/sctp/structs.h | 17 + + include/net/sctp/user.h | 1 + + include/net/snmp.h | 86 +- + include/net/sock.h | 1 + + include/net/tcp.h | 11 +- + lib/Kconfig | 14 + + lib/Makefile | 3 + + lib/cordic.c | 101 + + lib/crc8.c | 86 + + net/8021q/vlan.c | 15 +- + net/8021q/vlan_dev.c | 4 +- + net/8021q/vlanproc.c | 6 +- + net/atm/mpc.c | 2 +- + net/atm/pppoatm.c | 1 + + net/batman-adv/Kconfig | 1 + + net/batman-adv/aggregation.c | 48 +- + net/batman-adv/aggregation.h | 13 +- + net/batman-adv/bat_debugfs.c | 11 +- + net/batman-adv/bat_sysfs.c | 102 +- + net/batman-adv/bat_sysfs.h | 2 + + net/batman-adv/bitarray.c | 12 +- + net/batman-adv/bitarray.h | 10 +- + net/batman-adv/gateway_client.c | 263 +- + net/batman-adv/gateway_client.h | 3 +- + net/batman-adv/gateway_common.c | 25 +- + net/batman-adv/hard-interface.c | 46 +- + net/batman-adv/hard-interface.h | 20 +- + net/batman-adv/hash.c | 7 +- + net/batman-adv/hash.h | 6 +- + net/batman-adv/icmp_socket.c | 4 +- + net/batman-adv/main.c | 22 +- + net/batman-adv/main.h | 74 +- + net/batman-adv/originator.c | 29 +- + net/batman-adv/originator.h | 18 +- + net/batman-adv/packet.h | 137 +- + net/batman-adv/ring_buffer.c | 4 +- + net/batman-adv/ring_buffer.h | 2 +- + net/batman-adv/routing.c | 362 +- + net/batman-adv/routing.h | 15 +- + net/batman-adv/send.c | 130 +- + net/batman-adv/send.h | 14 +- + net/batman-adv/soft-interface.c | 48 +- + net/batman-adv/soft-interface.h | 5 +- + net/batman-adv/translation-table.c | 1452 ++++- + net/batman-adv/translation-table.h | 47 +- + net/batman-adv/types.h | 72 +- + net/batman-adv/unicast.c | 33 +- + net/batman-adv/unicast.h | 8 +- + net/batman-adv/vis.c | 104 +- + net/bluetooth/hci_core.c | 4 +- + net/bridge/br_netlink.c | 15 +- + net/caif/chnl_net.c | 1 + + net/can/af_can.c | 5 +- + net/can/bcm.c | 1 + + net/ceph/crypto.c | 2 +- + net/core/dev.c | 5 - + net/core/ethtool.c | 309 +- + net/core/fib_rules.c | 6 +- + net/core/neighbour.c | 11 +- + net/core/rtnetlink.c | 60 +- + net/core/timestamping.c | 1 + + net/dcb/dcbnl.c | 4 +- + net/decnet/dn_dev.c | 8 +- + net/decnet/dn_fib.c | 4 +- + net/decnet/dn_route.c | 5 +- + net/ipv4/af_inet.c | 52 +- + net/ipv4/devinet.c | 6 +- + net/ipv4/fib_frontend.c | 6 +- + net/ipv4/inet_diag.c | 2 +- + net/ipv4/inetpeer.c | 280 +- + net/ipv4/ipmr.c | 3 +- + net/ipv4/route.c | 2 +- + net/ipv4/syncookies.c | 1 + + net/ipv4/sysctl_net_ipv4.c | 14 - + net/ipv4/tcp_input.c | 46 +- + net/ipv4/tcp_ipv4.c | 11 +- + net/ipv4/tcp_minisocks.c | 6 +- + net/ipv6/addrconf.c | 51 +- + net/ipv6/addrlabel.c | 9 +- + net/ipv6/ip6_fib.c | 3 +- + net/ipv6/ip6mr.c | 3 +- + net/ipv6/route.c | 6 +- + net/ipv6/syncookies.c | 1 + + net/ipv6/tcp_ipv6.c | 5 + + net/irda/af_irda.c | 4 +- + net/irda/ircomm/ircomm_tty_attach.c | 2 +- + net/irda/irda_device.c | 2 +- + net/irda/iriap.c | 8 +- + net/irda/irlan/irlan_client.c | 10 +- + net/irda/irlan/irlan_common.c | 10 +- + net/irda/irlan/irlan_eth.c | 2 +- + net/irda/irlan/irlan_provider.c | 10 +- + net/irda/irqueue.c | 4 +- + net/irda/irttp.c | 18 +- + net/key/af_key.c | 20 +- + net/l2tp/l2tp_ip.c | 19 +- + net/mac80211/agg-rx.c | 15 + + net/mac80211/cfg.c | 14 + + net/mac80211/ht.c | 6 + + net/mac80211/rc80211_minstrel.c | 9 + + net/mac80211/rc80211_minstrel.h | 12 + + net/mac80211/rc80211_minstrel_ht.c | 7 + + net/mac80211/sta_info.h | 3 + + net/netfilter/ipset/Kconfig | 10 + + net/netfilter/ipset/Makefile | 1 + + net/netfilter/ipset/ip_set_bitmap_ip.c | 35 +- + net/netfilter/ipset/ip_set_bitmap_ipmac.c | 38 +- + net/netfilter/ipset/ip_set_bitmap_port.c | 31 +- + net/netfilter/ipset/ip_set_core.c | 165 +- + net/netfilter/ipset/ip_set_hash_ip.c | 43 +- + net/netfilter/ipset/ip_set_hash_ipport.c | 63 +- + net/netfilter/ipset/ip_set_hash_ipportip.c | 67 +- + net/netfilter/ipset/ip_set_hash_ipportnet.c | 131 +- + net/netfilter/ipset/ip_set_hash_net.c | 82 +- + net/netfilter/ipset/ip_set_hash_netiface.c | 762 +++ + net/netfilter/ipset/ip_set_hash_netport.c | 113 +- + net/netfilter/ipset/ip_set_list_set.c | 106 +- + net/netfilter/ipset/pfxlen.c | 23 +- + net/netfilter/ipvs/ip_vs_app.c | 14 +- + net/netfilter/ipvs/ip_vs_conn.c | 4 +- + net/netfilter/ipvs/ip_vs_core.c | 71 +- + net/netfilter/ipvs/ip_vs_ctl.c | 28 +- + net/netfilter/ipvs/ip_vs_est.c | 13 +- + net/netfilter/ipvs/ip_vs_ftp.c | 52 +- + net/netfilter/ipvs/ip_vs_proto.c | 4 +- + net/netfilter/ipvs/ip_vs_sync.c | 13 +- + net/netfilter/nf_conntrack_netlink.c | 4 +- + net/netfilter/xt_CT.c | 11 +- + net/netfilter/xt_set.c | 152 +- + net/netlabel/netlabel_unlabeled.c | 10 +- + net/netlink/af_netlink.c | 18 +- + net/netlink/genetlink.c | 2 +- + net/packet/af_packet.c | 43 +- + net/phonet/pn_netlink.c | 13 +- + net/rds/bind.c | 4 +- + net/rds/ib.h | 1 + + net/rds/ib_cm.c | 6 +- + net/rds/ib_send.c | 4 +- + net/rds/iw.h | 1 + + net/rds/iw_cm.c | 9 +- + net/rds/iw_rdma.c | 9 +- + net/rds/iw_send.c | 4 +- + net/rds/send.c | 7 +- + net/sched/act_api.c | 7 +- + net/sched/cls_api.c | 6 +- + net/sched/sch_api.c | 12 +- + net/sched/sch_atm.c | 1 + + net/sctp/associola.c | 6 + + net/sctp/bind_addr.c | 17 +- + net/sctp/input.c | 3 +- + net/sctp/ipv6.c | 2 + + net/sctp/outqueue.c | 13 + + net/sctp/protocol.c | 152 +- + net/sctp/sm_make_chunk.c | 55 +- + net/sctp/sm_sideeffect.c | 2 +- + net/sctp/socket.c | 190 +- + net/sctp/sysctl.c | 7 + + net/sunrpc/auth.c | 2 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 1 + + net/sunrpc/xprtrdma/verbs.c | 1 + + net/wireless/nl80211.c | 107 +- + net/xfrm/xfrm_user.c | 3 +- + 567 files changed, 41647 insertions(+), 18428 deletions(-) + create mode 100644 drivers/bcma/sprom.c + create mode 100644 drivers/net/bnx2x/bnx2x_sp.c + create mode 100644 drivers/net/bnx2x/bnx2x_sp.h + create mode 100644 drivers/net/caif/caif_hsi.c + create mode 100644 drivers/net/ftgmac100.c + create mode 100644 drivers/net/ftgmac100.h + delete mode 100644 drivers/net/myri_sbus.c + delete mode 100644 drivers/net/myri_sbus.h + create mode 100644 drivers/net/wireless/b43/bus.c + create mode 100644 drivers/net/wireless/b43/bus.h + create mode 100644 drivers/net/wireless/mac80211_hwsim.h + create mode 100644 include/linux/cordic.h + create mode 100644 include/linux/crc8.h + create mode 100644 include/net/caif/caif_hsi.h + create mode 100644 lib/cordic.c + create mode 100644 lib/crc8.c + create mode 100644 net/netfilter/ipset/ip_set_hash_netiface.c +Merging wireless/master +$ git merge wireless/master +Recorded preimage for 'net/bluetooth/l2cap_core.c' +Resolved 'drivers/net/wireless/rtlwifi/pci.c' using previous resolution. +Auto-merging drivers/bcma/host_pci.c +Auto-merging drivers/net/wireless/ath/ath9k/ath9k.h +Auto-merging drivers/net/wireless/b43/main.c +Auto-merging drivers/net/wireless/iwlegacy/iwl-dev.h +Auto-merging drivers/net/wireless/iwlwifi/iwl-dev.h +Auto-merging drivers/net/wireless/libertas/if_spi.c +Auto-merging drivers/net/wireless/rtlwifi/pci.c +CONFLICT (content): Merge conflict in drivers/net/wireless/rtlwifi/pci.c +Auto-merging include/net/bluetooth/hci_core.h +Auto-merging net/bluetooth/hci_conn.c +Auto-merging net/bluetooth/hci_core.c +Auto-merging net/bluetooth/hci_event.c +Auto-merging net/bluetooth/l2cap_core.c +CONFLICT (content): Merge conflict in net/bluetooth/l2cap_core.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'net/bluetooth/l2cap_core.c'. +[master 98fc4b9] Merge remote-tracking branch 'wireless/master' +$ git diff -M --stat --summary HEAD^.. + drivers/bcma/bcma_private.h | 4 +- + drivers/bcma/core.c | 3 +- + drivers/bcma/driver_chipcommon_pmu.c | 6 +- + drivers/bcma/driver_pci.c | 1 + + drivers/bcma/host_pci.c | 1 + + drivers/bcma/main.c | 2 - + drivers/net/wireless/ath/ath5k/ahb.c | 1 + + drivers/net/wireless/ath/ath5k/ath5k.h | 7 +- + drivers/net/wireless/ath/ath5k/base.c | 15 +- + drivers/net/wireless/ath/ath5k/mac80211-ops.c | 6 +- + drivers/net/wireless/ath/ath5k/reset.c | 6 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 4 +- + drivers/net/wireless/ath/ath9k/ar9003_paprd.c | 21 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 4 +- + drivers/net/wireless/ath/ath9k/hw.h | 5 +- + drivers/net/wireless/ath/ath9k/main.c | 16 +- + drivers/net/wireless/ath/ath9k/rc.c | 6 +- + drivers/net/wireless/b43/Kconfig | 13 + + drivers/net/wireless/b43/Makefile | 1 + + drivers/net/wireless/b43/b43.h | 6 + + drivers/net/wireless/b43/bus.c | 9 +- + drivers/net/wireless/b43/main.c | 37 +- + drivers/net/wireless/b43/phy_common.c | 6 + + drivers/net/wireless/b43/phy_common.h | 3 + + drivers/net/wireless/b43/phy_ht.c | 156 ++++++ + drivers/net/wireless/b43/phy_ht.h | 26 + + drivers/net/wireless/iwlegacy/iwl-3945.c | 4 - + drivers/net/wireless/iwlegacy/iwl-4965-lib.c | 79 +--- + drivers/net/wireless/iwlegacy/iwl-4965-rx.c | 78 +--- + drivers/net/wireless/iwlegacy/iwl-4965.c | 4 - + drivers/net/wireless/iwlegacy/iwl-commands.h | 7 - + drivers/net/wireless/iwlegacy/iwl-core.c | 91 ++--- + drivers/net/wireless/iwlegacy/iwl-core.h | 15 +- + drivers/net/wireless/iwlegacy/iwl-debugfs.c | 192 +------- + drivers/net/wireless/iwlegacy/iwl-dev.h | 60 +--- + drivers/net/wireless/iwlegacy/iwl-devtrace.c | 3 - + drivers/net/wireless/iwlegacy/iwl-devtrace.h | 60 --- + drivers/net/wireless/iwlegacy/iwl-helpers.h | 9 + + drivers/net/wireless/iwlegacy/iwl-rx.c | 21 - + drivers/net/wireless/iwlegacy/iwl-scan.c | 92 +--- + drivers/net/wireless/iwlegacy/iwl3945-base.c | 301 +----------- + drivers/net/wireless/iwlegacy/iwl4965-base.c | 463 ++--------------- + drivers/net/wireless/iwlwifi/Makefile | 1 + + drivers/net/wireless/iwlwifi/iwl-1000.c | 4 - + drivers/net/wireless/iwlwifi/iwl-2000.c | 20 +- + drivers/net/wireless/iwlwifi/iwl-5000-hw.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 23 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 22 +- + drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c | 14 +- + drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 12 +- + drivers/net/wireless/iwlwifi/iwl-agn-hw.h | 7 - + drivers/net/wireless/iwlwifi/iwl-agn-ict.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 75 ++-- + drivers/net/wireless/iwlwifi/iwl-agn-tt.c | 38 +- + drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 30 +- + drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 45 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 541 ++++++-------------- + drivers/net/wireless/iwlwifi/iwl-agn.h | 26 +- + drivers/net/wireless/iwlwifi/iwl-commands.h | 35 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 85 +--- + drivers/net/wireless/iwlwifi/iwl-core.h | 47 +-- + drivers/net/wireless/iwlwifi/iwl-debug.h | 18 +- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 7 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 60 ++- + drivers/net/wireless/iwlwifi/iwl-eeprom.c | 25 + + drivers/net/wireless/iwlwifi/iwl-eeprom.h | 25 +- + drivers/net/wireless/iwlwifi/iwl-hcmd.c | 11 +- + drivers/net/wireless/iwlwifi/iwl-helpers.h | 9 + + drivers/net/wireless/iwlwifi/iwl-io.h | 6 +- + drivers/net/wireless/iwlwifi/iwl-led.c | 14 +- + drivers/net/wireless/iwlwifi/iwl-pci.c | 571 +++++++++++++++++++++ + drivers/net/wireless/iwlwifi/iwl-pci.h | 69 +++ + drivers/net/wireless/iwlwifi/iwl-power.c | 33 +- + drivers/net/wireless/iwlwifi/iwl-power.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-rx.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-sv-open.c | 139 ++++-- + drivers/net/wireless/iwlwifi/iwl-testmode.h | 9 +- + drivers/net/wireless/iwlwifi/iwl-tx.c | 33 +- + drivers/net/wireless/libertas/if_sdio.c | 34 ++ + drivers/net/wireless/libertas/if_spi.c | 6 +- + drivers/net/wireless/mwifiex/main.c | 16 +- + drivers/net/wireless/mwifiex/main.h | 1 - + drivers/net/wireless/mwifiex/sdio.c | 81 ++-- + drivers/net/wireless/rtlwifi/base.c | 2 +- + drivers/net/wireless/rtlwifi/core.c | 12 +- + drivers/net/wireless/rtlwifi/core.h | 2 + + drivers/net/wireless/rtlwifi/efuse.c | 8 +- + drivers/net/wireless/rtlwifi/pci.c | 206 ++++---- + drivers/net/wireless/rtlwifi/ps.c | 65 +--- + drivers/net/wireless/rtlwifi/ps.h | 3 +- + drivers/net/wireless/rtlwifi/rc.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 4 +- + drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 10 +- + drivers/net/wireless/rtlwifi/rtl8192ce/led.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ce/rf.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 8 +- + drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 8 +- + drivers/net/wireless/rtlwifi/rtl8192cu/led.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192cu/rf.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192se/dm.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192se/hw.c | 11 +- + drivers/net/wireless/rtlwifi/rtl8192se/led.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192se/phy.c | 4 +- + drivers/net/wireless/rtlwifi/rtl8192se/reg.h | 6 +- + drivers/net/wireless/rtlwifi/rtl8192se/rf.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 6 +- + drivers/net/wireless/rtlwifi/wifi.h | 4 +- + drivers/net/wireless/zd1211rw/zd_chip.h | 2 + + drivers/ssb/driver_chipcommon_pmu.c | 4 +- + include/linux/bcma/bcma.h | 1 + + include/linux/bcma/bcma_driver_pci.h | 2 + + include/net/bluetooth/bluetooth.h | 15 +- + include/net/bluetooth/hci.h | 25 + + include/net/bluetooth/hci_core.h | 55 ++- + include/net/bluetooth/l2cap.h | 24 +- + include/net/bluetooth/rfcomm.h | 9 +- + include/net/mac80211.h | 20 + + net/bluetooth/cmtp/capi.c | 3 +- + net/bluetooth/hci_conn.c | 29 +- + net/bluetooth/hci_core.c | 82 +++- + net/bluetooth/hci_event.c | 137 ++++-- + net/bluetooth/l2cap_core.c | 307 +++++++++-- + net/bluetooth/l2cap_sock.c | 280 +++-------- + net/bluetooth/mgmt.c | 61 ++- + net/bluetooth/rfcomm/sock.c | 6 +- + net/mac80211/driver-ops.h | 10 + + net/mac80211/driver-trace.h | 6 + + net/mac80211/mlme.c | 8 + + net/mac80211/pm.c | 43 +- + net/mac80211/scan.c | 37 +- + net/mac80211/util.c | 2 + + net/wireless/mlme.c | 4 +- + 133 files changed, 2714 insertions(+), 2883 deletions(-) + create mode 100644 drivers/net/wireless/b43/phy_ht.c + create mode 100644 drivers/net/wireless/b43/phy_ht.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-pci.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-pci.h +Merging bluetooth/master +$ git merge bluetooth/master +Recorded preimage for 'net/bluetooth/l2cap_core.c' +Auto-merging include/net/bluetooth/hci_core.h +Auto-merging net/bluetooth/hci_conn.c +Auto-merging net/bluetooth/hci_core.c +Auto-merging net/bluetooth/l2cap_core.c +CONFLICT (content): Merge conflict in net/bluetooth/l2cap_core.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'net/bluetooth/l2cap_core.c'. +[master fda2bd8] Merge remote-tracking branch 'bluetooth/master' +$ git diff -M --stat --summary HEAD^.. + include/net/bluetooth/hci.h | 34 ++ + include/net/bluetooth/hci_core.h | 13 + + include/net/bluetooth/l2cap.h | 95 ++++-- + include/net/bluetooth/mgmt.h | 10 + + include/net/bluetooth/smp.h | 46 +++ + net/bluetooth/Kconfig | 8 + + net/bluetooth/Makefile | 2 +- + net/bluetooth/hci_conn.c | 50 +++ + net/bluetooth/hci_core.c | 113 +++++++ + net/bluetooth/hci_event.c | 69 ++++ + net/bluetooth/hci_sock.c | 70 +---- + net/bluetooth/l2cap_core.c | 679 +++++++++++++++++++------------------- + net/bluetooth/l2cap_sock.c | 97 +++++- + net/bluetooth/mgmt.c | 72 ++++- + net/bluetooth/smp.c | 533 ++++++++++++++++++++++++++++++ + 15 files changed, 1442 insertions(+), 449 deletions(-) + create mode 100644 net/bluetooth/smp.c +Merging mtd/master +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master +$ git merge l2-mtd/master +Auto-merging arch/arm/mach-at91/board-afeb-9260v1.c +Auto-merging arch/arm/mach-at91/board-cam60.c +Auto-merging arch/arm/mach-at91/board-cap9adk.c +Auto-merging arch/arm/mach-at91/board-kb9202.c +Auto-merging arch/arm/mach-at91/board-neocore926.c +Auto-merging arch/arm/mach-at91/board-qil-a9260.c +Auto-merging arch/arm/mach-at91/board-rm9200dk.c +Auto-merging arch/arm/mach-at91/board-sam9-l9260.c +Auto-merging arch/arm/mach-at91/board-sam9260ek.c +Auto-merging arch/arm/mach-at91/board-sam9261ek.c +Auto-merging arch/arm/mach-at91/board-sam9263ek.c +Auto-merging arch/arm/mach-at91/board-sam9g20ek.c +Auto-merging arch/arm/mach-at91/board-sam9m10g45ek.c +Auto-merging arch/arm/mach-at91/board-sam9rlek.c +Auto-merging arch/arm/mach-at91/board-snapper9260.c +Auto-merging arch/arm/mach-at91/board-usb-a9260.c +Auto-merging arch/arm/mach-at91/board-usb-a9263.c +Auto-merging arch/arm/mach-at91/board-yl-9200.c +Removing drivers/mtd/maps/ceiva.c +Merge made by recursive. + Documentation/DocBook/mtdnand.tmpl | 5 +- + arch/arm/mach-at91/board-afeb-9260v1.c | 9 +- + arch/arm/mach-at91/board-cam60.c | 9 +- + arch/arm/mach-at91/board-cap9adk.c | 9 +- + arch/arm/mach-at91/board-kb9202.c | 9 +- + arch/arm/mach-at91/board-neocore926.c | 9 +- + arch/arm/mach-at91/board-qil-a9260.c | 9 +- + arch/arm/mach-at91/board-rm9200dk.c | 9 +- + arch/arm/mach-at91/board-sam9-l9260.c | 9 +- + arch/arm/mach-at91/board-sam9260ek.c | 9 +- + arch/arm/mach-at91/board-sam9261ek.c | 9 +- + arch/arm/mach-at91/board-sam9263ek.c | 9 +- + arch/arm/mach-at91/board-sam9g20ek.c | 9 +- + arch/arm/mach-at91/board-sam9m10g45ek.c | 9 +- + arch/arm/mach-at91/board-sam9rlek.c | 9 +- + arch/arm/mach-at91/board-snapper9260.c | 10 +- + arch/arm/mach-at91/board-usb-a9260.c | 9 +- + arch/arm/mach-at91/board-usb-a9263.c | 9 +- + arch/arm/mach-at91/board-yl-9200.c | 9 +- + arch/arm/mach-at91/include/mach/board.h | 3 +- + arch/arm/mach-davinci/board-da830-evm.c | 2 +- + arch/arm/mach-davinci/board-da850-evm.c | 2 +- + arch/arm/mach-davinci/board-dm355-evm.c | 2 +- + arch/arm/mach-davinci/board-dm355-leopard.c | 2 +- + arch/arm/mach-davinci/board-dm365-evm.c | 2 +- + arch/arm/mach-davinci/board-dm644x-evm.c | 2 +- + arch/arm/mach-davinci/board-mityomapl138.c | 3 +- + arch/arm/mach-davinci/board-neuros-osd2.c | 2 +- + arch/arm/mach-davinci/board-tnetv107x-evm.c | 2 +- + arch/arm/mach-davinci/include/mach/nand.h | 4 +- + arch/arm/mach-ep93xx/ts72xx.c | 23 +- + arch/arm/mach-orion5x/ts78xx-setup.c | 2 +- + arch/avr32/boards/atngw100/setup.c | 8 +- + arch/avr32/boards/atstk1000/atstk1002.c | 9 +- + arch/avr32/mach-at32ap/include/mach/board.h | 3 +- + arch/cris/arch-v32/drivers/mach-a3/nandflash.c | 2 +- + arch/cris/arch-v32/drivers/mach-fs/nandflash.c | 2 +- + drivers/mtd/cmdlinepart.c | 3 - + drivers/mtd/devices/lart.c | 18 +- + drivers/mtd/devices/m25p80.c | 8 +- + drivers/mtd/devices/mtd_dataflash.c | 26 +- + drivers/mtd/devices/sst25l.c | 39 +-- + drivers/mtd/inftlcore.c | 4 +- + drivers/mtd/maps/Kconfig | 14 - + drivers/mtd/maps/Makefile | 1 - + drivers/mtd/maps/bfin-async-flash.c | 16 +- + drivers/mtd/maps/ceiva.c | 341 ----------- + drivers/mtd/maps/dc21285.c | 9 +- + drivers/mtd/maps/edb7312.c | 3 +- + drivers/mtd/maps/gpio-addr-flash.c | 16 +- + drivers/mtd/maps/h720x-flash.c | 23 +- + drivers/mtd/maps/impa7.c | 28 +- + drivers/mtd/maps/intel_vr_nor.c | 7 +- + drivers/mtd/maps/ixp2000.c | 11 +- + drivers/mtd/maps/ixp4xx.c | 29 +- + drivers/mtd/maps/lantiq-flash.c | 17 +- + drivers/mtd/maps/latch-addr-flash.c | 24 +- + drivers/mtd/maps/physmap.c | 38 +-- + drivers/mtd/maps/plat-ram.c | 23 +- + drivers/mtd/maps/pxa2xx-flash.c | 20 +- + drivers/mtd/maps/rbtx4939-flash.c | 24 +- + drivers/mtd/maps/sa1100-flash.c | 30 +- + drivers/mtd/maps/solutionengine.c | 30 +- + drivers/mtd/maps/wr_sbc82xx_flash.c | 33 +- + drivers/mtd/mtdblock.c | 4 +- + drivers/mtd/mtdchar.c | 1 + + drivers/mtd/mtdcore.c | 58 ++ + drivers/mtd/mtdpart.c | 40 ++ + drivers/mtd/mtdswap.c | 3 +- + drivers/mtd/nand/atmel_nand.c | 27 +- + drivers/mtd/nand/autcpu12.c | 4 +- + drivers/mtd/nand/bcm_umi_nand.c | 24 +- + drivers/mtd/nand/cafe_nand.c | 16 +- + drivers/mtd/nand/cmx270_nand.c | 23 +- + drivers/mtd/nand/cs553x_nand.c | 15 +- + drivers/mtd/nand/davinci_nand.c | 39 +-- + drivers/mtd/nand/denali.c | 6 +- + drivers/mtd/nand/diskonchip.c | 2 +- + drivers/mtd/nand/edb7312.c | 19 +- + drivers/mtd/nand/fsl_elbc_nand.c | 4 +- + drivers/mtd/nand/fsl_upm.c | 3 +- + drivers/mtd/nand/fsmc_nand.c | 77 +--- + drivers/mtd/nand/h1910.c | 19 +- + drivers/mtd/nand/jz4740_nand.c | 18 +- + drivers/mtd/nand/mpc5121_nfc.c | 7 +- + drivers/mtd/nand/mxc_nand.c | 17 +- + drivers/mtd/nand/nand_base.c | 747 +++++++++++------------ + drivers/mtd/nand/nand_bbt.c | 437 ++++++-------- + drivers/mtd/nand/nandsim.c | 4 +- + drivers/mtd/nand/ndfc.c | 8 +- + drivers/mtd/nand/nomadik_nand.c | 1 + + drivers/mtd/nand/nuc900_nand.c | 1 + + drivers/mtd/nand/omap2.c | 12 +- + drivers/mtd/nand/orion_nand.c | 16 +- + drivers/mtd/nand/pasemi_nand.c | 3 +- + drivers/mtd/nand/plat_nand.c | 24 +- + drivers/mtd/nand/ppchameleonevb.c | 47 +-- + drivers/mtd/nand/pxa3xx_nand.c | 32 +- + drivers/mtd/nand/rtc_from4.c | 1 - + drivers/mtd/nand/s3c2410.c | 25 +- + drivers/mtd/nand/sharpsl.c | 13 +- + drivers/mtd/nand/socrates_nand.c | 7 +- + drivers/mtd/nand/tmio_nand.c | 17 +- + drivers/mtd/nand/txx9ndfmc.c | 8 +- + drivers/mtd/nftlcore.c | 4 +- + drivers/mtd/onenand/generic.c | 13 +- + drivers/mtd/onenand/omap2.c | 16 +- + drivers/mtd/onenand/onenand_bbt.c | 4 +- + drivers/mtd/onenand/samsung.c | 13 +- + drivers/mtd/ssfdc.c | 10 +- + include/linux/mtd/bbm.h | 39 +- + include/linux/mtd/mtd.h | 5 + + include/linux/mtd/nand.h | 24 +- + include/linux/mtd/partitions.h | 11 +- + include/linux/mtd/physmap.h | 17 - + 115 files changed, 945 insertions(+), 2118 deletions(-) + delete mode 100644 drivers/mtd/maps/ceiva.c +Merging crypto/master +$ git merge crypto/master +Merge made by recursive. + arch/x86/crypto/ghash-clmulni-intel_glue.c | 2 +- + crypto/Kconfig | 4 +- + crypto/arc4.c | 15 +- + crypto/crc32c.c | 10 +- + crypto/testmgr.h | 293 +++++++++++++++++++++++++++- + drivers/char/hw_random/nomadik-rng.c | 3 +- + drivers/char/hw_random/omap-rng.c | 6 +- + drivers/char/hw_random/timeriomem-rng.c | 3 +- + drivers/crypto/caam/caamalg.c | 6 +- + drivers/crypto/caam/ctrl.c | 4 +- + drivers/crypto/omap-sham.c | 180 +++++++++--------- + 11 files changed, 409 insertions(+), 117 deletions(-) +Merging sound/for-next +$ git merge sound/for-next +Auto-merging sound/soc/ep93xx/ep93xx-pcm.c +Merge made by recursive. + Documentation/DocBook/writing-an-alsa-driver.tmpl | 10 +- + include/linux/pci_ids.h | 1 + + include/sound/rawmidi.h | 4 +- + include/sound/soc-dai.h | 4 + + include/sound/soc-dapm.h | 2 +- + include/sound/soc.h | 39 +- + sound/core/rawmidi.c | 37 +- + sound/firewire/speakers.c | 2 +- + sound/pci/ad1889.c | 4 +- + sound/pci/ali5451/ali5451.c | 4 +- + sound/pci/als300.c | 4 +- + sound/pci/als4000.c | 2 +- + sound/pci/asihpi/asihpi.c | 2 +- + sound/pci/atiixp.c | 4 +- + sound/pci/atiixp_modem.c | 4 +- + sound/pci/au88x0/au88x0.c | 4 +- + sound/pci/aw2/aw2-alsa.c | 4 +- + sound/pci/azt3328.c | 4 +- + sound/pci/bt87x.c | 4 +- + sound/pci/ca0106/ca0106_main.c | 4 +- + sound/pci/cmipci.c | 4 +- + sound/pci/cs4281.c | 4 +- + sound/pci/cs46xx/cs46xx.c | 2 +- + sound/pci/cs46xx/cs46xx_lib.c | 2 +- + sound/pci/cs5530.c | 2 +- + sound/pci/cs5535audio/cs5535audio.c | 4 +- + sound/pci/ctxfi/ct20k2reg.h | 1 + + sound/pci/ctxfi/ctatc.c | 107 ++- + sound/pci/ctxfi/ctatc.h | 8 +- + sound/pci/ctxfi/ctdaio.c | 23 +- + sound/pci/ctxfi/ctdaio.h | 1 + + sound/pci/ctxfi/cthardware.h | 14 +- + sound/pci/ctxfi/cthw20k1.c | 15 +- + sound/pci/ctxfi/cthw20k2.c | 337 +++++++--- + sound/pci/ctxfi/ctmixer.c | 145 ++++- + sound/pci/ctxfi/xfi.c | 6 +- + sound/pci/echoaudio/echoaudio.c | 6 +- + sound/pci/emu10k1/emu10k1.c | 2 +- + sound/pci/emu10k1/emu10k1_main.c | 2 +- + sound/pci/emu10k1/emu10k1x.c | 4 +- + sound/pci/ens1370.c | 4 +- + sound/pci/es1938.c | 6 +- + sound/pci/es1968.c | 68 +-- + sound/pci/fm801.c | 4 +- + sound/pci/hda/hda_codec.c | 142 +++-- + sound/pci/hda/hda_codec.h | 16 +- + sound/pci/hda/hda_eld.c | 46 +- + sound/pci/hda/hda_intel.c | 72 ++- + sound/pci/hda/hda_local.h | 8 +- + sound/pci/hda/patch_analog.c | 7 +- + sound/pci/hda/patch_ca0110.c | 3 +- + sound/pci/hda/patch_cirrus.c | 3 +- + sound/pci/hda/patch_cmedia.c | 4 +- + sound/pci/hda/patch_conexant.c | 1 + + sound/pci/hda/patch_hdmi.c | 704 +++++++++++++-------- + sound/pci/hda/patch_realtek.c | 2 +- + sound/pci/hda/patch_sigmatel.c | 4 +- + sound/pci/hda/patch_via.c | 40 +- + sound/pci/ice1712/ice1712.c | 4 +- + sound/pci/ice1712/ice1724.c | 4 +- + sound/pci/intel8x0.c | 6 +- + sound/pci/intel8x0m.c | 6 +- + sound/pci/korg1212/korg1212.c | 4 +- + sound/pci/lola/lola.c | 4 +- + sound/pci/lx6464es/lx6464es.c | 4 +- + sound/pci/maestro3.c | 75 +-- + sound/pci/mixart/mixart.c | 4 +- + sound/pci/nm256/nm256.c | 4 +- + sound/pci/oxygen/oxygen.c | 2 +- + sound/pci/oxygen/oxygen_lib.c | 2 +- + sound/pci/oxygen/oxygen_pcm.c | 6 - + sound/pci/oxygen/virtuoso.c | 2 +- + sound/pci/pcxhr/pcxhr.c | 4 +- + sound/pci/riptide/riptide.c | 6 +- + sound/pci/rme32.c | 4 +- + sound/pci/rme96.c | 4 +- + sound/pci/rme9652/hdsp.c | 4 +- + sound/pci/rme9652/hdspm.c | 4 +- + sound/pci/rme9652/rme9652.c | 4 +- + sound/pci/sis7019.c | 6 +- + sound/pci/sonicvibes.c | 4 +- + sound/pci/trident/trident.c | 2 +- + sound/pci/trident/trident_main.c | 2 +- + sound/pci/via82xx.c | 4 +- + sound/pci/via82xx_modem.c | 4 +- + sound/pci/vx222/vx222.c | 4 +- + sound/pci/ymfpci/ymfpci.c | 2 +- + sound/pci/ymfpci/ymfpci_main.c | 2 +- + sound/soc/Makefile | 2 +- + sound/soc/atmel/atmel-pcm.c | 8 +- + sound/soc/atmel/atmel-pcm.h | 2 +- + sound/soc/atmel/atmel_ssc_dai.c | 6 +- + sound/soc/atmel/sam9g20_wm8731.c | 1 + + sound/soc/au1x/dbdma2.c | 7 +- + sound/soc/blackfin/bf5xx-ac97-pcm.c | 6 +- + sound/soc/blackfin/bf5xx-i2s-pcm.c | 6 +- + sound/soc/blackfin/bf5xx-tdm-pcm.c | 6 +- + sound/soc/codecs/ad1836.c | 251 +++++--- + sound/soc/codecs/ad1836.h | 23 +- + sound/soc/codecs/ak4641.c | 2 +- + sound/soc/codecs/cs4270.c | 5 +- + sound/soc/codecs/max98088.c | 2 - + sound/soc/codecs/max98095.c | 2 - + sound/soc/codecs/wm8915.c | 156 ++++-- + sound/soc/codecs/wm8940.c | 7 - + sound/soc/codecs/wm8962.c | 132 +++-- + sound/soc/davinci/davinci-pcm.c | 154 +++-- + sound/soc/ep93xx/ep93xx-pcm.c | 6 +- + sound/soc/fsl/fsl_dma.c | 8 +- + sound/soc/fsl/fsl_ssi.c | 9 +- + sound/soc/fsl/mpc5200_dma.c | 7 +- + sound/soc/fsl/mpc8610_hpcd.c | 10 +- + sound/soc/fsl/p1022_ds.c | 10 +- + sound/soc/imx/imx-pcm-fiq.c | 8 +- + sound/soc/imx/imx-ssi.c | 7 +- + sound/soc/imx/imx-ssi.h | 3 +- + sound/soc/jz4740/jz4740-pcm.c | 6 +- + sound/soc/kirkwood/kirkwood-dma.c | 6 +- + sound/soc/mid-x86/sst_platform.c | 5 +- + sound/soc/nuc900/nuc900-ac97.c | 2 +- + sound/soc/nuc900/nuc900-pcm.c | 7 +- + sound/soc/omap/ams-delta.c | 3 +- + sound/soc/omap/omap-pcm.c | 6 +- + sound/soc/pxa/pxa2xx-pcm.c | 6 +- + sound/soc/s6000/s6000-pcm.c | 7 +- + sound/soc/samsung/Kconfig | 8 +- + sound/soc/samsung/Makefile | 2 + + sound/soc/samsung/dma.c | 6 +- + sound/soc/samsung/speyside.c | 61 ++- + sound/soc/samsung/speyside_wm8962.c | 260 ++++++++ + sound/soc/sh/dma-sh7760.c | 6 +- + sound/soc/sh/fsi.c | 582 +++++++++--------- + sound/soc/sh/siu_pcm.c | 5 +- + sound/soc/soc-cache.c | 301 +++++++-- + sound/soc/soc-core.c | 693 ++------------------- + sound/soc/soc-dapm.c | 122 ++-- + sound/soc/soc-pcm.c | 639 +++++++++++++++++++ + sound/soc/tegra/tegra_pcm.c | 6 +- + sound/soc/tegra/tegra_wm8903.c | 2 +- + sound/soc/txx9/txx9aclc.c | 5 +- + sound/usb/misc/ua101.c | 2 +- + 141 files changed, 3484 insertions(+), 2263 deletions(-) + create mode 100644 sound/soc/samsung/speyside_wm8962.c + create mode 100644 sound/soc/soc-pcm.c +Merging sound-asoc/for-next +$ git merge sound-asoc/for-next +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 1 + + include/sound/soc-dapm.h | 3 + + include/sound/soc.h | 3 +- + sound/soc/Makefile | 3 +- + sound/soc/blackfin/Kconfig | 14 +- + sound/soc/blackfin/Makefile | 2 + + sound/soc/blackfin/bf5xx-i2s-pcm.c | 6 +- + sound/soc/blackfin/bfin-eval-adau1701.c | 139 ++++++++ + sound/soc/codecs/Kconfig | 6 +- + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/ad1836.c | 78 ++--- + sound/soc/codecs/ad1836.h | 21 +- + sound/soc/codecs/adau1701.c | 549 +++++++++++++++++++++++++++++++ + sound/soc/codecs/adau1701.h | 17 + + sound/soc/soc-cache.c | 416 ----------------------- + sound/soc/soc-dapm.c | 142 ++++++++- + sound/soc/soc-io.c | 396 ++++++++++++++++++++++ + 17 files changed, 1304 insertions(+), 494 deletions(-) + create mode 100644 sound/soc/blackfin/bfin-eval-adau1701.c + create mode 100644 sound/soc/codecs/adau1701.c + create mode 100644 sound/soc/codecs/adau1701.h + create mode 100644 sound/soc/soc-io.c +Merging cpufreq/next +$ git merge cpufreq/next +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/mach-s3c64xx/Makefile +Auto-merging drivers/cpufreq/exynos4210-cpufreq.c +Auto-merging drivers/cpufreq/s3c64xx-cpufreq.c +Auto-merging drivers/cpufreq/s5pv210-cpufreq.c +Merge made by recursive. + arch/arm/Kconfig | 4 -- + arch/arm/mach-exynos4/Makefile | 1 - + arch/arm/mach-s3c64xx/Makefile | 4 -- + arch/arm/mach-s5pv210/Makefile | 1 - + drivers/cpufreq/Kconfig | 5 +++ + drivers/cpufreq/Kconfig.arm | 32 ++++++++++++++++++++ + drivers/cpufreq/Makefile | 8 +++-- + .../cpufreq/exynos4210-cpufreq.c | 3 +- + .../cpufreq.c => drivers/cpufreq/s3c64xx-cpufreq.c | 5 ++- + .../cpufreq.c => drivers/cpufreq/s5pv210-cpufreq.c | 28 +++++++++++------ + 10 files changed, 64 insertions(+), 27 deletions(-) + create mode 100644 drivers/cpufreq/Kconfig.arm + rename arch/arm/mach-exynos4/cpufreq.c => drivers/cpufreq/exynos4210-cpufreq.c (99%) + rename arch/arm/mach-s3c64xx/cpufreq.c => drivers/cpufreq/s3c64xx-cpufreq.c (99%) + rename arch/arm/mach-s5pv210/cpufreq.c => drivers/cpufreq/s5pv210-cpufreq.c (97%) +Merging quilt/rr +$ git merge quilt/rr +Merge made by recursive. + kernel/params.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) +Merging input/next +$ git merge input/next +Already up-to-date. +Merging input-mt/next +$ git merge input-mt/next +Already up-to-date. +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Merge made by recursive. + block/blk-ioc.c | 40 ++++++++++++++++++++-------------------- + block/blk-throttle.c | 10 +++++----- + block/bsg.c | 18 +++++++++--------- + block/cfq-iosched.c | 31 +++++++++++++++---------------- + block/deadline-iosched.c | 4 +--- + block/elevator.c | 7 ++----- + block/genhd.c | 6 +++--- + fs/partitions/check.c | 12 ++++++------ + include/linux/blkdev.h | 2 +- + include/linux/blktrace_api.h | 3 ++- + include/linux/elevator.h | 2 +- + 11 files changed, 65 insertions(+), 70 deletions(-) +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Already up-to-date. +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master +$ git merge pcmcia/master +Already up-to-date. +Merging battery/master +$ git merge battery/master +Already up-to-date. +Merging leds/for-mm +$ git merge leds/for-mm +Resolved 'drivers/leds/Kconfig' using previous resolution. +Auto-merging drivers/leds/Kconfig +CONFLICT (content): Merge conflict in drivers/leds/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6cece87] Merge remote-tracking branch 'leds/for-mm' +$ git diff -M --stat --summary HEAD^.. +Merging backlight/for-mm +$ git merge backlight/for-mm +Already up-to-date. +Merging mmc/mmc-next +$ git merge mmc/mmc-next +Removing arch/arm/plat-pxa/include/plat/sdhci.h +Auto-merging drivers/mmc/host/omap_hsmmc.c +CONFLICT (delete/modify): drivers/mmc/host/sdhci-of-core.c deleted in mmc/mmc-next and modified in HEAD. Version HEAD of drivers/mmc/host/sdhci-of-core.c left in tree. +Removing drivers/mmc/host/sdhci-of.h +Removing drivers/mmc/host/sdhci-pxa.c +Auto-merging drivers/pci/quirks.c +Auto-merging include/linux/mmc/host.h +Removing include/linux/mmc/sdhci-pltfm.h +Auto-merging include/linux/pci_ids.h +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/mmc/host/sdhci-of-core.c +drivers/mmc/host/sdhci-of-core.c: needs merge +rm 'drivers/mmc/host/sdhci-of-core.c' +$ git commit -v -a +[master 2b41e6b] Merge remote-tracking branch 'mmc/mmc-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/configs/mmp2_defconfig | 9 +- + arch/arm/mach-mmp/brownstone.c | 10 +- + arch/arm/mach-mmp/include/mach/mmp2.h | 2 +- + arch/arm/mach-mmp/jasper.c | 2 +- + arch/arm/mach-mmp/mmp2.c | 16 +- + arch/arm/plat-pxa/include/plat/sdhci.h | 35 ---- + drivers/mmc/core/sdio.c | 15 ++ + drivers/mmc/core/sdio_bus.c | 2 +- + drivers/mmc/host/Kconfig | 77 +++++--- + drivers/mmc/host/Makefile | 21 +-- + drivers/mmc/host/dw_mmc.c | 7 +- + drivers/mmc/host/of_mmc_spi.c | 5 + + drivers/mmc/host/omap_hsmmc.c | 6 +- + drivers/mmc/host/sdhci-cns3xxx.c | 44 ++++- + drivers/mmc/host/sdhci-dove.c | 43 ++++- + drivers/mmc/host/sdhci-esdhc-imx.c | 131 ++++++++++---- + drivers/mmc/host/sdhci-esdhc.h | 3 +- + drivers/mmc/host/sdhci-of-core.c | 253 -------------------------- + drivers/mmc/host/sdhci-of-esdhc.c | 93 ++++++++-- + drivers/mmc/host/sdhci-of-hlwd.c | 67 ++++++- + drivers/mmc/host/sdhci-of.h | 42 ----- + drivers/mmc/host/sdhci-pltfm.c | 216 +++++++++++------------ + drivers/mmc/host/sdhci-pltfm.h | 90 +++++++++- + drivers/mmc/host/sdhci-pxa.c | 303 ------------------------------- + drivers/mmc/host/sdhci-pxav2.c | 244 +++++++++++++++++++++++++ + drivers/mmc/host/sdhci-pxav3.c | 289 +++++++++++++++++++++++++++++ + drivers/mmc/host/sdhci-tegra.c | 117 ++++++++---- + drivers/mmc/host/sdhci.c | 9 +- + drivers/mmc/host/sdhci.h | 2 + + drivers/mmc/host/sh_mobile_sdhi.c | 5 +- + drivers/mmc/host/tmio_mmc_pio.c | 4 +- + drivers/mmc/host/vub300.c | 11 +- + drivers/pci/quirks.c | 2 + + include/linux/mmc/boot.h | 6 +- + include/linux/mmc/card.h | 2 +- + include/linux/mmc/core.h | 2 +- + include/linux/mmc/dw_mmc.h | 6 +- + include/linux/mmc/host.h | 3 +- + include/linux/mmc/ioctl.h | 2 +- + include/linux/mmc/mmc.h | 7 +- + include/linux/mmc/pm.h | 2 +- + include/linux/mmc/sd.h | 7 +- + include/linux/mmc/sdhci-pltfm.h | 35 ---- + include/linux/mmc/sdhci-spear.h | 6 +- + include/linux/mmc/sdhci.h | 14 +- + include/linux/mmc/sdio.h | 7 +- + include/linux/mmc/sdio_func.h | 7 +- + include/linux/mmc/sdio_ids.h | 6 +- + include/linux/mmc/sh_mmcif.h | 6 +- + include/linux/mmc/sh_mobile_sdhi.h | 6 +- + include/linux/mmc/tmio.h | 6 +- + include/linux/pci_ids.h | 1 + + include/linux/platform_data/pxa_sdhci.h | 60 ++++++ + 53 files changed, 1349 insertions(+), 1017 deletions(-) + delete mode 100644 arch/arm/plat-pxa/include/plat/sdhci.h + delete mode 100644 drivers/mmc/host/sdhci-of-core.c + delete mode 100644 drivers/mmc/host/sdhci-of.h + delete mode 100644 drivers/mmc/host/sdhci-pxa.c + create mode 100644 drivers/mmc/host/sdhci-pxav2.c + create mode 100644 drivers/mmc/host/sdhci-pxav3.c + delete mode 100644 include/linux/mmc/sdhci-pltfm.h + create mode 100644 include/linux/platform_data/pxa_sdhci.h +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Already up-to-date. +Merging slab/for-next +$ git merge slab/for-next +Merge made by recursive. + include/linux/slab.h | 10 ++++++++++ + include/linux/slab_def.h | 26 -------------------------- + include/linux/slob_def.h | 10 ---------- + include/linux/slub_def.h | 10 ---------- + mm/slob.c | 6 ++++++ + 5 files changed, 16 insertions(+), 46 deletions(-) +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Auto-merging drivers/gpio/Kconfig +Auto-merging drivers/gpio/Makefile +Merge made by recursive. + drivers/gpio/Kconfig | 6 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-tps65912.c | 156 ++++++ + drivers/input/keyboard/pmic8xxx-keypad.c | 3 +- + drivers/input/misc/pmic8xxx-pwrkey.c | 3 +- + drivers/mfd/Kconfig | 25 +- + drivers/mfd/Makefile | 5 + + drivers/mfd/ab3550-core.c | 41 +-- + drivers/mfd/ab8500-core.c | 231 +++++++--- + drivers/mfd/ab8500-debugfs.c | 41 +-- + drivers/mfd/jz4740-adc.c | 90 +--- + drivers/mfd/lpc_sch.c | 49 ++- + drivers/mfd/omap-usb-host.c | 131 +++++- + drivers/mfd/tps65910.c | 1 + + drivers/mfd/tps65912-core.c | 177 +++++++ + drivers/mfd/tps65912-i2c.c | 139 ++++++ + drivers/mfd/tps65912-irq.c | 224 +++++++++ + drivers/mfd/tps65912-spi.c | 142 ++++++ + drivers/mfd/wm831x-auxadc.c | 299 +++++++++++ + drivers/mfd/wm831x-core.c | 247 +++------- + drivers/mfd/wm831x-irq.c | 42 ++- + drivers/mfd/wm8350-irq.c | 18 +- + drivers/mfd/wm8994-core.c | 33 +- + drivers/regulator/Kconfig | 6 + + drivers/regulator/Makefile | 1 + + drivers/regulator/tps65912-regulator.c | 800 ++++++++++++++++++++++++++++++ + include/linux/mfd/ab8500.h | 8 +- + include/linux/mfd/tps65910.h | 1 + + include/linux/mfd/tps65912.h | 327 ++++++++++++ + include/linux/mfd/wm831x/core.h | 18 +- + include/linux/mfd/wm831x/pdata.h | 3 + + 31 files changed, 2851 insertions(+), 417 deletions(-) + create mode 100644 drivers/gpio/gpio-tps65912.c + create mode 100644 drivers/mfd/tps65912-core.c + create mode 100644 drivers/mfd/tps65912-i2c.c + create mode 100644 drivers/mfd/tps65912-irq.c + create mode 100644 drivers/mfd/tps65912-spi.c + create mode 100644 drivers/mfd/wm831x-auxadc.c + create mode 100644 drivers/regulator/tps65912-regulator.c + create mode 100644 include/linux/mfd/tps65912.h +$ git reset --hard HEAD^ +HEAD is now at b4304f7 Merge remote-tracking branch 'slab/for-next' +Merging refs/next/20110620/mfd +$ git merge refs/next/20110620/mfd +Merge made by recursive. + drivers/input/keyboard/pmic8xxx-keypad.c | 3 ++- + drivers/input/misc/pmic8xxx-pwrkey.c | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Already up-to-date. +Merging fbdev/master +$ git merge fbdev/master +Merge made by recursive. + drivers/staging/xgifb/XGI_main_26.c | 22 +-- + drivers/video/68328fb.c | 4 +- + drivers/video/Kconfig | 7 +- + drivers/video/acornfb.c | 5 +- + drivers/video/arkfb.c | 9 +- + drivers/video/atmel_lcdfb.c | 15 +- + drivers/video/aty/radeon_base.c | 10 +- + drivers/video/au1200fb.c | 297 ++++++++++++++------------------ + drivers/video/da8xx-fb.c | 4 +- + drivers/video/fb-puv3.c | 4 +- + drivers/video/fb_defio.c | 3 +- + drivers/video/g364fb.c | 5 +- + drivers/video/gxt4500.c | 4 +- + drivers/video/hgafb.c | 4 +- + drivers/video/imsttfb.c | 2 +- + drivers/video/intelfb/intelfbhw.c | 6 +- + drivers/video/mb862xx/mb862xxfbdrv.c | 2 +- + drivers/video/mx3fb.c | 6 +- + drivers/video/neofb.c | 4 +- + drivers/video/pm2fb.c | 4 +- + drivers/video/pm3fb.c | 4 +- + drivers/video/s3c-fb.c | 2 +- + drivers/video/s3fb.c | 7 +- + drivers/video/savage/savagefb_driver.c | 16 +- + drivers/video/sis/sis_main.c | 30 +-- + drivers/video/sm501fb.c | 6 +- + drivers/video/tridentfb.c | 4 +- + drivers/video/vfb.c | 4 +- + drivers/video/vga16fb.c | 2 +- + drivers/video/vt8500lcdfb.c | 4 +- + drivers/video/vt8623fb.c | 9 +- + 31 files changed, 228 insertions(+), 277 deletions(-) +Merging viafb/viafb-next +$ git merge viafb/viafb-next +Auto-merging drivers/video/via/viafbdev.c +Merge made by recursive. + drivers/video/via/viafbdev.c | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) +Merging omap_dss2/for-next +$ git merge omap_dss2/for-next +Already up-to-date. +Merging voltage/for-next +$ git merge voltage/for-next +Merge made by recursive. + drivers/regulator/core.c | 142 ++++++++++++++++------------------ + drivers/regulator/dummy.c | 32 ++++++-- + drivers/regulator/twl-regulator.c | 2 +- + drivers/regulator/wm8994-regulator.c | 4 +- + include/linux/regulator/consumer.h | 3 + + include/linux/regulator/driver.h | 4 +- + 6 files changed, 101 insertions(+), 86 deletions(-) +Merging security-testing/next +$ git merge security-testing/next +Auto-merging kernel/cgroup.c +Merge made by recursive. + kernel/cgroup.c | 5 +++++ + security/keys/request_key_auth.c | 2 ++ + 2 files changed, 7 insertions(+), 0 deletions(-) +Merging selinux/master +$ git merge selinux/master +Already up-to-date. +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging agp/agp-next +$ git merge agp/agp-next +Merge made by recursive. +Merging watchdog/master +$ git merge watchdog/master +Merge made by recursive. + arch/x86/include/asm/apb_timer.h | 2 +- + drivers/watchdog/Kconfig | 15 +- + drivers/watchdog/Makefile | 1 + + drivers/watchdog/dw_wdt.c | 376 ++++++++++++++++++++++++++++++ + drivers/watchdog/iTCO_wdt.c | 407 +++++++++++---------------------- + drivers/watchdog/intel_scu_watchdog.c | 1 - + drivers/watchdog/it8712f_wdt.c | 61 ++++-- + drivers/watchdog/it87_wdt.c | 168 ++++++++------- + drivers/watchdog/mpcore_wdt.c | 23 ++ + drivers/watchdog/mtx-1_wdt.c | 33 ++-- + drivers/watchdog/pc87413_wdt.c | 96 ++++---- + drivers/watchdog/wm831x_wdt.c | 5 + + 12 files changed, 759 insertions(+), 429 deletions(-) + create mode 100644 drivers/watchdog/dw_wdt.c +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging cputime/cputime +$ git merge cputime/cputime +Already up-to-date. +Merging osd/linux-next +$ git merge osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Already up-to-date. +Merging nommu/master +$ git merge nommu/master +Already up-to-date. +Merging trivial/for-next +$ git merge trivial/for-next +Resolved 'drivers/mtd/maps/pxa2xx-flash.c' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/arm/mach-at91/board-snapper9260.c +CONFLICT (delete/modify): arch/arm/mach-ep93xx/dma-m2p.c deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/arm/mach-ep93xx/dma-m2p.c left in tree. +Auto-merging arch/avr32/mach-at32ap/intc.c +Auto-merging arch/microblaze/pci/pci-common.c +Auto-merging arch/powerpc/kernel/pci-common.c +Auto-merging arch/powerpc/platforms/powermac/pci.c +Auto-merging arch/powerpc/platforms/pseries/smp.c +CONFLICT (delete/modify): arch/s390/kvm/sie64a.S deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/s390/kvm/sie64a.S left in tree. +Auto-merging arch/s390/oprofile/init.c +Auto-merging arch/sparc/kernel/ioport.c +Auto-merging arch/sparc/kernel/pci.c +Auto-merging arch/x86/kvm/mmu.c +Auto-merging drivers/media/video/videobuf2-memops.c +Auto-merging drivers/mmc/host/dw_mmc.c +Auto-merging drivers/mtd/devices/sst25l.c +Auto-merging drivers/mtd/maps/bfin-async-flash.c +Auto-merging drivers/mtd/maps/ixp2000.c +Auto-merging drivers/mtd/maps/pxa2xx-flash.c +CONFLICT (content): Merge conflict in drivers/mtd/maps/pxa2xx-flash.c +Auto-merging drivers/mtd/nand/atmel_nand.c +Auto-merging drivers/mtd/nand/bcm_umi_nand.c +Auto-merging drivers/mtd/nand/mpc5121_nfc.c +Auto-merging drivers/net/bcm63xx_enet.c +Auto-merging drivers/net/davinci_emac.c +Auto-merging drivers/net/ethoc.c +Auto-merging drivers/net/fec_mpc52xx.c +Auto-merging drivers/net/macb.c +Auto-merging drivers/net/pxa168_eth.c +Auto-merging drivers/net/sungem.c +Auto-merging drivers/net/wireless/ath/ath5k/ahb.c +Auto-merging drivers/staging/brcm80211/brcmfmac/wl_iw.c +Auto-merging drivers/video/atmel_lcdfb.c +Auto-merging drivers/video/aty/atyfb_base.c +Auto-merging drivers/video/mb862xx/mb862xxfbdrv.c +Auto-merging fs/ocfs2/move_extents.c +Auto-merging include/linux/fs.h +Auto-merging sound/soc/ep93xx/ep93xx-i2s.c +Auto-merging sound/soc/ep93xx/ep93xx-pcm.c +Auto-merging sound/soc/fsl/mpc5200_dma.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/arm/mach-ep93xx/dma-m2p.c +arch/arm/mach-ep93xx/dma-m2p.c: needs merge +arch/s390/kvm/sie64a.S: needs merge +drivers/mtd/maps/pxa2xx-flash.c: needs merge +rm 'arch/arm/mach-ep93xx/dma-m2p.c' +$ git rm -f arch/s390/kvm/sie64a.S +arch/s390/kvm/sie64a.S: needs merge +drivers/mtd/maps/pxa2xx-flash.c: needs merge +rm 'arch/s390/kvm/sie64a.S' +$ git commit -v -a +[master 5611b80] Merge remote-tracking branch 'trivial/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/RCU/NMI-RCU.txt | 4 +- + Documentation/blockdev/README.DAC960 | 2 +- + Documentation/blockdev/ramdisk.txt | 8 ++-- + Documentation/cpu-freq/cpu-drivers.txt | 2 +- + Documentation/filesystems/nfs/nfsroot.txt | 2 +- + Documentation/i2o/ioctl | 2 +- + Documentation/isdn/README.HiSax | 2 +- + Documentation/kbuild/makefiles.txt | 38 ++++++++++---------- + Documentation/magic-number.txt | 2 +- + Documentation/mca.txt | 4 +- + Documentation/scheduler/sched-arch.txt | 2 +- + Documentation/scsi/BusLogic.txt | 2 +- + Documentation/serial/computone.txt | 2 +- + Documentation/zh_CN/magic-number.txt | 2 +- + MAINTAINERS | 2 +- + arch/arm/common/scoop.c | 2 +- + arch/arm/mach-at91/at91sam9261_devices.c | 2 +- + arch/arm/mach-at91/board-snapper9260.c | 2 +- + arch/arm/mach-dove/common.c | 2 - + arch/arm/mach-ep93xx/gpio.c | 2 +- + arch/arm/mach-ep93xx/simone.c | 4 +- + arch/arm/mach-ep93xx/snappercl15.c | 4 +- + arch/arm/mach-mv78xx0/pcie.c | 8 ++-- + arch/arm/mach-s3c2410/h1940-bluetooth.c | 1 - + arch/arm/mach-u300/core.c | 2 +- + arch/arm/plat-s5p/sysmmu.c | 6 ++-- + arch/arm/plat-samsung/pm-check.c | 2 +- + arch/avr32/kernel/setup.c | 10 +++--- + arch/avr32/mach-at32ap/extint.c | 2 +- + arch/avr32/mach-at32ap/hsmc.c | 2 +- + arch/avr32/mach-at32ap/intc.c | 2 +- + arch/avr32/mach-at32ap/pio.c | 2 +- + arch/microblaze/pci/pci-common.c | 2 +- + arch/mips/lantiq/devices.c | 2 - + arch/mips/lantiq/xway/devices.c | 2 - + arch/mips/pci/pci-rc32434.c | 2 +- + arch/mips/pci/pci-vr41xx.c | 2 +- + arch/mips/powertv/asic/asic_devices.c | 10 ++--- + arch/powerpc/include/asm/macio.h | 2 +- + arch/powerpc/kernel/machine_kexec.c | 4 +- + arch/powerpc/kernel/pci-common.c | 2 +- + arch/powerpc/platforms/52xx/mpc52xx_pci.c | 8 ++-- + arch/powerpc/platforms/83xx/km83xx.c | 2 +- + arch/powerpc/platforms/83xx/mpc832x_mds.c | 2 +- + arch/powerpc/platforms/83xx/mpc834x_mds.c | 2 +- + arch/powerpc/platforms/83xx/mpc836x_mds.c | 2 +- + arch/powerpc/platforms/83xx/usb.c | 2 +- + arch/powerpc/platforms/85xx/sbc8560.c | 2 +- + arch/powerpc/platforms/85xx/xes_mpc85xx.c | 2 +- + arch/powerpc/platforms/cell/celleb_scc_epci.c | 8 ++-- + arch/powerpc/platforms/cell/celleb_scc_pciex.c | 2 +- + arch/powerpc/platforms/cell/spu_manage.c | 2 +- + arch/powerpc/platforms/chrp/pci.c | 2 +- + arch/powerpc/platforms/pasemi/dma_lib.c | 2 +- + arch/powerpc/platforms/powermac/nvram.c | 4 +- + arch/powerpc/platforms/powermac/pci.c | 6 +-- + arch/powerpc/platforms/powermac/time.c | 2 +- + arch/powerpc/platforms/pseries/smp.c | 1 - + arch/powerpc/sysdev/axonram.c | 2 +- + arch/powerpc/sysdev/cpm1.c | 2 +- + arch/powerpc/sysdev/cpm_common.c | 2 +- + arch/powerpc/sysdev/dart_iommu.c | 2 +- + arch/powerpc/sysdev/fsl_msi.c | 2 +- + arch/powerpc/sysdev/fsl_pci.c | 12 +++--- + arch/powerpc/sysdev/fsl_rio.c | 2 +- + arch/powerpc/sysdev/ipic.c | 2 +- + arch/powerpc/sysdev/mmio_nvram.c | 2 +- + arch/powerpc/sysdev/mpc8xx_pic.c | 2 +- + arch/powerpc/sysdev/mv64x60_udbg.c | 4 +- + arch/powerpc/sysdev/ppc4xx_pci.c | 16 ++++---- + arch/powerpc/sysdev/qe_lib/qe_ic.c | 2 +- + arch/powerpc/sysdev/qe_lib/qe_io.c | 2 +- + arch/powerpc/sysdev/xics/icp-native.c | 2 +- + arch/s390/oprofile/init.c | 2 - + arch/sh/kernel/io_trapped.c | 8 ++-- + arch/sh/kernel/machine_kexec.c | 2 +- + arch/sparc/kernel/ioport.c | 12 +++--- + arch/sparc/kernel/pci.c | 6 +-- + arch/tile/kernel/setup.c | 3 +- + arch/x86/kernel/pci-calgary_64.c | 2 +- + arch/x86/kernel/probe_roms.c | 2 +- + arch/x86/kvm/mmu.c | 1 - + arch/xtensa/include/asm/uaccess.h | 3 +- + drivers/char/bsr.c | 2 +- + drivers/char/xilinx_hwicap/xilinx_hwicap.c | 2 +- + drivers/dma/mv_xor.c | 5 +-- + drivers/edac/cell_edac.c | 2 +- + drivers/edac/mpc85xx_edac.c | 12 +++--- + drivers/gpio/ab8500-gpio.c | 1 - + drivers/gpio/gpio-u300.c | 8 ++-- + drivers/gpu/drm/nouveau/nv50_graph.c | 1 - + drivers/ide/palm_bk3710.c | 2 +- + drivers/ide/tx4939ide.c | 4 +- + drivers/input/serio/sa1111ps2.c | 6 +-- + drivers/media/rc/ite-cir.c | 1 - + drivers/media/video/davinci/vpif.c | 2 +- + drivers/media/video/m5mols/m5mols_capture.c | 1 - + drivers/media/video/omap24xxcam.c | 5 +-- + drivers/media/video/videobuf2-memops.c | 1 - + drivers/message/i2o/iop.c | 8 ++-- + drivers/mfd/tc6387xb.c | 2 +- + drivers/misc/atmel-ssc.c | 2 +- + drivers/misc/atmel_pwm.c | 2 +- + drivers/mmc/host/dw_mmc.c | 2 +- + drivers/mtd/devices/sst25l.c | 4 +- + drivers/mtd/maps/bfin-async-flash.c | 2 +- + drivers/mtd/maps/ixp2000.c | 11 +++--- + drivers/mtd/nand/atmel_nand.c | 4 +- + drivers/mtd/nand/bcm_umi_nand.c | 2 +- + drivers/mtd/nand/mpc5121_nfc.c | 2 +- + drivers/net/bcm63xx_enet.c | 8 ++-- + drivers/net/can/c_can/c_can.c | 1 - + drivers/net/can/c_can/c_can_platform.c | 1 - + drivers/net/can/softing/softing_main.c | 2 +- + drivers/net/davinci_emac.c | 6 ++-- + drivers/net/ethoc.c | 2 +- + drivers/net/fec_mpc52xx.c | 7 ++-- + drivers/net/fs_enet/mii-bitbang.c | 4 +- + drivers/net/fs_enet/mii-fec.c | 2 +- + drivers/net/gianfar_ptp.c | 2 +- + drivers/net/ibm_newemac/core.c | 2 +- + drivers/net/macb.c | 2 +- + drivers/net/mv643xx_eth.c | 2 +- + drivers/net/pxa168_eth.c | 2 +- + drivers/net/sb1250-mac.c | 2 +- + drivers/net/sungem.c | 3 +- + drivers/net/wireless/ath/ath5k/ahb.c | 1 - + drivers/parport/parport_ax88796.c | 2 +- + drivers/pci/hotplug/shpchp_sysfs.c | 21 +++++------ + drivers/pcmcia/at91_cf.c | 7 ++-- + drivers/pcmcia/electra_cf.c | 4 +- + drivers/pcmcia/rsrc_iodyn.c | 6 ++-- + drivers/pcmcia/rsrc_nonstatic.c | 6 ++-- + drivers/pnp/pnpacpi/rsparser.c | 10 +++--- + drivers/pnp/pnpbios/rsparser.c | 12 +++--- + drivers/power/ds2782_battery.c | 4 +- + drivers/rtc/rtc-at32ap700x.c | 2 +- + drivers/rtc/rtc-cmos.c | 6 ++-- + drivers/rtc/rtc-ds1286.c | 2 +- + drivers/rtc/rtc-ds1511.c | 2 +- + drivers/rtc/rtc-ds1742.c | 2 +- + drivers/rtc/rtc-m48t35.c | 2 +- + drivers/rtc/rtc-m48t59.c | 2 +- + drivers/rtc/rtc-mrst.c | 5 +-- + drivers/rtc/rtc-puv3.c | 5 +-- + drivers/rtc/rtc-s3c.c | 5 +-- + .../staging/ath6kl/os/linux/include/ar6000_drv.h | 1 - + drivers/staging/bcm/headers.h | 7 +--- + drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 1 - + drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h | 1 - + drivers/staging/brcm80211/brcmfmac/wl_iw.c | 9 +---- + drivers/staging/generic_serial/ser_a2232.c | 3 +- + drivers/staging/gma500/psb_2d.c | 1 - + drivers/staging/gma500/psb_gtt.c | 8 ++-- + drivers/staging/hv/hv_mouse.c | 1 - + drivers/staging/hv/tools/hv_kvp_daemon.c | 1 - + drivers/staging/nvec/nvec.c | 1 - + drivers/staging/rtl8712/drv_types.h | 1 - + drivers/staging/rtl8712/osdep_service.h | 1 - + drivers/staging/sep/sep_driver.c | 1 - + drivers/staging/usbip/userspace/src/utils.h | 1 - + .../cyashalomap_kernel.h | 2 +- + .../staging/westbridge/astoria/gadget/cyasgadget.h | 8 +--- + drivers/target/loopback/tcm_loop.c | 1 - + drivers/target/tcm_fc/tfc_cmd.c | 1 - + drivers/target/tcm_fc/tfc_conf.c | 1 - + drivers/target/tcm_fc/tfc_io.c | 1 - + drivers/target/tcm_fc/tfc_sess.c | 2 - + drivers/tty/serial/bfin_5xx.c | 5 +-- + drivers/tty/serial/imx.c | 5 +-- + drivers/tty/serial/m32r_sio.c | 2 +- + drivers/tty/serial/omap-serial.c | 6 ++-- + drivers/tty/serial/pxa.c | 2 +- + drivers/tty/serial/sunsu.c | 2 +- + drivers/tty/serial/vt8500_serial.c | 3 +- + drivers/uio/uio_pdrv.c | 2 +- + drivers/uio/uio_pdrv_genirq.c | 2 +- + drivers/usb/gadget/atmel_usba_udc.c | 2 +- + drivers/usb/gadget/fsl_udc_core.c | 6 ++-- + drivers/usb/host/ehci-ath79.c | 2 +- + drivers/usb/host/ehci-cns3xxx.c | 2 +- + drivers/usb/host/ehci-fsl.c | 2 +- + drivers/usb/host/ehci-grlib.c | 2 +- + drivers/usb/host/ehci-ixp4xx.c | 2 +- + drivers/usb/host/ehci-octeon.c | 2 +- + drivers/usb/host/ehci-pmcmsp.c | 10 +++--- + drivers/usb/host/ehci-ppc-of.c | 2 +- + drivers/usb/host/ehci-w90x900.c | 2 +- + drivers/usb/host/ehci-xilinx-of.c | 2 +- + drivers/usb/host/fhci-hcd.c | 2 +- + drivers/usb/host/ohci-ath79.c | 4 +- + drivers/usb/host/ohci-cns3xxx.c | 2 +- + drivers/usb/host/ohci-da8xx.c | 2 +- + drivers/usb/host/ohci-octeon.c | 2 +- + drivers/usb/host/ohci-ppc-of.c | 2 +- + drivers/usb/host/ohci-ppc-soc.c | 2 +- + drivers/usb/host/ohci-sa1111.c | 2 +- + drivers/usb/host/ohci-sm501.c | 11 +++--- + drivers/usb/host/ohci-tmio.c | 6 ++-- + drivers/usb/host/oxu210hp-hcd.c | 2 +- + drivers/usb/host/uhci-grlib.c | 2 +- + drivers/usb/host/whci/init.c | 2 +- + drivers/usb/otg/otg_fsm.c | 1 - + drivers/uwb/whc-rc.c | 2 +- + drivers/video/atmel_lcdfb.c | 4 +- + drivers/video/aty/atyfb_base.c | 7 ++-- + drivers/video/au1100fb.c | 2 +- + drivers/video/cobalt_lcdfb.c | 2 +- + drivers/video/controlfb.c | 4 +- + drivers/video/ep93xx-fb.c | 4 +- + drivers/video/mb862xx/mb862xxfbdrv.c | 4 +- + drivers/video/msm/mdp.c | 3 +- + drivers/video/msm/msm_fb.c | 7 ++-- + drivers/video/nuc900fb.c | 2 +- + drivers/video/platinumfb.c | 5 +-- + drivers/video/pxa168fb.c | 2 +- + drivers/video/udlfb.c | 1 - + fs/nfs/idmap.c | 7 +--- + fs/ocfs2/move_extents.c | 1 - + include/linux/dio.h | 2 +- + include/linux/fs.h | 1 - + include/linux/hw_random.h | 2 +- + include/linux/pnp.h | 2 +- + include/linux/stop_machine.h | 2 +- + include/linux/zorro.h | 2 +- + kernel/kexec.c | 2 +- + mm/Kconfig | 2 +- + scripts/bootgraph.pl | 2 +- + scripts/docproc.c | 17 +++------ + scripts/gcc-goto.sh | 2 +- + sound/aoa/soundbus/i2sbus/core.c | 9 ++--- + sound/atmel/abdac.c | 2 +- + sound/atmel/ac97c.c | 2 +- + sound/ppc/pmac.c | 9 ++--- + sound/soc/ep93xx/ep93xx-i2s.c | 4 +- + sound/soc/ep93xx/ep93xx-pcm.c | 4 +- + sound/soc/ep93xx/snappercl15.c | 4 +- + sound/soc/fsl/mpc5200_dma.c | 2 +- + 238 files changed, 379 insertions(+), 468 deletions(-) +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging suspend/linux-next +$ git merge suspend/linux-next +Auto-merging drivers/usb/core/driver.c +Merge made by recursive. + Documentation/power/devices.txt | 67 +++++++---------------------------- + Documentation/power/opp.txt | 2 + + Documentation/power/runtime_pm.txt | 5 --- + drivers/base/power/main.c | 14 +++++--- + drivers/base/power/opp.c | 17 +++++++++ + drivers/base/power/trace.c | 2 +- + drivers/usb/core/driver.c | 6 ++-- + include/linux/device.h | 4 +- + include/linux/opp.h | 8 ++++ + include/linux/pm.h | 2 +- + include/linux/suspend.h | 8 ++++ + kernel/power/suspend.c | 20 +++++++--- + kernel/power/user.c | 4 ++- + 13 files changed, 82 insertions(+), 77 deletions(-) +Merging apm/for-next +$ git merge apm/for-next +Already up-to-date. +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Auto-merging fs/cachefiles/namei.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/notify/fanotify/fanotify_user.c +Auto-merging fs/notify/mark.c +Auto-merging include/linux/fsnotify_backend.h +Merge made by recursive. + 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 +$ git merge irda/for-next +Already up-to-date. +Merging i7core_edac/linux_next +$ git merge i7core_edac/linux_next +Auto-merging drivers/edac/i7core_edac.c +Merge made by recursive. + drivers/edac/i7core_edac.c | 23 ++++++++++++++++++++--- + 1 files changed, 20 insertions(+), 3 deletions(-) +Merging i7300_edac/linux_next +$ git merge i7300_edac/linux_next +Already up-to-date! +Merge made by recursive. +Merging devicetree/devicetree/next +$ git merge devicetree/devicetree/next +Merge made by recursive. + arch/powerpc/platforms/52xx/mpc52xx_common.c | 10 ++--- + drivers/of/address.c | 2 +- + drivers/of/platform.c | 54 ++++++++++++++++++++++++-- + include/linux/of_platform.h | 3 + + 4 files changed, 58 insertions(+), 11 deletions(-) +Merging spi/spi/next +$ git merge spi/spi/next +Removing drivers/spi/atmel_spi.h +Auto-merging drivers/spi/spi-ath79.c +Auto-merging drivers/spi/spi-atmel.c +Auto-merging drivers/spi/spi-au1550.c +Auto-merging drivers/spi/spi-bfin5xx.c +Auto-merging drivers/spi/spi-bitbang.c +Auto-merging drivers/spi/spi-butterfly.c +Auto-merging drivers/spi/spi-dw-mid.c +Auto-merging drivers/spi/spi-dw-mmio.c +Auto-merging drivers/spi/spi-dw-pci.c +Auto-merging drivers/spi/spi-dw.c +Auto-merging drivers/spi/spi-fsl-espi.c +Auto-merging drivers/spi/spi-fsl-lib.c +Auto-merging drivers/spi/spi-fsl-spi.c +Auto-merging drivers/spi/spi-gpio.c +Auto-merging drivers/spi/spi-lm70llp.c +Auto-merging drivers/spi/spi-nuc900.c +Auto-merging drivers/spi/spi-omap-uwire.c +Auto-merging drivers/spi/spi-omap2-mcspi.c +Auto-merging drivers/spi/spi-orion.c +Auto-merging drivers/spi/spi-pl022.c +Auto-merging drivers/spi/spi-ppc4xx.c +Auto-merging drivers/spi/spi-s3c24xx-fiq.S +Auto-merging drivers/spi/spi-s3c24xx-gpio.c +Auto-merging drivers/spi/spi-s3c24xx.c +Auto-merging drivers/spi/spi-s3c64xx.c +Auto-merging drivers/spi/spi-sh-sci.c +Auto-merging drivers/spi/spi-tegra.c +Auto-merging drivers/spi/spi-tle62x0.c +Auto-merging drivers/spi/spi-topcliff-pch.c +Auto-merging drivers/spi/spi-txx9.c +Merge made by recursive. + .../devicetree/bindings/spi/spi_nvidia.txt | 5 + + Documentation/spi/pxa2xx | 5 - + drivers/spi/Kconfig | 23 +- + drivers/spi/Makefile | 112 +-- + drivers/spi/atmel_spi.h | 167 --- + drivers/spi/{spi_altera.c => spi-altera.c} | 0 + drivers/spi/{ath79_spi.c => spi-ath79.c} | 2 +- + drivers/spi/{atmel_spi.c => spi-atmel.c} | 155 +++- + drivers/spi/{au1550_spi.c => spi-au1550.c} | 2 +- + drivers/spi/{spi_bfin_sport.c => spi-bfin-sport.c} | 0 + drivers/spi/{spi_bfin5xx.c => spi-bfin5xx.c} | 218 ++--- + .../spi/{spi_bitbang_txrx.h => spi-bitbang-txrx.h} | 0 + drivers/spi/{spi_bitbang.c => spi-bitbang.c} | 8 +- + drivers/spi/{spi_butterfly.c => spi-butterfly.c} | 4 +- + .../spi/{coldfire_qspi.c => spi-coldfire-qspi.c} | 0 + drivers/spi/{davinci_spi.c => spi-davinci.c} | 0 + drivers/spi/{dw_spi_mid.c => spi-dw-mid.c} | 4 +- + drivers/spi/{dw_spi_mmio.c => spi-dw-mmio.c} | 4 +- + drivers/spi/{dw_spi_pci.c => spi-dw-pci.c} | 4 +- + drivers/spi/{dw_spi.c => spi-dw.c} | 4 +- + drivers/spi/{dw_spi.h => spi-dw.h} | 0 + drivers/spi/{ep93xx_spi.c => spi-ep93xx.c} | 0 + drivers/spi/{spi_fsl_espi.c => spi-fsl-espi.c} | 2 +- + drivers/spi/{spi_fsl_lib.c => spi-fsl-lib.c} | 2 +- + drivers/spi/{spi_fsl_lib.h => spi-fsl-lib.h} | 0 + drivers/spi/{spi_fsl_spi.c => spi-fsl-spi.c} | 2 +- + drivers/spi/{spi_gpio.c => spi-gpio.c} | 6 +- + drivers/spi/{spi_imx.c => spi-imx.c} | 0 + drivers/spi/{spi_lm70llp.c => spi-lm70llp.c} | 4 +- + .../spi/{mpc512x_psc_spi.c => spi-mpc512x-psc.c} | 0 + .../spi/{mpc52xx_psc_spi.c => spi-mpc52xx-psc.c} | 0 + drivers/spi/{mpc52xx_spi.c => spi-mpc52xx.c} | 0 + drivers/spi/{spi_nuc900.c => spi-nuc900.c} | 5 +- + drivers/spi/{spi_oc_tiny.c => spi-oc-tiny.c} | 0 + drivers/spi/{omap_spi_100k.c => spi-omap-100k.c} | 0 + drivers/spi/{omap_uwire.c => spi-omap-uwire.c} | 2 +- + drivers/spi/{omap2_mcspi.c => spi-omap2-mcspi.c} | 10 +- + drivers/spi/{orion_spi.c => spi-orion.c} | 8 +- + drivers/spi/{amba-pl022.c => spi-pl022.c} | 111 ++- + drivers/spi/{spi_ppc4xx.c => spi-ppc4xx.c} | 2 +- + drivers/spi/{pxa2xx_spi_pci.c => spi-pxa2xx-pci.c} | 0 + drivers/spi/{pxa2xx_spi.c => spi-pxa2xx.c} | 0 + .../spi/{spi_s3c24xx_fiq.S => spi-s3c24xx-fiq.S} | 2 +- + .../spi/{spi_s3c24xx_fiq.h => spi-s3c24xx-fiq.h} | 0 + .../spi/{spi_s3c24xx_gpio.c => spi-s3c24xx-gpio.c} | 5 +- + drivers/spi/{spi_s3c24xx.c => spi-s3c24xx.c} | 5 +- + drivers/spi/{spi_s3c64xx.c => spi-s3c64xx.c} | 3 +- + drivers/spi/{spi_sh_msiof.c => spi-sh-msiof.c} | 0 + drivers/spi/{spi_sh_sci.c => spi-sh-sci.c} | 2 +- + drivers/spi/{spi_sh.c => spi-sh.c} | 0 + drivers/spi/{spi_stmp.c => spi-stmp.c} | 0 + drivers/spi/{spi_tegra.c => spi-tegra.c} | 20 +- + drivers/spi/{ti-ssp-spi.c => spi-ti-ssp.c} | 0 + drivers/spi/{tle62x0.c => spi-tle62x0.c} | 2 +- + .../spi/{spi_topcliff_pch.c => spi-topcliff-pch.c} | 1158 +++++++++++++------- + drivers/spi/{spi_txx9.c => spi-txx9.c} | 2 +- + drivers/spi/{xilinx_spi.c => spi-xilinx.c} | 0 + drivers/spi/spi.c | 2 +- + drivers/spi/spidev.c | 2 +- + 59 files changed, 1255 insertions(+), 819 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/spi_nvidia.txt + delete mode 100644 drivers/spi/atmel_spi.h + rename drivers/spi/{spi_altera.c => spi-altera.c} (100%) + rename drivers/spi/{ath79_spi.c => spi-ath79.c} (99%) + rename drivers/spi/{atmel_spi.c => spi-atmel.c} (85%) + rename drivers/spi/{au1550_spi.c => spi-au1550.c} (99%) + rename drivers/spi/{spi_bfin_sport.c => spi-bfin-sport.c} (100%) + rename drivers/spi/{spi_bfin5xx.c => spi-bfin5xx.c} (88%) + rename drivers/spi/{spi_bitbang_txrx.h => spi-bitbang-txrx.h} (100%) + rename drivers/spi/{spi_bitbang.c => spi-bitbang.c} (98%) + rename drivers/spi/{spi_butterfly.c => spi-butterfly.c} (99%) + rename drivers/spi/{coldfire_qspi.c => spi-coldfire-qspi.c} (100%) + rename drivers/spi/{davinci_spi.c => spi-davinci.c} (100%) + rename drivers/spi/{dw_spi_mid.c => spi-dw-mid.c} (98%) + rename drivers/spi/{dw_spi_mmio.c => spi-dw-mmio.c} (97%) + rename drivers/spi/{dw_spi_pci.c => spi-dw-pci.c} (98%) + rename drivers/spi/{dw_spi.c => spi-dw.c} (99%) + rename drivers/spi/{dw_spi.h => spi-dw.h} (100%) + rename drivers/spi/{ep93xx_spi.c => spi-ep93xx.c} (100%) + rename drivers/spi/{spi_fsl_espi.c => spi-fsl-espi.c} (99%) + rename drivers/spi/{spi_fsl_lib.c => spi-fsl-lib.c} (99%) + rename drivers/spi/{spi_fsl_lib.h => spi-fsl-lib.h} (100%) + rename drivers/spi/{spi_fsl_spi.c => spi-fsl-spi.c} (99%) + rename drivers/spi/{spi_gpio.c => spi-gpio.c} (99%) + rename drivers/spi/{spi_imx.c => spi-imx.c} (100%) + rename drivers/spi/{spi_lm70llp.c => spi-lm70llp.c} (98%) + rename drivers/spi/{mpc512x_psc_spi.c => spi-mpc512x-psc.c} (100%) + rename drivers/spi/{mpc52xx_psc_spi.c => spi-mpc52xx-psc.c} (100%) + rename drivers/spi/{mpc52xx_spi.c => spi-mpc52xx.c} (100%) + rename drivers/spi/{spi_nuc900.c => spi-nuc900.c} (99%) + rename drivers/spi/{spi_oc_tiny.c => spi-oc-tiny.c} (100%) + rename drivers/spi/{omap_spi_100k.c => spi-omap-100k.c} (100%) + rename drivers/spi/{omap_uwire.c => spi-omap-uwire.c} (99%) + rename drivers/spi/{omap2_mcspi.c => spi-omap2-mcspi.c} (99%) + rename drivers/spi/{orion_spi.c => spi-orion.c} (98%) + rename drivers/spi/{amba-pl022.c => spi-pl022.c} (96%) + rename drivers/spi/{spi_ppc4xx.c => spi-ppc4xx.c} (99%) + rename drivers/spi/{pxa2xx_spi_pci.c => spi-pxa2xx-pci.c} (100%) + rename drivers/spi/{pxa2xx_spi.c => spi-pxa2xx.c} (100%) + rename drivers/spi/{spi_s3c24xx_fiq.S => spi-s3c24xx-fiq.S} (99%) + rename drivers/spi/{spi_s3c24xx_fiq.h => spi-s3c24xx-fiq.h} (100%) + rename drivers/spi/{spi_s3c24xx_gpio.c => spi-s3c24xx-gpio.c} (98%) + rename drivers/spi/{spi_s3c24xx.c => spi-s3c24xx.c} (99%) + rename drivers/spi/{spi_s3c64xx.c => spi-s3c64xx.c} (99%) + rename drivers/spi/{spi_sh_msiof.c => spi-sh-msiof.c} (100%) + rename drivers/spi/{spi_sh_sci.c => spi-sh-sci.c} (99%) + rename drivers/spi/{spi_sh.c => spi-sh.c} (100%) + rename drivers/spi/{spi_stmp.c => spi-stmp.c} (100%) + rename drivers/spi/{spi_tegra.c => spi-tegra.c} (96%) + rename drivers/spi/{ti-ssp-spi.c => spi-ti-ssp.c} (100%) + rename drivers/spi/{tle62x0.c => spi-tle62x0.c} (99%) + rename drivers/spi/{spi_topcliff_pch.c => spi-topcliff-pch.c} (53%) + rename drivers/spi/{spi_txx9.c => spi-txx9.c} (99%) + rename drivers/spi/{xilinx_spi.c => spi-xilinx.c} (100%) +Merging gpio/gpio/next +$ git merge gpio/gpio/next +Resolved 'arch/arm/mach-ep93xx/Makefile' using previous resolution. +Resolved 'drivers/gpio/gpio-ep93xx.c' using previous resolution. +Auto-merging arch/arm/mach-ep93xx/Makefile +CONFLICT (content): Merge conflict in arch/arm/mach-ep93xx/Makefile +Auto-merging arch/arm/mach-ep93xx/core.c +Auto-merging drivers/gpio/gpio-74x164.c +Auto-merging drivers/gpio/gpio-ep93xx.c +CONFLICT (content): Merge conflict in drivers/gpio/gpio-ep93xx.c +Auto-merging drivers/gpio/gpio-generic.c +Auto-merging drivers/gpio/gpio-it8761e.c +Auto-merging drivers/gpio/gpio-langwell.c +Auto-merging drivers/gpio/gpio-max7300.c +Auto-merging drivers/gpio/gpio-max7301.c +Auto-merging drivers/gpio/gpio-max730x.c +Auto-merging drivers/gpio/gpio-max732x.c +Auto-merging drivers/gpio/gpio-mc33880.c +Auto-merging drivers/gpio/gpio-mcp23s08.c +Auto-merging drivers/gpio/gpio-ml-ioh.c +Auto-merging drivers/gpio/gpio-omap.c +Auto-merging drivers/gpio/gpio-pca953x.c +Auto-merging drivers/gpio/gpio-pcf857x.c +Auto-merging drivers/gpio/gpio-pl061.c +Auto-merging drivers/gpio/gpio-sch.c +Auto-merging drivers/gpio/gpio-tegra.c +Auto-merging drivers/gpio/gpio-timberdale.c +Auto-merging drivers/gpio/gpio-tps65910.c +Auto-merging drivers/gpio/gpio-twl4030.c +Auto-merging drivers/gpio/gpio-u300.c +Auto-merging drivers/gpio/gpio-vr41xx.c +Auto-merging drivers/gpio/gpio-wm831x.c +Auto-merging drivers/gpio/gpio-wm8350.c +Auto-merging drivers/gpio/gpio-wm8994.c +Auto-merging drivers/leds/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a6873c7] Merge remote-tracking branch 'gpio/gpio/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/gpio/gpio_nvidia.txt | 7 + + arch/arm/mach-ep93xx/Makefile | 2 +- + arch/arm/mach-ep93xx/core.c | 27 +- + arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 1 + + arch/arm/mach-omap1/gpio15xx.c | 22 + + arch/arm/mach-omap1/gpio16xx.c | 28 + + arch/arm/mach-omap1/gpio7xx.c | 27 + + arch/arm/mach-omap2/gpio.c | 32 + + arch/arm/mach-tegra/Makefile | 1 - + arch/arm/plat-omap/include/plat/gpio.h | 20 + + drivers/gpio/Kconfig | 50 +- + drivers/gpio/Makefile | 83 ++-- + drivers/gpio/{74x164.c => gpio-74x164.c} | 33 +- + drivers/gpio/{ab8500-gpio.c => gpio-ab8500.c} | 0 + drivers/gpio/{adp5520-gpio.c => gpio-adp5520.c} | 0 + drivers/gpio/{adp5588-gpio.c => gpio-adp5588.c} | 0 + drivers/gpio/{bt8xxgpio.c => gpio-bt8xx.c} | 0 + drivers/gpio/{cs5535-gpio.c => gpio-cs5535.c} | 0 + .../gpio.c => drivers/gpio/gpio-ep93xx.c | 243 ++++---- + drivers/gpio/gpio-exynos4.c | 5 +- + drivers/gpio/{basic_mmio_gpio.c => gpio-generic.c} | 6 +- + drivers/gpio/{it8761e_gpio.c => gpio-it8761e.c} | 2 +- + drivers/gpio/{janz-ttl.c => gpio-janz-ttl.c} | 0 + drivers/gpio/{langwell_gpio.c => gpio-langwell.c} | 4 +- + drivers/gpio/{max7300.c => gpio-max7300.c} | 2 - + drivers/gpio/{max7301.c => gpio-max7301.c} | 2 - + drivers/gpio/{max730x.c => gpio-max730x.c} | 2 - + drivers/gpio/{max732x.c => gpio-max732x.c} | 2 +- + drivers/gpio/{mc33880.c => gpio-mc33880.c} | 2 +- + drivers/gpio/{mcp23s08.c => gpio-mcp23s08.c} | 2 +- + drivers/gpio/{ml_ioh_gpio.c => gpio-ml-ioh.c} | 2 +- + drivers/gpio/gpio-mxc.c | 92 +-- + drivers/gpio/gpio-mxs.c | 189 ++---- + drivers/gpio/gpio-omap.c | 723 +++++--------------- + drivers/gpio/{pca953x.c => gpio-pca953x.c} | 105 ++-- + drivers/gpio/{pcf857x.c => gpio-pcf857x.c} | 2 +- + drivers/gpio/{pch_gpio.c => gpio-pch.c} | 0 + drivers/gpio/{pl061.c => gpio-pl061.c} | 4 +- + drivers/gpio/gpio-plat-samsung.c | 3 +- + drivers/gpio/{rdc321x-gpio.c => gpio-rdc321x.c} | 0 + drivers/gpio/gpio-s5pc100.c | 5 +- + drivers/gpio/gpio-s5pv210.c | 5 +- + drivers/gpio/{sch_gpio.c => gpio-sch.c} | 2 +- + drivers/gpio/{stmpe-gpio.c => gpio-stmpe.c} | 0 + drivers/gpio/{sx150x.c => gpio-sx150x.c} | 0 + drivers/gpio/{tc3589x-gpio.c => gpio-tc3589x.c} | 0 + .../mach-tegra/gpio.c => drivers/gpio/gpio-tegra.c | 10 + + drivers/gpio/{timbgpio.c => gpio-timberdale.c} | 2 +- + drivers/gpio/{tps65910-gpio.c => gpio-tps65910.c} | 2 +- + drivers/gpio/{twl4030-gpio.c => gpio-twl4030.c} | 2 +- + drivers/gpio/gpio-u300.c | 5 +- + drivers/gpio/{ucb1400_gpio.c => gpio-ucb1400.c} | 0 + drivers/gpio/{vr41xx_giu.c => gpio-vr41xx.c} | 2 +- + drivers/gpio/{vx855_gpio.c => gpio-vx855.c} | 0 + drivers/gpio/{wm831x-gpio.c => gpio-wm831x.c} | 2 +- + drivers/gpio/{wm8350-gpiolib.c => gpio-wm8350.c} | 2 +- + drivers/gpio/{wm8994-gpio.c => gpio-wm8994.c} | 2 +- + drivers/gpio/{xilinx_gpio.c => gpio-xilinx.c} | 0 + drivers/leds/Kconfig | 19 +- + drivers/leds/leds-gpio.c | 6 +- + include/linux/spi/74x164.h | 2 - + 61 files changed, 684 insertions(+), 1109 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/gpio_nvidia.txt + rename drivers/gpio/{74x164.c => gpio-74x164.c} (88%) + rename drivers/gpio/{ab8500-gpio.c => gpio-ab8500.c} (100%) + rename drivers/gpio/{adp5520-gpio.c => gpio-adp5520.c} (100%) + rename drivers/gpio/{adp5588-gpio.c => gpio-adp5588.c} (100%) + rename drivers/gpio/{bt8xxgpio.c => gpio-bt8xx.c} (100%) + rename drivers/gpio/{cs5535-gpio.c => gpio-cs5535.c} (100%) + rename arch/arm/mach-ep93xx/gpio.c => drivers/gpio/gpio-ep93xx.c (69%) + rename drivers/gpio/{basic_mmio_gpio.c => gpio-generic.c} (99%) + rename drivers/gpio/{it8761e_gpio.c => gpio-it8761e.c} (98%) + rename drivers/gpio/{janz-ttl.c => gpio-janz-ttl.c} (100%) + rename drivers/gpio/{langwell_gpio.c => gpio-langwell.c} (99%) + rename drivers/gpio/{max7300.c => gpio-max7300.c} (98%) + rename drivers/gpio/{max7301.c => gpio-max7301.c} (98%) + rename drivers/gpio/{max730x.c => gpio-max730x.c} (99%) + rename drivers/gpio/{max732x.c => gpio-max732x.c} (99%) + rename drivers/gpio/{mc33880.c => gpio-mc33880.c} (98%) + rename drivers/gpio/{mcp23s08.c => gpio-mcp23s08.c} (99%) + rename drivers/gpio/{ml_ioh_gpio.c => gpio-ml-ioh.c} (99%) + rename drivers/gpio/{pca953x.c => gpio-pca953x.c} (89%) + rename drivers/gpio/{pcf857x.c => gpio-pcf857x.c} (99%) + rename drivers/gpio/{pch_gpio.c => gpio-pch.c} (100%) + rename drivers/gpio/{pl061.c => gpio-pl061.c} (99%) + rename drivers/gpio/{rdc321x-gpio.c => gpio-rdc321x.c} (100%) + rename drivers/gpio/{sch_gpio.c => gpio-sch.c} (99%) + rename drivers/gpio/{stmpe-gpio.c => gpio-stmpe.c} (100%) + rename drivers/gpio/{sx150x.c => gpio-sx150x.c} (100%) + rename drivers/gpio/{tc3589x-gpio.c => gpio-tc3589x.c} (100%) + rename arch/arm/mach-tegra/gpio.c => drivers/gpio/gpio-tegra.c (97%) + rename drivers/gpio/{timbgpio.c => gpio-timberdale.c} (99%) + rename drivers/gpio/{tps65910-gpio.c => gpio-tps65910.c} (98%) + rename drivers/gpio/{twl4030-gpio.c => gpio-twl4030.c} (99%) + rename drivers/gpio/{ucb1400_gpio.c => gpio-ucb1400.c} (100%) + rename drivers/gpio/{vr41xx_giu.c => gpio-vr41xx.c} (99%) + rename drivers/gpio/{vx855_gpio.c => gpio-vx855.c} (100%) + rename drivers/gpio/{wm831x-gpio.c => gpio-wm831x.c} (99%) + rename drivers/gpio/{wm8350-gpiolib.c => gpio-wm8350.c} (98%) + rename drivers/gpio/{wm8994-gpio.c => gpio-wm8994.c} (99%) + rename drivers/gpio/{xilinx_gpio.c => gpio-xilinx.c} (100%) +Merging tip/auto-latest +$ git merge tip/auto-latest +Removing arch/alpha/include/asm/8253pit.h +Removing arch/arm/include/asm/i8253.h +Removing arch/mips/include/asm/i8253.h +Removing arch/powerpc/include/asm/8253pit.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/include/asm/apb_timer.h +Removing arch/x86/include/asm/i8253.h +Merge made by recursive. + Documentation/x86/entry_64.txt | 98 + + Makefile | 1 + + arch/alpha/Kconfig | 1 + + arch/alpha/include/asm/8253pit.h | 3 - + arch/alpha/kernel/sys_ruffian.c | 1 - + arch/alpha/kernel/time.c | 1 - + arch/arm/include/asm/i8253.h | 15 - + arch/arm/mach-footbridge/isa-timer.c | 4 +- + arch/mips/Kconfig | 3 + + arch/mips/cobalt/time.c | 2 +- + arch/mips/include/asm/i8253.h | 24 - + arch/mips/jazz/irq.c | 2 +- + arch/mips/kernel/i8253.c | 5 +- + arch/mips/mti-malta/malta-time.c | 2 +- + arch/mips/sgi-ip22/ip22-time.c | 2 +- + arch/mips/sni/time.c | 2 +- + arch/powerpc/include/asm/8253pit.h | 3 - + arch/powerpc/platforms/amigaone/Kconfig | 2 +- + arch/powerpc/platforms/chrp/Kconfig | 1 + + arch/powerpc/platforms/prep/Kconfig | 1 + + arch/powerpc/platforms/pseries/Kconfig | 1 + + arch/x86/Kconfig | 2 + + arch/x86/boot/Makefile | 9 +- + arch/x86/boot/tools/build.c | 33 +- + arch/x86/ia32/ia32entry.S | 10 +- + arch/x86/include/asm/apb_timer.h | 1 - + arch/x86/include/asm/calling.h | 130 +- + arch/x86/include/asm/entry_arch.h | 4 - + arch/x86/include/asm/fixmap.h | 1 + + arch/x86/include/asm/hw_irq.h | 1 - + arch/x86/include/asm/i8253.h | 20 - + arch/x86/include/asm/irq_vectors.h | 11 +- + arch/x86/include/asm/mce.h | 19 +- + arch/x86/include/asm/pgtable_types.h | 6 +- + arch/x86/include/asm/segment.h | 2 +- + arch/x86/include/asm/time.h | 6 +- + arch/x86/include/asm/traps.h | 4 + + arch/x86/include/asm/uv/uv_mmrs.h | 2889 ++++++++++++++++------------- + arch/x86/include/asm/vgtod.h | 1 - + arch/x86/include/asm/vsyscall.h | 12 + + arch/x86/include/asm/vvar.h | 24 +- + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/apb_timer.c | 1 + + arch/x86/kernel/apic/apic.c | 3 +- + arch/x86/kernel/apm_32.c | 2 +- + arch/x86/kernel/cpu/mcheck/mce-severity.c | 152 +- + arch/x86/kernel/cpu/mcheck/mce.c | 288 ++-- + arch/x86/kernel/cpu/mcheck/mce_amd.c | 10 +- + arch/x86/kernel/entry_64.S | 15 +- + arch/x86/kernel/hpet.c | 5 +- + arch/x86/kernel/i8253.c | 6 +- + arch/x86/kernel/irqinit.c | 3 - + arch/x86/kernel/microcode_amd.c | 21 +- + arch/x86/kernel/time.c | 2 +- + arch/x86/kernel/traps.c | 6 + + arch/x86/kernel/vmlinux.lds.S | 48 +- + arch/x86/kernel/vsyscall_64.c | 297 ++-- + arch/x86/kernel/vsyscall_emu_64.S | 27 + + arch/x86/lib/thunk_64.S | 46 +- + arch/x86/mm/pageattr-test.c | 3 +- + arch/x86/pci/mmconfig-shared.c | 3 +- + arch/x86/platform/efi/efi.c | 39 +- + arch/x86/vdso/vclock_gettime.c | 55 +- + drivers/block/hd.c | 2 +- + drivers/clocksource/Kconfig | 6 + + drivers/clocksource/Makefile | 2 +- + drivers/clocksource/i8253.c | 13 +- + drivers/input/gameport/gameport.c | 2 +- + drivers/input/joystick/analog.c | 2 +- + drivers/input/misc/pcspkr.c | 9 +- + include/linux/efi.h | 34 +- + include/linux/i8253.h | 30 + + include/linux/perf_event.h | 33 +- + include/linux/seccomp.h | 10 + + init/Kconfig | 9 +- + kernel/events/Makefile | 2 +- + kernel/events/core.c | 788 ++------ + kernel/events/internal.h | 97 + + kernel/events/ring_buffer.c | 399 ++++ + kernel/printk.c | 8 +- + kernel/sched.c | 4 +- + kernel/sched_rt.c | 4 +- + sound/drivers/pcsp/pcsp.h | 8 +- + tools/perf/Documentation/perf-script.txt | 12 +- + tools/perf/builtin-script.c | 108 +- + tools/perf/builtin-stat.c | 9 +- + tools/perf/util/evsel.c | 1 + + tools/perf/util/evsel.h | 1 + + tools/perf/util/python.c | 17 +- + tools/perf/util/session.c | 61 +- + tools/perf/util/session.h | 5 +- + 91 files changed, 3325 insertions(+), 2743 deletions(-) + create mode 100644 Documentation/x86/entry_64.txt + delete mode 100644 arch/alpha/include/asm/8253pit.h + delete mode 100644 arch/arm/include/asm/i8253.h + delete mode 100644 arch/mips/include/asm/i8253.h + delete mode 100644 arch/powerpc/include/asm/8253pit.h + delete mode 100644 arch/x86/include/asm/i8253.h + create mode 100644 arch/x86/kernel/vsyscall_emu_64.S + create mode 100644 include/linux/i8253.h + create mode 100644 kernel/events/internal.h + create mode 100644 kernel/events/ring_buffer.c +Merging rcu/rcu/next +$ git merge rcu/rcu/next +Auto-merging Documentation/RCU/NMI-RCU.txt +Auto-merging init/Kconfig +Auto-merging kernel/lockdep.c +Auto-merging kernel/sched.c +Auto-merging security/device_cgroup.c +Merge made by recursive. + Documentation/RCU/NMI-RCU.txt | 2 +- + Documentation/RCU/torture.txt | 137 +++++++++++++++++++------- + Documentation/RCU/trace.txt | 13 ++- + drivers/md/linear.c | 8 +-- + fs/jbd2/journal.c | 7 +- + include/linux/lockdep.h | 2 +- + include/linux/rcupdate.h | 215 ++++++++++++++++++----------------------- + include/linux/rcutiny.h | 16 +++- + include/linux/rcutree.h | 2 + + include/linux/types.h | 10 ++ + include/trace/events/rcu.h | 98 +++++++++++++++++++ + init/Kconfig | 6 +- + kernel/lockdep.c | 84 +++++++++------- + kernel/pid.c | 4 +- + kernel/rcu.h | 79 +++++++++++++++ + kernel/rcupdate.c | 26 +++++- + kernel/rcutiny.c | 54 +++++------ + kernel/rcutiny_plugin.h | 14 --- + kernel/rcutorture.c | 60 +++++------- + kernel/rcutree.c | 92 +++++++++++++----- + kernel/rcutree.h | 4 + + kernel/rcutree_plugin.h | 36 +++---- + kernel/rcutree_trace.c | 8 +- + kernel/sched.c | 2 + + security/device_cgroup.c | 10 +-- + 25 files changed, 638 insertions(+), 351 deletions(-) + create mode 100644 include/trace/events/rcu.h + create mode 100644 kernel/rcu.h +Merging kvm/linux-next +$ git merge kvm/linux-next +Auto-merging arch/x86/kvm/mmu.c +Merge made by recursive. + Documentation/virtual/kvm/api.txt | 69 +- + Documentation/virtual/kvm/nested-vmx.txt | 251 +++ + arch/x86/include/asm/kvm_emulate.h | 52 +- + arch/x86/include/asm/kvm_host.h | 20 +- + arch/x86/include/asm/msr-index.h | 12 + + arch/x86/include/asm/vmx.h | 43 + + arch/x86/kvm/emulate.c | 1745 ++++++++---------- + arch/x86/kvm/mmu.c | 533 +++---- + arch/x86/kvm/paging_tmpl.h | 9 +- + arch/x86/kvm/svm.c | 6 +- + arch/x86/kvm/trace.h | 8 +- + arch/x86/kvm/vmx.c | 2979 +++++++++++++++++++++++++++--- + arch/x86/kvm/x86.c | 198 ++- + arch/x86/kvm/x86.h | 8 + + include/linux/kvm.h | 8 +- + virt/kvm/kvm_main.c | 15 +- + 16 files changed, 4302 insertions(+), 1654 deletions(-) + create mode 100644 Documentation/virtual/kvm/nested-vmx.txt +Merging oprofile/for-next +$ git merge oprofile/for-next +Merge made by recursive. + arch/mips/include/asm/stacktrace.h | 4 + + arch/mips/kernel/process.c | 19 +++- + arch/mips/oprofile/Makefile | 2 +- + arch/mips/oprofile/backtrace.c | 175 ++++++++++++++++++++++++++++++++++++ + arch/mips/oprofile/common.c | 1 + + arch/mips/oprofile/op_impl.h | 2 + + 6 files changed, 197 insertions(+), 6 deletions(-) + create mode 100644 arch/mips/oprofile/backtrace.c +Merging ptrace/ptrace +$ git merge ptrace/ptrace +Auto-merging fs/exec.c +Auto-merging include/linux/sched.h +Auto-merging kernel/exit.c +Auto-merging kernel/signal.c +Merge made by recursive. + fs/exec.c | 2 +- + include/linux/ptrace.h | 11 ++- + include/linux/sched.h | 37 ++++- + include/linux/tracehook.h | 52 ------- + kernel/exit.c | 3 +- + kernel/ptrace.c | 160 +++++++++++++++++---- + kernel/signal.c | 356 ++++++++++++++++++++++++++++++--------------- + 7 files changed, 411 insertions(+), 210 deletions(-) +Merging xen/upstream/xen +$ git merge xen/upstream/xen +Already up-to-date. +Merging xen-two/linux-next +$ git merge xen-two/linux-next +Merge made by recursive. + arch/x86/include/asm/xen/pci.h | 5 +- + arch/x86/pci/xen.c | 370 ++++++++++++++++++---------------------- + arch/x86/xen/Makefile | 2 +- + arch/x86/xen/enlighten.c | 8 + + arch/x86/xen/vga.c | 67 +++++++ + arch/x86/xen/xen-ops.h | 11 ++ + drivers/xen/events.c | 2 +- + include/xen/interface/xen.h | 39 +++++ + 8 files changed, 296 insertions(+), 208 deletions(-) + create mode 100644 arch/x86/xen/vga.c +Merging xen-pvhvm/linux-next +$ git merge xen-pvhvm/linux-next +Already up-to-date. +Merging edac-amd/for-next +$ git merge edac-amd/for-next +Already up-to-date. +Merging percpu/for-next +$ git merge percpu/for-next +Merge made by recursive. +Merging workqueues/for-next +$ git merge workqueues/for-next +Auto-merging Documentation/feature-removal-schedule.txt +Auto-merging kernel/workqueue.c +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 10 ---- + include/linux/workqueue.h | 18 +------ + kernel/workqueue.c | 81 ++++++++++++++++++---------- + 3 files changed, 55 insertions(+), 54 deletions(-) +Merging sfi/sfi-test +$ git merge sfi/sfi-test +Already up-to-date. +Merging asm-generic/next +$ git merge asm-generic/next +Already up-to-date. +Merging drivers-x86/linux-next +$ git merge drivers-x86/linux-next +Already up-to-date. +Merging hwpoison/hwpoison +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master +$ git merge sysctl/master +Auto-merging fs/proc/proc_sysctl.c +Merge made by recursive. + fs/proc/proc_sysctl.c | 14 ++------------ + 1 files changed, 2 insertions(+), 12 deletions(-) +Merging namespace/master +$ git merge namespace/master +Merge made by recursive. + fs/proc/namespaces.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging driver-core/driver-core-next +$ git merge driver-core/driver-core-next +Auto-merging drivers/misc/pti.c +Merge made by recursive. + Documentation/driver-model/device.txt | 2 +- + Documentation/driver-model/overview.txt | 52 ++++++++++++++++++++----------- + drivers/misc/pti.c | 6 ++-- + 3 files changed, 38 insertions(+), 22 deletions(-) +Merging tty/tty-next +$ git merge tty/tty-next +Auto-merging drivers/tty/serial/8250.c +Auto-merging drivers/tty/serial/8250_pci.c +Auto-merging drivers/tty/serial/pch_uart.c +Auto-merging include/linux/pci_ids.h +Merge made by recursive. + drivers/parport/parport_pc.c | 54 --------- + drivers/parport/parport_serial.c | 229 +++++++++++++++++++++++++++++++++++--- + drivers/tty/serial/8250.c | 2 +- + drivers/tty/serial/8250_pci.c | 183 ++++++++++++++++++++++++++++++- + drivers/tty/serial/pch_uart.c | 5 +- + include/linux/pci_ids.h | 4 + + include/linux/tty.h | 37 +++--- + 7 files changed, 421 insertions(+), 93 deletions(-) +Merging usb/usb-next +$ git merge usb/usb-next +Auto-merging Documentation/feature-removal-schedule.txt +Auto-merging Documentation/kernel-parameters.txt +Auto-merging drivers/usb/host/ehci-hcd.c +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 7 + + Documentation/kernel-parameters.txt | 5 + + drivers/usb/core/hcd.c | 17 +- + drivers/usb/gadget/Kconfig | 43 +- + drivers/usb/gadget/Makefile | 1 + + drivers/usb/gadget/file_storage.c | 2 + + drivers/usb/gadget/fusb300_udc.c | 5 - + drivers/usb/gadget/gadget_chips.h | 8 + + drivers/usb/gadget/net2272.c | 2718 ++++++++++++++++++++++++++++ + drivers/usb/gadget/net2272.h | 601 ++++++ + drivers/usb/host/ehci-hcd.c | 2 +- + drivers/usb/host/ehci-s5p.c | 95 + + drivers/usb/host/xhci-dbg.c | 22 +- + drivers/usb/host/xhci-mem.c | 26 +- + drivers/usb/host/xhci-ring.c | 42 +- + drivers/usb/host/xhci.c | 10 +- + drivers/usb/host/xhci.h | 7 + + drivers/usb/renesas_usbhs/Makefile | 2 +- + drivers/usb/renesas_usbhs/common.c | 11 +- + drivers/usb/renesas_usbhs/common.h | 44 + + drivers/usb/renesas_usbhs/fifo.c | 994 ++++++++++ + drivers/usb/renesas_usbhs/fifo.h | 104 ++ + drivers/usb/renesas_usbhs/mod_gadget.c | 759 ++------- + drivers/usb/renesas_usbhs/pipe.c | 298 +--- + drivers/usb/renesas_usbhs/pipe.h | 47 +- + drivers/usb/wusbcore/cbaf.c | 4 +- + include/linux/usb/gadget.h | 1 + + include/linux/usb/renesas_usbhs.h | 17 + + 28 files changed, 4965 insertions(+), 927 deletions(-) + create mode 100644 drivers/usb/gadget/net2272.c + create mode 100644 drivers/usb/gadget/net2272.h + create mode 100644 drivers/usb/renesas_usbhs/fifo.c + create mode 100644 drivers/usb/renesas_usbhs/fifo.h +Merging staging/staging-next +$ git merge staging/staging-next +Auto-merging MAINTAINERS +Removing drivers/staging/brcm80211/brcmfmac/bcmcdc.h +Auto-merging drivers/staging/brcm80211/brcmfmac/dhd_linux.c +CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/dhd_linux.c +Auto-merging drivers/staging/brcm80211/brcmfmac/dhd_sdio.c +CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/dhd_sdio.c +Removing drivers/staging/brcm80211/brcmfmac/dhdioctl.h +Removing drivers/staging/brcm80211/brcmfmac/hndrte_armtrap.h +Removing drivers/staging/brcm80211/brcmfmac/hndrte_cons.h +Removing drivers/staging/brcm80211/brcmfmac/msgtrace.h +Auto-merging drivers/staging/brcm80211/brcmfmac/pcicfg.h +Auto-merging drivers/staging/brcm80211/brcmfmac/sdio_host.h +Removing drivers/staging/brcm80211/brcmfmac/sdioh.h +Auto-merging drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h +CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h +Auto-merging drivers/staging/brcm80211/brcmfmac/wl_iw.c +CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/wl_iw.c +Auto-merging drivers/staging/brcm80211/brcmsmac/alloc.c +Auto-merging drivers/staging/brcm80211/brcmsmac/ampdu.c +Auto-merging drivers/staging/brcm80211/brcmsmac/ampdu.h +Auto-merging drivers/staging/brcm80211/brcmsmac/antsel.c +Auto-merging drivers/staging/brcm80211/brcmsmac/antsel.h +Removing drivers/staging/brcm80211/brcmsmac/bcmsrom.c +Auto-merging drivers/staging/brcm80211/brcmsmac/bmac.c +Auto-merging drivers/staging/brcm80211/brcmsmac/bmac.h +Auto-merging drivers/staging/brcm80211/brcmsmac/channel.c +Auto-merging drivers/staging/brcm80211/brcmsmac/channel.h +Auto-merging drivers/staging/brcm80211/brcmsmac/dma.c +Auto-merging drivers/staging/brcm80211/brcmsmac/dma.h +Auto-merging drivers/staging/brcm80211/brcmsmac/mac80211_if.c +Auto-merging drivers/staging/brcm80211/brcmsmac/mac80211_if.h +Auto-merging drivers/staging/brcm80211/brcmsmac/main.c +Auto-merging drivers/staging/brcm80211/brcmsmac/main.h +Removing drivers/staging/brcm80211/brcmsmac/nvram.c +Auto-merging drivers/staging/brcm80211/brcmsmac/otp.c +Auto-merging drivers/staging/brcm80211/brcmsmac/otp.h +Auto-merging drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c +Auto-merging drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h +Auto-merging drivers/staging/brcm80211/brcmsmac/phy/phy_int.h +Auto-merging drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.c +Auto-merging drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.h +Auto-merging drivers/staging/brcm80211/brcmsmac/phy/phy_n.c +Auto-merging drivers/staging/brcm80211/brcmsmac/phy/phy_qmath.c +Auto-merging drivers/staging/brcm80211/brcmsmac/phy/phy_qmath.h +Auto-merging drivers/staging/brcm80211/brcmsmac/phy/phy_radio.h +Removing drivers/staging/brcm80211/brcmsmac/phy/phy_version.h +Auto-merging drivers/staging/brcm80211/brcmsmac/phy/phytbl_lcn.c +Auto-merging drivers/staging/brcm80211/brcmsmac/phy/phytbl_n.c +Auto-merging drivers/staging/brcm80211/brcmsmac/phy_shim.c +Auto-merging drivers/staging/brcm80211/brcmsmac/phy_shim.h +Auto-merging drivers/staging/brcm80211/brcmsmac/pmu.c +Auto-merging drivers/staging/brcm80211/brcmsmac/pmu.h +Auto-merging drivers/staging/brcm80211/brcmsmac/pub.h +Auto-merging drivers/staging/brcm80211/brcmsmac/rate.c +Auto-merging drivers/staging/brcm80211/brcmsmac/scb.h +Auto-merging drivers/staging/brcm80211/brcmsmac/srom.c +Auto-merging drivers/staging/brcm80211/brcmsmac/srom.h +Auto-merging drivers/staging/brcm80211/brcmsmac/stf.c +Auto-merging drivers/staging/brcm80211/brcmsmac/stf.h +Auto-merging drivers/staging/brcm80211/brcmsmac/types.h +Auto-merging drivers/staging/brcm80211/brcmsmac/ucode_loader.c +Auto-merging drivers/staging/brcm80211/brcmsmac/ucode_loader.h +Removing drivers/staging/brcm80211/brcmsmac/wl_dbg.h +Removing drivers/staging/brcm80211/brcmsmac/wl_export.h +Removing drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h +Removing drivers/staging/brcm80211/brcmsmac/wlc_key.h +Removing drivers/staging/brcm80211/brcmsmac/wlc_types.h +Auto-merging drivers/staging/brcm80211/brcmutil/Makefile +Auto-merging drivers/staging/brcm80211/brcmutil/utils.c +Auto-merging drivers/staging/brcm80211/brcmutil/wifiRecorded preimage for 'drivers/staging/brcm80211/brcmfmac/dhd_sdio.c' +Recorded preimage for 'drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h' +Recorded preimage for 'drivers/staging/brcm80211/brcmfmac/wl_iw.c' +Recorded preimage for 'drivers/staging/usbip/userspace/src/utils.h' +Resolved 'drivers/staging/brcm80211/brcmfmac/dhd_linux.c' using previous resolution. +.c +Removing drivers/staging/brcm80211/include/aidmp.h +Removing drivers/staging/brcm80211/include/bcmdefs.h +Removing drivers/staging/brcm80211/include/bcmdevs.h +Removing drivers/staging/brcm80211/include/bcmnvram.h +Removing drivers/staging/brcm80211/include/bcmsdpcm.h +Removing drivers/staging/brcm80211/include/bcmsrom_fmt.h +Auto-merging drivers/staging/brcm80211/include/brcmu_utils.h +Auto-merging drivers/staging/brcm80211/include/brcmu_wifi.h +Removing drivers/staging/brcm80211/include/hndsoc.h +Removing drivers/staging/brcm80211/include/nicpci.h +Removing drivers/staging/brcm80211/include/pci_core.h +Removing drivers/staging/brcm80211/include/pcie_core.h +Removing drivers/staging/brcm80211/include/proto/802.11.h +Removing drivers/staging/brcm80211/include/proto/bcmeth.h +Removing drivers/staging/brcm80211/include/proto/bcmevent.h +Removing drivers/staging/brcm80211/include/sbchipc.h +Removing drivers/staging/brcm80211/include/sbconfig.h +Removing drivers/staging/brcm80211/include/sbhnddma.h +Removing drivers/staging/brcm80211/include/sbsdio.h +Removing drivers/staging/brcm80211/include/sbsdpcmdev.h +Removing drivers/staging/brcm80211/include/sdio.h +Removing drivers/staging/brcm80211/include/wlioctl.h +Auto-merging drivers/staging/hv/hv_mouse.c +Removing drivers/staging/usbip/userspace/src/bind-driver.c +Auto-merging drivers/staging/usbip/userspace/src/utils.h +CONFLICT (content): Merge conflict in drivers/staging/usbip/userspace/src/utils.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/staging/brcm80211/brcmfmac/dhd_sdio.c'. +Recorded resolution for 'drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h'. +Recorded resolution for 'drivers/staging/brcm80211/brcmfmac/wl_iw.c'. +Recorded resolution for 'drivers/staging/usbip/userspace/src/utils.h'. +[master 3a7b2c0] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 3 +- + drivers/staging/brcm80211/Kconfig | 2 + + drivers/staging/brcm80211/Makefile | 2 +- + drivers/staging/brcm80211/README | 65 +- + drivers/staging/brcm80211/TODO | 14 +- + drivers/staging/brcm80211/brcmfmac/bcmcdc.h | 98 - + drivers/staging/brcm80211/brcmfmac/bcmchip.h | 6 - + drivers/staging/brcm80211/brcmfmac/bcmsdbus.h | 2 + + drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 13 +- + drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c | 29 +- + drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 196 +-- + drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.h | 2 - + .../brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c | 8 +- + drivers/staging/brcm80211/brcmfmac/dhd.h | 920 +++++++- + drivers/staging/brcm80211/brcmfmac/dhd_bus.h | 2 +- + drivers/staging/brcm80211/brcmfmac/dhd_cdc.c | 85 +- + drivers/staging/brcm80211/brcmfmac/dhd_common.c | 152 +- + .../staging/brcm80211/brcmfmac/dhd_custom_gpio.c | 8 +- + drivers/staging/brcm80211/brcmfmac/dhd_dbg.h | 3 - + drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 24 +- + drivers/staging/brcm80211/brcmfmac/dhd_proto.h | 5 +- + drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 906 ++++---- + drivers/staging/brcm80211/brcmfmac/dhdioctl.h | 100 - + .../staging/brcm80211/brcmfmac/hndrte_armtrap.h | 75 - + drivers/staging/brcm80211/brcmfmac/hndrte_cons.h | 62 - + drivers/staging/brcm80211/brcmfmac/msgtrace.h | 61 - + .../brcm80211/{include => brcmfmac}/pcicfg.h | 2 +- + drivers/staging/brcm80211/brcmfmac/sbsdio.h | 373 ++++ + .../{include/bcmsdh.h => brcmfmac/sdio_host.h} | 27 +- + drivers/staging/brcm80211/brcmfmac/sdioh.h | 63 - + drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 48 +- + drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h | 14 +- + drivers/staging/brcm80211/brcmfmac/wl_iw.c | 68 +- + drivers/staging/brcm80211/brcmfmac/wl_iw.h | 4 - + drivers/staging/brcm80211/brcmsmac/Makefile | 45 +- + drivers/staging/brcm80211/brcmsmac/aiutils.c | 508 ++++- + drivers/staging/brcm80211/brcmsmac/aiutils.h | 218 ++- + .../brcm80211/brcmsmac/{wlc_alloc.c => alloc.c} | 38 +- + .../brcm80211/brcmsmac/{wlc_alloc.h => alloc.h} | 0 + .../brcm80211/brcmsmac/{wlc_ampdu.c => ampdu.c} | 48 +- + .../brcm80211/brcmsmac/{wlc_ampdu.h => ampdu.h} | 6 +- + .../brcm80211/brcmsmac/{wlc_antsel.c => antsel.c} | 39 +- + .../brcm80211/brcmsmac/{wlc_antsel.h => antsel.h} | 6 +- + drivers/staging/brcm80211/brcmsmac/bcmsrom.c | 714 ------ + .../brcm80211/brcmsmac/{wlc_bmac.c => bmac.c} | 110 +- + .../brcm80211/brcmsmac/{wlc_bmac.h => bmac.h} | 17 +- + .../brcmsmac/{wlc_channel.c => channel.c} | 31 +- + .../brcmsmac/{wlc_channel.h => channel.h} | 11 +- + drivers/staging/brcm80211/brcmsmac/d11.h | 49 +- + .../staging/brcm80211/brcmsmac/{hnddma.c => dma.c} | 293 ++- + .../brcm80211/{include/hnddma.h => brcmsmac/dma.h} | 139 +- + .../brcmsmac/{wl_mac80211.c => mac80211_if.c} | 704 +++--- + .../brcmsmac/{wl_mac80211.h => mac80211_if.h} | 74 +- + .../brcm80211/brcmsmac/{wlc_main.c => main.c} | 2278 ++++---------------- + .../brcm80211/brcmsmac/{wlc_main.h => main.h} | 322 ++-- + drivers/staging/brcm80211/brcmsmac/nicpci.c | 393 ++-- + drivers/staging/brcm80211/brcmsmac/nicpci.h | 85 + + drivers/staging/brcm80211/brcmsmac/nvram.c | 215 -- + .../staging/brcm80211/brcmsmac/{bcmotp.c => otp.c} | 464 +---- + .../brcm80211/{include/bcmotp.h => brcmsmac/otp.h} | 11 +- + .../brcmsmac/phy/{wlc_phy_cmn.c => phy_cmn.c} | 106 +- + .../brcmsmac/phy/{wlc_phy_hal.h => phy_hal.h} | 51 +- + .../brcmsmac/phy/{wlc_phy_int.h => phy_int.h} | 31 +- + .../brcmsmac/phy/{wlc_phy_lcn.c => phy_lcn.c} | 21 +- + .../brcmsmac/phy/{wlc_phy_lcn.h => phy_lcn.h} | 6 +- + .../brcmsmac/phy/{wlc_phy_n.c => phy_n.c} | 24 +- + .../brcmsmac/phy/{wlc_phy_qmath.c => phy_qmath.c} | 2 +- + .../brcmsmac/phy/{wlc_phy_qmath.h => phy_qmath.h} | 6 +- + .../brcmsmac/phy/{wlc_phy_radio.h => phy_radio.h} | 6 +- + .../staging/brcm80211/brcmsmac/phy/phy_version.h | 36 - + .../brcmsmac/phy/{wlc_phyreg_n.h => phyreg_n.h} | 0 + .../phy/{wlc_phytbl_lcn.c => phytbl_lcn.c} | 6 +- + .../phy/{wlc_phytbl_lcn.h => phytbl_lcn.h} | 0 + .../brcmsmac/phy/{wlc_phytbl_n.c => phytbl_n.c} | 6 +- + .../brcmsmac/phy/{wlc_phytbl_n.h => phytbl_n.h} | 0 + .../brcmsmac/{wlc_phy_shim.c => phy_shim.c} | 62 +- + .../brcmsmac/{wlc_phy_shim.h => phy_shim.h} | 61 +- + .../brcm80211/brcmsmac/{wlc_pmu.c => pmu.c} | 552 +++++- + .../brcm80211/brcmsmac/{wlc_pmu.h => pmu.h} | 42 +- + .../brcm80211/brcmsmac/{wlc_pub.h => pub.h} | 160 ++- + .../brcm80211/brcmsmac/{wlc_rate.c => rate.c} | 18 +- + .../brcm80211/brcmsmac/{wlc_rate.h => rate.h} | 0 + .../brcm80211/brcmsmac/{wlc_scb.h => scb.h} | 9 +- + .../brcm80211/brcmsmac/{bcmsrom_tbl.h => srom.c} | 983 ++++++++- + .../{include/bcmsrom.h => brcmsmac/srom.h} | 12 +- + .../brcm80211/brcmsmac/{wlc_stf.c => stf.c} | 67 +- + .../brcm80211/brcmsmac/{wlc_stf.h => stf.h} | 8 +- + .../brcm80211/brcmsmac/{wlc_cfg.h => types.h} | 284 ++- + .../brcmsmac/{wl_ucode_loader.c => ucode_loader.c} | 78 +- + .../brcmsmac/{wl_ucode.h => ucode_loader.h} | 15 +- + drivers/staging/brcm80211/brcmsmac/wl_dbg.h | 92 - + drivers/staging/brcm80211/brcmsmac/wl_export.h | 47 - + drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h | 135 -- + drivers/staging/brcm80211/brcmsmac/wlc_key.h | 140 -- + drivers/staging/brcm80211/brcmsmac/wlc_types.h | 37 - + .../staging/brcm80211/{util => brcmutil}/Makefile | 6 +- + .../{util/bcmutils.c => brcmutil/utils.c} | 143 +- + .../brcm80211/{util/bcmwifi.c => brcmutil/wifi.c} | 18 +- + drivers/staging/brcm80211/include/aidmp.h | 374 ---- + drivers/staging/brcm80211/include/bcmdefs.h | 150 -- + drivers/staging/brcm80211/include/bcmdevs.h | 124 -- + drivers/staging/brcm80211/include/bcmnvram.h | 153 -- + drivers/staging/brcm80211/include/bcmsdpcm.h | 208 -- + drivers/staging/brcm80211/include/bcmsrom_fmt.h | 367 ---- + drivers/staging/brcm80211/include/brcm_hw_ids.h | 59 + + .../include/{bcmutils.h => brcmu_utils.h} | 269 +-- + .../brcm80211/include/{bcmwifi.h => brcmu_wifi.h} | 89 +- + drivers/staging/brcm80211/include/chipcommon.h | 281 +++ + drivers/staging/brcm80211/include/defs.h | 110 + + drivers/staging/brcm80211/include/hndsoc.h | 199 -- + drivers/staging/brcm80211/include/nicpci.h | 79 - + drivers/staging/brcm80211/include/pci_core.h | 122 -- + drivers/staging/brcm80211/include/pcie_core.h | 299 --- + drivers/staging/brcm80211/include/proto/802.11.h | 200 -- + drivers/staging/brcm80211/include/proto/bcmeth.h | 44 - + drivers/staging/brcm80211/include/proto/bcmevent.h | 207 -- + drivers/staging/brcm80211/include/sbchipc.h | 1588 -------------- + drivers/staging/brcm80211/include/sbconfig.h | 272 --- + drivers/staging/brcm80211/include/sbhnddma.h | 315 --- + drivers/staging/brcm80211/include/sbsdio.h | 152 -- + drivers/staging/brcm80211/include/sbsdpcmdev.h | 281 --- + drivers/staging/brcm80211/include/sdio.h | 552 ----- + drivers/staging/brcm80211/include/soc.h | 95 + + drivers/staging/brcm80211/include/wlioctl.h | 1365 ------------ + drivers/staging/comedi/drivers.c | 4 + + .../staging/comedi/drivers/addi-data/addi_common.c | 2 +- + drivers/staging/comedi/drivers/adl_pci9118.c | 1 + + drivers/staging/comedi/drivers/das1800.c | 1 + + drivers/staging/comedi/drivers/dt282x.c | 1 + + drivers/staging/comedi/drivers/ni_at_a2150.c | 1 + + drivers/staging/comedi/drivers/ni_labpc.c | 1 + + drivers/staging/comedi/drivers/pcl812.c | 1 + + drivers/staging/comedi/drivers/pcl816.c | 1 + + drivers/staging/comedi/drivers/pcl818.c | 1 + + drivers/staging/hv/blkvsc_drv.c | 42 +- + drivers/staging/hv/channel.c | 111 +- + drivers/staging/hv/channel_mgmt.c | 6 - + drivers/staging/hv/connection.c | 50 +- + drivers/staging/hv/hv.c | 4 +- + drivers/staging/hv/hv_mouse.c | 1 - + drivers/staging/hv/hyperv.h | 86 +- + drivers/staging/hv/hyperv_net.h | 14 +- + drivers/staging/hv/hyperv_vmbus.h | 2 - + drivers/staging/hv/netvsc.c | 161 -- + drivers/staging/hv/netvsc_drv.c | 42 +- + drivers/staging/hv/ring_buffer.c | 6 +- + drivers/staging/hv/rndis_filter.c | 53 +- + drivers/staging/hv/storvsc_drv.c | 86 +- + drivers/staging/hv/vmbus_drv.c | 135 +- + drivers/staging/usbip/README | 1 + + drivers/staging/usbip/stub.h | 4 +- + drivers/staging/usbip/stub_dev.c | 68 +- + drivers/staging/usbip/stub_main.c | 193 +- + drivers/staging/usbip/stub_rx.c | 6 +- + drivers/staging/usbip/stub_tx.c | 13 +- + drivers/staging/usbip/usbip_common.c | 35 +- + drivers/staging/usbip/usbip_common.h | 238 ++- + drivers/staging/usbip/userspace/configure.ac | 8 +- + .../staging/usbip/userspace/libsrc/stub_driver.c | 17 +- + .../staging/usbip/userspace/libsrc/stub_driver.h | 4 +- + .../staging/usbip/userspace/libsrc/usbip_common.c | 9 +- + .../staging/usbip/userspace/libsrc/usbip_common.h | 20 +- + .../staging/usbip/userspace/libsrc/vhci_driver.c | 78 +- + .../staging/usbip/userspace/libsrc/vhci_driver.h | 21 +- + drivers/staging/usbip/userspace/src/Makefile.am | 11 +- + drivers/staging/usbip/userspace/src/bind-driver.c | 643 ------ + drivers/staging/usbip/userspace/src/usbip.c | 813 ++------ + drivers/staging/usbip/userspace/src/usbip.h | 39 + + drivers/staging/usbip/userspace/src/usbip_attach.c | 228 ++ + drivers/staging/usbip/userspace/src/usbip_bind.c | 264 +++ + drivers/staging/usbip/userspace/src/usbip_detach.c | 103 + + drivers/staging/usbip/userspace/src/usbip_list.c | 286 +++ + .../staging/usbip/userspace/src/usbip_network.c | 91 +- + .../staging/usbip/userspace/src/usbip_network.h | 57 +- + drivers/staging/usbip/userspace/src/usbip_unbind.c | 95 + + drivers/staging/usbip/userspace/src/usbipd.c | 28 +- + drivers/staging/usbip/userspace/src/utils.c | 66 +- + drivers/staging/usbip/userspace/src/utils.h | 28 +- + drivers/staging/usbip/vhci.h | 11 +- + drivers/staging/usbip/vhci_hcd.c | 17 +- + drivers/staging/usbip/vhci_rx.c | 2 - + drivers/staging/usbip/vhci_sysfs.c | 6 +- + 182 files changed, 9039 insertions(+), 16761 deletions(-) + delete mode 100644 drivers/staging/brcm80211/brcmfmac/bcmcdc.h + delete mode 100644 drivers/staging/brcm80211/brcmfmac/dhdioctl.h + delete mode 100644 drivers/staging/brcm80211/brcmfmac/hndrte_armtrap.h + delete mode 100644 drivers/staging/brcm80211/brcmfmac/hndrte_cons.h + delete mode 100644 drivers/staging/brcm80211/brcmfmac/msgtrace.h + rename drivers/staging/brcm80211/{include => brcmfmac}/pcicfg.h (98%) + create mode 100644 drivers/staging/brcm80211/brcmfmac/sbsdio.h + rename drivers/staging/brcm80211/{include/bcmsdh.h => brcmfmac/sdio_host.h} (94%) + delete mode 100644 drivers/staging/brcm80211/brcmfmac/sdioh.h + rename drivers/staging/brcm80211/brcmsmac/{wlc_alloc.c => alloc.c} (91%) + rename drivers/staging/brcm80211/brcmsmac/{wlc_alloc.h => alloc.h} (100%) + rename drivers/staging/brcm80211/brcmsmac/{wlc_ampdu.c => ampdu.c} (97%) + rename drivers/staging/brcm80211/brcmsmac/{wlc_ampdu.h => ampdu.h} (94%) + rename drivers/staging/brcm80211/brcmsmac/{wlc_antsel.c => antsel.c} (93%) + rename drivers/staging/brcm80211/brcmsmac/{wlc_antsel.h => antsel.h} (93%) + delete mode 100644 drivers/staging/brcm80211/brcmsmac/bcmsrom.c + rename drivers/staging/brcm80211/brcmsmac/{wlc_bmac.c => bmac.c} (98%) + rename drivers/staging/brcm80211/brcmsmac/{wlc_bmac.h => bmac.h} (93%) + rename drivers/staging/brcm80211/brcmsmac/{wlc_channel.c => channel.c} (99%) + rename drivers/staging/brcm80211/brcmsmac/{wlc_channel.h => channel.h} (95%) + rename drivers/staging/brcm80211/brcmsmac/{hnddma.c => dma.c} (82%) + rename drivers/staging/brcm80211/{include/hnddma.h => brcmsmac/dma.h} (62%) + rename drivers/staging/brcm80211/brcmsmac/{wl_mac80211.c => mac80211_if.c} (72%) + rename drivers/staging/brcm80211/brcmsmac/{wl_mac80211.h => mac80211_if.h} (52%) + rename drivers/staging/brcm80211/brcmsmac/{wlc_main.c => main.c} (78%) + rename drivers/staging/brcm80211/brcmsmac/{wlc_main.h => main.h} (83%) + create mode 100644 drivers/staging/brcm80211/brcmsmac/nicpci.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/nvram.c + rename drivers/staging/brcm80211/brcmsmac/{bcmotp.c => otp.c} (54%) + rename drivers/staging/brcm80211/{include/bcmotp.h => brcmsmac/otp.h} (87%) + rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phy_cmn.c => phy_cmn.c} (97%) + rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phy_hal.h => phy_hal.h} (83%) + rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phy_int.h => phy_int.h} (97%) + rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phy_lcn.c => phy_lcn.c} (99%) + rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phy_lcn.h => phy_lcn.h} (97%) + rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phy_n.c => phy_n.c} (99%) + rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phy_qmath.c => phy_qmath.c} (99%) + rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phy_qmath.h => phy_qmath.h} (93%) + rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phy_radio.h => phy_radio.h} (99%) + delete mode 100644 drivers/staging/brcm80211/brcmsmac/phy/phy_version.h + rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phyreg_n.h => phyreg_n.h} (100%) + rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phytbl_lcn.c => phytbl_lcn.c} (99%) + rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phytbl_lcn.h => phytbl_lcn.h} (100%) + rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phytbl_n.c => phytbl_n.c} (99%) + rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phytbl_n.h => phytbl_n.h} (100%) + rename drivers/staging/brcm80211/brcmsmac/{wlc_phy_shim.c => phy_shim.c} (84%) + rename drivers/staging/brcm80211/brcmsmac/{wlc_phy_shim.h => phy_shim.h} (67%) + rename drivers/staging/brcm80211/brcmsmac/{wlc_pmu.c => pmu.c} (73%) + rename drivers/staging/brcm80211/brcmsmac/{wlc_pmu.h => pmu.h} (51%) + rename drivers/staging/brcm80211/brcmsmac/{wlc_pub.h => pub.h} (83%) + rename drivers/staging/brcm80211/brcmsmac/{wlc_rate.c => rate.c} (98%) + rename drivers/staging/brcm80211/brcmsmac/{wlc_rate.h => rate.h} (100%) + rename drivers/staging/brcm80211/brcmsmac/{wlc_scb.h => scb.h} (95%) + rename drivers/staging/brcm80211/brcmsmac/{bcmsrom_tbl.h => srom.c} (52%) + rename drivers/staging/brcm80211/{include/bcmsrom.h => brcmsmac/srom.h} (83%) + rename drivers/staging/brcm80211/brcmsmac/{wlc_stf.c => stf.c} (93%) + rename drivers/staging/brcm80211/brcmsmac/{wlc_stf.h => stf.h} (92%) + rename drivers/staging/brcm80211/brcmsmac/{wlc_cfg.h => types.h} (56%) + rename drivers/staging/brcm80211/brcmsmac/{wl_ucode_loader.c => ucode_loader.c} (50%) + rename drivers/staging/brcm80211/brcmsmac/{wl_ucode.h => ucode_loader.h} (78%) + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wl_dbg.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wl_export.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_key.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_types.h + rename drivers/staging/brcm80211/{util => brcmutil}/Makefile (94%) + rename drivers/staging/brcm80211/{util/bcmutils.c => brcmutil/utils.c} (82%) + rename drivers/staging/brcm80211/{util/bcmwifi.c => brcmutil/wifi.c} (92%) + delete mode 100644 drivers/staging/brcm80211/include/aidmp.h + delete mode 100644 drivers/staging/brcm80211/include/bcmdefs.h + delete mode 100644 drivers/staging/brcm80211/include/bcmdevs.h + delete mode 100644 drivers/staging/brcm80211/include/bcmnvram.h + delete mode 100644 drivers/staging/brcm80211/include/bcmsdpcm.h + delete mode 100644 drivers/staging/brcm80211/include/bcmsrom_fmt.h + create mode 100644 drivers/staging/brcm80211/include/brcm_hw_ids.h + rename drivers/staging/brcm80211/include/{bcmutils.h => brcmu_utils.h} (60%) + rename drivers/staging/brcm80211/include/{bcmwifi.h => brcmu_wifi.h} (75%) + create mode 100644 drivers/staging/brcm80211/include/chipcommon.h + create mode 100644 drivers/staging/brcm80211/include/defs.h + delete mode 100644 drivers/staging/brcm80211/include/hndsoc.h + delete mode 100644 drivers/staging/brcm80211/include/nicpci.h + delete mode 100644 drivers/staging/brcm80211/include/pci_core.h + delete mode 100644 drivers/staging/brcm80211/include/pcie_core.h + delete mode 100644 drivers/staging/brcm80211/include/proto/802.11.h + delete mode 100644 drivers/staging/brcm80211/include/proto/bcmeth.h + delete mode 100644 drivers/staging/brcm80211/include/proto/bcmevent.h + delete mode 100644 drivers/staging/brcm80211/include/sbchipc.h + delete mode 100644 drivers/staging/brcm80211/include/sbconfig.h + delete mode 100644 drivers/staging/brcm80211/include/sbhnddma.h + delete mode 100644 drivers/staging/brcm80211/include/sbsdio.h + delete mode 100644 drivers/staging/brcm80211/include/sbsdpcmdev.h + delete mode 100644 drivers/staging/brcm80211/include/sdio.h + create mode 100644 drivers/staging/brcm80211/include/soc.h + delete mode 100644 drivers/staging/brcm80211/include/wlioctl.h + delete mode 100644 drivers/staging/usbip/userspace/src/bind-driver.c + create mode 100644 drivers/staging/usbip/userspace/src/usbip.h + create mode 100644 drivers/staging/usbip/userspace/src/usbip_attach.c + create mode 100644 drivers/staging/usbip/userspace/src/usbip_bind.c + create mode 100644 drivers/staging/usbip/userspace/src/usbip_detach.c + create mode 100644 drivers/staging/usbip/userspace/src/usbip_list.c + create mode 100644 drivers/staging/usbip/userspace/src/usbip_unbind.c +Merging bkl-config/config +$ git merge bkl-config/config +Already up-to-date. +Merging tmem/linux-next +$ git merge tmem/linux-next +Auto-merging include/linux/swap.h +Auto-merging mm/Kconfig +Merge made by recursive. + .../ABI/testing/sysfs-kernel-mm-frontswap | 16 + + Documentation/vm/frontswap.txt | 210 ++++++++++++ + drivers/xen/Kconfig | 4 + + drivers/xen/Makefile | 2 +- + drivers/xen/tmem.c | 158 +++++++++- + include/linux/frontswap.h | 92 ++++++ + include/linux/swap.h | 2 + + include/linux/swapfile.h | 13 + + mm/Kconfig | 17 + + mm/Makefile | 1 + + mm/frontswap.c | 335 ++++++++++++++++++++ + mm/page_io.c | 12 + + mm/swapfile.c | 65 +++- + 13 files changed, 904 insertions(+), 23 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-frontswap + 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/next +$ git merge writeback/next +Auto-merging fs/nfs/write.c +Auto-merging mm/filemap.c +Auto-merging mm/rmap.c +Merge made by recursive. + fs/block_dev.c | 16 ++- + fs/ext4/inode.c | 4 +- + fs/fs-writeback.c | 219 ++++++++++++++++++++------------------ + fs/inode.c | 5 +- + fs/nfs/write.c | 3 +- + fs/xfs/linux-2.6/xfs_aops.c | 2 +- + include/linux/backing-dev.h | 2 + + include/linux/writeback.h | 10 +-- + include/trace/events/btrfs.h | 6 +- + include/trace/events/ext4.h | 6 +- + include/trace/events/writeback.h | 100 +++++++++++++++++- + mm/backing-dev.c | 21 +++- + mm/filemap.c | 6 +- + mm/page-writeback.c | 25 +++-- + mm/rmap.c | 4 +- + 15 files changed, 270 insertions(+), 159 deletions(-) +Merging arm-dt/devicetree/arm-next +$ git merge arm-dt/devicetree/arm-next +Already up-to-date. +Merging scsi-post-merge/merge-base:master +$ date +Tue Jun 21 15:18:01 EST 2011 diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..0499b9833355 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,10 @@ +Importing i2c based on 3.0-rc3 +Unchanged quilt series i2c +Importing jdelvare-hwmon based on 3.0-rc3 +Unchanged quilt series jdelvare-hwmon +Importing kernel-doc based on 3.0-rc2 +Unchanged quilt series kernel-doc +Importing rr based on v3.0-rc2 +Unchanged quilt series rr +Importing device-mapper based on v2.6.39 +Unchanged quilt series device-mapper diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..438442a02d23 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20110621 |