1. 05 May, 2007 40 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 68762f3d
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [TG3]: Add TG3_FLAG_SUPPORT_MSI flag.
        [TG3]: Eliminate the TG3_FLAG_5701_REG_WRITE_BUG flag.
        [TG3]: Eliminate the TG3_FLAG_GOT_SERDES_FLOWCTL flag.
        [TG3]: Remove reset during MAC address changes.
        [TG3]: WoL fixes.
        [TG3]: Clear GPIO mask before storing.
        [TG3]: Improve NVRAM sizing.
        [TG3]: Fix TSO bugs.
        [MAC80211]: Add maintainers entry for mac80211.
        [MAC80211]: Add debugfs attributes.
        [MAC80211]: Add mac80211 wireless stack.
        [MAC80211]: Add generic include/linux/ieee80211.h
        [NETLINK]: Remove references to process ID
        [AF_IUCV]: Compile fix - adopt to skbuff changes.
      68762f3d
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · 4f7a307d
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (87 commits)
        [SCSI] fusion: fix domain validation loops
        [SCSI] qla2xxx: fix regression on sparc64
        [SCSI] modalias for scsi devices
        [SCSI] sg: cap reserved_size values at max_sectors
        [SCSI] BusLogic: stop using check_region
        [SCSI] tgt: fix rdma transfer bugs
        [SCSI] aacraid: fix aacraid not finding device
        [SCSI] aacraid: Correct SMC products in aacraid.txt
        [SCSI] scsi_error.c: Add EH Start Unit retry
        [SCSI] aacraid: [Fastboot] Panics for AACRAID driver during 'insmod' for kexec test.
        [SCSI] ipr: Driver version to 2.3.2
        [SCSI] ipr: Faster sg list fetch
        [SCSI] ipr: Return better qc_issue errors
        [SCSI] ipr: Disrupt device error
        [SCSI] ipr: Improve async error logging level control
        [SCSI] ipr: PCI unblock config access fix
        [SCSI] ipr: Fix for oops following SATA request sense
        [SCSI] ipr: Log error for SAS dual path switch
        [SCSI] ipr: Enable logging of debug error data for all devices
        [SCSI] ipr: Add new PCI-E IDs to device table
        ...
      4f7a307d
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/voyager-2.6 · fabb5c4e
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/jejb/voyager-2.6:
        [VOYAGER] add smp alternatives
        [VOYAGER] Use modern techniques to setup and teardown low identiy mappings.
        [VOYAGER] Convert the monitor thread to use the kthread API
        [VOYAGER] clockevents driver: bring voyager in to line
        [VOYAGER] clockevents: correct boot cpu is zero assumption
        [VOYAGER] add smp_call_function_single
      fabb5c4e
    • Michael Chan's avatar
      [TG3]: Add TG3_FLAG_SUPPORT_MSI flag. · 7544b097
      Michael Chan authored
      And fix up the code to always allow MSI on 5714 A2.
      
      Call tg3_find_peer() earlier because we need that information before
      we can determine whether we can set TG3_FLAG_SUPPORT_MSI or not.
      Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7544b097
    • Fabrice Aeschbacher's avatar
      ide-cs: recognize 2GB CompactFlash from Transcend · aa12b284
      Fabrice Aeschbacher authored
      Without the following patch, the kernel does not automatically detect
      2GB CompactFlash cards from Transcend.
      Signed-off-by: default avatarFabrice Aeschbacher <fabrice.aeschbacher@siemens.com>
      Cc: Dominik Brodowski <linux@dominikbrodowski.net>
      Acked-by: default avatarPeter Stuge <peter@stuge.se>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      aa12b284
    • Sergei Shtylyov's avatar
      hpt366: don't check enablebits for HPT36x · fdb0d72b
      Sergei Shtylyov authored
      HPT36x chip don't seem to have the channel enable bits, so prevent the IDE core
      from checking them...
      Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
      Cc: Michal Kepien <michal.kepien@poczta.onet.pl>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      fdb0d72b
    • Bartlomiej Zolnierkiewicz's avatar
      ide-cris: fix ->speedproc and wrong ->swdma_mask · 55e4dee3
      Bartlomiej Zolnierkiewicz authored
      * fix ->speedproc to set the drive speed
      
      * this driver doesn't support SWDMA so use the correct ->swdma_mask
      
      * BUG() if an unsupported mode is passed to ->speedproc
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      55e4dee3
    • Bartlomiej Zolnierkiewicz's avatar
      siimage: fix wrong ->swdma_mask · 8e60d376
      Bartlomiej Zolnierkiewicz authored
      This driver doesn't support SWDMA so use the correct ->swdma_mask.
      
      While at it:
      
      * no need to call config_chipset_for_pio() in config_chipset_for_dma(),
        if DMA is not available config_chipset_for_pio() will be called
        by siimage_config_drive_for_dma() and if DMA is available
        config_siimage_chipset_for_pio() will be called by siimage_tune_chipset()
      
      * remove needless config_chipset_for_pio() wrapper
      
      * bump driver version
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      8e60d376
    • Bartlomiej Zolnierkiewicz's avatar
      it821x: PIO mode setup fixes · 0e9b4e53
      Bartlomiej Zolnierkiewicz authored
      * limit max PIO mode to PIO4, this driver doesn't support PIO5 and attempt
        to setup PIO5 by it821x_tuneproc() could result in incorrect PIO timings
        + incorrect base clock being set for controller in the passthrough mode
      
      * move code limiting max PIO according to the pair device capabilities from
        config_it821x_chipset_for_pio() to it821x_tuneproc() so the check is also
        applied for mode change requests coming through ->tuneproc and ->speedproc
        interfaces
      
      * set device speed in it821x_tuneproc()
      
      * in it821x_tune_chipset() call it821x_tuneproc() also if the controller is
        in the smart mode (so the check for pair device max PIO is done)
      
      * rename it821x_tuneproc() to it821x_tune_pio(), then add it821x_tuneproc()
        wrapper which does the max PIO mode check;  it worked by the pure luck
        previously, pio[4] and pio_want[4] arrays were used with index == 255
        so random PIO timings and base clock were set for the controller in the
        passthrough mode, thankfully PIO timings and base clock were corrected
        later by config_it821x_chipset_for_pio() call (but it was not called for
        PIO-only devices during resume and for user requested PIO autotuning)
      
      * remove config_it821x_chipset_for_pio() call from config_chipset_for_dma()
        as the driver sets ->autotune to 1 and ->tuneproc does the proper job now
      
      * convert the last user of config_it821x_chipset_for_pio() to use
        it821x_tuneproc(drive, 255) and remove no longer needed function
      
      While at it:
      
      * fix few comments
      
      * bump driver version
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      0e9b4e53
    • Bartlomiej Zolnierkiewicz's avatar
      pdc202xx_new: enable DMA for all ATAPI devices · 247b03f8
      Bartlomiej Zolnierkiewicz authored
      There is no reason to limit DMA to ide_cdrom type devices.
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      247b03f8
    • Bartlomiej Zolnierkiewicz's avatar
      alim15x3: PIO fallback fix · 072cdcbb
      Bartlomiej Zolnierkiewicz authored
      If DMA tuning fails always set the best PIO mode.
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      072cdcbb
    • Sergei Shtylyov's avatar
      aec62xx: fix PIO/DMA setup issues · 826a1b65
      Sergei Shtylyov authored
      Teach the driver's tuneproc() method to do PIO auto-runing properly since it
      treated 5 instead of 255 as auto-tune request, and also passed the mode limit
      of PIO5 to ide_get_best_pio_mode() despite supporting up to PIO4 only.
      
      While at it, also:
      
      - remove the driver's wrong claim about supporting SWDMA modes;
      
      - stop hooking ide_dma_timeout() method as the handler clearly doesn't fit for
        the task...
      Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      826a1b65
    • Sergei Shtylyov's avatar
      cmd64x: use interrupt status from MRDMODE register (take 2) · 66602c83
      Sergei Shtylyov authored
      Fold the parts of the ide_dma_end() methods identical to __ide_dma_end() into a
      mere call to it.
      Start using faster versions of the ide_dma_end() and ide_dma_test_irq() methods
      for the PCI0646U and newer chips that have the duplicate interrupt status bits
      in the I/O mapped MRDMODE register, determing what methods to use at the driver
      load time. Do some cleanup/renaming in the "old" ide_dma_test_irq() method too.
      Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      66602c83
    • Sergei Shtylyov's avatar
      cmd64x: procfs code fixes/cleanups (take 2) · 5826b318
      Sergei Shtylyov authored
      Fix several issues with the driver's procfs output:
      
      - when testing if channel is enabled, the code looks at the "simplex" bits, not
        at the real enable bits -- add #define for the primary channel enable bit;
      
      - UltraDMA modes 0, 1, 3 for slave drive reported incorrectly due to using the
        master drive's clock cycle resolution bit.
      
      While at it, also perform the following cleanups:
      
      - don't print extra newline before the first controller's dump;
      
      - correct the chipset names (from CMDxxx to PCI-xxx)
      
      - don't read from the registers which aren't used for dump;
      
      - better align the table column sizes;
      
      - rework UltraDMA mode dump code;
      
      - remove PIO mode dump code that has never been finished;
      
      - remove the duplicate interrupt status (the MRDMODE register bits mirror those
        those in the CFR and ARTTIM23 registers) and fold the dump into single line;
      
      - correct the style of the ?: operators...
      Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      5826b318
    • Sergei Shtylyov's avatar
      cmd64x: add/fix enablebits (take 2) · 7accbffd
      Sergei Shtylyov authored
      The IDE core looks at the wrong bit when checking if the secondary channel is
      enabled on PCI0646 -- CNTRL register bit 7 is read-ahead disable, bit 3 is the
      correct one.
      Starting with PCI0646U chip, the primary channel can also be enabled/disabled --
      so, add 'enablebits' initializers to each 'ide_pci_device_t' structure, handling
      the original PCI0646 via adding the init_setup() method and clearing the 'reg'
      field there if necessary...
      Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      7accbffd
    • Sergei Shtylyov's avatar
      cmd64x: interrupt status fixes (take 2) · e51e2528
      Sergei Shtylyov authored
      The driver's ide_dma_test_irq() method was reading the MRDMODE register even on
      PCI0643/6 where it was write-only -- fix this by always reading the "backward-
      compatible" interrupt bits, renaming dma_alt_stat to irq_stat as the interrupt
      status bits are not coupled to DMA.
      In addition, wrong interrupt bit was tested/cleared for the primary channel --
      it's bit 2 in all the chip specs and the driver used bit 1... :-/
      Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      e51e2528
    • Sergei Shtylyov's avatar
      cmd64x: fix multiword and remove single-word DMA support · 60e7a82f
      Sergei Shtylyov authored
      Fix the multiword DMA and drop the single-word DMA support (which nobody will
      miss, I think).  In order to do it, a number of changes was necessary:
      
      - rename program_drive_counts() to program_cycle_times(), pass to it cycle's
        total/active times instead of the clock counts, and convert them into the
        active/recovery clocks there instead of cmd64x_tune_pio() -- this causes
        quantize_timing() to also move;
      
      - contrarywise, move all the code handling the address setup timing into
        cmd64x_tune_pio(), so that setting MWDMA mode wouldn't change address setup;
      
      - remove from the speedproc() method the  bogus code pretending to set the DMA
        timings by twiddling bits in the BMIDE status register, handle setting MWDMA
        by just calling program_cycle_times(); while at it, improve the style of that
        whole switch statement;
      
      - stop fiddling with the DMA capable bits in the speedproc() method -- they do
        not enable DMA, and are properly dealt with by the dma_host_{on,off} methods;
      
      - don't set hwif->swdma_mask in the init_hwif() method anymore.
      
      In addition to those changes, do the following:
      
      - in cmd64x_tune_pio(), when writing to ARTTIM23 register preserve the interrupt
        status bit, eliminate local_irq_{save|restore}() around this code as there's
        *no* actual race with the interrupt handler, and move cmdprintk() to a more
        fitting place -- after ide_get_best_pio_mode() call;
      
      - make {arttim|drwtim}_regs arrays single-dimensional, indexed with drive->dn;
      
      - rename {setup|recovery}_counts[] into more fitting {setup|recovery}_values[];
      
      - in  the speedproc() method, get rid of the duplicate reads/writes from/to the
        UDIDETCRx registers and of the extra variable used to store the transfer mode
        value after filtering,  use another method of determining master/slave drive,
        and cleanup useless parens;
      
      - beautify cmdprintk() output here and there.
      
      While at it, remove meaningless comment about the driver being used only on
      UltraSPARC and long non-relevant RCS tag. :-)
      Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      60e7a82f
    • Sergei Shtylyov's avatar
      sl82c105: DMA support code cleanup (take 4) · 688a87d1
      Sergei Shtylyov authored
      Fold the now equivalent code in the ide_dma_check() method into a mere call to
      ide_use_dma().  Make config_for_dma() return non-zero if DMA mode has been set
      and call it from the ide_dma_check() method instead of ide_dma_on().
      Defer writing the DMA timings to the chip registers until DMA is really turned
      on (and do not enable IORDY for DMA).
      Remove unneeded code from the init_hwif() method, improve its overall looks.
      Rename the dma_start(), ide_dma_check(), and ide_dma_lostirq() methods, and
      also use more proper hwif->dma_command, fix printk() and comment in the latter
      one as well.  While at it, cleanup style in several places.
      Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      688a87d1
    • Sergei Shtylyov's avatar
      sl82c105: rework PIO support (take 2) · e93df705
      Sergei Shtylyov authored
      Get rid of the 'pio_speed' member of 'ide_drive_t' that was only used by this
      driver by storing the PIO mode timings in the 'drive_data' instead -- this
      allows us to greatly  simplify the process of "reloading" of the chip's timing
      register and do it right in sl82c150_dma_off_quietly() and to get rid of two
      extra arguments to config_for_pio() -- which got renamed to sl82c105_tune_pio()
      and now returns a PIO mode selected, with ide_config_drive_speed() call moved
      into the tuneproc() method, now called sl82c105_tune_drive() with the code to
      set drive's 'io_32bit' and 'unmask' flags in its turn moved to its proper place
      in the init_hwif() method.
      Also, while at it, rename get_timing_sl82c105() into get_pio_timings() and get
      rid of the code in it clamping cycle counts to 32 which was both incorrect and
      never executed anyway...
      Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      e93df705
    • Matt Carlson's avatar
      [TG3]: Eliminate the TG3_FLAG_5701_REG_WRITE_BUG flag. · 98efd8a6
      Matt Carlson authored
      This patch removes the use of the TG3_FLAG_5701_REG_WRITE_BUG flag.
      It's logic is only used to set a function pointer and thus the
      logic can be collapsed and the flag removed.
      
      [ Comment tidy by Christoph Hellwig. -DaveM ]
      Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
      Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
      98efd8a6
    • Michael Chan's avatar
      [TG3]: Eliminate the TG3_FLAG_GOT_SERDES_FLOWCTL flag. · 5cf64b8a
      Michael Chan authored
      This flag does not do anything useful.
      Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      5cf64b8a
    • Michael Chan's avatar
      [TG3]: Remove reset during MAC address changes. · 986e0aeb
      Michael Chan authored
      The reset was added a while back so that ASF could re-init whatever
      MAC address it wanted to use after the MAC address was changed.
      Instead of resetting, we can just keep MAC address 1 unchanged during
      MAC address changes if MAC address 1 is different from MAC address 0.
      
      This fixes 2 problems:
      
      1. Bonding calls set_mac_address in contexts that cannot sleep.
      It no longer sleeps with the chip reset removed.
      
      2. When ASF shares the same MAC address as the NIC, it needs to
      always do that even when the MAC address is changed. 
      Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      986e0aeb
    • Gary Zambrano's avatar
      [TG3]: WoL fixes. · a85feb8c
      Gary Zambrano authored
      Change TG3_FLAG_SERDES_WOL_CAP to TG3_FLAG_WOL_CAP to make it easier
      to manage WoL.  This flag is now used consistently during ethtool WoL
      setup and power setting changes.
      Signed-off-by: default avatarGary Zambrano <zambrano@broadcom.com>
      Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a85feb8c
    • Gary Zambrano's avatar
      [TG3]: Clear GPIO mask before storing. · aaf84465
      Gary Zambrano authored
      The GPIO settings may change during reset and so the stored values in
      tp->grc_local_ctrl should be cleared first.
      Signed-off-by: default avatarGary Zambrano <zambrano@broadcom.com>
      Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      aaf84465
    • Matt Carlson's avatar
      [TG3]: Improve NVRAM sizing. · 989a9d23
      Matt Carlson authored
      This patch changes the NVRAM sizing procedure so that the driver can
      take advantage of devices with 1:1 NVRAM strapping configurations.  This
      is useful in cases where the traditional NVRAM sizing method fails.  In
      the event that the flash size cannot be determined, the largest known
      NVRAM size is used.  The patch also removes support for 5755 NVRAM
      devices that are not supported by Broadcom and adds explicit sizing for
      this device.
      Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
      Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      989a9d23
    • Matt Carlson's avatar
      [TG3]: Fix TSO bugs. · c13e3713
      Matt Carlson authored
      1. Remove the check for skb->len greater than MTU when doing TSO.
      When the destination has a smaller MSS than the source, a TSO packet
      may be smaller than the MTU and we still need to process it as a TSO
      packet.
      
      2. On 5705A3 devices with TSO enabled, the DMA engine can hang due to a
      hardware bug.  This patch avoids the hanging condition by reducing the
      DMA burst size.
      Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
      Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c13e3713
    • Jiri Benc's avatar
      [MAC80211]: Add maintainers entry for mac80211. · 64a327a7
      Jiri Benc authored
      Add MAINTAINERS entry for mac80211.
      Signed-off-by: default avatarJiri Benc <jbenc@suse.cz>
      Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      64a327a7
    • Jiri Benc's avatar
      [MAC80211]: Add debugfs attributes. · e9f207f0
      Jiri Benc authored
      Export various mac80211 internal variables through debugfs.
      Signed-off-by: default avatarJiri Benc <jbenc@suse.cz>
      Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e9f207f0
    • Jiri Benc's avatar
      [MAC80211]: Add mac80211 wireless stack. · f0706e82
      Jiri Benc authored
      Add mac80211, the IEEE 802.11 software MAC layer.
      Signed-off-by: default avatarJiri Benc <jbenc@suse.cz>
      Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
      f0706e82
    • Jiri Benc's avatar
      [MAC80211]: Add generic include/linux/ieee80211.h · a9de8ce0
      Jiri Benc authored
      Add generic IEEE 802.11 definitions.
      Signed-off-by: default avatarJiri Benc <jbenc@suse.cz>
      Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a9de8ce0
    • Herbert Xu's avatar
      [NETLINK]: Remove references to process ID · cf130cb1
      Herbert Xu authored
      People treating the *_pid fields in netlink as a process ID has caused
      endless confusion over the years.  The fact that our own netlink.h
      does this only adds to the confusion.
      
      So here is a patch to change the comments to refer to it as the port
      ID which hopefully will make it clear what the purpose of the fields
      really is.
      Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      cf130cb1
    • Heiko Carstens's avatar
      [AF_IUCV]: Compile fix - adopt to skbuff changes. · af7cd373
      Heiko Carstens authored
      From: Heiko Carstens <heiko.carstens@de.ibm.com>
      
        CC [M]  net/iucv/af_iucv.o
      net/iucv/af_iucv.c: In function `iucv_fragment_skb':
      net/iucv/af_iucv.c:984: error: structure has no member named `h'
      net/iucv/af_iucv.c:985: error: structure has no member named `nh'
      net/iucv/af_iucv.c:988: error: incompatible type for argument 1 of
      			`skb_queue_tail'
      Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      af7cd373
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc · 62ea6d80
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: (46 commits)
        mmc-omap: Clean up omap set_ios and make MMC_POWER_ON work
        mmc-omap: Fix omap to use MMC_POWER_ON
        mmc-omap: add missing '\n'
        mmc: make tifm_sd_set_dma_data() static
        mmc: remove old card states
        mmc: support unsafe resume of cards
        mmc: separate out reading EXT_CSD
        mmc: break apart switch function
        MMC: Fix handling of low-voltage cards
        MMC: Consolidate voltage definitions
        mmc: add bus handler
        wbsd: check for data opcode earlier
        mmc: Separate out protocol ops
        mmc: Move core functions to subdir
        mmc: deprecate mmc bus topology
        mmc: remove card upon suspend
        mmc: allow suspended block driver to be removed
        mmc: Flush pending detects on host removal
        mmc: Move host and card drivers to subdirs
        mmc: Move queue functions to mmc_block
        ...
      62ea6d80
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 · fa24aa56
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
        ocfs2: Force use of GFP_NOFS in ocfs2_write()
        ocfs2: fix sparse warnings in fs/ocfs2/cluster
        ocfs2: fix sparse warnings in fs/ocfs2/dlm
        ocfs2: fix sparse warnings in fs/ocfs2
        [PATCH] Copy i_flags to ocfs2 inode flags on write
        [PATCH] ocfs2: use __set_current_state()
        ocfs2: Wrap access of directory allocations with ip_alloc_sem.
        [PATCH] fs/ocfs2/: make 3 functions static
        ocfs2: Implement compat_ioctl()
      fa24aa56
    • Linus Torvalds's avatar
      iomap: make the default iomap functions fail softer · 6cbf0c70
      Linus Torvalds authored
      We used to BUG_ON() for a badly mapped IO port, which is certainly
      correct, but actually made it harder to debug the case where the ATA
      drivers had incorrectly mapped a nonconnected ATA port.
      
      So make badly mapped ports trigger a WARN_ON(), and throw the IO away
      instead (and return all ones for reads).  For things like broken driver
      initialization - which is the most likely cause anyway - that should
      mean that the machine comes up and is usable (at least that was the case
      for the ATA breakage that triggered this patch).
      
      It tends to be a whole lot easier to do a "dmesg" on a working machine
      than to try to capture logs off a dead one.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      6cbf0c70
    • Linus Torvalds's avatar
      Merge git://git.linux-nfs.org/pub/linux/nfs-2.6 · 4d470070
      Linus Torvalds authored
      * git://git.linux-nfs.org/pub/linux/nfs-2.6: (28 commits)
        NFS: Fix a compile glitch on 64-bit systems
        NFS: Clean up nfs_create_request comments
        spkm3: initialize hash
        spkm3: remove bad kfree, unnecessary export
        spkm3: fix spkm3's use of hmac
        NFS4: invalidate cached acl on setacl
        NFS: Fix directory caching problem - with test case and patch.
        NFS: Set meaningful value for fattr->time_start in readdirplus results.
        NFS: Added support to turn off the NFSv3 READDIRPLUS RPC.
        SUNRPC: RPC client should retry with different versions of rpcbind
        SUNRPC: remove old portmapper
        NFS: switch NFSROOT to use new rpcbind client
        SUNRPC: switch the RPC server to use the new rpcbind registration API
        SUNRPC: switch socket-based RPC transports to use rpcbind
        SUNRPC: introduce rpcbind: replacement for in-kernel portmapper
        SUNRPC: Eliminate side effects from rpc_malloc
        SUNRPC: RPC buffer size estimates are too large
        NLM: Shrink the maximum request size of NLM4 requests
        NFS: Use pgoff_t in structures and functions that pass page cache offsets
        NFS: Clean up nfs_sync_mapping_wait()
        ...
      4d470070
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 7e20ef03
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (49 commits)
        [SCTP]: Set assoc_id correctly during INIT collision.
        [SCTP]: Re-order SCTP initializations to avoid race with sctp_rcv()
        [SCTP]: Fix the SO_REUSEADDR handling to be similar to TCP.
        [SCTP]: Verify all destination ports in sctp_connectx.
        [XFRM] SPD info TLV aggregation
        [XFRM] SAD info TLV aggregationx
        [AF_RXRPC]: Sort out MTU handling.
        [AF_IUCV/IUCV] : Add missing section annotations
        [AF_IUCV]: Implementation of a skb backlog queue
        [NETLINK]: Remove bogus BUG_ON
        [IPV6]: Some cleanups in include/net/ipv6.h
        [TCP]: zero out rx_opt in tcp_disconnect()
        [BNX2]: Fix TSO problem with small MSS.
        [NET]: Rework dev_base via list_head (v3)
        [TCP] Highspeed: Limited slow-start is nowadays in tcp_slow_start
        [BNX2]: Update version and reldate.
        [BNX2]: Print bus information for PCIE devices.
        [BNX2]: Add 1-shot MSI handler for 5709.
        [BNX2]: Restructure PHY event handling.
        [BNX2]: Add indirect spinlock.
        ...
      7e20ef03
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input · a3d52136
      Linus Torvalds authored
      * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input: (65 commits)
        Input: gpio_keys - add support for switches (EV_SW)
        Input: cobalt_btns - convert to use polldev library
        Input: add skeleton for simple polled devices
        Input: update some documentation
        Input: wistron - fix typo in keymap for Acer TM610
        Input: add input_set_capability() helper
        Input: i8042 - add Fujitsu touchscreen/touchpad PNP IDs
        Input: i8042 - add Panasonic CF-29 to nomux list
        Input: lifebook - split into 2 devices
        Input: lifebook - add signature of Panasonic CF-29
        Input: lifebook - activate 6-byte protocol on select models
        Input: lifebook - work properly on Panasonic CF-18
        Input: cobalt buttons - separate device and driver registration
        Input: ati_remote - make button repeat sensitivity configurable
        Input: pxa27x - do not use deprecated SA_INTERRUPT flag
        Input: ucb1400 - make delays configurable
        Input: misc devices - switch to using input_dev->dev.parent
        Input: joysticks - switch to using input_dev->dev.parent
        Input: touchscreens - switch to using input_dev->dev.parent
        Input: mice - switch to using input_dev->dev.parent
        ...
      
      Fixed up conflicts with core device model removal of "struct subsystem" manually.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      a3d52136
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 · 5b339915
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
        remove "struct subsystem" as it is no longer needed
        sysfs: printk format warning
        DOC: Fix wrong identifier name in Documentation/driver-model/devres.txt
        platform: reorder platform_device_del
        Driver core: fix show_uevent from taking up way too much stack
      5b339915
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 · 89661ada
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (59 commits)
        PCI: Free resource files in error path of pci_create_sysfs_dev_files()
        pci-quirks: disable MSI on RS400-200 and RS480
        PCI hotplug: Use menuconfig objects
        PCI: ZT5550 CPCI Hotplug driver fix
        PCI: rpaphp: Remove semaphores
        PCI: rpaphp: Ensure more pcibios_add/pcibios_remove symmetry
        PCI: rpaphp: Use pcibios_remove_pci_devices() symmetrically
        PCI: rpaphp: Document is_php_dn()
        PCI: rpaphp: Document find_php_slot()
        PCI: rpaphp: Rename rpaphp_register_pci_slot() to rpaphp_enable_slot()
        PCI: rpaphp: refactor tail call to rpaphp_register_slot()
        PCI: rpaphp: remove rpaphp_set_attention_status()
        PCI: rpaphp: remove print_slot_pci_funcs()
        PCI: rpaphp: Remove setup_pci_slot()
        PCI: rpaphp: remove a call that does nothing but a pointer lookup
        PCI: rpaphp: Remove another wrappered function
        PCI: rpaphp: Remve another call that is a wrapper
        PCI: rpaphp: remove a function that does nothing but wrap debug printks
        PCI: rpaphp: Remove un-needed goto
        PCI: rpaphp: Fix a memleak; slot->location string was never freed
        ...
      89661ada