diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-11-13 18:17:47 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-11-13 18:17:47 +1100 |
| commit | f2a5e7b852249de91c0602f8f6181b6ceed6aed4 (patch) | |
| tree | e54bfc9a2fa8c56e390b81a49eabdb458c256a7d | |
| parent | 8320a39359204422cf67864cd8c0dda96fce5e2f (diff) | |
Add linux-next specific files for 20081113next-20081113
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 127 | ||||
| -rw-r--r-- | Next/Trees | 129 | ||||
| -rw-r--r-- | Next/merge.log | 3883 | ||||
| -rw-r--r-- | Next/quilt-import.log | 181 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 4321 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..b6605f518697 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,127 @@ +Name SHA1 +---- ---- +origin 3edac25f2e8ac8c2a84904c140e1aeb434e73e75 +powerpc-merge cb8fdc69a2a80e81e1280ec58afd2c3217ac8a7f +scsi-rc-fixes 03bdb85b284390d4da73d5437c03d376e41d4acb +net-current d809a1595610a7c0b0bd55f159e5dc37def0ac28 +sparc-current 12de512ae1d6d150f95b7157cb3293ef7545676d +sound-current 24924f884cd36603615ea5496244e542b0b513c6 +arm-current ebb4c65869db7213280ad9c510637683939b5ff8 +pci-current 2485b8674bf5762822e14e1554938e36511c0ae4 +wireless-current f7cd168645dda3e9067f24fabbfa787f9a237488 +kbuild-current bf1b36445dc868cbbde194aa1dd87e38fe24cf16 +driver-core.current 8a1dd158b19063c7ce266d8c234d6be4a805bf12 +usb.current 1c042b24e4bf0deec00281bb153a70327187343e +cpufreq-current 8d5922572038bae9f7b16fcb974eee806727b44c +input-current 734f0bae9504216bd760493ed4744a34cfe0e7ce +md-current 7a1fc53c5adb910751a9b212af90302eb4ffb527 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +arm ae91312e4e71aa2fcf01001c652e96845e500e17 +avr32 105462632c37ea5484ebae7db6e85e0aaac28f4b +blackfin 1390da4ee75168b6e4d8354e93e3b5f0a0291f2f +cris 0db42c6b23ce26b05b235dbe2e0aa096db194e33 +ia64 f21f237cf55494c3a4209de323281a3b0528da10 +m68k 493aabe038a71c5689bb55d8815dba33ac79908b +m68knommu 7680a920c75b242adaedf3d93b7f6d253db56792 +mips d3a47e82b6bc3724dd60f3ee4e84fe4479104382 +parisc 81e192d6ce303b6792aa38ff35f41a1a7357f23a +powerpc 486936cd93e99c802153b3f2f629c5ce62b8c0d4 +4xx 1c1b777a5673b57a6c0377ba60a790d05e4a0676 +galak 6965901cbc32112588c1bfb582a028b28663fbed +pxa 125f2537ba5c152e8f63acac0e0f54a6619e5e4a +s390 e09288d257bf23dab2f3dcc46b4fde03af54bab6 +sh 11ebca4a3f8337de2f4d1300bd307851d1191d53 +sparc 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 +x86 dc7428d62c9acc2fea596f3d10920b03203d3035 +xtensa 91a15026eb89a687dfcac860a969cfd872f3c94f +driver-core 4fa10e37aaad5012ff946f833d8efaf61c422445 +usb 6ae22e2c3983091431d99afefe0aa7e4d719ab12 +tip-core 968f901b6454db3a0f8a291cbbf43a9340adb693 +cpus4096 2d3854a37e8b767a51aba38ed6d22817b0631e33 +ftrace 802f925557dc77bb6a25fd7691798e872e0e9a62 +genirq f537deb59570ed1594db086a43c9bd945d46316f +safe-poison-pointers d7c26f1cdc477e9fff7ecf88d8dcf87acd816886 +sched 1a5b05461f043ac46183240aa031b17dad982314 +stackprotector 5cdd5018777d0bb415f04a88b915d0b7421b83f2 +timers 2214d8b3e83597b2191f1e09083eb422102f4dfb +pci 183fe1d40536b25a4285596b9cd3b5d7026a417a +device-mapper ad85ed16338d360c20309c545160407e7616c94f +hid 6db5581a9f06d1fe748bc8166277a1d9a8366aa4 +i2c 319c56497cf481bfdf9b3c4203fc45189a8018b7 +jdelvare-hwmon 700ff08f7646f2afc49101da5bca99444b139337 +kernel-doc 7591103c08abade60aeddb432ed0686ddd0de1c6 +v4l-dvb c55c3a3cdbd1f469d1a644d3a6e4afc40927d74f +jfs ec1aef33668448718fcba79e4e981592bfd7e0a3 +kbuild 56b2f0706d82535fd8d85503f2dcc0be40c8e55d +ide 75c8f96acdace36c24fed799fdb968d48ed9bc64 +libata 65fc716fa673cf98fb5887180fd3c52ca0371198 +nfs f21f237cf55494c3a4209de323281a3b0528da10 +xfs aad4b5330f5b2b7d57571da33e7a1af8fd0f44f9 +infiniband c35a2549642c45ba9085d8b6db4dd68d2b0de230 +acpi 08ecd69c33e829bfc1a3f3f52099ccfa58162e9d +nfsd f5eef1dc7beebf825ebd159be206f4c5e1f067a4 +ieee1394 10a334e24b8c39a8ca41573d34908a55a8055cd5 +ubi 2ad49887150894b9ed6a87a76b409adceee6b074 +kvm 0ee2ac553582a406a75d1a4a149cb9c7e9995ac7 +dlm 3edac25f2e8ac8c2a84904c140e1aeb434e73e75 +scsi 00aeec5c93a80145cfa939bb9c9e244b207cb48c +ocfs2 544e8de1761320cc3abbdc416c5576fe62d737b5 +ext4 50f19914b505f883efb23917d0b314be36952630 +async_tx 06190d8415219d9eef7d8f04b52a109e34575a76 +udf 5c89468c12899b84886cb47eec93f0c88e0f896a +net 9eca0a47dee201a73967026985b5f0a79a46bd36 +mtd dc8a0843a435b2c0891e7eaea64faaf1ebec9b11 +wireless 9757d55652f98836b9a4cac307a01f8b0232dbd9 +crypto 9edc3e7908e98b23af9da7cbf4e50dd7ecf4f7ca +vfs fd217f4d70172c526478f2bc76859e909fdfa674 +sound 6999c5132961e6f7ded79606f0c693bbe7b33f4d +cpufreq 4f6e6b9f97b0ce98a8d1da65adbaf743bd0486a9 +v9fs 073e30ef20440f1a95ff7dd07de1d422bc6c41b1 +rr 7fa5aea740ffe6098651e48ae23199f825e74cbd +cifs c527c8a7ffa18400c2c1488f7ab5aff5e83f3c8e +mmc f1e8f6787565d79d114dca4fb0c50fdec13e275b +gfs2 7dd37c3cc833fa30f88d06e9449aa064666ea810 +input a6c2490f010d9235b1424110c6f414460e41dfe1 +semaphore b552068999b0b05087c454e525b30b785c79dc9b +semaphore-removal 9ac2f04936e1140d7a28a01b84e086458e191b49 +bkl-removal 0d4a7bc12ffecd3ba41dd94179cc5b272b71ce8a +ubifs e84461ad9c4f0ff91ab8553596acdb7bf5522df4 +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block 70bfe2de81b32969db1b4939bf171bbe55bcf1ef +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 0105f18683fde1df6ef69e7812582a52701e8a54 +pcmcia b1769450da0eeae2d95aae5496acbdf4c6ba89b2 +battery ed8c3174dd227031d1f3b9fa4fbb512f8f623434 +leds 57f8f7b60db6f1ed2c6918ab9230c4623a9dbe37 +backlight 57f8f7b60db6f1ed2c6918ab9230c4623a9dbe37 +kgdb 0136574e061924dc236a611f28e881a12ab6822a +slab 00035957b2863e8d4bbb3c2b5f632c2a4fb5a0a1 +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md 609df3f1b4b2d24a7d37f318b2836ed69828c5c3 +kmemcheck 92ba0729a0f0bf543241f97d574f0d11b5f0f956 +generic-ipi 75fa67706cce5272bcfc51ed646f2da21f3bdb6e +mfd bf7d22802ee23b71bfbe507ab660794b5c453f72 +hdlc 959ffb0d55b2c3cf64417f9ac5c4d9ed8df981d4 +drm 5a125c3c79167e78ba44efef03af7090ef28eeaf +voltage 16dc77ca46778b6646213ec51aa2456721f298c6 +security-testing 92a77aac9812d5397abbe6f1920e085e50838635 +lblnet 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 +ttydev 0bfdb45bc0411aa4b3889343094e89815f91dc8f +agp a64d2b37c2259e169759c1701ac565f0a11dc0ea +creds 17092d8e18dc0aa08c7ee05546fcce46dc35568f +oprofile 75fa67706cce5272bcfc51ed646f2da21f3bdb6e +fastboot 75fa67706cce5272bcfc51ed646f2da21f3bdb6e +sparseirq 75fa67706cce5272bcfc51ed646f2da21f3bdb6e +iommu 75fa67706cce5272bcfc51ed646f2da21f3bdb6e +uwb 58be81ed301d96045bca2b85f3b838910efcfde4 +watchdog dce83a39157224756c0ec36576b265cc9bdc406d +proc 12bf5a00732a5f9512081291097d0e4a3224e8a3 +bdev 56b26add02b4bdea81d5e0ebda60db1fe3311ad4 +dwmw2-iommu b876d08f816527af257e13d89fb0d3b4b849223c +cpu_alloc 5bac7c164167e3425d8115a8f938cbd76c6e2f7e +userns 472203385bdc25cd75ec1c88fd68b8d2850a50b1 +cputime 1c6d7c38bf367f5fc35cc66f0fced4cb9a7a7b0b +perfmon3 4872c7055867a9b583c76cd7744030dd515a5f35 +osd fcd3fd37cb344a28e976cbe69e1294f6cf373a1a +fatfs 5a6bb10393eb9a1985e97af12f0cb2906bcbf1af +scsi-post-merge 04ab591808565f968d4406f6435090ad671ebdab diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..fe00804322d6 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,129 @@ +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 +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#merge +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 +sparc-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-linus +arm-current git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#master +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-2.6.26 +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 quilt http://www.kernel.org/pub/linux/kernel/people/geert/linux-m68k-patches-2.6/ +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/paulus/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.osdl.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/x86/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/x86/linux-2.6-tip.git#auto-core-next +cpus4096 git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-cpus4096-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-ftrace-next +genirq git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-genirq-next +safe-poison-pointers git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-safe-poison-pointers-next +sched git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-sched-next +stackprotector git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-stackprotector-next +timers git git://git.kernel.org/pub/scm/linux/kernel/git/x86/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#mm +i2c quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ +jdelvare-hwmon quilt http://khali.linux-fr.org/devel/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 +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:8090/xfs/xfs-2.6.git#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 +semaphore git git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc.git#semaphore +semaphore-removal git git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc.git#semaphore-removal +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 +creds git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/cred-2.6.git#creds-v4 +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 +cpu_alloc git git://git.kernel.org/pub/scm/linux/kernel/git/christoph/work.git#cpu_alloc +userns git git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/userns-2.6#next +cputime git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git#cputime +perfmon3 git git://git.kernel.org/pub/scm/linux/kernel/git/eranian/linux-next.git#master +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 +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..1bcc6e54c332 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3883 @@ +$ git checkout master +Already on "master" +$ git reset --hard stable +HEAD is now at f21f237 Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip +Merging origin/master +$ git merge origin/master +Updating f21f237..3edac25 +Fast forward + Documentation/ABI/testing/sysfs-firmware-acpi | 16 +- + Documentation/acpi/debug.txt | 148 +++++++ + Documentation/kernel-parameters.txt | 87 ++--- + MAINTAINERS | 11 +- + arch/ia64/kvm/Kconfig | 2 + + arch/ia64/kvm/kvm-ia64.c | 12 +- + arch/ia64/kvm/vcpu.h | 5 + + arch/mn10300/Kconfig.debug | 9 + + arch/mn10300/mm/misalignment.c | 538 +++++++++++++++++++------ + arch/x86/include/asm/acpi.h | 1 - + arch/x86/kernel/acpi/boot.c | 1 - + arch/x86/kernel/kvmclock.c | 2 +- + arch/x86/kvm/Kconfig | 2 + + arch/x86/kvm/i8254.c | 4 +- + arch/x86/kvm/mmu.c | 2 +- + arch/x86/kvm/vmx.c | 3 +- + arch/x86/kvm/vmx.h | 1 + + drivers/acpi/Kconfig | 22 +- + drivers/acpi/Makefile | 8 +- + drivers/acpi/ac.c | 3 +- + drivers/acpi/acpi_memhotplug.c | 1 - + drivers/acpi/battery.c | 3 +- + drivers/acpi/bus.c | 11 +- + drivers/acpi/button.c | 3 +- + drivers/acpi/cm_sbs.c | 7 - + drivers/acpi/container.c | 1 - + drivers/acpi/debug.c | 15 + + drivers/acpi/ec.c | 97 +++-- + drivers/acpi/events/evgpe.c | 2 - + drivers/acpi/events/evxfevnt.c | 41 +-- + drivers/acpi/fan.c | 1 - + drivers/acpi/glue.c | 40 ++ + drivers/acpi/pci_link.c | 11 +- + drivers/acpi/pci_root.c | 6 - + drivers/acpi/power.c | 11 +- + drivers/acpi/processor_core.c | 93 +++-- + drivers/acpi/processor_idle.c | 1 - + drivers/acpi/processor_perflib.c | 2 +- + drivers/acpi/processor_thermal.c | 1 - + drivers/acpi/processor_throttling.c | 2 +- + drivers/acpi/reboot.c | 25 +- + drivers/acpi/scan.c | 42 +-- + drivers/acpi/sleep/proc.c | 4 +- + drivers/acpi/sleep/wakeup.c | 8 +- + drivers/acpi/system.c | 48 ++- + drivers/acpi/tables/tbfadt.c | 2 +- + drivers/acpi/thermal.c | 9 +- + drivers/acpi/video.c | 42 +- + drivers/acpi/video_detect.c | 267 ++++++++++++ + drivers/acpi/wmi.c | 2 +- + drivers/char/sonypi.c | 4 +- + drivers/idle/Kconfig | 3 +- + drivers/infiniband/hw/cxgb3/iwch_provider.c | 6 - + drivers/infiniband/hw/cxgb3/iwch_qp.c | 1 - + drivers/infiniband/hw/ehca/ehca_irq.c | 44 ++- + drivers/infiniband/hw/ehca/ehca_qp.c | 5 + + drivers/infiniband/hw/ipath/ipath_ruc.c | 10 +- + drivers/infiniband/hw/mlx4/mr.c | 1 + + drivers/infiniband/hw/nes/nes.c | 16 + + drivers/infiniband/hw/nes/nes_hw.h | 1 + + drivers/infiniband/hw/nes/nes_verbs.c | 64 ++- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 6 +- + drivers/misc/Kconfig | 4 +- + drivers/misc/acer-wmi.c | 6 + + drivers/misc/asus-laptop.c | 10 +- + drivers/misc/compal-laptop.c | 12 +- + drivers/misc/eeepc-laptop.c | 12 +- + drivers/misc/fujitsu-laptop.c | 43 ++- + drivers/misc/intel_menlow.c | 10 +- + drivers/misc/msi-laptop.c | 16 +- + drivers/misc/sony-laptop.c | 6 +- + drivers/misc/thinkpad_acpi.c | 29 +- + drivers/net/cxgb3/cxgb3_main.c | 2 + + drivers/net/mlx4/mlx4.h | 9 +- + include/acpi/acpi_bus.h | 2 + + include/acpi/acpi_drivers.h | 22 +- + include/acpi/acpixf.h | 4 +- + include/acpi/actypes.h | 1 + + include/linux/acpi.h | 48 ++- + mm/mmap.c | 2 +- + sound/pci/hda/patch_sigmatel.c | 85 +++- + 81 files changed, 1564 insertions(+), 595 deletions(-) + create mode 100644 Documentation/acpi/debug.txt + create mode 100644 drivers/acpi/video_detect.c +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Merge made by recursive. + drivers/s390/scsi/zfcp_aux.c | 3 +- + drivers/s390/scsi/zfcp_ccw.c | 4 ++- + drivers/s390/scsi/zfcp_dbf.c | 42 +++++++++++++---------------------- + drivers/s390/scsi/zfcp_dbf.h | 8 +----- + drivers/s390/scsi/zfcp_erp.c | 1 + + drivers/s390/scsi/zfcp_fsf.c | 23 ++++++++----------- + drivers/s390/scsi/zfcp_scsi.c | 12 +++------ + drivers/scsi/dpt_i2o.c | 4 +- + drivers/scsi/megaraid.c | 11 ++++++-- + drivers/scsi/megaraid.h | 2 +- + drivers/scsi/qla2xxx/qla_def.h | 1 - + drivers/scsi/qla2xxx/qla_init.c | 26 ++++------------------ + drivers/scsi/qla2xxx/qla_mbx.c | 2 +- + drivers/scsi/qla2xxx/qla_os.c | 1 + + drivers/scsi/qla2xxx/qla_sup.c | 19 ++++++---------- + drivers/scsi/qla2xxx/qla_version.h | 2 +- + drivers/scsi/scsi_error.c | 5 ++- + 17 files changed, 67 insertions(+), 99 deletions(-) +Merging net-current/master +$ git merge net-current/master +Auto-merged drivers/net/cxgb3/cxgb3_main.c +Merge made by recursive. + drivers/net/cxgb3/cxgb3_main.c | 2 +- + drivers/net/cxgb3/t3_hw.c | 8 +++++++- + drivers/net/myri10ge/myri10ge.c | 4 +++- + drivers/net/smc911x.c | 4 +++- + 4 files changed, 14 insertions(+), 4 deletions(-) +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Already up-to-date. +Merging arm-current/master +$ git merge arm-current/master +Merge made by recursive. + arch/arm/include/asm/mach/map.h | 13 +++++++------ + arch/arm/mach-realview/clock.c | 2 +- + arch/arm/mach-versatile/clock.c | 2 +- + arch/arm/mm/cache-feroceon-l2.c | 4 ++-- + arch/arm/mm/mmu.c | 6 ++++++ + arch/arm/plat-iop/setup.c | 5 +++-- + 6 files changed, 20 insertions(+), 12 deletions(-) +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Merge made by recursive. + drivers/pci/pci-acpi.c | 15 ++++++++------- + 1 files changed, 8 insertions(+), 7 deletions(-) +Merging wireless-current/master +$ git merge wireless-current/master +Merge made by recursive. + drivers/net/wireless/hostap/hostap_wlan.h | 5 ++++- + drivers/net/wireless/rtl8187_dev.c | 3 +++ + net/mac80211/mlme.c | 6 +++--- + 3 files changed, 10 insertions(+), 4 deletions(-) +Merging kbuild-current/master +$ git merge kbuild-current/master +Already up-to-date. +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Merge made by recursive. + lib/dynamic_printk.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging quilt/usb.current +$ git merge quilt/usb.current +Auto-merged Documentation/kernel-parameters.txt +Merge made by recursive. + Documentation/kernel-parameters.txt | 29 ++++ + drivers/block/ub.c | 20 +++- + drivers/usb/class/cdc-acm.c | 9 +- + drivers/usb/core/message.c | 1 + + drivers/usb/core/sysfs.c | 2 +- + drivers/usb/core/urb.c | 4 +- + drivers/usb/gadget/fsl_qe_udc.c | 3 + + drivers/usb/host/Kconfig | 23 +-- + drivers/usb/host/ehci-ps3.c | 1 + + drivers/usb/host/isp1760-if.c | 22 ++-- + drivers/usb/host/ohci-ps3.c | 3 +- + drivers/usb/host/r8a66597-hcd.c | 5 +- + drivers/usb/misc/sisusbvga/sisusb.c | 1 + + drivers/usb/misc/vstusb.c | 2 +- + drivers/usb/musb/musb_core.c | 6 +- + drivers/usb/musb/musb_core.h | 3 +- + drivers/usb/musb/musb_debug.h | 4 +- + drivers/usb/musb/musb_host.c | 282 ++++++++++++++++++++++++----------- + drivers/usb/musb/musb_host.h | 1 + + drivers/usb/musb/omap2430.c | 2 + + drivers/usb/musb/tusb6010.c | 2 +- + drivers/usb/serial/cp2101.c | 2 + + drivers/usb/serial/option.c | 6 + + drivers/usb/storage/Kconfig | 4 +- + drivers/usb/storage/unusual_devs.h | 22 +++ + drivers/usb/storage/usb.c | 113 ++++++++++++++ + include/linux/usb.h | 2 + + 27 files changed, 435 insertions(+), 139 deletions(-) +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Merge made by recursive. + Documentation/input/input-programming.txt | 3 +- + drivers/input/keyboard/atkbd.c | 27 ++++++++++++++++++++- + drivers/input/misc/cm109.c | 37 ++++++++++++++++++++++++++++- + drivers/input/mouse/hgpk.c | 2 +- + drivers/input/serio/i8042-x86ia64io.h | 7 +++++ + drivers/input/touchscreen/elo.c | 2 +- + 6 files changed, 73 insertions(+), 5 deletions(-) +Merging md-current/for-2.6.26 +$ git merge md-current/for-2.6.26 +Already up-to-date. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Removed arch/arm/boot/compressed/head-clps7500.S +Removed arch/arm/mach-clps7500/Makefile +Removed arch/arm/mach-clps7500/Makefile.boot +Removed arch/arm/mach-clps7500/core.c +Removed arch/arm/mach-clps7500/include/mach/acornfb.h +Removed arch/arm/mach-clps7500/include/mach/debug-macro.S +Removed arch/arm/mach-clps7500/include/mach/dma.h +Removed arch/arm/mach-clps7500/include/mach/entry-macro.S +Removed arch/arm/mach-clps7500/include/mach/hardware.h +Removed arch/arm/mach-clps7500/include/mach/io.h +Removed arch/arm/mach-clps7500/include/mach/irq.h +Removed arch/arm/mach-clps7500/include/mach/irqs.h +Removed arch/arm/mach-clps7500/include/mach/memory.h +Removed arch/arm/mach-clps7500/include/mach/system.h +Removed arch/arm/mach-clps7500/include/mach/timex.h +Removed arch/arm/mach-clps7500/include/mach/uncompress.h +Removed arch/arm/mach-clps7500/include/mach/vmalloc.h +Auto-merged arch/arm/mach-realview/clock.c +CONFLICT (content): Merge conflict in arch/arm/mach-realview/clock.c +Auto-merged arch/arm/mach-versatile/clock.c +CONFLICT (content): Merge conflict in arch/arm/mach-versatile/clock.c +Removed arch/arm/mm/copypage-feroceon.S +Removed arch/arm/mm/copypage-v3.S +Removed arch/arm/mm/copypage-v4wb.S +Removed arch/arm/mm/copypage-v4wt.S +Removed arch/arm/mm/copypage-xsc3.S +Auto-merged arch/arm/mm/mmu.c +Resolved 'arch/arm/mach-realview/clock.c' using previous resolution. +Resolved 'arch/arm/mach-versatile/clock.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 15ebb48: Merge commit 'arm/devel' +$ git diff -M --stat --summary HEAD^.. + arch/arm/Kconfig | 40 ++- + arch/arm/Makefile | 1 - + arch/arm/boot/compressed/Makefile | 4 - + arch/arm/boot/compressed/head-clps7500.S | 86 ----- + arch/arm/boot/compressed/misc.c | 2 + + arch/arm/common/Kconfig | 3 + + arch/arm/common/Makefile | 1 + + arch/arm/common/clkdev.c | 128 +++++++ + arch/arm/include/asm/clkdev.h | 30 ++ + arch/arm/include/asm/hardware/iomd.h | 41 --- + arch/arm/include/asm/page.h | 32 +- + arch/arm/include/asm/processor.h | 2 +- + arch/arm/include/asm/setup.h | 6 +- + arch/arm/include/asm/string.h | 9 - + arch/arm/include/asm/uaccess.h | 2 +- + arch/arm/kernel/setup.c | 37 ++- + arch/arm/lib/Makefile | 1 - + arch/arm/lib/memset.S | 2 +- + arch/arm/mach-at91/Kconfig | 7 + + arch/arm/mach-clps7500/Makefile | 11 - + arch/arm/mach-clps7500/Makefile.boot | 2 - + arch/arm/mach-clps7500/core.c | 395 --------------------- + arch/arm/mach-clps7500/include/mach/acornfb.h | 33 -- + arch/arm/mach-clps7500/include/mach/debug-macro.S | 21 -- + arch/arm/mach-clps7500/include/mach/dma.h | 21 -- + arch/arm/mach-clps7500/include/mach/entry-macro.S | 16 - + arch/arm/mach-clps7500/include/mach/hardware.h | 67 ---- + arch/arm/mach-clps7500/include/mach/io.h | 255 ------------- + arch/arm/mach-clps7500/include/mach/irq.h | 32 -- + arch/arm/mach-clps7500/include/mach/irqs.h | 66 ---- + arch/arm/mach-clps7500/include/mach/memory.h | 43 --- + arch/arm/mach-clps7500/include/mach/system.h | 23 -- + arch/arm/mach-clps7500/include/mach/timex.h | 13 - + arch/arm/mach-clps7500/include/mach/uncompress.h | 35 -- + arch/arm/mach-clps7500/include/mach/vmalloc.h | 4 - + arch/arm/mach-integrator/clock.c | 80 +---- + arch/arm/mach-integrator/clock.h | 25 -- + arch/arm/mach-integrator/core.c | 35 ++ + arch/arm/mach-integrator/impd1.c | 26 +- + arch/arm/mach-integrator/include/mach/clkdev.h | 25 ++ + arch/arm/mach-integrator/integrator_cp.c | 18 +- + arch/arm/mach-omap1/Kconfig | 3 + + arch/arm/mach-pxa/Kconfig | 3 + + arch/arm/mach-pxa/clock.c | 66 +--- + arch/arm/mach-pxa/clock.h | 59 +-- + arch/arm/mach-pxa/include/mach/clkdev.h | 7 + + arch/arm/mach-pxa/pwm.c | 2 +- + arch/arm/mach-pxa/pxa25x.c | 71 +++-- + arch/arm/mach-pxa/pxa27x.c | 89 +++-- + arch/arm/mach-pxa/pxa300.c | 18 +- + arch/arm/mach-pxa/pxa320.c | 8 +- + arch/arm/mach-pxa/pxa3xx.c | 87 +++-- + arch/arm/mach-pxa/ssp.c | 2 +- + arch/arm/mach-realview/Kconfig | 2 + + arch/arm/mach-realview/clock.c | 80 +---- + arch/arm/mach-realview/clock.h | 6 - + arch/arm/mach-realview/core.c | 52 +++- + arch/arm/mach-realview/core.h | 1 - + arch/arm/mach-realview/include/mach/clkdev.h | 7 + + arch/arm/mach-realview/realview_eb.c | 2 - + arch/arm/mach-realview/realview_pb1176.c | 2 - + arch/arm/mach-realview/realview_pb11mp.c | 2 - + arch/arm/mach-s3c2410/Kconfig | 1 + + arch/arm/mach-s3c2412/Kconfig | 1 + + arch/arm/mach-s3c2440/Kconfig | 1 + + arch/arm/mach-s3c2442/Kconfig | 1 + + arch/arm/mach-sa1100/clock.c | 100 ++---- + arch/arm/mach-versatile/Kconfig | 2 + + arch/arm/mach-versatile/clock.c | 80 +---- + arch/arm/mach-versatile/clock.h | 7 +- + arch/arm/mach-versatile/core.c | 56 +++- + arch/arm/mach-versatile/include/mach/clkdev.h | 7 + + arch/arm/mm/Kconfig | 65 +--- + arch/arm/mm/copypage-feroceon.S | 95 ----- + arch/arm/mm/copypage-feroceon.c | 111 ++++++ + arch/arm/mm/copypage-v3.S | 67 ---- + arch/arm/mm/copypage-v3.c | 81 +++++ + arch/arm/mm/copypage-v4mc.c | 53 ++-- + arch/arm/mm/copypage-v4wb.S | 79 ---- + arch/arm/mm/copypage-v4wb.c | 94 +++++ + arch/arm/mm/copypage-v4wt.S | 73 ---- + arch/arm/mm/copypage-v4wt.c | 88 +++++ + arch/arm/mm/copypage-v6.c | 84 +++-- + arch/arm/mm/copypage-xsc3.S | 97 ----- + arch/arm/mm/copypage-xsc3.c | 113 ++++++ + arch/arm/mm/copypage-xscale.c | 47 ++-- + arch/arm/mm/init.c | 57 ++-- + arch/arm/mm/mm.h | 2 +- + arch/arm/mm/mmu.c | 109 +++--- + arch/arm/mm/nommu.c | 18 +- + arch/arm/mm/pgd.c | 2 +- + arch/arm/mm/proc-syms.c | 4 +- + arch/arm/plat-mxc/Kconfig | 2 + + arch/arm/plat-omap/Kconfig | 2 + + drivers/i2c/busses/i2c-pxa.c | 2 +- + drivers/ide/Kconfig | 2 +- + drivers/ide/ide_arm.c | 11 +- + drivers/input/keyboard/pxa27x_keypad.c | 2 +- + drivers/input/serio/Kconfig | 2 +- + drivers/media/video/pxa_camera.c | 2 +- + drivers/mfd/asic3.c | 6 +- + drivers/mmc/host/pxamci.c | 2 +- + drivers/mtd/maps/ixp2000.c | 2 +- + drivers/mtd/maps/ixp4xx.c | 2 +- + drivers/mtd/nand/pxa3xx_nand.c | 2 +- + drivers/mtd/nand/s3c2410.c | 4 +- + drivers/net/cs89x0.c | 6 +- + drivers/serial/pxa.c | 2 +- + drivers/usb/gadget/pxa25x_udc.c | 2 +- + drivers/usb/gadget/pxa27x_udc.c | 2 +- + drivers/usb/host/ohci-pxa27x.c | 2 +- + drivers/video/Kconfig | 2 +- + drivers/video/pxafb.c | 2 +- + drivers/video/sa1100fb.c | 2 +- + include/linux/highmem.h | 2 + + 115 files changed, 1430 insertions(+), 2479 deletions(-) + delete mode 100644 arch/arm/boot/compressed/head-clps7500.S + create mode 100644 arch/arm/common/clkdev.c + create mode 100644 arch/arm/include/asm/clkdev.h + delete mode 100644 arch/arm/mach-clps7500/Makefile + delete mode 100644 arch/arm/mach-clps7500/Makefile.boot + delete mode 100644 arch/arm/mach-clps7500/core.c + delete mode 100644 arch/arm/mach-clps7500/include/mach/acornfb.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-clps7500/include/mach/dma.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-clps7500/include/mach/hardware.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/io.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/irq.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/irqs.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/memory.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/system.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/timex.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/vmalloc.h + create mode 100644 arch/arm/mach-integrator/include/mach/clkdev.h + create mode 100644 arch/arm/mach-pxa/include/mach/clkdev.h + create mode 100644 arch/arm/mach-realview/include/mach/clkdev.h + create mode 100644 arch/arm/mach-versatile/include/mach/clkdev.h + delete mode 100644 arch/arm/mm/copypage-feroceon.S + create mode 100644 arch/arm/mm/copypage-feroceon.c + delete mode 100644 arch/arm/mm/copypage-v3.S + create mode 100644 arch/arm/mm/copypage-v3.c + delete mode 100644 arch/arm/mm/copypage-v4wb.S + create mode 100644 arch/arm/mm/copypage-v4wb.c + delete mode 100644 arch/arm/mm/copypage-v4wt.S + create mode 100644 arch/arm/mm/copypage-v4wt.c + delete mode 100644 arch/arm/mm/copypage-xsc3.S + create mode 100644 arch/arm/mm/copypage-xsc3.c +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Merge made by recursive. + arch/avr32/mach-at32ap/at32ap700x.c | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Merge made by recursive. + arch/cris/include/arch-v10/arch/byteorder.h | 10 ++++++---- + arch/cris/include/arch-v32/arch/byteorder.h | 6 ++++-- + arch/cris/include/asm/byteorder.h | 20 ++++---------------- + 3 files changed, 14 insertions(+), 22 deletions(-) +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging quilt/m68k +$ git merge quilt/m68k +Merge made by recursive. + arch/m68k/fpsp040/setox.S | 4 +- + arch/m68k/kernel/ints.c | 2 +- + arch/m68k/mac/baboon.c | 42 +++++++++++---- + arch/m68k/mac/config.c | 3 - + arch/m68k/mac/debug.c | 1 - + arch/m68k/mac/macints.c | 9 ++-- + arch/m68k/mac/misc.c | 16 ++++-- + arch/m68k/mac/oss.c | 1 - + arch/m68k/mac/via.c | 80 ++++++++++++----------------- + drivers/ide/macide.c | 1 - + drivers/macintosh/via-cuda.c | 1 - + drivers/macintosh/via-macii.c | 1 - + drivers/macintosh/via-maciisi.c | 1 - + drivers/macintosh/via-pmu68k.c | 1 - + drivers/scsi/mac_esp.c | 100 +++++++++++++++++++++++++------------ + drivers/scsi/mac_scsi.c | 1 - + drivers/video/console/fbcon.c | 78 ++-------------------------- + drivers/video/macfb.c | 107 ++++++++++++++++++-------------------- + include/asm-m68k/byteorder.h | 16 ++---- + include/asm-m68k/machw.h | 22 -------- + 20 files changed, 209 insertions(+), 278 deletions(-) +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Merge made by recursive. + arch/m68knommu/platform/coldfire/entry.S | 15 ++------------- + 1 files changed, 2 insertions(+), 13 deletions(-) +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Already up-to-date. +Merging parisc/master +$ git merge parisc/master +Already up-to-date. +Merging powerpc/next +$ git merge powerpc/next +Merge made by recursive. + arch/powerpc/boot/dts/kuroboxHD.dts | 1 - + arch/powerpc/boot/dts/kuroboxHG.dts | 1 - + arch/powerpc/boot/dts/lite5200.dts | 1 - + arch/powerpc/boot/dts/lite5200b.dts | 1 - + arch/powerpc/boot/dts/motionpro.dts | 1 - + arch/powerpc/boot/dts/mpc8315erdb.dts | 1 - + arch/powerpc/boot/dts/mpc8349emitx.dts | 1 - + arch/powerpc/boot/dts/mpc8349emitxgp.dts | 1 - + arch/powerpc/boot/dts/mpc8377_rdb.dts | 1 - + arch/powerpc/boot/dts/mpc8378_rdb.dts | 1 - + arch/powerpc/boot/dts/mpc8379_rdb.dts | 1 - + arch/powerpc/boot/dts/pcm030.dts | 2 - + arch/powerpc/boot/dts/tqm5200.dts | 1 - + arch/powerpc/boot/libfdt-wrapper.c | 2 +- + arch/powerpc/include/asm/byteorder.h | 38 ++-- + arch/powerpc/include/asm/cputable.h | 6 +- + arch/powerpc/include/asm/dma-mapping.h | 36 +--- + arch/powerpc/include/asm/eeh.h | 8 +- + arch/powerpc/include/asm/lppaca.h | 3 +- + arch/powerpc/include/asm/pci-bridge.h | 4 +- + arch/powerpc/include/asm/pci.h | 11 +- + arch/powerpc/include/asm/time.h | 20 -- + arch/powerpc/include/asm/vdso_datapage.h | 3 + + arch/powerpc/kernel/asm-offsets.c | 1 + + arch/powerpc/kernel/paca.c | 1 + + arch/powerpc/kernel/pci-common.c | 276 ++++++++++++++++++---------- + arch/powerpc/kernel/pci_32.c | 101 ++++------- + arch/powerpc/kernel/pci_64.c | 134 +++++++------- + arch/powerpc/kernel/rtas_pci.c | 48 ----- + arch/powerpc/kernel/smp-tbsync.c | 12 +- + arch/powerpc/kernel/time.c | 36 +---- + arch/powerpc/kernel/vdso32/gettimeofday.S | 208 +++++++++++++--------- + arch/powerpc/kernel/vdso64/gettimeofday.S | 141 ++++++++------- + arch/powerpc/lib/memcpy_64.S | 16 ++- + arch/powerpc/mm/fault.c | 12 +- + arch/powerpc/mm/hugetlbpage.c | 22 +- + arch/powerpc/platforms/ps3/device-init.c | 29 +++- + arch/powerpc/platforms/pseries/eeh.c | 44 +++-- + arch/powerpc/platforms/pseries/pci_dlpar.c | 163 ++++++++-------- + arch/powerpc/platforms/pseries/xics.c | 28 +++- + drivers/pci/hotplug/rpadlpar_core.c | 69 +++---- + 41 files changed, 757 insertions(+), 729 deletions(-) +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging galak/next +$ git merge galak/next +Merge made by recursive. + arch/powerpc/Makefile | 1 - + arch/powerpc/include/asm/processor.h | 6 + + arch/powerpc/include/asm/sfp-machine.h | 58 ++- + arch/powerpc/kernel/head_fsl_booke.S | 7 +- + arch/powerpc/kernel/traps.c | 62 +++- + arch/powerpc/math-emu/Makefile | 2 + + arch/powerpc/math-emu/fadd.c | 1 - + arch/powerpc/math-emu/fcmpo.c | 5 +- + arch/powerpc/math-emu/fdiv.c | 9 +- + arch/powerpc/math-emu/fdivs.c | 9 +- + arch/powerpc/math-emu/fmadd.c | 5 +- + arch/powerpc/math-emu/fmadds.c | 5 +- + arch/powerpc/math-emu/fmsub.c | 5 +- + arch/powerpc/math-emu/fmsubs.c | 5 +- + arch/powerpc/math-emu/fmul.c | 3 +- + arch/powerpc/math-emu/fmuls.c | 3 +- + arch/powerpc/math-emu/fnmadd.c | 5 +- + arch/powerpc/math-emu/fnmadds.c | 5 +- + arch/powerpc/math-emu/fnmsub.c | 5 +- + arch/powerpc/math-emu/fnmsubs.c | 5 +- + arch/powerpc/math-emu/fsqrt.c | 5 +- + arch/powerpc/math-emu/fsqrts.c | 5 +- + arch/powerpc/math-emu/fsub.c | 3 +- + arch/powerpc/math-emu/fsubs.c | 3 +- + arch/powerpc/math-emu/math_efp.c | 720 ++++++++++++++++++++++++++++++++ + 25 files changed, 862 insertions(+), 80 deletions(-) + create mode 100644 arch/powerpc/math-emu/math_efp.c +Merging pxa/for-next +$ git merge pxa/for-next +Auto-merged arch/arm/mach-pxa/Kconfig +Auto-merged drivers/video/pxafb.c +Merge made by recursive. + arch/arm/configs/h5000_defconfig | 996 ++++++++++++++++++++++++++++++++ + arch/arm/mach-pxa/Kconfig | 4 + + arch/arm/mach-pxa/Makefile | 1 + + arch/arm/mach-pxa/cpufreq-pxa2xx.c | 32 +- + arch/arm/mach-pxa/h5000.c | 200 +++++++ + arch/arm/mach-pxa/include/mach/h5000.h | 113 ++++ + drivers/video/pxafb.c | 18 +- + drivers/video/pxafb.h | 3 + + 8 files changed, 1345 insertions(+), 22 deletions(-) + create mode 100644 arch/arm/configs/h5000_defconfig + create mode 100644 arch/arm/mach-pxa/h5000.c + create mode 100644 arch/arm/mach-pxa/include/mach/h5000.h +Merging s390/features +$ git merge s390/features +Auto-merged Documentation/kernel-parameters.txt +Auto-merged drivers/s390/scsi/zfcp_aux.c +Auto-merged drivers/s390/scsi/zfcp_ccw.c +Auto-merged drivers/s390/scsi/zfcp_dbf.c +Auto-merged drivers/s390/scsi/zfcp_erp.c +Auto-merged drivers/s390/scsi/zfcp_fsf.c +Auto-merged drivers/s390/scsi/zfcp_scsi.c +Merge made by recursive. + Documentation/kernel-parameters.txt | 3 + + Documentation/kmsg/s390/hvc_iucv | 50 ++ + arch/powerpc/include/asm/elf.h | 2 +- + arch/powerpc/kernel/vdso.c | 3 +- + arch/s390/Kconfig | 13 + + arch/s390/Makefile | 1 + + arch/s390/appldata/appldata.h | 4 - + arch/s390/appldata/appldata_base.c | 11 +- + arch/s390/appldata/appldata_os.c | 20 +- + arch/s390/crypto/aes_s390.c | 13 +- + arch/s390/hypfs/hypfs_diag.c | 9 +- + arch/s390/hypfs/inode.c | 13 +- + arch/s390/include/asm/auxvec.h | 2 + + arch/s390/include/asm/bug.h | 5 +- + arch/s390/include/asm/elf.h | 16 + + arch/s390/include/asm/ftrace.h | 8 + + arch/s390/include/asm/isc.h | 1 + + arch/s390/include/asm/mmu.h | 1 + + arch/s390/include/asm/page.h | 2 + + arch/s390/include/asm/processor.h | 4 +- + arch/s390/include/asm/ptrace.h | 2 +- + arch/s390/include/asm/qdio.h | 16 +- + arch/s390/include/asm/sigp.h | 1 + + arch/s390/include/asm/smp.h | 5 +- + arch/s390/include/asm/syscall.h | 4 +- + arch/s390/include/asm/sysinfo.h | 11 + + arch/s390/include/asm/system.h | 20 +- + arch/s390/include/asm/vdso.h | 39 ++ + arch/s390/kernel/Makefile | 17 +- + arch/s390/kernel/asm-offsets.c | 17 +- + arch/s390/kernel/compat_signal.c | 2 +- + arch/s390/kernel/cpcmd.c | 6 +- + arch/s390/kernel/debug.c | 36 +- + arch/s390/kernel/entry.S | 41 +- + arch/s390/kernel/entry64.S | 34 +- + arch/s390/kernel/head.S | 49 ++ + arch/s390/kernel/head31.S | 27 +- + arch/s390/kernel/head64.S | 23 - + arch/s390/kernel/mcount.S | 48 ++ + arch/s390/kernel/process.c | 3 + + arch/s390/kernel/processor.c | 97 ++++ + arch/s390/kernel/ptrace.c | 12 +- + arch/s390/kernel/s390_ksyms.c | 5 + + arch/s390/kernel/setup.c | 180 ++----- + arch/s390/kernel/signal.c | 6 +- + arch/s390/kernel/smp.c | 191 +------ + arch/s390/kernel/time.c | 256 ++++++--- + arch/s390/kernel/topology.c | 15 +- + arch/s390/kernel/vdso.c | 232 ++++++++ + arch/s390/kernel/vdso32/Makefile | 55 ++ + arch/s390/kernel/vdso32/clock_getres.S | 39 ++ + arch/s390/kernel/vdso32/clock_gettime.S | 128 +++++ + arch/s390/kernel/vdso32/gettimeofday.S | 82 +++ + arch/s390/kernel/vdso32/note.S | 12 + + arch/s390/kernel/vdso32/vdso32.lds.S | 138 +++++ + arch/s390/kernel/vdso32/vdso32_wrapper.S | 13 + + arch/s390/kernel/vdso64/Makefile | 55 ++ + arch/s390/kernel/vdso64/clock_getres.S | 39 ++ + arch/s390/kernel/vdso64/clock_gettime.S | 89 ++++ + arch/s390/kernel/vdso64/gettimeofday.S | 56 ++ + arch/s390/kernel/vdso64/note.S | 12 + + arch/s390/kernel/vdso64/vdso64.lds.S | 138 +++++ + arch/s390/kernel/vdso64/vdso64_wrapper.S | 13 + + arch/s390/mm/extmem.c | 105 ++--- + arch/sh/include/asm/elf.h | 2 +- + arch/sh/kernel/vsyscall/vsyscall.c | 3 +- + arch/x86/include/asm/elf.h | 2 +- + arch/x86/vdso/vdso32-setup.c | 2 +- + arch/x86/vdso/vma.c | 2 +- + drivers/char/Kconfig | 10 + + drivers/char/Makefile | 1 + + drivers/char/hvc_iucv.c | 850 ++++++++++++++++++++++++++++++ + drivers/s390/block/dasd_devmap.c | 19 +- + drivers/s390/block/dasd_proc.c | 28 +- + drivers/s390/block/dcssblk.c | 76 ++-- + drivers/s390/block/xpram.c | 40 +- + drivers/s390/char/monreader.c | 40 +- + drivers/s390/char/monwriter.c | 4 +- + drivers/s390/char/sclp_cmd.c | 31 +- + drivers/s390/char/sclp_config.c | 9 +- + drivers/s390/char/sclp_cpi_sys.c | 11 +- + drivers/s390/char/sclp_sdias.c | 17 +- + drivers/s390/char/vmcp.c | 10 +- + drivers/s390/char/vmlogrdr.c | 25 +- + drivers/s390/char/vmur.c | 14 +- + drivers/s390/char/zcore.c | 13 +- + drivers/s390/cio/blacklist.c | 13 +- + drivers/s390/cio/ccwgroup.c | 8 +- + drivers/s390/cio/chsc.c | 7 +- + drivers/s390/cio/cio.c | 79 ++-- + drivers/s390/cio/cmf.c | 7 +- + drivers/s390/cio/css.c | 7 +- + drivers/s390/cio/device.c | 6 +- + drivers/s390/cio/qdio.h | 3 + + drivers/s390/cio/qdio_main.c | 25 +- + drivers/s390/cio/qdio_perf.c | 6 + + drivers/s390/cio/qdio_perf.h | 4 + + drivers/s390/cio/qdio_setup.c | 33 +- + drivers/s390/crypto/ap_bus.c | 211 +++++++- + drivers/s390/crypto/ap_bus.h | 6 +- + drivers/s390/kvm/kvm_virtio.c | 4 +- + drivers/s390/net/ctcm_fsms.c | 45 +- + drivers/s390/net/ctcm_main.c | 71 ++- + drivers/s390/net/ctcm_main.h | 6 - + drivers/s390/net/ctcm_mpc.c | 14 +- + drivers/s390/net/ctcm_sysfs.c | 2 + + drivers/s390/net/lcs.c | 91 ++-- + drivers/s390/net/netiucv.c | 63 ++- + drivers/s390/net/qeth_core.h | 9 +- + drivers/s390/net/qeth_core_main.c | 174 ++++--- + drivers/s390/net/qeth_l2_main.c | 36 +- + drivers/s390/net/qeth_l3_main.c | 210 ++++---- + drivers/s390/scsi/zfcp_aux.c | 27 +- + drivers/s390/scsi/zfcp_ccw.c | 2 + + drivers/s390/scsi/zfcp_cfdc.c | 2 + + drivers/s390/scsi/zfcp_dbf.c | 2 + + drivers/s390/scsi/zfcp_def.h | 2 + + drivers/s390/scsi/zfcp_erp.c | 7 +- + drivers/s390/scsi/zfcp_fc.c | 2 + + drivers/s390/scsi/zfcp_fsf.c | 2 + + drivers/s390/scsi/zfcp_qdio.c | 2 + + drivers/s390/scsi/zfcp_scsi.c | 2 + + drivers/s390/scsi/zfcp_sysfs.c | 2 + + drivers/s390/sysinfo.c | 127 +++++- + fs/binfmt_elf.c | 2 +- + include/asm-generic/memory_model.h | 2 +- + include/net/iucv/iucv.h | 45 ++ + net/iucv/af_iucv.c | 18 +- + net/iucv/iucv.c | 160 +++++-- + 129 files changed, 4040 insertions(+), 1265 deletions(-) + create mode 100644 Documentation/kmsg/s390/hvc_iucv + create mode 100644 arch/s390/include/asm/ftrace.h + create mode 100644 arch/s390/include/asm/vdso.h + create mode 100644 arch/s390/kernel/mcount.S + create mode 100644 arch/s390/kernel/processor.c + create mode 100644 arch/s390/kernel/vdso.c + create mode 100644 arch/s390/kernel/vdso32/Makefile + create mode 100644 arch/s390/kernel/vdso32/clock_getres.S + create mode 100644 arch/s390/kernel/vdso32/clock_gettime.S + create mode 100644 arch/s390/kernel/vdso32/gettimeofday.S + create mode 100644 arch/s390/kernel/vdso32/note.S + create mode 100644 arch/s390/kernel/vdso32/vdso32.lds.S + create mode 100644 arch/s390/kernel/vdso32/vdso32_wrapper.S + create mode 100644 arch/s390/kernel/vdso64/Makefile + create mode 100644 arch/s390/kernel/vdso64/clock_getres.S + create mode 100644 arch/s390/kernel/vdso64/clock_gettime.S + create mode 100644 arch/s390/kernel/vdso64/gettimeofday.S + create mode 100644 arch/s390/kernel/vdso64/note.S + create mode 100644 arch/s390/kernel/vdso64/vdso64.lds.S + create mode 100644 arch/s390/kernel/vdso64/vdso64_wrapper.S + create mode 100644 drivers/char/hvc_iucv.c +Merging sh/master +$ git merge sh/master +Auto-merged drivers/usb/host/r8a66597-hcd.c +Merge made by recursive. + arch/sh/Kconfig | 2 + + arch/sh/boards/board-ap325rxa.c | 3 +- + arch/sh/boards/mach-migor/setup.c | 5 +- + arch/sh/boards/mach-se/7722/setup.c | 3 +- + arch/sh/include/asm/ftrace.h | 21 ++ + arch/sh/include/asm/io.h | 4 + + arch/sh/include/asm/pgtable.h | 6 + + arch/sh/kernel/Makefile_32 | 6 + + arch/sh/kernel/cpu/clock.c | 10 + + arch/sh/kernel/cpu/init.c | 2 + + arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 308 +++++++++++++++++++--------- + arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 18 +- + arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 19 +-- + arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 19 +- + arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 25 +-- + arch/sh/kernel/entry-common.S | 44 ---- + arch/sh/kernel/ftrace.c | 109 ++++++++++ + arch/sh/kernel/sys_sh.c | 92 --------- + arch/sh/lib/Makefile | 1 + + arch/sh/lib/mcount.S | 90 ++++++++ + arch/sh/mm/Makefile_32 | 2 +- + arch/sh/mm/Makefile_64 | 2 +- + arch/sh/mm/init.c | 12 +- + arch/sh/mm/mmap.c | 125 +++++++++++ + arch/sh/mm/pg-sh4.c | 17 ++ + drivers/i2c/busses/i2c-sh_mobile.c | 73 ++++---- + drivers/input/keyboard/sh_keysc.c | 28 ++- + drivers/media/video/sh_mobile_ceu_camera.c | 20 ++- + drivers/serial/sh-sci.c | 20 +- + drivers/serial/sh-sci.h | 16 +- + drivers/usb/gadget/m66592-udc.c | 34 +++- + drivers/usb/gadget/m66592-udc.h | 27 +-- + drivers/usb/host/r8a66597-hcd.c | 35 +++- + drivers/usb/host/r8a66597.h | 8 +- + drivers/video/sh_mobile_lcdcfb.c | 46 +++-- + include/linux/serial_core.h | 3 + + scripts/recordmcount.pl | 11 + + 37 files changed, 862 insertions(+), 404 deletions(-) + create mode 100644 arch/sh/kernel/ftrace.c + create mode 100644 arch/sh/lib/mcount.S + create mode 100644 arch/sh/mm/mmap.c +$ git reset --hard HEAD^ +HEAD is now at 54b6d1d Merge commit 's390/features' +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 +Merge made by recursive. + Documentation/filesystems/proc.txt | 9 +- + Documentation/kernel-parameters.txt | 33 ++- + Documentation/nmi_watchdog.txt | 5 + + Documentation/x86/boot.txt | 2 +- + Documentation/x86/x86_64/boot-options.txt | 11 - + Documentation/x86/x86_64/mm.txt | 2 +- + arch/x86/Kconfig | 71 ++++- + arch/x86/Kconfig.debug | 20 +- + arch/x86/ia32/ia32_signal.c | 14 +- + arch/x86/include/asm/apic.h | 1 + + arch/x86/include/asm/bitops.h | 10 +- + arch/x86/include/asm/byteorder.h | 74 ++--- + arch/x86/include/asm/cpufeature.h | 3 + + arch/x86/include/asm/hypervisor.h | 26 ++ + arch/x86/include/asm/io_apic.h | 10 + + {include/asm-x86 => arch/x86/include/asm}/iomap.h | 0 + arch/x86/include/asm/irq.h | 4 - + arch/x86/include/asm/irq_regs_32.h | 2 + + arch/x86/include/asm/kexec.h | 31 +- + arch/x86/include/asm/msr.h | 8 +- + arch/x86/include/asm/pci.h | 2 + + arch/x86/include/asm/processor.h | 4 + + arch/x86/include/asm/setup.h | 4 + + arch/x86/include/asm/system.h | 2 + + arch/x86/include/asm/tsc.h | 8 +- + arch/x86/include/asm/uv/bios.h | 34 ++- + arch/x86/include/asm/uv/uv_hub.h | 87 +++++- + arch/x86/include/asm/vmware.h | 27 ++ + arch/x86/kernel/Makefile | 5 +- + arch/x86/kernel/apic.c | 121 ++++---- + arch/x86/kernel/bios_uv.c | 60 ++++- + arch/x86/kernel/check.c | 161 ++++++++++ + arch/x86/kernel/cpu/Makefile | 1 + + arch/x86/kernel/cpu/common.c | 2 + + arch/x86/kernel/cpu/hypervisor.c | 57 ++++ + arch/x86/kernel/cpu/intel.c | 3 +- + arch/x86/kernel/cpu/mtrr/main.c | 346 ++++++++++----------- + arch/x86/kernel/cpu/vmware.c | 111 +++++++ + arch/x86/kernel/ds.c | 9 +- + arch/x86/kernel/dumpstack.c | 319 +++++++++++++++++++ + arch/x86/kernel/dumpstack.h | 39 +++ + arch/x86/kernel/dumpstack_32.c | 302 +------------------ + arch/x86/kernel/dumpstack_64.c | 282 +----------------- + arch/x86/kernel/entry_64.S | 2 + + arch/x86/kernel/genx2apic_uv_x.c | 108 +++++++- + arch/x86/kernel/machine_kexec_32.c | 104 +++++-- + arch/x86/kernel/nmi.c | 58 +++- + arch/x86/kernel/process.c | 16 + + arch/x86/kernel/ptrace.c | 9 +- + arch/x86/kernel/reboot.c | 5 + + arch/x86/kernel/relocate_kernel_32.S | 115 ------- + arch/x86/kernel/setup.c | 158 +--------- + arch/x86/kernel/signal_32.c | 82 +++++- + arch/x86/kernel/signal_64.c | 103 +++++-- + arch/x86/kernel/smp.c | 13 - + arch/x86/kernel/tlb_uv.c | 4 - + arch/x86/kernel/tsc.c | 42 ++- + arch/x86/kernel/tsc_sync.c | 8 +- + arch/x86/kernel/vsyscall_64.c | 9 + + arch/x86/mach-voyager/voyager_smp.c | 16 +- + arch/x86/mm/fault.c | 11 +- + arch/x86/mm/init_32.c | 4 +- + arch/x86/mm/init_64.c | 2 - + arch/x86/pci/common.c | 17 + + drivers/acpi/pci_irq.c | 56 ++++ + drivers/firmware/dmi_scan.c | 11 + + drivers/misc/sgi-gru/gruprocfs.c | 1 - + drivers/misc/sgi-xp/xp.h | 7 +- + drivers/misc/sgi-xp/xp_main.c | 7 + + drivers/misc/sgi-xp/xp_sn2.c | 34 ++ + drivers/misc/sgi-xp/xp_uv.c | 70 ++++- + drivers/misc/sgi-xp/xpc.h | 12 + + drivers/misc/sgi-xp/xpc_sn2.c | 15 +- + drivers/misc/sgi-xp/xpc_uv.c | 290 ++++++++++++++---- + drivers/pci/quirks.c | 170 +++++++++-- + include/linux/dmi.h | 2 + + include/linux/kexec.h | 4 + + include/linux/pci.h | 6 + + include/linux/pci_ids.h | 5 + + 79 files changed, 2436 insertions(+), 1462 deletions(-) + create mode 100644 arch/x86/include/asm/hypervisor.h + rename {include/asm-x86 => arch/x86/include/asm}/iomap.h (100%) + create mode 100644 arch/x86/include/asm/vmware.h + create mode 100644 arch/x86/kernel/check.c + create mode 100644 arch/x86/kernel/cpu/hypervisor.c + create mode 100644 arch/x86/kernel/cpu/vmware.c + create mode 100644 arch/x86/kernel/dumpstack.c + create mode 100644 arch/x86/kernel/dumpstack.h +Merging xtensa/master +$ git merge xtensa/master +Merge made by recursive. + arch/xtensa/Makefile | 28 +-- + arch/xtensa/boot/boot-elf/boot.lds.S | 2 +- + arch/xtensa/boot/boot-redboot/bootstrap.S | 2 +- + .../asm-xtensa => arch/xtensa/include/asm}/Kbuild | 0 + .../xtensa/include/asm}/asmmacro.h | 2 +- + .../xtensa/include/asm}/atomic.h | 0 + .../xtensa/include/asm}/auxvec.h | 0 + .../xtensa/include/asm}/bitops.h | 0 + .../xtensa/include/asm}/bootparam.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/bug.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/bugs.h | 0 + .../xtensa/include/asm}/byteorder.h | 32 ++-- + .../asm-xtensa => arch/xtensa/include/asm}/cache.h | 2 +- + .../xtensa/include/asm}/cacheasm.h | 0 + .../xtensa/include/asm}/cacheflush.h | 0 + .../xtensa/include/asm}/checksum.h | 2 +- + .../xtensa/include/asm}/coprocessor.h | 4 +- + .../xtensa/include/asm}/cpumask.h | 0 + .../xtensa/include/asm}/cputime.h | 0 + .../xtensa/include/asm}/current.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/delay.h | 0 + .../xtensa/include/asm}/device.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/div64.h | 0 + .../xtensa/include/asm}/dma-mapping.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/dma.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/elf.h | 0 + .../xtensa/include/asm}/emergency-restart.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/errno.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/fb.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/fcntl.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/futex.h | 0 + .../xtensa/include/asm}/hardirq.h | 0 + .../xtensa/include/asm}/highmem.h | 0 + .../xtensa/include/asm}/hw_irq.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/io.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/ioctl.h | 0 + .../xtensa/include/asm}/ioctls.h | 0 + .../xtensa/include/asm}/ipcbuf.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/irq.h | 4 +- + .../xtensa/include/asm}/irq_regs.h | 0 + .../xtensa/include/asm}/kdebug.h | 0 + .../xtensa/include/asm}/kmap_types.h | 0 + .../xtensa/include/asm}/linkage.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/local.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/mman.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/mmu.h | 0 + .../xtensa/include/asm}/mmu_context.h | 0 + .../xtensa/include/asm}/module.h | 0 + .../xtensa/include/asm}/msgbuf.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/mutex.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/page.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/param.h | 0 + .../xtensa/include/asm}/pci-bridge.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/pci.h | 0 + .../xtensa/include/asm}/percpu.h | 0 + .../xtensa/include/asm}/pgalloc.h | 0 + .../xtensa/include/asm}/pgtable.h | 0 + .../xtensa/include/asm}/platform.h | 2 - + .../asm-xtensa => arch/xtensa/include/asm}/poll.h | 0 + .../xtensa/include/asm}/posix_types.h | 0 + .../xtensa/include/asm}/processor.h | 2 +- + .../xtensa/include/asm}/ptrace.h | 2 +- + .../asm-xtensa => arch/xtensa/include/asm}/regs.h | 0 + .../xtensa/include/asm}/resource.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/rmap.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/rwsem.h | 0 + .../xtensa/include/asm}/scatterlist.h | 0 + .../xtensa/include/asm}/sections.h | 0 + .../xtensa/include/asm}/segment.h | 0 + .../xtensa/include/asm}/sembuf.h | 0 + .../xtensa/include/asm}/serial.h | 2 +- + .../asm-xtensa => arch/xtensa/include/asm}/setup.h | 0 + .../xtensa/include/asm}/shmbuf.h | 0 + .../xtensa/include/asm}/shmparam.h | 0 + .../xtensa/include/asm}/sigcontext.h | 0 + .../xtensa/include/asm}/siginfo.h | 0 + .../xtensa/include/asm}/signal.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/smp.h | 0 + .../xtensa/include/asm}/socket.h | 0 + .../xtensa/include/asm}/sockios.h | 0 + .../xtensa/include/asm}/spinlock.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/stat.h | 0 + .../xtensa/include/asm}/statfs.h | 0 + .../xtensa/include/asm}/string.h | 0 + .../xtensa/include/asm}/syscall.h | 0 + .../xtensa/include/asm}/system.h | 0 + .../xtensa/include/asm}/termbits.h | 0 + .../xtensa/include/asm}/termios.h | 0 + .../xtensa/include/asm}/thread_info.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/timex.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/tlb.h | 0 + .../xtensa/include/asm}/tlbflush.h | 0 + .../xtensa/include/asm}/topology.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/types.h | 0 + .../xtensa/include/asm}/uaccess.h | 0 + .../xtensa/include/asm}/ucontext.h | 0 + .../xtensa/include/asm}/unaligned.h | 12 +- + .../xtensa/include/asm}/unistd.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/user.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/vga.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/xor.h | 0 + arch/xtensa/kernel/entry.S | 2 +- + arch/xtensa/kernel/vmlinux.lds.S | 2 +- + arch/xtensa/lib/checksum.S | 2 +- + arch/xtensa/lib/memcopy.S | 2 +- + arch/xtensa/lib/memset.S | 2 +- + arch/xtensa/lib/strncpy_user.S | 2 +- + arch/xtensa/lib/strnlen_user.S | 2 +- + arch/xtensa/lib/usercopy.S | 2 +- + arch/xtensa/platforms/iss/console.c | 2 +- + .../platforms/iss/include/platform}/hardware.h | 0 + .../platforms/iss/include/platform}/simcall.h | 0 + arch/xtensa/platforms/iss/io.c | 2 +- + arch/xtensa/platforms/iss/network.c | 2 +- + arch/xtensa/platforms/xt2000/Makefile | 5 + + .../platforms/xt2000/include/platform/hardware.h | 55 ++++++ + .../platforms/xt2000/include/platform/serial.h | 28 +++ + arch/xtensa/platforms/xt2000/setup.c | 181 ++++++++++++++++++++ + .../xtensa/variants/dc232b/include/variant}/core.h | 0 + .../variants/dc232b/include/variant}/tie-asm.h | 0 + .../xtensa/variants/dc232b/include/variant}/tie.h | 0 + .../xtensa/variants/fsf/include/variant}/core.h | 0 + .../xtensa/variants/fsf/include/variant}/tie-asm.h | 0 + .../xtensa/variants/fsf/include/variant}/tie.h | 0 + 124 files changed, 322 insertions(+), 67 deletions(-) + rename {include/asm-xtensa => arch/xtensa/include/asm}/Kbuild (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/asmmacro.h (98%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/atomic.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/auxvec.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/bitops.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/bootparam.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/bug.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/bugs.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/byteorder.h (82%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/cache.h (96%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/cacheasm.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/cacheflush.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/checksum.h (99%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/coprocessor.h (98%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/cpumask.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/cputime.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/current.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/delay.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/device.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/div64.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/dma-mapping.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/dma.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/elf.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/emergency-restart.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/errno.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/fb.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/fcntl.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/futex.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/hardirq.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/highmem.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/hw_irq.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/io.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/ioctl.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/ioctls.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/ipcbuf.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/irq.h (89%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/irq_regs.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/kdebug.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/kmap_types.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/linkage.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/local.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/mman.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/mmu.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/mmu_context.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/module.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/msgbuf.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/mutex.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/page.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/param.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/pci-bridge.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/pci.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/percpu.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/pgalloc.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/pgtable.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/platform.h (98%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/poll.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/posix_types.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/processor.h (99%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/ptrace.h (99%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/regs.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/resource.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/rmap.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/rwsem.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/scatterlist.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/sections.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/segment.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/sembuf.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/serial.h (92%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/setup.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/shmbuf.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/shmparam.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/sigcontext.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/siginfo.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/signal.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/smp.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/socket.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/sockios.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/spinlock.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/stat.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/statfs.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/string.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/syscall.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/system.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/termbits.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/termios.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/thread_info.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/timex.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/tlb.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/tlbflush.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/topology.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/types.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/uaccess.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/ucontext.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/unaligned.h (80%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/unistd.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/user.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/vga.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/xor.h (100%) + rename {include/asm-xtensa/platform-iss => arch/xtensa/platforms/iss/include/platform}/hardware.h (100%) + rename {include/asm-xtensa/platform-iss => arch/xtensa/platforms/iss/include/platform}/simcall.h (100%) + create mode 100644 arch/xtensa/platforms/xt2000/Makefile + create mode 100644 arch/xtensa/platforms/xt2000/include/platform/hardware.h + create mode 100644 arch/xtensa/platforms/xt2000/include/platform/serial.h + create mode 100644 arch/xtensa/platforms/xt2000/setup.c + rename {include/asm-xtensa/variant-dc232b => arch/xtensa/variants/dc232b/include/variant}/core.h (100%) + rename {include/asm-xtensa/variant-dc232b => arch/xtensa/variants/dc232b/include/variant}/tie-asm.h (100%) + rename {include/asm-xtensa/variant-dc232b => arch/xtensa/variants/dc232b/include/variant}/tie.h (100%) + rename {include/asm-xtensa/variant-fsf => arch/xtensa/variants/fsf/include/variant}/core.h (100%) + rename {include/asm-xtensa/variant-fsf => arch/xtensa/variants/fsf/include/variant}/tie-asm.h (100%) + rename {include/asm-xtensa/variant-fsf => arch/xtensa/variants/fsf/include/variant}/tie.h (100%) +Merging quilt/driver-core +$ git merge quilt/driver-core +Auto-merged include/linux/pci.h +Merge made by recursive. + drivers/base/attribute_container.c | 2 +- + drivers/base/bus.c | 12 ++-- + drivers/base/core.c | 36 +++++----- + drivers/base/dd.c | 12 ++-- + drivers/base/firmware_class.c | 8 +-- + drivers/base/isa.c | 7 +- + drivers/base/platform.c | 130 ++++++++++++++++++----------------- + drivers/base/power/main.c | 21 +++--- + drivers/base/power/trace.c | 4 +- + drivers/pci/pci-driver.c | 46 +++++-------- + drivers/uio/uio_cif.c | 3 +- + drivers/uio/uio_pdrv_genirq.c | 5 +- + drivers/usb/core/usb.c | 4 +- + include/linux/device.h | 13 ++-- + include/linux/init.h | 1 + + include/linux/klist.h | 2 - + include/linux/pci.h | 1 - + include/linux/platform_device.h | 1 - + include/linux/pm.h | 76 +++++++-------------- + init/Kconfig | 44 ++++++++----- + init/main.c | 9 +++ + lib/klist.c | 43 +++++++++++- + lib/kobject.c | 50 ++++++++++++++ + 23 files changed, 298 insertions(+), 232 deletions(-) +Merging quilt/usb +$ git merge quilt/usb +Merge made by recursive. + arch/arm/plat-mxc/include/mach/usb.h | 23 + + drivers/block/ub.c | 11 +- + drivers/hid/usbhid/hid-core.c | 9 +- + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 2 +- + drivers/net/usb/kaweth.c | 6 +- + drivers/net/usb/pegasus.c | 12 +- + drivers/usb/class/usbtmc.c | 9 +- + drivers/usb/core/devio.c | 5 - + drivers/usb/core/hcd.h | 4 + + drivers/usb/core/message.c | 6 +- + drivers/usb/core/sysfs.c | 35 +- + drivers/usb/core/usb.c | 23 +- + drivers/usb/gadget/Kconfig | 21 + + drivers/usb/gadget/Makefile | 1 + + drivers/usb/gadget/fsl_qe_udc.c | 12 +- + drivers/usb/gadget/gadget_chips.h | 1 - + drivers/usb/gadget/imx_udc.c | 1705 ++++++++++++ + drivers/usb/gadget/imx_udc.h | 321 +++ + drivers/usb/gadget/net2280.c | 2 +- + drivers/usb/host/Kconfig | 13 + + drivers/usb/host/Makefile | 1 + + drivers/usb/host/ehci-dbg.c | 8 +- + drivers/usb/host/ehci-hub.c | 18 +- + drivers/usb/host/oxu210hp-hcd.c | 3985 +++++++++++++++++++++++++++++ + drivers/usb/host/oxu210hp.h | 447 ++++ + drivers/usb/host/pci-quirks.c | 14 +- + drivers/usb/image/microtek.c | 11 +- + drivers/usb/misc/berry_charge.c | 5 + + drivers/usb/misc/usbtest.c | 2 - + drivers/usb/serial/Kconfig | 9 + + drivers/usb/serial/Makefile | 1 + + drivers/usb/serial/opticon.c | 363 +++ + drivers/usb/storage/transport.c | 8 +- + drivers/usb/wusbcore/rh.c | 2 +- + include/linux/oxu210hp.h | 7 + + include/linux/usb/association.h | 22 +- + 36 files changed, 7001 insertions(+), 123 deletions(-) + create mode 100644 arch/arm/plat-mxc/include/mach/usb.h + create mode 100644 drivers/usb/gadget/imx_udc.c + create mode 100644 drivers/usb/gadget/imx_udc.h + create mode 100644 drivers/usb/host/oxu210hp-hcd.c + create mode 100644 drivers/usb/host/oxu210hp.h + create mode 100644 drivers/usb/serial/opticon.c + create mode 100644 include/linux/oxu210hp.h +Merging tip-core/auto-core-next +$ git merge tip-core/auto-core-next +Merge made by recursive. + Documentation/lockstat.txt | 51 ++++--- + arch/um/include/asm/system.h | 14 +- + arch/x86/include/asm/percpu.h | 83 ++++++++++- + arch/x86/include/asm/uaccess.h | 2 + + arch/x86/include/asm/uaccess_32.h | 8 +- + arch/x86/include/asm/uaccess_64.h | 6 + + arch/x86/lib/usercopy_32.c | 8 +- + arch/x86/lib/usercopy_64.c | 4 +- + include/asm-generic/percpu.h | 11 ++- + include/asm-generic/sections.h | 10 ++ + include/asm-generic/vmlinux.lds.h | 16 ++ + include/linux/debug_locks.h | 2 +- + include/linux/futex.h | 2 + + include/linux/kernel.h | 11 ++ + include/linux/lockdep.h | 36 ++++- + include/linux/mutex.h | 2 + + include/linux/percpu.h | 17 ++- + include/linux/uaccess.h | 2 +- + include/net/sock.h | 2 +- + kernel/extable.c | 16 ++ + kernel/futex.c | 290 +++++++++++++------------------------ + kernel/lockdep.c | 37 +++-- + kernel/lockdep_proc.c | 28 +++- + kernel/module.c | 7 +- + kernel/mutex.c | 2 +- + kernel/notifier.c | 8 + + kernel/sched.c | 2 +- + kernel/softlockup.c | 2 +- + lib/Kconfig.debug | 10 ++ + mm/memory.c | 15 ++ + net/core/sock.c | 2 - + 31 files changed, 439 insertions(+), 267 deletions(-) +Merging cpus4096/auto-cpus4096-next +$ git merge cpus4096/auto-cpus4096-next +Already up-to-date. +Merging ftrace/auto-ftrace-next +$ git merge ftrace/auto-ftrace-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/Kconfig.debug +Auto-merged arch/x86/kernel/Makefile +Auto-merged arch/x86/kernel/entry_64.S +Auto-merged arch/x86/mm/fault.c +Auto-merged init/main.c +Merge made by recursive. + Documentation/kernel-parameters.txt | 8 + + arch/x86/Kconfig | 2 + + arch/x86/Kconfig.debug | 4 - + arch/x86/include/asm/ftrace.h | 29 ++- + arch/x86/include/asm/thread_info.h | 24 ++ + arch/x86/kernel/Makefile | 6 + + arch/x86/kernel/entry_32.S | 39 +++ + arch/x86/kernel/entry_64.S | 5 + + arch/x86/kernel/ftrace.c | 311 ++++++++++++++++++++++++- + arch/x86/mm/Makefile | 3 +- + arch/x86/mm/fault.c | 2 +- + drivers/char/sysrq.c | 18 ++- + include/linux/ftrace.h | 86 +++++++- + include/linux/ftrace_irq.h | 13 + + include/linux/hardirq.h | 15 +- + include/linux/marker.h | 2 - + include/linux/ring_buffer.h | 3 + + include/linux/sched.h | 11 + + include/linux/tracepoint.h | 4 + + init/main.c | 4 +- + kernel/Makefile | 4 + + kernel/marker.c | 80 +++---- + kernel/sysctl.c | 10 + + kernel/trace/Kconfig | 21 ++ + kernel/trace/Makefile | 1 + + kernel/trace/ftrace.c | 74 +++++-- + kernel/trace/ring_buffer.c | 325 ++++++++++++++++++++------ + kernel/trace/trace.c | 420 +++++++++++++++++++++++++-------- + kernel/trace/trace.h | 96 +++++++- + kernel/trace/trace_boot.c | 44 ++-- + kernel/trace/trace_functions.c | 15 +- + kernel/trace/trace_functions_return.c | 82 +++++++ + kernel/trace/trace_irqsoff.c | 52 +++-- + kernel/trace/trace_mmiotrace.c | 22 +- + kernel/trace/trace_nop.c | 16 +- + kernel/trace/trace_sched_switch.c | 103 ++++++--- + kernel/trace/trace_sched_wakeup.c | 67 +++--- + kernel/trace/trace_selftest.c | 82 ++++--- + kernel/trace/trace_stack.c | 8 +- + kernel/trace/trace_sysprof.c | 16 +- + kernel/tracepoint.c | 261 +++++++++++++-------- + scripts/Makefile.build | 12 +- + scripts/recordmcount.pl | 4 + + scripts/tracing/draw_functrace.py | 130 ++++++++++ + 44 files changed, 1964 insertions(+), 570 deletions(-) + create mode 100644 include/linux/ftrace_irq.h + create mode 100644 kernel/trace/trace_functions_return.c + create mode 100644 scripts/tracing/draw_functrace.py +Merging genirq/auto-genirq-next +$ git merge genirq/auto-genirq-next +Merge made by recursive. + arch/x86/kernel/io_apic.c | 26 ++++++++++++++--- + include/linux/irq.h | 8 +---- + kernel/irq/internals.h | 2 + + kernel/irq/manage.c | 66 +++++++++++++++++++++++++++++++++++--------- + kernel/irq/migration.c | 11 ------- + kernel/irq/proc.c | 2 +- + 6 files changed, 78 insertions(+), 37 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 arch/x86/Kconfig +Auto-merged kernel/Makefile +Auto-merged kernel/sched.c +Merge made by recursive. + Documentation/scheduler/sched-arch.txt | 4 +- + arch/ia64/Kconfig | 2 +- + arch/m32r/Kconfig | 2 +- + arch/mips/Kconfig | 2 +- + arch/powerpc/Kconfig | 2 +- + arch/x86/Kconfig | 4 +- + include/asm-m32r/system.h | 2 +- + include/linux/rcuclassic.h | 2 +- + kernel/Makefile | 3 +- + kernel/rcuclassic.c | 4 +- + kernel/sched.c | 138 +++++++++++-------------------- + kernel/sched_debug.c | 14 +--- + kernel/sched_rt.c | 7 +- + 13 files changed, 68 insertions(+), 118 deletions(-) +Merging stackprotector/auto-stackprotector-next +$ git merge stackprotector/auto-stackprotector-next +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/Kconfig.debug +Auto-merged arch/x86/include/asm/system.h +Auto-merged arch/x86/kernel/Makefile +Auto-merged arch/x86/mm/fault.c +Auto-merged include/linux/sched.h +Auto-merged init/main.c +Auto-merged kernel/exit.c +Auto-merged kernel/sched.c +Merge made by recursive. + arch/x86/Kconfig | 23 ++++++++++------------- + arch/x86/Kconfig.debug | 1 + + arch/x86/Makefile | 2 +- + arch/x86/include/asm/pda.h | 4 ++-- + arch/x86/include/asm/system.h | 6 +++++- + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/process_64.c | 13 ++++++++++++- + arch/x86/mm/fault.c | 7 +++++++ + include/asm-x86/stackprotector.h | 38 ++++++++++++++++++++++++++++++++++++++ + include/linux/magic.h | 1 + + include/linux/sched.h | 16 ++++++++++++++-- + include/linux/stackprotector.h | 16 ++++++++++++++++ + init/main.c | 7 +++++++ + kernel/exit.c | 5 +---- + kernel/fork.c | 5 +++++ + kernel/panic.c | 12 +++++++++++- + kernel/sched.c | 7 +------ + 17 files changed, 133 insertions(+), 31 deletions(-) + create mode 100644 include/asm-x86/stackprotector.h + create mode 100644 include/linux/stackprotector.h +Merging timers/auto-timers-next +$ git merge timers/auto-timers-next +Already uptodate! +Merge made by recursive. +Merging pci/linux-next +$ git merge pci/linux-next +Auto-merged arch/x86/pci/common.c +Auto-merged drivers/acpi/pci_root.c +Auto-merged drivers/pci/pci-acpi.c +Auto-merged drivers/pci/quirks.c +Auto-merged include/linux/pci.h +Merge made by recursive. + arch/x86/kernel/pci-dma.c | 2 +- + arch/x86/pci/common.c | 8 ++ + drivers/acpi/pci_root.c | 20 ++++++ + drivers/pci/bus.c | 4 + + drivers/pci/hotplug/acpiphp_ibm.c | 2 +- + drivers/pci/hotplug/pciehp_ctrl.c | 26 ++++---- + drivers/pci/irq.c | 2 +- + drivers/pci/msi.c | 31 +++------ + drivers/pci/pci-acpi.c | 39 ++++------- + drivers/pci/pci-sysfs.c | 2 +- + drivers/pci/pci.c | 126 +++++++++++++++++++++++++++--------- + drivers/pci/pci.h | 6 +- + drivers/pci/pcie/aer/aerdrv_acpi.c | 1 - + drivers/pci/pcie/aspm.c | 27 +++----- + drivers/pci/pcie/portdrv_core.c | 2 +- + drivers/pci/probe.c | 6 +- + drivers/pci/proc.c | 11 +++- + drivers/pci/quirks.c | 5 +- + include/linux/pci-acpi.h | 14 +--- + include/linux/pci.h | 16 +++++ + include/linux/pci_regs.h | 12 ++++ + 21 files changed, 230 insertions(+), 132 deletions(-) +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Merge made by recursive. + drivers/md/dm-crypt.c | 6 +----- + drivers/md/dm-delay.c | 6 +----- + drivers/md/dm-linear.c | 5 +---- + drivers/md/dm-mpath.c | 14 +++++++------- + drivers/md/dm-raid1.c | 7 ++----- + drivers/md/dm-snap.c | 11 ++--------- + drivers/md/dm-stripe.c | 8 ++++---- + drivers/md/dm-target.c | 15 +++++++-------- + drivers/md/dm-zero.c | 5 +---- + drivers/md/dm.c | 10 +++++----- + include/linux/device-mapper.h | 5 ++++- + 11 files changed, 35 insertions(+), 57 deletions(-) +Merging hid/mm +$ git merge hid/mm +Removed drivers/hid/hid-bright.c +Auto-merged drivers/hid/hid-core.c +Removed drivers/hid/hid-dell.c +Auto-merged drivers/hid/hid-ids.h +Auto-merged drivers/hid/usbhid/hid-core.c +Merge made by recursive. + drivers/hid/Kconfig | 15 -------- + drivers/hid/Makefile | 2 - + drivers/hid/hid-apple.c | 11 +++++- + drivers/hid/hid-bright.c | 71 -------------------------------------- + drivers/hid/hid-core.c | 20 ++++++----- + drivers/hid/hid-dell.c | 76 ----------------------------------------- + drivers/hid/hid-ids.h | 14 ++------ + drivers/hid/hid-lg.c | 7 ---- + drivers/hid/hidraw.c | 58 +++++++++++++++++++++++------- + drivers/hid/usbhid/hid-core.c | 23 ++++++++++-- + include/linux/hidraw.h | 2 + + include/linux/input.h | 2 + + 12 files changed, 90 insertions(+), 211 deletions(-) + delete mode 100644 drivers/hid/hid-bright.c + delete mode 100644 drivers/hid/hid-dell.c +Merging quilt/i2c +$ git merge quilt/i2c +Auto-merged drivers/i2c/busses/i2c-pxa.c +Merge made by recursive. + drivers/i2c/busses/i2c-bfin-twi.c | 2 +- + drivers/i2c/busses/i2c-i801.c | 50 ++++++++++++++- + drivers/i2c/busses/i2c-pxa.c | 4 +- + drivers/i2c/busses/i2c-s3c2410.c | 2 +- + drivers/i2c/busses/i2c-sh7760.c | 2 +- + drivers/i2c/busses/i2c-sh_mobile.c | 2 +- + drivers/i2c/i2c-core.c | 8 +- + drivers/input/misc/apanel.c | 81 ++++++++---------------- + drivers/media/video/cafe_ccic.c | 1 - + drivers/media/video/ov7670.c | 1 - + drivers/media/video/ovcamchip/ovcamchip_core.c | 1 - + drivers/media/video/w9968cf.c | 1 - + include/linux/i2c.h | 4 - + 13 files changed, 86 insertions(+), 73 deletions(-) +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Merge made by recursive. + Documentation/hwmon/it87 | 20 +- + Documentation/hwmon/lm70 | 11 +- + Documentation/hwmon/ltc4245 | 81 +++ + Documentation/spi/spi-lm70llp | 9 + + drivers/hwmon/Kconfig | 19 +- + drivers/hwmon/Makefile | 1 + + drivers/hwmon/asb100.c | 5 +- + drivers/hwmon/f71882fg.c | 1130 +++++++++++++++++++++++++++++++++++------ + drivers/hwmon/fschmd.c | 47 +- + drivers/hwmon/i5k_amb.c | 7 + + drivers/hwmon/it87.c | 30 +- + drivers/hwmon/k8temp.c | 15 + + drivers/hwmon/lm70.c | 86 +++- + drivers/hwmon/ltc4245.c | 567 +++++++++++++++++++++ + drivers/hwmon/w83781d.c | 5 +- + drivers/hwmon/w83791d.c | 5 +- + drivers/hwmon/w83792d.c | 5 +- + drivers/hwmon/w83793.c | 5 +- + drivers/spi/spi_lm70llp.c | 35 +- + 19 files changed, 1831 insertions(+), 252 deletions(-) + create mode 100644 Documentation/hwmon/ltc4245 + create mode 100644 drivers/hwmon/ltc4245.c +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Already up-to-date. +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Auto-merged drivers/hid/hid-core.c +Auto-merged drivers/media/video/pvrusb2/pvrusb2-hdw.c +Merge made by recursive. + Documentation/video4linux/CARDLIST.cx88 | 5 +- + Documentation/video4linux/README.cx88 | 8 +- + Documentation/video4linux/gspca.txt | 1 + + drivers/hid/hid-core.c | 1 + + drivers/media/common/saa7146_fops.c | 2 +- + drivers/media/common/saa7146_video.c | 10 +- + drivers/media/common/tuners/tda9887.c | 5 +- + drivers/media/dvb/Kconfig | 13 + + drivers/media/dvb/dm1105/dm1105.c | 3 +- + drivers/media/dvb/dvb-core/dvb_frontend.c | 75 +- + drivers/media/dvb/dvb-core/dvb_frontend.h | 134 ++- + drivers/media/dvb/dvb-core/dvbdev.c | 71 +- + drivers/media/dvb/dvb-core/dvbdev.h | 1 + + drivers/media/dvb/dvb-usb/af9015.c | 19 +- + drivers/media/dvb/dvb-usb/af9015.h | 76 + + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 1 + + drivers/media/dvb/dvb-usb/dw2102.c | 13 +- + drivers/media/dvb/frontends/Kconfig | 45 + + drivers/media/dvb/frontends/Makefile | 9 + + drivers/media/dvb/frontends/dvb-pll.c | 2 +- + drivers/media/dvb/frontends/lgdt3304.c | 378 ++++ + drivers/media/dvb/frontends/lgdt3304.h | 45 + + drivers/media/dvb/frontends/s921_core.c | 216 +++ + drivers/media/dvb/frontends/s921_core.h | 114 ++ + drivers/media/dvb/frontends/s921_module.c | 190 ++ + drivers/media/dvb/frontends/s921_module.h | 49 + + drivers/media/dvb/frontends/si21xx.c | 1 - + drivers/media/dvb/frontends/stb0899_algo.c | 1519 +++++++++++++++ + drivers/media/dvb/frontends/stb0899_cfg.h | 287 +++ + drivers/media/dvb/frontends/stb0899_drv.c | 1684 ++++++++++++++++ + drivers/media/dvb/frontends/stb0899_drv.h | 162 ++ + drivers/media/dvb/frontends/stb0899_priv.h | 267 +++ + drivers/media/dvb/frontends/stb0899_reg.h | 2027 ++++++++++++++++++++ + drivers/media/dvb/frontends/stb6100.c | 545 ++++++ + drivers/media/dvb/frontends/stb6100.h | 115 ++ + drivers/media/dvb/frontends/stb6100_cfg.h | 108 ++ + drivers/media/dvb/frontends/tda8261.c | 230 +++ + drivers/media/dvb/frontends/tda8261.h | 55 + + drivers/media/dvb/frontends/tda8261_cfg.h | 84 + + drivers/media/dvb/frontends/zl10353.c | 3 + + drivers/media/dvb/ttpci/Kconfig | 4 + + drivers/media/dvb/ttpci/budget-av.c | 298 +++ + drivers/media/dvb/ttpci/budget-ci.c | 311 +++ + drivers/media/dvb/ttpci/budget.h | 1 + + drivers/media/radio/dsbr100.c | 71 +- + drivers/media/radio/radio-aimslab.c | 2 +- + drivers/media/radio/radio-cadet.c | 2 +- + drivers/media/radio/radio-gemtek.c | 2 +- + drivers/media/radio/radio-mr800.c | 43 +- + drivers/media/radio/radio-rtrack2.c | 2 +- + drivers/media/radio/radio-sf16fmi.c | 2 +- + drivers/media/video/Kconfig | 14 +- + drivers/media/video/Makefile | 4 +- + drivers/media/video/arv.c | 5 +- + drivers/media/video/bt8xx/bttv-gpio.c | 7 +- + drivers/media/video/bt8xx/bttv.h | 2 +- + drivers/media/video/bt8xx/bttvp.h | 2 +- + drivers/media/video/bw-qcam.c | 5 +- + drivers/media/video/c-qcam.c | 7 +- + drivers/media/video/cpia.c | 9 +- + drivers/media/video/cpia2/cpia2_core.c | 2 +- + drivers/media/video/cpia2/cpia2_usb.c | 2 +- + drivers/media/video/cpia2/cpia2_v4l.c | 15 +- + drivers/media/video/cx18/cx18-av-audio.c | 41 +- + drivers/media/video/cx18/cx18-av-core.c | 100 +- + drivers/media/video/cx18/cx18-av-core.h | 3 + + drivers/media/video/cx18/cx18-av-firmware.c | 22 +- + drivers/media/video/cx18/cx18-driver.c | 2 - + drivers/media/video/cx18/cx18-driver.h | 7 +- + drivers/media/video/cx18/cx18-firmware.c | 60 +- + drivers/media/video/cx18/cx18-gpio.c | 22 +- + drivers/media/video/cx18/cx18-i2c.c | 24 +- + drivers/media/video/cx18/cx18-io.c | 24 +- + drivers/media/video/cx18/cx18-io.h | 8 +- + drivers/media/video/cx25840/Kconfig | 2 +- + drivers/media/video/cx88/cx88-cards.c | 86 +- + drivers/media/video/cx88/cx88-core.c | 3 + + drivers/media/video/cx88/cx88-dvb.c | 182 +- + drivers/media/video/cx88/cx88.h | 14 +- + drivers/media/video/em28xx/em28xx-audio.c | 11 +- + drivers/media/video/em28xx/em28xx-video.c | 4 +- + drivers/media/video/et61x251/et61x251_core.c | 2 +- + drivers/media/video/gspca/finepix.c | 3 - + drivers/media/video/gspca/gspca.c | 16 +- + drivers/media/video/gspca/gspca.h | 11 +- + drivers/media/video/gspca/ov519.c | 155 +- + drivers/media/video/gspca/pac207.c | 1 + + drivers/media/video/gspca/sonixb.c | 21 +- + drivers/media/video/gspca/sonixj.c | 60 +- + drivers/media/video/gspca/tv8532.c | 140 +- + drivers/media/video/gspca/zc3xx.c | 278 ++-- + drivers/media/video/ir-kbd-i2c.c | 6 +- + drivers/media/video/ivtv/ivtv-cards.c | 16 +- + drivers/media/video/ov511.c | 5 +- + drivers/media/video/ov772x.c | 964 ++++++++++ + drivers/media/video/pms.c | 9 +- + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 2 +- + drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 4 +- + drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 13 +- + drivers/media/video/pwc/pwc-if.c | 2 +- + drivers/media/video/pwc/pwc-v4l.c | 3 +- + drivers/media/video/pwc/pwc.h | 3 +- + drivers/media/video/saa5246a.c | 7 +- + drivers/media/video/saa5249.c | 7 +- + drivers/media/video/saa7134/saa7134-dvb.c | 24 +- + drivers/media/video/saa7134/saa7134.h | 2 +- + drivers/media/video/se401.c | 5 +- + drivers/media/video/sh_mobile_ceu_camera.c | 6 +- + drivers/media/video/sn9c102/sn9c102_core.c | 2 +- + drivers/media/video/sn9c102/sn9c102_devtable.h | 4 + + drivers/media/video/soc_camera.c | 5 +- + drivers/media/video/stv680.c | 5 +- + drivers/media/video/tvp5150.c | 15 + + drivers/media/video/usbvideo/usbvideo.c | 5 +- + drivers/media/video/usbvision/usbvision-video.c | 6 +- + drivers/media/video/uvc/uvc_driver.c | 169 +-- + drivers/media/video/uvc/uvc_v4l2.c | 17 +- + drivers/media/video/uvc/uvc_video.c | 63 +- + drivers/media/video/uvc/uvcvideo.h | 14 +- + drivers/media/video/v4l2-common.c | 2 +- + .../{compat_ioctl32.c => v4l2-compat-ioctl32.c} | 92 +- + drivers/media/video/v4l2-dev.c | 4 +- + drivers/media/video/v4l2-ioctl.c | 92 +- + drivers/media/video/vino.c | 5 +- + drivers/media/video/w9966.c | 5 +- + drivers/media/video/zc0301/zc0301_core.c | 2 +- + drivers/media/video/zoran/zoran_driver.c | 8 +- + firmware/Makefile | 16 +- + include/linux/videodev2.h | 1 + + include/media/ov772x.h | 21 + + include/media/saa7146_vv.h | 3 +- + include/media/soc_camera.h | 4 +- + include/media/v4l2-chip-ident.h | 1 + + include/media/v4l2-ioctl.h | 12 +- + sound/i2c/other/tea575x-tuner.c | 22 +- + 135 files changed, 11360 insertions(+), 1000 deletions(-) + create mode 100644 drivers/media/dvb/frontends/lgdt3304.c + create mode 100644 drivers/media/dvb/frontends/lgdt3304.h + create mode 100644 drivers/media/dvb/frontends/s921_core.c + create mode 100644 drivers/media/dvb/frontends/s921_core.h + create mode 100644 drivers/media/dvb/frontends/s921_module.c + create mode 100644 drivers/media/dvb/frontends/s921_module.h + create mode 100644 drivers/media/dvb/frontends/stb0899_algo.c + create mode 100644 drivers/media/dvb/frontends/stb0899_cfg.h + create mode 100644 drivers/media/dvb/frontends/stb0899_drv.c + create mode 100644 drivers/media/dvb/frontends/stb0899_drv.h + create mode 100644 drivers/media/dvb/frontends/stb0899_priv.h + create mode 100644 drivers/media/dvb/frontends/stb0899_reg.h + create mode 100644 drivers/media/dvb/frontends/stb6100.c + create mode 100644 drivers/media/dvb/frontends/stb6100.h + create mode 100644 drivers/media/dvb/frontends/stb6100_cfg.h + create mode 100644 drivers/media/dvb/frontends/tda8261.c + create mode 100644 drivers/media/dvb/frontends/tda8261.h + create mode 100644 drivers/media/dvb/frontends/tda8261_cfg.h + create mode 100644 drivers/media/video/ov772x.c + rename drivers/media/video/{compat_ioctl32.c => v4l2-compat-ioctl32.c} (92%) + create mode 100644 include/media/ov772x.h +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging kbuild/master +$ git merge kbuild/master +Already up-to-date. +Merging quilt/ide +$ git merge quilt/ide +Auto-merged drivers/ide/Kconfig +Merge made by recursive. + drivers/ide/Kconfig | 5 + + drivers/ide/Makefile | 3 +- + drivers/ide/cmd64x.c | 4 +- + drivers/ide/cy82c693.c | 1 - + drivers/ide/gayle.c | 6 +- + drivers/ide/hpt366.c | 8 +- + drivers/ide/ide-cd.c | 142 ++++-------------- + drivers/ide/ide-cd.h | 2 - + drivers/ide/ide-dma-sff.c | 54 +++---- + drivers/ide/ide-io.c | 367 +++++++++++---------------------------------- + drivers/ide/ide-ioctls.c | 5 +- + drivers/ide/ide-iops.c | 53 +++---- + drivers/ide/ide-legacy.c | 58 +++++++ + drivers/ide/ide-lib.c | 105 +++++++------ + drivers/ide/ide-park.c | 16 +- + drivers/ide/ide-pm.c | 233 ++++++++++++++++++++++++++++ + drivers/ide/ide-probe.c | 162 ++++---------------- + drivers/ide/ide-proc.c | 29 +--- + drivers/ide/ide.c | 89 +----------- + drivers/ide/rz1000.c | 36 +++-- + drivers/ide/trm290.c | 4 +- + drivers/ide/umc8672.c | 11 +- + drivers/scsi/ide-scsi.c | 32 +++-- + include/linux/ide.h | 39 +++--- + 24 files changed, 642 insertions(+), 822 deletions(-) + create mode 100644 drivers/ide/ide-legacy.c + create mode 100644 drivers/ide/ide-pm.c +Merging libata/NEXT +$ git merge libata/NEXT +Already up-to-date. +Merging nfs/linux-next +$ git merge nfs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Removed fs/xfs/xfs_clnt.h +Auto-merged fs/xfs/xfs_inode.c +Auto-merged fs/xfs/xfs_log.c +Auto-merged fs/xfs/xfs_log_recover.c +Auto-merged fs/xfs/xfs_mount.c +Merge made by recursive. + Documentation/filesystems/xfs.txt | 4 - + fs/inode.c | 209 ++- + fs/xfs/Makefile | 4 +- + fs/xfs/linux-2.6/xfs_aops.c | 2 +- + fs/xfs/linux-2.6/xfs_cred.h | 10 +- + fs/xfs/linux-2.6/xfs_globals.c | 8 - + fs/xfs/linux-2.6/xfs_globals.h | 1 - + fs/xfs/linux-2.6/xfs_ioctl.c | 9 +- + fs/xfs/linux-2.6/xfs_iops.c | 25 +- + fs/xfs/linux-2.6/xfs_linux.h | 2 +- + fs/xfs/linux-2.6/xfs_stats.c | 4 + + fs/xfs/linux-2.6/xfs_stats.h | 65 + + fs/xfs/linux-2.6/xfs_super.c | 851 ++++------ + fs/xfs/linux-2.6/xfs_super.h | 3 - + fs/xfs/linux-2.6/xfs_sync.c | 763 ++++++++ + fs/xfs/linux-2.6/xfs_sync.h | 55 + + fs/xfs/linux-2.6/xfs_sysctl.c | 11 - + fs/xfs/linux-2.6/xfs_sysctl.h | 3 +- + fs/xfs/linux-2.6/xfs_vfs.h | 31 - + fs/xfs/linux-2.6/xfs_vnode.c | 15 +- + fs/xfs/linux-2.6/xfs_vnode.h | 5 - + fs/xfs/quota/xfs_dquot.c | 39 +- + fs/xfs/quota/xfs_dquot.h | 4 +- + fs/xfs/quota/xfs_dquot_item.c | 45 +- + fs/xfs/quota/xfs_qm.c | 13 +- + fs/xfs/quota/xfs_qm.h | 1 - + fs/xfs/quota/xfs_qm_bhv.c | 1 - + fs/xfs/quota/xfs_qm_syscalls.c | 137 +- + fs/xfs/support/debug.c | 2 +- + fs/xfs/xfs.h | 2 +- + fs/xfs/xfs_acl.c | 8 +- + fs/xfs/xfs_ag.h | 10 +- + fs/xfs/xfs_alloc.c | 195 ++- + fs/xfs/xfs_alloc.h | 27 +- + fs/xfs/xfs_alloc_btree.c | 2387 ++++--------------------- + fs/xfs/xfs_alloc_btree.h | 107 +- + fs/xfs/xfs_arch.h | 39 +- + fs/xfs/xfs_bit.h | 3 +- + fs/xfs/xfs_bmap.c | 296 ++-- + fs/xfs/xfs_bmap.h | 61 +- + fs/xfs/xfs_bmap_btree.c | 2614 +++++---------------------- + fs/xfs/xfs_bmap_btree.h | 171 +-- + fs/xfs/xfs_btree.c | 3596 ++++++++++++++++++++++++++++++++----- + fs/xfs/xfs_btree.h | 392 +++-- + fs/xfs/xfs_btree_trace.c | 249 +++ + fs/xfs/xfs_btree_trace.h | 116 ++ + fs/xfs/xfs_buf_item.c | 25 +- + fs/xfs/xfs_clnt.h | 105 -- + fs/xfs/xfs_da_btree.h | 24 +- + fs/xfs/xfs_dinode.h | 5 +- + fs/xfs/xfs_dmops.c | 5 +- + fs/xfs/xfs_extfree_item.c | 45 +- + fs/xfs/xfs_fsops.c | 24 +- + fs/xfs/xfs_ialloc.c | 132 ++- + fs/xfs/xfs_ialloc.h | 21 +- + fs/xfs/xfs_ialloc_btree.c | 2193 +++-------------------- + fs/xfs/xfs_ialloc_btree.h | 111 +- + fs/xfs/xfs_iget.c | 501 ++---- + fs/xfs/xfs_imap.h | 2 - + fs/xfs/xfs_inode.c | 290 ++-- + fs/xfs/xfs_inode.h | 288 ++-- + fs/xfs/xfs_inode_item.c | 30 +- + fs/xfs/xfs_inode_item.h | 41 +- + fs/xfs/xfs_itable.c | 33 +- + fs/xfs/xfs_log.c | 10 +- + fs/xfs/xfs_log_priv.h | 1 + + fs/xfs/xfs_log_recover.c | 97 +- + fs/xfs/xfs_mount.c | 42 +- + fs/xfs/xfs_mount.h | 55 +- + fs/xfs/xfs_qmops.c | 5 +- + fs/xfs/xfs_trans.c | 13 +- + fs/xfs/xfs_trans.h | 322 ++-- + fs/xfs/xfs_trans_ail.c | 362 +++-- + fs/xfs/xfs_trans_buf.c | 7 +- + fs/xfs/xfs_trans_item.c | 10 + + fs/xfs/xfs_trans_priv.h | 98 +- + fs/xfs/xfs_vfsops.c | 617 +------- + fs/xfs/xfs_vfsops.h | 2 - + fs/xfs/xfs_vnodeops.c | 141 +-- + fs/xfs/xfs_vnodeops.h | 6 +- + include/linux/fs.h | 2 + + kernel/sysctl_check.c | 1 - + 82 files changed, 8086 insertions(+), 10175 deletions(-) + create mode 100644 fs/xfs/linux-2.6/xfs_sync.c + create mode 100644 fs/xfs/linux-2.6/xfs_sync.h + create mode 100644 fs/xfs/xfs_btree_trace.c + create mode 100644 fs/xfs/xfs_btree_trace.h + delete mode 100644 fs/xfs/xfs_clnt.h +Merging infiniband/for-next +$ git merge infiniband/for-next +Already up-to-date. +Merging acpi/test +$ git merge acpi/test +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/x86/kernel/reboot.c +Merge made by recursive. + Documentation/kernel-parameters.txt | 5 +- + arch/x86/kernel/acpi/sleep.c | 2 + + arch/x86/kernel/e820.c | 21 ++ + arch/x86/kernel/reboot.c | 2 +- + drivers/acpi/osl.c | 44 ---- + drivers/acpi/sleep/main.c | 68 ++++++- + drivers/acpi/toshiba_acpi.c | 19 +- + drivers/misc/thinkpad_acpi.c | 57 +++++-- + include/linux/acpi.h | 1 + + include/linux/suspend.h | 13 ++ + kernel/power/disk.c | 6 +- + kernel/power/snapshot.c | 367 +++++++++++++++++++---------------- + kernel/power/swsusp.c | 122 ++++++++++++ + 13 files changed, 479 insertions(+), 248 deletions(-) +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Merge made by recursive. + fs/lockd/svc.c | 8 ++++++++ + fs/nfsd/nfs4recover.c | 2 +- + fs/nfsd/nfs4state.c | 7 ++++--- + fs/nfsd/nfsfh.c | 30 ++++++++++++++++++++++++------ + include/linux/nfsd/nfsfh.h | 4 ++++ + include/linux/sunrpc/svc.h | 5 ++++- + net/sunrpc/svc_xprt.c | 22 ++++++++++++++++------ + 7 files changed, 61 insertions(+), 17 deletions(-) +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Auto-merged drivers/media/dvb/Kconfig +Merge made by recursive. + drivers/firewire/fw-cdev.c | 36 +- + drivers/firewire/fw-device.c | 3 + + drivers/firewire/fw-device.h | 4 + + drivers/firewire/fw-ohci.c | 73 +-- + drivers/firewire/fw-sbp2.c | 21 +- + drivers/ieee1394/dma.h | 1 + + 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/media/dvb/Kconfig | 2 + + drivers/media/dvb/Makefile | 2 + + drivers/media/dvb/firesat/Kconfig | 12 + + drivers/media/dvb/firesat/Makefile | 13 + + drivers/media/dvb/firesat/avc_api.c | 1051 ++++++++++++++++++++++++++++++ + drivers/media/dvb/firesat/avc_api.h | 432 ++++++++++++ + drivers/media/dvb/firesat/cmp.c | 171 +++++ + drivers/media/dvb/firesat/cmp.h | 9 + + drivers/media/dvb/firesat/firesat-ci.c | 255 ++++++++ + drivers/media/dvb/firesat/firesat-ci.h | 9 + + drivers/media/dvb/firesat/firesat-rc.c | 191 ++++++ + drivers/media/dvb/firesat/firesat-rc.h | 11 + + drivers/media/dvb/firesat/firesat.h | 227 +++++++ + drivers/media/dvb/firesat/firesat_1394.c | 291 +++++++++ + drivers/media/dvb/firesat/firesat_dvb.c | 276 ++++++++ + drivers/media/dvb/firesat/firesat_fe.c | 245 +++++++ + drivers/media/dvb/firesat/firesat_iso.c | 111 ++++ + 29 files changed, 3430 insertions(+), 77 deletions(-) + create mode 100644 drivers/media/dvb/firesat/Kconfig + create mode 100644 drivers/media/dvb/firesat/Makefile + create mode 100644 drivers/media/dvb/firesat/avc_api.c + create mode 100644 drivers/media/dvb/firesat/avc_api.h + create mode 100644 drivers/media/dvb/firesat/cmp.c + create mode 100644 drivers/media/dvb/firesat/cmp.h + create mode 100644 drivers/media/dvb/firesat/firesat-ci.c + create mode 100644 drivers/media/dvb/firesat/firesat-ci.h + create mode 100644 drivers/media/dvb/firesat/firesat-rc.c + create mode 100644 drivers/media/dvb/firesat/firesat-rc.h + create mode 100644 drivers/media/dvb/firesat/firesat.h + create mode 100644 drivers/media/dvb/firesat/firesat_1394.c + create mode 100644 drivers/media/dvb/firesat/firesat_dvb.c + create mode 100644 drivers/media/dvb/firesat/firesat_fe.c + create mode 100644 drivers/media/dvb/firesat/firesat_iso.c +Merging ubi/linux-next +$ git merge ubi/linux-next +Merge made by recursive. + drivers/mtd/ubi/eba.c | 2 +- + drivers/mtd/ubi/scan.c | 2 +- + drivers/mtd/ubi/wl.c | 3 ++- + 3 files changed, 4 insertions(+), 3 deletions(-) +Merging kvm/master +$ git merge kvm/master +Auto-merged arch/ia64/kvm/kvm-ia64.c +Auto-merged arch/powerpc/kernel/asm-offsets.c +Removed arch/powerpc/kvm/booke_host.c +Auto-merged arch/x86/kernel/cpu/mtrr/main.c +Auto-merged arch/x86/kvm/i8254.c +Auto-merged arch/x86/kvm/mmu.c +Auto-merged arch/x86/kvm/vmx.c +CONFLICT (content): Merge conflict in arch/x86/kvm/vmx.c +Auto-merged arch/x86/kvm/vmx.h +Recorded preimage for 'arch/x86/kvm/vmx.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/x86/kvm/vmx.c'. +Created commit 82ad847: Merge commit 'kvm/master' +$ git diff -M --stat --summary HEAD^.. + arch/ia64/include/asm/kvm_host.h | 192 ++++++++----- + arch/ia64/kvm/asm-offsets.c | 11 +- + arch/ia64/kvm/kvm-ia64.c | 62 ++-- + arch/ia64/kvm/kvm_minstate.h | 4 +- + arch/ia64/kvm/misc.h | 3 +- + arch/ia64/kvm/vcpu.c | 5 +- + arch/ia64/kvm/vtlb.c | 4 +- + arch/powerpc/include/asm/disassemble.h | 80 +++++ + arch/powerpc/include/asm/kvm_44x.h | 47 +++ + arch/powerpc/include/asm/kvm_host.h | 62 ++--- + arch/powerpc/include/asm/kvm_ppc.h | 79 ++--- + arch/powerpc/kernel/asm-offsets.c | 16 +- + arch/powerpc/kvm/44x.c | 234 ++++++++++++++ + arch/powerpc/kvm/44x_emulate.c | 369 ++++++++++++++++++++++ + arch/powerpc/kvm/44x_tlb.c | 179 ++++++++++- + arch/powerpc/kvm/44x_tlb.h | 29 ++- + arch/powerpc/kvm/Kconfig | 21 +- + arch/powerpc/kvm/Makefile | 11 +- + arch/powerpc/kvm/{booke_guest.c => booke.c} | 358 +++++++++------------- + arch/powerpc/kvm/booke.h | 57 ++++ + arch/powerpc/kvm/booke_host.c | 83 ----- + arch/powerpc/kvm/booke_interrupts.S | 6 +- + arch/powerpc/kvm/emulate.c | 443 ++------------------------- + arch/powerpc/kvm/powerpc.c | 130 +------- + arch/x86/include/asm/kvm_host.h | 22 +- + arch/x86/include/asm/kvm_x86_emulate.h | 10 +- + arch/x86/include/asm/mtrr.h | 25 ++ + arch/x86/kernel/cpu/mtrr/generic.c | 12 +- + arch/x86/kernel/cpu/mtrr/main.c | 4 +- + arch/x86/kernel/cpu/mtrr/mtrr.h | 18 +- + arch/x86/kvm/i8254.c | 19 ++ + arch/x86/kvm/irq.h | 1 + + arch/x86/kvm/lapic.c | 58 +++- + arch/x86/kvm/mmu.c | 135 ++++++++- + arch/x86/kvm/svm.c | 23 ++ + arch/x86/kvm/vmx.c | 345 ++++++++++++++------- + arch/x86/kvm/vmx.h | 12 +- + arch/x86/kvm/x86.c | 138 ++++++++-- + arch/x86/kvm/x86_emulate.c | 12 +- + include/linux/kvm.h | 11 +- + include/linux/kvm_host.h | 3 +- + virt/kvm/ioapic.c | 1 + + virt/kvm/irq_comm.c | 8 +- + virt/kvm/kvm_main.c | 18 +- + 44 files changed, 2079 insertions(+), 1281 deletions(-) + create mode 100644 arch/powerpc/include/asm/disassemble.h + create mode 100644 arch/powerpc/include/asm/kvm_44x.h + create mode 100644 arch/powerpc/kvm/44x.c + create mode 100644 arch/powerpc/kvm/44x_emulate.c + rename arch/powerpc/kvm/{booke_guest.c => booke.c} (61%) + create mode 100644 arch/powerpc/kvm/booke.h + delete mode 100644 arch/powerpc/kvm/booke_host.c +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Merge made by recursive. + drivers/scsi/NCR5380.c | 2 +- + drivers/scsi/a100u2w.c | 2 +- + drivers/scsi/aacraid/aachba.c | 2 +- + drivers/scsi/aacraid/commctrl.c | 14 +- + drivers/scsi/aacraid/comminit.c | 2 +- + drivers/scsi/aacraid/commsup.c | 2 +- + drivers/scsi/aacraid/dpcsup.c | 2 +- + drivers/scsi/aacraid/linit.c | 2 +- + drivers/scsi/aacraid/rkt.c | 2 +- + drivers/scsi/aacraid/rx.c | 2 +- + drivers/scsi/aacraid/sa.c | 2 +- + drivers/scsi/advansys.c | 3 +- + drivers/scsi/aha1740.c | 2 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 8 +- + drivers/scsi/atp870u.c | 4 +- + drivers/scsi/device_handler/scsi_dh_rdac.c | 16 +- + drivers/scsi/eata_pio.c | 4 +- + drivers/scsi/esp_scsi.c | 6 +- + drivers/scsi/fdomain.c | 2 +- + drivers/scsi/ibmmca.c | 2 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 261 ++++-- + drivers/scsi/ibmvscsi/ibmvfc.h | 9 +- + drivers/scsi/in2000.c | 2 +- + drivers/scsi/initio.c | 2 +- + drivers/scsi/initio.h | 2 +- + drivers/scsi/ipr.c | 2 +- + drivers/scsi/ipr.h | 2 +- + drivers/scsi/nsp32.c | 3 +- + drivers/scsi/qla1280.c | 3 +- + drivers/scsi/qla2xxx/qla_attr.c | 298 ++++--- + drivers/scsi/qla2xxx/qla_dbg.c | 61 +- + drivers/scsi/qla2xxx/qla_def.h | 525 ++++++------ + drivers/scsi/qla2xxx/qla_dfs.c | 21 +- + drivers/scsi/qla2xxx/qla_gbl.h | 13 +- + drivers/scsi/qla2xxx/qla_gs.c | 479 ++++++------ + drivers/scsi/qla2xxx/qla_init.c | 1113 +++++++++++++------------ + drivers/scsi/qla2xxx/qla_inline.h | 27 +- + drivers/scsi/qla2xxx/qla_iocb.c | 258 +++--- + drivers/scsi/qla2xxx/qla_isr.c | 633 ++++++++------- + drivers/scsi/qla2xxx/qla_mbx.c | 759 +++++++++-------- + drivers/scsi/qla2xxx/qla_mid.c | 173 ++--- + drivers/scsi/qla2xxx/qla_os.c | 1265 +++++++++++++++------------- + drivers/scsi/qla2xxx/qla_sup.c | 537 ++++++------ + drivers/scsi/qla2xxx/qla_version.h | 4 +- + drivers/scsi/qlogicfas408.c | 2 +- + drivers/scsi/scsi_error.c | 6 +- + drivers/scsi/scsi_ioctl.c | 4 +- + drivers/scsi/stex.c | 3 +- + drivers/scsi/sym53c416.c | 2 +- + drivers/scsi/tmscsim.c | 3 +- + drivers/scsi/u14-34f.c | 3 +- + drivers/scsi/wd7000.c | 4 +- + 52 files changed, 3475 insertions(+), 3085 deletions(-) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Merge made by recursive. + fs/ocfs2/alloc.c | 106 +++- + fs/ocfs2/alloc.h | 8 + + fs/ocfs2/dlm/userdlm.h | 2 +- + fs/ocfs2/ocfs2.h | 2 +- + fs/ocfs2/stack_user.c | 3 + + fs/ocfs2/xattr.c | 1847 ++++++++++++++++++++++++++---------------------- + 6 files changed, 1109 insertions(+), 859 deletions(-) +Merging ext4/next +$ git merge ext4/next +Auto-merged fs/ext3/super.c +Merge made by recursive. + fs/ext3/hash.c | 77 ++++++++++++++++++++++++++++++++++++++------ + fs/ext3/namei.c | 7 ++++ + fs/ext3/super.c | 12 +++++++ + fs/ext4/balloc.c | 4 +- + fs/ext4/ext4.h | 3 ++ + fs/ext4/ext4_sb.h | 1 + + fs/ext4/hash.c | 77 ++++++++++++++++++++++++++++++++++++++------ + fs/ext4/ialloc.c | 4 +- + fs/ext4/inode.c | 76 ++++++++++++++++++++++++++++++++----------- + fs/ext4/namei.c | 7 ++++ + fs/ext4/super.c | 12 +++++++ + include/linux/ext3_fs.h | 28 +++++++++++++++- + include/linux/ext3_fs_sb.h | 1 + + 13 files changed, 264 insertions(+), 45 deletions(-) +Merging async_tx/next +$ git merge async_tx/next +Merge made by recursive. + arch/arm/include/asm/hardware/iop3xx-adma.h | 5 +++-- + arch/arm/include/asm/hardware/iop_adma.h | 6 ++++++ + arch/arm/mach-iop13xx/include/mach/adma.h | 3 ++- + drivers/dma/dmaengine.c | 4 ++-- + drivers/dma/dmatest.c | 22 +++++++++++----------- + drivers/dma/iop-adma.c | 11 ++++++----- + 6 files changed, 30 insertions(+), 21 deletions(-) +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging net/master +$ git merge net/master +Auto-merged MAINTAINERS +Auto-merged arch/xtensa/platforms/iss/network.c +Auto-merged drivers/infiniband/hw/nes/nes.c +Auto-merged drivers/infiniband/ulp/ipoib/ipoib_main.c +Auto-merged drivers/media/dvb/dm1105/dm1105.c +Auto-merged drivers/net/cs89x0.c +Auto-merged drivers/net/cxgb3/cxgb3_main.c +Removed drivers/net/eepro100.c +Auto-merged drivers/net/myri10ge/myri10ge.c +Auto-merged drivers/net/smc911x.c +Auto-merged drivers/net/usb/pegasus.c +Auto-merged drivers/net/wireless/hostap/hostap_wlan.h +Auto-merged drivers/net/wireless/rtl8187_dev.c +Auto-merged drivers/s390/net/qeth_l2_main.c +Auto-merged fs/nfsd/nfs4state.c +Auto-merged include/linux/kernel.h +Auto-merged include/net/sock.h +Auto-merged net/core/sock.c +Auto-merged net/mac80211/mlme.c +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 7 - + Documentation/networking/README.ipw2200 | 2 +- + Documentation/networking/bonding.txt | 68 +- + Documentation/networking/dccp.txt | 4 + + Documentation/networking/ip-sysctl.txt | 6 + + Documentation/networking/regulatory.txt | 22 +- + Documentation/rfkill.txt | 20 +- + MAINTAINERS | 13 +- + arch/arm/mach-ixp4xx/fsg-setup.c | 9 +- + arch/arm/mach-ixp4xx/nas100d-setup.c | 5 +- + arch/arm/mach-ixp4xx/nslu2-setup.c | 5 +- + arch/sparc64/kernel/idprom.c | 5 +- + arch/um/drivers/net_kern.c | 7 +- + arch/xtensa/platforms/iss/network.c | 5 +- + drivers/firmware/iscsi_ibft.c | 7 +- + drivers/infiniband/core/sysfs.c | 10 +- + drivers/infiniband/hw/mthca/mthca_mcg.c | 23 +- + drivers/infiniband/hw/nes/nes.c | 17 +- + drivers/infiniband/hw/nes/nes_cm.c | 31 +- + drivers/infiniband/hw/nes/nes_nic.c | 10 +- + drivers/infiniband/hw/nes/nes_utils.c | 5 +- + drivers/infiniband/ulp/ipoib/ipoib.h | 23 - + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 8 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 25 +- + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 70 +- + drivers/infiniband/ulp/iser/iser_verbs.c | 8 +- + drivers/infiniband/ulp/srp/ib_srp.c | 31 +- + drivers/isdn/i4l/isdn_net.c | 34 +- + drivers/media/dvb/b2c2/flexcop.c | 2 +- + drivers/media/dvb/bt8xx/dst.c | 4 +- + drivers/media/dvb/dm1105/dm1105.c | 3 +- + drivers/media/dvb/dvb-usb/dvb-usb-dvb.c | 5 +- + drivers/media/dvb/pluto2/pluto2.c | 3 +- + drivers/message/fusion/mptlan.c | 12 +- + drivers/net/3c501.c | 1 - + drivers/net/3c503.c | 3 +- + drivers/net/3c505.c | 6 +- + drivers/net/3c507.c | 4 +- + drivers/net/3c509.c | 6 +- + drivers/net/3c515.c | 5 +- + drivers/net/3c523.c | 11 +- + drivers/net/3c527.c | 4 +- + drivers/net/3c59x.c | 9 +- + drivers/net/7990.c | 1 - + drivers/net/8139cp.c | 6 +- + drivers/net/8139too.c | 6 +- + drivers/net/82596.c | 14 +- + drivers/net/Kconfig | 28 +- + drivers/net/Makefile | 2 +- + drivers/net/a2065.c | 5 +- + drivers/net/ac3200.c | 5 +- + drivers/net/acenic.c | 4 +- + drivers/net/amd8111e.c | 6 +- + drivers/net/apne.c | 3 +- + drivers/net/appletalk/cops.c | 1 - + drivers/net/appletalk/ltpc.c | 1 - + drivers/net/arcnet/arc-rawmode.c | 1 - + drivers/net/arcnet/capmode.c | 1 - + drivers/net/arcnet/rfc1051.c | 1 - + drivers/net/arcnet/rfc1201.c | 2 - + drivers/net/ariadne.c | 21 +- + drivers/net/arm/am79c961a.c | 7 +- + drivers/net/arm/at91_ether.c | 11 +- + drivers/net/arm/ep93xx_eth.c | 2 - + drivers/net/arm/ether1.c | 5 +- + drivers/net/arm/ether3.c | 5 +- + drivers/net/arm/etherh.c | 5 +- + drivers/net/arm/ixp4xx_eth.c | 1 - + drivers/net/at1700.c | 4 +- + drivers/net/atarilance.c | 18 +- + drivers/net/atl1e/atl1e_main.c | 1 - + drivers/net/atlx/atl1.c | 70 +- + drivers/net/atlx/atl1.h | 4 +- + drivers/net/atlx/atl2.c | 64 +- + drivers/net/atlx/atl2.h | 1 - + drivers/net/atlx/atlx.c | 13 - + drivers/net/atp.c | 5 +- + drivers/net/au1000_eth.c | 1 - + drivers/net/ax88796.c | 9 +- + drivers/net/b44.c | 6 +- + drivers/net/bfin_mac.c | 1 - + drivers/net/bmac.c | 7 +- + drivers/net/bnx2.c | 6 +- + drivers/net/bnx2x_main.c | 16 +- + drivers/net/bonding/Makefile | 3 + + drivers/net/bonding/bond_3ad.c | 326 +- + drivers/net/bonding/bond_3ad.h | 10 +- + drivers/net/bonding/bond_alb.c | 13 +- + drivers/net/bonding/bond_ipv6.c | 218 + + drivers/net/bonding/bond_main.c | 106 +- + drivers/net/bonding/bond_sysfs.c | 126 +- + drivers/net/bonding/bonding.h | 35 +- + drivers/net/cassini.c | 6 +- + drivers/net/chelsio/sge.c | 1 - + drivers/net/cpmac.c | 5 +- + drivers/net/cris/eth_v10.c | 4 +- + drivers/net/cs89x0.c | 14 +- + drivers/net/cxgb3/cxgb3_main.c | 69 +- + drivers/net/cxgb3/sge.c | 1 - + drivers/net/de600.c | 4 +- + drivers/net/de620.c | 9 +- + drivers/net/declance.c | 5 +- + drivers/net/defxx.c | 3 +- + drivers/net/depca.c | 7 +- + drivers/net/dl2k.c | 6 +- + drivers/net/dm9000.c | 8 +- + drivers/net/e100.c | 22 +- + drivers/net/e1000/e1000_main.c | 12 +- + drivers/net/e1000e/netdev.c | 13 +- + drivers/net/eepro.c | 4 +- + drivers/net/eepro100.c | 2401 ------ + drivers/net/eexpress.c | 1 - + drivers/net/ehea/ehea.h | 2 +- + drivers/net/ehea/ehea_main.c | 1 - + drivers/net/ehea/ehea_qmr.c | 10 +- + drivers/net/enc28j60.c | 19 +- + drivers/net/enic/enic_main.c | 1 - + drivers/net/enic/enic_res.c | 7 +- + drivers/net/enic/vnic_dev.c | 10 +- + drivers/net/epic100.c | 8 +- + drivers/net/es3210.c | 9 +- + drivers/net/eth16i.c | 1 - + drivers/net/ewrk3.c | 8 +- + drivers/net/fealnx.c | 6 +- + drivers/net/fec.c | 4 +- + drivers/net/fec_mpc52xx.c | 3 +- + drivers/net/forcedeth.c | 13 +- + drivers/net/fs_enet/fs_enet-main.c | 5 +- + drivers/net/gianfar.c | 8 +- + drivers/net/hamachi.c | 6 +- + drivers/net/hamradio/6pack.c | 1 - + drivers/net/hamradio/baycom_epp.c | 1 - + drivers/net/hamradio/bpqether.c | 8 +- + drivers/net/hamradio/dmascc.c | 1 - + drivers/net/hamradio/hdlcdrv.c | 1 - + drivers/net/hamradio/mkiss.c | 1 - + drivers/net/hamradio/scc.c | 1 - + drivers/net/hamradio/yam.c | 1 - + drivers/net/hp-plus.c | 3 +- + drivers/net/hp.c | 3 +- + drivers/net/hp100.c | 7 +- + drivers/net/hydra.c | 5 +- + drivers/net/ibm_newemac/core.c | 11 +- + drivers/net/ibmlana.c | 6 +- + drivers/net/ibmveth.c | 6 +- + drivers/net/igb/igb_main.c | 8 +- + drivers/net/ioc3-eth.c | 13 +- + drivers/net/ipg.c | 9 - + drivers/net/irda/ali-ircc.c | 1 - + drivers/net/irda/au1k_ir.c | 1 - + drivers/net/irda/irda-usb.c | 1 - + drivers/net/irda/kingsun-sir.c | 1 - + drivers/net/irda/ks959-sir.c | 1 - + drivers/net/irda/ksdazzle-sir.c | 1 - + drivers/net/irda/mcs7780.c | 1 - + drivers/net/irda/nsc-ircc.c | 1 - + drivers/net/irda/pxaficp_ir.c | 4 - + drivers/net/irda/sa1100_ir.c | 2 - + drivers/net/irda/stir4200.c | 1 - + drivers/net/irda/vlsi_ir.c | 1 - + drivers/net/irda/w83977af_ir.c | 1 - + drivers/net/isa-skeleton.c | 4 +- + drivers/net/ixgb/ixgb_main.c | 4 +- + drivers/net/ixgbe/ixgbe.h | 1 + + drivers/net/ixgbe/ixgbe_82598.c | 12 + + drivers/net/ixgbe/ixgbe_ethtool.c | 27 + + drivers/net/ixgbe/ixgbe_main.c | 40 +- + drivers/net/ixgbe/ixgbe_phy.c | 68 + + drivers/net/ixgbe/ixgbe_phy.h | 7 + + drivers/net/ixgbe/ixgbe_type.h | 6 + + drivers/net/ixp2000/ixpdev.c | 2 - + drivers/net/jazzsonic.c | 4 +- + drivers/net/jme.c | 13 +- + drivers/net/korina.c | 1 - + drivers/net/lance.c | 4 +- + drivers/net/lib82596.c | 14 +- + drivers/net/lib8390.c | 1 - + drivers/net/lne390.c | 5 +- + drivers/net/loopback.c | 15 +- + drivers/net/lp486e.c | 1 - + drivers/net/mac89x0.c | 5 +- + drivers/net/macb.c | 8 +- + drivers/net/mace.c | 6 +- + drivers/net/macmace.c | 6 +- + drivers/net/macsonic.c | 9 +- + drivers/net/macvlan.c | 26 +- + drivers/net/meth.c | 4 +- + drivers/net/mlx4/en_rx.c | 2 - + drivers/net/mlx4/mcg.c | 23 +- + drivers/net/mlx4/mlx4_en.h | 8 +- + drivers/net/mv643xx_eth.c | 7 +- + drivers/net/mvme147.c | 5 +- + drivers/net/myri10ge/myri10ge.c | 5 +- + drivers/net/myri_sbus.c | 15 +- + drivers/net/natsemi.c | 6 +- + drivers/net/ne-h8300.c | 3 +- + drivers/net/ne.c | 3 +- + drivers/net/ne2.c | 6 +- + drivers/net/ne2k-pci.c | 5 +- + drivers/net/ne3210.c | 5 +- + drivers/net/netconsole.c | 9 +- + drivers/net/netx-eth.c | 1 - + drivers/net/netxen/netxen_nic_init.c | 2 - + drivers/net/netxen/netxen_nic_main.c | 8 +- + drivers/net/netxen/netxen_nic_niu.c | 7 +- + drivers/net/ni5010.c | 4 +- + drivers/net/ni52.c | 1 - + drivers/net/ni65.c | 1 - + drivers/net/niu.c | 6 +- + drivers/net/ns83820.c | 6 +- + drivers/net/pasemi_mac.c | 8 +- + drivers/net/pci-skeleton.c | 6 +- + drivers/net/pcmcia/3c574_cs.c | 6 +- + drivers/net/pcmcia/3c589_cs.c | 6 +- + drivers/net/pcmcia/axnet_cs.c | 6 +- + drivers/net/pcmcia/fmvj18x_cs.c | 79 +- + drivers/net/pcmcia/nmclan_cs.c | 6 +- + drivers/net/pcmcia/pcnet_cs.c | 3 +- + drivers/net/pcmcia/smc91c92_cs.c | 5 +- + drivers/net/pcmcia/xirc2ps_cs.c | 6 +- + drivers/net/pcnet32.c | 4 +- + drivers/net/phy/broadcom.c | 195 +- + drivers/net/phy/mdio_bus.c | 4 +- + drivers/net/phy/phy.c | 2 +- + drivers/net/phy/phy_device.c | 4 +- + drivers/net/phy/smsc.c | 28 + + drivers/net/plip.c | 1 - + drivers/net/ppp_generic.c | 1 - + drivers/net/pppoe.c | 5 +- + drivers/net/ps3_gelic_net.c | 6 +- + drivers/net/ps3_gelic_wireless.c | 37 +- + drivers/net/ps3_gelic_wireless.h | 4 +- + drivers/net/qla3xxx.c | 11 +- + drivers/net/qlge/qlge_main.c | 12 +- + drivers/net/r6040.c | 1 - + drivers/net/r8169.c | 1 - + drivers/net/rionet.c | 5 +- + drivers/net/rrunner.c | 4 +- + drivers/net/s2io.c | 11 +- + drivers/net/sb1000.c | 1 - + drivers/net/sb1250-mac.c | 5 +- + drivers/net/sc92031.c | 1 - + drivers/net/seeq8005.c | 4 +- + drivers/net/sfc/Kconfig | 8 + + drivers/net/sfc/Makefile | 1 + + drivers/net/sfc/boards.c | 136 + + drivers/net/sfc/efx.c | 47 +- + drivers/net/sfc/efx.h | 10 + + drivers/net/sfc/enum.h | 4 +- + drivers/net/sfc/ethtool.c | 15 +- + drivers/net/sfc/falcon.c | 23 +- + drivers/net/sfc/falcon_hwdefs.h | 1 - + drivers/net/sfc/mdio_10g.c | 35 + + drivers/net/sfc/mdio_10g.h | 7 + + drivers/net/sfc/mtd.c | 268 + + drivers/net/sfc/net_driver.h | 8 + + drivers/net/sfc/rx.c | 2 +- + drivers/net/sfc/sfe4001.c | 116 +- + drivers/net/sfc/spi.h | 34 +- + drivers/net/sfc/tenxpress.c | 18 +- + drivers/net/sfc/workarounds.h | 2 + + drivers/net/sfc/xfp_phy.c | 9 + + drivers/net/sgiseeq.c | 5 +- + drivers/net/sh_eth.c | 3 +- + drivers/net/sis190.c | 7 +- + drivers/net/sis900.c | 6 +- + drivers/net/skfp/skfddi.c | 2 - + drivers/net/skge.c | 44 +- + drivers/net/sky2.c | 5 +- + drivers/net/slip.c | 1 - + drivers/net/smc-mca.c | 5 +- + drivers/net/smc-ultra.c | 5 +- + drivers/net/smc-ultra32.c | 5 +- + drivers/net/smc911x.c | 2 - + drivers/net/smc9194.c | 5 +- + drivers/net/smc91x.c | 8 +- + drivers/net/smsc911x.c | 2091 +++++ + drivers/net/smsc911x.h | 394 + + drivers/net/sonic.c | 1 - + drivers/net/starfire.c | 14 +- + drivers/net/sun3lance.c | 10 +- + drivers/net/sunbmac.c | 6 +- + drivers/net/sundance.c | 6 +- + drivers/net/sungem.c | 7 +- + drivers/net/sunhme.c | 7 +- + drivers/net/sunlance.c | 7 +- + drivers/net/sunqe.c | 1 - + drivers/net/sunvnet.c | 5 +- + drivers/net/tc35815.c | 23 +- + drivers/net/tehuti.c | 1 - + drivers/net/tg3.c | 372 +- + drivers/net/tg3.h | 111 +- + drivers/net/tlan.c | 2 - + drivers/net/tokenring/3c359.c | 2 - + drivers/net/tokenring/abyss.c | 4 +- + drivers/net/tokenring/ibmtr.c | 11 +- + drivers/net/tokenring/lanstreamer.c | 36 +- + drivers/net/tokenring/madgemc.c | 10 +- + drivers/net/tokenring/olympic.c | 52 +- + drivers/net/tokenring/proteon.c | 5 +- + drivers/net/tokenring/skisa.c | 5 +- + drivers/net/tokenring/smctr.c | 2 - + drivers/net/tokenring/tms380tr.c | 1 - + drivers/net/tokenring/tmspci.c | 5 +- + drivers/net/tsi108_eth.c | 6 +- + drivers/net/tulip/de2104x.c | 6 +- + drivers/net/tulip/de4x5.c | 17 +- + drivers/net/tulip/dmfe.c | 7 +- + drivers/net/tulip/interrupt.c | 2 - + drivers/net/tulip/tulip_core.c | 11 +- + drivers/net/tulip/uli526x.c | 6 +- + drivers/net/tulip/winbond-840.c | 16 +- + drivers/net/tulip/xircom_cb.c | 4 +- + drivers/net/tun.c | 6 +- + drivers/net/typhoon.c | 6 +- + drivers/net/ucc_geth.c | 6 +- + drivers/net/usb/catc.c | 2 - + drivers/net/usb/pegasus.c | 5 +- + drivers/net/usb/smsc95xx.c | 4 +- + drivers/net/usb/usbnet.c | 5 +- + drivers/net/veth.c | 16 - + drivers/net/via-rhine.c | 6 +- + drivers/net/via-velocity.c | 2 - + drivers/net/virtio_net.c | 4 +- + drivers/net/wan/cosa.c | 1 - + drivers/net/wan/cycx_x25.c | 2 - + drivers/net/wan/dlci.c | 1 - + drivers/net/wan/dscc4.c | 4 +- + drivers/net/wan/farsync.c | 2 - + drivers/net/wan/hd6457x.c | 1 - + drivers/net/wan/hostess_sv11.c | 1 - + drivers/net/wan/lapbether.c | 3 - + drivers/net/wan/lmc/lmc_main.c | 1 - + drivers/net/wan/lmc/lmc_proto.c | 1 - + drivers/net/wan/pc300too.c | 2 +- + drivers/net/wan/pci200syn.c | 2 +- + drivers/net/wan/sbni.c | 2 - + drivers/net/wan/sealevel.c | 1 - + drivers/net/wan/syncppp.c | 4 - + drivers/net/wan/wanxl.c | 1 - + drivers/net/wan/x25_asy.c | 4 - + drivers/net/wd.c | 5 +- + drivers/net/wireless/Kconfig | 1 + + drivers/net/wireless/Makefile | 9 +- + drivers/net/wireless/adm8211.c | 52 +- + drivers/net/wireless/adm8211.h | 2 - + drivers/net/wireless/airo.c | 241 +- + drivers/net/wireless/arlan-main.c | 27 +- + drivers/net/wireless/ath5k/ath5k.h | 89 +- + drivers/net/wireless/ath5k/base.c | 131 +- + drivers/net/wireless/ath5k/dma.c | 190 +- + drivers/net/wireless/ath5k/initvals.c | 8 +- + drivers/net/wireless/ath5k/pcu.c | 184 +- + drivers/net/wireless/ath5k/phy.c | 5 +- + drivers/net/wireless/ath5k/qcu.c | 37 +- + drivers/net/wireless/ath5k/reg.h | 15 +- + drivers/net/wireless/ath5k/reset.c | 3 +- + drivers/net/wireless/ath9k/Makefile | 4 + + drivers/net/wireless/ath9k/ani.c | 854 ++ + drivers/net/wireless/ath9k/ath9k.h | 389 +- + drivers/net/wireless/ath9k/beacon.c | 42 +- + drivers/net/wireless/ath9k/calib.c | 930 +++ + drivers/net/wireless/ath9k/core.c | 486 +- + drivers/net/wireless/ath9k/core.h | 165 +- + drivers/net/wireless/ath9k/eeprom.c | 1605 ++++ + drivers/net/wireless/ath9k/hw.c | 8496 +++++--------------- + drivers/net/wireless/ath9k/hw.h | 2 +- + drivers/net/wireless/ath9k/mac.c | 1031 +++ + drivers/net/wireless/ath9k/main.c | 549 +- + drivers/net/wireless/ath9k/phy.c | 10 +- + drivers/net/wireless/ath9k/rc.c | 145 +- + drivers/net/wireless/ath9k/rc.h | 1 - + drivers/net/wireless/ath9k/recv.c | 537 -- + drivers/net/wireless/ath9k/xmit.c | 1037 +-- + drivers/net/wireless/atmel.c | 77 +- + drivers/net/wireless/b43/b43.h | 1 - + drivers/net/wireless/b43/dma.c | 4 +- + drivers/net/wireless/b43/main.c | 227 +- + drivers/net/wireless/b43/pio.c | 3 +- + drivers/net/wireless/b43/xmit.c | 60 +- + drivers/net/wireless/b43/xmit.h | 5 +- + drivers/net/wireless/b43legacy/dma.c | 48 +- + drivers/net/wireless/b43legacy/main.c | 100 +- + drivers/net/wireless/b43legacy/pio.c | 31 +- + drivers/net/wireless/b43legacy/xmit.c | 26 +- + drivers/net/wireless/b43legacy/xmit.h | 2 +- + drivers/net/wireless/hostap/hostap_80211_rx.c | 62 +- + drivers/net/wireless/hostap/hostap_80211_tx.c | 15 +- + drivers/net/wireless/hostap/hostap_ap.c | 241 +- + drivers/net/wireless/hostap/hostap_common.h | 13 - + drivers/net/wireless/hostap/hostap_hw.c | 10 +- + drivers/net/wireless/hostap/hostap_info.c | 16 +- + drivers/net/wireless/hostap/hostap_ioctl.c | 16 +- + drivers/net/wireless/hostap/hostap_main.c | 26 +- + drivers/net/wireless/hostap/hostap_pci.c | 2 +- + drivers/net/wireless/hostap/hostap_proc.c | 15 +- + drivers/net/wireless/hostap/hostap_wlan.h | 2 +- + drivers/net/wireless/ipw2100.c | 53 +- + drivers/net/wireless/ipw2200.c | 415 +- + drivers/net/wireless/ipw2200.h | 1 + + drivers/net/wireless/iwlwifi/Kconfig | 2 + + drivers/net/wireless/iwlwifi/iwl-3945-commands.h | 6 +- + drivers/net/wireless/iwlwifi/iwl-3945-io.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 76 +- + drivers/net/wireless/iwlwifi/iwl-3945.c | 74 +- + drivers/net/wireless/iwlwifi/iwl-3945.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 148 +- + drivers/net/wireless/iwlwifi/iwl-4965.c | 140 +- + drivers/net/wireless/iwlwifi/iwl-5000-hw.h | 39 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 284 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 104 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 20 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 604 +- + drivers/net/wireless/iwlwifi/iwl-calib.c | 8 +- + drivers/net/wireless/iwlwifi/iwl-commands.h | 197 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 186 +- + drivers/net/wireless/iwlwifi/iwl-core.h | 15 +- + drivers/net/wireless/iwlwifi/iwl-csr.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-debug.h | 9 +- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 5 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 66 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.c | 18 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.h | 5 +- + drivers/net/wireless/iwlwifi/iwl-fh.h | 60 +- + drivers/net/wireless/iwlwifi/iwl-helpers.h | 107 - + drivers/net/wireless/iwlwifi/iwl-io.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-led.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-power.c | 18 +- + drivers/net/wireless/iwlwifi/iwl-prph.h | 6 +- + drivers/net/wireless/iwlwifi/iwl-rfkill.c | 8 +- + drivers/net/wireless/iwlwifi/iwl-rx.c | 8 +- + drivers/net/wireless/iwlwifi/iwl-scan.c | 129 +- + drivers/net/wireless/iwlwifi/iwl-sta.c | 100 +- + drivers/net/wireless/iwlwifi/iwl-tx.c | 359 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 217 +- + drivers/net/wireless/libertas/assoc.c | 69 +- + drivers/net/wireless/libertas/cmd.c | 14 +- + drivers/net/wireless/libertas/debugfs.c | 11 +- + drivers/net/wireless/libertas/decl.h | 4 - + drivers/net/wireless/libertas/defs.h | 2 +- + drivers/net/wireless/libertas/dev.h | 7 +- + drivers/net/wireless/libertas/main.c | 75 +- + drivers/net/wireless/libertas/persistcfg.c | 2 +- + drivers/net/wireless/libertas/scan.c | 101 +- + drivers/net/wireless/libertas/scan.h | 4 + + drivers/net/wireless/libertas/types.h | 5 +- + drivers/net/wireless/libertas/wext.c | 8 +- + drivers/net/wireless/libertas_tf/cmd.c | 5 +- + drivers/net/wireless/libertas_tf/if_usb.c | 2 +- + drivers/net/wireless/libertas_tf/main.c | 8 +- + drivers/net/wireless/mac80211_hwsim.c | 288 +- + drivers/net/wireless/netwave_cs.c | 6 +- + drivers/net/wireless/orinoco/Makefile | 12 + + drivers/net/wireless/{ => orinoco}/airport.c | 0 + drivers/net/wireless/{ => orinoco}/hermes.c | 0 + drivers/net/wireless/{ => orinoco}/hermes.h | 0 + drivers/net/wireless/{ => orinoco}/hermes_dld.c | 0 + drivers/net/wireless/{ => orinoco}/hermes_dld.h | 0 + drivers/net/wireless/{ => orinoco}/hermes_rid.h | 0 + drivers/net/wireless/{ => orinoco}/orinoco.c | 83 +- + drivers/net/wireless/{ => orinoco}/orinoco.h | 5 + + drivers/net/wireless/{ => orinoco}/orinoco_cs.c | 2 +- + .../net/wireless/{ => orinoco}/orinoco_nortel.c | 0 + drivers/net/wireless/{ => orinoco}/orinoco_pci.c | 0 + drivers/net/wireless/{ => orinoco}/orinoco_pci.h | 0 + drivers/net/wireless/{ => orinoco}/orinoco_plx.c | 0 + drivers/net/wireless/{ => orinoco}/orinoco_tmd.c | 0 + drivers/net/wireless/{ => orinoco}/spectrum_cs.c | 2 +- + drivers/net/wireless/p54/p54.h | 52 +- + drivers/net/wireless/p54/p54common.c | 1160 ++- + drivers/net/wireless/p54/p54common.h | 316 +- + drivers/net/wireless/p54/p54pci.c | 33 +- + drivers/net/wireless/p54/p54usb.c | 98 +- + drivers/net/wireless/prism54/isl_ioctl.c | 24 +- + drivers/net/wireless/ray_cs.c | 10 +- + drivers/net/wireless/rndis_wlan.c | 33 +- + drivers/net/wireless/rt2x00/rt2400pci.c | 194 +- + drivers/net/wireless/rt2x00/rt2400pci.h | 2 + + drivers/net/wireless/rt2x00/rt2500pci.c | 234 +- + drivers/net/wireless/rt2x00/rt2500pci.h | 2 + + drivers/net/wireless/rt2x00/rt2500usb.c | 139 +- + drivers/net/wireless/rt2x00/rt2500usb.h | 2 + + drivers/net/wireless/rt2x00/rt2x00.h | 43 +- + drivers/net/wireless/rt2x00/rt2x00config.c | 176 +- + drivers/net/wireless/rt2x00/rt2x00debug.c | 47 +- + drivers/net/wireless/rt2x00/rt2x00debug.h | 13 + + drivers/net/wireless/rt2x00/rt2x00dev.c | 38 +- + drivers/net/wireless/rt2x00/rt2x00lib.h | 3 +- + drivers/net/wireless/rt2x00/rt2x00mac.c | 20 +- + drivers/net/wireless/rt2x00/rt2x00pci.c | 3 +- + drivers/net/wireless/rt2x00/rt2x00pci.h | 8 +- + drivers/net/wireless/rt2x00/rt2x00queue.c | 24 +- + drivers/net/wireless/rt2x00/rt2x00queue.h | 9 +- + drivers/net/wireless/rt2x00/rt61pci.c | 260 +- + drivers/net/wireless/rt2x00/rt61pci.h | 2 + + drivers/net/wireless/rt2x00/rt73usb.c | 245 +- + drivers/net/wireless/rt2x00/rt73usb.h | 2 + + drivers/net/wireless/rtl8180_dev.c | 36 +- + drivers/net/wireless/rtl8187.h | 1 - + drivers/net/wireless/rtl8187_dev.c | 133 +- + drivers/net/wireless/rtl8187_rtl8225.c | 391 +- + drivers/net/wireless/strip.c | 2 - + drivers/net/wireless/wavelan.c | 34 +- + drivers/net/wireless/wavelan_cs.c | 39 +- + drivers/net/wireless/wl3501.h | 4 +- + drivers/net/wireless/wl3501_cs.c | 11 +- + drivers/net/wireless/zd1201.c | 6 +- + drivers/net/wireless/zd1211rw/zd_chip.c | 4 +- + drivers/net/wireless/zd1211rw/zd_mac.c | 44 +- + drivers/net/wireless/zd1211rw/zd_usb.c | 2 +- + drivers/net/xen-netfront.c | 1 - + drivers/net/xtsonic.c | 6 +- + drivers/net/yellowfin.c | 14 +- + drivers/net/znet.c | 6 +- + drivers/net/zorro8390.c | 7 +- + drivers/s390/net/qeth_l2_main.c | 18 +- + drivers/scsi/iscsi_tcp.c | 4 +- + drivers/scsi/qla4xxx/ql4_os.c | 3 +- + drivers/usb/atm/cxacru.c | 4 +- + drivers/usb/atm/usbatm.c | 5 +- + drivers/usb/gadget/u_ether.c | 6 +- + drivers/uwb/wlp/eda.c | 38 +- + fs/afs/proc.c | 4 +- + fs/afs/server.c | 9 +- + fs/cifs/cifs_spnego.c | 6 +- + fs/cifs/connect.c | 4 +- + fs/lockd/host.c | 8 +- + fs/lockd/mon.c | 2 +- + fs/nfs/nfsroot.c | 6 +- + fs/nfs/super.c | 6 +- + fs/nfsd/nfs4state.c | 4 +- + fs/nfsd/nfsctl.c | 2 +- + fs/ocfs2/cluster/netdebug.c | 8 +- + fs/ocfs2/cluster/nodemanager.c | 2 +- + fs/ocfs2/cluster/tcp.c | 29 +- + include/linux/cgroup_subsys.h | 6 + + include/linux/dccp.h | 14 +- + include/linux/ieee80211.h | 152 +- + include/linux/if.h | 1 + + include/linux/kernel.h | 12 - + include/linux/netdevice.h | 33 +- + include/linux/nl80211.h | 147 +- + include/linux/pkt_cls.h | 14 + + include/linux/rculist.h | 17 + + include/linux/skbuff.h | 19 +- + include/linux/smsc911x.h | 42 + + include/linux/sunrpc/svc_xprt.h | 8 +- + include/linux/xfrm.h | 14 + + include/net/cfg80211.h | 82 +- + include/net/dst.h | 4 +- + include/net/ieee80211.h | 133 +- + include/net/ip_vs.h | 11 +- + include/net/lib80211.h | 18 + + include/net/mac80211.h | 427 +- + include/net/ndisc.h | 14 + + include/net/neighbour.h | 3 - + include/net/netfilter/nf_conntrack_tuple.h | 12 +- + include/net/netlink.h | 22 +- + include/net/netns/ipv4.h | 2 + + include/net/sch_generic.h | 35 + + include/net/sctp/sctp.h | 8 +- + include/net/sock.h | 43 +- + include/net/udp.h | 25 +- + include/net/udplite.h | 2 +- + include/net/wireless.h | 70 +- + include/net/xfrm.h | 5 +- + lib/vsprintf.c | 74 + + net/802/tr.c | 24 +- + net/8021q/vlan.c | 8 +- + net/8021q/vlan.h | 6 +- + net/8021q/vlan_core.c | 2 - + net/8021q/vlan_dev.c | 24 +- + net/Kconfig | 2 +- + net/appletalk/aarp.c | 3 +- + net/appletalk/sysctl_net_atalk.c | 14 +- + net/atm/atm_sysfs.c | 2 +- + net/atm/br2684.c | 5 +- + net/atm/clip.c | 4 +- + net/atm/lec.c | 26 +- + net/atm/mpc.c | 26 +- + net/atm/mpoa_caches.c | 18 +- + net/ax25/sysctl_net_ax25.c | 56 +- + net/bluetooth/bnep/core.c | 1 - + net/bluetooth/hci_sysfs.c | 7 +- + net/bridge/br_netfilter.c | 10 +- + net/bridge/netfilter/ebt_log.c | 18 +- + net/core/datagram.c | 5 +- + net/core/dev.c | 68 +- + net/core/fib_rules.c | 7 +- + net/core/flow.c | 2 +- + net/core/neighbour.c | 55 +- + net/core/net-sysfs.c | 9 +- + net/core/net_namespace.c | 2 - + net/core/netpoll.c | 5 +- + net/core/pktgen.c | 31 +- + net/core/skbuff.c | 3 +- + net/core/sock.c | 3 +- + net/core/sysctl_net_core.c | 34 +- + net/dccp/ccid.c | 48 + + net/dccp/ccid.h | 5 + + net/dccp/ccids/ccid2.c | 6 +- + net/dccp/dccp.h | 6 +- + net/dccp/feat.c | 542 ++- + net/dccp/feat.h | 87 +- + net/dccp/input.c | 2 - + net/dccp/ipv4.c | 12 +- + net/dccp/ipv6.c | 4 +- + net/dccp/minisocks.c | 7 +- + net/dccp/options.c | 18 - + net/dccp/output.c | 4 + + net/dccp/probe.c | 12 +- + net/dccp/proto.c | 10 +- + net/dccp/timer.c | 12 - + net/decnet/dn_route.c | 1 - + net/decnet/sysctl_net_decnet.c | 44 +- + net/dsa/slave.c | 2 +- + net/dsa/tag_dsa.c | 1 - + net/dsa/tag_edsa.c | 1 - + net/dsa/tag_trailer.c | 1 - + net/ieee80211/Kconfig | 57 +- + net/ieee80211/ieee80211_crypt_ccmp.c | 13 +- + net/ieee80211/ieee80211_crypt_tkip.c | 29 +- + net/ieee80211/ieee80211_module.c | 26 - + net/ieee80211/ieee80211_rx.c | 116 +- + net/ieee80211/ieee80211_wx.c | 30 +- + net/ipv4/af_inet.c | 7 +- + net/ipv4/ah4.c | 4 +- + net/ipv4/arp.c | 18 +- + net/ipv4/cipso_ipv4.c | 1 - + net/ipv4/devinet.c | 19 +- + net/ipv4/esp4.c | 4 +- + net/ipv4/fib_frontend.c | 10 +- + net/ipv4/fib_hash.c | 12 +- + net/ipv4/fib_semantics.c | 8 +- + net/ipv4/fib_trie.c | 6 +- + net/ipv4/icmp.c | 27 +- + net/ipv4/igmp.c | 46 +- + net/ipv4/inet_connection_sock.c | 2 +- + net/ipv4/inetpeer.c | 2 +- + net/ipv4/ip_forward.c | 2 +- + net/ipv4/ip_fragment.c | 21 +- + net/ipv4/ip_gre.c | 14 +- + net/ipv4/ip_input.c | 10 +- + net/ipv4/ip_output.c | 6 +- + net/ipv4/ip_sockglue.c | 32 +- + net/ipv4/ipcomp.c | 4 +- + net/ipv4/ipconfig.c | 40 +- + net/ipv4/ipip.c | 2 +- + net/ipv4/ipmr.c | 130 +- + net/ipv4/netfilter/arp_tables.c | 16 +- + net/ipv4/netfilter/ip_tables.c | 12 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 9 +- + net/ipv4/netfilter/ipt_LOG.c | 7 +- + net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 27 +- + net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 4 +- + net/ipv4/netfilter/nf_nat_h323.c | 58 +- + net/ipv4/netfilter/nf_nat_irc.c | 4 +- + net/ipv4/netfilter/nf_nat_rule.c | 6 +- + net/ipv4/netfilter/nf_nat_sip.c | 18 +- + net/ipv4/netfilter/nf_nat_snmp_basic.c | 9 +- + net/ipv4/raw.c | 8 +- + net/ipv4/route.c | 225 +- + net/ipv4/sysctl_net_ipv4.c | 188 +- + net/ipv4/tcp.c | 6 +- + net/ipv4/tcp_cubic.c | 120 +- + net/ipv4/tcp_input.c | 8 +- + net/ipv4/tcp_ipv4.c | 29 +- + net/ipv4/tcp_minisocks.c | 2 +- + net/ipv4/tcp_output.c | 8 +- + net/ipv4/tcp_probe.c | 7 +- + net/ipv4/tcp_timer.c | 12 +- + net/ipv4/tcp_yeah.c | 4 +- + net/ipv4/udp.c | 258 +- + net/ipv4/udp_impl.h | 4 +- + net/ipv4/udplite.c | 14 +- + net/ipv4/xfrm4_policy.c | 3 +- + net/ipv6/addrconf.c | 67 +- + net/ipv6/addrlabel.c | 34 +- + net/ipv6/ah6.c | 4 +- + net/ipv6/anycast.c | 6 +- + net/ipv6/esp6.c | 4 +- + net/ipv6/exthdrs.c | 2 +- + net/ipv6/icmp.c | 11 +- + net/ipv6/ip6_flowlabel.c | 4 +- + net/ipv6/ip6_output.c | 2 +- + net/ipv6/ip6mr.c | 5 +- + net/ipv6/ipcomp6.c | 4 +- + net/ipv6/mcast.c | 10 +- + net/ipv6/ndisc.c | 99 +- + net/ipv6/netfilter/ip6t_LOG.c | 7 +- + net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 5 +- + net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 2 +- + net/ipv6/netfilter/nf_conntrack_reasm.c | 6 +- + net/ipv6/reassembly.c | 12 +- + net/ipv6/route.c | 45 +- + net/ipv6/sysctl_net_ipv6.c | 4 +- + net/ipv6/tcp_ipv6.c | 8 +- + net/ipv6/udp.c | 137 +- + net/ipv6/udp_impl.h | 4 +- + net/ipv6/udplite.c | 9 +- + net/ipv6/xfrm6_policy.c | 10 +- + net/ipx/sysctl_net_ipx.c | 2 +- + net/irda/irlan/irlan_client.c | 4 +- + net/irda/irsysctl.c | 50 +- + net/llc/llc_proc.c | 3 +- + net/llc/sysctl_net_llc.c | 20 +- + net/mac80211/cfg.c | 141 +- + net/mac80211/debugfs.c | 12 +- + net/mac80211/debugfs_key.c | 4 +- + net/mac80211/debugfs_netdev.c | 117 +- + net/mac80211/debugfs_sta.c | 84 +- + net/mac80211/event.c | 5 +- + net/mac80211/ht.c | 252 +- + net/mac80211/ieee80211_i.h | 62 +- + net/mac80211/iface.c | 27 +- + net/mac80211/key.c | 10 +- + net/mac80211/main.c | 224 +- + net/mac80211/mesh.c | 4 +- + net/mac80211/mesh.h | 5 +- + net/mac80211/mesh_hwmp.c | 6 +- + net/mac80211/mesh_plink.c | 49 +- + net/mac80211/mlme.c | 502 +- + net/mac80211/rate.c | 52 +- + net/mac80211/rate.h | 11 +- + net/mac80211/rc80211_minstrel.c | 109 +- + net/mac80211/rc80211_minstrel.h | 2 + + net/mac80211/rc80211_pid.h | 3 +- + net/mac80211/rc80211_pid_algo.c | 32 +- + net/mac80211/rc80211_pid_debugfs.c | 5 +- + net/mac80211/rx.c | 77 +- + net/mac80211/scan.c | 24 +- + net/mac80211/sta_info.c | 37 +- + net/mac80211/sta_info.h | 42 +- + net/mac80211/tkip.c | 10 +- + net/mac80211/tx.c | 437 +- + net/mac80211/util.c | 20 +- + net/mac80211/wep.c | 26 +- + net/mac80211/wep.h | 2 +- + net/mac80211/wext.c | 88 +- + net/mac80211/wme.c | 32 +- + net/mac80211/wpa.c | 32 +- + net/netfilter/ipvs/ip_vs_conn.c | 20 +- + net/netfilter/ipvs/ip_vs_core.c | 20 +- + net/netfilter/ipvs/ip_vs_ctl.c | 82 +- + net/netfilter/ipvs/ip_vs_dh.c | 34 +- + net/netfilter/ipvs/ip_vs_ftp.c | 13 +- + net/netfilter/ipvs/ip_vs_lblc.c | 69 +- + net/netfilter/ipvs/ip_vs_lblcr.c | 96 +- + net/netfilter/ipvs/ip_vs_lc.c | 3 - + net/netfilter/ipvs/ip_vs_nq.c | 3 - + net/netfilter/ipvs/ip_vs_proto.c | 38 +- + net/netfilter/ipvs/ip_vs_proto_ah_esp.c | 10 +- + net/netfilter/ipvs/ip_vs_proto_tcp.c | 8 +- + net/netfilter/ipvs/ip_vs_proto_udp.c | 8 +- + net/netfilter/ipvs/ip_vs_rr.c | 3 - + net/netfilter/ipvs/ip_vs_sed.c | 3 - + net/netfilter/ipvs/ip_vs_sh.c | 34 +- + net/netfilter/ipvs/ip_vs_sync.c | 4 +- + net/netfilter/ipvs/ip_vs_wlc.c | 3 - + net/netfilter/ipvs/ip_vs_wrr.c | 3 - + net/netfilter/ipvs/ip_vs_xmit.c | 34 +- + net/netfilter/nf_conntrack_acct.c | 2 +- + net/netfilter/nf_conntrack_ftp.c | 15 +- + net/netfilter/nf_conntrack_h323_main.c | 12 +- + net/netfilter/nf_conntrack_irc.c | 13 +- + net/netfilter/nf_conntrack_proto_generic.c | 4 +- + net/netfilter/nf_conntrack_proto_sctp.c | 28 +- + net/netfilter/nf_conntrack_proto_tcp.c | 50 +- + net/netfilter/nf_conntrack_proto_udp.c | 8 +- + net/netfilter/nf_conntrack_proto_udplite.c | 4 +- + net/netfilter/nf_conntrack_standalone.c | 16 +- + net/netfilter/xt_hashlimit.c | 14 +- + net/netfilter/xt_iprange.c | 36 +- + net/netfilter/xt_recent.c | 10 +- + net/netlabel/netlabel_addrlist.c | 4 +- + net/netlink/attr.c | 2 +- + net/netrom/sysctl_net_netrom.c | 48 +- + net/phonet/af_phonet.c | 11 +- + net/phonet/pep-gprs.c | 41 +- + net/phonet/sysctl.c | 2 +- + net/rfkill/rfkill-input.c | 337 +- + net/rfkill/rfkill-input.h | 3 + + net/rfkill/rfkill.c | 85 +- + net/rose/sysctl_net_rose.c | 40 +- + net/rxrpc/af_rxrpc.c | 4 +- + net/rxrpc/ar-error.c | 3 +- + net/rxrpc/ar-local.c | 16 +- + net/rxrpc/ar-peer.c | 8 +- + net/rxrpc/ar-proc.c | 16 +- + net/rxrpc/ar-transport.c | 12 +- + net/rxrpc/rxkad.c | 2 +- + net/sched/Kconfig | 11 + + net/sched/Makefile | 1 + + net/sched/cls_cgroup.c | 290 + + net/sched/sch_api.c | 12 + + net/sched/sch_atm.c | 23 +- + net/sched/sch_blackhole.c | 1 + + net/sched/sch_cbq.c | 1 + + net/sched/sch_dsmark.c | 10 + + net/sched/sch_fifo.c | 2 + + net/sched/sch_generic.c | 19 + + net/sched/sch_gred.c | 1 + + net/sched/sch_hfsc.c | 15 +- + net/sched/sch_htb.c | 1 + + net/sched/sch_multiq.c | 29 + + net/sched/sch_netem.c | 138 +- + net/sched/sch_prio.c | 14 + + net/sched/sch_red.c | 9 + + net/sched/sch_sfq.c | 12 + + net/sched/sch_tbf.c | 13 +- + net/sched/sch_teql.c | 8 + + net/sctp/ipv6.c | 35 +- + net/sctp/protocol.c | 18 +- + net/sctp/sm_statefuns.c | 10 +- + net/sctp/sysctl.c | 82 +- + net/socket.c | 1 - + net/sunrpc/clnt.c | 8 +- + net/sunrpc/rpcb_clnt.c | 17 +- + net/sunrpc/svcauth_unix.c | 24 +- + net/sunrpc/svcsock.c | 6 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 12 +- + net/sunrpc/xprtrdma/transport.c | 14 +- + net/sunrpc/xprtrdma/verbs.c | 14 +- + net/sunrpc/xprtsock.c | 41 +- + net/tipc/eth_media.c | 3 +- + net/tipc/name_table.c | 2 +- + net/unix/af_unix.c | 73 +- + net/unix/garbage.c | 12 +- + net/unix/sysctl_net_unix.c | 3 +- + net/wireless/Kconfig | 10 + + net/wireless/Makefile | 1 + + net/wireless/core.c | 9 +- + net/wireless/lib80211.c | 65 + + net/wireless/nl80211.c | 288 +- + net/wireless/reg.c | 462 +- + net/wireless/reg.h | 20 +- + net/wireless/util.c | 19 + + net/x25/sysctl_net_x25.c | 22 +- + net/xfrm/xfrm_policy.c | 16 +- + net/xfrm/xfrm_state.c | 24 +- + net/xfrm/xfrm_user.c | 52 + + security/selinux/avc.c | 4 +- + security/selinux/hooks.c | 4 +- + 843 files changed, 24858 insertions(+), 22422 deletions(-) + create mode 100644 drivers/net/bonding/bond_ipv6.c + delete mode 100644 drivers/net/eepro100.c + create mode 100644 drivers/net/sfc/mtd.c + create mode 100644 drivers/net/smsc911x.c + create mode 100644 drivers/net/smsc911x.h + create mode 100644 drivers/net/wireless/ath9k/ani.c + create mode 100644 drivers/net/wireless/ath9k/calib.c + create mode 100644 drivers/net/wireless/ath9k/eeprom.c + create mode 100644 drivers/net/wireless/ath9k/mac.c + create mode 100644 drivers/net/wireless/orinoco/Makefile + rename drivers/net/wireless/{ => orinoco}/airport.c (100%) + rename drivers/net/wireless/{ => orinoco}/hermes.c (100%) + rename drivers/net/wireless/{ => orinoco}/hermes.h (100%) + rename drivers/net/wireless/{ => orinoco}/hermes_dld.c (100%) + rename drivers/net/wireless/{ => orinoco}/hermes_dld.h (100%) + rename drivers/net/wireless/{ => orinoco}/hermes_rid.h (100%) + rename drivers/net/wireless/{ => orinoco}/orinoco.c (99%) + rename drivers/net/wireless/{ => orinoco}/orinoco.h (98%) + rename drivers/net/wireless/{ => orinoco}/orinoco_cs.c (99%) + rename drivers/net/wireless/{ => orinoco}/orinoco_nortel.c (100%) + rename drivers/net/wireless/{ => orinoco}/orinoco_pci.c (100%) + rename drivers/net/wireless/{ => orinoco}/orinoco_pci.h (100%) + rename drivers/net/wireless/{ => orinoco}/orinoco_plx.c (100%) + rename drivers/net/wireless/{ => orinoco}/orinoco_tmd.c (100%) + rename drivers/net/wireless/{ => orinoco}/spectrum_cs.c (99%) + create mode 100644 include/linux/smsc911x.h + create mode 100644 include/net/lib80211.h + create mode 100644 net/sched/cls_cgroup.c + create mode 100644 net/wireless/lib80211.c +Merging mtd/master +$ git merge mtd/master +Already up-to-date. +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Auto-merged lib/Kconfig +Merge made by recursive. + arch/x86/crypto/crc32c-intel.c | 121 +++++----- + crypto/Kconfig | 4 +- + crypto/Makefile | 1 + + crypto/ahash.c | 30 +++ + crypto/ansi_cprng.c | 16 +- + crypto/api.c | 121 +++++++++- + crypto/authenc.c | 3 + + crypto/camellia.c | 84 +++---- + crypto/crc32c.c | 290 +++++++++++++---------- + crypto/hmac.c | 10 +- + crypto/internal.h | 2 + + crypto/proc.c | 20 +- + crypto/shash.c | 505 ++++++++++++++++++++++++++++++++++++++++ + crypto/testmgr.c | 58 +++++- + drivers/crypto/hifn_795x.c | 5 + + drivers/crypto/padlock-aes.c | 52 ++++- + drivers/crypto/talitos.c | 171 +++++++++----- + drivers/crypto/talitos.h | 11 +- + include/crypto/algapi.h | 16 ++- + include/crypto/hash.h | 125 ++++++++++ + include/crypto/internal/hash.h | 16 +- + include/linux/crc32c.h | 6 +- + include/linux/crypto.h | 10 +- + lib/Kconfig | 1 + + lib/libcrc32c.c | 182 +++------------ + 25 files changed, 1363 insertions(+), 497 deletions(-) + create mode 100644 crypto/shash.c +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/x86/Kconfig +Auto-merged include/linux/input.h +Removed sound/soc/at32/Kconfig +Removed sound/soc/at32/Makefile +Removed sound/soc/at32/at32-pcm.h +Removed sound/soc/at32/at32-ssc.c +Removed sound/soc/at32/at32-ssc.h +Removed sound/soc/at91/Kconfig +Removed sound/soc/at91/Makefile +Removed sound/soc/at91/at91-pcm.c +Removed sound/soc/at91/at91-pcm.h +Removed sound/soc/at91/at91-ssc.c +Removed sound/soc/at91/at91-ssc.h +Merge made by recursive. + Documentation/sound/alsa/ALSA-Configuration.txt | 4 + + arch/arm/mach-pxa/include/mach/palmasoc.h | 13 + + include/linux/input.h | 1 + + include/sound/ac97_codec.h | 2 + + include/sound/asound.h | 1 + + include/sound/core.h | 28 +- + include/sound/info.h | 106 +- + include/sound/jack.h | 1 + + include/sound/soc-dapm.h | 2 - + include/sound/soc.h | 6 +- + include/sound/version.h | 2 +- + sound/aoa/codecs/Makefile | 4 + + sound/aoa/codecs/{snd-aoa-codec-onyx.c => onyx.c} | 12 +- + sound/aoa/codecs/{snd-aoa-codec-onyx.h => onyx.h} | 0 + ...aoa-codec-tas-basstreble.h => tas-basstreble.h} | 0 + ...aoa-codec-tas-gain-table.h => tas-gain-table.h} | 0 + sound/aoa/codecs/{snd-aoa-codec-tas.c => tas.c} | 8 +- + sound/aoa/codecs/{snd-aoa-codec-tas.h => tas.h} | 0 + .../codecs/{snd-aoa-codec-toonie.c => toonie.c} | 2 +- + sound/aoa/core/Makefile | 8 +- + sound/aoa/core/{snd-aoa-alsa.c => alsa.c} | 4 +- + sound/aoa/core/{snd-aoa-alsa.h => alsa.h} | 0 + sound/aoa/core/{snd-aoa-core.c => core.c} | 2 +- + .../{snd-aoa-gpio-feature.c => gpio-feature.c} | 2 +- + sound/aoa/core/{snd-aoa-gpio-pmf.c => gpio-pmf.c} | 0 + sound/aoa/fabrics/Makefile | 2 + + .../fabrics/{snd-aoa-fabric-layout.c => layout.c} | 2 +- + sound/aoa/soundbus/i2sbus/Makefile | 2 +- + .../i2sbus/{i2sbus-control.c => control.c} | 0 + .../aoa/soundbus/i2sbus/{i2sbus-core.c => core.c} | 4 +- + sound/aoa/soundbus/i2sbus/i2sbus.h | 2 +- + .../i2sbus/{i2sbus-interface.h => interface.h} | 0 + sound/aoa/soundbus/i2sbus/{i2sbus-pcm.c => pcm.c} | 0 + sound/core/Kconfig | 21 + + sound/core/Makefile | 2 + + sound/core/device.c | 4 +- + sound/core/hrtimer.c | 140 +++ + sound/core/info.c | 17 + + sound/core/init.c | 67 +- + sound/core/jack.c | 9 +- + sound/core/seq/seq.c | 4 +- + sound/drivers/pcsp/pcsp.c | 8 +- + sound/drivers/pcsp/pcsp.h | 1 + + sound/drivers/pcsp/pcsp_lib.c | 95 +- + sound/pci/Kconfig | 9 + + sound/pci/ac97/ac97_patch.c | 7 +- + sound/pci/cs5535audio/Makefile | 1 + + sound/pci/cs5535audio/cs5535audio.c | 12 +- + sound/pci/cs5535audio/cs5535audio.h | 39 + + sound/pci/cs5535audio/cs5535audio_olpc.c | 179 +++ + sound/pci/cs5535audio/cs5535audio_pcm.c | 15 + + sound/pci/emu10k1/emu10k1_main.c | 494 ++++---- + sound/pci/hda/Makefile | 1 + + sound/pci/hda/hda_codec.c | 503 ++++++-- + sound/pci/hda/hda_codec.h | 64 +- + sound/pci/hda/hda_generic.c | 20 +- + sound/pci/hda/hda_hwdep.c | 228 ++++ + sound/pci/hda/hda_intel.c | 266 ++--- + sound/pci/hda/hda_local.h | 24 +- + sound/pci/hda/hda_patch.h | 2 + + sound/pci/hda/hda_proc.c | 44 +- + sound/pci/hda/patch_analog.c | 56 +- + sound/pci/hda/patch_conexant.c | 11 - + sound/pci/hda/patch_intelhdmi.c | 928 ++++++++++++++ + sound/pci/hda/patch_realtek.c | 1312 +++++++++----------- + sound/pci/hda/patch_sigmatel.c | 247 +++- + sound/pci/hda/patch_via.c | 71 +- + sound/pci/ice1712/ice1724.c | 23 +- + sound/pci/rme9652/hdsp.c | 2 +- + sound/pci/rme9652/hdspm.c | 2 +- + sound/ppc/tumbler.c | 3 +- + sound/soc/Kconfig | 3 +- + sound/soc/Makefile | 2 +- + sound/soc/at32/Kconfig | 34 - + sound/soc/at32/Makefile | 11 - + sound/soc/at32/at32-pcm.h | 79 -- + sound/soc/at32/at32-ssc.c | 849 ------------- + sound/soc/at32/at32-ssc.h | 59 - + sound/soc/at91/Kconfig | 10 - + sound/soc/at91/Makefile | 6 - + sound/soc/at91/at91-pcm.c | 434 ------- + sound/soc/at91/at91-pcm.h | 72 -- + sound/soc/at91/at91-ssc.c | 791 ------------ + sound/soc/at91/at91-ssc.h | 27 - + sound/soc/atmel/Kconfig | 43 + + sound/soc/atmel/Makefile | 15 + + sound/soc/{at32/at32-pcm.c => atmel/atmel-pcm.c} | 376 +++--- + sound/soc/atmel/atmel-pcm.h | 86 ++ + sound/soc/atmel/atmel_ssc_dai.c | 782 ++++++++++++ + sound/soc/atmel/atmel_ssc_dai.h | 121 ++ + sound/soc/{at32 => atmel}/playpaq_wm8510.c | 5 +- + sound/soc/atmel/sam9g20_wm8731.c | 328 +++++ + sound/soc/codecs/Kconfig | 49 +- + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/ad73311.c | 1 - + sound/soc/codecs/cs4270.c | 13 + + sound/soc/codecs/tlv320aic23.c | 222 +++- + sound/soc/codecs/twl4030.c | 653 ++++++++++ + sound/soc/codecs/twl4030.h | 197 +++ + sound/soc/codecs/wm8580.c | 108 +- + sound/soc/codecs/wm8580.h | 1 + + sound/soc/codecs/wm8900.c | 113 +- + sound/soc/codecs/wm8900.h | 1 + + sound/soc/codecs/wm9713.c | 2 + + sound/soc/davinci/davinci-i2s.c | 89 ++- + sound/soc/omap/Kconfig | 10 + + sound/soc/omap/Makefile | 3 + + sound/soc/omap/omap3beagle.c | 149 +++ + sound/soc/omap/overo.c | 148 +++ + sound/soc/pxa/Kconfig | 22 + + sound/soc/pxa/Makefile | 4 + + sound/soc/pxa/palm27x.c | 269 ++++ + sound/soc/pxa/pxa-ssp.c | 929 ++++++++++++++ + sound/soc/pxa/pxa-ssp.h | 47 + + sound/soc/s3c24xx/s3c24xx-i2s.c | 7 + + sound/soc/s3c24xx/s3c24xx-pcm.c | 12 +- + sound/soc/soc-core.c | 208 +++- + sound/soc/soc-dapm.c | 70 +- + 118 files changed, 8162 insertions(+), 4451 deletions(-) + create mode 100644 arch/arm/mach-pxa/include/mach/palmasoc.h + rename sound/aoa/codecs/{snd-aoa-codec-onyx.c => onyx.c} (99%) + rename sound/aoa/codecs/{snd-aoa-codec-onyx.h => onyx.h} (100%) + rename sound/aoa/codecs/{snd-aoa-codec-tas-basstreble.h => tas-basstreble.h} (100%) + rename sound/aoa/codecs/{snd-aoa-codec-tas-gain-table.h => tas-gain-table.h} (100%) + rename sound/aoa/codecs/{snd-aoa-codec-tas.c => tas.c} (99%) + rename sound/aoa/codecs/{snd-aoa-codec-tas.h => tas.h} (100%) + rename sound/aoa/codecs/{snd-aoa-codec-toonie.c => toonie.c} (98%) + rename sound/aoa/core/{snd-aoa-alsa.c => alsa.c} (98%) + rename sound/aoa/core/{snd-aoa-alsa.h => alsa.h} (100%) + rename sound/aoa/core/{snd-aoa-core.c => core.c} (99%) + rename sound/aoa/core/{snd-aoa-gpio-feature.c => gpio-feature.c} (99%) + rename sound/aoa/core/{snd-aoa-gpio-pmf.c => gpio-pmf.c} (100%) + rename sound/aoa/fabrics/{snd-aoa-fabric-layout.c => layout.c} (99%) + rename sound/aoa/soundbus/i2sbus/{i2sbus-control.c => control.c} (100%) + rename sound/aoa/soundbus/i2sbus/{i2sbus-core.c => core.c} (99%) + rename sound/aoa/soundbus/i2sbus/{i2sbus-interface.h => interface.h} (100%) + rename sound/aoa/soundbus/i2sbus/{i2sbus-pcm.c => pcm.c} (100%) + create mode 100644 sound/core/hrtimer.c + create mode 100644 sound/pci/cs5535audio/cs5535audio_olpc.c + create mode 100644 sound/pci/hda/patch_intelhdmi.c + delete mode 100644 sound/soc/at32/Kconfig + delete mode 100644 sound/soc/at32/Makefile + delete mode 100644 sound/soc/at32/at32-pcm.h + delete mode 100644 sound/soc/at32/at32-ssc.c + delete mode 100644 sound/soc/at32/at32-ssc.h + delete mode 100644 sound/soc/at91/Kconfig + delete mode 100644 sound/soc/at91/Makefile + delete mode 100644 sound/soc/at91/at91-pcm.c + delete mode 100644 sound/soc/at91/at91-pcm.h + delete mode 100644 sound/soc/at91/at91-ssc.c + delete mode 100644 sound/soc/at91/at91-ssc.h + create mode 100644 sound/soc/atmel/Kconfig + create mode 100644 sound/soc/atmel/Makefile + rename sound/soc/{at32/at32-pcm.c => atmel/atmel-pcm.c} (50%) + create mode 100644 sound/soc/atmel/atmel-pcm.h + create mode 100644 sound/soc/atmel/atmel_ssc_dai.c + create mode 100644 sound/soc/atmel/atmel_ssc_dai.h + rename sound/soc/{at32 => atmel}/playpaq_wm8510.c (99%) + create mode 100644 sound/soc/atmel/sam9g20_wm8731.c + create mode 100644 sound/soc/codecs/twl4030.c + create mode 100644 sound/soc/codecs/twl4030.h + create mode 100644 sound/soc/omap/omap3beagle.c + create mode 100644 sound/soc/omap/overo.c + create mode 100644 sound/soc/pxa/palm27x.c + create mode 100644 sound/soc/pxa/pxa-ssp.c + create mode 100644 sound/soc/pxa/pxa-ssp.h +Merging cpufreq/next +$ git merge cpufreq/next +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Merge made by recursive. + net/9p/Kconfig | 10 ++++++---- + 1 files changed, 6 insertions(+), 4 deletions(-) +Merging quilt/rr +$ git merge quilt/rr +Auto-merged drivers/net/virtio_net.c +Auto-merged drivers/s390/kvm/kvm_virtio.c +Auto-merged init/Kconfig +Merge made by recursive. + Documentation/lguest/lguest.c | 66 ++----------- + arch/s390/include/asm/kvm_virtio.h | 3 + + arch/x86/lguest/i386_head.S | 15 --- + drivers/lguest/lg.h | 2 +- + drivers/lguest/lguest_device.c | 6 +- + drivers/lguest/lguest_user.c | 13 +-- + drivers/lguest/page_tables.c | 72 +++++++++++++- + drivers/net/virtio_net.c | 189 +++++++++++++++++++++++++++++++----- + drivers/s390/kvm/kvm_virtio.c | 12 ++- + drivers/virtio/virtio.c | 2 +- + drivers/virtio/virtio_pci.c | 15 ++-- + drivers/virtio/virtio_ring.c | 3 +- + include/linux/lguest_launcher.h | 4 +- + include/linux/virtio_net.h | 9 ++ + include/linux/virtio_pci.h | 8 ++ + include/linux/virtio_ring.h | 13 ++- + init/Kconfig | 6 - + kernel/stop_machine.c | 5 +- + 18 files changed, 304 insertions(+), 139 deletions(-) +Merging cifs/master +$ git merge cifs/master +Auto-merged fs/cifs/connect.c +Merge made by recursive. + fs/cifs/connect.c | 9 +++++++-- + 1 files changed, 7 insertions(+), 2 deletions(-) +Merging mmc/next +$ git merge mmc/next +Merge made by recursive. + drivers/mmc/card/block.c | 6 ++---- + drivers/mmc/host/sdhci-pci.c | 2 +- + 2 files changed, 3 insertions(+), 5 deletions(-) +Merging gfs2/master +$ git merge gfs2/master +Removed fs/gfs2/ops_dentry.h +Removed fs/gfs2/ops_fstype.h +Removed fs/gfs2/ops_inode.h +Removed fs/gfs2/ops_super.h +Auto-merged include/linux/fs.h +Merge made by recursive. + fs/gfs2/acl.c | 2 +- + fs/gfs2/bmap.c | 30 ++++++++++---------- + fs/gfs2/dir.c | 62 ++++++++++++++++++++-------------------- + fs/gfs2/eattr.c | 40 +++++++++++++------------- + fs/gfs2/glock.c | 8 +++++ + fs/gfs2/glops.c | 13 ++++++-- + fs/gfs2/incore.h | 32 +++++++------------- + fs/gfs2/inode.c | 52 +++++++++++++++------------------ + fs/gfs2/inode.h | 13 ++++++++- + fs/gfs2/main.c | 2 +- + fs/gfs2/ops_address.c | 26 ++++++++--------- + fs/gfs2/ops_dentry.c | 2 +- + fs/gfs2/ops_dentry.h | 17 ----------- + fs/gfs2/ops_export.c | 5 +-- + fs/gfs2/ops_file.c | 20 ++++++------- + fs/gfs2/ops_fstype.c | 5 +-- + fs/gfs2/ops_fstype.h | 19 ------------ + fs/gfs2/ops_inode.c | 75 +++++++++++++++++++++++++++++++++++++++---------- + fs/gfs2/ops_inode.h | 25 ---------------- + fs/gfs2/ops_super.c | 12 ++++---- + fs/gfs2/ops_super.h | 17 ----------- + fs/gfs2/quota.c | 8 ++-- + fs/gfs2/rgrp.c | 58 +++++++++++++++++-------------------- + fs/gfs2/super.c | 12 ++++---- + fs/gfs2/super.h | 8 +++++ + fs/ioctl.c | 44 ++++++++++++++++++++++------ + include/linux/fs.h | 3 ++ + 27 files changed, 305 insertions(+), 305 deletions(-) + delete mode 100644 fs/gfs2/ops_dentry.h + delete mode 100644 fs/gfs2/ops_fstype.h + delete mode 100644 fs/gfs2/ops_inode.h + delete mode 100644 fs/gfs2/ops_super.h +Merging input/next +$ git merge input/next +Auto-merged drivers/input/evdev.c +Auto-merged drivers/input/joydev.c +Auto-merged drivers/input/mousedev.c +Merge made by recursive. + drivers/input/Makefile | 2 +- + drivers/input/evbug.c | 6 +- + drivers/input/evdev.c | 199 +----------------------- + drivers/input/gameport/gameport.c | 3 +- + drivers/input/gameport/ns558.c | 2 +- + drivers/input/input-compat.c | 135 +++++++++++++++++ + drivers/input/input-compat.h | 94 ++++++++++++ + drivers/input/input.c | 4 +- + drivers/input/joydev.c | 2 +- + drivers/input/keyboard/gpio_keys.c | 4 + + drivers/input/keyboard/omap-keypad.c | 6 +- + drivers/input/misc/uinput.c | 172 ++++++++++++++++++---- + drivers/input/mouse/appletouch.c | 274 +++++++++++++++++----------------- + drivers/input/mousedev.c | 3 +- + drivers/input/serio/pcips2.c | 2 +- + drivers/input/serio/serio.c | 4 +- + drivers/input/serio/xilinx_ps2.c | 220 ++++++++++++++------------- + drivers/input/touchscreen/ads7846.c | 4 +- + include/linux/gpio_keys.h | 1 + + 19 files changed, 653 insertions(+), 484 deletions(-) + create mode 100644 drivers/input/input-compat.c + create mode 100644 drivers/input/input-compat.h +Merging semaphore/semaphore +$ git merge semaphore/semaphore +Already up-to-date. +Merging bkl-removal/bkl-removal +$ git merge bkl-removal/bkl-removal +Already up-to-date. +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Auto-merged MAINTAINERS +Merge made by recursive. + MAINTAINERS | 4 +- + fs/ubifs/commit.c | 4 +- + fs/ubifs/debug.c | 66 ++++++++++++++++++++++++++++++--------------------- + fs/ubifs/dir.c | 5 ++- + fs/ubifs/file.c | 4 +- + fs/ubifs/journal.c | 8 ++++-- + fs/ubifs/key.h | 4 +- + fs/ubifs/orphan.c | 28 ++++++++++++--------- + fs/ubifs/recovery.c | 17 +++++++------ + fs/ubifs/replay.c | 2 +- + fs/ubifs/sb.c | 9 ++++--- + fs/ubifs/tnc.c | 5 ++- + 12 files changed, 89 insertions(+), 67 deletions(-) +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Auto-merged drivers/md/dm.c +Merge made by recursive. + block/Kconfig | 1 + + block/blk-core.c | 33 ++--- + block/blk-timeout.c | 17 ++- + block/blktrace.c | 332 +++++++++++++++++++++++++++++++++++++++++- + block/elevator.c | 21 +++- + drivers/block/virtio_blk.c | 2 + + drivers/block/xen-blkfront.c | 2 +- + drivers/md/dm.c | 6 +- + fs/bio.c | 3 +- + include/linux/blkdev.h | 1 + + include/linux/blktrace_api.h | 172 +--------------------- + include/trace/block.h | 60 ++++++++ + mm/bounce.c | 3 +- + 13 files changed, 446 insertions(+), 207 deletions(-) + create mode 100644 include/trace/block.h +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging pcmcia/master +$ git merge pcmcia/master +Merge made by recursive. + drivers/ide/ide-cs.c | 1 + + drivers/pcmcia/cistpl.c | 3 ++- + drivers/pcmcia/cs.c | 14 +++++++------- + drivers/pcmcia/ds.c | 11 ++++++----- + drivers/pcmcia/pcmcia_resource.c | 3 ++- + drivers/pcmcia/rsrc_nonstatic.c | 6 +++--- + 6 files changed, 21 insertions(+), 17 deletions(-) +Merging battery/master +$ git merge battery/master +Already up-to-date. +Merging leds/for-mm +$ git merge leds/for-mm +Already up-to-date. +Merging backlight/for-mm +$ git merge backlight/for-mm +Already up-to-date. +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 Documentation/kernel-parameters.txt +Auto-merged MAINTAINERS +Auto-merged fs/ext3/super.c +Auto-merged fs/ext4/super.c +Auto-merged fs/inode.c +Auto-merged include/linux/fs.h +Auto-merged init/Kconfig +Auto-merged init/main.c +Auto-merged kernel/sysctl.c +Auto-merged lib/Kconfig.debug +Merge made by recursive. + Documentation/ABI/testing/debugfs-kmemtrace | 71 ++++ + Documentation/kernel-parameters.txt | 10 + + Documentation/sysctl/vm.txt | 12 + + Documentation/vm/kmemtrace.txt | 126 +++++++ + Documentation/vm/slabinfo.c | 95 ++++- + MAINTAINERS | 6 + + fs/buffer.c | 102 +++++ + fs/dcache.c | 148 ++++++-- + fs/drop_caches.c | 2 +- + fs/ext2/super.c | 9 + + fs/ext3/super.c | 8 + + fs/ext4/super.c | 8 + + fs/inode.c | 123 ++++++ + fs/proc/inode.c | 8 + + fs/reiserfs/super.c | 8 + + include/linux/fs.h | 6 + + include/linux/kmemtrace.h | 86 +++++ + include/linux/mm.h | 3 +- + include/linux/mmzone.h | 1 + + include/linux/page-flags.h | 2 + + include/linux/slab.h | 61 +++- + include/linux/slab_def.h | 68 +++- + include/linux/slob_def.h | 9 +- + include/linux/slub_def.h | 69 ++++- + include/linux/swap.h | 3 + + init/Kconfig | 6 +- + init/main.c | 2 + + kernel/sysctl.c | 20 + + lib/Kconfig.debug | 20 + + mm/Makefile | 1 + + mm/kmemtrace.c | 333 +++++++++++++++++ + mm/slab.c | 81 ++++- + mm/slob.c | 37 ++- + mm/slub.c | 535 ++++++++++++++++++++++----- + mm/vmscan.c | 64 +++- + mm/vmstat.c | 4 +- + 36 files changed, 1955 insertions(+), 192 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-kmemtrace + create mode 100644 Documentation/vm/kmemtrace.txt + create mode 100644 include/linux/kmemtrace.h + create mode 100644 mm/kmemtrace.c +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Auto-merged drivers/md/md.c +Merge made by recursive. + drivers/md/md.c | 19 +++-- + drivers/md/raid0.c | 168 ++++++++++++++++++++++---------------------- + include/linux/raid/md_k.h | 1 + + include/linux/raid/raid0.h | 10 ++-- + 4 files changed, 102 insertions(+), 96 deletions(-) +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/kernel/process.c +Auto-merged arch/x86/mm/Makefile +CONFLICT (content): Merge conflict in arch/x86/mm/Makefile +Auto-merged arch/x86/mm/fault.c +Auto-merged arch/x86/mm/init_32.c +Auto-merged arch/x86/mm/init_64.c +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 +Auto-merged mm/slab.c +CONFLICT (content): Merge conflict in mm/slab.c +Auto-merged mm/slub.c +CONFLICT (content): Merge conflict in mm/slub.c +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'arch/x86/mm/Makefile' using previous resolution. +Resolved 'mm/slab.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 c4bf341: 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/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/asm-x86/kmemcheck.h | 42 ++ + 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 | 16 +- + 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, 1982 insertions(+), 104 deletions(-) + create mode 100644 Documentation/kmemcheck.txt + 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/asm-x86/kmemcheck.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/twl4030-core.c | 4 +- + drivers/mfd/wm8350-core.c | 74 ++++++++++++++++++++++++++++++++- + drivers/mfd/wm8350-i2c.c | 2 - + drivers/mfd/wm8350-regmap.c | 2 +- + include/linux/i2c/twl4030.h | 4 +- + include/linux/mfd/wm8350/comparator.h | 8 ++++ + include/linux/mfd/wm8350/core.h | 3 + + 7 files changed, 88 insertions(+), 9 deletions(-) +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Renamed drivers/net/wan/hd6457x.c => drivers/net/wan/hd64570.c +Auto-merged drivers/net/wan/hd64570.c +Auto-merged Documentation/DocBook/Makefile +CONFLICT (delete/modify): Documentation/DocBook/wanbook.tmpl deleted in hdlc/hdlc-next and modified in HEAD. Version HEAD of Documentation/DocBook/wanbook.tmpl left in tree. +Auto-merged drivers/net/wan/pc300too.c +Auto-merged drivers/net/wan/pci200syn.c +CONFLICT (delete/modify): drivers/net/wan/syncppp.c deleted in hdlc/hdlc-next and modified in HEAD. Version HEAD of drivers/net/wan/syncppp.c left in tree. +Removed include/net/syncppp.h +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/net/wan/syncppp.c Documentation/DocBook/wanbook.tmpl +rm 'Documentation/DocBook/wanbook.tmpl' +rm 'Documentation/DocBook/wanbook.tmpl' +rm 'drivers/net/wan/syncppp.c' +rm 'drivers/net/wan/syncppp.c' +$ git commit -v -a +Created commit 33b2f44: Merge commit 'hdlc/hdlc-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/Makefile | 2 +- + Documentation/DocBook/networking.tmpl | 3 - + Documentation/DocBook/wanbook.tmpl | 99 -- + Documentation/networking/generic-hdlc.txt | 8 +- + drivers/net/wan/Makefile | 2 +- + drivers/net/wan/c101.c | 6 +- + drivers/net/wan/{hd6457x.c => hd64570.c} | 254 ++---- + drivers/net/wan/hd64572.c | 641 +++++++++++++ + drivers/net/wan/hdlc_fr.c | 10 +- + drivers/net/wan/hdlc_ppp.c | 648 ++++++++++++- + drivers/net/wan/n2.c | 9 +- + drivers/net/wan/pc300_drv.c | 17 +- + drivers/net/wan/pc300too.c | 73 +- + drivers/net/wan/pci200syn.c | 77 +- + drivers/net/wan/syncppp.c | 1476 ----------------------------- + include/linux/hdlc.h | 2 +- + include/net/syncppp.h | 102 -- + 17 files changed, 1372 insertions(+), 2057 deletions(-) + delete mode 100644 Documentation/DocBook/wanbook.tmpl + rename drivers/net/wan/{hd6457x.c => hd64570.c} (78%) + create mode 100644 drivers/net/wan/hd64572.c + delete mode 100644 drivers/net/wan/syncppp.c + delete mode 100644 include/net/syncppp.h +Merging drm/drm-next +$ git merge drm/drm-next +Already up-to-date. +Merging voltage/for-next +$ git merge voltage/for-next +Merge made by recursive. + drivers/regulator/core.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) +Merging security-testing/next +$ git merge security-testing/next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged mm/oom_kill.c +Auto-merged security/selinux/hooks.c +Merge made by recursive. + Documentation/kernel-parameters.txt | 4 + + include/linux/audit.h | 36 +++++++ + include/linux/capability.h | 23 ++++ + include/linux/security.h | 16 +++- + kernel/auditsc.c | 198 ++++++++++++++++++++++++++++++++++- + kernel/capability.c | 21 ++++ + mm/oom_kill.c | 6 +- + security/commoncap.c | 163 ++++++++++++++++++----------- + security/security.c | 7 +- + security/selinux/hooks.c | 103 +++++++++--------- + security/selinux/nlmsgtab.c | 3 + + 11 files changed, 453 insertions(+), 127 deletions(-) +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging quilt/ttydev +$ git merge quilt/ttydev +Auto-merged drivers/char/Kconfig +Merge made by recursive. + Documentation/filesystems/devpts.txt | 132 ++++++ + drivers/char/Kconfig | 11 + + drivers/char/hvc_console.c | 2 +- + drivers/char/n_tty.c | 786 ++++++++++++++++++++++++++-------- + drivers/char/pty.c | 54 +++- + drivers/char/tty_io.c | 39 +- + drivers/char/vt.c | 16 +- + drivers/serial/bfin_5xx.c | 239 ++++++----- + drivers/usb/serial/sierra.c | 2 +- + drivers/usb/serial/usb-serial.c | 15 +- + fs/devpts/inode.c | 472 ++++++++++++++++++-- + include/linux/tty.h | 9 +- + include/linux/tty_driver.h | 6 +- + 13 files changed, 1408 insertions(+), 375 deletions(-) + create mode 100644 Documentation/filesystems/devpts.txt +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 up-to-date. +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 +Already up-to-date. +Merging iommu/auto-iommu-next +$ git merge iommu/auto-iommu-next +Already up-to-date. +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Auto-merged drivers/usb/wusbcore/rh.c +Merge made by recursive. + drivers/usb/host/hwa-hc.c | 103 ++++---- + drivers/usb/host/whci/hcd.c | 1 - + drivers/usb/host/whci/hw.c | 8 +- + drivers/usb/host/whci/int.c | 1 - + drivers/usb/host/whci/whcd.h | 2 +- + drivers/usb/host/whci/whci-hc.h | 2 + + drivers/usb/host/whci/wusb.c | 16 +- + drivers/usb/wusbcore/cbaf.c | 1 - + drivers/usb/wusbcore/crypto.c | 15 +- + drivers/usb/wusbcore/devconnect.c | 100 +-------- + drivers/usb/wusbcore/mmc.c | 8 +- + drivers/usb/wusbcore/reservation.c | 7 +- + drivers/usb/wusbcore/rh.c | 40 ++-- + drivers/usb/wusbcore/security.c | 3 +- + drivers/usb/wusbcore/wusbhc.h | 28 ++- + drivers/uwb/Makefile | 1 + + drivers/uwb/beacon.c | 85 +++---- + drivers/uwb/driver.c | 2 - + drivers/uwb/drp-ie.c | 1 - + drivers/uwb/hwa-rc.c | 23 ++- + drivers/uwb/i1480/dfu/usb.c | 1 - + drivers/uwb/i1480/i1480u-wlp/lc.c | 1 - + drivers/uwb/i1480/i1480u-wlp/sysfs.c | 1 - + drivers/uwb/ie-rcv.c | 55 ++++ + drivers/uwb/ie.c | 463 +++++++++++----------------------- + drivers/uwb/lc-rc.c | 51 ++--- + drivers/uwb/neh.c | 46 +++- + drivers/uwb/reset.c | 49 +++- + drivers/uwb/rsv.c | 82 ++++-- + drivers/uwb/umc-bus.c | 62 ++++-- + drivers/uwb/umc-dev.c | 3 +- + drivers/uwb/uwb-debug.c | 33 +++- + drivers/uwb/uwb-internal.h | 38 +-- + drivers/uwb/uwbd.c | 102 +++----- + drivers/uwb/whc-rc.c | 31 ++- + drivers/uwb/whci.c | 2 +- + drivers/uwb/wlp/wlp-internal.h | 4 - + include/linux/usb/wusb-wa.h | 1 + + include/linux/uwb.h | 41 ++-- + include/linux/uwb/debug-cmd.h | 9 + + include/linux/uwb/debug.h | 2 +- + include/linux/uwb/spec.h | 28 ++ + include/linux/uwb/umc.h | 2 + + 43 files changed, 751 insertions(+), 803 deletions(-) + create mode 100644 drivers/uwb/ie-rcv.c +Merging watchdog/master +$ git merge watchdog/master +Auto-merged drivers/watchdog/Kconfig +Auto-merged drivers/watchdog/ib700wdt.c +Merge made by recursive. + drivers/watchdog/Kconfig | 19 ++ + drivers/watchdog/Makefile | 2 + + drivers/watchdog/ib700wdt.c | 49 ++-- + drivers/watchdog/sch311x_wdt.c | 578 ++++++++++++++++++++++++++++++++++++++++ + drivers/watchdog/wm8350_wdt.c | 329 +++++++++++++++++++++++ + 5 files changed, 947 insertions(+), 30 deletions(-) + create mode 100644 drivers/watchdog/sch311x_wdt.c + create mode 100644 drivers/watchdog/wm8350_wdt.c +Merging proc/proc +$ git merge proc/proc +Auto-merged Documentation/filesystems/proc.txt +Auto-merged fs/proc/inode.c +Merge made by recursive. + Documentation/filesystems/proc.txt | 1 + + fs/proc/base.c | 225 ++++++++++++++++++++---------------- + fs/proc/generic.c | 8 +- + fs/proc/inode.c | 3 - + fs/proc/proc_net.c | 2 +- + fs/proc/root.c | 8 +- + 6 files changed, 133 insertions(+), 114 deletions(-) +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 cpu_alloc/cpu_alloc +$ git merge cpu_alloc/cpu_alloc +Auto-merged Documentation/kernel-parameters.txt +Auto-merged include/linux/percpu.h +Auto-merged init/main.c +Auto-merged kernel/lockdep.c +CONFLICT (content): Merge conflict in kernel/lockdep.c +Auto-merged kernel/module.c +CONFLICT (content): Merge conflict in kernel/module.c +Auto-merged mm/Makefile +Auto-merged mm/vmstat.c +Resolved 'kernel/lockdep.c' using previous resolution. +Resolved 'kernel/module.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 942a1ed: Merge commit 'cpu_alloc/cpu_alloc' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 7 ++ + arch/ia64/include/asm/percpu.h | 2 +- + arch/powerpc/kernel/setup_64.c | 4 +- + arch/sparc64/kernel/smp.c | 2 +- + arch/x86/kernel/setup_percpu.c | 2 +- + include/linux/module.h | 1 + + include/linux/percpu.h | 67 ++++++++++-- + include/linux/vmstat.h | 2 +- + init/main.c | 18 +++- + kernel/lockdep.c | 2 +- + kernel/module.c | 173 ++---------------------------- + mm/Makefile | 2 +- + mm/cpu_alloc.c | 203 +++++++++++++++++++++++++++++++++++ + mm/vmstat.c | 1 + + 14 files changed, 306 insertions(+), 180 deletions(-) + create mode 100644 mm/cpu_alloc.c +Merging cputime/cputime +$ git merge cputime/cputime +Auto-merged arch/powerpc/kernel/time.c +Auto-merged include/linux/sched.h +Auto-merged kernel/sched.c +Merge made by recursive. + arch/ia64/kernel/time.c | 18 ++++--- + arch/powerpc/kernel/process.c | 1 + + arch/powerpc/kernel/time.c | 18 ++++--- + arch/s390/include/asm/cpu.h | 4 +- + arch/s390/kernel/process.c | 74 ++++++++++++++++++-------- + arch/s390/kernel/s390_ext.c | 2 +- + arch/s390/kernel/smp.c | 25 +++++---- + arch/s390/kernel/vtime.c | 16 +++--- + arch/x86/xen/time.c | 10 ++-- + drivers/s390/cio/cio.c | 2 +- + include/linux/kernel_stat.h | 13 +++-- + include/linux/sched.h | 1 - + kernel/sched.c | 116 +++++++++++++++++++++++++++-------------- + kernel/time/tick-sched.c | 12 ++-- + kernel/timer.c | 15 ----- + 15 files changed, 193 insertions(+), 134 deletions(-) +$ git am -3 ../patches/cpu_alloc_merg_fix_1.patch +Applying cpu_alloc: merge_fix_1 +$ git reset HEAD^ +arch/alpha/include/asm/percpu.h: needs update +include/linux/percpu.h: needs update +$ git add . +$ git commit -v -a --amend +Created commit 1ba021e: Merge commit 'cputime/cputime' +Merging perfmon3/master +$ git merge perfmon3/master +Auto-merged arch/ia64/Kconfig +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/Makefile +Auto-merged arch/x86/include/asm/thread_info.h +Auto-merged arch/x86/kernel/entry_32.S +Auto-merged arch/x86/kernel/entry_64.S +Auto-merged arch/x86/kernel/process_64.c +Auto-merged arch/x86/kernel/signal_32.c +Auto-merged arch/x86/kernel/signal_64.c +Auto-merged include/linux/sched.h +Merge made by recursive. + Documentation/ABI/testing/sysfs-perfmon | 42 ++ + Documentation/ABI/testing/sysfs-perfmon-pmu | 48 ++ + Documentation/perfmon.txt | 206 +++++++ + Makefile | 2 + + arch/ia64/Kconfig | 2 +- + arch/ia64/configs/bigsur_defconfig | 2 +- + arch/ia64/configs/generic_defconfig | 2 +- + arch/ia64/configs/gensparse_defconfig | 2 +- + arch/ia64/configs/sim_defconfig | 2 +- + arch/ia64/configs/tiger_defconfig | 2 +- + arch/ia64/configs/zx1_defconfig | 2 +- + arch/ia64/include/asm/processor.h | 2 +- + arch/ia64/include/asm/system.h | 2 +- + arch/ia64/kernel/Makefile | 2 +- + arch/ia64/kernel/irq_ia64.c | 4 +- + arch/ia64/kernel/perfmon.c | 6 +- + arch/ia64/kernel/process.c | 16 +- + arch/ia64/kernel/ptrace.c | 4 +- + arch/ia64/kernel/smpboot.c | 4 +- + arch/ia64/lib/Makefile | 2 +- + arch/ia64/oprofile/Makefile | 2 +- + arch/ia64/oprofile/init.c | 4 +- + arch/x86/Kconfig | 2 + + arch/x86/Makefile | 3 + + arch/x86/ia32/ia32entry.S | 5 + + arch/x86/include/asm/Kbuild | 1 + + arch/x86/include/asm/irq_vectors.h | 5 + + arch/x86/include/asm/mach-default/entry_arch.h | 4 + + arch/x86/include/asm/perfmon.h | 34 ++ + arch/x86/include/asm/perfmon_kern.h | 438 ++++++++++++++ + arch/x86/include/asm/thread_info.h | 8 +- + arch/x86/include/asm/unistd_32.h | 5 + + arch/x86/include/asm/unistd_64.h | 11 +- + arch/x86/kernel/entry_32.S | 2 +- + arch/x86/kernel/entry_64.S | 8 +- + arch/x86/kernel/irqinit_64.c | 5 + + arch/x86/kernel/process_32.c | 10 + + arch/x86/kernel/process_64.c | 10 + + arch/x86/kernel/signal_32.c | 5 + + arch/x86/kernel/signal_64.c | 5 + + arch/x86/kernel/syscall_table_32.S | 5 + + arch/x86/oprofile/nmi_int.c | 10 +- + arch/x86/perfmon/Kconfig | 33 + + arch/x86/perfmon/Makefile | 7 + + arch/x86/perfmon/perfmon.c | 619 ++++++++++++++++++++ + arch/x86/perfmon/perfmon_amd64.c | 483 +++++++++++++++ + arch/x86/perfmon/perfmon_intel_arch.c | 628 ++++++++++++++++++++ + include/linux/perfmon.h | 102 ++++ + include/linux/perfmon_kern.h | 285 +++++++++ + include/linux/perfmon_pmu.h | 138 +++++ + include/linux/sched.h | 4 + + include/linux/syscalls.h | 11 + + kernel/sys_ni.c | 7 + + perfmon/Makefile | 10 + + perfmon/perfmon_activate.c | 136 +++++ + perfmon/perfmon_attach.c | 337 +++++++++++ + perfmon/perfmon_ctx.c | 400 +++++++++++++ + perfmon/perfmon_ctxsw.c | 252 ++++++++ + perfmon/perfmon_file.c | 306 ++++++++++ + perfmon/perfmon_init.c | 87 +++ + perfmon/perfmon_intr.c | 295 ++++++++++ + perfmon/perfmon_pmu.c | 269 +++++++++ + perfmon/perfmon_priv.h | 131 +++++ + perfmon/perfmon_res.c | 223 +++++++ + perfmon/perfmon_rw.c | 449 ++++++++++++++ + perfmon/perfmon_syscalls.c | 741 ++++++++++++++++++++++++ + perfmon/perfmon_sysfs.c | 344 +++++++++++ + 67 files changed, 7196 insertions(+), 37 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-perfmon + create mode 100644 Documentation/ABI/testing/sysfs-perfmon-pmu + create mode 100644 Documentation/perfmon.txt + create mode 100644 arch/x86/include/asm/perfmon.h + create mode 100644 arch/x86/include/asm/perfmon_kern.h + create mode 100644 arch/x86/perfmon/Kconfig + create mode 100644 arch/x86/perfmon/Makefile + create mode 100644 arch/x86/perfmon/perfmon.c + create mode 100644 arch/x86/perfmon/perfmon_amd64.c + create mode 100644 arch/x86/perfmon/perfmon_intel_arch.c + create mode 100644 include/linux/perfmon.h + create mode 100644 include/linux/perfmon_kern.h + create mode 100644 include/linux/perfmon_pmu.h + create mode 100644 perfmon/Makefile + create mode 100644 perfmon/perfmon_activate.c + create mode 100644 perfmon/perfmon_attach.c + create mode 100644 perfmon/perfmon_ctx.c + create mode 100644 perfmon/perfmon_ctxsw.c + create mode 100644 perfmon/perfmon_file.c + create mode 100644 perfmon/perfmon_init.c + create mode 100644 perfmon/perfmon_intr.c + create mode 100644 perfmon/perfmon_pmu.c + create mode 100644 perfmon/perfmon_priv.h + create mode 100644 perfmon/perfmon_res.c + create mode 100644 perfmon/perfmon_rw.c + create mode 100644 perfmon/perfmon_syscalls.c + create mode 100644 perfmon/perfmon_sysfs.c +Merging osd/linux-next +$ git merge osd/linux-next +Auto-merged MAINTAINERS +Merge made by recursive. + Documentation/devices.txt | 6 + + Documentation/scsi/osd.txt | 198 ++++++ + MAINTAINERS | 10 + + drivers/scsi/Kconfig | 2 + + drivers/scsi/Makefile | 2 + + drivers/scsi/osd/Kbuild | 33 + + drivers/scsi/osd/Kconfig | 41 ++ + drivers/scsi/osd/Makefile | 43 ++ + drivers/scsi/osd/osd_debug.h | 30 + + drivers/scsi/osd/osd_initiator.c | 1457 ++++++++++++++++++++++++++++++++++++++ + drivers/scsi/osd/osd_ktests.c | 441 ++++++++++++ + drivers/scsi/osd/osd_ktests.h | 31 + + drivers/scsi/osd/osd_test.c | 74 ++ + drivers/scsi/osd/osd_uld.c | 445 ++++++++++++ + drivers/scsi/scsi_scan.c | 1 + + include/linux/major.h | 1 + + include/scsi/osd_attributes.h | 327 +++++++++ + include/scsi/osd_initiator.h | 379 ++++++++++ + include/scsi/osd_protocol.h | 575 +++++++++++++++ + include/scsi/osd_sec.h | 45 ++ + include/scsi/osd_types.h | 40 + + include/scsi/scsi.h | 1 + + 22 files changed, 4182 insertions(+), 0 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_ktests.c + create mode 100644 drivers/scsi/osd/osd_ktests.h + create mode 100644 drivers/scsi/osd/osd_test.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_types.h +Merging fatfs/master +$ git merge fatfs/master +Merge made by recursive. + fs/fat/dir.c | 1 - + fs/fat/inode.c | 2 ++ + fs/fat/namei_vfat.c | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) +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..199ea58ba3a5 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,181 @@ +Importing driver-core.current based on 2.6.28-rc4-git2 +$ git checkout quilt/driver-core.current +Switched to branch "quilt/driver-core.current" +$ git reset --hard f21f237cf55494c3a4209de323281a3b0528da10 +HEAD is now at f21f237 Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core.current +driver-core-fix-using-ret-variable-in-unregister_dynamic_debug_module.patch +Importing usb.current based on quilt/driver-core.current +$ git checkout quilt/usb.current +Switched to branch "quilt/usb.current" +$ git reset --hard 8a1dd158b19063c7ce266d8c234d6be4a805bf12 +HEAD is now at 8a1dd15 driver core: fix using 'ret' variable in unregister_dynamic_debug_module +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb.current +usb-vstusb-fix-compiler-warning-on-x86-64.patch +usb-add-nikon-d300-camera-to-unusual_devs.patch +usb-don-t-register-endpoints-for-interfaces-that-are-going-away.patch +usb-musb-fix-for-isochronous-in-transfer.patch +usb-musb-fixes-endpoint-allocation-logic.patch +usb-musb-tusb6010-kill-compile-warning.patch +usb-musb-removes-compilation-warning-in-gadget-mode.patch +usb-musb-fix-debug-global-variable-name.patch +usb-musb-fix-bulk-request-on-different-available-endpoints.patch +usb-musb-fix-for-kernel-panic-with-multiple-bulk-transfer.patch +usb-add-yiso-u893-usb-modem-vendor-and-product-ids-to-option-driver.patch +usb-mention-urb_free_buffer-in-usb_free_urb-documentation.patch +usb-cp2101-add-device-id-for-amb2560.patch +usb-cdc-acm.c-fix-recursive-lock-in-acm_start_wb-error-path.patch +usb-unusual_devs-entry-for-argosy-usb-mass-storage-interface.patch +usb-fix-ps3-usb-shutdown-problems.patch +usb-storage-adjust-comment-in-kconfig.patch +usb-cp2101-add-enfora-gsm2228.patch +usb-remove-optional-bus-bindings-in-isp1760-fixing-runtime-warning.patch +usb-unusual-devs-patch-for-nokia-7610-supernova.patch +usb-usb-storage-add-quirks-module-parameter.patch +usb-sisusb2vga-driver-add-0x0711-0x0903.patch +ub-stub-pre_reset-and-post_reset-to-fix-oops.patch +usb-r8a66597-hcd-fix-wrong-data-access-in-superh-on-chip-usb.patch +usb-fsl_qe_udc-report-disconnect-before-unbinding-fixing-oopses.patch +Unchanged quilt series m68k +Importing driver-core based on quilt/usb.current +$ git checkout quilt/driver-core +Switched to branch "quilt/driver-core" +$ git reset --hard 1c042b24e4bf0deec00281bb153a70327187343e +HEAD is now at 1c042b2 USB: fsl_qe_udc: Report disconnect before unbinding fixing oopses +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core +pm-simplify-the-new-suspend-hibernation-framework-for-devices.patch +driver-core-rearrange-struct-device-for-better-packing.patch +driver-core-remove-completion-from-struct-klist_node.patch +driver-core-struct-device-replace-bus_id-with-dev_name-dev_set_name.patch +sysfs-clarify-sysfs_deprecated-help-text.patch +uio-use-pci_ioremap_bar-in-drivers-uio.patch +uio-uio_pdrv_genirq-allow-custom-irq_flags.patch +warn-when-statically-allocated-kobjects-are-used.patch +Importing usb based on quilt/driver-core +$ git checkout quilt/usb +Switched to branch "quilt/usb" +$ git reset --hard 4fa10e37aaad5012ff946f833d8efaf61c422445 +HEAD is now at 4fa10e3 warn when statically-allocated kobjects are used +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb +usb-clean-up-redundant-tests-on-unsigned.patch +usb-use-pci_ioremap_bar-in-drivers-usb.patch +usb-avoid-20ms-delay-in-ehci-resume.patch +usb-host-oxford-oxu210hp-hcd-driver.patch +usb-protect-hcd.h-from-multiple-inclusions.patch +usb-avoid-needless-address-taking-of-function-parameters.patch +usb-straighten-out-inline-code-in-sysfs.c.patch +usb-ehci-pci-quirks.c-don-t-wait-so-long-for-bios-handoff.patch +usb-wusb-annotate-association-types-withe-proper-endianness.patch +usb-remove-restrictions-on-signal-numbers-in-devio.c.patch +usb-power-availability-check-for-berry_charge.patch +usb-usbtmc-indent-braces-disagree-something-else-is-desired.patch +usb-change-interface-to-usb_lock_device_for_reset.patch +usb-fsl_qe_udc-check-for-muram-allocation-errors.patch +usb-add-imx-udc-gadget-driver.patch +usb-add-new-opticon-serial-driver.patch +Importing device-mapper based on v2.6.28-rc3-31-ga75952b +$ git checkout quilt/device-mapper +Switched to branch "quilt/device-mapper" +$ git reset --hard a75952b72a0fff3031124003e62118111aed42c1 +HEAD is now at a75952b Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 +$ git quiltimport --author Alasdair G Kergon <agk@redhat.com> --patches ../quilt/device-mapper +dm-raid1-flush-workqueue-before-destruction.patch +dm-stripe-fix-init-failure.patch +dm-consolidate-target-deregistration-error-handling.patch +dm-mpath-avoid-attempting-to-activate-null-path.patch +dm-mpath-warn-if-args-ignored.patch +dm-move-wake_up-into-dm_io_acct.patch +Importing i2c based on 2.6.28-rc4-git2 +$ git checkout quilt/i2c +Switched to branch "quilt/i2c" +$ git reset --hard f21f237cf55494c3a4209de323281a3b0528da10 +HEAD is now at f21f237 Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c +i2c-replace-bus_id-with-dev_name-dev_set_name-part-1.patch +i2c-replace-bus_id-with-dev_name-dev_set_name-part-2.patch +i2c-drop-I2C_CLASS_ALL.patch +i2c-drop-I2C_CLASS_CAM_ANALOG-and-I2C_CLASS_SOUND.patch +i2c-drop-I2C_CLASS_CAM_DIGITAL.patch +i2c-apanel-convert-to-new-style.patch +Importing jdelvare-hwmon based on 2.6.28-rc4-git2 +$ git checkout quilt/jdelvare-hwmon +Switched to branch "quilt/jdelvare-hwmon" +$ git reset --hard f21f237cf55494c3a4209de323281a3b0528da10 +HEAD is now at f21f237 Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/jdelvare-hwmon +hwmon-f71882fg-01-use-sensor_device_attribute_2.patch +hwmon-f71882fg-02-misc-cleanups.patch +hwmon-f71882fg-03-add-pwm-support.patch +hwmon-f71882fg-04-style-cleanups.patch +hwmon-f71882fg-05-add-f71862fg-support.patch +hwmon-f71882fg-06-no-io-to-unreserved-ports.patch +hwmon-add-ltc4245-driver.patch +hwmon-dont-overuse-I2C_CLIENT_MODULE_PARM.patch +hwmon-it87-add-it8720f-support.patch +hwmon-i5k_amb-load-automatically-on-all-5000-5400-chipsets.patch +hwmon-k8temp-01-warn-about-errata.patch +hwmon-fschmd-01-cleanup.patch +hwmon-lm70-01-fix-byte-order.patch +hwmon-lm70-02-ti-tmp121-support.patch +Unchanged quilt series kernel-doc +Importing ide based on 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 +$ git checkout quilt/ide +Switched to branch "quilt/ide" +$ git reset --hard 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 +HEAD is now at 45beca0 Linux v2.6.28-rc3 +$ git quiltimport --author Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> --patches ../quilt/ide +ide-fix-the-ide_release_lock-imbalance.patch +ide-unify-ide_intr-s-exit-points.patch +ide-ide-settings-dont-need-an-ide_lock-held.patch +ide-__ide_port_unregister_devices-doesnt-need-an-ide_lock-held.patch +ide-ide_hwgroup_t-rq-doesnt-need-an-ide_lock-held.patch +ide-push-ide_lock-to-__ide_end_request.patch +ide-ide_lock-__blk_end_request-to-blk_end_request.patch +ide-use-queue-lock-instead-of-ide_lock-when-possible.patch +ide-replace-the-global-ide_lock-spinlock-by-per-hwgroup-spinlocks-v2.patch +Context reduced to (1/1) to apply fragment at 949 +ide-cleanup-ide_do_request.patch +ide-cd-remove-obsolete-seek-optimization.patch +ide-dont-execute-the-next-queued-command-from-the-hard-irq-context-v2.patch +ali14xx-doesnt-use-shared-irqs.patch +cmd64x-set-ide_hflag_serialize-explictly-for-cmd646.patch +gayle-set-ide_hflag_serialize-explictly.patch +ide-fix-quirk_list-checking-in-ide_do_request.patch +ide-always-set-nien-on-idle-devices.patch +rz1000-apply-chipset-quirks-early-v2.patch +trm290-add-ide_hflag_trm290-host-flag.patch +cy82c693-remove-superfluous-ide_cy82c693-chipset-type.patch +ide-rework-handling-of-serialized-ports-v2.patch +ide-struct-device-replace-bus_id-with-dev_name()-dev_set_name().patch +ide-respect-current-dma-setting-during-resume.patch +ide-fix-build-for-debug_pm.patch +ide-remove-dead-code-from-drive_is_ready.patch +ide-remove-redundant-code-from-ide_end_drive_cmd.patch +ide-remove-inline-tags-from-ide-probe-c.patch +ide-checkpatch.pl-fixes-for-ide-lib-c.patch +ide-use-ata_dma_-defines-in-ide-dma-sff-c.patch +ide-move-power-management-support-to-ide-pm-c.patch +ide-move-legacy-isa-vlb-ports-handling-to-ide-legacy-c.patch +ide-remove-superfluous-local_irq_save-restore-from-ide_dump_status.patch +ide-push-local_irq_save-restore-to-do_identify.patch +ide-cd-remove-dead-atapi_overlap-setting.patch +Importing rr based on v2.6.28-rc3-261-g8b805ef +$ git checkout quilt/rr +Switched to branch "quilt/rr" +$ git reset --hard 8b805ef617cf0e02f6d18b891f8deb6246421b01 +HEAD is now at 8b805ef Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux +$ git quiltimport --author Rusty Russell <rusty@rustcorp.com.au> --patches ../quilt/rr +stop_machine:fix-return-race.patch +virtio:net_recycle_some_more_rx_buffer_pages.patch +virtio:net_hook_up_the_set_tso_ethtool_op.patch +virtio:net-mergeable-rx-bufs.patch +virtio:struct_device_replace_bus_id_with_dev_name_dev_set_name.patch +virtio:VIRTIO_PCI_QUEUE_ADDR_SHIFT.patch +virtio:rename-vring-pagesize-to-align.patch +virtio:VIRTIO_PCI_VRING_ALIGN.patch +virtio:LGUEST_VRING_ALIGN.patch +virtio:KVM_S390_VIRTIO_RING_ALIGN.patch +virtio:virtqueue-hand-in-vqalign.patch +lguest:move_the_initial_guest_page_table_creation_code_to_the_host.patch +module:remove_config_kmod.patch +Unchanged quilt series ttydev diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..afb0fab8c3c5 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20081113 |