Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Jun 5, 2007
  1. Linux 2.6.22-rc4

    Linus Torvalds authored
  2. Merge git://git.infradead.org/mtd-2.6

    Linus Torvalds authored
    * git://git.infradead.org/mtd-2.6:
      [JFFS2] Fix obsoletion of metadata nodes in jffs2_add_tn_to_tree()
      [MTD] Fix error checking after get_mtd_device() in get_sb_mtd functions
      [JFFS2] Fix buffer length calculations in jffs2_get_inode_nodes()
      [JFFS2] Fix potential memory leak of dead xattrs on unmount.
      [JFFS2] Fix BUG() caused by failing to discard xattrs on deleted files.
      [MTD] generalise the handling of MTD-specific superblocks
      [MTD] [MAPS] don't force uclinux mtd map to be root dev
Commits on Jun 4, 2007
  1. @htejun

    libata: always use polling SETXFER

    htejun authored Jeff Garzik committed
    Several people have reported LITE-ON LTR-48246S detection failed
    because SETXFER fails.  It seems the device raises IRQ too early after
    SETXFER.  This is controller independent.  The same problem has been
    reported for different controllers.
    
    So, now we have pata_via where the controller raises IRQ before it's
    ready after SETXFER and a device which does similar thing.  This patch
    makes libata always execute SETXFER via polling.  As this only happens
    during EH, performance impact is nil.  Setting ATA_TFLAG_POLLING is
    also moved from issue hot path to ata_dev_set_xfermode() - the only
    place where SETXFER can be issued.
    
    Note that ATA_TFLAG_POLLING applies only to drivers which implement
    SFF TF interface and use libata HSM.  More advanced controllers ignore
    the flag.  This doesn't matter for this fix as SFF TF controllers are
    the problematic ones.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  2. Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

    Linus Torvalds authored
    * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
      [SCSI] JAZZ ESP and SUN ESP need SPI_ATTRS
      [SCSI] atari_NCR5380: update_timeout removal
      [SCSI] aacraid: fix shutdown handler to also disable interrupts.
      [SCSI] qla2xxx: fix timeout in qla2x00_down_timeout
      [SCSI] fix CONFIG_SCSI_WAIT_SCAN=m
  3. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    Linus Torvalds authored
    …/git/dtor/input
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
      Input: reduce raciness when input handlers disconnect
      Input: ucb1x00 - do not access input_dev->private directly
      Input: logips2pp - fix typo in Kconfig
      Input: db9 - do not ignore dev2 module parameter
  4. Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/…

    Linus Torvalds authored
    …davem/net-2.6
    
    * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
      [ICMP]: Fix icmp_errors_use_inbound_ifaddr sysctl
      [IPV4]: Fix "ipOutNoRoutes" counter error for TCP and UDP
      [NET] gso: Fix GSO feature mask in sk_setup_caps
      [TCP]: Fix GSO ignorance of pkts_acked arg (cong.cntrl modules)
      [NET]: Fix comparisons of unsigned < 0.
      [NET]: Make net watchdog timers 1 sec jiffy aligned.
      [ATM]: Fix warning.
      [TCP]: Use default 32768-61000 outgoing port range in all cases.
      [AF_UNIX]: Fix datagram connect race causing an OOPS.
      [TG3]: Fix link problem on Dell's onboard 5906.
      [AF_UNIX]: Make socket locking much less confusing.
  5. Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/…

    Linus Torvalds authored
    …davem/sparc-2.6
    
    * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
      [ATA]: Don't allow to enable this for SPARC64 without PCI.
      [VIDEO]: XVR500 and XVR2500 require FB=y
  6. vanishing ioctl handler debugging

    Andrew Morton authored Linus Torvalds committed
    We've had several reoprts of the CPU jumping to 0x00000000 is do_ioctl().  I
    assume that there's a race and someone is zeroing out the ioctl handler while
    this CPU waits for the lock_kernel().
    
    The patch adds code to detect this, then emits stuff which will hopefuly lead
    us to the culprit.
    
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. mtrr atomicity fix

    Andrew Morton authored Linus Torvalds committed
    Rafael gets this on an SMP box with kernel preemption enabled, during
    hibernation and restore (100% of the time):
    
    Enabling non-boot CPUs ...
    BUG: using smp_processor_id() in preemptible [00000001] code: bash/4514
    caller is mtrr_save_state+0x9/0x40
    
    Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
    Cc: Andi Kleen <ak@suse.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  8. SPI dynamic busid generation bugfix

    David Brownell authored Linus Torvalds committed
    Fix SPI dynamic bus ID assignment to start at 2^15-1 rather than a negative
    number.  Valid bus ids are supposed to be positive, and are (now) stored in
    an 's16' value.
    
    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  9. @davem330

    [SCSI] JAZZ ESP and SUN ESP need SPI_ATTRS

    davem330 authored James Bottomley committed
    Reported by Meelis Roos.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
  10. [SCSI] atari_NCR5380: update_timeout removal

    Michael Schmitz authored James Bottomley committed
    Atari SCSI driver fixes: remove update_timeout kludge
    
    Signed-off-by: Michael Schmitz <schmitz@debian.org>
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Acked-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
  11. Input: reduce raciness when input handlers disconnect

    Dmitry Torokhov authored
    There is a race between input handler's release() and disconnect()
    methods: when input handler disconnects it wakes up all regular
    users and then process to walk user list to wake up async. users.
    While disconnect() walks the list release() removes elements of
    the same list causing oopses.
    
    While this is not a substibute for proper locking we can reduce
    odds of getting an oops if we wake up normal readers after walking
    the list.
    
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  12. Input: ucb1x00 - do not access input_dev->private directly

    Dmitry Torokhov authored
    Use input_get_drvdata() and input_set_drvdata() helpers to do that.
    
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
    Acked-by: Pavel Machek <pavel@ucw.cz>
  13. [ATA]: Don't allow to enable this for SPARC64 without PCI.

    David S. Miller authored
    Based upon a report from Meelis Roos.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
  14. [VIDEO]: XVR500 and XVR2500 require FB=y

    David S. Miller authored
    Signed-off-by: David S. Miller <davem@davemloft.net>
  15. @kaber

    [ICMP]: Fix icmp_errors_use_inbound_ifaddr sysctl

    kaber authored David S. Miller committed
    Currently when icmp_errors_use_inbound_ifaddr is set and an ICMP error is
    sent after the packet passed through ip_output(), an address from the
    outgoing interface is chosen as ICMP source address since skb->dev doesn't
    point to the incoming interface anymore.
    
    Fix this by doing an interface lookup on rt->dst.iif and using that device.
    
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  16. [IPV4]: Fix "ipOutNoRoutes" counter error for TCP and UDP

    Wei Dong authored David S. Miller committed
    Signed-off-by: Wei Dong <weidong@cn.fujitsu.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  17. @herbertx

    [NET] gso: Fix GSO feature mask in sk_setup_caps

    herbertx authored David S. Miller committed
    This isn't a bug just yet as only TCP uses sk_setup_caps for GSO.
    However, if and when UDP or something else starts using it this is
    likely to cause a problem if we forget to add software emulation
    for it at the same time.
    
    The problem is that right now we translate GSO emulation to the
    bitmask NETIF_F_GSO_MASK, which includes every protocol, even
    ones that we cannot emulate.
    
    This patch makes it provide only the ones that we can emulate.
    
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  18. [TCP]: Fix GSO ignorance of pkts_acked arg (cong.cntrl modules)

    Ilpo Järvinen authored David S. Miller committed
    The code used to ignore GSO completely, passing either way too
    small or zero pkts_acked when GSO skb or part of it got ACKed.
    In addition, there is no need to calculate the value in the loop
    but simple arithmetics after the loop is sufficient. There is
    no need to handle SYN case specially because congestion control
    modules are not yet initialized when FLAG_SYN_ACKED is set.
    
    Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  19. [NET]: Fix comparisons of unsigned < 0.

    Bill Nottingham authored David S. Miller committed
    Recent gcc versions emit warnings when unsigned variables are
    compared < 0 or >= 0.
    
    Signed-off-by: Bill Nottingham <notting@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  20. [NET]: Make net watchdog timers 1 sec jiffy aligned.

    Venkatesh Pallipadi authored David S. Miller committed
    round_jiffies for net dev watchdog timer.
    
    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  21. [ATM]: Fix warning.

    Jeff Garzik authored David S. Miller committed
    The compiler warning
    
    drivers/atm/firestream.c: In function ‘top_off_fp’:
    drivers/atm/firestream.c:1505: warning: cast to pointer from integer of different size
    
    does indicate a bug, albeit a minor one.  Fixed, by using a 32-bit
    temporary prior to the call to bus_to_virt().
    
    The larger bug is still present:  the entire driver assumes that machine
    pointers are 32-bit, as it stores pointers in 32-bit hardware registers.
    This is obvious to anyone who knows the driver well, but for the casual
    readers it is helpfully noted with FIXME.
    
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  22. @Infinoid

    [TCP]: Use default 32768-61000 outgoing port range in all cases.

    Infinoid authored David S. Miller committed
    This diff changes the default port range used for outgoing connections,
    from "use 32768-61000 in most cases, but use N-4999 on small boxes
    (where N is a multiple of 1024, depending on just *how* small the box
    is)" to just "use 32768-61000 in all cases".
    
    I don't believe there are any drawbacks to this change, and it keeps
    outgoing connection ports farther away from the mess of
    IANA-registered ports.
    
    Signed-off-by: Mark Glines <mark@glines.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  23. [AF_UNIX]: Fix datagram connect race causing an OOPS.

    David S. Miller authored
    Based upon an excellent bug report and initial patch by
    Frederik Deweerdt.
    
    The UNIX datagram connect code blindly dereferences other->sk_socket
    via the call down to the security_unix_may_send() function.
    
    Without locking 'other' that pointer can go NULL via unix_release_sock()
    which does sock_orphan() which also marks the socket SOCK_DEAD.
    
    So we have to lock both 'sk' and 'other' yet avoid all kinds of
    potential deadlocks (connect to self is OK for datagram sockets and it
    is possible for two datagram sockets to perform a simultaneous connect
    to each other).  So what we do is have a "double lock" function similar
    to how we handle this situation in other areas of the kernel.  We take
    the lock of the socket pointer with the smallest address first in
    order to avoid ABBA style deadlocks.
    
    Once we have them both locked, we check to see if SOCK_DEAD is set
    for 'other' and if so, drop everything and retry the lookup.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
  24. [TG3]: Fix link problem on Dell's onboard 5906.

    Michael Chan authored David S. Miller committed
    The bug is caused by code that always set
    (TG3_FLAG_USE_MI_INTERRUPT | TG3_FLAG_USE_LINKCHG_REG) on all Dell's
    onboard devices.  With these 2 flags set, the link status is polled
    by tg3_timer() and will only work when the PHY is set up to interrupt
    the MAC on link changes.  This breaks 5906 because the 5906 PHY does
    not support TG3_FLAG_USE_MI_INTERRUPT the same as other PHYs.
    
    For correctness, only Dell's onboard 5701 needs these 2 flags to be
    set.  This change will fix the 5906 problem and will change other
    Dell devices except 5700 and 5701 to use the more efficient
    interrupt-driven link changes.
    
    Update version to 3.77.
    
    Signed-off-by: Michael Chan <mchan@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  25. [AF_UNIX]: Make socket locking much less confusing.

    David S. Miller authored
    The unix_state_*() locking macros imply that there is some
    rwlock kind of thing going on, but the implementation is
    actually a spinlock which makes the code more confusing than
    it needs to be.
    
    So use plain unix_state_lock and unix_state_unlock.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
Commits on Jun 3, 2007
  1. Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/ker…

    Linus Torvalds authored
    …nel/git/jgarzik/netdev-2.6
    
    * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
      NET: add MAINTAINERS entry for ucc_geth driver
      myri10ge: report link up/down in standard ethtool way
      NetXen: Removal of extra free_irq call
      Update tulip maintainer email address
      smc91x: sh solution engine fixes.
      e1000: disable polling before registering netdevice
      network drivers: eliminate unneeded kill_vid code
      atl1: eliminate unneeded kill_vid code
      8139cp: fix VLAN unregistration
      sky2: Fix VLAN unregistration
      VLAN: kill_vid is only useful for VLAN filtering devices
      qla3xxx: device doesnt do hardware checksumming.
  2. Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-wat…

    Linus Torvalds authored
    …chdog
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
      [WATCHDOG] clean-up watchdog documentation
      [WATCHDOG] ks8695_wdt.c - new KS8695 watchdog driver
  3. Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    Linus Torvalds authored
    …t/paulus/powerpc
    
    * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
      [POWERPC] Fix zImage.coff generation for 32-bit pmac
      [POWERPC] Fix compile breakage for IBM/AMCC 4xx arch/ppc platforms
      [POWERPC] Don't allow PMAC_APM_EMU for 64-bit
      [POWERPC] Compare irq numbers with NO_IRQ not IRQ_NONE
      [POWERPC] Fix return from pte_alloc_one() in out-of-memory case
      [POWERPC] Fix compile warning in pseries xics code
      [POWERPC] Don't use HOSTCFLAGS in BOOTCFLAGS
      [POWERPC] Create a zImage for legacy iSeries
      [POWERPC] pasemi idle uses hard_smp_processor_id
      [POWERPC] ps3/interrupt.c uses get_hard_smp_processor_id
      [POWERPC] Fix possible access to free pages
      [POWERPC] Fix compiler/assembler flags for Ebony platform boot files
      [POWERPC] Fix ppc32 single-stepping out of syscalls
      [POWERPC] Update documentation for of_find_node_by_type()
  4. NET: add MAINTAINERS entry for ucc_geth driver

    Li Yang authored Jeff Garzik committed
    Signed-off-by: Li Yang <leoli@freescale.com>
    Acked-by: Kim Phillips <kim.phillips@freescale.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  5. myri10ge: report link up/down in standard ethtool way

    Brice Goglin authored Jeff Garzik committed
    Report link up/down in standard ethtool way
    
    Signed-off-by: Brice Goglin <brice@myri.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  6. NetXen: Removal of extra free_irq call

    Mithlesh Thukral authored Jeff Garzik committed
    NetXen: Removal of redundant free_irq
    This patch removes a redundant free_irq() call from remove() routine.
    This will also eliminate a warning during unload of driver.
    
    Signed-by: Mithlesh Thukral <mithlesh@netxen.com>
    
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  7. Update tulip maintainer email address

    Valerie Henson authored Jeff Garzik committed
    I've quit Intel and gone into business as a Linux consultant.  Update
    my email address in MAINTAINERS.
    
    Signed-off-by: Valerie Henson <val@nmt.edu>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  8. @pmundt

    smc91x: sh solution engine fixes.

    pmundt authored Jeff Garzik committed
    The current smc91x I/O routines ifdef the solution engine subtypes
    individually, which is rather bogus, as they can simply use
    CONFIG_SOLUTION_ENGINE instead. This fixes it for some of the other
    solution engines that weren't included in the ifdef list (SH7206
    specifically).
    
    There are also inb/outb definitions which are totally bogus (missing
    brackets in _both_ cases, SMC_CAN_USE_8BIT == 0, and even better, they
    try to use a 16-bit access to fake 8-bit access). Kill that nonsense off
    completely.
    
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
    
    --
    
     drivers/net/smc91x.h |    5 +----
     1 file changed, 1 insertion(+), 4 deletions(-)
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
Something went wrong with that request. Please try again.