diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-11 18:03:59 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-11 18:03:59 +1100 |
| commit | 168b70b72a78f289046823d810c29376e211a6de (patch) | |
| tree | 006d7f048c79bf32496b7663778584e530a8a0bb | |
| parent | 953e522d15cc05fae720487aa44467a1ccbc6851 (diff) | |
Add linux-next specific files for 20090211next-20090211
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 135 | ||||
| -rw-r--r-- | Next/Trees | 137 | ||||
| -rw-r--r-- | Next/merge.log | 4990 | ||||
| -rw-r--r-- | Next/quilt-import.log | 131 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 5394 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..8e01b5575346 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,135 @@ +Name SHA1 +---- ---- +origin c36c63c511fa088fcc247a8e888b04f248be8435 +arm-current f6f35bbe7c6494e66590cf519e21da2dd8d59e01 +m68k-current 877d52431f4d3cda4adea077ffbe88f3fd1755d3 +powerpc-merge 0b2f82872ff855b92e9e8356b90ef429d96d6977 +sparc-current aeb398768345c74a9e4c01aa3ebf839e858312ec +scsi-rc-fixes 822c05b6335534f74f90bd0edc12aeb5a591117a +net-current 4906f9985e310fc01f956256b0d58ac28b0dcb19 +sound-current b0050cae2ba48cb79fa22b0edd97e611abbd6a33 +pci-current 5294e256717923f4a3297bb8b802f5e0625763f3 +wireless-current c4e061ace75513aee227090486cc46dec7810c00 +kbuild-current df291fa993c506da89a89264ff8166bccd172a14 +driver-core.current 8e4921515c1a379539607eb443d51c30f4f7f338 +usb.current 17b1445cc57cc1f0541c33a9cf9d5e91e4a0f8be +cpufreq-current 732553e567c2700ba5b9bccc6ec885c75779a94b +input-current 4ab73761faef832f6d378328f79d21e77c62af3b +md-current de01dfadf25bf83cfe3d85c163005c4320532658 +audit-current c05a63c58c2884c4db00308ba5eb0dbac2fb5ac9 +crypto-current 4f3e797ad07d52d34983354a77b365dfcd48c1b4 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +arm b7eb1a5ed50c6f622664bb8a7113313fa8b6dd1e +avr32 61f3632fdcdcf547f6487f56b45976d7964756c4 +blackfin c8e674125e03c5f36ccfd61d83b933e6956074b0 +cris 7cb36b6ccdca03bd87e8faca7fd920643dd1aec7 +ia64 27421e211a39784694b597dbf35848b88363c248 +m68k 877d52431f4d3cda4adea077ffbe88f3fd1755d3 +m68knommu 354c06e332ec4d674a92ce4b2c134a9eb81cd9a1 +mips d3a47e82b6bc3724dd60f3ee4e84fe4479104382 +parisc ac2565d69d7ef73b4e446f63759358e8a9996385 +powerpc eda58a85ec3fc05855a26654d97a2b53f0e715b9 +4xx 18e352e4a73465349711a9324767e1b2453383e2 +galak a0e8618c71b9b685977c1407dee928d86c5bdc2c +pxa 5daff282ee236416d94655944e0a396f02fd0c1e +s390 b1637163ea266d6516692ca24f6b8d575be91664 +sh 508eb2ce222053e51e2243b7add8eeac85b1d250 +sparc 6680598b44ed3c0052d155522eb21fc5a00de5f3 +x86 b5e72e5c70d6c7a947051703953d9edd7f041f27 +xtensa 8903709b054a8dafe4e8c6d9a6444034d7aba36f +driver-core 94f001b7f0d94545d2f7183fa9131864c98c9019 +usb 849894bda343952933eefa7256a121e65b5147f5 +tip-core 546fc88f4ee60e5cf38a4ac11b599bf6c0fddcb6 +cpus4096 72c3adc502dce023ea2ab120b3e1f10edee4a26e +ftrace ad9c972311f9b61a34fcaaae5e21ca11b1ab5d49 +genirq de5f73d759bb3bc1662eaec07406d59525ee128d +safe-poison-pointers f0e31e6745b616a10e67bef651307ab858a25d8e +sched 1f652d43491de28d3c1d1fab044b41b505f0f384 +stackprotector 8f80581b05067000faee393c54ada87798a2d9b2 +timers 420adedaf79219f5254314ab77eb2236d7fe5fca +pci 6fbd19ee6fc68d1de91e4be6f51d66ce7d605034 +device-mapper 44f8676235ead36cb101c15d43b3624e61eaa7e1 +hid 8942f9cbafea31015e12c1a5cde451b4a4a16930 +i2c 695d07f1ee3c5d5d6ec4b9106a0a632b7a902a7c +jdelvare-hwmon 17b7ae15806bb1f9fc55f8dbee179ef4e6b4b4dd +kernel-doc 1de9e8e70f5acc441550ca75433563d91b269bbe +v4l-dvb b85f8e6623ad0f2cc42e51235db1d487fb8ee4c2 +quota c229e2704c5e5bc185b651e3376b44d3330420ae +jfs c68a65da35906b32505bbb8eecab316e6736e28b +kbuild b67ff8ce122f3353bd741db48ce1756c12fb5f2d +ide 15f10c4dbd237b12cf863fc31e097bd0b3445a26 +libata dbb036157dda0f9cf8bdedfc8fd2d47ca68e2ef7 +nfs de8d63424cfc39103dc258b756e3d1ec52f372d6 +xfs 8e08f6eb34af13b78d379a025e4c9f8612b47b95 +infiniband 5264a59b5f51229849a09d229c9307f1a6cdb95a +acpi 26db8646cadbbd2c095816f6a70cb308d6287c0c +nfsd a97075add761928b155633b39e538ee3dde702ad +ieee1394 8a076d67e22343ce7ce9959b5e721a7eeab47228 +ubi d5b562330ec766292a3ac54ae5e0673610bd5b3d +kvm 9397484cf3f0dfa765619bdada199019eee1067b +dlm 3d24b4d98066a596dd20e25e64807ee7524a1e75 +scsi b35fe25ae156830f85a305afaba837b084458e7a +ocfs2 66adc4334e25ccd78d5f684f6ec3618ad4bf8893 +ext4 c1aa87aa364b5d665978f8e9f8fe4a54448fedcc +async_tx 86528da229a448577a8401a17c295883640d336c +udf a006760466b41fda23d10b9de53b9ad7e2d6120b +net b4ac530fc3af02a004729043dacf6b6330b46892 +mtd 3afd522de8d8ec446efe957b86e4f63e3dd8ce9d +wireless 99e0fca6740b98aed1f604fc2e0acbdbc9e7578a +crypto d61e6247bcf80ff6329dd9cc454e5040ca30d0ba +vfs fd217f4d70172c526478f2bc76859e909fdfa674 +sound ac3a58e31b9d7de0d212d04c20af756ba0f23fe0 +cpufreq 22455dcb6c08f36fdaaee250d62e1b8232a8a344 +v9fs b9b8e1c85b1d98534a562f601acda8132bfff439 +rr e976607a52782f69974fed726484e074e4ddc085 +cifs c816391ebbb65f91fc2c0ca136686768a1d72e42 +mmc 56fd879f66779b486f3b4a30601ac94aad82c2dd +gfs2 a9cfc5a7c4e08f1e06b4b7bbb8973640b2d807c3 +input 8a49cfa9de4ef47eb9238d625b900d4cdddccf30 +bkl-removal 5c7eec1a9b90b18837a45cccb7fe3c182dce57d0 +ubifs 2bc275e9b04f23708c495a8bfe92a5f4b65345c8 +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block d3f761104b097738932afcc310fbbbbfb007ef92 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware f0c996e7399bb6aca523119a568b56c98bbe16df +pcmcia b1769450da0eeae2d95aae5496acbdf4c6ba89b2 +battery 5bf2b994bfe11bfe86231050897b2d881ca544d9 +leds 874721ba92f7f70a17e4492a75648711d19eaca8 +backlight 84fe843ca97c27482343f1ded658a38d20437bee +kgdb 0136574e061924dc236a611f28e881a12ab6822a +slab 4bfb6e059860507459e6d369614ad825d697758c +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md de01dfadf25bf83cfe3d85c163005c4320532658 +kmemcheck 072bdb8831c61e2c263151031c7d2d0b30fd7ddd +generic-ipi f3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b +mfd d3341db6923b3ec6881a4586cf4d6a95ffd04b47 +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm 5dce49a572016fd5b780dfcc0a690990e4aae7c5 +voltage 094a5e56b3177fc26d7b3753abd2713263dda3d3 +security-testing cb5629b10d64a8006622ce3a52bc887d91057d69 +lblnet 163472f2bf5fa8d53cca9287c4bd278b604aef07 +ttydev b379f4665ccdb4125721d878db86fc699f32359e +agp b854b2ab959e8175d75e01cf8ed452ed2624d0c8 +oprofile 37a74e71eea80db0a6dd4b68b946ad23c6dc3bb2 +fastboot f3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b +sparseirq e758c57da06a8513637aca8731586b0050a9162e +iommu 76cb105c32079a89c2a77864529321f01c7ca7ac +uwb 8f04915532485d81e7f6c580a396ea7b01094221 +watchdog d3e2000d218824ca49efa6c5c427ee7b0ea77a78 +proc 274e88b89e0aae0fb751fe54efc40e974e265a66 +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu 8e4921515c1a379539607eb443d51c30f4f7f338 +cputime c742b31c03f37c5c499178f09f57381aa6c70131 +osd e232c28b1d97a6a1ccb84ecf972f6e0cf1ae109a +fatfs 5a6bb10393eb9a1985e97af12f0cb2906bcbf1af +fuse f3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b +jc_docs 7ead643f665c618d4bbd9efb68595fa41b2eb93b +nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 +trivial d919f5fba6f46300187c19309ab4fc08dfd880fb +audit 1db8508cf483dc1ecf66141f90a7c03659d69512 +squashfs 1b736951ba912796d34c4b9f4e7b99ce42713b85 +omap dfaf928eca6e49c55255a18b999b0f9de719f505 +aoe 1de9e8e70f5acc441550ca75433563d91b269bbe +kmemleak a2a127e219d3eeca56232bad1f7e8681a10e609e +staging b0a52cc8086bb941b6f4a09fa724a1cc7afcfdc5 +scsi-post-merge 238c6d54830c624f34ac9cf123ac04aebfca5013 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..81fc48c02d8b --- /dev/null +++ b/Next/Trees @@ -0,0 +1,137 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git#master +arm-current git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#master +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +sparc-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git#master +scsi-rc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git#master +net-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#for-linus +wireless-current git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes.git#master +driver-core.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver-core.current/ +usb.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-usb.current/ +cpufreq-current git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +md-current git git://neil.brown.name/md#for-linus +audit-current git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6#master +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master +arm git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#devel +avr32 git git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git#avr32-arch +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6.git#for-linus +cris git git://www.jni.nu/cris.git#for-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git#test +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +mips git git://git.linux-mips.org/pub/scm/upstream-sfr.git#mips-for-linux-next +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git#master +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +4xx git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#next +pxa git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git#for-next +s390 git git://git390.marist.edu/pub/scm/linux-2.6.git#features +sh git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#master +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git#master +x86 git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-x86-next +xtensa git git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-next.git#master +driver-core quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-driver-core/ +usb quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-usb/ +tip-core git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-core-next +cpus4096 git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-cpus4096-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-ftrace-next +genirq git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-genirq-next +safe-poison-pointers git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-safe-poison-pointers-next +sched git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-sched-next +stackprotector git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-stackprotector-next +timers git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-timers-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#linux-next +device-mapper quilt http://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/editing/ +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c quilt http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/ +jdelvare-hwmon quilt http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/ +kernel-doc quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ +v4l-dvb git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next.git#master +quota git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-quota-2.6.git#for_next +jfs git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#next +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next.git#master +ide quilt http://kernel.org/pub/linux/kernel/people/bart/pata-2.6/patches/ +libata git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +xfs git git://oss.sgi.com/xfs/xfs#master +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +acpi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git#test +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git#for-next +ubi git git://git.infradead.org/ubi-2.6.git#linux-next +kvm git git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git#master +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git#next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git#master +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git#linux-next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#next +async_tx git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git#next +udf git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6.git#for_next +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git#master +mtd git git://git.infradead.org/mtd-2.6.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6#master +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-next +cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/ +cifs git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git#master +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git#next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git#master +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +bkl-removal git git://git.lwn.net/linux-2.6.git#bkl-removal +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +lsm git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next +block git git://git.kernel.dk/linux-2.6-block.git#for-next +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git#master +battery git git://git.infradead.org/battery-2.6.git#master +leds git git://git.o-hand.com/linux-rpurdie-leds#for-mm +backlight git git://git.o-hand.com/linux-rpurdie-backlight#for-mm +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb#kgdb-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +kmemcheck git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-kmemcheck-next +generic-ipi git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-generic-ipi-next +mfd git git://git.o-hand.com/linux-mfd#for-next +hdlc git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6.git#hdlc-next +drm git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git#drm-next +voltage git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git#for-next +security-testing git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git#next +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master +ttydev quilt http://www.linux.org.uk/~alan/ttydev/ +agp git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6.git#agp-next +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-oprofile-next +fastboot git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-fastboot-next +sparseirq git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-sparseirq-next +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-iommu-next +uwb git git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb.git#for-upstream +watchdog git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog-next.git#master +proc git git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc.git#proc +bdev git git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev.git#master +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +cputime git git://git390.marist.edu/pub/scm/linux-2.6.git#cputime +osd git git://git.open-osd.org/linux-open-osd.git#linux-next +fatfs git git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6.git#master +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +jc_docs git git://git.lwn.net/linux-2.6.git#docs-next +nommu git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-nommu.git#master +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-next +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus.git#master +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git#for-next +aoe quilt http://support.coraid.com/support/linux/for-next/patches/ +kmemleak git git://linux-arm.org/linux-2.6.git#kmemleak +staging quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-05-staging/ +scsi-post-merge git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..5bd183174ab4 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4990 @@ +$ git checkout master +Already on "master" +$ git reset --hard stable +HEAD is now at 4c098bc Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable +Merging origin/master +$ git merge origin/master +Updating 4c098bc..c36c63c +Fast forward + arch/powerpc/boot/dts/mpc8313erdb.dts | 11 +-- + arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | 2 +- + arch/powerpc/kernel/ftrace.c | 5 +- + arch/powerpc/kernel/pci-common.c | 17 ++++- + arch/powerpc/lib/sstep.c | 2 + + arch/powerpc/mm/fsl_booke_mmu.c | 4 +- + arch/powerpc/mm/pgtable_32.c | 4 +- + arch/powerpc/oprofile/cell/spu_profiler.c | 1 + + arch/powerpc/platforms/82xx/pq2ads-pci-pic.c | 2 +- + arch/powerpc/platforms/pseries/hotplug-memory.c | 1 + + arch/powerpc/sysdev/cpm2_pic.c | 2 +- + arch/powerpc/sysdev/ipic.c | 2 +- + arch/sparc/kernel/head_64.S | 31 +++++++- + arch/sparc/kernel/nmi.c | 1 + + arch/sparc/kernel/pcr.c | 7 ++- + arch/sparc/lib/GENbzero.S | 6 +- + arch/sparc/lib/GENcopy_from_user.S | 8 +-- + arch/sparc/lib/GENcopy_to_user.S | 8 +-- + arch/sparc/lib/NG2copy_from_user.S | 9 +-- + arch/sparc/lib/NG2copy_to_user.S | 9 +-- + arch/sparc/lib/NGbzero.S | 6 +- + arch/sparc/lib/NGcopy_from_user.S | 9 +-- + arch/sparc/lib/NGcopy_to_user.S | 9 +-- + arch/sparc/lib/U1copy_from_user.S | 8 +-- + arch/sparc/lib/U1copy_to_user.S | 8 +-- + arch/sparc/lib/U3copy_from_user.S | 6 +- + arch/sparc/lib/U3copy_to_user.S | 8 +-- + arch/sparc/lib/bzero.S | 6 +- + arch/sparc/lib/copy_in_user.S | 61 ++++----------- + drivers/atm/solos-pci.c | 1 + + drivers/isdn/hardware/mISDN/hfcmulti.c | 2 + + drivers/net/3c509.c | 1 + + drivers/net/gianfar.c | 6 ++ + drivers/net/netxen/netxen_nic.h | 2 +- + drivers/net/netxen/netxen_nic_main.c | 13 +++- + drivers/net/r8169.c | 93 ++++++++++++++--------- + drivers/net/sungem.c | 8 +- + drivers/net/sunhme.c | 12 ++- + drivers/net/tulip/de2104x.c | 3 +- + drivers/net/tun.c | 10 ++- + fs/hugetlbfs/inode.c | 8 +- + include/linux/dmaengine.h | 12 +++ + include/linux/hugetlb.h | 5 +- + include/linux/mm.h | 3 +- + ipc/shm.c | 8 +- + mm/fremap.c | 2 +- + mm/hugetlb.c | 39 ++++++---- + mm/mmap.c | 38 ++++++---- + mm/mprotect.c | 5 +- + net/9p/protocol.c | 22 +++-- + net/bridge/br_forward.c | 7 ++- + net/core/dev.c | 4 +- + net/core/neighbour.c | 14 ++-- + net/ipv4/udp.c | 6 +- + net/ipv6/ip6_flowlabel.c | 8 ++- + net/ipv6/ip6_tunnel.c | 2 +- + net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 25 ++++++- + net/netfilter/nf_conntrack_netlink.c | 15 +++- + net/netfilter/xt_sctp.c | 2 +- + net/rxrpc/af_rxrpc.c | 5 +- + 60 files changed, 368 insertions(+), 266 deletions(-) +Merging arm-current/master +$ git merge arm-current/master +Merge made by recursive. + arch/arm/kernel/machine_kexec.c | 4 ++-- + arch/arm/mach-pxa/dma.c | 18 ++++++++++-------- + arch/arm/mach-pxa/include/mach/regs-ac97.h | 2 ++ + arch/arm/mach-pxa/include/mach/regs-ssp.h | 3 +++ + arch/arm/mach-pxa/pxa300.c | 4 ++-- + arch/arm/mach-pxa/pxa320.c | 2 +- + sound/arm/aaci.c | 6 +++--- + 7 files changed, 23 insertions(+), 16 deletions(-) +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Merge made by recursive. + drivers/scsi/ibmvscsi/ibmvfc.c | 15 +++++++-- + drivers/scsi/ibmvscsi/ibmvfc.h | 2 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 1 + + drivers/scsi/libiscsi.c | 3 +- + drivers/scsi/lpfc/lpfc_els.c | 1 + + drivers/scsi/qla2xxx/qla_attr.c | 13 ++++---- + drivers/scsi/qla2xxx/qla_def.h | 5 +++ + drivers/scsi/qla2xxx/qla_devtbl.h | 2 +- + drivers/scsi/qla2xxx/qla_fw.h | 2 + + drivers/scsi/qla2xxx/qla_gbl.h | 9 +++-- + drivers/scsi/qla2xxx/qla_init.c | 7 ++-- + drivers/scsi/qla2xxx/qla_isr.c | 58 +++++++++++++++++++++-------------- + drivers/scsi/qla2xxx/qla_mbx.c | 40 ++++++++++++++++++++----- + drivers/scsi/qla2xxx/qla_mid.c | 12 ++++---- + drivers/scsi/qla2xxx/qla_os.c | 16 ++++++++++ + drivers/scsi/qla2xxx/qla_sup.c | 2 +- + drivers/scsi/qla2xxx/qla_version.h | 2 +- + drivers/scsi/scsi_scan.c | 1 + + drivers/scsi/sg.c | 2 +- + 19 files changed, 131 insertions(+), 62 deletions(-) +Merging net-current/master +$ git merge net-current/master +Already up-to-date. +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless-current/master +$ git merge wireless-current/master +Already up-to-date. +Merging kbuild-current/master +$ git merge kbuild-current/master +Already up-to-date. +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Already up-to-date. +Merging quilt/usb.current +$ git merge quilt/usb.current +Merge made by recursive. +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Auto-merged drivers/input/keyboard/atkbd.c +Auto-merged drivers/input/keyboard/omap-keypad.c +Auto-merged drivers/input/mouse/pxa930_trkball.c +Auto-merged drivers/media/video/uvc/uvc_status.c +Merge made by recursive. + drivers/input/keyboard/atkbd.c | 4 ++-- + drivers/input/keyboard/bf54x-keys.c | 4 ++-- + drivers/input/keyboard/corgikbd.c | 8 ++++---- + drivers/input/keyboard/omap-keypad.c | 8 ++++---- + drivers/input/keyboard/spitzkbd.c | 8 ++++---- + drivers/input/mouse/Kconfig | 2 +- + drivers/input/mouse/pxa930_trkball.c | 2 +- + drivers/input/serio/ambakmi.c | 6 +++--- + drivers/input/serio/gscps2.c | 2 +- + drivers/input/serio/sa1111ps2.c | 4 ++-- + drivers/input/touchscreen/atmel_tsadcc.c | 2 +- + drivers/input/touchscreen/corgi_ts.c | 9 +++++---- + drivers/input/touchscreen/tsc2007.c | 3 ++- + drivers/input/touchscreen/usbtouchscreen.c | 19 +++++++++++++++++-- + drivers/media/video/uvc/uvc_status.c | 10 ++++++---- + 15 files changed, 55 insertions(+), 36 deletions(-) +Merging md-current/for-linus +$ git merge md-current/for-linus +Already up-to-date. +Merging audit-current/for-linus +$ git merge audit-current/for-linus +Auto-merged drivers/char/tty_audit.c +CONFLICT (content): Merge conflict in drivers/char/tty_audit.c +Auto-merged drivers/char/tty_io.c +Auto-merged include/linux/audit.h +Auto-merged include/linux/tty.h +Auto-merged kernel/auditsc.c +CONFLICT (content): Merge conflict in kernel/auditsc.c +Auto-merged kernel/fork.c +Resolved 'drivers/char/tty_audit.c' using previous resolution. +Resolved 'kernel/auditsc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit b624a08: Merge commit 'audit-current/for-linus' +$ git diff -M --stat --summary HEAD^.. +Merging crypto-current/master +$ git merge crypto-current/master +Already up-to-date. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Auto-merged drivers/video/Kconfig +Merge made by recursive. + MAINTAINERS | 2 +- + arch/arm/configs/acs5k_defconfig | 1233 ++++++++++++++++++++ + arch/arm/configs/acs5k_tiny_defconfig | 941 +++++++++++++++ + .../{xm_x2xx_defconfig => cm_x2xx_defconfig} | 466 +++++--- + .../{xm_x2xx_defconfig => em_x270_defconfig} | 773 ++++++------- + arch/arm/configs/magician_defconfig | 699 +++++++++--- + arch/arm/mach-ep93xx/edb9307a.c | 12 + + arch/arm/mach-ks8695/Kconfig | 6 + + arch/arm/mach-ks8695/Makefile | 1 + + arch/arm/mach-ks8695/board-acs5k.c | 233 ++++ + arch/arm/mach-pxa/Kconfig | 33 + + arch/arm/mach-pxa/Makefile | 4 + + arch/arm/mach-pxa/am300epd.c | 295 +++++ + arch/arm/mach-pxa/em-x270.c | 604 +++++++++- + arch/arm/mach-pxa/gumstix.c | 6 + + arch/arm/mach-pxa/himalaya.c | 168 +++ + arch/arm/mach-pxa/include/mach/gumstix.h | 1 + + arch/arm/mach-pxa/include/mach/magician.h | 2 +- + arch/arm/mach-pxa/include/mach/palmld.h | 109 ++ + arch/arm/mach-pxa/include/mach/palmt5.h | 84 ++ + arch/arm/mach-pxa/magician.c | 84 +- + arch/arm/mach-pxa/palmld.c | 566 +++++++++ + arch/arm/mach-pxa/palmt5.c | 497 ++++++++ + arch/arm/mach-sa1100/jornada720.c | 14 +- + arch/arm/mach-w90x900/cpu.h | 17 +- + arch/arm/mach-w90x900/mach-w90p910evb.c | 10 +- + arch/arm/mach-w90x900/w90p910.c | 67 +- + drivers/video/Kconfig | 14 + + drivers/video/Makefile | 1 + + drivers/video/broadsheetfb.c | 568 +++++++++ + include/video/broadsheetfb.h | 59 + + 31 files changed, 6675 insertions(+), 894 deletions(-) + create mode 100644 arch/arm/configs/acs5k_defconfig + create mode 100644 arch/arm/configs/acs5k_tiny_defconfig + copy arch/arm/configs/{xm_x2xx_defconfig => cm_x2xx_defconfig} (83%) + rename arch/arm/configs/{xm_x2xx_defconfig => em_x270_defconfig} (74%) + create mode 100644 arch/arm/mach-ks8695/board-acs5k.c + create mode 100644 arch/arm/mach-pxa/am300epd.c + create mode 100644 arch/arm/mach-pxa/himalaya.c + create mode 100644 arch/arm/mach-pxa/include/mach/palmld.h + create mode 100644 arch/arm/mach-pxa/include/mach/palmt5.h + create mode 100644 arch/arm/mach-pxa/palmld.c + create mode 100644 arch/arm/mach-pxa/palmt5.c + create mode 100644 drivers/video/broadsheetfb.c + create mode 100644 include/video/broadsheetfb.h +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Merge made by recursive. + arch/avr32/include/asm/uaccess.h | 8 ++-- + arch/avr32/kernel/entry-avr32b.S | 60 ++++++++++++++++++------------------ + arch/avr32/kernel/syscall-stubs.S | 14 ++++---- + arch/avr32/lib/strnlen_user.S | 2 +- + 4 files changed, 42 insertions(+), 42 deletions(-) +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Already up-to-date. +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging m68k/for-next +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Removed arch/m68k/include/asm/bootinfo_mm.h +Removed arch/m68k/include/asm/bootinfo_no.h +Removed arch/m68k/include/asm/bug_mm.h +Removed arch/m68k/include/asm/bug_no.h +Removed arch/m68k/include/asm/bugs_mm.h +Removed arch/m68k/include/asm/bugs_no.h +Removed arch/m68k/include/asm/cache_mm.h +Removed arch/m68k/include/asm/cache_no.h +Removed arch/m68k/include/asm/current_mm.h +Removed arch/m68k/include/asm/current_no.h +Removed arch/m68k/include/asm/div64_mm.h +Removed arch/m68k/include/asm/div64_no.h +Removed arch/m68k/include/asm/dma-mapping_mm.h +Removed arch/m68k/include/asm/dma-mapping_no.h +Removed arch/m68k/include/asm/elf_mm.h +Removed arch/m68k/include/asm/elf_no.h +Removed arch/m68k/include/asm/fb_mm.h +Removed arch/m68k/include/asm/fb_no.h +Removed arch/m68k/include/asm/fpu_mm.h +Removed arch/m68k/include/asm/fpu_no.h +Removed arch/m68k/include/asm/hw_irq_mm.h +Removed arch/m68k/include/asm/hw_irq_no.h +Removed arch/m68k/include/asm/kmap_types_mm.h +Removed arch/m68k/include/asm/kmap_types_no.h +Removed arch/m68k/include/asm/mc146818rtc_mm.h +Removed arch/m68k/include/asm/mc146818rtc_no.h +Removed arch/m68k/include/asm/mcfpci.h +Removed arch/m68k/include/asm/mmu_mm.h +Removed arch/m68k/include/asm/mmu_no.h +Removed arch/m68k/include/asm/page_offset_mm.h +Removed arch/m68k/include/asm/page_offset_no.h +Removed arch/m68k/include/asm/param_mm.h +Removed arch/m68k/include/asm/param_no.h +Removed arch/m68k/include/asm/pci_mm.h +Removed arch/m68k/include/asm/pci_no.h +Removed arch/m68k/include/asm/pgalloc_mm.h +Removed arch/m68k/include/asm/pgalloc_no.h +Removed arch/m68k/include/asm/scatterlist_mm.h +Removed arch/m68k/include/asm/scatterlist_no.h +Removed arch/m68k/include/asm/segment_mm.h +Removed arch/m68k/include/asm/segment_no.h +Removed arch/m68k/include/asm/setup_mm.h +Removed arch/m68k/include/asm/setup_no.h +Removed arch/m68k/include/asm/siginfo_mm.h +Removed arch/m68k/include/asm/siginfo_no.h +Removed arch/m68k/include/asm/timex_mm.h +Removed arch/m68k/include/asm/timex_no.h +Removed arch/m68k/include/asm/ucontext_mm.h +Removed arch/m68k/include/asm/ucontext_no.h +Removed arch/m68k/include/asm/unaligned_mm.h +Removed arch/m68k/include/asm/unaligned_no.h +Removed arch/m68k/include/asm/unistd_mm.h +Removed arch/m68k/include/asm/unistd_no.h +Merge made by recursive. + arch/m68k/include/asm/bootinfo.h | 381 +++++++++++++++++++++++++++++++- + arch/m68k/include/asm/bootinfo_mm.h | 378 ------------------------------- + arch/m68k/include/asm/bootinfo_no.h | 2 - + arch/m68k/include/asm/bug.h | 31 +++- + arch/m68k/include/asm/bug_mm.h | 29 --- + arch/m68k/include/asm/bug_no.h | 4 - + arch/m68k/include/asm/bugs.h | 21 ++- + arch/m68k/include/asm/bugs_mm.h | 14 -- + arch/m68k/include/asm/bugs_no.h | 16 -- + arch/m68k/include/asm/cache.h | 14 +- + arch/m68k/include/asm/cache_mm.h | 11 - + arch/m68k/include/asm/cache_no.h | 12 - + arch/m68k/include/asm/current.h | 31 +++- + arch/m68k/include/asm/current_mm.h | 6 - + arch/m68k/include/asm/current_no.h | 24 -- + arch/m68k/include/asm/div64.h | 37 +++- + arch/m68k/include/asm/div64_mm.h | 28 --- + arch/m68k/include/asm/div64_no.h | 1 - + arch/m68k/include/asm/dma-mapping.h | 113 +++++++++- + arch/m68k/include/asm/dma-mapping_mm.h | 112 ---------- + arch/m68k/include/asm/dma-mapping_no.h | 6 - + arch/m68k/include/asm/elf.h | 120 ++++++++++- + arch/m68k/include/asm/elf_mm.h | 119 ---------- + arch/m68k/include/asm/elf_no.h | 110 --------- + arch/m68k/include/asm/fb.h | 41 +++- + arch/m68k/include/asm/fb_mm.h | 34 --- + arch/m68k/include/asm/fb_no.h | 12 - + arch/m68k/include/asm/fpu.h | 22 ++- + arch/m68k/include/asm/fpu_mm.h | 21 -- + arch/m68k/include/asm/fpu_no.h | 21 -- + arch/m68k/include/asm/hw_irq.h | 9 +- + arch/m68k/include/asm/hw_irq_mm.h | 6 - + arch/m68k/include/asm/hw_irq_no.h | 4 - + arch/m68k/include/asm/kmap_types.h | 26 ++- + arch/m68k/include/asm/kmap_types_mm.h | 21 -- + arch/m68k/include/asm/kmap_types_no.h | 21 -- + arch/m68k/include/asm/mc146818rtc.h | 31 +++- + arch/m68k/include/asm/mc146818rtc_mm.h | 26 --- + arch/m68k/include/asm/mc146818rtc_no.h | 9 - + arch/m68k/include/asm/mcfpci.h | 119 ---------- + arch/m68k/include/asm/mmu.h | 14 +- + arch/m68k/include/asm/mmu_mm.h | 7 - + arch/m68k/include/asm/mmu_no.h | 10 - + arch/m68k/include/asm/page_offset.h | 12 +- + arch/m68k/include/asm/page_offset_mm.h | 8 - + arch/m68k/include/asm/page_offset_no.h | 5 - + arch/m68k/include/asm/param.h | 27 ++- + arch/m68k/include/asm/param_mm.h | 22 -- + arch/m68k/include/asm/param_no.h | 22 -- + arch/m68k/include/asm/pci.h | 17 +- + arch/m68k/include/asm/pci_mm.h | 12 - + arch/m68k/include/asm/pci_no.h | 29 --- + arch/m68k/include/asm/pgalloc.h | 20 ++- + arch/m68k/include/asm/pgalloc_mm.h | 19 -- + arch/m68k/include/asm/pgalloc_no.h | 8 - + arch/m68k/include/asm/pgtable_no.h | 2 + + arch/m68k/include/asm/scatterlist.h | 26 ++- + arch/m68k/include/asm/scatterlist_mm.h | 23 -- + arch/m68k/include/asm/scatterlist_no.h | 22 -- + arch/m68k/include/asm/segment.h | 64 +++++- + arch/m68k/include/asm/segment_mm.h | 57 ----- + arch/m68k/include/asm/segment_no.h | 51 ----- + arch/m68k/include/asm/setup.h | 377 +++++++++++++++++++++++++++++++- + arch/m68k/include/asm/setup_mm.h | 376 ------------------------------- + arch/m68k/include/asm/setup_no.h | 10 - + arch/m68k/include/asm/siginfo.h | 98 ++++++++- + arch/m68k/include/asm/siginfo_mm.h | 92 -------- + arch/m68k/include/asm/siginfo_no.h | 6 - + arch/m68k/include/asm/timex.h | 21 ++- + arch/m68k/include/asm/timex_mm.h | 18 -- + arch/m68k/include/asm/timex_no.h | 23 -- + arch/m68k/include/asm/ucontext.h | 33 +++- + arch/m68k/include/asm/ucontext_mm.h | 30 --- + arch/m68k/include/asm/ucontext_no.h | 32 --- + arch/m68k/include/asm/unaligned.h | 26 ++- + arch/m68k/include/asm/unaligned_mm.h | 13 - + arch/m68k/include/asm/unaligned_no.h | 25 -- + arch/m68k/include/asm/unistd.h | 377 +++++++++++++++++++++++++++++++- + arch/m68k/include/asm/unistd_mm.h | 372 ------------------------------- + arch/m68k/include/asm/unistd_no.h | 372 ------------------------------- + arch/m68knommu/kernel/dma.c | 8 +- + arch/m68knommu/mm/init.c | 6 +- + drivers/serial/mcf.c | 2 +- + 83 files changed, 1905 insertions(+), 2932 deletions(-) + delete mode 100644 arch/m68k/include/asm/bootinfo_mm.h + delete mode 100644 arch/m68k/include/asm/bootinfo_no.h + delete mode 100644 arch/m68k/include/asm/bug_mm.h + delete mode 100644 arch/m68k/include/asm/bug_no.h + delete mode 100644 arch/m68k/include/asm/bugs_mm.h + delete mode 100644 arch/m68k/include/asm/bugs_no.h + delete mode 100644 arch/m68k/include/asm/cache_mm.h + delete mode 100644 arch/m68k/include/asm/cache_no.h + delete mode 100644 arch/m68k/include/asm/current_mm.h + delete mode 100644 arch/m68k/include/asm/current_no.h + delete mode 100644 arch/m68k/include/asm/div64_mm.h + delete mode 100644 arch/m68k/include/asm/div64_no.h + delete mode 100644 arch/m68k/include/asm/dma-mapping_mm.h + delete mode 100644 arch/m68k/include/asm/dma-mapping_no.h + delete mode 100644 arch/m68k/include/asm/elf_mm.h + delete mode 100644 arch/m68k/include/asm/elf_no.h + delete mode 100644 arch/m68k/include/asm/fb_mm.h + delete mode 100644 arch/m68k/include/asm/fb_no.h + delete mode 100644 arch/m68k/include/asm/fpu_mm.h + delete mode 100644 arch/m68k/include/asm/fpu_no.h + delete mode 100644 arch/m68k/include/asm/hw_irq_mm.h + delete mode 100644 arch/m68k/include/asm/hw_irq_no.h + delete mode 100644 arch/m68k/include/asm/kmap_types_mm.h + delete mode 100644 arch/m68k/include/asm/kmap_types_no.h + delete mode 100644 arch/m68k/include/asm/mc146818rtc_mm.h + delete mode 100644 arch/m68k/include/asm/mc146818rtc_no.h + delete mode 100644 arch/m68k/include/asm/mcfpci.h + delete mode 100644 arch/m68k/include/asm/mmu_mm.h + delete mode 100644 arch/m68k/include/asm/mmu_no.h + delete mode 100644 arch/m68k/include/asm/page_offset_mm.h + delete mode 100644 arch/m68k/include/asm/page_offset_no.h + delete mode 100644 arch/m68k/include/asm/param_mm.h + delete mode 100644 arch/m68k/include/asm/param_no.h + delete mode 100644 arch/m68k/include/asm/pci_mm.h + delete mode 100644 arch/m68k/include/asm/pci_no.h + delete mode 100644 arch/m68k/include/asm/pgalloc_mm.h + delete mode 100644 arch/m68k/include/asm/pgalloc_no.h + delete mode 100644 arch/m68k/include/asm/scatterlist_mm.h + delete mode 100644 arch/m68k/include/asm/scatterlist_no.h + delete mode 100644 arch/m68k/include/asm/segment_mm.h + delete mode 100644 arch/m68k/include/asm/segment_no.h + delete mode 100644 arch/m68k/include/asm/setup_mm.h + delete mode 100644 arch/m68k/include/asm/setup_no.h + delete mode 100644 arch/m68k/include/asm/siginfo_mm.h + delete mode 100644 arch/m68k/include/asm/siginfo_no.h + delete mode 100644 arch/m68k/include/asm/timex_mm.h + delete mode 100644 arch/m68k/include/asm/timex_no.h + delete mode 100644 arch/m68k/include/asm/ucontext_mm.h + delete mode 100644 arch/m68k/include/asm/ucontext_no.h + delete mode 100644 arch/m68k/include/asm/unaligned_mm.h + delete mode 100644 arch/m68k/include/asm/unaligned_no.h + delete mode 100644 arch/m68k/include/asm/unistd_mm.h + delete mode 100644 arch/m68k/include/asm/unistd_no.h +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Already up-to-date. +Merging parisc/master +$ git merge parisc/master +Auto-merged arch/parisc/kernel/pci-dma.c +Auto-merged drivers/parisc/sba_iommu.c +Merge made by recursive. + arch/parisc/hpux/fs.c | 1 - + arch/parisc/include/asm/assembly.h | 10 +++--- + arch/parisc/include/asm/page.h | 13 +------ + arch/parisc/include/asm/pgtable.h | 15 ++++++--- + arch/parisc/include/asm/uaccess.h | 1 + + arch/parisc/kernel/cache.c | 5 +-- + arch/parisc/kernel/entry.S | 14 ++++---- + arch/parisc/kernel/firmware.c | 12 +++--- + arch/parisc/kernel/pci-dma.c | 22 +++--------- + arch/parisc/mm/init.c | 13 +++++-- + drivers/char/agp/parisc-agp.c | 23 ++++++------- + drivers/parisc/gsc.c | 39 +++++++++++++---------- + drivers/parisc/led.c | 16 ++++++--- + drivers/parisc/sba_iommu.c | 61 ++++++++++++++++++++--------------- + drivers/scsi/lasi700.c | 2 +- + drivers/scsi/zalon.c | 2 +- + 16 files changed, 127 insertions(+), 122 deletions(-) +Merging powerpc/next +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging galak/next +$ git merge galak/next +Auto-merged arch/powerpc/mm/fsl_booke_mmu.c +Auto-merged include/linux/pci_ids.h +Merge made by recursive. + Documentation/powerpc/dts-bindings/fsl/dma.txt | 34 +- + Documentation/powerpc/dts-bindings/fsl/esdhc.txt | 24 + + arch/powerpc/Kconfig | 19 +- + arch/powerpc/boot/dts/gef_sbc310.dts | 364 +++++ + arch/powerpc/boot/dts/mpc8315erdb.dts | 64 + + arch/powerpc/boot/dts/mpc8377_mds.dts | 71 +- + arch/powerpc/boot/dts/mpc8377_rdb.dts | 102 ++ + arch/powerpc/boot/dts/mpc8378_mds.dts | 71 +- + arch/powerpc/boot/dts/mpc8378_rdb.dts | 102 ++ + arch/powerpc/boot/dts/mpc8379_mds.dts | 7 +- + arch/powerpc/boot/dts/mpc8379_rdb.dts | 38 + + arch/powerpc/boot/dts/tqm8540.dts | 5 + + arch/powerpc/boot/dts/tqm8541.dts | 5 + + arch/powerpc/boot/dts/tqm8548-bigflash.dts | 9 +- + arch/powerpc/boot/dts/tqm8548.dts | 9 +- + arch/powerpc/boot/dts/tqm8555.dts | 5 + + arch/powerpc/boot/dts/tqm8560.dts | 9 +- + arch/powerpc/configs/86xx/gef_sbc310_defconfig | 1613 ++++++++++++++++++++++ + arch/powerpc/include/asm/reg_booke.h | 1 + + arch/powerpc/kernel/Makefile | 1 + + arch/powerpc/kernel/cpu_setup_fsl_booke.S | 31 + + arch/powerpc/kernel/cputable.c | 8 + + arch/powerpc/kernel/head_booke.h | 6 +- + arch/powerpc/kernel/head_fsl_booke.S | 81 +- + arch/powerpc/mm/fsl_booke_mmu.c | 93 +- + arch/powerpc/platforms/83xx/mpc831x_rdb.c | 2 + + arch/powerpc/platforms/83xx/mpc837x_mds.c | 10 +- + arch/powerpc/platforms/83xx/mpc837x_rdb.c | 2 + + arch/powerpc/platforms/86xx/Kconfig | 10 +- + arch/powerpc/platforms/86xx/Makefile | 1 + + arch/powerpc/platforms/86xx/gef_gpio.c | 36 +- + arch/powerpc/platforms/86xx/gef_sbc310.c | 230 +++ + arch/powerpc/sysdev/cpm2.c | 3 +- + arch/powerpc/sysdev/fsl_pci.c | 244 +++- + drivers/watchdog/Kconfig | 2 +- + include/linux/pci_ids.h | 8 + + 36 files changed, 3171 insertions(+), 149 deletions(-) + create mode 100644 Documentation/powerpc/dts-bindings/fsl/esdhc.txt + create mode 100644 arch/powerpc/boot/dts/gef_sbc310.dts + create mode 100644 arch/powerpc/configs/86xx/gef_sbc310_defconfig + create mode 100644 arch/powerpc/kernel/cpu_setup_fsl_booke.S + create mode 100644 arch/powerpc/platforms/86xx/gef_sbc310.c +Merging pxa/for-next +$ git merge pxa/for-next +Auto-merged arch/arm/mach-pxa/gumstix.c +Removed arch/arm/mach-pxa/include/mach/pxa-regs.h +Auto-merged drivers/input/keyboard/corgikbd.c +Auto-merged drivers/input/keyboard/spitzkbd.c +Auto-merged drivers/input/touchscreen/corgi_ts.c +Auto-merged drivers/mmc/host/pxamci.c +Merge made by recursive. + arch/arm/common/sharpsl_pm.c | 2 +- + arch/arm/mach-pxa/am200epd.c | 2 +- + arch/arm/mach-pxa/cm-x255.c | 4 +- + arch/arm/mach-pxa/cm-x270.c | 2 +- + arch/arm/mach-pxa/cm-x2xx-pci.c | 1 - + arch/arm/mach-pxa/cm-x2xx.c | 2 - + arch/arm/mach-pxa/cm-x300.c | 4 +- + arch/arm/mach-pxa/colibri.c | 4 +- + arch/arm/mach-pxa/corgi.c | 4 +- + arch/arm/mach-pxa/corgi_lcd.c | 1 - + arch/arm/mach-pxa/corgi_pm.c | 1 - + arch/arm/mach-pxa/corgi_ssp.c | 1 - + arch/arm/mach-pxa/cpufreq-pxa2xx.c | 2 - + arch/arm/mach-pxa/cpufreq-pxa3xx.c | 2 - + arch/arm/mach-pxa/devices.c | 1 - + arch/arm/mach-pxa/dma.c | 6 +- + arch/arm/mach-pxa/e330.c | 4 +- + arch/arm/mach-pxa/e350.c | 4 +- + arch/arm/mach-pxa/e400.c | 4 +- + arch/arm/mach-pxa/e740.c | 4 +- + arch/arm/mach-pxa/e750.c | 4 +- + arch/arm/mach-pxa/e800.c | 4 +- + arch/arm/mach-pxa/em-x270.c | 3 +- + arch/arm/mach-pxa/eseries.c | 3 +- + arch/arm/mach-pxa/ezx.c | 10 +- + arch/arm/mach-pxa/generic.c | 33 ++- + arch/arm/mach-pxa/generic.h | 7 +- + arch/arm/mach-pxa/gpio.c | 438 ++++++++++--------------- + arch/arm/mach-pxa/gumstix.c | 6 +- + arch/arm/mach-pxa/h5000.c | 7 +- + arch/arm/mach-pxa/idp.c | 3 +- + arch/arm/mach-pxa/imote2.c | 5 +- + arch/arm/mach-pxa/include/mach/dma.h | 58 ++++- + arch/arm/mach-pxa/include/mach/gpio.h | 118 +++++++- + arch/arm/mach-pxa/include/mach/lubbock.h | 1 - + arch/arm/mach-pxa/include/mach/mtd-xip.h | 4 +- + arch/arm/mach-pxa/include/mach/pm.h | 10 + + arch/arm/mach-pxa/include/mach/pxa-regs.h | 263 --------------- + arch/arm/mach-pxa/include/mach/pxa25x.h | 8 + + arch/arm/mach-pxa/include/mach/pxa27x.h | 19 ++ + arch/arm/mach-pxa/include/mach/pxa2xx-gpio.h | 2 + + arch/arm/mach-pxa/include/mach/pxa2xx-regs.h | 31 +- + arch/arm/mach-pxa/include/mach/pxa300.h | 8 + + arch/arm/mach-pxa/include/mach/pxa320.h | 9 + + arch/arm/mach-pxa/include/mach/pxa3xx-regs.h | 11 + + arch/arm/mach-pxa/include/mach/pxa930.h | 8 + + arch/arm/mach-pxa/include/mach/regs-intc.h | 23 ++ + arch/arm/mach-pxa/include/mach/regs-ost.h | 34 ++ + arch/arm/mach-pxa/include/mach/regs-rtc.h | 23 ++ + arch/arm/mach-pxa/include/mach/regs-ssp.h | 1 - + arch/arm/mach-pxa/include/mach/system.h | 1 - + arch/arm/mach-pxa/irq.c | 70 ++++- + arch/arm/mach-pxa/leds-idp.c | 2 +- + arch/arm/mach-pxa/leds-lubbock.c | 2 +- + arch/arm/mach-pxa/leds-mainstone.c | 2 +- + arch/arm/mach-pxa/littleton.c | 3 +- + arch/arm/mach-pxa/lpd270.c | 5 +- + arch/arm/mach-pxa/lubbock.c | 12 +- + arch/arm/mach-pxa/magician.c | 5 +- + arch/arm/mach-pxa/mainstone.c | 5 +- + arch/arm/mach-pxa/mfp-pxa2xx.c | 5 +- + arch/arm/mach-pxa/mioa701.c | 5 +- + arch/arm/mach-pxa/mp900.c | 4 +- + arch/arm/mach-pxa/palmld.c | 3 +- + arch/arm/mach-pxa/palmt5.c | 3 +- + arch/arm/mach-pxa/palmtx.c | 3 +- + arch/arm/mach-pxa/palmz72.c | 4 +- + arch/arm/mach-pxa/pcm027.c | 5 +- + arch/arm/mach-pxa/pcm990-baseboard.c | 3 +- + arch/arm/mach-pxa/pm.c | 13 +- + arch/arm/mach-pxa/poodle.c | 4 +- + arch/arm/mach-pxa/pwm.c | 1 - + arch/arm/mach-pxa/pxa25x.c | 11 +- + arch/arm/mach-pxa/pxa27x.c | 9 +- + arch/arm/mach-pxa/pxa2xx.c | 1 - + arch/arm/mach-pxa/pxa300.c | 4 +- + arch/arm/mach-pxa/pxa320.c | 5 +- + arch/arm/mach-pxa/pxa3xx.c | 5 +- + arch/arm/mach-pxa/pxa930.c | 3 +- + arch/arm/mach-pxa/reset.c | 2 +- + arch/arm/mach-pxa/saar.c | 6 +- + arch/arm/mach-pxa/sharpsl_pm.c | 1 - + arch/arm/mach-pxa/sleep.S | 1 - + arch/arm/mach-pxa/spitz.c | 4 +- + arch/arm/mach-pxa/spitz_pm.c | 1 - + arch/arm/mach-pxa/ssp.c | 1 - + arch/arm/mach-pxa/standby.S | 1 - + arch/arm/mach-pxa/tavorevb.c | 5 +- + arch/arm/mach-pxa/time.c | 3 +- + arch/arm/mach-pxa/tosa.c | 4 +- + arch/arm/mach-pxa/trizeps4.c | 5 +- + arch/arm/mach-pxa/viper.c | 7 +- + arch/arm/mach-pxa/zylonite_pxa300.c | 4 +- + arch/arm/mach-pxa/zylonite_pxa320.c | 2 +- + drivers/input/keyboard/corgikbd.c | 2 - + drivers/input/keyboard/spitzkbd.c | 2 - + drivers/input/touchscreen/corgi_ts.c | 1 - + drivers/media/video/pxa_camera.c | 1 - + drivers/mmc/host/pxamci.c | 3 +- + drivers/mtd/nand/cmx270_nand.c | 3 +- + drivers/mtd/nand/pxa3xx_nand.c | 1 - + drivers/net/irda/pxaficp_ir.c | 3 +- + drivers/net/smc911x.h | 3 +- + drivers/net/smc91x.h | 2 - + drivers/pcmcia/pxa2xx_base.c | 87 +++++- + drivers/pcmcia/pxa2xx_cm_x255.c | 1 - + drivers/pcmcia/pxa2xx_cm_x270.c | 1 - + drivers/pcmcia/pxa2xx_e740.c | 2 - + drivers/pcmcia/pxa2xx_lubbock.c | 1 - + drivers/pcmcia/pxa2xx_mainstone.c | 3 +- + drivers/pcmcia/pxa2xx_trizeps4.c | 3 +- + drivers/pcmcia/pxa2xx_viper.c | 1 - + drivers/pcmcia/sa11xx_base.c | 48 +++- + drivers/pcmcia/soc_common.c | 54 +--- + drivers/pcmcia/soc_common.h | 7 +- + drivers/rtc/rtc-sa1100.c | 3 +- + drivers/serial/pxa.c | 30 +-- + drivers/spi/pxa2xx_spi.c | 2 - + drivers/video/pxafb.c | 1 - + drivers/watchdog/sa1100_wdt.c | 2 +- + sound/arm/pxa2xx-ac97-lib.c | 1 - + sound/arm/pxa2xx-ac97.c | 2 - + sound/arm/pxa2xx-pcm-lib.c | 3 +- + sound/soc/pxa/corgi.c | 2 - + sound/soc/pxa/e800_wm9712.c | 2 - + sound/soc/pxa/em-x270.c | 2 - + sound/soc/pxa/poodle.c | 2 - + sound/soc/pxa/pxa-ssp.c | 2 +- + sound/soc/pxa/pxa2xx-ac97.c | 2 +- + sound/soc/pxa/pxa2xx-i2s.c | 2 +- + sound/soc/pxa/spitz.c | 2 - + sound/soc/pxa/tosa.c | 2 - + 132 files changed, 875 insertions(+), 870 deletions(-) + delete mode 100644 arch/arm/mach-pxa/include/mach/pxa-regs.h + create mode 100644 arch/arm/mach-pxa/include/mach/pxa25x.h + create mode 100644 arch/arm/mach-pxa/include/mach/pxa27x.h + create mode 100644 arch/arm/mach-pxa/include/mach/pxa300.h + create mode 100644 arch/arm/mach-pxa/include/mach/pxa320.h + create mode 100644 arch/arm/mach-pxa/include/mach/pxa930.h + create mode 100644 arch/arm/mach-pxa/include/mach/regs-intc.h + create mode 100644 arch/arm/mach-pxa/include/mach/regs-ost.h + create mode 100644 arch/arm/mach-pxa/include/mach/regs-rtc.h +Merging s390/features +$ git merge s390/features +Removed drivers/s390/ebcdic.c +Merge made by recursive. + Documentation/kernel-parameters.txt | 3 + + arch/s390/include/asm/lowcore.h | 26 ++-- + arch/s390/include/asm/system.h | 16 ++ + arch/s390/kernel/Makefile | 4 +- + arch/s390/kernel/ipl.c | 39 ++++- + arch/s390/kernel/process.c | 69 ++++---- + arch/s390/kernel/setup.c | 5 + + arch/s390/kernel/smp.c | 11 +- + {drivers/s390 => arch/s390/kernel}/sysinfo.c | 69 ++------ + arch/s390/mm/fault.c | 28 +--- + drivers/char/hvc_iucv.c | 139 ++++++++++++++- + drivers/s390/Makefile | 4 +- + drivers/s390/block/dasd.c | 49 ++---- + drivers/s390/block/dasd_devmap.c | 2 +- + drivers/s390/block/dasd_ioctl.c | 17 ++- + drivers/s390/char/zcore.c | 88 +++++++++- + drivers/s390/ebcdic.c | 246 -------------------------- + 17 files changed, 382 insertions(+), 433 deletions(-) + rename {drivers/s390 => arch/s390/kernel}/sysinfo.c (88%) + delete mode 100644 drivers/s390/ebcdic.c +Merging sh/master +$ git merge sh/master +Merge made by recursive. + arch/sh/Kconfig | 37 ++- + arch/sh/boards/Kconfig | 6 +- + arch/sh/boards/mach-highlander/Kconfig | 2 +- + arch/sh/boards/mach-rsk/Kconfig | 2 +- + arch/sh/include/asm/atomic-irq.h | 16 +- + arch/sh/include/asm/bitops-llsc.h | 72 ++-- + arch/sh/include/asm/cmpxchg-llsc.h | 38 +- + arch/sh/include/asm/gpio.h | 70 +++-- + arch/sh/include/asm/kprobes.h | 2 +- + arch/sh/include/asm/processor_32.h | 12 +- + arch/sh/include/asm/processor_64.h | 14 +- + arch/sh/include/asm/timer.h | 4 +- + arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 34 ++ + arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 34 ++ + arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 34 ++ + arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 34 ++ + arch/sh/kernel/gpio.c | 338 +++++++++++------- + arch/sh/kernel/time_32.c | 71 +--- + arch/sh/kernel/timers/timer-mtu2.c | 3 +- + arch/sh/kernel/timers/timer-tmu.c | 20 +- + drivers/clocksource/Makefile | 1 + + drivers/clocksource/sh_cmt.c | 615 ++++++++++++++++++++++++++++++++ + drivers/serial/sh-sci.h | 2 +- + include/linux/sh_cmt.h | 13 + + 24 files changed, 1168 insertions(+), 306 deletions(-) + create mode 100644 drivers/clocksource/sh_cmt.c + create mode 100644 include/linux/sh_cmt.h +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging x86/auto-x86-next +$ git merge x86/auto-x86-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/x86/ia32/ia32entry.S +Removed arch/x86/include/asm/bigsmp/apic.h +Removed arch/x86/include/asm/bigsmp/apicdef.h +Removed arch/x86/include/asm/bigsmp/ipi.h +Removed arch/x86/include/asm/es7000/apic.h +Removed arch/x86/include/asm/es7000/apicdef.h +Removed arch/x86/include/asm/es7000/ipi.h +Removed arch/x86/include/asm/es7000/mpparse.h +Removed arch/x86/include/asm/es7000/wakecpu.h +Removed arch/x86/include/asm/genapic_32.h +Removed arch/x86/include/asm/genapic_64.h +Removed arch/x86/include/asm/hardirq_32.h +Removed arch/x86/include/asm/hardirq_64.h +Removed arch/x86/include/asm/irq_regs_32.h +Removed arch/x86/include/asm/irq_regs_64.h +Removed arch/x86/include/asm/mach-default/entry_arch.h +Removed arch/x86/include/asm/mach-default/mach_apic.h +Removed arch/x86/include/asm/mach-default/mach_apicdef.h +Removed arch/x86/include/asm/mach-default/mach_ipi.h +Removed arch/x86/include/asm/mach-default/mach_mpparse.h +Removed arch/x86/include/asm/mach-default/mach_mpspec.h +Removed arch/x86/include/asm/mach-default/mach_wakecpu.h +Removed arch/x86/include/asm/mach-generic/gpio.h +Removed arch/x86/include/asm/mach-generic/mach_apic.h +Removed arch/x86/include/asm/mach-generic/mach_apicdef.h +Removed arch/x86/include/asm/mach-generic/mach_ipi.h +Removed arch/x86/include/asm/mach-generic/mach_mpparse.h +Removed arch/x86/include/asm/mach-generic/mach_mpspec.h +Removed arch/x86/include/asm/mach-generic/mach_wakecpu.h +Removed arch/x86/include/asm/mach-rdc321x/gpio.h +Removed arch/x86/include/asm/mmu_context_32.h +Removed arch/x86/include/asm/mmu_context_64.h +Removed arch/x86/include/asm/numaq/apic.h +Removed arch/x86/include/asm/numaq/apicdef.h +Removed arch/x86/include/asm/numaq/ipi.h +Removed arch/x86/include/asm/numaq/mpparse.h +Removed arch/x86/include/asm/numaq/wakecpu.h +Auto-merged arch/x86/include/asm/paravirt.h +Removed arch/x86/include/asm/pda.h +Auto-merged arch/x86/include/asm/spinlock.h +Removed arch/x86/include/asm/summit/apic.h +Removed arch/x86/include/asm/summit/apicdef.h +Removed arch/x86/include/asm/summit/ipi.h +Removed arch/x86/include/asm/summit/mpparse.h +Auto-merged arch/x86/kernel/acpi/sleep.c +Removed arch/x86/kernel/smpcommon.c +Removed arch/x86/kernel/tlb_32.c +Removed arch/x86/mach-default/Makefile +Removed arch/x86/mach-default/setup.c +Removed arch/x86/mach-generic/Makefile +Removed arch/x86/mach-generic/bigsmp.c +Removed arch/x86/mach-generic/default.c +Removed arch/x86/mach-generic/es7000.c +Removed arch/x86/mach-generic/numaq.c +Removed arch/x86/mach-generic/probe.c +Removed arch/x86/mach-generic/summit.c +Removed arch/x86/mach-rdc321x/Makefile +Removed arch/x86/mach-rdc321x/gpio.c +Removed arch/x86/mach-rdc321x/platform.c +Auto-merged drivers/input/mouse/Kconfig +Auto-merged kernel/fork.c +Merge made by recursive. + Documentation/cputopology.txt | 6 +- + Documentation/kernel-parameters.txt | 2 + + Documentation/x86/boot.txt | 13 +- + arch/alpha/kernel/irq.c | 2 +- + arch/arm/kernel/irq.c | 18 +- + arch/arm/kernel/vmlinux.lds.S | 1 + + arch/arm/oprofile/op_model_mpcore.c | 2 +- + arch/blackfin/kernel/irqchip.c | 5 + + arch/ia64/include/asm/topology.h | 2 +- + arch/ia64/kernel/iosapic.c | 2 +- + arch/ia64/kernel/irq.c | 4 +- + arch/ia64/kernel/irq_ia64.c | 12 +- + arch/ia64/kernel/msi_ia64.c | 4 +- + arch/ia64/kernel/vmlinux.lds.S | 1 + + arch/ia64/sn/kernel/msi_sn.c | 2 +- + arch/mips/include/asm/irq.h | 2 +- + arch/mips/kernel/irq-gic.c | 2 +- + arch/mips/kernel/smtc.c | 6 +- + arch/mips/mti-malta/malta-smtc.c | 5 +- + arch/mips/sgi-ip22/ip22-int.c | 2 +- + arch/mips/sgi-ip22/ip22-time.c | 2 +- + arch/mips/sibyte/bcm1480/smp.c | 3 +- + arch/mips/sibyte/sb1250/smp.c | 3 +- + arch/mn10300/kernel/mn10300-watchdog.c | 3 +- + arch/parisc/kernel/irq.c | 8 +- + arch/powerpc/kernel/irq.c | 2 +- + arch/powerpc/kernel/vmlinux.lds.S | 1 + + arch/powerpc/platforms/pseries/xics.c | 5 +- + arch/powerpc/sysdev/mpic.c | 3 +- + arch/sparc/kernel/irq_64.c | 5 +- + arch/sparc/kernel/time_64.c | 2 +- + arch/x86/Kconfig | 623 ++++++++-------- + arch/x86/Kconfig.cpu | 108 ++-- + arch/x86/Kconfig.debug | 50 +- + arch/x86/Makefile | 28 +- + arch/x86/boot/a20.c | 75 +- + arch/x86/configs/i386_defconfig | 1 - + arch/x86/configs/x86_64_defconfig | 1 - + arch/x86/ia32/ia32_signal.c | 365 +++++----- + arch/x86/ia32/ia32entry.S | 8 +- + arch/x86/include/asm/apic.h | 33 + + arch/x86/include/asm/apicnum.h | 12 + + arch/x86/include/asm/{mach-default => }/apm.h | 0 + arch/x86/include/asm/bigsmp/apic.h | 155 ---- + arch/x86/include/asm/bigsmp/apicdef.h | 13 - + arch/x86/include/asm/bigsmp/ipi.h | 22 - + arch/x86/include/asm/calling.h | 56 ++- + arch/x86/include/asm/cpu.h | 17 + + arch/x86/include/asm/cpumask.h | 32 + + arch/x86/include/asm/current.h | 24 +- + arch/x86/include/asm/{mach-default => }/do_timer.h | 0 + arch/x86/include/asm/entry_arch.h | 57 ++ + arch/x86/include/asm/es7000/apic.h | 242 ------ + arch/x86/include/asm/es7000/apicdef.h | 13 - + arch/x86/include/asm/es7000/ipi.h | 22 - + arch/x86/include/asm/es7000/mpparse.h | 29 - + arch/x86/include/asm/es7000/wakecpu.h | 37 - + arch/x86/include/asm/genapic.h | 262 +++++++- + arch/x86/include/asm/genapic_32.h | 148 ---- + arch/x86/include/asm/genapic_64.h | 66 -- + arch/x86/include/asm/hardirq.h | 49 ++- + arch/x86/include/asm/hardirq_32.h | 30 - + arch/x86/include/asm/hardirq_64.h | 25 - + arch/x86/include/asm/hw_irq.h | 18 +- + arch/x86/include/asm/io.h | 3 +- + arch/x86/include/asm/io_32.h | 2 - + arch/x86/include/asm/io_64.h | 2 - + arch/x86/include/asm/io_apic.h | 35 +- + arch/x86/include/asm/ipi.h | 77 ++- + arch/x86/include/asm/irq_regs.h | 36 +- + arch/x86/include/asm/irq_regs_32.h | 31 - + arch/x86/include/asm/irq_regs_64.h | 1 - + arch/x86/include/asm/irq_vectors.h | 209 +++--- + arch/x86/include/asm/kexec.h | 27 +- + arch/x86/include/asm/mach-default/entry_arch.h | 36 - + arch/x86/include/asm/mach-default/mach_apic.h | 168 ----- + arch/x86/include/asm/mach-default/mach_apicdef.h | 24 - + arch/x86/include/asm/mach-default/mach_ipi.h | 64 -- + arch/x86/include/asm/mach-default/mach_mpparse.h | 17 - + arch/x86/include/asm/mach-default/mach_mpspec.h | 12 - + arch/x86/include/asm/mach-default/mach_wakecpu.h | 41 - + arch/x86/include/asm/mach-generic/gpio.h | 15 - + arch/x86/include/asm/mach-generic/mach_apic.h | 35 - + arch/x86/include/asm/mach-generic/mach_apicdef.h | 11 - + arch/x86/include/asm/mach-generic/mach_ipi.h | 10 - + arch/x86/include/asm/mach-generic/mach_mpparse.h | 9 - + arch/x86/include/asm/mach-generic/mach_mpspec.h | 12 - + arch/x86/include/asm/mach-generic/mach_wakecpu.h | 12 - + arch/x86/include/asm/mach-rdc321x/gpio.h | 60 -- + .../include/asm/{mach-default => }/mach_timer.h | 0 + .../include/asm/{mach-default => }/mach_traps.h | 0 + arch/x86/include/asm/mmu_context.h | 63 ++- + arch/x86/include/asm/mmu_context_32.h | 55 -- + arch/x86/include/asm/mmu_context_64.h | 54 -- + arch/x86/include/asm/mpspec.h | 33 +- + arch/x86/include/asm/mpspec_def.h | 23 +- + arch/x86/include/asm/numaq.h | 2 + + arch/x86/include/asm/numaq/apic.h | 142 ---- + arch/x86/include/asm/numaq/apicdef.h | 14 - + arch/x86/include/asm/numaq/ipi.h | 22 - + arch/x86/include/asm/numaq/mpparse.h | 6 - + arch/x86/include/asm/numaq/wakecpu.h | 45 -- + arch/x86/include/asm/page.h | 3 +- + arch/x86/include/asm/page_64.h | 4 +- + arch/x86/include/asm/paravirt.h | 463 ++++++++---- + arch/x86/include/asm/pat.h | 4 - + .../include/asm/{mach-default => }/pci-functions.h | 0 + arch/x86/include/asm/pda.h | 137 ---- + arch/x86/include/asm/percpu.h | 153 ++--- + arch/x86/include/asm/pgtable.h | 64 ++- + arch/x86/include/asm/pgtable_64.h | 1 - + arch/x86/include/asm/prctl.h | 4 - + arch/x86/include/asm/processor.h | 22 +- + arch/x86/include/asm/proto.h | 4 - + .../include/asm/{mach-rdc321x => }/rdc321x_defs.h | 0 + arch/x86/include/asm/setup.h | 9 +- + .../include/asm/{mach-default => }/setup_arch.h | 0 + arch/x86/include/asm/smp.h | 69 +-- + .../include/asm/{mach-default => }/smpboot_hooks.h | 6 +- + arch/x86/include/asm/spinlock.h | 69 +-- + arch/x86/include/asm/stackprotector.h | 38 + + arch/x86/include/asm/summit/apic.h | 202 ----- + arch/x86/include/asm/summit/apicdef.h | 13 - + arch/x86/include/asm/summit/ipi.h | 26 - + arch/x86/include/asm/summit/mpparse.h | 109 --- + arch/x86/include/asm/system.h | 29 +- + arch/x86/include/asm/thread_info.h | 21 +- + arch/x86/include/asm/tlbflush.h | 17 +- + arch/x86/include/asm/topology.h | 31 +- + arch/x86/include/asm/trampoline.h | 1 + + arch/x86/include/asm/uaccess.h | 115 +++- + arch/x86/include/asm/uv/uv.h | 33 + + arch/x86/include/asm/uv/uv_bau.h | 1 - + arch/x86/include/asm/voyager.h | 42 ++ + arch/x86/include/asm/xen/page.h | 2 +- + arch/x86/kernel/Makefile | 25 +- + arch/x86/kernel/acpi/boot.c | 121 ++-- + arch/x86/kernel/acpi/sleep.c | 1 + + arch/x86/kernel/apic.c | 142 +++-- + arch/x86/kernel/apm_32.c | 2 +- + arch/x86/kernel/asm-offsets_64.c | 11 - + arch/x86/kernel/bigsmp_32.c | 266 +++++++ + arch/x86/kernel/cpu/addon_cpuid_features.c | 54 +-- + arch/x86/kernel/cpu/amd.c | 2 +- + arch/x86/kernel/cpu/common.c | 238 ++++--- + arch/x86/kernel/cpu/intel.c | 14 +- + arch/x86/kernel/cpu/intel_cacheinfo.c | 63 ++- + arch/x86/kernel/cpu/mcheck/mce_amd_64.c | 21 +- + arch/x86/kernel/cpu/mcheck/mce_intel_64.c | 1 + + arch/x86/kernel/crash.c | 4 +- + arch/x86/kernel/dumpstack_64.c | 35 +- + arch/x86/kernel/efi.c | 2 + + arch/x86/kernel/efi_64.c | 1 + + arch/x86/kernel/entry_32.S | 8 +- + arch/x86/kernel/entry_64.S | 47 +- + arch/x86/kernel/es7000_32.c | 468 +++++++++++- + arch/x86/kernel/genapic_64.c | 24 +- + arch/x86/kernel/genapic_flat_64.c | 176 ++++-- + arch/x86/kernel/genx2apic_cluster.c | 133 +++-- + arch/x86/kernel/genx2apic_phys.c | 125 ++-- + arch/x86/kernel/genx2apic_uv_x.c | 112 ++- + arch/x86/kernel/head64.c | 23 - + arch/x86/kernel/head_32.S | 19 +- + arch/x86/kernel/head_64.S | 36 +- + arch/x86/kernel/io_apic.c | 369 +++++----- + arch/x86/kernel/ipi.c | 176 ++--- + arch/x86/kernel/irq.c | 6 +- + arch/x86/kernel/irq_32.c | 4 +- + arch/x86/kernel/irq_64.c | 9 +- + arch/x86/kernel/irqinit_32.c | 23 +- + arch/x86/kernel/kgdb.c | 4 +- + arch/x86/kernel/machine_kexec_64.c | 82 ++- + arch/x86/kernel/microcode_intel.c | 10 +- + arch/x86/kernel/module_32.c | 6 +- + arch/x86/kernel/module_64.c | 32 +- + arch/x86/kernel/mpparse.c | 172 ++--- + arch/x86/kernel/msr.c | 2 +- + arch/x86/kernel/nmi.c | 12 +- + arch/x86/kernel/numaq_32.c | 307 ++++++++- + arch/x86/kernel/paravirt-spinlocks.c | 10 - + arch/x86/kernel/paravirt.c | 55 +- + arch/x86/kernel/paravirt_patch_32.c | 12 + + arch/x86/kernel/paravirt_patch_64.c | 15 + + arch/x86/kernel/probe_32.c | 411 +++++++++++ + arch/x86/kernel/probe_roms_32.c | 2 +- + arch/x86/kernel/process.c | 2 +- + arch/x86/kernel/process_32.c | 11 +- + arch/x86/kernel/process_64.c | 52 +- + arch/x86/kernel/reboot.c | 5 +- + arch/x86/kernel/relocate_kernel_64.S | 125 +--- + arch/x86/kernel/setup.c | 34 +- + arch/x86/kernel/setup_percpu.c | 412 ++--------- + arch/x86/kernel/signal.c | 297 ++++---- + arch/x86/kernel/smp.c | 15 +- + arch/x86/kernel/smpboot.c | 117 +--- + arch/x86/kernel/smpcommon.c | 30 - + arch/x86/kernel/stacktrace.c | 2 +- + arch/x86/kernel/summit_32.c | 416 +++++++++++- + arch/x86/kernel/time_32.c | 2 +- + arch/x86/kernel/tlb_32.c | 256 ------- + arch/x86/kernel/tlb_uv.c | 72 ++- + arch/x86/kernel/trampoline_64.S | 19 +- + arch/x86/kernel/traps.c | 3 +- + arch/x86/kernel/tsc.c | 2 +- + arch/x86/kernel/visws_quirks.c | 6 +- + arch/x86/kernel/vmi_32.c | 9 +- + arch/x86/kernel/vmiclock_32.c | 2 +- + arch/x86/kernel/vmlinux_32.lds.S | 9 +- + arch/x86/kernel/vmlinux_64.lds.S | 27 +- + arch/x86/kernel/vsmp_64.c | 12 +- + arch/x86/kernel/x8664_ksyms_64.c | 2 - + arch/x86/lguest/boot.c | 13 +- + arch/x86/mach-default/Makefile | 5 - + arch/x86/mach-default/setup.c | 174 ----- + arch/x86/mach-generic/Makefile | 11 - + arch/x86/mach-generic/bigsmp.c | 60 -- + arch/x86/mach-generic/default.c | 27 - + arch/x86/mach-generic/es7000.c | 103 --- + arch/x86/mach-generic/numaq.c | 53 -- + arch/x86/mach-generic/probe.c | 152 ---- + arch/x86/mach-generic/summit.c | 40 - + arch/x86/mach-rdc321x/Makefile | 5 - + arch/x86/mach-rdc321x/gpio.c | 194 ----- + arch/x86/mach-rdc321x/platform.c | 69 -- + arch/x86/mach-voyager/setup.c | 1 + + arch/x86/mach-voyager/voyager_smp.c | 9 +- + arch/x86/mm/Makefile | 2 + + arch/x86/mm/extable.c | 6 + + arch/x86/mm/fault.c | 468 +++++++----- + arch/x86/mm/init_32.c | 1 - + arch/x86/mm/ioremap.c | 2 +- + arch/x86/mm/mmap.c | 2 +- + arch/x86/mm/numa_64.c | 217 ++++++ + arch/x86/mm/pat.c | 31 +- + arch/x86/mm/srat_64.c | 1 + + arch/x86/{kernel/tlb_64.c => mm/tlb.c} | 124 ++-- + arch/x86/pci/numaq_32.c | 6 +- + arch/x86/pci/pcbios.c | 2 +- + arch/x86/xen/Makefile | 3 +- + arch/x86/xen/enlighten.c | 772 +------------------- + arch/x86/xen/irq.c | 22 +- + arch/x86/xen/mmu.c | 753 +++++++++++++++++++- + arch/x86/xen/mmu.h | 3 + + arch/x86/xen/multicalls.h | 2 +- + arch/x86/xen/smp.c | 41 +- + arch/x86/xen/suspend.c | 1 + + arch/x86/xen/xen-asm.S | 140 ++++ + arch/x86/xen/xen-asm.h | 12 + + arch/x86/xen/xen-asm_32.S | 111 +--- + arch/x86/xen/xen-asm_64.S | 147 +---- + arch/x86/xen/xen-ops.h | 10 + + drivers/base/cpu.c | 2 +- + drivers/base/topology.c | 33 +- + drivers/clocksource/acpi_pm.c | 2 +- + drivers/clocksource/cyclone.c | 2 +- + drivers/eisa/Kconfig | 6 +- + drivers/firmware/dcdbas.c | 12 +- + drivers/input/keyboard/Kconfig | 4 +- + drivers/input/mouse/Kconfig | 2 +- + drivers/misc/Kconfig | 4 +- + drivers/misc/sgi-gru/gru.h | 2 + + drivers/misc/sgi-xp/xp.h | 2 + + drivers/misc/sgi-xp/xpc_main.c | 2 +- + drivers/mtd/nand/Kconfig | 2 +- + drivers/net/sfc/efx.c | 17 +- + drivers/oprofile/buffer_sync.c | 22 +- + drivers/oprofile/buffer_sync.h | 4 + + drivers/oprofile/oprof.c | 9 +- + drivers/pci/intel-iommu.c | 14 +- + drivers/pci/intr_remapping.c | 1 + + drivers/watchdog/rdc321x_wdt.c | 2 +- + drivers/xen/events.c | 26 +- + drivers/xen/manage.c | 2 +- + include/asm-generic/percpu.h | 52 ++ + include/asm-generic/sections.h | 2 +- + include/asm-generic/vmlinux.lds.h | 55 ++- + include/linux/interrupt.h | 1 + + include/linux/irq.h | 86 +++- + include/linux/irqnr.h | 1 + + include/linux/magic.h | 1 + + include/linux/percpu.h | 41 +- + include/linux/sched.h | 16 +- + include/linux/smp.h | 6 + + include/linux/stackprotector.h | 16 + + include/linux/topology.h | 6 + + init/main.c | 19 +- + kernel/exit.c | 5 +- + kernel/fork.c | 5 + + kernel/irq/chip.c | 5 +- + kernel/irq/handle.c | 57 +- + kernel/irq/internals.h | 7 + + kernel/irq/manage.c | 12 +- + kernel/irq/migration.c | 12 +- + kernel/irq/numa_migrate.c | 19 +- + kernel/irq/proc.c | 4 +- + kernel/panic.c | 12 +- + kernel/sched.c | 7 +- + kernel/sched_rt.c | 32 +- + kernel/softirq.c | 5 + + sound/drivers/Kconfig | 2 +- + 300 files changed, 7946 insertions(+), 8190 deletions(-) + create mode 100644 arch/x86/include/asm/apicnum.h + rename arch/x86/include/asm/{mach-default => }/apm.h (100%) + delete mode 100644 arch/x86/include/asm/bigsmp/apic.h + delete mode 100644 arch/x86/include/asm/bigsmp/apicdef.h + delete mode 100644 arch/x86/include/asm/bigsmp/ipi.h + create mode 100644 arch/x86/include/asm/cpumask.h + rename arch/x86/include/asm/{mach-default => }/do_timer.h (100%) + create mode 100644 arch/x86/include/asm/entry_arch.h + delete mode 100644 arch/x86/include/asm/es7000/apic.h + delete mode 100644 arch/x86/include/asm/es7000/apicdef.h + delete mode 100644 arch/x86/include/asm/es7000/ipi.h + delete mode 100644 arch/x86/include/asm/es7000/mpparse.h + delete mode 100644 arch/x86/include/asm/es7000/wakecpu.h + delete mode 100644 arch/x86/include/asm/genapic_32.h + delete mode 100644 arch/x86/include/asm/genapic_64.h + delete mode 100644 arch/x86/include/asm/hardirq_32.h + delete mode 100644 arch/x86/include/asm/hardirq_64.h + delete mode 100644 arch/x86/include/asm/irq_regs_32.h + delete mode 100644 arch/x86/include/asm/irq_regs_64.h + delete mode 100644 arch/x86/include/asm/mach-default/entry_arch.h + delete mode 100644 arch/x86/include/asm/mach-default/mach_apic.h + delete mode 100644 arch/x86/include/asm/mach-default/mach_apicdef.h + delete mode 100644 arch/x86/include/asm/mach-default/mach_ipi.h + delete mode 100644 arch/x86/include/asm/mach-default/mach_mpparse.h + delete mode 100644 arch/x86/include/asm/mach-default/mach_mpspec.h + delete mode 100644 arch/x86/include/asm/mach-default/mach_wakecpu.h + delete mode 100644 arch/x86/include/asm/mach-generic/gpio.h + delete mode 100644 arch/x86/include/asm/mach-generic/mach_apic.h + delete mode 100644 arch/x86/include/asm/mach-generic/mach_apicdef.h + delete mode 100644 arch/x86/include/asm/mach-generic/mach_ipi.h + delete mode 100644 arch/x86/include/asm/mach-generic/mach_mpparse.h + delete mode 100644 arch/x86/include/asm/mach-generic/mach_mpspec.h + delete mode 100644 arch/x86/include/asm/mach-generic/mach_wakecpu.h + delete mode 100644 arch/x86/include/asm/mach-rdc321x/gpio.h + rename arch/x86/include/asm/{mach-default => }/mach_timer.h (100%) + rename arch/x86/include/asm/{mach-default => }/mach_traps.h (100%) + delete mode 100644 arch/x86/include/asm/mmu_context_32.h + delete mode 100644 arch/x86/include/asm/mmu_context_64.h + delete mode 100644 arch/x86/include/asm/numaq/apic.h + delete mode 100644 arch/x86/include/asm/numaq/apicdef.h + delete mode 100644 arch/x86/include/asm/numaq/ipi.h + delete mode 100644 arch/x86/include/asm/numaq/mpparse.h + delete mode 100644 arch/x86/include/asm/numaq/wakecpu.h + rename arch/x86/include/asm/{mach-default => }/pci-functions.h (100%) + delete mode 100644 arch/x86/include/asm/pda.h + rename arch/x86/include/asm/{mach-rdc321x => }/rdc321x_defs.h (100%) + rename arch/x86/include/asm/{mach-default => }/setup_arch.h (100%) + rename arch/x86/include/asm/{mach-default => }/smpboot_hooks.h (83%) + create mode 100644 arch/x86/include/asm/stackprotector.h + delete mode 100644 arch/x86/include/asm/summit/apic.h + delete mode 100644 arch/x86/include/asm/summit/apicdef.h + delete mode 100644 arch/x86/include/asm/summit/ipi.h + delete mode 100644 arch/x86/include/asm/summit/mpparse.h + create mode 100644 arch/x86/include/asm/uv/uv.h + create mode 100644 arch/x86/kernel/bigsmp_32.c + create mode 100644 arch/x86/kernel/probe_32.c + delete mode 100644 arch/x86/kernel/smpcommon.c + delete mode 100644 arch/x86/kernel/tlb_32.c + delete mode 100644 arch/x86/mach-default/Makefile + delete mode 100644 arch/x86/mach-default/setup.c + delete mode 100644 arch/x86/mach-generic/Makefile + delete mode 100644 arch/x86/mach-generic/bigsmp.c + delete mode 100644 arch/x86/mach-generic/default.c + delete mode 100644 arch/x86/mach-generic/es7000.c + delete mode 100644 arch/x86/mach-generic/numaq.c + delete mode 100644 arch/x86/mach-generic/probe.c + delete mode 100644 arch/x86/mach-generic/summit.c + delete mode 100644 arch/x86/mach-rdc321x/Makefile + delete mode 100644 arch/x86/mach-rdc321x/gpio.c + delete mode 100644 arch/x86/mach-rdc321x/platform.c + rename arch/x86/{kernel/tlb_64.c => mm/tlb.c} (67%) + create mode 100644 arch/x86/xen/xen-asm.S + create mode 100644 arch/x86/xen/xen-asm.h + create mode 100644 include/linux/stackprotector.h +Merging xtensa/master +$ git merge xtensa/master +Already up-to-date. +Merging quilt/driver-core +$ git merge quilt/driver-core +Auto-merged Documentation/kernel-parameters.txt +Auto-merged drivers/input/serio/ambakmi.c +Auto-merged drivers/spi/pxa2xx_spi.c +Auto-merged include/asm-generic/vmlinux.lds.h +Removed include/linux/dynamic_printk.h +Auto-merged init/main.c +Removed lib/dynamic_printk.c +Merge made by recursive. + Documentation/DocBook/uio-howto.tmpl | 29 +- + Documentation/dynamic-debug-howto.txt | 240 ++++++++++ + Documentation/kernel-parameters.txt | 5 - + arch/mips/basler/excite/excite_iodev.c | 27 +- + arch/powerpc/platforms/ps3/system-bus.c | 4 +- + drivers/amba/bus.c | 4 +- + drivers/base/base.h | 31 ++ + drivers/base/bus.c | 42 ++- + drivers/base/core.c | 87 +++-- + drivers/base/dd.c | 32 +- + drivers/base/driver.c | 13 +- + drivers/base/platform.c | 44 ++- + drivers/block/floppy.c | 3 +- + drivers/char/tpm/tpm_atmel.c | 28 +- + drivers/char/tpm/tpm_tis.c | 28 +- + drivers/dio/dio.c | 4 +- + drivers/dma/dw_dmac.c | 2 +- + drivers/edac/cell_edac.c | 2 +- + drivers/edac/mpc85xx_edac.c | 2 +- + drivers/edac/mv64x60_edac.c | 8 +- + drivers/eisa/eisa-bus.c | 4 +- + drivers/gpio/bt8xxgpio.c | 2 +- + drivers/gpu/drm/drm_sysfs.c | 4 +- + drivers/ide/au1xxx-ide.c | 36 +- + drivers/isdn/gigaset/ser-gigaset.c | 3 +- + drivers/mca/mca-bus.c | 4 +- + drivers/media/radio/radio-tea5764.c | 3 +- + drivers/media/video/v4l2-device.c | 2 +- + drivers/mfd/mcp-core.c | 2 +- + drivers/mfd/ucb1x00-core.c | 2 +- + drivers/mmc/host/atmel-mci.c | 2 +- + drivers/mmc/host/of_mmc_spi.c | 2 +- + drivers/mtd/maps/pxa2xx-flash.c | 37 +- + drivers/mtd/nand/excite_nandflash.c | 25 +- + drivers/mtd/nand/ndfc.c | 2 +- + drivers/mtd/onenand/generic.c | 26 +- + drivers/net/arm/ks8695net.c | 2 +- + drivers/net/au1000_eth.c | 8 +- + drivers/net/bfin_mac.c | 12 +- + drivers/net/bmac.c | 2 +- + drivers/net/cpmac.c | 2 +- + drivers/net/declance.c | 6 +- + drivers/net/depca.c | 6 +- + drivers/net/ehea/ehea_main.c | 2 +- + drivers/net/jazzsonic.c | 6 +- + drivers/net/macb.c | 10 +- + drivers/net/macsonic.c | 15 +- + drivers/net/mipsnet.c | 26 +- + drivers/net/mv643xx_eth.c | 2 +- + drivers/net/sb1250-mac.c | 10 +- + drivers/net/smc911x.c | 2 +- + drivers/net/smc91x.c | 2 +- + drivers/net/smsc911x.c | 7 +- + drivers/net/smsc9420.c | 4 +- + drivers/net/tc35815.c | 4 +- + drivers/net/wimax/i2400m/driver.c | 2 +- + drivers/net/wimax/i2400m/usb-notif.c | 2 +- + drivers/net/xtsonic.c | 2 +- + drivers/parisc/dino.c | 11 +- + drivers/pci/hotplug/cpqphp_sysfs.c | 3 +- + drivers/pcmcia/au1000_generic.c | 37 +- + drivers/pcmcia/i82365.c | 28 +- + drivers/pcmcia/m32r_cfc.c | 30 +- + drivers/pcmcia/m32r_pcc.c | 30 +- + drivers/pcmcia/rsrc_mgr.c | 2 +- + drivers/pcmcia/sa1100_generic.c | 38 ++- + drivers/pcmcia/tcic.c | 30 +- + drivers/pcmcia/vrc4171_card.c | 34 +- + drivers/rapidio/rio-driver.c | 2 +- + drivers/rtc/rtc-at91sam9.c | 4 +- + drivers/rtc/rtc-omap.c | 4 +- + drivers/rtc/rtc-twl4030.c | 2 +- + drivers/s390/net/qeth_l3_main.c | 2 +- + drivers/scsi/a4000t.c | 26 +- + drivers/scsi/bvme6000_scsi.c | 26 +- + drivers/scsi/mvme16x_scsi.c | 26 +- + drivers/serial/sunzilog.c | 4 +- + drivers/sh/maple/maple.c | 8 +- + drivers/sh/superhyway/superhyway.c | 4 +- + drivers/spi/atmel_spi.c | 8 +- + drivers/spi/mpc52xx_psc_spi.c | 2 +- + drivers/spi/omap2_mcspi.c | 2 +- + drivers/spi/omap_uwire.c | 12 +- + drivers/spi/orion_spi.c | 2 +- + drivers/spi/pxa2xx_spi.c | 4 +- + drivers/spi/spi_bfin5xx.c | 4 +- + drivers/spi/spi_gpio.c | 2 +- + drivers/spi/spi_imx.c | 5 +- + drivers/spi/spi_mpc83xx.c | 4 +- + drivers/spi/spi_txx9.c | 3 +- + drivers/tc/tc.c | 8 +- + drivers/uio/Kconfig | 18 + + drivers/uio/Makefile | 1 + + drivers/uio/uio.c | 22 + + drivers/uio/uio_aec.c | 175 +++++++ + drivers/usb/gadget/ci13xxx_udc.c | 2 +- + drivers/usb/gadget/imx_udc.c | 4 +- + drivers/video/au1100fb.c | 31 +- + drivers/video/au1200fb.c | 25 +- + drivers/video/pmag-ba-fb.c | 17 +- + drivers/video/pmagb-b-fb.c | 17 +- + drivers/video/ps3fb.c | 2 +- + drivers/video/sh_mobile_lcdcfb.c | 2 +- + drivers/video/tmiofb.c | 2 +- + drivers/watchdog/rm9k_wdt.c | 27 +- + drivers/zorro/zorro.c | 4 +- + fs/sysfs/mount.c | 5 +- + include/asm-generic/vmlinux.lds.h | 15 +- + include/linux/device.h | 13 +- + include/linux/dynamic_debug.h | 88 ++++ + include/linux/dynamic_printk.h | 93 ---- + include/linux/init.h | 1 + + include/linux/kernel.h | 4 +- + include/linux/kobject.h | 2 + + include/linux/mod_devicetable.h | 9 + + include/linux/platform_device.h | 6 + + include/linux/uio_driver.h | 4 + + include/linux/wimax/debug.h | 2 +- + init/main.c | 9 + + kernel/module.c | 25 +- + lib/Kconfig.debug | 74 ++-- + lib/Makefile | 2 +- + lib/dynamic_debug.c | 769 +++++++++++++++++++++++++++++++ + lib/dynamic_printk.c | 414 ----------------- + lib/kobject.c | 52 ++- + net/netfilter/nf_conntrack_pptp.c | 2 +- + scripts/Makefile.lib | 2 +- + scripts/mod/file2alias.c | 12 + + 128 files changed, 2208 insertions(+), 1076 deletions(-) + create mode 100644 Documentation/dynamic-debug-howto.txt + create mode 100644 drivers/uio/uio_aec.c + create mode 100644 include/linux/dynamic_debug.h + delete mode 100644 include/linux/dynamic_printk.h + create mode 100644 lib/dynamic_debug.c + delete mode 100644 lib/dynamic_printk.c +Merging quilt/usb +$ git merge quilt/usb +Merge made by recursive. + drivers/block/ub.c | 9 +- + drivers/usb/class/usblp.c | 11 +- + drivers/usb/core/devices.c | 2 +- + drivers/usb/core/endpoint.c | 9 +- + drivers/usb/gadget/Kconfig | 1 + + drivers/usb/gadget/ci13xxx_udc.c | 1 - + drivers/usb/gadget/fsl_usb2_udc.c | 8 +- + drivers/usb/gadget/imx_udc.c | 244 ++++++++++++++--------- + drivers/usb/gadget/imx_udc.h | 49 +++-- + drivers/usb/gadget/lh7a40x_udc.c | 16 +- + drivers/usb/gadget/pxa27x_udc.c | 218 ++++++++++++++++++++- + drivers/usb/gadget/pxa27x_udc.h | 10 + + drivers/usb/host/isp116x.h | 8 +- + drivers/usb/host/pci-quirks.c | 2 +- + drivers/usb/host/r8a66597-hcd.c | 15 +- + drivers/usb/musb/cppi_dma.c | 22 +-- + drivers/usb/musb/musb_core.c | 22 ++- + drivers/usb/musb/musb_core.h | 1 - + drivers/usb/musb/musb_gadget_ep0.c | 1 - + drivers/usb/musb/musb_host.c | 296 +++++++++++++++++++++------- + drivers/usb/musb/musb_host.h | 1 + + drivers/usb/musb/musbhsdma.c | 7 +- + drivers/usb/otg/Kconfig | 8 + + drivers/usb/otg/Makefile | 1 + + drivers/usb/otg/gpio_vbus.c | 42 +++- + drivers/usb/otg/nop-usb-xceiv.c | 180 +++++++++++++++++ + drivers/usb/serial/ch341.c | 374 +++++++++++++++++++++++++++++------- + drivers/usb/serial/ftdi_sio.c | 27 +-- + drivers/usb/serial/generic.c | 9 +- + drivers/usb/serial/keyspan.c | 2 +- + drivers/usb/serial/opticon.c | 215 ++++++++++++++++++++- + drivers/usb/serial/option.c | 86 ++++++++- + drivers/usb/serial/usb-serial.c | 11 +- + drivers/usb/storage/Kconfig | 4 +- + drivers/usb/storage/alauda.c | 25 ++- + drivers/usb/storage/sddr09.c | 37 ++-- + drivers/usb/storage/sddr55.c | 4 +- + drivers/usb/storage/usb.c | 6 +- + drivers/usb/usb-skeleton.c | 6 +- + include/linux/usb.h | 180 ----------------- + include/linux/usb/ch9.h | 179 +++++++++++++++++ + include/linux/usb/gadget.h | 6 +- + include/linux/usb/otg.h | 8 + + include/linux/usb/serial.h | 3 +- + 44 files changed, 1758 insertions(+), 608 deletions(-) + create mode 100644 drivers/usb/otg/nop-usb-xceiv.c +Merging tip-core/auto-core-next +$ git merge tip-core/auto-core-next +Auto-merged arch/x86/include/asm/setup.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/setup.h +Auto-merged arch/x86/mm/fault.c +Auto-merged fs/btrfs/locking.c +CONFLICT (content): Merge conflict in fs/btrfs/locking.c +Auto-merged include/linux/kernel.h +Auto-merged kernel/fork.c +Auto-merged lib/Kconfig.debug +Resolved 'arch/x86/include/asm/setup.h' using previous resolution. +Resolved 'fs/btrfs/locking.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 127f485: Merge commit 'tip-core/auto-core-next' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/include/asm/statfs.h | 2 + + arch/alpha/include/asm/swab.h | 2 +- + arch/arm/include/asm/a.out.h | 2 +- + arch/arm/include/asm/setup.h | 2 +- + arch/arm/include/asm/swab.h | 2 +- + arch/avr32/include/asm/swab.h | 2 +- + arch/blackfin/include/asm/swab.h | 2 +- + arch/h8300/include/asm/swab.h | 2 +- + arch/ia64/include/asm/fpu.h | 2 - + arch/ia64/include/asm/gcc_intrin.h | 1 + + arch/ia64/include/asm/intrinsics.h | 1 + + arch/ia64/include/asm/kvm.h | 3 +- + arch/ia64/include/asm/swab.h | 2 +- + arch/mips/include/asm/sigcontext.h | 1 + + arch/mips/include/asm/swab.h | 2 +- + arch/parisc/include/asm/pdc.h | 3 +- + arch/parisc/include/asm/swab.h | 2 +- + arch/powerpc/include/asm/bootx.h | 2 +- + arch/powerpc/include/asm/elf.h | 2 +- + arch/powerpc/include/asm/kvm.h | 2 +- + arch/powerpc/include/asm/ps3fb.h | 1 + + arch/powerpc/include/asm/spu_info.h | 3 +- + arch/powerpc/include/asm/swab.h | 2 +- + arch/x86/include/asm/setup.h | 43 +++--- + arch/x86/include/asm/syscalls.h | 1 + + arch/x86/xen/xen-asm.S | 78 ++++++------ + arch/x86/xen/xen-asm_32.S | 238 ++++++++++++++++++----------------- + arch/x86/xen/xen-asm_64.S | 107 ++++++++-------- + arch/xtensa/include/asm/swab.h | 2 +- + include/asm-frv/swab.h | 2 +- + include/asm-m32r/swab.h | 2 +- + include/asm-mn10300/swab.h | 2 +- + include/linux/coda_psdev.h | 15 +- + include/linux/in6.h | 2 +- + include/linux/kernel.h | 17 +++ + include/linux/mutex.h | 5 +- + include/linux/nubus.h | 2 + + include/linux/reiserfs_fs.h | 56 ++++---- + include/linux/sched.h | 19 ++- + include/linux/socket.h | 6 +- + include/linux/types.h | 3 +- + kernel/Makefile | 1 + + kernel/fork.c | 2 +- + kernel/hung_task.c | 241 +++++++++++++++++++++++++++++++++++ + kernel/mutex-debug.c | 9 +- + kernel/mutex-debug.h | 18 ++- + kernel/mutex.c | 121 +++++++++++++++--- + kernel/mutex.h | 22 +++- + kernel/sched.c | 71 ++++++++++- + kernel/sched_features.h | 1 + + kernel/softlockup.c | 100 --------------- + kernel/sysctl.c | 15 ++- + lib/Kconfig.debug | 38 ++++++ + scripts/headers_check.pl | 2 +- + scripts/mod/modpost.c | 5 +- + 55 files changed, 852 insertions(+), 439 deletions(-) + create mode 100644 kernel/hung_task.c +Merging cpus4096/auto-cpus4096-next +$ git merge cpus4096/auto-cpus4096-next +Merge made by recursive. + drivers/char/sysrq.c | 2 +- + drivers/oprofile/buffer_sync.c | 20 ++++++-------------- + drivers/oprofile/buffer_sync.h | 4 ---- + drivers/oprofile/oprof.c | 9 +-------- + 4 files changed, 8 insertions(+), 27 deletions(-) +Merging ftrace/auto-ftrace-next +$ git merge ftrace/auto-ftrace-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged MAINTAINERS +Auto-merged arch/x86/Kconfig.debug +Auto-merged drivers/char/sysrq.c +Auto-merged include/linux/sched.h +Auto-merged init/main.c +Auto-merged kernel/sched.c +Auto-merged kernel/softirq.c +Merge made by recursive. + Documentation/ABI/testing/debugfs-kmemtrace | 71 ++ + Documentation/ftrace.txt | 74 ++ + Documentation/kernel-parameters.txt | 10 + + Documentation/sysrq.txt | 2 + + Documentation/tracers/mmiotrace.txt | 6 +- + Documentation/vm/kmemtrace.txt | 126 +++ + MAINTAINERS | 6 + + arch/ia64/Kconfig | 3 + + arch/ia64/include/asm/ftrace.h | 28 + + arch/ia64/kernel/Makefile | 5 + + arch/ia64/kernel/entry.S | 100 +++ + arch/ia64/kernel/ftrace.c | 206 +++++ + arch/ia64/kernel/ia64_ksyms.c | 6 + + arch/x86/Kconfig.debug | 24 +- + arch/x86/kernel/dumpstack.c | 6 + + arch/x86/kernel/ftrace.c | 11 +- + arch/x86/kvm/Kconfig | 3 +- + block/Kconfig | 8 + + block/blktrace.c | 718 +++++++++++++++- + drivers/char/sysrq.c | 2 +- + drivers/oprofile/cpu_buffer.c | 5 +- + fs/partitions/check.c | 4 + + include/linux/blktrace_api.h | 5 + + include/linux/ftrace.h | 25 + + include/linux/ring_buffer.h | 9 +- + include/linux/sched.h | 2 + + include/linux/slab_def.h | 68 ++- + include/linux/slob_def.h | 9 +- + include/linux/slub_def.h | 53 ++- + include/trace/kmemtrace.h | 75 ++ + include/trace/workqueue.h | 25 + + init/main.c | 2 + + kernel/relay.c | 4 +- + kernel/sched.c | 8 +- + kernel/softirq.c | 13 +- + kernel/trace/Kconfig | 62 ++- + kernel/trace/Makefile | 4 + + kernel/trace/ftrace.c | 18 +- + kernel/trace/kmemtrace.c | 339 ++++++++ + kernel/trace/ring_buffer.c | 64 +- + kernel/trace/trace.c | 1232 +++++---------------------- + kernel/trace/trace.h | 82 ++- + kernel/trace/trace_boot.c | 36 +- + kernel/trace/trace_branch.c | 275 ++++--- + kernel/trace/trace_functions.c | 202 ++++- + kernel/trace/trace_functions_graph.c | 313 +++++--- + kernel/trace/trace_hw_branches.c | 178 +++- + kernel/trace/trace_irqsoff.c | 44 +- + kernel/trace/trace_mmiotrace.c | 55 +- + kernel/trace/trace_nop.c | 5 - + kernel/trace/trace_output.c | 919 ++++++++++++++++++++ + kernel/trace/trace_output.h | 62 ++ + kernel/trace/trace_power.c | 25 +- + kernel/trace/trace_sched_switch.c | 12 +- + kernel/trace/trace_sched_wakeup.c | 85 +- + kernel/trace/trace_selftest.c | 19 +- + kernel/trace/trace_stat.c | 319 +++++++ + kernel/trace/trace_stat.h | 31 + + kernel/trace/trace_sysprof.c | 14 +- + kernel/trace/trace_workqueue.c | 281 ++++++ + kernel/workqueue.c | 16 +- + mm/slab.c | 71 ++- + mm/slob.c | 37 +- + mm/slub.c | 83 ++- + scripts/Makefile.build | 13 +- + scripts/recordmcount.pl | 37 +- + 66 files changed, 4990 insertions(+), 1665 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-kmemtrace + create mode 100644 Documentation/vm/kmemtrace.txt + create mode 100644 arch/ia64/include/asm/ftrace.h + create mode 100644 arch/ia64/kernel/ftrace.c + create mode 100644 include/trace/kmemtrace.h + create mode 100644 include/trace/workqueue.h + create mode 100644 kernel/trace/kmemtrace.c + create mode 100644 kernel/trace/trace_output.c + create mode 100644 kernel/trace/trace_output.h + create mode 100644 kernel/trace/trace_stat.c + create mode 100644 kernel/trace/trace_stat.h + create mode 100644 kernel/trace/trace_workqueue.c +Merging genirq/auto-genirq-next +$ git merge genirq/auto-genirq-next +Auto-merged include/linux/interrupt.h +Auto-merged kernel/irq/chip.c +Merge made by recursive. + include/linux/interrupt.h | 6 ++++++ + kernel/irq/chip.c | 6 ++++-- + kernel/irq/spurious.c | 14 +++++++++++++- + 3 files changed, 23 insertions(+), 3 deletions(-) +Merging safe-poison-pointers/auto-safe-poison-pointers-next +$ git merge safe-poison-pointers/auto-safe-poison-pointers-next +Auto-merged arch/x86/Kconfig +Merge made by recursive. + arch/x86/Kconfig | 5 +++++ + include/linux/poison.h | 16 ++++++++++++++-- + 2 files changed, 19 insertions(+), 2 deletions(-) +Merging sched/auto-sched-next +$ git merge sched/auto-sched-next +Auto-merged include/linux/sched.h +Auto-merged kernel/sched.c +Auto-merged kernel/sched_features.h +Auto-merged kernel/sched_rt.c +Auto-merged lib/Makefile +Merge made by recursive. + include/linux/init_task.h | 1 + + include/linux/plist.h | 9 +- + include/linux/sched.h | 7 +- + init/Kconfig | 1 - + kernel/sched.c | 146 +++++++++++-- + kernel/sched_debug.c | 1 + + kernel/sched_fair.c | 59 +++++- + kernel/sched_features.h | 3 +- + kernel/sched_rt.c | 537 +++++++++++++++++++++++++++++++-------------- + lib/Kconfig | 6 - + lib/Makefile | 4 +- + 11 files changed, 568 insertions(+), 206 deletions(-) +Merging stackprotector/auto-stackprotector-next +$ git merge stackprotector/auto-stackprotector-next +Already uptodate! +Merge made by recursive. +Merging timers/auto-timers-next +$ git merge timers/auto-timers-next +Auto-merged kernel/hrtimer.c +Merge made by recursive. + arch/x86/kernel/quirks.c | 3 ++- + kernel/time/clockevents.c | 20 +++++++++++--------- + 2 files changed, 13 insertions(+), 10 deletions(-) +Merging pci/linux-next +$ git merge pci/linux-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged drivers/pci/pci-driver.c +Auto-merged drivers/pci/pci.c +Auto-merged drivers/pci/pcie/portdrv_pci.c +CONFLICT (content): Merge conflict in drivers/pci/pcie/portdrv_pci.c +Auto-merged include/linux/pci.h +Resolved 'drivers/pci/pcie/portdrv_pci.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit d95c7b5: Merge commit 'pci/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 2 + + arch/x86/pci/early.c | 19 +- + drivers/pci/hotplug/pciehp_acpi.c | 16 +-- + drivers/pci/hotplug/pciehp_core.c | 18 +-- + drivers/pci/msi.c | 24 ++- + drivers/pci/pci-driver.c | 20 +- + drivers/pci/pci.c | 17 +- + drivers/pci/pci.h | 20 +- + drivers/pci/pcie/aer/aerdrv.c | 28 +--- + drivers/pci/pcie/aer/aerdrv_core.c | 10 +- + drivers/pci/pcie/portdrv.h | 14 +- + drivers/pci/pcie/portdrv_bus.c | 18 +- + drivers/pci/pcie/portdrv_core.c | 361 ++++++++++++++++++++++++----------- + drivers/pci/pcie/portdrv_pci.c | 49 ++--- + include/linux/pci.h | 5 + + include/linux/pcieport_if.h | 36 ++-- + 16 files changed, 388 insertions(+), 269 deletions(-) +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Merge made by recursive. + drivers/md/dm-io.c | 2 + + drivers/md/dm-ioctl.c | 7 ++- + drivers/md/dm-target.c | 104 ++++++++++++----------------------------- + drivers/md/dm.h | 2 +- + include/linux/device-mapper.h | 3 + + 5 files changed, 40 insertions(+), 78 deletions(-) +Merging hid/for-next +$ git merge hid/for-next +Auto-merged include/linux/hid.h +Merge made by recursive. + drivers/hid/Kconfig | 6 +- + drivers/hid/hid-core.c | 17 ++ + drivers/hid/hid-ids.h | 3 + + drivers/hid/hidraw.c | 31 ++- + drivers/hid/usbhid/hid-core.c | 443 ++++++++++++++++++++++++++++++++--------- + drivers/hid/usbhid/hiddev.c | 17 ++- + drivers/hid/usbhid/usbhid.h | 14 +- + include/linux/hid.h | 7 + + 8 files changed, 427 insertions(+), 111 deletions(-) +Merging quilt/i2c +$ git merge quilt/i2c +Auto-merged include/linux/pci_ids.h +Merge made by recursive. + Documentation/i2c/busses/i2c-nforce2 | 11 +- + drivers/i2c/algos/i2c-algo-pca.c | 14 ++- + drivers/i2c/algos/i2c-algo-pcf.c | 260 ++++++++++++++++------------------ + drivers/i2c/busses/i2c-amd8111.c | 4 +- + drivers/i2c/busses/i2c-nforce2.c | 10 +- + drivers/i2c/busses/i2c-pca-isa.c | 5 +- + drivers/i2c/busses/i2c-powermac.c | 3 +- + drivers/i2c/busses/i2c-pxa.c | 11 +- + drivers/misc/eeprom/Kconfig | 2 +- + include/linux/pci_ids.h | 3 + + 10 files changed, 162 insertions(+), 161 deletions(-) +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Merge made by recursive. + Documentation/hwmon/ds1621 | 51 +------------ + drivers/hwmon/ds1621.c | 172 +++++++++++++++++++++----------------------- + drivers/hwmon/f71882fg.c | 4 +- + drivers/hwmon/vt1211.c | 2 +- + drivers/hwmon/w83627ehf.c | 2 +- + 5 files changed, 90 insertions(+), 141 deletions(-) +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Already up-to-date. +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Auto-merged MAINTAINERS +Auto-merged drivers/media/video/uvc/uvc_status.c +Merge made by recursive. + Documentation/video4linux/CARDLIST.bttv | 1 + + Documentation/video4linux/CARDLIST.cx23885 | 3 + + Documentation/video4linux/CARDLIST.em28xx | 1 + + Documentation/video4linux/gspca.txt | 2 + + Documentation/video4linux/v4l2-framework.txt | 6 + + Documentation/video4linux/zr364xx.txt | 1 + + MAINTAINERS | 6 +- + drivers/media/common/saa7146_fops.c | 39 +- + drivers/media/common/saa7146_video.c | 1250 ++++++++++---------- + drivers/media/dvb/bt8xx/dst_ca.c | 2 +- + drivers/media/dvb/dvb-core/dmxdev.c | 2 +- + drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 2 +- + drivers/media/dvb/dvb-core/dvb_frontend.c | 2 +- + drivers/media/dvb/dvb-core/dvb_net.c | 2 +- + drivers/media/dvb/dvb-core/dvbdev.c | 4 +- + drivers/media/dvb/dvb-core/dvbdev.h | 2 +- + drivers/media/dvb/dvb-usb/af9015.c | 20 +- + drivers/media/dvb/dvb-usb/af9015.h | 31 + + drivers/media/dvb/dvb-usb/dib0700_core.c | 3 +- + drivers/media/dvb/dvb-usb/dib0700_devices.c | 43 +- + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 1 + + drivers/media/dvb/frontends/cx24116.c | 58 +- + drivers/media/dvb/frontends/lnbp21.h | 16 +- + drivers/media/dvb/ttpci/av7110.c | 2 +- + drivers/media/dvb/ttpci/av7110_av.c | 4 +- + drivers/media/dvb/ttpci/av7110_ca.c | 2 +- + drivers/media/dvb/ttpci/av7110_v4l.c | 480 ++++---- + drivers/media/dvb/ttpci/budget-av.c | 88 +- + drivers/media/radio/dsbr100.c | 4 +- + drivers/media/radio/radio-mr800.c | 4 +- + drivers/media/video/bt8xx/bttv-cards.c | 17 + + drivers/media/video/bt8xx/bttv.h | 1 + + drivers/media/video/cs53l32a.c | 1 - + drivers/media/video/cx18/cx18-av-core.c | 2 +- + drivers/media/video/cx18/cx18-av-firmware.c | 6 +- + drivers/media/video/cx18/cx18-cards.c | 5 +- + drivers/media/video/cx18/cx18-driver.c | 97 +- + drivers/media/video/cx18/cx18-driver.h | 11 +- + drivers/media/video/cx18/cx18-dvb.c | 2 +- + drivers/media/video/cx18/cx18-fileops.c | 10 +- + drivers/media/video/cx18/cx18-firmware.c | 4 +- + drivers/media/video/cx18/cx18-i2c.c | 2 +- + drivers/media/video/cx18/cx18-ioctl.c | 9 +- + drivers/media/video/cx18/cx18-mailbox.c | 44 +- + drivers/media/video/cx18/cx18-queue.c | 4 +- + drivers/media/video/cx18/cx18-queue.h | 4 +- + drivers/media/video/cx18/cx18-streams.c | 59 +- + drivers/media/video/cx18/cx23418.h | 16 + + drivers/media/video/cx2341x.c | 99 ++- + drivers/media/video/cx23885/cx23885-cards.c | 37 + + drivers/media/video/cx23885/cx23885-dvb.c | 54 + + drivers/media/video/cx23885/cx23885.h | 3 + + drivers/media/video/cx25840/cx25840-core.c | 12 +- + drivers/media/video/dabusb.c | 70 +- + drivers/media/video/em28xx/em28xx-audio.c | 20 +- + drivers/media/video/em28xx/em28xx-cards.c | 26 +- + drivers/media/video/em28xx/em28xx-core.c | 2 +- + drivers/media/video/em28xx/em28xx-video.c | 11 +- + drivers/media/video/em28xx/em28xx.h | 1 + + drivers/media/video/gspca/Kconfig | 9 + + drivers/media/video/gspca/Makefile | 98 +- + drivers/media/video/gspca/conex.c | 15 +- + drivers/media/video/gspca/etoms.c | 36 +- + drivers/media/video/gspca/finepix.c | 12 +- + drivers/media/video/gspca/gspca.c | 45 +- + drivers/media/video/gspca/gspca.h | 13 +- + drivers/media/video/gspca/jpeg.h | 283 +++-- + drivers/media/video/gspca/m5602/m5602_core.c | 7 +- + drivers/media/video/gspca/mars.c | 453 ++++---- + drivers/media/video/gspca/mr97310a.c | 378 ++++++ + drivers/media/video/gspca/ov519.c | 7 +- + drivers/media/video/gspca/ov534.c | 9 +- + drivers/media/video/gspca/pac207.c | 8 +- + drivers/media/video/gspca/pac7311.c | 7 +- + drivers/media/video/gspca/sonixb.c | 7 +- + drivers/media/video/gspca/sonixj.c | 456 ++++---- + drivers/media/video/gspca/spca500.c | 48 +- + drivers/media/video/gspca/spca501.c | 22 +- + drivers/media/video/gspca/spca505.c | 529 ++++----- + drivers/media/video/gspca/spca506.c | 57 +- + drivers/media/video/gspca/spca508.c | 128 +-- + drivers/media/video/gspca/spca561.c | 192 +--- + drivers/media/video/gspca/stk014.c | 20 +- + drivers/media/video/gspca/stv06xx/stv06xx.c | 7 +- + drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c | 76 ++- + drivers/media/video/gspca/stv06xx/stv06xx_hdcs.h | 65 - + drivers/media/video/gspca/stv06xx/stv06xx_pb0100.c | 147 +++- + drivers/media/video/gspca/stv06xx/stv06xx_pb0100.h | 130 +-- + drivers/media/video/gspca/stv06xx/stv06xx_sensor.h | 8 - + drivers/media/video/gspca/stv06xx/stv06xx_vv6410.c | 123 ++- + drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h | 58 +- + drivers/media/video/gspca/sunplus.c | 73 +-- + drivers/media/video/gspca/t613.c | 552 +++++---- + drivers/media/video/gspca/tv8532.c | 483 ++++----- + drivers/media/video/gspca/vc032x.c | 7 +- + drivers/media/video/gspca/zc3xx.c | 816 +++++++------- + drivers/media/video/hexium_gemini.c | 292 ++--- + drivers/media/video/hexium_orion.c | 103 +- + drivers/media/video/ivtv/ivtv-driver.h | 2 +- + drivers/media/video/ivtv/ivtv-fileops.c | 8 +- + drivers/media/video/m52790.c | 1 - + drivers/media/video/mxb.c | 641 ++++++----- + drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | 12 + + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 24 +- + drivers/media/video/pvrusb2/pvrusb2-hdw.h | 6 +- + .../media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c | 23 +- + drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c | 14 + + drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h | 1 + + drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 2 +- + drivers/media/video/pvrusb2/pvrusb2-main.c | 4 +- + drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 12 +- + drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 14 +- + drivers/media/video/pwc/Kconfig | 10 + + drivers/media/video/pwc/pwc-if.c | 77 +- + drivers/media/video/pwc/pwc.h | 6 + + drivers/media/video/s2255drv.c | 41 +- + drivers/media/video/saa5246a.c | 1 - + drivers/media/video/saa5249.c | 1 - + drivers/media/video/saa7115.c | 2 +- + drivers/media/video/saa7134/saa6752hs.c | 569 +++++---- + drivers/media/video/saa7134/saa7134-cards.c | 59 +- + drivers/media/video/saa7134/saa7134-core.c | 72 +- + drivers/media/video/saa7134/saa7134-dvb.c | 4 +- + drivers/media/video/saa7134/saa7134-empress.c | 22 +- + drivers/media/video/saa7134/saa7134-i2c.c | 21 +- + drivers/media/video/saa7134/saa7134-video.c | 17 +- + drivers/media/video/saa7134/saa7134.h | 28 +- + drivers/media/video/saa717x.c | 3 +- + drivers/media/video/tda7432.c | 1 - + drivers/media/video/tda9840.c | 1 - + drivers/media/video/tda9875.c | 1 - + drivers/media/video/tea6415c.c | 1 - + drivers/media/video/tea6420.c | 1 - + drivers/media/video/tlv320aic23b.c | 1 - + drivers/media/video/tvp5150.c | 1 - + drivers/media/video/upd64031a.c | 1 - + drivers/media/video/upd64083.c | 1 - + drivers/media/video/usbvision/usbvision-core.c | 44 +- + drivers/media/video/usbvision/usbvision-i2c.c | 6 +- + drivers/media/video/usbvision/usbvision-video.c | 39 +- + drivers/media/video/uvc/uvc_ctrl.c | 2 +- + drivers/media/video/uvc/uvc_driver.c | 27 +- + drivers/media/video/uvc/uvc_status.c | 16 +- + drivers/media/video/uvc/uvc_v4l2.c | 14 +- + drivers/media/video/uvc/uvc_video.c | 79 +- + drivers/media/video/uvc/uvcvideo.h | 7 +- + drivers/media/video/v4l2-common.c | 44 +- + drivers/media/video/v4l2-subdev.c | 6 + + drivers/media/video/videobuf-dma-contig.c | 2 +- + drivers/media/video/videobuf-vmalloc.c | 2 +- + drivers/media/video/vivi.c | 186 +++- + drivers/media/video/vp27smpx.c | 1 - + drivers/media/video/wm8739.c | 1 - + drivers/media/video/zc0301/zc0301_sensor.h | 8 + + drivers/media/video/zr364xx.c | 1 + + include/linux/videodev2.h | 1 + + include/media/cx2341x.h | 6 +- + include/media/cx25840.h | 12 + + include/media/saa7146_vv.h | 17 +- + include/media/v4l2-common.h | 13 + + include/media/v4l2-subdev.h | 3 + + 161 files changed, 5843 insertions(+), 4889 deletions(-) + create mode 100644 drivers/media/video/gspca/mr97310a.c +Merging quota/for_next +$ git merge quota/for_next +Auto-merged fs/Kconfig +Auto-merged fs/ext3/namei.c +Auto-merged fs/ext4/balloc.c +Auto-merged fs/ext4/ext4.h +Auto-merged fs/ext4/inode.c +Auto-merged fs/ext4/mballoc.c +Auto-merged fs/ext4/namei.c +Auto-merged fs/ocfs2/quota_global.c +Auto-merged fs/super.c +Merge made by recursive. + fs/Kconfig | 56 +----- + fs/Makefile | 6 +- + fs/attr.c | 3 +- + fs/ext2/balloc.c | 8 +- + fs/ext2/ialloc.c | 10 +- + fs/ext2/inode.c | 2 +- + fs/ext2/xattr.c | 8 +- + fs/ext3/balloc.c | 8 +- + fs/ext3/ialloc.c | 12 +- + fs/ext3/inode.c | 6 +- + fs/ext3/namei.c | 6 +- + fs/ext3/super.c | 48 +---- + fs/ext3/xattr.c | 6 +- + fs/ext4/balloc.c | 2 +- + fs/ext4/ext4.h | 2 + + fs/ext4/ialloc.c | 12 +- + fs/ext4/inode.c | 40 +++- + fs/ext4/mballoc.c | 46 ++-- + fs/ext4/namei.c | 6 +- + fs/ext4/super.c | 54 +---- + fs/ext4/xattr.c | 6 +- + fs/inode.c | 4 +- + fs/jfs/acl.c | 2 +- + fs/jfs/inode.c | 6 +- + fs/jfs/jfs_dtree.c | 18 +- + fs/jfs/jfs_extent.c | 10 +- + fs/jfs/jfs_inode.c | 4 +- + fs/jfs/jfs_xtree.c | 14 +- + fs/jfs/namei.c | 6 +- + fs/jfs/xattr.c | 12 +- + fs/namei.c | 22 +- + fs/nfsd/vfs.c | 4 +- + fs/open.c | 2 +- + fs/quota/Kconfig | 59 +++++ + fs/quota/Makefile | 14 + + fs/{ => quota}/dquot.c | 560 +++++++++++++++++++++++++++++-------------- + fs/{ => quota}/quota.c | 37 ++- + fs/{ => quota}/quota_tree.c | 132 ++++++----- + fs/{ => quota}/quota_tree.h | 0 + fs/{ => quota}/quota_v1.c | 48 +++-- + fs/{ => quota}/quota_v2.c | 3 +- + fs/{ => quota}/quotaio_v1.h | 0 + fs/{ => quota}/quotaio_v2.h | 0 + fs/ramfs/file-nommu.c | 6 - + fs/reiserfs/bitmap.c | 14 +- + fs/reiserfs/inode.c | 10 +- + fs/reiserfs/namei.c | 6 +- + fs/reiserfs/stree.c | 14 +- + fs/reiserfs/super.c | 60 +----- + fs/super.c | 8 +- + fs/sync.c | 2 +- + fs/udf/balloc.c | 14 +- + fs/udf/ialloc.c | 8 +- + fs/ufs/balloc.c | 12 +- + fs/ufs/ialloc.c | 8 +- + include/linux/quota.h | 11 +- + include/linux/quotaops.h | 119 ++++++---- + 57 files changed, 899 insertions(+), 697 deletions(-) + create mode 100644 fs/quota/Kconfig + create mode 100644 fs/quota/Makefile + rename fs/{ => quota}/dquot.c (85%) + rename fs/{ => quota}/quota.c (94%) + rename fs/{ => quota}/quota_tree.c (84%) + rename fs/{ => quota}/quota_tree.h (100%) + rename fs/{ => quota}/quota_v1.c (79%) + rename fs/{ => quota}/quota_v2.c (98%) + rename fs/{ => quota}/quotaio_v1.h (100%) + rename fs/{ => quota}/quotaio_v2.h (100%) +Merging jfs/next +$ git merge jfs/next +Auto-merged fs/jfs/jfs_extent.c +Auto-merged fs/jfs/jfs_xtree.c +Merge made by recursive. + fs/jfs/Kconfig | 1 + + fs/jfs/jfs_extent.c | 63 +++++------- + fs/jfs/jfs_imap.c | 10 +-- + fs/jfs/jfs_metapage.c | 18 +++- + fs/jfs/jfs_types.h | 29 ------ + fs/jfs/jfs_xtree.c | 263 +------------------------------------------------ + fs/jfs/jfs_xtree.h | 2 - + fs/jfs/super.c | 4 + + 8 files changed, 46 insertions(+), 344 deletions(-) +Merging kbuild/master +$ git merge kbuild/master +Already up-to-date. +Merging quilt/ide +$ git merge quilt/ide +Auto-merged Documentation/kernel-parameters.txt +Auto-merged drivers/ide/au1xxx-ide.c +Removed include/asm-frv/ide.h +Removed include/asm-mn10300/ide.h +Merge made by recursive. + Documentation/kernel-parameters.txt | 6 +- + arch/m68k/include/asm/ide.h | 73 ---- + drivers/ide/Kconfig | 10 +- + drivers/ide/Makefile | 4 +- + drivers/ide/aec62xx.c | 4 +- + drivers/ide/alim15x3.c | 2 +- + drivers/ide/amd74xx.c | 14 +- + drivers/ide/atiixp.c | 3 +- + drivers/ide/au1xxx-ide.c | 18 +- + drivers/ide/buddha.c | 11 +- + drivers/ide/cmd64x.c | 2 +- + drivers/ide/cs5520.c | 3 +- + drivers/ide/cs5530.c | 2 +- + drivers/ide/delkin_cb.c | 3 +- + drivers/ide/dtc2278.c | 3 +- + drivers/ide/falconide.c | 45 ++- + drivers/ide/gayle.c | 7 +- + drivers/ide/hpt366.c | 4 +- + drivers/ide/icside.c | 12 +- + drivers/ide/ide-4drives.c | 3 +- + drivers/ide/ide-acpi.c | 214 +++-------- + drivers/ide/ide-atapi.c | 87 ++++- + drivers/ide/ide-cd.c | 131 +++--- + drivers/ide/ide-cd.h | 4 +- + drivers/ide/ide-cs.c | 1 + + drivers/ide/ide-devsets.c | 190 +++++++++ + drivers/ide/ide-disk.c | 163 ++++---- + drivers/ide/ide-disk_proc.c | 28 +- + drivers/ide/ide-dma-sff.c | 6 +- + drivers/ide/ide-dma.c | 83 ++++- + drivers/ide/ide-eh.c | 437 ++++++++++++++++++++ + drivers/ide/ide-floppy.c | 136 +++---- + drivers/ide/ide-gd.c | 10 +- + drivers/ide/ide-gd.h | 4 +- + drivers/ide/ide-generic.c | 8 +- + drivers/ide/ide-h8300.c | 66 ++-- + drivers/ide/ide-io-std.c | 321 +++++++++++++++ + drivers/ide/ide-io.c | 487 +++++------------------ + drivers/ide/ide-ioctls.c | 44 +- + drivers/ide/ide-iops.c | 770 ++--------------------------------- + drivers/ide/ide-lib.c | 260 +------------ + drivers/ide/ide-park.c | 26 ++ + drivers/ide/ide-pci-generic.c | 4 +- + drivers/ide/ide-pm.c | 42 ++- + drivers/ide/ide-pnp.c | 6 +- + drivers/ide/ide-probe.c | 346 +++++------------ + drivers/ide/ide-proc.c | 18 +- + drivers/ide/ide-tape.c | 100 ++---- + drivers/ide/ide-taskfile.c | 431 +++++++++----------- + drivers/ide/ide-xfer-mode.c | 246 +++++++++++ + drivers/ide/ide.c | 167 +------- + drivers/ide/ide_arm.c | 6 +- + drivers/ide/it821x.c | 2 +- + drivers/ide/macide.c | 7 +- + drivers/ide/ns87415.c | 34 +- + drivers/ide/palm_bk3710.c | 13 +- + drivers/ide/pdc202xx_new.c | 4 +- + drivers/ide/pdc202xx_old.c | 4 +- + drivers/ide/piix.c | 13 +- + drivers/ide/pmac.c | 7 +- + drivers/ide/q40ide.c | 15 +- + drivers/ide/scc_pata.c | 94 ++--- + drivers/ide/serverworks.c | 13 +- + drivers/ide/setup-pci.c | 31 +- + drivers/ide/sgiioc4.c | 11 +- + drivers/ide/siimage.c | 2 +- + drivers/ide/sis5513.c | 4 +- + drivers/ide/sl82c105.c | 4 +- + drivers/ide/slc90e66.c | 1 - + drivers/ide/trm290.c | 4 +- + drivers/ide/tx4938ide.c | 68 ++-- + drivers/ide/tx4939ide.c | 83 ++-- + drivers/ide/via82cxxx.c | 12 +- + include/asm-frv/ide.h | 24 -- + include/asm-mn10300/ide.h | 39 -- + include/asm-mn10300/pci.h | 5 + + include/linux/ata.h | 2 - + include/linux/ide.h | 277 +++++++------ + 78 files changed, 2650 insertions(+), 3194 deletions(-) + create mode 100644 drivers/ide/ide-devsets.c + create mode 100644 drivers/ide/ide-eh.c + create mode 100644 drivers/ide/ide-io-std.c + create mode 100644 drivers/ide/ide-xfer-mode.c + delete mode 100644 include/asm-frv/ide.h + delete mode 100644 include/asm-mn10300/ide.h +Merging libata/NEXT +$ git merge libata/NEXT +Merge made by recursive. + drivers/ata/pata_rb532_cf.c | 60 +-------- + drivers/ata/sata_mv.c | 339 ++++++++++++++++++++++++++++++++++--------- + 2 files changed, 274 insertions(+), 125 deletions(-) +Merging nfs/linux-next +$ git merge nfs/linux-next +Auto-merged fs/Kconfig +Auto-merged fs/Makefile +Auto-merged fs/ext2/inode.c +Auto-merged fs/ext3/inode.c +Auto-merged fs/super.c +Auto-merged init/Kconfig +Auto-merged kernel/Makefile +Auto-merged kernel/sysctl.c +Merge made by recursive. + Documentation/filesystems/caching/backend-api.txt | 658 ++++++++++++++++ + Documentation/filesystems/caching/cachefiles.txt | 501 ++++++++++++ + Documentation/filesystems/caching/fscache.txt | 333 ++++++++ + Documentation/filesystems/caching/netfs-api.txt | 800 +++++++++++++++++++ + Documentation/filesystems/caching/object.txt | 313 ++++++++ + Documentation/filesystems/caching/operations.txt | 213 +++++ + Documentation/slow-work.txt | 174 +++++ + fs/Kconfig | 7 + + fs/Makefile | 2 + + fs/afs/Kconfig | 8 + + fs/afs/Makefile | 3 + + fs/afs/cache.c | 503 ++++++++----- + fs/afs/cache.h | 15 +- + fs/afs/cell.c | 16 +- + fs/afs/file.c | 220 ++++-- + fs/afs/inode.c | 31 +- + fs/afs/internal.h | 53 +- + fs/afs/main.c | 27 +- + fs/afs/mntpt.c | 4 +- + fs/afs/vlocation.c | 25 +- + fs/afs/volume.c | 14 +- + fs/afs/write.c | 21 + + fs/cachefiles/Kconfig | 39 + + fs/cachefiles/Makefile | 18 + + fs/cachefiles/cf-bind.c | 286 +++++++ + fs/cachefiles/cf-daemon.c | 754 ++++++++++++++++++ + fs/cachefiles/cf-interface.c | 449 +++++++++++ + fs/cachefiles/cf-internal.h | 360 +++++++++ + fs/cachefiles/cf-key.c | 159 ++++ + fs/cachefiles/cf-main.c | 106 +++ + fs/cachefiles/cf-namei.c | 772 +++++++++++++++++++ + fs/cachefiles/cf-proc.c | 134 ++++ + fs/cachefiles/cf-rdwr.c | 853 +++++++++++++++++++++ + fs/cachefiles/cf-security.c | 116 +++ + fs/cachefiles/cf-xattr.c | 291 +++++++ + fs/ext2/inode.c | 2 + + fs/ext3/inode.c | 9 +- + fs/fscache/Kconfig | 56 ++ + fs/fscache/Makefile | 19 + + fs/fscache/fsc-cache.c | 415 ++++++++++ + fs/fscache/fsc-cookie.c | 498 ++++++++++++ + fs/fscache/fsc-fsdef.c | 144 ++++ + fs/fscache/fsc-histogram.c | 109 +++ + fs/fscache/fsc-internal.h | 380 +++++++++ + fs/fscache/fsc-main.c | 124 +++ + fs/fscache/fsc-netfs.c | 103 +++ + fs/fscache/fsc-object.c | 810 +++++++++++++++++++ + fs/fscache/fsc-operation.c | 459 +++++++++++ + fs/fscache/fsc-page.c | 771 +++++++++++++++++++ + fs/fscache/fsc-proc.c | 68 ++ + fs/fscache/fsc-stats.c | 212 +++++ + fs/nfs/Kconfig | 8 + + fs/nfs/Makefile | 1 + + fs/nfs/client.c | 14 +- + fs/nfs/file.c | 37 +- + fs/nfs/fscache-index.c | 337 ++++++++ + fs/nfs/fscache.c | 521 +++++++++++++ + fs/nfs/fscache.h | 208 +++++ + fs/nfs/inode.c | 17 +- + fs/nfs/internal.h | 4 + + fs/nfs/iostat.h | 18 + + fs/nfs/read.c | 27 +- + fs/nfs/super.c | 45 +- + fs/splice.c | 3 +- + fs/super.c | 1 + + include/linux/fs.h | 7 + + include/linux/fscache-cache.h | 504 ++++++++++++ + include/linux/fscache.h | 592 ++++++++++++++ + include/linux/nfs_fs.h | 13 + + include/linux/nfs_fs_sb.h | 11 + + include/linux/nfs_iostat.h | 12 + + include/linux/page-flags.h | 43 +- + include/linux/pagemap.h | 21 + + include/linux/slow-work.h | 95 +++ + init/Kconfig | 12 + + kernel/Makefile | 1 + + kernel/slow-work.c | 640 ++++++++++++++++ + kernel/sysctl.c | 9 + + mm/filemap.c | 99 +++ + mm/migrate.c | 10 +- + mm/readahead.c | 40 +- + mm/swap.c | 4 +- + mm/truncate.c | 10 +- + mm/vmscan.c | 6 +- + security/security.c | 2 + + 85 files changed, 15435 insertions(+), 394 deletions(-) + create mode 100644 Documentation/filesystems/caching/backend-api.txt + create mode 100644 Documentation/filesystems/caching/cachefiles.txt + create mode 100644 Documentation/filesystems/caching/fscache.txt + create mode 100644 Documentation/filesystems/caching/netfs-api.txt + create mode 100644 Documentation/filesystems/caching/object.txt + create mode 100644 Documentation/filesystems/caching/operations.txt + create mode 100644 Documentation/slow-work.txt + create mode 100644 fs/cachefiles/Kconfig + create mode 100644 fs/cachefiles/Makefile + create mode 100644 fs/cachefiles/cf-bind.c + create mode 100644 fs/cachefiles/cf-daemon.c + create mode 100644 fs/cachefiles/cf-interface.c + create mode 100644 fs/cachefiles/cf-internal.h + create mode 100644 fs/cachefiles/cf-key.c + create mode 100644 fs/cachefiles/cf-main.c + create mode 100644 fs/cachefiles/cf-namei.c + create mode 100644 fs/cachefiles/cf-proc.c + create mode 100644 fs/cachefiles/cf-rdwr.c + create mode 100644 fs/cachefiles/cf-security.c + create mode 100644 fs/cachefiles/cf-xattr.c + create mode 100644 fs/fscache/Kconfig + create mode 100644 fs/fscache/Makefile + create mode 100644 fs/fscache/fsc-cache.c + create mode 100644 fs/fscache/fsc-cookie.c + create mode 100644 fs/fscache/fsc-fsdef.c + create mode 100644 fs/fscache/fsc-histogram.c + create mode 100644 fs/fscache/fsc-internal.h + create mode 100644 fs/fscache/fsc-main.c + create mode 100644 fs/fscache/fsc-netfs.c + create mode 100644 fs/fscache/fsc-object.c + create mode 100644 fs/fscache/fsc-operation.c + create mode 100644 fs/fscache/fsc-page.c + create mode 100644 fs/fscache/fsc-proc.c + create mode 100644 fs/fscache/fsc-stats.c + create mode 100644 fs/nfs/fscache-index.c + create mode 100644 fs/nfs/fscache.c + create mode 100644 fs/nfs/fscache.h + create mode 100644 include/linux/fscache-cache.h + create mode 100644 include/linux/fscache.h + create mode 100644 include/linux/slow-work.h + create mode 100644 kernel/slow-work.c +Merging xfs/master +$ git merge xfs/master +Auto-merged MAINTAINERS +Merge made by recursive. + MAINTAINERS | 3 +- + fs/xfs/Makefile | 1 + + fs/xfs/linux-2.6/xfs_ioctl.c | 116 +++++------- + fs/xfs/linux-2.6/xfs_iops.c | 30 +-- + fs/xfs/linux-2.6/xfs_linux.h | 11 - + fs/xfs/linux-2.6/xfs_quotaops.c | 157 +++++++++++++++ + fs/xfs/linux-2.6/xfs_super.c | 107 ++++------- + fs/xfs/linux-2.6/xfs_super.h | 1 + + fs/xfs/linux-2.6/xfs_sync.h | 1 + + fs/xfs/linux-2.6/xfs_vnode.h | 5 - + fs/xfs/quota/xfs_dquot.c | 28 ++-- + fs/xfs/quota/xfs_dquot.h | 14 +-- + fs/xfs/quota/xfs_qm.c | 208 ++++++--------------- + fs/xfs/quota/xfs_qm.h | 20 +- + fs/xfs/quota/xfs_qm_bhv.c | 1 - + fs/xfs/quota/xfs_qm_syscalls.c | 188 +------------------ + fs/xfs/quota/xfs_quota_priv.h | 38 ++--- + fs/xfs/quota/xfs_trans_dquot.c | 16 +- + fs/xfs/xfs_ag.h | 4 +- + fs/xfs/xfs_attr_leaf.c | 55 +++--- + fs/xfs/xfs_da_btree.c | 2 +- + fs/xfs/xfs_da_btree.h | 6 +- + fs/xfs/xfs_dfrag.c | 62 +++---- + fs/xfs/xfs_extfree_item.h | 6 - + fs/xfs/xfs_ialloc.c | 10 +- + fs/xfs/xfs_ialloc_btree.h | 22 +-- + fs/xfs/xfs_inode_item.h | 2 - + fs/xfs/xfs_log.c | 28 +--- + fs/xfs/xfs_log_priv.h | 2 +- + fs/xfs/xfs_log_recover.c | 4 +- + fs/xfs/xfs_mount.c | 84 ++++----- + fs/xfs/xfs_mount.h | 9 +- + fs/xfs/xfs_qmops.c | 1 - + fs/xfs/xfs_quota.h | 3 +- + fs/xfs/xfs_rtalloc.c | 10 + + fs/xfs/xfs_rtalloc.h | 4 + + fs/xfs/xfs_trans.h | 12 +- + fs/xfs/xfs_trans_space.h | 2 +- + fs/xfs/xfs_types.h | 8 - + fs/xfs/xfs_vnodeops.c | 402 +++++++++------------------------------ + fs/xfs/xfs_vnodeops.h | 3 - + 41 files changed, 591 insertions(+), 1095 deletions(-) + create mode 100644 fs/xfs/linux-2.6/xfs_quotaops.c +Merging infiniband/for-next +$ git merge infiniband/for-next +Merge made by recursive. + drivers/infiniband/core/cm.c | 15 ++-- + drivers/infiniband/core/cm_msgs.h | 22 +++--- + drivers/infiniband/core/mad_rmpp.c | 2 +- + drivers/infiniband/hw/amso1100/c2.c | 20 +++-- + drivers/infiniband/hw/amso1100/c2_provider.c | 15 ++-- + drivers/infiniband/hw/cxgb3/cxio_hal.c | 13 +++- + drivers/infiniband/hw/cxgb3/cxio_wr.h | 6 ++ + drivers/infiniband/hw/cxgb3/iwch_cm.c | 3 + + drivers/infiniband/hw/cxgb3/iwch_ev.c | 5 -- + drivers/infiniband/hw/cxgb3/iwch_qp.c | 11 +-- + drivers/infiniband/hw/ehca/ehca_sqp.c | 8 +- + drivers/infiniband/hw/ipath/ipath_eeprom.c | 4 +- + drivers/infiniband/hw/ipath/ipath_mad.c | 95 ++++++++++++------------- + drivers/infiniband/hw/ipath/ipath_rc.c | 2 +- + drivers/infiniband/hw/ipath/ipath_sdma.c | 4 +- + drivers/infiniband/hw/ipath/ipath_uc.c | 2 +- + drivers/infiniband/hw/ipath/ipath_ud.c | 4 +- + drivers/infiniband/hw/ipath/ipath_user_sdma.c | 6 +- + drivers/infiniband/hw/ipath/ipath_verbs.c | 2 +- + drivers/infiniband/hw/ipath/ipath_verbs.h | 10 ++-- + drivers/infiniband/hw/mlx4/mad.c | 27 +++++-- + drivers/infiniband/hw/mlx4/qp.c | 22 +++--- + drivers/infiniband/hw/mthca/mthca_mad.c | 25 +++++-- + drivers/infiniband/hw/nes/nes.c | 2 +- + drivers/infiniband/hw/nes/nes.h | 2 +- + drivers/infiniband/hw/nes/nes_cm.c | 6 +-- + drivers/infiniband/hw/nes/nes_cm.h | 2 +- + drivers/infiniband/hw/nes/nes_context.h | 2 +- + drivers/infiniband/hw/nes/nes_hw.c | 10 +++- + drivers/infiniband/hw/nes/nes_hw.h | 2 +- + drivers/infiniband/hw/nes/nes_nic.c | 24 ++++--- + drivers/infiniband/hw/nes/nes_user.h | 2 +- + drivers/infiniband/hw/nes/nes_utils.c | 2 +- + drivers/infiniband/hw/nes/nes_verbs.c | 2 +- + drivers/infiniband/hw/nes/nes_verbs.h | 2 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 20 +++-- + include/rdma/ib_cm.h | 12 ++-- + include/rdma/ib_mad.h | 2 +- + include/rdma/ib_smi.h | 34 +++++----- + 39 files changed, 250 insertions(+), 199 deletions(-) +Merging acpi/test +$ git merge acpi/test +Auto-merged MAINTAINERS +Auto-merged arch/x86/kernel/reboot.c +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 8 + + MAINTAINERS | 5 + + arch/x86/kernel/reboot.c | 2 +- + drivers/acpi/acpica/acglobal.h | 1 - + drivers/acpi/acpica/actables.h | 7 +- + drivers/acpi/acpica/nsdump.c | 6 + + drivers/acpi/acpica/tbfadt.c | 7 +- + drivers/acpi/acpica/tbinstal.c | 28 +- + drivers/acpi/acpica/tbutils.c | 71 ++- + drivers/acpi/acpica/tbxface.c | 34 +- + drivers/acpi/battery.c | 39 +- + drivers/acpi/pci_link.c | 39 +- + drivers/acpi/sbs.c | 31 +- + drivers/pci/pci-acpi.c | 4 +- + drivers/platform/x86/Kconfig | 13 + + drivers/platform/x86/Makefile | 1 + + drivers/platform/x86/fujitsu-laptop.c | 25 +- + drivers/platform/x86/oqo-wmi.c | 941 ++++++++++++++++++++++++++++ + drivers/power/power_supply_sysfs.c | 2 + + include/acpi/acpixf.h | 2 +- + include/acpi/actbl.h | 74 ++-- + include/linux/power_supply.h | 2 + + 22 files changed, 1192 insertions(+), 150 deletions(-) + create mode 100644 drivers/platform/x86/oqo-wmi.c +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Auto-merged fs/nfsd/vfs.c +Merge made by recursive. + fs/lockd/svclock.c | 7 ++ + fs/nfsd/Kconfig | 1 + + fs/nfsd/nfs3proc.c | 5 +- + fs/nfsd/nfs4callback.c | 7 +- + fs/nfsd/nfs4proc.c | 27 +++---- + fs/nfsd/nfs4state.c | 167 ++++++++++++++++++++++++-------------------- + fs/nfsd/vfs.c | 19 +++++ + include/linux/nfsd/nfsfh.h | 7 ++ + include/linux/nfsd/state.h | 9 +-- + 9 files changed, 148 insertions(+), 101 deletions(-) +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Merge made by recursive. + drivers/firewire/fw-card.c | 77 +-- + drivers/firewire/fw-cdev.c | 1006 +++++++++++++++++-------- + drivers/firewire/fw-device.c | 161 ++-- + drivers/firewire/fw-device.h | 18 +- + drivers/firewire/fw-iso.c | 227 +++++- + drivers/firewire/fw-ohci.c | 239 +++--- + drivers/firewire/fw-sbp2.c | 57 +- + drivers/firewire/fw-topology.c | 28 +- + drivers/firewire/fw-topology.h | 19 +- + drivers/firewire/fw-transaction.c | 151 ++--- + drivers/firewire/fw-transaction.h | 127 +--- + drivers/ieee1394/csr.c | 8 +- + drivers/ieee1394/dma.h | 1 + + drivers/ieee1394/eth1394.c | 2 +- + drivers/ieee1394/highlevel.c | 2 +- + drivers/ieee1394/ieee1394_core.c | 1 + + drivers/ieee1394/ieee1394_transactions.c | 29 + + drivers/ieee1394/ieee1394_transactions.h | 2 + + drivers/ieee1394/iso.h | 1 + + drivers/ieee1394/nodemgr.c | 10 +- + drivers/ieee1394/nodemgr.h | 18 + + drivers/ieee1394/raw1394.c | 2 +- + drivers/ieee1394/sbp2.c | 7 +- + drivers/media/dvb/Kconfig | 2 + + drivers/media/dvb/Makefile | 2 + + drivers/media/dvb/firewire/Kconfig | 12 + + drivers/media/dvb/firewire/Makefile | 11 + + drivers/media/dvb/firewire/avc.c | 1180 +++++++++++++++++++++++++++++ + drivers/media/dvb/firewire/avc.h | 427 +++++++++++ + drivers/media/dvb/firewire/firedtv-1394.c | 378 +++++++++ + drivers/media/dvb/firewire/firedtv-ci.c | 261 +++++++ + drivers/media/dvb/firewire/firedtv-ci.h | 9 + + drivers/media/dvb/firewire/firedtv-dvb.c | 276 +++++++ + drivers/media/dvb/firewire/firedtv-fe.c | 244 ++++++ + drivers/media/dvb/firewire/firedtv-rc.c | 191 +++++ + drivers/media/dvb/firewire/firedtv-rc.h | 11 + + drivers/media/dvb/firewire/firedtv.h | 190 +++++ + include/linux/firewire-cdev.h | 170 ++++- + 38 files changed, 4697 insertions(+), 860 deletions(-) + create mode 100644 drivers/media/dvb/firewire/Kconfig + create mode 100644 drivers/media/dvb/firewire/Makefile + create mode 100644 drivers/media/dvb/firewire/avc.c + create mode 100644 drivers/media/dvb/firewire/avc.h + create mode 100644 drivers/media/dvb/firewire/firedtv-1394.c + create mode 100644 drivers/media/dvb/firewire/firedtv-ci.c + create mode 100644 drivers/media/dvb/firewire/firedtv-ci.h + create mode 100644 drivers/media/dvb/firewire/firedtv-dvb.c + create mode 100644 drivers/media/dvb/firewire/firedtv-fe.c + create mode 100644 drivers/media/dvb/firewire/firedtv-rc.c + create mode 100644 drivers/media/dvb/firewire/firedtv-rc.h + create mode 100644 drivers/media/dvb/firewire/firedtv.h +Merging ubi/linux-next +$ git merge ubi/linux-next +Already up-to-date. +Merging kvm/master +$ git merge kvm/master +Auto-merged arch/ia64/include/asm/kvm.h +Auto-merged arch/powerpc/include/asm/kvm.h +Auto-merged arch/x86/kvm/Kconfig +Merge made by recursive. + arch/ia64/include/asm/kvm.h | 53 ++- + arch/ia64/include/asm/kvm_host.h | 18 +- + arch/ia64/kvm/Kconfig | 4 + + arch/ia64/kvm/kvm-ia64.c | 117 ++++- + arch/ia64/kvm/kvm_fw.c | 151 +++++- + arch/ia64/kvm/process.c | 88 ++- + arch/ia64/kvm/vcpu.c | 44 +-- + arch/ia64/kvm/vcpu.h | 4 +- + arch/ia64/kvm/vtlb.c | 44 +- + arch/powerpc/include/asm/kvm.h | 7 + + arch/powerpc/include/asm/kvm_44x.h | 7 + + arch/powerpc/include/asm/kvm_asm.h | 7 +- + arch/powerpc/include/asm/kvm_e500.h | 67 +++ + arch/powerpc/include/asm/kvm_host.h | 21 +- + arch/powerpc/include/asm/kvm_ppc.h | 15 +- + arch/powerpc/include/asm/mmu-fsl-booke.h | 2 + + arch/powerpc/kernel/asm-offsets.c | 4 +- + arch/powerpc/kvm/44x.c | 72 +--- + arch/powerpc/kvm/44x_emulate.c | 217 +------- + arch/powerpc/kvm/44x_tlb.c | 39 +- + arch/powerpc/kvm/44x_tlb.h | 9 - + arch/powerpc/kvm/Kconfig | 16 + + arch/powerpc/kvm/Makefile | 10 + + arch/powerpc/kvm/booke.c | 50 +- + arch/powerpc/kvm/booke.h | 35 +- + arch/powerpc/kvm/booke_emulate.c | 266 +++++++++ + arch/powerpc/kvm/booke_interrupts.S | 5 + + arch/powerpc/kvm/e500.c | 169 ++++++ + arch/powerpc/kvm/e500_emulate.c | 194 +++++++ + arch/powerpc/kvm/e500_tlb.c | 737 +++++++++++++++++++++++++ + arch/powerpc/kvm/e500_tlb.h | 184 +++++++ + arch/powerpc/kvm/emulate.c | 93 +++- + arch/powerpc/kvm/powerpc.c | 35 +- + arch/s390/include/asm/kvm.h | 7 + + arch/s390/include/asm/kvm_host.h | 3 - + arch/s390/kvm/Kconfig | 3 + + arch/s390/kvm/intercept.c | 2 +- + arch/s390/kvm/interrupt.c | 7 +- + arch/s390/kvm/kvm-s390.c | 8 +- + arch/s390/kvm/kvm-s390.h | 2 +- + arch/s390/kvm/priv.c | 18 +- + arch/s390/kvm/sigp.c | 2 - + arch/x86/include/asm/kvm.h | 31 + + arch/x86/include/asm/kvm_host.h | 59 ++- + arch/x86/include/asm/msr-index.h | 9 + + arch/x86/include/asm/svm.h | 4 - + arch/x86/include/asm/virtext.h | 2 +- + arch/x86/include/asm/vmx.h | 5 +- + arch/x86/kvm/Kconfig | 4 + + arch/x86/kvm/i8254.c | 23 +- + arch/x86/kvm/i8254.h | 2 + + arch/x86/kvm/i8259.c | 5 +- + arch/x86/kvm/irq.c | 7 - + arch/x86/kvm/irq.h | 3 +- + arch/x86/kvm/kvm_svm.h | 16 +- + arch/x86/kvm/lapic.c | 66 +-- + arch/x86/kvm/lapic.h | 2 - + arch/x86/kvm/mmu.c | 226 ++++---- + arch/x86/kvm/paging_tmpl.h | 213 ++++---- + arch/x86/kvm/svm.c | 872 ++++++++++++++++++++++++++---- + arch/x86/kvm/vmx.c | 307 +++++++---- + arch/x86/kvm/x86.c | 322 ++++++++---- + arch/x86/kvm/x86_emulate.c | 56 ++- + include/linux/kvm.h | 104 +++- + include/linux/kvm_host.h | 58 ++- + include/linux/kvm_types.h | 13 - + virt/kvm/ioapic.c | 16 +- + virt/kvm/iommu.c | 6 +- + virt/kvm/irq_comm.c | 201 +++++++- + virt/kvm/kvm_main.c | 106 +++- + 70 files changed, 4320 insertions(+), 1254 deletions(-) + create mode 100644 arch/powerpc/include/asm/kvm_e500.h + create mode 100644 arch/powerpc/kvm/booke_emulate.c + create mode 100644 arch/powerpc/kvm/e500.c + create mode 100644 arch/powerpc/kvm/e500_emulate.c + create mode 100644 arch/powerpc/kvm/e500_tlb.c + create mode 100644 arch/powerpc/kvm/e500_tlb.h +Merging dlm/next +$ git merge dlm/next +Merge made by recursive. + fs/dlm/dir.c | 18 +++--- + fs/dlm/dlm_internal.h | 2 +- + fs/dlm/lockspace.c | 2 +- + fs/dlm/lowcomms.c | 180 ++++++++++++++++++++++++++----------------------- + 4 files changed, 107 insertions(+), 95 deletions(-) +Merging scsi/master +$ git merge scsi/master +Auto-merged MAINTAINERS +Auto-merged drivers/scsi/ibmvscsi/ibmvfc.c +Auto-merged drivers/scsi/ipr.c +Auto-merged drivers/scsi/scsi.c +Auto-merged drivers/scsi/scsi_scan.c +Auto-merged drivers/scsi/sg.c +Auto-merged drivers/usb/storage/transport.c +Merge made by recursive. + Documentation/devices.txt | 6 + + Documentation/scsi/osd.txt | 198 ++++ + MAINTAINERS | 10 + + drivers/s390/scsi/zfcp_fsf.c | 1 - + drivers/scsi/Kconfig | 17 +- + drivers/scsi/Makefile | 2 + + drivers/scsi/constants.c | 13 +- + drivers/scsi/device_handler/scsi_dh_alua.c | 14 +- + drivers/scsi/device_handler/scsi_dh_rdac.c | 5 + + drivers/scsi/hptiop.c | 3 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 62 +- + drivers/scsi/ipr.c | 9 + + drivers/scsi/ipr.h | 4 +- + drivers/scsi/ips.c | 3 +- + drivers/scsi/libfc/fc_fcp.c | 6 +- + drivers/scsi/libfc/fc_lport.c | 5 +- + drivers/scsi/libfc/fc_rport.c | 2 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 16 +- + drivers/scsi/lpfc/lpfc_scsi.c | 6 +- + drivers/scsi/osd/Kbuild | 45 + + drivers/scsi/osd/Kconfig | 53 + + drivers/scsi/osd/Makefile | 37 + + drivers/scsi/osd/osd_debug.h | 30 + + drivers/scsi/osd/osd_initiator.c | 1654 ++++++++++++++++++++++++++++ + drivers/scsi/osd/osd_uld.c | 487 ++++++++ + drivers/scsi/osst.c | 96 ++- + drivers/scsi/osst.h | 2 + + drivers/scsi/scsi.c | 104 ++ + drivers/scsi/scsi_debug.c | 443 ++++++++- + drivers/scsi/scsi_error.c | 34 +- + drivers/scsi/scsi_lib.c | 203 +---- + drivers/scsi/scsi_scan.c | 1 + + drivers/scsi/scsi_sysfs.c | 1 - + drivers/scsi/scsi_transport_fc.c | 2 +- + drivers/scsi/ses.c | 31 +- + drivers/scsi/sg.c | 466 ++++---- + drivers/scsi/st.c | 6 +- + drivers/scsi/stex.c | 107 +-- + drivers/scsi/sym53c8xx_2/sym_hipd.c | 35 +- + drivers/scsi/sym53c8xx_2/sym_hipd.h | 1 + + drivers/usb/storage/transport.c | 2 +- + include/linux/major.h | 1 + + include/scsi/osd_attributes.h | 327 ++++++ + include/scsi/osd_initiator.h | 433 ++++++++ + include/scsi/osd_protocol.h | 579 ++++++++++ + include/scsi/osd_sec.h | 45 + + include/scsi/osd_sense.h | 260 +++++ + include/scsi/osd_types.h | 40 + + include/scsi/scsi.h | 12 +- + include/scsi/scsi_device.h | 10 +- + 50 files changed, 5277 insertions(+), 652 deletions(-) + create mode 100644 Documentation/scsi/osd.txt + create mode 100644 drivers/scsi/osd/Kbuild + create mode 100644 drivers/scsi/osd/Kconfig + create mode 100755 drivers/scsi/osd/Makefile + create mode 100644 drivers/scsi/osd/osd_debug.h + create mode 100644 drivers/scsi/osd/osd_initiator.c + create mode 100644 drivers/scsi/osd/osd_uld.c + create mode 100644 include/scsi/osd_attributes.h + create mode 100644 include/scsi/osd_initiator.h + create mode 100644 include/scsi/osd_protocol.h + create mode 100644 include/scsi/osd_sec.h + create mode 100644 include/scsi/osd_sense.h + create mode 100644 include/scsi/osd_types.h +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Merge made by recursive. + fs/ocfs2/cluster/heartbeat.c | 96 +++++++++++++++++++++- + fs/ocfs2/cluster/heartbeat.h | 3 +- + fs/ocfs2/cluster/nodemanager.c | 9 ++- + fs/ocfs2/journal.c | 12 --- + fs/ocfs2/journal.h | 11 +++ + fs/ocfs2/localalloc.c | 86 ------------------- + fs/ocfs2/ocfs2.h | 6 +- + fs/ocfs2/super.c | 176 ++++++++++++++++++++++++++++++++++++++++ + 8 files changed, 292 insertions(+), 107 deletions(-) +Merging ext4/next +$ git merge ext4/next +Auto-merged fs/ext3/namei.c +Auto-merged fs/ext4/ext4.h +CONFLICT (content): Merge conflict in fs/ext4/ext4.h +Auto-merged fs/ext4/inode.c +Auto-merged fs/ext4/namei.c +Resolved 'fs/ext4/ext4.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit a062a77: Merge commit 'ext4/next' +$ git diff -M --stat --summary HEAD^.. + fs/ext4/ext4.h | 10 ---------- + fs/ext4/ext4_i.h | 3 --- + fs/ext4/ext4_sb.h | 4 ---- + fs/ext4/mballoc.h | 1 - + 4 files changed, 0 insertions(+), 18 deletions(-) +Merging async_tx/next +$ git merge async_tx/next +Already up-to-date. +Merging udf/for_next +$ git merge udf/for_next +Auto-merged fs/udf/balloc.c +Auto-merged fs/udf/ialloc.c +Merge made by recursive. + Documentation/filesystems/udf.txt | 2 + + fs/udf/balloc.c | 113 +++++----- + fs/udf/dir.c | 14 +- + fs/udf/directory.c | 38 ++-- + fs/udf/ecma_167.h | 416 ++++++++++++++++++------------------ + fs/udf/ialloc.c | 4 +- + fs/udf/inode.c | 213 ++++++++++--------- + fs/udf/misc.c | 29 ++-- + fs/udf/namei.c | 86 ++++---- + fs/udf/osta_udf.h | 22 +- + fs/udf/partition.c | 2 +- + fs/udf/super.c | 164 ++++++++++----- + fs/udf/truncate.c | 44 ++-- + fs/udf/udf_i.h | 6 +- + fs/udf/udf_sb.h | 4 + + fs/udf/udfdecl.h | 46 +++-- + fs/udf/udfend.h | 28 ++-- + fs/udf/udftime.c | 6 +- + fs/udf/unicode.c | 62 ++++-- + 19 files changed, 695 insertions(+), 604 deletions(-) +Merging net/master +$ git merge net/master +Renamed fs/dquot.c => fs/quota/dquot.c +Auto-merged fs/quota/dquot.c +Auto-merged Documentation/feature-removal-schedule.txt +Auto-merged drivers/infiniband/hw/cxgb3/cxio_hal.c +Auto-merged drivers/infiniband/hw/nes/nes_hw.c +Auto-merged drivers/infiniband/hw/nes/nes_nic.c +Auto-merged drivers/net/au1000_eth.c +Auto-merged drivers/net/cpmac.c +Auto-merged drivers/net/ehea/ehea_main.c +Removed drivers/net/gianfar_mii.h +Auto-merged drivers/net/macb.c +Auto-merged drivers/net/sb1250-mac.c +Auto-merged drivers/net/sfc/efx.c +Auto-merged drivers/net/smc91x.c +Auto-merged drivers/net/smc91x.h +Auto-merged drivers/net/smsc911x.c +Auto-merged drivers/net/smsc9420.c +Auto-merged drivers/net/tc35815.c +Removed drivers/net/ucc_geth_mii.c +Removed drivers/net/ucc_geth_mii.h +Removed drivers/net/wireless/iwlwifi/iwl-3945-commands.h +Removed drivers/net/wireless/iwlwifi/iwl-3945-debug.h +Removed drivers/net/wireless/iwlwifi/iwl-3945-io.h +Removed drivers/net/wireless/iwlwifi/iwl-3945-rs.h +Removed drivers/net/wireless/iwlwifi/iwl-agn-hcmd-check.c +Auto-merged drivers/scsi/scsi_transport_fc.c +Auto-merged fs/compat_ioctl.c +Auto-merged include/linux/pci_ids.h +Auto-merged net/netfilter/nf_conntrack_pptp.c +Merge made by recursive. + Documentation/DocBook/mac80211.tmpl | 12 +- + Documentation/feature-removal-schedule.txt | 4 +- + Documentation/networking/dccp.txt | 3 +- + Documentation/networking/ip-sysctl.txt | 6 + + Documentation/powerpc/dts-bindings/fsl/tsec.txt | 6 + + drivers/acpi/event.c | 6 +- + drivers/char/pcmcia/synclink_cs.c | 18 +- + drivers/char/synclink.c | 18 +- + drivers/char/synclink_gt.c | 18 +- + drivers/char/synclinkmp.c | 18 +- + drivers/connector/cn_queue.c | 80 +- + drivers/connector/connector.c | 19 +- + drivers/infiniband/hw/cxgb3/cxio_hal.c | 3 + + drivers/infiniband/hw/cxgb3/cxio_hal.h | 2 + + drivers/infiniband/hw/cxgb3/iwch.c | 15 +- + drivers/infiniband/hw/nes/nes_hw.c | 2 +- + drivers/infiniband/hw/nes/nes_nic.c | 2 +- + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 6 +- + drivers/net/3c501.c | 17 +- + drivers/net/3c505.c | 18 +- + drivers/net/3c507.c | 15 +- + drivers/net/3c509.c | 25 +- + drivers/net/3c515.c | 21 +- + drivers/net/3c523.c | 25 +- + drivers/net/3c527.c | 19 +- + drivers/net/3c59x.c | 55 +- + drivers/net/8139cp.c | 6 +- + drivers/net/8139too.c | 6 +- + drivers/net/82596.c | 17 +- + drivers/net/Kconfig | 16 +- + drivers/net/Makefile | 5 +- + drivers/net/amd8111e.c | 6 +- + drivers/net/arcnet/arc-rawmode.c | 4 +- + drivers/net/arcnet/arcnet.c | 71 +- + drivers/net/arcnet/capmode.c | 6 +- + drivers/net/arcnet/com20020-isa.c | 2 + + drivers/net/arcnet/com20020-pci.c | 3 + + drivers/net/arcnet/com20020.c | 11 +- + drivers/net/arcnet/rfc1051.c | 12 +- + drivers/net/arcnet/rfc1201.c | 47 +- + drivers/net/arm/ep93xx_eth.c | 8 +- + drivers/net/arm/ixp4xx_eth.c | 12 +- + drivers/net/atl1e/atl1e_main.c | 6 +- + drivers/net/au1000_eth.c | 1043 ++-- + drivers/net/b44.c | 8 +- + drivers/net/bnx2.c | 24 +- + drivers/net/bnx2x_main.c | 7 +- + drivers/net/bonding/bond_3ad.h | 2 +- + drivers/net/bonding/bond_alb.c | 4 +- + drivers/net/bonding/bond_main.c | 2 +- + drivers/net/cassini.c | 8 +- + drivers/net/chelsio/sge.c | 4 +- + drivers/net/cpmac.c | 10 +- + drivers/net/cxgb3/adapter.h | 14 +- + drivers/net/cxgb3/cxgb3_main.c | 78 +- + drivers/net/cxgb3/cxgb3_offload.c | 12 + + drivers/net/cxgb3/cxgb3_offload.h | 7 + + drivers/net/cxgb3/sge.c | 120 +- + drivers/net/defxx.c | 2 +- + drivers/net/e100.c | 6 +- + drivers/net/e1000/e1000.h | 2 - + drivers/net/e1000/e1000_main.c | 41 +- + drivers/net/e1000e/e1000.h | 2 - + drivers/net/e1000e/ethtool.c | 2 +- + drivers/net/e1000e/lib.c | 4 +- + drivers/net/e1000e/netdev.c | 56 +- + drivers/net/ehea/ehea.h | 2 +- + drivers/net/ehea/ehea_main.c | 128 +- + drivers/net/ehea/ehea_qmr.c | 4 +- + drivers/net/enic/enic.h | 3 +- + drivers/net/enic/enic_main.c | 84 +- + drivers/net/enic/vnic_dev.c | 33 +- + drivers/net/enic/vnic_dev.h | 2 + + drivers/net/enic/vnic_devcmd.h | 8 +- + drivers/net/enic/vnic_intr.h | 14 + + drivers/net/epic100.c | 6 +- + drivers/net/fec.c | 446 +- + drivers/net/fec.h | 11 +- + drivers/net/forcedeth.c | 167 +- + drivers/net/fs_enet/fs_enet-main.c | 4 +- + drivers/net/fsl_pq_mdio.c | 463 ++ + drivers/net/fsl_pq_mdio.h | 45 + + drivers/net/gianfar.c | 82 +- + drivers/net/gianfar.h | 17 +- + drivers/net/gianfar_ethtool.c | 1 + + drivers/net/gianfar_mii.c | 12 +- + drivers/net/gianfar_mii.h | 54 - + drivers/net/gianfar_sysfs.c | 33 +- + drivers/net/hamachi.c | 8 +- + drivers/net/hamradio/6pack.c | 16 +- + drivers/net/hamradio/baycom_epp.c | 43 +- + drivers/net/hamradio/bpqether.c | 40 +- + drivers/net/hamradio/dmascc.c | 54 +- + drivers/net/hamradio/hdlcdrv.c | 45 +- + drivers/net/hamradio/mkiss.c | 46 +- + drivers/net/hamradio/scc.c | 21 +- + drivers/net/hamradio/yam.c | 61 +- + drivers/net/ibmveth.c | 8 +- + drivers/net/igb/Makefile | 2 +- + drivers/net/igb/e1000_82575.c | 97 +- + drivers/net/igb/e1000_82575.h | 4 +- + drivers/net/igb/e1000_defines.h | 10 +- + drivers/net/igb/e1000_hw.h | 31 +- + drivers/net/igb/e1000_mac.c | 35 +- + drivers/net/igb/e1000_mac.h | 3 +- + drivers/net/igb/e1000_nvm.c | 44 +- + drivers/net/igb/e1000_phy.c | 349 +- + drivers/net/igb/e1000_phy.h | 3 +- + drivers/net/igb/e1000_regs.h | 2 +- + drivers/net/igb/igb.h | 40 +- + drivers/net/igb/igb_ethtool.c | 138 +- + drivers/net/igb/igb_main.c | 451 +- + drivers/net/irda/sir_dev.c | 3 +- + drivers/net/ixgb/ixgb_main.c | 6 +- + drivers/net/ixgbe/Makefile | 2 +- + drivers/net/ixgbe/ixgbe.h | 22 +- + drivers/net/ixgbe/ixgbe_82598.c | 326 +- + drivers/net/ixgbe/ixgbe_common.c | 143 +- + drivers/net/ixgbe/ixgbe_common.h | 5 +- + drivers/net/ixgbe/ixgbe_dcb.c | 2 +- + drivers/net/ixgbe/ixgbe_dcb.h | 2 +- + drivers/net/ixgbe/ixgbe_dcb_82598.c | 4 +- + drivers/net/ixgbe/ixgbe_dcb_82598.h | 2 +- + drivers/net/ixgbe/ixgbe_dcb_nl.c | 2 +- + drivers/net/ixgbe/ixgbe_ethtool.c | 65 +- + drivers/net/ixgbe/ixgbe_main.c | 467 +- + drivers/net/ixgbe/ixgbe_phy.c | 2 +- + drivers/net/ixgbe/ixgbe_phy.h | 2 +- + drivers/net/ixgbe/ixgbe_type.h | 47 +- + drivers/net/ixp2000/ixpdev.c | 4 +- + drivers/net/jme.h | 6 +- + drivers/net/korina.c | 4 +- + drivers/net/macb.c | 10 +- + drivers/net/mlx4/en_rx.c | 5 +- + drivers/net/myri10ge/myri10ge.c | 7 +- + drivers/net/myri_sbus.c | 2 +- + drivers/net/natsemi.c | 6 +- + drivers/net/netxen/netxen_nic_main.c | 10 +- + drivers/net/niu.c | 11 +- + drivers/net/pasemi_mac.c | 6 +- + drivers/net/pcnet32.c | 6 +- + drivers/net/phy/mdio-gpio.c | 13 +- + drivers/net/phy/mdio_bus.c | 54 +- + drivers/net/ppp_generic.c | 275 +- + drivers/net/pppoe.c | 515 ++- + drivers/net/pppol2tp.c | 192 +- + drivers/net/pppox.c | 3 - + drivers/net/ps3_gelic_net.c | 26 +- + drivers/net/ps3_gelic_wireless.c | 28 +- + drivers/net/qla3xxx.c | 6 +- + drivers/net/qlge/qlge_main.c | 7 +- + drivers/net/r6040.c | 4 +- + drivers/net/r8169.c | 6 +- + drivers/net/s2io.c | 14 +- + drivers/net/sb1250-mac.c | 6 +- + drivers/net/sc92031.c | 27 +- + drivers/net/sfc/Kconfig | 1 - + drivers/net/sfc/bitfield.h | 4 +- + drivers/net/sfc/efx.c | 15 +- + drivers/net/sfc/efx.h | 2 +- + drivers/net/sfc/net_driver.h | 9 - + drivers/net/sfc/rx.c | 209 +- + drivers/net/sfc/rx.h | 3 - + drivers/net/sfc/sfe4001.c | 1 + + drivers/net/sfc/tenxpress.c | 1 + + drivers/net/skge.c | 6 +- + drivers/net/sky2.c | 267 +- + drivers/net/smc91x.c | 138 +- + drivers/net/smc91x.h | 10 + + drivers/net/smsc911x.c | 145 +- + drivers/net/smsc9420.c | 4 +- + drivers/net/spider_net.c | 12 +- + drivers/net/starfire.c | 6 +- + drivers/net/sungem.c | 6 +- + drivers/net/tc35815.c | 6 +- + drivers/net/tehuti.c | 6 +- + drivers/net/tg3.c | 18 +- + drivers/net/tokenring/3c359.c | 17 +- + drivers/net/tokenring/abyss.c | 10 +- + drivers/net/tokenring/ibmtr.c | 43 +- + drivers/net/tokenring/lanstreamer.c | 43 +- + drivers/net/tokenring/lanstreamer.h | 1 - + drivers/net/tokenring/olympic.c | 38 +- + drivers/net/tokenring/olympic.h | 1 - + drivers/net/tokenring/tms380tr.c | 21 +- + drivers/net/tokenring/tms380tr.h | 1 + + drivers/net/tokenring/tmspci.c | 4 +- + drivers/net/tsi108_eth.c | 8 +- + drivers/net/tulip/interrupt.c | 10 +- + drivers/net/tun.c | 528 ++- + drivers/net/typhoon.c | 8 +- + drivers/net/typhoon.h | 234 +- + drivers/net/ucc_geth.c | 22 +- + drivers/net/ucc_geth.h | 14 +- + drivers/net/ucc_geth_ethtool.c | 1 - + drivers/net/ucc_geth_mii.c | 295 -- + drivers/net/ucc_geth_mii.h | 101 - + drivers/net/usb/hso.c | 3 +- + drivers/net/usb/smsc95xx.c | 8 +- + drivers/net/via-rhine.c | 4 +- + drivers/net/via-velocity.h | 6 +- + drivers/net/virtio_net.c | 244 +- + drivers/net/wan/c101.c | 12 +- + drivers/net/wan/cosa.c | 14 +- + drivers/net/wan/dscc4.c | 18 +- + drivers/net/wan/farsync.c | 18 +- + drivers/net/wan/hd64572.c | 4 +- + drivers/net/wan/hdlc.c | 31 +- + drivers/net/wan/hdlc_cisco.c | 17 +- + drivers/net/wan/hdlc_fr.c | 44 +- + drivers/net/wan/hdlc_ppp.c | 6 +- + drivers/net/wan/hdlc_raw.c | 5 +- + drivers/net/wan/hdlc_raw_eth.c | 8 +- + drivers/net/wan/hdlc_x25.c | 2 +- + drivers/net/wan/hostess_sv11.c | 12 +- + drivers/net/wan/ixp4xx_hss.c | 24 +- + drivers/net/wan/lapbether.c | 2 +- + drivers/net/wan/lmc/lmc_main.c | 19 +- + drivers/net/wan/lmc/lmc_proto.c | 17 +- + drivers/net/wan/n2.c | 12 +- + drivers/net/wan/pc300too.c | 12 +- + drivers/net/wan/pci200syn.c | 12 +- + drivers/net/wan/sealevel.c | 12 +- + drivers/net/wan/wanxl.c | 14 +- + drivers/net/wimax/i2400m/fw.c | 12 +- + drivers/net/wimax/i2400m/i2400m.h | 16 +- + drivers/net/wimax/i2400m/netdev.c | 16 +- + drivers/net/wimax/i2400m/sdio.c | 16 +- + drivers/net/wimax/i2400m/usb.c | 16 +- + drivers/net/wireless/Kconfig | 128 +- + drivers/net/wireless/airo.c | 1137 +++-- + drivers/net/wireless/ath5k/ath5k.h | 1 + + drivers/net/wireless/ath5k/base.c | 189 +- + drivers/net/wireless/ath5k/base.h | 3 +- + drivers/net/wireless/ath5k/caps.c | 6 +- + drivers/net/wireless/ath5k/debug.c | 43 +- + drivers/net/wireless/ath5k/debug.h | 1 - + drivers/net/wireless/ath5k/eeprom.c | 150 +- + drivers/net/wireless/ath5k/gpio.c | 10 +- + drivers/net/wireless/ath5k/pcu.c | 24 +- + drivers/net/wireless/ath5k/qcu.c | 47 +- + drivers/net/wireless/ath9k/Makefile | 2 + + drivers/net/wireless/ath9k/ahb.c | 187 + + drivers/net/wireless/ath9k/ani.c | 18 +- + drivers/net/wireless/ath9k/ath9k.h | 71 +- + drivers/net/wireless/ath9k/beacon.c | 30 +- + drivers/net/wireless/ath9k/calib.c | 214 +- + drivers/net/wireless/ath9k/core.h | 122 +- + drivers/net/wireless/ath9k/debug.c | 101 + + drivers/net/wireless/ath9k/eeprom.c | 150 +- + drivers/net/wireless/ath9k/hw.c | 356 +- + drivers/net/wireless/ath9k/hw.h | 21 +- + drivers/net/wireless/ath9k/initvals.h | 565 ++-- + drivers/net/wireless/ath9k/mac.c | 34 +- + drivers/net/wireless/ath9k/main.c | 1118 ++--- + drivers/net/wireless/ath9k/pci.c | 305 ++ + drivers/net/wireless/ath9k/rc.c | 196 +- + drivers/net/wireless/ath9k/rc.h | 1 - + drivers/net/wireless/ath9k/recv.c | 36 +- + drivers/net/wireless/ath9k/reg.h | 38 +- + drivers/net/wireless/ath9k/regd.c | 1195 ++---- + drivers/net/wireless/ath9k/regd.h | 181 +- + drivers/net/wireless/ath9k/regd_common.h | 2058 ++------- + drivers/net/wireless/ath9k/xmit.c | 2824 +++++------- + drivers/net/wireless/atmel.c | 20 +- + drivers/net/wireless/b43/Kconfig | 14 +- + drivers/net/wireless/b43/Makefile | 1 + + drivers/net/wireless/b43/b43.h | 37 +- + drivers/net/wireless/b43/debugfs.c | 44 +- + drivers/net/wireless/b43/debugfs.h | 5 +- + drivers/net/wireless/b43/main.c | 378 +- + drivers/net/wireless/b43/main.h | 25 + + drivers/net/wireless/b43/phy_g.c | 3 + + drivers/net/wireless/b43/phy_lp.c | 220 +- + drivers/net/wireless/b43/phy_lp.h | 315 ++- + drivers/net/wireless/b43/tables_lpphy.c | 333 ++ + drivers/net/wireless/b43/tables_lpphy.h | 23 + + drivers/net/wireless/b43legacy/leds.c | 8 +- + drivers/net/wireless/b43legacy/main.c | 2 +- + drivers/net/wireless/hostap/hostap_80211_rx.c | 4 +- + drivers/net/wireless/hostap/hostap_ap.c | 8 +- + drivers/net/wireless/hostap/hostap_ioctl.c | 6 +- + drivers/net/wireless/ipw2x00/Kconfig | 1 + + drivers/net/wireless/ipw2x00/ipw2200.c | 2 +- + drivers/net/wireless/iwlwifi/Kconfig | 53 +- + drivers/net/wireless/iwlwifi/Makefile | 4 +- + drivers/net/wireless/iwlwifi/iwl-100.c | 73 + + drivers/net/wireless/iwlwifi/iwl-3945-commands.h | 1702 ------- + drivers/net/wireless/iwlwifi/iwl-3945-debug.h | 167 - + drivers/net/wireless/iwlwifi/iwl-3945-fh.h | 188 + + drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 221 +- + drivers/net/wireless/iwlwifi/iwl-3945-io.h | 404 -- + drivers/net/wireless/iwlwifi/iwl-3945-led.c | 115 +- + drivers/net/wireless/iwlwifi/iwl-3945-led.h | 40 +- + drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 165 +- + drivers/net/wireless/iwlwifi/iwl-3945-rs.h | 206 - + drivers/net/wireless/iwlwifi/iwl-3945.c | 1144 +++-- + drivers/net/wireless/iwlwifi/iwl-3945.h | 761 +--- + drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 40 +- + drivers/net/wireless/iwlwifi/iwl-4965.c | 194 +- + drivers/net/wireless/iwlwifi/iwl-5000-hw.h | 14 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 224 +- + .../iwlwifi/{iwl-3945-core.h => iwl-6000-hw.h} | 59 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 158 + + drivers/net/wireless/iwlwifi/iwl-agn-hcmd-check.c | 108 - + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 210 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 55 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 1172 ++--- + drivers/net/wireless/iwlwifi/iwl-calib.c | 93 +- + drivers/net/wireless/iwlwifi/iwl-calib.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-commands.h | 511 ++- + drivers/net/wireless/iwlwifi/iwl-core.c | 647 +++- + drivers/net/wireless/iwlwifi/iwl-core.h | 77 +- + drivers/net/wireless/iwlwifi/iwl-csr.h | 7 +- + drivers/net/wireless/iwlwifi/iwl-debug.h | 183 +- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 23 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 140 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.c | 40 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.h | 7 +- + drivers/net/wireless/iwlwifi/iwl-fh.h | 21 +- + drivers/net/wireless/iwlwifi/iwl-hcmd.c | 32 +- + drivers/net/wireless/iwlwifi/iwl-helpers.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-io.h | 42 +- + drivers/net/wireless/iwlwifi/iwl-led.c | 26 +- + drivers/net/wireless/iwlwifi/iwl-led.h | 8 +- + drivers/net/wireless/iwlwifi/iwl-power.c | 96 +- + drivers/net/wireless/iwlwifi/iwl-power.h | 16 +- + drivers/net/wireless/iwlwifi/iwl-prph.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-rfkill.c | 17 +- + drivers/net/wireless/iwlwifi/iwl-rfkill.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-rx.c | 60 +- + drivers/net/wireless/iwlwifi/iwl-scan.c | 114 +- + drivers/net/wireless/iwlwifi/iwl-spectrum.c | 12 +- + drivers/net/wireless/iwlwifi/iwl-spectrum.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-sta.c | 95 +- + drivers/net/wireless/iwlwifi/iwl-sta.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-tx.c | 287 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 5074 +++++--------------- + drivers/net/wireless/libertas/Makefile | 2 + + drivers/net/wireless/libertas/debugfs.c | 14 +- + drivers/net/wireless/libertas/defs.h | 2 + + drivers/net/wireless/libertas/host.h | 1 + + drivers/net/wireless/libertas/hostcmd.h | 8 + + drivers/net/wireless/libertas/if_cs.c | 2 +- + drivers/net/wireless/libertas/if_spi.c | 1218 +++++ + drivers/net/wireless/libertas/if_spi.h | 208 + + drivers/net/wireless/libertas/main.c | 5 +- + drivers/net/wireless/libertas/scan.c | 2 +- + drivers/net/wireless/libertas_tf/cmd.c | 2 +- + drivers/net/wireless/libertas_tf/libertas_tf.h | 2 +- + drivers/net/wireless/mac80211_hwsim.c | 2 + + drivers/net/wireless/orinoco/Kconfig | 120 + + drivers/net/wireless/orinoco/airport.c | 35 +- + drivers/net/wireless/orinoco/hermes.c | 102 +- + drivers/net/wireless/orinoco/hermes.h | 35 +- + drivers/net/wireless/orinoco/hermes_dld.c | 4 +- + drivers/net/wireless/orinoco/orinoco.c | 65 +- + drivers/net/wireless/orinoco/orinoco.h | 26 +- + drivers/net/wireless/orinoco/orinoco_cs.c | 31 +- + drivers/net/wireless/orinoco/orinoco_nortel.c | 7 +- + drivers/net/wireless/orinoco/orinoco_pci.c | 5 +- + drivers/net/wireless/orinoco/orinoco_pci.h | 10 +- + drivers/net/wireless/orinoco/orinoco_plx.c | 3 +- + drivers/net/wireless/orinoco/orinoco_tmd.c | 2 +- + drivers/net/wireless/orinoco/spectrum_cs.c | 15 +- + drivers/net/wireless/p54/Kconfig | 10 + + drivers/net/wireless/p54/Makefile | 1 + + drivers/net/wireless/p54/p54.h | 38 +- + drivers/net/wireless/p54/p54common.c | 631 ++- + drivers/net/wireless/p54/p54common.h | 125 +- + drivers/net/wireless/p54/p54pci.c | 6 + + drivers/net/wireless/p54/p54spi.c | 770 +++ + drivers/net/wireless/p54/p54spi.h | 125 + + drivers/net/wireless/p54/p54spi_eeprom.h | 678 +++ + drivers/net/wireless/p54/p54usb.c | 87 +- + drivers/net/wireless/p54/p54usb.h | 1 + + drivers/net/wireless/prism54/islpci_eth.c | 5 +- + drivers/net/wireless/prism54/islpci_mgt.h | 6 - + drivers/net/wireless/rndis_wlan.c | 13 +- + drivers/net/wireless/rt2x00/Kconfig | 7 +- + drivers/net/wireless/rt2x00/Makefile | 1 + + drivers/net/wireless/rt2x00/rt2400pci.c | 100 +- + drivers/net/wireless/rt2x00/rt2400pci.h | 2 +- + drivers/net/wireless/rt2x00/rt2500pci.c | 128 +- + drivers/net/wireless/rt2x00/rt2500pci.h | 2 +- + drivers/net/wireless/rt2x00/rt2500usb.c | 69 +- + drivers/net/wireless/rt2x00/rt2500usb.h | 10 +- + drivers/net/wireless/rt2x00/rt2x00.h | 154 +- + drivers/net/wireless/rt2x00/rt2x00config.c | 11 +- + drivers/net/wireless/rt2x00/rt2x00crypto.c | 15 +- + drivers/net/wireless/rt2x00/rt2x00debug.c | 6 +- + drivers/net/wireless/rt2x00/rt2x00debug.h | 2 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 416 +-- + drivers/net/wireless/rt2x00/rt2x00dump.h | 2 +- + drivers/net/wireless/rt2x00/rt2x00firmware.c | 29 +- + drivers/net/wireless/rt2x00/rt2x00leds.c | 8 +- + drivers/net/wireless/rt2x00/rt2x00leds.h | 2 +- + drivers/net/wireless/rt2x00/rt2x00lib.h | 106 +- + drivers/net/wireless/rt2x00/rt2x00link.c | 461 ++ + drivers/net/wireless/rt2x00/rt2x00mac.c | 77 +- + drivers/net/wireless/rt2x00/rt2x00pci.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00pci.h | 2 +- + drivers/net/wireless/rt2x00/rt2x00queue.c | 216 +- + drivers/net/wireless/rt2x00/rt2x00queue.h | 17 +- + drivers/net/wireless/rt2x00/rt2x00reg.h | 22 +- + drivers/net/wireless/rt2x00/rt2x00rfkill.c | 127 +- + drivers/net/wireless/rt2x00/rt2x00usb.c | 64 +- + drivers/net/wireless/rt2x00/rt2x00usb.h | 13 +- + drivers/net/wireless/rt2x00/rt61pci.c | 241 +- + drivers/net/wireless/rt2x00/rt61pci.h | 9 +- + drivers/net/wireless/rt2x00/rt73usb.c | 196 +- + drivers/net/wireless/rt2x00/rt73usb.h | 15 +- + drivers/net/wireless/rtl818x/rtl8187.h | 4 +- + drivers/net/wireless/rtl818x/rtl8187_dev.c | 92 +- + drivers/net/wireless/strip.c | 2 +- + drivers/net/wireless/wl3501_cs.c | 9 +- + drivers/net/wireless/zd1201.c | 7 +- + drivers/net/wireless/zd1211rw/zd_mac.c | 2 +- + drivers/net/xen-netfront.c | 8 +- + drivers/net/znet.c | 17 +- + drivers/s390/net/claw.c | 445 +- + drivers/s390/net/ctcm_main.c | 24 +- + drivers/s390/net/lcs.c | 21 +- + drivers/s390/net/netiucv.c | 14 +- + drivers/scsi/cxgb3i/cxgb3i_ddp.h | 2 + + drivers/scsi/scsi_transport_fc.c | 16 +- + drivers/scsi/scsi_transport_iscsi.c | 12 +- + drivers/ssb/Makefile | 1 + + drivers/ssb/b43_pci_bridge.c | 2 + + drivers/ssb/driver_chipcommon.c | 14 +- + drivers/ssb/driver_chipcommon_pmu.c | 508 ++ + drivers/ssb/pci.c | 74 +- + drivers/video/uvesafb.c | 5 +- + fs/compat_ioctl.c | 2 + + fs/quota/dquot.c | 5 +- + include/linux/arcdevice.h | 9 +- + include/linux/ath9k_platform.h | 28 + + include/linux/com20020.h | 1 + + include/linux/connector.h | 8 + + include/linux/dccp.h | 51 +- + include/linux/etherdevice.h | 21 + + include/linux/hdlc.h | 5 + + include/linux/hdlcdrv.h | 1 - + include/linux/ibmtr.h | 2 +- + include/linux/ieee80211.h | 181 + + include/linux/if.h | 1 + + include/linux/if_ether.h | 8 +- + include/linux/if_tun.h | 2 + + include/linux/inetdevice.h | 1 + + include/linux/mroute.h | 18 +- + include/linux/netdevice.h | 99 +- + include/linux/nl80211.h | 40 +- + include/linux/pci_ids.h | 6 + + include/linux/ppp_channel.h | 4 + + include/linux/skbuff.h | 26 +- + include/linux/smsc911x.h | 3 + + include/linux/spi/libertas_spi.h | 32 + + include/linux/ssb/ssb_driver_chipcommon.h | 224 + + include/linux/ssb/ssb_regs.h | 36 + + include/linux/sysctl.h | 1 + + include/linux/virtio_net.h | 71 + + include/linux/wireless.h | 12 +- + include/net/atmclip.h | 1 - + include/net/cfg80211.h | 84 + + include/net/inet_hashtables.h | 4 +- + include/net/mac80211.h | 226 +- + include/net/netns/ipv4.h | 13 + + include/net/netrom.h | 4 - + include/net/phonet/phonet.h | 1 - + include/net/phonet/pn_dev.h | 5 +- + include/net/pkt_sched.h | 1 + + include/net/sch_generic.h | 7 +- + include/net/sock.h | 5 + + include/net/wireless.h | 68 +- + kernel/sysctl_check.c | 1 + + lib/kobject_uevent.c | 3 + + net/802/psnap.c | 2 +- + net/8021q/vlan.c | 2 +- + net/8021q/vlan_core.c | 43 +- + net/Kconfig | 2 +- + net/appletalk/ddp.c | 4 +- + net/appletalk/dev.c | 10 +- + net/atm/br2684.c | 58 +- + net/atm/clip.c | 30 +- + net/atm/lec.c | 64 +- + net/atm/lec.h | 1 - + net/ax25/af_ax25.c | 2 +- + net/ax25/ax25_iface.c | 13 +- + net/bridge/br_netfilter.c | 2 +- + net/can/af_can.c | 2 +- + net/core/dev.c | 232 +- + net/core/skbuff.c | 162 +- + net/core/sock.c | 8 +- + net/dccp/dccp.h | 21 +- + net/dccp/feat.c | 232 +- + net/dccp/feat.h | 21 +- + net/dccp/minisocks.c | 11 - + net/dccp/options.c | 8 - + net/dccp/proto.c | 2 - + net/dccp/sysctl.c | 43 +- + net/decnet/af_decnet.c | 2 +- + net/decnet/dn_route.c | 2 +- + net/dsa/mv88e6123_61_65.c | 2 +- + net/dsa/mv88e6131.c | 2 +- + net/dsa/tag_dsa.c | 2 +- + net/dsa/tag_edsa.c | 2 +- + net/dsa/tag_trailer.c | 2 +- + net/econet/af_econet.c | 2 +- + net/ipv4/af_inet.c | 26 +- + net/ipv4/arp.c | 2 +- + net/ipv4/devinet.c | 9 + + net/ipv4/inet_connection_sock.c | 42 +- + net/ipv4/inet_hashtables.c | 12 +- + net/ipv4/ip_gre.c | 131 +- + net/ipv4/ipconfig.c | 8 +- + net/ipv4/ipmr.c | 464 ++- + net/ipv4/netfilter/nf_nat_snmp_basic.c | 4 +- + net/ipv4/route.c | 15 +- + net/ipv4/tcp.c | 27 +- + net/ipv4/tcp_ipv4.c | 2 +- + net/ipv4/xfrm4_policy.c | 2 +- + net/ipv6/addrconf.c | 45 +- + net/ipv6/af_inet6.c | 32 +- + net/ipv6/ndisc.c | 16 +- + net/ipv6/route.c | 4 +- + net/ipv6/tcp_ipv6.c | 2 +- + net/ipv6/xfrm6_policy.c | 2 +- + net/ipx/af_ipx.c | 4 +- + net/irda/irmod.c | 2 +- + net/llc/llc_core.c | 4 +- + net/mac80211/Makefile | 3 + + net/mac80211/aes_cmac.c | 135 + + net/mac80211/aes_cmac.h | 19 + + net/mac80211/cfg.c | 139 +- + net/mac80211/debugfs.c | 59 +- + net/mac80211/debugfs_key.c | 79 +- + net/mac80211/debugfs_key.h | 10 + + net/mac80211/debugfs_sta.c | 5 +- + net/mac80211/ht.c | 21 +- + net/mac80211/ieee80211_i.h | 68 +- + net/mac80211/iface.c | 92 +- + net/mac80211/key.c | 113 +- + net/mac80211/key.h | 16 + + net/mac80211/main.c | 102 +- + net/mac80211/mesh.c | 5 +- + net/mac80211/mesh.h | 9 +- + net/mac80211/mesh_hwmp.c | 6 +- + net/mac80211/mesh_plink.c | 38 +- + net/mac80211/mlme.c | 315 +- + net/mac80211/pm.c | 117 + + net/mac80211/rx.c | 317 +- + net/mac80211/scan.c | 26 +- + net/mac80211/spectmgmt.c | 100 +- + net/mac80211/sta_info.h | 4 +- + net/mac80211/tx.c | 85 +- + net/mac80211/util.c | 29 +- + net/mac80211/wext.c | 151 +- + net/mac80211/wpa.c | 152 +- + net/mac80211/wpa.h | 5 + + net/netfilter/ipvs/ip_vs_sync.c | 4 +- + net/netfilter/nf_conntrack_amanda.c | 4 +- + net/netfilter/nf_conntrack_h323_main.c | 8 +- + net/netfilter/nf_conntrack_netbios_ns.c | 2 +- + net/netfilter/nf_conntrack_pptp.c | 2 +- + net/netfilter/nf_tproxy_core.c | 1 + + net/netlink/af_netlink.c | 8 +- + net/netrom/af_netrom.c | 2 +- + net/netrom/nr_dev.c | 26 +- + net/phonet/af_phonet.c | 31 +- + net/phonet/pn_dev.c | 119 +- + net/phonet/pn_netlink.c | 24 +- + net/rose/af_rose.c | 3 +- + net/rose/rose_dev.c | 22 +- + net/sched/sch_api.c | 11 + + net/sched/sch_hfsc.c | 6 +- + net/sched/sch_htb.c | 42 +- + net/sched/sch_multiq.c | 2 +- + net/sctp/ipv6.c | 3 +- + net/sctp/output.c | 2 +- + net/sctp/sm_make_chunk.c | 4 +- + net/sunrpc/xprtsock.c | 53 +- + net/wimax/op-msg.c | 9 +- + net/wimax/stack.c | 12 +- + net/wireless/core.c | 12 +- + net/wireless/nl80211.c | 162 +- + net/wireless/reg.c | 287 +- + net/wireless/reg.h | 9 +- + net/wireless/sysfs.c | 30 + + net/wireless/util.c | 2 +- + net/x25/af_x25.c | 2 +- + 590 files changed, 28337 insertions(+), 24902 deletions(-) + create mode 100644 drivers/net/fsl_pq_mdio.c + create mode 100644 drivers/net/fsl_pq_mdio.h + delete mode 100644 drivers/net/gianfar_mii.h + delete mode 100644 drivers/net/ucc_geth_mii.c + delete mode 100644 drivers/net/ucc_geth_mii.h + create mode 100644 drivers/net/wireless/ath9k/ahb.c + create mode 100644 drivers/net/wireless/ath9k/pci.c + create mode 100644 drivers/net/wireless/b43/tables_lpphy.c + create mode 100644 drivers/net/wireless/b43/tables_lpphy.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-100.c + delete mode 100644 drivers/net/wireless/iwlwifi/iwl-3945-commands.h + delete mode 100644 drivers/net/wireless/iwlwifi/iwl-3945-debug.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-3945-fh.h + delete mode 100644 drivers/net/wireless/iwlwifi/iwl-3945-io.h + delete mode 100644 drivers/net/wireless/iwlwifi/iwl-3945-rs.h + rename drivers/net/wireless/iwlwifi/{iwl-3945-core.h => iwl-6000-hw.h} (64%) + create mode 100644 drivers/net/wireless/iwlwifi/iwl-6000.c + delete mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-hcmd-check.c + create mode 100644 drivers/net/wireless/libertas/if_spi.c + create mode 100644 drivers/net/wireless/libertas/if_spi.h + create mode 100644 drivers/net/wireless/orinoco/Kconfig + create mode 100644 drivers/net/wireless/p54/p54spi.c + create mode 100644 drivers/net/wireless/p54/p54spi.h + create mode 100644 drivers/net/wireless/p54/p54spi_eeprom.h + create mode 100644 drivers/net/wireless/rt2x00/rt2x00link.c + create mode 100644 drivers/ssb/driver_chipcommon_pmu.c + create mode 100644 include/linux/ath9k_platform.h + create mode 100644 include/linux/spi/libertas_spi.h + create mode 100644 net/mac80211/aes_cmac.c + create mode 100644 net/mac80211/aes_cmac.h + create mode 100644 net/mac80211/pm.c +Merging mtd/master +$ git merge mtd/master +Merge made by recursive. + drivers/mtd/chips/map_rom.c | 8 ++++++++ + drivers/mtd/devices/slram.c | 14 ++++++++++---- + drivers/mtd/lpddr/Kconfig | 1 + + 3 files changed, 19 insertions(+), 4 deletions(-) +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Auto-merged MAINTAINERS +Auto-merged arch/powerpc/boot/dts/kilauea.dts +Auto-merged crypto/shash.c +Auto-merged include/crypto/hash.h +Merge made by recursive. + MAINTAINERS | 6 + + arch/powerpc/boot/dts/canyonlands.dts | 7 + + arch/powerpc/boot/dts/kilauea.dts | 7 + + arch/s390/crypto/sha.h | 6 +- + arch/s390/crypto/sha1_s390.c | 40 +- + arch/s390/crypto/sha256_s390.c | 40 +- + arch/s390/crypto/sha512_s390.c | 80 +- + arch/s390/crypto/sha_common.c | 20 +- + arch/x86/crypto/Makefile | 3 + + arch/x86/crypto/aes-i586-asm_32.S | 18 +- + arch/x86/crypto/aes-x86_64-asm_64.S | 6 +- + arch/x86/crypto/aes_glue.c | 20 +- + arch/x86/crypto/aesni-intel_asm.S | 896 +++++++++++++++++++++ + arch/x86/crypto/aesni-intel_glue.c | 461 +++++++++++ + arch/x86/include/asm/aes.h | 11 + + arch/x86/include/asm/cpufeature.h | 1 + + crypto/Kconfig | 25 + + crypto/ansi_cprng.c | 17 +- + crypto/cryptd.c | 35 + + crypto/shash.c | 2 - + drivers/crypto/Kconfig | 15 +- + drivers/crypto/Makefile | 1 + + drivers/crypto/amcc/Makefile | 2 + + drivers/crypto/amcc/crypto4xx_alg.c | 293 +++++++ + drivers/crypto/amcc/crypto4xx_core.c | 1310 +++++++++++++++++++++++++++++++ + drivers/crypto/amcc/crypto4xx_core.h | 177 +++++ + drivers/crypto/amcc/crypto4xx_reg_def.h | 284 +++++++ + drivers/crypto/amcc/crypto4xx_sa.c | 108 +++ + drivers/crypto/amcc/crypto4xx_sa.h | 243 ++++++ + include/crypto/aes.h | 6 +- + include/crypto/cryptd.h | 27 + + include/crypto/hash.h | 5 + + 32 files changed, 4062 insertions(+), 110 deletions(-) + create mode 100644 arch/x86/crypto/aesni-intel_asm.S + create mode 100644 arch/x86/crypto/aesni-intel_glue.c + create mode 100644 arch/x86/include/asm/aes.h + create mode 100644 drivers/crypto/amcc/Makefile + create mode 100644 drivers/crypto/amcc/crypto4xx_alg.c + create mode 100644 drivers/crypto/amcc/crypto4xx_core.c + create mode 100644 drivers/crypto/amcc/crypto4xx_core.h + create mode 100644 drivers/crypto/amcc/crypto4xx_reg_def.h + create mode 100644 drivers/crypto/amcc/crypto4xx_sa.c + create mode 100644 drivers/crypto/amcc/crypto4xx_sa.h + create mode 100644 include/crypto/cryptd.h +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging sound/for-next +$ git merge sound/for-next +Auto-merged arch/arm/mach-pxa/e740.c +Auto-merged arch/arm/mach-pxa/e750.c +Auto-merged arch/arm/mach-pxa/h5000.c +Auto-merged arch/arm/mach-pxa/spitz.c +Auto-merged drivers/media/video/em28xx/em28xx-audio.c +Auto-merged include/linux/pci_ids.h +Auto-merged sound/arm/aaci.c +Auto-merged sound/arm/pxa2xx-ac97.c +Auto-merged sound/soc/pxa/e800_wm9712.c +Auto-merged sound/soc/pxa/pxa-ssp.c +Auto-merged sound/soc/pxa/pxa2xx-i2s.c +CONFLICT (content): Merge conflict in sound/soc/pxa/pxa2xx-i2s.c +Resolved 'sound/soc/pxa/pxa2xx-i2s.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit e8849b3: Merge commit 'sound/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/sound/alsa/ALSA-Configuration.txt | 52 + + .../sound/alsa/DocBook/alsa-driver-api.tmpl | 17 +- + .../sound/alsa/DocBook/writing-an-alsa-driver.tmpl | 52 +- + Documentation/sound/alsa/HD-Audio-Models.txt | 5 +- + Documentation/sound/alsa/soc/dapm.txt | 3 + + arch/arm/mach-pxa/e740.c | 5 + + arch/arm/mach-pxa/e750.c | 5 + + arch/arm/mach-pxa/h5000.c | 7 + + arch/arm/mach-pxa/include/mach/eseries-gpio.h | 15 + + arch/arm/mach-pxa/spitz.c | 6 + + drivers/media/video/cx88/cx88-alsa.c | 7 +- + drivers/media/video/em28xx/em28xx-audio.c | 7 +- + drivers/media/video/saa7134/saa7134-alsa.c | 8 +- + drivers/staging/go7007/snd-go7007.c | 7 +- + drivers/usb/gadget/gmidi.c | 7 +- + include/linux/input.h | 1 + + include/linux/mfd/wm8350/audio.h | 1 + + include/linux/pci_ids.h | 2 + + include/linux/soundcard.h | 74 +- + include/sound/ad1816a.h | 2 + + include/sound/atmel-abdac.h | 23 + + include/sound/atmel-ac97c.h | 40 + + include/sound/control.h | 52 +- + include/sound/core.h | 30 +- + include/sound/hwdep.h | 38 +- + include/sound/jack.h | 5 + + include/sound/pcm.h | 2 +- + include/sound/soc-dapm.h | 19 +- + include/sound/soc.h | 37 +- + include/sound/version.h | 2 +- + sound/Kconfig | 2 + + sound/Makefile | 2 +- + sound/aoa/aoa-gpio.h | 2 + + sound/aoa/core/alsa.c | 7 +- + sound/aoa/core/gpio-feature.c | 17 +- + sound/aoa/fabrics/layout.c | 81 +- + sound/aoa/soundbus/i2sbus/core.c | 22 +- + sound/arm/aaci.c | 7 +- + sound/arm/pxa2xx-ac97.c | 7 +- + sound/arm/sa11xx-uda1341.c | 9 +- + sound/atmel/Kconfig | 19 + + sound/atmel/Makefile | 5 + + sound/atmel/abdac.c | 602 ++++++++++ + sound/atmel/ac97c.c | 932 +++++++++++++++ + sound/atmel/ac97c.h | 71 ++ + sound/core/hwdep.c | 9 +- + sound/core/init.c | 47 +- + sound/core/jack.c | 45 +- + sound/core/misc.c | 10 +- + sound/core/oss/pcm_oss.c | 49 +- + sound/core/oss/pcm_plugin.h | 4 +- + sound/core/pcm.c | 2 +- + sound/core/pcm_native.c | 6 +- + sound/core/seq/oss/seq_oss_device.h | 2 +- + sound/core/seq/seq_prioq.c | 3 +- + sound/core/vmaster.c | 62 +- + sound/drivers/dummy.c | 8 +- + sound/drivers/ml403-ac97cr.c | 6 +- + sound/drivers/mpu401/mpu401.c | 6 +- + sound/drivers/mtpav.c | 18 +- + sound/drivers/mts64.c | 8 +- + sound/drivers/opl3/opl3_lib.c | 2 +- + sound/drivers/opl3/opl3_midi.c | 30 +- + sound/drivers/opl3/opl3_oss.c | 8 +- + sound/drivers/opl3/opl3_synth.c | 2 +- + sound/drivers/pcsp/pcsp.c | 8 +- + sound/drivers/portman2x4.c | 6 +- + sound/drivers/serial-u16550.c | 24 +- + sound/drivers/virmidi.c | 12 +- + sound/drivers/vx/vx_core.c | 3 +- + sound/drivers/vx/vx_hwdep.c | 12 - + sound/isa/Kconfig | 40 +- + sound/isa/Makefile | 2 +- + sound/isa/ad1816a/ad1816a.c | 21 +- + sound/isa/ad1816a/ad1816a_lib.c | 11 +- + sound/isa/ad1848/ad1848.c | 6 +- + sound/isa/adlib.c | 6 +- + sound/isa/als100.c | 7 +- + sound/isa/azt2320.c | 7 +- + sound/isa/cmi8330.c | 94 ++- + sound/isa/cs423x/cs4231.c | 6 +- + sound/isa/cs423x/cs4236.c | 32 +- + sound/isa/cs423x/cs4236_lib.c | 21 +- + sound/isa/dt019x.c | 7 +- + sound/isa/es1688/es1688.c | 29 +- + sound/isa/es1688/es1688_lib.c | 23 +- + sound/isa/es18xx.c | 24 +- + sound/isa/gus/gus_dma.c | 27 +- + sound/isa/gus/gus_irq.c | 6 +- + sound/isa/gus/gus_pcm.c | 26 +- + sound/isa/gus/gus_uart.c | 10 +- + sound/isa/gus/gusclassic.c | 6 +- + sound/isa/gus/gusextreme.c | 6 +- + sound/isa/gus/gusmax.c | 8 +- + sound/isa/gus/interwave.c | 42 +- + sound/isa/msnd/Makefile | 9 + + sound/isa/msnd/msnd.c | 705 +++++++++++ + sound/isa/msnd/msnd.h | 308 +++++ + sound/isa/msnd/msnd_classic.c | 3 + + sound/isa/msnd/msnd_classic.h | 129 ++ + sound/isa/msnd/msnd_midi.c | 180 +++ + sound/isa/msnd/msnd_pinnacle.c | 1238 ++++++++++++++++++++ + sound/isa/msnd/msnd_pinnacle.h | 181 +++ + sound/isa/msnd/msnd_pinnacle_mixer.c | 343 ++++++ + sound/isa/opl3sa2.c | 41 +- + sound/isa/opti9xx/miro.c | 7 +- + sound/isa/opti9xx/opti92x-ad1848.c | 65 +- + sound/isa/sb/es968.c | 7 +- + sound/isa/sb/sb16.c | 28 +- + sound/isa/sb/sb8.c | 8 +- + sound/isa/sc6000.c | 10 +- + sound/isa/sgalaxy.c | 6 +- + sound/isa/sscape.c | 205 +--- + sound/isa/wavefront/wavefront.c | 30 +- + sound/isa/wavefront/wavefront_synth.c | 2 +- + sound/isa/wss/wss_lib.c | 157 ++- + sound/mips/au1x00.c | 9 +- + sound/mips/hal2.c | 6 +- + sound/mips/sgio2audio.c | 6 +- + sound/parisc/harmony.c | 6 +- + sound/pci/ac97/ac97_codec.c | 7 +- + sound/pci/ac97/ac97_proc.c | 2 + + sound/pci/ad1889.c | 6 +- + sound/pci/ak4531_codec.c | 3 +- + sound/pci/ali5451/ali5451.c | 6 +- + sound/pci/als300.c | 8 +- + sound/pci/als4000.c | 9 +- + sound/pci/atiixp.c | 6 +- + sound/pci/atiixp_modem.c | 6 +- + sound/pci/au88x0/au88x0.c | 6 +- + sound/pci/au88x0/au88x0_a3d.c | 7 +- + sound/pci/au88x0/au88x0_core.c | 19 +- + sound/pci/au88x0/au88x0_synth.c | 39 +- + sound/pci/aw2/aw2-alsa.c | 6 +- + sound/pci/azt3328.c | 14 +- + sound/pci/bt87x.c | 6 +- + sound/pci/ca0106/ca0106_main.c | 105 ++- + sound/pci/cmipci.c | 6 +- + sound/pci/cs4281.c | 12 +- + sound/pci/cs46xx/cs46xx.c | 6 +- + sound/pci/cs46xx/cs46xx_lib.c | 6 +- + sound/pci/cs46xx/cs46xx_lib.h | 6 +- + sound/pci/cs5530.c | 6 +- + sound/pci/cs5535audio/cs5535audio.c | 8 +- + sound/pci/echoaudio/echoaudio.c | 6 +- + sound/pci/emu10k1/emu10k1.c | 6 +- + sound/pci/emu10k1/emu10k1_callback.c | 7 +- + sound/pci/emu10k1/emu10k1_main.c | 5 +- + sound/pci/emu10k1/emu10k1x.c | 6 +- + sound/pci/emu10k1/emufx.c | 11 +- + sound/pci/emu10k1/emupcm.c | 37 +- + sound/pci/emu10k1/io.c | 4 +- + sound/pci/emu10k1/p16v.c | 100 ++- + sound/pci/emu10k1/voice.c | 12 +- + sound/pci/ens1370.c | 9 +- + sound/pci/es1938.c | 29 +- + sound/pci/es1968.c | 6 +- + sound/pci/fm801.c | 6 +- + sound/pci/hda/hda_beep.c | 1 + + sound/pci/hda/hda_beep.h | 2 +- + sound/pci/hda/hda_codec.c | 63 +- + sound/pci/hda/hda_intel.c | 6 +- + sound/pci/hda/hda_local.h | 8 +- + sound/pci/hda/patch_analog.c | 178 ++-- + sound/pci/hda/patch_conexant.c | 20 +- + sound/pci/hda/patch_realtek.c | 620 +++++++---- + sound/pci/hda/patch_sigmatel.c | 641 +++++----- + sound/pci/ice1712/ice1712.c | 8 +- + sound/pci/ice1712/ice1724.c | 66 +- + sound/pci/ice1712/juli.c | 5 +- + sound/pci/ice1712/prodigy192.c | 13 +- + sound/pci/intel8x0.c | 85 +- + sound/pci/intel8x0m.c | 20 +- + sound/pci/korg1212/korg1212.c | 6 +- + sound/pci/maestro3.c | 6 +- + sound/pci/mixart/mixart.c | 6 +- + sound/pci/mixart/mixart_hwdep.c | 58 +- + sound/pci/nm256/nm256.c | 6 +- + sound/pci/oxygen/oxygen_lib.c | 8 +- + sound/pci/pcxhr/pcxhr.c | 47 +- + sound/pci/pcxhr/pcxhr.h | 5 +- + sound/pci/pcxhr/pcxhr_core.h | 2 +- + sound/pci/pcxhr/pcxhr_hwdep.c | 12 - + sound/pci/pcxhr/pcxhr_mix22.c | 40 +- + sound/pci/pcxhr/pcxhr_mix22.h | 3 + + sound/pci/pcxhr/pcxhr_mixer.c | 8 +- + sound/pci/riptide/riptide.c | 6 +- + sound/pci/rme32.c | 7 +- + sound/pci/rme96.c | 7 +- + sound/pci/rme9652/hdsp.c | 15 +- + sound/pci/rme9652/hdspm.c | 17 +- + sound/pci/rme9652/rme9652.c | 8 +- + sound/pci/sis7019.c | 5 +- + sound/pci/sonicvibes.c | 115 ++- + sound/pci/trident/trident.c | 6 +- + sound/pci/trident/trident_main.c | 57 +- + sound/pci/via82xx.c | 29 +- + sound/pci/via82xx_modem.c | 11 +- + sound/pci/vx222/vx222.c | 6 +- + sound/pci/vx222/vx222_ops.c | 8 +- + sound/pci/ymfpci/ymfpci.c | 6 +- + sound/pci/ymfpci/ymfpci_main.c | 14 +- + sound/pcmcia/pdaudiocf/pdaudiocf.c | 19 +- + sound/pcmcia/pdaudiocf/pdaudiocf_core.c | 23 +- + sound/pcmcia/pdaudiocf/pdaudiocf_irq.c | 4 +- + sound/pcmcia/vx/vxpocket.c | 32 +- + sound/ppc/Kconfig | 1 + + sound/ppc/awacs.c | 88 ++- + sound/ppc/daca.c | 2 +- + sound/ppc/pmac.c | 11 +- + sound/ppc/powermac.c | 8 +- + sound/ppc/snd_ps3.c | 6 +- + sound/ppc/tumbler.c | 13 +- + sound/sh/aica.c | 8 +- + sound/soc/Kconfig | 1 + + sound/soc/Makefile | 2 +- + sound/soc/atmel/atmel-pcm.c | 2 +- + sound/soc/au1x/dbdma2.c | 2 +- + sound/soc/blackfin/bf5xx-ac97-pcm.c | 2 +- + sound/soc/blackfin/bf5xx-ac97.c | 92 +- + sound/soc/blackfin/bf5xx-ad73311.c | 4 +- + sound/soc/blackfin/bf5xx-i2s-pcm.c | 2 +- + sound/soc/blackfin/bf5xx-sport.c | 104 +- + sound/soc/codecs/Kconfig | 9 +- + sound/soc/codecs/Makefile | 3 + + sound/soc/codecs/ac97.c | 22 +- + sound/soc/codecs/ad1980.c | 33 +- + sound/soc/codecs/ad73311.c | 8 +- + sound/soc/codecs/ak4535.c | 32 +- + sound/soc/codecs/cs4270.c | 566 +++++----- + sound/soc/codecs/pcm3008.c | 12 +- + sound/soc/codecs/ssm2602.c | 38 +- + sound/soc/codecs/tlv320aic23.c | 39 +- + sound/soc/codecs/tlv320aic26.c | 4 +- + sound/soc/codecs/tlv320aic3x.c | 44 +- + sound/soc/codecs/twl4030.c | 458 +++++--- + sound/soc/codecs/twl4030.h | 15 + + sound/soc/codecs/uda134x.c | 68 +- + sound/soc/codecs/uda1380.c | 108 ++- + sound/soc/codecs/wm8350.c | 144 ++- + sound/soc/codecs/wm8350.h | 8 + + sound/soc/codecs/wm8510.c | 35 +- + sound/soc/codecs/wm8580.c | 31 +- + sound/soc/codecs/wm8728.c | 38 +- + sound/soc/codecs/wm8731.c | 39 +- + sound/soc/codecs/wm8750.c | 34 +- + sound/soc/codecs/wm8753.c | 40 +- + sound/soc/codecs/wm8900.c | 27 +- + sound/soc/codecs/wm8903.c | 34 +- + sound/soc/codecs/wm8971.c | 32 +- + sound/soc/codecs/wm8990.c | 40 +- + sound/soc/codecs/wm9705.c | 413 +++++++ + sound/soc/codecs/wm9705.h | 14 + + sound/soc/codecs/wm9712.c | 43 +- + sound/soc/codecs/wm9713.c | 49 +- + sound/soc/davinci/davinci-pcm.c | 2 +- + sound/soc/davinci/davinci-sffsdr.c | 20 +- + sound/soc/fsl/Kconfig | 17 +- + sound/soc/fsl/Makefile | 7 +- + sound/soc/fsl/fsl_dma.c | 178 ++-- + sound/soc/fsl/fsl_ssi.c | 19 +- + sound/soc/omap/Kconfig | 14 +- + sound/soc/omap/Makefile | 2 + + sound/soc/omap/omap-pcm.c | 2 +- + sound/soc/omap/omap3pandora.c | 49 +- + sound/soc/pxa/Kconfig | 27 + + sound/soc/pxa/Makefile | 6 + + sound/soc/pxa/e740_wm9705.c | 211 ++++ + sound/soc/pxa/e750_wm9705.c | 187 +++ + sound/soc/pxa/e800_wm9712.c | 113 ++- + sound/soc/pxa/mioa701_wm9713.c | 250 ++++ + sound/soc/pxa/pxa-ssp.c | 12 +- + sound/soc/pxa/pxa2xx-i2s.c | 36 - + sound/soc/pxa/zylonite.c | 93 ++- + sound/soc/s3c24xx/Kconfig | 1 + + sound/soc/soc-core.c | 76 +- + sound/soc/soc-dapm.c | 63 +- + sound/soc/soc-jack.c | 138 +++ + sound/sparc/amd7930.c | 12 +- + sound/sparc/cs4231.c | 9 +- + sound/sparc/dbri.c | 8 +- + sound/spi/at73c213.c | 7 +- + sound/synth/emux/emux_hwdep.c | 21 - + sound/synth/emux/emux_oss.c | 2 +- + sound/synth/emux/emux_seq.c | 16 +- + sound/synth/emux/emux_synth.c | 6 +- + sound/synth/emux/soundfont.c | 28 +- + sound/usb/Kconfig | 3 + + sound/usb/caiaq/caiaq-audio.c | 5 +- + sound/usb/caiaq/caiaq-control.c | 42 +- + sound/usb/caiaq/caiaq-device.c | 44 +- + sound/usb/caiaq/caiaq-device.h | 2 + + sound/usb/usbaudio.c | 70 +- + sound/usb/usbmixer.c | 164 ++-- + sound/usb/usbmixer_maps.c | 26 + + sound/usb/usbquirks.h | 10 + + sound/usb/usx2y/us122l.c | 59 +- + sound/usb/usx2y/usX2Yhwdep.c | 12 - + sound/usb/usx2y/usb_stream.c | 2 +- + sound/usb/usx2y/usbusx2y.c | 52 +- + 300 files changed, 11144 insertions(+), 3558 deletions(-) + create mode 100644 include/sound/atmel-abdac.h + create mode 100644 include/sound/atmel-ac97c.h + create mode 100644 sound/atmel/Kconfig + create mode 100644 sound/atmel/Makefile + create mode 100644 sound/atmel/abdac.c + create mode 100644 sound/atmel/ac97c.c + create mode 100644 sound/atmel/ac97c.h + create mode 100644 sound/isa/msnd/Makefile + create mode 100644 sound/isa/msnd/msnd.c + create mode 100644 sound/isa/msnd/msnd.h + create mode 100644 sound/isa/msnd/msnd_classic.c + create mode 100644 sound/isa/msnd/msnd_classic.h + create mode 100644 sound/isa/msnd/msnd_midi.c + create mode 100644 sound/isa/msnd/msnd_pinnacle.c + create mode 100644 sound/isa/msnd/msnd_pinnacle.h + create mode 100644 sound/isa/msnd/msnd_pinnacle_mixer.c + create mode 100644 sound/soc/codecs/wm9705.c + create mode 100644 sound/soc/codecs/wm9705.h + create mode 100644 sound/soc/pxa/e740_wm9705.c + create mode 100644 sound/soc/pxa/e750_wm9705.c + create mode 100644 sound/soc/pxa/mioa701_wm9713.c + create mode 100644 sound/soc/soc-jack.c +Merging cpufreq/next +$ git merge cpufreq/next +Auto-merged Documentation/cpu-freq/user-guide.txt +Auto-merged arch/x86/kernel/cpu/cpufreq/Kconfig +Merge made by recursive. + Documentation/cpu-freq/governors.txt | 26 ++- + Documentation/cpu-freq/user-guide.txt | 12 + + arch/x86/kernel/cpu/cpufreq/Kconfig | 19 +-- + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 36 ++-- + arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c | 54 ++-- + arch/x86/kernel/cpu/cpufreq/e_powersaver.c | 21 +- + arch/x86/kernel/cpu/cpufreq/elanfreq.c | 6 +- + arch/x86/kernel/cpu/cpufreq/gx-suspmod.c | 105 +++++--- + arch/x86/kernel/cpu/cpufreq/longhaul.c | 193 +++++++------- + arch/x86/kernel/cpu/cpufreq/longhaul.h | 12 +- + arch/x86/kernel/cpu/cpufreq/longrun.c | 25 +- + arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 60 +++-- + arch/x86/kernel/cpu/cpufreq/powernow-k6.c | 44 ++-- + arch/x86/kernel/cpu/cpufreq/powernow-k7.c | 239 +++++++++------- + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 368 +++++++++++++++---------- + arch/x86/kernel/cpu/cpufreq/powernow-k8.h | 5 +- + arch/x86/kernel/cpu/cpufreq/sc520_freq.c | 30 ++- + arch/x86/kernel/cpu/cpufreq/speedstep-ich.c | 70 +++--- + arch/x86/kernel/cpu/cpufreq/speedstep-lib.c | 129 +++++---- + arch/x86/kernel/cpu/cpufreq/speedstep-lib.h | 18 +- + arch/x86/kernel/cpu/cpufreq/speedstep-smi.c | 166 +++++++----- + drivers/cpufreq/cpufreq.c | 55 ++-- + drivers/cpufreq/cpufreq_conservative.c | 67 +++-- + drivers/cpufreq/cpufreq_ondemand.c | 74 ++++-- + drivers/cpufreq/cpufreq_stats.c | 74 +++--- + drivers/cpufreq/cpufreq_userspace.c | 27 +- + drivers/cpufreq/freq_table.c | 18 +- + 27 files changed, 1128 insertions(+), 825 deletions(-) +Merging v9fs/for-next +$ git merge v9fs/for-next +Auto-merged net/9p/protocol.c +CONFLICT (content): Merge conflict in net/9p/protocol.c +Resolved 'net/9p/protocol.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 652a875: Merge commit 'v9fs/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging quilt/rr +$ git merge quilt/rr +CONFLICT (delete/modify): arch/x86/include/asm/es7000/apic.h deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/x86/include/asm/es7000/apic.h left in tree. +CONFLICT (delete/modify): arch/x86/include/asm/numaq/apic.h deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/x86/include/asm/numaq/apic.h left in tree. +Auto-merged arch/x86/kernel/cpu/cpufreq/powernow-k8.c +CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/powernow-k8.c +Auto-merged drivers/net/virtio_net.c +CONFLICT (content): Merge conflict in drivers/net/virtio_net.c +Auto-merged init/main.c +Auto-merged kernel/sched_rt.c +Resolved 'arch/x86/kernel/cpu/cpufreq/powernow-k8.c' using previous resolution. +Resolved 'drivers/net/virtio_net.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/x86/include/asm/es7000/apic.h +arch/x86/include/asm/es7000/apic.h: needs merge +arch/x86/include/asm/numaq/apic.h: needs merge +arch/x86/kernel/cpu/cpufreq/powernow-k8.c: needs merge +drivers/net/virtio_net.c: needs merge +rm 'arch/x86/include/asm/es7000/apic.h' +rm 'arch/x86/include/asm/es7000/apic.h' +$ git rm -f arch/x86/include/asm/numaq/apic.h +arch/x86/include/asm/numaq/apic.h: needs merge +arch/x86/kernel/cpu/cpufreq/powernow-k8.c: needs merge +drivers/net/virtio_net.c: needs merge +rm 'arch/x86/include/asm/numaq/apic.h' +rm 'arch/x86/include/asm/numaq/apic.h' +Applying: rr: fixup for cpumask:remove-address-of-CPU_MASK_ALL +$ git commit -v -a +Created commit 7a38f91: Merge branch 'quilt/rr' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/kernel/process.c | 8 ++-- + arch/alpha/kernel/smp.c | 12 ++++---- + arch/mips/alchemy/common/time.c | 2 +- + arch/sparc/include/asm/topology_64.h | 2 +- + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 15 ++++++---- + arch/x86/kernel/es7000_32.c | 2 +- + arch/x86/kernel/numaq_32.c | 2 +- + drivers/virtio/virtio_ring.c | 22 +++++++++----- + include/asm-frv/gdb-stub.h | 1 - + include/asm-mn10300/gdb-stub.h | 1 - + include/linux/cpumask.h | 36 +++++++++++++---------- + init/main.c | 7 +---- + kernel/cpu.c | 44 +++++++++++++--------------- + kernel/kmod.c | 2 +- + kernel/kthread.c | 8 ++--- + kernel/sched_cpupri.c | 5 ++- + kernel/sched_rt.c | 15 ++------- + mm/pdflush.c | 2 +- + 18 files changed, 90 insertions(+), 96 deletions(-) +Merging cifs/master +$ git merge cifs/master +Merge made by recursive. + fs/cifs/cifsproto.h | 1 + + fs/cifs/connect.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++--- + fs/cifs/inode.c | 4 ++-- + 3 files changed, 51 insertions(+), 5 deletions(-) +Merging mmc/next +$ git merge mmc/next +Merge made by recursive. + drivers/mmc/host/sdhci-pci.c | 3 +-- + drivers/mmc/host/sdhci.c | 3 +-- + drivers/mmc/host/sdhci.h | 2 -- + 3 files changed, 2 insertions(+), 6 deletions(-) +Merging gfs2/master +$ git merge gfs2/master +Removed fs/gfs2/locking.c +Removed fs/gfs2/locking/dlm/Makefile +Removed fs/gfs2/locking/dlm/lock.c +Removed fs/gfs2/locking/dlm/lock_dlm.h +Removed fs/gfs2/locking/dlm/main.c +Removed fs/gfs2/locking/dlm/mount.c +Removed fs/gfs2/locking/dlm/sysfs.c +Removed fs/gfs2/locking/dlm/thread.c +Removed fs/gfs2/mount.h +Removed include/linux/lm_interface.h +Merge made by recursive. + fs/gfs2/Kconfig | 17 +- + fs/gfs2/Makefile | 4 +- + fs/gfs2/acl.c | 1 - + fs/gfs2/bmap.c | 1 - + fs/gfs2/dir.c | 1 - + fs/gfs2/eaops.c | 1 - + fs/gfs2/eattr.c | 1 - + fs/gfs2/glock.c | 261 +++++---------- + fs/gfs2/glock.h | 127 +++++++- + fs/gfs2/glops.c | 33 +-- + fs/gfs2/incore.h | 69 ++++- + fs/gfs2/inode.c | 13 +- + fs/gfs2/inode.h | 22 +- + fs/gfs2/lock_dlm.c | 240 ++++++++++++++ + fs/gfs2/locking.c | 232 ------------- + fs/gfs2/locking/dlm/Makefile | 3 - + fs/gfs2/locking/dlm/lock.c | 708 ---------------------------------------- + fs/gfs2/locking/dlm/lock_dlm.h | 166 ---------- + fs/gfs2/locking/dlm/main.c | 48 --- + fs/gfs2/locking/dlm/mount.c | 276 ---------------- + fs/gfs2/locking/dlm/sysfs.c | 226 ------------- + fs/gfs2/locking/dlm/thread.c | 68 ---- + fs/gfs2/log.c | 1 - + fs/gfs2/lops.c | 1 - + fs/gfs2/main.c | 13 +- + fs/gfs2/meta_io.c | 1 - + fs/gfs2/mount.c | 122 ++------ + fs/gfs2/mount.h | 17 - + fs/gfs2/ops_address.c | 2 +- + fs/gfs2/ops_dentry.c | 1 - + fs/gfs2/ops_export.c | 1 - + fs/gfs2/ops_file.c | 74 ++--- + fs/gfs2/ops_fstype.c | 149 ++++++--- + fs/gfs2/ops_inode.c | 1 - + fs/gfs2/ops_super.c | 44 ++- + fs/gfs2/quota.c | 203 ++++++------ + fs/gfs2/quota.h | 2 + + fs/gfs2/recovery.c | 28 +- + fs/gfs2/rgrp.c | 56 +++- + fs/gfs2/super.c | 1 - + fs/gfs2/super.h | 26 +- + fs/gfs2/sys.c | 156 +++++++++- + fs/gfs2/trans.c | 19 +- + fs/gfs2/util.c | 11 +- + include/linux/lm_interface.h | 277 ---------------- + 45 files changed, 1109 insertions(+), 2615 deletions(-) + create mode 100644 fs/gfs2/lock_dlm.c + delete mode 100644 fs/gfs2/locking.c + delete mode 100644 fs/gfs2/locking/dlm/Makefile + delete mode 100644 fs/gfs2/locking/dlm/lock.c + delete mode 100644 fs/gfs2/locking/dlm/lock_dlm.h + delete mode 100644 fs/gfs2/locking/dlm/main.c + delete mode 100644 fs/gfs2/locking/dlm/mount.c + delete mode 100644 fs/gfs2/locking/dlm/sysfs.c + delete mode 100644 fs/gfs2/locking/dlm/thread.c + delete mode 100644 fs/gfs2/mount.h + delete mode 100644 include/linux/lm_interface.h +Merging input/next +$ git merge input/next +Auto-merged drivers/input/mouse/Kconfig +Merge made by recursive. + drivers/input/input.c | 7 + + drivers/input/misc/ati_remote2.c | 277 +++++++++++++++++++++++++++++++++++--- + drivers/input/mouse/Kconfig | 11 ++ + drivers/input/mouse/Makefile | 9 +- + drivers/input/mouse/maplemouse.c | 147 ++++++++++++++++++++ + drivers/input/mouse/pc110pad.c | 5 +- + 6 files changed, 432 insertions(+), 24 deletions(-) + create mode 100644 drivers/input/mouse/maplemouse.c +Merging bkl-removal/bkl-removal +$ git merge bkl-removal/bkl-removal +Auto-merged drivers/hid/usbhid/hiddev.c +Auto-merged drivers/net/wan/cosa.c +Auto-merged drivers/scsi/sg.c +Auto-merged fs/nfsd/vfs.c +Auto-merged include/linux/fs.h +Auto-merged sound/core/oss/pcm_oss.c +Auto-merged sound/core/pcm_native.c +Merge made by recursive. + Documentation/filesystems/Locking | 7 +++++-- + drivers/char/sonypi.c | 7 +------ + drivers/char/tty_io.c | 5 ++--- + drivers/gpu/drm/drm_fops.c | 6 +----- + drivers/hid/usbhid/hiddev.c | 5 +---- + drivers/ieee1394/dv1394.c | 6 +----- + drivers/input/evdev.c | 5 +---- + drivers/input/joydev.c | 5 +---- + drivers/input/mousedev.c | 5 +---- + drivers/input/serio/serio_raw.c | 4 +--- + drivers/net/wan/cosa.c | 4 ++-- + drivers/platform/x86/sony-laptop.c | 7 +------ + drivers/scsi/sg.c | 4 +--- + drivers/usb/gadget/file_storage.c | 7 ++++++- + fs/eventpoll.c | 12 +++++++----- + fs/fcntl.c | 33 ++++++++++++++++++++------------- + fs/file_table.c | 1 + + fs/ioctl.c | 18 ++++-------------- + fs/nfsd/vfs.c | 5 ++++- + fs/pipe.c | 17 +++-------------- + include/linux/eventpoll.h | 1 - + include/linux/fs.h | 2 +- + ipc/mqueue.c | 2 ++ + net/socket.c | 7 +++++++ + sound/core/control.c | 7 ++----- + sound/core/oss/pcm_oss.c | 2 ++ + sound/core/pcm_native.c | 4 +--- + sound/core/timer.c | 6 +----- + sound/oss/au1550_ac97.c | 2 ++ + sound/oss/audio.c | 2 ++ + sound/oss/sh_dac_audio.c | 2 ++ + sound/oss/swarm_cs4297a.c | 2 ++ + sound/oss/vwsnd.c | 2 ++ + 33 files changed, 90 insertions(+), 114 deletions(-) +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Merge made by recursive. + fs/ubifs/lpt_commit.c | 21 +++++++++++++-------- + 1 files changed, 13 insertions(+), 8 deletions(-) +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Already up-to-date. +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Auto-merged drivers/media/dvb/ttpci/av7110.c +Removed drivers/media/dvb/ttpci/fdump.c +Removed drivers/scsi/ql1040_fw.h +Removed drivers/scsi/ql12160_fw.h +Removed drivers/scsi/ql1280_fw.h +Removed drivers/scsi/qlogicpti_asm.c +Auto-merged firmware/Makefile +Auto-merged firmware/WHENCE +Auto-merged sound/isa/Kconfig +CONFLICT (content): Merge conflict in sound/isa/Kconfig +Removed sound/isa/wavefront/yss225.c +Resolved 'sound/isa/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit e568749: Merge commit 'firmware/master' +$ git diff -M --stat --summary HEAD^.. + drivers/media/dvb/ttpci/Kconfig | 23 +- + drivers/media/dvb/ttpci/Makefile | 9 - + drivers/media/dvb/ttpci/av7110.c | 16 - + drivers/media/dvb/ttpci/av7110_hw.c | 35 +- + drivers/media/dvb/ttpci/av7110_hw.h | 3 +- + drivers/media/dvb/ttpci/fdump.c | 44 - + drivers/scsi/advansys.c | 1731 ++----------------- + drivers/scsi/ql1040_fw.h | 2130 ---------------------- + drivers/scsi/ql12160_fw.h | 1811 ------------------- + drivers/scsi/ql1280_fw.h | 2048 --------------------- + drivers/scsi/qla1280.c | 114 +- + drivers/scsi/qla1280.h | 6 + + drivers/scsi/qlogicpti.c | 63 +- + drivers/scsi/qlogicpti_asm.c | 1160 ------------ + firmware/.gitignore | 1 + + firmware/Makefile | 29 +- + firmware/WHENCE | 59 + + firmware/advansys/3550.bin.ihex | 317 ++++ + firmware/advansys/38C0800.bin.ihex | 336 ++++ + firmware/advansys/38C1600.bin.ihex | 398 +++++ + firmware/advansys/mcode.bin.ihex | 147 ++ + firmware/av7110/Boot.S | 109 ++ + firmware/av7110/bootcode.bin.ihex | 15 + + {scripts => firmware}/ihex2fw.c | 0 + firmware/qlogic/1040.bin.ihex | 2111 ++++++++++++++++++++++ + firmware/qlogic/12160.bin.ihex | 1771 +++++++++++++++++++ + firmware/qlogic/1280.bin.ihex | 2008 +++++++++++++++++++++ + firmware/qlogic/isp1000.bin.ihex | 1158 ++++++++++++ + firmware/yamaha/yss225_registers.bin.ihex | 998 +++++++++++ + scripts/.gitignore | 1 - + scripts/Makefile | 3 +- + sound/isa/Kconfig | 10 - + sound/isa/wavefront/wavefront_fx.c | 16 - + sound/isa/wavefront/yss225.c | 2739 ----------------------------- + 34 files changed, 9695 insertions(+), 11724 deletions(-) + delete mode 100644 drivers/media/dvb/ttpci/fdump.c + delete mode 100644 drivers/scsi/ql1040_fw.h + delete mode 100644 drivers/scsi/ql12160_fw.h + delete mode 100644 drivers/scsi/ql1280_fw.h + delete mode 100644 drivers/scsi/qlogicpti_asm.c + create mode 100644 firmware/advansys/3550.bin.ihex + create mode 100644 firmware/advansys/38C0800.bin.ihex + create mode 100644 firmware/advansys/38C1600.bin.ihex + create mode 100644 firmware/advansys/mcode.bin.ihex + create mode 100644 firmware/av7110/Boot.S + create mode 100644 firmware/av7110/bootcode.bin.ihex + rename {scripts => firmware}/ihex2fw.c (100%) + create mode 100644 firmware/qlogic/1040.bin.ihex + create mode 100644 firmware/qlogic/12160.bin.ihex + create mode 100644 firmware/qlogic/1280.bin.ihex + create mode 100644 firmware/qlogic/isp1000.bin.ihex + create mode 100644 firmware/yamaha/yss225_registers.bin.ihex + delete mode 100644 sound/isa/wavefront/yss225.c +Merging pcmcia/master +$ git merge pcmcia/master +Already up-to-date. +Merging battery/master +$ git merge battery/master +Merge made by recursive. + drivers/power/pcf50633-charger.c | 91 +++++++++++++++++++++++++++++------- + drivers/power/pda_power.c | 89 +++++++++++++++++++++++++++++++----- + include/linux/mfd/pcf50633/core.h | 2 + + include/linux/mfd/pcf50633/mbc.h | 1 - + include/linux/pda_power.h | 2 + + 5 files changed, 154 insertions(+), 31 deletions(-) +Merging leds/for-mm +$ git merge leds/for-mm +Merge made by recursive. + Documentation/powerpc/dts-bindings/gpio/led.txt | 46 ++++- + drivers/leds/Kconfig | 28 +++- + drivers/leds/Makefile | 3 + + drivers/leds/led-class.c | 21 ++- + drivers/leds/leds-dac124s085.c | 150 ++++++++++++++++ + drivers/leds/leds-gpio.c | 215 ++++++++++++++++++----- + drivers/leds/leds.h | 4 +- + drivers/leds/ledtrig-default-on.c | 2 +- + drivers/leds/ledtrig-heartbeat.c | 4 +- + drivers/leds/ledtrig-ide-disk.c | 3 +- + drivers/leds/ledtrig-timer.c | 2 +- + include/linux/leds.h | 1 + + 12 files changed, 417 insertions(+), 62 deletions(-) + create mode 100644 drivers/leds/leds-dac124s085.c +Merging backlight/for-mm +$ git merge backlight/for-mm +Merge made by recursive. + drivers/video/backlight/mbp_nvidia_bl.c | 191 +++++++++++++++++++++++++------ + 1 files changed, 155 insertions(+), 36 deletions(-) +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Merge made by recursive. + include/linux/kgdb.h | 42 ++++++++++++++++++++++++++++++++++++++++-- + kernel/kgdb.c | 6 +++--- + 2 files changed, 43 insertions(+), 5 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Auto-merged arch/x86/include/asm/page.h +Auto-merged include/linux/mm.h +Auto-merged include/linux/slub_def.h +CONFLICT (content): Merge conflict in include/linux/slub_def.h +Auto-merged init/Kconfig +Auto-merged lib/Kconfig.debug +Auto-merged mm/slob.c +CONFLICT (content): Merge conflict in mm/slob.c +Auto-merged mm/slub.c +CONFLICT (content): Merge conflict in mm/slub.c +Resolved 'include/linux/slub_def.h' using previous resolution. +Resolved 'mm/slob.c' using previous resolution. +Resolved 'mm/slub.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 284b2c5: Merge commit 'slab/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/vm/slqbinfo.c | 1054 +++++++++++++ + arch/x86/include/asm/page.h | 1 + + include/linux/mm.h | 4 + + include/linux/rcu_types.h | 18 + + include/linux/rcupdate.h | 11 +- + include/linux/slab.h | 10 +- + include/linux/slqb_def.h | 296 ++++ + include/linux/slub_def.h | 40 +- + init/Kconfig | 9 +- + lib/Kconfig.debug | 20 + + mm/Makefile | 1 + + mm/slob.c | 40 +- + mm/slqb.c | 3621 +++++++++++++++++++++++++++++++++++++++++++ + mm/slub.c | 52 +- + 14 files changed, 5088 insertions(+), 89 deletions(-) + create mode 100644 Documentation/vm/slqbinfo.c + create mode 100644 include/linux/rcu_types.h + create mode 100644 include/linux/slqb_def.h + create mode 100644 mm/slqb.c +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Already up-to-date. +Merging kmemcheck/auto-kmemcheck-next +$ git merge kmemcheck/auto-kmemcheck-next +Auto-merged MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merged arch/x86/Kconfig.debug +Auto-merged arch/x86/Makefile +Auto-merged arch/x86/include/asm/pgtable.h +Auto-merged arch/x86/include/asm/pgtable_64.h +Auto-merged arch/x86/kernel/head_32.S +Auto-merged arch/x86/kernel/process.c +Auto-merged arch/x86/kernel/stacktrace.c +Auto-merged arch/x86/kernel/traps.c +Auto-merged arch/x86/mm/Makefile +Auto-merged arch/x86/mm/fault.c +Auto-merged arch/x86/mm/init_32.c +Auto-merged include/linux/interrupt.h +Auto-merged include/linux/slab.h +Auto-merged include/linux/slab_def.h +Auto-merged init/main.c +Auto-merged kernel/fork.c +Auto-merged kernel/softirq.c +Auto-merged kernel/sysctl.c +Auto-merged mm/Makefile +CONFLICT (content): Merge conflict in mm/Makefile +Auto-merged mm/slab.c +Auto-merged mm/slub.c +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'mm/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit e3e7510: Merge commit 'kmemcheck/auto-kmemcheck-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/kmemcheck.txt | 129 ++++++ + MAINTAINERS | 8 + + arch/x86/Kconfig.debug | 88 +++++ + arch/x86/Makefile | 5 + + arch/x86/include/asm/dma-mapping.h | 2 + + arch/x86/include/asm/kmemcheck.h | 42 ++ + arch/x86/include/asm/pgtable.h | 4 +- + arch/x86/include/asm/pgtable_32.h | 6 + + arch/x86/include/asm/pgtable_64.h | 6 + + arch/x86/include/asm/string_32.h | 8 + + arch/x86/include/asm/string_64.h | 8 + + arch/x86/kernel/head_32.S | 2 +- + arch/x86/kernel/process.c | 2 +- + arch/x86/kernel/stacktrace.c | 7 + + arch/x86/kernel/traps.c | 5 + + arch/x86/mm/Makefile | 2 + + arch/x86/mm/fault.c | 18 +- + arch/x86/mm/init_32.c | 4 +- + arch/x86/mm/init_64.c | 2 +- + arch/x86/mm/kmemcheck/Makefile | 1 + + arch/x86/mm/kmemcheck/error.c | 229 +++++++++++ + arch/x86/mm/kmemcheck/error.h | 15 + + arch/x86/mm/kmemcheck/kmemcheck.c | 752 ++++++++++++++++++++++++++++++++++++ + arch/x86/mm/kmemcheck/opcode.c | 90 +++++ + arch/x86/mm/kmemcheck/opcode.h | 10 + + arch/x86/mm/kmemcheck/pte.c | 22 + + arch/x86/mm/kmemcheck/pte.h | 10 + + arch/x86/mm/kmemcheck/shadow.c | 124 ++++++ + arch/x86/mm/kmemcheck/shadow.h | 16 + + include/linux/gfp.h | 3 +- + include/linux/interrupt.h | 14 + + include/linux/kmemcheck.h | 86 ++++ + include/linux/mm_types.h | 8 + + include/linux/slab.h | 7 + + include/linux/slab_def.h | 81 ++++ + include/linux/stacktrace.h | 3 + + init/main.c | 4 + + kernel/fork.c | 14 +- + kernel/softirq.c | 11 + + kernel/sysctl.c | 11 + + mm/Makefile | 1 + + mm/kmemcheck.c | 103 +++++ + mm/slab.c | 101 +---- + mm/slub.c | 20 +- + 44 files changed, 1981 insertions(+), 103 deletions(-) + create mode 100644 Documentation/kmemcheck.txt + create mode 100644 arch/x86/include/asm/kmemcheck.h + create mode 100644 arch/x86/mm/kmemcheck/Makefile + create mode 100644 arch/x86/mm/kmemcheck/error.c + create mode 100644 arch/x86/mm/kmemcheck/error.h + create mode 100644 arch/x86/mm/kmemcheck/kmemcheck.c + create mode 100644 arch/x86/mm/kmemcheck/opcode.c + create mode 100644 arch/x86/mm/kmemcheck/opcode.h + create mode 100644 arch/x86/mm/kmemcheck/pte.c + create mode 100644 arch/x86/mm/kmemcheck/pte.h + create mode 100644 arch/x86/mm/kmemcheck/shadow.c + create mode 100644 arch/x86/mm/kmemcheck/shadow.h + create mode 100644 include/linux/kmemcheck.h + create mode 100644 mm/kmemcheck.c +Merging generic-ipi/auto-generic-ipi-next +$ git merge generic-ipi/auto-generic-ipi-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Merge made by recursive. + drivers/mfd/htc-egpio.c | 4 +- + drivers/mfd/pcf50633-core.c | 1 - + drivers/mfd/twl4030-core.c | 2 +- + drivers/mfd/wm8350-core.c | 85 ++++++++++++++++++++++++++++---------- + drivers/mfd/wm8350-regmap.c | 2 +- + include/linux/mfd/wm8350/core.h | 2 + + 6 files changed, 68 insertions(+), 28 deletions(-) +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Auto-merged drivers/gpu/drm/drm_memory.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_memory.c +Auto-merged drivers/gpu/drm/drm_sysfs.c +Auto-merged drivers/gpu/drm/i915/i915_dma.c +Auto-merged drivers/gpu/drm/i915/i915_drv.c +Auto-merged drivers/gpu/drm/i915/i915_gem.c +Auto-merged drivers/gpu/drm/radeon/radeon_cp.c +Resolved 'drivers/gpu/drm/drm_memory.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 9c08b78: Merge commit 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/drm_bufs.c | 87 ++++++++++++++++++++++------------ + drivers/gpu/drm/drm_context.c | 4 +- + drivers/gpu/drm/drm_crtc_helper.c | 3 +- + drivers/gpu/drm/drm_drv.c | 73 +++++----------------------- + drivers/gpu/drm/drm_gem.c | 2 +- + drivers/gpu/drm/drm_memory.c | 6 +- + drivers/gpu/drm/drm_proc.c | 6 +- + drivers/gpu/drm/drm_stub.c | 89 ++++++++++++++++++++++++++--------- + drivers/gpu/drm/drm_sysfs.c | 37 ++------------ + drivers/gpu/drm/drm_vm.c | 32 +++++++------ + drivers/gpu/drm/i810/i810_drv.h | 4 +- + drivers/gpu/drm/i830/i830_drv.h | 4 +- + drivers/gpu/drm/i915/i915_dma.c | 2 +- + drivers/gpu/drm/i915/i915_drv.c | 38 +++++++++++++++ + drivers/gpu/drm/i915/i915_gem.c | 4 +- + drivers/gpu/drm/mga/mga_dma.c | 17 ++++--- + drivers/gpu/drm/mga/mga_drv.h | 8 ++-- + drivers/gpu/drm/r128/r128_cce.c | 7 ++- + drivers/gpu/drm/radeon/radeon_cp.c | 9 ++-- + drivers/gpu/drm/radeon/radeon_drv.c | 12 ----- + drivers/gpu/drm/radeon/radeon_drv.h | 2 +- + drivers/gpu/drm/savage/savage_bci.c | 8 ++-- + drivers/gpu/drm/via/via_drv.c | 6 -- + include/drm/drmP.h | 62 ++++++++++++++---------- + include/drm/drm_crtc.h | 2 +- + 25 files changed, 279 insertions(+), 245 deletions(-) +Merging voltage/for-next +$ git merge voltage/for-next +Auto-merged MAINTAINERS +Merge made by recursive. + Documentation/ABI/testing/sysfs-class-regulator | 57 ++++++++++-- + MAINTAINERS | 2 +- + drivers/regulator/Kconfig | 6 +- + drivers/regulator/bq24022.c | 3 +- + drivers/regulator/core.c | 107 +++++++++++++++------- + drivers/regulator/da903x.c | 3 +- + drivers/regulator/fixed.c | 3 +- + drivers/regulator/pcf50633-regulator.c | 3 +- + drivers/regulator/virtual.c | 14 ++- + drivers/regulator/wm8350-regulator.c | 4 +- + drivers/regulator/wm8400-regulator.c | 2 +- + include/linux/regulator/bq24022.h | 3 + + include/linux/regulator/consumer.h | 4 +- + include/linux/regulator/driver.h | 55 +++++++++++- + include/linux/regulator/fixed.h | 3 + + include/linux/regulator/machine.h | 2 +- + 16 files changed, 211 insertions(+), 60 deletions(-) +Merging security-testing/next +$ git merge security-testing/next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged MAINTAINERS +Auto-merged fs/exec.c +Auto-merged fs/file_table.c +Auto-merged fs/inode.c +Auto-merged fs/namei.c +Auto-merged ipc/shm.c +Auto-merged mm/mmap.c +Merge made by recursive. + Documentation/ABI/testing/ima_policy | 61 ++++ + Documentation/kernel-parameters.txt | 10 + + MAINTAINERS | 6 + + drivers/char/tpm/tpm.c | 530 ++++++++++++++++------------------ + drivers/char/tpm/tpm.h | 142 +++++++++ + fs/exec.c | 10 + + fs/file_table.c | 2 + + fs/inode.c | 24 +- + fs/namei.c | 8 + + include/linux/audit.h | 5 + + include/linux/ima.h | 60 ++++ + include/linux/tpm.h | 35 +++ + ipc/shm.c | 3 + + mm/mmap.c | 4 + + mm/shmem.c | 2 + + security/Kconfig | 5 +- + security/Makefile | 4 + + security/inode.c | 7 +- + security/integrity/ima/Kconfig | 55 ++++ + security/integrity/ima/Makefile | 9 + + security/integrity/ima/ima.h | 166 +++++++++++ + security/integrity/ima/ima_api.c | 190 ++++++++++++ + security/integrity/ima/ima_audit.c | 78 +++++ + security/integrity/ima/ima_crypto.c | 140 +++++++++ + security/integrity/ima/ima_fs.c | 376 ++++++++++++++++++++++++ + security/integrity/ima/ima_iint.c | 202 +++++++++++++ + security/integrity/ima/ima_init.c | 96 ++++++ + security/integrity/ima/ima_main.c | 327 +++++++++++++++++++++ + security/integrity/ima/ima_policy.c | 413 ++++++++++++++++++++++++++ + security/integrity/ima/ima_queue.c | 140 +++++++++ + security/selinux/hooks.c | 241 +++++----------- + security/selinux/include/objsec.h | 2 - + security/selinux/include/security.h | 8 + + 33 files changed, 2890 insertions(+), 471 deletions(-) + create mode 100644 Documentation/ABI/testing/ima_policy + create mode 100644 include/linux/ima.h + create mode 100644 include/linux/tpm.h + create mode 100644 security/integrity/ima/Kconfig + create mode 100644 security/integrity/ima/Makefile + create mode 100644 security/integrity/ima/ima.h + create mode 100644 security/integrity/ima/ima_api.c + create mode 100644 security/integrity/ima/ima_audit.c + create mode 100644 security/integrity/ima/ima_crypto.c + create mode 100644 security/integrity/ima/ima_fs.c + create mode 100644 security/integrity/ima/ima_iint.c + create mode 100644 security/integrity/ima/ima_init.c + create mode 100644 security/integrity/ima/ima_main.c + create mode 100644 security/integrity/ima/ima_policy.c + create mode 100644 security/integrity/ima/ima_queue.c +Merging lblnet/master +$ git merge lblnet/master +Auto-merged Documentation/feature-removal-schedule.txt +Auto-merged Documentation/kernel-parameters.txt +Auto-merged security/selinux/hooks.c +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 12 -- + Documentation/kernel-parameters.txt | 9 -- + security/selinux/hooks.c | 153 ++-------------------------- + security/selinux/selinuxfs.c | 68 ------------ + 4 files changed, 7 insertions(+), 235 deletions(-) +Merging quilt/ttydev +$ git merge quilt/ttydev +Merge made by recursive. +Merging agp/agp-next +$ git merge agp/agp-next +Already up-to-date. +Merging oprofile/auto-oprofile-next +$ git merge oprofile/auto-oprofile-next +Already uptodate! +Merge made by recursive. +Merging fastboot/auto-fastboot-next +$ git merge fastboot/auto-fastboot-next +Already up-to-date. +Merging sparseirq/auto-sparseirq-next +$ git merge sparseirq/auto-sparseirq-next +Auto-merged arch/alpha/kernel/irq.c +Auto-merged arch/arm/kernel/irq.c +Auto-merged arch/blackfin/kernel/irqchip.c +Auto-merged arch/ia64/kernel/irq.c +Auto-merged arch/parisc/kernel/irq.c +Auto-merged arch/powerpc/kernel/irq.c +Auto-merged arch/sparc/kernel/irq_64.c +Auto-merged arch/sparc/kernel/time_64.c +Auto-merged drivers/pci/intr_remapping.c +Auto-merged include/linux/irq.h +Auto-merged include/linux/irqnr.h +Auto-merged kernel/irq/handle.c +CONFLICT (content): Merge conflict in kernel/irq/handle.c +Resolved 'kernel/irq/handle.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 21ba5d8: Merge commit 'sparseirq/auto-sparseirq-next' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/kernel/irq.c | 2 +- + arch/alpha/kernel/irq_alpha.c | 2 +- + arch/arm/kernel/irq.c | 2 +- + arch/arm/mach-ns9xxx/irq.c | 3 +-- + arch/avr32/kernel/irq.c | 2 +- + arch/blackfin/kernel/irqchip.c | 2 +- + arch/cris/kernel/irq.c | 2 +- + arch/frv/kernel/irq.c | 2 +- + arch/h8300/kernel/irq.c | 4 ++-- + arch/ia64/kernel/irq.c | 2 +- + arch/m32r/kernel/irq.c | 2 +- + arch/mips/kernel/irq.c | 2 +- + arch/mn10300/kernel/irq.c | 2 +- + arch/parisc/kernel/irq.c | 2 +- + arch/powerpc/kernel/irq.c | 2 +- + arch/powerpc/platforms/cell/interrupt.c | 2 +- + arch/sh/kernel/irq.c | 2 +- + arch/sparc/kernel/irq_64.c | 2 +- + arch/sparc/kernel/time_64.c | 2 +- + arch/um/kernel/irq.c | 2 +- + arch/xtensa/kernel/irq.c | 2 +- + drivers/char/random.c | 6 +++++- + drivers/pci/intr_remapping.c | 2 +- + include/linux/irq.h | 10 +--------- + include/linux/irqnr.h | 8 ++++++-- + include/linux/kernel_stat.h | 13 ++++++++----- + kernel/irq/handle.c | 5 +++-- + 27 files changed, 46 insertions(+), 43 deletions(-) +Merging iommu/auto-iommu-next +$ git merge iommu/auto-iommu-next +Removed arch/ia64/dig/dig_vtd_iommu.c +Auto-merged arch/ia64/hp/common/sba_iommu.c +Auto-merged arch/ia64/kernel/Makefile +Auto-merged arch/x86/include/asm/dma-mapping.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/dma-mapping.h +Auto-merged arch/x86/kernel/Makefile +Auto-merged arch/x86/kernel/pci-gart_64.c +Auto-merged drivers/pci/intel-iommu.c +Resolved 'arch/x86/include/asm/dma-mapping.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit d803fdc: Merge commit 'iommu/auto-iommu-next' +$ git diff -M --stat --summary HEAD^.. + arch/ia64/dig/Makefile | 4 +- + arch/ia64/dig/dig_vtd_iommu.c | 59 ------ + arch/ia64/hp/common/hwsw_iommu.c | 165 ++--------------- + arch/ia64/hp/common/sba_iommu.c | 79 ++++++--- + arch/ia64/include/asm/dma-mapping.h | 194 +++++++++++--------- + arch/ia64/include/asm/machvec.h | 102 +--------- + arch/ia64/include/asm/machvec_dig_vtd.h | 20 -- + arch/ia64/include/asm/machvec_hpzx1.h | 23 +-- + arch/ia64/include/asm/machvec_hpzx1_swiotlb.h | 27 +--- + arch/ia64/include/asm/machvec_sn2.h | 27 +--- + arch/ia64/kernel/Makefile | 4 +- + arch/ia64/kernel/dma-mapping.c | 13 ++ + arch/ia64/kernel/machvec.c | 8 +- + arch/ia64/kernel/pci-dma.c | 52 +++-- + arch/ia64/kernel/pci-swiotlb.c | 20 ++- + arch/ia64/sn/pci/pci_dma.c | 99 ++++++----- + arch/x86/include/asm/device.h | 2 +- + arch/x86/include/asm/dma-mapping.h | 149 ++++++--------- + arch/x86/include/asm/iommu.h | 2 +- + arch/x86/kernel/Makefile | 2 +- + arch/x86/kernel/amd_iommu.c | 24 ++- + arch/x86/kernel/pci-calgary_64.c | 38 ++-- + arch/x86/kernel/pci-dma.c | 4 +- + arch/x86/kernel/pci-gart_64.c | 34 ++-- + arch/x86/kernel/pci-nommu.c | 21 +- + .../x86/kernel/{pci-swiotlb_64.c => pci-swiotlb.c} | 19 +-- + drivers/pci/intel-iommu.c | 31 +++- + include/linux/dma-mapping.h | 48 +++++ + include/linux/intel-iommu.h | 6 +- + include/linux/swiotlb.h | 41 ++--- + lib/swiotlb.c | 88 ++++----- + 31 files changed, 583 insertions(+), 822 deletions(-) + delete mode 100644 arch/ia64/dig/dig_vtd_iommu.c + create mode 100644 arch/ia64/kernel/dma-mapping.c + rename arch/x86/kernel/{pci-swiotlb_64.c => pci-swiotlb.c} (81%) +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Already up-to-date. +Merging watchdog/master +$ git merge watchdog/master +Auto-merged drivers/watchdog/Kconfig +Merge made by recursive. + drivers/watchdog/Kconfig | 2 +- + drivers/watchdog/cpwd.c | 20 +++++++------- + drivers/watchdog/davinci_wdt.c | 45 +++++++++++++++++-------------- + drivers/watchdog/iTCO_vendor_support.c | 32 ++++++++++++++++++++--- + drivers/watchdog/iTCO_wdt.c | 35 ++++++++++--------------- + drivers/watchdog/pcwd_usb.c | 4 +-- + drivers/watchdog/riowd.c | 15 +++++----- + drivers/watchdog/w83697ug_wdt.c | 21 ++++++++++---- + 8 files changed, 101 insertions(+), 73 deletions(-) +Merging proc/proc +$ git merge proc/proc +Auto-merged drivers/acpi/battery.c +Auto-merged drivers/acpi/sbs.c +Auto-merged drivers/acpi/video.c +Auto-merged drivers/input/input.c +Auto-merged drivers/net/bonding/bond_main.c +Auto-merged drivers/net/wireless/airo.c +Auto-merged drivers/platform/x86/asus_acpi.c +Auto-merged fs/nfs/client.c +Removed fs/proc/inode-alloc.txt +Auto-merged include/linux/magic.h +Auto-merged kernel/exit.c +Auto-merged security/selinux/hooks.c +CONFLICT (content): Merge conflict in security/selinux/hooks.c +Resolved 'security/selinux/hooks.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit fe37bf8: Merge commit 'proc/proc' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/procfs_example.c | 9 -- + arch/alpha/kernel/srm_env.c | 5 - + arch/blackfin/mm/sram-alloc.c | 1 - + arch/ia64/kernel/palinfo.c | 2 - + arch/ia64/sn/kernel/sn2/prominfo_proc.c | 9 +- + arch/powerpc/kernel/rtas_flash.c | 1 - + arch/x86/kernel/cpu/mtrr/if.c | 10 +-- + drivers/acpi/ac.c | 1 - + drivers/acpi/battery.c | 1 - + drivers/acpi/button.c | 3 - + drivers/acpi/fan.c | 2 - + drivers/acpi/processor_core.c | 2 - + drivers/acpi/sbs.c | 1 - + drivers/acpi/thermal.c | 2 - + drivers/acpi/video.c | 5 - + drivers/char/ipmi/ipmi_msghandler.c | 12 +- + drivers/char/ipmi/ipmi_si_intf.c | 6 +- + drivers/input/input.c | 2 - + drivers/isdn/hardware/eicon/divasi.c | 1 - + drivers/media/video/cpia.c | 4 +- + drivers/message/i2o/i2o_proc.c | 2 - + drivers/net/bonding/bond_main.c | 35 +----- + drivers/net/irda/vlsi_ir.c | 7 - + drivers/net/wireless/airo.c | 1 - + drivers/platform/x86/asus_acpi.c | 3 - + drivers/platform/x86/thinkpad_acpi.c | 2 - + drivers/platform/x86/toshiba_acpi.c | 3 - + drivers/rtc/rtc-proc.c | 10 +- + drivers/s390/block/dasd_proc.c | 2 - + drivers/scsi/scsi_devinfo.c | 2 - + drivers/scsi/scsi_proc.c | 3 - + drivers/video/via/viafbdev.c | 5 - + fs/afs/proc.c | 1 - + fs/cifs/cifs_debug.c | 1 - + fs/jfs/jfs_debug.c | 1 - + fs/nfs/client.c | 2 - + fs/proc/Makefile | 1 + + fs/proc/automount.c | 28 ++++ + fs/proc/base.c | 26 ++-- + fs/proc/generic.c | 110 +++++++++++---- + fs/proc/inode-alloc.txt | 14 -- + fs/proc/inode.c | 22 +--- + fs/proc/internal.h | 16 ++- + fs/proc/proc_net.c | 235 +++++++++++++++++++++++-------- + fs/proc/proc_tty.c | 1 - + fs/reiserfs/procfs.c | 5 +- + include/linux/ipmi_smi.h | 2 +- + include/linux/magic.h | 1 + + include/linux/proc_fs.h | 14 +-- + include/net/net_namespace.h | 1 + + kernel/exit.c | 2 +- + net/appletalk/atalk_proc.c | 1 - + net/atm/mpoa_proc.c | 1 - + net/atm/proc.c | 1 - + net/can/bcm.c | 4 - + net/can/proc.c | 2 - + net/core/pktgen.c | 1 - + net/irda/irproc.c | 1 - + net/llc/llc_proc.c | 1 - + net/sctp/protocol.c | 8 +- + net/sunrpc/cache.c | 4 - + net/sunrpc/stats.c | 10 +- + security/selinux/hooks.c | 29 +++- + sound/core/info.c | 31 +---- + 64 files changed, 375 insertions(+), 356 deletions(-) + create mode 100644 fs/proc/automount.c + delete mode 100644 fs/proc/inode-alloc.txt +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging cputime/cputime +$ git merge cputime/cputime +Already up-to-date. +Merging osd/linux-next +$ git merge osd/linux-next +Auto-merged MAINTAINERS +Auto-merged drivers/scsi/Kconfig +Auto-merged drivers/scsi/scsi_scan.c +Auto-merged fs/Kconfig +Auto-merged fs/Makefile +Auto-merged include/scsi/scsi.h +Merge made by recursive. + Documentation/filesystems/exofs.txt | 176 +++++++ + fs/Kconfig | 2 + + fs/Makefile | 1 + + fs/exofs/BUGS | 3 + + fs/exofs/Kbuild | 30 ++ + fs/exofs/Kconfig | 13 + + fs/exofs/common.h | 181 +++++++ + fs/exofs/dir.c | 643 ++++++++++++++++++++++++ + fs/exofs/exofs.h | 208 ++++++++ + fs/exofs/file.c | 82 +++ + fs/exofs/inode.c | 931 +++++++++++++++++++++++++++++++++++ + fs/exofs/namei.c | 338 +++++++++++++ + fs/exofs/osd.c | 230 +++++++++ + fs/exofs/super.c | 520 +++++++++++++++++++ + fs/exofs/symlink.c | 57 +++ + 15 files changed, 3415 insertions(+), 0 deletions(-) + create mode 100644 Documentation/filesystems/exofs.txt + create mode 100644 fs/exofs/BUGS + create mode 100644 fs/exofs/Kbuild + create mode 100644 fs/exofs/Kconfig + create mode 100644 fs/exofs/common.h + create mode 100644 fs/exofs/dir.c + create mode 100644 fs/exofs/exofs.h + create mode 100644 fs/exofs/file.c + create mode 100644 fs/exofs/inode.c + create mode 100644 fs/exofs/namei.c + create mode 100644 fs/exofs/osd.c + create mode 100644 fs/exofs/super.c + create mode 100644 fs/exofs/symlink.c +Merging fatfs/master +$ git merge fatfs/master +Already up-to-date. +Merging fuse/for-next +$ git merge fuse/for-next +Already up-to-date. +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Merge made by recursive. + Documentation/SubmittingPatches | 9 ++++++++- + 1 files changed, 8 insertions(+), 1 deletions(-) +Merging nommu/master +$ git merge nommu/master +Already up-to-date. +Merging trivial/for-next +$ git merge trivial/for-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/powerpc/Kconfig +Auto-merged arch/sh/Kconfig +Auto-merged arch/sparc/kernel/head_64.S +Auto-merged arch/x86/Kconfig +Auto-merged drivers/hid/Kconfig +Auto-merged drivers/leds/Kconfig +Auto-merged drivers/misc/Kconfig +Auto-merged drivers/net/sb1250-mac.c +Auto-merged drivers/net/tg3.c +Auto-merged drivers/net/wan/farsync.c +Auto-merged drivers/net/wireless/ipw2x00/ipw2200.c +Auto-merged drivers/net/wireless/iwlwifi/iwl-agn.c +Auto-merged drivers/net/wireless/iwlwifi/iwl3945-base.c +Auto-merged drivers/pci/pci.c +Auto-merged drivers/platform/x86/thinkpad_acpi.c +Auto-merged drivers/scsi/Kconfig +Auto-merged drivers/usb/gadget/Kconfig +Auto-merged init/Kconfig +Auto-merged kernel/trace/Kconfig +Auto-merged kernel/trace/ftrace.c +Auto-merged net/Kconfig +Auto-merged sound/sh/aica.c +Merge made by recursive. + CREDITS | 4 ++-- + Documentation/00-INDEX | 4 ++-- + Documentation/cgroups/00-INDEX | 18 ++++++++++++++++++ + Documentation/cgroups/cgroups.txt | 10 +++++----- + Documentation/cgroups/cpusets.txt | 12 ++++++------ + Documentation/cgroups/devices.txt | 2 +- + Documentation/cgroups/memcg_test.txt | 2 +- + Documentation/cgroups/memory.txt | 2 +- + Documentation/filesystems/ext3.txt | 14 ++++++++++++-- + Documentation/ia64/kvm.txt | 2 +- + Documentation/kernel-parameters.txt | 4 ++-- + .../dts-bindings/fsl/cpm_qe/qe/firmware.txt | 2 +- + Documentation/scheduler/sched-rt-group.txt | 2 +- + Documentation/vm/numa_memory_policy.txt | 3 ++- + Documentation/vm/page_migration | 3 ++- + Documentation/x86/x86_64/fake-numa-for-cpusets | 5 +++-- + arch/arm/mach-netx/include/mach/netx-regs.h | 2 +- + arch/arm/mach-omap1/Kconfig | 2 +- + arch/avr32/Kconfig | 6 +++--- + arch/blackfin/Kconfig | 6 +++--- + arch/cris/Kconfig | 6 +++--- + arch/cris/arch-v32/Kconfig | 2 +- + arch/cris/arch-v32/drivers/Kconfig | 2 +- + arch/cris/arch-v32/mach-fs/Kconfig | 2 +- + arch/mips/Kconfig | 2 +- + arch/mips/sgi-ip27/ip27-smp.c | 2 +- + arch/powerpc/Kconfig | 2 +- + arch/powerpc/platforms/Kconfig | 2 +- + arch/powerpc/sysdev/bestcomm/Kconfig | 4 ++-- + arch/sh/Kconfig | 4 ++-- + arch/sparc/kernel/head_64.S | 2 +- + arch/x86/Kconfig | 4 ++-- + drivers/ata/Kconfig | 2 +- + drivers/base/sys.c | 2 +- + drivers/gpio/Kconfig | 6 +++--- + drivers/hid/Kconfig | 2 +- + drivers/input/Kconfig | 2 +- + drivers/input/mouse/gpio_mouse.c | 2 +- + drivers/isdn/mISDN/Kconfig | 10 ++++++---- + drivers/isdn/mISDN/l1oip_codec.c | 2 +- + drivers/leds/Kconfig | 6 +++--- + drivers/media/common/tuners/Kconfig | 2 +- + drivers/media/dvb/frontends/Kconfig | 2 +- + drivers/mfd/Kconfig | 2 +- + drivers/misc/Kconfig | 6 +++--- + drivers/mmc/host/Kconfig | 2 +- + drivers/mtd/nand/diskonchip.c | 2 +- + drivers/net/sb1250-mac.c | 2 +- + drivers/net/skfp/h/hwmtm.h | 2 +- + drivers/net/tg3.c | 2 +- + drivers/net/wan/farsync.c | 2 +- + drivers/net/wireless/ipw2x00/ipw2100.c | 2 +- + drivers/net/wireless/ipw2x00/ipw2200.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 2 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 +- + drivers/net/wireless/libertas/cmd.c | 2 +- + drivers/pci/pci.c | 2 +- + drivers/platform/x86/thinkpad_acpi.c | 2 +- + drivers/scsi/Kconfig | 4 ++-- + drivers/serial/Kconfig | 2 +- + drivers/staging/Kconfig | 4 ++-- + drivers/staging/comedi/Kconfig | 4 ++-- + drivers/staging/go7007/Kconfig | 4 ++-- + drivers/staging/otus/hal/hpmain.c | 2 +- + drivers/staging/panel/Kconfig | 2 +- + drivers/usb/atm/ueagle-atm.c | 2 +- + drivers/usb/gadget/Kconfig | 2 +- + drivers/usb/serial/ChangeLog.history | 2 +- + drivers/usb/serial/Kconfig | 4 ++-- + drivers/usb/wusbcore/security.c | 2 +- + drivers/uwb/Kconfig | 4 ++-- + drivers/xen/Kconfig | 2 +- + fs/bio.c | 3 +-- + fs/ext4/Kconfig | 2 +- + fs/proc/nommu.c | 2 +- + fs/ubifs/Kconfig | 4 ++-- + include/linux/cgroup.h | 5 ++++- + include/linux/libata.h | 2 +- + include/linux/pwm.h | 2 +- + init/Kconfig | 8 ++++---- + kernel/power/disk.c | 4 ++-- + kernel/trace/Kconfig | 9 ++++----- + mm/page_alloc.c | 2 +- + net/Kconfig | 2 +- + net/ipv6/Kconfig | 18 +++++++++--------- + net/mac80211/Kconfig | 2 +- + net/netfilter/Kconfig | 2 +- + net/phonet/Kconfig | 2 +- + net/sunrpc/Kconfig | 2 +- + net/wimax/Kconfig | 2 +- + sound/oss/pss.c | 2 +- + sound/sh/aica.c | 2 +- + sound/soc/blackfin/Kconfig | 2 +- + 93 files changed, 182 insertions(+), 148 deletions(-) + create mode 100644 Documentation/cgroups/00-INDEX +Merging audit/for-next +$ git merge audit/for-next +Merge made by recursive. + include/linux/hugetlb.h | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) +Merging squashfs/master +$ git merge squashfs/master +Auto-merged fs/squashfs/super.c +Merge made by recursive. + fs/squashfs/block.c | 12 ++++++++++-- + fs/squashfs/cache.c | 4 ++-- + fs/squashfs/squashfs.h | 2 +- + fs/squashfs/super.c | 2 +- + 4 files changed, 14 insertions(+), 6 deletions(-) +Merging omap/for-next +$ git merge omap/for-next +Auto-merged arch/arm/mach-omap1/devices.c +Auto-merged arch/arm/mach-omap2/devices.c +Removed arch/arm/plat-omap/mailbox.h +Merge made by recursive. + arch/arm/mach-omap1/devices.c | 2 +- + arch/arm/mach-omap1/mailbox.c | 29 ++-- + arch/arm/mach-omap2/devices.c | 39 +++++-- + arch/arm/mach-omap2/mailbox.c | 195 ++++++++++++++++------------ + arch/arm/plat-omap/Kconfig | 8 + + arch/arm/plat-omap/include/mach/mailbox.h | 27 ++++- + arch/arm/plat-omap/include/mach/omap34xx.h | 1 + + arch/arm/plat-omap/mailbox.c | 152 ++++++++++++++++------ + arch/arm/plat-omap/mailbox.h | 100 -------------- + 9 files changed, 307 insertions(+), 246 deletions(-) + delete mode 100644 arch/arm/plat-omap/mailbox.h +Merging quilt/aoe +$ git merge quilt/aoe +Already up-to-date. +Merging kmemleak/kmemleak +$ git merge kmemleak/kmemleak +Auto-merged Documentation/kernel-parameters.txt +Auto-merged MAINTAINERS +Auto-merged arch/arm/kernel/vmlinux.lds.S +Auto-merged arch/x86/kernel/vmlinux_32.lds.S +Auto-merged arch/x86/kernel/vmlinux_64.lds.S +Auto-merged include/linux/percpu.h +Auto-merged include/linux/slab.h +CONFLICT (content): Merge conflict in include/linux/slab.h +Auto-merged init/main.c +CONFLICT (content): Merge conflict in init/main.c +Auto-merged kernel/module.c +Auto-merged lib/Kconfig.debug +CONFLICT (content): Merge conflict in lib/Kconfig.debug +Auto-merged mm/Makefile +Auto-merged mm/page_alloc.c +Auto-merged mm/slab.c +CONFLICT (content): Merge conflict in mm/slab.c +Auto-merged mm/slob.c +CONFLICT (content): Merge conflict in mm/slob.c +Auto-merged mm/slub.c +CONFLICT (content): Merge conflict in mm/slub.c +Resolved 'include/linux/slab.h' using previous resolution. +Resolved 'init/main.c' using previous resolution. +Resolved 'lib/Kconfig.debug' using previous resolution. +Resolved 'mm/slab.c' using previous resolution. +Resolved 'mm/slob.c' using previous resolution. +Resolved 'mm/slub.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit ffc197f: Merge commit 'kmemleak/kmemleak' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 4 + + Documentation/kmemleak.txt | 142 ++++ + MAINTAINERS | 6 + + arch/arm/kernel/vmlinux.lds.S | 2 + + arch/x86/kernel/vmlinux_32.lds.S | 1 + + arch/x86/kernel/vmlinux_64.lds.S | 1 + + drivers/char/vt.c | 7 + + include/linux/kmemleak.h | 96 +++ + include/linux/percpu.h | 5 + + include/linux/slab.h | 2 + + init/main.c | 4 +- + kernel/module.c | 56 ++ + lib/Kconfig.debug | 33 + + mm/Makefile | 2 + + mm/kmemleak-test.c | 111 +++ + mm/kmemleak.c | 1467 +++++++++++++++++++++++++++++++++++ + mm/page_alloc.c | 11 + + mm/slab.c | 32 +- + mm/slob.c | 7 + + mm/slub.c | 5 +- + mm/vmalloc.c | 30 +- + 21 files changed, 2017 insertions(+), 7 deletions(-) + create mode 100644 Documentation/kmemleak.txt + create mode 100644 include/linux/kmemleak.h + create mode 100644 mm/kmemleak-test.c + create mode 100644 mm/kmemleak.c +Merging quilt/staging +$ git merge quilt/staging +Auto-merged drivers/staging/Kconfig +Removed drivers/staging/frontier/frontier_compat.h +Removed drivers/staging/frontier/surface_sysfs.h +Removed drivers/staging/slicoss/gbdownload.h +Removed drivers/staging/slicoss/gbrcvucode.h +Removed drivers/staging/slicoss/oasisdbgdownload.h +Removed drivers/staging/slicoss/oasisdownload.h +Removed drivers/staging/slicoss/oasisrcvucode.h +Removed drivers/staging/sxg/saharadbgdownload.h +Removed drivers/staging/winbond/bss_f.h +Removed drivers/staging/winbond/common.h +Removed drivers/staging/winbond/ioctls.h +Removed drivers/staging/winbond/mlme_mib.h +Removed drivers/staging/winbond/mto_f.h +Removed drivers/staging/winbond/os_common.h +Removed drivers/staging/winbond/sme_s.h +Removed drivers/staging/winbond/wb35_ver.h +Removed drivers/staging/wlan-ng/p80211metamib.h +Removed drivers/staging/wlan-ng/p80211metamsg.h +Auto-merged firmware/Makefile +Auto-merged firmware/WHENCE +Auto-merged include/linux/connector.h +Merge made by recursive. + drivers/staging/Kconfig | 8 + + drivers/staging/Makefile | 4 + + drivers/staging/agnx/pci.c | 3 +- + drivers/staging/agnx/rf.c | 2 +- + drivers/staging/altpciechdma/altpciechdma.c | 4 +- + drivers/staging/asus_oled/asus_oled.c | 149 +- + drivers/staging/at76_usb/TODO | 9 +- + drivers/staging/b3dfg/Kconfig | 9 + + drivers/staging/b3dfg/Makefile | 1 + + drivers/staging/b3dfg/TODO | 4 + + drivers/staging/b3dfg/b3dfg.c | 1119 ++++ + drivers/staging/benet/be_int.c | 4 +- + drivers/staging/comedi/comedidev.h | 1 - + drivers/staging/comedi/drivers/me4000.c | 2 +- + drivers/staging/comedi/drivers/usbdux.c | 6 +- + drivers/staging/comedi/drivers/usbduxfast.c | 14 +- + drivers/staging/comedi/rt_pend_tq.c | 2 +- + drivers/staging/dst/Kconfig | 67 + + drivers/staging/dst/Makefile | 3 + + drivers/staging/dst/crypto.c | 731 +++ + drivers/staging/dst/dcore.c | 995 ++++ + drivers/staging/dst/export.c | 657 +++ + drivers/staging/dst/state.c | 839 +++ + drivers/staging/dst/thread_pool.c | 345 ++ + drivers/staging/dst/trans.c | 335 ++ + drivers/staging/frontier/README | 53 +- + drivers/staging/frontier/alphatrack.c | 383 +- + drivers/staging/frontier/alphatrack.h | 80 +- + drivers/staging/frontier/frontier_compat.h | 63 - + drivers/staging/frontier/surface_sysfs.h | 100 - + drivers/staging/frontier/tranzport.c | 685 ++-- + drivers/staging/go7007/s2250-board.c | 7 +- + drivers/staging/me4000/me4000.c | 193 +- + drivers/staging/meilhaus/me1600_ao.c | 4 +- + drivers/staging/meilhaus/me4600_ao.c | 2 +- + drivers/staging/meilhaus/me6000_ao.c | 11 +- + drivers/staging/meilhaus/memain.c | 2 +- + drivers/staging/otus/80211core/cwm.c | 6 +- + drivers/staging/otus/usbdrv.c | 12 +- + drivers/staging/rspiusb/rspiusb.c | 5 +- + drivers/staging/rt2860/2860_main_dev.c | 43 +- + drivers/staging/rt2860/rt2860.h | 18 - + drivers/staging/rt2860/rt_linux.c | 23 +- + drivers/staging/rt2860/rt_linux.h | 20 - + drivers/staging/rt2860/rt_main_dev.c | 107 +- + drivers/staging/rt2860/sta_ioctl.c | 12 +- + drivers/staging/rt2870/rt_linux.h | 1 - + drivers/staging/rt2870/sta_ioctl.c | 2 +- + drivers/staging/slicoss/gbdownload.h | 8215 --------------------------- + drivers/staging/slicoss/gbrcvucode.h | 238 - + drivers/staging/slicoss/oasisdbgdownload.h | 6850 ---------------------- + drivers/staging/slicoss/oasisdownload.h | 6848 ---------------------- + drivers/staging/slicoss/oasisrcvucode.h | 205 - + drivers/staging/slicoss/slic.h | 20 - + drivers/staging/slicoss/slicoss.c | 170 +- + drivers/staging/stlc45xx/Kconfig | 8 + + drivers/staging/stlc45xx/Makefile | 1 + + drivers/staging/stlc45xx/stlc45xx.c | 2606 +++++++++ + drivers/staging/stlc45xx/stlc45xx.h | 283 + + drivers/staging/stlc45xx/stlc45xx_lmac.h | 434 ++ + drivers/staging/sxg/Makefile | 4 +- + drivers/staging/sxg/saharadbgdownload.c | 5124 +++++++++++++++++ + drivers/staging/sxg/saharadbgdownload.h | 4854 ---------------- + drivers/staging/sxg/saharadbgdownloadB.c | 16 + + drivers/staging/sxg/saharadownload.c | 4446 +++++++++++++++ + drivers/staging/sxg/saharadownloadB.c | 16 + + drivers/staging/sxg/sxg.c | 2561 ++++++--- + drivers/staging/sxg/sxg.h | 913 ++-- + drivers/staging/sxg/sxg_ethtool.c | 327 ++ + drivers/staging/sxg/sxg_os.h | 100 +- + drivers/staging/sxg/sxgdbg.h | 129 +- + drivers/staging/sxg/sxghif.h | 1103 ++-- + drivers/staging/sxg/sxghw.h | 1550 +++--- + drivers/staging/sxg/sxgphycode.h | 14 +- + drivers/staging/uc2322/Kconfig | 10 + + drivers/staging/uc2322/Makefile | 1 + + drivers/staging/uc2322/TODO | 7 + + drivers/staging/uc2322/aten2011.c | 2452 ++++++++ + drivers/staging/usbip/stub_rx.c | 4 +- + drivers/staging/winbond/bss_f.h | 63 - + drivers/staging/winbond/common.h | 27 - + drivers/staging/winbond/core.h | 4 +- + drivers/staging/winbond/ioctls.h | 678 --- + drivers/staging/winbond/mds.c | 16 +- + drivers/staging/winbond/mlme_mib.h | 84 - + drivers/staging/winbond/mlmetxrx.c | 2 +- + drivers/staging/winbond/mto.c | 23 +- + drivers/staging/winbond/mto.h | 11 +- + drivers/staging/winbond/mto_f.h | 13 - + drivers/staging/winbond/os_common.h | 2 - + drivers/staging/winbond/phy_calibration.c | 28 +- + drivers/staging/winbond/phy_calibration.h | 2 +- + drivers/staging/winbond/reg.c | 81 +- + drivers/staging/winbond/sme_api.h | 3 - + drivers/staging/winbond/sme_s.h | 236 - + drivers/staging/winbond/wb35_ver.h | 30 - + drivers/staging/winbond/wb35reg.c | 41 +- + drivers/staging/winbond/wb35reg_f.h | 70 +- + drivers/staging/winbond/wb35rx.c | 43 +- + drivers/staging/winbond/wb35rx_f.h | 6 +- + drivers/staging/winbond/wb35rx_s.h | 8 +- + drivers/staging/winbond/wb35tx.c | 54 +- + drivers/staging/winbond/wb35tx_f.h | 8 +- + drivers/staging/winbond/wb35tx_s.h | 6 +- + drivers/staging/winbond/wbhal.c | 50 +- + drivers/staging/winbond/wbhal_f.h | 94 +- + drivers/staging/winbond/wbhal_s.h | 87 +- + drivers/staging/winbond/wbusb.c | 40 +- + drivers/staging/winbond/wbusb_s.h | 16 +- + drivers/staging/wlan-ng/hfa384x.h | 2629 ++------- + drivers/staging/wlan-ng/hfa384x_usb.c | 2181 +++----- + drivers/staging/wlan-ng/p80211conv.c | 375 +- + drivers/staging/wlan-ng/p80211conv.h | 131 +- + drivers/staging/wlan-ng/p80211hdr.h | 143 +- + drivers/staging/wlan-ng/p80211ioctl.h | 46 +- + drivers/staging/wlan-ng/p80211meta.h | 107 +- + drivers/staging/wlan-ng/p80211metadef.h | 544 -- + drivers/staging/wlan-ng/p80211metamib.h | 105 - + drivers/staging/wlan-ng/p80211metamsg.h | 105 - + drivers/staging/wlan-ng/p80211metastruct.h | 424 +- + drivers/staging/wlan-ng/p80211mgmt.h | 438 +- + drivers/staging/wlan-ng/p80211msg.h | 45 +- + drivers/staging/wlan-ng/p80211netdev.c | 392 +- + drivers/staging/wlan-ng/p80211netdev.h | 214 +- + drivers/staging/wlan-ng/p80211req.c | 233 +- + drivers/staging/wlan-ng/p80211req.h | 17 +- + drivers/staging/wlan-ng/p80211types.h | 502 +-- + drivers/staging/wlan-ng/p80211wep.c | 22 +- + drivers/staging/wlan-ng/p80211wext.c | 1212 ++-- + drivers/staging/wlan-ng/prism2mgmt.c | 875 ++-- + drivers/staging/wlan-ng/prism2mgmt.h | 63 +- + drivers/staging/wlan-ng/prism2mib.c | 790 ++-- + drivers/staging/wlan-ng/prism2sta.c | 1448 +++--- + drivers/staging/wlan-ng/prism2usb.c | 159 +- + drivers/staging/wlan-ng/wlan_compat.h | 142 - + firmware/Makefile | 4 + + firmware/WHENCE | 14 + + firmware/slicoss/gbdownload.sys.ihex | 6148 ++++++++++++++++++++ + firmware/slicoss/gbrcvucode.sys.ihex | 162 + + firmware/slicoss/oasisdbgdownload.sys.ihex | 5124 +++++++++++++++++ + firmware/slicoss/oasisdownload.sys.ihex | 5124 +++++++++++++++++ + firmware/slicoss/oasisrcvucode.sys.ihex | 162 + + include/linux/connector.h | 4 +- + include/linux/dst.h | 587 ++ + 144 files changed, 47845 insertions(+), 41306 deletions(-) + create mode 100644 drivers/staging/b3dfg/Kconfig + create mode 100644 drivers/staging/b3dfg/Makefile + create mode 100644 drivers/staging/b3dfg/TODO + create mode 100644 drivers/staging/b3dfg/b3dfg.c + create mode 100644 drivers/staging/dst/Kconfig + create mode 100644 drivers/staging/dst/Makefile + create mode 100644 drivers/staging/dst/crypto.c + create mode 100644 drivers/staging/dst/dcore.c + create mode 100644 drivers/staging/dst/export.c + create mode 100644 drivers/staging/dst/state.c + create mode 100644 drivers/staging/dst/thread_pool.c + create mode 100644 drivers/staging/dst/trans.c + delete mode 100644 drivers/staging/frontier/frontier_compat.h + delete mode 100644 drivers/staging/frontier/surface_sysfs.h + delete mode 100644 drivers/staging/slicoss/gbdownload.h + delete mode 100644 drivers/staging/slicoss/gbrcvucode.h + delete mode 100644 drivers/staging/slicoss/oasisdbgdownload.h + delete mode 100644 drivers/staging/slicoss/oasisdownload.h + delete mode 100644 drivers/staging/slicoss/oasisrcvucode.h + create mode 100644 drivers/staging/stlc45xx/Kconfig + create mode 100644 drivers/staging/stlc45xx/Makefile + create mode 100644 drivers/staging/stlc45xx/stlc45xx.c + create mode 100644 drivers/staging/stlc45xx/stlc45xx.h + create mode 100644 drivers/staging/stlc45xx/stlc45xx_lmac.h + create mode 100644 drivers/staging/sxg/saharadbgdownload.c + delete mode 100644 drivers/staging/sxg/saharadbgdownload.h + create mode 100644 drivers/staging/sxg/saharadbgdownloadB.c + create mode 100644 drivers/staging/sxg/saharadownload.c + create mode 100644 drivers/staging/sxg/saharadownloadB.c + create mode 100644 drivers/staging/sxg/sxg_ethtool.c + create mode 100644 drivers/staging/uc2322/Kconfig + create mode 100644 drivers/staging/uc2322/Makefile + create mode 100644 drivers/staging/uc2322/TODO + create mode 100644 drivers/staging/uc2322/aten2011.c + delete mode 100644 drivers/staging/winbond/bss_f.h + delete mode 100644 drivers/staging/winbond/common.h + delete mode 100644 drivers/staging/winbond/ioctls.h + delete mode 100644 drivers/staging/winbond/mlme_mib.h + delete mode 100644 drivers/staging/winbond/mto_f.h + delete mode 100644 drivers/staging/winbond/os_common.h + delete mode 100644 drivers/staging/winbond/sme_s.h + delete mode 100644 drivers/staging/winbond/wb35_ver.h + delete mode 100644 drivers/staging/wlan-ng/p80211metamib.h + delete mode 100644 drivers/staging/wlan-ng/p80211metamsg.h + create mode 100644 firmware/slicoss/gbdownload.sys.ihex + create mode 100644 firmware/slicoss/gbrcvucode.sys.ihex + create mode 100644 firmware/slicoss/oasisdbgdownload.sys.ihex + create mode 100644 firmware/slicoss/oasisdownload.sys.ihex + create mode 100644 firmware/slicoss/oasisrcvucode.sys.ihex + create mode 100644 include/linux/dst.h +Merging scsi-post-merge/master +$ git merge scsi-post-merge/master +Already up-to-date. diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..c7aff943206c --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,131 @@ +Unchanged quilt series driver-core.current +Unchanged quilt series usb.current +Unchanged quilt series driver-core +Unchanged quilt series usb +Unchanged quilt series device-mapper +Unchanged quilt series i2c +Unchanged quilt series jdelvare-hwmon +Unchanged quilt series kernel-doc +Importing ide based on eda58a85ec3fc05855a26654d97a2b53f0e715b9 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard eda58a85ec3fc05855a26654d97a2b53f0e715b9 +HEAD is now at eda58a8 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6 +$ git quiltimport --author Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> --patches ../quilt/ide +ide-fix-ide_dflag_no_io_32bit-handling.patch +ide-move-ide_pktcmd_tf_load-to-ide-atapi-c.patch +ide-no-need-to-touch-local-irqs-in-ide_probe_port.patch +ide-move-lock-and-timer-init-from-init_irq-to-ide_init_port_data.patch +ide-init_irq-doesnt-need-to-hold-ide_cfg_mtx.patch +ide-remove-superfluous-check-from-ide_proc_port_register_devices.patch +ide-acpi-no-need-to-zero-acpidata-for-devices.patch +ide-acpi-init-acpi-handles-early-for-devices.patch +ide-add-ide_for_each_present_dev-iterator.patch +ide-sanitize-acpi-initialization.patch +ide-acpi-cleanup-do_drive_get_gtf.patch +ide-acpi-cleanup-do_drive_set_taskfiles.patch +ide-acpi-remove-taskfile_load_raw.patch +Context reduced to (2/2) to apply fragment at 21 +ide-remove-stale-comments-from-drive_is_ready.patch +ide-unexport-ide_devset_execute.patch +ide-move-drive_is_ready-to-ide-io-c.patch +ide-move-ide_dma_timeout_retry-to-ide-dma-c.patch +ide-remove-ide_do_drive_cmd.patch +ide-factor-out-processing-of-special-commands-from-ide_special_rq.patch +ide-move-ide_do_park_unpark-to-ide-park-c.patch +ide-move-device-settings-code-to-ide-devsets-c.patch +ide-move-xfer-mode-tuning-to-ide-xfer-mode-c.patch +ide-move-ide_read_bcount_and_ireason-to-ide-atapi-c.patch +ide-move-standard-io-code-to-ide-io-std-c.patch +ide-fix-printk-levels-in-atapi_-reset_pollfunc.patch +ide-fix-comments-in-ide_config_drive_speed.patch +ide-checkpatch-pl-fixes-for-ide-iops-c.patch +ide-move-error-handling-code-to-ide-eh-c-v2.patch +mn10300-add-pci_get_legacy_ide_irq-to-asm-pci-h.patch +amd74xx-use-ide_pci_is_in_compatibility_mode.patch +ns87415-use-pci_get_legacy_ide_irq.patch +ns87415-small-init_hwif-cleanup.patch +trm290-small-init_hwif-cleanup.patch +ide-handle-ide_hflag_-force-_legacy_irqs-in-ide_pci_init_-one-two-.patch +ide-use-pci_get_legacy_ide_irq-in-ide_pci_init_-one-two-.patch +ide-use-ide_pci_is_in_compatibility_mode-in-ide_pci_init_-one-two-.patch +ide-remove-no-longer-needed-ide_hflag_-force-_legacy_irqs.patch +amd74xx-remove-no-longer-needed-init_hwif-method.patch +ide-remove-no-longer-needed-irq-fallback-code-from-hwif_init.patch +ide-remove-no-longer-needed-irq-auto-probing-from-try_to_identify-v2.patch +ide-remove-try_to_identify-wrapper.patch +ide-fix-init_chipset-method-to-return-int.patch +ide-remove-pciirq-argument-from-ide_pci_setup_ports.patch +frv-remove-asm-ide-h.patch +mn10300-remove-asm-ide-h.patch +ide-fix-kmalloc-failure-handling-in-ide_driveid_update.patch +ide-propagate-altstatus-workarounds-to-ide_driveid_update.patch +ide-shorten-timeout-value-in-ide_driveid_update.patch +ide-remove-broken-exabytenest-support.patch +ide-classify-device-type-in-do_probe.patch +ide-sanitize-select_mask-usage-in-ide_driveid_update.patch +ide-clear-drive-irq-after-re-enabling-local-irqs-in-ide_driveid_update.patch +ide-use-try_to_identify-in-ide_driveid_update.patch +icside-use-struct-ide_port_info-also-for-pcb-version-5.patch +ide_arm-use-struct-ide_port_info.patch +ide-generic-use-struct-ide_port_info.patch +ide-pnp-use-struct-ide_port_info.patch +buddha-use-struct-ide_port_info.patch +macide-use-struct-ide_port_info.patch +ide-move-rqsize-init-from-init_irq-to-ide_init_port.patch +ide-improve-debugging-scheme.patch +ide-remove-ide_arch_intr-v2.patch +ide-remove-ide_arch_lock-v2.patch +ide-make-m68k-host-drivers-use-ide_hflag_mmio.patch +m68k-cleanup-asm-ide-h.patch +ide-palm_bk3710-use-ioremap-instead-of-arch-specific-io_address.patch +ide-cd-use-ide_drive_t-s-rq-in-cdrom_queue_request_sense.patch +ide-include-asm-ide-h-only-when-needed.patch +scc_pata-remove-declare_scc_dev-macro-v2.patch +ide-fix-memleak-on-failure-in-probe_for_drive.patch +ide-fix-error-message-in-pre_task_out_intr.patch +ide-allow-host-drivers-to-specify-irq-flags.patch +ide-remove-now-superfluous-check-from-ide_host_register.patch +ide-add-ide_hflag_dtc2278-host-flag.patch +ide-add-ide_hflag_4drives-host-flag.patch +ide-add-flagged_tf_flags-to-struct-ide_taskfile-v2.patch +ide-complete-power-step-in-ide_complete_pm_request.patch +ide-factor-out-completion-of-taskfile-from-ide_end_drive_cmd.patch +ide-move-request-type-specific-code-from-ide_end_drive_cmd-to-the-callers-v3.patch +ide-no-need-to-read-status-and-error-registers-for-empty-taskfile-requests.patch +ide-remove-data_phase-field-from-ide_hwif_t.patch +ide-move-smart_enable-call-out-from-get_smart_data.patch +icside-icside_dma_setup-fixes.patch +trm290-trm290_dma_setup-fix.patch +au1xxx-ide-auide_dma_end-cleanup.patch +ide-remove-no-longer-needed-pc_flag_timedout-packet-command-flag.patch +ide-floppy-remove-stale-check-from-ide_floppy_end_request.patch +ide-tape-remove-superfluous-tape-lock.patch +ide-move-failed_pc-to-ide_drive_t.patch +ide-use-end_request-only-for-private-device-driver-requests.patch +ide-floppy-tape-cleanup-ide-_end_request.patch +ide-remove-end_request-method.patch +ide-return-request-status-from-pc_callback-method.patch +ide-use-blk_fs_request-check-in-ide-taskfile-c.patch +ide-call-ide_build_sglist-prior-to-dma_setup-v2.patch +ide-remove-ide_task_t-typedef.patch +ide-pass-command-instead-of-request-to-ide_pio_datablock.patch +ide-move-command-related-fields-from-ide_hwif_t-to-struct-ide_cmd.patch +ide-set-ide_tflag_write-basing-on-data-phase-used-in-ide_taskfile_ioctl.patch +ide-use-ata_tf_protocols-enums.patch +ide-merge-task_in-out_intr.patch +ide-inline-task_in_unexpected-into-task_pio_intr.patch +ide-unify-exit-paths-in-task_pio_intr.patch +ide-task_error-to-ide_error_cmd.patch +ide-use-ide_complete_cmd-for-head-unload-commands.patch +ide-use-ide_complete_cmd-for-req_unpark_heads.patch +ide-sanitize-ide_finish_cmd.patch +ide-ide-c-clear-fix-ide-nodma-documentation.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/ide +From ../quilt-tmp + + 8379cb9...15f10c4 master -> quilt/ide (forced update) +Unchanged quilt series rr +Unchanged quilt series ttydev +Unchanged quilt series aoe +Unchanged quilt series staging diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..511b938dc472 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20090211 |