diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-10-27 18:10:16 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-10-27 18:10:16 +1100 |
| commit | a603250484105f36239096c915fb7c81d7b1993e (patch) | |
| tree | 0596cf3300e60029fde1dc2778853111adf81b81 | |
| parent | 502a2bab82ff22cb389ebe8f9d005794eeadaccd (diff) | |
Add linux-next specific files for 20081027next-20081027
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 123 | ||||
| -rw-r--r-- | Next/Trees | 125 | ||||
| -rw-r--r-- | Next/merge.log | 1988 | ||||
| -rw-r--r-- | Next/quilt-import.log | 143 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 2380 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..89fadd132872 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,123 @@ +Name SHA1 +---- ---- +origin f8d56f1771e4867acc461146764b4feeb5245669 +powerpc-merge 61e9916eba35dfb76d38013a5aae9a59cc50877a +scsi-rc-fixes c9eeb248f3b44939532a9716bc06413383aa5d63 +net-current fd6149d332973bafa50f03ddb0ea9513e67f4517 +sparc-current 60b8267338aafde5315fc65ff385f3d4d75eccfe +sound-current bfd4e66b8d0dfcdbe3f5ccff45757f098bdbb26e +arm-current 778c4c821779bb7eef7f5a1eea4d15d05d976f8b +pci-current 3b15e581981b3ad35809f56d8131d5c19b6da1bd +wireless-current 4cc683c9adbe644323e978bc63b2ab12606bb3c8 +kbuild-current bec1fe23b9df506d0cd06ef14df3664ca052fd01 +driver-core.current 5214edd9f6dc7bc282276585f73b3f6019600e33 +usb.current 5214edd9f6dc7bc282276585f73b3f6019600e33 +cpufreq-current 8d5922572038bae9f7b16fcb974eee806727b44c +input-current 2a0bd75e5e687a9c34921e942c18477ea7ec2d63 +md-current 7a1fc53c5adb910751a9b212af90302eb4ffb527 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +arm 6ffab0efc17f70f44810ae50fc40f934c8173f35 +avr32 105462632c37ea5484ebae7db6e85e0aaac28f4b +blackfin 1390da4ee75168b6e4d8354e93e3b5f0a0291f2f +cris a54373eee6e9f5e986a251e852ee1bb83e03671b +ia64 f2e4bd2b37bf072babc6a1f6c2a7ef53b7b046ad +m68k c85b5f11b80dc0d2218184888287ea406e46c41e +m68knommu 7680a920c75b242adaedf3d93b7f6d253db56792 +mips d3a47e82b6bc3724dd60f3ee4e84fe4479104382 +parisc 81e192d6ce303b6792aa38ff35f41a1a7357f23a +powerpc 54622f10a6aabb8bb2bdacf3dd070046f03dc246 +4xx 54622f10a6aabb8bb2bdacf3dd070046f03dc246 +galak 6dc6472581f693b5fc95aebedf67b4960fb85cf0 +pxa c77edb536bbab9376f205af68f05ba213d2038c3 +s390 56d4d7a1c8fa74b5ba8c2631750cae4f4286d074 +sh 57f8f7b60db6f1ed2c6918ab9230c4623a9dbe37 +sparc 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 +x86 fd14e0c8b7d8f260fe5ed28ae4018153ad05e66f +xtensa dbd3dca3d7d5b1cd36a3df2ee9ed2c46d99b7f64 +driver-core 5214edd9f6dc7bc282276585f73b3f6019600e33 +usb ef4e05fb433058f3fc996546b8049eadd9352d5f +tip-core 22c7cf7f3ebd9aa18bd7ff35fae0852a758cb731 +cpus4096 95a15dd7131ec742e642b3b7856f83f65503b44a +ftrace b92954a36a9134d7a0864743ae86789fe69c179f +genirq a9b6148d25f15ddfe9d7a7f3e526fdb64e7cf7da +safe-poison-pointers 22181507925482507b4275127377f3cf37a94331 +sched ca972b0a052bc13c576a502f4b3c43ff2e001d89 +stackprotector 52e6b9b6880a51269869018dea8c329cbaa48b52 +timers a9b6148d25f15ddfe9d7a7f3e526fdb64e7cf7da +pci c89e087d03d1af96cd082fd08322d91550465cff +device-mapper 332edc2f7fa58b818dfed1cede60272eecc27c0a +hid b6f304af487eeefc2375bc05b92d88607474f236 +i2c 2478937b9cfbf30db55ed0931271729afa46d96b +jdelvare-hwmon 24f0339d2301c564c7893884da4ee8f58c5f3135 +kernel-doc a881214af7025692df7329c477edb044a3920bb4 +v4l-dvb 828687a7b6699fbc6bc62d03f381e3cd468134ab +jfs ec1aef33668448718fcba79e4e981592bfd7e0a3 +kbuild 56b2f0706d82535fd8d85503f2dcc0be40c8e55d +ide 10af3f15abb8fbd32f34b9cecf399aab187009cc +libata a551b98d5f6fce5897d497abd8bfb262efb33d2a +nfs 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 +xfs b8448a3a93f10d87817bc7fe519c3536fd8a3cb7 +infiniband 332edc2f7fa58b818dfed1cede60272eecc27c0a +acpi 40b9f86254dbfa4cc0fa0cfbfd2bb41c7c0b8684 +nfsd 30bc4dfd3b64eb1fbefe2c63e30d8fc129273e20 +ieee1394 7ccf54a0cc18ef8fe3a1e21727f8c15cd14fa66e +ubi 57f8f7b60db6f1ed2c6918ab9230c4623a9dbe37 +kvm fc024f2d8f4077cc221b48b307cff038f32a01d0 +dlm 27eccf46491e1f77f9af9bbe0778122ce6882890 +scsi 520a2c2741747062e75f91cd0faddb564fbc64d2 +tests 94a97a3018e55a27d1c29e011b3c38fee01a967f +ocfs2 63d05f4b042f033feaa856b219f3a29dddd27dae +ext4 f287a1a56130be5fdb96a4a62d1290bd064f308e +async_tx 77cd62e8082b9743b59ee1946a4c3ee2e3cd2bce +udf 5c89468c12899b84886cb47eec93f0c88e0f896a +net 4480f15b3306f43bbb0310d461142b4e897ca45b +mtd f04de505e3fa322728d1a851e08bf7060b117743 +wireless ad788b5e079484aa1d48aa90a3ebd7d954d2e7db +crypto 6aa7aef26e24d713397c7f56615ab90281dc59e6 +vfs fd217f4d70172c526478f2bc76859e909fdfa674 +sound b31052b8567f44f13c03c3fe7d3d56b5a7694d57 +cpufreq 4f6e6b9f97b0ce98a8d1da65adbaf743bd0486a9 +v9fs 38ebce615ac25b9805a29ab22f3b653353a9884d +rr a7df98c8760980d72a6ab239a3a78465bff2adcd +cifs 969907a956752f88dde4aa23fa8c033b9a939aee +mmc 6ee6c6adf1cfebbf432b8d1f204c7f96e395933e +gfs2 c59f927e7facd5a911c6bc68e56e3bda8de5d65e +input b8d055a878ee0f997ded40649701089d2486f850 +semaphore b552068999b0b05087c454e525b30b785c79dc9b +semaphore-removal 9ac2f04936e1140d7a28a01b84e086458e191b49 +bkl-removal 0d4a7bc12ffecd3ba41dd94179cc5b272b71ce8a +trivial 0bb08241ce68aaa70b7b804b4d6319d8bad3ae24 +ubifs e013e13bf605b9e6b702adffbe2853cfc60e7806 +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block 75361dec7c1b1ecb1eeb85583cc1eef09263c6b0 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 0105f18683fde1df6ef69e7812582a52701e8a54 +pcmcia 5cb02ff3489d710c73b4a21bb804feedeacce116 +battery ed8c3174dd227031d1f3b9fa4fbb512f8f623434 +leds 57f8f7b60db6f1ed2c6918ab9230c4623a9dbe37 +backlight 57f8f7b60db6f1ed2c6918ab9230c4623a9dbe37 +kgdb 29c2e152262690a5e87543b0c2cd3b13884f70a9 +slab d096f80bf195c0bbe868e3287b951effb765c4c0 +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md e31bf116a45723524d62beecaac494ac50c70434 +kmemcheck d3731c39d14ac4ef0a6f31bf755d241db5dd2398 +generic-ipi a9b6148d25f15ddfe9d7a7f3e526fdb64e7cf7da +mfd c3177623edf3fabf200c60bde9b400d03b6271f7 +hdlc 959ffb0d55b2c3cf64417f9ac5c4d9ed8df981d4 +drm 7e78f72524b794fa8d73dc59aeeacc12a2e937fe +voltage 02bdc62abff3fe77bc57372196efb58216a9b248 +security-testing 0da939b0058742ad2d8580b7db6b966d0fc72252 +lblnet 7591103c08abade60aeddb432ed0686ddd0de1c6 +ttydev f8d56f1771e4867acc461146764b4feeb5245669 +agp a64d2b37c2259e169759c1701ac565f0a11dc0ea +creds bf93d538c5d4d7fd621fa8ef7ea36b012ef51eaa +oprofile 57f8f7b60db6f1ed2c6918ab9230c4623a9dbe37 +fastboot a9b6148d25f15ddfe9d7a7f3e526fdb64e7cf7da +sparseirq b6f3b7803a9231eddc36d0a2a6d2d8105ef89344 +iommu a9b6148d25f15ddfe9d7a7f3e526fdb64e7cf7da +uwb 14e361d67031c64c430136155ed5d1c5960ce3bb +watchdog c3168cacfa97f978b65c14a86cdea0ca1ee1e39f +proc af22e6782098da2da2bd7e7428a7327f821cb157 +bdev 56b26add02b4bdea81d5e0ebda60db1fe3311ad4 +dwmw2-iommu b876d08f816527af257e13d89fb0d3b4b849223c +scsi-post-merge 04ab591808565f968d4406f6435090ad671ebdab diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..71560836ea00 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,125 @@ +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/benh/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/benh/powerpc.git#next +4xx git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#powerpc-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#stable +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 +tests git git://git.kernel.org/pub/scm/linux/kernel/git/sam/test.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 +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial-2.6.git#next +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-linus +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 +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..ea5adb7e79e3 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,1988 @@ +$ git checkout master +Already on "master" +$ git reset --hard stable +HEAD is now at 332edc2 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 +Merging origin/master +$ git merge origin/master +Updating 332edc2..f8d56f1 +Fast forward + Documentation/DocBook/deviceiobook.tmpl | 2 +- + Documentation/DocBook/kernel-api.tmpl | 10 +- + Documentation/DocBook/kernel-hacking.tmpl | 4 +- + Documentation/DocBook/mcabook.tmpl | 2 +- + Documentation/hwmon/lm90 | 2 +- + Documentation/input/elantech.txt | 405 ++++++++ + Makefile | 6 +- + arch/arm/Kconfig | 9 +- + arch/arm/Makefile | 2 +- + arch/arm/configs/corgi_defconfig | 1396 ++++++++++++++++---------- + arch/arm/configs/msm_defconfig | 2 +- + arch/arm/configs/spitz_defconfig | 1294 +++++++++++++++--------- + arch/arm/include/asm/div64.h | 6 +- + arch/arm/mach-at91/gpio.c | 1 + + arch/arm/mach-kirkwood/Makefile | 2 +- + arch/arm/mach-msm/Kconfig | 17 +- + arch/arm/mach-msm/Makefile | 7 +- + arch/arm/mach-msm/board-halibut.c | 38 +- + arch/arm/mach-msm/clock-7x01a.c | 126 +++ + arch/arm/mach-msm/clock.c | 218 ++++ + arch/arm/mach-msm/clock.h | 48 + + arch/arm/mach-msm/common.c | 116 --- + arch/arm/mach-msm/devices.c | 267 +++++ + arch/arm/mach-msm/devices.h | 36 + + arch/arm/mach-msm/dma.c | 72 +- + arch/arm/mach-msm/include/mach/board.h | 1 + + arch/arm/mach-msm/include/mach/debug-macro.S | 8 +- + arch/arm/mach-msm/include/mach/dma.h | 24 +- + arch/arm/mach-msm/include/mach/msm_iomap.h | 69 +- + arch/arm/mach-msm/include/mach/vreg.h | 29 + + arch/arm/mach-msm/io.c | 12 +- + arch/arm/mach-msm/irq.c | 10 +- + arch/arm/mach-msm/proc_comm.c | 110 ++ + arch/arm/mach-msm/proc_comm.h | 165 +++ + arch/arm/mach-msm/timer.c | 2 +- + arch/arm/mach-msm/vreg.c | 143 +++ + arch/arm/mach-pxa/Kconfig | 8 + + arch/arm/mach-pxa/Makefile | 1 + + arch/arm/mach-pxa/corgi_lcd.c | 289 ++++++ + arch/arm/mach-pxa/corgi_ssp.c | 276 +++++ + arch/arm/mach-pxa/include/mach/corgi.h | 1 + + arch/arm/mach-pxa/include/mach/spitz.h | 1 + + arch/arm/mach-pxa/include/mach/tosa.h | 3 + + arch/arm/mach-pxa/sharpsl_pm.c | 17 +- + arch/arm/mach-pxa/tosa.c | 21 +- + arch/arm/mm/Kconfig | 4 +- + arch/arm/mm/proc-v7.S | 4 +- + arch/mips/include/asm/txx9/tx4938.h | 13 + + arch/mips/txx9/generic/setup_tx4938.c | 47 + + arch/mips/txx9/rbtx4938/setup.c | 1 + + arch/sparc/kernel/apc.c | 2 +- + arch/sparc/kernel/head.S | 1 + + arch/sparc64/kernel/trampoline.S | 18 +- + drivers/Makefile | 2 +- + drivers/acpi/button.c | 3 +- + drivers/acpi/processor_perflib.c | 5 + + drivers/acpi/sleep/main.c | 2 + + drivers/acpi/toshiba_acpi.c | 2 + + drivers/ata/libata-core.c | 66 +-- + drivers/ata/libata-scsi.c | 14 +- + drivers/ata/libata.h | 19 +- + drivers/char/amiserial.c | 6 +- + drivers/dma/ioat_dma.c | 7 +- + drivers/hid/Kconfig | 2 - + drivers/hid/hid-apple.c | 63 +- + drivers/hid/hid-core.c | 43 +- + drivers/hid/hid-gyration.c | 4 +- + drivers/hid/hid-ids.h | 5 +- + drivers/hid/hid-lg.c | 5 - + drivers/hid/hid-sony.c | 44 +- + drivers/hid/hidraw.c | 3 +- + drivers/hid/usbhid/hid-core.c | 3 + + drivers/hid/usbhid/hiddev.c | 3 +- + drivers/hwmon/abituguru3.c | 30 +- + drivers/hwmon/adt7473.c | 29 +- + drivers/hwmon/hwmon-vid.c | 1 + + drivers/hwmon/lm90.c | 52 +- + drivers/hwmon/w83781d.c | 4 +- + drivers/ide/Kconfig | 10 + + drivers/ide/Makefile | 4 +- + drivers/ide/icside.c | 4 +- + drivers/ide/ide-cd.c | 1 + + drivers/ide/ide-disk.c | 8 +- + drivers/ide/{generic.c => ide-pci-generic.c} | 0 + drivers/ide/rapide.c | 4 +- + drivers/ide/scc_pata.c | 10 +- + drivers/ide/sgiioc4.c | 24 +- + drivers/ide/siimage.c | 2 +- + drivers/ide/tx4938ide.c | 310 ++++++ + drivers/ide/tx4939ide.c | 754 ++++++++++++++ + drivers/idle/Kconfig | 11 +- + drivers/idle/i7300_idle.c | 105 +-- + drivers/input/mouse/Kconfig | 25 +- + drivers/input/mouse/Makefile | 1 + + drivers/input/mouse/elantech.c | 674 +++++++++++++ + drivers/input/mouse/elantech.h | 124 +++ + drivers/input/mouse/psmouse-base.c | 23 + + drivers/input/mouse/psmouse.h | 1 + + drivers/input/serio/i8042-x86ia64io.h | 8 + + drivers/input/touchscreen/Kconfig | 6 +- + drivers/leds/Kconfig | 25 +- + drivers/leds/Makefile | 4 +- + drivers/leds/led-class.c | 12 +- + drivers/leds/leds-ams-delta.c | 20 +- + drivers/leds/leds-cm-x270.c | 124 --- + drivers/leds/leds-da903x.c | 175 ++++ + drivers/leds/leds-hp-disk.c | 156 +++ + drivers/leds/leds-pca955x.c | 2 +- + drivers/leds/leds-wrap.c | 5 +- + drivers/leds/ledtrig-backlight.c | 110 ++ + drivers/leds/ledtrig-timer.c | 8 +- + drivers/md/md.c | 56 +- + drivers/mfd/Kconfig | 12 + + drivers/mfd/Makefile | 2 + + drivers/net/8139cp.c | 5 +- + drivers/net/8139too.c | 5 +- + drivers/net/Kconfig | 9 +- + drivers/net/ax88796.c | 6 +- + drivers/net/bonding/bond_main.c | 16 +- + drivers/net/cxgb3/l2t.c | 1 + + drivers/net/dm9000.c | 9 - + drivers/net/ehea/ehea.h | 2 +- + drivers/net/ehea/ehea_main.c | 25 +- + drivers/net/ehea/ehea_qmr.c | 131 ++- + drivers/net/ehea/ehea_qmr.h | 2 + + drivers/net/fec_mpc52xx.c | 18 + + drivers/net/gianfar.c | 24 +- + drivers/net/igb/igb_main.c | 60 +- + drivers/net/myri10ge/myri10ge.c | 6 +- + drivers/net/qlge/qlge.h | 5 +- + drivers/net/qlge/qlge_main.c | 89 +- + drivers/net/r8169.c | 74 +-- + drivers/net/sis190.c | 1 + + drivers/net/smc911x.c | 38 +- + drivers/net/smc911x.h | 6 +- + drivers/net/wireless/ath5k/base.c | 27 +- + drivers/net/wireless/ath5k/base.h | 3 +- + drivers/net/wireless/orinoco.c | 42 +- + drivers/net/wireless/p54/p54common.c | 28 +- + drivers/pci/Makefile | 3 +- + drivers/pci/hotplug/acpiphp_ibm.c | 2 +- + drivers/pci/hotplug/cpqphp_core.c | 2 +- + drivers/pci/hotplug/pciehp.h | 2 +- + drivers/pci/hotplug/pciehp_core.c | 38 +- + drivers/pci/hotplug/pciehp_ctrl.c | 64 +- + drivers/pci/hotplug/pciehp_hpc.c | 43 +- + drivers/pci/hotplug/pciehp_pci.c | 19 +- + drivers/pci/hotplug/shpchp.h | 22 +- + drivers/pci/hotplug/shpchp_core.c | 48 +- + drivers/pci/hotplug/shpchp_ctrl.c | 158 ++-- + drivers/pci/hotplug/shpchp_hpc.c | 113 ++- + drivers/pci/hotplug/shpchp_pci.c | 36 +- + drivers/pci/irq.c | 60 ++ + drivers/pci/pci-acpi.c | 3 + + drivers/pci/pci.c | 21 +- + drivers/pci/probe.c | 3 - + drivers/video/backlight/Kconfig | 37 +- + drivers/video/backlight/Makefile | 4 + + drivers/video/backlight/da903x.c | 201 ++++ + drivers/video/backlight/kb3886_bl.c | 204 ++++ + drivers/video/backlight/tosa_bl.c | 198 ++++ + drivers/video/backlight/tosa_lcd.c | 280 ++++++ + fs/compat.c | 5 +- + fs/eventpoll.c | 11 +- + fs/ext3/dir.c | 20 +- + fs/ext4/dir.c | 20 +- + fs/select.c | 5 +- + include/linux/hid.h | 6 + + include/linux/i7300_idle.h | 83 ++ + include/linux/leds.h | 4 +- + include/linux/libata.h | 1 - + include/linux/netdevice.h | 12 +- + include/linux/pci.h | 7 + + include/linux/raid/md_k.h | 8 +- + include/linux/smc911x.h | 1 + + include/math-emu/op-common.h | 19 +- + include/net/sctp/sm.h | 1 + + init/main.c | 3 +- + kernel/cgroup.c | 2 +- + kernel/stop_machine.c | 2 +- + net/bridge/br_device.c | 2 +- + net/bridge/br_if.c | 14 +- + net/core/dev.c | 135 ++-- + net/ipv4/tcp_output.c | 25 +- + net/sctp/input.c | 2 +- + net/sctp/sm_statefuns.c | 54 + + net/sctp/sm_statetable.c | 4 +- + net/wireless/Kconfig | 11 +- + scripts/checkstack.pl | 4 + + scripts/kconfig/confdata.c | 3 +- + scripts/kernel-doc | 6 +- + 191 files changed, 8860 insertions(+), 2408 deletions(-) + create mode 100644 Documentation/input/elantech.txt + create mode 100644 arch/arm/mach-msm/clock-7x01a.c + create mode 100644 arch/arm/mach-msm/clock.c + create mode 100644 arch/arm/mach-msm/clock.h + delete mode 100644 arch/arm/mach-msm/common.c + create mode 100644 arch/arm/mach-msm/devices.c + create mode 100644 arch/arm/mach-msm/devices.h + create mode 100644 arch/arm/mach-msm/include/mach/vreg.h + create mode 100644 arch/arm/mach-msm/proc_comm.c + create mode 100644 arch/arm/mach-msm/proc_comm.h + create mode 100644 arch/arm/mach-msm/vreg.c + create mode 100644 arch/arm/mach-pxa/corgi_lcd.c + create mode 100644 arch/arm/mach-pxa/corgi_ssp.c + rename drivers/ide/{generic.c => ide-pci-generic.c} (100%) + create mode 100644 drivers/ide/tx4938ide.c + create mode 100644 drivers/ide/tx4939ide.c + create mode 100644 drivers/input/mouse/elantech.c + create mode 100644 drivers/input/mouse/elantech.h + delete mode 100644 drivers/leds/leds-cm-x270.c + create mode 100644 drivers/leds/leds-da903x.c + create mode 100644 drivers/leds/leds-hp-disk.c + create mode 100644 drivers/leds/ledtrig-backlight.c + create mode 100644 drivers/pci/irq.c + create mode 100644 drivers/video/backlight/da903x.c + create mode 100644 drivers/video/backlight/kb3886_bl.c + create mode 100644 drivers/video/backlight/tosa_bl.c + create mode 100644 drivers/video/backlight/tosa_lcd.c + create mode 100644 include/linux/i7300_idle.h +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net-current/master +$ git merge net-current/master +Already up-to-date. +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 +Already up-to-date. +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Merge made by recursive. + arch/ia64/include/asm/iommu.h | 1 - + arch/ia64/kernel/pci-dma.c | 7 ------- + arch/x86/include/asm/iommu.h | 1 - + arch/x86/kernel/pci-dma.c | 16 ++++++++++++++++ + drivers/pci/quirks.c | 14 -------------- + 5 files changed, 16 insertions(+), 23 deletions(-) +Merging wireless-current/master +$ git merge wireless-current/master +Already up-to-date. +Merging kbuild-current/master +$ git merge kbuild-current/master +Auto-merged Makefile +Merge made by recursive. + Makefile | 5 +++++ + scripts/package/mkspec | 3 +++ + 2 files changed, 8 insertions(+), 0 deletions(-) +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Merge made by recursive. + Documentation/sysctl/kernel.txt | 24 +++++++++++++++++------- + drivers/base/sys.c | 10 ++++++---- + 2 files changed, 23 insertions(+), 11 deletions(-) +Merging quilt/usb.current +$ git merge quilt/usb.current +Already up-to-date. +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Already up-to-date. +Merging md-current/for-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 +Already up-to-date. +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. + include/asm-cris/arch-v32/io.h | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging quilt/m68k +$ git merge quilt/m68k +Merge made by recursive. +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 +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging galak/powerpc-next +$ git merge galak/powerpc-next +Already up-to-date. +Merging pxa/for-next +$ git merge pxa/for-next +Auto-merged arch/arm/mach-pxa/Kconfig +Auto-merged drivers/video/backlight/Kconfig +Merge made by recursive. + arch/arm/configs/eseries_pxa_defconfig | 2 +- + arch/arm/configs/magician_defconfig | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging s390/features +$ git merge s390/features +Merge made by recursive. + arch/powerpc/include/asm/elf.h | 2 +- + arch/powerpc/kernel/vdso.c | 3 +- + arch/s390/Kconfig | 19 ++-- + arch/s390/appldata/appldata_base.c | 2 +- + arch/s390/include/asm/auxvec.h | 2 + + arch/s390/include/asm/elf.h | 16 ++ + arch/s390/include/asm/kvm_virtio.h | 2 +- + arch/s390/include/asm/mmu.h | 4 +- + arch/s390/include/asm/mmu_context.h | 19 ++- + arch/s390/include/asm/page.h | 2 + + arch/s390/include/asm/pgtable.h | 8 +- + arch/s390/include/asm/thread_info.h | 5 - + arch/s390/include/asm/vdso.h | 39 +++++ + arch/s390/kernel/Makefile | 7 +- + arch/s390/kernel/asm-offsets.c | 15 ++ + arch/s390/kernel/smp.c | 24 ++-- + arch/s390/kernel/time.c | 31 ++++ + 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/pgtable.c | 16 +- + 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/s390/char/tape_block.c | 6 +- + drivers/s390/char/tape_core.c | 8 +- + drivers/s390/char/vmcp.c | 3 - + drivers/s390/cio/qdio_debug.c | 19 +-- + drivers/s390/cio/qdio_main.c | 1 - + fs/binfmt_elf.c | 2 +- + 44 files changed, 1286 insertions(+), 81 deletions(-) + create mode 100644 arch/s390/include/asm/vdso.h + 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 +Merging sh/master +$ git merge sh/master +Already up-to-date. +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging x86/auto-x86-next +$ git merge x86/auto-x86-next +Merge made by recursive. + arch/x86/Kconfig.debug | 8 ++-- + arch/x86/kernel/dumpstack_32.c | 82 ++++++++++++++++++---------------------- + arch/x86/kernel/dumpstack_64.c | 35 +++++++++-------- + arch/x86/mm/fault.c | 11 +++-- + 4 files changed, 67 insertions(+), 69 deletions(-) +Merging xtensa/master +$ git merge xtensa/master +Merge made by recursive. +Merging quilt/driver-core +$ git merge quilt/driver-core +Already up-to-date. +Merging quilt/usb +$ git merge quilt/usb +Merge made by recursive. + drivers/net/usb/hso.c | 24 ++++++++++++------------ + include/linux/usb.h | 4 ---- + 2 files changed, 12 insertions(+), 16 deletions(-) +$ git revert ef4e05fb433058f3fc996546b8049eadd9352d5f +Finished one revert. +Created commit e889801: Revert "USB: remove info() macro from usb.h" + 1 files changed, 2 insertions(+), 0 deletions(-) +$ git revert 9a0a3610436856d2103ae23c7765120feb4345cc +Finished one revert. +Created commit aaccc1d: Revert "USB: remove warn() macro from usb.h" + 1 files changed, 2 insertions(+), 0 deletions(-) +Merging tip-core/auto-core-next +$ git merge tip-core/auto-core-next +Renamed include/asm-um/system-generic.h => arch/um/include/asm/system.h +Auto-merged arch/um/include/asm/system.h +CONFLICT (rename/modify): Merge conflict in arch/um/include/asm/system.h +Renamed include/asm-x86/percpu.h => arch/x86/include/asm/percpu.h +Auto-merged arch/x86/include/asm/percpu.h +Renamed include/asm-x86/uaccess.h => arch/x86/include/asm/uaccess.h +Auto-merged arch/x86/include/asm/uaccess.h +Renamed include/asm-x86/uaccess_32.h => arch/x86/include/asm/uaccess_32.h +Auto-merged arch/x86/include/asm/uaccess_32.h +Renamed include/asm-x86/uaccess_64.h => arch/x86/include/asm/uaccess_64.h +Auto-merged arch/x86/include/asm/uaccess_64.h +Auto-merged include/linux/kernel.h +Auto-merged kernel/futex.c +Auto-merged kernel/module.c +Auto-merged kernel/sched.c +Auto-merged mm/memory.c +Resolved 'arch/um/include/asm/system.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 8e8b836: Merge commit 'tip-core/auto-core-next' +$ git diff -M --stat --summary HEAD^.. + 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 | 31 ++++- + include/linux/percpu.h | 17 ++- + include/linux/uaccess.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 ++ + 28 files changed, 433 insertions(+), 262 deletions(-) +Merging cpus4096/auto-cpus4096-next +$ git merge cpus4096/auto-cpus4096-next +Renamed include/asm-x86/smp.h => arch/x86/include/asm/smp.h +Auto-merged arch/x86/include/asm/smp.h +Auto-merged arch/x86/Kconfig +Merge made by recursive. + arch/x86/Kconfig | 17 +++++++++++------ + arch/x86/include/asm/smp.h | 6 +++--- + arch/x86/kernel/smp.c | 6 +++--- + arch/x86/xen/smp.c | 6 +++--- + kernel/smp.c | 12 +++++------- + 5 files changed, 25 insertions(+), 22 deletions(-) +Merging ftrace/auto-ftrace-next +$ git merge ftrace/auto-ftrace-next +Renamed include/asm-x86/ftrace.h => arch/x86/include/asm/ftrace.h +Auto-merged arch/x86/include/asm/ftrace.h +Auto-merged Makefile +Auto-merged arch/arm/Kconfig +Auto-merged arch/powerpc/Kconfig +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/kernel/entry_32.S +Auto-merged kernel/sysctl.c +Merge made by recursive. + Makefile | 2 +- + arch/arm/Kconfig | 4 +- + arch/arm/boot/compressed/Makefile | 2 +- + arch/arm/include/asm/ftrace.h | 2 +- + arch/arm/kernel/armksyms.c | 2 +- + arch/arm/kernel/entry-common.S | 4 +- + arch/powerpc/Kconfig | 2 +- + arch/powerpc/Makefile | 2 +- + arch/powerpc/include/asm/ftrace.h | 2 +- + arch/powerpc/kernel/Makefile | 2 +- + arch/powerpc/kernel/entry_32.S | 2 +- + arch/powerpc/kernel/entry_64.S | 2 +- + arch/powerpc/kernel/ppc_ksyms.c | 2 +- + arch/powerpc/platforms/powermac/Makefile | 2 +- + arch/sparc64/Kconfig | 2 +- + arch/sparc64/Kconfig.debug | 2 +- + arch/sparc64/lib/mcount.S | 4 +- + arch/x86/Kconfig | 2 +- + arch/x86/include/asm/ftrace.h | 4 +- + arch/x86/kernel/Makefile | 2 +- + arch/x86/kernel/entry_32.S | 4 +- + arch/x86/kernel/entry_64.S | 4 +- + arch/x86/kernel/ftrace.c | 8 ++- + arch/x86/kernel/i386_ksyms_32.c | 2 +- + arch/x86/kernel/x8664_ksyms_64.c | 2 +- + arch/x86/xen/Makefile | 2 +- + include/linux/ftrace.h | 12 ++-- + include/linux/marker.h | 2 - + kernel/Makefile | 4 +- + kernel/marker.c | 77 ++++++++++------------------- + kernel/sysctl.c | 2 +- + kernel/trace/Kconfig | 22 ++++----- + kernel/trace/Makefile | 6 +- + kernel/trace/ftrace.c | 43 +++++++++++++++++ + kernel/trace/trace.c | 2 +- + kernel/trace/trace.h | 2 +- + kernel/trace/trace_functions.c | 2 +- + kernel/trace/trace_irqsoff.c | 4 +- + kernel/trace/trace_sched_wakeup.c | 4 +- + kernel/trace/trace_selftest.c | 4 +- + kernel/trace/trace_stack.c | 4 ++ + lib/Makefile | 2 +- + 42 files changed, 141 insertions(+), 121 deletions(-) +Merging genirq/auto-genirq-next +$ git merge genirq/auto-genirq-next +Already up-to-date. +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 +Already uptodate! +Merge made by recursive. +Merging stackprotector/auto-stackprotector-next +$ git merge stackprotector/auto-stackprotector-next +Renamed include/asm-x86/pda.h => arch/x86/include/asm/pda.h +Auto-merged arch/x86/include/asm/pda.h +CONFLICT (rename/modify): Merge conflict in arch/x86/include/asm/pda.h +Renamed include/asm-x86/system.h => arch/x86/include/asm/system.h +Auto-merged arch/x86/include/asm/system.h +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/Kconfig.debug +Auto-merged arch/x86/Makefile +Auto-merged arch/x86/kernel/Makefile +Auto-merged arch/x86/kernel/process_64.c +Auto-merged arch/x86/mm/fault.c +Auto-merged include/linux/sched.h +Auto-merged init/main.c +Auto-merged kernel/fork.c +Auto-merged kernel/panic.c +Auto-merged kernel/sched.c +Resolved 'arch/x86/include/asm/pda.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit f51466c: Merge commit 'stackprotector/auto-stackprotector-next' +$ git diff -M --stat --summary HEAD^.. + 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 up-to-date. +Merging pci/linux-next +$ git merge pci/linux-next +Merge made by recursive. + drivers/pci/hotplug/pciehp_ctrl.c | 26 ++++++++++++-------------- + drivers/pci/pci-sysfs.c | 2 +- + drivers/pci/pci.h | 4 ++++ + drivers/pci/proc.c | 11 ++++++++++- + 4 files changed, 27 insertions(+), 16 deletions(-) +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Already up-to-date. +Merging hid/mm +$ git merge hid/mm +Auto-merged drivers/hid/usbhid/hid-core.c +Merge made by recursive. + drivers/hid/usbhid/hid-core.c | 6 ++---- + 1 files changed, 2 insertions(+), 4 deletions(-) +Merging quilt/i2c +$ git merge quilt/i2c +Merge made by recursive. + drivers/i2c/busses/scx200_i2c.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Auto-merged drivers/hwmon/w83781d.c +Merge made by recursive. + Documentation/hwmon/it87 | 20 +- + Documentation/hwmon/ltc4245 | 81 +++ + drivers/hwmon/Kconfig | 14 +- + drivers/hwmon/Makefile | 1 + + drivers/hwmon/asb100.c | 5 +- + drivers/hwmon/f71882fg.c | 1130 ++++++++++++++++++++++++++++++++++++------- + drivers/hwmon/it87.c | 30 +- + 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 +- + 12 files changed, 1681 insertions(+), 187 deletions(-) + create mode 100644 Documentation/hwmon/ltc4245 + create mode 100644 drivers/hwmon/ltc4245.c +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Auto-merged Documentation/00-INDEX +Auto-merged include/linux/kernel.h +Merge made by recursive. + Documentation/00-INDEX | 2 -- + Documentation/early-userspace/00-INDEX | 8 ++++++++ + Documentation/{ => early-userspace}/initrd.txt | 6 +++--- + include/linux/kernel.h | 4 ++-- + 4 files changed, 13 insertions(+), 7 deletions(-) + create mode 100644 Documentation/early-userspace/00-INDEX + rename Documentation/{ => early-userspace}/initrd.txt (99%) +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 +Merge made by recursive. + drivers/ide/ide-cd.c | 127 ++++++++-------------------------------- + drivers/ide/ide-cd.h | 2 - + drivers/ide/ide-io.c | 144 +++++++++++++++++++--------------------------- + drivers/ide/ide-ioctls.c | 3 - + drivers/ide/ide-iops.c | 48 +++++++-------- + drivers/ide/ide-lib.c | 7 +-- + drivers/ide/ide-park.c | 16 +++--- + drivers/ide/ide-probe.c | 26 +++++---- + drivers/ide/ide-proc.c | 25 +------- + drivers/ide/ide.c | 15 +---- + drivers/ide/umc8672.c | 11 ++- + drivers/scsi/ide-scsi.c | 32 +++++++---- + include/linux/ide.h | 16 ++--- + 13 files changed, 174 insertions(+), 298 deletions(-) +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 +Auto-merged fs/xfs/linux-2.6/xfs_super.c +Removed fs/xfs/xfs_clnt.h +Auto-merged include/linux/fs.h +Merge made by recursive. + fs/inode.c | 208 ++- + fs/xfs/Makefile | 4 +- + fs/xfs/linux-2.6/xfs_aops.c | 2 +- + fs/xfs/linux-2.6/xfs_iops.c | 19 +- + 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_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_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.c | 5 + + fs/xfs/xfs_da_btree.h | 24 +- + fs/xfs/xfs_dinode.h | 5 +- + fs/xfs/xfs_dir2.c | 6 + + 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 | 487 +++---- + fs/xfs/xfs_imap.h | 2 - + fs/xfs/xfs_inode.c | 292 ++-- + 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 | 105 +- + fs/xfs/xfs_mount.c | 47 +- + 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 | 122 +-- + include/linux/fs.h | 2 + + 73 files changed, 8076 insertions(+), 10108 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 +Merge made by recursive. + kernel/power/disk.c | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Already up-to-date. +Merging ieee1394/for-next +$ git merge ieee1394/for-next +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 | 123 +++++++++++++++++++++++-------------- + drivers/firewire/fw-sbp2.c | 38 ++++++++--- + drivers/firewire/fw-topology.c | 6 +- + drivers/firewire/fw-transaction.h | 2 +- + 7 files changed, 130 insertions(+), 82 deletions(-) +Merging ubi/linux-next +$ git merge ubi/linux-next +Already up-to-date. +Merging kvm/master +$ git merge kvm/master +Renamed include/asm-x86/kvm_host.h => arch/x86/include/asm/kvm_host.h +Auto-merged arch/x86/include/asm/kvm_host.h +Renamed include/asm-x86/kvm_x86_emulate.h => arch/x86/include/asm/kvm_x86_emulate.h +Auto-merged arch/x86/include/asm/kvm_x86_emulate.h +Renamed include/asm-x86/mtrr.h => arch/x86/include/asm/mtrr.h +Auto-merged arch/x86/include/asm/mtrr.h +Auto-merged arch/ia64/kvm/kvm-ia64.c +Auto-merged arch/x86/kvm/i8254.c +Auto-merged arch/x86/kvm/lapic.c +Merge made by recursive. + arch/ia64/include/asm/kvm_host.h | 6 +- + arch/ia64/kvm/Makefile | 8 +- + arch/ia64/kvm/kvm-ia64.c | 80 ++++---- + arch/ia64/kvm/kvm_fw.c | 9 +- + arch/ia64/kvm/process.c | 2 +- + arch/x86/include/asm/kvm_host.h | 23 ++- + 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 | 30 +++- + arch/x86/kvm/i8254.h | 1 + + arch/x86/kvm/irq.h | 1 + + arch/x86/kvm/lapic.c | 58 +++++- + arch/x86/kvm/mmu.c | 122 ++++++++++++- + arch/x86/kvm/svm.c | 6 + + arch/x86/kvm/vmx.c | 315 ++++++++++++++++++++++---------- + arch/x86/kvm/vmx.h | 12 +- + arch/x86/kvm/x86.c | 135 ++++++++++++-- + arch/x86/kvm/x86_emulate.c | 10 +- + include/linux/kvm.h | 17 ++- + include/linux/kvm_host.h | 10 +- + virt/kvm/ioapic.c | 1 + + virt/kvm/irq_comm.c | 50 +++++- + virt/kvm/kvm_main.c | 14 +- + 26 files changed, 746 insertions(+), 233 deletions(-) +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Already up-to-date. +Merging tests/master +$ git merge tests/master +Auto-merged Makefile +Auto-merged drivers/misc/Makefile +Auto-merged kernel/Makefile +Auto-merged lib/Kconfig.debug +CONFLICT (content): Merge conflict in lib/Kconfig.debug +Auto-merged lib/Makefile +Resolved 'lib/Kconfig.debug' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit ffb3b59: Merge commit 'tests/master' +$ git diff -M --stat --summary HEAD^.. + Makefile | 1 + + drivers/misc/Makefile | 1 - + kernel/Makefile | 4 - + lib/Kconfig.debug | 93 +-------------------- + lib/Makefile | 1 - + tests/Kconfig | 101 +++++++++++++++++++++++ + tests/Makefile | 10 ++ + {kernel => tests}/backtracetest.c | 0 + {drivers/misc => tests}/lkdtm.c | 0 + {lib => tests}/locking-selftest-hardirq.h | 0 + {lib => tests}/locking-selftest-mutex.h | 0 + {lib => tests}/locking-selftest-rlock-hardirq.h | 0 + {lib => tests}/locking-selftest-rlock-softirq.h | 0 + {lib => tests}/locking-selftest-rlock.h | 0 + {lib => tests}/locking-selftest-rsem.h | 0 + {lib => tests}/locking-selftest-softirq.h | 0 + {lib => tests}/locking-selftest-spin-hardirq.h | 0 + {lib => tests}/locking-selftest-spin-softirq.h | 0 + {lib => tests}/locking-selftest-spin.h | 0 + {lib => tests}/locking-selftest-wlock-hardirq.h | 0 + {lib => tests}/locking-selftest-wlock-softirq.h | 0 + {lib => tests}/locking-selftest-wlock.h | 0 + {lib => tests}/locking-selftest-wsem.h | 0 + {lib => tests}/locking-selftest.c | 0 + {kernel => tests}/rcutorture.c | 0 + {kernel => tests}/rtmutex-tester.c | 2 +- + {kernel => tests}/test_kprobes.c | 0 + 27 files changed, 115 insertions(+), 98 deletions(-) + create mode 100644 tests/Kconfig + create mode 100644 tests/Makefile + rename {kernel => tests}/backtracetest.c (100%) + rename {drivers/misc => tests}/lkdtm.c (100%) + rename {lib => tests}/locking-selftest-hardirq.h (100%) + rename {lib => tests}/locking-selftest-mutex.h (100%) + rename {lib => tests}/locking-selftest-rlock-hardirq.h (100%) + rename {lib => tests}/locking-selftest-rlock-softirq.h (100%) + rename {lib => tests}/locking-selftest-rlock.h (100%) + rename {lib => tests}/locking-selftest-rsem.h (100%) + rename {lib => tests}/locking-selftest-softirq.h (100%) + rename {lib => tests}/locking-selftest-spin-hardirq.h (100%) + rename {lib => tests}/locking-selftest-spin-softirq.h (100%) + rename {lib => tests}/locking-selftest-spin.h (100%) + rename {lib => tests}/locking-selftest-wlock-hardirq.h (100%) + rename {lib => tests}/locking-selftest-wlock-softirq.h (100%) + rename {lib => tests}/locking-selftest-wlock.h (100%) + rename {lib => tests}/locking-selftest-wsem.h (100%) + rename {lib => tests}/locking-selftest.c (100%) + rename {kernel => tests}/rcutorture.c (100%) + rename {kernel => tests}/rtmutex-tester.c (99%) + rename {kernel => tests}/test_kprobes.c (100%) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Merge made by recursive. + fs/ocfs2/file.c | 20 +++--- + fs/ocfs2/inode.c | 6 ++ + fs/ocfs2/journal.c | 1 + + fs/ocfs2/mmap.c | 6 ++- + fs/ocfs2/namei.c | 8 ++- + fs/ocfs2/ocfs2.h | 3 + + fs/ocfs2/ocfs2_fs.h | 17 +++-- + fs/ocfs2/xattr.c | 189 +++++++++++++++++--------------------------------- + fs/ocfs2/xattr.h | 38 ++--------- + 9 files changed, 109 insertions(+), 179 deletions(-) +Merging ext4/next +$ git merge ext4/next +Already up-to-date. +Merging async_tx/next +$ git merge async_tx/next +Already up-to-date. +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging net/master +$ git merge net/master +Already up-to-date. +Merging mtd/master +$ git merge mtd/master +Merge made by recursive. + drivers/mtd/onenand/omap2.c | 1 - + fs/jffs2/nodemgmt.c | 2 ++ + 2 files changed, 2 insertions(+), 1 deletions(-) +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Merge made by recursive. + crypto/camellia.c | 84 +++++++++------------ + crypto/testmgr.c | 7 ++- + drivers/crypto/hifn_795x.c | 5 ++ + drivers/crypto/talitos.c | 171 ++++++++++++++++++++++++++++---------------- + drivers/crypto/talitos.h | 11 +++- + 5 files changed, 166 insertions(+), 112 deletions(-) +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging sound/for-next +$ git merge sound/for-next +Already uptodate! +Merge made by recursive. +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/client.c | 19 +++++++++---------- + net/9p/trans_rdma.c | 4 +++- + 2 files changed, 12 insertions(+), 11 deletions(-) +Merging quilt/rr +$ git merge quilt/rr +Renamed include/asm-x86/genapic_32.h => arch/x86/include/asm/genapic_32.h +Auto-merged arch/x86/include/asm/genapic_32.h +Renamed include/asm-x86/genapic_64.h => arch/x86/include/asm/genapic_64.h +Auto-merged arch/x86/include/asm/genapic_64.h +Renamed include/asm-x86/ipi.h => arch/x86/include/asm/ipi.h +Auto-merged arch/x86/include/asm/ipi.h +CONFLICT (rename/modify): Merge conflict in arch/x86/include/asm/ipi.h +Renamed include/asm-x86/mach-default/mach_apic.h => arch/x86/include/asm/mach-default/mach_apic.h +Auto-merged arch/x86/include/asm/mach-default/mach_apic.h +Renamed include/asm-x86/mach-default/mach_ipi.h => arch/x86/include/asm/mach-default/mach_ipi.h +Auto-merged arch/x86/include/asm/mach-default/mach_ipi.h +Auto-merged arch/ia64/kernel/acpi.c +Auto-merged arch/ia64/kernel/perfmon.c +Auto-merged arch/ia64/kernel/setup.c +Auto-merged arch/powerpc/kernel/machine_kexec_64.c +Auto-merged arch/powerpc/kernel/setup-common.c +Auto-merged arch/powerpc/mm/numa.c +Auto-merged arch/s390/Kconfig +Auto-merged arch/s390/kernel/smp.c +Auto-merged arch/sh/kernel/smp.c +Auto-merged arch/x86/Kconfig +CONFLICT (content): Merge conflict in arch/x86/Kconfig +Auto-merged arch/x86/kernel/genapic_flat_64.c +Auto-merged arch/x86/kernel/genx2apic_cluster.c +Auto-merged arch/x86/kernel/genx2apic_phys.c +Auto-merged arch/x86/kernel/genx2apic_uv_x.c +Auto-merged arch/x86/kernel/setup_percpu.c +Auto-merged arch/x86/kernel/smp.c +Auto-merged arch/x86/kernel/smpboot.c +Auto-merged arch/x86/xen/smp.c +Auto-merged drivers/pci/pci-sysfs.c +Auto-merged drivers/pci/probe.c +Auto-merged include/linux/workqueue.h +Auto-merged init/Kconfig +Auto-merged init/main.c +Auto-merged kernel/module.c +Auto-merged kernel/panic.c +Auto-merged kernel/params.c +CONFLICT (content): Merge conflict in kernel/params.c +Auto-merged kernel/sched.c +CONFLICT (content): Merge conflict in kernel/sched.c +Auto-merged kernel/sched_stats.h +Auto-merged kernel/smp.c +Auto-merged kernel/stop_machine.c +CONFLICT (content): Merge conflict in kernel/stop_machine.c +Auto-merged kernel/time/timer_list.c +Auto-merged kernel/trace/trace.c +Auto-merged kernel/workqueue.c +Auto-merged lib/Kconfig.debug +Auto-merged mm/slub.c +Auto-merged mm/vmstat.c +Recorded preimage for 'kernel/stop_machine.c' +Resolved 'arch/x86/Kconfig' using previous resolution. +Resolved 'arch/x86/include/asm/ipi.h' using previous resolution. +Resolved 'kernel/params.c' using previous resolution. +Resolved 'kernel/sched.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'kernel/stop_machine.c'. +Created commit aee9ccc: Merge branch 'quilt/rr' +$ git diff -M --stat --summary HEAD^.. + Documentation/lguest/lguest.c | 60 +-- + arch/alpha/include/asm/smp.h | 1 - + arch/alpha/kernel/irq.c | 3 +- + arch/alpha/kernel/process.c | 2 + + arch/alpha/kernel/smp.c | 15 +- + arch/arm/kernel/irq.c | 2 +- + arch/arm/kernel/smp.c | 10 - + arch/cris/arch-v32/kernel/smp.c | 4 - + arch/cris/kernel/setup.c | 2 +- + arch/frv/kernel/setup.c | 2 +- + arch/h8300/kernel/setup.c | 2 +- + arch/ia64/include/asm/smp.h | 1 - + arch/ia64/kernel/acpi.c | 2 +- + arch/ia64/kernel/iosapic.c | 4 +- + arch/ia64/kernel/irq.c | 2 +- + arch/ia64/kernel/mca.c | 6 +- + arch/ia64/kernel/perfmon.c | 4 +- + arch/ia64/kernel/salinfo.c | 6 +- + arch/ia64/kernel/setup.c | 4 +- + arch/ia64/kernel/smpboot.c | 6 - + arch/ia64/kernel/topology.c | 2 +- + arch/ia64/sn/kernel/setup.c | 2 +- + arch/ia64/sn/kernel/sn2/sn2_smp.c | 6 +- + arch/ia64/sn/kernel/sn2/sn_hwperf.c | 2 +- + arch/m32r/Kconfig | 1 + + arch/m32r/kernel/setup.c | 2 +- + arch/m32r/kernel/smpboot.c | 8 +- + arch/m68knommu/kernel/setup.c | 2 +- + arch/mips/include/asm/smp.h | 3 - + arch/mips/kernel/irq-gic.c | 2 +- + arch/mips/kernel/proc.c | 2 +- + arch/mips/kernel/smp-cmp.c | 8 +- + arch/mips/kernel/smp-mt.c | 2 +- + arch/mips/kernel/smp.c | 7 +- + arch/mips/kernel/smtc.c | 12 +- + arch/mips/pmc-sierra/yosemite/smp.c | 6 +- + arch/mips/sgi-ip27/ip27-smp.c | 2 +- + arch/mips/sibyte/bcm1480/irq.c | 2 +- + arch/mips/sibyte/bcm1480/smp.c | 10 +- + arch/mips/sibyte/sb1250/smp.c | 10 +- + arch/mn10300/kernel/irq.c | 4 +- + arch/mn10300/kernel/setup.c | 2 +- + arch/parisc/Kconfig | 1 + + arch/parisc/kernel/irq.c | 4 +- + arch/parisc/kernel/processor.c | 4 +- + arch/parisc/kernel/smp.c | 15 - + arch/powerpc/include/asm/cputhreads.h | 2 +- + arch/powerpc/kernel/irq.c | 2 +- + arch/powerpc/kernel/machine_kexec_64.c | 2 +- + arch/powerpc/kernel/process.c | 2 +- + arch/powerpc/kernel/setup-common.c | 10 +- + arch/powerpc/kernel/smp.c | 4 - + arch/powerpc/mm/numa.c | 4 +- + arch/powerpc/platforms/cell/spu_base.c | 5 +- + arch/powerpc/platforms/powermac/setup.c | 2 +- + arch/powerpc/platforms/powermac/smp.c | 4 +- + arch/powerpc/platforms/pseries/hotplug-cpu.c | 2 +- + arch/powerpc/platforms/pseries/rtasd.c | 2 +- + arch/powerpc/platforms/pseries/xics.c | 4 +- + arch/powerpc/xmon/xmon.c | 4 +- + arch/s390/Kconfig | 1 + + arch/s390/kernel/smp.c | 16 +- + arch/sh/kernel/setup.c | 2 +- + arch/sh/kernel/smp.c | 6 - + arch/sparc/include/asm/smp_32.h | 2 - + arch/sparc/kernel/smp.c | 17 +- + arch/sparc/kernel/sparc_ksyms.c | 4 - + arch/sparc/kernel/sun4d_smp.c | 9 +- + arch/sparc/kernel/sun4m_smp.c | 8 +- + arch/sparc/mm/srmmu.c | 2 +- + arch/sparc64/kernel/ds.c | 2 +- + arch/sparc64/kernel/irq.c | 4 +- + arch/sparc64/kernel/smp.c | 4 - + arch/sparc64/mm/init.c | 2 +- + arch/um/kernel/smp.c | 7 - + arch/um/kernel/um_arch.c | 2 +- + arch/x86/Kconfig | 11 +- + arch/x86/include/asm/bigsmp/apic.h | 14 +- + arch/x86/include/asm/bigsmp/ipi.h | 9 +- + arch/x86/include/asm/es7000/apic.h | 18 +- + arch/x86/include/asm/es7000/ipi.h | 9 +- + arch/x86/include/asm/genapic_32.h | 11 +- + arch/x86/include/asm/genapic_64.h | 11 +- + arch/x86/include/asm/ipi.h | 21 +- + arch/x86/include/asm/mach-default/mach_apic.h | 17 +- + arch/x86/include/asm/mach-default/mach_ipi.h | 18 +- + arch/x86/include/asm/numaq/apic.h | 4 +- + arch/x86/include/asm/numaq/ipi.h | 9 +- + arch/x86/include/asm/summit/apic.h | 12 +- + arch/x86/include/asm/summit/ipi.h | 9 +- + arch/x86/kernel/apic.c | 4 +- + arch/x86/kernel/cpu/intel_cacheinfo.c | 4 +- + arch/x86/kernel/crash.c | 5 +- + arch/x86/kernel/genapic_flat_64.c | 76 ++- + arch/x86/kernel/genx2apic_cluster.c | 60 +- + arch/x86/kernel/genx2apic_phys.c | 54 +- + arch/x86/kernel/genx2apic_uv_x.c | 43 +- + arch/x86/kernel/io_apic.c | 118 ++-- + arch/x86/kernel/ipi.c | 26 +- + arch/x86/kernel/irq_32.c | 2 +- + arch/x86/kernel/setup_percpu.c | 9 +- + arch/x86/kernel/smp.c | 4 +- + arch/x86/kernel/smpboot.c | 6 - + arch/x86/kernel/tlb_32.c | 2 +- + arch/x86/kernel/tlb_64.c | 2 +- + arch/x86/lguest/boot.c | 32 +- + arch/x86/lguest/i386_head.S | 15 - + arch/x86/mach-generic/bigsmp.c | 5 +- + arch/x86/mach-generic/es7000.c | 5 +- + arch/x86/mach-generic/numaq.c | 5 +- + arch/x86/mach-generic/summit.c | 5 +- + arch/x86/mach-voyager/voyager_smp.c | 11 +- + arch/x86/mm/numa_64.c | 4 +- + arch/x86/mm/srat_64.c | 2 +- + arch/x86/xen/smp.c | 13 +- + drivers/base/cpu.c | 2 +- + drivers/base/node.c | 4 +- + drivers/base/topology.c | 4 +- + drivers/infiniband/hw/ehca/ehca_irq.c | 2 +- + drivers/lguest/lg.h | 2 +- + drivers/lguest/lguest_user.c | 13 +- + drivers/lguest/page_tables.c | 72 ++- + drivers/net/virtio_net.c | 189 ++++- + drivers/pci/pci-sysfs.c | 4 +- + drivers/pci/probe.c | 4 +- + drivers/pnp/pnpbios/bioscalls.c | 2 +- + include/asm-cris/smp.h | 1 - + include/asm-m32r/smp.h | 2 - + include/linux/cpumask.h | 794 +++++++++++--------- + include/linux/lguest_launcher.h | 2 +- + include/linux/seq_file.h | 2 +- + include/linux/smp.h | 9 + + include/linux/stop_machine.h | 6 + + include/linux/threads.h | 16 +- + include/linux/virtio_net.h | 9 + + include/linux/workqueue.h | 8 + + init/Kconfig | 15 +- + init/main.c | 16 +- + kernel/Kconfig.preempt | 10 + + kernel/cpu.c | 93 ++- + kernel/cpuset.c | 4 +- + kernel/irq/proc.c | 4 +- + kernel/kexec.c | 2 +- + kernel/kmod.c | 2 +- + kernel/kthread.c | 4 +- + kernel/profile.c | 4 +- + kernel/sched.c | 192 +++--- + kernel/sched_stats.h | 2 +- + kernel/smp.c | 2 +- + kernel/stop_machine.c | 4 +- + kernel/taskstats.c | 2 +- + kernel/time/timer_list.c | 4 +- + kernel/trace/trace.c | 4 +- + kernel/workqueue.c | 51 ++- + lib/Kconfig.debug | 6 + + lib/cpumask.c | 68 ++- + mm/allocpercpu.c | 4 +- + mm/slub.c | 2 +- + mm/vmstat.c | 2 +- + net/core/neighbour.c | 4 +- + .../netfilter/nf_conntrack_l3proto_ipv4_compat.c | 4 +- + net/ipv4/route.c | 4 +- + net/netfilter/nf_conntrack_standalone.c | 4 +- + security/selinux/selinuxfs.c | 2 +- + 164 files changed, 1554 insertions(+), 1189 deletions(-) +$ git am -3 ../patches/0001-x86-cpumask-change-fallout.patch +Applying x86: cpumask change fallout +$ git reset HEAD^ +arch/x86/kernel/smp.c: needs update +arch/x86/xen/smp.c: needs update +$ git add . +$ git commit -v -a --amend +Created commit 75f6acd: Merge branch 'quilt/rr' +Merging cifs/master +$ git merge cifs/master +Already up-to-date. +Merging mmc/next +$ git merge mmc/next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Removed fs/gfs2/ops_dentry.h +Auto-merged fs/gfs2/ops_export.c +Removed fs/gfs2/ops_fstype.h +Auto-merged fs/gfs2/ops_inode.c +Removed fs/gfs2/ops_inode.h +Removed fs/gfs2/ops_super.h +Auto-merged include/linux/fs.h +Merge made by recursive. + fs/gfs2/inode.c | 1 - + fs/gfs2/inode.h | 11 +++++++++++ + fs/gfs2/main.c | 2 +- + fs/gfs2/ops_address.c | 16 +++++++--------- + fs/gfs2/ops_dentry.c | 2 +- + fs/gfs2/ops_dentry.h | 17 ----------------- + fs/gfs2/ops_export.c | 3 +-- + fs/gfs2/ops_file.c | 1 - + fs/gfs2/ops_fstype.c | 3 --- + fs/gfs2/ops_fstype.h | 19 ------------------- + fs/gfs2/ops_inode.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- + fs/gfs2/ops_inode.h | 25 ------------------------- + fs/gfs2/ops_super.c | 8 ++++---- + fs/gfs2/ops_super.h | 17 ----------------- + fs/gfs2/super.h | 8 ++++++++ + fs/ioctl.c | 44 ++++++++++++++++++++++++++++++++++---------- + include/linux/fs.h | 3 +++ + 17 files changed, 117 insertions(+), 112 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 +Already up-to-date. +Merging semaphore/semaphore +$ git merge semaphore/semaphore +Already up-to-date. +Merging semaphore-removal/semaphore-removal +$ git merge semaphore-removal/semaphore-removal +Auto-merged arch/arm/mach-lh7a40x/clocks.c +Auto-merged drivers/net/bonding/bond_main.c +Auto-merged drivers/net/bonding/bond_sysfs.c +Auto-merged drivers/net/ps3_gelic_wireless.c +Auto-merged drivers/scsi/qla2xxx/qla_def.h +Auto-merged include/net/bluetooth/hci_core.h +Auto-merged net/9p/trans_virtio.c +CONFLICT (content): Merge conflict in net/9p/trans_virtio.c +Auto-merged net/bluetooth/hci_core.c +Auto-merged sound/soc/s3c24xx/s3c2443-ac97.c +Resolved 'net/9p/trans_virtio.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit af8a66b: Merge commit 'semaphore-removal/semaphore-removal' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-lh7a40x/clocks.c | 15 ++++++++------- + drivers/net/bonding/bond_main.c | 21 +++++++++++---------- + drivers/net/bonding/bond_sysfs.c | 15 ++++++++------- + drivers/net/ppp_async.c | 8 ++++---- + drivers/net/ps3_gelic_net.c | 1 + + drivers/net/ps3_gelic_wireless.c | 1 + + drivers/pci/hotplug/ibmphp_hpc.c | 30 ++++++++++++++---------------- + include/net/bluetooth/hci_core.h | 7 ++++--- + net/9p/trans_virtio.c | 21 +++++++++++---------- + net/bluetooth/hci_core.c | 2 +- + sound/soc/s3c24xx/s3c2443-ac97.c | 11 ++++++----- + 11 files changed, 69 insertions(+), 63 deletions(-) +Merging bkl-removal/bkl-removal +$ git merge bkl-removal/bkl-removal +Already up-to-date. +Merging trivial/next +$ git merge trivial/next +Auto-merged Documentation/edac.txt +CONFLICT (content): Merge conflict in Documentation/edac.txt +Auto-merged arch/mips/kernel/vpe.c +Auto-merged drivers/base/sys.c +Auto-merged drivers/media/dvb/ttpci/av7110.c +Auto-merged drivers/message/i2o/i2o_block.c +Auto-merged drivers/net/spider_net.c +Auto-merged drivers/serial/mpc52xx_uart.c +Auto-merged drivers/usb/serial/ftdi_sio.c +Auto-merged fs/jffs2/fs.c +Auto-merged fs/ntfs/aops.c +Auto-merged fs/proc/nommu.c +Auto-merged include/linux/securebits.h +CONFLICT (content): Merge conflict in include/linux/securebits.h +Auto-merged mm/migrate.c +Auto-merged mm/slub.c +Auto-merged net/wireless/wext.c +Resolved 'Documentation/edac.txt' using previous resolution. +Resolved 'include/linux/securebits.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 0787257: Merge commit 'trivial/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/hfs.txt | 2 +- + Documentation/ja_JP/SubmittingPatches | 4 ++-- + Documentation/zh_CN/SubmittingPatches | 4 ++-- + arch/mips/kernel/vpe.c | 2 +- + arch/sh/lib64/c-checksum.c | 4 ++-- + drivers/base/sys.c | 2 +- + drivers/char/serial167.c | 2 +- + drivers/media/dvb/ttpci/av7110.c | 2 +- + drivers/message/i2o/i2o_block.c | 2 +- + drivers/misc/ibmasm/event.c | 2 +- + drivers/net/spider_net.c | 2 +- + drivers/serial/mpc52xx_uart.c | 4 ++-- + drivers/usb/serial/ftdi_sio.c | 2 +- + fs/jffs2/fs.c | 2 +- + fs/ntfs/aops.c | 2 +- + fs/proc/nommu.c | 2 +- + mm/migrate.c | 2 +- + mm/slub.c | 4 ++-- + net/wireless/wext.c | 2 +- + 19 files changed, 24 insertions(+), 24 deletions(-) +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Already up-to-date. +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Merge made by recursive. + block/blk-merge.c | 21 --------------------- + block/cfq-iosched.c | 8 ++------ + 2 files changed, 2 insertions(+), 27 deletions(-) +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Auto-merged drivers/media/dvb/ttpci/Kconfig +Auto-merged drivers/media/dvb/ttpci/av7110.c +Removed drivers/media/dvb/ttpci/fdump.c +Removed drivers/net/acenic_firmware.h +Auto-merged drivers/net/e100.c +Removed drivers/net/starfire_firmware.h +Removed drivers/net/starfire_firmware.pl +Auto-merged drivers/net/tg3.c +Auto-merged drivers/net/tg3.h +Removed drivers/scsi/ql1040_fw.h +Removed drivers/scsi/ql12160_fw.h +Removed drivers/scsi/ql1280_fw.h +Auto-merged drivers/scsi/qla1280.c +Auto-merged drivers/scsi/qlogicpti.c +CONFLICT (content): Merge conflict in drivers/scsi/qlogicpti.c +Removed drivers/scsi/qlogicpti_asm.c +Auto-merged firmware/Makefile +Auto-merged firmware/WHENCE +CONFLICT (content): Merge conflict in firmware/WHENCE +Auto-merged sound/isa/Kconfig +Auto-merged sound/isa/wavefront/wavefront_fx.c +Removed sound/isa/wavefront/yss225.c +Resolved 'drivers/scsi/qlogicpti.c' using previous resolution. +Resolved 'firmware/WHENCE' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 5e31fb0: Merge commit 'firmware/master' +$ git diff -M --stat --summary HEAD^.. + drivers/media/dvb/ttpci/Kconfig | 23 +- + drivers/media/dvb/ttpci/Makefile | 9 - + drivers/media/dvb/ttpci/av7110.c | 16 - + drivers/media/dvb/ttpci/av7110_hw.c | 35 +- + drivers/media/dvb/ttpci/av7110_hw.h | 3 +- + drivers/media/dvb/ttpci/fdump.c | 44 - + drivers/net/acenic.c | 117 +- + drivers/net/acenic.h | 4 + + drivers/net/acenic_firmware.h | 9456 ----------------------------- + drivers/net/e100.c | 283 +- + drivers/net/starfire.c | 51 +- + drivers/net/starfire_firmware.h | 346 -- + drivers/net/starfire_firmware.pl | 31 - + drivers/net/tg3.c | 789 +--- + drivers/net/tg3.h | 4 + + drivers/scsi/advansys.c | 1731 +----- + drivers/scsi/ql1040_fw.h | 2130 ------- + drivers/scsi/ql12160_fw.h | 1811 ------ + drivers/scsi/ql1280_fw.h | 2048 ------- + drivers/scsi/qla1280.c | 114 +- + drivers/scsi/qla1280.h | 6 + + drivers/scsi/qlogicpti.c | 63 +- + drivers/scsi/qlogicpti_asm.c | 1160 ---- + firmware/Makefile | 20 + + firmware/WHENCE | 121 + + firmware/acenic/tg1.bin.ihex | 4573 ++++++++++++++ + firmware/acenic/tg2.bin.ihex | 4844 +++++++++++++++ + firmware/adaptec/starfire_rx.bin.ihex | 53 + + firmware/adaptec/starfire_tx.bin.ihex | 53 + + firmware/advansys/3550.bin.ihex | 317 + + firmware/advansys/38C0800.bin.ihex | 336 + + firmware/advansys/38C1600.bin.ihex | 398 ++ + firmware/advansys/mcode.bin.ihex | 147 + + firmware/av7110/Boot.S | 109 + + firmware/av7110/bootcode.bin.ihex | 15 + + firmware/e100/d101m_ucode.bin.ihex | 38 + + firmware/e100/d101s_ucode.bin.ihex | 38 + + firmware/e100/d102e_ucode.bin.ihex | 38 + + firmware/qlogic/1040.bin.ihex | 2111 +++++++ + firmware/qlogic/12160.bin.ihex | 1771 ++++++ + firmware/qlogic/1280.bin.ihex | 2008 ++++++ + firmware/qlogic/isp1000.bin.ihex | 1158 ++++ + firmware/tigon/tg3.bin.ihex | 175 + + firmware/tigon/tg3_tso.bin.ihex | 446 ++ + firmware/tigon/tg3_tso5.bin.ihex | 252 + + firmware/yamaha/yss225_registers.bin.ihex | 998 +++ + sound/isa/Kconfig | 10 - + sound/isa/wavefront/wavefront_fx.c | 16 - + sound/isa/wavefront/yss225.c | 2739 --------- + 49 files changed, 20560 insertions(+), 22498 deletions(-) + delete mode 100644 drivers/media/dvb/ttpci/fdump.c + delete mode 100644 drivers/net/acenic_firmware.h + delete mode 100644 drivers/net/starfire_firmware.h + delete mode 100644 drivers/net/starfire_firmware.pl + delete mode 100644 drivers/scsi/ql1040_fw.h + delete mode 100644 drivers/scsi/ql12160_fw.h + delete mode 100644 drivers/scsi/ql1280_fw.h + delete mode 100644 drivers/scsi/qlogicpti_asm.c + create mode 100644 firmware/acenic/tg1.bin.ihex + create mode 100644 firmware/acenic/tg2.bin.ihex + create mode 100644 firmware/adaptec/starfire_rx.bin.ihex + create mode 100644 firmware/adaptec/starfire_tx.bin.ihex + create mode 100644 firmware/advansys/3550.bin.ihex + create mode 100644 firmware/advansys/38C0800.bin.ihex + create mode 100644 firmware/advansys/38C1600.bin.ihex + create mode 100644 firmware/advansys/mcode.bin.ihex + create mode 100644 firmware/av7110/Boot.S + create mode 100644 firmware/av7110/bootcode.bin.ihex + create mode 100644 firmware/e100/d101m_ucode.bin.ihex + create mode 100644 firmware/e100/d101s_ucode.bin.ihex + create mode 100644 firmware/e100/d102e_ucode.bin.ihex + create mode 100644 firmware/qlogic/1040.bin.ihex + create mode 100644 firmware/qlogic/12160.bin.ihex + create mode 100644 firmware/qlogic/1280.bin.ihex + create mode 100644 firmware/qlogic/isp1000.bin.ihex + create mode 100644 firmware/tigon/tg3.bin.ihex + create mode 100644 firmware/tigon/tg3_tso.bin.ihex + create mode 100644 firmware/tigon/tg3_tso5.bin.ihex + create mode 100644 firmware/yamaha/yss225_registers.bin.ihex + delete mode 100644 sound/isa/wavefront/yss225.c +Merging pcmcia/master +$ git merge pcmcia/master +Merge made by recursive. + drivers/bluetooth/bluecard_cs.c | 2 +- + drivers/bluetooth/bt3c_cs.c | 6 ++++-- + drivers/bluetooth/btuart_cs.c | 6 ++++-- + drivers/bluetooth/dtl1_cs.c | 7 +++++-- + drivers/char/pcmcia/synclink_cs.c | 2 +- + drivers/parport/parport_cs.c | 2 +- + drivers/pcmcia/pcmcia_resource.c | 3 ++- + drivers/scsi/fdomain.c | 2 ++ + 8 files changed, 20 insertions(+), 10 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 include/linux/slab.h +Auto-merged init/main.c +Auto-merged lib/Kconfig.debug +Auto-merged mm/Makefile +CONFLICT (content): Merge conflict in mm/Makefile +Auto-merged mm/slab.c +Auto-merged mm/slob.c +Auto-merged mm/slub.c +Resolved 'mm/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit de3feec: Merge commit 'slab/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/debugfs-kmemtrace | 71 ++++++ + Documentation/kernel-parameters.txt | 10 + + Documentation/vm/kmemtrace.txt | 126 ++++++++++ + MAINTAINERS | 6 + + include/linux/kmemtrace.h | 86 +++++++ + include/linux/slab.h | 8 +- + include/linux/slab_def.h | 68 +++++- + include/linux/slob_def.h | 9 +- + include/linux/slub_def.h | 53 ++++- + init/main.c | 2 + + kernel/relay.c | 7 +- + lib/Kconfig.debug | 20 ++ + mm/Makefile | 1 + + mm/kmemtrace.c | 333 +++++++++++++++++++++++++++ + mm/slab.c | 79 ++++++- + mm/slob.c | 37 +++- + mm/slub.c | 141 +++++++++--- + 17 files changed, 980 insertions(+), 77 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 +Renamed include/asm-x86/dma-mapping.h => arch/x86/include/asm/dma-mapping.h +Auto-merged arch/x86/include/asm/dma-mapping.h +Renamed include/asm-x86/pgtable.h => arch/x86/include/asm/pgtable.h +Auto-merged arch/x86/include/asm/pgtable.h +Renamed include/asm-x86/pgtable_32.h => arch/x86/include/asm/pgtable_32.h +Auto-merged arch/x86/include/asm/pgtable_32.h +Renamed include/asm-x86/pgtable_64.h => arch/x86/include/asm/pgtable_64.h +Auto-merged arch/x86/include/asm/pgtable_64.h +Renamed include/asm-x86/string_32.h => arch/x86/include/asm/string_32.h +Auto-merged arch/x86/include/asm/string_32.h +Renamed include/asm-x86/string_64.h => arch/x86/include/asm/string_64.h +Auto-merged arch/x86/include/asm/string_64.h +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/traps.c +Auto-merged arch/x86/mm/fault.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/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 '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 9f8ecf5: Merge commit 'kmemcheck/auto-kmemcheck-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/kmemcheck.txt | 135 +++++++ + MAINTAINERS | 8 + + arch/x86/Kconfig.debug | 87 +++++ + 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/cpu/common.c | 4 + + 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 | 3 + + 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 | 25 +- + mm/Makefile | 1 + + mm/kmemcheck.c | 103 +++++ + mm/slab.c | 101 +---- + mm/slub.c | 20 +- + 45 files changed, 1993 insertions(+), 111 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/wm8350-regmap.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Removed Documentation/DocBook/wanbook.tmpl +Removed drivers/net/wan/syncppp.c +Removed include/net/syncppp.h +Merge made by recursive. + 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 | 1479 ----------------------------- + include/linux/hdlc.h | 2 +- + include/net/syncppp.h | 102 -- + 17 files changed, 1372 insertions(+), 2060 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-linus +$ git merge voltage/for-linus +Auto-merged drivers/Kconfig +Merge made by recursive. + drivers/Kconfig | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) +Merging security-testing/next +$ git merge security-testing/next +Already up-to-date. +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging quilt/ttydev +$ git merge quilt/ttydev +Already up-to-date. +Merging agp/agp-next +$ git merge agp/agp-next +Already up-to-date. +Merging creds/creds-v4 +$ git merge creds/creds-v4 +Auto-merged arch/ia64/kernel/perfmon.c +Auto-merged arch/mips/kernel/vpe.c +Auto-merged arch/x86/mm/fault.c +Auto-merged fs/binfmt_elf.c +Auto-merged fs/compat.c +Auto-merged fs/gfs2/inode.c +Auto-merged fs/ocfs2/namei.c +Auto-merged fs/xfs/xfs_inode.h +Auto-merged include/linux/fs.h +Removed include/linux/key-ui.h +Auto-merged include/linux/sched.h +Auto-merged init/main.c +Auto-merged kernel/Makefile +Auto-merged kernel/cgroup.c +Auto-merged kernel/exit.c +Auto-merged kernel/fork.c +Auto-merged kernel/futex.c +Auto-merged kernel/kmod.c +Auto-merged kernel/sched.c +Auto-merged kernel/sysctl.c +Auto-merged kernel/trace/trace.c +Auto-merged kernel/workqueue.c +Auto-merged lib/Makefile +Auto-merged mm/migrate.c +Auto-merged net/9p/client.c +Auto-merged security/selinux/selinuxfs.c +Merge made by recursive. + Documentation/credentials.txt | 582 +++++++++++++ + arch/alpha/kernel/asm-offsets.c | 11 +- + arch/alpha/kernel/entry.S | 10 +- + arch/ia64/ia32/sys_ia32.c | 7 +- + arch/ia64/kernel/mca_drv.c | 2 +- + arch/ia64/kernel/perfmon.c | 43 +- + arch/ia64/kernel/signal.c | 4 +- + arch/mips/kernel/kspd.c | 4 +- + arch/mips/kernel/mips-mt-fpaff.c | 5 +- + arch/mips/kernel/vpe.c | 4 +- + arch/parisc/kernel/signal.c | 2 +- + arch/powerpc/mm/fault.c | 2 +- + arch/powerpc/platforms/cell/spufs/inode.c | 8 +- + arch/s390/hypfs/inode.c | 4 +- + arch/s390/kernel/compat_linux.c | 28 +- + arch/um/drivers/mconsole_kern.c | 3 +- + arch/x86/ia32/ia32_aout.c | 2 +- + arch/x86/mm/fault.c | 2 +- + drivers/block/loop.c | 6 +- + drivers/char/tty_audit.c | 6 +- + drivers/connector/cn_proc.c | 16 +- + drivers/isdn/capi/capifs.c | 4 +- + drivers/isdn/hysdn/hysdn_procconf.c | 6 +- + drivers/net/tun.c | 8 +- + drivers/usb/core/devio.c | 10 +- + drivers/usb/core/inode.c | 4 +- + fs/9p/fid.c | 2 +- + fs/9p/vfs_inode.c | 4 +- + fs/9p/vfs_super.c | 4 +- + fs/affs/inode.c | 4 +- + fs/affs/super.c | 4 +- + fs/anon_inodes.c | 4 +- + fs/attr.c | 4 +- + fs/autofs/inode.c | 4 +- + fs/autofs4/dev-ioctl.c | 3 +- + fs/autofs4/inode.c | 4 +- + fs/autofs4/waitq.c | 4 +- + fs/bfs/dir.c | 4 +- + fs/binfmt_aout.c | 2 +- + fs/binfmt_elf.c | 20 +- + fs/binfmt_elf_fdpic.c | 19 +- + fs/binfmt_flat.c | 2 +- + fs/binfmt_som.c | 2 +- + fs/cifs/cifs_fs_sb.h | 2 +- + fs/cifs/cifsproto.h | 2 +- + fs/cifs/connect.c | 4 +- + fs/cifs/dir.c | 12 +- + fs/cifs/inode.c | 8 +- + fs/cifs/ioctl.c | 2 +- + fs/cifs/misc.c | 4 +- + fs/coda/cache.c | 6 +- + fs/coda/file.c | 2 +- + fs/coda/upcall.c | 2 +- + fs/compat.c | 42 +- + fs/devpts/inode.c | 4 +- + fs/dquot.c | 4 +- + fs/ecryptfs/ecryptfs_kernel.h | 3 +- + fs/ecryptfs/kthread.c | 9 +- + fs/ecryptfs/main.c | 3 +- + fs/ecryptfs/messaging.c | 18 +- + fs/ecryptfs/miscdev.c | 20 +- + fs/exec.c | 183 +++-- + fs/exportfs/expfs.c | 4 +- + fs/ext2/balloc.c | 2 +- + fs/ext2/ialloc.c | 4 +- + fs/ext3/balloc.c | 2 +- + fs/ext3/ialloc.c | 4 +- + fs/ext4/balloc.c | 5 +- + fs/ext4/ialloc.c | 4 +- + fs/fat/file.c | 2 +- + fs/fat/inode.c | 4 +- + fs/fcntl.c | 18 +- + fs/file_table.c | 10 +- + fs/fuse/dev.c | 4 +- + fs/fuse/dir.c | 25 +- + fs/gfs2/inode.c | 10 +- + fs/hfs/inode.c | 4 +- + fs/hfs/super.c | 4 +- + fs/hfsplus/inode.c | 4 +- + fs/hfsplus/options.c | 4 +- + fs/hpfs/namei.c | 24 +- + fs/hpfs/super.c | 4 +- + fs/hppfs/hppfs.c | 6 +- + fs/hugetlbfs/inode.c | 21 +- + fs/inotify_user.c | 2 +- + fs/internal.h | 6 + + fs/ioprio.c | 18 +- + fs/jfs/jfs_inode.c | 4 +- + fs/locks.c | 2 +- + fs/minix/bitmap.c | 4 +- + fs/namei.c | 10 +- + fs/namespace.c | 2 +- + fs/ncpfs/ioctl.c | 91 +-- + fs/nfsctl.c | 3 +- + fs/nfsd/auth.c | 95 ++- + fs/nfsd/nfs4recover.c | 71 +- + fs/nfsd/nfsfh.c | 11 +- + fs/nfsd/vfs.c | 9 +- + fs/ocfs2/dlm/dlmfs.c | 8 +- + fs/ocfs2/namei.c | 4 +- + fs/omfs/inode.c | 8 +- + fs/open.c | 59 +- + fs/pipe.c | 4 +- + fs/posix_acl.c | 4 +- + fs/proc/array.c | 32 +- + fs/proc/base.c | 32 +- + fs/quota.c | 4 +- + fs/ramfs/inode.c | 4 +- + fs/reiserfs/namei.c | 4 +- + fs/smbfs/dir.c | 3 +- + fs/smbfs/inode.c | 2 +- + fs/smbfs/proc.c | 2 +- + fs/sysv/ialloc.c | 4 +- + fs/ubifs/budget.c | 2 +- + fs/ubifs/dir.c | 4 +- + fs/udf/ialloc.c | 4 +- + fs/udf/namei.c | 2 +- + fs/ufs/ialloc.c | 4 +- + fs/xfs/linux-2.6/xfs_cred.h | 6 +- + fs/xfs/linux-2.6/xfs_globals.h | 2 +- + fs/xfs/linux-2.6/xfs_ioctl.c | 5 +- + fs/xfs/xfs_acl.c | 6 +- + fs/xfs/xfs_inode.h | 2 +- + fs/xfs/xfs_vnodeops.h | 10 +- + include/keys/keyring-type.h | 31 + + include/linux/binfmts.h | 16 +- + include/linux/capability.h | 2 - + include/linux/cred.h | 340 +++++++- + include/linux/fs.h | 8 +- + include/linux/init_task.h | 13 +- + include/linux/key-ui.h | 66 -- + include/linux/key.h | 32 +- + include/linux/keyctl.h | 4 +- + include/linux/sched.h | 64 +-- + include/linux/securebits.h | 2 +- + include/linux/security.h | 326 ++++---- + include/net/scm.h | 4 +- + init/main.c | 1 + + ipc/mqueue.c | 19 +- + ipc/shm.c | 9 +- + ipc/util.c | 18 +- + kernel/Makefile | 2 +- + kernel/acct.c | 7 +- + kernel/auditsc.c | 57 +- + kernel/capability.c | 268 +------ + kernel/cgroup.c | 17 +- + kernel/cred-internals.h | 21 + + kernel/cred.c | 577 +++++++++++++ + kernel/exit.c | 23 +- + kernel/fork.c | 44 +- + kernel/futex.c | 20 +- + kernel/futex_compat.c | 7 +- + kernel/kmod.c | 30 +- + kernel/ptrace.c | 29 +- + kernel/sched.c | 26 +- + kernel/signal.c | 60 +- + kernel/sys.c | 579 ++++++++------ + kernel/sysctl.c | 2 +- + kernel/timer.c | 8 +- + kernel/trace/trace.c | 2 +- + kernel/tsacct.c | 6 +- + kernel/uid16.c | 31 +- + kernel/user.c | 37 +- + kernel/user_namespace.c | 14 +- + kernel/workqueue.c | 8 +- + lib/Makefile | 2 +- + lib/is_single_threaded.c | 45 + + mm/mempolicy.c | 9 +- + mm/migrate.c | 9 +- + mm/oom_kill.c | 6 +- + mm/shmem.c | 8 +- + net/9p/client.c | 2 +- + net/ax25/af_ax25.c | 2 +- + net/ax25/ax25_route.c | 2 +- + net/core/dev.c | 8 +- + net/core/scm.c | 10 +- + net/ipv4/netfilter/ipt_LOG.c | 4 +- + net/ipv6/ip6_flowlabel.c | 2 +- + net/ipv6/netfilter/ip6t_LOG.c | 4 +- + net/netfilter/nfnetlink_log.c | 5 +- + net/netfilter/xt_owner.c | 16 +- + net/netrom/af_netrom.c | 4 +- + net/rose/af_rose.c | 4 +- + net/rxrpc/ar-key.c | 6 +- + net/sched/cls_flow.c | 4 +- + net/socket.c | 4 +- + net/sunrpc/auth.c | 14 +- + net/unix/af_unix.c | 11 +- + security/capability.c | 56 +- + security/commoncap.c | 699 ++++++++++------ + security/keys/internal.h | 47 +- + security/keys/key.c | 25 +- + security/keys/keyctl.c | 210 +++-- + security/keys/keyring.c | 15 +- + security/keys/permission.c | 29 +- + security/keys/proc.c | 8 +- + security/keys/process_keys.c | 469 +++++------ + security/keys/request_key.c | 133 ++-- + security/keys/request_key_auth.c | 46 +- + security/root_plug.c | 13 +- + security/security.c | 96 +-- + security/selinux/exports.c | 8 +- + security/selinux/hooks.c | 1151 ++++++++++++++------------ + security/selinux/include/av_perm_to_string.h | 2 + + security/selinux/include/av_permissions.h | 2 + + security/selinux/include/class_to_string.h | 5 + + security/selinux/include/flask.h | 1 + + security/selinux/include/objsec.h | 11 - + security/selinux/selinuxfs.c | 13 +- + security/selinux/xfrm.c | 6 +- + security/smack/smack_access.c | 4 +- + security/smack/smack_lsm.c | 173 +++-- + security/smack/smackfs.c | 6 +- + 213 files changed, 5062 insertions(+), 3098 deletions(-) + create mode 100644 Documentation/credentials.txt + create mode 100644 include/keys/keyring-type.h + delete mode 100644 include/linux/key-ui.h + create mode 100644 kernel/cred-internals.h + create mode 100644 kernel/cred.c + create mode 100644 lib/is_single_threaded.c +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 +Already uptodate! +Merge made by recursive. +Merging watchdog/master +$ git merge watchdog/master +Merge made by recursive. + drivers/watchdog/Kconfig | 12 + + drivers/watchdog/Makefile | 1 + + drivers/watchdog/i6300esb.c | 3 +- + drivers/watchdog/ib700wdt.c | 49 ++-- + drivers/watchdog/sch311x_wdt.c | 578 ++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 611 insertions(+), 32 deletions(-) + create mode 100644 drivers/watchdog/sch311x_wdt.c +Merging proc/proc +$ git merge proc/proc +Merge made by recursive. + fs/proc/generic.c | 8 ++------ + fs/proc/inode.c | 3 --- + fs/proc/proc_net.c | 2 +- + fs/proc/root.c | 8 +------- + 4 files changed, 4 insertions(+), 17 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 scsi-post-merge/master +$ git merge scsi-post-merge/master +Already up-to-date. +$ git am -3 ../patches/0001-sparc-qlogicpti-fallout-from-sbus-removal.patch +Applying sparc: qlogicpti fallout from sbus removal +$ git am -3 ../patches/Work_around_ld_bug_in_older_binutils +Applying Work around ld bug in older binutils +$ git am -3 ../patches/ftrace__rename_FTRACE_to_FUNCTION_TRACER_more_successfully. +Applying ftrace: rename FTRACE to FUNCTION_TRACER more successfully. +$ git am -3 ../patches/nfsctl__credentials_error +Applying nfsctl: credentials error +$ git am -3 ../patches/coda__credentials_error +Applying coda: credentials error diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..650a74ae2826 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,143 @@ +Importing driver-core.current based on 2.6.28-rc1 +$ git checkout quilt/driver-core.current +Switched to branch "quilt/driver-core.current" +$ git reset --hard 57f8f7b60db6f1ed2c6918ab9230c4623a9dbe37 +HEAD is now at 57f8f7b Linux 2.6.28-rc1 +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core.current +document-kernel-taint-flags-properly.patch +driver-core-drivers-base-sys.c-update-comments.patch +sysfs-fix-return-values-for-sysdev_store_-ulong-int.patch +Importing usb.current based on quilt/driver-core.current + quilt series is empty +$ git update-ref refs/heads/quilt/usb.current 5214edd9f6dc7bc282276585f73b3f6019600e33 +Importing m68k based on 332edc2f7fa58b818dfed1cede60272eecc27c0a +$ git checkout quilt/m68k +Switched to branch "quilt/m68k" +$ git reset --hard 332edc2f7fa58b818dfed1cede60272eecc27c0a +HEAD is now at 332edc2 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 +$ git quiltimport --author Geert Uytterhoeven <geert@linux-m68k.org> --patches ../quilt/m68k +amiga-amiserial-no-serial-console-if-modular.diff +Importing driver-core based on quilt/usb.current + quilt series is empty +$ git update-ref refs/heads/quilt/driver-core 5214edd9f6dc7bc282276585f73b3f6019600e33 +Importing usb based on quilt/driver-core +$ git checkout quilt/usb +Switched to branch "quilt/usb" +$ git reset --hard 5214edd9f6dc7bc282276585f73b3f6019600e33 +HEAD is now at 5214edd sysfs: Fix return values for sysdev_store_{ulong,int} +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb +hso-fix-hso_serial_close-refcounting.patch +hso-put-linefeeds-on-printk-s-in-hso.c.patch +usb-remove-warn-macro-from-usb.h.patch +usb-remove-info-macro-from-usb.h.patch +Importing device-mapper based on v2.6.27-7464-g332edc2 + quilt series is empty +$ git update-ref refs/heads/quilt/device-mapper 332edc2f7fa58b818dfed1cede60272eecc27c0a +Importing i2c based on 2.6.28-rc1 +$ git checkout quilt/i2c +Switched to branch "quilt/i2c" +$ git reset --hard 57f8f7b60db6f1ed2c6918ab9230c4623a9dbe37 +HEAD is now at 57f8f7b Linux 2.6.28-rc1 +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c +i2c-scx200_i2c-add-missing-class-parameter.patch +Importing jdelvare-hwmon based on 2.6.28-rc1 +$ git checkout quilt/jdelvare-hwmon +Switched to branch "quilt/jdelvare-hwmon" +$ git reset --hard 57f8f7b60db6f1ed2c6918ab9230c4623a9dbe37 +HEAD is now at 57f8f7b Linux 2.6.28-rc1 +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/jdelvare-hwmon +hwmon-w83781d-doesnt-link-when-built-in.patch +hwmon-vid-add-support-for-AMD-fam10.patch +hwmon-lm90-01-fix-hyst-for-specific-chips.patch +hwmon-lm90-02-handle-LM99-offset.patch +hwmon-adt7473-fix-voltage-conversion.patch +hwmon-abituguru3-01-cosmetic-whitespace-fixes.patch +hwmon-abituguru3-02-enable-dmi-probing-feature-on-aw9d-max.patch +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 +Unchanged quilt series kernel-doc +Importing ide based on 57f8f7b60db6f1ed2c6918ab9230c4623a9dbe37 +$ git checkout quilt/ide +Switched to branch "quilt/ide" +$ git reset --hard 57f8f7b60db6f1ed2c6918ab9230c4623a9dbe37 +HEAD is now at 57f8f7b Linux 2.6.28-rc1 +$ git quiltimport --author Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> --patches ../quilt/ide +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 +ide-cleanup-ide_do_request.patch +ide-cd-remove-obsolete-seek-optimization.patch +Importing rr based on v2.6.27-6509-g2515ddc +$ git checkout quilt/rr +Switched to branch "quilt/rr" +$ git reset --hard 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 +HEAD is now at 2515ddc binfmt_elf_fdpic: Update for cputime changes. +$ git quiltimport --author Rusty Russell <rusty@rustcorp.com.au> --patches ../quilt/rr +module:simplify-load_module.patch +module:remove_stop_machine_during_load_v2.patch +module:compile-time-prefix-length-check.patch +module_param:fix-duplicate-prefixes.patch +module:core_param.patch +misc:make-initcall_debug-a-module_param.patch +misc:make-panic-options-core_params.patch +misc:call_init_workqueues_before_pre_smp_initcalls.patch +misc:workqueue_introduce_create_rt_workqueue.patch +stop_machine:use_workqueues_instead_of_kernel_threads.patch +stop_machine:fix_error_code_handling_on_multiple_cpus.patch +stop_machine:fix-init-breakage.patch +virtio:net_recycle_some_more_rx_buffer_pages.patch +virtio:net-mergeable-rx-bufs.patch +virtio:net_hook_up_the_set_tso_ethtool_op.patch +lguest:fix-efi.patch +lguest:fix-irq-vectors.patch +lguest:move_the_initial_guest_page_table_creation_code_to_the_host.patch +module:remove_config_kmod.patch +cpumask:add-for_each_cpu_mask_and.patch +x86:modify-send_IPI-API.patch +sched:reduce-stack-usage.patch +cpumask:centralize-common-maps.patch +cpumask:remove-min.patch +cpumask:add-struct-cpumask.patch +cpumask:convert-few-difficult-cpumask_t-users.patch +cpumask:cpumask_size.patch +cpumask:cpus_copy.patch +cpumask:cpumask_var_t.patch +x86:enable-MAXSMP.patch +cpumask:CONFIG_NR_CPUS-always.patch +cpumask:always-have-nr_cpu_ids.patch +cpumask:add-nr_cpumask_bits.patch +cpumask:all-ops-compare-against-nr_cpu_ids.patch +cpumask:fix-impossible-percpu-accesses.patch +cpumask:use-nr_cpu_ids-in-all-ops.patch +cpumask:cpumask_bits-everywhere.patch +cpumask:cpumask_of.patch +cpumask:for_each_cpu.patch +cpumask:cpumask_first-cpumask_next.patch +cpumask:deprecate-any_online_cpu.patch +cpumask:cpumask_any_but.patch +cpumask:deprecate-CPUMASK_ALLOC.patch +cpumask:use-alloc_cpumask_var-in-sched.patch +cpumask:to_cpumask.patch +cpumask:cpumap-accessors.patch +cpumask:CPU_BITS_ALL-and-CPU_BITS_NONE.patch +cpumask:cpu_online_mask-et-al.patch +cpumask:cpu_all_mask-and-cpu_none_mask.patch +cpumask:cleanup-ifdefs.patch +cpumask:check-all-ops-for-limits.patch +cpumask:simple-smp_call_function_many.patch +misc:work_on_cpu.patch +Importing ttydev based on origin/master + quilt series is empty +$ git update-ref refs/heads/quilt/ttydev f8d56f1771e4867acc461146764b4feeb5245669 diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..c1f42f30b5f3 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20081027 |