diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2012-02-15 15:57:36 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2012-02-15 15:57:36 +1100 |
| commit | 69a1d1dbc0fb91b5d2a9ced68604c1bc0ea5272f (patch) | |
| tree | 610811b1debf5fd89ccf6a6c66c458fc176e8dd9 | |
| parent | 98a09b34db4e30484341a257bb2597f50be9aac6 (diff) | |
Add linux-next specific files for 20120215next-20120215
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 184 | ||||
| -rw-r--r-- | Next/Trees | 186 | ||||
| -rw-r--r-- | Next/merge.log | 6267 | ||||
| -rw-r--r-- | Next/quilt-import.log | 29 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 6667 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..1b914637b618 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,184 @@ +Name SHA1 +---- ---- +origin 13d261932bbfff7f45f288c5c8cce43177cccd3b +fixes f8275f9694b8adf9f3498e747ea4c3e8b984499b +kbuild-current 620c231c7a7f48745094727bb612f6321cfc8844 +arm-current bdf800c4fceb6d8dbe65471d214eb44a61f5bfc9 +m68k-current 2a3535069e33d8b416f406c159ce924427315303 +powerpc-merge 778a785f02ad846446e91dab49331bd7d853c514 +52xx-and-virtex-current c49f8789f532ae39019135ca038e9bc0d15aaa4a +sparc e51e07e0ac7e3ff847d640f41b7527db04d4a4e7 +scsi-rc-fixes 6f6c2aa33b915c574543f176dee89d7aefc115c1 +net 3013dc0cceb9baaf25d5624034eeaa259bf99004 +sound-current 27c3afe6e1cf129faac90405121203962da08ff4 +pci-current 3682a3946d2b0bad621db871e3bead83e523a238 +wireless c27111e5b8d6b1e9296f7075cdc35872f672b524 +driver-core.current 29bb5d4fd3140a7d5d02d858118c74a45f15c296 +tty.current 19e00f2f1d5273dbc52eab0ebc315cae3aa44b2a +usb.current 887aa58e482dbf6d35d24cfa7b3315c8f5543339 +staging.current b05ee6bf9e6c7acc38dca1466b63bb24ae5df6f3 +char-misc.current b5266ea675c5a041e2852c7ccec4cf2d4f5e0cf4 +cpufreq-current 5983fe2b29df5885880d7fa3b91aca306c7564ef +input-current 82b982c9a697e7be0745523a53334fe38a4582c8 +md-current db91ff55bdf06736b849afc1b1fce5763bbb8d5d +audit-current c158a35c8a681cf68d36f22f058f9f5466386c71 +crypto-current 3a92d687c8015860a19213e3c102cad6b722f83c +ide 0ab3d8b3213c8bb55370b11fcc5321ee4f2c5e92 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +devicetree-current 810ae3d26507e61d1f7a69e9716443df1ce41449 +spi-current c88db233251b026fda775428f0250c760553e216 +gpio-current 7e3a70fb7bccada029c188c89bfbf3c0a63c1500 +arm 827dcfbbbcbfff85a1405c40715e2c44963c2b51 +arm-perf cdd2a5b530a008f64d86631c40e38c6dc9419b91 +davinci fe0d42203cb5616eeff68b14576a0f7e2dd56625 +samsung 9edb240696bacd53f4331119d2dfd13d4cd4852f +s5p e8a4c2f77d8051f5691ddb6a15fafe70591321f6 +tegra 90482018f4271a5b8de6412dbc152e090c06fe70 +xilinx b85a3ef4ac65169b65fd2fe9bec7912bbf475ba4 +blackfin e651fe5202da3dd618a72133f3040cc125f64681 +c6x dcd6c92267155e70a94b3927bce681ce74b80d1f +cris ea78f5b898555ddfbab494c7755130362fe3cf46 +hexagon 110b3723837f231b7dda418df975bcc09e780825 +ia64 0f261ede311bfd718d84bdf50dd7fcee585e82c7 +m68k 2a3535069e33d8b416f406c159ce924427315303 +m68knommu 97202276714e4e8dd93befaad56c6a3a099a0a8a +microblaze 8597559a78e1cde158b999212bc9543682638eb1 +mips 8551715e982c8e1cd51d4fafd571a8988acbe3a6 +openrisc b6fd41e29dea9c6753b1843a77e50433e6123bcb +parisc fc99a914318c60cc9fa9c7347529f4e07dec67d8 +powerpc ef88e3911c0e0301e73fa3b3b2567aabdbe17cc4 +4xx ef88e3911c0e0301e73fa3b3b2567aabdbe17cc4 +52xx-and-virtex c1395f4cf4a1944236f0f28cdf718c4aacc88f2d +galak ef88e3911c0e0301e73fa3b3b2567aabdbe17cc4 +s390 7014bc6376dc623323e82047273bd964f4317000 +sparc-next e4e11180dfa545233e5145919b75b7fac88638df +tile 0c90547b4a3fcee184db4d54ffc1a4fb17fd54d6 +unicore32 099469502f62fbe0d7e4f0b83a2f22538367f734 +ceph 83eb26af0db71f2dfe551405c55d982288fa6178 +cifs ff4fa4a25a33f92b5653bb43add0c63bea98d464 +configfs b930c26416c4ea6855726fd977145ccea9afbdda +ecryptfs 6cfd4b42f29db32426499c9dca8885ea04b04839 +ext3 62aa2b537c6f5957afd98e29f96897419ed5ebab +ext4 d2403cab490c5a31d8400f58f7cc2d269b514326 +fuse 03c9693db0ea5605e23b8f4bbd4f7212a6fad982 +gfs2 bc5fd03ea79f5545ea7b3493122bc0be40ecdd97 +logfs 3b582f393150c72b18339bc00d7ed4fb22445ed1 +nfs 982a9fed699008aa609ed535861bc93f46610ec6 +nfsd 7a6ef8c72314f254c107c6a9ed7cb201961ee05a +ocfs2 939255798a468e1a92f03546de6e87be7b491e57 +omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84 +squashfs 3d4a1c80c4eb97187b3a61b3bfa8c804327f7a45 +v9fs f766619db2be059cd0dbba8a36176fe01a29d588 +ubifs 72d3ef6846b6cf3b88f680ea2e4ff671e1efa2b5 +xfs f65020a83ad570c1788f7d8ece67f3487166576b +vfs 9a3b4c1d5078e47c0fe1b82cf8add4be12cd49ca +pci a78cfc93c0dbf6bd97721bf57d191eb6127bb5c9 +hid 9d23d8a7215d7bdb3c218dcedcb6d32ce4de0035 +i2c c3632e0590532f1cc50f6851d896c6511687e6bd +bjdooks-i2c fc84fe19ffb9eee7e6b3301bc6cd45b22f187bd7 +jdelvare-hwmon 127e71ef2b143dd7bbd6b25d90477e3b68087100 +hwmon-staging de69184d78ccbdd710b32390dc2e1c7d42a7e6ca +kernel-doc 7e7b32ac24949774b0c19cafa353390a0eead92b +docs 5c24d8b2bf99ee93049a6f8154ef9cd7897a6e36 +v4l-dvb 18544386346b3e34d133a5ffd06e3a84eece924e +kbuild d90898e9bc6cfc4c49a804ee65b2e2bcd7d511a7 +kconfig eae1c36aea9cfe4d123b8af3ffe54109c6579810 +libata 96c4d2965023fed2d219e0b1b411cdce712c8be3 +infiniband 715252d41912941efb791a7b7bad94d2614dc5c3 +acpi eb7004e623637a6c2b32317c000d4b617b5cb053 +ieee1394 6e01490dfebe03df873e6153c25660f624ea541d +ubi ecaabdb615178dd7207f05265eb6409e7aa37865 +dlm 60f98d1839376d30e13f3e452dce2433fad3060e +scsi 76ffe8a3f766358a0ade543153625b3e4e66159d +target-updates 24d2f085fc6c3437ae2c2f631cef7459a83460de +target-merge d65b4e98d7ea3038b767b70fe8be959b2913f16d +ibft 935a9fee51c945b8942be2d7b4bae069167b4886 +isci 57872c25d27817494b58fc396f8fd4bf950c593a +slave-dma b63fd6ce71226e5e048e2035ba202b53f89a1825 +dmaengine d07a74a546981a09ba490936645fbf0d1340b96c +net-next eb40d89276705a35c9a2e05793ae63411ae357eb +wireless-next 12325280dfeba18164f9c47e226a40ab34e23ee7 +bluetooth c5993de864d96b3656e9fca38c377b130105d97a +mtd 3c3e51d5451036b1d697f0f3b73c567c5cbdc4c5 +l2-mtd 783dbd63b6b0010068e03e7fda6812021e707d53 +crypto 0cfdec7a65c98de6637e547a04a33969dc9c61b1 +sound 96c24d3225bbb07fb1a178b32006ca6c2dc2a045 +sound-asoc 60eb1ca47604a18461aba0f36383041e56a84a7a +cpufreq 6c523c614c13b84a3dc64f7a56d6855b03e6b292 +rr b7e745a6c411512991a0d5a24ad32e6309783c3c +input 023cea0ecfa2df034096c3f4afa796a0b2d1188a +input-mt 7491f3dffd99fadf1239011c0ab5346925618dae +block b3021da8f53746bc90d76694ded195e890ac9220 +device-mapper d65b4e98d7ea3038b767b70fe8be959b2913f16d +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +battery 913272b3864d6da89c70d9fc2c30ccb57794b369 +mmc 8b4e801a148b236cb4531892421cf32798c2b091 +kgdb 880ba694f6161ce4b8e14fb7be64f3d446dd5ae6 +slab 4de900b4d6b2216b7443d32e263f5de9078697a3 +uclinux 5e442a493fc59fa536c76db1fff5b49ca36a88c5 +md fae8cc5ed0714953b1ad7cf86f030d2177278424 +mfd fa884b5607085735fb11867d16c71b28c11739e0 +drm cdbe8b5426e71d09882212073c27c9dcf25a71b6 +fbdev e9474be4eb6918c91cb0d296f9744e8ec0e08c11 +viafb 4ce36bbb0497bdd3d6b8682175e5c58745b7acdd +omap_dss2 9a9016832d2601a290db4dce6dd55552bdae5b1a +regulator d46f5ea466cd05c500d8c79ba7e8e6042ed7cf69 +security 4040153087478993cbf0809f444400a3c808074c +selinux dc2e1ff2fad65a78e50d8e9dfc46c5efd33c5412 +lblnet 7e27d6e778cd87b6f2415515d7127eba53fe5d02 +watchdog 1776b7d06df7c3edfb086278dea744d3d4ca5d34 +dwmw2-iommu c3b92c8787367a8bb53d57d9789b558f1295cc96 +iommu 48d211675a2dd82e9de75665013f43b84a9d24ed +osd 0aa436b78b6c7f3bfc814b78ea752369af311c3a +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +trivial 2105b9a11fbf92a4bf16ced4dba7f59a110932b2 +audit dcd6c92267155e70a94b3927bce681ce74b80d1f +pm 40bd93bab407aa68269aeefe55a57b4745b481e8 +apm b4a133da2eaccb844a7beaef16ffd9c76a0d21d3 +fsnotify ef9bf3b7144bee6ce1da5616015cabc8771206af +edac 4d096ca7e65584dd5845e64c6400f920e694f672 +edac-amd 5a4239490efe43529c5c6be9c0f04aa6fd81f08b +devicetree 5411972995b27a9074062b6d8e106fc15bd1cd44 +spi 14af60b6fb3b76634278364b697dae2f9f360abf +gpio ff64abefb6680dfc2aca7ecaa5e695949e7335c9 +tip 630e0fd110eb2694b14685d7e0d32af91b885754 +rcu 710fbb1ca24c6a31e7ed7c6ba1262486f156d148 +cputime c3e0ef9a298e028a82ada28101ccd5cf64d209ee +uprobes 9efc679b559e219f8bf465173f808d143ea2f142 +cgroup 761b3ef50e1c2649cffbfa67a4dcb2dcdb7982ed +kmemleak d65b4e98d7ea3038b767b70fe8be959b2913f16d +kvm 4b99f72c2a9c622ad8b346bd1593b19b789d5638 +oprofile 42fcb11f001d9912d97e69406ffdfddaa0a944fe +xen 59e9a6b1ee9fa3992860eb6c48a37b163e97d205 +xen-two 53eaea00d9a05b72ecd2388ebe4a06e48d009d53 +xen-pvhvm b056b6a0144de90707cd22cf7b4f60bf69c86d59 +percpu 26dd8e0291fd699142722632c6588a438d6ef0e4 +workqueues 6b3da11b3c36fdafce3a72e0e90d6c4e99e9aad5 +hwpoison 46e387bbd82d438b9131e237e6e2cb55a825da49 +sysctl 4e75732035d7e97e001bdf6e3149d3967c0221de +regmap 902eb424ad9f6c0293c2d83ab56b452b7b65f827 +hsi 43139a61fc68f4b0af7327a0e63f340a7c81c69a +driver-core b4d2d23148b446f6853e711eb31c533c7385eba5 +tty 6816383a09b5be8d35f14f4c25dedb64498e4959 +usb 03a41f3da42b58a84bf06cc624b60922893a45af +staging 00da8eddf9eb8d432533c3a83da3a6470a45dfc4 +char-misc 838d51bfa31540d474b9562056379b6325ec07d7 +arm-soc 69bae692abbd231626976e6858c45aa247dbe099 +tmem b05b561f1dd2b8f36120c92184057b50804611a0 +writeback 977b7e3a52a7421ad33a393a38ece59f3d41c2fa +arm-dt ede338f4ce2fb5ee99d18751df32fbd3b10df268 +hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad +pinctrl 77a5988355f993840928d195f790a939200a4ff0 +moduleh 6aec187a90aeb883533c9180e2acac1e54c87f7d +vhost 1e05b62ae4bd4c1209229de367b0989b39644f88 +kmap_atomic 019e9ad394b1ec0293210a651fa242e50f790188 +modem-shm 3cff1cc0d7703b289fc2e1dbf6cc7790ccac9d5e +memblock 7bd0b0f0da3b1ec11cbcc798eb0ef747a1184077 +remoteproc 6c7b643c995ff106416ffd38131f5a60056abb2a +irqdomain 98ecf5260207e45ad587a5dc16c39f5ede467a45 +kvmtool 8bff3eb1be84ca24b8250a486743a6fe028f81ed +dma-mapping e9725412a39567abe9fd98fe929c7d634212f3d0 +ktest be405f95f0a090d1dfc26a5bb4d781c00f34479c +scsi-post-merge 65112dccf8a113737684366349d7f9ec373ddc47 +akpm 64a741a75a0361f9c9c05364178d98c73205c103 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..04b8d6ac8c5e --- /dev/null +++ b/Next/Trees @@ -0,0 +1,186 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#rc-fixes +arm-current git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +52xx-and-virtex-current git git://git.secretlab.ca/git/linux-2.6#powerpc/merge +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +scsi-rc-fixes git git://bedivere.hansenpartnership.com/git/scsi-rc-fixes-2.6.git#master +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci#for-linus +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git#master +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +cpufreq-current git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +md-current git git://neil.brown.name/md#for-linus +audit-current git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master +devicetree-current git git://git.secretlab.ca/git/linux-2.6#devicetree/merge +spi-current git git://git.secretlab.ca/git/linux-2.6#spi/merge +gpio-current git git://git.secretlab.ca/git/linux-2.6#gpio/merge +arm git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm#for-next +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +davinci git git://gitorious.org/linux-davinci/linux-davinci.git#davinci-next +samsung git git://git.fluff.org/bjdooks/linux.git#next-samsung +s5p git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git#for-next +xilinx git git://git.xilinx.com/linux-2.6-xlnx.git#arm-next +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin.git#for-linus +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +cris git git://www.jni.nu/cris.git#for-next +hexagon quilt https://www.codeaurora.org/patches/quic/hlk/linux-next/ +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/ralf/upstream-sfr.git#mips-for-linux-next +openrisc git git://openrisc.net/jonas/linux#for-upstream +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +4xx git git://git.infradead.org/users/jwboyer/powerpc-4xx.git#next +52xx-and-virtex git git://git.secretlab.ca/git/linux-2.6#powerpc/next +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master +unicore32 git git://github.com/gxt/linux.git#unicore32 +ceph git git://github.com/NewDreamNetwork/ceph-client.git#for-next +cifs git git://git.samba.org/sfrench/cifs-2.6.git#master +configfs git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git#linux-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +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 +logfs git git://github.com/prasad-joshi/logfs_upstream.git#master +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git#linux-next +omfs git git://github.com/bcopeland/omfs.git#for-next +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git#master +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://oss.sgi.com/xfs/xfs.git#for-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/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://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#for-next +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next +libata git git://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 +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +ubi git git://git.infradead.org/ubi-2.6.git#linux-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +scsi git git://bedivere.hansenpartnership.com/git/scsi-misc-2.6.git#master +target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next +target-merge git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next-merge +ibft git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft.git#linux-next +isci git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/isci.git#all +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine.git#next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master +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://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.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://github.com/rydberg/linux.git#for-next +block git git://git.kernel.dk/linux-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 +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.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git#for-next +drm git git://people.freedesktop.org/~airlied/linux.git#drm-next +fbdev git git://github.com/schandinat/linux-2.6.git#fbdev-next +viafb git git://github.com/schandinat/linux-2.6.git#viafb-next +omap_dss2 git git://gitorious.org/linux-omap-dss2/linux.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next +selinux git git://git.infradead.org/users/eparis/selinux.git#master +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master +watchdog git git://www.linux-watchdog.org/linux-watchdog.git#linux-next +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +osd git git://git.open-osd.org/linux-open-osd.git#linux-next +jc_docs git git://git.lwn.net/linux-2.6.git#docs-next +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit.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 +edac git git://git.infradead.org/users/mchehab/edac.git#linux_next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +devicetree git git://git.secretlab.ca/git/linux-2.6#devicetree/next +spi git git://git.secretlab.ca/git/linux-2.6#spi/next +gpio git git://git.secretlab.ca/git/linux-2.6#gpio/next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +cputime git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#cputime +uprobes git git://github.com/srikard/linux.git#for-next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +kmemleak git git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux.git#kmemleak +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +oprofile git git://amd64.org/linux/rric.git#for-next +xen git git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git#upstream/xen +xen-two git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git#linux-next +xen-pvhvm git git://xenbits.xen.org/people/sstabellini/linux-pvhvm.git#linux-next +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 +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 +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +hsi git git://gitorious.org/kernel-hsi/kernel-hsi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next +tmem git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm.git#linux-next +writeback git git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux.git#writeback-for-next +arm-dt git git://git.secretlab.ca/git/linux-2.6#devicetree/arm-next +hwspinlock git git://github.com/ohadbc/hwspinlock-next.git#linux-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +moduleh git git://openlinux.windriver.com/people/paulg/linux-next#for-sfr +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +kmap_atomic git git://github.com/congwang/linux.git#kmap_atomic +modem-shm git git://github.com/sjurbren/modem-ipc.git#for-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git#memblock-kill-early_node_map +remoteproc git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git#for-next +irqdomain git git://git.secretlab.ca/git/linux-2.6.git#irqdomain/next +kvmtool git git://github.com/penberg/linux-kvm.git#master +dma-mapping git git://git.infradead.org/users/kmpark/linux-samsung#dma-mapping-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +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..873926116ca3 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,6267 @@ +$ date +Wed Feb 15 10:17:48 EST 2012 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 3b582f3 Merge tag 'battery-fixes-for-v3.3-rc2' of git://git.infradead.org/users/cbou/battery-urgent +Merging origin/master (13d2619 Merge tag 'sound-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound) +$ git merge origin/master +Updating 3b582f3..13d2619 +Fast-forward + crypto/sha512_generic.c | 70 +++++++++++++++++++--------------------- + fs/cifs/connect.c | 9 +++-- + fs/cifs/dir.c | 2 +- + kernel/params.c | 3 +- + scripts/mod/file2alias.c | 2 +- + sound/pci/hda/patch_realtek.c | 23 +++++++++++++ + sound/pci/hda/patch_sigmatel.c | 4 +- + sound/pci/hda/patch_via.c | 3 ++ + sound/pci/intel8x0.c | 6 +++ + sound/soc/sh/fsi.c | 6 +--- + 10 files changed, 77 insertions(+), 51 deletions(-) +Merging fixes/master (f8275f9 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (620c231 kbuild: do not check for ancient modutils tools) +$ git merge kbuild-current/rc-fixes +Merge made by the 'recursive' strategy. + scripts/depmod.sh | 6 ------ + 1 files changed, 0 insertions(+), 6 deletions(-) +Merging arm-current/fixes (bdf800c ARM: 7322/1: Print BUG instead of undefined instruction on BUG_ON()) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (2a35350 m68k: Fix assembler constraint to prevent overeager gcc optimisation) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge (778a785 powerpc/pseries/eeh: Fix crash when error happens during device probe) +$ git merge powerpc-merge/merge +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/ppc-pci.h | 5 +++++ + arch/powerpc/include/asm/ptrace.h | 20 ++++++++++++-------- + arch/powerpc/kernel/irq.c | 6 +++++- + arch/powerpc/kernel/rtas.c | 5 +++-- + arch/powerpc/platforms/powernv/pci.c | 22 ++++++++++++++-------- + arch/powerpc/platforms/pseries/eeh.c | 4 ++-- + arch/powerpc/platforms/pseries/suspend.c | 6 +++++- + arch/powerpc/platforms/wsp/ics.c | 2 +- + arch/powerpc/platforms/wsp/wsp_pci.c | 8 ++++---- + 9 files changed, 51 insertions(+), 27 deletions(-) +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 (e51e07e sparc32: forced setting of mode of sun4m per-cpu timers) +$ git merge sparc/master +Already up-to-date. +Merging scsi-rc-fixes/master (6f6c2aa [SCSI] fcoe: fix fcoe in a DCB environment by adding DCB notifiers to set skb priority) +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net/master (3013dc0 3c59x: shorten timer period for slave devices) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/3com/3c59x.c | 2 +- + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 17 +------- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 8 ++-- + drivers/net/ethernet/freescale/fec.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/eq.c | 5 +- + drivers/net/ethernet/micrel/ks8851.c | 2 +- + drivers/net/ethernet/octeon/octeon_mgmt.c | 4 +- + drivers/net/ethernet/ti/cpmac.c | 4 +- + drivers/net/ethernet/xscale/ixp4xx_eth.c | 3 +- + net/core/netpoll.c | 2 +- + net/ipv4/tcp_input.c | 45 +++++++++++++------- + net/rxrpc/ar-key.c | 4 +- + 13 files changed, 50 insertions(+), 50 deletions(-) +Merging sound-current/for-linus (27c3afe ALSA: intel8x0: Fix default inaudible sound on Gateway M520) +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus (3682a39 PCI: Fix pci cardbus removal) +$ git merge pci-current/for-linus +Merge made by the 'recursive' strategy. + drivers/pci/iov.c | 3 +-- + drivers/pci/probe.c | 5 +++++ + drivers/pci/remove.c | 28 ++++++++++++++++++++++------ + 3 files changed, 28 insertions(+), 8 deletions(-) +Merging wireless/master (c27111e rtlwifi: Modify rtl_pci_init to return 0 on success) +$ git merge wireless/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/rtlwifi/pci.c | 4 ++-- + net/mac80211/main.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging driver-core.current/driver-core-linus (29bb5d4 driver-core: cpu: fix kobject warning when hotplugging a cpu) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (19e00f2 Merge tag 'tty-3.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (887aa58 Merge tag 'for-usb-linus-2012-02-14' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-linus) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/core/hcd-pci.c | 5 ++++- + drivers/usb/core/hcd.c | 6 ++++-- + drivers/usb/host/xhci-hub.c | 2 +- + drivers/usb/host/xhci.c | 5 +++++ + include/linux/usb/ch11.h | 10 ++-------- + 5 files changed, 16 insertions(+), 12 deletions(-) +Merging staging.current/staging-linus (b05ee6b Merge tag 'staging-3.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (b5266ea mmc: cb710 core: Add missing spin_lock_init for irq_lock of struct cb710_chip) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging cpufreq-current/fixes (5983fe2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus (82b982c Input: i8042 - add Lenovo Ideapad U455 to 'reset' blacklist) +$ git merge input-current/for-linus +Already up-to-date. +Merging md-current/for-linus (db91ff5 md: two small fixes to handling interrupt resync.) +$ git merge md-current/for-linus +Already up-to-date. +Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix) +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master (3a92d68 crypto: sha512 - Avoid stack bloat on i386) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (0ab3d8b cy82c693: fix PCI device selection) +$ git merge ide/master +Already up-to-date. +Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6) +$ git merge dwmw2/master +Already up-to-date. +Merging devicetree-current/devicetree/merge (810ae3d ARM: devicetree: Add .dtb files to arch/arm/boot/.gitignore) +$ git merge devicetree-current/devicetree/merge +Merge made by the 'recursive' strategy. + arch/arm/boot/.gitignore | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) +Merging spi-current/spi/merge (c88db23 spi-topcliff-pch: rename pch_spi_pcidev to pch_spi_pcidev_driver) +$ git merge spi-current/spi/merge +Already up-to-date. +Merging gpio-current/gpio/merge (7e3a70f gpio: Add missing spin_lock_init in gpio-ml-ioh driver) +$ git merge gpio-current/gpio/merge +Already up-to-date. +Merging arm/for-next (827dcfb Merge branch 'sa11x0' into for-next) +$ git merge arm/for-next +Auto-merging drivers/pcmcia/sa1111_neponset.c +Auto-merging drivers/pcmcia/sa1111_lubbock.c +Auto-merging drivers/pcmcia/sa1111_jornada720.c +Auto-merging drivers/pcmcia/sa1111_badge4.c +Removing arch/arm/plat-spear/include/plat/system.h +Removing arch/arm/plat-omap/include/plat/system.h +Removing arch/arm/plat-mxc/include/mach/system.h +Removing arch/arm/mach-zynq/include/mach/system.h +Removing arch/arm/mach-w90x900/include/mach/system.h +Removing arch/arm/mach-vexpress/include/mach/system.h +Removing arch/arm/mach-versatile/include/mach/system.h +Removing arch/arm/mach-ux500/include/mach/system.h +Removing arch/arm/mach-u300/include/mach/system.h +Removing arch/arm/mach-tegra/include/mach/system.h +Removing arch/arm/mach-spear6xx/include/mach/system.h +Removing arch/arm/mach-spear3xx/include/mach/system.h +Removing arch/arm/mach-shark/include/mach/system.h +Removing arch/arm/mach-sa1100/include/mach/system.h +Removing arch/arm/mach-sa1100/include/mach/dma.h +Removing arch/arm/mach-sa1100/dma.c +Removing arch/arm/mach-s5pv210/include/mach/system.h +Removing arch/arm/mach-s5pc100/include/mach/system.h +Removing arch/arm/mach-s5p64x0/include/mach/system.h +Removing arch/arm/mach-s3c64xx/include/mach/system.h +Removing arch/arm/mach-s3c2410/include/mach/system.h +Removing arch/arm/mach-rpc/include/mach/system.h +Removing arch/arm/mach-realview/include/mach/system.h +Removing arch/arm/mach-pxa/include/mach/system.h +Removing arch/arm/mach-prima2/include/mach/system.h +Removing arch/arm/mach-pnx4008/include/mach/system.h +Removing arch/arm/mach-picoxcell/include/mach/system.h +Removing arch/arm/mach-orion5x/include/mach/system.h +Removing arch/arm/mach-omap2/include/mach/system.h +Removing arch/arm/mach-omap1/include/mach/system.h +Removing arch/arm/mach-nomadik/include/mach/system.h +Removing arch/arm/mach-netx/include/mach/system.h +Removing arch/arm/mach-mxs/include/mach/system.h +Removing arch/arm/mach-mv78xx0/include/mach/system.h +Removing arch/arm/mach-msm/idle.S +Removing arch/arm/mach-mmp/include/mach/system.h +Removing arch/arm/mach-lpc32xx/include/mach/system.h +Removing arch/arm/mach-ks8695/include/mach/system.h +Removing arch/arm/mach-kirkwood/include/mach/system.h +Removing arch/arm/mach-ixp4xx/include/mach/system.h +Removing arch/arm/mach-ixp23xx/include/mach/system.h +Removing arch/arm/mach-ixp2000/include/mach/system.h +Removing arch/arm/mach-iop33x/include/mach/system.h +Removing arch/arm/mach-iop32x/include/mach/system.h +Removing arch/arm/mach-iop13xx/include/mach/system.h +Removing arch/arm/mach-integrator/include/mach/system.h +Removing arch/arm/mach-highbank/include/mach/system.h +Removing arch/arm/mach-h720x/include/mach/system.h +Removing arch/arm/mach-footbridge/include/mach/system.h +Removing arch/arm/mach-exynos/include/mach/system.h +Removing arch/arm/mach-ep93xx/include/mach/system.h +Removing arch/arm/mach-ebsa110/include/mach/system.h +Removing arch/arm/mach-dove/include/mach/system.h +Removing arch/arm/mach-davinci/include/mach/system.h +Removing arch/arm/mach-cns3xxx/include/mach/system.h +Removing arch/arm/mach-clps711x/include/mach/system.h +Removing arch/arm/mach-bcmring/include/mach/system.h +Removing arch/arm/mach-at91/include/mach/system.h +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 2 + + arch/arm/Kconfig.debug | 156 ++-- + arch/arm/boot/compressed/.gitignore | 2 + + arch/arm/boot/compressed/Makefile | 15 +- + arch/arm/boot/compressed/decompress.c | 6 + + arch/arm/boot/compressed/piggy.xzkern.S | 6 + + arch/arm/common/gic.c | 13 +- + arch/arm/common/sa1111.c | 281 ++++-- + arch/arm/configs/integrator_defconfig | 8 + + arch/arm/include/asm/cp15.h | 87 ++ + arch/arm/include/asm/elf.h | 4 - + arch/arm/include/asm/hardware/cache-l2x0.h | 6 +- + arch/arm/include/asm/hardware/sa1111.h | 156 +--- + arch/arm/include/asm/mmu_context.h | 29 +- + arch/arm/include/asm/opcodes.h | 59 + + arch/arm/include/asm/page.h | 2 + + arch/arm/include/asm/perf_event.h | 1 + + arch/arm/include/asm/prom.h | 2 - + arch/arm/include/asm/system.h | 78 +-- + arch/arm/include/asm/tlbflush.h | 128 +-- + arch/arm/include/asm/traps.h | 2 +- + arch/arm/kernel/ecard.c | 6 +- + arch/arm/kernel/fiq.c | 2 +- + arch/arm/kernel/head-nommu.S | 2 +- + arch/arm/kernel/head.S | 2 +- + arch/arm/kernel/irq.c | 5 +- + arch/arm/kernel/perf_event.c | 3 + + arch/arm/kernel/perf_event_v7.c | 145 +++ + arch/arm/kernel/process.c | 65 +- + arch/arm/kernel/sched_clock.c | 18 + + arch/arm/kernel/setup.c | 3 +- + arch/arm/kernel/smp.c | 17 +- + arch/arm/kernel/traps.c | 19 +- + arch/arm/mach-at91/at91cap9.c | 8 + + arch/arm/mach-at91/at91rm9200.c | 10 + + arch/arm/mach-at91/at91sam9260.c | 8 + + arch/arm/mach-at91/at91sam9261.c | 8 + + arch/arm/mach-at91/at91sam9263.c | 8 + + arch/arm/mach-at91/at91sam9g45.c | 7 + + arch/arm/mach-at91/at91sam9rl.c | 8 + + arch/arm/mach-at91/at91x40.c | 12 + + arch/arm/mach-at91/include/mach/system.h | 50 - + arch/arm/mach-bcmring/core.c | 23 +- + arch/arm/mach-bcmring/include/mach/system.h | 28 - + arch/arm/mach-clps711x/common.c | 16 + + arch/arm/mach-clps711x/include/mach/system.h | 35 - + arch/arm/mach-cns3xxx/include/mach/system.h | 25 - + arch/arm/mach-davinci/include/mach/system.h | 21 - + arch/arm/mach-dove/include/mach/system.h | 17 - + arch/arm/mach-ebsa110/core.c | 38 +- + arch/arm/mach-ebsa110/core.h | 41 + + arch/arm/mach-ebsa110/include/mach/hardware.h | 39 - + arch/arm/mach-ebsa110/include/mach/system.h | 37 - + arch/arm/mach-ebsa110/io.c | 20 + + arch/arm/mach-ebsa110/leds.c | 2 + + arch/arm/mach-ep93xx/core.c | 46 +- + arch/arm/mach-ep93xx/include/mach/system.h | 7 - + arch/arm/mach-exynos/common.c | 12 - + arch/arm/mach-exynos/dma.c | 38 +- + arch/arm/mach-exynos/hotplug.c | 1 + + arch/arm/mach-exynos/include/mach/system.h | 20 - + arch/arm/mach-footbridge/include/mach/system.h | 13 - + arch/arm/mach-gemini/Makefile | 2 +- + arch/arm/mach-gemini/idle.c | 29 + + arch/arm/mach-gemini/include/mach/system.h | 14 - + arch/arm/mach-gemini/irq.c | 4 +- + arch/arm/mach-h720x/common.c | 18 + + arch/arm/mach-h720x/include/mach/system.h | 27 - + arch/arm/mach-highbank/include/mach/system.h | 24 - + arch/arm/mach-imx/mm-imx3.c | 52 +- + arch/arm/mach-imx/mm-imx5.c | 28 +- + arch/arm/mach-imx/pm-imx27.c | 3 +- + arch/arm/mach-integrator/Kconfig | 1 + + arch/arm/mach-integrator/core.c | 70 +- + arch/arm/mach-integrator/impd1.c | 9 +- + arch/arm/mach-integrator/include/mach/system.h | 33 - + arch/arm/mach-integrator/integrator_ap.c | 7 + + arch/arm/mach-integrator/integrator_cp.c | 49 +- + arch/arm/mach-iop13xx/include/mach/system.h | 13 - + arch/arm/mach-iop32x/include/mach/system.h | 13 - + arch/arm/mach-iop33x/include/mach/system.h | 13 - + arch/arm/mach-ixp2000/include/mach/system.h | 14 - + arch/arm/mach-ixp23xx/core.c | 3 + + arch/arm/mach-ixp23xx/include/mach/system.h | 16 - + arch/arm/mach-ixp4xx/common.c | 6 + + arch/arm/mach-ixp4xx/include/mach/system.h | 19 - + arch/arm/mach-kirkwood/include/mach/system.h | 17 - + arch/arm/mach-ks8695/include/mach/system.h | 27 - + arch/arm/mach-lpc32xx/include/mach/system.h | 27 - + arch/arm/mach-lpc32xx/phy3250.c | 32 +- + arch/arm/mach-mmp/include/mach/system.h | 16 - + arch/arm/mach-msm/idle.S | 36 - + arch/arm/mach-msm/idle.c | 49 + + arch/arm/mach-msm/include/mach/system.h | 1 - + arch/arm/mach-mv78xx0/include/mach/system.h | 17 - + arch/arm/mach-mxs/devices.c | 8 +- + arch/arm/mach-mxs/devices/amba-duart.c | 2 +- + arch/arm/mach-mxs/include/mach/system.h | 25 - + arch/arm/mach-mxs/pm.c | 3 +- + arch/arm/mach-netx/fb.c | 13 +- + arch/arm/mach-netx/include/mach/system.h | 28 - + arch/arm/mach-nomadik/board-nhk8815.c | 17 +- + arch/arm/mach-nomadik/cpu-8815.c | 9 +- + arch/arm/mach-nomadik/include/mach/system.h | 32 - + arch/arm/mach-omap1/include/mach/system.h | 5 - + arch/arm/mach-omap1/pm.c | 19 +- + arch/arm/mach-omap2/emu.c | 26 +- + arch/arm/mach-omap2/include/mach/system.h | 5 - + arch/arm/mach-omap2/pm24xx.c | 4 +- + arch/arm/mach-omap2/pm34xx.c | 6 +- + arch/arm/mach-omap2/pm44xx.c | 8 +- + arch/arm/mach-omap2/prm_common.c | 1 - + arch/arm/mach-orion5x/include/mach/system.h | 19 - + arch/arm/mach-picoxcell/include/mach/system.h | 26 - + arch/arm/mach-pnx4008/include/mach/system.h | 29 - + arch/arm/mach-prima2/include/mach/system.h | 17 - + arch/arm/mach-pxa/include/mach/balloon3.h | 1 - + arch/arm/mach-pxa/include/mach/system.h | 15 - + arch/arm/mach-pxa/lubbock.c | 1 + + arch/arm/mach-realview/core.h | 20 +- + arch/arm/mach-realview/hotplug.c | 1 + + arch/arm/mach-realview/include/mach/irqs-eb.h | 23 +- + arch/arm/mach-realview/include/mach/irqs-pb1176.h | 2 +- + arch/arm/mach-realview/include/mach/system.h | 33 - + arch/arm/mach-realview/realview_eb.c | 78 +- + arch/arm/mach-realview/realview_pb1176.c | 78 +- + arch/arm/mach-realview/realview_pb11mp.c | 78 +- + arch/arm/mach-realview/realview_pba8.c | 78 +- + arch/arm/mach-realview/realview_pbx.c | 78 +- + arch/arm/mach-rpc/include/mach/system.h | 13 - + arch/arm/mach-s3c2410/include/mach/system.h | 54 - + arch/arm/mach-s3c2412/s3c2412.c | 4 +- + arch/arm/mach-s3c2416/s3c2416.c | 3 - + arch/arm/mach-s3c64xx/include/mach/system.h | 19 - + arch/arm/mach-s5p64x0/common.c | 15 +- + arch/arm/mach-s5p64x0/dma.c | 22 +- + arch/arm/mach-s5p64x0/include/mach/system.h | 21 - + arch/arm/mach-s5pc100/common.c | 12 - + arch/arm/mach-s5pc100/dma.c | 38 +- + arch/arm/mach-s5pc100/include/mach/system.h | 19 - + arch/arm/mach-s5pv210/common.c | 12 - + arch/arm/mach-s5pv210/dma.c | 38 +- + arch/arm/mach-s5pv210/include/mach/system.h | 21 - + arch/arm/mach-sa1100/Makefile | 2 +- + arch/arm/mach-sa1100/assabet.c | 191 +++- + arch/arm/mach-sa1100/badge4.c | 41 +- + arch/arm/mach-sa1100/cerf.c | 14 +- + arch/arm/mach-sa1100/collie.c | 52 +- + arch/arm/mach-sa1100/dma.c | 348 ------ + arch/arm/mach-sa1100/generic.c | 147 ++-- + arch/arm/mach-sa1100/generic.h | 7 +- + arch/arm/mach-sa1100/h3100.c | 23 +- + arch/arm/mach-sa1100/h3600.c | 32 +- + arch/arm/mach-sa1100/h3xxx.c | 13 +- + arch/arm/mach-sa1100/hackkit.c | 7 +- + arch/arm/mach-sa1100/include/mach/SA-1100.h | 219 +---- + arch/arm/mach-sa1100/include/mach/assabet.h | 15 +- + arch/arm/mach-sa1100/include/mach/cerf.h | 15 +- + arch/arm/mach-sa1100/include/mach/dma.h | 117 -- + arch/arm/mach-sa1100/include/mach/irqs.h | 24 +- + arch/arm/mach-sa1100/include/mach/mcp.h | 2 +- + arch/arm/mach-sa1100/include/mach/nanoengine.h | 12 +- + arch/arm/mach-sa1100/include/mach/neponset.h | 52 +- + arch/arm/mach-sa1100/include/mach/shannon.h | 14 +- + arch/arm/mach-sa1100/include/mach/simpad.h | 6 +- + arch/arm/mach-sa1100/include/mach/system.h | 9 - + arch/arm/mach-sa1100/irq.c | 7 +- + arch/arm/mach-sa1100/jornada720.c | 40 +- + arch/arm/mach-sa1100/lart.c | 80 ++ + arch/arm/mach-sa1100/nanoengine.c | 11 +- + arch/arm/mach-sa1100/neponset.c | 546 ++++++---- + arch/arm/mach-sa1100/pci-nanoengine.c | 8 +- + arch/arm/mach-sa1100/pleb.c | 24 +- + arch/arm/mach-sa1100/shannon.c | 25 +- + arch/arm/mach-sa1100/simpad.c | 19 +- + arch/arm/mach-sa1100/sleep.S | 37 +- + arch/arm/mach-shark/core.c | 6 + + arch/arm/mach-shark/include/mach/system.h | 13 - + arch/arm/mach-shmobile/include/mach/system.h | 5 - + arch/arm/mach-spear3xx/include/mach/system.h | 19 - + arch/arm/mach-spear3xx/spear300.c | 14 +- + arch/arm/mach-spear3xx/spear3xx.c | 27 +- + arch/arm/mach-spear6xx/include/mach/system.h | 19 - + arch/arm/mach-spear6xx/spear6xx.c | 10 +- + arch/arm/mach-tegra/common.c | 3 +- + arch/arm/mach-tegra/hotplug.c | 1 + + arch/arm/mach-tegra/include/mach/system.h | 28 - + arch/arm/mach-u300/core.c | 85 +-- + arch/arm/mach-u300/include/mach/system.h | 14 - + arch/arm/mach-ux500/board-mop500-sdi.c | 21 +- + arch/arm/mach-ux500/devices-common.c | 13 +- + arch/arm/mach-ux500/include/mach/system.h | 20 - + arch/arm/mach-versatile/core.c | 70 +- + arch/arm/mach-versatile/core.h | 20 +- + arch/arm/mach-versatile/include/mach/system.h | 33 - + arch/arm/mach-versatile/versatile_pb.c | 18 +- + arch/arm/mach-vexpress/core.h | 17 - + arch/arm/mach-vexpress/ct-ca9x4.c | 8 +- + arch/arm/mach-vexpress/hotplug.c | 2 +- + arch/arm/mach-vexpress/include/mach/ct-ca9x4.h | 2 +- + arch/arm/mach-vexpress/include/mach/system.h | 33 - + arch/arm/mach-vexpress/v2m.c | 20 +- + arch/arm/mach-vt8500/include/mach/system.h | 5 - + arch/arm/mach-w90x900/dev.c | 1 + + arch/arm/mach-w90x900/include/mach/system.h | 19 - + arch/arm/mach-zynq/include/mach/system.h | 23 - + arch/arm/mm/alignment.c | 2 +- + arch/arm/mm/cache-feroceon-l2.c | 1 + + arch/arm/mm/cache-l2x0.c | 22 +- + arch/arm/mm/cache-tauros2.c | 1 + + arch/arm/mm/cache-xsc3l2.c | 2 +- + arch/arm/mm/copypage-v4mc.c | 9 +- + arch/arm/mm/copypage-v6.c | 20 +- + arch/arm/mm/copypage-xscale.c | 9 +- + arch/arm/mm/dma-mapping.c | 20 +- + arch/arm/mm/fault.c | 3 +- + arch/arm/mm/flush.c | 14 +- + arch/arm/mm/highmem.c | 21 +- + arch/arm/mm/init.c | 4 + + arch/arm/mm/ioremap.c | 1 + + arch/arm/mm/mm.h | 26 +- + arch/arm/mm/mmu.c | 8 +- + arch/arm/mm/pgd.c | 1 + + arch/arm/mm/vmregion.c | 76 ++- + arch/arm/mm/vmregion.h | 5 +- + arch/arm/plat-mxc/include/mach/system.h | 25 - + arch/arm/plat-omap/include/plat/system.h | 15 - + arch/arm/plat-s3c24xx/cpu.c | 27 + + arch/arm/plat-spear/include/plat/system.h | 26 - + arch/arm/plat-versatile/Kconfig | 2 +- + arch/arm/vfp/vfpmodule.c | 1 + + drivers/amba/bus.c | 105 ++- + drivers/dma/Kconfig | 9 + + drivers/dma/Makefile | 1 + + drivers/dma/sa11x0-dma.c | 1117 ++++++++++++++++++++ + drivers/input/serio/sa1111ps2.c | 59 +- + drivers/mfd/Kconfig | 5 +- + drivers/mfd/mcp-core.c | 49 +- + drivers/mfd/mcp-sa11x0.c | 198 +++-- + drivers/mfd/ucb1x00-assabet.c | 46 +- + drivers/mfd/ucb1x00-core.c | 433 ++++---- + drivers/mfd/ucb1x00-ts.c | 39 +- + drivers/mmc/host/mmci.c | 168 +++- + drivers/mmc/host/mmci.h | 15 +- + drivers/mtd/maps/sa1100-flash.c | 112 -- + drivers/net/ethernet/smsc/smc91x.c | 2 +- + drivers/net/irda/Kconfig | 2 +- + drivers/net/irda/sa1100_ir.c | 957 ++++++++++-------- + drivers/of/platform.c | 6 +- + drivers/pcmcia/Kconfig | 8 +- + drivers/pcmcia/Makefile | 14 +- + drivers/pcmcia/pxa2xx_balloon3.c | 22 +- + drivers/pcmcia/pxa2xx_base.c | 5 +- + drivers/pcmcia/pxa2xx_cm_x255.c | 39 +- + drivers/pcmcia/pxa2xx_cm_x270.c | 23 +- + drivers/pcmcia/pxa2xx_colibri.c | 21 +- + drivers/pcmcia/pxa2xx_e740.c | 71 +- + drivers/pcmcia/pxa2xx_mainstone.c | 31 +- + drivers/pcmcia/pxa2xx_palmld.c | 8 +- + drivers/pcmcia/pxa2xx_palmtc.c | 8 +- + drivers/pcmcia/pxa2xx_palmtx.c | 8 +- + drivers/pcmcia/pxa2xx_sharpsl.c | 30 +- + drivers/pcmcia/pxa2xx_stargate2.c | 34 +- + drivers/pcmcia/pxa2xx_trizeps4.c | 62 +- + drivers/pcmcia/pxa2xx_viper.c | 39 +- + drivers/pcmcia/pxa2xx_vpac270.c | 54 +- + drivers/pcmcia/sa1100_assabet.c | 65 +- + drivers/pcmcia/sa1100_cerf.c | 52 +- + drivers/pcmcia/sa1100_h3600.c | 94 +-- + drivers/pcmcia/sa1100_nanoengine.c | 132 +-- + drivers/pcmcia/sa1100_shannon.c | 52 +- + drivers/pcmcia/sa1100_simpad.c | 27 +- + .../pcmcia/{sa1100_badge4.c => sa1111_badge4.c} | 3 +- + drivers/pcmcia/sa1111_generic.c | 111 ++- + drivers/pcmcia/sa1111_generic.h | 1 - + .../{sa1100_jornada720.c => sa1111_jornada720.c} | 8 +- + .../pcmcia/{pxa2xx_lubbock.c => sa1111_lubbock.c} | 1 - + .../{sa1100_neponset.c => sa1111_neponset.c} | 18 +- + drivers/pcmcia/sa11xx_base.c | 5 +- + drivers/pcmcia/soc_common.c | 193 +++-- + drivers/pcmcia/soc_common.h | 23 +- + drivers/scsi/arm/arxescsi.c | 2 +- + drivers/scsi/arm/fas216.c | 4 +- + drivers/scsi/arm/fas216.h | 4 - + drivers/usb/host/ohci-sa1111.c | 297 +++--- + drivers/video/sa1100fb.c | 433 ++------ + drivers/video/sa1100fb.h | 67 +-- + include/linux/amba/bus.h | 36 + + include/linux/amba/mmci.h | 22 +- + include/linux/mfd/mcp.h | 14 +- + include/linux/mfd/ucb1x00.h | 38 +- + include/linux/sa11x0-dma.h | 24 + + include/sound/soc-dmaengine.h | 26 + + include/video/sa1100fb.h | 63 ++ + sound/soc/Kconfig | 4 + + sound/soc/Makefile | 3 + + sound/soc/sa11x0/Kconfig | 14 + + sound/soc/sa11x0/Makefile | 5 + + sound/soc/sa11x0/sa11x0-assabet.c | 432 ++++++++ + sound/soc/sa11x0/sa11x0-ssp.c | 345 ++++++ + sound/soc/sa11x0/sa11x0-ssp.h | 11 + + sound/soc/soc-dmaengine.c | 576 ++++++++++ + 302 files changed, 7127 insertions(+), 6643 deletions(-) + create mode 100644 arch/arm/boot/compressed/piggy.xzkern.S + create mode 100644 arch/arm/include/asm/cp15.h + delete mode 100644 arch/arm/mach-at91/include/mach/system.h + delete mode 100644 arch/arm/mach-bcmring/include/mach/system.h + delete mode 100644 arch/arm/mach-clps711x/include/mach/system.h + delete mode 100644 arch/arm/mach-cns3xxx/include/mach/system.h + delete mode 100644 arch/arm/mach-davinci/include/mach/system.h + delete mode 100644 arch/arm/mach-dove/include/mach/system.h + create mode 100644 arch/arm/mach-ebsa110/core.h + delete mode 100644 arch/arm/mach-ebsa110/include/mach/system.h + delete mode 100644 arch/arm/mach-ep93xx/include/mach/system.h + delete mode 100644 arch/arm/mach-exynos/include/mach/system.h + delete mode 100644 arch/arm/mach-footbridge/include/mach/system.h + create mode 100644 arch/arm/mach-gemini/idle.c + delete mode 100644 arch/arm/mach-h720x/include/mach/system.h + delete mode 100644 arch/arm/mach-highbank/include/mach/system.h + delete mode 100644 arch/arm/mach-integrator/include/mach/system.h + delete mode 100644 arch/arm/mach-iop13xx/include/mach/system.h + delete mode 100644 arch/arm/mach-iop32x/include/mach/system.h + delete mode 100644 arch/arm/mach-iop33x/include/mach/system.h + delete mode 100644 arch/arm/mach-ixp2000/include/mach/system.h + delete mode 100644 arch/arm/mach-ixp23xx/include/mach/system.h + delete mode 100644 arch/arm/mach-ixp4xx/include/mach/system.h + delete mode 100644 arch/arm/mach-kirkwood/include/mach/system.h + delete mode 100644 arch/arm/mach-ks8695/include/mach/system.h + delete mode 100644 arch/arm/mach-lpc32xx/include/mach/system.h + delete mode 100644 arch/arm/mach-mmp/include/mach/system.h + delete mode 100644 arch/arm/mach-msm/idle.S + create mode 100644 arch/arm/mach-msm/idle.c + delete mode 100644 arch/arm/mach-mv78xx0/include/mach/system.h + delete mode 100644 arch/arm/mach-mxs/include/mach/system.h + delete mode 100644 arch/arm/mach-netx/include/mach/system.h + delete mode 100644 arch/arm/mach-nomadik/include/mach/system.h + delete mode 100644 arch/arm/mach-omap1/include/mach/system.h + delete mode 100644 arch/arm/mach-omap2/include/mach/system.h + delete mode 100644 arch/arm/mach-orion5x/include/mach/system.h + delete mode 100644 arch/arm/mach-picoxcell/include/mach/system.h + delete mode 100644 arch/arm/mach-pnx4008/include/mach/system.h + delete mode 100644 arch/arm/mach-prima2/include/mach/system.h + delete mode 100644 arch/arm/mach-pxa/include/mach/system.h + delete mode 100644 arch/arm/mach-realview/include/mach/system.h + delete mode 100644 arch/arm/mach-rpc/include/mach/system.h + delete mode 100644 arch/arm/mach-s3c2410/include/mach/system.h + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/system.h + delete mode 100644 arch/arm/mach-s5p64x0/include/mach/system.h + delete mode 100644 arch/arm/mach-s5pc100/include/mach/system.h + delete mode 100644 arch/arm/mach-s5pv210/include/mach/system.h + delete mode 100644 arch/arm/mach-sa1100/dma.c + delete mode 100644 arch/arm/mach-sa1100/include/mach/dma.h + delete mode 100644 arch/arm/mach-sa1100/include/mach/system.h + delete mode 100644 arch/arm/mach-shark/include/mach/system.h + delete mode 100644 arch/arm/mach-spear3xx/include/mach/system.h + delete mode 100644 arch/arm/mach-spear6xx/include/mach/system.h + delete mode 100644 arch/arm/mach-tegra/include/mach/system.h + delete mode 100644 arch/arm/mach-u300/include/mach/system.h + delete mode 100644 arch/arm/mach-ux500/include/mach/system.h + delete mode 100644 arch/arm/mach-versatile/include/mach/system.h + delete mode 100644 arch/arm/mach-vexpress/include/mach/system.h + delete mode 100644 arch/arm/mach-w90x900/include/mach/system.h + delete mode 100644 arch/arm/mach-zynq/include/mach/system.h + delete mode 100644 arch/arm/plat-mxc/include/mach/system.h + delete mode 100644 arch/arm/plat-omap/include/plat/system.h + delete mode 100644 arch/arm/plat-spear/include/plat/system.h + create mode 100644 drivers/dma/sa11x0-dma.c + rename drivers/pcmcia/{sa1100_badge4.c => sa1111_badge4.c} (98%) + rename drivers/pcmcia/{sa1100_jornada720.c => sa1111_jornada720.c} (94%) + rename drivers/pcmcia/{pxa2xx_lubbock.c => sa1111_lubbock.c} (99%) + rename drivers/pcmcia/{sa1100_neponset.c => sa1111_neponset.c} (90%) + create mode 100644 include/linux/sa11x0-dma.h + create mode 100644 include/sound/soc-dmaengine.h + create mode 100644 include/video/sa1100fb.h + create mode 100644 sound/soc/sa11x0/Kconfig + create mode 100644 sound/soc/sa11x0/Makefile + create mode 100644 sound/soc/sa11x0/sa11x0-assabet.c + create mode 100644 sound/soc/sa11x0/sa11x0-ssp.c + create mode 100644 sound/soc/sa11x0/sa11x0-ssp.h + create mode 100644 sound/soc/soc-dmaengine.c +Merging arm-perf/for-next/perf (cdd2a5b Merge branches 'perf/updates' and 'perf/fixes' into for-next/perf) +$ git merge arm-perf/for-next/perf +Merge made by the 'recursive' strategy. +Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6) +$ git merge davinci/davinci-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 (e8a4c2f Merge branch 'v3.4-for-rafael' into for-next) +$ git merge s5p/for-next +Removing arch/arm/mach-exynos/dev-pd.c +Merge made by the 'recursive' strategy. + .../bindings/arm/exynos/power_domain.txt | 21 ++ + arch/arm/boot/dts/exynos4210.dtsi | 1 + + arch/arm/mach-exynos/Kconfig | 15 +- + arch/arm/mach-exynos/Makefile | 2 +- + arch/arm/mach-exynos/clock-exynos4210.c | 4 +- + arch/arm/mach-exynos/clock-exynos4212.c | 4 +- + arch/arm/mach-exynos/clock.c | 4 +- + arch/arm/mach-exynos/common.c | 2 +- + arch/arm/mach-exynos/dev-pd.c | 139 -------------- + arch/arm/mach-exynos/dma.c | 16 +- + arch/arm/mach-exynos/include/mach/map.h | 3 + + arch/arm/mach-exynos/mach-exynos4-dt.c | 8 +- + arch/arm/mach-exynos/mach-nuri.c | 85 +++++++-- + arch/arm/mach-exynos/mach-origen.c | 52 ++++-- + arch/arm/mach-exynos/mach-smdkv310.c | 13 +-- + arch/arm/mach-exynos/mach-universal_c210.c | 98 ++++++++--- + arch/arm/mach-exynos/pm.c | 4 +- + arch/arm/mach-exynos/pm_domains.c | 195 ++++++++++++++++++++ + arch/arm/mach-s3c2410/cpu-freq.c | 8 +- + arch/arm/mach-s3c2410/dma.c | 5 +- + arch/arm/mach-s3c2410/mach-h1940.c | 12 +- + arch/arm/mach-s3c2410/pll.c | 2 +- + arch/arm/mach-s3c2410/pm.c | 2 +- + arch/arm/mach-s3c2412/cpu-freq.c | 3 +- + arch/arm/mach-s3c2412/dma.c | 3 +- + arch/arm/mach-s3c2412/irq.c | 2 +- + arch/arm/mach-s3c2412/pm.c | 2 +- + arch/arm/mach-s3c2416/clock.c | 6 - + arch/arm/mach-s3c2416/irq.c | 3 +- + arch/arm/mach-s3c2416/mach-smdk2416.c | 8 +- + arch/arm/mach-s3c2416/pm.c | 2 +- + arch/arm/mach-s3c2416/s3c2416.c | 2 + + arch/arm/mach-s3c2440/clock.c | 2 +- + arch/arm/mach-s3c2440/dma.c | 3 +- + arch/arm/mach-s3c2440/irq.c | 2 +- + arch/arm/mach-s3c2440/mach-gta02.c | 4 +- + arch/arm/mach-s3c2440/mach-rx1950.c | 12 +- + arch/arm/mach-s3c2440/s3c2440-cpufreq.c | 3 +- + arch/arm/mach-s3c2440/s3c2440-pll-12000000.c | 2 +- + arch/arm/mach-s3c2440/s3c2440-pll-16934400.c | 3 +- + arch/arm/mach-s3c2440/s3c2442.c | 2 +- + arch/arm/mach-s3c2440/s3c244x-clock.c | 2 +- + arch/arm/mach-s3c2440/s3c244x-irq.c | 2 +- + arch/arm/mach-s3c2443/dma.c | 3 +- + arch/arm/mach-s3c2443/irq.c | 3 +- + arch/arm/mach-s3c2443/s3c2443.c | 2 + + arch/arm/mach-s3c64xx/Kconfig | 1 + + arch/arm/mach-s3c64xx/Makefile | 1 + + arch/arm/mach-s3c64xx/clock.c | 126 ++++++++++++- + arch/arm/mach-s3c64xx/common.c | 2 +- + arch/arm/mach-s3c64xx/common.h | 2 - + arch/arm/mach-s3c64xx/cpuidle.c | 91 +++++++++ + arch/arm/mach-s3c64xx/irq-pm.c | 2 +- + arch/arm/mach-s3c64xx/mach-crag6410-module.c | 27 +++- + arch/arm/mach-s3c64xx/mach-crag6410.c | 67 +++++++- + arch/arm/mach-s5p64x0/clock.c | 11 +- + arch/arm/mach-s5p64x0/dma.c | 12 +- + arch/arm/mach-s5p64x0/include/mach/s5p64x0-clock.h | 7 - + arch/arm/mach-s5p64x0/pm.c | 2 +- + arch/arm/mach-s5pc100/clock.c | 28 ++-- + arch/arm/mach-s5pc100/dma.c | 16 +- + arch/arm/mach-s5pv210/clock.c | 4 +- + arch/arm/mach-s5pv210/dma.c | 16 +- + arch/arm/mach-s5pv210/mach-aquila.c | 1 + + arch/arm/mach-s5pv210/mach-goni.c | 2 +- + arch/arm/mach-s5pv210/mach-smdkv210.c | 2 +- + arch/arm/mach-s5pv210/pm.c | 2 +- + arch/arm/plat-s3c24xx/s3c2443-clock.c | 2 +- + arch/arm/plat-s5p/Kconfig | 5 + + arch/arm/plat-s5p/irq-eint.c | 2 +- + arch/arm/plat-s5p/irq-gpioint.c | 2 +- + arch/arm/plat-samsung/clock.c | 12 +- + arch/arm/plat-samsung/dev-backlight.c | 2 + + arch/arm/plat-samsung/devs.c | 45 ++++-- + arch/arm/plat-samsung/dma-ops.c | 2 +- + arch/arm/plat-samsung/include/plat/devs.h | 1 + + arch/arm/plat-samsung/include/plat/regs-rtc.h | 81 +++++---- + arch/arm/plat-samsung/include/plat/rtc-core.h | 27 +++ + arch/arm/plat-samsung/include/plat/sdhci.h | 2 + + arch/arm/plat-samsung/platformdata.c | 2 + + drivers/base/power/domain.c | 32 ++++ + drivers/mmc/host/sdhci-s3c.c | 6 +- + drivers/rtc/rtc-s3c.c | 71 ++++++-- + include/linux/pm_domain.h | 12 ++ + 84 files changed, 1076 insertions(+), 423 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/exynos/power_domain.txt + delete mode 100644 arch/arm/mach-exynos/dev-pd.c + create mode 100644 arch/arm/mach-exynos/pm_domains.c + create mode 100644 arch/arm/mach-s3c64xx/cpuidle.c + create mode 100644 arch/arm/plat-samsung/include/plat/rtc-core.h +Merging tegra/for-next (9048201 Merge branch 'for-3.4/soc-drivers' into for-next) +$ git merge tegra/for-next +Auto-merging arch/arm/mach-tegra/common.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/tegra/emc.txt | 100 + + .../bindings/arm/tegra/nvidia,tegra20-pmc.txt | 19 + + .../devicetree/bindings/dma/tegra20-apbdma.txt | 30 + + .../devicetree/bindings/gpio/gpio_nvidia.txt | 36 +- + arch/arm/boot/dts/tegra-harmony.dts | 45 +- + arch/arm/boot/dts/tegra-paz00.dts | 62 +- + arch/arm/boot/dts/tegra-seaboard.dts | 78 + + arch/arm/boot/dts/tegra-trimslice.dts | 12 + + arch/arm/boot/dts/tegra-ventana.dts | 42 + + arch/arm/boot/dts/tegra20.dtsi | 43 +- + arch/arm/boot/dts/tegra30.dtsi | 53 +- + arch/arm/mach-tegra/Makefile | 6 +- + arch/arm/mach-tegra/apbio.c | 145 + + arch/arm/mach-tegra/apbio.h | 39 + + arch/arm/mach-tegra/board-dt-tegra30.c | 24 +- + arch/arm/mach-tegra/board-harmony-power.c | 15 - + arch/arm/mach-tegra/board-harmony.c | 2 +- + arch/arm/mach-tegra/board-paz00.c | 8 +- + arch/arm/mach-tegra/board-paz00.h | 2 +- + arch/arm/mach-tegra/board-seaboard.c | 5 +- + arch/arm/mach-tegra/clock.c | 22 + + arch/arm/mach-tegra/clock.h | 15 + + arch/arm/mach-tegra/common.c | 21 + + arch/arm/mach-tegra/cpuidle.c | 107 + + arch/arm/mach-tegra/dma.c | 128 +- + arch/arm/mach-tegra/flowctrl.h | 37 + + arch/arm/mach-tegra/fuse.c | 107 +- + arch/arm/mach-tegra/fuse.h | 34 +- + arch/arm/mach-tegra/include/mach/clk.h | 10 + + arch/arm/mach-tegra/include/mach/debug-macro.S | 88 +- + arch/arm/mach-tegra/include/mach/dma.h | 10 +- + arch/arm/mach-tegra/include/mach/gpio-tegra.h | 2 - + arch/arm/mach-tegra/include/mach/iomap.h | 3 + + arch/arm/mach-tegra/include/mach/irammap.h | 35 + + arch/arm/mach-tegra/include/mach/irqs.h | 7 +- + arch/arm/mach-tegra/include/mach/uncompress.h | 118 +- + arch/arm/mach-tegra/irq.c | 20 +- + arch/arm/mach-tegra/pmc.c | 76 + + arch/arm/mach-tegra/pmc.h | 23 + + arch/arm/mach-tegra/sleep.S | 91 + + arch/arm/mach-tegra/tegra2_clocks.c | 2 +- + arch/arm/mach-tegra/tegra2_emc.c | 224 ++- + arch/arm/mach-tegra/tegra2_emc.h | 11 +- + arch/arm/mach-tegra/tegra30_clocks.c | 3099 ++++++++++++++++++++ + drivers/gpio/gpio-tegra.c | 61 +- + drivers/i2c/busses/i2c-tegra.c | 2 +- + include/linux/platform_data/tegra_emc.h | 34 + + 47 files changed, 4938 insertions(+), 215 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/tegra/emc.txt + create mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.txt + create mode 100644 Documentation/devicetree/bindings/dma/tegra20-apbdma.txt + create mode 100644 arch/arm/mach-tegra/apbio.c + create mode 100644 arch/arm/mach-tegra/apbio.h + create mode 100644 arch/arm/mach-tegra/cpuidle.c + create mode 100644 arch/arm/mach-tegra/flowctrl.h + create mode 100644 arch/arm/mach-tegra/include/mach/irammap.h + create mode 100644 arch/arm/mach-tegra/pmc.c + create mode 100644 arch/arm/mach-tegra/pmc.h + create mode 100644 arch/arm/mach-tegra/sleep.S + create mode 100644 arch/arm/mach-tegra/tegra30_clocks.c + create mode 100644 include/linux/platform_data/tegra_emc.h +Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support) +$ git merge xilinx/arm-next +Already up-to-date. +Merging blackfin/for-linus (e651fe5 Blackfin: wire up new process_vm syscalls) +$ git merge blackfin/for-linus +Merge made by the 'recursive' strategy. + arch/blackfin/configs/BF518F-EZBRD_defconfig | 25 ++-- + arch/blackfin/configs/BF526-EZBRD_defconfig | 26 ++-- + arch/blackfin/configs/BF527-EZKIT-V2_defconfig | 26 ++-- + arch/blackfin/configs/BF527-EZKIT_defconfig | 27 ++-- + arch/blackfin/configs/BF533-EZKIT_defconfig | 23 +-- + arch/blackfin/configs/BF533-STAMP_defconfig | 22 +- + arch/blackfin/configs/BF537-STAMP_defconfig | 27 ++-- + arch/blackfin/configs/BF548-EZKIT_defconfig | 16 +- + arch/blackfin/configs/BF561-EZKIT-SMP_defconfig | 35 ++-- + arch/blackfin/configs/BF561-EZKIT_defconfig | 23 +-- + arch/blackfin/include/asm/bfin5xx_spi.h | 1 - + arch/blackfin/include/asm/bfin_simple_timer.h | 10 +- + arch/blackfin/include/asm/bfin_sport.h | 3 + + arch/blackfin/include/asm/blackfin.h | 44 ++--- + arch/blackfin/include/asm/kgdb.h | 1 + + arch/blackfin/include/asm/mmu_context.h | 5 +- + arch/blackfin/include/asm/thread_info.h | 2 + + arch/blackfin/include/asm/unistd.h | 4 +- + arch/blackfin/kernel/cplb-mpu/cplbmgr.c | 2 + + arch/blackfin/mach-bf537/boards/stamp.c | 24 +++- + arch/blackfin/mach-bf548/boards/ezkit.c | 2 + + arch/blackfin/mach-bf561/atomic.S | 7 + + arch/blackfin/mach-bf561/include/mach/defBF561.h | 220 +++++++++++----------- + arch/blackfin/mach-common/entry.S | 2 + + 24 files changed, 309 insertions(+), 268 deletions(-) +Merging c6x/for-linux-next (dcd6c92 Linux 3.3-rc1) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (ea78f5b CRIS: Update documentation) +$ git merge cris/for-next +Auto-merging drivers/net/cris/eth_v10.c +Auto-merging arch/cris/arch-v32/drivers/cryptocop.c +Merge made by the 'recursive' strategy. + Documentation/cris/README | 62 +++++++++++++++--------------- + arch/cris/arch-v32/drivers/cryptocop.c | 6 +-- + arch/cris/arch-v32/kernel/ptrace.c | 2 - + arch/cris/include/arch-v32/arch/cache.h | 2 +- + drivers/net/cris/eth_v10.c | 1 - + 5 files changed, 34 insertions(+), 39 deletions(-) +Merging quilt/hexagon (110b372 Remove unneeded include of version.h from arch/hexagon/include/asm/spinlock_types.h) +$ git merge quilt/hexagon +Resolved 'arch/hexagon/Kconfig' using previous resolution. +Auto-merging arch/hexagon/Kconfig +CONFLICT (content): Merge conflict in arch/hexagon/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3dc4ac2] Merge branch 'quilt/hexagon' +$ git diff -M --stat --summary HEAD^.. + arch/hexagon/Kconfig | 23 ++++------------------- + arch/hexagon/Makefile | 4 ---- + arch/hexagon/include/asm/spinlock_types.h | 2 -- + arch/hexagon/kernel/dma.c | 1 + + arch/hexagon/kernel/ptrace.c | 1 + + arch/hexagon/kernel/time.c | 7 +++---- + arch/hexagon/kernel/vdso.c | 1 + + 7 files changed, 10 insertions(+), 29 deletions(-) +Merging ia64/next (0f261ed [IA64] disable interrupts when exiting from ia64_mca_cmc_int_handler()) +$ git merge ia64/next +Merge made by the 'recursive' strategy. + arch/ia64/kernel/mca.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) +Merging m68k/for-next (2a35350 m68k: Fix assembler constraint to prevent overeager gcc optimisation) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (9720227 m68knommu: clean up linker script) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/include/asm/mcf_pgtable.h | 3 +- + arch/m68k/kernel/vmlinux-nommu.lds | 200 +++++++++-------------------------- + arch/m68k/mm/mcfmmu.c | 9 +- + arch/m68k/platform/coldfire/entry.S | 4 +- + arch/m68k/platform/coldfire/head.S | 4 + + 5 files changed, 61 insertions(+), 159 deletions(-) +Merging microblaze/next (8597559 Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (8551715 Merge branches 'fixes-for-linus' and 'next/lantiq' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Removing arch/mips/lantiq/xway/setup-xway.c +Removing arch/mips/lantiq/xway/setup-ase.c +Removing arch/mips/lantiq/xway/pmu.c +Removing arch/mips/lantiq/xway/ebu.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 + + arch/mips/alchemy/common/time.c | 2 +- + arch/mips/configs/ase_defconfig | 79 ++++ + arch/mips/configs/falcon_defconfig | 82 ++++ + arch/mips/configs/xway_defconfig | 80 ++++ + arch/mips/include/asm/mach-au1x00/gpio-au1300.h | 20 +- + .../include/asm/mach-lantiq/falcon/falcon_irq.h | 268 +++++++++++++ + arch/mips/include/asm/mach-lantiq/falcon/irq.h | 18 + + .../include/asm/mach-lantiq/falcon/lantiq_soc.h | 158 ++++++++ + arch/mips/include/asm/mach-lantiq/lantiq.h | 23 +- + .../mips/include/asm/mach-lantiq/xway/lantiq_irq.h | 22 +- + .../mips/include/asm/mach-lantiq/xway/lantiq_soc.h | 56 +++- + arch/mips/include/asm/page.h | 3 - + arch/mips/kernel/smp-bmips.c | 1 - + arch/mips/kernel/vmlinux.lds.S | 1 - + arch/mips/lantiq/Kconfig | 4 + + arch/mips/lantiq/Makefile | 1 + + arch/mips/lantiq/Platform | 1 + + arch/mips/lantiq/clk.c | 25 +-- + arch/mips/lantiq/devices.c | 30 +-- + arch/mips/lantiq/devices.h | 4 + + arch/mips/lantiq/early_printk.c | 14 +- + arch/mips/lantiq/falcon/Kconfig | 11 + + arch/mips/lantiq/falcon/Makefile | 2 + + arch/mips/lantiq/falcon/clk.c | 44 +++ + arch/mips/lantiq/falcon/devices.c | 128 +++++++ + arch/mips/lantiq/falcon/devices.h | 20 + + arch/mips/lantiq/falcon/gpio.c | 399 ++++++++++++++++++++ + arch/mips/lantiq/falcon/mach-easy98000.c | 110 ++++++ + arch/mips/lantiq/falcon/prom.c | 93 +++++ + arch/mips/lantiq/falcon/reset.c | 88 +++++ + arch/mips/lantiq/falcon/sysctrl.c | 183 +++++++++ + arch/mips/lantiq/irq.c | 24 +- + arch/mips/lantiq/machtypes.h | 5 + + arch/mips/lantiq/prom.c | 57 +++- + arch/mips/lantiq/prom.h | 4 + + arch/mips/lantiq/xway/Makefile | 6 +- + arch/mips/lantiq/xway/devices.c | 47 +-- + arch/mips/lantiq/xway/dma.c | 21 +- + arch/mips/lantiq/xway/ebu.c | 52 --- + arch/mips/lantiq/xway/gpio.c | 14 +- + arch/mips/lantiq/xway/gpio_stp.c | 13 +- + arch/mips/lantiq/xway/mach-easy50601.c | 5 + + arch/mips/lantiq/xway/pmu.c | 69 ---- + arch/mips/lantiq/xway/prom-ase.c | 9 + + arch/mips/lantiq/xway/prom-xway.c | 10 + + arch/mips/lantiq/xway/reset.c | 24 +- + arch/mips/lantiq/xway/setup-ase.c | 19 - + arch/mips/lantiq/xway/setup-xway.c | 20 - + arch/mips/lantiq/xway/sysctrl.c | 78 ++++ + arch/mips/mm/fault.c | 36 ++- + arch/mips/pci/pci-lantiq.c | 40 +- + arch/mips/pci/pci.c | 5 +- + arch/mips/pmc-sierra/yosemite/ht-irq.c | 10 - + arch/mips/txx9/generic/7segled.c | 2 +- + drivers/net/ethernet/lantiq_etop.c | 204 +++++++++-- + drivers/watchdog/lantiq_wdt.c | 2 +- + 57 files changed, 2324 insertions(+), 428 deletions(-) + create mode 100644 arch/mips/configs/ase_defconfig + create mode 100644 arch/mips/configs/falcon_defconfig + create mode 100644 arch/mips/configs/xway_defconfig + create mode 100644 arch/mips/include/asm/mach-lantiq/falcon/falcon_irq.h + create mode 100644 arch/mips/include/asm/mach-lantiq/falcon/irq.h + create mode 100644 arch/mips/include/asm/mach-lantiq/falcon/lantiq_soc.h + create mode 100644 arch/mips/lantiq/falcon/Kconfig + create mode 100644 arch/mips/lantiq/falcon/Makefile + create mode 100644 arch/mips/lantiq/falcon/clk.c + create mode 100644 arch/mips/lantiq/falcon/devices.c + create mode 100644 arch/mips/lantiq/falcon/devices.h + create mode 100644 arch/mips/lantiq/falcon/gpio.c + create mode 100644 arch/mips/lantiq/falcon/mach-easy98000.c + create mode 100644 arch/mips/lantiq/falcon/prom.c + create mode 100644 arch/mips/lantiq/falcon/reset.c + create mode 100644 arch/mips/lantiq/falcon/sysctrl.c + delete mode 100644 arch/mips/lantiq/xway/ebu.c + delete mode 100644 arch/mips/lantiq/xway/pmu.c + delete mode 100644 arch/mips/lantiq/xway/setup-ase.c + delete mode 100644 arch/mips/lantiq/xway/setup-xway.c + create mode 100644 arch/mips/lantiq/xway/sysctrl.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 (ef88e39 powerpc: fix compile error with 85xx/p1010rdb.c) +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next (ef88e39 powerpc: fix compile error with 85xx/p1010rdb.c) +$ 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 (ef88e39 powerpc: fix compile error with 85xx/p1010rdb.c) +$ git merge galak/next +Already up-to-date. +Merging s390/features (7014bc6 [S390] irq: external interrupt code passing) +$ git merge s390/features +Removing arch/s390/kernel/switch_cpu64.S +Removing arch/s390/kernel/switch_cpu.S +Removing arch/s390/include/asm/sigp.h +Merge made by the 'recursive' strategy. + arch/s390/include/asm/cputime.h | 9 +- + arch/s390/include/asm/hardirq.h | 1 + + arch/s390/include/asm/irq.h | 7 +- + arch/s390/include/asm/lowcore.h | 104 ++-- + arch/s390/include/asm/sigp.h | 132 ----- + arch/s390/include/asm/smp.h | 63 +-- + arch/s390/include/asm/timer.h | 4 +- + arch/s390/include/asm/vdso.h | 4 +- + arch/s390/kernel/Makefile | 2 - + arch/s390/kernel/asm-offsets.c | 27 +- + arch/s390/kernel/entry.S | 158 +++--- + arch/s390/kernel/entry.h | 17 +- + arch/s390/kernel/entry64.S | 138 +++-- + arch/s390/kernel/ipl.c | 51 +-- + arch/s390/kernel/irq.c | 14 +- + arch/s390/kernel/machine_kexec.c | 43 +-- + arch/s390/kernel/nmi.c | 2 - + arch/s390/kernel/process.c | 12 +- + arch/s390/kernel/setup.c | 58 +- + arch/s390/kernel/smp.c | 1118 +++++++++++++++++++------------------- + arch/s390/kernel/switch_cpu.S | 58 -- + arch/s390/kernel/switch_cpu64.S | 51 -- + arch/s390/kernel/swsusp_asm64.S | 16 +- + arch/s390/kernel/time.c | 11 +- + arch/s390/kernel/topology.c | 8 +- + arch/s390/kernel/vdso.c | 12 +- + arch/s390/kernel/vtime.c | 168 ++----- + arch/s390/kvm/interrupt.c | 6 +- + arch/s390/lib/delay.c | 31 +- + arch/s390/lib/spinlock.c | 30 +- + arch/s390/mm/fault.c | 4 +- + arch/s390/mm/pgtable.c | 2 +- + arch/s390/oprofile/hwsampler.c | 6 +- + drivers/s390/block/dasd_diag.c | 8 +- + drivers/s390/char/con3215.c | 22 +- + drivers/s390/char/sclp.c | 4 +- + drivers/s390/char/sclp_quiesce.c | 1 - + drivers/s390/char/sclp_sdias.c | 101 +++- + drivers/s390/char/zcore.c | 1 - + drivers/s390/cio/cio.c | 2 - + drivers/s390/kvm/kvm_virtio.c | 6 +- + net/iucv/iucv.c | 2 +- + 42 files changed, 1096 insertions(+), 1418 deletions(-) + delete mode 100644 arch/s390/include/asm/sigp.h + delete mode 100644 arch/s390/kernel/switch_cpu.S + delete mode 100644 arch/s390/kernel/switch_cpu64.S +Merging sparc-next/master (e4e1118 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (0c90547 arch/tile: use new generic {enable,disable}_percpu_irq() routines) +$ git merge tile/master +Already up-to-date. +Merging unicore32/unicore32 (0994695 Merge branch 'akpm' (aka "Andrew's patch-bomb, take two")) +$ git merge unicore32/unicore32 +Already up-to-date. +Merging ceph/for-next (83eb26a ceph: ensure prealloc_blob is in place when removing xattr) +$ git merge ceph/for-next +Already up-to-date. +Merging cifs/master (ff4fa4a cifs: don't return error from standard_receive3 after marking response malformed) +$ git merge cifs/master +Already up-to-date. +Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs) +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next (6cfd4b4 ecryptfs: remove the second argument of k[un]map_atomic()) +$ git merge ecryptfs/next +Merge made by the 'recursive' strategy. + fs/ecryptfs/crypto.c | 68 ++++++++++++++++++++++++++++++++++++---- + fs/ecryptfs/ecryptfs_kernel.h | 5 +++ + fs/ecryptfs/inode.c | 2 + + fs/ecryptfs/keystore.c | 9 ++--- + fs/ecryptfs/mmap.c | 16 +++++++-- + fs/ecryptfs/read_write.c | 4 +- + fs/ecryptfs/super.c | 14 ++++++++- + 7 files changed, 98 insertions(+), 20 deletions(-) +Merging ext3/for_next (62aa2b5 Linux 3.3-rc2) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (d2403ca ext4: using PTR_ERR() on the wrong variable in ext4_ext_migrate()) +$ git merge ext4/dev +Merge made by the 'recursive' strategy. + Documentation/filesystems/ext4.txt | 8 -- + fs/ext4/balloc.c | 59 ++++++--- + fs/ext4/dir.c | 8 +- + fs/ext4/ext4.h | 14 ++- + fs/ext4/ext4_jbd2.h | 128 +++++++++++++++---- + fs/ext4/ialloc.c | 235 ++++++++++++++--------------------- + fs/ext4/inode.c | 36 ++++-- + fs/ext4/mballoc.c | 233 ++++++++++++++---------------------- + fs/ext4/mballoc.h | 18 ++-- + fs/ext4/migrate.c | 2 +- + fs/ext4/super.c | 73 ++++-------- + fs/ext4/xattr.c | 5 +- + fs/jbd2/checkpoint.c | 4 +- + fs/jbd2/commit.c | 2 +- + fs/jbd2/journal.c | 74 ++---------- + fs/jbd2/revoke.c | 12 +-- + fs/jbd2/transaction.c | 38 ++++++- + include/linux/jbd2.h | 5 + + include/trace/events/jbd2.h | 28 +++++ + 19 files changed, 484 insertions(+), 498 deletions(-) +Merging fuse/for-next (03c9693 cuse: implement memory mapping) +$ git merge fuse/for-next +Auto-merging fs/fuse/inode.c +Auto-merging fs/fuse/fuse_i.h +Merge made by the 'recursive' strategy. + fs/fuse/cuse.c | 426 +++++++++++++++++++++++++++++++++++++++++++++++++- + fs/fuse/dev.c | 155 ++----------------- + fs/fuse/fuse_i.h | 35 ++++- + fs/fuse/inode.c | 167 +++++++++++++++++++- + include/linux/fuse.h | 25 +++ + 5 files changed, 656 insertions(+), 152 deletions(-) +Merging gfs2/master (bc5fd03 GFS2: Sort the ordered write list) +$ git merge gfs2/master +Merge made by the 'recursive' strategy. + fs/gfs2/file.c | 2 + + fs/gfs2/glock.c | 224 ++++++++++++++++++++++++++++++++++++++++--- + fs/gfs2/incore.h | 49 +++++++++- + fs/gfs2/inode.c | 4 +- + fs/gfs2/lock_dlm.c | 123 +++++++++++++++++++++++- + fs/gfs2/log.c | 117 ++++------------------- + fs/gfs2/log.h | 5 +- + fs/gfs2/lops.c | 94 ++++++++++++++++++- + fs/gfs2/ops_fstype.c | 8 ++ + fs/gfs2/rgrp.c | 164 ++++++++++++++++++++++++++----- + fs/gfs2/rgrp.h | 10 +- + fs/gfs2/super.c | 2 +- + fs/gfs2/trace_gfs2.h | 60 +++++++++++- + fs/gfs2/xattr.c | 4 +- + include/linux/gfs2_ondisk.h | 1 + + 15 files changed, 707 insertions(+), 160 deletions(-) +Merging logfs/master (3b582f3 Merge tag 'battery-fixes-for-v3.3-rc2' of git://git.infradead.org/users/cbou/battery-urgent) +$ git merge logfs/master +Already up-to-date. +Merging nfs/linux-next (982a9fe Merge branch 'nfs-for-next' into linux-next) +$ git merge nfs/linux-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/nfs/idmapper.txt | 20 +- + Documentation/kernel-parameters.txt | 8 + + fs/lockd/clnt4xdr.c | 2 +- + fs/lockd/clntlock.c | 3 +- + fs/lockd/clntxdr.c | 8 +- + fs/lockd/host.c | 42 ++- + fs/lockd/mon.c | 21 +- + fs/lockd/netns.h | 12 + + fs/lockd/svc.c | 117 ++++++- + fs/nfs/Kconfig | 13 +- + fs/nfs/blocklayout/blocklayout.c | 152 ++++++++-- + fs/nfs/blocklayout/blocklayout.h | 3 +- + fs/nfs/blocklayout/blocklayoutdev.c | 7 +- + fs/nfs/blocklayout/blocklayoutdm.c | 9 +- + fs/nfs/blocklayout/extents.c | 2 +- + fs/nfs/cache_lib.c | 61 +++- + fs/nfs/cache_lib.h | 10 +- + fs/nfs/callback.c | 12 +- + fs/nfs/callback.h | 3 +- + fs/nfs/callback_proc.c | 58 +++-- + fs/nfs/callback_xdr.c | 15 +- + fs/nfs/client.c | 197 +++++++----- + fs/nfs/dir.c | 25 ++- + fs/nfs/dns_resolve.c | 129 ++++++-- + fs/nfs/dns_resolve.h | 14 +- + fs/nfs/file.c | 2 + + fs/nfs/idmap.c | 356 +++++++++++++++------ + fs/nfs/inode.c | 49 +++- + fs/nfs/internal.h | 13 +- + fs/nfs/mount_clnt.c | 14 +- + fs/nfs/netns.h | 20 ++ + fs/nfs/nfs2xdr.c | 2 +- + fs/nfs/nfs3xdr.c | 4 +- + fs/nfs/nfs4_fs.h | 35 +-- + fs/nfs/nfs4filelayout.c | 12 +- + fs/nfs/nfs4filelayoutdev.c | 88 ++---- + fs/nfs/nfs4namespace.c | 10 +- + fs/nfs/nfs4proc.c | 258 ++++++++++------ + fs/nfs/nfs4state.c | 201 +++++------- + fs/nfs/nfs4xdr.c | 45 ++- + fs/nfs/objlayout/objio_osd.c | 6 +- + fs/nfs/objlayout/objlayout.c | 6 +- + fs/nfs/pagelist.c | 1 + + fs/nfs/pnfs.c | 16 +- + fs/nfs/read.c | 2 +- + fs/nfs/super.c | 32 ++- + fs/nfs/sysctl.c | 2 - + fs/nfs/unlink.c | 4 +- + fs/nfs/write.c | 2 +- + fs/nfsd/nfs4callback.c | 8 +- + fs/nfsd/nfs4state.c | 2 +- + fs/nfsd/nfsctl.c | 6 +- + fs/nfsd/nfssvc.c | 4 +- + fs/nfsd/stats.c | 5 +- + include/linux/lockd/bind.h | 1 + + include/linux/lockd/lockd.h | 7 +- + include/linux/lockd/xdr4.h | 2 +- + include/linux/nfs.h | 2 +- + include/linux/nfs_fs_i.h | 4 - + include/linux/nfs_fs_sb.h | 16 +- + include/linux/nfs_idmap.h | 22 +- + include/linux/nfs_xdr.h | 15 +- + include/linux/sunrpc/auth.h | 2 + + include/linux/sunrpc/cache.h | 8 +- + include/linux/sunrpc/clnt.h | 36 +- + include/linux/sunrpc/debug.h | 3 + + include/linux/sunrpc/rpc_pipe_fs.h | 44 ++- + include/linux/sunrpc/sched.h | 23 ++- + include/linux/sunrpc/stats.h | 22 +- + include/linux/sunrpc/svc.h | 13 +- + include/linux/sunrpc/svc_xprt.h | 3 +- + include/linux/sunrpc/svcauth_gss.h | 2 + + include/linux/sunrpc/svcsock.h | 2 +- + include/linux/sunrpc/xprt.h | 2 +- + include/trace/events/sunrpc.h | 177 ++++++++++ + net/sunrpc/addr.c | 26 +- + net/sunrpc/auth_gss/auth_gss.c | 216 +++++++++---- + net/sunrpc/auth_gss/svcauth_gss.c | 165 +++++++--- + net/sunrpc/cache.c | 44 ++- + net/sunrpc/clnt.c | 219 +++++++++---- + net/sunrpc/netns.h | 14 + + net/sunrpc/rpc_pipe.c | 478 +++++++++++++++++----------- + net/sunrpc/rpcb_clnt.c | 144 +++++---- + net/sunrpc/sched.c | 58 +++- + net/sunrpc/stats.c | 21 +- + net/sunrpc/sunrpc.h | 2 + + net/sunrpc/sunrpc_syms.c | 19 +- + net/sunrpc/svc.c | 98 ++++--- + net/sunrpc/svc_xprt.c | 51 ++- + net/sunrpc/svcauth_unix.c | 126 ++++---- + net/sunrpc/svcsock.c | 3 +- + net/sunrpc/sysctl.c | 4 +- + net/sunrpc/xprt.c | 53 ++-- + 93 files changed, 2838 insertions(+), 1457 deletions(-) + create mode 100644 fs/lockd/netns.h + create mode 100644 fs/nfs/netns.h + create mode 100644 include/trace/events/sunrpc.h +Merging nfsd/nfsd-next (7a6ef8c nfsd4: nfsd4_create_clid_dir return value is unused) +$ git merge nfsd/nfsd-next +Already up-to-date. +Merging ocfs2/linux-next (9392557 ocfs2: avoid unaligned access to dqc_bitmap) +$ git merge ocfs2/linux-next +Already up-to-date. +Merging omfs/for-next (976d167 Linux 3.1-rc9) +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master (3d4a1c8 Squashfs: fix i_blocks calculation with extended regular files) +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next (f766619 fs/9p: iattr_valid flags are kernel internal flags map them to 9p values.) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (72d3ef6 UBIFS: do not use inc_link when i_nlink is zero) +$ git merge ubifs/linux-next +Merge made by the 'recursive' strategy. + fs/ubifs/debug.c | 410 +++++++++++++++++++++++++------------------------- + fs/ubifs/debug.h | 3 - + fs/ubifs/dir.c | 18 +- + fs/ubifs/recovery.c | 3 +- + 4 files changed, 216 insertions(+), 218 deletions(-) +Merging xfs/for-next (f65020a XFS: xfs_trans_add_item() - don't assign in ASSERT() when compare is intended) +$ git merge xfs/for-next +Auto-merging fs/xfs/xfs_qm.c +Auto-merging fs/xfs/xfs_dquot.c +Merge made by the 'recursive' strategy. + fs/xfs/xfs_dquot.c | 37 +++++++++++-------------------------- + fs/xfs/xfs_dquot.h | 30 ++++++++++++++++++++++++++---- + fs/xfs/xfs_log_recover.c | 2 +- + fs/xfs/xfs_mount.c | 8 +++++--- + fs/xfs/xfs_mount.h | 2 +- + fs/xfs/xfs_qm.c | 2 +- + fs/xfs/xfs_quota.h | 2 ++ + fs/xfs/xfs_sb.h | 1 - + fs/xfs/xfs_super.c | 7 +++---- + fs/xfs/xfs_trans.c | 4 ++-- + 10 files changed, 52 insertions(+), 43 deletions(-) +Merging vfs/for-next (9a3b4c1 qnx4fs: small cleanup) +$ git merge vfs/for-next +Auto-merging net/sunrpc/rpc_pipe.c +Auto-merging fs/xfs/xfs_super.c +Auto-merging fs/gfs2/ops_fstype.c +Auto-merging fs/fuse/inode.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ecryptfs/super.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/porting | 6 +++ + arch/powerpc/platforms/cell/spufs/inode.c | 4 +- + arch/s390/hypfs/inode.c | 6 +-- + drivers/misc/ibmasm/ibmasmfs.c | 16 +++----- + drivers/oprofile/oprofilefs.c | 11 ++---- + drivers/usb/core/inode.c | 13 +------ + drivers/usb/gadget/f_fs.c | 8 +--- + drivers/usb/gadget/inode.c | 4 +-- + fs/9p/vfs_super.c | 3 +- + fs/adfs/super.c | 3 +- + fs/affs/super.c | 7 +--- + fs/afs/super.c | 7 +--- + fs/autofs4/expire.c | 2 + + fs/autofs4/inode.c | 10 +---- + fs/befs/linuxvfs.c | 3 +- + fs/bfs/inode.c | 3 +- + fs/btrfs/super.c | 8 +--- + fs/ceph/super.c | 3 +- + fs/cifs/cifsfs.c | 7 +--- + fs/coda/inode.c | 6 +--- + fs/compat.c | 56 +++++++++++++---------------- + fs/configfs/mount.c | 3 +- + fs/cramfs/inode.c | 6 +-- + fs/dcache.c | 32 ++-------------- + fs/devpts/inode.c | 3 +- + fs/ecryptfs/main.c | 3 +- + fs/ecryptfs/super.c | 1 - + fs/efs/super.c | 3 +- + fs/exofs/namei.c | 13 +------ + fs/exofs/super.c | 4 +- + fs/ext2/namei.c | 13 +------ + fs/ext2/super.c | 4 +- + fs/ext3/super.c | 3 +- + fs/ext4/super.c | 3 +- + fs/fat/inode.c | 8 ++-- + fs/file_table.c | 3 +- + fs/freevxfs/vxfs_super.c | 3 +- + fs/fuse/inode.c | 9 +---- + fs/gfs2/ops_fstype.c | 3 +- + fs/hfs/super.c | 6 +-- + fs/hfsplus/super.c | 17 +++++---- + fs/hostfs/hostfs_kern.c | 4 +- + fs/hpfs/super.c | 6 +-- + fs/hppfs/hppfs.c | 9 +---- + fs/hugetlbfs/inode.c | 13 +------ + fs/inode.c | 19 ++-------- + fs/isofs/inode.c | 3 +- + fs/jffs2/fs.c | 6 +-- + fs/jfs/namei.c | 13 ------- + fs/jfs/super.c | 4 +- + fs/libfs.c | 6 +-- + fs/logfs/dir.c | 3 -- + fs/logfs/super.c | 7 ++-- + fs/minix/inode.c | 38 +++++++++----------- + fs/minix/minix.h | 1 - + fs/minix/namei.c | 14 +------- + fs/namei.c | 17 ++++++++- + fs/ncpfs/inode.c | 6 +-- + fs/nfs/getroot.c | 6 +-- + fs/nilfs2/namei.c | 11 ------ + fs/nilfs2/super.c | 4 +- + fs/ntfs/super.c | 7 ++-- + fs/ocfs2/dlmfs/dlmfs.c | 14 +------ + fs/ocfs2/namei.c | 2 +- + fs/ocfs2/super.c | 11 ++---- + fs/omfs/inode.c | 6 +-- + fs/openpromfs/inode.c | 3 +- + fs/proc/inode.c | 16 ++------- + fs/pstore/inode.c | 25 ++++--------- + fs/qnx4/inode.c | 33 +---------------- + fs/qnx4/namei.c | 4 -- + fs/quota/quota.c | 24 +++++++++++-- + fs/ramfs/inode.c | 30 ++++------------ + fs/reiserfs/super.c | 6 +-- + fs/romfs/super.c | 6 +-- + fs/squashfs/super.c | 3 +- + fs/super.c | 22 +++++++++++ + fs/sysfs/mount.c | 3 +- + fs/sysv/namei.c | 12 +------ + fs/sysv/super.c | 27 +++++++------- + fs/sysv/sysv.h | 1 - + fs/ubifs/super.c | 6 +-- + fs/udf/namei.c | 13 ------- + fs/udf/super.c | 6 ++- + fs/ufs/namei.c | 14 +------- + fs/ufs/super.c | 7 ++-- + fs/xfs/xfs_rename.c | 11 ------ + fs/xfs/xfs_super.c | 7 ++-- + fs/xfs/xfs_utils.c | 2 - + fs/xfs/xfs_vnodeops.c | 16 -------- + include/linux/dcache.h | 1 - + include/linux/file.h | 1 - + include/linux/fs.h | 7 +++- + ipc/mqueue.c | 24 ++++--------- + kernel/cgroup.c | 8 +--- + kernel/pid.c | 4 +- + mm/page_alloc.c | 1 + + mm/shmem.c | 10 ++---- + net/ipv4/tcp.c | 5 ++- + net/sunrpc/rpc_pipe.c | 8 +--- + 100 files changed, 301 insertions(+), 621 deletions(-) +Merging pci/linux-next (a78cfc93 PCI / PM: Disable wakeup during shutdown for devices not enabled to wake up) +$ git merge pci/linux-next +Merge made by the 'recursive' strategy. + arch/x86/Kconfig | 23 ++- + arch/x86/pci/Makefile | 2 + + arch/x86/pci/acpi.c | 7 +- + arch/x86/pci/i386.c | 83 ++++++- + arch/x86/pci/sta2x11-fixup.c | 365 ++++++++++++++++++++++++ + drivers/pci/hotplug/acpiphp_glue.c | 29 +- + drivers/pci/hotplug/cpcihp_generic.c | 2 +- + drivers/pci/hotplug/ibmphp_ebda.c | 6 +- + drivers/pci/hotplug/pciehp_hpc.c | 133 ++++++++-- + drivers/pci/iov.c | 8 +- + drivers/pci/pci-driver.c | 10 + + drivers/pci/pci-sysfs.c | 5 +- + drivers/pci/pci.c | 32 ++- + drivers/pci/pci.h | 2 + + drivers/pci/pcie/Kconfig | 25 ++ + drivers/pci/pcie/aspm.c | 8 + + drivers/pci/probe.c | 73 +++--- + drivers/pci/quirks.c | 57 ++++- + drivers/pci/remove.c | 10 +- + drivers/pci/setup-bus.c | 505 +++++++++++++++++++++++----------- + drivers/pci/setup-res.c | 90 +++---- + drivers/xen/xen-pciback/pci_stub.c | 41 +++- + drivers/xen/xen-pciback/pciback.h | 1 + + include/linux/ioport.h | 6 - + include/linux/pci.h | 5 +- + 25 files changed, 1212 insertions(+), 316 deletions(-) + create mode 100644 arch/x86/pci/sta2x11-fixup.c +Merging hid/for-next (9d23d8a Merge branch 'upstream' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/Kconfig | 62 +++----------- + drivers/hid/Makefile | 12 +-- + drivers/hid/hid-chicony.c | 7 ++ + drivers/hid/hid-core.c | 3 + + drivers/hid/hid-ids.h | 6 ++ + drivers/hid/hid-input.c | 9 ++- + drivers/hid/hid-logitech-dj.c | 2 +- + drivers/hid/hid-multitouch.c | 83 ++++++++++++++++-- + drivers/hid/hid-tivo.c | 89 +++++++++++++++++++ + drivers/hid/hid-waltop.c | 192 +++++++++++++++++++++++++++++++++++++++++ + 10 files changed, 398 insertions(+), 67 deletions(-) + create mode 100644 drivers/hid/hid-tivo.c +Merging quilt/i2c (c3632e0 i2c-i801: Use usleep_range to wait for command completion) +$ git merge quilt/i2c +Merge made by the 'recursive' strategy. + Documentation/i2c/busses/i2c-i801 | 1 + + drivers/i2c/busses/Kconfig | 1 + + drivers/i2c/busses/i2c-gpio.c | 3 +-- + drivers/i2c/busses/i2c-i801.c | 27 +++++++++++++++------------ + drivers/i2c/busses/i2c-isch.c | 10 +++++----- + drivers/i2c/i2c-core.c | 12 ++++++++---- + 6 files changed, 31 insertions(+), 23 deletions(-) +Merging bjdooks-i2c/next-i2c (fc84fe1 Merge branch 'for_3.3/i2c/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into for-33/i2c/omap) +$ git merge bjdooks-i2c/next-i2c +Resolved 'drivers/i2c/busses/i2c-omap.c' using previous resolution. +Auto-merging drivers/i2c/busses/i2c-omap.c +CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-omap.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 87c5793] Merge remote-tracking branch 'bjdooks-i2c/next-i2c' +$ git diff -M --stat --summary HEAD^.. +Merging quilt/jdelvare-hwmon (127e71e hwmon: (mc13xxx-adc) Add support for the MC13892 PMIC) +$ git merge quilt/jdelvare-hwmon +Merge made by the 'recursive' strategy. + Documentation/hwmon/lm90 | 4 + + Documentation/hwmon/mc13783-adc | 50 +++- + drivers/hwmon/Kconfig | 18 +- + drivers/hwmon/fam15h_power.c | 10 +- + drivers/hwmon/lm63.c | 586 ++++++++++++++++++++++----------------- + drivers/hwmon/lm90.c | 77 ++++-- + drivers/hwmon/mc13783-adc.c | 103 ++++++-- + drivers/hwmon/w83795.c | 132 ++++++--- + 8 files changed, 609 insertions(+), 371 deletions(-) +Merging hwmon-staging/hwmon-next (de69184 hwmon: (hwmon-vid) Fix checkpatch issues) +$ git merge hwmon-staging/hwmon-next +Auto-merging drivers/hwmon/w83795.c +Auto-merging drivers/hwmon/lm90.c +Auto-merging drivers/hwmon/lm63.c +Auto-merging drivers/hwmon/Kconfig +Merge made by the 'recursive' strategy. + Documentation/hwmon/lm80 | 9 +- + drivers/hwmon/Kconfig | 4 +- + drivers/hwmon/abituguru.c | 584 ++++++++++++++--------- + drivers/hwmon/abituguru3.c | 267 +++++++---- + drivers/hwmon/ad7314.c | 12 +- + drivers/hwmon/ad7414.c | 21 +- + drivers/hwmon/ad7418.c | 25 +- + drivers/hwmon/adcxx.c | 13 +- + drivers/hwmon/adm1021.c | 97 +++-- + drivers/hwmon/adm1025.c | 76 ++-- + drivers/hwmon/adm1026.c | 504 +++++++++++++-------- + drivers/hwmon/adm1029.c | 47 +-- + drivers/hwmon/adm1031.c | 73 ++-- + drivers/hwmon/adm9240.c | 86 ++-- + drivers/hwmon/ads1015.c | 13 +- + drivers/hwmon/ads7828.c | 59 ++-- + drivers/hwmon/ads7871.c | 39 +- + drivers/hwmon/adt7411.c | 14 +- + drivers/hwmon/adt7462.c | 30 +- + drivers/hwmon/adt7470.c | 19 +- + drivers/hwmon/adt7475.c | 105 +++-- + drivers/hwmon/amc6821.c | 74 ++-- + drivers/hwmon/applesmc.c | 14 +- + drivers/hwmon/asb100.c | 200 +++++---- + drivers/hwmon/asc7621.c | 8 +- + drivers/hwmon/asus_atk0110.c | 18 +- + drivers/hwmon/atxp1.c | 173 ++++--- + drivers/hwmon/coretemp.c | 4 +- + drivers/hwmon/dme1737.c | 506 ++++++++++++--------- + drivers/hwmon/ds1621.c | 93 ++-- + drivers/hwmon/ds620.c | 13 +- + drivers/hwmon/emc1403.c | 25 +- + drivers/hwmon/emc2103.c | 63 ++-- + drivers/hwmon/emc6w201.c | 12 +- + drivers/hwmon/f71805f.c | 201 ++++++--- + drivers/hwmon/f71882fg.c | 63 ++- + drivers/hwmon/f75375s.c | 13 +- + drivers/hwmon/fschmd.c | 231 ++++++---- + drivers/hwmon/g760a.c | 48 +-- + drivers/hwmon/gl518sm.c | 115 +++-- + drivers/hwmon/gl520sm.c | 243 ++++++---- + drivers/hwmon/hwmon-vid.c | 159 +++---- + drivers/hwmon/hwmon.c | 25 +- + drivers/hwmon/i5k_amb.c | 18 +- + drivers/hwmon/ibmaem.c | 2 +- + drivers/hwmon/it87.c | 176 +++++--- + drivers/hwmon/jc42.c | 19 +- + drivers/hwmon/k10temp.c | 2 +- + drivers/hwmon/k8temp.c | 17 +- + drivers/hwmon/lineage-pem.c | 13 +- + drivers/hwmon/lm63.c | 13 +- + drivers/hwmon/lm70.c | 38 +- + drivers/hwmon/lm73.c | 15 +- + drivers/hwmon/lm75.c | 17 +- + drivers/hwmon/lm77.c | 172 ++++--- + drivers/hwmon/lm78.c | 206 ++++++--- + drivers/hwmon/lm80.c | 247 +++++++--- + drivers/hwmon/lm83.c | 30 +- + drivers/hwmon/lm85.c | 374 +++++++++------ + drivers/hwmon/lm87.c | 958 ++++++++++++++++++++------------------ + drivers/hwmon/lm90.c | 13 +- + drivers/hwmon/lm92.c | 111 +++-- + drivers/hwmon/lm93.c | 696 +++++++++++++++++----------- + drivers/hwmon/lm95241.c | 13 +- + drivers/hwmon/lm95245.c | 13 +- + drivers/hwmon/ltc4151.c | 16 +- + drivers/hwmon/ltc4215.c | 28 +- + drivers/hwmon/ltc4245.c | 22 +- + drivers/hwmon/ltc4261.c | 13 +- + drivers/hwmon/max1111.c | 15 +- + drivers/hwmon/max16065.c | 13 +- + drivers/hwmon/max1619.c | 34 +- + drivers/hwmon/max1668.c | 51 +-- + drivers/hwmon/max6639.c | 13 +- + drivers/hwmon/max6642.c | 13 +- + drivers/hwmon/max6650.c | 177 ++++---- + drivers/hwmon/pc87360.c | 602 ++++++++++++++---------- + drivers/hwmon/pc87427.c | 72 ++-- + drivers/hwmon/pcf8591.c | 143 ++++--- + drivers/hwmon/pmbus/adm1275.c | 12 +- + drivers/hwmon/pmbus/lm25066.c | 12 +- + drivers/hwmon/pmbus/ltc2978.c | 12 +- + drivers/hwmon/pmbus/max16064.c | 12 +- + drivers/hwmon/pmbus/max34440.c | 12 +- + drivers/hwmon/pmbus/max8688.c | 12 +- + drivers/hwmon/pmbus/pmbus.c | 12 +- + drivers/hwmon/pmbus/pmbus_core.c | 2 +- + drivers/hwmon/pmbus/ucd9000.c | 12 +- + drivers/hwmon/pmbus/ucd9200.c | 12 +- + drivers/hwmon/pmbus/zl6100.c | 12 +- + drivers/hwmon/sht15.c | 2 +- + drivers/hwmon/sht21.c | 23 +- + drivers/hwmon/sis5595.c | 307 ++++++++----- + drivers/hwmon/smm665.c | 22 +- + drivers/hwmon/smsc47b397.c | 64 ++-- + drivers/hwmon/smsc47m1.c | 291 ++++++++----- + drivers/hwmon/smsc47m192.c | 145 ++++--- + drivers/hwmon/thmc50.c | 84 ++-- + drivers/hwmon/tmp102.c | 12 +- + drivers/hwmon/tmp401.c | 13 +- + drivers/hwmon/tmp421.c | 13 +- + drivers/hwmon/ultra45_env.c | 34 +- + drivers/hwmon/via686a.c | 357 +++++++++------ + drivers/hwmon/vt1211.c | 389 ++++++++-------- + drivers/hwmon/vt8231.c | 285 +++++++----- + drivers/hwmon/w83627ehf.c | 189 +++++---- + drivers/hwmon/w83627hf.c | 272 +++++++---- + drivers/hwmon/w83781d.c | 475 +++++++++++-------- + drivers/hwmon/w83791d.c | 331 ++++++++------ + drivers/hwmon/w83792d.c | 397 +++++++++------- + drivers/hwmon/w83793.c | 453 ++++++++++-------- + drivers/hwmon/w83795.c | 13 +- + drivers/hwmon/w83l785ts.c | 30 +- + drivers/hwmon/w83l786ng.c | 190 +++++---- + drivers/hwmon/wm831x-hwmon.c | 8 +- + drivers/hwmon/wm8350-hwmon.c | 2 +- + 116 files changed, 7492 insertions(+), 5804 deletions(-) +Merging quilt/kernel-doc (7e7b32a Update quilt tree location for Documentation/ patches.) +$ git merge quilt/kernel-doc +Merge made by the 'recursive' strategy. +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 (1854438 Merge /home/v4l/v4l/patchwork) +$ git merge v4l-dvb/master +Merge made by the 'recursive' strategy. + Documentation/DocBook/media/v4l/compat.xml | 4 + + Documentation/DocBook/media/v4l/v4l2.xml | 9 +- + .../DocBook/media/v4l/vidioc-querycap.xml | 36 ++- + drivers/media/common/tuners/mt2063.c | 2 +- + drivers/media/dvb/ddbridge/ddbridge-core.c | 1 + + drivers/media/dvb/dvb-usb/Kconfig | 8 + + drivers/media/dvb/dvb-usb/Makefile | 4 +- + drivers/media/dvb/dvb-usb/az6007.c | 581 ++++++++++++++++++++ + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 2 + + drivers/media/dvb/dvb-usb/it913x.c | 19 +- + drivers/media/dvb/frontends/drxk.h | 23 +- + drivers/media/dvb/frontends/drxk_hard.c | 41 +- + drivers/media/dvb/frontends/drxk_hard.h | 1 + + drivers/media/dvb/ngene/ngene-cards.c | 1 + + .../media/rc/keymaps/rc-nec-terratec-cinergy-xs.c | 52 ++ + drivers/media/video/cx231xx/cx231xx-417.c | 1 - + drivers/media/video/ivtv/ivtv-driver.h | 1 + + drivers/media/video/ivtv/ivtv-ioctl.c | 7 +- + drivers/media/video/ivtv/ivtv-streams.c | 14 + + drivers/media/video/omap/omap_vout.c | 3 +- + drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 1 - + drivers/media/video/v4l2-ioctl.c | 6 +- + drivers/media/video/vivi.c | 5 +- + include/linux/videodev2.h | 29 +- + 24 files changed, 790 insertions(+), 61 deletions(-) + create mode 100644 drivers/media/dvb/dvb-usb/az6007.c +Merging kbuild/for-next (d90898e Merge branch 'kbuild/misc' into kbuild/for-next) +$ git merge kbuild/for-next +Merge made by the 'recursive' strategy. + scripts/Makefile.build | 2 ++ + scripts/coccicheck | 13 ++++--------- + scripts/kconfig/confdata.c | 26 ++++++-------------------- + scripts/kconfig/symbol.c | 9 ++++++++- + 4 files changed, 20 insertions(+), 30 deletions(-) +Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next) +$ git merge kconfig/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging libata/NEXT (96c4d29 pata_legacy: correctly mask recovery field for HT6560B) +$ git merge libata/NEXT +Merge made by the 'recursive' strategy. + drivers/acpi/dock.c | 98 +++++++++++++++ + drivers/acpi/glue.c | 2 + + drivers/ata/ahci.c | 8 ++ + drivers/ata/ata_piix.c | 8 ++ + drivers/ata/libata-acpi.c | 273 +++++++++++++++++++++++++----------------- + drivers/ata/libata-core.c | 6 +- + drivers/ata/libata-pmp.c | 4 - + drivers/ata/libata-scsi.c | 3 + + drivers/ata/libata.h | 13 ++- + drivers/ata/pata_acpi.c | 4 +- + drivers/ata/pata_legacy.c | 3 +- + drivers/scsi/scsi_lib.c | 11 ++ + include/acpi/acpi_drivers.h | 11 ++ + include/linux/libata.h | 7 +- + include/scsi/scsi.h | 10 ++ + 15 files changed, 329 insertions(+), 132 deletions(-) +Merging infiniband/for-next (715252d IB/srpt: Don't return freed pointer from srpt_alloc_ioctx_ring()) +$ git merge infiniband/for-next +Already up-to-date. +Merging acpi/next (eb7004e Merge branches 'atomicio-apei', 'hotplug', 'sony-nvs-nosave' and 'thermal-netlink' into release) +$ git merge acpi/next +Already up-to-date. +Merging ieee1394/for-next (6e01490 Merge branch 'fixes' into for-next) +$ git merge ieee1394/for-next +Merge made by the 'recursive' strategy. + drivers/firewire/core-device.c | 2 + + drivers/firewire/core.h | 13 +++ + drivers/firewire/ohci.c | 185 +++++++++++++++++++++++----------------- + drivers/firewire/sbp2.c | 93 +++++++++++--------- + include/linux/firewire.h | 12 --- + sound/firewire/isight.c | 4 +- + sound/firewire/speakers.c | 4 - + 7 files changed, 173 insertions(+), 140 deletions(-) +Merging ubi/linux-next (ecaabdb UBI: fix error handling in ubi_scan()) +$ git merge ubi/linux-next +Merge made by the 'recursive' strategy. + drivers/mtd/ubi/scan.c | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) +Merging dlm/next (60f98d1 dlm: add recovery callbacks) +$ git merge dlm/next +Already up-to-date. +Merging scsi/master (76ffe8a [SCSI] libfc: remove redundant timer init for fcp) +$ git merge scsi/master +Already up-to-date. +Merging target-updates/for-next (24d2f08 tcm_fc: Remove cmd->cdb data member) +$ git merge target-updates/for-next +Auto-merging include/scsi/scsi.h +Merge made by the 'recursive' strategy. + drivers/infiniband/ulp/srpt/ib_srpt.c | 13 ++- + drivers/scsi/bnx2fc/bnx2fc_io.c | 4 +- + drivers/scsi/libfc/fc_fcp.c | 5 +- + drivers/target/iscsi/iscsi_target.c | 10 +- + drivers/target/iscsi/iscsi_target_device.c | 19 ---- + drivers/target/iscsi/iscsi_target_device.h | 2 - + drivers/target/iscsi/iscsi_target_erl1.c | 2 +- + drivers/target/iscsi/iscsi_target_tmr.c | 6 +- + drivers/target/iscsi/iscsi_target_tq.c | 6 - + drivers/target/target_core_configfs.c | 6 +- + drivers/target/target_core_device.c | 5 - + drivers/target/target_core_iblock.c | 78 +++++++-------- + drivers/target/target_core_iblock.h | 7 +- + drivers/target/target_core_pr.c | 6 +- + drivers/target/target_core_tmr.c | 24 ++-- + drivers/target/target_core_transport.c | 150 +++++++++++++--------------- + drivers/target/tcm_fc/tcm_fc.h | 2 - + drivers/target/tcm_fc/tfc_cmd.c | 91 +++++++---------- + include/scsi/fc/fc_fcp.h | 6 +- + include/scsi/scsi.h | 1 + + include/target/target_core_base.h | 34 +++---- + 21 files changed, 202 insertions(+), 275 deletions(-) +Merging target-merge/for-next-merge (d65b4e9 Linux 3.3-rc3) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI) +$ git merge ibft/linux-next +Already up-to-date. +Merging isci/all (57872c2 Merge branches 'devel' and 'fixes' into all) +$ git merge isci/all +Auto-merging include/linux/libata.h +Auto-merging drivers/ata/libata.h +Auto-merging drivers/ata/libata-scsi.c +Auto-merging drivers/ata/libata-core.c +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 6 + + Documentation/scsi/libsas.txt | 15 - + drivers/ata/libata-core.c | 34 +- + drivers/ata/libata-eh.c | 1 + + drivers/ata/libata-scsi.c | 13 + + drivers/ata/libata.h | 2 +- + drivers/scsi/aic94xx/aic94xx.h | 2 + + drivers/scsi/aic94xx/aic94xx_dev.c | 38 +- + drivers/scsi/aic94xx/aic94xx_init.c | 6 +- + drivers/scsi/aic94xx/aic94xx_tmf.c | 11 +- + drivers/scsi/isci/host.c | 22 +- + drivers/scsi/isci/host.h | 19 +- + drivers/scsi/isci/init.c | 27 +- + drivers/scsi/isci/phy.c | 171 ++++--- + drivers/scsi/isci/phy.h | 155 +++---- + drivers/scsi/isci/port.c | 263 ++++++----- + drivers/scsi/isci/port.h | 114 ++--- + drivers/scsi/isci/registers.h | 27 +- + drivers/scsi/isci/remote_device.c | 82 ++-- + drivers/scsi/isci/remote_device.h | 212 ++++----- + drivers/scsi/isci/remote_node_context.c | 19 +- + drivers/scsi/isci/remote_node_context.h | 97 ++-- + drivers/scsi/isci/request.c | 370 +++++++-------- + drivers/scsi/isci/request.h | 228 ++++----- + drivers/scsi/isci/scu_task_context.h | 55 ++- + drivers/scsi/isci/task.c | 158 ++----- + drivers/scsi/isci/task.h | 40 -- + drivers/scsi/libsas/sas_ata.c | 828 +++++++++++++++---------------- + drivers/scsi/libsas/sas_discover.c | 216 +++++++-- + drivers/scsi/libsas/sas_event.c | 96 ++++- + drivers/scsi/libsas/sas_expander.c | 360 +++++++++----- + drivers/scsi/libsas/sas_host_smp.c | 11 +- + drivers/scsi/libsas/sas_init.c | 243 ++++++++- + drivers/scsi/libsas/sas_internal.h | 97 +++-- + drivers/scsi/libsas/sas_phy.c | 12 +- + drivers/scsi/libsas/sas_port.c | 32 +- + drivers/scsi/libsas/sas_scsi_host.c | 421 ++++++++--------- + drivers/scsi/mvsas/mv_init.c | 2 - + drivers/scsi/mvsas/mv_sas.c | 31 +- + drivers/scsi/pm8001/pm8001_init.c | 2 - + drivers/scsi/pm8001/pm8001_sas.c | 59 ++- + drivers/scsi/scsi_transport_sas.c | 60 ++- + include/linux/libata.h | 2 + + include/scsi/libsas.h | 86 ++-- + include/scsi/sas.h | 4 +- + include/scsi/sas_ata.h | 44 +- + include/scsi/scsi_transport_sas.h | 12 +- + 47 files changed, 2593 insertions(+), 2212 deletions(-) +Merging slave-dma/next (b63fd6c i.MX SDMA: Fix burstsize settings) +$ git merge slave-dma/next +Auto-merging drivers/dma/imx-sdma.c +Merge made by the 'recursive' strategy. + drivers/dma/amba-pl08x.c | 2 +- + drivers/dma/imx-dma.c | 9 +-- + drivers/dma/imx-sdma.c | 140 +++++++++++++++++++------------------- + drivers/dma/pl330.c | 17 +++-- + drivers/mmc/host/mxcmmc.c | 1 + + sound/soc/imx/imx-pcm-dma-mx2.c | 1 + + 6 files changed, 88 insertions(+), 82 deletions(-) +Merging dmaengine/next (d07a74a dmaengine: fix missing 'cnt' in ?: in dmatest) +$ git merge dmaengine/next +Already up-to-date. +Merging net-next/master (eb40d89 mlx4: add unicast steering entries to resource_tracker) +$ git merge net-next/master +Auto-merging net/mac80211/main.c +Auto-merging net/core/netpoll.c +Auto-merging drivers/net/wireless/rtlwifi/pci.c +Auto-merging drivers/net/ethernet/ti/cpmac.c +Auto-merging drivers/net/ethernet/smsc/smc91x.c +Removing drivers/net/ethernet/sfc/mac.h +Auto-merging drivers/net/ethernet/micrel/ks8851.c +Auto-merging drivers/net/ethernet/lantiq_etop.c +Auto-merging drivers/net/ethernet/intel/e1000e/mac.c +Auto-merging drivers/net/ethernet/freescale/fec.c +Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c +Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +Auto-merging drivers/net/ethernet/3com/3c59x.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/magic-number.txt | 2 +- + Documentation/networking/LICENSE.qlge | 328 +- + Documentation/networking/phy.txt | 3 +- + Documentation/zh_CN/magic-number.txt | 2 +- + MAINTAINERS | 12 +- + arch/s390/include/asm/qeth.h | 7 + + drivers/atm/lanai.c | 2 +- + drivers/bcma/sprom.c | 180 +- + drivers/infiniband/core/addr.c | 14 +- + drivers/infiniband/hw/cxgb4/cm.c | 10 +- + drivers/infiniband/hw/nes/nes_cm.c | 8 +- + drivers/isdn/hardware/eicon/capi20.h | 60 +- + drivers/isdn/hardware/mISDN/hfcsusb.c | 3 +- + drivers/isdn/hisax/callc.c | 2 +- + drivers/isdn/hisax/tei.c | 2 +- + drivers/isdn/i4l/isdn_ppp.c | 4 +- + drivers/isdn/mISDN/dsp_core.c | 2 +- + drivers/isdn/mISDN/l1oip_core.c | 16 +- + drivers/net/bonding/bond_3ad.c | 2 +- + drivers/net/bonding/bond_alb.c | 12 +- + drivers/net/caif/caif_hsi.c | 145 +- + drivers/net/can/Kconfig | 6 +- + drivers/net/can/bfin_can.c | 36 +- + drivers/net/can/dev.c | 33 +- + drivers/net/can/flexcan.c | 61 +- + drivers/net/can/mcp251x.c | 3 +- + drivers/net/can/mscan/mscan.c | 33 +- + drivers/net/can/pch_can.c | 2 +- + drivers/net/can/sja1000/Kconfig | 1 + + drivers/net/can/sja1000/plx_pci.c | 22 +- + drivers/net/can/sja1000/sja1000.c | 19 +- + drivers/net/can/slcan.c | 6 +- + drivers/net/can/ti_hecc.c | 32 +- + drivers/net/can/usb/ems_usb.c | 63 +- + drivers/net/can/usb/esd_usb2.c | 27 +- + drivers/net/ethernet/3com/3c501.c | 2 +- + drivers/net/ethernet/3com/3c509.c | 2 +- + drivers/net/ethernet/3com/3c515.c | 10 +- + drivers/net/ethernet/3com/3c574_cs.c | 2 +- + drivers/net/ethernet/3com/3c589_cs.c | 2 +- + drivers/net/ethernet/3com/3c59x.c | 10 +- + drivers/net/ethernet/3com/Kconfig | 2 +- + drivers/net/ethernet/3com/typhoon.c | 5 +- + drivers/net/ethernet/8390/ax88796.c | 2 +- + drivers/net/ethernet/8390/axnet_cs.c | 4 +- + drivers/net/ethernet/8390/lib8390.c | 2 +- + drivers/net/ethernet/8390/pcnet_cs.c | 2 +- + drivers/net/ethernet/adaptec/starfire.c | 13 +- + drivers/net/ethernet/adi/bfin_mac.c | 12 +- + drivers/net/ethernet/aeroflex/greth.c | 3 +- + drivers/net/ethernet/alteon/acenic.c | 5 +- + drivers/net/ethernet/amd/7990.c | 2 +- + drivers/net/ethernet/amd/Kconfig | 2 +- + drivers/net/ethernet/amd/a2065.c | 2 +- + drivers/net/ethernet/amd/am79c961a.c | 4 +- + drivers/net/ethernet/amd/am79c961a.h | 2 +- + drivers/net/ethernet/amd/amd8111e.c | 7 +- + drivers/net/ethernet/amd/ariadne.c | 2 +- + drivers/net/ethernet/amd/atarilance.c | 2 +- + drivers/net/ethernet/amd/au1000_eth.c | 3 +- + drivers/net/ethernet/amd/declance.c | 4 +- + drivers/net/ethernet/amd/depca.c | 2 +- + drivers/net/ethernet/amd/ni65.c | 6 +- + drivers/net/ethernet/amd/nmclan_cs.c | 2 +- + drivers/net/ethernet/amd/pcnet32.c | 16 +- + drivers/net/ethernet/amd/sun3lance.c | 2 +- + drivers/net/ethernet/amd/sunlance.c | 4 +- + drivers/net/ethernet/apple/bmac.c | 19 +- + drivers/net/ethernet/apple/mace.c | 9 +- + drivers/net/ethernet/apple/macmace.c | 2 +- + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 3 +- + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 1 - + drivers/net/ethernet/broadcom/b44.c | 1 - + drivers/net/ethernet/broadcom/bnx2.c | 106 +- + drivers/net/ethernet/broadcom/bnx2.h | 3 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 9 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 51 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 20 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_dump.h | 2 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 36 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h | 2 +- + .../ethernet/broadcom/bnx2x/bnx2x_fw_file_hdr.h | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h | 2 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h | 55 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 323 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h | 12 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 3 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 6 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h | 6 +- + drivers/net/ethernet/broadcom/cnic.c | 42 +- + drivers/net/ethernet/broadcom/cnic_defs.h | 3 +- + drivers/net/ethernet/broadcom/cnic_if.h | 4 +- + drivers/net/ethernet/broadcom/sb1250-mac.c | 2 - + drivers/net/ethernet/broadcom/tg3.c | 9055 ++++++++++---------- + drivers/net/ethernet/broadcom/tg3.h | 13 +- + drivers/net/ethernet/brocade/bna/bfa_cee.c | 8 +- + drivers/net/ethernet/brocade/bna/bfa_defs.h | 1 + + drivers/net/ethernet/brocade/bna/bfa_ioc.c | 2 +- + drivers/net/ethernet/brocade/bna/bnad.c | 1 - + drivers/net/ethernet/brocade/bna/bnad_debugfs.c | 21 +- + drivers/net/ethernet/brocade/bna/bnad_ethtool.c | 42 + + drivers/net/ethernet/cadence/at91_ether.c | 2 +- + drivers/net/ethernet/cadence/macb.c | 6 +- + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 2 - + drivers/net/ethernet/cirrus/cs89x0.c | 4 +- + drivers/net/ethernet/cirrus/ep93xx_eth.c | 2 +- + drivers/net/ethernet/cisco/enic/enic.h | 4 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 10 +- + drivers/net/ethernet/cisco/enic/enic_pp.c | 4 +- + drivers/net/ethernet/cisco/enic/vnic_dev.c | 58 +- + drivers/net/ethernet/cisco/enic/vnic_rq.c | 4 +- + drivers/net/ethernet/cisco/enic/vnic_wq.c | 4 +- + drivers/net/ethernet/davicom/dm9000.c | 6 +- + drivers/net/ethernet/dec/ewrk3.c | 4 +- + drivers/net/ethernet/dec/tulip/21142.c | 2 +- + drivers/net/ethernet/dec/tulip/de2104x.c | 6 +- + drivers/net/ethernet/dec/tulip/de4x5.c | 4 +- + drivers/net/ethernet/dec/tulip/dmfe.c | 20 +- + drivers/net/ethernet/dec/tulip/eeprom.c | 2 +- + drivers/net/ethernet/dec/tulip/interrupt.c | 10 +- + drivers/net/ethernet/dec/tulip/media.c | 2 +- + drivers/net/ethernet/dec/tulip/pnic.c | 2 +- + drivers/net/ethernet/dec/tulip/pnic2.c | 2 +- + drivers/net/ethernet/dec/tulip/timer.c | 2 +- + drivers/net/ethernet/dec/tulip/tulip.h | 2 +- + drivers/net/ethernet/dec/tulip/tulip_core.c | 9 +- + drivers/net/ethernet/dec/tulip/uli526x.c | 21 +- + drivers/net/ethernet/dec/tulip/winbond-840.c | 6 +- + drivers/net/ethernet/dec/tulip/xircom_cb.c | 7 +- + drivers/net/ethernet/dlink/de600.c | 2 +- + drivers/net/ethernet/dlink/de620.c | 2 +- + drivers/net/ethernet/dlink/sundance.c | 9 +- + drivers/net/ethernet/dnet.c | 6 +- + drivers/net/ethernet/emulex/benet/be.h | 71 +- + drivers/net/ethernet/emulex/benet/be_cmds.c | 104 +- + drivers/net/ethernet/emulex/benet/be_cmds.h | 54 +- + drivers/net/ethernet/emulex/benet/be_ethtool.c | 160 +- + drivers/net/ethernet/emulex/benet/be_main.c | 858 +- + drivers/net/ethernet/ethoc.c | 3 +- + drivers/net/ethernet/fealnx.c | 8 +- + drivers/net/ethernet/freescale/fec.c | 21 +- + drivers/net/ethernet/freescale/fec_mpc52xx.c | 4 +- + drivers/net/ethernet/freescale/fec_mpc52xx.h | 2 +- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 12 +- + drivers/net/ethernet/freescale/gianfar.c | 2 +- + drivers/net/ethernet/freescale/gianfar.h | 2 +- + drivers/net/ethernet/freescale/gianfar_ethtool.c | 2 +- + drivers/net/ethernet/freescale/gianfar_sysfs.c | 2 +- + drivers/net/ethernet/freescale/ucc_geth.c | 7 +- + drivers/net/ethernet/fujitsu/at1700.c | 2 +- + drivers/net/ethernet/fujitsu/eth16i.c | 2 +- + drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 2 +- + drivers/net/ethernet/hp/hp100.c | 6 +- + drivers/net/ethernet/i825xx/3c505.c | 2 +- + drivers/net/ethernet/i825xx/3c507.c | 2 +- + drivers/net/ethernet/i825xx/3c523.c | 2 +- + drivers/net/ethernet/i825xx/3c527.c | 4 +- + drivers/net/ethernet/i825xx/82596.c | 8 +- + drivers/net/ethernet/i825xx/eepro.c | 2 +- + drivers/net/ethernet/i825xx/eexpress.c | 2 +- + drivers/net/ethernet/i825xx/ether1.c | 2 +- + drivers/net/ethernet/i825xx/lp486e.c | 4 +- + drivers/net/ethernet/i825xx/ni52.c | 2 +- + drivers/net/ethernet/i825xx/sun3_82586.c | 27 +- + drivers/net/ethernet/i825xx/znet.c | 2 +- + drivers/net/ethernet/ibm/ehea/ehea.h | 2 +- + drivers/net/ethernet/ibm/ehea/ehea_ethtool.c | 2 +- + drivers/net/ethernet/ibm/ehea/ehea_hw.h | 2 +- + drivers/net/ethernet/ibm/ehea/ehea_main.c | 3 +- + drivers/net/ethernet/ibm/ehea/ehea_phyp.c | 2 +- + drivers/net/ethernet/ibm/ehea/ehea_phyp.h | 2 +- + drivers/net/ethernet/ibm/ehea/ehea_qmr.c | 2 +- + drivers/net/ethernet/ibm/ehea/ehea_qmr.h | 2 +- + drivers/net/ethernet/ibm/emac/core.c | 8 +- + drivers/net/ethernet/ibm/emac/core.h | 2 +- + drivers/net/ethernet/ibm/emac/debug.c | 2 +- + drivers/net/ethernet/ibm/emac/debug.h | 2 +- + drivers/net/ethernet/ibm/emac/emac.h | 2 +- + drivers/net/ethernet/ibm/emac/mal.c | 2 +- + drivers/net/ethernet/ibm/emac/mal.h | 2 +- + drivers/net/ethernet/ibm/emac/phy.c | 2 +- + drivers/net/ethernet/ibm/emac/phy.h | 2 +- + drivers/net/ethernet/ibm/emac/rgmii.c | 7 +- + drivers/net/ethernet/ibm/emac/rgmii.h | 2 +- + drivers/net/ethernet/ibm/emac/tah.c | 7 +- + drivers/net/ethernet/ibm/emac/tah.h | 2 +- + drivers/net/ethernet/ibm/emac/zmii.c | 7 +- + drivers/net/ethernet/ibm/emac/zmii.h | 2 +- + drivers/net/ethernet/ibm/iseries_veth.c | 4 +- + drivers/net/ethernet/icplus/ipg.c | 4 - + drivers/net/ethernet/intel/e100.c | 5 +- + drivers/net/ethernet/intel/e1000/e1000.h | 1 + + drivers/net/ethernet/intel/e1000/e1000_hw.h | 10 + + drivers/net/ethernet/intel/e1000/e1000_main.c | 228 +- + drivers/net/ethernet/intel/e1000e/80003es2lan.c | 79 +- + drivers/net/ethernet/intel/e1000e/82571.c | 123 +- + drivers/net/ethernet/intel/e1000e/Makefile | 5 +- + drivers/net/ethernet/intel/e1000e/defines.h | 10 +- + drivers/net/ethernet/intel/e1000e/e1000.h | 33 +- + drivers/net/ethernet/intel/e1000e/ethtool.c | 201 +- + drivers/net/ethernet/intel/e1000e/hw.h | 11 +- + drivers/net/ethernet/intel/e1000e/ich8lan.c | 397 +- + drivers/net/ethernet/intel/e1000e/{lib.c => mac.c} | 1099 +--- + drivers/net/ethernet/intel/e1000e/manage.c | 367 + + drivers/net/ethernet/intel/e1000e/netdev.c | 628 +- + drivers/net/ethernet/intel/e1000e/nvm.c | 643 ++ + drivers/net/ethernet/intel/e1000e/param.c | 50 +- + drivers/net/ethernet/intel/e1000e/phy.c | 258 +- + drivers/net/ethernet/intel/igb/igb_main.c | 4 + + drivers/net/ethernet/intel/igbvf/ethtool.c | 19 +- + drivers/net/ethernet/intel/igbvf/igbvf.h | 27 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 142 +- + drivers/net/ethernet/intel/ixgb/ixgb_ee.c | 12 +- + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 29 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 59 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 694 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 14 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 1 + + drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 2 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 34 +- + drivers/net/ethernet/jme.c | 1 - + drivers/net/ethernet/korina.c | 6 +- + drivers/net/ethernet/lantiq_etop.c | 6 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 12 +- + drivers/net/ethernet/marvell/skge.c | 4 +- + drivers/net/ethernet/marvell/sky2.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/cmd.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 8 +- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 6 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/mcg.c | 38 +- + drivers/net/ethernet/mellanox/mlx4/mlx4.h | 1 - + drivers/net/ethernet/mellanox/mlx4/port.c | 2 - + .../net/ethernet/mellanox/mlx4/resource_tracker.c | 21 +- + drivers/net/ethernet/micrel/ks8695net.c | 8 +- + drivers/net/ethernet/micrel/ks8851.c | 8 +- + drivers/net/ethernet/micrel/ks8851.h | 2 +- + drivers/net/ethernet/micrel/ks8851_mll.c | 10 +- + drivers/net/ethernet/micrel/ksz884x.c | 8 +- + drivers/net/ethernet/microchip/enc28j60.c | 6 +- + drivers/net/ethernet/mipsnet.c | 2 +- + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 4 +- + drivers/net/ethernet/natsemi/ibmlana.c | 2 +- + drivers/net/ethernet/natsemi/natsemi.c | 5 +- + drivers/net/ethernet/natsemi/sonic.c | 4 +- + drivers/net/ethernet/neterion/s2io.c | 7 +- + drivers/net/ethernet/netx-eth.c | 5 +- + drivers/net/ethernet/nuvoton/w90p910_ether.c | 2 +- + drivers/net/ethernet/nvidia/forcedeth.c | 8 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 13 +- + drivers/net/ethernet/packetengines/hamachi.c | 8 +- + drivers/net/ethernet/packetengines/yellowfin.c | 13 +- + drivers/net/ethernet/pasemi/pasemi_mac.c | 4 +- + drivers/net/ethernet/qlogic/netxen/netxen_nic.h | 437 +- + .../net/ethernet/qlogic/netxen/netxen_nic_ctx.c | 296 +- + .../ethernet/qlogic/netxen/netxen_nic_ethtool.c | 109 + + .../net/ethernet/qlogic/netxen/netxen_nic_hdr.h | 1 + + drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c | 629 ++- + .../net/ethernet/qlogic/netxen/netxen_nic_init.c | 17 +- + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 132 +- + drivers/net/ethernet/qlogic/qla3xxx.c | 1 - + drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 2 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 14 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | 10 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 17 +- + drivers/net/ethernet/qlogic/qlge/qlge.h | 2 +- + drivers/net/ethernet/qlogic/qlge/qlge_dbg.c | 4 +- + drivers/net/ethernet/qlogic/qlge/qlge_main.c | 86 +- + drivers/net/ethernet/racal/ni5010.c | 2 +- + drivers/net/ethernet/rdc/r6040.c | 1 - + drivers/net/ethernet/realtek/8139too.c | 5 +- + drivers/net/ethernet/realtek/Kconfig | 10 +- + drivers/net/ethernet/realtek/atp.c | 2 +- + drivers/net/ethernet/realtek/r8169.c | 569 +- + drivers/net/ethernet/renesas/sh_eth.c | 69 +- + drivers/net/ethernet/renesas/sh_eth.h | 1 - + drivers/net/ethernet/s6gmac.c | 15 +- + drivers/net/ethernet/seeq/ether3.c | 2 +- + drivers/net/ethernet/seeq/seeq8005.c | 2 +- + drivers/net/ethernet/seeq/sgiseeq.c | 1 - + drivers/net/ethernet/sfc/Kconfig | 13 +- + drivers/net/ethernet/sfc/Makefile | 2 +- + drivers/net/ethernet/sfc/bitfield.h | 18 +- + drivers/net/ethernet/sfc/efx.c | 198 +- + drivers/net/ethernet/sfc/efx.h | 10 +- + drivers/net/ethernet/sfc/ethtool.c | 138 +- + drivers/net/ethernet/sfc/falcon.c | 42 +- + drivers/net/ethernet/sfc/falcon_boards.c | 12 +- + drivers/net/ethernet/sfc/falcon_xmac.c | 15 +- + drivers/net/ethernet/sfc/mac.h | 21 - + drivers/net/ethernet/sfc/mcdi.c | 115 +- + drivers/net/ethernet/sfc/mcdi.h | 34 +- + drivers/net/ethernet/sfc/mcdi_mac.c | 61 +- + drivers/net/ethernet/sfc/mcdi_mon.c | 415 + + drivers/net/ethernet/sfc/mcdi_pcol.h | 3542 +++++---- + drivers/net/ethernet/sfc/mcdi_phy.c | 36 +- + drivers/net/ethernet/sfc/mdio_10g.c | 2 +- + drivers/net/ethernet/sfc/mtd.c | 13 +- + drivers/net/ethernet/sfc/net_driver.h | 189 +- + drivers/net/ethernet/sfc/nic.c | 69 +- + drivers/net/ethernet/sfc/nic.h | 20 +- + drivers/net/ethernet/sfc/qt202x_phy.c | 6 +- + drivers/net/ethernet/sfc/rx.c | 119 +- + drivers/net/ethernet/sfc/selftest.c | 110 +- + drivers/net/ethernet/sfc/selftest.h | 1 - + drivers/net/ethernet/sfc/siena.c | 33 +- + drivers/net/ethernet/sfc/spi.h | 2 +- + drivers/net/ethernet/sfc/tenxpress.c | 2 +- + drivers/net/ethernet/sfc/tx.c | 4 +- + drivers/net/ethernet/sfc/txc43128_phy.c | 2 +- + drivers/net/ethernet/sis/sis190.c | 2 - + drivers/net/ethernet/sis/sis900.c | 7 +- + drivers/net/ethernet/smsc/epic100.c | 11 +- + drivers/net/ethernet/smsc/smc911x.c | 3 +- + drivers/net/ethernet/smsc/smc9194.c | 2 +- + drivers/net/ethernet/smsc/smc91c92_cs.c | 2 +- + drivers/net/ethernet/smsc/smc91x.c | 3 +- + drivers/net/ethernet/smsc/smsc911x.c | 1 - + drivers/net/ethernet/smsc/smsc9420.c | 6 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 9 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 4 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 2 +- + drivers/net/ethernet/sun/cassini.c | 4 +- + drivers/net/ethernet/sun/niu.c | 4 +- + drivers/net/ethernet/sun/sunbmac.c | 2 +- + drivers/net/ethernet/sun/sungem.c | 1 - + drivers/net/ethernet/sun/sunhme.c | 2 +- + drivers/net/ethernet/sun/sunqe.c | 2 +- + drivers/net/ethernet/sun/sunvnet.c | 13 +- + drivers/net/ethernet/tehuti/tehuti.c | 8 +- + drivers/net/ethernet/ti/cpmac.c | 5 +- + drivers/net/ethernet/ti/davinci_emac.c | 4 +- + drivers/net/ethernet/ti/tlan.c | 1 - + drivers/net/ethernet/tile/tilepro.c | 4 +- + drivers/net/ethernet/toshiba/ps3_gelic_wireless.c | 5 +- + drivers/net/ethernet/toshiba/tc35815.c | 7 +- + drivers/net/ethernet/tundra/tsi108_eth.c | 4 +- + drivers/net/ethernet/via/via-rhine.c | 3 - + drivers/net/ethernet/via/via-velocity.c | 6 +- + drivers/net/ethernet/xilinx/Kconfig | 8 + + drivers/net/ethernet/xilinx/Makefile | 2 + + drivers/net/ethernet/xilinx/ll_temac_main.c | 5 +- + drivers/net/ethernet/xilinx/xilinx_axienet.h | 508 ++ + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 1680 ++++ + drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | 238 + + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 6 +- + drivers/net/ethernet/xircom/xirc2ps_cs.c | 3 +- + drivers/net/hamradio/baycom_epp.c | 2 +- + drivers/net/hamradio/baycom_par.c | 2 +- + drivers/net/hamradio/yam.c | 1 - + drivers/net/hippi/rrunner.c | 8 +- + drivers/net/hyperv/netvsc_drv.c | 7 +- + drivers/net/hyperv/rndis_filter.c | 60 +- + drivers/net/irda/donauboe.c | 2 - + drivers/net/netconsole.c | 8 +- + drivers/net/phy/broadcom.c | 6 +- + drivers/net/plip/plip.c | 4 +- + drivers/net/ppp/ppp_generic.c | 2 +- + drivers/net/ppp/pptp.c | 4 +- + drivers/net/rionet.c | 2 - + drivers/net/slip/slip.c | 4 +- + drivers/net/tokenring/3c359.c | 4 - + drivers/net/tokenring/madgemc.c | 1 - + drivers/net/tokenring/tms380tr.c | 179 +- + drivers/net/usb/Kconfig | 22 + + drivers/net/usb/Makefile | 1 + + drivers/net/usb/pegasus.c | 4 +- + drivers/net/usb/qmi_wwan.c | 228 + + drivers/net/usb/rtl8150.c | 4 +- + drivers/net/usb/usbnet.c | 4 +- + drivers/net/virtio_net.c | 7 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 44 +- + drivers/net/wan/c101.c | 4 +- + drivers/net/wan/dscc4.c | 8 +- + drivers/net/wan/lmc/lmc_main.c | 1 - + drivers/net/wan/n2.c | 4 +- + drivers/net/wan/pc300too.c | 1 - + drivers/net/wan/pci200syn.c | 1 - + drivers/net/wan/wanxl.c | 1 - + drivers/net/wan/x25_asy.c | 4 +- + drivers/net/wireless/ath/ath5k/ani.c | 8 +- + drivers/net/wireless/ath/ath5k/base.c | 5 +- + drivers/net/wireless/ath/ath5k/mac80211-ops.c | 8 + + drivers/net/wireless/ath/ath9k/ani.c | 6 +- + drivers/net/wireless/ath/ath9k/hif_usb.c | 154 +- + drivers/net/wireless/ath/ath9k/hif_usb.h | 3 +- + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 2 + + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 15 + + drivers/net/wireless/ath/ath9k/htc_hst.c | 5 +- + drivers/net/wireless/ath/ath9k/hw-ops.h | 2 +- + drivers/net/wireless/ath/ath9k/hw.c | 5 +- + drivers/net/wireless/ath/ath9k/main.c | 4 +- + drivers/net/wireless/ath/carl9170/carl9170.h | 2 +- + drivers/net/wireless/ath/carl9170/fw.c | 33 - + drivers/net/wireless/ath/carl9170/mac.c | 35 + + drivers/net/wireless/ath/carl9170/main.c | 18 +- + drivers/net/wireless/ath/carl9170/phy.c | 36 +- + drivers/net/wireless/ath/carl9170/tx.c | 2 + + drivers/net/wireless/atmel.c | 5 +- + drivers/net/wireless/b43/b43.h | 12 + + drivers/net/wireless/b43/main.c | 67 +- + drivers/net/wireless/b43/phy_n.c | 532 +- + drivers/net/wireless/b43/phy_n.h | 1 + + drivers/net/wireless/b43/tables_nphy.c | 76 +- + drivers/net/wireless/b43/tables_nphy.h | 14 +- + drivers/net/wireless/brcm80211/Makefile | 2 +- + drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 2 + + .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 3 + + drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 4 +- + drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c | 2 + + .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 17 +- + drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h | 20 +- + .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 10 +- + drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 232 +- + .../net/wireless/brcm80211/brcmfmac/sdio_chip.c | 2 + + .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 6 +- + .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 36 +- + drivers/net/wireless/brcm80211/brcmsmac/aiutils.c | 4 +- + drivers/net/wireless/brcm80211/brcmsmac/ampdu.c | 2 +- + drivers/net/wireless/brcm80211/brcmsmac/dma.c | 8 +- + .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 24 +- + .../net/wireless/brcm80211/brcmsmac/mac80211_if.h | 2 +- + drivers/net/wireless/brcm80211/brcmsmac/main.c | 198 +- + drivers/net/wireless/brcm80211/brcmsmac/main.h | 6 +- + .../net/wireless/brcm80211/brcmsmac/phy/phy_n.c | 7 +- + drivers/net/wireless/brcm80211/brcmutil/utils.c | 26 +- + .../net/wireless/brcm80211/include/brcmu_utils.h | 15 +- + drivers/net/wireless/hostap/hostap_hw.c | 18 +- + drivers/net/wireless/ipw2x00/ipw2100.c | 5 +- + drivers/net/wireless/ipw2x00/libipw_module.c | 5 +- + drivers/net/wireless/iwlwifi/iwl-1000.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-2000.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-agn-calib.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-agn-hw.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn-rx.c | 30 +- + drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn-sta.c | 13 +- + drivers/net/wireless/iwlwifi/iwl-agn-tt.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn-tt.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 103 +- + drivers/net/wireless/iwlwifi/iwl-agn.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-bus.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-cfg.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-commands.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-core.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-csr.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-debug.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 9 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-devtrace.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-devtrace.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-fh.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-io.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-io.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-led.c | 6 +- + drivers/net/wireless/iwlwifi/iwl-led.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-mac80211.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-pci.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-power.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-power.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-prph.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-scan.c | 23 +- + drivers/net/wireless/iwlwifi/iwl-shared.h | 8 +- + drivers/net/wireless/iwlwifi/iwl-testmode.c | 64 +- + drivers/net/wireless/iwlwifi/iwl-testmode.h | 32 +- + drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c | 6 +- + drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-trans.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-trans.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-ucode.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-wifi.h | 4 +- + drivers/net/wireless/libertas/if_cs.c | 5 +- + drivers/net/wireless/libertas/if_usb.c | 4 +- + drivers/net/wireless/libertas_tf/if_usb.c | 4 +- + drivers/net/wireless/mwifiex/11n_aggr.c | 3 +- + drivers/net/wireless/mwifiex/cfg80211.c | 37 +- + drivers/net/wireless/mwifiex/cmdevt.c | 3 +- + drivers/net/wireless/mwifiex/decl.h | 6 +- + drivers/net/wireless/mwifiex/init.c | 5 +- + drivers/net/wireless/mwifiex/main.c | 25 +- + drivers/net/wireless/mwifiex/main.h | 4 +- + drivers/net/wireless/mwifiex/pcie.c | 4 +- + drivers/net/wireless/mwifiex/scan.c | 8 +- + drivers/net/wireless/mwifiex/sdio.c | 4 +- + drivers/net/wireless/mwifiex/sta_rx.c | 6 +- + drivers/net/wireless/mwifiex/sta_tx.c | 3 +- + drivers/net/wireless/mwifiex/txrx.c | 6 +- + drivers/net/wireless/mwifiex/util.c | 3 +- + drivers/net/wireless/mwifiex/wmm.c | 5 +- + drivers/net/wireless/mwifiex/wmm.h | 4 +- + drivers/net/wireless/mwl8k.c | 7 +- + drivers/net/wireless/orinoco/main.c | 6 +- + drivers/net/wireless/orinoco/orinoco_usb.c | 5 - + drivers/net/wireless/p54/main.c | 3 +- + drivers/net/wireless/prism54/islpci_mgt.c | 6 +- + drivers/net/wireless/rt2x00/rt2800lib.c | 23 +- + drivers/net/wireless/rt2x00/rt2800pci.c | 2 +- + drivers/net/wireless/rt2x00/rt2800usb.c | 4 +- + drivers/net/wireless/rtlwifi/Kconfig | 5 + + drivers/net/wireless/rtlwifi/base.c | 67 +- + drivers/net/wireless/rtlwifi/base.h | 2 +- + drivers/net/wireless/rtlwifi/cam.c | 85 +- + drivers/net/wireless/rtlwifi/cam.h | 2 +- + drivers/net/wireless/rtlwifi/core.c | 174 +- + drivers/net/wireless/rtlwifi/core.h | 6 +- + drivers/net/wireless/rtlwifi/debug.c | 4 +- + drivers/net/wireless/rtlwifi/debug.h | 121 +- + drivers/net/wireless/rtlwifi/efuse.c | 65 +- + drivers/net/wireless/rtlwifi/efuse.h | 2 +- + drivers/net/wireless/rtlwifi/pci.c | 243 +- + drivers/net/wireless/rtlwifi/pci.h | 3 +- + drivers/net/wireless/rtlwifi/ps.c | 39 +- + drivers/net/wireless/rtlwifi/ps.h | 2 +- + drivers/net/wireless/rtlwifi/rc.c | 4 +- + drivers/net/wireless/rtlwifi/rc.h | 2 +- + drivers/net/wireless/rtlwifi/regd.c | 14 +- + drivers/net/wireless/rtlwifi/regd.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 195 +- + drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 99 +- + drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192c/main.c | 4 +- + drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c | 221 +- + drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ce/def.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ce/dm.c | 26 +- + drivers/net/wireless/rtlwifi/rtl8192ce/dm.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 288 +- + drivers/net/wireless/rtlwifi/rtl8192ce/hw.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ce/led.c | 18 +- + drivers/net/wireless/rtlwifi/rtl8192ce/led.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ce/phy.c | 113 +- + drivers/net/wireless/rtlwifi/rtl8192ce/phy.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ce/reg.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ce/rf.c | 87 +- + drivers/net/wireless/rtlwifi/rtl8192ce/rf.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 37 +- + drivers/net/wireless/rtlwifi/rtl8192ce/sw.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ce/table.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ce/table.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 25 +- + drivers/net/wireless/rtlwifi/rtl8192ce/trx.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192cu/def.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192cu/dm.c | 26 +- + drivers/net/wireless/rtlwifi/rtl8192cu/dm.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 464 +- + drivers/net/wireless/rtlwifi/rtl8192cu/hw.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192cu/led.c | 17 +- + drivers/net/wireless/rtlwifi/rtl8192cu/led.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | 133 +- + drivers/net/wireless/rtlwifi/rtl8192cu/mac.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192cu/phy.c | 126 +- + drivers/net/wireless/rtlwifi/rtl8192cu/phy.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192cu/reg.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192cu/rf.c | 75 +- + drivers/net/wireless/rtlwifi/rtl8192cu/rf.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 34 +- + drivers/net/wireless/rtlwifi/rtl8192cu/sw.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192cu/table.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192cu/table.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 44 +- + drivers/net/wireless/rtlwifi/rtl8192cu/trx.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192de/def.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192de/dm.c | 243 +- + drivers/net/wireless/rtlwifi/rtl8192de/dm.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192de/fw.c | 137 +- + drivers/net/wireless/rtlwifi/rtl8192de/fw.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192de/hw.c | 202 +- + drivers/net/wireless/rtlwifi/rtl8192de/hw.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192de/led.c | 16 +- + drivers/net/wireless/rtlwifi/rtl8192de/led.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192de/phy.c | 695 +- + drivers/net/wireless/rtlwifi/rtl8192de/phy.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192de/reg.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192de/rf.c | 99 +- + drivers/net/wireless/rtlwifi/rtl8192de/rf.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192de/sw.c | 57 +- + drivers/net/wireless/rtlwifi/rtl8192de/sw.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192de/table.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192de/table.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192de/trx.c | 28 +- + drivers/net/wireless/rtlwifi/rtl8192de/trx.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192se/def.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192se/dm.c | 32 +- + drivers/net/wireless/rtlwifi/rtl8192se/dm.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192se/fw.c | 76 +- + drivers/net/wireless/rtlwifi/rtl8192se/fw.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192se/hw.c | 272 +- + drivers/net/wireless/rtlwifi/rtl8192se/hw.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192se/led.c | 22 +- + drivers/net/wireless/rtlwifi/rtl8192se/led.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192se/phy.c | 221 +- + drivers/net/wireless/rtlwifi/rtl8192se/phy.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192se/reg.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192se/rf.c | 66 +- + drivers/net/wireless/rtlwifi/rtl8192se/rf.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192se/sw.c | 87 +- + drivers/net/wireless/rtlwifi/rtl8192se/sw.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192se/table.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192se/table.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 20 +- + drivers/net/wireless/rtlwifi/rtl8192se/trx.h | 2 +- + drivers/net/wireless/rtlwifi/usb.c | 92 +- + drivers/net/wireless/rtlwifi/usb.h | 3 +- + drivers/net/wireless/rtlwifi/wifi.h | 8 +- + drivers/net/wireless/wl1251/main.c | 7 +- + drivers/net/wireless/wl12xx/main.c | 5 +- + drivers/net/xen-netback/netback.c | 4 +- + drivers/net/xen-netfront.c | 62 +- + drivers/nfc/nfcwilink.c | 305 +- + drivers/s390/net/qeth_core.h | 1 + + drivers/s390/net/qeth_core_main.c | 100 + + drivers/s390/net/qeth_core_mpc.h | 13 + + drivers/s390/net/qeth_l2_main.c | 3 + + drivers/s390/net/qeth_l3_main.c | 38 +- + drivers/ssb/pci.c | 40 +- + include/linux/can/dev.h | 2 +- + include/linux/etherdevice.h | 13 +- + include/linux/in.h | 1 + + include/linux/in6.h | 1 + + include/linux/ipv6.h | 8 +- + include/linux/netlink.h | 18 +- + include/linux/nfc.h | 7 + + include/linux/nl80211.h | 8 + + include/linux/pkt_sched.h | 21 + + include/linux/skbuff.h | 9 +- + include/linux/snmp.h | 1 + + include/linux/ssb/ssb.h | 8 + + include/linux/ssb/ssb_regs.h | 34 + + include/linux/tcp.h | 5 +- + include/net/addrconf.h | 1 - + include/net/caif/caif_hsi.h | 1 + + include/net/cfg80211.h | 6 +- + include/net/genetlink.h | 31 +- + include/net/inet_sock.h | 3 + + include/net/iucv/af_iucv.h | 2 + + include/net/mac80211.h | 44 +- + include/net/ndisc.h | 1 - + include/net/netlink.h | 35 - + include/net/nfc/nci.h | 53 +- + include/net/nfc/nci_core.h | 26 +- + include/net/nfc/nfc.h | 9 +- + include/net/tcp.h | 66 +- + net/atm/clip.c | 17 +- + net/caif/caif_dev.c | 2 - + net/caif/caif_socket.c | 113 +- + net/caif/chnl_net.c | 15 +- + net/core/dev.c | 94 +- + net/core/neighbour.c | 90 +- + net/core/netpoll.c | 71 +- + net/core/skbuff.c | 3 +- + net/decnet/dn_neigh.c | 24 +- + net/decnet/dn_route.c | 3 +- + net/ethernet/eth.c | 2 + + net/ipv4/af_inet.c | 1 + + net/ipv4/ip_gre.c | 19 +- + net/ipv4/ip_sockglue.c | 37 + + net/ipv4/ipip.c | 3 +- + net/ipv4/ping.c | 3 +- + net/ipv4/proc.c | 1 + + net/ipv4/raw.c | 3 +- + net/ipv4/route.c | 5 + + net/ipv4/tcp_ipv4.c | 297 +- + net/ipv4/tcp_minisocks.c | 12 +- + net/ipv4/tcp_output.c | 4 +- + net/ipv4/udp.c | 3 +- + net/ipv6/af_inet6.c | 1 + + net/ipv6/anycast.c | 29 - + net/ipv6/datagram.c | 2 +- + net/ipv6/icmp.c | 4 + + net/ipv6/ip6_fib.c | 19 +- + net/ipv6/ip6_output.c | 10 +- + net/ipv6/ipv6_sockglue.c | 38 + + net/ipv6/ndisc.c | 30 +- + net/ipv6/raw.c | 2 + + net/ipv6/reassembly.c | 7 +- + net/ipv6/route.c | 15 +- + net/ipv6/sit.c | 20 +- + net/ipv6/tcp_ipv6.c | 231 +- + net/ipv6/udp.c | 3 +- + net/ipv6/xfrm6_output.c | 2 +- + net/iucv/af_iucv.c | 202 +- + net/mac80211/cfg.c | 46 +- + net/mac80211/chan.c | 28 +- + net/mac80211/debugfs.c | 4 - + net/mac80211/debugfs_netdev.c | 35 + + net/mac80211/debugfs_sta.c | 5 +- + net/mac80211/ibss.c | 94 +- + net/mac80211/ieee80211_i.h | 3 +- + net/mac80211/iface.c | 13 +- + net/mac80211/main.c | 3 +- + net/mac80211/mesh_hwmp.c | 2 +- + net/mac80211/mesh_plink.c | 6 +- + net/mac80211/mlme.c | 25 +- + net/mac80211/rate.c | 151 +- + net/mac80211/rate.h | 4 - + net/mac80211/rx.c | 11 +- + net/mac80211/sta_info.c | 84 +- + net/mac80211/sta_info.h | 17 +- + net/mac80211/status.c | 6 +- + net/mac80211/tx.c | 5 + + net/mac80211/util.c | 21 +- + net/mac80211/work.c | 5 +- + net/netlink/af_netlink.c | 18 + + net/netlink/genetlink.c | 31 + + net/nfc/core.c | 5 - + net/nfc/nci/core.c | 118 +- + net/nfc/nci/data.c | 4 + + net/nfc/nci/ntf.c | 337 +- + net/nfc/nci/rsp.c | 28 +- + net/nfc/netlink.c | 6 + + net/nfc/rawsock.c | 12 - + net/sched/Kconfig | 26 + + net/sched/Makefile | 1 + + net/sched/sch_plug.c | 233 + + net/tipc/bcast.c | 324 +- + net/tipc/bcast.h | 2 +- + net/tipc/link.c | 148 +- + net/tipc/name_distr.c | 4 - + net/tipc/node.c | 14 +- + net/tipc/node.h | 18 +- + net/tipc/port.c | 5 +- + net/wireless/mesh.c | 1 + + net/wireless/nl80211.c | 74 +- + net/wireless/reg.c | 19 +- + 749 files changed, 24378 insertions(+), 16910 deletions(-) + rename drivers/net/ethernet/intel/e1000e/{lib.c => mac.c} (63%) + create mode 100644 drivers/net/ethernet/intel/e1000e/manage.c + create mode 100644 drivers/net/ethernet/intel/e1000e/nvm.c + delete mode 100644 drivers/net/ethernet/sfc/mac.h + create mode 100644 drivers/net/ethernet/sfc/mcdi_mon.c + create mode 100644 drivers/net/ethernet/xilinx/xilinx_axienet.h + create mode 100644 drivers/net/ethernet/xilinx/xilinx_axienet_main.c + create mode 100644 drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c + create mode 100644 drivers/net/usb/qmi_wwan.c + create mode 100644 net/sched/sch_plug.c +Merging wireless-next/master (1232528 rtlwifi: Modify rtl_pci_init to return 0 on success) +$ git merge wireless-next/master +Auto-merging net/mac80211/rx.c +Auto-merging net/mac80211/main.c +Auto-merging drivers/net/wireless/rtlwifi/rtl8192de/dm.c +Auto-merging drivers/net/wireless/rtlwifi/pci.c +Auto-merging drivers/net/wireless/rt2x00/rt2800lib.c +Auto-merging drivers/net/wireless/mwl8k.c +Auto-merging drivers/net/wireless/mwifiex/init.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-trans-pcie.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c +Auto-merging drivers/bcma/scan.c +Auto-merging drivers/bcma/main.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/DocBook/80211.tmpl | 1 - + MAINTAINERS | 2 - + arch/mips/pci/pci-bcm47xx.c | 49 +- + drivers/bcma/bcma_private.h | 8 +- + drivers/bcma/driver_pci.c | 168 ++-- + drivers/bcma/driver_pci_host.c | 578 +++++++++- + drivers/bcma/host_pci.c | 4 +- + drivers/bcma/main.c | 14 +- + drivers/bcma/scan.c | 24 +- + drivers/bcma/sprom.c | 7 + + drivers/net/wireless/ath/ath6kl/Kconfig | 25 +- + drivers/net/wireless/ath/ath6kl/Makefile | 30 +- + drivers/net/wireless/ath/ath6kl/bmi.c | 10 +- + drivers/net/wireless/ath/ath6kl/cfg80211.c | 606 ++++++--- + drivers/net/wireless/ath/ath6kl/cfg80211.h | 12 +- + drivers/net/wireless/ath/ath6kl/common.h | 3 - + drivers/net/wireless/ath/ath6kl/core.c | 316 +++++ + drivers/net/wireless/ath/ath6kl/core.h | 107 ++- + drivers/net/wireless/ath/ath6kl/debug.c | 114 +- + drivers/net/wireless/ath/ath6kl/debug.h | 28 +- + drivers/net/wireless/ath/ath6kl/hif.c | 15 +- + drivers/net/wireless/ath/ath6kl/htc.c | 11 +- + drivers/net/wireless/ath/ath6kl/init.c | 472 +++---- + drivers/net/wireless/ath/ath6kl/main.c | 182 +++- + drivers/net/wireless/ath/ath6kl/sdio.c | 140 ++- + drivers/net/wireless/ath/ath6kl/testmode.c | 102 +-- + drivers/net/wireless/ath/ath6kl/testmode.h | 6 +- + drivers/net/wireless/ath/ath6kl/txrx.c | 534 ++++++-- + drivers/net/wireless/ath/ath6kl/usb.c | 431 +++++++ + drivers/net/wireless/ath/ath6kl/wmi.c | 148 ++- + drivers/net/wireless/ath/ath6kl/wmi.h | 67 +- + drivers/net/wireless/ath/ath9k/hif_usb.c | 2 +- + drivers/net/wireless/ipw2x00/libipw_rx.c | 2 +- + drivers/net/wireless/iwlegacy/3945-mac.c | 186 ++-- + drivers/net/wireless/iwlegacy/3945-rs.c | 7 +- + drivers/net/wireless/iwlegacy/3945.c | 111 +- + drivers/net/wireless/iwlegacy/3945.h | 6 +- + drivers/net/wireless/iwlegacy/4965-calib.c | 24 +- + drivers/net/wireless/iwlegacy/4965-mac.c | 512 ++++---- + drivers/net/wireless/iwlegacy/4965-rs.c | 48 +- + drivers/net/wireless/iwlegacy/4965.c | 328 ++---- + drivers/net/wireless/iwlegacy/4965.h | 22 +- + drivers/net/wireless/iwlegacy/common.c | 656 ++++------ + drivers/net/wireless/iwlegacy/common.h | 234 ++--- + drivers/net/wireless/iwlegacy/debug.c | 43 +- + drivers/net/wireless/iwlwifi/iwl-1000.c | 6 +- + drivers/net/wireless/iwlwifi/iwl-2000.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 6 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 10 +- + drivers/net/wireless/iwlwifi/iwl-agn-rx.c | 8 +- + drivers/net/wireless/iwlwifi/iwl-agn-tt.c | 14 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 713 +---------- + drivers/net/wireless/iwlwifi/iwl-agn.h | 3 +- + drivers/net/wireless/iwlwifi/iwl-bus.h | 64 - + drivers/net/wireless/iwlwifi/iwl-core.c | 128 +-- + drivers/net/wireless/iwlwifi/iwl-core.h | 6 - + drivers/net/wireless/iwlwifi/iwl-debug.h | 16 +- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 6 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 109 -- + drivers/net/wireless/iwlwifi/iwl-eeprom.c | 65 +- + drivers/net/wireless/iwlwifi/iwl-io.c | 193 ++-- + drivers/net/wireless/iwlwifi/iwl-io.h | 60 +- + drivers/net/wireless/iwlwifi/iwl-led.c | 9 +- + drivers/net/wireless/iwlwifi/iwl-mac80211.c | 36 +- + drivers/net/wireless/iwlwifi/iwl-pci.c | 229 +--- + drivers/net/wireless/iwlwifi/iwl-power.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-shared.h | 2 - + drivers/net/wireless/iwlwifi/iwl-testmode.c | 36 +- + drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h | 18 +- + drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c | 103 +- + drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c | 55 +- + drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 661 ++++++++-- + drivers/net/wireless/iwlwifi/iwl-trans.h | 133 ++- + drivers/net/wireless/iwlwifi/iwl-ucode.c | 740 ++++++++++-- + drivers/net/wireless/iwlwifi/iwl-ucode.h | 178 +++ + drivers/net/wireless/iwmc3200wifi/trace.h | 2 +- + drivers/net/wireless/mwifiex/cfg80211.c | 15 +- + drivers/net/wireless/mwifiex/init.c | 1 + + drivers/net/wireless/mwifiex/main.h | 2 +- + drivers/net/wireless/mwifiex/scan.c | 6 - + drivers/net/wireless/mwifiex/sta_cmd.c | 60 +- + drivers/net/wireless/mwifiex/sta_cmdresp.c | 3 + + drivers/net/wireless/mwl8k.c | 38 +- + drivers/net/wireless/rt2x00/rt2800.h | 49 +- + drivers/net/wireless/rt2x00/rt2800lib.c | 159 ++- + drivers/net/wireless/rt2x00/rt2800pci.c | 1 + + drivers/net/wireless/rt2x00/rt2800usb.c | 1 + + drivers/net/wireless/rt2x00/rt2x00.h | 15 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 18 + + drivers/net/wireless/rtlwifi/core.c | 4 +- + drivers/net/wireless/rtlwifi/pci.c | 39 +- + drivers/net/wireless/rtlwifi/rtl8192de/dm.c | 2 +- + drivers/ssb/driver_chipcommon_pmu.c | 48 +- + drivers/ssb/driver_mipscore.c | 3 + + drivers/ssb/main.c | 3 + + drivers/ssb/scan.c | 3 + + drivers/ssb/ssb_private.h | 4 + + include/linux/bcma/bcma.h | 2 + + include/linux/bcma/bcma_driver_chipcommon.h | 16 + + include/linux/bcma/bcma_driver_pci.h | 125 ++- + include/linux/bcma/bcma_regs.h | 27 + + include/net/cfg80211.h | 58 +- + include/net/mac80211.h | 35 + + net/mac80211/Makefile | 4 +- + net/mac80211/cfg.c | 6 +- + net/mac80211/debugfs.c | 2 + + net/mac80211/debugfs_sta.c | 4 +- + net/mac80211/driver-ops.h | 33 + + net/mac80211/driver-trace.h | 32 + + net/mac80211/ibss.c | 6 +- + net/mac80211/ieee80211_i.h | 79 +- + net/mac80211/iface.c | 7 +- + net/mac80211/key.c | 38 +- + net/mac80211/main.c | 16 +- + net/mac80211/mesh_pathtbl.c | 6 +- + net/mac80211/mlme.c | 1390 +++++++++++++++------ + net/mac80211/pm.c | 11 +- + net/mac80211/rate.c | 4 +- + net/mac80211/rate.h | 3 +- + net/mac80211/rx.c | 22 +- + net/mac80211/sta_info.c | 252 ++-- + net/mac80211/sta_info.h | 40 +- + net/mac80211/util.c | 11 +- + net/mac80211/work.c | 815 ------------ + net/wireless/core.h | 14 +- + net/wireless/mlme.c | 322 +---- + net/wireless/nl80211.c | 40 +- + net/wireless/scan.c | 12 + + net/wireless/sme.c | 41 +- + 129 files changed, 7900 insertions(+), 6057 deletions(-) + create mode 100644 drivers/net/wireless/ath/ath6kl/core.c + create mode 100644 drivers/net/wireless/ath/ath6kl/usb.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-ucode.h +Merging bluetooth/master (c5993de Bluetooth: Correct packet len calculation) +$ git merge bluetooth/master +Already up-to-date. +Merging mtd/master (3c3e51d Merge ../linux-2.6 to bring in 3.3-rc fixes already merged) +$ git merge mtd/master +Merge made by the 'recursive' strategy. + drivers/mtd/chips/cfi_cmdset_0002.c | 240 +++++++++++++++++++++++++++++++++++ + 1 files changed, 240 insertions(+), 0 deletions(-) +Merging l2-mtd/master (783dbd6 sfc: mtd: Use MTD_FAIL_ADDR_UNKNOWN instead of 0xffffffff) +$ git merge l2-mtd/master +Resolved 'drivers/mtd/chips/cfi_cmdset_0002.c' using previous resolution. +Removing include/linux/mtd/pmc551.h +Auto-merging drivers/net/ethernet/sfc/mtd.c +Auto-merging drivers/mtd/chips/cfi_cmdset_0002.c +CONFLICT (content): Merge conflict in drivers/mtd/chips/cfi_cmdset_0002.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8a92394] Merge remote-tracking branch 'l2-mtd/master' +$ git diff -M --stat --summary HEAD^.. + drivers/mtd/Kconfig | 3 - + drivers/mtd/chips/cfi_cmdset_0001.c | 66 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 47 +- + drivers/mtd/chips/cfi_cmdset_0020.c | 33 +- + drivers/mtd/chips/cfi_util.c | 6 - + drivers/mtd/chips/fwh_lock.h | 4 +- + drivers/mtd/chips/map_absent.c | 10 +- + drivers/mtd/chips/map_ram.c | 14 +- + drivers/mtd/chips/map_rom.c | 13 +- + drivers/mtd/devices/Kconfig | 7 + + drivers/mtd/devices/Makefile | 1 + + drivers/mtd/devices/block2mtd.c | 28 +- + drivers/mtd/devices/doc2000.c | 24 +- + drivers/mtd/devices/doc2001.c | 21 +- + drivers/mtd/devices/doc2001plus.c | 21 +- + drivers/mtd/devices/docg3.c | 14 +- + drivers/mtd/devices/lart.c | 17 +- + drivers/mtd/devices/m25p80.c | 56 +-- + drivers/mtd/devices/ms02-nv.c | 12 +- + drivers/mtd/devices/mtd_dataflash.c | 50 +- + drivers/mtd/devices/mtdram.c | 35 +- + drivers/mtd/devices/phram.c | 43 +- + drivers/mtd/devices/pmc551.c | 99 ++-- + drivers/mtd/devices/slram.c | 41 +- + drivers/mtd/devices/spear_smi.c | 1091 +++++++++++++++++++++++++ + drivers/mtd/devices/sst25l.c | 40 +- + drivers/mtd/inftlcore.c | 2 +- + drivers/mtd/lpddr/lpddr_cmds.c | 37 +- + drivers/mtd/maps/ixp4xx.c | 5 +- + drivers/mtd/maps/uclinux.c | 2 +- + drivers/mtd/maps/vmu-flash.c | 14 +- + drivers/mtd/mtd_blkdevs.c | 1 + + drivers/mtd/mtdblock.c | 8 +- + drivers/mtd/mtdchar.c | 4 +- + drivers/mtd/mtdconcat.c | 104 +-- + drivers/mtd/mtdcore.c | 270 ++++++- + drivers/mtd/mtdoops.c | 9 +- + drivers/mtd/mtdpart.c | 141 ++--- + drivers/mtd/nand/Kconfig | 20 + + drivers/mtd/nand/Makefile | 1 + + drivers/mtd/nand/alauda.c | 8 +- + drivers/mtd/nand/docg4.c | 1378 ++++++++++++++++++++++++++++++++ + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 2 +- + drivers/mtd/nand/nand_base.c | 180 +++--- + drivers/mtd/nftlcore.c | 7 - + drivers/mtd/onenand/onenand_base.c | 65 +- + drivers/mtd/onenand/samsung.c | 4 +- + drivers/mtd/redboot.c | 6 +- + drivers/mtd/ubi/gluebi.c | 29 +- + drivers/net/ethernet/sfc/mtd.c | 10 +- + fs/jffs2/compr.c | 2 +- + fs/jffs2/compr_lzo.c | 1 - + fs/jffs2/compr_zlib.c | 6 +- + fs/jffs2/os-linux.h | 4 +- + fs/jffs2/scan.c | 22 +- + fs/romfs/storage.c | 2 +- + include/linux/mtd/bbm.h | 5 + + include/linux/mtd/blktrans.h | 1 + + include/linux/mtd/mtd.h | 301 ++----- + include/linux/mtd/nand.h | 5 +- + include/linux/mtd/pmc551.h | 78 -- + include/linux/mtd/spear_smi.h | 62 ++ + 62 files changed, 3368 insertions(+), 1224 deletions(-) + create mode 100644 drivers/mtd/devices/spear_smi.c + create mode 100644 drivers/mtd/nand/docg4.c + delete mode 100644 include/linux/mtd/pmc551.h + create mode 100644 include/linux/mtd/spear_smi.h +Merging crypto/master (0cfdec7 crypto: In crypto_add_alg(), 'exact' wants to be initialized to 0) +$ git merge crypto/master +Resolved 'arch/arm/mach-tegra/fuse.c' using previous resolution. +Auto-merging crypto/sha512_generic.c +Auto-merging crypto/crypto_user.c +Auto-merging arch/arm/mach-tegra/fuse.c +CONFLICT (content): Merge conflict in arch/arm/mach-tegra/fuse.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e1fdca9] Merge remote-tracking branch 'crypto/master' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-tegra/fuse.c | 2 + + arch/x86/crypto/blowfish_glue.c | 30 + + arch/x86/crypto/serpent-sse2-i586-asm_32.S | 29 +- + arch/x86/crypto/serpent-sse2-x86_64-asm_64.S | 29 +- + arch/x86/crypto/twofish_glue_3way.c | 47 ++ + crypto/algapi.c | 35 + + crypto/crypto_user.c | 2 +- + crypto/sha512_generic.c | 13 +- + drivers/char/hw_random/tx4939-rng.c | 5 +- + drivers/crypto/Kconfig | 11 + + drivers/crypto/Makefile | 1 + + drivers/crypto/caam/caamalg.c | 126 +++- + drivers/crypto/caam/ctrl.c | 2 +- + drivers/crypto/geode-aes.c | 6 +- + drivers/crypto/hifn_795x.c | 3 +- + drivers/crypto/ixp4xx_crypto.c | 4 +- + drivers/crypto/mv_cesa.c | 12 +- + drivers/crypto/n2_core.c | 7 +- + drivers/crypto/omap-aes.c | 8 +- + drivers/crypto/omap-sham.c | 4 + + drivers/crypto/picoxcell_crypto.c | 46 +- + drivers/crypto/s5p-sss.c | 6 +- + drivers/crypto/talitos.c | 1 + + drivers/crypto/tegra-aes.c | 1096 ++++++++++++++++++++++++++ + drivers/crypto/tegra-aes.h | 103 +++ + include/linux/bitops.h | 20 + + include/linux/crypto.h | 7 + + 27 files changed, 1578 insertions(+), 77 deletions(-) + create mode 100644 drivers/crypto/tegra-aes.c + create mode 100644 drivers/crypto/tegra-aes.h +Merging sound/for-next (96c24d3 Merge branch 'fix/misc' into for-next) +$ git merge sound/for-next +Removing sound/soc/omap/sdp4430.c +Auto-merging arch/arm/mach-s3c64xx/mach-crag6410-module.c +Auto-merging arch/arm/mach-omap2/board-omap4panda.c +Auto-merging arch/arm/mach-omap2/board-4430sdp.c +Auto-merging arch/arm/mach-ep93xx/core.c +Merge made by the 'recursive' strategy. + Documentation/driver-model/devres.txt | 3 + + arch/arm/mach-ep93xx/core.c | 19 +- + arch/arm/mach-ep93xx/include/mach/platform.h | 2 +- + arch/arm/mach-omap2/board-4430sdp.c | 29 + + arch/arm/mach-omap2/board-omap4panda.c | 60 +- + arch/arm/mach-s3c64xx/mach-crag6410-module.c | 1 + + arch/mips/jz4740/board-qi_lb60.c | 6 + + drivers/base/regmap/internal.h | 3 + + drivers/base/regmap/regcache.c | 11 + + drivers/base/regmap/regmap.c | 58 + + drivers/regulator/core.c | 108 + + include/linux/platform_data/omap-abe-twl6040.h | 49 + + include/linux/regmap.h | 3 + + include/linux/regulator/consumer.h | 12 + + include/sound/pcm.h | 4 + + include/sound/soc-dapm.h | 9 + + include/sound/soc.h | 2 + + include/sound/version.h | 2 +- + include/sound/wm2200.h | 41 + + include/sound/wm8962.h | 6 + + sound/aoa/codecs/onyx.c | 13 +- + sound/aoa/codecs/tas.c | 13 +- + sound/core/pcm.c | 99 +- + sound/pci/au88x0/au88x0.h | 13 +- + sound/pci/au88x0/au88x0_core.c | 18 +- + sound/pci/au88x0/au88x0_pcm.c | 127 +- + sound/pci/hda/hda_codec.c | 21 +- + sound/pci/hda/hda_codec.h | 1 + + sound/pci/hda/hda_intel.c | 28 +- + sound/pci/hda/hda_jack.c | 16 + + sound/pci/hda/hda_jack.h | 13 +- + sound/pci/hda/hda_local.h | 3 +- + sound/pci/hda/patch_analog.c | 66 +- + sound/pci/hda/patch_conexant.c | 36 +- + sound/pci/hda/patch_realtek.c | 84 +- + sound/pci/hda/patch_sigmatel.c | 29 +- + sound/pci/hda/patch_via.c | 28 +- + sound/soc/atmel/atmel-pcm.c | 4 +- + sound/soc/codecs/Kconfig | 4 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/adau1373.c | 3 +- + sound/soc/codecs/adau1701.c | 2 +- + sound/soc/codecs/alc5623.c | 4 +- + sound/soc/codecs/alc5632.c | 2 +- + sound/soc/codecs/cq93vc.c | 2 - + sound/soc/codecs/sgtl5000.c | 19 +- + sound/soc/codecs/sn95031.c | 3 +- + sound/soc/codecs/tlv320aic3x.c | 2 +- + sound/soc/codecs/tlv320dac33.c | 8 +- + sound/soc/codecs/twl4030.c | 9 +- + sound/soc/codecs/twl6040.c | 29 +- + sound/soc/codecs/twl6040.h | 1 + + sound/soc/codecs/wm2200.c | 2285 +++++++++++++++ + sound/soc/codecs/wm2200.h | 3674 ++++++++++++++++++++++++ + sound/soc/codecs/wm5100.c | 613 ++--- + sound/soc/codecs/wm8731.c | 109 +- + sound/soc/codecs/wm8753.c | 186 +- + sound/soc/codecs/wm8770.c | 3 +- + sound/soc/codecs/wm8804.c | 148 +- + sound/soc/codecs/wm8904.c | 840 ++---- + sound/soc/codecs/wm8904.h | 11 + + sound/soc/codecs/wm8940.c | 14 +- + sound/soc/codecs/wm8955.c | 247 +- + sound/soc/codecs/wm8962.c | 1838 +++++-------- + sound/soc/codecs/wm8971.c | 37 +- + sound/soc/codecs/wm8974.c | 45 +- + sound/soc/codecs/wm8978.c | 185 +- + sound/soc/codecs/wm8978.h | 2 + + sound/soc/codecs/wm8983.c | 5 - + sound/soc/codecs/wm8985.c | 315 ++- + sound/soc/codecs/wm8988.c | 29 +- + sound/soc/codecs/wm8993.c | 599 +++-- + sound/soc/codecs/wm8994.c | 10 +- + sound/soc/codecs/wm8995.c | 2 +- + sound/soc/codecs/wm8996.c | 46 +- + sound/soc/codecs/wm9090.c | 266 +- + sound/soc/davinci/davinci-pcm.c | 4 +- + sound/soc/ep93xx/edb93xx.c | 4 +- + sound/soc/ep93xx/ep93xx-pcm.c | 4 +- + sound/soc/ep93xx/snappercl15.c | 4 +- + sound/soc/fsl/fsl_dma.c | 10 +- + sound/soc/fsl/mpc5200_dma.c | 16 +- + sound/soc/imx/mx27vis-aic32x4.c | 104 + + sound/soc/jz4740/qi_lb60.c | 56 +- + sound/soc/kirkwood/kirkwood-dma.c | 4 +- + sound/soc/omap/Kconfig | 13 +- + sound/soc/omap/Makefile | 4 +- + sound/soc/omap/omap-abe-twl6040.c | 349 +++ + sound/soc/omap/omap-dmic.c | 7 +- + sound/soc/omap/omap-mcpdm.c | 2 + + sound/soc/omap/sdp4430.c | 279 -- + sound/soc/s6000/s6000-pcm.c | 5 +- + sound/soc/samsung/dma.c | 2 +- + sound/soc/soc-core.c | 33 +- + sound/soc/soc-dapm.c | 86 +- + sound/soc/soc-io.c | 1 + + sound/soc/soc-pcm.c | 38 + + sound/soc/soc-utils.c | 20 +- + sound/soc/tegra/tegra_pcm.c | 2 +- + sound/spi/at73c213.c | 12 +- + 100 files changed, 10040 insertions(+), 3658 deletions(-) + create mode 100644 include/linux/platform_data/omap-abe-twl6040.h + create mode 100644 include/sound/wm2200.h + create mode 100644 sound/soc/codecs/wm2200.c + create mode 100644 sound/soc/codecs/wm2200.h + create mode 100644 sound/soc/omap/omap-abe-twl6040.c + delete mode 100644 sound/soc/omap/sdp4430.c +Merging sound-asoc/for-next (60eb1ca Merge branch 'for-3.4' into asoc-next) +$ git merge sound-asoc/for-next +Resolved 'sound/soc/codecs/wm5100.c' using previous resolution. +Auto-merging sound/soc/codecs/wm5100.c +CONFLICT (content): Merge conflict in sound/soc/codecs/wm5100.c +Auto-merging sound/soc/codecs/twl6040.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b9dab46] Merge remote-tracking branch 'sound-asoc/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/sound/alc5632.txt | 24 + + .../bindings/sound/tegra-audio-alc5632.txt | 57 ++ + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/mach-kirkwood/openrd-setup.c | 6 + + arch/arm/mach-kirkwood/t5325-setup.c | 6 + + arch/arm/mach-shmobile/board-ap4evb.c | 30 +- + arch/arm/mach-shmobile/board-mackerel.c | 18 +- + arch/sh/boards/mach-ecovec24/setup.c | 4 +- + arch/sh/boards/mach-se/7724/setup.c | 4 +- + include/sound/max9768.h | 24 + + include/sound/sh_fsi.h | 10 +- + include/sound/soc-dapm.h | 6 + + include/sound/soc.h | 8 +- + sound/soc/atmel/snd-soc-afeb9260.c | 37 +- + sound/soc/blackfin/bf5xx-ad1836.c | 17 +- + sound/soc/blackfin/bf5xx-ad193x.c | 17 +- + sound/soc/blackfin/bf5xx-ad73311.c | 29 +- + sound/soc/blackfin/bf5xx-ssm2602.c | 20 +- + sound/soc/blackfin/bfin-eval-adau1373.c | 13 +- + sound/soc/blackfin/bfin-eval-adau1701.c | 16 +- + sound/soc/blackfin/bfin-eval-adav80x.c | 13 +- + sound/soc/codecs/Kconfig | 4 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/ad1836.c | 6 +- + sound/soc/codecs/ad1980.c | 2 +- + sound/soc/codecs/adau1373.c | 4 +- + sound/soc/codecs/ak4535.c | 2 +- + sound/soc/codecs/ak4642.c | 2 +- + sound/soc/codecs/ak4671.c | 2 +- + sound/soc/codecs/alc5623.c | 8 +- + sound/soc/codecs/alc5632.c | 195 ++++-- + sound/soc/codecs/alc5632.h | 1 + + sound/soc/codecs/cq93vc.c | 2 +- + sound/soc/codecs/cs4270.c | 2 +- + sound/soc/codecs/cs4271.c | 2 +- + sound/soc/codecs/lm4857.c | 2 +- + sound/soc/codecs/max9768.c | 247 +++++++ + sound/soc/codecs/max98088.c | 4 +- + sound/soc/codecs/max98095.c | 6 +- + sound/soc/codecs/max9877.c | 2 +- + sound/soc/codecs/sn95031.c | 2 +- + sound/soc/codecs/ssm2602.c | 2 +- + sound/soc/codecs/stac9766.c | 2 +- + sound/soc/codecs/tlv320aic23.c | 2 +- + sound/soc/codecs/tlv320aic26.c | 2 +- + sound/soc/codecs/tlv320aic32x4.c | 2 +- + sound/soc/codecs/tlv320aic3x.c | 64 +-- + sound/soc/codecs/tlv320aic3x.h | 9 - + sound/soc/codecs/tlv320dac33.c | 2 +- + sound/soc/codecs/tpa6130a2.c | 4 +- + sound/soc/codecs/twl4030.c | 2 +- + sound/soc/codecs/twl6040.c | 2 +- + sound/soc/codecs/uda134x.c | 6 +- + sound/soc/codecs/wl1273.c | 2 +- + sound/soc/codecs/wm2200.c | 1 + + sound/soc/codecs/wm5100.c | 38 +- + sound/soc/codecs/wm8737.c | 2 +- + sound/soc/codecs/wm8770.c | 2 +- + sound/soc/codecs/wm8904.c | 16 +- + sound/soc/codecs/wm8940.c | 2 +- + sound/soc/codecs/wm8958-dsp2.c | 14 +- + sound/soc/codecs/wm8960.c | 2 +- + sound/soc/codecs/wm8961.c | 2 +- + sound/soc/codecs/wm8962.c | 13 +- + sound/soc/codecs/wm8988.c | 142 ++++- + sound/soc/codecs/wm8990.c | 2 +- + sound/soc/codecs/wm8991.c | 2 +- + sound/soc/codecs/wm8993.c | 35 +- + sound/soc/codecs/wm8993.h | 9 + + sound/soc/codecs/wm8994.c | 138 +++- + sound/soc/codecs/wm8994.h | 5 +- + sound/soc/codecs/wm8995.c | 2 +- + sound/soc/codecs/wm8996.c | 43 +- + sound/soc/codecs/wm9081.c | 25 +- + sound/soc/codecs/wm9090.c | 6 +- + sound/soc/codecs/wm9705.c | 2 +- + sound/soc/codecs/wm9712.c | 16 +- + sound/soc/codecs/wm9713.c | 2 +- + sound/soc/codecs/wm_hubs.c | 139 ++++- + sound/soc/codecs/wm_hubs.h | 11 + + sound/soc/kirkwood/kirkwood-openrd.c | 46 +- + sound/soc/kirkwood/kirkwood-t5325.c | 47 +- + sound/soc/mid-x86/mfld_machine.c | 2 +- + sound/soc/mxs/mxs-saif.c | 51 +-- + sound/soc/omap/ams-delta.c | 2 +- + sound/soc/omap/n810.c | 17 +- + sound/soc/omap/omap-mcbsp.c | 8 +- + sound/soc/omap/omap-mcbsp.h | 2 +- + sound/soc/omap/rx51.c | 25 +- + sound/soc/pxa/corgi.c | 14 +- + sound/soc/pxa/magician.c | 2 +- + sound/soc/pxa/poodle.c | 14 +- + sound/soc/pxa/tosa.c | 2 +- + sound/soc/samsung/littlemill.c | 3 + + sound/soc/samsung/neo1973_wm8753.c | 4 +- + sound/soc/samsung/s3c24xx_simtec.c | 6 +- + sound/soc/sh/fsi.c | 680 +++++++++++--------- + sound/soc/soc-core.c | 112 ++-- + sound/soc/soc-dapm.c | 31 +- + sound/soc/soc-pcm.c | 41 +- + sound/soc/tegra/tegra_alc5632.c | 130 +++- + 101 files changed, 1792 insertions(+), 1076 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/alc5632.txt + create mode 100644 Documentation/devicetree/bindings/sound/tegra-audio-alc5632.txt + create mode 100644 include/sound/max9768.h + create mode 100644 sound/soc/codecs/max9768.c +Merging cpufreq/next (6c523c6 [CPUFREQ] EXYNOS: Removed useless headers and codes) +$ git merge cpufreq/next +Already up-to-date. +Merging quilt/rr (b7e745a virtio: update documentation to v0.9.4 of spec) +$ git merge quilt/rr +Auto-merging kernel/params.c +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 2 + + Documentation/virtual/virtio-spec.txt | 1000 ++++++++++++++++++++++++++++++--- + include/asm-generic/vmlinux.lds.h | 35 +- + include/linux/module.h | 32 +- + include/linux/moduleparam.h | 58 ++- + init/main.c | 65 ++- + kernel/module.c | 37 ++- + kernel/params.c | 39 +- + 8 files changed, 1097 insertions(+), 171 deletions(-) +Merging input/next (023cea0 Input: tegra-kbc - allow skipping setting up some of GPIO pins) +$ git merge input/next +Auto-merging kernel/time/timekeeping.c +Auto-merging drivers/input/tablet/wacom_wac.c +Auto-merging drivers/input/tablet/wacom_sys.c +Auto-merging drivers/input/serio/at32psif.c +Auto-merging drivers/input/keyboard/samsung-keypad.c +Auto-merging drivers/input/keyboard/nomadik-ske-keypad.c +Auto-merging drivers/input/evdev.c +Auto-merging drivers/hid/hid-ids.h +Auto-merging drivers/hid/hid-core.c +Merge made by the 'recursive' strategy. + arch/arm/mach-tegra/include/mach/kbc.h | 13 +- + arch/m68k/q40/config.c | 13 + + drivers/hid/hid-core.c | 10 + + drivers/hid/hid-ids.h | 11 + + drivers/input/evdev.c | 25 +- + drivers/input/keyboard/nomadik-ske-keypad.c | 17 +- + drivers/input/keyboard/samsung-keypad.c | 6 +- + drivers/input/keyboard/tegra-kbc.c | 51 ++- + drivers/input/misc/Kconfig | 2 +- + drivers/input/mouse/Kconfig | 17 + + drivers/input/mouse/Makefile | 1 + + drivers/input/mouse/synaptics_usb.c | 568 ++++++++++++++++++++++++ + drivers/input/serio/at32psif.c | 22 +- + drivers/input/serio/q40kbd.c | 139 ++++--- + drivers/input/tablet/wacom_sys.c | 6 +- + drivers/input/tablet/wacom_wac.c | 28 +- + drivers/input/tablet/wacom_wac.h | 2 + + drivers/input/touchscreen/Kconfig | 32 ++- + drivers/input/touchscreen/Makefile | 5 +- + drivers/input/touchscreen/cyttsp_core.c | 625 +++++++++++++++++++++++++++ + drivers/input/touchscreen/cyttsp_core.h | 149 +++++++ + drivers/input/touchscreen/cyttsp_i2c.c | 146 +++++++ + drivers/input/touchscreen/cyttsp_spi.c | 210 +++++++++ + include/linux/input.h | 2 + + include/linux/input/cyttsp.h | 58 +++ + kernel/time/timekeeping.c | 2 + + 26 files changed, 2042 insertions(+), 118 deletions(-) + create mode 100644 drivers/input/mouse/synaptics_usb.c + create mode 100644 drivers/input/touchscreen/cyttsp_core.c + create mode 100644 drivers/input/touchscreen/cyttsp_core.h + create mode 100644 drivers/input/touchscreen/cyttsp_i2c.c + create mode 100644 drivers/input/touchscreen/cyttsp_spi.c + create mode 100644 include/linux/input/cyttsp.h +Merging input-mt/for-next (7491f3d bcm5974: Add pointer and buttonpad properties) +$ git merge input-mt/for-next +Auto-merging include/linux/input.h +Auto-merging drivers/input/evdev.c +Merge made by the 'recursive' strategy. + drivers/input/evdev.c | 27 ++++++++++++++++++++++++++- + drivers/input/input.c | 2 +- + drivers/input/mouse/bcm5974.c | 1 + + include/linux/input.h | 25 +++++++++++++++++++++++++ + include/linux/input/mt.h | 8 ++++++-- + 5 files changed, 59 insertions(+), 4 deletions(-) +Merging block/for-next (b3021da Merge branch 'for-3.3/core' into for-next) +$ git merge block/for-next +Merge made by the 'recursive' strategy. +Merging quilt/device-mapper (d65b4e9 Linux 3.3-rc3) +$ 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 battery/master (913272b Merge git://git.infradead.org/users/cbou/battery-urgent) +$ git merge battery/master +Already up-to-date. +Merging mmc/mmc-next (8b4e801 mmc: dw_mmc: shift with slot-id for CLKENA register) +$ git merge mmc/mmc-next +Merge made by the 'recursive' strategy. + drivers/mmc/card/block.c | 22 ++- + drivers/mmc/core/core.c | 55 ++++- + drivers/mmc/core/host.h | 21 -- + drivers/mmc/core/mmc.c | 40 +++- + drivers/mmc/core/sd.c | 22 ++- + drivers/mmc/core/sdio.c | 7 +- + drivers/mmc/core/sdio_irq.c | 10 +- + drivers/mmc/host/Kconfig | 25 ++ + drivers/mmc/host/Makefile | 2 + + drivers/mmc/host/atmel-mci.c | 3 + + drivers/mmc/host/dw_mmc-pci.c | 158 +++++++++++++ + drivers/mmc/host/dw_mmc-pltfm.c | 134 +++++++++++ + drivers/mmc/host/dw_mmc.c | 449 ++++++++++++++++++++----------------- + drivers/mmc/host/dw_mmc.h | 7 + + drivers/mmc/host/of_mmc_spi.c | 4 +- + drivers/mmc/host/sdhci-of-esdhc.c | 69 ++++++- + drivers/mmc/host/sdhci-pci.c | 2 +- + drivers/mmc/host/sdhci-pltfm.c | 10 +- + drivers/mmc/host/sdhci-tegra.c | 100 +++++++- + drivers/mmc/host/sdhci.c | 6 + + drivers/mmc/host/sdhci.h | 2 + + drivers/mmc/host/sh_mmcif.c | 16 +- + drivers/mmc/host/tmio_mmc.h | 7 +- + drivers/mmc/host/tmio_mmc_dma.c | 12 + + drivers/mmc/host/tmio_mmc_pio.c | 6 +- + include/linux/mmc/card.h | 6 + + include/linux/mmc/dw_mmc.h | 14 +- + include/linux/mmc/host.h | 20 ++ + include/linux/mmc/mmc.h | 3 + + 29 files changed, 940 insertions(+), 292 deletions(-) + create mode 100644 drivers/mmc/host/dw_mmc-pci.c + create mode 100644 drivers/mmc/host/dw_mmc-pltfm.c +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 (4de900b slub: include include for prefetch) +$ git merge slab/for-next +Merge made by the 'recursive' strategy. + mm/slab.c | 5 ++--- + mm/slub.c | 14 ++++++++++++-- + 2 files changed, 14 insertions(+), 5 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 (fae8cc5 md/raid10: fix handling of error on last working device in array.) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + drivers/md/raid1.c | 2 +- + drivers/md/raid10.c | 37 +++++++++++++++++++++++++++---------- + 2 files changed, 28 insertions(+), 11 deletions(-) +Merging mfd/for-next (fa884b5 mfd: twl-core: Don't specify regulator consumers by struct device) +$ git merge mfd/for-next +Auto-merging drivers/mfd/twl-core.c +Merge made by the 'recursive' strategy. + drivers/mfd/twl-core.c | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) +Merging drm/drm-next (cdbe8b5 Merge tag 'drm-intel-next-2012-02-07' of git://people.freedesktop.org/~danvet/drm-intel into drm-core-next) +$ git merge drm/drm-next +Auto-merging drivers/gpu/drm/radeon/evergreen.c +Auto-merging drivers/gpu/drm/i915/intel_dp.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Removing drivers/gpu/drm/i915/i915_mem.c +Merge made by the 'recursive' strategy. + drivers/char/agp/intel-agp.c | 1 + + drivers/gpu/drm/drm_crtc.c | 201 +++--- + drivers/gpu/drm/drm_crtc_helper.c | 12 +- + drivers/gpu/drm/drm_drv.c | 12 +- + drivers/gpu/drm/drm_edid.c | 7 +- + drivers/gpu/drm/drm_fb_helper.c | 88 +-- + drivers/gpu/drm/drm_ioctl.c | 2 + + drivers/gpu/drm/drm_modes.c | 2 - + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 28 +- + drivers/gpu/drm/gma500/framebuffer.c | 11 +- + drivers/gpu/drm/gma500/intel_gmbus.c | 2 +- + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 28 +- + drivers/gpu/drm/i2c/ch7006_drv.c | 5 +- + drivers/gpu/drm/i915/Makefile | 2 +- + drivers/gpu/drm/i915/i915_debugfs.c | 242 ++++---- + drivers/gpu/drm/i915/i915_dma.c | 19 +- + drivers/gpu/drm/i915/i915_drv.c | 8 +- + drivers/gpu/drm/i915/i915_drv.h | 68 +- + drivers/gpu/drm/i915/i915_gem.c | 398 +++++------- + drivers/gpu/drm/i915/i915_gem_evict.c | 2 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 150 +++-- + drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 4 +- + drivers/gpu/drm/i915/i915_irq.c | 116 ++-- + drivers/gpu/drm/i915/i915_mem.c | 387 ----------- + drivers/gpu/drm/i915/i915_reg.h | 30 +- + drivers/gpu/drm/i915/intel_acpi.c | 2 +- + drivers/gpu/drm/i915/intel_bios.c | 2 +- + drivers/gpu/drm/i915/intel_display.c | 296 ++++++--- + drivers/gpu/drm/i915/intel_dp.c | 13 +- + drivers/gpu/drm/i915/intel_drv.h | 1 + + drivers/gpu/drm/i915/intel_fb.c | 6 +- + drivers/gpu/drm/i915/intel_i2c.c | 4 +- + drivers/gpu/drm/i915/intel_modes.c | 28 +- + drivers/gpu/drm/i915/intel_overlay.c | 6 +- + drivers/gpu/drm/i915/intel_panel.c | 4 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 97 +--- + drivers/gpu/drm/i915/intel_ringbuffer.h | 20 +- + drivers/gpu/drm/i915/intel_sdvo.c | 30 +- + drivers/gpu/drm/i915/intel_sprite.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 20 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 6 +- + drivers/gpu/drm/radeon/Makefile | 2 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 20 +- + drivers/gpu/drm/radeon/atombios_i2c.c | 139 ++++ + drivers/gpu/drm/radeon/evergreen.c | 31 + + drivers/gpu/drm/radeon/evergreen_blit_kms.c | 12 +- + drivers/gpu/drm/radeon/evergreen_cs.c | 958 +++++++++++++++++++++++++-- + drivers/gpu/drm/radeon/evergreend.h | 377 +++++++++++ + drivers/gpu/drm/radeon/r100.c | 58 +- + drivers/gpu/drm/radeon/r200.c | 29 +- + drivers/gpu/drm/radeon/r600_blit_kms.c | 15 +- + drivers/gpu/drm/radeon/r600_cs.c | 282 +++++++-- + drivers/gpu/drm/radeon/r600d.h | 20 + + drivers/gpu/drm/radeon/radeon.h | 13 + + drivers/gpu/drm/radeon/radeon_benchmark.c | 12 +- + drivers/gpu/drm/radeon/radeon_blit_common.h | 44 ++ + drivers/gpu/drm/radeon/radeon_display.c | 70 +-- + drivers/gpu/drm/radeon/radeon_drv.c | 5 +- + drivers/gpu/drm/radeon/radeon_fb.c | 6 +- + drivers/gpu/drm/radeon/radeon_i2c.c | 27 +- + drivers/gpu/drm/radeon/radeon_object.c | 46 ++ + drivers/gpu/drm/radeon/reg_srcs/cayman | 11 +- + drivers/gpu/drm/radeon/reg_srcs/evergreen | 11 +- + drivers/gpu/drm/radeon/reg_srcs/r600 | 19 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 53 ++ + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 15 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 22 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 252 ++++--- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.h | 9 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 91 +++- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 8 + + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 38 +- + include/drm/drm_crtc.h | 13 +- + include/drm/drm_fb_helper.h | 2 - + include/drm/i915_drm.h | 1 + + include/drm/radeon_drm.h | 24 +- + 79 files changed, 3281 insertions(+), 1834 deletions(-) + delete mode 100644 drivers/gpu/drm/i915/i915_mem.c + create mode 100644 drivers/gpu/drm/radeon/atombios_i2c.c + create mode 100644 drivers/gpu/drm/radeon/radeon_blit_common.h +Merging fbdev/fbdev-next (e9474be video: support DP controller driver) +$ git merge fbdev/fbdev-next +Merge made by the 'recursive' strategy. + arch/arm/plat-samsung/include/plat/regs-fb.h | 9 + + drivers/video/Kconfig | 2 +- + drivers/video/Makefile | 2 + + drivers/video/atmel_lcdfb.c | 12 +- + drivers/video/au1100fb.c | 32 +- + drivers/video/au1200fb.c | 9 +- + drivers/video/bf537-lq035.c | 12 +- + drivers/video/bf54x-lq043fb.c | 4 +- + drivers/video/bfin-lq035q1-fb.c | 8 +- + drivers/video/bfin_adv7393fb.c | 5 +- + drivers/video/da8xx-fb.c | 37 +- + drivers/video/exynos/Kconfig | 37 + + drivers/video/exynos/Makefile | 8 + + drivers/video/exynos/exynos_dp_core.c | 1058 ++++++++++++++++++ + drivers/video/exynos/exynos_dp_core.h | 206 ++++ + drivers/video/exynos/exynos_dp_reg.c | 1173 ++++++++++++++++++++ + drivers/video/exynos/exynos_dp_reg.h | 335 ++++++ + drivers/video/exynos/exynos_mipi_dsi.c | 600 ++++++++++ + drivers/video/exynos/exynos_mipi_dsi_common.c | 896 +++++++++++++++ + drivers/video/exynos/exynos_mipi_dsi_common.h | 46 + + drivers/video/exynos/exynos_mipi_dsi_lowlevel.c | 618 +++++++++++ + drivers/video/exynos/exynos_mipi_dsi_lowlevel.h | 112 ++ + drivers/video/exynos/exynos_mipi_dsi_regs.h | 149 +++ + drivers/video/exynos/s6e8ax0.c | 898 +++++++++++++++ + drivers/video/exynos/s6e8ax0.h | 21 + + drivers/video/fbmem.c | 18 +- + drivers/video/msm/mddi_client_nt35399.c | 7 +- + drivers/video/msm/mddi_client_toshiba.c | 7 +- + drivers/video/omap/lcd_inn1610.c | 10 +- + drivers/video/omap/lcd_mipid.c | 14 +- + drivers/video/omap2/displays/panel-acx565akm.c | 13 +- + .../omap2/displays/panel-lgphilips-lb035q02.c | 12 +- + .../omap2/displays/panel-nec-nl8048hl11-01b.c | 12 +- + drivers/video/omap2/displays/panel-taal.c | 4 +- + .../video/omap2/displays/panel-tpo-td043mtea1.c | 24 +- + drivers/video/riva/fbdev.c | 5 +- + drivers/video/s3c-fb.c | 76 +- + drivers/video/udlfb.c | 2 +- + include/linux/fb.h | 1 + + include/video/exynos_dp.h | 131 +++ + include/video/exynos_mipi_dsim.h | 359 ++++++ + 41 files changed, 6799 insertions(+), 185 deletions(-) + create mode 100644 drivers/video/exynos/Kconfig + create mode 100644 drivers/video/exynos/Makefile + create mode 100644 drivers/video/exynos/exynos_dp_core.c + create mode 100644 drivers/video/exynos/exynos_dp_core.h + create mode 100644 drivers/video/exynos/exynos_dp_reg.c + create mode 100644 drivers/video/exynos/exynos_dp_reg.h + create mode 100644 drivers/video/exynos/exynos_mipi_dsi.c + create mode 100644 drivers/video/exynos/exynos_mipi_dsi_common.c + create mode 100644 drivers/video/exynos/exynos_mipi_dsi_common.h + create mode 100644 drivers/video/exynos/exynos_mipi_dsi_lowlevel.c + create mode 100644 drivers/video/exynos/exynos_mipi_dsi_lowlevel.h + create mode 100644 drivers/video/exynos/exynos_mipi_dsi_regs.h + create mode 100644 drivers/video/exynos/s6e8ax0.c + create mode 100644 drivers/video/exynos/s6e8ax0.h + create mode 100644 include/video/exynos_dp.h + create mode 100644 include/video/exynos_mipi_dsim.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 (9a90168 OMAPDSS: HDMI: Disable DDC internal pull up) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (d46f5ea Merge branch 'regulator-supply' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + Documentation/driver-model/devres.txt | 2 + + drivers/regulator/Kconfig | 31 + + drivers/regulator/Makefile | 5 + + drivers/regulator/core.c | 38 +- + drivers/regulator/db8500-prcmu.c | 118 ++--- + drivers/regulator/dbx500-prcmu.c | 241 ++++++++ + drivers/regulator/dbx500-prcmu.h | 63 +++ + drivers/regulator/max8649.c | 4 +- + drivers/regulator/max8997.c | 8 +- + drivers/regulator/mc13xxx-regulator-core.c | 2 + + drivers/regulator/s5m8767.c | 832 ++++++++++++++++++++++++++++ + drivers/regulator/tps62360-regulator.c | 472 ++++++++++++++++ + drivers/regulator/tps65023-regulator.c | 4 - + drivers/regulator/tps65217-regulator.c | 493 ++++++++++++++++ + drivers/regulator/tps65910-regulator.c | 280 +++++++++- + drivers/regulator/twl-regulator.c | 14 +- + drivers/regulator/wm8350-regulator.c | 4 +- + include/linux/mfd/tps65910.h | 8 + + include/linux/regulator/consumer.h | 12 +- + include/linux/regulator/machine.h | 2 - + include/linux/regulator/tps62360.h | 57 ++ + 21 files changed, 2535 insertions(+), 155 deletions(-) + create mode 100644 drivers/regulator/dbx500-prcmu.c + create mode 100644 drivers/regulator/dbx500-prcmu.h + create mode 100644 drivers/regulator/s5m8767.c + create mode 100644 drivers/regulator/tps62360-regulator.c + create mode 100644 drivers/regulator/tps65217-regulator.c + create mode 100644 include/linux/regulator/tps62360.h +Merging security/next (4040153 security: trim security.h) +$ git merge security/next +Auto-merging mm/shmem.c +Auto-merging kernel/fork.c +Auto-merging fs/super.c +Auto-merging fs/nfs/idmap.c +Auto-merging fs/nfs/client.c +Auto-merging drivers/target/iscsi/iscsi_target.c +Merge made by the 'recursive' strategy. + Documentation/networking/dns_resolver.txt | 4 + + Documentation/security/00-INDEX | 2 + + Documentation/security/Yama.txt | 60 ++++++ + Documentation/security/keys.txt | 4 + + drivers/char/tpm/Kconfig | 1 - + drivers/net/macvtap.c | 1 + + drivers/target/iscsi/iscsi_target.c | 1 + + drivers/target/iscsi/iscsi_target_login.c | 1 + + fs/cifs/cifsacl.c | 1 + + fs/nfs/client.c | 1 + + fs/nfs/idmap.c | 1 + + fs/proc/proc_sysctl.c | 2 + + fs/quota/dquot.c | 1 + + fs/super.c | 1 + + include/linux/digsig.h | 4 +- + include/linux/key.h | 1 + + include/linux/prctl.h | 6 + + include/linux/security.h | 80 ++++---- + include/net/sock.h | 2 + + ipc/msgutil.c | 2 + + kernel/cred.c | 1 + + kernel/exit.c | 1 + + kernel/fork.c | 3 +- + kernel/sched/core.c | 1 + + kernel/sysctl.c | 1 + + mm/mmap.c | 17 ++- + mm/mprotect.c | 2 +- + mm/mremap.c | 2 +- + mm/shmem.c | 4 +- + mm/swapfile.c | 4 +- + net/dns_resolver/dns_key.c | 1 + + security/Kconfig | 6 + + security/Makefile | 2 + + security/capability.c | 5 + + security/commoncap.c | 1 + + security/integrity/ima/Kconfig | 2 +- + security/integrity/ima/ima_policy.c | 1 + + security/keys/keyctl.c | 15 ++- + security/security.c | 21 +-- + security/selinux/hooks.c | 2 + + security/smack/smack_lsm.c | 3 + + security/yama/Kconfig | 13 ++ + security/yama/Makefile | 3 + + security/yama/yama_lsm.c | 319 +++++++++++++++++++++++++++++ + 44 files changed, 537 insertions(+), 69 deletions(-) + create mode 100644 Documentation/security/Yama.txt + create mode 100644 security/yama/Kconfig + create mode 100644 security/yama/Makefile + create mode 100644 security/yama/yama_lsm.c +Merging selinux/master (dc2e1ff Merge commit 'v3.2' into 20120130) +$ git merge selinux/master +Merge made by the 'recursive' strategy. +Merging lblnet/master (7e27d6e Linux 2.6.35-rc3) +$ git merge lblnet/master +Already up-to-date. +Merging watchdog/linux-next (1776b7d watchdog: fix error in probe() of s3c2410_wdt (reset at booting)) +$ git merge watchdog/linux-next +Merge made by the 'recursive' strategy. + drivers/watchdog/hpwdt.c | 5 ++- + drivers/watchdog/s3c2410_wdt.c | 57 +++++++++++++++++++++------------------ + 2 files changed, 34 insertions(+), 28 deletions(-) +Merging dwmw2-iommu/master (c3b92c8 Linux 3.1) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging iommu/next (48d2116 Merge branches 'iommu/fixes' and 'arm/tegra' into next) +$ git merge iommu/next +Merge made by the 'recursive' strategy. + arch/arm/mach-tegra/include/mach/smmu.h | 63 ++ + drivers/iommu/Kconfig | 20 + + drivers/iommu/Makefile | 2 + + drivers/iommu/tegra-gart.c | 451 ++++++++++++++ + drivers/iommu/tegra-smmu.c | 1034 +++++++++++++++++++++++++++++++ + 5 files changed, 1570 insertions(+), 0 deletions(-) + create mode 100644 arch/arm/mach-tegra/include/mach/smmu.h + create mode 100644 drivers/iommu/tegra-gart.c + create mode 100644 drivers/iommu/tegra-smmu.c +Merging osd/linux-next (0aa436b exofs: Cap on the memcpy() size) +$ git merge osd/linux-next +Auto-merging fs/exofs/super.c +Merge made by the 'recursive' strategy. + drivers/scsi/osd/osd_uld.c | 4 ++-- + fs/exofs/super.c | 7 ++++--- + 2 files changed, 6 insertions(+), 5 deletions(-) +Merging jc_docs/docs-next (5c050fb docs: update the development process document) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging trivial/for-next (2105b9a Only include linux/sched.h once in arch/arm/mach-bcmring/dma.c) +$ git merge trivial/for-next +Auto-merging drivers/net/wireless/zd1211rw/zd_mac.c +Auto-merging drivers/media/dvb/frontends/drxk_hard.c +Auto-merging drivers/infiniband/ulp/srpt/ib_srpt.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +Auto-merging arch/arm/mm/init.c +Auto-merging arch/arm/mach-bcmring/dma.c +Merge made by the 'recursive' strategy. + Documentation/target/tcm_mod_builder.py | 2 +- + Documentation/vm/cleancache.txt | 2 +- + Documentation/vm/unevictable-lru.txt | 6 ++-- + arch/arm/mach-bcmring/dma.c | 1 - + arch/arm/mach-ks8695/leds.c | 1 - + arch/arm/mach-omap1/lcd_dma.c | 2 +- + arch/arm/mm/init.c | 1 - + arch/mips/bcm63xx/setup.c | 2 +- + arch/score/Kconfig.debug | 2 +- + arch/sh/drivers/pci/pci-sh7780.c | 2 +- + arch/x86/platform/scx200/scx200_32.c | 24 +++++++++----------- + drivers/char/nvram.c | 2 +- + drivers/char/rtc.c | 4 +- + drivers/char/tlclk.c | 2 +- + drivers/char/viotape.c | 2 +- + drivers/dma/iop-adma.c | 2 +- + drivers/gpu/drm/gma500/psb_intel_lvds.c | 9 +++---- + drivers/gpu/drm/radeon/rv515.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 2 +- + drivers/iommu/intel-iommu.c | 2 +- + drivers/macintosh/mediabay.c | 2 +- + drivers/md/dm-bufio.c | 1 - + drivers/media/dvb/dvb-usb/lmedm04.c | 2 +- + drivers/media/dvb/frontends/drxk_hard.c | 1 - + drivers/media/dvb/frontends/tda1004x.c | 4 +- + drivers/media/dvb/mantis/mantis_hif.c | 2 +- + drivers/media/video/ov6650.c | 2 +- + drivers/media/video/s5p-tv/hdmi_drv.c | 4 +- + drivers/media/video/s5p-tv/mixer_drv.c | 2 +- + drivers/mfd/ab5500-core.c | 1 - + drivers/mmc/host/s3cmci.c | 4 +- + drivers/net/wireless/zd1211rw/zd_mac.c | 2 +- + drivers/net/wireless/zd1211rw/zd_usb.c | 2 +- + drivers/platform/x86/hdaps.c | 4 +- + drivers/power/max8998_charger.c | 1 - + drivers/scsi/aic7xxx/aic79xx_core.c | 4 +- + drivers/scsi/aic7xxx/aic7xxx_core.c | 2 +- + drivers/scsi/mpt2sas/mpt2sas_config.c | 2 +- + drivers/scsi/pm8001/pm8001_hwi.c | 2 +- + drivers/scsi/qla2xxx/qla_bsg.c | 2 +- + drivers/staging/iio/dac/ad5686.c | 1 - + drivers/staging/mei/interrupt.c | 2 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 2 +- + drivers/tty/synclink_gt.c | 2 +- + fs/btrfs/check-integrity.c | 1 - + fs/btrfs/free-space-cache.c | 2 +- + fs/ntfs/mft.c | 4 +- + fs/reiserfs/lbalance.c | 2 +- + include/trace/events/power.h | 1 - + kernel/resource.c | 3 +- + net/rds/ib_recv.c | 2 +- + net/rds/iw_recv.c | 2 +- + 53 files changed, 66 insertions(+), 80 deletions(-) +Merging audit/for-next (dcd6c92 Linux 3.3-rc1) +$ git merge audit/for-next +Already up-to-date. +Merging pm/linux-next (40bd93b PM / Hibernate: print physical addresses consistently with other parts of kernel) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + Documentation/power/devices.txt | 93 +++++++---- + Documentation/power/freezing-of-tasks.txt | 21 +++ + arch/x86/kernel/apm_32.c | 11 +- + drivers/base/power/domain.c | 157 +++++++++++++------ + drivers/base/power/generic_ops.c | 157 ++++++++++++------ + drivers/base/power/main.c | 247 ++++++++++++++++++++++++++--- + drivers/base/power/wakeup.c | 2 +- + drivers/devfreq/devfreq.c | 70 ++++++++ + drivers/devfreq/exynos4_bus.c | 17 +-- + drivers/devfreq/governor_performance.c | 5 +- + drivers/devfreq/governor_powersave.c | 2 +- + drivers/devfreq/governor_simpleondemand.c | 12 +- + drivers/devfreq/governor_userspace.c | 15 ++- + drivers/xen/manage.c | 6 +- + include/linux/devfreq.h | 9 +- + include/linux/pm.h | 58 ++++++- + include/linux/pm_domain.h | 6 +- + include/linux/pm_qos.h | 55 ++------ + include/linux/suspend.h | 4 + + kernel/kexec.c | 8 +- + kernel/power/Makefile | 3 +- + kernel/power/hibernate.c | 40 +++--- + kernel/power/main.c | 20 +-- + kernel/power/power.h | 7 +- + kernel/power/process.c | 16 +- + kernel/power/qos.c | 23 ++-- + kernel/power/snapshot.c | 7 +- + kernel/power/suspend.c | 84 +++++----- + kernel/power/user.c | 12 +- + 29 files changed, 812 insertions(+), 355 deletions(-) +Merging apm/for-next (b4a133d 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 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 (5a42394 Merge remote-tracking branch 'kepek/3.3-edac-dbam' into edac-for-next) +$ git merge edac-amd/for-next +Merge made by the 'recursive' strategy. + Documentation/edac.txt | 4 +- + drivers/edac/amd64_edac.c | 32 ++++++- + drivers/edac/edac_mc_sysfs.c | 4 +- + drivers/edac/mce_amd.c | 208 +++++++++++++----------------------------- + drivers/edac/mce_amd.h | 13 +-- + 5 files changed, 102 insertions(+), 159 deletions(-) +Merging devicetree/devicetree/next (5411972 arm/dts: OMAP3: Add omap3evm and am335xevm support) +$ git merge devicetree/devicetree/next +Auto-merging drivers/base/core.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/omap/omap.txt | 6 +++ + arch/arm/boot/dts/testcases/tests-phandle.dtsi | 2 + + arch/powerpc/kernel/ibmebus.c | 2 +- + drivers/base/core.c | 5 +++ + drivers/base/platform.c | 2 +- + drivers/macintosh/macio_asic.c | 2 +- + drivers/of/base.c | 36 ++++++++++++++++++++ + drivers/of/device.c | 30 +++++++++-------- + drivers/of/selftest.c | 29 ++++++++++++++++ + include/linux/of.h | 3 ++ + include/linux/of_device.h | 8 +++- + 11 files changed, 106 insertions(+), 19 deletions(-) +Merging spi/spi/next (14af60b spi/pl022: Add high priority message pump support) +$ git merge spi/spi/next +Merge made by the 'recursive' strategy. + drivers/spi/spi-nuc900.c | 2 - + drivers/spi/spi-pl022.c | 77 ++++++++++++++++++++---------- + drivers/spi/spi-s3c64xx.c | 114 +++++++++++++++++++++++++++++++++++++++---- + include/linux/amba/pl022.h | 3 + + 4 files changed, 158 insertions(+), 38 deletions(-) +Merging gpio/gpio/next (ff64abe of_gpio: add support of of_gpio_named_count to be able to count named gpio) +$ git merge gpio/gpio/next +Resolved 'include/linux/mfd/tps65910.h' using previous resolution. +Auto-merging include/linux/mfd/tps65910.h +CONFLICT (content): Merge conflict in include/linux/mfd/tps65910.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d62849f] Merge remote-tracking branch 'gpio/gpio/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/gpio/sodaville.txt | 48 +++ + arch/x86/platform/ce4100/falconfalls.dts | 7 +- + drivers/gpio/Kconfig | 14 + + drivers/gpio/Makefile | 2 + + drivers/gpio/gpio-mc9s08dz60.c | 161 +++++++++++ + drivers/gpio/gpio-sodaville.c | 302 ++++++++++++++++++++ + drivers/gpio/gpio-tps65910.c | 20 ++- + drivers/of/gpio.c | 9 +- + include/linux/mfd/tps65910.h | 8 + + include/linux/of_gpio.h | 27 ++- + 10 files changed, 588 insertions(+), 10 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/sodaville.txt + create mode 100644 drivers/gpio/gpio-mc9s08dz60.c + create mode 100644 drivers/gpio/gpio-sodaville.c +Merging tip/auto-latest (630e0fd Merge branch 'x86/urgent' into auto-latest) +$ git merge tip/auto-latest +Auto-merging kernel/sched/core.c +Auto-merging block/blk.h +Removing arch/x86/platform/mrst/pmu.h +Removing arch/x86/platform/mrst/pmu.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/arm/include/asm/perf_event.h +Removing Documentation/nmi_watchdog.txt +Merge made by the 'recursive' strategy. + Documentation/lockup-watchdogs.txt | 63 ++ + Documentation/nmi_watchdog.txt | 83 -- + Documentation/scheduler/sched-stats.txt | 3 +- + arch/arm/include/asm/perf_event.h | 4 - + arch/frv/include/asm/perf_event.h | 2 - + arch/hexagon/include/asm/perf_event.h | 2 - + arch/powerpc/include/asm/perf_event_server.h | 2 - + arch/powerpc/kernel/perf_event.c | 6 + + arch/s390/include/asm/perf_event.h | 1 - + arch/x86/Kconfig | 22 +- + arch/x86/boot/boot.h | 2 +- + arch/x86/include/asm/alternative.h | 6 + + arch/x86/include/asm/atomic64_32.h | 146 ++-- + arch/x86/include/asm/e820.h | 7 + + arch/x86/include/asm/efi.h | 5 - + arch/x86/include/asm/inat.h | 5 +- + arch/x86/include/asm/insn.h | 18 +- + arch/x86/include/asm/mrst.h | 4 +- + arch/x86/include/asm/perf_event.h | 2 - + arch/x86/include/asm/spinlock.h | 4 +- + arch/x86/include/asm/spinlock_types.h | 1 - + arch/x86/kernel/cpu/amd.c | 3 + + arch/x86/kernel/cpu/intel_cacheinfo.c | 44 +- + arch/x86/kernel/cpu/mcheck/mce-severity.c | 16 +- + arch/x86/kernel/cpu/mcheck/mce.c | 179 +++-- + arch/x86/kernel/cpu/perf_event.c | 82 ++ + arch/x86/kernel/cpu/perf_event.h | 8 + + arch/x86/kernel/crash.c | 8 - + arch/x86/kernel/e820.c | 3 +- + arch/x86/kernel/microcode_amd.c | 1 - + arch/x86/kernel/reboot.c | 277 ++++---- + arch/x86/kernel/setup.c | 21 +- + arch/x86/lib/atomic64_32.c | 59 +-- + arch/x86/lib/atomic64_386_32.S | 6 +- + arch/x86/lib/atomic64_cx8_32.S | 29 +- + arch/x86/lib/copy_page_64.S | 12 +- + arch/x86/lib/inat.c | 36 +- + arch/x86/lib/insn.c | 13 +- + arch/x86/lib/memcpy_64.S | 44 +- + arch/x86/lib/memset_64.S | 33 +- + arch/x86/platform/efi/efi.c | 37 +- + arch/x86/platform/efi/efi_64.c | 17 - + arch/x86/platform/mrst/Makefile | 1 - + arch/x86/platform/mrst/mrst.c | 70 +- + arch/x86/platform/mrst/pmu.c | 817 -------------------- + arch/x86/platform/mrst/pmu.h | 234 ------ + block/blk-softirq.c | 16 +- + block/blk.h | 16 - + drivers/base/memory.c | 2 +- + include/linux/jump_label.h | 32 + + include/linux/mm.h | 4 +- + include/linux/perf_event.h | 11 +- + include/linux/sched.h | 24 +- + include/trace/events/signal.h | 85 +-- + kernel/events/core.c | 53 +- + kernel/events/hw_breakpoint.c | 7 + + kernel/sched/core.c | 6 +- + kernel/sched/debug.c | 1 - + kernel/sched/fair.c | 24 +- + kernel/sched/sched.h | 1 - + kernel/sched/stats.c | 4 +- + kernel/signal.c | 28 +- + kernel/watchdog.c | 24 +- + lib/Kconfig.debug | 18 +- + mm/hwpoison-inject.c | 4 +- + mm/madvise.c | 2 +- + mm/memory-failure.c | 96 ++-- + tools/perf/Documentation/Makefile | 86 ++- + tools/perf/Documentation/perf-lock.txt | 20 +- + tools/perf/Documentation/perf-record.txt | 4 + + tools/perf/Documentation/perf-script.txt | 5 +- + tools/perf/Documentation/perf-top.txt | 4 + + tools/perf/Makefile | 5 +- + tools/perf/bench/bench.h | 1 + + tools/perf/bench/mem-memcpy-x86-64-asm-def.h | 8 + + tools/perf/bench/mem-memcpy-x86-64-asm.S | 6 +- + tools/perf/bench/mem-memcpy.c | 12 +- + tools/perf/bench/mem-memset-arch.h | 12 + + tools/perf/bench/mem-memset-x86-64-asm-def.h | 12 + + tools/perf/bench/mem-memset-x86-64-asm.S | 13 + + tools/perf/bench/mem-memset.c | 297 +++++++ + tools/perf/builtin-bench.c | 3 + + tools/perf/builtin-lock.c | 4 +- + tools/perf/builtin-probe.c | 12 +- + tools/perf/builtin-record.c | 40 +- + tools/perf/builtin-script.c | 80 ++- + tools/perf/builtin-stat.c | 12 +- + tools/perf/builtin-test.c | 185 +++++- + tools/perf/builtin-top.c | 22 +- + tools/perf/perf.h | 1 + + tools/perf/python/twatch.py | 2 +- + tools/perf/util/cpumap.c | 11 + + tools/perf/util/cpumap.h | 4 + + tools/perf/util/evlist.c | 12 +- + tools/perf/util/evlist.h | 7 +- + tools/perf/util/evsel.c | 2 +- + tools/perf/util/header.h | 1 + + tools/perf/util/hist.h | 1 + + tools/perf/util/include/asm/dwarf2.h | 4 +- + tools/perf/util/map.c | 15 + + tools/perf/util/map.h | 1 + + tools/perf/util/probe-event.c | 32 +- + tools/perf/util/probe-finder.c | 1 - + tools/perf/util/python.c | 10 +- + .../util/scripting-engines/trace-event-python.c | 1 - + tools/perf/util/session.c | 39 +- + tools/perf/util/session.h | 2 +- + tools/perf/util/symbol.c | 22 + + tools/perf/util/symbol.h | 4 + + tools/perf/util/thread_map.c | 109 +++- + tools/perf/util/thread_map.h | 7 +- + tools/perf/util/top.c | 3 + + tools/perf/util/top.h | 2 + + tools/perf/util/trace-event-parse.c | 1 - + tools/perf/util/trace-event-read.c | 1 - + tools/perf/util/trace-event-scripting.c | 1 - + tools/perf/util/ui/browsers/hists.c | 3 + + tools/perf/util/ui/browsers/map.c | 2 +- + tools/perf/util/usage.c | 39 + + tools/perf/util/util.h | 2 + + 120 files changed, 2026 insertions(+), 2055 deletions(-) + create mode 100644 Documentation/lockup-watchdogs.txt + delete mode 100644 Documentation/nmi_watchdog.txt + delete mode 100644 arch/x86/platform/mrst/pmu.c + delete mode 100644 arch/x86/platform/mrst/pmu.h + create mode 100644 tools/perf/bench/mem-memset-arch.h + create mode 100644 tools/perf/bench/mem-memset-x86-64-asm-def.h + create mode 100644 tools/perf/bench/mem-memset-x86-64-asm.S + create mode 100644 tools/perf/bench/mem-memset.c +Merging rcu/rcu/next (710fbb1 cpuidle: Inform RCU of read-side critical sections) +$ git merge rcu/rcu/next +Auto-merging net/mac80211/mesh_pathtbl.c +Auto-merging net/ipv4/ip_sockglue.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/rcutorture.c +Auto-merging include/linux/sched.h +Auto-merging arch/s390/kernel/irq.c +Merge made by the 'recursive' strategy. + Documentation/RCU/RTFP.txt | 1902 ++++++++++++++++++++++++++++++++++---- + Documentation/RCU/checklist.txt | 14 + + Documentation/RCU/stallwarn.txt | 87 ++- + Documentation/RCU/torture.txt | 33 +- + Documentation/RCU/trace.txt | 36 +- + arch/s390/kernel/irq.c | 9 +- + drivers/cpuidle/cpuidle.c | 12 +- + drivers/target/tcm_fc/tfc_sess.c | 12 +- + include/linux/rcupdate.h | 83 ++- + include/linux/rcutiny.h | 10 +- + include/linux/rcutree.h | 19 + + include/linux/sched.h | 3 +- + include/linux/srcu.h | 15 +- + include/trace/events/rcu.h | 63 +- + init/Kconfig | 9 - + kernel/lockdep.c | 8 +- + kernel/rcu.h | 26 +- + kernel/rcupdate.c | 5 + + kernel/rcutiny.c | 26 +- + kernel/rcutiny_plugin.h | 77 ++- + kernel/rcutorture.c | 91 ++- + kernel/rcutree.c | 507 ++++++++--- + kernel/rcutree.h | 27 +- + kernel/rcutree_plugin.h | 445 ++++++---- + kernel/rcutree_trace.c | 12 +- + kernel/srcu.c | 33 +- + lib/Kconfig.debug | 24 + + net/ipv4/cipso_ipv4.c | 11 +- + net/ipv4/ip_sockglue.c | 7 +- + net/mac80211/mesh_pathtbl.c | 8 +- + 30 files changed, 2970 insertions(+), 644 deletions(-) +Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show) +$ git merge cputime/cputime +Already up-to-date. +Merging uprobes/for-next (9efc679 perf: perf interface for uprobes) +$ git merge uprobes/for-next +Resolved 'tools/perf/builtin-probe.c' using previous resolution. +Resolved 'tools/perf/util/probe-event.c' using previous resolution. +Auto-merging tools/perf/util/symbol.h +Auto-merging tools/perf/util/symbol.c +Auto-merging tools/perf/util/probe-event.c +CONFLICT (content): Merge conflict in tools/perf/util/probe-event.c +Auto-merging tools/perf/builtin-probe.c +CONFLICT (content): Merge conflict in tools/perf/builtin-probe.c +Auto-merging mm/mmap.c +Auto-merging kernel/signal.c +Auto-merging kernel/fork.c +Auto-merging include/linux/sched.h +Auto-merging arch/x86/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master bf54f98] Merge remote-tracking branch 'uprobes/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/trace/uprobetracer.txt | 93 ++ + arch/Kconfig | 3 + + arch/x86/Kconfig | 5 +- + arch/x86/include/asm/thread_info.h | 2 + + arch/x86/include/asm/uprobes.h | 58 ++ + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/signal.c | 6 + + arch/x86/kernel/uprobes.c | 666 +++++++++++++ + include/linux/mm_types.h | 5 + + include/linux/sched.h | 4 + + include/linux/uprobes.h | 171 ++++ + kernel/Makefile | 1 + + kernel/fork.c | 15 + + kernel/signal.c | 3 + + kernel/trace/Kconfig | 20 + + kernel/trace/Makefile | 2 + + kernel/trace/trace.h | 5 + + kernel/trace/trace_kprobe.c | 899 +----------------- + kernel/trace/trace_probe.c | 786 ++++++++++++++++ + kernel/trace/trace_probe.h | 162 ++++ + kernel/trace/trace_uprobe.c | 772 +++++++++++++++ + kernel/uprobes.c | 1546 +++++++++++++++++++++++++++++++ + mm/mmap.c | 33 +- + tools/perf/Documentation/perf-probe.txt | 14 + + tools/perf/builtin-probe.c | 41 +- + tools/perf/util/probe-event.c | 415 +++++++-- + tools/perf/util/probe-event.h | 12 +- + tools/perf/util/symbol.c | 8 + + tools/perf/util/symbol.h | 1 + + 29 files changed, 4771 insertions(+), 978 deletions(-) + create mode 100644 Documentation/trace/uprobetracer.txt + create mode 100644 arch/x86/include/asm/uprobes.h + create mode 100644 arch/x86/kernel/uprobes.c + create mode 100644 include/linux/uprobes.h + create mode 100644 kernel/trace/trace_probe.c + create mode 100644 kernel/trace/trace_probe.h + create mode 100644 kernel/trace/trace_uprobe.c + create mode 100644 kernel/uprobes.c +Merging cgroup/for-next (761b3ef cgroup: remove cgroup_subsys argument from callbacks) +$ git merge cgroup/for-next +Auto-merging net/core/sock.c +Auto-merging net/core/netprio_cgroup.c +Auto-merging mm/memcontrol.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/events/core.c +Auto-merging kernel/cgroup.c +Auto-merging include/net/sock.h +Auto-merging block/blk-cgroup.c +Merge made by the 'recursive' strategy. + Documentation/cgroups/cgroups.txt | 26 ++-- + block/blk-cgroup.c | 22 +-- + include/linux/cgroup.h | 70 ++------- + include/net/sock.h | 7 +- + include/net/tcp_memcontrol.h | 2 +- + kernel/cgroup.c | 304 ++++++++++++++----------------------- + kernel/cgroup_freezer.c | 11 +- + kernel/cpuset.c | 16 +-- + kernel/events/core.c | 13 +- + kernel/sched/core.c | 20 +-- + mm/memcontrol.c | 48 +++---- + net/core/netprio_cgroup.c | 10 +- + net/core/sock.c | 6 +- + net/ipv4/tcp_memcontrol.c | 2 +- + net/sched/cls_cgroup.c | 10 +- + security/device_cgroup.c | 10 +- + 16 files changed, 208 insertions(+), 369 deletions(-) +Merging kmemleak/kmemleak (d65b4e9 Linux 3.3-rc3) +$ git merge kmemleak/kmemleak +Already up-to-date. +Merging kvm/linux-next (4b99f72 KVM: mmu_notifier: Flush TLBs before releasing mmu_lock) +$ git merge kvm/linux-next +Merge made by the 'recursive' strategy. + arch/s390/kvm/intercept.c | 20 ++++++++++++-------- + arch/s390/kvm/kvm-s390.c | 2 +- + arch/x86/kvm/x86.c | 11 +++++------ + virt/kvm/kvm_main.c | 19 ++++++++++--------- + 4 files changed, 28 insertions(+), 24 deletions(-) +Merging oprofile/for-next (42fcb11 Merge branch 'oprofile/perf-ibs-v4' into oprofile/for-next) +$ git merge oprofile/for-next +Resolved 'tools/perf/util/header.c' using previous resolution. +Auto-merging tools/perf/util/parse-events.c +Auto-merging tools/perf/util/header.h +Auto-merging tools/perf/util/header.c +CONFLICT (content): Merge conflict in tools/perf/util/header.c +Auto-merging arch/x86/include/asm/perf_event.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 413b39c] Merge remote-tracking branch 'oprofile/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/include/asm/msr-index.h | 5 + + arch/x86/include/asm/perf_event.h | 2 + + arch/x86/kernel/cpu/perf_event_amd_ibs.c | 438 +++++++++++++++++++++++++++++- + tools/perf/scripts/perl/bin/ibs-record | 23 ++ + tools/perf/scripts/perl/bin/ibs-report | 6 + + tools/perf/scripts/perl/ibs.pl | 47 ++++ + tools/perf/util/header.c | 443 +++++++++++++++++++----------- + tools/perf/util/header.h | 1 + + tools/perf/util/parse-events.c | 84 ++++++- + 9 files changed, 875 insertions(+), 174 deletions(-) + create mode 100644 tools/perf/scripts/perl/bin/ibs-record + create mode 100644 tools/perf/scripts/perl/bin/ibs-report + create mode 100644 tools/perf/scripts/perl/ibs.pl +Merging xen/upstream/xen (59e9a6b Merge branch 'upstream/ticketlock-cleanup' into upstream/xen) +$ git merge xen/upstream/xen +Resolved 'arch/x86/include/asm/cmpxchg.h' using previous resolution. +Auto-merging arch/x86/include/asm/cmpxchg.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/cmpxchg.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1dac20b] Merge remote-tracking branch 'xen/upstream/xen' +$ git diff -M --stat --summary HEAD^.. +Merging xen-two/linux-next (53eaea0 Merge branch 'stable/for-linus-fixes-3.3' into linux-next) +$ git merge xen-two/linux-next +Auto-merging drivers/xen/xen-pciback/pci_stub.c +Merge made by the 'recursive' strategy. + arch/x86/pci/xen.c | 29 ++++++++++++++++++++++++++++- + arch/x86/xen/enlighten.c | 6 +++--- + arch/x86/xen/irq.c | 8 ++++---- + arch/x86/xen/mmu.c | 20 ++++++++++---------- + arch/x86/xen/multicalls.h | 2 +- + arch/x86/xen/smp.c | 9 ++++++++- + drivers/pci/xen-pcifront.c | 10 +++++----- + drivers/xen/cpu_hotplug.c | 18 ++++++++++-------- + drivers/xen/xen-pciback/pci_stub.c | 8 ++++---- + drivers/xen/xen-pciback/xenbus.c | 5 +++-- + drivers/xen/xenbus/xenbus_dev_frontend.c | 4 ++++ + include/xen/interface/physdev.h | 7 +++++++ + 12 files changed, 87 insertions(+), 39 deletions(-) +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 (26dd8e0 percpu: use bitmap_clear) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. + mm/percpu-vm.c | 3 +-- + 1 files changed, 1 insertions(+), 2 deletions(-) +Merging workqueues/for-next (6b3da11 Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu) +$ git merge workqueues/for-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 (4e75732 sysctl: Don't call sysctl_follow_link unless we are a link.) +$ git merge sysctl/master +Recorded preimage for 'fs/proc/proc_sysctl.c' +Auto-merging lib/Kconfig.debug +Removing kernel/sysctl_check.c +Auto-merging kernel/sysctl.c +Auto-merging kernel/Makefile +Auto-merging fs/proc/proc_sysctl.c +CONFLICT (content): Merge conflict in fs/proc/proc_sysctl.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/proc/proc_sysctl.c'. +[master 4a772be] Merge remote-tracking branch 'sysctl/master' +$ git diff -M --stat --summary HEAD^.. + fs/proc/internal.h | 3 + + fs/proc/proc_sysctl.c | 1257 +++++++++++++++++++++++++++++++++++++++++++++--- + include/linux/sysctl.h | 106 +++-- + kernel/Makefile | 1 - + kernel/sysctl.c | 501 +------------------- + kernel/sysctl_check.c | 160 ------ + lib/Kconfig.debug | 8 - + net/sysctl_net.c | 24 +- + 8 files changed, 1264 insertions(+), 796 deletions(-) + delete mode 100644 kernel/sysctl_check.c +Merging regmap/for-next (902eb42 Merge branch 'regmap-bulk' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/internal.h | 9 ++- + drivers/base/regmap/regcache.c | 10 ++-- + drivers/base/regmap/regmap-debugfs.c | 9 +++ + drivers/base/regmap/regmap-i2c.c | 17 +++++ + drivers/base/regmap/regmap-spi.c | 17 +++++ + drivers/base/regmap/regmap.c | 131 ++++++++++++++++++++++++++++------ + include/linux/regmap.h | 10 +++ + 7 files changed, 173 insertions(+), 30 deletions(-) +Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt) +$ git merge hsi/for-next +Auto-merging include/linux/Kbuild +Auto-merging drivers/Makefile +Auto-merging drivers/Kconfig +Auto-merging Documentation/ioctl/ioctl-number.txt +Auto-merging Documentation/DocBook/device-drivers.tmpl +Merge made by the 'recursive' strategy. + Documentation/DocBook/device-drivers.tmpl | 17 + + Documentation/ioctl/ioctl-number.txt | 1 + + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/hsi/Kconfig | 19 + + drivers/hsi/Makefile | 6 + + drivers/hsi/clients/Kconfig | 13 + + drivers/hsi/clients/Makefile | 5 + + drivers/hsi/clients/hsi_char.c | 802 +++++++++++++++++++++++++++++ + drivers/hsi/hsi.c | 494 ++++++++++++++++++ + drivers/hsi/hsi_boardinfo.c | 62 +++ + drivers/hsi/hsi_core.h | 35 ++ + include/linux/Kbuild | 1 + + include/linux/hsi/Kbuild | 1 + + include/linux/hsi/hsi.h | 410 +++++++++++++++ + include/linux/hsi/hsi_char.h | 63 +++ + 16 files changed, 1932 insertions(+), 0 deletions(-) + create mode 100644 drivers/hsi/Kconfig + create mode 100644 drivers/hsi/Makefile + create mode 100644 drivers/hsi/clients/Kconfig + create mode 100644 drivers/hsi/clients/Makefile + create mode 100644 drivers/hsi/clients/hsi_char.c + create mode 100644 drivers/hsi/hsi.c + create mode 100644 drivers/hsi/hsi_boardinfo.c + create mode 100644 drivers/hsi/hsi_core.h + create mode 100644 include/linux/hsi/Kbuild + create mode 100644 include/linux/hsi/hsi.h + create mode 100644 include/linux/hsi/hsi_char.h +Merging driver-core/driver-core-next (b4d2d23 powernow-k6: Really enable auto-loading) +$ git merge driver-core/driver-core-next +Resolved 'drivers/base/cpu.c' using previous resolution. +Auto-merging scripts/mod/file2alias.c +Auto-merging include/linux/pci.h +Auto-merging include/linux/hyperv.h +Auto-merging fs/sysfs/mount.c +Auto-merging drivers/ssb/main.c +Auto-merging drivers/pcmcia/ds.c +Auto-merging drivers/pci/xen-pcifront.c +Auto-merging drivers/pci/pci-driver.c +Auto-merging drivers/hwmon/coretemp.c +Removing drivers/hv/hv_kvp.h +Auto-merging drivers/hid/hid-core.c +Auto-merging drivers/base/cpu.c +CONFLICT (content): Merge conflict in drivers/base/cpu.c +Auto-merging drivers/acpi/processor_driver.c +Auto-merging arch/x86/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d07d709] Merge remote-tracking branch 'driver-core/driver-core-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-devices-soc | 58 ++++++ + Documentation/dynamic-debug-howto.txt | 30 ++-- + Documentation/filesystems/debugfs.txt | 5 +- + arch/x86/Kconfig | 3 + + arch/x86/crypto/aesni-intel_glue.c | 12 +- + arch/x86/crypto/crc32c-intel.c | 11 +- + arch/x86/crypto/ghash-clmulni-intel_glue.c | 12 +- + arch/x86/include/asm/cpu_device_id.h | 13 ++ + arch/x86/include/asm/cpufeature.h | 1 + + arch/x86/kernel/cpu/Makefile | 1 + + arch/x86/kernel/cpu/match.c | 91 +++++++++ + arch/x86/kernel/cpu/scattered.c | 1 + + arch/x86/kernel/microcode_core.c | 15 ++ + drivers/acpi/processor_driver.c | 1 + + drivers/acpi/processor_perflib.c | 22 +++ + drivers/base/Kconfig | 3 + + drivers/base/Makefile | 1 + + drivers/base/bus.c | 6 +- + drivers/base/cpu.c | 11 + + drivers/base/driver.c | 35 +--- + drivers/base/soc.c | 183 ++++++++++++++++++ + drivers/cpufreq/cpufreq-nforce2.c | 8 + + drivers/cpufreq/e_powersaver.c | 20 +- + drivers/cpufreq/elanfreq.c | 14 +- + drivers/cpufreq/gx-suspmod.c | 9 +- + drivers/cpufreq/longhaul.c | 8 +- + drivers/cpufreq/longrun.c | 13 +- + drivers/cpufreq/p4-clockmod.c | 17 +- + drivers/cpufreq/powernow-k6.c | 12 +- + drivers/cpufreq/powernow-k7.c | 14 +- + drivers/cpufreq/powernow-k8.c | 19 ++- + drivers/cpufreq/sc520_freq.c | 14 +- + drivers/cpufreq/speedstep-centrino.c | 24 ++- + drivers/cpufreq/speedstep-ich.c | 15 ++ + drivers/cpufreq/speedstep-lib.c | 1 + + drivers/cpufreq/speedstep-smi.c | 15 ++ + drivers/crypto/padlock-aes.c | 9 +- + drivers/crypto/padlock-sha.c | 16 +- + drivers/hid/hid-core.c | 6 +- + drivers/hv/channel_mgmt.c | 87 --------- + drivers/hv/hv.c | 4 +- + drivers/hv/hv_kvp.c | 43 +++-- + drivers/hv/hv_kvp.h | 184 ------------------ + drivers/hv/hv_util.c | 3 - + drivers/hv/hyperv_vmbus.h | 5 +- + drivers/hwmon/coretemp.c | 17 ++- + drivers/hwmon/via-cputemp.c | 16 +- + drivers/idle/intel_idle.c | 116 +++++++----- + drivers/input/gameport/gameport.c | 1 - + drivers/input/serio/serio.c | 1 - + drivers/media/video/cx18/cx18-alsa-main.c | 1 - + drivers/media/video/ivtv/ivtvfb.c | 2 - + drivers/media/video/s5p-fimc/fimc-mdevice.c | 5 +- + drivers/media/video/s5p-tv/mixer_video.c | 1 - + drivers/net/phy/phy_device.c | 6 +- + drivers/pci/pci-driver.c | 52 ++---- + drivers/pci/xen-pcifront.c | 3 +- + drivers/pcmcia/ds.c | 11 +- + drivers/s390/cio/ccwgroup.c | 2 - + drivers/s390/cio/device.c | 8 +- + drivers/s390/net/smsgiucv_app.c | 9 +- + drivers/ssb/main.c | 20 +-- + drivers/usb/core/driver.c | 66 ++----- + drivers/usb/dwc3/dwc3-pci.c | 12 +- + drivers/w1/masters/w1-gpio.c | 3 +- + fs/debugfs/inode.c | 149 +++++++++++++++- + fs/sysfs/dir.c | 228 ++++++++++++----------- + fs/sysfs/inode.c | 3 - + fs/sysfs/mount.c | 2 +- + fs/sysfs/sysfs.h | 18 +- + include/acpi/processor.h | 1 + + include/linux/connector.h | 1 + + include/linux/cpu.h | 7 + + include/linux/device.h | 10 +- + include/linux/dynamic_debug.h | 19 +- + include/linux/hyperv.h | 146 +++++++++++++++ + include/linux/mod_devicetable.h | 21 ++ + include/linux/netdevice.h | 8 +- + include/linux/pci.h | 13 ++ + include/linux/printk.h | 8 +- + include/linux/sys_soc.h | 37 ++++ + lib/dma-debug.c | 3 +- + lib/dynamic_debug.c | 270 ++++++++++++++++++-------- + scripts/mod/file2alias.c | 25 +++ + tools/hv/hv_kvp_daemon.c | 62 ++----- + 85 files changed, 1543 insertions(+), 915 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-devices-soc + create mode 100644 arch/x86/include/asm/cpu_device_id.h + create mode 100644 arch/x86/kernel/cpu/match.c + create mode 100644 drivers/base/soc.c + delete mode 100644 drivers/hv/hv_kvp.h + create mode 100644 include/linux/sys_soc.h +Merging tty/tty-next (6816383 tty: sparc: rename drivers/tty/serial/suncore.h -> include/linux/sunserialcore.h) +$ git merge tty/tty-next +Auto-merging include/linux/sunserialcore.h +Auto-merging fs/devpts/inode.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/tty/serial/efm32-uart.txt | 14 + + MAINTAINERS | 2 +- + drivers/isdn/capi/capi.c | 9 +- + drivers/misc/pti.c | 6 +- + drivers/mmc/card/sdio_uart.c | 9 +- + drivers/tty/hvc/hvc_beat.c | 2 +- + drivers/tty/hvc/hvc_rtas.c | 2 +- + drivers/tty/hvc/hvc_udbg.c | 2 +- + drivers/tty/hvc/hvc_xen.c | 2 +- + drivers/tty/hvc/hvcs.c | 4 +- + drivers/tty/hvc/hvsi.c | 2 +- + drivers/tty/nozomi.c | 8 +- + drivers/tty/pty.c | 68 +-- + drivers/tty/serial/21285.c | 4 +- + drivers/tty/serial/8250/8250.c | 28 +- + drivers/tty/serial/Kconfig | 13 + + drivers/tty/serial/Makefile | 3 +- + drivers/tty/serial/altera_uart.c | 47 +- + drivers/tty/serial/efm32-uart.c | 830 ++++++++++++++++++++ + drivers/tty/serial/m32r_sio.c | 11 +- + drivers/tty/serial/mpc52xx_uart.c | 4 +- + drivers/tty/serial/mux.c | 2 +- + drivers/tty/serial/pch_uart.c | 115 ++- + drivers/tty/serial/pmac_zilog.c | 2 +- + drivers/tty/serial/suncore.c | 2 +- + drivers/tty/serial/sunhv.c | 3 +- + drivers/tty/serial/sunsab.c | 2 +- + drivers/tty/serial/sunsu.c | 3 +- + drivers/tty/serial/sunzilog.c | 12 +- + drivers/tty/serial/ucc_uart.c | 2 +- + drivers/tty/serial/vr41xx_siu.c | 4 +- + drivers/tty/sysrq.c | 11 +- + drivers/tty/tty_io.c | 44 +- + drivers/usb/serial/usb-serial.c | 16 +- + fs/devpts/inode.c | 85 ++- + include/linux/altera_uart.h | 4 - + include/linux/platform_data/efm32-uart.h | 18 + + include/linux/serial_core.h | 2 + + .../suncore.h => include/linux/sunserialcore.h | 2 +- + include/linux/tty.h | 6 +- + 40 files changed, 1162 insertions(+), 243 deletions(-) + create mode 100644 Documentation/devicetree/bindings/tty/serial/efm32-uart.txt + create mode 100644 drivers/tty/serial/efm32-uart.c + create mode 100644 include/linux/platform_data/efm32-uart.h + rename drivers/tty/serial/suncore.h => include/linux/sunserialcore.h (98%) +Merging usb/usb-next (03a41f3 Merge tag 'for-usb-next-2012-02-14' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-next) +$ git merge usb/usb-next +Auto-merging drivers/usb/core/driver.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-usb | 11 + + drivers/scsi/scsi_scan.c | 4 + + drivers/scsi/sd.c | 2 +- + drivers/usb/Kconfig | 1 + + drivers/usb/class/cdc-wdm.c | 119 ++++++------ + drivers/usb/core/driver.c | 120 ++++++++---- + drivers/usb/core/hub.c | 202 +++++++++++++++----- + drivers/usb/core/sysfs.c | 23 +++ + drivers/usb/core/urb.c | 21 +-- + drivers/usb/core/usb.c | 2 +- + drivers/usb/core/usb.h | 1 + + drivers/usb/host/ehci-fsl.c | 14 ++ + drivers/usb/host/ehci-fsl.h | 2 + + drivers/usb/host/ehci-hcd.c | 5 + + drivers/usb/host/ehci-ls1x.c | 159 +++++++++++++++ + drivers/usb/host/imx21-dbg.c | 2 +- + drivers/usb/host/uhci-hcd.c | 3 + + drivers/usb/host/xhci-hub.c | 41 ++++ + drivers/usb/host/xhci-mem.c | 11 +- + drivers/usb/host/xhci-ring.c | 74 ++++++-- + drivers/usb/host/xhci.h | 1 + + drivers/usb/serial/cp210x.c | 13 +- + drivers/usb/serial/cypress_m8.c | 2 +- + drivers/usb/serial/digi_acceleport.c | 4 +- + drivers/usb/serial/generic.c | 2 +- + drivers/usb/serial/io_edgeport.c | 4 +- + drivers/usb/serial/io_ti.c | 4 +- + drivers/usb/serial/mos7720.c | 4 +- + drivers/usb/serial/mos7840.c | 4 +- + drivers/usb/serial/omninet.c | 2 +- + drivers/usb/serial/oti6858.c | 6 +- + drivers/usb/serial/ti_usb_3410_5052.c | 5 +- + drivers/usb/serial/whiteheat.c | 2 +- + drivers/usb/storage/alauda.c | 1 + + drivers/usb/storage/cypress_atacb.c | 1 + + drivers/usb/storage/datafab.c | 1 + + drivers/usb/storage/ene_ub6250.c | 1 + + drivers/usb/storage/freecom.c | 1 + + drivers/usb/storage/isd200.c | 1 + + drivers/usb/storage/jumpshot.c | 1 + + drivers/usb/storage/karma.c | 1 + + drivers/usb/storage/onetouch.c | 1 + + drivers/usb/storage/realtek_cr.c | 1 + + drivers/usb/storage/scsiglue.c | 55 +++--- + drivers/usb/storage/sddr09.c | 1 + + drivers/usb/storage/sddr55.c | 1 + + drivers/usb/storage/shuttle_usbat.c | 1 + + drivers/usb/storage/uas.c | 328 ++++++++++++++++++++----------- + drivers/usb/storage/usb.c | 21 ++- + include/linux/usb.h | 8 + + include/linux/usb/ch11.h | 5 + + include/linux/usb/hcd.h | 2 + + include/linux/usb/serial.h | 15 ++ + include/linux/usb/uas.h | 69 +++++++ + include/scsi/scsi_device.h | 7 +- + 55 files changed, 1045 insertions(+), 348 deletions(-) + create mode 100644 drivers/usb/host/ehci-ls1x.c + create mode 100644 include/linux/usb/uas.h +Merging staging/staging-next (00da8ed Staging: bcm: Move directives for the preprocessor statement to enum value in led_control.h) +$ git merge staging/staging-next +Removing drivers/staging/zram/xvmalloc_int.h +Removing drivers/staging/zram/xvmalloc.h +Removing drivers/staging/zram/xvmalloc.c +Removing drivers/staging/tidspbridge/rmgr/drv_interface.h +Removing drivers/staging/tidspbridge/include/dspbridge/dbc.h +Removing drivers/staging/sep/sep_driver.c +Auto-merging drivers/staging/mei/interrupt.c +Removing drivers/staging/hv/TODO +Removing drivers/staging/hv/Makefile +Removing drivers/staging/hv/Kconfig +Auto-merging drivers/scsi/storvsc_drv.c +Auto-merging drivers/Makefile +Auto-merging drivers/Kconfig +Merge made by the 'recursive' strategy. + drivers/Kconfig | 2 - + drivers/Makefile | 1 - + drivers/scsi/Kconfig | 7 + + drivers/scsi/Makefile | 3 + + drivers/{staging/hv => scsi}/storvsc_drv.c | 1300 +++--- + drivers/staging/Kconfig | 6 +- + drivers/staging/Makefile | 4 +- + drivers/staging/android/Kconfig | 26 + + drivers/staging/android/Makefile | 2 + + drivers/staging/android/TODO | 2 +- + drivers/staging/android/alarm-dev.c | 297 ++ + drivers/staging/android/alarm.c | 601 +++ + drivers/staging/android/android_alarm.h | 121 + + drivers/staging/android/ashmem.c | 4 +- + drivers/staging/android/binder.c | 2 +- + drivers/staging/android/logger.c | 73 +- + drivers/staging/android/lowmemorykiller.c | 75 +- + drivers/staging/android/ram_console.c | 7 +- + drivers/staging/android/timed_gpio.c | 6 +- + drivers/staging/bcm/Bcmchar.c | 41 +- + drivers/staging/bcm/CmHost.c | 3094 ++++++-------- + drivers/staging/bcm/led_control.h | 80 +- + drivers/staging/comedi/Kconfig | 5 +- + drivers/staging/comedi/drivers/adv_pci_dio.c | 29 +- + drivers/staging/comedi/drivers/dt2801.c | 12 +- + drivers/staging/comedi/drivers/dt9812.c | 4 +- + drivers/staging/comedi/drivers/me4000.c | 12 +- + drivers/staging/comedi/drivers/ni_pcidio.c | 61 +- + drivers/staging/comedi/drivers/ni_pcimio.c | 27 +- + drivers/staging/crystalhd/crystalhd_hw.c | 3 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c | 6 +- + drivers/staging/hv/Kconfig | 5 - + drivers/staging/hv/Makefile | 3 - + drivers/staging/hv/TODO | 5 - + .../staging/iio/Documentation/iio_event_monitor.c | 241 ++ + drivers/staging/iio/Makefile | 2 +- + drivers/staging/iio/accel/adis16201_ring.c | 2 - + drivers/staging/iio/accel/adis16203_ring.c | 2 - + drivers/staging/iio/accel/adis16204_ring.c | 2 - + drivers/staging/iio/accel/adis16209_ring.c | 2 - + drivers/staging/iio/accel/adis16240_ring.c | 2 - + drivers/staging/iio/accel/lis3l02dq.h | 2 - + drivers/staging/iio/accel/lis3l02dq_ring.c | 2 - + drivers/staging/iio/adc/ad7192.c | 45 +- + drivers/staging/iio/adc/ad7291.c | 14 +- + drivers/staging/iio/adc/ad7298_ring.c | 3 - + drivers/staging/iio/adc/ad7476_ring.c | 2 - + drivers/staging/iio/adc/ad7606_core.c | 83 +- + drivers/staging/iio/adc/ad7606_ring.c | 2 - + drivers/staging/iio/adc/ad7793.c | 2 - + drivers/staging/iio/adc/ad7887_ring.c | 2 - + drivers/staging/iio/adc/ad799x_core.c | 4 +- + drivers/staging/iio/adc/ad799x_ring.c | 2 - + drivers/staging/iio/adc/adt7310.c | 21 +- + drivers/staging/iio/adc/adt7410.c | 21 +- + drivers/staging/iio/adc/max1363_core.c | 12 +- + drivers/staging/iio/adc/max1363_ring.c | 2 - + drivers/staging/iio/cdc/ad7150.c | 10 +- + drivers/staging/iio/dac/ad5360.c | 4 +- + drivers/staging/iio/dac/ad5380.c | 4 +- + drivers/staging/iio/dac/ad5446.c | 33 +- + drivers/staging/iio/dds/ad9834.c | 53 +- + drivers/staging/iio/events.h | 4 +- + drivers/staging/iio/gyro/adis16260_ring.c | 2 - + drivers/staging/iio/iio_core.h | 4 + + drivers/staging/iio/iio_simple_dummy_buffer.c | 2 - + drivers/staging/iio/impedance-analyzer/ad5933.c | 3 - + drivers/staging/iio/imu/adis16400_ring.c | 2 - + drivers/staging/iio/industrialio-core.c | 458 -- + drivers/staging/iio/industrialio-event.c | 453 ++ + drivers/staging/iio/kfifo_buf.c | 46 +- + drivers/staging/iio/kfifo_buf.h | 2 - + drivers/staging/iio/light/isl29018.c | 7 + + drivers/staging/iio/magnetometer/ak8975.c | 8 + + drivers/staging/iio/meter/ade7758_ring.c | 2 - + drivers/staging/iio/ring_sw.c | 22 +- + drivers/staging/iio/ring_sw.h | 5 - + drivers/staging/line6/capture.c | 54 +- + drivers/staging/line6/capture.h | 2 +- + drivers/staging/line6/driver.c | 2 +- + drivers/staging/line6/pcm.c | 109 +- + drivers/staging/line6/pcm.h | 167 +- + drivers/staging/line6/playback.c | 68 +- + drivers/staging/line6/playback.h | 2 +- + drivers/staging/line6/toneport.c | 12 +- + drivers/staging/line6/usbdefs.h | 44 +- + drivers/staging/media/easycap/easycap_main.c | 1 + + drivers/staging/mei/TODO | 3 + + drivers/staging/mei/hw.h | 2 +- + drivers/staging/mei/init.c | 2 +- + drivers/staging/mei/interface.c | 25 +- + drivers/staging/mei/interface.h | 5 +- + drivers/staging/mei/interrupt.c | 18 +- + drivers/staging/mei/iorw.c | 2 +- + drivers/staging/mei/main.c | 2 +- + drivers/staging/mei/mei-amt-version.c | 479 +++ + drivers/staging/mei/mei.h | 125 +- + drivers/staging/mei/mei_dev.h | 8 +- + drivers/staging/mei/mei_version.h | 2 +- + drivers/staging/mei/wd.c | 2 +- + drivers/staging/nvec/Kconfig | 6 +- + drivers/staging/nvec/nvec.c | 19 +- + drivers/staging/nvec/nvec_ps2.c | 53 +- + drivers/staging/omapdrm/omap_gem_helpers.c | 2 +- + drivers/staging/quickstart/quickstart.c | 370 +- + drivers/staging/rtl8192e/rtllib_rx.c | 2 +- + drivers/staging/rtl8712/Kconfig | 7 - + drivers/staging/rtl8712/drv_types.h | 1 - + drivers/staging/rtl8712/os_intfs.c | 1 - + drivers/staging/rtl8712/osdep_service.h | 17 - + drivers/staging/rtl8712/rtl8712_recv.c | 2 - + drivers/staging/rtl8712/rtl871x_io.c | 1 - + drivers/staging/rtl8712/rtl871x_io.h | 1 - + drivers/staging/rtl8712/rtl871x_pwrctrl.c | 11 +- + drivers/staging/rtl8712/rtl871x_pwrctrl.h | 1 - + drivers/staging/rtl8712/rtl871x_recv.c | 1 - + drivers/staging/rtl8712/rtl871x_recv.h | 3 - + drivers/staging/rtl8712/rtl871x_sta_mgt.c | 4 - + drivers/staging/rtl8712/rtl871x_xmit.c | 3 - + drivers/staging/rtl8712/rtl871x_xmit.h | 3 - + drivers/staging/rtl8712/sta_info.h | 4 - + drivers/staging/rtl8712/usb_intf.c | 1 - + drivers/staging/rts5139/ms.h | 4 +- + drivers/staging/rts5139/rts51x_chip.c | 14 +- + drivers/staging/rts5139/rts51x_chip.h | 6 +- + drivers/staging/rts5139/rts51x_fop.h | 2 +- + drivers/staging/rts5139/rts51x_transport.c | 2 +- + drivers/staging/rts5139/rts51x_transport.h | 2 +- + drivers/staging/rts5139/sd_cprm.c | 2 +- + drivers/staging/sbe-2t3e3/intr.c | 2 +- + drivers/staging/sep/Kconfig | 3 +- + drivers/staging/sep/Makefile | 5 +- + drivers/staging/sep/TODO | 5 +- + drivers/staging/sep/sep_crypto.c | 4058 ++++++++++++++++++ + drivers/staging/sep/sep_crypto.h | 359 ++ + drivers/staging/sep/sep_dev.h | 98 +- + drivers/staging/sep/sep_driver.c | 2932 ------------- + drivers/staging/sep/sep_driver_api.h | 293 ++- + drivers/staging/sep/sep_driver_config.h | 79 +- + drivers/staging/sep/sep_driver_hw_defs.h | 185 +- + drivers/staging/sep/sep_main.c | 4518 ++++++++++++++++++++ + drivers/staging/sep/sep_trace_events.h | 188 + + drivers/staging/sm7xx/smtcfb.c | 2 +- + drivers/staging/sm7xx/smtcfb.h | 2 +- + drivers/{ => staging}/telephony/Kconfig | 0 + drivers/{ => staging}/telephony/Makefile | 0 + drivers/staging/telephony/TODO | 10 + + drivers/{ => staging}/telephony/ixj-ver.h | 0 + drivers/{ => staging}/telephony/ixj.c | 0 + drivers/{ => staging}/telephony/ixj.h | 0 + drivers/{ => staging}/telephony/ixj_pcmcia.c | 0 + drivers/{ => staging}/telephony/phonedev.c | 0 + drivers/staging/tidspbridge/Kconfig | 6 - + drivers/staging/tidspbridge/Makefile | 4 +- + drivers/staging/tidspbridge/core/chnl_sm.c | 34 +- + drivers/staging/tidspbridge/core/dsp-clock.c | 3 - + drivers/staging/tidspbridge/core/io_sm.c | 29 +- + drivers/staging/tidspbridge/core/msg_sm.c | 3 - + drivers/staging/tidspbridge/core/tiomap3430.c | 9 - + drivers/staging/tidspbridge/core/tiomap3430_pwr.c | 1 - + drivers/staging/tidspbridge/core/tiomap_io.c | 18 - + drivers/staging/tidspbridge/gen/uuidutil.c | 7 - + .../staging/tidspbridge/include/dspbridge/dbc.h | 46 - + .../staging/tidspbridge/include/dspbridge/io_sm.h | 2 - + drivers/staging/tidspbridge/pmgr/chnl.c | 19 - + drivers/staging/tidspbridge/pmgr/cmm.c | 68 +- + drivers/staging/tidspbridge/pmgr/cod.c | 74 - + drivers/staging/tidspbridge/pmgr/dbll.c | 113 +- + drivers/staging/tidspbridge/pmgr/dev.c | 132 - + drivers/staging/tidspbridge/pmgr/dmm.c | 14 - + drivers/staging/tidspbridge/pmgr/dspapi.c | 7 - + drivers/staging/tidspbridge/pmgr/io.c | 17 - + drivers/staging/tidspbridge/pmgr/msg.c | 17 - + drivers/staging/tidspbridge/rmgr/dbdcd.c | 88 - + drivers/staging/tidspbridge/rmgr/disp.c | 44 - + drivers/staging/tidspbridge/rmgr/drv.c | 48 - + drivers/staging/tidspbridge/rmgr/drv_interface.c | 357 +- + drivers/staging/tidspbridge/rmgr/drv_interface.h | 28 - + drivers/staging/tidspbridge/rmgr/dspdrv.c | 5 - + drivers/staging/tidspbridge/rmgr/mgr.c | 36 - + drivers/staging/tidspbridge/rmgr/nldr.c | 71 - + drivers/staging/tidspbridge/rmgr/node.c | 98 - + drivers/staging/tidspbridge/rmgr/proc.c | 91 - + drivers/staging/tidspbridge/rmgr/rmm.c | 36 - + drivers/staging/tidspbridge/rmgr/strm.c | 86 +- + drivers/staging/usbip/stub.h | 1 - + drivers/staging/usbip/stub_rx.c | 9 - + drivers/staging/usbip/usbip_common.c | 11 +- + drivers/staging/usbip/usbip_common.h | 2 +- + drivers/staging/usbip/vhci_hcd.c | 39 - + drivers/staging/usbip/vhci_rx.c | 3 +- + drivers/staging/vme/vme.h | 2 +- + drivers/staging/vt6655/ioctl.c | 23 +- + drivers/staging/vt6656/iwctl.c | 230 +- + drivers/staging/vt6656/iwctl.h | 13 +- + drivers/staging/vt6656/main_usb.c | 13 +- + drivers/staging/vt6656/wpactl.c | 937 ++--- + drivers/staging/wlan-ng/prism2mgmt.c | 1 + + drivers/staging/xgifb/XGI_main.h | 78 +- + drivers/staging/xgifb/XGI_main_26.c | 208 +- + drivers/staging/xgifb/XGIfb.h | 2 +- + drivers/staging/xgifb/vb_def.h | 178 +- + drivers/staging/xgifb/vb_init.c | 20 +- + drivers/staging/xgifb/vb_setmode.c | 836 ++-- + drivers/staging/xgifb/vb_struct.h | 79 +- + drivers/staging/xgifb/vb_table.h | 346 +- + drivers/staging/xgifb/vgatypes.h | 9 + + drivers/staging/zcache/Kconfig | 11 +- + drivers/staging/zcache/zcache-main.c | 231 +- + drivers/staging/zram/Kconfig | 10 +- + drivers/staging/zram/Makefile | 1 - + drivers/staging/zram/xvmalloc.c | 510 --- + drivers/staging/zram/xvmalloc.h | 30 - + drivers/staging/zram/xvmalloc_int.h | 95 - + drivers/staging/zram/zram_drv.c | 116 +- + drivers/staging/zram/zram_drv.h | 12 +- + drivers/staging/zram/zram_sysfs.c | 4 +- + drivers/staging/zsmalloc/Kconfig | 14 + + drivers/staging/zsmalloc/Makefile | 3 + + drivers/staging/zsmalloc/zsmalloc-main.c | 757 ++++ + drivers/staging/zsmalloc/zsmalloc.h | 31 + + drivers/staging/zsmalloc/zsmalloc_int.h | 126 + + 222 files changed, 17381 insertions(+), 11163 deletions(-) + rename drivers/{staging/hv => scsi}/storvsc_drv.c (84%) + create mode 100644 drivers/staging/android/alarm-dev.c + create mode 100644 drivers/staging/android/alarm.c + create mode 100644 drivers/staging/android/android_alarm.h + delete mode 100644 drivers/staging/hv/Kconfig + delete mode 100644 drivers/staging/hv/Makefile + delete mode 100644 drivers/staging/hv/TODO + create mode 100644 drivers/staging/iio/Documentation/iio_event_monitor.c + create mode 100644 drivers/staging/iio/industrialio-event.c + create mode 100644 drivers/staging/mei/mei-amt-version.c + create mode 100644 drivers/staging/sep/sep_crypto.c + create mode 100644 drivers/staging/sep/sep_crypto.h + delete mode 100644 drivers/staging/sep/sep_driver.c + create mode 100644 drivers/staging/sep/sep_main.c + create mode 100644 drivers/staging/sep/sep_trace_events.h + rename drivers/{ => staging}/telephony/Kconfig (100%) + rename drivers/{ => staging}/telephony/Makefile (100%) + create mode 100644 drivers/staging/telephony/TODO + rename drivers/{ => staging}/telephony/ixj-ver.h (100%) + rename drivers/{ => staging}/telephony/ixj.c (100%) + rename drivers/{ => staging}/telephony/ixj.h (100%) + rename drivers/{ => staging}/telephony/ixj_pcmcia.c (100%) + rename drivers/{ => staging}/telephony/phonedev.c (100%) + delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/dbc.h + delete mode 100644 drivers/staging/tidspbridge/rmgr/drv_interface.h + delete mode 100644 drivers/staging/zram/xvmalloc.c + delete mode 100644 drivers/staging/zram/xvmalloc.h + delete mode 100644 drivers/staging/zram/xvmalloc_int.h + create mode 100644 drivers/staging/zsmalloc/Kconfig + create mode 100644 drivers/staging/zsmalloc/Makefile + create mode 100644 drivers/staging/zsmalloc/zsmalloc-main.c + create mode 100644 drivers/staging/zsmalloc/zsmalloc.h + create mode 100644 drivers/staging/zsmalloc/zsmalloc_int.h +Merging char-misc/char-misc-next (838d51b char: Fix typo in tlclk.c) +$ git merge char-misc/char-misc-next +Auto-merging drivers/misc/cs5535-mfgpt.c +Merge made by the 'recursive' strategy. + drivers/misc/ad525x_dpot-i2c.c | 12 +----------- + drivers/misc/ad525x_dpot-spi.c | 12 +----------- + drivers/misc/apds9802als.c | 12 +----------- + drivers/misc/apds990x.c | 13 +------------ + drivers/misc/bh1770glc.c | 13 +------------ + drivers/misc/bh1780gli.c | 15 ++------------- + drivers/misc/bmp085.c | 14 +------------- + drivers/misc/carma/carma-fpga.c | 17 +---------------- + drivers/misc/cs5535-mfgpt.c | 2 +- + drivers/misc/ds1682.c | 13 +------------ + drivers/misc/eeprom/at25.c | 12 +----------- + drivers/misc/eeprom/eeprom.c | 14 +------------- + drivers/misc/eeprom/eeprom_93xx46.c | 12 +----------- + drivers/misc/eeprom/max6875.c | 14 +------------- + drivers/misc/fsa9480.c | 12 +----------- + drivers/misc/hmc6352.c | 13 +------------ + drivers/misc/ics932s401.c | 13 +------------ + drivers/misc/isl29003.c | 14 +------------- + drivers/misc/isl29020.c | 13 +------------ + drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 13 +------------ + drivers/misc/lis3lv02d/lis3lv02d_spi.c | 13 +------------ + drivers/misc/max8997-muic.c | 12 +----------- + drivers/misc/spear13xx_pcie_gadget.c | 12 +----------- + drivers/misc/ti-st/st_kim.c | 13 +------------ + drivers/misc/ti_dac7512.c | 13 +------------ + drivers/misc/tsl2550.c | 13 +------------ + 26 files changed, 27 insertions(+), 302 deletions(-) +Merging arm-soc/for-next (69bae69 Merge branch 'next/soc2' into for-next) +$ git merge arm-soc/for-next +Auto-merging arch/arm/mach-ux500/board-mop500-sdi.c +Removing arch/arm/mach-nomadik/include/mach/setup.h +Removing arch/arm/mach-highbank/include/mach/memory.h +Removing arch/arm/mach-at91/include/mach/at91cap9_matrix.h +Removing arch/arm/mach-at91/include/mach/at91cap9.h +Removing arch/arm/mach-at91/board-cap9adk.c +Removing arch/arm/mach-at91/at91cap9_devices.c +Removing arch/arm/mach-at91/at91cap9.c +Removing arch/arm/configs/at91cap9_defconfig +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + Documentation/feature-removal-schedule.txt | 14 - + arch/arm/Kconfig | 3 +- + arch/arm/Kconfig.debug | 2 +- + arch/arm/arm-soc-for-next-contents.txt | 32 + + arch/arm/boot/dts/at91sam9g25ek.dts | 37 + + arch/arm/boot/dts/at91sam9x5.dtsi | 172 +++ + arch/arm/boot/dts/at91sam9x5cm.dtsi | 14 + + arch/arm/common/timer-sp.c | 17 +- + arch/arm/configs/at91cap9_defconfig | 108 -- + arch/arm/configs/lpc32xx_defconfig | 145 +++ + arch/arm/configs/mxs_defconfig | 20 +- + arch/arm/include/asm/hardware/timer-sp.h | 15 +- + arch/arm/mach-at91/Kconfig | 23 +- + arch/arm/mach-at91/Makefile | 5 +- + arch/arm/mach-at91/Makefile.boot | 6 +- + arch/arm/mach-at91/at91cap9.c | 404 ------- + arch/arm/mach-at91/at91cap9_devices.c | 1273 -------------------- + arch/arm/mach-at91/at91sam9263_devices.c | 13 +- + arch/arm/mach-at91/at91sam9g45_devices.c | 113 ++- + arch/arm/mach-at91/at91sam9rl_devices.c | 8 +- + arch/arm/mach-at91/at91sam9x5.c | 373 ++++++ + arch/arm/mach-at91/board-cap9adk.c | 396 ------ + arch/arm/mach-at91/board-dt.c | 1 + + arch/arm/mach-at91/board-flexibity.c | 12 +- + arch/arm/mach-at91/board-sam9m10g45ek.c | 80 ++- + arch/arm/mach-at91/clock.c | 88 +- + arch/arm/mach-at91/cpuidle.c | 11 +- + arch/arm/mach-at91/generic.h | 1 - + arch/arm/mach-at91/include/mach/at91_pmc.h | 72 +- + arch/arm/mach-at91/include/mach/at91cap9.h | 122 -- + arch/arm/mach-at91/include/mach/at91cap9_matrix.h | 137 --- + arch/arm/mach-at91/include/mach/at91sam9_ddrsdr.h | 10 - + arch/arm/mach-at91/include/mach/at91sam9x5.h | 80 ++ + .../arm/mach-at91/include/mach/at91sam9x5_matrix.h | 53 + + arch/arm/mach-at91/include/mach/board.h | 6 +- + arch/arm/mach-at91/include/mach/cpu.h | 21 - + arch/arm/mach-at91/include/mach/hardware.h | 6 +- + arch/arm/mach-at91/pm.c | 17 +- + arch/arm/mach-at91/pm.h | 91 +- + arch/arm/mach-at91/pm_slowclock.S | 12 +- + arch/arm/mach-at91/setup.c | 17 - + arch/arm/mach-at91/soc.h | 5 - + arch/arm/mach-dove/common.c | 3 +- + arch/arm/mach-highbank/highbank.c | 2 +- + arch/arm/mach-highbank/include/mach/memory.h | 1 - + arch/arm/mach-imx/mach-mx31moboard.c | 2 +- + arch/arm/mach-imx/pm-imx5.c | 4 +- + arch/arm/mach-kirkwood/common.c | 3 +- + arch/arm/mach-kirkwood/mpp.h | 320 +++--- + arch/arm/mach-lpc32xx/clock.c | 62 +- + arch/arm/mach-lpc32xx/common.h | 1 - + arch/arm/mach-mv78xx0/common.c | 3 +- + arch/arm/mach-mv78xx0/mpp.h | 226 ++-- + arch/arm/mach-mxs/Kconfig | 16 + + arch/arm/mach-mxs/Makefile | 1 + + arch/arm/mach-mxs/clock-mx23.c | 34 +- + arch/arm/mach-mxs/clock-mx28.c | 57 +- + arch/arm/mach-mxs/devices/platform-mxs-mmc.c | 2 + + arch/arm/mach-mxs/include/mach/common.h | 2 + + arch/arm/mach-mxs/include/mach/digctl.h | 1 + + arch/arm/mach-mxs/include/mach/mxs.h | 29 +- + arch/arm/mach-mxs/include/mach/uncompress.h | 13 +- + arch/arm/mach-mxs/mach-apx4devkit.c | 260 ++++ + arch/arm/mach-mxs/mach-m28evk.c | 7 +- + arch/arm/mach-mxs/mach-mx28evk.c | 80 +- + arch/arm/mach-mxs/system.c | 16 + + arch/arm/mach-nomadik/board-nhk8815.c | 7 +- + arch/arm/mach-nomadik/include/mach/setup.h | 19 - + arch/arm/mach-orion5x/common.c | 4 +- + arch/arm/mach-ux500/Kconfig | 1 + + arch/arm/mach-ux500/board-mop500-sdi.c | 31 +- + arch/arm/mach-ux500/board-mop500.c | 74 +- + arch/arm/mach-ux500/board-mop500.h | 8 +- + arch/arm/mach-ux500/board-u5500-sdi.c | 4 +- + arch/arm/mach-ux500/board-u5500.c | 27 +- + arch/arm/mach-ux500/cpu-db5500.c | 36 +- + arch/arm/mach-ux500/cpu-db8500.c | 44 +- + arch/arm/mach-ux500/cpu.c | 75 ++ + arch/arm/mach-ux500/devices-common.c | 78 +- + arch/arm/mach-ux500/devices-common.h | 83 +- + arch/arm/mach-ux500/devices-db5500.h | 116 ++- + arch/arm/mach-ux500/devices-db8500.h | 176 ++-- + arch/arm/mach-ux500/dma-db5500.c | 3 +- + arch/arm/mach-ux500/include/mach/db8500-regs.h | 3 + + arch/arm/mach-ux500/include/mach/setup.h | 11 +- + arch/arm/mach-ux500/include/mach/usb.h | 4 +- + arch/arm/mach-ux500/timer.c | 7 +- + arch/arm/mach-ux500/usb.c | 7 +- + arch/arm/plat-mxc/audmux-v2.c | 8 +- + arch/arm/plat-mxc/devices/platform-ahci-imx.c | 16 +- + arch/arm/plat-mxc/epit.c | 2 +- + arch/arm/plat-mxc/pwm.c | 4 +- + arch/arm/plat-mxc/system.c | 2 +- + arch/arm/plat-mxc/time.c | 2 +- + arch/arm/plat-nomadik/include/plat/mtu.h | 4 +- + arch/arm/plat-nomadik/timer.c | 33 +- + arch/arm/plat-orion/common.c | 9 +- + arch/arm/plat-orion/include/plat/common.h | 3 +- + arch/arm/plat-orion/mpp.c | 3 +- + arch/avr32/mach-at32ap/include/mach/cpu.h | 3 - + drivers/i2c/busses/i2c-imx.c | 4 +- + drivers/mmc/host/at91_mci.c | 1 - + drivers/mmc/host/sdhci-esdhc-imx.c | 6 +- + drivers/tty/serial/imx.c | 7 +- + drivers/usb/gadget/Kconfig | 4 +- + 105 files changed, 2537 insertions(+), 3572 deletions(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/at91sam9g25ek.dts + create mode 100644 arch/arm/boot/dts/at91sam9x5.dtsi + create mode 100644 arch/arm/boot/dts/at91sam9x5cm.dtsi + delete mode 100644 arch/arm/configs/at91cap9_defconfig + create mode 100644 arch/arm/configs/lpc32xx_defconfig + delete mode 100644 arch/arm/mach-at91/at91cap9.c + delete mode 100644 arch/arm/mach-at91/at91cap9_devices.c + create mode 100644 arch/arm/mach-at91/at91sam9x5.c + delete mode 100644 arch/arm/mach-at91/board-cap9adk.c + delete mode 100644 arch/arm/mach-at91/include/mach/at91cap9.h + delete mode 100644 arch/arm/mach-at91/include/mach/at91cap9_matrix.h + create mode 100644 arch/arm/mach-at91/include/mach/at91sam9x5.h + create mode 100644 arch/arm/mach-at91/include/mach/at91sam9x5_matrix.h + delete mode 100644 arch/arm/mach-highbank/include/mach/memory.h + create mode 100644 arch/arm/mach-mxs/mach-apx4devkit.c + delete mode 100644 arch/arm/mach-nomadik/include/mach/setup.h +Merging tmem/linux-next (b05b561 Merge branch 'devel/frontswap.v13' into linux-next) +$ git merge tmem/linux-next +Auto-merging mm/swapfile.c +Auto-merging mm/filemap.c +Auto-merging include/linux/swap.h +Auto-merging fs/super.c +Auto-merging drivers/staging/zcache/zcache-main.c +Auto-merging Documentation/vm/cleancache.txt +Removing Documentation/ABI/testing/sysfs-kernel-mm-cleancache +Merge made by the 'recursive' strategy. + .../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/block_dev.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 +$ git am -3 ../patches/0001-mm-frontswap-update-for-security_vm_enough_memory-AP.patch +Applying: mm: frontswap: update for security_vm_enough_memory API change +$ git reset HEAD^ +Unstaged changes after reset: +M mm/frontswap.c +$ git add . +$ git commit -v -a --amend +[master 72c5cf7] Merge remote-tracking branch 'tmem/linux-next' +Merging writeback/writeback-for-next (977b7e3 writeback: fix dereferencing NULL bdi->dev on trace_writeback_queue) +$ 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 (77a5988 pinctrl: changes hog mechanism to be self-referential) +$ git merge pinctrl/for-next +Auto-merging arch/arm/mach-u300/core.c +Merge made by the 'recursive' strategy. + Documentation/pinctrl.txt | 135 +++--- + arch/arm/mach-u300/core.c | 36 +- + drivers/pinctrl/Kconfig | 22 + + drivers/pinctrl/Makefile | 4 + + drivers/pinctrl/core.c | 624 +++++++++++++++++++++++- + drivers/pinctrl/core.h | 37 ++- + drivers/pinctrl/pinconf.c | 8 +- + drivers/pinctrl/pinctrl-coh901.c | 6 +- + drivers/pinctrl/pinctrl-mmp2.c | 722 +++++++++++++++++++++++++++ + drivers/pinctrl/pinctrl-pxa168.c | 651 ++++++++++++++++++++++++ + drivers/pinctrl/pinctrl-pxa3xx.c | 244 +++++++++ + drivers/pinctrl/pinctrl-pxa3xx.h | 264 ++++++++++ + drivers/pinctrl/pinctrl-pxa910.c | 1007 ++++++++++++++++++++++++++++++++++++++ + drivers/pinctrl/pinmux.c | 743 ++++------------------------ + drivers/pinctrl/pinmux.h | 67 +++- + include/linux/pinctrl/consumer.h | 118 +++++ + include/linux/pinctrl/machine.h | 54 +-- + include/linux/pinctrl/pinconf.h | 39 -- + include/linux/pinctrl/pinmux.h | 52 -- + 19 files changed, 3942 insertions(+), 891 deletions(-) + create mode 100644 drivers/pinctrl/pinctrl-mmp2.c + create mode 100644 drivers/pinctrl/pinctrl-pxa168.c + create mode 100644 drivers/pinctrl/pinctrl-pxa3xx.c + create mode 100644 drivers/pinctrl/pinctrl-pxa3xx.h + create mode 100644 drivers/pinctrl/pinctrl-pxa910.c + create mode 100644 include/linux/pinctrl/consumer.h +Merging moduleh/for-sfr (6aec187 drivers/media: video/a5k6aa is a module and so needs module.h) +$ git merge moduleh/for-sfr +Already up-to-date. +Merging vhost/linux-next (1e05b62 sh: use the the PCI channels's io_map_base) +$ git merge vhost/linux-next +Already up-to-date. +Merging kmap_atomic/kmap_atomic (019e9ad feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal) +$ git merge kmap_atomic/kmap_atomic +Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution. +Resolved 'drivers/net/ethernet/intel/e1000e/netdev.c' using previous resolution. +Resolved 'drivers/scsi/storvsc_drv.c' using previous resolution. +Resolved 'drivers/staging/zcache/zcache-main.c' using previous resolution. +Resolved 'drivers/staging/zram/zram_drv.c' using previous resolution. +Auto-merging net/rds/iw_recv.c +Auto-merging net/rds/ib_recv.c +Auto-merging mm/swapfile.c +Auto-merging mm/shmem.c +Auto-merging mm/filemap.c +Auto-merging kernel/power/snapshot.c +Auto-merging fs/ntfs/super.c +Auto-merging fs/nfs/nfs4proc.c +Auto-merging fs/nfs/dir.c +Auto-merging fs/namei.c +Auto-merging fs/logfs/dir.c +Auto-merging fs/jbd2/transaction.c +Auto-merging fs/jbd2/journal.c +Auto-merging fs/jbd2/commit.c +Auto-merging fs/gfs2/lops.c +Auto-merging fs/fuse/dev.c +Auto-merging drivers/target/target_core_transport.c +Auto-merging drivers/staging/zram/zram_drv.c +CONFLICT (content): Merge conflict in drivers/staging/zram/zram_drv.c +CONFLICT (modify/delete): drivers/staging/zram/xvmalloc.c deleted in HEAD and modified in kmap_atomic/kmap_atomic. Version kmap_atomic/kmap_atomic of drivers/staging/zram/xvmalloc.c left in tree. +Auto-merging drivers/staging/zcache/zcache-main.c +CONFLICT (content): Merge conflict in drivers/staging/zcache/zcache-main.c +Removing drivers/staging/rtl8192u/ieee80211/kmap_types.h +Auto-merging drivers/scsi/storvsc_drv.c +CONFLICT (content): Merge conflict in drivers/scsi/storvsc_drv.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/mvsas/mv_sas.c +Auto-merging drivers/scsi/libsas/sas_host_smp.c +Auto-merging drivers/scsi/libfc/fc_fcp.c +Auto-merging drivers/scsi/isci/request.c +Auto-merging drivers/net/ethernet/sun/cassini.c +Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/e1000e/netdev.c +Auto-merging drivers/net/ethernet/intel/e1000/e1000_main.c +Auto-merging drivers/crypto/hifn_795x.c +Auto-merging drivers/block/loop.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/crypto/aesni-intel_glue.c +Auto-merging arch/arm/mm/highmem.c +Auto-merging arch/arm/mm/copypage-xscale.c +Auto-merging arch/arm/mm/copypage-v6.c +Auto-merging arch/arm/mm/copypage-v4mc.c +Auto-merging Documentation/feature-removal-schedule.txt +CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/zram/xvmalloc.c +Documentation/feature-removal-schedule.txt: needs merge +drivers/net/ethernet/intel/e1000e/netdev.c: needs merge +drivers/scsi/storvsc_drv.c: needs merge +drivers/staging/zcache/zcache-main.c: needs merge +drivers/staging/zram/xvmalloc.c: needs merge +drivers/staging/zram/zram_drv.c: needs merge +rm 'drivers/staging/zram/xvmalloc.c' +$ git commit -v -a +[master 6ea8c40] Merge remote-tracking branch 'kmap_atomic/kmap_atomic' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 8 ++ + arch/arm/include/asm/highmem.h | 2 +- + arch/arm/mm/copypage-fa.c | 12 ++-- + arch/arm/mm/copypage-feroceon.c | 12 ++-- + arch/arm/mm/copypage-v3.c | 12 ++-- + arch/arm/mm/copypage-v4mc.c | 8 +- + arch/arm/mm/copypage-v4wb.c | 12 ++-- + arch/arm/mm/copypage-v4wt.c | 12 ++-- + arch/arm/mm/copypage-v6.c | 12 ++-- + arch/arm/mm/copypage-xsc3.c | 12 ++-- + arch/arm/mm/copypage-xscale.c | 8 +- + arch/arm/mm/highmem.c | 4 +- + arch/frv/include/asm/highmem.h | 2 +- + arch/frv/mm/highmem.c | 4 +- + arch/mips/include/asm/highmem.h | 2 +- + arch/mips/mm/c-r4k.c | 4 +- + arch/mips/mm/highmem.c | 4 +- + arch/mips/mm/init.c | 8 +- + arch/mn10300/include/asm/highmem.h | 2 +- + arch/parisc/include/asm/cacheflush.h | 2 +- + arch/powerpc/include/asm/highmem.h | 2 +- + arch/powerpc/kvm/book3s_pr.c | 4 +- + arch/powerpc/mm/dma-noncoherent.c | 5 +- + arch/powerpc/mm/hugetlbpage.c | 4 +- + arch/powerpc/mm/mem.c | 4 +- + arch/sh/mm/cache-sh4.c | 4 +- + arch/sh/mm/cache.c | 12 ++-- + arch/sparc/include/asm/highmem.h | 2 +- + arch/sparc/mm/highmem.c | 4 +- + arch/tile/include/asm/highmem.h | 2 +- + arch/tile/mm/highmem.c | 4 +- + arch/um/kernel/skas/uaccess.c | 4 +- + arch/x86/crypto/aesni-intel_glue.c | 24 +++--- + arch/x86/include/asm/highmem.h | 2 +- + arch/x86/kernel/crash_dump_32.c | 6 +- + arch/x86/kvm/lapic.c | 8 +- + arch/x86/kvm/paging_tmpl.h | 4 +- + arch/x86/kvm/x86.c | 8 +- + arch/x86/lib/usercopy_32.c | 4 +- + arch/x86/mm/highmem_32.c | 4 +- + crypto/ahash.c | 4 +- + crypto/async_tx/async_memcpy.c | 8 +- + crypto/blkcipher.c | 8 +- + crypto/ccm.c | 4 +- + crypto/scatterwalk.c | 8 +- + crypto/shash.c | 8 +- + drivers/ata/libata-sff.c | 8 +- + drivers/block/brd.c | 20 +++--- + drivers/block/drbd/drbd_bitmap.c | 50 ++++++------ + drivers/block/drbd/drbd_nl.c | 4 +- + drivers/block/loop.c | 16 ++-- + drivers/block/pktcdvd.c | 8 +- + drivers/crypto/hifn_795x.c | 10 +- + drivers/edac/edac_mc.c | 4 +- + drivers/gpu/drm/drm_cache.c | 8 +- + drivers/gpu/drm/gma500/mmu.c | 30 ++++---- + drivers/gpu/drm/ttm/ttm_tt.c | 16 ++-- + drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c | 6 +- + drivers/ide/ide-taskfile.c | 4 +- + drivers/infiniband/ulp/iser/iser_memory.c | 8 +- + drivers/md/bitmap.c | 42 +++++----- + drivers/md/dm-crypt.c | 8 +- + drivers/media/video/ivtv/ivtv-udma.c | 4 +- + drivers/memstick/host/jmb38x_ms.c | 4 +- + drivers/memstick/host/tifm_ms.c | 4 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 6 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 11 +-- + drivers/net/ethernet/sun/cassini.c | 4 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 8 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 5 +- + drivers/scsi/cxgbi/libcxgbi.c | 5 +- + drivers/scsi/fcoe/fcoe.c | 4 +- + drivers/scsi/fcoe/fcoe_transport.c | 5 +- + drivers/scsi/gdth.c | 4 +- + drivers/scsi/ips.c | 6 +- + drivers/scsi/isci/request.c | 16 ++-- + drivers/scsi/libfc/fc_fcp.c | 8 +- + drivers/scsi/libfc/fc_libfc.c | 8 +- + drivers/scsi/libfc/fc_libfc.h | 2 +- + drivers/scsi/libfc/fc_lport.c | 2 +- + drivers/scsi/libiscsi_tcp.c | 4 +- + drivers/scsi/libsas/sas_host_smp.c | 8 +- + drivers/scsi/megaraid.c | 4 +- + drivers/scsi/mvsas/mv_sas.c | 4 +- + drivers/scsi/scsi_debug.c | 24 +++--- + drivers/scsi/scsi_lib.c | 4 +- + drivers/scsi/sd_dif.c | 12 ++-- + drivers/scsi/storvsc_drv.c | 34 ++++----- + drivers/staging/rtl8192u/ieee80211/cipher.c | 8 +- + drivers/staging/rtl8192u/ieee80211/digest.c | 8 +- + drivers/staging/rtl8192u/ieee80211/internal.h | 17 ---- + drivers/staging/rtl8192u/ieee80211/kmap_types.h | 20 ----- + drivers/staging/rtl8192u/ieee80211/scatterwalk.c | 19 +--- + drivers/staging/zcache/zcache-main.c | 12 ++-- + drivers/staging/zram/zram_drv.c | 32 ++++---- + drivers/target/target_core_transport.c | 4 +- + drivers/target/tcm_fc/tfc_io.c | 10 +-- + drivers/vhost/vhost.c | 4 +- + fs/afs/fsclient.c | 8 +- + fs/afs/mntpt.c | 4 +- + fs/aio.c | 30 ++++---- + fs/bio-integrity.c | 10 +- + fs/btrfs/compression.c | 12 ++-- + fs/btrfs/extent_io.c | 16 ++-- + fs/btrfs/file-item.c | 4 +- + fs/btrfs/inode.c | 26 +++--- + fs/btrfs/lzo.c | 4 +- + fs/btrfs/scrub.c | 8 +- + fs/btrfs/zlib.c | 4 +- + fs/exec.c | 4 +- + fs/exofs/dir.c | 4 +- + fs/ext2/dir.c | 4 +- + fs/fuse/dev.c | 4 +- + fs/fuse/file.c | 4 +- + fs/gfs2/aops.c | 12 ++-- + fs/gfs2/lops.c | 8 +- + fs/gfs2/quota.c | 4 +- + fs/jbd/journal.c | 12 ++-- + fs/jbd/transaction.c | 4 +- + fs/jbd2/commit.c | 4 +- + fs/jbd2/journal.c | 12 ++-- + fs/jbd2/transaction.c | 4 +- + fs/logfs/dir.c | 18 ++-- + fs/logfs/readwrite.c | 38 +++++----- + fs/logfs/segment.c | 4 +- + fs/minix/dir.c | 4 +- + fs/namei.c | 4 +- + fs/nfs/dir.c | 8 +- + fs/nfs/nfs4proc.c | 4 +- + fs/nilfs2/cpfile.c | 94 +++++++++++----------- + fs/nilfs2/dat.c | 38 +++++----- + fs/nilfs2/dir.c | 4 +- + fs/nilfs2/ifile.c | 4 +- + fs/nilfs2/mdt.c | 4 +- + fs/nilfs2/page.c | 8 +- + fs/nilfs2/recovery.c | 4 +- + fs/nilfs2/segbuf.c | 4 +- + fs/nilfs2/sufile.c | 68 ++++++++-------- + fs/ntfs/aops.c | 20 +++--- + fs/ntfs/attrib.c | 20 +++--- + fs/ntfs/file.c | 16 ++-- + fs/ntfs/super.c | 8 +- + fs/ocfs2/aops.c | 16 ++-- + fs/pipe.c | 8 +- + fs/reiserfs/stree.c | 4 +- + fs/reiserfs/tail_conversion.c | 4 +- + fs/splice.c | 7 +- + fs/squashfs/file.c | 8 +- + fs/squashfs/symlink.c | 4 +- + fs/ubifs/file.c | 4 +- + fs/udf/file.c | 4 +- + include/crypto/scatterwalk.h | 28 +------ + include/linux/bio.h | 8 +- + include/linux/highmem.h | 79 +++++++++++++----- + kernel/debug/kdb/kdb_support.c | 4 +- + kernel/power/snapshot.c | 28 +++--- + lib/scatterlist.c | 4 +- + lib/swiotlb.c | 5 +- + mm/bounce.c | 4 +- + mm/filemap.c | 8 +- + mm/ksm.c | 12 ++-- + mm/memory.c | 4 +- + mm/shmem.c | 4 +- + mm/swapfile.c | 30 ++++---- + mm/vmalloc.c | 8 +- + net/core/kmap_skb.h | 4 +- + net/rds/ib_recv.c | 7 +- + net/rds/info.c | 6 +- + net/rds/iw_recv.c | 7 +- + net/rds/loop.c | 2 +- + net/rds/rds.h | 2 +- + net/rds/recv.c | 2 +- + net/rds/tcp_recv.c | 11 +-- + net/sunrpc/auth_gss/gss_krb5_wrap.c | 4 +- + net/sunrpc/socklib.c | 4 +- + net/sunrpc/xdr.c | 20 +++--- + net/sunrpc/xprtrdma/rpc_rdma.c | 8 +- + security/tomoyo/domain.c | 4 +- + 178 files changed, 881 insertions(+), 932 deletions(-) + delete mode 100644 drivers/staging/rtl8192u/ieee80211/kmap_types.h +Merging modem-shm/for-next (3cff1cc caif_shm: Add CAIF driver for Shared memory for M7400) +$ git merge modem-shm/for-next +Auto-merging include/linux/Kbuild +Auto-merging drivers/Makefile +Auto-merging drivers/Kconfig +Merge made by the 'recursive' strategy. + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/modem_shm/Kconfig | 62 ++ + drivers/modem_shm/Makefile | 5 + + drivers/modem_shm/dummy_c2c_genio.c | 76 ++ + drivers/modem_shm/shm_boot.c | 1208 ++++++++++++++++++++++++++ + drivers/modem_shm/shm_bus.c | 113 +++ + drivers/modem_shm/shm_chr.c | 1242 +++++++++++++++++++++++++++ + drivers/modem_shm/shm_dev.c | 527 ++++++++++++ + drivers/modem_shm/shm_ipctoc.h | 154 ++++ + drivers/net/caif/Kconfig | 12 +- + drivers/net/caif/Makefile | 3 +- + drivers/net/caif/caif_shm.c | 900 +++++++++++++++++++ + include/linux/Kbuild | 1 + + include/linux/c2c_genio.h | 195 +++++ + include/linux/modem_shm/Kbuild | 1 + + include/linux/modem_shm/modem_shm_netlink.h | 95 ++ + include/linux/modem_shm/shm_dev.h | 245 ++++++ + 18 files changed, 4840 insertions(+), 2 deletions(-) + create mode 100644 drivers/modem_shm/Kconfig + create mode 100644 drivers/modem_shm/Makefile + create mode 100644 drivers/modem_shm/dummy_c2c_genio.c + create mode 100644 drivers/modem_shm/shm_boot.c + create mode 100644 drivers/modem_shm/shm_bus.c + create mode 100644 drivers/modem_shm/shm_chr.c + create mode 100644 drivers/modem_shm/shm_dev.c + create mode 100644 drivers/modem_shm/shm_ipctoc.h + create mode 100644 drivers/net/caif/caif_shm.c + create mode 100644 include/linux/c2c_genio.h + create mode 100644 include/linux/modem_shm/Kbuild + create mode 100644 include/linux/modem_shm/modem_shm_netlink.h + create mode 100644 include/linux/modem_shm/shm_dev.h +Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator) +$ git merge memblock/memblock-kill-early_node_map +Already up-to-date. +Merging remoteproc/for-next (6c7b643 remoteproc: s/big switch/lookup table/) +$ git merge remoteproc/for-next +Auto-merging include/linux/mod_devicetable.h +Auto-merging drivers/Makefile +Auto-merging drivers/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-rpmsg | 75 ++ + Documentation/remoteproc.txt | 324 ++++++ + Documentation/rpmsg.txt | 293 ++++++ + MAINTAINERS | 7 + + arch/arm/plat-omap/include/plat/remoteproc.h | 57 + + drivers/Kconfig | 4 + + drivers/Makefile | 2 + + drivers/remoteproc/Kconfig | 29 + + drivers/remoteproc/Makefile | 9 + + drivers/remoteproc/omap_remoteproc.c | 238 +++++ + drivers/remoteproc/omap_remoteproc.h | 69 ++ + drivers/remoteproc/remoteproc_core.c | 1450 ++++++++++++++++++++++++++ + drivers/remoteproc/remoteproc_debugfs.c | 179 ++++ + drivers/remoteproc/remoteproc_internal.h | 44 + + drivers/remoteproc/remoteproc_rpmsg.c | 299 ++++++ + drivers/rpmsg/Kconfig | 10 + + drivers/rpmsg/Makefile | 1 + + drivers/rpmsg/virtio_rpmsg_bus.c | 1026 ++++++++++++++++++ + include/linux/mod_devicetable.h | 9 + + include/linux/remoteproc.h | 271 +++++ + include/linux/rpmsg.h | 326 ++++++ + include/linux/virtio_ids.h | 1 + + samples/Kconfig | 8 + + samples/Makefile | 2 +- + samples/rpmsg/Makefile | 1 + + samples/rpmsg/rpmsg_client_sample.c | 100 ++ + 26 files changed, 4833 insertions(+), 1 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-rpmsg + create mode 100644 Documentation/remoteproc.txt + create mode 100644 Documentation/rpmsg.txt + create mode 100644 arch/arm/plat-omap/include/plat/remoteproc.h + create mode 100644 drivers/remoteproc/Kconfig + create mode 100644 drivers/remoteproc/Makefile + create mode 100644 drivers/remoteproc/omap_remoteproc.c + create mode 100644 drivers/remoteproc/omap_remoteproc.h + create mode 100644 drivers/remoteproc/remoteproc_core.c + create mode 100644 drivers/remoteproc/remoteproc_debugfs.c + create mode 100644 drivers/remoteproc/remoteproc_internal.h + create mode 100644 drivers/remoteproc/remoteproc_rpmsg.c + create mode 100644 drivers/rpmsg/Kconfig + create mode 100644 drivers/rpmsg/Makefile + create mode 100644 drivers/rpmsg/virtio_rpmsg_bus.c + create mode 100644 include/linux/remoteproc.h + create mode 100644 include/linux/rpmsg.h + create mode 100644 samples/rpmsg/Makefile + create mode 100644 samples/rpmsg/rpmsg_client_sample.c +Merging irqdomain/irqdomain/next (98ecf52 irq_domain/microblaze: Convert microblaze to use irq_domains) +$ git merge irqdomain/irqdomain/next +Resolved 'arch/arm/common/gic.c' using previous resolution. +Resolved 'drivers/mfd/twl-core.c' using previous resolution. +Auto-merging drivers/mfd/twl-core.c +CONFLICT (content): Merge conflict in drivers/mfd/twl-core.c +Auto-merging arch/powerpc/kernel/irq.c +Auto-merging arch/microblaze/kernel/setup.c +Auto-merging arch/microblaze/Kconfig +Auto-merging arch/arm/mach-versatile/core.c +Auto-merging arch/arm/mach-imx/imx53-dt.c +Auto-merging arch/arm/mach-imx/imx51-dt.c +Auto-merging arch/arm/mach-exynos/common.c +Auto-merging arch/arm/common/gic.c +CONFLICT (content): Merge conflict in arch/arm/common/gic.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e5e845e] Merge remote-tracking branch 'irqdomain/irqdomain/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/IRQ-domain.txt | 117 +++ + MAINTAINERS | 9 + + arch/arm/common/gic.c | 95 ++-- + arch/arm/common/vic.c | 16 +- + arch/arm/include/asm/hardware/gic.h | 4 +- + arch/arm/include/asm/hardware/vic.h | 2 + + arch/arm/mach-exynos/common.c | 2 +- + arch/arm/mach-imx/imx51-dt.c | 4 +- + arch/arm/mach-imx/imx53-dt.c | 4 +- + arch/arm/mach-imx/mach-imx6q.c | 3 +- + arch/arm/mach-msm/board-msm8x60.c | 8 +- + arch/arm/mach-omap2/board-generic.c | 2 +- + arch/arm/mach-prima2/irq.c | 2 +- + arch/arm/mach-versatile/core.c | 7 +- + arch/c6x/Kconfig | 1 + + arch/c6x/include/asm/irq.h | 245 +------- + arch/c6x/kernel/irq.c | 612 +---------------- + arch/c6x/platforms/megamod-pic.c | 25 +- + arch/microblaze/Kconfig | 1 + + arch/microblaze/include/asm/hardirq.h | 16 - + arch/microblaze/include/asm/irq.h | 42 +- + arch/microblaze/kernel/intc.c | 61 +- + arch/microblaze/kernel/irq.c | 24 +- + arch/microblaze/kernel/setup.c | 2 - + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/ehv_pic.h | 2 +- + arch/powerpc/include/asm/i8259.h | 2 +- + arch/powerpc/include/asm/irq.h | 247 +------- + arch/powerpc/include/asm/mpic.h | 2 +- + arch/powerpc/include/asm/xics.h | 2 +- + arch/powerpc/kernel/irq.c | 617 +---------------- + arch/powerpc/platforms/512x/mpc5121_ads_cpld.c | 12 +- + arch/powerpc/platforms/52xx/media5200.c | 15 +- + arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 16 +- + arch/powerpc/platforms/52xx/mpc52xx_pic.c | 12 +- + arch/powerpc/platforms/82xx/pq2ads-pci-pic.c | 14 +- + arch/powerpc/platforms/85xx/socrates_fpga_pic.c | 15 +- + arch/powerpc/platforms/86xx/gef_pic.c | 15 +- + arch/powerpc/platforms/cell/axon_msi.c | 29 +- + arch/powerpc/platforms/cell/beat_interrupt.c | 16 +- + arch/powerpc/platforms/cell/interrupt.c | 16 +- + arch/powerpc/platforms/cell/spider-pic.c | 14 +- + arch/powerpc/platforms/embedded6xx/flipper-pic.c | 30 +- + arch/powerpc/platforms/embedded6xx/hlwd-pic.c | 35 +- + arch/powerpc/platforms/iseries/irq.c | 11 +- + arch/powerpc/platforms/powermac/pic.c | 26 +- + arch/powerpc/platforms/powermac/smp.c | 9 +- + arch/powerpc/platforms/ps3/interrupt.c | 11 +- + arch/powerpc/platforms/wsp/opb_pic.c | 26 +- + arch/powerpc/sysdev/cpm1.c | 9 +- + arch/powerpc/sysdev/cpm2_pic.c | 23 +- + arch/powerpc/sysdev/ehv_pic.c | 14 +- + arch/powerpc/sysdev/fsl_msi.c | 10 +- + arch/powerpc/sysdev/fsl_msi.h | 2 +- + arch/powerpc/sysdev/i8259.c | 15 +- + arch/powerpc/sysdev/ipic.c | 31 +- + arch/powerpc/sysdev/ipic.h | 2 +- + arch/powerpc/sysdev/mpc8xx_pic.c | 11 +- + arch/powerpc/sysdev/mpic.c | 17 +- + arch/powerpc/sysdev/mpic_msi.c | 2 +- + arch/powerpc/sysdev/mv64x60_pic.c | 11 +- + arch/powerpc/sysdev/qe_lib/qe_ic.c | 26 +- + arch/powerpc/sysdev/qe_lib/qe_ic.h | 2 +- + arch/powerpc/sysdev/tsi108_pci.c | 22 +- + arch/powerpc/sysdev/uic.c | 26 +- + arch/powerpc/sysdev/xics/xics-common.c | 25 +- + arch/powerpc/sysdev/xilinx_intc.c | 19 +- + drivers/gpio/gpio-mpc8xxx.c | 30 +- + drivers/mfd/twl-core.c | 16 +- + include/linux/irqdomain.h | 191 ++++-- + include/linux/of_address.h | 33 +- + kernel/irq/irqdomain.c | 824 +++++++++++++++++++--- + 72 files changed, 1384 insertions(+), 2476 deletions(-) + create mode 100644 Documentation/IRQ-domain.txt +Merging kvmtool/master (8bff3eb kvm tools: Add guest/init_stage2 to .gitignore) +$ git merge kvmtool/master +Auto-merging scripts/kconfig/Makefile +Auto-merging arch/x86/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 8 + + arch/x86/Kconfig | 31 + + scripts/kconfig/Makefile | 7 +- + tools/kvm/.gitignore | 12 + + tools/kvm/CREDITS-Git | 30 + + tools/kvm/Documentation/kernel-debugging.txt | 15 + + tools/kvm/Documentation/kvm-balloon.txt | 24 + + tools/kvm/Documentation/kvm-debug.txt | 16 + + tools/kvm/Documentation/kvm-list.txt | 16 + + tools/kvm/Documentation/kvm-pause.txt | 16 + + tools/kvm/Documentation/kvm-resume.txt | 16 + + tools/kvm/Documentation/kvm-run.txt | 62 + + tools/kvm/Documentation/kvm-sandbox.txt | 16 + + tools/kvm/Documentation/kvm-setup.txt | 15 + + tools/kvm/Documentation/kvm-stat.txt | 19 + + tools/kvm/Documentation/kvm-stop.txt | 16 + + tools/kvm/Documentation/kvm-version.txt | 21 + + tools/kvm/Documentation/virtio-console.txt | 41 + + tools/kvm/Makefile | 425 +++++++ + tools/kvm/README | 109 ++ + tools/kvm/builtin-balloon.c | 80 ++ + tools/kvm/builtin-debug.c | 103 ++ + tools/kvm/builtin-help.c | 63 ++ + tools/kvm/builtin-list.c | 149 +++ + tools/kvm/builtin-pause.c | 88 ++ + tools/kvm/builtin-resume.c | 88 ++ + tools/kvm/builtin-run.c | 1343 ++++++++++++++++++++++ + tools/kvm/builtin-sandbox.c | 9 + + tools/kvm/builtin-setup.c | 232 ++++ + tools/kvm/builtin-stat.c | 127 +++ + tools/kvm/builtin-stop.c | 70 ++ + tools/kvm/builtin-version.c | 15 + + tools/kvm/code16gcc.h | 15 + + tools/kvm/command-list.txt | 15 + + tools/kvm/config/feature-tests.mak | 168 +++ + tools/kvm/config/utilities.mak | 188 ++++ + tools/kvm/disk/blk.c | 42 + + tools/kvm/disk/core.c | 260 +++++ + tools/kvm/disk/qcow.c | 1529 ++++++++++++++++++++++++++ + tools/kvm/disk/raw.c | 141 +++ + tools/kvm/framebuffer.c | 75 ++ + tools/kvm/guest/init.c | 38 + + tools/kvm/guest/init_stage2.c | 55 + + tools/kvm/guest/passwd | 1 + + tools/kvm/guest_compat.c | 99 ++ + tools/kvm/hw/i8042.c | 348 ++++++ + tools/kvm/hw/pci-shmem.c | 268 +++++ + tools/kvm/hw/rtc.c | 137 +++ + tools/kvm/hw/serial.c | 447 ++++++++ + tools/kvm/hw/vesa.c | 85 ++ + tools/kvm/include/asm/hweight.h | 8 + + tools/kvm/include/bios/memcpy.h | 9 + + tools/kvm/include/kvm/8250-serial.h | 11 + + tools/kvm/include/kvm/apic.h | 17 + + tools/kvm/include/kvm/brlock.h | 41 + + tools/kvm/include/kvm/builtin-balloon.h | 9 + + tools/kvm/include/kvm/builtin-debug.h | 18 + + tools/kvm/include/kvm/builtin-help.h | 6 + + tools/kvm/include/kvm/builtin-list.h | 10 + + tools/kvm/include/kvm/builtin-pause.h | 9 + + tools/kvm/include/kvm/builtin-resume.h | 9 + + tools/kvm/include/kvm/builtin-run.h | 11 + + tools/kvm/include/kvm/builtin-sandbox.h | 6 + + tools/kvm/include/kvm/builtin-setup.h | 11 + + tools/kvm/include/kvm/builtin-stat.h | 9 + + tools/kvm/include/kvm/builtin-stop.h | 9 + + tools/kvm/include/kvm/builtin-version.h | 6 + + tools/kvm/include/kvm/compiler.h | 10 + + tools/kvm/include/kvm/disk-image.h | 81 ++ + tools/kvm/include/kvm/e820.h | 13 + + tools/kvm/include/kvm/framebuffer.h | 35 + + tools/kvm/include/kvm/guest_compat.h | 9 + + tools/kvm/include/kvm/i8042.h | 12 + + tools/kvm/include/kvm/ioeventfd.h | 27 + + tools/kvm/include/kvm/ioport.h | 69 ++ + tools/kvm/include/kvm/irq.h | 33 + + tools/kvm/include/kvm/kvm-cmd.h | 17 + + tools/kvm/include/kvm/kvm-cpu.h | 24 + + tools/kvm/include/kvm/kvm-ipc.h | 24 + + tools/kvm/include/kvm/kvm.h | 92 ++ + tools/kvm/include/kvm/msi.h | 10 + + tools/kvm/include/kvm/mutex.h | 33 + + tools/kvm/include/kvm/parse-options.h | 214 ++++ + tools/kvm/include/kvm/pci-shmem.h | 28 + + tools/kvm/include/kvm/pci.h | 95 ++ + tools/kvm/include/kvm/qcow.h | 133 +++ + tools/kvm/include/kvm/rbtree-interval.h | 28 + + tools/kvm/include/kvm/read-write.h | 43 + + tools/kvm/include/kvm/rtc.h | 9 + + tools/kvm/include/kvm/rwsem.h | 39 + + tools/kvm/include/kvm/sdl.h | 22 + + tools/kvm/include/kvm/segment.h | 21 + + tools/kvm/include/kvm/strbuf.h | 19 + + tools/kvm/include/kvm/symbol.h | 30 + + tools/kvm/include/kvm/term.h | 20 + + tools/kvm/include/kvm/threadpool.h | 37 + + tools/kvm/include/kvm/types.h | 7 + + tools/kvm/include/kvm/uip.h | 358 ++++++ + tools/kvm/include/kvm/util.h | 95 ++ + 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 | 12 + + tools/kvm/include/kvm/virtio-console.h | 9 + + tools/kvm/include/kvm/virtio-net.h | 23 + + tools/kvm/include/kvm/virtio-pci-dev.h | 37 + + tools/kvm/include/kvm/virtio-pci.h | 49 + + tools/kvm/include/kvm/virtio-rng.h | 9 + + tools/kvm/include/kvm/virtio-trans.h | 44 + + tools/kvm/include/kvm/virtio.h | 67 ++ + tools/kvm/include/kvm/vnc.h | 20 + + tools/kvm/include/linux/bitops.h | 33 + + tools/kvm/include/linux/byteorder.h | 7 + + tools/kvm/include/linux/compiler.h | 19 + + 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 | 51 + + tools/kvm/ioeventfd.c | 209 ++++ + tools/kvm/ioport.c | 195 ++++ + tools/kvm/kvm-cmd.c | 91 ++ + tools/kvm/kvm-cpu.c | 175 +++ + tools/kvm/kvm-ipc.c | 231 ++++ + tools/kvm/kvm.c | 587 ++++++++++ + tools/kvm/main.c | 19 + + tools/kvm/mmio.c | 137 +++ + 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 | 213 ++++ + tools/kvm/powerpc/cpu_info.c | 83 ++ + tools/kvm/powerpc/cpu_info.h | 43 + + tools/kvm/powerpc/include/kvm/barrier.h | 6 + + tools/kvm/powerpc/include/kvm/kvm-arch.h | 88 ++ + tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h | 76 ++ + tools/kvm/powerpc/ioport.c | 18 + + tools/kvm/powerpc/irq.c | 75 ++ + tools/kvm/powerpc/kvm-cpu.c | 291 +++++ + tools/kvm/powerpc/kvm.c | 460 ++++++++ + tools/kvm/powerpc/spapr.h | 93 ++ + tools/kvm/powerpc/spapr_hcall.c | 134 +++ + tools/kvm/powerpc/spapr_hvcons.c | 102 ++ + tools/kvm/powerpc/spapr_hvcons.h | 19 + + tools/kvm/powerpc/spapr_pci.c | 423 +++++++ + tools/kvm/powerpc/spapr_pci.h | 57 + + tools/kvm/powerpc/spapr_rtas.c | 229 ++++ + tools/kvm/powerpc/xics.c | 514 +++++++++ + tools/kvm/powerpc/xics.h | 23 + + tools/kvm/symbol.c | 131 +++ + tools/kvm/term.c | 166 +++ + tools/kvm/tests/Makefile | 19 + + tools/kvm/tests/boot/Makefile | 13 + + tools/kvm/tests/boot/init.c | 11 + + tools/kvm/tests/kernel/.gitignore | 2 + + tools/kvm/tests/kernel/Makefile | 20 + + tools/kvm/tests/kernel/README | 16 + + tools/kvm/tests/kernel/kernel.S | 8 + + tools/kvm/tests/pit/.gitignore | 2 + + tools/kvm/tests/pit/Makefile | 20 + + tools/kvm/tests/pit/README | 16 + + tools/kvm/tests/pit/tick.S | 109 ++ + tools/kvm/ui/sdl.c | 303 +++++ + tools/kvm/ui/vnc.c | 230 ++++ + 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 | 89 ++ + tools/kvm/util/read-write.c | 344 ++++++ + tools/kvm/util/set_private_br.sh | 51 + + tools/kvm/util/strbuf.c | 39 + + tools/kvm/util/threadpool.c | 145 +++ + tools/kvm/util/util.c | 115 ++ + tools/kvm/virtio/9p-pdu.c | 287 +++++ + tools/kvm/virtio/9p.c | 1326 ++++++++++++++++++++++ + tools/kvm/virtio/balloon.c | 275 +++++ + tools/kvm/virtio/blk.c | 290 +++++ + tools/kvm/virtio/console.c | 203 ++++ + tools/kvm/virtio/core.c | 158 +++ + tools/kvm/virtio/net.c | 547 +++++++++ + tools/kvm/virtio/pci.c | 380 +++++++ + tools/kvm/virtio/rng.c | 203 ++++ + tools/kvm/virtio/trans.c | 24 + + tools/kvm/x86/bios.c | 174 +++ + tools/kvm/x86/bios/.gitignore | 3 + + tools/kvm/x86/bios/bios-rom.S | 12 + + tools/kvm/x86/bios/e820.c | 72 ++ + tools/kvm/x86/bios/entry.S | 92 ++ + tools/kvm/x86/bios/gen-offsets.sh | 14 + + tools/kvm/x86/bios/int10.c | 110 ++ + tools/kvm/x86/bios/int15.c | 18 + + tools/kvm/x86/bios/local.S | 7 + + tools/kvm/x86/bios/macro.S | 25 + + tools/kvm/x86/bios/memcpy.c | 23 + + tools/kvm/x86/bios/rom.ld.S | 10 + + tools/kvm/x86/cpuid.c | 55 + + tools/kvm/x86/include/kvm/assembly.h | 24 + + tools/kvm/x86/include/kvm/barrier.h | 16 + + tools/kvm/x86/include/kvm/bios-export.h | 13 + + tools/kvm/x86/include/kvm/bios.h | 88 ++ + tools/kvm/x86/include/kvm/boot-protocol.h | 16 + + tools/kvm/x86/include/kvm/cpufeature.h | 41 + + tools/kvm/x86/include/kvm/interrupt.h | 26 + + tools/kvm/x86/include/kvm/kvm-arch.h | 65 ++ + tools/kvm/x86/include/kvm/kvm-cpu-arch.h | 49 + + tools/kvm/x86/include/kvm/mptable.h | 9 + + tools/kvm/x86/interrupt.c | 28 + + tools/kvm/x86/ioport.c | 59 + + tools/kvm/x86/irq.c | 229 ++++ + tools/kvm/x86/kvm-cpu.c | 425 +++++++ + tools/kvm/x86/kvm.c | 385 +++++++ + tools/kvm/x86/mptable.c | 287 +++++ + 218 files changed, 24003 insertions(+), 1 deletions(-) + create mode 100644 tools/kvm/.gitignore + create mode 100644 tools/kvm/CREDITS-Git + create mode 100644 tools/kvm/Documentation/kernel-debugging.txt + create mode 100644 tools/kvm/Documentation/kvm-balloon.txt + create mode 100644 tools/kvm/Documentation/kvm-debug.txt + create mode 100644 tools/kvm/Documentation/kvm-list.txt + create mode 100644 tools/kvm/Documentation/kvm-pause.txt + create mode 100644 tools/kvm/Documentation/kvm-resume.txt + create mode 100644 tools/kvm/Documentation/kvm-run.txt + create mode 100644 tools/kvm/Documentation/kvm-sandbox.txt + create mode 100644 tools/kvm/Documentation/kvm-setup.txt + create mode 100644 tools/kvm/Documentation/kvm-stat.txt + create mode 100644 tools/kvm/Documentation/kvm-stop.txt + create mode 100644 tools/kvm/Documentation/kvm-version.txt + create mode 100644 tools/kvm/Documentation/virtio-console.txt + create mode 100644 tools/kvm/Makefile + create mode 100644 tools/kvm/README + create mode 100644 tools/kvm/builtin-balloon.c + create mode 100644 tools/kvm/builtin-debug.c + create mode 100644 tools/kvm/builtin-help.c + create mode 100644 tools/kvm/builtin-list.c + create mode 100644 tools/kvm/builtin-pause.c + create mode 100644 tools/kvm/builtin-resume.c + create mode 100644 tools/kvm/builtin-run.c + create mode 100644 tools/kvm/builtin-sandbox.c + create mode 100644 tools/kvm/builtin-setup.c + create mode 100644 tools/kvm/builtin-stat.c + create mode 100644 tools/kvm/builtin-stop.c + create mode 100644 tools/kvm/builtin-version.c + create mode 100644 tools/kvm/code16gcc.h + create mode 100644 tools/kvm/command-list.txt + create mode 100644 tools/kvm/config/feature-tests.mak + create mode 100644 tools/kvm/config/utilities.mak + create mode 100644 tools/kvm/disk/blk.c + create mode 100644 tools/kvm/disk/core.c + create mode 100644 tools/kvm/disk/qcow.c + create mode 100644 tools/kvm/disk/raw.c + create mode 100644 tools/kvm/framebuffer.c + create mode 100644 tools/kvm/guest/init.c + create mode 100644 tools/kvm/guest/init_stage2.c + create mode 100644 tools/kvm/guest/passwd + create mode 100644 tools/kvm/guest_compat.c + create mode 100644 tools/kvm/hw/i8042.c + create mode 100644 tools/kvm/hw/pci-shmem.c + create mode 100644 tools/kvm/hw/rtc.c + create mode 100644 tools/kvm/hw/serial.c + create mode 100644 tools/kvm/hw/vesa.c + create mode 100644 tools/kvm/include/asm/hweight.h + create mode 100644 tools/kvm/include/bios/memcpy.h + create mode 100644 tools/kvm/include/kvm/8250-serial.h + create mode 100644 tools/kvm/include/kvm/apic.h + create mode 100644 tools/kvm/include/kvm/brlock.h + create mode 100644 tools/kvm/include/kvm/builtin-balloon.h + create mode 100644 tools/kvm/include/kvm/builtin-debug.h + create mode 100644 tools/kvm/include/kvm/builtin-help.h + create mode 100644 tools/kvm/include/kvm/builtin-list.h + create mode 100644 tools/kvm/include/kvm/builtin-pause.h + create mode 100644 tools/kvm/include/kvm/builtin-resume.h + create mode 100644 tools/kvm/include/kvm/builtin-run.h + create mode 100644 tools/kvm/include/kvm/builtin-sandbox.h + create mode 100644 tools/kvm/include/kvm/builtin-setup.h + create mode 100644 tools/kvm/include/kvm/builtin-stat.h + create mode 100644 tools/kvm/include/kvm/builtin-stop.h + create mode 100644 tools/kvm/include/kvm/builtin-version.h + create mode 100644 tools/kvm/include/kvm/compiler.h + create mode 100644 tools/kvm/include/kvm/disk-image.h + create mode 100644 tools/kvm/include/kvm/e820.h + create mode 100644 tools/kvm/include/kvm/framebuffer.h + create mode 100644 tools/kvm/include/kvm/guest_compat.h + create mode 100644 tools/kvm/include/kvm/i8042.h + create mode 100644 tools/kvm/include/kvm/ioeventfd.h + create mode 100644 tools/kvm/include/kvm/ioport.h + create mode 100644 tools/kvm/include/kvm/irq.h + create mode 100644 tools/kvm/include/kvm/kvm-cmd.h + create mode 100644 tools/kvm/include/kvm/kvm-cpu.h + create mode 100644 tools/kvm/include/kvm/kvm-ipc.h + create mode 100644 tools/kvm/include/kvm/kvm.h + create mode 100644 tools/kvm/include/kvm/msi.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/compiler.h + create mode 100644 tools/kvm/include/linux/kernel.h + create mode 100644 tools/kvm/include/linux/module.h + create mode 100644 tools/kvm/include/linux/prefetch.h + create mode 100644 tools/kvm/include/linux/types.h + create mode 100644 tools/kvm/ioeventfd.c + create mode 100644 tools/kvm/ioport.c + create mode 100644 tools/kvm/kvm-cmd.c + create mode 100644 tools/kvm/kvm-cpu.c + create mode 100644 tools/kvm/kvm-ipc.c + create mode 100644 tools/kvm/kvm.c + create mode 100644 tools/kvm/main.c + create mode 100644 tools/kvm/mmio.c + create mode 100644 tools/kvm/net/uip/arp.c + create mode 100644 tools/kvm/net/uip/buf.c + create mode 100644 tools/kvm/net/uip/core.c + create mode 100644 tools/kvm/net/uip/csum.c + create mode 100644 tools/kvm/net/uip/dhcp.c + create mode 100644 tools/kvm/net/uip/icmp.c + create mode 100644 tools/kvm/net/uip/ipv4.c + create mode 100644 tools/kvm/net/uip/tcp.c + create mode 100644 tools/kvm/net/uip/udp.c + create mode 100644 tools/kvm/pci.c + create mode 100644 tools/kvm/powerpc/cpu_info.c + create mode 100644 tools/kvm/powerpc/cpu_info.h + create mode 100644 tools/kvm/powerpc/include/kvm/barrier.h + create mode 100644 tools/kvm/powerpc/include/kvm/kvm-arch.h + create mode 100644 tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h + create mode 100644 tools/kvm/powerpc/ioport.c + create mode 100644 tools/kvm/powerpc/irq.c + create mode 100644 tools/kvm/powerpc/kvm-cpu.c + create mode 100644 tools/kvm/powerpc/kvm.c + create mode 100644 tools/kvm/powerpc/spapr.h + create mode 100644 tools/kvm/powerpc/spapr_hcall.c + create mode 100644 tools/kvm/powerpc/spapr_hvcons.c + create mode 100644 tools/kvm/powerpc/spapr_hvcons.h + create mode 100644 tools/kvm/powerpc/spapr_pci.c + create mode 100644 tools/kvm/powerpc/spapr_pci.h + create mode 100644 tools/kvm/powerpc/spapr_rtas.c + create mode 100644 tools/kvm/powerpc/xics.c + create mode 100644 tools/kvm/powerpc/xics.h + create mode 100644 tools/kvm/symbol.c + create mode 100644 tools/kvm/term.c + create mode 100644 tools/kvm/tests/Makefile + create mode 100644 tools/kvm/tests/boot/Makefile + create mode 100644 tools/kvm/tests/boot/init.c + create mode 100644 tools/kvm/tests/kernel/.gitignore + create mode 100644 tools/kvm/tests/kernel/Makefile + create mode 100644 tools/kvm/tests/kernel/README + create mode 100644 tools/kvm/tests/kernel/kernel.S + create mode 100644 tools/kvm/tests/pit/.gitignore + create mode 100644 tools/kvm/tests/pit/Makefile + create mode 100644 tools/kvm/tests/pit/README + create mode 100644 tools/kvm/tests/pit/tick.S + create mode 100644 tools/kvm/ui/sdl.c + create mode 100644 tools/kvm/ui/vnc.c + create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN + create mode 100755 tools/kvm/util/generate-cmdlist.sh + create mode 100755 tools/kvm/util/kvm-ifup-vbr0 + create mode 100644 tools/kvm/util/parse-options.c + create mode 100644 tools/kvm/util/rbtree-interval.c + create mode 100644 tools/kvm/util/read-write.c + create mode 100755 tools/kvm/util/set_private_br.sh + create mode 100644 tools/kvm/util/strbuf.c + create mode 100644 tools/kvm/util/threadpool.c + create mode 100644 tools/kvm/util/util.c + create mode 100644 tools/kvm/virtio/9p-pdu.c + create mode 100644 tools/kvm/virtio/9p.c + create mode 100644 tools/kvm/virtio/balloon.c + create mode 100644 tools/kvm/virtio/blk.c + create mode 100644 tools/kvm/virtio/console.c + create mode 100644 tools/kvm/virtio/core.c + create mode 100644 tools/kvm/virtio/net.c + create mode 100644 tools/kvm/virtio/pci.c + create mode 100644 tools/kvm/virtio/rng.c + create mode 100644 tools/kvm/virtio/trans.c + create mode 100644 tools/kvm/x86/bios.c + create mode 100644 tools/kvm/x86/bios/.gitignore + create mode 100644 tools/kvm/x86/bios/bios-rom.S + create mode 100644 tools/kvm/x86/bios/e820.c + create mode 100644 tools/kvm/x86/bios/entry.S + create mode 100644 tools/kvm/x86/bios/gen-offsets.sh + create mode 100644 tools/kvm/x86/bios/int10.c + create mode 100644 tools/kvm/x86/bios/int15.c + create mode 100644 tools/kvm/x86/bios/local.S + create mode 100644 tools/kvm/x86/bios/macro.S + create mode 100644 tools/kvm/x86/bios/memcpy.c + create mode 100644 tools/kvm/x86/bios/rom.ld.S + create mode 100644 tools/kvm/x86/cpuid.c + create mode 100644 tools/kvm/x86/include/kvm/assembly.h + create mode 100644 tools/kvm/x86/include/kvm/barrier.h + create mode 100644 tools/kvm/x86/include/kvm/bios-export.h + create mode 100644 tools/kvm/x86/include/kvm/bios.h + create mode 100644 tools/kvm/x86/include/kvm/boot-protocol.h + create mode 100644 tools/kvm/x86/include/kvm/cpufeature.h + create mode 100644 tools/kvm/x86/include/kvm/interrupt.h + create mode 100644 tools/kvm/x86/include/kvm/kvm-arch.h + create mode 100644 tools/kvm/x86/include/kvm/kvm-cpu-arch.h + create mode 100644 tools/kvm/x86/include/kvm/mptable.h + create mode 100644 tools/kvm/x86/interrupt.c + create mode 100644 tools/kvm/x86/ioport.c + create mode 100644 tools/kvm/x86/irq.c + create mode 100644 tools/kvm/x86/kvm-cpu.c + create mode 100644 tools/kvm/x86/kvm.c + create mode 100644 tools/kvm/x86/mptable.c +Merging dma-mapping/dma-mapping-next (e972541 common: DMA-mapping: add NON-CONSISTENT attribute) +$ git merge dma-mapping/dma-mapping-next +Auto-merging lib/swiotlb.c +Auto-merging drivers/iommu/intel-iommu.c +Auto-merging arch/powerpc/kernel/ibmebus.c +Auto-merging arch/hexagon/kernel/dma.c +Merge made by the 'recursive' strategy. + Documentation/DMA-attributes.txt | 19 +++++++++++++++++++ + arch/alpha/include/asm/dma-mapping.h | 18 ++++++++++++------ + arch/alpha/kernel/pci-noop.c | 10 ++++++---- + arch/alpha/kernel/pci_iommu.c | 10 ++++++---- + arch/hexagon/include/asm/dma-mapping.h | 18 ++++++++++++------ + arch/hexagon/kernel/dma.c | 9 +++++---- + arch/ia64/hp/common/sba_iommu.c | 11 ++++++----- + arch/ia64/include/asm/dma-mapping.h | 18 ++++++++++++------ + arch/ia64/kernel/pci-swiotlb.c | 9 +++++---- + arch/ia64/sn/pci/pci_dma.c | 9 +++++---- + arch/microblaze/include/asm/dma-mapping.h | 18 ++++++++++++------ + arch/microblaze/kernel/dma.c | 10 ++++++---- + arch/mips/cavium-octeon/dma-octeon.c | 16 ++++++++-------- + arch/mips/include/asm/dma-mapping.h | 18 ++++++++++++------ + arch/mips/mm/dma-default.c | 8 ++++---- + arch/powerpc/include/asm/dma-mapping.h | 24 ++++++++++++++++-------- + arch/powerpc/kernel/dma-iommu.c | 10 ++++++---- + arch/powerpc/kernel/dma-swiotlb.c | 4 ++-- + arch/powerpc/kernel/dma.c | 10 ++++++---- + arch/powerpc/kernel/ibmebus.c | 10 ++++++---- + arch/powerpc/kernel/vio.c | 14 ++++++++------ + arch/powerpc/platforms/cell/iommu.c | 16 +++++++++------- + arch/powerpc/platforms/ps3/system-bus.c | 13 +++++++------ + arch/sh/include/asm/dma-mapping.h | 28 ++++++++++++++++++---------- + arch/sh/kernel/dma-nommu.c | 4 ++-- + arch/sh/mm/consistent.c | 6 ++++-- + arch/sparc/include/asm/dma-mapping.h | 18 ++++++++++++------ + arch/sparc/kernel/iommu.c | 10 ++++++---- + arch/sparc/kernel/ioport.c | 18 ++++++++++-------- + arch/sparc/kernel/pci_sun4v.c | 9 +++++---- + arch/unicore32/include/asm/dma-mapping.h | 18 ++++++++++++------ + arch/unicore32/mm/dma-swiotlb.c | 4 ++-- + arch/x86/include/asm/dma-mapping.h | 26 ++++++++++++++++---------- + arch/x86/kernel/amd_gart_64.c | 11 ++++++----- + arch/x86/kernel/pci-calgary_64.c | 9 +++++---- + arch/x86/kernel/pci-dma.c | 3 ++- + arch/x86/kernel/pci-nommu.c | 6 +++--- + arch/x86/kernel/pci-swiotlb.c | 12 +++++++----- + arch/x86/xen/pci-swiotlb-xen.c | 4 ++-- + drivers/iommu/amd_iommu.c | 10 ++++++---- + drivers/iommu/intel-iommu.c | 9 +++++---- + drivers/xen/swiotlb-xen.c | 5 +++-- + include/linux/dma-attrs.h | 2 ++ + include/linux/dma-mapping.h | 13 +++++++++---- + include/linux/swiotlb.h | 6 ++++-- + include/xen/swiotlb-xen.h | 6 ++++-- + lib/swiotlb.c | 5 +++-- + 47 files changed, 338 insertions(+), 206 deletions(-) +Merging ktest/for-next (be405f9 ktest: Add INGORE_ERRORS to ignore warnings in boot up) +$ git merge ktest/for-next +Already up-to-date. +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: acerhdf: add support for new hardware +Applying: acerhdf: lowered default temp fanon/fanoff values +Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver +Applying: x86, olpc-xo15-sci: enable lid close wakeup control through sysfs +Applying: geos: platform driver for Geos and Geos2 single-board computers +Applying: platform-drivers-x86: convert drivers/platform/x86/* to use module_platform_driver() +Applying: platform, x86: kill off Moorestown +Applying: intel_scu_ipc: remove Moorestown support +Applying: platform-x86: intel_mid_thermal: add msic_thermal alias +Applying: platform-x86: intel_mid_thermal: convert to use Intel MSIC API +Applying: platform-x86: intel_mid_thermal: turn off thermistor voltage by default +Applying: intel_mid_powerbtn: use MSIC read/write instead of ipc_scu +Applying: intel_mid_powerbtn: mark irq as IRQF_NO_SUSPEND +Applying: x86, olpc: add debugfs interface for EC commands +Applying: x86, mm: fix the size calculation of mapping tables +Applying: alix2: supplement driver to include GPIO button support +Applying: alix2-supplement-driver-to-include-gpio-button-support-fix +Applying: alix2-supplement-driver-to-include-gpio-button-support-fix-2 +Applying: x86: net5501: platform driver for Soekris Engineering net5501 single-board computer +Applying: net5501-platform-driver-for-soekris-engineering-net5501-single-board-computer-fix +Applying: drivers/platform/x86/sony-laptop.c: fix scancodes +Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file +Applying: arm, exec: remove redundant set_fs(USER_DS) +Applying: fs/btrfs/inode-map.c: fix warnings +Applying: net: use this_cpu_xxx replace percpu_xxx funcs +Applying: x86: use this_cpu_xxx to replace percpu_xxx funcs +Applying: x86: change percpu_read_stable() to this_cpu_read_stable() +Applying: percpu: remove percpu_xxx() functions +Applying: Subject irqs: fix long-term regression in genirq irq_set_irq_type() handling +Applying: irqs: fix handling of pending IRQs at request time +Applying: hrtimers: Special-case zero length sleeps +Applying: cs5535-clockevt: don't ignore MFGPT on SMP-capable kernels +Applying: cs5535-clockevt: allow the MFGPT IRQ to be shared +Applying: hpet: factor timer allocate from open +Applying: drivers/thermal/thermal_sys.c: fix build warning +Applying: thermal-thermal_sys-fix-build-warning-fix +Applying: thermal_sys: remove unnecessary line continuations +Applying: thermal_sys: remove obfuscating used-once macros +Applying: thermal_sys: kernel style cleanups +Applying: thermal_sys: convert printks to pr_<level> +Applying: bluetooth: add support for BCM20702A0 [0a5c:21e6] +Applying: debugobjects: Fix selftest for static warnings +Applying: ocfs2: use find_last_bit() +Applying: ocfs2: use bitmap_weight() +Applying: drivers/scsi/aacraid/commctrl.c: fix mem leak in aac_send_raw_srb() +Applying: drivers/scsi/mpt2sas/mpt2sas_base.c: fix mismatch in mpt2sas_base_hard_reset_handler() mutex lock-unlock +Applying: drivers/scsi/mpt2sas/mpt2sas_scsih.c: spell "primitive" correctly +Applying: drivers/scsi/hpsa.c: use find_first_zero_bit() +Applying: MAINTAINERS: Staging: cx25821: Add L: linux-media +Applying: mm, oom: avoid looping when chosen thread detaches its mm +Applying: mm, oom: fold oom_kill_task() into oom_kill_process() +Applying: mm, oom: do not emit oom killer warning if chosen thread is already exiting +Applying: mm: add rss counters consistency check +Applying: mm/vmscan.c: cleanup with s/reclaim_mode/isolate_mode/ +Applying: mm: make get_mm_counter static-inline +Applying: mm: vmscan: fix misused nr_reclaimed in shrink_mem_cgroup_zone() +Applying: mm: make swapin readahead skip over holes +Applying: make-swapin-readahead-skip-over-holes-fix +Applying: vmscan: reclaim at order 0 when compaction is enabled +Applying: vmscan: kswapd carefully call compaction +Applying: vmscan-kswapd-carefully-call-compaction-fix +Applying: vmscan: only defer compaction for failed order and higher +Applying: compact_pgdat: workaround lockdep warning in kswapd +Applying: mm: compaction: make compact_control order signed +Applying: mm-compaction-make-compact_control-order-signed-fix +Applying: hugetlbfs: fix hugetlb_get_unmapped_area() +Applying: hugetlb: drop prev_vma in hugetlb_get_unmapped_area_topdown() +Applying: hugetlb: try to search again if it is really needed +Applying: hugetlb-try-to-search-again-if-it-is-really-needed-fix +Applying: mm: do not reset cached_hole_size when vma is unmapped +Applying: mm: search from free_area_cache for the bigger size +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: memcg: replace MEM_CONT by MEM_RES_CTLR +Applying: memcg: replace mem and mem_cont stragglers +Applying: memcg: lru_size instead of MEM_CGROUP_ZSTAT +Applying: memcg: enum lru_list lru +Applying: memcg: remove redundant returns +Applying: memcg: remove unnecessary thp check in page stat accounting +Applying: idr: make idr_get_next() good for rcu_read_lock() +Applying: cgroup: revert ss_id_lock to spinlock +Applying: memcg: let css_get_next() rely upon rcu_read_lock() +Applying: memcg: remove PCG_CACHE page_cgroup flag +Applying: memcg-remove-pcg_cache-page_cgroup-flag-checkpatch-fixes +Applying: magic.h: move some FS magic numbers into magic.h +Applying: nmi watchdog: do not use cpp symbol in Kconfig +Applying: ceph, cifs, nfs, fuse: boolean and / or confusion +Applying: prctl: add PR_{SET,GET}_CHILD_SUBREAPER to allow simple process supervision +Applying: prctl-add-pr_setget_child_subreaper-to-allow-simple-process-supervision-fix +Applying: prctl-add-pr_setget_child_subreaper-to-allow-simple-process-supervision-fix-fix +Applying: prctl-add-pr_setget_child_subreaper-to-allow-simple-process-supervision-fix-fix-fix +Applying: kernel/exit.c: if init dies, log a signal which killed it, if any +Applying: kernel-exitc-if-init-dies-log-a-signal-which-killed-it-if-any-fix +Applying: smp: start up non-boot CPUs asynchronously +Applying: smp-start-up-non-boot-cpus-asynchronously-fix +Applying: vfs: increment iversion when a file is truncated +Applying: brlocks/lglocks: cleanups +Applying: brlocks-lglocks-cleanups-checkpatch-fixes +Applying: vfs: correctly set the dir i_mutex lockdep class +Applying: seq_file: fix mishandling of consecutive pread() invocations. +Applying: MAINTAINERS: fix REMOTEPROC F: typo +Applying: backlight: convert backlight i2c drivers to module_i2c_driver +Applying: backlight: convert backlight spi drivers to module_spi_driver +Applying: drivers/video/backlight/wm831x_bl.c: use devm_ functions +Applying: drivers/video/backlight: use devm_ functions +Applying: drivers/video/backlight/adp5520_bl.c: use devm_ functions +Applying: backlight: new backlight driver for LP855x devices +Applying: backlight: lp855x_bl: Add missing mutex_unlock in lp855x_read_byte error path +Applying: backlight/lp855x_bl.c: check platform data in lp855x_probe() +Applying: backlight/lp855x_bl.c: small cleanups +Applying: backlight: add driver for Bachmann's ot200 +Applying: backlight-add-driver-for-bachmanns-ot200-fix +Applying: backlight: add support for Pandora backlight +Applying: bitops: rename for_each_set_bit_cont() in favor of analogous list.h function +Applying: bitops: remove for_each_set_bit_cont() +Applying: bitops: introduce for_each_clear_bit() +Applying: mtd: use for_each_clear_bit() +Applying: s390/char: use for_each_clear_bit() +Applying: uwb: use for_each_clear_bit() +Applying: x86: use for_each_clear_bit_from() +Applying: drivers/leds/leds-lp5521.c: fix typo +Applying: drivers/leds/leds-tca6507.c: cleanup error handling in tca6507_probe() +Applying: drivers/leds/leds-lp5521.c: add 'name' in the lp5521_led_config +Applying: drivers/leds/leds-lp5521.c: add 'update_config' in the lp5521_platform_data +Applying: drivers/leds/leds-lp5521.c: support led pattern data +Applying: leds-lp5521-support-led-pattern-data-checkpatch-fixes +Applying: drivers/leds/leds-lp5521.c: redefinition of register bits +Applying: drivers/leds/leds-lp5523.c: constify some data +Applying: drivers/leds: add driver for PCA9663 I2C chip +Applying: drivers-leds-add-driver-for-pca9663-i2c-chip-fix +Applying: drivers-leds-add-driver-for-pca9663-i2c-chip-fix-2 +Applying: drivers/leds/leds-gpio.c: use linux/gpio.h rather than asm/gpio.h +Applying: string: memchr_inv speed improvements +Applying: include/ and checkpatch: prefer __scanf to __attribute__((format(scanf,...) +Applying: crc32: remove two instances of trailing whitespaces +Applying: crc32: move long comment about crc32 fundamentals to Documentation/ +Applying: crc32-move-long-comment-about-crc32-fundamentals-to-documentation-fix +Applying: crc32: simplify unit test code +Applying: crc32: miscellaneous cleanups +Applying: crc32: fix mixing of endian-specific types +Applying: crc32: make CRC_*_BITS definition correspond to actual bit counts +Applying: crc32: add slice-by-8 algorithm to existing code +Applying: crc32: optimize loop counter for x86 +Applying: crc32: add note about this patchset to crc32.c +Applying: crc32: bolt on crc32c +Applying: crc32: Don't reference unnecessary crc32 tables in single-bit mode +Applying: crypto: crc32c should use library implementation +Applying: crc32: add self-test code for crc32c +Applying: crc32: select an algorithm via Kconfig +Applying: epoll: comment the funky #ifdef +Applying: init/do_mounts.c: create /root if it does not exist +Applying: rtc-spear: fix for balancing the enable_irq_wake in Power Mgmt +Applying: rtc/spear: fix for RTC_AIE_ON and RTC_AIE_OFF ioctl errors +Applying: rtc/rtc-spear: call platform_set_drvdata() before registering rtc device +Applying: rtc: convert rtc spi drivers to module_spi_driver +Applying: rtc: convert rtc i2c drivers to module_i2c_driver +Applying: MIPS: add RTC support for loongson1B +Applying: drivers/rtc/rtc-twl.c: optimize IRQ bit access +Applying: drivers/rtc/rtc-twl.c: enable RTC irrespective of its prior state +Applying: drivers/rtc/rtc-twl.c: simplify RTC interrupt clearing +Applying: drivers/rtc/rtc-twl.c: return correct RTC event from ISR +Applying: drivers/rtc: remove IRQF_DISABLED +Applying: drivers/rtc/rtc-pm8xxx.c: make pm8xxx_rtc_pm_ops static +Applying: drivers/rtc/rtc-ds1307.c: generalise ram size and offset +Applying: drivers/rtc/rtc-max8925.c: fix max8925_rtc_read_alarm() return value error +Applying: drivers/rtc/rtc-max8925.c: fix alarm->enabled mistake in max8925_rtc_read_alarm/max8925_rtc_set_alarm +Applying: rtc: driver for DA9052/53 PMIC v1 +Applying: rtc-rtc-driver-for-da9052-53-pmic-v1-fix +Applying: kmod: avoid deadlock from recursive kmod call +Applying: kmod-avoid-deadlock-by-recursive-kmod-call-fix +Applying: fs/proc/kcore.c: make get_sparsemem_vmemmap_info() static +Applying: proc: speedup /proc/stat handling +Applying: procfs: add num_to_str() to speed up /proc/stat +Applying: procfs-add-num_to_str-to-speed-up-proc-stat-fix +Applying: procfs: avoid breaking the ABI in /proc/stat +Applying: procfs: speed up /proc/pid/stat, statm +Applying: procfs-speed-up-proc-pid-stat-statm-checkpatch-fixes +Applying: proc: clean up /proc/<pid>/environ handling +Applying: seq_file: add seq_set_overflow(), seq_overflow() +Applying: seq_file-add-seq_set_overflow-seq_overflow-fix +Applying: smp: introduce a generic on_each_cpu_mask() function +Applying: arm: move arm over to generic on_each_cpu_mask +Applying: tile: move tile to use generic on_each_cpu_mask +Applying: smp: add func to IPI cpus based on parameter func +Applying: smp-add-func-to-ipi-cpus-based-on-parameter-func-fix +Applying: smp-add-func-to-ipi-cpus-based-on-parameter-func-update +Applying: slub: only IPI CPUs that have per cpu obj to flush +Applying: fs: only send IPI to invalidate LRU BH when needed +Applying: mm: only IPI CPUs to drain local pages if they exist +Applying: mm-only-ipi-cpus-to-drain-local-pages-if-they-exist-update +Applying: cpumask: avoid mask based num_possible_cpus() and num_online_cpus() +Applying: ipc/sem.c: alternatives to preempt_disable() +Applying: ipc: provide generic compat versions of IPC syscalls +Applying: ipmi: decrease the IPMI message transaction time in interrupt mode +Applying: ipmi: increase KCS timeouts +Applying: ipmi: use a tasklet for handling received messages +Applying: ipmi: fix message handling during panics +Applying: ipmi: simplify locking +Applying: ipmi: use locks on watchdog timeout set on reboot +Applying: sysctl: use bitmap library functions +Using index info to reconstruct a base tree... +Falling back to patching base and 3-way merge... +Auto-merging kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +Failed to merge in the changes. +Patch failed at 0204 sysctl: use bitmap library functions + +When you have resolved this problem run "git rebase --continue". +If you would prefer to skip this patch, instead run "git rebase --skip". +To check out the original branch and stop rebasing run "git rebase --abort". + +$ git rebase --continue +Applying: pidns: add reboot_pid_ns() to handle the reboot syscall +Applying: pidns-add-reboot_pid_ns-to-handle-the-reboot-syscall-fix +Applying: pidns-add-reboot_pid_ns-to-handle-the-reboot-syscall-checkpatch-fixes +Applying: fs/proc/namespaces.c: prevent crash when ns_entries[] is empty +Applying: sysctl: make kernel.ns_last_pid control dependent on CHECKPOINT_RESTORE +Applying: ramoops: use pstore interface +Applying: ramoops: fix printk format warnings +Applying: notify_change(): check that i_mutex is held +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm +From ../rebase-tmp + + 6dc9ada...64a741a akpm -> akpm (forced update) +$ rm -rf ../rebase-tmp +Merging akpm (64a741a notify_change(): check that i_mutex is held) +$ git merge --no-ff akpm +Removing include/linux/rar_register.h +Removing drivers/platform/x86/intel_rar_register.c +Removing drivers/leds/leds-net5501.c +Merge made by the 'recursive' strategy. + Documentation/00-INDEX | 2 + + Documentation/ABI/testing/debugfs-olpc | 16 + + Documentation/backlight/lp855x-driver.txt | 81 ++ + Documentation/crc32.txt | 183 ++++ + Documentation/laptops/sony-laptop.txt | 5 + + Documentation/leds/leds-lp5521.txt | 63 ++ + Documentation/ramoops.txt | 8 +- + Documentation/sysctl/vm.txt | 16 + + MAINTAINERS | 7 +- + arch/Kconfig | 6 + + arch/arm/include/asm/processor.h | 1 - + arch/arm/kernel/smp_tlb.c | 20 +- + arch/arm/mach-ux500/mbox-db5500.c | 2 +- + arch/blackfin/Kconfig | 1 + + arch/blackfin/include/asm/irq.h | 4 - + arch/mips/Kconfig | 1 + + arch/mn10300/Kconfig | 1 + + arch/mn10300/include/asm/reset-regs.h | 4 - + arch/powerpc/Kconfig | 1 + + arch/s390/Kconfig | 1 + + arch/sparc/Kconfig | 2 + + arch/sparc/include/asm/irq_64.h | 1 - + arch/tile/include/asm/compat.h | 11 - + arch/tile/include/asm/smp.h | 7 - + arch/tile/kernel/compat.c | 43 - + arch/tile/kernel/smp.c | 19 - + arch/x86/Kconfig | 14 + + arch/x86/include/asm/current.h | 2 +- + arch/x86/include/asm/desc.h | 1 + + arch/x86/include/asm/hardirq.h | 9 +- + arch/x86/include/asm/irq_regs.h | 4 +- + arch/x86/include/asm/mmu_context.h | 12 +- + arch/x86/include/asm/percpu.h | 24 +- + arch/x86/include/asm/smp.h | 4 +- + arch/x86/include/asm/stackprotector.h | 4 +- + arch/x86/include/asm/thread_info.h | 2 +- + arch/x86/include/asm/tlbflush.h | 4 +- + arch/x86/kernel/cpu/common.c | 2 +- + arch/x86/kernel/cpu/mcheck/mce.c | 4 +- + arch/x86/kernel/cpu/perf_event.c | 4 +- + arch/x86/kernel/irqinit.c | 6 +- + arch/x86/kernel/nmi_selftest.c | 1 + + arch/x86/kernel/paravirt.c | 12 +- + arch/x86/kernel/process_32.c | 2 +- + arch/x86/kernel/process_64.c | 12 +- + arch/x86/kernel/sys_x86_64.c | 34 +- + arch/x86/mm/hugetlbpage.c | 31 +- + arch/x86/mm/init.c | 21 +- + arch/x86/mm/tlb.c | 10 +- + arch/x86/platform/geode/Makefile | 2 + + arch/x86/platform/geode/alix.c | 76 ++- + arch/x86/platform/geode/geos.c | 128 +++ + arch/x86/platform/geode/net5501.c | 154 +++ + arch/x86/platform/iris/iris.c | 67 ++- + arch/x86/platform/olpc/olpc-xo15-sci.c | 67 ++ + arch/x86/platform/olpc/olpc.c | 86 ++ + crypto/Kconfig | 1 + + crypto/crc32c.c | 94 +-- + drivers/bluetooth/btusb.c | 1 + + drivers/char/Kconfig | 1 + + drivers/char/hpet.c | 56 +- + drivers/char/ipmi/ipmi_kcs_sm.c | 4 +- + drivers/char/ipmi/ipmi_msghandler.c | 242 +++--- + drivers/char/ipmi/ipmi_si_intf.c | 72 +- + drivers/char/ipmi/ipmi_watchdog.c | 21 +- + drivers/char/ramoops.c | 204 ++++- + drivers/clocksource/cs5535-clockevt.c | 3 +- + drivers/leds/Kconfig | 18 +- + drivers/leds/Makefile | 2 +- + drivers/leds/leds-gpio.c | 3 +- + drivers/leds/leds-lp5521.c | 145 +++- + drivers/leds/leds-lp5523.c | 6 +- + drivers/leds/leds-net5501.c | 97 -- + drivers/leds/leds-pca9633.c | 195 ++++ + drivers/leds/leds-tca6507.c | 8 +- + drivers/mtd/chips/cfi_cmdset_0001.c | 6 +- + drivers/mtd/mtdchar.c | 2 +- + drivers/platform/x86/Kconfig | 24 +- + drivers/platform/x86/Makefile | 1 - + drivers/platform/x86/acerhdf.c | 67 +- + drivers/platform/x86/intel_mid_powerbtn.c | 46 +- + drivers/platform/x86/intel_mid_thermal.c | 60 +- + drivers/platform/x86/intel_rar_register.c | 669 ------------- + drivers/platform/x86/intel_scu_ipc.c | 208 +---- + drivers/platform/x86/intel_scu_ipcutil.c | 32 +- + drivers/platform/x86/sony-laptop.c | 16 +- + drivers/platform/x86/xo1-rfkill.c | 13 +- + drivers/rtc/Kconfig | 17 + + drivers/rtc/Makefile | 2 + + drivers/rtc/rtc-at91sam9.c | 2 +- + drivers/rtc/rtc-bq32k.c | 12 +- + drivers/rtc/rtc-cmos.c | 2 +- + drivers/rtc/rtc-coh901331.c | 2 +- + drivers/rtc/rtc-da9052.c | 293 ++++++ + drivers/rtc/rtc-davinci.c | 2 +- + drivers/rtc/rtc-ds1305.c | 12 +- + drivers/rtc/rtc-ds1307.c | 115 ++- + drivers/rtc/rtc-ds1374.c | 13 +- + drivers/rtc/rtc-ds1390.c | 12 +- + drivers/rtc/rtc-ds1511.c | 2 +- + drivers/rtc/rtc-ds1553.c | 2 +- + drivers/rtc/rtc-ds1672.c | 13 +- + drivers/rtc/rtc-ds3232.c | 13 +- + drivers/rtc/rtc-ds3234.c | 12 +- + drivers/rtc/rtc-em3027.c | 13 +- + drivers/rtc/rtc-fm3130.c | 12 +- + drivers/rtc/rtc-isl12022.c | 13 +- + drivers/rtc/rtc-isl1208.c | 15 +- + drivers/rtc/rtc-lpc32xx.c | 2 +- + drivers/rtc/rtc-ls1x.c | 211 +++++ + drivers/rtc/rtc-m41t80.c | 13 +- + drivers/rtc/rtc-m41t93.c | 12 +- + drivers/rtc/rtc-m41t94.c | 14 +- + drivers/rtc/rtc-max6900.c | 13 +- + drivers/rtc/rtc-max6902.c | 12 +- + drivers/rtc/rtc-max8925.c | 21 +- + drivers/rtc/rtc-mpc5121.c | 4 +- + drivers/rtc/rtc-mrst.c | 2 +- + drivers/rtc/rtc-mv.c | 2 +- + drivers/rtc/rtc-nuc900.c | 2 +- + drivers/rtc/rtc-omap.c | 4 +- + drivers/rtc/rtc-pcf2123.c | 13 +- + drivers/rtc/rtc-pcf8563.c | 13 +- + drivers/rtc/rtc-pcf8583.c | 13 +- + drivers/rtc/rtc-pl030.c | 2 +- + drivers/rtc/rtc-pl031.c | 2 +- + drivers/rtc/rtc-pm8xxx.c | 2 +- + drivers/rtc/rtc-pxa.c | 4 +- + drivers/rtc/rtc-r9701.c | 12 +- + drivers/rtc/rtc-rs5c348.c | 13 +- + drivers/rtc/rtc-rs5c372.c | 13 +- + drivers/rtc/rtc-rv3029c2.c | 13 +- + drivers/rtc/rtc-rx8025.c | 13 +- + drivers/rtc/rtc-rx8581.c | 13 +- + drivers/rtc/rtc-s35390a.c | 13 +- + drivers/rtc/rtc-s3c.c | 4 +- + drivers/rtc/rtc-sa1100.c | 4 +- + drivers/rtc/rtc-sh.c | 8 +- + drivers/rtc/rtc-spear.c | 100 ++- + drivers/rtc/rtc-stk17ta8.c | 2 +- + drivers/rtc/rtc-twl.c | 28 +- + drivers/rtc/rtc-tx4939.c | 2 +- + drivers/rtc/rtc-vr41xx.c | 4 +- + drivers/rtc/rtc-x1205.c | 13 +- + drivers/s390/char/sclp_cmd.c | 5 +- + drivers/scsi/aacraid/commctrl.c | 1 + + drivers/scsi/hpsa.c | 18 +- + drivers/scsi/mpt2sas/mpt2sas_base.c | 3 +- + drivers/scsi/mpt2sas/mpt2sas_scsih.c | 6 +- + drivers/thermal/thermal_sys.c | 90 +-- + drivers/uwb/allocator.c | 6 +- + drivers/video/backlight/88pm860x_bl.c | 8 +- + drivers/video/backlight/Kconfig | 21 + + drivers/video/backlight/Makefile | 4 +- + drivers/video/backlight/aat2870_bl.c | 9 +- + drivers/video/backlight/adp5520_bl.c | 6 +- + drivers/video/backlight/adp8860_bl.c | 12 +- + drivers/video/backlight/adp8870_bl.c | 12 +- + drivers/video/backlight/ams369fg06.c | 13 +- + drivers/video/backlight/corgi_lcd.c | 12 +- + drivers/video/backlight/cr_bllcd.c | 3 +- + drivers/video/backlight/da903x_bl.c | 6 +- + drivers/video/backlight/l4f00242t03.c | 13 +- + drivers/video/backlight/ld9040.c | 13 +- + drivers/video/backlight/lms283gf05.c | 13 +- + drivers/video/backlight/lp855x_bl.c | 322 +++++++ + drivers/video/backlight/ltv350qv.c | 12 +- + drivers/video/backlight/max8925_bl.c | 7 +- + drivers/video/backlight/omap1_bl.c | 9 +- + drivers/video/backlight/ot200_bl.c | 175 ++++ + drivers/video/backlight/pandora_bl.c | 168 ++++ + drivers/video/backlight/pcf50633-backlight.c | 16 +- + drivers/video/backlight/pwm_bl.c | 7 +- + drivers/video/backlight/s6e63m0.c | 13 +- + drivers/video/backlight/tdo24m.c | 12 +- + drivers/video/backlight/tosa_bl.c | 13 +- + drivers/video/backlight/tosa_lcd.c | 13 +- + drivers/video/backlight/vgg2432a4.c | 15 +- + drivers/video/backlight/wm831x_bl.c | 6 +- + fs/attr.c | 8 +- + fs/binfmt_misc.c | 3 +- + fs/block_dev.c | 3 +- + fs/btrfs/inode-map.c | 4 +- + fs/buffer.c | 15 +- + fs/cifs/cifsfs.c | 2 +- + fs/dcache.c | 4 +- + fs/eventpoll.c | 25 + + fs/file_table.c | 17 +- + fs/hugetlbfs/inode.c | 15 +- + fs/inode.c | 3 +- + fs/internal.h | 3 +- + fs/namei.c | 24 +- + fs/namespace.c | 140 ++-- + fs/ocfs2/cluster/heartbeat.c | 40 +- + fs/pipe.c | 1 + + fs/pnode.c | 4 +- + fs/proc/array.c | 119 ++-- + fs/proc/base.c | 55 +- + fs/proc/kcore.c | 6 +- + fs/proc/namespaces.c | 6 +- + fs/proc/stat.c | 62 +- + fs/proc_namespace.c | 4 +- + fs/seq_file.c | 112 ++- + include/linux/bitops.h | 13 +- + include/linux/cgroup.h | 2 +- + include/linux/compaction.h | 20 +- + include/linux/compat.h | 12 +- + include/linux/compiler-gcc.h | 3 +- + include/linux/cpumask.h | 9 +- + include/linux/crc32.h | 2 + + include/linux/hpet.h | 1 + + include/linux/kernel.h | 10 +- + include/linux/leds-lp5521.h | 25 + + include/linux/lglock.h | 187 +--- + include/linux/lp855x.h | 133 +++ + include/linux/magic.h | 18 +- + include/linux/memcontrol.h | 2 +- + include/linux/mm.h | 21 +- + include/linux/mm_types.h | 1 + + include/linux/mmzone.h | 3 +- + include/linux/nmi.h | 2 +- + include/linux/page_cgroup.h | 8 +- + include/linux/percpu.h | 54 -- + include/linux/pid_namespace.h | 8 +- + include/linux/pipe_fs_i.h | 2 - + include/linux/prctl.h | 3 + + include/linux/rar_register.h | 60 -- + include/linux/sched.h | 12 + + include/linux/seq_file.h | 5 +- + include/linux/smp.h | 45 + + include/linux/swap.h | 37 +- + include/linux/topology.h | 4 +- + include/xen/xenbus.h | 4 +- + init/do_mounts.c | 3 + + ipc/compat.c | 70 ++- + ipc/sem.c | 250 ++++-- + kernel/Makefile | 2 +- + kernel/cgroup.c | 19 +- + kernel/cpu.c | 13 + + kernel/exit.c | 40 +- + kernel/fork.c | 25 +- + kernel/hrtimer.c | 8 + + kernel/irq/chip.c | 3 +- + kernel/irq/manage.c | 5 +- + kernel/kmod.c | 31 +- + kernel/lglock.c | 136 +++ + kernel/pid_namespace.c | 39 +- + kernel/smp.c | 110 +++- + kernel/sys.c | 17 + + kernel/sysctl.c | 19 +- + lib/Kconfig | 61 ++- + lib/Kconfig.debug | 2 +- + lib/crc32.c | 1287 +++++++++++++++++++------- + lib/crc32defs.h | 56 +- + lib/debugobjects.c | 14 +- + lib/gen_crc32table.c | 81 ++- + lib/idr.c | 8 +- + lib/string.c | 20 +- + lib/vsprintf.c | 20 + + mm/compaction.c | 77 ++- + mm/memcontrol.c | 180 ++-- + mm/memory.c | 31 +- + mm/mmap.c | 40 +- + mm/oom_kill.c | 141 ++-- + mm/page_alloc.c | 82 ++- + mm/rmap.c | 3 +- + mm/slub.c | 10 +- + mm/swap_state.c | 24 +- + mm/swapfile.c | 62 -- + mm/vmscan.c | 82 ++- + net/netfilter/nf_conntrack_netlink.c | 5 + + net/netfilter/xt_TEE.c | 12 +- + net/socket.c | 4 +- + scripts/checkpatch.pl | 6 + + tools/perf/util/include/linux/bitops.h | 2 +- + 275 files changed, 6475 insertions(+), 3885 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-olpc + create mode 100644 Documentation/backlight/lp855x-driver.txt + create mode 100644 Documentation/crc32.txt + create mode 100644 arch/x86/platform/geode/geos.c + create mode 100644 arch/x86/platform/geode/net5501.c + delete mode 100644 drivers/leds/leds-net5501.c + create mode 100644 drivers/leds/leds-pca9633.c + delete mode 100644 drivers/platform/x86/intel_rar_register.c + create mode 100644 drivers/rtc/rtc-da9052.c + create mode 100644 drivers/rtc/rtc-ls1x.c + create mode 100644 drivers/video/backlight/lp855x_bl.c + create mode 100644 drivers/video/backlight/ot200_bl.c + create mode 100644 drivers/video/backlight/pandora_bl.c + create mode 100644 include/linux/lp855x.h + delete mode 100644 include/linux/rar_register.h + create mode 100644 kernel/lglock.c +$ git revert a093145d9919 +[master 6dcb26a] Revert "smp-start-up-non-boot-cpus-asynchronously-fix" + 1 files changed, 2 insertions(+), 2 deletions(-) +$ git revert 6a85fec0c0fd +[master 98a09b3] Revert "smp: start up non-boot CPUs asynchronously" + 1 files changed, 1 insertions(+), 20 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..b3659f76c336 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,29 @@ +Importing hexagon based on v3.2-rc2 +Unchanged quilt series hexagon +Importing i2c based on ce5afed937f0a823d3b00c9459409c3f5f2fbd5d +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard ce5afed937f0a823d3b00c9459409c3f5f2fbd5d +HEAD is now at ce5afed Merge git://git.samba.org/sfrench/cifs-2.6 +$ git am ../quilt/i2c/i2c-core-comment-says-transmitted-but-means-received.patch +Applying: i2c-core: Comment says "transmitted" but means "received" +$ git am ../quilt/i2c/i2c-gpio-use-linux-gpio.h-rather-than-asm-gpio.h.patch +Applying: i2c-gpio: Use linux/gpio.h rather than asm/gpio.h +$ git am ../quilt/i2c/i2c-isch-decrease-delay-in-command-completion-check-loop.patch +Applying: i2c-isch: Decrease delay in command completion check loop +$ git am ../quilt/i2c/i2c-i801-01-add-device-ids-for-intel-lynx-point.patch +Applying: i2c-i801: Add device IDs for Intel Lynx Point +$ git am ../quilt/i2c/i2c-i801-02-use-usleep_range.patch +Applying: i2c-i801: Use usleep_range to wait for command completion +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/i2c +From ../quilt-tmp + + 8833619...c3632e0 master -> quilt/i2c (forced update) +Importing jdelvare-hwmon based on 19e00f2f1d5273dbc52eab0ebc315cae3aa44b2a +Unchanged quilt series jdelvare-hwmon +Importing kernel-doc based on 3.3-rc2 +Unchanged quilt series kernel-doc +Importing rr based on v3.3-rc1-383-g0a96265 +Unchanged quilt series rr +Importing device-mapper based on v3.3-rc3 +Unchanged quilt series device-mapper diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..c0853ab58c37 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20120215 |