$ git checkout master Already on "master" $ git reset --hard stable HEAD is now at 778ef1e Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 Merging origin/master $ git merge origin/master Updating 778ef1e..2450cf5 Fast forward Documentation/scsi/cxgb3i.txt | 11 +- MAINTAINERS | 2 +- arch/mips/include/asm/seccomp.h | 1 - arch/powerpc/include/asm/compat.h | 5 + arch/powerpc/include/asm/seccomp.h | 4 - arch/sparc/include/asm/compat.h | 5 + arch/sparc/include/asm/seccomp.h | 6 - arch/x86/include/asm/seccomp_32.h | 6 - arch/x86/include/asm/seccomp_64.h | 8 - arch/x86/kernel/ptrace.c | 2 +- arch/x86/mm/iomap_32.c | 15 +- arch/x86/mm/pat.c | 2 + drivers/gpu/drm/drm_bufs.c | 2 +- drivers/gpu/drm/drm_fops.c | 14 ++ drivers/gpu/drm/drm_lock.c | 3 +- drivers/gpu/drm/drm_stub.c | 8 - drivers/gpu/drm/i915/i915_irq.c | 5 +- drivers/input/keyboard/atkbd.c | 4 +- drivers/input/keyboard/bf54x-keys.c | 4 +- drivers/input/keyboard/corgikbd.c | 8 +- drivers/input/keyboard/omap-keypad.c | 8 +- drivers/input/keyboard/spitzkbd.c | 8 +- drivers/input/mouse/Kconfig | 2 +- drivers/input/mouse/elantech.c | 32 ++- drivers/input/mouse/pxa930_trkball.c | 2 +- drivers/input/mouse/synaptics.c | 9 +- drivers/input/serio/ambakmi.c | 6 +- drivers/input/serio/gscps2.c | 2 +- drivers/input/serio/sa1111ps2.c | 4 +- drivers/input/touchscreen/atmel_tsadcc.c | 2 +- drivers/input/touchscreen/corgi_ts.c | 9 +- drivers/input/touchscreen/tsc2007.c | 3 +- drivers/input/touchscreen/usbtouchscreen.c | 20 ++- drivers/media/video/uvc/uvc_status.c | 10 +- drivers/message/fusion/mptbase.c | 4 +- drivers/mmc/host/sdhci-pci.c | 1 + drivers/mmc/host/sdhci.c | 5 +- drivers/mmc/host/sdhci.h | 2 + drivers/net/b44.c | 13 +- drivers/net/gianfar.c | 2 +- drivers/net/hp-plus.c | 2 +- drivers/net/netxen/netxen_nic_main.c | 16 +- drivers/net/r8169.c | 114 ++++++++++- drivers/net/usb/asix.c | 8 + drivers/net/usb/cdc_ether.c | 5 + drivers/net/usb/usbnet.c | 4 +- drivers/net/usb/zaurus.c | 5 + drivers/net/veth.c | 51 +---- drivers/net/wireless/ath9k/main.c | 24 ++- drivers/net/wireless/libertas/ethtool.c | 12 +- drivers/net/wireless/libertas/if_usb.c | 4 +- drivers/net/wireless/libertas/main.c | 31 ++-- drivers/net/wireless/libertas/persistcfg.c | 16 +- drivers/net/wireless/libertas/scan.c | 4 +- drivers/net/wireless/libertas/tx.c | 2 +- drivers/net/wireless/libertas/wext.c | 72 +++--- drivers/net/wireless/orinoco/orinoco.c | 19 ++- drivers/net/wireless/rtl818x/rtl8187_dev.c | 12 + drivers/scsi/cxgb3i/cxgb3i.h | 21 ++ drivers/scsi/cxgb3i/cxgb3i_ddp.c | 19 +- drivers/scsi/cxgb3i/cxgb3i_ddp.h | 5 +- drivers/scsi/cxgb3i/cxgb3i_init.c | 4 +- drivers/scsi/cxgb3i/cxgb3i_iscsi.c | 22 +-- drivers/scsi/cxgb3i/cxgb3i_offload.c | 146 +++++++++---- drivers/scsi/cxgb3i/cxgb3i_offload.h | 29 ++- drivers/scsi/cxgb3i/cxgb3i_pdu.c | 275 ++++++++++++++++-------- drivers/scsi/cxgb3i/cxgb3i_pdu.h | 2 +- drivers/scsi/hptiop.c | 1 + drivers/scsi/scsi_lib.c | 5 +- drivers/scsi/sd.c | 7 + fs/Makefile | 6 +- fs/ext4/balloc.c | 4 +- fs/ext4/inode.c | 2 +- fs/ext4/super.c | 1 - include/linux/Kbuild | 1 + include/linux/dcbnl.h | 4 +- include/linux/io-mapping.h | 5 +- include/linux/netfilter/xt_NFLOG.h | 2 +- include/net/netfilter/nf_conntrack_core.h | 2 +- kernel/seccomp.c | 7 +- net/8021q/vlan_core.c | 10 + net/core/dev.c | 6 + net/ipv4/tcp_input.c | 9 +- net/ipv4/tcp_scalable.c | 2 +- net/ipv6/inet6_hashtables.c | 4 +- net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 5 +- net/netfilter/nfnetlink_log.c | 8 +- net/netfilter/x_tables.c | 199 ++++++++++++----- net/netfilter/xt_recent.c | 2 +- net/sched/sch_drr.c | 6 +- security/selinux/netlabel.c | 5 +- sound/pci/hda/hda_intel.c | 2 + sound/pci/hda/patch_realtek.c | 1 + sound/pci/hda/patch_sigmatel.c | 2 +- 94 files changed, 990 insertions(+), 501 deletions(-) Merging arm-current/master $ git merge arm-current/master Merge made by recursive. arch/arm/kernel/setup.c | 13 +++++++------ arch/arm/mach-at91/pm.c | 1 - arch/arm/mm/abort-ev6.S | 3 ++- arch/arm/plat-s3c64xx/irq-eint.c | 2 +- drivers/dma/iop-adma.c | 2 +- drivers/dma/mv_xor.c | 2 +- drivers/i2c/busses/i2c-mv64xxx.c | 4 ++-- drivers/mtd/nand/orion_nand.c | 2 +- drivers/net/arm/Makefile | 2 +- drivers/net/arm/etherh.c | 10 +++++----- drivers/video/pxafb.c | 2 +- 11 files changed, 22 insertions(+), 21 deletions(-) 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 Already up-to-date. 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 Already up-to-date. Merging wireless-current/master $ git merge wireless-current/master Merge made by recursive. drivers/net/wireless/rt2x00/rt2500usb.c | 8 +++++++ drivers/net/wireless/rt2x00/rt73usb.c | 32 ++++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 1 deletions(-) Merging kbuild-current/master $ git merge kbuild-current/master Already up-to-date. Merging quilt/driver-core.current $ git merge quilt/driver-core.current Already up-to-date. 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-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 Merge made by recursive. arch/s390/crypto/aes_s390.c | 2 +- crypto/api.c | 15 +++++++++++++-- drivers/crypto/padlock-aes.c | 2 +- drivers/crypto/padlock-sha.c | 4 ++-- 4 files changed, 17 insertions(+), 6 deletions(-) Merging dwmw2/master $ git merge dwmw2/master Already up-to-date. Merging arm/devel $ git merge arm/devel Resolved 'arch/arm/mach-at91/gpio.c' using previous resolution. Auto-merging MAINTAINERS Auto-merging arch/arm/kernel/setup.c Removing arch/arm/kernel/stacktrace.h Auto-merging arch/arm/mach-at91/gpio.c CONFLICT (content): Merge conflict in arch/arm/mach-at91/gpio.c Auto-merging drivers/video/Kconfig Auto-merging lib/Kconfig.debug Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master]: created 25bcd05: "Merge commit 'arm/devel'" $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 2 +- arch/arm/Kconfig | 3 +- arch/arm/Kconfig.debug | 23 +- arch/arm/Makefile | 4 + arch/arm/boot/compressed/head.S | 6 + arch/arm/boot/compressed/misc.c | 15 + arch/arm/boot/compressed/vmlinux.lds.in | 5 + arch/arm/configs/acs5k_defconfig | 1233 ++++++++++++++++++++ arch/arm/configs/acs5k_tiny_defconfig | 941 +++++++++++++++ arch/arm/configs/assabet_defconfig | 1 - arch/arm/configs/badge4_defconfig | 1 - arch/arm/configs/cerfcube_defconfig | 1 - .../{xm_x2xx_defconfig => cm_x2xx_defconfig} | 466 +++++--- arch/arm/configs/collie_defconfig | 1 - .../{xm_x2xx_defconfig => em_x270_defconfig} | 773 ++++++------- arch/arm/configs/h3600_defconfig | 1 - arch/arm/configs/hackkit_defconfig | 1 - arch/arm/configs/jornada720_defconfig | 1 - arch/arm/configs/lart_defconfig | 1 - arch/arm/configs/magician_defconfig | 699 +++++++++--- arch/arm/configs/neponset_defconfig | 1 - arch/arm/configs/pleb_defconfig | 1 - arch/arm/configs/shannon_defconfig | 1 - arch/arm/configs/shark_defconfig | 928 ++++++++++------ arch/arm/configs/simpad_defconfig | 1 - arch/arm/include/asm/dma.h | 46 +- arch/arm/include/asm/elf.h | 1 + arch/arm/include/asm/hwcap.h | 2 + arch/arm/include/asm/mach/dma.h | 35 +- arch/arm/include/asm/module.h | 22 +- arch/arm/include/asm/ptrace.h | 2 + arch/arm/include/asm/stacktrace.h | 15 + arch/arm/include/asm/thread_info.h | 4 + arch/arm/include/asm/traps.h | 1 + arch/arm/include/asm/unwind.h | 69 ++ arch/arm/include/asm/user.h | 9 + arch/arm/kernel/Makefile | 1 + arch/arm/kernel/debug.S | 27 + arch/arm/kernel/dma-isa.c | 67 +- arch/arm/kernel/dma.c | 119 ++- arch/arm/kernel/entry-armv.S | 19 + arch/arm/kernel/entry-common.S | 4 + arch/arm/kernel/module.c | 64 + arch/arm/kernel/process.c | 21 +- arch/arm/kernel/ptrace.c | 58 + arch/arm/kernel/setup.c | 5 + arch/arm/kernel/smp.c | 2 + arch/arm/kernel/stacktrace.c | 88 +- arch/arm/kernel/stacktrace.h | 9 - arch/arm/kernel/time.c | 21 +- arch/arm/kernel/traps.c | 44 +- arch/arm/kernel/unwind.c | 434 +++++++ arch/arm/kernel/vmlinux.lds.S | 19 + arch/arm/mach-at91/board-sam9g20ek.c | 4 + arch/arm/mach-at91/generic.h | 3 - arch/arm/mach-at91/gpio.c | 276 +++-- arch/arm/mach-at91/include/mach/gpio.h | 28 +- arch/arm/mach-ep93xx/Makefile | 2 +- arch/arm/mach-ep93xx/clock.c | 79 ++ arch/arm/mach-ep93xx/dma-m2p.c | 408 +++++++ arch/arm/mach-ep93xx/edb9307a.c | 12 + arch/arm/mach-ep93xx/include/mach/dma.h | 52 + arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 3 +- arch/arm/mach-footbridge/dma.c | 12 +- arch/arm/mach-ks8695/Kconfig | 6 + arch/arm/mach-ks8695/Makefile | 1 + arch/arm/mach-ks8695/board-acs5k.c | 233 ++++ arch/arm/mach-pxa/Kconfig | 33 + arch/arm/mach-pxa/Makefile | 4 + arch/arm/mach-pxa/am300epd.c | 295 +++++ arch/arm/mach-pxa/em-x270.c | 604 +++++++++- arch/arm/mach-pxa/gumstix.c | 6 + arch/arm/mach-pxa/himalaya.c | 168 +++ arch/arm/mach-pxa/include/mach/gumstix.h | 1 + arch/arm/mach-pxa/include/mach/magician.h | 2 +- arch/arm/mach-pxa/include/mach/palmld.h | 109 ++ arch/arm/mach-pxa/include/mach/palmt5.h | 84 ++ arch/arm/mach-pxa/magician.c | 84 +- arch/arm/mach-pxa/palmld.c | 566 +++++++++ arch/arm/mach-pxa/palmt5.c | 497 ++++++++ arch/arm/mach-realview/Kconfig | 2 + arch/arm/mach-realview/core.c | 55 +- arch/arm/mach-realview/core.h | 2 + arch/arm/mach-realview/include/mach/board-pba8.h | 2 - arch/arm/mach-realview/include/mach/platform.h | 6 + arch/arm/mach-realview/realview_eb.c | 16 + arch/arm/mach-realview/realview_pb1176.c | 15 + arch/arm/mach-realview/realview_pb11mp.c | 25 +- arch/arm/mach-realview/realview_pba8.c | 25 +- arch/arm/mach-rpc/dma.c | 213 +++-- arch/arm/mach-rpc/include/mach/isa-dma.h | 2 + arch/arm/mach-sa1100/Kconfig | 12 +- arch/arm/mach-sa1100/h3600.c | 392 ------- arch/arm/mach-sa1100/include/mach/h3600.h | 2 +- arch/arm/mach-sa1100/include/mach/h3600_gpio.h | 463 -------- arch/arm/mach-sa1100/include/mach/irqs.h | 22 - arch/arm/mach-sa1100/jornada720.c | 14 +- arch/arm/mach-shark/core.c | 48 +- arch/arm/mach-shark/dma.c | 6 +- arch/arm/mach-shark/include/mach/debug-macro.S | 2 - arch/arm/mach-shark/include/mach/framebuffer.h | 16 + arch/arm/mach-shark/include/mach/hardware.h | 27 - arch/arm/mach-shark/include/mach/io.h | 8 +- arch/arm/mach-shark/include/mach/irqs.h | 2 +- arch/arm/mach-shark/include/mach/isa-dma.h | 4 - arch/arm/mach-shark/include/mach/memory.h | 1 + arch/arm/mach-shark/include/mach/system.h | 16 +- arch/arm/mach-shark/include/mach/uncompress.h | 2 +- arch/arm/mach-shark/leds.c | 6 +- arch/arm/mach-versatile/core.c | 16 +- arch/arm/mach-w90x900/cpu.h | 39 +- arch/arm/mach-w90x900/mach-w90p910evb.c | 56 +- arch/arm/mach-w90x900/w90p910.c | 67 +- arch/arm/oprofile/backtrace.c | 14 +- arch/arm/plat-mxc/dma-mx1-mx2.c | 2 +- arch/arm/plat-s3c/include/plat/uncompress.h | 5 +- arch/arm/vfp/vfp.h | 2 - arch/arm/vfp/vfphw.S | 2 - arch/arm/vfp/vfpmodule.c | 61 + drivers/ata/pata_icside.c | 19 +- drivers/i2c/busses/i2c-versatile.c | 10 +- drivers/scsi/arm/cumana_2.c | 3 +- drivers/scsi/arm/eesox.c | 3 +- drivers/scsi/arm/powertec.c | 3 +- drivers/usb/host/ohci-ep93xx.c | 2 - drivers/video/Kconfig | 14 + drivers/video/Makefile | 1 + drivers/video/broadsheetfb.c | 568 +++++++++ drivers/video/cyber2000fb.c | 2 +- drivers/video/s3c2410fb.c | 4 + drivers/video/sa1100fb.c | 21 - include/video/broadsheetfb.h | 59 + lib/Kconfig.debug | 2 +- 133 files changed, 9516 insertions(+), 2755 deletions(-) create mode 100644 arch/arm/configs/acs5k_defconfig create mode 100644 arch/arm/configs/acs5k_tiny_defconfig copy arch/arm/configs/{xm_x2xx_defconfig => cm_x2xx_defconfig} (83%) rename arch/arm/configs/{xm_x2xx_defconfig => em_x270_defconfig} (74%) create mode 100644 arch/arm/include/asm/stacktrace.h create mode 100644 arch/arm/include/asm/unwind.h delete mode 100644 arch/arm/kernel/stacktrace.h create mode 100644 arch/arm/kernel/unwind.c create mode 100644 arch/arm/mach-ep93xx/dma-m2p.c create mode 100644 arch/arm/mach-ep93xx/include/mach/dma.h create mode 100644 arch/arm/mach-ks8695/board-acs5k.c create mode 100644 arch/arm/mach-pxa/am300epd.c create mode 100644 arch/arm/mach-pxa/himalaya.c create mode 100644 arch/arm/mach-pxa/include/mach/palmld.h create mode 100644 arch/arm/mach-pxa/include/mach/palmt5.h create mode 100644 arch/arm/mach-pxa/palmld.c create mode 100644 arch/arm/mach-pxa/palmt5.c create mode 100644 arch/arm/mach-shark/include/mach/framebuffer.h create mode 100644 drivers/video/broadsheetfb.c create mode 100644 include/video/broadsheetfb.h Merging avr32/avr32-arch $ git merge avr32/avr32-arch Merge made by recursive. arch/avr32/include/asm/uaccess.h | 8 ++-- arch/avr32/kernel/entry-avr32b.S | 60 ++++++++++++++++++------------------ arch/avr32/kernel/syscall-stubs.S | 14 ++++---- arch/avr32/lib/strnlen_user.S | 2 +- 4 files changed, 42 insertions(+), 42 deletions(-) Merging blackfin/for-linus $ git merge blackfin/for-linus Already up-to-date. Merging cris/for-next $ git merge cris/for-next Already up-to-date. Merging ia64/test $ git merge ia64/test Already up-to-date. Merging m68k/for-next $ git merge m68k/for-next Auto-merging MAINTAINERS Merge made by recursive. MAINTAINERS | 2 +- arch/m68k/Makefile | 3 + arch/m68k/include/asm/macintosh.h | 7 + arch/m68k/install.sh | 52 ++ arch/m68k/mac/config.c | 207 ++++++-- arch/m68k/mac/via.c | 9 + drivers/block/Kconfig | 7 + drivers/block/Makefile | 3 + drivers/block/swim.c | 995 +++++++++++++++++++++++++++++++++++ drivers/block/swim_asm.S | 247 +++++++++ drivers/scsi/atari_NCR5380.c | 2 +- drivers/scsi/atari_scsi.c | 2 +- sound/oss/dmasound/dmasound_atari.c | 4 +- 13 files changed, 1481 insertions(+), 59 deletions(-) create mode 100644 arch/m68k/install.sh create mode 100644 drivers/block/swim.c create mode 100644 drivers/block/swim_asm.S Merging m68knommu/for-next $ git merge m68knommu/for-next Removing arch/m68k/include/asm/bootinfo_mm.h Removing arch/m68k/include/asm/bootinfo_no.h Removing arch/m68k/include/asm/bug_mm.h Removing arch/m68k/include/asm/bug_no.h Removing arch/m68k/include/asm/bugs_mm.h Removing arch/m68k/include/asm/bugs_no.h Removing arch/m68k/include/asm/cache_mm.h Removing arch/m68k/include/asm/cache_no.h Removing arch/m68k/include/asm/current_mm.h Removing arch/m68k/include/asm/current_no.h Removing arch/m68k/include/asm/div64_mm.h Removing arch/m68k/include/asm/div64_no.h Removing arch/m68k/include/asm/dma-mapping_mm.h Removing arch/m68k/include/asm/dma-mapping_no.h Removing arch/m68k/include/asm/elf_mm.h Removing arch/m68k/include/asm/elf_no.h Removing arch/m68k/include/asm/fb_mm.h Removing arch/m68k/include/asm/fb_no.h Removing arch/m68k/include/asm/fpu_mm.h Removing arch/m68k/include/asm/fpu_no.h Removing arch/m68k/include/asm/hw_irq_mm.h Removing arch/m68k/include/asm/hw_irq_no.h Removing arch/m68k/include/asm/kmap_types_mm.h Removing arch/m68k/include/asm/kmap_types_no.h Removing arch/m68k/include/asm/mc146818rtc_mm.h Removing arch/m68k/include/asm/mc146818rtc_no.h Removing arch/m68k/include/asm/mcfpci.h Removing arch/m68k/include/asm/mmu_mm.h Removing arch/m68k/include/asm/mmu_no.h Removing arch/m68k/include/asm/page_offset_mm.h Removing arch/m68k/include/asm/page_offset_no.h Removing arch/m68k/include/asm/param_mm.h Removing arch/m68k/include/asm/param_no.h Removing arch/m68k/include/asm/pci_mm.h Removing arch/m68k/include/asm/pci_no.h Removing arch/m68k/include/asm/pgalloc_mm.h Removing arch/m68k/include/asm/pgalloc_no.h Removing arch/m68k/include/asm/scatterlist_mm.h Removing arch/m68k/include/asm/scatterlist_no.h Removing arch/m68k/include/asm/segment_mm.h Removing arch/m68k/include/asm/segment_no.h Removing arch/m68k/include/asm/setup_mm.h Removing arch/m68k/include/asm/setup_no.h Removing arch/m68k/include/asm/siginfo_mm.h Removing arch/m68k/include/asm/siginfo_no.h Removing arch/m68k/include/asm/timex_mm.h Removing arch/m68k/include/asm/timex_no.h Removing arch/m68k/include/asm/ucontext_mm.h Removing arch/m68k/include/asm/ucontext_no.h Removing arch/m68k/include/asm/unaligned_mm.h Removing arch/m68k/include/asm/unaligned_no.h Removing arch/m68k/include/asm/unistd_mm.h Removing arch/m68k/include/asm/unistd_no.h Merge made by recursive. arch/m68k/include/asm/bootinfo.h | 381 +++++++++++++++++++++++++++++++- arch/m68k/include/asm/bootinfo_mm.h | 378 ------------------------------- arch/m68k/include/asm/bootinfo_no.h | 2 - arch/m68k/include/asm/bug.h | 31 +++- arch/m68k/include/asm/bug_mm.h | 29 --- arch/m68k/include/asm/bug_no.h | 4 - arch/m68k/include/asm/bugs.h | 21 ++- arch/m68k/include/asm/bugs_mm.h | 14 -- arch/m68k/include/asm/bugs_no.h | 16 -- arch/m68k/include/asm/cache.h | 14 +- arch/m68k/include/asm/cache_mm.h | 11 - arch/m68k/include/asm/cache_no.h | 12 - arch/m68k/include/asm/current.h | 31 +++- arch/m68k/include/asm/current_mm.h | 6 - arch/m68k/include/asm/current_no.h | 24 -- arch/m68k/include/asm/div64.h | 37 +++- arch/m68k/include/asm/div64_mm.h | 28 --- arch/m68k/include/asm/div64_no.h | 1 - arch/m68k/include/asm/dma-mapping.h | 113 +++++++++- arch/m68k/include/asm/dma-mapping_mm.h | 112 ---------- arch/m68k/include/asm/dma-mapping_no.h | 6 - arch/m68k/include/asm/elf.h | 120 ++++++++++- arch/m68k/include/asm/elf_mm.h | 119 ---------- arch/m68k/include/asm/elf_no.h | 110 --------- arch/m68k/include/asm/fb.h | 41 +++- arch/m68k/include/asm/fb_mm.h | 34 --- arch/m68k/include/asm/fb_no.h | 12 - arch/m68k/include/asm/fpu.h | 22 ++- arch/m68k/include/asm/fpu_mm.h | 21 -- arch/m68k/include/asm/fpu_no.h | 21 -- arch/m68k/include/asm/hw_irq.h | 9 +- arch/m68k/include/asm/hw_irq_mm.h | 6 - arch/m68k/include/asm/hw_irq_no.h | 4 - arch/m68k/include/asm/kmap_types.h | 26 ++- arch/m68k/include/asm/kmap_types_mm.h | 21 -- arch/m68k/include/asm/kmap_types_no.h | 21 -- arch/m68k/include/asm/mc146818rtc.h | 31 +++- arch/m68k/include/asm/mc146818rtc_mm.h | 26 --- arch/m68k/include/asm/mc146818rtc_no.h | 9 - arch/m68k/include/asm/mcfpci.h | 119 ---------- arch/m68k/include/asm/mmu.h | 14 +- arch/m68k/include/asm/mmu_mm.h | 7 - arch/m68k/include/asm/mmu_no.h | 10 - arch/m68k/include/asm/page_offset.h | 12 +- arch/m68k/include/asm/page_offset_mm.h | 8 - arch/m68k/include/asm/page_offset_no.h | 5 - arch/m68k/include/asm/param.h | 27 ++- arch/m68k/include/asm/param_mm.h | 22 -- arch/m68k/include/asm/param_no.h | 22 -- arch/m68k/include/asm/pci.h | 17 +- arch/m68k/include/asm/pci_mm.h | 12 - arch/m68k/include/asm/pci_no.h | 29 --- arch/m68k/include/asm/pgalloc.h | 20 ++- arch/m68k/include/asm/pgalloc_mm.h | 19 -- arch/m68k/include/asm/pgalloc_no.h | 8 - arch/m68k/include/asm/pgtable_no.h | 2 + arch/m68k/include/asm/scatterlist.h | 26 ++- arch/m68k/include/asm/scatterlist_mm.h | 23 -- arch/m68k/include/asm/scatterlist_no.h | 22 -- arch/m68k/include/asm/segment.h | 64 +++++- arch/m68k/include/asm/segment_mm.h | 57 ----- arch/m68k/include/asm/segment_no.h | 51 ----- arch/m68k/include/asm/setup.h | 377 +++++++++++++++++++++++++++++++- arch/m68k/include/asm/setup_mm.h | 376 ------------------------------- arch/m68k/include/asm/setup_no.h | 10 - arch/m68k/include/asm/siginfo.h | 98 ++++++++- arch/m68k/include/asm/siginfo_mm.h | 92 -------- arch/m68k/include/asm/siginfo_no.h | 6 - arch/m68k/include/asm/timex.h | 21 ++- arch/m68k/include/asm/timex_mm.h | 18 -- arch/m68k/include/asm/timex_no.h | 23 -- arch/m68k/include/asm/ucontext.h | 33 +++- arch/m68k/include/asm/ucontext_mm.h | 30 --- arch/m68k/include/asm/ucontext_no.h | 32 --- arch/m68k/include/asm/unaligned.h | 26 ++- arch/m68k/include/asm/unaligned_mm.h | 13 - arch/m68k/include/asm/unaligned_no.h | 25 -- arch/m68k/include/asm/unistd.h | 377 +++++++++++++++++++++++++++++++- arch/m68k/include/asm/unistd_mm.h | 372 ------------------------------- arch/m68k/include/asm/unistd_no.h | 372 ------------------------------- arch/m68knommu/kernel/dma.c | 8 +- arch/m68knommu/mm/init.c | 6 +- drivers/serial/mcf.c | 2 +- 83 files changed, 1905 insertions(+), 2932 deletions(-) delete mode 100644 arch/m68k/include/asm/bootinfo_mm.h delete mode 100644 arch/m68k/include/asm/bootinfo_no.h delete mode 100644 arch/m68k/include/asm/bug_mm.h delete mode 100644 arch/m68k/include/asm/bug_no.h delete mode 100644 arch/m68k/include/asm/bugs_mm.h delete mode 100644 arch/m68k/include/asm/bugs_no.h delete mode 100644 arch/m68k/include/asm/cache_mm.h delete mode 100644 arch/m68k/include/asm/cache_no.h delete mode 100644 arch/m68k/include/asm/current_mm.h delete mode 100644 arch/m68k/include/asm/current_no.h delete mode 100644 arch/m68k/include/asm/div64_mm.h delete mode 100644 arch/m68k/include/asm/div64_no.h delete mode 100644 arch/m68k/include/asm/dma-mapping_mm.h delete mode 100644 arch/m68k/include/asm/dma-mapping_no.h delete mode 100644 arch/m68k/include/asm/elf_mm.h delete mode 100644 arch/m68k/include/asm/elf_no.h delete mode 100644 arch/m68k/include/asm/fb_mm.h delete mode 100644 arch/m68k/include/asm/fb_no.h delete mode 100644 arch/m68k/include/asm/fpu_mm.h delete mode 100644 arch/m68k/include/asm/fpu_no.h delete mode 100644 arch/m68k/include/asm/hw_irq_mm.h delete mode 100644 arch/m68k/include/asm/hw_irq_no.h delete mode 100644 arch/m68k/include/asm/kmap_types_mm.h delete mode 100644 arch/m68k/include/asm/kmap_types_no.h delete mode 100644 arch/m68k/include/asm/mc146818rtc_mm.h delete mode 100644 arch/m68k/include/asm/mc146818rtc_no.h delete mode 100644 arch/m68k/include/asm/mcfpci.h delete mode 100644 arch/m68k/include/asm/mmu_mm.h delete mode 100644 arch/m68k/include/asm/mmu_no.h delete mode 100644 arch/m68k/include/asm/page_offset_mm.h delete mode 100644 arch/m68k/include/asm/page_offset_no.h delete mode 100644 arch/m68k/include/asm/param_mm.h delete mode 100644 arch/m68k/include/asm/param_no.h delete mode 100644 arch/m68k/include/asm/pci_mm.h delete mode 100644 arch/m68k/include/asm/pci_no.h delete mode 100644 arch/m68k/include/asm/pgalloc_mm.h delete mode 100644 arch/m68k/include/asm/pgalloc_no.h delete mode 100644 arch/m68k/include/asm/scatterlist_mm.h delete mode 100644 arch/m68k/include/asm/scatterlist_no.h delete mode 100644 arch/m68k/include/asm/segment_mm.h delete mode 100644 arch/m68k/include/asm/segment_no.h delete mode 100644 arch/m68k/include/asm/setup_mm.h delete mode 100644 arch/m68k/include/asm/setup_no.h delete mode 100644 arch/m68k/include/asm/siginfo_mm.h delete mode 100644 arch/m68k/include/asm/siginfo_no.h delete mode 100644 arch/m68k/include/asm/timex_mm.h delete mode 100644 arch/m68k/include/asm/timex_no.h delete mode 100644 arch/m68k/include/asm/ucontext_mm.h delete mode 100644 arch/m68k/include/asm/ucontext_no.h delete mode 100644 arch/m68k/include/asm/unaligned_mm.h delete mode 100644 arch/m68k/include/asm/unaligned_no.h delete mode 100644 arch/m68k/include/asm/unistd_mm.h delete mode 100644 arch/m68k/include/asm/unistd_no.h Merging mips/mips-for-linux-next $ git merge mips/mips-for-linux-next Already up-to-date. Merging parisc/master $ git merge parisc/master Already up-to-date. Merging powerpc/next $ git merge powerpc/next Auto-merging arch/powerpc/kernel/align.c Auto-merging arch/powerpc/sysdev/ppc4xx_pci.c Auto-merging include/linux/pci_ids.h Merge made by recursive. Documentation/powerpc/dts-bindings/fsl/dma.txt | 34 +- Documentation/powerpc/dts-bindings/fsl/esdhc.txt | 24 + arch/powerpc/Kconfig | 72 +- arch/powerpc/boot/Makefile | 9 +- arch/powerpc/boot/cuboot-amigaone.c | 35 + arch/powerpc/boot/dts/amigaone.dts | 173 ++ arch/powerpc/boot/dts/canyonlands.dts | 28 + arch/powerpc/boot/dts/cm5200.dts | 49 +- arch/powerpc/boot/dts/digsy_mtc.dts | 254 +++ arch/powerpc/boot/dts/gef_sbc310.dts | 364 +++++ arch/powerpc/boot/dts/lite5200.dts | 52 +- arch/powerpc/boot/dts/lite5200b.dts | 63 +- arch/powerpc/boot/dts/media5200.dts | 318 ++++ arch/powerpc/boot/dts/motionpro.dts | 42 +- arch/powerpc/boot/dts/mpc8315erdb.dts | 64 + arch/powerpc/boot/dts/mpc8377_mds.dts | 71 +- arch/powerpc/boot/dts/mpc8377_rdb.dts | 102 ++ arch/powerpc/boot/dts/mpc8378_mds.dts | 71 +- arch/powerpc/boot/dts/mpc8378_rdb.dts | 102 ++ arch/powerpc/boot/dts/mpc8379_mds.dts | 7 +- arch/powerpc/boot/dts/mpc8379_rdb.dts | 38 + arch/powerpc/boot/dts/mpc8572ds.dts | 10 +- arch/powerpc/boot/dts/mpc8572ds_36b.dts | 787 ++++++++++ arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts | 8 +- arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts | 4 +- arch/powerpc/boot/dts/pcm030.dts | 182 +-- arch/powerpc/boot/dts/redwood.dts | 244 +++ arch/powerpc/boot/dts/tqm5200.dts | 32 +- arch/powerpc/boot/dts/tqm8540.dts | 5 + arch/powerpc/boot/dts/tqm8541.dts | 5 + arch/powerpc/boot/dts/tqm8548-bigflash.dts | 9 +- arch/powerpc/boot/dts/tqm8548.dts | 9 +- arch/powerpc/boot/dts/tqm8555.dts | 5 + arch/powerpc/boot/dts/tqm8560.dts | 9 +- arch/powerpc/boot/serial.c | 3 +- arch/powerpc/boot/wrapper | 3 + arch/powerpc/configs/44x/canyonlands_defconfig | 266 +++- arch/powerpc/configs/44x/redwood_defconfig | 1176 ++++++++++++++ arch/powerpc/configs/86xx/gef_sbc310_defconfig | 1613 +++++++++++++++++++ arch/powerpc/configs/amigaone_defconfig | 1636 ++++++++++++++++++++ arch/powerpc/include/asm/bootx.h | 2 +- arch/powerpc/include/asm/code-patching.h | 4 +- arch/powerpc/include/asm/cputable.h | 4 +- arch/powerpc/include/asm/dbell.h | 43 + arch/powerpc/include/asm/elf.h | 14 +- arch/powerpc/include/asm/ftrace.h | 39 +- arch/powerpc/include/asm/highmem.h | 12 +- arch/powerpc/include/asm/kvm.h | 2 +- arch/powerpc/include/asm/machdep.h | 2 - arch/powerpc/include/asm/mmu-44x.h | 2 + .../include/asm/{mmu-fsl-booke.h => mmu-book3e.h} | 66 +- arch/powerpc/include/asm/mmu.h | 6 +- arch/powerpc/include/asm/page.h | 6 +- arch/powerpc/include/asm/page_32.h | 4 + arch/powerpc/include/asm/pgtable-ppc32.h | 57 +- arch/powerpc/include/asm/pgtable-ppc64.h | 29 +- arch/powerpc/include/asm/pgtable.h | 84 + arch/powerpc/include/asm/ppc-opcode.h | 73 + arch/powerpc/include/asm/ppc_asm.h | 6 +- arch/powerpc/include/asm/ps3fb.h | 1 + arch/powerpc/include/asm/reg_booke.h | 1 + arch/powerpc/include/asm/spu_info.h | 3 +- arch/powerpc/include/asm/swab.h | 2 +- arch/powerpc/include/asm/system.h | 2 +- arch/powerpc/include/asm/thread_info.h | 11 +- arch/powerpc/kernel/Makefile | 10 +- arch/powerpc/kernel/align.c | 2 +- arch/powerpc/kernel/cpu_setup_44x.S | 1 + arch/powerpc/kernel/cpu_setup_fsl_booke.S | 31 + arch/powerpc/kernel/cputable.c | 22 + arch/powerpc/kernel/crash_dump.c | 2 +- arch/powerpc/kernel/dbell.c | 44 + arch/powerpc/kernel/entry_32.S | 129 +- arch/powerpc/kernel/entry_64.S | 89 +- arch/powerpc/kernel/ftrace.c | 222 ++- arch/powerpc/kernel/head_booke.h | 19 +- arch/powerpc/kernel/head_fsl_booke.S | 101 +- arch/powerpc/kernel/module_64.c | 2 +- arch/powerpc/kernel/pci-common.c | 41 +- arch/powerpc/kernel/pci_32.c | 36 +- arch/powerpc/kernel/pci_64.c | 19 - arch/powerpc/kernel/process.c | 58 + arch/powerpc/kernel/prom.c | 6 +- arch/powerpc/kernel/rtas.c | 10 +- arch/powerpc/kernel/setup_64.c | 7 - arch/powerpc/kernel/signal.h | 10 - arch/powerpc/kernel/traps.c | 79 +- arch/powerpc/kernel/vmlinux.lds.S | 1 + arch/powerpc/lib/dma-noncoherent.c | 303 +--- arch/powerpc/lib/feature-fixups.c | 4 +- arch/powerpc/mm/fault.c | 46 +- arch/powerpc/mm/fsl_booke_mmu.c | 95 +- arch/powerpc/mm/hash_utils_64.c | 5 +- arch/powerpc/mm/mem.c | 33 - arch/powerpc/mm/mmap.c | 64 +- arch/powerpc/mm/numa.c | 174 +-- arch/powerpc/mm/pgtable.c | 131 ++ arch/powerpc/platforms/44x/Kconfig | 19 + arch/powerpc/platforms/44x/ppc44x_simple.c | 1 + arch/powerpc/platforms/52xx/Kconfig | 12 +- arch/powerpc/platforms/52xx/Makefile | 3 +- arch/powerpc/platforms/52xx/media5200.c | 273 ++++ arch/powerpc/platforms/52xx/mpc5200_simple.c | 1 + arch/powerpc/platforms/52xx/mpc52xx_gpio.c | 85 - arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 435 ++++++ arch/powerpc/platforms/52xx/mpc52xx_pic.c | 170 +-- arch/powerpc/platforms/83xx/mpc831x_rdb.c | 2 + arch/powerpc/platforms/83xx/mpc837x_mds.c | 10 +- arch/powerpc/platforms/83xx/mpc837x_rdb.c | 2 + arch/powerpc/platforms/86xx/Kconfig | 10 +- arch/powerpc/platforms/86xx/Makefile | 1 + arch/powerpc/platforms/86xx/gef_gpio.c | 36 +- arch/powerpc/platforms/86xx/gef_sbc310.c | 230 +++ arch/powerpc/platforms/Kconfig | 10 +- arch/powerpc/platforms/Kconfig.cputype | 4 + arch/powerpc/platforms/Makefile | 1 + arch/powerpc/platforms/amigaone/Kconfig | 18 + arch/powerpc/platforms/amigaone/Makefile | 1 + arch/powerpc/platforms/amigaone/setup.c | 170 ++ arch/powerpc/platforms/cell/Kconfig | 22 +- arch/powerpc/platforms/cell/qpace_setup.c | 2 + arch/powerpc/platforms/cell/spu_fault.c | 48 +- arch/powerpc/platforms/cell/spufs/file.c | 8 +- arch/powerpc/platforms/cell/spufs/inode.c | 5 +- arch/powerpc/platforms/cell/spufs/run.c | 3 + arch/powerpc/platforms/cell/spufs/spufs.h | 8 +- arch/powerpc/platforms/chrp/pegasos_eth.c | 72 +- arch/powerpc/platforms/powermac/setup.c | 3 + arch/powerpc/platforms/pseries/eeh_driver.c | 68 +- arch/powerpc/platforms/pseries/msi.c | 224 +++- arch/powerpc/platforms/pseries/pci_dlpar.c | 2 - arch/powerpc/sysdev/cpm2.c | 3 +- arch/powerpc/sysdev/fsl_pci.c | 244 +++- arch/powerpc/sysdev/ppc4xx_pci.c | 2 + arch/x86/include/asm/ftrace.h | 25 - arch/x86/kernel/dumpstack.c | 1 + arch/x86/kernel/ftrace.c | 75 +- drivers/macintosh/therm_adt746x.c | 4 +- drivers/net/fec_mpc52xx.c | 6 +- drivers/serial/mpc52xx_uart.c | 40 +- drivers/watchdog/Kconfig | 2 +- include/linux/ftrace.h | 24 + include/linux/pci_ids.h | 8 + kernel/trace/trace_functions_graph.c | 75 + lib/lmb.c | 42 +- 145 files changed, 10930 insertions(+), 1829 deletions(-) create mode 100644 Documentation/powerpc/dts-bindings/fsl/esdhc.txt create mode 100644 arch/powerpc/boot/cuboot-amigaone.c create mode 100644 arch/powerpc/boot/dts/amigaone.dts create mode 100644 arch/powerpc/boot/dts/digsy_mtc.dts create mode 100644 arch/powerpc/boot/dts/gef_sbc310.dts create mode 100644 arch/powerpc/boot/dts/media5200.dts create mode 100644 arch/powerpc/boot/dts/mpc8572ds_36b.dts create mode 100644 arch/powerpc/boot/dts/redwood.dts create mode 100644 arch/powerpc/configs/44x/redwood_defconfig create mode 100644 arch/powerpc/configs/86xx/gef_sbc310_defconfig create mode 100644 arch/powerpc/configs/amigaone_defconfig create mode 100644 arch/powerpc/include/asm/dbell.h rename arch/powerpc/include/asm/{mmu-fsl-booke.h => mmu-book3e.h} (52%) create mode 100644 arch/powerpc/include/asm/ppc-opcode.h create mode 100644 arch/powerpc/kernel/cpu_setup_fsl_booke.S create mode 100644 arch/powerpc/kernel/dbell.c create mode 100644 arch/powerpc/platforms/52xx/media5200.c create mode 100644 arch/powerpc/platforms/52xx/mpc52xx_gpt.c create mode 100644 arch/powerpc/platforms/86xx/gef_sbc310.c create mode 100644 arch/powerpc/platforms/amigaone/Kconfig create mode 100644 arch/powerpc/platforms/amigaone/Makefile create mode 100644 arch/powerpc/platforms/amigaone/setup.c Merging 4xx/next $ git merge 4xx/next Already up-to-date. Merging galak/next $ git merge galak/next Auto-merging arch/powerpc/kernel/cputable.c Merge made by recursive. arch/powerpc/include/asm/mmu.h | 4 +- arch/powerpc/kernel/cputable.c | 3 +- arch/powerpc/mm/tlb_nohash_low.S | 44 +++++++++++++++++++++++++++++++------ arch/powerpc/platforms/83xx/usb.c | 3 +- arch/powerpc/sysdev/fsl_soc.c | 4 +++ arch/powerpc/sysdev/ipic.c | 6 +--- drivers/i2c/busses/i2c-mpc.c | 9 ++----- 7 files changed, 52 insertions(+), 21 deletions(-) Merging pxa/for-next $ git merge pxa/for-next Resolved 'arch/arm/plat-pxa/dma.c' using previous resolution. Renaming arch/arm/mach-pxa/dma.c => arch/arm/plat-pxa/dma.c Auto-merging arch/arm/plat-pxa/dma.c CONFLICT (rename/modify): Merge conflict in arch/arm/plat-pxa/dma.c Auto-merging MAINTAINERS Auto-merging arch/arm/Kconfig Auto-merging arch/arm/Makefile Auto-merging arch/arm/boot/compressed/head.S Removing arch/arm/mach-pxa/gpio.c Removing arch/arm/mach-pxa/include/mach/pxa-regs.h Auto-merging arch/arm/mach-pxa/include/mach/regs-ssp.h Auto-merging arch/arm/mach-pxa/pxa300.c Auto-merging arch/arm/mach-pxa/pxa320.c Auto-merging drivers/input/keyboard/corgikbd.c Auto-merging drivers/input/keyboard/spitzkbd.c Auto-merging drivers/input/touchscreen/corgi_ts.c Auto-merging drivers/media/video/pxa_camera.c Auto-merging drivers/video/pxafb.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master]: created 499a66b: "Merge commit 'pxa/for-next'" $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 8 + arch/arm/Kconfig | 23 + arch/arm/Makefile | 2 + arch/arm/boot/compressed/head.S | 17 + arch/arm/common/sharpsl_pm.c | 2 +- arch/arm/configs/magician_defconfig | 1 + arch/arm/configs/pxa168_defconfig | 888 ++++++++++++++++++++++++++ arch/arm/include/asm/cacheflush.h | 8 + arch/arm/include/asm/proc-fns.h | 8 + arch/arm/mach-mmp/Kconfig | 20 + arch/arm/mach-mmp/Makefile | 11 + arch/arm/mach-mmp/Makefile.boot | 1 + arch/arm/mach-mmp/clock.c | 83 +++ arch/arm/mach-mmp/clock.h | 71 ++ arch/arm/mach-mmp/common.c | 37 ++ arch/arm/mach-mmp/common.h | 9 + arch/arm/mach-mmp/devices.c | 72 +++ arch/arm/mach-mmp/include/mach/addr-map.h | 34 + arch/arm/mach-mmp/include/mach/clkdev.h | 7 + arch/arm/mach-mmp/include/mach/cputype.h | 35 + arch/arm/mach-mmp/include/mach/debug-macro.S | 23 + arch/arm/mach-mmp/include/mach/devices.h | 31 + arch/arm/mach-mmp/include/mach/dma.h | 13 + arch/arm/mach-mmp/include/mach/entry-macro.S | 25 + arch/arm/mach-mmp/include/mach/gpio.h | 36 + arch/arm/mach-mmp/include/mach/hardware.h | 4 + arch/arm/mach-mmp/include/mach/io.h | 21 + arch/arm/mach-mmp/include/mach/irqs.h | 59 ++ arch/arm/mach-mmp/include/mach/memory.h | 14 + arch/arm/mach-mmp/include/mach/mfp-pxa168.h | 258 ++++++++ arch/arm/mach-mmp/include/mach/mfp.h | 37 ++ arch/arm/mach-mmp/include/mach/pxa168.h | 20 + arch/arm/mach-mmp/include/mach/regs-apbc.h | 53 ++ arch/arm/mach-mmp/include/mach/regs-apmu.h | 36 + arch/arm/mach-mmp/include/mach/regs-icu.h | 31 + arch/arm/mach-mmp/include/mach/regs-timers.h | 44 ++ arch/arm/mach-mmp/include/mach/system.h | 21 + arch/arm/mach-mmp/include/mach/timex.h | 9 + arch/arm/mach-mmp/include/mach/uncompress.h | 41 ++ arch/arm/mach-mmp/include/mach/vmalloc.h | 5 + arch/arm/mach-mmp/irq.c | 58 ++ arch/arm/mach-mmp/pxa168.c | 88 +++ arch/arm/mach-mmp/time.c | 212 ++++++ arch/arm/mach-mmp/zylonite2.c | 106 +++ arch/arm/mach-pxa/Kconfig | 1 + arch/arm/mach-pxa/Makefile | 4 +- arch/arm/mach-pxa/am200epd.c | 2 +- arch/arm/mach-pxa/cm-x255.c | 4 +- arch/arm/mach-pxa/cm-x270.c | 2 +- arch/arm/mach-pxa/cm-x2xx-pci.c | 1 - arch/arm/mach-pxa/cm-x2xx.c | 2 - arch/arm/mach-pxa/cm-x300.c | 4 +- arch/arm/mach-pxa/colibri.c | 4 +- arch/arm/mach-pxa/corgi.c | 4 +- arch/arm/mach-pxa/corgi_lcd.c | 1 - arch/arm/mach-pxa/corgi_pm.c | 1 - arch/arm/mach-pxa/corgi_ssp.c | 1 - arch/arm/mach-pxa/cpufreq-pxa2xx.c | 2 - arch/arm/mach-pxa/cpufreq-pxa3xx.c | 2 - arch/arm/mach-pxa/devices.c | 1 - arch/arm/mach-pxa/e330.c | 4 +- arch/arm/mach-pxa/e350.c | 4 +- arch/arm/mach-pxa/e400.c | 4 +- arch/arm/mach-pxa/e740.c | 4 +- arch/arm/mach-pxa/e750.c | 4 +- arch/arm/mach-pxa/e800.c | 4 +- arch/arm/mach-pxa/em-x270.c | 3 +- arch/arm/mach-pxa/eseries.c | 3 +- arch/arm/mach-pxa/ezx.c | 10 +- arch/arm/mach-pxa/generic.c | 33 +- arch/arm/mach-pxa/generic.h | 7 +- arch/arm/mach-pxa/gpio.c | 453 ------------- arch/arm/mach-pxa/gumstix.c | 6 +- arch/arm/mach-pxa/h5000.c | 7 +- arch/arm/mach-pxa/himalaya.c | 2 - arch/arm/mach-pxa/idp.c | 3 +- arch/arm/mach-pxa/imote2.c | 5 +- arch/arm/mach-pxa/include/mach/dma.h | 33 +- arch/arm/mach-pxa/include/mach/gpio.h | 126 +++- arch/arm/mach-pxa/include/mach/lubbock.h | 1 - arch/arm/mach-pxa/include/mach/mfp-pxa25x.h | 1 - arch/arm/mach-pxa/include/mach/mfp-pxa27x.h | 1 - arch/arm/mach-pxa/include/mach/mfp-pxa2xx.h | 2 +- arch/arm/mach-pxa/include/mach/mfp-pxa300.h | 1 - arch/arm/mach-pxa/include/mach/mfp-pxa320.h | 1 - arch/arm/mach-pxa/include/mach/mfp-pxa3xx.h | 130 +---- arch/arm/mach-pxa/include/mach/mfp-pxa930.h | 1 - arch/arm/mach-pxa/include/mach/mtd-xip.h | 4 +- arch/arm/mach-pxa/include/mach/pm.h | 10 + arch/arm/mach-pxa/include/mach/pxa-regs.h | 263 -------- arch/arm/mach-pxa/include/mach/pxa25x.h | 8 + arch/arm/mach-pxa/include/mach/pxa27x.h | 19 + arch/arm/mach-pxa/include/mach/pxa2xx-gpio.h | 2 + arch/arm/mach-pxa/include/mach/pxa2xx-regs.h | 31 +- arch/arm/mach-pxa/include/mach/pxa300.h | 8 + arch/arm/mach-pxa/include/mach/pxa320.h | 9 + arch/arm/mach-pxa/include/mach/pxa3xx-regs.h | 11 + arch/arm/mach-pxa/include/mach/pxa930.h | 8 + arch/arm/mach-pxa/include/mach/regs-intc.h | 23 + arch/arm/mach-pxa/include/mach/regs-ost.h | 34 + arch/arm/mach-pxa/include/mach/regs-rtc.h | 23 + arch/arm/mach-pxa/include/mach/regs-ssp.h | 1 - arch/arm/mach-pxa/include/mach/system.h | 1 - arch/arm/mach-pxa/irq.c | 70 ++- arch/arm/mach-pxa/leds-idp.c | 2 +- arch/arm/mach-pxa/leds-lubbock.c | 2 +- arch/arm/mach-pxa/leds-mainstone.c | 2 +- arch/arm/mach-pxa/littleton.c | 3 +- arch/arm/mach-pxa/lpd270.c | 5 +- arch/arm/mach-pxa/lubbock.c | 12 +- arch/arm/mach-pxa/magician.c | 17 +- arch/arm/mach-pxa/mainstone.c | 5 +- arch/arm/mach-pxa/mfp-pxa2xx.c | 5 +- arch/arm/mach-pxa/mfp-pxa3xx.c | 189 +------ arch/arm/mach-pxa/mioa701.c | 5 +- arch/arm/mach-pxa/mp900.c | 4 +- arch/arm/mach-pxa/palmld.c | 3 +- arch/arm/mach-pxa/palmt5.c | 3 +- arch/arm/mach-pxa/palmtx.c | 3 +- arch/arm/mach-pxa/palmz72.c | 4 +- arch/arm/mach-pxa/pcm027.c | 5 +- arch/arm/mach-pxa/pcm990-baseboard.c | 3 +- arch/arm/mach-pxa/pm.c | 13 +- arch/arm/mach-pxa/poodle.c | 4 +- arch/arm/mach-pxa/pwm.c | 1 - arch/arm/mach-pxa/pxa25x.c | 11 +- arch/arm/mach-pxa/pxa27x.c | 9 +- arch/arm/mach-pxa/pxa2xx.c | 1 - arch/arm/mach-pxa/pxa300.c | 14 +- arch/arm/mach-pxa/pxa320.c | 11 +- arch/arm/mach-pxa/pxa3xx.c | 5 +- arch/arm/mach-pxa/pxa930.c | 9 +- arch/arm/mach-pxa/reset.c | 2 +- arch/arm/mach-pxa/saar.c | 6 +- arch/arm/mach-pxa/sharpsl_pm.c | 1 - arch/arm/mach-pxa/sleep.S | 1 - arch/arm/mach-pxa/spitz.c | 4 +- arch/arm/mach-pxa/spitz_pm.c | 1 - arch/arm/mach-pxa/ssp.c | 1 - arch/arm/mach-pxa/standby.S | 1 - arch/arm/mach-pxa/tavorevb.c | 5 +- arch/arm/mach-pxa/time.c | 3 +- arch/arm/mach-pxa/tosa.c | 4 +- arch/arm/mach-pxa/trizeps4.c | 5 +- arch/arm/mach-pxa/viper.c | 7 +- arch/arm/mach-pxa/zylonite_pxa300.c | 4 +- arch/arm/mach-pxa/zylonite_pxa320.c | 2 +- arch/arm/mm/Kconfig | 20 +- arch/arm/mm/Makefile | 1 + arch/arm/mm/proc-mohawk.S | 447 +++++++++++++ arch/arm/plat-pxa/Kconfig | 3 + arch/arm/plat-pxa/Makefile | 7 + arch/arm/{mach-pxa => plat-pxa}/dma.c | 12 +- arch/arm/plat-pxa/gpio.c | 337 ++++++++++ arch/arm/plat-pxa/include/plat/dma.h | 85 +++ arch/arm/plat-pxa/include/plat/gpio.h | 62 ++ arch/arm/plat-pxa/include/plat/mfp.h | 369 +++++++++++ arch/arm/plat-pxa/mfp.c | 278 ++++++++ drivers/input/keyboard/corgikbd.c | 2 - drivers/input/keyboard/spitzkbd.c | 2 - drivers/input/touchscreen/corgi_ts.c | 1 - drivers/media/video/pxa_camera.c | 1 - drivers/mmc/host/pxamci.c | 3 +- drivers/mtd/nand/cmx270_nand.c | 3 +- drivers/mtd/nand/pxa3xx_nand.c | 1 - drivers/net/irda/pxaficp_ir.c | 3 +- drivers/net/smc911x.h | 3 +- drivers/net/smc91x.h | 3 +- drivers/pcmcia/pxa2xx_base.c | 87 +++- drivers/pcmcia/pxa2xx_cm_x255.c | 1 - drivers/pcmcia/pxa2xx_cm_x270.c | 1 - drivers/pcmcia/pxa2xx_e740.c | 2 - drivers/pcmcia/pxa2xx_lubbock.c | 1 - drivers/pcmcia/pxa2xx_mainstone.c | 3 +- drivers/pcmcia/pxa2xx_trizeps4.c | 3 +- drivers/pcmcia/pxa2xx_viper.c | 1 - drivers/pcmcia/sa11xx_base.c | 48 ++- drivers/pcmcia/soc_common.c | 54 +-- drivers/pcmcia/soc_common.h | 7 +- drivers/rtc/rtc-sa1100.c | 3 +- drivers/serial/Kconfig | 2 +- drivers/serial/pxa.c | 30 +- drivers/spi/pxa2xx_spi.c | 2 - drivers/video/pxafb.c | 1 - drivers/watchdog/sa1100_wdt.c | 2 +- sound/arm/pxa2xx-ac97-lib.c | 1 - sound/arm/pxa2xx-ac97.c | 2 - sound/arm/pxa2xx-pcm-lib.c | 3 +- sound/soc/pxa/corgi.c | 2 - sound/soc/pxa/e800_wm9712.c | 2 - sound/soc/pxa/em-x270.c | 2 - sound/soc/pxa/poodle.c | 2 - sound/soc/pxa/pxa-ssp.c | 2 +- sound/soc/pxa/pxa2xx-ac97.c | 2 +- sound/soc/pxa/pxa2xx-i2s.c | 2 +- sound/soc/pxa/spitz.c | 2 - sound/soc/pxa/tosa.c | 2 - 197 files changed, 4869 insertions(+), 1439 deletions(-) create mode 100644 arch/arm/configs/pxa168_defconfig create mode 100644 arch/arm/mach-mmp/Kconfig create mode 100644 arch/arm/mach-mmp/Makefile create mode 100644 arch/arm/mach-mmp/Makefile.boot create mode 100644 arch/arm/mach-mmp/clock.c create mode 100644 arch/arm/mach-mmp/clock.h create mode 100644 arch/arm/mach-mmp/common.c create mode 100644 arch/arm/mach-mmp/common.h create mode 100644 arch/arm/mach-mmp/devices.c create mode 100644 arch/arm/mach-mmp/include/mach/addr-map.h create mode 100644 arch/arm/mach-mmp/include/mach/clkdev.h create mode 100644 arch/arm/mach-mmp/include/mach/cputype.h create mode 100644 arch/arm/mach-mmp/include/mach/debug-macro.S create mode 100644 arch/arm/mach-mmp/include/mach/devices.h create mode 100644 arch/arm/mach-mmp/include/mach/dma.h create mode 100644 arch/arm/mach-mmp/include/mach/entry-macro.S create mode 100644 arch/arm/mach-mmp/include/mach/gpio.h create mode 100644 arch/arm/mach-mmp/include/mach/hardware.h create mode 100644 arch/arm/mach-mmp/include/mach/io.h create mode 100644 arch/arm/mach-mmp/include/mach/irqs.h create mode 100644 arch/arm/mach-mmp/include/mach/memory.h create mode 100644 arch/arm/mach-mmp/include/mach/mfp-pxa168.h create mode 100644 arch/arm/mach-mmp/include/mach/mfp.h create mode 100644 arch/arm/mach-mmp/include/mach/pxa168.h create mode 100644 arch/arm/mach-mmp/include/mach/regs-apbc.h create mode 100644 arch/arm/mach-mmp/include/mach/regs-apmu.h create mode 100644 arch/arm/mach-mmp/include/mach/regs-icu.h create mode 100644 arch/arm/mach-mmp/include/mach/regs-timers.h create mode 100644 arch/arm/mach-mmp/include/mach/system.h create mode 100644 arch/arm/mach-mmp/include/mach/timex.h create mode 100644 arch/arm/mach-mmp/include/mach/uncompress.h create mode 100644 arch/arm/mach-mmp/include/mach/vmalloc.h create mode 100644 arch/arm/mach-mmp/irq.c create mode 100644 arch/arm/mach-mmp/pxa168.c create mode 100644 arch/arm/mach-mmp/time.c create mode 100644 arch/arm/mach-mmp/zylonite2.c delete mode 100644 arch/arm/mach-pxa/gpio.c delete mode 100644 arch/arm/mach-pxa/include/mach/pxa-regs.h create mode 100644 arch/arm/mach-pxa/include/mach/pxa25x.h create mode 100644 arch/arm/mach-pxa/include/mach/pxa27x.h create mode 100644 arch/arm/mach-pxa/include/mach/pxa300.h create mode 100644 arch/arm/mach-pxa/include/mach/pxa320.h create mode 100644 arch/arm/mach-pxa/include/mach/pxa930.h create mode 100644 arch/arm/mach-pxa/include/mach/regs-intc.h create mode 100644 arch/arm/mach-pxa/include/mach/regs-ost.h create mode 100644 arch/arm/mach-pxa/include/mach/regs-rtc.h create mode 100644 arch/arm/mm/proc-mohawk.S create mode 100644 arch/arm/plat-pxa/Kconfig create mode 100644 arch/arm/plat-pxa/Makefile rename arch/arm/{mach-pxa => plat-pxa}/dma.c (93%) create mode 100644 arch/arm/plat-pxa/gpio.c create mode 100644 arch/arm/plat-pxa/include/plat/dma.h create mode 100644 arch/arm/plat-pxa/include/plat/gpio.h create mode 100644 arch/arm/plat-pxa/include/plat/mfp.h create mode 100644 arch/arm/plat-pxa/mfp.c Merging s390/features $ git merge s390/features Auto-merging MAINTAINERS Removing arch/s390/kernel/bitmap.S Removing drivers/s390/ebcdic.c Removing drivers/s390/s390mach.h Merge made by recursive. Documentation/kernel-parameters.txt | 3 + MAINTAINERS | 9 + arch/s390/Kconfig | 9 +- arch/s390/include/asm/bitops.h | 14 +- arch/s390/include/asm/crw.h | 68 ++ arch/s390/include/asm/dasd.h | 10 +- arch/s390/include/asm/idals.h | 17 +- arch/s390/include/asm/lowcore.h | 24 +- arch/s390/include/asm/nmi.h | 66 ++ arch/s390/include/asm/ptrace.h | 2 + arch/s390/include/asm/string.h | 20 +- arch/s390/include/asm/sysinfo.h | 1 + arch/s390/include/asm/system.h | 16 + arch/s390/include/asm/topology.h | 2 + arch/s390/include/asm/vtoc.h | 16 +- arch/s390/kernel/Makefile | 4 +- arch/s390/kernel/bitmap.S | 56 - arch/s390/kernel/bitmap.c | 54 + arch/s390/kernel/compat_ptrace.h | 3 +- arch/s390/kernel/early.c | 23 +- arch/s390/kernel/ipl.c | 56 +- arch/s390/kernel/mcount.S | 6 +- arch/s390/kernel/module.c | 19 +- drivers/s390/s390mach.c => arch/s390/kernel/nmi.c | 278 +---- arch/s390/kernel/process.c | 73 +- arch/s390/kernel/s390_ksyms.c | 44 - arch/s390/kernel/setup.c | 17 +- arch/s390/kernel/smp.c | 11 +- {drivers/s390 => arch/s390/kernel}/sysinfo.c | 69 +- arch/s390/kernel/time.c | 71 +- arch/s390/kernel/traps.c | 4 +- arch/s390/kernel/vmlinux.lds.S | 2 + arch/s390/kvm/kvm-s390.c | 6 +- arch/s390/lib/delay.c | 2 + arch/s390/lib/string.c | 12 + arch/s390/mm/fault.c | 28 +- arch/s390/mm/init.c | 2 + arch/s390/mm/pgtable.c | 4 + drivers/char/hvc_iucv.c | 259 ++++- drivers/s390/Makefile | 3 - drivers/s390/block/dasd.c | 232 +++-- drivers/s390/block/dasd_3990_erp.c | 871 ++++++++------- drivers/s390/block/dasd_alias.c | 33 +- drivers/s390/block/dasd_devmap.c | 7 + drivers/s390/block/dasd_diag.c | 57 +- drivers/s390/block/dasd_eckd.c | 1272 +++++++++++++++++---- drivers/s390/block/dasd_eckd.h | 49 +- drivers/s390/block/dasd_eer.c | 21 +- drivers/s390/block/dasd_erp.c | 19 +- drivers/s390/block/dasd_fba.c | 48 +- drivers/s390/block/dasd_int.h | 13 +- drivers/s390/block/dasd_ioctl.c | 46 +- drivers/s390/block/dasd_proc.c | 2 +- drivers/s390/char/tape.h | 2 - drivers/s390/char/tape_34xx.c | 161 ++-- drivers/s390/char/tape_3590.c | 364 +++--- drivers/s390/char/tape_block.c | 18 +- drivers/s390/char/tape_char.c | 7 - drivers/s390/char/tape_core.c | 62 +- drivers/s390/char/tape_proc.c | 3 - drivers/s390/char/tape_std.c | 21 +- drivers/s390/char/zcore.c | 88 ++- drivers/s390/cio/Makefile | 2 +- drivers/s390/cio/airq.c | 6 +- drivers/s390/cio/chp.c | 6 +- drivers/s390/cio/chsc.c | 6 +- drivers/s390/cio/cio.c | 21 +- drivers/s390/cio/crw.c | 159 +++ drivers/s390/cio/css.c | 37 +- drivers/s390/cio/device.c | 41 +- drivers/s390/cio/device.h | 2 +- drivers/s390/cio/device_fsm.c | 8 +- drivers/s390/cio/qdio_main.c | 63 +- drivers/s390/cio/qdio_thinint.c | 18 +- drivers/s390/crypto/zcrypt_api.c | 6 +- drivers/s390/ebcdic.c | 246 ---- drivers/s390/s390mach.h | 122 -- fs/partitions/ibm.c | 101 ++- 78 files changed, 3393 insertions(+), 2230 deletions(-) create mode 100644 arch/s390/include/asm/crw.h create mode 100644 arch/s390/include/asm/nmi.h delete mode 100644 arch/s390/kernel/bitmap.S create mode 100644 arch/s390/kernel/bitmap.c rename drivers/s390/s390mach.c => arch/s390/kernel/nmi.c (62%) rename {drivers/s390 => arch/s390/kernel}/sysinfo.c (88%) create mode 100644 drivers/s390/cio/crw.c delete mode 100644 drivers/s390/ebcdic.c delete mode 100644 drivers/s390/s390mach.h Merging sh/master $ git merge sh/master Merge made by recursive. arch/sh/Kconfig | 44 +- arch/sh/boards/Kconfig | 11 +- arch/sh/boards/Makefile | 1 + arch/sh/boards/board-urquell.c | 128 ++++ arch/sh/boards/mach-highlander/Kconfig | 2 +- arch/sh/boards/mach-hp6xx/pm_wakeup.S | 31 +- arch/sh/boards/mach-rsk/Kconfig | 2 +- arch/sh/configs/urquell_defconfig | 534 ++++++++++++++++ arch/sh/include/asm/atomic-irq.h | 16 +- arch/sh/include/asm/bitops-llsc.h | 72 +- arch/sh/include/asm/cmpxchg-llsc.h | 38 +- arch/sh/include/asm/entry-macros.S | 5 + arch/sh/include/asm/gpio.h | 70 ++- arch/sh/include/asm/kprobes.h | 2 +- arch/sh/include/asm/processor.h | 2 +- arch/sh/include/asm/processor_32.h | 15 +- arch/sh/include/asm/processor_64.h | 14 +- arch/sh/include/asm/ptrace.h | 8 +- arch/sh/include/asm/timer.h | 4 +- arch/sh/include/cpu-sh4/cpu/freq.h | 4 + arch/sh/include/cpu-sh4/cpu/sh7786.h | 192 ++++++ arch/sh/include/mach-common/mach/urquell.h | 68 ++ arch/sh/kernel/cpu/sh3/entry.S | 345 ++++++----- arch/sh/kernel/cpu/sh4/probe.c | 7 + arch/sh/kernel/cpu/sh4/setup-sh7750.c | 87 +-- arch/sh/kernel/cpu/sh4a/Makefile | 3 + arch/sh/kernel/cpu/sh4a/clock-sh7786.c | 148 +++++ arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c | 950 ++++++++++++++++++++++++++++ arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 34 + arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 34 + arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 34 + arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 34 + arch/sh/kernel/cpu/sh4a/setup-sh7780.c | 97 +-- arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 95 +-- arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 407 ++++++++++++ arch/sh/kernel/gpio.c | 338 ++++++---- arch/sh/kernel/irq.c | 2 +- arch/sh/kernel/setup.c | 1 + arch/sh/kernel/time_32.c | 71 +-- arch/sh/kernel/timers/timer-mtu2.c | 3 +- arch/sh/kernel/timers/timer-tmu.c | 21 +- arch/sh/mm/ioremap_32.c | 2 +- arch/sh/oprofile/common.c | 1 + arch/sh/tools/mach-types | 1 + drivers/clocksource/Makefile | 1 + drivers/clocksource/sh_cmt.c | 615 ++++++++++++++++++ drivers/input/joystick/maplecontrol.c | 4 +- drivers/input/keyboard/maple_keyb.c | 37 +- drivers/rtc/rtc-sh.c | 190 ++++--- drivers/serial/sh-sci.c | 12 +- drivers/serial/sh-sci.h | 15 +- drivers/sh/intc.c | 47 ++ drivers/sh/maple/maple.c | 472 +++++++------- drivers/sh/superhyway/superhyway.c | 4 +- include/linux/maple.h | 62 ++- include/linux/sh_cmt.h | 13 + include/linux/sh_intc.h | 1 + 57 files changed, 4405 insertions(+), 1046 deletions(-) create mode 100644 arch/sh/boards/board-urquell.c create mode 100644 arch/sh/configs/urquell_defconfig create mode 100644 arch/sh/include/cpu-sh4/cpu/sh7786.h create mode 100644 arch/sh/include/mach-common/mach/urquell.h create mode 100644 arch/sh/kernel/cpu/sh4a/clock-sh7786.c create mode 100644 arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c create mode 100644 arch/sh/kernel/cpu/sh4a/setup-sh7786.c create mode 100644 drivers/clocksource/sh_cmt.c create mode 100644 include/linux/sh_cmt.h Merging sparc/master $ git merge sparc/master Already up-to-date. Merging x86/auto-x86-next $ git merge x86/auto-x86-next Auto-merging Makefile Auto-merging arch/arm/kernel/vmlinux.lds.S Auto-merging arch/ia64/include/asm/kvm.h Auto-merging arch/ia64/kernel/iosapic.c Auto-merging arch/powerpc/include/asm/elf.h CONFLICT (content): Merge conflict in arch/powerpc/include/asm/elf.h Auto-merging arch/powerpc/include/asm/ps3fb.h Auto-merging arch/powerpc/kernel/vmlinux.lds.S Auto-merging arch/x86/Kconfig Auto-merging arch/x86/Kconfig.debug Removing arch/x86/include/asm/bigsmp/apic.h Removing arch/x86/include/asm/bigsmp/apicdef.h Removing arch/x86/include/asm/bigsmp/ipi.h Removing arch/x86/include/asm/es7000/apic.h Removing arch/x86/include/asm/es7000/apicdef.h Removing arch/x86/include/asm/es7000/ipi.h Removing arch/x86/include/asm/es7000/mpparse.h Removing arch/x86/include/asm/es7000/wakecpu.h Removing arch/x86/include/asm/genapic_32.h Removing arch/x86/include/asm/genapic_64.h Removing arch/x86/include/asm/hardirq_32.h Removing arch/x86/include/asm/hardirq_64.h Removing arch/x86/include/asm/irq_regs_32.h Removing arch/x86/include/asm/irq_regs_64.h Removing arch/x86/include/asm/mach-default/entry_arch.h Removing arch/x86/include/asm/mach-default/mach_apic.h Removing arch/x86/include/asm/mach-default/mach_apicdef.h Removing arch/x86/include/asm/mach-default/mach_ipi.h Removing arch/x86/include/asm/mach-default/mach_mpparse.h Removing arch/x86/include/asm/mach-default/mach_mpspec.h Removing arch/x86/include/asm/mach-default/mach_wakecpu.h Removing arch/x86/include/asm/mach-generic/gpio.h Removing arch/x86/include/asm/mach-generic/mach_apic.h Removing arch/x86/include/asm/mach-generic/mach_apicdef.h Removing arch/x86/include/asm/mach-generic/mach_ipi.h Removing arch/x86/include/asm/mach-generic/mach_mpparse.h Removing arch/x86/include/asm/mach-generic/mach_mpspec.h Removing arch/x86/include/asm/mach-generic/mach_wakecpu.h Removing arch/x86/include/asm/mach-rdc321x/gpio.h Removing arch/x86/include/asm/mmu_context_32.h Removing arch/x86/include/asm/mmu_context_64.h Removing arch/x86/include/asm/numaq/apic.h Removing arch/x86/include/asm/numaq/apicdef.h Removing arch/x86/include/asm/numaq/ipi.h Removing arch/x86/include/asm/numaq/mpparse.h Removing arch/x86/include/asm/numaq/wakecpu.h Removing arch/x86/include/asm/pda.h Removing arch/x86/include/asm/pgtable-2level-defs.h Removing arch/x86/include/asm/summit/apic.h Removing arch/x86/include/asm/summit/apicdef.h Removing arch/x86/include/asm/summit/ipi.h Removing arch/x86/include/asm/summit/mpparse.h Auto-merging arch/x86/kernel/apic.c Auto-merging arch/x86/kernel/apm_32.c Auto-merging arch/x86/kernel/cpu/mcheck/mce_amd_64.c Auto-merging arch/x86/kernel/cpu/mcheck/mce_intel_64.c Auto-merging arch/x86/kernel/dumpstack.c Auto-merging arch/x86/kernel/process_32.c Auto-merging arch/x86/kernel/ptrace.c Removing arch/x86/kernel/smpcommon.c Removing arch/x86/kernel/tlb_32.c Auto-merging arch/x86/kernel/vmiclock_32.c Removing arch/x86/mach-default/Makefile CONFLICT (delete/modify): arch/x86/mach-default/setup.c deleted in x86/auto-x86-next and modified in HEAD. Version HEAD of arch/x86/mach-default/setup.c left in tree. Removing arch/x86/mach-generic/Makefile Removing arch/x86/mach-generic/bigsmp.c Removing arch/x86/mach-generic/default.c Removing arch/x86/mach-generic/es7000.c Removing arch/x86/mach-generic/numaq.c Removing arch/x86/mach-generic/probe.c Removing arch/x86/mach-generic/summit.c Removing arch/x86/mach-rdc321x/Makefile Removing arch/x86/mach-rdc321x/gpio.c Removing arch/x86/mach-rdc321x/platform.c Auto-merging arch/x86/mach-voyager/setup.c Auto-merging arch/x86/mach-voyager/voyager_smp.c Auto-merging arch/x86/mm/numa_64.c Auto-merging arch/x86/mm/pat.c Auto-merging arch/x86/xen/enlighten.c Auto-merging drivers/input/mouse/Kconfig Auto-merging drivers/pci/dmar.c Auto-merging drivers/pci/intr_remapping.c Auto-merging drivers/xen/manage.c Auto-merging kernel/kexec.c Auto-merging kernel/sched.c Automatic merge failed; fix conflicts and then commit the result. $ git rm -f arch/x86/mach-default/setup.c arch/powerpc/include/asm/elf.h: needs merge arch/x86/mach-default/setup.c: needs merge rm 'arch/x86/mach-default/setup.c' rm 'arch/x86/mach-default/setup.c' $ git commit -v -a Recorded resolution for 'arch/powerpc/include/asm/elf.h'. [master]: created 52324d4: "Merge commit 'x86/auto-x86-next'" $ git diff -M --stat --summary HEAD^.. Documentation/cputopology.txt | 6 +- Documentation/x86/boot.txt | 13 +- Makefile | 3 +- arch/alpha/include/asm/statfs.h | 2 + arch/alpha/include/asm/swab.h | 2 +- arch/alpha/kernel/irq.c | 2 +- arch/arm/include/asm/a.out.h | 2 +- arch/arm/include/asm/setup.h | 2 +- arch/arm/include/asm/swab.h | 2 +- arch/arm/kernel/irq.c | 18 +- arch/arm/kernel/vmlinux.lds.S | 1 + arch/arm/oprofile/op_model_mpcore.c | 2 +- arch/avr32/include/asm/swab.h | 2 +- arch/blackfin/include/asm/swab.h | 2 +- arch/blackfin/kernel/irqchip.c | 5 + arch/h8300/include/asm/swab.h | 2 +- arch/ia64/include/asm/fpu.h | 2 - arch/ia64/include/asm/gcc_intrin.h | 1 + arch/ia64/include/asm/intrinsics.h | 1 + arch/ia64/include/asm/kvm.h | 3 +- arch/ia64/include/asm/percpu.h | 4 +- arch/ia64/include/asm/swab.h | 2 +- arch/ia64/include/asm/topology.h | 2 +- arch/ia64/include/asm/uv/uv.h | 13 + arch/ia64/kernel/acpi.c | 4 + arch/ia64/kernel/iosapic.c | 2 +- arch/ia64/kernel/irq.c | 4 +- arch/ia64/kernel/irq_ia64.c | 12 +- arch/ia64/kernel/msi_ia64.c | 4 +- arch/ia64/kernel/vmlinux.lds.S | 1 + arch/ia64/sn/kernel/msi_sn.c | 2 +- arch/mips/include/asm/irq.h | 2 +- arch/mips/include/asm/sigcontext.h | 1 + arch/mips/include/asm/swab.h | 2 +- arch/mips/kernel/irq-gic.c | 2 +- arch/mips/kernel/smtc.c | 6 +- arch/mips/mti-malta/malta-smtc.c | 5 +- arch/mips/sgi-ip22/ip22-int.c | 2 +- arch/mips/sgi-ip22/ip22-time.c | 2 +- arch/mips/sibyte/bcm1480/smp.c | 3 +- arch/mips/sibyte/sb1250/smp.c | 3 +- arch/mn10300/kernel/mn10300-watchdog.c | 3 +- arch/parisc/include/asm/pdc.h | 3 +- arch/parisc/include/asm/swab.h | 2 +- arch/parisc/kernel/irq.c | 8 +- arch/powerpc/include/asm/ps3fb.h | 1 + arch/powerpc/kernel/irq.c | 2 +- arch/powerpc/kernel/vmlinux.lds.S | 1 + arch/powerpc/platforms/pseries/xics.c | 5 +- arch/powerpc/sysdev/mpic.c | 3 +- arch/sparc/kernel/irq_64.c | 5 +- arch/sparc/kernel/time_64.c | 2 +- arch/x86/Kconfig | 621 ++++++++-------- arch/x86/Kconfig.cpu | 80 +- arch/x86/Kconfig.debug | 50 +- arch/x86/Makefile | 43 +- arch/x86/boot/a20.c | 75 +- arch/x86/configs/i386_defconfig | 414 ++++++++--- arch/x86/configs/x86_64_defconfig | 420 +++++++++--- arch/x86/ia32/ia32_signal.c | 365 +++++----- arch/x86/ia32/ia32entry.S | 8 +- arch/x86/include/asm/a.out-core.h | 2 +- arch/x86/include/asm/acpi.h | 3 - arch/x86/include/asm/apic.h | 74 ++- arch/x86/include/asm/apicnum.h | 12 + arch/x86/include/asm/{mach-default => }/apm.h | 0 arch/x86/include/asm/bigsmp/apic.h | 155 ---- arch/x86/include/asm/bigsmp/apicdef.h | 13 - arch/x86/include/asm/bigsmp/ipi.h | 22 - arch/x86/include/asm/calling.h | 56 ++- arch/x86/include/asm/cpu.h | 17 + arch/x86/include/asm/cpumask.h | 32 + arch/x86/include/asm/current.h | 24 +- arch/x86/include/asm/{mach-default => }/do_timer.h | 0 arch/x86/include/asm/elf.h | 15 +- arch/x86/include/asm/entry_arch.h | 57 ++ arch/x86/include/asm/es7000/apic.h | 242 ------ arch/x86/include/asm/es7000/apicdef.h | 13 - arch/x86/include/asm/es7000/ipi.h | 22 - arch/x86/include/asm/es7000/mpparse.h | 29 - arch/x86/include/asm/es7000/wakecpu.h | 37 - arch/x86/include/asm/fixmap_32.h | 4 - arch/x86/include/asm/fixmap_64.h | 4 - arch/x86/include/asm/genapic.h | 262 +++++++- arch/x86/include/asm/genapic_32.h | 148 ---- arch/x86/include/asm/genapic_64.h | 66 -- arch/x86/include/asm/hardirq.h | 49 ++- arch/x86/include/asm/hardirq_32.h | 30 - arch/x86/include/asm/hardirq_64.h | 25 - arch/x86/include/asm/hw_irq.h | 24 +- arch/x86/include/asm/io.h | 93 +++- arch/x86/include/asm/io_32.h | 88 --- arch/x86/include/asm/io_64.h | 61 -- arch/x86/include/asm/io_apic.h | 41 +- arch/x86/include/asm/ipi.h | 77 +- arch/x86/include/asm/irq.h | 4 +- arch/x86/include/asm/irq_regs.h | 36 +- arch/x86/include/asm/irq_regs_32.h | 31 - arch/x86/include/asm/irq_regs_64.h | 1 - arch/x86/include/asm/irq_vectors.h | 209 +++--- arch/x86/include/asm/kexec.h | 27 +- arch/x86/include/asm/mach-default/entry_arch.h | 36 - arch/x86/include/asm/mach-default/mach_apic.h | 168 ----- arch/x86/include/asm/mach-default/mach_apicdef.h | 24 - arch/x86/include/asm/mach-default/mach_ipi.h | 64 -- arch/x86/include/asm/mach-default/mach_mpparse.h | 17 - arch/x86/include/asm/mach-default/mach_mpspec.h | 12 - arch/x86/include/asm/mach-default/mach_wakecpu.h | 41 - arch/x86/include/asm/mach-generic/gpio.h | 15 - arch/x86/include/asm/mach-generic/mach_apic.h | 35 - arch/x86/include/asm/mach-generic/mach_apicdef.h | 11 - arch/x86/include/asm/mach-generic/mach_ipi.h | 10 - arch/x86/include/asm/mach-generic/mach_mpparse.h | 9 - arch/x86/include/asm/mach-generic/mach_mpspec.h | 12 - arch/x86/include/asm/mach-generic/mach_wakecpu.h | 12 - arch/x86/include/asm/mach-rdc321x/gpio.h | 60 -- .../include/asm/{mach-default => }/mach_timer.h | 0 .../include/asm/{mach-default => }/mach_traps.h | 0 arch/x86/include/asm/mmu_context.h | 63 ++- arch/x86/include/asm/mmu_context_32.h | 55 -- arch/x86/include/asm/mmu_context_64.h | 54 -- arch/x86/include/asm/mpspec.h | 35 +- arch/x86/include/asm/mpspec_def.h | 23 +- arch/x86/include/asm/numaq.h | 2 + arch/x86/include/asm/numaq/apic.h | 142 ---- arch/x86/include/asm/numaq/apicdef.h | 14 - arch/x86/include/asm/numaq/ipi.h | 22 - arch/x86/include/asm/numaq/mpparse.h | 6 - arch/x86/include/asm/numaq/wakecpu.h | 45 -- arch/x86/include/asm/page.h | 152 +---- arch/x86/include/asm/page_32.h | 87 +--- arch/x86/include/asm/page_32_types.h | 62 ++ arch/x86/include/asm/page_64.h | 101 +--- arch/x86/include/asm/page_64.h.rej | 114 +++ arch/x86/include/asm/page_64_types.h | 91 +++ arch/x86/include/asm/page_types.h | 63 ++ arch/x86/include/asm/paravirt.h | 465 ++++++++---- arch/x86/include/asm/pat.h | 4 - .../include/asm/{mach-default => }/pci-functions.h | 0 arch/x86/include/asm/pda.h | 137 ---- arch/x86/include/asm/percpu.h | 169 ++--- arch/x86/include/asm/pgtable-2level-defs.h | 20 - arch/x86/include/asm/pgtable-2level.h | 2 - arch/x86/include/asm/pgtable-2level_types.h | 35 + arch/x86/include/asm/pgtable-3level.h | 35 - ...gtable-3level-defs.h => pgtable-3level_types.h} | 18 + arch/x86/include/asm/pgtable.h | 507 +++++++------- arch/x86/include/asm/pgtable_32.h | 88 +--- arch/x86/include/asm/pgtable_32_types.h | 46 ++ arch/x86/include/asm/pgtable_64.h | 113 +--- arch/x86/include/asm/pgtable_64_types.h | 62 ++ arch/x86/include/asm/pgtable_types.h | 322 ++++++++ arch/x86/include/asm/prctl.h | 4 - arch/x86/include/asm/processor.h | 29 +- arch/x86/include/asm/proto.h | 4 - arch/x86/include/asm/ptrace.h | 4 +- .../include/asm/{mach-rdc321x => }/rdc321x_defs.h | 0 arch/x86/include/asm/segment.h | 9 +- arch/x86/include/asm/setup.h | 52 +- .../include/asm/{mach-default => }/setup_arch.h | 0 arch/x86/include/asm/smp.h | 69 +-- .../include/asm/{mach-default => }/smpboot_hooks.h | 6 +- arch/x86/include/asm/spinlock.h | 69 +-- arch/x86/include/asm/stackprotector.h | 124 +++ arch/x86/include/asm/summit/apic.h | 202 ----- arch/x86/include/asm/summit/apicdef.h | 13 - arch/x86/include/asm/summit/ipi.h | 26 - arch/x86/include/asm/summit/mpparse.h | 109 --- arch/x86/include/asm/syscalls.h | 21 +- arch/x86/include/asm/system.h | 67 ++- arch/x86/include/asm/thread_info.h | 21 +- arch/x86/include/asm/tlbflush.h | 17 +- arch/x86/include/asm/topology.h | 31 +- arch/x86/include/asm/trampoline.h | 1 + arch/x86/include/asm/traps.h | 2 +- arch/x86/include/asm/uaccess.h | 138 ++++- arch/x86/include/asm/uv/uv.h | 36 + arch/x86/include/asm/uv/uv_bau.h | 1 - arch/x86/include/asm/voyager.h | 42 + arch/x86/include/asm/xen/events.h | 6 - arch/x86/kernel/Makefile | 25 +- arch/x86/kernel/acpi/boot.c | 168 ++--- arch/x86/kernel/acpi/sleep.c | 1 + arch/x86/kernel/apic.c | 201 +++-- arch/x86/kernel/apm_32.c | 2 +- arch/x86/kernel/asm-offsets_32.c | 1 + arch/x86/kernel/asm-offsets_64.c | 11 - arch/x86/kernel/bigsmp_32.c | 266 +++++++ arch/x86/kernel/cpu/addon_cpuid_features.c | 54 +-- arch/x86/kernel/cpu/amd.c | 2 +- arch/x86/kernel/cpu/common.c | 251 ++++--- arch/x86/kernel/cpu/intel.c | 14 +- arch/x86/kernel/cpu/intel_cacheinfo.c | 63 ++- arch/x86/kernel/cpu/mcheck/mce_amd_64.c | 21 +- arch/x86/kernel/cpu/mcheck/mce_intel_64.c | 1 + arch/x86/kernel/crash.c | 4 +- arch/x86/kernel/dumpstack.c | 2 +- arch/x86/kernel/dumpstack_64.c | 35 +- arch/x86/kernel/early_printk.c | 2 +- arch/x86/kernel/efi.c | 2 + arch/x86/kernel/efi_64.c | 1 + arch/x86/kernel/entry_32.S | 451 +++++++---- arch/x86/kernel/entry_64.S | 47 +- arch/x86/kernel/es7000_32.c | 477 +++++++++++- arch/x86/kernel/genapic_64.c | 24 +- arch/x86/kernel/genapic_flat_64.c | 176 +++-- arch/x86/kernel/genx2apic_cluster.c | 133 +++-- arch/x86/kernel/genx2apic_phys.c | 125 ++-- arch/x86/kernel/genx2apic_uv_x.c | 113 ++- arch/x86/kernel/head64.c | 23 - arch/x86/kernel/head_32.S | 40 +- arch/x86/kernel/head_64.S | 19 +- arch/x86/kernel/io_apic.c | 427 ++++++------ arch/x86/kernel/ioport.c | 3 +- arch/x86/kernel/ipi.c | 176 ++--- arch/x86/kernel/irq.c | 44 +- arch/x86/kernel/irq_32.c | 33 +- arch/x86/kernel/irq_64.c | 43 +- arch/x86/kernel/irqinit_32.c | 23 +- arch/x86/kernel/kgdb.c | 4 +- arch/x86/kernel/machine_kexec_64.c | 82 ++- arch/x86/kernel/microcode_intel.c | 10 +- arch/x86/kernel/module_32.c | 6 +- arch/x86/kernel/module_64.c | 32 +- arch/x86/kernel/mpparse.c | 178 ++--- arch/x86/kernel/msr.c | 2 +- arch/x86/kernel/nmi.c | 12 +- arch/x86/kernel/numaq_32.c | 307 ++++++++- arch/x86/kernel/paravirt-spinlocks.c | 10 - arch/x86/kernel/paravirt.c | 55 +- arch/x86/kernel/paravirt_patch_32.c | 12 + arch/x86/kernel/paravirt_patch_64.c | 15 + arch/x86/kernel/probe_32.c | 411 ++++++++++ arch/x86/kernel/probe_roms_32.c | 2 +- arch/x86/kernel/process.c | 2 +- arch/x86/kernel/process_32.c | 59 +- arch/x86/kernel/process_64.c | 42 +- arch/x86/kernel/ptrace.c | 19 +- arch/x86/kernel/reboot.c | 5 +- arch/x86/kernel/relocate_kernel_64.S | 125 +--- arch/x86/kernel/setup.c | 32 +- arch/x86/kernel/setup_percpu.c | 414 ++--------- arch/x86/kernel/signal.c | 350 ++++----- arch/x86/kernel/smp.c | 15 +- arch/x86/kernel/smpboot.c | 120 +--- arch/x86/kernel/smpcommon.c | 30 - arch/x86/kernel/stacktrace.c | 2 +- arch/x86/kernel/summit_32.c | 416 ++++++++++- arch/x86/kernel/syscall_table_32.S | 20 +- arch/x86/kernel/time_32.c | 2 +- arch/x86/kernel/tlb_32.c | 256 ------- arch/x86/kernel/tlb_uv.c | 72 +- arch/x86/kernel/trampoline_64.S | 19 +- arch/x86/kernel/traps.c | 12 +- arch/x86/kernel/tsc.c | 2 +- arch/x86/kernel/visws_quirks.c | 6 +- arch/x86/kernel/vm86_32.c | 20 +- arch/x86/kernel/vmi_32.c | 9 +- arch/x86/kernel/vmiclock_32.c | 2 +- arch/x86/kernel/vmlinux_32.lds.S | 9 +- arch/x86/kernel/vmlinux_64.lds.S | 35 +- arch/x86/kernel/vsmp_64.c | 12 +- arch/x86/kernel/x8664_ksyms_64.c | 2 - arch/x86/lguest/boot.c | 15 +- arch/x86/mach-default/Makefile | 5 - arch/x86/mach-default/setup.c | 174 ----- arch/x86/mach-generic/Makefile | 11 - arch/x86/mach-generic/bigsmp.c | 60 -- arch/x86/mach-generic/default.c | 27 - arch/x86/mach-generic/es7000.c | 103 --- arch/x86/mach-generic/numaq.c | 53 -- arch/x86/mach-generic/probe.c | 152 ---- arch/x86/mach-generic/summit.c | 40 - arch/x86/mach-rdc321x/Makefile | 5 - arch/x86/mach-rdc321x/gpio.c | 194 ----- arch/x86/mach-rdc321x/platform.c | 69 -- arch/x86/mach-voyager/setup.c | 1 + arch/x86/mach-voyager/voyager_smp.c | 16 +- arch/x86/math-emu/get_address.c | 6 +- arch/x86/mm/Makefile | 2 + arch/x86/mm/extable.c | 6 + arch/x86/mm/fault.c | 467 +++++++----- arch/x86/mm/init_32.c | 135 ++-- arch/x86/mm/ioremap.c | 2 +- arch/x86/mm/mmap.c | 2 +- arch/x86/mm/numa_64.c | 217 ++++++ arch/x86/mm/pat.c | 31 +- arch/x86/mm/srat_64.c | 1 + arch/x86/{kernel/tlb_64.c => mm/tlb.c} | 124 ++-- arch/x86/pci/numaq_32.c | 6 +- arch/x86/pci/pcbios.c | 2 +- arch/x86/vdso/Makefile | 2 +- arch/x86/xen/Makefile | 3 +- arch/x86/xen/enlighten.c | 789 +------------------- arch/x86/xen/irq.c | 39 +- arch/x86/xen/mmu.c | 750 ++++++++++++++++++- arch/x86/xen/mmu.h | 3 + arch/x86/xen/multicalls.h | 2 +- arch/x86/xen/smp.c | 41 +- arch/x86/xen/suspend.c | 1 + arch/x86/xen/xen-asm.S | 142 ++++ arch/x86/xen/xen-asm.h | 12 + arch/x86/xen/xen-asm_32.S | 343 ++++------ arch/x86/xen/xen-asm_64.S | 252 ++----- arch/x86/xen/xen-ops.h | 10 + arch/xtensa/include/asm/swab.h | 2 +- drivers/acpi/acpica/tbxface.c | 17 +- drivers/acpi/osl.c | 11 +- drivers/acpi/tables.c | 20 +- drivers/base/cpu.c | 2 +- drivers/base/topology.c | 33 +- drivers/clocksource/acpi_pm.c | 2 +- drivers/clocksource/cyclone.c | 2 +- drivers/eisa/Kconfig | 6 +- drivers/firmware/dcdbas.c | 12 +- drivers/firmware/iscsi_ibft.c | 4 +- drivers/gpu/drm/drm_proc.c | 4 +- drivers/input/keyboard/Kconfig | 4 +- drivers/input/mouse/Kconfig | 2 +- drivers/misc/Kconfig | 4 +- drivers/misc/sgi-gru/grufile.c | 18 +- drivers/misc/sgi-xp/xp.h | 24 +- drivers/misc/sgi-xp/xpc_main.c | 2 +- drivers/mtd/nand/Kconfig | 2 +- drivers/net/ne3210.c | 3 +- drivers/net/sfc/efx.c | 17 +- drivers/net/sfc/falcon.c | 24 +- drivers/net/wireless/arlan-main.c | 4 +- drivers/oprofile/buffer_sync.c | 22 +- drivers/oprofile/buffer_sync.h | 4 + drivers/oprofile/oprof.c | 9 +- drivers/pci/dmar.c | 7 +- drivers/pci/intr_remapping.c | 1 + drivers/watchdog/rdc321x_wdt.c | 2 +- drivers/xen/events.c | 251 +++++-- drivers/xen/manage.c | 2 +- include/acpi/acpiosxf.h | 1 + include/acpi/acpixf.h | 4 + include/asm-frv/swab.h | 2 +- include/asm-generic/percpu.h | 52 ++ include/asm-generic/sections.h | 2 +- include/asm-generic/vmlinux.lds.h | 55 ++- include/asm-m32r/swab.h | 2 +- include/asm-mn10300/swab.h | 2 +- include/linux/acpi.h | 1 + include/linux/coda_psdev.h | 15 +- include/linux/elfcore.h | 9 + include/linux/in6.h | 2 +- include/linux/interrupt.h | 1 + include/linux/irq.h | 86 ++- include/linux/irqnr.h | 1 + include/linux/magic.h | 1 + include/linux/nubus.h | 2 + include/linux/percpu.h | 47 +- include/linux/reiserfs_fs.h | 56 +- include/linux/sched.h | 16 +- include/linux/smp.h | 6 + include/linux/socket.h | 6 +- include/linux/stackprotector.h | 16 + include/linux/topology.h | 6 + include/linux/types.h | 6 +- init/main.c | 19 +- kernel/exit.c | 5 +- kernel/fork.c | 5 + kernel/irq/chip.c | 5 +- kernel/irq/handle.c | 57 +- kernel/irq/internals.h | 7 + kernel/irq/manage.c | 12 +- kernel/irq/migration.c | 12 +- kernel/irq/numa_migrate.c | 19 +- kernel/irq/proc.c | 4 +- kernel/kexec.c | 2 +- kernel/panic.c | 8 +- kernel/sched.c | 7 +- kernel/sched_rt.c | 32 +- kernel/softirq.c | 5 + scripts/gcc-x86_32-has-stack-protector.sh | 8 + scripts/gcc-x86_64-has-stack-protector.sh | 6 +- scripts/headers_check.pl | 2 +- scripts/mod/modpost.c | 5 +- sound/drivers/Kconfig | 2 +- 381 files changed, 11131 insertions(+), 10221 deletions(-) create mode 100644 arch/ia64/include/asm/uv/uv.h create mode 100644 arch/x86/include/asm/apicnum.h rename arch/x86/include/asm/{mach-default => }/apm.h (100%) delete mode 100644 arch/x86/include/asm/bigsmp/apic.h delete mode 100644 arch/x86/include/asm/bigsmp/apicdef.h delete mode 100644 arch/x86/include/asm/bigsmp/ipi.h create mode 100644 arch/x86/include/asm/cpumask.h rename arch/x86/include/asm/{mach-default => }/do_timer.h (100%) create mode 100644 arch/x86/include/asm/entry_arch.h delete mode 100644 arch/x86/include/asm/es7000/apic.h delete mode 100644 arch/x86/include/asm/es7000/apicdef.h delete mode 100644 arch/x86/include/asm/es7000/ipi.h delete mode 100644 arch/x86/include/asm/es7000/mpparse.h delete mode 100644 arch/x86/include/asm/es7000/wakecpu.h delete mode 100644 arch/x86/include/asm/genapic_32.h delete mode 100644 arch/x86/include/asm/genapic_64.h delete mode 100644 arch/x86/include/asm/hardirq_32.h delete mode 100644 arch/x86/include/asm/hardirq_64.h delete mode 100644 arch/x86/include/asm/irq_regs_32.h delete mode 100644 arch/x86/include/asm/irq_regs_64.h delete mode 100644 arch/x86/include/asm/mach-default/entry_arch.h delete mode 100644 arch/x86/include/asm/mach-default/mach_apic.h delete mode 100644 arch/x86/include/asm/mach-default/mach_apicdef.h delete mode 100644 arch/x86/include/asm/mach-default/mach_ipi.h delete mode 100644 arch/x86/include/asm/mach-default/mach_mpparse.h delete mode 100644 arch/x86/include/asm/mach-default/mach_mpspec.h delete mode 100644 arch/x86/include/asm/mach-default/mach_wakecpu.h delete mode 100644 arch/x86/include/asm/mach-generic/gpio.h delete mode 100644 arch/x86/include/asm/mach-generic/mach_apic.h delete mode 100644 arch/x86/include/asm/mach-generic/mach_apicdef.h delete mode 100644 arch/x86/include/asm/mach-generic/mach_ipi.h delete mode 100644 arch/x86/include/asm/mach-generic/mach_mpparse.h delete mode 100644 arch/x86/include/asm/mach-generic/mach_mpspec.h delete mode 100644 arch/x86/include/asm/mach-generic/mach_wakecpu.h delete mode 100644 arch/x86/include/asm/mach-rdc321x/gpio.h rename arch/x86/include/asm/{mach-default => }/mach_timer.h (100%) rename arch/x86/include/asm/{mach-default => }/mach_traps.h (100%) delete mode 100644 arch/x86/include/asm/mmu_context_32.h delete mode 100644 arch/x86/include/asm/mmu_context_64.h delete mode 100644 arch/x86/include/asm/numaq/apic.h delete mode 100644 arch/x86/include/asm/numaq/apicdef.h delete mode 100644 arch/x86/include/asm/numaq/ipi.h delete mode 100644 arch/x86/include/asm/numaq/mpparse.h delete mode 100644 arch/x86/include/asm/numaq/wakecpu.h create mode 100644 arch/x86/include/asm/page_32_types.h create mode 100644 arch/x86/include/asm/page_64.h.rej create mode 100644 arch/x86/include/asm/page_64_types.h create mode 100644 arch/x86/include/asm/page_types.h rename arch/x86/include/asm/{mach-default => }/pci-functions.h (100%) delete mode 100644 arch/x86/include/asm/pda.h delete mode 100644 arch/x86/include/asm/pgtable-2level-defs.h create mode 100644 arch/x86/include/asm/pgtable-2level_types.h rename arch/x86/include/asm/{pgtable-3level-defs.h => pgtable-3level_types.h} (67%) create mode 100644 arch/x86/include/asm/pgtable_32_types.h create mode 100644 arch/x86/include/asm/pgtable_64_types.h create mode 100644 arch/x86/include/asm/pgtable_types.h rename arch/x86/include/asm/{mach-rdc321x => }/rdc321x_defs.h (100%) rename arch/x86/include/asm/{mach-default => }/setup_arch.h (100%) rename arch/x86/include/asm/{mach-default => }/smpboot_hooks.h (83%) create mode 100644 arch/x86/include/asm/stackprotector.h delete mode 100644 arch/x86/include/asm/summit/apic.h delete mode 100644 arch/x86/include/asm/summit/apicdef.h delete mode 100644 arch/x86/include/asm/summit/ipi.h delete mode 100644 arch/x86/include/asm/summit/mpparse.h create mode 100644 arch/x86/include/asm/uv/uv.h create mode 100644 arch/x86/kernel/bigsmp_32.c create mode 100644 arch/x86/kernel/probe_32.c delete mode 100644 arch/x86/kernel/smpcommon.c delete mode 100644 arch/x86/kernel/tlb_32.c delete mode 100644 arch/x86/mach-default/Makefile delete mode 100644 arch/x86/mach-default/setup.c delete mode 100644 arch/x86/mach-generic/Makefile delete mode 100644 arch/x86/mach-generic/bigsmp.c delete mode 100644 arch/x86/mach-generic/default.c delete mode 100644 arch/x86/mach-generic/es7000.c delete mode 100644 arch/x86/mach-generic/numaq.c delete mode 100644 arch/x86/mach-generic/probe.c delete mode 100644 arch/x86/mach-generic/summit.c delete mode 100644 arch/x86/mach-rdc321x/Makefile delete mode 100644 arch/x86/mach-rdc321x/gpio.c delete mode 100644 arch/x86/mach-rdc321x/platform.c rename arch/x86/{kernel/tlb_64.c => mm/tlb.c} (67%) create mode 100644 arch/x86/xen/xen-asm.S create mode 100644 arch/x86/xen/xen-asm.h create mode 100644 include/linux/stackprotector.h create mode 100644 scripts/gcc-x86_32-has-stack-protector.sh Merging xtensa/master $ git merge xtensa/master Already up-to-date. Merging quilt/driver-core $ git merge quilt/driver-core Recorded preimage for 'drivers/sh/maple/maple.c' Auto-merging Documentation/kernel-parameters.txt Auto-merging drivers/input/serio/ambakmi.c Auto-merging drivers/sh/maple/maple.c CONFLICT (content): Merge conflict in drivers/sh/maple/maple.c Auto-merging drivers/spi/pxa2xx_spi.c Auto-merging include/asm-generic/vmlinux.lds.h Removing include/linux/dynamic_printk.h Auto-merging init/main.c Auto-merging lib/Kconfig.debug Removing lib/dynamic_printk.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'drivers/sh/maple/maple.c'. [master]: created 2ffe832: "Merge branch 'quilt/driver-core'" $ git diff -M --stat --summary HEAD^.. Documentation/DocBook/uio-howto.tmpl | 29 +- Documentation/dynamic-debug-howto.txt | 240 ++++++++++ Documentation/kernel-parameters.txt | 5 - arch/mips/basler/excite/excite_iodev.c | 27 +- arch/powerpc/platforms/ps3/system-bus.c | 4 +- drivers/amba/bus.c | 4 +- drivers/base/base.h | 31 ++ drivers/base/bus.c | 44 ++- drivers/base/core.c | 87 +++-- drivers/base/dd.c | 40 +- drivers/base/driver.c | 15 +- drivers/base/platform.c | 44 ++- drivers/block/floppy.c | 3 +- drivers/char/tpm/tpm_atmel.c | 28 +- drivers/char/tpm/tpm_tis.c | 28 +- drivers/dio/dio.c | 4 +- drivers/dma/dw_dmac.c | 2 +- drivers/edac/cell_edac.c | 2 +- drivers/edac/mpc85xx_edac.c | 2 +- drivers/edac/mv64x60_edac.c | 8 +- drivers/eisa/eisa-bus.c | 4 +- drivers/gpio/bt8xxgpio.c | 2 +- drivers/gpu/drm/drm_sysfs.c | 4 +- drivers/ide/au1xxx-ide.c | 36 +- drivers/isdn/gigaset/ser-gigaset.c | 3 +- drivers/mca/mca-bus.c | 4 +- drivers/media/radio/radio-tea5764.c | 3 +- drivers/media/video/v4l2-device.c | 2 +- drivers/mfd/mcp-core.c | 2 +- drivers/mfd/ucb1x00-core.c | 2 +- drivers/mmc/host/atmel-mci.c | 2 +- drivers/mmc/host/of_mmc_spi.c | 2 +- drivers/mtd/maps/pxa2xx-flash.c | 37 +- drivers/mtd/nand/excite_nandflash.c | 25 +- drivers/mtd/nand/ndfc.c | 2 +- drivers/mtd/onenand/generic.c | 26 +- drivers/net/arm/ks8695net.c | 2 +- drivers/net/au1000_eth.c | 8 +- drivers/net/bfin_mac.c | 12 +- drivers/net/bmac.c | 2 +- drivers/net/cpmac.c | 2 +- drivers/net/declance.c | 6 +- drivers/net/depca.c | 6 +- drivers/net/ehea/ehea_main.c | 2 +- drivers/net/jazzsonic.c | 6 +- drivers/net/macb.c | 10 +- drivers/net/macsonic.c | 15 +- drivers/net/mipsnet.c | 26 +- drivers/net/mv643xx_eth.c | 2 +- drivers/net/sb1250-mac.c | 10 +- drivers/net/smc911x.c | 2 +- drivers/net/smc91x.c | 2 +- drivers/net/smsc911x.c | 7 +- drivers/net/smsc9420.c | 4 +- drivers/net/tc35815.c | 4 +- drivers/net/wimax/i2400m/driver.c | 2 +- drivers/net/wimax/i2400m/usb-notif.c | 2 +- drivers/net/xtsonic.c | 2 +- drivers/parisc/dino.c | 11 +- drivers/pci/hotplug/cpqphp_sysfs.c | 3 +- drivers/pcmcia/au1000_generic.c | 37 +- drivers/pcmcia/i82365.c | 28 +- drivers/pcmcia/m32r_cfc.c | 30 +- drivers/pcmcia/m32r_pcc.c | 30 +- drivers/pcmcia/rsrc_mgr.c | 2 +- drivers/pcmcia/sa1100_generic.c | 38 ++- drivers/pcmcia/tcic.c | 30 +- drivers/pcmcia/vrc4171_card.c | 34 +- drivers/rapidio/rio-driver.c | 2 +- drivers/rtc/rtc-at91sam9.c | 4 +- drivers/rtc/rtc-omap.c | 4 +- drivers/rtc/rtc-twl4030.c | 2 +- drivers/s390/net/qeth_l3_main.c | 2 +- drivers/scsi/a4000t.c | 26 +- drivers/scsi/bvme6000_scsi.c | 26 +- drivers/scsi/mvme16x_scsi.c | 26 +- drivers/serial/sunzilog.c | 4 +- drivers/spi/atmel_spi.c | 8 +- drivers/spi/mpc52xx_psc_spi.c | 2 +- drivers/spi/omap2_mcspi.c | 2 +- drivers/spi/omap_uwire.c | 12 +- drivers/spi/orion_spi.c | 2 +- drivers/spi/pxa2xx_spi.c | 4 +- drivers/spi/spi_bfin5xx.c | 4 +- drivers/spi/spi_gpio.c | 2 +- drivers/spi/spi_imx.c | 5 +- drivers/spi/spi_mpc83xx.c | 4 +- drivers/spi/spi_txx9.c | 3 +- drivers/tc/tc.c | 8 +- drivers/uio/Kconfig | 18 + drivers/uio/Makefile | 1 + drivers/uio/uio.c | 25 +- drivers/uio/uio_aec.c | 175 +++++++ drivers/usb/gadget/ci13xxx_udc.c | 2 +- drivers/usb/gadget/imx_udc.c | 4 +- drivers/usb/host/fhci-dbg.c | 2 +- drivers/usb/host/fhci-hcd.c | 4 +- drivers/video/au1100fb.c | 31 +- drivers/video/au1200fb.c | 25 +- drivers/video/pmag-ba-fb.c | 17 +- drivers/video/pmagb-b-fb.c | 17 +- drivers/video/ps3fb.c | 2 +- drivers/video/sh_mobile_lcdcfb.c | 2 +- drivers/video/tmiofb.c | 2 +- drivers/watchdog/rm9k_wdt.c | 27 +- drivers/zorro/zorro.c | 4 +- fs/sysfs/dir.c | 32 ++- fs/sysfs/inode.c | 17 + fs/sysfs/mount.c | 6 +- fs/sysfs/sysfs.h | 1 + include/asm-generic/vmlinux.lds.h | 15 +- include/linux/device.h | 15 +- include/linux/dynamic_debug.h | 88 ++++ include/linux/dynamic_printk.h | 93 ---- include/linux/init.h | 1 + include/linux/kernel.h | 4 +- include/linux/kobject.h | 2 + include/linux/mod_devicetable.h | 9 + include/linux/platform_device.h | 6 + include/linux/uio_driver.h | 4 + include/linux/wimax/debug.h | 2 +- init/main.c | 9 + kernel/module.c | 25 +- lib/Kconfig.debug | 74 ++-- lib/Makefile | 2 +- lib/dynamic_debug.c | 769 +++++++++++++++++++++++++++++++ lib/dynamic_printk.c | 414 ----------------- lib/kobject.c | 52 ++- net/netfilter/nf_conntrack_pptp.c | 2 +- scripts/Makefile.lib | 2 +- scripts/mod/file2alias.c | 12 + 131 files changed, 2263 insertions(+), 1083 deletions(-) create mode 100644 Documentation/dynamic-debug-howto.txt create mode 100644 drivers/uio/uio_aec.c create mode 100644 include/linux/dynamic_debug.h delete mode 100644 include/linux/dynamic_printk.h create mode 100644 lib/dynamic_debug.c delete mode 100644 lib/dynamic_printk.c Merging quilt/usb $ git merge quilt/usb Removing drivers/usb/storage/alauda.h Removing drivers/usb/storage/datafab.h Removing drivers/usb/storage/jumpshot.h Removing drivers/usb/storage/karma.h Removing drivers/usb/storage/onetouch.h Removing drivers/usb/storage/sddr09.h Removing drivers/usb/storage/shuttle_usbat.h Merge made by recursive. Documentation/usb/usbmon.txt | 27 +- drivers/block/ub.c | 11 +- drivers/usb/Makefile | 1 + drivers/usb/class/usblp.c | 11 +- drivers/usb/core/devices.c | 2 +- drivers/usb/core/devio.c | 3 +- drivers/usb/core/endpoint.c | 9 +- drivers/usb/core/hcd.c | 2 +- drivers/usb/core/hub.c | 9 +- drivers/usb/core/urb.c | 2 +- drivers/usb/gadget/Kconfig | 1 + drivers/usb/gadget/amd5536udc.c | 2 +- drivers/usb/gadget/atmel_usba_udc.c | 20 +- drivers/usb/gadget/cdc2.c | 8 +- drivers/usb/gadget/ci13xxx_udc.c | 1 - drivers/usb/gadget/composite.c | 5 +- drivers/usb/gadget/dummy_hcd.c | 2 +- drivers/usb/gadget/epautoconf.c | 2 +- drivers/usb/gadget/ether.c | 8 +- drivers/usb/gadget/f_acm.c | 10 +- drivers/usb/gadget/f_ecm.c | 16 +- drivers/usb/gadget/f_loopback.c | 4 +- drivers/usb/gadget/f_obex.c | 8 +- drivers/usb/gadget/f_phonet.c | 8 +- drivers/usb/gadget/f_rndis.c | 10 +- drivers/usb/gadget/f_serial.c | 4 +- drivers/usb/gadget/f_sourcesink.c | 4 +- drivers/usb/gadget/f_subset.c | 14 +- drivers/usb/gadget/file_storage.c | 22 +- drivers/usb/gadget/fsl_usb2_udc.c | 8 +- drivers/usb/gadget/gmidi.c | 16 +- drivers/usb/gadget/goku_udc.c | 8 +- drivers/usb/gadget/imx_udc.c | 244 ++++++++----- drivers/usb/gadget/imx_udc.h | 49 ++- drivers/usb/gadget/inode.c | 4 +- drivers/usb/gadget/lh7a40x_udc.c | 16 +- drivers/usb/gadget/net2280.c | 16 +- drivers/usb/gadget/printer.c | 18 +- drivers/usb/gadget/pxa27x_udc.c | 218 ++++++++++- drivers/usb/gadget/pxa27x_udc.h | 10 + drivers/usb/gadget/serial.c | 12 +- drivers/usb/gadget/u_serial.c | 2 +- drivers/usb/gadget/zero.c | 8 +- drivers/usb/host/Kconfig | 7 +- drivers/usb/host/ehci-hcd.c | 36 ++ drivers/usb/host/ehci-q.c | 32 ++ drivers/usb/host/ehci-sched.c | 2 +- drivers/usb/host/ehci.h | 39 +-- drivers/usb/host/isp116x.h | 8 +- drivers/usb/host/isp1760-hcd.c | 11 +- drivers/usb/host/isp1760-hcd.h | 7 +- drivers/usb/host/isp1760-if.c | 95 ++++- drivers/usb/host/oxu210hp-hcd.c | 22 +- drivers/usb/host/oxu210hp.h | 8 +- drivers/usb/host/pci-quirks.c | 2 +- drivers/usb/host/r8a66597-hcd.c | 15 +- drivers/usb/host/uhci-hcd.h | 10 +- drivers/usb/host/uhci-q.c | 10 +- drivers/usb/image/mdc800.c | 8 +- drivers/usb/mon/mon_bin.c | 142 ++++++-- drivers/usb/musb/Kconfig | 6 +- drivers/usb/musb/davinci.c | 63 +++- drivers/usb/musb/davinci.h | 23 +- drivers/usb/musb/musb_core.c | 2 +- drivers/usb/musb/musb_core.h | 5 +- drivers/usb/musb/musb_host.c | 140 +++++--- drivers/usb/musb/musb_virthub.c | 2 +- drivers/usb/otg/Kconfig | 10 +- drivers/usb/otg/Makefile | 1 + drivers/usb/otg/gpio_vbus.c | 42 ++- drivers/usb/otg/nop-usb-xceiv.c | 180 +++++++++ drivers/usb/otg/twl4030-usb.c | 73 ++++- drivers/usb/serial/Kconfig | 18 + drivers/usb/serial/Makefile | 2 + drivers/usb/serial/ch341.c | 396 ++++++++++++++++---- drivers/usb/serial/ftdi_sio.c | 27 +- drivers/usb/serial/generic.c | 9 +- drivers/usb/serial/keyspan.c | 2 +- drivers/usb/serial/opticon.c | 215 +++++++++++- drivers/usb/serial/option.c | 86 ++++- drivers/usb/serial/qcserial.c | 145 +++++++ drivers/usb/serial/symbolserial.c | 340 +++++++++++++++++ drivers/usb/serial/usb-serial.c | 20 +- drivers/usb/storage/Kconfig | 48 ++- drivers/usb/storage/Makefile | 41 ++- drivers/usb/storage/alauda.c | 188 +++++++++- drivers/usb/storage/alauda.h | 100 ----- drivers/usb/storage/cypress_atacb.c | 103 +++++- drivers/usb/storage/datafab.c | 100 +++++- drivers/usb/storage/datafab.h | 40 -- drivers/usb/storage/freecom.c | 95 +++++- drivers/usb/storage/isd200.c | 94 +++++- drivers/usb/storage/jumpshot.c | 99 +++++- drivers/usb/storage/jumpshot.h | 39 -- drivers/usb/storage/karma.c | 96 +++++- drivers/usb/storage/karma.h | 7 - drivers/usb/storage/libusual.c | 33 +-- drivers/usb/storage/onetouch.c | 90 +++++- drivers/usb/storage/onetouch.h | 9 - drivers/usb/storage/protocol.c | 3 + drivers/usb/storage/scsiglue.c | 2 +- drivers/usb/storage/sddr09.c | 144 ++++++- drivers/usb/storage/sddr09.h | 38 -- drivers/usb/storage/sddr55.c | 96 +++++- drivers/usb/storage/shuttle_usbat.c | 199 +++++++++- drivers/usb/storage/shuttle_usbat.h | 123 ------ drivers/usb/storage/transport.c | 10 + .../usb/storage/{freecom.h => unusual_alauda.h} | 29 +- .../usb/storage/{sddr55.h => unusual_cypress.h} | 28 +- drivers/usb/storage/unusual_datafab.h | 98 +++++ drivers/usb/storage/unusual_devs.h | 307 +--------------- .../storage/{cypress_atacb.h => unusual_freecom.h} | 19 +- drivers/usb/storage/unusual_isd200.h | 57 +++ .../usb/storage/{sddr55.h => unusual_jumpshot.h} | 23 +- drivers/usb/storage/{isd200.h => unusual_karma.h} | 21 +- .../usb/storage/{sddr55.h => unusual_onetouch.h} | 30 +- drivers/usb/storage/unusual_sddr09.h | 56 +++ drivers/usb/storage/unusual_sddr55.h | 44 +++ drivers/usb/storage/unusual_usbat.h | 43 +++ drivers/usb/storage/usb.c | 344 ++++++------------ drivers/usb/storage/usb.h | 21 + drivers/usb/storage/usual-tables.c | 116 ++++++ drivers/usb/usb-skeleton.c | 6 +- drivers/usb/wusbcore/devconnect.c | 2 + drivers/usb/wusbcore/security.c | 2 + include/linux/usb.h | 180 --------- include/linux/usb/ch9.h | 181 +++++++++- include/linux/usb/gadget.h | 6 +- include/linux/usb/otg.h | 8 + include/linux/usb/serial.h | 3 +- include/linux/usb_usual.h | 21 +- 131 files changed, 4625 insertions(+), 1933 deletions(-) create mode 100644 drivers/usb/otg/nop-usb-xceiv.c create mode 100644 drivers/usb/serial/qcserial.c create mode 100644 drivers/usb/serial/symbolserial.c delete mode 100644 drivers/usb/storage/alauda.h delete mode 100644 drivers/usb/storage/datafab.h delete mode 100644 drivers/usb/storage/jumpshot.h delete mode 100644 drivers/usb/storage/karma.h delete mode 100644 drivers/usb/storage/onetouch.h delete mode 100644 drivers/usb/storage/sddr09.h delete mode 100644 drivers/usb/storage/shuttle_usbat.h rename drivers/usb/storage/{freecom.h => unusual_alauda.h} (60%) copy drivers/usb/storage/{sddr55.h => unusual_cypress.h} (54%) create mode 100644 drivers/usb/storage/unusual_datafab.h rename drivers/usb/storage/{cypress_atacb.h => unusual_freecom.h} (68%) create mode 100644 drivers/usb/storage/unusual_isd200.h copy drivers/usb/storage/{sddr55.h => unusual_jumpshot.h} (63%) rename drivers/usb/storage/{isd200.h => unusual_karma.h} (63%) rename drivers/usb/storage/{sddr55.h => unusual_onetouch.h} (52%) create mode 100644 drivers/usb/storage/unusual_sddr09.h create mode 100644 drivers/usb/storage/unusual_sddr55.h create mode 100644 drivers/usb/storage/unusual_usbat.h create mode 100644 drivers/usb/storage/usual-tables.c Merging tip-core/auto-core-next $ git merge tip-core/auto-core-next Auto-merging include/linux/kernel.h Auto-merging kernel/Makefile Auto-merging kernel/sched.c Auto-merging lib/Kconfig.debug Auto-merging mm/page_alloc.c Auto-merging mm/vmscan.c Merge made by recursive. Documentation/lockdep-design.txt | 30 ++- include/linux/interrupt.h | 14 + include/linux/kernel.h | 17 ++ include/linux/lockdep.h | 50 +--- include/linux/mutex.h | 5 +- include/linux/sched.h | 21 +- include/linux/timer.h | 93 +++++++- kernel/Makefile | 1 + kernel/fork.c | 8 +- kernel/hung_task.c | 217 ++++++++++++++++ kernel/lockdep.c | 511 +++++++++++++++++++------------------- kernel/lockdep_internals.h | 45 ++++- kernel/lockdep_proc.c | 22 +- kernel/lockdep_states.h | 9 + kernel/mutex-debug.c | 9 +- kernel/mutex-debug.h | 18 +- kernel/mutex.c | 121 ++++++++-- kernel/mutex.h | 22 ++- kernel/sched.c | 71 +++++- kernel/sched_features.h | 1 + kernel/softirq.c | 11 + kernel/softlockup.c | 100 -------- kernel/sysctl.c | 19 ++- kernel/timer.c | 68 +++++- lib/Kconfig.debug | 38 +++ mm/page_alloc.c | 5 + mm/slab.c | 4 + mm/slob.c | 2 + mm/slub.c | 1 + mm/vmscan.c | 2 + 30 files changed, 1041 insertions(+), 494 deletions(-) create mode 100644 kernel/hung_task.c create mode 100644 kernel/lockdep_states.h Merging cpus4096/auto-cpus4096-next $ git merge cpus4096/auto-cpus4096-next Merge made by recursive. arch/x86/kernel/cpu/intel_cacheinfo.c | 18 +++++++++--------- drivers/char/sysrq.c | 2 +- drivers/oprofile/buffer_sync.c | 20 ++++++-------------- drivers/oprofile/buffer_sync.h | 4 ---- drivers/oprofile/oprof.c | 9 +-------- 5 files changed, 17 insertions(+), 36 deletions(-) Merging tracing/auto-tracing-next $ git merge tracing/auto-tracing-next Resolved 'arch/x86/Kconfig' using previous resolution. Auto-merging Documentation/kernel-parameters.txt Auto-merging MAINTAINERS Auto-merging arch/ia64/Kconfig Auto-merging arch/x86/Kconfig CONFLICT (content): Merge conflict in arch/x86/Kconfig Auto-merging arch/x86/kernel/dumpstack.c Auto-merging arch/x86/kernel/process.c Auto-merging arch/x86/mm/init_32.c Removing block/blktrace.c Auto-merging drivers/char/sysrq.c Auto-merging include/linux/sched.h Auto-merging init/main.c Auto-merging kernel/module.c Auto-merging kernel/sched.c Auto-merging kernel/softirq.c Auto-merging mm/slab.c Auto-merging mm/slob.c Auto-merging mm/slub.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master]: created e1cbfe9: "Merge commit 'tracing/auto-tracing-next'" $ git diff -M --stat --summary HEAD^.. Documentation/ABI/testing/debugfs-kmemtrace | 71 ++ Documentation/ftrace.txt | 1134 +++++++++++++------- Documentation/kernel-parameters.txt | 10 + Documentation/sysrq.txt | 2 + Documentation/vm/kmemtrace.txt | 126 +++ MAINTAINERS | 6 + arch/alpha/include/asm/hardirq.h | 13 - arch/avr32/include/asm/hardirq.h | 11 - arch/ia64/Kconfig | 3 + arch/ia64/include/asm/ftrace.h | 28 + arch/ia64/include/asm/hardirq.h | 10 - arch/ia64/kernel/Makefile | 5 + arch/ia64/kernel/entry.S | 100 ++ arch/ia64/kernel/ftrace.c | 206 ++++ arch/ia64/kernel/ia64_ksyms.c | 6 + arch/x86/Kconfig | 1 + arch/x86/include/asm/cacheflush.h | 5 + arch/x86/include/asm/ptrace-abi.h | 3 - arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 4 +- arch/x86/kernel/dumpstack.c | 6 + arch/x86/kernel/ftrace.c | 66 +- arch/x86/kernel/process.c | 5 +- arch/x86/kvm/Kconfig | 3 +- arch/x86/mm/init_32.c | 35 +- arch/x86/mm/init_64.c | 37 +- block/Kconfig | 16 - block/Makefile | 1 - block/blktrace.c | 860 --------------- drivers/char/sysrq.c | 2 +- drivers/oprofile/cpu_buffer.c | 5 +- fs/partitions/check.c | 4 + include/linux/blktrace_api.h | 5 + include/linux/ftrace.h | 102 ++- include/linux/ftrace_irq.h | 2 +- include/linux/hardirq.h | 73 +- include/linux/ring_buffer.h | 22 +- include/linux/sched.h | 2 + include/linux/slab_def.h | 68 +- include/linux/slob_def.h | 9 +- include/linux/slub_def.h | 72 ++- include/trace/kmemtrace.h | 75 ++ include/trace/power.h | 34 + include/trace/workqueue.h | 25 + init/Kconfig | 2 +- init/main.c | 2 + kernel/extable.c | 4 +- kernel/module.c | 2 +- kernel/relay.c | 4 +- kernel/sched.c | 8 +- kernel/softirq.c | 13 +- kernel/trace/Kconfig | 72 ++- kernel/trace/Makefile | 5 + kernel/trace/blktrace.c | 1538 +++++++++++++++++++++++++++ kernel/trace/ftrace.c | 1016 ++++++++++++++---- kernel/trace/kmemtrace.c | 339 ++++++ kernel/trace/ring_buffer.c | 168 ++-- kernel/trace/trace.c | 1533 ++++++++------------------ kernel/trace/trace.h | 130 ++- kernel/trace/trace_boot.c | 36 +- kernel/trace/trace_branch.c | 279 +++--- kernel/trace/trace_functions.c | 369 ++++++- kernel/trace/trace_functions_graph.c | 401 +++++--- kernel/trace/trace_hw_branches.c | 185 +++- kernel/trace/trace_irqsoff.c | 46 +- kernel/trace/trace_mmiotrace.c | 41 +- kernel/trace/trace_nop.c | 5 - kernel/trace/trace_output.c | 919 ++++++++++++++++ kernel/trace/trace_output.h | 62 ++ kernel/trace/trace_power.c | 188 ++-- kernel/trace/trace_sched_switch.c | 15 +- kernel/trace/trace_sched_wakeup.c | 88 +- kernel/trace/trace_selftest.c | 85 ++- kernel/trace/trace_stat.c | 319 ++++++ kernel/trace/trace_stat.h | 31 + kernel/trace/trace_sysprof.c | 21 +- kernel/trace/trace_workqueue.c | 281 +++++ kernel/workqueue.c | 16 +- mm/slab.c | 71 ++- mm/slob.c | 37 +- mm/slub.c | 97 ++- scripts/Makefile.build | 13 +- scripts/recordmcount.pl | 37 +- 82 files changed, 8326 insertions(+), 3425 deletions(-) create mode 100644 Documentation/ABI/testing/debugfs-kmemtrace create mode 100644 Documentation/vm/kmemtrace.txt create mode 100644 arch/ia64/include/asm/ftrace.h create mode 100644 arch/ia64/kernel/ftrace.c delete mode 100644 block/blktrace.c create mode 100644 include/trace/kmemtrace.h create mode 100644 include/trace/power.h create mode 100644 include/trace/workqueue.h create mode 100644 kernel/trace/blktrace.c create mode 100644 kernel/trace/kmemtrace.c create mode 100644 kernel/trace/trace_output.c create mode 100644 kernel/trace/trace_output.h create mode 100644 kernel/trace/trace_stat.c create mode 100644 kernel/trace/trace_stat.h create mode 100644 kernel/trace/trace_workqueue.c Merging genirq/auto-genirq-next $ git merge genirq/auto-genirq-next Resolved 'kernel/irq/handle.c' using previous resolution. Auto-merging arch/alpha/kernel/irq.c Auto-merging arch/arm/kernel/irq.c Auto-merging arch/blackfin/kernel/irqchip.c Auto-merging arch/ia64/kernel/irq.c Auto-merging arch/mips/kernel/irq.c Auto-merging arch/parisc/kernel/irq.c Auto-merging arch/powerpc/kernel/irq.c Auto-merging arch/sh/kernel/irq.c Auto-merging arch/sparc/kernel/irq_64.c Auto-merging arch/sparc/kernel/time_64.c Auto-merging drivers/pci/intr_remapping.c Auto-merging include/linux/interrupt.h Auto-merging include/linux/irq.h Auto-merging include/linux/irqnr.h Auto-merging kernel/irq/chip.c Auto-merging kernel/irq/handle.c CONFLICT (content): Merge conflict in kernel/irq/handle.c Auto-merging kernel/irq/internals.h Auto-merging kernel/irq/manage.c Auto-merging kernel/irq/numa_migrate.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master]: created d6ce7cf: "Merge commit 'genirq/auto-genirq-next'" $ git diff -M --stat --summary HEAD^.. arch/alpha/kernel/irq.c | 2 +- arch/alpha/kernel/irq_alpha.c | 2 +- arch/arm/kernel/irq.c | 2 +- arch/arm/mach-ns9xxx/irq.c | 3 +- arch/avr32/kernel/irq.c | 2 +- arch/blackfin/kernel/irqchip.c | 2 +- arch/cris/kernel/irq.c | 2 +- arch/frv/kernel/irq.c | 2 +- arch/h8300/kernel/irq.c | 4 +- arch/ia64/kernel/irq.c | 2 +- arch/m32r/kernel/irq.c | 2 +- arch/mips/kernel/irq.c | 2 +- arch/mn10300/kernel/irq.c | 2 +- arch/parisc/kernel/irq.c | 2 +- arch/powerpc/kernel/irq.c | 2 +- arch/powerpc/platforms/cell/interrupt.c | 2 +- arch/sh/kernel/irq.c | 2 +- arch/sparc/kernel/irq_64.c | 2 +- arch/sparc/kernel/time_64.c | 2 +- arch/um/kernel/irq.c | 2 +- arch/xtensa/kernel/irq.c | 2 +- drivers/char/random.c | 6 +- drivers/pci/intr_remapping.c | 2 +- include/linux/interrupt.h | 6 ++ include/linux/irq.h | 10 +-- include/linux/irqnr.h | 8 ++- include/linux/kernel_stat.h | 13 ++- kernel/irq/chip.c | 7 +- kernel/irq/handle.c | 30 +++++--- kernel/irq/internals.h | 1 + kernel/irq/manage.c | 126 ++++++++++++++++-------------- kernel/irq/numa_migrate.c | 11 +-- kernel/irq/spurious.c | 14 +++- 33 files changed, 157 insertions(+), 122 deletions(-) Merging safe-poison-pointers/auto-safe-poison-pointers-next $ git merge safe-poison-pointers/auto-safe-poison-pointers-next Auto-merging arch/x86/Kconfig Merge made by recursive. arch/x86/Kconfig | 5 +++++ include/linux/poison.h | 16 ++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) Merging sched/auto-sched-next $ git merge sched/auto-sched-next Auto-merging include/linux/sched.h Auto-merging init/Kconfig Auto-merging kernel/sched.c Auto-merging kernel/sched_features.h Auto-merging kernel/sched_rt.c Auto-merging lib/Makefile Merge made by recursive. include/linux/init_task.h | 1 + include/linux/latencytop.h | 10 +- include/linux/plist.h | 9 +- include/linux/sched.h | 7 +- init/Kconfig | 1 - kernel/latencytop.c | 83 ++++++- kernel/sched.c | 131 +++++++++-- kernel/sched_debug.c | 1 + kernel/sched_fair.c | 59 +++++- kernel/sched_features.h | 3 +- kernel/sched_rt.c | 537 ++++++++++++++++++++++++++++++------------- lib/Kconfig | 6 - lib/Makefile | 4 +- 13 files changed, 638 insertions(+), 214 deletions(-) Merging stackprotector/auto-stackprotector-next $ git merge stackprotector/auto-stackprotector-next Already uptodate! Merge made by recursive. Merging timers/auto-timers-next $ git merge timers/auto-timers-next Merge made by recursive. arch/x86/kernel/quirks.c | 3 ++- kernel/time/clockevents.c | 20 +++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) Merging pci/linux-next $ git merge pci/linux-next Resolved 'drivers/pci/pcie/portdrv_pci.c' using previous resolution. Auto-merging Documentation/kernel-parameters.txt Auto-merging drivers/pci/intel-iommu.c Auto-merging drivers/pci/pcie/aer/aerdrv_core.c Auto-merging drivers/pci/pcie/portdrv_pci.c CONFLICT (content): Merge conflict in drivers/pci/pcie/portdrv_pci.c Auto-merging drivers/pci/quirks.c Auto-merging include/linux/acpi.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master]: created 39675c7: "Merge commit 'pci/linux-next'" $ git diff -M --stat --summary HEAD^.. Documentation/kernel-parameters.txt | 2 + arch/alpha/include/asm/pci.h | 14 ++ arch/alpha/kernel/Makefile | 2 +- arch/alpha/kernel/pci-sysfs.c | 366 +++++++++++++++++++++++++++++++++ arch/powerpc/include/asm/pci.h | 4 + arch/x86/include/asm/pci.h | 3 + arch/x86/pci/early.c | 19 +- drivers/acpi/pci_root.c | 180 ++++++++++++++++- drivers/pci/bus.c | 2 +- drivers/pci/hotplug/acpi_pcihp.c | 5 +- drivers/pci/hotplug/pciehp.h | 13 +- drivers/pci/hotplug/pciehp_acpi.c | 21 +-- drivers/pci/hotplug/pciehp_core.c | 18 +-- drivers/pci/hotplug/pciehp_hpc.c | 34 ++-- drivers/pci/hotplug/shpchp.h | 10 +- drivers/pci/hotplug/shpchp_pci.c | 2 +- drivers/pci/intel-iommu.c | 2 +- drivers/pci/msi.c | 71 ++++--- drivers/pci/pci-acpi.c | 215 -------------------- drivers/pci/pci-driver.c | 20 +- drivers/pci/pci-sysfs.c | 19 ++- drivers/pci/pci.c | 50 +++-- drivers/pci/pcie/aer/aerdrv.c | 28 +--- drivers/pci/pcie/aer/aerdrv_acpi.c | 2 +- drivers/pci/pcie/aer/aerdrv_core.c | 10 +- drivers/pci/pcie/portdrv.h | 14 +- drivers/pci/pcie/portdrv_bus.c | 18 +- drivers/pci/pcie/portdrv_core.c | 378 +++++++++++++++++++++++------------ drivers/pci/pcie/portdrv_pci.c | 49 ++--- drivers/pci/quirks.c | 6 +- drivers/pci/remove.c | 3 + drivers/pci/setup-bus.c | 4 +- drivers/pci/slot.c | 18 +- include/linux/acpi.h | 34 +++ include/linux/pci-acpi.h | 46 ----- include/linux/pci.h | 9 +- include/linux/pcieport_if.h | 36 ++-- 37 files changed, 1090 insertions(+), 637 deletions(-) create mode 100644 arch/alpha/kernel/pci-sysfs.c Merging quilt/device-mapper $ git merge quilt/device-mapper Merge made by recursive. drivers/md/dm-io.c | 2 + drivers/md/dm-ioctl.c | 7 ++- drivers/md/dm-target.c | 104 ++++++++++++----------------------------- drivers/md/dm.h | 2 +- include/linux/device-mapper.h | 3 + 5 files changed, 40 insertions(+), 78 deletions(-) Merging hid/for-next $ git merge hid/for-next Auto-merging drivers/hid/hid-core.c Auto-merging drivers/hid/hidraw.c Merge made by recursive. drivers/hid/Kconfig | 6 +- drivers/hid/hid-core.c | 16 ++ drivers/hid/hid-pl.c | 50 ++++- drivers/hid/hidraw.c | 17 ++- drivers/hid/usbhid/hid-core.c | 475 ++++++++++++++++++++++++++++++++--------- drivers/hid/usbhid/hiddev.c | 22 ++- drivers/hid/usbhid/usbhid.h | 14 +- include/linux/hid.h | 7 + 8 files changed, 478 insertions(+), 129 deletions(-) Merging quilt/i2c $ git merge quilt/i2c Resolved 'drivers/i2c/busses/i2c-mpc.c' using previous resolution. Auto-merging drivers/i2c/busses/i2c-mpc.c CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-mpc.c Auto-merging drivers/i2c/busses/i2c-mv64xxx.c Auto-merging include/linux/pci_ids.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master]: created d13182d: "Merge branch 'quilt/i2c'" $ git diff -M --stat --summary HEAD^.. Documentation/i2c/busses/i2c-nforce2 | 11 +- arch/sh/boards/board-sh7785lcr.c | 2 +- drivers/i2c/algos/i2c-algo-bit.c | 4 +- drivers/i2c/algos/i2c-algo-pca.c | 250 ++++++++++++++++++++++++++------ drivers/i2c/algos/i2c-algo-pcf.c | 261 +++++++++++++++------------------ drivers/i2c/busses/Kconfig | 8 +- drivers/i2c/busses/i2c-davinci.c | 8 +- drivers/i2c/busses/i2c-ibm_iic.c | 6 +- drivers/i2c/busses/i2c-iop3xx.c | 2 +- drivers/i2c/busses/i2c-mpc.c | 4 +- drivers/i2c/busses/i2c-mv64xxx.c | 7 +- drivers/i2c/busses/i2c-nforce2.c | 10 +- drivers/i2c/busses/i2c-pca-isa.c | 39 ++++-- drivers/i2c/busses/i2c-pca-platform.c | 48 ++++--- drivers/i2c/busses/i2c-piix4.c | 73 +++++++++- drivers/i2c/busses/i2c-powermac.c | 3 +- drivers/i2c/busses/i2c-pxa.c | 9 +- drivers/i2c/i2c-core.c | 5 + drivers/misc/eeprom/Kconfig | 2 +- include/linux/i2c-algo-pca.h | 33 ++++- include/linux/i2c-pca-platform.h | 2 +- include/linux/pci_ids.h | 3 + 22 files changed, 535 insertions(+), 255 deletions(-) Merging quilt/jdelvare-hwmon $ git merge quilt/jdelvare-hwmon Merge made by recursive. Documentation/hwmon/ds1621 | 51 +--------- Documentation/hwmon/w83627ehf | 29 ++++-- drivers/hwmon/Kconfig | 18 +++- drivers/hwmon/Makefile | 1 + drivers/hwmon/abituguru3.c | 7 +- drivers/hwmon/ds1621.c | 172 +++++++++++++++---------------- drivers/hwmon/hdaps.c | 66 ++++++------ drivers/{i2c/chips => hwmon}/pcf8591.c | 24 ++-- drivers/hwmon/w83627ehf.c | 170 +++++++++++++++++++++++-------- drivers/i2c/chips/Kconfig | 13 --- drivers/i2c/chips/Makefile | 1 - 11 files changed, 300 insertions(+), 252 deletions(-) rename drivers/{i2c/chips => hwmon}/pcf8591.c (96%) Merging quilt/kernel-doc $ git merge quilt/kernel-doc Resolved 'Documentation/kernel-parameters.txt' using previous resolution. Auto-merging Documentation/kernel-parameters.txt CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master]: created ae01423: "Merge branch 'quilt/kernel-doc'" $ git diff -M --stat --summary HEAD^.. Documentation/kernel-parameters.txt | 479 ++++++++++++++++++----------------- 1 files changed, 240 insertions(+), 239 deletions(-) Merging v4l-dvb/master $ git merge v4l-dvb/master Resolved 'drivers/media/video/v4l2-device.c' using previous resolution. Auto-merging drivers/media/video/pxa_camera.c Removing drivers/media/video/saa7111.c Removing drivers/media/video/saa7114.c Removing drivers/media/video/tda9840.h Auto-merging drivers/media/video/uvc/uvc_status.c Auto-merging drivers/media/video/v4l2-device.c CONFLICT (content): Merge conflict in drivers/media/video/v4l2-device.c Auto-merging include/linux/Kbuild Removing include/linux/video_encoder.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master]: created 361684b: "Merge commit 'v4l-dvb/master'" $ git diff -M --stat --summary HEAD^.. Documentation/ioctl/ioctl-number.txt | 1 - Documentation/video4linux/CARDLIST.bttv | 1 + Documentation/video4linux/CARDLIST.cx23885 | 3 + Documentation/video4linux/CARDLIST.em28xx | 9 +- Documentation/video4linux/cx2341x/README.hm12 | 4 + Documentation/video4linux/gspca.txt | 3 + Documentation/video4linux/si470x.txt | 11 +- Documentation/video4linux/v4l2-framework.txt | 144 +- Documentation/video4linux/zr364xx.txt | 1 + arch/arm/plat-mxc/include/mach/mx3_camera.h | 52 + arch/sh/boards/board-ap325rxa.c | 3 +- arch/sh/boards/mach-migor/setup.c | 5 +- drivers/media/Kconfig | 2 +- drivers/media/common/ir-keymaps.c | 146 + drivers/media/common/saa7146_core.c | 15 +- drivers/media/common/saa7146_fops.c | 48 +- drivers/media/common/saa7146_i2c.c | 8 +- drivers/media/common/saa7146_video.c | 1273 ++++---- drivers/media/common/tuners/Kconfig | 8 + drivers/media/common/tuners/Makefile | 1 + drivers/media/common/tuners/mc44s803.c | 371 +++ drivers/media/common/tuners/mc44s803.h | 46 + drivers/media/common/tuners/mc44s803_priv.h | 208 ++ drivers/media/common/tuners/mt2060.c | 2 +- drivers/media/common/tuners/mt20xx.c | 2 +- drivers/media/common/tuners/tda18271-common.c | 6 +- drivers/media/common/tuners/tda827x.c | 183 +- drivers/media/common/tuners/tda8290.c | 8 +- drivers/media/common/tuners/tea5761.c | 2 +- drivers/media/common/tuners/tea5767.c | 2 +- drivers/media/dvb/bt8xx/dst_ca.c | 2 +- drivers/media/dvb/dm1105/dm1105.c | 204 +- drivers/media/dvb/dvb-core/dmxdev.c | 2 +- drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 2 +- drivers/media/dvb/dvb-core/dvb_frontend.c | 2 +- drivers/media/dvb/dvb-core/dvb_net.c | 2 +- drivers/media/dvb/dvb-core/dvbdev.c | 4 +- drivers/media/dvb/dvb-core/dvbdev.h | 2 +- drivers/media/dvb/dvb-usb/Kconfig | 1 + drivers/media/dvb/dvb-usb/af9015.c | 60 +- drivers/media/dvb/dvb-usb/af9015.h | 31 + drivers/media/dvb/dvb-usb/dib0700_core.c | 10 +- drivers/media/dvb/dvb-usb/dib0700_devices.c | 43 +- drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 1 + drivers/media/dvb/frontends/cx24113.c | 2 +- drivers/media/dvb/frontends/cx24116.c | 63 +- drivers/media/dvb/frontends/cx24123.c | 4 +- drivers/media/dvb/frontends/lgdt3304.c | 1 - drivers/media/dvb/frontends/lnbp21.h | 16 +- drivers/media/dvb/frontends/s921_module.c | 1 - drivers/media/dvb/frontends/tda1004x.c | 30 +- drivers/media/dvb/siano/Makefile | 4 +- drivers/media/dvb/siano/sms-cards.c | 92 +- drivers/media/dvb/siano/sms-cards.h | 5 +- drivers/media/dvb/siano/smscoreapi.c | 45 +- drivers/media/dvb/siano/smscoreapi.h | 41 +- drivers/media/dvb/siano/smsdvb.c | 60 +- drivers/media/dvb/siano/smsusb.c | 73 +- drivers/media/dvb/ttpci/av7110.c | 2 +- drivers/media/dvb/ttpci/av7110_av.c | 4 +- drivers/media/dvb/ttpci/av7110_ca.c | 2 +- drivers/media/dvb/ttpci/av7110_v4l.c | 480 ++-- drivers/media/dvb/ttpci/budget-av.c | 88 +- drivers/media/radio/dsbr100.c | 10 +- drivers/media/radio/radio-mr800.c | 221 +- drivers/media/radio/radio-si470x.c | 198 +- drivers/media/video/Kconfig | 51 +- drivers/media/video/Makefile | 7 +- drivers/media/video/adv7170.c | 353 +-- drivers/media/video/adv7175.c | 328 +- drivers/media/video/bt819.c | 479 ++-- drivers/media/video/bt856.c | 291 +- drivers/media/video/bt866.c | 282 +- drivers/media/video/bt8xx/bttv-cards.c | 1290 +++----- drivers/media/video/bt8xx/bttv-driver.c | 90 +- drivers/media/video/bt8xx/bttv-i2c.c | 6 +- drivers/media/video/bt8xx/bttv-if.c | 18 +- drivers/media/video/bt8xx/bttv-risc.c | 4 +- drivers/media/video/bt8xx/bttv-vbi.c | 2 +- drivers/media/video/bt8xx/bttv.h | 81 +- drivers/media/video/bt8xx/bttvp.h | 19 +- drivers/media/video/cs53l32a.c | 1 - drivers/media/video/cx18/cx18-audio.c | 53 +- drivers/media/video/cx18/cx18-audio.h | 2 - drivers/media/video/cx18/cx18-av-core.c | 773 +++-- drivers/media/video/cx18/cx18-av-core.h | 35 +- drivers/media/video/cx18/cx18-av-firmware.c | 16 +- drivers/media/video/cx18/cx18-av-vbi.c | 106 +- drivers/media/video/cx18/cx18-cards.c | 50 +- drivers/media/video/cx18/cx18-cards.h | 18 +- drivers/media/video/cx18/cx18-controls.c | 30 +- drivers/media/video/cx18/cx18-driver.c | 417 ++-- drivers/media/video/cx18/cx18-driver.h | 258 ++- drivers/media/video/cx18/cx18-dvb.c | 2 +- drivers/media/video/cx18/cx18-fileops.c | 107 +- drivers/media/video/cx18/cx18-firmware.c | 22 +- drivers/media/video/cx18/cx18-gpio.c | 319 ++- drivers/media/video/cx18/cx18-gpio.h | 10 +- drivers/media/video/cx18/cx18-i2c.c | 296 +-- drivers/media/video/cx18/cx18-i2c.h | 5 +- drivers/media/video/cx18/cx18-ioctl.c | 273 ++- drivers/media/video/cx18/cx18-mailbox.c | 44 +- drivers/media/video/cx18/cx18-queue.c | 4 +- drivers/media/video/cx18/cx18-queue.h | 4 +- drivers/media/video/cx18/cx18-streams.c | 211 +- drivers/media/video/cx18/cx18-vbi.c | 121 +- drivers/media/video/cx18/cx18-vbi.h | 2 +- drivers/media/video/cx18/cx18-version.h | 4 +- drivers/media/video/cx18/cx18-video.c | 3 +- drivers/media/video/cx18/cx23418.h | 16 + drivers/media/video/cx2341x.c | 196 +- drivers/media/video/cx23885/cx23885-cards.c | 37 + drivers/media/video/cx23885/cx23885-dvb.c | 54 + drivers/media/video/cx23885/cx23885-video.c | 1 + drivers/media/video/cx23885/cx23885.h | 3 + drivers/media/video/cx25840/cx25840-core.c | 19 +- drivers/media/video/cx88/cx88-video.c | 1 + drivers/media/video/dabusb.c | 70 +- drivers/media/video/em28xx/em28xx-audio.c | 77 +- drivers/media/video/em28xx/em28xx-cards.c | 174 +- drivers/media/video/em28xx/em28xx-core.c | 34 +- drivers/media/video/em28xx/em28xx-i2c.c | 6 +- drivers/media/video/em28xx/em28xx-video.c | 54 +- drivers/media/video/em28xx/em28xx.h | 23 +- drivers/media/video/gspca/Kconfig | 18 + drivers/media/video/gspca/Makefile | 100 +- drivers/media/video/gspca/conex.c | 15 +- drivers/media/video/gspca/etoms.c | 36 +- drivers/media/video/gspca/finepix.c | 12 +- drivers/media/video/gspca/gspca.c | 148 +- drivers/media/video/gspca/gspca.h | 13 +- drivers/media/video/gspca/jpeg.h | 283 +- drivers/media/video/gspca/m5602/m5602_core.c | 7 +- drivers/media/video/gspca/mars.c | 453 ++-- drivers/media/video/gspca/mr97310a.c | 378 +++ drivers/media/video/gspca/ov519.c | 7 +- drivers/media/video/gspca/ov534.c | 9 +- drivers/media/video/gspca/pac207.c | 8 +- drivers/media/video/gspca/pac7311.c | 7 +- drivers/media/video/gspca/sonixb.c | 7 +- drivers/media/video/gspca/sonixj.c | 870 ++++-- drivers/media/video/gspca/spca500.c | 48 +- drivers/media/video/gspca/spca501.c | 22 +- drivers/media/video/gspca/spca505.c | 525 ++-- drivers/media/video/gspca/spca506.c | 57 +- drivers/media/video/gspca/spca508.c | 128 +- drivers/media/video/gspca/spca561.c | 192 +- drivers/media/video/gspca/sq905.c | 438 +++ drivers/media/video/gspca/stk014.c | 20 +- drivers/media/video/gspca/stv06xx/stv06xx.c | 7 +- drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c | 76 +- drivers/media/video/gspca/stv06xx/stv06xx_hdcs.h | 65 - drivers/media/video/gspca/stv06xx/stv06xx_pb0100.c | 147 +- drivers/media/video/gspca/stv06xx/stv06xx_pb0100.h | 130 +- drivers/media/video/gspca/stv06xx/stv06xx_sensor.h | 8 - drivers/media/video/gspca/stv06xx/stv06xx_vv6410.c | 123 +- drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h | 58 +- drivers/media/video/gspca/sunplus.c | 73 +- drivers/media/video/gspca/t613.c | 558 ++-- drivers/media/video/gspca/tv8532.c | 483 ++-- drivers/media/video/gspca/vc032x.c | 691 +++-- drivers/media/video/gspca/zc3xx.c | 833 +++--- drivers/media/video/hexium_gemini.c | 292 +- drivers/media/video/hexium_orion.c | 103 +- drivers/media/video/ir-kbd-i2c.c | 64 + drivers/media/video/ivtv/ivtv-controls.c | 1 + drivers/media/video/ivtv/ivtv-driver.c | 93 +- drivers/media/video/ivtv/ivtv-driver.h | 26 +- drivers/media/video/ivtv/ivtv-fileops.c | 10 +- drivers/media/video/ivtv/ivtv-firmware.c | 2 +- drivers/media/video/ivtv/ivtv-gpio.c | 4 +- drivers/media/video/ivtv/ivtv-i2c.c | 14 +- drivers/media/video/ivtv/ivtv-ioctl.c | 20 +- drivers/media/video/ivtv/ivtv-irq.c | 4 +- drivers/media/video/ivtv/ivtv-queue.c | 8 +- drivers/media/video/ivtv/ivtv-queue.h | 8 +- drivers/media/video/ivtv/ivtv-streams.c | 68 +- drivers/media/video/ivtv/ivtv-udma.c | 10 +- drivers/media/video/ivtv/ivtv-udma.h | 4 +- drivers/media/video/ivtv/ivtv-yuv.c | 6 +- drivers/media/video/ivtv/ivtvfb.c | 6 +- drivers/media/video/ks0127.c | 676 ++--- drivers/media/video/ks0127.h | 2 - drivers/media/video/m52790.c | 1 - drivers/media/video/msp3400-driver.c | 26 +- drivers/media/video/mt9m001.c | 2 +- drivers/media/video/mt9m111.c | 8 +- drivers/media/video/mt9t031.c | 127 +- drivers/media/video/mt9v022.c | 2 +- drivers/media/video/mx3_camera.c | 1183 +++++++ drivers/media/video/mxb.c | 827 +++--- drivers/media/video/ov772x.c | 289 +- drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | 12 + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 24 +- drivers/media/video/pvrusb2/pvrusb2-hdw.h | 6 +- .../media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c | 23 +- drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c | 14 + drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h | 1 + drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 2 +- drivers/media/video/pvrusb2/pvrusb2-main.c | 4 +- drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 12 +- drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 14 +- drivers/media/video/pwc/Kconfig | 10 + drivers/media/video/pwc/pwc-if.c | 77 +- drivers/media/video/pwc/pwc.h | 6 + drivers/media/video/pxa_camera.c | 1 + drivers/media/video/s2255drv.c | 41 +- drivers/media/video/saa5246a.c | 70 +- drivers/media/video/saa5249.c | 71 +- drivers/media/video/saa6588.c | 191 +- drivers/media/video/saa7110.c | 472 ++-- drivers/media/video/saa7111.c | 492 --- drivers/media/video/saa7114.c | 1068 ------ drivers/media/video/saa7115.c | 60 +- drivers/media/video/saa7127.c | 1 - drivers/media/video/saa7134/saa6752hs.c | 581 ++-- drivers/media/video/saa7134/saa7134-cards.c | 133 +- drivers/media/video/saa7134/saa7134-core.c | 94 +- drivers/media/video/saa7134/saa7134-dvb.c | 4 +- drivers/media/video/saa7134/saa7134-empress.c | 26 +- drivers/media/video/saa7134/saa7134-i2c.c | 23 +- drivers/media/video/saa7134/saa7134-video.c | 33 +- drivers/media/video/saa7134/saa7134.h | 30 +- drivers/media/video/saa717x.c | 3 +- drivers/media/video/saa7185.c | 239 +- drivers/media/video/sh_mobile_ceu_camera.c | 47 +- drivers/media/video/sn9c102/sn9c102_devtable.h | 2 + drivers/media/video/tcm825x.c | 22 +- drivers/media/video/tcm825x.h | 2 +- drivers/media/video/tda7432.c | 7 +- drivers/media/video/tda9840.c | 82 +- drivers/media/video/tda9840.h | 14 - drivers/media/video/tda9875.c | 4 +- drivers/media/video/tea6415c.c | 53 +- drivers/media/video/tea6415c.h | 12 - drivers/media/video/tea6420.c | 69 +- drivers/media/video/tea6420.h | 27 +- drivers/media/video/tlv320aic23b.c | 1 - drivers/media/video/tvaudio.c | 19 +- drivers/media/video/tveeprom.c | 5 + drivers/media/video/tvp514x.c | 113 +- drivers/media/video/tvp5150.c | 2 - drivers/media/video/tw9910.c | 17 +- drivers/media/video/upd64031a.c | 1 - drivers/media/video/upd64083.c | 1 - drivers/media/video/usbvision/usbvision-core.c | 47 +- drivers/media/video/usbvision/usbvision-i2c.c | 153 +- drivers/media/video/usbvision/usbvision-video.c | 103 +- drivers/media/video/usbvision/usbvision.h | 8 +- drivers/media/video/uvc/uvc_ctrl.c | 2 +- drivers/media/video/uvc/uvc_driver.c | 36 +- drivers/media/video/uvc/uvc_status.c | 16 +- drivers/media/video/uvc/uvc_v4l2.c | 14 +- drivers/media/video/uvc/uvc_video.c | 133 +- drivers/media/video/uvc/uvcvideo.h | 8 +- drivers/media/video/v4l2-common.c | 235 +- drivers/media/video/v4l2-dev.c | 25 +- drivers/media/video/v4l2-device.c | 47 +- drivers/media/video/v4l2-ioctl.c | 3 + drivers/media/video/v4l2-subdev.c | 10 + drivers/media/video/videobuf-dma-contig.c | 2 +- drivers/media/video/videobuf-vmalloc.c | 2 +- drivers/media/video/vivi.c | 491 ++-- drivers/media/video/vp27smpx.c | 1 - drivers/media/video/vpx3220.c | 491 ++-- drivers/media/video/wm8739.c | 1 - drivers/media/video/zc0301/zc0301_sensor.h | 8 + drivers/media/video/zoran/Kconfig | 8 +- drivers/media/video/zoran/videocodec.h | 9 +- drivers/media/video/zoran/zoran.h | 40 +- drivers/media/video/zoran/zoran_card.c | 421 +-- drivers/media/video/zoran/zoran_card.h | 3 +- drivers/media/video/zoran/zoran_device.c | 523 ++-- drivers/media/video/zoran/zoran_device.h | 15 +- drivers/media/video/zoran/zoran_driver.c | 3413 +++++++------------- drivers/media/video/zoran/zoran_procfs.c | 2 +- drivers/media/video/zoran/zr36016.c | 5 - drivers/media/video/zoran/zr36050.c | 4 - drivers/media/video/zoran/zr36060.c | 4 - drivers/media/video/zr364xx.c | 1 + include/linux/Kbuild | 1 - include/linux/video_encoder.h | 23 - include/linux/videodev2.h | 11 +- include/media/cx2341x.h | 6 +- include/media/cx25840.h | 12 + include/media/ir-common.h | 3 + include/media/ov772x.h | 5 + include/media/saa7146.h | 8 + include/media/saa7146_vv.h | 17 +- include/media/sh_mobile_ceu.h | 5 +- include/media/soc_camera.h | 8 +- include/media/v4l2-chip-ident.h | 58 +- include/media/v4l2-common.h | 24 +- include/media/v4l2-device.h | 31 +- include/media/v4l2-subdev.h | 9 +- include/sound/tea575x-tuner.h | 8 +- sound/i2c/other/tea575x-tuner.c | 302 ++- sound/pci/Kconfig | 2 +- 298 files changed, 17955 insertions(+), 15767 deletions(-) create mode 100644 arch/arm/plat-mxc/include/mach/mx3_camera.h create mode 100644 drivers/media/common/tuners/mc44s803.c create mode 100644 drivers/media/common/tuners/mc44s803.h create mode 100644 drivers/media/common/tuners/mc44s803_priv.h create mode 100644 drivers/media/video/gspca/mr97310a.c create mode 100644 drivers/media/video/gspca/sq905.c create mode 100644 drivers/media/video/mx3_camera.c delete mode 100644 drivers/media/video/saa7111.c delete mode 100644 drivers/media/video/saa7114.c delete mode 100644 drivers/media/video/tda9840.h delete mode 100644 include/linux/video_encoder.h Merging quota/for_next $ git merge quota/for_next Auto-merging fs/Kconfig Auto-merging fs/Makefile Auto-merging fs/ext2/super.c Auto-merging fs/ext3/namei.c Auto-merging fs/ext3/super.c Auto-merging fs/ext4/balloc.c Auto-merging fs/ext4/ext4.h Auto-merging fs/ext4/ialloc.c Auto-merging fs/ext4/inode.c Auto-merging fs/ext4/mballoc.c Auto-merging fs/ext4/namei.c Auto-merging fs/ext4/super.c Auto-merging fs/ocfs2/quota_global.c Auto-merging fs/super.c Merge made by recursive. fs/Kconfig | 56 +----- fs/Makefile | 6 +- fs/attr.c | 3 +- fs/ext2/balloc.c | 8 +- fs/ext2/ialloc.c | 10 +- fs/ext2/inode.c | 2 +- fs/ext2/super.c | 1 + fs/ext2/xattr.c | 8 +- fs/ext3/balloc.c | 8 +- fs/ext3/ialloc.c | 12 +- fs/ext3/inode.c | 6 +- fs/ext3/namei.c | 6 +- fs/ext3/super.c | 48 +---- fs/ext3/xattr.c | 6 +- fs/ext4/balloc.c | 2 +- fs/ext4/ext4.h | 2 + fs/ext4/ialloc.c | 12 +- fs/ext4/inode.c | 40 +++- fs/ext4/mballoc.c | 46 ++-- fs/ext4/namei.c | 6 +- fs/ext4/super.c | 54 +---- fs/ext4/xattr.c | 6 +- fs/inode.c | 4 +- fs/jfs/acl.c | 2 +- fs/jfs/inode.c | 6 +- fs/jfs/jfs_dtree.c | 18 +- fs/jfs/jfs_extent.c | 10 +- fs/jfs/jfs_inode.c | 4 +- fs/jfs/jfs_xtree.c | 14 +- fs/jfs/namei.c | 6 +- fs/jfs/xattr.c | 12 +- fs/namei.c | 22 +- fs/nfsd/vfs.c | 4 +- fs/open.c | 2 +- fs/quota/Kconfig | 59 +++++ fs/quota/Makefile | 14 + fs/{ => quota}/dquot.c | 562 +++++++++++++++++++++++++++++-------------- fs/{ => quota}/quota.c | 37 ++- fs/{ => quota}/quota_tree.c | 132 ++++++----- fs/{ => quota}/quota_tree.h | 0 fs/{ => quota}/quota_v1.c | 48 +++-- fs/{ => quota}/quota_v2.c | 3 +- fs/{ => quota}/quotaio_v1.h | 0 fs/{ => quota}/quotaio_v2.h | 0 fs/ramfs/file-nommu.c | 6 - fs/reiserfs/bitmap.c | 14 +- fs/reiserfs/inode.c | 10 +- fs/reiserfs/namei.c | 6 +- fs/reiserfs/stree.c | 14 +- fs/reiserfs/super.c | 60 +----- fs/super.c | 8 +- fs/sync.c | 2 +- fs/udf/balloc.c | 14 +- fs/udf/ialloc.c | 8 +- fs/ufs/balloc.c | 12 +- fs/ufs/ialloc.c | 8 +- include/linux/quota.h | 11 +- include/linux/quotaops.h | 119 ++++++--- 58 files changed, 902 insertions(+), 697 deletions(-) create mode 100644 fs/quota/Kconfig create mode 100644 fs/quota/Makefile rename fs/{ => quota}/dquot.c (85%) rename fs/{ => quota}/quota.c (94%) rename fs/{ => quota}/quota_tree.c (84%) rename fs/{ => quota}/quota_tree.h (100%) rename fs/{ => quota}/quota_v1.c (79%) rename fs/{ => quota}/quota_v2.c (98%) rename fs/{ => quota}/quotaio_v1.h (100%) rename fs/{ => quota}/quotaio_v2.h (100%) Merging jfs/next $ git merge jfs/next Auto-merging fs/jfs/jfs_extent.c Auto-merging fs/jfs/jfs_xtree.c Merge made by recursive. fs/jfs/Kconfig | 1 + fs/jfs/jfs_extent.c | 63 +++++------- fs/jfs/jfs_imap.c | 10 +-- fs/jfs/jfs_metapage.c | 18 +++- fs/jfs/jfs_types.h | 29 ------ fs/jfs/jfs_xtree.c | 263 +------------------------------------------------ fs/jfs/jfs_xtree.h | 2 - fs/jfs/super.c | 4 + 8 files changed, 46 insertions(+), 344 deletions(-) Merging kbuild/master $ git merge kbuild/master Already up-to-date. Merging quilt/ide $ git merge quilt/ide Auto-merging drivers/ide/Kconfig Auto-merging drivers/ide/amd74xx.c Auto-merging drivers/ide/atiixp.c Auto-merging drivers/ide/au1xxx-ide.c Auto-merging drivers/ide/ide-cd.c Auto-merging drivers/ide/ide-cd.h Auto-merging drivers/ide/ide-gd.c Auto-merging drivers/ide/ide-gd.h Auto-merging drivers/ide/ide-tape.c Auto-merging drivers/ide/ide.c Removing drivers/ide/ide_arm.c Auto-merging drivers/ide/it821x.c Removing include/asm-frv/ide.h Removing include/asm-mn10300/ide.h Auto-merging include/linux/ide.h Merge made by recursive. arch/m68k/include/asm/ide.h | 73 ---- drivers/ide/Kconfig | 39 +- drivers/ide/Makefile | 6 +- drivers/ide/aec62xx.c | 4 +- drivers/ide/alim15x3.c | 17 +- drivers/ide/amd74xx.c | 14 +- drivers/ide/atiixp.c | 3 +- drivers/ide/au1xxx-ide.c | 50 +-- drivers/ide/buddha.c | 11 +- drivers/ide/cmd64x.c | 14 +- drivers/ide/cs5520.c | 3 +- drivers/ide/cs5530.c | 2 +- drivers/ide/cs5536.c | 3 +- drivers/ide/delkin_cb.c | 3 +- drivers/ide/dtc2278.c | 3 +- drivers/ide/falconide.c | 45 ++- drivers/ide/gayle.c | 19 +- drivers/ide/hpt366.c | 20 +- drivers/ide/icside.c | 32 +-- drivers/ide/ide-4drives.c | 3 +- drivers/ide/ide-acpi.c | 214 +++-------- drivers/ide/ide-atapi.c | 116 +++++-- drivers/ide/ide-cd.c | 646 ++++++++++++--------------------- drivers/ide/ide-cd.h | 4 +- drivers/ide/ide-cs.c | 1 + drivers/ide/ide-devsets.c | 188 ++++++++++ drivers/ide/ide-disk.c | 171 ++++----- drivers/ide/ide-disk_proc.c | 28 +- drivers/ide/ide-dma-sff.c | 45 +-- drivers/ide/ide-dma.c | 140 ++++++-- drivers/ide/ide-eh.c | 440 ++++++++++++++++++++++ drivers/ide/ide-floppy.c | 161 ++++----- drivers/ide/ide-floppy_ioctl.c | 5 +- drivers/ide/ide-gd.c | 10 +- drivers/ide/ide-gd.h | 4 +- drivers/ide/ide-generic.c | 88 +---- drivers/ide/ide-h8300.c | 66 ++-- drivers/ide/ide-io-std.c | 321 ++++++++++++++++ drivers/ide/ide-io.c | 593 +++++++----------------------- drivers/ide/ide-ioctls.c | 44 ++-- drivers/ide/ide-iops.c | 804 +++------------------------------------- drivers/ide/ide-lib.c | 260 +------------- drivers/ide/ide-park.c | 26 ++ drivers/ide/ide-pci-generic.c | 4 +- drivers/ide/ide-pm.c | 42 ++- drivers/ide/ide-pnp.c | 6 +- drivers/ide/ide-probe.c | 358 +++++------------- drivers/ide/ide-proc.c | 18 +- drivers/ide/ide-tape.c | 127 +++---- drivers/ide/ide-taskfile.c | 500 ++++++++++++-------------- drivers/ide/ide-xfer-mode.c | 246 ++++++++++++ drivers/ide/ide.c | 156 +-------- drivers/ide/ide_arm.c | 49 --- drivers/ide/it821x.c | 5 +- drivers/ide/macide.c | 7 +- drivers/ide/ns87415.c | 64 ++-- drivers/ide/palm_bk3710.c | 13 +- drivers/ide/pdc202xx_new.c | 4 +- drivers/ide/pdc202xx_old.c | 18 +- drivers/ide/piix.c | 13 +- drivers/ide/pmac.c | 40 +-- drivers/ide/q40ide.c | 15 +- drivers/ide/sc1200.c | 6 +- drivers/ide/scc_pata.c | 121 +++---- drivers/ide/serverworks.c | 13 +- drivers/ide/setup-pci.c | 31 +- drivers/ide/sgiioc4.c | 43 +-- drivers/ide/siimage.c | 5 +- drivers/ide/sis5513.c | 4 +- drivers/ide/sl82c105.c | 13 +- drivers/ide/slc90e66.c | 1 - drivers/ide/tc86c001.c | 3 +- drivers/ide/trm290.c | 49 +-- drivers/ide/tx4938ide.c | 68 ++-- drivers/ide/tx4939ide.c | 120 +++---- drivers/ide/via82cxxx.c | 12 +- include/asm-frv/ide.h | 24 -- include/asm-mn10300/ide.h | 39 -- include/asm-mn10300/pci.h | 5 + include/linux/ata.h | 2 - include/linux/hdreg.h | 1 - include/linux/ide.h | 319 ++++++++-------- 82 files changed, 3132 insertions(+), 4171 deletions(-) create mode 100644 drivers/ide/ide-devsets.c create mode 100644 drivers/ide/ide-eh.c create mode 100644 drivers/ide/ide-io-std.c create mode 100644 drivers/ide/ide-xfer-mode.c delete mode 100644 drivers/ide/ide_arm.c delete mode 100644 include/asm-frv/ide.h delete mode 100644 include/asm-mn10300/ide.h Merging libata/NEXT $ git merge libata/NEXT Merge made by recursive. drivers/ata/ahci.c | 4 +- drivers/ata/libata-core.c | 1 + drivers/ata/libata.h | 2 - drivers/ata/pata_rb532_cf.c | 60 +---- drivers/ata/sata_mv.c | 603 ++++++++++++++++++++++++++++++++++++------- include/linux/libata.h | 3 + 6 files changed, 518 insertions(+), 155 deletions(-) Merging nfs/linux-next $ git merge nfs/linux-next Auto-merging fs/Kconfig Auto-merging fs/Makefile Auto-merging fs/ext2/inode.c Auto-merging fs/ext3/inode.c Auto-merging fs/super.c Auto-merging init/Kconfig Auto-merging kernel/Makefile Auto-merging kernel/sysctl.c Auto-merging mm/vmscan.c Merge made by recursive. Documentation/filesystems/caching/backend-api.txt | 658 ++++++++++++++++ Documentation/filesystems/caching/cachefiles.txt | 501 ++++++++++++ Documentation/filesystems/caching/fscache.txt | 333 ++++++++ Documentation/filesystems/caching/netfs-api.txt | 800 +++++++++++++++++++ Documentation/filesystems/caching/object.txt | 313 ++++++++ Documentation/filesystems/caching/operations.txt | 213 +++++ Documentation/slow-work.txt | 174 +++++ fs/Kconfig | 7 + fs/Makefile | 2 + fs/afs/Kconfig | 8 + fs/afs/Makefile | 3 + fs/afs/cache.c | 503 ++++++++----- fs/afs/cache.h | 15 +- fs/afs/cell.c | 16 +- fs/afs/file.c | 220 ++++-- fs/afs/inode.c | 31 +- fs/afs/internal.h | 53 +- fs/afs/main.c | 27 +- fs/afs/mntpt.c | 4 +- fs/afs/vlocation.c | 25 +- fs/afs/volume.c | 14 +- fs/afs/write.c | 21 + fs/cachefiles/Kconfig | 39 + fs/cachefiles/Makefile | 18 + fs/cachefiles/cf-bind.c | 286 +++++++ fs/cachefiles/cf-daemon.c | 754 ++++++++++++++++++ fs/cachefiles/cf-interface.c | 449 +++++++++++ fs/cachefiles/cf-internal.h | 360 +++++++++ fs/cachefiles/cf-key.c | 159 ++++ fs/cachefiles/cf-main.c | 106 +++ fs/cachefiles/cf-namei.c | 772 +++++++++++++++++++ fs/cachefiles/cf-proc.c | 134 ++++ fs/cachefiles/cf-rdwr.c | 853 +++++++++++++++++++++ fs/cachefiles/cf-security.c | 116 +++ fs/cachefiles/cf-xattr.c | 291 +++++++ fs/ext2/inode.c | 2 + fs/ext3/inode.c | 9 +- fs/fscache/Kconfig | 56 ++ fs/fscache/Makefile | 19 + fs/fscache/fsc-cache.c | 415 ++++++++++ fs/fscache/fsc-cookie.c | 498 ++++++++++++ fs/fscache/fsc-fsdef.c | 144 ++++ fs/fscache/fsc-histogram.c | 109 +++ fs/fscache/fsc-internal.h | 380 +++++++++ fs/fscache/fsc-main.c | 124 +++ fs/fscache/fsc-netfs.c | 103 +++ fs/fscache/fsc-object.c | 810 +++++++++++++++++++ fs/fscache/fsc-operation.c | 459 +++++++++++ fs/fscache/fsc-page.c | 771 +++++++++++++++++++ fs/fscache/fsc-proc.c | 68 ++ fs/fscache/fsc-stats.c | 212 +++++ fs/nfs/Kconfig | 8 + fs/nfs/Makefile | 1 + fs/nfs/client.c | 14 +- fs/nfs/file.c | 37 +- fs/nfs/fscache-index.c | 337 ++++++++ fs/nfs/fscache.c | 521 +++++++++++++ fs/nfs/fscache.h | 208 +++++ fs/nfs/inode.c | 17 +- fs/nfs/internal.h | 4 + fs/nfs/iostat.h | 18 + fs/nfs/read.c | 27 +- fs/nfs/super.c | 45 +- fs/splice.c | 3 +- fs/super.c | 1 + include/linux/fs.h | 7 + include/linux/fscache-cache.h | 504 ++++++++++++ include/linux/fscache.h | 592 ++++++++++++++ include/linux/nfs_fs.h | 13 + include/linux/nfs_fs_sb.h | 11 + include/linux/nfs_iostat.h | 12 + include/linux/page-flags.h | 43 +- include/linux/pagemap.h | 21 + include/linux/slow-work.h | 95 +++ init/Kconfig | 12 + kernel/Makefile | 1 + kernel/slow-work.c | 640 ++++++++++++++++ kernel/sysctl.c | 9 + mm/filemap.c | 99 +++ mm/migrate.c | 10 +- mm/readahead.c | 40 +- mm/swap.c | 4 +- mm/truncate.c | 10 +- mm/vmscan.c | 6 +- security/security.c | 2 + 85 files changed, 15435 insertions(+), 394 deletions(-) create mode 100644 Documentation/filesystems/caching/backend-api.txt create mode 100644 Documentation/filesystems/caching/cachefiles.txt create mode 100644 Documentation/filesystems/caching/fscache.txt create mode 100644 Documentation/filesystems/caching/netfs-api.txt create mode 100644 Documentation/filesystems/caching/object.txt create mode 100644 Documentation/filesystems/caching/operations.txt create mode 100644 Documentation/slow-work.txt create mode 100644 fs/cachefiles/Kconfig create mode 100644 fs/cachefiles/Makefile create mode 100644 fs/cachefiles/cf-bind.c create mode 100644 fs/cachefiles/cf-daemon.c create mode 100644 fs/cachefiles/cf-interface.c create mode 100644 fs/cachefiles/cf-internal.h create mode 100644 fs/cachefiles/cf-key.c create mode 100644 fs/cachefiles/cf-main.c create mode 100644 fs/cachefiles/cf-namei.c create mode 100644 fs/cachefiles/cf-proc.c create mode 100644 fs/cachefiles/cf-rdwr.c create mode 100644 fs/cachefiles/cf-security.c create mode 100644 fs/cachefiles/cf-xattr.c create mode 100644 fs/fscache/Kconfig create mode 100644 fs/fscache/Makefile create mode 100644 fs/fscache/fsc-cache.c create mode 100644 fs/fscache/fsc-cookie.c create mode 100644 fs/fscache/fsc-fsdef.c create mode 100644 fs/fscache/fsc-histogram.c create mode 100644 fs/fscache/fsc-internal.h create mode 100644 fs/fscache/fsc-main.c create mode 100644 fs/fscache/fsc-netfs.c create mode 100644 fs/fscache/fsc-object.c create mode 100644 fs/fscache/fsc-operation.c create mode 100644 fs/fscache/fsc-page.c create mode 100644 fs/fscache/fsc-proc.c create mode 100644 fs/fscache/fsc-stats.c create mode 100644 fs/nfs/fscache-index.c create mode 100644 fs/nfs/fscache.c create mode 100644 fs/nfs/fscache.h create mode 100644 include/linux/fscache-cache.h create mode 100644 include/linux/fscache.h create mode 100644 include/linux/slow-work.h create mode 100644 kernel/slow-work.c Merging xfs/master $ git merge xfs/master Auto-merging MAINTAINERS Merge made by recursive. MAINTAINERS | 3 +- fs/xfs/Makefile | 1 + fs/xfs/linux-2.6/xfs_ioctl.c | 116 +++++------- fs/xfs/linux-2.6/xfs_iops.c | 30 +-- fs/xfs/linux-2.6/xfs_linux.h | 11 - fs/xfs/linux-2.6/xfs_quotaops.c | 157 +++++++++++++++ fs/xfs/linux-2.6/xfs_super.c | 107 ++++------- fs/xfs/linux-2.6/xfs_super.h | 1 + fs/xfs/linux-2.6/xfs_sync.h | 1 + fs/xfs/linux-2.6/xfs_vnode.h | 5 - fs/xfs/quota/xfs_dquot.c | 28 ++-- fs/xfs/quota/xfs_dquot.h | 14 +-- fs/xfs/quota/xfs_qm.c | 208 ++++++--------------- fs/xfs/quota/xfs_qm.h | 20 +- fs/xfs/quota/xfs_qm_bhv.c | 1 - fs/xfs/quota/xfs_qm_syscalls.c | 188 +------------------ fs/xfs/quota/xfs_quota_priv.h | 38 ++--- fs/xfs/quota/xfs_trans_dquot.c | 16 +- fs/xfs/xfs_ag.h | 4 +- fs/xfs/xfs_attr_leaf.c | 55 +++--- fs/xfs/xfs_da_btree.c | 2 +- fs/xfs/xfs_da_btree.h | 6 +- fs/xfs/xfs_dfrag.c | 68 ++++---- fs/xfs/xfs_extfree_item.h | 6 - fs/xfs/xfs_ialloc.c | 10 +- fs/xfs/xfs_ialloc_btree.h | 22 +-- fs/xfs/xfs_inode_item.h | 2 - fs/xfs/xfs_log.c | 42 +--- fs/xfs/xfs_log_priv.h | 2 +- fs/xfs/xfs_log_recover.c | 4 +- fs/xfs/xfs_mount.c | 84 ++++----- fs/xfs/xfs_mount.h | 9 +- fs/xfs/xfs_qmops.c | 1 - fs/xfs/xfs_quota.h | 3 +- fs/xfs/xfs_rtalloc.c | 10 + fs/xfs/xfs_rtalloc.h | 4 + fs/xfs/xfs_trans.h | 12 +- fs/xfs/xfs_trans_space.h | 2 +- fs/xfs/xfs_types.h | 8 - fs/xfs/xfs_vnodeops.c | 402 +++++++++------------------------------ fs/xfs/xfs_vnodeops.h | 3 - 41 files changed, 605 insertions(+), 1101 deletions(-) create mode 100644 fs/xfs/linux-2.6/xfs_quotaops.c Merging infiniband/for-next $ git merge infiniband/for-next Merge made by recursive. drivers/infiniband/core/cm.c | 15 ++-- drivers/infiniband/core/cm_msgs.h | 22 +++--- drivers/infiniband/core/device.c | 4 +- drivers/infiniband/core/mad.c | 28 ++++---- drivers/infiniband/core/mad_rmpp.c | 2 +- drivers/infiniband/core/sysfs.c | 3 + drivers/infiniband/hw/amso1100/c2.c | 20 +++-- drivers/infiniband/hw/amso1100/c2_provider.c | 15 ++-- drivers/infiniband/hw/cxgb3/cxio_hal.c | 13 +++- drivers/infiniband/hw/cxgb3/cxio_wr.h | 6 ++ drivers/infiniband/hw/cxgb3/iwch_cm.c | 3 + drivers/infiniband/hw/cxgb3/iwch_ev.c | 5 - drivers/infiniband/hw/cxgb3/iwch_qp.c | 17 ++--- drivers/infiniband/hw/ehca/ehca_sqp.c | 8 +- drivers/infiniband/hw/ipath/ipath_eeprom.c | 4 +- drivers/infiniband/hw/ipath/ipath_init_chip.c | 2 +- drivers/infiniband/hw/ipath/ipath_mad.c | 95 ++++++++++++------------ drivers/infiniband/hw/ipath/ipath_rc.c | 2 +- drivers/infiniband/hw/ipath/ipath_sdma.c | 4 +- drivers/infiniband/hw/ipath/ipath_uc.c | 2 +- drivers/infiniband/hw/ipath/ipath_ud.c | 4 +- drivers/infiniband/hw/ipath/ipath_user_pages.c | 8 +- drivers/infiniband/hw/ipath/ipath_user_sdma.c | 6 +- drivers/infiniband/hw/ipath/ipath_verbs.c | 2 +- drivers/infiniband/hw/ipath/ipath_verbs.h | 10 +- drivers/infiniband/hw/mlx4/mad.c | 27 +++++-- drivers/infiniband/hw/mlx4/qp.c | 22 +++--- drivers/infiniband/hw/mthca/mthca_mad.c | 25 +++++-- drivers/infiniband/hw/nes/nes.c | 2 +- drivers/infiniband/hw/nes/nes.h | 2 +- drivers/infiniband/hw/nes/nes_cm.c | 6 +- drivers/infiniband/hw/nes/nes_cm.h | 2 +- drivers/infiniband/hw/nes/nes_context.h | 2 +- drivers/infiniband/hw/nes/nes_hw.c | 12 +++- drivers/infiniband/hw/nes/nes_hw.h | 3 +- drivers/infiniband/hw/nes/nes_nic.c | 24 ++++--- drivers/infiniband/hw/nes/nes_user.h | 2 +- drivers/infiniband/hw/nes/nes_utils.c | 2 +- drivers/infiniband/hw/nes/nes_verbs.c | 72 +++++++++++------- drivers/infiniband/hw/nes/nes_verbs.h | 2 +- drivers/infiniband/ulp/ipoib/ipoib_main.c | 29 +++++--- drivers/infiniband/ulp/iser/iser_verbs.c | 7 -- drivers/net/mlx4/main.c | 2 + include/rdma/ib_cm.h | 12 ++-- include/rdma/ib_mad.h | 4 +- include/rdma/ib_smi.h | 34 ++++---- 46 files changed, 333 insertions(+), 260 deletions(-) Merging acpi/test $ git merge acpi/test Auto-merging MAINTAINERS Auto-merging arch/x86/kernel/reboot.c Auto-merging drivers/acpi/acpica/tbxface.c Auto-merging drivers/acpi/osl.c Auto-merging drivers/pci/pci-acpi.c Auto-merging include/acpi/acpixf.h Merge made by recursive. Documentation/feature-removal-schedule.txt | 8 + MAINTAINERS | 5 + arch/x86/kernel/reboot.c | 2 +- drivers/acpi/acpica/acglobal.h | 6 +- drivers/acpi/acpica/achware.h | 5 +- drivers/acpi/acpica/aclocal.h | 14 +- drivers/acpi/acpica/acmacros.h | 4 - drivers/acpi/acpica/acpredef.h | 41 +- drivers/acpi/acpica/actables.h | 7 +- drivers/acpi/acpica/dsmthdat.c | 2 +- drivers/acpi/acpica/dsobject.c | 6 +- drivers/acpi/acpica/dsopcode.c | 8 +- drivers/acpi/acpica/dsutils.c | 2 +- drivers/acpi/acpica/dswexec.c | 5 +- drivers/acpi/acpica/evevent.c | 12 +- drivers/acpi/acpica/evgpeblk.c | 8 +- drivers/acpi/acpica/evmisc.c | 4 +- drivers/acpi/acpica/evregion.c | 2 +- drivers/acpi/acpica/evxfevnt.c | 24 +- drivers/acpi/acpica/exconfig.c | 4 +- drivers/acpi/acpica/exconvrt.c | 11 +- drivers/acpi/acpica/exdump.c | 19 +- drivers/acpi/acpica/exfield.c | 29 +- drivers/acpi/acpica/exfldio.c | 8 +- drivers/acpi/acpica/exmisc.c | 14 +- drivers/acpi/acpica/exoparg1.c | 13 +- drivers/acpi/acpica/exoparg2.c | 2 +- drivers/acpi/acpica/exoparg3.c | 7 +- drivers/acpi/acpica/exprep.c | 2 +- drivers/acpi/acpica/exresnte.c | 8 +- drivers/acpi/acpica/exresolv.c | 9 +- drivers/acpi/acpica/exresop.c | 23 +- drivers/acpi/acpica/exstore.c | 18 +- drivers/acpi/acpica/exstoren.c | 29 +- drivers/acpi/acpica/exutils.c | 2 +- drivers/acpi/acpica/hwacpi.c | 2 +- drivers/acpi/acpica/hwregs.c | 283 ++++++--- drivers/acpi/acpica/hwsleep.c | 108 ++-- drivers/acpi/acpica/hwxface.c | 272 +++----- drivers/acpi/acpica/nsaccess.c | 3 +- drivers/acpi/acpica/nsdump.c | 8 +- drivers/acpi/acpica/nseval.c | 2 +- drivers/acpi/acpica/nsobject.c | 18 +- drivers/acpi/acpica/nspredef.c | 8 +- drivers/acpi/acpica/nsutils.c | 2 +- drivers/acpi/acpica/nsxfeval.c | 3 +- drivers/acpi/acpica/rscalc.c | 7 +- drivers/acpi/acpica/rscreate.c | 15 +- drivers/acpi/acpica/tbfadt.c | 278 +++++---- drivers/acpi/acpica/tbinstal.c | 37 +- drivers/acpi/acpica/tbutils.c | 106 +++- drivers/acpi/acpica/tbxface.c | 71 +-- drivers/acpi/acpica/tbxfroot.c | 4 +- drivers/acpi/acpica/utcopy.c | 30 +- drivers/acpi/acpica/utdelete.c | 6 +- drivers/acpi/acpica/uteval.c | 49 +- drivers/acpi/acpica/utglobal.c | 16 +- drivers/acpi/acpica/utmisc.c | 3 +- drivers/acpi/acpica/utobject.c | 11 +- drivers/acpi/battery.c | 14 +- drivers/acpi/fan.c | 20 +- drivers/acpi/osl.c | 50 -- drivers/acpi/pci_link.c | 39 +- drivers/acpi/processor_idle.c | 10 +- drivers/acpi/processor_thermal.c | 20 +- drivers/acpi/sbs.c | 31 +- drivers/acpi/sleep.c | 10 +- drivers/acpi/system.c | 51 ++- drivers/acpi/thermal.c | 538 +++------------- drivers/acpi/video.c | 22 +- drivers/pci/pci-acpi.c | 4 +- drivers/platform/x86/Kconfig | 21 +- drivers/platform/x86/Makefile | 1 + drivers/platform/x86/asus-laptop.c | 5 +- drivers/platform/x86/eeepc-laptop.c | 6 +- drivers/platform/x86/intel_menlow.c | 29 +- drivers/platform/x86/oqo-wmi.c | 941 ++++++++++++++++++++++++++++ drivers/platform/x86/thinkpad_acpi.c | 2 +- drivers/power/power_supply_sysfs.c | 2 + drivers/thermal/thermal_sys.c | 356 ++++++++++- include/acpi/acexcep.h | 6 +- include/acpi/acpixf.h | 16 +- include/acpi/actbl.h | 74 ++-- include/acpi/actypes.h | 9 +- include/linux/power_supply.h | 2 + include/linux/thermal.h | 48 ++- 86 files changed, 2551 insertions(+), 1481 deletions(-) create mode 100644 drivers/platform/x86/oqo-wmi.c $ git am -3 ../patches/0001-acpi-update-thermal-for-bus_id-removal.patch Applying: acpi: update thermal for bus_id removal $ git reset HEAD^ drivers/acpi/thermal.c: locally modified $ git add . $ git commit -v -a --amend [master]: created 0571d37: "Merge commit 'acpi/test'" Merging nfsd/nfsd-next $ git merge nfsd/nfsd-next Auto-merging fs/nfsd/vfs.c Merge made by recursive. fs/lockd/svclock.c | 7 + fs/nfsd/Kconfig | 1 + fs/nfsd/nfs3proc.c | 5 +- fs/nfsd/nfs4callback.c | 45 ++++--- fs/nfsd/nfs4proc.c | 33 +++--- fs/nfsd/nfs4state.c | 293 +++++++++++++++++++++++++------------------- fs/nfsd/vfs.c | 19 +++ include/linux/lockd/xdr.h | 12 +- include/linux/lockd/xdr4.h | 10 +- include/linux/nfsd/nfsd.h | 132 ++++++++++---------- include/linux/nfsd/nfsfh.h | 7 + include/linux/nfsd/state.h | 11 +-- include/linux/sunrpc/xdr.h | 42 +++--- 13 files changed, 344 insertions(+), 273 deletions(-) Merging ieee1394/for-next $ git merge ieee1394/for-next Merge made by recursive. drivers/firewire/fw-card.c | 77 ++-- drivers/firewire/fw-cdev.c | 1006 +++++++++++++++++++++++++------------ drivers/firewire/fw-device.c | 161 +++--- drivers/firewire/fw-device.h | 18 +- drivers/firewire/fw-iso.c | 227 ++++++++-- drivers/firewire/fw-ohci.c | 239 +++++----- drivers/firewire/fw-sbp2.c | 57 +-- drivers/firewire/fw-topology.c | 28 +- drivers/firewire/fw-topology.h | 19 +- drivers/firewire/fw-transaction.c | 151 +++---- drivers/firewire/fw-transaction.h | 127 ++---- drivers/ieee1394/csr.c | 8 +- drivers/ieee1394/eth1394.c | 2 +- drivers/ieee1394/highlevel.c | 2 +- drivers/ieee1394/raw1394.c | 2 +- drivers/ieee1394/sbp2.c | 7 +- include/linux/firewire-cdev.h | 170 ++++++- 17 files changed, 1444 insertions(+), 857 deletions(-) Merging ubi/linux-next $ git merge ubi/linux-next Merge made by recursive. drivers/mtd/ubi/cdev.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) Merging kvm/master $ git merge kvm/master Renaming arch/powerpc/include/asm/mmu-fsl-booke.h => arch/powerpc/include/asm/mmu-book3e.h Auto-merging arch/powerpc/include/asm/mmu-book3e.h Auto-merging arch/ia64/include/asm/kvm.h Auto-merging arch/ia64/kernel/msi_ia64.c Auto-merging arch/powerpc/include/asm/kvm.h Auto-merging arch/s390/kvm/kvm-s390.c Auto-merging arch/x86/kvm/Kconfig Merge made by recursive. arch/ia64/include/asm/kvm.h | 49 ++- arch/ia64/include/asm/kvm_host.h | 18 +- arch/ia64/include/asm/msidef.h | 42 ++ arch/ia64/kernel/msi_ia64.c | 55 +-- arch/ia64/kvm/Kconfig | 4 + arch/ia64/kvm/irq.h | 2 + arch/ia64/kvm/kvm-ia64.c | 125 ++++- arch/ia64/kvm/kvm_fw.c | 151 ++++++- arch/ia64/kvm/process.c | 71 ++- arch/ia64/kvm/vcpu.c | 44 +-- arch/ia64/kvm/vcpu.h | 4 +- arch/ia64/kvm/vtlb.c | 44 +- arch/powerpc/include/asm/kvm.h | 7 + arch/powerpc/include/asm/kvm_44x.h | 7 + arch/powerpc/include/asm/kvm_asm.h | 7 +- arch/powerpc/include/asm/kvm_e500.h | 67 +++ arch/powerpc/include/asm/kvm_host.h | 21 +- arch/powerpc/include/asm/kvm_ppc.h | 15 +- arch/powerpc/include/asm/mmu-book3e.h | 2 + arch/powerpc/kernel/asm-offsets.c | 4 +- arch/powerpc/kvm/44x.c | 72 +--- arch/powerpc/kvm/44x_emulate.c | 217 +-------- arch/powerpc/kvm/44x_tlb.c | 39 +- arch/powerpc/kvm/44x_tlb.h | 9 - arch/powerpc/kvm/Kconfig | 16 + arch/powerpc/kvm/Makefile | 10 + arch/powerpc/kvm/booke.c | 50 ++- arch/powerpc/kvm/booke.h | 35 +- arch/powerpc/kvm/booke_emulate.c | 266 ++++++++++ arch/powerpc/kvm/booke_interrupts.S | 5 + arch/powerpc/kvm/e500.c | 169 ++++++ arch/powerpc/kvm/e500_emulate.c | 202 ++++++++ arch/powerpc/kvm/e500_tlb.c | 753 +++++++++++++++++++++++++++ arch/powerpc/kvm/e500_tlb.h | 185 +++++++ arch/powerpc/kvm/emulate.c | 93 +++-- arch/powerpc/kvm/powerpc.c | 31 +- arch/s390/include/asm/kvm.h | 7 + arch/s390/include/asm/kvm_host.h | 3 - arch/s390/kvm/Kconfig | 3 + arch/s390/kvm/intercept.c | 2 +- arch/s390/kvm/interrupt.c | 7 +- arch/s390/kvm/kvm-s390.c | 4 +- arch/s390/kvm/kvm-s390.h | 2 +- arch/s390/kvm/priv.c | 18 +- arch/s390/kvm/sigp.c | 2 - arch/x86/include/asm/kvm.h | 25 + arch/x86/include/asm/kvm_host.h | 61 ++- arch/x86/include/asm/msr-index.h | 9 + arch/x86/include/asm/svm.h | 4 - arch/x86/include/asm/virtext.h | 2 +- arch/x86/include/asm/vmx.h | 5 +- arch/x86/kernel/kvm.c | 4 + arch/x86/kvm/Kconfig | 4 + arch/x86/kvm/i8254.c | 21 +- arch/x86/kvm/i8254.h | 2 + arch/x86/kvm/i8259.c | 25 +- arch/x86/kvm/irq.h | 2 + arch/x86/kvm/kvm_svm.h | 16 +- arch/x86/kvm/lapic.c | 11 +- arch/x86/kvm/mmu.c | 237 ++++----- arch/x86/kvm/mmu.h | 2 +- arch/x86/kvm/paging_tmpl.h | 213 ++++----- arch/x86/kvm/svm.c | 916 +++++++++++++++++++++++++++++---- arch/x86/kvm/vmx.c | 493 ++++++++++-------- arch/x86/kvm/x86.c | 439 ++++++++++++---- arch/x86/kvm/x86_emulate.c | 56 ++- include/linux/kvm.h | 141 +++++- include/linux/kvm_host.h | 76 +++- include/linux/kvm_types.h | 26 +- virt/kvm/ioapic.c | 153 +++--- virt/kvm/ioapic.h | 25 +- virt/kvm/irq_comm.c | 320 +++++++++++- virt/kvm/kvm_main.c | 395 ++++++++++++--- 73 files changed, 5085 insertions(+), 1537 deletions(-) create mode 100644 arch/ia64/include/asm/msidef.h create mode 100644 arch/powerpc/include/asm/kvm_e500.h create mode 100644 arch/powerpc/kvm/booke_emulate.c create mode 100644 arch/powerpc/kvm/e500.c create mode 100644 arch/powerpc/kvm/e500_emulate.c create mode 100644 arch/powerpc/kvm/e500_tlb.c create mode 100644 arch/powerpc/kvm/e500_tlb.h Merging dlm/next $ git merge dlm/next Merge made by recursive. fs/dlm/dir.c | 18 +++--- fs/dlm/dlm_internal.h | 2 +- fs/dlm/lock.c | 60 ++++++++++++++-- fs/dlm/lockspace.c | 2 +- fs/dlm/lowcomms.c | 180 ++++++++++++++++++++++++++----------------------- 5 files changed, 159 insertions(+), 103 deletions(-) Merging scsi/master $ git merge scsi/master Auto-merging MAINTAINERS Auto-merging drivers/scsi/hptiop.c Auto-merging drivers/scsi/ibmvscsi/ibmvfc.c Auto-merging drivers/scsi/ipr.c Auto-merging drivers/scsi/scsi.c Auto-merging drivers/scsi/scsi_lib.c Auto-merging drivers/scsi/scsi_scan.c Auto-merging drivers/scsi/sg.c Auto-merging drivers/usb/storage/transport.c Merge made by recursive. Documentation/devices.txt | 6 + Documentation/scsi/osd.txt | 198 ++++ MAINTAINERS | 10 + drivers/s390/scsi/zfcp_fsf.c | 1 - drivers/scsi/Kconfig | 17 +- drivers/scsi/Makefile | 2 + drivers/scsi/constants.c | 13 +- drivers/scsi/device_handler/scsi_dh_alua.c | 14 +- drivers/scsi/device_handler/scsi_dh_rdac.c | 5 + drivers/scsi/hptiop.c | 3 +- drivers/scsi/ibmvscsi/ibmvfc.c | 62 +- drivers/scsi/ipr.c | 9 + drivers/scsi/ipr.h | 4 +- drivers/scsi/ips.c | 3 +- drivers/scsi/libfc/fc_fcp.c | 6 +- drivers/scsi/libfc/fc_lport.c | 5 +- drivers/scsi/libfc/fc_rport.c | 2 +- drivers/scsi/lpfc/lpfc_debugfs.c | 16 +- drivers/scsi/lpfc/lpfc_scsi.c | 6 +- drivers/scsi/osd/Kbuild | 45 + drivers/scsi/osd/Kconfig | 53 + drivers/scsi/osd/Makefile | 37 + drivers/scsi/osd/osd_debug.h | 30 + drivers/scsi/osd/osd_initiator.c | 1654 ++++++++++++++++++++++++++++ drivers/scsi/osd/osd_uld.c | 487 ++++++++ drivers/scsi/osst.c | 96 ++- drivers/scsi/osst.h | 2 + drivers/scsi/scsi.c | 104 ++ drivers/scsi/scsi_debug.c | 443 ++++++++- drivers/scsi/scsi_error.c | 34 +- drivers/scsi/scsi_lib.c | 203 +---- drivers/scsi/scsi_scan.c | 1 + drivers/scsi/scsi_sysfs.c | 1 - drivers/scsi/scsi_transport_fc.c | 2 +- drivers/scsi/ses.c | 31 +- drivers/scsi/sg.c | 466 ++++---- drivers/scsi/st.c | 6 +- drivers/scsi/stex.c | 107 +-- drivers/scsi/sym53c8xx_2/sym_hipd.c | 35 +- drivers/scsi/sym53c8xx_2/sym_hipd.h | 1 + drivers/usb/storage/transport.c | 2 +- include/linux/major.h | 1 + include/scsi/osd_attributes.h | 327 ++++++ include/scsi/osd_initiator.h | 433 ++++++++ include/scsi/osd_protocol.h | 579 ++++++++++ include/scsi/osd_sec.h | 45 + include/scsi/osd_sense.h | 260 +++++ include/scsi/osd_types.h | 40 + include/scsi/scsi.h | 12 +- include/scsi/scsi_device.h | 10 +- 50 files changed, 5277 insertions(+), 652 deletions(-) create mode 100644 Documentation/scsi/osd.txt create mode 100644 drivers/scsi/osd/Kbuild create mode 100644 drivers/scsi/osd/Kconfig create mode 100755 drivers/scsi/osd/Makefile create mode 100644 drivers/scsi/osd/osd_debug.h create mode 100644 drivers/scsi/osd/osd_initiator.c create mode 100644 drivers/scsi/osd/osd_uld.c create mode 100644 include/scsi/osd_attributes.h create mode 100644 include/scsi/osd_initiator.h create mode 100644 include/scsi/osd_protocol.h create mode 100644 include/scsi/osd_sec.h create mode 100644 include/scsi/osd_sense.h create mode 100644 include/scsi/osd_types.h Merging ocfs2/linux-next $ git merge ocfs2/linux-next Resolved 'fs/ocfs2/ocfs2.h' using previous resolution. Auto-merging fs/ocfs2/alloc.c Auto-merging fs/ocfs2/ocfs2.h CONFLICT (content): Merge conflict in fs/ocfs2/ocfs2.h Auto-merging fs/ocfs2/super.c Auto-merging fs/ocfs2/xattr.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master]: created 6df4764: "Merge commit 'ocfs2/linux-next'" $ git diff -M --stat --summary HEAD^.. fs/ocfs2/alloc.c | 57 + fs/ocfs2/alloc.h | 3 + fs/ocfs2/cluster/heartbeat.c | 96 ++- fs/ocfs2/cluster/heartbeat.h | 3 +- fs/ocfs2/cluster/nodemanager.c | 9 +- fs/ocfs2/dir.c | 2806 ++++++++++++++++++++++++++++++++++++++-- fs/ocfs2/dir.h | 57 +- fs/ocfs2/inode.c | 20 +- fs/ocfs2/inode.h | 4 + fs/ocfs2/journal.c | 42 +- fs/ocfs2/journal.h | 76 +- fs/ocfs2/localalloc.c | 86 -- fs/ocfs2/namei.c | 250 ++-- fs/ocfs2/ocfs2.h | 73 +- fs/ocfs2/ocfs2_fs.h | 136 ++- fs/ocfs2/suballoc.c | 95 ++- fs/ocfs2/suballoc.h | 2 + fs/ocfs2/super.c | 182 +++ fs/ocfs2/xattr.c | 8 +- fs/ocfs2/xattr.h | 2 +- 20 files changed, 3596 insertions(+), 411 deletions(-) Merging ext4/next $ git merge ext4/next Resolved 'fs/ext4/inode.c' using previous resolution. Auto-merging fs/ext4/balloc.c Auto-merging fs/ext4/ext4.h Auto-merging fs/ext4/ialloc.c Auto-merging fs/ext4/inode.c CONFLICT (content): Merge conflict in fs/ext4/inode.c Auto-merging fs/ext4/mballoc.c Auto-merging fs/ext4/namei.c Auto-merging fs/ext4/super.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master]: created f1fbccc: "Merge commit 'ext4/next'" $ git diff -M --stat --summary HEAD^.. Documentation/filesystems/ext4.txt | 5 +- fs/ext4/balloc.c | 9 +- fs/ext4/dir.c | 16 +- fs/ext4/ext4.h | 84 ++++----- fs/ext4/ext4_extents.h | 1 + fs/ext4/ext4_i.h | 6 +- fs/ext4/ext4_sb.h | 14 +- fs/ext4/extents.c | 126 +++++++++++-- fs/ext4/file.c | 7 +- fs/ext4/ialloc.c | 229 ++++++++++++++++------- fs/ext4/inode.c | 364 ++++++++++++++++++++---------------- fs/ext4/ioctl.c | 17 ++- fs/ext4/mballoc.c | 124 ++++--------- fs/ext4/mballoc.h | 1 - fs/ext4/namei.c | 163 +++++++++++------ fs/ext4/super.c | 261 +++++++++++++++++++++----- 16 files changed, 927 insertions(+), 500 deletions(-) Merging async_tx/next $ git merge async_tx/next Auto-merging drivers/dma/iop-adma.c Auto-merging drivers/dma/mv_xor.c Auto-merging drivers/video/Kconfig Auto-merging drivers/video/Makefile Auto-merging include/linux/dmaengine.h Merge made by recursive. arch/arm/plat-mxc/include/mach/mx3fb.h | 26 +- drivers/dca/dca-core.c | 2 +- drivers/dma/dmatest.c | 2 +- drivers/dma/fsldma.c | 8 +- drivers/dma/ioat.c | 2 +- drivers/dma/ioat_dca.c | 26 +- drivers/dma/ioat_dma.c | 39 +- drivers/dma/ioatdma.h | 8 +- drivers/dma/ioatdma_hw.h | 2 +- drivers/dma/ioatdma_registers.h | 2 +- drivers/dma/iop-adma.c | 16 +- drivers/dma/ipu/ipu_idmac.c | 2 +- drivers/dma/mv_xor.c | 16 +- drivers/video/Kconfig | 20 +- drivers/video/Makefile | 2 +- drivers/video/mx3fb.c | 2300 ++++++++++++++++---------------- include/linux/dmaengine.h | 7 +- 17 files changed, 1257 insertions(+), 1223 deletions(-) Merging udf/for_next $ git merge udf/for_next Auto-merging fs/udf/balloc.c Auto-merging fs/udf/ialloc.c Merge made by recursive. Documentation/filesystems/udf.txt | 2 + fs/udf/balloc.c | 113 +++++----- fs/udf/dir.c | 14 +- fs/udf/directory.c | 38 ++-- fs/udf/ecma_167.h | 416 ++++++++++++++++++------------------ fs/udf/ialloc.c | 4 +- fs/udf/inode.c | 213 ++++++++++--------- fs/udf/misc.c | 29 ++-- fs/udf/namei.c | 86 ++++---- fs/udf/osta_udf.h | 22 +- fs/udf/partition.c | 2 +- fs/udf/super.c | 164 ++++++++++----- fs/udf/truncate.c | 44 ++-- fs/udf/udf_i.h | 6 +- fs/udf/udf_sb.h | 4 + fs/udf/udfdecl.h | 46 +++-- fs/udf/udfend.h | 28 ++-- fs/udf/udftime.c | 6 +- fs/udf/unicode.c | 62 ++++-- 19 files changed, 695 insertions(+), 604 deletions(-) Merging net/master $ git merge net/master Recorded preimage for 'drivers/net/wireless/rt2x00/rt73usb.c' Resolved 'drivers/net/wimax/i2400m/usb-notif.c' using previous resolution. Renaming fs/dquot.c => fs/quota/dquot.c Auto-merging fs/quota/dquot.c Auto-merging Documentation/feature-removal-schedule.txt Auto-merging MAINTAINERS Auto-merging drivers/infiniband/hw/cxgb3/cxio_hal.c Auto-merging drivers/infiniband/hw/nes/nes_hw.c Auto-merging drivers/infiniband/hw/nes/nes_nic.c Auto-merging drivers/net/au1000_eth.c Auto-merging drivers/net/cpmac.c Auto-merging drivers/net/ehea/ehea_main.c Removing drivers/net/gianfar_mii.h Auto-merging drivers/net/macb.c Auto-merging drivers/net/mv643xx_eth.c Auto-merging drivers/net/sb1250-mac.c Auto-merging drivers/net/sfc/efx.c Auto-merging drivers/net/sfc/falcon.c Auto-merging drivers/net/smc91x.c Auto-merging drivers/net/smc91x.h Auto-merging drivers/net/smsc911x.c Auto-merging drivers/net/smsc9420.c Auto-merging drivers/net/tc35815.c Removing drivers/net/tehuti_fw.h Removing drivers/net/typhoon-firmware.h Removing drivers/net/ucc_geth_mii.c Removing drivers/net/ucc_geth_mii.h Auto-merging drivers/net/wimax/i2400m/driver.c Auto-merging drivers/net/wimax/i2400m/usb-notif.c CONFLICT (content): Merge conflict in drivers/net/wimax/i2400m/usb-notif.c Removing drivers/net/wireless/ath9k/core.h Removing drivers/net/wireless/iwlwifi/iwl-3945-commands.h Removing drivers/net/wireless/iwlwifi/iwl-3945-debug.h Removing drivers/net/wireless/iwlwifi/iwl-3945-io.h Removing drivers/net/wireless/iwlwifi/iwl-3945-rs.h Removing drivers/net/wireless/iwlwifi/iwl-agn-hcmd-check.c Removing drivers/net/wireless/orinoco/orinoco.c Auto-merging drivers/net/wireless/rt2x00/rt2500usb.c Auto-merging drivers/net/wireless/rt2x00/rt73usb.c CONFLICT (content): Merge conflict in drivers/net/wireless/rt2x00/rt73usb.c Auto-merging drivers/scsi/cxgb3i/cxgb3i_ddp.h Auto-merging drivers/scsi/scsi_transport_fc.c Auto-merging include/linux/pci_ids.h Auto-merging include/linux/socket.h Auto-merging net/netfilter/nf_conntrack_pptp.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'drivers/net/wireless/rt2x00/rt73usb.c'. [master]: created f0186d7: "Merge commit 'net/master'" $ git diff -M --stat --summary HEAD^.. Documentation/DocBook/mac80211.tmpl | 12 +- Documentation/feature-removal-schedule.txt | 4 +- Documentation/networking/dccp.txt | 3 +- Documentation/networking/ip-sysctl.txt | 144 +- Documentation/networking/rds.txt | 356 + Documentation/networking/timestamping.txt | 180 + Documentation/networking/timestamping/.gitignore | 1 + Documentation/networking/timestamping/Makefile | 6 + .../networking/timestamping/timestamping.c | 533 + Documentation/powerpc/dts-bindings/fsl/tsec.txt | 6 + MAINTAINERS | 8 + arch/alpha/include/asm/socket.h | 3 + arch/arm/include/asm/socket.h | 3 + arch/avr32/include/asm/socket.h | 3 + arch/blackfin/include/asm/socket.h | 3 + arch/cris/include/asm/socket.h | 3 + arch/h8300/include/asm/socket.h | 3 + arch/ia64/include/asm/socket.h | 3 + arch/m68k/include/asm/socket.h | 3 + arch/m68knommu/platform/520x/config.c | 56 + arch/m68knommu/platform/523x/config.c | 51 + arch/m68knommu/platform/5272/config.c | 48 + arch/m68knommu/platform/527x/config.c | 113 +- arch/m68knommu/platform/528x/config.c | 58 + arch/m68knommu/platform/532x/config.c | 49 + arch/mips/include/asm/socket.h | 3 + arch/parisc/include/asm/socket.h | 3 + arch/powerpc/include/asm/socket.h | 3 + arch/s390/include/asm/socket.h | 3 + arch/sh/include/asm/socket.h | 3 + arch/sparc/include/asm/socket.h | 3 + arch/x86/include/asm/socket.h | 3 + arch/xtensa/include/asm/socket.h | 3 + drivers/acpi/event.c | 6 +- drivers/atm/firestream.c | 8 +- drivers/bluetooth/bfusb.c | 3 +- drivers/bluetooth/bt3c_cs.c | 4 +- drivers/bluetooth/btusb.c | 40 +- drivers/bluetooth/hci_h4.c | 3 +- drivers/bluetooth/hci_ll.c | 3 +- drivers/char/pcmcia/synclink_cs.c | 18 +- drivers/char/synclink.c | 18 +- drivers/char/synclink_gt.c | 18 +- drivers/char/synclinkmp.c | 18 +- drivers/connector/cn_queue.c | 80 +- drivers/connector/connector.c | 19 +- drivers/infiniband/hw/cxgb3/cxio_hal.c | 3 + drivers/infiniband/hw/cxgb3/cxio_hal.h | 2 + drivers/infiniband/hw/cxgb3/iwch.c | 15 +- drivers/infiniband/hw/nes/nes_hw.c | 2 +- drivers/infiniband/hw/nes/nes_nic.c | 2 +- drivers/infiniband/ulp/ipoib/ipoib_ib.c | 6 +- drivers/isdn/act2000/act2000_isa.c | 6 +- drivers/isdn/capi/capi.c | 2 +- drivers/isdn/capi/kcapi_proc.c | 2 + drivers/isdn/hardware/eicon/debug.c | 2 +- drivers/isdn/hardware/eicon/message.c | 70 +- drivers/isdn/hardware/mISDN/hfcpci.c | 4 +- drivers/isdn/hardware/mISDN/hfcsusb.c | 6 +- drivers/isdn/hardware/mISDN/hfcsusb.h | 6 +- drivers/isdn/hisax/callc.c | 1 - drivers/isdn/hisax/config.c | 6 - drivers/isdn/hisax/hfcscard.c | 2 - drivers/isdn/hisax/hisax.h | 9 + drivers/isdn/hisax/isdnl1.c | 4 +- drivers/isdn/hisax/sedlbauer.c | 2 - drivers/isdn/hisax/teles0.c | 2 - drivers/isdn/hisax/teles3.c | 1 - drivers/isdn/mISDN/clock.c | 10 +- drivers/isdn/mISDN/timerdev.c | 3 +- drivers/isdn/pcbit/layer2.c | 6 +- drivers/net/3c501.c | 17 +- drivers/net/3c505.c | 18 +- drivers/net/3c507.c | 15 +- drivers/net/3c509.c | 25 +- drivers/net/3c515.c | 21 +- drivers/net/3c523.c | 25 +- drivers/net/3c527.c | 19 +- drivers/net/3c59x.c | 61 +- drivers/net/8139cp.c | 6 +- drivers/net/8139too.c | 6 +- drivers/net/82596.c | 17 +- drivers/net/Kconfig | 25 +- drivers/net/Makefile | 5 +- drivers/net/acenic.c | 2 +- drivers/net/amd8111e.c | 6 +- drivers/net/arcnet/arc-rawmode.c | 4 +- drivers/net/arcnet/arcnet.c | 72 +- drivers/net/arcnet/capmode.c | 6 +- drivers/net/arcnet/com20020-isa.c | 2 + drivers/net/arcnet/com20020-pci.c | 3 + drivers/net/arcnet/com20020.c | 11 +- drivers/net/arcnet/rfc1051.c | 12 +- drivers/net/arcnet/rfc1201.c | 47 +- drivers/net/arm/ep93xx_eth.c | 8 +- drivers/net/arm/ixp4xx_eth.c | 12 +- drivers/net/at1700.c | 2 +- drivers/net/atl1e/atl1e.h | 2 +- drivers/net/atl1e/atl1e_main.c | 6 +- drivers/net/atl1e/atl1e_param.c | 2 +- drivers/net/atlx/atl1.c | 2 +- drivers/net/atlx/atl2.c | 2 +- drivers/net/au1000_eth.c | 1043 +- drivers/net/b44.c | 8 +- drivers/net/bnx2.c | 24 +- drivers/net/bnx2x.h | 186 +- drivers/net/bnx2x_dump.h | 526 + drivers/net/bnx2x_fw_defs.h | 153 +- drivers/net/bnx2x_hsi.h | 559 +- drivers/net/bnx2x_init.h | 167 +- drivers/net/bnx2x_init_values.h |26527 +++++++++++--------- drivers/net/bnx2x_link.c | 1416 +- drivers/net/bnx2x_link.h | 23 +- drivers/net/bnx2x_main.c | 2659 ++- drivers/net/bnx2x_reg.h | 314 +- drivers/net/bonding/bond_3ad.h | 2 +- drivers/net/bonding/bond_alb.c | 12 +- drivers/net/bonding/bond_main.c | 16 +- drivers/net/cassini.c | 8 +- drivers/net/chelsio/sge.c | 7 +- drivers/net/cpmac.c | 10 +- drivers/net/cxgb3/adapter.h | 14 +- drivers/net/cxgb3/ael1002.c | 3 +- drivers/net/cxgb3/cxgb3_main.c | 81 +- drivers/net/cxgb3/cxgb3_offload.c | 12 + drivers/net/cxgb3/cxgb3_offload.h | 7 + drivers/net/cxgb3/sge.c | 120 +- drivers/net/defxx.c | 2 +- drivers/net/e100.c | 6 +- drivers/net/e1000/e1000.h | 2 - drivers/net/e1000/e1000_main.c | 94 +- drivers/net/e1000e/82571.c | 144 +- drivers/net/e1000e/defines.h | 1 + drivers/net/e1000e/e1000.h | 2 - drivers/net/e1000e/ethtool.c | 2 +- drivers/net/e1000e/hw.h | 8 + drivers/net/e1000e/ich8lan.c | 17 +- drivers/net/e1000e/lib.c | 4 +- drivers/net/e1000e/netdev.c | 170 +- drivers/net/e2100.c | 6 +- drivers/net/ehea/ehea.h | 2 +- drivers/net/ehea/ehea_main.c | 131 +- drivers/net/ehea/ehea_qmr.c | 4 +- drivers/net/enic/enic.h | 3 +- drivers/net/enic/enic_main.c | 84 +- drivers/net/enic/vnic_dev.c | 33 +- drivers/net/enic/vnic_dev.h | 2 + drivers/net/enic/vnic_devcmd.h | 8 +- drivers/net/enic/vnic_intr.h | 14 + drivers/net/epic100.c | 6 +- drivers/net/fealnx.c | 4 +- drivers/net/fec.c | 890 +- drivers/net/fec.h | 11 +- drivers/net/forcedeth.c | 169 +- drivers/net/fs_enet/fs_enet-main.c | 4 +- drivers/net/fsl_pq_mdio.c | 463 + drivers/net/fsl_pq_mdio.h | 45 + drivers/net/gianfar.c | 82 +- drivers/net/gianfar.h | 17 +- drivers/net/gianfar_ethtool.c | 1 + drivers/net/gianfar_mii.c | 12 +- drivers/net/gianfar_mii.h | 54 - drivers/net/gianfar_sysfs.c | 33 +- drivers/net/hamachi.c | 10 +- drivers/net/hamradio/6pack.c | 20 +- drivers/net/hamradio/baycom_epp.c | 43 +- drivers/net/hamradio/bpqether.c | 45 +- drivers/net/hamradio/dmascc.c | 54 +- drivers/net/hamradio/hdlcdrv.c | 45 +- drivers/net/hamradio/mkiss.c | 55 +- drivers/net/hamradio/scc.c | 24 +- drivers/net/hamradio/yam.c | 68 +- drivers/net/ibmveth.c | 8 +- drivers/net/igb/Makefile | 4 +- drivers/net/igb/e1000_82575.c | 139 +- drivers/net/igb/e1000_82575.h | 64 +- drivers/net/igb/e1000_defines.h | 133 +- drivers/net/igb/e1000_hw.h | 200 +- drivers/net/igb/e1000_mac.c | 59 +- drivers/net/igb/e1000_mac.h | 9 +- drivers/net/igb/e1000_mbx.c | 447 + drivers/net/igb/e1000_mbx.h | 77 + drivers/net/igb/e1000_nvm.c | 44 +- drivers/net/igb/e1000_phy.c | 352 +- drivers/net/igb/e1000_phy.h | 3 +- drivers/net/igb/e1000_regs.h | 103 +- drivers/net/igb/igb.h | 88 +- drivers/net/igb/igb_ethtool.c | 197 +- drivers/net/igb/igb_main.c | 1730 +- drivers/net/irda/sir_dev.c | 6 +- drivers/net/ixgb/ixgb_main.c | 6 +- drivers/net/ixgbe/Makefile | 7 +- drivers/net/ixgbe/ixgbe.h | 60 +- drivers/net/ixgbe/ixgbe_82598.c | 333 +- drivers/net/ixgbe/ixgbe_82599.c | 1277 + drivers/net/ixgbe/ixgbe_common.c | 464 +- drivers/net/ixgbe/ixgbe_common.h | 15 +- drivers/net/ixgbe/ixgbe_dcb.c | 19 +- drivers/net/ixgbe/ixgbe_dcb.h | 56 +- drivers/net/ixgbe/ixgbe_dcb_82598.c | 4 +- drivers/net/ixgbe/ixgbe_dcb_82598.h | 2 +- drivers/net/ixgbe/ixgbe_dcb_82599.c | 470 + drivers/net/ixgbe/ixgbe_dcb_82599.h | 127 + drivers/net/ixgbe/ixgbe_dcb_nl.c | 195 +- drivers/net/ixgbe/ixgbe_ethtool.c | 68 +- drivers/net/ixgbe/ixgbe_main.c | 1142 +- drivers/net/ixgbe/ixgbe_phy.c | 592 +- drivers/net/ixgbe/ixgbe_phy.h | 18 +- drivers/net/ixgbe/ixgbe_type.h | 813 +- drivers/net/ixp2000/ixpdev.c | 4 +- drivers/net/jme.c | 31 +- drivers/net/jme.h | 8 +- drivers/net/korina.c | 4 +- drivers/net/lance.c | 11 +- drivers/net/macb.c | 10 +- drivers/net/mlx4/en_rx.c | 5 +- drivers/net/mv643xx_eth.c | 410 +- drivers/net/myri10ge/myri10ge.c | 7 +- drivers/net/myri_sbus.c | 2 +- drivers/net/natsemi.c | 8 +- drivers/net/ne2k-pci.c | 5 +- drivers/net/netxen/Makefile | 9 +- drivers/net/netxen/netxen_nic.h | 20 +- drivers/net/netxen/netxen_nic_ctx.c | 8 +- drivers/net/netxen/netxen_nic_ethtool.c | 135 +- drivers/net/netxen/netxen_nic_hdr.h | 15 +- drivers/net/netxen/netxen_nic_hw.c | 411 +- drivers/net/netxen/netxen_nic_hw.h | 62 +- drivers/net/netxen/netxen_nic_init.c | 371 +- drivers/net/netxen/netxen_nic_main.c | 527 +- drivers/net/netxen/netxen_nic_niu.c | 230 +- drivers/net/netxen/netxen_nic_phan_reg.h | 10 +- drivers/net/ni65.c | 11 +- drivers/net/niu.c | 1059 +- drivers/net/niu.h | 19 +- drivers/net/ns83820.c | 5 +- drivers/net/pasemi_mac.c | 6 +- drivers/net/pcmcia/axnet_cs.c | 2 +- drivers/net/pcnet32.c | 6 +- drivers/net/phy/mdio-gpio.c | 13 +- drivers/net/phy/mdio_bus.c | 56 +- drivers/net/ppp_async.c | 6 +- drivers/net/ppp_generic.c | 283 +- drivers/net/ppp_synctty.c | 3 +- drivers/net/pppoe.c | 515 +- drivers/net/pppol2tp.c | 192 +- drivers/net/pppox.c | 3 - drivers/net/ps3_gelic_net.c | 26 +- drivers/net/ps3_gelic_wireless.c | 28 +- drivers/net/qla3xxx.c | 6 +- drivers/net/qlge/qlge.h | 158 +- drivers/net/qlge/qlge_dbg.c | 9 + drivers/net/qlge/qlge_ethtool.c | 3 +- drivers/net/qlge/qlge_main.c | 484 +- drivers/net/qlge/qlge_mpi.c | 543 +- drivers/net/r6040.c | 8 +- drivers/net/r8169.c | 6 +- drivers/net/rionet.c | 3 +- drivers/net/s2io.c | 15 +- drivers/net/sb1250-mac.c | 6 +- drivers/net/sc92031.c | 27 +- drivers/net/sfc/Kconfig | 1 - drivers/net/sfc/bitfield.h | 4 +- drivers/net/sfc/boards.c | 74 +- drivers/net/sfc/boards.h | 1 + drivers/net/sfc/efx.c | 19 +- drivers/net/sfc/efx.h | 2 +- drivers/net/sfc/falcon.c | 1 + drivers/net/sfc/mdio_10g.c | 28 +- drivers/net/sfc/mdio_10g.h | 8 +- drivers/net/sfc/mtd.c | 1 + drivers/net/sfc/net_driver.h | 20 +- drivers/net/sfc/phy.h | 8 +- drivers/net/sfc/rx.c | 209 +- drivers/net/sfc/rx.h | 3 - drivers/net/sfc/sfe4001.c | 21 +- drivers/net/sfc/tenxpress.c | 141 +- drivers/net/sfc/xfp_phy.c | 105 +- drivers/net/sis900.c | 4 +- drivers/net/skfp/h/smc.h | 17 + drivers/net/skfp/hwmtm.c | 9 - drivers/net/skfp/pcmplc.c | 3 - drivers/net/skfp/skfddi.c | 3 - drivers/net/skfp/smt.c | 10 - drivers/net/skge.c | 6 +- drivers/net/sky2.c | 267 +- drivers/net/smc91x.c | 138 +- drivers/net/smc91x.h | 10 + drivers/net/smsc911x.c | 145 +- drivers/net/smsc9420.c | 4 +- drivers/net/spider_net.c | 12 +- drivers/net/starfire.c | 8 +- drivers/net/sundance.c | 5 +- drivers/net/sungem.c | 6 +- drivers/net/tc35815.c | 6 +- drivers/net/tehuti.c | 45 +- drivers/net/tehuti.h | 1 + drivers/net/tehuti_fw.h |10712 -------- drivers/net/tg3.c | 779 +- drivers/net/tg3.h | 18 + drivers/net/tokenring/3c359.c | 17 +- drivers/net/tokenring/abyss.c | 10 +- drivers/net/tokenring/ibmtr.c | 43 +- drivers/net/tokenring/lanstreamer.c | 45 +- drivers/net/tokenring/lanstreamer.h | 1 - drivers/net/tokenring/madgemc.c | 2 - drivers/net/tokenring/olympic.c | 39 +- drivers/net/tokenring/olympic.h | 1 - drivers/net/tokenring/smctr.c | 13 +- drivers/net/tokenring/smctr.h | 1 - drivers/net/tokenring/tms380tr.c | 21 +- drivers/net/tokenring/tms380tr.h | 1 + drivers/net/tokenring/tmspci.c | 4 +- drivers/net/tsi108_eth.c | 8 +- drivers/net/tulip/de4x5.c | 7 +- drivers/net/tulip/dmfe.c | 2 +- drivers/net/tulip/interrupt.c | 10 +- drivers/net/tulip/media.c | 8 +- drivers/net/tulip/uli526x.c | 2 +- drivers/net/tulip/winbond-840.c | 7 +- drivers/net/tun.c | 528 +- drivers/net/typhoon-firmware.h | 3778 --- drivers/net/typhoon.c | 104 +- drivers/net/typhoon.h | 234 +- drivers/net/ucc_geth.c | 22 +- drivers/net/ucc_geth.h | 14 +- drivers/net/ucc_geth_ethtool.c | 1 - drivers/net/ucc_geth_mii.c | 295 - drivers/net/ucc_geth_mii.h | 101 - drivers/net/usb/hso.c | 31 +- drivers/net/usb/rndis_host.c | 25 +- drivers/net/usb/smsc95xx.c | 10 +- drivers/net/via-rhine.c | 9 +- drivers/net/via-velocity.h | 6 +- drivers/net/virtio_net.c | 244 +- drivers/net/wan/c101.c | 12 +- drivers/net/wan/cosa.c | 17 +- drivers/net/wan/dscc4.c | 18 +- drivers/net/wan/farsync.c | 18 +- drivers/net/wan/hd64572.c | 4 +- drivers/net/wan/hdlc.c | 31 +- drivers/net/wan/hdlc_cisco.c | 17 +- drivers/net/wan/hdlc_fr.c | 44 +- drivers/net/wan/hdlc_ppp.c | 6 +- drivers/net/wan/hdlc_raw.c | 5 +- drivers/net/wan/hdlc_raw_eth.c | 8 +- drivers/net/wan/hdlc_x25.c | 2 +- drivers/net/wan/hostess_sv11.c | 12 +- drivers/net/wan/ixp4xx_hss.c | 24 +- drivers/net/wan/lapbether.c | 5 +- drivers/net/wan/lmc/lmc_main.c | 19 +- drivers/net/wan/lmc/lmc_proto.c | 17 +- drivers/net/wan/n2.c | 12 +- drivers/net/wan/pc300too.c | 12 +- drivers/net/wan/pci200syn.c | 12 +- drivers/net/wan/sbni.c | 17 +- drivers/net/wan/sealevel.c | 12 +- drivers/net/wan/wanxl.c | 14 +- drivers/net/wan/z85230.c | 3 +- drivers/net/wimax/i2400m/Makefile | 1 + drivers/net/wimax/i2400m/control.c | 147 +- drivers/net/wimax/i2400m/debug-levels.h | 1 + drivers/net/wimax/i2400m/driver.c | 26 + drivers/net/wimax/i2400m/fw.c | 65 +- drivers/net/wimax/i2400m/i2400m.h | 91 +- drivers/net/wimax/i2400m/netdev.c | 120 +- drivers/net/wimax/i2400m/rx.c | 749 +- drivers/net/wimax/i2400m/sdio.c | 27 +- drivers/net/wimax/i2400m/sysfs.c | 80 + drivers/net/wimax/i2400m/usb-notif.c | 2 +- drivers/net/wimax/i2400m/usb.c | 30 +- drivers/net/wireless/Kconfig | 136 +- drivers/net/wireless/Makefile | 2 + drivers/net/wireless/airo.c | 1146 +- drivers/net/wireless/at76c50x-usb.c | 2501 ++ drivers/net/wireless/at76c50x-usb.h | 463 + drivers/net/wireless/ath5k/ath5k.h | 74 +- drivers/net/wireless/ath5k/attach.c | 18 +- drivers/net/wireless/ath5k/base.c | 193 +- drivers/net/wireless/ath5k/base.h | 4 +- drivers/net/wireless/ath5k/caps.c | 6 +- drivers/net/wireless/ath5k/debug.c | 43 +- drivers/net/wireless/ath5k/debug.h | 1 - drivers/net/wireless/ath5k/eeprom.c | 168 +- drivers/net/wireless/ath5k/eeprom.h | 1 + drivers/net/wireless/ath5k/gpio.c | 10 +- drivers/net/wireless/ath5k/initvals.c | 1575 +- drivers/net/wireless/ath5k/pcu.c | 24 +- drivers/net/wireless/ath5k/phy.c | 2029 +-- drivers/net/wireless/ath5k/qcu.c | 47 +- drivers/net/wireless/ath5k/reg.h | 124 +- drivers/net/wireless/ath5k/reset.c | 948 +- drivers/net/wireless/ath5k/rfbuffer.h | 1181 + drivers/net/wireless/ath5k/rfgain.h | 516 + drivers/net/wireless/ath9k/Makefile | 2 + drivers/net/wireless/ath9k/ahb.c | 185 + drivers/net/wireless/ath9k/ani.c | 288 +- drivers/net/wireless/ath9k/ani.h | 138 + drivers/net/wireless/ath9k/ath9k.h | 1651 +- drivers/net/wireless/ath9k/beacon.c | 134 +- drivers/net/wireless/ath9k/calib.c | 460 +- drivers/net/wireless/ath9k/calib.h | 124 + drivers/net/wireless/ath9k/core.h | 754 - drivers/net/wireless/ath9k/debug.c | 230 +- drivers/net/wireless/ath9k/debug.h | 154 + drivers/net/wireless/ath9k/eeprom.c | 3142 ++-- drivers/net/wireless/ath9k/eeprom.h | 506 + drivers/net/wireless/ath9k/hw.c | 1586 +- drivers/net/wireless/ath9k/hw.h | 1557 +- drivers/net/wireless/ath9k/initvals.h | 565 +- drivers/net/wireless/ath9k/mac.c | 233 +- drivers/net/wireless/ath9k/mac.h | 677 + drivers/net/wireless/ath9k/main.c | 1569 +- drivers/net/wireless/ath9k/pci.c | 304 + drivers/net/wireless/ath9k/phy.c | 240 +- drivers/net/wireless/ath9k/phy.h | 43 +- drivers/net/wireless/ath9k/rc.c | 214 +- drivers/net/wireless/ath9k/rc.h | 18 +- drivers/net/wireless/ath9k/recv.c | 95 +- drivers/net/wireless/ath9k/reg.h | 103 +- drivers/net/wireless/ath9k/regd.c | 1242 +- drivers/net/wireless/ath9k/regd.h | 206 +- drivers/net/wireless/ath9k/regd_common.h | 2058 +-- drivers/net/wireless/ath9k/xmit.c | 2835 +-- drivers/net/wireless/atmel.c | 20 +- drivers/net/wireless/b43/Kconfig | 14 +- drivers/net/wireless/b43/Makefile | 1 + drivers/net/wireless/b43/b43.h | 40 +- drivers/net/wireless/b43/debugfs.c | 48 +- drivers/net/wireless/b43/debugfs.h | 5 +- drivers/net/wireless/b43/dma.c | 64 +- drivers/net/wireless/b43/dma.h | 17 +- drivers/net/wireless/b43/lo.c | 77 +- drivers/net/wireless/b43/main.c | 454 +- drivers/net/wireless/b43/main.h | 25 + drivers/net/wireless/b43/phy_a.c | 111 +- drivers/net/wireless/b43/phy_g.c | 614 +- drivers/net/wireless/b43/phy_lp.c | 395 +- drivers/net/wireless/b43/phy_lp.h | 329 +- drivers/net/wireless/b43/pio.c | 16 +- drivers/net/wireless/b43/rfkill.c | 2 +- drivers/net/wireless/b43/tables_lpphy.c | 394 + drivers/net/wireless/b43/tables_lpphy.h | 31 + drivers/net/wireless/b43/wa.c | 113 +- drivers/net/wireless/b43legacy/leds.c | 8 +- drivers/net/wireless/b43legacy/main.c | 2 +- drivers/net/wireless/hostap/hostap.h | 2 +- drivers/net/wireless/hostap/hostap_80211.h | 2 +- drivers/net/wireless/hostap/hostap_80211_rx.c | 92 +- drivers/net/wireless/hostap/hostap_80211_tx.c | 51 +- drivers/net/wireless/hostap/hostap_ap.c | 144 +- drivers/net/wireless/hostap/hostap_ap.h | 6 +- drivers/net/wireless/hostap/hostap_hw.c | 24 +- drivers/net/wireless/hostap/hostap_info.c | 1 + drivers/net/wireless/hostap/hostap_ioctl.c | 7 +- drivers/net/wireless/hostap/hostap_main.c | 38 +- drivers/net/wireless/ipw2x00/Kconfig | 3 +- .../net/wireless/ipw2x00}/ieee80211.h | 3 + drivers/net/wireless/ipw2x00/ipw2100.c | 21 +- drivers/net/wireless/ipw2x00/ipw2100.h | 8 +- drivers/net/wireless/ipw2x00/ipw2200.c | 118 +- drivers/net/wireless/ipw2x00/ipw2200.h | 7 +- drivers/net/wireless/ipw2x00/libipw_geo.c | 2 +- drivers/net/wireless/ipw2x00/libipw_module.c | 17 +- drivers/net/wireless/ipw2x00/libipw_rx.c | 5 +- drivers/net/wireless/ipw2x00/libipw_tx.c | 2 +- drivers/net/wireless/ipw2x00/libipw_wx.c | 27 +- drivers/net/wireless/iwlwifi/Kconfig | 95 +- drivers/net/wireless/iwlwifi/Makefile | 8 +- drivers/net/wireless/iwlwifi/iwl-100.c | 73 + drivers/net/wireless/iwlwifi/iwl-3945-commands.h | 1702 -- drivers/net/wireless/iwlwifi/iwl-3945-debug.h | 167 - drivers/net/wireless/iwlwifi/iwl-3945-fh.h | 188 + drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 227 +- drivers/net/wireless/iwlwifi/iwl-3945-io.h | 404 - drivers/net/wireless/iwlwifi/iwl-3945-led.c | 115 +- drivers/net/wireless/iwlwifi/iwl-3945-led.h | 40 +- drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 165 +- drivers/net/wireless/iwlwifi/iwl-3945-rs.h | 206 - drivers/net/wireless/iwlwifi/iwl-3945.c | 1162 +- drivers/net/wireless/iwlwifi/iwl-3945.h | 761 +- drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 47 +- drivers/net/wireless/iwlwifi/iwl-4965.c | 215 +- drivers/net/wireless/iwlwifi/iwl-5000-hw.h | 14 +- drivers/net/wireless/iwlwifi/iwl-5000.c | 237 +- .../iwlwifi/{iwl-3945-core.h => iwl-6000-hw.h} | 59 +- drivers/net/wireless/iwlwifi/iwl-6000.c | 158 + drivers/net/wireless/iwlwifi/iwl-agn-hcmd-check.c | 108 - drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 210 +- drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 55 +- drivers/net/wireless/iwlwifi/iwl-agn.c | 1332 +- drivers/net/wireless/iwlwifi/iwl-calib.c | 93 +- drivers/net/wireless/iwlwifi/iwl-calib.h | 4 +- drivers/net/wireless/iwlwifi/iwl-commands.h | 511 +- drivers/net/wireless/iwlwifi/iwl-core.c | 752 +- drivers/net/wireless/iwlwifi/iwl-core.h | 99 +- drivers/net/wireless/iwlwifi/iwl-csr.h | 7 +- drivers/net/wireless/iwlwifi/iwl-debug.h | 183 +- drivers/net/wireless/iwlwifi/iwl-debugfs.c | 23 +- drivers/net/wireless/iwlwifi/iwl-dev.h | 140 +- drivers/net/wireless/iwlwifi/iwl-eeprom.c | 40 +- drivers/net/wireless/iwlwifi/iwl-eeprom.h | 9 +- drivers/net/wireless/iwlwifi/iwl-fh.h | 21 +- drivers/net/wireless/iwlwifi/iwl-hcmd.c | 32 +- drivers/net/wireless/iwlwifi/iwl-helpers.h | 2 +- drivers/net/wireless/iwlwifi/iwl-io.h | 42 +- drivers/net/wireless/iwlwifi/iwl-led.c | 26 +- drivers/net/wireless/iwlwifi/iwl-led.h | 8 +- drivers/net/wireless/iwlwifi/iwl-power.c | 102 +- drivers/net/wireless/iwlwifi/iwl-power.h | 16 +- drivers/net/wireless/iwlwifi/iwl-prph.h | 4 +- drivers/net/wireless/iwlwifi/iwl-rfkill.c | 17 +- drivers/net/wireless/iwlwifi/iwl-rfkill.h | 2 +- drivers/net/wireless/iwlwifi/iwl-rx.c | 60 +- drivers/net/wireless/iwlwifi/iwl-scan.c | 184 +- drivers/net/wireless/iwlwifi/iwl-spectrum.c | 12 +- drivers/net/wireless/iwlwifi/iwl-spectrum.h | 2 +- drivers/net/wireless/iwlwifi/iwl-sta.c | 95 +- drivers/net/wireless/iwlwifi/iwl-sta.h | 4 +- drivers/net/wireless/iwlwifi/iwl-tx.c | 287 +- drivers/net/wireless/iwlwifi/iwl3945-base.c | 5337 +--- drivers/net/wireless/libertas/Makefile | 2 + drivers/net/wireless/libertas/debugfs.c | 14 +- drivers/net/wireless/libertas/defs.h | 3 + drivers/net/wireless/libertas/host.h | 1 + drivers/net/wireless/libertas/hostcmd.h | 8 + drivers/net/wireless/libertas/if_cs.c | 2 +- drivers/net/wireless/libertas/if_sdio.c | 20 +- drivers/net/wireless/libertas/if_spi.c | 1218 + drivers/net/wireless/libertas/if_spi.h | 208 + drivers/net/wireless/libertas/main.c | 5 +- drivers/net/wireless/libertas/scan.c | 2 +- drivers/net/wireless/libertas_tf/cmd.c | 2 +- drivers/net/wireless/libertas_tf/libertas_tf.h | 2 +- drivers/net/wireless/mac80211_hwsim.c | 2 + drivers/net/wireless/orinoco/Kconfig | 120 + drivers/net/wireless/orinoco/Makefile | 3 +- drivers/net/wireless/orinoco/airport.c | 37 +- drivers/net/wireless/orinoco/fw.c | 379 + drivers/net/wireless/orinoco/fw.h | 16 + drivers/net/wireless/orinoco/hermes.c | 116 +- drivers/net/wireless/orinoco/hermes.h | 35 +- drivers/net/wireless/orinoco/hermes_dld.c | 132 +- drivers/net/wireless/orinoco/hermes_dld.h | 12 +- drivers/net/wireless/orinoco/hw.c | 586 + drivers/net/wireless/orinoco/hw.h | 47 + drivers/net/wireless/orinoco/main.c | 2665 ++ drivers/net/wireless/orinoco/main.h | 63 + drivers/net/wireless/orinoco/mic.c | 79 + drivers/net/wireless/orinoco/mic.h | 22 + drivers/net/wireless/orinoco/orinoco.c | 6159 ----- drivers/net/wireless/orinoco/orinoco.h | 26 +- drivers/net/wireless/orinoco/orinoco_cs.c | 33 +- drivers/net/wireless/orinoco/orinoco_nortel.c | 7 +- drivers/net/wireless/orinoco/orinoco_pci.c | 5 +- drivers/net/wireless/orinoco/orinoco_pci.h | 12 +- drivers/net/wireless/orinoco/orinoco_plx.c | 3 +- drivers/net/wireless/orinoco/orinoco_tmd.c | 4 +- drivers/net/wireless/orinoco/scan.c | 233 + drivers/net/wireless/orinoco/scan.h | 29 + drivers/net/wireless/orinoco/spectrum_cs.c | 19 +- drivers/net/wireless/orinoco/wext.c | 2325 ++ drivers/net/wireless/orinoco/wext.h | 13 + drivers/net/wireless/p54/Kconfig | 10 + drivers/net/wireless/p54/Makefile | 1 + drivers/net/wireless/p54/p54.h | 38 +- drivers/net/wireless/p54/p54common.c | 635 +- drivers/net/wireless/p54/p54common.h | 125 +- drivers/net/wireless/p54/p54pci.c | 6 + drivers/net/wireless/p54/p54spi.c | 770 + drivers/net/wireless/p54/p54spi.h | 125 + drivers/net/wireless/p54/p54spi_eeprom.h | 678 + drivers/net/wireless/p54/p54usb.c | 87 +- drivers/net/wireless/p54/p54usb.h | 1 + drivers/net/wireless/prism54/isl_ioctl.c | 3 +- drivers/net/wireless/prism54/islpci_eth.c | 5 +- drivers/net/wireless/prism54/islpci_mgt.h | 6 - drivers/net/wireless/prism54/oid_mgt.c | 2 +- drivers/net/wireless/rndis_wlan.c | 103 +- drivers/net/wireless/rt2x00/Kconfig | 7 +- drivers/net/wireless/rt2x00/Makefile | 1 + drivers/net/wireless/rt2x00/rt2400pci.c | 103 +- drivers/net/wireless/rt2x00/rt2400pci.h | 6 +- drivers/net/wireless/rt2x00/rt2500pci.c | 131 +- drivers/net/wireless/rt2x00/rt2500pci.h | 6 +- drivers/net/wireless/rt2x00/rt2500usb.c | 72 +- drivers/net/wireless/rt2x00/rt2500usb.h | 14 +- drivers/net/wireless/rt2x00/rt2x00.h | 154 +- drivers/net/wireless/rt2x00/rt2x00config.c | 11 +- drivers/net/wireless/rt2x00/rt2x00crypto.c | 15 +- drivers/net/wireless/rt2x00/rt2x00debug.c | 16 +- drivers/net/wireless/rt2x00/rt2x00debug.h | 2 +- drivers/net/wireless/rt2x00/rt2x00dev.c | 416 +- drivers/net/wireless/rt2x00/rt2x00dump.h | 2 +- drivers/net/wireless/rt2x00/rt2x00firmware.c | 29 +- drivers/net/wireless/rt2x00/rt2x00leds.c | 8 +- drivers/net/wireless/rt2x00/rt2x00leds.h | 2 +- drivers/net/wireless/rt2x00/rt2x00lib.h | 106 +- drivers/net/wireless/rt2x00/rt2x00link.c | 461 + drivers/net/wireless/rt2x00/rt2x00mac.c | 77 +- drivers/net/wireless/rt2x00/rt2x00pci.c | 2 +- drivers/net/wireless/rt2x00/rt2x00pci.h | 2 +- drivers/net/wireless/rt2x00/rt2x00queue.c | 216 +- drivers/net/wireless/rt2x00/rt2x00queue.h | 17 +- drivers/net/wireless/rt2x00/rt2x00reg.h | 22 +- drivers/net/wireless/rt2x00/rt2x00rfkill.c | 127 +- drivers/net/wireless/rt2x00/rt2x00usb.c | 64 +- drivers/net/wireless/rt2x00/rt2x00usb.h | 13 +- drivers/net/wireless/rt2x00/rt61pci.c | 244 +- drivers/net/wireless/rt2x00/rt61pci.h | 13 +- drivers/net/wireless/rt2x00/rt73usb.c | 208 +- drivers/net/wireless/rt2x00/rt73usb.h | 19 +- drivers/net/wireless/rtl818x/rtl8187.h | 4 +- drivers/net/wireless/rtl818x/rtl8187_dev.c | 92 +- drivers/net/wireless/strip.c | 4 +- drivers/net/wireless/wavelan.c | 11 +- drivers/net/wireless/wl3501_cs.c | 9 +- drivers/net/wireless/zd1201.c | 7 +- drivers/net/wireless/zd1211rw/zd_def.h | 5 + drivers/net/wireless/zd1211rw/zd_mac.c | 31 +- drivers/net/xen-netfront.c | 8 +- drivers/net/yellowfin.c | 6 +- drivers/net/znet.c | 17 +- drivers/s390/net/claw.c | 445 +- drivers/s390/net/ctcm_main.c | 24 +- drivers/s390/net/lcs.c | 21 +- drivers/s390/net/netiucv.c | 14 +- drivers/scsi/scsi_transport_fc.c | 16 +- drivers/scsi/scsi_transport_iscsi.c | 12 +- drivers/ssb/Makefile | 1 + drivers/ssb/b43_pci_bridge.c | 2 + drivers/ssb/driver_chipcommon.c | 14 +- drivers/ssb/driver_chipcommon_pmu.c | 508 + drivers/ssb/pci.c | 74 +- drivers/usb/gadget/rndis.c | 92 +- drivers/video/uvesafb.c | 5 +- firmware/3com/typhoon.bin.ihex | 2819 +++ firmware/Makefile | 2 + firmware/WHENCE | 58 + firmware/tehuti/bdx.bin.ihex | 2678 ++ fs/compat_ioctl.c | 8 + fs/quota/dquot.c | 5 +- include/asm-frv/socket.h | 3 + include/asm-m32r/socket.h | 3 + include/asm-mn10300/socket.h | 3 + include/linux/arcdevice.h | 9 +- include/linux/ath9k_platform.h | 28 + include/linux/clocksource.h | 101 + include/linux/com20020.h | 1 + include/linux/connector.h | 8 + include/linux/dccp.h | 51 +- include/linux/errqueue.h | 1 + include/linux/etherdevice.h | 21 + include/linux/ethtool.h | 89 +- include/linux/hdlc.h | 5 + include/linux/hdlcdrv.h | 3 +- include/linux/ibmtr.h | 2 +- include/linux/ieee80211.h | 181 + include/linux/if.h | 1 + include/linux/if_ether.h | 8 +- include/linux/if_pppox.h | 20 +- include/linux/if_tun.h | 2 + include/linux/if_tunnel.h | 16 +- include/linux/inetdevice.h | 1 + include/linux/mroute.h | 18 +- include/linux/ncp_no.h | 26 +- include/linux/net_tstamp.h | 104 + include/linux/netdevice.h | 103 +- include/linux/netfilter_bridge.h | 4 +- include/linux/netlink.h | 1 + include/linux/nl80211.h | 110 +- include/linux/pci_ids.h | 6 + include/linux/pim.h | 4 +- include/linux/ppp_channel.h | 4 + include/linux/rds.h | 250 + include/linux/rtnetlink.h | 4 +- include/linux/sctp.h | 92 +- include/linux/skbuff.h | 115 +- include/linux/smsc911x.h | 3 + include/linux/socket.h | 3 + include/linux/sockios.h | 3 + include/linux/spi/libertas_spi.h | 32 + include/linux/ssb/ssb_driver_chipcommon.h | 224 + include/linux/ssb/ssb_regs.h | 36 + include/linux/sysctl.h | 1 + include/linux/tcp.h | 21 +- include/linux/timecompare.h | 125 + include/linux/usb/rndis_host.h | 85 +- include/linux/virtio_net.h | 71 + include/linux/wimax/i2400m.h | 69 + include/linux/wireless.h | 12 +- include/net/atmclip.h | 1 - include/net/bluetooth/bluetooth.h | 12 + include/net/bluetooth/hci.h | 8 + include/net/bluetooth/hci_core.h | 84 +- include/net/bluetooth/l2cap.h | 13 +- include/net/bluetooth/rfcomm.h | 20 +- include/net/cfg80211.h | 253 + include/net/inet_ecn.h | 4 +- include/net/inet_frag.h | 3 +- include/net/inet_hashtables.h | 4 +- include/net/ip.h | 1 + include/net/ip_vs.h | 4 +- include/net/ipv6.h | 4 +- include/net/ipx.h | 2 +- include/net/mac80211.h | 260 +- include/net/net_namespace.h | 27 +- include/net/netns/ipv4.h | 13 + include/net/netrom.h | 4 - include/net/phonet/phonet.h | 1 - include/net/phonet/pn_dev.h | 5 +- include/net/pkt_sched.h | 1 + include/net/sch_generic.h | 7 +- include/net/sctp/checksum.h | 14 +- include/net/sctp/command.h | 3 +- include/net/sctp/sctp.h | 2 + include/net/sctp/structs.h | 7 + include/net/sock.h | 49 +- include/net/tcp.h | 6 +- include/net/transp_v6.h | 2 +- include/net/wireless.h | 86 +- include/rdma/ib_verbs.h | 2 +- kernel/sysctl_check.c | 1 + kernel/time/Makefile | 2 +- kernel/time/clocksource.c | 76 + kernel/time/timecompare.c | 191 + lib/kobject_uevent.c | 3 + net/802/psnap.c | 9 +- net/802/tr.c | 2 + net/8021q/vlan.c | 2 +- net/8021q/vlan_core.c | 45 +- net/9p/trans_fd.c | 2 +- net/Kconfig | 3 +- net/Makefile | 1 + net/appletalk/ddp.c | 6 +- net/appletalk/dev.c | 10 +- net/atm/br2684.c | 58 +- net/atm/clip.c | 30 +- net/atm/lec.c | 64 +- net/atm/lec.h | 1 - net/ax25/af_ax25.c | 2 +- net/ax25/ax25_iface.c | 13 +- net/bluetooth/af_bluetooth.c | 17 +- net/bluetooth/cmtp/core.c | 3 +- net/bluetooth/hci_conn.c | 64 +- net/bluetooth/hci_core.c | 3 +- net/bluetooth/hci_event.c | 26 +- net/bluetooth/l2cap.c | 602 +- net/bluetooth/rfcomm/core.c | 179 +- net/bluetooth/rfcomm/sock.c | 189 +- net/bluetooth/sco.c | 57 +- net/bridge/br_netfilter.c | 2 +- net/bridge/br_netlink.c | 3 +- net/can/af_can.c | 5 +- net/can/raw.c | 3 + net/compat.c | 19 +- net/core/dev.c | 269 +- net/core/ethtool.c | 58 +- net/core/fib_rules.c | 3 +- net/core/neighbour.c | 9 +- net/core/net_namespace.c | 3 - net/core/pktgen.c | 18 +- net/core/rtnetlink.c | 9 +- net/core/skbuff.c | 213 +- net/core/sock.c | 95 +- net/core/sysctl_net_core.c | 1 + net/dccp/ackvec.h | 3 + net/dccp/dccp.h | 26 +- net/dccp/feat.c | 232 +- net/dccp/feat.h | 21 +- net/dccp/minisocks.c | 11 - net/dccp/options.c | 8 - net/dccp/output.c | 37 +- net/dccp/proto.c | 2 - net/dccp/sysctl.c | 43 +- net/decnet/af_decnet.c | 22 +- net/decnet/dn_dev.c | 6 +- net/decnet/dn_route.c | 2 +- net/decnet/dn_table.c | 3 +- net/decnet/sysctl_net_decnet.c | 2 +- net/dsa/mv88e6123_61_65.c | 2 +- net/dsa/mv88e6131.c | 2 +- net/dsa/tag_dsa.c | 2 +- net/dsa/tag_edsa.c | 2 +- net/dsa/tag_trailer.c | 2 +- net/econet/af_econet.c | 2 +- net/ipv4/Kconfig | 52 +- net/ipv4/af_inet.c | 26 +- net/ipv4/arp.c | 2 +- net/ipv4/devinet.c | 12 +- net/ipv4/fib_frontend.c | 2 +- net/ipv4/fib_semantics.c | 5 +- net/ipv4/icmp.c | 4 +- net/ipv4/inet_connection_sock.c | 42 +- net/ipv4/inet_fragment.c | 1 + net/ipv4/inet_hashtables.c | 12 +- net/ipv4/ip_gre.c | 136 +- net/ipv4/ip_output.c | 6 + net/ipv4/ipconfig.c | 8 +- net/ipv4/ipip.c | 7 +- net/ipv4/ipmr.c | 464 +- net/ipv4/netfilter/nf_nat_snmp_basic.c | 4 +- net/ipv4/proc.c | 4 +- net/ipv4/raw.c | 1 + net/ipv4/route.c | 15 +- net/ipv4/tcp.c | 31 +- net/ipv4/tcp_bic.c | 11 +- net/ipv4/tcp_cong.c | 21 +- net/ipv4/tcp_cubic.c | 11 +- net/ipv4/tcp_htcp.c | 3 +- net/ipv4/tcp_input.c | 116 +- net/ipv4/tcp_ipv4.c | 4 +- net/ipv4/tcp_minisocks.c | 5 +- net/ipv4/tcp_output.c | 52 +- net/ipv4/tcp_scalable.c | 10 +- net/ipv4/tcp_timer.c | 23 +- net/ipv4/tcp_veno.c | 7 +- net/ipv4/tcp_yeah.c | 9 +- net/ipv4/udp.c | 4 + net/ipv4/xfrm4_policy.c | 2 +- net/ipv6/addrconf.c | 54 +- net/ipv6/af_inet6.c | 32 +- net/ipv6/ipv6_sockglue.c | 3 +- net/ipv6/ndisc.c | 22 +- net/ipv6/route.c | 9 +- net/ipv6/sit.c | 5 +- net/ipv6/tcp_ipv6.c | 8 +- net/ipv6/xfrm6_policy.c | 2 +- net/ipv6/xfrm6_state.c | 2 +- net/ipx/af_ipx.c | 4 +- net/irda/irmod.c | 2 +- net/iucv/af_iucv.c | 3 +- net/key/af_key.c | 6 +- net/llc/af_llc.c | 6 +- net/llc/llc_conn.c | 3 +- net/llc/llc_core.c | 4 +- net/mac80211/Makefile | 6 +- net/mac80211/aes_cmac.c | 135 + net/mac80211/aes_cmac.h | 19 + net/mac80211/agg-rx.c | 302 + net/mac80211/agg-tx.c | 701 + net/mac80211/cfg.c | 167 +- net/mac80211/debugfs.c | 59 +- net/mac80211/debugfs_key.c | 79 +- net/mac80211/debugfs_key.h | 10 + net/mac80211/debugfs_netdev.c | 48 +- net/mac80211/debugfs_sta.c | 5 +- net/mac80211/ht.c | 903 +- net/mac80211/ibss.c | 905 + net/mac80211/ieee80211_i.h | 277 +- net/mac80211/iface.c | 154 +- net/mac80211/key.c | 115 +- net/mac80211/key.h | 16 + net/mac80211/main.c | 172 +- net/mac80211/mesh.c | 15 +- net/mac80211/mesh.h | 10 +- net/mac80211/mesh_hwmp.c | 7 +- net/mac80211/mesh_plink.c | 38 +- net/mac80211/mlme.c | 1849 +- net/mac80211/pm.c | 117 + net/mac80211/rate.h | 12 + net/mac80211/rx.c | 406 +- net/mac80211/scan.c | 684 +- net/mac80211/spectmgmt.c | 103 +- net/mac80211/sta_info.c | 52 +- net/mac80211/sta_info.h | 13 +- net/mac80211/tx.c | 122 +- net/mac80211/util.c | 267 +- net/mac80211/wext.c | 441 +- net/mac80211/wme.c | 161 +- net/mac80211/wme.h | 6 - net/mac80211/wpa.c | 152 +- net/mac80211/wpa.h | 5 + net/netfilter/ipvs/ip_vs_sync.c | 4 +- net/netfilter/nf_conntrack_amanda.c | 4 +- net/netfilter/nf_conntrack_h323_main.c | 8 +- net/netfilter/nf_conntrack_netbios_ns.c | 2 +- net/netfilter/nf_conntrack_pptp.c | 2 +- net/netfilter/nf_tproxy_core.c | 1 + net/netlink/af_netlink.c | 49 +- net/netrom/af_netrom.c | 2 +- net/netrom/nr_dev.c | 26 +- net/packet/af_packet.c | 3 +- net/phonet/af_phonet.c | 31 +- net/phonet/pn_dev.c | 119 +- net/phonet/pn_netlink.c | 29 +- net/rds/Kconfig | 13 + net/rds/Makefile | 14 + net/rds/af_rds.c | 586 + net/rds/bind.c | 199 + net/rds/cong.c | 404 + net/rds/connection.c | 487 + net/rds/ib.c | 323 + net/rds/ib.h | 367 + net/rds/ib_cm.c | 726 + net/rds/ib_rdma.c | 641 + net/rds/ib_recv.c | 869 + net/rds/ib_ring.c | 168 + net/rds/ib_send.c | 874 + net/rds/ib_stats.c | 95 + net/rds/ib_sysctl.c | 137 + net/rds/info.c | 241 + net/rds/info.h | 30 + net/rds/iw.c | 333 + net/rds/iw.h | 395 + net/rds/iw_cm.c | 750 + net/rds/iw_rdma.c | 888 + net/rds/iw_recv.c | 869 + net/rds/iw_ring.c | 169 + net/rds/iw_send.c | 975 + net/rds/iw_stats.c | 95 + net/rds/iw_sysctl.c | 137 + net/rds/loop.c | 188 + net/rds/loop.h | 9 + net/rds/message.c | 402 + net/rds/page.c | 221 + net/rds/rdma.c | 679 + net/rds/rdma.h | 84 + net/rds/rdma_transport.c | 214 + net/rds/rdma_transport.h | 28 + net/rds/rds.h | 686 + net/rds/recv.c | 542 + net/rds/send.c | 1003 + net/rds/stats.c | 148 + net/rds/sysctl.c | 122 + net/rds/threads.c | 265 + net/rds/transport.c | 117 + net/rose/af_rose.c | 3 +- net/rose/rose_dev.c | 22 +- net/sched/sch_api.c | 11 + net/sched/sch_hfsc.c | 6 +- net/sched/sch_htb.c | 42 +- net/sched/sch_multiq.c | 2 +- net/sctp/debug.c | 4 + net/sctp/input.c | 14 +- net/sctp/ipv6.c | 36 +- net/sctp/output.c | 16 +- net/sctp/outqueue.c | 3 +- net/sctp/protocol.c | 31 +- net/sctp/sm_make_chunk.c | 4 +- net/sctp/sm_sideeffect.c | 43 +- net/sctp/sm_statefuns.c | 6 +- net/sctp/socket.c | 64 +- net/sctp/transport.c | 9 +- net/socket.c | 84 +- net/sunrpc/xprtsock.c | 53 +- net/unix/af_unix.c | 3 +- net/wanrouter/wanmain.c | 8 +- net/wanrouter/wanproc.c | 2 + net/wimax/op-msg.c | 9 +- net/wimax/stack.c | 12 +- net/wireless/Makefile | 2 +- net/wireless/core.c | 123 +- net/wireless/core.h | 56 +- net/wireless/nl80211.c | 540 +- net/wireless/nl80211.h | 12 + net/wireless/reg.c | 1164 +- net/wireless/reg.h | 45 +- net/wireless/scan.c | 866 + net/wireless/sysfs.c | 39 +- net/wireless/util.c | 2 +- net/wireless/wext-compat.c | 97 + net/x25/af_x25.c | 2 +- 963 files changed, 109708 insertions(+), 78336 deletions(-) create mode 100644 Documentation/networking/rds.txt create mode 100644 Documentation/networking/timestamping.txt create mode 100644 Documentation/networking/timestamping/.gitignore create mode 100644 Documentation/networking/timestamping/Makefile create mode 100644 Documentation/networking/timestamping/timestamping.c create mode 100644 drivers/net/bnx2x_dump.h create mode 100644 drivers/net/fsl_pq_mdio.c create mode 100644 drivers/net/fsl_pq_mdio.h delete mode 100644 drivers/net/gianfar_mii.h create mode 100644 drivers/net/igb/e1000_mbx.c create mode 100644 drivers/net/igb/e1000_mbx.h create mode 100644 drivers/net/ixgbe/ixgbe_82599.c create mode 100644 drivers/net/ixgbe/ixgbe_dcb_82599.c create mode 100644 drivers/net/ixgbe/ixgbe_dcb_82599.h delete mode 100644 drivers/net/tehuti_fw.h delete mode 100644 drivers/net/typhoon-firmware.h delete mode 100644 drivers/net/ucc_geth_mii.c delete mode 100644 drivers/net/ucc_geth_mii.h create mode 100644 drivers/net/wimax/i2400m/sysfs.c create mode 100644 drivers/net/wireless/at76c50x-usb.c create mode 100644 drivers/net/wireless/at76c50x-usb.h create mode 100644 drivers/net/wireless/ath5k/rfbuffer.h create mode 100644 drivers/net/wireless/ath5k/rfgain.h create mode 100644 drivers/net/wireless/ath9k/ahb.c create mode 100644 drivers/net/wireless/ath9k/ani.h create mode 100644 drivers/net/wireless/ath9k/calib.h delete mode 100644 drivers/net/wireless/ath9k/core.h create mode 100644 drivers/net/wireless/ath9k/debug.h create mode 100644 drivers/net/wireless/ath9k/eeprom.h create mode 100644 drivers/net/wireless/ath9k/mac.h create mode 100644 drivers/net/wireless/ath9k/pci.c create mode 100644 drivers/net/wireless/b43/tables_lpphy.c create mode 100644 drivers/net/wireless/b43/tables_lpphy.h rename {include/net => drivers/net/wireless/ipw2x00}/ieee80211.h (99%) create mode 100644 drivers/net/wireless/iwlwifi/iwl-100.c delete mode 100644 drivers/net/wireless/iwlwifi/iwl-3945-commands.h delete mode 100644 drivers/net/wireless/iwlwifi/iwl-3945-debug.h create mode 100644 drivers/net/wireless/iwlwifi/iwl-3945-fh.h delete mode 100644 drivers/net/wireless/iwlwifi/iwl-3945-io.h delete mode 100644 drivers/net/wireless/iwlwifi/iwl-3945-rs.h rename drivers/net/wireless/iwlwifi/{iwl-3945-core.h => iwl-6000-hw.h} (64%) create mode 100644 drivers/net/wireless/iwlwifi/iwl-6000.c delete mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-hcmd-check.c create mode 100644 drivers/net/wireless/libertas/if_spi.c create mode 100644 drivers/net/wireless/libertas/if_spi.h create mode 100644 drivers/net/wireless/orinoco/Kconfig create mode 100644 drivers/net/wireless/orinoco/fw.c create mode 100644 drivers/net/wireless/orinoco/fw.h create mode 100644 drivers/net/wireless/orinoco/hw.c create mode 100644 drivers/net/wireless/orinoco/hw.h create mode 100644 drivers/net/wireless/orinoco/main.c create mode 100644 drivers/net/wireless/orinoco/main.h create mode 100644 drivers/net/wireless/orinoco/mic.c create mode 100644 drivers/net/wireless/orinoco/mic.h delete mode 100644 drivers/net/wireless/orinoco/orinoco.c create mode 100644 drivers/net/wireless/orinoco/scan.c create mode 100644 drivers/net/wireless/orinoco/scan.h create mode 100644 drivers/net/wireless/orinoco/wext.c create mode 100644 drivers/net/wireless/orinoco/wext.h create mode 100644 drivers/net/wireless/p54/p54spi.c create mode 100644 drivers/net/wireless/p54/p54spi.h create mode 100644 drivers/net/wireless/p54/p54spi_eeprom.h create mode 100644 drivers/net/wireless/rt2x00/rt2x00link.c create mode 100644 drivers/ssb/driver_chipcommon_pmu.c create mode 100644 firmware/3com/typhoon.bin.ihex create mode 100644 firmware/tehuti/bdx.bin.ihex create mode 100644 include/linux/ath9k_platform.h create mode 100644 include/linux/net_tstamp.h create mode 100644 include/linux/rds.h create mode 100644 include/linux/spi/libertas_spi.h create mode 100644 include/linux/timecompare.h create mode 100644 kernel/time/timecompare.c create mode 100644 net/mac80211/aes_cmac.c create mode 100644 net/mac80211/aes_cmac.h create mode 100644 net/mac80211/agg-rx.c create mode 100644 net/mac80211/agg-tx.c create mode 100644 net/mac80211/ibss.c create mode 100644 net/mac80211/pm.c create mode 100644 net/rds/Kconfig create mode 100644 net/rds/Makefile create mode 100644 net/rds/af_rds.c create mode 100644 net/rds/bind.c create mode 100644 net/rds/cong.c create mode 100644 net/rds/connection.c create mode 100644 net/rds/ib.c create mode 100644 net/rds/ib.h create mode 100644 net/rds/ib_cm.c create mode 100644 net/rds/ib_rdma.c create mode 100644 net/rds/ib_recv.c create mode 100644 net/rds/ib_ring.c create mode 100644 net/rds/ib_send.c create mode 100644 net/rds/ib_stats.c create mode 100644 net/rds/ib_sysctl.c create mode 100644 net/rds/info.c create mode 100644 net/rds/info.h create mode 100644 net/rds/iw.c create mode 100644 net/rds/iw.h create mode 100644 net/rds/iw_cm.c create mode 100644 net/rds/iw_rdma.c create mode 100644 net/rds/iw_recv.c create mode 100644 net/rds/iw_ring.c create mode 100644 net/rds/iw_send.c create mode 100644 net/rds/iw_stats.c create mode 100644 net/rds/iw_sysctl.c create mode 100644 net/rds/loop.c create mode 100644 net/rds/loop.h create mode 100644 net/rds/message.c create mode 100644 net/rds/page.c create mode 100644 net/rds/rdma.c create mode 100644 net/rds/rdma.h create mode 100644 net/rds/rdma_transport.c create mode 100644 net/rds/rdma_transport.h create mode 100644 net/rds/rds.h create mode 100644 net/rds/recv.c create mode 100644 net/rds/send.c create mode 100644 net/rds/stats.c create mode 100644 net/rds/sysctl.c create mode 100644 net/rds/threads.c create mode 100644 net/rds/transport.c create mode 100644 net/wireless/scan.c Merging wireless/master $ git merge wireless/master Merge made by recursive. drivers/net/wireless/airo.c | 7 +- drivers/net/wireless/ath5k/base.c | 3 +- drivers/net/wireless/ath9k/eeprom.c | 3 +- drivers/net/wireless/ath9k/hw.c | 91 +++++++- drivers/net/wireless/ath9k/hw.h | 2 +- drivers/net/wireless/ath9k/mac.h | 8 +- drivers/net/wireless/ath9k/main.c | 29 ++- drivers/net/wireless/ath9k/phy.h | 2 - drivers/net/wireless/ath9k/rc.c | 27 --- drivers/net/wireless/ath9k/rc.h | 2 - drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 11 +- drivers/net/wireless/iwlwifi/iwl-5000.c | 2 +- drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 23 ++- drivers/net/wireless/iwlwifi/iwl-agn.c | 36 +--- drivers/net/wireless/iwlwifi/iwl-core.c | 33 +++ drivers/net/wireless/iwlwifi/iwl-core.h | 1 + drivers/net/wireless/iwlwifi/iwl-sta.c | 3 +- drivers/net/wireless/iwlwifi/iwl-sta.h | 1 + drivers/net/wireless/iwlwifi/iwl3945-base.c | 319 +++++++++++++++------------ drivers/net/wireless/rt2x00/rt2x00link.c | 20 ++- drivers/net/wireless/wavelan_cs.c | 5 +- drivers/net/wireless/zd1211rw/zd_chip.c | 21 ++ drivers/net/wireless/zd1211rw/zd_chip.h | 2 + drivers/net/wireless/zd1211rw/zd_mac.c | 7 + drivers/ssb/pci.c | 14 +- drivers/ssb/sprom.c | 36 +++ drivers/ssb/ssb_private.h | 1 + include/linux/ssb/ssb.h | 4 + net/mac80211/cfg.c | 3 +- net/mac80211/mlme.c | 6 +- net/mac80211/wext.c | 58 ++++-- 31 files changed, 511 insertions(+), 269 deletions(-) Merging mtd/master $ git merge mtd/master Already up-to-date. Merging crypto/master $ git merge crypto/master Auto-merging MAINTAINERS Auto-merging arch/powerpc/boot/dts/canyonlands.dts Auto-merging crypto/api.c Merge made by recursive. MAINTAINERS | 6 + arch/powerpc/boot/dts/canyonlands.dts | 7 + arch/powerpc/boot/dts/kilauea.dts | 7 + arch/s390/crypto/sha.h | 6 +- arch/s390/crypto/sha1_s390.c | 40 +- arch/s390/crypto/sha256_s390.c | 40 +- arch/s390/crypto/sha512_s390.c | 80 +- arch/s390/crypto/sha_common.c | 20 +- arch/x86/crypto/Makefile | 3 + arch/x86/crypto/aes-i586-asm_32.S | 18 +- arch/x86/crypto/aes-x86_64-asm_64.S | 6 +- arch/x86/crypto/aes_glue.c | 20 +- arch/x86/crypto/aesni-intel_asm.S | 896 +++++++++++++++++++++ arch/x86/crypto/aesni-intel_glue.c | 461 +++++++++++ arch/x86/include/asm/aes.h | 11 + arch/x86/include/asm/cpufeature.h | 1 + crypto/Kconfig | 30 + crypto/Makefile | 2 + crypto/ablkcipher.c | 19 + crypto/aead.c | 16 + crypto/algboss.c | 20 +- crypto/ansi_cprng.c | 17 +- crypto/api.c | 17 +- crypto/blkcipher.c | 2 +- crypto/chainiv.c | 3 +- crypto/cryptd.c | 237 +++--- crypto/crypto_wq.c | 38 + crypto/internal.h | 6 +- crypto/shash.c | 20 +- drivers/char/hw_random/Kconfig | 14 + drivers/char/hw_random/Makefile | 1 + drivers/char/hw_random/timeriomem-rng.c | 151 ++++ drivers/crypto/Kconfig | 15 +- drivers/crypto/Makefile | 1 + drivers/crypto/amcc/Makefile | 2 + drivers/crypto/amcc/crypto4xx_alg.c | 293 +++++++ drivers/crypto/amcc/crypto4xx_core.c | 1310 +++++++++++++++++++++++++++++++ drivers/crypto/amcc/crypto4xx_core.h | 177 +++++ drivers/crypto/amcc/crypto4xx_reg_def.h | 284 +++++++ drivers/crypto/amcc/crypto4xx_sa.c | 108 +++ drivers/crypto/amcc/crypto4xx_sa.h | 243 ++++++ include/crypto/aes.h | 6 +- include/crypto/cryptd.h | 27 + include/crypto/crypto_wq.h | 7 + include/crypto/hash.h | 5 + include/linux/crypto.h | 3 - include/linux/timeriomem-rng.h | 21 + 47 files changed, 4466 insertions(+), 251 deletions(-) create mode 100644 arch/x86/crypto/aesni-intel_asm.S create mode 100644 arch/x86/crypto/aesni-intel_glue.c create mode 100644 arch/x86/include/asm/aes.h create mode 100644 crypto/crypto_wq.c create mode 100644 drivers/char/hw_random/timeriomem-rng.c create mode 100644 drivers/crypto/amcc/Makefile create mode 100644 drivers/crypto/amcc/crypto4xx_alg.c create mode 100644 drivers/crypto/amcc/crypto4xx_core.c create mode 100644 drivers/crypto/amcc/crypto4xx_core.h create mode 100644 drivers/crypto/amcc/crypto4xx_reg_def.h create mode 100644 drivers/crypto/amcc/crypto4xx_sa.c create mode 100644 drivers/crypto/amcc/crypto4xx_sa.h create mode 100644 include/crypto/cryptd.h create mode 100644 include/crypto/crypto_wq.h create mode 100644 include/linux/timeriomem-rng.h Merging vfs/for-next $ git merge vfs/for-next Already up-to-date. Merging sound/for-next $ git merge sound/for-next Resolved 'sound/soc/pxa/pxa2xx-i2s.c' using previous resolution. Auto-merging Documentation/DocBook/Makefile Removing Documentation/sound/oss/CS4232 Auto-merging arch/arm/mach-pxa/e740.c Auto-merging arch/arm/mach-pxa/e750.c Auto-merging arch/arm/mach-pxa/h5000.c Auto-merging arch/arm/mach-pxa/spitz.c Auto-merging drivers/media/video/em28xx/em28xx-audio.c Auto-merging drivers/usb/gadget/gmidi.c Auto-merging include/linux/pci_ids.h Auto-merging sound/arm/pxa2xx-ac97.c Removing sound/isa/cs423x/cs4232.c Auto-merging sound/pci/Kconfig Auto-merging sound/soc/pxa/corgi.c Auto-merging sound/soc/pxa/e800_wm9712.c Auto-merging sound/soc/pxa/poodle.c Auto-merging sound/soc/pxa/pxa-ssp.c Auto-merging sound/soc/pxa/pxa2xx-i2s.c CONFLICT (content): Merge conflict in sound/soc/pxa/pxa2xx-i2s.c Auto-merging sound/soc/pxa/spitz.c Auto-merging sound/soc/pxa/tosa.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master]: created 2c2c990: "Merge commit 'sound/for-next'" $ git diff -M --stat --summary HEAD^.. Documentation/DocBook/Makefile | 3 +- .../{sound/alsa => }/DocBook/alsa-driver-api.tmpl | 17 +- .../alsa => }/DocBook/writing-an-alsa-driver.tmpl | 52 +- Documentation/sound/alsa/ALSA-Configuration.txt | 87 +- Documentation/sound/alsa/HD-Audio-Models.txt | 14 +- Documentation/sound/alsa/HD-Audio.txt | 47 +- Documentation/sound/alsa/soc/dapm.txt | 3 + Documentation/sound/oss/CS4232 | 23 - Documentation/sound/oss/Introduction | 2 +- arch/arm/mach-pxa/e740.c | 5 + arch/arm/mach-pxa/e750.c | 5 + arch/arm/mach-pxa/h5000.c | 7 + arch/arm/mach-pxa/include/mach/eseries-gpio.h | 15 + arch/arm/mach-pxa/spitz.c | 6 + drivers/media/video/cx88/cx88-alsa.c | 7 +- drivers/media/video/em28xx/em28xx-audio.c | 7 +- drivers/media/video/saa7134/saa7134-alsa.c | 8 +- drivers/staging/go7007/snd-go7007.c | 7 +- drivers/usb/gadget/gmidi.c | 7 +- include/linux/input.h | 1 + include/linux/mfd/wm8350/audio.h | 1 + include/linux/pci_ids.h | 2 + include/sound/ad1816a.h | 2 + include/sound/atmel-abdac.h | 23 + include/sound/atmel-ac97c.h | 40 + include/sound/control.h | 52 +- include/sound/core.h | 30 +- include/sound/hwdep.h | 38 +- include/sound/jack.h | 5 + include/sound/pcm.h | 2 +- include/sound/sb.h | 4 +- include/sound/soc-dapm.h | 31 +- include/sound/soc.h | 37 +- include/sound/version.h | 2 +- include/sound/wss.h | 1 + sound/Kconfig | 2 + sound/Makefile | 2 +- sound/aoa/aoa-gpio.h | 2 + sound/aoa/core/alsa.c | 7 +- sound/aoa/core/gpio-feature.c | 17 +- sound/aoa/fabrics/layout.c | 81 +- sound/aoa/soundbus/i2sbus/core.c | 22 +- sound/arm/aaci.c | 7 +- sound/arm/pxa2xx-ac97.c | 7 +- sound/arm/sa11xx-uda1341.c | 9 +- sound/atmel/Kconfig | 19 + sound/atmel/Makefile | 5 + sound/atmel/abdac.c | 602 ++++++++++ sound/atmel/ac97c.c | 932 +++++++++++++++ sound/atmel/ac97c.h | 71 ++ sound/core/hwdep.c | 9 +- sound/core/init.c | 47 +- sound/core/jack.c | 45 +- sound/core/misc.c | 10 +- sound/core/oss/pcm_oss.c | 49 +- sound/core/oss/pcm_plugin.h | 4 +- sound/core/pcm.c | 2 +- sound/core/pcm_native.c | 6 +- sound/core/seq/oss/seq_oss_device.h | 2 +- sound/core/seq/seq_prioq.c | 3 +- sound/core/vmaster.c | 62 +- sound/drivers/dummy.c | 8 +- sound/drivers/ml403-ac97cr.c | 6 +- sound/drivers/mpu401/mpu401.c | 6 +- sound/drivers/mtpav.c | 18 +- sound/drivers/mts64.c | 8 +- sound/drivers/opl3/opl3_lib.c | 2 +- sound/drivers/opl3/opl3_midi.c | 30 +- sound/drivers/opl3/opl3_oss.c | 8 +- sound/drivers/opl3/opl3_synth.c | 2 +- sound/drivers/pcsp/pcsp.c | 8 +- sound/drivers/portman2x4.c | 6 +- sound/drivers/serial-u16550.c | 24 +- sound/drivers/virmidi.c | 12 +- sound/drivers/vx/vx_core.c | 3 +- sound/drivers/vx/vx_hwdep.c | 12 - sound/drivers/vx/vx_uer.c | 2 +- sound/isa/Kconfig | 63 +- sound/isa/Makefile | 2 +- sound/isa/ad1816a/ad1816a.c | 21 +- sound/isa/ad1816a/ad1816a_lib.c | 11 +- sound/isa/ad1848/ad1848.c | 6 +- sound/isa/adlib.c | 6 +- sound/isa/als100.c | 7 +- sound/isa/azt2320.c | 7 +- sound/isa/cmi8330.c | 94 ++- sound/isa/cs423x/Makefile | 8 +- sound/isa/cs423x/cs4231.c | 6 +- sound/isa/cs423x/cs4232.c | 2 - sound/isa/cs423x/cs4236.c | 185 ++-- sound/isa/cs423x/cs4236_lib.c | 45 +- sound/isa/dt019x.c | 7 +- sound/isa/es1688/es1688.c | 29 +- sound/isa/es1688/es1688_lib.c | 23 +- sound/isa/es18xx.c | 24 +- sound/isa/gus/gus_dma.c | 27 +- sound/isa/gus/gus_irq.c | 6 +- sound/isa/gus/gus_pcm.c | 26 +- sound/isa/gus/gus_uart.c | 10 +- sound/isa/gus/gusclassic.c | 6 +- sound/isa/gus/gusextreme.c | 6 +- sound/isa/gus/gusmax.c | 8 +- sound/isa/gus/interwave.c | 42 +- sound/isa/msnd/Makefile | 9 + sound/isa/msnd/msnd.c | 705 +++++++++++ sound/isa/msnd/msnd.h | 308 +++++ sound/isa/msnd/msnd_classic.c | 3 + sound/isa/msnd/msnd_classic.h | 129 ++ sound/isa/msnd/msnd_midi.c | 180 +++ sound/isa/msnd/msnd_pinnacle.c | 1238 ++++++++++++++++++++ sound/isa/msnd/msnd_pinnacle.h | 181 +++ sound/isa/msnd/msnd_pinnacle_mixer.c | 343 ++++++ sound/isa/opl3sa2.c | 45 +- sound/isa/opti9xx/miro.c | 7 +- sound/isa/opti9xx/opti92x-ad1848.c | 65 +- sound/isa/sb/es968.c | 7 +- sound/isa/sb/sb16.c | 28 +- sound/isa/sb/sb8.c | 8 +- sound/isa/sb/sb_mixer.c | 156 ++- sound/isa/sc6000.c | 10 +- sound/isa/sgalaxy.c | 6 +- sound/isa/sscape.c | 205 +--- sound/isa/wavefront/wavefront.c | 30 +- sound/isa/wavefront/wavefront_synth.c | 2 +- sound/isa/wss/wss_lib.c | 160 ++- sound/mips/au1x00.c | 9 +- sound/mips/hal2.c | 6 +- sound/mips/sgio2audio.c | 6 +- sound/oss/ad1848.c | 4 +- sound/oss/dmabuf.c | 2 +- sound/oss/pas2_card.c | 4 +- sound/oss/pss.c | 12 +- sound/oss/sequencer.c | 3 +- sound/parisc/harmony.c | 6 +- sound/pci/Kconfig | 3 +- sound/pci/ac97/ac97_codec.c | 7 +- sound/pci/ac97/ac97_proc.c | 2 + sound/pci/ad1889.c | 6 +- sound/pci/ak4531_codec.c | 3 +- sound/pci/ali5451/ali5451.c | 6 +- sound/pci/als300.c | 8 +- sound/pci/als4000.c | 9 +- sound/pci/atiixp.c | 6 +- sound/pci/atiixp_modem.c | 6 +- sound/pci/au88x0/au88x0.c | 6 +- sound/pci/au88x0/au88x0_a3d.c | 7 +- sound/pci/au88x0/au88x0_core.c | 21 +- sound/pci/au88x0/au88x0_synth.c | 39 +- sound/pci/aw2/aw2-alsa.c | 6 +- sound/pci/azt3328.c | 14 +- sound/pci/bt87x.c | 6 +- sound/pci/ca0106/ca0106_main.c | 105 ++- sound/pci/cmipci.c | 6 +- sound/pci/cs4281.c | 12 +- sound/pci/cs46xx/cs46xx.c | 6 +- sound/pci/cs46xx/cs46xx_lib.c | 6 +- sound/pci/cs46xx/cs46xx_lib.h | 6 +- sound/pci/cs5530.c | 6 +- sound/pci/cs5535audio/cs5535audio.c | 8 +- sound/pci/echoaudio/echo3g_dsp.c | 2 +- sound/pci/echoaudio/echoaudio.c | 6 +- sound/pci/echoaudio/echoaudio_3g.c | 3 +- sound/pci/echoaudio/echoaudio_dsp.c | 6 +- sound/pci/echoaudio/gina20_dsp.c | 4 +- sound/pci/echoaudio/layla20_dsp.c | 4 +- sound/pci/echoaudio/mia_dsp.c | 4 +- sound/pci/echoaudio/midi.c | 4 +- sound/pci/emu10k1/emu10k1.c | 6 +- sound/pci/emu10k1/emu10k1_callback.c | 7 +- sound/pci/emu10k1/emu10k1_main.c | 11 +- sound/pci/emu10k1/emu10k1x.c | 6 +- sound/pci/emu10k1/emufx.c | 11 +- sound/pci/emu10k1/emupcm.c | 37 +- sound/pci/emu10k1/io.c | 4 +- sound/pci/emu10k1/p16v.c | 100 ++- sound/pci/emu10k1/voice.c | 12 +- sound/pci/ens1370.c | 9 +- sound/pci/es1938.c | 29 +- sound/pci/es1968.c | 6 +- sound/pci/fm801.c | 6 +- sound/pci/hda/hda_beep.c | 1 + sound/pci/hda/hda_beep.h | 2 +- sound/pci/hda/hda_codec.c | 333 +++++- sound/pci/hda/hda_codec.h | 15 + sound/pci/hda/hda_generic.c | 2 +- sound/pci/hda/hda_hwdep.c | 228 ++++- sound/pci/hda/hda_intel.c | 42 +- sound/pci/hda/hda_local.h | 32 +- sound/pci/hda/patch_analog.c | 195 ++-- sound/pci/hda/patch_cmedia.c | 12 +- sound/pci/hda/patch_conexant.c | 60 +- sound/pci/hda/patch_realtek.c | 962 ++++++++++------ sound/pci/hda/patch_sigmatel.c | 1062 ++++++++--------- sound/pci/hda/patch_via.c | 17 +- sound/pci/ice1712/ice1712.c | 8 +- sound/pci/ice1712/ice1724.c | 66 +- sound/pci/ice1712/juli.c | 5 +- sound/pci/ice1712/prodigy192.c | 13 +- sound/pci/intel8x0.c | 85 +- sound/pci/intel8x0m.c | 20 +- sound/pci/korg1212/korg1212.c | 6 +- sound/pci/maestro3.c | 6 +- sound/pci/mixart/mixart.c | 6 +- sound/pci/mixart/mixart_hwdep.c | 58 +- sound/pci/nm256/nm256.c | 6 +- sound/pci/oxygen/hifier.c | 12 +- sound/pci/oxygen/oxygen.c | 63 +- sound/pci/oxygen/oxygen.h | 22 +- sound/pci/oxygen/oxygen_io.c | 31 + sound/pci/oxygen/oxygen_lib.c | 104 ++- sound/pci/oxygen/virtuoso.c | 339 +++++-- sound/pci/pcxhr/pcxhr.c | 47 +- sound/pci/pcxhr/pcxhr.h | 5 +- sound/pci/pcxhr/pcxhr_core.h | 2 +- sound/pci/pcxhr/pcxhr_hwdep.c | 12 - sound/pci/pcxhr/pcxhr_mix22.c | 40 +- sound/pci/pcxhr/pcxhr_mix22.h | 3 + sound/pci/pcxhr/pcxhr_mixer.c | 8 +- sound/pci/riptide/riptide.c | 6 +- sound/pci/rme32.c | 7 +- sound/pci/rme96.c | 7 +- sound/pci/rme9652/hdsp.c | 518 +++++---- sound/pci/rme9652/hdspm.c | 17 +- sound/pci/rme9652/rme9652.c | 8 +- sound/pci/sis7019.c | 5 +- sound/pci/sonicvibes.c | 115 ++- sound/pci/trident/trident.c | 6 +- sound/pci/trident/trident_main.c | 57 +- sound/pci/via82xx.c | 29 +- sound/pci/via82xx_modem.c | 11 +- sound/pci/vx222/vx222.c | 6 +- sound/pci/vx222/vx222_ops.c | 8 +- sound/pci/ymfpci/ymfpci.c | 6 +- sound/pci/ymfpci/ymfpci_main.c | 14 +- sound/pcmcia/pdaudiocf/pdaudiocf.c | 19 +- sound/pcmcia/pdaudiocf/pdaudiocf_core.c | 23 +- sound/pcmcia/pdaudiocf/pdaudiocf_irq.c | 4 +- sound/pcmcia/vx/vxpocket.c | 32 +- sound/ppc/Kconfig | 1 + sound/ppc/awacs.c | 88 ++- sound/ppc/burgundy.c | 2 +- sound/ppc/daca.c | 2 +- sound/ppc/pmac.c | 11 +- sound/ppc/powermac.c | 8 +- sound/ppc/snd_ps3.c | 6 +- sound/ppc/tumbler.c | 13 +- sound/sh/aica.c | 8 +- sound/soc/Kconfig | 1 + sound/soc/Makefile | 2 +- sound/soc/atmel/atmel-pcm.c | 2 +- sound/soc/atmel/sam9g20_wm8731.c | 124 ++- sound/soc/au1x/dbdma2.c | 2 +- sound/soc/blackfin/bf5xx-ac97-pcm.c | 2 +- sound/soc/blackfin/bf5xx-ac97.c | 92 +- sound/soc/blackfin/bf5xx-ad73311.c | 4 +- sound/soc/blackfin/bf5xx-i2s-pcm.c | 2 +- sound/soc/blackfin/bf5xx-sport.c | 104 +- sound/soc/codecs/Kconfig | 15 +- sound/soc/codecs/Makefile | 3 + sound/soc/codecs/ac97.c | 22 +- sound/soc/codecs/ad1980.c | 33 +- sound/soc/codecs/ad73311.c | 8 +- sound/soc/codecs/ak4535.c | 32 +- sound/soc/codecs/cs4270.c | 661 ++++++----- sound/soc/codecs/pcm3008.c | 12 +- sound/soc/codecs/ssm2602.c | 38 +- sound/soc/codecs/tlv320aic23.c | 39 +- sound/soc/codecs/tlv320aic26.c | 4 +- sound/soc/codecs/tlv320aic3x.c | 147 ++- sound/soc/codecs/twl4030.c | 502 ++++++--- sound/soc/codecs/twl4030.h | 15 + sound/soc/codecs/uda134x.c | 68 +- sound/soc/codecs/uda1380.c | 108 ++- sound/soc/codecs/wm8350.c | 146 ++- sound/soc/codecs/wm8350.h | 8 + sound/soc/codecs/wm8510.c | 35 +- sound/soc/codecs/wm8580.c | 31 +- sound/soc/codecs/wm8728.c | 38 +- sound/soc/codecs/wm8731.c | 414 +++---- sound/soc/codecs/wm8731.h | 6 - sound/soc/codecs/wm8750.c | 34 +- sound/soc/codecs/wm8753.c | 455 ++++---- sound/soc/codecs/wm8753.h | 6 - sound/soc/codecs/wm8900.c | 35 +- sound/soc/codecs/wm8903.c | 42 +- sound/soc/codecs/wm8971.c | 32 +- sound/soc/codecs/wm8990.c | 36 +- sound/soc/codecs/wm9705.c | 413 +++++++ sound/soc/codecs/wm9705.h | 14 + sound/soc/codecs/wm9712.c | 43 +- sound/soc/codecs/wm9713.c | 56 +- sound/soc/davinci/davinci-evm.c | 3 +- sound/soc/davinci/davinci-pcm.c | 2 +- sound/soc/davinci/davinci-sffsdr.c | 23 +- sound/soc/fsl/Kconfig | 17 +- sound/soc/fsl/Makefile | 7 +- sound/soc/fsl/fsl_dma.c | 178 ++-- sound/soc/fsl/fsl_ssi.c | 19 +- sound/soc/omap/Kconfig | 14 +- sound/soc/omap/Makefile | 2 + sound/soc/omap/n810.c | 2 +- sound/soc/omap/omap-pcm.c | 2 +- sound/soc/omap/omap3pandora.c | 49 +- sound/soc/pxa/Kconfig | 27 + sound/soc/pxa/Makefile | 6 + sound/soc/pxa/corgi.c | 46 +- sound/soc/pxa/e740_wm9705.c | 211 ++++ sound/soc/pxa/e750_wm9705.c | 187 +++ sound/soc/pxa/e800_wm9712.c | 113 ++- sound/soc/pxa/mioa701_wm9713.c | 250 ++++ sound/soc/pxa/palm27x.c | 2 +- sound/soc/pxa/poodle.c | 44 +- sound/soc/pxa/pxa-ssp.c | 12 +- sound/soc/pxa/pxa2xx-i2s.c | 36 - sound/soc/pxa/spitz.c | 2 +- sound/soc/pxa/tosa.c | 2 +- sound/soc/pxa/zylonite.c | 98 ++- sound/soc/s3c24xx/Kconfig | 1 + sound/soc/s3c24xx/neo1973_wm8753.c | 6 - sound/soc/s3c24xx/s3c24xx-i2s.c | 2 +- sound/soc/s3c24xx/s3c24xx-pcm.c | 2 +- sound/soc/soc-core.c | 76 +- sound/soc/soc-dapm.c | 133 ++- sound/soc/soc-jack.c | 138 +++ sound/sparc/amd7930.c | 12 +- sound/sparc/cs4231.c | 9 +- sound/sparc/dbri.c | 8 +- sound/spi/at73c213.c | 7 +- sound/synth/emux/emux_hwdep.c | 21 - sound/synth/emux/emux_oss.c | 2 +- sound/synth/emux/emux_seq.c | 16 +- sound/synth/emux/emux_synth.c | 6 +- sound/synth/emux/soundfont.c | 28 +- sound/usb/Kconfig | 3 + sound/usb/caiaq/caiaq-audio.c | 5 +- sound/usb/caiaq/caiaq-control.c | 42 +- sound/usb/caiaq/caiaq-device.c | 44 +- sound/usb/caiaq/caiaq-device.h | 2 + sound/usb/usbaudio.c | 85 +- sound/usb/usbmixer.c | 164 ++-- sound/usb/usbmixer_maps.c | 26 + sound/usb/usbquirks.h | 10 + sound/usb/usx2y/us122l.c | 59 +- sound/usb/usx2y/usX2Yhwdep.c | 15 - sound/usb/usx2y/usb_stream.c | 2 +- sound/usb/usx2y/usbusx2y.c | 56 +- sound/usb/usx2y/usx2yhwdeppcm.h | 2 + 347 files changed, 13954 insertions(+), 5148 deletions(-) rename Documentation/{sound/alsa => }/DocBook/alsa-driver-api.tmpl (87%) rename Documentation/{sound/alsa => }/DocBook/writing-an-alsa-driver.tmpl (99%) delete mode 100644 Documentation/sound/oss/CS4232 create mode 100644 include/sound/atmel-abdac.h create mode 100644 include/sound/atmel-ac97c.h create mode 100644 sound/atmel/Kconfig create mode 100644 sound/atmel/Makefile create mode 100644 sound/atmel/abdac.c create mode 100644 sound/atmel/ac97c.c create mode 100644 sound/atmel/ac97c.h delete mode 100644 sound/isa/cs423x/cs4232.c create mode 100644 sound/isa/msnd/Makefile create mode 100644 sound/isa/msnd/msnd.c create mode 100644 sound/isa/msnd/msnd.h create mode 100644 sound/isa/msnd/msnd_classic.c create mode 100644 sound/isa/msnd/msnd_classic.h create mode 100644 sound/isa/msnd/msnd_midi.c create mode 100644 sound/isa/msnd/msnd_pinnacle.c create mode 100644 sound/isa/msnd/msnd_pinnacle.h create mode 100644 sound/isa/msnd/msnd_pinnacle_mixer.c create mode 100644 sound/soc/codecs/wm9705.c create mode 100644 sound/soc/codecs/wm9705.h create mode 100644 sound/soc/pxa/e740_wm9705.c create mode 100644 sound/soc/pxa/e750_wm9705.c create mode 100644 sound/soc/pxa/mioa701_wm9713.c create mode 100644 sound/soc/soc-jack.c Merging cpufreq/next $ git merge cpufreq/next Auto-merging arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c Auto-merging arch/x86/kernel/tsc.c Merge made by recursive. Documentation/cpu-freq/governors.txt | 26 ++- Documentation/cpu-freq/user-guide.txt | 12 + arch/x86/include/asm/timer.h | 2 +- arch/x86/kernel/cpu/cpufreq/Kconfig | 19 +- arch/x86/kernel/cpu/cpufreq/Makefile | 8 +- arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 36 ++-- arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c | 54 ++-- arch/x86/kernel/cpu/cpufreq/e_powersaver.c | 21 +- arch/x86/kernel/cpu/cpufreq/elanfreq.c | 6 +- arch/x86/kernel/cpu/cpufreq/gx-suspmod.c | 105 ++++--- arch/x86/kernel/cpu/cpufreq/longhaul.c | 193 ++++++------ arch/x86/kernel/cpu/cpufreq/longhaul.h | 12 +- arch/x86/kernel/cpu/cpufreq/longrun.c | 25 +- arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 67 +++-- arch/x86/kernel/cpu/cpufreq/powernow-k6.c | 44 ++-- arch/x86/kernel/cpu/cpufreq/powernow-k7.c | 239 +++++++++------ arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 386 ++++++++++++++---------- arch/x86/kernel/cpu/cpufreq/powernow-k8.h | 5 +- arch/x86/kernel/cpu/cpufreq/sc520_freq.c | 30 +- arch/x86/kernel/cpu/cpufreq/speedstep-ich.c | 70 +++-- arch/x86/kernel/cpu/cpufreq/speedstep-lib.c | 163 ++++++---- arch/x86/kernel/cpu/cpufreq/speedstep-lib.h | 18 +- arch/x86/kernel/cpu/cpufreq/speedstep-smi.c | 166 ++++++---- arch/x86/kernel/tsc.c | 3 - drivers/cpufreq/cpufreq.c | 55 ++-- drivers/cpufreq/cpufreq_conservative.c | 404 +++++++++++++++---------- drivers/cpufreq/cpufreq_ondemand.c | 74 +++-- drivers/cpufreq/cpufreq_stats.c | 74 +++--- drivers/cpufreq/cpufreq_userspace.c | 27 +- drivers/cpufreq/freq_table.c | 18 +- 30 files changed, 1368 insertions(+), 994 deletions(-) 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]: created 7f04dff: "Merge commit 'v9fs/for-next'" $ git diff -M --stat --summary HEAD^.. Merging quilt/rr $ git merge quilt/rr Resolved 'drivers/hid/hid-core.c' using previous resolution. Resolved 'drivers/media/video/saa7134/saa7134-core.c' using previous resolution. Resolved 'drivers/media/video/saa7134/saa7134.h' using previous resolution. Resolved 'drivers/net/virtio_net.c' using previous resolution. Resolved 'kernel/module.c' using previous resolution. Auto-merging arch/arm/boot/compressed/misc.c Auto-merging arch/s390/include/asm/string.h CONFLICT (delete/modify): arch/x86/include/asm/es7000/apic.h deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/x86/include/asm/es7000/apic.h left in tree. CONFLICT (delete/modify): arch/x86/include/asm/numaq/apic.h deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/x86/include/asm/numaq/apic.h left in tree. Auto-merging drivers/hid/hid-core.c CONFLICT (content): Merge conflict in drivers/hid/hid-core.c Auto-merging drivers/media/video/bt8xx/bttv-driver.c Auto-merging drivers/media/video/bt8xx/bttvp.h Auto-merging drivers/media/video/em28xx/em28xx-cards.c Auto-merging drivers/media/video/em28xx/em28xx.h Auto-merging drivers/media/video/saa7134/saa7134-core.c CONFLICT (content): Merge conflict in drivers/media/video/saa7134/saa7134-core.c Auto-merging drivers/media/video/saa7134/saa7134.h CONFLICT (content): Merge conflict in drivers/media/video/saa7134/saa7134.h Auto-merging drivers/net/virtio_net.c CONFLICT (content): Merge conflict in drivers/net/virtio_net.c Auto-merging drivers/video/cyber2000fb.c Auto-merging drivers/video/uvesafb.c Auto-merging include/linux/sched.h Auto-merging init/main.c Auto-merging kernel/extable.c Auto-merging kernel/fork.c Auto-merging kernel/module.c CONFLICT (content): Merge conflict in kernel/module.c Auto-merging kernel/sched_rt.c Auto-merging scripts/mod/modpost.c Automatic merge failed; fix conflicts and then commit the result. $ git rm -f arch/x86/include/asm/es7000/apic.h arch/x86/include/asm/es7000/apic.h: needs merge arch/x86/include/asm/numaq/apic.h: needs merge drivers/hid/hid-core.c: needs merge drivers/media/video/saa7134/saa7134-core.c: needs merge drivers/media/video/saa7134/saa7134.h: needs merge drivers/net/virtio_net.c: needs merge kernel/module.c: needs merge rm 'arch/x86/include/asm/es7000/apic.h' rm 'arch/x86/include/asm/es7000/apic.h' $ git rm -f arch/x86/include/asm/numaq/apic.h arch/x86/include/asm/numaq/apic.h: needs merge drivers/hid/hid-core.c: needs merge drivers/media/video/saa7134/saa7134-core.c: needs merge drivers/media/video/saa7134/saa7134.h: needs merge drivers/net/virtio_net.c: needs merge kernel/module.c: needs merge rm 'arch/x86/include/asm/numaq/apic.h' rm 'arch/x86/include/asm/numaq/apic.h' Applying: rr: fixup for cpumask:remove-address-of-CPU_MASK_ALL $ git commit -v -a [master]: created 9431492: "Merge branch 'quilt/rr'" $ git diff -M --stat --summary HEAD^.. arch/arm/boot/compressed/misc.c | 5 +- arch/blackfin/lib/strcmp.c | 1 + arch/blackfin/lib/strcpy.c | 1 + arch/blackfin/lib/strncmp.c | 2 + arch/blackfin/lib/strncpy.c | 2 + arch/mips/alchemy/common/time.c | 2 +- arch/sparc/include/asm/topology_64.h | 2 +- arch/x86/kernel/es7000_32.c | 2 +- arch/x86/kernel/numaq_32.c | 2 +- drivers/hid/hid-core.c | 19 +-- drivers/media/video/bt8xx/bttv-driver.c | 8 +- drivers/media/video/bt8xx/bttvp.h | 3 - drivers/media/video/cx88/cx88-mpeg.c | 14 +- drivers/media/video/cx88/cx88.h | 1 - drivers/media/video/em28xx/em28xx-cards.c | 17 +-- drivers/media/video/em28xx/em28xx.h | 2 - drivers/media/video/saa7134/saa7134-core.c | 17 +-- drivers/media/video/saa7134/saa7134.h | 2 - drivers/mtd/nand/nand_base.c | 4 +- drivers/video/aty/aty128fb.c | 2 +- drivers/video/cyber2000fb.c | 9 +- drivers/video/uvesafb.c | 10 +- drivers/virtio/virtio_ring.c | 22 ++- include/asm-frv/gdb-stub.h | 1 - include/asm-mn10300/gdb-stub.h | 1 - include/linux/cpu.h | 5 - include/linux/cpumask.h | 20 +- include/linux/kallsyms.h | 15 ++ include/linux/kmod.h | 11 +- include/linux/mm_types.h | 3 + include/linux/module.h | 63 ++++++- include/linux/moduleparam.h | 42 +++- include/linux/sched.h | 3 + include/linux/string.h | 9 + init/main.c | 8 +- kernel/cpu.c | 21 ++- kernel/extable.c | 6 +- kernel/fork.c | 2 +- kernel/kallsyms.c | 19 ++ kernel/kmod.c | 11 +- kernel/kthread.c | 28 ++-- kernel/module.c | 272 ++++++++++++++++------------ kernel/params.c | 48 ++++- kernel/sched_cpupri.c | 5 +- kernel/sched_rt.c | 15 +- mm/pdflush.c | 2 +- scripts/mod/modpost.c | 4 +- 47 files changed, 453 insertions(+), 310 deletions(-) Merging cifs/master $ git merge cifs/master Merge made by recursive. fs/cifs/CHANGES | 6 ++- fs/cifs/Kconfig | 21 +++--- fs/cifs/README | 22 +++++- fs/cifs/cifs_debug.c | 2 + fs/cifs/cifs_fs_sb.h | 1 + fs/cifs/cifsglob.h | 1 + fs/cifs/cifspdu.h | 76 ++++++-------------- fs/cifs/cifsproto.h | 6 ++ fs/cifs/cifssmb.c | 27 +++++++- fs/cifs/connect.c | 7 ++ fs/cifs/dir.c | 6 +- fs/cifs/file.c | 189 +++++++++++++++++++++++++++++++++++++++++++++----- fs/cifs/inode.c | 3 + fs/cifs/smbfsctl.h | 84 ++++++++++++++++++++++ 14 files changed, 361 insertions(+), 90 deletions(-) create mode 100644 fs/cifs/smbfsctl.h Merging mmc/next $ git merge mmc/next Auto-merging drivers/mmc/host/atmel-mci.c Merge made by recursive. drivers/mmc/core/mmc.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) Merging gfs2/master $ git merge gfs2/master Removing fs/gfs2/locking.c Removing fs/gfs2/locking/dlm/Makefile Removing fs/gfs2/locking/dlm/lock.c Removing fs/gfs2/locking/dlm/lock_dlm.h Removing fs/gfs2/locking/dlm/main.c Removing fs/gfs2/locking/dlm/mount.c Removing fs/gfs2/locking/dlm/sysfs.c Removing fs/gfs2/locking/dlm/thread.c Removing fs/gfs2/mount.h Removing include/linux/lm_interface.h Merge made by recursive. fs/gfs2/Kconfig | 17 +- fs/gfs2/Makefile | 4 +- fs/gfs2/acl.c | 1 - fs/gfs2/bmap.c | 1 - fs/gfs2/dir.c | 1 - fs/gfs2/eaops.c | 1 - fs/gfs2/eattr.c | 1 - fs/gfs2/glock.c | 268 +++++----------- fs/gfs2/glock.h | 127 +++++++- fs/gfs2/glops.c | 45 ++-- fs/gfs2/glops.h | 1 + fs/gfs2/incore.h | 70 ++++- fs/gfs2/inode.c | 13 +- fs/gfs2/inode.h | 22 +- fs/gfs2/lock_dlm.c | 240 ++++++++++++++ fs/gfs2/locking.c | 232 ------------- fs/gfs2/locking/dlm/Makefile | 3 - fs/gfs2/locking/dlm/lock.c | 708 ---------------------------------------- fs/gfs2/locking/dlm/lock_dlm.h | 166 ---------- fs/gfs2/locking/dlm/main.c | 48 --- fs/gfs2/locking/dlm/mount.c | 276 ---------------- fs/gfs2/locking/dlm/sysfs.c | 226 ------------- fs/gfs2/locking/dlm/thread.c | 68 ---- fs/gfs2/log.c | 1 - fs/gfs2/lops.c | 1 - fs/gfs2/main.c | 13 +- fs/gfs2/meta_io.c | 1 - fs/gfs2/mount.c | 128 ++------ fs/gfs2/mount.h | 17 - fs/gfs2/ops_address.c | 5 +- fs/gfs2/ops_dentry.c | 1 - fs/gfs2/ops_export.c | 1 - fs/gfs2/ops_file.c | 74 ++--- fs/gfs2/ops_fstype.c | 150 ++++++--- fs/gfs2/ops_inode.c | 1 - fs/gfs2/ops_super.c | 44 ++- fs/gfs2/quota.c | 203 ++++++------ fs/gfs2/quota.h | 2 + fs/gfs2/recovery.c | 28 +- fs/gfs2/rgrp.c | 189 +++++++---- fs/gfs2/super.c | 1 - fs/gfs2/super.h | 26 +- fs/gfs2/sys.c | 236 +++++++++++++- fs/gfs2/trans.c | 19 +- fs/gfs2/util.c | 11 +- include/linux/lm_interface.h | 277 ---------------- 46 files changed, 1288 insertions(+), 2680 deletions(-) create mode 100644 fs/gfs2/lock_dlm.c delete mode 100644 fs/gfs2/locking.c delete mode 100644 fs/gfs2/locking/dlm/Makefile delete mode 100644 fs/gfs2/locking/dlm/lock.c delete mode 100644 fs/gfs2/locking/dlm/lock_dlm.h delete mode 100644 fs/gfs2/locking/dlm/main.c delete mode 100644 fs/gfs2/locking/dlm/mount.c delete mode 100644 fs/gfs2/locking/dlm/sysfs.c delete mode 100644 fs/gfs2/locking/dlm/thread.c delete mode 100644 fs/gfs2/mount.h delete mode 100644 include/linux/lm_interface.h Merging input/next $ git merge input/next Auto-merging drivers/input/mouse/Kconfig Merge made by recursive. drivers/input/input.c | 7 + drivers/input/misc/ati_remote2.c | 277 +++++++++++++++++++++++++++++++++++--- drivers/input/mouse/Kconfig | 11 ++ drivers/input/mouse/Makefile | 9 +- drivers/input/mouse/hgpk.c | 2 +- drivers/input/mouse/maplemouse.c | 147 ++++++++++++++++++++ drivers/input/mouse/pc110pad.c | 5 +- 7 files changed, 433 insertions(+), 25 deletions(-) create mode 100644 drivers/input/mouse/maplemouse.c Merging bkl-removal/bkl-removal $ git merge bkl-removal/bkl-removal Auto-merging drivers/gpu/drm/drm_fops.c Auto-merging drivers/hid/usbhid/hiddev.c Auto-merging drivers/net/wan/cosa.c Auto-merging drivers/scsi/sg.c Auto-merging drivers/usb/gadget/file_storage.c Auto-merging fs/nfsd/vfs.c Auto-merging include/linux/fs.h Auto-merging net/socket.c Auto-merging sound/core/oss/pcm_oss.c Auto-merging sound/core/pcm_native.c Merge made by recursive. Documentation/filesystems/Locking | 7 +++++-- drivers/char/sonypi.c | 7 +------ drivers/char/tty_io.c | 5 ++--- drivers/gpu/drm/drm_fops.c | 6 +----- drivers/hid/usbhid/hiddev.c | 5 +---- drivers/ieee1394/dv1394.c | 6 +----- drivers/input/evdev.c | 5 +---- drivers/input/joydev.c | 5 +---- drivers/input/mousedev.c | 5 +---- drivers/input/serio/serio_raw.c | 4 +--- drivers/net/wan/cosa.c | 4 ++-- drivers/platform/x86/sony-laptop.c | 7 +------ drivers/scsi/sg.c | 4 +--- drivers/usb/gadget/file_storage.c | 7 ++++++- fs/eventpoll.c | 12 +++++++----- fs/fcntl.c | 33 ++++++++++++++++++++------------- fs/file_table.c | 1 + fs/ioctl.c | 18 ++++-------------- fs/nfsd/vfs.c | 5 ++++- fs/pipe.c | 17 +++-------------- include/linux/eventpoll.h | 1 - include/linux/fs.h | 2 +- ipc/mqueue.c | 2 ++ net/socket.c | 7 +++++++ sound/core/control.c | 7 ++----- sound/core/oss/pcm_oss.c | 2 ++ sound/core/pcm_native.c | 4 +--- sound/core/timer.c | 6 +----- sound/oss/au1550_ac97.c | 2 ++ sound/oss/audio.c | 2 ++ sound/oss/sh_dac_audio.c | 2 ++ sound/oss/swarm_cs4297a.c | 2 ++ sound/oss/vwsnd.c | 2 ++ 33 files changed, 90 insertions(+), 114 deletions(-) Merging ubifs/linux-next $ git merge ubifs/linux-next Merge made by recursive. fs/ubifs/log.c | 3 +-- fs/ubifs/lpt_commit.c | 21 +++++++++++++-------- fs/ubifs/shrinker.c | 6 ++---- 3 files changed, 16 insertions(+), 14 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 Already up-to-date. Merging firmware/master $ git merge firmware/master Resolved 'firmware/Makefile' using previous resolution. Resolved 'firmware/WHENCE' using previous resolution. Resolved 'sound/isa/Kconfig' using previous resolution. Auto-merging drivers/media/dvb/ttpci/av7110.c Removing drivers/media/dvb/ttpci/fdump.c Removing drivers/scsi/ql1040_fw.h Removing drivers/scsi/ql12160_fw.h Removing drivers/scsi/ql1280_fw.h Removing drivers/scsi/qlogicpti_asm.c Auto-merging firmware/Makefile CONFLICT (content): Merge conflict in firmware/Makefile Auto-merging firmware/WHENCE CONFLICT (content): Merge conflict in firmware/WHENCE Auto-merging sound/isa/Kconfig CONFLICT (content): Merge conflict in sound/isa/Kconfig Removing sound/isa/wavefront/yss225.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master]: created d88b973: "Merge commit 'firmware/master'" $ git diff -M --stat --summary HEAD^.. drivers/media/dvb/ttpci/Kconfig | 23 +- drivers/media/dvb/ttpci/Makefile | 9 - drivers/media/dvb/ttpci/av7110.c | 16 - drivers/media/dvb/ttpci/av7110_hw.c | 35 +- drivers/media/dvb/ttpci/av7110_hw.h | 3 +- drivers/media/dvb/ttpci/fdump.c | 44 - drivers/scsi/advansys.c | 1731 ++----------------- drivers/scsi/ql1040_fw.h | 2130 ---------------------- drivers/scsi/ql12160_fw.h | 1811 ------------------- drivers/scsi/ql1280_fw.h | 2048 --------------------- drivers/scsi/qla1280.c | 114 +- drivers/scsi/qla1280.h | 6 + drivers/scsi/qlogicpti.c | 63 +- drivers/scsi/qlogicpti_asm.c | 1160 ------------ firmware/.gitignore | 1 + firmware/Makefile | 29 +- firmware/WHENCE | 59 + 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 + {scripts => firmware}/ihex2fw.c | 0 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/yamaha/yss225_registers.bin.ihex | 998 +++++++++++ scripts/.gitignore | 1 - scripts/Makefile | 3 +- sound/isa/Kconfig | 10 - sound/isa/wavefront/wavefront_fx.c | 16 - sound/isa/wavefront/yss225.c | 2739 ----------------------------- 34 files changed, 9695 insertions(+), 11724 deletions(-) delete mode 100644 drivers/media/dvb/ttpci/fdump.c 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/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 rename {scripts => firmware}/ihex2fw.c (100%) 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/yamaha/yss225_registers.bin.ihex delete mode 100644 sound/isa/wavefront/yss225.c Merging pcmcia/master $ git merge pcmcia/master Already up-to-date. Merging battery/master $ git merge battery/master Merge made by recursive. drivers/power/pcf50633-charger.c | 88 +++++++++++++++++++++++++++++------- drivers/power/pda_power.c | 89 ++++++++++++++++++++++++++++++++----- include/linux/mfd/pcf50633/core.h | 2 + include/linux/mfd/pcf50633/mbc.h | 1 - include/linux/pda_power.h | 2 + 5 files changed, 152 insertions(+), 30 deletions(-) Merging leds/for-mm $ git merge leds/for-mm Merge made by recursive. Documentation/powerpc/dts-bindings/gpio/led.txt | 46 ++++- drivers/leds/Kconfig | 54 +++++- drivers/leds/Makefile | 6 + drivers/leds/led-class.c | 21 ++- drivers/leds/led-triggers.c | 10 +- drivers/leds/leds-dac124s085.c | 150 ++++++++++++++ drivers/leds/leds-gpio.c | 216 ++++++++++++++++---- drivers/leds/leds-pca9532.c | 2 +- drivers/leds/leds-pwm.c | 153 +++++++++++++++ drivers/leds/leds-rb532.c | 77 ++++++++ drivers/leds/leds.h | 4 +- drivers/leds/ledtrig-default-on.c | 2 +- drivers/leds/ledtrig-gpio.c | 239 +++++++++++++++++++++++ drivers/leds/ledtrig-heartbeat.c | 4 +- drivers/leds/ledtrig-ide-disk.c | 3 +- drivers/leds/ledtrig-timer.c | 2 +- include/linux/leds.h | 4 +- include/linux/leds_pwm.h | 21 ++ 18 files changed, 949 insertions(+), 65 deletions(-) create mode 100644 drivers/leds/leds-dac124s085.c create mode 100644 drivers/leds/leds-pwm.c create mode 100644 drivers/leds/leds-rb532.c create mode 100644 drivers/leds/ledtrig-gpio.c create mode 100644 include/linux/leds_pwm.h Merging backlight/for-mm $ git merge backlight/for-mm Merge made by recursive. drivers/video/backlight/Kconfig | 18 +++ drivers/video/backlight/Makefile | 2 + drivers/video/backlight/jornada720_bl.c | 161 +++++++++++++++++++++++++ drivers/video/backlight/jornada720_lcd.c | 153 ++++++++++++++++++++++++ drivers/video/backlight/mbp_nvidia_bl.c | 191 ++++++++++++++++++++++++------ drivers/video/backlight/pwm_bl.c | 4 +- 6 files changed, 491 insertions(+), 38 deletions(-) create mode 100644 drivers/video/backlight/jornada720_bl.c create mode 100644 drivers/video/backlight/jornada720_lcd.c Merging kgdb/kgdb-next $ git merge kgdb/kgdb-next Merge made by recursive. include/linux/kgdb.h | 42 ++++++++++++++++++++++++++++++++++++++++-- kernel/kgdb.c | 6 +++--- 2 files changed, 43 insertions(+), 5 deletions(-) Merging slab/for-next $ git merge slab/for-next Resolved 'include/linux/slub_def.h' using previous resolution. Resolved 'mm/slob.c' using previous resolution. Resolved 'mm/slub.c' using previous resolution. Auto-merging include/linux/slab.h Auto-merging include/linux/slub_def.h CONFLICT (content): Merge conflict in include/linux/slub_def.h Auto-merging init/Kconfig Auto-merging lib/Kconfig.debug Auto-merging mm/slob.c CONFLICT (content): Merge conflict in mm/slob.c Auto-merging mm/slub.c CONFLICT (content): Merge conflict in mm/slub.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master]: created 9d8f398: "Merge commit 'slab/for-next'" $ git diff -M --stat --summary HEAD^.. Documentation/vm/slqbinfo.c | 1054 +++++++++++++ include/linux/rcu_types.h | 18 + include/linux/rcupdate.h | 11 +- include/linux/slab.h | 10 +- include/linux/slqb_def.h | 296 ++++ include/linux/slub_def.h | 6 +- init/Kconfig | 9 +- lib/Kconfig.debug | 20 + mm/Makefile | 1 + mm/slob.c | 40 +- mm/slqb.c | 3622 +++++++++++++++++++++++++++++++++++++++++++ mm/slub.c | 58 +- 12 files changed, 5098 insertions(+), 47 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 Merge made by recursive. drivers/md/bitmap.c | 44 ++- drivers/md/faulty.c | 2 +- drivers/md/linear.c | 4 +- drivers/md/md.c | 480 ++++++++++++++++------ drivers/md/multipath.c | 2 +- drivers/md/raid0.c | 41 +- drivers/md/raid1.c | 13 +- drivers/md/raid10.c | 9 +- drivers/md/raid5.c | 979 ++++++++++++++++++++++++++++++------------- include/linux/raid/md_k.h | 26 +- include/linux/raid/raid5.h | 82 ++++- 11 files changed, 1198 insertions(+), 484 deletions(-) Merging mfd/for-next $ git merge mfd/for-next Auto-merging arch/arm/mach-pxa/magician.c Auto-merging drivers/mfd/pcf50633-core.c Auto-merging drivers/mfd/wm8350-core.c Removing include/linux/ds1wm.h Merge made by recursive. arch/arm/mach-pxa/magician.c | 1 - drivers/mfd/Kconfig | 1 + drivers/mfd/htc-pasic3.c | 169 ++++++++++++++++----------------------- drivers/mfd/pcf50633-core.c | 1 - drivers/mfd/t7l66xb.c | 4 +- drivers/mfd/tc6393xb.c | 2 +- drivers/mfd/twl4030-irq.c | 2 +- drivers/mfd/wm8350-core.c | 37 ++++++--- drivers/w1/masters/ds1wm.c | 58 ++++++------- include/linux/ds1wm.h | 12 --- include/linux/mfd/ds1wm.h | 6 ++ include/linux/mfd/htc-pasic3.h | 1 - include/linux/mfd/wm8350/core.h | 2 + 13 files changed, 135 insertions(+), 161 deletions(-) delete mode 100644 include/linux/ds1wm.h create mode 100644 include/linux/mfd/ds1wm.h Merging hdlc/hdlc-next $ git merge hdlc/hdlc-next Already up-to-date. Merging drm/drm-next $ git merge drm/drm-next Resolved 'drivers/gpu/drm/drm_proc.c' using previous resolution. Auto-merging drivers/gpu/drm/drm_bufs.c Auto-merging drivers/gpu/drm/drm_proc.c CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_proc.c Auto-merging drivers/gpu/drm/drm_stub.c Auto-merging drivers/gpu/drm/drm_sysfs.c Auto-merging drivers/gpu/drm/i915/i915_dma.c Removing drivers/gpu/drm/i915/i915_gem_proc.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master]: created 7725f97: "Merge commit 'drm/drm-next'" $ git diff -M --stat --summary HEAD^.. drivers/gpu/drm/Makefile | 3 +- drivers/gpu/drm/ati_pcigart.c | 40 +- drivers/gpu/drm/drm_bufs.c | 122 +- drivers/gpu/drm/drm_context.c | 4 +- drivers/gpu/drm/drm_debugfs.c | 235 + drivers/gpu/drm/drm_drv.c | 85 +- drivers/gpu/drm/drm_gem.c | 2 +- drivers/gpu/drm/drm_info.c | 328 + drivers/gpu/drm/drm_ioc32.c | 4 + drivers/gpu/drm/drm_memory.c | 6 +- drivers/gpu/drm/drm_proc.c | 720 +- drivers/gpu/drm/drm_stub.c | 108 +- drivers/gpu/drm/drm_sysfs.c | 37 +- drivers/gpu/drm/drm_vm.c | 32 +- drivers/gpu/drm/i810/i810_drv.h | 4 +- drivers/gpu/drm/i830/i830_drv.h | 4 +- drivers/gpu/drm/i915/Makefile | 2 +- drivers/gpu/drm/i915/i915_dma.c | 2 +- drivers/gpu/drm/i915/i915_drv.c | 44 +- drivers/gpu/drm/i915/i915_drv.h | 6 +- drivers/gpu/drm/i915/i915_gem.c | 6 +- drivers/gpu/drm/i915/i915_gem_debugfs.c | 257 + drivers/gpu/drm/i915/i915_gem_proc.c | 334 - drivers/gpu/drm/mga/mga_dma.c | 17 +- drivers/gpu/drm/mga/mga_drv.h | 8 +- drivers/gpu/drm/r128/r128_cce.c | 7 +- drivers/gpu/drm/radeon/Makefile | 2 +- drivers/gpu/drm/radeon/r300_cmdbuf.c | 6 +- drivers/gpu/drm/radeon/r600_cp.c | 2244 +++ drivers/gpu/drm/radeon/r600_microcode.h |23297 +++++++++++++++++++++++++++++++ drivers/gpu/drm/radeon/radeon_cp.c | 518 +- drivers/gpu/drm/radeon/radeon_drv.c | 12 - drivers/gpu/drm/radeon/radeon_drv.h | 634 +- drivers/gpu/drm/radeon/radeon_state.c | 49 +- drivers/gpu/drm/savage/savage_bci.c | 8 +- drivers/gpu/drm/via/via_drv.c | 6 - include/drm/drmP.h | 139 +- include/drm/drm_crtc.h | 2 +- include/drm/drm_os_linux.h | 19 + include/drm/drm_pciids.h | 111 + include/drm/radeon_drm.h | 5 +- 41 files changed, 28132 insertions(+), 1337 deletions(-) create mode 100644 drivers/gpu/drm/drm_debugfs.c create mode 100644 drivers/gpu/drm/drm_info.c create mode 100644 drivers/gpu/drm/i915/i915_gem_debugfs.c delete mode 100644 drivers/gpu/drm/i915/i915_gem_proc.c create mode 100644 drivers/gpu/drm/radeon/r600_cp.c create mode 100644 drivers/gpu/drm/radeon/r600_microcode.h Merging voltage/for-next $ git merge voltage/for-next Auto-merging MAINTAINERS Merge made by recursive. Documentation/ABI/testing/sysfs-class-regulator | 57 +++- MAINTAINERS | 2 +- drivers/regulator/Kconfig | 13 +- drivers/regulator/Makefile | 1 + drivers/regulator/bq24022.c | 3 +- drivers/regulator/core.c | 246 ++++++++++-- drivers/regulator/da903x.c | 3 +- drivers/regulator/fixed.c | 3 +- drivers/regulator/pcf50633-regulator.c | 3 +- drivers/regulator/twl4030-regulator.c | 495 +++++++++++++++++++++++ drivers/regulator/virtual.c | 14 +- drivers/regulator/wm8350-regulator.c | 28 +- drivers/regulator/wm8400-regulator.c | 2 +- include/linux/i2c/twl4030.h | 47 +++ include/linux/regulator/bq24022.h | 3 + include/linux/regulator/consumer.h | 6 +- include/linux/regulator/driver.h | 81 ++++- include/linux/regulator/fixed.h | 3 + include/linux/regulator/machine.h | 6 +- 19 files changed, 939 insertions(+), 77 deletions(-) create mode 100644 drivers/regulator/twl4030-regulator.c Merging security-testing/next $ git merge security-testing/next Auto-merging Documentation/kernel-parameters.txt Auto-merging MAINTAINERS Auto-merging fs/compat.c Auto-merging fs/exec.c Auto-merging fs/file_table.c Auto-merging fs/inode.c Auto-merging fs/namei.c Auto-merging include/linux/sched.h Auto-merging ipc/shm.c Auto-merging kernel/user.c Auto-merging mm/mmap.c Auto-merging mm/shmem.c Merge made by recursive. Documentation/ABI/testing/ima_policy | 61 + Documentation/kernel-parameters.txt | 10 + MAINTAINERS | 19 + drivers/char/tpm/tpm.c | 530 ++++----- drivers/char/tpm/tpm.h | 142 +++ fs/compat.c | 3 + fs/exec.c | 13 + fs/file_table.c | 2 + fs/inode.c | 24 +- fs/namei.c | 8 + include/linux/audit.h | 9 +- include/linux/ima.h | 61 + include/linux/sched.h | 2 + include/linux/tpm.h | 35 + ipc/shm.c | 3 + kernel/user.c | 2 +- mm/mmap.c | 4 + mm/shmem.c | 2 + security/Kconfig | 6 +- security/Makefile | 6 + security/inode.c | 7 +- security/integrity/ima/Kconfig | 55 + security/integrity/ima/Makefile | 9 + security/integrity/ima/ima.h | 166 +++ security/integrity/ima/ima_api.c | 190 +++ security/integrity/ima/ima_audit.c | 81 ++ security/integrity/ima/ima_crypto.c | 140 +++ security/integrity/ima/ima_fs.c | 376 ++++++ security/integrity/ima/ima_iint.c | 204 ++++ security/integrity/ima/ima_init.c | 96 ++ security/integrity/ima/ima_main.c | 327 +++++ security/integrity/ima/ima_policy.c | 414 +++++++ security/integrity/ima/ima_queue.c | 140 +++ security/keys/internal.h | 4 +- security/keys/key.c | 11 +- security/keys/keyctl.c | 2 +- security/keys/keyring.c | 3 + security/keys/permission.c | 5 + security/keys/proc.c | 55 +- security/keys/process_keys.c | 2 + security/keys/request_key.c | 2 +- security/selinux/avc.c | 169 ++-- security/selinux/hooks.c | 294 ++--- security/selinux/include/objsec.h | 2 - security/selinux/include/security.h | 9 +- security/selinux/selinuxfs.c | 2 +- security/selinux/ss/services.c | 2 - security/smack/smack_access.c | 4 +- security/smack/smack_lsm.c | 52 +- security/smack/smackfs.c | 15 +- security/tomoyo/Kconfig | 11 + security/tomoyo/Makefile | 1 + security/tomoyo/common.c | 2206 ++++++++++++++++++++++++++++++++++ security/tomoyo/common.h | 359 ++++++ security/tomoyo/domain.c | 878 ++++++++++++++ security/tomoyo/file.c | 1241 +++++++++++++++++++ security/tomoyo/realpath.c | 482 ++++++++ security/tomoyo/realpath.h | 66 + security/tomoyo/tomoyo.c | 294 +++++ security/tomoyo/tomoyo.h | 106 ++ 60 files changed, 8802 insertions(+), 622 deletions(-) create mode 100644 Documentation/ABI/testing/ima_policy create mode 100644 include/linux/ima.h create mode 100644 include/linux/tpm.h create mode 100644 security/integrity/ima/Kconfig create mode 100644 security/integrity/ima/Makefile create mode 100644 security/integrity/ima/ima.h create mode 100644 security/integrity/ima/ima_api.c create mode 100644 security/integrity/ima/ima_audit.c create mode 100644 security/integrity/ima/ima_crypto.c create mode 100644 security/integrity/ima/ima_fs.c create mode 100644 security/integrity/ima/ima_iint.c create mode 100644 security/integrity/ima/ima_init.c create mode 100644 security/integrity/ima/ima_main.c create mode 100644 security/integrity/ima/ima_policy.c create mode 100644 security/integrity/ima/ima_queue.c create mode 100644 security/tomoyo/Kconfig create mode 100644 security/tomoyo/Makefile create mode 100644 security/tomoyo/common.c create mode 100644 security/tomoyo/common.h create mode 100644 security/tomoyo/domain.c create mode 100644 security/tomoyo/file.c create mode 100644 security/tomoyo/realpath.c create mode 100644 security/tomoyo/realpath.h create mode 100644 security/tomoyo/tomoyo.c create mode 100644 security/tomoyo/tomoyo.h Merging lblnet/master $ git merge lblnet/master Auto-merging Documentation/feature-removal-schedule.txt Auto-merging Documentation/kernel-parameters.txt Auto-merging security/selinux/hooks.c Auto-merging security/selinux/selinuxfs.c Merge made by recursive. Documentation/feature-removal-schedule.txt | 12 -- Documentation/kernel-parameters.txt | 9 -- security/selinux/hooks.c | 153 ++-------------------------- security/selinux/selinuxfs.c | 68 ------------ 4 files changed, 7 insertions(+), 235 deletions(-) Merging quilt/ttydev $ git merge quilt/ttydev Auto-merging drivers/pci/quirks.c Auto-merging drivers/serial/Kconfig Merge made by recursive. drivers/serial/8250_pnp.c | 7 ++++++- drivers/serial/Kconfig | 2 +- drivers/serial/jsm/jsm_driver.c | 7 +++---- fs/devpts/inode.c | 2 ++ 4 files changed, 12 insertions(+), 6 deletions(-) Merging agp/agp-next $ git merge agp/agp-next Already up-to-date. Merging kmemcheck/auto-kmemcheck-next $ git merge kmemcheck/auto-kmemcheck-next Resolved 'MAINTAINERS' using previous resolution. Resolved 'mm/Makefile' using previous resolution. Auto-merging MAINTAINERS CONFLICT (content): Merge conflict in MAINTAINERS Removing arch/x86/include/asm/page_64.h.rej Auto-merging arch/x86/kernel/process.c Auto-merging arch/x86/mm/init_32.c Auto-merging arch/x86/mm/init_64.c Auto-merging include/linux/interrupt.h Auto-merging include/linux/mm_types.h Auto-merging include/linux/slab.h Auto-merging include/linux/slab_def.h Auto-merging init/main.c Auto-merging kernel/fork.c Auto-merging kernel/softirq.c Auto-merging kernel/sysctl.c Auto-merging mm/Makefile CONFLICT (content): Merge conflict in mm/Makefile Auto-merging mm/slab.c Auto-merging mm/slub.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master]: created 69b3dab: "Merge commit 'kmemcheck/auto-kmemcheck-next'" $ git diff -M --stat --summary HEAD^.. Documentation/kmemcheck.txt | 129 ++++++ MAINTAINERS | 8 + arch/x86/Kconfig.debug | 88 ++++ arch/x86/Makefile | 5 + arch/x86/include/asm/dma-mapping.h | 2 + arch/x86/include/asm/kmemcheck.h | 42 ++ arch/x86/include/asm/page_64.h.rej | 114 ----- arch/x86/include/asm/pgtable.h | 5 + arch/x86/include/asm/pgtable_types.h | 9 +- arch/x86/include/asm/string_32.h | 8 + arch/x86/include/asm/string_64.h | 8 + arch/x86/include/asm/xen/hypervisor.h | 28 +- arch/x86/kernel/apic.c | 20 +- arch/x86/kernel/head_32.S | 2 +- arch/x86/kernel/io_apic.c | 16 +- arch/x86/kernel/process.c | 2 +- arch/x86/kernel/stacktrace.c | 7 + arch/x86/kernel/traps.c | 5 + arch/x86/mm/Makefile | 2 + arch/x86/mm/fault.c | 18 +- arch/x86/mm/init_32.c | 4 +- arch/x86/mm/init_64.c | 2 +- arch/x86/mm/kmemcheck/Makefile | 1 + arch/x86/mm/kmemcheck/error.c | 229 ++++++++++ arch/x86/mm/kmemcheck/error.h | 15 + arch/x86/mm/kmemcheck/kmemcheck.c | 752 +++++++++++++++++++++++++++++++++ arch/x86/mm/kmemcheck/opcode.c | 90 ++++ arch/x86/mm/kmemcheck/opcode.h | 10 + arch/x86/mm/kmemcheck/pte.c | 22 + arch/x86/mm/kmemcheck/pte.h | 10 + arch/x86/mm/kmemcheck/shadow.c | 124 ++++++ arch/x86/mm/kmemcheck/shadow.h | 16 + arch/x86/xen/multicalls.c | 15 +- include/linux/gfp.h | 3 +- include/linux/kmemcheck.h | 86 ++++ include/linux/mm_types.h | 8 + include/linux/slab.h | 7 + include/linux/slab_def.h | 81 ++++ include/linux/stacktrace.h | 3 + init/main.c | 4 + kernel/fork.c | 14 +- kernel/sysctl.c | 11 + mm/Makefile | 1 + mm/kmemcheck.c | 103 +++++ mm/slab.c | 101 +---- mm/slub.c | 20 +- 46 files changed, 1993 insertions(+), 257 deletions(-) create mode 100644 Documentation/kmemcheck.txt create mode 100644 arch/x86/include/asm/kmemcheck.h delete mode 100644 arch/x86/include/asm/page_64.h.rej create mode 100644 arch/x86/mm/kmemcheck/Makefile create mode 100644 arch/x86/mm/kmemcheck/error.c create mode 100644 arch/x86/mm/kmemcheck/error.h create mode 100644 arch/x86/mm/kmemcheck/kmemcheck.c create mode 100644 arch/x86/mm/kmemcheck/opcode.c create mode 100644 arch/x86/mm/kmemcheck/opcode.h create mode 100644 arch/x86/mm/kmemcheck/pte.c create mode 100644 arch/x86/mm/kmemcheck/pte.h create mode 100644 arch/x86/mm/kmemcheck/shadow.c create mode 100644 arch/x86/mm/kmemcheck/shadow.h create mode 100644 include/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 oprofile/auto-oprofile-next $ git merge oprofile/auto-oprofile-next Already uptodate! Merge made by recursive. Merging fastboot/auto-fastboot-next $ git merge fastboot/auto-fastboot-next Already up-to-date. Merging sparseirq/auto-sparseirq-next $ git merge sparseirq/auto-sparseirq-next Already uptodate! Merge made by recursive. Merging iommu/auto-iommu-next $ git merge iommu/auto-iommu-next Resolved 'arch/x86/include/asm/dma-mapping.h' using previous resolution. Removing arch/ia64/dig/dig_vtd_iommu.c Auto-merging arch/ia64/kernel/Makefile Auto-merging arch/x86/include/asm/dma-mapping.h CONFLICT (content): Merge conflict in arch/x86/include/asm/dma-mapping.h Auto-merging arch/x86/kernel/Makefile Auto-merging drivers/pci/intel-iommu.c Auto-merging include/linux/intel-iommu.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master]: created 0586f74: "Merge commit 'iommu/auto-iommu-next'" $ git diff -M --stat --summary HEAD^.. arch/ia64/dig/Makefile | 4 +- arch/ia64/dig/dig_vtd_iommu.c | 59 ------ arch/ia64/hp/common/hwsw_iommu.c | 165 ++--------------- arch/ia64/hp/common/sba_iommu.c | 79 ++++++--- arch/ia64/include/asm/dma-mapping.h | 194 +++++++++++--------- arch/ia64/include/asm/machvec.h | 102 +--------- arch/ia64/include/asm/machvec_dig_vtd.h | 20 -- arch/ia64/include/asm/machvec_hpzx1.h | 23 +-- arch/ia64/include/asm/machvec_hpzx1_swiotlb.h | 27 +--- arch/ia64/include/asm/machvec_sn2.h | 27 +--- arch/ia64/kernel/Makefile | 4 +- arch/ia64/kernel/dma-mapping.c | 13 ++ arch/ia64/kernel/machvec.c | 8 +- arch/ia64/kernel/pci-dma.c | 46 +++-- arch/ia64/kernel/pci-swiotlb.c | 30 +++- arch/ia64/sn/pci/pci_dma.c | 99 ++++++----- arch/x86/include/asm/device.h | 2 +- arch/x86/include/asm/dma-mapping.h | 149 ++++++--------- arch/x86/include/asm/iommu.h | 2 +- arch/x86/kernel/Makefile | 2 +- arch/x86/kernel/amd_iommu.c | 24 ++- arch/x86/kernel/pci-calgary_64.c | 38 ++-- arch/x86/kernel/pci-dma.c | 4 +- arch/x86/kernel/pci-gart_64.c | 34 ++-- arch/x86/kernel/pci-nommu.c | 21 +- .../x86/kernel/{pci-swiotlb_64.c => pci-swiotlb.c} | 19 +-- drivers/pci/intel-iommu.c | 50 ++++-- include/linux/dma-mapping.h | 48 +++++ include/linux/intel-iommu.h | 7 - include/linux/swiotlb.h | 41 ++--- lib/swiotlb.c | 88 ++++----- 31 files changed, 591 insertions(+), 838 deletions(-) delete mode 100644 arch/ia64/dig/dig_vtd_iommu.c create mode 100644 arch/ia64/kernel/dma-mapping.c rename arch/x86/kernel/{pci-swiotlb_64.c => pci-swiotlb.c} (81%) Merging uwb/for-upstream $ git merge uwb/for-upstream Already up-to-date. Merging watchdog/master $ git merge watchdog/master Auto-merging drivers/watchdog/Kconfig Merge made by recursive. arch/arm/mach-orion5x/common.c | 29 +++ arch/arm/plat-orion/include/plat/orion5x_wdt.h | 18 ++ drivers/watchdog/cpwd.c | 20 +- drivers/watchdog/davinci_wdt.c | 45 +++-- drivers/watchdog/hpwdt.c | 15 +- drivers/watchdog/ks8695_wdt.c | 1 + drivers/watchdog/orion5x_wdt.c | 75 ++++++-- drivers/watchdog/pcwd_usb.c | 4 +- drivers/watchdog/rc32434_wdt.c | 273 ++++++++++++------------ drivers/watchdog/riowd.c | 15 +- drivers/watchdog/w83697ug_wdt.c | 21 ++- 11 files changed, 315 insertions(+), 201 deletions(-) create mode 100644 arch/arm/plat-orion/include/plat/orion5x_wdt.h Merging proc/proc $ git merge proc/proc Resolved 'security/selinux/hooks.c' using previous resolution. Auto-merging drivers/acpi/battery.c Auto-merging drivers/acpi/fan.c Auto-merging drivers/acpi/sbs.c Auto-merging drivers/acpi/thermal.c Auto-merging drivers/acpi/video.c Auto-merging drivers/input/input.c Auto-merging drivers/net/bonding/bond_main.c Auto-merging drivers/net/wireless/airo.c Auto-merging drivers/platform/x86/thinkpad_acpi.c Auto-merging drivers/s390/block/dasd_proc.c Auto-merging fs/cifs/cifs_debug.c Auto-merging fs/nfs/client.c Removing fs/proc/inode-alloc.txt Auto-merging include/linux/magic.h Auto-merging include/net/net_namespace.h Auto-merging kernel/exit.c Auto-merging net/core/pktgen.c Auto-merging net/sctp/protocol.c Auto-merging security/selinux/hooks.c CONFLICT (content): Merge conflict in security/selinux/hooks.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master]: created a9a9922: "Merge commit 'proc/proc'" $ git diff -M --stat --summary HEAD^.. Documentation/DocBook/procfs_example.c | 9 -- arch/alpha/kernel/srm_env.c | 5 - arch/blackfin/mm/sram-alloc.c | 1 - arch/ia64/kernel/palinfo.c | 2 - arch/ia64/sn/kernel/sn2/prominfo_proc.c | 9 +- arch/powerpc/kernel/rtas_flash.c | 1 - arch/sparc/kernel/led.c | 1 - arch/x86/kernel/cpu/mtrr/if.c | 10 +-- drivers/acpi/ac.c | 1 - drivers/acpi/battery.c | 1 - drivers/acpi/button.c | 3 - drivers/acpi/fan.c | 2 - drivers/acpi/processor_core.c | 2 - drivers/acpi/sbs.c | 1 - drivers/acpi/thermal.c | 2 - drivers/acpi/video.c | 5 - drivers/char/ipmi/ipmi_msghandler.c | 12 +- drivers/char/ipmi/ipmi_si_intf.c | 6 +- drivers/input/input.c | 2 - drivers/isdn/hardware/eicon/divasi.c | 1 - drivers/media/video/cpia.c | 4 +- drivers/message/i2o/i2o_proc.c | 2 - drivers/net/bonding/bond_main.c | 35 +----- drivers/net/irda/vlsi_ir.c | 7 - drivers/net/wireless/airo.c | 1 - drivers/platform/x86/asus_acpi.c | 3 - drivers/platform/x86/thinkpad_acpi.c | 2 - drivers/platform/x86/toshiba_acpi.c | 3 - drivers/rtc/rtc-proc.c | 10 +- drivers/s390/block/dasd_proc.c | 2 - drivers/scsi/scsi_devinfo.c | 2 - drivers/scsi/scsi_proc.c | 3 - drivers/video/via/viafbdev.c | 5 - fs/afs/proc.c | 1 - fs/cifs/cifs_debug.c | 1 - fs/jfs/jfs_debug.c | 1 - fs/nfs/client.c | 2 - fs/proc/Makefile | 1 + fs/proc/automount.c | 28 ++++ fs/proc/base.c | 26 ++-- fs/proc/generic.c | 110 +++++++++++---- fs/proc/inode-alloc.txt | 14 -- fs/proc/inode.c | 23 +--- fs/proc/internal.h | 16 ++- fs/proc/proc_net.c | 235 +++++++++++++++++++++++-------- fs/proc/proc_tty.c | 1 - fs/proc/task_mmu.c | 8 +- fs/proc/uptime.c | 38 +++--- fs/reiserfs/procfs.c | 5 +- include/linux/ipmi_smi.h | 2 +- include/linux/magic.h | 1 + include/linux/proc_fs.h | 14 +-- include/net/net_namespace.h | 1 + kernel/exit.c | 2 +- net/appletalk/atalk_proc.c | 1 - net/atm/mpoa_proc.c | 1 - net/atm/proc.c | 1 - net/can/bcm.c | 4 - net/can/proc.c | 2 - net/core/pktgen.c | 1 - net/irda/irproc.c | 1 - net/llc/llc_proc.c | 1 - net/sctp/protocol.c | 8 +- net/sunrpc/cache.c | 4 - net/sunrpc/stats.c | 10 +- security/selinux/hooks.c | 29 +++- sound/core/info.c | 31 +---- 67 files changed, 397 insertions(+), 382 deletions(-) create mode 100644 fs/proc/automount.c delete mode 100644 fs/proc/inode-alloc.txt Merging bdev/master $ git merge bdev/master Already up-to-date. Merging dwmw2-iommu/master $ git merge dwmw2-iommu/master Already up-to-date. Merging cputime/cputime $ git merge cputime/cputime Already up-to-date. Merging osd/linux-next $ git merge osd/linux-next Auto-merging MAINTAINERS Auto-merging drivers/scsi/Kconfig Auto-merging drivers/scsi/scsi_scan.c Auto-merging fs/Kconfig Auto-merging fs/Makefile Auto-merging include/scsi/scsi.h Merge made by recursive. Documentation/filesystems/exofs.txt | 176 +++++++ fs/Kconfig | 2 + fs/Makefile | 1 + fs/exofs/BUGS | 3 + fs/exofs/Kbuild | 30 ++ fs/exofs/Kconfig | 13 + fs/exofs/common.h | 181 +++++++ fs/exofs/dir.c | 643 ++++++++++++++++++++++++ fs/exofs/exofs.h | 208 ++++++++ fs/exofs/file.c | 82 +++ fs/exofs/inode.c | 931 +++++++++++++++++++++++++++++++++++ fs/exofs/namei.c | 338 +++++++++++++ fs/exofs/osd.c | 230 +++++++++ fs/exofs/super.c | 520 +++++++++++++++++++ fs/exofs/symlink.c | 57 +++ 15 files changed, 3415 insertions(+), 0 deletions(-) create mode 100644 Documentation/filesystems/exofs.txt create mode 100644 fs/exofs/BUGS create mode 100644 fs/exofs/Kbuild create mode 100644 fs/exofs/Kconfig create mode 100644 fs/exofs/common.h create mode 100644 fs/exofs/dir.c create mode 100644 fs/exofs/exofs.h create mode 100644 fs/exofs/file.c create mode 100644 fs/exofs/inode.c create mode 100644 fs/exofs/namei.c create mode 100644 fs/exofs/osd.c create mode 100644 fs/exofs/super.c create mode 100644 fs/exofs/symlink.c Merging fatfs/master $ git merge fatfs/master Already up-to-date. Merging fuse/for-next $ git merge fuse/for-next Already up-to-date. Merging jc_docs/docs-next $ git merge jc_docs/docs-next Merge made by recursive. Documentation/SubmittingPatches | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) Merging nommu/master $ git merge nommu/master Already up-to-date. Merging trivial/for-next $ git merge trivial/for-next Auto-merging Documentation/kernel-parameters.txt Auto-merging arch/powerpc/Kconfig Auto-merging arch/powerpc/platforms/Kconfig Auto-merging arch/sh/Kconfig Auto-merging arch/x86/Kconfig Auto-merging drivers/hid/Kconfig Auto-merging drivers/leds/Kconfig Auto-merging drivers/media/common/tuners/Kconfig Auto-merging drivers/mfd/Kconfig Auto-merging drivers/misc/Kconfig Auto-merging drivers/net/sb1250-mac.c Auto-merging drivers/net/tg3.c Auto-merging drivers/net/wan/farsync.c Auto-merging drivers/net/wireless/ipw2x00/ipw2100.c Auto-merging drivers/net/wireless/ipw2x00/ipw2200.c Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c Auto-merging drivers/net/wireless/iwlwifi/iwl3945-base.c Auto-merging drivers/pci/pci.c Auto-merging drivers/platform/x86/thinkpad_acpi.c Auto-merging drivers/scsi/Kconfig Auto-merging drivers/serial/Kconfig Auto-merging drivers/usb/gadget/Kconfig Auto-merging drivers/usb/serial/Kconfig Auto-merging drivers/usb/wusbcore/security.c Auto-merging include/linux/libata.h Auto-merging init/Kconfig Auto-merging kernel/trace/Kconfig Auto-merging kernel/trace/ftrace.c Auto-merging mm/page_alloc.c Auto-merging net/Kconfig Auto-merging sound/oss/pss.c Auto-merging sound/sh/aica.c Merge made by recursive. CREDITS | 4 ++-- Documentation/00-INDEX | 4 ++-- Documentation/cgroups/00-INDEX | 18 ++++++++++++++++++ Documentation/cgroups/cgroups.txt | 10 +++++----- Documentation/cgroups/cpusets.txt | 12 ++++++------ Documentation/cgroups/devices.txt | 2 +- Documentation/cgroups/memcg_test.txt | 2 +- Documentation/cgroups/memory.txt | 2 +- Documentation/filesystems/ext3.txt | 14 ++++++++++++-- Documentation/ia64/kvm.txt | 2 +- Documentation/kernel-parameters.txt | 4 ++-- .../dts-bindings/fsl/cpm_qe/qe/firmware.txt | 2 +- Documentation/scheduler/sched-rt-group.txt | 2 +- Documentation/vm/numa_memory_policy.txt | 3 ++- Documentation/vm/page_migration | 3 ++- Documentation/x86/x86_64/fake-numa-for-cpusets | 5 +++-- arch/arm/mach-netx/include/mach/netx-regs.h | 2 +- arch/arm/mach-omap1/Kconfig | 2 +- arch/avr32/Kconfig | 6 +++--- arch/blackfin/Kconfig | 6 +++--- arch/cris/Kconfig | 6 +++--- arch/cris/arch-v32/Kconfig | 2 +- arch/cris/arch-v32/drivers/Kconfig | 2 +- arch/cris/arch-v32/mach-fs/Kconfig | 2 +- arch/h8300/kernel/timer/tpu.c | 2 +- arch/mips/Kconfig | 2 +- arch/mips/sgi-ip27/ip27-smp.c | 2 +- arch/powerpc/Kconfig | 2 +- arch/powerpc/platforms/Kconfig | 2 +- arch/powerpc/sysdev/bestcomm/Kconfig | 4 ++-- arch/sh/Kconfig | 4 ++-- arch/sparc/kernel/head_64.S | 2 +- arch/x86/Kconfig | 4 ++-- drivers/ata/Kconfig | 2 +- drivers/base/sys.c | 2 +- drivers/char/bsr.c | 2 +- drivers/gpio/Kconfig | 6 +++--- drivers/hid/Kconfig | 2 +- drivers/input/Kconfig | 2 +- drivers/input/mouse/gpio_mouse.c | 2 +- drivers/isdn/mISDN/Kconfig | 10 ++++++---- drivers/isdn/mISDN/l1oip_codec.c | 2 +- drivers/leds/Kconfig | 6 +++--- drivers/media/common/tuners/Kconfig | 2 +- drivers/media/dvb/frontends/Kconfig | 2 +- drivers/mfd/Kconfig | 2 +- drivers/misc/Kconfig | 6 +++--- drivers/mmc/host/Kconfig | 2 +- drivers/mtd/nand/diskonchip.c | 2 +- drivers/net/sb1250-mac.c | 2 +- drivers/net/skfp/h/hwmtm.h | 2 +- drivers/net/tg3.c | 2 +- drivers/net/wan/farsync.c | 2 +- drivers/net/wireless/ipw2x00/ipw2100.c | 2 +- drivers/net/wireless/ipw2x00/ipw2200.c | 2 +- drivers/net/wireless/iwlwifi/iwl-agn.c | 2 +- drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 +- drivers/net/wireless/libertas/cmd.c | 2 +- drivers/pci/pci.c | 2 +- drivers/platform/x86/thinkpad_acpi.c | 2 +- drivers/scsi/Kconfig | 4 ++-- drivers/serial/Kconfig | 2 +- drivers/staging/Kconfig | 4 ++-- drivers/staging/comedi/Kconfig | 4 ++-- drivers/staging/go7007/Kconfig | 4 ++-- drivers/staging/otus/hal/hpmain.c | 2 +- drivers/staging/panel/Kconfig | 2 +- drivers/usb/atm/ueagle-atm.c | 2 +- drivers/usb/gadget/Kconfig | 2 +- drivers/usb/serial/ChangeLog.history | 2 +- drivers/usb/serial/Kconfig | 4 ++-- drivers/usb/wusbcore/security.c | 2 +- drivers/uwb/Kconfig | 4 ++-- drivers/xen/Kconfig | 2 +- fs/bio.c | 3 +-- fs/ext4/Kconfig | 2 +- fs/fs-writeback.c | 2 +- fs/proc/nommu.c | 2 +- fs/ubifs/Kconfig | 4 ++-- include/linux/cgroup.h | 5 ++++- include/linux/jbd.h | 2 +- include/linux/libata.h | 2 +- include/linux/pwm.h | 2 +- include/linux/usb/wusb.h | 3 +-- init/Kconfig | 8 ++++---- kernel/power/disk.c | 4 ++-- kernel/trace/Kconfig | 9 ++++----- mm/page_alloc.c | 2 +- net/Kconfig | 2 +- net/ipv6/Kconfig | 18 +++++++++--------- net/mac80211/Kconfig | 2 +- net/netfilter/Kconfig | 2 +- net/phonet/Kconfig | 2 +- net/sunrpc/Kconfig | 2 +- net/wimax/Kconfig | 2 +- sound/oss/pss.c | 2 +- sound/sh/aica.c | 2 +- sound/soc/blackfin/Kconfig | 2 +- 98 files changed, 187 insertions(+), 154 deletions(-) create mode 100644 Documentation/cgroups/00-INDEX Merging audit/for-next $ git merge audit/for-next Already up-to-date. Merging squashfs/master $ git merge squashfs/master Already up-to-date. Merging omap/for-next $ git merge omap/for-next Auto-merging arch/arm/mach-omap1/devices.c Auto-merging arch/arm/mach-omap2/devices.c Removing arch/arm/plat-omap/mailbox.h Merge made by recursive. arch/arm/mach-omap1/devices.c | 2 +- arch/arm/mach-omap1/mailbox.c | 29 ++-- arch/arm/mach-omap2/devices.c | 39 +++++-- arch/arm/mach-omap2/mailbox.c | 195 ++++++++++++++++------------ arch/arm/plat-omap/Kconfig | 8 + arch/arm/plat-omap/include/mach/mailbox.h | 27 ++++- arch/arm/plat-omap/include/mach/omap34xx.h | 1 + arch/arm/plat-omap/mailbox.c | 152 ++++++++++++++++------ arch/arm/plat-omap/mailbox.h | 100 -------------- 9 files changed, 307 insertions(+), 246 deletions(-) delete mode 100644 arch/arm/plat-omap/mailbox.h Merging quilt/aoe $ git merge quilt/aoe Already up-to-date. Merging kmemleak/kmemleak $ git merge kmemleak/kmemleak Resolved 'Documentation/kernel-parameters.txt' using previous resolution. Resolved 'include/linux/slab.h' using previous resolution. Resolved 'init/main.c' using previous resolution. Resolved 'lib/Kconfig.debug' using previous resolution. Resolved 'mm/slab.c' using previous resolution. Resolved 'mm/slob.c' using previous resolution. Resolved 'mm/slub.c' using previous resolution. Auto-merging Documentation/kernel-parameters.txt CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt Auto-merging MAINTAINERS Auto-merging arch/arm/kernel/vmlinux.lds.S Auto-merging arch/x86/kernel/vmlinux_32.lds.S Auto-merging arch/x86/kernel/vmlinux_64.lds.S Auto-merging include/linux/percpu.h Auto-merging include/linux/slab.h CONFLICT (content): Merge conflict in include/linux/slab.h Auto-merging init/main.c CONFLICT (content): Merge conflict in init/main.c Auto-merging kernel/module.c Auto-merging lib/Kconfig.debug CONFLICT (content): Merge conflict in lib/Kconfig.debug Auto-merging mm/Makefile Auto-merging mm/page_alloc.c Auto-merging mm/slab.c CONFLICT (content): Merge conflict in mm/slab.c Auto-merging mm/slob.c CONFLICT (content): Merge conflict in mm/slob.c Auto-merging mm/slub.c CONFLICT (content): Merge conflict in mm/slub.c Auto-merging mm/vmalloc.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master]: created a132d6e: "Merge commit 'kmemleak/kmemleak'" $ git diff -M --stat --summary HEAD^.. Documentation/kernel-parameters.txt | 4 + Documentation/kmemleak.txt | 142 ++++ MAINTAINERS | 6 + arch/arm/kernel/vmlinux.lds.S | 2 + arch/x86/kernel/vmlinux_32.lds.S | 1 + arch/x86/kernel/vmlinux_64.lds.S | 1 + drivers/char/vt.c | 7 + include/linux/kmemleak.h | 96 +++ include/linux/percpu.h | 5 + include/linux/slab.h | 2 + init/main.c | 4 +- kernel/module.c | 56 ++ lib/Kconfig.debug | 33 + mm/Makefile | 2 + mm/kmemleak-test.c | 111 +++ mm/kmemleak.c | 1467 +++++++++++++++++++++++++++++++++++ mm/page_alloc.c | 11 + mm/slab.c | 32 +- mm/slob.c | 7 + mm/slub.c | 5 +- mm/vmalloc.c | 30 +- 21 files changed, 2017 insertions(+), 7 deletions(-) create mode 100644 Documentation/kmemleak.txt create mode 100644 include/linux/kmemleak.h create mode 100644 mm/kmemleak-test.c create mode 100644 mm/kmemleak.c Merging quilt/staging $ git merge quilt/staging Auto-merging drivers/staging/Kconfig Auto-merging drivers/staging/comedi/Kconfig Removing drivers/staging/frontier/frontier_compat.h Removing drivers/staging/frontier/surface_sysfs.h Auto-merging drivers/staging/otus/hal/hpmain.c Removing drivers/staging/slicoss/gbdownload.h Removing drivers/staging/slicoss/gbrcvucode.h Removing drivers/staging/slicoss/oasisdbgdownload.h Removing drivers/staging/slicoss/oasisdownload.h Removing drivers/staging/slicoss/oasisrcvucode.h Removing drivers/staging/slicoss/slic_os.h Removing drivers/staging/slicoss/slicbuild.h Removing drivers/staging/slicoss/slicdbg.h Removing drivers/staging/slicoss/slicdump.h Removing drivers/staging/slicoss/slicinc.h Removing drivers/staging/sxg/saharadbgdownload.h Removing drivers/staging/sxg/sxgphycode.h Removing drivers/staging/winbond/bss_f.h Removing drivers/staging/winbond/common.h Removing drivers/staging/winbond/ioctls.h Removing drivers/staging/winbond/mlme_mib.h Removing drivers/staging/winbond/mto_f.h Removing drivers/staging/winbond/os_common.h Removing drivers/staging/winbond/sme_s.h Removing drivers/staging/winbond/wb35_ver.h Removing drivers/staging/wlan-ng/p80211metamib.h Removing drivers/staging/wlan-ng/p80211metamsg.h Removing drivers/staging/wlan-ng/wlan_compat.h Auto-merging firmware/Makefile Auto-merging firmware/WHENCE Auto-merging include/linux/connector.h Auto-merging mm/filemap.c Merge made by recursive. .../filesystems/pohmelfs/design_notes.txt | 70 + Documentation/filesystems/pohmelfs/info.txt | 86 + .../filesystems/pohmelfs/network_protocol.txt | 227 + drivers/staging/Kconfig | 20 + drivers/staging/Makefile | 10 + drivers/staging/agnx/pci.c | 7 +- drivers/staging/agnx/rf.c | 2 +- drivers/staging/altpciechdma/altpciechdma.c | 16 +- drivers/staging/android/binder.c | 18 +- drivers/staging/android/ram_console.c | 8 +- drivers/staging/asus_oled/asus_oled.c | 149 +- drivers/staging/at76_usb/TODO | 9 +- drivers/staging/at76_usb/at76_usb.c | 18 +- drivers/staging/at76_usb/at76_usb.h | 87 + drivers/staging/b3dfg/Kconfig | 9 + drivers/staging/b3dfg/Makefile | 1 + drivers/staging/b3dfg/TODO | 4 + drivers/staging/b3dfg/b3dfg.c | 1119 +++ drivers/staging/benet/be_int.c | 4 +- drivers/staging/comedi/Kconfig | 14 + drivers/staging/comedi/comedi.h | 9 +- drivers/staging/comedi/comedi_fops.c | 41 +- drivers/staging/comedi/comedi_fops.h | 1 + drivers/staging/comedi/comedi_ksyms.c | 2 + drivers/staging/comedi/comedidev.h | 5 +- drivers/staging/comedi/drivers.c | 41 +- drivers/staging/comedi/drivers/8253.h | 420 + drivers/staging/comedi/drivers/8255.c | 442 + drivers/staging/comedi/drivers/8255.h | 57 + drivers/staging/comedi/drivers/Makefile | 113 +- drivers/staging/comedi/drivers/acl7225b.c | 149 + .../comedi/drivers/addi-data/APCI1710_82x54.c | 1047 +++ .../comedi/drivers/addi-data/APCI1710_82x54.h | 73 + .../comedi/drivers/addi-data/APCI1710_Chrono.c | 2032 +++++ .../comedi/drivers/addi-data/APCI1710_Chrono.h | 74 + .../comedi/drivers/addi-data/APCI1710_Dig_io.c | 1020 +++ .../comedi/drivers/addi-data/APCI1710_Dig_io.h | 46 + .../comedi/drivers/addi-data/APCI1710_INCCPT.c | 5363 ++++++++++++ .../comedi/drivers/addi-data/APCI1710_INCCPT.h | 271 + .../comedi/drivers/addi-data/APCI1710_Inp_cpt.c | 861 ++ .../comedi/drivers/addi-data/APCI1710_Inp_cpt.h | 47 + .../comedi/drivers/addi-data/APCI1710_Pwm.c | 3588 ++++++++ .../comedi/drivers/addi-data/APCI1710_Pwm.h | 76 + .../comedi/drivers/addi-data/APCI1710_Ssi.c | 848 ++ .../comedi/drivers/addi-data/APCI1710_Ssi.h | 43 + .../comedi/drivers/addi-data/APCI1710_Tor.c | 2049 +++++ .../comedi/drivers/addi-data/APCI1710_Tor.h | 57 + .../comedi/drivers/addi-data/APCI1710_Ttl.c | 1038 +++ .../comedi/drivers/addi-data/APCI1710_Ttl.h | 44 + .../comedi/drivers/addi-data/addi_amcc_S5920.c | 203 + .../comedi/drivers/addi-data/addi_amcc_S5920.h | 27 + .../comedi/drivers/addi-data/addi_amcc_s5933.h | 476 + .../staging/comedi/drivers/addi-data/addi_common.c | 3062 +++++++ .../staging/comedi/drivers/addi-data/addi_common.h | 465 + .../staging/comedi/drivers/addi-data/addi_eeprom.c | 1158 +++ .../comedi/drivers/addi-data/amcc_s5933_58.h | 475 + .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 1265 +++ .../comedi/drivers/addi-data/hwdrv_APCI1710.h | 71 + .../comedi/drivers/addi-data/hwdrv_apci035.c | 600 ++ .../comedi/drivers/addi-data/hwdrv_apci035.h | 123 + .../comedi/drivers/addi-data/hwdrv_apci1032.c | 285 + .../comedi/drivers/addi-data/hwdrv_apci1032.h | 63 + .../comedi/drivers/addi-data/hwdrv_apci1500.c | 3045 +++++++ .../comedi/drivers/addi-data/hwdrv_apci1500.h | 165 + .../comedi/drivers/addi-data/hwdrv_apci1516.c | 542 ++ .../comedi/drivers/addi-data/hwdrv_apci1516.h | 64 + .../comedi/drivers/addi-data/hwdrv_apci1564.c | 1105 +++ .../comedi/drivers/addi-data/hwdrv_apci1564.h | 119 + .../comedi/drivers/addi-data/hwdrv_apci16xx.c | 780 ++ .../comedi/drivers/addi-data/hwdrv_apci16xx.h | 94 + .../comedi/drivers/addi-data/hwdrv_apci2016.c | 460 + .../comedi/drivers/addi-data/hwdrv_apci2016.h | 70 + .../comedi/drivers/addi-data/hwdrv_apci2032.c | 579 ++ .../comedi/drivers/addi-data/hwdrv_apci2032.h | 81 + .../comedi/drivers/addi-data/hwdrv_apci2200.c | 549 ++ .../comedi/drivers/addi-data/hwdrv_apci2200.h | 61 + .../comedi/drivers/addi-data/hwdrv_apci3120.c | 2688 ++++++ .../comedi/drivers/addi-data/hwdrv_apci3120.h | 241 + .../comedi/drivers/addi-data/hwdrv_apci3200.c | 3642 ++++++++ .../comedi/drivers/addi-data/hwdrv_apci3200.h | 187 + .../comedi/drivers/addi-data/hwdrv_apci3501.c | 742 ++ .../comedi/drivers/addi-data/hwdrv_apci3501.h | 94 + .../comedi/drivers/addi-data/hwdrv_apci3xxx.c | 1691 ++++ .../comedi/drivers/addi-data/hwdrv_apci3xxx.h | 62 + drivers/staging/comedi/drivers/addi_apci_035.c | 5 + drivers/staging/comedi/drivers/addi_apci_1032.c | 3 + drivers/staging/comedi/drivers/addi_apci_1500.c | 3 + drivers/staging/comedi/drivers/addi_apci_1516.c | 3 + drivers/staging/comedi/drivers/addi_apci_1564.c | 3 + drivers/staging/comedi/drivers/addi_apci_16xx.c | 3 + drivers/staging/comedi/drivers/addi_apci_1710.c | 3 + drivers/staging/comedi/drivers/addi_apci_2016.c | 3 + drivers/staging/comedi/drivers/addi_apci_2032.c | 3 + drivers/staging/comedi/drivers/addi_apci_2200.c | 3 + drivers/staging/comedi/drivers/addi_apci_3001.c | 3 + drivers/staging/comedi/drivers/addi_apci_3120.c | 3 + drivers/staging/comedi/drivers/addi_apci_3200.c | 3 + drivers/staging/comedi/drivers/addi_apci_3300.c | 3 + drivers/staging/comedi/drivers/addi_apci_3501.c | 3 + drivers/staging/comedi/drivers/addi_apci_3xxx.c | 3 + drivers/staging/comedi/drivers/addi_apci_all.c | 18 + drivers/staging/comedi/drivers/adl_pci6208.c | 390 + drivers/staging/comedi/drivers/adl_pci7296.c | 173 + drivers/staging/comedi/drivers/adl_pci7432.c | 202 + drivers/staging/comedi/drivers/adl_pci8164.c | 512 ++ drivers/staging/comedi/drivers/adl_pci9111.c | 1446 ++++ drivers/staging/comedi/drivers/adl_pci9118.c | 2100 +++++ drivers/staging/comedi/drivers/adq12b.c | 394 + drivers/staging/comedi/drivers/adv_pci1710.c | 1568 ++++ drivers/staging/comedi/drivers/adv_pci1723.c | 465 + drivers/staging/comedi/drivers/adv_pci_dio.c | 1077 +++ drivers/staging/comedi/drivers/aio_aio12_8.c | 226 + drivers/staging/comedi/drivers/aio_iiro_16.c | 177 + drivers/staging/comedi/drivers/am9513.h | 79 + drivers/staging/comedi/drivers/amcc_s5933.h | 172 + drivers/staging/comedi/drivers/amplc_dio200.c | 1483 ++++ drivers/staging/comedi/drivers/amplc_pc236.c | 654 ++ drivers/staging/comedi/drivers/amplc_pc263.c | 431 + drivers/staging/comedi/drivers/amplc_pci224.c | 1545 ++++ drivers/staging/comedi/drivers/amplc_pci230.c | 2977 +++++++ drivers/staging/comedi/drivers/c6xdigio.c | 517 ++ drivers/staging/comedi/drivers/cb_das16_cs.c | 976 +++ drivers/staging/comedi/drivers/cb_pcidas.c | 1828 ++++ drivers/staging/comedi/drivers/cb_pcidas64.c | 4220 +++++++++ drivers/staging/comedi/drivers/cb_pcidda.c | 841 ++ drivers/staging/comedi/drivers/cb_pcidio.c | 294 + drivers/staging/comedi/drivers/cb_pcimdas.c | 484 ++ drivers/staging/comedi/drivers/cb_pcimdda.c | 474 + drivers/staging/comedi/drivers/comedi_rt_timer.c | 728 ++ drivers/staging/comedi/drivers/contec_pci_dio.c | 230 + drivers/staging/comedi/drivers/daqboard2000.c | 877 ++ drivers/staging/comedi/drivers/das08.c | 1068 +++ drivers/staging/comedi/drivers/das08.h | 78 + drivers/staging/comedi/drivers/das08_cs.c | 489 ++ drivers/staging/comedi/drivers/das16.c | 1730 ++++ drivers/staging/comedi/drivers/das16m1.c | 765 ++ drivers/staging/comedi/drivers/das1800.c | 1758 ++++ drivers/staging/comedi/drivers/das6402.c | 354 + drivers/staging/comedi/drivers/das800.c | 894 ++ drivers/staging/comedi/drivers/dmm32at.c | 1081 +++ drivers/staging/comedi/drivers/dt2801.c | 693 ++ drivers/staging/comedi/drivers/dt2811.c | 601 ++ drivers/staging/comedi/drivers/dt2814.c | 381 + drivers/staging/comedi/drivers/dt2815.c | 262 + drivers/staging/comedi/drivers/dt2817.c | 178 + drivers/staging/comedi/drivers/dt282x.c | 1471 ++++ drivers/staging/comedi/drivers/dt3000.c | 979 +++ drivers/staging/comedi/drivers/fl512.c | 184 + drivers/staging/comedi/drivers/gsc_hpdi.c | 1056 +++ drivers/staging/comedi/drivers/ii_pci20kc.c | 610 ++ drivers/staging/comedi/drivers/jr3_pci.c | 972 +++ drivers/staging/comedi/drivers/jr3_pci.h | 634 ++ drivers/staging/comedi/drivers/ke_counter.c | 250 + drivers/staging/comedi/drivers/me4000.c | 2 +- drivers/staging/comedi/drivers/mpc624.c | 384 + drivers/staging/comedi/drivers/mpc8260cpm.c | 167 + drivers/staging/comedi/drivers/multiq3.c | 333 + drivers/staging/comedi/drivers/ni_6527.c | 486 ++ drivers/staging/comedi/drivers/ni_65xx.c | 805 ++ drivers/staging/comedi/drivers/ni_660x.c | 1322 +++ drivers/staging/comedi/drivers/ni_670x.c | 334 + drivers/staging/comedi/drivers/ni_at_a2150.c | 907 ++ drivers/staging/comedi/drivers/ni_at_ao.c | 451 + drivers/staging/comedi/drivers/ni_atmio.c | 513 ++ drivers/staging/comedi/drivers/ni_atmio16d.c | 858 ++ drivers/staging/comedi/drivers/ni_daq_700.c | 840 ++ drivers/staging/comedi/drivers/ni_daq_dio24.c | 597 ++ drivers/staging/comedi/drivers/ni_labpc.c | 2005 +++++ drivers/staging/comedi/drivers/ni_labpc.h | 85 + drivers/staging/comedi/drivers/ni_labpc_cs.c | 574 ++ drivers/staging/comedi/drivers/ni_mio_common.c | 5862 +++++++++++++ drivers/staging/comedi/drivers/ni_mio_cs.c | 550 ++ drivers/staging/comedi/drivers/ni_pcidio.c | 1300 +++ drivers/staging/comedi/drivers/ni_pcimio.c | 1788 ++++ drivers/staging/comedi/drivers/ni_stc.h | 1498 ++++ drivers/staging/comedi/drivers/ni_tio.c | 1691 ++++ drivers/staging/comedi/drivers/ni_tio.h | 163 + drivers/staging/comedi/drivers/ni_tio_internal.h | 774 ++ drivers/staging/comedi/drivers/ni_tiocmd.c | 523 ++ drivers/staging/comedi/drivers/pcl711.c | 619 ++ drivers/staging/comedi/drivers/pcl724.c | 220 + drivers/staging/comedi/drivers/pcl725.c | 111 + drivers/staging/comedi/drivers/pcl726.c | 373 + drivers/staging/comedi/drivers/pcl730.c | 166 + drivers/staging/comedi/drivers/pcl812.c | 1601 ++++ drivers/staging/comedi/drivers/pcl816.c | 1247 +++ drivers/staging/comedi/drivers/pcl818.c | 1984 +++++ drivers/staging/comedi/drivers/pcm3724.c | 306 + drivers/staging/comedi/drivers/pcm3730.c | 152 + drivers/staging/comedi/drivers/pcmad.c | 173 + drivers/staging/comedi/drivers/pcmda12.c | 304 + drivers/staging/comedi/drivers/pcmmio.c | 1333 +++ drivers/staging/comedi/drivers/pcmuio.c | 1101 +++ drivers/staging/comedi/drivers/plx9052.h | 86 + drivers/staging/comedi/drivers/poc.c | 247 + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 1364 +++ drivers/staging/comedi/drivers/rtd520.c | 2 +- drivers/staging/comedi/drivers/rti800.c | 456 + drivers/staging/comedi/drivers/rti802.c | 151 + drivers/staging/comedi/drivers/s526.c | 975 +++ drivers/staging/comedi/drivers/serial2002.c | 864 ++ drivers/staging/comedi/drivers/skel.c | 619 ++ drivers/staging/comedi/drivers/ssv_dnp.c | 309 + drivers/staging/comedi/drivers/unioxx5.c | 515 ++ drivers/staging/comedi/drivers/usbdux.c | 174 +- drivers/staging/comedi/drivers/usbduxfast.c | 2015 +++-- drivers/staging/comedi/rt_pend_tq.c | 2 +- drivers/staging/dst/Kconfig | 67 + drivers/staging/dst/Makefile | 3 + drivers/staging/dst/crypto.c | 731 ++ drivers/staging/dst/dcore.c | 995 +++ drivers/staging/dst/export.c | 657 ++ drivers/staging/dst/state.c | 839 ++ drivers/staging/dst/thread_pool.c | 345 + drivers/staging/dst/trans.c | 335 + drivers/staging/et131x/et1310_rx.c | 3 +- drivers/staging/frontier/README | 53 +- drivers/staging/frontier/alphatrack.c | 383 +- drivers/staging/frontier/alphatrack.h | 80 +- drivers/staging/frontier/frontier_compat.h | 63 - drivers/staging/frontier/surface_sysfs.h | 100 - drivers/staging/frontier/tranzport.c | 685 +- drivers/staging/go7007/s2250-board.c | 7 +- drivers/staging/heci/Kconfig | 6 + drivers/staging/heci/Makefile | 9 + drivers/staging/heci/TODO | 6 + drivers/staging/heci/heci.h | 176 + drivers/staging/heci/heci_data_structures.h | 530 ++ drivers/staging/heci/heci_init.c | 1077 +++ drivers/staging/heci/heci_interface.c | 485 ++ drivers/staging/heci/heci_interface.h | 170 + drivers/staging/heci/heci_main.c | 1564 ++++ drivers/staging/heci/heci_version.h | 54 + drivers/staging/heci/interrupt.c | 1553 ++++ drivers/staging/heci/io_heci.c | 847 ++ drivers/staging/line6/Kconfig | 20 + drivers/staging/line6/Makefile | 15 + drivers/staging/line6/audio.c | 72 + drivers/staging/line6/audio.h | 24 + drivers/staging/line6/capture.c | 372 + drivers/staging/line6/capture.h | 32 + drivers/staging/line6/config.h | 48 + drivers/staging/line6/control.c | 840 ++ drivers/staging/line6/control.h | 187 + drivers/staging/line6/driver.c | 1102 +++ drivers/staging/line6/driver.h | 204 + drivers/staging/line6/dumprequest.c | 151 + drivers/staging/line6/dumprequest.h | 90 + drivers/staging/line6/midi.c | 422 + drivers/staging/line6/midi.h | 87 + drivers/staging/line6/midibuf.c | 262 + drivers/staging/line6/midibuf.h | 39 + drivers/staging/line6/pcm.c | 301 + drivers/staging/line6/pcm.h | 222 + drivers/staging/line6/playback.c | 427 + drivers/staging/line6/playback.h | 30 + drivers/staging/line6/pod.c | 1151 +++ drivers/staging/line6/pod.h | 204 + drivers/staging/line6/revision.h | 4 + drivers/staging/line6/toneport.c | 241 + drivers/staging/line6/toneport.h | 45 + drivers/staging/line6/usbdefs.h | 74 + drivers/staging/line6/variax.c | 546 ++ drivers/staging/line6/variax.h | 108 + drivers/staging/me4000/me4000.c | 193 +- drivers/staging/meilhaus/me1600_ao.c | 4 +- drivers/staging/meilhaus/me4600_ao.c | 2 +- drivers/staging/meilhaus/me6000_ao.c | 11 +- drivers/staging/meilhaus/memain.c | 2 +- drivers/staging/mimio/Kconfig | 2 +- drivers/staging/otus/80211core/cmmsta.c | 5 +- drivers/staging/otus/80211core/coid.c | 8 +- drivers/staging/otus/80211core/cwm.c | 6 +- drivers/staging/otus/hal/hpani.c | 46 +- drivers/staging/otus/hal/hpmain.c | 99 +- drivers/staging/otus/hal/hpreg.c | 9 +- drivers/staging/otus/hal/hprw.c | 30 +- drivers/staging/otus/hal/hpusb.c | 11 +- drivers/staging/otus/usbdrv.c | 12 +- drivers/staging/p9auth/Kconfig | 8 + drivers/staging/p9auth/Makefile | 1 + drivers/staging/p9auth/p9auth.c | 383 + drivers/staging/phison/Kconfig | 5 + drivers/staging/phison/Makefile | 1 + drivers/staging/phison/phison.c | 106 + drivers/staging/pohmelfs/Kconfig | 28 + drivers/staging/pohmelfs/Makefile | 3 + drivers/staging/pohmelfs/config.c | 478 + drivers/staging/pohmelfs/crypto.c | 880 ++ drivers/staging/pohmelfs/dir.c | 1093 +++ drivers/staging/pohmelfs/inode.c | 1976 +++++ drivers/staging/pohmelfs/lock.c | 182 + drivers/staging/pohmelfs/mcache.c | 171 + drivers/staging/pohmelfs/net.c | 1247 +++ drivers/staging/pohmelfs/netfs.h | 932 ++ drivers/staging/pohmelfs/path_entry.c | 114 + drivers/staging/pohmelfs/trans.c | 715 ++ drivers/staging/rspiusb/rspiusb.c | 5 +- drivers/staging/rt2860/2860_main_dev.c | 43 +- drivers/staging/rt2860/common/spectrum.c | 2 +- drivers/staging/rt2860/rt2860.h | 18 - drivers/staging/rt2860/rt_linux.c | 25 +- drivers/staging/rt2860/rt_linux.h | 20 - drivers/staging/rt2860/rt_main_dev.c | 107 +- drivers/staging/rt2860/sta_ioctl.c | 12 +- drivers/staging/rt2870/common/spectrum.c | 2 +- drivers/staging/rt2870/rt_linux.c | 2 +- drivers/staging/rt2870/rt_linux.h | 1 - drivers/staging/rt2870/sta_ioctl.c | 2 +- drivers/staging/rt3070/2870_main_dev.c | 1627 ++++ drivers/staging/rt3070/Kconfig | 6 + drivers/staging/rt3070/Makefile | 47 + drivers/staging/rt3070/action.h | 68 + drivers/staging/rt3070/aironet.h | 210 + drivers/staging/rt3070/ap.h | 557 ++ drivers/staging/rt3070/chlist.h | 1253 +++ drivers/staging/rt3070/common/2870_rtmp_init.c | 1762 ++++ drivers/staging/rt3070/common/action.c | 1038 +++ drivers/staging/rt3070/common/ba_action.c | 1810 ++++ drivers/staging/rt3070/common/cmm_data.c | 2827 ++++++ drivers/staging/rt3070/common/cmm_data_2870.c | 980 +++ drivers/staging/rt3070/common/cmm_info.c | 3395 ++++++++ drivers/staging/rt3070/common/cmm_sanity.c | 1669 ++++ drivers/staging/rt3070/common/cmm_sync.c | 711 ++ drivers/staging/rt3070/common/cmm_wpa.c | 1606 ++++ drivers/staging/rt3070/common/dfs.c | 441 + drivers/staging/rt3070/common/eeprom.c | 1498 ++++ drivers/staging/rt3070/common/md5.c | 1427 +++ drivers/staging/rt3070/common/mlme.c | 9136 ++++++++++++++++++++ drivers/staging/rt3070/common/netif_block.c | 136 + drivers/staging/rt3070/common/rtmp_init.c | 4197 +++++++++ drivers/staging/rt3070/common/rtmp_tkip.c | 1613 ++++ drivers/staging/rt3070/common/rtmp_wep.c | 508 ++ drivers/staging/rt3070/common/rtusb_bulk.c | 1382 +++ drivers/staging/rt3070/common/rtusb_data.c | 218 + drivers/staging/rt3070/common/rtusb_io.c | 1908 ++++ drivers/staging/rt3070/common/spectrum.c | 1876 ++++ drivers/staging/rt3070/dfs.h | 100 + drivers/staging/rt3070/firmware.h | 558 ++ drivers/staging/rt3070/leap.h | 215 + drivers/staging/rt3070/link_list.h | 134 + drivers/staging/rt3070/md4.h | 42 + drivers/staging/rt3070/md5.h | 107 + drivers/staging/rt3070/mlme.h | 1468 ++++ drivers/staging/rt3070/netif_block.h | 58 + drivers/staging/rt3070/oid.h | 1142 +++ drivers/staging/rt3070/rt2870.h | 756 ++ drivers/staging/rt3070/rt28xx.h | 2725 ++++++ drivers/staging/rt3070/rt_ate.c | 6506 ++++++++++++++ drivers/staging/rt3070/rt_ate.h | 294 + drivers/staging/rt3070/rt_config.h | 121 + drivers/staging/rt3070/rt_linux.c | 1063 +++ drivers/staging/rt3070/rt_linux.h | 887 ++ drivers/staging/rt3070/rt_main_dev.c | 1800 ++++ drivers/staging/rt3070/rt_profile.c | 2041 +++++ drivers/staging/rt3070/rtmp.h | 7728 +++++++++++++++++ drivers/staging/rt3070/rtmp_ckipmic.h | 113 + drivers/staging/rt3070/rtmp_def.h | 1559 ++++ drivers/staging/rt3070/rtmp_type.h | 95 + drivers/staging/rt3070/spectrum.h | 322 + drivers/staging/rt3070/spectrum_def.h | 95 + drivers/staging/rt3070/sta/aironet.c | 1312 +++ drivers/staging/rt3070/sta/assoc.c | 2060 +++++ drivers/staging/rt3070/sta/auth.c | 475 + drivers/staging/rt3070/sta/auth_rsp.c | 167 + drivers/staging/rt3070/sta/connect.c | 2857 ++++++ drivers/staging/rt3070/sta/dls.c | 2170 +++++ drivers/staging/rt3070/sta/rtmp_data.c | 2637 ++++++ drivers/staging/rt3070/sta/sanity.c | 420 + drivers/staging/rt3070/sta/sync.c | 1755 ++++ drivers/staging/rt3070/sta/wpa.c | 2099 +++++ drivers/staging/rt3070/sta_ioctl.c | 7203 +++++++++++++++ drivers/staging/rt3070/wpa.h | 356 + drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 4 +- drivers/staging/rtl8187se/r8180_core.c | 2 +- drivers/staging/rtl8187se/r8180_wx.c | 12 +- drivers/staging/slicoss/gbdownload.h | 8215 ------------------ drivers/staging/slicoss/gbrcvucode.h | 238 - drivers/staging/slicoss/oasisdbgdownload.h | 6850 --------------- drivers/staging/slicoss/oasisdownload.h | 6848 --------------- drivers/staging/slicoss/oasisrcvucode.h | 205 - drivers/staging/slicoss/slic.h | 86 +- drivers/staging/slicoss/slic_os.h | 84 - drivers/staging/slicoss/slicbuild.h | 96 - drivers/staging/slicoss/slicdbg.h | 100 - drivers/staging/slicoss/slicdump.h | 278 - drivers/staging/slicoss/slichw.h | 1038 ++-- drivers/staging/slicoss/slicinc.h | 185 - drivers/staging/slicoss/slicoss.c | 2913 ++----- drivers/staging/stlc45xx/Kconfig | 8 + drivers/staging/stlc45xx/Makefile | 1 + drivers/staging/stlc45xx/stlc45xx.c | 2606 ++++++ drivers/staging/stlc45xx/stlc45xx.h | 283 + drivers/staging/stlc45xx/stlc45xx_lmac.h | 434 + drivers/staging/sxg/Makefile | 4 +- drivers/staging/sxg/saharadbgdownload-1.71.c | 5233 +++++++++++ drivers/staging/sxg/saharadbgdownload.h | 4854 ----------- drivers/staging/sxg/saharadbgdownloadB-1.10.c | 5251 +++++++++++ drivers/staging/sxg/saharadownload-1.55.c | 4531 ++++++++++ drivers/staging/sxg/saharadownloadB-1.8.c | 4532 ++++++++++ drivers/staging/sxg/sxg.c | 2756 ++++-- drivers/staging/sxg/sxg.h | 916 +- drivers/staging/sxg/sxg_ethtool.c | 328 + drivers/staging/sxg/sxg_os.h | 100 +- drivers/staging/sxg/sxgdbg.h | 129 +- drivers/staging/sxg/sxghif.h | 1110 ++- drivers/staging/sxg/sxghw.h | 1573 ++-- drivers/staging/sxg/sxgphycode-1.2.h | 130 + drivers/staging/sxg/sxgphycode.h | 349 - drivers/staging/uc2322/Kconfig | 10 + drivers/staging/uc2322/Makefile | 1 + drivers/staging/uc2322/TODO | 7 + drivers/staging/uc2322/aten2011.c | 2452 ++++++ drivers/staging/usbip/stub_rx.c | 4 +- drivers/staging/winbond/bss_f.h | 63 - drivers/staging/winbond/common.h | 27 - drivers/staging/winbond/core.h | 4 +- drivers/staging/winbond/ioctls.h | 678 -- drivers/staging/winbond/mds.c | 16 +- drivers/staging/winbond/mlme_mib.h | 84 - drivers/staging/winbond/mlmetxrx.c | 2 +- drivers/staging/winbond/mto.c | 23 +- drivers/staging/winbond/mto.h | 11 +- drivers/staging/winbond/mto_f.h | 13 - drivers/staging/winbond/os_common.h | 2 - drivers/staging/winbond/phy_calibration.c | 28 +- drivers/staging/winbond/phy_calibration.h | 2 +- drivers/staging/winbond/reg.c | 81 +- drivers/staging/winbond/sme_api.h | 3 - drivers/staging/winbond/sme_s.h | 236 - drivers/staging/winbond/wb35_ver.h | 30 - drivers/staging/winbond/wb35reg.c | 41 +- drivers/staging/winbond/wb35reg_f.h | 70 +- drivers/staging/winbond/wb35rx.c | 43 +- drivers/staging/winbond/wb35rx_f.h | 6 +- drivers/staging/winbond/wb35rx_s.h | 8 +- drivers/staging/winbond/wb35tx.c | 54 +- drivers/staging/winbond/wb35tx_f.h | 8 +- drivers/staging/winbond/wb35tx_s.h | 6 +- drivers/staging/winbond/wbhal.c | 50 +- drivers/staging/winbond/wbhal_f.h | 94 +- drivers/staging/winbond/wbhal_s.h | 87 +- drivers/staging/winbond/wbusb.c | 20 +- drivers/staging/winbond/wbusb_s.h | 16 +- drivers/staging/wlan-ng/hfa384x.h | 2638 ++----- drivers/staging/wlan-ng/hfa384x_usb.c | 2294 ++--- drivers/staging/wlan-ng/p80211conv.c | 377 +- drivers/staging/wlan-ng/p80211conv.h | 131 +- drivers/staging/wlan-ng/p80211hdr.h | 146 +- drivers/staging/wlan-ng/p80211ioctl.h | 46 +- drivers/staging/wlan-ng/p80211meta.h | 110 +- drivers/staging/wlan-ng/p80211metadef.h | 544 -- drivers/staging/wlan-ng/p80211metamib.h | 105 - drivers/staging/wlan-ng/p80211metamsg.h | 105 - drivers/staging/wlan-ng/p80211metastruct.h | 424 +- drivers/staging/wlan-ng/p80211mgmt.h | 441 +- drivers/staging/wlan-ng/p80211msg.h | 48 +- drivers/staging/wlan-ng/p80211netdev.c | 411 +- drivers/staging/wlan-ng/p80211netdev.h | 218 +- drivers/staging/wlan-ng/p80211req.c | 235 +- drivers/staging/wlan-ng/p80211req.h | 17 +- drivers/staging/wlan-ng/p80211types.h | 505 +- drivers/staging/wlan-ng/p80211wep.c | 24 +- drivers/staging/wlan-ng/p80211wext.c | 1214 ++-- drivers/staging/wlan-ng/prism2mgmt.c | 899 +- drivers/staging/wlan-ng/prism2mgmt.h | 69 +- drivers/staging/wlan-ng/prism2mib.c | 905 +-- drivers/staging/wlan-ng/prism2sta.c | 1561 ++-- drivers/staging/wlan-ng/prism2usb.c | 158 +- drivers/staging/wlan-ng/wlan_compat.h | 193 - firmware/Makefile | 4 + firmware/WHENCE | 14 + firmware/slicoss/gbdownload.sys.ihex | 6148 +++++++++++++ firmware/slicoss/gbrcvucode.sys.ihex | 162 + firmware/slicoss/oasisdbgdownload.sys.ihex | 5124 +++++++++++ firmware/slicoss/oasisdownload.sys.ihex | 5124 +++++++++++ firmware/slicoss/oasisrcvucode.sys.ihex | 162 + include/linux/connector.h | 4 +- include/linux/dst.h | 587 ++ mm/filemap.c | 2 + 480 files changed, 309781 insertions(+), 46867 deletions(-) create mode 100644 Documentation/filesystems/pohmelfs/design_notes.txt create mode 100644 Documentation/filesystems/pohmelfs/info.txt create mode 100644 Documentation/filesystems/pohmelfs/network_protocol.txt create mode 100644 drivers/staging/b3dfg/Kconfig create mode 100644 drivers/staging/b3dfg/Makefile create mode 100644 drivers/staging/b3dfg/TODO create mode 100644 drivers/staging/b3dfg/b3dfg.c create mode 100644 drivers/staging/comedi/drivers/8253.h create mode 100644 drivers/staging/comedi/drivers/8255.c create mode 100644 drivers/staging/comedi/drivers/8255.h create mode 100644 drivers/staging/comedi/drivers/acl7225b.c create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.h create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.h create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.c create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.h create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.h create mode 100644 drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.c create mode 100644 drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.h create mode 100644 drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h create mode 100644 drivers/staging/comedi/drivers/addi-data/addi_common.c create mode 100644 drivers/staging/comedi/drivers/addi-data/addi_common.h create mode 100644 drivers/staging/comedi/drivers/addi-data/addi_eeprom.c create mode 100644 drivers/staging/comedi/drivers/addi-data/amcc_s5933_58.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.h create mode 100644 drivers/staging/comedi/drivers/addi_apci_035.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_1032.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_1500.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_1516.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_1564.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_16xx.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_1710.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_2016.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_2032.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_2200.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_3001.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_3120.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_3200.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_3300.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_3501.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_3xxx.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_all.c create mode 100644 drivers/staging/comedi/drivers/adl_pci6208.c create mode 100644 drivers/staging/comedi/drivers/adl_pci7296.c create mode 100644 drivers/staging/comedi/drivers/adl_pci7432.c create mode 100644 drivers/staging/comedi/drivers/adl_pci8164.c create mode 100644 drivers/staging/comedi/drivers/adl_pci9111.c create mode 100644 drivers/staging/comedi/drivers/adl_pci9118.c create mode 100644 drivers/staging/comedi/drivers/adq12b.c create mode 100644 drivers/staging/comedi/drivers/adv_pci1710.c create mode 100644 drivers/staging/comedi/drivers/adv_pci1723.c create mode 100644 drivers/staging/comedi/drivers/adv_pci_dio.c create mode 100644 drivers/staging/comedi/drivers/aio_aio12_8.c create mode 100644 drivers/staging/comedi/drivers/aio_iiro_16.c create mode 100644 drivers/staging/comedi/drivers/am9513.h create mode 100644 drivers/staging/comedi/drivers/amcc_s5933.h create mode 100644 drivers/staging/comedi/drivers/amplc_dio200.c create mode 100644 drivers/staging/comedi/drivers/amplc_pc236.c create mode 100644 drivers/staging/comedi/drivers/amplc_pc263.c create mode 100644 drivers/staging/comedi/drivers/amplc_pci224.c create mode 100644 drivers/staging/comedi/drivers/amplc_pci230.c create mode 100644 drivers/staging/comedi/drivers/c6xdigio.c create mode 100644 drivers/staging/comedi/drivers/cb_das16_cs.c create mode 100644 drivers/staging/comedi/drivers/cb_pcidas.c create mode 100644 drivers/staging/comedi/drivers/cb_pcidas64.c create mode 100644 drivers/staging/comedi/drivers/cb_pcidda.c create mode 100644 drivers/staging/comedi/drivers/cb_pcidio.c create mode 100644 drivers/staging/comedi/drivers/cb_pcimdas.c create mode 100644 drivers/staging/comedi/drivers/cb_pcimdda.c create mode 100644 drivers/staging/comedi/drivers/comedi_rt_timer.c create mode 100644 drivers/staging/comedi/drivers/contec_pci_dio.c create mode 100644 drivers/staging/comedi/drivers/daqboard2000.c create mode 100644 drivers/staging/comedi/drivers/das08.c create mode 100644 drivers/staging/comedi/drivers/das08.h create mode 100644 drivers/staging/comedi/drivers/das08_cs.c create mode 100644 drivers/staging/comedi/drivers/das16.c create mode 100644 drivers/staging/comedi/drivers/das16m1.c create mode 100644 drivers/staging/comedi/drivers/das1800.c create mode 100644 drivers/staging/comedi/drivers/das6402.c create mode 100644 drivers/staging/comedi/drivers/das800.c create mode 100644 drivers/staging/comedi/drivers/dmm32at.c create mode 100644 drivers/staging/comedi/drivers/dt2801.c create mode 100644 drivers/staging/comedi/drivers/dt2811.c create mode 100644 drivers/staging/comedi/drivers/dt2814.c create mode 100644 drivers/staging/comedi/drivers/dt2815.c create mode 100644 drivers/staging/comedi/drivers/dt2817.c create mode 100644 drivers/staging/comedi/drivers/dt282x.c create mode 100644 drivers/staging/comedi/drivers/dt3000.c create mode 100644 drivers/staging/comedi/drivers/fl512.c create mode 100644 drivers/staging/comedi/drivers/gsc_hpdi.c create mode 100644 drivers/staging/comedi/drivers/ii_pci20kc.c create mode 100644 drivers/staging/comedi/drivers/jr3_pci.c create mode 100644 drivers/staging/comedi/drivers/jr3_pci.h create mode 100644 drivers/staging/comedi/drivers/ke_counter.c create mode 100644 drivers/staging/comedi/drivers/mpc624.c create mode 100644 drivers/staging/comedi/drivers/mpc8260cpm.c create mode 100644 drivers/staging/comedi/drivers/multiq3.c create mode 100644 drivers/staging/comedi/drivers/ni_6527.c create mode 100644 drivers/staging/comedi/drivers/ni_65xx.c create mode 100644 drivers/staging/comedi/drivers/ni_660x.c create mode 100644 drivers/staging/comedi/drivers/ni_670x.c create mode 100644 drivers/staging/comedi/drivers/ni_at_a2150.c create mode 100644 drivers/staging/comedi/drivers/ni_at_ao.c create mode 100644 drivers/staging/comedi/drivers/ni_atmio.c create mode 100644 drivers/staging/comedi/drivers/ni_atmio16d.c create mode 100644 drivers/staging/comedi/drivers/ni_daq_700.c create mode 100644 drivers/staging/comedi/drivers/ni_daq_dio24.c create mode 100644 drivers/staging/comedi/drivers/ni_labpc.c create mode 100644 drivers/staging/comedi/drivers/ni_labpc.h create mode 100644 drivers/staging/comedi/drivers/ni_labpc_cs.c create mode 100644 drivers/staging/comedi/drivers/ni_mio_common.c create mode 100644 drivers/staging/comedi/drivers/ni_mio_cs.c create mode 100644 drivers/staging/comedi/drivers/ni_pcidio.c create mode 100644 drivers/staging/comedi/drivers/ni_pcimio.c create mode 100644 drivers/staging/comedi/drivers/ni_stc.h create mode 100644 drivers/staging/comedi/drivers/ni_tio.c create mode 100644 drivers/staging/comedi/drivers/ni_tio.h create mode 100644 drivers/staging/comedi/drivers/ni_tio_internal.h create mode 100644 drivers/staging/comedi/drivers/ni_tiocmd.c create mode 100644 drivers/staging/comedi/drivers/pcl711.c create mode 100644 drivers/staging/comedi/drivers/pcl724.c create mode 100644 drivers/staging/comedi/drivers/pcl725.c create mode 100644 drivers/staging/comedi/drivers/pcl726.c create mode 100644 drivers/staging/comedi/drivers/pcl730.c create mode 100644 drivers/staging/comedi/drivers/pcl812.c create mode 100644 drivers/staging/comedi/drivers/pcl816.c create mode 100644 drivers/staging/comedi/drivers/pcl818.c create mode 100644 drivers/staging/comedi/drivers/pcm3724.c create mode 100644 drivers/staging/comedi/drivers/pcm3730.c create mode 100644 drivers/staging/comedi/drivers/pcmad.c create mode 100644 drivers/staging/comedi/drivers/pcmda12.c create mode 100644 drivers/staging/comedi/drivers/pcmmio.c create mode 100644 drivers/staging/comedi/drivers/pcmuio.c create mode 100644 drivers/staging/comedi/drivers/plx9052.h create mode 100644 drivers/staging/comedi/drivers/poc.c create mode 100644 drivers/staging/comedi/drivers/quatech_daqp_cs.c create mode 100644 drivers/staging/comedi/drivers/rti800.c create mode 100644 drivers/staging/comedi/drivers/rti802.c create mode 100644 drivers/staging/comedi/drivers/s526.c create mode 100644 drivers/staging/comedi/drivers/serial2002.c create mode 100644 drivers/staging/comedi/drivers/skel.c create mode 100644 drivers/staging/comedi/drivers/ssv_dnp.c create mode 100644 drivers/staging/comedi/drivers/unioxx5.c create mode 100644 drivers/staging/dst/Kconfig create mode 100644 drivers/staging/dst/Makefile create mode 100644 drivers/staging/dst/crypto.c create mode 100644 drivers/staging/dst/dcore.c create mode 100644 drivers/staging/dst/export.c create mode 100644 drivers/staging/dst/state.c create mode 100644 drivers/staging/dst/thread_pool.c create mode 100644 drivers/staging/dst/trans.c delete mode 100644 drivers/staging/frontier/frontier_compat.h delete mode 100644 drivers/staging/frontier/surface_sysfs.h create mode 100644 drivers/staging/heci/Kconfig create mode 100644 drivers/staging/heci/Makefile create mode 100644 drivers/staging/heci/TODO create mode 100644 drivers/staging/heci/heci.h create mode 100644 drivers/staging/heci/heci_data_structures.h create mode 100644 drivers/staging/heci/heci_init.c create mode 100644 drivers/staging/heci/heci_interface.c create mode 100644 drivers/staging/heci/heci_interface.h create mode 100644 drivers/staging/heci/heci_main.c create mode 100644 drivers/staging/heci/heci_version.h create mode 100644 drivers/staging/heci/interrupt.c create mode 100644 drivers/staging/heci/io_heci.c create mode 100644 drivers/staging/line6/Kconfig create mode 100644 drivers/staging/line6/Makefile create mode 100644 drivers/staging/line6/audio.c create mode 100644 drivers/staging/line6/audio.h create mode 100644 drivers/staging/line6/capture.c create mode 100644 drivers/staging/line6/capture.h create mode 100644 drivers/staging/line6/config.h create mode 100644 drivers/staging/line6/control.c create mode 100644 drivers/staging/line6/control.h create mode 100644 drivers/staging/line6/driver.c create mode 100644 drivers/staging/line6/driver.h create mode 100644 drivers/staging/line6/dumprequest.c create mode 100644 drivers/staging/line6/dumprequest.h create mode 100644 drivers/staging/line6/midi.c create mode 100644 drivers/staging/line6/midi.h create mode 100644 drivers/staging/line6/midibuf.c create mode 100644 drivers/staging/line6/midibuf.h create mode 100644 drivers/staging/line6/pcm.c create mode 100644 drivers/staging/line6/pcm.h create mode 100644 drivers/staging/line6/playback.c create mode 100644 drivers/staging/line6/playback.h create mode 100644 drivers/staging/line6/pod.c create mode 100644 drivers/staging/line6/pod.h create mode 100644 drivers/staging/line6/revision.h create mode 100644 drivers/staging/line6/toneport.c create mode 100644 drivers/staging/line6/toneport.h create mode 100644 drivers/staging/line6/usbdefs.h create mode 100644 drivers/staging/line6/variax.c create mode 100644 drivers/staging/line6/variax.h create mode 100644 drivers/staging/p9auth/Kconfig create mode 100644 drivers/staging/p9auth/Makefile create mode 100644 drivers/staging/p9auth/p9auth.c create mode 100644 drivers/staging/phison/Kconfig create mode 100644 drivers/staging/phison/Makefile create mode 100644 drivers/staging/phison/phison.c create mode 100644 drivers/staging/pohmelfs/Kconfig create mode 100644 drivers/staging/pohmelfs/Makefile create mode 100644 drivers/staging/pohmelfs/config.c create mode 100644 drivers/staging/pohmelfs/crypto.c create mode 100644 drivers/staging/pohmelfs/dir.c create mode 100644 drivers/staging/pohmelfs/inode.c create mode 100644 drivers/staging/pohmelfs/lock.c create mode 100644 drivers/staging/pohmelfs/mcache.c create mode 100644 drivers/staging/pohmelfs/net.c create mode 100644 drivers/staging/pohmelfs/netfs.h create mode 100644 drivers/staging/pohmelfs/path_entry.c create mode 100644 drivers/staging/pohmelfs/trans.c create mode 100644 drivers/staging/rt3070/2870_main_dev.c create mode 100644 drivers/staging/rt3070/Kconfig create mode 100644 drivers/staging/rt3070/Makefile create mode 100644 drivers/staging/rt3070/action.h create mode 100644 drivers/staging/rt3070/aironet.h create mode 100644 drivers/staging/rt3070/ap.h create mode 100644 drivers/staging/rt3070/chlist.h create mode 100644 drivers/staging/rt3070/common/2870_rtmp_init.c create mode 100644 drivers/staging/rt3070/common/action.c create mode 100644 drivers/staging/rt3070/common/ba_action.c create mode 100644 drivers/staging/rt3070/common/cmm_data.c create mode 100644 drivers/staging/rt3070/common/cmm_data_2870.c create mode 100644 drivers/staging/rt3070/common/cmm_info.c create mode 100644 drivers/staging/rt3070/common/cmm_sanity.c create mode 100644 drivers/staging/rt3070/common/cmm_sync.c create mode 100644 drivers/staging/rt3070/common/cmm_wpa.c create mode 100644 drivers/staging/rt3070/common/dfs.c create mode 100644 drivers/staging/rt3070/common/eeprom.c create mode 100644 drivers/staging/rt3070/common/md5.c create mode 100644 drivers/staging/rt3070/common/mlme.c create mode 100644 drivers/staging/rt3070/common/netif_block.c create mode 100644 drivers/staging/rt3070/common/rtmp_init.c create mode 100644 drivers/staging/rt3070/common/rtmp_tkip.c create mode 100644 drivers/staging/rt3070/common/rtmp_wep.c create mode 100644 drivers/staging/rt3070/common/rtusb_bulk.c create mode 100644 drivers/staging/rt3070/common/rtusb_data.c create mode 100644 drivers/staging/rt3070/common/rtusb_io.c create mode 100644 drivers/staging/rt3070/common/spectrum.c create mode 100644 drivers/staging/rt3070/dfs.h create mode 100644 drivers/staging/rt3070/firmware.h create mode 100644 drivers/staging/rt3070/leap.h create mode 100644 drivers/staging/rt3070/link_list.h create mode 100644 drivers/staging/rt3070/md4.h create mode 100644 drivers/staging/rt3070/md5.h create mode 100644 drivers/staging/rt3070/mlme.h create mode 100644 drivers/staging/rt3070/netif_block.h create mode 100644 drivers/staging/rt3070/oid.h create mode 100644 drivers/staging/rt3070/rt2870.h create mode 100644 drivers/staging/rt3070/rt28xx.h create mode 100644 drivers/staging/rt3070/rt_ate.c create mode 100644 drivers/staging/rt3070/rt_ate.h create mode 100644 drivers/staging/rt3070/rt_config.h create mode 100644 drivers/staging/rt3070/rt_linux.c create mode 100644 drivers/staging/rt3070/rt_linux.h create mode 100644 drivers/staging/rt3070/rt_main_dev.c create mode 100644 drivers/staging/rt3070/rt_profile.c create mode 100644 drivers/staging/rt3070/rtmp.h create mode 100644 drivers/staging/rt3070/rtmp_ckipmic.h create mode 100644 drivers/staging/rt3070/rtmp_def.h create mode 100644 drivers/staging/rt3070/rtmp_type.h create mode 100644 drivers/staging/rt3070/spectrum.h create mode 100644 drivers/staging/rt3070/spectrum_def.h create mode 100644 drivers/staging/rt3070/sta/aironet.c create mode 100644 drivers/staging/rt3070/sta/assoc.c create mode 100644 drivers/staging/rt3070/sta/auth.c create mode 100644 drivers/staging/rt3070/sta/auth_rsp.c create mode 100644 drivers/staging/rt3070/sta/connect.c create mode 100644 drivers/staging/rt3070/sta/dls.c create mode 100644 drivers/staging/rt3070/sta/rtmp_data.c create mode 100644 drivers/staging/rt3070/sta/sanity.c create mode 100644 drivers/staging/rt3070/sta/sync.c create mode 100644 drivers/staging/rt3070/sta/wpa.c create mode 100644 drivers/staging/rt3070/sta_ioctl.c create mode 100644 drivers/staging/rt3070/wpa.h delete mode 100644 drivers/staging/slicoss/gbdownload.h delete mode 100644 drivers/staging/slicoss/gbrcvucode.h delete mode 100644 drivers/staging/slicoss/oasisdbgdownload.h delete mode 100644 drivers/staging/slicoss/oasisdownload.h delete mode 100644 drivers/staging/slicoss/oasisrcvucode.h delete mode 100644 drivers/staging/slicoss/slic_os.h delete mode 100644 drivers/staging/slicoss/slicbuild.h delete mode 100644 drivers/staging/slicoss/slicdbg.h delete mode 100644 drivers/staging/slicoss/slicdump.h delete mode 100644 drivers/staging/slicoss/slicinc.h create mode 100644 drivers/staging/stlc45xx/Kconfig create mode 100644 drivers/staging/stlc45xx/Makefile create mode 100644 drivers/staging/stlc45xx/stlc45xx.c create mode 100644 drivers/staging/stlc45xx/stlc45xx.h create mode 100644 drivers/staging/stlc45xx/stlc45xx_lmac.h create mode 100644 drivers/staging/sxg/saharadbgdownload-1.71.c delete mode 100644 drivers/staging/sxg/saharadbgdownload.h create mode 100644 drivers/staging/sxg/saharadbgdownloadB-1.10.c create mode 100644 drivers/staging/sxg/saharadownload-1.55.c create mode 100644 drivers/staging/sxg/saharadownloadB-1.8.c create mode 100644 drivers/staging/sxg/sxg_ethtool.c create mode 100644 drivers/staging/sxg/sxgphycode-1.2.h delete mode 100644 drivers/staging/sxg/sxgphycode.h create mode 100644 drivers/staging/uc2322/Kconfig create mode 100644 drivers/staging/uc2322/Makefile create mode 100644 drivers/staging/uc2322/TODO create mode 100644 drivers/staging/uc2322/aten2011.c delete mode 100644 drivers/staging/winbond/bss_f.h delete mode 100644 drivers/staging/winbond/common.h delete mode 100644 drivers/staging/winbond/ioctls.h delete mode 100644 drivers/staging/winbond/mlme_mib.h delete mode 100644 drivers/staging/winbond/mto_f.h delete mode 100644 drivers/staging/winbond/os_common.h delete mode 100644 drivers/staging/winbond/sme_s.h delete mode 100644 drivers/staging/winbond/wb35_ver.h delete mode 100644 drivers/staging/wlan-ng/p80211metamib.h delete mode 100644 drivers/staging/wlan-ng/p80211metamsg.h delete mode 100644 drivers/staging/wlan-ng/wlan_compat.h create mode 100644 firmware/slicoss/gbdownload.sys.ihex create mode 100644 firmware/slicoss/gbrcvucode.sys.ihex create mode 100644 firmware/slicoss/oasisdbgdownload.sys.ihex create mode 100644 firmware/slicoss/oasisdownload.sys.ihex create mode 100644 firmware/slicoss/oasisrcvucode.sys.ihex create mode 100644 include/linux/dst.h Merging scsi-post-merge/master $ git merge scsi-post-merge/master Already up-to-date.