Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Sep 20, 2006
  1. Linux v2.6.18. Arrr!

    Linus Torvalds authored
    Ahoy, all land-lubbers, test me out right smartly!
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  2. Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

    Linus Torvalds authored
    * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
      [IPV4] fib_trie: missing ntohl() when calling fib_semantic_match()
      [NETFILTER]: xt_quota: add missing module aliases
      [ATM]: [he] don't hold the device lock when upcalling
Commits on Sep 19, 2006
  1. @davem330

    [IPV4] fib_trie: missing ntohl() when calling fib_semantic_match()

    Al Viro authored davem330 committed
    fib_trie.c::check_leaf() passes host-endian where fib_semantic_match()
    expects (and stores into) net-endian.
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  2. @kaber @davem330

    [NETFILTER]: xt_quota: add missing module aliases

    kaber authored davem330 committed
    Add missing aliases for ipt_quota and ip6t_quota to make autoload
    work.
    
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  3. @davem330

    [ATM]: [he] don't hold the device lock when upcalling

    Chas Williams authored davem330 committed
    This can create a deadlock/lock ordering problem with other layers
    that want to use the transmit (or other) path of the card at that
    time.
    
    Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  4. Merge branch 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6

    Linus Torvalds authored
    * 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6:
      NFS: Fix nfs_page use after free issues in fs/nfs/write.c
      NFSv4: Fix incorrect semaphore release in _nfs4_do_open()
      NFS: Fix Oopsable condition in nfs_readpage_sync()
  5. NFS: Fix nfs_page use after free issues in fs/nfs/write.c

    Trond Myklebust authored
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  6. NFSv4: Fix incorrect semaphore release in _nfs4_do_open()

    Trond Myklebust authored
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  7. NFS: Fix Oopsable condition in nfs_readpage_sync()

    Trond Myklebust authored
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  8. Revert mmiocfg heuristics and blacklist changes

    Linus Torvalds authored
    This reverts commits 11012d4 and
    40dd2d2, which allowed us to use the
    MMIO accesses for PCI config cycles even without the area being marked
    reserved in the e820 memory tables.
    
    Those changes were needed for EFI-environment Intel macs, but broke some
    newer Intel 965 boards, so for now it's better to revert to our old
    2.6.17 behaviour and at least avoid introducing any new breakage.
    
    Andi Kleen has a set of patches that work with both EFI and the broken
    Intel 965 boards, which will be applied once they get wider testing.
    
    Cc: Arjan van de Ven <arjan@infradead.org>
    Cc: Edgar Hucek <hostmaster@ed-soft.at>
    Cc: Andi Kleen <ak@suse.de>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  9. Merge git://git.infradead.org/mtd-2.6

    Linus Torvalds authored
    * git://git.infradead.org/mtd-2.6:
      [MTD] Use SEEK_{SET,CUR,END} instead of hardcoded values in mtdchar lseek()
      MTD: Fix bug in fixup_convert_atmel_pri
      [JFFS2][SUMMARY] Fix a summary collecting bug.
      [PATCH] [MTD] DEVICES: Fill more device IDs in the structure of m25p80
      MTD: Add lock/unlock operations for Atmel AT49BV6416
      MTD: Convert Atmel PRI information to AMD format
      fs/jffs2/xattr.c: remove dead code
      [PATCH] [MTD] Maps: Add dependency on alternate probe methods to physmap
      [PATCH] MTD: Add Macronix MX29F040 to JEDEC
      [MTD] Fixes of performance and stability issues in CFI driver.
      block2mtd.c: Make kernel boot command line arguments work (try 4)
      [MTD NAND] Fix lookup error in nand_get_flash_type()
      remove #error on !PCI from pmc551.c
      MTD: [NAND] Fix the sharpsl driver after breakage from a core conversion
      [MTD] NAND: OOB buffer offset fixups
      make fs/jffs2/nodelist.c:jffs2_obsolete_node_frag() static
      [PATCH] [MTD] NAND: fix dead URL in Kconfig
  10. [PATCH] EXT2: Remove superblock lock contention in ext2_statfs

    Dave Kleikamp authored Linus Torvalds committed
    Fix a performance degradation introduced in 2.6.17.  (30% degradation
    running dbench with 16 threads)
    
    Commit 21730ee, which claims to make
    EXT2_DEBUG work again, moves the taking of the kernel lock out of
    debug-only code in ext2_count_free_inodes and ext2_count_free_blocks and
    into ext2_statfs.
    
    The same problem was fixed in ext3 by removing the lock completely (commit
    5b11687)
    
    Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  11. [PATCH] headers_check: Clean up asm-parisc/page.h for user headers

    Matthew Wilcox authored Linus Torvalds committed
    Remove definitions of PAGE_* from the user view
    Delete unnecessary comments referring to the size of pages
    Only include <asm-generic> if we're in __KERNEL__
    
    Signed-off-by: David Woodhouse <dwmw2@infradead.org>
    Signed-off-by: Matthew Wilcox <matthew@wil.cx>
    Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  12. @geertu

    [PATCH] Fix 'make headers_check' on ia64

    geertu authored Linus Torvalds committed
    Fix 'make headers_check' on m68k
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Cc: Roman Zippel <zippel@linux-m68k.org>
    Cc: David Woodhouse <dwmw2@infradead.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  13. @dwmw2

    [PATCH] Add headers_check' target to output of 'make help'

    dwmw2 authored Linus Torvalds committed
    Signed-off-by: David Woodhouse <dwmw2@infradead.org>
    Cc: Sam Ravnborg <sam@ravnborg.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  14. [PATCH] genirq core: fix handle_level_irq()

    Ingo Molnar authored Linus Torvalds committed
    while porting the -rt tree to 2.6.18-rc7 i noticed the following
    screaming-IRQ scenario on an SMP system:
    
     2274  0Dn.:1 0.001ms: do_IRQ+0xc/0x103  <= (ret_from_intr+0x0/0xf)
     2274  0Dn.:1 0.010ms: do_IRQ+0xc/0x103  <= (ret_from_intr+0x0/0xf)
     2274  0Dn.:1 0.020ms: do_IRQ+0xc/0x103  <= (ret_from_intr+0x0/0xf)
     2274  0Dn.:1 0.029ms: do_IRQ+0xc/0x103  <= (ret_from_intr+0x0/0xf)
     2274  0Dn.:1 0.039ms: do_IRQ+0xc/0x103  <= (ret_from_intr+0x0/0xf)
     2274  0Dn.:1 0.048ms: do_IRQ+0xc/0x103  <= (ret_from_intr+0x0/0xf)
     2274  0Dn.:1 0.058ms: do_IRQ+0xc/0x103  <= (ret_from_intr+0x0/0xf)
     2274  0Dn.:1 0.068ms: do_IRQ+0xc/0x103  <= (ret_from_intr+0x0/0xf)
     2274  0Dn.:1 0.077ms: do_IRQ+0xc/0x103  <= (ret_from_intr+0x0/0xf)
     2274  0Dn.:1 0.087ms: do_IRQ+0xc/0x103  <= (ret_from_intr+0x0/0xf)
     2274  0Dn.:1 0.097ms: do_IRQ+0xc/0x103  <= (ret_from_intr+0x0/0xf)
    
    as it turns out, the bug is caused by handle_level_irq(), which if it
    races with another CPU already handling this IRQ, it _unmasks_ the IRQ
    line on the way out. This is not how 2.6.17 works, and we introduced
    this bug in one of the early genirq cleanups right before it went into
    -mm. (the bug was not in the genirq patchset for a long time, and we
    didnt notice the bug due to the lack of -rt rebase to the new genirq
    code. -rt, and hardirq-preemption in particular opens up such races much
    wider than anything else.)
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Commits on Sep 18, 2006
  1. x86: save/restore eflags in context switch

    Linus Torvalds authored
    (And reset it on new thread creation)
    
    It turns out that eflags is important to save and restore not just
    because of iopl, but due to the magic bits like the NT bit, which we
    don't want leaking between different threads.
    
    Tested-by: Mike Galbraith <efault@gmx.de>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  2. Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

    Linus Torvalds authored
    * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
      [ATM] CLIP: Do not refer freed skbuff in clip_mkip().
      [NET]: Drop tx lock in dev_watchdog_up
      [PACKET]: Don't truncate non-linear skbs with mmaped IO
      [NET]: Mark frame diverter for future removal.
      [NETFILTER]: Add secmark headers to header-y
      [ATM]: linux-atm-general mailing list is subscribers only
      [ATM]: [he] when transmit fails, unmap the dma regions
      [TCP] tcp-lp: update information to MAINTAINERS
      [TCP] tcp-lp: bug fix for oops in 2.6.18-rc6
      [BRIDGE]: random extra bytes on STP TCN packet
      [IPV6]: Accept -1 for IPV6_TCLASS
      [IPV6]: Fix tclass setting for raw sockets.
      [IPVS]: remove the debug option go ip_vs_ftp
      [IPVS]: Make sure ip_vs_ftp ports are valid
      [IPVS]: auto-help for ip_vs_ftp
      [IPVS]: Document the ports option to ip_vs_ftp in kernel-parameters.txt
      [TCP]: Turn ABC off.
      [NEIGH]: neigh_table_clear() doesn't free stats
  3. Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

    Linus Torvalds authored
    * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
      [SPARC]: Fix regression in sys_getdomainname()
      [OPENPROMIO]: Handle current_node being NULL correctly.
  4. Merge master.kernel.org:/home/rmk/linux-2.6-arm

    Linus Torvalds authored
    * master.kernel.org:/home/rmk/linux-2.6-arm:
      [ARM] 3815/1: headers_install support for ARM
      [ARM] 3794/1: S3C24XX: do not defined set_irq_wake when no CONFIG_PM
      [ARM] 3793/1: S3C2412: fix wrong serial info struct
      [ARM] 3780/1: Fix iop321 cpuid
      [ARM] 3786/1: pnx4008: update defconfig
      [ARM] 3785/1: S3C2412: Fix idle code as default uses wrong clocks
      [ARM] 3784/1: S3C2413: fix config for MACH_S3C2413/MACH_SMDK2413
  5. [ARM] 3815/1: headers_install support for ARM

    Ralph Siemsen authored Russell King committed
    Move kernel-only #includes into #ifdef __KERNEL__, so that
    headers_install target can be used on ARM.
    
    Signed-off-by: Ralph Siemsen <ralphs@netwinder.org>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  6. @davem330

    [SPARC]: Fix regression in sys_getdomainname()

    Andy Walker authored davem330 committed
    This patch corrects the buffer length checking in the
    sys_getdomainname() implementation for sparc/sparc64.
    
    Signed-off-by: Andy Walker <andy@puszczka.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  7. @davem330

    [ATM] CLIP: Do not refer freed skbuff in clip_mkip().

    YOSHIFUJI Hideaki authored davem330 committed
    In clip_mkip(), skb->dev is dereferenced after clip_push(),
    which frees up skb.
    
    Advisory: AD_LAB-06009 (<adlab@venustech.com.cn>).
    
    Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  8. [ARM] 3794/1: S3C24XX: do not defined set_irq_wake when no CONFIG_PM

    Ben Dooks authored Russell King committed
    Patch from Ben Dooks
    
    Do not define set_irq_wake as a real function if
    the CONFIG_PM option is not set.
    
    Fixes bug reported by Thomas Gleixner.
    
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  9. [ARM] 3793/1: S3C2412: fix wrong serial info struct

    Ben Dooks authored Russell King committed
    Patch from Ben Dooks
    
    The S3C2440 serial info struct is being passed
    through the S3C2412 serial info struct probe
    routine.
    
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Signed-off-by: Thomas Glexiner <tglx@linutronix.de>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  10. [OPENPROMIO]: Handle current_node being NULL correctly.

    David S. Miller authored
    If the user tries to traverse to the next node of the
    last node, we get NULL in current_node and a zero phandle
    returned.  That's fine, but if the user tries to obtain
    properties in that state, we try to dereference a NULL
    pointer in the downcall to the of_*() routines.
    
    So protect against that.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
  11. @herbertx @davem330

    [NET]: Drop tx lock in dev_watchdog_up

    herbertx authored davem330 committed
    Fix lockdep warning with GRE, iptables and Speedtouch ADSL, PPP over ATM.
    
    On Sat, Sep 02, 2006 at 08:39:28PM +0000, Krzysztof Halasa wrote:
    > 
    > =======================================================
    > [ INFO: possible circular locking dependency detected ]
    > -------------------------------------------------------
    > swapper/0 is trying to acquire lock:
    >  (&dev->queue_lock){-+..}, at: [<c02c8c46>] dev_queue_xmit+0x56/0x290
    > 
    > but task is already holding lock:
    >  (&dev->_xmit_lock){-+..}, at: [<c02c8e14>] dev_queue_xmit+0x224/0x290
    > 
    > which lock already depends on the new lock.
    
    This turns out to be a genuine bug.  The queue lock and xmit lock are
    intentionally taken out of order.  Two things are supposed to prevent
    dead-locks from occuring:
    
    1) When we hold the queue_lock we're supposed to only do try_lock on the
    tx_lock.
    
    2) We always drop the queue_lock after taking the tx_lock and before doing
    anything else.
    
    > 
    > the existing dependency chain (in reverse order) is:
    > 
    > -> #1 (&dev->_xmit_lock){-+..}:
    >        [<c012e7b6>] lock_acquire+0x76/0xa0
    >        [<c0336241>] _spin_lock_bh+0x31/0x40
    >        [<c02d25a9>] dev_activate+0x69/0x120
    
    This path obviously breaks assumption 1) and therefore can lead to ABBA
    dead-locks.
    
    I've looked at the history and there seems to be no reason for the lock
    to be held at all in dev_watchdog_up.  The lock appeared in day one and
    even there it was unnecessary.  In fact, people added __dev_watchdog_up
    precisely in order to get around the tx lock there.
    
    The function dev_watchdog_up is already serialised by rtnl_lock since
    its only caller dev_activate is always called under it.
    
    So here is a simple patch to remove the tx lock from dev_watchdog_up.
    In 2.6.19 we can eliminate the unnecessary __dev_watchdog_up and
    replace it with dev_watchdog_up.
    
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  12. @kaber @davem330

    [PACKET]: Don't truncate non-linear skbs with mmaped IO

    kaber authored davem330 committed
    Non-linear skbs are truncated to their linear part with mmaped IO.
    Fix by using skb_copy_bits instead of memcpy.
    
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Acked-by: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  13. [NET]: Mark frame diverter for future removal.

    Stephen Hemminger authored David S. Miller committed
    The code for frame diverter is unmaintained and has bitrotted.
    The number of users is very small and the code has lots of problems.
    If anyone is using it, they maybe exposing themselves to bad packet attacks.
    
    Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  14. [NETFILTER]: Add secmark headers to header-y

    James Morris authored David S. Miller committed
    This patch includes xt_SECMARK.h and xt_CONNSECMARK.h to the kernel
    headers which are exported via 'make headers_install'.  This is needed to
    allow userland code to be built correctly with these features.
    
    Please apply, and consider for inclusion with 2.6.18 as a bugfix.
    
    Signed-off-by: James Morris <jmorris@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  15. @rolandd

    [ATM]: linux-atm-general mailing list is subscribers only

    rolandd authored David S. Miller committed
    As the automated reply I got to my last ATM patch shows, the
    linux-atm-general mailing list is subscribers-only.
    
    Signed-off-by: Roland Dreier <roland@digitalvampire.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  16. [ATM]: [he] when transmit fails, unmap the dma regions

    Chas Williams authored David S. Miller committed
    Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  17. @hswong3i

    [TCP] tcp-lp: update information to MAINTAINERS

    hswong3i authored David S. Miller committed
    Signed-off-by: Wong Hoi Sing Edison <hswong3i@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  18. @hswong3i

    [TCP] tcp-lp: bug fix for oops in 2.6.18-rc6

    hswong3i authored David S. Miller committed
    Sorry that the patch submited yesterday still contain a small bug.
    This version have already been test for hours with BT connections. The
    oops is now difficult to reproduce.
    
    Signed-off-by: Wong Hoi Sing Edison <hswong3i@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  19. [BRIDGE]: random extra bytes on STP TCN packet

    Stephen Hemminger authored David S. Miller committed
    We seem to send 3 extra bytes in a TCN, which will be whatever happens
    to be on the stack. Thanks to Aji_Srinivas@emc.com for seeing.
    
    Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
Something went wrong with that request. Please try again.