1. 29 Mar, 2006 8 commits
    • Alan Cox's avatar
      [PATCH] libata - ATA is both ATA and CFA · 692785e7
      Alan Cox authored
      
      
      I think this is still needed with the new probe code (which btw seems to
      be missing docs in upstream ?).
      Signed-off-by: default avatarAlan Cox <alan@redhat.com>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      692785e7
    • Alan Cox's avatar
      [PATCH] libata: Add ->set_mode hook for odd drivers · e35a9e01
      Alan Cox authored
      
      
      Some hardware doesn't want the usual mode setup logic running. This
      allows the hardware driver to replace it for special cases in the least
      invasive way possible.
      Signed-off-by: default avatarAlan Cox <alan@redhat.com>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      e35a9e01
    • Alan Cox's avatar
      [PATCH] libata: BMDMA handling updates · 4e5ec5db
      Alan Cox authored
      
      
      This is the minimal patch set to enable the current code to be used with
      a controller following SFF (ie any PATA and early SATA controllers)
      safely without crashes if there is no BMDMA area or if BMDMA is not
      assigned by the BIOS for some reason.
      
      Simplex status is recorded but not acted upon in this change, this isn't
      a problem with the current drivers as none of them are for simplex
      hardware. A following diff will deal with that.
      
      The flags in the probe structure remain ->host_set_flags although Jeff
      asked me to rename them, simply because the rename would break the usual
      Linux rules that old code should break when there are changes. not
      compile and run and then blow up/eat your computer/etc. Renaming this
      later is a trivial exercise once a better name is chosen.
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      4e5ec5db
    • Tejun Heo's avatar
      [PATCH] libata: kill trailing whitespace · 05c8e0ac
      Tejun Heo authored
      
      
      Kill trailing whitespace.
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      05c8e0ac
    • Jeff Garzik's avatar
      Merge branch 'master' · e02a4cab
      Jeff Garzik authored
      e02a4cab
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · f3cab8a0
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [NETFILTER]: Rename init functions.
        [TCP]: Fix RFC2465 typo.
        [INET]: Introduce tunnel4/tunnel6
        [NET]: deinline 200+ byte inlines in sock.h
        [ECONET]: Convert away from SOCKOPS_WRAPPED
        [NET]: Fix ipx/econet/appletalk/irda ioctl crashes
        [NET]: Kill Documentation/networking/TODO
        [TG3]: Update version and reldate
        [TG3]: Skip timer code during full lock
        [TG3]: Speed up SRAM access
        [TG3]: Fix PHY loopback on 5700
        [TG3]: Fix bug in 40-bit DMA workaround code
        [TG3]: Fix probe failure due to invalid MAC address
      f3cab8a0
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · 76babde1
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (67 commits)
        [PATCH] powerpc: Remove oprofile spinlock backtrace code
        [PATCH] powerpc: Add oprofile calltrace support to all powerpc cpus
        [PATCH] powerpc: Add oprofile calltrace support
        [PATCH] for_each_possible_cpu: ppc
        [PATCH] for_each_possible_cpu: powerpc
        [PATCH] lock PTE before updating it in 440/BookE page fault handler
        [PATCH] powerpc: Kill _machine and hard-coded platform numbers
        ppc: Fix compile error in arch/ppc/lib/strcase.c
        [PATCH] git-powerpc: WARN was a dumb idea
        [PATCH] powerpc: a couple of trivial compile warning fixes
        powerpc: remove OCP references
        powerpc: Make uImage default build output for MPC8540 ADS
        powerpc: move math-emu over to arch/powerpc
        powerpc: use memparse() for mem= command line parsing
        ppc: fix strncasecmp prototype
        [PATCH] powerpc: make ISA floppies work again
        [PATCH] powerpc: Fix some initcall return values
        [PATCH] powerpc: Workaround for pSeries RTAS bug
        [PATCH] spufs: fix __init/__exit annotations
        [PATCH] powerpc: add hvc backend for rtas
        ...
      76babde1
    • Linus Torvalds's avatar
      Merge git://oss.sgi.com:8090/oss/git/xfs-2.6 · e71ac603
      Linus Torvalds authored
      * git://oss.sgi.com:8090/oss/git/xfs-2.6:
        [XFS] Cleanup in XFS after recent get_block_t interface tweaks.
        [XFS] Remove unused/obsoleted function: xfs_bmap_do_search_extents()
        [XFS] A change to inode chunk allocation to try allocating the new chunk
        Fixes a regression from the recent "remove ->get_blocks() support"
        [XFS] Fix compiler warning and small code inconsistencies in compat
        [XFS] We really suck at spulling.  Thanks to Chris Pascoe for fixing all
      e71ac603
  2. 28 Mar, 2006 32 commits