From /pub/scm/linux/kernel/git/jejb/../torvalds/linux-2.6 f6614b7..9457b24 master -> origin/master Switched to branch '2.6.37-rc1-stor5' From . * branch scsi-rc-fixes -> FETCH_HEAD From . * branch block-for-linus -> FETCH_HEAD From . * branch block-for-next -> FETCH_HEAD warning: too many files (created: 1655 deleted: 843), skipping inexact rename detection Died at /pub/linux/kernel/people/jejb/build.pl line 103. hmobile/Kconfig | 2 + arch/arm/mach-shmobile/board-ap4evb.c | 46 ++++- arch/arm/mach-shmobile/clock-sh7372.c | 102 ++++++++ arch/arm/mach-shmobile/include/mach/gpio.h | 4 +- arch/arm/mach-shmobile/include/mach/sh7372.h | 2 + arch/ia64/hp/sim/simscsi.c | 4 +- arch/sh/Kconfig | 1 + arch/sh/Makefile | 3 - arch/sh/boards/Kconfig | 7 - arch/sh/boards/Makefile | 2 + arch/sh/boards/board-edosk7705.c | 78 ++++++ .../setup.c => board-secureedge5410.c} | 38 +--- arch/sh/boards/mach-edosk7705/Makefile | 5 - arch/sh/boards/mach-edosk7705/io.c | 71 ------ arch/sh/boards/mach-edosk7705/setup.c | 36 --- arch/sh/boards/mach-microdev/io.c | 246 +------------------- arch/sh/boards/mach-microdev/setup.c | 23 +-- arch/sh/boards/mach-se/7206/Makefile | 2 +- arch/sh/boards/mach-se/7206/io.c | 104 -------- arch/sh/boards/mach-se/7206/irq.c | 4 +- arch/sh/boards/mach-se/7206/setup.c | 15 -- arch/sh/boards/mach-se/770x/Makefile | 2 +- arch/sh/boards/mach-se/770x/io.c | 156 ------------- arch/sh/boards/mach-se/770x/setup.c | 22 -- arch/sh/boards/mach-se/7751/Makefile | 2 +- arch/sh/boards/mach-se/7751/io.c | 119 ---------- arch/sh/boards/mach-se/7751/setup.c | 18 -- arch/sh/boards/mach-snapgear/Makefile | 5 - arch/sh/boards/mach-snapgear/io.c | 121 ---------- arch/sh/boards/mach-systemh/Makefile | 13 - arch/sh/boards/mach-systemh/io.c | 158 ------------- arch/sh/boards/mach-systemh/irq.c | 61 ----- arch/sh/boards/mach-systemh/setup.c | 57 ----- ...snapgear_defconfig => secureedge5410_defconfig} | 0 arch/sh/configs/systemh_defconfig | 28 --- arch/sh/include/asm/addrspace.h | 8 +- arch/sh/include/asm/pgtable.h | 12 - arch/sh/include/asm/system.h | 4 +- arch/sh/include/asm/system_32.h | 36 --- arch/sh/include/asm/system_64.h | 3 - arch/sh/include/asm/uncached.h | 40 ++++ arch/sh/include/mach-common/mach/edosk7705.h | 7 - arch/sh/include/mach-common/mach/microdev.h | 9 - .../mach/{snapgear.h => secureedge5410.h} | 22 -- arch/sh/include/mach-common/mach/systemh7751.h | 71 ------ arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 6 +- arch/sh/mm/Kconfig | 2 +- arch/sh/mm/consistent.c | 15 +- arch/sh/mm/uncached.c | 2 +- arch/sh/tools/mach-types | 1 - drivers/Makefile | 1 + drivers/ata/libata-scsi.c | 4 +- drivers/block/cciss_scsi.c | 4 +- drivers/block/floppy.c | 2 +- drivers/char/Makefile | 44 +---- drivers/clocksource/sh_cmt.c | 10 +- drivers/clocksource/sh_mtu2.c | 10 +- drivers/clocksource/sh_tmu.c | 10 +- drivers/firewire/sbp2.c | 4 +- drivers/infiniband/ulp/srp/ib_srp.c | 4 +- drivers/message/fusion/mptfc.c | 4 +- drivers/message/fusion/mptsas.c | 4 +- drivers/message/fusion/mptspi.c | 4 +- drivers/message/i2o/i2o_scsi.c | 6 +- drivers/rtc/rtc-ds1302.c | 2 +- drivers/s390/scsi/zfcp_scsi.c | 4 +- drivers/scsi/3w-9xxx.c | 4 +- drivers/scsi/3w-sas.c | 4 +- drivers/scsi/3w-xxxx.c | 4 +- drivers/scsi/53c700.c | 6 +- drivers/scsi/BusLogic.c | 3 +- drivers/scsi/NCR5380.c | 3 +- drivers/scsi/NCR53c406a.c | 4 +- drivers/scsi/a100u2w.c | 4 +- drivers/scsi/aacraid/linit.c | 4 +- drivers/scsi/advansys.c | 4 +- drivers/scsi/aha152x.c | 4 +- drivers/scsi/aha1542.c | 4 +- drivers/scsi/aha1740.c | 4 +- drivers/scsi/aic7xxx/aic79xx_osm.c | 4 +- drivers/scsi/aic7xxx/aic7xxx_osm.c | 4 +- drivers/scsi/aic7xxx_old.c | 4 +- drivers/scsi/arcmsr/arcmsr_hba.c | 4 +- drivers/scsi/arm/acornscsi.c | 4 +- drivers/scsi/arm/fas216.c | 8 +- drivers/scsi/atari_NCR5380.c | 4 +- drivers/scsi/atp870u.c | 4 +- drivers/scsi/bfa/bfad_im.c | 4 +- drivers/scsi/dc395x.c | 3 +- drivers/scsi/dpt_i2o.c | 4 +- drivers/scsi/eata.c | 4 +- drivers/scsi/eata_pio.c | 4 +- drivers/scsi/esp_scsi.c | 4 +- drivers/scsi/fd_mcs.c | 4 +- drivers/scsi/fdomain.c | 4 +- drivers/scsi/fnic/fnic_scsi.c | 4 +- drivers/scsi/gdth.c | 4 +- drivers/scsi/hpsa.c | 4 +- drivers/scsi/hptiop.c | 4 +- drivers/scsi/ibmmca.c | 4 +- drivers/scsi/ibmvscsi/ibmvfc.c | 4 +- drivers/scsi/ibmvscsi/ibmvscsi.c | 4 +- drivers/scsi/imm.c | 4 +- drivers/scsi/in2000.c | 4 +- drivers/scsi/initio.c | 4 +- drivers/scsi/ipr.c | 4 +- drivers/scsi/ips.c | 4 +- drivers/scsi/libfc/fc_fcp.c | 4 +- drivers/scsi/libiscsi.c | 4 +- drivers/scsi/libsas/sas_scsi_host.c | 4 +- drivers/scsi/lpfc/lpfc_scsi.c | 4 +- drivers/scsi/mac53c94.c | 4 +- drivers/scsi/megaraid.c | 4 +- drivers/scsi/megaraid/megaraid_mbox.c | 4 +- drivers/scsi/megaraid/megaraid_sas.c | 4 +- drivers/scsi/mesh.c | 4 +- drivers/scsi/mpt2sas/mpt2sas_scsih.c | 4 +- drivers/scsi/ncr53c8xx.c | 4 +- drivers/scsi/nsp32.c | 4 +- drivers/scsi/pcmcia/nsp_cs.c | 4 +- drivers/scsi/pcmcia/sym53c500_cs.c | 4 +- drivers/scsi/pmcraid.c | 4 +- drivers/scsi/ppa.c | 4 +- drivers/scsi/ps3rom.c | 4 +- drivers/scsi/qla1280.c | 4 +- drivers/scsi/qla2xxx/qla_os.c | 4 +- drivers/scsi/qla4xxx/ql4_os.c | 4 +- drivers/scsi/qlogicfas408.c | 4 +- drivers/scsi/qlogicpti.c | 4 +- drivers/scsi/scsi.c | 15 +- drivers/scsi/scsi_debug.c | 4 +- drivers/scsi/scsi_error.c | 3 - drivers/scsi/stex.c | 4 +- drivers/scsi/sun3_NCR5380.c | 4 +- drivers/scsi/sym53c416.c | 4 +- drivers/scsi/sym53c8xx_2/sym_glue.c | 4 +- drivers/scsi/tmscsim.c | 4 +- drivers/scsi/u14-34f.c | 4 +- drivers/scsi/ultrastor.c | 4 +- drivers/scsi/vmw_pvscsi.c | 4 +- drivers/scsi/wd33c93.c | 6 +- drivers/scsi/wd7000.c | 4 +- drivers/sh/clk/core.c | 96 ++++++++- drivers/sh/intc/core.c | 2 +- drivers/sh/intc/dynamic.c | 2 +- .../ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c | 4 +- drivers/staging/hv/storvsc_drv.c | 4 +- drivers/staging/keucr/scsiglue.c | 4 +- drivers/staging/solo6x10/solo6010-v4l2-enc.c | 2 +- drivers/staging/solo6x10/solo6010-v4l2.c | 2 +- drivers/tty/Makefile | 11 + drivers/{char => tty}/n_gsm.c | 0 drivers/{char => tty}/n_hdlc.c | 0 drivers/{char => tty}/n_r3964.c | 0 drivers/{char => tty}/n_tty.c | 0 drivers/{char => tty}/pty.c | 0 drivers/{char => tty}/sysrq.c | 0 drivers/{char => tty}/tty_audit.c | 0 drivers/{char => tty}/tty_buffer.c | 0 drivers/{char => tty}/tty_io.c | 0 drivers/{char => tty}/tty_ioctl.c | 0 drivers/{char => tty}/tty_ldisc.c | 0 drivers/{char => tty}/tty_mutex.c | 0 drivers/{char => tty}/tty_port.c | 0 drivers/{char => tty/vt}/.gitignore | 0 drivers/tty/vt/Makefile | 34 +++ drivers/{char => tty/vt}/consolemap.c | 0 drivers/{char => tty/vt}/cp437.uni | 0 drivers/{char => tty/vt}/defkeymap.c_shipped | 0 drivers/{char => tty/vt}/defkeymap.map | 0 drivers/{char => tty/vt}/keyboard.c | 0 drivers/{char => tty/vt}/selection.c | 0 drivers/{char => tty/vt}/vc_screen.c | 0 drivers/{char => tty/vt}/vt.c | 0 drivers/{char => tty/vt}/vt_ioctl.c | 0 drivers/usb/image/microtek.c | 4 +- drivers/usb/storage/scsiglue.c | 4 +- drivers/usb/storage/uas.c | 4 +- fs/cifs/inode.c | 1 - fs/cifs/ioctl.c | 12 +- fs/ext4/ext4.h | 4 +- fs/ext4/inode.c | 3 + fs/ext4/mballoc.c | 2 - fs/ext4/page-io.c | 97 ++++---- fs/ext4/super.c | 102 +++++---- fs/openpromfs/inode.c | 2 +- include/linux/kernel.h | 2 +- include/linux/mmc/sh_mmcif.h | 18 +- include/linux/sh_clk.h | 4 + include/linux/sh_timer.h | 1 - include/scsi/scsi_host.h | 22 ++ include/trace/events/ext4.h | 97 ++++++++ mm/mprotect.c | 2 +- 193 files changed, 1004 insertions(+), 1769 deletions(-) create mode 100644 arch/sh/boards/board-edosk7705.c rename arch/sh/boards/{mach-snapgear/setup.c => board-secureedge5410.c} (70%) delete mode 100644 arch/sh/boards/mach-edosk7705/Makefile delete mode 100644 arch/sh/boards/mach-edosk7705/io.c delete mode 100644 arch/sh/boards/mach-edosk7705/setup.c delete mode 100644 arch/sh/boards/mach-se/7206/io.c delete mode 100644 arch/sh/boards/mach-se/770x/io.c delete mode 100644 arch/sh/boards/mach-se/7751/io.c delete mode 100644 arch/sh/boards/mach-snapgear/Makefile delete mode 100644 arch/sh/boards/mach-snapgear/io.c delete mode 100644 arch/sh/boards/mach-systemh/Makefile delete mode 100644 arch/sh/boards/mach-systemh/io.c delete mode 100644 arch/sh/boards/mach-systemh/irq.c delete mode 100644 arch/sh/boards/mach-systemh/setup.c rename arch/sh/configs/{snapgear_defconfig => secureedge5410_defconfig} (100%) delete mode 100644 arch/sh/configs/systemh_defconfig delete mode 100644 arch/sh/include/mach-common/mach/edosk7705.h rename arch/sh/include/mach-common/mach/{snapgear.h => secureedge5410.h} (79%) delete mode 100644 arch/sh/include/mach-common/mach/systemh7751.h delete mode 100644 drivers/staging/ath6kl/os/linux/include/athendpack_linux.h delete mode 100644 drivers/staging/ath6kl/os/linux/include/athstartpack_linux.h create mode 100644 drivers/tty/Makefile rename drivers/{char => tty}/n_gsm.c (100%) rename drivers/{char => tty}/n_hdlc.c (100%) rename drivers/{char => tty}/n_r3964.c (100%) rename drivers/{char => tty}/n_tty.c (100%) rename drivers/{char => tty}/pty.c (100%) rename drivers/{char => tty}/sysrq.c (100%) rename drivers/{char => tty}/tty_audit.c (100%) rename drivers/{char => tty}/tty_buffer.c (100%) rename drivers/{char => tty}/tty_io.c (100%) rename drivers/{char => tty}/tty_ioctl.c (100%) rename drivers/{char => tty}/tty_ldisc.c (100%) rename drivers/{char => tty}/tty_mutex.c (100%) rename drivers/{char => tty}/tty_port.c (100%) rename drivers/{char => tty/vt}/.gitignore (100%) create mode 100644 drivers/tty/vt/Makefile rename drivers/{char => tty/vt}/consolemap.c (100%) rename drivers/{char => tty/vt}/cp437.uni (100%) rename drivers/{char => tty/vt}/defkeymap.c_shipped (100%) rename drivers/{char => tty/vt}/defkeymap.map (100%) rename drivers/{char => tty/vt}/keyboard.c (100%) rename drivers/{char => tty/vt}/selection.c (100%) rename drivers/{char => tty/vt}/vc_screen.c (100%) rename drivers/{char => tty/vt}/vt.c (100%) rename drivers/{char => tty/vt}/vt_ioctl.c (100%) ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git for-linus block-for-linus ## Auto-merging drivers/scsi/scsi_error.c Auto-merging drivers/usb/storage/uas.c Merge made by recursive. Documentation/block/switching-sched.txt | 8 +- Documentation/kernel-parameters.txt | 2 +- Documentation/rbtree.txt | 4 +- block/blk-core.c | 11 +-- block/blk-ioc.c | 14 -- block/blk-map.c | 2 + block/compat_ioctl.c | 4 +- block/elevator.c | 4 +- block/ioctl.c | 7 +- block/scsi_ioctl.c | 34 ++++-- drivers/block/aoe/aoeblk.c | 3 - drivers/block/cciss.c | 131 +++++++++---------- drivers/block/cciss.h | 4 + drivers/block/drbd/drbd_actlog.c | 42 ++++--- drivers/block/drbd/drbd_int.h | 52 ++++---- drivers/block/drbd/drbd_main.c | 148 ++++++++++++--------- drivers/block/drbd/drbd_nl.c | 25 +++- drivers/block/drbd/drbd_proc.c | 1 - drivers/block/drbd/drbd_receiver.c | 217 +++++-------------------------- drivers/block/drbd/drbd_req.c | 38 +++--- drivers/block/drbd/drbd_worker.c | 23 +--- drivers/block/loop.c | 6 - drivers/block/xen-blkfront.c | 2 - drivers/md/md.c | 20 ++-- drivers/scsi/scsi_error.c | 18 +-- drivers/usb/storage/uas.c | 5 +- fs/bio.c | 23 +++- fs/ioprio.c | 18 +++- include/linux/bio.h | 4 - include/linux/blk_types.h | 6 +- include/linux/blkdev.h | 3 +- include/linux/drbd.h | 2 +- include/linux/iocontext.h | 1 - kernel/trace/blktrace.c | 4 - 34 files changed, 367 insertions(+), 519 deletions(-) ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git for-next block-for-next ## Auto-merging fs/ocfs2/file.c CONFLICT (content): Merge conflict in fs/ocfs2/file.c Automatic merge failed; fix conflicts and then commit the result.