1. 25 Sep, 2006 3 commits
    • Sam Ravnborg's avatar
      kbuild: add unifdef · 01f1c879
      Sam Ravnborg authored
      This patch contains a raw copy of unifdef.c
      Next patch will modify it and add infrastructure to use it
      Adding unifdef to the kernel is acked by the author.
      
      The reason to add unifdef as part of the kernel source is that it is not
      yet a common utility on most distributions.
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      01f1c879
    • Sam Ravnborg's avatar
      kbuild: consistently decide when to rebuild a target · 48f1f058
      Sam Ravnborg authored
      Consistently decide when to rebuild a target across all of
      if_changed, if_changed_dep, if_changed_rule.
      PHONY targets are now treated alike (ignored) for all targets
      
      While add it make Kbuild.include almost readable by factoring out a few
      bits to some common variables and reuse this in Makefile.build.
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      48f1f058
    • Matthew Wilcox's avatar
      kconfig: support DOS line endings · d3660a8c
      Matthew Wilcox authored
      Kconfig doesn't currently handle config files with DOS line endings.
      While these are, of course, an abomination, etc, etc, it can be handy
      to not have to convert them first.  It's also a tiny patch and even adds
      support for lines ending in just \r or even \n\r.
      Signed-off-by: default avatarMatthew Wilcox <matthew@wil.cx>
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      d3660a8c
  2. 24 Sep, 2006 16 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · 4f5537de
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6:
        [SCSI] scsi_transport_fc: fixup netlink arguments
      4f5537de
    • James Bottomley's avatar
      [SCSI] scsi_transport_fc: fixup netlink arguments · 1b73c4bb
      James Bottomley authored
      nlmsg_multicast now takes an extra allocation flag, so add it to
      the use in the fibre channel transport class.
      Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
      1b73c4bb
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · f164c421
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (94 commits)
        [SCSI] SPI transport class: misc DV fixes
        [SCSI] Switch some more scsi drivers to pci_get_device and refcounted pci structures
        [SCSI] eata_pio cleanup and PCI fix
        [SCSI] aacraid: README update
        [SCSI] aacraid: remove scsi_remove_device
        [SCSI] aacraid: merge rx and rkt code
        [SCSI] aacraid: expose physical devices
        [SCSI] aacraid: misc cleanup
        [SCSI] zfcp: update maintainers file
        [SCSI] zfcp: update maintainers file
        [SCSI] zfcp: fix: avoid removal of fsf reqs before qdio queues are down
        [SCSI] zfcp: introduce struct timer_list in struct zfcp_fsf_req
        [SCSI] zfcp: fix: use correct req_id in eh_abort_handler
        [SCSI] zfcp: create private slab caches to guarantee proper data alignment
        [SCSI] zfcp: remove zfcp_ccw_unregister function
        [SCSI] aic7xxx: pause sequencer before touching SBLKCTL
        [SCSI] aic7xxx: avoid checking SBLKCTL register for certain cards
        [SCSI] scsi_debug version 1.80
        [SCSI] megaraid: Make megaraid_ioctl() check copy_to_user() return value
        [SCSI] aha152x: remove static host array
        ...
      f164c421
    • James Bottomley's avatar
      Merge mulgrave-w:git/linux-2.6 · 1aedf2cc
      James Bottomley authored
      Conflicts:
      
      	include/linux/blkdev.h
      
      Trivial merge to incorporate tag prototypes.
      1aedf2cc
    • James Bottomley's avatar
      [SCSI] SPI transport class: misc DV fixes · dfdc58ba
      James Bottomley authored
      Key more of the domain validation settings off the inquiry data from
      the disk (in particular, don't try IU or DT unless the disk claims to
      support them.
      
      Also add a new dv_in_progress flag to prevent recursive DV.
      Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
      dfdc58ba
    • David S. Miller's avatar
      [SPARC64]: Update defconfig. · 6973ddde
      David S. Miller authored
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      6973ddde
    • David S. Miller's avatar
      [SPARC64]: Fix sched_clock() wrapping every ~17 seconds. · e17ba8f5
      David S. Miller authored
      Unfortunately, sparc64 doesn't have an easy way to do a "64 X 64 -->
      128" bit multiply like PowerPC and IA64 do.  We were doing a
      "64 X 64 --> 64" bit multiple which causes overflow very quickly with
      a 30-bit quotient shift.
      
      So use a quotientshift count of 10 instead of 30, just like x86 and
      ARM do.
      
      This also fixes the wrapping of printk timestamp values every ~17
      seconds.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e17ba8f5
    • Alan Cox's avatar
    • Alan Cox's avatar
      [SCSI] eata_pio cleanup and PCI fix · 1a68d41a
      Alan Cox authored
      This started as a PCI reference fixup but to do that I need to build it,
      to build it I need to fix it and its full of 32bitisms and uglies.
      
      It has been resurrected, I'm not sure if this is a thank you for the
      work on the license stuff or punishment for some unknown misdeed however
      8). I've also fixed a memory scribble in the init code.
      
      One oddity - the changes from HZ * to constants are deliberate. Whoever
      originally wrote the code (or cleaned it up) used HZ for a cycle timing
      loop even though is not HZ related. I've put it back to the counts used
      in the old days when the driver was most used.
      Signed-off-by: default avatarAlan Cox <alan@redhat.com>
      Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
      1a68d41a
    • Mark Haverkamp's avatar
      [SCSI] aacraid: README update · 2538363e
      Mark Haverkamp authored
      Received from Mark Salyzyn:
      
      This patch to the driver's documentation adds a few new product entries,
      sorts the entries on OEM lines first for easy searching, followed by
      product id order to make it easier to compare against the open source
      pci list. The driver has 'family match' so is somewhat future proof, no
      code changes are required to recognize the new products.
      Signed-off-by: default avatarMark Haverkamp <markh@osdl.org>
      Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
      2538363e
    • Mark Haverkamp's avatar
      [SCSI] aacraid: remove scsi_remove_device · ac5826ca
      Mark Haverkamp authored
      Received from Mark Salyzyn:
      
      Until the system is stabilized, I am suggesting the enclosed
      modification to prevent the driver from tickling the panic. Once sysfs
      and friends are stabilized, the patch may be backed out. We have yet to
      evaluate if we really want to relinquish existing Scsi Devices in any
      case, holding on to them as configuration of arrays comes and goes makes
      some sense as well. As a result, we have opted to pull the lines rather
      than comment them in legacy.
      Signed-off-by: default avatarMark Haverkamp <markh@osdl.org>
      Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
      ac5826ca
    • Mark Haverkamp's avatar
      [SCSI] aacraid: merge rx and rkt code · 76a7f8fd
      Mark Haverkamp authored
      Received from Mark Salyzyn:
      
      The only real difference between the rkt and rx platform modules is the
      offset of the message registers. This patch recognizes this similarity
      and simplifies the driver to reduce it's code footprint and to improve
      maintainability by reducing the code duplication.
      
      Visibly, the 'rkt.c' portion of this patch looks more complicated than
      it really is. View it as retaining the rkt-only specifics of the
      interface.
      Signed-off-by: default avatarMark Haverkamp <markh@osdl.org>
      Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
      76a7f8fd
    • Mark Haverkamp's avatar
      [SCSI] aacraid: expose physical devices · 653ba58d
      Mark Haverkamp authored
      Received from Mark Salyzyn:
      
      I am placing this functionality into an insmod parameter. Normally the physical
      components are exported to sg, and are blocked from showing up in sd.
      
      Note that the pass-through I/O path via the driver through the Firmware to the
      physical disks is not an optimized path, the card is designed for Hardware
      RAID, elevator sorting and caching. This should not be used as a means for
      utilizing the aacraid based controllers as a generic scsi/SATA/SAS controller,
      performance should suck by a few percentage points, any RAID meta-data on the
      drives will confuse the controller about who owns the drives and there is a
      high risk of destroying content in both directions. Unreliable and for
      experimentation or strange controlled circumstances only.
      Signed-off-by: default avatarMark Haverkamp <markh@osdl.org>
      Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
      653ba58d
    • Mark Haverkamp's avatar
      [SCSI] aacraid: misc cleanup · 65101355
      Mark Haverkamp authored
      Received from Mark Salyzyn:
      
      Basically cleanup, nothing here will have an affect. Adjusting some
      error codes, removing superfluous definitions and code fragments.
      Signed-off-by: default avatarMark Haverkamp <markh@osdl.org>
      Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
      65101355
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/mtd-2.6 · 1ab9dd09
      Linus Torvalds authored
      * git://git.infradead.org/mtd-2.6:
        [MTD] Whitespace cleanup in SSFDC driver.
        [MTD] SSFDC translation layer minor cleanup
        [MTD] Fix dependencies with CONFIG_MTD=m
      1ab9dd09
    • Linus Torvalds's avatar
      Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa · f7425b16
      Linus Torvalds authored
      * 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: (148 commits)
        [ALSA] intel8x0m - Free irq in suspend
        [ALSA] Move CONFIG_SND_AC97_POWER_SAVE to pci/Kconfig
        [ALSA] usb-audio: add mixer control names for the Aureon 5.1 MkII
        [ALSA] ES1938: remove duplicate field initialization
        [ALSA] usb-audio: increase number of packets per URB
        [ALSA] hda-codec - Fix headphone auto-toggle on sigmatel codec
        [ALSA] hda-intel - A slight cleanup of timeout check in azx_get_response()
        [ALSA] hda-codec - Fix mic input with STAC92xx codecs
        [ALSA] mixart: Use SEEK_{SET,CUR,END} instead of hardcoded values
        [ALSA] gus: Use SEEK_{SET,CUR,END} instead of hardcoded values
        [ALSA] opl4: Use SEEK_{SET,CUR,END} instead of hardcoded values
        [ALSA] sound core: Use SEEK_{SET,CUR,END} instead of hardcoded values
        [ALSA] hda-codec - Support multiple headphone pins
        [ALSA] hda_intel prefer 24bit instead of 20bit
        [ALSA] hda-codec - Add vendor ids for Motorola and Conexant
        [ALSA] hda-codec - Add device id for Motorola si3054-compatible codec
        [ALSA] Add missing compat ioctls for ALSA control API
        [ALSA] powermac - Fix Oops when conflicting with aoa driver
        [ALSA] aoa: add locking to tas codec
        [ALSA] hda-intel - Fix suspend/resume with MSI
        ...
      f7425b16
  3. 23 Sep, 2006 21 commits