$ git checkout master Already on "master" $ git reset --hard stable HEAD is now at f3b8436 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband Merging origin/master $ git merge origin/master Already up-to-date. Merging mfd/for-next $ git merge mfd/for-next Merge made by recursive. drivers/mfd/pcf50633-core.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) Merging arm-current/master $ git merge arm-current/master Removed arch/arm/plat-omap/include/mach/aic23.h Merge made by recursive. arch/arm/common/clkdev.c | 25 +- arch/arm/mach-davinci/usb.c | 1 + arch/arm/mach-omap1/board-h2.c | 45 +- arch/arm/mach-omap1/board-h3.c | 50 -- arch/arm/mach-omap1/board-innovator.c | 39 - arch/arm/mach-omap1/board-nokia770.c | 8 +- arch/arm/mach-omap1/board-osk.c | 43 +- arch/arm/mach-omap1/board-palmte.c | 29 - arch/arm/mach-omap1/board-palmtt.c | 41 - arch/arm/mach-omap1/board-palmz71.c | 37 - arch/arm/mach-omap1/board-sx1.c | 39 +- arch/arm/mach-omap1/board-voiceblue.c | 1 - arch/arm/mach-omap1/mcbsp.c | 1 + arch/arm/mach-omap2/board-apollon.c | 64 +-- arch/arm/mach-omap2/board-ldp.c | 2 +- arch/arm/mach-omap2/board-omap3beagle.c | 9 +- arch/arm/mach-omap2/mcbsp.c | 1 + arch/arm/mm/copypage-v4mc.c | 2 +- arch/arm/plat-omap/dma.c | 13 +- arch/arm/plat-omap/gpio.c | 3 + arch/arm/plat-omap/include/mach/aic23.h | 116 --- arch/arm/plat-omap/include/mach/board-h3.h | 4 +- arch/arm/plat-omap/include/mach/gpio.h | 10 - arch/arm/plat-omap/include/mach/mcbsp.h | 11 + arch/arm/plat-omap/mcbsp.c | 4 + drivers/char/hw_random/omap-rng.c | 2 +- drivers/mmc/host/Kconfig | 10 + drivers/mmc/host/Makefile | 1 + drivers/mmc/host/omap_hsmmc.c | 1242 ++++++++++++++++++++++++++++ drivers/mmc/host/s3cmci.c | 2 +- drivers/mtd/onenand/omap2.c | 6 +- drivers/usb/host/ohci-omap.c | 6 +- drivers/video/omap/lcdc.c | 4 +- drivers/watchdog/at91rm9200_wdt.c | 1 + 34 files changed, 1340 insertions(+), 532 deletions(-) delete mode 100644 arch/arm/plat-omap/include/mach/aic23.h create mode 100644 drivers/mmc/host/omap_hsmmc.c Merging m68k-current/for-linus $ git merge m68k-current/for-linus Already up-to-date. Merging powerpc-merge/merge $ git merge powerpc-merge/merge Already up-to-date. Merging sparc-current/master $ git merge sparc-current/master Already up-to-date. Merging scsi-rc-fixes/master $ git merge scsi-rc-fixes/master Merge made by recursive. drivers/scsi/ibmvscsi/ibmvfc.c | 4 ++- drivers/scsi/libiscsi.c | 1 + drivers/scsi/qla2xxx/qla_attr.c | 6 ++++ drivers/scsi/qla2xxx/qla_gbl.h | 1 + drivers/scsi/qla2xxx/qla_init.c | 53 +++++++++++++++++++++++++++++++---- drivers/scsi/qla2xxx/qla_isr.c | 5 +++ drivers/scsi/qla2xxx/qla_mbx.c | 16 ++++------- drivers/scsi/qla2xxx/qla_os.c | 22 ++++++++------- drivers/scsi/qla2xxx/qla_sup.c | 23 ++++++--------- drivers/scsi/qla2xxx/qla_version.h | 2 +- drivers/scsi/qla4xxx/ql4_def.h | 1 + drivers/scsi/qla4xxx/ql4_init.c | 10 +++++- 12 files changed, 100 insertions(+), 44 deletions(-) Merging net-current/master $ git merge net-current/master Merge made by recursive. drivers/net/bnx2x.h | 11 +- drivers/net/bnx2x_link.c | 64 ++++-- drivers/net/bnx2x_main.c | 295 ++++++++++++++++----------- drivers/net/bnx2x_reg.h | 2 +- drivers/net/cxgb3/sge.c | 1 + drivers/net/ixgbe/ixgbe_main.c | 62 +++--- drivers/net/ixgbe/ixgbe_type.h | 3 + drivers/net/korina.c | 15 +- drivers/net/macb.c | 8 + drivers/net/mv643xx_eth.c | 17 +- drivers/net/myri10ge/myri10ge.c | 15 +- drivers/net/phy/mdio_bus.c | 8 +- drivers/net/phy/smsc.c | 12 + drivers/net/tg3.c | 81 +++++--- drivers/net/tg3.h | 1 + drivers/net/usb/mcs7830.c | 20 ++- drivers/net/via-velocity.c | 2 +- drivers/net/wimax/i2400m/control.c | 2 +- drivers/net/wimax/i2400m/usb-rx.c | 9 +- drivers/net/wireless/ath9k/rc.c | 2 +- drivers/net/wireless/ath9k/regd_common.h | 2 +- drivers/net/wireless/iwlwifi/iwl-agn.c | 2 +- drivers/net/wireless/iwlwifi/iwl-hcmd.c | 2 +- drivers/net/wireless/iwlwifi/iwl3945-base.c | 4 +- drivers/net/wireless/libertas/hostcmd.h | 91 ++++---- drivers/net/wireless/orinoco/orinoco.c | 32 ++-- drivers/net/wireless/p54/p54common.c | 30 ++- drivers/net/wireless/p54/p54usb.c | 34 ++-- drivers/net/wireless/rndis_wlan.c | 2 - drivers/net/wireless/rt2x00/rt2x00queue.c | 3 +- drivers/net/wireless/rt2x00/rt2x00rfkill.c | 2 +- drivers/net/wireless/zd1211rw/zd_usb.c | 1 + include/linux/usb/usbnet.h | 4 +- include/net/mac80211.h | 1 - net/9p/client.c | 2 +- net/core/dev.c | 15 ++- net/core/net_namespace.c | 2 +- net/core/skbuff.c | 70 +++---- net/ipv6/af_inet6.c | 7 + net/mac80211/mlme.c | 4 +- net/mac80211/sta_info.h | 1 - net/mac80211/tx.c | 6 +- net/netfilter/nf_conntrack_netlink.c | 3 + net/wireless/reg.c | 128 +++++++++++- net/xfrm/xfrm_user.c | 11 +- 45 files changed, 682 insertions(+), 407 deletions(-) Merging sound-current/for-linus $ git merge sound-current/for-linus Merge made by recursive. Documentation/kernel-parameters.txt | 7 --- Documentation/sound/alsa/HD-Audio-Models.txt | 1 + include/sound/soc-dapm.h | 2 +- sound/pci/Kconfig | 4 +- sound/pci/hda/patch_realtek.c | 2 + sound/pci/hda/patch_sigmatel.c | 54 ++++++++++++++++--------- sound/pci/oxygen/virtuoso.c | 3 +- sound/soc/atmel/atmel-pcm.c | 2 - sound/soc/fsl/mpc8610_hpcd.c | 18 +++------ 9 files changed, 48 insertions(+), 45 deletions(-) Merging pci-current/for-linus $ git merge pci-current/for-linus Merge made by recursive. drivers/pci/hotplug/pciehp_core.c | 4 +- drivers/pci/msi.c | 16 +++---- drivers/pci/pci-driver.c | 91 +++++++++++-------------------------- drivers/pci/pci.c | 63 +++++++++++++++++++++++--- drivers/pci/pci.h | 6 +++ include/linux/pci.h | 5 ++ 6 files changed, 105 insertions(+), 80 deletions(-) Merging wireless-current/master $ git merge wireless-current/master Merge made by recursive. drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 14 +++++++++++--- drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 14 ++++++++++++-- drivers/net/wireless/p54/p54usb.c | 7 +++++-- drivers/net/wireless/rtl818x/rtl8187_dev.c | 1 + 4 files changed, 29 insertions(+), 7 deletions(-) Merging kbuild-current/master $ git merge kbuild-current/master Auto-merged Makefile Removed arch/x86/scripts/strip-symbols Auto-merged init/Kconfig Removed scripts/strip-symbols Merge made by recursive. Documentation/kbuild/kbuild.txt | 29 +++--- Makefile | 59 ++++-------- arch/x86/scripts/strip-symbols | 1 - init/Kconfig | 7 -- kernel/kallsyms.c | 16 ++- scripts/Makefile.build | 55 ++++------- scripts/Makefile.modinst | 3 +- scripts/config | 4 + scripts/genksyms/genksyms.c | 21 +--- scripts/genksyms/keywords.c_shipped | 189 +++++++++++++++++------------------ scripts/genksyms/keywords.gperf | 2 - scripts/kallsyms.c | 21 +++-- scripts/mksysmap | 7 +- scripts/strip-symbols | 22 ---- 14 files changed, 185 insertions(+), 251 deletions(-) delete mode 100644 arch/x86/scripts/strip-symbols delete mode 100644 scripts/strip-symbols Merging quilt/driver-core.current $ git merge quilt/driver-core.current Merge made by recursive. Documentation/DocBook/uio-howto.tmpl | 88 +++++++++++++++++++++++++++ Documentation/ja_JP/stable_kernel_rules.txt | 15 +++-- drivers/base/core.c | 8 ++- fs/sysfs/bin.c | 6 ++ include/linux/debugfs.h | 8 +++ include/linux/klist.h | 2 +- scripts/mod/file2alias.c | 17 +++++- 7 files changed, 135 insertions(+), 9 deletions(-) Merging quilt/usb.current $ git merge quilt/usb.current Auto-merged arch/arm/mach-davinci/usb.c Merge made by recursive. arch/arm/mach-davinci/usb.c | 23 - drivers/usb/Makefile | 1 + drivers/usb/class/cdc-acm.c | 9 + drivers/usb/class/usblp.c | 1 + drivers/usb/core/devio.c | 20 +- drivers/usb/core/driver.c | 2 +- drivers/usb/core/hcd-pci.c | 117 +---- drivers/usb/core/hcd.h | 1 - drivers/usb/core/hub.c | 4 +- drivers/usb/core/inode.c | 1 - drivers/usb/core/message.c | 40 +- drivers/usb/core/usb.h | 6 +- drivers/usb/gadget/composite.c | 9 +- drivers/usb/gadget/imx_udc.c | 2 +- drivers/usb/host/Kconfig | 18 + drivers/usb/host/Makefile | 6 + drivers/usb/host/ehci-pci.c | 3 +- drivers/usb/host/fhci-dbg.c | 139 +++++ drivers/usb/host/fhci-hcd.c | 836 +++++++++++++++++++++++++++++++ drivers/usb/host/fhci-hub.c | 345 +++++++++++++ drivers/usb/host/fhci-mem.c | 113 +++++ drivers/usb/host/fhci-q.c | 284 +++++++++++ drivers/usb/host/fhci-sched.c | 888 +++++++++++++++++++++++++++++++++ drivers/usb/host/fhci-tds.c | 626 +++++++++++++++++++++++ drivers/usb/host/fhci.h | 607 ++++++++++++++++++++++ drivers/usb/host/ohci-hcd.c | 8 +- drivers/usb/host/ohci-pci.c | 1 - drivers/usb/host/uhci-hcd.c | 1 - drivers/usb/misc/ldusb.c | 2 - drivers/usb/mon/mon_bin.c | 105 +++-- drivers/usb/musb/Kconfig | 1 + drivers/usb/musb/cppi_dma.c | 10 +- drivers/usb/musb/davinci.c | 13 +- drivers/usb/musb/musb_core.c | 5 +- drivers/usb/musb/musb_gadget.c | 6 +- drivers/usb/musb/musb_host.c | 4 +- drivers/usb/musb/omap2430.c | 4 + drivers/usb/musb/tusb6010_omap.c | 4 +- drivers/usb/otg/Kconfig | 4 +- drivers/usb/serial/cp2101.c | 2 + drivers/usb/serial/ftdi_sio.c | 2 + drivers/usb/serial/ftdi_sio.h | 9 + drivers/usb/serial/option.c | 14 +- drivers/usb/serial/ti_usb_3410_5052.c | 3 + drivers/usb/serial/ti_usb_3410_5052.h | 2 + drivers/usb/storage/unusual_devs.h | 36 +- include/linux/usb.h | 2 + 47 files changed, 4108 insertions(+), 231 deletions(-) create mode 100644 drivers/usb/host/fhci-dbg.c create mode 100644 drivers/usb/host/fhci-hcd.c create mode 100644 drivers/usb/host/fhci-hub.c create mode 100644 drivers/usb/host/fhci-mem.c create mode 100644 drivers/usb/host/fhci-q.c create mode 100644 drivers/usb/host/fhci-sched.c create mode 100644 drivers/usb/host/fhci-tds.c create mode 100644 drivers/usb/host/fhci.h Merging cpufreq-current/fixes $ git merge cpufreq-current/fixes Merge made by recursive. drivers/cpufreq/cpufreq_ondemand.c | 47 +++++++++++++++++++---------------- 1 files changed, 25 insertions(+), 22 deletions(-) Merging input-current/for-linus $ git merge input-current/for-linus Auto-merged drivers/input/keyboard/atkbd.c Auto-merged drivers/input/keyboard/omap-keypad.c Merge made by recursive. drivers/input/keyboard/atkbd.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/touchscreen/corgi_ts.c | 9 +++++---- drivers/input/touchscreen/usbtouchscreen.c | 19 +++++++++++++++++-- drivers/media/video/uvc/uvc_status.c | 10 ++++++---- 8 files changed, 43 insertions(+), 25 deletions(-) Merging md-current/for-linus $ git merge md-current/for-linus Already up-to-date. Merging dwmw2/master $ git merge dwmw2/master Already up-to-date. Merging arm/devel $ git merge arm/devel Already up-to-date. Merging avr32/avr32-arch $ git merge avr32/avr32-arch Merge made by recursive. arch/avr32/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 Already up-to-date. Merging m68knommu/for-next $ git merge m68knommu/for-next Auto-merged Makefile CONFLICT (delete/modify): arch/m68knommu/include/asm/Kbuild deleted in m68knommu/for-next and modified in HEAD. Version HEAD of arch/m68knommu/include/asm/Kbuild left in tree. Removed arch/m68knommu/include/asm/cachectl.h Removed arch/m68knommu/include/asm/cputime.h Removed arch/m68knommu/include/asm/errno.h Removed arch/m68knommu/include/asm/fcntl.h Removed arch/m68knommu/include/asm/hwtest.h Removed arch/m68knommu/include/asm/ioctls.h Removed arch/m68knommu/include/asm/ipcbuf.h Removed arch/m68knommu/include/asm/linkage.h Removed arch/m68knommu/include/asm/local.h Removed arch/m68knommu/include/asm/math-emu.h Removed arch/m68knommu/include/asm/md.h Removed arch/m68knommu/include/asm/mman.h Removed arch/m68knommu/include/asm/movs.h Removed arch/m68knommu/include/asm/msgbuf.h Removed arch/m68knommu/include/asm/openprom.h Removed arch/m68knommu/include/asm/oplib.h Removed arch/m68knommu/include/asm/percpu.h Removed arch/m68knommu/include/asm/poll.h Removed arch/m68knommu/include/asm/posix_types.h Removed arch/m68knommu/include/asm/resource.h Removed arch/m68knommu/include/asm/rtc.h Removed arch/m68knommu/include/asm/sections.h Removed arch/m68knommu/include/asm/sembuf.h Removed arch/m68knommu/include/asm/shm.h Removed arch/m68knommu/include/asm/shmbuf.h Removed arch/m68knommu/include/asm/shmparam.h Removed arch/m68knommu/include/asm/socket.h Removed arch/m68knommu/include/asm/sockios.h Removed arch/m68knommu/include/asm/spinlock.h Removed arch/m68knommu/include/asm/stat.h Removed arch/m68knommu/include/asm/statfs.h Removed arch/m68knommu/include/asm/termbits.h Removed arch/m68knommu/include/asm/termios.h Removed arch/m68knommu/include/asm/tlb.h Removed arch/m68knommu/include/asm/types.h Removed arch/m68knommu/include/asm/user.h Removed include/asm-m68k/auxvec.h Removed include/asm-m68k/device.h Removed include/asm-m68k/emergency-restart.h Removed include/asm-m68k/futex.h Removed include/asm-m68k/ioctl.h Removed include/asm-m68k/irq_regs.h Removed include/asm-m68k/kdebug.h Removed include/asm-m68k/mutex.h Removed include/asm-m68k/topology.h Automatic merge failed; fix conflicts and then commit the result. $ git rm -f arch/m68knommu/include/asm/Kbuild arch/m68knommu/include/asm/Kbuild: needs merge rm 'arch/m68knommu/include/asm/Kbuild' rm 'arch/m68knommu/include/asm/Kbuild' $ git commit -v -a Created commit 3bae15f: Merge commit 'm68knommu/for-next' $ git diff -M --stat --summary HEAD^.. Makefile | 4 ++++ {include/asm-m68k => arch/m68k/include/asm}/Kbuild | 0 arch/{m68knommu => m68k}/include/asm/MC68328.h | 0 arch/{m68knommu => m68k}/include/asm/MC68332.h | 0 arch/{m68knommu => m68k}/include/asm/MC68EZ328.h | 0 arch/{m68knommu => m68k}/include/asm/MC68VZ328.h | 0 .../m68k/include/asm}/a.out-core.h | 0 .../asm-m68k => arch/m68k/include/asm}/a.out.h | 0 .../asm-m68k => arch/m68k/include/asm}/adb_iop.h | 0 .../asm-m68k => arch/m68k/include/asm}/amigahw.h | 0 .../asm-m68k => arch/m68k/include/asm}/amigaints.h | 0 .../asm-m68k => arch/m68k/include/asm}/amigayle.h | 0 .../asm-m68k => arch/m68k/include/asm}/amipcmcia.h | 0 arch/{m68knommu => m68k}/include/asm/anchor.h | 0 .../asm-m68k => arch/m68k/include/asm}/apollodma.h | 0 .../asm-m68k => arch/m68k/include/asm}/apollohw.h | 0 .../asm-m68k => arch/m68k/include/asm}/atafd.h | 0 .../asm-m68k => arch/m68k/include/asm}/atafdreg.h | 0 .../m68k/include/asm}/atari_joystick.h | 0 .../m68k/include/asm}/atari_stdma.h | 0 .../m68k/include/asm}/atari_stram.h | 0 .../asm-m68k => arch/m68k/include/asm}/atarihw.h | 0 .../asm-m68k => arch/m68k/include/asm}/atariints.h | 0 .../asm-m68k => arch/m68k/include/asm}/atarikb.h | 0 arch/m68k/include/asm/atomic.h | 5 +++++ .../atomic.h => arch/m68k/include/asm/atomic_mm.h | 0 .../asm/atomic.h => m68k/include/asm/atomic_no.h} | 0 arch/{m68knommu => m68k}/include/asm/auxvec.h | 0 arch/m68k/include/asm/bitops.h | 5 +++++ .../bitops.h => arch/m68k/include/asm/bitops_mm.h | 0 .../asm/bitops.h => m68k/include/asm/bitops_no.h} | 0 .../asm-m68k => arch/m68k/include/asm}/blinken.h | 0 arch/m68k/include/asm/bootinfo.h | 5 +++++ .../m68k/include/asm/bootinfo_mm.h | 0 .../bootinfo.h => m68k/include/asm/bootinfo_no.h} | 0 arch/{m68knommu => m68k}/include/asm/bootstd.h | 0 arch/m68k/include/asm/bug.h | 5 +++++ .../bug.h => arch/m68k/include/asm/bug_mm.h | 0 .../asm/bug.h => m68k/include/asm/bug_no.h} | 0 arch/m68k/include/asm/bugs.h | 5 +++++ .../bugs.h => arch/m68k/include/asm/bugs_mm.h | 0 .../asm/bugs.h => m68k/include/asm/bugs_no.h} | 0 .../m68k/include/asm}/bvme6000hw.h | 0 arch/m68k/include/asm/byteorder.h | 5 +++++ .../m68k/include/asm/byteorder_mm.h | 0 .../include/asm/byteorder_no.h} | 0 arch/m68k/include/asm/cache.h | 5 +++++ .../cache.h => arch/m68k/include/asm/cache_mm.h | 0 .../asm/cache.h => m68k/include/asm/cache_no.h} | 0 .../asm-m68k => arch/m68k/include/asm}/cachectl.h | 0 arch/m68k/include/asm/cacheflush.h | 5 +++++ .../m68k/include/asm/cacheflush_mm.h | 0 .../include/asm/cacheflush_no.h} | 0 arch/m68k/include/asm/checksum.h | 5 +++++ .../m68k/include/asm/checksum_mm.h | 0 .../checksum.h => m68k/include/asm/checksum_no.h} | 0 arch/{m68knommu => m68k}/include/asm/coldfire.h | 0 arch/{m68knommu => m68k}/include/asm/commproc.h | 0 .../asm-m68k => arch/m68k/include/asm}/contregs.h | 0 .../asm-m68k => arch/m68k/include/asm}/cputime.h | 0 arch/m68k/include/asm/current.h | 5 +++++ .../m68k/include/asm/current_mm.h | 0 .../current.h => m68k/include/asm/current_no.h} | 0 arch/{m68knommu => m68k}/include/asm/dbg.h | 0 arch/m68k/include/asm/delay.h | 5 +++++ .../delay.h => arch/m68k/include/asm/delay_mm.h | 0 .../asm/delay.h => m68k/include/asm/delay_no.h} | 0 arch/{m68knommu => m68k}/include/asm/device.h | 0 arch/m68k/include/asm/div64.h | 5 +++++ .../div64.h => arch/m68k/include/asm/div64_mm.h | 0 .../asm/div64.h => m68k/include/asm/div64_no.h} | 0 arch/m68k/include/asm/dma-mapping.h | 5 +++++ .../m68k/include/asm/dma-mapping_mm.h | 0 .../include/asm/dma-mapping_no.h} | 0 arch/m68k/include/asm/dma.h | 5 +++++ .../dma.h => arch/m68k/include/asm/dma_mm.h | 0 .../asm/dma.h => m68k/include/asm/dma_no.h} | 0 .../asm-m68k => arch/m68k/include/asm}/dsp56k.h | 0 {include/asm-m68k => arch/m68k/include/asm}/dvma.h | 0 arch/m68k/include/asm/elf.h | 5 +++++ .../elf.h => arch/m68k/include/asm/elf_mm.h | 0 .../asm/elf.h => m68k/include/asm/elf_no.h} | 0 arch/{m68knommu => m68k}/include/asm/elia.h | 0 .../include/asm/emergency-restart.h | 0 arch/m68k/include/asm/entry.h | 5 +++++ .../entry.h => arch/m68k/include/asm/entry_mm.h | 0 .../asm/entry.h => m68k/include/asm/entry_no.h} | 0 .../asm-m68k => arch/m68k/include/asm}/errno.h | 0 arch/m68k/include/asm/fb.h | 5 +++++ .../asm-m68k/fb.h => arch/m68k/include/asm/fb_mm.h | 0 .../include/asm/fb.h => m68k/include/asm/fb_no.h} | 0 {include/asm-m68k => arch/m68k/include/asm}/fbio.h | 0 .../asm-m68k => arch/m68k/include/asm}/fcntl.h | 0 arch/{m68knommu => m68k}/include/asm/flat.h | 0 .../asm-m68k => arch/m68k/include/asm}/floppy.h | 0 arch/m68k/include/asm/fpu.h | 5 +++++ .../fpu.h => arch/m68k/include/asm/fpu_mm.h | 0 .../asm/fpu.h => m68k/include/asm/fpu_no.h} | 0 arch/{m68knommu => m68k}/include/asm/futex.h | 0 arch/m68k/include/asm/hardirq.h | 5 +++++ .../m68k/include/asm/hardirq_mm.h | 0 .../hardirq.h => m68k/include/asm/hardirq_no.h} | 0 .../asm-m68k => arch/m68k/include/asm}/hp300hw.h | 0 arch/m68k/include/asm/hw_irq.h | 5 +++++ .../hw_irq.h => arch/m68k/include/asm/hw_irq_mm.h | 0 .../asm/hw_irq.h => m68k/include/asm/hw_irq_no.h} | 0 .../asm-m68k => arch/m68k/include/asm}/hwtest.h | 0 {include/asm-m68k => arch/m68k/include/asm}/ide.h | 0 .../asm-m68k => arch/m68k/include/asm}/idprom.h | 0 .../asm-m68k => arch/m68k/include/asm}/intersil.h | 0 arch/m68k/include/asm/io.h | 5 +++++ .../asm-m68k/io.h => arch/m68k/include/asm/io_mm.h | 0 .../include/asm/io.h => m68k/include/asm/io_no.h} | 0 arch/{m68knommu => m68k}/include/asm/ioctl.h | 0 .../asm-m68k => arch/m68k/include/asm}/ioctls.h | 0 .../asm-m68k => arch/m68k/include/asm}/ipcbuf.h | 0 arch/m68k/include/asm/irq.h | 5 +++++ .../irq.h => arch/m68k/include/asm/irq_mm.h | 0 .../asm/irq.h => m68k/include/asm/irq_no.h} | 0 arch/{m68knommu => m68k}/include/asm/irq_regs.h | 0 arch/{m68knommu => m68k}/include/asm/kdebug.h | 0 arch/m68k/include/asm/kmap_types.h | 5 +++++ .../m68k/include/asm/kmap_types_mm.h | 0 .../include/asm/kmap_types_no.h} | 0 .../asm-m68k => arch/m68k/include/asm}/linkage.h | 0 .../asm-m68k => arch/m68k/include/asm}/local.h | 0 arch/{m68knommu => m68k}/include/asm/m5206sim.h | 0 arch/{m68knommu => m68k}/include/asm/m520xsim.h | 0 arch/{m68knommu => m68k}/include/asm/m523xsim.h | 0 arch/{m68knommu => m68k}/include/asm/m5249sim.h | 0 arch/{m68knommu => m68k}/include/asm/m5272sim.h | 0 arch/{m68knommu => m68k}/include/asm/m527xsim.h | 0 arch/{m68knommu => m68k}/include/asm/m528xsim.h | 0 arch/{m68knommu => m68k}/include/asm/m5307sim.h | 0 arch/{m68knommu => m68k}/include/asm/m532xsim.h | 0 arch/{m68knommu => m68k}/include/asm/m5407sim.h | 0 arch/{m68knommu => m68k}/include/asm/m68360.h | 0 arch/{m68knommu => m68k}/include/asm/m68360_enet.h | 0 arch/{m68knommu => m68k}/include/asm/m68360_pram.h | 0 .../{m68knommu => m68k}/include/asm/m68360_quicc.h | 0 arch/{m68knommu => m68k}/include/asm/m68360_regs.h | 0 .../asm-m68k => arch/m68k/include/asm}/mac_asc.h | 0 .../m68k/include/asm}/mac_baboon.h | 0 .../asm-m68k => arch/m68k/include/asm}/mac_iop.h | 0 .../asm-m68k => arch/m68k/include/asm}/mac_mouse.h | 0 .../asm-m68k => arch/m68k/include/asm}/mac_oss.h | 0 .../asm-m68k => arch/m68k/include/asm}/mac_psc.h | 0 .../asm-m68k => arch/m68k/include/asm}/mac_via.h | 0 arch/m68k/include/asm/machdep.h | 5 +++++ .../m68k/include/asm/machdep_mm.h | 0 .../machdep.h => m68k/include/asm/machdep_no.h} | 0 .../asm-m68k => arch/m68k/include/asm}/machines.h | 0 .../asm-m68k => arch/m68k/include/asm}/machw.h | 0 .../asm-m68k => arch/m68k/include/asm}/macintosh.h | 0 .../asm-m68k => arch/m68k/include/asm}/macints.h | 0 .../asm-m68k => arch/m68k/include/asm}/math-emu.h | 0 arch/m68k/include/asm/mc146818rtc.h | 5 +++++ .../m68k/include/asm/mc146818rtc_mm.h | 0 .../include/asm/mc146818rtc_no.h} | 0 arch/{m68knommu => m68k}/include/asm/mcfcache.h | 0 arch/{m68knommu => m68k}/include/asm/mcfdma.h | 0 arch/{m68knommu => m68k}/include/asm/mcfmbus.h | 0 arch/{m68knommu => m68k}/include/asm/mcfne.h | 0 arch/{m68knommu => m68k}/include/asm/mcfpci.h | 0 arch/{m68knommu => m68k}/include/asm/mcfpit.h | 0 arch/{m68knommu => m68k}/include/asm/mcfsim.h | 0 arch/{m68knommu => m68k}/include/asm/mcfsmc.h | 0 arch/{m68knommu => m68k}/include/asm/mcftimer.h | 0 arch/{m68knommu => m68k}/include/asm/mcfuart.h | 0 arch/{m68knommu => m68k}/include/asm/mcfwdebug.h | 0 {include/asm-m68k => arch/m68k/include/asm}/md.h | 0 {include/asm-m68k => arch/m68k/include/asm}/mman.h | 0 arch/m68k/include/asm/mmu.h | 5 +++++ arch/m68k/include/asm/mmu_context.h | 5 +++++ .../m68k/include/asm/mmu_context_mm.h | 0 .../include/asm/mmu_context_no.h} | 0 .../mmu.h => arch/m68k/include/asm/mmu_mm.h | 0 .../asm/mmu.h => m68k/include/asm/mmu_no.h} | 0 .../asm-m68k => arch/m68k/include/asm}/mmzone.h | 0 arch/m68k/include/asm/module.h | 5 +++++ .../module.h => arch/m68k/include/asm/module_mm.h | 0 .../asm/module.h => m68k/include/asm/module_no.h} | 0 .../m68k/include/asm}/motorola_pgalloc.h | 0 .../m68k/include/asm}/motorola_pgtable.h | 0 {include/asm-m68k => arch/m68k/include/asm}/movs.h | 0 .../asm-m68k => arch/m68k/include/asm}/msgbuf.h | 0 arch/{m68knommu => m68k}/include/asm/mutex.h | 0 .../asm-m68k => arch/m68k/include/asm}/mvme147hw.h | 0 .../asm-m68k => arch/m68k/include/asm}/mvme16xhw.h | 0 arch/{m68knommu => m68k}/include/asm/nettel.h | 0 .../asm-m68k => arch/m68k/include/asm}/nubus.h | 0 .../asm-m68k => arch/m68k/include/asm}/openprom.h | 0 .../asm-m68k => arch/m68k/include/asm}/oplib.h | 0 arch/m68k/include/asm/page.h | 5 +++++ .../page.h => arch/m68k/include/asm/page_mm.h | 0 .../asm/page.h => m68k/include/asm/page_no.h} | 0 arch/m68k/include/asm/page_offset.h | 5 +++++ .../m68k/include/asm/page_offset_mm.h | 0 .../include/asm/page_offset_no.h} | 0 arch/m68k/include/asm/param.h | 5 +++++ .../param.h => arch/m68k/include/asm/param_mm.h | 0 .../asm/param.h => m68k/include/asm/param_no.h} | 0 .../asm-m68k => arch/m68k/include/asm}/parport.h | 0 arch/m68k/include/asm/pci.h | 5 +++++ .../pci.h => arch/m68k/include/asm/pci_mm.h | 0 .../asm/pci.h => m68k/include/asm/pci_no.h} | 2 +- .../asm-m68k => arch/m68k/include/asm}/percpu.h | 0 arch/m68k/include/asm/pgalloc.h | 5 +++++ .../m68k/include/asm/pgalloc_mm.h | 0 .../pgalloc.h => m68k/include/asm/pgalloc_no.h} | 0 arch/m68k/include/asm/pgtable.h | 5 +++++ .../m68k/include/asm/pgtable_mm.h | 0 .../pgtable.h => m68k/include/asm/pgtable_no.h} | 0 {include/asm-m68k => arch/m68k/include/asm}/poll.h | 0 .../m68k/include/asm}/posix_types.h | 0 arch/m68k/include/asm/processor.h | 5 +++++ .../m68k/include/asm/processor_mm.h | 0 .../include/asm/processor_no.h} | 0 arch/m68k/include/asm/ptrace.h | 5 +++++ .../ptrace.h => arch/m68k/include/asm/ptrace_mm.h | 0 .../asm/ptrace.h => m68k/include/asm/ptrace_no.h} | 0 .../m68k/include/asm}/q40_master.h | 0 .../asm-m68k => arch/m68k/include/asm}/q40ints.h | 0 .../{m68knommu => m68k}/include/asm/quicc_simple.h | 0 .../asm-m68k => arch/m68k/include/asm}/raw_io.h | 0 .../asm-m68k => arch/m68k/include/asm}/resource.h | 0 {include/asm-m68k => arch/m68k/include/asm}/rtc.h | 0 {include/asm-m68k => arch/m68k/include/asm}/sbus.h | 0 arch/m68k/include/asm/scatterlist.h | 5 +++++ .../m68k/include/asm/scatterlist_mm.h | 0 .../include/asm/scatterlist_no.h} | 0 .../asm-m68k => arch/m68k/include/asm}/sections.h | 0 arch/m68k/include/asm/segment.h | 5 +++++ .../m68k/include/asm/segment_mm.h | 0 .../segment.h => m68k/include/asm/segment_no.h} | 0 .../asm-m68k => arch/m68k/include/asm}/sembuf.h | 0 .../asm-m68k => arch/m68k/include/asm}/serial.h | 0 arch/m68k/include/asm/setup.h | 5 +++++ .../setup.h => arch/m68k/include/asm/setup_mm.h | 0 .../asm/setup.h => m68k/include/asm/setup_no.h} | 2 +- {include/asm-m68k => arch/m68k/include/asm}/shm.h | 0 .../asm-m68k => arch/m68k/include/asm}/shmbuf.h | 0 .../asm-m68k => arch/m68k/include/asm}/shmparam.h | 0 arch/m68k/include/asm/sigcontext.h | 5 +++++ .../m68k/include/asm/sigcontext_mm.h | 0 .../include/asm/sigcontext_no.h} | 0 arch/m68k/include/asm/siginfo.h | 5 +++++ .../m68k/include/asm/siginfo_mm.h | 0 .../siginfo.h => m68k/include/asm/siginfo_no.h} | 0 arch/m68k/include/asm/signal.h | 5 +++++ .../signal.h => arch/m68k/include/asm/signal_mm.h | 0 .../asm/signal.h => m68k/include/asm/signal_no.h} | 0 arch/{m68knommu => m68k}/include/asm/smp.h | 0 .../asm-m68k => arch/m68k/include/asm}/socket.h | 0 .../asm-m68k => arch/m68k/include/asm}/sockios.h | 0 .../asm-m68k => arch/m68k/include/asm}/spinlock.h | 0 {include/asm-m68k => arch/m68k/include/asm}/stat.h | 0 .../asm-m68k => arch/m68k/include/asm}/statfs.h | 0 arch/m68k/include/asm/string.h | 5 +++++ .../string.h => arch/m68k/include/asm/string_mm.h | 0 .../asm/string.h => m68k/include/asm/string_no.h} | 0 .../asm-m68k => arch/m68k/include/asm}/sun3-head.h | 0 .../m68k/include/asm}/sun3_pgalloc.h | 0 .../m68k/include/asm}/sun3_pgtable.h | 0 .../asm-m68k => arch/m68k/include/asm}/sun3ints.h | 0 .../asm-m68k => arch/m68k/include/asm}/sun3mmu.h | 0 .../asm-m68k => arch/m68k/include/asm}/sun3x.h | 0 .../asm-m68k => arch/m68k/include/asm}/sun3xflop.h | 0 .../asm-m68k => arch/m68k/include/asm}/sun3xprom.h | 0 .../asm-m68k => arch/m68k/include/asm}/suspend.h | 0 .../swab.h => arch/m68k/include/asm/swab_mm.h | 0 .../asm/swab.h => m68k/include/asm/swab_no.h} | 0 arch/m68k/include/asm/system.h | 5 +++++ .../system.h => arch/m68k/include/asm/system_mm.h | 0 .../asm/system.h => m68k/include/asm/system_no.h} | 0 .../asm-m68k => arch/m68k/include/asm}/termbits.h | 0 .../asm-m68k => arch/m68k/include/asm}/termios.h | 0 arch/m68k/include/asm/thread_info.h | 5 +++++ .../m68k/include/asm/thread_info_mm.h | 0 .../include/asm/thread_info_no.h} | 0 arch/m68k/include/asm/timex.h | 5 +++++ .../timex.h => arch/m68k/include/asm/timex_mm.h | 0 .../asm/timex.h => m68k/include/asm/timex_no.h} | 0 {include/asm-m68k => arch/m68k/include/asm}/tlb.h | 0 arch/m68k/include/asm/tlbflush.h | 5 +++++ .../m68k/include/asm/tlbflush_mm.h | 0 .../tlbflush.h => m68k/include/asm/tlbflush_no.h} | 0 arch/{m68knommu => m68k}/include/asm/topology.h | 0 arch/m68k/include/asm/traps.h | 5 +++++ .../traps.h => arch/m68k/include/asm/traps_mm.h | 0 .../asm/traps.h => m68k/include/asm/traps_no.h} | 0 .../asm-m68k => arch/m68k/include/asm}/types.h | 0 arch/m68k/include/asm/uaccess.h | 5 +++++ .../m68k/include/asm/uaccess_mm.h | 0 .../uaccess.h => m68k/include/asm/uaccess_no.h} | 0 arch/m68k/include/asm/ucontext.h | 5 +++++ .../m68k/include/asm/ucontext_mm.h | 0 .../ucontext.h => m68k/include/asm/ucontext_no.h} | 0 arch/m68k/include/asm/unaligned.h | 5 +++++ .../m68k/include/asm/unaligned_mm.h | 0 .../include/asm/unaligned_no.h} | 0 arch/m68k/include/asm/unistd.h | 5 +++++ .../unistd.h => arch/m68k/include/asm/unistd_mm.h | 0 .../asm/unistd.h => m68k/include/asm/unistd_no.h} | 0 {include/asm-m68k => arch/m68k/include/asm}/user.h | 0 .../m68k/include/asm}/virtconvert.h | 0 {include/asm-m68k => arch/m68k/include/asm}/xor.h | 0 .../asm-m68k => arch/m68k/include/asm}/zorro.h | 0 arch/m68knommu/include/asm/Kbuild | 1 - arch/m68knommu/include/asm/cachectl.h | 1 - arch/m68knommu/include/asm/cputime.h | 6 ------ arch/m68knommu/include/asm/errno.h | 1 - arch/m68knommu/include/asm/fcntl.h | 1 - arch/m68knommu/include/asm/hwtest.h | 1 - arch/m68knommu/include/asm/ioctls.h | 1 - arch/m68knommu/include/asm/ipcbuf.h | 1 - arch/m68knommu/include/asm/linkage.h | 1 - arch/m68knommu/include/asm/local.h | 6 ------ arch/m68knommu/include/asm/math-emu.h | 1 - arch/m68knommu/include/asm/md.h | 1 - arch/m68knommu/include/asm/mman.h | 1 - arch/m68knommu/include/asm/movs.h | 1 - arch/m68knommu/include/asm/msgbuf.h | 1 - arch/m68knommu/include/asm/openprom.h | 1 - arch/m68knommu/include/asm/oplib.h | 1 - arch/m68knommu/include/asm/percpu.h | 6 ------ arch/m68knommu/include/asm/poll.h | 1 - arch/m68knommu/include/asm/posix_types.h | 1 - arch/m68knommu/include/asm/resource.h | 1 - arch/m68knommu/include/asm/rtc.h | 1 - arch/m68knommu/include/asm/sections.h | 7 ------- arch/m68knommu/include/asm/sembuf.h | 1 - arch/m68knommu/include/asm/shm.h | 1 - arch/m68knommu/include/asm/shmbuf.h | 1 - arch/m68knommu/include/asm/shmparam.h | 1 - arch/m68knommu/include/asm/socket.h | 1 - arch/m68knommu/include/asm/sockios.h | 1 - arch/m68knommu/include/asm/spinlock.h | 1 - arch/m68knommu/include/asm/stat.h | 1 - arch/m68knommu/include/asm/statfs.h | 1 - arch/m68knommu/include/asm/termbits.h | 1 - arch/m68knommu/include/asm/termios.h | 1 - arch/m68knommu/include/asm/tlb.h | 1 - arch/m68knommu/include/asm/types.h | 1 - arch/m68knommu/include/asm/user.h | 1 - include/asm-m68k/auxvec.h | 4 ---- include/asm-m68k/device.h | 7 ------- include/asm-m68k/emergency-restart.h | 6 ------ include/asm-m68k/futex.h | 6 ------ include/asm-m68k/ioctl.h | 1 - include/asm-m68k/irq_regs.h | 1 - include/asm-m68k/kdebug.h | 1 - include/asm-m68k/mutex.h | 9 --------- include/asm-m68k/topology.h | 6 ------ 354 files changed, 266 insertions(+), 101 deletions(-) rename {include/asm-m68k => arch/m68k/include/asm}/Kbuild (100%) rename arch/{m68knommu => m68k}/include/asm/MC68328.h (100%) rename arch/{m68knommu => m68k}/include/asm/MC68332.h (100%) rename arch/{m68knommu => m68k}/include/asm/MC68EZ328.h (100%) rename arch/{m68knommu => m68k}/include/asm/MC68VZ328.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/a.out-core.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/a.out.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/adb_iop.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/amigahw.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/amigaints.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/amigayle.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/amipcmcia.h (100%) rename arch/{m68knommu => m68k}/include/asm/anchor.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/apollodma.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/apollohw.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/atafd.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/atafdreg.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/atari_joystick.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/atari_stdma.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/atari_stram.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/atarihw.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/atariints.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/atarikb.h (100%) create mode 100644 arch/m68k/include/asm/atomic.h rename include/asm-m68k/atomic.h => arch/m68k/include/asm/atomic_mm.h (100%) rename arch/{m68knommu/include/asm/atomic.h => m68k/include/asm/atomic_no.h} (100%) rename arch/{m68knommu => m68k}/include/asm/auxvec.h (100%) create mode 100644 arch/m68k/include/asm/bitops.h rename include/asm-m68k/bitops.h => arch/m68k/include/asm/bitops_mm.h (100%) rename arch/{m68knommu/include/asm/bitops.h => m68k/include/asm/bitops_no.h} (100%) rename {include/asm-m68k => arch/m68k/include/asm}/blinken.h (100%) create mode 100644 arch/m68k/include/asm/bootinfo.h rename include/asm-m68k/bootinfo.h => arch/m68k/include/asm/bootinfo_mm.h (100%) rename arch/{m68knommu/include/asm/bootinfo.h => m68k/include/asm/bootinfo_no.h} (100%) rename arch/{m68knommu => m68k}/include/asm/bootstd.h (100%) create mode 100644 arch/m68k/include/asm/bug.h rename include/asm-m68k/bug.h => arch/m68k/include/asm/bug_mm.h (100%) rename arch/{m68knommu/include/asm/bug.h => m68k/include/asm/bug_no.h} (100%) create mode 100644 arch/m68k/include/asm/bugs.h rename include/asm-m68k/bugs.h => arch/m68k/include/asm/bugs_mm.h (100%) rename arch/{m68knommu/include/asm/bugs.h => m68k/include/asm/bugs_no.h} (100%) rename {include/asm-m68k => arch/m68k/include/asm}/bvme6000hw.h (100%) create mode 100644 arch/m68k/include/asm/byteorder.h rename include/asm-m68k/byteorder.h => arch/m68k/include/asm/byteorder_mm.h (100%) rename arch/{m68knommu/include/asm/byteorder.h => m68k/include/asm/byteorder_no.h} (100%) create mode 100644 arch/m68k/include/asm/cache.h rename include/asm-m68k/cache.h => arch/m68k/include/asm/cache_mm.h (100%) rename arch/{m68knommu/include/asm/cache.h => m68k/include/asm/cache_no.h} (100%) rename {include/asm-m68k => arch/m68k/include/asm}/cachectl.h (100%) create mode 100644 arch/m68k/include/asm/cacheflush.h rename include/asm-m68k/cacheflush.h => arch/m68k/include/asm/cacheflush_mm.h (100%) rename arch/{m68knommu/include/asm/cacheflush.h => m68k/include/asm/cacheflush_no.h} (100%) create mode 100644 arch/m68k/include/asm/checksum.h rename include/asm-m68k/checksum.h => arch/m68k/include/asm/checksum_mm.h (100%) rename arch/{m68knommu/include/asm/checksum.h => m68k/include/asm/checksum_no.h} (100%) rename arch/{m68knommu => m68k}/include/asm/coldfire.h (100%) rename arch/{m68knommu => m68k}/include/asm/commproc.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/contregs.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/cputime.h (100%) create mode 100644 arch/m68k/include/asm/current.h rename include/asm-m68k/current.h => arch/m68k/include/asm/current_mm.h (100%) rename arch/{m68knommu/include/asm/current.h => m68k/include/asm/current_no.h} (100%) rename arch/{m68knommu => m68k}/include/asm/dbg.h (100%) create mode 100644 arch/m68k/include/asm/delay.h rename include/asm-m68k/delay.h => arch/m68k/include/asm/delay_mm.h (100%) rename arch/{m68knommu/include/asm/delay.h => m68k/include/asm/delay_no.h} (100%) rename arch/{m68knommu => m68k}/include/asm/device.h (100%) create mode 100644 arch/m68k/include/asm/div64.h rename include/asm-m68k/div64.h => arch/m68k/include/asm/div64_mm.h (100%) rename arch/{m68knommu/include/asm/div64.h => m68k/include/asm/div64_no.h} (100%) create mode 100644 arch/m68k/include/asm/dma-mapping.h rename include/asm-m68k/dma-mapping.h => arch/m68k/include/asm/dma-mapping_mm.h (100%) rename arch/{m68knommu/include/asm/dma-mapping.h => m68k/include/asm/dma-mapping_no.h} (100%) create mode 100644 arch/m68k/include/asm/dma.h rename include/asm-m68k/dma.h => arch/m68k/include/asm/dma_mm.h (100%) rename arch/{m68knommu/include/asm/dma.h => m68k/include/asm/dma_no.h} (100%) rename {include/asm-m68k => arch/m68k/include/asm}/dsp56k.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/dvma.h (100%) create mode 100644 arch/m68k/include/asm/elf.h rename include/asm-m68k/elf.h => arch/m68k/include/asm/elf_mm.h (100%) rename arch/{m68knommu/include/asm/elf.h => m68k/include/asm/elf_no.h} (100%) rename arch/{m68knommu => m68k}/include/asm/elia.h (100%) rename arch/{m68knommu => m68k}/include/asm/emergency-restart.h (100%) create mode 100644 arch/m68k/include/asm/entry.h rename include/asm-m68k/entry.h => arch/m68k/include/asm/entry_mm.h (100%) rename arch/{m68knommu/include/asm/entry.h => m68k/include/asm/entry_no.h} (100%) rename {include/asm-m68k => arch/m68k/include/asm}/errno.h (100%) create mode 100644 arch/m68k/include/asm/fb.h rename include/asm-m68k/fb.h => arch/m68k/include/asm/fb_mm.h (100%) rename arch/{m68knommu/include/asm/fb.h => m68k/include/asm/fb_no.h} (100%) rename {include/asm-m68k => arch/m68k/include/asm}/fbio.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/fcntl.h (100%) rename arch/{m68knommu => m68k}/include/asm/flat.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/floppy.h (100%) create mode 100644 arch/m68k/include/asm/fpu.h rename include/asm-m68k/fpu.h => arch/m68k/include/asm/fpu_mm.h (100%) rename arch/{m68knommu/include/asm/fpu.h => m68k/include/asm/fpu_no.h} (100%) rename arch/{m68knommu => m68k}/include/asm/futex.h (100%) create mode 100644 arch/m68k/include/asm/hardirq.h rename include/asm-m68k/hardirq.h => arch/m68k/include/asm/hardirq_mm.h (100%) rename arch/{m68knommu/include/asm/hardirq.h => m68k/include/asm/hardirq_no.h} (100%) rename {include/asm-m68k => arch/m68k/include/asm}/hp300hw.h (100%) create mode 100644 arch/m68k/include/asm/hw_irq.h rename include/asm-m68k/hw_irq.h => arch/m68k/include/asm/hw_irq_mm.h (100%) rename arch/{m68knommu/include/asm/hw_irq.h => m68k/include/asm/hw_irq_no.h} (100%) rename {include/asm-m68k => arch/m68k/include/asm}/hwtest.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/ide.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/idprom.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/intersil.h (100%) create mode 100644 arch/m68k/include/asm/io.h rename include/asm-m68k/io.h => arch/m68k/include/asm/io_mm.h (100%) rename arch/{m68knommu/include/asm/io.h => m68k/include/asm/io_no.h} (100%) rename arch/{m68knommu => m68k}/include/asm/ioctl.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/ioctls.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/ipcbuf.h (100%) create mode 100644 arch/m68k/include/asm/irq.h rename include/asm-m68k/irq.h => arch/m68k/include/asm/irq_mm.h (100%) rename arch/{m68knommu/include/asm/irq.h => m68k/include/asm/irq_no.h} (100%) rename arch/{m68knommu => m68k}/include/asm/irq_regs.h (100%) rename arch/{m68knommu => m68k}/include/asm/kdebug.h (100%) create mode 100644 arch/m68k/include/asm/kmap_types.h rename include/asm-m68k/kmap_types.h => arch/m68k/include/asm/kmap_types_mm.h (100%) rename arch/{m68knommu/include/asm/kmap_types.h => m68k/include/asm/kmap_types_no.h} (100%) rename {include/asm-m68k => arch/m68k/include/asm}/linkage.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/local.h (100%) rename arch/{m68knommu => m68k}/include/asm/m5206sim.h (100%) rename arch/{m68knommu => m68k}/include/asm/m520xsim.h (100%) rename arch/{m68knommu => m68k}/include/asm/m523xsim.h (100%) rename arch/{m68knommu => m68k}/include/asm/m5249sim.h (100%) rename arch/{m68knommu => m68k}/include/asm/m5272sim.h (100%) rename arch/{m68knommu => m68k}/include/asm/m527xsim.h (100%) rename arch/{m68knommu => m68k}/include/asm/m528xsim.h (100%) rename arch/{m68knommu => m68k}/include/asm/m5307sim.h (100%) rename arch/{m68knommu => m68k}/include/asm/m532xsim.h (100%) rename arch/{m68knommu => m68k}/include/asm/m5407sim.h (100%) rename arch/{m68knommu => m68k}/include/asm/m68360.h (100%) rename arch/{m68knommu => m68k}/include/asm/m68360_enet.h (100%) rename arch/{m68knommu => m68k}/include/asm/m68360_pram.h (100%) rename arch/{m68knommu => m68k}/include/asm/m68360_quicc.h (100%) rename arch/{m68knommu => m68k}/include/asm/m68360_regs.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/mac_asc.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/mac_baboon.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/mac_iop.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/mac_mouse.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/mac_oss.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/mac_psc.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/mac_via.h (100%) create mode 100644 arch/m68k/include/asm/machdep.h rename include/asm-m68k/machdep.h => arch/m68k/include/asm/machdep_mm.h (100%) rename arch/{m68knommu/include/asm/machdep.h => m68k/include/asm/machdep_no.h} (100%) rename {include/asm-m68k => arch/m68k/include/asm}/machines.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/machw.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/macintosh.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/macints.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/math-emu.h (100%) create mode 100644 arch/m68k/include/asm/mc146818rtc.h rename include/asm-m68k/mc146818rtc.h => arch/m68k/include/asm/mc146818rtc_mm.h (100%) rename arch/{m68knommu/include/asm/mc146818rtc.h => m68k/include/asm/mc146818rtc_no.h} (100%) rename arch/{m68knommu => m68k}/include/asm/mcfcache.h (100%) rename arch/{m68knommu => m68k}/include/asm/mcfdma.h (100%) rename arch/{m68knommu => m68k}/include/asm/mcfmbus.h (100%) rename arch/{m68knommu => m68k}/include/asm/mcfne.h (100%) rename arch/{m68knommu => m68k}/include/asm/mcfpci.h (100%) rename arch/{m68knommu => m68k}/include/asm/mcfpit.h (100%) rename arch/{m68knommu => m68k}/include/asm/mcfsim.h (100%) rename arch/{m68knommu => m68k}/include/asm/mcfsmc.h (100%) rename arch/{m68knommu => m68k}/include/asm/mcftimer.h (100%) rename arch/{m68knommu => m68k}/include/asm/mcfuart.h (100%) rename arch/{m68knommu => m68k}/include/asm/mcfwdebug.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/md.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/mman.h (100%) create mode 100644 arch/m68k/include/asm/mmu.h create mode 100644 arch/m68k/include/asm/mmu_context.h rename include/asm-m68k/mmu_context.h => arch/m68k/include/asm/mmu_context_mm.h (100%) rename arch/{m68knommu/include/asm/mmu_context.h => m68k/include/asm/mmu_context_no.h} (100%) rename include/asm-m68k/mmu.h => arch/m68k/include/asm/mmu_mm.h (100%) rename arch/{m68knommu/include/asm/mmu.h => m68k/include/asm/mmu_no.h} (100%) rename {include/asm-m68k => arch/m68k/include/asm}/mmzone.h (100%) create mode 100644 arch/m68k/include/asm/module.h rename include/asm-m68k/module.h => arch/m68k/include/asm/module_mm.h (100%) rename arch/{m68knommu/include/asm/module.h => m68k/include/asm/module_no.h} (100%) rename {include/asm-m68k => arch/m68k/include/asm}/motorola_pgalloc.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/motorola_pgtable.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/movs.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/msgbuf.h (100%) rename arch/{m68knommu => m68k}/include/asm/mutex.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/mvme147hw.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/mvme16xhw.h (100%) rename arch/{m68knommu => m68k}/include/asm/nettel.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/nubus.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/openprom.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/oplib.h (100%) create mode 100644 arch/m68k/include/asm/page.h rename include/asm-m68k/page.h => arch/m68k/include/asm/page_mm.h (100%) rename arch/{m68knommu/include/asm/page.h => m68k/include/asm/page_no.h} (100%) create mode 100644 arch/m68k/include/asm/page_offset.h rename include/asm-m68k/page_offset.h => arch/m68k/include/asm/page_offset_mm.h (100%) rename arch/{m68knommu/include/asm/page_offset.h => m68k/include/asm/page_offset_no.h} (100%) create mode 100644 arch/m68k/include/asm/param.h rename include/asm-m68k/param.h => arch/m68k/include/asm/param_mm.h (100%) rename arch/{m68knommu/include/asm/param.h => m68k/include/asm/param_no.h} (100%) rename {include/asm-m68k => arch/m68k/include/asm}/parport.h (100%) create mode 100644 arch/m68k/include/asm/pci.h rename include/asm-m68k/pci.h => arch/m68k/include/asm/pci_mm.h (100%) rename arch/{m68knommu/include/asm/pci.h => m68k/include/asm/pci_no.h} (96%) rename {include/asm-m68k => arch/m68k/include/asm}/percpu.h (100%) create mode 100644 arch/m68k/include/asm/pgalloc.h rename include/asm-m68k/pgalloc.h => arch/m68k/include/asm/pgalloc_mm.h (100%) rename arch/{m68knommu/include/asm/pgalloc.h => m68k/include/asm/pgalloc_no.h} (100%) create mode 100644 arch/m68k/include/asm/pgtable.h rename include/asm-m68k/pgtable.h => arch/m68k/include/asm/pgtable_mm.h (100%) rename arch/{m68knommu/include/asm/pgtable.h => m68k/include/asm/pgtable_no.h} (100%) rename {include/asm-m68k => arch/m68k/include/asm}/poll.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/posix_types.h (100%) create mode 100644 arch/m68k/include/asm/processor.h rename include/asm-m68k/processor.h => arch/m68k/include/asm/processor_mm.h (100%) rename arch/{m68knommu/include/asm/processor.h => m68k/include/asm/processor_no.h} (100%) create mode 100644 arch/m68k/include/asm/ptrace.h rename include/asm-m68k/ptrace.h => arch/m68k/include/asm/ptrace_mm.h (100%) rename arch/{m68knommu/include/asm/ptrace.h => m68k/include/asm/ptrace_no.h} (100%) rename {include/asm-m68k => arch/m68k/include/asm}/q40_master.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/q40ints.h (100%) rename arch/{m68knommu => m68k}/include/asm/quicc_simple.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/raw_io.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/resource.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/rtc.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/sbus.h (100%) create mode 100644 arch/m68k/include/asm/scatterlist.h rename include/asm-m68k/scatterlist.h => arch/m68k/include/asm/scatterlist_mm.h (100%) rename arch/{m68knommu/include/asm/scatterlist.h => m68k/include/asm/scatterlist_no.h} (100%) rename {include/asm-m68k => arch/m68k/include/asm}/sections.h (100%) create mode 100644 arch/m68k/include/asm/segment.h rename include/asm-m68k/segment.h => arch/m68k/include/asm/segment_mm.h (100%) rename arch/{m68knommu/include/asm/segment.h => m68k/include/asm/segment_no.h} (100%) rename {include/asm-m68k => arch/m68k/include/asm}/sembuf.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/serial.h (100%) create mode 100644 arch/m68k/include/asm/setup.h rename include/asm-m68k/setup.h => arch/m68k/include/asm/setup_mm.h (100%) rename arch/{m68knommu/include/asm/setup.h => m68k/include/asm/setup_no.h} (84%) rename {include/asm-m68k => arch/m68k/include/asm}/shm.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/shmbuf.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/shmparam.h (100%) create mode 100644 arch/m68k/include/asm/sigcontext.h rename include/asm-m68k/sigcontext.h => arch/m68k/include/asm/sigcontext_mm.h (100%) rename arch/{m68knommu/include/asm/sigcontext.h => m68k/include/asm/sigcontext_no.h} (100%) create mode 100644 arch/m68k/include/asm/siginfo.h rename include/asm-m68k/siginfo.h => arch/m68k/include/asm/siginfo_mm.h (100%) rename arch/{m68knommu/include/asm/siginfo.h => m68k/include/asm/siginfo_no.h} (100%) create mode 100644 arch/m68k/include/asm/signal.h rename include/asm-m68k/signal.h => arch/m68k/include/asm/signal_mm.h (100%) rename arch/{m68knommu/include/asm/signal.h => m68k/include/asm/signal_no.h} (100%) rename arch/{m68knommu => m68k}/include/asm/smp.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/socket.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/sockios.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/spinlock.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/stat.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/statfs.h (100%) create mode 100644 arch/m68k/include/asm/string.h rename include/asm-m68k/string.h => arch/m68k/include/asm/string_mm.h (100%) rename arch/{m68knommu/include/asm/string.h => m68k/include/asm/string_no.h} (100%) rename {include/asm-m68k => arch/m68k/include/asm}/sun3-head.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/sun3_pgalloc.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/sun3_pgtable.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/sun3ints.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/sun3mmu.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/sun3x.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/sun3xflop.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/sun3xprom.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/suspend.h (100%) create mode 100644 arch/m68k/include/asm/swab.h rename include/asm-m68k/swab.h => arch/m68k/include/asm/swab_mm.h (100%) rename arch/{m68knommu/include/asm/swab.h => m68k/include/asm/swab_no.h} (100%) create mode 100644 arch/m68k/include/asm/system.h rename include/asm-m68k/system.h => arch/m68k/include/asm/system_mm.h (100%) rename arch/{m68knommu/include/asm/system.h => m68k/include/asm/system_no.h} (100%) rename {include/asm-m68k => arch/m68k/include/asm}/termbits.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/termios.h (100%) create mode 100644 arch/m68k/include/asm/thread_info.h rename include/asm-m68k/thread_info.h => arch/m68k/include/asm/thread_info_mm.h (100%) rename arch/{m68knommu/include/asm/thread_info.h => m68k/include/asm/thread_info_no.h} (100%) create mode 100644 arch/m68k/include/asm/timex.h rename include/asm-m68k/timex.h => arch/m68k/include/asm/timex_mm.h (100%) rename arch/{m68knommu/include/asm/timex.h => m68k/include/asm/timex_no.h} (100%) rename {include/asm-m68k => arch/m68k/include/asm}/tlb.h (100%) create mode 100644 arch/m68k/include/asm/tlbflush.h rename include/asm-m68k/tlbflush.h => arch/m68k/include/asm/tlbflush_mm.h (100%) rename arch/{m68knommu/include/asm/tlbflush.h => m68k/include/asm/tlbflush_no.h} (100%) rename arch/{m68knommu => m68k}/include/asm/topology.h (100%) create mode 100644 arch/m68k/include/asm/traps.h rename include/asm-m68k/traps.h => arch/m68k/include/asm/traps_mm.h (100%) rename arch/{m68knommu/include/asm/traps.h => m68k/include/asm/traps_no.h} (100%) rename {include/asm-m68k => arch/m68k/include/asm}/types.h (100%) create mode 100644 arch/m68k/include/asm/uaccess.h rename include/asm-m68k/uaccess.h => arch/m68k/include/asm/uaccess_mm.h (100%) rename arch/{m68knommu/include/asm/uaccess.h => m68k/include/asm/uaccess_no.h} (100%) create mode 100644 arch/m68k/include/asm/ucontext.h rename include/asm-m68k/ucontext.h => arch/m68k/include/asm/ucontext_mm.h (100%) rename arch/{m68knommu/include/asm/ucontext.h => m68k/include/asm/ucontext_no.h} (100%) create mode 100644 arch/m68k/include/asm/unaligned.h rename include/asm-m68k/unaligned.h => arch/m68k/include/asm/unaligned_mm.h (100%) rename arch/{m68knommu/include/asm/unaligned.h => m68k/include/asm/unaligned_no.h} (100%) create mode 100644 arch/m68k/include/asm/unistd.h rename include/asm-m68k/unistd.h => arch/m68k/include/asm/unistd_mm.h (100%) rename arch/{m68knommu/include/asm/unistd.h => m68k/include/asm/unistd_no.h} (100%) rename {include/asm-m68k => arch/m68k/include/asm}/user.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/virtconvert.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/xor.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/zorro.h (100%) delete mode 100644 arch/m68knommu/include/asm/Kbuild delete mode 100644 arch/m68knommu/include/asm/cachectl.h delete mode 100644 arch/m68knommu/include/asm/cputime.h delete mode 100644 arch/m68knommu/include/asm/errno.h delete mode 100644 arch/m68knommu/include/asm/fcntl.h delete mode 100644 arch/m68knommu/include/asm/hwtest.h delete mode 100644 arch/m68knommu/include/asm/ioctls.h delete mode 100644 arch/m68knommu/include/asm/ipcbuf.h delete mode 100644 arch/m68knommu/include/asm/linkage.h delete mode 100644 arch/m68knommu/include/asm/local.h delete mode 100644 arch/m68knommu/include/asm/math-emu.h delete mode 100644 arch/m68knommu/include/asm/md.h delete mode 100644 arch/m68knommu/include/asm/mman.h delete mode 100644 arch/m68knommu/include/asm/movs.h delete mode 100644 arch/m68knommu/include/asm/msgbuf.h delete mode 100644 arch/m68knommu/include/asm/openprom.h delete mode 100644 arch/m68knommu/include/asm/oplib.h delete mode 100644 arch/m68knommu/include/asm/percpu.h delete mode 100644 arch/m68knommu/include/asm/poll.h delete mode 100644 arch/m68knommu/include/asm/posix_types.h delete mode 100644 arch/m68knommu/include/asm/resource.h delete mode 100644 arch/m68knommu/include/asm/rtc.h delete mode 100644 arch/m68knommu/include/asm/sections.h delete mode 100644 arch/m68knommu/include/asm/sembuf.h delete mode 100644 arch/m68knommu/include/asm/shm.h delete mode 100644 arch/m68knommu/include/asm/shmbuf.h delete mode 100644 arch/m68knommu/include/asm/shmparam.h delete mode 100644 arch/m68knommu/include/asm/socket.h delete mode 100644 arch/m68knommu/include/asm/sockios.h delete mode 100644 arch/m68knommu/include/asm/spinlock.h delete mode 100644 arch/m68knommu/include/asm/stat.h delete mode 100644 arch/m68knommu/include/asm/statfs.h delete mode 100644 arch/m68knommu/include/asm/termbits.h delete mode 100644 arch/m68knommu/include/asm/termios.h delete mode 100644 arch/m68knommu/include/asm/tlb.h delete mode 100644 arch/m68knommu/include/asm/types.h delete mode 100644 arch/m68knommu/include/asm/user.h delete mode 100644 include/asm-m68k/auxvec.h delete mode 100644 include/asm-m68k/device.h delete mode 100644 include/asm-m68k/emergency-restart.h delete mode 100644 include/asm-m68k/futex.h delete mode 100644 include/asm-m68k/ioctl.h delete mode 100644 include/asm-m68k/irq_regs.h delete mode 100644 include/asm-m68k/kdebug.h delete mode 100644 include/asm-m68k/mutex.h delete mode 100644 include/asm-m68k/topology.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 Merge made by recursive. arch/parisc/hpux/fs.c | 1 - arch/parisc/include/asm/assembly.h | 10 +++--- arch/parisc/include/asm/page.h | 13 +------ arch/parisc/include/asm/pgtable.h | 15 ++++++--- arch/parisc/include/asm/uaccess.h | 1 + arch/parisc/kernel/cache.c | 5 +-- arch/parisc/kernel/entry.S | 14 ++++---- arch/parisc/kernel/firmware.c | 12 +++--- arch/parisc/kernel/pci-dma.c | 22 +++--------- arch/parisc/mm/init.c | 13 +++++-- drivers/char/agp/parisc-agp.c | 23 ++++++------- drivers/parisc/gsc.c | 39 +++++++++++++---------- drivers/parisc/led.c | 16 ++++++--- drivers/parisc/sba_iommu.c | 61 ++++++++++++++++++++--------------- drivers/scsi/lasi700.c | 2 +- drivers/scsi/zalon.c | 2 +- 16 files changed, 127 insertions(+), 122 deletions(-) Merging powerpc/next $ git merge powerpc/next Already up-to-date. Merging 4xx/next $ git merge 4xx/next Already up-to-date. Merging galak/next $ git merge galak/next Already up-to-date. Merging pxa/for-next $ git merge pxa/for-next Removed arch/arm/mach-pxa/include/mach/pxa-regs.h Auto-merged drivers/input/keyboard/corgikbd.c Auto-merged drivers/input/keyboard/spitzkbd.c Auto-merged drivers/input/touchscreen/corgi_ts.c Merge made by recursive. MAINTAINERS | 2 +- arch/arm/common/sharpsl_pm.c | 2 +- arch/arm/configs/magician_defconfig | 643 +++++++++++++++++++------- arch/arm/configs/xm_x2xx_defconfig | 378 +++++++++++----- arch/arm/mach-pxa/Kconfig | 21 + arch/arm/mach-pxa/Makefile | 2 + 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/dma.c | 22 +- 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 | 374 ++++++++++++++- 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 | 438 +++++++----------- arch/arm/mach-pxa/gumstix.c | 6 +- arch/arm/mach-pxa/h5000.c | 7 +- arch/arm/mach-pxa/idp.c | 3 +- arch/arm/mach-pxa/imote2.c | 5 +- arch/arm/mach-pxa/include/mach/dma.h | 58 +++- arch/arm/mach-pxa/include/mach/gpio.h | 118 +++++- arch/arm/mach-pxa/include/mach/lubbock.h | 1 - arch/arm/mach-pxa/include/mach/mtd-xip.h | 4 +- arch/arm/mach-pxa/include/mach/palmld.h | 109 +++++ arch/arm/mach-pxa/include/mach/palmt5.h | 84 ++++ 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-ac97.h | 2 + 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 | 4 +- 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 | 54 ++- arch/arm/mach-pxa/mainstone.c | 5 +- arch/arm/mach-pxa/mfp-pxa2xx.c | 5 +- arch/arm/mach-pxa/mioa701.c | 5 +- arch/arm/mach-pxa/mp900.c | 4 +- arch/arm/mach-pxa/palmld.c | 565 ++++++++++++++++++++++ arch/arm/mach-pxa/palmt5.c | 496 ++++++++++++++++++++ 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 | 8 +- arch/arm/mach-pxa/pxa320.c | 7 +- arch/arm/mach-pxa/pxa3xx.c | 5 +- arch/arm/mach-pxa/pxa930.c | 3 +- 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 +- 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 | 2 - 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/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 - 140 files changed, 3294 insertions(+), 1192 deletions(-) create mode 100644 arch/arm/mach-pxa/include/mach/palmld.h create mode 100644 arch/arm/mach-pxa/include/mach/palmt5.h 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/mach-pxa/palmld.c create mode 100644 arch/arm/mach-pxa/palmt5.c Merging s390/features $ git merge s390/features Merge made by recursive. arch/s390/include/asm/elf.h | 20 +++++--- arch/s390/include/asm/lowcore.h | 24 +++++---- arch/s390/include/asm/system.h | 16 ++++++ arch/s390/include/asm/thread_info.h | 2 + arch/s390/kernel/compat_wrapper.S | 38 +++++++++++++++ arch/s390/kernel/ipl.c | 39 ++++++++++++++-- arch/s390/kernel/process.c | 7 +++ arch/s390/kernel/setup.c | 5 ++ arch/s390/kernel/smp.c | 9 ---- arch/s390/kernel/syscalls.S | 12 ++-- arch/s390/kernel/time.c | 6 ++- arch/s390/kernel/vtime.c | 4 ++ arch/s390/mm/fault.c | 28 +---------- drivers/s390/char/zcore.c | 88 ++++++++++++++++++++++++++++++++++- 14 files changed, 230 insertions(+), 68 deletions(-) Merging sh/master $ git merge sh/master Merge made by recursive. arch/sh/Kconfig | 63 +----- arch/sh/boards/Kconfig | 6 +- arch/sh/boards/board-ap325rxa.c | 53 ++++- arch/sh/boards/board-magicpanelr2.c | 23 ++- arch/sh/boards/board-sh7785lcr.c | 1 + arch/sh/boards/mach-highlander/Kconfig | 2 +- arch/sh/boards/mach-highlander/setup.c | 1 + arch/sh/boards/mach-hp6xx/setup.c | 2 +- arch/sh/boards/mach-migor/setup.c | 171 ++++++-------- arch/sh/boards/mach-rsk/Kconfig | 2 +- arch/sh/boards/mach-rsk/devices-rsk7203.c | 24 +- arch/sh/boards/mach-x3proto/setup.c | 1 + arch/sh/configs/ap325rxa_defconfig | 355 ++++++++++++++++++++++++++--- arch/sh/configs/dreamcast_defconfig | 60 ++++-- arch/sh/configs/edosk7705_defconfig | 18 +- arch/sh/configs/edosk7760_defconfig | 83 +++++-- arch/sh/configs/hp6xx_defconfig | 88 ++++---- arch/sh/configs/landisk_defconfig | 76 +++++-- arch/sh/configs/lboxre2_defconfig | 63 ++++-- arch/sh/configs/magicpanelr2_defconfig | 119 +++++++--- arch/sh/configs/microdev_defconfig | 63 ++++-- arch/sh/configs/migor_defconfig | 95 ++++++-- arch/sh/configs/r7780mp_defconfig | 85 ++++++-- arch/sh/configs/r7785rp_defconfig | 130 ++++++++--- arch/sh/configs/rsk7201_defconfig | 26 ++- arch/sh/configs/rsk7203_defconfig | 88 ++++++-- arch/sh/configs/rts7751r2d1_defconfig | 87 +++++-- arch/sh/configs/rts7751r2dplus_defconfig | 87 +++++-- arch/sh/configs/sdk7780_defconfig | 101 ++++++--- arch/sh/configs/se7206_defconfig | 75 +++++-- arch/sh/configs/se7343_defconfig | 61 +++-- arch/sh/configs/se7619_defconfig | 47 +++-- arch/sh/configs/se7705_defconfig | 60 +++-- arch/sh/configs/se7712_defconfig | 79 +++++-- arch/sh/configs/se7721_defconfig | 85 +++++--- arch/sh/configs/se7722_defconfig | 61 +++-- arch/sh/configs/se7750_defconfig | 61 +++-- arch/sh/configs/se7751_defconfig | 56 +++-- arch/sh/configs/se7780_defconfig | 87 +++++--- arch/sh/configs/sh03_defconfig | 82 +++++-- arch/sh/configs/sh7710voipgw_defconfig | 55 +++-- arch/sh/configs/sh7763rdp_defconfig | 71 ++++-- arch/sh/configs/sh7785lcr_defconfig | 92 +++++--- arch/sh/configs/shmin_defconfig | 54 +++-- arch/sh/configs/shx3_defconfig | 77 +++++-- arch/sh/configs/snapgear_defconfig | 53 +++-- arch/sh/configs/systemh_defconfig | 50 +++-- arch/sh/configs/titan_defconfig | 90 +++++-- arch/sh/configs/ul2_defconfig | 69 ++++-- arch/sh/include/asm/gpio.h | 70 ++++--- arch/sh/include/asm/posix_types_32.h | 8 +- arch/sh/include/asm/posix_types_64.h | 8 +- arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 31 +++ arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 2 +- arch/sh/kernel/gpio.c | 338 +++++++++++++++++----------- arch/sh/kernel/process_64.c | 2 - arch/sh/kernel/traps_32.c | 9 +- arch/sh/mm/ioremap_64.c | 2 +- drivers/serial/sh-sci.h | 7 +- kernel/dma-coherent.c | 47 ++-- mm/nommu.c | 20 ++- 61 files changed, 2626 insertions(+), 1256 deletions(-) Merging sparc/master $ git merge sparc/master Already up-to-date. Merging x86/auto-x86-next $ git merge x86/auto-x86-next Removed arch/x86/include/asm/mach-rdc321x/gpio.h Removed arch/x86/mach-rdc321x/Makefile Removed arch/x86/mach-rdc321x/gpio.c Removed arch/x86/mach-rdc321x/platform.c Merge made by recursive. Documentation/x86/boot.txt | 13 +- arch/x86/Kconfig.cpu | 4 +- arch/x86/include/asm/bitops.h | 14 +- arch/x86/include/asm/cpu.h | 21 + arch/x86/include/asm/cpumask.h | 28 ++ arch/x86/include/asm/hardirq_32.h | 3 + arch/x86/include/asm/io.h | 1 - arch/x86/include/asm/io_apic.h | 26 +- arch/x86/include/asm/mach-rdc321x/gpio.h | 60 --- arch/x86/include/asm/mpspec_def.h | 23 +- arch/x86/include/asm/msr-index.h | 29 ++ arch/x86/include/asm/paravirt.h | 2 - .../include/asm/{mach-rdc321x => }/rdc321x_defs.h | 0 arch/x86/include/asm/smp.h | 41 +-- arch/x86/include/asm/spinlock.h | 66 +--- arch/x86/include/asm/syscalls.h | 2 +- arch/x86/include/asm/system.h | 6 +- arch/x86/include/asm/tlbflush.h | 2 + arch/x86/include/asm/uaccess.h | 12 +- arch/x86/kernel/acpi/boot.c | 96 ++--- arch/x86/kernel/apic.c | 9 + arch/x86/kernel/cpu/common.c | 2 + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 35 +- arch/x86/kernel/cpu/intel.c | 10 + arch/x86/kernel/cpu/mtrr/generic.c | 12 +- arch/x86/kernel/crash.c | 2 +- arch/x86/kernel/entry_64.S | 2 + arch/x86/kernel/io_apic.c | 153 +++----- 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 | 142 ++++---- arch/x86/kernel/msr.c | 2 +- arch/x86/kernel/paravirt-spinlocks.c | 10 - arch/x86/kernel/reboot.c | 1 + arch/x86/kernel/setup.c | 2 +- arch/x86/kernel/setup_percpu.c | 3 +- arch/x86/kernel/signal.c | 11 +- arch/x86/kernel/smpboot.c | 1 - arch/x86/kernel/tlb_64.c | 16 +- arch/x86/kernel/tlb_uv.c | 1 + arch/x86/lib/usercopy_32.c | 4 +- arch/x86/lib/usercopy_64.c | 4 +- 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/mm/fault.c | 439 ++++++++++++-------- arch/x86/mm/init_32.c | 49 ++- arch/x86/mm/init_64.c | 2 +- arch/x86/mm/ioremap.c | 25 -- arch/x86/mm/pageattr.c | 49 ++- arch/x86/mm/pat.c | 43 ++- drivers/pci/intr_remapping.c | 1 + drivers/watchdog/rdc321x_wdt.c | 2 +- include/asm-generic/bitops/__ffs.h | 2 +- include/asm-generic/bitops/__fls.h | 2 +- include/asm-generic/bitops/fls.h | 2 +- include/asm-generic/bitops/fls64.h | 4 +- kernel/workqueue.c | 20 +- lib/Kconfig.debug | 9 + 61 files changed, 794 insertions(+), 1043 deletions(-) create mode 100644 arch/x86/include/asm/cpumask.h delete mode 100644 arch/x86/include/asm/mach-rdc321x/gpio.h rename arch/x86/include/asm/{mach-rdc321x => }/rdc321x_defs.h (100%) 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 Merging xtensa/master $ git merge xtensa/master Already up-to-date. Merging quilt/driver-core $ git merge quilt/driver-core Auto-merged drivers/net/macb.c Auto-merged drivers/net/mv643xx_eth.c Auto-merged drivers/spi/pxa2xx_spi.c Merge made by recursive. Documentation/DocBook/uio-howto.tmpl | 29 ++++++++++++++-- drivers/acpi/glue.c | 8 ++-- drivers/amba/bus.c | 4 +- drivers/base/base.h | 5 +++ drivers/base/bus.c | 2 +- drivers/base/core.c | 39 +++++++++++----------- drivers/base/dd.c | 19 ++++------- 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/ide-acpi.c | 2 +- drivers/input/serio/ambakmi.c | 4 +- drivers/input/serio/gscps2.c | 2 +- drivers/input/serio/sa1111ps2.c | 4 +- drivers/input/touchscreen/atmel_tsadcc.c | 2 +- drivers/input/touchscreen/tsc2007.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/nand/ndfc.c | 2 +- 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/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/rsrc_mgr.c | 2 +- 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/serial/sunzilog.c | 4 +- drivers/sh/maple/maple.c | 8 ++-- drivers/sh/superhyway/superhyway.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/uio.c | 22 ++++++++++++ drivers/usb/gadget/ci13xxx_udc.c | 2 +- drivers/usb/gadget/imx_udc.c | 4 +- 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/zorro/zorro.c | 4 +- fs/sysfs/mount.c | 5 ++- include/linux/device.h | 4 +-- include/linux/init.h | 1 + include/linux/kobject.h | 2 + include/linux/uio_driver.h | 4 ++ include/linux/wimax/debug.h | 2 +- init/main.c | 9 +++++ lib/kobject.c | 52 +++++++++++++++++++++++++++++- 90 files changed, 325 insertions(+), 206 deletions(-) Merging quilt/usb $ git merge quilt/usb Merge made by recursive. drivers/block/ub.c | 9 +- drivers/usb/class/usblp.c | 11 +- drivers/usb/core/devices.c | 2 +- drivers/usb/core/endpoint.c | 9 +- drivers/usb/gadget/Kconfig | 1 + drivers/usb/gadget/ci13xxx_udc.c | 1 - drivers/usb/gadget/imx_udc.c | 244 +++++++++++++++---------- drivers/usb/gadget/imx_udc.h | 49 ++++-- drivers/usb/gadget/pxa27x_udc.c | 218 +++++++++++++++++++++- drivers/usb/gadget/pxa27x_udc.h | 10 + drivers/usb/host/r8a66597-hcd.c | 15 +- drivers/usb/otg/gpio_vbus.c | 42 +++- drivers/usb/serial/ch341.c | 374 ++++++++++++++++++++++++++++++-------- drivers/usb/serial/ftdi_sio.c | 16 +- drivers/usb/serial/keyspan.c | 2 +- drivers/usb/storage/usb.c | 6 +- include/linux/usb.h | 180 ------------------ include/linux/usb/ch9.h | 179 ++++++++++++++++++ include/linux/usb/gadget.h | 6 +- include/linux/usb/otg.h | 4 + 20 files changed, 952 insertions(+), 426 deletions(-) $ git revert 73babb2d89a71d2110b65aab658e6309748827c2 Auto-merged lib/kobject.c Finished one revert. Created commit f05bd35: Revert "driver core: get rid of struct device's bus_id string array" 4 files changed, 24 insertions(+), 23 deletions(-) Merging tip-core/auto-core-next $ git merge tip-core/auto-core-next Removed arch/x86/include/asm/irq_regs_32.h Removed arch/x86/include/asm/irq_regs_64.h Removed arch/x86/include/asm/mmu_context_32.h Removed arch/x86/include/asm/mmu_context_64.h Auto-merged arch/x86/include/asm/paravirt.h Removed arch/x86/include/asm/pda.h Auto-merged arch/x86/include/asm/system.h Auto-merged arch/x86/kernel/apic.c Auto-merged arch/x86/kernel/entry_64.S Auto-merged arch/x86/kernel/io_apic.c Auto-merged arch/x86/kernel/setup_percpu.c CONFLICT (content): Merge conflict in arch/x86/kernel/setup_percpu.c Removed arch/x86/kernel/tlb_32.c Auto-merged arch/x86/kernel/tlb_uv.c Auto-merged arch/x86/mm/fault.c Auto-merged init/Kconfig Auto-merged init/main.c Auto-merged lib/Kconfig.debug Resolved 'arch/x86/kernel/setup_percpu.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit b0e3fcc: Merge commit 'tip-core/auto-core-next' $ git diff -M --stat --summary HEAD^.. Documentation/cputopology.txt | 6 +- arch/alpha/kernel/irq.c | 2 +- arch/arm/kernel/irq.c | 18 +- arch/arm/kernel/vmlinux.lds.S | 1 + arch/arm/oprofile/op_model_mpcore.c | 2 +- arch/blackfin/kernel/irqchip.c | 5 + arch/ia64/include/asm/topology.h | 2 +- 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/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/kernel/irq.c | 8 +- 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 | 30 ++-- arch/x86/Kconfig.cpu | 6 +- arch/x86/Kconfig.debug | 1 + arch/x86/Makefile | 2 +- arch/x86/ia32/ia32entry.S | 8 +- arch/x86/include/asm/apicnum.h | 12 + arch/x86/include/asm/current.h | 24 +-- arch/x86/include/asm/e820.h | 11 +- arch/x86/include/asm/genapic_32.h | 7 - arch/x86/include/asm/genapic_64.h | 6 - arch/x86/include/asm/hardirq_64.h | 24 ++- 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 | 49 +++-- arch/x86/include/asm/mach-default/entry_arch.h | 18 ++- arch/x86/include/asm/mce.h | 5 +- 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/mtrr.h | 1 + arch/x86/include/asm/page_64.h | 4 +- arch/x86/include/asm/paravirt.h | 8 +- arch/x86/include/asm/pda.h | 137 ------------- arch/x86/include/asm/percpu.h | 153 ++++++--------- arch/x86/include/asm/pgtable_64.h | 1 - arch/x86/include/asm/prctl.h | 4 - arch/x86/include/asm/processor.h | 24 +++ arch/x86/include/asm/ptrace-abi.h | 5 +- arch/x86/include/asm/setup.h | 9 +- arch/x86/include/asm/sigcontext.h | 2 +- arch/x86/include/asm/sigcontext32.h | 2 + arch/x86/include/asm/smp.h | 9 +- arch/x86/include/asm/stackprotector.h | 38 ++++ arch/x86/include/asm/system.h | 23 ++- arch/x86/include/asm/thread_info.h | 20 +- arch/x86/include/asm/tlbflush.h | 15 +- arch/x86/include/asm/topology.h | 25 ++- arch/x86/include/asm/trampoline.h | 1 + arch/x86/include/asm/uv/uv.h | 33 +++ arch/x86/include/asm/uv/uv_bau.h | 1 - arch/x86/kernel/Makefile | 8 +- arch/x86/kernel/acpi/sleep.c | 1 + arch/x86/kernel/apic.c | 22 +- arch/x86/kernel/asm-offsets_64.c | 11 - arch/x86/kernel/cpu/common.c | 112 ++++------- arch/x86/kernel/cpu/intel_cacheinfo.c | 63 ++++-- arch/x86/kernel/cpu/mcheck/mce_amd_64.c | 21 ++- arch/x86/kernel/dumpstack_64.c | 35 ++-- arch/x86/kernel/efi.c | 2 + arch/x86/kernel/entry_32.S | 6 +- arch/x86/kernel/entry_64.S | 43 ++-- arch/x86/kernel/genapic_64.c | 2 + arch/x86/kernel/genx2apic_uv_x.c | 1 + arch/x86/kernel/head64.c | 23 -- arch/x86/kernel/head_32.S | 6 +- arch/x86/kernel/head_64.S | 36 +++- arch/x86/kernel/hpet.c | 3 +- arch/x86/kernel/io_apic.c | 46 +++- arch/x86/kernel/irq.c | 6 +- arch/x86/kernel/irq_32.c | 2 +- arch/x86/kernel/irq_64.c | 8 +- arch/x86/kernel/irqinit_32.c | 11 +- arch/x86/kernel/nmi.c | 10 +- arch/x86/kernel/process_32.c | 5 +- arch/x86/kernel/process_64.c | 43 +++-- arch/x86/kernel/setup_percpu.c | 181 +++++++++--------- arch/x86/kernel/smpboot.c | 69 +------ arch/x86/kernel/smpcommon.c | 10 +- arch/x86/kernel/tlb_32.c | 256 ------------------------ arch/x86/kernel/tlb_uv.c | 68 ++++--- arch/x86/kernel/traps.c | 1 - arch/x86/kernel/vmlinux_32.lds.S | 9 +- arch/x86/kernel/vmlinux_64.lds.S | 26 +++- arch/x86/kernel/x8664_ksyms_64.c | 2 - arch/x86/mach-voyager/voyager_smp.c | 6 +- arch/x86/mm/Makefile | 2 + arch/x86/mm/fault.c | 7 + arch/x86/mm/srat_64.c | 1 + arch/x86/{kernel/tlb_64.c => mm/tlb.c} | 106 ++++++----- arch/x86/xen/enlighten.c | 46 ++--- arch/x86/xen/irq.c | 8 +- arch/x86/xen/mmu.c | 8 +- arch/x86/xen/multicalls.h | 2 +- arch/x86/xen/smp.c | 33 +--- arch/x86/xen/xen-asm_64.S | 31 ++-- drivers/base/cpu.c | 2 +- drivers/base/topology.c | 33 ++-- drivers/firmware/dcdbas.c | 12 +- drivers/misc/Kconfig | 4 +- drivers/misc/sgi-gru/gru.h | 2 + drivers/misc/sgi-xp/xp.h | 2 + drivers/misc/sgi-xp/xpc_main.c | 2 +- drivers/net/sfc/efx.c | 17 +- drivers/oprofile/buffer_sync.c | 22 ++- drivers/oprofile/buffer_sync.h | 4 + drivers/oprofile/cpu_buffer.c | 5 + drivers/oprofile/cpu_buffer.h | 7 + drivers/oprofile/oprof.c | 9 +- drivers/xen/events.c | 26 ++- drivers/xen/manage.c | 2 +- fs/btrfs/locking.c | 10 - include/asm-generic/percpu.h | 52 +++++ include/asm-generic/sections.h | 2 +- include/asm-generic/vmlinux.lds.h | 47 ++++- include/linux/aio_abi.h | 1 + include/linux/atalk.h | 1 + include/linux/atmbr2684.h | 1 + include/linux/atmdev.h | 2 + include/linux/auto_fs4.h | 1 + include/linux/bfs_fs.h | 2 + include/linux/blktrace_api.h | 2 + include/linux/can/bcm.h | 2 + include/linux/capability.h | 8 +- include/linux/cdrom.h | 1 + include/linux/cgroupstats.h | 1 + include/linux/cm4000_cs.h | 2 +- include/linux/coda_psdev.h | 2 + include/linux/dlm_plock.h | 2 + include/linux/dn.h | 2 + include/linux/dvb/dmx.h | 2 +- include/linux/dvb/frontend.h | 3 +- include/linux/dvb/net.h | 3 +- include/linux/dvb/video.h | 7 +- include/linux/edd.h | 2 + include/linux/efs_fs_sb.h | 1 + include/linux/elf-fdpic.h | 2 + include/linux/elfcore.h | 2 + include/linux/errqueue.h | 2 + include/linux/fb.h | 4 +- include/linux/genetlink.h | 1 + include/linux/gfs2_ondisk.h | 2 + include/linux/hiddev.h | 2 + include/linux/icmpv6.h | 1 + include/linux/if_addr.h | 1 + include/linux/if_addrlabel.h | 2 + include/linux/if_fc.h | 1 + include/linux/if_hippi.h | 1 + include/linux/if_link.h | 1 + include/linux/if_ppp.h | 1 + include/linux/if_strip.h | 2 + include/linux/if_tr.h | 1 + include/linux/igmp.h | 1 + include/linux/in6.h | 2 +- include/linux/inet_diag.h | 2 + include/linux/interrupt.h | 1 + include/linux/ip6_tunnel.h | 2 + include/linux/ipv6.h | 1 + include/linux/ipv6_route.h | 2 + include/linux/ipx.h | 1 + include/linux/irda.h | 2 + include/linux/irq.h | 86 ++++++++- include/linux/irqnr.h | 1 + include/linux/kernel.h | 3 +- include/linux/magic.h | 1 + include/linux/minix_fs.h | 1 + include/linux/msdos_fs.h | 1 + include/linux/mutex.h | 5 +- include/linux/neighbour.h | 1 + include/linux/netfilter/xt_conntrack.h | 1 + include/linux/nfs_idmap.h | 2 + include/linux/nfsd/export.h | 3 +- include/linux/nfsd/nfsfh.h | 3 +- include/linux/nfsd/stats.h | 2 + include/linux/nfsd/syscall.h | 3 +- include/linux/nubus.h | 5 +- include/linux/percpu.h | 41 ++-- include/linux/phonet.h | 2 + include/linux/pkt_cls.h | 5 +- include/linux/pkt_sched.h | 2 + include/linux/pktcdvd.h | 2 + include/linux/ppp_defs.h | 2 + include/linux/raid/md_p.h | 2 + include/linux/random.h | 1 + include/linux/raw.h | 2 + include/linux/rtnetlink.h | 1 + include/linux/sched.h | 35 +++- include/linux/signalfd.h | 1 + include/linux/socket.h | 13 +- include/linux/sound.h | 2 + include/linux/spi/spidev.h | 1 + include/linux/stackprotector.h | 16 ++ include/linux/synclink.h | 2 + include/linux/taskstats.h | 2 + include/linux/tc_act/tc_gact.h | 1 + include/linux/tc_act/tc_mirred.h | 1 + include/linux/tc_act/tc_pedit.h | 1 + include/linux/tc_ematch/tc_em_cmp.h | 1 + include/linux/tc_ematch/tc_em_meta.h | 1 + include/linux/tc_ematch/tc_em_nbyte.h | 1 + include/linux/tc_ematch/tc_em_text.h | 1 + include/linux/topology.h | 6 + include/linux/usb/cdc.h | 2 + include/linux/usb/gadgetfs.h | 2 +- include/linux/video_decoder.h | 2 + include/linux/video_encoder.h | 2 + include/linux/videodev.h | 1 + include/linux/videodev2.h | 2 +- include/linux/virtio_blk.h | 1 + include/linux/virtio_console.h | 2 + include/linux/virtio_net.h | 2 + include/linux/workqueue.h | 6 + include/mtd/inftl-user.h | 2 + include/sound/hdsp.h | 2 + include/video/sisfb.h | 2 +- include/video/uvesafb.h | 2 + init/Kconfig | 179 +++++++++-------- init/main.c | 7 + kernel/Makefile | 1 + kernel/exit.c | 5 +- kernel/fork.c | 7 +- kernel/hung_task.c | 206 +++++++++++++++++++ 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/mutex-debug.c | 9 +- kernel/mutex-debug.h | 18 +- kernel/mutex.c | 121 ++++++++++-- kernel/mutex.h | 22 ++- kernel/panic.c | 12 +- kernel/rcuclassic.c | 2 +- kernel/rcutree.c | 2 +- kernel/relay.c | 4 +- kernel/sched.c | 78 +++++++- kernel/sched_features.h | 1 + kernel/sched_rt.c | 36 ++-- kernel/softirq.c | 5 + kernel/softlockup.c | 109 +--------- kernel/sysctl.c | 17 ++- lib/Kconfig.debug | 51 ++++-- lib/smp_processor_id.c | 2 +- 264 files changed, 2283 insertions(+), 1839 deletions(-) create mode 100644 arch/x86/include/asm/apicnum.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/mmu_context_32.h delete mode 100644 arch/x86/include/asm/mmu_context_64.h delete mode 100644 arch/x86/include/asm/pda.h create mode 100644 arch/x86/include/asm/stackprotector.h create mode 100644 arch/x86/include/asm/uv/uv.h delete mode 100644 arch/x86/kernel/tlb_32.c rename arch/x86/{kernel/tlb_64.c => mm/tlb.c} (72%) create mode 100644 include/linux/stackprotector.h create mode 100644 kernel/hung_task.c Merging cpus4096/auto-cpus4096-next $ git merge cpus4096/auto-cpus4096-next Already uptodate! Merge made by recursive. Merging ftrace/auto-ftrace-next $ git merge ftrace/auto-ftrace-next Auto-merged Documentation/kernel-parameters.txt Auto-merged MAINTAINERS Auto-merged arch/x86/Kconfig.debug Auto-merged init/main.c Auto-merged kernel/relay.c Auto-merged kernel/workqueue.c Auto-merged scripts/Makefile.build Merge made by recursive. Documentation/ABI/testing/debugfs-kmemtrace | 71 +++ Documentation/ftrace.txt | 74 +++ Documentation/kernel-parameters.txt | 10 + Documentation/sysrq.txt | 2 + Documentation/tracers/mmiotrace.txt | 6 +- Documentation/vm/kmemtrace.txt | 126 ++++ MAINTAINERS | 6 + arch/ia64/Kconfig | 3 + arch/ia64/include/asm/ftrace.h | 28 + 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.debug | 24 +- arch/x86/kernel/ds.c | 31 +- arch/x86/kernel/dumpstack.c | 6 + arch/x86/kvm/Kconfig | 3 +- drivers/char/sysrq.c | 2 +- include/linux/ftrace.h | 17 + include/linux/slab_def.h | 68 ++- include/linux/slob_def.h | 9 +- include/linux/slub_def.h | 53 ++- include/trace/kmemtrace.h | 75 +++ include/trace/workqueue.h | 25 + init/main.c | 2 + kernel/relay.c | 4 +- kernel/trace/Kconfig | 55 ++ kernel/trace/Makefile | 4 + kernel/trace/ftrace.c | 45 +- kernel/trace/kmemtrace.c | 350 +++++++++++ kernel/trace/ring_buffer.c | 70 ++- kernel/trace/trace.c | 859 ++------------------------- kernel/trace/trace.h | 60 ++- kernel/trace/trace_boot.c | 1 + kernel/trace/trace_branch.c | 278 ++++++---- kernel/trace/trace_functions.c | 193 ++++++- kernel/trace/trace_functions_graph.c | 8 +- kernel/trace/trace_hw_branches.c | 174 +++++- kernel/trace/trace_irqsoff.c | 1 + kernel/trace/trace_mmiotrace.c | 31 +- kernel/trace/trace_output.c | 829 ++++++++++++++++++++++++++ kernel/trace/trace_output.h | 60 ++ kernel/trace/trace_power.c | 1 + kernel/trace/trace_sched_wakeup.c | 79 ++-- kernel/trace/trace_selftest.c | 1 - kernel/trace/trace_stat.c | 319 ++++++++++ kernel/trace/trace_stat.h | 31 + kernel/trace/trace_workqueue.c | 281 +++++++++ kernel/workqueue.c | 16 +- mm/slab.c | 71 ++- mm/slob.c | 37 +- mm/slub.c | 83 +++- scripts/Makefile.build | 13 +- scripts/recordmcount.pl | 37 +- 54 files changed, 3794 insertions(+), 1155 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 create mode 100644 include/trace/kmemtrace.h create mode 100644 include/trace/workqueue.h 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 Auto-merged include/linux/interrupt.h Auto-merged kernel/irq/chip.c Merge made by recursive. include/linux/interrupt.h | 6 ++++++ kernel/irq/chip.c | 8 ++++++-- kernel/irq/spurious.c | 14 +++++++++++++- 3 files changed, 25 insertions(+), 3 deletions(-) Merging safe-poison-pointers/auto-safe-poison-pointers-next $ git merge safe-poison-pointers/auto-safe-poison-pointers-next Auto-merged arch/x86/Kconfig Merge made by recursive. arch/x86/Kconfig | 5 +++++ include/linux/poison.h | 16 ++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) Merging sched/auto-sched-next $ git merge sched/auto-sched-next Auto-merged include/linux/sched.h Auto-merged init/Kconfig Auto-merged kernel/sched.c Auto-merged kernel/sched_features.h Auto-merged kernel/sched_rt.c Merge made by recursive. include/linux/init_task.h | 1 + include/linux/plist.h | 9 +- include/linux/sched.h | 7 +- init/Kconfig | 1 - kernel/cpuset.c | 13 +- kernel/sched.c | 129 ++++++++++-- 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 +- 12 files changed, 569 insertions(+), 201 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 Auto-merged arch/x86/kernel/hpet.c Auto-merged include/linux/init_task.h Auto-merged include/linux/sched.h Auto-merged include/linux/workqueue.h Auto-merged kernel/fork.c Merge made by recursive. arch/x86/kernel/quirks.c | 3 +- include/linux/clockchips.h | 1 + include/linux/init_task.h | 6 ++++ include/linux/sched.h | 29 +++++++++++------- include/linux/workqueue.h | 6 ++++ kernel/fork.c | 16 ++++----- kernel/hrtimer.c | 38 ++++++++++++++++++++++- kernel/posix-cpu-timers.c | 70 -------------------------------------------- kernel/sched_stats.h | 33 +++++++++----------- kernel/time/clockevents.c | 20 +++++++----- kernel/time/tick-common.c | 26 ++++++++++++---- kernel/time/tick-sched.c | 2 +- 12 files changed, 122 insertions(+), 128 deletions(-) Merging pci/linux-next $ git merge pci/linux-next Auto-merged Documentation/kernel-parameters.txt Merge made by recursive. Documentation/kernel-parameters.txt | 2 + arch/x86/pci/early.c | 19 ++-- drivers/pci/hotplug/pciehp_acpi.c | 16 +--- drivers/pci/hotplug/pciehp_core.c | 18 +--- drivers/pci/pci.c | 17 ++- drivers/pci/pci.h | 20 ++-- drivers/pci/pcie/aer/aerdrv.c | 28 +----- drivers/pci/pcie/aer/aerdrv_core.c | 10 +- drivers/pci/pcie/portdrv.h | 8 +- drivers/pci/pcie/portdrv_bus.c | 18 ++-- drivers/pci/pcie/portdrv_core.c | 173 ++++++++++++++++++----------------- drivers/pci/pcie/portdrv_pci.c | 61 ++++--------- include/linux/pcieport_if.h | 24 ++--- 13 files changed, 181 insertions(+), 233 deletions(-) Merging quilt/device-mapper $ git merge quilt/device-mapper Merge made by recursive. drivers/md/dm-ioctl.c | 7 ++- drivers/md/dm-target.c | 104 ++++++++++++----------------------------- drivers/md/dm.h | 2 +- include/linux/device-mapper.h | 3 + 4 files changed, 38 insertions(+), 78 deletions(-) Merging hid/for-next $ git merge hid/for-next Merge made by recursive. drivers/hid/Kconfig | 6 +- drivers/hid/hid-core.c | 16 ++ drivers/hid/hid-microsoft.c | 13 +- drivers/hid/hidraw.c | 17 ++- drivers/hid/usbhid/hid-core.c | 440 ++++++++++++++++++++++++++++++++--------- drivers/hid/usbhid/hiddev.c | 17 ++- drivers/hid/usbhid/usbhid.h | 14 +- include/linux/hid.h | 6 + 8 files changed, 414 insertions(+), 115 deletions(-) Merging quilt/i2c $ git merge quilt/i2c Auto-merged MAINTAINERS Auto-merged arch/arm/configs/magician_defconfig CONFLICT (content): Merge conflict in arch/arm/configs/magician_defconfig Auto-merged arch/arm/configs/xm_x2xx_defconfig Auto-merged arch/sh/configs/edosk7760_defconfig Auto-merged arch/sh/configs/migor_defconfig Auto-merged arch/sh/configs/r7780mp_defconfig Auto-merged arch/sh/configs/r7785rp_defconfig Auto-merged arch/sh/configs/rts7751r2d1_defconfig Auto-merged arch/sh/configs/rts7751r2dplus_defconfig Auto-merged arch/sh/configs/se7343_defconfig Auto-merged arch/sh/configs/sh7785lcr_defconfig Auto-merged arch/sh/configs/shx3_defconfig Auto-merged drivers/misc/Kconfig Resolved 'arch/arm/configs/magician_defconfig' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit 4d84e15: Merge branch 'quilt/i2c' $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 2 +- arch/arm/configs/afeb9260_defconfig | 6 +- arch/arm/configs/ams_delta_defconfig | 2 +- arch/arm/configs/at91cap9adk_defconfig | 4 +- arch/arm/configs/at91rm9200dk_defconfig | 2 +- arch/arm/configs/at91rm9200ek_defconfig | 2 +- arch/arm/configs/at91sam9260ek_defconfig | 2 +- arch/arm/configs/at91sam9261ek_defconfig | 4 +- arch/arm/configs/at91sam9263ek_defconfig | 4 +- arch/arm/configs/at91sam9g20ek_defconfig | 2 +- arch/arm/configs/at91sam9rlek_defconfig | 4 +- arch/arm/configs/ateb9200_defconfig | 2 +- arch/arm/configs/badge4_defconfig | 2 +- arch/arm/configs/cam60_defconfig | 4 +- arch/arm/configs/cm_x300_defconfig | 4 +- arch/arm/configs/colibri_defconfig | 2 +- arch/arm/configs/corgi_defconfig | 6 +- arch/arm/configs/csb337_defconfig | 2 +- arch/arm/configs/csb637_defconfig | 2 +- arch/arm/configs/ecbat91_defconfig | 4 +- arch/arm/configs/ep93xx_defconfig | 2 +- arch/arm/configs/ezx_defconfig | 4 +- arch/arm/configs/footbridge_defconfig | 2 +- arch/arm/configs/iop13xx_defconfig | 2 +- arch/arm/configs/iop32x_defconfig | 2 +- arch/arm/configs/iop33x_defconfig | 2 +- arch/arm/configs/ixp2000_defconfig | 2 +- arch/arm/configs/ixp23xx_defconfig | 2 +- arch/arm/configs/ixp4xx_defconfig | 2 +- arch/arm/configs/kafa_defconfig | 2 +- arch/arm/configs/kirkwood_defconfig | 6 +- arch/arm/configs/loki_defconfig | 4 +- arch/arm/configs/magician_defconfig | 2 +- arch/arm/configs/msm_defconfig | 2 +- arch/arm/configs/mv78xx0_defconfig | 2 +- arch/arm/configs/n770_defconfig | 4 +- arch/arm/configs/neocore926_defconfig | 6 +- arch/arm/configs/neponset_defconfig | 2 +- arch/arm/configs/omap3_beagle_defconfig | 4 +- arch/arm/configs/omap3_pandora_defconfig | 6 +- arch/arm/configs/omap_2430sdp_defconfig | 4 +- arch/arm/configs/omap_apollon_2420_defconfig | 2 +- arch/arm/configs/omap_generic_1510_defconfig | 2 +- arch/arm/configs/omap_generic_1610_defconfig | 2 +- arch/arm/configs/omap_h2_1610_defconfig | 4 +- arch/arm/configs/omap_h4_2420_defconfig | 2 +- arch/arm/configs/omap_innovator_1510_defconfig | 2 +- arch/arm/configs/omap_ldp_defconfig | 6 +- arch/arm/configs/omap_osk_5912_defconfig | 2 +- arch/arm/configs/onearm_defconfig | 2 +- arch/arm/configs/orion5x_defconfig | 4 +- arch/arm/configs/overo_defconfig | 6 +- arch/arm/configs/palmz71_defconfig | 2 +- arch/arm/configs/palmz72_defconfig | 6 +- arch/arm/configs/pcm027_defconfig | 2 +- arch/arm/configs/pcm038_defconfig | 4 +- arch/arm/configs/picotux200_defconfig | 2 +- arch/arm/configs/pnx4008_defconfig | 2 +- arch/arm/configs/qil-a9260_defconfig | 4 +- arch/arm/configs/rpc_defconfig | 2 +- arch/arm/configs/s3c2410_defconfig | 4 +- arch/arm/configs/s3c6400_defconfig | 4 +- arch/arm/configs/spitz_defconfig | 6 +- arch/arm/configs/sx1_defconfig | 2 +- arch/arm/configs/trizeps4_defconfig | 2 +- arch/arm/configs/usb-a9260_defconfig | 2 +- arch/arm/configs/usb-a9263_defconfig | 2 +- arch/arm/configs/versatile_defconfig | 2 +- arch/arm/configs/viper_defconfig | 4 +- arch/arm/configs/xm_x2xx_defconfig | 4 +- arch/arm/configs/yl9200_defconfig | 2 +- arch/avr32/configs/atngw100_defconfig | 6 +- arch/avr32/configs/atngw100_evklcd100_defconfig | 4 +- arch/avr32/configs/atngw100_evklcd101_defconfig | 4 +- arch/avr32/configs/atstk1002_defconfig | 6 +- arch/avr32/configs/atstk1003_defconfig | 6 +- arch/avr32/configs/atstk1004_defconfig | 2 +- arch/avr32/configs/atstk1006_defconfig | 6 +- arch/avr32/configs/favr-32_defconfig | 6 +- arch/avr32/configs/hammerhead_defconfig | 6 +- arch/avr32/configs/mimc200_defconfig | 6 +- arch/blackfin/configs/BF518F-EZBRD_defconfig | 4 +- arch/blackfin/configs/BF526-EZBRD_defconfig | 6 +- arch/blackfin/configs/BF527-EZKIT_defconfig | 6 +- arch/blackfin/configs/BF533-EZKIT_defconfig | 2 +- arch/blackfin/configs/BF533-STAMP_defconfig | 6 +- arch/blackfin/configs/BF537-STAMP_defconfig | 6 +- arch/blackfin/configs/BF538-EZKIT_defconfig | 6 +- arch/blackfin/configs/BF548-EZKIT_defconfig | 6 +- arch/blackfin/configs/BF561-EZKIT_defconfig | 2 +- arch/blackfin/configs/BlackStamp_defconfig | 4 +- arch/blackfin/configs/CM-BF527_defconfig | 4 +- arch/blackfin/configs/CM-BF548_defconfig | 4 +- arch/blackfin/configs/H8606_defconfig | 2 +- arch/blackfin/configs/IP0X_defconfig | 2 +- arch/blackfin/configs/PNAV-10_defconfig | 6 +- arch/blackfin/configs/SRV1_defconfig | 4 +- arch/blackfin/configs/TCM-BF537_defconfig | 2 +- arch/ia64/configs/bigsur_defconfig | 2 +- arch/ia64/configs/zx1_defconfig | 2 +- arch/m32r/configs/m32104ut_defconfig | 2 +- arch/mips/configs/bigsur_defconfig | 2 +- arch/mips/configs/emma2rh_defconfig | 2 +- arch/mips/configs/fulong_defconfig | 4 +- arch/mips/configs/msp71xx_defconfig | 2 +- arch/mips/configs/mtx1_defconfig | 4 +- arch/mips/configs/pnx8335-stb225_defconfig | 4 +- arch/mips/configs/rbtx49xx_defconfig | 2 +- arch/powerpc/configs/44x/sam440ep_defconfig | 4 +- arch/powerpc/configs/44x/warp_defconfig | 4 +- arch/powerpc/configs/52xx/cm5200_defconfig | 4 +- arch/powerpc/configs/52xx/lite5200b_defconfig | 4 +- arch/powerpc/configs/52xx/motionpro_defconfig | 4 +- arch/powerpc/configs/52xx/pcm030_defconfig | 4 +- arch/powerpc/configs/52xx/tqm5200_defconfig | 4 +- arch/powerpc/configs/83xx/asp8347_defconfig | 4 +- arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | 6 +- arch/powerpc/configs/83xx/mpc8315_rdb_defconfig | 6 +- arch/powerpc/configs/83xx/mpc832x_mds_defconfig | 4 +- arch/powerpc/configs/83xx/mpc832x_rdb_defconfig | 6 +- arch/powerpc/configs/83xx/mpc834x_itx_defconfig | 6 +- arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig | 6 +- arch/powerpc/configs/83xx/mpc834x_mds_defconfig | 4 +- arch/powerpc/configs/83xx/mpc836x_mds_defconfig | 4 +- arch/powerpc/configs/83xx/mpc836x_rdk_defconfig | 6 +- arch/powerpc/configs/83xx/mpc837x_mds_defconfig | 4 +- arch/powerpc/configs/83xx/mpc837x_rdb_defconfig | 4 +- arch/powerpc/configs/83xx/sbc834x_defconfig | 4 +- arch/powerpc/configs/85xx/mpc8536_ds_defconfig | 4 +- arch/powerpc/configs/85xx/mpc8544_ds_defconfig | 4 +- arch/powerpc/configs/85xx/mpc8568mds_defconfig | 4 +- arch/powerpc/configs/85xx/mpc8572_ds_defconfig | 4 +- arch/powerpc/configs/85xx/stx_gp3_defconfig | 4 +- arch/powerpc/configs/85xx/tqm8540_defconfig | 4 +- arch/powerpc/configs/85xx/tqm8541_defconfig | 4 +- arch/powerpc/configs/85xx/tqm8548_defconfig | 4 +- arch/powerpc/configs/85xx/tqm8555_defconfig | 4 +- arch/powerpc/configs/85xx/tqm8560_defconfig | 4 +- arch/powerpc/configs/86xx/gef_sbc610_defconfig | 4 +- arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig | 4 +- arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig | 4 +- arch/powerpc/configs/86xx/sbc8641d_defconfig | 4 +- arch/powerpc/configs/c2k_defconfig | 4 +- arch/powerpc/configs/cell_defconfig | 2 +- arch/powerpc/configs/celleb_defconfig | 2 +- arch/powerpc/configs/chrp32_defconfig | 4 +- arch/powerpc/configs/g5_defconfig | 4 +- arch/powerpc/configs/linkstation_defconfig | 4 +- arch/powerpc/configs/maple_defconfig | 4 +- arch/powerpc/configs/mpc5200_defconfig | 4 +- arch/powerpc/configs/mpc83xx_defconfig | 4 +- arch/powerpc/configs/mpc85xx_defconfig | 4 +- arch/powerpc/configs/mpc86xx_defconfig | 4 +- arch/powerpc/configs/pasemi_defconfig | 2 +- arch/powerpc/configs/pmac32_defconfig | 4 +- arch/powerpc/configs/ppc40x_defconfig | 4 +- arch/powerpc/configs/ppc44x_defconfig | 4 +- arch/powerpc/configs/ppc64_defconfig | 4 +- arch/powerpc/configs/ppc6xx_defconfig | 4 +- arch/powerpc/configs/prpmc2800_defconfig | 4 +- arch/powerpc/configs/pseries_defconfig | 4 +- arch/powerpc/configs/storcenter_defconfig | 4 +- arch/sh/configs/cayman_defconfig | 4 +- arch/sh/configs/edosk7760_defconfig | 4 +- arch/sh/configs/migor_defconfig | 4 +- arch/sh/configs/r7780mp_defconfig | 4 +- arch/sh/configs/r7785rp_defconfig | 4 +- arch/sh/configs/rts7751r2d1_defconfig | 2 +- arch/sh/configs/rts7751r2dplus_defconfig | 2 +- arch/sh/configs/se7343_defconfig | 4 +- arch/sh/configs/sh7785lcr_defconfig | 4 +- arch/sh/configs/shx3_defconfig | 6 +- arch/sparc/configs/sparc64_defconfig | 4 +- arch/x86/configs/i386_defconfig | 4 +- arch/x86/configs/x86_64_defconfig | 4 +- drivers/gpu/drm/i915/intel_i2c.c | 4 -- drivers/i2c/busses/i2c-acorn.c | 1 - drivers/i2c/busses/i2c-ali1535.c | 1 - drivers/i2c/busses/i2c-ali1563.c | 1 - drivers/i2c/busses/i2c-ali15x3.c | 1 - drivers/i2c/busses/i2c-amd756.c | 1 - drivers/i2c/busses/i2c-amd8111.c | 1 - drivers/i2c/busses/i2c-au1550.c | 1 - drivers/i2c/busses/i2c-bfin-twi.c | 1 - drivers/i2c/busses/i2c-elektor.c | 1 - drivers/i2c/busses/i2c-hydra.c | 1 - drivers/i2c/busses/i2c-i801.c | 1 - drivers/i2c/busses/i2c-ibm_iic.c | 1 - drivers/i2c/busses/i2c-iop3xx.c | 1 - drivers/i2c/busses/i2c-ixp2000.c | 1 - drivers/i2c/busses/i2c-mpc.c | 1 - drivers/i2c/busses/i2c-mv64xxx.c | 1 - drivers/i2c/busses/i2c-nforce2.c | 1 - drivers/i2c/busses/i2c-parport-light.c | 1 - drivers/i2c/busses/i2c-parport.c | 1 - drivers/i2c/busses/i2c-pca-isa.c | 1 - drivers/i2c/busses/i2c-piix4.c | 1 - drivers/i2c/busses/i2c-sibyte.c | 2 - drivers/i2c/busses/i2c-sis5595.c | 1 - drivers/i2c/busses/i2c-sis630.c | 1 - drivers/i2c/busses/i2c-sis96x.c | 1 - drivers/i2c/busses/i2c-via.c | 1 - drivers/i2c/busses/i2c-viapro.c | 1 - drivers/i2c/busses/i2c-voodoo3.c | 2 - drivers/i2c/busses/scx200_acb.c | 1 - drivers/i2c/busses/scx200_i2c.c | 1 - drivers/i2c/chips/Kconfig | 37 ------------- drivers/i2c/chips/Makefile | 2 - drivers/ieee1394/pcilynx.c | 1 - drivers/misc/Kconfig | 9 +--- drivers/misc/Makefile | 2 +- drivers/misc/eeprom/Kconfig | 59 ++++++++++++++++++++ drivers/misc/eeprom/Makefile | 4 ++ drivers/{i2c/chips => misc/eeprom}/at24.c | 0 drivers/{spi => misc/eeprom}/at25.c | 0 drivers/{i2c/chips => misc/eeprom}/eeprom.c | 0 drivers/misc/{ => eeprom}/eeprom_93cx6.c | 0 drivers/spi/Kconfig | 11 ---- drivers/spi/Makefile | 1 - drivers/video/aty/radeon_i2c.c | 1 - drivers/video/i810/i810-i2c.c | 1 - drivers/video/intelfb/intelfb_i2c.c | 1 - drivers/video/nvidia/nv_i2c.c | 1 - drivers/video/savage/savagefb-i2c.c | 1 - include/linux/i2c-id.h | 61 --------------------- include/linux/i2c.h | 8 ++- 226 files changed, 390 insertions(+), 486 deletions(-) create mode 100644 drivers/misc/eeprom/Kconfig create mode 100644 drivers/misc/eeprom/Makefile rename drivers/{i2c/chips => misc/eeprom}/at24.c (100%) rename drivers/{spi => misc/eeprom}/at25.c (100%) rename drivers/{i2c/chips => misc/eeprom}/eeprom.c (100%) rename drivers/misc/{ => eeprom}/eeprom_93cx6.c (100%) Merging quilt/jdelvare-hwmon $ git merge quilt/jdelvare-hwmon Merge made by recursive. drivers/hwmon/ds1621.c | 79 +++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 65 insertions(+), 14 deletions(-) Merging quilt/kernel-doc $ git merge quilt/kernel-doc Already up-to-date. Merging v4l-dvb/master $ git merge v4l-dvb/master Auto-merged drivers/media/video/uvc/uvc_status.c Merge made by recursive. Documentation/video4linux/v4lgrab.c | 25 +- drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 24 +- drivers/media/dvb/dvb-core/dvb_ca_en50221.h | 6 +- drivers/media/dvb/dvb-usb/dib0700_devices.c | 18 +- drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 2 + drivers/media/dvb/frontends/stb0899_algo.c | 3 + drivers/media/video/cs5345.c | 1 - drivers/media/video/cx23885/cx23885-417.c | 3 +- drivers/media/video/cx23885/cx23885-video.c | 5 +- drivers/media/video/cx88/cx88-dvb.c | 72 ++-- drivers/media/video/cx88/cx88.h | 2 +- drivers/media/video/em28xx/em28xx-core.c | 9 + drivers/media/video/em28xx/em28xx-video.c | 41 +- drivers/media/video/em28xx/em28xx.h | 19 + drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | 12 + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 19 + drivers/media/video/pvrusb2/pvrusb2-hdw.h | 6 +- drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 12 +- drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 2 +- drivers/media/video/pwc/pwc-if.c | 1 - drivers/media/video/saa7127.c | 52 +- drivers/media/video/saa7134/saa7134-core.c | 4 + drivers/media/video/saa717x.c | 1 - drivers/media/video/tveeprom.c | 3 + drivers/media/video/tvp514x.c | 2 +- drivers/media/video/upd64031a.c | 1 - drivers/media/video/upd64083.c | 1 - drivers/media/video/uvc/uvc_ctrl.c | 7 +- drivers/media/video/uvc/uvc_driver.c | 55 +- drivers/media/video/uvc/uvc_isight.c | 2 + drivers/media/video/uvc/uvc_queue.c | 31 +- drivers/media/video/uvc/uvc_status.c | 3 +- drivers/media/video/uvc/uvc_v4l2.c | 10 +- drivers/media/video/uvc/uvc_video.c | 31 +- drivers/media/video/uvc/uvcvideo.h | 232 ++++---- drivers/media/video/v4l2-subdev.c | 10 +- drivers/media/video/vivi.c | 186 +++++-- drivers/media/video/zoran/zoran.h | 12 +- drivers/media/video/zoran/zoran_card.c | 620 ++++++++++---------- drivers/media/video/zoran/zoran_card.h | 2 - drivers/media/video/zoran/zoran_driver.c | 105 ++--- include/media/v4l2-device.h | 8 +- include/media/v4l2-subdev.h | 3 + 43 files changed, 913 insertions(+), 750 deletions(-) Merging quota/for_next $ git merge quota/for_next Merge made by recursive. fs/dquot.c | 514 +++++++++++++++++++++++++++++++--------------- fs/ext3/super.c | 44 +---- fs/ext4/ext4.h | 1 + fs/ext4/inode.c | 36 +++- fs/ext4/mballoc.c | 44 +++-- fs/ext4/super.c | 48 +---- fs/ocfs2/quota_global.c | 169 +--------------- fs/reiserfs/super.c | 58 +----- include/linux/quota.h | 9 + include/linux/quotaops.h | 90 +++++++- 10 files changed, 506 insertions(+), 507 deletions(-) Merging jfs/next $ git merge jfs/next Merge made by recursive. fs/jfs/jfs_extent.c | 63 +++++-------- fs/jfs/jfs_imap.c | 10 +-- fs/jfs/jfs_types.h | 29 ------ fs/jfs/jfs_xtree.c | 263 +-------------------------------------------------- fs/jfs/jfs_xtree.h | 2 - 5 files changed, 28 insertions(+), 339 deletions(-) Merging kbuild/master $ git merge kbuild/master Already up-to-date. Merging quilt/ide $ git merge quilt/ide Auto-merged drivers/ide/ide-acpi.c CONFLICT (content): Merge conflict in drivers/ide/ide-acpi.c Removed include/asm-frv/ide.h Removed include/asm-mn10300/ide.h Recorded preimage for 'drivers/ide/ide-acpi.c' Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'drivers/ide/ide-acpi.c'. Created commit f9a15ff: Merge branch 'quilt/ide' $ git diff -M --stat --summary HEAD^.. drivers/ide/Kconfig | 18 + drivers/ide/Makefile | 5 +- drivers/ide/aec62xx.c | 4 +- drivers/ide/alim15x3.c | 2 +- drivers/ide/amd74xx.c | 14 +- drivers/ide/atiixp.c | 3 +- drivers/ide/cmd64x.c | 2 +- drivers/ide/cs5520.c | 3 +- drivers/ide/cs5530.c | 2 +- drivers/ide/cs5536.c | 309 +++++++++++++++++ drivers/ide/delkin_cb.c | 2 +- drivers/ide/falconide.c | 2 +- drivers/ide/hpt366.c | 4 +- drivers/ide/ide-acpi.c | 214 +++--------- drivers/ide/ide-atapi.c | 41 +++- drivers/ide/ide-cd.c | 4 +- drivers/ide/ide-devsets.c | 190 +++++++++++ drivers/ide/ide-dma.c | 57 ++++ drivers/ide/ide-eh.c | 428 ++++++++++++++++++++++++ drivers/ide/ide-io-std.c | 314 +++++++++++++++++ drivers/ide/ide-io.c | 320 ++---------------- drivers/ide/ide-iops.c | 740 ++--------------------------------------- drivers/ide/ide-lib.c | 240 ------------- drivers/ide/ide-park.c | 25 ++ drivers/ide/ide-pci-generic.c | 4 +- drivers/ide/ide-probe.c | 260 ++++----------- drivers/ide/ide-proc.c | 2 +- drivers/ide/ide-xfer-mode.c | 246 ++++++++++++++ drivers/ide/ide.c | 156 +--------- drivers/ide/it821x.c | 2 +- drivers/ide/ns87415.c | 4 +- drivers/ide/palm_bk3710.c | 11 +- drivers/ide/pdc202xx_new.c | 4 +- drivers/ide/pdc202xx_old.c | 4 +- drivers/ide/piix.c | 13 +- drivers/ide/serverworks.c | 13 +- drivers/ide/setup-pci.c | 27 +- drivers/ide/siimage.c | 2 +- drivers/ide/sis5513.c | 4 +- drivers/ide/sl82c105.c | 4 +- drivers/ide/slc90e66.c | 1 - drivers/ide/trm290.c | 3 - drivers/ide/tx4939ide.c | 4 +- drivers/ide/via82cxxx.c | 7 +- 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/ide.h | 78 ++--- 49 files changed, 1903 insertions(+), 1959 deletions(-) create mode 100644 drivers/ide/cs5536.c 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 include/asm-frv/ide.h delete mode 100644 include/asm-mn10300/ide.h Merging libata/NEXT $ git merge libata/NEXT Already up-to-date. Merging nfs/linux-next $ git merge nfs/linux-next Auto-merged init/Kconfig Auto-merged kernel/Makefile Auto-merged kernel/sysctl.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 | 24 + fs/Makefile | 2 + 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/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 + 83 files changed, 15436 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 Merge made by recursive. fs/xfs/Kconfig | 1 + fs/xfs/linux-2.6/xfs_ioctl.c | 305 ++++++++++++++++++---------------------- fs/xfs/linux-2.6/xfs_ioctl.h | 15 ++- fs/xfs/linux-2.6/xfs_ioctl32.c | 184 ++++++++----------------- fs/xfs/linux-2.6/xfs_super.c | 17 ++- fs/xfs/quota/xfs_dquot.c | 38 ++++-- fs/xfs/quota/xfs_dquot.h | 10 ++ fs/xfs/quota/xfs_qm.c | 9 ++ fs/xfs/xfs_ag.h | 6 +- fs/xfs/xfs_alloc_btree.c | 2 +- fs/xfs/xfs_attr.c | 26 ++-- fs/xfs/xfs_bmap.c | 166 +++++++++++----------- fs/xfs/xfs_bmap.h | 2 - fs/xfs/xfs_bmap_btree.c | 10 +- fs/xfs/xfs_bmap_btree.h | 4 - fs/xfs/xfs_btree.c | 16 +- fs/xfs/xfs_da_btree.c | 8 +- fs/xfs/xfs_extfree_item.h | 6 - fs/xfs/xfs_ialloc.c | 6 +- fs/xfs/xfs_ialloc.h | 2 - fs/xfs/xfs_ialloc_btree.h | 1 - fs/xfs/xfs_inode.c | 19 ++- fs/xfs/xfs_inode_item.h | 6 - fs/xfs/xfs_iomap.c | 10 +- fs/xfs/xfs_itable.c | 6 +- fs/xfs/xfs_mount.c | 26 ++-- fs/xfs/xfs_mount.h | 9 +- fs/xfs/xfs_rename.c | 2 +- fs/xfs/xfs_rtalloc.c | 2 +- fs/xfs/xfs_rw.h | 1 - fs/xfs/xfs_sb.h | 2 +- fs/xfs/xfs_vnodeops.c | 20 ++-- 32 files changed, 441 insertions(+), 496 deletions(-) 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/mad_rmpp.c | 2 +- drivers/infiniband/hw/amso1100/c2.c | 20 +++-- drivers/infiniband/hw/amso1100/c2_provider.c | 15 ++-- drivers/infiniband/hw/cxgb3/iwch_qp.c | 4 +- drivers/infiniband/hw/ehca/ehca_sqp.c | 8 +- drivers/infiniband/hw/ipath/ipath_eeprom.c | 4 +- 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_sdma.c | 6 +- drivers/infiniband/hw/ipath/ipath_verbs.c | 2 +- drivers/infiniband/hw/ipath/ipath_verbs.h | 10 ++-- drivers/infiniband/hw/mlx4/qp.c | 22 +++--- drivers/infiniband/hw/nes/nes_nic.c | 22 ++++--- drivers/infiniband/ulp/ipoib/ipoib_main.c | 20 +++-- include/rdma/ib_cm.h | 12 ++-- include/rdma/ib_mad.h | 2 +- include/rdma/ib_smi.h | 34 +++++----- 22 files changed, 169 insertions(+), 158 deletions(-) Merging acpi/test $ git merge acpi/test Auto-merged MAINTAINERS Auto-merged arch/x86/kernel/acpi/sleep.c Auto-merged arch/x86/kernel/reboot.c Merge made by recursive. Documentation/feature-removal-schedule.txt | 8 + MAINTAINERS | 5 + arch/x86/kernel/acpi/sleep.c | 4 +- arch/x86/kernel/reboot.c | 2 +- drivers/acpi/battery.c | 14 +- drivers/acpi/ec.c | 2 +- drivers/acpi/pci_link.c | 39 +- drivers/acpi/sbs.c | 31 +- drivers/acpi/sleep.c | 51 +- drivers/platform/x86/Kconfig | 14 + drivers/platform/x86/Makefile | 1 + drivers/platform/x86/asus-laptop.c | 176 +++++- drivers/platform/x86/asus_acpi.c | 16 +- drivers/platform/x86/eeepc-laptop.c | 161 +++++- drivers/platform/x86/oqo-wmi.c | 941 ++++++++++++++++++++++++++++ drivers/platform/x86/panasonic-laptop.c | 2 +- drivers/power/power_supply_sysfs.c | 2 + include/linux/power_supply.h | 2 + kernel/power/main.c | 26 +- 19 files changed, 1383 insertions(+), 114 deletions(-) create mode 100644 drivers/platform/x86/oqo-wmi.c Merging nfsd/nfsd-next $ git merge nfsd/nfsd-next Auto-merged fs/Kconfig Merge made by recursive. Documentation/filesystems/nfs-rdma.txt | 4 +- fs/Kconfig | 5 +- fs/nfsd/nfs3proc.c | 5 +- fs/nfsd/nfs4state.c | 163 ++++++++++++++++++-------------- 4 files changed, 98 insertions(+), 79 deletions(-) Merging ieee1394/for-next $ git merge ieee1394/for-next Merge made by recursive. drivers/firewire/fw-card.c | 70 +-- drivers/firewire/fw-cdev.c | 1006 +++++++++++++++++-------- drivers/firewire/fw-device.c | 164 +++-- drivers/firewire/fw-device.h | 8 +- drivers/firewire/fw-iso.c | 225 +++++- drivers/firewire/fw-ohci.c | 242 +++--- drivers/firewire/fw-sbp2.c | 57 +- drivers/firewire/fw-topology.c | 40 +- drivers/firewire/fw-topology.h | 19 +- drivers/firewire/fw-transaction.c | 151 ++--- drivers/firewire/fw-transaction.h | 136 ++--- drivers/ieee1394/dma.h | 1 + drivers/ieee1394/ieee1394_core.c | 1 + drivers/ieee1394/ieee1394_transactions.c | 29 + drivers/ieee1394/ieee1394_transactions.h | 2 + drivers/ieee1394/iso.h | 1 + drivers/ieee1394/nodemgr.c | 10 +- drivers/ieee1394/nodemgr.h | 18 + drivers/ieee1394/ohci1394.h | 2 +- drivers/media/dvb/Kconfig | 2 + drivers/media/dvb/Makefile | 2 + drivers/media/dvb/firewire/Kconfig | 12 + drivers/media/dvb/firewire/Makefile | 11 + drivers/media/dvb/firewire/avc.c | 1180 +++++++++++++++++++++++++++++ drivers/media/dvb/firewire/avc.h | 427 +++++++++++ drivers/media/dvb/firewire/firedtv-1394.c | 378 +++++++++ drivers/media/dvb/firewire/firedtv-ci.c | 261 +++++++ drivers/media/dvb/firewire/firedtv-ci.h | 9 + drivers/media/dvb/firewire/firedtv-dvb.c | 276 +++++++ drivers/media/dvb/firewire/firedtv-fe.c | 244 ++++++ drivers/media/dvb/firewire/firedtv-rc.c | 191 +++++ drivers/media/dvb/firewire/firedtv-rc.h | 11 + drivers/media/dvb/firewire/firedtv.h | 190 +++++ include/linux/firewire-cdev.h | 170 ++++- 34 files changed, 4735 insertions(+), 811 deletions(-) create mode 100644 drivers/media/dvb/firewire/Kconfig create mode 100644 drivers/media/dvb/firewire/Makefile create mode 100644 drivers/media/dvb/firewire/avc.c create mode 100644 drivers/media/dvb/firewire/avc.h create mode 100644 drivers/media/dvb/firewire/firedtv-1394.c create mode 100644 drivers/media/dvb/firewire/firedtv-ci.c create mode 100644 drivers/media/dvb/firewire/firedtv-ci.h create mode 100644 drivers/media/dvb/firewire/firedtv-dvb.c create mode 100644 drivers/media/dvb/firewire/firedtv-fe.c create mode 100644 drivers/media/dvb/firewire/firedtv-rc.c create mode 100644 drivers/media/dvb/firewire/firedtv-rc.h create mode 100644 drivers/media/dvb/firewire/firedtv.h Merging ubi/linux-next $ git merge ubi/linux-next Merge made by recursive. drivers/mtd/ubi/cdev.c | 148 ++++++++++++++++++++++++++++++++------------- drivers/mtd/ubi/gluebi.c | 11 +--- drivers/mtd/ubi/scan.c | 8 +-- drivers/mtd/ubi/ubi.h | 6 +- drivers/mtd/ubi/upd.c | 21 ++---- drivers/mtd/ubi/vmt.c | 17 ++--- include/mtd/ubi-user.h | 98 +++++++++++++++++++++++------- 7 files changed, 204 insertions(+), 105 deletions(-) Merging kvm/master $ git merge kvm/master Auto-merged arch/x86/include/asm/msr-index.h Auto-merged arch/x86/kvm/Kconfig Merge made by recursive. arch/ia64/include/asm/kvm.h | 53 ++- arch/ia64/include/asm/kvm_host.h | 8 +- arch/ia64/kvm/Kconfig | 4 + arch/ia64/kvm/kvm-ia64.c | 105 ++++- arch/ia64/kvm/kvm_fw.c | 151 +++++- arch/ia64/kvm/process.c | 88 ++- arch/ia64/kvm/vcpu.c | 39 +-- 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-fsl-booke.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 | 194 +++++++ arch/powerpc/kvm/e500_tlb.c | 737 +++++++++++++++++++++++++ arch/powerpc/kvm/e500_tlb.h | 184 +++++++ arch/powerpc/kvm/emulate.c | 93 +++- arch/powerpc/kvm/powerpc.c | 35 +- arch/s390/include/asm/kvm.h | 7 + arch/s390/include/asm/kvm_host.h | 3 - arch/s390/kvm/Kconfig | 3 + arch/s390/kvm/kvm-s390.c | 8 +- arch/x86/include/asm/kvm.h | 31 ++ arch/x86/include/asm/kvm_host.h | 59 ++- arch/x86/include/asm/msr-index.h | 7 + arch/x86/include/asm/svm.h | 4 - arch/x86/include/asm/virtext.h | 2 +- arch/x86/include/asm/vmx.h | 5 +- arch/x86/kvm/Kconfig | 4 + arch/x86/kvm/i8254.c | 23 +- arch/x86/kvm/i8254.h | 2 + arch/x86/kvm/irq.c | 7 - arch/x86/kvm/irq.h | 1 - arch/x86/kvm/kvm_svm.h | 16 +- arch/x86/kvm/lapic.c | 60 +-- arch/x86/kvm/lapic.h | 2 - arch/x86/kvm/mmu.c | 226 ++++---- arch/x86/kvm/paging_tmpl.h | 213 ++++----- arch/x86/kvm/svm.c | 869 ++++++++++++++++++++++++++---- arch/x86/kvm/vmx.c | 307 +++++++---- arch/x86/kvm/x86.c | 310 +++++++---- arch/x86/kvm/x86_emulate.c | 56 ++- include/linux/kvm.h | 104 +++- include/linux/kvm_host.h | 56 ++- include/linux/kvm_types.h | 13 - virt/kvm/ioapic.c | 6 + virt/kvm/irq_comm.c | 192 +++++++- virt/kvm/kvm_main.c | 103 +++- 63 files changed, 4232 insertions(+), 1224 deletions(-) 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 Already up-to-date. Merging scsi/master $ git merge scsi/master Auto-merged drivers/scsi/scsi.c Merge made by recursive. drivers/scsi/Kconfig | 15 +- drivers/scsi/libfc/fc_lport.c | 5 +- drivers/scsi/libfc/fc_rport.c | 2 +- drivers/scsi/lpfc/lpfc_debugfs.c | 16 +- drivers/scsi/scsi.c | 104 ++++++++ drivers/scsi/scsi_debug.c | 443 ++++++++++++++++++++++++++++++++++- drivers/scsi/scsi_sysfs.c | 1 - drivers/scsi/scsi_transport_fc.c | 2 +- drivers/scsi/ses.c | 31 +--- drivers/scsi/sym53c8xx_2/sym_hipd.c | 35 ++- drivers/scsi/sym53c8xx_2/sym_hipd.h | 1 + include/scsi/scsi_device.h | 4 +- 12 files changed, 596 insertions(+), 63 deletions(-) Merging ocfs2/linux-next $ git merge ocfs2/linux-next Auto-merged fs/ocfs2/quota_global.c Merge made by recursive. fs/configfs/dir.c | 59 +++++++++++++ fs/ocfs2/cluster/heartbeat.c | 96 +++++++++++++++++++++- fs/ocfs2/cluster/heartbeat.h | 3 +- fs/ocfs2/cluster/nodemanager.c | 9 ++- fs/ocfs2/dcache.c | 42 +++++++++- fs/ocfs2/dcache.h | 9 ++- fs/ocfs2/journal.c | 12 --- fs/ocfs2/journal.h | 11 +++ fs/ocfs2/localalloc.c | 86 ------------------- fs/ocfs2/ocfs2.h | 12 ++- fs/ocfs2/quota_global.c | 4 +- fs/ocfs2/super.c | 179 ++++++++++++++++++++++++++++++++++++++++ fs/ocfs2/xattr.c | 17 ++-- 13 files changed, 418 insertions(+), 121 deletions(-) Merging ext4/next $ git merge ext4/next Auto-merged fs/ext4/ext4.h Auto-merged fs/ext4/inode.c Merge made by recursive. fs/ext3/namei.c | 20 ++++++++++++++------ fs/ext4/ext4.h | 17 +++++------------ fs/ext4/ext4_i.h | 3 --- fs/ext4/ext4_sb.h | 4 ---- fs/ext4/inode.c | 4 ++-- fs/ext4/mballoc.h | 1 - fs/ext4/namei.c | 21 +++++++++++++++------ fs/jbd2/journal.c | 6 +++--- include/linux/jbd2.h | 3 ++- 9 files changed, 41 insertions(+), 38 deletions(-) Merging async_tx/next $ git merge async_tx/next Auto-merged drivers/video/Makefile Auto-merged include/linux/dmaengine.h Merge made by recursive. arch/arm/plat-mxc/include/mach/ipu.h | 181 ++++ arch/arm/plat-mxc/include/mach/irqs.h | 10 +- arch/arm/plat-mxc/include/mach/mx3fb.h | 38 + drivers/dma/Kconfig | 19 + drivers/dma/Makefile | 1 + drivers/dma/dmaengine.c | 8 +- drivers/dma/dmatest.c | 35 +- drivers/dma/fsldma.c | 8 +- drivers/dma/ipu/Makefile | 1 + drivers/dma/ipu/ipu_idmac.c | 1740 ++++++++++++++++++++++++++++++++ drivers/dma/ipu/ipu_intern.h | 176 ++++ drivers/dma/ipu/ipu_irq.c | 413 ++++++++ drivers/video/Kconfig | 12 + drivers/video/Makefile | 1 + drivers/video/mx3fb.c | 1555 ++++++++++++++++++++++++++++ include/linux/dmaengine.h | 11 +- 16 files changed, 4194 insertions(+), 15 deletions(-) create mode 100644 arch/arm/plat-mxc/include/mach/ipu.h create mode 100644 arch/arm/plat-mxc/include/mach/mx3fb.h create mode 100644 drivers/dma/ipu/Makefile create mode 100644 drivers/dma/ipu/ipu_idmac.c create mode 100644 drivers/dma/ipu/ipu_intern.h create mode 100644 drivers/dma/ipu/ipu_irq.c create mode 100644 drivers/video/mx3fb.c Merging udf/for_next $ git merge udf/for_next 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 | 139 ++++++++----- 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 | 41 +++-- 19 files changed, 663 insertions(+), 590 deletions(-) Merging net/master $ git merge net/master Auto-merged drivers/infiniband/hw/nes/nes_nic.c Auto-merged drivers/net/au1000_eth.c Auto-merged drivers/net/bnx2x_main.c Auto-merged drivers/net/cpmac.c Auto-merged drivers/net/ehea/ehea_main.c Auto-merged drivers/net/macb.c Auto-merged drivers/net/sb1250-mac.c Auto-merged drivers/net/sfc/efx.c Auto-merged drivers/net/smc91x.c Auto-merged drivers/net/smc91x.h Auto-merged drivers/net/smsc911x.c Auto-merged drivers/net/smsc9420.c Auto-merged drivers/net/tc35815.c Auto-merged include/linux/virtio_net.h Merge made by recursive. Documentation/networking/dccp.txt | 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/infiniband/hw/nes/nes_hw.c | 2 +- drivers/infiniband/hw/nes/nes_nic.c | 2 +- drivers/infiniband/ulp/ipoib/ipoib_ib.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 | 55 ++- drivers/net/8139cp.c | 6 +- drivers/net/8139too.c | 6 +- drivers/net/82596.c | 17 +- drivers/net/Kconfig | 3 - drivers/net/amd8111e.c | 6 +- drivers/net/arcnet/arc-rawmode.c | 2 +- drivers/net/arcnet/arcnet.c | 71 +-- drivers/net/arcnet/capmode.c | 2 +- drivers/net/arcnet/com20020-isa.c | 2 + drivers/net/arcnet/com20020-pci.c | 3 + drivers/net/arcnet/com20020.c | 10 +- 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/atl1e/atl1e_main.c | 6 +- drivers/net/au1000_eth.c | 1043 +++++++++++++++---------------- drivers/net/b44.c | 6 +- drivers/net/bnx2.c | 22 +- drivers/net/bnx2x_main.c | 6 +- drivers/net/bonding/bond_main.c | 2 +- drivers/net/cassini.c | 8 +- drivers/net/chelsio/sge.c | 4 +- drivers/net/cpmac.c | 10 +- drivers/net/cxgb3/adapter.h | 14 +- drivers/net/cxgb3/cxgb3_main.c | 65 +-- drivers/net/cxgb3/sge.c | 119 +--- drivers/net/e100.c | 6 +- drivers/net/e1000/e1000.h | 2 - drivers/net/e1000/e1000_main.c | 39 +- drivers/net/e1000e/e1000.h | 2 - drivers/net/e1000e/netdev.c | 52 +-- drivers/net/ehea/ehea.h | 2 +- drivers/net/ehea/ehea_main.c | 128 ++-- drivers/net/ehea/ehea_qmr.c | 4 +- drivers/net/enic/enic_main.c | 12 +- drivers/net/epic100.c | 6 +- drivers/net/forcedeth.c | 10 +- drivers/net/fs_enet/fs_enet-main.c | 4 +- drivers/net/gianfar.c | 6 +- drivers/net/hamradio/6pack.c | 16 +- drivers/net/hamradio/baycom_epp.c | 43 +- drivers/net/hamradio/bpqether.c | 38 +- drivers/net/hamradio/dmascc.c | 54 +- drivers/net/hamradio/hdlcdrv.c | 45 +- drivers/net/hamradio/mkiss.c | 46 +- drivers/net/hamradio/scc.c | 21 +- drivers/net/hamradio/yam.c | 61 +-- drivers/net/ibmveth.c | 8 +- drivers/net/igb/e1000_82575.c | 7 + drivers/net/igb/igb.h | 16 - drivers/net/igb/igb_ethtool.c | 17 - drivers/net/igb/igb_main.c | 103 +--- drivers/net/ixgb/ixgb_main.c | 6 +- drivers/net/ixgbe/ixgbe.h | 9 - drivers/net/ixgbe/ixgbe_ethtool.c | 11 - drivers/net/ixgbe/ixgbe_main.c | 93 +--- drivers/net/ixp2000/ixpdev.c | 4 +- drivers/net/jme.h | 6 +- drivers/net/korina.c | 4 +- drivers/net/macb.c | 10 +- drivers/net/mlx4/en_rx.c | 4 +- drivers/net/myri10ge/myri10ge.c | 6 +- drivers/net/natsemi.c | 6 +- drivers/net/netxen/netxen_nic_main.c | 2 +- drivers/net/niu.c | 6 +- drivers/net/pasemi_mac.c | 6 +- drivers/net/pcnet32.c | 6 +- drivers/net/phy/mdio-gpio.c | 13 +- drivers/net/ppp_generic.c | 275 ++++++--- drivers/net/pppoe.c | 529 ++++++++++------ drivers/net/pppol2tp.c | 166 ++++-- drivers/net/pppox.c | 3 - drivers/net/ps3_gelic_net.c | 24 +- drivers/net/ps3_gelic_wireless.c | 28 +- drivers/net/qla3xxx.c | 6 +- drivers/net/qlge/qlge_main.c | 6 +- drivers/net/r6040.c | 4 +- drivers/net/r8169.c | 6 +- drivers/net/s2io.c | 8 +- drivers/net/sb1250-mac.c | 6 +- drivers/net/sc92031.c | 27 +- drivers/net/sfc/Kconfig | 1 - drivers/net/sfc/efx.c | 15 +- drivers/net/sfc/efx.h | 2 +- drivers/net/sfc/net_driver.h | 9 - drivers/net/sfc/rx.c | 207 +------ drivers/net/sfc/rx.h | 3 - drivers/net/sfc/sfe4001.c | 1 + drivers/net/sfc/tenxpress.c | 1 + drivers/net/skge.c | 6 +- drivers/net/smc91x.c | 116 ++++- drivers/net/smc91x.h | 10 + drivers/net/smsc911x.c | 8 +- drivers/net/smsc9420.c | 4 +- drivers/net/spider_net.c | 12 +- drivers/net/starfire.c | 6 +- drivers/net/sungem.c | 6 +- drivers/net/tc35815.c | 6 +- drivers/net/tehuti.c | 6 +- drivers/net/tg3.c | 18 +- drivers/net/tokenring/3c359.c | 17 +- drivers/net/tokenring/abyss.c | 10 +- drivers/net/tokenring/ibmtr.c | 43 +- drivers/net/tokenring/lanstreamer.c | 43 +- drivers/net/tokenring/lanstreamer.h | 1 - drivers/net/tokenring/olympic.c | 38 +- drivers/net/tokenring/olympic.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/interrupt.c | 10 +- drivers/net/tun.c | 371 +++++++----- drivers/net/typhoon.c | 8 +- drivers/net/typhoon.h | 234 ++++---- drivers/net/ucc_geth.c | 6 +- drivers/net/via-rhine.c | 4 +- drivers/net/virtio_net.c | 55 ++- drivers/net/wan/c101.c | 12 +- drivers/net/wan/cosa.c | 14 +- drivers/net/wan/dscc4.c | 18 +- drivers/net/wan/farsync.c | 18 +- drivers/net/wan/hd64572.c | 4 +- drivers/net/wan/hdlc.c | 29 +- drivers/net/wan/hdlc_cisco.c | 1 - drivers/net/wan/hdlc_fr.c | 28 +- drivers/net/wan/hdlc_ppp.c | 2 - drivers/net/wan/hdlc_raw.c | 3 - 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/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/sealevel.c | 12 +- drivers/net/wan/wanxl.c | 14 +- drivers/net/wimax/i2400m/netdev.c | 14 +- drivers/net/wireless/ath5k/debug.c | 2 +- drivers/net/wireless/libertas/debugfs.c | 14 +- drivers/net/wireless/strip.c | 2 +- drivers/net/xen-netfront.c | 8 +- drivers/net/znet.c | 17 +- drivers/s390/net/claw.c | 14 +- drivers/s390/net/ctcm_main.c | 24 +- drivers/s390/net/lcs.c | 21 +- drivers/s390/net/netiucv.c | 14 +- drivers/scsi/cxgb3i/cxgb3i_ddp.h | 2 + include/linux/arcdevice.h | 9 +- include/linux/com20020.h | 1 + include/linux/dccp.h | 51 +-- include/linux/hdlc.h | 5 + include/linux/hdlcdrv.h | 1 - include/linux/ibmtr.h | 2 +- include/linux/if.h | 1 + include/linux/mroute.h | 18 +- include/linux/netdevice.h | 50 -- include/linux/pci_ids.h | 2 + include/linux/ppp_channel.h | 4 + include/linux/virtio_net.h | 5 + include/net/atmclip.h | 1 - include/net/inet_hashtables.h | 3 +- include/net/netns/ipv4.h | 13 + include/net/netrom.h | 4 - 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/dccp/dccp.h | 21 +- net/dccp/feat.c | 232 ++++++-- net/dccp/feat.h | 21 +- net/dccp/minisocks.c | 11 - net/dccp/options.c | 8 - net/dccp/proto.c | 2 - net/dccp/sysctl.c | 43 +- net/ipv4/inet_connection_sock.c | 41 +- net/ipv4/inet_hashtables.c | 11 +- net/ipv4/ip_gre.c | 128 +++-- net/ipv4/ipmr.c | 461 +++++++++------ net/ipv4/route.c | 11 +- net/netrom/af_netrom.c | 2 +- net/netrom/nr_dev.c | 26 +- net/rose/af_rose.c | 3 +- net/rose/rose_dev.c | 22 +- net/sctp/ipv6.c | 3 +- 205 files changed, 3606 insertions(+), 3310 deletions(-) $ git revert 0db155de988031f925096a7df1bf9633790a2c18 Finished one revert. Created commit fd0b769: Revert "com20020: Fix allyesconfig build failure." 1 files changed, 1 insertions(+), 1 deletions(-) $ git revert a1799af4d7deefccdaa9d222a886fa1373dbb49a Finished one revert. Created commit e21f5dd: Revert "com20020: convert to net_devic_ops" 4 files changed, 2 insertions(+), 14 deletions(-) Merging mtd/master $ git merge mtd/master Merge made by recursive. drivers/mtd/chips/map_rom.c | 8 ++++++++ drivers/mtd/devices/slram.c | 14 ++++++++++---- drivers/mtd/lpddr/Kconfig | 1 + 3 files changed, 19 insertions(+), 4 deletions(-) Merging wireless/master $ git merge wireless/master Already up-to-date. Merging crypto/master $ git merge crypto/master Merge made by recursive. 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 | 25 + crypto/cryptd.c | 35 ++ crypto/shash.c | 2 - include/crypto/aes.h | 6 +- include/crypto/cryptd.h | 27 + 13 files changed, 1491 insertions(+), 20 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 include/crypto/cryptd.h Merging vfs/for-next $ git merge vfs/for-next Already up-to-date. Merging sound/for-next $ git merge sound/for-next Auto-merged arch/arm/mach-pxa/e740.c Auto-merged arch/arm/mach-pxa/e750.c Auto-merged include/linux/pci_ids.h Auto-merged sound/arm/pxa2xx-ac97.c Auto-merged sound/soc/pxa/e800_wm9712.c Merge made by recursive. .../sound/alsa/DocBook/writing-an-alsa-driver.tmpl | 44 ++- Documentation/sound/alsa/HD-Audio-Models.txt | 4 +- Documentation/sound/alsa/soc/dapm.txt | 3 + arch/arm/mach-pxa/e740.c | 5 + arch/arm/mach-pxa/e750.c | 5 + arch/arm/mach-pxa/include/mach/eseries-gpio.h | 15 + 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/control.h | 20 +- include/sound/core.h | 14 +- include/sound/jack.h | 5 + include/sound/soc-dapm.h | 19 +- include/sound/soc.h | 34 ++ include/sound/version.h | 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 | 7 +- sound/core/init.c | 47 ++- sound/core/jack.c | 45 +-- sound/core/vmaster.c | 46 ++- sound/drivers/dummy.c | 8 +- sound/drivers/ml403-ac97cr.c | 6 +- sound/drivers/mpu401/mpu401.c | 6 +- sound/drivers/mtpav.c | 6 +- sound/drivers/mts64.c | 6 +- sound/drivers/pcsp/pcsp.c | 6 +- sound/drivers/portman2x4.c | 6 +- sound/drivers/serial-u16550.c | 6 +- sound/drivers/virmidi.c | 8 +- sound/isa/Kconfig | 1 + sound/isa/ad1816a/ad1816a.c | 21 +- sound/isa/ad1816a/ad1816a_lib.c | 5 - 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 | 52 ++- sound/isa/cs423x/cs4231.c | 6 +- sound/isa/cs423x/cs4236.c | 32 +- sound/isa/dt019x.c | 7 +- sound/isa/es1688/es1688.c | 6 +- sound/isa/es18xx.c | 24 +- sound/isa/gus/gusclassic.c | 6 +- sound/isa/gus/gusextreme.c | 6 +- sound/isa/gus/gusmax.c | 8 +- sound/isa/gus/interwave.c | 26 +- sound/isa/opl3sa2.c | 31 +- sound/isa/opti9xx/miro.c | 7 +- sound/isa/opti9xx/opti92x-ad1848.c | 35 +- sound/isa/sb/es968.c | 7 +- sound/isa/sb/sb16.c | 28 +- sound/isa/sb/sb8.c | 8 +- sound/isa/sc6000.c | 10 +- sound/isa/sgalaxy.c | 6 +- sound/isa/sscape.c | 165 ++------- sound/isa/wavefront/wavefront.c | 26 +- sound/isa/wss/wss_lib.c | 81 +++-- sound/mips/au1x00.c | 7 +- sound/mips/hal2.c | 6 +- sound/mips/sgio2audio.c | 6 +- sound/parisc/harmony.c | 6 +- sound/pci/ad1889.c | 6 +- sound/pci/ali5451/ali5451.c | 6 +- sound/pci/als300.c | 6 +- sound/pci/als4000.c | 9 +- sound/pci/atiixp.c | 6 +- sound/pci/atiixp_modem.c | 6 +- sound/pci/au88x0/au88x0.c | 6 +- sound/pci/aw2/aw2-alsa.c | 6 +- sound/pci/azt3328.c | 6 +- sound/pci/bt87x.c | 6 +- sound/pci/ca0106/ca0106_main.c | 14 +- sound/pci/cmipci.c | 6 +- sound/pci/cs4281.c | 6 +- sound/pci/cs46xx/cs46xx.c | 6 +- sound/pci/cs5530.c | 6 +- sound/pci/cs5535audio/cs5535audio.c | 6 +- sound/pci/echoaudio/echoaudio.c | 6 +- sound/pci/emu10k1/emu10k1.c | 6 +- sound/pci/emu10k1/emu10k1x.c | 6 +- sound/pci/ens1370.c | 6 +- sound/pci/es1938.c | 6 +- sound/pci/es1968.c | 6 +- sound/pci/fm801.c | 6 +- sound/pci/hda/hda_codec.c | 61 +++- sound/pci/hda/hda_intel.c | 6 +- sound/pci/hda/hda_local.h | 7 +- sound/pci/hda/patch_analog.c | 26 +- sound/pci/hda/patch_realtek.c | 67 ++-- sound/pci/hda/patch_sigmatel.c | 397 ++++++++----------- sound/pci/ice1712/ice1712.c | 6 +- sound/pci/ice1712/ice1724.c | 6 +- sound/pci/intel8x0.c | 6 +- sound/pci/intel8x0m.c | 6 +- sound/pci/korg1212/korg1212.c | 6 +- sound/pci/maestro3.c | 6 +- sound/pci/mixart/mixart.c | 6 +- sound/pci/nm256/nm256.c | 6 +- sound/pci/oxygen/oxygen_lib.c | 8 +- sound/pci/pcxhr/pcxhr.c | 47 ++- sound/pci/pcxhr/pcxhr.h | 5 +- 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 | 6 +- sound/pci/rme9652/hdspm.c | 8 +- sound/pci/rme9652/rme9652.c | 8 +- sound/pci/sis7019.c | 5 +- sound/pci/sonicvibes.c | 6 +- sound/pci/trident/trident.c | 6 +- sound/pci/via82xx.c | 6 +- sound/pci/via82xx_modem.c | 6 +- sound/pci/vx222/vx222.c | 6 +- sound/pci/ymfpci/ymfpci.c | 6 +- sound/pcmcia/pdaudiocf/pdaudiocf.c | 19 +- sound/pcmcia/vx/vxpocket.c | 32 +- sound/ppc/Kconfig | 1 + sound/ppc/awacs.c | 88 ++++- sound/ppc/pmac.c | 3 +- sound/ppc/powermac.c | 6 +- sound/ppc/snd_ps3.c | 6 +- sound/sh/aica.c | 8 +- sound/soc/Kconfig | 1 + sound/soc/Makefile | 2 +- sound/soc/atmel/atmel-pcm.c | 2 +- sound/soc/au1x/dbdma2.c | 2 +- sound/soc/blackfin/bf5xx-ac97-pcm.c | 2 +- sound/soc/blackfin/bf5xx-i2s-pcm.c | 2 +- sound/soc/codecs/Kconfig | 9 +- sound/soc/codecs/Makefile | 3 + sound/soc/codecs/ac97.c | 2 - sound/soc/codecs/ad1980.c | 21 +- sound/soc/codecs/ak4535.c | 18 +- sound/soc/codecs/cs4270.c | 90 ++--- sound/soc/codecs/ssm2602.c | 18 +- sound/soc/codecs/tlv320aic23.c | 21 +- sound/soc/codecs/tlv320aic3x.c | 19 +- sound/soc/codecs/twl4030.c | 22 +- sound/soc/codecs/uda134x.c | 50 +-- sound/soc/codecs/uda1380.c | 18 +- sound/soc/codecs/wm8350.c | 134 ++++++- sound/soc/codecs/wm8350.h | 8 + sound/soc/codecs/wm8510.c | 19 +- sound/soc/codecs/wm8580.c | 21 +- sound/soc/codecs/wm8728.c | 22 +- sound/soc/codecs/wm8731.c | 19 +- sound/soc/codecs/wm8750.c | 18 +- sound/soc/codecs/wm8753.c | 22 +- sound/soc/codecs/wm8900.c | 19 +- sound/soc/codecs/wm8903.c | 18 +- sound/soc/codecs/wm8971.c | 18 +- sound/soc/codecs/wm8990.c | 22 +- sound/soc/codecs/wm9705.c | 412 ++++++++++++++++++++ sound/soc/codecs/wm9705.h | 14 + sound/soc/codecs/wm9712.c | 22 +- sound/soc/codecs/wm9713.c | 32 +-- sound/soc/davinci/davinci-pcm.c | 2 +- sound/soc/davinci/davinci-sffsdr.c | 20 +- sound/soc/fsl/Kconfig | 17 +- sound/soc/fsl/Makefile | 7 +- sound/soc/omap/Kconfig | 14 +- sound/soc/omap/Makefile | 2 + sound/soc/omap/omap-pcm.c | 2 +- sound/soc/pxa/Kconfig | 18 + sound/soc/pxa/Makefile | 4 + sound/soc/pxa/e740_wm9705.c | 211 ++++++++++ sound/soc/pxa/e750_wm9705.c | 187 +++++++++ sound/soc/pxa/e800_wm9712.c | 113 +++++- sound/soc/pxa/zylonite.c | 93 ++++- sound/soc/s3c24xx/Kconfig | 1 + sound/soc/soc-core.c | 39 ++- sound/soc/soc-dapm.c | 57 ++- sound/soc/soc-jack.c | 138 +++++++ sound/sparc/amd7930.c | 7 +- sound/sparc/cs4231.c | 9 +- sound/sparc/dbri.c | 8 +- sound/spi/at73c213.c | 7 +- sound/usb/Kconfig | 3 + sound/usb/caiaq/caiaq-audio.c | 5 +- sound/usb/caiaq/caiaq-control.c | 15 +- sound/usb/caiaq/caiaq-device.c | 38 ++- sound/usb/caiaq/caiaq-device.h | 2 + sound/usb/usbaudio.c | 6 +- sound/usb/usbmixer.c | 137 ++++--- sound/usb/usbmixer_maps.c | 26 ++ sound/usb/usbquirks.h | 10 + sound/usb/usx2y/us122l.c | 59 ++-- sound/usb/usx2y/usbusx2y.c | 52 ++- 203 files changed, 3114 insertions(+), 1648 deletions(-) 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/soc-jack.c Merging cpufreq/next $ git merge cpufreq/next Auto-merged arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c Auto-merged drivers/cpufreq/cpufreq_ondemand.c Resolved 'arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit 0ee6d4b: Merge commit 'cpufreq/next' $ git diff -M --stat --summary HEAD^.. 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 | 182 +++++++------ arch/x86/kernel/cpu/cpufreq/longhaul.h | 12 +- arch/x86/kernel/cpu/cpufreq/longrun.c | 25 +- arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 60 +++-- 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 | 355 ++++++++++++++++--------- 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 | 129 ++++++---- arch/x86/kernel/cpu/cpufreq/speedstep-lib.h | 18 +- arch/x86/kernel/cpu/cpufreq/speedstep-smi.c | 166 +++++++----- drivers/cpufreq/cpufreq.c | 52 ++-- drivers/cpufreq/cpufreq_conservative.c | 28 +- drivers/cpufreq/cpufreq_ondemand.c | 29 +-- drivers/cpufreq/cpufreq_stats.c | 74 +++--- drivers/cpufreq/cpufreq_userspace.c | 27 +- drivers/cpufreq/freq_table.c | 18 +- 23 files changed, 1021 insertions(+), 759 deletions(-) Merging v9fs/for-next $ git merge v9fs/for-next Already up-to-date. Merging quilt/rr $ git merge quilt/rr Auto-merged kernel/module.c Auto-merged kernel/workqueue.c Merge made by recursive. include/linux/module.h | 25 ++++++++++++++++--------- kernel/module.c | 33 +++++++++++++++++++++++---------- 2 files changed, 39 insertions(+), 19 deletions(-) Merging cifs/master $ git merge cifs/master Merge made by recursive. fs/cifs/CHANGES | 4 +- fs/cifs/cifsencrypt.c | 18 ++++---- fs/cifs/cifsproto.h | 4 +- fs/cifs/connect.c | 24 ++++----- fs/cifs/dir.c | 56 ++++++++++++---------- fs/cifs/inode.c | 5 ++ fs/cifs/md5.c | 38 +++++++------- fs/cifs/md5.h | 6 +- fs/cifs/transport.c | 127 +++++++++++++++---------------------------------- 9 files changed, 121 insertions(+), 161 deletions(-) Merging mmc/next $ git merge mmc/next Already up-to-date. Merging gfs2/master $ git merge gfs2/master Removed fs/gfs2/locking.c Removed fs/gfs2/locking/dlm/Makefile Removed fs/gfs2/locking/dlm/lock.c Removed fs/gfs2/locking/dlm/lock_dlm.h Removed fs/gfs2/locking/dlm/main.c Removed fs/gfs2/locking/dlm/mount.c Removed fs/gfs2/locking/dlm/sysfs.c Removed fs/gfs2/locking/dlm/thread.c Removed fs/gfs2/mount.h Removed 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 | 251 +++++---------- fs/gfs2/glock.h | 127 +++++++- fs/gfs2/glops.c | 14 - fs/gfs2/incore.h | 67 ++++- 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 | 112 +------ fs/gfs2/mount.h | 17 - fs/gfs2/ops_address.c | 2 +- fs/gfs2/ops_dentry.c | 1 - fs/gfs2/ops_export.c | 1 - fs/gfs2/ops_file.c | 74 ++--- fs/gfs2/ops_fstype.c | 149 ++++++--- fs/gfs2/ops_inode.c | 1 - fs/gfs2/ops_super.c | 42 ++- fs/gfs2/quota.c | 203 ++++++------ fs/gfs2/quota.h | 2 + fs/gfs2/recovery.c | 28 +- fs/gfs2/rgrp.c | 1 - fs/gfs2/super.c | 1 - fs/gfs2/super.h | 26 +- fs/gfs2/sys.c | 156 +++++++++- fs/gfs2/trans.c | 3 +- fs/gfs2/util.c | 11 +- include/linux/lm_interface.h | 277 ---------------- 45 files changed, 1015 insertions(+), 2595 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 Already up-to-date. Merging bkl-removal/bkl-removal $ git merge bkl-removal/bkl-removal Auto-merged fs/fcntl.c Auto-merged fs/ioctl.c Auto-merged include/linux/fs.h Merge made by recursive. drivers/char/tty_io.c | 5 +-- fs/fcntl.c | 65 +++++++++++++++++++++++++++++++++++++++---------- fs/ioctl.c | 25 ++++--------------- fs/nfsd/vfs.c | 5 +++- include/linux/fs.h | 17 +++++++++++++ 5 files changed, 80 insertions(+), 37 deletions(-) Merging ubifs/linux-next $ git merge ubifs/linux-next Merge made by recursive. fs/ubifs/dir.c | 4 ++-- fs/ubifs/file.c | 8 ++++---- fs/ubifs/gc.c | 20 ++++++++++++++++++++ fs/ubifs/journal.c | 2 +- fs/ubifs/super.c | 22 ++++++++-------------- fs/ubifs/ubifs.h | 18 +++++++++--------- 6 files changed, 44 insertions(+), 30 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 Removed drivers/media/dvb/ttpci/fdump.c Removed drivers/scsi/ql1040_fw.h Removed drivers/scsi/ql12160_fw.h Removed drivers/scsi/ql1280_fw.h Removed drivers/scsi/qlogicpti_asm.c Auto-merged firmware/Makefile Auto-merged firmware/WHENCE Auto-merged sound/isa/Kconfig Removed sound/isa/wavefront/yss225.c Merge made by recursive. 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/pda_power.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Merging leds/for-mm $ git merge leds/for-mm Auto-merged drivers/leds/Kconfig Auto-merged drivers/leds/Makefile Merge made by recursive. Documentation/powerpc/dts-bindings/gpio/led.txt | 46 ++++- drivers/leds/Kconfig | 28 +++- drivers/leds/Makefile | 3 + drivers/leds/led-class.c | 21 +++- drivers/leds/leds-dac124s085.c | 150 +++++++++++++++++ drivers/leds/leds-gpio.c | 205 ++++++++++++++++++----- drivers/leds/leds.h | 4 +- drivers/leds/ledtrig-default-on.c | 2 +- drivers/leds/ledtrig-heartbeat.c | 4 +- drivers/leds/ledtrig-ide-disk.c | 3 +- drivers/leds/ledtrig-timer.c | 2 +- include/linux/leds.h | 1 + 12 files changed, 408 insertions(+), 61 deletions(-) create mode 100644 drivers/leds/leds-dac124s085.c Merging backlight/for-mm $ git merge backlight/for-mm Merge made by recursive. drivers/video/backlight/mbp_nvidia_bl.c | 191 +++++++++++++++++++++++++------ 1 files changed, 155 insertions(+), 36 deletions(-) Merging kgdb/kgdb-next $ git merge kgdb/kgdb-next Merge made by recursive. include/linux/kgdb.h | 42 ++++++++++++++++++++++++++++++++++++++++-- kernel/kgdb.c | 6 +++--- 2 files changed, 43 insertions(+), 5 deletions(-) Merging slab/for-next $ git merge slab/for-next Auto-merged include/linux/slub_def.h CONFLICT (content): Merge conflict in include/linux/slub_def.h Auto-merged mm/slob.c CONFLICT (content): Merge conflict in mm/slob.c Auto-merged mm/slub.c CONFLICT (content): Merge conflict in mm/slub.c Recorded preimage for 'include/linux/slub_def.h' Recorded preimage for 'mm/slub.c' Resolved 'mm/slob.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'include/linux/slub_def.h'. Recorded resolution for 'mm/slub.c'. Created commit f05c870: Merge commit 'slab/for-next' $ git diff -M --stat --summary HEAD^.. include/linux/slub_def.h | 40 ++++++++++++++++++---------------- mm/slob.c | 40 ++++++++++++++++++++++------------- mm/slub.c | 52 +++++++++------------------------------------ 3 files changed, 57 insertions(+), 75 deletions(-) Merging uclinux/for-next $ git merge uclinux/for-next Already up-to-date. Merging md/for-next $ git merge md/for-next Already up-to-date. Merging kmemcheck/auto-kmemcheck-next $ git merge kmemcheck/auto-kmemcheck-next Auto-merged MAINTAINERS CONFLICT (content): Merge conflict in MAINTAINERS Auto-merged arch/x86/Kconfig.debug Auto-merged arch/x86/Makefile Auto-merged arch/x86/include/asm/pgtable_64.h Auto-merged arch/x86/kernel/head_32.S Auto-merged arch/x86/kernel/traps.c Auto-merged arch/x86/mm/Makefile Auto-merged arch/x86/mm/fault.c CONFLICT (content): Merge conflict in arch/x86/mm/fault.c Auto-merged arch/x86/mm/init_32.c Auto-merged arch/x86/mm/init_64.c Auto-merged include/linux/interrupt.h Auto-merged include/linux/slab_def.h Auto-merged init/main.c Auto-merged kernel/fork.c Auto-merged kernel/softirq.c Auto-merged kernel/sysctl.c Auto-merged mm/slab.c Auto-merged mm/slub.c Resolved 'MAINTAINERS' using previous resolution. Resolved 'arch/x86/mm/fault.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit b86497c: 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/pgtable.h | 4 +- arch/x86/include/asm/pgtable_32.h | 6 + arch/x86/include/asm/pgtable_64.h | 6 + arch/x86/include/asm/string_32.h | 8 + arch/x86/include/asm/string_64.h | 8 + arch/x86/kernel/head_32.S | 2 +- arch/x86/kernel/process.c | 2 +- arch/x86/kernel/stacktrace.c | 7 + arch/x86/kernel/traps.c | 5 + arch/x86/mm/Makefile | 2 + arch/x86/mm/fault.c | 18 +- arch/x86/mm/init_32.c | 4 +- arch/x86/mm/init_64.c | 2 +- arch/x86/mm/kmemcheck/Makefile | 1 + arch/x86/mm/kmemcheck/error.c | 229 +++++++++++ arch/x86/mm/kmemcheck/error.h | 15 + arch/x86/mm/kmemcheck/kmemcheck.c | 752 ++++++++++++++++++++++++++++++++++++ arch/x86/mm/kmemcheck/opcode.c | 90 +++++ arch/x86/mm/kmemcheck/opcode.h | 10 + arch/x86/mm/kmemcheck/pte.c | 22 + arch/x86/mm/kmemcheck/pte.h | 10 + arch/x86/mm/kmemcheck/shadow.c | 124 ++++++ arch/x86/mm/kmemcheck/shadow.h | 16 + include/linux/gfp.h | 3 +- include/linux/interrupt.h | 14 + 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/softirq.c | 11 + kernel/sysctl.c | 11 + mm/Makefile | 1 + mm/kmemcheck.c | 103 +++++ mm/slab.c | 101 +---- mm/slub.c | 20 +- 44 files changed, 1981 insertions(+), 103 deletions(-) create mode 100644 Documentation/kmemcheck.txt create mode 100644 arch/x86/include/asm/kmemcheck.h 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 hdlc/hdlc-next $ git merge hdlc/hdlc-next Already up-to-date. Merging drm/drm-next $ git merge drm/drm-next Already up-to-date. Merging voltage/for-next $ git merge voltage/for-next Merge made by recursive. Documentation/ABI/testing/sysfs-class-regulator | 57 ++++++++++-- drivers/regulator/Kconfig | 6 +- drivers/regulator/bq24022.c | 9 +-- drivers/regulator/core.c | 107 +++++++++++++++------- drivers/regulator/da903x.c | 3 +- drivers/regulator/fixed.c | 3 +- drivers/regulator/pcf50633-regulator.c | 3 +- drivers/regulator/virtual.c | 14 ++- drivers/regulator/wm8350-regulator.c | 6 +- drivers/regulator/wm8400-regulator.c | 2 +- include/linux/regulator/bq24022.h | 3 + include/linux/regulator/consumer.h | 2 + include/linux/regulator/driver.h | 53 +++++++++++- include/linux/regulator/fixed.h | 3 + 14 files changed, 209 insertions(+), 62 deletions(-) Merging security-testing/next $ git merge security-testing/next Auto-merged MAINTAINERS Merge made by recursive. MAINTAINERS | 1 + security/selinux/hooks.c | 83 +++++++++++++++++++++++------------ security/selinux/include/objsec.h | 2 - security/selinux/include/security.h | 8 +++ 4 files changed, 64 insertions(+), 30 deletions(-) Merging lblnet/master $ git merge lblnet/master Already up-to-date. Merging quilt/ttydev $ git merge quilt/ttydev Merge made by recursive. drivers/serial/8250_pci.c | 6 ++++++ drivers/serial/Kconfig | 2 +- drivers/serial/jsm/jsm_driver.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) Merging agp/agp-next $ git merge agp/agp-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 Auto-merged arch/alpha/kernel/irq.c Auto-merged arch/arm/kernel/irq.c Auto-merged arch/blackfin/kernel/irqchip.c Auto-merged arch/ia64/kernel/irq.c Auto-merged arch/parisc/kernel/irq.c Auto-merged arch/powerpc/kernel/irq.c Auto-merged arch/sparc/kernel/irq_64.c Auto-merged arch/sparc/kernel/time_64.c Auto-merged drivers/pci/intr_remapping.c Auto-merged include/linux/irq.h Auto-merged include/linux/irqnr.h Auto-merged kernel/irq/handle.c CONFLICT (content): Merge conflict in kernel/irq/handle.c Resolved 'kernel/irq/handle.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit b68f16e: Merge commit 'sparseirq/auto-sparseirq-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/irq.h | 10 +--------- include/linux/irqnr.h | 8 ++++++-- include/linux/kernel_stat.h | 13 ++++++++----- kernel/irq/handle.c | 5 +++-- 27 files changed, 46 insertions(+), 43 deletions(-) Merging iommu/auto-iommu-next $ git merge iommu/auto-iommu-next Removed arch/ia64/dig/dig_vtd_iommu.c Auto-merged arch/ia64/kernel/Makefile Auto-merged arch/x86/include/asm/dma-mapping.h CONFLICT (content): Merge conflict in arch/x86/include/asm/dma-mapping.h Resolved 'arch/x86/include/asm/dma-mapping.h' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit 26b8dca: 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 | 10 ++ arch/ia64/kernel/machvec.c | 8 +- arch/ia64/kernel/pci-dma.c | 52 ++++--- arch/ia64/kernel/pci-swiotlb.c | 23 ++- 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/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 ++-- arch/x86/kernel/pci-swiotlb_64.c | 19 +-- drivers/pci/intel-iommu.c | 31 +++- include/linux/dma-mapping.h | 48 ++++++ include/linux/intel-iommu.h | 6 +- include/linux/swiotlb.h | 41 +++--- lib/swiotlb.c | 88 +++++------ 30 files changed, 582 insertions(+), 821 deletions(-) delete mode 100644 arch/ia64/dig/dig_vtd_iommu.c create mode 100644 arch/ia64/kernel/dma-mapping.c Merging uwb/for-upstream $ git merge uwb/for-upstream Merge made by recursive. drivers/usb/host/whci/asl.c | 9 +++++++-- drivers/usb/host/whci/hw.c | 15 +++++++++++++++ drivers/usb/host/whci/pzl.c | 9 +++++++-- drivers/usb/host/whci/whcd.h | 1 + drivers/usb/wusbcore/devconnect.c | 1 + drivers/usb/wusbcore/rh.c | 3 +++ drivers/uwb/allocator.c | 1 - drivers/uwb/drp.c | 4 ++-- drivers/uwb/rsv.c | 21 +++++++++++++++------ 9 files changed, 51 insertions(+), 13 deletions(-) Merging watchdog/master $ git merge watchdog/master Auto-merged arch/powerpc/configs/86xx/gef_sbc610_defconfig Merge made by recursive. drivers/watchdog/cpwd.c | 17 ++++++++--------- drivers/watchdog/riowd.c | 15 +++++++-------- 2 files changed, 15 insertions(+), 17 deletions(-) Merging proc/proc $ git merge proc/proc Removed fs/proc/inode-alloc.txt Auto-merged include/linux/magic.h Auto-merged kernel/exit.c Auto-merged security/selinux/hooks.c CONFLICT (content): Merge conflict in security/selinux/hooks.c Resolved 'security/selinux/hooks.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit b4ea603: Merge commit 'proc/proc' $ git diff -M --stat --summary HEAD^.. fs/proc/Makefile | 1 + fs/proc/automount.c | 28 +++++ fs/proc/base.c | 26 +++--- fs/proc/generic.c | 62 ++++++++---- fs/proc/inode-alloc.txt | 14 --- fs/proc/inode.c | 2 +- fs/proc/internal.h | 15 +++- fs/proc/proc_net.c | 235 ++++++++++++++++++++++++++++++++---------- include/linux/magic.h | 1 + include/linux/proc_fs.h | 10 +- include/net/net_namespace.h | 1 + kernel/exit.c | 2 +- security/selinux/hooks.c | 29 ++++- 13 files changed, 309 insertions(+), 117 deletions(-) create mode 100644 fs/proc/automount.c delete mode 100644 fs/proc/inode-alloc.txt $ git am -3 ../patches/0001-proc-fixup-for-pppoe-changes.patch Applying: proc: fixup for pppoe changes $ git reset HEAD^ drivers/net/pppoe.c: locally modified drivers/net/pppol2tp.c: locally modified $ git add . $ git commit -v -a --amend Created commit 4b91772: Merge commit 'proc/proc' Merging bdev/master $ git merge bdev/master Already up-to-date. Merging dwmw2-iommu/master $ git merge dwmw2-iommu/master Auto-merged drivers/pci/intel-iommu.c CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c Auto-merged include/linux/dma_remapping.h CONFLICT (content): Merge conflict in include/linux/dma_remapping.h Auto-merged include/linux/intel-iommu.h Resolved 'drivers/pci/intel-iommu.c' using previous resolution. Resolved 'include/linux/dma_remapping.h' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit 57758a4: Merge commit 'dwmw2-iommu/master' $ git diff -M --stat --summary HEAD^.. Merging cputime/cputime $ git merge cputime/cputime Already up-to-date. Merging osd/linux-next $ git merge osd/linux-next Auto-merged MAINTAINERS Auto-merged drivers/scsi/Kconfig Auto-merged fs/Kconfig Auto-merged fs/Makefile Merge made by recursive. Documentation/devices.txt | 6 + Documentation/filesystems/exofs.txt | 181 ++++ Documentation/scsi/osd.txt | 198 +++++ MAINTAINERS | 10 + drivers/scsi/Kconfig | 2 + drivers/scsi/Makefile | 2 + 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/scsi_scan.c | 1 + fs/Kconfig | 2 + fs/Makefile | 1 + fs/exofs/BUGS | 6 + fs/exofs/Kbuild | 30 + fs/exofs/Kconfig | 13 + fs/exofs/common.h | 157 ++++ fs/exofs/dir.c | 643 ++++++++++++++ fs/exofs/exofs.h | 242 +++++ fs/exofs/file.c | 82 ++ fs/exofs/inode.c | 889 +++++++++++++++++++ fs/exofs/mkexofs.c | 606 +++++++++++++ fs/exofs/namei.c | 338 +++++++ fs/exofs/osd.c | 395 +++++++++ fs/exofs/super.c | 522 +++++++++++ fs/exofs/symlink.c | 57 ++ 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 | 1 + 36 files changed, 8375 insertions(+), 0 deletions(-) create mode 100644 Documentation/filesystems/exofs.txt 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 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/mkexofs.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 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 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-merged drivers/net/wan/farsync.c Auto-merged kernel/trace/ftrace.c Merge made by recursive. CREDITS | 4 ++-- Documentation/cgroups/cgroups.txt | 10 +++++----- Documentation/cgroups/cpusets.txt | 12 ++++++------ Documentation/cgroups/devices.txt | 2 +- Documentation/cgroups/memory.txt | 2 +- Documentation/filesystems/ext3.txt | 14 ++++++++++++-- arch/arm/mach-netx/include/mach/netx-regs.h | 2 +- drivers/base/sys.c | 2 +- drivers/input/mouse/gpio_mouse.c | 2 +- drivers/isdn/mISDN/l1oip_codec.c | 2 +- drivers/net/skfp/h/hwmtm.h | 2 +- drivers/net/wan/farsync.c | 2 +- drivers/usb/wusbcore/security.c | 2 +- fs/proc/nommu.c | 2 +- mm/page_alloc.c | 2 +- 15 files changed, 36 insertions(+), 26 deletions(-) Merging squashfs/master $ git merge squashfs/master Already up-to-date. Merging omap/for-next $ git merge omap/for-next Already up-to-date. Merging kmemleak/kmemleak $ git merge kmemleak/kmemleak Auto-merged Documentation/kernel-parameters.txt Auto-merged MAINTAINERS Auto-merged arch/arm/kernel/vmlinux.lds.S Auto-merged arch/x86/kernel/vmlinux_32.lds.S Auto-merged arch/x86/kernel/vmlinux_64.lds.S Auto-merged include/linux/percpu.h Auto-merged include/linux/slab.h CONFLICT (content): Merge conflict in include/linux/slab.h Auto-merged init/main.c CONFLICT (content): Merge conflict in init/main.c Auto-merged kernel/module.c Auto-merged lib/Kconfig.debug Auto-merged mm/Makefile Auto-merged mm/page_alloc.c Auto-merged mm/slab.c CONFLICT (content): Merge conflict in mm/slab.c Auto-merged mm/slob.c CONFLICT (content): Merge conflict in mm/slob.c Auto-merged mm/slub.c CONFLICT (content): Merge conflict in mm/slub.c Auto-merged mm/vmalloc.c CONFLICT (content): Merge conflict in mm/vmalloc.c Resolved 'include/linux/slab.h' using previous resolution. Resolved 'init/main.c' using previous resolution. Resolved 'mm/slab.c' using previous resolution. Resolved 'mm/slob.c' using previous resolution. Resolved 'mm/slub.c' using previous resolution. Resolved 'mm/vmalloc.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit 2120d2d: 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 | 1465 +++++++++++++++++++++++++++++++++++ mm/page_alloc.c | 11 + mm/slab.c | 32 +- mm/slob.c | 7 + mm/slub.c | 5 +- mm/vmalloc.c | 30 +- 21 files changed, 2015 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 Removed drivers/staging/frontier/frontier_compat.h Removed drivers/staging/frontier/surface_sysfs.h Removed drivers/staging/sxg/saharadbgdownload.h Removed drivers/staging/winbond/bss_f.h Removed drivers/staging/winbond/common.h Removed drivers/staging/winbond/ioctls.h Removed drivers/staging/winbond/mlme_mib.h Removed drivers/staging/winbond/mto_f.h Removed drivers/staging/winbond/os_common.h Removed drivers/staging/winbond/sme_s.h Removed drivers/staging/winbond/wb35_ver.h Merge made by recursive. drivers/staging/Kconfig | 4 + drivers/staging/Makefile | 2 + drivers/staging/agnx/agnx.h | 2 + drivers/staging/agnx/pci.c | 3 +- drivers/staging/altpciechdma/altpciechdma.c | 4 +- drivers/staging/android/binder.c | 16 +- drivers/staging/android/lowmemorykiller.txt | 16 + drivers/staging/android/timed_gpio.c | 2 +- drivers/staging/asus_oled/asus_oled.c | 149 +- drivers/staging/at76_usb/TODO | 9 +- drivers/staging/comedi/Kconfig | 1 + drivers/staging/comedi/comedidev.h | 1 - drivers/staging/comedi/drivers/me4000.c | 2 +- drivers/staging/comedi/drivers/usbdux.c | 6 +- drivers/staging/comedi/drivers/usbduxfast.c | 14 +- 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/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/meilhaus/Kconfig | 21 +- 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/otus/80211core/cwm.c | 6 +- drivers/staging/otus/usbdrv.c | 12 +- drivers/staging/rspiusb/rspiusb.c | 5 +- drivers/staging/rt2860/2860_main_dev.c | 43 +- drivers/staging/rt2860/rt2860.h | 18 - drivers/staging/rt2860/rt_linux.c | 23 +- 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/rt_linux.h | 1 - drivers/staging/rt2870/sta_ioctl.c | 2 +- drivers/staging/slicoss/slic.h | 20 - drivers/staging/slicoss/slicoss.c | 170 +- 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.c | 5124 +++++++++++++++++++++++++++ drivers/staging/sxg/saharadbgdownload.h | 4854 ------------------------- drivers/staging/sxg/saharadbgdownloadB.c | 16 + drivers/staging/sxg/saharadownload.c | 4446 +++++++++++++++++++++++ drivers/staging/sxg/saharadownloadB.c | 16 + drivers/staging/sxg/sxg.c | 2133 +++++++----- drivers/staging/sxg/sxg.h | 905 +++--- drivers/staging/sxg/sxg_ethtool.c | 337 ++ drivers/staging/sxg/sxg_os.h | 100 +- drivers/staging/sxg/sxgdbg.h | 129 +- drivers/staging/sxg/sxghif.h | 1097 ++++--- drivers/staging/sxg/sxghw.h | 1550 +++++---- drivers/staging/sxg/sxgphycode.h | 14 +- drivers/staging/usbip/usbip_common.c | 16 +- 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 | 342 +- drivers/staging/wlan-ng/hfa384x_usb.c | 182 +- drivers/staging/wlan-ng/p80211conv.c | 44 +- drivers/staging/wlan-ng/p80211conv.h | 9 +- drivers/staging/wlan-ng/p80211hdr.h | 29 +- drivers/staging/wlan-ng/p80211ioctl.h | 6 +- drivers/staging/wlan-ng/p80211meta.h | 15 - drivers/staging/wlan-ng/p80211metamib.h | 28 - drivers/staging/wlan-ng/p80211metamsg.h | 28 - drivers/staging/wlan-ng/p80211metastruct.h | 30 +- drivers/staging/wlan-ng/p80211mgmt.h | 26 +- drivers/staging/wlan-ng/p80211msg.h | 10 +- drivers/staging/wlan-ng/p80211netdev.c | 59 +- drivers/staging/wlan-ng/p80211netdev.h | 5 +- drivers/staging/wlan-ng/p80211req.c | 10 - drivers/staging/wlan-ng/p80211req.h | 12 - drivers/staging/wlan-ng/p80211types.h | 38 +- drivers/staging/wlan-ng/p80211wext.c | 95 +- drivers/staging/wlan-ng/prism2mgmt.c | 29 - drivers/staging/wlan-ng/prism2mgmt.h | 15 - drivers/staging/wlan-ng/prism2mib.c | 58 - drivers/staging/wlan-ng/prism2sta.c | 109 +- drivers/staging/wlan-ng/prism2usb.c | 16 - drivers/staging/wlan-ng/wlan_compat.h | 25 - include/linux/connector.h | 4 +- include/linux/dst.h | 587 +++ 125 files changed, 22703 insertions(+), 11042 deletions(-) create mode 100644 drivers/staging/android/lowmemorykiller.txt 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/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.c delete mode 100644 drivers/staging/sxg/saharadbgdownload.h create mode 100644 drivers/staging/sxg/saharadbgdownloadB.c create mode 100644 drivers/staging/sxg/saharadownload.c create mode 100644 drivers/staging/sxg/saharadownloadB.c create mode 100644 drivers/staging/sxg/sxg_ethtool.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 create mode 100644 include/linux/dst.h Merging scsi-post-merge/master $ git merge scsi-post-merge/master Already up-to-date.