diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-24 16:56:33 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-24 16:56:33 +1000 |
| commit | b475aa5f5cf3d152bfcf6ba26c472519d6d60785 (patch) | |
| tree | db2c3977463ec41ef24de6af6149af5acabb3855 | |
| parent | be66b9e9398ff9ecc1ee58a5d9e18e93f0ff3e3e (diff) | |
Add linux-next specific files for 20080724next-20080724
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/Trees | 109 | ||||
| -rw-r--r-- | Next/merge.log | 3004 | ||||
| -rw-r--r-- | Next/quilt-import.log | 152 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 3266 insertions, 0 deletions
diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..e561159e9425 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,109 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git#master +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +scsi-rc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git#master +net-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git#master +sparc-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-linus +arm-current git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#master +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#for-linus +wireless-current git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes.git#master +driver-core.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver-core.current/ +usb.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-usb.current/ +cpufreq-current git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +md-current git git://neil.brown.name/md#for-2.6.26 +driver-core quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-driver-core/ +usb quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-usb/ +tip-core git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-core-next +cpus4096 git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-cpus4096-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-ftrace-next +genirq git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-genirq-next +safe-poison-pointers git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-safe-poison-pointers-next +sched git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-sched-next +stackprotector git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-stackprotector-next +timers git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-timers-next +x86 git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-x86-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#linux-next +device-mapper quilt http://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/editing/ +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#mm +i2c quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ +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-next.git#master +ide quilt http://kernel.org/pub/linux/kernel/people/bart/pata-2.6/patches/ +libata git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +xfs git git://oss.sgi.com:8090/xfs/xfs-2.6.git#master +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +acpi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6#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#linux-next +kvm git git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git#master +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git#next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git#master +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 +m68k quilt http://www.kernel.org/pub/linux/kernel/people/geert/linux-m68k-patches-2.6/ +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +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 +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-next-2.6.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6#master +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#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#next +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/ +cifs git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git#master +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git#next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git#master +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +semaphore git git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc.git#semaphore +semaphore-removal git git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc.git#semaphore-removal +bkl-removal git git://git.lwn.net/linux-2.6.git#bkl-removal +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial-2.6.git#next +ubifs git git://git.infradead.org/~dedekind/ubifs-2.6.git#linux-next +lsm git git://gitkernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next +block git git://git.kernel.dk/linux-2.6-block.git#for-next +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git#master +battery git git://git.infradead.org/battery-2.6.git#master +leds git git://git.o-hand.com/linux-rpurdie-leds#for-mm +backlight git git://git.o-hand.com/linux-rpurdie-backlight#for-mm +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb#kgdb-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +cris git git://www.jni.nu/cris.git#for-next +kmemcheck git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-kmemcheck-next +generic-ipi git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-generic-ipi-next +mips git git://git.linux-mips.org/pub/scm/upstream-sfr.git#mips-for-linux-next +mfd git git://git.o-hand.com/linux-mfd#for-next +hdlc git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6.git#hdlc-next +drm git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git#drm-next +voltage git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git#reg-for-linus +security-testing git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git#next +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master +ttydev quilt http://www.linux.org.uk/~alan/ttydev/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..8f0e2ef92eb3 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3004 @@ +$ git checkout master +Already on "master" +$ git reset --hard stable +HEAD is now at 0988c37 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip +Merging origin/master +$ git merge origin/master +Updating 0988c37..20b7997 +Fast forward + Documentation/networking/e1000.txt | 14 +- + Documentation/networking/udplite.txt | 2 +- + MAINTAINERS | 9 +- + arch/arm/Kconfig | 1 + + arch/arm/kernel/Makefile | 1 + + arch/arm/kernel/kgdb.c | 201 +++ + arch/arm/kernel/setup.c | 2 + + arch/arm/kernel/traps.c | 5 + + arch/avr32/mach-at32ap/at32ap700x.c | 27 +- + arch/powerpc/Kconfig | 1 + + arch/powerpc/Kconfig.debug | 50 +- + arch/powerpc/kernel/Makefile | 1 + + arch/powerpc/kernel/kgdb.c | 410 +++++ + arch/powerpc/kernel/setup_32.c | 16 - + arch/powerpc/platforms/powermac/setup.c | 6 - + arch/sparc/Makefile | 1 + + arch/um/include/init.h | 8 + + crypto/async_tx/async_memcpy.c | 12 +- + crypto/async_tx/async_memset.c | 12 +- + crypto/async_tx/async_tx.c | 33 +- + crypto/async_tx/async_xor.c | 262 ++-- + drivers/char/nvram.c | 1 - + drivers/char/tty_io.c | 2 +- + drivers/dca/dca-core.c | 131 ++- + drivers/dca/dca-sysfs.c | 3 +- + drivers/dma/Kconfig | 37 +- + drivers/dma/Makefile | 3 + + drivers/dma/dmaengine.c | 35 +- + drivers/dma/dmatest.c | 444 +++++ + drivers/dma/dw_dmac.c | 1122 ++++++++++++ + drivers/dma/dw_dmac_regs.h | 225 +++ + drivers/dma/fsldma.c | 38 +- + drivers/dma/ioat.c | 15 + + drivers/dma/ioat_dca.c | 244 +++- + drivers/dma/ioat_dma.c | 402 ++++- + drivers/dma/ioatdma.h | 28 +- + drivers/dma/ioatdma_hw.h | 1 + + drivers/dma/ioatdma_registers.h | 20 + + drivers/dma/iop-adma.c | 53 +- + drivers/dma/mv_xor.c | 1375 +++++++++++++++ + drivers/dma/mv_xor.h | 183 ++ + drivers/hid/hid-core.c | 10 +- + drivers/hid/hid-input-quirks.c | 40 + + drivers/hid/hid-input.c | 3 + + drivers/hid/hidraw.c | 48 +- + drivers/hid/usbhid/hid-quirks.c | 22 +- + drivers/hid/usbhid/hiddev.c | 14 +- + drivers/hid/usbhid/usbkbd.c | 10 +- + drivers/hid/usbhid/usbmouse.c | 8 - + drivers/ide/Kconfig | 2 + + drivers/ide/arm/icside.c | 71 +- + drivers/ide/arm/ide_arm.c | 14 +- + drivers/ide/arm/palm_bk3710.c | 30 +- + drivers/ide/arm/rapide.c | 24 +- + drivers/ide/h8300/ide-h8300.c | 48 +- + drivers/ide/ide-atapi.c | 58 +- + drivers/ide/ide-cd.c | 157 +- + drivers/ide/ide-cd.h | 38 - + drivers/ide/ide-cd_ioctl.c | 35 +- + drivers/ide/ide-disk.c | 2 +- + drivers/ide/ide-dma.c | 103 +- + drivers/ide/ide-floppy.c | 90 +- + drivers/ide/ide-generic.c | 73 +- + drivers/ide/ide-io.c | 42 +- + drivers/ide/ide-iops.c | 230 ++- + drivers/ide/ide-lib.c | 17 +- + drivers/ide/ide-pnp.c | 29 +- + drivers/ide/ide-probe.c | 366 +++-- + drivers/ide/ide-proc.c | 4 +- + drivers/ide/ide-tape.c | 127 +- + drivers/ide/ide-taskfile.c | 38 +- + drivers/ide/ide.c | 49 +- + drivers/ide/legacy/buddha.c | 24 +- + drivers/ide/legacy/falconide.c | 56 +- + drivers/ide/legacy/gayle.c | 39 +- + drivers/ide/legacy/ide-4drives.c | 20 +- + drivers/ide/legacy/ide-cs.c | 54 +- + drivers/ide/legacy/ide_platform.c | 32 +- + drivers/ide/legacy/macide.c | 15 +- + drivers/ide/legacy/q40ide.c | 47 +- + drivers/ide/mips/au1xxx-ide.c | 56 +- + drivers/ide/mips/swarm.c | 24 +- + drivers/ide/pci/aec62xx.c | 5 - + drivers/ide/pci/alim15x3.c | 12 +- + drivers/ide/pci/amd74xx.c | 1 - + drivers/ide/pci/cmd640.c | 29 +- + drivers/ide/pci/cmd64x.c | 12 +- + drivers/ide/pci/cs5520.c | 41 +- + drivers/ide/pci/cs5535.c | 3 +- + drivers/ide/pci/delkin_cb.c | 25 +- + drivers/ide/pci/hpt34x.c | 1 - + drivers/ide/pci/hpt366.c | 23 +- + drivers/ide/pci/ns87415.c | 115 +- + drivers/ide/pci/pdc202xx_old.c | 3 +- + drivers/ide/pci/piix.c | 4 +- + drivers/ide/pci/scc_pata.c | 139 +- + drivers/ide/pci/serverworks.c | 4 +- + drivers/ide/pci/sgiioc4.c | 65 +- + drivers/ide/pci/siimage.c | 6 +- + drivers/ide/pci/sl82c105.c | 4 +- + drivers/ide/pci/tc86c001.c | 16 +- + drivers/ide/pci/via82cxxx.c | 1 - + drivers/ide/ppc/pmac.c | 222 ++- + drivers/ide/setup-pci.c | 109 +- + drivers/mmc/card/mmc_test.c | 225 +++- + drivers/mmc/card/queue.c | 97 +- + drivers/mmc/host/au1xmmc.c | 54 +- + drivers/mmc/host/pxamci.c | 2 +- + drivers/mmc/host/s3cmci.c | 50 +- + drivers/mmc/host/sdhci.c | 167 +- + drivers/mmc/host/sdhci.h | 7 +- + drivers/net/8139too.c | 138 +- + drivers/net/Kconfig | 25 +- + drivers/net/Makefile | 1 + + drivers/net/arm/at91_ether.c | 39 +- + drivers/net/arm/at91_ether.h | 1 - + drivers/net/atl1e/Makefile | 2 + + drivers/net/atl1e/atl1e.h | 503 ++++++ + drivers/net/atl1e/atl1e_ethtool.c | 405 +++++ + drivers/net/atl1e/atl1e_hw.c | 664 +++++++ + drivers/net/atl1e/atl1e_hw.h | 793 +++++++++ + drivers/net/atl1e/atl1e_main.c | 2599 ++++++++++++++++++++++++++++ + drivers/net/atl1e/atl1e_param.c | 263 +++ + drivers/net/au1000_eth.c | 5 +- + drivers/net/bfin_mac.c | 1 - + drivers/net/bonding/bond_main.c | 3 + + drivers/net/cpmac.c | 2 - + drivers/net/dm9000.c | 15 +- + drivers/net/e1000/e1000.h | 71 +- + drivers/net/e1000/e1000_ethtool.c | 558 +++--- + drivers/net/e1000/e1000_hw.c | 1373 +++++++--------- + drivers/net/e1000/e1000_main.c | 1490 ++++++++--------- + drivers/net/e1000/e1000_osdep.h | 14 +- + drivers/net/e1000/e1000_param.c | 16 +- + drivers/net/fec_mpc52xx.c | 5 - + drivers/net/fs_enet/fs_enet-main.c | 7 +- + drivers/net/hamradio/bpqether.c | 2 + + drivers/net/hp-plus.c | 2 +- + drivers/net/hp.c | 2 +- + drivers/net/igb/igb_main.c | 2 +- + drivers/net/ixgbe/ixgbe_main.c | 2 - + drivers/net/macb.c | 4 +- + drivers/net/macvlan.c | 3 + + drivers/net/meth.c | 2 +- + drivers/net/mv643xx_eth.c | 2 +- + drivers/net/myri10ge/myri10ge.c | 62 +- + drivers/net/ne.c | 2 +- + drivers/net/ne2.c | 2 +- + drivers/net/netxen/Makefile | 2 +- + drivers/net/netxen/netxen_nic.h | 575 ++++++- + drivers/net/netxen/netxen_nic_ctx.c | 710 ++++++++ + drivers/net/netxen/netxen_nic_ethtool.c | 168 ++- + drivers/net/netxen/netxen_nic_hdr.h | 251 +++- + drivers/net/netxen/netxen_nic_hw.c | 2196 +++++++++++++++++------- + drivers/net/netxen/netxen_nic_hw.h | 60 +- + drivers/net/netxen/netxen_nic_init.c | 806 ++++++---- + drivers/net/netxen/netxen_nic_isr.c | 220 --- + drivers/net/netxen/netxen_nic_main.c | 1169 +++++++++---- + drivers/net/netxen/netxen_nic_niu.c | 114 +- + drivers/net/netxen/netxen_nic_phan_reg.h | 31 +- + drivers/net/phy/marvell.c | 7 +- + drivers/net/r6040.c | 445 +++-- + drivers/net/r8169.c | 14 +- + drivers/net/sfc/efx.c | 39 +- + drivers/net/sfc/falcon.c | 12 +- + drivers/net/sfc/net_driver.h | 5 +- + drivers/net/sh_eth.c | 5 - + drivers/net/tc35815.c | 1 - + drivers/net/tulip/de4x5.c | 16 - + drivers/net/tulip/de4x5.h | 3 +- + drivers/net/tun.c | 2 +- + drivers/net/usb/cdc_ether.c | 11 +- + drivers/net/usb/rndis_host.c | 4 + + drivers/net/wireless/hostap/hostap_hw.c | 3 + + drivers/net/wireless/ipw2200.c | 33 +- + drivers/net/wireless/mac80211_hwsim.c | 18 +- + drivers/s390/net/claw.c | 2141 ++++++----------------- + drivers/s390/net/ctcm_dbug.c | 29 +- + drivers/s390/net/ctcm_dbug.h | 39 +- + drivers/s390/net/ctcm_fsms.c | 402 ++--- + drivers/s390/net/ctcm_main.c | 514 +++--- + drivers/s390/net/ctcm_main.h | 31 +- + drivers/s390/net/ctcm_mpc.c | 1110 +++++-------- + drivers/s390/net/ctcm_mpc.h | 2 +- + drivers/s390/net/qeth_l3_main.c | 2 +- + drivers/scsi/ide-scsi.c | 32 +- + drivers/serial/cpm_uart/cpm_uart_core.c | 95 +- + drivers/serial/mpsc.c | 148 ++- + drivers/usb/serial/airprime.c | 355 ---- + fs/proc/proc_net.c | 11 +- + include/asm-arm/arch-iop13xx/adma.h | 18 +- + include/asm-arm/hardware/iop3xx-adma.h | 4 +- + include/asm-arm/kgdb.h | 104 ++ + include/asm-arm/plat-orion/mv_xor.h | 28 + + include/asm-arm/traps.h | 2 + + include/asm-avr32/arch-at32ap/at32ap700x.h | 16 + + include/asm-powerpc/kgdb.h | 92 +- + include/asm-sparc/ide.h | 102 +- + include/asm-sparc/ide_32.h | 95 - + include/asm-sparc/ide_64.h | 118 -- + include/asm-sparc/io_32.h | 1 + + include/asm-sparc/io_64.h | 2 +- + include/linux/async_tx.h | 11 +- + include/linux/dca.h | 7 +- + include/linux/dmaengine.h | 69 +- + include/linux/dw_dmac.h | 62 + + include/linux/fs_enet_pd.h | 4 - + include/linux/hid.h | 2 +- + include/linux/ide.h | 193 ++- + include/linux/ipv6.h | 2 + + include/linux/netdevice.h | 60 +- + include/linux/pci_ids.h | 8 + + include/linux/proc_fs.h | 2 - + include/linux/scatterlist.h | 38 + + include/net/if_inet6.h | 2 - + include/net/ip6_route.h | 2 +- + include/net/netns/ipv6.h | 2 +- + include/net/sctp/structs.h | 1 - + kernel/irq/manage.c | 39 +- + lib/Kconfig.kgdb | 3 - + lib/scatterlist.c | 176 ++- + net/8021q/vlan_dev.c | 4 + + net/core/dev.c | 102 +- + net/core/user_dma.c | 1 + + net/ipv4/tcp_output.c | 2 +- + net/ipv4/udp.c | 4 + + net/ipv6/addrconf.c | 2 +- + net/ipv6/ip6_fib.c | 60 +- + net/ipv6/route.c | 10 +- + net/netrom/af_netrom.c | 2 + + net/rose/af_rose.c | 2 + + net/sched/sch_api.c | 2 +- + net/sched/sch_generic.c | 6 +- + net/sctp/outqueue.c | 4 +- + net/sctp/proc.c | 5 - + 235 files changed, 21491 insertions(+), 9938 deletions(-) + create mode 100644 arch/arm/kernel/kgdb.c + create mode 100644 arch/powerpc/kernel/kgdb.c + create mode 100644 drivers/dma/dmatest.c + create mode 100644 drivers/dma/dw_dmac.c + create mode 100644 drivers/dma/dw_dmac_regs.h + create mode 100644 drivers/dma/mv_xor.c + create mode 100644 drivers/dma/mv_xor.h + create mode 100644 drivers/net/atl1e/Makefile + create mode 100644 drivers/net/atl1e/atl1e.h + create mode 100644 drivers/net/atl1e/atl1e_ethtool.c + create mode 100644 drivers/net/atl1e/atl1e_hw.c + create mode 100644 drivers/net/atl1e/atl1e_hw.h + create mode 100644 drivers/net/atl1e/atl1e_main.c + create mode 100644 drivers/net/atl1e/atl1e_param.c + create mode 100644 drivers/net/netxen/netxen_nic_ctx.c + delete mode 100644 drivers/net/netxen/netxen_nic_isr.c + delete mode 100644 drivers/usb/serial/airprime.c + create mode 100644 include/asm-arm/kgdb.h + create mode 100644 include/asm-arm/plat-orion/mv_xor.h + delete mode 100644 include/asm-sparc/ide_32.h + delete mode 100644 include/asm-sparc/ide_64.h + create mode 100644 include/linux/dw_dmac.h +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net-current/master +$ git merge net-current/master +Merge made by recursive. + drivers/net/sky2.c | 5 ----- + net/core/dev.c | 3 --- + 2 files changed, 0 insertions(+), 8 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 +Merge made by recursive. + sound/isa/opti9xx/opti92x-ad1848.c | 6 +- + sound/pci/ac97/ac97_codec.c | 3 +- + sound/pci/ens1370.c | 3 +- + sound/pci/hda/hda_intel.c | 6 +- + sound/pci/hda/patch_realtek.c | 180 ++++++++++++++++++++++++++++++++++-- + sound/soc/au1x/psc-i2s.c | 2 +- + sound/soc/codecs/wm9712.c | 10 +- + sound/soc/soc-dapm.c | 105 ++++++++++----------- + 8 files changed, 242 insertions(+), 73 deletions(-) +Merging arm-current/master +$ git merge arm-current/master +Already up-to-date. +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Merge made by recursive. + drivers/acpi/pci_slot.c | 5 +++-- + drivers/pci/dmar.c | 4 +--- + drivers/pci/pci.c | 34 ++++++++++++++++++++++++---------- + drivers/pci/proc.c | 18 +++++++++--------- + include/linux/pci.h | 2 ++ + 5 files changed, 39 insertions(+), 24 deletions(-) +Merging wireless-current/master +$ git merge wireless-current/master +Already up-to-date. +Merging kbuild-current/master +$ git merge kbuild-current/master +Already up-to-date. +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Auto-merged drivers/char/tty_io.c +Auto-merged drivers/dca/dca-sysfs.c +CONFLICT (content): Merge conflict in drivers/dca/dca-sysfs.c +Auto-merged drivers/hid/hidraw.c +Auto-merged drivers/ide/ide-probe.c +Auto-merged drivers/ide/ide-tape.c +Recorded preimage for 'drivers/dca/dca-sysfs.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/dca/dca-sysfs.c'. +Created commit f73a79c: Merge branch 'quilt/driver-core.current' +$ git diff -M --stat --summary HEAD^.. + Documentation/kobject.txt | 4 ++++ + arch/mips/kernel/rtlx.c | 4 ++-- + arch/mips/sibyte/common/sb_tbprof.c | 3 +-- + arch/x86/kernel/cpuid.c | 4 ++-- + arch/x86/kernel/msr.c | 4 ++-- + block/bsg.c | 3 +-- + drivers/base/core.c | 5 +++++ + drivers/block/aoe/aoechr.c | 6 +++--- + drivers/block/paride/pg.c | 5 ++--- + drivers/block/paride/pt.c | 10 ++++------ + drivers/block/pktcdvd.c | 5 ++--- + drivers/char/bsr.c | 5 ++--- + drivers/char/dsp56k.c | 4 ++-- + drivers/char/ip2/ip2main.c | 12 ++++++------ + drivers/char/ipmi/ipmi_devintf.c | 2 +- + drivers/char/istallion.c | 5 ++--- + drivers/char/lp.c | 4 ++-- + drivers/char/mem.c | 6 +++--- + drivers/char/misc.c | 4 ++-- + drivers/char/pcmcia/cm4000_cs.c | 2 +- + drivers/char/pcmcia/cm4040_cs.c | 3 +-- + drivers/char/ppdev.c | 5 ++--- + drivers/char/raw.c | 7 +++---- + drivers/char/snsc.c | 4 ++-- + drivers/char/stallion.c | 4 ++-- + drivers/char/tty_io.c | 12 +++++------- + drivers/char/vc_screen.c | 12 ++++++------ + drivers/char/viotape.c | 8 ++++---- + drivers/char/vt.c | 14 ++++++-------- + drivers/char/xilinx_hwicap/xilinx_hwicap.c | 3 +-- + drivers/dca/dca-sysfs.c | 8 +++----- + drivers/hid/hidraw.c | 5 ++--- + drivers/hwmon/hwmon.c | 4 ++-- + drivers/i2c/i2c-dev.c | 6 +++--- + drivers/ide/ide-probe.c | 4 ++-- + drivers/ide/ide-tape.c | 11 +++++------ + drivers/ieee1394/dv1394.c | 8 ++++---- + drivers/ieee1394/raw1394.c | 8 ++++---- + drivers/ieee1394/video1394.c | 5 ++--- + drivers/infiniband/core/cm.c | 6 +++--- + drivers/infiniband/core/user_mad.c | 12 ++++++------ + drivers/infiniband/core/uverbs_main.c | 9 +++------ + drivers/infiniband/hw/ipath/ipath_file_ops.c | 2 +- + drivers/isdn/capi/capi.c | 3 +-- + drivers/leds/led-class.c | 4 ++-- + drivers/macintosh/adb.c | 3 +-- + drivers/media/dvb/dvb-core/dvbdev.c | 2 +- + drivers/misc/phantom.c | 6 +++--- + drivers/mtd/mtdchar.c | 10 ++++------ + drivers/net/ppp_generic.c | 4 ++-- + drivers/net/wan/cosa.c | 4 ++-- + drivers/net/wireless/mac80211_hwsim.c | 6 +++--- + drivers/power/power_supply_core.c | 4 ++-- + drivers/s390/char/raw3270.c | 14 ++++++-------- + drivers/s390/char/tape_class.c | 6 +++--- + drivers/s390/char/vmlogrdr.c | 8 ++++---- + drivers/s390/char/vmur.c | 5 ++--- + drivers/scsi/ch.c | 6 +++--- + drivers/scsi/dpt_i2o.c | 2 +- + drivers/scsi/osst.c | 3 ++- + drivers/scsi/sg.c | 10 ++++------ + drivers/scsi/st.c | 11 ++++------- + drivers/spi/spidev.c | 7 +++---- + drivers/uio/uio.c | 6 +++--- + drivers/usb/core/devio.c | 6 +++--- + drivers/usb/core/file.c | 6 +++--- + drivers/usb/core/hcd.c | 5 ++--- + drivers/usb/gadget/printer.c | 4 ++-- + drivers/usb/misc/phidgetkit.c | 5 ++--- + drivers/usb/misc/phidgetmotorcontrol.c | 5 ++--- + drivers/usb/misc/phidgetservo.c | 5 ++--- + drivers/usb/mon/mon_bin.c | 6 +++--- + drivers/video/console/fbcon.c | 4 ++-- + drivers/video/display/display-sysfs.c | 9 +++------ + drivers/video/fbmem.c | 5 ++--- + fs/coda/psdev.c | 5 ++--- + include/linux/device.h | 1 - + include/linux/sysfs.h | 4 +++- + lib/kobject.c | 18 +++++------------- + sound/core/init.c | 6 +++--- + sound/core/sound.c | 5 ++--- + sound/oss/soundcard.c | 15 +++++++-------- + sound/sound_core.c | 5 ++--- + 83 files changed, 227 insertions(+), 273 deletions(-) +Merging quilt/usb.current +$ git merge quilt/usb.current +Already up-to-date. +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Already up-to-date. +Merging md-current/for-2.6.26 +$ git merge md-current/for-2.6.26 +Already up-to-date. +Merging quilt/driver-core +$ git merge quilt/driver-core +Merge made by recursive. + arch/x86/kernel/traps_32.c | 1 + + arch/x86/kernel/traps_64.c | 1 + + drivers/base/core.c | 1 + + drivers/net/phy/phy_device.c | 8 +----- + fs/sysfs/file.c | 13 ++++++++++ + fs/sysfs/mount.c | 2 +- + fs/sysfs/sysfs.h | 1 + + include/linux/init.h | 1 + + include/linux/sysfs.h | 5 ++++ + init/main.c | 9 +++++++ + lib/kobject.c | 52 ++++++++++++++++++++++++++++++++++++++++++ + 11 files changed, 86 insertions(+), 8 deletions(-) +Merging quilt/usb +$ git merge quilt/usb +Merge made by recursive. + drivers/usb/misc/Kconfig | 10 ++ + drivers/usb/misc/Makefile | 1 + + drivers/usb/misc/gotemp.c | 301 +++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 312 insertions(+), 0 deletions(-) + create mode 100644 drivers/usb/misc/gotemp.c +Merging tip-core/auto-core-next +$ git merge tip-core/auto-core-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged include/asm-x86/percpu.h +Auto-merged kernel/module.c +Auto-merged kernel/sysctl.c +Auto-merged lib/Kconfig.debug +Merge made by recursive. + Documentation/kernel-parameters.txt | 3 + + arch/avr32/kernel/stacktrace.c | 1 + + arch/mips/kernel/stacktrace.c | 1 + + arch/sh/kernel/stacktrace.c | 1 + + arch/x86/kernel/cpu/common.c | 2 +- + arch/x86/kernel/vmlinux_32.lds.S | 1 + + include/asm-generic/percpu.h | 11 ++++- + include/asm-generic/sections.h | 10 ++++ + include/asm-generic/vmlinux.lds.h | 17 +++++++ + include/asm-x86/percpu.h | 83 ++++++++++++++++++++++++++++++++-- + include/linux/percpu.h | 24 ++++++++++- + include/linux/sched.h | 3 +- + kernel/kthread.c | 4 +- + kernel/lockdep.c | 4 +- + kernel/module.c | 7 ++- + kernel/softlockup.c | 45 ++++++++++++++++--- + kernel/sysctl.c | 20 +++++++-- + kernel/time/tick-sched.c | 4 +- + lib/Kconfig.debug | 26 ++++++++++- + mm/filemap.c | 15 +++--- + 20 files changed, 245 insertions(+), 37 deletions(-) +Merging cpus4096/auto-cpus4096-next +$ git merge cpus4096/auto-cpus4096-next +Auto-merged net/core/dev.c +Merge made by recursive. + arch/x86/kernel/acpi/cstate.c | 3 +- + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 16 ++- + arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 6 +- + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 23 ++-- + arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c | 157 +++++++++++++-------- + arch/x86/kernel/cpu/cpufreq/speedstep-ich.c | 7 +- + arch/x86/kernel/cpu/intel_cacheinfo.c | 5 +- + arch/x86/kernel/cpu/mcheck/mce_64.c | 2 +- + arch/x86/kernel/cpu/mcheck/mce_amd_64.c | 4 +- + arch/x86/kernel/cpu/proc.c | 2 +- + arch/x86/kernel/genapic_flat_64.c | 2 +- + arch/x86/kernel/genx2apic_uv_x.c | 4 +- + arch/x86/kernel/io_apic_64.c | 12 +- + arch/x86/kernel/ldt.c | 6 +- + arch/x86/kernel/microcode.c | 13 ++- + arch/x86/kernel/reboot.c | 14 ++- + arch/x86/kernel/smpboot.c | 8 +- + arch/x86/xen/smp.c | 4 +- + drivers/acpi/processor_throttling.c | 17 ++- + drivers/base/cpu.c | 4 +- + drivers/cpufreq/cpufreq.c | 14 +- + drivers/cpufreq/cpufreq_conservative.c | 2 +- + drivers/cpufreq/cpufreq_ondemand.c | 4 +- + drivers/cpufreq/cpufreq_userspace.c | 79 ++++++----- + drivers/firmware/dcdbas.c | 3 +- + drivers/infiniband/hw/ehca/ehca_irq.c | 4 +- + drivers/misc/sgi-xp/xpc_main.c | 3 +- + drivers/net/sfc/efx.c | 2 + + include/asm-x86/ipi.h | 2 +- + include/asm-x86/processor.h | 2 +- + include/linux/cpumask.h | 166 +++++++++++++++++----- + kernel/cpu.c | 2 +- + kernel/rcuclassic.c | 2 +- + kernel/rcupreempt.c | 10 +- + kernel/sched.c | 36 +++--- + kernel/sched_fair.c | 2 +- + kernel/sched_rt.c | 4 +- + kernel/stop_machine.c | 3 +- + kernel/taskstats.c | 4 +- + kernel/time/clocksource.c | 4 +- + kernel/time/tick-broadcast.c | 3 +- + kernel/time/tick-common.c | 14 +- + kernel/trace/trace_sysprof.c | 4 +- + kernel/workqueue.c | 6 +- + lib/cpumask.c | 9 ++ + lib/smp_processor_id.c | 6 +- + mm/allocpercpu.c | 4 +- + mm/vmstat.c | 2 +- + net/core/dev.c | 4 +- + net/iucv/iucv.c | 2 +- + net/sunrpc/svc.c | 3 +- + 51 files changed, 444 insertions(+), 270 deletions(-) +Merging ftrace/auto-ftrace-next +$ git merge ftrace/auto-ftrace-next +Merge made by recursive. + kernel/trace/trace_irqsoff.c | 6 ++++-- + kernel/trace/trace_sched_wakeup.c | 27 ++++++++++++++++----------- + 2 files changed, 20 insertions(+), 13 deletions(-) +Merging genirq/auto-genirq-next +$ git merge genirq/auto-genirq-next +Merge made by recursive. + kernel/irq/spurious.c | 146 ++++++++++++++++++++++++++++++------------------ + 1 files changed, 91 insertions(+), 55 deletions(-) +Merging safe-poison-pointers/auto-safe-poison-pointers-next +$ git merge safe-poison-pointers/auto-safe-poison-pointers-next +Auto-merged arch/x86/Kconfig +Merge made by recursive. + arch/x86/Kconfig | 5 +++++ + include/linux/poison.h | 10 ++++++++-- + 2 files changed, 13 insertions(+), 2 deletions(-) +Merging sched/auto-sched-next +$ git merge sched/auto-sched-next +Auto-merged include/linux/cpumask.h +Auto-merged include/linux/sched.h +Auto-merged init/main.c +Auto-merged kernel/cpu.c +Auto-merged kernel/cpuset.c +Auto-merged kernel/rcuclassic.c +Auto-merged kernel/sched.c +Auto-merged kernel/sched_fair.c +CONFLICT (content): Merge conflict in kernel/sched_fair.c +Auto-merged kernel/sched_rt.c +Resolved 'kernel/sched_fair.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 14a9367: Merge commit 'sched/auto-sched-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/kernel/signal_32.c | 3 - + arch/x86/kernel/signal_64.c | 3 - + include/asm-x86/thread_info.h | 4 +- + include/linux/cpumask.h | 6 +- + include/linux/cpuset.h | 7 + + include/linux/rcuclassic.h | 28 +++-- + include/linux/sched.h | 11 ++- + init/main.c | 7 + + kernel/Kconfig.hz | 2 +- + kernel/Makefile | 2 + + kernel/cpu.c | 40 +++++- + kernel/cpuset.c | 2 +- + kernel/rcuclassic.c | 177 ++++++++++++++---------- + kernel/sched.c | 313 ++++++++++++++--------------------------- + kernel/sched_fair.c | 8 +- + kernel/sched_rt.c | 77 +++++++---- + 16 files changed, 351 insertions(+), 339 deletions(-) +Merging stackprotector/auto-stackprotector-next +$ git merge stackprotector/auto-stackprotector-next +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/Kconfig.debug +Auto-merged arch/x86/kernel/Makefile +Auto-merged arch/x86/kernel/process_64.c +Auto-merged include/linux/sched.h +Auto-merged init/main.c +Auto-merged kernel/sched.c +Merge made by recursive. + arch/x86/Kconfig | 23 ++++++++++------------- + arch/x86/Kconfig.debug | 1 + + arch/x86/Makefile | 2 +- + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/process_64.c | 13 ++++++++++++- + arch/x86/mm/fault.c | 7 +++++++ + include/asm-x86/pda.h | 3 +-- + include/asm-x86/stackprotector.h | 38 ++++++++++++++++++++++++++++++++++++++ + include/asm-x86/system.h | 6 +++++- + include/linux/magic.h | 1 + + include/linux/sched.h | 16 ++++++++++++++-- + include/linux/stackprotector.h | 16 ++++++++++++++++ + init/main.c | 7 +++++++ + kernel/exit.c | 5 +---- + kernel/fork.c | 5 +++++ + kernel/panic.c | 12 +++++++++++- + kernel/sched.c | 7 +------ + 17 files changed, 132 insertions(+), 31 deletions(-) + create mode 100644 include/asm-x86/stackprotector.h + create mode 100644 include/linux/stackprotector.h +Merging timers/auto-timers-next +$ git merge timers/auto-timers-next +Auto-merged arch/sparc64/kernel/process.c +Auto-merged arch/x86/kernel/process_64.c +Auto-merged kernel/time/tick-sched.c +Merge made by recursive. + arch/arm/kernel/process.c | 2 +- + arch/avr32/kernel/process.c | 2 +- + arch/blackfin/kernel/process.c | 2 +- + arch/mips/kernel/process.c | 2 +- + arch/powerpc/kernel/idle.c | 2 +- + arch/powerpc/platforms/iseries/setup.c | 4 +- + arch/s390/kernel/process.c | 2 +- + arch/sh/kernel/process_32.c | 2 +- + arch/sparc64/kernel/process.c | 2 +- + arch/um/kernel/process.c | 2 +- + arch/x86/kernel/process_32.c | 2 +- + arch/x86/kernel/process_64.c | 2 +- + drivers/char/hpet.c | 63 ++++++++++++++++++++++++++++++++ + include/linux/hpet.h | 3 +- + include/linux/tick.h | 5 ++- + kernel/softirq.c | 2 +- + kernel/time/tick-sched.c | 12 +++++- + 17 files changed, 92 insertions(+), 19 deletions(-) +Merging x86/auto-x86-next +$ git merge x86/auto-x86-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/kernel/Makefile +Auto-merged arch/x86/kernel/genapic_flat_64.c +Auto-merged arch/x86/kernel/genx2apic_uv_x.c +Auto-merged arch/x86/kernel/io_apic_64.c +Auto-merged arch/x86/kernel/paravirt.c +Auto-merged arch/x86/kernel/setup.c +Auto-merged arch/x86/kernel/smpboot.c +Auto-merged arch/x86/xen/enlighten.c +Auto-merged drivers/pci/dmar.c +CONFLICT (content): Merge conflict in drivers/pci/dmar.c +Auto-merged include/asm-x86/ipi.h +Auto-merged include/asm-x86/paravirt.h +Auto-merged kernel/irq/manage.c +Resolved 'drivers/pci/dmar.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit ebdd3a4: Merge commit 'x86/auto-x86-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 6 + + arch/x86/Kconfig | 8 + + arch/x86/kernel/Makefile | 2 + + arch/x86/kernel/acpi/boot.c | 4 +- + arch/x86/kernel/apic_32.c | 41 ++- + arch/x86/kernel/apic_64.c | 237 ++++++++++- + arch/x86/kernel/cpu/common_64.c | 2 + + arch/x86/kernel/cpu/feature_names.c | 2 +- + arch/x86/kernel/genapic_64.c | 83 ++--- + arch/x86/kernel/genapic_flat_64.c | 62 +++- + arch/x86/kernel/genx2apic_cluster.c | 164 +++++++ + arch/x86/kernel/genx2apic_phys.c | 161 +++++++ + arch/x86/kernel/genx2apic_uv_x.c | 66 +++- + arch/x86/kernel/i8259.c | 24 + + arch/x86/kernel/io_apic_32.c | 5 +- + arch/x86/kernel/io_apic_64.c | 608 +++++++++++++++++++++++++-- + arch/x86/kernel/mpparse.c | 2 + + arch/x86/kernel/paravirt.c | 2 - + arch/x86/kernel/setup.c | 2 + + arch/x86/kernel/smpboot.c | 38 +- + arch/x86/kernel/vmi_32.c | 4 +- + arch/x86/lguest/boot.c | 38 ++- + arch/x86/mach-generic/bigsmp.c | 5 +- + arch/x86/mach-generic/es7000.c | 3 +- + arch/x86/mach-generic/numaq.c | 4 +- + arch/x86/mach-generic/summit.c | 5 +- + arch/x86/xen/enlighten.c | 45 ++- + drivers/pci/Makefile | 2 + + drivers/pci/dma_remapping.h | 157 +++++++ + drivers/pci/dmar.c | 397 +++++++++++++++++- + drivers/pci/intel-iommu.c | 164 ++------ + drivers/pci/intel-iommu.h | 233 +++++------ + drivers/pci/intr_remapping.c | 471 +++++++++++++++++++++ + drivers/pci/intr_remapping.h | 8 + + include/asm-x86/apic.h | 65 +++- + include/asm-x86/apicdef.h | 3 + + include/asm-x86/cpufeature.h | 2 + + include/asm-x86/genapic_64.h | 8 + + include/asm-x86/hw_irq.h | 2 + + include/asm-x86/i8259.h | 3 + + include/asm-x86/io_apic.h | 20 + + include/asm-x86/ipi.h | 16 +- + include/asm-x86/irq_remapping.h | 8 + + include/asm-x86/mach-default/mach_apic.h | 4 +- + include/asm-x86/mach-default/mach_apicdef.h | 6 +- + include/asm-x86/mach-es7000/mach_apic.h | 2 +- + include/asm-x86/msidef.h | 4 + + include/asm-x86/paravirt.h | 19 - + include/asm-x86/smp.h | 17 +- + include/linux/dmar.h | 127 +++++-- + include/linux/irq.h | 1 + + kernel/irq/manage.c | 9 +- + 52 files changed, 2854 insertions(+), 517 deletions(-) + create mode 100644 arch/x86/kernel/genx2apic_cluster.c + create mode 100644 arch/x86/kernel/genx2apic_phys.c + create mode 100644 drivers/pci/dma_remapping.h + create mode 100644 drivers/pci/intr_remapping.c + create mode 100644 drivers/pci/intr_remapping.h + create mode 100644 include/asm-x86/irq_remapping.h +Merging pci/linux-next +$ git merge pci/linux-next +Already up-to-date. +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Merge made by recursive. + drivers/md/dm-exception-store.c | 29 +++++++++++++++++++---------- + drivers/md/dm-mpath.c | 22 ++++++++++++---------- + 2 files changed, 31 insertions(+), 20 deletions(-) +Merging hid/mm +$ git merge hid/mm +Already up-to-date. +Merging quilt/i2c +$ git merge quilt/i2c +Auto-merged include/linux/i2c-id.h +Merge made by recursive. + arch/arm/mach-omap1/board-h3.c | 4 + + arch/arm/mach-omap2/board-h4.c | 11 +++ + drivers/i2c/chips/isp1301_omap.c | 141 +++++++++++++-------------------- + drivers/video/matrox/i2c-matroxfb.c | 21 +++-- + drivers/video/matrox/matroxfb_maven.c | 97 +++++++++------------- + include/linux/i2c-id.h | 2 - + 6 files changed, 123 insertions(+), 153 deletions(-) +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Merge made by recursive. + Documentation/00-INDEX | 6 ------ + Documentation/early-userspace/00-INDEX | 8 ++++++++ + Documentation/{ => early-userspace}/initrd.txt | 6 +++--- + Documentation/timers/00-INDEX | 10 ++++++++++ + Documentation/{ => timers}/hpet.txt | 0 + Documentation/x86/00-INDEX | 4 ++++ + Documentation/{ => x86}/mtrr.txt | 4 ++-- + scripts/kernel-doc | 1 + + 8 files changed, 28 insertions(+), 11 deletions(-) + create mode 100644 Documentation/early-userspace/00-INDEX + rename Documentation/{ => early-userspace}/initrd.txt (99%) + create mode 100644 Documentation/timers/00-INDEX + rename Documentation/{ => timers}/hpet.txt (100%) + create mode 100644 Documentation/x86/00-INDEX + rename Documentation/{ => x86}/mtrr.txt (99%) +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Auto-merged arch/avr32/mach-at32ap/at32ap700x.c +Merge made by recursive. + arch/avr32/boards/atstk1000/atstk1003.c | 2 +- + arch/avr32/boards/atstk1000/atstk1004.c | 2 +- + arch/avr32/mach-at32ap/at32ap700x.c | 13 ++++++------- + drivers/mmc/host/atmel-mci.c | 1 + + 4 files changed, 9 insertions(+), 9 deletions(-) +Merging v4l-dvb/stable +$ git merge v4l-dvb/stable +Auto-merged drivers/media/dvb/dvb-core/dvb_net.c +Auto-merged include/linux/i2c-id.h +Merge made by recursive. + 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 + + 5 files changed, 1689 insertions(+), 0 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 +Merge made by recursive. + arch/s390/kernel/ipl.c | 5 +- + arch/s390/lib/delay.c | 4 +- + drivers/s390/block/dasd_alias.c | 4 +- + drivers/s390/block/dasd_devmap.c | 16 +++- + drivers/s390/block/dasd_eckd.c | 147 ++++++++++++++++++++++------- + drivers/s390/block/dasd_eckd.h | 184 ++++++++++++------------------------- + drivers/s390/block/dasd_int.h | 1 + + drivers/s390/char/sclp.c | 6 +- + drivers/s390/net/qeth_core.h | 5 +- + drivers/s390/net/qeth_core_main.c | 59 +++++++++--- + drivers/s390/net/qeth_l2_main.c | 50 ++++++++-- + drivers/s390/net/qeth_l3_main.c | 51 ++++++++--- + include/asm-s390/hardirq.h | 14 +++ + include/asm-s390/ipl.h | 3 +- + include/asm-s390/setup.h | 1 - + include/linux/page-flags.h | 3 - + mm/rmap.c | 3 +- + 17 files changed, 343 insertions(+), 213 deletions(-) +Merging sh/master +$ git merge sh/master +Removed arch/sh/boot/compressed/vmlinux.scr +Removed arch/sh/kernel/cpu/sh4a/clock-sh7343.c +Auto-merged arch/sh/kernel/process_32.c +Auto-merged drivers/serial/sh-sci.c +Merge made by recursive. + arch/sh/Kconfig | 33 + + arch/sh/Kconfig.debug | 3 +- + arch/sh/Makefile | 4 + + arch/sh/boards/dreamcast/rtc.c | 4 +- + arch/sh/boards/renesas/ap325rxa/Makefile | 1 + + arch/sh/boards/renesas/ap325rxa/setup.c | 107 +++ + arch/sh/boards/renesas/migor/setup.c | 7 +- + arch/sh/boards/renesas/rsk7203/Makefile | 1 + + arch/sh/boards/renesas/rsk7203/setup.c | 126 +++ + arch/sh/boards/renesas/sh7763rdp/Makefile | 1 + + arch/sh/boards/renesas/sh7763rdp/irq.c | 45 + + arch/sh/boards/renesas/sh7763rdp/setup.c | 128 +++ + arch/sh/boards/renesas/sh7785lcr/Makefile | 1 + + arch/sh/boards/renesas/sh7785lcr/setup.c | 302 +++++++ + arch/sh/boards/se/7343/irq.c | 232 ++---- + arch/sh/boards/se/7343/setup.c | 70 ++- + arch/sh/boards/se/770x/io.c | 59 +- + arch/sh/boards/se/770x/setup.c | 53 +- + arch/sh/boards/se/7722/setup.c | 8 +- + arch/sh/boot/compressed/Makefile_32 | 5 +- + arch/sh/boot/compressed/Makefile_64 | 5 +- + arch/sh/boot/compressed/piggy.S | 8 + + arch/sh/boot/compressed/vmlinux.scr | 9 - + arch/sh/configs/ap325rxa_defconfig | 947 ++++++++++++++++++++ + arch/sh/configs/se7343_defconfig | 735 ++++++++-------- + arch/sh/configs/se7712_defconfig | 659 ++++++-------- + arch/sh/configs/sh7763rdp_defconfig | 1052 ++++++++++++++++++++++ + arch/sh/configs/sh7785lcr_defconfig | 1388 +++++++++++++++++++++++++++++ + arch/sh/drivers/pci/Makefile | 1 + + arch/sh/drivers/pci/fixups-sh7785lcr.c | 46 + + arch/sh/drivers/pci/ops-dreamcast.c | 2 + + arch/sh/drivers/pci/ops-sh7785lcr.c | 66 ++ + arch/sh/drivers/pci/pci-auto.c | 2 +- + arch/sh/drivers/pci/pci.c | 2 +- + arch/sh/kernel/Makefile_32 | 2 +- + arch/sh/kernel/cf-enabler.c | 2 +- + arch/sh/kernel/cpu/clock.c | 20 +- + arch/sh/kernel/cpu/irq/intc.c | 31 +- + arch/sh/kernel/cpu/sh2/entry.S | 133 ++-- + arch/sh/kernel/cpu/sh2/ex.S | 15 +- + arch/sh/kernel/cpu/sh2/setup-sh7619.c | 24 + + arch/sh/kernel/cpu/sh2a/Makefile | 2 +- + arch/sh/kernel/cpu/sh2a/entry.S | 249 ++++++ + arch/sh/kernel/cpu/sh2a/ex.S | 72 ++ + arch/sh/kernel/cpu/sh3/ex.S | 38 +- + arch/sh/kernel/cpu/sh4/probe.c | 6 +- + arch/sh/kernel/cpu/sh4a/Makefile | 2 +- + arch/sh/kernel/cpu/sh4a/clock-sh7343.c | 99 -- + arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 221 ++++-- + arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 253 ++++++ + arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 139 +++- + arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 85 ++- + arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 138 +++- + arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 21 +- + arch/sh/kernel/cpu/sh4a/setup-sh7780.c | 11 +- + arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 17 +- + arch/sh/kernel/entry-common.S | 2 +- + arch/sh/kernel/process_32.c | 14 +- + arch/sh/kernel/process_64.c | 10 - + arch/sh/kernel/ptrace_32.c | 23 + + arch/sh/kernel/setup.c | 7 + + arch/sh/kernel/signal_32.c | 36 +- + arch/sh/kernel/time_32.c | 2 +- + arch/sh/kernel/timers/timer-tmu.c | 2 +- + arch/sh/kernel/traps_32.c | 4 + + arch/sh/lib/Makefile | 4 +- + arch/sh/mm/Kconfig | 12 +- + arch/sh/mm/cache-debugfs.c | 2 +- + arch/sh/mm/cache-sh4.c | 59 +- + arch/sh/mm/consistent.c | 30 + + arch/sh/mm/fault_32.c | 12 +- + arch/sh/mm/pg-sh4.c | 2 +- + arch/sh/mm/pg-sh7705.c | 2 +- + arch/sh/mm/pmb.c | 2 +- + arch/sh/tools/mach-types | 4 + + drivers/input/keyboard/sh_keysc.c | 27 +- + drivers/serial/sh-sci.c | 17 +- + drivers/serial/sh-sci.h | 38 +- + fs/Kconfig.binfmt | 2 +- + fs/binfmt_elf_fdpic.c | 45 +- + include/asm-sh/clock.h | 21 +- + include/asm-sh/cpu-sh4/cacheflush.h | 1 - + include/asm-sh/cpu-sh4/freq.h | 4 + + include/asm-sh/device.h | 5 + + include/asm-sh/elf.h | 53 ++- + include/asm-sh/hw_irq.h | 4 +- + include/asm-sh/migor.h | 4 - + include/asm-sh/mmu.h | 4 + + include/asm-sh/page.h | 2 + + include/asm-sh/pgtable_32.h | 4 +- + include/asm-sh/processor.h | 1 + + include/asm-sh/processor_32.h | 5 +- + include/asm-sh/processor_64.h | 4 - + include/asm-sh/ptrace.h | 5 + + include/asm-sh/se.h | 17 + + include/asm-sh/se7343.h | 93 ++- + include/asm-sh/se7722.h | 4 - + include/asm-sh/segment.h | 30 +- + include/asm-sh/sh7763rdp.h | 54 ++ + include/asm-sh/sh7785lcr.h | 55 ++ + include/asm-sh/system.h | 8 - + include/asm-sh/thread_info.h | 2 + + include/asm-sh/timer.h | 1 - + include/asm-sh/uaccess.h | 222 +++++ + include/asm-sh/uaccess_32.h | 341 +------ + include/asm-sh/uaccess_64.h | 206 ----- + include/asm-sh/unistd.h | 14 +- + include/linux/maple.h | 2 - + 108 files changed, 7207 insertions(+), 2009 deletions(-) + create mode 100644 arch/sh/boards/renesas/ap325rxa/Makefile + create mode 100644 arch/sh/boards/renesas/ap325rxa/setup.c + create mode 100644 arch/sh/boards/renesas/rsk7203/Makefile + create mode 100644 arch/sh/boards/renesas/rsk7203/setup.c + create mode 100644 arch/sh/boards/renesas/sh7763rdp/Makefile + create mode 100644 arch/sh/boards/renesas/sh7763rdp/irq.c + create mode 100644 arch/sh/boards/renesas/sh7763rdp/setup.c + create mode 100644 arch/sh/boards/renesas/sh7785lcr/Makefile + create mode 100644 arch/sh/boards/renesas/sh7785lcr/setup.c + create mode 100644 arch/sh/boot/compressed/piggy.S + delete mode 100644 arch/sh/boot/compressed/vmlinux.scr + create mode 100644 arch/sh/configs/ap325rxa_defconfig + create mode 100644 arch/sh/configs/sh7763rdp_defconfig + create mode 100644 arch/sh/configs/sh7785lcr_defconfig + create mode 100644 arch/sh/drivers/pci/fixups-sh7785lcr.c + create mode 100644 arch/sh/drivers/pci/ops-sh7785lcr.c + create mode 100644 arch/sh/kernel/cpu/sh2a/entry.S + create mode 100644 arch/sh/kernel/cpu/sh2a/ex.S + delete mode 100644 arch/sh/kernel/cpu/sh4a/clock-sh7343.c + create mode 100644 include/asm-sh/sh7763rdp.h + create mode 100644 include/asm-sh/sh7785lcr.h +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging kbuild/master +$ git merge kbuild/master +Auto-merged Makefile +CONFLICT (content): Merge conflict in Makefile +Auto-merged arch/x86/Kconfig +Auto-merged drivers/misc/Kconfig +Auto-merged drivers/mtd/maps/Kconfig +Auto-merged include/Kbuild +CONFLICT (content): Merge conflict in include/Kbuild +Auto-merged include/asm-generic/vmlinux.lds.h +Auto-merged init/Kconfig +Removed scripts/hdrcheck.sh +Auto-merged sound/oss/Kconfig +Resolved 'Makefile' using previous resolution. +Resolved 'include/Kbuild' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit b3c4ffc: Merge commit 'kbuild/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/sparse.txt | 8 +- + Kbuild | 3 +- + Makefile | 118 ++++++++++++-------- + arch/x86/Kconfig | 4 +- + drivers/media/radio/Kconfig | 16 ++-- + drivers/misc/Kconfig | 2 +- + drivers/mtd/devices/Kconfig | 3 +- + drivers/mtd/maps/Kconfig | 2 +- + include/Kbuild | 4 +- + include/asm-generic/vmlinux.lds.h | 4 +- + init/Kconfig | 4 +- + scripts/Makefile.headersinst | 230 +++++++++++-------------------------- + scripts/diffconfig | 129 +++++++++++++++++++++ + scripts/hdrcheck.sh | 10 -- + scripts/headers.sh | 41 +++++++ + scripts/headers_check.pl | 56 +++++++++ + scripts/headers_install.pl | 45 +++++++ + scripts/kconfig/conf.c | 161 +++++++++++--------------- + scripts/kconfig/confdata.c | 72 ++++++++++++- + scripts/kconfig/lkc.h | 11 ++ + scripts/kconfig/menu.c | 41 ++++++- + scripts/kconfig/util.c | 16 +++ + scripts/setlocalversion | 4 +- + sound/oss/Kconfig | 10 +- + 24 files changed, 646 insertions(+), 348 deletions(-) + create mode 100755 scripts/diffconfig + delete mode 100755 scripts/hdrcheck.sh + create mode 100755 scripts/headers.sh + create mode 100644 scripts/headers_check.pl + create mode 100644 scripts/headers_install.pl +$ git revert 9ba4ff5059e1a26698786373c8c71321c37ef7f9 +Finished one revert. +Created commit f730f87: Revert "kconfig: normalize int/hex values" + 4 files changed, 6 insertions(+), 55 deletions(-) +Merging quilt/ide +$ git merge quilt/ide +Auto-merged drivers/ide/ide-probe.c +Auto-merged drivers/ide/ide-tape.c +Removed include/asm-alpha/ide.h +Removed include/asm-blackfin/ide.h +Removed include/asm-cris/arch-v10/ide.h +Removed include/asm-cris/arch-v32/ide.h +Removed include/asm-cris/ide.h +Removed include/asm-h8300/ide.h +Removed include/asm-ia64/ide.h +Removed include/asm-m32r/ide.h +Removed include/asm-sh/ide.h +Removed include/asm-x86/ide.h +Removed include/asm-xtensa/ide.h +Merge made by recursive. + drivers/ide/Kconfig | 2 +- + drivers/ide/Makefile | 9 +- + drivers/ide/arm/icside.c | 10 +- + drivers/ide/arm/palm_bk3710.c | 12 +- + drivers/ide/arm/rapide.c | 6 + + drivers/ide/ide-acpi.c | 6 +- + drivers/ide/ide-cd.c | 54 ++++++-- + drivers/ide/ide-disk.c | 85 ++++++------- + drivers/ide/ide-dma.c | 56 ++++---- + drivers/ide/ide-floppy.c | 26 +++-- + drivers/ide/ide-generic.c | 36 +++++- + drivers/ide/ide-io.c | 2 - + drivers/ide/ide-iops.c | 173 ++++++------------------- + drivers/ide/ide-lib.c | 24 ++-- + drivers/ide/ide-probe.c | 203 +++++++++++++++-------------- + drivers/ide/ide-proc.c | 9 +- + drivers/ide/ide-tape.c | 39 ++++--- + drivers/ide/ide-taskfile.c | 18 ++- + drivers/ide/ide-timings.c | 21 ++-- + drivers/ide/ide.c | 112 +++++++++++++++-- + drivers/ide/legacy/gayle.c | 8 +- + drivers/ide/legacy/ht6560b.c | 24 +---- + drivers/ide/legacy/qd65xx.c | 22 ++-- + drivers/ide/pci/aec62xx.c | 76 +++++++---- + drivers/ide/pci/alim15x3.c | 22 ++- + drivers/ide/pci/amd74xx.c | 155 +++++++++++------------ + drivers/ide/pci/atiixp.c | 20 ++- + drivers/ide/pci/cmd64x.c | 50 +++---- + drivers/ide/pci/cs5520.c | 24 ++-- + drivers/ide/pci/cs5530.c | 30 +++-- + drivers/ide/pci/cs5535.c | 13 ++- + drivers/ide/pci/cy82c693.c | 35 ++++- + drivers/ide/pci/generic.c | 78 ++++++------ + drivers/ide/pci/hpt34x.c | 21 ++- + drivers/ide/pci/hpt366.c | 191 ++++++++++++++-------------- + drivers/ide/pci/it8213.c | 35 +++--- + drivers/ide/pci/it821x.c | 125 ++++++++++-------- + drivers/ide/pci/jmicron.c | 13 ++- + drivers/ide/pci/ns87415.c | 13 ++- + drivers/ide/pci/opti621.c | 13 ++- + drivers/ide/pci/pdc202xx_new.c | 82 +++++++----- + drivers/ide/pci/pdc202xx_old.c | 55 +++++---- + drivers/ide/pci/piix.c | 118 ++++++++--------- + drivers/ide/pci/rz1000.c | 13 ++- + drivers/ide/pci/sc1200.c | 60 +++++---- + drivers/ide/pci/serverworks.c | 44 +++++-- + drivers/ide/pci/siimage.c | 169 ++++++++++++++---------- + drivers/ide/pci/sis5513.c | 39 ++++-- + drivers/ide/pci/sl82c105.c | 17 ++- + drivers/ide/pci/slc90e66.c | 13 ++- + drivers/ide/pci/tc86c001.c | 57 ++++++-- + drivers/ide/pci/triflex.c | 13 ++- + drivers/ide/pci/trm290.c | 17 ++- + drivers/ide/pci/via82cxxx.c | 139 +++++++++++--------- + drivers/ide/ppc/pmac.c | 6 +- + drivers/ide/setup-pci.c | 240 +++++++++++++++++++++++------------ + drivers/scsi/ide-scsi.c | 46 ++++--- + include/asm-alpha/ide.h | 44 ------- + include/asm-arm/ide.h | 4 - + include/asm-blackfin/ide.h | 27 ---- + include/asm-cris/arch-v10/ide.h | 91 ------------- + include/asm-cris/arch-v32/ide.h | 56 -------- + include/asm-cris/ide.h | 1 - + include/asm-frv/ide.h | 4 - + include/asm-h8300/ide.h | 26 ---- + include/asm-ia64/ide.h | 51 -------- + include/asm-m32r/ide.h | 70 ---------- + include/asm-m68k/ide.h | 4 - + include/asm-mips/mach-generic/ide.h | 48 ------- + include/asm-mn10300/ide.h | 4 - + include/asm-parisc/ide.h | 4 - + include/asm-powerpc/ide.h | 26 ---- + include/asm-sh/ide.h | 21 --- + include/asm-sparc/ide.h | 3 - + include/asm-x86/ide.h | 65 ---------- + include/asm-xtensa/ide.h | 35 ----- + include/linux/ata.h | 122 +++++++++++------- + include/linux/ide.h | 50 ++++++-- + 78 files changed, 1837 insertions(+), 1918 deletions(-) + delete mode 100644 include/asm-alpha/ide.h + delete mode 100644 include/asm-blackfin/ide.h + delete mode 100644 include/asm-cris/arch-v10/ide.h + delete mode 100644 include/asm-cris/arch-v32/ide.h + delete mode 100644 include/asm-cris/ide.h + delete mode 100644 include/asm-h8300/ide.h + delete mode 100644 include/asm-ia64/ide.h + delete mode 100644 include/asm-m32r/ide.h + delete mode 100644 include/asm-sh/ide.h + delete mode 100644 include/asm-x86/ide.h + delete mode 100644 include/asm-xtensa/ide.h +Applying ide: fix typo in drivers/ide/ppc/pmac.c +Merging libata/NEXT +$ git merge libata/NEXT +Already up-to-date. +Merging nfs/linux-next +$ git merge nfs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Merge made by recursive. + fs/dcache.c | 102 +++++ + fs/xfs/Makefile | 3 +- + fs/xfs/linux-2.6/kmem.c | 6 +- + fs/xfs/linux-2.6/kmem.h | 4 +- + fs/xfs/linux-2.6/xfs_aops.c | 5 +- + fs/xfs/linux-2.6/xfs_buf.c | 14 +- + fs/xfs/linux-2.6/xfs_buf.h | 2 +- + fs/xfs/linux-2.6/xfs_export.c | 2 +- + fs/xfs/linux-2.6/xfs_ioctl.c | 376 ++++++++++++++-- + fs/xfs/linux-2.6/xfs_iops.c | 345 +++++---------- + fs/xfs/linux-2.6/xfs_iops.h | 2 + + fs/xfs/linux-2.6/xfs_linux.h | 8 + + fs/xfs/linux-2.6/xfs_stats.c | 15 +- + fs/xfs/linux-2.6/xfs_stats.h | 12 +- + fs/xfs/linux-2.6/xfs_super.c | 949 ++++++++++++++++++++++++++++++++++++---- + fs/xfs/linux-2.6/xfs_super.h | 4 +- + fs/xfs/linux-2.6/xfs_sysctl.c | 8 +- + fs/xfs/linux-2.6/xfs_sysctl.h | 4 +- + fs/xfs/linux-2.6/xfs_vnode.c | 50 --- + fs/xfs/linux-2.6/xfs_vnode.h | 89 ---- + fs/xfs/linux-2.6/xfs_xattr.c | 330 ++++++++++++++ + fs/xfs/quota/xfs_dquot.c | 3 +- + fs/xfs/quota/xfs_dquot.h | 2 +- + fs/xfs/quota/xfs_dquot_item.c | 4 +- + fs/xfs/quota/xfs_qm.c | 24 +- + fs/xfs/quota/xfs_qm_syscalls.c | 12 +- + fs/xfs/quota/xfs_quota_priv.h | 3 - + fs/xfs/support/ktrace.c | 4 +- + fs/xfs/support/uuid.c | 8 +- + fs/xfs/support/uuid.h | 1 - + fs/xfs/xfs_acl.c | 21 +- + fs/xfs/xfs_acl.h | 4 +- + fs/xfs/xfs_attr.c | 608 ++++---------------------- + fs/xfs/xfs_attr.h | 90 ++--- + fs/xfs/xfs_attr_leaf.c | 99 ++--- + fs/xfs/xfs_attr_leaf.h | 29 +-- + fs/xfs/xfs_attr_sf.h | 10 +- + fs/xfs/xfs_bit.c | 103 ----- + fs/xfs/xfs_bit.h | 34 ++- + fs/xfs/xfs_bmap.c | 118 +++--- + fs/xfs/xfs_bmap.h | 13 +- + fs/xfs/xfs_bmap_btree.c | 76 ++-- + fs/xfs/xfs_buf_item.c | 8 +- + fs/xfs/xfs_clnt.h | 1 + + fs/xfs/xfs_da_btree.c | 48 ++- + fs/xfs/xfs_da_btree.h | 36 ++- + fs/xfs/xfs_dfrag.c | 4 +- + fs/xfs/xfs_dir2.c | 125 +++++- + fs/xfs/xfs_dir2.h | 6 +- + fs/xfs/xfs_dir2_block.c | 56 ++- + fs/xfs/xfs_dir2_data.c | 5 +- + fs/xfs/xfs_dir2_leaf.c | 93 +++-- + fs/xfs/xfs_dir2_node.c | 402 ++++++++++------- + fs/xfs/xfs_dir2_sf.c | 83 ++-- + fs/xfs/xfs_dir2_sf.h | 6 +- + fs/xfs/xfs_dir2_trace.c | 20 +- + fs/xfs/xfs_dmapi.h | 2 +- + fs/xfs/xfs_error.c | 13 +- + fs/xfs/xfs_error.h | 1 - + fs/xfs/xfs_extfree_item.c | 6 +- + fs/xfs/xfs_filestream.c | 4 +- + fs/xfs/xfs_fs.h | 4 + + fs/xfs/xfs_fsops.c | 4 +- + fs/xfs/xfs_inode.c | 165 +++----- + fs/xfs/xfs_inode.h | 3 - + fs/xfs/xfs_inode_item.c | 7 +- + fs/xfs/xfs_iomap.c | 10 + + fs/xfs/xfs_itable.c | 6 +- + fs/xfs/xfs_log.c | 49 +- + fs/xfs/xfs_log_priv.h | 6 +- + fs/xfs/xfs_log_recover.c | 21 +- + fs/xfs/xfs_mount.c | 118 ++---- + fs/xfs/xfs_mount.h | 18 +- + fs/xfs/xfs_mru_cache.c | 21 +- + fs/xfs/xfs_rename.c | 22 +- + fs/xfs/xfs_rtalloc.c | 21 +- + fs/xfs/xfs_sb.h | 17 +- + fs/xfs/xfs_trans.c | 4 +- + fs/xfs/xfs_trans_inode.c | 2 +- + fs/xfs/xfs_trans_item.c | 8 +- + fs/xfs/xfs_vfsops.c | 610 +------------------------- + fs/xfs/xfs_vfsops.h | 5 - + fs/xfs/xfs_vnodeops.c | 722 +++++++++---------------------- + fs/xfs/xfs_vnodeops.h | 12 +- + include/linux/dcache.h | 1 + + 85 files changed, 3153 insertions(+), 3218 deletions(-) + create mode 100644 fs/xfs/linux-2.6/xfs_xattr.c +Merging infiniband/for-next +$ git merge infiniband/for-next +Auto-merged drivers/infiniband/hw/ehca/ehca_irq.c +Merge made by recursive. + drivers/infiniband/core/cma.c | 99 ++++++++++++++++++++- + drivers/infiniband/core/iwcm.c | 3 +- + drivers/infiniband/core/sa_query.c | 3 +- + drivers/infiniband/core/verbs.c | 138 +++++++++++++++++++++++++++-- + drivers/infiniband/hw/ehca/ehca_classes.h | 1 + + drivers/infiniband/hw/ehca/ehca_hca.c | 4 +- + drivers/infiniband/hw/ehca/ehca_irq.c | 4 + + drivers/infiniband/hw/ehca/ehca_qp.c | 2 + + drivers/infiniband/hw/ehca/ipz_pt_fn.c | 1 + + drivers/infiniband/hw/mlx4/cq.c | 12 +++ + drivers/infiniband/hw/mlx4/main.c | 11 +++ + drivers/infiniband/hw/mlx4/mlx4_ib.h | 15 +++ + drivers/infiniband/hw/mlx4/mr.c | 70 +++++++++++++++ + drivers/infiniband/hw/mlx4/qp.c | 74 ++++++++++++++-- + drivers/infiniband/hw/mthca/mthca_dev.h | 1 + + drivers/infiniband/hw/mthca/mthca_mr.c | 26 ++++-- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 +- + drivers/infiniband/ulp/iser/iser_verbs.c | 1 + + drivers/net/mlx4/cmd.c | 3 + + drivers/net/mlx4/fw.c | 18 +++-- + drivers/net/mlx4/fw.h | 2 +- + drivers/net/mlx4/main.c | 2 + + drivers/net/mlx4/mlx4.h | 1 + + drivers/net/mlx4/mr.c | 49 ++++++++--- + drivers/net/mlx4/pd.c | 7 ++ + include/linux/mlx4/device.h | 10 ++ + include/linux/mlx4/qp.h | 16 +++- + include/rdma/ib_verbs.h | 60 ++++++++++++- + include/rdma/rdma_cm.h | 4 +- + 29 files changed, 584 insertions(+), 55 deletions(-) +Merging acpi/test +$ git merge acpi/test +Renamed arch/x86/kernel/srat_32.c => arch/x86/mm/srat_32.c +Auto-merged arch/x86/mm/srat_32.c +CONFLICT (rename/modify): Merge conflict in arch/x86/mm/srat_32.c +Auto-merged Documentation/ABI/testing/sysfs-firmware-acpi +CONFLICT (content): Merge conflict in Documentation/ABI/testing/sysfs-firmware-acpi +Auto-merged Documentation/kernel-parameters.txt +Auto-merged MAINTAINERS +Auto-merged arch/ia64/kernel/process.c +Auto-merged arch/x86/kernel/acpi/sleep.c +CONFLICT (content): Merge conflict in arch/x86/kernel/acpi/sleep.c +Auto-merged arch/x86/kernel/process.c +CONFLICT (content): Merge conflict in arch/x86/kernel/process.c +Auto-merged drivers/acpi/bus.c +Auto-merged drivers/acpi/executer/exconfig.c +Auto-merged drivers/acpi/executer/exdump.c +CONFLICT (content): Merge conflict in drivers/acpi/executer/exdump.c +Auto-merged drivers/acpi/fan.c +Auto-merged drivers/acpi/hardware/hwgpe.c +CONFLICT (content): Merge conflict in drivers/acpi/hardware/hwgpe.c +Auto-merged drivers/acpi/namespace/nsxfeval.c +Auto-merged drivers/acpi/processor_core.c +Auto-merged drivers/acpi/processor_idle.c +Auto-merged drivers/acpi/processor_throttling.c +CONFLICT (content): Merge conflict in drivers/acpi/processor_throttling.c +Auto-merged drivers/acpi/scan.c +CONFLICT (content): Merge conflict in drivers/acpi/scan.c +Auto-merged drivers/acpi/sleep/main.c +CONFLICT (content): Merge conflict in drivers/acpi/sleep/main.c +Auto-merged drivers/acpi/system.c +CONFLICT (content): Merge conflict in drivers/acpi/system.c +Auto-merged drivers/acpi/tables/tbfadt.c +Auto-merged drivers/acpi/utilities/utmisc.c +Auto-merged drivers/acpi/video.c +CONFLICT (content): Merge conflict in drivers/acpi/video.c +Auto-merged drivers/char/apm-emulation.c +CONFLICT (content): Merge conflict in drivers/char/apm-emulation.c +Auto-merged drivers/misc/Kconfig +CONFLICT (content): Merge conflict in drivers/misc/Kconfig +Auto-merged drivers/misc/Makefile +Auto-merged drivers/misc/compal-laptop.c +CONFLICT (add/add): Merge conflict in drivers/misc/compal-laptop.c +Auto-merged drivers/misc/fujitsu-laptop.c +CONFLICT (content): Merge conflict in drivers/misc/fujitsu-laptop.c +Auto-merged drivers/pci/pci-acpi.c +Auto-merged drivers/pci/pci.c +CONFLICT (content): Merge conflict in drivers/pci/pci.c +Auto-merged drivers/pci/pci.h +CONFLICT (content): Merge conflict in drivers/pci/pci.h +Auto-merged drivers/serial/8250_pnp.c +Auto-merged include/acpi/acconfig.h +CONFLICT (content): Merge conflict in include/acpi/acconfig.h +Auto-merged include/acpi/acexcep.h +CONFLICT (content): Merge conflict in include/acpi/acexcep.h +Auto-merged include/acpi/acmacros.h +CONFLICT (content): Merge conflict in include/acpi/acmacros.h +Auto-merged include/acpi/acpi_bus.h +CONFLICT (content): Merge conflict in include/acpi/acpi_bus.h +Auto-merged include/acpi/actbl1.h +CONFLICT (content): Merge conflict in include/acpi/actbl1.h +Auto-merged include/acpi/actypes.h +CONFLICT (content): Merge conflict in include/acpi/actypes.h +Auto-merged include/asm-x86/processor.h +Auto-merged include/linux/ioport.h +CONFLICT (content): Merge conflict in include/linux/ioport.h +Auto-merged include/linux/sched.h +Auto-merged kernel/cpu.c +Auto-merged kernel/kthread.c +Resolved 'Documentation/ABI/testing/sysfs-firmware-acpi' using previous resolution. +Resolved 'arch/x86/kernel/acpi/sleep.c' using previous resolution. +Resolved 'arch/x86/mm/srat_32.c' using previous resolution. +Resolved 'drivers/acpi/executer/exdump.c' using previous resolution. +Resolved 'drivers/acpi/hardware/hwgpe.c' using previous resolution. +Resolved 'drivers/acpi/processor_throttling.c' using previous resolution. +Resolved 'drivers/acpi/scan.c' using previous resolution. +Resolved 'drivers/acpi/sleep/main.c' using previous resolution. +Resolved 'drivers/acpi/system.c' using previous resolution. +Resolved 'drivers/acpi/video.c' using previous resolution. +Resolved 'drivers/char/apm-emulation.c' using previous resolution. +Resolved 'drivers/misc/Kconfig' using previous resolution. +Resolved 'drivers/misc/compal-laptop.c' using previous resolution. +Resolved 'drivers/misc/fujitsu-laptop.c' using previous resolution. +Resolved 'drivers/pci/pci.c' using previous resolution. +Resolved 'drivers/pci/pci.h' using previous resolution. +Resolved 'include/acpi/acconfig.h' using previous resolution. +Resolved 'include/acpi/acexcep.h' using previous resolution. +Resolved 'include/acpi/acmacros.h' using previous resolution. +Resolved 'include/acpi/acpi_bus.h' using previous resolution. +Resolved 'include/acpi/actbl1.h' using previous resolution. +Resolved 'include/acpi/actypes.h' using previous resolution. +Resolved 'include/linux/ioport.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/x86/kernel/process.c'. +Created commit 5d1e9fc: Merge commit 'acpi/test' +$ git diff -M --stat --summary HEAD^.. + drivers/acpi/events/evxface.c | 2 ++ + drivers/acpi/namespace/nsxfeval.c | 2 ++ + drivers/acpi/utilities/utmisc.c | 2 ++ + 3 files changed, 6 insertions(+), 0 deletions(-) +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Auto-merged arch/blackfin/Kconfig +Removed arch/blackfin/kernel/dualcore_test.c +Auto-merged drivers/serial/bfin_5xx.c +Merge made by recursive. + arch/blackfin/Kconfig | 100 ++- + arch/blackfin/Kconfig.debug | 7 - + arch/blackfin/Makefile | 5 +- + arch/blackfin/configs/BF527-EZKIT_defconfig | 187 ++++- + arch/blackfin/configs/BF533-EZKIT_defconfig | 279 ++---- + arch/blackfin/configs/BF533-STAMP_defconfig | 340 +++---- + arch/blackfin/configs/BF537-STAMP_defconfig | 337 +++---- + arch/blackfin/configs/BF548-EZKIT_defconfig | 63 +- + arch/blackfin/configs/BF561-EZKIT_defconfig | 273 ++---- + arch/blackfin/configs/CM-BF527_defconfig | 1185 +++++++++++++++++++++ + arch/blackfin/configs/CM-BF533_defconfig | 12 +- + arch/blackfin/configs/CM-BF537E_defconfig | 14 +- + arch/blackfin/configs/CM-BF537U_defconfig | 16 +- + arch/blackfin/configs/CM-BF548_defconfig | 8 +- + arch/blackfin/configs/CM-BF561_defconfig | 12 +- + arch/blackfin/configs/PNAV-10_defconfig | 2 +- + arch/blackfin/kernel/Makefile | 1 - + arch/blackfin/kernel/bfin_dma_5xx.c | 26 + + arch/blackfin/kernel/bfin_gpio.c | 118 ++- + arch/blackfin/kernel/cplb-nompu/cplbhdlr.S | 2 +- + arch/blackfin/kernel/cplb-nompu/cplbinit.c | 6 +- + arch/blackfin/kernel/dualcore_test.c | 49 - + arch/blackfin/kernel/entry.S | 5 + + arch/blackfin/kernel/module.c | 74 +- + arch/blackfin/kernel/ptrace.c | 28 + + arch/blackfin/kernel/setup.c | 24 +- + arch/blackfin/kernel/traps.c | 296 +++++- + arch/blackfin/kernel/vmlinux.lds.S | 40 +- + arch/blackfin/mach-bf527/boards/Kconfig | 5 + + arch/blackfin/mach-bf527/boards/Makefile | 1 + + arch/blackfin/mach-bf527/boards/cm_bf527.c | 1011 ++++++++++++++++++ + arch/blackfin/mach-bf527/head.S | 12 +- + arch/blackfin/mach-bf533/head.S | 12 +- + arch/blackfin/mach-bf537/boards/stamp.c | 88 ++- + arch/blackfin/mach-bf537/head.S | 12 +- + arch/blackfin/mach-bf548/boards/ezkit.c | 44 + + arch/blackfin/mach-bf548/head.S | 6 +- + arch/blackfin/mach-bf561/head.S | 6 - + arch/blackfin/mach-common/arch_checks.c | 6 - + arch/blackfin/mach-common/dpmc_modes.S | 607 ++++++++++- + arch/blackfin/mach-common/ints-priority.c | 4 + + arch/blackfin/mach-common/pm.c | 225 ++++- + arch/blackfin/mm/blackfin_sram.c | 543 +++++++--- + arch/blackfin/mm/blackfin_sram.h | 4 +- + arch/blackfin/mm/init.c | 12 +- + drivers/serial/bfin_5xx.c | 60 +- + include/asm-blackfin/bfin-global.h | 8 +- + include/asm-blackfin/dma.h | 8 + + include/asm-blackfin/dpmc.h | 82 +- + include/asm-blackfin/elf.h | 2 + + include/asm-blackfin/gpio.h | 19 +- + include/asm-blackfin/mach-bf527/anomaly.h | 2 + + include/asm-blackfin/mach-bf527/bfin_serial_5xx.h | 3 - + include/asm-blackfin/mach-bf527/bfin_sir.h | 21 +- + include/asm-blackfin/mach-bf527/defBF527.h | 1 + + include/asm-blackfin/mach-bf527/mem_init.h | 27 - + include/asm-blackfin/mach-bf533/bfin_serial_5xx.h | 2 - + include/asm-blackfin/mach-bf533/bfin_sir.h | 13 +- + include/asm-blackfin/mach-bf533/mem_init.h | 27 - + include/asm-blackfin/mach-bf537/bfin_serial_5xx.h | 3 - + include/asm-blackfin/mach-bf537/bfin_sir.h | 21 +- + include/asm-blackfin/mach-bf537/defBF537.h | 1 + + include/asm-blackfin/mach-bf537/mem_init.h | 27 - + include/asm-blackfin/mach-bf548/bfin_serial_5xx.h | 3 - + include/asm-blackfin/mach-bf548/bfin_sir.h | 37 +- + include/asm-blackfin/mach-bf548/gpio.h | 8 + + include/asm-blackfin/mach-bf561/bfin_serial_5xx.h | 2 - + include/asm-blackfin/mach-bf561/bfin_sir.h | 13 +- + include/asm-blackfin/mach-bf561/mem_init.h | 27 - + include/asm-blackfin/module.h | 5 +- + include/asm-blackfin/processor.h | 21 +- + 71 files changed, 4998 insertions(+), 1552 deletions(-) + create mode 100644 arch/blackfin/configs/CM-BF527_defconfig + delete mode 100644 arch/blackfin/kernel/dualcore_test.c + create mode 100644 arch/blackfin/mach-bf527/boards/cm_bf527.c +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Auto-merged net/sunrpc/svc.c +Merge made by recursive. + fs/lockd/svc.c | 2 +- + fs/lockd/svc4proc.c | 4 ++-- + fs/lockd/svcproc.c | 4 ++-- + fs/nfs/callback.c | 3 ++- + fs/nfsd/nfssvc.c | 1 + + include/linux/sunrpc/svc.h | 9 +++++---- + net/sunrpc/svc.c | 11 ++++++----- + net/sunrpc/svc_xprt.c | 39 +++++++++++++++++++++++++++++++++------ + 8 files changed, 52 insertions(+), 21 deletions(-) +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Merge made by recursive. + drivers/firewire/fw-card.c | 2 +- + drivers/firewire/fw-cdev.c | 6 +++--- + drivers/firewire/fw-topology.c | 2 -- + drivers/firewire/fw-transaction.c | 21 +++++++++------------ + 4 files changed, 13 insertions(+), 18 deletions(-) +Merging hwmon/testing +$ git merge hwmon/testing +Auto-merged drivers/hwmon/adt7473.c +Merge made by recursive. + Documentation/hwmon/dme1737 | 4 + + Documentation/hwmon/lm85 | 11 +- + drivers/hwmon/Kconfig | 25 ++- + drivers/hwmon/adt7473.c | 16 +- + drivers/hwmon/dme1737.c | 297 ++++++++++++-------- + drivers/hwmon/lm75.c | 282 +++++++++++++----- + drivers/hwmon/lm85.c | 672 ++++++++++++++++++------------------------- + 7 files changed, 691 insertions(+), 616 deletions(-) +Merging ubi/linux-next +$ git merge ubi/linux-next +Merge made by recursive. + drivers/mtd/ubi/build.c | 93 +++++++++++++---- + drivers/mtd/ubi/cdev.c | 234 +++++++++++++++++++++++++++++++++++++++---- + drivers/mtd/ubi/debug.c | 158 +++++++++++++++-------------- + drivers/mtd/ubi/debug.h | 74 +++++++++----- + drivers/mtd/ubi/eba.c | 77 ++++---------- + drivers/mtd/ubi/gluebi.c | 16 ++-- + drivers/mtd/ubi/io.c | 48 +++++---- + drivers/mtd/ubi/kapi.c | 50 +++++++--- + drivers/mtd/ubi/misc.c | 2 +- + drivers/mtd/ubi/scan.c | 136 +++++++++---------------- + drivers/mtd/ubi/scan.h | 21 ++-- + drivers/mtd/ubi/ubi-media.h | 38 +++---- + drivers/mtd/ubi/ubi.h | 75 ++++++++++----- + drivers/mtd/ubi/upd.c | 32 ++++--- + drivers/mtd/ubi/vmt.c | 148 +++++++++++++++++---------- + drivers/mtd/ubi/vtbl.c | 127 +++++++++++++++++------ + drivers/mtd/ubi/wl.c | 208 +++++++++++++++++++------------------- + include/linux/mtd/ubi.h | 5 +- + include/mtd/ubi-user.h | 76 ++++++++++++-- + 19 files changed, 1006 insertions(+), 612 deletions(-) +Merging kvm/master +$ git merge kvm/master +Auto-merged include/asm-x86/kvm_host.h +Merge made by recursive. + arch/powerpc/kvm/44x_tlb.c | 15 ++- + arch/powerpc/kvm/Kconfig | 11 + + arch/powerpc/kvm/Makefile | 6 +- + arch/powerpc/kvm/emulate.c | 6 + + arch/x86/kvm/i8259.c | 18 +- + arch/x86/kvm/irq.c | 11 + + arch/x86/kvm/irq.h | 2 + + arch/x86/kvm/kvm_cache_regs.h | 32 +++ + arch/x86/kvm/lapic.c | 4 +- + arch/x86/kvm/mmu.c | 27 ++- + arch/x86/kvm/svm.c | 148 ++++++--------- + arch/x86/kvm/vmx.c | 448 +++++++++++++++++++++-------------------- + arch/x86/kvm/vmx.h | 4 +- + arch/x86/kvm/x86.c | 396 ++++++++++++++++++------------------ + arch/x86/kvm/x86.h | 22 ++ + arch/x86/kvm/x86_emulate.c | 19 +- + include/asm-x86/kvm.h | 22 -- + include/asm-x86/kvm_host.h | 45 ++-- + include/linux/kvm.h | 48 ++++- + include/linux/kvm_host.h | 19 ++ + virt/kvm/kvm_trace.c | 30 ++-- + 21 files changed, 735 insertions(+), 598 deletions(-) + create mode 100644 arch/x86/kvm/kvm_cache_regs.h + create mode 100644 arch/x86/kvm/x86.h +Merging dlm/next +$ git merge dlm/next +Auto-merged fs/dlm/user.c +Merge made by recursive. + fs/dlm/lock.c | 4 +++- + fs/dlm/lowcomms.c | 4 +++- + fs/dlm/user.c | 2 +- + 3 files changed, 7 insertions(+), 3 deletions(-) +Merging scsi/master +$ git merge scsi/master +Auto-merged drivers/md/dm-mpath.c +Auto-merged drivers/scsi/st.c +Auto-merged include/scsi/scsi_host.h +Merge made by recursive. + drivers/md/dm-mpath.c | 13 + + drivers/scsi/Kconfig | 1 + + drivers/scsi/Makefile | 2 + + drivers/scsi/device_handler/Kconfig | 8 + + drivers/scsi/device_handler/Makefile | 1 + + drivers/scsi/device_handler/scsi_dh.c | 446 ++++++++++++++- + drivers/scsi/device_handler/scsi_dh_alua.c | 802 +++++++++++++++++++++++++++ + drivers/scsi/device_handler/scsi_dh_emc.c | 644 ++++++++++++++-------- + drivers/scsi/device_handler/scsi_dh_hp_sw.c | 348 +++++++++--- + drivers/scsi/device_handler/scsi_dh_rdac.c | 262 +++++----- + drivers/scsi/qla2xxx/qla_attr.c | 69 ++- + drivers/scsi/qla2xxx/qla_dbg.c | 2 +- + drivers/scsi/qla2xxx/qla_def.h | 12 +- + drivers/scsi/qla2xxx/qla_gbl.h | 5 +- + drivers/scsi/qla2xxx/qla_gs.c | 6 + + drivers/scsi/qla2xxx/qla_init.c | 126 +++-- + drivers/scsi/qla2xxx/qla_iocb.c | 23 +- + drivers/scsi/qla2xxx/qla_isr.c | 4 - + drivers/scsi/qla2xxx/qla_mbx.c | 12 +- + drivers/scsi/qla2xxx/qla_mid.c | 15 +- + drivers/scsi/qla2xxx/qla_os.c | 86 ++-- + drivers/scsi/qla2xxx/qla_sup.c | 48 ++- + drivers/scsi/qla2xxx/qla_version.h | 2 +- + drivers/scsi/qla4xxx/ql4_os.c | 4 +- + drivers/scsi/scsi.c | 55 ++- + drivers/scsi/scsi_error.c | 8 + + drivers/scsi/scsi_lib.c | 49 ++- + drivers/scsi/scsi_priv.h | 1 + + drivers/scsi/scsi_scan.c | 1 + + drivers/scsi/scsi_sysfs.c | 4 + + drivers/scsi/sd.c | 270 +++++++-- + drivers/scsi/sd.h | 48 ++ + drivers/scsi/sd_dif.c | 538 ++++++++++++++++++ + drivers/scsi/st.c | 11 +- + drivers/scsi/stex.c | 2 +- + drivers/scsi/sym53c8xx_2/sym_hipd.c | 2 + + include/scsi/scsi.h | 3 + + include/scsi/scsi_cmnd.h | 86 +++ + include/scsi/scsi_device.h | 14 +- + include/scsi/scsi_dh.h | 11 + + include/scsi/scsi_eh.h | 2 + + include/scsi/scsi_host.h | 86 +++- + 42 files changed, 3422 insertions(+), 710 deletions(-) + create mode 100644 drivers/scsi/device_handler/scsi_dh_alua.c + create mode 100644 drivers/scsi/sd_dif.c +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging tests/master +$ git merge tests/master +Renamed kernel/rtmutex-tester.c => tests/rtmutex-tester.c +Auto-merged tests/rtmutex-tester.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 +Created commit 1baad3e: Merge commit 'tests/master' +$ git diff -M --stat --summary HEAD^.. + Makefile | 1 + + drivers/misc/Makefile | 1 - + kernel/Makefile | 4 - + lib/Kconfig.debug | 93 +-------------------- + lib/Makefile | 1 - + tests/Kconfig | 101 +++++++++++++++++++++++ + tests/Makefile | 10 ++ + {kernel => tests}/backtracetest.c | 0 + {drivers/misc => tests}/lkdtm.c | 0 + {lib => tests}/locking-selftest-hardirq.h | 0 + {lib => tests}/locking-selftest-mutex.h | 0 + {lib => tests}/locking-selftest-rlock-hardirq.h | 0 + {lib => tests}/locking-selftest-rlock-softirq.h | 0 + {lib => tests}/locking-selftest-rlock.h | 0 + {lib => tests}/locking-selftest-rsem.h | 0 + {lib => tests}/locking-selftest-softirq.h | 0 + {lib => tests}/locking-selftest-spin-hardirq.h | 0 + {lib => tests}/locking-selftest-spin-softirq.h | 0 + {lib => tests}/locking-selftest-spin.h | 0 + {lib => tests}/locking-selftest-wlock-hardirq.h | 0 + {lib => tests}/locking-selftest-wlock-softirq.h | 0 + {lib => tests}/locking-selftest-wlock.h | 0 + {lib => tests}/locking-selftest-wsem.h | 0 + {lib => tests}/locking-selftest.c | 0 + {kernel => tests}/rcutorture.c | 0 + {kernel => tests}/rtmutex-tester.c | 2 +- + {kernel => tests}/test_kprobes.c | 0 + 27 files changed, 115 insertions(+), 98 deletions(-) + create mode 100644 tests/Kconfig + create mode 100644 tests/Makefile + rename {kernel => tests}/backtracetest.c (100%) + rename {drivers/misc => tests}/lkdtm.c (100%) + rename {lib => tests}/locking-selftest-hardirq.h (100%) + rename {lib => tests}/locking-selftest-mutex.h (100%) + rename {lib => tests}/locking-selftest-rlock-hardirq.h (100%) + rename {lib => tests}/locking-selftest-rlock-softirq.h (100%) + rename {lib => tests}/locking-selftest-rlock.h (100%) + rename {lib => tests}/locking-selftest-rsem.h (100%) + rename {lib => tests}/locking-selftest-softirq.h (100%) + rename {lib => tests}/locking-selftest-spin-hardirq.h (100%) + rename {lib => tests}/locking-selftest-spin-softirq.h (100%) + rename {lib => tests}/locking-selftest-spin.h (100%) + rename {lib => tests}/locking-selftest-wlock-hardirq.h (100%) + rename {lib => tests}/locking-selftest-wlock-softirq.h (100%) + rename {lib => tests}/locking-selftest-wlock.h (100%) + rename {lib => tests}/locking-selftest-wsem.h (100%) + rename {lib => tests}/locking-selftest.c (100%) + rename {kernel => tests}/rcutorture.c (100%) + rename {kernel => tests}/rtmutex-tester.c (99%) + rename {kernel => tests}/test_kprobes.c (100%) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Merge made by recursive. + Documentation/filesystems/configfs/configfs.txt | 17 ++- + ...figfs_example.c => configfs_example_explicit.c} | 18 +- + ...onfigfs_example.c => configfs_example_macros.c} | 75 ++------ + fs/configfs/configfs_internal.h | 3 + + fs/configfs/dir.c | 210 ++++++++++++++++---- + fs/configfs/symlink.c | 26 +++ + fs/ocfs2/aops.c | 29 ++-- + fs/ocfs2/file.c | 2 +- + fs/ocfs2/journal.c | 173 +++++++++++++---- + fs/ocfs2/journal.h | 3 +- + fs/ocfs2/ocfs2.h | 2 + + fs/ocfs2/ocfs2_fs.h | 5 +- + fs/ocfs2/super.c | 12 +- + include/linux/configfs.h | 68 ++++++- + 14 files changed, 475 insertions(+), 168 deletions(-) + copy Documentation/filesystems/configfs/{configfs_example.c => configfs_example_explicit.c} (96%) + rename Documentation/filesystems/configfs/{configfs_example.c => configfs_example_macros.c} (85%) +Merging quilt/m68k +$ git merge quilt/m68k +Auto-merged drivers/char/nvram.c +Auto-merged drivers/net/Kconfig +Auto-merged init/main.c +Merge made by recursive. +Merging powerpc/next +$ git merge powerpc/next +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 +Already uptodate! +Merge made by recursive. +Merging net/master +$ git merge net/master +Already up-to-date. +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 +Auto-merged arch/arm/mach-at91/at91cap9_devices.c +Auto-merged arch/arm/mach-at91/at91sam9260_devices.c +Auto-merged arch/arm/mach-at91/at91sam9261_devices.c +Auto-merged arch/arm/mach-at91/at91sam9263_devices.c +Auto-merged arch/arm/mach-at91/at91sam9rl_devices.c +Auto-merged arch/arm/mach-at91/board-cap9adk.c +Auto-merged arch/arm/mach-at91/board-dk.c +Auto-merged arch/arm/mach-at91/board-kb9202.c +Auto-merged arch/arm/mach-at91/board-sam9rlek.c +Auto-merged arch/arm/mach-at91/board-yl-9200.c +CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-yl-9200.c +Auto-merged arch/avr32/boards/atstk1000/atstk1002.c +Auto-merged arch/avr32/mach-at32ap/at32ap700x.c +Auto-merged drivers/mtd/devices/Kconfig +Auto-merged drivers/mtd/devices/block2mtd.c +Auto-merged drivers/mtd/ftl.c +Auto-merged drivers/mtd/maps/Kconfig +Auto-merged drivers/mtd/maps/Makefile +Removed drivers/mtd/maps/bast-flash.c +CONFLICT (delete/modify): drivers/mtd/maps/mtx-1_flash.c deleted in HEAD and modified in mtd/master. Version mtd/master of drivers/mtd/maps/mtx-1_flash.c left in tree. +Auto-merged drivers/mtd/maps/pcmciamtd.c +Auto-merged drivers/mtd/mtdchar.c +Removed include/asm-arm/arch-at91/at91_ecc.h +Auto-merged include/asm-arm/arch-at91/board.h +Auto-merged include/asm-avr32/arch-at32ap/board.h +Auto-merged include/linux/mtd/map.h +Auto-merged include/linux/mtd/mtd.h +Resolved 'arch/arm/mach-at91/board-yl-9200.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm drivers/mtd/maps/mtx-1_flash.c +rm 'drivers/mtd/maps/mtx-1_flash.c' +rm 'drivers/mtd/maps/mtx-1_flash.c' +$ git commit -v -a +Created commit d42a2e6: Merge commit 'mtd/master' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-at91/at91cap9_devices.c | 8 +- + arch/arm/mach-at91/at91rm9200_devices.c | 8 +- + arch/arm/mach-at91/at91sam9260_devices.c | 8 +- + arch/arm/mach-at91/at91sam9261_devices.c | 12 +- + arch/arm/mach-at91/at91sam9263_devices.c | 8 +- + arch/arm/mach-at91/at91sam9rl_devices.c | 12 +- + arch/arm/mach-at91/board-cam60.c | 2 +- + arch/arm/mach-at91/board-cap9adk.c | 2 +- + arch/arm/mach-at91/board-dk.c | 2 +- + arch/arm/mach-at91/board-kb9202.c | 2 +- + arch/arm/mach-at91/board-sam9-l9260.c | 2 +- + arch/arm/mach-at91/board-sam9260ek.c | 2 +- + arch/arm/mach-at91/board-sam9261ek.c | 2 +- + arch/arm/mach-at91/board-sam9263ek.c | 2 +- + arch/arm/mach-at91/board-sam9rlek.c | 2 +- + arch/arm/mach-at91/board-yl-9200.c | 12 +- + arch/avr32/boards/atstk1000/Kconfig | 4 + + arch/avr32/boards/atstk1000/Makefile | 1 + + arch/avr32/boards/atstk1000/atstk1002.c | 78 +++++++- + arch/avr32/mach-at32ap/at32ap700x.c | 52 +++++ + arch/avr32/mach-at32ap/hsmc.c | 2 +- + drivers/mtd/Kconfig | 2 - + drivers/mtd/afs.c | 2 - + drivers/mtd/chips/cfi_cmdset_0001.c | 8 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 3 - + drivers/mtd/chips/cfi_cmdset_0020.c | 2 - + drivers/mtd/chips/cfi_probe.c | 1 - + drivers/mtd/chips/cfi_util.c | 3 - + drivers/mtd/chips/chipreg.c | 2 - + drivers/mtd/chips/gen_probe.c | 5 +- + drivers/mtd/chips/jedec_probe.c | 119 ++++++++++- + drivers/mtd/chips/map_absent.c | 1 - + drivers/mtd/chips/map_ram.c | 1 - + drivers/mtd/chips/map_rom.c | 1 - + drivers/mtd/cmdlinepart.c | 4 +- + drivers/mtd/devices/Kconfig | 1 - + drivers/mtd/devices/Makefile | 1 - + drivers/mtd/devices/block2mtd.c | 6 - + drivers/mtd/devices/doc2000.c | 2 - + drivers/mtd/devices/doc2001.c | 2 - + drivers/mtd/devices/doc2001plus.c | 2 - + drivers/mtd/devices/docecc.c | 2 - + drivers/mtd/devices/docprobe.c | 5 - + drivers/mtd/devices/lart.c | 2 - + drivers/mtd/devices/m25p80.c | 22 ++ + drivers/mtd/devices/ms02-nv.c | 2 - + drivers/mtd/devices/ms02-nv.h | 2 - + drivers/mtd/devices/mtd_dataflash.c | 135 ++++++++++-- + drivers/mtd/devices/mtdram.c | 1 - + drivers/mtd/devices/phram.c | 2 - + drivers/mtd/devices/pmc551.c | 2 - + drivers/mtd/devices/slram.c | 2 - + drivers/mtd/ftl.c | 3 - + drivers/mtd/inftlcore.c | 5 - + drivers/mtd/inftlmount.c | 4 - + drivers/mtd/maps/Kconfig | 30 +-- + drivers/mtd/maps/Makefile | 3 +- + drivers/mtd/maps/amd76xrom.c | 1 - + drivers/mtd/maps/autcpu12-nvram.c | 2 - + drivers/mtd/maps/bast-flash.c | 226 ------------------- + drivers/mtd/maps/bfin-async-flash.c | 219 +++++++++++++++++++ + drivers/mtd/maps/cdb89712.c | 1 - + drivers/mtd/maps/ceiva.c | 1 - + drivers/mtd/maps/cfi_flagadm.c | 2 - + drivers/mtd/maps/dbox2-flash.c | 2 - + drivers/mtd/maps/dc21285.c | 2 - + drivers/mtd/maps/dilnetpc.c | 2 - + drivers/mtd/maps/dmv182.c | 2 - + drivers/mtd/maps/ebony.c | 2 - + drivers/mtd/maps/edb7312.c | 2 - + drivers/mtd/maps/fortunet.c | 1 - + drivers/mtd/maps/h720x-flash.c | 2 - + drivers/mtd/maps/ichxrom.c | 1 - + drivers/mtd/maps/impa7.c | 2 - + drivers/mtd/maps/integrator-flash.c | 2 - + drivers/mtd/maps/ipaq-flash.c | 2 - + drivers/mtd/maps/ixp2000.c | 2 - + drivers/mtd/maps/ixp4xx.c | 2 - + drivers/mtd/maps/l440gx.c | 2 - + drivers/mtd/maps/map_funcs.c | 2 - + drivers/mtd/maps/mbx860.c | 2 - + drivers/mtd/maps/netsc520.c | 2 - + drivers/mtd/maps/nettel.c | 2 - + drivers/mtd/maps/octagon-5066.c | 1 - + drivers/mtd/maps/omap-toto-flash.c | 2 - + drivers/mtd/maps/pci.c | 2 - + drivers/mtd/maps/pcmciamtd.c | 5 +- + drivers/mtd/maps/physmap.c | 2 - + drivers/mtd/maps/plat-ram.c | 2 - + drivers/mtd/maps/redwood.c | 2 - + drivers/mtd/maps/rpxlite.c | 2 - + drivers/mtd/maps/sa1100-flash.c | 2 - + drivers/mtd/maps/sbc8240.c | 3 - + drivers/mtd/maps/sbc_gxx.c | 2 - + drivers/mtd/maps/sc520cdp.c | 2 - + drivers/mtd/maps/scb2_flash.c | 1 - + drivers/mtd/maps/scx200_docflash.c | 2 - + drivers/mtd/maps/sharpsl-flash.c | 2 - + drivers/mtd/maps/solutionengine.c | 2 - + drivers/mtd/maps/sun_uflash.c | 2 +- + drivers/mtd/maps/tqm8xxl.c | 2 - + drivers/mtd/maps/ts5500_flash.c | 2 - + drivers/mtd/maps/tsunami_flash.c | 1 - + drivers/mtd/maps/uclinux.c | 2 - + drivers/mtd/maps/vmax301.c | 1 - + drivers/mtd/maps/walnut.c | 2 - + drivers/mtd/maps/wr_sbc82xx_flash.c | 2 - + drivers/mtd/mtd_blkdevs.c | 34 +-- + drivers/mtd/mtdblock.c | 2 - + drivers/mtd/mtdblock_ro.c | 2 - + drivers/mtd/mtdchar.c | 24 +- + drivers/mtd/mtdconcat.c | 2 - + drivers/mtd/mtdcore.c | 14 +- + drivers/mtd/mtdpart.c | 25 +-- + drivers/mtd/nand/Kconfig | 28 ++-- + drivers/mtd/nand/Makefile | 3 +- + drivers/mtd/nand/{at91_nand.c => atmel_nand.c} | 278 ++++++++++++++---------- + drivers/mtd/nand/atmel_nand_ecc.h | 36 +++ + drivers/mtd/nand/au1550nd.c | 2 - + drivers/mtd/nand/autcpu12.c | 2 - + drivers/mtd/nand/cafe_nand.c | 6 +- + drivers/mtd/nand/diskonchip.c | 4 - + drivers/mtd/nand/edb7312.c | 2 - + drivers/mtd/nand/excite_nandflash.c | 2 +- + drivers/mtd/nand/fsl_elbc_nand.c | 59 +++++- + drivers/mtd/nand/h1910.c | 2 - + drivers/mtd/nand/nand_bbt.c | 2 - + drivers/mtd/nand/nand_ecc.c | 2 - + drivers/mtd/nand/nand_ids.c | 2 - + drivers/mtd/nand/nandsim.c | 41 ++-- + drivers/mtd/nand/ppchameleonevb.c | 2 - + drivers/mtd/nand/rtc_from4.c | 2 - + drivers/mtd/nand/s3c2410.c | 25 +-- + drivers/mtd/nand/sharpsl.c | 2 - + drivers/mtd/nand/spia.c | 2 - + drivers/mtd/nand/toto.c | 2 - + drivers/mtd/nand/ts7250.c | 2 - + drivers/mtd/nftlcore.c | 5 - + drivers/mtd/nftlmount.c | 4 - + drivers/mtd/onenand/onenand_base.c | 54 ++--- + drivers/mtd/redboot.c | 2 - + drivers/mtd/rfd_ftl.c | 2 - + fs/jffs2/dir.c | 2 +- + fs/jffs2/file.c | 2 +- + fs/jffs2/ioctl.c | 3 +- + fs/jffs2/os-linux.h | 2 +- + include/asm-arm/arch-at91/at91_ecc.h | 38 ---- + include/asm-arm/arch-at91/board.h | 4 +- + include/asm-avr32/arch-at32ap/board.h | 13 + + include/linux/jffs2.h | 3 - + include/linux/mtd/blktrans.h | 2 - + include/linux/mtd/cfi.h | 1 - + include/linux/mtd/cfi_endian.h | 5 - + include/linux/mtd/concat.h | 2 - + include/linux/mtd/doc2000.h | 2 - + include/linux/mtd/flashchip.h | 3 - + include/linux/mtd/ftl.h | 2 - + include/linux/mtd/gen_probe.h | 1 - + include/linux/mtd/inftl.h | 4 - + include/linux/mtd/map.h | 1 - + include/linux/mtd/mtd.h | 2 - + include/linux/mtd/nand.h | 2 - + include/linux/mtd/nand_ecc.h | 2 - + include/linux/mtd/nftl.h | 2 - + include/linux/mtd/partitions.h | 2 - + include/linux/mtd/physmap.h | 2 - + include/linux/mtd/plat-ram.h | 2 - + include/linux/mtd/pmc551.h | 4 +- + include/linux/mtd/xip.h | 2 - + include/mtd/inftl-user.h | 2 - + include/mtd/jffs2-user.h | 2 - + include/mtd/mtd-abi.h | 2 - + include/mtd/mtd-user.h | 2 - + include/mtd/nftl-user.h | 2 - + 174 files changed, 1055 insertions(+), 892 deletions(-) + delete mode 100644 drivers/mtd/maps/bast-flash.c + create mode 100644 drivers/mtd/maps/bfin-async-flash.c + rename drivers/mtd/nand/{at91_nand.c => atmel_nand.c} (62%) + create mode 100644 drivers/mtd/nand/atmel_nand_ecc.h + delete mode 100644 include/asm-arm/arch-at91/at91_ecc.h +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Merge made by recursive. + crypto/Kconfig | 93 +++++++----- + crypto/Makefile | 2 +- + crypto/prng.c | 394 ++++++++++++++++++++++++++++++++++++++++++++++ + crypto/prng.h | 27 +++ + drivers/crypto/talitos.c | 49 ++++-- + 5 files changed, 510 insertions(+), 55 deletions(-) + create mode 100644 crypto/prng.c + create mode 100644 crypto/prng.h +Merging vfs/for-next +$ git merge vfs/for-next +Auto-merged fs/ocfs2/file.c +Auto-merged fs/xfs/linux-2.6/xfs_iops.c +Removed include/asm-alpha/namei.h +Removed include/asm-arm/namei.h +Removed include/asm-avr32/namei.h +Removed include/asm-blackfin/namei.h +Removed include/asm-cris/namei.h +Removed include/asm-frv/namei.h +Removed include/asm-h8300/namei.h +Removed include/asm-ia64/namei.h +Removed include/asm-m32r/namei.h +Removed include/asm-m68k/namei.h +Removed include/asm-m68knommu/namei.h +Removed include/asm-mips/namei.h +Removed include/asm-mn10300/namei.h +Removed include/asm-parisc/namei.h +Removed include/asm-powerpc/namei.h +Removed include/asm-s390/namei.h +Removed include/asm-sh/namei.h +Removed include/asm-sparc/namei.h +Removed include/asm-sparc64/namei.h +Removed include/asm-um/namei.h +Removed include/asm-v850/namei.h +Removed include/asm-x86/namei.h +Removed include/asm-xtensa/namei.h +Auto-merged include/linux/proc_fs.h +Auto-merged kernel/exec_domain.c +Auto-merged kernel/exit.c +Auto-merged kernel/fork.c +Auto-merged kernel/sysctl.c +Auto-merged mm/filemap.c +Merge made by recursive. + fs/afs/internal.h | 4 +- + fs/afs/security.c | 2 +- + fs/attr.c | 7 +- + fs/bad_inode.c | 3 +- + fs/cifs/cifsfs.c | 2 +- + fs/coda/dir.c | 4 +- + fs/coda/pioctl.c | 6 +- + fs/ecryptfs/inode.c | 21 +-- + fs/exec.c | 4 +- + fs/ext2/acl.c | 2 +- + fs/ext2/acl.h | 2 +- + fs/ext3/acl.c | 2 +- + fs/ext3/acl.h | 2 +- + fs/ext4/acl.c | 2 +- + fs/ext4/acl.h | 2 +- + fs/fat/file.c | 15 ++- + fs/fifo.c | 8 +- + fs/fuse/dir.c | 6 +- + fs/fuse/file.c | 2 +- + fs/gfs2/ops_inode.c | 12 +- + fs/hfs/inode.c | 3 +- + fs/hfsplus/inode.c | 2 +- + fs/hostfs/hostfs_kern.c | 2 +- + fs/hpfs/namei.c | 2 +- + fs/hppfs/hppfs.c | 7 - + fs/jffs2/acl.c | 2 +- + fs/jffs2/acl.h | 2 +- + fs/jfs/acl.c | 2 +- + fs/jfs/jfs_acl.h | 2 +- + fs/namei.c | 143 ++++---------- + fs/namespace.c | 32 ++-- + fs/nfs/dir.c | 11 +- + fs/nfsd/vfs.c | 10 +- + fs/ntfs/file.c | 2 +- + fs/ocfs2/file.c | 2 +- + fs/ocfs2/file.h | 3 +- + fs/open.c | 42 +--- + fs/pipe.c | 51 +---- + fs/proc/base.c | 3 +- + fs/proc/inode.c | 5 + + fs/proc/proc_sysctl.c | 429 ++++++++++++++++++---------------------- + fs/reiserfs/xattr.c | 2 +- + fs/smbfs/file.c | 4 +- + fs/splice.c | 4 +- + fs/utimes.c | 135 +++++++------ + fs/xfs/linux-2.6/xfs_iops.c | 3 +- + fs/xfs/linux-2.6/xfs_lrw.c | 2 +- + include/asm-alpha/namei.h | 17 -- + include/asm-arm/namei.h | 25 --- + include/asm-avr32/namei.h | 7 - + include/asm-blackfin/namei.h | 19 -- + include/asm-cris/namei.h | 17 -- + include/asm-frv/namei.h | 18 -- + include/asm-h8300/namei.h | 17 -- + include/asm-ia64/namei.h | 25 --- + include/asm-m32r/namei.h | 17 -- + include/asm-m68k/namei.h | 17 -- + include/asm-m68knommu/namei.h | 1 - + include/asm-mips/namei.h | 11 - + include/asm-mn10300/namei.h | 22 -- + include/asm-parisc/namei.h | 17 -- + include/asm-powerpc/namei.h | 20 -- + include/asm-s390/namei.h | 21 -- + include/asm-sh/namei.h | 17 -- + include/asm-sparc/namei.h | 8 - + include/asm-sparc64/namei.h | 1 - + include/asm-um/namei.h | 6 - + include/asm-v850/namei.h | 17 -- + include/asm-x86/namei.h | 11 - + include/asm-xtensa/namei.h | 26 --- + include/linux/coda_linux.h | 2 +- + include/linux/fs.h | 47 +++-- + include/linux/fs_struct.h | 3 +- + include/linux/mount.h | 2 +- + include/linux/namei.h | 3 - + include/linux/nfs_fs.h | 2 +- + include/linux/proc_fs.h | 5 + + include/linux/reiserfs_xattr.h | 2 +- + include/linux/security.h | 7 +- + include/linux/shmem_fs.h | 2 +- + include/linux/sysctl.h | 25 +++- + include/net/ip.h | 2 + + include/net/net_namespace.h | 4 +- + kernel/exec_domain.c | 1 - + kernel/exit.c | 2 - + kernel/fork.c | 7 - + kernel/sysctl.c | 166 ++++++++++++++-- + mm/filemap.c | 7 +- + mm/filemap_xip.c | 2 +- + mm/shmem_acl.c | 2 +- + net/ipv4/af_inet.c | 4 + + net/ipv4/sysctl_net_ipv4.c | 7 + + net/sysctl_net.c | 22 +-- + security/capability.c | 3 +- + security/security.c | 5 +- + security/selinux/hooks.c | 5 +- + security/smack/smack_lsm.c | 3 +- + 97 files changed, 664 insertions(+), 1050 deletions(-) + delete mode 100644 include/asm-alpha/namei.h + delete mode 100644 include/asm-arm/namei.h + delete mode 100644 include/asm-avr32/namei.h + delete mode 100644 include/asm-blackfin/namei.h + delete mode 100644 include/asm-cris/namei.h + delete mode 100644 include/asm-frv/namei.h + delete mode 100644 include/asm-h8300/namei.h + delete mode 100644 include/asm-ia64/namei.h + delete mode 100644 include/asm-m32r/namei.h + delete mode 100644 include/asm-m68k/namei.h + delete mode 100644 include/asm-m68knommu/namei.h + delete mode 100644 include/asm-mips/namei.h + delete mode 100644 include/asm-mn10300/namei.h + delete mode 100644 include/asm-parisc/namei.h + delete mode 100644 include/asm-powerpc/namei.h + delete mode 100644 include/asm-s390/namei.h + delete mode 100644 include/asm-sh/namei.h + delete mode 100644 include/asm-sparc/namei.h + delete mode 100644 include/asm-sparc64/namei.h + delete mode 100644 include/asm-um/namei.h + delete mode 100644 include/asm-v850/namei.h + delete mode 100644 include/asm-x86/namei.h + delete mode 100644 include/asm-xtensa/namei.h +Merging sound/master +$ git merge sound/master +Auto-merged sound/pci/ac97/ac97_codec.c +Merge made by recursive. + sound/pci/Kconfig | 8 +++ + sound/pci/ac97/ac97_codec.c | 20 +++--- + sound/pci/hda/Makefile | 1 + + sound/pci/hda/hda_beep.c | 134 ++++++++++++++++++++++++++++++++++++++++ + sound/pci/hda/hda_beep.h | 44 +++++++++++++ + sound/pci/hda/hda_codec.h | 4 + + sound/pci/hda/patch_sigmatel.c | 63 +++++++++++++++++++ + 7 files changed, 264 insertions(+), 10 deletions(-) + create mode 100644 sound/pci/hda/hda_beep.c + create mode 100644 sound/pci/hda/hda_beep.h +Merging arm/devel +$ git merge arm/devel +CONFLICT (rename/delete): Renamed arch/arm/configs/em_x270_defconfig->arch/sh/configs/sh7785lcr_defconfig in HEAD and deleted in arm/devel +Auto-merged MAINTAINERS +Auto-merged arch/arm/common/sa1111.c +Auto-merged arch/sh/boards/renesas/migor/setup.c +Auto-merged drivers/mfd/Kconfig +Auto-merged drivers/pcmcia/Kconfig +Auto-merged drivers/pcmcia/Makefile +Auto-merged drivers/usb/gadget/pxa25x_udc.c +Removed include/asm-arm/arch-pxa/cm-x270.h +Auto-merged sound/soc/pxa/Kconfig +Auto-merged sound/soc/pxa/tosa.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit b364f12: Merge commit 'arm/devel' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 25 + + arch/arm/common/sa1111.c | 2 +- + arch/arm/configs/ezx_defconfig | 1614 +++++++++++++++++++++++++++++++ + arch/arm/mach-pxa/Kconfig | 219 +++-- + arch/arm/mach-pxa/Makefile | 15 +- + arch/arm/mach-pxa/clock.c | 30 - + arch/arm/mach-pxa/clock.h | 33 + + arch/arm/mach-pxa/cm-x270-pci.c | 27 +- + arch/arm/mach-pxa/cm-x270-pci.h | 14 +- + arch/arm/mach-pxa/cm-x270.c | 403 ++++++--- + arch/arm/mach-pxa/corgi.c | 1 + + arch/arm/mach-pxa/devices.c | 61 ++ + arch/arm/mach-pxa/devices.h | 2 + + arch/arm/mach-pxa/e400_lcd.c | 56 ++ + arch/arm/mach-pxa/e740_lcd.c | 123 +++ + arch/arm/mach-pxa/e750_lcd.c | 109 +++ + arch/arm/mach-pxa/e800_lcd.c | 159 +++ + arch/arm/mach-pxa/em-x270.c | 371 ++++++-- + arch/arm/mach-pxa/eseries.c | 15 +- + arch/arm/mach-pxa/eseries_udc.c | 57 ++ + arch/arm/mach-pxa/ezx.c | 220 +++++ + arch/arm/mach-pxa/littleton.c | 70 ++- + arch/arm/mach-pxa/lubbock.c | 19 +- + arch/arm/mach-pxa/magician.c | 49 +- + arch/arm/mach-pxa/mainstone.c | 18 +- + arch/arm/mach-pxa/mfp-pxa2xx.c | 71 +- + arch/arm/mach-pxa/palmtx.c | 416 ++++++++ + arch/arm/mach-pxa/pcm027.c | 31 + + arch/arm/mach-pxa/pcm990-baseboard.c | 74 +- + arch/arm/mach-pxa/poodle.c | 1 + + arch/arm/mach-pxa/pxa25x.c | 59 ++- + arch/arm/mach-pxa/pxa300.c | 19 +- + arch/arm/mach-pxa/pxa320.c | 21 +- + arch/arm/mach-pxa/pxa3xx.c | 25 +- + arch/arm/mach-pxa/pxa930.c | 190 ++++ + arch/arm/mach-pxa/reset.c | 96 ++ + arch/arm/mach-pxa/saar.c | 84 ++ + arch/arm/mach-pxa/spitz.c | 10 +- + arch/arm/mach-pxa/ssp.c | 13 +- + arch/arm/mach-pxa/tavorevb.c | 84 ++ + arch/arm/mach-pxa/tosa-bt.c | 150 +++ + arch/arm/mach-pxa/tosa.c | 382 +++++++- + arch/arm/mach-pxa/trizeps4.c | 1 + + arch/arm/mach-pxa/zylonite.c | 103 ++- + arch/arm/mach-pxa/zylonite_pxa300.c | 46 + + arch/arm/mach-pxa/zylonite_pxa320.c | 6 + + arch/arm/mach-sa1100/clock.c | 2 +- + arch/arm/mm/Makefile | 2 + + arch/arm/tools/mach-types | 10 +- + arch/sh/boards/renesas/migor/setup.c | 3 +- + drivers/input/keyboard/tosakbd.c | 2 - + drivers/mfd/Kconfig | 11 + + drivers/mfd/Makefile | 4 + + drivers/mfd/mfd-core.c | 114 +++ + drivers/mfd/tc6393xb.c | 600 ++++++++++++ + drivers/mtd/nand/cmx270_nand.c | 79 +- + drivers/net/smc91x.c | 94 +- + drivers/net/smc91x.h | 76 +- + drivers/pcmcia/Kconfig | 3 +- + drivers/pcmcia/Makefile | 1 + + drivers/pcmcia/pxa2xx_cm_x270.c | 93 +-- + drivers/pcmcia/pxa2xx_palmtx.c | 118 +++ + drivers/power/Kconfig | 6 + + drivers/power/Makefile | 1 + + drivers/power/palmtx_battery.c | 198 ++++ + drivers/usb/gadget/pxa25x_udc.c | 6 +- + drivers/video/pxafb.c | 64 ++- + include/asm-arm/arch-pxa/cm-x270.h | 50 - + include/asm-arm/arch-pxa/eseries-gpio.h | 50 + + include/asm-arm/arch-pxa/eseries-irq.h | 27 + + include/asm-arm/arch-pxa/hardware.h | 33 + + include/asm-arm/arch-pxa/irqs.h | 3 + + include/asm-arm/arch-pxa/mfp-pxa2xx.h | 1 + + include/asm-arm/arch-pxa/mfp-pxa930.h | 491 ++++++++++ + include/asm-arm/arch-pxa/mfp.h | 8 + + include/asm-arm/arch-pxa/palmtx.h | 106 ++ + include/asm-arm/arch-pxa/pxa27x-udc.h | 2 +- + include/asm-arm/arch-pxa/pxa2xx_spi.h | 2 + + include/asm-arm/arch-pxa/pxa3xx_nand.h | 2 + + include/asm-arm/arch-pxa/pxafb.h | 3 +- + include/asm-arm/arch-pxa/regs-lcd.h | 6 + + include/asm-arm/arch-pxa/regs-ssp.h | 16 +- + include/asm-arm/arch-pxa/system.h | 17 +- + include/asm-arm/arch-pxa/tosa.h | 50 +- + include/asm-arm/arch-pxa/tosa_bt.h | 22 + + include/asm-arm/arch-pxa/uncompress.h | 13 +- + include/asm-arm/arch-pxa/zylonite.h | 2 + + include/asm-arm/mach/udc_pxa2xx.h | 1 + + include/linux/mfd/core.h | 55 ++ + include/linux/mfd/tc6393xb.h | 49 + + include/linux/mfd/tmio.h | 17 + + include/linux/smc91x.h | 12 +- + sound/soc/pxa/Kconfig | 1 + + sound/soc/pxa/tosa.c | 29 +- + 94 files changed, 7354 insertions(+), 795 deletions(-) + create mode 100644 arch/arm/configs/ezx_defconfig + create mode 100644 arch/arm/mach-pxa/e400_lcd.c + create mode 100644 arch/arm/mach-pxa/e740_lcd.c + create mode 100644 arch/arm/mach-pxa/e750_lcd.c + create mode 100644 arch/arm/mach-pxa/e800_lcd.c + create mode 100644 arch/arm/mach-pxa/eseries_udc.c + create mode 100644 arch/arm/mach-pxa/ezx.c + create mode 100644 arch/arm/mach-pxa/palmtx.c + create mode 100644 arch/arm/mach-pxa/pxa930.c + create mode 100644 arch/arm/mach-pxa/reset.c + create mode 100644 arch/arm/mach-pxa/saar.c + create mode 100644 arch/arm/mach-pxa/tavorevb.c + create mode 100644 arch/arm/mach-pxa/tosa-bt.c + create mode 100644 drivers/mfd/mfd-core.c + create mode 100644 drivers/mfd/tc6393xb.c + create mode 100644 drivers/pcmcia/pxa2xx_palmtx.c + create mode 100644 drivers/power/palmtx_battery.c + delete mode 100644 include/asm-arm/arch-pxa/cm-x270.h + create mode 100644 include/asm-arm/arch-pxa/eseries-gpio.h + create mode 100644 include/asm-arm/arch-pxa/eseries-irq.h + create mode 100644 include/asm-arm/arch-pxa/mfp-pxa930.h + create mode 100644 include/asm-arm/arch-pxa/palmtx.h + create mode 100644 include/asm-arm/arch-pxa/tosa_bt.h + create mode 100644 include/linux/mfd/core.h + create mode 100644 include/linux/mfd/tc6393xb.h + create mode 100644 include/linux/mfd/tmio.h +Merging cpufreq/next +$ git merge cpufreq/next +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 arch/x86/lguest/boot.c +Auto-merged drivers/char/snsc.c +Auto-merged drivers/char/viotape.c +Auto-merged drivers/infiniband/core/user_mad.c +Auto-merged fs/xfs/linux-2.6/xfs_buf.c +Auto-merged kernel/cpu.c +Auto-merged kernel/kthread.c +Auto-merged kernel/module.c +Auto-merged kernel/rcuclassic.c +Auto-merged kernel/stop_machine.c +CONFLICT (content): Merge conflict in kernel/stop_machine.c +Auto-merged kernel/sysctl.c +Resolved 'kernel/stop_machine.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit e222b44: Merge branch 'quilt/rr' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/kernel-locking.tmpl | 57 ++-- + Documentation/lguest/lguest.c | 541 +++++++++++++++++++++-------- + arch/ia64/kernel/salinfo.c | 4 +- + arch/s390/Kconfig | 1 + + arch/s390/kernel/kprobes.c | 6 +- + arch/s390/kernel/setup.c | 4 +- + arch/x86/lguest/boot.c | 3 + + drivers/block/virtio_blk.c | 10 +- + drivers/char/Kconfig | 11 +- + drivers/char/Makefile | 1 + + drivers/char/hvc_console.c | 85 ++---- + drivers/char/hvc_console.h | 35 ++- + drivers/char/hvc_irq.c | 45 +++ + drivers/char/hvc_iseries.c | 2 + + drivers/char/hvc_vio.c | 2 + + drivers/char/hvc_xen.c | 2 + + drivers/char/hw_random/intel-rng.c | 6 +- + drivers/char/snsc.c | 4 +- + drivers/char/viotape.c | 4 +- + drivers/char/virtio_console.c | 40 ++- + drivers/infiniband/core/user_mad.c | 2 +- + drivers/input/serio/hil_mlc.c | 4 +- + drivers/input/serio/hp_sdc_mlc.c | 14 +- + drivers/lguest/core.c | 1 + + drivers/lguest/interrupts_and_traps.c | 24 +- + drivers/lguest/lguest_device.c | 14 +- + drivers/lguest/x86/core.c | 4 +- + drivers/md/dm-raid1.c | 2 +- + drivers/net/3c527.c | 2 +- + drivers/net/irda/sir_dev.c | 2 +- + drivers/net/virtio_net.c | 114 ++++++- + drivers/net/wireless/airo.c | 12 +- + drivers/s390/kvm/kvm_virtio.c | 34 ++- + drivers/scsi/aacraid/commsup.c | 2 +- + drivers/usb/core/usb.c | 2 +- + drivers/usb/gadget/inode.c | 2 +- + drivers/virtio/virtio.c | 26 +- + drivers/virtio/virtio_pci.c | 13 +- + drivers/virtio/virtio_ring.c | 41 ++- + 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/asm-s390/kvm_virtio.h | 10 + + include/linux/compiler-gcc.h | 18 + + 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 | 8 +- + include/linux/stop_machine.h | 57 +++- + include/linux/timer.h | 32 ++- + include/linux/usb.h | 2 +- + include/linux/virtio_9p.h | 2 + + include/linux/virtio_balloon.h | 2 + + include/linux/virtio_blk.h | 5 + + include/linux/virtio_config.h | 16 +- + include/linux/virtio_console.h | 2 + + include/linux/virtio_net.h | 2 + + include/linux/virtio_pci.h | 5 +- + include/linux/virtio_ring.h | 14 +- + include/linux/virtio_rng.h | 2 + + kernel/cpu.c | 16 +- + kernel/kthread.c | 29 +-- + kernel/module.c | 8 +- + kernel/mutex.c | 4 +- + kernel/printk.c | 4 +- + kernel/rcuclassic.c | 4 +- + kernel/semaphore.c | 17 +- + kernel/stop_machine.c | 332 ++++++++++-------- + kernel/sysctl.c | 12 + + mm/page_alloc.c | 4 +- + 72 files changed, 1274 insertions(+), 599 deletions(-) + create mode 100644 drivers/char/hvc_irq.c +Merging cifs/master +$ git merge cifs/master +Merge made by recursive. + fs/cifs/asn1.c | 2 +- + fs/cifs/connect.c | 35 ++++++++++++ + fs/cifs/inode.c | 151 +++++++++++++++++++++++++++------------------------- + 3 files changed, 114 insertions(+), 74 deletions(-) +Merging mmc/next +$ git merge mmc/next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Merge made by recursive. + fs/gfs2/glock.c | 11 ++++++----- + 1 files changed, 6 insertions(+), 5 deletions(-) +Merging input/next +$ git merge input/next +Merge made by recursive. + drivers/input/misc/uinput.c | 1 - + drivers/input/serio/serio.c | 55 +++++++++++++++++++++++----------- + drivers/input/touchscreen/ads7846.c | 16 ++++------ + include/linux/serio.h | 3 +- + 4 files changed, 45 insertions(+), 30 deletions(-) +Merging semaphore/semaphore +$ git merge semaphore/semaphore +Auto-merged drivers/input/misc/hp_sdc_rtc.c +Auto-merged drivers/input/serio/hp_sdc.c +Auto-merged include/asm-sparc64/semaphore.h +CONFLICT (content): Merge conflict in include/asm-sparc64/semaphore.h +Auto-merged include/linux/semaphore.h +Resolved 'include/asm-sparc64/semaphore.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 70d592e: Merge commit 'semaphore/semaphore' +$ git diff -M --stat --summary HEAD^.. + drivers/input/keyboard/hil_kbd.c | 1 + + 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-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 ++---- + 26 files changed, 27 insertions(+), 4 deletions(-) +Merging semaphore-removal/semaphore-removal +$ git merge semaphore-removal/semaphore-removal +Auto-merged drivers/net/bonding/bond_main.c +Auto-merged drivers/net/bonding/bond_sysfs.c +Auto-merged drivers/net/ppp_async.c +Auto-merged drivers/net/ps3_gelic_net.c +Auto-merged drivers/net/ps3_gelic_wireless.c +CONFLICT (content): Merge conflict in drivers/net/ps3_gelic_wireless.c +Auto-merged drivers/net/ps3_gelic_wireless.h +Auto-merged drivers/scsi/qla2xxx/qla_attr.c +CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_attr.c +Auto-merged drivers/scsi/qla2xxx/qla_def.h +CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_def.h +Auto-merged drivers/scsi/qla2xxx/qla_mbx.c +CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_mbx.c +Auto-merged drivers/scsi/qla2xxx/qla_mid.c +CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_mid.c +Auto-merged drivers/scsi/qla2xxx/qla_os.c +CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_os.c +Auto-merged include/net/bluetooth/hci_core.h +Auto-merged net/bluetooth/hci_core.c +Auto-merged sound/soc/s3c24xx/s3c2443-ac97.c +Resolved 'drivers/net/ps3_gelic_wireless.c' using previous resolution. +Resolved 'drivers/scsi/qla2xxx/qla_def.h' using previous resolution. +Resolved 'drivers/scsi/qla2xxx/qla_mbx.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git reset --hard +HEAD is now at 70d592e Merge commit 'semaphore/semaphore' +$ git checkout -b tmp semaphore-removal/semaphore-removal +Switched to a new branch "tmp" +$ git revert e2c6f1aa2f67c585ffcb879d32ff3e74b53faf25 +Finished one revert. +Created commit aff684f: Revert "Convert qla_os to use mutex instead of semaphore" + 1 files changed, 5 insertions(+), 7 deletions(-) +$ git revert 5469811b8b0085c0f19fd3aaad29cde59761e243 +Finished one revert. +Created commit 9fba210: Revert "qla2xxx: Turn vport_sem into vport_mutex" + 5 files changed, 16 insertions(+), 15 deletions(-) +$ git checkout master +Switched to branch "master" +$ git merge tmp +Auto-merged drivers/net/bonding/bond_main.c +Auto-merged drivers/net/bonding/bond_sysfs.c +Auto-merged drivers/net/ppp_async.c +Auto-merged drivers/net/ps3_gelic_net.c +Auto-merged drivers/net/ps3_gelic_wireless.c +CONFLICT (content): Merge conflict in drivers/net/ps3_gelic_wireless.c +Auto-merged drivers/net/ps3_gelic_wireless.h +Auto-merged include/net/bluetooth/hci_core.h +Auto-merged net/bluetooth/hci_core.c +Auto-merged sound/soc/s3c24xx/s3c2443-ac97.c +Resolved 'drivers/net/ps3_gelic_wireless.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit f62d32b: Merge branch 'tmp' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-lh7a40x/clocks.c | 15 ++++++++------- + drivers/net/bonding/bond_main.c | 21 +++++++++++---------- + drivers/net/bonding/bond_sysfs.c | 15 ++++++++------- + drivers/net/ppp_async.c | 8 ++++---- + drivers/net/ps3_gelic_net.c | 1 + + drivers/net/ps3_gelic_wireless.c | 1 + + drivers/pci/hotplug/ibmphp_hpc.c | 30 ++++++++++++++---------------- + include/net/bluetooth/hci_core.h | 7 ++++--- + net/9p/trans_virtio.c | 21 +++++++++++---------- + net/bluetooth/hci_core.c | 2 +- + sound/soc/s3c24xx/s3c2443-ac97.c | 11 ++++++----- + 11 files changed, 69 insertions(+), 63 deletions(-) +Merging bkl-removal/bkl-removal +$ git merge bkl-removal/bkl-removal +Merge made by recursive. + drivers/infiniband/core/ucm.c | 10 ++++++++-- + drivers/infiniband/core/ucma.c | 11 ++++++++--- + 2 files changed, 16 insertions(+), 5 deletions(-) +Merging trivial/next +$ git merge trivial/next +Auto-merged arch/mips/kernel/vpe.c +Auto-merged drivers/base/sys.c +Auto-merged drivers/media/dvb/ttpci/av7110.c +Auto-merged drivers/net/spider_net.c +Auto-merged drivers/serial/mpc52xx_uart.c +Auto-merged drivers/usb/serial/ftdi_sio.c +Auto-merged include/linux/securebits.h +CONFLICT (content): Merge conflict in include/linux/securebits.h +Auto-merged mm/migrate.c +Auto-merged mm/slub.c +Auto-merged net/wireless/wext.c +Resolved 'include/linux/securebits.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 545bb6b: Merge commit 'trivial/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/edac.txt | 2 +- + Documentation/filesystems/hfs.txt | 2 +- + Documentation/ja_JP/SubmittingPatches | 4 ++-- + Documentation/zh_CN/SubmittingPatches | 4 ++-- + arch/mips/kernel/vpe.c | 2 +- + arch/sh/lib64/c-checksum.c | 4 ++-- + drivers/base/sys.c | 2 +- + drivers/char/serial167.c | 2 +- + drivers/media/dvb/ttpci/av7110.c | 2 +- + drivers/message/i2o/i2o_block.c | 2 +- + drivers/misc/ibmasm/event.c | 2 +- + drivers/net/spider_net.c | 2 +- + drivers/serial/mpc52xx_uart.c | 4 ++-- + drivers/usb/serial/ftdi_sio.c | 2 +- + fs/jffs2/fs.c | 2 +- + fs/ntfs/aops.c | 2 +- + fs/proc/nommu.c | 2 +- + mm/migrate.c | 2 +- + mm/slub.c | 4 ++-- + net/wireless/wext.c | 2 +- + 20 files changed, 25 insertions(+), 25 deletions(-) +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Auto-merged Documentation/filesystems/ubifs.txt +CONFLICT (add/add): Merge conflict in Documentation/filesystems/ubifs.txt +Auto-merged MAINTAINERS +Auto-merged fs/Kconfig +Auto-merged fs/Makefile +Auto-merged fs/ubifs/budget.c +CONFLICT (add/add): Merge conflict in fs/ubifs/budget.c +Auto-merged fs/ubifs/commit.c +CONFLICT (add/add): Merge conflict in fs/ubifs/commit.c +Auto-merged fs/ubifs/debug.c +CONFLICT (add/add): Merge conflict in fs/ubifs/debug.c +Auto-merged fs/ubifs/dir.c +CONFLICT (add/add): Merge conflict in fs/ubifs/dir.c +Auto-merged fs/ubifs/file.c +CONFLICT (add/add): Merge conflict in fs/ubifs/file.c +Auto-merged fs/ubifs/io.c +CONFLICT (add/add): Merge conflict in fs/ubifs/io.c +Auto-merged fs/ubifs/journal.c +CONFLICT (add/add): Merge conflict in fs/ubifs/journal.c +Auto-merged fs/ubifs/log.c +CONFLICT (add/add): Merge conflict in fs/ubifs/log.c +Auto-merged fs/ubifs/misc.h +CONFLICT (add/add): Merge conflict in fs/ubifs/misc.h +Auto-merged fs/ubifs/orphan.c +CONFLICT (add/add): Merge conflict in fs/ubifs/orphan.c +Auto-merged fs/ubifs/super.c +CONFLICT (add/add): Merge conflict in fs/ubifs/super.c +Auto-merged fs/ubifs/ubifs.h +CONFLICT (add/add): Merge conflict in fs/ubifs/ubifs.h +Auto-merged include/linux/fs.h +Recorded preimage for 'fs/ubifs/commit.c' +Recorded preimage for 'fs/ubifs/journal.c' +Recorded preimage for 'fs/ubifs/log.c' +Recorded preimage for 'fs/ubifs/orphan.c' +Recorded preimage for 'fs/ubifs/super.c' +Recorded preimage for 'fs/ubifs/ubifs.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git checkout ubifs/linux-next Documentation/filesystems/ubifs.txt fs/ubifs/budget.c fs/ubifs/commit.c fs/ubifs/debug.c fs/ubifs/dir.c fs/ubifs/file.c fs/ubifs/io.c fs/ubifs/journal.c fs/ubifs/log.c fs/ubifs/misc.h fs/ubifs/orphan.c fs/ubifs/super.c fs/ubifs/ubifs.h +$ git commit -v -a +Recorded resolution for 'Documentation/filesystems/ubifs.txt'. +Recorded resolution for 'fs/ubifs/budget.c'. +Recorded resolution for 'fs/ubifs/commit.c'. +Recorded resolution for 'fs/ubifs/debug.c'. +Recorded resolution for 'fs/ubifs/dir.c'. +Recorded resolution for 'fs/ubifs/file.c'. +Recorded resolution for 'fs/ubifs/io.c'. +Recorded resolution for 'fs/ubifs/journal.c'. +Recorded resolution for 'fs/ubifs/log.c'. +Recorded resolution for 'fs/ubifs/misc.h'. +Recorded resolution for 'fs/ubifs/orphan.c'. +Recorded resolution for 'fs/ubifs/super.c'. +Recorded resolution for 'fs/ubifs/ubifs.h'. +Created commit 5225388: Merge commit 'ubifs/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/ubifs.txt | 2 +- + fs/ubifs/budget.c | 5 +- + fs/ubifs/commit.c | 3 +- + fs/ubifs/debug.c | 7 +- + fs/ubifs/dir.c | 3 +- + fs/ubifs/file.c | 3 +- + fs/ubifs/io.c | 14 +++++ + fs/ubifs/journal.c | 107 ++++++++++++++++++++++++++--------- + fs/ubifs/log.c | 4 +- + fs/ubifs/misc.h | 14 ----- + fs/ubifs/orphan.c | 4 +- + fs/ubifs/super.c | 38 +++++++++---- + fs/ubifs/ubifs.h | 19 ++++-- + 13 files changed, 151 insertions(+), 72 deletions(-) +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Already up-to-date. +Merging embedded/master +$ git merge embedded/master +Auto-merged drivers/char/Kconfig +Auto-merged drivers/char/Makefile +Auto-merged drivers/char/vt.c +Merge made by recursive. + drivers/char/Kconfig | 8 ++++++++ + drivers/char/Makefile | 4 ++-- + drivers/char/vt.c | 2 +- + include/linux/consolemap.h | 14 ++++++++++++++ + include/linux/vt_kern.h | 19 +++++++++++++++++++ + 5 files changed, 44 insertions(+), 3 deletions(-) +Merging firmware/master +$ git merge firmware/master +Auto-merged drivers/media/dvb/ttpci/Kconfig +Auto-merged drivers/media/dvb/ttpci/Makefile +CONFLICT (content): Merge conflict in drivers/media/dvb/ttpci/Makefile +Auto-merged drivers/media/dvb/ttpci/av7110.c +Auto-merged drivers/media/dvb/ttpci/av7110_hw.h +Removed drivers/media/dvb/ttpci/fdump.c +Auto-merged drivers/net/acenic.c +Auto-merged drivers/net/acenic.h +Removed drivers/net/acenic_firmware.h +Auto-merged drivers/net/starfire.c +Removed drivers/net/starfire_firmware.h +Removed drivers/net/starfire_firmware.pl +Auto-merged drivers/net/tg3.c +Auto-merged drivers/net/tg3.h +Removed drivers/scsi/ql1040_fw.h +Removed drivers/scsi/ql12160_fw.h +Removed drivers/scsi/ql1280_fw.h +Removed drivers/scsi/qlogicpti_asm.c +Resolved 'drivers/media/dvb/ttpci/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 4da18c1: Merge commit 'firmware/master' +$ git diff -M --stat --summary HEAD^.. + drivers/media/dvb/ttpci/Kconfig | 24 +- + drivers/media/dvb/ttpci/Makefile | 9 - + drivers/media/dvb/ttpci/av7110.c | 16 - + drivers/media/dvb/ttpci/av7110_hw.c | 35 +- + drivers/media/dvb/ttpci/av7110_hw.h | 3 +- + drivers/media/dvb/ttpci/fdump.c | 44 - + drivers/net/acenic.c | 117 +- + drivers/net/acenic.h | 4 + + drivers/net/acenic_firmware.h | 9456 --------------------------------- + drivers/net/e100.c | 283 +- + drivers/net/starfire.c | 51 +- + drivers/net/starfire_firmware.h | 346 -- + drivers/net/starfire_firmware.pl | 31 - + drivers/net/tg3.c | 789 +--- + drivers/net/tg3.h | 4 + + drivers/scsi/advansys.c | 1731 +------ + drivers/scsi/ql1040_fw.h | 2130 -------- + drivers/scsi/ql12160_fw.h | 1811 ------- + drivers/scsi/ql1280_fw.h | 2048 ------- + drivers/scsi/qla1280.c | 114 +- + drivers/scsi/qla1280.h | 6 + + drivers/scsi/qlogicpti.c | 61 +- + drivers/scsi/qlogicpti_asm.c | 1160 ---- + firmware/Makefile | 19 + + firmware/WHENCE | 109 + + firmware/acenic/tg1.bin.ihex | 4573 ++++++++++++++++ + firmware/acenic/tg2.bin.ihex | 4844 +++++++++++++++++ + firmware/adaptec/starfire_rx.bin.ihex | 53 + + firmware/adaptec/starfire_tx.bin.ihex | 53 + + firmware/advansys/3550.bin.ihex | 317 ++ + firmware/advansys/38C0800.bin.ihex | 336 ++ + firmware/advansys/38C1600.bin.ihex | 398 ++ + firmware/advansys/mcode.bin.ihex | 147 + + firmware/av7110/Boot.S | 109 + + firmware/av7110/bootcode.bin.ihex | 15 + + firmware/e100/d101m_ucode.bin.ihex | 38 + + firmware/e100/d101s_ucode.bin.ihex | 38 + + firmware/e100/d102e_ucode.bin.ihex | 38 + + firmware/qlogic/1040.bin.ihex | 2111 ++++++++ + firmware/qlogic/12160.bin.ihex | 1771 ++++++ + firmware/qlogic/1280.bin.ihex | 2008 +++++++ + firmware/qlogic/isp1000.bin.ihex | 1158 ++++ + firmware/tigon/tg3.bin.ihex | 175 + + firmware/tigon/tg3_tso.bin.ihex | 446 ++ + firmware/tigon/tg3_tso5.bin.ihex | 252 + + 45 files changed, 19549 insertions(+), 19732 deletions(-) + delete mode 100644 drivers/media/dvb/ttpci/fdump.c + delete mode 100644 drivers/net/acenic_firmware.h + delete mode 100644 drivers/net/starfire_firmware.h + delete mode 100644 drivers/net/starfire_firmware.pl + delete mode 100644 drivers/scsi/ql1040_fw.h + delete mode 100644 drivers/scsi/ql12160_fw.h + delete mode 100644 drivers/scsi/ql1280_fw.h + delete mode 100644 drivers/scsi/qlogicpti_asm.c + create mode 100644 firmware/acenic/tg1.bin.ihex + create mode 100644 firmware/acenic/tg2.bin.ihex + create mode 100644 firmware/adaptec/starfire_rx.bin.ihex + create mode 100644 firmware/adaptec/starfire_tx.bin.ihex + create mode 100644 firmware/advansys/3550.bin.ihex + create mode 100644 firmware/advansys/38C0800.bin.ihex + create mode 100644 firmware/advansys/38C1600.bin.ihex + create mode 100644 firmware/advansys/mcode.bin.ihex + create mode 100644 firmware/av7110/Boot.S + create mode 100644 firmware/av7110/bootcode.bin.ihex + create mode 100644 firmware/e100/d101m_ucode.bin.ihex + create mode 100644 firmware/e100/d101s_ucode.bin.ihex + create mode 100644 firmware/e100/d102e_ucode.bin.ihex + create mode 100644 firmware/qlogic/1040.bin.ihex + create mode 100644 firmware/qlogic/12160.bin.ihex + create mode 100644 firmware/qlogic/1280.bin.ihex + create mode 100644 firmware/qlogic/isp1000.bin.ihex + create mode 100644 firmware/tigon/tg3.bin.ihex + create mode 100644 firmware/tigon/tg3_tso.bin.ihex + create mode 100644 firmware/tigon/tg3_tso5.bin.ihex +Merging pcmcia/master +$ git merge pcmcia/master +Auto-merged drivers/char/pcmcia/cm4000_cs.c +Auto-merged drivers/ide/legacy/ide-cs.c +Merge made by recursive. +Merging battery/master +$ git merge battery/master +Auto-merged drivers/power/Kconfig +CONFLICT (content): Merge conflict in drivers/power/Kconfig +Auto-merged drivers/power/Makefile +CONFLICT (content): Merge conflict in drivers/power/Makefile +Auto-merged drivers/power/power_supply_sysfs.c +Resolved 'drivers/power/Kconfig' using previous resolution. +Resolved 'drivers/power/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit d072924: Merge commit 'battery/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/power/power_supply_class.txt | 4 + + drivers/power/Kconfig | 7 + + drivers/power/Makefile | 1 + + drivers/power/olpc_battery.c | 273 +++++++++++----- + drivers/power/power_supply_sysfs.c | 1 + + drivers/power/tosa_battery.c | 486 ++++++++++++++++++++++++++++ + include/linux/power_supply.h | 1 + + 7 files changed, 697 insertions(+), 76 deletions(-) + create mode 100644 drivers/power/tosa_battery.c +Merging leds/for-mm +$ git merge leds/for-mm +Merge made by recursive. + arch/arm/mach-iop32x/n2100.c | 52 ++++++ + drivers/leds/Kconfig | 16 ++ + drivers/leds/Makefile | 2 + + drivers/leds/led-triggers.c | 3 +- + drivers/leds/leds-atmel-pwm.c | 2 +- + drivers/leds/leds-h1940.c | 9 +- + drivers/leds/leds-pca9532.c | 337 ++++++++++++++++++++++++++++++++++++ + drivers/leds/leds-pca955x.c | 384 +++++++++++++++++++++++++++++++++++++++++ + include/linux/leds-pca9532.h | 45 +++++ + include/linux/leds.h | 16 ++- + 10 files changed, 860 insertions(+), 6 deletions(-) + create mode 100644 drivers/leds/leds-pca9532.c + create mode 100644 drivers/leds/leds-pca955x.c + create mode 100644 include/linux/leds-pca9532.h +Merging backlight/for-mm +$ git merge backlight/for-mm +Merge made by recursive. + drivers/video/backlight/Kconfig | 9 +++ + drivers/video/backlight/Makefile | 2 + + drivers/video/backlight/backlight.c | 1 + + drivers/video/backlight/mbp_nvidia_bl.c | 116 +++++++++++++++++++++++++++++++ + 4 files changed, 128 insertions(+), 0 deletions(-) + create mode 100644 drivers/video/backlight/mbp_nvidia_bl.c +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Already up-to-date. +Merging slab/for-next +$ git merge slab/for-next +Already up-to-date. +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Merge made by recursive. + arch/m68knommu/Kconfig | 15 + + arch/m68knommu/Makefile | 11 +- + arch/m68knommu/configs/m5208evb_defconfig | 610 ++++++++++++++++++++++++ + arch/m68knommu/configs/m5249evb_defconfig | 497 ++++++++++++++++++++ + arch/m68knommu/configs/m5275evb_defconfig | 627 +++++++++++++++++++++++++ + arch/m68knommu/configs/m5307c3_defconfig | 580 +++++++++++++++++++++++ + arch/m68knommu/configs/m5407c3_defconfig | 641 ++++++++++++++++++++++++++ + arch/m68knommu/kernel/time.c | 40 +- + arch/m68knommu/kernel/traps.c | 38 ++- + arch/m68knommu/kernel/vmlinux.lds.S | 1 + + arch/m68knommu/platform/coldfire/Makefile | 2 +- + arch/m68knommu/platform/coldfire/dma_timer.c | 84 ++++ + arch/m68knommu/platform/coldfire/head.S | 3 +- + arch/m68knommu/platform/coldfire/pit.c | 91 ++++- + drivers/net/fec.c | 54 +--- + include/asm-m68knommu/bitops.h | 30 ++ + include/asm-m68knommu/byteorder.h | 16 +- + include/asm-m68knommu/commproc.h | 19 - + include/asm-m68knommu/system.h | 11 + + 19 files changed, 3253 insertions(+), 117 deletions(-) + create mode 100644 arch/m68knommu/configs/m5208evb_defconfig + create mode 100644 arch/m68knommu/configs/m5249evb_defconfig + create mode 100644 arch/m68knommu/configs/m5275evb_defconfig + create mode 100644 arch/m68knommu/configs/m5307c3_defconfig + create mode 100644 arch/m68knommu/configs/m5407c3_defconfig + create mode 100644 arch/m68knommu/platform/coldfire/dma_timer.c +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Merge made by recursive. + arch/cris/arch-v10/boot/compressed/Makefile | 2 +- + .../compressed/{decompress.ld => decompress.lds} | 0 + arch/cris/arch-v10/boot/rescue/Makefile | 2 +- + .../arch-v10/boot/rescue/{rescue.ld => rescue.lds} | 0 + arch/cris/arch-v32/boot/compressed/Makefile | 2 +- + .../compressed/{decompress.ld => decompress.lds} | 0 + arch/cris/arch-v32/boot/rescue/Makefile | 2 +- + .../arch-v32/boot/rescue/{rescue.ld => rescue.lds} | 0 + 8 files changed, 4 insertions(+), 4 deletions(-) + rename arch/cris/arch-v10/boot/compressed/{decompress.ld => decompress.lds} (100%) + rename arch/cris/arch-v10/boot/rescue/{rescue.ld => rescue.lds} (100%) + rename arch/cris/arch-v32/boot/compressed/{decompress.ld => decompress.lds} (100%) + rename arch/cris/arch-v32/boot/rescue/{rescue.ld => rescue.lds} (100%) +Merging kmemcheck/auto-kmemcheck-next +$ git merge kmemcheck/auto-kmemcheck-next +Auto-merged MAINTAINERS +Auto-merged arch/x86/Kconfig.debug +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 include/asm-x86/pgtable.h +Auto-merged include/asm-x86/pgtable_32.h +Auto-merged include/asm-x86/pgtable_64.h +Auto-merged init/main.c +Auto-merged kernel/fork.c +Auto-merged kernel/softirq.c +Auto-merged kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +Auto-merged mm/slub.c +Resolved 'kernel/sysctl.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit c5b9bbb: Merge commit 'kmemcheck/auto-kmemcheck-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/kmemcheck.txt | 135 ++++++++++ + MAINTAINERS | 8 + + arch/x86/Kconfig.debug | 109 +++++++++ + arch/x86/kernel/process.c | 2 +- + arch/x86/kernel/process_32.c | 4 +- + arch/x86/kernel/process_64.c | 12 +- + arch/x86/kernel/stacktrace.c | 7 + + arch/x86/kernel/traps_32.c | 11 +- + arch/x86/kernel/traps_64.c | 11 +- + arch/x86/mm/Makefile | 2 + + arch/x86/mm/fault.c | 18 ++- + arch/x86/mm/kmemcheck/Makefile | 3 + + arch/x86/mm/kmemcheck/error.c | 216 ++++++++++++++++ + arch/x86/mm/kmemcheck/error.h | 15 ++ + arch/x86/mm/kmemcheck/kmemcheck.c | 485 +++++++++++++++++++++++++++++++++++++ + arch/x86/mm/kmemcheck/opcode.c | 72 ++++++ + arch/x86/mm/kmemcheck/opcode.h | 9 + + arch/x86/mm/kmemcheck/pte.c | 22 ++ + arch/x86/mm/kmemcheck/pte.h | 10 + + arch/x86/mm/kmemcheck/shadow.c | 176 ++++++++++++++ + arch/x86/mm/kmemcheck/shadow.h | 16 ++ + arch/x86/mm/kmemcheck/smp.c | 80 ++++++ + arch/x86/mm/kmemcheck/smp.h | 23 ++ + arch/x86/mm/kmemcheck/string.c | 95 +++++++ + include/asm-x86/kdebug.h | 3 +- + include/asm-x86/kmemcheck.h | 36 +++ + include/asm-x86/pgtable.h | 4 +- + include/asm-x86/pgtable_32.h | 6 + + include/asm-x86/pgtable_64.h | 6 + + include/asm-x86/string_32.h | 8 + + include/asm-x86/string_64.h | 1 + + include/linux/gfp.h | 3 +- + include/linux/interrupt.h | 14 + + include/linux/kmemcheck.h | 70 ++++++ + include/linux/mm_types.h | 4 + + include/linux/slab.h | 7 + + include/linux/slab_def.h | 81 ++++++ + include/linux/stacktrace.h | 3 + + init/main.c | 3 + + kernel/fork.c | 16 +- + kernel/softirq.c | 11 + + kernel/sysctl.c | 26 ++- + mm/Makefile | 2 +- + mm/kmemcheck.c | 97 ++++++++ + mm/slab.c | 101 ++------- + mm/slub.c | 20 ++- + 46 files changed, 1945 insertions(+), 118 deletions(-) + create mode 100644 Documentation/kmemcheck.txt + create mode 100644 arch/x86/mm/kmemcheck/Makefile + create mode 100644 arch/x86/mm/kmemcheck/error.c + create mode 100644 arch/x86/mm/kmemcheck/error.h + create mode 100644 arch/x86/mm/kmemcheck/kmemcheck.c + create mode 100644 arch/x86/mm/kmemcheck/opcode.c + create mode 100644 arch/x86/mm/kmemcheck/opcode.h + create mode 100644 arch/x86/mm/kmemcheck/pte.c + create mode 100644 arch/x86/mm/kmemcheck/pte.h + create mode 100644 arch/x86/mm/kmemcheck/shadow.c + create mode 100644 arch/x86/mm/kmemcheck/shadow.h + create mode 100644 arch/x86/mm/kmemcheck/smp.c + create mode 100644 arch/x86/mm/kmemcheck/smp.h + create mode 100644 arch/x86/mm/kmemcheck/string.c + create mode 100644 include/asm-x86/kmemcheck.h + create mode 100644 include/linux/kmemcheck.h + create mode 100644 mm/kmemcheck.c +Merging generic-ipi/auto-generic-ipi-next +$ git merge generic-ipi/auto-generic-ipi-next +Already up-to-date. +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Already up-to-date. +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Auto-merged drivers/char/pcmcia/synclink_cs.c +Auto-merged drivers/char/synclink.c +Auto-merged drivers/char/synclink_gt.c +Auto-merged drivers/char/synclinkmp.c +Auto-merged drivers/net/wan/cosa.c +Merge made by recursive. + Documentation/DocBook/z8530book.tmpl | 38 +-- + drivers/char/pcmcia/synclink_cs.c | 4 - + drivers/char/synclink.c | 4 - + drivers/char/synclink_gt.c | 5 - + drivers/char/synclinkmp.c | 4 - + drivers/net/wan/Kconfig | 13 +- + drivers/net/wan/Makefile | 11 +- + drivers/net/wan/cosa.c | 293 +++++++--------- + drivers/net/wan/dscc4.c | 1 - + drivers/net/wan/farsync.c | 5 +- + drivers/net/wan/farsync.h | 6 - + drivers/net/wan/hdlc.c | 25 +- + drivers/net/wan/hdlc_cisco.c | 29 +- + drivers/net/wan/hdlc_fr.c | 19 +- + drivers/net/wan/hdlc_ppp.c | 15 +- + drivers/net/wan/hdlc_raw.c | 15 +- + drivers/net/wan/hdlc_raw_eth.c | 17 +- + drivers/net/wan/hdlc_x25.c | 17 +- + drivers/net/wan/hostess_sv11.c | 382 ++++++++------------ + drivers/net/wan/lmc/lmc.h | 11 +- + drivers/net/wan/lmc/lmc_debug.c | 7 +- + drivers/net/wan/lmc/lmc_debug.h | 6 +- + drivers/net/wan/lmc/lmc_ioctl.h | 2 +- + drivers/net/wan/lmc/lmc_main.c | 672 +++++++++++++++------------------- + drivers/net/wan/lmc/lmc_media.c | 66 ++-- + drivers/net/wan/lmc/lmc_proto.c | 146 ++------ + drivers/net/wan/lmc/lmc_proto.h | 14 +- + drivers/net/wan/lmc/lmc_var.h | 360 +++++++------------ + drivers/net/wan/pc300.h | 228 +++++------- + drivers/net/wan/pc300_drv.c | 146 ++++---- + drivers/net/wan/sealevel.c | 361 +++++++----------- + drivers/net/wan/syncppp.c | 9 - + drivers/net/wan/z85230.c | 193 ++++------ + drivers/net/wan/z85230.h | 10 +- + include/net/syncppp.h | 2 - + net/wanrouter/wanmain.c | 27 -- + 36 files changed, 1245 insertions(+), 1918 deletions(-) +Merging drm/drm-next +$ git merge drm/drm-next +Auto-merged drivers/Makefile +Auto-merged drivers/char/Makefile +Auto-merged drivers/gpu/Makefile +CONFLICT (add/add): Merge conflict in drivers/gpu/Makefile +Auto-merged drivers/gpu/drm/i830/Makefile +CONFLICT (add/add): Merge conflict in drivers/gpu/drm/i830/Makefile +Auto-merged include/Kbuild +CONFLICT (content): Merge conflict in include/Kbuild +Auto-merged include/drm/Kbuild +CONFLICT (add/add): Merge conflict in include/drm/Kbuild +Resolved 'drivers/gpu/Makefile' using previous resolution. +Resolved 'drivers/gpu/drm/i830/Makefile' using previous resolution. +Resolved 'include/Kbuild' using previous resolution. +Resolved 'include/drm/Kbuild' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit dcd713c: Merge commit 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + drivers/Makefile | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) +Merging voltage/reg-for-linus +$ git merge voltage/reg-for-linus +Auto-merged MAINTAINERS +Auto-merged arch/arm/Kconfig +Auto-merged drivers/Makefile +Merge made by recursive. + Documentation/ABI/testing/sysfs-class-regulator | 315 ++++ + Documentation/power/regulator/consumer.txt | 182 +++ + Documentation/power/regulator/machine.txt | 101 ++ + Documentation/power/regulator/overview.txt | 171 ++ + Documentation/power/regulator/regulator.txt | 30 + + MAINTAINERS | 9 + + arch/arm/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/regulator/Kconfig | 59 + + drivers/regulator/Makefile | 12 + + drivers/regulator/bq24022.c | 167 ++ + drivers/regulator/core.c | 1903 +++++++++++++++++++++++ + drivers/regulator/fixed.c | 129 ++ + drivers/regulator/virtual.c | 345 ++++ + include/linux/regulator/bq24022.h | 21 + + include/linux/regulator/consumer.h | 284 ++++ + include/linux/regulator/driver.h | 99 ++ + include/linux/regulator/fixed.h | 22 + + include/linux/regulator/machine.h | 104 ++ + 19 files changed, 3956 insertions(+), 0 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-regulator + create mode 100644 Documentation/power/regulator/consumer.txt + create mode 100644 Documentation/power/regulator/machine.txt + create mode 100644 Documentation/power/regulator/overview.txt + create mode 100644 Documentation/power/regulator/regulator.txt + create mode 100644 drivers/regulator/Kconfig + create mode 100644 drivers/regulator/Makefile + create mode 100644 drivers/regulator/bq24022.c + create mode 100644 drivers/regulator/core.c + create mode 100644 drivers/regulator/fixed.c + create mode 100644 drivers/regulator/virtual.c + create mode 100644 include/linux/regulator/bq24022.h + create mode 100644 include/linux/regulator/consumer.h + create mode 100644 include/linux/regulator/driver.h + create mode 100644 include/linux/regulator/fixed.h + create mode 100644 include/linux/regulator/machine.h +Merging security-testing/next +$ git merge security-testing/next +Already up-to-date. +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging quilt/ttydev +$ git merge quilt/ttydev +Already up-to-date. +$ git am -3 ../patches/0001-firmware-fix-typo-in-qlogicpti.c.patch +Applying firmware: fix typo in qlogicpti.c +$ git am -3 ../patches/0001-firmware-conversion-fallout-in-qlogicpti.c.patch +Applying firmware: conversion fallout in qlogicpti.c +$ git am -3 ../patches/0001-firmware-another-typo-in-the-conversion.patch +Applying firmware: another typo in the conversion diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..7fabc2984c23 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,152 @@ +Importing driver-core.current based on 2.6.26-git10 +$ git checkout quilt/driver-core.current +Switched to branch "quilt/driver-core.current" +$ git reset --hard c010b2f76c3032e48097a6eef291d8593d5d79a6 +HEAD is now at c010b2f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core.current +device-create-block-convert-device_create_drvdata-to-device_create.patch +device-create-char-convert-device_create_drvdata-to-device_create.patch +device-create-ieee1394-convert-device_create_drvdata-to-device_create.patch +.dotest/patch:35: space before tab in indent. + MKDEV(IEEE1394_MAJOR, +warning: 1 line adds whitespace errors. +device-create-infiniband-convert-device_create_drvdata-to-device_create.patch +device-create-misc-convert-device_create_drvdata-to-device_create.patch +device-create-net-convert-device_create_drvdata-to-device_create.patch +device-create-s390-convert-device_create_drvdata-to-device_create.patch +device-create-scsi-convert-device_create_drvdata-to-device_create.patch +device-create-sound-convert-device_create_drvdata-to-device_create.patch +device-create-usb-convert-device_create_drvdata-to-device_create.patch +device-create-video-convert-device_create_drvdata-to-device_create.patch +device-create-ide-convert-device_create_drvdata-to-device_create.patch +device-create-remove-device_create_drvdata.patch +kobject-fix-kobject_rename-and-config_sysfs.patch +Importing usb.current based on quilt/driver-core.current + quilt series is empty +$ git update-ref refs/heads/quilt/usb.current 9e263970972258fdd262ef375bdd83b5e3d9121f +Importing driver-core based on quilt/usb.current +$ git checkout quilt/driver-core +Switched to branch "quilt/driver-core" +$ git reset --hard 9e263970972258fdd262ef375bdd83b5e3d9121f +HEAD is now at 9e26397 kobject: Fix kobject_rename and !CONFIG_SYSFS +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core +net-convert-the-phy_device-file-to-use-bus_find_device_by_name.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 checkout quilt/usb +Switched to branch "quilt/usb" +$ git reset --hard bcc4e2d7a85812f876aaa10f153b3ad7c2721d8b +HEAD is now at bcc4e2d sysfs: crash debugging +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb +usb-gotemp.patch +Importing device-mapper based on v2.6.26-5752-g93ded9b +$ git checkout quilt/device-mapper +Switched to branch "quilt/device-mapper" +$ git reset --hard 93ded9b8fd42abe2c3607097963d8de6ad9117eb +HEAD is now at 93ded9b Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 +$ git quiltimport --author Alasdair G Kergon <agk@redhat.com> --patches ../quilt/device-mapper +dm-mpath-use-more-error-codes.patch +dm-exception-store-introduce-area_location-function.patch +dm-exception-store-use-chunk_t-for_areas.patch +Unchanged quilt series i2c +Unchanged quilt series kernel-doc +Importing ide based on 20b7997e8abdf338dcc27fb4f1333c4973a7f113 +$ git checkout quilt/ide +Switched to branch "quilt/ide" +$ git reset --hard 20b7997e8abdf338dcc27fb4f1333c4973a7f113 +HEAD is now at 20b7997 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc +$ git quiltimport --author Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> --patches ../quilt/ide +ide-always-call-init_chipset-method-in-do_ide_setup_pci_device.patch +ide-respect-dev-irq-in-do_ide_setup_pci_device-also-if-tried_config.patch +ide-move-ide_setup_pci_controller-call-to-ide_setup_pci_device-s.patch +ide-call-ide_pci_setup_ports-before-do_ide_setup_pci_device.patch +ide-add-dev-and-host_priv-fields-to-struct-ide_host.patch +ide-add-ide_device_get-put-helpers.patch +aec62xx-convert-to-use-host_priv.patch +hpt366-convert-to-use-host_priv.patch +it821x-convert-to-use-host_priv.patch +sc1200-convert-to-use-host_priv.patch +siimage-convert-to-use-host_priv.patch +via82cxxx-convert-to-use-host_priv.patch +tc86c001-remove-init_chipset-method.patch +amd74xx-cleanup-init_chipset-method.patch +cmd64x-cleanup-init_chipset-method.patch +via82cxxx-cleanup-init_chipset-method.patch +ide-add-ide_pci_remove-helper.patch +aec62xx-add-remove-method-and-module_exit.patch +alim15x3-add-remove-method-and-module_exit.patch +amd74xx-add-remove-method-and-module_exit.patch +atiixp-add-remove-method-and-module_exit.patch +cmd64x-add-remove-method-and-module_exit.patch +cs5530-add-remove-method-and-module_exit.patch +cs5535-add-remove-method-and-module_exit.patch +cy82c693-add-remove-method-and-module_exit.patch +generic-add-remove-method-and-module_exit.patch +hpt34x-add-remove-method-and-module_exit.patch +hpt366-add-remove-method-and-module_exit.patch +it8213-add-remove-method-and-module_exit.patch +it821x-add-remove-method-and-module_exit.patch +jmicron-add-remove-method-and-module_exit.patch +ns87415-add-remove-method-and-module_exit.patch +opti621-add-remove-method-and-module_exit.patch +pdc202xx_new-add-remove-method-and-module_exit.patch +pdc202xx_old-add-remove-method-and-module_exit.patch +piix-add-remove-method-and-module_exit.patch +rz1000-add-remove-method-and-module_exit.patch +sc1200-add-remove-method-and-module_exit.patch +serverworks-add-remove-method-and-module_exit.patch +siimage-add-remove-method-and-module_exit.patch +sis5513-add-remove-method-and-module_exit.patch +sl82c105-add-remove-method-and-module_exit.patch +slc90e66-add-remove-method-and-module_exit.patch +tc86c001-add-remove-method-and-module_exit.patch +triflex-add-remove-method-and-module_exit.patch +trm290-add-remove-method-and-module_exit.patch +via82cxxx-add-remove-method-and-module_exit.patch +icside-add-module_exit.patch +rapide-add-module_exit.patch +ide-fix-asm-xtensa-ide-h.patch +ide-generic-fix-ide_default_io_base-for-m32r.patch +ide-generic-minor-fix-for-mips.patch +ide-generic-remove-no_pci_devices-quirk-from-ide_default_io_base.patch +ide-remove-asm-cris-ide-h.patch +ide-define-max_hwifs-in-linux-ide-h.patch +ide-generic-remove-broken-ppc_prep-support.patch +ide-generic-is-no-longer-needed-on-ppc32.patch +ide-generic-remove-ide_default_io_base-irq-inlines-take-3.patch +ide-remove-asm-ide-h-for-some-archs.patch +ide-include-pci-device-name-in-messages-from-ide-pci-host-drivers.patch +it8213-remove-declare_ite_dev-macro.patch +it821x-remove-declare_ite_dev-macro.patch +ide-prefix-messages-from-ide-pci-host-drivers-by-driver-name.patch +ide-drop-name-parameter-from-init_chipset-method.patch +ide-ide-tape-c-sparse-annotations-and-unaligned-access-removal.patch +ide-trivial-sparse-annotations.patch +palm_bk3710-add-ultradma_100-support.patch +gayle-release-resources-on-ide_host_add-failure.patch +ide-cd-fix-oops-when-using-growisofs.patch +ht6560b-update-email-address.patch +ht6560b-remove-old-history.patch +ide-scsi-remove-kmalloced-struct-request.patch +ide-enable-local-irqs-in-all-handlers-for-taskfile_no_data-data-phase.patch +ide-remove-stale-comments-from-drivers-ide-makefile.patch +ide-fix-for-eata-hba-in-ata-emulating-mode.patch +ide-use-proper-printk-kern_-levels-in-ide-probe-c.patch +ata-add-missing-ata_id_-defines-take-2.patch +ide-fix-pre-eide-swdma-support-on-big-endian.patch +ide-fix-ide_fix_driveid.patch +ide-remove-superfluous-check-from-ide_disk_special.patch +ide-cleanup-ide_disk_init_mult_count.patch +ide-cleanup-ide_fix_driveid.patch +ide-make-drive-id-an-union.patch +ide-remove-drive-driveid.patch +ide-use-ata_id_current_chs_valid.patch +ide-disk-use-ata_id_wcache_enabled.patch +ide-disk-use-ata_id_hpa_enabled.patch +Unchanged quilt series m68k +Unchanged quilt series rr +Importing ttydev based on origin/master + quilt series is empty +$ git update-ref refs/heads/quilt/ttydev 20b7997e8abdf338dcc27fb4f1333c4973a7f113 diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..745964bee4e2 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20080724 |