1. 07 8月, 2008 26 次提交
  2. 06 8月, 2008 14 次提交
    • L
      Linux 2.6.27-rc2 · 0967d61e
      Linus Torvalds 提交于
      0967d61e
    • L
      Re-introduce "[SCSI] extend the last_sector_bug flag to cover more sectors" · 18351070
      Linus Torvalds 提交于
      This re-introduces commit 2b142900,
      which was reverted due to the regression it caused by commit
      fca082c9.
      
      That regression was not root-caused by the original commit, it was just
      uncovered by it, and the real fix was done by Alan Stern in commit
      580da348 ("Fix USB storage hang on
      command abort").
      
      We can thus re-introduce the change that was confirmed by Alan Jenkins
      to be still required by his odd card reader.
      
      Cc: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
      Cc: Alan Stern <stern@rowland.harvard.edu>
      Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      18351070
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · e63e0327
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (78 commits)
        AX.25: Fix sysctl registration if !CONFIG_AX25_DAMA_SLAVE
        pktgen: mac count
        pktgen: random flow 
        bridge: Eliminate unnecessary forward delay
        bridge: fix compile warning in net/bridge/br_netfilter.c
        ipv4: remove unused field in struct flowi (include/net/flow.h).
        tg3: Fix 'scheduling while atomic' errors
        net: Kill plain NET_XMIT_BYPASS.
        net_sched: Add qdisc __NET_XMIT_BYPASS flag
        net_sched: Add qdisc __NET_XMIT_STOLEN flag
        iwl3945: fix merge mistake for packet injection
        iwlwifi: grap nic access before accessing periphery registers
        iwlwifi: decrement rx skb counter in scan abort handler
        iwlwifi: fix unhandled interrupt when HW rfkill is on
        iwlwifi: implement iwl5000_calc_rssi
        iwlwifi: memory allocation optimization
        iwlwifi: HW bug fixes
        p54: Fix potential concurrent access to private data
        rt2x00: Disable link tuning in rt2500usb
        iwlwifi: Don't use buffer allocated on the stack for led names
        ...
      e63e0327
    • R
      AX.25: Fix sysctl registration if !CONFIG_AX25_DAMA_SLAVE · ffb20847
      Ralf Baechle 提交于
      Since 49ffcf8f ("sysctl: update
      sysctl_check_table") setting struct ctl_table.procname = NULL does no
      longer work as it used to the way the AX.25 code is expecting it to
      resulting in the AX.25 sysctl registration code to break if
      CONFIG_AX25_DAMA_SLAVE was not set as in some distribution kernels.
      Kernel releases from 2.6.24 are affected.
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ffb20847
    • R
      pktgen: mac count · ff2a79a5
      Robert Olsson 提交于
      dst_mac_count and src_mac_count patch from Eneas Hunguana
      We have sent one mac address to much.
      Signed-off-by: NRobert Olsson <robert.olsson@its.uu.se>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ff2a79a5
    • R
      pktgen: random flow · 1211a645
      Robert Olsson 提交于
      Random flow generation has not worked. This fixes it.
      Signed-off-by: NRobert Olsson <robert.olsson@its.uu.se>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      1211a645
    • S
      bridge: Eliminate unnecessary forward delay · ef647f13
      Stephen Hemminger 提交于
      From: Stephen Hemminger <shemminger@vyatta.com>
      
      Based upon original patch by Herbert Xu, which contained
      the following problem description:
      
      --------------------
      When the forward delay is set to zero, we still delay the setting
      of the forwarding state by one or possibly two timers depending
      on whether STP is enabled.  This could either turn out to be
      instantaneous, or horribly slow depending on the load of the
      machine.
      
      As there is nothing preventing us from enabling forwarding straight
      away, this patch eliminates this potential delay by executing the
      code directly if the forward delay is zero.
      
      The effect of this problem is that immediately after the carrier
      comes on a port, the bridge will drop all packets received from
      that port until it enters forwarding mode, thus causing unnecessary
      packet loss.
      
      Note that this patch doesn't fully remove the delay due to the
      link watcher.  We should also check the carrier state when we
      are about to drop an incoming packet because the port is disabled.
      But that's for another patch.
      --------------------
      
      This version of the fix takes a different approach, in that
      it just does the state change directly.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ef647f13
    • R
      docbook: fix s390 fatal error after header files moved · 37193fb4
      Randy Dunlap 提交于
      Fix (fatal error) s390 docbook file to handle renamed header files.
      Signed-off-by: NRandy Dunlap <randy.dunlap@oracle.com>
      cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      37193fb4
    • A
      drivers/media/video/vino.c needs v4l2-ioctl.h · 8c275ce3
      Andrew Morton 提交于
      mips allmodconfig:
      
        drivers/media/video/vino.c: In function `vino_free_buffer_with_count':
        drivers/media/video/vino.c:811: warning: passing arg 1 of `virt_to_phys' makes pointer from integer without a cast
        drivers/media/video/vino.c: In function `vino_allocate_buffer':
        drivers/media/video/vino.c:889: warning: passing arg 1 of `virt_to_phys' makes pointer from integer without a cast
        drivers/media/video/vino.c: In function `vino_ioctl':
        drivers/media/video/vino.c:4364: error: implicit declaration of function `video_usercopy'
      
      The patch fixes the error, but not the warnings.
      
      Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
      Cc: Hans Verkuil <hverkuil@xs4all.nl>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      8c275ce3
    • B
      mm: fix uninitialized variables for find_vma_prepare callers · dfe195fb
      Benny Halevy 提交于
      gcc 4.3.0 correctly emits the following warnings.
      When a vma covering addr is found, find_vma_prepare indeed returns without
      setting pprev, rb_link, and rb_parent.
      
        mm/mmap.c: In function `insert_vm_struct':
        mm/mmap.c:2085: warning: `rb_parent' may be used uninitialized in this function
        mm/mmap.c:2085: warning: `rb_link' may be used uninitialized in this function
        mm/mmap.c:2084: warning: `prev' may be used uninitialized in this function
        mm/mmap.c: In function `copy_vma':
        mm/mmap.c:2124: warning: `rb_parent' may be used uninitialized in this function
        mm/mmap.c:2124: warning: `rb_link' may be used uninitialized in this function
        mm/mmap.c:2123: warning: `prev' may be used uninitialized in this function
        mm/mmap.c: In function `do_brk':
        mm/mmap.c:1951: warning: `rb_parent' may be used uninitialized in this function
        mm/mmap.c:1951: warning: `rb_link' may be used uninitialized in this function
        mm/mmap.c:1949: warning: `prev' may be used uninitialized in this function
        mm/mmap.c: In function `mmap_region':
        mm/mmap.c:1092: warning: `rb_parent' may be used uninitialized in this function
        mm/mmap.c:1092: warning: `rb_link' may be used uninitialized in this function
        mm/mmap.c:1089: warning: `prev' may be used uninitialized in this function
      
      Hugh adds: in fact, none of find_vma_prepare's callers use those values
      when a vma is found to be already covering addr, it's either an error or
      an occasion to munmap and repeat.  Okay, let's quieten the compiler (but I
      would prefer it if pprev, rb_link and rb_parent were meaningful in that
      case, rather than whatever's in them from descending the tree).
      Signed-off-by: NBenny Halevy <bhalevy@panasas.com>
      Signed-off-by: NHugh Dickins <hugh@veritas.com>
      Cc: "Ryan Hope" <rmh3093@gmail.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      dfe195fb
    • R
      pm_qos: spelling fixes · bf1db69f
      Richard Hughes 提交于
      A documentation cleanup patch.  With a minor tweak to clarify units for
      kbs.
      
      [akpm@linux-foundation.org: coding-style fixes]
      Signed-off-by: Nmark gross <mgross@linux.intel.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      bf1db69f
    • A
      proc: fix warnings · 7c44319d
      Alexander Beregalov 提交于
      proc: fix warnings
      
       fs/proc/base.c:2429: warning: format '%llu' expects type 'long long unsigned int', but argument 3 has type 'u64'
       fs/proc/base.c:2429: warning: format '%llu' expects type 'long long unsigned int', but argument 4 has type 'u64'
       fs/proc/base.c:2429: warning: format '%llu' expects type 'long long unsigned int', but argument 5 has type 'u64'
       fs/proc/base.c:2429: warning: format '%llu' expects type 'long long unsigned int', but argument 6 has type 'u64'
       fs/proc/base.c:2429: warning: format '%llu' expects type 'long long unsigned int', but argument 7 has type 'u64'
       fs/proc/base.c:2429: warning: format '%llu' expects type 'long long unsigned int', but argument 8 has type 'u64'
       fs/proc/base.c:2429: warning: format '%llu' expects type 'long long unsigned int', but argument 9 has type 'u64'
      Signed-off-by: NAlexander Beregalov <a.beregalov@gmail.com>
      Acked-by: NAndrea Righi <righi.andrea@gmail.com>
      Cc: Oleg Nesterov <oleg@tv-sign.ru>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      7c44319d
    • H
      drivers/misc/sgi-gru/grutlbpurge.c: removed duplicated #include · dc39778f
      Huang Weiyi 提交于
      Removed duplicated include <linux/delay.h> in
      drivers/misc/sgi-gru/grutlbpurge.c.
      Signed-off-by: NHuang Weiyi <weiyi.huang@gmail.com>
      Cc: Jack Steiner <steiner@sgi.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      dc39778f
    • A
      omfs: fix warning · dc60bf1d
      Alexander Beregalov 提交于
      fs/omfs/inode.c:495: warning: format '%llx' expects type 'long long
      	unsigned int', but argument 2 has type 'u64'
      fs/omfs/inode.c:495: warning: format '%llx' expects type 'long
      	long unsigned int', but argument 3 has type '__be64'
      Signed-off-by: NAlexander Beregalov <a.beregalov@gmail.com>
      Acked-by: NBob Copeland <me@bobcopeland.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      dc60bf1d