diff options
Diffstat (limited to 'Next/merge.log')
| -rw-r--r-- | Next/merge.log | 1554 |
1 files changed, 1554 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..b77fe8c02a59 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,1554 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at e83c2b0 Merge branch 'kmemleak' of git://linux-arm.org/linux-2.6 +Merging origin/master +$ git merge origin/master +Updating e83c2b0..d960eea +Fast forward + Documentation/block/data-integrity.txt | 4 +- + MAINTAINERS | 2 +- + arch/x86/include/asm/pci.h | 2 +- + block/Makefile | 2 +- + block/blk-core.c | 14 +- + block/bsg.c | 2 +- + block/cfq-iosched.c | 176 +++++++++++++----------- + block/cmd-filter.c | 233 -------------------------------- + block/scsi_ioctl.c | 43 +++++- + drivers/md/dm.c | 4 +- + drivers/md/linear.c | 4 +- + drivers/md/md.c | 56 +++++---- + drivers/md/multipath.c | 7 +- + drivers/md/raid0.c | 9 +- + drivers/md/raid1.c | 9 +- + drivers/md/raid10.c | 19 ++- + drivers/md/raid5.c | 28 +++- + drivers/mtd/cmdlinepart.c | 2 +- + drivers/mtd/devices/m25p80.c | 2 +- + drivers/mtd/inftlcore.c | 11 +- + drivers/mtd/maps/integrator-flash.c | 22 ++- + drivers/mtd/nand/atmel_nand.c | 2 +- + drivers/mtd/nand/omap2.c | 7 +- + drivers/mtd/nftlcore.c | 16 +- + drivers/net/bnx2x_main.c | 10 ++- + drivers/net/e1000/e1000_main.c | 11 ++- + drivers/net/e1000e/netdev.c | 3 + + drivers/net/igb/igb_main.c | 14 ++- + drivers/net/irda/bfin_sir.c | 16 ++- + drivers/net/ixgbe/ixgbe_ethtool.c | 5 +- + drivers/net/ixgbe/ixgbe_main.c | 45 ++++-- + drivers/net/usb/cdc_eem.c | 2 +- + drivers/net/usb/dm9601.c | 10 +- + drivers/net/usb/net1080.c | 12 +- + drivers/net/usb/rndis_host.c | 2 +- + drivers/net/usb/smsc95xx.c | 10 +- + drivers/net/usb/usbnet.c | 30 ++-- + drivers/pci/iova.c | 26 +++- + drivers/scsi/sg.c | 4 +- + fs/binfmt_elf.c | 4 +- + fs/bio-integrity.c | 170 +++++++++++++++++------ + fs/bio.c | 11 +- + fs/fuse/dev.c | 83 +++++++++++- + fs/fuse/dir.c | 57 ++++++++- + fs/fuse/file.c | 2 +- + fs/fuse/fuse_i.h | 27 ++++ + fs/fuse/inode.c | 68 +++++++++- + fs/jffs2/scan.c | 4 +- + include/linux/bio.h | 22 +++- + include/linux/blkdev.h | 15 +-- + include/linux/fuse.h | 36 +++++- + include/linux/netfilter/xt_conntrack.h | 13 ++ + include/linux/netfilter/xt_osf.h | 2 + + include/linux/usb/usbnet.h | 1 - + include/net/netfilter/nf_conntrack.h | 4 +- + mm/kmemleak.c | 31 +---- + net/ieee802154/netlink.c | 6 + + net/ipv4/arp.c | 7 +- + net/ipv4/fib_trie.c | 3 + + net/ipv4/netfilter/nf_nat_helper.c | 17 ++- + net/ipv4/tcp.c | 15 ++- + net/ipv4/tcp_output.c | 3 +- + net/netfilter/nf_conntrack_expect.c | 4 +- + net/netfilter/nf_conntrack_extend.c | 2 +- + net/netfilter/nf_conntrack_proto_tcp.c | 6 +- + net/netfilter/xt_conntrack.c | 66 ++++++++- + net/sctp/output.c | 2 +- + net/xfrm/xfrm_state.c | 57 +------- + scripts/kernel-doc | 4 +- + 69 files changed, 941 insertions(+), 677 deletions(-) + delete mode 100644 block/cmd-filter.c +Merging fixes/fixes +$ git merge fixes/fixes +Already up-to-date. +Merging arm-current/master +$ git merge arm-current/master +Already up-to-date. +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Merge made by recursive. + drivers/scsi/cxgb3i/cxgb3i_iscsi.c | 4 ++++ + drivers/scsi/fnic/fnic_main.c | 8 ++++---- + drivers/scsi/fnic/fnic_scsi.c | 7 ++----- + drivers/scsi/ibmvscsi/ibmvscsi.c | 7 ++++++- + drivers/scsi/scsi_transport_fc.c | 5 +++-- + drivers/scsi/zalon.c | 2 +- + 6 files changed, 20 insertions(+), 13 deletions(-) +Merging net-current/master +$ git merge net-current/master +Already up-to-date. +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Merge made by recursive. + arch/ia64/pci/pci.c | 2 +- + arch/mn10300/include/asm/pci.h | 4 -- + arch/x86/pci/acpi.c | 59 ++++++++++++----------------- + arch/x86/pci/amd_bus.c | 8 +++- + drivers/pci/hotplug/pci_hotplug_core.c | 2 + + drivers/pci/msi.c | 64 ++++++++++++++++++++++--------- + drivers/pci/msi.h | 10 ++-- + drivers/pci/pci.c | 15 ++++++- + drivers/pci/pcie/aer/ecrc.c | 2 +- + drivers/pci/quirks.c | 5 ++ + drivers/pci/slot.c | 4 +- + include/linux/pci.h | 2 +- + 12 files changed, 104 insertions(+), 73 deletions(-) +Merging wireless-current/master +$ git merge wireless-current/master +Already up-to-date. +Merging kbuild-current/master +$ git merge kbuild-current/master +Auto-merging include/asm-generic/vmlinux.lds.h +Merge made by recursive. + .gitignore | 1 + + Makefile | 7 +++---- + arch/mn10300/kernel/vmlinux.lds.S | 2 +- + drivers/scsi/cxgb3i/Kbuild | 2 +- + include/asm-generic/vmlinux.lds.h | 12 ++++++------ + include/linux/init_task.h | 3 +++ + include/linux/linkage.h | 9 +++++++++ + scripts/.gitignore | 1 + + scripts/package/builddeb | 2 ++ + 9 files changed, 27 insertions(+), 12 deletions(-) +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Auto-merging drivers/video/omap/omapfb_main.c +Merge made by recursive. + drivers/base/base.h | 5 +++++ + drivers/base/core.c | 20 ++++++++++++++------ + drivers/base/dd.c | 31 +++++++++++++++++++++++++++++-- + drivers/base/devres.c | 3 +++ + drivers/power/wm97xx_battery.c | 4 ++-- + drivers/video/omap/omapfb_main.c | 14 +++++++------- + fs/partitions/check.c | 2 +- + include/linux/device.h | 16 ++++------------ + sound/soc/codecs/wm8988.c | 4 ++-- + 9 files changed, 67 insertions(+), 32 deletions(-) +Merging quilt/usb.current +$ git merge quilt/usb.current +Removing drivers/usb/otg/langwell_otg.c +Removing include/linux/usb/langwell_otg.h +Merge made by recursive. + drivers/usb/gadget/Kconfig | 42 +- + drivers/usb/gadget/audio.c | 6 +- + drivers/usb/host/ehci-hcd.c | 35 +- + drivers/usb/host/ehci-q.c | 19 +- + drivers/usb/host/fhci-sched.c | 8 +- + drivers/usb/host/isp1760-if.c | 2 +- + drivers/usb/otg/Kconfig | 14 - + drivers/usb/otg/Makefile | 1 - + drivers/usb/otg/langwell_otg.c | 1915 --------------------------------- + drivers/usb/serial/ftdi_sio.c | 3 + + drivers/usb/serial/ftdi_sio.h | 3 + + drivers/usb/serial/option.c | 12 +- + drivers/usb/serial/pl2303.c | 1 + + drivers/usb/serial/pl2303.h | 4 + + drivers/usb/serial/ti_usb_3410_5052.c | 1 - + include/linux/usb/langwell_otg.h | 177 --- + 16 files changed, 83 insertions(+), 2160 deletions(-) + delete mode 100644 drivers/usb/otg/langwell_otg.c + delete mode 100644 include/linux/usb/langwell_otg.h +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Merge made by recursive. + drivers/input/keyboard/Kconfig | 294 +++++++++++---------- + drivers/input/keyboard/Makefile | 33 ++-- + drivers/input/keyboard/gpio_keys.c | 33 ++- + drivers/input/keyboard/matrix_keypad.c | 453 ++++++++++++++++++++++++++++++++ + drivers/input/serio/i8042-x86ia64io.h | 28 ++ + drivers/input/tablet/wacom_wac.c | 6 +- + drivers/mfd/dm355evm_msp.c | 3 +- + include/linux/input/matrix_keypad.h | 65 +++++ + 8 files changed, 744 insertions(+), 171 deletions(-) + create mode 100644 drivers/input/keyboard/matrix_keypad.c + create mode 100644 include/linux/input/matrix_keypad.h +Merging md-current/for-linus +$ git merge md-current/for-linus +Already up-to-date. +Merging audit-current/for-linus +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master +$ git merge crypto-current/master +Already up-to-date. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Auto-merging arch/arm/mach-at91/board-sam9rlek.c +Merge made by recursive. + arch/arm/mach-at91/Kconfig | 26 +- + arch/arm/mach-at91/Makefile | 4 + + arch/arm/mach-at91/Makefile.boot | 4 + + arch/arm/mach-at91/at91sam9g45.c | 360 ++++++ + arch/arm/mach-at91/at91sam9g45_devices.c | 1230 ++++++++++++++++++++ + arch/arm/mach-at91/board-sam9m10g45ek.c | 389 ++++++ + arch/arm/mach-at91/board-sam9rlek.c | 79 ++ + arch/arm/mach-at91/clock.c | 62 +- + arch/arm/mach-at91/generic.h | 2 + + arch/arm/mach-at91/gpio.c | 15 - + arch/arm/mach-at91/include/mach/at91sam9g45.h | 138 +++ + .../mach-at91/include/mach/at91sam9g45_matrix.h | 153 +++ + arch/arm/mach-at91/include/mach/board.h | 8 +- + arch/arm/mach-at91/include/mach/cpu.h | 16 + + arch/arm/mach-at91/include/mach/hardware.h | 2 + + arch/arm/mach-at91/include/mach/timex.h | 5 + + arch/arm/mach-ep93xx/gpio.c | 64 +- + arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 61 +- + arch/arm/mach-ep93xx/include/mach/io.h | 17 +- + drivers/net/Kconfig | 2 +- + drivers/video/Kconfig | 2 +- + 21 files changed, 2569 insertions(+), 70 deletions(-) + create mode 100644 arch/arm/mach-at91/at91sam9g45.c + create mode 100644 arch/arm/mach-at91/at91sam9g45_devices.c + create mode 100644 arch/arm/mach-at91/board-sam9m10g45ek.c + create mode 100644 arch/arm/mach-at91/include/mach/at91sam9g45.h + create mode 100644 arch/arm/mach-at91/include/mach/at91sam9g45_matrix.h +Merging davinci/for-next +$ git merge davinci/for-next +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Already up-to-date. +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Merge made by recursive. + arch/cris/include/arch-v10/arch/mmu.h | 9 +++++---- + arch/cris/include/arch-v32/arch/mmu.h | 10 ++++++---- + arch/cris/include/asm/pgtable.h | 2 ++ + 3 files changed, 13 insertions(+), 8 deletions(-) +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging m68k/for-next +$ git merge m68k/for-next +Auto-merging drivers/rtc/Kconfig +Auto-merging drivers/rtc/Makefile +Merge made by recursive. + drivers/rtc/Kconfig | 19 +++ + drivers/rtc/Makefile | 2 + + drivers/rtc/rtc-msm6242.c | 268 +++++++++++++++++++++++++++++++++++++++++++++ + drivers/rtc/rtc-rp5c01.c | 222 +++++++++++++++++++++++++++++++++++++ + 4 files changed, 511 insertions(+), 0 deletions(-) + create mode 100644 drivers/rtc/rtc-msm6242.c + create mode 100644 drivers/rtc/rtc-rp5c01.c +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Removing arch/m68k/include/asm/checksum_mm.h +Removing arch/m68k/include/asm/checksum_no.h +Removing arch/m68k/include/asm/dma_mm.h +Removing arch/m68k/include/asm/dma_no.h +Removing arch/m68k/include/asm/hardirq_mm.h +Removing arch/m68k/include/asm/hardirq_no.h +Removing arch/m68k/include/asm/irq_mm.h +Removing arch/m68k/include/asm/irq_no.h +Removing arch/m68k/include/asm/processor_mm.h +Removing arch/m68k/include/asm/processor_no.h +Merge made by recursive. + arch/m68k/include/asm/checksum.h | 160 ++++++++- + arch/m68k/include/asm/checksum_mm.h | 148 -------- + arch/m68k/include/asm/checksum_no.h | 132 ------- + arch/m68k/include/asm/dma.h | 492 +++++++++++++++++++++++++- + arch/m68k/include/asm/dma_mm.h | 16 - + arch/m68k/include/asm/dma_no.h | 494 -------------------------- + arch/m68k/include/asm/hardirq.h | 21 +- + arch/m68k/include/asm/hardirq_mm.h | 16 - + arch/m68k/include/asm/hardirq_no.h | 27 -- + arch/m68k/include/asm/irq.h | 135 +++++++- + arch/m68k/include/asm/irq_mm.h | 126 ------- + arch/m68k/include/asm/irq_no.h | 26 -- + arch/m68k/include/asm/m5206sim.h | 22 +- + arch/m68k/include/asm/m520xsim.h | 21 +- + arch/m68k/include/asm/m5249sim.h | 33 +- + arch/m68k/include/asm/m5272sim.h | 5 + + arch/m68k/include/asm/m5307sim.h | 21 +- + arch/m68k/include/asm/m532xsim.h | 44 +-- + arch/m68k/include/asm/m5407sim.h | 18 +- + arch/m68k/include/asm/mcfintc.h | 89 +++++ + arch/m68k/include/asm/mcfsim.h | 93 +----- + arch/m68k/include/asm/processor.h | 171 +++++++++- + arch/m68k/include/asm/processor_mm.h | 130 ------- + arch/m68k/include/asm/processor_no.h | 143 -------- + arch/m68knommu/kernel/irq.c | 21 -- + arch/m68knommu/lib/checksum.c | 9 - + arch/m68knommu/platform/5206/config.c | 56 ++-- + arch/m68knommu/platform/5206e/config.c | 57 ++-- + arch/m68knommu/platform/520x/config.c | 30 -- + arch/m68knommu/platform/523x/config.c | 63 ---- + arch/m68knommu/platform/5249/Makefile | 2 +- + arch/m68knommu/platform/5249/config.c | 49 +-- + arch/m68knommu/platform/5249/intc2.c | 59 +++ + arch/m68knommu/platform/5272/config.c | 29 +-- + arch/m68knommu/platform/527x/config.c | 49 --- + arch/m68knommu/platform/528x/config.c | 51 +--- + arch/m68knommu/platform/5307/config.c | 65 ++--- + arch/m68knommu/platform/532x/config.c | 49 +--- + arch/m68knommu/platform/5407/config.c | 68 ++--- + arch/m68knommu/platform/68328/ints.c | 72 ++-- + arch/m68knommu/platform/68360/ints.c | 44 ++- + arch/m68knommu/platform/coldfire/Makefile | 22 +- + arch/m68knommu/platform/coldfire/intc-2.c | 93 +++++ + arch/m68knommu/platform/coldfire/intc-simr.c | 78 ++++ + arch/m68knommu/platform/coldfire/intc.c | 153 ++++++++ + arch/m68knommu/platform/coldfire/pit.c | 8 - + arch/m68knommu/platform/coldfire/timers.c | 18 +- + arch/m68knommu/platform/coldfire/vectors.c | 20 +- + 48 files changed, 1704 insertions(+), 2044 deletions(-) + delete mode 100644 arch/m68k/include/asm/checksum_mm.h + delete mode 100644 arch/m68k/include/asm/checksum_no.h + delete mode 100644 arch/m68k/include/asm/dma_mm.h + delete mode 100644 arch/m68k/include/asm/dma_no.h + delete mode 100644 arch/m68k/include/asm/hardirq_mm.h + delete mode 100644 arch/m68k/include/asm/hardirq_no.h + delete mode 100644 arch/m68k/include/asm/irq_mm.h + delete mode 100644 arch/m68k/include/asm/irq_no.h + create mode 100644 arch/m68k/include/asm/mcfintc.h + delete mode 100644 arch/m68k/include/asm/processor_mm.h + delete mode 100644 arch/m68k/include/asm/processor_no.h + create mode 100644 arch/m68knommu/platform/5249/intc2.c + create mode 100644 arch/m68knommu/platform/coldfire/intc-2.c + create mode 100644 arch/m68knommu/platform/coldfire/intc-simr.c + create mode 100644 arch/m68knommu/platform/coldfire/intc.c +Merging microblaze/next +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Resolved 'arch/mips/cavium-octeon/executive/cvmx-helper-errata.c' using previous resolution. +Resolved 'arch/mips/mm/tlbex.c' using previous resolution. +Resolved 'arch/mips/sibyte/swarm/setup.c' using previous resolution. +Resolved 'drivers/char/hw_random/Kconfig' using previous resolution. +Resolved 'drivers/char/hw_random/Makefile' using previous resolution. +Resolved 'drivers/dma/txx9dmac.c' using previous resolution. +Auto-merging arch/mips/Kconfig +Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-errata.c +CONFLICT (add/add): Merge conflict in arch/mips/cavium-octeon/executive/cvmx-helper-errata.c +Auto-merging arch/mips/cavium-octeon/octeon-irq.c +Auto-merging arch/mips/include/asm/cpu-features.h +Auto-merging arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h +Auto-merging arch/mips/mm/c-r4k.c +Auto-merging arch/mips/mm/tlbex.c +CONFLICT (content): Merge conflict in arch/mips/mm/tlbex.c +Auto-merging arch/mips/sibyte/Kconfig +Auto-merging arch/mips/sibyte/swarm/setup.c +CONFLICT (content): Merge conflict in arch/mips/sibyte/swarm/setup.c +Auto-merging drivers/char/hw_random/Kconfig +CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig +Auto-merging drivers/char/hw_random/Makefile +CONFLICT (content): Merge conflict in drivers/char/hw_random/Makefile +Auto-merging drivers/dma/txx9dmac.c +CONFLICT (add/add): Merge conflict in drivers/dma/txx9dmac.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 708cc27] Merge commit 'mips/mips-for-linux-next' +$ git diff -M --stat --summary HEAD^.. +Merging parisc/master +$ git merge parisc/master +Already up-to-date. +Merging powerpc/next +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging galak/next +$ git merge galak/next +Already up-to-date. +Merging s390/features +$ git merge s390/features +Merge made by recursive. + arch/s390/include/asm/chsc.h | 28 ++ + arch/s390/include/asm/cio.h | 223 +------------- + .../cio/scsw.c => arch/s390/include/asm/scsw.h | 345 +++++++++++++------- + arch/s390/include/asm/timex.h | 16 +- + arch/s390/kernel/early.c | 2 +- + arch/s390/kernel/head.S | 2 +- + arch/s390/kernel/time.c | 9 +- + arch/s390/lib/delay.c | 2 + + drivers/s390/block/dasd_eckd.c | 43 +-- + drivers/s390/block/dasd_erp.c | 2 +- + drivers/s390/block/dasd_fba.c | 21 +- + drivers/s390/block/dasd_int.h | 3 +- + drivers/s390/char/monreader.c | 4 +- + drivers/s390/char/sclp_rw.h | 5 + + drivers/s390/cio/Makefile | 2 +- + drivers/s390/cio/chsc.h | 24 -- + 16 files changed, 314 insertions(+), 417 deletions(-) + rename drivers/s390/cio/scsw.c => arch/s390/include/asm/scsw.h (70%) +Merging sh/master +$ git merge sh/master +Auto-merging mm/nommu.c +Auto-merging tools/perf/perf.h +Merge made by recursive. + arch/sh/Kconfig.debug | 4 - + arch/sh/boards/mach-se/7206/io.c | 2 +- + arch/sh/boards/mach-se/7724/setup.c | 110 +++++++++++++++++++++++++++++++- + arch/sh/configs/migor_defconfig | 53 +++++++++++++++- + arch/sh/configs/se7724_defconfig | 25 ++++++- + arch/sh/include/asm/perf_counter.h | 2 +- + arch/sh/include/asm/syscall_32.h | 1 + + arch/sh/include/mach-se/mach/se7724.h | 5 ++ + arch/sh/mm/fault_32.c | 61 ++++++++++--------- + arch/sh/mm/tlbflush_64.c | 15 ++++- + drivers/clocksource/sh_tmu.c | 2 +- + drivers/video/sh_mobile_lcdcfb.c | 53 +++++++++++++--- + mm/nommu.c | 21 ++++++ + tools/perf/perf.h | 10 +++ + 14 files changed, 307 insertions(+), 57 deletions(-) +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging xtensa/master +$ git merge xtensa/master +Auto-merging arch/xtensa/Kconfig +Merge made by recursive. +Merging cifs/master +$ git merge cifs/master +Merge made by recursive. + fs/cifs/cifsfs.h | 13 ++ + fs/cifs/cifsglob.h | 25 ++++ + fs/cifs/cifspdu.h | 14 +-- + fs/cifs/cifsproto.h | 9 +- + fs/cifs/dir.c | 22 ++-- + fs/cifs/inode.c | 380 ++++++++++++++++++++++++++------------------------- + fs/cifs/readdir.c | 253 ++++++++++++---------------------- + 7 files changed, 339 insertions(+), 377 deletions(-) +Merging configfs/linux-next +$ git merge configfs/linux-next +Resolved 'fs/configfs/dir.c' using previous resolution. +Auto-merging fs/configfs/dir.c +CONFLICT (content): Merge conflict in fs/configfs/dir.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 335d93b] Merge commit 'configfs/linux-next' +$ git diff -M --stat --summary HEAD^.. +Merging ext4/next +$ git merge ext4/next +Already up-to-date. +Merging fatfs/master +$ git merge fatfs/master +Merge made by recursive. + fs/fat/Kconfig | 20 +++++++++++++++++ + fs/fat/dir.c | 15 ++++++------- + fs/fat/namei_vfat.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 86 insertions(+), 8 deletions(-) +Merging fuse/for-next +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Merge made by recursive. + fs/gfs2/aops.c | 39 +++++++++++++++++++++++++++++++++++++++ + fs/gfs2/glock.c | 27 +++++++++------------------ + fs/gfs2/super.c | 39 +++++++++++++++++++++++++-------------- + fs/gfs2/super.h | 4 ++++ + 4 files changed, 77 insertions(+), 32 deletions(-) +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging nfs/linux-next +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Already up-to-date. +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Auto-merging fs/nilfs2/cpfile.c +Auto-merging fs/nilfs2/inode.c +Auto-merging fs/nilfs2/nilfs.h +Auto-merging fs/nilfs2/super.c +Auto-merging fs/nilfs2/the_nilfs.c +Merge made by recursive. +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Already up-to-date. +Merging squashfs/master +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Resolved 'net/9p/protocol.c' using previous resolution. +Auto-merging net/9p/protocol.c +CONFLICT (content): Merge conflict in net/9p/protocol.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f439d29] Merge commit 'v9fs/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Already up-to-date. +Merging reiserfs-bkl/reiserfs/kill-bkl-rc6 +$ git merge reiserfs-bkl/reiserfs/kill-bkl-rc6 +Resolved 'fs/reiserfs/super.c' using previous resolution. +Auto-merging fs/reiserfs/dir.c +Auto-merging fs/reiserfs/do_balan.c +Auto-merging fs/reiserfs/inode.c +Auto-merging fs/reiserfs/resize.c +Auto-merging fs/reiserfs/super.c +CONFLICT (content): Merge conflict in fs/reiserfs/super.c +Auto-merging fs/reiserfs/xattr.c +Auto-merging include/linux/reiserfs_fs.h +Auto-merging include/linux/reiserfs_fs_sb.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7f9ea88] Merge commit 'reiserfs-bkl/reiserfs/kill-bkl-rc6' +$ git diff -M --stat --summary HEAD^.. + fs/reiserfs/Makefile | 2 +- + fs/reiserfs/bitmap.c | 4 ++ + fs/reiserfs/dir.c | 8 +++ + fs/reiserfs/do_balan.c | 17 ++---- + fs/reiserfs/fix_node.c | 19 ++++++-- + fs/reiserfs/inode.c | 73 ++++++++++++++++++--------- + fs/reiserfs/ioctl.c | 6 ++- + fs/reiserfs/journal.c | 109 ++++++++++++++++++++++++++++------------ + fs/reiserfs/lock.c | 89 ++++++++++++++++++++++++++++++++ + fs/reiserfs/namei.c | 13 ++++- + fs/reiserfs/prints.c | 4 -- + fs/reiserfs/resize.c | 2 + + fs/reiserfs/stree.c | 53 ++++++++++++++++--- + fs/reiserfs/super.c | 55 +++++++++++++++++--- + fs/reiserfs/xattr.c | 4 +- + include/linux/reiserfs_fs.h | 68 +++++++++++++++++++++++-- + include/linux/reiserfs_fs_sb.h | 20 +++++++ + 17 files changed, 441 insertions(+), 105 deletions(-) + create mode 100644 fs/reiserfs/lock.c +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging pci/linux-next +$ git merge pci/linux-next +Auto-merging arch/x86/include/asm/pci.h +Merge made by recursive. + arch/alpha/include/asm/pci.h | 1 - + arch/arm/include/asm/pci.h | 2 -- + arch/frv/mb93090-mb00/pci-frv.c | 10 ++++------ + arch/h8300/include/asm/pci.h | 1 - + arch/ia64/include/asm/pci.h | 14 ++++++++++++-- + arch/mips/include/asm/pci.h | 2 -- + arch/mn10300/include/asm/pci.h | 13 ++++++++++++- + arch/parisc/include/asm/pci.h | 1 - + arch/powerpc/include/asm/pci.h | 1 - + arch/sh/include/asm/pci.h | 1 - + arch/sparc/include/asm/pci_32.h | 1 - + arch/sparc/include/asm/pci_64.h | 1 - + arch/um/include/asm/pci.h | 1 - + arch/x86/include/asm/pci.h | 1 - + drivers/pci/probe.c | 3 +-- + drivers/pci/setup-res.c | 1 + + drivers/pcmcia/yenta_socket.c | 16 ++++++++-------- + include/asm-generic/pci.h | 13 ++++++++++++- + 18 files changed, 50 insertions(+), 33 deletions(-) +Merging hid/for-next +$ git merge hid/for-next +Auto-merging drivers/hid/usbhid/hiddev.c +Merge made by recursive. + drivers/hid/Kconfig | 22 +-- + drivers/hid/Makefile | 5 +- + drivers/hid/hid-core.c | 58 +++++-- + drivers/hid/hid-debug.c | 438 ++++++++++++++++++++++++++++++++++------- + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-input.c | 13 +-- + drivers/hid/hid-lg.c | 2 + + drivers/hid/hid-lgff.c | 1 + + drivers/hid/hid-ntrig.c | 33 +++- + drivers/hid/hid-samsung.c | 39 ++++- + drivers/hid/hid-tmff.c | 6 +- + drivers/hid/usbhid/hid-core.c | 9 +- + drivers/hid/usbhid/hiddev.c | 4 +- + include/linux/hid-debug.h | 48 ++++-- + include/linux/hid.h | 22 +-- + 15 files changed, 535 insertions(+), 166 deletions(-) +Merging quilt/i2c +$ git merge quilt/i2c +Merge made by recursive. + include/linux/i2c-id.h | 11 ----------- + include/linux/i2c.h | 2 -- + 2 files changed, 0 insertions(+), 13 deletions(-) +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Merge made by recursive. + Documentation/hwmon/tmp421 | 36 +++++ + drivers/hwmon/Kconfig | 10 ++ + drivers/hwmon/Makefile | 1 + + drivers/hwmon/abituguru3.c | 6 +- + drivers/hwmon/hwmon-vid.c | 10 +- + drivers/hwmon/max6650.c | 1 + + drivers/hwmon/sht15.c | 2 +- + drivers/hwmon/tmp421.c | 347 ++++++++++++++++++++++++++++++++++++++++++++ + 8 files changed, 408 insertions(+), 5 deletions(-) + create mode 100644 Documentation/hwmon/tmp421 + create mode 100644 drivers/hwmon/tmp421.c +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Merge made by recursive. + Documentation/x86/00-INDEX | 2 + + .../{exception.txt => x86/exception-tables.txt} | 202 ++++++++++---------- + 2 files changed, 103 insertions(+), 101 deletions(-) + rename Documentation/{exception.txt => x86/exception-tables.txt} (75%) +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Already uptodate! +Merge made by recursive. +Merging quota/for_next +$ git merge quota/for_next +Already up-to-date. +Merging kbuild/master +$ git merge kbuild/master +Already up-to-date. +Merging ide/master +$ git merge ide/master +Already up-to-date. +Merging libata/NEXT +$ git merge libata/NEXT +Auto-merging drivers/ata/libata-eh.c +Merge made by recursive. + drivers/ata/libata-eh.c | 6 ++++-- + drivers/ata/sata_sil.c | 13 +++++++++++++ + 2 files changed, 17 insertions(+), 2 deletions(-) +Merging infiniband/for-next +$ git merge infiniband/for-next +Already up-to-date. +Merging acpi/test +$ git merge acpi/test +Auto-merging drivers/platform/x86/Kconfig +Merge made by recursive. + arch/x86/kernel/reboot.c | 2 +- + drivers/acpi/Kconfig | 17 ++- + drivers/acpi/Makefile | 2 + + drivers/acpi/acpi_memhotplug.c | 40 ++--- + drivers/acpi/acpica/evevent.c | 13 +- + drivers/acpi/acpica/hwsleep.c | 24 +-- + drivers/acpi/ec.c | 118 ++++------- + drivers/acpi/processor_aggregator.c | 389 +++++++++++++++++++++++++++++++++++ + drivers/acpi/processor_core.c | 244 +++++++++++------------ + drivers/acpi/processor_idle.c | 10 +- + drivers/acpi/processor_thermal.c | 3 +- + drivers/acpi/processor_throttling.c | 3 +- + drivers/acpi/scan.c | 5 - + drivers/acpi/sleep.c | 14 -- + drivers/acpi/video.c | 12 +- + drivers/platform/x86/Kconfig | 2 + + include/acpi/acpi_bus.h | 2 - + 17 files changed, 616 insertions(+), 284 deletions(-) + create mode 100644 drivers/acpi/processor_aggregator.c +$ git revert 6af05c22969dce2776375953131b56e9f4282848 +Automatic revert failed. After resolving the conflicts, +mark the corrected paths with 'git add <paths>' or 'git rm <paths>' and commit the result. +Resolved 'drivers/platform/x86/eeepc-laptop.c' using previous resolution. +$ git checkout HEAD drivers/platform/x86/eeepc-laptop.c +$ git commit -v -a +[master f0e3ef6] Revert "eeepc-laptop: Register as a pci-hotplug device" + 1 files changed, 0 insertions(+), 2 deletions(-) +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Merge made by recursive. + drivers/firewire/core-card.c | 14 +++++++------- + drivers/firewire/core-cdev.c | 4 +++- + drivers/firewire/core-iso.c | 24 +++++++++++++----------- + drivers/firewire/core.h | 3 ++- + include/linux/firewire.h | 1 + + 5 files changed, 26 insertions(+), 20 deletions(-) +Merging ubi/linux-next +$ git merge ubi/linux-next +Already up-to-date. +Merging kvm/master +$ git merge kvm/master +Removing arch/x86/kvm/kvm_svm.h +Removing virt/kvm/kvm_trace.c +Merge made by recursive. + arch/ia64/include/asm/kvm_host.h | 4 +- + arch/ia64/kvm/Kconfig | 11 +- + arch/ia64/kvm/kvm-ia64.c | 65 ++--- + arch/ia64/kvm/vcpu.c | 4 +- + arch/powerpc/include/asm/kvm_host.h | 4 +- + arch/powerpc/kvm/44x.c | 4 +- + arch/powerpc/kvm/44x_tlb.c | 11 +- + arch/powerpc/kvm/Kconfig | 14 +- + arch/powerpc/kvm/Makefile | 4 +- + arch/powerpc/kvm/booke.c | 2 +- + arch/powerpc/kvm/e500.c | 7 +- + arch/powerpc/kvm/e500_emulate.c | 3 + + arch/powerpc/kvm/e500_tlb.c | 26 +- + arch/powerpc/kvm/e500_tlb.h | 6 +- + arch/powerpc/kvm/emulate.c | 7 +- + arch/powerpc/kvm/powerpc.c | 19 +- + arch/powerpc/kvm/trace.h | 104 ++++++ + arch/s390/include/asm/kvm_host.h | 15 +- + arch/s390/kvm/Kconfig | 9 +- + arch/s390/kvm/gaccess.h | 23 +- + arch/s390/kvm/intercept.c | 18 +- + arch/s390/kvm/kvm-s390.c | 78 ++--- + arch/s390/kvm/kvm-s390.h | 32 ++- + arch/s390/kvm/sigp.c | 60 ++-- + arch/x86/include/asm/kvm.h | 1 + + arch/x86/include/asm/kvm_host.h | 47 ++-- + arch/x86/include/asm/msr-index.h | 1 + + arch/x86/include/asm/vmx.h | 8 + + arch/x86/kvm/Kconfig | 21 +- + arch/x86/kvm/Makefile | 35 +- + arch/x86/kvm/i8254.c | 118 ++++--- + arch/x86/kvm/i8254.h | 2 +- + arch/x86/kvm/i8259.c | 48 ++- + arch/x86/kvm/kvm_cache_regs.h | 9 + + arch/x86/kvm/kvm_svm.h | 51 --- + arch/x86/kvm/kvm_timer.h | 2 +- + arch/x86/kvm/lapic.c | 118 ++++--- + arch/x86/kvm/lapic.h | 1 + + arch/x86/kvm/mmu.c | 349 +++++++++++++------- + arch/x86/kvm/mmu.h | 4 +- + arch/x86/kvm/paging_tmpl.h | 43 ++-- + arch/x86/kvm/svm.c | 259 ++++++++++----- + arch/x86/kvm/timer.c | 16 +- + arch/x86/kvm/trace.h | 270 +++++++++++++++ + arch/x86/kvm/vmx.c | 418 +++++++++++++++++------ + arch/x86/kvm/x86.c | 624 +++++++++++++++++++++++++---------- + arch/x86/kvm/x86_emulate.c | 257 ++++++++++++++- + fs/eventfd.c | 7 +- + include/linux/kvm.h | 93 ++++-- + include/linux/kvm_host.h | 101 ++++--- + include/trace/events/kvm.h | 95 ++++++ + mm/hugetlb.c | 1 + + virt/kvm/Kconfig | 14 + + virt/kvm/coalesced_mmio.c | 68 ++-- + virt/kvm/coalesced_mmio.h | 1 + + virt/kvm/eventfd.c | 216 ++++++++++++ + virt/kvm/ioapic.c | 50 ++- + virt/kvm/iodev.h | 55 ++-- + virt/kvm/irq_comm.c | 45 ++- + virt/kvm/kvm_main.c | 247 +++++++++----- + virt/kvm/kvm_trace.c | 285 ---------------- + 61 files changed, 3029 insertions(+), 1481 deletions(-) + create mode 100644 arch/powerpc/kvm/trace.h + delete mode 100644 arch/x86/kvm/kvm_svm.h + create mode 100644 arch/x86/kvm/trace.h + create mode 100644 include/trace/events/kvm.h + create mode 100644 virt/kvm/Kconfig + create mode 100644 virt/kvm/eventfd.c + delete mode 100644 virt/kvm/kvm_trace.c +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Merge made by recursive. + drivers/scsi/constants.c | 95 ++++++++++++++++++++++++++------- + drivers/scsi/device_handler/scsi_dh.c | 11 ++--- + 2 files changed, 79 insertions(+), 27 deletions(-) +Merging async_tx/next +$ git merge async_tx/next +Auto-merging drivers/dma/Kconfig +Merge made by recursive. + arch/powerpc/include/asm/fsldma.h | 136 +++++++++++++++++ + drivers/dma/Kconfig | 4 +- + drivers/dma/fsldma.c | 287 ++++++++++++++++++++++++++++++++++--- + drivers/dma/fsldma.h | 4 +- + 4 files changed, 408 insertions(+), 23 deletions(-) + create mode 100644 arch/powerpc/include/asm/fsldma.h +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging net/master +$ git merge net/master +Already up-to-date. +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging mtd/master +$ git merge mtd/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Merge made by recursive. + arch/s390/crypto/des_s390.c | 11 ++++++----- + arch/x86/crypto/aesni-intel_glue.c | 2 +- + crypto/Kconfig | 2 +- + crypto/ablkcipher.c | 23 +++++++++++++++++++++-- + crypto/internal.h | 7 +------ + crypto/tcrypt.c | 15 ++++++++++++++- + crypto/testmgr.c | 4 ---- + drivers/char/hw_random/amd-rng.c | 4 ++-- + drivers/char/hw_random/geode-rng.c | 3 +-- + drivers/char/random.c | 14 ++++++++++++++ + include/linux/fips.h | 10 ++++++++++ + 11 files changed, 71 insertions(+), 24 deletions(-) + create mode 100644 include/linux/fips.h +Merging sound/for-next +$ git merge sound/for-next +Merge made by recursive. + sound/pci/hda/patch_analog.c | 1 + + sound/pci/hda/patch_ca0110.c | 2 +- + 2 files changed, 2 insertions(+), 1 deletions(-) +Merging cpufreq/next +$ git merge cpufreq/next +Already up-to-date. +Merging quilt/rr +$ git merge quilt/rr +Resolved 'arch/powerpc/platforms/powermac/setup.c' using previous resolution. +Auto-merging arch/powerpc/kernel/smp.c +Auto-merging arch/powerpc/platforms/powermac/setup.c +CONFLICT (content): Merge conflict in arch/powerpc/platforms/powermac/setup.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging drivers/acpi/processor_throttling.c +Auto-merging drivers/lguest/lg.h +Auto-merging include/linux/sched.h +Auto-merging kernel/trace/trace.c +Auto-merging virt/kvm/kvm_main.c +Automatic merge failed; fix conflicts and then commit the result. +Applying: rr/pmac: fix for cpumask accessor changes +$ git commit -v -a +[master ece9084] Merge branch 'quilt/rr' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/include/asm/smp.h | 2 +- + arch/alpha/include/asm/topology.h | 18 - + arch/alpha/kernel/smp.c | 14 +- + arch/arm/include/asm/cacheflush.h | 8 +- + arch/arm/include/asm/mmu_context.h | 7 +- + arch/arm/include/asm/smp.h | 1 - + arch/arm/include/asm/tlbflush.h | 4 +- + arch/arm/kernel/smp.c | 10 +- + arch/arm/mm/context.c | 2 +- + arch/arm/mm/flush.c | 10 +- + arch/frv/include/asm/gdb-stub.h | 1 - + arch/ia64/include/asm/smp.h | 1 - + arch/ia64/include/asm/topology.h | 3 - + arch/ia64/kernel/smp.c | 2 +- + arch/m32r/include/asm/mmu_context.h | 4 +- + arch/m32r/include/asm/smp.h | 2 +- + arch/m32r/kernel/smp.c | 30 +- + arch/m32r/kernel/smpboot.c | 2 +- + arch/mips/alchemy/common/time.c | 2 +- + arch/mips/include/asm/mach-ip27/topology.h | 2 - + arch/mips/include/asm/mmu_context.h | 10 +- + arch/mips/include/asm/smp-ops.h | 2 +- + arch/mips/include/asm/smp.h | 2 +- + arch/mips/kernel/smp-cmp.c | 9 +- + arch/mips/kernel/smp-mt.c | 4 +- + arch/mips/kernel/smp-up.c | 3 +- + arch/mips/kernel/smp.c | 4 +- + arch/mips/mipssim/sim_smtc.c | 5 +- + arch/mips/mm/c-octeon.c | 2 +- + arch/mips/mti-malta/malta-smtc.c | 4 +- + arch/mips/pmc-sierra/yosemite/smp.c | 4 +- + arch/mips/sgi-ip27/ip27-memory.c | 2 +- + arch/mips/sgi-ip27/ip27-smp.c | 4 +- + arch/mips/sibyte/bcm1480/smp.c | 5 +- + arch/mips/sibyte/sb1250/smp.c | 5 +- + arch/mn10300/include/asm/gdb-stub.h | 1 - + arch/mn10300/include/asm/mmu_context.h | 12 +- + arch/parisc/include/asm/smp.h | 1 - + arch/powerpc/include/asm/smp.h | 2 +- + arch/powerpc/include/asm/topology.h | 12 - + arch/powerpc/kernel/setup-common.c | 4 +- + arch/powerpc/kernel/smp.c | 4 +- + arch/powerpc/platforms/powermac/smp.c | 2 +- + arch/s390/include/asm/smp.h | 2 +- + arch/s390/include/asm/topology.h | 1 - + arch/s390/kernel/smp.c | 4 +- + arch/sh/include/asm/smp.h | 1 - + arch/sh/include/asm/topology.h | 1 - + arch/sparc/include/asm/smp_64.h | 1 - + arch/sparc/include/asm/topology_64.h | 16 - + arch/um/include/asm/mmu_context.h | 4 +- + arch/um/kernel/smp.c | 2 +- + arch/x86/include/asm/lguest_hcall.h | 2 +- + arch/x86/include/asm/mmu_context.h | 6 +- + arch/x86/include/asm/smp.h | 1 - + arch/x86/kernel/acpi/cstate.c | 36 +- + arch/x86/kernel/apic/io_apic.c | 7 +- + arch/x86/kernel/ldt.c | 4 +- + arch/x86/kernel/process.c | 6 +- + arch/x86/kernel/setup.c | 1 - + arch/x86/kernel/smpboot.c | 9 +- + arch/x86/lguest/boot.c | 2 +- + arch/x86/mm/tlb.c | 15 +- + arch/x86/xen/mmu.c | 4 +- + drivers/acpi/processor_perflib.c | 3 +- + drivers/acpi/processor_throttling.c | 85 ++-- + drivers/block/virtio_blk.c | 5 +- + drivers/firmware/dcdbas.c | 49 +-- + drivers/lguest/lg.h | 2 - + drivers/net/sfc/efx.c | 3 +- + drivers/oprofile/buffer_sync.c | 3 +- + include/asm-generic/topology.h | 17 - + include/linux/cpumask.h | 709 ++++++++++------------------ + include/linux/interrupt.h | 2 - + include/linux/lguest.h | 2 +- + include/linux/sched.h | 3 + + include/linux/smp.h | 11 - + include/linux/topology.h | 6 - + init/main.c | 5 - + kernel/kthread.c | 10 +- + kernel/module.c | 3 +- + kernel/smp.c | 7 - + kernel/trace/trace.c | 7 +- + mm/quicklist.c | 3 +- + virt/kvm/kvm_main.c | 3 +- + 85 files changed, 489 insertions(+), 802 deletions(-) +Merging mmc/next +$ git merge mmc/next +Already up-to-date. +Merging input/next +$ git merge input/next +Merge made by recursive. + drivers/input/misc/dm355evm_keys.c | 42 +++++++++++++++++------------------ + 1 files changed, 20 insertions(+), 22 deletions(-) +Merging bkl-removal/bkl-removal +$ git merge bkl-removal/bkl-removal +Already up-to-date. +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Auto-merging fs/fuse/inode.c +Removing mm/pdflush.c +Merge made by recursive. + block/blk-core.c | 1 + + drivers/block/aoe/aoeblk.c | 1 + + drivers/char/mem.c | 1 + + fs/btrfs/disk-io.c | 1 + + fs/buffer.c | 2 +- + fs/char_dev.c | 1 + + fs/configfs/inode.c | 1 + + fs/fs-writeback.c | 775 ++++++++++++++++++++++++++++++++++--------- + fs/fuse/inode.c | 1 + + fs/hugetlbfs/inode.c | 1 + + fs/nfs/client.c | 1 + + fs/ocfs2/dlm/dlmfs.c | 1 + + fs/ramfs/inode.c | 1 + + fs/super.c | 3 - + fs/sysfs/inode.c | 1 + + fs/ubifs/super.c | 1 + + include/linux/backing-dev.h | 71 ++++- + include/linux/fs.h | 11 +- + include/linux/writeback.h | 15 +- + kernel/cgroup.c | 1 + + mm/Makefile | 2 +- + mm/backing-dev.c | 533 +++++++++++++++++++++++++++++- + mm/page-writeback.c | 157 ++-------- + mm/pdflush.c | 269 --------------- + mm/swap_state.c | 1 + + mm/vmscan.c | 2 +- + 26 files changed, 1259 insertions(+), 596 deletions(-) + delete mode 100644 mm/pdflush.c +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Already up-to-date. +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master +$ git merge pcmcia/master +Already up-to-date. +Merging battery/master +$ git merge battery/master +Merge made by recursive. + Documentation/power/power_supply_class.txt | 2 + + drivers/power/Kconfig | 7 + + drivers/power/Makefile | 1 + + drivers/power/ds2782_battery.c | 330 ++++++++++++++++++++++++++++ + drivers/power/olpc_battery.c | 67 +++++- + drivers/power/power_supply_sysfs.c | 6 + + include/linux/power_supply.h | 10 + + 7 files changed, 412 insertions(+), 11 deletions(-) + create mode 100644 drivers/power/ds2782_battery.c +Merging leds/for-mm +$ git merge leds/for-mm +Already up-to-date. +Merging backlight/for-mm +$ git merge backlight/for-mm +Already up-to-date. +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Auto-merging arch/x86/kernel/kgdb.c +Merge made by recursive. + arch/x86/kernel/kgdb.c | 9 +++++++-- + include/linux/kgdb.h | 48 ++++++++++++++++++++++++++++++++++++++++++------ + kernel/kgdb.c | 6 +++--- + 3 files changed, 52 insertions(+), 11 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Auto-merging lib/Kconfig.debug +Auto-merging mm/Makefile +Merge made by recursive. + Documentation/vm/slqbinfo.c | 1047 ++++++++++++ + include/linux/rcu_types.h | 18 + + include/linux/rcupdate.h | 11 +- + include/linux/slab.h | 10 +- + include/linux/slqb_def.h | 301 ++++ + init/Kconfig | 28 +- + lib/Kconfig.debug | 20 + + mm/Makefile | 1 + + mm/slab.c | 8 +- + mm/slob.c | 2 + + mm/slqb.c | 3765 +++++++++++++++++++++++++++++++++++++++++++ + mm/slub.c | 2 + + 12 files changed, 5193 insertions(+), 20 deletions(-) + create mode 100644 Documentation/vm/slqbinfo.c + create mode 100644 include/linux/rcu_types.h + create mode 100644 include/linux/slqb_def.h + create mode 100644 mm/slqb.c +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Merge made by recursive. + drivers/mfd/ab3100-core.c | 8 ++++---- + drivers/mfd/sm501.c | 3 ++- + 2 files changed, 6 insertions(+), 5 deletions(-) +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Already up-to-date. +Merging voltage/for-next +$ git merge voltage/for-next +Merge made by recursive. + drivers/regulator/core.c | 62 ++++++++++++++++++++++++++-------- + drivers/regulator/virtual.c | 44 +++++++++++++++--------- + drivers/regulator/wm8350-regulator.c | 2 + + include/linux/regulator/machine.h | 7 +++- + 4 files changed, 84 insertions(+), 31 deletions(-) +Merging security-testing/next +$ git merge security-testing/next +Merge made by recursive. + fs/proc/base.c | 23 +++---- + include/linux/security.h | 14 ++-- + kernel/ptrace.c | 2 +- + security/capability.c | 2 +- + security/commoncap.c | 4 +- + security/keys/proc.c | 4 + + security/security.c | 4 +- + security/selinux/avc.c | 8 ++- + security/selinux/hooks.c | 24 +++++-- + security/selinux/include/avc.h | 6 +- + security/selinux/ss/services.c | 142 +++++++++++++++++++++++++++++++++------ + security/smack/smack_lsm.c | 8 +- + security/tomoyo/common.c | 30 +++++++++ + security/tomoyo/common.h | 2 - + security/tomoyo/domain.c | 42 ++---------- + security/tomoyo/tomoyo.c | 10 +-- + security/tomoyo/tomoyo.h | 3 +- + 17 files changed, 216 insertions(+), 112 deletions(-) +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging quilt/ttydev +$ git merge quilt/ttydev +Resolved 'drivers/char/tty_ldisc.c' using previous resolution. +Auto-merging drivers/char/tty_ldisc.c +CONFLICT (content): Merge conflict in drivers/char/tty_ldisc.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5c8130b] Merge branch 'quilt/ttydev' +$ git diff -M --stat --summary HEAD^.. + arch/x86/include/asm/termios.h | 25 +- + drivers/char/cyclades.c | 2276 ++++++++++------------------------------ + drivers/firmware/dmi_scan.c | 34 +- + drivers/net/slip.c | 96 +-- + drivers/serial/8250.c | 22 +- + drivers/serial/8250.h | 1 + + include/linux/cyclades.h | 10 + + include/linux/kfifo.h | 4 +- + include/linux/serial_8250.h | 1 + + include/linux/serial_core.h | 1 + + kernel/kfifo.c | 2 +- + 11 files changed, 650 insertions(+), 1822 deletions(-) +Merging agp/agp-next +$ git merge agp/agp-next +Already up-to-date. +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Already up-to-date. +Merging watchdog/master +$ git merge watchdog/master +Merge made by recursive. + drivers/watchdog/bcm47xx_wdt.c | 2 +- + drivers/watchdog/sa1100_wdt.c | 5 +++-- + drivers/watchdog/w83627hf_wdt.c | 5 +++++ + drivers/watchdog/w83697ug_wdt.c | 4 +++- + 4 files changed, 12 insertions(+), 4 deletions(-) +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Merge made by recursive. + arch/x86/Kconfig | 15 +- + arch/x86/kernel/pci-dma.c | 2 +- + drivers/pci/intel-iommu.c | 689 +++++++++++++++++++++++---------------------- + 3 files changed, 348 insertions(+), 358 deletions(-) +Merging cputime/cputime +$ git merge cputime/cputime +Merge made by recursive. + fs/proc/uptime.c | 7 ++++++- + 1 files changed, 6 insertions(+), 1 deletions(-) +Merging osd/linux-next +$ git merge osd/linux-next +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 5 +- + drivers/block/Kconfig | 16 ++ + drivers/block/Makefile | 1 + + drivers/block/osdblk.c | 701 ++++++++++++++++++++++++++++++++++++++++++++++++ + fs/exofs/common.h | 4 +- + fs/exofs/dir.c | 4 +- + fs/exofs/exofs.h | 7 +- + fs/exofs/file.c | 21 +- + fs/exofs/inode.c | 7 +- + fs/exofs/namei.c | 4 +- + fs/exofs/osd.c | 4 +- + fs/exofs/super.c | 6 +- + fs/exofs/symlink.c | 4 +- + 13 files changed, 750 insertions(+), 34 deletions(-) + create mode 100644 drivers/block/osdblk.c +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Already up-to-date. +Merging nommu/master +$ git merge nommu/master +Already up-to-date. +Merging trivial/for-next +$ git merge trivial/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/mtd/devices/m25p80.c +Merge made by recursive. + Documentation/filesystems/seq_file.txt | 2 +- + Documentation/hwmon/hpfall.c | 64 +++++++++++++++---------------- + MAINTAINERS | 12 +++--- + arch/h8300/kernel/timer/tpu.c | 1 - + drivers/block/DAC960.c | 4 +- + drivers/mtd/devices/m25p80.c | 4 +- + drivers/mtd/devices/slram.c | 2 +- + drivers/mtd/ftl.c | 2 +- + drivers/mtd/nand/cafe_nand.c | 4 +- + drivers/mtd/nand/cmx270_nand.c | 4 +- + drivers/usb/host/ohci-q.c | 2 +- + include/linux/capability.h | 2 +- + include/linux/namei.h | 2 +- + include/linux/workqueue.h | 2 +- + kernel/panic.c | 2 +- + scripts/basic/fixdep.c | 3 +- + scripts/mod/sumversion.c | 2 - + 17 files changed, 54 insertions(+), 60 deletions(-) +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging omap/for-next +$ git merge omap/for-next +Already up-to-date. +Merging quilt/aoe +$ git merge quilt/aoe +Already up-to-date. +Merging suspend/linux-next +$ git merge suspend/linux-next +Already up-to-date. +Merging bluetooth/master +$ git merge bluetooth/master +Merge made by recursive. + include/net/bluetooth/l2cap.h | 8 +++-- + net/bluetooth/hidp/core.c | 1 + + net/bluetooth/l2cap.c | 72 +++++++++++++++++++++++++++++++++++----- + net/bluetooth/sco.c | 49 +++++++++++++++++++-------- + 4 files changed, 103 insertions(+), 27 deletions(-) +Merging edac-amd/for-next +$ git merge edac-amd/for-next +Merge made by recursive. +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Auto-merging init/Kconfig +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 7 + + fs/notify/dnotify/dnotify.c | 2 +- + fs/notify/inode_mark.c | 18 ++- + fs/notify/inotify/inotify_user.c | 2 +- + include/linux/fsnotify_backend.h | 10 +- + init/Kconfig | 10 +- + kernel/Makefile | 5 +- + kernel/audit.c | 1 - + kernel/audit.h | 26 ++- + kernel/audit_tree.c | 223 ++++++++++++---------- + kernel/audit_watch.c | 293 ++++++++++++++++------------ + kernel/auditfilter.c | 39 ++--- + kernel/auditsc.c | 9 +- + 13 files changed, 365 insertions(+), 280 deletions(-) +Merging irda/for-next +$ git merge irda/for-next +Already up-to-date. +Merging hwlat/for-linus +$ git merge hwlat/for-linus +Auto-merging MAINTAINERS +Merge made by recursive. + Documentation/hwlat_detector.txt | 64 ++ + MAINTAINERS | 9 + + drivers/misc/Kconfig | 29 + + drivers/misc/Makefile | 1 + + drivers/misc/hwlat_detector.c | 1208 ++++++++++++++++++++++++++++++++++++++ + 5 files changed, 1311 insertions(+), 0 deletions(-) + create mode 100644 Documentation/hwlat_detector.txt + create mode 100644 drivers/misc/hwlat_detector.c +Merging tip/auto-latest +$ git merge tip/auto-latest +Resolved 'arch/x86/include/asm/termios.h' using previous resolution. +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/include/asm/termios.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/termios.h +Removing include/linux/rcuclassic.h +Auto-merging include/linux/rcupdate.h +Auto-merging include/linux/sched.h +Auto-merging init/Kconfig +Auto-merging kernel/Makefile +Removing kernel/rcuclassic.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6366e2f] Merge commit 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/scheduler/sched-rt-group.txt | 13 +- + arch/x86/Kconfig | 5 + + arch/x86/boot/video-vesa.c | 7 +- + arch/x86/boot/video-vga.c | 10 - + arch/x86/boot/video.c | 5 - + arch/x86/boot/video.h | 20 +- + arch/x86/include/asm/i387.h | 1 + + arch/x86/include/asm/ioctls.h | 95 +---- + arch/x86/include/asm/ipcbuf.h | 29 +- + arch/x86/include/asm/mce.h | 2 +- + arch/x86/include/asm/mman.h | 14 +- + arch/x86/include/asm/module.h | 13 +- + arch/x86/include/asm/msgbuf.h | 40 +-- + arch/x86/include/asm/param.h | 23 +- + arch/x86/include/asm/paravirt.h | 711 +------------------------ + arch/x86/include/asm/paravirt_types.h | 720 +++++++++++++++++++++++++ + arch/x86/include/asm/pgtable.h | 16 +- + arch/x86/include/asm/scatterlist.h | 27 +- + arch/x86/include/asm/shmbuf.h | 52 +-- + arch/x86/include/asm/socket.h | 61 +-- + arch/x86/include/asm/sockios.h | 14 +- + arch/x86/include/asm/termbits.h | 199 +------- + arch/x86/include/asm/termios.h | 114 +---- + arch/x86/include/asm/types.h | 12 +- + arch/x86/include/asm/ucontext.h | 8 +- + arch/x86/kernel/cpu/mcheck/mce.c | 4 +- + arch/x86/kernel/cpu/proc.c | 2 - + arch/x86/kernel/ds.c | 6 +- + arch/x86/kernel/process_32.c | 27 +- + arch/x86/kernel/process_64.c | 33 +- + arch/x86/kernel/traps.c | 33 +- + arch/x86/mm/fault.c | 51 +- + arch/x86/mm/highmem_32.c | 2 +- + arch/x86/oprofile/nmi_int.c | 101 ++-- + arch/x86/oprofile/op_model_amd.c | 267 ++++----- + arch/x86/oprofile/op_model_p4.c | 60 +-- + arch/x86/oprofile/op_model_ppro.c | 95 ++-- + arch/x86/oprofile/op_x86_model.h | 47 +- + drivers/oprofile/cpu_buffer.c | 16 +- + drivers/oprofile/oprofile_stats.c | 1 + + include/linux/oprofile.h | 2 +- + include/linux/poison.h | 16 +- + include/linux/rcuclassic.h | 178 ------ + include/linux/rcupdate.h | 4 +- + include/linux/sched.h | 6 + + init/Kconfig | 12 +- + kernel/Makefile | 1 - + kernel/irq/manage.c | 2 +- + kernel/rcuclassic.c | 807 ---------------------------- + kernel/rcutree.c | 3 +- + kernel/sched.c | 54 ++- + kernel/trace/ftrace.c | 4 +- + kernel/trace/trace_event_types.h | 3 + + kernel/trace/trace_stack.c | 4 +- + 54 files changed, 1210 insertions(+), 2842 deletions(-) + create mode 100644 arch/x86/include/asm/paravirt_types.h + delete mode 100644 include/linux/rcuclassic.h + delete mode 100644 kernel/rcuclassic.c +Merging percpu/for-next +$ git merge percpu/for-next +Resolved 'arch/alpha/include/asm/percpu.h' using previous resolution. +Resolved 'arch/mn10300/kernel/vmlinux.lds.S' using previous resolution. +Resolved 'include/linux/percpu-defs.h' using previous resolution. +Auto-merging Makefile +Auto-merging arch/alpha/include/asm/percpu.h +CONFLICT (content): Merge conflict in arch/alpha/include/asm/percpu.h +Auto-merging arch/arm/kernel/vmlinux.lds.S +Auto-merging arch/ia64/kernel/smp.c +Auto-merging arch/mn10300/kernel/vmlinux.lds.S +CONFLICT (content): Merge conflict in arch/mn10300/kernel/vmlinux.lds.S +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kernel/cpu/mcheck/mce.c +Auto-merging arch/x86/kernel/cpu/perf_counter.c +Auto-merging block/cfq-iosched.c +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging include/linux/percpu-defs.h +CONFLICT (content): Merge conflict in include/linux/percpu-defs.h +Auto-merging init/main.c +Auto-merging kernel/module.c +Auto-merging kernel/perf_counter.c +Auto-merging kernel/sched.c +Auto-merging kernel/trace/trace_events.c +Auto-merging lib/Kconfig.debug +Auto-merging mm/Makefile +Auto-merging mm/page-writeback.c +Auto-merging mm/quicklist.c +Auto-merging mm/slub.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b8ecf4e] Merge commit 'percpu/for-next' +$ git diff -M --stat --summary HEAD^.. + Makefile | 2 +- + arch/alpha/include/asm/percpu.h | 100 +++----------------------------- + arch/alpha/include/asm/tlbflush.h | 1 + + arch/alpha/kernel/vmlinux.lds.S | 1 + + arch/arm/kernel/vmlinux.lds.S | 1 + + arch/avr32/kernel/vmlinux.lds.S | 1 + + arch/blackfin/kernel/vmlinux.lds.S | 1 + + arch/blackfin/mm/sram-alloc.c | 6 +- + arch/cris/include/asm/mmu_context.h | 3 +- + arch/cris/kernel/vmlinux.lds.S | 1 + + arch/cris/mm/fault.c | 2 +- + arch/frv/kernel/vmlinux.lds.S | 2 + + arch/h8300/kernel/vmlinux.lds.S | 1 + + arch/ia64/Kconfig | 3 + + arch/ia64/kernel/smp.c | 3 +- + arch/ia64/kernel/vmlinux.lds.S | 1 + + arch/ia64/sn/kernel/setup.c | 2 +- + arch/m32r/kernel/vmlinux.lds.S | 1 + + arch/m68k/kernel/vmlinux-std.lds | 1 + + arch/m68k/kernel/vmlinux-sun3.lds | 1 + + arch/m68knommu/kernel/vmlinux.lds.S | 1 + + arch/microblaze/kernel/vmlinux.lds.S | 2 + + arch/mips/kernel/vmlinux.lds.S | 1 + + arch/mn10300/kernel/vmlinux.lds.S | 1 + + arch/parisc/kernel/vmlinux.lds.S | 1 + + arch/powerpc/Kconfig | 3 + + arch/powerpc/kernel/vmlinux.lds.S | 1 + + arch/powerpc/mm/stab.c | 2 +- + arch/powerpc/platforms/ps3/smp.c | 2 +- + arch/s390/include/asm/percpu.h | 32 +++-------- + arch/s390/kernel/vmlinux.lds.S | 1 + + arch/sh/kernel/vmlinux.lds.S | 1 + + arch/sparc/Kconfig | 3 - + arch/sparc/kernel/vmlinux.lds.S | 1 + + arch/um/kernel/dyn.lds.S | 2 + + arch/um/kernel/uml.lds.S | 2 + + arch/x86/Kconfig | 3 - + arch/x86/kernel/cpu/cpu_debug.c | 4 +- + arch/x86/kernel/cpu/mcheck/mce.c | 8 +- + arch/x86/kernel/cpu/mcheck/mce_amd.c | 2 +- + arch/x86/kernel/cpu/perf_counter.c | 14 ++-- + arch/xtensa/kernel/vmlinux.lds.S | 1 + + block/as-iosched.c | 10 ++-- + block/cfq-iosched.c | 10 ++-- + drivers/cpufreq/cpufreq_conservative.c | 12 ++-- + drivers/cpufreq/cpufreq_ondemand.c | 15 +++-- + drivers/xen/events.c | 13 ++-- + include/asm-generic/vmlinux.lds.h | 8 +++ + include/linux/percpu-defs.h | 66 ++++++++++++++++++--- + include/linux/percpu.h | 12 +++- + init/main.c | 24 -------- + kernel/module.c | 6 +- + kernel/perf_counter.c | 6 +- + kernel/sched.c | 4 +- + kernel/trace/trace_events.c | 6 +- + lib/Kconfig.debug | 15 +++++ + mm/Makefile | 2 +- + mm/allocpercpu.c | 28 +++++++++ + mm/kmemleak-test.c | 6 +- + mm/page-writeback.c | 5 +- + mm/percpu.c | 40 ++++++++++++- + mm/quicklist.c | 2 +- + mm/slub.c | 4 +- + net/ipv4/syncookies.c | 5 +- + net/ipv6/syncookies.c | 5 +- + net/rds/ib_stats.c | 2 +- + net/rds/iw_stats.c | 2 +- + net/rds/page.c | 2 +- + scripts/module-common.lds | 8 +++ + 69 files changed, 300 insertions(+), 240 deletions(-) + create mode 100644 scripts/module-common.lds +Merging sfi/sfi-test +$ git merge sfi/sfi-test +Auto-merging Documentation/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kernel/setup.c +Auto-merging init/main.c +Merge made by recursive. + Documentation/kernel-parameters.txt | 5 + + MAINTAINERS | 12 + + arch/x86/Kconfig | 4 +- + arch/x86/include/asm/io_apic.h | 4 +- + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/e820.c | 5 + + arch/x86/kernel/setup.c | 3 + + arch/x86/kernel/sfi.c | 335 ++++++++++++++++++++++++++++ + arch/x86/pci/mmconfig-shared.c | 5 +- + drivers/Makefile | 1 + + drivers/acpi/tables.c | 3 + + drivers/sfi/Kconfig | 16 ++ + drivers/sfi/Makefile | 3 + + drivers/sfi/sfi_acpi.c | 96 ++++++++ + drivers/sfi/sfi_core.c | 409 +++++++++++++++++++++++++++++++++++ + drivers/sfi/sfi_core.h | 62 ++++++ + include/acpi/acpi_drivers.h | 3 + + include/linux/acpi.h | 5 +- + include/linux/sfi.h | 174 +++++++++++++++ + include/linux/sfi_acpi.h | 59 +++++ + init/main.c | 2 + + 21 files changed, 1201 insertions(+), 6 deletions(-) + create mode 100644 arch/x86/kernel/sfi.c + create mode 100644 drivers/sfi/Kconfig + create mode 100644 drivers/sfi/Makefile + create mode 100644 drivers/sfi/sfi_acpi.c + create mode 100644 drivers/sfi/sfi_core.c + create mode 100644 drivers/sfi/sfi_core.h + create mode 100644 include/linux/sfi.h + create mode 100644 include/linux/sfi_acpi.h +$ git reset --hard HEAD^ +HEAD is now at b8ecf4e Merge commit 'percpu/for-next' +Merging asm-generic/next +$ git merge asm-generic/next +Merge made by recursive. + lib/checksum.c | 14 ++++++++------ + 1 files changed, 8 insertions(+), 6 deletions(-) +Merging quilt/driver-core +$ git merge quilt/driver-core +Auto-merging init/main.c +Merge made by recursive. + drivers/base/Kconfig | 25 +++ + drivers/base/Makefile | 1 + + drivers/base/base.h | 6 + + drivers/base/core.c | 3 + + drivers/base/devtmpfs.c | 367 ++++++++++++++++++++++++++++++++++++++++++++++ + drivers/base/init.c | 1 + + include/linux/device.h | 10 ++ + include/linux/shmem_fs.h | 3 + + init/do_mounts.c | 2 +- + init/main.c | 2 + + mm/shmem.c | 9 +- + 11 files changed, 422 insertions(+), 7 deletions(-) + create mode 100644 drivers/base/devtmpfs.c +Merging quilt/usb +$ git merge quilt/usb +Removing drivers/usb/mon/mon_dma.c +Merge made by recursive. + Documentation/usb/usbmon.txt | 2 +- + drivers/usb/core/message.c | 32 ++++-------- + drivers/usb/host/ehci-dbg.c | 3 +- + drivers/usb/misc/sisusbvga/sisusb.c | 53 +++++--------------- + drivers/usb/misc/sisusbvga/sisusb.h | 2 - + drivers/usb/mon/Kconfig | 4 +- + drivers/usb/mon/Makefile | 2 +- + drivers/usb/mon/mon_bin.c | 12 +---- + drivers/usb/mon/mon_dma.c | 95 ----------------------------------- + drivers/usb/mon/mon_main.c | 1 - + drivers/usb/mon/mon_text.c | 14 ----- + drivers/usb/mon/usb_mon.h | 14 ----- + include/linux/usb.h | 19 +++++-- + 13 files changed, 41 insertions(+), 212 deletions(-) + delete mode 100644 drivers/usb/mon/mon_dma.c +Merging quilt/staging +$ git merge quilt/staging +Merge made by recursive. + drivers/staging/android/binder.c | 701 +++++----- + drivers/staging/et131x/et1310_address_map.h | 2138 +++++++++++++------------- + drivers/staging/et131x/et1310_eeprom.c | 46 +- + drivers/staging/et131x/et1310_eeprom.h | 6 +- + drivers/staging/et131x/et1310_jagcore.c | 20 +- + drivers/staging/et131x/et1310_jagcore.h | 17 +- + drivers/staging/et131x/et1310_mac.c | 112 +- + drivers/staging/et131x/et1310_mac.h | 8 +- + drivers/staging/et131x/et1310_phy.c | 202 ++-- + drivers/staging/et131x/et1310_phy.h | 904 ++++++------ + drivers/staging/et131x/et1310_pm.c | 19 +- + drivers/staging/et131x/et1310_pm.h | 8 +- + drivers/staging/et131x/et1310_rx.c | 115 +- + drivers/staging/et131x/et1310_rx.h | 194 ++-- + drivers/staging/et131x/et1310_tx.c | 120 +- + drivers/staging/et131x/et1310_tx.h | 102 +- + drivers/staging/et131x/et131x_adapter.h | 72 +- + drivers/staging/et131x/et131x_config.c | 38 +- + drivers/staging/et131x/et131x_debug.c | 12 +- + drivers/staging/et131x/et131x_debug.h | 24 +- + drivers/staging/et131x/et131x_defs.h | 12 +- + drivers/staging/et131x/et131x_initpci.c | 74 +- + drivers/staging/et131x/et131x_initpci.h | 6 +- + drivers/staging/et131x/et131x_isr.c | 44 +- + drivers/staging/et131x/et131x_isr.h | 6 +- + drivers/staging/et131x/et131x_netdev.c | 123 +- + drivers/staging/et131x/et131x_netdev.h | 6 +- + drivers/staging/et131x/et131x_version.h | 6 +- + drivers/staging/rspiusb/rspiusb.c | 14 +- + drivers/staging/rt2870/rt2870.h | 1 + + drivers/staging/vt6655/device_main.c | 10 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 202 ++-- + drivers/staging/wlan-ng/p80211conv.c | 12 +- + drivers/staging/wlan-ng/p80211netdev.c | 54 +- + drivers/staging/wlan-ng/p80211req.c | 12 +- + drivers/staging/wlan-ng/p80211wep.c | 12 +- + drivers/staging/wlan-ng/p80211wext.c | 66 +- + drivers/staging/wlan-ng/prism2fw.c | 46 +- + drivers/staging/wlan-ng/prism2mgmt.c | 20 +- + drivers/staging/wlan-ng/prism2mib.c | 144 +- + drivers/staging/wlan-ng/prism2sta.c | 148 +- + drivers/staging/wlan-ng/prism2usb.c | 10 +- + 42 files changed, 2929 insertions(+), 2957 deletions(-) +Merging scsi-post-merge/master +$ git merge scsi-post-merge/master +Already up-to-date. |