From a51a24eaf5ec5bb3dd7642acda9320492f3c96d9 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Mon, 14 Nov 2011 14:31:14 +1100 Subject: [PATCH 1/1] Add linux-next specific files for 20111114 Signed-off-by: Stephen Rothwell --- Next/SHA1s | 197 +++ Next/Trees | 199 +++ Next/merge.log | 3903 +++++++++++++++++++++++++++++++++++++++++ Next/quilt-import.log | 12 + localversion-next | 1 + 5 files changed, 4312 insertions(+) create mode 100644 Next/SHA1s create mode 100644 Next/Trees create mode 100644 Next/merge.log create mode 100644 Next/quilt-import.log create mode 100644 localversion-next diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..f66f57f08e52 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,197 @@ +Name SHA1 +---- ---- +origin 52e4c2a05256cb83cda12f3c2137ab1533344edb +fixes 31555213f03bca37d2c02e10946296052f4ecfcd +kbuild-current 44656fa03926e7363ab41c565619800a4b3b1322 +arm-current a34dbfb03f472ad3e063d3b1d1e88f7ef8f88bf1 +m68k-current 2690e2148b730c53acb8797821468d0ea1673f25 +powerpc-merge 5ccf55dd8177295813b68780f0a3c85e47306be1 +52xx-and-virtex-current c49f8789f532ae39019135ca038e9bc0d15aaa4a +sparc 51ce185af0f71b65c23ed719f72d0241895a61da +scsi-rc-fixes cf16123c9c8e346ed1dd171295a678d77648d7f8 +net 4b90a603a1b21d63cf743cc833680cb195a729f6 +sound-current d938e66003c9ccc6c0ab10fa31ee23cf27574d66 +pci-current b3c004542229099e18198061c737e13eafc8d4d6 +wireless fada10584d3890258e59da73728510ad7e08a033 +driver-core.current 1ea6b8f48918282bdca0b32a34095504ee65bab5 +tty.current 1ea6b8f48918282bdca0b32a34095504ee65bab5 +usb.current 1ea6b8f48918282bdca0b32a34095504ee65bab5 +staging.current 1ea6b8f48918282bdca0b32a34095504ee65bab5 +cpufreq-current eb0b38a5d2c063cd8dc9e44415ce08e30d95f571 +input-current 77f6ca5a6283a5d34c4bd9dc809fec9e37fdd80d +md-current 257a4b42af7586fab4eaec7f04e6896b86551843 +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current 3acc84739dd5d746840f881ad4d60bd2a428f1dd +ide 0ab3d8b3213c8bb55370b11fcc5321ee4f2c5e92 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +sh-current 21d41f2b312231536cf981c960c83cc4493c0293 +rmobile-current a408baea3cdd2a7b5ad3d70080dff454b8883f62 +devicetree-current 50e07f888cb24b55e0d8283f631907794dd757c2 +spi-current 940ab88962bc1aff3273a8356d64577a6e386736 +arm c18ebb13d248131cdc6386def89129685c59b241 +arm-lpae b38209677687570bcab416b022343f175f1145b4 +arm-soc 31555213f03bca37d2c02e10946296052f4ecfcd +at91 bcdbf1668041ab5ff42c0498c06e0ae47c6d9928 +davinci fe0d42203cb5616eeff68b14576a0f7e2dd56625 +i.MX 5788f4d617769d5f5b8ffa88d6015f4390229855 +linux-spec 5111711d3ed8f4f1012cac3ec3f2b463b549fbfd +omap 322a8b034003c0d46d39af85bf24fee27b902f48 +pxa 19d6c13b56a78b3757e747f469285c2a546d634a +samsung 9edb240696bacd53f4331119d2dfd13d4cd4852f +s5p 98f5bc5d5c09bc15362fe1c34348ea3440a02b35 +tegra b48c54e2fdd9671b54a3092877d0f49c378271b5 +xilinx b85a3ef4ac65169b65fd2fe9bec7912bbf475ba4 +blackfin 5e442a493fc59fa536c76db1fff5b49ca36a88c5 +c6x 2141355fcd4d2c95132226434d38f1c6ffff4105 +cris ea78f5b898555ddfbab494c7755130362fe3cf46 +hexagon 976d167615b64e14bc1491ca51d424e2ba9a5e84 +ia64 0f6a1c01b855919f6d5a453073f7992a109307ec +m68k 2f0084b6106c2766b98d899f83bf5c9f8d77b0ff +m68knommu 8de5bbddc892751d616c8a8bfbe6457b7f3f7c80 +microblaze 31555213f03bca37d2c02e10946296052f4ecfcd +mips b4f13a2bb818ad5f4d3a05081066dfc4c926d99f +openrisc b6fd41e29dea9c6753b1843a77e50433e6123bcb +parisc fc99a914318c60cc9fa9c7347529f4e07dec67d8 +powerpc 96cc017c5b7ec095ef047d3c1952b6b6bbf98943 +4xx 9fcd768d0cc88b41ea459e25d2db12d3e25fa9dd +52xx-and-virtex c1395f4cf4a1944236f0f28cdf718c4aacc88f2d +galak 96cc017c5b7ec095ef047d3c1952b6b6bbf98943 +s390 108285511aadf0f517b4d44db946db57604588e3 +sh b9a3acf46afdafc601947136f63e9dd228cd86e8 +rmobile b58c580d996655658975aa8042b43b7d579f3986 +sparc-next 3ee72ca99288f1de95ec9c570e43f531c8799f06 +tile 1583171492eb514e267c7b51e96846b38de0f544 +unicore32 10967fd885eab09cfcfbfcabb4a1d5f9855a8aff +xtensa 29aced688a9321e3da04a45ad94407dfe7c903f7 +ceph 339573406737461cfb17bebabf7ba536a302d841 +cifs 9c32c63bb70b2fafc3b18bee29959c3bf245ceba +configfs 420118caa32c8ccdf9fce5a623b9de3f951573c5 +ecryptfs 985ca0e626e195ea08a1a82b8dbeb6719747429a +ext3 ed47a7d00c22b326fc4c97342a73ecd15929732e +ext4 5c8a0fbba543d9428a486f0d1282bbcf3cf1d95a +fatfs 710d4403a45c4040a9aa86971d50958f5ae6ed40 +fuse c2183d1e9b3f313dd8ba2b1b0197c8d9fb86a7ae +gfs2 79c4c379c8f16a12c28ea2084db5138e33d17ebd +hfsplus 6596528e391ad978a6a120142cba97a1d7324cb6 +jfs 1c8007b0769d37aa5fcb343b383b0af89ade2f71 +logfs 51b3089b6a98a53b2f83a9c9c054fcb4a7020522 +nfs 62e4a76987eab2b7fa952546614bc83e5bfc9d3e +nfsd c7e8472cf8ae877b232eb506284a5b15cf7efb2c +nilfs2 93ee7a9340d64f20295aacc3fb6a22b759323280 +ocfs2 c849cc2a8a30f3fdc05636f44d4ddbbc4719076b +omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84 +squashfs 7657cacf478940b995c2c73fdff981c13cc62c5c +v9fs 14211d026dad4641d4dffd7a4c520bcaa8fd4a65 +ubifs 7606f85a701ed8feeac065e133ff9a51c267aa0d +xfs 810627d9a6d0e8820c798001875bc4e1b7754ebf +vfs 206b1d09a56dcd2db1052245c4131879c410eaf8 +vfs-scale 32385c7cf60a78375b63afc4f02001df84dfd1a0 +pci cfbf1bd27c26420cc67c48469e9d4d29a8caaba5 +hid 20d575986ed73502013975ac080dcdc0aefa8b8c +i2c f16e246bd3d9ee86bc192dd89f3150089610908e +bjdooks-i2c f8420b7bf6ce1a3c483cbc0a5a48ee82715224a0 +jdelvare-hwmon 1ea6b8f48918282bdca0b32a34095504ee65bab5 +hwmon-staging 1ea6b8f48918282bdca0b32a34095504ee65bab5 +kernel-doc c3b92c8787367a8bb53d57d9789b558f1295cc96 +docs 5c24d8b2bf99ee93049a6f8154ef9cd7897a6e36 +v4l-dvb eeff030c47b7e3fcfce1eec2353b696f7db2edfd +kbuild 8398e54c8e0bd03522f0eb5cb160982b0ee106b2 +kconfig eae1c36aea9cfe4d123b8af3ffe54109c6579810 +libata c24f8350f03dbe457143086b5d724776a2538dd4 +infiniband 042f36e1560cedfe524607791fa44607a3121f63 +acpi efb90582c575084723cc14302c1300cb26c7e01f +cpupowerutils 498ca793d90aef8ad38a852a969c257f62832738 +ieee1394 a572e688cf5d99d2382016c7241ec37b523b0137 +ubi 93ee7a9340d64f20295aacc3fb6a22b759323280 +dlm c3b92c8787367a8bb53d57d9789b558f1295cc96 +swiotlb 25b84fa6892ba6517f292a6254bed39de77da1b5 +ibft f1b1e067b999aa141229a2a524b7be080f999795 +scsi f7c9c6bb14f3104608a3a83cadea10a6943d2804 +target-updates 5bda90c8f20f0af93375721533f4081a40fa6f41 +target-merge e0d85e51564055cf6b527c121f561228308359f5 +slave-dma 9b3fd2438c9cb19e7c7211c8dc33c45e1cb58bdf +async_tx 21ef4b8b7a7d59a995bf44382de38c95587767d4 +net-next 3d249d4ca7d0ed6629a135ea1ea21c72286c0d80 +wireless-next b4487c2d0edaf1332d7a9f11b5661044955ef5e2 +bluetooth 4d611e4d3dc78efcba514d235b5f0a6df0828372 +mtd e0d65113a70f1dc514e625cc4e7a7485a4bf72df +l2-mtd c0af4d0929e0a01a23f76fa4b318a94ec027835a +crypto d19978f58745e586d9385d306d557e7c785abe23 +sound 769f11e1a7343b15d96293632e40d5e223b58295 +sound-asoc a9317e8b6b53ab61d3ee764b6456596efd8c83b7 +cpufreq 5aace5819034c0156adec9f9d3883b3b6d296612 +rr bb6f197b70cc4209f210a97f584e73c054c38da2 +input c22e9b3a64cf7c9969114005967da282aa7b473d +input-mt 02f8c6aee8df3cdc935e9bdd4f2d020306035dbe +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block a629e9a980280eab5f3f3933b516ac0b802b8f91 +device-mapper 94956eed14b4b16d401c8ad36d68df0608f968cb +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 74411c04540404a1ff29d254584ef393e150aeda +battery 85b5fbf784810d80aa09646189848c9ebc8a4ba2 +mmc 6c0cf5c9b708dcb7be5635d52e65144fc0550aeb +kgdb 880ba694f6161ce4b8e14fb7be64f3d446dd5ae6 +slab 09997746c8ac4cee3a6da49a9ee2bf22eab6c458 +uclinux 5e442a493fc59fa536c76db1fff5b49ca36a88c5 +md c7eefaffedcb7abeaea7903e62864ce52efdc941 +mfd b958f7a7cbdfbf59ba61de7ebb9c59b0ee3a7967 +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm 1717c0e23f411147490c7a3312b894f0ea9a5fb1 +fbdev 4420dd2b306f1997232a13462bca0d420be5b1b8 +viafb 4ce36bbb0497bdd3d6b8682175e5c58745b7acdd +omap_dss2 3e28189038bb831512cf4f8313e1aead97c3e63f +regulator a92460dfa57f813f3c6d3820a737a70f77a8892f +security 59df3166ef293288d164ab3362a717743e62d20c +selinux ded509880f6a0213b09f8ae7bef84acb16eaccbf +lblnet 7e27d6e778cd87b6f2415515d7127eba53fe5d02 +watchdog 1ea6b8f48918282bdca0b32a34095504ee65bab5 +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu c3b92c8787367a8bb53d57d9789b558f1295cc96 +iommu 1abb4ba596a91a839f82e0c9c837b777d574e83d +cputime c5927fe412bf8c71f2fcf03c33b083a8370b712a +osd dde406e58cd91b10233c40fa5ea86c1261a4d043 +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +nommu 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d +trivial 92094aa0946a0e64ef5dd810ccc829fb6aae93c6 +audit def57543418a5f47debae28a0a9dea2effc11692 +pm 23527e313ca55d554c3ccb45c9be03bc9ac31516 +apm 73692d9bb58ecc2fa73f4b2bfcf6eadaa6d49a26 +fsnotify ef9bf3b7144bee6ce1da5616015cabc8771206af +irda 94d57c4cfaa43e29ca5fa5ff874048cfc67276f5 +edac 4d096ca7e65584dd5845e64c6400f920e694f672 +edac-amd 1f6189ed18cbd99d90bffdbc76c3adc54418b2fd +devicetree ae97159aed6eff68f4ac86472b018985f071fed5 +spi 940ab88962bc1aff3273a8356d64577a6e386736 +gpio d92ef29a6fa971d9e314e412cd9c09757906411a +tip e471db82dae27dc125f6f8f84de2cc1846df48c8 +rcu afe24b122eb6edb5f1cb942570ac8d766105c7fc +kmemleak cbc6e609939d78ccd4b99af4588f060d9d6a264b +kvm a3e06bbe8445f57eb949e6474c5a9b30f24d2057 +oprofile de346b6949063aa040ef607943b072835294f4b3 +xen ec8161f0607c014eb27e65340edcda7edebb545a +xen-two 31555213f03bca37d2c02e10946296052f4ecfcd +xen-pvhvm b056b6a0144de90707cd22cf7b4f60bf69c86d59 +percpu bc499f9bdc7009a2c7045885960053bdf58f5655 +workqueues 9c5a2ba70251ecaab18c7a83e38b3c620223476c +sfi 5b026c4e3af52fda22c9313a3388344f82f3ba15 +asm-generic 35dbc0e020c6587f78a6c17693beca73aead7b54 +drivers-x86 15b956a0b5651bbb1217ec374fdd67291dabb2af +hwpoison 46e387bbd82d438b9131e237e6e2cb55a825da49 +sysctl c2f5631aceb700224d0cfe0465cee18df564a29e +namespace 7e05c935c50ab5c9ee488c411252076825ec2919 +regmap 58072cbfc522c2520e34333a53c8f17bb1adb1a0 +driver-core 1ea6b8f48918282bdca0b32a34095504ee65bab5 +tty 1ea6b8f48918282bdca0b32a34095504ee65bab5 +usb 1ea6b8f48918282bdca0b32a34095504ee65bab5 +staging 1ea6b8f48918282bdca0b32a34095504ee65bab5 +bkl-config 4ba8216cd90560bc402f52076f64d8546e8aefcb +tmem 665c1e6acbfb4c3b1476a299e383e68c54867cca +writeback 1ea6b8f48918282bdca0b32a34095504ee65bab5 +arm-dt ede338f4ce2fb5ee99d18751df32fbd3b10df268 +hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad +pinctrl 412a6bf09052c62e73e0a1be1adb4a0aefdb8952 +moduleh 6aec187a90aeb883533c9180e2acac1e54c87f7d +kvmtool ef10d0bfc95f72bebd37a2ef7205bf2d1f68d162 +scsi-post-merge 65112dccf8a113737684366349d7f9ec373ddc47 +akpm b01633e7fb22003c5007e33c0bd0e88e39691559 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..9f0570335c90 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,199 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#master +kbuild-current git git://repo.or.cz/linux-kbuild.git#rc-fixes +arm-current git http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +52xx-and-virtex-current git git://git.secretlab.ca/git/linux-2.6#powerpc/merge +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +scsi-rc-fixes git git://bedivere.hansenpartnership.com/git/scsi-rc-fixes-2.6.git#master +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci#for-linus +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git#master +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-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://github.com/herbertx/crypto.git#master +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master +sh-current git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#sh-fixes-for-linus +rmobile-current git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#rmobile-fixes-for-linus +devicetree-current git git://git.secretlab.ca/git/linux-2.6#devicetree/merge +spi-current git git://git.secretlab.ca/git/linux-2.6#spi/merge +arm git http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm#for-next +arm-lpae git git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux.git#for-next +arm-soc git git://git.linaro.org/people/arnd/arm-soc.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 +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://github.com/kgene/linux-samsung.git#for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git#for-next +xilinx git git://git.xilinx.com/linux-2.6-xlnx.git#arm-next +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin.git#for-linus +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +cris git git://www.jni.nu/cris.git#for-next +hexagon quilt https://www.codeaurora.org/patches/quic/hlk/linux-next/ +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://github.com/gregungerer/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/ralf/upstream-sfr.git#mips-for-linux-next +openrisc git git://openrisc.net/jonas/linux#for-upstream +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +4xx git git://git.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-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master +unicore32 git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-unicore.git#unicore32 +xtensa git git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-next.git#master +ceph git git://github.com/NewDreamNetwork/ceph-client.git#for-next +cifs git git://git.samba.org/sfrench/cifs-2.6.git#master +configfs git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git#linux-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +fatfs git git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6.git#master +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw.git#master +hfsplus git git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus.git#for-next +jfs git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#next +logfs git git://github.com/prasad-joshi/logfs.git#master +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +nilfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2.git#for-next +ocfs2 git git://oss.oracle.com/git/jlbec/linux-2.6.git#linux-next +omfs git git://github.com/bcopeland/omfs.git#for-next +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git#master +v9fs git git://github.com/ericvh/linux.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://oss.sgi.com/xfs/xfs#master +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +vfs-scale git git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin.git#vfs-scale-working +pci git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci#linux-next +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c quilt http://khali.linux-fr.org/devel/linux-3/jdelvare-i2c/ +bjdooks-i2c git git://git.fluff.org/bjdooks/linux.git#next-i2c +jdelvare-hwmon quilt http://khali.linux-fr.org/devel/linux-3/jdelvare-hwmon/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +kernel-doc quilt http://www.xenotime.net/kernel-doc-patches/current/ +docs git git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs.git#docs-move +v4l-dvb git git://linuxtv.org/mchehab/media-next.git#master +kbuild git git://repo.or.cz/linux-kbuild.git#for-next +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig.git#for-next +libata git git://github.com/jgarzik/libata-dev.git#NEXT +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +acpi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +cpupowerutils git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils.git#master +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +ubi git git://git.infradead.org/ubi-2.6.git#linux-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +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://bedivere.hansenpartnership.com/git/scsi-misc-2.6.git#master +target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next +target-merge git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next-merge +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next +async_tx git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git#next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master +wireless-next git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next.git#master +mtd git git://git.infradead.org/mtd-2.6.git#master +l2-mtd git git://git.infradead.org/users/dedekind/l2-mtd-2.6.git#master +crypto git git://github.com/herbertx/cryptodev.git#master +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next +rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/ +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +input-mt git git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.git#next +lsm git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next +block git git://git.kernel.dk/linux-2.6-block.git#for-next +device-mapper quilt http://people.redhat.com/agk/patches/linux/editing/ +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git#master +battery git git://git.infradead.org/battery-2.6.git#master +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next +kgdb git git://github.com/jwessel/linux-kgdb.git#kgdb-next +slab git git://github.com/penberg/linux.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +mfd git git://git.infradead.org/users/sameo/mfd-2.6.git#for-next +hdlc git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6.git#hdlc-next +drm git git://people.freedesktop.org/~airlied/linux.git#drm-next +fbdev git git://github.com/schandinat/linux-2.6.git#fbdev-next +viafb git git://github.com/schandinat/linux-2.6.git#viafb-next +omap_dss2 git git://gitorious.org/linux-omap-dss2/linux.git#for-next +regulator git git://opensource.wolfsonmicro.com/regulator.git#for-next +security git git://selinuxproject.org/~jmorris/linux-security#next +selinux git git://git.infradead.org/users/eparis/selinux.git#master +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master +watchdog git git://www.linux-watchdog.org/linux-watchdog.git#linux-next +bdev git git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev.git#master +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +iommu git git://git.8bytes.org/scm/iommu.git#next +cputime git git://git390.marist.edu/pub/scm/linux-2.6.git#cputime +osd git git://git.open-osd.org/linux-open-osd.git#linux-next +jc_docs git git://git.lwn.net/linux-2.6.git#docs-next +nommu git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-nommu.git#master +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-next +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +apm git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git#for-next +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next +irda git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git#for-next +edac git git://git.infradead.org/users/mchehab/edac.git#linux_next +edac-amd git git://amd64.org/linux/bp.git#for-next +devicetree git git://git.secretlab.ca/git/linux-2.6#devicetree/next +spi git git://git.secretlab.ca/git/linux-2.6#spi/next +gpio git git://git.secretlab.ca/git/linux-2.6#gpio/next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +rcu git git://github.com/paulmckrcu/linux#rcu/next +kmemleak git git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux.git#kmemleak +kvm git git://github.com/avikivity/kvm.git#kvm-updates/3.2 +oprofile git git://amd64.org/linux/rric.git#for-next +xen git git://github.com/jsgf/linux-xen.git#upstream/xen +xen-two git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git#linux-next +xen-pvhvm git git://xenbits.xen.org/people/sstabellini/linux-pvhvm.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +sfi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git#sfi-test +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic#next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86#linux-next +hwpoison git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git#hwpoison +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl.git#master +namespace git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/linux-2.6-nsfd.git#master +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +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://oss.oracle.com/git/djm/tmem.git#tmem +writeback git git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux.git#writeback-for-next +arm-dt git git://git.secretlab.ca/git/linux-2.6#devicetree/arm-next +hwspinlock git git://github.com/ohadbc/hwspinlock-next.git#linux-next +pinctrl git git://git.linaro.org/people/triad/linux-pinctrl.git#for-next +moduleh git git://openlinux.windriver.com/people/paulg/linux-next#for-sfr +kvmtool git git://github.com/penberg/linux-kvm.git#master +scsi-post-merge git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master +akpm mmotm http://userweb.kernel.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..f9008b1b4e3f --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3903 @@ +$ date +Mon Nov 14 10:26:03 EST 2011 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**" +Merging origin/master (52e4c2a Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux) +$ git merge origin/master +Updating 5e442a4..52e4c2a +Fast-forward + Documentation/sound/alsa/HD-Audio-Models.txt | 1 + + Kbuild | 2 +- + MAINTAINERS | 10 +- + arch/arm/boot/dts/tegra-ventana.dts | 3 +- + arch/arm/mach-at91/at91cap9_devices.c | 7 +- + arch/arm/mach-at91/at91rm9200_devices.c | 5 +- + arch/arm/mach-at91/at91sam9260_devices.c | 5 +- + arch/arm/mach-at91/at91sam9261_devices.c | 5 +- + arch/arm/mach-at91/at91sam9263_devices.c | 5 +- + arch/arm/mach-at91/at91sam9g45_devices.c | 7 +- + arch/arm/mach-at91/at91sam9rl_devices.c | 7 +- + arch/arm/mach-at91/board-yl-9200.c | 2 +- + arch/arm/mach-at91/include/mach/vmalloc.h | 2 + + arch/arm/mach-imx/Makefile.boot | 34 ++- + arch/arm/mach-imx/clock-imx6q.c | 17 +- + arch/arm/mach-msm/Makefile | 2 + + arch/arm/mach-msm/board-msm7x30.c | 4 +- + arch/arm/mach-msm/board-msm8960.c | 4 +- + arch/arm/mach-msm/board-msm8x60.c | 4 +- + arch/arm/mach-msm/scm.c | 3 + + arch/arm/mach-mx5/clock-mx51-mx53.c | 6 +- + arch/arm/mach-mxs/mach-mx28evk.c | 4 +- + arch/arm/mach-picoxcell/include/mach/debug-macro.S | 2 +- + arch/arm/mach-tegra/board-dt.c | 13 +- + arch/arm/mach-tegra/board-harmony-pinmux.c | 6 +- + arch/arm/mach-tegra/board-paz00-pinmux.c | 6 +- + arch/arm/mach-tegra/board-seaboard-pinmux.c | 6 +- + arch/arm/mach-tegra/board-trimslice-pinmux.c | 5 +- + arch/arm/plat-mxc/Kconfig | 4 +- + arch/arm/plat-mxc/avic.c | 1 + + arch/arm/plat-mxc/gic.c | 11 +- + arch/arm/plat-mxc/include/mach/entry-macro.S | 3 - + arch/arm/plat-mxc/tzic.c | 1 + + arch/m68k/Kconfig | 4 +- + arch/m68k/Kconfig.bus | 9 + + arch/m68k/Kconfig.devices | 31 ++ + arch/m68k/amiga/amiints.c | 168 ++++------- + arch/m68k/amiga/cia.c | 39 ++-- + arch/m68k/apollo/dn_ints.c | 35 ++- + arch/m68k/atari/ataints.c | 274 ++--------------- + arch/m68k/bvme6000/config.c | 2 +- + arch/m68k/hp300/time.c | 2 +- + arch/m68k/include/asm/hardirq.h | 5 + + arch/m68k/include/asm/irq.h | 69 +---- + arch/m68k/include/asm/macintosh.h | 2 + + arch/m68k/include/asm/q40ints.h | 3 - + arch/m68k/kernel/Makefile | 9 +- + arch/m68k/kernel/entry_mm.S | 7 +- + arch/m68k/kernel/ints.c | 323 ++------------------ + arch/m68k/mac/baboon.c | 21 +- + arch/m68k/mac/iop.c | 10 +- + arch/m68k/mac/macints.c | 24 +- + arch/m68k/mac/oss.c | 54 ++-- + arch/m68k/mac/psc.c | 49 ++-- + arch/m68k/mac/via.c | 74 ++--- + arch/m68k/mvme147/config.c | 5 +- + arch/m68k/mvme16x/config.c | 2 +- + arch/m68k/q40/q40ints.c | 60 ++-- + arch/m68k/sun3/sun3ints.c | 46 ++-- + arch/mips/Makefile | 4 +- + arch/powerpc/boot/dts/charon.dts | 236 ++++++++++++++ + arch/powerpc/configs/52xx/tqm5200_defconfig | 20 +- + arch/powerpc/configs/ppc64_defconfig | 4 + + arch/powerpc/configs/pseries_defconfig | 4 + + arch/powerpc/include/asm/floppy.h | 4 +- + arch/powerpc/include/asm/lv1call.h | 2 +- + arch/powerpc/include/asm/xics.h | 4 +- + arch/powerpc/kernel/exceptions-64s.S | 6 +- + arch/powerpc/kernel/smp.c | 2 +- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 2 +- + arch/powerpc/mm/mem.c | 30 ++ + arch/powerpc/mm/numa.c | 24 +- + arch/powerpc/platforms/52xx/mpc5200_simple.c | 1 + + arch/powerpc/platforms/cell/beat.c | 2 +- + arch/powerpc/platforms/cell/celleb_scc_pciex.c | 2 +- + arch/powerpc/platforms/cell/iommu.c | 3 +- + arch/powerpc/platforms/cell/pmu.c | 2 +- + arch/powerpc/platforms/cell/spu_base.c | 9 +- + arch/powerpc/platforms/powermac/pic.c | 1 - + arch/powerpc/platforms/powermac/smp.c | 4 +- + arch/powerpc/platforms/ps3/device-init.c | 2 +- + arch/powerpc/platforms/ps3/repository.c | 32 +- + arch/powerpc/sysdev/mpic.c | 2 - + arch/powerpc/sysdev/ppc4xx_soc.c | 2 +- + arch/powerpc/sysdev/xics/xics-common.c | 5 +- + arch/x86/platform/ce4100/ce4100.c | 2 +- + arch/x86/platform/mrst/mrst.c | 1 + + arch/x86/platform/mrst/vrtc.c | 4 +- + crypto/ablkcipher.c | 14 + + crypto/aead.c | 14 + + crypto/ahash.c | 7 + + crypto/blkcipher.c | 7 + + crypto/crypto_user.c | 3 - + crypto/pcompress.c | 7 + + crypto/rng.c | 7 + + crypto/shash.c | 7 + + drivers/acpi/processor_idle.c | 29 -- + drivers/ata/ahci.c | 3 + + drivers/ata/ahci_platform.c | 4 +- + drivers/ata/libata-eh.c | 12 +- + drivers/ata/libata-pmp.c | 7 +- + drivers/ata/libata-scsi.c | 4 + + drivers/ata/pata_of_platform.c | 2 +- + drivers/ata/sata_sis.c | 2 +- + drivers/char/agp/intel-gtt.c | 7 +- + drivers/cpufreq/db8500-cpufreq.c | 6 +- + drivers/gpu/drm/Kconfig | 2 +- + drivers/gpu/drm/drm_crtc.c | 4 +- + drivers/gpu/drm/drm_crtc_helper.c | 13 + + drivers/gpu/drm/drm_debugfs.c | 12 +- + drivers/gpu/drm/drm_drv.c | 2 +- + drivers/gpu/drm/drm_irq.c | 22 +- + drivers/gpu/drm/i915/i915_debugfs.c | 5 +- + drivers/gpu/drm/i915/i915_gem.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_bios.c | 22 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_channel.c | 1 + + drivers/gpu/drm/nouveau/nouveau_connector.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 11 +- + drivers/gpu/drm/nouveau/nouveau_fence.c | 2 - + drivers/gpu/drm/nouveau/nouveau_i2c.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_perf.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_state.c | 13 +- + drivers/gpu/drm/nouveau/nv40_pm.c | 20 +- + drivers/gpu/drm/nouveau/nv50_graph.c | 4 +- + drivers/gpu/drm/nouveau/nv50_grctx.c | 2 +- + drivers/gpu/drm/nouveau/nv50_vram.c | 2 +- + drivers/gpu/drm/nouveau/nvc0_graph.c | 41 ++- + drivers/gpu/drm/nouveau/nvc0_grctx.c | 31 +- + drivers/gpu/drm/nouveau/nvc0_vram.c | 16 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 6 - + drivers/gpu/drm/radeon/atombios_dp.c | 2 +- + drivers/gpu/drm/radeon/evergreen.c | 53 ++++- + drivers/gpu/drm/radeon/r600.c | 118 ++------ + drivers/gpu/drm/radeon/radeon.h | 50 +++- + drivers/gpu/drm/radeon/radeon_asic.c | 2 +- + drivers/gpu/drm/radeon/radeon_asic.h | 1 + + drivers/gpu/drm/radeon/radeon_atombios.c | 118 +++++--- + drivers/gpu/drm/radeon/radeon_benchmark.c | 2 +- + drivers/gpu/drm/radeon/radeon_combios.c | 27 ++- + drivers/gpu/drm/radeon/radeon_cs.c | 14 +- + drivers/gpu/drm/radeon/radeon_device.c | 16 +- + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 6 - + drivers/gpu/drm/radeon/radeon_pm.c | 18 ++ + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 14 +- + drivers/ide/ide-cd.c | 1 - + drivers/ide/ide-floppy.c | 1 - + drivers/ide/ide-tape.c | 1 - + drivers/macintosh/via-macii.c | 2 +- + drivers/macintosh/via-maciisi.c | 4 +- + drivers/media/dvb/dvb-usb/mxl111sf-i2c.c | 3 +- + drivers/media/dvb/dvb-usb/mxl111sf-phy.c | 7 +- + drivers/media/video/s5p-mfc/s5p_mfc_dec.c | 4 +- + drivers/media/video/s5p-mfc/s5p_mfc_enc.c | 4 +- + drivers/media/video/uvc/uvc_ctrl.c | 6 +- + drivers/media/video/v4l2-ctrls.c | 5 +- + drivers/media/video/v4l2-event.c | 10 +- + drivers/media/video/videobuf2-core.c | 6 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 8 + + drivers/ps3/ps3-vuart.c | 2 +- + drivers/ps3/ps3stor_lib.c | 2 +- + drivers/rtc/rtc-mrst.c | 19 +- + drivers/spi/spi-atmel.c | 5 +- + fs/btrfs/btrfs_inode.h | 4 +- + fs/btrfs/delayed-inode.c | 58 ++++- + fs/btrfs/disk-io.c | 42 ++-- + fs/btrfs/extent-tree.c | 50 ++-- + fs/btrfs/free-space-cache.c | 17 +- + fs/btrfs/inode-map.c | 28 ++- + fs/btrfs/inode.c | 84 ++++-- + fs/btrfs/relocation.c | 2 + + fs/btrfs/scrub.c | 64 ++--- + fs/btrfs/super.c | 49 ++-- + fs/btrfs/transaction.c | 4 +- + fs/btrfs/volumes.c | 5 +- + fs/xfs/xfs_aops.c | 2 +- + fs/xfs/xfs_buf_item.c | 2 +- + fs/xfs/xfs_dquot_item.c | 6 +- + fs/xfs/xfs_extfree_item.c | 4 +- + fs/xfs/xfs_inode_item.c | 2 +- + fs/xfs/xfs_log.c | 2 +- + fs/xfs/xfs_log.h | 2 +- + fs/xfs/xfs_trans.h | 6 +- + fs/xfs/xfs_vnodeops.c | 14 +- + include/drm/drmP.h | 4 +- + include/drm/exynos_drm.h | 2 + + include/linux/mfd/wm8994/registers.h | 15 + + include/linux/pci_ids.h | 2 + + sound/core/vmaster.c | 18 +- + sound/pci/hda/hda_codec.c | 64 +++-- + sound/pci/hda/hda_codec.h | 1 + + sound/pci/hda/hda_local.h | 16 +- + sound/pci/hda/patch_conexant.c | 1 - + sound/pci/hda/patch_realtek.c | 13 +- + sound/pci/hda/patch_sigmatel.c | 11 + + sound/pci/intel8x0.c | 58 +++- + sound/ppc/snd_ps3.c | 2 +- + sound/soc/codecs/wm8994.c | 43 ++- + sound/usb/mixer.c | 110 ++++--- + sound/usb/quirks.c | 7 +- + 200 files changed, 1982 insertions(+), 1686 deletions(-) + create mode 100644 arch/powerpc/boot/dts/charon.dts +Merging fixes/master (3155521 Revert "hvc_console: display printk messages on console.") +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (44656fa kbuild: Fix missing system calls check on mips.) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arm-current/fixes (a34dbfb ARM: 7160/1: setup: avoid overflowing {elf,arch}_name from proc_info_list) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/Makefile | 2 + + arch/arm/include/asm/hardware/cache-l2x0.h | 2 + + arch/arm/include/asm/mach/arch.h | 1 + + arch/arm/kernel/head.S | 2 +- + arch/arm/kernel/machine_kexec.c | 35 ++++++++-------- + arch/arm/kernel/setup.c | 6 ++- + arch/arm/mach-bcmring/core.c | 2 +- + arch/arm/mach-bcmring/dma.c | 1 + + arch/arm/mach-w90x900/dev.c | 4 +- + arch/arm/mach-w90x900/include/mach/mfp.h | 3 +- + arch/arm/mach-w90x900/include/mach/nuc900_spi.h | 2 +- + arch/arm/mach-w90x900/mfp.c | 48 ++++++++++++++++++++--- + drivers/spi/spi-pl022.c | 8 ++++ + 13 files changed, 84 insertions(+), 32 deletions(-) +Merging m68k-current/for-linus (2690e21 m68k/mac: Remove mac_irq_{en,dis}able() wrappers) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge (5ccf55d powerpc/kvm: Fix build failure with HV KVM and CBE) +$ git merge powerpc-merge/merge +Already up-to-date. +Merging 52xx-and-virtex-current/powerpc/merge (c49f878 dtc/powerpc: remove obsolete .gitignore entries) +$ git merge 52xx-and-virtex-current/powerpc/merge +Already up-to-date. +Merging sparc/master (51ce185 sparc: Hook up process_vm_{readv,writev} syscalls.) +$ git merge sparc/master +Already up-to-date. +Merging scsi-rc-fixes/master (cf16123 [SCSI] aacraid: controller hangs if kernel uses non-default ASPM policy) +$ git merge scsi-rc-fixes/master +Merge made by the 'recursive' strategy. + drivers/scsi/aacraid/linit.c | 4 ++++ + drivers/scsi/mpt2sas/mpt2sas_scsih.c | 5 +++++ + drivers/scsi/scsi_lib.c | 3 ++- + drivers/scsi/scsi_scan.c | 6 +----- + 4 files changed, 12 insertions(+), 6 deletions(-) +Merging net/master (4b90a60 ah: Don't return NET_XMIT_DROP on input.) +$ git merge net/master +Merge made by the 'recursive' strategy. + Documentation/networking/ip-sysctl.txt | 2 +- + arch/cris/arch-v10/drivers/Kconfig | 2 +- + arch/cris/arch-v32/drivers/Kconfig | 2 +- + drivers/bluetooth/btusb.c | 3 +++ + drivers/net/Kconfig | 2 ++ + drivers/net/ethernet/realtek/r8169.c | 2 +- + drivers/net/ethernet/sun/sunhme.c | 2 +- + drivers/net/ethernet/xilinx/ll_temac_main.c | 7 ++++++- + drivers/net/hippi/Kconfig | 2 +- + drivers/net/usb/smsc75xx.c | 7 ++++--- + drivers/net/wireless/ath/regd.c | 2 ++ + drivers/net/wireless/b43/xmit.c | 15 +++++++++++++-- + drivers/net/wireless/b43/xmit.h | 16 +++++++++++++++- + drivers/net/wireless/brcm80211/brcmsmac/dma.c | 5 +++-- + drivers/net/wireless/mwifiex/scan.c | 3 ++- + drivers/net/wireless/wl12xx/scan.c | 2 +- + drivers/s390/net/Kconfig | 2 +- + drivers/s390/net/lcs.c | 6 +++--- + include/net/bluetooth/l2cap.h | 7 +++++-- + include/net/cfg80211.h | 4 ++++ + net/bluetooth/hci_conn.c | 2 +- + net/bluetooth/l2cap_core.c | 16 ++++++++-------- + net/ipv4/ah4.c | 8 ++------ + net/ipv4/ip_options.c | 1 + + net/ipv4/route.c | 10 +++++++--- + net/ipv4/tcp_output.c | 2 +- + net/ipv6/ah6.c | 8 ++------ + net/ipv6/ip6_input.c | 8 ++++++++ + net/l2tp/l2tp_core.c | 8 ++++---- + net/mac80211/mlme.c | 19 +++++++++++++++++++ + net/mac80211/sta_info.c | 8 ++++---- + net/wireless/nl80211.c | 9 +++++++-- + net/wireless/scan.c | 13 ++++++++----- + 33 files changed, 142 insertions(+), 63 deletions(-) +Merging sound-current/for-linus (d938e66 Merge branch 'fix/misc' into for-linus) +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus (b3c0045 PCI: pciehp: wait 100 ms after Link Training check) +$ git merge pci-current/for-linus +Auto-merging drivers/pci/Kconfig +Merge made by the 'recursive' strategy. + drivers/pci/Kconfig | 1 + + drivers/pci/hotplug/acpiphp_glue.c | 29 ++++++++++++++++++++++++----- + drivers/pci/hotplug/pciehp_ctrl.c | 3 --- + drivers/pci/hotplug/pciehp_hpc.c | 27 ++++++++++++++++++--------- + include/linux/pci-ats.h | 6 +++--- + include/linux/pci.h | 2 +- + 6 files changed, 47 insertions(+), 21 deletions(-) +Merging wireless/master (fada105 mwifiex: fix association issue with AP configured in hidden SSID mode) +$ git merge wireless/master +Auto-merging net/wireless/reg.c +Auto-merging net/mac80211/util.c +Auto-merging net/mac80211/rx.c +Auto-merging net/mac80211/mlme.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 33 +++++++++++++------------ + drivers/net/wireless/libertas/cfg.c | 2 +- + drivers/net/wireless/mwifiex/scan.c | 6 +++- + net/mac80211/mlme.c | 2 +- + net/mac80211/rx.c | 9 ++++-- + net/mac80211/util.c | 4 +++ + net/wireless/reg.c | 3 ++ + 7 files changed, 36 insertions(+), 23 deletions(-) +Merging driver-core.current/driver-core-linus (1ea6b8f Linux 3.2-rc1) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (1ea6b8f Linux 3.2-rc1) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (1ea6b8f Linux 3.2-rc1) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging staging.current/staging-linus (1ea6b8f Linux 3.2-rc1) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging cpufreq-current/fixes (eb0b38a [CPUFREQ] db8500: fix build error due to undeclared i variable) +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus (77f6ca5 Input: ams_delta_serio - include linux/module.h) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + drivers/input/mouse/elantech.c | 26 ++++++++++++++++++-------- + drivers/input/serio/ams_delta_serio.c | 1 + + drivers/input/serio/i8042-x86ia64io.h | 14 ++++++++++++++ + 3 files changed, 33 insertions(+), 8 deletions(-) +Merging md-current/for-linus (257a4b4 md/raid5: STRIPE_ACTIVE has lock semantics, add barriers) +$ git merge md-current/for-linus +Already up-to-date. +Merging audit-current/for-linus (def5754 Audit: remove spaces from audit_log_d_path) +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master (3acc847 crypto: algapi - Fix build problem with NET disabled) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (0ab3d8b cy82c693: fix PCI device selection) +$ git merge ide/master +Merge made by the 'recursive' strategy. + drivers/ide/cy82c693.c | 6 +++--- + drivers/ide/icside.c | 2 +- + drivers/ide/piix.c | 18 ++++++++++-------- + drivers/ide/triflex.c | 16 +++++++++++++++- + 4 files changed, 29 insertions(+), 13 deletions(-) +Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6) +$ git merge dwmw2/master +Already up-to-date. +Merging sh-current/sh-fixes-for-linus (21d41f2 sh: fix the compile error in setup-sh7757.c) +$ git merge sh-current/sh-fixes-for-linus +Already up-to-date. +Merging rmobile-current/rmobile-fixes-for-linus (a408bae ARM: mach-shmobile: sh7372 CMT3 and CMT4 clock support) +$ git merge rmobile-current/rmobile-fixes-for-linus +Already up-to-date. +Merging devicetree-current/devicetree/merge (50e07f8 dt: add empty of_machine_is_compatible) +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging spi-current/spi/merge (940ab88 drivercore: Add helper macro for platform_driver boilerplate) +$ git merge spi-current/spi/merge +Already up-to-date. +Merging arm/for-next (c18ebb1 Merge branches 'fixes', 'misc', 'pgt' and 'restart-base' into for-next) +$ git merge arm/for-next +Removing arch/arm/mach-omap2/include/mach/omap4-common.h +Removing arch/arm/mach-clps711x/time.c +Removing arch/arm/mach-clps711x/mm.c +Auto-merging arch/arm/mach-clps711x/common.c +Merge made by the 'recursive' strategy. + arch/arm/include/asm/hardirq.h | 17 - + arch/arm/include/asm/mach/arch.h | 9 +- + arch/arm/include/asm/pgalloc.h | 2 +- + arch/arm/include/asm/pgtable.h | 23 +- + arch/arm/include/asm/system.h | 1 + + arch/arm/include/asm/tlb.h | 1 + + arch/arm/kernel/machine_kexec.c | 4 +- + arch/arm/kernel/process.c | 35 +- + arch/arm/kernel/setup.c | 7 +- + arch/arm/mach-clps711x/Makefile | 2 +- + arch/arm/mach-clps711x/{irq.c => common.c} | 95 +++- + arch/arm/mach-clps711x/include/mach/system.h | 2 +- + arch/arm/mach-clps711x/mm.c | 48 -- + arch/arm/mach-clps711x/time.c | 84 --- + arch/arm/mach-ebsa110/core.c | 2 +- + arch/arm/mach-ebsa110/include/mach/system.h | 2 +- + arch/arm/mach-ep93xx/include/mach/system.h | 2 - + arch/arm/mach-footbridge/cats-hw.c | 2 +- + arch/arm/mach-footbridge/include/mach/system.h | 2 +- + arch/arm/mach-iop32x/include/mach/system.h | 4 +- + arch/arm/mach-iop33x/include/mach/system.h | 2 +- + arch/arm/mach-ixp2000/include/mach/system.h | 2 - + arch/arm/mach-ixp4xx/include/mach/system.h | 2 +- + arch/arm/mach-ks8695/include/mach/system.h | 2 +- + arch/arm/mach-lpc32xx/include/mach/system.h | 3 - + arch/arm/mach-mmp/include/mach/system.h | 4 +- + arch/arm/mach-mxs/system.c | 2 +- + arch/arm/mach-omap1/board-ams-delta.c | 2 +- + arch/arm/mach-omap1/board-fsample.c | 2 +- + arch/arm/mach-omap1/board-generic.c | 2 +- + arch/arm/mach-omap1/board-h2.c | 2 +- + arch/arm/mach-omap1/board-h3.c | 2 +- + arch/arm/mach-omap1/board-htcherald.c | 2 +- + arch/arm/mach-omap1/board-innovator.c | 2 +- + arch/arm/mach-omap1/board-nokia770.c | 2 +- + arch/arm/mach-omap1/board-osk.c | 2 +- + arch/arm/mach-omap1/board-palmte.c | 2 +- + arch/arm/mach-omap1/board-palmtt.c | 2 +- + arch/arm/mach-omap1/board-palmz71.c | 2 +- + arch/arm/mach-omap1/board-perseus2.c | 2 +- + arch/arm/mach-omap1/board-sx1.c | 2 +- + arch/arm/mach-omap1/board-voiceblue.c | 2 +- + arch/arm/mach-omap1/common.h | 61 ++ + arch/arm/mach-omap1/devices.c | 2 +- + arch/arm/mach-omap1/time.c | 2 +- + arch/arm/mach-omap1/timer32k.c | 2 +- + arch/arm/mach-omap2/board-2430sdp.c | 2 +- + arch/arm/mach-omap2/board-3430sdp.c | 2 +- + arch/arm/mach-omap2/board-3630sdp.c | 2 +- + arch/arm/mach-omap2/board-4430sdp.c | 3 +- + arch/arm/mach-omap2/board-am3517crane.c | 2 +- + arch/arm/mach-omap2/board-am3517evm.c | 2 +- + arch/arm/mach-omap2/board-apollon.c | 2 +- + arch/arm/mach-omap2/board-cm-t35.c | 2 +- + arch/arm/mach-omap2/board-cm-t3517.c | 2 +- + arch/arm/mach-omap2/board-devkit8000.c | 2 +- + arch/arm/mach-omap2/board-generic.c | 3 +- + arch/arm/mach-omap2/board-h4.c | 2 +- + arch/arm/mach-omap2/board-igep0020.c | 2 +- + arch/arm/mach-omap2/board-ldp.c | 2 +- + arch/arm/mach-omap2/board-n8x0.c | 2 +- + arch/arm/mach-omap2/board-omap3beagle.c | 2 +- + arch/arm/mach-omap2/board-omap3evm.c | 2 +- + arch/arm/mach-omap2/board-omap3logic.c | 2 +- + arch/arm/mach-omap2/board-omap3pandora.c | 2 +- + arch/arm/mach-omap2/board-omap3stalker.c | 2 +- + arch/arm/mach-omap2/board-omap3touchbook.c | 2 +- + arch/arm/mach-omap2/board-omap4panda.c | 3 +- + arch/arm/mach-omap2/board-overo.c | 2 +- + arch/arm/mach-omap2/board-rm680.c | 2 +- + arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +- + arch/arm/mach-omap2/board-rx51.c | 2 +- + arch/arm/mach-omap2/board-ti8168evm.c | 2 +- + arch/arm/mach-omap2/board-zoom-peripherals.c | 2 +- + arch/arm/mach-omap2/board-zoom.c | 2 +- + arch/arm/mach-omap2/cm2xxx_3xxx.c | 2 +- + arch/arm/mach-omap2/cm44xx.c | 2 +- + arch/arm/mach-omap2/cminst44xx.c | 2 +- + arch/arm/mach-omap2/common.c | 2 +- + arch/arm/mach-omap2/common.h | 185 ++++++ + arch/arm/mach-omap2/control.c | 2 +- + arch/arm/mach-omap2/i2c.c | 2 +- + arch/arm/mach-omap2/id.c | 2 +- + arch/arm/mach-omap2/include/mach/omap4-common.h | 43 -- + arch/arm/mach-omap2/io.c | 4 +- + arch/arm/mach-omap2/omap-hotplug.c | 3 +- + arch/arm/mach-omap2/omap-smp.c | 3 +- + arch/arm/mach-omap2/omap4-common.c | 3 +- + arch/arm/mach-omap2/omap_hwmod.c | 2 +- + arch/arm/mach-omap2/pm.c | 2 +- + arch/arm/mach-omap2/pm24xx.c | 1 + + arch/arm/mach-omap2/pm34xx.c | 1 + + arch/arm/mach-omap2/pm44xx.c | 2 +- + arch/arm/mach-omap2/prcm.c | 2 +- + arch/arm/mach-omap2/prcm_mpu44xx.c | 2 +- + arch/arm/mach-omap2/prm2xxx_3xxx.c | 2 +- + arch/arm/mach-omap2/prm44xx.c | 2 +- + arch/arm/mach-omap2/prminst44xx.c | 2 +- + arch/arm/mach-omap2/sdram-nokia.c | 2 +- + arch/arm/mach-omap2/sdrc.c | 2 +- + arch/arm/mach-omap2/sdrc2xxx.c | 2 +- + arch/arm/mach-omap2/serial.c | 2 +- + arch/arm/mach-omap2/smartreflex.c | 2 +- + arch/arm/mach-omap2/timer.c | 2 +- + arch/arm/mach-omap2/vc3xxx_data.c | 2 +- + arch/arm/mach-omap2/vc44xx_data.c | 2 +- + arch/arm/mach-omap2/voltage.c | 2 +- + arch/arm/mach-omap2/voltagedomains3xxx_data.c | 2 +- + arch/arm/mach-omap2/voltagedomains44xx_data.c | 2 +- + arch/arm/mach-omap2/vp.c | 2 +- + arch/arm/mach-omap2/vp3xxx_data.c | 2 +- + arch/arm/mach-omap2/vp44xx_data.c | 2 +- + arch/arm/mach-pnx4008/include/mach/system.h | 2 +- + arch/arm/mach-pxa/mioa701.c | 1 + + arch/arm/mach-pxa/reset.c | 2 +- + arch/arm/mach-pxa/spitz.c | 3 + + arch/arm/mach-pxa/tosa.c | 1 + + arch/arm/mach-rpc/include/mach/system.h | 2 +- + arch/arm/mach-s3c2410/include/mach/system-reset.h | 4 +- + arch/arm/mach-s3c64xx/include/mach/system.h | 2 +- + arch/arm/mach-sa1100/include/mach/system.h | 2 +- + arch/arm/mach-shark/core.c | 1 - + arch/arm/mach-shmobile/include/mach/system.h | 2 +- + arch/arm/mach-u300/include/mach/system.h | 2 - + arch/arm/mach-w90x900/include/mach/system.h | 2 +- + arch/arm/mach-w90x900/irq.c | 2 + + arch/arm/mach-w90x900/nuc910.h | 9 +- + arch/arm/mach-w90x900/nuc950.h | 9 +- + arch/arm/mach-w90x900/nuc960.h | 9 +- + arch/arm/mach-w90x900/nuc9xx.h | 23 + + arch/arm/mach-w90x900/time.c | 2 + + arch/arm/mm/idmap.c | 2 +- + arch/arm/mm/nommu.c | 2 +- + arch/arm/plat-mxc/system.c | 2 +- + arch/arm/plat-omap/include/plat/common.h | 82 --- + arch/arm/plat-omap/include/plat/io.h | 68 --- + arch/arm/plat-omap/include/plat/irqs.h | 10 - + arch/arm/plat-spear/include/plat/system.h | 2 +- + arch/arm/tools/mach-types | 632 +++++++++++---------- + 139 files changed, 873 insertions(+), 827 deletions(-) + rename arch/arm/mach-clps711x/{irq.c => common.c} (59%) + delete mode 100644 arch/arm/mach-clps711x/mm.c + delete mode 100644 arch/arm/mach-clps711x/time.c + create mode 100644 arch/arm/mach-omap1/common.h + create mode 100644 arch/arm/mach-omap2/common.h + delete mode 100644 arch/arm/mach-omap2/include/mach/omap4-common.h + create mode 100644 arch/arm/mach-w90x900/nuc9xx.h +Merging arm-lpae/for-next (b382096 ARM: LPAE: Add the Kconfig entries) +$ git merge arm-lpae/for-next +Recorded preimage for 'arch/arm/include/asm/pgtable.h' +Resolved 'arch/arm/include/asm/pgalloc.h' using previous resolution. +Resolved 'arch/arm/include/asm/tlb.h' using previous resolution. +Auto-merging arch/arm/mm/idmap.c +Auto-merging arch/arm/kernel/setup.c +Auto-merging arch/arm/kernel/head.S +Auto-merging arch/arm/include/asm/tlb.h +CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h +Auto-merging arch/arm/include/asm/system.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/pgalloc.h +CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/arm/include/asm/pgtable.h'. +[master ae94ae7] 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/page.h | 4 + + arch/arm/include/asm/pgalloc.h | 24 ++++ + arch/arm/include/asm/pgtable-2level.h | 41 ++++++ + arch/arm/include/asm/pgtable-3level-hwdef.h | 82 +++++++++++++ + arch/arm/include/asm/pgtable-3level-types.h | 70 +++++++++++ + arch/arm/include/asm/pgtable-3level.h | 155 ++++++++++++++++++++++++ + arch/arm/include/asm/pgtable-hwdef.h | 4 + + arch/arm/include/asm/pgtable.h | 42 +------ + arch/arm/include/asm/proc-fns.h | 21 +++ + arch/arm/include/asm/setup.h | 8 ++ + arch/arm/include/asm/system.h | 8 ++ + arch/arm/include/asm/tlb.h | 11 ++- + arch/arm/kernel/head.S | 45 +++++++- + arch/arm/kernel/hw_breakpoint.c | 8 +- + arch/arm/kernel/setup.c | 23 ++++ + arch/arm/kernel/sleep.S | 2 + + arch/arm/mm/Kconfig | 17 +++ + arch/arm/mm/alignment.c | 2 +- + arch/arm/mm/context.c | 19 +++- + arch/arm/mm/fault.c | 111 +++-------------- + arch/arm/mm/fault.h | 27 ++++- + arch/arm/mm/fsr-2level.c | 78 ++++++++++++ + arch/arm/mm/fsr-3level.c | 68 +++++++++++ + arch/arm/mm/idmap.c | 36 +++++- + arch/arm/mm/ioremap.c | 39 ++++--- + arch/arm/mm/mmu.c | 46 +++++++- + arch/arm/mm/pgd.c | 51 +++++++- + arch/arm/mm/proc-macros.S | 5 +- + arch/arm/mm/proc-v7-2level.S | 171 ++++++++++++++++++++++++++ + arch/arm/mm/proc-v7-3level.S | 149 +++++++++++++++++++++++ + arch/arm/mm/proc-v7.S | 175 +++------------------------ + 34 files changed, 1234 insertions(+), 322 deletions(-) + 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/fsr-2level.c + create mode 100644 arch/arm/mm/fsr-3level.c + create mode 100644 arch/arm/mm/proc-v7-2level.S + create mode 100644 arch/arm/mm/proc-v7-3level.S +Merging arm-soc/for-next (3155521 Revert "hvc_console: display printk messages on console.") +$ git merge arm-soc/for-next +Already up-to-date. +Merging at91/at91-next (bcdbf16 hw_random: add driver for atmel true hardware random number generator) +$ git merge at91/at91-next +Resolved 'arch/arm/mach-at91/at91sam9260.c' using previous resolution. +Resolved 'arch/arm/mach-at91/at91sam9g45.c' using previous resolution. +Resolved 'arch/arm/mach-at91/board-afeb-9260v1.c' using previous resolution. +Resolved 'arch/arm/mach-at91/board-neocore926.c' using previous resolution. +Resolved 'arch/arm/mach-at91/board-rm9200dk.c' using previous resolution. +Resolved 'arch/arm/mach-at91/board-sam9g20ek.c' using previous resolution. +Resolved 'arch/arm/mach-at91/board-sam9m10g45ek.c' using previous resolution. +Resolved 'drivers/ata/pata_at91.c' using previous resolution. +Auto-merging drivers/usb/host/ohci-at91.c +Auto-merging drivers/usb/gadget/at91_udc.c +Auto-merging drivers/mtd/nand/atmel_nand.c +Auto-merging drivers/mmc/host/at91_mci.c +Auto-merging drivers/ide/at91_ide.c +Auto-merging drivers/ata/pata_at91.c +CONFLICT (content): Merge conflict in drivers/ata/pata_at91.c +Auto-merging arch/arm/mach-at91/include/mach/gpio.h +Auto-merging arch/arm/mach-at91/include/mach/at91sam9g45.h +Auto-merging arch/arm/mach-at91/gpio.c +Auto-merging arch/arm/mach-at91/board-yl-9200.c +Auto-merging arch/arm/mach-at91/board-usb-a926x.c +Auto-merging arch/arm/mach-at91/board-snapper9260.c +Auto-merging arch/arm/mach-at91/board-sam9rlek.c +Auto-merging arch/arm/mach-at91/board-sam9m10g45ek.c +CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-sam9m10g45ek.c +Auto-merging arch/arm/mach-at91/board-sam9g20ek.c +CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-sam9g20ek.c +Auto-merging arch/arm/mach-at91/board-sam9263ek.c +Auto-merging arch/arm/mach-at91/board-sam9261ek.c +Auto-merging arch/arm/mach-at91/board-sam9260ek.c +Auto-merging arch/arm/mach-at91/board-sam9-l9260.c +Auto-merging arch/arm/mach-at91/board-rm9200ek.c +Auto-merging arch/arm/mach-at91/board-rm9200dk.c +CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-rm9200dk.c +Auto-merging arch/arm/mach-at91/board-qil-a9260.c +Auto-merging arch/arm/mach-at91/board-picotux200.c +Auto-merging arch/arm/mach-at91/board-neocore926.c +CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-neocore926.c +Auto-merging arch/arm/mach-at91/board-kb9202.c +Auto-merging arch/arm/mach-at91/board-kafa.c +Auto-merging arch/arm/mach-at91/board-ecbat91.c +Auto-merging arch/arm/mach-at91/board-eb9200.c +Auto-merging arch/arm/mach-at91/board-csb637.c +Auto-merging arch/arm/mach-at91/board-csb337.c +Auto-merging arch/arm/mach-at91/board-cpuat91.c +Auto-merging arch/arm/mach-at91/board-cpu9krea.c +Auto-merging arch/arm/mach-at91/board-carmeva.c +Auto-merging arch/arm/mach-at91/board-cap9adk.c +Auto-merging arch/arm/mach-at91/board-cam60.c +Auto-merging arch/arm/mach-at91/board-afeb-9260v1.c +CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-afeb-9260v1.c +Auto-merging arch/arm/mach-at91/board-1arm.c +Auto-merging arch/arm/mach-at91/at91sam9rl_devices.c +Auto-merging arch/arm/mach-at91/at91sam9g45_devices.c +Auto-merging arch/arm/mach-at91/at91sam9g45.c +CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9g45.c +Auto-merging arch/arm/mach-at91/at91sam9263_devices.c +Auto-merging arch/arm/mach-at91/at91sam9263.c +Auto-merging arch/arm/mach-at91/at91sam9261_devices.c +Auto-merging arch/arm/mach-at91/at91sam9261.c +Auto-merging arch/arm/mach-at91/at91sam9260_devices.c +Auto-merging arch/arm/mach-at91/at91sam9260.c +CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9260.c +Auto-merging arch/arm/mach-at91/at91rm9200_devices.c +Auto-merging arch/arm/mach-at91/at91rm9200.c +Auto-merging arch/arm/mach-at91/at91cap9_devices.c +Auto-merging arch/arm/mach-at91/at91cap9.c +Auto-merging arch/arm/configs/at91sam9rl_defconfig +Auto-merging arch/arm/configs/at91sam9g20_defconfig +Auto-merging arch/arm/configs/at91sam9260_defconfig +Auto-merging arch/arm/configs/at91cap9_defconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 050fc84] Merge remote-tracking branch 'at91/at91-next' +$ git diff -M --stat --summary HEAD^.. + .../{at91cap9adk_defconfig => at91cap9_defconfig} | 5 - + ...91sam9260ek_defconfig => at91sam9260_defconfig} | 14 +- + ...91sam9g20ek_defconfig => at91sam9g20_defconfig} | 19 +- + ...at91sam9rlek_defconfig => at91sam9rl_defconfig} | 5 - + arch/arm/mach-at91/at91cap9.c | 8 +- + arch/arm/mach-at91/at91cap9_devices.c | 20 +- + arch/arm/mach-at91/at91rm9200.c | 8 +- + arch/arm/mach-at91/at91rm9200_devices.c | 22 +- + arch/arm/mach-at91/at91sam9260.c | 6 +- + arch/arm/mach-at91/at91sam9260_devices.c | 26 +- + arch/arm/mach-at91/at91sam9261.c | 6 +- + arch/arm/mach-at91/at91sam9261_devices.c | 14 +- + arch/arm/mach-at91/at91sam9263.c | 10 +- + arch/arm/mach-at91/at91sam9263_devices.c | 26 +- + arch/arm/mach-at91/at91sam9g45.c | 10 +- + arch/arm/mach-at91/at91sam9g45_devices.c | 20 +- + arch/arm/mach-at91/at91sam9rl.c | 8 +- + arch/arm/mach-at91/at91sam9rl_devices.c | 16 +- + arch/arm/mach-at91/board-1arm.c | 1 + + arch/arm/mach-at91/board-afeb-9260v1.c | 7 +- + arch/arm/mach-at91/board-cam60.c | 3 +- + arch/arm/mach-at91/board-cap9adk.c | 14 +- + arch/arm/mach-at91/board-carmeva.c | 6 +- + arch/arm/mach-at91/board-cpu9krea.c | 7 +- + arch/arm/mach-at91/board-cpuat91.c | 4 + + arch/arm/mach-at91/board-csb337.c | 4 +- + arch/arm/mach-at91/board-csb637.c | 1 + + arch/arm/mach-at91/board-eb9200.c | 8 +- + arch/arm/mach-at91/board-ecbat91.c | 4 + + arch/arm/mach-at91/board-eco920.c | 4 + + arch/arm/mach-at91/board-flexibity.c | 4 +- + arch/arm/mach-at91/board-foxg20.c | 6 +- + arch/arm/mach-at91/board-gsia18s.c | 4 +- + arch/arm/mach-at91/board-kafa.c | 1 + + arch/arm/mach-at91/board-kb9202.c | 5 +- + arch/arm/mach-at91/board-neocore926.c | 4 +- + arch/arm/mach-at91/board-pcontrol-g20.c | 1 + + arch/arm/mach-at91/board-picotux200.c | 2 + + arch/arm/mach-at91/board-qil-a9260.c | 11 +- + arch/arm/mach-at91/board-rm9200dk.c | 10 +- + arch/arm/mach-at91/board-rm9200ek.c | 2 + + arch/arm/mach-at91/board-sam9-l9260.c | 7 +- + arch/arm/mach-at91/board-sam9260ek.c | 11 +- + arch/arm/mach-at91/board-sam9261ek.c | 8 +- + arch/arm/mach-at91/board-sam9263ek.c | 7 +- + arch/arm/mach-at91/board-sam9g20ek.c | 8 +- + arch/arm/mach-at91/board-sam9m10g45ek.c | 3 + + arch/arm/mach-at91/board-sam9rlek.c | 7 +- + arch/arm/mach-at91/board-snapper9260.c | 5 + + arch/arm/mach-at91/board-stamp9g20.c | 11 +- + arch/arm/mach-at91/board-usb-a926x.c | 5 +- + arch/arm/mach-at91/board-yl-9200.c | 6 +- + arch/arm/mach-at91/generic.h | 2 +- + arch/arm/mach-at91/gpio.c | 62 ++-- + arch/arm/mach-at91/include/mach/at91cap9.h | 9 +- + arch/arm/mach-at91/include/mach/at91rm9200.h | 9 +- + arch/arm/mach-at91/include/mach/at91sam9260.h | 7 +- + arch/arm/mach-at91/include/mach/at91sam9261.h | 7 +- + arch/arm/mach-at91/include/mach/at91sam9263.h | 11 +- + arch/arm/mach-at91/include/mach/at91sam9g45.h | 11 +- + arch/arm/mach-at91/include/mach/at91sam9rl.h | 9 +- + arch/arm/mach-at91/include/mach/gpio.h | 336 ++++++++++---------- + drivers/ata/pata_at91.c | 6 +- + drivers/ide/at91_ide.c | 2 +- + drivers/mmc/host/at91_mci.c | 30 +- + drivers/mtd/nand/atmel_nand.c | 8 +- + drivers/usb/gadget/at91_udc.c | 14 +- + drivers/usb/host/ohci-at91.c | 4 +- + 68 files changed, 530 insertions(+), 431 deletions(-) + rename arch/arm/configs/{at91cap9adk_defconfig => at91cap9_defconfig} (95%) + rename arch/arm/configs/{at91sam9260ek_defconfig => at91sam9260_defconfig} (89%) + rename arch/arm/configs/{at91sam9g20ek_defconfig => at91sam9g20_defconfig} (93%) + rename arch/arm/configs/{at91sam9rlek_defconfig => at91sam9rl_defconfig} (94%) +Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6) +$ git merge davinci/davinci-next +Already up-to-date. +Merging i.MX/for-next (5788f4d Merge branches 'imx-fixes', 'imx-cleanup' and 'imx-features' into master) +$ git merge i.MX/for-next +Resolved 'arch/arm/mach-mx5/clock-mx51-mx53.c' using previous resolution. +Resolved 'arch/arm/mach-mx5/devices-imx53.h' using previous resolution. +Resolved 'arch/arm/mach-mx5/mm.c' using previous resolution. +Resolved 'arch/arm/plat-mxc/include/mach/hardware.h' using previous resolution. +Auto-merging arch/arm/plat-mxc/include/mach/hardware.h +CONFLICT (content): Merge conflict in arch/arm/plat-mxc/include/mach/hardware.h +Auto-merging arch/arm/mach-mxs/clock-mx28.c +Auto-merging arch/arm/mach-mx5/mm.c +CONFLICT (content): Merge conflict in arch/arm/mach-mx5/mm.c +Auto-merging arch/arm/mach-mx5/devices-imx53.h +CONFLICT (content): Merge conflict in arch/arm/mach-mx5/devices-imx53.h +Auto-merging arch/arm/mach-mx5/clock-mx51-mx53.c +CONFLICT (content): Merge conflict in arch/arm/mach-mx5/clock-mx51-mx53.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master de5aa21] Merge remote-tracking branch 'i.MX/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-mxs/clock-mx28.c | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) +Merging linux-spec/for-next (5111711 Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux) +$ git merge linux-spec/for-next +Already up-to-date. +Merging omap/for-next (322a8b0 Linux 3.1-rc1) +$ git merge omap/for-next +Already up-to-date. +Merging pxa/for-next (19d6c13 [ARM] pxa/hx4700: actually use platform_lcd driver) +$ git merge pxa/for-next +Already up-to-date. +Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers) +$ git merge samsung/next-samsung +Already up-to-date. +Merging s5p/for-next (98f5bc5 Merge branch 'next-samsung-devel' into for-next) +$ git merge s5p/for-next +Removing drivers/tty/serial/s5pv210.c +Removing drivers/tty/serial/s3c6400.c +Removing drivers/tty/serial/s3c2440.c +Removing drivers/tty/serial/s3c2412.c +Removing drivers/tty/serial/s3c2410.c +Removing arch/arm/mach-s5pv210/setup-sdhci.c +Removing arch/arm/mach-s5pc100/setup-sdhci.c +Removing arch/arm/mach-s3c64xx/setup-sdhci.c +Removing arch/arm/mach-s3c2416/setup-sdhci.c +Removing arch/arm/mach-exynos/setup-sdhci.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/insignal-boards.txt | 8 + + .../devicetree/bindings/arm/samsung-boards.txt | 8 + + .../devicetree/bindings/dma/arm-pl330.txt | 30 + + .../devicetree/bindings/gpio/gpio-samsung.txt | 40 ++ + .../devicetree/bindings/input/samsung-keypad.txt | 88 +++ + Documentation/devicetree/bindings/rtc/s3c-rtc.txt | 20 + + .../devicetree/bindings/serial/samsung_uart.txt | 14 + + arch/arm/boot/dts/exynos4210-origen.dts | 137 +++++ + arch/arm/boot/dts/exynos4210-smdkv310.dts | 182 ++++++ + arch/arm/boot/dts/exynos4210.dtsi | 397 ++++++++++++ + arch/arm/mach-exynos/Kconfig | 24 + + arch/arm/mach-exynos/Makefile | 6 +- + arch/arm/mach-exynos/clock.c | 229 +++++--- + arch/arm/mach-exynos/cpu.c | 39 ++- + arch/arm/mach-exynos/cpuidle.c | 2 + + arch/arm/mach-exynos/dma.c | 229 ++----- + arch/arm/mach-exynos/include/mach/entry-macro.S | 1 - + arch/arm/mach-exynos/include/mach/io.h | 5 + + arch/arm/mach-exynos/include/mach/irqs.h | 8 +- + arch/arm/mach-exynos/init.c | 21 +- + arch/arm/mach-exynos/mach-exynos4-dt.c | 85 +++ + arch/arm/mach-exynos/mach-origen.c | 34 + + arch/arm/mach-exynos/setup-sdhci.c | 22 - + arch/arm/mach-s3c2410/mach-bast.c | 22 - + arch/arm/mach-s3c2410/mach-vr1000.c | 24 - + arch/arm/mach-s3c2410/s3c2410.c | 6 + + arch/arm/mach-s3c2412/clock.c | 7 + + arch/arm/mach-s3c2416/Makefile | 1 - + arch/arm/mach-s3c2416/clock.c | 68 ++- + arch/arm/mach-s3c2416/setup-sdhci.c | 24 - + arch/arm/mach-s3c2440/clock.c | 44 ++ + arch/arm/mach-s3c2440/mach-anubis.c | 22 +- + arch/arm/mach-s3c2440/mach-at2440evb.c | 22 +- + arch/arm/mach-s3c2440/mach-osiris.c | 24 +- + arch/arm/mach-s3c2440/mach-rx1950.c | 18 +- + arch/arm/mach-s3c2440/mach-rx3715.c | 19 +- + arch/arm/mach-s3c64xx/Kconfig | 6 +- + arch/arm/mach-s3c64xx/Makefile | 1 - + arch/arm/mach-s3c64xx/clock.c | 243 +++++--- + arch/arm/mach-s3c64xx/dev-spi.c | 7 - + arch/arm/mach-s3c64xx/include/mach/crag6410.h | 3 +- + arch/arm/mach-s3c64xx/include/mach/gpio.h | 2 +- + arch/arm/mach-s3c64xx/mach-crag6410.c | 2 +- + arch/arm/mach-s3c64xx/setup-sdhci.c | 24 - + arch/arm/mach-s5p64x0/clock-s5p6440.c | 93 ++-- + arch/arm/mach-s5p64x0/clock-s5p6450.c | 81 ++- + arch/arm/mach-s5p64x0/dev-spi.c | 6 - + arch/arm/mach-s5p64x0/dma.c | 227 ++----- + arch/arm/mach-s5p64x0/include/mach/irqs.h | 2 + + arch/arm/mach-s5p64x0/init.c | 31 - + arch/arm/mach-s5pc100/Makefile | 1 - + arch/arm/mach-s5pc100/clock.c | 287 ++++++---- + arch/arm/mach-s5pc100/dev-spi.c | 7 - + arch/arm/mach-s5pc100/dma.c | 247 +++------ + arch/arm/mach-s5pc100/include/mach/irqs.h | 2 + + arch/arm/mach-s5pc100/setup-sdhci.c | 23 - + arch/arm/mach-s5pv210/Makefile | 1 - + arch/arm/mach-s5pv210/clock.c | 324 ++++++---- + arch/arm/mach-s5pv210/dev-spi.c | 6 - + arch/arm/mach-s5pv210/dma.c | 241 +++------ + arch/arm/mach-s5pv210/include/mach/irqs.h | 2 + + arch/arm/mach-s5pv210/init.c | 19 - + arch/arm/mach-s5pv210/setup-sdhci.c | 22 - + arch/arm/plat-s3c24xx/s3c2443-clock.c | 39 +- + arch/arm/plat-samsung/Kconfig | 8 + + arch/arm/plat-samsung/dma-ops.c | 15 +- + arch/arm/plat-samsung/include/plat/dma-ops.h | 1 + + arch/arm/plat-samsung/include/plat/dma-pl330.h | 3 +- + arch/arm/plat-samsung/include/plat/irqs.h | 3 +- + arch/arm/plat-samsung/include/plat/regs-serial.h | 45 +- + arch/arm/plat-samsung/include/plat/s3c64xx-spi.h | 2 - + arch/arm/plat-samsung/include/plat/sdhci.h | 31 - + drivers/dma/pl330.c | 99 ++-- + drivers/gpio/gpio-samsung.c | 72 +++ + drivers/input/keyboard/Kconfig | 9 +- + drivers/input/keyboard/samsung-keypad.c | 174 +++++- + drivers/mmc/host/sdhci-s3c.c | 7 +- + drivers/rtc/rtc-s3c.c | 21 +- + drivers/spi/spi-s3c64xx.c | 14 +- + drivers/tty/serial/Kconfig | 45 +-- + drivers/tty/serial/Makefile | 5 - + drivers/tty/serial/s3c2410.c | 115 ---- + drivers/tty/serial/s3c2412.c | 149 ----- + drivers/tty/serial/s3c2440.c | 178 ------ + drivers/tty/serial/s3c6400.c | 149 ----- + drivers/tty/serial/s5pv210.c | 158 ----- + drivers/tty/serial/samsung.c | 639 ++++++++++++-------- + drivers/tty/serial/samsung.h | 32 +- + include/linux/amba/pl330.h | 15 +- + 89 files changed, 3085 insertions(+), 2783 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/insignal-boards.txt + create mode 100644 Documentation/devicetree/bindings/arm/samsung-boards.txt + create mode 100644 Documentation/devicetree/bindings/dma/arm-pl330.txt + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-samsung.txt + create mode 100644 Documentation/devicetree/bindings/input/samsung-keypad.txt + create mode 100644 Documentation/devicetree/bindings/rtc/s3c-rtc.txt + create mode 100644 Documentation/devicetree/bindings/serial/samsung_uart.txt + create mode 100644 arch/arm/boot/dts/exynos4210-origen.dts + create mode 100644 arch/arm/boot/dts/exynos4210-smdkv310.dts + create mode 100644 arch/arm/boot/dts/exynos4210.dtsi + create mode 100644 arch/arm/mach-exynos/mach-exynos4-dt.c + delete mode 100644 arch/arm/mach-exynos/setup-sdhci.c + delete mode 100644 arch/arm/mach-s3c2416/setup-sdhci.c + delete mode 100644 arch/arm/mach-s3c64xx/setup-sdhci.c + delete mode 100644 arch/arm/mach-s5pc100/setup-sdhci.c + delete mode 100644 arch/arm/mach-s5pv210/setup-sdhci.c + delete mode 100644 drivers/tty/serial/s3c2410.c + delete mode 100644 drivers/tty/serial/s3c2412.c + delete mode 100644 drivers/tty/serial/s3c2440.c + delete mode 100644 drivers/tty/serial/s3c6400.c + delete mode 100644 drivers/tty/serial/s5pv210.c +Merging tegra/for-next (b48c54e Merge branch 'for-3.3/boards' into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/usb/tegra-usb.txt | 13 +++ + arch/arm/boot/dts/tegra-paz00.dts | 82 ++++++++++++++++++++ + arch/arm/boot/dts/tegra-seaboard.dts | 4 + + arch/arm/boot/dts/tegra-trimslice.dts | 38 +++++++++ + arch/arm/boot/dts/tegra20.dtsi | 21 +++++ + arch/arm/mach-tegra/Makefile | 28 ++++--- + arch/arm/mach-tegra/Makefile.boot | 2 + + arch/arm/mach-tegra/board-dt.c | 15 ++++ + arch/arm/mach-tegra/board-paz00-pinmux.c | 2 +- + arch/arm/mach-tegra/board-paz00.c | 27 +++++++ + arch/arm/mach-tegra/board-paz00.h | 3 + + arch/arm/mach-tegra/irq.c | 4 - + arch/arm/mach-tegra/timer.c | 12 ++- + drivers/usb/host/ehci-tegra.c | 71 +++++++++++++++++ + 14 files changed, 300 insertions(+), 22 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/tegra-usb.txt + create mode 100644 arch/arm/boot/dts/tegra-paz00.dts + create mode 100644 arch/arm/boot/dts/tegra-trimslice.dts +Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support) +$ git merge xilinx/arm-next +Already up-to-date. +Merging blackfin/for-linus (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**") +$ git merge blackfin/for-linus +Already up-to-date. +Merging c6x/for-linux-next (2141355 C6X: MAINTAINERS) +$ git merge c6x/for-linux-next +Auto-merging include/asm-generic/page.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/c6x/clocks.txt | 40 + + Documentation/devicetree/bindings/c6x/dscr.txt | 127 +++ + Documentation/devicetree/bindings/c6x/emifa.txt | 62 ++ + .../devicetree/bindings/c6x/interrupt.txt | 104 +++ + Documentation/devicetree/bindings/c6x/soc.txt | 28 + + Documentation/devicetree/bindings/c6x/timer64.txt | 26 + + MAINTAINERS | 8 + + arch/c6x/Kconfig | 174 +++++ + arch/c6x/Makefile | 60 ++ + arch/c6x/boot/Makefile | 30 + + arch/c6x/boot/dts/dsk6455.dts | 62 ++ + arch/c6x/boot/dts/evmc6457.dts | 48 ++ + arch/c6x/boot/dts/evmc6472.dts | 73 ++ + arch/c6x/boot/dts/evmc6474.dts | 58 ++ + arch/c6x/boot/dts/tms320c6455.dtsi | 96 +++ + arch/c6x/boot/dts/tms320c6457.dtsi | 68 ++ + arch/c6x/boot/dts/tms320c6472.dtsi | 134 ++++ + arch/c6x/boot/dts/tms320c6474.dtsi | 89 +++ + arch/c6x/boot/linked_dtb.S | 2 + + arch/c6x/configs/dsk6455_defconfig | 44 ++ + arch/c6x/configs/evmc6457_defconfig | 41 + + arch/c6x/configs/evmc6472_defconfig | 42 + + arch/c6x/configs/evmc6474_defconfig | 42 + + arch/c6x/include/asm/Kbuild | 54 ++ + arch/c6x/include/asm/asm-offsets.h | 1 + + arch/c6x/include/asm/bitops.h | 105 +++ + arch/c6x/include/asm/byteorder.h | 12 + + arch/c6x/include/asm/cache.h | 90 +++ + arch/c6x/include/asm/cacheflush.h | 65 ++ + arch/c6x/include/asm/checksum.h | 34 + + arch/c6x/include/asm/clkdev.h | 22 + + arch/c6x/include/asm/clock.h | 148 ++++ + arch/c6x/include/asm/delay.h | 67 ++ + arch/c6x/include/asm/dma-mapping.h | 91 +++ + arch/c6x/include/asm/dscr.h | 34 + + arch/c6x/include/asm/elf.h | 113 +++ + arch/c6x/include/asm/ftrace.h | 6 + + arch/c6x/include/asm/hardirq.h | 20 + + arch/c6x/include/asm/irq.h | 302 ++++++++ + arch/c6x/include/asm/irqflags.h | 72 ++ + arch/c6x/include/asm/linkage.h | 30 + + arch/c6x/include/asm/megamod-pic.h | 9 + + arch/c6x/include/asm/memblock.h | 4 + + arch/c6x/include/asm/mmu.h | 18 + + arch/c6x/include/asm/module.h | 33 + + arch/c6x/include/asm/mutex.h | 6 + + arch/c6x/include/asm/page.h | 11 + + arch/c6x/include/asm/pgtable.h | 81 ++ + arch/c6x/include/asm/processor.h | 132 ++++ + arch/c6x/include/asm/procinfo.h | 28 + + arch/c6x/include/asm/prom.h | 1 + + arch/c6x/include/asm/ptrace.h | 174 +++++ + arch/c6x/include/asm/sections.h | 12 + + arch/c6x/include/asm/setup.h | 32 + + arch/c6x/include/asm/sigcontext.h | 80 ++ + arch/c6x/include/asm/signal.h | 17 + + arch/c6x/include/asm/soc.h | 35 + + arch/c6x/include/asm/string.h | 21 + + arch/c6x/include/asm/swab.h | 54 ++ + arch/c6x/include/asm/syscall.h | 123 +++ + arch/c6x/include/asm/syscalls.h | 55 ++ + arch/c6x/include/asm/system.h | 168 ++++ + arch/c6x/include/asm/thread_info.h | 121 +++ + arch/c6x/include/asm/timer64.h | 6 + + arch/c6x/include/asm/timex.h | 33 + + arch/c6x/include/asm/tlb.h | 8 + + arch/c6x/include/asm/traps.h | 36 + + arch/c6x/include/asm/uaccess.h | 107 +++ + arch/c6x/include/asm/unaligned.h | 170 +++++ + arch/c6x/include/asm/unistd.h | 26 + + arch/c6x/kernel/Makefile | 12 + + arch/c6x/kernel/asm-offsets.c | 123 +++ + arch/c6x/kernel/c6x_ksyms.c | 66 ++ + arch/c6x/kernel/devicetree.c | 53 ++ + arch/c6x/kernel/dma.c | 153 ++++ + arch/c6x/kernel/entry.S | 803 ++++++++++++++++++++ + arch/c6x/kernel/head.S | 84 ++ + arch/c6x/kernel/irq.c | 728 ++++++++++++++++++ + arch/c6x/kernel/module.c | 123 +++ + arch/c6x/kernel/process.c | 263 +++++++ + arch/c6x/kernel/ptrace.c | 187 +++++ + arch/c6x/kernel/setup.c | 498 ++++++++++++ + arch/c6x/kernel/signal.c | 377 +++++++++ + arch/c6x/kernel/soc.c | 91 +++ + arch/c6x/kernel/switch_to.S | 74 ++ + arch/c6x/kernel/sys_c6x.c | 74 ++ + arch/c6x/kernel/time.c | 65 ++ + arch/c6x/kernel/traps.c | 423 ++++++++++ + arch/c6x/kernel/vectors.S | 81 ++ + arch/c6x/kernel/vmlinux.lds.S | 162 ++++ + arch/c6x/lib/Makefile | 7 + + arch/c6x/lib/checksum.c | 36 + + arch/c6x/lib/csum_64plus.S | 419 ++++++++++ + arch/c6x/lib/divi.S | 53 ++ + arch/c6x/lib/divremi.S | 46 ++ + arch/c6x/lib/divremu.S | 87 +++ + arch/c6x/lib/divu.S | 98 +++ + arch/c6x/lib/llshl.S | 37 + + arch/c6x/lib/llshr.S | 38 + + arch/c6x/lib/llshru.S | 38 + + arch/c6x/lib/memcpy_64plus.S | 46 ++ + arch/c6x/lib/mpyll.S | 49 ++ + arch/c6x/lib/negll.S | 31 + + arch/c6x/lib/pop_rts.S | 32 + + arch/c6x/lib/push_rts.S | 31 + + arch/c6x/lib/remi.S | 64 ++ + arch/c6x/lib/remu.S | 82 ++ + arch/c6x/lib/strasgi.S | 89 +++ + arch/c6x/lib/strasgi_64plus.S | 39 + + arch/c6x/mm/Makefile | 5 + + arch/c6x/mm/dma-coherent.c | 143 ++++ + arch/c6x/mm/init.c | 113 +++ + arch/c6x/platforms/Kconfig | 16 + + arch/c6x/platforms/Makefile | 12 + + arch/c6x/platforms/cache.c | 445 +++++++++++ + arch/c6x/platforms/dscr.c | 598 +++++++++++++++ + arch/c6x/platforms/emif.c | 88 +++ + arch/c6x/platforms/megamod-pic.c | 349 +++++++++ + arch/c6x/platforms/platform.c | 17 + + arch/c6x/platforms/pll.c | 444 +++++++++++ + arch/c6x/platforms/plldata.c | 404 ++++++++++ + arch/c6x/platforms/timer64.c | 236 ++++++ + include/asm-generic/io.h | 2 +- + include/asm-generic/page.h | 10 +- + include/asm-generic/uaccess.h | 7 +- + include/linux/elf-em.h | 1 + + 126 files changed, 12972 insertions(+), 5 deletions(-) + create mode 100644 Documentation/devicetree/bindings/c6x/clocks.txt + create mode 100644 Documentation/devicetree/bindings/c6x/dscr.txt + create mode 100644 Documentation/devicetree/bindings/c6x/emifa.txt + create mode 100644 Documentation/devicetree/bindings/c6x/interrupt.txt + create mode 100644 Documentation/devicetree/bindings/c6x/soc.txt + create mode 100644 Documentation/devicetree/bindings/c6x/timer64.txt + create mode 100644 arch/c6x/Kconfig + create mode 100644 arch/c6x/Makefile + create mode 100644 arch/c6x/boot/Makefile + create mode 100644 arch/c6x/boot/dts/dsk6455.dts + create mode 100644 arch/c6x/boot/dts/evmc6457.dts + create mode 100644 arch/c6x/boot/dts/evmc6472.dts + create mode 100644 arch/c6x/boot/dts/evmc6474.dts + create mode 100644 arch/c6x/boot/dts/tms320c6455.dtsi + create mode 100644 arch/c6x/boot/dts/tms320c6457.dtsi + create mode 100644 arch/c6x/boot/dts/tms320c6472.dtsi + create mode 100644 arch/c6x/boot/dts/tms320c6474.dtsi + create mode 100644 arch/c6x/boot/linked_dtb.S + create mode 100644 arch/c6x/configs/dsk6455_defconfig + create mode 100644 arch/c6x/configs/evmc6457_defconfig + create mode 100644 arch/c6x/configs/evmc6472_defconfig + create mode 100644 arch/c6x/configs/evmc6474_defconfig + create mode 100644 arch/c6x/include/asm/Kbuild + create mode 100644 arch/c6x/include/asm/asm-offsets.h + create mode 100644 arch/c6x/include/asm/bitops.h + create mode 100644 arch/c6x/include/asm/byteorder.h + create mode 100644 arch/c6x/include/asm/cache.h + create mode 100644 arch/c6x/include/asm/cacheflush.h + create mode 100644 arch/c6x/include/asm/checksum.h + create mode 100644 arch/c6x/include/asm/clkdev.h + create mode 100644 arch/c6x/include/asm/clock.h + create mode 100644 arch/c6x/include/asm/delay.h + create mode 100644 arch/c6x/include/asm/dma-mapping.h + create mode 100644 arch/c6x/include/asm/dscr.h + create mode 100644 arch/c6x/include/asm/elf.h + create mode 100644 arch/c6x/include/asm/ftrace.h + create mode 100644 arch/c6x/include/asm/hardirq.h + create mode 100644 arch/c6x/include/asm/irq.h + create mode 100644 arch/c6x/include/asm/irqflags.h + create mode 100644 arch/c6x/include/asm/linkage.h + create mode 100644 arch/c6x/include/asm/megamod-pic.h + create mode 100644 arch/c6x/include/asm/memblock.h + create mode 100644 arch/c6x/include/asm/mmu.h + create mode 100644 arch/c6x/include/asm/module.h + create mode 100644 arch/c6x/include/asm/mutex.h + create mode 100644 arch/c6x/include/asm/page.h + create mode 100644 arch/c6x/include/asm/pgtable.h + create mode 100644 arch/c6x/include/asm/processor.h + create mode 100644 arch/c6x/include/asm/procinfo.h + create mode 100644 arch/c6x/include/asm/prom.h + create mode 100644 arch/c6x/include/asm/ptrace.h + create mode 100644 arch/c6x/include/asm/sections.h + create mode 100644 arch/c6x/include/asm/setup.h + create mode 100644 arch/c6x/include/asm/sigcontext.h + create mode 100644 arch/c6x/include/asm/signal.h + create mode 100644 arch/c6x/include/asm/soc.h + create mode 100644 arch/c6x/include/asm/string.h + create mode 100644 arch/c6x/include/asm/swab.h + create mode 100644 arch/c6x/include/asm/syscall.h + create mode 100644 arch/c6x/include/asm/syscalls.h + create mode 100644 arch/c6x/include/asm/system.h + create mode 100644 arch/c6x/include/asm/thread_info.h + create mode 100644 arch/c6x/include/asm/timer64.h + create mode 100644 arch/c6x/include/asm/timex.h + create mode 100644 arch/c6x/include/asm/tlb.h + create mode 100644 arch/c6x/include/asm/traps.h + create mode 100644 arch/c6x/include/asm/uaccess.h + create mode 100644 arch/c6x/include/asm/unaligned.h + create mode 100644 arch/c6x/include/asm/unistd.h + create mode 100644 arch/c6x/kernel/Makefile + create mode 100644 arch/c6x/kernel/asm-offsets.c + create mode 100644 arch/c6x/kernel/c6x_ksyms.c + create mode 100644 arch/c6x/kernel/devicetree.c + create mode 100644 arch/c6x/kernel/dma.c + create mode 100644 arch/c6x/kernel/entry.S + create mode 100644 arch/c6x/kernel/head.S + create mode 100644 arch/c6x/kernel/irq.c + create mode 100644 arch/c6x/kernel/module.c + create mode 100644 arch/c6x/kernel/process.c + create mode 100644 arch/c6x/kernel/ptrace.c + create mode 100644 arch/c6x/kernel/setup.c + create mode 100644 arch/c6x/kernel/signal.c + create mode 100644 arch/c6x/kernel/soc.c + create mode 100644 arch/c6x/kernel/switch_to.S + create mode 100644 arch/c6x/kernel/sys_c6x.c + create mode 100644 arch/c6x/kernel/time.c + create mode 100644 arch/c6x/kernel/traps.c + create mode 100644 arch/c6x/kernel/vectors.S + create mode 100644 arch/c6x/kernel/vmlinux.lds.S + create mode 100644 arch/c6x/lib/Makefile + create mode 100644 arch/c6x/lib/checksum.c + create mode 100644 arch/c6x/lib/csum_64plus.S + create mode 100644 arch/c6x/lib/divi.S + create mode 100644 arch/c6x/lib/divremi.S + create mode 100644 arch/c6x/lib/divremu.S + create mode 100644 arch/c6x/lib/divu.S + create mode 100644 arch/c6x/lib/llshl.S + create mode 100644 arch/c6x/lib/llshr.S + create mode 100644 arch/c6x/lib/llshru.S + create mode 100644 arch/c6x/lib/memcpy_64plus.S + create mode 100644 arch/c6x/lib/mpyll.S + create mode 100644 arch/c6x/lib/negll.S + create mode 100644 arch/c6x/lib/pop_rts.S + create mode 100644 arch/c6x/lib/push_rts.S + create mode 100644 arch/c6x/lib/remi.S + create mode 100644 arch/c6x/lib/remu.S + create mode 100644 arch/c6x/lib/strasgi.S + create mode 100644 arch/c6x/lib/strasgi_64plus.S + create mode 100644 arch/c6x/mm/Makefile + create mode 100644 arch/c6x/mm/dma-coherent.c + create mode 100644 arch/c6x/mm/init.c + create mode 100644 arch/c6x/platforms/Kconfig + create mode 100644 arch/c6x/platforms/Makefile + create mode 100644 arch/c6x/platforms/cache.c + create mode 100644 arch/c6x/platforms/dscr.c + create mode 100644 arch/c6x/platforms/emif.c + create mode 100644 arch/c6x/platforms/megamod-pic.c + create mode 100644 arch/c6x/platforms/platform.c + create mode 100644 arch/c6x/platforms/pll.c + create mode 100644 arch/c6x/platforms/plldata.c + create mode 100644 arch/c6x/platforms/timer64.c +Merging cris/for-next (ea78f5b CRIS: Update documentation) +$ git merge cris/for-next +Auto-merging drivers/net/cris/eth_v10.c +Auto-merging arch/cris/arch-v32/drivers/cryptocop.c +Merge made by the 'recursive' strategy. + Documentation/cris/README | 62 +++++++++++++++--------------- + arch/cris/arch-v32/drivers/cryptocop.c | 6 +-- + arch/cris/arch-v32/kernel/ptrace.c | 2 - + arch/cris/include/arch-v32/arch/cache.h | 2 +- + drivers/net/cris/eth_v10.c | 1 - + 5 files changed, 34 insertions(+), 39 deletions(-) +Merging quilt/hexagon (976d167 Linux 3.1-rc9) +$ git merge quilt/hexagon +Already up-to-date. +Merging ia64/next (0f6a1c0 Pull misc-3.2 into next branch) +$ git merge ia64/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging m68k/for-next (2f0084b m68k/atari: Move declaration of atari_SCC_reset_done to header file) +$ git merge m68k/for-next +Merge made by the 'recursive' strategy. + arch/m68k/Kconfig.debug | 11 ++ + arch/m68k/Kconfig.devices | 2 +- + arch/m68k/atari/ataints.c | 2 - + arch/m68k/atari/debug.c | 1 - + arch/m68k/configs/multi_defconfig | 1 - + arch/m68k/configs/mvme16x_defconfig | 1 - + arch/m68k/emu/nfeth.c | 2 +- + arch/m68k/hp300/config.c | 3 +- + arch/m68k/include/asm/atarihw.h | 2 + + arch/m68k/include/asm/blinken.h | 8 +- + arch/m68k/include/asm/mac_baboon.h | 6 + + arch/m68k/include/asm/mac_iop.h | 2 + + arch/m68k/include/asm/mac_oss.h | 23 +--- + arch/m68k/include/asm/mac_psc.h | 4 + + arch/m68k/include/asm/mac_via.h | 9 ++ + arch/m68k/include/asm/macintosh.h | 10 +- + arch/m68k/include/asm/macints.h | 6 +- + arch/m68k/include/asm/serial.h | 2 + + arch/m68k/kernel/head.S | 117 ++++++++-------- + arch/m68k/mac/baboon.c | 41 +----- + arch/m68k/mac/config.c | 93 +++++++++----- + arch/m68k/mac/iop.c | 8 +- + arch/m68k/mac/macints.c | 197 +++++++-------------------- + arch/m68k/mac/oss.c | 157 +++++++-------------- + arch/m68k/mac/psc.c | 17 --- + arch/m68k/mac/via.c | 255 +++++++++++++++++------------------ + arch/m68k/mvme16x/config.c | 160 ++++++++++++++++++++++ + drivers/block/swim.c | 1 - + drivers/scsi/mac_esp.c | 3 +- + 29 files changed, 569 insertions(+), 575 deletions(-) +Merging m68knommu/for-next (8de5bbd m68k: make fp register stores consistent for m68k and ColdFire) +$ git merge m68knommu/for-next +Recorded preimage for 'arch/m68k/Kconfig.debug' +Resolved 'arch/m68k/Kconfig' using previous resolution. +Resolved 'arch/m68k/kernel/Makefile' using previous resolution. +Auto-merging arch/m68k/kernel/entry_mm.S +Auto-merging arch/m68k/kernel/Makefile +CONFLICT (content): Merge conflict in arch/m68k/kernel/Makefile +Auto-merging arch/m68k/Kconfig.debug +CONFLICT (content): Merge conflict in arch/m68k/Kconfig.debug +Auto-merging arch/m68k/Kconfig +CONFLICT (content): Merge conflict in arch/m68k/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/m68k/Kconfig.debug'. +[master d745a05] Merge remote-tracking branch 'm68knommu/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/m68k/Kconfig | 1 - + arch/m68k/Kconfig.cpu | 4 +++ + arch/m68k/Kconfig.debug | 16 +++++++------- + arch/m68k/include/asm/div64.h | 8 +++--- + arch/m68k/include/asm/gpio.h | 3 +- + arch/m68k/include/asm/processor.h | 2 - + arch/m68k/include/asm/sigcontext.h | 4 --- + arch/m68k/include/asm/thread_info.h | 30 --------------------------- + arch/m68k/include/asm/traps.h | 1 + + arch/m68k/include/asm/ucontext.h | 4 --- + arch/m68k/kernel/Makefile | 8 +----- + arch/m68k/kernel/asm-offsets.c | 3 +- + arch/m68k/kernel/entry_mm.S | 31 +++++++++++++++++++--------- + arch/m68k/kernel/entry_no.S | 6 ----- + arch/m68k/kernel/init_task.c | 3 +- + arch/m68k/kernel/process_mm.c | 16 -------------- + arch/m68k/kernel/setup_mm.c | 4 +++ + arch/m68k/kernel/setup_no.c | 1 - + arch/m68k/kernel/time_no.c | 3 ++ + arch/m68k/kernel/vmlinux-std.lds | 2 + + arch/m68k/kernel/vmlinux-sun3.lds | 2 + + arch/m68k/mm/init_mm.c | 34 +++++++++++++++++++++++++++++++ + arch/m68k/platform/68328/timers.c | 4 +-- + arch/m68k/platform/coldfire/dma_timer.c | 5 +--- + arch/m68k/platform/coldfire/entry.S | 1 - + arch/m68k/platform/coldfire/pit.c | 4 +-- + arch/m68k/platform/coldfire/sltimers.c | 4 +-- + arch/m68k/platform/coldfire/timers.c | 4 +-- + 28 files changed, 94 insertions(+), 114 deletions(-) +Merging microblaze/next (3155521 Revert "hvc_console: display printk messages on console.") +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (b4f13a2 Merge branch 'bmips' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Removing drivers/pcmcia/au1000_pb1x00.c +Removing drivers/pcmcia/au1000_generic.h +Removing drivers/pcmcia/au1000_generic.c +Removing drivers/net/irda/au1000_ircc.h +Removing arch/mips/nxp/pnx8550/common/setup.c +Removing arch/mips/nxp/pnx8550/common/pci.c +Removing arch/mips/include/asm/mach-pb1x00/pb1550.h +Removing arch/mips/include/asm/mach-pb1x00/pb1200.h +Removing arch/mips/include/asm/mach-pb1x00/pb1000.h +Removing arch/mips/include/asm/mach-pb1x00/mc146818rtc.h +Removing arch/mips/include/asm/mach-db1x00/db1x00.h +Removing arch/mips/configs/pb1200_defconfig +Removing arch/mips/configs/db1500_defconfig +Removing arch/mips/configs/db1100_defconfig +Removing arch/mips/alchemy/xxs1500/platform.c +Removing arch/mips/alchemy/xxs1500/init.c +Removing arch/mips/alchemy/xxs1500/board_setup.c +Removing arch/mips/alchemy/xxs1500/Makefile +Removing arch/mips/alchemy/mtx-1/init.c +Removing arch/mips/alchemy/mtx-1/board_setup.c +Removing arch/mips/alchemy/mtx-1/Makefile +Removing arch/mips/alchemy/gpr/init.c +Removing arch/mips/alchemy/gpr/board_setup.c +Removing arch/mips/alchemy/gpr/Makefile +Removing arch/mips/alchemy/devboards/pb1550/board_setup.c +Removing arch/mips/alchemy/devboards/pb1550/Makefile +Auto-merging arch/mips/alchemy/devboards/pb1550.c +Removing arch/mips/alchemy/devboards/pb1500/platform.c +Removing arch/mips/alchemy/devboards/pb1500/Makefile +Auto-merging arch/mips/alchemy/devboards/pb1500.c +Removing arch/mips/alchemy/devboards/pb1200/platform.c +Removing arch/mips/alchemy/devboards/pb1200/board_setup.c +Removing arch/mips/alchemy/devboards/pb1200/Makefile +Removing arch/mips/alchemy/devboards/pb1100/platform.c +Removing arch/mips/alchemy/devboards/pb1100/Makefile +Auto-merging arch/mips/alchemy/devboards/pb1100.c +Removing arch/mips/alchemy/devboards/pb1000/board_setup.c +Removing arch/mips/alchemy/devboards/pb1000/Makefile +Removing arch/mips/alchemy/devboards/db1x00/platform.c +Removing arch/mips/alchemy/devboards/db1x00/board_setup.c +Removing arch/mips/alchemy/devboards/db1x00/Makefile +Removing arch/mips/alchemy/devboards/db1200/setup.c +Removing arch/mips/alchemy/devboards/db1200/Makefile +Auto-merging arch/mips/alchemy/devboards/db1200.c +Auto-merging arch/mips/alchemy/board-mtx1.c +Auto-merging arch/mips/alchemy/board-gpr.c +Auto-merging arch/mips/Makefile +Merge made by the 'recursive' strategy. + arch/mips/Kconfig | 38 +- + arch/mips/Makefile | 1 + + arch/mips/alchemy/Kconfig | 60 +- + arch/mips/alchemy/Makefile | 3 + + arch/mips/alchemy/Platform | 58 +- + arch/mips/alchemy/{gpr/platform.c => board-gpr.c} | 81 ++- + .../alchemy/{mtx-1/platform.c => board-mtx1.c} | 93 ++- + arch/mips/alchemy/board-xxs1500.c | 154 +++ + arch/mips/alchemy/common/Makefile | 4 +- + arch/mips/alchemy/common/dbdma.c | 49 +- + arch/mips/alchemy/common/gpiolib.c | 42 + + arch/mips/alchemy/common/irq.c | 875 ++++++++++----- + arch/mips/alchemy/common/platform.c | 31 +- + arch/mips/alchemy/common/power.c | 3 + + arch/mips/alchemy/common/sleeper.S | 73 ++ + arch/mips/alchemy/common/time.c | 3 +- + arch/mips/alchemy/common/vss.c | 84 ++ + arch/mips/alchemy/devboards/Makefile | 19 +- + arch/mips/alchemy/devboards/bcsr.c | 11 +- + arch/mips/alchemy/devboards/db1000.c | 565 +++++++++ + .../devboards/{db1200/platform.c => db1200.c} | 387 ++++++- + arch/mips/alchemy/devboards/db1200/Makefile | 1 - + arch/mips/alchemy/devboards/db1200/setup.c | 81 -- + arch/mips/alchemy/devboards/db1300.c | 785 +++++++++++++ + arch/mips/alchemy/devboards/db1550.c | 498 ++++++++ + arch/mips/alchemy/devboards/db1x00/Makefile | 8 - + arch/mips/alchemy/devboards/db1x00/board_setup.c | 229 ---- + arch/mips/alchemy/devboards/db1x00/platform.c | 316 ----- + arch/mips/alchemy/devboards/pb1000/Makefile | 8 - + arch/mips/alchemy/devboards/pb1000/board_setup.c | 209 ---- + .../devboards/{pb1100/board_setup.c => pb1100.c} | 92 ++- + arch/mips/alchemy/devboards/pb1100/Makefile | 8 - + arch/mips/alchemy/devboards/pb1100/platform.c | 77 -- + arch/mips/alchemy/devboards/pb1200/Makefile | 5 - + arch/mips/alchemy/devboards/pb1200/board_setup.c | 174 --- + arch/mips/alchemy/devboards/pb1200/platform.c | 339 ------ + .../devboards/{pb1500/board_setup.c => pb1500.c} | 113 ++- + arch/mips/alchemy/devboards/pb1500/Makefile | 8 - + arch/mips/alchemy/devboards/pb1500/platform.c | 94 -- + .../devboards/{pb1550/platform.c => pb1550.c} | 112 ++- + arch/mips/alchemy/devboards/pb1550/Makefile | 8 - + arch/mips/alchemy/devboards/pb1550/board_setup.c | 80 -- + arch/mips/alchemy/devboards/platform.c | 13 +- + arch/mips/alchemy/devboards/prom.c | 11 +- + arch/mips/alchemy/gpr/Makefile | 8 - + arch/mips/alchemy/gpr/board_setup.c | 75 -- + arch/mips/alchemy/gpr/init.c | 63 - + arch/mips/alchemy/mtx-1/Makefile | 9 - + arch/mips/alchemy/mtx-1/board_setup.c | 94 -- + arch/mips/alchemy/mtx-1/init.c | 66 -- + arch/mips/alchemy/xxs1500/Makefile | 8 - + arch/mips/alchemy/xxs1500/board_setup.c | 93 -- + arch/mips/alchemy/xxs1500/init.c | 63 - + arch/mips/alchemy/xxs1500/platform.c | 63 - + arch/mips/boot/compressed/uart-alchemy.c | 5 +- + arch/mips/cavium-octeon/flash_setup.c | 9 +- + arch/mips/cavium-octeon/setup.c | 8 - + arch/mips/cavium-octeon/smp.c | 5 +- + arch/mips/configs/db1000_defconfig | 369 +++++- + arch/mips/configs/db1100_defconfig | 122 -- + arch/mips/configs/db1300_defconfig | 391 +++++++ + arch/mips/configs/db1500_defconfig | 128 -- + arch/mips/configs/db1550_defconfig | 288 ++++-- + arch/mips/configs/pb1200_defconfig | 170 --- + arch/mips/dec/setup.c | 1 - + arch/mips/emma/common/prom.c | 2 +- + arch/mips/include/asm/bmips.h | 110 ++ + arch/mips/include/asm/bootinfo.h | 1 + + arch/mips/include/asm/cpu.h | 1 + + arch/mips/include/asm/gio_device.h | 56 + + arch/mips/include/asm/hazards.h | 7 +- + arch/mips/include/asm/hugetlb.h | 2 +- + arch/mips/include/asm/mach-au1x00/au1000.h | 273 ++++- + arch/mips/include/asm/mach-au1x00/au1100_mmc.h | 2 + + arch/mips/include/asm/mach-au1x00/au1200fb.h | 14 + + arch/mips/include/asm/mach-au1x00/au1550nd.h | 16 + + arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h | 31 + + arch/mips/include/asm/mach-au1x00/gpio-au1300.h | 241 ++++ + arch/mips/include/asm/mach-au1x00/gpio.h | 3 + + arch/mips/include/asm/mach-bcm47xx/gpio.h | 18 +- + arch/mips/include/asm/mach-db1x00/bcsr.h | 36 +- + arch/mips/include/asm/mach-db1x00/db1200.h | 11 +- + arch/mips/include/asm/mach-db1x00/db1300.h | 40 + + arch/mips/include/asm/mach-db1x00/db1x00.h | 79 -- + arch/mips/include/asm/mach-db1x00/irq.h | 23 + + arch/mips/include/asm/mach-generic/floppy.h | 2 +- + arch/mips/include/asm/mach-jazz/floppy.h | 2 +- + .../asm/mach-netlogic/cpu-feature-overrides.h | 5 +- + arch/mips/include/asm/mach-pb1x00/mc146818rtc.h | 34 - + arch/mips/include/asm/mach-pb1x00/pb1000.h | 87 -- + arch/mips/include/asm/mach-pb1x00/pb1200.h | 139 --- + arch/mips/include/asm/mach-pb1x00/pb1550.h | 73 -- + arch/mips/include/asm/mipsregs.h | 9 +- + arch/mips/include/asm/module.h | 2 + + arch/mips/include/asm/netlogic/xlr/msidef.h | 84 ++ + arch/mips/include/asm/traps.h | 13 + + arch/mips/include/asm/unistd.h | 18 +- + arch/mips/jazz/irq.c | 2 +- + arch/mips/kernel/Makefile | 1 + + arch/mips/kernel/bmips_vec.S | 255 ++++ + arch/mips/kernel/cevt-bcm1480.c | 2 +- + arch/mips/kernel/cevt-ds1287.c | 2 +- + arch/mips/kernel/cevt-gt641xx.c | 2 +- + arch/mips/kernel/cevt-r4k.c | 40 +- + arch/mips/kernel/cevt-sb1250.c | 2 +- + arch/mips/kernel/cevt-txx9.c | 2 +- + arch/mips/kernel/cpu-probe.c | 8 + + arch/mips/kernel/cpufreq/loongson2_clock.c | 1 + + arch/mips/kernel/i8253.c | 2 +- + arch/mips/kernel/rtlx.c | 1 - + arch/mips/kernel/scall32-o32.S | 2 + + arch/mips/kernel/scall64-64.S | 2 + + arch/mips/kernel/scall64-n32.S | 2 + + arch/mips/kernel/scall64-o32.S | 2 + + arch/mips/kernel/setup.c | 43 +- + arch/mips/kernel/smp-bmips.c | 457 ++++++++ + arch/mips/kernel/smtc.c | 2 +- + arch/mips/kernel/traps.c | 15 +- + arch/mips/lantiq/irq.c | 1 - + arch/mips/loongson/common/cs5536/cs5536_mfgpt.c | 2 +- + arch/mips/mm/Makefile | 4 +- + arch/mips/mm/gup.c | 315 +++++ + arch/mips/mm/init.c | 9 +- + arch/mips/mti-malta/malta-int.c | 4 +- + arch/mips/netlogic/Platform | 2 +- + arch/mips/netlogic/xlr/irq.c | 5 + + arch/mips/nxp/pnx8550/common/pci.c | 134 --- + arch/mips/nxp/pnx8550/common/setup.c | 143 --- + arch/mips/pci/ops-pmcmsp.c | 2 +- + arch/mips/pci/ops-tx3927.c | 2 +- + arch/mips/pci/pci-alchemy.c | 1 + + arch/mips/pci/pci-tx4927.c | 2 +- + arch/mips/pci/pci-tx4938.c | 2 +- + arch/mips/pci/pci-tx4939.c | 2 +- + arch/mips/pci/pci-xlr.c | 51 +- + arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c | 2 +- + arch/mips/pmc-sierra/msp71xx/msp_smp.c | 4 +- + arch/mips/pmc-sierra/yosemite/prom.c | 2 +- + arch/mips/pnx8550/common/int.c | 4 +- + arch/mips/pnx8550/common/time.c | 4 +- + arch/mips/sgi-ip22/Makefile | 2 +- + arch/mips/sgi-ip22/ip22-gio.c | 427 +++++++ + arch/mips/sgi-ip22/ip22-int.c | 10 +- + arch/mips/sgi-ip22/ip22-mc.c | 10 +- + arch/mips/sgi-ip22/ip22-setup.c | 21 - + arch/mips/sgi-ip27/ip27-irq.c | 2 +- + arch/mips/sgi-ip27/ip27-timer.c | 2 +- + arch/mips/sgi-ip32/ip32-irq.c | 2 - + arch/mips/sni/irq.c | 2 +- + arch/mips/sni/time.c | 2 +- + arch/mips/txx9/generic/pci.c | 2 +- + drivers/i2c/busses/Kconfig | 4 +- + drivers/mmc/host/au1xmmc.c | 45 +- + drivers/mtd/nand/au1550nd.c | 308 +++--- + drivers/net/irda/Kconfig | 6 +- + drivers/net/irda/au1000_ircc.h | 125 -- + drivers/net/irda/au1k_ir.c | 1229 +++++++++++--------- + drivers/pcmcia/Kconfig | 8 +- + drivers/pcmcia/Makefile | 4 - + drivers/pcmcia/au1000_generic.c | 545 --------- + drivers/pcmcia/au1000_generic.h | 135 --- + drivers/pcmcia/au1000_pb1x00.c | 294 ----- + drivers/pcmcia/db1xxx_ss.c | 26 +- + drivers/spi/Kconfig | 4 +- + drivers/staging/octeon/ethernet-tx.c | 2 +- + drivers/usb/host/alchemy-common.c | 277 +++++ + drivers/usb/host/ohci-au1xxx.c | 13 +- + drivers/video/Kconfig | 8 +- + drivers/video/au1100fb.c | 12 - + drivers/video/au1200fb.c | 273 +++-- + drivers/video/console/newport_con.c | 63 +- + sound/soc/au1x/Kconfig | 14 +- + sound/soc/au1x/db1200.c | 73 ++- + 173 files changed, 8658 insertions(+), 6209 deletions(-) + create mode 100644 arch/mips/alchemy/Makefile + rename arch/mips/alchemy/{gpr/platform.c => board-gpr.c} (75%) + rename arch/mips/alchemy/{mtx-1/platform.c => board-mtx1.c} (71%) + create mode 100644 arch/mips/alchemy/board-xxs1500.c + create mode 100644 arch/mips/alchemy/common/vss.c + create mode 100644 arch/mips/alchemy/devboards/db1000.c + rename arch/mips/alchemy/devboards/{db1200/platform.c => db1200.c} (63%) + delete mode 100644 arch/mips/alchemy/devboards/db1200/Makefile + delete mode 100644 arch/mips/alchemy/devboards/db1200/setup.c + create mode 100644 arch/mips/alchemy/devboards/db1300.c + create mode 100644 arch/mips/alchemy/devboards/db1550.c + delete mode 100644 arch/mips/alchemy/devboards/db1x00/Makefile + delete mode 100644 arch/mips/alchemy/devboards/db1x00/board_setup.c + delete mode 100644 arch/mips/alchemy/devboards/db1x00/platform.c + delete mode 100644 arch/mips/alchemy/devboards/pb1000/Makefile + delete mode 100644 arch/mips/alchemy/devboards/pb1000/board_setup.c + rename arch/mips/alchemy/devboards/{pb1100/board_setup.c => pb1100.c} (55%) + delete mode 100644 arch/mips/alchemy/devboards/pb1100/Makefile + delete mode 100644 arch/mips/alchemy/devboards/pb1100/platform.c + delete mode 100644 arch/mips/alchemy/devboards/pb1200/Makefile + delete mode 100644 arch/mips/alchemy/devboards/pb1200/board_setup.c + delete mode 100644 arch/mips/alchemy/devboards/pb1200/platform.c + rename arch/mips/alchemy/devboards/{pb1500/board_setup.c => pb1500.c} (51%) + delete mode 100644 arch/mips/alchemy/devboards/pb1500/Makefile + delete mode 100644 arch/mips/alchemy/devboards/pb1500/platform.c + rename arch/mips/alchemy/devboards/{pb1550/platform.c => pb1550.c} (61%) + delete mode 100644 arch/mips/alchemy/devboards/pb1550/Makefile + delete mode 100644 arch/mips/alchemy/devboards/pb1550/board_setup.c + delete mode 100644 arch/mips/alchemy/gpr/Makefile + delete mode 100644 arch/mips/alchemy/gpr/board_setup.c + delete mode 100644 arch/mips/alchemy/gpr/init.c + delete mode 100644 arch/mips/alchemy/mtx-1/Makefile + delete mode 100644 arch/mips/alchemy/mtx-1/board_setup.c + delete mode 100644 arch/mips/alchemy/mtx-1/init.c + delete mode 100644 arch/mips/alchemy/xxs1500/Makefile + delete mode 100644 arch/mips/alchemy/xxs1500/board_setup.c + delete mode 100644 arch/mips/alchemy/xxs1500/init.c + delete mode 100644 arch/mips/alchemy/xxs1500/platform.c + delete mode 100644 arch/mips/configs/db1100_defconfig + create mode 100644 arch/mips/configs/db1300_defconfig + delete mode 100644 arch/mips/configs/db1500_defconfig + delete mode 100644 arch/mips/configs/pb1200_defconfig + create mode 100644 arch/mips/include/asm/bmips.h + create mode 100644 arch/mips/include/asm/gio_device.h + create mode 100644 arch/mips/include/asm/mach-au1x00/au1200fb.h + create mode 100644 arch/mips/include/asm/mach-au1x00/au1550nd.h + create mode 100644 arch/mips/include/asm/mach-au1x00/gpio-au1300.h + create mode 100644 arch/mips/include/asm/mach-db1x00/db1300.h + delete mode 100644 arch/mips/include/asm/mach-db1x00/db1x00.h + create mode 100644 arch/mips/include/asm/mach-db1x00/irq.h + delete mode 100644 arch/mips/include/asm/mach-pb1x00/mc146818rtc.h + delete mode 100644 arch/mips/include/asm/mach-pb1x00/pb1000.h + delete mode 100644 arch/mips/include/asm/mach-pb1x00/pb1200.h + delete mode 100644 arch/mips/include/asm/mach-pb1x00/pb1550.h + create mode 100644 arch/mips/include/asm/netlogic/xlr/msidef.h + create mode 100644 arch/mips/kernel/bmips_vec.S + create mode 100644 arch/mips/kernel/smp-bmips.c + create mode 100644 arch/mips/mm/gup.c + delete mode 100644 arch/mips/nxp/pnx8550/common/pci.c + delete mode 100644 arch/mips/nxp/pnx8550/common/setup.c + create mode 100644 arch/mips/sgi-ip22/ip22-gio.c + delete mode 100644 drivers/net/irda/au1000_ircc.h + delete mode 100644 drivers/pcmcia/au1000_generic.c + delete mode 100644 drivers/pcmcia/au1000_generic.h + delete mode 100644 drivers/pcmcia/au1000_pb1x00.c +Merging openrisc/for-upstream (b6fd41e Linux 3.1-rc6) +$ git merge openrisc/for-upstream +Already up-to-date. +Merging parisc/for-next (fc99a91 futex: Use same lock set as lws calls) +$ git merge parisc/for-next +Merge made by the 'recursive' strategy. + arch/parisc/include/asm/futex.h | 31 +++++++++++++++++++++++++++---- + 1 files changed, 27 insertions(+), 4 deletions(-) +Merging powerpc/next (96cc017 powerpc/p3060qds: Add support for P3060QDS board) +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next (9fcd768 powerpc/40x: Remove obsolete HCU4 board) +$ git merge 4xx/next +Already up-to-date. +Merging 52xx-and-virtex/powerpc/next (c1395f4 dtc/powerpc: remove obsolete .gitignore entries) +$ git merge 52xx-and-virtex/powerpc/next +Merge made by the 'recursive' strategy. +Merging galak/next (96cc017 powerpc/p3060qds: Add support for P3060QDS board) +$ git merge galak/next +Already up-to-date. +Merging s390/features (1082855 [S390] kernel: Fix smp_switch_to_ipl_cpu() stack frame setup) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 1 + + arch/s390/crypto/crypt_s390.h | 7 ++- + arch/s390/include/asm/pgtable.h | 35 ++++------- + arch/s390/include/asm/setup.h | 3 + + arch/s390/include/asm/sparsemem.h | 4 +- + arch/s390/include/asm/timex.h | 2 +- + arch/s390/include/asm/unistd.h | 4 +- + arch/s390/kernel/compat_wrapper.S | 20 ++++++ + arch/s390/kernel/early.c | 2 + + arch/s390/kernel/mem_detect.c | 122 ++++++++++++++++++++----------------- + arch/s390/kernel/setup.c | 72 +++++++++++++++++----- + arch/s390/kernel/smp.c | 4 +- + arch/s390/kernel/syscalls.S | 2 + + arch/s390/kernel/topology.c | 45 ++++++++++++-- + arch/s390/kernel/vmlinux.lds.S | 2 + + arch/s390/mm/fault.c | 9 ++- + arch/s390/mm/init.c | 16 +++-- + arch/s390/mm/pgtable.c | 11 --- + drivers/s390/char/zcore.c | 2 + + drivers/s390/crypto/ap_bus.c | 23 +++++-- + 20 files changed, 252 insertions(+), 134 deletions(-) +Merging sh/sh-latest (b9a3acf Merge branch 'sh/stable-updates' into sh-latest) +$ git merge sh/sh-latest +Already up-to-date. +Merging rmobile/rmobile-latest (b58c580 Merge branch 'rmobile-fixes-for-linus' into rmobile-latest) +$ git merge rmobile/rmobile-latest +Already up-to-date. +Merging sparc-next/master (3ee72ca Merge git://github.com/davem330/net) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (1583171 Merge branch 'for-linus' of git://github.com/cmetcalf-tilera/linux-tile) +$ git merge tile/master +Already up-to-date. +Merging unicore32/unicore32 (10967fd arch/unicore32: do not use EXTRA_AFLAGS or EXTRA_CFLAGS) +$ git merge unicore32/unicore32 +Merge made by the 'recursive' strategy. + arch/unicore32/boot/compressed/Makefile | 4 ++-- + arch/unicore32/include/asm/bitops.h | 12 ++++++------ + arch/unicore32/kernel/ksyms.c | 4 ++-- + arch/unicore32/lib/findbit.S | 14 ++++++++------ + 4 files changed, 18 insertions(+), 16 deletions(-) +Merging xtensa/master (29aced6 xtensa: remove defining register numbers) +$ git merge xtensa/master +Merge made by the 'recursive' strategy. + arch/xtensa/include/asm/irqflags.h | 1 + + arch/xtensa/include/asm/regs.h | 91 ++++++++++++++++++--------------- + arch/xtensa/include/asm/timex.h | 4 +- + arch/xtensa/include/asm/uaccess.h | 2 +- + arch/xtensa/kernel/align.S | 14 +++--- + arch/xtensa/kernel/coprocessor.S | 10 ++-- + arch/xtensa/kernel/entry.S | 98 ++++++++++++++++++------------------ + arch/xtensa/kernel/head.S | 12 ++-- + arch/xtensa/kernel/irq.c | 5 ++ + arch/xtensa/kernel/traps.c | 4 +- + arch/xtensa/kernel/vectors.S | 22 ++++---- + arch/xtensa/kernel/vmlinux.lds.S | 1 + + 12 files changed, 139 insertions(+), 125 deletions(-) +Merging ceph/for-next (3395734 libceph: fix double-free of page vector) +$ git merge ceph/for-next +Already up-to-date. +Merging cifs/master (9c32c63 cifs: Fix sparse warning when calling cifs_strtoUCS) +$ git merge cifs/master +Merge made by the 'recursive' strategy. + fs/cifs/file.c | 26 ++++++++++++++++++++++++++ + fs/cifs/smbencrypt.c | 6 +++--- + 2 files changed, 29 insertions(+), 3 deletions(-) +Merging configfs/linux-next (420118c configfs: Rework configfs_depend_item() locking and make lockdep happy) +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next (985ca0e ecryptfs: Make inode bdi consistent with superblock bdi) +$ git merge ecryptfs/next +Already up-to-date. +Merging ext3/for_next (ed47a7d udf: Cleanup metadata flags handling) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (5c8a0fb VFS: fix statfs() automounter semantics regression) +$ git merge ext4/dev +Already up-to-date. +Merging fatfs/master (710d440 fat: fat16 support maximum 4GB file/vol size as WinXP or 7.) +$ git merge fatfs/master +Already up-to-date. +Merging fuse/for-next (c2183d1 fuse: check size of FUSE_NOTIFY_INVAL_ENTRY message) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master (79c4c37 GFS2: f_ra is always valid in dir readahead function) +$ git merge gfs2/master +Merge made by the 'recursive' strategy. + fs/gfs2/bmap.c | 3 -- + fs/gfs2/dir.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++-- + fs/gfs2/dir.h | 2 +- + fs/gfs2/export.c | 3 +- + fs/gfs2/file.c | 4 +- + fs/gfs2/inode.c | 9 +++++-- + fs/gfs2/log.c | 2 +- + fs/gfs2/meta_io.c | 4 +- + fs/gfs2/ops_fstype.c | 2 +- + fs/gfs2/quota.c | 2 +- + fs/gfs2/xattr.c | 7 +++-- + 11 files changed, 75 insertions(+), 21 deletions(-) +Merging hfsplus/for-next (6596528 hfsplus: ensure bio requests are not smaller than the hardware sectors) +$ git merge hfsplus/for-next +Already up-to-date. +Merging jfs/next (1c8007b jfs: flush journal completely before releasing metadata inodes) +$ git merge jfs/next +Already up-to-date. +Merging logfs/master (51b3089 Merge branch 'master' of github.com:prasad-joshi/logfs) +$ git merge logfs/master +Resolved 'fs/logfs/file.c' using previous resolution. +Auto-merging fs/logfs/super.c +Auto-merging fs/logfs/readwrite.c +Auto-merging fs/logfs/logfs.h +Auto-merging fs/logfs/inode.c +Auto-merging fs/logfs/file.c +CONFLICT (content): Merge conflict in fs/logfs/file.c +Auto-merging fs/logfs/dir.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2fac318] Merge remote-tracking branch 'logfs/master' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 1 + + fs/logfs/dev_mtd.c | 26 ++++++++++++-------------- + fs/logfs/dir.c | 2 +- + fs/logfs/file.c | 2 ++ + fs/logfs/inode.c | 4 +++- + fs/logfs/journal.c | 1 - + fs/logfs/logfs.h | 5 ++++- + fs/logfs/readwrite.c | 22 ++++++++++++---------- + fs/logfs/segment.c | 14 ++++++++++---- + fs/logfs/super.c | 3 ++- + 10 files changed, 47 insertions(+), 33 deletions(-) +Merging nfs/linux-next (62e4a76 NFS: Revert pnfs ugliness from the generic NFS read code path) +$ git merge nfs/linux-next +Auto-merging fs/nfs/pnfs.c +Merge made by the 'recursive' strategy. + fs/nfs/dir.c | 2 +- + fs/nfs/file.c | 91 ++++++++++++++++++++++++++-------------------- + fs/nfs/inode.c | 2 +- + fs/nfs/internal.h | 2 + + fs/nfs/nfs3proc.c | 1 + + fs/nfs/nfs4proc.c | 4 +- + fs/nfs/pnfs.c | 26 +++++++++++--- + fs/nfs/proc.c | 1 + + fs/nfs/read.c | 14 +------ + include/linux/nfs_fs.h | 3 ++ + include/linux/nfs_xdr.h | 1 + + net/sunrpc/xprtsock.c | 4 ++- + 12 files changed, 89 insertions(+), 62 deletions(-) +Merging nfsd/nfsd-next (c7e8472 NFSD: Remove unnecessary whitespace) +$ git merge nfsd/nfsd-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + CREDITS | 5 + + Documentation/filesystems/nfs/00-INDEX | 2 + + Documentation/filesystems/nfs/fault_injection.txt | 69 +++++++ + MAINTAINERS | 1 - + fs/nfsd/Kconfig | 10 + + fs/nfsd/Makefile | 1 + + fs/nfsd/fault_inject.c | 91 +++++++++ + fs/nfsd/fault_inject.h | 28 +++ + fs/nfsd/nfs4state.c | 214 +++++++++++++++++---- + fs/nfsd/nfsctl.c | 10 +- + fs/nfsd/nfsd.h | 20 +- + tools/nfsd/inject_fault.sh | 49 +++++ + 12 files changed, 455 insertions(+), 45 deletions(-) + create mode 100644 Documentation/filesystems/nfs/fault_injection.txt + create mode 100644 fs/nfsd/fault_inject.c + create mode 100644 fs/nfsd/fault_inject.h + create mode 100755 tools/nfsd/inject_fault.sh +Merging nilfs2/for-next (93ee7a9 Linux 3.1-rc2) +$ git merge nilfs2/for-next +Already up-to-date. +Merging ocfs2/linux-next (c849cc2 ocfs2: make direntry invalid when deleting it) +$ git merge ocfs2/linux-next +Resolved 'fs/ocfs2/xattr.c' using previous resolution. +Auto-merging fs/ocfs2/xattr.c +CONFLICT (content): Merge conflict in fs/ocfs2/xattr.c +Auto-merging fs/ocfs2/move_extents.c +Auto-merging fs/ocfs2/file.c +Auto-merging fs/ocfs2/dlmglue.c +Auto-merging fs/ocfs2/dir.c +Auto-merging fs/ocfs2/cluster/tcp.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 68fedec] Merge remote-tracking branch 'ocfs2/linux-next' +$ git diff -M --stat --summary HEAD^.. + fs/ocfs2/aops.c | 69 +++++++++++++-- + fs/ocfs2/aops.h | 14 +++ + fs/ocfs2/cluster/heartbeat.c | 194 ++++++++++++++++++++++++++---------------- + fs/ocfs2/cluster/netdebug.c | 102 +++++++++++++++------- + fs/ocfs2/cluster/tcp.c | 138 ++++++++++++++++-------------- + fs/ocfs2/cluster/tcp.h | 2 + + fs/ocfs2/dir.c | 3 +- + fs/ocfs2/dlm/dlmcommon.h | 56 +++---------- + fs/ocfs2/dlm/dlmdomain.c | 44 +++++----- + fs/ocfs2/dlm/dlmlock.c | 54 ++++++------ + fs/ocfs2/dlm/dlmmaster.c | 175 +++++++++++++++++++------------------- + fs/ocfs2/dlm/dlmrecovery.c | 164 ++++++++++++++++++------------------ + fs/ocfs2/dlm/dlmthread.c | 16 ++-- + fs/ocfs2/dlmglue.c | 21 +++-- + fs/ocfs2/extent_map.c | 96 +++++++++++++++++++++ + fs/ocfs2/extent_map.h | 2 + + fs/ocfs2/file.c | 93 ++++++++++++++++++++- + fs/ocfs2/inode.h | 3 + + fs/ocfs2/ioctl.c | 8 +- + fs/ocfs2/journal.c | 23 +++++- + fs/ocfs2/mmap.c | 53 +++++------ + fs/ocfs2/move_extents.c | 2 +- + fs/ocfs2/ocfs2.h | 4 +- + fs/ocfs2/quota_local.c | 13 ++- + fs/ocfs2/slot_map.c | 4 +- + fs/ocfs2/stack_o2cb.c | 71 ++++++++++++++-- + fs/ocfs2/super.c | 23 +++-- + 27 files changed, 926 insertions(+), 521 deletions(-) +Merging omfs/for-next (976d167 Linux 3.1-rc9) +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master (7657cac Squashfs: Add an option to set dev block size to 4K) +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next (14211d0 9p: fix 9p.txt to advertise msize instead of maxdata) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (7606f85 UBIFS: fix the dark space calculation) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/master (810627d xfs: fix force shutdown handling in xfs_end_io) +$ git merge xfs/master +Already up-to-date. +Merging vfs/for-next (206b1d0 Fix POSIX ACL permission check) +$ git merge vfs/for-next +Already up-to-date. +Merging vfs-scale/vfs-scale-working (32385c7 kernel: fix hlist_bl again) +$ git merge vfs-scale/vfs-scale-working +Already up-to-date. +Merging pci/linux-next (cfbf1bd PCI: msi: Disable msi interrupts when we initialize a pci device) +$ git merge pci/linux-next +Auto-merging drivers/pci/msi.c +Auto-merging drivers/pci/ats.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-pci | 18 +++++ + drivers/acpi/pci_root.c | 7 ++ + drivers/pci/ats.c | 20 +++--- + drivers/pci/hotplug/acpiphp_glue.c | 4 +- + drivers/pci/hotplug/pciehp.h | 1 - + drivers/pci/hotplug/pciehp_core.c | 11 +--- + drivers/pci/hotplug/pciehp_ctrl.c | 4 +- + drivers/pci/hotplug/pciehp_hpc.c | 1 - + drivers/pci/msi.c | 121 +++++++++++++++++++++++++++++++ + drivers/pci/pci-acpi.c | 13 ++-- + drivers/pci/pcie/aspm.c | 58 ++++++++++------ + include/linux/acpi.h | 4 + + include/linux/msi.h | 3 + + include/linux/pci-aspm.h | 4 +- + include/linux/pci.h | 1 + + include/linux/pci_regs.h | 4 +- + 16 files changed, 218 insertions(+), 56 deletions(-) +Merging hid/for-next (20d5759 Merge branch 'wacom' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/hid-core.c | 1 + + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-lg4ff.c | 2 +- + drivers/hid/hid-wacom.c | 179 +++++++++++++++++++++++++++++++++++++++++------ + 4 files changed, 160 insertions(+), 23 deletions(-) +Merging quilt/i2c (f16e246 i2c-algo-bit: Generate correct i2c address sequence for 10-bit target) +$ git merge quilt/i2c +Merge made by the 'recursive' strategy. + drivers/i2c/algos/i2c-algo-bit.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) +Merging bjdooks-i2c/next-i2c (f8420b7 fixup merge) +$ git merge bjdooks-i2c/next-i2c +Resolved 'drivers/i2c/busses/i2c-designware-platdrv.c' using previous resolution. +Auto-merging drivers/i2c/busses/i2c-designware-platdrv.c +CONFLICT (add/add): Merge conflict in drivers/i2c/busses/i2c-designware-platdrv.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c070521] Merge remote-tracking branch 'bjdooks-i2c/next-i2c' +$ git diff -M --stat --summary HEAD^.. + drivers/i2c/busses/i2c-designware-platdrv.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging quilt/jdelvare-hwmon (1ea6b8f Linux 3.2-rc1) +$ git merge quilt/jdelvare-hwmon +Already up-to-date. +Merging hwmon-staging/hwmon-next (1ea6b8f Linux 3.2-rc1) +$ git merge hwmon-staging/hwmon-next +Already up-to-date. +Merging quilt/kernel-doc (c3b92c8 Linux 3.1) +$ git merge quilt/kernel-doc +Already up-to-date. +Merging docs/docs-move (5c24d8b Merge branch 'docs/docbook/drm' of git://github.com/mfwitten/linux into docs-move) +$ git merge docs/docs-move +Already up-to-date. +Merging v4l-dvb/master (eeff030 Merge branch 'poll-pwc' of /home/v4l/v4l/patchwork) +$ git merge v4l-dvb/master +Merge made by the 'recursive' strategy. + Documentation/video4linux/CARDLIST.bttv | 2 +- + Documentation/video4linux/CARDLIST.cx23885 | 2 + + Documentation/video4linux/CARDLIST.cx88 | 2 + + Documentation/video4linux/CARDLIST.em28xx | 8 +- + Documentation/video4linux/CARDLIST.saa7134 | 1 + + Documentation/video4linux/CARDLIST.saa7164 | 2 + + drivers/media/common/tuners/mxl5007t.c | 49 ++ + drivers/media/common/tuners/tda18212.c | 49 +- + drivers/media/common/tuners/tda18212.h | 4 + + drivers/media/common/tuners/tda18271-fe.c | 10 + + drivers/media/common/tuners/tda18271-priv.h | 2 + + drivers/media/common/tuners/tuner-simple.c | 11 + + drivers/media/dvb/dvb-usb/Kconfig | 1 + + drivers/media/dvb/dvb-usb/anysee.c | 418 ++++++++-- + drivers/media/dvb/dvb-usb/anysee.h | 6 + + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 1 + + drivers/media/dvb/dvb-usb/it913x.c | 79 +- + drivers/media/dvb/dvb-usb/mxl111sf-tuner.c | 56 ++- + drivers/media/dvb/dvb-usb/ttusb2.c | 17 +- + drivers/media/dvb/frontends/au8522_dig.c | 31 +- + drivers/media/dvb/frontends/it913x-fe-priv.h | 722 +++++++++++++++- + drivers/media/dvb/frontends/it913x-fe.c | 167 +++- + drivers/media/dvb/frontends/it913x-fe.h | 24 +- + drivers/media/dvb/frontends/s5h1409.c | 31 +- + drivers/media/dvb/frontends/s5h1411.c | 31 +- + drivers/media/radio/Kconfig | 297 ++++--- + drivers/media/video/Kconfig | 412 +++++---- + drivers/media/video/Makefile | 2 + + drivers/media/video/adv7170.c | 62 ++ + drivers/media/video/atmel-isi.c | 2 +- + drivers/media/video/bt8xx/bt848.h | 5 +- + drivers/media/video/bt8xx/bttv-cards.c | 58 ++- + drivers/media/video/bt8xx/bttv-driver.c | 1 + + drivers/media/video/bt8xx/bttv.h | 3 +- + drivers/media/video/cx88/Kconfig | 10 +- + drivers/media/video/davinci/vpbe_display.c | 5 +- + drivers/media/video/gspca/pac207.c | 10 +- + drivers/media/video/ivtv/ivtv-fileops.c | 6 +- + drivers/media/video/mt9m001.c | 5 +- + drivers/media/video/mt9m111.c | 7 +- + drivers/media/video/mt9p031.c | 5 +- + drivers/media/video/mt9t001.c | 5 +- + drivers/media/video/mt9t031.c | 5 +- + drivers/media/video/mt9v022.c | 5 +- + drivers/media/video/mt9v032.c | 8 +- + drivers/media/video/omap/omap_vout.c | 187 +++-- + drivers/media/video/omap/omap_voutdef.h | 2 +- + drivers/media/video/pwc/pwc-ctrl.c | 134 ++-- + drivers/media/video/pwc/pwc-dec23.c | 7 + + drivers/media/video/pwc/pwc-dec23.h | 2 + + drivers/media/video/pwc/pwc-if.c | 155 ++-- + drivers/media/video/pwc/pwc-v4l.c | 155 +++-- + drivers/media/video/pwc/pwc.h | 11 +- + drivers/media/video/s5p-g2d/Makefile | 3 + + drivers/media/video/s5p-g2d/g2d-hw.c | 106 +++ + drivers/media/video/s5p-g2d/g2d-regs.h | 115 +++ + drivers/media/video/s5p-g2d/g2d.c | 824 ++++++++++++++++++ + drivers/media/video/s5p-g2d/g2d.h | 83 ++ + drivers/media/video/saa7134/saa7134-cards.c | 33 + + drivers/media/video/saa7134/saa7134.h | 1 + + drivers/media/video/tvp5150.c | 14 +- + drivers/media/video/usbvision/usbvision-i2c.c | 46 +- + drivers/media/video/via-camera.c | 10 +- + drivers/media/video/videobuf-core.c | 3 +- + drivers/media/video/videobuf2-core.c | 48 +- + drivers/media/video/vivi.c | 9 +- + drivers/staging/media/as102/Kconfig | 1 + + drivers/staging/media/as102/Makefile | 2 +- + drivers/staging/media/as102/as102_drv.c | 126 +-- + drivers/staging/media/as102/as102_drv.h | 59 +- + drivers/staging/media/as102/as102_fe.c | 4 - + drivers/staging/media/as102/as102_fw.c | 44 +- + drivers/staging/media/as102/as102_fw.h | 10 +- + drivers/staging/media/as102/as102_usb_drv.c | 34 +- + drivers/staging/media/as102/as102_usb_drv.h | 1 - + drivers/staging/media/as102/as10x_cmd.c | 139 ++-- + drivers/staging/media/as102/as10x_cmd.h | 895 ++++++++++---------- + drivers/staging/media/as102/as10x_cmd_cfg.c | 66 +- + drivers/staging/media/as102/as10x_cmd_stream.c | 56 +- + drivers/staging/media/as102/as10x_handle.h | 26 +- + drivers/staging/media/as102/as10x_types.h | 250 +++--- + drivers/staging/media/solo6x10/Makefile | 2 +- + .../media/solo6x10/{jpeg.h => solo6x10-jpeg.h} | 0 + drivers/staging/media/solo6x10/v4l2-enc.c | 2 +- + fs/eventpoll.c | 18 +- + fs/select.c | 38 +- + include/linux/poll.h | 13 +- + 87 files changed, 4537 insertions(+), 1836 deletions(-) + create mode 100644 drivers/media/video/s5p-g2d/Makefile + create mode 100644 drivers/media/video/s5p-g2d/g2d-hw.c + create mode 100644 drivers/media/video/s5p-g2d/g2d-regs.h + create mode 100644 drivers/media/video/s5p-g2d/g2d.c + create mode 100644 drivers/media/video/s5p-g2d/g2d.h + rename drivers/staging/media/solo6x10/{jpeg.h => solo6x10-jpeg.h} (100%) +Merging kbuild/for-next (8398e54 Merge branch 'kbuild/rc-fixes' into kbuild/for-next) +$ git merge kbuild/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next) +$ git merge kconfig/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging libata/NEXT (c24f835 ahci: start engine only during soft/hard resets) +$ git merge libata/NEXT +Merge made by the 'recursive' strategy. + drivers/ata/libahci.c | 5 +---- + 1 files changed, 1 insertions(+), 4 deletions(-) +Merging infiniband/for-next (042f36e IB/qib: Don't use schedule_work()) +$ git merge infiniband/for-next +Merge made by the 'recursive' strategy. + drivers/infiniband/hw/qib/qib_iba7322.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging acpi/next (efb9058 Merge branches 'acpi', 'idle', 'mrst-pmu' and 'pm-tools' into next) +$ git merge acpi/next +Already up-to-date. +Merging cpupowerutils/master (498ca79 cpupower: use man(1) when calling "cpupower help subcommand") +$ git merge cpupowerutils/master +Already up-to-date. +Merging ieee1394/for-next (a572e68 firewire: ohci: fix isochronous DMA synchronization) +$ git merge ieee1394/for-next +Already up-to-date. +Merging ubi/linux-next (93ee7a9 Linux 3.1-rc2) +$ git merge ubi/linux-next +Already up-to-date. +Merging dlm/next (c3b92c8 Linux 3.1) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/master (25b84fa swiotlb: Export io_tlb_nslabs as swiotlb_nslabs and use it.) +$ git merge swiotlb/master +Resolved 'drivers/xen/swiotlb-xen.c' using previous resolution. +Auto-merging drivers/xen/swiotlb-xen.c +CONFLICT (content): Merge conflict in drivers/xen/swiotlb-xen.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fd42f6f] Merge remote-tracking branch 'swiotlb/master' +$ git diff -M --stat --summary HEAD^.. +Merging ibft/master (f1b1e06 iscsi-ibft: Fix compile warning introduced by 'iscsi_ibft: iscsi_ibft_find unused variable i') +$ git merge ibft/master +Merge made by the 'recursive' strategy. +Merging scsi/master (f7c9c6b [SCSI] Fix block queue and elevator memory leak in scsi_alloc_sdev) +$ git merge scsi/master +Already up-to-date. +Merging target-updates/for-next (5bda90c target: use ->exectute_task for all CDB emulation) +$ git merge target-updates/for-next +Already up-to-date. +Merging target-merge/for-next-merge (e0d85e5 ib_srpt: Initial SRP Target merge for v3.2-rc1) +$ git merge target-merge/for-next-merge +Merge made by the 'recursive' strategy. + drivers/infiniband/Kconfig | 1 + + drivers/infiniband/Makefile | 1 + + drivers/infiniband/ulp/srpt/Kconfig | 12 + + drivers/infiniband/ulp/srpt/Makefile | 2 + + drivers/infiniband/ulp/srpt/ib_dm_mad.h | 139 ++ + drivers/infiniband/ulp/srpt/ib_srpt.c | 4081 +++++++++++++++++++++++++++++++ + drivers/infiniband/ulp/srpt/ib_srpt.h | 444 ++++ + 7 files changed, 4680 insertions(+), 0 deletions(-) + create mode 100644 drivers/infiniband/ulp/srpt/Kconfig + create mode 100644 drivers/infiniband/ulp/srpt/Makefile + create mode 100644 drivers/infiniband/ulp/srpt/ib_dm_mad.h + create mode 100644 drivers/infiniband/ulp/srpt/ib_srpt.c + create mode 100644 drivers/infiniband/ulp/srpt/ib_srpt.h +Merging slave-dma/next (9b3fd24 dma: fix spacing for method declaration, coding style issue in iop-adma.c) +$ git merge slave-dma/next +Resolved 'drivers/dma/pl330.c' using previous resolution. +Auto-merging drivers/dma/pl330.c +CONFLICT (content): Merge conflict in drivers/dma/pl330.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 32993e1] Merge remote-tracking branch 'slave-dma/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/dma/atmel-dma.txt | 14 ++++ + drivers/dma/at_hdmac.c | 78 +++++++++++++++++--- + drivers/dma/at_hdmac_regs.h | 8 ++ + drivers/dma/iop-adma.c | 4 +- + drivers/dma/pl330.c | 4 +- + 5 files changed, 94 insertions(+), 14 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/atmel-dma.txt +Merging async_tx/next (21ef4b8 dmaengine: use DEFINE_IDR for static initialization) +$ git merge async_tx/next +Already up-to-date. +Merging net-next/master (3d249d4 net: introduce ethernet teaming device) +$ git merge net-next/master +Auto-merging drivers/net/ethernet/xilinx/ll_temac_main.c +Auto-merging drivers/net/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/networking/team.txt | 2 + + MAINTAINERS | 7 + + drivers/net/Kconfig | 2 + + drivers/net/Makefile | 1 + + drivers/net/ethernet/3com/3c589_cs.c | 7 +- + drivers/net/ethernet/3com/3c59x.c | 12 +- + drivers/net/ethernet/3com/typhoon.c | 16 +- + drivers/net/ethernet/8390/ne2k-pci.c | 6 +- + drivers/net/ethernet/adaptec/starfire.c | 6 +- + drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c | 10 +- + drivers/net/ethernet/atheros/atlx/atl2.c | 10 +- + drivers/net/ethernet/broadcom/bnx2.c | 8 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 18 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 24 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 68 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 61 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h | 4 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 8 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 100 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 4 +- + drivers/net/ethernet/broadcom/tg3.c | 8 +- + drivers/net/ethernet/brocade/bna/bnad_ethtool.c | 11 +- + drivers/net/ethernet/dec/tulip/de2104x.c | 6 +- + drivers/net/ethernet/dec/tulip/dmfe.c | 7 +- + drivers/net/ethernet/dec/tulip/tulip_core.c | 6 +- + drivers/net/ethernet/dec/tulip/uli526x.c | 7 +- + drivers/net/ethernet/dec/tulip/winbond-840.c | 6 +- + drivers/net/ethernet/dlink/sundance.c | 6 +- + drivers/net/ethernet/dnet.c | 6 +- + drivers/net/ethernet/emulex/benet/be.h | 16 +- + drivers/net/ethernet/emulex/benet/be_cmds.c | 49 +- + drivers/net/ethernet/emulex/benet/be_cmds.h | 4 +- + drivers/net/ethernet/emulex/benet/be_ethtool.c | 7 +- + drivers/net/ethernet/emulex/benet/be_main.c | 66 +- + drivers/net/ethernet/fealnx.c | 6 +- + drivers/net/ethernet/i825xx/eepro.c | 7 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 9 +- + drivers/net/ethernet/marvell/skge.c | 9 +- + drivers/net/ethernet/marvell/sky2.c | 9 +- + drivers/net/ethernet/natsemi/natsemi.c | 6 +- + drivers/net/ethernet/natsemi/ns83820.c | 6 +- + drivers/net/ethernet/neterion/s2io.c | 8 +- + drivers/net/ethernet/nvidia/forcedeth.c | 6 +- + .../ethernet/qlogic/netxen/netxen_nic_ethtool.c | 12 +- + drivers/net/ethernet/qlogic/qla3xxx.c | 10 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 13 +- + drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c | 11 +- + drivers/net/ethernet/realtek/8139cp.c | 6 +- + drivers/net/ethernet/realtek/8139too.c | 6 +- + drivers/net/ethernet/realtek/r8169.c | 10 +- + drivers/net/ethernet/smsc/epic100.c | 6 +- + drivers/net/ethernet/smsc/smsc9420.c | 7 +- + drivers/net/ethernet/xilinx/ll_temac_main.c | 14 + + drivers/net/ethernet/xircom/xirc2ps_cs.c | 2 +- + drivers/net/team/Kconfig | 43 + + drivers/net/team/Makefile | 7 + + drivers/net/team/team.c | 1583 ++++++++++++++++++++ + drivers/net/team/team_mode_activebackup.c | 137 ++ + drivers/net/team/team_mode_roundrobin.c | 107 ++ + drivers/net/veth.c | 2 +- + include/linux/Kbuild | 1 + + include/linux/if.h | 1 + + include/linux/if_team.h | 242 +++ + include/net/icmp.h | 4 +- + include/net/inet_connection_sock.h | 6 +- + include/net/ip.h | 2 +- + include/net/netns/mib.h | 2 +- + include/net/sctp/structs.h | 1 + + include/net/snmp.h | 2 +- + include/net/sock.h | 4 +- + net/core/sock.c | 11 +- + net/dccp/minisocks.c | 2 +- + net/ipv4/af_inet.c | 8 +- + net/ipv4/inet_connection_sock.c | 17 +- + net/ipv4/ip_gre.c | 2 +- + net/ipv4/ip_sockglue.c | 35 +- + net/ipv4/ipip.c | 2 +- + net/ipv4/proc.c | 9 +- + net/ipv4/raw.c | 3 +- + net/ipv4/tcp_minisocks.c | 2 +- + net/ipv4/udp.c | 3 +- + net/ipv6/af_inet6.c | 2 +- + net/ipv6/datagram.c | 2 +- + net/ipv6/ip6_tunnel.c | 2 +- + net/ipv6/raw.c | 3 +- + net/ipv6/sit.c | 2 +- + net/ipv6/udp.c | 4 +- + net/sched/sch_choke.c | 27 +- + net/sctp/sm_make_chunk.c | 4 +- + net/sctp/sm_sideeffect.c | 8 +- + net/sctp/transport.c | 16 + + 91 files changed, 2692 insertions(+), 358 deletions(-) + create mode 100644 Documentation/networking/team.txt + create mode 100644 drivers/net/team/Kconfig + create mode 100644 drivers/net/team/Makefile + create mode 100644 drivers/net/team/team.c + create mode 100644 drivers/net/team/team_mode_activebackup.c + create mode 100644 drivers/net/team/team_mode_roundrobin.c + create mode 100644 include/linux/if_team.h +Merging wireless-next/master (b4487c2 mac80211: fix warning in ieee80211_probe_client) +$ git merge wireless-next/master +Recorded preimage for 'drivers/net/wireless/libertas/cfg.c' +Resolved 'include/net/bluetooth/bluetooth.h' using previous resolution. +Auto-merging net/wireless/wext-compat.c +Auto-merging net/nfc/nci/core.c +Auto-merging net/mac80211/util.c +Auto-merging net/mac80211/tx.c +Auto-merging net/mac80211/status.c +Auto-merging net/mac80211/scan.c +Auto-merging net/mac80211/rx.c +Auto-merging net/mac80211/mlme.c +Auto-merging net/mac80211/key.c +Auto-merging net/mac80211/ht.c +Auto-merging net/mac80211/agg-tx.c +Auto-merging net/mac80211/agg-rx.c +Auto-merging net/core/sock.c +Auto-merging net/core/skbuff.c +Auto-merging net/bluetooth/mgmt.c +Auto-merging net/bluetooth/l2cap_sock.c +Auto-merging net/bluetooth/hci_sysfs.c +Auto-merging include/net/sock.h +Auto-merging include/net/bluetooth/hci_core.h +Auto-merging include/net/bluetooth/bluetooth.h +CONFLICT (content): Merge conflict in include/net/bluetooth/bluetooth.h +Auto-merging include/linux/skbuff.h +Auto-merging drivers/net/wireless/rtlwifi/rtl8192cu/sw.c +Auto-merging drivers/net/wireless/mwifiex/scan.c +Auto-merging drivers/net/wireless/mac80211_hwsim.c +Auto-merging drivers/net/wireless/libertas/cfg.c +CONFLICT (content): Merge conflict in drivers/net/wireless/libertas/cfg.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-trans-pcie.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-pci.c +Auto-merging drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c +Auto-merging drivers/net/wireless/ath/ath9k/init.c +Auto-merging drivers/net/wireless/ath/ath9k/hw.c +Auto-merging drivers/net/wireless/ath/ath9k/debug.c +Auto-merging drivers/net/wireless/ath/ath9k/ar9003_phy.c +Auto-merging drivers/net/wireless/ath/ath6kl/cfg80211.c +Auto-merging drivers/net/wireless/ath/ath.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/net/wireless/libertas/cfg.c'. +[master 7b4df12] Merge remote-tracking branch 'wireless-next/master' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/include/asm/socket.h | 3 + + arch/arm/include/asm/socket.h | 3 + + arch/avr32/include/asm/socket.h | 3 + + arch/cris/include/asm/socket.h | 3 + + arch/frv/include/asm/socket.h | 3 + + arch/h8300/include/asm/socket.h | 3 + + arch/ia64/include/asm/socket.h | 3 + + arch/m32r/include/asm/socket.h | 3 + + arch/m68k/include/asm/socket.h | 3 + + arch/mips/include/asm/socket.h | 3 + + arch/mn10300/include/asm/socket.h | 3 + + arch/parisc/include/asm/socket.h | 3 + + arch/powerpc/include/asm/socket.h | 3 + + arch/s390/include/asm/socket.h | 3 + + arch/sparc/include/asm/socket.h | 3 + + arch/xtensa/include/asm/socket.h | 3 + + drivers/bluetooth/ath3k.c | 15 +- + drivers/bluetooth/bfusb.c | 4 +- + drivers/bluetooth/bluecard_cs.c | 4 +- + drivers/bluetooth/bt3c_cs.c | 4 +- + drivers/bluetooth/btuart_cs.c | 4 +- + drivers/bluetooth/btusb.c | 16 +- + drivers/bluetooth/dtl1_cs.c | 4 +- + drivers/bluetooth/hci_vhci.c | 5 +- + drivers/net/wireless/Makefile | 6 +- + drivers/net/wireless/ath/ath.h | 1 + + drivers/net/wireless/ath/ath6kl/cfg80211.c | 3 +- + drivers/net/wireless/ath/ath6kl/init.c | 3 +- + drivers/net/wireless/ath/ath9k/Kconfig | 1 + + drivers/net/wireless/ath/ath9k/Makefile | 1 + + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 140 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 10 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 4 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.h | 2 + + .../net/wireless/ath/ath9k/ar9462_2p0_initvals.h | 26 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 4 + + drivers/net/wireless/ath/ath9k/debug.c | 13 +- + drivers/net/wireless/ath/ath9k/eeprom.h | 3 +- + drivers/net/wireless/ath/ath9k/gpio.c | 7 +- + drivers/net/wireless/ath/ath9k/hw.c | 4 +- + drivers/net/wireless/ath/ath9k/hw.h | 11 + + drivers/net/wireless/ath/ath9k/init.c | 3 + + drivers/net/wireless/ath/ath9k/main.c | 12 +- + drivers/net/wireless/ath/ath9k/mci.c | 254 +++ + drivers/net/wireless/ath/ath9k/mci.h | 118 ++ + drivers/net/wireless/ath/ath9k/xmit.c | 5 +- + drivers/net/wireless/brcm80211/brcmfmac/Makefile | 3 +- + drivers/net/wireless/brcm80211/brcmfmac/bcmchip.h | 7 - + drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 18 +- + .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 5 +- + .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 301 ++--- + drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 709 +------- + .../net/wireless/brcm80211/brcmfmac/sdio_chip.c | 622 +++++++ + .../net/wireless/brcm80211/brcmfmac/sdio_chip.h | 136 ++ + .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 41 +- + .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 9 - + drivers/net/wireless/brcm80211/brcmsmac/aiutils.h | 76 - + drivers/net/wireless/brcm80211/brcmsmac/ampdu.c | 6 +- + drivers/net/wireless/brcm80211/brcmsmac/channel.c | 118 -- + drivers/net/wireless/brcm80211/brcmsmac/dma.c | 39 +- + drivers/net/wireless/brcm80211/brcmsmac/dma.h | 3 +- + .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 121 +- + .../net/wireless/brcm80211/brcmsmac/mac80211_if.h | 2 + + drivers/net/wireless/brcm80211/brcmsmac/main.c | 687 +++----- + drivers/net/wireless/brcm80211/brcmsmac/main.h | 19 +- + .../net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c | 10 +- + .../net/wireless/brcm80211/brcmsmac/phy/phy_int.h | 5 - + .../net/wireless/brcm80211/brcmsmac/phy/phy_n.c | 38 +- + drivers/net/wireless/brcm80211/brcmsmac/pmu.c | 1 + + drivers/net/wireless/brcm80211/brcmsmac/pub.h | 38 +- + drivers/net/wireless/brcm80211/brcmsmac/rate.h | 5 +- + drivers/net/wireless/brcm80211/brcmsmac/srom.c | 469 +----- + drivers/net/wireless/brcm80211/brcmsmac/srom.h | 5 - + drivers/net/wireless/brcm80211/brcmutil/utils.c | 218 +-- + .../net/wireless/brcm80211/include/brcmu_utils.h | 30 +- + drivers/net/wireless/brcm80211/include/defs.h | 1 - + drivers/net/wireless/brcm80211/include/soc.h | 12 +- + drivers/net/wireless/ipw2x00/ipw2200.c | 8 + + drivers/net/wireless/ipw2x00/libipw.h | 8 - + drivers/net/wireless/iwlwifi/Makefile | 2 +- + drivers/net/wireless/iwlwifi/iwl-2000.c | 20 - + drivers/net/wireless/iwlwifi/iwl-6000.c | 10 - + drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 358 ++++ + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 8 +- + drivers/net/wireless/iwlwifi/iwl-agn-rx.c | 49 +- + drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 13 +- + drivers/net/wireless/iwlwifi/iwl-agn-sta.c | 78 +- + drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 16 +- + drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 154 ++- + drivers/net/wireless/iwlwifi/iwl-agn.c | 1781 ++------------------ + drivers/net/wireless/iwlwifi/iwl-agn.h | 31 +- + drivers/net/wireless/iwlwifi/iwl-cfg.h | 6 - + drivers/net/wireless/iwlwifi/iwl-commands.h | 27 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 307 +---- + drivers/net/wireless/iwlwifi/iwl-core.h | 14 - + drivers/net/wireless/iwlwifi/iwl-csr.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-debug.h | 19 +- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 8 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 34 +- + drivers/net/wireless/iwlwifi/iwl-devtrace.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-devtrace.h | 23 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.c | 142 +- + drivers/net/wireless/iwlwifi/iwl-mac80211.c | 1632 ++++++++++++++++++ + drivers/net/wireless/iwlwifi/iwl-pci.c | 20 +- + drivers/net/wireless/iwlwifi/iwl-scan.c | 50 +- + drivers/net/wireless/iwlwifi/iwl-sv-open.c | 7 +- + drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h | 35 +- + drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c | 52 +- + drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 23 +- + drivers/net/wireless/iwlwifi/iwl-trans.h | 50 +- + drivers/net/wireless/iwmc3200wifi/cfg80211.c | 15 +- + drivers/net/wireless/libertas/cfg.c | 25 +- + drivers/net/wireless/mac80211_hwsim.c | 2 + + drivers/net/wireless/mwifiex/11n_rxreorder.c | 18 +- + drivers/net/wireless/mwifiex/cfg80211.c | 4 +- + drivers/net/wireless/mwifiex/fw.h | 2 +- + drivers/net/wireless/mwifiex/init.c | 4 +- + drivers/net/wireless/mwifiex/join.c | 96 +- + drivers/net/wireless/mwifiex/pcie.c | 11 +- + drivers/net/wireless/mwifiex/scan.c | 7 +- + drivers/net/wireless/mwifiex/sdio.c | 4 +- + drivers/net/wireless/mwifiex/sta_rx.c | 12 +- + drivers/net/wireless/orinoco/scan.c | 16 +- + drivers/net/wireless/rndis_wlan.c | 23 +- + drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 36 +- + include/asm-generic/socket.h | 3 + + include/linux/errqueue.h | 3 +- + include/linux/ieee80211.h | 6 + + include/linux/nl80211.h | 111 ++ + include/linux/skbuff.h | 19 +- + include/net/bluetooth/bluetooth.h | 29 +- + include/net/bluetooth/hci.h | 22 + + include/net/bluetooth/hci_core.h | 136 ++- + include/net/bluetooth/l2cap.h | 409 ++++- + include/net/bluetooth/mgmt.h | 47 +- + include/net/cfg80211.h | 108 ++- + include/net/ieee80211_radiotap.h | 8 - + include/net/mac80211.h | 35 +- + include/net/nfc/nci.h | 109 +- + include/net/nfc/nci_core.h | 13 +- + include/net/sock.h | 6 + + net/bluetooth/bnep/core.c | 13 +- + net/bluetooth/cmtp/core.c | 13 +- + net/bluetooth/hci_conn.c | 69 +- + net/bluetooth/hci_core.c | 399 ++++-- + net/bluetooth/hci_event.c | 221 ++- + net/bluetooth/hci_sysfs.c | 40 +- + net/bluetooth/hidp/core.c | 157 +- + net/bluetooth/l2cap_core.c | 947 ++++++++--- + net/bluetooth/l2cap_sock.c | 90 +- + net/bluetooth/mgmt.c | 500 +++--- + net/bluetooth/rfcomm/core.c | 65 +- + net/bluetooth/rfcomm/sock.c | 2 + + net/bluetooth/rfcomm/tty.c | 45 +- + net/bluetooth/smp.c | 3 +- + net/core/skbuff.c | 20 + + net/core/sock.c | 9 + + net/mac80211/agg-rx.c | 3 +- + net/mac80211/agg-tx.c | 10 +- + net/mac80211/cfg.c | 165 ++- + net/mac80211/debugfs.c | 2 +- + net/mac80211/driver-ops.h | 68 +- + net/mac80211/ht.c | 3 +- + net/mac80211/ibss.c | 3 + + net/mac80211/ieee80211_i.h | 29 +- + net/mac80211/iface.c | 44 +- + net/mac80211/key.c | 9 +- + net/mac80211/main.c | 39 +- + net/mac80211/mesh.c | 70 +- + net/mac80211/mesh.h | 7 + + net/mac80211/mesh_hwmp.c | 52 +- + net/mac80211/mesh_pathtbl.c | 3 - + net/mac80211/mesh_plink.c | 50 +- + net/mac80211/mlme.c | 90 +- + net/mac80211/pm.c | 2 +- + net/mac80211/rc80211_minstrel.c | 7 +- + net/mac80211/rx.c | 73 +- + net/mac80211/scan.c | 199 +-- + net/mac80211/sta_info.h | 8 + + net/mac80211/status.c | 87 +- + net/mac80211/tx.c | 110 ++- + net/mac80211/util.c | 126 ++- + net/mac80211/wme.c | 10 +- + net/mac80211/work.c | 46 +- + net/mac80211/wpa.c | 9 +- + net/nfc/nci/core.c | 18 +- + net/nfc/nci/data.c | 5 +- + net/nfc/nci/lib.c | 8 +- + net/nfc/nci/ntf.c | 152 +- + net/nfc/nci/rsp.c | 83 +- + net/rfkill/core.c | 4 +- + net/socket.c | 18 + + net/wireless/core.c | 4 + + net/wireless/core.h | 4 +- + net/wireless/mlme.c | 35 +- + net/wireless/nl80211.c | 410 ++++- + net/wireless/nl80211.h | 5 + + net/wireless/scan.c | 117 ++- + net/wireless/wext-compat.c | 12 + + 200 files changed, 9056 insertions(+), 6557 deletions(-) + create mode 100644 drivers/net/wireless/ath/ath9k/mci.c + create mode 100644 drivers/net/wireless/ath/ath9k/mci.h + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-mac80211.c +Merging bluetooth/master (4d611e4 Bluetooth: Only set ack_timer if we didn't send and ack) +$ git merge bluetooth/master +Auto-merging net/bluetooth/mgmt.c +Auto-merging net/bluetooth/l2cap_sock.c +Auto-merging include/net/bluetooth/hci_core.h +Merge made by the 'recursive' strategy. + include/net/bluetooth/hci_core.h | 16 +++-- + include/net/bluetooth/l2cap.h | 1 + + include/net/bluetooth/mgmt.h | 9 ++- + net/bluetooth/hci_event.c | 45 ++++++++------- + net/bluetooth/l2cap_core.c | 15 +++-- + net/bluetooth/l2cap_sock.c | 16 ++++- + net/bluetooth/mgmt.c | 116 ++++++++++++++++++++++++++++---------- + 7 files changed, 147 insertions(+), 71 deletions(-) +Merging mtd/master (e0d6511 Merge git://git.infradead.org/mtd-2.6) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (c0af4d0 mtd: nand: scan 1st and 2nd page for Macronix SLC) +$ git merge l2-mtd/master +Merge made by the 'recursive' strategy. + drivers/mtd/nand/nand_base.c | 7 ++++--- + drivers/mtd/nand/nand_ids.c | 4 +++- + include/linux/mtd/nand.h | 1 + + 3 files changed, 8 insertions(+), 4 deletions(-) +Merging crypto/master (d19978f crypto: fix typo in crypto/Kconfig) +$ git merge crypto/master +Auto-merging crypto/crypto_user.c +Merge made by the 'recursive' strategy. + arch/x86/crypto/twofish_glue_3way.c | 250 +++ + crypto/Kconfig | 2 +- + crypto/Makefile | 4 +- + crypto/algapi.c | 29 + + crypto/ansi_cprng.c | 8 + + crypto/crypto_user.c | 2 +- + crypto/lrw.c | 156 ++- + crypto/serpent.c | 44 +- + crypto/tcrypt.c | 310 ++++ + crypto/tcrypt.h | 2 + + crypto/testmgr.c | 90 + + crypto/testmgr.h | 3029 +++++++++++++++++++++++++++++++++-- + crypto/twofish_common.c | 13 +- + crypto/xts.c | 79 +- + include/crypto/algapi.h | 1 + + include/crypto/lrw.h | 43 + + include/crypto/serpent.h | 25 + + include/crypto/twofish.h | 2 + + include/crypto/xts.h | 27 + + 19 files changed, 3915 insertions(+), 201 deletions(-) + create mode 100644 include/crypto/lrw.h + create mode 100644 include/crypto/serpent.h + create mode 100644 include/crypto/xts.h +Merging sound/for-next (769f11e Merge branch 'fix/hda' into for-next) +$ git merge sound/for-next +Removing sound/pci/hda/alc262_quirks.c +Merge made by the 'recursive' strategy. + Documentation/sound/alsa/HD-Audio-Models.txt | 14 +- + include/sound/soc.h | 3 + + sound/pci/hda/alc262_quirks.c | 875 --------- + sound/pci/hda/alc882_quirks.c | 2667 +------------------------- + sound/pci/hda/patch_realtek.c | 461 ++++- + sound/pci/hda/patch_sigmatel.c | 33 +- + sound/soc/codecs/Makefile | 6 +- + sound/soc/codecs/ak4642.c | 2 +- + sound/soc/codecs/cs42l51.c | 13 +- + sound/soc/codecs/tlv320aic3x.c | 41 +- + sound/soc/codecs/wm8400.c | 6 +- + sound/soc/codecs/wm8900.c | 2 +- + sound/soc/codecs/wm8904.c | 2 +- + sound/soc/codecs/wm8940.c | 4 +- + sound/soc/codecs/wm8960.c | 2 +- + sound/soc/codecs/wm8961.c | 2 +- + sound/soc/codecs/wm8962.c | 20 + + sound/soc/codecs/wm8974.c | 2 +- + sound/soc/codecs/wm8983.c | 3 +- + sound/soc/codecs/wm8985.c | 3 +- + sound/soc/codecs/wm8988.c | 2 +- + sound/soc/codecs/wm8990.c | 4 +- + sound/soc/codecs/wm8991.c | 4 +- + sound/soc/codecs/wm8995.c | 6 +- + sound/soc/codecs/wm8996.c | 2 +- + sound/soc/codecs/wm9081.c | 2 + + sound/soc/codecs/wm_hubs.c | 3 + + sound/soc/sh/fsi.c | 21 +- + sound/soc/soc-pcm.c | 3 +- + 29 files changed, 516 insertions(+), 3692 deletions(-) + delete mode 100644 sound/pci/hda/alc262_quirks.c +Merging sound-asoc/for-next (a9317e8 ASoC: ak4642: add ak4648 support) +$ git merge sound-asoc/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 - + drivers/base/regmap/internal.h | 1 + + drivers/base/regmap/regcache.c | 19 + + drivers/base/regmap/regmap.c | 4 +- + include/linux/regmap.h | 1 + + include/sound/soc.h | 3 +- + sound/soc/Kconfig | 15 - + sound/soc/codecs/Kconfig | 3 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/ak4642.c | 133 +++- + sound/soc/codecs/alc5632.c | 1132 +++++++++++++++++++++++++++ + sound/soc/codecs/alc5632.h | 249 ++++++ + sound/soc/codecs/da7210.c | 4 +- + sound/soc/codecs/wm5100-tables.c | 1489 ++++++++++++++++++------------------ + sound/soc/codecs/wm5100.c | 400 +++++----- + sound/soc/codecs/wm5100.h | 7 +- + sound/soc/codecs/wm8962.c | 1599 +++++++++++++++++++------------------- + sound/soc/codecs/wm8971.c | 2 +- + sound/soc/codecs/wm8995.c | 717 +++++++++++++++--- + sound/soc/codecs/wm8996.c | 912 ++++++++++++---------- + sound/soc/codecs/wm9081.c | 363 ++++++---- + sound/soc/samsung/Kconfig | 7 + + sound/soc/samsung/Makefile | 2 + + sound/soc/samsung/lowland.c | 246 ++++++ + sound/soc/soc-cache.c | 384 --------- + 25 files changed, 4875 insertions(+), 2820 deletions(-) + create mode 100644 sound/soc/codecs/alc5632.c + create mode 100644 sound/soc/codecs/alc5632.h + create mode 100644 sound/soc/samsung/lowland.c +Merging cpufreq/next (5aace58 [CPUFREQ] ARM Exynos4210 PM/Suspend compatibility with different bootloaders) +$ git merge cpufreq/next +Merge made by the 'recursive' strategy. +Merging quilt/rr (bb6f197 virtio-balloon: Trivial cleanups) +$ git merge quilt/rr +Merge made by the 'recursive' strategy. + drivers/virtio/virtio_balloon.c | 6 +++--- + drivers/virtio/virtio_pci.c | 11 ++++++----- + 2 files changed, 9 insertions(+), 8 deletions(-) +Merging input/next (c22e9b3 Input: add EETI eGalax I2C capacitive multi touch driver) +$ git merge input/next +Resolved 'drivers/input/keyboard/Kconfig' using previous resolution. +Resolved 'drivers/input/keyboard/samsung-keypad.c' using previous resolution. +Auto-merging drivers/input/touchscreen/ads7846.c +Auto-merging drivers/input/touchscreen/ad7879.c +Auto-merging drivers/input/touchscreen/ad7877.c +Auto-merging drivers/input/tablet/wacom_wac.c +Auto-merging drivers/input/tablet/wacom_sys.c +Auto-merging drivers/input/mouse/elantech.c +Auto-merging drivers/input/misc/ati_remote2.c +Auto-merging drivers/input/misc/adxl34x.c +Auto-merging drivers/input/keyboard/samsung-keypad.c +CONFLICT (content): Merge conflict in drivers/input/keyboard/samsung-keypad.c +Auto-merging drivers/input/keyboard/Kconfig +CONFLICT (content): Merge conflict in drivers/input/keyboard/Kconfig +Auto-merging drivers/input/input-polldev.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5edb741] Merge remote-tracking branch 'input/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/input/alps.txt | 188 +++++ + arch/arm/plat-samsung/include/plat/keypad.h | 27 +- + drivers/input/input-polldev.c | 8 +- + drivers/input/keyboard/Kconfig | 21 +- + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/atkbd.c | 40 +- + drivers/input/keyboard/lm8323.c | 11 +- + drivers/input/keyboard/samsung-keypad.c | 14 +- + drivers/input/keyboard/tca8418_keypad.c | 430 +++++++++++ + drivers/input/misc/adxl34x.c | 16 +- + drivers/input/misc/ati_remote2.c | 19 +- + drivers/input/mouse/alps.c | 1036 ++++++++++++++++++++++++--- + drivers/input/mouse/alps.h | 19 + + drivers/input/mouse/elantech.c | 7 +- + drivers/input/mouse/hgpk.c | 18 +- + drivers/input/mouse/logips2pp.c | 9 +- + drivers/input/mouse/psmouse-base.c | 36 +- + drivers/input/mouse/psmouse.h | 3 + + drivers/input/mouse/sentelic.c | 43 +- + drivers/input/mouse/synaptics.c | 197 ++++-- + drivers/input/mouse/synaptics.h | 5 + + drivers/input/mouse/trackpoint.c | 17 +- + drivers/input/serio/i8042.c | 23 +- + drivers/input/tablet/aiptek.c | 34 +- + drivers/input/tablet/wacom_sys.c | 96 +++- + drivers/input/tablet/wacom_wac.c | 110 +++- + drivers/input/tablet/wacom_wac.h | 4 +- + drivers/input/touchscreen/Kconfig | 16 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/ad7877.c | 16 +- + drivers/input/touchscreen/ad7879.c | 4 +- + drivers/input/touchscreen/ads7846.c | 8 +- + drivers/input/touchscreen/egalax_ts.c | 303 ++++++++ + drivers/input/touchscreen/usbtouchscreen.c | 36 + + include/linux/input/samsung-keypad.h | 43 ++ + include/linux/input/tca8418_keypad.h | 44 ++ + 36 files changed, 2597 insertions(+), 306 deletions(-) + create mode 100644 Documentation/input/alps.txt + create mode 100644 drivers/input/keyboard/tca8418_keypad.c + create mode 100644 drivers/input/touchscreen/egalax_ts.c + create mode 100644 include/linux/input/samsung-keypad.h + create mode 100644 include/linux/input/tca8418_keypad.h +Merging input-mt/next (02f8c6a Linux 3.0) +$ git merge input-mt/next +Already up-to-date. +Merging lsm/for-next (ca05a99 capabilities: remain source compatible with 32-bit raw legacy capability support.) +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next (a629e9a Merge branch 'for-3.3/mtip32xx' into for-next) +$ git merge block/for-next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-block | 13 - + block/genhd.c | 71 - + drivers/block/Kconfig | 2 + + drivers/block/Makefile | 1 + + drivers/block/mtip32xx/Kconfig | 9 + + drivers/block/mtip32xx/Makefile | 5 + + drivers/block/mtip32xx/mtip32xx.c | 3564 +++++++++++++++++++++++++++++++++ + drivers/block/mtip32xx/mtip32xx.h | 408 ++++ + include/linux/genhd.h | 4 - + mm/backing-dev.c | 8 + + 10 files changed, 3997 insertions(+), 88 deletions(-) + create mode 100644 drivers/block/mtip32xx/Kconfig + create mode 100644 drivers/block/mtip32xx/Makefile + create mode 100644 drivers/block/mtip32xx/mtip32xx.c + create mode 100644 drivers/block/mtip32xx/mtip32xx.h +Merging quilt/device-mapper (94956ee Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge quilt/device-mapper +Already up-to-date. +Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence) +$ git merge embedded/master +Already up-to-date. +Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3) +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master (74411c0 smc91c92_cs.c: fix bogus compiler warning) +$ git merge pcmcia/master +Already up-to-date. +Merging battery/master (85b5fbf power_supply: Fix sysfs format warning) +$ git merge battery/master +Auto-merging drivers/power/power_supply_sysfs.c +Auto-merging drivers/power/max8998_charger.c +Auto-merging drivers/power/max8997_charger.c +Auto-merging drivers/power/max8903_charger.c +Auto-merging drivers/power/max17042_battery.c +Auto-merging drivers/power/ds2780_battery.c +Merge made by the 'recursive' strategy. + .../bindings/power_supply/olpc_battery.txt | 5 + + drivers/power/ds2780_battery.c | 2 +- + drivers/power/max17042_battery.c | 17 ++-- + drivers/power/max8903_charger.c | 2 +- + drivers/power/max8997_charger.c | 1 + + drivers/power/max8998_charger.c | 2 + + drivers/power/olpc_battery.c | 79 ++++++++++++++----- + drivers/power/pda_power.c | 74 ++++++++++++++++-- + drivers/power/power_supply_sysfs.c | 4 +- + drivers/power/wm831x_power.c | 44 +++++++---- + drivers/power/z2_battery.c | 2 +- + include/linux/pda_power.h | 2 + + 12 files changed, 175 insertions(+), 59 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power_supply/olpc_battery.txt +Merging mmc/mmc-next (6c0cf5c mmc: core: Fix setting power notify state variable for non-eMMC) +$ git merge mmc/mmc-next +Auto-merging drivers/mmc/host/sdhci-tegra.c +Auto-merging drivers/mmc/host/sdhci-s3c.c +Auto-merging drivers/mmc/host/sdhci-esdhc-imx.c +Auto-merging drivers/mmc/host/omap_hsmmc.c +Auto-merging drivers/mmc/host/mxcmmc.c +Auto-merging drivers/mmc/core/sdio_io.c +Auto-merging drivers/mmc/core/sd.c +Auto-merging drivers/mmc/core/mmc.c +Auto-merging drivers/mmc/core/host.c +Auto-merging drivers/mmc/core/debugfs.c +Merge made by the 'recursive' strategy. + drivers/mmc/card/block.c | 33 ++++++++++++++++----- + drivers/mmc/core/core.c | 12 +++++++ + drivers/mmc/core/debugfs.c | 2 + + drivers/mmc/core/host.c | 57 +++++++++++++++++++++++++++++++++-- + drivers/mmc/core/mmc.c | 10 ++++-- + drivers/mmc/core/sd.c | 4 +- + drivers/mmc/core/sdio_io.c | 8 ++++- + drivers/mmc/core/sdio_ops.c | 14 +++------ + drivers/mmc/host/mxcmmc.c | 1 + + drivers/mmc/host/omap_hsmmc.c | 7 +++- + drivers/mmc/host/sdhci-cns3xxx.c | 6 +-- + drivers/mmc/host/sdhci-dove.c | 5 +-- + drivers/mmc/host/sdhci-esdhc-imx.c | 5 +-- + drivers/mmc/host/sdhci-of-esdhc.c | 5 +-- + drivers/mmc/host/sdhci-of-hlwd.c | 5 +-- + drivers/mmc/host/sdhci-pci.c | 26 ++++++++-------- + drivers/mmc/host/sdhci-pltfm.c | 18 +++++++---- + drivers/mmc/host/sdhci-pltfm.h | 6 ++- + drivers/mmc/host/sdhci-pxav2.c | 5 +-- + drivers/mmc/host/sdhci-pxav3.c | 5 +-- + drivers/mmc/host/sdhci-s3c.c | 21 +++++++++---- + drivers/mmc/host/sdhci-tegra.c | 5 +-- + drivers/mmc/host/sdhci.c | 12 +++++++- + drivers/mmc/host/sdhci.h | 2 +- + include/linux/mmc/card.h | 9 ++++++ + include/linux/mmc/host.h | 6 +++- + 26 files changed, 195 insertions(+), 94 deletions(-) +Merging kgdb/kgdb-next (880ba69 lib: rename pack_hex_byte() to hex_byte_pack()) +$ git merge kgdb/kgdb-next +Merge made by the 'recursive' strategy. +Merging slab/for-next (0999774 Merge branch 'slab/next' into for-next) +$ git merge slab/for-next +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 6 ++++++ + mm/slab.c | 30 ++++++++++++++++++++++-------- + mm/slub.c | 3 ++- + 3 files changed, 30 insertions(+), 9 deletions(-) +Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**") +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next (c7eefaf md/raid1: Mark device replaceable when we see a write error.) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + Documentation/md.txt | 22 ++- + drivers/md/md.c | 123 ++++++++--- + drivers/md/md.h | 82 ++++--- + drivers/md/multipath.c | 7 +- + drivers/md/raid1.c | 168 ++++++++++---- + drivers/md/raid1.h | 7 +- + drivers/md/raid10.c | 572 ++++++++++++++++++++++++++++++++++++--------- + drivers/md/raid10.h | 61 +++-- + drivers/md/raid5.c | 493 ++++++++++++++++++++++++++++++--------- + drivers/md/raid5.h | 98 +++++---- + include/linux/raid/md_p.h | 7 +- + 11 files changed, 1239 insertions(+), 401 deletions(-) +Merging mfd/for-next (b958f7a mfd: Fix missing abx500 header file updates) +$ git merge mfd/for-next +Already up-to-date. +Merging hdlc/hdlc-next (4a6908a Linux 2.6.28) +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next (1717c0e Revert "drm/ttm: add a way to bo_wait for either the last read or last write") +$ git merge drm/drm-next +Already up-to-date. +Merging fbdev/fbdev-next (4420dd2 video: s3c-fb: fix transparency length for pixel blending) +$ git merge fbdev/fbdev-next +Removing include/linux/display.h +Removing drivers/video/display/display-sysfs.c +Removing drivers/video/display/Makefile +Removing drivers/video/display/Kconfig +Auto-merging drivers/video/atmel_lcdfb.c +Auto-merging drivers/video/Kconfig +Auto-merging arch/arm/mach-at91/board-sam9rlek.c +Auto-merging arch/arm/mach-at91/board-sam9m10g45ek.c +Auto-merging arch/arm/mach-at91/board-sam9263ek.c +Auto-merging arch/arm/mach-at91/board-sam9261ek.c +Auto-merging arch/arm/mach-at91/board-neocore926.c +Auto-merging arch/arm/mach-at91/board-cap9adk.c +Merge made by the 'recursive' strategy. + arch/arm/mach-at91/board-cap9adk.c | 2 +- + arch/arm/mach-at91/board-neocore926.c | 2 +- + arch/arm/mach-at91/board-sam9261ek.c | 4 +- + arch/arm/mach-at91/board-sam9263ek.c | 2 +- + arch/arm/mach-at91/board-sam9m10g45ek.c | 2 +- + arch/arm/mach-at91/board-sam9rlek.c | 2 +- + drivers/video/Kconfig | 1 - + drivers/video/Makefile | 2 +- + drivers/video/atmel_lcdfb.c | 41 ++++-- + drivers/video/cirrusfb.c | 268 +++++++++++++++++-------------- + drivers/video/display/Kconfig | 24 --- + drivers/video/display/Makefile | 6 - + drivers/video/display/display-sysfs.c | 219 ------------------------- + drivers/video/s3c-fb.c | 3 +- + include/linux/display.h | 61 ------- + include/linux/zorro_ids.h | 4 +- + 16 files changed, 186 insertions(+), 457 deletions(-) + delete mode 100644 drivers/video/display/Kconfig + delete mode 100644 drivers/video/display/Makefile + delete mode 100644 drivers/video/display/display-sysfs.c + delete mode 100644 include/linux/display.h +Merging viafb/viafb-next (4ce36bb viafb: replace strict_strtoul to kstrto* and check return value) +$ git merge viafb/viafb-next +Already up-to-date. +Merging omap_dss2/for-next (3e28189 OMAPDSS: picodlp: add missing #include ) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (a92460d regulator: Don't create voltage sysfs entries if we can't read voltage) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + drivers/regulator/Kconfig | 1 + + drivers/regulator/core.c | 3 +- + drivers/regulator/fixed.c | 5 +- + drivers/regulator/max8649.c | 155 +++++++++++-------------------- + drivers/regulator/tps65023-regulator.c | 87 +++++++----------- + drivers/regulator/tps65910-regulator.c | 51 ++++------- + include/linux/mfd/tps65910.h | 33 +++++++- + 7 files changed, 143 insertions(+), 192 deletions(-) +Merging security/next (59df316 TOMOYO: Fix interactive judgment functionality.) +$ git merge security/next +Already up-to-date. +Merging selinux/master (ded5098 SELinux: skip file_name_trans_write() when policy downgraded.) +$ git merge selinux/master +Already up-to-date. +Merging lblnet/master (7e27d6e Linux 2.6.35-rc3) +$ git merge lblnet/master +Already up-to-date. +Merging watchdog/linux-next (1ea6b8f Linux 3.2-rc1) +$ git merge watchdog/linux-next +Already up-to-date. +Merging bdev/master (feaf384 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block) +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master (c3b92c8 Linux 3.1) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging iommu/next (1abb4ba Merge branches 'amd/fixes', 'debug/dma-api', 'arm/omap', 'arm/msm', 'core', 'iommu/fault-reporting' and 'api/iommu-ops-per-bus' into next) +$ git merge iommu/next +Already up-to-date. +Merging cputime/cputime (c5927fe [S390] cputime: add sparse checking and cleanup) +$ git merge cputime/cputime +Merge made by the 'recursive' strategy. + arch/ia64/include/asm/cputime.h | 69 +++++++--------- + arch/powerpc/include/asm/cputime.h | 70 ++++++---------- + arch/s390/include/asm/cputime.h | 140 ++++++++++++++----------------- + drivers/cpufreq/cpufreq_conservative.c | 29 +++---- + drivers/cpufreq/cpufreq_ondemand.c | 33 ++++---- + drivers/cpufreq/cpufreq_stats.c | 5 +- + drivers/macintosh/rack-meter.c | 11 +-- + fs/proc/array.c | 8 +- + fs/proc/stat.c | 27 +++--- + fs/proc/uptime.c | 4 +- + include/asm-generic/cputime.h | 62 +++++++-------- + include/linux/sched.h | 4 +- + kernel/acct.c | 4 +- + kernel/cpu.c | 3 +- + kernel/exit.c | 22 ++---- + kernel/fork.c | 14 +-- + kernel/itimer.c | 15 ++-- + kernel/posix-cpu-timers.c | 132 ++++++++++++------------------ + kernel/sched.c | 80 ++++++++---------- + kernel/sched_stats.h | 6 +- + kernel/signal.c | 6 +- + kernel/sys.c | 6 +- + kernel/tsacct.c | 2 +- + 23 files changed, 323 insertions(+), 429 deletions(-) +Merging osd/linux-next (dde406e pnfs-obj: Support for RAID5 read-4-write interface.) +$ git merge osd/linux-next +Merge made by the 'recursive' strategy. +Merging jc_docs/docs-next (5c050fb docs: update the development process document) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging nommu/master (0ce790e Linux 2.6.39-rc1) +$ git merge nommu/master +Already up-to-date. +Merging trivial/for-next (92094aa MAINTAINERS: update ipwireless entry) +$ git merge trivial/for-next +Auto-merging crypto/Kconfig +Auto-merging arch/s390/Kconfig +Auto-merging arch/mips/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/cpu-freq/governors.txt | 4 +-- + Documentation/scsi/53c700.txt | 21 +--------------- + MAINTAINERS | 3 +- + arch/arm/Kconfig | 3 +- + arch/arm/mach-pxa/colibri-pxa270-income.c | 2 +- + arch/cris/Kconfig.debug | 1 - + arch/frv/Kconfig | 10 ------- + arch/mips/Kconfig | 5 ---- + arch/mips/sgi-ip27/Kconfig | 6 ---- + arch/mips/sibyte/Kconfig | 1 - + arch/powerpc/platforms/40x/Kconfig | 38 ----------------------------- + arch/powerpc/platforms/44x/Kconfig | 18 +------------- + arch/powerpc/platforms/512x/Kconfig | 1 - + arch/s390/Kconfig | 1 - + crypto/Kconfig | 2 - + drivers/edac/i82975x_edac.c | 30 ++++++++++++++-------- + drivers/mtd/nand/Kconfig | 1 - + drivers/parisc/Kconfig | 7 ----- + drivers/video/console/Kconfig | 2 - + fs/namespace.c | 2 - + include/linux/cordic.h | 4 +- + include/linux/security.h | 26 ++++++++++---------- + kernel/irq/manage.c | 2 +- + lib/Kconfig | 7 ++--- + lib/cordic.c | 2 +- + net/ipv4/Kconfig | 2 - + net/netfilter/ipvs/Kconfig | 1 - + scripts/package/Makefile | 2 +- + sound/aoa/codecs/Kconfig | 8 ------ + sound/core/Kconfig | 1 - + 30 files changed, 46 insertions(+), 167 deletions(-) +Merging audit/for-next (def5754 Audit: remove spaces from audit_log_d_path) +$ git merge audit/for-next +Already up-to-date. +Merging pm/linux-next (23527e3 PM / Freezer: Fix fallout of thaw_process() -> __thaw_task() rename) +$ git merge pm/linux-next +Auto-merging mm/backing-dev.c +Auto-merging kernel/fork.c +Auto-merging kernel/exit.c +Auto-merging include/linux/sched.h +Auto-merging fs/gfs2/quota.c +Auto-merging fs/gfs2/log.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging arch/m68k/include/asm/thread_info.h +Merge made by the 'recursive' strategy. + Documentation/power/freezing-of-tasks.txt | 12 +- + arch/alpha/include/asm/thread_info.h | 2 - + arch/arm/include/asm/thread_info.h | 2 - + arch/arm/mach-shmobile/pm-sh7372.c | 22 +++- + arch/avr32/include/asm/thread_info.h | 2 - + arch/blackfin/include/asm/thread_info.h | 2 - + arch/cris/include/asm/thread_info.h | 2 - + arch/frv/include/asm/thread_info.h | 2 - + arch/h8300/include/asm/thread_info.h | 2 - + arch/ia64/include/asm/thread_info.h | 2 - + arch/m32r/include/asm/thread_info.h | 2 - + arch/m68k/include/asm/thread_info.h | 1 - + arch/microblaze/include/asm/thread_info.h | 2 - + arch/mips/include/asm/thread_info.h | 2 - + arch/mn10300/include/asm/thread_info.h | 2 - + arch/parisc/include/asm/thread_info.h | 2 - + arch/powerpc/include/asm/thread_info.h | 2 - + arch/s390/include/asm/thread_info.h | 2 - + arch/sh/include/asm/thread_info.h | 2 - + arch/sparc/include/asm/thread_info_32.h | 2 - + arch/sparc/include/asm/thread_info_64.h | 2 - + arch/um/include/asm/thread_info.h | 2 - + arch/unicore32/include/asm/thread_info.h | 2 - + arch/x86/include/asm/thread_info.h | 2 - + arch/xtensa/include/asm/thread_info.h | 2 - + drivers/base/power/clock_ops.c | 3 +- + drivers/base/power/qos.c | 18 +-- + drivers/bluetooth/btmrvl_main.c | 2 - + drivers/devfreq/devfreq.c | 2 + + drivers/mfd/twl6030-irq.c | 2 - + drivers/net/irda/stir4200.c | 2 +- + drivers/platform/x86/thinkpad_acpi.c | 15 +-- + drivers/staging/rts_pstor/rtsx.c | 2 - + drivers/usb/storage/usb.c | 13 +- + fs/btrfs/async-thread.c | 2 +- + fs/btrfs/disk-io.c | 8 +- + fs/ext4/super.c | 3 +- + fs/fs-writeback.c | 4 +- + fs/gfs2/log.c | 4 +- + fs/gfs2/quota.c | 4 +- + fs/jbd/journal.c | 2 +- + fs/jbd2/journal.c | 2 +- + fs/jfs/jfs_logmgr.c | 2 +- + fs/jfs/jfs_txnmgr.c | 4 +- + fs/nilfs2/segment.c | 2 +- + fs/xfs/xfs_buf.c | 2 +- + include/linux/freezer.h | 108 ++++++---------- + include/linux/kthread.h | 1 + + include/linux/sched.h | 4 +- + kernel/cgroup_freezer.c | 63 ++++----- + kernel/exit.c | 3 +- + kernel/fork.c | 1 - + kernel/freezer.c | 203 +++++++++++++++-------------- + kernel/kthread.c | 27 ++++- + kernel/power/hibernate.c | 15 +-- + kernel/power/process.c | 77 +++++------- + kernel/power/suspend.c | 8 +- + kernel/power/user.c | 4 +- + mm/backing-dev.c | 8 +- + mm/oom_kill.c | 2 +- + 60 files changed, 301 insertions(+), 400 deletions(-) +$ git revert cd3bc8fbc2d5 +[master abca3a7] Revert "freezer: kill unused set_freezable_with_signal()" + 4 files changed, 42 insertions(+), 8 deletions(-) +Merging apm/for-next (73692d9 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm) +$ git merge apm/for-next +Already up-to-date. +Merging fsnotify/for-next (ef9bf3b fanotify: only destroy a mark if both its mask and its ignored_mask are cleared) +$ git merge fsnotify/for-next +Auto-merging include/linux/fsnotify_backend.h +Auto-merging fs/notify/mark.c +Auto-merging fs/notify/group.c +Auto-merging fs/notify/fanotify/fanotify_user.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/cachefiles/namei.c +Merge made by the 'recursive' strategy. + fs/cachefiles/namei.c | 1 - + fs/cachefiles/xattr.c | 1 - + fs/nfsd/vfs.c | 3 - + fs/notify/dnotify/dnotify.c | 15 +++--- + fs/notify/fanotify/fanotify.c | 24 +++++---- + fs/notify/fanotify/fanotify_user.c | 101 +++++++++++++++++++++++++----------- + fs/notify/group.c | 1 + + fs/notify/mark.c | 36 +++++-------- + include/linux/fanotify.h | 5 ++- + include/linux/fsnotify_backend.h | 14 ++++- + 10 files changed, 121 insertions(+), 80 deletions(-) +Merging irda/for-next (94d57c4 enic: Update MAINTAINERS) +$ git merge irda/for-next +Already up-to-date. +Merging edac/linux_next (4d096ca MAINTAINERS: add an entry for Edac Sandy Bridge driver) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (1f6189e amd64_edac: Cleanup return type of amd64_determine_edac_cap()) +$ git merge edac-amd/for-next +Already up-to-date. +Merging devicetree/devicetree/next (ae97159 of_mdio: Don't phy_scan_fixups() twice) +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging spi/spi/next (940ab88 drivercore: Add helper macro for platform_driver boilerplate) +$ git merge spi/spi/next +Already up-to-date. +Merging gpio/gpio/next (d92ef29 h8300: Move gpio.h to gpio-internal.h) +$ git merge gpio/gpio/next +Already up-to-date. +Merging tip/auto-latest (e471db8 Merge branch 'perf/core' into auto-latest) +$ git merge tip/auto-latest +Recorded preimage for 'MAINTAINERS' +Resolved 'arch/x86/kernel/cpu/amd.c' using previous resolution. +Resolved 'drivers/char/random.c' using previous resolution. +Auto-merging drivers/char/random.c +CONFLICT (content): Merge conflict in drivers/char/random.c +Auto-merging arch/x86/xen/mmu.c +Auto-merging arch/x86/kernel/vsyscall_64.c +Auto-merging arch/x86/kernel/cpu/amd.c +CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/amd.c +Auto-merging arch/x86/Kconfig +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'MAINTAINERS'. +[master a905351] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-platform-ts5500 | 46 +++ + MAINTAINERS | 5 + + arch/x86/Kconfig | 2 + + arch/x86/include/asm/pgtable_types.h | 1 - + arch/x86/include/asm/x86_init.h | 12 - + arch/x86/kernel/vsyscall_64.c | 2 +- + arch/x86/kernel/x86_init.c | 4 - + arch/x86/mm/init.c | 145 ++++++-- + arch/x86/platform/Makefile | 1 + + arch/x86/platform/ts5500/Kconfig | 28 ++ + arch/x86/platform/ts5500/Makefile | 4 + + arch/x86/platform/ts5500/ts5500.c | 468 +++++++++++++++++++++++ + arch/x86/platform/ts5500/ts5500_adc.c | 326 ++++++++++++++++ + arch/x86/platform/ts5500/ts5500_adc.h | 62 +++ + arch/x86/platform/ts5500/ts5500_gpio.c | 413 ++++++++++++++++++++ + arch/x86/platform/ts5500/ts5500_gpio.h | 60 +++ + arch/x86/platform/ts5500/ts5500_led.c | 115 ++++++ + arch/x86/xen/mmu.c | 15 - + 18 files changed, 1639 insertions(+), 70 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-platform-ts5500 + create mode 100644 arch/x86/platform/ts5500/Kconfig + create mode 100644 arch/x86/platform/ts5500/Makefile + create mode 100644 arch/x86/platform/ts5500/ts5500.c + create mode 100644 arch/x86/platform/ts5500/ts5500_adc.c + create mode 100644 arch/x86/platform/ts5500/ts5500_adc.h + create mode 100644 arch/x86/platform/ts5500/ts5500_gpio.c + create mode 100644 arch/x86/platform/ts5500/ts5500_gpio.h + create mode 100644 arch/x86/platform/ts5500/ts5500_led.c +Merging rcu/rcu/next (afe24b1 rcu: Move propagation of ->completed from rcu_start_gp() to rcu_report_qs_rsp()) +$ git merge rcu/rcu/next +Already up-to-date. +Merging kmemleak/kmemleak (cbc6e60 kmemleak: Handle percpu memory allocation) +$ git merge kmemleak/kmemleak +Merge made by the 'recursive' strategy. + Documentation/kmemleak.txt | 3 + + include/linux/kmemleak.h | 8 ++ + mm/kmemleak.c | 152 +++++++++++++++++++++++++++++++++++++------- + mm/percpu.c | 12 +++- + 4 files changed, 150 insertions(+), 25 deletions(-) +Merging kvm/kvm-updates/3.2 (a3e06bb KVM: emulate lapic tsc deadline timer for guest) +$ git merge kvm/kvm-updates/3.2 +Already up-to-date. +Merging oprofile/for-next (de346b6 Merge branch 'perf/core' into oprofile/master) +$ git merge oprofile/for-next +Auto-merging kernel/events/core.c +Removing arch/x86/oprofile/nmi_timer_int.c +Auto-merging arch/x86/oprofile/nmi_int.c +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 3 + + arch/Kconfig | 4 + + arch/x86/oprofile/Makefile | 3 +- + arch/x86/oprofile/init.c | 25 ++---- + arch/x86/oprofile/nmi_int.c | 27 ++++- + arch/x86/oprofile/nmi_timer_int.c | 50 ---------- + drivers/oprofile/nmi_timer_int.c | 173 +++++++++++++++++++++++++++++++++++ + drivers/oprofile/oprof.c | 21 ++++- + drivers/oprofile/oprof.h | 9 ++ + drivers/oprofile/timer_int.c | 29 +++--- + kernel/events/core.c | 2 + + 11 files changed, 252 insertions(+), 94 deletions(-) + delete mode 100644 arch/x86/oprofile/nmi_timer_int.c + create mode 100644 drivers/oprofile/nmi_timer_int.c +Merging xen/upstream/xen (ec8161f Merge branch 'upstream/microcode' into upstream/xen) +$ git merge xen/upstream/xen +Resolved 'arch/x86/xen/Kconfig' using previous resolution. +Auto-merging arch/x86/xen/Kconfig +CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig +Auto-merging arch/x86/kernel/microcode_core.c +Auto-merging arch/x86/kernel/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b4478a7] Merge remote-tracking branch 'xen/upstream/xen' +$ git diff -M --stat --summary HEAD^.. + arch/x86/include/asm/microcode.h | 9 ++ + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/microcode_core.c | 5 +- + arch/x86/kernel/microcode_xen.c | 198 ++++++++++++++++++++++++++++++++++++++ + arch/x86/xen/Kconfig | 4 + + 5 files changed, 216 insertions(+), 1 deletions(-) + create mode 100644 arch/x86/kernel/microcode_xen.c +Merging xen-two/linux-next (3155521 Revert "hvc_console: display printk messages on console.") +$ git merge xen-two/linux-next +Already up-to-date. +Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend) +$ git merge xen-pvhvm/linux-next +Already up-to-date. +Merging percpu/for-next (bc499f9 percpu: rename pcpu_mem_alloc to pcpu_mem_zalloc) +$ git merge percpu/for-next +Auto-merging mm/percpu.c +Merge made by the 'recursive' strategy. + mm/percpu-vm.c | 5 ++--- + mm/percpu.c | 17 +++++++++-------- + 2 files changed, 11 insertions(+), 11 deletions(-) +Merging workqueues/for-next (9c5a2ba workqueue: separate out drain_workqueue() from destroy_workqueue()) +$ git merge workqueues/for-next +Already up-to-date. +Merging sfi/sfi-test (5b026c4 SFI: use ioremap_cache() instead of ioremap()) +$ git merge sfi/sfi-test +Already up-to-date. +Merging asm-generic/next (35dbc0e asm-generic/io.h: allow people to override individual funcs) +$ git merge asm-generic/next +Already up-to-date. +Merging drivers-x86/linux-next (15b956a acer-wmi: support Lenovo ideapad S205 wifi switch) +$ git merge drivers-x86/linux-next +Already up-to-date. +Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison) +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master (c2f5631 sysctl: remove impossible condition check) +$ git merge sysctl/master +Auto-merging fs/proc/proc_sysctl.c +Merge made by the 'recursive' strategy. + fs/proc/proc_sysctl.c | 14 ++------------ + 1 files changed, 2 insertions(+), 12 deletions(-) +Merging namespace/master (7e05c93 proc: Fix the proc access checks to namespace files.) +$ git merge namespace/master +Auto-merging fs/proc/inode.c +Merge made by the 'recursive' strategy. + fs/proc/inode.c | 6 +- + fs/proc/namespaces.c | 160 +++++++++++++++++++++++++++++++++++++++++++------- + 2 files changed, 142 insertions(+), 24 deletions(-) +Merging regmap/for-next (58072cb regmap: Fix memory leak in regmap_init error path) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/Kconfig | 3 + + drivers/base/regmap/Makefile | 4 +- + drivers/base/regmap/regcache-lzo.c | 17 ++- + drivers/base/regmap/regmap-irq.c | 284 ++++++++++++++++++++++++++++++++++++ + drivers/base/regmap/regmap.c | 39 +++-- + include/linux/regmap.h | 49 ++++++- + 6 files changed, 371 insertions(+), 25 deletions(-) + create mode 100644 drivers/base/regmap/regmap-irq.c +Merging driver-core/driver-core-next (1ea6b8f Linux 3.2-rc1) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (1ea6b8f Linux 3.2-rc1) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (1ea6b8f Linux 3.2-rc1) +$ git merge usb/usb-next +Already up-to-date. +Merging staging/staging-next (1ea6b8f Linux 3.2-rc1) +$ git merge staging/staging-next +Already up-to-date. +Merging bkl-config/config (4ba8216 BKL: That's all, folks) +$ git merge bkl-config/config +Already up-to-date. +Merging tmem/tmem (665c1e6 mm: cleancache: Use __read_mostly as appropiate.) +$ git merge tmem/tmem +Resolved 'mm/swapfile.c' using previous resolution. +Auto-merging mm/truncate.c +Auto-merging mm/swapfile.c +CONFLICT (content): Merge conflict in mm/swapfile.c +Auto-merging mm/filemap.c +Auto-merging mm/Makefile +Auto-merging mm/Kconfig +Auto-merging include/linux/swap.h +Auto-merging fs/super.c +Auto-merging fs/buffer.c +Auto-merging drivers/staging/zcache/zcache-main.c +Removing Documentation/ABI/testing/sysfs-kernel-mm-cleancache +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3e845a9] Merge remote-tracking branch 'tmem/tmem' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-kernel-mm-cleancache | 11 - + Documentation/vm/cleancache.txt | 41 ++-- + Documentation/vm/frontswap.txt | 210 +++++++++++++++ + drivers/staging/zcache/zcache-main.c | 10 +- + drivers/xen/tmem.c | 10 +- + fs/buffer.c | 2 +- + fs/super.c | 2 +- + include/linux/cleancache.h | 24 +- + include/linux/frontswap.h | 126 +++++++++ + include/linux/swap.h | 4 + + include/linux/swapfile.h | 13 + + mm/Kconfig | 17 ++ + mm/Makefile | 1 + + mm/cleancache.c | 98 +++----- + mm/filemap.c | 2 +- + mm/frontswap.c | 273 ++++++++++++++++++++ + mm/page_io.c | 12 + + mm/swapfile.c | 64 ++++- + mm/truncate.c | 10 +- + 19 files changed, 796 insertions(+), 134 deletions(-) + delete mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-cleancache + create mode 100644 Documentation/vm/frontswap.txt + create mode 100644 include/linux/frontswap.h + create mode 100644 include/linux/swapfile.h + create mode 100644 mm/frontswap.c +Merging writeback/writeback-for-next (1ea6b8f Linux 3.2-rc1) +$ git merge writeback/writeback-for-next +Already up-to-date. +Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface) +$ git merge arm-dt/devicetree/arm-next +Already up-to-date. +Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries) +$ git merge hwspinlock/linux-next +Already up-to-date. +Merging pinctrl/for-next (412a6bf pinctrl: add a pin_base for sparse gpio-ranges) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + Documentation/pinctrl.txt | 46 ++++++++---------- + drivers/pinctrl/Kconfig | 22 +++------ + drivers/pinctrl/core.c | 33 +++++++++++++- + drivers/pinctrl/core.h | 4 +- + drivers/pinctrl/pinmux-sirf.c | 6 ++- + drivers/pinctrl/pinmux-u300.c | 1 + + drivers/pinctrl/pinmux.c | 97 +++++++++++++++----------------------- + include/linux/pinctrl/pinctrl.h | 3 + + include/linux/pinctrl/pinmux.h | 5 ++- + 9 files changed, 114 insertions(+), 103 deletions(-) +Merging moduleh/for-sfr (6aec187 drivers/media: video/a5k6aa is a module and so needs module.h) +$ git merge moduleh/for-sfr +Already up-to-date. +Merging kvmtool/master (ef10d0b kvm tools: Add abstract virtio transport layer) +$ git merge kvmtool/master +Resolved 'include/net/9p/9p.h' using previous resolution. +Resolved 'scripts/kconfig/Makefile' using previous resolution. +Auto-merging scripts/kconfig/Makefile +CONFLICT (content): Merge conflict in scripts/kconfig/Makefile +Auto-merging include/net/9p/9p.h +CONFLICT (content): Merge conflict in include/net/9p/9p.h +Auto-merging arch/x86/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e45f8b4] Merge remote-tracking branch 'kvmtool/master' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 8 + + arch/x86/Kconfig | 30 + + scripts/kconfig/Makefile | 6 +- + tools/kvm/.gitignore | 10 + + tools/kvm/CREDITS-Git | 30 + + tools/kvm/Documentation/kernel-debugging.txt | 15 + + tools/kvm/Documentation/kvm-balloon.txt | 24 + + tools/kvm/Documentation/kvm-debug.txt | 16 + + tools/kvm/Documentation/kvm-list.txt | 16 + + tools/kvm/Documentation/kvm-pause.txt | 16 + + tools/kvm/Documentation/kvm-resume.txt | 16 + + tools/kvm/Documentation/kvm-run.txt | 62 ++ + tools/kvm/Documentation/kvm-setup.txt | 15 + + tools/kvm/Documentation/kvm-stat.txt | 19 + + tools/kvm/Documentation/kvm-stop.txt | 16 + + tools/kvm/Documentation/kvm-version.txt | 21 + + tools/kvm/Makefile | 307 ++++++ + tools/kvm/README | 109 +++ + tools/kvm/bios.c | 174 ++++ + tools/kvm/bios/.gitignore | 3 + + tools/kvm/bios/bios-rom.S | 12 + + tools/kvm/bios/e820.c | 72 ++ + tools/kvm/bios/entry.S | 92 ++ + tools/kvm/bios/gen-offsets.sh | 14 + + tools/kvm/bios/int10.c | 110 +++ + tools/kvm/bios/int15.c | 18 + + tools/kvm/bios/local.S | 7 + + tools/kvm/bios/macro.S | 25 + + tools/kvm/bios/memcpy.c | 23 + + tools/kvm/bios/rom.ld.S | 17 + + tools/kvm/builtin-balloon.c | 90 ++ + tools/kvm/builtin-debug.c | 89 ++ + tools/kvm/builtin-help.c | 62 ++ + tools/kvm/builtin-list.c | 156 +++ + tools/kvm/builtin-pause.c | 78 ++ + tools/kvm/builtin-resume.c | 78 ++ + tools/kvm/builtin-run.c | 995 +++++++++++++++++++ + tools/kvm/builtin-setup.c | 241 +++++ + tools/kvm/builtin-stat.c | 131 +++ + tools/kvm/builtin-stop.c | 78 ++ + tools/kvm/builtin-version.c | 15 + + tools/kvm/code16gcc.h | 15 + + tools/kvm/command-list.txt | 14 + + tools/kvm/config/feature-tests.mak | 168 ++++ + tools/kvm/config/utilities.mak | 188 ++++ + tools/kvm/cpuid.c | 55 ++ + tools/kvm/disk/blk.c | 39 + + tools/kvm/disk/core.c | 241 +++++ + tools/kvm/disk/qcow.c | 1334 ++++++++++++++++++++++++++ + tools/kvm/disk/raw.c | 142 +++ + tools/kvm/framebuffer.c | 68 ++ + tools/kvm/guest/init.c | 46 + + tools/kvm/guest/passwd | 1 + + tools/kvm/guest_compat.c | 104 ++ + tools/kvm/hw/i8042.c | 348 +++++++ + tools/kvm/hw/pci-shmem.c | 261 +++++ + tools/kvm/hw/rtc.c | 87 ++ + tools/kvm/hw/serial.c | 364 +++++++ + tools/kvm/hw/vesa.c | 77 ++ + tools/kvm/include/asm/hweight.h | 8 + + tools/kvm/include/bios/memcpy.h | 9 + + tools/kvm/include/kvm/8250-serial.h | 10 + + tools/kvm/include/kvm/apic.h | 17 + + tools/kvm/include/kvm/assembly.h | 24 + + tools/kvm/include/kvm/barrier.h | 15 + + tools/kvm/include/kvm/bios-export.h | 13 + + tools/kvm/include/kvm/bios.h | 88 ++ + tools/kvm/include/kvm/boot-protocol.h | 16 + + tools/kvm/include/kvm/brlock.h | 41 + + tools/kvm/include/kvm/builtin-balloon.h | 7 + + tools/kvm/include/kvm/builtin-debug.h | 7 + + tools/kvm/include/kvm/builtin-help.h | 6 + + tools/kvm/include/kvm/builtin-list.h | 7 + + tools/kvm/include/kvm/builtin-pause.h | 7 + + tools/kvm/include/kvm/builtin-resume.h | 7 + + tools/kvm/include/kvm/builtin-run.h | 7 + + tools/kvm/include/kvm/builtin-setup.h | 9 + + tools/kvm/include/kvm/builtin-stat.h | 7 + + tools/kvm/include/kvm/builtin-stop.h | 7 + + tools/kvm/include/kvm/builtin-version.h | 6 + + tools/kvm/include/kvm/compiler.h | 6 + + tools/kvm/include/kvm/cpufeature.h | 41 + + tools/kvm/include/kvm/disk-image.h | 81 ++ + tools/kvm/include/kvm/e820.h | 12 + + tools/kvm/include/kvm/framebuffer.h | 34 + + tools/kvm/include/kvm/guest_compat.h | 9 + + tools/kvm/include/kvm/i8042.h | 12 + + tools/kvm/include/kvm/interrupt.h | 26 + + tools/kvm/include/kvm/ioeventfd.h | 27 + + tools/kvm/include/kvm/ioport.h | 65 ++ + tools/kvm/include/kvm/irq.h | 31 + + tools/kvm/include/kvm/kvm-cmd.h | 17 + + tools/kvm/include/kvm/kvm-cpu.h | 46 + + tools/kvm/include/kvm/kvm-ipc.h | 27 + + tools/kvm/include/kvm/kvm.h | 108 +++ + tools/kvm/include/kvm/mptable.h | 8 + + tools/kvm/include/kvm/mutex.h | 33 + + tools/kvm/include/kvm/parse-options.h | 213 ++++ + tools/kvm/include/kvm/pci-shmem.h | 28 + + tools/kvm/include/kvm/pci.h | 74 ++ + tools/kvm/include/kvm/qcow.h | 131 +++ + tools/kvm/include/kvm/rbtree-interval.h | 27 + + tools/kvm/include/kvm/read-write.h | 43 + + tools/kvm/include/kvm/rtc.h | 6 + + tools/kvm/include/kvm/rwsem.h | 39 + + tools/kvm/include/kvm/sdl.h | 17 + + tools/kvm/include/kvm/segment.h | 21 + + tools/kvm/include/kvm/strbuf.h | 6 + + tools/kvm/include/kvm/symbol.h | 22 + + tools/kvm/include/kvm/term.h | 18 + + tools/kvm/include/kvm/threadpool.h | 37 + + tools/kvm/include/kvm/types.h | 7 + + tools/kvm/include/kvm/uip.h | 358 +++++++ + tools/kvm/include/kvm/util.h | 78 ++ + tools/kvm/include/kvm/vesa.h | 18 + + tools/kvm/include/kvm/virtio-9p.h | 74 ++ + tools/kvm/include/kvm/virtio-balloon.h | 8 + + tools/kvm/include/kvm/virtio-blk.h | 13 + + tools/kvm/include/kvm/virtio-console.h | 9 + + tools/kvm/include/kvm/virtio-net.h | 21 + + tools/kvm/include/kvm/virtio-pci-dev.h | 37 + + tools/kvm/include/kvm/virtio-pci.h | 49 + + tools/kvm/include/kvm/virtio-rng.h | 9 + + tools/kvm/include/kvm/virtio-trans.h | 41 + + tools/kvm/include/kvm/virtio.h | 62 ++ + tools/kvm/include/kvm/vnc.h | 14 + + tools/kvm/include/linux/bitops.h | 33 + + tools/kvm/include/linux/byteorder.h | 7 + + tools/kvm/include/linux/kernel.h | 39 + + tools/kvm/include/linux/module.h | 6 + + tools/kvm/include/linux/prefetch.h | 6 + + tools/kvm/include/linux/types.h | 50 + + tools/kvm/interrupt.c | 27 + + tools/kvm/ioeventfd.c | 128 +++ + tools/kvm/ioport.c | 192 ++++ + tools/kvm/irq.c | 193 ++++ + tools/kvm/kvm-cmd.c | 91 ++ + tools/kvm/kvm-cpu.c | 523 ++++++++++ + tools/kvm/kvm-ipc.c | 171 ++++ + tools/kvm/kvm.c | 821 ++++++++++++++++ + tools/kvm/main.c | 19 + + tools/kvm/mmio.c | 132 +++ + tools/kvm/mptable.c | 284 ++++++ + tools/kvm/net/uip/arp.c | 30 + + tools/kvm/net/uip/buf.c | 114 +++ + tools/kvm/net/uip/core.c | 190 ++++ + tools/kvm/net/uip/csum.c | 92 ++ + tools/kvm/net/uip/dhcp.c | 203 ++++ + tools/kvm/net/uip/icmp.c | 29 + + tools/kvm/net/uip/ipv4.c | 29 + + tools/kvm/net/uip/tcp.c | 317 ++++++ + tools/kvm/net/uip/udp.c | 236 +++++ + tools/kvm/pci.c | 169 ++++ + tools/kvm/read-write.c | 344 +++++++ + tools/kvm/symbol.c | 98 ++ + tools/kvm/term.c | 170 ++++ + tools/kvm/tests/Makefile | 19 + + tools/kvm/tests/boot/Makefile | 13 + + tools/kvm/tests/boot/init.c | 11 + + tools/kvm/tests/kernel/.gitignore | 2 + + tools/kvm/tests/kernel/Makefile | 20 + + tools/kvm/tests/kernel/README | 16 + + tools/kvm/tests/kernel/kernel.S | 8 + + tools/kvm/tests/pit/.gitignore | 2 + + tools/kvm/tests/pit/Makefile | 20 + + tools/kvm/tests/pit/README | 16 + + tools/kvm/tests/pit/tick.S | 109 +++ + tools/kvm/threadpool.c | 146 +++ + tools/kvm/ui/sdl.c | 280 ++++++ + tools/kvm/ui/vnc.c | 218 +++++ + tools/kvm/util.c | 101 ++ + tools/kvm/util/KVMTOOLS-VERSION-GEN | 40 + + tools/kvm/util/generate-cmdlist.sh | 23 + + tools/kvm/util/kvm-ifup-vbr0 | 6 + + tools/kvm/util/parse-options.c | 577 +++++++++++ + tools/kvm/util/rbtree-interval.c | 90 ++ + tools/kvm/util/set_private_br.sh | 51 + + tools/kvm/util/strbuf.c | 13 + + tools/kvm/virtio/9p-pdu.c | 287 ++++++ + tools/kvm/virtio/9p.c | 1320 +++++++++++++++++++++++++ + tools/kvm/virtio/balloon.c | 268 ++++++ + tools/kvm/virtio/blk.c | 293 ++++++ + tools/kvm/virtio/console.c | 204 ++++ + tools/kvm/virtio/core.c | 111 +++ + tools/kvm/virtio/net.c | 427 ++++++++ + tools/kvm/virtio/pci.c | 341 +++++++ + tools/kvm/virtio/rng.c | 189 ++++ + tools/kvm/virtio/trans.c | 22 + + 188 files changed, 19234 insertions(+), 1 deletions(-) + create mode 100644 tools/kvm/.gitignore + create mode 100644 tools/kvm/CREDITS-Git + create mode 100644 tools/kvm/Documentation/kernel-debugging.txt + create mode 100644 tools/kvm/Documentation/kvm-balloon.txt + create mode 100644 tools/kvm/Documentation/kvm-debug.txt + create mode 100644 tools/kvm/Documentation/kvm-list.txt + create mode 100644 tools/kvm/Documentation/kvm-pause.txt + create mode 100644 tools/kvm/Documentation/kvm-resume.txt + create mode 100644 tools/kvm/Documentation/kvm-run.txt + create mode 100644 tools/kvm/Documentation/kvm-setup.txt + create mode 100644 tools/kvm/Documentation/kvm-stat.txt + create mode 100644 tools/kvm/Documentation/kvm-stop.txt + create mode 100644 tools/kvm/Documentation/kvm-version.txt + create mode 100644 tools/kvm/Makefile + create mode 100644 tools/kvm/README + create mode 100644 tools/kvm/bios.c + create mode 100644 tools/kvm/bios/.gitignore + create mode 100644 tools/kvm/bios/bios-rom.S + create mode 100644 tools/kvm/bios/e820.c + create mode 100644 tools/kvm/bios/entry.S + create mode 100644 tools/kvm/bios/gen-offsets.sh + create mode 100644 tools/kvm/bios/int10.c + create mode 100644 tools/kvm/bios/int15.c + create mode 100644 tools/kvm/bios/local.S + create mode 100644 tools/kvm/bios/macro.S + create mode 100644 tools/kvm/bios/memcpy.c + create mode 100644 tools/kvm/bios/rom.ld.S + create mode 100644 tools/kvm/builtin-balloon.c + create mode 100644 tools/kvm/builtin-debug.c + create mode 100644 tools/kvm/builtin-help.c + create mode 100644 tools/kvm/builtin-list.c + create mode 100644 tools/kvm/builtin-pause.c + create mode 100644 tools/kvm/builtin-resume.c + create mode 100644 tools/kvm/builtin-run.c + create mode 100644 tools/kvm/builtin-setup.c + create mode 100644 tools/kvm/builtin-stat.c + create mode 100644 tools/kvm/builtin-stop.c + create mode 100644 tools/kvm/builtin-version.c + create mode 100644 tools/kvm/code16gcc.h + create mode 100644 tools/kvm/command-list.txt + create mode 100644 tools/kvm/config/feature-tests.mak + create mode 100644 tools/kvm/config/utilities.mak + create mode 100644 tools/kvm/cpuid.c + create mode 100644 tools/kvm/disk/blk.c + create mode 100644 tools/kvm/disk/core.c + create mode 100644 tools/kvm/disk/qcow.c + create mode 100644 tools/kvm/disk/raw.c + create mode 100644 tools/kvm/framebuffer.c + create mode 100644 tools/kvm/guest/init.c + create mode 100644 tools/kvm/guest/passwd + create mode 100644 tools/kvm/guest_compat.c + create mode 100644 tools/kvm/hw/i8042.c + create mode 100644 tools/kvm/hw/pci-shmem.c + create mode 100644 tools/kvm/hw/rtc.c + create mode 100644 tools/kvm/hw/serial.c + create mode 100644 tools/kvm/hw/vesa.c + create mode 100644 tools/kvm/include/asm/hweight.h + create mode 100644 tools/kvm/include/bios/memcpy.h + create mode 100644 tools/kvm/include/kvm/8250-serial.h + create mode 100644 tools/kvm/include/kvm/apic.h + create mode 100644 tools/kvm/include/kvm/assembly.h + create mode 100644 tools/kvm/include/kvm/barrier.h + create mode 100644 tools/kvm/include/kvm/bios-export.h + create mode 100644 tools/kvm/include/kvm/bios.h + create mode 100644 tools/kvm/include/kvm/boot-protocol.h + create mode 100644 tools/kvm/include/kvm/brlock.h + create mode 100644 tools/kvm/include/kvm/builtin-balloon.h + create mode 100644 tools/kvm/include/kvm/builtin-debug.h + create mode 100644 tools/kvm/include/kvm/builtin-help.h + create mode 100644 tools/kvm/include/kvm/builtin-list.h + create mode 100644 tools/kvm/include/kvm/builtin-pause.h + create mode 100644 tools/kvm/include/kvm/builtin-resume.h + create mode 100644 tools/kvm/include/kvm/builtin-run.h + create mode 100644 tools/kvm/include/kvm/builtin-setup.h + create mode 100644 tools/kvm/include/kvm/builtin-stat.h + create mode 100644 tools/kvm/include/kvm/builtin-stop.h + create mode 100644 tools/kvm/include/kvm/builtin-version.h + create mode 100644 tools/kvm/include/kvm/compiler.h + create mode 100644 tools/kvm/include/kvm/cpufeature.h + create mode 100644 tools/kvm/include/kvm/disk-image.h + create mode 100644 tools/kvm/include/kvm/e820.h + create mode 100644 tools/kvm/include/kvm/framebuffer.h + create mode 100644 tools/kvm/include/kvm/guest_compat.h + create mode 100644 tools/kvm/include/kvm/i8042.h + create mode 100644 tools/kvm/include/kvm/interrupt.h + create mode 100644 tools/kvm/include/kvm/ioeventfd.h + create mode 100644 tools/kvm/include/kvm/ioport.h + create mode 100644 tools/kvm/include/kvm/irq.h + create mode 100644 tools/kvm/include/kvm/kvm-cmd.h + create mode 100644 tools/kvm/include/kvm/kvm-cpu.h + create mode 100644 tools/kvm/include/kvm/kvm-ipc.h + create mode 100644 tools/kvm/include/kvm/kvm.h + create mode 100644 tools/kvm/include/kvm/mptable.h + create mode 100644 tools/kvm/include/kvm/mutex.h + create mode 100644 tools/kvm/include/kvm/parse-options.h + create mode 100644 tools/kvm/include/kvm/pci-shmem.h + create mode 100644 tools/kvm/include/kvm/pci.h + create mode 100644 tools/kvm/include/kvm/qcow.h + create mode 100644 tools/kvm/include/kvm/rbtree-interval.h + create mode 100644 tools/kvm/include/kvm/read-write.h + create mode 100644 tools/kvm/include/kvm/rtc.h + create mode 100644 tools/kvm/include/kvm/rwsem.h + create mode 100644 tools/kvm/include/kvm/sdl.h + create mode 100644 tools/kvm/include/kvm/segment.h + create mode 100644 tools/kvm/include/kvm/strbuf.h + create mode 100644 tools/kvm/include/kvm/symbol.h + create mode 100644 tools/kvm/include/kvm/term.h + create mode 100644 tools/kvm/include/kvm/threadpool.h + create mode 100644 tools/kvm/include/kvm/types.h + create mode 100644 tools/kvm/include/kvm/uip.h + create mode 100644 tools/kvm/include/kvm/util.h + create mode 100644 tools/kvm/include/kvm/vesa.h + create mode 100644 tools/kvm/include/kvm/virtio-9p.h + create mode 100644 tools/kvm/include/kvm/virtio-balloon.h + create mode 100644 tools/kvm/include/kvm/virtio-blk.h + create mode 100644 tools/kvm/include/kvm/virtio-console.h + create mode 100644 tools/kvm/include/kvm/virtio-net.h + create mode 100644 tools/kvm/include/kvm/virtio-pci-dev.h + create mode 100644 tools/kvm/include/kvm/virtio-pci.h + create mode 100644 tools/kvm/include/kvm/virtio-rng.h + create mode 100644 tools/kvm/include/kvm/virtio-trans.h + create mode 100644 tools/kvm/include/kvm/virtio.h + create mode 100644 tools/kvm/include/kvm/vnc.h + create mode 100644 tools/kvm/include/linux/bitops.h + create mode 100644 tools/kvm/include/linux/byteorder.h + create mode 100644 tools/kvm/include/linux/kernel.h + create mode 100644 tools/kvm/include/linux/module.h + create mode 100644 tools/kvm/include/linux/prefetch.h + create mode 100644 tools/kvm/include/linux/types.h + create mode 100644 tools/kvm/interrupt.c + create mode 100644 tools/kvm/ioeventfd.c + create mode 100644 tools/kvm/ioport.c + create mode 100644 tools/kvm/irq.c + create mode 100644 tools/kvm/kvm-cmd.c + create mode 100644 tools/kvm/kvm-cpu.c + create mode 100644 tools/kvm/kvm-ipc.c + create mode 100644 tools/kvm/kvm.c + create mode 100644 tools/kvm/main.c + create mode 100644 tools/kvm/mmio.c + create mode 100644 tools/kvm/mptable.c + create mode 100644 tools/kvm/net/uip/arp.c + create mode 100644 tools/kvm/net/uip/buf.c + create mode 100644 tools/kvm/net/uip/core.c + create mode 100644 tools/kvm/net/uip/csum.c + create mode 100644 tools/kvm/net/uip/dhcp.c + create mode 100644 tools/kvm/net/uip/icmp.c + create mode 100644 tools/kvm/net/uip/ipv4.c + create mode 100644 tools/kvm/net/uip/tcp.c + create mode 100644 tools/kvm/net/uip/udp.c + create mode 100644 tools/kvm/pci.c + create mode 100644 tools/kvm/read-write.c + create mode 100644 tools/kvm/symbol.c + create mode 100644 tools/kvm/term.c + create mode 100644 tools/kvm/tests/Makefile + create mode 100644 tools/kvm/tests/boot/Makefile + create mode 100644 tools/kvm/tests/boot/init.c + create mode 100644 tools/kvm/tests/kernel/.gitignore + create mode 100644 tools/kvm/tests/kernel/Makefile + create mode 100644 tools/kvm/tests/kernel/README + create mode 100644 tools/kvm/tests/kernel/kernel.S + create mode 100644 tools/kvm/tests/pit/.gitignore + create mode 100644 tools/kvm/tests/pit/Makefile + create mode 100644 tools/kvm/tests/pit/README + create mode 100644 tools/kvm/tests/pit/tick.S + create mode 100644 tools/kvm/threadpool.c + create mode 100644 tools/kvm/ui/sdl.c + create mode 100644 tools/kvm/ui/vnc.c + create mode 100644 tools/kvm/util.c + create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN + create mode 100755 tools/kvm/util/generate-cmdlist.sh + create mode 100755 tools/kvm/util/kvm-ifup-vbr0 + create mode 100644 tools/kvm/util/parse-options.c + create mode 100644 tools/kvm/util/rbtree-interval.c + create mode 100755 tools/kvm/util/set_private_br.sh + create mode 100644 tools/kvm/util/strbuf.c + create mode 100644 tools/kvm/virtio/9p-pdu.c + create mode 100644 tools/kvm/virtio/9p.c + create mode 100644 tools/kvm/virtio/balloon.c + create mode 100644 tools/kvm/virtio/blk.c + create mode 100644 tools/kvm/virtio/console.c + create mode 100644 tools/kvm/virtio/core.c + create mode 100644 tools/kvm/virtio/net.c + create mode 100644 tools/kvm/virtio/pci.c + create mode 100644 tools/kvm/virtio/rng.c + create mode 100644 tools/kvm/virtio/trans.c +Merging scsi-post-merge/merge-base:master () +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git fetch --no-tags ../next refs/heads/quilt/akpm:akpm +From ../next + * [new branch] quilt/akpm -> akpm +$ git fetch --no-tags ../next refs/heads/quilt/akpm-base:akpm-base +From ../next + * [new branch] quilt/akpm-base -> akpm-base +$ git checkout akpm +Switched to branch 'akpm' +$ git rebase --onto master akpm-base +First, rewinding head to replay your work on top of it... +Applying: net/netfilter/nf_conntrack_netlink.c: fix Oops on container destroy +Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314 +Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver +Applying: x86: fix mmap random address range +Applying: arch/x86/kernel/e820.c: eliminate bubble sort from sanitize_e820_map +Applying: x86: rtc: don't register a platform RTC device for Intel MID platforms +Applying: mrst: battery fixes +Applying: drivers/power/intel_mid_battery.c: fix build +Applying: arch/x86/kernel/e820.c: quiet sparse noise about plain integer as NULL pointer +Applying: arch/x86/kernel/ptrace.c: quiet sparse noise +Applying: arch/x86/mm/pageattr.c: quiet sparse noise; local functions should be static +Applying: x86: tlb flush avoid superflous leave_mm() +Applying: x86: reduce clock calibration time during slave cpu startup +Applying: x86-reduce-clock-calibration-time-during-slave-cpu-startup-fix +Applying: x86/paravirt: PTE updates in k(un)map_atomic need to be synchronous, regardless of lazy_mmu mode +Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file +Applying: arm, exec: remove redundant set_fs(USER_DS) +Applying: audit: always follow va_copy() with va_end() +Applying: drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac +Applying: devtmpfsd: fix task state handling +Applying: drivers/gpu/vga/vgaarb.c: add missing kfree +Applying: drm: avoid switching to text console if there is no panic timeout +Applying: hrtimers: Special-case zero length sleeps +Applying: ia64, exec: remove redundant set_fs(USER_DS) +Applying: brlocks/lglocks: clean up code +Applying: brlocks-lglocks-clean-up-code-checkpatch-fixes +Applying: ipc/mqueue: cleanup definition names and locations +Applying: ipc/mqueue: switch back to using non-max values on create +Applying: ipc/mqueue: enforce hard limits +Applying: ipc/mqueue: update maximums for the mqueue subsystem +Applying: ipc-mqueue-update-maximums-for-the-mqueue-subsystem-fix +Applying: ipc-mqueue-update-maximums-for-the-mqueue-subsystem-checkpatch-fixes +Applying: unicore32, exec: remove redundant set_fs(USER_DS) +Applying: drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h: remove unused macro pr_fmt() +Applying: debugobjects: extend debugobjects to assert that an object is initialized +Applying: kernel/timer.c: use debugobjects to catch deletion of uninitialized timers +Applying: ext4: use proper little-endian bitops +Applying: ocfs2: avoid unaligned access to dqc_bitmap +Applying: parisc, exec: remove redundant set_fs(USER_DS) +Applying: drivers/firmware/dmi_scan.c: make dmi_name_in_vendors more focused +Applying: scsi: fix a header to include linux/types.h +Applying: drivers/scsi/megaraid.c: fix sparse warnings +Applying: drivers/scsi/aacraid/commctrl.c: fix mem leak in aac_send_raw_srb() +Applying: drivers/scsi/osd/osd_uld.c: use ida_simple_get() to handle id +Applying: drivers/scsi/sg.c: convert to kstrtoul_from_user() +Applying: drivers/scsi/mpt2sas/mpt2sas_base.c: fix mismatch in mpt2sas_base_hard_reset_handler() mutex lock-unlock +Applying: drivers/message/fusion/mptbase.c: ensure NUL-termination of MptCallbacksName elements +Applying: loop: prevent information leak after failed read +Applying: loop: cleanup set_status interface +Applying: loop-cleanup-set_status-interface-checkpatch-fixes +Applying: cciss: auto engage SCSI mid layer at driver load time +Applying: block: avoid unnecessary plug list flush +Applying: block: add missed trace_block_plug +Applying: include/linux/bio.h: use a static inline function for bio_integrity_clone() +Applying: bio: change some signed vars to unsigned +Applying: paride: fix potential information leak in pg_read() +Applying: slab: add taint flag outputting to debug paths. +Applying: slub: add taint flag outputting to debug paths +Applying: drivers/tty/serial/pch_uart.c: add console support +Applying: mm/page-writeback.c: make determine_dirtyable_memory static again +Applying: vmscan: fix initial shrinker size handling +Applying: vmscan: use atomic-long for shrinker batching +Applying: vmscan-use-atomic-long-for-shrinker-batching-fix +Applying: vmscan: promote shared file mapped pages +Applying: vmscan: activate executable pages after first usage +Applying: mm: add free_hot_cold_page_list() helper +Applying: mm: fix page-faults detection in swap-token logic +Applying: mm: add extra free kbytes tunable +Applying: mm-add-extra-free-kbytes-tunable-update +Applying: mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes +Applying: mm: add vm_area_add_early() +Applying: selinuxfs: remove custom hex_to_bin() +Applying: include/linux/security.h: fix security_inode_init_security() arg +Applying: hpet: factor timer allocate from open +Applying: intel_idle: fix API misuse +Applying: intel_idle: disable auto_demotion for hotplugged CPUs +Applying: lib/crc: add slice by 8 algorithm to crc32.c +Applying: lib-crc-add-slice-by-8-algorithm-to-crc32c-fix +Applying: epoll: limit paths +Applying: oprofilefs: handle zero-length writes +Applying: cgroups: add res_counter_write_u64() API +Applying: cgroups: new resource counter inheritance API +Applying: cgroups: add previous cgroup in can_attach_task/attach_task callbacks +Using index info to reconstruct a base tree... +Falling back to patching base and 3-way merge... +Auto-merging kernel/cgroup_freezer.c +Applying: cgroups: new cancel_attach_task() subsystem callback +Applying: cgroups: ability to stop res charge propagation on bounded ancestor +Applying: cgroups: add res counter common ancestor searching +Applying: res_counter: allow charge failure pointer to be null +Applying: cgroups: pull up res counter charge failure interpretation to caller +Applying: cgroups: allow subsystems to cancel a fork +Using index info to reconstruct a base tree... +Falling back to patching base and 3-way merge... +Auto-merging kernel/fork.c +Auto-merging kernel/exit.c +Auto-merging kernel/cgroup_freezer.c +Applying: cgroups: add a task counter subsystem +Applying: cgroups: ERR_PTR needs err.h +Applying: proc: force dcache drop on unauthorized access +Applying: kdump: fix crash_kexec()/smp_send_stop() race in panic +Applying: kdump: Add udev events for memory online/offline +Applying: ipc/sem.c: alternatives to preempt_disable() +Applying: fs/direct-io.c: calculate fs_count correctly in get_more_blocks() +Applying: vfs: cache request_queue in struct block_device +Applying: dio: optimize cache misses in the submission path +Applying: dio-optimize-cache-misses-in-the-submission-path-v2-checkpatch-fixes +Applying: dio: using prefetch requires including prefetch.h +Applying: ramoops: update parameters only after successful init +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm +From ../rebase-tmp + + 083fbff...b01633e akpm -> akpm (forced update) +$ rm -rf ../rebase-tmp +Merging akpm (b01633e ramoops: update parameters only after successful init) +$ git merge --no-ff akpm +Merge made by the 'recursive' strategy. + Documentation/DocBook/debugobjects.tmpl | 50 +++ + Documentation/blockdev/cciss.txt | 14 +- + Documentation/cgroups/cgroups.txt | 13 +- + Documentation/cgroups/resource_counter.txt | 20 ++- + Documentation/cgroups/task_counter.txt | 153 ++++++++++ + Documentation/sysctl/vm.txt | 16 + + arch/arm/include/asm/processor.h | 1 - + arch/arm/mach-ux500/mbox-db5500.c | 2 +- + arch/ia64/include/asm/processor.h | 1 - + arch/parisc/include/asm/processor.h | 2 - + arch/parisc/kernel/process.c | 1 - + arch/unicore32/include/asm/processor.h | 1 - + arch/x86/include/asm/mrst.h | 9 + + arch/x86/kernel/e820.c | 59 ++--- + arch/x86/kernel/ptrace.c | 3 +- + arch/x86/kernel/rtc.c | 5 + + arch/x86/kernel/smpboot.c | 16 +- + arch/x86/kernel/tsc.c | 20 ++ + arch/x86/mm/highmem_32.c | 2 + + arch/x86/mm/mmap.c | 4 +- + arch/x86/mm/pageattr.c | 2 +- + arch/x86/mm/tlb.c | 16 +- + arch/x86/platform/iris/iris.c | 67 ++++- + block/blk-cgroup.c | 12 +- + block/blk-core.c | 18 +- + drivers/base/devtmpfs.c | 3 +- + drivers/base/memory.c | 10 +- + drivers/block/cciss.c | 1 + + drivers/block/cciss_scsi.c | 1 + + drivers/block/loop.c | 47 ++- + drivers/block/paride/pg.c | 1 + + drivers/char/hpet.c | 56 +++- + drivers/char/ramoops.c | 17 +- + drivers/edac/mpc85xx_edac.c | 2 +- + drivers/firmware/dmi_scan.c | 6 +- + drivers/gpu/drm/drm_fb_helper.c | 7 + + drivers/gpu/vga/vgaarb.c | 18 +- + drivers/idle/intel_idle.c | 59 +++-- + drivers/message/fusion/mptbase.c | 7 +- + drivers/message/fusion/mptbase.h | 1 + + drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h | 2 - + drivers/oprofile/oprofilefs.c | 5 +- + drivers/platform/x86/acerhdf.c | 1 + + drivers/power/intel_mid_battery.c | 12 +- + drivers/scsi/aacraid/commctrl.c | 1 + + drivers/scsi/megaraid.c | 8 +- + drivers/scsi/mpt2sas/mpt2sas_base.c | 3 +- + drivers/scsi/osd/osd_uld.c | 22 +- + drivers/scsi/sg.c | 25 +- + drivers/tty/serial/Kconfig | 9 + + drivers/tty/serial/pch_uart.c | 160 ++++++++++- + fs/bio.c | 7 +- + fs/block_dev.c | 3 + + fs/dcache.c | 10 +- + fs/direct-io.c | 57 +++- + fs/eventpoll.c | 226 ++++++++++++-- + fs/ext4/ext4.h | 7 +- + fs/ext4/ialloc.c | 4 +- + fs/file_table.c | 23 +- + fs/internal.h | 3 +- + fs/namei.c | 26 +- + fs/namespace.c | 124 ++++---- + fs/ocfs2/ocfs2.h | 47 +++ + fs/ocfs2/quota_local.c | 10 +- + fs/pnode.c | 4 +- + fs/proc/base.c | 5 + + include/linux/bio.h | 10 +- + include/linux/cgroup.h | 28 ++- + include/linux/cgroup_subsys.h | 8 + + include/linux/debugobjects.h | 6 + + include/linux/eventpoll.h | 1 + + include/linux/fs.h | 5 +- + include/linux/gfp.h | 1 + + include/linux/hpet.h | 1 + + include/linux/ipc_namespace.h | 40 +++- + include/linux/lglock.h | 152 ++-------- + include/linux/mm.h | 1 + + include/linux/mm_types.h | 1 + + include/linux/mmzone.h | 2 +- + include/linux/res_counter.h | 27 ++- + include/linux/security.h | 2 +- + include/linux/shrinker.h | 2 +- + include/linux/swap.h | 36 +++ + include/linux/vmalloc.h | 1 + + include/linux/writeback.h | 2 - + include/scsi/scsi_netlink.h | 2 +- + init/Kconfig | 9 + + init/calibrate.c | 15 + + ipc/mq_sysctl.c | 31 +-- + ipc/mqueue.c | 24 +- + ipc/sem.c | 250 +++++++++++----- + kernel/Makefile | 3 +- + kernel/audit.c | 5 +- + kernel/cgroup.c | 58 +++- + kernel/cgroup_freezer.c | 9 +- + kernel/cgroup_task_counter.c | 239 +++++++++++++++ + kernel/cpuset.c | 6 +- + kernel/events/core.c | 5 +- + kernel/exit.c | 2 +- + kernel/fork.c | 8 +- + kernel/hrtimer.c | 8 + + kernel/lglock.c | 101 ++++++ + kernel/panic.c | 8 + + kernel/res_counter.c | 97 +++++- + kernel/sched.c | 6 +- + kernel/sysctl.c | 11 +- + kernel/timer.c | 54 +++- + lib/crc32.c | 370 ++++++++++++++++------- + lib/crc32defs.h | 16 +- + lib/debugobjects.c | 33 ++ + lib/gen_crc32table.c | 59 +++-- + mm/memory.c | 13 + + mm/page-writeback.c | 122 ++++---- + mm/page_alloc.c | 49 +++- + mm/rmap.c | 3 +- + mm/slab.c | 9 +- + mm/slub.c | 2 +- + mm/swap.c | 14 +- + mm/vmalloc.c | 28 ++- + mm/vmscan.c | 54 ++-- + net/netfilter/nf_conntrack_netlink.c | 5 + + security/selinux/selinuxfs.c | 14 +- + 122 files changed, 2675 insertions(+), 940 deletions(-) + create mode 100644 Documentation/cgroups/task_counter.txt + create mode 100644 kernel/cgroup_task_counter.c + create mode 100644 kernel/lglock.c +$ git am -3 ../patches/0001-freezer-fis-more-falloput-from-the-thaw_process-rena.patch +Applying: freezer: fix more fallout from the thaw_process rename diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..734736d3204b --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,12 @@ +Importing hexagon based on v3.1-rc9 +Unchanged quilt series hexagon +Importing i2c based on 3.2-rc1 +Unchanged quilt series i2c +Importing jdelvare-hwmon based on 3.2-rc1 +Unchanged quilt series jdelvare-hwmon +Importing kernel-doc based on 3.1 +Unchanged quilt series kernel-doc +Importing rr based on v3.2-rc1 +Unchanged quilt series rr +Importing device-mapper based on v3.1-10674-g94956ee +Unchanged quilt series device-mapper diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..55500c9974bc --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20111114 -- 2.39.2