1. 12 Jan, 2011 26 commits
  2. 11 Jan, 2011 14 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 4162cf64
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (67 commits)
        cxgb4vf: recover from failure in cxgb4vf_open()
        netfilter: ebtables: make broute table work again
        netfilter: fix race in conntrack between dump_table and destroy
        ah: reload pointers to skb data after calling skb_cow_data()
        ah: update maximum truncated ICV length
        xfrm: check trunc_len in XFRMA_ALG_AUTH_TRUNC
        ehea: Increase the skb array usage
        net/fec: remove config FEC2 as it's used nowhere
        pcnet_cs: add new_id
        tcp: disallow bind() to reuse addr/port
        net/r8169: Update the function of parsing firmware
        net: ppp: use {get,put}_unaligned_be{16,32}
        CAIF: Fix IPv6 support in receive path for GPRS/3G
        arp: allow to invalidate specific ARP entries
        net_sched: factorize qdisc stats handling
        mlx4: Call alloc_etherdev to allocate RX and TX queues
        net: Add alloc_netdev_mqs function
        caif: don't set connection request param size before copying data
        cxgb4vf: fix mailbox data/control coherency domain race
        qlcnic: change module parameter permissions
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 · fb7b5a95
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
        sparc64: Fix bootup regression due to perf init ordering.
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 5a62f995
      Linus Torvalds authored
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (72 commits)
        powerpc/pseries: Fix build of topology stuff without CONFIG_NUMA
        powerpc/pseries: Fix VPHN build errors on non-SMP systems
        powerpc/83xx: add mpc8308_p1m DMA controller device-tree node
        powerpc/83xx: add DMA controller to mpc8308 device-tree node
        powerpc/512x: try to free dma descriptors in case of allocation failure
        powerpc/512x: add MPC8308 dma support
        powerpc/512x: fix the hanged dma transfer issue
        powerpc/512x: scatter/gather dma fix
        powerpc/powermac: Make auto-loading of therm_pm72 possible
        of/address: Use propper endianess in get_flags
        powerpc/pci: Use printf extension %pR for struct resource
        powerpc: Remove unnecessary casts of void ptr
        powerpc: Disable VPHN polling during a suspend operation
        powerpc/pseries: Poll VPA for topology changes and update NUMA maps
        powerpc: iommu: Add device name to iommu error printks
        powerpc: Record vma->phys_addr in ioremap()
        powerpc: Update compat_arch_ptrace
        powerpc: Fix PPC_PTRACE_SETHWDEBUG on PPC_BOOK3S
        powerpc/time: printk time stamp init not correct
        powerpc: Minor cleanups for machdep.h
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · f1d6d6cd
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (42 commits)
        IB/qib: Fix refcount leak in lkey/rkey validation
        IB/qib: Improve SERDES tunning on QMH boards
        IB/qib: Unnecessary delayed completions on RC connection
        IB/qib: Issue pre-emptive NAKs on eager buffer overflow
        IB/qib: RDMA lkey/rkey validation is inefficient for large MRs
        IB/qib: Change QPN increment
        IB/qib: Add fix missing from earlier patch
        IB/qib: Change receive queue/QPN selection
        IB/qib: Fix interrupt mitigation
        IB/qib: Avoid duplicate writes to the rcv head register
        IB/qib: Add a few new SERDES tunings
        IB/qib: Reset packet list after freeing
        IB/qib: New SERDES init routine and improvements to SI quality
        IB/qib: Clear WAIT_SEND flags when setting QP to error state
        IB/qib: Fix context allocation with multiple HCAs
        IB/qib: Fix multi-Florida HCA host panic on reboot
        IB/qib: Handle transitions from ACTIVE_DEFERRED to ACTIVE better
        IB/qib: UD send with immediate receive completion has wrong size
        IB/qib: Set port physical state even if other fields are invalid
        IB/qib: Generate completion callback on errors
    • Benjamin Herrenschmidt's avatar
    • Casey Leedom's avatar
      cxgb4vf: recover from failure in cxgb4vf_open() · 343a8d13
      Casey Leedom authored
      If the Link Start fails in cxgb4vf_open(), we need to back out any state
      that we've built up ...
      Signed-off-by: default avatarCasey Leedom <leedom@chelsio.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • David S. Miller's avatar
    • Linus Torvalds's avatar
      Merge branch 'nfs-for-2.6.38' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 · b9d919a4
      Linus Torvalds authored
      * 'nfs-for-2.6.38' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (89 commits)
        NFS fix the setting of exchange id flag
        NFS: Don't use vm_map_ram() in readdir
        NFSv4: Ensure continued open and lockowner name uniqueness
        NFS: Move cl_delegations to the nfs_server struct
        NFS: Introduce nfs_detach_delegations()
        NFS: Move cl_state_owners and related fields to the nfs_server struct
        NFS: Allow walking nfs_client.cl_superblocks list outside client.c
        pnfs: layout roc code
        pnfs: update nfs4_callback_recallany to handle layouts
        pnfs: add CB_LAYOUTRECALL handling
        pnfs: CB_LAYOUTRECALL xdr code
        pnfs: change lo refcounting to atomic_t
        pnfs: check that partial LAYOUTGET return is ignored
        pnfs: add layout to client list before sending rpc
        pnfs: serialize LAYOUTGET(openstateid)
        pnfs: layoutget rpc code cleanup
        pnfs: change how lsegs are removed from layout list
        pnfs: change layout state seqlock to a spinlock
        pnfs: add prefix to struct pnfs_layout_hdr fields
        pnfs: add prefix to struct pnfs_layout_segment fields
    • Florian Westphal's avatar
      netfilter: ebtables: make broute table work again · 2f46e079
      Florian Westphal authored
      broute table init hook sets up the "br_should_route_hook" pointer,
      which then gets called from br_input.
      commit a386f990
      (bridge: add proper RCU annotation to should_route_hook)
      introduced a typedef, and then changed this to:
      br_should_route_hook_t *rhook;
      rhook = rcu_dereference(br_should_route_hook);
      if (*rhook(skb))
      problem is that "br_should_route_hook" contains the address of the function,
      so calling *rhook() results in kernel panic.
      Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
      Acked-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
      Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
    • Stephen Hemminger's avatar
      netfilter: fix race in conntrack between dump_table and destroy · 13ee6ac5
      Stephen Hemminger authored
      The netlink interface to dump the connection tracking table has a race
      when entries are deleted at the same time. A customer reported a crash
      and the backtrace showed thatctnetlink_dump_table was running while a
      conntrack entry was being destroyed.
      (see https://bugzilla.vyatta.com/show_bug.cgi?id=6402
      According to RCU documentation, when using hlist_nulls the reader
      must handle the case of seeing a deleted entry and not proceed
      further down the linked list.  The old code would continue
      which caused the scan to walk into the free list.
      This patch uses locking (rather than RCU) for this operation which
      is guaranteed safe, and no longer requires getting reference while
      doing dump operation.
      Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
      Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6 · 7c955fca
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
        UDF: Close small mem leak in udf_find_entry()
        udf: Fix directory corruption after extent merging
        udf: Protect udf_file_aio_write from possible races
        udf: Remove unnecessary bkl usages
        udf: Use of s_alloc_mutex to serialize udf_relocate_blocks() execution
        udf: Replace bkl with the UDF_I(inode)->i_data_sem for protect udf_inode_info struct
        udf: Remove BKL from free space counting functions
        udf: Call udf_add_free_space() for more blocks at once in udf_free_blocks()
        udf: Remove BKL from udf_put_super() and udf_remount_fs()
        udf: Protect default inode credentials by rwlock
        udf: Protect all modifications of LVID with s_alloc_mutex
        udf: Move handling of uniqueID into a helper function and protect it by a s_alloc_mutex
        udf: Remove BKL from udf_update_inode
        udf: Convert UDF_SB(sb)->s_flags to use bitops
        fs/udf: Add printf format/argument verification
        fs/udf: Use vzalloc
      (Evil merge: this also removes the BKL dependency from the Kconfig file)
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · e9688f6a
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (44 commits)
        ext4: fix trimming starting with block 0 with small blocksize
        ext4: revert buggy trim overflow patch
        ext4: don't pass entire map to check_eofblocks_fl
        ext4: fix memory leak in ext4_free_branches
        ext4: remove ext4_mb_return_to_preallocation()
        ext4: flush the i_completed_io_list during ext4_truncate
        ext4: add error checking to calls to ext4_handle_dirty_metadata()
        ext4: fix trimming of a single group
        ext4: fix uninitialized variable in ext4_register_li_request
        ext4: dynamically allocate the jbd2_inode in ext4_inode_info as necessary
        ext4: drop i_state_flags on architectures with 64-bit longs
        ext4: reorder ext4_inode_info structure elements to remove unneeded padding
        ext4: drop ec_type from the ext4_ext_cache structure
        ext4: use ext4_lblk_t instead of sector_t for logical blocks
        ext4: replace i_delalloc_reserved_flag with EXT4_STATE_DELALLOC_RESERVED
        ext4: fix 32bit overflow in ext4_ext_find_goal()
        ext4: add more error checks to ext4_mkdir()
        ext4: ext4_ext_migrate should use NULL not 0
        ext4: Use ext4_error_file() to print the pathname to the corrupted inode
        ext4: use IS_ERR() to check for errors in ext4_error_file
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 · 40c73abb
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
        ext2: Resolve 'dereferencing pointer to incomplete type' when enabling EXT2_XATTR_DEBUG
        ext3: Remove redundant unlikely()
        ext2: Remove redundant unlikely()
        ext3: speed up file creates by optimizing rec_len functions
        ext2: speed up file creates by optimizing rec_len functions
        ext3: Add more journal error check
        ext3: Add journal error check in resize.c
        quota: Use %pV and __attribute__((format (printf in __quota_error and fix fallout
        ext3: Add FITRIM handling
        ext3: Add batched discard support for ext3
        ext3: Add journal error check into ext3_rename()
        ext3: Use search_dirblock() in ext3_dx_find_entry()
        ext3: Avoid uninitialized memory references with a corrupted htree directory
        ext3: Return error code from generic_check_addressable
        ext3: Add journal error check into ext3_delete_entry()
        ext3: Add error check in ext3_mkdir()
        fs/ext3/super.c: Use printf extension %pV
        fs/ext2/super.c: Use printf extension %pV
        ext3: don't update sb journal_devnum when RO dev
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs · 0945f352
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
        fs/9p: Don't set dentry->d_op in create routines
        fs/9p: fix spelling typo
        fs/9p: TREADLINK bugfix
        net/9p: Use proper data types
        fs/9p: Simplify the .L create operation
        fs/9p: Move dotl inode operations into a seperate file
        fs/9p: fix menu presentation
        fs/9p: Fix the return error on default acl removal
        fs/9p: Remove unnecessary semicolons