diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-05-06 14:22:58 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-05-06 14:22:58 +1000 |
| commit | 34859565cf6419379ebe7e1e57bd9d3cf083666f (patch) | |
| tree | cceff0ccdeb5dad8fcbc83e485a8a43484d0a3aa | |
| parent | c615ad98bcc77d08186f1edd7bedf2bd8e8c9c11 (diff) | |
Add linux-next specific filesnext-20080506
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/Trees | 73 | ||||
| -rw-r--r-- | Next/merge.log | 1980 | ||||
| -rw-r--r-- | Next/quilt-import.log | 268 | ||||
| -rw-r--r-- | localversion-next | 1 | ||||
| -rw-r--r-- | localversion-sched-devel.git | 1 | ||||
| -rw-r--r-- | localversion-x86-latest.git | 1 |
6 files changed, 2322 insertions, 2 deletions
diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..41ce6807a972 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,73 @@ +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 +x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git#for-linus +sched-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel.git#for-linus +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#merge +scsi-rc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git#master +net-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git#master +sparc-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-linus +arm-current git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#master +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#for-linus +driver-core quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver-core/ +usb quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-usb/ +x86 git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git#for-akpm +sched git git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel.git#for-akpm +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/ +kernel-doc quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ +avr32 git git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git#avr32-arch +v4l-dvb git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next.git#stable +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 +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.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#test +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6.git#for-linus +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 +hwmon git git://lm-sensors.org/kernel/mhoffman/hwmon-2.6.git#testing +ubi git git://git.infradead.org/~dedekind/ubi-2.6.git#master +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 +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git#test +tests git git://git.kernel.org/pub/scm/linux/kernel/git/sam/tests.git#master +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git#linux-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6.git#for-akpm +m68k quilt http://linux-m68k-cvs.ubb.ca/~geert/linux-m68k-patches-2.6/ +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#powerpc-next +hrt git git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt.git#mm +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_testing#master +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#next +4xx git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.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 +security-testing git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git#next +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git#master +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git#master +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#powerpc-next +mtd git git://git.infradead.org/mtd-2.6.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.26.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#vfs-2.6.25 +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#master +arm git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#devel +cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#master +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/ +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 +x86-latest git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git#latest +sched-latest git git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel.git#latest +ldp quilt http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-ldp/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..71c7b05ba85a --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,1980 @@ +$ git checkout master +Already on "master" +$ git reset --hard stable +HEAD is now at afa26be Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt +Merging origin/master +$ git merge origin/master +Updating afa26be..17aa7e0 +Fast forward + Documentation/DocBook/kgdb.tmpl | 8 +- + Documentation/kbuild/kconfig-language.txt | 24 -- + Documentation/kernel-parameters.txt | 5 +- + arch/m68k/kernel/traps.c | 17 +- + arch/m68k/mac/config.c | 24 -- + arch/powerpc/kvm/booke_guest.c | 6 + + arch/powerpc/kvm/powerpc.c | 20 ++- + arch/um/Makefile | 5 +- + arch/x86/Kconfig | 1 + + arch/x86/boot/compressed/relocs.c | 2 +- + arch/x86/kernel/acpi/Makefile | 2 +- + arch/x86/kernel/acpi/realmode/Makefile | 5 +- + arch/x86/kernel/kvmclock.c | 4 + + arch/x86/kernel/mpparse.c | 7 +- + arch/x86/kernel/reboot.c | 1 - + arch/x86/kernel/setup.c | 2 +- + arch/x86/kernel/smpboot.c | 4 +- + arch/x86/kvm/i8254.c | 2 + + arch/x86/kvm/mmu.c | 89 +++---- + arch/x86/kvm/mmu.h | 37 +++- + arch/x86/kvm/svm.c | 10 + + arch/x86/kvm/vmx.c | 375 +++++++++++++++++++++++++++-- + arch/x86/kvm/vmx.h | 38 +++ + arch/x86/kvm/x86.c | 22 ++- + arch/x86/kvm/x86_emulate.c | 1 + + arch/x86/mm/discontig_32.c | 26 -- + arch/x86/pci/Makefile_32 | 12 +- + arch/x86/pci/acpi.c | 41 --- + arch/x86/pci/common.c | 58 ++++- + arch/x86/pci/fixup.c | 2 +- + arch/x86/pci/init.c | 4 + + arch/x86/pci/pci.h | 3 + + arch/x86/vdso/vdso32-setup.c | 2 +- + arch/x86/video/fbdev.c | 2 +- + drivers/char/serial167.c | 2 +- + drivers/edac/edac_core.h | 2 +- + drivers/edac/edac_device.c | 6 +- + drivers/edac/edac_mc.c | 6 +- + drivers/edac/edac_pci.c | 6 +- + drivers/ide/ide-probe.c | 12 +- + drivers/ide/legacy/falconide.c | 2 +- + drivers/input/serio/hp_sdc.c | 1 + + drivers/misc/kgdbts.c | 75 ++++--- + drivers/pci/probe.c | 33 ++-- + drivers/scsi/Kconfig | 1 + + fs/proc/task_nommu.c | 1 + + include/asm-alpha/types.h | 6 + + include/asm-m68k/machw.h | 30 --- + include/asm-mips/types.h | 2 - + include/asm-powerpc/kvm_host.h | 1 + + include/asm-powerpc/kvm_ppc.h | 5 + + include/asm-x86/bootparam.h | 8 +- + include/asm-x86/kvm_host.h | 10 +- + include/linux/kgdb.h | 4 +- + include/linux/pci.h | 5 +- + include/linux/sysfs.h | 6 - + init/Kconfig | 9 + + kernel/futex.c | 176 +------------- + kernel/kgdb.c | 8 +- + kernel/module.c | 44 +++-- + lib/Kconfig.kgdb | 16 +- + scripts/kconfig/lkc.h | 6 +- + scripts/kconfig/mconf.c | 3 +- + scripts/mod/file2alias.c | 35 ++- + sound/drivers/pcsp/pcsp.c | 4 + + sound/pci/Kconfig | 5 +- + sound/pci/ac97/ac97_patch.c | 9 +- + sound/pci/hda/patch_realtek.c | 5 +- + sound/pci/hda/patch_sigmatel.c | 2 + + sound/soc/s3c24xx/s3c24xx-i2s.c | 2 + + sound/soc/s3c24xx/s3c24xx-pcm.c | 2 +- + virt/kvm/kvm_main.c | 1 + + 72 files changed, 862 insertions(+), 550 deletions(-) +Applying v4l build fix +Merging x86-fixes/for-linus +$ git merge x86-fixes/for-linus +Already up-to-date. +Merging sched-fixes/for-linus +$ git merge sched-fixes/for-linus +Removed Documentation/scheduler/sched-design.txt +Merge made by recursive. + Documentation/scheduler/sched-design.txt | 165 --------------- + arch/x86/Kconfig | 1 + + include/linux/sched.h | 38 ++++- + init/Kconfig | 11 +- + init/main.c | 1 + + kernel/Makefile | 2 +- + kernel/sched.c | 323 ++++++++++++------------------ + kernel/sched_clock.c | 236 ++++++++++++++++++++++ + kernel/sched_debug.c | 7 - + kernel/sched_fair.c | 39 +--- + kernel/sched_idletask.c | 2 +- + kernel/sched_rt.c | 9 +- + 12 files changed, 428 insertions(+), 406 deletions(-) + delete mode 100644 Documentation/scheduler/sched-design.txt + create mode 100644 kernel/sched_clock.c +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net-current/master +$ git merge net-current/master +Merge made by recursive. + drivers/net/irda/nsc-ircc.c | 6 +++++ + drivers/net/irda/smsc-ircc2.c | 5 +++- + drivers/net/niu.c | 11 ++++++--- + drivers/net/wan/lapbether.c | 1 + + include/net/ip.h | 2 +- + include/net/xfrm.h | 48 ++++++++++++++++++++++++++++++++++------ + net/atm/br2684.c | 6 +--- + net/bridge/br_if.c | 12 ++++++---- + net/core/skbuff.c | 4 ++- + net/decnet/dn_route.c | 12 +++++----- + net/ipv4/route.c | 18 +++++++------- + net/ipv4/tcp_input.c | 15 ++++++------ + net/ipv6/route.c | 6 ++-- + net/mac80211/main.c | 7 ++++- + net/sched/act_simple.c | 34 +++++++++++++--------------- + net/sched/sch_htb.c | 8 +++++- + 16 files changed, 124 insertions(+), 71 deletions(-) +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Already up-to-date. +Merging arm-current/master +$ git merge arm-current/master +Merge made by recursive. + arch/arm/mach-ep93xx/core.c | 2 +- + arch/arm/mach-pxa/pm.c | 7 ++++--- + arch/arm/mach-pxa/pxa25x.c | 8 +++----- + arch/arm/mach-pxa/pxa27x.c | 8 +++----- + arch/arm/mach-pxa/pxa3xx.c | 7 +++---- + arch/arm/mach-sa1100/pm.c | 8 +++----- + drivers/mmc/host/mmci.c | 14 +++++++++++++- + include/asm-arm/arch-pxa/pm.h | 2 +- + 8 files changed, 31 insertions(+), 25 deletions(-) +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Already up-to-date. +Merging quilt/driver-core +$ git merge quilt/driver-core +Auto-merged include/linux/device.h +Auto-merged init/main.c +Merge made by recursive. + Documentation/ABI/testing/sysfs-dev | 20 + + Documentation/filesystems/sysfs.txt | 6 + + arch/x86/kernel/apm_32.c | 8 +- + arch/x86/kernel/traps_32.c | 1 + + arch/x86/kernel/traps_64.c | 1 + + block/genhd.c | 5 +- + drivers/base/class.c | 4 + + drivers/base/core.c | 84 +++++- + drivers/base/platform.c | 296 +++++++++++++++- + drivers/base/power/main.c | 675 +++++++++++++++++++++++++++-------- + drivers/base/power/power.h | 2 +- + drivers/base/power/trace.c | 4 +- + drivers/net/phy/phy_device.c | 8 +- + drivers/usb/core/devio.c | 5 + + fs/sysfs/file.c | 13 + + fs/sysfs/mount.c | 2 +- + fs/sysfs/sysfs.h | 1 + + include/linux/device.h | 12 + + include/linux/init.h | 1 + + include/linux/platform_device.h | 1 + + include/linux/pm.h | 314 +++++++++++++++-- + include/linux/sysfs.h | 5 + + init/main.c | 9 + + kernel/power/disk.c | 22 +- + kernel/power/main.c | 6 +- + lib/kobject.c | 52 +++ + 26 files changed, 1344 insertions(+), 213 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-dev +Merging quilt/usb +$ git merge quilt/usb +Auto-merged MAINTAINERS +Auto-merged drivers/usb/Makefile +Auto-merged drivers/usb/core/message.c +Auto-merged drivers/usb/host/Kconfig +Auto-merged drivers/usb/host/Makefile +CONFLICT (content): Merge conflict in drivers/usb/host/Makefile +Resolved 'drivers/usb/host/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + Documentation/usb/WUSB-Design-overview.txt | 448 +++++++ + Documentation/usb/wusb-cbaf | 136 ++ + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/usb/Kconfig | 2 + + drivers/usb/Makefile | 5 + + drivers/usb/core/driver.c | 20 +- + drivers/usb/core/endpoint.c | 11 +- + drivers/usb/core/hub.c | 506 +++++--- + drivers/usb/core/message.c | 1 + + drivers/usb/core/sysfs.c | 136 ++- + drivers/usb/core/usb.c | 1 + + drivers/usb/core/usb.h | 4 + + drivers/usb/host/Kconfig | 15 + + drivers/usb/host/Makefile | 1 + + drivers/usb/host/hwa-hc.c | 925 +++++++++++++ + drivers/usb/misc/Kconfig | 9 + + drivers/usb/misc/Makefile | 1 + + drivers/usb/misc/gotemp.c | 295 +++++ + drivers/usb/serial/Kconfig | 8 + + drivers/usb/serial/ti_fw_3410.h | 4 + + drivers/usb/serial/ti_fw_5052.h | 5 + + drivers/usb/serial/ti_usb_3410_5052.c | 106 +- + drivers/usb/wusbcore/Kconfig | 17 + + drivers/usb/wusbcore/Makefile | 20 + + drivers/usb/wusbcore/cbaf.c | 620 +++++++++ + drivers/usb/wusbcore/crypto.c | 537 ++++++++ + drivers/usb/wusbcore/dev-sysfs.c | 199 +++ + drivers/usb/wusbcore/devconnect.c | 1307 +++++++++++++++++++ + drivers/usb/wusbcore/mmc.c | 329 +++++ + drivers/usb/wusbcore/pal.c | 39 + + drivers/usb/wusbcore/reservation.c | 127 ++ + drivers/usb/wusbcore/rh.c | 477 +++++++ + drivers/usb/wusbcore/security.c | 536 ++++++++ + drivers/usb/wusbcore/wa-hc.c | 83 ++ + drivers/usb/wusbcore/wa-hc.h | 420 ++++++ + drivers/usb/wusbcore/wa-nep.c | 313 +++++ + drivers/usb/wusbcore/wa-rpipe.c | 548 ++++++++ + drivers/usb/wusbcore/wa-xfer.c | 1710 ++++++++++++++++++++++++ + drivers/usb/wusbcore/wusbhc.c | 395 ++++++ + drivers/usb/wusbcore/wusbhc.h | 522 ++++++++ + drivers/uwb/Kconfig | 88 ++ + drivers/uwb/Makefile | 30 + + drivers/uwb/address.c | 380 ++++++ + drivers/uwb/beacon.c | 713 ++++++++++ + drivers/uwb/driver.c | 308 +++++ + drivers/uwb/drp-avail.c | 288 ++++ + drivers/uwb/drp-ie.c | 230 ++++ + drivers/uwb/drp.c | 406 ++++++ + drivers/uwb/est.c | 414 ++++++ + drivers/uwb/hwa-rc.c | 915 +++++++++++++ + drivers/uwb/i1480/Makefile | 2 + + drivers/uwb/i1480/dfu/Makefile | 9 + + drivers/uwb/i1480/dfu/dfu.c | 281 ++++ + drivers/uwb/i1480/dfu/i1480-dfu.h | 264 ++++ + drivers/uwb/i1480/dfu/mac.c | 530 ++++++++ + drivers/uwb/i1480/dfu/phy.c | 203 +++ + drivers/uwb/i1480/dfu/usb.c | 501 +++++++ + drivers/uwb/i1480/i1480-est.c | 99 ++ + drivers/uwb/i1480/i1480-wlp.h | 160 +++ + drivers/uwb/i1480/i1480u-wlp/Makefile | 8 + + drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h | 269 ++++ + drivers/uwb/i1480/i1480u-wlp/lc.c | 421 ++++++ + drivers/uwb/i1480/i1480u-wlp/netdev.c | 367 ++++++ + drivers/uwb/i1480/i1480u-wlp/rx.c | 492 +++++++ + drivers/uwb/i1480/i1480u-wlp/sysfs.c | 446 +++++++ + drivers/uwb/i1480/i1480u-wlp/tx.c | 641 +++++++++ + drivers/uwb/ie.c | 591 +++++++++ + drivers/uwb/lc-dev.c | 703 ++++++++++ + drivers/uwb/lc-rc.c | 499 +++++++ + drivers/uwb/neh.c | 616 +++++++++ + drivers/uwb/pal.c | 71 + + drivers/uwb/reset.c | 328 +++++ + drivers/uwb/rsv.c | 607 +++++++++ + drivers/uwb/scan.c | 160 +++ + drivers/uwb/umc-bus.c | 186 +++ + drivers/uwb/umc-dev.c | 104 ++ + drivers/uwb/umc-drv.c | 31 + + drivers/uwb/uwb-debug.c | 306 +++++ + drivers/uwb/uwb-internal.h | 288 ++++ + drivers/uwb/uwbd.c | 428 ++++++ + drivers/uwb/whc-rc.c | 552 ++++++++ + drivers/uwb/whci.c | 285 ++++ + drivers/uwb/wlp/Makefile | 10 + + drivers/uwb/wlp/driver.c | 43 + + drivers/uwb/wlp/eda.c | 449 +++++++ + drivers/uwb/wlp/messages.c | 1946 ++++++++++++++++++++++++++++ + drivers/uwb/wlp/sysfs.c | 715 ++++++++++ + drivers/uwb/wlp/txrx.c | 374 ++++++ + drivers/uwb/wlp/wlp-internal.h | 228 ++++ + drivers/uwb/wlp/wlp-lc.c | 565 ++++++++ + drivers/uwb/wlp/wss-lc.c | 1056 +++++++++++++++ + include/linux/bitmap.h | 1 + + include/linux/usb.h | 3 + + include/linux/usb/association.h | 150 +++ + include/linux/usb/wusb-wa.h | 284 ++++ + include/linux/usb/wusb.h | 420 ++++++ + include/linux/uwb.h | 768 +++++++++++ + include/linux/uwb/bugs-macros.h | 64 + + include/linux/uwb/bugs.h | 18 + + include/linux/uwb/debug-cmd.h | 57 + + include/linux/uwb/debug.h | 82 ++ + include/linux/uwb/spec.h | 630 +++++++++ + include/linux/uwb/umc.h | 194 +++ + include/linux/uwb/util.h | 89 ++ + include/linux/uwb/whci.h | 117 ++ + include/linux/wlp.h | 728 +++++++++++ + lib/bitmap.c | 20 + + 108 files changed, 33797 insertions(+), 275 deletions(-) + create mode 100644 Documentation/usb/WUSB-Design-overview.txt + create mode 100644 Documentation/usb/wusb-cbaf + create mode 100644 drivers/usb/host/hwa-hc.c + create mode 100644 drivers/usb/misc/gotemp.c + create mode 100644 drivers/usb/wusbcore/Kconfig + create mode 100644 drivers/usb/wusbcore/Makefile + create mode 100644 drivers/usb/wusbcore/cbaf.c + create mode 100644 drivers/usb/wusbcore/crypto.c + create mode 100644 drivers/usb/wusbcore/dev-sysfs.c + create mode 100644 drivers/usb/wusbcore/devconnect.c + create mode 100644 drivers/usb/wusbcore/mmc.c + create mode 100644 drivers/usb/wusbcore/pal.c + create mode 100644 drivers/usb/wusbcore/reservation.c + create mode 100644 drivers/usb/wusbcore/rh.c + create mode 100644 drivers/usb/wusbcore/security.c + create mode 100644 drivers/usb/wusbcore/wa-hc.c + create mode 100644 drivers/usb/wusbcore/wa-hc.h + create mode 100644 drivers/usb/wusbcore/wa-nep.c + create mode 100644 drivers/usb/wusbcore/wa-rpipe.c + create mode 100644 drivers/usb/wusbcore/wa-xfer.c + create mode 100644 drivers/usb/wusbcore/wusbhc.c + create mode 100644 drivers/usb/wusbcore/wusbhc.h + create mode 100644 drivers/uwb/Kconfig + create mode 100644 drivers/uwb/Makefile + create mode 100644 drivers/uwb/address.c + create mode 100644 drivers/uwb/beacon.c + create mode 100644 drivers/uwb/driver.c + create mode 100644 drivers/uwb/drp-avail.c + create mode 100644 drivers/uwb/drp-ie.c + create mode 100644 drivers/uwb/drp.c + create mode 100644 drivers/uwb/est.c + create mode 100644 drivers/uwb/hwa-rc.c + create mode 100644 drivers/uwb/i1480/Makefile + create mode 100644 drivers/uwb/i1480/dfu/Makefile + create mode 100644 drivers/uwb/i1480/dfu/dfu.c + create mode 100644 drivers/uwb/i1480/dfu/i1480-dfu.h + create mode 100644 drivers/uwb/i1480/dfu/mac.c + create mode 100644 drivers/uwb/i1480/dfu/phy.c + create mode 100644 drivers/uwb/i1480/dfu/usb.c + create mode 100644 drivers/uwb/i1480/i1480-est.c + create mode 100644 drivers/uwb/i1480/i1480-wlp.h + create mode 100644 drivers/uwb/i1480/i1480u-wlp/Makefile + create mode 100644 drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h + create mode 100644 drivers/uwb/i1480/i1480u-wlp/lc.c + create mode 100644 drivers/uwb/i1480/i1480u-wlp/netdev.c + create mode 100644 drivers/uwb/i1480/i1480u-wlp/rx.c + create mode 100644 drivers/uwb/i1480/i1480u-wlp/sysfs.c + create mode 100644 drivers/uwb/i1480/i1480u-wlp/tx.c + create mode 100644 drivers/uwb/ie.c + create mode 100644 drivers/uwb/lc-dev.c + create mode 100644 drivers/uwb/lc-rc.c + create mode 100644 drivers/uwb/neh.c + create mode 100644 drivers/uwb/pal.c + create mode 100644 drivers/uwb/reset.c + create mode 100644 drivers/uwb/rsv.c + create mode 100644 drivers/uwb/scan.c + create mode 100644 drivers/uwb/umc-bus.c + create mode 100644 drivers/uwb/umc-dev.c + create mode 100644 drivers/uwb/umc-drv.c + create mode 100644 drivers/uwb/uwb-debug.c + create mode 100644 drivers/uwb/uwb-internal.h + create mode 100644 drivers/uwb/uwbd.c + create mode 100644 drivers/uwb/whc-rc.c + create mode 100644 drivers/uwb/whci.c + create mode 100644 drivers/uwb/wlp/Makefile + create mode 100644 drivers/uwb/wlp/driver.c + create mode 100644 drivers/uwb/wlp/eda.c + create mode 100644 drivers/uwb/wlp/messages.c + create mode 100644 drivers/uwb/wlp/sysfs.c + create mode 100644 drivers/uwb/wlp/txrx.c + create mode 100644 drivers/uwb/wlp/wlp-internal.h + create mode 100644 drivers/uwb/wlp/wlp-lc.c + create mode 100644 drivers/uwb/wlp/wss-lc.c + create mode 100644 include/linux/usb/association.h + create mode 100644 include/linux/usb/wusb-wa.h + create mode 100644 include/linux/usb/wusb.h + create mode 100644 include/linux/uwb.h + create mode 100644 include/linux/uwb/bugs-macros.h + create mode 100644 include/linux/uwb/bugs.h + create mode 100644 include/linux/uwb/debug-cmd.h + create mode 100644 include/linux/uwb/debug.h + create mode 100644 include/linux/uwb/spec.h + create mode 100644 include/linux/uwb/umc.h + create mode 100644 include/linux/uwb/util.h + create mode 100644 include/linux/uwb/whci.h + create mode 100644 include/linux/wlp.h +Merging x86/for-akpm +$ git merge x86/for-akpm +Already up-to-date. +Merging sched/for-akpm +$ git merge sched/for-akpm +Merge made by recursive. + Documentation/tracers/mmiotrace.txt | 164 ++ + Makefile | 4 + + arch/x86/Kconfig | 1 + + arch/x86/Kconfig.debug | 28 + + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/alternative.c | 22 +- + arch/x86/kernel/entry_32.S | 68 + + arch/x86/kernel/entry_64.S | 102 ++ + arch/x86/kernel/ftrace.c | 159 ++ + arch/x86/kernel/machine_kexec_32.c | 4 + + arch/x86/kernel/machine_kexec_64.c | 4 + + arch/x86/kernel/process_32.c | 3 + + arch/x86/kernel/process_64.c | 3 + + arch/x86/kernel/vsyscall_64.c | 3 +- + arch/x86/lib/Makefile | 1 + + arch/x86/lib/thunk_32.S | 47 + + arch/x86/lib/thunk_64.S | 19 +- + arch/x86/mm/Makefile | 5 + + arch/x86/mm/fault.c | 13 + + arch/x86/mm/init_32.c | 4 + + arch/x86/mm/init_64.c | 10 +- + arch/x86/mm/ioremap.c | 11 +- + arch/x86/mm/kmmio.c | 508 ++++++ + arch/x86/mm/mmio-mod.c | 515 ++++++ + arch/x86/mm/pageattr.c | 1 + + arch/x86/mm/pf_in.c | 489 ++++++ + arch/x86/mm/pf_in.h | 39 + + arch/x86/mm/testmmiotrace.c | 71 + + arch/x86/vdso/vclock_gettime.c | 15 +- + arch/x86/vdso/vgetcpu.c | 3 +- + include/asm-x86/alternative.h | 2 + + include/asm-x86/irqflags.h | 24 +- + include/asm-x86/vsyscall.h | 3 +- + include/linux/ftrace.h | 123 ++ + include/linux/irqflags.h | 13 +- + include/linux/linkage.h | 2 + + include/linux/mmiotrace.h | 85 + + include/linux/preempt.h | 34 +- + include/linux/sched.h | 48 + + kernel/Makefile | 11 + + kernel/fork.c | 2 +- + kernel/lockdep.c | 33 +- + kernel/printk.c | 2 + + kernel/sched.c | 70 +- + kernel/sched_cpupri.c | 174 ++ + kernel/sched_cpupri.h | 36 + + kernel/sched_rt.c | 197 ++- + kernel/spinlock.c | 2 +- + kernel/sysctl.c | 11 + + kernel/time/tick-sched.c | 11 +- + kernel/trace/Kconfig | 131 ++ + kernel/trace/Makefile | 24 + + kernel/trace/ftrace.c | 1401 +++++++++++++++ + kernel/trace/trace.c | 3038 +++++++++++++++++++++++++++++++++ + kernel/trace/trace.h | 351 ++++ + kernel/trace/trace_functions.c | 78 + + kernel/trace/trace_irqsoff.c | 502 ++++++ + kernel/trace/trace_mmiotrace.c | 295 ++++ + kernel/trace/trace_sched_switch.c | 186 ++ + kernel/trace/trace_sched_wakeup.c | 288 ++++ + kernel/trace/trace_selftest.c | 555 ++++++ + kernel/trace/trace_selftest_dynamic.c | 7 + + kernel/trace/trace_sysprof.c | 355 ++++ + lib/Kconfig.debug | 2 + + lib/Makefile | 9 + + lib/smp_processor_id.c | 6 +- + 66 files changed, 10270 insertions(+), 158 deletions(-) + create mode 100644 Documentation/tracers/mmiotrace.txt + create mode 100644 arch/x86/kernel/ftrace.c + create mode 100644 arch/x86/lib/thunk_32.S + create mode 100644 arch/x86/mm/kmmio.c + create mode 100644 arch/x86/mm/mmio-mod.c + create mode 100644 arch/x86/mm/pf_in.c + create mode 100644 arch/x86/mm/pf_in.h + create mode 100644 arch/x86/mm/testmmiotrace.c + create mode 100644 include/linux/ftrace.h + create mode 100644 include/linux/mmiotrace.h + create mode 100644 kernel/sched_cpupri.c + create mode 100644 kernel/sched_cpupri.h + create mode 100644 kernel/trace/Kconfig + create mode 100644 kernel/trace/Makefile + create mode 100644 kernel/trace/ftrace.c + create mode 100644 kernel/trace/trace.c + create mode 100644 kernel/trace/trace.h + create mode 100644 kernel/trace/trace_functions.c + create mode 100644 kernel/trace/trace_irqsoff.c + create mode 100644 kernel/trace/trace_mmiotrace.c + create mode 100644 kernel/trace/trace_sched_switch.c + create mode 100644 kernel/trace/trace_sched_wakeup.c + create mode 100644 kernel/trace/trace_selftest.c + create mode 100644 kernel/trace/trace_selftest_dynamic.c + create mode 100644 kernel/trace/trace_sysprof.c +Merging pci/linux-next +$ git merge pci/linux-next +Auto-merged include/linux/pci.h +Merge made by recursive. + drivers/pci/hotplug/pciehp_core.c | 2 +- + drivers/pci/hotplug/shpchp_core.c | 2 +- + include/linux/pci.h | 5 ++++- + 3 files changed, 6 insertions(+), 3 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 +Auto-merged include/linux/hid.h +Merge made by recursive. +Merging quilt/i2c +$ git merge quilt/i2c +Merge made by recursive. + MAINTAINERS | 2 + + drivers/i2c/busses/i2c-ali1535.c | 6 +++ + drivers/i2c/busses/i2c-ali1563.c | 5 ++ + drivers/i2c/busses/i2c-ali15x3.c | 5 ++ + drivers/i2c/busses/i2c-amd756.c | 6 +++ + drivers/i2c/busses/i2c-amd8111.c | 5 ++ + drivers/i2c/busses/i2c-davinci.c | 89 ++++++++++++++++++++++++++++--------- + drivers/i2c/busses/i2c-i801.c | 5 ++ + drivers/i2c/busses/i2c-mpc.c | 16 +++---- + drivers/i2c/busses/i2c-nforce2.c | 6 +++ + drivers/i2c/busses/i2c-piix4.c | 36 ++++++++++++++- + drivers/i2c/busses/i2c-sis5595.c | 6 +++ + drivers/i2c/busses/i2c-sis630.c | 6 +++ + drivers/i2c/busses/i2c-sis96x.c | 5 ++ + drivers/i2c/busses/i2c-viapro.c | 5 ++ + drivers/i2c/i2c-core.c | 14 +++--- + drivers/rtc/rtc-s35390a.c | 2 +- + include/linux/i2c.h | 2 +- + 18 files changed, 180 insertions(+), 41 deletions(-) +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Merge made by recursive. + Documentation/00-INDEX | 2 - + Documentation/early-userspace/00-INDEX | 8 + + Documentation/{ => early-userspace}/initrd.txt | 6 +- + Documentation/kbuild/00-INDEX | 2 + + Documentation/kbuild/make-configs.txt | 188 ++++++++++++++++++++++++ + README | 32 +++-- + 6 files changed, 221 insertions(+), 17 deletions(-) + create mode 100644 Documentation/early-userspace/00-INDEX + rename Documentation/{ => early-userspace}/initrd.txt (99%) + create mode 100644 Documentation/kbuild/make-configs.txt +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Already up-to-date. +Merging v4l-dvb/stable +$ git merge v4l-dvb/stable +Merge made by recursive. + drivers/media/common/tuners/tea5767.c | 6 +- + drivers/media/dvb/frontends/Kconfig | 14 + + drivers/media/dvb/frontends/Makefile | 1 + + drivers/media/dvb/frontends/drx397xD.c | 1504 +++++++++++++++++++++++++++++ + drivers/media/dvb/frontends/drx397xD.h | 130 +++ + drivers/media/dvb/frontends/drx397xD_fw.h | 40 + + drivers/media/video/Kconfig | 4 +- + drivers/media/video/cx23885/Kconfig | 2 + + drivers/media/video/cx88/cx88-dvb.c | 251 +++--- + drivers/media/video/em28xx/em28xx-dvb.c | 1 - + drivers/media/video/saa7134/saa7134-dvb.c | 140 ++- + drivers/media/video/stk-webcam.c | 7 + + drivers/media/video/tuner-core.c | 34 +- + 13 files changed, 1953 insertions(+), 181 deletions(-) + create mode 100644 drivers/media/dvb/frontends/drx397xD.c + create mode 100644 drivers/media/dvb/frontends/drx397xD.h + create mode 100644 drivers/media/dvb/frontends/drx397xD_fw.h +Merging s390/features +$ git merge s390/features +Already up-to-date. +Merging sh/master +$ git merge sh/master +Removed arch/sh/boards/mpc1211/Makefile +Removed arch/sh/boards/mpc1211/pci.c +Removed arch/sh/boards/mpc1211/rtc.c +Removed arch/sh/boards/mpc1211/setup.c +Auto-merged arch/sh/boards/renesas/migor/setup.c +Auto-merged arch/sh/boards/renesas/r7780rp/setup.c +Auto-merged drivers/mtd/maps/Kconfig +Removed drivers/mtd/maps/mpc1211.c +Auto-merged drivers/rtc/rtc-sh.c +Auto-merged drivers/serial/sh-sci.c +Removed include/asm-sh/keyboard.h +Removed include/asm-sh/mpc1211/dma.h +Removed include/asm-sh/mpc1211/io.h +Removed include/asm-sh/mpc1211/keyboard.h +Removed include/asm-sh/mpc1211/m1543c.h +Removed include/asm-sh/mpc1211/mc146818rtc.h +Removed include/asm-sh/mpc1211/mpc1211.h +Removed include/asm-sh/mpc1211/pci.h +Merge made by recursive. + arch/sh/Kconfig | 17 +- + arch/sh/Kconfig.debug | 1 + + arch/sh/Makefile | 1 - + arch/sh/boards/mpc1211/Makefile | 8 - + arch/sh/boards/mpc1211/pci.c | 295 ---------------------- + arch/sh/boards/mpc1211/rtc.c | 136 ---------- + arch/sh/boards/mpc1211/setup.c | 347 -------------------------- + arch/sh/boards/renesas/migor/setup.c | 11 +- + arch/sh/boards/renesas/r7780rp/irq-r7780mp.c | 2 +- + arch/sh/boards/renesas/r7780rp/irq-r7780rp.c | 2 +- + arch/sh/boards/renesas/r7780rp/irq-r7785rp.c | 2 +- + arch/sh/boards/renesas/r7780rp/setup.c | 24 +-- + arch/sh/boards/renesas/rts7751r2d/setup.c | 7 +- + arch/sh/boards/se/7722/setup.c | 6 + + arch/sh/boot/compressed/Makefile_32 | 1 - + arch/sh/boot/compressed/Makefile_64 | 1 - + arch/sh/kernel/cpu/irq/intc-sh5.c | 73 +++--- + arch/sh/kernel/cpu/irq/intc.c | 93 +++++++- + arch/sh/kernel/cpu/sh3/Makefile | 2 +- + arch/sh/kernel/cpu/sh3/setup-sh3.c | 71 ++++++ + arch/sh/kernel/cpu/sh3/setup-sh7705.c | 22 +-- + arch/sh/kernel/cpu/sh3/setup-sh770x.c | 32 +-- + arch/sh/kernel/cpu/sh3/setup-sh7710.c | 25 +-- + arch/sh/kernel/cpu/sh3/setup-sh7720.c | 35 +--- + arch/sh/kernel/cpu/sh5/entry.S | 28 ++ + arch/sh/kernel/cpu/sh5/probe.c | 4 + + arch/sh/kernel/early_printk.c | 30 ++- + arch/sh/kernel/setup.c | 46 ++++- + arch/sh/kernel/sh_ksyms_32.c | 2 - + arch/sh/kernel/sh_ksyms_64.c | 26 ++ + arch/sh/kernel/time_64.c | 5 +- + arch/sh/lib64/dbg.c | 2 +- + arch/sh/mm/Makefile_64 | 7 +- + arch/sh/mm/cache-sh5.c | 2 + + arch/sh/mm/ioremap_64.c | 2 + + arch/sh/mm/numa.c | 2 +- + arch/sh/tools/mach-types | 1 - + drivers/input/serio/i8042-io.h | 2 +- + drivers/mtd/maps/Kconfig | 9 +- + drivers/mtd/maps/Makefile | 1 - + drivers/mtd/maps/mpc1211.c | 80 ------ + drivers/rtc/rtc-sh.c | 14 +- + drivers/serial/sh-sci.c | 32 +-- + drivers/serial/sh-sci.h | 27 ++- + include/asm-sh/hw_irq.h | 19 ++ + include/asm-sh/io.h | 12 +- + include/asm-sh/keyboard.h | 13 - + include/asm-sh/mmu_context.h | 4 +- + include/asm-sh/mmzone.h | 2 + + include/asm-sh/mpc1211/dma.h | 303 ---------------------- + include/asm-sh/mpc1211/io.h | 22 -- + include/asm-sh/mpc1211/keyboard.h | 60 ----- + include/asm-sh/mpc1211/m1543c.h | 200 --------------- + include/asm-sh/mpc1211/mc146818rtc.h | 6 - + include/asm-sh/mpc1211/mpc1211.h | 18 -- + include/asm-sh/mpc1211/pci.h | 38 --- + include/asm-sh/r7780rp.h | 4 +- + include/asm-sh/tlb_64.h | 10 +- + include/asm-sh/uaccess_64.h | 2 + + 59 files changed, 466 insertions(+), 1783 deletions(-) + delete mode 100644 arch/sh/boards/mpc1211/Makefile + delete mode 100644 arch/sh/boards/mpc1211/pci.c + delete mode 100644 arch/sh/boards/mpc1211/rtc.c + delete mode 100644 arch/sh/boards/mpc1211/setup.c + create mode 100644 arch/sh/kernel/cpu/sh3/setup-sh3.c + delete mode 100644 drivers/mtd/maps/mpc1211.c + delete mode 100644 include/asm-sh/keyboard.h + delete mode 100644 include/asm-sh/mpc1211/dma.h + delete mode 100644 include/asm-sh/mpc1211/io.h + delete mode 100644 include/asm-sh/mpc1211/keyboard.h + delete mode 100644 include/asm-sh/mpc1211/m1543c.h + delete mode 100644 include/asm-sh/mpc1211/mc146818rtc.h + delete mode 100644 include/asm-sh/mpc1211/mpc1211.h + delete mode 100644 include/asm-sh/mpc1211/pci.h +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging kbuild/master +$ git merge kbuild/master +Auto-merged Makefile +Auto-merged README +CONFLICT (content): Merge conflict in README +Resolved 'README' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + Makefile | 2 +- + README | 21 ++- + scripts/kconfig/.gitignore | 1 + + scripts/kconfig/Makefile | 78 +++++---- + scripts/kconfig/aconf.c | 325 +++++++++++++++++++++++++++++++++++ + scripts/kconfig/conf.c | 168 ++----------------- + scripts/kconfig/lex.zconf.c_shipped | 16 +- + scripts/kconfig/zconf.l | 16 +- + 8 files changed, 418 insertions(+), 209 deletions(-) + create mode 100644 scripts/kconfig/aconf.c +$ git revert 95ee7b97051dcc4b61d1dbf626e9b32266cb402d +Finished one revert. +Created commit ba3607c: Revert "kconfig: add support for stdin (make K=- ...)" + 3 files changed, 18 insertions(+), 34 deletions(-) +Merging quilt/ide +$ git merge quilt/ide +Auto-merged Documentation/kernel-parameters.txt +Merge made by recursive. + Documentation/kernel-parameters.txt | 3 - + drivers/ide/ide-acpi.c | 6 +- + drivers/ide/ide-cd.c | 111 ++++++------ + drivers/ide/ide-cd.h | 4 +- + drivers/ide/ide-cd_ioctl.c | 113 ++++++------ + drivers/ide/ide-disk.c | 10 +- + drivers/ide/ide-dma.c | 2 +- + drivers/ide/ide-floppy.c | 17 +- + drivers/ide/ide-io.c | 83 +------- + drivers/ide/ide-tape.c | 49 +++-- + drivers/ide/ide-taskfile.c | 34 ++-- + drivers/ide/ide-timing.h | 1 - + drivers/ide/ide.c | 359 +++-------------------------------- + drivers/ide/legacy/ali14xx.c | 2 +- + drivers/ide/legacy/gayle.c | 3 +- + drivers/ide/legacy/ht6560b.c | 2 +- + drivers/ide/legacy/qd65xx.c | 4 +- + drivers/ide/pci/aec62xx.c | 2 +- + drivers/ide/pci/alim15x3.c | 2 +- + drivers/ide/pci/amd74xx.c | 16 +- + drivers/ide/pci/cmd640.c | 8 +- + drivers/ide/pci/cmd64x.c | 4 +- + drivers/ide/pci/cy82c693.c | 2 +- + drivers/ide/pci/opti621.c | 2 +- + drivers/ide/pci/via82cxxx.c | 16 +- + drivers/scsi/ide-scsi.c | 5 +- + include/linux/ide.h | 8 - + 27 files changed, 255 insertions(+), 613 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 +Auto-merged fs/xfs/xfs_mount.c +Auto-merged fs/xfs/xfs_mount.h +Auto-merged fs/xfs/xfs_vfsops.c +Merge made by recursive. + fs/xfs/linux-2.6/xfs_super.c | 1 + + fs/xfs/xfs_clnt.h | 1 + + fs/xfs/xfs_dir2_node.c | 358 ++++++++++++++++++++++++------------------ + fs/xfs/xfs_mount.c | 12 ++- + fs/xfs/xfs_mount.h | 1 + + fs/xfs/xfs_sb.h | 7 + + fs/xfs/xfs_vfsops.c | 9 +- + 7 files changed, 231 insertions(+), 158 deletions(-) +Merging infiniband/for-next +$ git merge infiniband/for-next +Merge made by recursive. + drivers/infiniband/hw/cxgb3/cxio_hal.c | 13 ++++++-- + drivers/infiniband/hw/cxgb3/cxio_hal.h | 4 +- + drivers/infiniband/hw/cxgb3/iwch_cm.c | 6 ++-- + drivers/infiniband/hw/cxgb3/iwch_qp.c | 13 +++++--- + drivers/infiniband/hw/mlx4/cq.c | 4 +- + drivers/infiniband/ulp/ipoib/ipoib.h | 2 + + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 47 +++++++++++++++++++++++++--- + drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 3 +- + 8 files changed, 71 insertions(+), 21 deletions(-) +Merging acpi/test +$ git merge acpi/test +Merge made by recursive. + drivers/acpi/dispatcher/dsmethod.c | 2 +- + drivers/acpi/executer/exmutex.c | 4 +- + drivers/acpi/processor_core.c | 14 ++++++-- + drivers/acpi/scan.c | 56 ++++++++++++++++++++--------------- + kernel/cpu.c | 1 + + 5 files changed, 46 insertions(+), 31 deletions(-) +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Merge made by recursive. + fs/nfsd/nfs4state.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Already up-to-date. +Merging hwmon/testing +$ git merge hwmon/testing +Already up-to-date. +Merging ubi/master +$ git merge ubi/master +Merge made by recursive. +Merging kvm/master +$ git merge kvm/master +Merge made by recursive. + arch/x86/kvm/i8254.c | 7 +++-- + arch/x86/kvm/lapic.c | 4 +++ + arch/x86/kvm/lapic.h | 1 + + arch/x86/kvm/mmu.c | 4 +- + arch/x86/kvm/svm.c | 45 +++++++++++++++++++++++++++++-- + arch/x86/kvm/vmx.c | 4 +-- + arch/x86/kvm/x86.c | 29 +++++++++++++++----- + arch/x86/kvm/x86_emulate.c | 7 +++- + include/asm-x86/kvm.h | 1 + + include/asm-x86/kvm_x86_emulate.h | 1 + + virt/kvm/kvm_main.c | 52 +++++++++++++++++++++++++++---------- + 11 files changed, 121 insertions(+), 34 deletions(-) +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Removed drivers/md/dm-emc.c +Removed drivers/md/dm-hw-handler.c +Removed drivers/md/dm-hw-handler.h +Removed drivers/md/dm-mpath-hp-sw.c +Removed drivers/md/dm-mpath-rdac.c +Auto-merged drivers/scsi/Kconfig +Merge made by recursive. + drivers/md/Kconfig | 19 +- + drivers/md/Makefile | 7 +- + drivers/md/dm-emc.c | 345 ------------- + drivers/md/dm-hw-handler.c | 213 -------- + drivers/md/dm-hw-handler.h | 63 --- + drivers/md/dm-mpath-hp-sw.c | 247 ---------- + drivers/md/dm-mpath-rdac.c | 700 --------------------------- + drivers/md/dm-mpath.c | 161 ++++--- + drivers/md/dm-mpath.h | 1 - + drivers/scsi/Kconfig | 2 + + drivers/scsi/Makefile | 1 + + drivers/scsi/device_handler/Kconfig | 32 ++ + drivers/scsi/device_handler/Makefile | 7 + + drivers/scsi/device_handler/scsi_dh.c | 162 ++++++ + drivers/scsi/device_handler/scsi_dh_emc.c | 499 +++++++++++++++++++ + drivers/scsi/device_handler/scsi_dh_hp_sw.c | 202 ++++++++ + drivers/scsi/device_handler/scsi_dh_rdac.c | 691 ++++++++++++++++++++++++++ + drivers/scsi/scsi_error.c | 11 + + drivers/scsi/scsi_lib.c | 8 + + drivers/scsi/scsi_sysfs.c | 1 + + include/scsi/scsi.h | 1 + + include/scsi/scsi_device.h | 22 + + include/scsi/scsi_dh.h | 59 +++ + 23 files changed, 1788 insertions(+), 1666 deletions(-) + delete mode 100644 drivers/md/dm-emc.c + delete mode 100644 drivers/md/dm-hw-handler.c + delete mode 100644 drivers/md/dm-hw-handler.h + delete mode 100644 drivers/md/dm-mpath-hp-sw.c + delete mode 100644 drivers/md/dm-mpath-rdac.c + create mode 100644 drivers/scsi/device_handler/Kconfig + create mode 100644 drivers/scsi/device_handler/Makefile + create mode 100644 drivers/scsi/device_handler/scsi_dh.c + create mode 100644 drivers/scsi/device_handler/scsi_dh_emc.c + create mode 100644 drivers/scsi/device_handler/scsi_dh_hp_sw.c + create mode 100644 drivers/scsi/device_handler/scsi_dh_rdac.c + create mode 100644 include/scsi/scsi_dh.h +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging tests/master +$ git merge tests/master +Renamed drivers/misc/lkdtm.c => tests/lkdtm.c +Auto-merged tests/lkdtm.c +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 +$ git diff -M --stat --summary HEAD^.. + Makefile | 1 + + drivers/misc/Makefile | 1 - + kernel/Makefile | 4 - + lib/Kconfig.debug | 72 +-------------------- + lib/Makefile | 1 - + tests/Kconfig | 80 +++++++++++++++++++++++ + tests/Makefile | 10 +++ + {kernel => tests}/backtracetest.c | 0 + {drivers/misc => tests}/lkdtm.c | 12 ++-- + {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, 100 insertions(+), 83 deletions(-) + create mode 100644 tests/Kconfig + create mode 100644 tests/Makefile + rename {kernel => tests}/backtracetest.c (100%) + rename {drivers/misc => tests}/lkdtm.c (96%) + 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 +Already up-to-date. +Merging selinux/for-akpm +$ git merge selinux/for-akpm +Already up-to-date. +Merging quilt/m68k +$ git merge quilt/m68k +Auto-merged Documentation/kernel-parameters.txt +Auto-merged drivers/scsi/Kconfig +Merge made by recursive. + arch/m68k/Kconfig | 9 +- + arch/m68k/configs/amiga_defconfig | 130 ++-- + arch/m68k/configs/apollo_defconfig | 112 ++-- + arch/m68k/configs/atari_defconfig | 115 ++-- + arch/m68k/configs/bvme6000_defconfig | 112 ++-- + arch/m68k/configs/hp300_defconfig | 114 ++-- + arch/m68k/configs/mac_defconfig | 115 ++-- + arch/m68k/configs/multi_defconfig | 1255 ++++++++++++++++++++++++++++++++++ + arch/m68k/configs/mvme147_defconfig | 112 ++-- + arch/m68k/configs/mvme16x_defconfig | 112 ++-- + arch/m68k/configs/q40_defconfig | 131 ++-- + arch/m68k/configs/sun3_defconfig | 112 ++-- + arch/m68k/configs/sun3x_defconfig | 112 ++-- + arch/m68k/kernel/head.S | 2 +- + arch/m68k/kernel/setup.c | 3 +- + drivers/block/amiflop.c | 6 +- + drivers/block/z2ram.c | 2 +- + drivers/char/vme_scc.c | 4 +- + drivers/ide/legacy/macide.c | 3 + + drivers/input/misc/hp_sdc_rtc.c | 5 + + drivers/input/serio/hp_sdc_mlc.c | 5 + + drivers/input/serio/q40kbd.c | 2 +- + drivers/net/82596.c | 7 + + drivers/net/apne.c | 3 + + drivers/net/mac89x0.c | 3 + + drivers/net/macmace.c | 3 + + drivers/net/sun3lance.c | 3 + + drivers/video/Kconfig | 4 +- + drivers/video/amifb.c | 4 +- + drivers/video/dnfb.c | 3 + + drivers/video/hpfb.c | 2 +- + include/asm-m68k/bug.h | 4 +- + include/asm-m68k/setup.h | 2 +- + include/asm-m68k/uaccess.h | 6 +- + 34 files changed, 2087 insertions(+), 530 deletions(-) + create mode 100644 arch/m68k/configs/multi_defconfig +Merging powerpc/powerpc-next +$ git merge powerpc/powerpc-next +Merge made by recursive. + arch/powerpc/lib/Makefile | 1 + + arch/powerpc/lib/devres.c | 42 ++++++++++++++++++++++++++++++ + arch/powerpc/platforms/pseries/scanlog.c | 19 +------------ + drivers/macintosh/adb.c | 30 ++++++++++---------- + drivers/macintosh/therm_pm72.c | 31 +++++++++++---------- + drivers/macintosh/windfarm_smu_sat.c | 10 +++--- + include/asm-powerpc/io.h | 8 +++++- + include/linux/io.h | 1 + + lib/devres.c | 2 +- + 9 files changed, 90 insertions(+), 54 deletions(-) + create mode 100644 arch/powerpc/lib/devres.c +Merging hrt/mm +$ git merge hrt/mm +Already up-to-date. +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging ext4/next +$ git merge ext4/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/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 +Merge made by recursive. + fs/udf/partition.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) +Merging security-testing/next +$ git merge security-testing/next +Already up-to-date. +Merging net/master +$ git merge net/master +Merge made by recursive. + net/tipc/config.c | 2 +- + net/tipc/core.c | 6 +- + net/tipc/core.h | 124 ++++++++++++++++----------- + net/tipc/dbg.c | 231 +++++++++++++++++++++++------------------------- + net/tipc/dbg.h | 12 ++-- + net/tipc/link.c | 20 ++++- + net/tipc/msg.c | 10 ++- + net/tipc/name_distr.c | 3 - + 8 files changed, 218 insertions(+), 190 deletions(-) +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging galak/powerpc-next +$ git merge galak/powerpc-next +Already up-to-date. +Merging mtd/master +$ git merge mtd/master +Already up-to-date. +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Already up-to-date. +Merging vfs/vfs-2.6.25 +$ git merge vfs/vfs-2.6.25 +Merge made by recursive. + Documentation/filesystems/Locking | 2 -- + Documentation/filesystems/vfs.txt | 4 ---- + fs/affs/affs.h | 4 +--- + fs/affs/file.c | 25 +++++++++++++++++-------- + fs/affs/inode.c | 34 ++++++++-------------------------- + fs/affs/namei.c | 6 ++++-- + fs/affs/super.c | 18 +++++++++++------- + fs/inode.c | 3 --- + include/linux/fs.h | 5 ----- + 9 files changed, 41 insertions(+), 60 deletions(-) +Merging sound/master +$ git merge sound/master +Merge made by recursive. + include/sound/soc-dapm.h | 2 + + sound/soc/codecs/tlv320aic3x.c | 278 +++++++++++++++++++----------------- + sound/soc/codecs/tlv320aic3x.h | 51 +++++++ + sound/soc/s3c24xx/neo1973_wm8753.c | 46 ++++++ + sound/soc/soc-dapm.c | 23 +++ + 5 files changed, 266 insertions(+), 134 deletions(-) +Merging arm/devel +$ git merge arm/devel +Removed arch/arm/common/rtctime.c +Removed arch/arm/mach-integrator/time.c +Auto-merged arch/arm/mach-pxa/pxa25x.c +Auto-merged arch/arm/mach-pxa/pxa27x.c +Auto-merged arch/arm/mach-pxa/pxa3xx.c +Auto-merged drivers/pcmcia/pxa2xx_mainstone.c +Removed include/asm-arm/dyntick.h +Removed include/asm-arm/rtc.h +Auto-merged kernel/hrtimer.c +Auto-merged kernel/sysctl.c +Merge made by recursive. + arch/arm/Kconfig | 24 +-- + arch/arm/common/Makefile | 1 - + arch/arm/common/rtctime.c | 434 ------------------------------ + arch/arm/common/sharpsl_pm.c | 2 + + arch/arm/configs/at91cap9adk_defconfig | 1 - + arch/arm/configs/at91rm9200dk_defconfig | 1 - + arch/arm/configs/at91rm9200ek_defconfig | 1 - + arch/arm/configs/at91sam9260ek_defconfig | 1 - + arch/arm/configs/at91sam9261ek_defconfig | 1 - + arch/arm/configs/at91sam9263ek_defconfig | 1 - + arch/arm/configs/at91sam9rlek_defconfig | 1 - + arch/arm/configs/ateb9200_defconfig | 1 - + arch/arm/configs/cm_x270_defconfig | 1 - + arch/arm/configs/collie_defconfig | 1 - + arch/arm/configs/corgi_defconfig | 1 - + arch/arm/configs/ecbat91_defconfig | 1 - + arch/arm/configs/em_x270_defconfig | 1 - + arch/arm/configs/ep93xx_defconfig | 1 - + arch/arm/configs/eseries_pxa_defconfig | 1 - + arch/arm/configs/iop13xx_defconfig | 1 - + arch/arm/configs/iop32x_defconfig | 1 - + arch/arm/configs/iop33x_defconfig | 1 - + arch/arm/configs/ixp2000_defconfig | 1 - + arch/arm/configs/ixp23xx_defconfig | 1 - + arch/arm/configs/kafa_defconfig | 1 - + arch/arm/configs/kb9202_defconfig | 1 - + arch/arm/configs/ks8695_defconfig | 1 - + arch/arm/configs/lpd270_defconfig | 1 - + arch/arm/configs/lpd7a404_defconfig | 1 - + arch/arm/configs/netx_defconfig | 1 - + arch/arm/configs/onearm_defconfig | 1 - + arch/arm/configs/picotux200_defconfig | 1 - + arch/arm/configs/pnx4008_defconfig | 1 - + arch/arm/configs/realview-smp_defconfig | 1 - + arch/arm/configs/realview_defconfig | 1 - + arch/arm/configs/rpc_defconfig | 1 - + arch/arm/configs/s3c2410_defconfig | 1 - + arch/arm/configs/sam9_l9260_defconfig | 1 - + arch/arm/configs/spitz_defconfig | 1 - + arch/arm/configs/tct_hammer_defconfig | 1 - + arch/arm/configs/trizeps4_defconfig | 1 - + arch/arm/configs/versatile_defconfig | 1 - + arch/arm/kernel/ecard.c | 13 +- + arch/arm/kernel/ecard.h | 13 + + arch/arm/kernel/process.c | 4 +- + arch/arm/kernel/time.c | 120 -------- + arch/arm/mach-integrator/Makefile | 2 +- + arch/arm/mach-integrator/time.c | 223 --------------- + arch/arm/mach-omap1/pm.c | 7 - + arch/arm/mach-omap2/pm.c | 7 - + arch/arm/mach-pxa/Kconfig | 13 +- + arch/arm/mach-pxa/Makefile | 1 + + arch/arm/mach-pxa/corgi_pm.c | 2 + + arch/arm/mach-pxa/devices.c | 60 ++++ + arch/arm/mach-pxa/devices.h | 5 + + arch/arm/mach-pxa/em-x270.c | 1 + + arch/arm/mach-pxa/lpd270.c | 9 +- + arch/arm/mach-pxa/mainstone.c | 63 ++---- + arch/arm/mach-pxa/pwm.c | 299 ++++++++++++++++++++ + arch/arm/mach-pxa/pxa25x.c | 6 +- + arch/arm/mach-pxa/pxa27x.c | 7 +- + arch/arm/mach-pxa/pxa3xx.c | 6 +- + arch/arm/mach-pxa/spitz_pm.c | 2 + + arch/arm/mach-pxa/zylonite.c | 26 ++- + arch/arm/mach-pxa/zylonite_pxa300.c | 4 +- + arch/arm/mach-pxa/zylonite_pxa320.c | 2 +- + arch/sh/configs/landisk_defconfig | 1 - + arch/sh/configs/lboxre2_defconfig | 1 - + arch/sh/configs/se7705_defconfig | 1 - + arch/sh/configs/se7712_defconfig | 1 - + arch/sh/configs/se7750_defconfig | 1 - + drivers/net/arm/etherh.c | 2 +- + drivers/pcmcia/pxa2xx_cm_x270.c | 15 +- + drivers/pcmcia/pxa2xx_mainstone.c | 13 +- + drivers/pcmcia/pxa2xx_sharpsl.c | 12 +- + drivers/rtc/Kconfig | 10 + + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-at91rm9200.c | 4 - + drivers/rtc/rtc-at91sam9.c | 1 - + drivers/rtc/rtc-omap.c | 1 - + drivers/rtc/rtc-pl030.c | 217 +++++++++++++++ + drivers/rtc/rtc-pl031.c | 36 +-- + drivers/rtc/rtc-s3c.c | 4 - + drivers/rtc/rtc-sa1100.c | 37 +++- + drivers/scsi/arm/Kconfig | 2 +- + drivers/scsi/arm/acornscsi-io.S | 15 +- + drivers/scsi/arm/acornscsi.c | 426 +++++++++++++---------------- + drivers/scsi/arm/acornscsi.h | 9 +- + drivers/usb/gadget/pxa2xx_udc.c | 10 +- + drivers/video/backlight/Kconfig | 7 + + drivers/video/backlight/Makefile | 1 + + drivers/video/backlight/pwm_bl.c | 143 ++++++++++ + include/asm-arm/arch-pxa/pxa-regs.h | 412 ---------------------------- + include/asm-arm/arch-pxa/pxa25x-udc.h | 163 +++++++++++ + include/asm-arm/arch-pxa/pxa27x-udc.h | 256 ++++++++++++++++++ + include/asm-arm/arch-pxa/zylonite.h | 1 - + include/asm-arm/arch-rpc/io.h | 5 +- + include/asm-arm/dyntick.h | 6 - + include/asm-arm/ecard.h | 35 --- + include/asm-arm/hw_irq.h | 11 - + include/asm-arm/mach/time.h | 22 -- + include/asm-arm/rtc.h | 43 --- + include/linux/pwm.h | 31 +++ + include/linux/pwm_backlight.h | 14 + + kernel/hrtimer.c | 2 +- + kernel/sysctl.c | 12 - + kernel/timer.c | 10 +- + 107 files changed, 1595 insertions(+), 1793 deletions(-) + delete mode 100644 arch/arm/common/rtctime.c + delete mode 100644 arch/arm/mach-integrator/time.c + create mode 100644 arch/arm/mach-pxa/pwm.c + create mode 100644 drivers/rtc/rtc-pl030.c + create mode 100644 drivers/video/backlight/pwm_bl.c + create mode 100644 include/asm-arm/arch-pxa/pxa25x-udc.h + create mode 100644 include/asm-arm/arch-pxa/pxa27x-udc.h + delete mode 100644 include/asm-arm/dyntick.h + delete mode 100644 include/asm-arm/rtc.h + create mode 100644 include/linux/pwm.h + create mode 100644 include/linux/pwm_backlight.h +Merging cpufreq/master +$ git merge cpufreq/master +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Already up-to-date. +Merging quilt/rr +$ git merge quilt/rr +Auto-merged drivers/input/serio/hp_sdc_mlc.c +Auto-merged drivers/usb/core/usb.c +Auto-merged include/linux/usb.h +Auto-merged kernel/printk.c +Merge made by recursive. + Documentation/DocBook/kernel-locking.tmpl | 2 +- + Documentation/lguest/lguest.c | 23 +++++++---- + arch/ia64/kernel/salinfo.c | 4 +- + drivers/char/snsc.c | 4 +- + drivers/char/viotape.c | 4 +- + drivers/infiniband/core/user_mad.c | 2 +- + drivers/input/serio/hil_mlc.c | 4 +- + drivers/input/serio/hp_sdc_mlc.c | 14 +++--- + drivers/lguest/lguest_device.c | 3 +- + drivers/md/dm-raid1.c | 2 +- + drivers/net/3c527.c | 2 +- + drivers/net/irda/sir_dev.c | 2 +- + drivers/net/ps3_gelic_wireless.c | 2 +- + drivers/net/virtio_net.c | 58 +++++++++++++++++++++++++++-- + drivers/net/wireless/airo.c | 12 +++--- + drivers/s390/kvm/kvm_virtio.c | 42 ++++++++++++-------- + drivers/scsi/aacraid/commsup.c | 2 +- + drivers/usb/core/usb.c | 2 +- + drivers/usb/gadget/inode.c | 2 +- + drivers/virtio/virtio.c | 5 ++ + drivers/virtio/virtio_pci.c | 6 ++- + drivers/virtio/virtio_ring.c | 28 ++++++++++---- + drivers/watchdog/ar7_wdt.c | 2 +- + drivers/watchdog/it8712f_wdt.c | 2 +- + drivers/watchdog/s3c2410_wdt.c | 2 +- + drivers/watchdog/sc1200wdt.c | 2 +- + drivers/watchdog/scx200_wdt.c | 2 +- + drivers/watchdog/wdt_pci.c | 2 +- + fs/ocfs2/inode.c | 4 -- + fs/reiserfs/journal.c | 2 +- + fs/xfs/linux-2.6/sema.h | 8 +-- + fs/xfs/linux-2.6/xfs_buf.c | 4 +- + include/linux/compiler-gcc.h | 19 +++++++++ + include/linux/compiler-intel.h | 2 + + include/linux/kernel.h | 35 +++++++++++++++++ + include/linux/kthread.h | 29 +++++++++++++- + include/linux/mutex.h | 4 -- + include/linux/semaphore.h | 7 +++- + include/linux/stop_machine.h | 19 +++++++-- + include/linux/timer.h | 32 +++++++++++---- + include/linux/usb.h | 2 +- + include/linux/virtio_config.h | 7 +++ + include/linux/virtio_ring.h | 15 +++++++- + kernel/kthread.c | 29 ++------------ + kernel/mutex.c | 4 +- + kernel/printk.c | 4 +- + kernel/semaphore.c | 17 ++++---- + kernel/stop_machine.c | 36 +++++++++++++---- + 48 files changed, 358 insertions(+), 158 deletions(-) +Merging semaphore/semaphore +$ git merge semaphore/semaphore +Auto-merged Documentation/DocBook/kernel-locking.tmpl +CONFLICT (content): Merge conflict in Documentation/DocBook/kernel-locking.tmpl +Auto-merged drivers/input/misc/hp_sdc_rtc.c +Auto-merged drivers/input/serio/hp_sdc.c +Auto-merged include/linux/semaphore.h +Recorded preimage for 'Documentation/DocBook/kernel-locking.tmpl' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/kernel-locking.tmpl | 57 ++++++++++++----------------- + drivers/input/keyboard/hil_kbd.c | 2 +- + drivers/input/misc/hp_sdc_rtc.c | 1 + + drivers/input/serio/hp_sdc.c | 1 + + include/asm-alpha/semaphore.h | 1 + + include/asm-arm/semaphore.h | 1 + + include/asm-avr32/semaphore.h | 1 + + include/asm-blackfin/semaphore.h | 1 + + include/asm-cris/semaphore.h | 1 + + include/asm-frv/semaphore.h | 1 + + include/asm-h8300/semaphore.h | 1 + + include/asm-ia64/semaphore.h | 1 + + include/asm-m32r/semaphore.h | 1 + + include/asm-m68k/semaphore.h | 1 + + include/asm-m68knommu/semaphore.h | 1 + + include/asm-mips/semaphore.h | 1 + + include/asm-mn10300/semaphore.h | 1 + + include/asm-parisc/semaphore.h | 1 + + include/asm-powerpc/semaphore.h | 1 + + include/asm-s390/semaphore.h | 1 + + include/asm-sh/semaphore.h | 1 + + include/asm-sparc/semaphore.h | 1 + + include/asm-sparc64/semaphore.h | 1 + + include/asm-um/semaphore.h | 1 + + include/asm-v850/semaphore.h | 1 + + include/asm-x86/semaphore.h | 1 + + include/asm-xtensa/semaphore.h | 1 + + include/linux/semaphore.h | 6 +-- + 28 files changed, 52 insertions(+), 38 deletions(-) +Merging semaphore-removal/semaphore-removal +$ git merge semaphore-removal/semaphore-removal +Auto-merged drivers/atm/ambassador.c +CONFLICT (content): Merge conflict in drivers/atm/ambassador.c +Auto-merged drivers/net/bonding/bond_main.c +Auto-merged drivers/net/ppp_async.c +Auto-merged drivers/net/ps3_gelic_wireless.c +CONFLICT (content): Merge conflict in drivers/net/ps3_gelic_wireless.c +Auto-merged drivers/scsi/qla2xxx/qla_attr.c +Auto-merged drivers/scsi/qla2xxx/qla_mbx.c +Auto-merged drivers/scsi/qla2xxx/qla_os.c +Auto-merged sound/soc/s3c24xx/s3c2443-ac97.c +Recorded preimage for 'drivers/net/ps3_gelic_wireless.c' +Resolved 'drivers/atm/ambassador.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-lh7a40x/clocks.c | 15 +++++++------ + drivers/atm/ambassador.c | 1 + + drivers/net/bonding/bond_main.c | 21 +++++++++-------- + drivers/net/bonding/bond_sysfs.c | 17 +++++++------- + drivers/net/ppp_async.c | 8 +++--- + drivers/net/ps3_gelic_net.c | 11 +++++---- + drivers/net/ps3_gelic_net.h | 2 +- + drivers/net/ps3_gelic_wireless.c | 41 ++++++++++++++++++----------------- + drivers/net/ps3_gelic_wireless.h | 4 +- + drivers/pci/hotplug/ibmphp_hpc.c | 30 ++++++++++++------------- + drivers/scsi/qla2xxx/qla_attr.c | 4 +- + drivers/scsi/qla2xxx/qla_def.h | 3 +- + drivers/scsi/qla2xxx/qla_mbx.c | 4 +- + drivers/scsi/qla2xxx/qla_mid.c | 18 +++++++------- + drivers/scsi/qla2xxx/qla_os.c | 14 +++++++----- + include/net/bluetooth/hci_core.h | 7 +++-- + net/9p/trans_virtio.c | 44 +++++++++++++++++++------------------ + net/bluetooth/hci_core.c | 2 +- + sound/soc/s3c24xx/s3c2443-ac97.c | 11 +++++---- + 19 files changed, 133 insertions(+), 124 deletions(-) +Applying idr.h needs spinlock.h +Merging x86-latest/latest +$ git merge x86-latest/latest +Auto-merged Documentation/kernel-parameters.txt +Auto-merged MAINTAINERS +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/Kconfig.debug +Auto-merged arch/x86/kernel/Makefile +Auto-merged arch/x86/kernel/entry_32.S +Auto-merged arch/x86/kernel/entry_64.S +Auto-merged arch/x86/kernel/process_32.c +Auto-merged arch/x86/kernel/process_64.c +Auto-merged arch/x86/kernel/traps_32.c +Auto-merged arch/x86/kernel/traps_64.c +Auto-merged arch/x86/mm/fault.c +Auto-merged arch/x86/mm/init_32.c +Auto-merged arch/x86/mm/init_64.c +Auto-merged arch/x86/mm/ioremap.c +Auto-merged arch/x86/pci/acpi.c +Auto-merged arch/x86/pci/common.c +Auto-merged drivers/base/power/trace.c +Removed include/asm-x86/hw_irq_32.h +Removed include/asm-x86/hw_irq_64.h +Removed include/asm-x86/irq_32.h +Removed include/asm-x86/irq_64.h +Removed include/asm-x86/mach-default/irq_vectors.h +Removed include/asm-x86/mach-default/irq_vectors_limits.h +Removed include/asm-x86/mach-visws/irq_vectors.h +Removed include/asm-x86/mach-voyager/irq_vectors.h +Removed include/asm-x86/thread_info_32.h +Removed include/asm-x86/thread_info_64.h +Auto-merged include/linux/ide.h +Auto-merged include/linux/kernel.h +Auto-merged include/linux/pci.h +Auto-merged include/linux/sched.h +Auto-merged init/main.c +Auto-merged kernel/fork.c +Auto-merged kernel/printk.c +Auto-merged kernel/sched.c +Auto-merged kernel/sysctl.c +Auto-merged lib/Kconfig.debug +Auto-merged net/core/skbuff.c +Merge made by recursive. + Documentation/filesystems/sysfs-pci.txt | 1 + + Documentation/kernel-parameters.txt | 23 + + Documentation/kmemcheck.txt | 101 ++ + Documentation/x86_64/mm.txt | 5 +- + MAINTAINERS | 8 + + arch/avr32/kernel/vmlinux.lds.S | 2 - + arch/parisc/kernel/vmlinux.lds.S | 1 - + arch/powerpc/kernel/vmlinux.lds.S | 2 - + arch/s390/kernel/vmlinux.lds.S | 1 - + arch/sh/kernel/vmlinux_32.lds.S | 1 - + arch/sh/kernel/vmlinux_64.lds.S | 1 - + arch/um/Kconfig | 50 +- + arch/um/Kconfig.char | 6 +- + arch/um/Kconfig.i386 | 9 +- + arch/x86/Kconfig | 96 +- + arch/x86/Kconfig.cpu | 24 +- + arch/x86/Kconfig.debug | 65 + + arch/x86/Makefile | 6 +- + arch/x86/Makefile_32.cpu | 3 +- + arch/x86/boot/printf.c | 2 +- + arch/x86/configs/i386_defconfig | 1711 +++++++++++++++------ + arch/x86/configs/x86_64_defconfig | 1735 +++++++++++++++------ + arch/x86/kernel/Makefile | 3 + + arch/x86/kernel/acpi/boot.c | 4 - + arch/x86/kernel/aperture_64.c | 283 +++-- + arch/x86/kernel/apic_32.c | 18 +- + arch/x86/kernel/apic_64.c | 8 +- + arch/x86/kernel/cpu/common.c | 9 +- + arch/x86/kernel/cpu/intel.c | 3 +- + arch/x86/kernel/cpu/mtrr/generic.c | 36 +- + arch/x86/kernel/cpu/mtrr/main.c | 884 ++++++++++- + arch/x86/kernel/cpu/mtrr/mtrr.h | 3 + + arch/x86/kernel/ds.c | 953 ++++++++---- + arch/x86/kernel/e820_32.c | 70 +- + arch/x86/kernel/e820_64.c | 46 +- + arch/x86/kernel/early_printk.c | 2 +- + arch/x86/kernel/entry_32.S | 10 +- + arch/x86/kernel/entry_64.S | 8 +- + arch/x86/kernel/head_32.S | 2 +- + arch/x86/kernel/i8259_64.c | 46 +- + arch/x86/kernel/io_apic_32.c | 4 +- + arch/x86/kernel/io_apic_64.c | 8 +- + arch/x86/kernel/irq_32.c | 38 + + arch/x86/kernel/irq_64.c | 28 + + arch/x86/kernel/kmemcheck.c | 918 +++++++++++ + arch/x86/kernel/ldt.c | 6 +- + arch/x86/kernel/mmconf-fam10h_64.c | 1 + + arch/x86/kernel/mpparse.c | 17 +- + arch/x86/kernel/nmi_32.c | 29 +- + arch/x86/kernel/nmi_64.c | 4 +- + arch/x86/kernel/pci-dma.c | 13 +- + arch/x86/kernel/pci-gart_64.c | 23 +- + arch/x86/kernel/process.c | 2 +- + arch/x86/kernel/process_32.c | 54 +- + arch/x86/kernel/process_64.c | 50 +- + arch/x86/kernel/ptrace.c | 444 ++++--- + arch/x86/kernel/reboot.c | 18 +- + arch/x86/kernel/reboot_fixups_32.c | 4 +- + arch/x86/kernel/setup_32.c | 57 +- + arch/x86/kernel/setup_64.c | 22 +- + arch/x86/kernel/smpboot.c | 5 +- + arch/x86/kernel/traps_32.c | 18 +- + arch/x86/kernel/traps_64.c | 24 +- + arch/x86/kernel/tsc_64.c | 2 +- + arch/x86/kernel/vm86_32.c | 7 +- + arch/x86/kernel/vmiclock_32.c | 3 +- + arch/x86/kernel/vmlinux_32.lds.S | 16 +- + arch/x86/kernel/vmlinux_64.lds.S | 17 +- + arch/x86/kernel/vsmp_64.c | 3 + + arch/x86/mach-visws/visws_apic.c | 3 +- + arch/x86/mach-voyager/voyager_smp.c | 2 +- + arch/x86/mm/dump_pagetables.c | 2 +- + arch/x86/mm/fault.c | 37 +- + arch/x86/mm/init_32.c | 15 +- + arch/x86/mm/init_64.c | 6 +- + arch/x86/mm/ioremap.c | 10 +- + arch/x86/mm/k8topology_64.c | 13 +- + arch/x86/mm/numa_64.c | 38 +- + arch/x86/mm/srat_64.c | 3 +- + arch/x86/pci/acpi.c | 18 +- + arch/x86/pci/k8-bus_64.c | 8 - + arch/x86/pci/mmconfig-shared.c | 2 +- + drivers/base/power/trace.c | 2 +- + drivers/char/agp/amd64-agp.c | 77 +- + drivers/input/misc/pcspkr.c | 16 +- + drivers/pci/pci-sysfs.c | 84 +- + fs/proc/proc_misc.c | 9 + + include/asm-generic/vmlinux.lds.h | 21 + + include/asm-x86/desc.h | 22 + + include/asm-x86/ds.h | 258 +++- + include/asm-x86/e820_32.h | 6 +- + include/asm-x86/e820_64.h | 2 +- + include/asm-x86/fixmap_32.h | 8 +- + include/asm-x86/gart.h | 38 + + include/asm-x86/genapic_64.h | 2 + + include/asm-x86/hardirq.h | 6 + + include/asm-x86/hw_irq.h | 105 ++- + include/asm-x86/hw_irq_32.h | 66 - + include/asm-x86/hw_irq_64.h | 173 -- + include/asm-x86/i8253.h | 31 +- + include/asm-x86/irq.h | 51 +- + include/asm-x86/irq_32.h | 51 - + include/asm-x86/irq_64.h | 51 - + include/asm-x86/irq_vectors.h | 166 ++ + include/asm-x86/kdebug.h | 3 +- + include/asm-x86/kmemcheck.h | 30 + + include/asm-x86/mach-default/irq_vectors.h | 96 -- + include/asm-x86/mach-default/irq_vectors_limits.h | 16 - + include/asm-x86/mach-visws/irq_vectors.h | 62 - + include/asm-x86/mach-voyager/irq_vectors.h | 79 - + include/asm-x86/mmconfig.h | 12 + + include/asm-x86/page.h | 10 +- + include/asm-x86/page_32.h | 8 + + include/asm-x86/pci.h | 2 + + include/asm-x86/pda.h | 2 - + include/asm-x86/pgalloc.h | 32 +- + include/asm-x86/pgtable.h | 33 +- + include/asm-x86/pgtable_32.h | 6 + + include/asm-x86/pgtable_64.h | 6 + + include/asm-x86/processor.h | 12 +- + include/asm-x86/ptrace-abi.h | 14 +- + include/asm-x86/ptrace.h | 38 +- + include/asm-x86/reboot.h | 2 +- + include/asm-x86/required-features.h | 6 +- + include/asm-x86/resume-trace.h | 2 +- + include/asm-x86/stackprotector.h | 38 + + include/asm-x86/string_32.h | 313 +++-- + include/asm-x86/string_64.h | 1 + + include/asm-x86/system.h | 115 +- + include/asm-x86/thread_info.h | 248 +++- + include/asm-x86/thread_info_32.h | 205 --- + include/asm-x86/thread_info_64.h | 195 --- + include/asm-x86/vm86.h | 13 +- + include/linux/gfp.h | 3 +- + include/linux/ide.h | 3 +- + include/linux/kernel.h | 2 +- + include/linux/kernel_stat.h | 2 +- + include/linux/kmemcheck.h | 29 + + include/linux/magic.h | 1 + + include/linux/mm_types.h | 4 + + include/linux/pci.h | 1 + + include/linux/pci_ids.h | 2 + + include/linux/percpu.h | 7 + + include/linux/resume-trace.h | 2 +- + include/linux/sched.h | 16 +- + include/linux/slab.h | 7 + + include/linux/slub_kmemcheck.h | 32 + + include/linux/stackprotector.h | 16 + + init/main.c | 9 + + kernel/exit.c | 5 +- + kernel/fork.c | 21 +- + kernel/panic.c | 77 +- + kernel/printk.c | 2 +- + kernel/sched.c | 7 +- + kernel/sysctl.c | 12 + + lib/Kconfig.debug | 1 - + localversion-x86-latest.git | 1 + + mm/Makefile | 3 + + mm/slub.c | 19 +- + mm/slub_kmemcheck.c | 107 ++ + net/core/skbuff.c | 2 +- + 161 files changed, 8109 insertions(+), 3361 deletions(-) + create mode 100644 Documentation/kmemcheck.txt + create mode 100644 arch/x86/kernel/kmemcheck.c + delete mode 100644 include/asm-x86/hw_irq_32.h + delete mode 100644 include/asm-x86/hw_irq_64.h + delete mode 100644 include/asm-x86/irq_32.h + delete mode 100644 include/asm-x86/irq_64.h + create mode 100644 include/asm-x86/irq_vectors.h + create mode 100644 include/asm-x86/kmemcheck.h + delete mode 100644 include/asm-x86/mach-default/irq_vectors.h + delete mode 100644 include/asm-x86/mach-default/irq_vectors_limits.h + delete mode 100644 include/asm-x86/mach-visws/irq_vectors.h + delete mode 100644 include/asm-x86/mach-voyager/irq_vectors.h + create mode 100644 include/asm-x86/mmconfig.h + create mode 100644 include/asm-x86/stackprotector.h + delete mode 100644 include/asm-x86/thread_info_32.h + delete mode 100644 include/asm-x86/thread_info_64.h + create mode 100644 include/linux/kmemcheck.h + create mode 100644 include/linux/slub_kmemcheck.h + create mode 100644 include/linux/stackprotector.h + create mode 100644 localversion-x86-latest.git + create mode 100644 mm/slub_kmemcheck.c +Merging sched-latest/latest +$ git merge sched-latest/latest +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/x86/kernel/traps_32.c +Auto-merged arch/x86/kernel/traps_64.c +Auto-merged arch/x86/kvm/x86.c +Auto-merged include/linux/kernel.h +Auto-merged include/linux/stop_machine.h +CONFLICT (content): Merge conflict in include/linux/stop_machine.h +Auto-merged init/main.c +Auto-merged kernel/Makefile +Auto-merged kernel/cpu.c +Auto-merged kernel/kthread.c +Auto-merged kernel/printk.c +Auto-merged kernel/stop_machine.c +Auto-merged kernel/sysctl.c +Auto-merged kernel/timer.c +Auto-merged lib/Kconfig.debug +Recorded preimage for 'include/linux/stop_machine.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + Documentation/RCU/NMI-RCU.txt | 3 + + Documentation/RCU/RTFP.txt | 108 ++++ + Documentation/RCU/checklist.txt | 89 ++- + Documentation/RCU/whatisRCU.txt | 58 ++- + Documentation/immediate.txt | 221 +++++++ + Documentation/kernel-parameters.txt | 3 + + Documentation/markers.txt | 17 +- + arch/alpha/kernel/irq.c | 2 +- + arch/ia64/kernel/kprobes.c | 2 - + arch/ia64/sn/kernel/irq.c | 1 + + arch/powerpc/Kconfig | 1 + + arch/powerpc/kernel/Makefile | 1 + + arch/powerpc/kernel/immediate.c | 70 +++ + arch/powerpc/kernel/kprobes.c | 2 - + arch/s390/kernel/kprobes.c | 2 - + arch/x86/Kconfig | 40 ++- + arch/x86/Kconfig.debug | 2 +- + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/apic_32.c | 9 +- + arch/x86/kernel/apic_64.c | 11 +- + arch/x86/kernel/asm-offsets_32.c | 1 + + arch/x86/kernel/asm-offsets_64.c | 1 + + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 6 +- + arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 6 +- + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 8 +- + arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c | 10 +- + arch/x86/kernel/cpu/cpufreq/speedstep-ich.c | 4 +- + arch/x86/kernel/cpu/intel_cacheinfo.c | 2 +- + arch/x86/kernel/cpu/mcheck/mce_amd_64.c | 4 +- + arch/x86/kernel/entry_32.S | 30 + + arch/x86/kernel/entry_64.S | 34 +- + arch/x86/kernel/head64.c | 22 +- + arch/x86/kernel/immediate.c | 545 +++++++++++++++++ + arch/x86/kernel/io_apic_64.c | 8 +- + arch/x86/kernel/kprobes.c | 2 - + arch/x86/kernel/nmi_64.c | 4 +- + arch/x86/kernel/paravirt.c | 3 + + arch/x86/kernel/paravirt_patch_32.c | 6 +- + arch/x86/kernel/paravirt_patch_64.c | 6 +- + arch/x86/kernel/setup.c | 296 +++++++++- + arch/x86/kernel/setup64.c | 8 +- + arch/x86/kernel/setup_32.c | 24 - + arch/x86/kernel/setup_64.c | 9 - + arch/x86/kernel/smpboot.c | 87 ++-- + arch/x86/kernel/traps_32.c | 11 +- + arch/x86/kernel/traps_64.c | 4 + + arch/x86/kernel/vmi_32.c | 2 + + arch/x86/kernel/vmlinux_32.lds.S | 1 + + arch/x86/kernel/vmlinux_64.lds.S | 1 + + arch/x86/kvm/x86.c | 2 +- + arch/x86/lguest/boot.c | 1 + + arch/x86/mm/fault.c | 4 +- + arch/x86/mm/kmmio.c | 14 +- + arch/x86/mm/mmio-mod.c | 2 +- + arch/x86/mm/numa_64.c | 49 +-- + arch/x86/mm/srat_64.c | 2 +- + arch/x86/xen/enlighten.c | 1 + + arch/x86/xen/smp.c | 4 +- + crypto/async_tx/async_tx.c | 1 + + drivers/acpi/processor_throttling.c | 6 +- + drivers/base/cpu.c | 6 +- + drivers/base/topology.c | 25 +- + drivers/cpufreq/cpufreq.c | 14 +- + drivers/cpufreq/cpufreq_conservative.c | 2 +- + drivers/cpufreq/cpufreq_ondemand.c | 4 +- + drivers/infiniband/hw/ehca/ehca_irq.c | 4 +- + drivers/infiniband/hw/ipath/ipath_verbs.c | 1 + + drivers/infiniband/hw/ipath/ipath_verbs_mcast.c | 3 +- + drivers/net/macvlan.c | 2 +- + drivers/pci/pci-driver.c | 2 +- + fs/buffer.c | 3 + + fs/compat.c | 2 + + fs/exec.c | 2 + + fs/ioctl.c | 3 + + fs/open.c | 3 + + fs/read_write.c | 23 +- + fs/select.c | 5 + + include/asm-alpha/thread_info.h | 2 +- + include/asm-avr32/thread_info.h | 2 +- + include/asm-generic/vmlinux.lds.h | 9 +- + include/asm-powerpc/cacheflush.h | 4 +- + include/asm-powerpc/immediate.h | 76 +++ + include/asm-x86/immediate.h | 169 ++++++ + include/asm-x86/ipi.h | 2 +- + include/asm-x86/irqflags.h | 56 ++ + include/asm-x86/kdebug.h | 12 + + include/asm-x86/kprobes.h | 9 - + include/asm-x86/numa_64.h | 19 +- + include/asm-x86/paravirt.h | 7 +- + include/asm-x86/pda.h | 5 +- + include/asm-x86/percpu.h | 46 ++ + include/asm-x86/smp.h | 15 +- + include/asm-x86/topology.h | 152 +++-- + include/linux/cpumask.h | 97 +++- + include/linux/cpuset.h | 2 + + include/linux/dcache.h | 1 + + include/linux/hardirq.h | 27 +- + include/linux/immediate.h | 97 +++ + include/linux/irq.h | 7 - + include/linux/kernel.h | 6 - + include/linux/kprobes.h | 2 - + include/linux/list.h | 367 ------------ + include/linux/marker.h | 57 ++- + include/linux/memory.h | 7 + + include/linux/mm.h | 1 + + include/linux/module.h | 25 + + include/linux/profile.h | 5 +- + include/linux/rcuclassic.h | 3 + + include/linux/rculist.h | 373 ++++++++++++ + include/linux/rcupdate.h | 26 +- + include/linux/rcupreempt.h | 42 ++- + include/linux/sched.h | 67 +-- + include/linux/stringify.h | 5 + + include/linux/swapops.h | 8 + + include/linux/writeback.h | 2 + + init/Kconfig | 18 + + init/main.c | 10 + + ipc/msg.c | 6 +- + ipc/sem.c | 6 +- + ipc/shm.c | 6 +- + kernel/Makefile | 1 + + kernel/cpu.c | 2 +- + kernel/cpuset.c | 115 ++++- + kernel/exit.c | 8 + + kernel/fork.c | 5 + + kernel/immediate.c | 147 +++++ + kernel/irq/handle.c | 7 + + kernel/irq/manage.c | 65 ++ + kernel/itimer.c | 13 + + kernel/kprobes.c | 46 ++- + kernel/kthread.c | 55 ++- + kernel/lockdep.c | 20 + + kernel/marker.c | 38 +- + kernel/module.c | 83 +++- + kernel/pid.c | 1 + + kernel/printk.c | 130 +++-- + kernel/profile.c | 22 +- + kernel/rcuclassic.c | 32 +- + kernel/rcupdate.c | 71 ++- + kernel/rcupreempt.c | 428 ++++++++++++-- + kernel/sched.c | 163 +++--- + kernel/sched_clock.c | 8 + + kernel/sched_debug.c | 95 ++- + kernel/sched_fair.c | 681 +++++++++++++++++----- + kernel/sched_features.h | 7 +- + kernel/sched_rt.c | 6 +- + kernel/sched_trace.h | 41 ++ + kernel/signal.c | 3 + + kernel/softirq.c | 23 + + kernel/softlockup.c | 39 ++- + kernel/stacktrace.c | 3 + + kernel/sysctl.c | 20 +- + kernel/taskstats.c | 4 +- + kernel/time/clocksource.c | 4 +- + kernel/time/tick-broadcast.c | 3 +- + kernel/timer.c | 13 +- + kernel/trace/trace.c | 46 ++- + kernel/trace/trace.h | 20 +- + kernel/trace/trace_sched_switch.c | 171 +++++- + kernel/trace/trace_sched_wakeup.c | 106 ++++- + kernel/workqueue.c | 6 +- + lib/Kconfig.debug | 26 +- + lib/cpumask.c | 9 + + lib/textsearch.c | 1 + + localversion-sched-devel.git | 1 + + mm/allocpercpu.c | 4 +- + mm/filemap.c | 7 + + mm/hugetlb.c | 3 + + mm/memory.c | 75 +++- + mm/page-writeback.c | 10 +- + mm/page_alloc.c | 9 + + mm/page_io.c | 6 + + mm/swapfile.c | 23 + + mm/vmstat.c | 2 +- + net/802/psnap.c | 1 + + net/8021q/vlan.c | 1 + + net/bridge/br_fdb.c | 1 + + net/bridge/br_stp.c | 1 + + net/core/dev.c | 10 +- + net/ipv4/devinet.c | 6 + + net/iucv/iucv.c | 2 +- + net/netlabel/netlabel_domainhash.c | 3 +- + net/socket.c | 19 + + net/sunrpc/svc.c | 2 +- + tests/rcutorture.c | 34 +- + 185 files changed, 5392 insertions(+), 1451 deletions(-) + create mode 100644 Documentation/immediate.txt + create mode 100644 arch/powerpc/kernel/immediate.c + create mode 100644 arch/x86/kernel/immediate.c + create mode 100644 include/asm-powerpc/immediate.h + create mode 100644 include/asm-x86/immediate.h + create mode 100644 include/linux/immediate.h + create mode 100644 include/linux/rculist.h + create mode 100644 kernel/immediate.c + create mode 100644 kernel/sched_trace.h + create mode 100644 localversion-sched-devel.git +Merging quilt/ldp +$ git merge quilt/ldp +Auto-merged drivers/media/video/Kconfig +Auto-merged drivers/misc/Makefile +Merge made by recursive. + drivers/hid/usbhid/hid-quirks.c | 2 + + drivers/input/misc/Kconfig | 12 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/appleir.c | 361 + + drivers/media/dvb/Kconfig | 2 + + drivers/media/dvb/Makefile | 2 +- + drivers/media/dvb/firesat/Kconfig | 11 + + drivers/media/dvb/firesat/Makefile | 12 + + drivers/media/dvb/firesat/avc_api.c | 813 + + drivers/media/dvb/firesat/avc_api.h | 380 + + drivers/media/dvb/firesat/cmp.c | 230 + + drivers/media/dvb/firesat/cmp.h | 9 + + drivers/media/dvb/firesat/firesat-ci.c | 95 + + drivers/media/dvb/firesat/firesat-ci.h | 9 + + drivers/media/dvb/firesat/firesat-rc.c | 82 + + drivers/media/dvb/firesat/firesat-rc.h | 9 + + drivers/media/dvb/firesat/firesat.h | 85 + + drivers/media/dvb/firesat/firesat_1394.c | 468 + + drivers/media/dvb/firesat/firesat_dvb.c | 327 + + drivers/media/dvb/firesat/firesat_fe.c | 263 + + drivers/media/video/Kconfig | 1 + + drivers/media/video/Makefile | 2 + + drivers/media/video/go7007/Kconfig | 14 + + drivers/media/video/go7007/Makefile | 17 + + drivers/media/video/go7007/go7007-driver.c | 693 + + drivers/media/video/go7007/go7007-fw.c | 1643 ++ + drivers/media/video/go7007/go7007-i2c.c | 309 + + drivers/media/video/go7007/go7007-priv.h | 279 + + drivers/media/video/go7007/go7007-usb.c | 1229 + + drivers/media/video/go7007/go7007-v4l2.c | 1509 + + drivers/media/video/go7007/go7007.h | 120 + + drivers/media/video/go7007/saa7134-go7007.c | 484 + + drivers/media/video/go7007/snd-go7007.c | 315 + + drivers/media/video/go7007/wis-i2c.h | 55 + + drivers/media/video/go7007/wis-ov7640.c | 146 + + drivers/media/video/go7007/wis-saa7113.c | 378 + + drivers/media/video/go7007/wis-saa7115.c | 507 + + drivers/media/video/go7007/wis-sony-tuner.c | 757 + + drivers/media/video/go7007/wis-tw2804.c | 383 + + drivers/media/video/go7007/wis-tw9903.c | 378 + + drivers/media/video/go7007/wis-uda1342.c | 136 + + drivers/misc/Kconfig | 13 + + drivers/misc/Makefile | 2 + + drivers/misc/aectc/Makefile | 1 + + drivers/misc/aectc/aec_tc.c | 349 + + drivers/misc/aectc/aectc.h | 18 + + drivers/misc/aectc/read.c | 63 + + drivers/misc/aectc/write.c | 64 + + drivers/misc/me4000.c | 5435 ++++ + drivers/misc/me4000.h | 1014 + + drivers/misc/xilinx_firm.h |15416 ++++++++++ + drivers/net/Kconfig | 32 + + drivers/net/Makefile | 2 + + drivers/net/et131x/Makefile | 18 + + drivers/net/et131x/et1310_address_map.h | 2399 ++ + drivers/net/et131x/et1310_eeprom.c | 480 + + drivers/net/et131x/et1310_eeprom.h | 89 + + drivers/net/et131x/et1310_jagcore.c | 220 + + drivers/net/et131x/et1310_jagcore.h | 112 + + drivers/net/et131x/et1310_mac.c | 792 + + drivers/net/et131x/et1310_mac.h | 93 + + drivers/net/et131x/et1310_phy.c | 1281 + + drivers/net/et131x/et1310_phy.h | 910 + + drivers/net/et131x/et1310_pm.c | 207 + + drivers/net/et131x/et1310_pm.h | 125 + + drivers/net/et131x/et1310_rx.c | 1391 + + drivers/net/et131x/et1310_rx.h | 373 + + drivers/net/et131x/et1310_tx.c | 1525 + + drivers/net/et131x/et1310_tx.h | 242 + + drivers/net/et131x/et131x_adapter.h | 347 + + drivers/net/et131x/et131x_config.c | 325 + + drivers/net/et131x/et131x_config.h | 67 + + drivers/net/et131x/et131x_debug.c | 218 + + drivers/net/et131x/et131x_debug.h | 201 + + drivers/net/et131x/et131x_defs.h | 128 + + drivers/net/et131x/et131x_initpci.c | 1046 + + drivers/net/et131x/et131x_initpci.h | 73 + + drivers/net/et131x/et131x_isr.c | 488 + + drivers/net/et131x/et131x_isr.h | 65 + + drivers/net/et131x/et131x_netdev.c | 856 + + drivers/net/et131x/et131x_netdev.h | 64 + + drivers/net/et131x/et131x_version.h | 81 + + drivers/net/slicoss/Makefile | 1 + + drivers/net/slicoss/gbdownload.h | 8215 ++++++ + drivers/net/slicoss/gbrcvucode.h | 239 + + drivers/net/slicoss/oasisdbgdownload.h | 6850 +++++ + drivers/net/slicoss/oasisdownload.h | 6848 +++++ + drivers/net/slicoss/oasisrcvucode.h | 205 + + drivers/net/slicoss/slic.h | 619 + + drivers/net/slicoss/slic_os.h | 150 + + drivers/net/slicoss/slicbuild.h | 97 + + drivers/net/slicoss/slicdbg.h | 100 + + drivers/net/slicoss/slicdump.h | 282 + + drivers/net/slicoss/slichw.h | 855 + + drivers/net/slicoss/slicinc.h | 215 + + drivers/net/slicoss/slicoss.c | 6160 ++++ + drivers/net/usb/Kconfig | 10 + + drivers/net/usb/Makefile | 1 + + drivers/net/usb/hso.c | 3153 +++ + drivers/usb/image/Kconfig | 9 + + drivers/usb/image/Makefile | 1 + + drivers/usb/image/f2255usb.h |40334 +++++++++++++++++++++++++++ + drivers/usb/image/s2255drv.c | 2802 ++ + fs/Kconfig | 9 + + fs/Makefile | 1 + + fs/novfs/Makefile | 19 + + fs/novfs/commands.h | 1029 + + fs/novfs/daemon.c | 2229 ++ + fs/novfs/file.c | 1711 ++ + fs/novfs/inode.c | 5307 ++++ + fs/novfs/nwcapi.c | 2517 ++ + fs/novfs/nwcapi.h | 2208 ++ + fs/novfs/nwerror.h | 658 + + fs/novfs/proc.c | 140 + + fs/novfs/profile.c | 687 + + fs/novfs/scope.c | 675 + + fs/novfs/vfs.h | 438 + + 117 files changed, 143926 insertions(+), 1 deletions(-) + create mode 100644 drivers/input/misc/appleir.c + create mode 100644 drivers/media/dvb/firesat/Kconfig + create mode 100644 drivers/media/dvb/firesat/Makefile + create mode 100644 drivers/media/dvb/firesat/avc_api.c + create mode 100644 drivers/media/dvb/firesat/avc_api.h + create mode 100644 drivers/media/dvb/firesat/cmp.c + create mode 100644 drivers/media/dvb/firesat/cmp.h + create mode 100644 drivers/media/dvb/firesat/firesat-ci.c + create mode 100644 drivers/media/dvb/firesat/firesat-ci.h + create mode 100644 drivers/media/dvb/firesat/firesat-rc.c + create mode 100644 drivers/media/dvb/firesat/firesat-rc.h + create mode 100644 drivers/media/dvb/firesat/firesat.h + create mode 100644 drivers/media/dvb/firesat/firesat_1394.c + create mode 100644 drivers/media/dvb/firesat/firesat_dvb.c + create mode 100644 drivers/media/dvb/firesat/firesat_fe.c + create mode 100644 drivers/media/video/go7007/Kconfig + create mode 100644 drivers/media/video/go7007/Makefile + create mode 100644 drivers/media/video/go7007/go7007-driver.c + create mode 100644 drivers/media/video/go7007/go7007-fw.c + create mode 100644 drivers/media/video/go7007/go7007-i2c.c + create mode 100644 drivers/media/video/go7007/go7007-priv.h + create mode 100644 drivers/media/video/go7007/go7007-usb.c + create mode 100644 drivers/media/video/go7007/go7007-v4l2.c + create mode 100644 drivers/media/video/go7007/go7007.h + create mode 100644 drivers/media/video/go7007/saa7134-go7007.c + create mode 100644 drivers/media/video/go7007/snd-go7007.c + create mode 100644 drivers/media/video/go7007/wis-i2c.h + create mode 100644 drivers/media/video/go7007/wis-ov7640.c + create mode 100644 drivers/media/video/go7007/wis-saa7113.c + create mode 100644 drivers/media/video/go7007/wis-saa7115.c + create mode 100644 drivers/media/video/go7007/wis-sony-tuner.c + create mode 100644 drivers/media/video/go7007/wis-tw2804.c + create mode 100644 drivers/media/video/go7007/wis-tw9903.c + create mode 100644 drivers/media/video/go7007/wis-uda1342.c + create mode 100644 drivers/misc/aectc/Makefile + create mode 100644 drivers/misc/aectc/aec_tc.c + create mode 100644 drivers/misc/aectc/aectc.h + create mode 100644 drivers/misc/aectc/read.c + create mode 100644 drivers/misc/aectc/write.c + create mode 100644 drivers/misc/me4000.c + create mode 100644 drivers/misc/me4000.h + create mode 100644 drivers/misc/xilinx_firm.h + create mode 100644 drivers/net/et131x/Makefile + create mode 100644 drivers/net/et131x/et1310_address_map.h + create mode 100644 drivers/net/et131x/et1310_eeprom.c + create mode 100644 drivers/net/et131x/et1310_eeprom.h + create mode 100644 drivers/net/et131x/et1310_jagcore.c + create mode 100644 drivers/net/et131x/et1310_jagcore.h + create mode 100644 drivers/net/et131x/et1310_mac.c + create mode 100644 drivers/net/et131x/et1310_mac.h + create mode 100644 drivers/net/et131x/et1310_phy.c + create mode 100644 drivers/net/et131x/et1310_phy.h + create mode 100644 drivers/net/et131x/et1310_pm.c + create mode 100644 drivers/net/et131x/et1310_pm.h + create mode 100644 drivers/net/et131x/et1310_rx.c + create mode 100644 drivers/net/et131x/et1310_rx.h + create mode 100644 drivers/net/et131x/et1310_tx.c + create mode 100644 drivers/net/et131x/et1310_tx.h + create mode 100644 drivers/net/et131x/et131x_adapter.h + create mode 100644 drivers/net/et131x/et131x_config.c + create mode 100644 drivers/net/et131x/et131x_config.h + create mode 100644 drivers/net/et131x/et131x_debug.c + create mode 100644 drivers/net/et131x/et131x_debug.h + create mode 100644 drivers/net/et131x/et131x_defs.h + create mode 100644 drivers/net/et131x/et131x_initpci.c + create mode 100644 drivers/net/et131x/et131x_initpci.h + create mode 100644 drivers/net/et131x/et131x_isr.c + create mode 100644 drivers/net/et131x/et131x_isr.h + create mode 100644 drivers/net/et131x/et131x_netdev.c + create mode 100644 drivers/net/et131x/et131x_netdev.h + create mode 100644 drivers/net/et131x/et131x_version.h + create mode 100644 drivers/net/slicoss/Makefile + create mode 100644 drivers/net/slicoss/gbdownload.h + create mode 100644 drivers/net/slicoss/gbrcvucode.h + create mode 100644 drivers/net/slicoss/oasisdbgdownload.h + create mode 100644 drivers/net/slicoss/oasisdownload.h + create mode 100644 drivers/net/slicoss/oasisrcvucode.h + create mode 100644 drivers/net/slicoss/slic.h + create mode 100644 drivers/net/slicoss/slic_os.h + create mode 100644 drivers/net/slicoss/slicbuild.h + create mode 100644 drivers/net/slicoss/slicdbg.h + create mode 100644 drivers/net/slicoss/slicdump.h + create mode 100644 drivers/net/slicoss/slichw.h + create mode 100644 drivers/net/slicoss/slicinc.h + create mode 100644 drivers/net/slicoss/slicoss.c + create mode 100644 drivers/net/usb/hso.c + create mode 100644 drivers/usb/image/f2255usb.h + create mode 100644 drivers/usb/image/s2255drv.c + create mode 100644 fs/novfs/Makefile + create mode 100644 fs/novfs/commands.h + create mode 100644 fs/novfs/daemon.c + create mode 100644 fs/novfs/file.c + create mode 100644 fs/novfs/inode.c + create mode 100644 fs/novfs/nwcapi.c + create mode 100644 fs/novfs/nwcapi.h + create mode 100644 fs/novfs/nwerror.h + create mode 100644 fs/novfs/proc.c + create mode 100644 fs/novfs/profile.c + create mode 100644 fs/novfs/scope.c + create mode 100644 fs/novfs/vfs.h +$ git rm localversion-sched-devel.git localversion-x86-latest.git diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..f489dc09ebfa --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,268 @@ +Importing driver-core based on 2.6.25-git17 +$ git branch -D quilt/driver-core +Deleted branch quilt/driver-core. +$ git checkout -b quilt/driver-core e4c576b911e364737b1bf4f5bfdab1c440713f26 +Switched to a new branch "quilt/driver-core" +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core +sysfs-add-sys-dev-char-block-to-lookup-sysfs-path-by-major-minor.patch +net-convert-the-phy_device-file-to-use-bus_find_device_by_name.patch +pm-introduce-new-top-level-suspend-and-hibernation-callbacks.patch +pm-new-suspend-and-hibernation-callbacks-for-platform-bus-type.patch +put_device-might_sleep.patch +warn-when-statically-allocated-kobjects-are-used.patch +sysfs-crash-debugging.patch +Importing usb based on quilt/driver-core +$ git branch -D quilt/usb +Deleted branch quilt/usb. +$ git checkout -b quilt/usb quilt/driver-core +Switched to a new branch "quilt/usb" +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb +usb-isp1760-hcd-driver.patch +usb-ldusb-ld_usb-semaphore-to-mutex.patch +usb-storage-fix-build-failure-in-onetouch-driver.patch +usb-storage-onetouch.c-make-a-function-static.patch +usb-storage-add-unusual_devs-entry-for-samsung-yp-u3.patch +usb-libusual-kthread_run-called-with-wrong-format.patch +ub-fix-timeouts.patch +ub-tune-retries.patch +ub-ignore-bad-residue.patch +ub-cosmetics.patch +usb-usbtest-displays-diagnostics-again.patch +usb-mos7840-test-and-propagate-set_uart_reg-return-value.patch +usb-intova-pixtreme-camera-mass-storage-device.patch +usb-pxa27x_udc-driver.patch +usb-serial-gadget-cdc-acm-fixes.patch +usb-gadget-zero-style-fixups.patch +usb-gadget-zero-timer-init-fix.patch +usb-fix-cannot-work-usb-storage-when-using-ohci-sm501.patch +usb-add-more-ftdi-device-ids.patch +usb-add-the-usb-2.0-extension-descriptor.patch +usb-storage-unusual_devs-for-pandigital-picture-frame.patch +usb-storage-update-mailling-list-address.patch +usb-airprime-unlock-mutex-instead-of-trying-to-lock-it-again.patch +c67x00-1-lowlevel.patch +c67x00-2-core.patch +c67x00-3-hcd.patch +usb-ohci-work-around-bogus-compiler-warning.patch +usb-uhci-disable-remote-wakeup-when-it-s-not-needed.patch +usb-remove-redundant-dependencies-on-usb_atm.patch +usb_serial-some-coding-style-fixes.patch +ti_usb-kick-firmware-into-user-space.patch +usb-add-new-routine-for-checking-port-resume-type.patch +usb-debounce-before-unregistering.patch +usb-simplify-hub_restart-logic.patch +usb-try-to-salvage-lost-power-sessions.patch +usb-optimize-port-debouncing-during-hub-activation.patch +usb-combine-hub_activate-and-hub_restart.patch +usb-combine-hub_quiesce-and-hub_stop.patch +usb-gadget-peripheral-g_file_storage-bulk-only-transport-compliance.patch +usb-gadget-peripheral-g_file_storage-bulk-only-transport-compliance-clear-feature-ignore.patch +usb-create-attributes-before-sending-uevent.patch +usb-add-usb_dev_reset_delayed.patch +wusb-documentation.patch +bitmap-add-bitmap_copy_le.patch +usb-add-association.h.patch +wusb-add-usb-specific-wusb-include-files.patch +wusb-add-the-uwb-include-files.patch +uwb-add-the-uwb-stack.patch +wusb-add-whc-rc-radio-control-driver.patch +.dotest/patch:494: space before tab in indent. + whcrc->umc_dev = umc_dev; +.dotest/patch:507: space before tab in indent. + result = whcrc_setup_rc_umc(whcrc); +.dotest/patch:509: space before tab in indent. + dev_err(dev, "Can't setup RC UMC interface: %d\n", result); +.dotest/patch:514: space before tab in indent. + dev_err(dev, "Can't setup RC interface: %d\n", result); +.dotest/patch:576: space before tab in indent. + .probe = whcrc_probe, +warning: squelched 1 whitespace error +warning: 6 lines add whitespace errors. +wusb-add-hwa-rc-radio-controller-driver.patch +wusb-add-uwb-core-for-wimedia-link-protocol.patch +wusb-add-the-i1480-driver.patch +.dotest/patch:969: space before tab in indent. + const struct firmware *fw; +.dotest/patch:1329: space before tab in indent. + const struct firmware *fw; +.dotest/patch:3487: space before tab in indent. + "Dropping\n", untd_hdr->reserved1); +.dotest/patch:4783: space before tab in indent. + /* +warning: 4 lines add whitespace errors. +wusb-add-the-usb-wireless-core-code.patch +wusb-add-the-usb-wusb-cbaf-driver.patch +wusb-add-the-wire-adapter-core.patch +wusb-add-hwa-hc-wireless-host-controller-driver.patch +usb-gotemp.patch +Importing device-mapper based on v2.6.25-3562-g3dc5063 +$ git branch -D quilt/device-mapper +Deleted branch quilt/device-mapper. +$ git checkout -b quilt/device-mapper v2.6.25-3562-g3dc5063 +Switched to a new branch "quilt/device-mapper" +$ git quiltimport --author Alasdair G Kergon <agk@redhat.com> --patches ../quilt/device-mapper +Importing i2c based on 2.6.26-rc1-git2 +$ git branch -D quilt/i2c +Deleted branch quilt/i2c. +$ git checkout -b quilt/i2c f74d505b58d36ceeef10e459094f0eb760681165 +Switched to a new branch "quilt/i2c" +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c +i2c-new-co-maintainer.patch +i2c-mpc-compare-to-NO_IRQ-instead-of-zero.patch +i2c-piix4-blacklist-2-mainboards.patch +i2c-01-match-dummy-by-type.patch +i2c-davinci-01-clock-between-7-12-mhz.patch +i2c-davinci-02-move-dev_dbg-statement-for-more-output.patch +i2c-davinci-03-remove-useless-ivr-read.patch +i2c-davinci-04-fix-signal-handling-bug.patch +i2c-davinci-05-initialize-cmd_complete-sooner.patch +i2c-acpi-check-conflict.patch +Importing kernel-doc based on 2.6.25-git13 +$ git branch -D quilt/kernel-doc +Deleted branch quilt/kernel-doc. +$ git checkout -b quilt/kernel-doc a01e035ebb552223c03f2d9138ffc73f2d4d3965 +Switched to a new branch "quilt/kernel-doc" +$ git quiltimport --author Randy Dunlap <randy.dunlap@oracle.com> --patches ../quilt/kernel-doc +kconfig_allconfig_docv2.patch +doc-move-initrd-txt.patch +Importing ide based on commit f74d505b58d36ceeef10e459094f0eb760681165 +$ git branch -D quilt/ide +Deleted branch quilt/ide. +$ git checkout -b quilt/ide f74d505b58d36ceeef10e459094f0eb760681165 +Switched to a new branch "quilt/ide" +$ git quiltimport --author Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> --patches ../quilt/ide +ide-remove-obsoleted-idebus-kernel-parameter.patch +ide-remove-obsoleted-hdx-kernel-parameters.patch +ide-cleanup-init_ide_data.patch +ide-remove-obsoleted-ide-parameters.patch +ide-eliminate-fit-macro.patch +ide-tape-use-clamp_t-rather-than-nested-min_t-_max_t.patch +ide-use-get_unaligned_-helpers.patch +ide-set-req_preempt-request-flag-in-ide_do_drive_cmd-users.patch +ide-use-__generic_unplug_device-in-ide_do_drive_cmd.patch +ide-cd-convert-ide_cd_queue_pc-to-use-blk_execute_rq.patch +ide-cd-convert-ide_do_drive_cmd-path-to-use-blk_execute_rq.patch +ide-disk-convert-ide_do_drive_cmd-path-to-use-blk_execute_rq.patch +ide-floppy-convert-ide_do_drive_cmd-path-to-use-blk_execute_rq.patch +ide-taskfile-convert-ide_do_drive_cmd-path-to-use-blk_execute_rq.patch +ide-tape-convert-ide_do_drive_cmd-path-to-use-blk_execute_rq.patch +ide-convert-ide_do_drive_cmd-path-to-use-blk_execute_rq.patch +ide-remove-ide_wait_head_wait-path-in-ide_do_drive_cmd.patch +ide-remove-ide_init_drive_cmd.patch +ide-cd-remove-ide_cd_init_rq.patch +ide-remove-try_to_flush_leftover_data.patch +Importing m68k based on f74d505b58d36ceeef10e459094f0eb760681165 +$ git branch -D quilt/m68k +Deleted branch quilt/m68k. +$ git checkout -b quilt/m68k f74d505b58d36ceeef10e459094f0eb760681165 +Switched to a new branch "quilt/m68k" +$ git quiltimport --author Geert Uytterhoeven <geert@linux-m68k.org> --patches ../quilt/m68k +m68k-convert-access_ok-to-inline-func.diff +m68k-kill-CONFIG_FB_DAFB.diff +m68k-correct-FB_HP300-dependencies.diff +m68k-whippet-serial-no-longer-exists.diff +m68k-vme_scc-globals.diff +m68k-silence-BUG-can-return-warnings.diff +m68k-hp300-breaks-multi-platform.diff +m68k-macide-breaks-multi-platform.diff +m68k-dnfb-breaks-multi-platform.diff +m68k-net-drivers-break-multiplatform.diff +m68k-input-drivers-break-multiplatform.diff +m68k-initcalls-should-return-ENODEV-if-device-not-found.diff +m68k-q40-floppy-is-broken.diff +m68k-update-defconfig.diff +m68k-add-multi_defconfig.diff +m68k-handle-68040-bus-faults.diff +m68k-remove-old-mac_esp-cruft.diff +SCSI_MAC_ESP-needs-SCSI_SPI_ATTRS.diff +drivers-input-serio-hp_sdc.c-needs-linux-semaphore.h.diff +serial167-switch-to-int-put_char-method-update.diff +falconide-data_adr-typo.diff +m68k-export-m68k_mmutype.diff +Importing rr based on v2.6.26-rc1-6-gafa26be +$ git branch -D quilt/rr +Deleted branch quilt/rr. +$ git checkout -b quilt/rr v2.6.26-rc1-6-gafa26be +Switched to a new branch "quilt/rr" +$ git quiltimport --author Rusty Russell <rusty@rustcorp.com.au> --patches ../quilt/rr +misc:fixup-bootparam.h-for-userspace.patch +virtio:s390-kvm_virtio-feature-changes.patch +virtio:net_add_ethtool_ops_for_sg_gso.patch +virtio:net_allow_receiving_sg_packets.patch +virtio:transport-features.patch +virtio:vring-enhance.patch +lguest:publish-indices.patch +misc:add_all_cpus_option_to_stop_machine_run.patch +misc:removal_of_futex_fd.patch +misc:kthread-printf-attribute.patch +misc:cast_if_type.patch +misc:typesafe_cb.patch +misc:stop_machine-typesafe.patch +misc:kthread-typesafe.patch +misc:timer-typesafe.patch +misc:down_nowait.patch +misc:down_nowait-documentation.patch +misc:down_nowait-arch_ia64_kernel_salinfo.patch +misc:down_nowait-drivers_char_snsc.patch +misc:down_nowait-drivers_char_viotape.patch +misc:down_nowait-drivers_infiniband_core_user_mad.patch +misc:down_nowait-drivers_input_serio_hil_mlc.patch +misc:down_nowait-drivers_input_serio_hp_sdc_mlc.patch +misc:down_nowait-drivers_md_dm-raid1.patch +misc:down_nowait-drivers_net_3c527.patch +misc:down_nowait-drivers_net_irda_sir_dev.patch +misc:down_nowait-drivers_net_ps3_gelic_wireless.patch +misc:down_nowait-drivers_net_wireless_airo.patch +misc:down_nowait-drivers_scsi_aacraid_commsup.patch +misc:down_nowait-drivers_usb_core_usb.patch +misc:down_nowait-drivers_usb_gadget_inode.patch +misc:down_nowait-drivers_watchdog_ar7_wdt.patch +misc:down_nowait-drivers_watchdog_it8712f_wdt.patch +misc:down_nowait-drivers_watchdog_s3c2410_wdt.patch +misc:down_nowait-drivers_watchdog_sc1200wdt.patch +misc:down_nowait-drivers_watchdog_scx200_wdt.patch +misc:down_nowait-drivers_watchdog_wdt_pci.patch +misc:down_nowait-fs_reiserfs_journal.patch +misc:down_nowait-xfs.patch +misc:down_nowait-kernel_printk.patch +Importing ldp based on quilt/usb +$ git branch -D quilt/ldp +Deleted branch quilt/ldp. +$ git checkout -b quilt/ldp quilt/usb +Switched to a new branch "quilt/ldp" +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/ldp +usb-add-sensoray-2255-v4l-driver.patch +dvb-add-firesat-driver.patch +usb-add-option-hso-driver.patch +video-add-the-go7007-driver.patch +.dotest/patch:1838: space before tab in indent. + 0xd3), +.dotest/patch:1853: space before tab in indent. + GO7007_SENSOR_TV) && +.dotest/patch:1857: space before tab in indent. + GO7007_SENSOR_TV) && +.dotest/patch:2067: space before tab in indent. + (1 << 14) | (1 << 9) : 0) | +.dotest/patch:2070: space before tab in indent. + GO7007_SENSOR_CONFIG_MASK), +warning: 5 lines add whitespace errors. +net-add-alacritech-slicoss-driver.patch +.dotest/patch:8518: trailing whitespace. +obj-$(CONFIG_SLICOSS) += slicoss.o
+.dotest/patch:24297: space before tab in indent. + ushort DramRomFn; // 14 Dram/Rom function +warning: 2 lines add whitespace errors. +input-add-appleir-driver.patch +add-me4000-pci-data-collection-driver.patch +novfs-add-the-novell-filesystem-client-kernel-module.patch +aectc-add-the-aectc-driver.patch +net-add-et131x-driver.patch +.dotest/patch:2669: space before tab in indent. + /* bits 1:0 are equal to 1 */ +.dotest/patch:2724: space before tab in indent. + /* I2C write complete */ +.dotest/patch:7720: space before tab in indent. + pRxLocal->local_psr_full.bits.psr_full_wrap) { +.dotest/patch:11895: space before tab in indent. + * I need to call this function twice to get my card in a +warning: 4 lines add whitespace errors. diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..aeffd1196c04 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20080506 diff --git a/localversion-sched-devel.git b/localversion-sched-devel.git deleted file mode 100644 index 4060b7ac0145..000000000000 --- a/localversion-sched-devel.git +++ /dev/null @@ -1 +0,0 @@ --sched-devel.git diff --git a/localversion-x86-latest.git b/localversion-x86-latest.git deleted file mode 100644 index 854024ef0000..000000000000 --- a/localversion-x86-latest.git +++ /dev/null @@ -1 +0,0 @@ --x86-latest.git |