1. 05 Oct, 2006 10 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/willy/parisc-2.6 · 4b844718
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/willy/parisc-2.6:
        [PA-RISC] Fix time.c for new do_timer() calling convention
        [PA-RISC] Fix must_check warnings in drivers.c
        [PA-RISC] Fix parisc_newuname()
        [PA-RISC] Remove warning from pci.c
        [PA-RISC] Fix filldir warnings
        [PA-RISC] Fix sys32_sysctl
        [PA-RISC] Fix sba_iommu compilation
      4b844718
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · a43cdf08
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
        [POWERPC] cell: fix bugs found by sparse
        [POWERPC] spiderpic: enable new style devtree support
        [POWERPC] Update cell_defconfig
        [POWERPC] spufs: add infrastructure for finding elf objects
        [POWERPC] spufs: support new OF device tree format
        [POWERPC] spufs: add support for read/write on cntl
        [POWERPC] spufs: remove support for ancient firmware
        [POWERPC] spufs: make mailbox functions handle multiple elements
        [POWERPC] spufs: use correct pg_prot for mapping SPU local store
        [POWERPC] spufs: Add infrastructure needed for gang scheduling
        [POWERPC] spufs: implement error event delivery to user space
        [POWERPC] spufs: fix context switch during page fault
        [POWERPC] spufs: scheduler support for NUMA.
        [POWERPC] spufs: cell spu problem state mapping updates
      a43cdf08
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · 97d41e90
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (54 commits)
        [SCSI] Initial Commit of qla4xxx
        [SCSI] raid class: handle component-add errors
        [SCSI] SCSI megaraid_sas: handle thrown errors
        [SCSI] SCSI aic94xx: handle sysfs errors
        [SCSI] SCSI st: fix error handling in module init, sysfs
        [SCSI] SCSI sd: fix module init/exit error handling
        [SCSI] SCSI osst: add error handling to module init, sysfs
        [SCSI] scsi: remove hosts.h
        [SCSI] scsi: Scsi_Cmnd convertion in aic7xxx_old.c
        [SCSI] megaraid_sas: sets ioctl timeout and updates version,changelog
        [SCSI] megaraid_sas: adds tasklet for cmd completion
        [SCSI] megaraid_sas: prints pending cmds before setting hw_crit_error
        [SCSI] megaraid_sas: function pointer for disable interrupt
        [SCSI] megaraid_sas: frame count optimization
        [SCSI] megaraid_sas: FW transition and q size changes
        [SCSI] qla2xxx: Update version number to 8.01.07-k2.
        [SCSI] qla2xxx: Stall mid-layer error handlers while rport is blocked.
        [SCSI] qla2xxx: Add MODULE_FIRMWARE tags.
        [SCSI] qla2xxx: Add support for host port state FC transport attribute.
        [SCSI] qla2xxx: Add support for fabric name FC transport attribute.
        ...
      97d41e90
    • Matthew Wilcox's avatar
      [PA-RISC] Fix time.c for new do_timer() calling convention · 1604f318
      Matthew Wilcox authored
      do_timer now wants to know how many ticks have elapsed.  Now that we
      have to calculate that, we can eliminate some of the clever code that
      avoided having to calculate that.  Also add some more documentation.
      I'd like to thank Grant Grundler for helping me with this.
      Signed-off-by: default avatarMatthew Wilcox <willy@parisc-linux.org>
      1604f318
    • Matthew Wilcox's avatar
      [PA-RISC] Fix must_check warnings in drivers.c · 1070c965
      Matthew Wilcox authored
      Panic if we can't register the parisc bus or the root parisc device.
      There's no way we can boot without them, so let the user know ASAP.
      
      If we can't register a parisc device, handle the failure gracefully.
      Signed-off-by: default avatarMatthew Wilcox <willy@parisc-linux.org>
      1070c965
    • Matthew Wilcox's avatar
      [PA-RISC] Fix parisc_newuname() · f64ef295
      Matthew Wilcox authored
      The utsname virtualisation broke parisc_newuname compilation.
      Rewrite the implementation to call sys_newuname() like sparc64 does.
      Signed-off-by: default avatarMatthew Wilcox <willy@parisc-linux.org>
      f64ef295
    • Matthew Wilcox's avatar
      [PA-RISC] Remove warning from pci.c · ccd6c355
      Matthew Wilcox authored
      max() doesn't like comparing an unsigned long and a resource_size_t,
      so make the local variables resource_size_t too.
      Signed-off-by: default avatarMatthew Wilcox <willy@parisc-linux.org>
      ccd6c355
    • Matthew Wilcox's avatar
      [PA-RISC] Fix filldir warnings · 15c130c1
      Matthew Wilcox authored
      filldir_t now takes a u64, not an ino_t.
      Signed-off-by: default avatarMatthew Wilcox <matthew@wil.cx>
      15c130c1
    • Matthew Wilcox's avatar
      [PA-RISC] Fix sys32_sysctl · 17cca072
      Matthew Wilcox authored
      When CONFIG_SYSCTL_SYSCALL isn't defined, do_sysctl doesn't exist and
      we fail to link.  Fix with an ifdef, the same way sparc64 did.
      Also add some minor changes to be more like sparc64.
      Signed-off-by: default avatarMatthew Wilcox <matthew@wil.cx>
      17cca072
    • Matthew Wilcox's avatar
      [PA-RISC] Fix sba_iommu compilation · ee9f4b5d
      Matthew Wilcox authored
      klist_iter_exit() only takes one parameter.
      Also fix warning by adding additional brackets.
      Signed-off-by: default avatarMatthew Wilcox <matthew@wil.cx>
      ee9f4b5d
  2. 04 Oct, 2006 30 commits