1. 14 10月, 2006 6 次提交
  2. 13 10月, 2006 25 次提交
  3. 12 10月, 2006 9 次提交
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 · 9eb20074
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
        sh: SH-4A UBC support
        sh: interrupt exception handling rework
        sh: Default enable R7780RP IRQs.
        sh: Zero-out coherent buffer in consistent_alloc().
        sh: Convert IPR-IRQ to IRQ chip.
        sh: Convert INTC2 IRQ handler to irq_chip.
        sh: Fix pr_debug statements for sh4
        sh: Convert r7780rp IRQ handler to IRQ chip.
        sh: Updates for IRQ handler changes.
        sh: Kill off timer_ops get_frequency().
        sh: First step at generic timeofday support.
      9eb20074
    • J
      8770c018
    • A
      [CIFS] cifs Kconfig: don't select CONNECTOR · 230a0395
      Andrew Morton 提交于
      `select' is a bit obnoxious: the option keeps on coming back
      and it's hard to work out what to do to make it go away again.
      The use of `depends on' is preferred (although it has
      usability problems too..)
      Signed-off-by: NAndrew Morton <akpm@osdl.org>
      Signed-off-by: NSteve French <sfrench@us.ibm.com>
      230a0395
    • L
      Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block · da79cbae
      Linus Torvalds 提交于
      * 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block:
        [PATCH] block layer: ioprio_best function fix
        [PATCH] ide-cd: fix breakage with internally queued commands
        [PATCH] block layer: elv_iosched_show should get elv_list_lock
        [PATCH] splice: fix pipe_to_file() ->prepare_write() error path
        [PATCH] block layer: elevator_find function cleanup
        [PATCH] elevator: elevator_type member not used
      da79cbae
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 9ff4680e
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [PKT_SCHED] sch_htb: use rb_first() cleanup
        [RTNETLINK]: Fix use of wrong skb in do_getlink()
        [DECNET]: Fix sfuzz hanging on 2.6.18
        [NET]: Do not memcmp() over pad bytes of struct flowi.
        [NET]: Introduce protocol-specific destructor for time-wait sockets.
        [NET]: Use typesafe inet_twsk() inline function instead of cast.
        [NET]: Use hton{l,s}() for non-initializers.
        [TCP]: Use TCPOLEN_TSTAMP_ALIGNED macro instead of magic number.
        [IPV6]: Seperate sit driver to extra module (addrconf.c changes)
        [IPV6]: Seperate sit driver to extra module
        [NET]: File descriptor loss while receiving SCM_RIGHTS
        [SCTP]: Fix the RX queue size shown in /proc/net/sctp/assocs output.
        [SCTP]: Fix receive buffer accounting.
        SELinux: Bug fix in polidydb_destroy
        IPsec: fix handling of errors for socket policies
        IPsec: correct semantics for SELinux policy matching
        IPsec: propagate security module errors up from flow_cache_lookup
        NetLabel: use SECINITSID_UNLABELED for a base SID
        NetLabel: fix a cache race condition
      9ff4680e
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · 83d3d3c5
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SPARC32]: Fix sparc32 modpost warnings.
        [SPARC32]: Fix sparc32 modpost warnings with sunzilog
        [SPARC32]: Mark srmmu_nocache_init as __init.
        [SPARC32]: pcic.c needs asm/irq_regs.h
      83d3d3c5
    • E
      [PATCH] x86_64 irq: Properly update vector_irq · 994bd4f9
      Eric W. Biederman 提交于
      This patch fixes my one line thinko where I was clearing
      the vector_irq entries on the wrong cpus.
      Signed-off-by: NEric W. Biederman <ebiederm@xmission.com>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      994bd4f9
    • V
      [PATCH] block layer: ioprio_best function fix · d58cdfb8
      Vasily Tarasov 提交于
      Currently ioprio_best function first checks wethere aioprio or bioprio equals
      IOPRIO_CLASS_NONE (ioprio_valid() macros does that) and if it is so it returns
      bioprio/aioprio appropriately. Thus the next four lines, that set aclass/bclass
      to IOPRIO_CLASS_BE, if aclass/bclass == IOPRIO_CLASS_NONE, are never executed.
      
      The second problem: if aioprio from class IOPRIO_CLASS_NONE and bioprio from
      class IOPRIO_CLASS_IDLE are passed to ioprio_best function, it will return
      IOPRIO_CLASS_IDLE. It means that during __make_request we can merge two
      requests and set the priority of merged request to IDLE, while one of
      the initial requests originates from a process with NONE (default) priority.
      So we can get a situation when a process with default ioprio will experience
      IO starvation, while there is no process from real-time class in the system.
      
      Just removing ioprio_valid check should correct situation.
      Signed-off-by: NVasily Tarasov <vtaras@openvz.org>
      Signed-off-by: NJens Axboe <jens.axboe@oracle.com>
      d58cdfb8
    • J
      [PATCH] ide-cd: fix breakage with internally queued commands · cea2885a
      Jens Axboe 提交于
      We still need to maintain a private PC style command, since it
      isn't completely unified with REQ_TYPE_BLOCK_PC yet.
      Signed-off-by: NJens Axboe <jens.axboe@oracle.com>
      cea2885a