Commits on May 25, 2006
  1. Linux 2.6.17-rc5

    Linus Torvalds committed May 24, 2006
  2. [PATCH] V4L/DVB (4045): Fixes recursive dependency for I2C

    Mixing "depends on I2C" and "select I2C" within the media subsystem
    leads to the following problem:
    Warning! Found recursive dependency: I2C DVB_BUDGET DVB_BUDGET_PATCH
    DVB_AV7110 VIDEO_SAA7146_VV VIDEO_SAA7146 I2C
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Acked-by: Manu Abraham <manu@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Jean Delvare committed with Linus Torvalds May 24, 2006
Commits on May 24, 2006
  1. Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/g…

    …it/roland/infiniband
    
    * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
      IB/ipath: deref correct pointer when using kernel SMA
      IB/ipath: fix null deref during rdma ops
      IB/ipath: register as IB device owner
      IB/ipath: enable PE800 receive interrupts on user ports
      IB/ipath: enable GPIO interrupt on HT-460
      IB/ipath: fix NULL dereference during cleanup
      IB/ipath: replace uses of LIST_POISON
      IB/ipath: fix reporting of driver version to userspace
      IB/ipath: don't modify QP if changes fail
      IB/ipath: fix spinlock recursion bug
    Linus Torvalds committed May 24, 2006
  2. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/shaggy/jfs-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
      JFS: Fix multiple errors in metapage_releasepage
    Linus Torvalds committed May 24, 2006
  3. Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/ker…

    …nel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
      [PATCH] libata: add pio flush for via atapi (was: Re: TR: ASUS A8V Deluxe, x86_64)
    Linus Torvalds committed May 24, 2006
  4. Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/ker…

    …nel/git/jgarzik/netdev-2.6
    
    * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
      [PATCH] sky2: fix jumbo packet support
    Linus Torvalds committed May 24, 2006
  5. [MMC] Fix premature use of md->disk

    md->disk was being used in a debug message before it was allocated.
    
    Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Pierre Ossman committed with Linus Torvalds May 24, 2006
  6. JFS: Fix multiple errors in metapage_releasepage

    It looks like metapage_releasepage was making in invalid assumption that
    the releasepage method would not be called on a dirty page.  Instead of
    issuing a warning and releasing the metapage, it should return 0, indicating
    that the private data for the page cannot be released.
    
    I also realized that metapage_releasepage had the return code all wrong.  If
    it is successful in releasing the private data, it should return 1, otherwise
    it needs to return 0.
    
    Lastly, there is no need to call wait_on_page_writeback, since
    try_to_release_page will not call us with a page in writback state.
    
    Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
    Dave Kleikamp committed May 24, 2006
  7. [PATCH] libata: add pio flush for via atapi (was: Re: TR: ASUS A8V De…

    …luxe, x86_64)
    
    Backport the "pio flush" from the libata major update to 2.6.17 for via atapi.
    
    Signed-off-by: Albert Lee <albertcc@tw.ibm.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    Albert Lee committed with Jeff Garzik May 22, 2006
  8. [PATCH] sky2: fix jumbo packet support

    The truncate threshold calculation to prevent receiver from getting stuck
    was incorrect, and it didn't take into account the upper limit on bits
    in the register so the jumbo packet support was broken.
    
    Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    Stephen Hemminger committed with Jeff Garzik May 22, 2006
Commits on May 23, 2006
  1. @davem330

    [BRIDGE]: need to ref count the LLC sap

    Bridge will OOPS on removal if other application has the SAP open.
    The bridge SAP might be shared with other usages, so need
    to do reference counting on module removal rather than explicit
    close/delete.
    
    Since packet might arrive after or during removal, need to clear
    the receive function handle, so LLC only hands it to user (if any).
    
    Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Stephen Hemminger committed with davem330 May 23, 2006
  2. @chriswright

    [NETFILTER]: SNMP NAT: fix memleak in snmp_object_decode

    If kmalloc fails, error path leaks data allocated from asn1_oid_decode().
    
    Signed-off-by: Chris Wright <chrisw@sous-sol.org>
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    chriswright committed with David S. Miller May 23, 2006
  3. @kaber

    [NETFILTER]: H.323 helper: fix sequence extension parsing

    When parsing unknown sequence extensions the "son"-pointer points behind
    the last known extension for this type, don't try to interpret it.
    
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    kaber committed with David S. Miller May 23, 2006
  4. @kaber

    [NETFILTER]: H.323 helper: fix parser error propagation

    The condition "> H323_ERROR_STOP" can never be true since H323_ERROR_STOP
    is positive and is the highest possible return code, while real errors are
    negative, fix the checks. Also only abort on real errors in some spots
    that were just interpreting any return value != 0 as error.
    
    Fixes crashes caused by use of stale data after a parsing error occured:
    
    BUG: unable to handle kernel paging request at virtual address bfffffff
     printing eip:
    c01aa0f8
    *pde = 1a801067
    *pte = 00000000
    Oops: 0000 [#1]
    PREEMPT
    Modules linked in: ip_nat_h323 ip_conntrack_h323 nfsd exportfs sch_sfq sch_red cls_fw sch_hfsc  xt_length ipt_owner xt_MARK iptable_mangle nfs lockd sunrpc pppoe pppoxx
    CPU:    0
    EIP:    0060:[<c01aa0f8>]    Not tainted VLI
    EFLAGS: 00210646   (2.6.17-rc4 #8)
    EIP is at memmove+0x19/0x22
    eax: d77264e9   ebx: d77264e9   ecx: e88d9b17   edx: d77264e9
    esi: bfffffff   edi: bfffffff   ebp: de6a7680   esp: c0349db8
    ds: 007b   es: 007b   ss: 0068
    Process asterisk (pid: 3765, threadinfo=c0349000 task=da068540)
    Stack: <0>00000006 c0349e5e d77264e3 e09a2b4e e09a38a0 d7726052 d7726124 00000491
           00000006 00000006 00000006 00000491 de6a7680 d772601e d7726032 c0349f74
           e09a2dc2 00000006 c0349e5e 00000006 00000000 d76dda28 00000491 c0349f74
    Call Trace:
     [<e09a2b4e>] mangle_contents+0x62/0xfe [ip_nat]
     [<e09a2dc2>] ip_nat_mangle_tcp_packet+0xa1/0x191 [ip_nat]
     [<e0a2712d>] set_addr+0x74/0x14c [ip_nat_h323]
     [<e0ad531e>] process_setup+0x11b/0x29e [ip_conntrack_h323]
     [<e0ad534f>] process_setup+0x14c/0x29e [ip_conntrack_h323]
     [<e0ad57bd>] process_q931+0x3c/0x142 [ip_conntrack_h323]
     [<e0ad5dff>] q931_help+0xe0/0x144 [ip_conntrack_h323]
    ...
    
    Found by the PROTOS c07-h2250v4 testsuite.
    
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    kaber committed with David S. Miller May 23, 2006
  5. IB/ipath: deref correct pointer when using kernel SMA

    At this point, the core QP structure hasn't been initialized, so what's
    in there isn't valid.  Get the same information elsewhere.
    
    Signed-off-by: Bryan O'Sullivan <bos@pathscale.com>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>
    Bryan O'Sullivan committed with Roland Dreier May 23, 2006
  6. IB/ipath: fix null deref during rdma ops

    The problem was that node A's sending thread, which handles sending RDMA
    read response data, would write the trigger word, the last packet would
    be sent, node B would send a new RDMA read request, node A's interrupt
    handler would initialize s_rdma_sge, then node A's sending thread would
    update s_rdma_sge.  This didn't happen very often naturally but was more
    frequent with 1 byte RDMA reads.  Rather than adding more locking or
    increasing the QP structure size and copying sge data, I modified the
    copy routine to update the pointers before writing the trigger word to
    avoid the update race.
    
    Signed-off-by: Ralph Campbell <ralphc@pathscale.com>
    Signed-off-by: Bryan O'Sullivan <bos@pathscale.com>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>
    Bryan O'Sullivan committed with Roland Dreier May 23, 2006
  7. IB/ipath: register as IB device owner

    This fixes an oops.
    
    Signed-off-by: Bryan O'Sullivan <bos@pathscale.com>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>
    Bryan O'Sullivan committed with Roland Dreier May 23, 2006
  8. IB/ipath: enable PE800 receive interrupts on user ports

    Fixed so it works on the PE-800.  It had not previously been updated to
    match PE-800 receive interrupt differences from HT-400.
    
    Signed-off-by: Bryan O'Sullivan <bos@pathscale.com>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>
    Bryan O'Sullivan committed with Roland Dreier May 23, 2006
  9. IB/ipath: enable GPIO interrupt on HT-460

    This is required for even semi-decent performance on OpenIB.
    
    Signed-off-by: Bryan O'Sullivan <bos@pathscale.com>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>
    Bryan O'Sullivan committed with Roland Dreier May 23, 2006
  10. IB/ipath: fix NULL dereference during cleanup

    Fix NULL deref due to pcidev being clobbered before dd->ipath_f_cleanup()
    was called.
    
    Signed-off-by: Bryan O'Sullivan <bos@pathscale.com>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>
    Bryan O'Sullivan committed with Roland Dreier May 23, 2006
  11. IB/ipath: replace uses of LIST_POISON

    Per Andrew's request.
    
    Signed-off-by: Bryan O'Sullivan <bos@pathscale.com>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>
    Bryan O'Sullivan committed with Roland Dreier May 23, 2006
  12. IB/ipath: fix reporting of driver version to userspace

    Fix the interface version that gets exported to userspace.
    
    Signed-off-by: Bryan O'Sullivan <bos@pathscale.com>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>
    Bryan O'Sullivan committed with Roland Dreier May 23, 2006
  13. IB/ipath: don't modify QP if changes fail

    Make sure modify_qp won't modify the QP if any of the changes failed.
    
    Signed-off-by: Bryan O'Sullivan <bos@pathscale.com>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>
    Bryan O'Sullivan committed with Roland Dreier May 23, 2006
  14. IB/ipath: fix spinlock recursion bug

    The local loopback path for RC can lock the rkey table lock without
    blocking interrupts.  The receive interrupt path can then call
    ipath_rkey_ok() and deadlock.  Remove the redundant lock.
    
    Signed-off-by: Bryan O'Sullivan <bos@pathscale.com>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>
    Bryan O'Sullivan committed with Roland Dreier May 23, 2006
  15. @mchehab

    V4L/DVB (4041): Fix compilation on PPC 64

    Those functions don't exist on PPC64 architecture.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
    mchehab committed May 23, 2006
  16. @mchehab

    V4L/DVB (4040a): Fix the following section warnings:

    reference to .init.text: from .text between 'dvb_bt8xx_probe'
    (at offset 0x122c) and 'dvb_bt8xx_remove'
    reference to .init.text: from .text between 'dvb_bt8xx_probe'
    (at offset 0x1267) and 'dvb_bt8xx_remove'
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
    Jean Delvare committed with mchehab May 23, 2006
  17. @mchehab

    V4L/DVB (4037): Make the bridge devices that depend on I2C dependant …

    …on I2C
    
    Ref: Bugzilla 6179, 6589
    
    Signed-off-by: Manu Abraham <manu@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
    Manu Abraham committed with mchehab May 20, 2006
  18. @AdrianBunk @mchehab

    V4L/DVB (3927): Fix VIDEO_DEV=m, VIDEO_V4L1_COMPAT=y

    If CONFIG_VIDEO_DEV=m and CONFIG_VIDEO_V4L1_COMPAT=y, v4l1-compat should
    be built as a module (currently, it isn't built at all leading to
    problems with modules using it).
    
    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
    AdrianBunk committed with mchehab May 23, 2006
  19. Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

    * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
      [SPARC64]: Respect gfp_t argument to dma_alloc_coherent().
    Linus Torvalds committed May 23, 2006
  20. Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

    * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
      [NETFILTER]: SNMP NAT: fix memory corruption
      [IRDA]: fixup type of ->lsap_state
      [IRDA]: fix 16/32 bit confusion
      [NET]: Fix "ntohl(ntohs" bugs
      [BNX2]: Use kmalloc instead of array
      [BNX2]: Fix bug in bnx2_nvram_write()
      [TG3]: Add some missing rx error counters
    Linus Torvalds committed May 23, 2006
  21. [PATCH] blk: fix gendisk->in_flight accounting during barrier sequence

    While executing barrrier sequence, the bar_rq which carries actual
    write was accounted as normal IO on completion, while it wasn't on
    queueing.  This caused gendisk->in_flight to be decremented by 1 after
    each barrier thus messed up statistics.
    
    This patch makes bar_rq not accounted as normal IO.  As the containing
    barrier request as a whole is accounted, part of it shouldn't be.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jens Axboe <axboe@suse.de>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Jens Axboe committed with Linus Torvalds May 23, 2006
  22. @dwmw2

    [PATCH] powerpc: wire up sys_[gs]et_robust_list

    Signed-off-by: David Woodhouse <dwmw2@infradead.org>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Acked-by: Paul Mackerras <paulus@samba.org>
    Cc: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    dwmw2 committed with Linus Torvalds May 23, 2006
  23. @dwmw2

    [PATCH] powerpc: check Cell SPU syscall number range _before_ using it

    Signed-off-by: David Woodhouse <dwmw2@infradead.org>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Acked-by: Paul Mackerras <paulus@samba.org>
    Cc: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    dwmw2 committed with Linus Torvalds May 23, 2006
  24. @dwmw2

    [PATCH] powerpc: fill hole in Cell SPU syscall table

    Syscall number 224 was absent from the table, which I believe means that
    the SPU can cause an oops by attempting to use it.
    
    Signed-off-by: David Woodhouse <dwmw2@infradead.org>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Acked-by: Paul Mackerras <paulus@samba.org>
    Cc: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    dwmw2 committed with Linus Torvalds May 23, 2006
  25. @fmalita

    [PATCH] orinoco: possible null pointer dereference in orinoco_rx_moni…

    …tor()
    
    If the skb allocation fails, the current error path calls
    dev_kfree_skb_irq() with a NULL argument.  Also, 'err' is not being used.
    
    Coverity CID: 275.
    
    Signed-off-by: Florin Malita <fmalita@gmail.com>
    Cc: "John W. Linville" <linville@tuxdriver.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    fmalita committed with Linus Torvalds May 22, 2006