Permalink
Commits on Dec 24, 2005
  1. Linux v2.6.15-rc7

    Linus Torvalds
    Linus Torvalds committed Dec 24, 2005
    Ho ho ho.
  2. [PATCH] n_r3964: fixed usage of HZ; removed bad include

    Kurt Huwig Linus Torvalds
    Kurt Huwig authored and Linus Torvalds committed Dec 24, 2005
    Fix n_r3964 timeouts (hardcoded for 100Hz)
    
    Also the include of <asm/termios.h> in 'n_r3964.h' is unnecessary and
    prevents using the header file in any application that has to include
    <termios.h> due to duplicate definition of 'struct termio'.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  3. Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/ker…

    Linus Torvalds
    Linus Torvalds committed Dec 24, 2005
    …nel/git/jgarzik/libata-dev
  4. [PATCH] Fix typo in x86_64 __build_write_lock_const assembly

    Ben Collins Linus Torvalds
    Ben Collins authored and Linus Torvalds committed Dec 23, 2005
    Based on __build_read_lock_const, this looked like a bug.
    
    [ Indeed. Maybe nobody uses this version? Worth fixing up anyway ]
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  5. [PATCH] x86_64/ia64 : Fix compilation error for node_to_first_cpu

    Ravikiran G Thirumalai Linus Torvalds
    Ravikiran G Thirumalai authored and Linus Torvalds committed Dec 22, 2005
    Fixes a compiler error in node_to_first_cpu, __ffs expects unsigned long as
    a parameter; instead cpumask_t was being passed.  The macro
    node_to_first_cpu was not yet used in x86_64 and ia64 arches, and so we never
    hit this.  This patch replaces __ffs with first_cpu macro, similar to other
    arches.
    
    Signed-off-by: Alok N Kataria <alokk@calsoftinc.com>
    Signed-off-by: Ravikiran G Thirumalai <kiran@scalex86.org>
    Signed-off-by: Shai Fultheim <shai@scalex86.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  6. Fix silly typo ("smb" vs "smp")

    Linus Torvalds
    Linus Torvalds committed Dec 24, 2005
    Introduced by commit 6003a93
  7. [PATCH] Fix memory ordering problem in wake_futex()

    Andrew Morton Linus Torvalds
    Andrew Morton authored and Linus Torvalds committed Dec 24, 2005
    Fix a memory ordering problem that occurs on IA64. The "store" to q->lock_ptr
    in wake_futex() can become visible before wake_up_all() clears the lock in the
    futex_q.
    
    Signed-off-by: Jack Steiner <steiner@sgi.com>
    Acked-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  8. [PATCH] add missing memory barriers to ipc/sem.c

    manfred-colorfu authored and Linus Torvalds committed Dec 23, 2005
    Two smp_wmb() statements are missing in the sysv sem code: This could
    cause stack corruptions.
    
    The attached patch adds them.
    
    Signed-Off-By: Manfred Spraul <manfred@colorfullife.com>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  9. [VIDEO] sbuslib: Disallow private mmaps.

    David S. Miller
    David S. Miller committed Dec 24, 2005
    The COW semantics just do not make any sense especially
    with the physically discontiguous I/O mappings possible
    here.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
  10. Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/ker…

    Linus Torvalds
    Linus Torvalds committed Dec 24, 2005
    …nel/git/jgarzik/netdev-2.6
  11. [PATCH] forcedeth: fix random memory scribbling bug

    manfred-colorfu authored and Linus Torvalds committed Dec 24, 2005
    Two critical bugs were found in forcedeth 0.47:
     - TSO doesn't work.
     - pci_map_single() for the rx buffers is called with size==0.  This bug
       is critical, it causes random memory corruptions on systems with an
       iommu.
    
    Below is a minimal fix for both bugs, for 2.6.15.
    
    TSO will be fixed properly in the next version.  Tested on x86-64.
    
    Signed-Off-By: Manfred Spraul <manfred@colorfullife.com>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  12. [PATCH] s390: remove redundant and useless code in qeth

    Frank Pavlic authored and jgarzik committed Dec 13, 2005
    [patch 3/3] s390: remove redundant and useless code in qeth
    
    From: Frank Pavlic <pavlic@de.ibm.com>
    	- remove redundant and useless code in qeth for
    	  procfs operations.
    	- update Revision numbers
    Signed-off-by: Frank Pavlic <pavlic@de.ibm.com>
    
    diffstat:
     qeth_main.c |    6 -
     qeth_mpc.c  |    2
     qeth_mpc.h  |    2
     qeth_proc.c |  250 ++++++------------------------------------------------------
     qeth_sys.c  |    4
     qeth_tso.h  |    4
     6 files changed, 38 insertions(+), 230 deletions(-)
    Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
  13. [PATCH] s390: minor qeth network driver fixes

    Frank Pavlic authored and jgarzik committed Dec 13, 2005
    [patch 2/3] s390: minor qeth network driver fixes
    
    From: Frank Pavlic <pavlic@de.ibm.com>
    	- use netif_carrier_on/off calls to tell network stack
    	  link carrier state
    	- fix possible kfree on NULL
    	- PDU_LEN2 is at offset 0x29 otherwise OSN chpid won't initialize
    
    Signed-off-by: Frank Pavlic <pavlic@de.ibm.com>
    
    diffstat:
     qeth_eddp.c |    3 ++-
     qeth_main.c |   17 +++++++----------
     qeth_mpc.h  |    2 +-
     3 files changed, 10 insertions(+), 12 deletions(-)
    Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
  14. [PATCH] s390: some minor qeth driver fixes

    Frank Pavlic authored and jgarzik committed Dec 13, 2005
    [patch 1/3] s390: some minor qeth driver fixes
    
    From: Frank Pavlic <pavlic@de.ibm.com>
    	- let's have just one function for both ,input and output queue
    	  to check qdio errors
    	- add /proc/s390dbf/qeth_qerr entries for outbound processing
    	- check removed for layer2 device in qeth_add_multicast_ipv6
    	- NULL pointer dereference with bonding and VLAN device fixed
    	- minimum length check for portname fixed
    
    Signed-off-by: Frank Pavlic <pavlic@de.ibm.com>
    
    diffstat:
    qeth_main.c |   42 +++++++++++++++++++++---------------------
    qeth_sys.c  |    6 +++---
    2 files changed, 24 insertions(+), 24 deletions(-)
    Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
  15. [PATCH] missing license for libphy.ko

    olafhering authored and jgarzik committed Dec 13, 2005
    Andy,
    
    libphy has no license tag. Something like the attached (untested!) patch
    is needed. Hopefully such a change finds its way into 2.6.15.
    
    filename: /lib/modules/2.6.15-rc5-3-ppc64/kernel/drivers/net/phy/libphy.ko
    vermagic:       2.6.15-rc5-3-ppc64 SMP gcc-4.1
    depends:
    srcversion:     ACC921B5E82701BE1E6F603
    
     drivers/net/phy/phy_device.c |    4 ++++
     1 files changed, 4 insertions(+)
    
    Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
  16. [PATCH] orinoco_nortel: Add Symbol LA-4123 ID

    proski authored and jgarzik committed Dec 16, 2005
    Add ID for Symbol LA-4123.  Reported by Tomas Novak <tap@post.cz>
    
    Signed-off-by: Pavel Roskin <proski@gnu.org>
    Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
  17. [PATCH] orinoco_nortel: Fix incorrect PCI resource use

    proski authored and jgarzik committed Dec 16, 2005
    orinoco_nortel was broken during conversion to iomem API.  Wrong PCI BAR
    is used for chipset registers.  Reported by Tomas Novak <tap@post.cz>
    
    Signed-off-by: Pavel Roskin <proski@gnu.org>
    Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
  18. [PATCH] fix libata inquiry VPD for ATAPI devices

    abattersby authored and jgarzik committed Dec 21, 2005
    The following patch prevents libata from incorrectly modifying inquiry
    VPD pages and command support data from ATAPI devices.  I have tested
    the patch with a SATA ATAPI tape drive on an AHCI controller.
    
    Patch is against kernel 2.4.32 with 2.4.32-libata1.patch applied.
    
    Anthony J. Battersby
    Cybernetics
    
    Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Commits on Dec 23, 2005
  1. [IPV6]: Fix Temporary Address Generation

    h-yamamo authored and davem330 committed Dec 23, 2005
    From: Hiroyuki YAMAMORI <h-yamamo@db3.so-net.ne.jp>
    
    Since regen_count is stored in the public address, we need to reset it
    when we start renewing temporary address.
    
    Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  2. [IPV6]: Fix dead lock.

    YOSHIFUJI Hideaki authored and davem330 committed Dec 23, 2005
    We need to relesae ifp->lock before we call addrconf_dad_stop(),
    which will hold ifp->lock.
    
    Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  3. [SPARC]: Kill CHILD_MAX.

    David S. Miller
    David S. Miller committed Dec 23, 2005
    It's definition is wrong (-1 means "no limit" not 999),
    only the Sparc SunOS/Solaris compat code uses it, so
    let's just kill it off completely from limits.h and
    all referencing code.
    
    Noticed by Ulrich Drepper.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
  4. [SPARC]: introduce a SPARC Kconfig symbol

    AdrianBunk authored and David S. Miller committed Dec 23, 2005
    Introduce a Kconfig symbol SPARC that is defined on both the sparc and
    sparc64 architectures.
    
    This symbol makes some dependencies more readable.
    
    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  5. [SUNGEM]: Fix link error with CONFIG_HOTPLUG disabled.

    AdrianBunk authored and David S. Miller committed Dec 22, 2005
    gem_remove_one() is called from the __devinit gem_init_one().
    
    Therefore, gem_remove_one() mustn't be __devexit.
    
    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  6. Pull bug3410 into release branch

    lenb committed Dec 23, 2005
  7. [ACPI] fix build warning from owner_id patch

    lenb committed Dec 23, 2005
    Signed-off-by: Len Brown <len.brown@intel.com>
  8. Auto-update from upstream

    lenb committed Dec 23, 2005
  9. [ACPI] fix passive cooling regression

    watologo1 authored and lenb committed Dec 21, 2005
    Return logic was inverted.
    Going for changing the return value to not return zero as it is makes
    more sense regarding the naming of the function (cpu_has_cpufreq()).
    
    http://bugzilla.kernel.org/show_bug.cgi?id=3410
    
    Signed-off-by: Thomas Renninger <trenn@suse.de>
    Signed-off-by: Len Brown <len.brown@intel.com>
Commits on Dec 22, 2005
  1. Merge branch 'to_linus' of master.kernel.org:/pub/scm/linux/kernel/gi…

    Linus Torvalds
    Linus Torvalds committed Dec 22, 2005
    …t/mchehab/v4l-dvb
  2. [PATCH] fix posix lock on NFS

    ASANO Masahiro Linus Torvalds
    ASANO Masahiro authored and Linus Torvalds committed Dec 22, 2005
    NFS client prevents mandatory lock, but there is a flaw on it; Locks are
    possibly left if the mode is changed while locking.
    
    This permits unlocking even if the mandatory lock bits are set.
    
    Signed-off-by: ASANO Masahiro <masano@tnes.nec.co.jp>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>