diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-08-01 16:10:49 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-08-01 16:10:49 +1000 |
| commit | 6f36f3d6ab2b3e0daf12b4f2f073291fbd3471e6 (patch) | |
| tree | 1d1bb09afcfaccf9a94390ae8a9fe74a7eab54eb | |
| parent | 5f32887c074dd339e8bda81bb298ad645219ed87 (diff) | |
Add linux-next specific files for 20080801next-20080801
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/Trees | 108 | ||||
| -rw-r--r-- | Next/merge.log | 2700 | ||||
| -rw-r--r-- | Next/quilt-import.log | 80 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 2889 insertions, 0 deletions
diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..f0754e16b30b --- /dev/null +++ b/Next/Trees @@ -0,0 +1,108 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git#master +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +scsi-rc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git#master +net-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git#master +sparc-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-linus +arm-current git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#master +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#for-linus +wireless-current git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes.git#master +driver-core.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver-core.current/ +usb.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-usb.current/ +cpufreq-current git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +md-current git git://neil.brown.name/md#for-2.6.26 +driver-core quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-driver-core/ +usb quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-usb/ +tip-core git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-core-next +cpus4096 git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-cpus4096-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-ftrace-next +genirq git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-genirq-next +safe-poison-pointers git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-safe-poison-pointers-next +sched git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-sched-next +stackprotector git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-stackprotector-next +timers git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-timers-next +x86 git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-x86-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#linux-next +device-mapper quilt http://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/editing/ +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#mm +i2c quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ +kernel-doc quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ +avr32 git git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git#avr32-arch +s390 git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git#features +sh git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#master +jfs git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#next +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next.git#master +ide quilt http://kernel.org/pub/linux/kernel/people/bart/pata-2.6/patches/ +libata git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +xfs git git://oss.sgi.com:8090/xfs/xfs-2.6.git#master +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6.git#for-linus +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git#for-next +hwmon git git://lm-sensors.org/kernel/mhoffman/hwmon-2.6.git#testing +ubi git git://git.infradead.org/~dedekind/ubi-2.6.git#linux-next +kvm git git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git#master +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git#next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git#master +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git#test +tests git git://git.kernel.org/pub/scm/linux/kernel/git/sam/test.git#master +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git#linux-next +m68k quilt http://www.kernel.org/pub/linux/kernel/people/geert/linux-m68k-patches-2.6/ +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#next +4xx git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next +async_tx git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git#next +udf git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6.git#for_next +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git#master +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git#master +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#powerpc-next +mtd git git://git.infradead.org/mtd-2.6.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6#master +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-next +arm git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#devel +cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/ +cifs git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git#master +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git#next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git#master +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +semaphore git git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc.git#semaphore +semaphore-removal git git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc.git#semaphore-removal +bkl-removal git git://git.lwn.net/linux-2.6.git#bkl-removal +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial-2.6.git#next +ubifs git git://git.infradead.org/~dedekind/ubifs-2.6.git#linux-next +lsm git git://gitkernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next +block git git://git.kernel.dk/linux-2.6-block.git#for-next +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git#master +battery git git://git.infradead.org/battery-2.6.git#master +leds git git://git.o-hand.com/linux-rpurdie-leds#for-mm +backlight git git://git.o-hand.com/linux-rpurdie-backlight#for-mm +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb#kgdb-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +cris git git://www.jni.nu/cris.git#for-next +kmemcheck git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-kmemcheck-next +generic-ipi git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-generic-ipi-next +mips git git://git.linux-mips.org/pub/scm/upstream-sfr.git#mips-for-linux-next +mfd git git://git.o-hand.com/linux-mfd#for-next +hdlc git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6.git#hdlc-next +drm git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git#drm-next +voltage git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git#reg-for-linus +security-testing git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git#next +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master +ttydev quilt http://www.linux.org.uk/~alan/ttydev/ +agp git git://git.kernel.org//pub/scm/linux/kernel/git/airlied/agp-2.6.git#agp-next diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..289525cb8bf0 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2700 @@ +$ git checkout master +Already on "master" +$ git reset --hard stable +HEAD is now at 94ad374 Fix off-by-one error in iov_iter_advance() +Merging origin/master +$ git merge origin/master +Already up-to-date. +$ git am -3 ../patches/0001-Revert-Merge-branch-x86-iommu-of-git-git.kernel.patch +Applying Revert "Merge branch 'x86/iommu' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into for-linus" +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Merge made by recursive. + block/scsi_ioctl.c | 2 +- + drivers/scsi/hptiop.c | 7 +++++++ + drivers/scsi/scsi_transport_spi.c | 8 +++++--- + drivers/scsi/ses.c | 18 ++++++++++++++---- + 4 files changed, 27 insertions(+), 8 deletions(-) +Merging net-current/master +$ git merge net-current/master +Merge made by recursive. + arch/arm/mach-kirkwood/rd88f6281-setup.c | 3 + + arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 3 + + arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 3 + + arch/arm/mach-orion5x/wnr854t-setup.c | 3 + + arch/arm/mach-orion5x/wrt350n-v2-setup.c | 3 + + drivers/atm/iphase.c | 40 ++-- + drivers/bluetooth/hci_usb.c | 7 + + drivers/isdn/gigaset/isocdata.c | 5 +- + drivers/isdn/hysdn/hysdn_pof.h | 2 +- + drivers/net/Kconfig | 4 +- + drivers/net/bfin_mac.c | 111 +++++-- + drivers/net/cxgb3/t3_hw.c | 2 +- + drivers/net/ehea/ehea_main.c | 4 +- + drivers/net/enc28j60.c | 6 +- + drivers/net/forcedeth.c | 64 ++++- + drivers/net/irda/act200l-sir.c | 10 +- + drivers/net/irda/actisys-sir.c | 2 +- + drivers/net/irda/ali-ircc.c | 246 ++++++++-------- + drivers/net/irda/donauboe.c | 68 ++-- + drivers/net/irda/girbil-sir.c | 12 +- + drivers/net/irda/irda-usb.c | 92 +++--- + drivers/net/irda/irtty-sir.c | 10 +- + drivers/net/irda/kingsun-sir.c | 2 +- + drivers/net/irda/litelink-sir.c | 8 +- + drivers/net/irda/ma600-sir.c | 16 +- + drivers/net/irda/mcp2120-sir.c | 12 +- + drivers/net/irda/nsc-ircc.c | 119 ++++---- + drivers/net/irda/nsc-ircc.h | 3 + + drivers/net/irda/old_belkin-sir.c | 8 +- + drivers/net/irda/sir_dev.c | 63 ++-- + drivers/net/irda/sir_dongle.c | 2 +- + drivers/net/irda/smsc-ircc2.c | 120 ++++---- + drivers/net/irda/tekram-sir.c | 10 +- + drivers/net/irda/toim3232-sir.c | 10 +- + drivers/net/irda/via-ircc.c | 80 +++--- + drivers/net/irda/vlsi_ir.c | 92 +++--- + drivers/net/irda/vlsi_ir.h | 2 +- + drivers/net/irda/w83977af_ir.c | 62 ++-- + drivers/net/mv643xx_eth.c | 358 ++++++++++++++-------- + drivers/net/ne.c | 6 +- + drivers/net/s2io.c | 29 ++- + drivers/net/sh_eth.c | 202 ++++++++++--- + drivers/net/sh_eth.h | 426 +++++++++++++++++++------- + drivers/net/skfp/smt.c | 13 +- + drivers/net/tg3.c | 67 ++--- + drivers/net/usb/dm9601.c | 52 +++- + drivers/net/wd.c | 2 +- + include/linux/netfilter/nf_conntrack_tcp.h | 3 + + lib/random32.c | 48 ++-- + net/atm/mpc.c | 22 +- + net/bridge/br_device.c | 9 +- + net/bridge/br_if.c | 3 + + net/bridge/br_netfilter.c | 65 +++-- + net/bridge/br_private.h | 6 + + net/ipv4/netfilter/ipt_CLUSTERIP.c | 5 +- + net/ipv4/netfilter/ipt_recent.c | 2 +- + net/netfilter/nf_conntrack_proto_tcp.c | 29 ++- + net/netfilter/xt_hashlimit.c | 4 +- + 58 files changed, 1663 insertions(+), 997 deletions(-) +Merging sparc-current/master +$ git merge sparc-current/master +Removed arch/sparc/include/asm/of_platform_32.h +Removed arch/sparc/include/asm/of_platform_64.h +Merge made by recursive. + arch/sparc/include/asm/futex_64.h | 2 +- + arch/sparc/include/asm/irq_64.h | 3 ++ + arch/sparc/include/asm/of_platform.h | 26 ++++++++++++++--- + arch/sparc/include/asm/of_platform_32.h | 24 ---------------- + arch/sparc/include/asm/of_platform_64.h | 25 ----------------- + arch/sparc/include/asm/ptrace_64.h | 8 +++--- + arch/sparc64/kernel/of_device.c | 5 --- + arch/sparc64/kernel/process.c | 46 +++++++++++++++++++++++++------ + arch/sparc64/mm/ultra.S | 7 +++++ + drivers/video/console/.gitignore | 2 + + 10 files changed, 75 insertions(+), 73 deletions(-) + delete mode 100644 arch/sparc/include/asm/of_platform_32.h + delete mode 100644 arch/sparc/include/asm/of_platform_64.h + create mode 100644 drivers/video/console/.gitignore +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Merge made by recursive. + include/sound/soc-dapm.h | 3 ++ + sound/soc/fsl/fsl_dma.c | 7 ++++- + sound/soc/fsl/fsl_ssi.c | 74 +++++++++++++++++++++++++++++++++++++++------ + sound/soc/pxa/poodle.c | 8 +---- + sound/soc/pxa/tosa.c | 1 - + sound/soc/soc-dapm.c | 1 + + 6 files changed, 76 insertions(+), 18 deletions(-) +Merging arm-current/master +$ git merge arm-current/master +Auto-merged MAINTAINERS +Merge made by recursive. + MAINTAINERS | 6 + + arch/arm/mach-at91/board-qil-a9260.c | 2 +- + arch/arm/mach-at91/board-sam9g20ek.c | 2 +- + arch/arm/mach-at91/board-usb-a9260.c | 2 +- + arch/arm/mach-at91/board-usb-a9263.c | 2 +- + arch/arm/mach-imx/clock.c | 5 + + arch/arm/mach-imx/generic.c | 1 - + arch/arm/mach-imx/mx1ads.c | 4 +- + arch/arm/mm/Kconfig | 10 ++- + arch/arm/mm/cache-xsc3l2.c | 182 ++++++++++++++++++++++++++++++++++ + arch/arm/mm/proc-xsc3.S | 22 ---- + 11 files changed, 208 insertions(+), 30 deletions(-) + create mode 100644 arch/arm/mm/cache-xsc3l2.c +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Auto-merged arch/x86/kernel/pci-gart_64.c +CONFLICT (content): Merge conflict in arch/x86/kernel/pci-gart_64.c +Recorded preimage for 'arch/x86/kernel/pci-gart_64.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/x86/kernel/pci-gart_64.c'. +Created commit c2aa7c6: Merge commit 'pci-current/for-linus' +$ git diff -M --stat --summary HEAD^.. + arch/x86/kernel/pci-gart_64.c | 24 ++++++++++++++---------- + drivers/pci/quirks.c | 5 ++++- + include/linux/pci.h | 10 ++++++---- + kernel/dma-coherent.c | 10 +++++----- + 4 files changed, 29 insertions(+), 20 deletions(-) +Merging wireless-current/master +$ git merge wireless-current/master +Already up-to-date. +Merging kbuild-current/master +$ git merge kbuild-current/master +Merge made by recursive. + Makefile | 2 +- + init/Kconfig | 2 +- + scripts/genksyms/genksyms.c | 2 + + scripts/genksyms/lex.c_shipped | 133 +++++++++++++++++++++----------- + scripts/genksyms/lex.l | 2 + + scripts/genksyms/parse.c_shipped | 144 +++++++++++++++++----------------- + scripts/genksyms/parse.y | 2 +- + scripts/kconfig/lex.zconf.c_shipped | 86 +++++++++++++++++---- + scripts/kconfig/zconf.l | 1 + + scripts/ver_linux | 1 - + 10 files changed, 238 insertions(+), 137 deletions(-) +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Merge made by recursive. + Documentation/ja_JP/SubmitChecklist | 111 ++++++++++++++++++++++++++ + Documentation/kobject.txt | 4 + + arch/mips/kernel/rtlx.c | 4 +- + arch/mips/sibyte/common/sb_tbprof.c | 3 +- + arch/x86/kernel/cpuid.c | 4 +- + arch/x86/kernel/msr.c | 4 +- + block/bsg.c | 3 +- + drivers/base/core.c | 7 ++- + drivers/base/driver.c | 3 - + drivers/block/aoe/aoechr.c | 6 +- + drivers/block/paride/pg.c | 5 +- + drivers/block/paride/pt.c | 10 +-- + drivers/block/pktcdvd.c | 5 +- + drivers/char/bsr.c | 5 +- + drivers/char/dsp56k.c | 4 +- + drivers/char/ip2/ip2main.c | 12 ++-- + drivers/char/ipmi/ipmi_devintf.c | 2 +- + drivers/char/istallion.c | 5 +- + drivers/char/lp.c | 4 +- + drivers/char/mem.c | 6 +- + drivers/char/misc.c | 4 +- + drivers/char/pcmcia/cm4000_cs.c | 2 +- + drivers/char/pcmcia/cm4040_cs.c | 3 +- + drivers/char/ppdev.c | 5 +- + drivers/char/raw.c | 7 +- + drivers/char/snsc.c | 4 +- + drivers/char/stallion.c | 4 +- + drivers/char/tty_io.c | 12 +-- + drivers/char/vc_screen.c | 12 ++-- + drivers/char/viotape.c | 8 +- + drivers/char/vt.c | 14 ++-- + drivers/char/xilinx_hwicap/xilinx_hwicap.c | 3 +- + drivers/dca/dca-sysfs.c | 8 +- + drivers/hid/hidraw.c | 5 +- + drivers/hwmon/hwmon.c | 4 +- + drivers/i2c/i2c-dev.c | 6 +- + drivers/ide/ide-probe.c | 4 +- + drivers/ide/ide-tape.c | 11 +-- + drivers/ieee1394/dv1394.c | 8 +- + drivers/ieee1394/raw1394.c | 8 +- + drivers/ieee1394/video1394.c | 5 +- + drivers/infiniband/core/cm.c | 6 +- + drivers/infiniband/core/user_mad.c | 12 ++-- + drivers/infiniband/core/uverbs_main.c | 9 +-- + drivers/infiniband/hw/ipath/ipath_file_ops.c | 2 +- + drivers/isdn/capi/capi.c | 3 +- + drivers/leds/led-class.c | 4 +- + drivers/macintosh/adb.c | 3 +- + drivers/media/dvb/dvb-core/dvbdev.c | 2 +- + drivers/misc/phantom.c | 6 +- + drivers/mtd/mtdchar.c | 10 +-- + drivers/net/ppp_generic.c | 4 +- + drivers/net/wan/cosa.c | 4 +- + drivers/net/wireless/mac80211_hwsim.c | 6 +- + drivers/power/power_supply_core.c | 4 +- + drivers/s390/char/raw3270.c | 14 ++-- + drivers/s390/char/tape_class.c | 6 +- + drivers/s390/char/vmlogrdr.c | 8 +- + drivers/s390/char/vmur.c | 5 +- + drivers/scsi/ch.c | 6 +- + drivers/scsi/dpt_i2o.c | 2 +- + drivers/scsi/osst.c | 3 +- + drivers/scsi/sg.c | 10 +-- + drivers/scsi/st.c | 11 +-- + drivers/spi/spidev.c | 7 +- + drivers/uio/uio.c | 6 +- + drivers/usb/core/devio.c | 6 +- + drivers/usb/core/file.c | 6 +- + drivers/usb/core/hcd.c | 5 +- + drivers/usb/gadget/printer.c | 4 +- + drivers/usb/misc/phidgetkit.c | 5 +- + drivers/usb/misc/phidgetmotorcontrol.c | 5 +- + drivers/usb/misc/phidgetservo.c | 5 +- + drivers/usb/mon/mon_bin.c | 6 +- + drivers/video/console/fbcon.c | 4 +- + drivers/video/display/display-sysfs.c | 9 +-- + drivers/video/fbmem.c | 5 +- + fs/coda/psdev.c | 5 +- + include/linux/device.h | 5 +- + include/linux/sysfs.h | 4 +- + lib/kobject.c | 21 ++---- + sound/core/init.c | 6 +- + sound/core/sound.c | 5 +- + sound/oss/soundcard.c | 15 ++-- + sound/sound_core.c | 5 +- + 85 files changed, 342 insertions(+), 281 deletions(-) + create mode 100644 Documentation/ja_JP/SubmitChecklist +Merging quilt/usb.current +$ git merge quilt/usb.current +Removed Documentation/usb/auerswald.txt +Auto-merged MAINTAINERS +Removed drivers/usb/misc/auerswald.c +Merge made by recursive. + Documentation/devices.txt | 3 - + Documentation/ioctl-number.txt | 1 - + Documentation/usb/auerswald.txt | 30 - + MAINTAINERS | 12 +- + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/usb/Kconfig | 4 +- + drivers/usb/class/cdc-acm.c | 8 +- + drivers/usb/class/usblp.c | 18 +- + drivers/usb/core/driver.c | 3 +- + drivers/usb/core/message.c | 2 +- + drivers/usb/core/urb.c | 95 ++- + drivers/usb/gadget/Kconfig | 10 + + drivers/usb/gadget/dummy_hcd.c | 5 +- + drivers/usb/gadget/gadget_chips.h | 6 + + drivers/usb/host/ohci-hub.c | 7 + + drivers/usb/misc/Kconfig | 10 - + drivers/usb/misc/Makefile | 1 - + drivers/usb/misc/auerswald.c | 2152 ---------------------------------- + drivers/usb/musb/Kconfig | 176 +++ + drivers/usb/musb/Makefile | 86 ++ + drivers/usb/musb/cppi_dma.c | 1540 ++++++++++++++++++++++++ + drivers/usb/musb/cppi_dma.h | 133 +++ + drivers/usb/musb/davinci.c | 462 ++++++++ + drivers/usb/musb/davinci.h | 100 ++ + drivers/usb/musb/musb_core.c | 2266 ++++++++++++++++++++++++++++++++++++ + drivers/usb/musb/musb_core.h | 517 ++++++++ + drivers/usb/musb/musb_debug.h | 66 ++ + drivers/usb/musb/musb_dma.h | 172 +++ + drivers/usb/musb/musb_gadget.c | 2033 ++++++++++++++++++++++++++++++++ + drivers/usb/musb/musb_gadget.h | 108 ++ + drivers/usb/musb/musb_gadget_ep0.c | 981 ++++++++++++++++ + drivers/usb/musb/musb_host.c | 2170 ++++++++++++++++++++++++++++++++++ + drivers/usb/musb/musb_host.h | 110 ++ + drivers/usb/musb/musb_io.h | 115 ++ + drivers/usb/musb/musb_procfs.c | 830 +++++++++++++ + drivers/usb/musb/musb_regs.h | 300 +++++ + drivers/usb/musb/musb_virthub.c | 425 +++++++ + drivers/usb/musb/musbhsdma.c | 433 +++++++ + drivers/usb/musb/omap2430.c | 324 +++++ + drivers/usb/musb/omap2430.h | 56 + + drivers/usb/musb/tusb6010.c | 1151 ++++++++++++++++++ + drivers/usb/musb/tusb6010.h | 402 +++++++ + drivers/usb/musb/tusb6010_omap.c | 719 ++++++++++++ + drivers/usb/serial/ftdi_sio.c | 5 + + drivers/usb/serial/ftdi_sio.h | 6 + + drivers/usb/serial/usb-serial.c | 7 +- + drivers/usb/storage/transport.c | 17 +- + drivers/usb/storage/unusual_devs.h | 18 +- + include/linux/usb.h | 6 + + include/linux/usb/musb.h | 70 ++ + include/linux/usb/serial.h | 3 +- + 52 files changed, 15939 insertions(+), 2238 deletions(-) + delete mode 100644 Documentation/usb/auerswald.txt + delete mode 100644 drivers/usb/misc/auerswald.c + create mode 100644 drivers/usb/musb/Kconfig + create mode 100644 drivers/usb/musb/Makefile + create mode 100644 drivers/usb/musb/cppi_dma.c + create mode 100644 drivers/usb/musb/cppi_dma.h + create mode 100644 drivers/usb/musb/davinci.c + create mode 100644 drivers/usb/musb/davinci.h + create mode 100644 drivers/usb/musb/musb_core.c + create mode 100644 drivers/usb/musb/musb_core.h + create mode 100644 drivers/usb/musb/musb_debug.h + create mode 100644 drivers/usb/musb/musb_dma.h + create mode 100644 drivers/usb/musb/musb_gadget.c + create mode 100644 drivers/usb/musb/musb_gadget.h + create mode 100644 drivers/usb/musb/musb_gadget_ep0.c + create mode 100644 drivers/usb/musb/musb_host.c + create mode 100644 drivers/usb/musb/musb_host.h + create mode 100644 drivers/usb/musb/musb_io.h + create mode 100644 drivers/usb/musb/musb_procfs.c + create mode 100644 drivers/usb/musb/musb_regs.h + create mode 100644 drivers/usb/musb/musb_virthub.c + create mode 100644 drivers/usb/musb/musbhsdma.c + create mode 100644 drivers/usb/musb/omap2430.c + create mode 100644 drivers/usb/musb/omap2430.h + create mode 100644 drivers/usb/musb/tusb6010.c + create mode 100644 drivers/usb/musb/tusb6010.h + create mode 100644 drivers/usb/musb/tusb6010_omap.c + create mode 100644 include/linux/usb/musb.h +Applying usb: two more functions are needed when CONFIG_PM is not set +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Auto-merged MAINTAINERS +Merge made by recursive. + MAINTAINERS | 2 +- + arch/x86/kernel/cpu/cpufreq/Kconfig | 4 ++-- + arch/x86/kernel/cpu/cpufreq/elanfreq.c | 2 +- + drivers/cpufreq/cpufreq_conservative.c | 20 ++++++++++---------- + 4 files changed, 14 insertions(+), 14 deletions(-) +Merging input-current/for-linus +$ git merge input-current/for-linus +Merge made by recursive. + drivers/input/joystick/xpad.c | 1 + + drivers/input/keyboard/gpio_keys.c | 3 ++- + drivers/input/touchscreen/Kconfig | 21 +++++++++------------ + 3 files changed, 12 insertions(+), 13 deletions(-) +Merging md-current/for-2.6.26 +$ git merge md-current/for-2.6.26 +Already up-to-date. +Merging quilt/driver-core +$ git merge quilt/driver-core +Merge made by recursive. + arch/x86/kernel/traps_32.c | 1 + + arch/x86/kernel/traps_64.c | 1 + + drivers/base/core.c | 1 + + drivers/base/platform.c | 2 +- + drivers/net/phy/phy_device.c | 8 +----- + fs/sysfs/dir.c | 1 + + fs/sysfs/file.c | 44 +++++++++++++++++++++++++---------- + fs/sysfs/mount.c | 17 +++++++++++++- + fs/sysfs/sysfs.h | 7 ++++- + include/linux/init.h | 1 + + include/linux/sysfs.h | 31 +++++++++++++++++++++++- + init/main.c | 9 +++++++ + lib/kobject.c | 52 ++++++++++++++++++++++++++++++++++++++++++ + 13 files changed, 149 insertions(+), 26 deletions(-) +$ git am -3 ../patches/kobject_verification_fixup +Applying driver-core: kobject verification fixup +Merging quilt/usb +$ git merge quilt/usb +Merge made by recursive. + drivers/usb/misc/Kconfig | 10 ++ + drivers/usb/misc/Makefile | 1 + + drivers/usb/misc/gotemp.c | 301 +++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 312 insertions(+), 0 deletions(-) + create mode 100644 drivers/usb/misc/gotemp.c +Merging tip-core/auto-core-next +$ git merge tip-core/auto-core-next +Auto-merged include/asm-generic/vmlinux.lds.h +Auto-merged include/asm-x86/percpu.h +Auto-merged include/linux/percpu.h +Auto-merged kernel/module.c +Auto-merged mm/filemap.c +Merge made by recursive. + arch/x86/kernel/cpu/common.c | 2 +- + arch/x86/kernel/vmlinux_32.lds.S | 1 + + include/asm-generic/percpu.h | 11 ++++- + include/asm-generic/sections.h | 10 ++++ + include/asm-generic/vmlinux.lds.h | 17 ++++++++ + include/asm-x86/percpu.h | 83 ++++++++++++++++++++++++++++++++++-- + include/linux/percpu.h | 24 ++++++++++- + kernel/lockdep.c | 4 +- + kernel/module.c | 7 ++- + mm/filemap.c | 15 ++++--- + 10 files changed, 154 insertions(+), 20 deletions(-) +Merging cpus4096/auto-cpus4096-next +$ git merge cpus4096/auto-cpus4096-next +Auto-merged drivers/cpufreq/cpufreq.c +Auto-merged net/sunrpc/svc.c +CONFLICT (content): Merge conflict in net/sunrpc/svc.c +Resolved 'net/sunrpc/svc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 92e388f: Merge commit 'cpus4096/auto-cpus4096-next' +$ git diff -M --stat --summary HEAD^.. + drivers/net/sfc/efx.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) +Merging ftrace/auto-ftrace-next +$ git merge ftrace/auto-ftrace-next +Already uptodate! +Merge made by recursive. +Merging genirq/auto-genirq-next +$ git merge genirq/auto-genirq-next +Merge made by recursive. + kernel/irq/spurious.c | 146 ++++++++++++++++++++++++++++++------------------ + 1 files changed, 91 insertions(+), 55 deletions(-) +Merging safe-poison-pointers/auto-safe-poison-pointers-next +$ git merge safe-poison-pointers/auto-safe-poison-pointers-next +Auto-merged arch/x86/Kconfig +Merge made by recursive. + arch/x86/Kconfig | 5 +++++ + include/linux/poison.h | 10 ++++++++-- + 2 files changed, 13 insertions(+), 2 deletions(-) +Merging sched/auto-sched-next +$ git merge sched/auto-sched-next +Auto-merged include/asm-x86/thread_info.h +Auto-merged kernel/rcuclassic.c +Merge made by recursive. + include/linux/rcuclassic.h | 28 +++++--- + kernel/rcuclassic.c | 177 ++++++++++++++++++++++++++------------------ + 2 files changed, 122 insertions(+), 83 deletions(-) +Merging stackprotector/auto-stackprotector-next +$ git merge stackprotector/auto-stackprotector-next +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/Kconfig.debug +Auto-merged arch/x86/Makefile +Auto-merged arch/x86/kernel/Makefile +Auto-merged arch/x86/kernel/process_64.c +Auto-merged include/linux/sched.h +Auto-merged init/main.c +Auto-merged kernel/exit.c +Auto-merged kernel/fork.c +Auto-merged kernel/panic.c +Auto-merged kernel/sched.c +Merge made by recursive. + arch/x86/Kconfig | 23 ++++++++++------------- + arch/x86/Kconfig.debug | 1 + + arch/x86/Makefile | 2 +- + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/process_64.c | 13 ++++++++++++- + arch/x86/mm/fault.c | 7 +++++++ + include/asm-x86/pda.h | 3 +-- + include/asm-x86/stackprotector.h | 38 ++++++++++++++++++++++++++++++++++++++ + include/asm-x86/system.h | 6 +++++- + include/linux/magic.h | 1 + + include/linux/sched.h | 16 ++++++++++++++-- + include/linux/stackprotector.h | 16 ++++++++++++++++ + init/main.c | 7 +++++++ + kernel/exit.c | 5 +---- + kernel/fork.c | 5 +++++ + kernel/panic.c | 12 +++++++++++- + kernel/sched.c | 7 +------ + 17 files changed, 132 insertions(+), 31 deletions(-) + create mode 100644 include/asm-x86/stackprotector.h + create mode 100644 include/linux/stackprotector.h +Merging timers/auto-timers-next +$ git merge timers/auto-timers-next +Auto-merged drivers/char/hpet.c +Merge made by recursive. + drivers/char/hpet.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ + include/linux/hpet.h | 3 +- + 2 files changed, 65 insertions(+), 1 deletions(-) +Merging x86/auto-x86-next +$ git merge x86/auto-x86-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/kernel/Makefile +Auto-merged arch/x86/kernel/genapic_64.c +CONFLICT (content): Merge conflict in arch/x86/kernel/genapic_64.c +Auto-merged arch/x86/kernel/genapic_flat_64.c +Auto-merged arch/x86/kernel/genx2apic_uv_x.c +Auto-merged arch/x86/kernel/io_apic_64.c +Auto-merged arch/x86/kernel/paravirt.c +Auto-merged arch/x86/kernel/setup.c +Auto-merged arch/x86/kernel/smpboot.c +Auto-merged arch/x86/lguest/boot.c +Auto-merged arch/x86/xen/enlighten.c +Auto-merged drivers/pci/dmar.c +CONFLICT (content): Merge conflict in drivers/pci/dmar.c +Auto-merged include/asm-x86/ipi.h +Auto-merged include/asm-x86/paravirt.h +Auto-merged kernel/irq/manage.c +Resolved 'arch/x86/kernel/genapic_64.c' using previous resolution. +Resolved 'drivers/pci/dmar.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit ae416f9: Merge commit 'x86/auto-x86-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 6 + + arch/x86/Kconfig | 8 + + arch/x86/kernel/Makefile | 2 + + arch/x86/kernel/acpi/boot.c | 4 +- + arch/x86/kernel/apic_32.c | 41 ++- + arch/x86/kernel/apic_64.c | 237 ++++++++++- + arch/x86/kernel/cpu/common_64.c | 2 + + arch/x86/kernel/cpu/feature_names.c | 2 +- + arch/x86/kernel/genapic_64.c | 84 ++--- + arch/x86/kernel/genapic_flat_64.c | 62 +++- + arch/x86/kernel/genx2apic_cluster.c | 164 +++++++ + arch/x86/kernel/genx2apic_phys.c | 161 +++++++ + arch/x86/kernel/genx2apic_uv_x.c | 66 +++- + arch/x86/kernel/i8259.c | 24 + + arch/x86/kernel/io_apic_32.c | 5 +- + arch/x86/kernel/io_apic_64.c | 608 +++++++++++++++++++++++++-- + arch/x86/kernel/mpparse.c | 2 + + arch/x86/kernel/paravirt.c | 2 - + arch/x86/kernel/setup.c | 2 + + arch/x86/kernel/smpboot.c | 38 +- + arch/x86/kernel/vmi_32.c | 4 +- + arch/x86/lguest/boot.c | 38 ++- + arch/x86/mach-generic/bigsmp.c | 5 +- + arch/x86/mach-generic/es7000.c | 3 +- + arch/x86/mach-generic/numaq.c | 4 +- + arch/x86/mach-generic/summit.c | 5 +- + arch/x86/xen/enlighten.c | 45 ++- + drivers/pci/Makefile | 2 + + drivers/pci/dma_remapping.h | 157 +++++++ + drivers/pci/dmar.c | 397 +++++++++++++++++- + drivers/pci/intel-iommu.c | 164 ++------ + drivers/pci/intel-iommu.h | 233 +++++------ + drivers/pci/intr_remapping.c | 471 +++++++++++++++++++++ + drivers/pci/intr_remapping.h | 8 + + include/asm-x86/apic.h | 65 +++- + include/asm-x86/apicdef.h | 3 + + include/asm-x86/cpufeature.h | 2 + + include/asm-x86/genapic_64.h | 8 + + include/asm-x86/hw_irq.h | 2 + + include/asm-x86/i8259.h | 3 + + include/asm-x86/io_apic.h | 20 + + include/asm-x86/ipi.h | 16 +- + include/asm-x86/irq_remapping.h | 8 + + include/asm-x86/mach-default/mach_apic.h | 4 +- + include/asm-x86/mach-default/mach_apicdef.h | 6 +- + include/asm-x86/mach-es7000/mach_apic.h | 2 +- + include/asm-x86/msidef.h | 4 + + include/asm-x86/paravirt.h | 19 - + include/asm-x86/smp.h | 17 +- + include/linux/dmar.h | 127 +++++-- + include/linux/irq.h | 1 + + kernel/irq/manage.c | 9 +- + 52 files changed, 2854 insertions(+), 518 deletions(-) + create mode 100644 arch/x86/kernel/genx2apic_cluster.c + create mode 100644 arch/x86/kernel/genx2apic_phys.c + create mode 100644 drivers/pci/dma_remapping.h + create mode 100644 drivers/pci/intr_remapping.c + create mode 100644 drivers/pci/intr_remapping.h + create mode 100644 include/asm-x86/irq_remapping.h +Merging pci/linux-next +$ git merge pci/linux-next +Already up-to-date. +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Auto-merged drivers/md/dm-mpath.c +Merge made by recursive. + drivers/md/dm-exception-store.c | 29 +++++++++++++++++++---------- + drivers/md/dm-mpath.c | 35 +++++++++++++++++++---------------- + drivers/md/dm-mpath.h | 2 -- + drivers/md/dm-raid1.c | 4 +++- + 4 files changed, 41 insertions(+), 29 deletions(-) +Merging hid/mm +$ git merge hid/mm +Already up-to-date. +Merging quilt/i2c +$ git merge quilt/i2c +Auto-merged include/linux/i2c-id.h +Merge made by recursive. + arch/arm/mach-omap1/board-h3.c | 4 + + arch/arm/mach-omap2/board-h4.c | 11 +++ + drivers/i2c/chips/isp1301_omap.c | 141 +++++++++++++-------------------- + drivers/video/matrox/i2c-matroxfb.c | 21 +++-- + drivers/video/matrox/matroxfb_maven.c | 97 +++++++++------------- + include/linux/i2c-id.h | 2 - + 6 files changed, 123 insertions(+), 153 deletions(-) +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Auto-merged Documentation/00-INDEX +Auto-merged arch/x86/Kconfig +Merge made by recursive. + Documentation/00-INDEX | 6 ------ + Documentation/early-userspace/00-INDEX | 8 ++++++++ + Documentation/{ => early-userspace}/initrd.txt | 6 +++--- + Documentation/timers/00-INDEX | 10 ++++++++++ + Documentation/{ => timers}/hpet.txt | 0 + Documentation/x86/00-INDEX | 4 ++++ + Documentation/{ => x86}/mtrr.txt | 4 ++-- + arch/x86/Kconfig | 2 +- + 8 files changed, 28 insertions(+), 12 deletions(-) + create mode 100644 Documentation/early-userspace/00-INDEX + rename Documentation/{ => early-userspace}/initrd.txt (99%) + create mode 100644 Documentation/timers/00-INDEX + rename Documentation/{ => timers}/hpet.txt (100%) + create mode 100644 Documentation/x86/00-INDEX + rename Documentation/{ => x86}/mtrr.txt (99%) +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Removed arch/avr32/mach-at32ap/hmatrix.h +Merge made by recursive. + arch/avr32/mach-at32ap/Makefile | 1 + + arch/avr32/mach-at32ap/at32ap700x.c | 26 +--- + arch/avr32/mach-at32ap/clock.c | 2 + + arch/avr32/mach-at32ap/hmatrix.c | 88 +++++++++++++ + arch/avr32/mach-at32ap/hmatrix.h | 182 ---------------------------- + arch/avr32/mach-at32ap/pm.c | 4 +- + arch/avr32/mach-at32ap/pm.h | 12 +-- + include/asm-avr32/arch-at32ap/at32ap700x.h | 37 ++++++ + include/asm-avr32/arch-at32ap/chip.h | 19 +++ + include/asm-avr32/arch-at32ap/hmatrix.h | 55 +++++++++ + 10 files changed, 212 insertions(+), 214 deletions(-) + create mode 100644 arch/avr32/mach-at32ap/hmatrix.c + delete mode 100644 arch/avr32/mach-at32ap/hmatrix.h + create mode 100644 include/asm-avr32/arch-at32ap/chip.h + create mode 100644 include/asm-avr32/arch-at32ap/hmatrix.h +Merging s390/features +$ git merge s390/features +Merge made by recursive. + arch/s390/Kconfig | 3 + + arch/s390/kernel/compat_wrapper.S | 37 ++++++++ + arch/s390/kernel/ipl.c | 5 +- + arch/s390/kernel/mem_detect.c | 23 ----- + arch/s390/kernel/syscalls.S | 6 + + arch/s390/kernel/time.c | 2 +- + arch/s390/lib/delay.c | 4 +- + arch/s390/mm/init.c | 13 +++- + drivers/s390/block/dasd_alias.c | 4 +- + drivers/s390/block/dasd_devmap.c | 16 +++- + drivers/s390/block/dasd_eckd.c | 147 ++++++++++++++++++++++------- + drivers/s390/block/dasd_eckd.h | 184 ++++++++++++------------------------- + drivers/s390/block/dasd_int.h | 1 + + drivers/s390/char/sclp.c | 6 +- + drivers/s390/char/sclp_cmd.c | 5 + + drivers/s390/char/sclp_config.c | 13 +--- + drivers/s390/cio/idset.c | 8 +- + drivers/s390/cio/qdio_main.c | 2 +- + drivers/s390/cio/qdio_perf.c | 2 +- + drivers/s390/cio/qdio_setup.c | 4 +- + drivers/s390/kvm/kvm_virtio.c | 2 +- + drivers/s390/net/qeth_core.h | 5 +- + drivers/s390/net/qeth_core_main.c | 59 +++++++++--- + drivers/s390/net/qeth_l2_main.c | 50 ++++++++-- + drivers/s390/net/qeth_l3_main.c | 51 ++++++++--- + include/asm-s390/hardirq.h | 14 +++ + include/asm-s390/ipl.h | 3 +- + include/asm-s390/schid.h | 1 + + include/asm-s390/setup.h | 1 - + include/asm-s390/unistd.h | 8 ++- + include/linux/page-flags.h | 3 - + mm/rmap.c | 3 +- + 32 files changed, 425 insertions(+), 260 deletions(-) +Merging sh/master +$ git merge sh/master +Auto-merged MAINTAINERS +Auto-merged arch/sh/Kconfig +Removed arch/sh/boards/magicpanelr2/Kconfig +Removed arch/sh/boards/magicpanelr2/Makefile +Removed arch/sh/boards/renesas/ap325rxa/Makefile +Removed arch/sh/boards/renesas/rsk7203/Makefile +Removed arch/sh/boards/renesas/sh7785lcr/Makefile +Removed arch/sh/boards/se/7619/Makefile +Removed arch/sh/boards/shmin/Makefile +Removed include/asm-sh/.gitignore +Removed include/asm-sh/cpu-sh2a/addrspace.h +Removed include/asm-sh/cpu-sh2a/cacheflush.h +Removed include/asm-sh/cpu-sh2a/dma.h +Removed include/asm-sh/cpu-sh2a/mmu_context.h +Removed include/asm-sh/cpu-sh2a/timer.h +Removed include/asm-sh/cpu-sh2a/ubc.h +Removed include/asm-sh/cpu-sh2a/watchdog.h +Removed include/asm-sh/cpu-sh3/addrspace.h +Removed include/asm-sh/cpu-sh3/cacheflush.h +Removed include/asm-sh/cpu-sh3/rtc.h +Removed include/asm-sh/cpu-sh3/sigcontext.h +Removed include/asm-sh/cpu-sh5/timer.h +Auto-merged mm/hugetlb.c +Merge made by recursive. + MAINTAINERS | 2 +- + arch/sh/Kconfig | 252 +------ + arch/sh/Makefile | 139 +-- + arch/sh/boards/Kconfig | 258 ++++++ + arch/sh/boards/Makefile | 8 + + .../{renesas/ap325rxa/setup.c => board-ap325rxa.c} | 4 + + .../{magicpanelr2/setup.c => board-magicpanelr2.c} | 0 + .../{renesas/rsk7203/setup.c => board-rsk7203.c} | 10 + + .../sh7785lcr/setup.c => board-sh7785lcr.c} | 0 + arch/sh/boards/{shmin/setup.c => board-shmin.c} | 0 + arch/sh/boards/{cayman => mach-cayman}/Makefile | 0 + arch/sh/boards/{cayman => mach-cayman}/irq.c | 2 +- + arch/sh/boards/{cayman => mach-cayman}/led.c | 0 + arch/sh/boards/{cayman => mach-cayman}/setup.c | 2 +- + .../boards/{dreamcast => mach-dreamcast}/Makefile | 0 + arch/sh/boards/{dreamcast => mach-dreamcast}/irq.c | 2 +- + arch/sh/boards/{dreamcast => mach-dreamcast}/rtc.c | 0 + .../boards/{dreamcast => mach-dreamcast}/setup.c | 2 +- + .../{renesas/edosk7705 => mach-edosk7705}/Makefile | 0 + .../{renesas/edosk7705 => mach-edosk7705}/io.c | 0 + .../{renesas/edosk7705 => mach-edosk7705}/setup.c | 0 + .../{renesas/r7780rp => mach-highlander}/Kconfig | 0 + .../{renesas/r7780rp => mach-highlander}/Makefile | 0 + .../r7780rp => mach-highlander}/irq-r7780mp.c | 0 + .../r7780rp => mach-highlander}/irq-r7780rp.c | 0 + .../r7780rp => mach-highlander}/irq-r7785rp.c | 0 + .../{renesas/r7780rp => mach-highlander}/psw.c | 2 +- + .../{renesas/r7780rp => mach-highlander}/setup.c | 0 + arch/sh/boards/{hp6xx => mach-hp6xx}/Makefile | 0 + arch/sh/boards/{hp6xx => mach-hp6xx}/hp6xx_apm.c | 0 + arch/sh/boards/{hp6xx => mach-hp6xx}/pm.c | 2 +- + arch/sh/boards/{hp6xx => mach-hp6xx}/pm_wakeup.S | 2 +- + arch/sh/boards/{hp6xx => mach-hp6xx}/setup.c | 2 +- + arch/sh/boards/{landisk => mach-landisk}/Makefile | 0 + arch/sh/boards/{landisk => mach-landisk}/gio.c | 4 +- + arch/sh/boards/{landisk => mach-landisk}/irq.c | 2 +- + arch/sh/boards/{landisk => mach-landisk}/psw.c | 2 +- + arch/sh/boards/{landisk => mach-landisk}/setup.c | 2 +- + arch/sh/boards/{lboxre2 => mach-lboxre2}/Makefile | 0 + arch/sh/boards/{lboxre2 => mach-lboxre2}/irq.c | 0 + arch/sh/boards/{lboxre2 => mach-lboxre2}/setup.c | 0 + .../{superh/microdev => mach-microdev}/Makefile | 0 + .../boards/{superh/microdev => mach-microdev}/io.c | 0 + .../{superh/microdev => mach-microdev}/irq.c | 0 + .../{superh/microdev => mach-microdev}/led.c | 0 + .../{superh/microdev => mach-microdev}/setup.c | 0 + .../boards/{renesas/migor => mach-migor}/Kconfig | 0 + .../boards/{renesas/migor => mach-migor}/Makefile | 0 + .../{renesas/migor => mach-migor}/lcd_qvga.c | 0 + .../boards/{renesas/migor => mach-migor}/setup.c | 4 + + .../{renesas/rts7751r2d => mach-r2d}/Kconfig | 0 + .../{renesas/rts7751r2d => mach-r2d}/Makefile | 0 + .../boards/{renesas/rts7751r2d => mach-r2d}/irq.c | 0 + .../{renesas/rts7751r2d => mach-r2d}/setup.c | 0 + .../{renesas/sdk7780 => mach-sdk7780}/Kconfig | 0 + .../{renesas/sdk7780 => mach-sdk7780}/Makefile | 0 + .../boards/{renesas/sdk7780 => mach-sdk7780}/irq.c | 0 + .../{renesas/sdk7780 => mach-sdk7780}/setup.c | 0 + arch/sh/boards/{se => mach-se}/7206/Makefile | 0 + arch/sh/boards/{se => mach-se}/7206/io.c | 2 +- + arch/sh/boards/{se => mach-se}/7206/irq.c | 2 +- + arch/sh/boards/{se => mach-se}/7206/setup.c | 2 +- + arch/sh/boards/{se => mach-se}/7343/Makefile | 0 + arch/sh/boards/{se => mach-se}/7343/io.c | 2 +- + arch/sh/boards/{se => mach-se}/7343/irq.c | 6 +- + arch/sh/boards/{se => mach-se}/7343/setup.c | 2 +- + arch/sh/boards/{se => mach-se}/770x/Makefile | 0 + arch/sh/boards/{se => mach-se}/770x/io.c | 2 +- + arch/sh/boards/{se => mach-se}/770x/irq.c | 2 +- + arch/sh/boards/{se => mach-se}/770x/setup.c | 8 +- + arch/sh/boards/{se => mach-se}/7721/Makefile | 0 + arch/sh/boards/{se => mach-se}/7721/irq.c | 2 +- + arch/sh/boards/{se => mach-se}/7721/setup.c | 2 +- + arch/sh/boards/{se => mach-se}/7722/Makefile | 0 + arch/sh/boards/{se => mach-se}/7722/irq.c | 2 +- + arch/sh/boards/{se => mach-se}/7722/setup.c | 2 +- + arch/sh/boards/{se => mach-se}/7751/Makefile | 0 + arch/sh/boards/{se => mach-se}/7751/io.c | 2 +- + arch/sh/boards/{se => mach-se}/7751/irq.c | 2 +- + arch/sh/boards/{se => mach-se}/7751/pci.c | 0 + arch/sh/boards/{se => mach-se}/7751/setup.c | 2 +- + arch/sh/boards/{se => mach-se}/7780/Makefile | 0 + arch/sh/boards/{se => mach-se}/7780/irq.c | 2 +- + arch/sh/boards/{se => mach-se}/7780/setup.c | 2 +- + arch/sh/boards/mach-se/Makefile | 9 + + .../{se/7619/setup.c => mach-se/board-se7619.c} | 0 + arch/sh/boards/{sh03 => mach-sh03}/Makefile | 0 + arch/sh/boards/{sh03 => mach-sh03}/rtc.c | 0 + arch/sh/boards/{sh03 => mach-sh03}/setup.c | 4 +- + .../{renesas/sh7763rdp => mach-sh7763rdp}/Makefile | 0 + .../{renesas/sh7763rdp => mach-sh7763rdp}/irq.c | 0 + .../{renesas/sh7763rdp => mach-sh7763rdp}/setup.c | 0 + .../sh/boards/{snapgear => mach-snapgear}/Makefile | 0 + arch/sh/boards/{snapgear => mach-snapgear}/io.c | 0 + arch/sh/boards/{snapgear => mach-snapgear}/setup.c | 2 +- + .../{renesas/systemh => mach-systemh}/Makefile | 0 + .../boards/{renesas/systemh => mach-systemh}/io.c | 0 + .../boards/{renesas/systemh => mach-systemh}/irq.c | 0 + .../{renesas/systemh => mach-systemh}/setup.c | 0 + arch/sh/boards/{titan => mach-titan}/Makefile | 0 + arch/sh/boards/{titan => mach-titan}/io.c | 0 + arch/sh/boards/{titan => mach-titan}/setup.c | 0 + .../{renesas/x3proto => mach-x3proto}/Makefile | 0 + .../{renesas/x3proto => mach-x3proto}/ilsel.c | 0 + .../{renesas/x3proto => mach-x3proto}/setup.c | 0 + arch/sh/boards/magicpanelr2/Kconfig | 13 - + arch/sh/boards/magicpanelr2/Makefile | 5 - + arch/sh/boards/renesas/ap325rxa/Makefile | 1 - + arch/sh/boards/renesas/rsk7203/Makefile | 1 - + arch/sh/boards/renesas/sh7785lcr/Makefile | 1 - + arch/sh/boards/se/7619/Makefile | 5 - + arch/sh/boards/shmin/Makefile | 5 - + arch/sh/boot/Makefile | 3 +- + arch/sh/boot/compressed/head_64.S | 4 +- + arch/sh/configs/ap325rxa_defconfig | 35 +- + arch/sh/configs/dreamcast_defconfig | 304 +++++-- + arch/sh/configs/hp6xx_defconfig | 258 ++++-- + arch/sh/configs/landisk_defconfig | 894 +++++++++----------- + arch/sh/configs/lboxre2_defconfig | 725 +++++++--------- + arch/sh/configs/magicpanelr2_defconfig | 195 +++-- + arch/sh/configs/microdev_defconfig | 630 +++++++-------- + arch/sh/configs/migor_defconfig | 63 ++- + arch/sh/configs/r7780mp_defconfig | 194 +++-- + arch/sh/configs/r7785rp_defconfig | 258 ++++-- + arch/sh/configs/rsk7203_defconfig | 179 ++++- + arch/sh/configs/rts7751r2d1_defconfig | 259 ++++--- + arch/sh/configs/rts7751r2dplus_defconfig | 259 ++++--- + arch/sh/configs/sdk7780_defconfig | 269 ++++--- + arch/sh/configs/se7206_defconfig | 38 +- + arch/sh/configs/se7343_defconfig | 78 +- + arch/sh/configs/se7619_defconfig | 261 +++---- + arch/sh/drivers/dma/dma-g2.c | 4 +- + arch/sh/drivers/dma/dma-pvr2.c | 4 +- + arch/sh/drivers/dma/dma-sh.c | 2 +- + arch/sh/drivers/dma/dma-sh.h | 2 +- + arch/sh/drivers/pci/fixups-dreamcast.c | 2 +- + arch/sh/drivers/pci/ops-cayman.c | 2 +- + arch/sh/drivers/pci/ops-dreamcast.c | 2 +- + arch/sh/drivers/pci/ops-se7780.c | 2 +- + arch/sh/drivers/pci/pci-sh5.c | 2 +- + arch/sh/include/asm/.gitignore | 1 + + {include/asm-sh => arch/sh/include/asm}/Kbuild | 0 + {include/asm-sh => arch/sh/include/asm}/a.out.h | 0 + {include/asm-sh => arch/sh/include/asm}/adc.h | 2 +- + .../asm-sh => arch/sh/include/asm}/addrspace.h | 2 +- + .../asm-sh => arch/sh/include/asm}/atomic-grb.h | 0 + .../asm-sh => arch/sh/include/asm}/atomic-irq.h | 0 + .../asm-sh => arch/sh/include/asm}/atomic-llsc.h | 0 + {include/asm-sh => arch/sh/include/asm}/atomic.h | 0 + {include/asm-sh => arch/sh/include/asm}/auxvec.h | 2 +- + .../asm-sh => arch/sh/include/asm}/bitops-grb.h | 0 + .../asm-sh => arch/sh/include/asm}/bitops-irq.h | 0 + {include/asm-sh => arch/sh/include/asm}/bitops.h | 0 + {include/asm-sh => arch/sh/include/asm}/bug.h | 0 + {include/asm-sh => arch/sh/include/asm}/bugs.h | 0 + .../asm-sh => arch/sh/include/asm}/byteorder.h | 0 + {include/asm-sh => arch/sh/include/asm}/cache.h | 2 +- + .../asm-sh => arch/sh/include/asm}/cacheflush.h | 2 +- + {include/asm-sh => arch/sh/include/asm}/checksum.h | 0 + .../asm-sh => arch/sh/include/asm}/checksum_32.h | 0 + .../asm-sh => arch/sh/include/asm}/checksum_64.h | 0 + {include/asm-sh => arch/sh/include/asm}/clock.h | 0 + .../asm-sh => arch/sh/include/asm}/cmpxchg-grb.h | 0 + .../asm-sh => arch/sh/include/asm}/cmpxchg-irq.h | 0 + .../asm-sh => arch/sh/include/asm}/cpu-features.h | 0 + {include/asm-sh => arch/sh/include/asm}/cputime.h | 0 + {include/asm-sh => arch/sh/include/asm}/current.h | 0 + {include/asm-sh => arch/sh/include/asm}/delay.h | 0 + {include/asm-sh => arch/sh/include/asm}/device.h | 0 + {include/asm-sh => arch/sh/include/asm}/div64.h | 0 + .../asm-sh => arch/sh/include/asm}/dma-mapping.h | 0 + {include/asm-sh => arch/sh/include/asm}/dma.h | 2 +- + {include/asm-sh => arch/sh/include/asm}/dmabrg.h | 0 + .../asm-sh => arch/sh/include/asm}/edosk7705.h | 0 + {include/asm-sh => arch/sh/include/asm}/elf.h | 0 + .../sh/include/asm}/emergency-restart.h | 0 + .../asm-sh => arch/sh/include/asm}/entry-macros.S | 0 + {include/asm-sh => arch/sh/include/asm}/errno.h | 0 + {include/asm-sh => arch/sh/include/asm}/fb.h | 0 + {include/asm-sh => arch/sh/include/asm}/fcntl.h | 0 + {include/asm-sh => arch/sh/include/asm}/fixmap.h | 0 + {include/asm-sh => arch/sh/include/asm}/flat.h | 0 + {include/asm-sh => arch/sh/include/asm}/fpu.h | 0 + {include/asm-sh => arch/sh/include/asm}/freq.h | 2 +- + .../asm-sh => arch/sh/include/asm}/futex-irq.h | 0 + {include/asm-sh => arch/sh/include/asm}/futex.h | 0 + {include/asm-sh => arch/sh/include/asm}/gpio.h | 2 +- + {include/asm-sh => arch/sh/include/asm}/hardirq.h | 0 + {include/asm-sh => arch/sh/include/asm}/hd64461.h | 0 + .../asm-sh => arch/sh/include/asm}/hd64465/gpio.h | 0 + .../sh/include/asm}/hd64465/hd64465.h | 0 + .../asm-sh => arch/sh/include/asm}/hd64465/io.h | 0 + .../asm-sh => arch/sh/include/asm}/heartbeat.h | 0 + {include/asm-sh => arch/sh/include/asm}/hp6xx.h | 0 + {include/asm-sh => arch/sh/include/asm}/hugetlb.h | 0 + {include/asm-sh => arch/sh/include/asm}/hw_irq.h | 0 + .../asm-sh => arch/sh/include/asm}/i2c-sh7760.h | 0 + {include/asm-sh => arch/sh/include/asm}/ilsel.h | 0 + {include/asm-sh => arch/sh/include/asm}/io.h | 0 + .../asm-sh => arch/sh/include/asm}/io_generic.h | 0 + .../asm-sh => arch/sh/include/asm}/io_trapped.h | 0 + {include/asm-sh => arch/sh/include/asm}/ioctl.h | 0 + {include/asm-sh => arch/sh/include/asm}/ioctls.h | 0 + {include/asm-sh => arch/sh/include/asm}/ipcbuf.h | 0 + {include/asm-sh => arch/sh/include/asm}/irq.h | 2 +- + {include/asm-sh => arch/sh/include/asm}/irq_regs.h | 0 + {include/asm-sh => arch/sh/include/asm}/irqflags.h | 0 + .../asm-sh => arch/sh/include/asm}/irqflags_32.h | 0 + .../asm-sh => arch/sh/include/asm}/irqflags_64.h | 2 +- + {include/asm-sh => arch/sh/include/asm}/kdebug.h | 0 + {include/asm-sh => arch/sh/include/asm}/kexec.h | 0 + {include/asm-sh => arch/sh/include/asm}/kgdb.h | 0 + .../asm-sh => arch/sh/include/asm}/kmap_types.h | 0 + {include/asm-sh => arch/sh/include/asm}/lboxre2.h | 0 + {include/asm-sh => arch/sh/include/asm}/linkage.h | 0 + {include/asm-sh => arch/sh/include/asm}/local.h | 0 + {include/asm-sh => arch/sh/include/asm}/machvec.h | 0 + .../asm-sh => arch/sh/include/asm}/magicpanelr2.h | 0 + .../asm-sh => arch/sh/include/asm}/mc146818rtc.h | 0 + {include/asm-sh => arch/sh/include/asm}/microdev.h | 0 + {include/asm-sh => arch/sh/include/asm}/migor.h | 0 + {include/asm-sh => arch/sh/include/asm}/mman.h | 0 + {include/asm-sh => arch/sh/include/asm}/mmu.h | 0 + .../asm-sh => arch/sh/include/asm}/mmu_context.h | 2 +- + .../sh/include/asm}/mmu_context_32.h | 0 + .../sh/include/asm}/mmu_context_64.h | 2 +- + {include/asm-sh => arch/sh/include/asm}/mmzone.h | 0 + {include/asm-sh => arch/sh/include/asm}/module.h | 0 + {include/asm-sh => arch/sh/include/asm}/msgbuf.h | 0 + {include/asm-sh => arch/sh/include/asm}/mutex.h | 0 + {include/asm-sh => arch/sh/include/asm}/page.h | 0 + {include/asm-sh => arch/sh/include/asm}/param.h | 0 + {include/asm-sh => arch/sh/include/asm}/parport.h | 0 + {include/asm-sh => arch/sh/include/asm}/pci.h | 0 + {include/asm-sh => arch/sh/include/asm}/percpu.h | 0 + {include/asm-sh => arch/sh/include/asm}/pgalloc.h | 0 + {include/asm-sh => arch/sh/include/asm}/pgtable.h | 0 + .../asm-sh => arch/sh/include/asm}/pgtable_32.h | 0 + .../asm-sh => arch/sh/include/asm}/pgtable_64.h | 0 + {include/asm-sh => arch/sh/include/asm}/pm.h | 0 + {include/asm-sh => arch/sh/include/asm}/poll.h | 0 + .../asm-sh => arch/sh/include/asm}/posix_types.h | 0 + .../sh/include/asm}/posix_types_32.h | 0 + .../sh/include/asm}/posix_types_64.h | 0 + .../asm-sh => arch/sh/include/asm}/processor.h | 0 + .../asm-sh => arch/sh/include/asm}/processor_32.h | 2 +- + .../asm-sh => arch/sh/include/asm}/processor_64.h | 2 +- + {include/asm-sh => arch/sh/include/asm}/ptrace.h | 0 + .../asm-sh => arch/sh/include/asm}/push-switch.h | 0 + {include/asm-sh => arch/sh/include/asm}/r7780rp.h | 0 + {include/asm-sh => arch/sh/include/asm}/resource.h | 0 + {include/asm-sh => arch/sh/include/asm}/rtc.h | 2 +- + .../asm-sh => arch/sh/include/asm}/rts7751r2d.h | 0 + {include/asm-sh => arch/sh/include/asm}/rwsem.h | 0 + .../asm-sh => arch/sh/include/asm}/scatterlist.h | 0 + {include/asm-sh => arch/sh/include/asm}/sdk7780.h | 0 + {include/asm-sh => arch/sh/include/asm}/sections.h | 0 + {include/asm-sh => arch/sh/include/asm}/segment.h | 0 + {include/asm-sh => arch/sh/include/asm}/sembuf.h | 0 + {include/asm-sh => arch/sh/include/asm}/serial.h | 2 +- + {include/asm-sh => arch/sh/include/asm}/setup.h | 0 + .../asm-sh => arch/sh/include/asm}/sfp-machine.h | 0 + {include/asm-sh => arch/sh/include/asm}/sh7760fb.h | 0 + .../asm-sh => arch/sh/include/asm}/sh7763rdp.h | 0 + .../asm-sh => arch/sh/include/asm}/sh7785lcr.h | 0 + {include/asm-sh => arch/sh/include/asm}/sh_bios.h | 0 + {include/asm-sh => arch/sh/include/asm}/sh_keysc.h | 0 + .../sh/include/asm}/sh_mobile_lcdc.h | 0 + {include/asm-sh => arch/sh/include/asm}/shmbuf.h | 0 + {include/asm-sh => arch/sh/include/asm}/shmin.h | 0 + {include/asm-sh => arch/sh/include/asm}/shmparam.h | 0 + .../asm-sh => arch/sh/include/asm}/sigcontext.h | 0 + {include/asm-sh => arch/sh/include/asm}/siginfo.h | 0 + {include/asm-sh => arch/sh/include/asm}/signal.h | 0 + .../asm-sh => arch/sh/include/asm}/smc37c93x.h | 0 + {include/asm-sh => arch/sh/include/asm}/smp.h | 0 + {include/asm-sh => arch/sh/include/asm}/snapgear.h | 0 + {include/asm-sh => arch/sh/include/asm}/socket.h | 0 + {include/asm-sh => arch/sh/include/asm}/sockios.h | 0 + .../asm-sh => arch/sh/include/asm}/sparsemem.h | 0 + {include/asm-sh => arch/sh/include/asm}/spi.h | 0 + {include/asm-sh => arch/sh/include/asm}/spinlock.h | 0 + .../sh/include/asm}/spinlock_types.h | 0 + {include/asm-sh => arch/sh/include/asm}/stat.h | 0 + {include/asm-sh => arch/sh/include/asm}/statfs.h | 0 + {include/asm-sh => arch/sh/include/asm}/string.h | 0 + .../asm-sh => arch/sh/include/asm}/string_32.h | 0 + .../asm-sh => arch/sh/include/asm}/string_64.h | 0 + {include/asm-sh => arch/sh/include/asm}/system.h | 0 + .../asm-sh => arch/sh/include/asm}/system_32.h | 0 + .../asm-sh => arch/sh/include/asm}/system_64.h | 0 + .../asm-sh => arch/sh/include/asm}/systemh7751.h | 0 + {include/asm-sh => arch/sh/include/asm}/termbits.h | 0 + {include/asm-sh => arch/sh/include/asm}/termios.h | 0 + .../asm-sh => arch/sh/include/asm}/thread_info.h | 0 + {include/asm-sh => arch/sh/include/asm}/timer.h | 2 +- + {include/asm-sh => arch/sh/include/asm}/timex.h | 0 + {include/asm-sh => arch/sh/include/asm}/titan.h | 0 + {include/asm-sh => arch/sh/include/asm}/tlb.h | 0 + {include/asm-sh => arch/sh/include/asm}/tlb_64.h | 0 + {include/asm-sh => arch/sh/include/asm}/tlbflush.h | 0 + {include/asm-sh => arch/sh/include/asm}/topology.h | 0 + {include/asm-sh => arch/sh/include/asm}/types.h | 0 + {include/asm-sh => arch/sh/include/asm}/uaccess.h | 6 +- + .../asm-sh => arch/sh/include/asm}/uaccess_32.h | 3 +- + .../asm-sh => arch/sh/include/asm}/uaccess_64.h | 0 + {include/asm-sh => arch/sh/include/asm}/ubc.h | 2 +- + {include/asm-sh => arch/sh/include/asm}/ucontext.h | 0 + .../asm-sh => arch/sh/include/asm}/unaligned.h | 0 + {include/asm-sh => arch/sh/include/asm}/unistd.h | 0 + .../asm-sh => arch/sh/include/asm}/unistd_32.h | 0 + .../asm-sh => arch/sh/include/asm}/unistd_64.h | 0 + {include/asm-sh => arch/sh/include/asm}/user.h | 0 + {include/asm-sh => arch/sh/include/asm}/vga.h | 0 + {include/asm-sh => arch/sh/include/asm}/watchdog.h | 4 +- + {include/asm-sh => arch/sh/include/asm}/xor.h | 0 + .../sh/include/cpu-common/cpu}/addrspace.h | 0 + .../sh/include/cpu-common/cpu}/cacheflush.h | 4 +- + .../sh/include/cpu-common/cpu}/mmu_context.h | 0 + .../sh/include/cpu-common/cpu}/rtc.h | 0 + .../sh/include/cpu-common/cpu}/sigcontext.h | 0 + .../sh/include/cpu-common/cpu}/timer.h | 0 + .../sh/include/cpu-sh2/cpu}/cache.h | 0 + .../cpu-sh2 => arch/sh/include/cpu-sh2/cpu}/dma.h | 0 + .../cpu-sh2 => arch/sh/include/cpu-sh2/cpu}/freq.h | 0 + .../cpu-sh2 => arch/sh/include/cpu-sh2/cpu}/ubc.h | 0 + .../sh/include/cpu-sh2/cpu}/watchdog.h | 0 + .../sh/include/cpu-sh2a/cpu}/cache.h | 0 + arch/sh/include/cpu-sh2a/cpu/dma.h | 1 + + .../sh/include/cpu-sh2a/cpu}/freq.h | 0 + .../sh/include/cpu-sh2a/cpu}/rtc.h | 0 + arch/sh/include/cpu-sh2a/cpu/ubc.h | 1 + + arch/sh/include/cpu-sh2a/cpu/watchdog.h | 1 + + .../cpu-sh3 => arch/sh/include/cpu-sh3/cpu}/adc.h | 0 + .../sh/include/cpu-sh3/cpu}/cache.h | 0 + arch/sh/include/cpu-sh3/cpu/cacheflush.h | 36 + + .../cpu-sh3 => arch/sh/include/cpu-sh3/cpu}/dac.h | 0 + .../cpu-sh3 => arch/sh/include/cpu-sh3/cpu}/dma.h | 0 + .../cpu-sh3 => arch/sh/include/cpu-sh3/cpu}/freq.h | 0 + .../cpu-sh3 => arch/sh/include/cpu-sh3/cpu}/gpio.h | 0 + .../sh/include/cpu-sh3/cpu}/mmu_context.h | 0 + .../sh/include/cpu-sh3/cpu}/timer.h | 0 + .../cpu-sh3 => arch/sh/include/cpu-sh3/cpu}/ubc.h | 0 + .../sh/include/cpu-sh3/cpu}/watchdog.h | 0 + .../sh/include/cpu-sh4/cpu}/addrspace.h | 0 + .../sh/include/cpu-sh4/cpu}/cache.h | 0 + .../sh/include/cpu-sh4/cpu}/cacheflush.h | 0 + .../sh/include/cpu-sh4/cpu}/dma-sh7780.h | 0 + .../cpu-sh4 => arch/sh/include/cpu-sh4/cpu}/dma.h | 2 +- + .../cpu-sh4 => arch/sh/include/cpu-sh4/cpu}/fpu.h | 0 + .../cpu-sh4 => arch/sh/include/cpu-sh4/cpu}/freq.h | 0 + .../sh/include/cpu-sh4/cpu}/mmu_context.h | 0 + .../cpu-sh4 => arch/sh/include/cpu-sh4/cpu}/rtc.h | 0 + .../sh/include/cpu-sh4/cpu}/sigcontext.h | 0 + .../cpu-sh4 => arch/sh/include/cpu-sh4/cpu}/sq.h | 0 + .../sh/include/cpu-sh4/cpu}/timer.h | 0 + .../cpu-sh4 => arch/sh/include/cpu-sh4/cpu}/ubc.h | 0 + .../sh/include/cpu-sh4/cpu}/watchdog.h | 0 + .../sh/include/cpu-sh5/cpu}/addrspace.h | 0 + .../sh/include/cpu-sh5/cpu}/cache.h | 0 + .../sh/include/cpu-sh5/cpu}/cacheflush.h | 0 + .../cpu-sh5 => arch/sh/include/cpu-sh5/cpu}/dma.h | 0 + .../cpu-sh5 => arch/sh/include/cpu-sh5/cpu}/irq.h | 0 + .../sh/include/cpu-sh5/cpu}/mmu_context.h | 0 + .../sh/include/cpu-sh5/cpu}/registers.h | 0 + .../cpu-sh5 => arch/sh/include/cpu-sh5/cpu}/rtc.h | 0 + .../sh/include/mach-dreamcast/mach}/dma.h | 0 + .../sh/include/mach-dreamcast/mach}/maple.h | 0 + .../sh/include/mach-dreamcast/mach}/pci.h | 2 +- + .../sh/include/mach-dreamcast/mach}/sysasic.h | 0 + .../sh/include/mach-landisk/mach}/gio.h | 0 + .../sh/include/mach-landisk/mach}/iodata_landisk.h | 0 + .../asm-sh => arch/sh/include/mach-se/mach}/se.h | 0 + .../sh/include/mach-se/mach}/se7206.h | 0 + .../sh/include/mach-se/mach}/se7343.h | 0 + .../sh/include/mach-se/mach}/se7721.h | 0 + .../sh/include/mach-se/mach}/se7722.h | 0 + .../sh/include/mach-se/mach}/se7751.h | 0 + .../sh/include/mach-se/mach}/se7780.h | 0 + .../sh03 => arch/sh/include/mach-sh03/mach}/io.h | 0 + .../sh03 => arch/sh/include/mach-sh03/mach}/sh03.h | 0 + arch/sh/kernel/.gitignore | 1 + + arch/sh/kernel/cf-enabler.c | 6 +- + arch/sh/kernel/cpu/irq/intc-sh5.c | 2 +- + arch/sh/kernel/cpu/sh2/entry.S | 2 +- + arch/sh/kernel/cpu/sh2a/entry.S | 2 +- + arch/sh/kernel/cpu/sh3/entry.S | 2 +- + arch/sh/kernel/cpu/sh4/fpu.c | 2 +- + arch/sh/kernel/cpu/sh4/softfloat.c | 2 +- + arch/sh/kernel/cpu/sh4/sq.c | 2 +- + arch/sh/kernel/cpu/sh5/entry.S | 2 +- + arch/sh/kernel/head_64.S | 4 +- + arch/sh/kernel/irq.c | 2 +- + arch/sh/kernel/time_64.c | 4 +- + arch/sh/lib64/panic.c | 2 +- + arch/sh/mm/fault_64.c | 2 +- + arch/sh/tools/Makefile | 4 +- + drivers/cdrom/gdrom.c | 4 +- + drivers/input/keyboard/maple_keyb.c | 1 - + drivers/serial/sh-sci.h | 12 +- + drivers/sh/maple/maple.c | 265 ++++-- + drivers/video/Makefile | 1 - + drivers/video/backlight/hp680_bl.c | 2 +- + drivers/video/hitfb.c | 2 +- + drivers/video/pvr2fb.c | 6 +- + include/asm-sh/.gitignore | 3 - + include/asm-sh/cpu-sh2a/addrspace.h | 10 - + include/asm-sh/cpu-sh2a/cacheflush.h | 1 - + include/asm-sh/cpu-sh2a/dma.h | 1 - + include/asm-sh/cpu-sh2a/mmu_context.h | 1 - + include/asm-sh/cpu-sh2a/timer.h | 1 - + include/asm-sh/cpu-sh2a/ubc.h | 1 - + include/asm-sh/cpu-sh2a/watchdog.h | 1 - + include/asm-sh/cpu-sh3/addrspace.h | 19 - + include/asm-sh/cpu-sh3/cacheflush.h | 70 -- + include/asm-sh/cpu-sh3/rtc.h | 8 - + include/asm-sh/cpu-sh3/sigcontext.h | 17 - + include/asm-sh/cpu-sh5/timer.h | 4 - + include/linux/maple.h | 6 +- + mm/hugetlb.c | 2 +- + sound/sh/aica.c | 2 +- + 421 files changed, 3358 insertions(+), 2943 deletions(-) + create mode 100644 arch/sh/boards/Kconfig + create mode 100644 arch/sh/boards/Makefile + rename arch/sh/boards/{renesas/ap325rxa/setup.c => board-ap325rxa.c} (99%) + rename arch/sh/boards/{magicpanelr2/setup.c => board-magicpanelr2.c} (100%) + rename arch/sh/boards/{renesas/rsk7203/setup.c => board-rsk7203.c} (92%) + rename arch/sh/boards/{renesas/sh7785lcr/setup.c => board-sh7785lcr.c} (100%) + rename arch/sh/boards/{shmin/setup.c => board-shmin.c} (100%) + rename arch/sh/boards/{cayman => mach-cayman}/Makefile (100%) + rename arch/sh/boards/{cayman => mach-cayman}/irq.c (99%) + rename arch/sh/boards/{cayman => mach-cayman}/led.c (100%) + rename arch/sh/boards/{cayman => mach-cayman}/setup.c (99%) + rename arch/sh/boards/{dreamcast => mach-dreamcast}/Makefile (100%) + rename arch/sh/boards/{dreamcast => mach-dreamcast}/irq.c (99%) + rename arch/sh/boards/{dreamcast => mach-dreamcast}/rtc.c (100%) + rename arch/sh/boards/{dreamcast => mach-dreamcast}/setup.c (98%) + rename arch/sh/boards/{renesas/edosk7705 => mach-edosk7705}/Makefile (100%) + rename arch/sh/boards/{renesas/edosk7705 => mach-edosk7705}/io.c (100%) + rename arch/sh/boards/{renesas/edosk7705 => mach-edosk7705}/setup.c (100%) + rename arch/sh/boards/{renesas/r7780rp => mach-highlander}/Kconfig (100%) + rename arch/sh/boards/{renesas/r7780rp => mach-highlander}/Makefile (100%) + rename arch/sh/boards/{renesas/r7780rp => mach-highlander}/irq-r7780mp.c (100%) + rename arch/sh/boards/{renesas/r7780rp => mach-highlander}/irq-r7780rp.c (100%) + rename arch/sh/boards/{renesas/r7780rp => mach-highlander}/irq-r7785rp.c (100%) + rename arch/sh/boards/{renesas/r7780rp => mach-highlander}/psw.c (98%) + rename arch/sh/boards/{renesas/r7780rp => mach-highlander}/setup.c (100%) + rename arch/sh/boards/{hp6xx => mach-hp6xx}/Makefile (100%) + rename arch/sh/boards/{hp6xx => mach-hp6xx}/hp6xx_apm.c (100%) + rename arch/sh/boards/{hp6xx => mach-hp6xx}/pm.c (98%) + rename arch/sh/boards/{hp6xx => mach-hp6xx}/pm_wakeup.S (96%) + rename arch/sh/boards/{hp6xx => mach-hp6xx}/setup.c (99%) + rename arch/sh/boards/{landisk => mach-landisk}/Makefile (100%) + rename arch/sh/boards/{landisk => mach-landisk}/gio.c (97%) + rename arch/sh/boards/{landisk => mach-landisk}/irq.c (96%) + rename arch/sh/boards/{landisk => mach-landisk}/psw.c (98%) + rename arch/sh/boards/{landisk => mach-landisk}/setup.c (98%) + rename arch/sh/boards/{lboxre2 => mach-lboxre2}/Makefile (100%) + rename arch/sh/boards/{lboxre2 => mach-lboxre2}/irq.c (100%) + rename arch/sh/boards/{lboxre2 => mach-lboxre2}/setup.c (100%) + rename arch/sh/boards/{superh/microdev => mach-microdev}/Makefile (100%) + rename arch/sh/boards/{superh/microdev => mach-microdev}/io.c (100%) + rename arch/sh/boards/{superh/microdev => mach-microdev}/irq.c (100%) + rename arch/sh/boards/{superh/microdev => mach-microdev}/led.c (100%) + rename arch/sh/boards/{superh/microdev => mach-microdev}/setup.c (100%) + rename arch/sh/boards/{renesas/migor => mach-migor}/Kconfig (100%) + rename arch/sh/boards/{renesas/migor => mach-migor}/Makefile (100%) + rename arch/sh/boards/{renesas/migor => mach-migor}/lcd_qvga.c (100%) + rename arch/sh/boards/{renesas/migor => mach-migor}/setup.c (99%) + rename arch/sh/boards/{renesas/rts7751r2d => mach-r2d}/Kconfig (100%) + rename arch/sh/boards/{renesas/rts7751r2d => mach-r2d}/Makefile (100%) + rename arch/sh/boards/{renesas/rts7751r2d => mach-r2d}/irq.c (100%) + rename arch/sh/boards/{renesas/rts7751r2d => mach-r2d}/setup.c (100%) + rename arch/sh/boards/{renesas/sdk7780 => mach-sdk7780}/Kconfig (100%) + rename arch/sh/boards/{renesas/sdk7780 => mach-sdk7780}/Makefile (100%) + rename arch/sh/boards/{renesas/sdk7780 => mach-sdk7780}/irq.c (100%) + rename arch/sh/boards/{renesas/sdk7780 => mach-sdk7780}/setup.c (100%) + rename arch/sh/boards/{se => mach-se}/7206/Makefile (100%) + rename arch/sh/boards/{se => mach-se}/7206/io.c (98%) + rename arch/sh/boards/{se => mach-se}/7206/irq.c (98%) + rename arch/sh/boards/{se => mach-se}/7206/setup.c (98%) + rename arch/sh/boards/{se => mach-se}/7343/Makefile (100%) + rename arch/sh/boards/{se => mach-se}/7343/io.c (99%) + rename arch/sh/boards/{se => mach-se}/7343/irq.c (96%) + rename arch/sh/boards/{se => mach-se}/7343/setup.c (98%) + rename arch/sh/boards/{se => mach-se}/770x/Makefile (100%) + rename arch/sh/boards/{se => mach-se}/770x/io.c (99%) + rename arch/sh/boards/{se => mach-se}/770x/irq.c (98%) + rename arch/sh/boards/{se => mach-se}/770x/setup.c (96%) + rename arch/sh/boards/{se => mach-se}/7721/Makefile (100%) + rename arch/sh/boards/{se => mach-se}/7721/irq.c (96%) + rename arch/sh/boards/{se => mach-se}/7721/setup.c (98%) + rename arch/sh/boards/{se => mach-se}/7722/Makefile (100%) + rename arch/sh/boards/{se => mach-se}/7722/irq.c (98%) + rename arch/sh/boards/{se => mach-se}/7722/setup.c (99%) + rename arch/sh/boards/{se => mach-se}/7751/Makefile (100%) + rename arch/sh/boards/{se => mach-se}/7751/io.c (99%) + rename arch/sh/boards/{se => mach-se}/7751/irq.c (96%) + rename arch/sh/boards/{se => mach-se}/7751/pci.c (100%) + rename arch/sh/boards/{se => mach-se}/7751/setup.c (98%) + rename arch/sh/boards/{se => mach-se}/7780/Makefile (100%) + rename arch/sh/boards/{se => mach-se}/7780/irq.c (97%) + rename arch/sh/boards/{se => mach-se}/7780/setup.c (98%) + create mode 100644 arch/sh/boards/mach-se/Makefile + rename arch/sh/boards/{se/7619/setup.c => mach-se/board-se7619.c} (100%) + rename arch/sh/boards/{sh03 => mach-sh03}/Makefile (100%) + rename arch/sh/boards/{sh03 => mach-sh03}/rtc.c (100%) + rename arch/sh/boards/{sh03 => mach-sh03}/setup.c (96%) + rename arch/sh/boards/{renesas/sh7763rdp => mach-sh7763rdp}/Makefile (100%) + rename arch/sh/boards/{renesas/sh7763rdp => mach-sh7763rdp}/irq.c (100%) + rename arch/sh/boards/{renesas/sh7763rdp => mach-sh7763rdp}/setup.c (100%) + rename arch/sh/boards/{snapgear => mach-snapgear}/Makefile (100%) + rename arch/sh/boards/{snapgear => mach-snapgear}/io.c (100%) + rename arch/sh/boards/{snapgear => mach-snapgear}/setup.c (98%) + rename arch/sh/boards/{renesas/systemh => mach-systemh}/Makefile (100%) + rename arch/sh/boards/{renesas/systemh => mach-systemh}/io.c (100%) + rename arch/sh/boards/{renesas/systemh => mach-systemh}/irq.c (100%) + rename arch/sh/boards/{renesas/systemh => mach-systemh}/setup.c (100%) + rename arch/sh/boards/{titan => mach-titan}/Makefile (100%) + rename arch/sh/boards/{titan => mach-titan}/io.c (100%) + rename arch/sh/boards/{titan => mach-titan}/setup.c (100%) + rename arch/sh/boards/{renesas/x3proto => mach-x3proto}/Makefile (100%) + rename arch/sh/boards/{renesas/x3proto => mach-x3proto}/ilsel.c (100%) + rename arch/sh/boards/{renesas/x3proto => mach-x3proto}/setup.c (100%) + delete mode 100644 arch/sh/boards/magicpanelr2/Kconfig + delete mode 100644 arch/sh/boards/magicpanelr2/Makefile + delete mode 100644 arch/sh/boards/renesas/ap325rxa/Makefile + delete mode 100644 arch/sh/boards/renesas/rsk7203/Makefile + delete mode 100644 arch/sh/boards/renesas/sh7785lcr/Makefile + delete mode 100644 arch/sh/boards/se/7619/Makefile + delete mode 100644 arch/sh/boards/shmin/Makefile + create mode 100644 arch/sh/include/asm/.gitignore + rename {include/asm-sh => arch/sh/include/asm}/Kbuild (100%) + rename {include/asm-sh => arch/sh/include/asm}/a.out.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/adc.h (88%) + rename {include/asm-sh => arch/sh/include/asm}/addrspace.h (98%) + rename {include/asm-sh => arch/sh/include/asm}/atomic-grb.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/atomic-irq.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/atomic-llsc.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/atomic.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/auxvec.h (94%) + rename {include/asm-sh => arch/sh/include/asm}/bitops-grb.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/bitops-irq.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/bitops.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/bug.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/bugs.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/byteorder.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/cache.h (97%) + rename {include/asm-sh => arch/sh/include/asm}/cacheflush.h (98%) + rename {include/asm-sh => arch/sh/include/asm}/checksum.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/checksum_32.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/checksum_64.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/clock.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/cmpxchg-grb.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/cmpxchg-irq.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/cpu-features.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/cputime.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/current.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/delay.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/device.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/div64.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/dma-mapping.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/dma.h (99%) + rename {include/asm-sh => arch/sh/include/asm}/dmabrg.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/edosk7705.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/elf.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/emergency-restart.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/entry-macros.S (100%) + rename {include/asm-sh => arch/sh/include/asm}/errno.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/fb.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/fcntl.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/fixmap.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/flat.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/fpu.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/freq.h (94%) + rename {include/asm-sh => arch/sh/include/asm}/futex-irq.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/futex.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/gpio.h (94%) + rename {include/asm-sh => arch/sh/include/asm}/hardirq.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/hd64461.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/hd64465/gpio.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/hd64465/hd64465.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/hd64465/io.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/heartbeat.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/hp6xx.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/hugetlb.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/hw_irq.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/i2c-sh7760.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/ilsel.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/io.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/io_generic.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/io_trapped.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/ioctl.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/ioctls.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/ipcbuf.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/irq.h (97%) + rename {include/asm-sh => arch/sh/include/asm}/irq_regs.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/irqflags.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/irqflags_32.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/irqflags_64.h (98%) + rename {include/asm-sh => arch/sh/include/asm}/kdebug.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/kexec.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/kgdb.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/kmap_types.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/lboxre2.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/linkage.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/local.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/machvec.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/magicpanelr2.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/mc146818rtc.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/microdev.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/migor.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/mman.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/mmu.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/mmu_context.h (99%) + rename {include/asm-sh => arch/sh/include/asm}/mmu_context_32.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/mmu_context_64.h (98%) + rename {include/asm-sh => arch/sh/include/asm}/mmzone.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/module.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/msgbuf.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/mutex.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/page.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/param.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/parport.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/pci.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/percpu.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/pgalloc.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/pgtable.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/pgtable_32.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/pgtable_64.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/pm.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/poll.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/posix_types.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/posix_types_32.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/posix_types_64.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/processor.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/processor_32.h (98%) + rename {include/asm-sh => arch/sh/include/asm}/processor_64.h (99%) + rename {include/asm-sh => arch/sh/include/asm}/ptrace.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/push-switch.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/r7780rp.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/resource.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/rtc.h (92%) + rename {include/asm-sh => arch/sh/include/asm}/rts7751r2d.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/rwsem.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/scatterlist.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/sdk7780.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/sections.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/segment.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/sembuf.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/serial.h (96%) + rename {include/asm-sh => arch/sh/include/asm}/setup.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/sfp-machine.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/sh7760fb.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/sh7763rdp.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/sh7785lcr.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/sh_bios.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/sh_keysc.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/sh_mobile_lcdc.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/shmbuf.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/shmin.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/shmparam.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/sigcontext.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/siginfo.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/signal.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/smc37c93x.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/smp.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/snapgear.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/socket.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/sockios.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/sparsemem.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/spi.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/spinlock.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/spinlock_types.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/stat.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/statfs.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/string.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/string_32.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/string_64.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/system.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/system_32.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/system_64.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/systemh7751.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/termbits.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/termios.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/thread_info.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/timer.h (96%) + rename {include/asm-sh => arch/sh/include/asm}/timex.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/titan.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/tlb.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/tlb_64.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/tlbflush.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/topology.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/types.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/uaccess.h (97%) + rename {include/asm-sh => arch/sh/include/asm}/uaccess_32.h (98%) + rename {include/asm-sh => arch/sh/include/asm}/uaccess_64.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/ubc.h (98%) + rename {include/asm-sh => arch/sh/include/asm}/ucontext.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/unaligned.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/unistd.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/unistd_32.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/unistd_64.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/user.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/vga.h (100%) + rename {include/asm-sh => arch/sh/include/asm}/watchdog.h (96%) + rename {include/asm-sh => arch/sh/include/asm}/xor.h (100%) + rename {include/asm-sh/cpu-sh2 => arch/sh/include/cpu-common/cpu}/addrspace.h (100%) + rename {include/asm-sh/cpu-sh2 => arch/sh/include/cpu-common/cpu}/cacheflush.h (99%) + rename {include/asm-sh/cpu-sh2 => arch/sh/include/cpu-common/cpu}/mmu_context.h (100%) + rename {include/asm-sh/cpu-sh2 => arch/sh/include/cpu-common/cpu}/rtc.h (100%) + rename {include/asm-sh/cpu-sh2 => arch/sh/include/cpu-common/cpu}/sigcontext.h (100%) + rename {include/asm-sh/cpu-sh2 => arch/sh/include/cpu-common/cpu}/timer.h (100%) + rename {include/asm-sh/cpu-sh2 => arch/sh/include/cpu-sh2/cpu}/cache.h (100%) + rename {include/asm-sh/cpu-sh2 => arch/sh/include/cpu-sh2/cpu}/dma.h (100%) + rename {include/asm-sh/cpu-sh2 => arch/sh/include/cpu-sh2/cpu}/freq.h (100%) + rename {include/asm-sh/cpu-sh2 => arch/sh/include/cpu-sh2/cpu}/ubc.h (100%) + rename {include/asm-sh/cpu-sh2 => arch/sh/include/cpu-sh2/cpu}/watchdog.h (100%) + rename {include/asm-sh/cpu-sh2a => arch/sh/include/cpu-sh2a/cpu}/cache.h (100%) + create mode 100644 arch/sh/include/cpu-sh2a/cpu/dma.h + rename {include/asm-sh/cpu-sh2a => arch/sh/include/cpu-sh2a/cpu}/freq.h (100%) + rename {include/asm-sh/cpu-sh2a => arch/sh/include/cpu-sh2a/cpu}/rtc.h (100%) + create mode 100644 arch/sh/include/cpu-sh2a/cpu/ubc.h + create mode 100644 arch/sh/include/cpu-sh2a/cpu/watchdog.h + rename {include/asm-sh/cpu-sh3 => arch/sh/include/cpu-sh3/cpu}/adc.h (100%) + rename {include/asm-sh/cpu-sh3 => arch/sh/include/cpu-sh3/cpu}/cache.h (100%) + create mode 100644 arch/sh/include/cpu-sh3/cpu/cacheflush.h + rename {include/asm-sh/cpu-sh3 => arch/sh/include/cpu-sh3/cpu}/dac.h (100%) + rename {include/asm-sh/cpu-sh3 => arch/sh/include/cpu-sh3/cpu}/dma.h (100%) + rename {include/asm-sh/cpu-sh3 => arch/sh/include/cpu-sh3/cpu}/freq.h (100%) + rename {include/asm-sh/cpu-sh3 => arch/sh/include/cpu-sh3/cpu}/gpio.h (100%) + rename {include/asm-sh/cpu-sh3 => arch/sh/include/cpu-sh3/cpu}/mmu_context.h (100%) + rename {include/asm-sh/cpu-sh3 => arch/sh/include/cpu-sh3/cpu}/timer.h (100%) + rename {include/asm-sh/cpu-sh3 => arch/sh/include/cpu-sh3/cpu}/ubc.h (100%) + rename {include/asm-sh/cpu-sh3 => arch/sh/include/cpu-sh3/cpu}/watchdog.h (100%) + rename {include/asm-sh/cpu-sh4 => arch/sh/include/cpu-sh4/cpu}/addrspace.h (100%) + rename {include/asm-sh/cpu-sh4 => arch/sh/include/cpu-sh4/cpu}/cache.h (100%) + rename {include/asm-sh/cpu-sh4 => arch/sh/include/cpu-sh4/cpu}/cacheflush.h (100%) + rename {include/asm-sh/cpu-sh4 => arch/sh/include/cpu-sh4/cpu}/dma-sh7780.h (100%) + rename {include/asm-sh/cpu-sh4 => arch/sh/include/cpu-sh4/cpu}/dma.h (97%) + rename {include/asm-sh/cpu-sh4 => arch/sh/include/cpu-sh4/cpu}/fpu.h (100%) + rename {include/asm-sh/cpu-sh4 => arch/sh/include/cpu-sh4/cpu}/freq.h (100%) + rename {include/asm-sh/cpu-sh4 => arch/sh/include/cpu-sh4/cpu}/mmu_context.h (100%) + rename {include/asm-sh/cpu-sh4 => arch/sh/include/cpu-sh4/cpu}/rtc.h (100%) + rename {include/asm-sh/cpu-sh4 => arch/sh/include/cpu-sh4/cpu}/sigcontext.h (100%) + rename {include/asm-sh/cpu-sh4 => arch/sh/include/cpu-sh4/cpu}/sq.h (100%) + rename {include/asm-sh/cpu-sh4 => arch/sh/include/cpu-sh4/cpu}/timer.h (100%) + rename {include/asm-sh/cpu-sh4 => arch/sh/include/cpu-sh4/cpu}/ubc.h (100%) + rename {include/asm-sh/cpu-sh4 => arch/sh/include/cpu-sh4/cpu}/watchdog.h (100%) + rename {include/asm-sh/cpu-sh5 => arch/sh/include/cpu-sh5/cpu}/addrspace.h (100%) + rename {include/asm-sh/cpu-sh5 => arch/sh/include/cpu-sh5/cpu}/cache.h (100%) + rename {include/asm-sh/cpu-sh5 => arch/sh/include/cpu-sh5/cpu}/cacheflush.h (100%) + rename {include/asm-sh/cpu-sh5 => arch/sh/include/cpu-sh5/cpu}/dma.h (100%) + rename {include/asm-sh/cpu-sh5 => arch/sh/include/cpu-sh5/cpu}/irq.h (100%) + rename {include/asm-sh/cpu-sh5 => arch/sh/include/cpu-sh5/cpu}/mmu_context.h (100%) + rename {include/asm-sh/cpu-sh5 => arch/sh/include/cpu-sh5/cpu}/registers.h (100%) + rename {include/asm-sh/cpu-sh5 => arch/sh/include/cpu-sh5/cpu}/rtc.h (100%) + rename {include/asm-sh/dreamcast => arch/sh/include/mach-dreamcast/mach}/dma.h (100%) + rename {include/asm-sh/dreamcast => arch/sh/include/mach-dreamcast/mach}/maple.h (100%) + rename {include/asm-sh/dreamcast => arch/sh/include/mach-dreamcast/mach}/pci.h (93%) + rename {include/asm-sh/dreamcast => arch/sh/include/mach-dreamcast/mach}/sysasic.h (100%) + rename {include/asm-sh/landisk => arch/sh/include/mach-landisk/mach}/gio.h (100%) + rename {include/asm-sh/landisk => arch/sh/include/mach-landisk/mach}/iodata_landisk.h (100%) + rename {include/asm-sh => arch/sh/include/mach-se/mach}/se.h (100%) + rename {include/asm-sh => arch/sh/include/mach-se/mach}/se7206.h (100%) + rename {include/asm-sh => arch/sh/include/mach-se/mach}/se7343.h (100%) + rename {include/asm-sh => arch/sh/include/mach-se/mach}/se7721.h (100%) + rename {include/asm-sh => arch/sh/include/mach-se/mach}/se7722.h (100%) + rename {include/asm-sh => arch/sh/include/mach-se/mach}/se7751.h (100%) + rename {include/asm-sh => arch/sh/include/mach-se/mach}/se7780.h (100%) + rename {include/asm-sh/sh03 => arch/sh/include/mach-sh03/mach}/io.h (100%) + rename {include/asm-sh/sh03 => arch/sh/include/mach-sh03/mach}/sh03.h (100%) + create mode 100644 arch/sh/kernel/.gitignore + delete mode 100644 include/asm-sh/.gitignore + delete mode 100644 include/asm-sh/cpu-sh2a/addrspace.h + delete mode 100644 include/asm-sh/cpu-sh2a/cacheflush.h + delete mode 100644 include/asm-sh/cpu-sh2a/dma.h + delete mode 100644 include/asm-sh/cpu-sh2a/mmu_context.h + delete mode 100644 include/asm-sh/cpu-sh2a/timer.h + delete mode 100644 include/asm-sh/cpu-sh2a/ubc.h + delete mode 100644 include/asm-sh/cpu-sh2a/watchdog.h + delete mode 100644 include/asm-sh/cpu-sh3/addrspace.h + delete mode 100644 include/asm-sh/cpu-sh3/cacheflush.h + delete mode 100644 include/asm-sh/cpu-sh3/rtc.h + delete mode 100644 include/asm-sh/cpu-sh3/sigcontext.h + delete mode 100644 include/asm-sh/cpu-sh5/timer.h +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging kbuild/master +$ git merge kbuild/master +Already up-to-date. +Merging quilt/ide +$ git merge quilt/ide +Auto-merged drivers/ide/ide-probe.c +Auto-merged drivers/ide/ide-tape.c +Auto-merged drivers/ide/ppc/pmac.c +Auto-merged drivers/scsi/hptiop.c +Auto-merged init/main.c +Merge made by recursive. + arch/arm/mach-pxa/pcm990-baseboard.c | 1 - + arch/m68k/mac/baboon.c | 1 - + arch/m68k/mac/via.c | 1 - + arch/mips/emma2rh/markeins/setup.c | 1 - + arch/mips/jazz/setup.c | 2 - + arch/sh/boards/mach-systemh/irq.c | 3 +- + arch/xtensa/kernel/xtensa_ksyms.c | 1 - + drivers/ata/libata-scsi.c | 2 +- + drivers/block/hd.c | 9 +- + drivers/ide/Kconfig | 33 ---- + drivers/ide/arm/icside.c | 5 +- + drivers/ide/arm/palm_bk3710.c | 8 +- + drivers/ide/ide-acpi.c | 6 +- + drivers/ide/ide-atapi.c | 34 ++-- + drivers/ide/ide-cd.c | 100 ++++++------ + drivers/ide/ide-disk.c | 266 ++++++++++++++---------------- + drivers/ide/ide-dma.c | 56 +++--- + drivers/ide/ide-floppy.c | 70 +++++---- + drivers/ide/ide-io.c | 73 ++++----- + drivers/ide/ide-iops.c | 225 ++++++++------------------ + drivers/ide/ide-lib.c | 73 ++++---- + drivers/ide/ide-probe.c | 240 +++++++++++++-------------- + drivers/ide/ide-proc.c | 300 +++++++++++----------------------- + drivers/ide/ide-tape.c | 104 ++++++++----- + drivers/ide/ide-taskfile.c | 61 ++++--- + drivers/ide/ide-timings.c | 22 +-- + drivers/ide/ide.c | 143 ++++++++++++----- + drivers/ide/legacy/ali14xx.c | 1 - + drivers/ide/legacy/buddha.c | 1 - + drivers/ide/legacy/dtc2278.c | 1 - + drivers/ide/legacy/falconide.c | 1 - + drivers/ide/legacy/gayle.c | 1 - + drivers/ide/legacy/ht6560b.c | 1 - + drivers/ide/legacy/ide-cs.c | 1 - + drivers/ide/legacy/macide.c | 1 - + drivers/ide/legacy/q40ide.c | 2 - + drivers/ide/legacy/qd65xx.c | 23 ++-- + drivers/ide/legacy/umc8672.c | 1 - + drivers/ide/pci/aec62xx.c | 1 - + drivers/ide/pci/alim15x3.c | 5 +- + drivers/ide/pci/atiixp.c | 1 - + drivers/ide/pci/cmd640.c | 43 +++--- + drivers/ide/pci/cmd64x.c | 1 - + drivers/ide/pci/cs5520.c | 1 - + drivers/ide/pci/cs5530.c | 15 +- + drivers/ide/pci/cs5535.c | 4 +- + drivers/ide/pci/delkin_cb.c | 1 - + drivers/ide/pci/generic.c | 1 - + drivers/ide/pci/hpt34x.c | 1 - + drivers/ide/pci/hpt366.c | 13 +- + drivers/ide/pci/it8213.c | 1 - + drivers/ide/pci/it821x.c | 52 +++--- + drivers/ide/pci/jmicron.c | 1 - + drivers/ide/pci/ns87415.c | 7 +- + drivers/ide/pci/opti621.c | 5 +- + drivers/ide/pci/pdc202xx_new.c | 5 +- + drivers/ide/pci/pdc202xx_old.c | 7 +- + drivers/ide/pci/piix.c | 1 - + drivers/ide/pci/rz1000.c | 1 - + drivers/ide/pci/sc1200.c | 15 +- + drivers/ide/pci/scc_pata.c | 5 +- + drivers/ide/pci/serverworks.c | 5 +- + drivers/ide/pci/sgiioc4.c | 1 - + drivers/ide/pci/siimage.c | 13 +- + drivers/ide/pci/sis5513.c | 1 - + drivers/ide/pci/sl82c105.c | 3 +- + drivers/ide/pci/slc90e66.c | 1 - + drivers/ide/pci/triflex.c | 1 - + drivers/ide/pci/trm290.c | 1 - + drivers/ide/pci/via82cxxx.c | 4 +- + drivers/ide/ppc/pmac.c | 6 +- + drivers/macintosh/mediabay.c | 1 - + drivers/scsi/hptiop.c | 1 - + drivers/scsi/ide-scsi.c | 83 ++++++---- + drivers/usb/storage/freecom.c | 2 - + include/asm-powerpc/ide.h | 1 - + include/linux/ata.h | 172 ++++++++++++++----- + include/linux/ide.h | 213 +++++++++++++----------- + init/main.c | 1 - + 79 files changed, 1229 insertions(+), 1342 deletions(-) +Merging libata/NEXT +$ git merge libata/NEXT +Already up-to-date. +Merging nfs/linux-next +$ git merge nfs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Auto-merged fs/dcache.c +Auto-merged fs/xfs/linux-2.6/kmem.h +Auto-merged fs/xfs/linux-2.6/xfs_ioctl.c +Auto-merged fs/xfs/linux-2.6/xfs_iops.c +Auto-merged fs/xfs/linux-2.6/xfs_super.c +Merge made by recursive. + fs/dcache.c | 102 +++++ + fs/xfs/Makefile | 3 +- + fs/xfs/linux-2.6/kmem.c | 6 +- + fs/xfs/linux-2.6/kmem.h | 4 +- + fs/xfs/linux-2.6/xfs_aops.c | 5 +- + fs/xfs/linux-2.6/xfs_buf.c | 14 +- + fs/xfs/linux-2.6/xfs_buf.h | 2 +- + fs/xfs/linux-2.6/xfs_export.c | 2 +- + fs/xfs/linux-2.6/xfs_ioctl.c | 376 ++++++++++++++-- + fs/xfs/linux-2.6/xfs_iops.c | 345 +++++---------- + fs/xfs/linux-2.6/xfs_iops.h | 2 + + fs/xfs/linux-2.6/xfs_linux.h | 8 + + fs/xfs/linux-2.6/xfs_stats.c | 15 +- + fs/xfs/linux-2.6/xfs_stats.h | 12 +- + fs/xfs/linux-2.6/xfs_super.c | 949 ++++++++++++++++++++++++++++++++++++---- + fs/xfs/linux-2.6/xfs_super.h | 4 +- + fs/xfs/linux-2.6/xfs_sysctl.c | 8 +- + fs/xfs/linux-2.6/xfs_sysctl.h | 4 +- + fs/xfs/linux-2.6/xfs_vnode.c | 50 --- + fs/xfs/linux-2.6/xfs_vnode.h | 89 ---- + fs/xfs/linux-2.6/xfs_xattr.c | 330 ++++++++++++++ + fs/xfs/quota/xfs_dquot.c | 3 +- + fs/xfs/quota/xfs_dquot.h | 2 +- + fs/xfs/quota/xfs_dquot_item.c | 4 +- + fs/xfs/quota/xfs_qm.c | 24 +- + fs/xfs/quota/xfs_qm_syscalls.c | 12 +- + fs/xfs/quota/xfs_quota_priv.h | 3 - + fs/xfs/support/ktrace.c | 4 +- + fs/xfs/support/uuid.c | 8 +- + fs/xfs/support/uuid.h | 1 - + fs/xfs/xfs_acl.c | 21 +- + fs/xfs/xfs_acl.h | 4 +- + fs/xfs/xfs_attr.c | 608 ++++---------------------- + fs/xfs/xfs_attr.h | 90 ++--- + fs/xfs/xfs_attr_leaf.c | 99 ++--- + fs/xfs/xfs_attr_leaf.h | 29 +-- + fs/xfs/xfs_attr_sf.h | 10 +- + fs/xfs/xfs_bit.c | 103 ----- + fs/xfs/xfs_bit.h | 34 ++- + fs/xfs/xfs_bmap.c | 118 +++--- + fs/xfs/xfs_bmap.h | 13 +- + fs/xfs/xfs_bmap_btree.c | 76 ++-- + fs/xfs/xfs_buf_item.c | 8 +- + fs/xfs/xfs_clnt.h | 1 + + fs/xfs/xfs_da_btree.c | 48 ++- + fs/xfs/xfs_da_btree.h | 36 ++- + fs/xfs/xfs_dfrag.c | 4 +- + fs/xfs/xfs_dir2.c | 125 +++++- + fs/xfs/xfs_dir2.h | 6 +- + fs/xfs/xfs_dir2_block.c | 56 ++- + fs/xfs/xfs_dir2_data.c | 5 +- + fs/xfs/xfs_dir2_leaf.c | 93 +++-- + fs/xfs/xfs_dir2_node.c | 402 ++++++++++------- + fs/xfs/xfs_dir2_sf.c | 83 ++-- + fs/xfs/xfs_dir2_sf.h | 6 +- + fs/xfs/xfs_dir2_trace.c | 20 +- + fs/xfs/xfs_dmapi.h | 2 +- + fs/xfs/xfs_error.c | 13 +- + fs/xfs/xfs_error.h | 1 - + fs/xfs/xfs_extfree_item.c | 6 +- + fs/xfs/xfs_filestream.c | 4 +- + fs/xfs/xfs_fs.h | 4 + + fs/xfs/xfs_fsops.c | 4 +- + fs/xfs/xfs_inode.c | 165 +++----- + fs/xfs/xfs_inode.h | 3 - + fs/xfs/xfs_inode_item.c | 7 +- + fs/xfs/xfs_iomap.c | 10 + + fs/xfs/xfs_itable.c | 6 +- + fs/xfs/xfs_log.c | 49 +- + fs/xfs/xfs_log_priv.h | 6 +- + fs/xfs/xfs_log_recover.c | 21 +- + fs/xfs/xfs_mount.c | 118 ++---- + fs/xfs/xfs_mount.h | 18 +- + fs/xfs/xfs_mru_cache.c | 21 +- + fs/xfs/xfs_rename.c | 22 +- + fs/xfs/xfs_rtalloc.c | 21 +- + fs/xfs/xfs_sb.h | 17 +- + fs/xfs/xfs_trans.c | 4 +- + fs/xfs/xfs_trans_inode.c | 2 +- + fs/xfs/xfs_trans_item.c | 8 +- + fs/xfs/xfs_vfsops.c | 610 +------------------------- + fs/xfs/xfs_vfsops.h | 5 - + fs/xfs/xfs_vnodeops.c | 722 +++++++++---------------------- + fs/xfs/xfs_vnodeops.h | 12 +- + include/linux/dcache.h | 1 + + 85 files changed, 3153 insertions(+), 3218 deletions(-) + create mode 100644 fs/xfs/linux-2.6/xfs_xattr.c +Merging infiniband/for-next +$ git merge infiniband/for-next +Merge made by recursive. + drivers/infiniband/hw/ipath/ipath_verbs.c | 6 +++--- + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Auto-merged MAINTAINERS +Auto-merged net/sunrpc/svc.c +Merge made by recursive. + MAINTAINERS | 4 ++-- + fs/lockd/svc.c | 2 +- + fs/lockd/svc4proc.c | 4 ++-- + fs/lockd/svcproc.c | 4 ++-- + fs/nfs/callback.c | 3 ++- + fs/nfsd/export.c | 6 +++--- + fs/nfsd/nfssvc.c | 1 + + include/linux/sunrpc/svc.h | 9 +++++---- + net/sunrpc/svc.c | 11 ++++++----- + net/sunrpc/svc_xprt.c | 39 +++++++++++++++++++++++++++++++++------ + 10 files changed, 57 insertions(+), 26 deletions(-) +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Auto-merged drivers/firewire/fw-sbp2.c +Merge made by recursive. + drivers/firewire/fw-card.c | 56 +++++++++--------------------------- + drivers/firewire/fw-device.c | 37 ++++-------------------- + drivers/firewire/fw-sbp2.c | 46 ++++++++---------------------- + drivers/firewire/fw-transaction.c | 48 +++++++++++++++++++++++++++++-- + drivers/firewire/fw-transaction.h | 9 ++++-- + 5 files changed, 82 insertions(+), 114 deletions(-) +Merging hwmon/testing +$ git merge hwmon/testing +Auto-merged drivers/hwmon/adt7473.c +Merge made by recursive. + Documentation/hwmon/dme1737 | 4 + + Documentation/hwmon/lm85 | 11 +- + drivers/hwmon/Kconfig | 25 ++- + drivers/hwmon/adt7473.c | 16 +- + drivers/hwmon/dme1737.c | 297 ++++++++++++-------- + drivers/hwmon/lm75.c | 282 +++++++++++++----- + drivers/hwmon/lm85.c | 672 ++++++++++++++++++------------------------- + 7 files changed, 691 insertions(+), 616 deletions(-) +Merging ubi/linux-next +$ git merge ubi/linux-next +Already up-to-date. +Merging kvm/master +$ git merge kvm/master +Merge made by recursive. + arch/powerpc/kernel/asm-offsets.c | 4 +- + arch/powerpc/kvm/44x_tlb.c | 49 +++- + arch/powerpc/kvm/Kconfig | 11 + + arch/powerpc/kvm/Makefile | 6 +- + arch/powerpc/kvm/booke_guest.c | 17 + + arch/powerpc/kvm/booke_interrupts.S | 79 +++-- + arch/powerpc/kvm/emulate.c | 8 +- + arch/powerpc/kvm/powerpc.c | 99 ++++++- + arch/s390/kvm/priv.c | 1 + + arch/x86/kernel/kvmclock.c | 30 ++ + arch/x86/kernel/pvclock.c | 12 + + arch/x86/kvm/i8254.c | 70 +++--- + arch/x86/kvm/i8254.h | 7 +- + arch/x86/kvm/i8259.c | 30 ++- + arch/x86/kvm/irq.c | 36 +++- + arch/x86/kvm/irq.h | 10 +- + arch/x86/kvm/kvm_cache_regs.h | 32 ++ + arch/x86/kvm/lapic.c | 11 +- + arch/x86/kvm/mmu.c | 120 +++++++- + arch/x86/kvm/paging_tmpl.h | 12 + + arch/x86/kvm/svm.c | 138 +++------ + arch/x86/kvm/vmx.c | 428 ++++++++++++++------------- + arch/x86/kvm/vmx.h | 4 +- + arch/x86/kvm/x86.c | 554 ++++++++++++++++++++++++++--------- + arch/x86/kvm/x86.h | 22 ++ + arch/x86/kvm/x86_emulate.c | 19 +- + arch/x86/xen/time.c | 11 +- + include/asm-powerpc/kvm_host.h | 14 +- + include/asm-powerpc/kvm_ppc.h | 12 + + include/asm-x86/kvm.h | 22 -- + include/asm-x86/kvm_host.h | 73 ++++-- + include/asm-x86/pvclock.h | 1 + + include/linux/kvm.h | 68 ++++- + include/linux/kvm_host.h | 43 +++ + virt/kvm/ioapic.c | 20 +- + virt/kvm/ioapic.h | 3 +- + virt/kvm/kvm_main.c | 177 +++++++++++- + virt/kvm/kvm_trace.c | 30 +- + 38 files changed, 1634 insertions(+), 649 deletions(-) + create mode 100644 arch/x86/kvm/kvm_cache_regs.h + create mode 100644 arch/x86/kvm/x86.h +Merging dlm/next +$ git merge dlm/next +Merge made by recursive. + fs/dlm/config.c | 203 +++++++++++++++++++++++++++++-------------------------- + fs/dlm/user.c | 10 ++- + 2 files changed, 114 insertions(+), 99 deletions(-) +Merging scsi/master +$ git merge scsi/master +Already up-to-date. +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging tests/master +$ git merge tests/master +Auto-merged Makefile +Auto-merged drivers/misc/Makefile +Auto-merged kernel/Makefile +Merge made by recursive. + Makefile | 1 + + drivers/misc/Makefile | 1 - + kernel/Makefile | 4 - + lib/Kconfig.debug | 93 +-------------------- + lib/Makefile | 1 - + tests/Kconfig | 101 +++++++++++++++++++++++ + tests/Makefile | 10 ++ + {kernel => tests}/backtracetest.c | 0 + {drivers/misc => tests}/lkdtm.c | 0 + {lib => tests}/locking-selftest-hardirq.h | 0 + {lib => tests}/locking-selftest-mutex.h | 0 + {lib => tests}/locking-selftest-rlock-hardirq.h | 0 + {lib => tests}/locking-selftest-rlock-softirq.h | 0 + {lib => tests}/locking-selftest-rlock.h | 0 + {lib => tests}/locking-selftest-rsem.h | 0 + {lib => tests}/locking-selftest-softirq.h | 0 + {lib => tests}/locking-selftest-spin-hardirq.h | 0 + {lib => tests}/locking-selftest-spin-softirq.h | 0 + {lib => tests}/locking-selftest-spin.h | 0 + {lib => tests}/locking-selftest-wlock-hardirq.h | 0 + {lib => tests}/locking-selftest-wlock-softirq.h | 0 + {lib => tests}/locking-selftest-wlock.h | 0 + {lib => tests}/locking-selftest-wsem.h | 0 + {lib => tests}/locking-selftest.c | 0 + {kernel => tests}/rcutorture.c | 0 + {kernel => tests}/rtmutex-tester.c | 2 +- + {kernel => tests}/test_kprobes.c | 0 + 27 files changed, 115 insertions(+), 98 deletions(-) + create mode 100644 tests/Kconfig + create mode 100644 tests/Makefile + rename {kernel => tests}/backtracetest.c (100%) + rename {drivers/misc => tests}/lkdtm.c (100%) + rename {lib => tests}/locking-selftest-hardirq.h (100%) + rename {lib => tests}/locking-selftest-mutex.h (100%) + rename {lib => tests}/locking-selftest-rlock-hardirq.h (100%) + rename {lib => tests}/locking-selftest-rlock-softirq.h (100%) + rename {lib => tests}/locking-selftest-rlock.h (100%) + rename {lib => tests}/locking-selftest-rsem.h (100%) + rename {lib => tests}/locking-selftest-softirq.h (100%) + rename {lib => tests}/locking-selftest-spin-hardirq.h (100%) + rename {lib => tests}/locking-selftest-spin-softirq.h (100%) + rename {lib => tests}/locking-selftest-spin.h (100%) + rename {lib => tests}/locking-selftest-wlock-hardirq.h (100%) + rename {lib => tests}/locking-selftest-wlock-softirq.h (100%) + rename {lib => tests}/locking-selftest-wlock.h (100%) + rename {lib => tests}/locking-selftest-wsem.h (100%) + rename {lib => tests}/locking-selftest.c (100%) + rename {kernel => tests}/rcutorture.c (100%) + rename {kernel => tests}/rtmutex-tester.c (99%) + rename {kernel => tests}/test_kprobes.c (100%) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Auto-merged fs/ocfs2/file.c +Auto-merged fs/ocfs2/super.c +Merge made by recursive. + Documentation/filesystems/configfs/configfs.txt | 17 ++- + ...figfs_example.c => configfs_example_explicit.c} | 18 +- + ...onfigfs_example.c => configfs_example_macros.c} | 75 ++------ + fs/configfs/configfs_internal.h | 3 + + fs/configfs/dir.c | 210 ++++++++++++++++---- + fs/configfs/symlink.c | 26 +++ + fs/ocfs2/aops.c | 29 ++-- + fs/ocfs2/file.c | 2 +- + fs/ocfs2/journal.c | 173 +++++++++++++---- + fs/ocfs2/journal.h | 3 +- + fs/ocfs2/ocfs2.h | 2 + + fs/ocfs2/ocfs2_fs.h | 5 +- + fs/ocfs2/super.c | 12 +- + include/linux/configfs.h | 68 ++++++- + 14 files changed, 475 insertions(+), 168 deletions(-) + copy Documentation/filesystems/configfs/{configfs_example.c => configfs_example_explicit.c} (96%) + rename Documentation/filesystems/configfs/{configfs_example.c => configfs_example_macros.c} (85%) +Merging quilt/m68k +$ git merge quilt/m68k +Already up-to-date. +Merging powerpc/next +$ git merge powerpc/next +Already up-to-date. +Merging ext4/next +$ git merge ext4/next +Auto-merged fs/ext4/acl.c +Auto-merged fs/ext4/inode.c +Auto-merged fs/ext4/super.c +Merge made by recursive. + Documentation/filesystems/ext4.txt | 6 + + fs/ext4/acl.c | 188 +++++++++++----------- + fs/ext4/balloc.c | 11 +- + fs/ext4/ext4.h | 1 - + fs/ext4/extents.c | 43 +++--- + fs/ext4/ialloc.c | 56 ++++--- + fs/ext4/inode.c | 123 +++++++++----- + fs/ext4/mballoc.c | 254 ++++++++++++++++++++++++----- + fs/ext4/mballoc.h | 10 +- + fs/ext4/resize.c | 79 +++++----- + fs/ext4/super.c | 316 +++++++++++++++++++----------------- + fs/ext4/xattr.c | 2 +- + fs/jbd2/commit.c | 10 +- + fs/jbd2/journal.c | 1 - + 14 files changed, 680 insertions(+), 420 deletions(-) +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging async_tx/next +$ git merge async_tx/next +Already up-to-date. +Merging udf/for_next +$ git merge udf/for_next +Already uptodate! +Merge made by recursive. +Merging net/master +$ git merge net/master +Already up-to-date. +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging galak/powerpc-next +$ git merge galak/powerpc-next +Already uptodate! +Merge made by recursive. +Merging mtd/master +$ git merge mtd/master +Merge made by recursive. + drivers/mtd/chips/jedec_probe.c | 2 +- + drivers/mtd/devices/mtd_dataflash.c | 130 ++++++++++++++++++++++------------- + drivers/mtd/nand/fsl_elbc_nand.c | 2 +- + drivers/mtd/nand/nandsim.c | 57 +++++++++++----- + include/linux/mtd/mtd.h | 6 ++- + include/linux/mtd/nand.h | 4 +- + 6 files changed, 133 insertions(+), 68 deletions(-) +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Merge made by recursive. + crypto/Kconfig | 81 ++++++++++++++++++++++++---------------------- + crypto/tcrypt.c | 28 +++++++++++----- + drivers/crypto/talitos.c | 54 ++++++++++++++++++++++-------- + 3 files changed, 100 insertions(+), 63 deletions(-) +Merging vfs/for-next +$ git merge vfs/for-next +Merge made by recursive. + fs/devpts/inode.c | 16 +++--- + fs/fcntl.c | 140 +++++++++++++++----------------------------------- + fs/file.c | 61 ++++++++++++++++++++++ + fs/namei.c | 2 +- + fs/open.c | 56 -------------------- + fs/proc/generic.c | 27 ++++----- + include/linux/file.h | 3 +- + net/ipv4/route.c | 2 + + 8 files changed, 127 insertions(+), 180 deletions(-) +Merging sound/for-next +$ git merge sound/for-next +Merge made by recursive. +Merging arm/devel +$ git merge arm/devel +Already up-to-date. +Merging cpufreq/next +$ git merge cpufreq/next +Auto-merged arch/x86/kernel/cpu/cpufreq/elanfreq.c +Auto-merged drivers/cpufreq/cpufreq.c +Auto-merged drivers/cpufreq/cpufreq_conservative.c +Merge made by recursive. + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 8 +++-- + arch/x86/kernel/cpu/cpufreq/elanfreq.c | 42 ++++++++++++++-------------- + arch/x86/kernel/cpu/cpufreq/powernow-k6.c | 41 +++++++++++++-------------- + drivers/cpufreq/cpufreq.c | 24 ++++++++++----- + drivers/cpufreq/cpufreq_conservative.c | 1 + + drivers/cpufreq/cpufreq_ondemand.c | 8 ++++- + 6 files changed, 70 insertions(+), 54 deletions(-) +Merging v9fs/for-next +$ git merge v9fs/for-next +Already up-to-date. +Merging quilt/rr +$ git merge quilt/rr +Auto-merged drivers/char/snsc.c +Auto-merged drivers/char/viotape.c +Auto-merged drivers/infiniband/core/user_mad.c +Auto-merged drivers/md/dm-raid1.c +Auto-merged drivers/net/irda/sir_dev.c +Auto-merged fs/xfs/linux-2.6/xfs_buf.c +Auto-merged include/linux/kernel.h +Auto-merged include/linux/usb.h +Auto-merged kernel/printk.c +Merge made by recursive. + arch/ia64/kernel/salinfo.c | 4 ++-- + drivers/char/snsc.c | 4 ++-- + drivers/char/viotape.c | 4 ++-- + drivers/infiniband/core/user_mad.c | 2 +- + drivers/input/serio/hil_mlc.c | 4 ++-- + drivers/input/serio/hp_sdc_mlc.c | 14 +++++++------- + drivers/md/dm-raid1.c | 2 +- + drivers/net/3c527.c | 2 +- + drivers/net/irda/sir_dev.c | 2 +- + drivers/net/wireless/airo.c | 12 ++++++------ + drivers/scsi/aacraid/commsup.c | 2 +- + drivers/usb/core/usb.c | 2 +- + drivers/usb/gadget/inode.c | 2 +- + fs/ocfs2/inode.c | 4 ---- + fs/xfs/linux-2.6/sema.h | 8 +++----- + fs/xfs/linux-2.6/xfs_buf.c | 4 ++-- + include/linux/compiler-gcc.h | 18 ++++++++++++++++++ + include/linux/compiler-intel.h | 2 ++ + include/linux/kernel.h | 35 +++++++++++++++++++++++++++++++++++ + include/linux/kthread.h | 28 +++++++++++++++++++++++++--- + include/linux/mutex.h | 4 ---- + include/linux/semaphore.h | 8 ++++++-- + include/linux/stop_machine.h | 13 ++++++++----- + include/linux/timer.h | 32 +++++++++++++++++++++++--------- + include/linux/usb.h | 2 +- + kernel/kthread.c | 29 +++++------------------------ + kernel/mutex.c | 4 ++-- + kernel/printk.c | 4 ++-- + kernel/semaphore.c | 17 ++++++++--------- + kernel/stop_machine.c | 4 ++-- + 30 files changed, 170 insertions(+), 102 deletions(-) +Merging cifs/master +$ git merge cifs/master +Merge made by recursive. + fs/cifs/asn1.c | 258 ++++++++++++++++++++++++-------------------------- + fs/cifs/cifsfs.h | 2 +- + fs/cifs/transport.c | 1 + + 3 files changed, 126 insertions(+), 135 deletions(-) +Merging mmc/next +$ git merge mmc/next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Merge made by recursive. + fs/gfs2/glock.c | 11 ++++++----- + 1 files changed, 6 insertions(+), 5 deletions(-) +Merging input/next +$ git merge input/next +Merge made by recursive. + drivers/input/gameport/gameport.c | 88 +++++++++--- + drivers/input/joystick/a3d.c | 3 +- + drivers/input/joystick/adi.c | 3 +- + drivers/input/joystick/analog.c | 4 +- + drivers/input/joystick/cobra.c | 3 +- + drivers/input/joystick/gf2k.c | 3 +- + drivers/input/joystick/grip.c | 3 +- + drivers/input/joystick/grip_mp.c | 3 +- + drivers/input/joystick/guillemot.c | 3 +- + drivers/input/joystick/interact.c | 3 +- + drivers/input/joystick/joydump.c | 3 +- + drivers/input/joystick/sidewinder.c | 3 +- + drivers/input/joystick/tmdc.c | 3 +- + drivers/input/misc/ati_remote2.c | 263 ++++++++++++++++++++++++++++++----- + include/linux/gameport.h | 7 +- + include/linux/input.h | 15 ++- + include/linux/mod_devicetable.h | 2 +- + 17 files changed, 326 insertions(+), 86 deletions(-) +Merging semaphore/semaphore +$ git merge semaphore/semaphore +Already up-to-date. +Merging semaphore-removal/semaphore-removal +$ git merge semaphore-removal/semaphore-removal +Auto-merged drivers/net/ps3_gelic_wireless.c +Auto-merged drivers/scsi/qla2xxx/qla_def.h +Merge made by recursive. + arch/arm/mach-lh7a40x/clocks.c | 15 ++++++++------- + drivers/net/bonding/bond_main.c | 21 +++++++++++---------- + drivers/net/bonding/bond_sysfs.c | 15 ++++++++------- + drivers/net/ppp_async.c | 8 ++++---- + drivers/net/ps3_gelic_net.c | 1 + + drivers/net/ps3_gelic_wireless.c | 1 + + drivers/pci/hotplug/ibmphp_hpc.c | 30 ++++++++++++++---------------- + drivers/scsi/qla2xxx/qla_def.h | 1 - + include/net/bluetooth/hci_core.h | 7 ++++--- + net/9p/trans_virtio.c | 21 +++++++++++---------- + net/bluetooth/hci_core.c | 2 +- + sound/soc/s3c24xx/s3c2443-ac97.c | 11 ++++++----- + 12 files changed, 69 insertions(+), 64 deletions(-) +Merging bkl-removal/bkl-removal +$ git merge bkl-removal/bkl-removal +Merge made by recursive. +Merging trivial/next +$ git merge trivial/next +Auto-merged Documentation/edac.txt +CONFLICT (content): Merge conflict in Documentation/edac.txt +Auto-merged arch/mips/kernel/vpe.c +Auto-merged drivers/base/sys.c +Auto-merged drivers/media/dvb/ttpci/av7110.c +Auto-merged drivers/net/spider_net.c +Auto-merged drivers/serial/mpc52xx_uart.c +Auto-merged drivers/usb/serial/ftdi_sio.c +Auto-merged include/linux/securebits.h +CONFLICT (content): Merge conflict in include/linux/securebits.h +Auto-merged mm/migrate.c +Auto-merged mm/slub.c +Auto-merged net/wireless/wext.c +Resolved 'Documentation/edac.txt' using previous resolution. +Resolved 'include/linux/securebits.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 75033df: Merge commit 'trivial/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/hfs.txt | 2 +- + Documentation/ja_JP/SubmittingPatches | 4 ++-- + Documentation/zh_CN/SubmittingPatches | 4 ++-- + arch/mips/kernel/vpe.c | 2 +- + arch/sh/lib64/c-checksum.c | 4 ++-- + drivers/base/sys.c | 2 +- + drivers/char/serial167.c | 2 +- + drivers/media/dvb/ttpci/av7110.c | 2 +- + drivers/message/i2o/i2o_block.c | 2 +- + drivers/misc/ibmasm/event.c | 2 +- + drivers/net/spider_net.c | 2 +- + drivers/serial/mpc52xx_uart.c | 4 ++-- + drivers/usb/serial/ftdi_sio.c | 2 +- + fs/jffs2/fs.c | 2 +- + fs/ntfs/aops.c | 2 +- + fs/proc/nommu.c | 2 +- + mm/migrate.c | 2 +- + mm/slub.c | 4 ++-- + net/wireless/wext.c | 2 +- + 19 files changed, 24 insertions(+), 24 deletions(-) +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Merge made by recursive. + Documentation/filesystems/ubifs.txt | 2 +- + fs/ubifs/budget.c | 33 +++++++++-- + fs/ubifs/commit.c | 3 +- + fs/ubifs/debug.c | 27 +++++---- + fs/ubifs/dir.c | 20 +++---- + fs/ubifs/file.c | 7 +- + fs/ubifs/find.c | 9 ++- + fs/ubifs/io.c | 14 +++++ + fs/ubifs/journal.c | 108 ++++++++++++++++++++++++++--------- + fs/ubifs/log.c | 4 +- + fs/ubifs/misc.h | 16 +----- + fs/ubifs/orphan.c | 4 +- + fs/ubifs/super.c | 102 ++++++++++++++++++++++++++------- + fs/ubifs/ubifs-media.h | 4 +- + fs/ubifs/ubifs.h | 27 +++++++-- + fs/ubifs/xattr.c | 4 +- + 16 files changed, 271 insertions(+), 113 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 +Auto-merged drivers/media/dvb/ttpci/Kconfig +CONFLICT (content): Merge conflict in drivers/media/dvb/ttpci/Kconfig +Auto-merged drivers/media/dvb/ttpci/Makefile +CONFLICT (content): Merge conflict in drivers/media/dvb/ttpci/Makefile +Auto-merged drivers/media/dvb/ttpci/av7110.c +Auto-merged drivers/media/dvb/ttpci/av7110_hw.h +Removed drivers/media/dvb/ttpci/fdump.c +Auto-merged drivers/net/acenic.c +Auto-merged drivers/net/acenic.h +Removed drivers/net/acenic_firmware.h +Auto-merged drivers/net/e100.c +Auto-merged drivers/net/starfire.c +Removed drivers/net/starfire_firmware.h +Removed drivers/net/starfire_firmware.pl +Auto-merged drivers/net/tg3.c +Auto-merged drivers/net/tg3.h +Auto-merged drivers/scsi/advansys.c +Removed drivers/scsi/ql1040_fw.h +Removed drivers/scsi/ql12160_fw.h +Removed drivers/scsi/ql1280_fw.h +Auto-merged drivers/scsi/qla1280.c +Removed drivers/scsi/qlogicpti_asm.c +Resolved 'drivers/media/dvb/ttpci/Kconfig' using previous resolution. +Resolved 'drivers/media/dvb/ttpci/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit bbb92ba: Merge commit 'firmware/master' +$ git diff -M --stat --summary HEAD^.. + drivers/media/dvb/ttpci/Kconfig | 23 +- + drivers/media/dvb/ttpci/Makefile | 9 - + drivers/media/dvb/ttpci/av7110.c | 16 - + drivers/media/dvb/ttpci/av7110_hw.c | 35 +- + drivers/media/dvb/ttpci/av7110_hw.h | 3 +- + drivers/media/dvb/ttpci/fdump.c | 44 - + drivers/net/acenic.c | 117 +- + drivers/net/acenic.h | 4 + + drivers/net/acenic_firmware.h | 9456 --------------------------------- + drivers/net/e100.c | 283 +- + drivers/net/starfire.c | 51 +- + drivers/net/starfire_firmware.h | 346 -- + drivers/net/starfire_firmware.pl | 31 - + drivers/net/tg3.c | 789 +--- + drivers/net/tg3.h | 4 + + drivers/scsi/advansys.c | 1731 +------ + drivers/scsi/ql1040_fw.h | 2130 -------- + drivers/scsi/ql12160_fw.h | 1811 ------- + drivers/scsi/ql1280_fw.h | 2048 ------- + drivers/scsi/qla1280.c | 114 +- + drivers/scsi/qla1280.h | 6 + + drivers/scsi/qlogicpti.c | 63 +- + drivers/scsi/qlogicpti_asm.c | 1160 ---- + firmware/Makefile | 19 + + firmware/WHENCE | 109 + + firmware/acenic/tg1.bin.ihex | 4573 ++++++++++++++++ + firmware/acenic/tg2.bin.ihex | 4844 +++++++++++++++++ + firmware/adaptec/starfire_rx.bin.ihex | 53 + + firmware/adaptec/starfire_tx.bin.ihex | 53 + + firmware/advansys/3550.bin.ihex | 317 ++ + firmware/advansys/38C0800.bin.ihex | 336 ++ + firmware/advansys/38C1600.bin.ihex | 398 ++ + firmware/advansys/mcode.bin.ihex | 147 + + firmware/av7110/Boot.S | 109 + + firmware/av7110/bootcode.bin.ihex | 15 + + firmware/e100/d101m_ucode.bin.ihex | 38 + + firmware/e100/d101s_ucode.bin.ihex | 38 + + firmware/e100/d102e_ucode.bin.ihex | 38 + + firmware/qlogic/1040.bin.ihex | 2111 ++++++++ + firmware/qlogic/12160.bin.ihex | 1771 ++++++ + firmware/qlogic/1280.bin.ihex | 2008 +++++++ + firmware/qlogic/isp1000.bin.ihex | 1158 ++++ + firmware/tigon/tg3.bin.ihex | 175 + + firmware/tigon/tg3_tso.bin.ihex | 446 ++ + firmware/tigon/tg3_tso5.bin.ihex | 252 + + 45 files changed, 19549 insertions(+), 19733 deletions(-) + delete mode 100644 drivers/media/dvb/ttpci/fdump.c + delete mode 100644 drivers/net/acenic_firmware.h + delete mode 100644 drivers/net/starfire_firmware.h + delete mode 100644 drivers/net/starfire_firmware.pl + delete mode 100644 drivers/scsi/ql1040_fw.h + delete mode 100644 drivers/scsi/ql12160_fw.h + delete mode 100644 drivers/scsi/ql1280_fw.h + delete mode 100644 drivers/scsi/qlogicpti_asm.c + create mode 100644 firmware/acenic/tg1.bin.ihex + create mode 100644 firmware/acenic/tg2.bin.ihex + create mode 100644 firmware/adaptec/starfire_rx.bin.ihex + create mode 100644 firmware/adaptec/starfire_tx.bin.ihex + create mode 100644 firmware/advansys/3550.bin.ihex + create mode 100644 firmware/advansys/38C0800.bin.ihex + create mode 100644 firmware/advansys/38C1600.bin.ihex + create mode 100644 firmware/advansys/mcode.bin.ihex + create mode 100644 firmware/av7110/Boot.S + create mode 100644 firmware/av7110/bootcode.bin.ihex + create mode 100644 firmware/e100/d101m_ucode.bin.ihex + create mode 100644 firmware/e100/d101s_ucode.bin.ihex + create mode 100644 firmware/e100/d102e_ucode.bin.ihex + create mode 100644 firmware/qlogic/1040.bin.ihex + create mode 100644 firmware/qlogic/12160.bin.ihex + create mode 100644 firmware/qlogic/1280.bin.ihex + create mode 100644 firmware/qlogic/isp1000.bin.ihex + create mode 100644 firmware/tigon/tg3.bin.ihex + create mode 100644 firmware/tigon/tg3_tso.bin.ihex + create mode 100644 firmware/tigon/tg3_tso5.bin.ihex +Merging pcmcia/master +$ git merge pcmcia/master +Merge made by recursive. + drivers/pcmcia/rsrc_nonstatic.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging battery/master +$ git merge battery/master +Merge made by recursive. + Documentation/power/power_supply_class.txt | 4 + + drivers/power/Kconfig | 7 + + drivers/power/Makefile | 1 + + drivers/power/olpc_battery.c | 273 +++++++++++----- + drivers/power/power_supply_sysfs.c | 1 + + drivers/power/tosa_battery.c | 486 ++++++++++++++++++++++++++++ + include/linux/power_supply.h | 1 + + 7 files changed, 697 insertions(+), 76 deletions(-) + create mode 100644 drivers/power/tosa_battery.c +Merging leds/for-mm +$ git merge leds/for-mm +Already up-to-date. +Merging backlight/for-mm +$ git merge backlight/for-mm +Already up-to-date. +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Removed arch/mips/au1000/common/dbg_io.c +Removed arch/mips/basler/excite/excite_dbg_io.c +Auto-merged arch/mips/emma2rh/markeins/setup.c +Removed arch/mips/kernel/gdb-low.S +Removed arch/mips/kernel/gdb-stub.c +Removed arch/mips/mti-malta/malta-kgdb.c +Removed arch/mips/nxp/pnx8550/common/gdb_hook.c +Removed arch/mips/pmc-sierra/yosemite/dbg_io.c +Removed arch/mips/sgi-ip27/ip27-dbgio.c +Removed arch/mips/sibyte/swarm/dbg_io.c +Removed arch/mips/txx9/generic/dbgio.c +Removed arch/mips/txx9/jmr3927/kgdb_io.c +Removed include/asm-mips/gdb-stub.h +Merge made by recursive. + Documentation/DocBook/kgdb.tmpl | 18 + + arch/mips/Kconfig | 7 +- + arch/mips/Kconfig.debug | 22 - + arch/mips/au1000/Kconfig | 1 - + arch/mips/au1000/common/Makefile | 1 - + arch/mips/au1000/common/dbg_io.c | 109 --- + arch/mips/basler/excite/Makefile | 1 - + arch/mips/basler/excite/excite_dbg_io.c | 121 --- + arch/mips/basler/excite/excite_irq.c | 7 - + arch/mips/basler/excite/excite_setup.c | 4 +- + arch/mips/configs/db1000_defconfig | 1 - + arch/mips/configs/db1100_defconfig | 1 - + arch/mips/configs/db1200_defconfig | 1 - + arch/mips/configs/db1500_defconfig | 1 - + arch/mips/configs/db1550_defconfig | 1 - + arch/mips/configs/excite_defconfig | 1 - + arch/mips/configs/ip27_defconfig | 1 - + arch/mips/configs/msp71xx_defconfig | 2 - + arch/mips/configs/mtx1_defconfig | 1 - + arch/mips/configs/pb1100_defconfig | 1 - + arch/mips/configs/pb1500_defconfig | 1 - + arch/mips/configs/pb1550_defconfig | 1 - + arch/mips/configs/pnx8550-jbs_defconfig | 4 +- + arch/mips/configs/pnx8550-stb810_defconfig | 4 +- + arch/mips/configs/rbtx49xx_defconfig | 1 - + arch/mips/configs/sb1250-swarm_defconfig | 1 - + arch/mips/configs/yosemite_defconfig | 2 - + arch/mips/emma2rh/markeins/platform.c | 1 - + arch/mips/emma2rh/markeins/setup.c | 1 - + arch/mips/kernel/Makefile | 2 +- + arch/mips/kernel/gdb-low.S | 394 ---------- + arch/mips/kernel/gdb-stub.c | 1155 ---------------------------- + arch/mips/kernel/irq.c | 30 +- + arch/mips/kernel/kgdb.c | 285 +++++++ + arch/mips/kernel/traps.c | 21 + + arch/mips/mti-malta/Makefile | 1 - + arch/mips/mti-malta/malta-init.c | 54 -- + arch/mips/mti-malta/malta-kgdb.c | 133 ---- + arch/mips/mti-malta/malta-setup.c | 4 - + arch/mips/nxp/pnx8550/common/Makefile | 1 - + arch/mips/nxp/pnx8550/common/gdb_hook.c | 109 --- + arch/mips/nxp/pnx8550/common/int.c | 1 - + arch/mips/nxp/pnx8550/common/proc.c | 1 - + arch/mips/nxp/pnx8550/common/setup.c | 12 - + arch/mips/pmc-sierra/msp71xx/msp_serial.c | 73 -- + arch/mips/pmc-sierra/yosemite/Makefile | 1 - + arch/mips/pmc-sierra/yosemite/dbg_io.c | 180 ----- + arch/mips/pmc-sierra/yosemite/irq.c | 9 - + arch/mips/sgi-ip22/ip22-setup.c | 25 - + arch/mips/sgi-ip27/Makefile | 1 - + arch/mips/sgi-ip27/ip27-dbgio.c | 60 -- + arch/mips/sibyte/bcm1480/irq.c | 80 -- + arch/mips/sibyte/cfe/setup.c | 14 - + arch/mips/sibyte/sb1250/irq.c | 60 -- + arch/mips/sibyte/swarm/Makefile | 1 - + arch/mips/sibyte/swarm/dbg_io.c | 76 -- + arch/mips/txx9/Kconfig | 2 - + arch/mips/txx9/generic/Makefile | 1 - + arch/mips/txx9/generic/dbgio.c | 48 -- + arch/mips/txx9/jmr3927/Makefile | 1 - + arch/mips/txx9/jmr3927/kgdb_io.c | 105 --- + drivers/serial/serial_txx9.c | 113 +++- + include/asm-mips/gdb-stub.h | 215 ------ + include/asm-mips/kdebug.h | 14 +- + include/asm-mips/kgdb.h | 44 ++ + kernel/kgdb.c | 26 +- + lib/Kconfig.kgdb | 11 +- + 67 files changed, 517 insertions(+), 3164 deletions(-) + delete mode 100644 arch/mips/au1000/common/dbg_io.c + delete mode 100644 arch/mips/basler/excite/excite_dbg_io.c + delete mode 100644 arch/mips/kernel/gdb-low.S + delete mode 100644 arch/mips/kernel/gdb-stub.c + create mode 100644 arch/mips/kernel/kgdb.c + delete mode 100644 arch/mips/mti-malta/malta-kgdb.c + delete mode 100644 arch/mips/nxp/pnx8550/common/gdb_hook.c + delete mode 100644 arch/mips/pmc-sierra/yosemite/dbg_io.c + delete mode 100644 arch/mips/sgi-ip27/ip27-dbgio.c + delete mode 100644 arch/mips/sibyte/swarm/dbg_io.c + delete mode 100644 arch/mips/txx9/generic/dbgio.c + delete mode 100644 arch/mips/txx9/jmr3927/kgdb_io.c + delete mode 100644 include/asm-mips/gdb-stub.h + create mode 100644 include/asm-mips/kgdb.h +Merging slab/for-next +$ git merge slab/for-next +Auto-merged mm/slub.c +Merge made by recursive. + include/linux/slub_def.h | 7 ++++++- + mm/slab.c | 1 - + mm/slob.c | 1 - + mm/slub.c | 41 ++++++++++++++++++----------------------- + 4 files changed, 24 insertions(+), 26 deletions(-) +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Already up-to-date. +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Merge made by recursive. + arch/cris/arch-v10/boot/compressed/Makefile | 2 +- + .../compressed/{decompress.ld => decompress.lds} | 0 + arch/cris/arch-v10/boot/rescue/Makefile | 2 +- + .../arch-v10/boot/rescue/{rescue.ld => rescue.lds} | 0 + arch/cris/arch-v32/boot/compressed/Makefile | 2 +- + .../compressed/{decompress.ld => decompress.lds} | 0 + arch/cris/arch-v32/boot/rescue/Makefile | 2 +- + .../arch-v32/boot/rescue/{rescue.ld => rescue.lds} | 0 + 8 files changed, 4 insertions(+), 4 deletions(-) + rename arch/cris/arch-v10/boot/compressed/{decompress.ld => decompress.lds} (100%) + rename arch/cris/arch-v10/boot/rescue/{rescue.ld => rescue.lds} (100%) + rename arch/cris/arch-v32/boot/compressed/{decompress.ld => decompress.lds} (100%) + rename arch/cris/arch-v32/boot/rescue/{rescue.ld => rescue.lds} (100%) +Merging kmemcheck/auto-kmemcheck-next +$ git merge kmemcheck/auto-kmemcheck-next +Auto-merged MAINTAINERS +Auto-merged arch/x86/Kconfig.debug +Auto-merged arch/x86/kernel/process_64.c +Auto-merged arch/x86/kernel/traps_32.c +Auto-merged arch/x86/kernel/traps_64.c +Auto-merged arch/x86/mm/fault.c +Auto-merged include/linux/mm_types.h +Auto-merged init/main.c +Auto-merged kernel/fork.c +Auto-merged kernel/sysctl.c +Auto-merged mm/Makefile +Auto-merged mm/slab.c +Auto-merged mm/slub.c +Merge made by recursive. + Documentation/kmemcheck.txt | 135 ++++++++++ + MAINTAINERS | 8 + + arch/x86/Kconfig.debug | 109 +++++++++ + arch/x86/kernel/process.c | 2 +- + arch/x86/kernel/process_32.c | 4 +- + arch/x86/kernel/process_64.c | 12 +- + arch/x86/kernel/stacktrace.c | 7 + + arch/x86/kernel/traps_32.c | 11 +- + arch/x86/kernel/traps_64.c | 11 +- + arch/x86/mm/Makefile | 2 + + arch/x86/mm/fault.c | 18 ++- + arch/x86/mm/kmemcheck/Makefile | 3 + + arch/x86/mm/kmemcheck/error.c | 216 ++++++++++++++++ + arch/x86/mm/kmemcheck/error.h | 15 ++ + arch/x86/mm/kmemcheck/kmemcheck.c | 485 +++++++++++++++++++++++++++++++++++++ + arch/x86/mm/kmemcheck/opcode.c | 72 ++++++ + arch/x86/mm/kmemcheck/opcode.h | 9 + + arch/x86/mm/kmemcheck/pte.c | 22 ++ + arch/x86/mm/kmemcheck/pte.h | 10 + + arch/x86/mm/kmemcheck/shadow.c | 178 ++++++++++++++ + arch/x86/mm/kmemcheck/shadow.h | 16 ++ + arch/x86/mm/kmemcheck/smp.c | 80 ++++++ + arch/x86/mm/kmemcheck/smp.h | 23 ++ + arch/x86/mm/kmemcheck/string.c | 95 +++++++ + include/asm-x86/kdebug.h | 3 +- + include/asm-x86/kmemcheck.h | 36 +++ + include/asm-x86/pgtable.h | 4 +- + include/asm-x86/pgtable_32.h | 6 + + include/asm-x86/pgtable_64.h | 6 + + include/asm-x86/string_32.h | 8 + + include/asm-x86/string_64.h | 1 + + include/linux/gfp.h | 3 +- + include/linux/interrupt.h | 14 + + include/linux/kmemcheck.h | 70 ++++++ + include/linux/mm_types.h | 4 + + include/linux/slab.h | 7 + + include/linux/slab_def.h | 81 ++++++ + include/linux/stacktrace.h | 3 + + init/main.c | 4 + + kernel/fork.c | 16 +- + kernel/softirq.c | 11 + + kernel/sysctl.c | 26 ++- + mm/Makefile | 2 +- + mm/kmemcheck.c | 97 ++++++++ + mm/slab.c | 101 ++------- + mm/slub.c | 20 ++- + 46 files changed, 1948 insertions(+), 118 deletions(-) + create mode 100644 Documentation/kmemcheck.txt + create mode 100644 arch/x86/mm/kmemcheck/Makefile + create mode 100644 arch/x86/mm/kmemcheck/error.c + create mode 100644 arch/x86/mm/kmemcheck/error.h + create mode 100644 arch/x86/mm/kmemcheck/kmemcheck.c + create mode 100644 arch/x86/mm/kmemcheck/opcode.c + create mode 100644 arch/x86/mm/kmemcheck/opcode.h + create mode 100644 arch/x86/mm/kmemcheck/pte.c + create mode 100644 arch/x86/mm/kmemcheck/pte.h + create mode 100644 arch/x86/mm/kmemcheck/shadow.c + create mode 100644 arch/x86/mm/kmemcheck/shadow.h + create mode 100644 arch/x86/mm/kmemcheck/smp.c + create mode 100644 arch/x86/mm/kmemcheck/smp.h + create mode 100644 arch/x86/mm/kmemcheck/string.c + create mode 100644 include/asm-x86/kmemcheck.h + create mode 100644 include/linux/kmemcheck.h + create mode 100644 mm/kmemcheck.c +Merging generic-ipi/auto-generic-ipi-next +$ git merge generic-ipi/auto-generic-ipi-next +Already up-to-date. +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Merge made by recursive. + drivers/mfd/Kconfig | 12 ++ + drivers/mfd/Makefile | 2 + + drivers/mfd/t7l66xb.c | 414 ++++++++++++++++++++++++++++++++++++++++++ + drivers/mfd/tc6387xb.c | 172 +++++++++++++++++ + drivers/mfd/tc6393xb.c | 3 - + include/linux/mfd/t7l66xb.h | 36 ++++ + include/linux/mfd/tc6387xb.h | 23 +++ + include/linux/mfd/tmio.h | 19 ++- + 8 files changed, 674 insertions(+), 7 deletions(-) + create mode 100644 drivers/mfd/t7l66xb.c + create mode 100644 drivers/mfd/tc6387xb.c + create mode 100644 include/linux/mfd/t7l66xb.h + create mode 100644 include/linux/mfd/tc6387xb.h +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Auto-merged drivers/char/pcmcia/synclink_cs.c +Auto-merged drivers/char/synclink.c +Auto-merged drivers/char/synclink_gt.c +Auto-merged drivers/char/synclinkmp.c +Auto-merged drivers/net/wan/cosa.c +Merge made by recursive. + Documentation/DocBook/z8530book.tmpl | 38 +-- + drivers/char/pcmcia/synclink_cs.c | 4 - + drivers/char/synclink.c | 4 - + drivers/char/synclink_gt.c | 5 - + drivers/char/synclinkmp.c | 4 - + drivers/net/wan/Kconfig | 13 +- + drivers/net/wan/Makefile | 11 +- + drivers/net/wan/c101.c | 6 +- + drivers/net/wan/cosa.c | 293 ++++++-------- + drivers/net/wan/dscc4.c | 1 - + drivers/net/wan/farsync.c | 5 +- + drivers/net/wan/farsync.h | 6 - + drivers/net/wan/{hd6457x.c => hd64570.c} | 254 +++--------- + drivers/net/wan/hd64572.c | 641 ++++++++++++++++++++++++++++ + drivers/net/wan/hdlc.c | 25 +- + drivers/net/wan/hdlc_cisco.c | 29 +- + drivers/net/wan/hdlc_fr.c | 19 +- + drivers/net/wan/hdlc_ppp.c | 15 +- + drivers/net/wan/hdlc_raw.c | 15 +- + drivers/net/wan/hdlc_raw_eth.c | 17 +- + drivers/net/wan/hdlc_x25.c | 17 +- + drivers/net/wan/hostess_sv11.c | 382 +++++++---------- + drivers/net/wan/lmc/lmc.h | 11 +- + drivers/net/wan/lmc/lmc_debug.c | 7 +- + drivers/net/wan/lmc/lmc_debug.h | 6 +- + drivers/net/wan/lmc/lmc_ioctl.h | 2 +- + drivers/net/wan/lmc/lmc_main.c | 672 +++++++++++++----------------- + drivers/net/wan/lmc/lmc_media.c | 66 ++-- + drivers/net/wan/lmc/lmc_proto.c | 146 ++------ + drivers/net/wan/lmc/lmc_proto.h | 14 +- + drivers/net/wan/lmc/lmc_var.h | 360 ++++++---------- + drivers/net/wan/n2.c | 9 +- + drivers/net/wan/pc300.h | 228 ++++------ + drivers/net/wan/pc300_drv.c | 146 +++---- + drivers/net/wan/pc300too.c | 73 +--- + drivers/net/wan/pci200syn.c | 77 ++--- + drivers/net/wan/sealevel.c | 361 +++++++---------- + drivers/net/wan/syncppp.c | 9 - + drivers/net/wan/z85230.c | 193 ++++----- + drivers/net/wan/z85230.h | 10 +- + include/net/syncppp.h | 2 - + net/wanrouter/wanmain.c | 27 -- + 42 files changed, 1995 insertions(+), 2228 deletions(-) + rename drivers/net/wan/{hd6457x.c => hd64570.c} (78%) + create mode 100644 drivers/net/wan/hd64572.c +Merging drm/drm-next +$ git merge drm/drm-next +Merge made by recursive. + drivers/gpu/drm/drm_irq.c | 20 +- + drivers/gpu/drm/i915/i915_dma.c | 167 +++-- + drivers/gpu/drm/i915/i915_drv.c | 54 +- + drivers/gpu/drm/i915/i915_drv.h | 843 +---------------------- + drivers/gpu/drm/i915/i915_irq.c | 176 ++++-- + drivers/gpu/drm/i915/i915_reg.h | 1405 +++++++++++++++++++++++++++++++++++++++ + drivers/gpu/drm/sis/sis_mm.c | 10 +- + include/drm/drm.h | 17 - + 8 files changed, 1698 insertions(+), 994 deletions(-) + create mode 100644 drivers/gpu/drm/i915/i915_reg.h +Merging voltage/reg-for-linus +$ git merge voltage/reg-for-linus +Auto-merged MAINTAINERS +Auto-merged drivers/Makefile +Merge made by recursive. + Documentation/ABI/testing/sysfs-class-regulator | 315 ++++ + Documentation/power/regulator/consumer.txt | 182 +++ + Documentation/power/regulator/machine.txt | 101 ++ + Documentation/power/regulator/overview.txt | 171 ++ + Documentation/power/regulator/regulator.txt | 30 + + MAINTAINERS | 9 + + arch/arm/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/regulator/Kconfig | 59 + + drivers/regulator/Makefile | 12 + + drivers/regulator/bq24022.c | 167 ++ + drivers/regulator/core.c | 1903 +++++++++++++++++++++++ + drivers/regulator/fixed.c | 129 ++ + drivers/regulator/virtual.c | 345 ++++ + include/linux/regulator/bq24022.h | 21 + + include/linux/regulator/consumer.h | 284 ++++ + include/linux/regulator/driver.h | 99 ++ + include/linux/regulator/fixed.h | 22 + + include/linux/regulator/machine.h | 104 ++ + 19 files changed, 3956 insertions(+), 0 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-regulator + create mode 100644 Documentation/power/regulator/consumer.txt + create mode 100644 Documentation/power/regulator/machine.txt + create mode 100644 Documentation/power/regulator/overview.txt + create mode 100644 Documentation/power/regulator/regulator.txt + create mode 100644 drivers/regulator/Kconfig + create mode 100644 drivers/regulator/Makefile + create mode 100644 drivers/regulator/bq24022.c + create mode 100644 drivers/regulator/core.c + create mode 100644 drivers/regulator/fixed.c + create mode 100644 drivers/regulator/virtual.c + create mode 100644 include/linux/regulator/bq24022.h + create mode 100644 include/linux/regulator/consumer.h + create mode 100644 include/linux/regulator/driver.h + create mode 100644 include/linux/regulator/fixed.h + create mode 100644 include/linux/regulator/machine.h +Merging security-testing/next +$ git merge security-testing/next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged fs/namei.c +Auto-merged include/linux/magic.h +Merge made by recursive. + Documentation/ABI/testing/ima_policy | 55 ++++ + Documentation/kernel-parameters.txt | 11 + + drivers/char/tpm/tpm.c | 233 +++++++++++++---- + drivers/char/tpm/tpm.h | 4 +- + fs/debugfs/inode.c | 3 +- + fs/exec.c | 4 + + fs/file_table.c | 3 + + fs/inode.c | 11 + + fs/namei.c | 7 +- + include/linux/audit.h | 8 + + include/linux/fs.h | 3 + + include/linux/ima.h | 48 ++++ + include/linux/integrity.h | 195 +++++++++++++++ + include/linux/magic.h | 4 + + include/linux/tpm.h | 49 ++++ + mm/mmap.c | 4 + + mm/shmem.c | 4 +- + security/Kconfig | 2 + + security/Makefile | 4 + + security/inode.c | 3 +- + security/integrity/Kconfig | 23 ++ + security/integrity/Makefile | 8 + + security/integrity/ima/Kconfig | 41 +++ + security/integrity/ima/Makefile | 9 + + security/integrity/ima/ima.h | 148 +++++++++++ + security/integrity/ima/ima_api.c | 350 ++++++++++++++++++++++++++ + security/integrity/ima/ima_crypto.c | 154 ++++++++++++ + security/integrity/ima/ima_fs.c | 458 ++++++++++++++++++++++++++++++++++ + security/integrity/ima/ima_init.c | 105 ++++++++ + security/integrity/ima/ima_main.c | 362 +++++++++++++++++++++++++++ + security/integrity/ima/ima_policy.c | 249 ++++++++++++++++++ + security/integrity/ima/ima_queue.c | 124 +++++++++ + security/integrity/integrity.c | 310 +++++++++++++++++++++++ + security/integrity/integrity_audit.c | 79 ++++++ + security/selinux/hooks.c | 45 ++-- + security/selinux/ss/avtab.c | 6 +- + security/selinux/ss/conditional.c | 2 +- + security/selinux/ss/mls.c | 14 +- + security/selinux/ss/policydb.c | 20 +- + 39 files changed, 3057 insertions(+), 105 deletions(-) + create mode 100644 Documentation/ABI/testing/ima_policy + create mode 100644 include/linux/ima.h + create mode 100644 include/linux/integrity.h + create mode 100644 include/linux/tpm.h + create mode 100644 security/integrity/Kconfig + create mode 100644 security/integrity/Makefile + create mode 100644 security/integrity/ima/Kconfig + create mode 100644 security/integrity/ima/Makefile + create mode 100644 security/integrity/ima/ima.h + create mode 100644 security/integrity/ima/ima_api.c + create mode 100644 security/integrity/ima/ima_crypto.c + create mode 100644 security/integrity/ima/ima_fs.c + create mode 100644 security/integrity/ima/ima_init.c + create mode 100644 security/integrity/ima/ima_main.c + create mode 100644 security/integrity/ima/ima_policy.c + create mode 100644 security/integrity/ima/ima_queue.c + create mode 100644 security/integrity/integrity.c + create mode 100644 security/integrity/integrity_audit.c +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging quilt/ttydev +$ git merge quilt/ttydev +Already up-to-date. +Merging agp/agp-next +$ git merge agp/agp-next +Merge made by recursive. + drivers/char/agp/agp.h | 3 + + drivers/char/agp/ali-agp.c | 10 ++-- + drivers/char/agp/amd-k7-agp.c | 10 ++-- + drivers/char/agp/amd64-agp.c | 51 ++++++++++++++--------- + drivers/char/agp/ati-agp.c | 7 +-- + drivers/char/agp/backend.c | 28 ++++++++----- + drivers/char/agp/generic.c | 41 +++++++++++++++---- + drivers/char/agp/intel-agp.c | 83 ++++++++++++++++++++++----------------- + drivers/char/agp/isoch.c | 37 +++++++++-------- + drivers/char/agp/sis-agp.c | 15 +++---- + drivers/char/agp/sworks-agp.c | 25 ++++++------ + drivers/char/agp/uninorth-agp.c | 32 +++++++------- + include/linux/agp_backend.h | 5 ++ + 13 files changed, 204 insertions(+), 143 deletions(-) +$ git am -3 ../patches/0001-hfcmulti-is-not-supported-on-big-endian.patch +Applying hfcmulti is not supported on big endian +$ git revert fb2e405fc1fc8b20d9c78eaa1c7fd5a297efde43 +Finished one revert. +Created commit d0dc0a7: Revert "fix fs/nfs/nfsroot.c compilation" + 1 files changed, 1 insertions(+), 1 deletions(-) +$ git revert f9247273cb69ba101877e946d2d83044409cc8c5 +Auto-merged fs/ufs/super.c +Finished one revert. +Created commit 7a05f8c: Revert "UFS: add const to parser token table" + 2 files changed, 2 insertions(+), 2 deletions(-) +$ git am -3 ../patches/Add_cuImage.mpc866ads_to_the_bootwrapper_as_a_cuboot-8xx_target +Applying Add cuImage.mpc866ads to the bootwrapper as a cuboot-8xx target +Applying m68k: some asm-sparc include files moved diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..fdad754f218a --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,80 @@ +Importing driver-core.current based on 2.6.27-rc1-git2 +$ git checkout quilt/driver-core.current +Switched to branch "quilt/driver-core.current" +$ git reset --hard 94ad374a0751f40d25e22e036c37f7263569d24c +HEAD is now at 94ad374 Fix off-by-one error in iov_iter_advance() +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core.current +device-create-block-convert-device_create_drvdata-to-device_create.patch +device-create-char-convert-device_create_drvdata-to-device_create.patch +device-create-ieee1394-convert-device_create_drvdata-to-device_create.patch +.dotest/patch:35: space before tab in indent. + MKDEV(IEEE1394_MAJOR, +warning: 1 line adds whitespace errors. +device-create-infiniband-convert-device_create_drvdata-to-device_create.patch +device-create-misc-convert-device_create_drvdata-to-device_create.patch +device-create-net-convert-device_create_drvdata-to-device_create.patch +device-create-s390-convert-device_create_drvdata-to-device_create.patch +device-create-scsi-convert-device_create_drvdata-to-device_create.patch +device-create-sound-convert-device_create_drvdata-to-device_create.patch +device-create-usb-convert-device_create_drvdata-to-device_create.patch +device-create-video-convert-device_create_drvdata-to-device_create.patch +device-create-ide-convert-device_create_drvdata-to-device_create.patch +device-create-remove-device_create_drvdata.patch +kobject-replace-all-occurrences-of-with-instead-of-only-the-first-one.patch +japanese-translation-of-documentation-submitchecklist.patch +drivers-base-driver.c-remove-unused-to_dev-macro.patch +dev_printk-constify-the-dev-argument.patch +kobject-fix-kobject_rename-and-config_sysfs.patch +Importing usb.current based on quilt/driver-core.current +$ git checkout quilt/usb.current +Switched to branch "quilt/usb.current" +$ git reset --hard 87bcefc8b95f182b2499dc9ba18c873699161848 +HEAD is now at 87bcefc kobject: Fix kobject_rename and !CONFIG_SYSFS +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb.current +usb-auerswald-remove-driver.patch +usb-add-musb-and-tusb-support.patch +usb-fix-usb-boot-crash-ecm_do_notify-list_add-corruption.-prev-next-should-be-next.patch +usb-fix-deadlock-in-cdc-acm.patch +usb-ftdi_sio-add-usb-product-id-for-elv-hs485.patch +usb-ftdi_sio-add-support-for-luminance-stellaris-evaluation-development-kits.patch +usb-add-missing-kerneldoc-line-for-needs_binding.patch +usb-core-driver-fix-warning.patch +usb-ohci-fix-system-hang-caused-by-earlier-patch.patch +drivers-usb-class-usblp.c-adjust-error-handling-code.patch +usb-kill-urbs-permanently.patch +usb-extend-poisoning-to-anchors.patch +usb-usb-storage-quirk-around-v1.11-firmware-on-nikon-d4.patch +usb-gadget-protect-gadget_chips.h-from-been-included-twice.patch +usb-serial-don-t-release-unregistered-minors.patch +usb-fix-interface-unregistration-logic.patch +usb-storage-automatically-recognize-bad-residues.patch +usb-move-usb-mon-up-to-misc-options-in-kconfig.patch +usb-storage-unusual_devs-entries-for-iriver-t10-and-datafab-cf-sm-reader.patch +Importing driver-core based on quilt/usb.current +$ git checkout quilt/driver-core +Switched to branch "quilt/driver-core" +$ git reset --hard 2f0389a175ea05ecbfb05cabf4e596e126ec3881 +HEAD is now at 2f0389a usb-storage: unusual_devs entries for iRiver T10 and Datafab CF+SM reader +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core +driver-core-make-struct-platform_pm_ops-static.patch +sysfs-support-sysfs_notify-from-atomic-context-with-new-sysfs_notify_dirent.patch +net-convert-the-phy_device-file-to-use-bus_find_device_by_name.patch +put_device-might_sleep.patch +warn-when-statically-allocated-kobjects-are-used.patch +sysfs-crash-debugging.patch +Importing usb based on quilt/driver-core +$ git checkout quilt/usb +Switched to branch "quilt/usb" +$ git reset --hard 1bcc91308469ce73bcca1f74e267b4723bfbbf36 +HEAD is now at 1bcc913 sysfs: crash debugging +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb +usb-gotemp.patch +Unchanged quilt series device-mapper +Unchanged quilt series i2c +Unchanged quilt series kernel-doc +Unchanged quilt series ide +Importing m68k based on c9272c4f9fbe2087beb3392f526dc5b19efaa56b + quilt series is empty +$ git update-ref refs/heads/quilt/m68k c9272c4f9fbe2087beb3392f526dc5b19efaa56b +Unchanged quilt series rr +Unchanged quilt series ttydev diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..fab1159d2b24 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20080801 |