Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v3.2-rc4

Dec 01, 2011

  1. Linus Torvalds

    Linux 3.2-rc4

    authored December 01, 2011
  2. Linus Torvalds

    Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/k…

    …ernel/git/jlbec/ocfs2
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: (31 commits)
      ocfs2: avoid unaligned access to dqc_bitmap
      ocfs2: Use filemap_write_and_wait() instead of write_inode_now()
      ocfs2: honor O_(D)SYNC flag in fallocate
      ocfs2: Add a missing journal credit in ocfs2_link_credits() -v2
      ocfs2: send correct UUID to cleancache initialization
      ocfs2: Commit transactions in error cases -v2
      ocfs2: make direntry invalid when deleting it
      fs/ocfs2/dlm/dlmlock.c: free kmem_cache_zalloc'd data using kmem_cache_free
      ocfs2: Avoid livelock in ocfs2_readpage()
      ocfs2: serialize unaligned aio
      ocfs2: Implement llseek()
      ocfs2: Fix ocfs2_page_mkwrite()
      ocfs2: Add comment about orphan scanning
      ocfs2: Clean up messages in the fs
      ocfs2/cluster: Cluster up now includes network connections too
      ocfs2/cluster: Add new function o2net_fill_node_map()
      ocfs2/cluster: Fix output in file elapsed_time_in_ms
      ocfs2/dlm: dlmlock_remote() needs to account for remastery
      ocfs2/dlm: Take inflight reference count for remotely mastered resources too
      ocfs2/dlm: Cleanup dlm_wait_for_node_death() and dlm_wait_for_node_recovery()
      ...
    authored December 01, 2011
  3. mita

    ocfs2: avoid unaligned access to dqc_bitmap

    The dqc_bitmap field of struct ocfs2_local_disk_chunk is 32-bit aligned,
    but not 64-bit aligned.  The dqc_bitmap is accessed by ocfs2_set_bit(),
    ocfs2_clear_bit(), ocfs2_test_bit(), or ocfs2_find_next_zero_bit().  These
    are wrapper macros for ext2_*_bit() which need to take an unsigned long
    aligned address (though some architectures are able to handle unaligned
    address correctly)
    
    So some 64bit architectures may not be able to access the dqc_bitmap
    correctly.
    
    This avoids such unaligned access by using another wrapper functions for
    ext2_*_bit().  The code is taken from fs/ext4/mballoc.c which also need to
    handle unaligned bitmap access.
    
    Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
    Acked-by: Joel Becker <jlbec@evilplan.org>
    Cc: Mark Fasheh <mfasheh@suse.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Joel Becker <jlbec@evilplan.org>
    authored November 15, 2011 Joel Becker committed December 01, 2011
  4. Linus Torvalds

    Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/ker…

    …nel/git-cur/linux-2.6-arm
    
    * 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
      ARM: 7182/1: ARM cpu topology: fix warning
      ARM: 7181/1: Restrict kprobes probing SWP instructions to ARMv5 and below
      ARM: 7180/1: Change kprobes testcase with unpredictable STRD instruction
      ARM: 7177/1: GIC: avoid skipping non-existent PPIs in irq_start calculation
      ARM: 7176/1: cpu_pm: register GIC PM notifier only once
      ARM: 7175/1: add subname parameter to mfp_set_groupg callers
      ARM: 7174/1: Fix build error in kprobes test code on Thumb2 kernels
      ARM: 7172/1: dma: Drop GFP_COMP for DMA memory allocations
      ARM: 7171/1: unwind: add unwind directives to bitops assembly macros
      ARM: 7170/2: fix compilation breakage in entry-armv.S
      ARM: 7168/1: use cache type functions for arch_get_unmapped_area
      ARM: perf: check that we have a platform device when reserving PMU
      ARM: 7166/1: Use PMD_SHIFT instead of PGDIR_SHIFT in dma-consistent.c
      ARM: 7165/2: PL330: Fix typo in _prepare_ccr()
      ARM: 7163/2: PL330: Only register usable channels
      ARM: 7162/1: errata: tidy up Kconfig options for PL310 errata workarounds
      ARM: 7161/1: errata: no automatic store buffer drain
      ARM: perf: initialise used_mask for fake PMU during validation
      ARM: PMU: remove pmu_init declaration
      ARM: PMU: re-export release_pmu symbol to modules
    authored December 01, 2011
  5. Linus Torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/mason/linux-btrfs
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
      Btrfs: fix meta data raid-repair merge problem
      Btrfs: skip allocation attempt from empty cluster
      Btrfs: skip block groups without enough space for a cluster
      Btrfs: start search for new cluster at the beginning
      Btrfs: reset cluster's max_size when creating bitmap
      Btrfs: initialize new bitmaps' list
      Btrfs: fix oops when calling statfs on readonly device
      Btrfs: Don't error on resizing FS to same size
      Btrfs: fix deadlock on metadata reservation when evicting a inode
      Fix URL of btrfs-progs git repository in docs
      btrfs scrub: handle -ENOMEM from init_ipath()
    authored December 01, 2011
  6. Btrfs: fix meta data raid-repair merge problem

    Commit 4a54c8c introduced raid-repair, killing the individual
    readpage_io_failed_hook entries from inode.c and disk-io.c. Commit
    4bb31e9 introduced new readahead code, adding a readpage_io_failed_hook to
    disk-io.c.
    
    The raid-repair commit had logic to disable raid-repair, if
    readpage_io_failed_hook is set. Thus, the readahead commit effectively
    disabled raid-repair for meta data.
    
    This commit changes the logic to always attempt raid-repair when needed and
    call the readpage_io_failed_hook in case raid-repair fails. This is much
    more straight forward and should have been like that from the beginning.
    
    Signed-off-by: Jan Schmidt <list.btrfs@jan-o-sch.net>
    Reported-by: Stefan Behrens <sbehrens@giantdisaster.de>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
    authored December 01, 2011 chrismason-xx committed December 01, 2011
  7. Linus Torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/roland/infiniband
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
      IB: Fix RCU lockdep splats
      IB/ipoib: Prevent hung task or softlockup processing multicast response
      IB/qib: Fix over-scheduling of QSFP work
      RDMA/cxgb4: Fix retry with MPAv1 logic for MPAv2
      RDMA/cxgb4: Fix iw_cxgb4 count_rcqes() logic
      IB/qib: Don't use schedule_work()
    authored November 30, 2011
  8. Linus Torvalds

    Merge branch 'dt-for-linus' of git://sources.calxeda.com/kernel/linux

    * 'dt-for-linus' of git://sources.calxeda.com/kernel/linux:
      of: Add Silicon Image vendor prefix
      of/irq: of_irq_init: add check for parent equal to child node
    authored November 30, 2011
  9. Linus Torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/broonie/regulator
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
      regulator: twl: fix twl4030 support for smps regulators
      regulator: fix use after free bug
      regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator
    authored November 30, 2011
  10. Linus Torvalds

    Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git…

    …/arm/arm-soc
    
    * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (45 commits)
      ARM: ux500: update defconfig
      ARM: u300: update defconfig
      ARM: at91: enable additional boards in existing soc defconfig files
      ARM: at91: refresh soc defconfig files for 3.2
      ARM: at91: rename defconfig files appropriately
      ARM: OMAP2+: Fix Compilation error when omap_l3_noc built as module
      ARM: OMAP2+: Remove empty io.h
      ARM: OMAP2: select ARM_AMBA if OMAP3_EMU is defined
      ARM: OMAP: smartreflex: fix IRQ handling bug
      ARM: OMAP: PM: only register TWL with voltage layer when device is present
      ARM: OMAP: hwmod: Fix the addr space, irq, dma count APIs
      arm: mx28: fix bit operation in clock setting
      ARM: imx: export imx_ioremap
      ARM: imx/mm-imx3: conditionally compile i.MX31 and i.MX35 code
      ARM: mx5: Fix checkpatch warnings in cpu-imx5.c
      MAINTAINERS: Add missing directory
      ARM: imx: drop 'ARCH_MX31' and 'ARCH_MX35'
      ARM: imx6q: move clock register map to machine_desc.map_io
      ARM: pxa168/gplugd: add the correct SSP device
      ARM: Update mach-types to fix mxs build breakage
      ...
    authored November 30, 2011

Nov 30, 2011

  1. ARM: 7182/1: ARM cpu topology: fix warning

    kernel/sched.c:7354:2: warning: initialization from incompatible pointer type
    
    Align cpu_coregroup_mask prototype interface with sched_domain_mask_f typedef
    use int cpu instead of unsigned int cpu
    
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    authored November 29, 2011 Russell King committed November 30, 2011
  2. ARM: 7181/1: Restrict kprobes probing SWP instructions to ARMv5 and b…

    …elow
    
    The SWP instruction is deprecated on ARMv6 and with ARMv7 it will be
    UNDEFINED when CONFIG_SWP_EMULATE is selected. In this case, probing a
    SWP instruction will cause an oops when the kprobes emulation code
    executes an undefined instruction.
    
    As the SWP instruction should be rare or non-existent in kernels for
    ARMv6 and later, we can simply avoid these problems by not allowing
    probing of these.
    
    Reported-by: Leif Lindholm <leif.lindholm@arm.com>
    Tested-by: Leif Lindholm <leif.lindholm@arm.com>
    Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
    Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    authored November 29, 2011 Russell King committed November 30, 2011
  3. ARM: 7180/1: Change kprobes testcase with unpredictable STRD instruction

    There is a kprobes testcase for the instruction "strd r2, [r3], r4".
    This has unpredictable behaviour as it uses r3 for register writeback
    addressing and also stores it to memory.
    
    On a cortex A9, this testcase would fail because the instruction writes
    the updated value of r3 to memory, whereas the kprobes emulation code
    writes the original value.
    
    Fix this by changing testcase to used r5 instead of r3.
    
    Reported-by: Leif Lindholm <leif.lindholm@arm.com>
    Tested-by: Leif Lindholm <leif.lindholm@arm.com>
    Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
    Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    authored November 29, 2011 Russell King committed November 30, 2011
  4. Btrfs: skip allocation attempt from empty cluster

    If we don't have a cluster, don't bother trying to allocate from it,
    jumping right away to the attempt to allocate a new cluster.
    
    Signed-off-by: Alexandre Oliva <oliva@lsd.ic.unicamp.br>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
    authored November 30, 2011 chrismason-xx committed November 30, 2011
  5. Btrfs: skip block groups without enough space for a cluster

    We test whether a block group has enough free space to hold the
    requested block, but when we're doing clustered allocation, we can
    save some cycles by testing whether it has enough room for the cluster
    upfront, otherwise we end up attempting to set up a cluster and
    failing.  Only in the NO_EMPTY_SIZE loop do we attempt an unclustered
    allocation, and by then we'll have zeroed the cluster size, so this
    patch won't stop us from using the block group as a last resort.
    
    Signed-off-by: Alexandre Oliva <oliva@lsd.ic.unicamp.br>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
    authored November 30, 2011 chrismason-xx committed November 30, 2011
  6. Btrfs: start search for new cluster at the beginning

    Instead of starting at zero (offset is always zero), request a cluster
    starting at search_start, that denotes the beginning of the current
    block group.
    
    Signed-off-by: Alexandre Oliva <oliva@lsd.ic.unicamp.br>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
    authored November 30, 2011 chrismason-xx committed November 30, 2011
  7. Btrfs: reset cluster's max_size when creating bitmap

    The field that indicates the size of the largest contiguous chunk of
    free space in the cluster is not initialized when setting up bitmaps,
    it's only increased when we find a larger contiguous chunk.  We end up
    retaining a larger value than appropriate for highly-fragmented
    clusters, which may cause pointless searches for large contiguous
    groups, and even cause clusters that do not meet the density
    requirements to be set up.
    
    Signed-off-by: Alexandre Oliva <oliva@lsd.ic.unicamp.br>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
    authored November 30, 2011 chrismason-xx committed November 30, 2011
  8. Btrfs: initialize new bitmaps' list

    We're failing to create clusters with bitmaps because
    setup_cluster_no_bitmap checks that the list is empty before inserting
    the bitmap entry in the list for setup_cluster_bitmap, but the list
    field is only initialized when it is restored from the on-disk free
    space cache, or when it is written out to disk.
    
    Besides a potential race condition due to the multiple use of the list
    field, filesystem performance severely degrades over time: as we use
    up all non-bitmap free extents, the try-to-set-up-cluster dance is
    done at every metadata block allocation.  For every block group, we
    fail to set up a cluster, and after failing on them all up to twice,
    we fall back to the much slower unclustered allocation.
    
    To make matters worse, before the unclustered allocation, we try to
    create new block groups until we reach the 1% threshold, which
    introduces additional bitmaps and thus block groups that we'll iterate
    over at each metadata block request.
    authored November 28, 2011 David Sterba committed November 30, 2011
  9. Btrfs: fix oops when calling statfs on readonly device

    To reproduce this bug:
    
      # dd if=/dev/zero of=img bs=1M count=256
      # mkfs.btrfs img
      # losetup -r /dev/loop1 img
      # mount /dev/loop1 /mnt
      OOPS!!
    
    It triggered BUG_ON(!nr_devices) in btrfs_calc_avail_data_space().
    
    To fix this, instead of checking write-only devices, we check all open
    deivces:
    
      # df -h /dev/loop1
      Filesystem            Size  Used Avail Use% Mounted on
      /dev/loop1            250M   28K  238M   1% /mnt
    
    Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
    authored November 28, 2011 David Sterba committed November 30, 2011
  10. mfleetwo

    Btrfs: Don't error on resizing FS to same size

    It seems overly harsh to fail a resize of a btrfs file system to the
    same size when a shrink or grow would succeed.  User app GParted trips
    over this error.  Allow it by bypassing the shrink or grow operation.
    
    Signed-off-by: Mike Fleetwood <mike.fleetwood@googlemail.com>
    authored November 18, 2011 David Sterba committed November 30, 2011
  11. Miao Xie

    Btrfs: fix deadlock on metadata reservation when evicting a inode

    When I ran the xfstests, I found the test tasks was blocked on meta-data
    reservation.
    
    By debugging, I found the reason of this bug:
       start transaction
            |
    	v
       reserve meta-data space
    	|
    	v
       flush delay allocation -> iput inode -> evict inode
    	^					|
    	|					v
       wait for delay allocation flush <- reserve meta-data space
    
    And besides that, the flush on evicting inode will block the thread, which
    is reclaiming the memory, and make oom happen easily.
    
    Fix this bug by skipping the flush step when evicting inode.
    
    Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
    authored November 18, 2011 David Sterba committed November 30, 2011
  12. Arnd Hannemann

    Fix URL of btrfs-progs git repository in docs

    	The location of the btrfs-progs repository has been changed.
    	This patch updates the documentation accordingly.
    
    Signed-off-by: Arnd Hannemann <arnd@arndnet.de>
    authored November 16, 2011 David Sterba committed November 30, 2011
  13. btrfs scrub: handle -ENOMEM from init_ipath()

    init_ipath() can return an ERR_PTR(-ENOMEM).
    
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    authored November 16, 2011 David Sterba committed November 30, 2011
  14. Roland Dreier

    Merge branches 'cxgb4', 'ipoib', 'misc' and 'qib' into for-next

    authored November 29, 2011

Nov 29, 2011

  1. Linus Torvalds

    Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/…

    …git/rafael/linux-pm
    
    * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
      PM: Update comments describing device power management callbacks
      PM / Sleep: Update documentation related to system wakeup
      PM / Runtime: Make documentation follow the new behavior of irq_safe
      PM / Sleep: Correct inaccurate information in devices.txt
      PM / Domains: Document how PM domains are used by the PM core
      PM / Hibernate: Do not leak memory in error/test code paths
    authored November 29, 2011
  2. IB: Fix RCU lockdep splats

    Commit f2c31e3 ("net: fix NULL dereferences in check_peer_redir()")
    forgot to take care of infiniband uses of dst neighbours.
    
    Many thanks to Marc Aurele who provided a nice bug report and feedback.
    
    Reported-by: Marc Aurele La France <tsi@ualberta.ca>
    Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
    Cc: David Miller <davem@davemloft.net>
    Cc: <stable@kernel.org>
    Signed-off-by: Roland Dreier <roland@purestorage.com>
    authored November 29, 2011 rolandd committed November 29, 2011
  3. IB/ipoib: Prevent hung task or softlockup processing multicast response

    This following can occur with ipoib when processing a multicast reponse:
    
        BUG: soft lockup - CPU#0 stuck for 67s! [ib_mad1:982]
        Modules linked in: ...
        CPU 0:
        Modules linked in: ...
        Pid: 982, comm: ib_mad1 Not tainted 2.6.32-131.0.15.el6.x86_64 #1 ProLiant DL160 G5
        RIP: 0010:[<ffffffff814ddb27>]  [<ffffffff814ddb27>] _spin_unlock_irqrestore+0x17/0x20
        RSP: 0018:ffff8802119ed860  EFLAGS: 00000246
        0000000000000004 RBX: ffff8802119ed860 RCX: 000000000000a299
        RDX: ffff88021086c700 RSI: 0000000000000246 RDI: 0000000000000246
        RBP: ffffffff8100bc8e R08: ffff880210ac229c R09: 0000000000000000
        R10: ffff88021278aab8 R11: 0000000000000000 R12: ffff8802119ed860
        R13: ffffffff8100be6e R14: 0000000000000001 R15: 0000000000000003
        FS:  0000000000000000(0000) GS:ffff880028200000(0000) knlGS:0000000000000000
        CS:  0010 DS: 0018 ES: 0018 CR0: 000000008005003b
        CR2: 00000000006d4840 CR3: 0000000209aa5000 CR4: 00000000000406f0
        DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
        DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
        Call Trace:
        [<ffffffffa032c247>] ? ipoib_mcast_send+0x157/0x480 [ib_ipoib]
        [<ffffffff8100bc8e>] ? apic_timer_interrupt+0xe/0x20
        [<ffffffff8100bc8e>] ? apic_timer_interrupt+0xe/0x20
        [<ffffffffa03283d4>] ? ipoib_path_lookup+0x124/0x2d0 [ib_ipoib]
        [<ffffffffa03286fc>] ? ipoib_start_xmit+0x17c/0x430 [ib_ipoib]
        [<ffffffff8141e758>] ? dev_hard_start_xmit+0x2c8/0x3f0
        [<ffffffff81439d0a>] ? sch_direct_xmit+0x15a/0x1c0
        [<ffffffff81423098>] ? dev_queue_xmit+0x388/0x4d0
        [<ffffffffa032d6b7>] ? ipoib_mcast_join_finish+0x2c7/0x510 [ib_ipoib]
        [<ffffffffa032dab8>] ? ipoib_mcast_sendonly_join_complete+0x1b8/0x1f0 [ib_ipoib]
        [<ffffffffa02a0946>] ? mcast_work_handler+0x1a6/0x710 [ib_sa]
        [<ffffffffa015f01e>] ? ib_send_mad+0xfe/0x3c0 [ib_mad]
        [<ffffffffa00f6c93>] ? ib_get_cached_lmc+0xa3/0xb0 [ib_core]
        [<ffffffffa02a0f9b>] ? join_handler+0xeb/0x200 [ib_sa]
        [<ffffffffa029e4fc>] ? ib_sa_mcmember_rec_callback+0x5c/0xa0 [ib_sa]
        [<ffffffffa029e79c>] ? recv_handler+0x3c/0x70 [ib_sa]
        [<ffffffffa01603a4>] ? ib_mad_completion_handler+0x844/0x9d0 [ib_mad]
        [<ffffffffa015fb60>] ? ib_mad_completion_handler+0x0/0x9d0 [ib_mad]
        [<ffffffff81088830>] ? worker_thread+0x170/0x2a0
        [<ffffffff8108e160>] ? autoremove_wake_function+0x0/0x40
        [<ffffffff810886c0>] ? worker_thread+0x0/0x2a0
        [<ffffffff8108ddf6>] ? kthread+0x96/0xa0
        [<ffffffff8100c1ca>] ? child_rip+0xa/0x20
    
    Coinciding with stack trace is the following message:
    
        ib0: ib_address_create failed
    
    The code below in ipoib_mcast_join_finish() will note the above
    failure in the address handle but otherwise continue:
    
                    ah = ipoib_create_ah(dev, priv->pd, &av);
                    if (!ah) {
                            ipoib_warn(priv, "ib_address_create failed\n");
                    } else {
    
    The while loop at the bottom of ipoib_mcast_join_finish() will attempt
    to send queued multicast packets in mcast->pkt_queue and eventually
    end up in ipoib_mcast_send():
    
            if (!mcast->ah) {
                    if (skb_queue_len(&mcast->pkt_queue) < IPOIB_MAX_MCAST_QUEUE)
                            skb_queue_tail(&mcast->pkt_queue, skb);
                    else {
                            ++dev->stats.tx_dropped;
                            dev_kfree_skb_any(skb);
                    }
    
    My read is that the code will requeue the packet and return to the
    ipoib_mcast_join_finish() while loop and the stage is set for the
    "hung" task diagnostic as the while loop never sees a non-NULL ah, and
    will do nothing to resolve.
    
    There are GFP_ATOMIC allocates in the provider routines, so this is
    possible and should be dealt with.
    
    The test that induced the failure is associated with a host SM on the
    same server during a shutdown.
    
    This patch causes ipoib_mcast_join_finish() to exit with an error
    which will flush the queued mcast packets.  Nothing is done to unwind
    the QP attached state so that subsequent sends from above will retry
    the join.
    
    Reviewed-by: Ram Vepa <ram.vepa@qlogic.com>
    Reviewed-by: Gary Leshner <gary.leshner@qlogic.com>
    Signed-off-by: Mike Marciniszyn <mike.marciniszyn@qlogic.com>
    Signed-off-by: Roland Dreier <roland@purestorage.com>
    authored November 21, 2011 rolandd committed November 29, 2011
  4. Linus Torvalds

    Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kern…

    …el/git/penberg/linux
    
    * 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux:
      slub: avoid potential NULL dereference or corruption
      slub: use irqsafe_cpu_cmpxchg for put_cpu_partial
      slub: move discard_slab out of node lock
      slub: use correct parameter to add a page to partial list tail
    authored November 29, 2011
  5. Linus Torvalds

    Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/t…

    …ytso/ext4
    
    * 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
      ext4: fix racy use-after-free in ext4_end_io_dio()
    authored November 29, 2011
  6. arndb

    Merge branch 'defconfigs-for-arnd' of git://git.linaro.org/people/tri…

    …ad/linux-stericsson into fixes
    authored November 29, 2011
  7. of: Add Silicon Image vendor prefix

    "sil" is the most commonly used abbreviation for Silicon
    Image products.
    
    Signed-off-by: Pawel Moll <pawel.moll@arm.com>
    authored November 08, 2011 Rob Herring committed November 29, 2011
  8. of/irq: of_irq_init: add check for parent equal to child node

    With the revert of "of/irq: of_irq_find_parent: check for parent equal to
    child" (dc93728), we need another way to handle parent node equal
    to the child node. This can simply be handled in of_irq_init by checking
    for this condition.
    
    Signed-off-by: Rob Herring <rob.herring@calxeda.com>
    Tested-by: Pawel Moll <pawel.moll@arm.com>
    Tested-by: Stephen Warren <swarren@nvidia.com>
    authored November 27, 2011
  9. Linus Walleij

    ARM: ux500: update defconfig

    This updates the Ux500 defconfig with the new drivers for HWSEM
    and AB5500 core that were merged in the 3.2 cycle.
    
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    authored November 16, 2011
  10. Linus Walleij

    ARM: u300: update defconfig

    This updates the U300 defconfig to support some new drivers like
    FSMC, sets it to use the MMC clock gating scheme, and removes
    some stale config options.
    
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    authored November 16, 2011
  11. Linus Torvalds

    Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/…

    …kernel/git/groeck/linux-staging
    
    * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
      hwmon: convert drivers/hwmon/* to use module_platform_driver()
      hwmon: Remove redundant spi driver bus initialization
    authored November 28, 2011
Something went wrong with that request. Please try again.