1. 03 10月, 2006 31 次提交
  2. 02 10月, 2006 9 次提交
    • L
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · 95f3eff6
      Linus Torvalds 提交于
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (37 commits)
        [netdrvr] hp100: encapsulate all non-module code
        drivers/net/wireless/{airo,ipw2100}: fix error handling bugs
        [netdrvr] phy: Fix bugs in error handling
        [PATCH] spidernet: Use pci_dma_mapping_error()
        [PATCH] sky2: version 1.9
        [PATCH] sky2: fragmented receive for large MTU
        [PATCH] sky2: use netif_tx_lock instead of LLTX
        [PATCH] sky2: incremental transmit completion
        [PATCH] sky2: name irq after eth for irqbalance
        [PATCH] sky2: workarounds for some 88e806x chips
        [PATCH] sky2: use standard pci register capabilties for error register
        [PATCH] sky2: gigabit full duplex negotiation
        e100, e1000, ixgb: increment version numbers
        ixgb: convert to netdev_priv(netdev)
        ixgb: combine more rx descriptors to improve performance
        e1000: possible memory leak in e1000_set_ringparam
        e1000: Janitor: Use #defined values for literals
        e1000: don't strip vlan ID if 8021q claims it
        e1000: rework polarity, NVM, eeprom code and fixes.
        e1000: driver state fixes (race fix)
        ...
      95f3eff6
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6 · 44f54921
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
        JFS: White space cleanup
        [PATCH] JFS: return correct error when i-node allocation failed
        JFS: Remove shadow variable from fs/jfs/jfs_txnmgr.c:xtLog()
      44f54921
    • L
      Merge git://git.infradead.org/mtd-2.6 · 3e04767a
      Linus Torvalds 提交于
      * git://git.infradead.org/mtd-2.6:
        [MTD] Cleanup of 'ioremap balanced with iounmap for drivers/mtd subsystem'
        [MTD] fix nftl_write warning
        [MTD] fix printk warning
        [MTD ONENAND] Check OneNAND lock scheme & all block unlock command support
        [MTD ONENAND] Remove unused MTD_ONENAND_SYNC_READ configuration
        [MTD ONENAND] Fix OneNAND probe
        [MTD NAND] Provide prototype for newly-exported nand_wait_ready()
        [MTD] Remove #ifndef __KERNEL__ hack in <mtd/mtd-abi.h>
        [MTD NAND] Allow override of page read and write functions.
        [MTD NAND] Allocate chip->buffers separately to allow it to be overridden
        [MTD NAND] Split nand_scan() into two parts; allow board driver to intervene
        [MTD NAND] Export nand_wait_ready() for use by board drivers
      3e04767a
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · a12f66fc
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (35 commits)
        Input: wistron - add support for Acer TravelMate 2424NWXCi
        Input: wistron - fix setting up special buttons
        Input: add KEY_BLUETOOTH and KEY_WLAN definitions
        Input: add new BUS_VIRTUAL bus type
        Input: add driver for stowaway serial keyboards
        Input: make input_register_handler() return error codes
        Input: remove cruft that was needed for transition to sysfs
        Input: fix input module refcounting
        Input: constify input core
        Input: libps2 - rearrange exports
        Input: atkbd - support Microsoft Natural Elite Pro keyboards
        Input: i8042 - disable MUX mode on Toshiba Equium A110
        Input: i8042 - get rid of polling timer
        Input: send key up events at disconnect
        Input: constify psmouse driver
        Input: i8042 - add Amoi to the MUX blacklist
        Input: logips2pp - add sugnature 56 (Cordless MouseMan Wheel), cleanup
        Input: add driver for Touchwin serial touchscreens
        Input: add driver for Touchright serial touchscreens
        Input: add driver for Penmount serial touchscreens
        ...
      a12f66fc
    • L
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · 12dce626
      Linus Torvalds 提交于
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
        [MIPS] Remove unused galileo-boars header files
        [MIPS] Rename SERIAL_PORT_DEFNS for EV64120
        [MIPS] Add UART IRQ number for EV64120
        [MIPS] Remove excite_flash.c
        [MIPS] Update i8259 resources.
        [MIPS] Make unwind_stack() can dig into interrupted context
        [MIPS] Stacktrace build-fix and improvement
        [MIPS] QEMU: Add support for little endian mips
        [MIPS] Remove __flush_icache_page
        [MIPS] lockdep: update defconfigs
        [MIPS] lockdep: Add STACKTRACE_SUPPORT and enable LOCKDEP_SUPPORT
        [MIPS] lockdep: fix TRACE_IRQFLAGS_SUPPORT
      12dce626
    • D
      [PATCH] BLOCK: Revert patch to hack around undeclared sigset_t in linux/compat.h · 3f2e05e9
      David Howells 提交于
      Revert Andrew Morton's patch to temporarily hack around the lack of a
      declaration of sigset_t in linux/compat.h to make the block-disablement
      patches build on IA64.  This got accidentally pushed to Linus and should
      be fixed in a different manner.
      
      Also make linux/compat.h #include asm/signal.h to gain a definition of
      sigset_t so that it can externally declare sigset_from_compat().
      
      This has been compile-tested for i386, x86_64, ia64, mips, mips64, frv, ppc and
      ppc64 and run-tested on frv.
      Signed-off-by: NDavid Howells <dhowells@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      3f2e05e9
    • C
      [PATCH] replace cad_pid by a struct pid · 9ec52099
      Cedric Le Goater 提交于
      There are a few places in the kernel where the init task is signaled.  The
      ctrl+alt+del sequence is one them.  It kills a task, usually init, using a
      cached pid (cad_pid).
      
      This patch replaces the pid_t by a struct pid to avoid pid wrap around
      problem.  The struct pid is initialized at boot time in init() and can be
      modified through systctl with
      
      	/proc/sys/kernel/cad_pid
      
      [ I haven't found any distro using it ? ]
      
      It also introduces a small helper routine kill_cad_pid() which is used
      where it seemed ok to use cad_pid instead of pid 1.
      
      [akpm@osdl.org: cleanups, build fix]
      Signed-off-by: NCedric Le Goater <clg@fr.ibm.com>
      Cc: Eric W. Biederman <ebiederm@xmission.com>
      Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
      Cc: Paul Mackerras <paulus@samba.org>
      Signed-off-by: NAndrew Morton <akpm@osdl.org>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      9ec52099
    • O
      [PATCH] introduce get_task_pid() to fix unsafe get_pid() · 1a657f78
      Oleg Nesterov 提交于
      proc_pid_make_inode:
      
      	ei->pid = get_pid(task_pid(task));
      
      I think this is not safe.  get_pid() can be preempted after checking "pid
      != NULL".  Then the task exits, does detach_pid(), and RCU frees the pid.
      Signed-off-by: NOleg Nesterov <oleg@tv-sign.ru>
      Cc: "Eric W. Biederman" <ebiederm@xmission.com>
      Signed-off-by: NAndrew Morton <akpm@osdl.org>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      1a657f78
    • E
      [PATCH] proc: comment what proc_fill_cache does · 1c0d04c9
      Eric W. Biederman 提交于
      Signed-off-by: NEric W. Biederman <ebiederm@xmission.com>
      Cc: Oleg Nesterov <oleg@tv-sign.ru>
      Signed-off-by: NAndrew Morton <akpm@osdl.org>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      1c0d04c9