1. 09 12月, 2008 6 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · f7a8db89
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
        tproxy: fixe a possible read from an invalid location in the socket match
        zd1211rw: use unaligned safe memcmp() in-place of compare_ether_addr()
        mac80211: use unaligned safe memcmp() in-place of compare_ether_addr()
        ipw2200: fix netif_*_queue() removal regression
        iwlwifi: clean key table in iwl_clear_stations_table function
        tcp: tcp_vegas ssthresh bug fix
        can: omit received RTR frames for single ID filter lists
        ATM: CVE-2008-5079: duplicate listen() on socket corrupts the vcc table
        netx-eth: initialize per device spinlock
        tcp: make urg+gso work for real this time
        enc28j60: Fix sporadic packet loss (corrected again)
        hysdn: fix writing outside the field on 64 bits
        b1isa: fix b1isa_exit() to really remove registered capi controllers
        can: Fix CAN_(EFF|RTR)_FLAG handling in can_filter
        Phonet: do not dump addresses from other namespaces
        netlabel: Fix a potential NULL pointer dereference
        bnx2: Add workaround to handle missed MSI.
        xfrm: Fix kernel panic when flush and dump SPD entries
      f7a8db89
    • L
      Merge branch 'x86-fixes-for-linus' of... · 6f84b4db
      Linus Torvalds 提交于
      Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: fix default_spin_lock_flags() prototype
        AMD IOMMU: __unmap_single: check for bad_dma_address instead of 0
        AMD IOMMU: fix WARN_ON in dma_ops unmap path
        AMD IOMMU: fix typo in comment
        AMD IOMMU: fix loop counter in free_pagetable function
        AMD IOMMU: fix iommu_map_page function
      6f84b4db
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 · 7f336bf1
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
        ide: build-fix for CONFIG_BLK_DEV_IDEDMA_PMAC=n
        Revert "ide: respect current DMA setting during resume"
      7f336bf1
    • J
      EXPORTFS: handle NULL returns from fh_to_dentry()/fh_to_parent() · a4f4d6df
      J. Bruce Fields 提交于
      While 44003728 "[PATCH] switch all filesystems over to
      d_obtain_alias" removed some cases where fh_to_dentry() and
      fh_to_parent() could return NULL, there are still a few NULL returns
      left in individual filesystems.  Thus it was a mistake for that commit
      to remove the handling of NULL returns in the callers.
      
      Revert those parts of 44003728 which removed the NULL handling.
      
      (We could, alternatively, modify all implementations to return -ESTALE
      instead of NULL, but that proves to require fixing a number of
      filesystems, and in some cases it's arguably more natural to return
      NULL.)
      
      Thanks to David for original patch and Linus, Christoph, and Hugh for
      review.
      Signed-off-by: NJ. Bruce Fields <bfields@citi.umich.edu>
      Cc: David Howells <dhowells@redhat.com>
      Cc: Christoph Hellwig <hch@infradead.org>
      Cc: Hugh Dickins <hugh@veritas.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      a4f4d6df
    • B
      ide: build-fix for CONFIG_BLK_DEV_IDEDMA_PMAC=n · 53846574
      Bartlomiej Zolnierkiewicz 提交于
      IDE pmac host driver build fails with CONFIG_BLK_DEV_IDEDMA_PMAC=n
      as reported by Kamalesh:
      
      > drivers/ide/pmac.c: In function 'pmac_ide_set_pio_mode':
      > drivers/ide/pmac.c:527: error: implicit declaration of function 'kauai_lookup_timing'
      > drivers/ide/pmac.c:527: error: 'shasta_pio_timings' undeclared (first use in this function)
      > drivers/ide/pmac.c:527: error: (Each undeclared identifier is reported only once
      > drivers/ide/pmac.c:527: error: for each function it appears in.)
      > drivers/ide/pmac.c:534: error: 'kauai_pio_timings' undeclared (first use in this function)
      > drivers/ide/pmac.c: In function 'pmac_ide_do_resume':
      > drivers/ide/pmac.c:914: error: 'IDE_WAKEUP_DELAY' undeclared (first use in this function)
      > drivers/ide/pmac.c: At top level:
      > drivers/ide/pmac.c:1007: error: 'pmac_ide_init_dma' undeclared here (not in a function)
      > drivers/ide/pmac.c: In function 'pmac_ide_setup_device':
      > drivers/ide/pmac.c:1107: error: 'IDE_WAKEUP_DELAY' undeclared (first use in this function)
      > drivers/ide/pmac.c: In function 'pmac_ide_macio_attach':
      > drivers/ide/pmac.c:1209: error: 'pmac_ide_hwif_t' has no member named 'dma_regs'
      > drivers/ide/pmac.c:1210: error: 'pmac_ide_hwif_t' has no member named 'dma_regs'
      > make[2]: *** [drivers/ide/pmac.o] Error 1
      
      Fix it by removing the superfluous config option.
      Reported-and-tested-by: NKamalesh Babulal <kamalesh@linux.vnet.ibm.com>
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
      Cc: Stephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      53846574
    • B
      Revert "ide: respect current DMA setting during resume" · 1a659880
      Bartlomiej Zolnierkiewicz 提交于
      This reverts commit e9eb8388 since
      it could break resume (thanks to Paul Collins for the report).
      
      I'll look into sorting this out properly for 2.6.29
      but for 2.6.28 it is the best to just revert my patch.
      Reported-by: NPaul Collins <paul@burly.ondioline.org>
      Cc: rjw@sisk.pl
      Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      1a659880
  2. 08 12月, 2008 7 次提交
  3. 06 12月, 2008 9 次提交
  4. 05 12月, 2008 18 次提交