Squashed commit of the following:

commit 6b16351acbd415e66ba16bf7d473ece1574cf0bc
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sun Jun 24 12:53:04 2012 -0700

    Linux 3.5-rc4

commit 02b7d83436ae4b1d86a5df03e72c1c69af7e239d
Author: Anatol Pomozov <anatol.pomozov@gmail.com>
Date:   Sat Jun 23 15:54:34 2012 -0700

    Fix typo in printed messages

    Coult -> Could

    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 104452f052dfcf62dbf0c4110c9234a3285f59bf
Merge: 08d49c4 081f323
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sun Jun 24 11:02:09 2012 -0700

    Merge git://git.kernel.org/pub/scm/virt/kvm/kvm

    Pull KVM fixes from Avi Kivity:
     "Fixing a scheduling-while-atomic bug in the ppc code, and a bug which
      allowed pci bridges to be assigned to guests."

    * git://git.kernel.org/pub/scm/virt/kvm/kvm:
      KVM: PPC: Book3S HV: Drop locks around call to kvmppc_pin_guest_page
      KVM: Fix PCI header check on device assignment

commit 08d49c46cf61f707f3f44228b362947bb57343e7
Merge: a4a20fd 2e51fd3
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sun Jun 24 11:00:07 2012 -0700

    Merge tag 'rdma-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

    Pull InfiniBand/RDMA fixes from Roland Dreier:
     - Fixes to new ocrdma driver
     - Typo in test in CMA

    * tag 'rdma-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
      RDMA/cma: QP type check on received REQs should be AND not OR
      RDMA/ocrdma: Fix off by one in ocrdma_query_gid()
      RDMA/ocrdma: Fixed RQ error CQE polling
      RDMA/ocrdma: Correct queue SGE calculation
      RDMA/ocrdma: Correct reported max queue sizes
      RDMA/ocrdma: Fixed GID table for vlan and events

commit a4a20fd981b2e6419556ca474b3b9689d42e5233
Merge: 2ecedc4 0fa1f06
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sun Jun 24 10:57:59 2012 -0700

    Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

    Pull ARM SoC fixes from Olof Johansson:
     "Nothing very controversial in here.  Most of the fixes are for OMAP
      this time around, with some orion/kirkwood and a tegra patch mixed in."

    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
      ARM: Orion: Fix Virtual/Physical mixup with watchdog
      ARM: Kirkwood: clk_register_gate_fn: add fn assignment
      ARM: Orion5x - Restore parts of io.h, with rework
      ARM: OMAP4: hwmod data: Force HDMI in no-idle while enabled
      ARM: OMAP2+: mux: fix sparse warning
      ARM: OMAP2+: CM: increase the module disable timeout
      ARM: OMAP4: clock data: add clockdomains for clocks used as main clocks
      ARM: OMAP4: hwmod data: fix 32k sync timer idle modes
      ARM: OMAP4+: hwmod: fix issue causing IPs not going back to Smart-Standby
      ARM: OMAP: Fix Beagleboard DVI reset gpio
      arm/dts: OMAP2: Fix interrupt controller binding
      ARM: OMAP2: Fix tusb6010 GPIO interrupt for n8x0
      ARM: OMAP2+: Fix MUSB ifdefs for platform init code
      ARM: tegra: make tegra_cpu_reset_handler_enable() __init
      ARM: OMAP: PM: Lock clocks list while generating summary
      ARM: iconnect: Remove include of removed linux/spi/orion_spi.h

commit 2ecedc478e7a20597d95f48144cbe5ee568c0f1b
Merge: 002b758 59bbe27
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sun Jun 24 10:57:15 2012 -0700

    Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

    Pull drm fixes from Dave Airlie:
     "Nothing major in here, one radeon SI fix for tiling, and one uninit
      var fix, two minor header file fixes."

    * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
      drm: drop comment about this header being autogenerated.
      drm/edid: don't return stack garbage from supports_rb
      vga_switcheroo: Add include guard
      drm/radeon: SI tiling fixes for display

commit 2e51fd3c13e330d9364a211ddcd3e38771eeb4b4
Merge: 4dd81e8 7b33dc2
Author: Roland Dreier <roland@purestorage.com>
Date:   Sun Jun 24 04:59:59 2012 -0700

    Merge branches 'cma' and 'ocrdma' into for-linus

commit 0fa1f0609a0c1fe8b2be3c0089a2cb48f7fda521
Author: Andrew Lunn <andrew@lunn.ch>
Date:   Fri Jun 22 08:54:02 2012 +0200

    ARM: Orion: Fix Virtual/Physical mixup with watchdog

    The orion watchdog is expecting to be passed the physcial address of
    the hardware, and will ioremap() it to give a virtual address it will
    use as the base address for the hardware. However, when creating the
    platform resource record, a virtual address was being used.

    Add the necassary #define's so we can pass the physical address as
    expected.

    Tested on Kirkwood and Orion5x.

    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Andrew Lunn <andrew@lunn.ch>
    Signed-off-by: Olof Johansson <olof@lixom.net>

commit 5fb2ce119c113e5c987fa81ed89e73b2653e28e4
Author: Marc Kleine-Budde <mkl@blackshift.org>
Date:   Fri Jun 22 08:54:01 2012 +0200

    ARM: Kirkwood: clk_register_gate_fn: add fn assignment

    In commit:
        98d9986 ARM: Kirkwood: Replace clock gating
    the kirkwood clock gating has been reworked. A custom variant of
    clock gating, that calls a custom function before gating the clock
    off, has been introduced. However in clk_register_gate_fn() this
    custom function "fn" is never assigned.

    This patch adds the missing fn assignment.

    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Marc Kleine-Budde <mkl@blackshift.org>
    Tested-by: Andrew Lunn <andrew@lunn.ch>
    Acked-by: Andrew Lunn <andrew@lunn.ch>
    Signed-off-by: Olof Johansson <olof@lixom.net>

commit b5e12229a4850ae9b19ee5252508749da8844b3c
Author: Andrew Lunn <andrew@lunn.ch>
Date:   Fri Jun 22 20:57:57 2012 +0200

    ARM: Orion5x - Restore parts of io.h, with rework

    Commit 4d5fc58dbe34b78157c05b319669bb3e064ba8bd (ARM: remove bunch of
    now unused mach/io.h files) removed the orion5x io.h. Unfortunately,
    this is still needed for the definition of IO_SPACE_LIMIT which
    overrides the default 64K. All Orion based systems have 1Mbyte of IO
    space per PCI[e] bus, and try to request_resource() this size. Orion5x
    has two such PCI buses.

    It is likely that the original, removed version, was broken. This
    version might be less broken. However, it has not been tested on
    hardware with a PCI card, let alone hardware with a PCI card with IO
    capabilities.

    Signed-off-by: Andrew Lunn <andrew@lunn.ch>
    Acked-by: Rob Herring <rob.herring@calxeda.com>
    Signed-off-by: Olof Johansson <olof@lixom.net>

commit a34a3b7264fdb40c8d4be8bebb38fd56dc48d162
Merge: e23d709 dc57aef
Author: Olof Johansson <olof@lixom.net>
Date:   Sat Jun 23 16:16:29 2012 -0700

    Merge tag 'omap-fixes-a-for-3.5rc' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into fixes

    From Paul Walmsley (as per Tony Lindgren's request):
     "Some uncontroversial OMAP clock, hwmod, and compiler warning fixes for 3.5-rc"

    * tag 'omap-fixes-a-for-3.5rc' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending:
      ARM: OMAP4: hwmod data: Force HDMI in no-idle while enabled
      ARM: OMAP2+: mux: fix sparse warning
      ARM: OMAP2+: CM: increase the module disable timeout
      ARM: OMAP4: clock data: add clockdomains for clocks used as main clocks
      ARM: OMAP4: hwmod data: fix 32k sync timer idle modes
      ARM: OMAP4+: hwmod: fix issue causing IPs not going back to Smart-Standby
      ARM: OMAP: PM: Lock clocks list while generating summary

commit e23d7096f9633d37aa35dffab9b0bd594ed64533
Merge: 6355f25 aef2b89
Author: Olof Johansson <olof@lixom.net>
Date:   Sat Jun 23 16:11:50 2012 -0700

    Merge tag 'omap-fixes-for-v3.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

    From Tony Lindgren:
    "Here are a few fixes with the biggest one being fix for Beagle DVI
     reset. All of them are regression fixes, except for the missing omap2
     interrupt controller binding that somehow got missed earlier."

    * tag 'omap-fixes-for-v3.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
      ARM: OMAP: Fix Beagleboard DVI reset gpio
      arm/dts: OMAP2: Fix interrupt controller binding
      ARM: OMAP2: Fix tusb6010 GPIO interrupt for n8x0
      ARM: OMAP2+: Fix MUSB ifdefs for platform init code

commit 002b758b6dc4d840e662f25625f696d7b43d48f4
Merge: 369c4f5 642c0db
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri Jun 22 17:47:08 2012 -0700

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

    Pull Ceph fixes from Sage Weil:
     "There are a couple of fixes from Yan for bad pointer dereferences in
      the messenger code and when fiddling with page->private after page
      migration, a fix from Alex for a use-after-free in the osd client
      code, and a couple fixes for the message refcounting and shutdown
      ordering."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
      libceph: flush msgr queue during mon_client shutdown
      rbd: Clear ceph_msg->bio_iter for retransmitted message
      libceph: use con get/put ops from osd_client
      libceph: osd_client: don't drop reply reference too early
      ceph: check PG_Private flag before accessing page->private

commit 369c4f542fd5e197ace5f9fdd33c558fb2358480
Merge: a116371 f7bdf03
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri Jun 22 11:07:55 2012 -0700

    Merge tag 'for-linus-Jun-21-2012' of git://oss.sgi.com/xfs/xfs

    Pull XFS fixes from Ben Myers:
     - Fix stale data exposure with unwritten extents
     - Fix a warning in xfs_alloc_vextent with ODEBUG
     - Fix overallocation and alignment of pages for xfs_bufs
     - Fix a cursor leak
     - Fix a log hang
     - Fix a crash related to xfs_sync_worker
     - Rename xfs log structure from struct log to struct xlog so we can use
       crash dumps effectively

    * tag 'for-linus-Jun-21-2012' of git://oss.sgi.com/xfs/xfs:
      xfs: rename log structure to xlog
      xfs: shutdown xfs_sync_worker before the log
      xfs: Fix overallocation in xfs_buf_allocate_memory()
      xfs: fix allocbt cursor leak in xfs_alloc_ag_vextent_near
      xfs: check for stale inode before acquiring iflock on push
      xfs: fix debug_object WARN at xfs_alloc_vextent()
      xfs: xfs_vm_writepage clear iomap_valid when !buffer_uptodate (REV2)

commit a11637194adc8bf2c2022ac89314dbdd1fcd1778
Merge: 636040b 6921a57
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri Jun 22 10:58:57 2012 -0700

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

    Pull perf updates from Ingo Molnar.

    * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      ftrace: Make all inline tags also include notrace
      perf: Use css_tryget() to avoid propping up css refcount
      perf tools: Fix synthesizing tracepoint names from the perf.data headers
      perf stat: Fix default output file
      perf tools: Fix endianity swapping for adds_features bitmask

commit 59bbe27ba0f6bae1d85f1521e43181d98ee9c5ab
Author: Dave Airlie <airlied@redhat.com>
Date:   Fri Jun 22 11:04:55 2012 +0100

    drm: drop comment about this header being autogenerated.

    This comment is well out of date.

    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit dc57aef503859dbf724f6126c58b2e1672e215f3
Author: Ricardo Neri <ricardo.neri@ti.com>
Date:   Thu Jun 21 10:08:53 2012 +0200

    ARM: OMAP4: hwmod data: Force HDMI in no-idle while enabled

    As per the OMAP4 documentation, audio over HDMI must be transmitted in
    no-idle mode. This patch adds the HWMOD_SWSUP_SIDLE so that omap_hwmod uses
    no-idle/force-idle settings instead of smart-idle mode.

    This is required as the DSS interface clock is used as functional clock
    for the HDMI wrapper audio FIFO. If no-idle mode is not used, audio could
    be choppy, have bad quality or not be audible at all.

    Signed-off-by: Ricardo Neri <ricardo.neri@ti.com>
    [b-cousson@ti.com: Update the subject and align the .flags
    location with the script template]
    Signed-off-by: Benoit Cousson <b-cousson@ti.com>
    Signed-off-by: Paul Walmsley <paul@pwsan.com>

commit 65e25976b75c4996c5650afadc4180db09ec7475
Author: Paul Walmsley <paul@pwsan.com>
Date:   Sun Jun 17 12:00:58 2012 -0600

    ARM: OMAP2+: mux: fix sparse warning

    Commit bbd707acee279a61177a604822db92e8164d00db ("ARM: omap2: use
    machine specific hook for late init") resulted in the addition of this
    sparse warning:

    arch/arm/mach-omap2/mux.c:791:12: warning: symbol 'omap_mux_late_init' was not declared. Should it be static?

    Fix by including the header file containing the prototype.

    Signed-off-by: Paul Walmsley <paul@pwsan.com>
    Cc: Shawn Guo <shawn.guo@linaro.org>
    Cc: Tony Lindgren <tony@atomide.com>

commit b8f15b7e1dd3638d35cfff85571df1d7ea96e35e
Author: Paul Walmsley <paul@pwsan.com>
Date:   Sun Jun 17 11:57:53 2012 -0600

    ARM: OMAP2+: CM: increase the module disable timeout

    Increase the timeout for disabling an IP block to five milliseconds.
    This is to handle the usb_host_fs idle latency, which takes almost
    four milliseconds after a host controller reset.

    This is the second of two patches needed to resolve the following
    boot warning:

    omap_hwmod: usb_host_fs: _wait_target_disable failed

    Thanks to Sergei Shtylyov <sshtylyov@mvista.com> for finding
    an unrelated hunk in a previous version of this patch.

    Signed-off-by: Paul Walmsley <paul@pwsan.com>
    Cc: Sergei Shtylyov <sshtylyov@mvista.com>
    Cc: Tero Kristo <t-kristo@ti.com>

commit 9a47d32d5c4b91a4ce4c459f3b7b0290185e7578
Author: Paul Walmsley <paul@pwsan.com>
Date:   Sun Jun 17 11:57:52 2012 -0600

    ARM: OMAP4: clock data: add clockdomains for clocks used as main clocks

    Until the OMAP4 code is converted to disable the use of the clock
    framework-based clockdomain enable/disable sequence, any clock used as
    a hwmod main_clk must have a clockdomain associated with it.  This
    patch populates some clock structure clockdomain names to resolve the
    following warnings during kernel init:

    omap_hwmod: dpll_mpu_m2_ck: missing clockdomain for dpll_mpu_m2_ck.
    omap_hwmod: trace_clk_div_ck: missing clockdomain for trace_clk_div_ck.
    omap_hwmod: l3_div_ck: missing clockdomain for l3_div_ck.
    omap_hwmod: ddrphy_ck: missing clockdomain for ddrphy_ck.

    Signed-off-by: Paul Walmsley <paul@pwsan.com>
    Cc: Rajendra Nayak <rnayak@ti.com>
    Cc: Benoît Cousson <b-cousson@ti.com>

commit 252a4c5443ec4d0bd310ae5b0d1b7f9c5b1e7f46
Author: Paul Walmsley <paul@pwsan.com>
Date:   Sun Jun 17 11:57:51 2012 -0600

    ARM: OMAP4: hwmod data: fix 32k sync timer idle modes

    The 32k sync timer IP block target idle modes in the hwmod data are
    incorrect.  The IP block does not support any smart-idle modes.
    Update the data to reflect the correct modes.

    This problem was initially identified and a diff fragment posted to
    the lists by Benoît Cousson <b-cousson@ti.com>.  A patch description
    bug in the first version was also identified by Benoît.

    Signed-off-by: Paul Walmsley <paul@pwsan.com>
    Cc: Benoît Cousson <b-cousson@ti.com>
    Cc: Tero Kristo <t-kristo@ti.com>

commit 561038f0a8aa1de272a2ac5dad24cc8246d9f496
Author: Djamil Elaidi <d-elaidi@ti.com>
Date:   Sun Jun 17 11:57:51 2012 -0600

    ARM: OMAP4+: hwmod: fix issue causing IPs not going back to Smart-Standby

    If an IP is configured in Smart-Standby-Wakeup, when disabling wakeup feature the
    IP will not go back to Smart-Standby, but will remain in Smart-Standby-Wakeup.

    Signed-off-by: Djamil Elaidi <d-elaidi@ti.com>
    Signed-off-by: Paul Walmsley <paul@pwsan.com>

commit 636040b4eddf6152b5d0b2d574663809f898953b
Merge: 8874e81 b102743
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu Jun 21 16:05:43 2012 -0700

    Merge tag 'nfs-for-3.5-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

    Pull NFS client bugfixes from Trond Myklebust:
     - Fix a write hang due to an uninitalised variable when
       !defined(CONFIG_NFS_V4)
     - Address upcall races in the legacy NFSv4 idmapper
     - Remove an O_DIRECT refcounting issue
     - Fix a pNFS refcounting bug when the file layout metadata server is
       also acting as a data server
     - Fix a pNFS module loading race.

    * tag 'nfs-for-3.5-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
      NFS: Force the legacy idmapper to be single threaded
      NFS: Initialise commit_info.rpc_out when !defined(CONFIG_NFS_V4)
      NFS: Fix a refcounting issue in O_DIRECT
      NFSv4.1: Fix a race in set_pnfs_layoutdriver
      NFSv4.1: Fix umount when filelayout DS is also the MDS

commit 8874e812feb4926f4a51a82c4fca75c7daa05fc5
Merge: 7b83778 cb77fcd
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu Jun 21 13:41:07 2012 -0700

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

    Pull btrfs fixes from Chris Mason:
     "This is a small pull with btrfs fixes.  The biggest of the bunch is
      another fix for the new backref walking code.

      We're still hammering out one btrfs dio vs buffered reads problem, but
      that one will have to wait for the next rc."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
      Btrfs: delay iput with async extents
      Btrfs: add a missing spin_lock
      Btrfs: don't assume to be on the correct extent in add_all_parents
      Btrfs: introduce btrfs_next_old_item

commit 7b8377862bd816a5e8ceb5c713d88bf82555c8d4
Merge: 7940b2a 2355375
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu Jun 21 13:40:40 2012 -0700

    Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

    Pull hwmon fixes from Guenter Roeck:
     "Two minor fixes in emc2103 and applesmc drivers."

    * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
      hwmon: (emc2103) Fix use of an uninitilized variable in error case
      hwmon: (applesmc) Limit key length in warning messages

commit f7bdf03a99efc083608cd9c0c3e03abff311c79e
Author: Mark Tinguely <tinguely@sgi.com>
Date:   Thu Jun 14 09:22:15 2012 -0500

    xfs: rename log structure to xlog

    Rename the XFS log structure to xlog to help crash distinquish it from the
    other logs in Linux.

    Signed-off-by: Mark Tinguely <tinguely@sgi.com>
    Reviewed-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Ben Myers <bpm@sgi.com>

commit 8866fc6fa55e31b2bce931b7963ff16641b39dc7
Author: Ben Myers <bpm@sgi.com>
Date:   Fri May 25 15:45:36 2012 -0500

    xfs: shutdown xfs_sync_worker before the log

    Revert commit 1307bbd, which uses the s_umount semaphore to provide
    exclusion between xfs_sync_worker and unmount, in favor of shutting down
    the sync worker before freeing the log in xfs_log_unmount.  This is a
    cleaner way of resolving the race between xfs_sync_worker and unmount
    than using s_umount.

    Signed-off-by: Ben Myers <bpm@sgi.com>
    Reviewed-by: Mark Tinguely <tinguely@sgi.com>
    Reviewed-by: Dave Chinner <dchinner@redhat.com>

commit 59c84ed0ddc11f1823b4a33ace4fbcc948261bb2
Author: Jan Kara <jack@suse.cz>
Date:   Wed Jun 6 00:32:26 2012 +0200

    xfs: Fix overallocation in xfs_buf_allocate_memory()

    Commit de1cbee which removed b_file_offset in favor of b_bn introduced a bug
    causing xfs_buf_allocate_memory() to overestimate the number of necessary
    pages. The problem is that xfs_buf_alloc() sets b_bn to -1 and thus effectively
    every buffer is straddling a page boundary which causes
    xfs_buf_allocate_memory() to allocate two pages and use vmalloc() for access
    which is unnecessary.

    Dave says xfs_buf_alloc() doesn't need to set b_bn to -1 anymore since the
    buffer is inserted into the cache only after being fully initialized now.
    So just make xfs_buf_alloc() fill in proper block number from the beginning.

    CC: David Chinner <dchinner@redhat.com>
    Signed-off-by: Jan Kara <jack@suse.cz>
    Reviewed-by: Christoph Hellwig <hch@lst.de>
    Reviewed-by: Dave Chinner <dchinner@redhat.com>
    Signed-off-by: Ben Myers <bpm@sgi.com>

commit 76d095388b040229ea1aad7dea45be0cfa20f589
Author: Dave Chinner <dchinner@redhat.com>
Date:   Tue Jun 12 14:20:26 2012 +1000

    xfs: fix allocbt cursor leak in xfs_alloc_ag_vextent_near

    When we fail to find an matching extent near the requested extent
    specification during a left-right distance search in
    xfs_alloc_ag_vextent_near, we fail to free the original cursor that
    we used to look up the XFS_BTNUM_CNT tree and hence leak it.

    Reported-by: Chris J Arges <chris.j.arges@canonical.com>
    Signed-off-by: Dave Chinner <dchinner@redhat.com>
    Reviewed-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Ben Myers <bpm@sgi.com>

commit 9a3a5dab63461b84213052888bf38a962b22d035
Author: Brian Foster <bfoster@redhat.com>
Date:   Mon Jun 11 10:39:43 2012 -0400

    xfs: check for stale inode before acquiring iflock on push

    An inode in the AIL can be flush locked and marked stale if
    a cluster free transaction occurs at the right time. The
    inode item is then marked as flushing, which causes xfsaild
    to spin and leaves the filesystem stalled. This is
    reproduced by running xfstests 273 in a loop for an
    extended period of time.

    Check for stale inodes before the flush lock. This marks
    the inode as pinned, leads to a log flush and allows the
    filesystem to proceed.

    Signed-off-by: Brian Foster <bfoster@redhat.com>
    Reviewed-by: Dave Chinner <dchinner@redhat.com>
    Reviewed-by: Christoph Hellwig <hch@lst.de>
    Reviewed-by: Mark Tinguely <tinguely@sgi.com>
    Signed-off-by: Ben Myers <bpm@sgi.com>

commit cb77fcd88569cd2b7b25ecd4086ea932a53be9b3
Author: Josef Bacik <josef@redhat.com>
Date:   Fri Jun 15 12:19:48 2012 -0600

    Btrfs: delay iput with async extents

    There is some concern that these iput()'s could be the final iputs and could
    induce lockups on people waiting on writeback.  This would happen in the
    rare case that we don't create ordered extents because of an error, but it
    is theoretically possible and we already have a mechanism to deal with this
    so just make them delayed iputs to negate any worry.

    Signed-off-by: Josef Bacik <josef@redhat.com>
    Signed-off-by: Chris Mason <chris.mason@fusionio.com>

commit e18fca734278784bd6591de63ca148cc27344ca9
Author: Josef Bacik <josef@redhat.com>
Date:   Mon Jun 18 07:23:18 2012 -0600

    Btrfs: add a missing spin_lock

    When fixing up the locking in the delayed ref destruction work I accidently
    broke the locking myself ;(.  Add back a spin_lock that should be there and
    we are now all set.  Thanks,
    Btrfs: add a missing spin_lock

    When fixing up the locking in the delayed ref destruction work I accidently
    broke the locking myself ;(.  Add back a spin_lock that should be there and
    we are now all set.  Thanks,

    Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Josef Bacik <josef@redhat.com>
    Signed-off-by: Chris Mason <chris.mason@fusionio.com>

commit 69bca40d41c613927b150c5392505f1894fe3010
Author: Alexander Block <ablock84@googlemail.com>
Date:   Tue Jun 19 07:42:26 2012 -0600

    Btrfs: don't assume to be on the correct extent in add_all_parents

    add_all_parents did assume that path is already at a correct extent data
    item, which may not be true in case of data extents that were partly
    rewritten and splitted.

    We need to check if we're on a matching extent for every item and only
    for the ones after the first. The loop is changed to do this now.

    This patch also fixes a bug introduced with commit 3b127fd8 "Btrfs:
    remove obsolete btrfs_next_leaf call from __resolve_indirect_ref".
    The removal of next_leaf did sometimes result in slot==nritems when
    the above described case happens, and thus resulting in invalid values
    (e.g. wanted_obejctid) in add_all_parents (leading to missed backrefs
    or even crashes).

    Signed-off-by: Alexander Block <ablock84@googlemail.com>
    Signed-off-by: Jan Schmidt <list.btrfs@jan-o-sch.net>
    Signed-off-by: Chris Mason <chris.mason@fusionio.com>

commit 1c8f52a5e9539600543347bcdefafa1854e07986
Author: Alexander Block <ablock84@googlemail.com>
Date:   Tue Jun 19 07:42:25 2012 -0600

    Btrfs: introduce btrfs_next_old_item

    We introduce btrfs_next_old_item that uses btrfs_next_old_leaf instead
    of btrfs_next_leaf.

    btrfs_next_item is also changed to simply call btrfs_next_old_item with
    time_seq being 0.

    Signed-off-by: Alexander Block <ablock84@googlemail.com>
    Signed-off-by: Chris Mason <chris.mason@fusionio.com>

commit b196a4980ff7bb54db478e2a408dc8b12be15304
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Tue Jun 19 11:33:06 2012 +0200

    drm/edid: don't return stack garbage from supports_rb

    We need to initialize this to false, because the is_rb callback only
    ever sets it to true.

    Noticed while reading through the code.

    Cc: stable@vger.kernel.org
    Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    Reviewed-by: Adam Jackson <ajax@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit d3decf3a0c1d28c80c76be170373f4c7a7217f09
Author: Ozan Çağlayan <ozancag@gmail.com>
Date:   Thu Jun 14 15:02:35 2012 +0300

    vga_switcheroo: Add include guard

    Guard vga_switcheroo.h against multiple inclusion.

    Signed-off-by: Ozan Çağlayan <ozancag@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 7940b2adb474608318e51294d4e9fa0eee1bef61
Merge: 2ce5682 fdec53d
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Jun 20 22:12:52 2012 -0700

    Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma

    Pull slave-dmaengine fixes from Vinod Koul:
     "A few fixes in pl330 and imx-sdma drivers."

    * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
      DMA: PL330: Fix racy mutex unlock
      DMA: PL330: Add missing static storage class specifier
      dma: imx-sdma: buf_tail should be initialize in prepare function
      dmaengine: pl330: dont complete descriptor for cyclic dma

commit 2ce5682947872061148b0e5ed2212e03d0d8bc8b
Merge: c4c0e9e 8e3bbf4
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Jun 20 22:11:04 2012 -0700

    Merge branch 'for-3.5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

    Pull two cgroup fixes from Tejun Heo:
     "This containes two patches fixing a refcnt race bug during css_put().
      Decrementing and checking the value weren't atomic and two tasks could
      think that they both pushed the counter to zero."

    * 'for-3.5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
      cgroups: Account for CSS_DEACT_BIAS in __css_put
      cgroup: make sure that decisions in __css_put are atomic

commit c4c0e9e544a0eb640798cc66e68f394fa4a561bf
Author: David Rientjes <rientjes@google.com>
Date:   Wed Jun 20 18:00:12 2012 -0700

    mm, mempolicy: fix mbind() to do synchronous migration

    If the range passed to mbind() is not allocated on nodes set in the
    nodemask, it migrates the pages to respect the constraint.

    The final formal of migrate_pages() is a mode of type enum migrate_mode,
    not a boolean.  do_mbind() is currently passing "true" which is the
    equivalent of MIGRATE_SYNC_LIGHT.  This should instead be MIGRATE_SYNC
    for synchronous page migration.

    Signed-off-by: David Rientjes <rientjes@google.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 0e3534c0417fef6e6535db8867a04798f2024e3f
Author: Randy Dunlap <rdunlap@xenotime.net>
Date:   Wed Jun 20 18:30:30 2012 -0700

    media: pms.c needs linux/slab.h

    drivers/media/video/pms.c uses kzalloc() and kfree() so it should
    include <linux/slab.h> to fix build errors and a warning.

      drivers/media/video/pms.c:1047:2: error: implicit declaration of function 'kzalloc'
      drivers/media/video/pms.c:1047:6: warning: assignment makes pointer from integer without a cast
      drivers/media/video/pms.c:1116:2: error: implicit declaration of function 'kfree'

    Found in mmotm but applies to mainline.

    Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
    Cc: Hans Verkuil <hverkuil@xs4all.nl>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit bc259adc9b76f625fff0423df3ffb80a03802927
Merge: fe80352 3026b0e
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Jun 20 15:15:03 2012 -0700

    Merge tag 'staging-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

    Pull staging tree fixes from Greg Kroah-Hartman:
     "Here are a number of small fixes for the drivers/staging tree, as well
      as iio and pstore drivers (which came from the staging tree in the
      3.5-rc1 merge).  All of these are tiny, but resolve issues that people
      have been reporting.

      There's also a documentation update to reflect what the iio drivers
      really are doing, which is good to get straightened out.

      Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"

    * tag 'staging-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
      staging: r8712u: Add new USB IDs
      staging: gdm72xx: Release netlink socket properly
      iio: drop wrong reference from Kconfig
      pstore/inode: Make pstore_fill_super() static
      pstore/ram: Should zap persistent zone on unlink
      pstore/ram_core: Factor persistent_ram_zap() out of post_init()
      pstore/ram_core: Do not reset restored zone's position and size
      pstore/ram: Should update old dmesg buffer before reading
      staging:iio:ad7298: Fix linker error due to missing IIO kfifo buffer
      Revert "staging: usbip: bugfix for stack corruption on 64-bit architectures"
      staging: usbip: bugfix for stack corruption on 64-bit architectures
      staging/comedi: fix build for USB not enabled
      staging: omapdrm: fix crash when freeing bad fb
      staging:iio:ad7606: Re-add missing scale attribute
      iio: Fix potential use after free
      staging:iio: remove num_interrupt_lines from documentation
      iio: documentation: Add out_altvoltage and friends

commit fe80352460971de12519bf46ed5ec4235350bcd7
Merge: f8fc0c9 96c9f05
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Jun 20 15:14:28 2012 -0700

    Merge tag 'driver-core-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

    Pull driver core and printk fixes from Greg Kroah-Hartman:
     "Here are some fixes for 3.5-rc4 that resolve the kmsg problems that
      people have reported showing up after the printk and kmsg changes went
      into 3.5-rc1.  There are also a smattering of other tiny fixes for the
      extcon and hyper-v drivers that people have reported.

      Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"

    * tag 'driver-core-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
      extcon: max8997: Add missing kfree for info->edev in max8997_muic_remove()
      extcon: Set platform drvdata in gpio_extcon_probe() and fix irq leak
      extcon: Fix wrong index in max8997_extcon_cable[]
      kmsg - kmsg_dump() fix CONFIG_PRINTK=n compilation
      printk: return -EINVAL if the message len is bigger than the buf size
      printk: use mutex lock to stop syslog_seq from going wild
      kmsg - kmsg_dump() use iterator to receive log buffer content
      vme: change maintainer e-mail address
      Extcon: Don't try to create duplicate link names
      driver core: fixup reversed deferred probe order
      printk: Fix alignment of buf causing crash on ARM EABI
      Tools: hv: verify origin of netlink connector message

commit f8fc0c9a5f7f4f5a3d2e7dd58147e30053cc5dd8
Merge: a1821f7 49fbd3f
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Jun 20 15:13:56 2012 -0700

    Merge tag 'char-misc-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

    Pull misc tree updates from Greg Kroah-Hartman:
     "Here are some drivers/misc bugfixes (really just drivers/misc/mei/
      fixes) for a few problems that have been reported.

      Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"

    * tag 'char-misc-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
      misc: mei: set WDIOF_ALARMONLY on mei watchdog
      misc: mei: Disable MSI when IRQ registration fails
      misc: mei: fix stalled read
      misc: mei: unregister misc device in pci_remove function
      misc: mei: set IRQF_ONESHOT for msi request_threaded_irq

commit a1821f774d4600727edf71005f259a9fdb73981e
Merge: a2a2609 78d80c5
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Jun 20 15:13:13 2012 -0700

    Merge tag 'tty-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

    Pull serial driver fixes from Greg Kroah-Hartman:
     "Here are 3 patches resolving a boot regression (the mop500 fix), a
      build warning fix, and a kernel-doc fix.  All tiny, but should go into
      the final 3.5 release.

      Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"

    * tag 'tty-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
      serial/amba-pl011: move custom pin control to driver
      serial: fix serial_txx9.c build warning/typo
      serial: fix kernel-doc warnings in 8250.c

commit a2a2609c97c1e21996b9d87d10d2c9ff07277524
Merge: a4d7a12 48c3b58
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Jun 20 14:41:57 2012 -0700

    Merge branch 'akpm' (Andrew's patch-bomb)

    * emailed from Andrew Morton <akpm@linux-foundation.org>: (21 patches)
      mm/memblock: fix overlapping allocation when doubling reserved array
      c/r: prctl: Move PR_GET_TID_ADDRESS to a proper place
      pidns: find_new_reaper() can no longer switch to init_pid_ns.child_reaper
      pidns: guarantee that the pidns init will be the last pidns process reaped
      fault-inject: avoid call to random32() if fault injection is disabled
      Viresh has moved
      get_maintainer: Fix --help warning
      mm/memory.c: fix kernel-doc warnings
      mm: fix kernel-doc warnings
      mm: correctly synchronize rss-counters at exit/exec
      mm, thp: print useful information when mmap_sem is unlocked in zap_pmd_range
      h8300: use the declarations provided by <asm/sections.h>
      h8300: fix use of extinct _sbss and _ebss
      xtensa: use the declarations provided by <asm/sections.h>
      xtensa: use "test -e" instead of bashism "test -a"
      xtensa: replace xtensa-specific _f{data,text} by _s{data,text}
      memcg: fix use_hierarchy css_is_ancestor oops regression
      mm, oom: fix and cleanup oom score calculations
      nilfs2: ensure proper cache clearing for gc-inodes
      thp: avoid atomic64_read in pmd_read_atomic for 32bit PAE
      ...

commit 48c3b583bbddad2220ca4c22319ca5d1f78b2090
Author: Greg Pearson <greg.pearson@hp.com>
Date:   Wed Jun 20 12:53:05 2012 -0700

    mm/memblock: fix overlapping allocation when doubling reserved array

    __alloc_memory_core_early() asks memblock for a range of memory then try
    to reserve it.  If the reserved region array lacks space for the new
    range, memblock_double_array() is called to allocate more space for the
    array.  If memblock is used to allocate memory for the new array it can
    end up using a range that overlaps with the range originally allocated in
    __alloc_memory_core_early(), leading to possible data corruption.

    With this patch memblock_double_array() now calls memblock_find_in_range()
    with a narrowed candidate range (in cases where the reserved.regions array
    is being doubled) so any memory allocated will not overlap with the
    original range that was being reserved.  The range is narrowed by passing
    in the starting address and size of the previously allocated range.  Then
    the range above the ending address is searched and if a candidate is not
    found, the range below the starting address is searched.

    Signed-off-by: Greg Pearson <greg.pearson@hp.com>
    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    Acked-by: Tejun Heo <tj@kernel.org>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 5702c5eeab959e86ee2d9b4fe7f2d87e65b25d46
Author: Cyrill Gorcunov <gorcunov@openvz.org>
Date:   Wed Jun 20 12:53:04 2012 -0700

    c/r: prctl: Move PR_GET_TID_ADDRESS to a proper place

    During merging of PR_GET_TID_ADDRESS patch the code has been misplaced (it
    happened to appear under PR_MCE_KILL) in result noone can use this option.

    Fix it by moving code snippet to a proper place.

    Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
    Acked-by: Kees Cook <keescook@chromium.org>
    Cc: Oleg Nesterov <oleg@redhat.com>
    Cc: Pavel Emelyanov <xemul@parallels.com>
    Cc: Andrey Vagin <avagin@openvz.org>
    Cc: Serge Hallyn <serge.hallyn@canonical.com>
    Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 50d75f8daead8a1f850c40a3b6c6575ab19b48cf
Author: Oleg Nesterov <oleg@redhat.com>
Date:   Wed Jun 20 12:53:04 2012 -0700

    pidns: find_new_reaper() can no longer switch to init_pid_ns.child_reaper

    find_new_reaper() changes pid_ns->child_reaper, see add0d4df ("pid_ns:
    zap_pid_ns_processes: fix the ->child_reaper changing").

    The original reason has gone away after the previous patch, ->children
    list must be empty after zap_pid_ns_processes().

    However now we can not switch to init_pid_ns.child_reaper.
    __unhash_process() relies on the "->child_reaper == parent" check, but
    this check does not work if the last exiting task is also the child
    reaper.

    As Eric sugested, we can change __unhash_process() to use the parent's
    pid_ns and remove this code.

    Also, with this change we can move detach_pid(PIDTYPE_PID) back, where it
    was before the previous fix.

    Signed-off-by: Oleg Nesterov <oleg@redhat.com>
    Acked-by: "Eric W. Biederman" <ebiederm@xmission.com>
    Cc: Louis Rilling <louis.rilling@kerlabs.com>
    Cc: Mike Galbraith <efault@gmx.de>
    Acked-by: Pavel Emelyanov <xemul@parallels.com>
    Tested-by: Andrew Wagin <avagin@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 6347e90091041e34bea625370794c92f4ce71228
Author: Eric W. Biederman <ebiederm@xmission.com>
Date:   Wed Jun 20 12:53:03 2012 -0700

    pidns: guarantee that the pidns init will be the last pidns process reaped

    Today we have a twofold bug.  Sometimes release_task on pid == 1 in a pid
    namespace can run before other processes in a pid namespace have had
    release task called.  With the result that pid_ns_release_proc can be
    called before the last proc_flus_task() is done using upid->ns->proc_mnt,
    resulting in the use of a stale pointer.  This same set of circumstances
    can lead to waitpid(...) returning for a processes started with
    clone(CLONE_NEWPID) before the every process in the pid namespace has
    actually exited.

    To fix this modify zap_pid_ns_processess wait until all other processes in
    the pid namespace have exited, even EXIT_DEAD zombies.

    The delay_group_leader and related tests ensure that the thread gruop
    leader will be the last thread of a process group to be reaped, or to
    become EXIT_DEAD and self reap.  With the change to zap_pid_ns_processes
    we get the guarantee that pid == 1 in a pid namespace will be the last
    task that release_task is called on.

    With pid == 1 being the last task to pass through release_task
    pid_ns_release_proc can no longer be called too early nor can wait return
    before all of the EXIT_DEAD tasks in a pid namespace have exited.

    Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
    Signed-off-by: Oleg Nesterov <oleg@redhat.com>
    Cc: Louis Rilling <louis.rilling@kerlabs.com>
    Cc: Mike Galbraith <efault@gmx.de>
    Acked-by: Pavel Emelyanov <xemul@parallels.com>
    Tested-by: Andrew Wagin <avagin@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit f39cdaebb89dc3e6dd4f3e75b6d4e87ef12190af
Author: Anton Blanchard <anton@samba.org>
Date:   Wed Jun 20 12:53:03 2012 -0700

    fault-inject: avoid call to random32() if fault injection is disabled

    After enabling CONFIG_FAILSLAB I noticed random32 in profiles even if slub
    fault injection wasn't enabled at runtime.

    should_fail forces a comparison against random32() even if probability is
    0:

            if (attr->probability <= random32() % 100)
                    return false;

    Add a check up front for probability == 0 and avoid all of the more
    complicated checks.

    Signed-off-by: Anton Blanchard <anton@samba.org>
    Acked-by: Akinobu Mita <akinobu.mita@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 10d8935f46e5028847b179757ecbf9238b13d129
Author: Viresh Kumar <viresh.linux@gmail.com>
Date:   Wed Jun 20 12:53:02 2012 -0700

    Viresh has moved

    viresh.kumar@st.com email-id doesn't exist anymore as I have left the
    company.  Replace ST's id with viresh.linux@gmail.com.

    It also updates .mailmap file to fix address for 'git shortlog'

    Signed-off-by: Viresh Kumar <viresh.linux@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 7dea26813507bfa3d261a81f70494336c3b28293
Author: Joe Perches <joe@perches.com>
Date:   Wed Jun 20 12:53:02 2012 -0700

    get_maintainer: Fix --help warning

    Using --help emits a concatenation error.  Fix it.

    Signed-off-by: Joe Perches <joe@perches.com>
    Reported-by: Paul Bolle <pebolle@tiscali.nl>
    Tested-by: Paul Bolle <pebolle@tiscali.nl>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit eb4546bbbdb160aff084d50511165f385756af18
Author: Randy Dunlap <rdunlap@xenotime.net>
Date:   Wed Jun 20 12:53:02 2012 -0700

    mm/memory.c: fix kernel-doc warnings

    Fix kernel-doc warnings in mm/memory.c:

      Warning(mm/memory.c:1377): No description found for parameter 'start'
      Warning(mm/memory.c:1377): Excess function parameter 'address' description in 'zap_page_range'

    Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit dad7557eb705688040aac134efa5418b66d5ed92
Author: Wanpeng Li <liwp@linux.vnet.ibm.com>
Date:   Wed Jun 20 12:53:01 2012 -0700

    mm: fix kernel-doc warnings

    Fix kernel-doc warnings such as

      Warning(../mm/page_cgroup.c:432): No description found for parameter 'id'
      Warning(../mm/page_cgroup.c:432): Excess function parameter 'mem' description in 'swap_cgroup_record'

    Signed-off-by: Wanpeng Li <liwp@linux.vnet.ibm.com>
    Cc: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 4fe7efdbdfb1c7e7a7f31decfd831c0f31d37091
Author: Konstantin Khlebnikov <khlebnikov@openvz.org>
Date:   Wed Jun 20 12:53:01 2012 -0700

    mm: correctly synchronize rss-counters at exit/exec

    do_exit() and exec_mmap() call sync_mm_rss() before mm_release() does
    put_user(clear_child_tid) which can update task->rss_stat and thus make
    mm->rss_stat inconsistent.  This triggers the "BUG:" printk in check_mm().

    Let's fix this bug in the safest way, and optimize/cleanup this later.

    Reported-by: Markus Trippelsdorf <markus@trippelsdorf.de>
    Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
    Cc: Oleg Nesterov <oleg@redhat.com>
    Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Cc: Hugh Dickins <hughd@google.com>
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit e0897d75f0b22e8c3a7287a48548c5686ef73447
Author: David Rientjes <rientjes@google.com>
Date:   Wed Jun 20 12:53:00 2012 -0700

    mm, thp: print useful information when mmap_sem is unlocked in zap_pmd_range

    Andrea asked for addr, end, vma->vm_start, and vma->vm_end to be emitted
    when !rwsem_is_locked(&tlb->mm->mmap_sem).  Otherwise, debugging the
    underlying issue is more difficult.

    Suggested-by: Andrea Arcangeli <aarcange@redhat.com>
    Signed-off-by: David Rientjes <rientjes@google.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 436814e61f5c526ed123853a9bf63fb2ff4ff94b
Author: Geert Uytterhoeven <geert@linux-m68k.org>
Date:   Wed Jun 20 12:53:00 2012 -0700

    h8300: use the declarations provided by <asm/sections.h>

    Cleanups:
      - Include <asm/sections.h>,
      - Remove the (different) extern declarations,
      - Remove the no longer needed address-of ('&') operators,
      - Remove the superfluous casts, use proper printk formatting instead.

    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit ffb20313c01addc04212577af5f9b1399156a5bd
Author: Geert Uytterhoeven <geert@linux-m68k.org>
Date:   Wed Jun 20 12:53:00 2012 -0700

    h8300: fix use of extinct _sbss and _ebss

    Nowadays it should use __bss_start and __bss_stop

    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit f022d0fa183c4def30ddd74f2baebd72c4254fcf
Author: Geert Uytterhoeven <geert@linux-m68k.org>
Date:   Wed Jun 20 12:52:59 2012 -0700

    xtensa: use the declarations provided by <asm/sections.h>

    Cleanups:
      - Include <asm/sections.h>,
      - Remove the (different) extern declarations,
      - Remove the no longer needed address-of ('&') operators,
      - Use %p to format pointer differences.

    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Cc: Chris Zankel <chris@zankel.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 0eff08b5d1bf4b30f1a549a58c85806748256b18
Author: Geert Uytterhoeven <geert@linux-m68k.org>
Date:   Wed Jun 20 12:52:59 2012 -0700

    xtensa: use "test -e" instead of bashism "test -a"

    On Ubuntu, /bin/sh is a symlink to dash, which does not support "test -a".
    This causes messages like

        test: 1: -a: unexpected operator
        test: 1: -a: unexpected operator

    and link failures like

        (.init.text+0x132): undefined reference to `platform_init'

    due to the appropriate platform code not being compiled.

    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Cc: Chris Zankel <chris@zankel.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 5e7b6ed8e9bf3c8e3bb579fd0aec64f6526f8c81
Author: Geert Uytterhoeven <geert@linux-m68k.org>
Date:   Wed Jun 20 12:52:58 2012 -0700

    xtensa: replace xtensa-specific _f{data,text} by _s{data,text}

    commit a2d063ac216c161 ("extable, core_kernel_data(): Make sure all archs
    define _sdata") missed xtensa.  Xtensa does have a start of data marker,
    but calls it _fdata, causing

        kernel/built-in.o:(.text+0x964): undefined reference to `_sdata'

    _stext was already defined, but it was duplicated by _fdata.

    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Cc: Steven Rostedt <rostedt@goodmis.org>
    Cc: Chris Zankel <chris@zankel.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 3a981f482cc29f7d0aeab509e51ea15519a6e961
Author: Hugh Dickins <hughd@google.com>
Date:   Wed Jun 20 12:52:58 2012 -0700

    memcg: fix use_hierarchy css_is_ancestor oops regression

    If use_hierarchy is set, reclaim testing soon oopses in css_is_ancestor()
    called from __mem_cgroup_same_or_subtree() called from page_referenced():
    when processes are exiting, it's easy for mm_match_cgroup() to pass along
    a NULL memcg coming from a NULL mm->owner.

    Check for that in __mem_cgroup_same_or_subtree().  Return true or false?
    False because we cannot know if it was in the hierarchy, but also false
    because it's better not to count a reference from an exiting process.

    Signed-off-by: Hugh Dickins <hughd@google.com>
    Acked-by: Johannes Weiner <hannes@cmpxchg.org>
    Acked-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
    Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Acked-by: Michal Hocko <mhocko@suse.cz>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 61eafb00d55dfbccdfce543c6b60e369ff4f8f18
Author: David Rientjes <rientjes@google.com>
Date:   Wed Jun 20 12:52:58 2012 -0700

    mm, oom: fix and cleanup oom score calculations

    The divide in p->signal->oom_score_adj * totalpages / 1000 within
    oom_badness() was causing an overflow of the signed long data type.

    This adds both the root bias and p->signal->oom_score_adj before doing the
    normalization which fixes the issue and also cleans up the calculation.

    Tested-by: Dave Jones <davej@redhat.com>
    Signed-off-by: David Rientjes <rientjes@google.com>
    Cc: KOSAKI Motohiro <kosaki.motohiro@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit fbb24a3a915f105016f1c828476be11aceac8504
Author: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Date:   Wed Jun 20 12:52:57 2012 -0700

    nilfs2: ensure proper cache clearing for gc-inodes

    A gc-inode is a pseudo inode used to buffer the blocks to be moved by
    garbage collection.

    Block caches of gc-inodes must be cleared every time a garbage collection
    function (nilfs_clean_segments) completes.  Otherwise, stale blocks
    buffered in the caches may be wrongly reused in successive calls of the GC
    function.

    For user files, this is not a problem because their gc-inodes are
    distinguished by a checkpoint number as well as an inode number.  They
    never buffer different blocks if either an inode number, a checkpoint
    number, or a block offset differs.

    However, gc-inodes of sufile, cpfile and DAT file can store different data
    for the same block offset.  Thus, the nilfs_clean_segments function can
    move incorrect block for these meta-data files if an old block is cached.
    I found this is really causing meta-data corruption in nilfs.

    This fixes the issue by ensuring cache clear of gc-inodes and resolves
    reported GC problems including checkpoint file corruption, b-tree
    corruption, and the following warning during GC.

      nilfs_palloc_freev: entry number 307234 already freed.
      ...

    Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
    Tested-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
    Cc: <stable@vger.kernel.org>	[2.6.37+]
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit e4eed03fd06578571c01d4f1478c874bb432c815
Author: Andrea Arcangeli <aarcange@redhat.com>
Date:   Wed Jun 20 12:52:57 2012 -0700

    thp: avoid atomic64_read in pmd_read_atomic for 32bit PAE

    In the x86 32bit PAE CONFIG_TRANSPARENT_HUGEPAGE=y case while holding the
    mmap_sem for reading, cmpxchg8b cannot be used to read pmd contents under
    Xen.

    So instead of dealing only with "consistent" pmdvals in
    pmd_none_or_trans_huge_or_clear_bad() (which would be conceptually
    simpler) we let pmd_none_or_trans_huge_or_clear_bad() deal with pmdvals
    where the low 32bit and high 32bit could be inconsistent (to avoid having
    to use cmpxchg8b).

    The only guarantee we get from pmd_read_atomic is that if the low part of
    the pmd was found null, the high part will be null too (so the pmd will be
    considered unstable).  And if the low part of the pmd is found "stable"
    later, then it means the whole pmd was read atomically (because after a
    pmd is stable, neither MADV_DONTNEED nor page faults can alter it anymore,
    and we read the high part after the low part).

    In the 32bit PAE x86 case, it is enough to read the low part of the pmdval
    atomically to declare the pmd as "stable" and that's true for THP and no
    THP, furthermore in the THP case we also have a barrier() that will
    prevent any inconsistent pmdvals to be cached by a later re-read of the
    *pmd.

    Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
    Cc: Jonathan Nieder <jrnieder@gmail.com>
    Cc: Ulrich Obergfell <uobergfe@redhat.com>
    Cc: Mel Gorman <mgorman@suse.de>
    Cc: Hugh Dickins <hughd@google.com>
    Cc: Larry Woodman <lwoodman@redhat.com>
    Cc: Petr Matousek <pmatouse@redhat.com>
    Cc: Rik van Riel <riel@redhat.com>
    Cc: Jan Beulich <jbeulich@suse.com>
    Cc: KOSAKI Motohiro <kosaki.motohiro@gmail.com>
    Tested-by: Andrew Jones <drjones@redhat.com>
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit abca7c4965845924f65d40e0aa1092bdd895e314
Author: Pravin B Shelar <pshelar@nicira.com>
Date:   Wed Jun 20 12:52:56 2012 -0700

    mm: fix slab->page _count corruption when using slub

    On arches that do not support this_cpu_cmpxchg_double() slab_lock is used
    to do atomic cmpxchg() on double word which contains page->_count.  The
    page count can be changed from get_page() or put_page() without taking
    slab_lock.  That corrupts page counter.

    Fix it by moving page->_count out of cmpxchg_double data.  So that slub
    does no change it while updating slub meta-data in struct page.

    [akpm@linux-foundation.org: use standard comment layout, tweak comment text]
    Reported-by: Amey Bhide <abhide@nicira.com>
    Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
    Acked-by: Christoph Lameter <cl@linux.com>
    Cc: Pekka Enberg <penberg@cs.helsinki.fi>
    Cc: Andrea Arcangeli <aarcange@redhat.com>
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 3b876c8f2a361ceeed3fed894980c69066f903a0
Author: Jeff Liu <jeff.liu@oracle.com>
Date:   Thu Jun 7 15:44:32 2012 +0800

    xfs: fix debug_object WARN at xfs_alloc_vextent()

    Fengguang reports:

    [  780.529603] XFS (vdd): Ending clean mount
    [  781.454590] ODEBUG: object is on stack, but not annotated
    [  781.455433] ------------[ cut here ]------------
    [  781.455433] WARNING: at /c/kernel-tests/sound/lib/debugobjects.c:301 __debug_object_init+0x173/0x1f1()
    [  781.455433] Hardware name: Bochs
    [  781.455433] Modules linked in:
    [  781.455433] Pid: 26910, comm: kworker/0:2 Not tainted 3.4.0+ #51
    [  781.455433] Call Trace:
    [  781.455433]  [<ffffffff8106bc84>] warn_slowpath_common+0x83/0x9b
    [  781.455433]  [<ffffffff8106bcb6>] warn_slowpath_null+0x1a/0x1c
    [  781.455433]  [<ffffffff814919a5>] __debug_object_init+0x173/0x1f1
    [  781.455433]  [<ffffffff81491c65>] debug_object_init+0x14/0x16
    [  781.455433]  [<ffffffff8108842a>] __init_work+0x20/0x22
    [  781.455433]  [<ffffffff8134ea56>] xfs_alloc_vextent+0x6c/0xd5

    Use INIT_WORK_ONSTACK in xfs_alloc_vextent instead of INIT_WORK.

    Reported-by: Wu Fengguang <wfg@linux.intel.com>
    Signed-off-by: Jie Liu <jeff.liu@oracle.com>
    Signed-off-by: Ben Myers <bpm@sgi.com>

commit 66f9311381b4772003d595fb6c518f1647450db0
Author: Alain Renaud <arenaud@sgi.com>
Date:   Fri Jun 8 15:34:46 2012 -0400

    xfs: xfs_vm_writepage clear iomap_valid when !buffer_uptodate (REV2)

    On filesytems with a block size smaller than PAGE_SIZE we currently have
    a problem with unwritten extents.  If a we have multi-block page for
    which an unwritten extent has been allocated, and only some of the
    buffers have been written to, and they are not contiguous, we can expose
    stale data from disk in the blocks between the writes after extent
    conversion.

    Example of a page with unwritten and real data.
    buffer  content
    0       empty  b_state = 0
    1       DATA   b_state = 0x1023 Uptodate,Dirty,Mapped,Unwritten
    2       DATA   b_state = 0x1023 Uptodate,Dirty,Mapped,Unwritten
    3       empty  b_state = 0
    4       empty  b_state = 0
    5       DATA   b_state = 0x1023 Uptodate,Dirty,Mapped,Unwritten
    6       DATA   b_state = 0x1023 Uptodate,Dirty,Mapped,Unwritten
    7       empty  b_state = 0

    Buffers 1, 2, 5, and 6 have been written to, leaving 0, 3, 4, and 7
    empty.  Currently buffers 1, 2, 5, and 6 are added to a single ioend,
    and when IO has completed, extent conversion creates a real extent from
    block 1 through block 6, leaving 0 and 7 unwritten.  However buffers 3
    and 4 were not written to disk, so stale data is exposed from those
    blocks on a subsequent read.

    Fix this by setting iomap_valid = 0 when we find a buffer that is not
    Uptodate.  This ensures that buffers 5 and 6 are not added to the same
    ioend as buffers 1 and 2.  Later these blocks will be converted into two
    separate real extents, leaving the blocks in between unwritten.

    Signed-off-by: Alain Renaud <arenaud@sgi.com>
    Reviewed-by: Dave Chinner <dchinner@redhat.com>
    Signed-off-by: Ben Myers <bpm@sgi.com>

commit b7019b2f31fe7bec9f6f5dc1bf54cb0e0d73e047
Author: Alex Deucher <alexander.deucher@amd.com>
Date:   Thu Jun 14 15:58:25 2012 -0400

    drm/radeon: SI tiling fixes for display

    - Use the correct union for getting the tiling info
    - Properly init the PIPE_CONFIG field for SI

    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit b1027439dff844675f6c0df97a1b1d190791a699
Author: Bryan Schumaker <bjschuma@netapp.com>
Date:   Wed Jun 20 14:35:28 2012 -0400

    NFS: Force the legacy idmapper to be single threaded

    It was initially coded under the assumption that there would only be one
    request at a time, so use a lock to enforce this requirement..

    Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
    CC: stable@vger.kernel.org [3.4+]
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit a4d7a122385e27bdd91101635c704327d7c0d87f
Merge: 61fcbc8 10aa5a3
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Jun 20 09:42:09 2012 -0700

    Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm

    Pull ARM fixes from Russell King:
     "This includes three MMCI changes - one to fix up the wrong version of
      the DT support patch which was merged, and two to make deferred
      probing work.  It also includes a fix to the OMAP SPI driver which is
      causing a boot time warning.

      The remainder are very minor ARM fixes."

    * 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
      SPI: fix over-eager devm_xxx() conversion
      ARM: 7427/1: mmc: mmci: Defer probe() in case of yet uninitialized GPIOs
      ARM: 7426/1: mmc: mmci: Remove wrong error handling of gpio 0
      ARM: 7425/1: extable: ensure fixup entries are 4-byte aligned
      ARM: 7421/1: bpf_jit: BPF_S_ANC_ALU_XOR_X support
      ARM: 7423/1: kprobes: run t32_simulate_ldr_literal() without insn slot
      ARM: 7422/1: mmc: mmci: Allocate platform memory during Device Tree boot

commit 61fcbc8dfe40d6fb5e59ab31dfcef67d6019f1a5
Merge: f40759e daf7317
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Jun 20 09:41:21 2012 -0700

    Merge tag 'pinctrl-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl

    Pull two pinctrl fixes from Linus Walleij:
     - Fixed a 2-line compile error for MXS
     - A pure documentation fix for Nomadik

    * tag 'pinctrl-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
      pinctrl/nomadik: document Alt-C glitch
      pinctrl: mxs: Use kfree to fix build error

commit aef2b89662b8a7506846d0dc0df672d196ddf8d0
Author: Russ Dill <Russ.Dill@ti.com>
Date:   Wed May 9 15:15:03 2012 -0700

    ARM: OMAP: Fix Beagleboard DVI reset gpio

    Commit e813a55eb9c9bc6c8039fb16332cf43402125b30 ("OMAP: board-files:
    remove custom PD GPIO handling for DVI output") moved TFP410 chip's
    powerdown-gpio handling from the board files to the tfp410 driver. One
    gpio_request_one(powerdown-gpio, ...) was mistakenly left unremoved in
    the Beagle board file. This causes the tfp410 driver to fail to request
    the gpio on Beagle, causing the driver to fail and thus the DVI output
    doesn't work.

    This patch removes several boot errors from board-omap3beagle.c:

     - gpio_request: gpio--22 (DVI reset) status -22
     - Unable to get DVI reset GPIO

    There is a combination of leftover code and revision confusion.
    Additionally, xM support is currently a hack.

    For original Beagleboard this removes the double initialization of GPIO
    170, properly configures it as an output, and wraps the initialization
    in an if block so that xM does not attempt to request it.

    For Beagleboard xM it removes reference to GPIO 129 which was part
    of rev A1 and A2 designs, but never functioned. It then properly assigns
    beagle_dvi_device.reset_gpio in beagle_twl_gpio_setup and removes the
    hack of initializing it high. Additionally, it uses
    gpio_set_value_cansleep since this GPIO is connected through i2c.

    Unfortunately, there is no way to tell the difference between xM A2 and
    A3. However, GPIO 129 does not function on rev A1 and A2, and the TWL
    GPIO used on A3 and beyond is not used on rev A1 and A2, there are no
    problems created by this fix.

    Tested on Beagleboard-xM Rev C1 and Beagleboard Rev B4.

    Signed-off-by: Russ Dill <Russ.Dill@ti.com>
    Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
    Signed-off-by: Tony Lindgren <tony@atomide.com>

commit 95dca12d6bf2dd5e7720506b8f9786318899b8d6
Author: Jon Hunter <jon-hunter@ti.com>
Date:   Tue Jun 12 19:40:46 2012 -0500

    arm/dts: OMAP2: Fix interrupt controller binding

    When booting with device-tree on an OMAP2420H4, the kernel is hanging when
    initialising the interrupts and following kernel dumps is seen ...

    [    0.000000] ------------[ cut here ]------------
    [    0.000000] WARNING: at arch/arm/mach-omap2/irq.c:271 omap_intc_of_init+0x50/0xb4()
    [    0.000000] unable to get intc registers
    [    0.000000] Modules linked in:
    [    0.000000] [<c001befc>] (unwind_backtrace+0x0/0xf4) from [<c0040c34>] (warn_slowpath_common+0x4c/0x64)
    [    0.000000] [<c0040c34>] (warn_slowpath_common+0x4c/0x64) from [<c0040ce0>] (warn_slowpath_fmt+0x30/0x40)
    [    0.000000] [<c0040ce0>] (warn_slowpath_fmt+0x30/0x40) from [<c066b8a4>] (omap_intc_of_init+0x50/0xb4)
    [    0.000000] [<c066b8a4>] (omap_intc_of_init+0x50/0xb4) from [<c0688b70>] (of_irq_init+0x144/0x288)
    [    0.000000] [<c0688b70>] (of_irq_init+0x144/0x288) from [<c0663294>] (init_IRQ+0x14/0x1c)
    [    0.000000] [<c0663294>] (init_IRQ+0x14/0x1c) from [<c06607fc>] (start_kernel+0x198/0x304)
    [    0.000000] [<c06607fc>] (start_kernel+0x198/0x304) from [<80008044>] (0x80008044)
    [    0.000000] ---[ end trace 1b75b31a2719ed1c ]---
    [    0.000000] of_irq_init: children remain, but no parents

    The OMAP2 interrupt controller binding is missing the number of interrupts and
    interrupt controller register address. Adding these fixes the problem.

    Signed-off-by: Jon Hunter <jon-hunter@ti.com>
    Signed-off-by: Tony Lindgren <tony@atomide.com>

commit 3d09b33fecf204561e5c7126648ec05c756c631c
Author: Tony Lindgren <tony@atomide.com>
Date:   Wed Jun 20 07:18:15 2012 -0700

    ARM: OMAP2: Fix tusb6010 GPIO interrupt for n8x0

    Here's one more gpio_to_irq conversion that we missed
    earlier. Tested with n800 in gadget mode using USB_ETH.

    Cc: Felipe Balbi <balbi@ti.com>
    Signed-off-by: Tony Lindgren <tony@atomide.com>

commit 310018d52ec06c19dc946c2807c07c8b70e2d1a6
Author: Tony Lindgren <tony@atomide.com>
Date:   Wed Jun 20 07:18:15 2012 -0700

    ARM: OMAP2+: Fix MUSB ifdefs for platform init code

    Commit 62285963 (usb: musb: drop a gigantic amount of ifdeferry)
    got rid of a bunch of ifdefs in the MUSB code. Looks like the
    platform init code is still using these dropped defines though,
    which in many cases results the board defaulting always to host
    mode.

    Currently the situation is that USB_MUSB_HDRC is the main
    Kconfig option with additional USB_GADGET_MUSB_HDRC so only
    these two should be used to select between host and OTG mode.

    Fix the situation for omaps. The following users should fix the
    platform init code in a similar way:

    Dropped Kconfig option          Current users

    USB_MUSB_OTG                    blackfin, davinci, not in Kconfigs
    USB_MUSB_PERIPHERAL             davinci, not in Kconfigs
    USB_MUSB_HOST                   davinci, not in Kconfigs
    USB_MUSB_HDRC_HCD               blackfin, not in Kconfigs
    USB_MUSB_OTG                    blackfin, not in Kconfigs

    Cc: Mike Frysinger <vapier@gentoo.org>
    Cc: Sekhar Nori <nsekhar@ti.com>
    Cc: linux-usb@vger.kernel.org
    Cc: Felipe Balbi <balbi@ti.com>
    Signed-off-by: Tony Lindgren <tony@atomide.com>

commit 642c0dbde32f34baa7886e988a067089992adc8f
Author: Sage Weil <sage@inktank.com>
Date:   Sun Jun 10 20:43:56 2012 -0700

    libceph: flush msgr queue during mon_client shutdown

    We need to flush the msgr workqueue during mon_client shutdown to
    ensure that any work affecting our embedded ceph_connection is
    finished so that we can be safely destroyed.

    Previously, we were flushing the work queue after osd_client
    shutdown and before mon_client shutdown to ensure that any osd
    connection refs to authorizers are flushed.  Remove the redundant
    flush, and document in the comment that the mon_client flush is
    needed to cover that case as well.

    Signed-off-by: Sage Weil <sage@inktank.com>
    Reviewed-by: Alex Elder <elder@inktank.com>
    (cherry picked from commit f3dea7edd3d449fe7a6d402c1ce56a294b985261)

commit b132cf4c733f91bb4dd2277ea049243cf16e8b66
Author: Yan, Zheng <zheng.z.yan@intel.com>
Date:   Wed Jun 6 19:35:55 2012 -0500

    rbd: Clear ceph_msg->bio_iter for retransmitted message

    The bug can cause NULL pointer dereference in write_partial_msg_pages

    Signed-off-by: Zheng Yan <zheng.z.yan@intel.com>
    Reviewed-by: Alex Elder <elder@inktank.com>
    (cherry picked from commit 43643528cce60ca184fe8197efa8e8da7c89a037)

commit 88ed6ea0b295f8e2383d599a04027ec596cdf97b
Author: Sage Weil <sage@inktank.com>
Date:   Thu May 31 20:22:18 2012 -0700

    libceph: use con get/put ops from osd_client

    There were a few direct calls to ceph_con_{get,put}() instead of the con
    ops from osd_client.c.  This is a bug since those ops aren't defined to
    be ceph_con_get/put.

    This breaks refcounting on the ceph_osd structs that contain the
    ceph_connections, and could lead to all manner of strangeness.

    The purpose of the ->get and ->put methods in a ceph connection are
    to allow the connection to indicate it has a reference to something
    external to the messaging system, *not* to indicate something
    external has a reference to the connection.

    [elder@inktank.com: added that last sentence]

    Signed-off-by: Sage Weil <sage@newdream.net>
    Reviewed-by: Alex Elder <elder@inktank.com>
    (cherry picked from commit 0d47766f14211a73eaf54cab234db134ece79f49)

commit 680584fab05efff732b5ae16ad601ba994d7b505
Author: Alex Elder <elder@inktank.com>
Date:   Mon Jun 4 14:43:32 2012 -0500

    libceph: osd_client: don't drop reply reference too early

    In ceph_osdc_release_request(), a reference to the r_reply message
    is dropped.  But just after that, that same message is revoked if it
    was in use to receive an incoming reply.  Reorder these so we are
    sure we hold a reference until we're actually done with the message.

    Signed-off-by: Alex Elder <elder@inktank.com>
    Reviewed-by: Sage Weil <sage@inktank.com>
    (cherry picked from commit ab8cb34a4b2f60281a4b18b1f1ad23bc2313d91b)

commit 61600ef8483924039dcdec8b4717ca32bd3353c6
Author: Yan, Zheng <zheng.z.yan@intel.com>
Date:   Mon May 28 14:44:30 2012 +0800

    ceph: check PG_Private flag before accessing page->private

    I got lots of NULL pointer dereference Oops when compiling kernel on ceph.
    The bug is because the kernel page migration routine replaces some pages
    in the page cache with new pages, these new pages' private can be non-zero.

    Signed-off-by: Zheng Yan <zheng.z.yan@intel.com>
    Signed-off-by: Sage Weil <sage@inktank.com>
    (cherry picked from commit 28c0254ede13ab575d2df5c6585ed3d4817c3e6b)

commit 6921a575c9f26f7ea274aaea3b78967810ce5513
Merge: 9c5da09 93b3cca
Author: Ingo Molnar <mingo@kernel.org>
Date:   Wed Jun 20 14:26:58 2012 +0200

    Merge branch 'tip/perf/urgent-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/urgent

commit f40759e7041498577235192727322186b43aa216
Merge: 2fe8ac6 0b1d8e0
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Jun 19 23:37:19 2012 -0700

    Merge tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

    Pull sound fixes from Takashi Iwai:
     "Most of changes are fairly small and driver-specific.

      A remaining regression fix for USB-audio sync pipe check, a fix for
      HD-audio power-up sequence, fixes for ASoC pxa-ssp compile issues, and
      bunch of ASoC codec and trivial fix patches."

    * tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
      ALSA: 6fire: use NULL instead of 0 for pointer assignment
      ALSA: hda - Handle open while transitioning to D3.
      ALSA: snd-usb: make snd_usb_substream_capture_trigger static
      ALSA: snd-usb: fix sync pipe check
      ASoC: tegra+wm8903: turn of mic detect when card is removed
      ASoC: wm8996: Mark the CODEC as cache only when powering off on boot
      ASoC: wm8996: Move reset before the initial regulator disable
      ASoC: wm8996: Remove spurious regulator_bulk_free()
      ASoC: wm8904: Fix cache only management
      ASoC: wm8904: Fix GPIO and MICBIAS initialisation for regmap conversion
      ASoC: fix pxa-ssp compiling issue under mach-mmp
      ARM: MMP: add pxa910-ssp into ssp_id_table

commit 4dd81e895655c59bd19d7a8f03a5de1310f4aeb6
Author: Sean Hefty <sean.hefty@intel.com>
Date:   Thu Jun 14 20:49:09 2012 +0000

    RDMA/cma: QP type check on received REQs should be AND not OR

    Change || check to the intended && when checking the QP type in a
    received connection request against the listening endpoint.

    Signed-off-by: Sean Hefty <sean.hefty@intel.com>
    Signed-off-by: Roland Dreier <roland@purestorage.com>

commit 1a0de48ae56b5cdb9a46b3d3a0b578dd7f787f22
Author: Trond Myklebust <Trond.Myklebust@netapp.com>
Date:   Tue Jun 19 18:38:56 2012 -0400

    NFS: Initialise commit_info.rpc_out when !defined(CONFIG_NFS_V4)

    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Cc: Fred Isaman <iisaman@netapp.com>

commit 5a695da26367f53a368c90435e0b883c12f02791
Author: Trond Myklebust <Trond.Myklebust@netapp.com>
Date:   Tue Jun 19 13:39:14 2012 -0400

    NFS: Fix a refcounting issue in O_DIRECT

    In nfs_direct_write_reschedule(), the requests from nfs_scan_commit_list
    have a refcount of 2, whereas the operations in
    nfs_direct_write_completion_ops expect them to have a refcount of 1.

    This patch adds a call to release the extra references.

    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Cc: Fred Isaman <iisaman@netapp.com>

commit 2fe8ac608bf1a9c947f03f5d8cbf25c91b4f1a7c
Merge: 02edf6a ea851f4
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Jun 19 12:35:44 2012 -0700

    Merge tag 'regulator-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

    Pull regulator fixes from Mark Brown:
     "One small bug fix, plus a rename of all the ST Ericsson regulators in
      the device tree since all the device trees had been written with
      different names and some infelicities in the test proceedures meant
      that the device tree code had apparently never actually been run
      against the upstream device tree."

    * tag 'regulator-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
      regulator: Change db8500-prcmu match names to reflect Device Tree
      regulator: Change ab8500 match names to reflect Device Tree
      regulator: Fix the s5m8767a problem of the division by null

commit 0a9c63fae7df086ff5e107273c3cce8642430974
Author: Trond Myklebust <Trond.Myklebust@netapp.com>
Date:   Fri Jun 15 13:02:58 2012 -0400

    NFSv4.1: Fix a race in set_pnfs_layoutdriver

    The call to try_module_get() dereferences ld_type outside the
    spin locks, which means that it may be pointing to garbage if
    a module unload was in progress.

    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit 081f323bd3cc3a4d5ee6276e53cc52eddfc20a63
Author: Paul Mackerras <paulus@samba.org>
Date:   Fri Jun 1 20:20:24 2012 +1000

    KVM: PPC: Book3S HV: Drop locks around call to kvmppc_pin_guest_page

    At the moment we call kvmppc_pin_guest_page() in kvmppc_update_vpa()
    with two spinlocks held: the vcore lock and the vcpu->vpa_update_lock.
    This is not good, since kvmppc_pin_guest_page() calls down_read() and
    get_user_pages_fast(), both of which can sleep.  This bug was introduced
    in 2e25aa5f ("KVM: PPC: Book3S HV: Make virtual processor area
    registration more robust").

    This arranges to drop those spinlocks before calling
    kvmppc_pin_guest_page() and re-take them afterwards.  Dropping the
    vcore lock in kvmppc_run_core() means we have to set the vcore_state
    field to VCORE_RUNNING before we drop the lock, so that other vcpus
    won't try to run this vcore.

    Signed-off-by: Paul Mackerras <paulus@samba.org>
    Acked-by: Alexander Graf <agraf@suse.de>
    Signed-off-by: Avi Kivity <avi@redhat.com>

commit 6355f25ed965421725d92cf719fc63008690ca1c
Author: Stephen Warren <swarren@nvidia.com>
Date:   Mon Jun 18 15:01:50 2012 -0600

    ARM: tegra: make tegra_cpu_reset_handler_enable() __init

    This solves a section mismatch warning. I hadn't noticed this before,
    because my compiler was inlining tegra_cpu_reset_handler_enable() inside
    tegra_cpu_reset_handler_init(), which is already __init, but I switched
    compilers and it stopped doing that.

    Cc: <stable@kernel.org> # v3.4
    Signed-off-by: Stephen Warren <swarren@nvidia.com>
    Signed-off-by: Olof Johansson <olof@lixom.net>

commit 96c9f05b39a5a3239cf0588cc86a1b95cac652c4
Author: Axel Lin <axel.lin@gmail.com>
Date:   Sat Jun 16 21:25:11 2012 +0800

    extcon: max8997: Add missing kfree for info->edev in max8997_muic_remove()

    extcon_dev_unregister(info->edev) doest not free info->edev, we need to call
    kfree(info->edev) here.

    Signed-off-by: Axel Lin <axel.lin@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 3f1dc550b069e9fbfe375844f3c76f2cdd12f05c
Author: Axel Lin <axel.lin@gmail.com>
Date:   Sat Jun 16 11:55:18 2012 +0800

    extcon: Set platform drvdata in gpio_extcon_probe() and fix irq leak

    Add missing platform_set_drvdata() in gpio_extcon_probe(), otherwise calling
    platform_get_drvdata in gpio_extcon_remove() returns NULL.

    Also add missing free_irq call in gpio_extcon_remove().

    Signed-off-by: Axel Lin <axel.lin@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 155cb06c89f13af3e3e6bd520b9c62762f532d7b
Author: Axel Lin <axel.lin@gmail.com>
Date:   Sat Jun 16 11:36:08 2012 +0800

    extcon: Fix wrong index in max8997_extcon_cable[]

    Currently, the index of "Dock-desk" and "Dock-card" are the same.
    Thus the latter one overrides the first one.
    Then we have problem when calling extcon_find_cable_index() because
    edev->supported_cable[7] only matches "Dock-card".

    Signed-off-by: Axel Lin <axel.lin@gmail.com>
    Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 246f6f2ff2c5cf46ded6d06f11f63e38bad880d1
Author: Kay Sievers <kay@vrfy.org>
Date:   Tue Jun 19 00:32:57 2012 +0200

    kmsg - kmsg_dump() fix CONFIG_PRINTK=n compilation

    Signed-off-by: Kay Sievers <kay@vrfy.org>
    Cc: Stephen Rothwell <sfr@canb.auug.org.au>
    Reported-by: Randy Dunlap <rdunlap@xenotime.net>
    Reported-by: Fengguang Wu <wfg@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 8e3bbf42c6d73881956863cc3305456afe2bc4ea
Author: Salman Qazi <sqazi@google.com>
Date:   Thu Jun 14 14:55:30 2012 -0700

    cgroups: Account for CSS_DEACT_BIAS in __css_put

    When we fixed the race between atomic_dec and css_refcnt, we missed
    the fact that css_refcnt internally subtracts CSS_DEACT_BIAS to get
    the actual reference count.  This can potentially cause a refcount leak
    if __css_put races with cgroup_clear_css_refs.

    Signed-off-by: Salman Qazi <sqazi@google.com>
    Acked-by: Li Zefan <lizefan@huawei.com>
    Signed-off-by: Tejun Heo <tj@kernel.org>

commit 02edf6abe01610a5fb379df442de3c837ad99467
Merge: 67f5d06 8447c4d
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Jun 18 13:34:25 2012 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac

    Pull EDAC fixes from Mauro Carvalho Chehab.

    * git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac:
      edac: Do alignment logic properly in edac_align_ptr()
      mpc85xx_edac: fix error: too few arguments to function 'edac_mc_alloc'
      edac: fix the error about memory type detection on SandyBridge
      edac: avoid mce decoding crash after edac driver unloaded

commit 67f5d06d732f591449a48242d40928f59d39287d
Merge: 48d4e13 5fcb08b
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Jun 18 12:21:25 2012 -0700

    Merge branch 'v9fs-devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs

    Pull a 9p bugfix from Eric Van Hensbergen.

    * 'v9fs-devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
      9p: BUG before corrupting memory

commit 48d4e137ea3174dc77efe1cc20570e95af2ffc9e
Merge: 9023a40 c475c06
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Jun 18 12:20:36 2012 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

    Pull a crypto fix from Herbert Xu:
     "This push fixes another bug in the atmel-rng that made it produce
      completely useless output."

    * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
      hwrng: atmel-rng - fix data valid check

commit 9023a4093d6594040fb8142cdd2615d3461caa7a
Merge: 1bea57f a3e545e
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Jun 18 11:53:34 2012 -0700

    Merge tag 'mmc-fixes-for-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc

    Pull MMC fixes from Chris Ball:
     - atmel-mci: Fixes for NULL timer and DMA burst/chunk size
     - dw_mmc: Fix DMA ordering, clkdiv calculation, NULL host->data
     - mxs_mmc: Compile fix for CONFIG_OF=y && CONFIG_PM=n
     - omap: Fix NULL deref in mmc_omap_remove_slot(), reg_shift initialization
     - sdhci-s3c: Fix boot regression by adding IRQF_ONESHOT flag
     - Small fixes to core/sd, core/sdio, sdhci

    * tag 'mmc-fixes-for-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
      mmc: mxs-mmc: Move of_match_table out of CONFIG_PM
      mmc: sdhci-s3c: pass IRQF ONESHOT to request threaded irq
      mmc: core: return an error on suspend if mmc_deselect_cards fails
      mmc: omap: Fix broken reg_shift initialization
      mmc: omap: Fix NULL pointer dereference if mmc_omap_new_slot() fails
      mmc: omap: Fix a section warning regression
      mmc: dw_mmc: correct the calculation for CLKDIV
      mmc: dw_mmc: fix incorrect setting of host->data of NULL
      mmc: dw_mmc: fix the IDMAC sw reset
      mmc: dw_mmc: fix the transmission handling in IDMAC
      mmc: sdio: fix setting card data bus width as 4-bit
      mmc: atmel-mci: fix burst/chunk size modification
      mmc: atmel-mci: fix data timeout issue
      mmc: sdhci: Use DBG() instead of pr_warning() on large timeout

commit 1bea57f5f38809e2d3e0fe58ab01362c05232777
Merge: 4005af6 6b03976
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Jun 18 11:52:25 2012 -0700

    Merge tag 'rproc-fixes-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc

    Pull remoteproc fixes from Ohad Ben-Cohen:
     "A few relatively-small remoteproc fixes for 3.5: two error path fixes,
      and one -Wformat warning fix."

    * tag 'rproc-fixes-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc:
      remoteproc/omap: fix dev_err typo
      remoteproc: fix missing fault indication in error-path
      remoteproc: fix print format warnings

commit 4005af65c918a57a03bb87ede13217a959fffc11
Merge: 2603efa 1268a17
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Jun 18 11:51:10 2012 -0700

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

    Pull hwmon subsystem fixes from Jean Delvare.

    * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
      hwmon: (coretemp) Drop needless initialization
      hwmon: (coretemp) Document TjMax for 3rd generation i5/i7 processors
      hwmon: (coretemp) Improve support for TjMax detection on Atom CPUs
      hwmon: (coretemp) Add support for Atom D2000 and N2000 series CPU models
      hwmon: (coretemp) Improve support of recent Atom CPU models

commit 2603efa31a0377eeaa06723bded8a1d644dd4901
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Mon Jun 18 13:54:17 2012 +0900

    bug.h: Fix up powerpc build regression.

    The asm-generic/bug.h __ASSEMBLY__ guarding is completely bogus, which
    tripped up the powerpc build when the kernel.h include was added:

    	In file included from include/asm-generic/bug.h:5:0,
    			 from arch/powerpc/include/asm/bug.h:127,
    			 from arch/powerpc/kernel/head_64.S:31:
    	include/linux/kernel.h:44:0: warning: "ALIGN" redefined [enabled by default]
    	include/linux/linkage.h:57:0: note: this is the location of the previous definition
    	include/linux/sysinfo.h: Assembler messages:
    	include/linux/sysinfo.h:7: Error: Unrecognized opcode: `struct'
    	include/linux/sysinfo.h:8: Error: Unrecognized opcode: `__kernel_long_t'

    Moving the __ASSEMBLY__ guard up and stashing the kernel.h include under
    it fixes this up, as well as covering the case the original fix was
    attempting to handle.

    Tested-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Acked-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit a1f42beb8e287482d1a802731d4fb7e2bdc2c703
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Mon Jun 18 13:48:08 2012 +0900

    Makefile: fix up CROSS_COMPILE and READABLE_ASM interaction.

    When the READABLE_ASM cc-option tests were added they were done so prior
    to the arch Makefile include, resulting in cc-option being run on the
    host cc instead of the factoring in the cross prefix set up by the
    architecture.

    This bumps the include back up so that cc-option actually runs on the
    compiler that we're building with.

    Cc: Andi Kleen <andi@firstfloor.org>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 2355375efdf10f43680d420023baa97796bfcdff
Author: Guenter Roeck <linux@roeck-us.net>
Date:   Sat Jun 2 10:16:32 2012 -0700

    hwmon: (emc2103) Fix use of an uninitilized variable in error case

    Fix:

    emc2103.c: In function set_pwm_enable:
    emc2103.c:463:12: warning: conf_reg may be used uninitialized in this function

    by checking the return value from read_u8_from_i2c(). This fixes a real problem,
    as conf_reg is really uninitialized if read_u8_from_i2c returns an error.

    Signed-off-by: Guenter Roeck <linux@roeck-us.net>
    Reviewed-by: Robert Coulson <robert.coulson@ericsson.com>
    Acked-by: Jean Delvare <khali@linux-fr.org>

commit ac852edb47b15900886ba2564eeeb13b3b526e3e
Author: Henrik Rydberg <rydberg@euromail.se>
Date:   Thu Jun 7 04:54:29 2012 -0400

    hwmon: (applesmc) Limit key length in warning messages

    Key lookups may call read_smc() with a fixed-length key string,
    and if the lookup fails, trailing stack content may appear in the
    kernel log. Fixed with this patch.

    Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
    Cc: stable@vger.kernel.org
    Signed-off-by: Guenter Roeck <linux@roeck-us.net>

commit 93b3cca1ccd30b1ad290951a3fc7c10c73db7313
Author: Steven Rostedt <rostedt@goodmis.org>
Date:   Thu Jun 14 10:54:28 2012 -0400

    ftrace: Make all inline tags also include notrace

    Commit 5963e317b1e9d2a ("ftrace/x86: Do not change stacks in DEBUG when
    calling lockdep") prevented lockdep calls from the int3 breakpoint handler
    from reseting the stack if a function that was called was in the process
    of being converted for tracing and had a breakpoint on it. The idea is,
    before calling the lockdep code, do a load_idt() to the special IDT that
    kept the breakpoint stack from reseting. This worked well as a quick fix
    for this kernel release, until a certain config caused a lockup in the
    function tracer start up tests.

    Investigating it, I found that the load_idt that was used to prevent
    the int3 from changing stacks was itself being traced!

    Even though the config had CONFIG_OPTIMIZE_INLINING disabled, and
    all 'inline' tags were set to always inline, there were still cases that
    it did not inline! This was caused by CONFIG_PARAVIRT_GUEST, where it
    would add a pointer to the native_load_idt() which made that function
    to be traced.

    Commit 45959ee7aa645815a ("ftrace: Do not function trace inlined functions")
    only touched the 'inline' tags when CONFIG_OPMITIZE_INLINING was enabled.
    PARAVIRT_GUEST shows that this was not enough and we need to also
    mark always_inline with notrace as well.

    Reported-by: Fengguang Wu <wfg@linux.intel.com>
    Tested-by: Fengguang Wu <wfg@linux.intel.com>
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

commit 2a4c8994eeef50796015f8a2005e4a75c1929166
Author: Trond Myklebust <Trond.Myklebust@netapp.com>
Date:   Thu Jun 14 13:08:38 2012 -0400

    NFSv4.1: Fix umount when filelayout DS is also the MDS

    Currently there is a 'chicken and egg' issue when the DS is also the mounted
    MDS. The nfs_match_client() reference from nfs4_set_ds_client bumps the
    cl_count, the nfs_client is not freed at umount, and nfs4_deviceid_purge_client
    is not called to dereference the MDS usage of a deviceid which holds a
    reference to the DS nfs_client.  The result is the umount program returns,
    but the nfs_client is not freed, and the cl_session hearbeat continues.

    The MDS (and all other nfs mounts) lose their last nfs_client reference in
    nfs_free_server when the last nfs_server (fsid) is umounted.
    The file layout DS lose their last nfs_client reference in destroy_ds
    when the last deviceid referencing the data server is put and destroy_ds is
    called. This is triggered by a call to nfs4_deviceid_purge_client which
    removes references to a pNFS deviceid used by an MDS mount.

    The fix is to track how many pnfs enabled filesystems are mounted from
    this server, and then to purge the device id cache once that count reaches
    zero.

    Reported-by: Jorge Mora <Jorge.Mora@netapp.com>
    Reported-by: Andy Adamson <andros@netapp.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit 10aa5a35e34fb00a2dd814447199f08756eb307b
Author: Russell King <rmk+kernel@arm.linux.org.uk>
Date:   Mon Jun 18 11:27:04 2012 +0100

    SPI: fix over-eager devm_xxx() conversion

    1a77b127ae (OMAP : SPI : use devm_* functions) converted the SPI
    device controller state to use devm_kzalloc().  Unfortunately, this
    is used against an unbound struct device, which results in the
    following when the device is bound to its driver:

    ------------[ cut here ]------------
    WARNING: at /home/rmk/git/linux-rmk/drivers/base/dd.c:257 driver_probe_device+0x78/0x21c()
    Modules linked in:
    Backtrace:
    [<c0017d0c>] (dump_backtrace+0x0/0x10c) from [<c033e208>] (dump_stack+0x18/0x1c) r7:00000000 r6:c01ff28c r5:c040050c r4:00000101
    [<c033e1f0>] (dump_stack+0x0/0x1c) from [<c00337ec>] (warn_slowpath_common+0x58/0x70)
    [<c0033794>] (warn_slowpath_common+0x0/0x70) from [<c0033828>] (warn_slowpath_null+0x24/0x2c)
    [<c0033804>] (warn_slowpath_null+0x0/0x2c) from [<c01ff28c>] (driver_probe_device+0x78/0x21c)
    [<c01ff214>] (driver_probe_device+0x0/0x21c) from [<c01ff49c>] (__driver_attach+0x6c/0x90)
    [<c01ff430>] (__driver_attach+0x0/0x90) from [<c01fda70>] (bus_for_each_dev+0x58/0x98)
    [<c01fda18>] (bus_for_each_dev+0x0/0x98) from [<c01ff0f4>] (driver_attach+0x20/0x28)
    [<c01ff0d4>] (driver_attach+0x0/0x28) from [<c01fe2f4>] (bus_add_driver+0xb4/0x230)
    [<c01fe240>] (bus_add_driver+0x0/0x230) from [<c01ffb24>] (driver_register+0xac/0x138)
    [<c01ffa78>] (driver_register+0x0/0x138) from [<c0215d4c>] (spi_register_driver+0x4c/0x60)
    [<c0215d00>] (spi_register_driver+0x0/0x60) from [<c045414c>] (ks8851_init+0x14/0x1c)
    [<c0454138>] (ks8851_init+0x0/0x1c) from [<c0008770>] (do_one_initcall+0x9c/0x164)
    [<c00086d4>] (do_one_initcall+0x0/0x164) from [<c0436410>] (kernel_init+0x128/0x210)
    [<c04362e8>] (kernel_init+0x0/0x210) from [<c0038754>] (do_exit+0x0/0x72c)
    ---[ end trace 4dcda79f5e89dd84 ]---
    ks8851 spi1.0: message enable is 0
    ks8851 spi1.0: eth0: revision 0, MAC 08:00:28:01:4d:c6, IRQ 194, has EEPROM

    Fix this by partially reverting the original commit.

    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit 9c5da09d266ca9b32eb16cf940f8161d949c2fe5
Author: Salman Qazi <sqazi@google.com>
Date:   Thu Jun 14 15:31:09 2012 -0700

    perf: Use css_tryget() to avoid propping up css refcount

    An rmdir pushes css's ref count to zero.  However, if the associated
    directory is open at the time, the dentry ref count is non-zero.  If
    the fd for this directory is then passed into perf_event_open, it
    does a css_get().  This bounces the ref count back up from zero.  This
    is a problem by itself.  But what makes it turn into a crash is the
    fact that we end up doing an extra dput, since we perform a dput
    when css_put sees the ref count go down to zero.

    css_tryget() does not fall into that trap. So, we use that instead.

    Reproduction test-case for the bug:

     #include <unistd.h>
     #include <sys/types.h>
     #include <sys/stat.h>
     #include <fcntl.h>
     #include <linux/unistd.h>
     #include <linux/perf_event.h>
     #include <string.h>
     #include <errno.h>
     #include <stdio.h>

     #define PERF_FLAG_PID_CGROUP    (1U << 2)

     int perf_event_open(struct perf_event_attr *hw_event_uptr,
                         pid_t pid, int cpu, int group_fd, unsigned long flags) {
             return syscall(__NR_perf_event_open,hw_event_uptr, pid, cpu,
                     group_fd, flags);
     }

     /*
      * Directly poke at the perf_event bug, since it's proving hard to repro
      * depending on where in the kernel tree.  what moved?
      */
     int main(int argc, char **argv)
     {
            int fd;
            struct perf_event_attr attr;
            memset(&attr, 0, sizeof(attr));
            attr.exclude_kernel = 1;
            attr.size = sizeof(attr);
            mkdir("/dev/cgroup/perf_event/blah", 0777);
            fd = open("/dev/cgroup/perf_event/blah", O_RDONLY);
            perror("open");
            rmdir("/dev/cgroup/perf_event/blah");
            sleep(2);
            perf_event_open(&attr, fd, 0, -1,  PERF_FLAG_PID_CGROUP);
            perror("perf_event_open");
            close(fd);
            return 0;
     }

    Signed-off-by: Salman Qazi <sqazi@google.com>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Acked-by: Tejun Heo <tj@kernel.org>
    Link: http://lkml.kernel.org/r/20120614223108.1025.2503.stgit@dungbeetle.mtv.corp.google.com
    Signed-off-by: Ingo Molnar <mingo@kernel.org>

commit 0b1d8e09089b69ac2e8be203fb28cd07cfe035b2
Author: Daniel Mack <zonque@gmail.com>
Date:   Sat Jun 16 16:58:36 2012 +0200

    ALSA: 6fire: use NULL instead of 0 for pointer assignment

    Signed-off-by: Daniel Mack <zonque@gmail.com>
    Cc: Torsten Schenk <torsten.schenk@zoho.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit b4a91cf05c33d4ab5b2b3738a257a3fe49b462bd
Author: Dylan Reid <dgreid@chromium.org>
Date:   Fri Jun 15 19:36:23 2012 -0700

    ALSA: hda - Handle open while transitioning to D3.

    This addresses an issue encountered when a pcm is opened while
    transitioning to low power state (codec->power_on == 1 &&
    codec->power_transition == -1).  Add snd_pcm_power_up_d3wait to
    hda_codec.  This function is used to power up from azx_open as opposed
    to snd_hda_power_up used from codec_exec_verb. When powering up from
    azx_open, wait for pending power downs to complete, avoiding the power
    up continuing in parallel with the power down on the work queue.

    The specific issue seen was with the CS4210 codec, it powers off the ADC
    and DAC nid in its suspend handler.  If it is re-opened before the
    ~100ms power down process completes, the ADC and DAC nid are initialized
    while powered down and audio is lost until another suspend/resume cycle.

    Signed-off-by: Dylan Reid <dgreid@chromium.org>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit afe25967ecf66b38d94d374f0fcb5f4add458a4c
Author: Daniel Mack <zonque@gmail.com>
Date:   Sat Jun 16 16:58:04 2012 +0200

    ALSA: snd-usb: make snd_usb_substream_capture_trigger static

    Signed-off-by: Daniel Mack <zonque@gmail.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 7fb75db139965c1955bf6bbde62a357f9843286d
Author: Daniel Mack <zonque@gmail.com>
Date:   Sun Jun 17 13:44:27 2012 +0200

    ALSA: snd-usb: fix sync pipe check

    Fix a bogus sanity check for sync pipe in pcm.c. This flaw was
    introduced during the streaming logic refactorization.

    While at it, improve the error messages that are generated in such cases.

    Signed-off-by: Daniel Mack <zonque@gmail.com>
    Reported-and-tested-by: <ben@b1c1l1.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit ef890ae9b34cd99411bc72829944c74d2223ef70
Merge: 2e8b2b2 3419ae7
Author: Takashi Iwai <tiwai@suse.de>
Date:   Mon Jun 18 08:36:00 2012 +0200

    Merge tag 'asoc-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

    ASoC: Updates for 3.5

    All driver specific and fairly small.  The pxa-ssp changes are larger
    than I'd like but they're build failures and are pretty clear to
    inspection.

commit 39a50b42f7026027b54131291ad0f350100eac95
Merge: fb09185 7dea966
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sun Jun 17 14:40:35 2012 -0700

    Merge branch 'hfsplus'

    Merge hfsplus fixes from Christoph Hellwig:
     "Two small hfsplus fixes:

       - a one liner regression fix for large volume handling from Janne
         Kalliomäki.
       - a fixup for the boot image blessing feature to make it work with
         the fake "hardlinks" in hfsplus from Matthew Garrett."

    * branch 'hfsplus':
      hfsplus: fix bless ioctl when used with hardlinks
      hfsplus: fix overflow in sector calculations in hfsplus_submit_bio

commit 7dea9665fee828fb56db3bae5b9685d9fa006d33
Author: Matthew Garrett <mjg@redhat.com>
Date:   Sun Jun 17 17:05:25 2012 -0400

    hfsplus: fix bless ioctl when used with hardlinks

    HFS+ doesn't really implement hard links - instead, hardlinks are indicated
    by a magic file type which refers to an indirect node in a hidden
    directory. The spec indicates that stat() should return the inode number
    of the indirect node, but it turns out that this doesn't satisfy the
    firmware when it's looking for a bootloader - it wants the catalog ID of
    the hardlink file instead. Fix up this case.

    Signed-off-by: Matthew Garrett <mjg@redhat.com>
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit a6dc8c04218eb752ff79cdc24a995cf51866caed
Author: Janne Kalliomäki <janne@tuxera.com>
Date:   Sun Jun 17 17:05:24 2012 -0400

    hfsplus: fix overflow in sector calculations in hfsplus_submit_bio

    The variable io_size was unsigned int, which caused the wrong sector number
    to be calculated after aligning it. This then caused mount to fail with big
    volumes, as backup volume header information was searched from a
    wrong sector.

    Signed-off-by: Janne Kalliomäki <janne@tuxera.com>
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 2805b9ab7c836cfbe01e86129983e36205078cb2
Author: Roland Stigge <stigge@antcom.de>
Date:   Sun Jun 17 21:14:27 2012 +0100

    ARM: 7427/1: mmc: mmci: Defer probe() in case of yet uninitialized GPIOs

    If the GPIOs used by the MMCI driver are not registered yet when the driver is
    probe()d, they can't be used. This happens if the mmci driver is probed before
    the respective GPIO controller (e.g. on the LPC32xx EA3250 board, the PCA9532
    GPIO controller would be initialized via DT after mmci). Therefore, we defer
    mmci in this case.

    Signed-off-by: Roland Stigge <stigge@antcom.de>
    Acked-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit f43380981716c9b48bf2809e4cd1cb0c6b71429d
Author: Roland Stigge <stigge@antcom.de>
Date:   Sun Jun 17 21:13:34 2012 +0100

    ARM: 7426/1: mmc: mmci: Remove wrong error handling of gpio 0

    Zero is a valid GPIO and shouldn't be handled as an error return code from
    of_get_named_gpio(). It was a leftover from old code before getting
    pdata->gpio_*() was modified.

    Signed-off-by: Roland Stigge <stigge@antcom.de>
    Acked-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit 6bc07d6afa1679a2f5b272bc36618314686e143a
Author: Todd Poynor <toddpoynor@google.com>
Date:   Sun Jun 17 11:57:50 2012 -0600

    ARM: OMAP: PM: Lock clocks list while generating summary

    Commit a53025724052b2b1edbc982a4a248784638f563d (OMAP: Add debugfs
    node to show the summary of all clocks) introduced clock summary,
    however, we are interested in seeing snapshot of the clock state, not
    in dynamically changing clock configurations as the data provided by
    clock summary will then be useless for debugging configuration
    issues. So, hold the common lock when dumping the clock summary.

    Cc: Paul Walmsley <paul@pwsan.com>
    Cc: Tony Lindgren <tony@atomide.com>
    Signed-off-by: Todd Poynor <toddpoynor@google.com>
    [nm@ti.com: added commit message]
    Signed-off-by: Nishanth Menon <nm@ti.com>
    [paul@pwsan.com: minor edits to commit message]
    Signed-off-by: Paul Walmsley <paul@pwsan.com>

commit 22cec7ca02f81b57a06d238a4043bc6c9ba6ea03
Author: Andrew Lunn <andrew@lunn.ch>
Date:   Fri Jun 8 11:36:45 2012 +0200

    ARM: iconnect: Remove include of removed linux/spi/orion_spi.h

    v3.5-rc1 fails to build when DT and iconnect is enabled because of
    this now none existant include file.

    Also remove the other two SPI include files, which are not needed
    with the move to DT.

    Signed-off-by: Andrew Lunn <andrew@lunn.ch>
    Acked-by: Arnaud Patard <arnaud.patard@rtp-net.org>
    Signed-off-by: Olof Johansson <olof@lixom.net>

commit daf731748f978efb4f741d19b499236e03bf667f
Author: Linus Walleij <linus.walleij@linaro.org>
Date:   Tue May 22 11:46:45 2012 +0200

    pinctrl/nomadik: document Alt-C glitch

    This documentation comment existed in an earlier patch set for
    GPIO consolidation, so I'm saving it for maintainability of the
    code.

    Acked-by: Stephen Warren <swarren@wwwdotorg.org>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

commit 14e1e9f5cadb7cff3a2846c27cc1b9c8f207ee18
Author: Fabio Estevam <fabio.estevam@freescale.com>
Date:   Wed Jun 13 14:06:07 2012 -0300

    pinctrl: mxs: Use kfree to fix build error

    commit 0bf7481 (pinctrl: pinctrl-mxs: Take care of frees if the kzalloc fails)
    introduced the following build error:

    drivers/pinctrl/pinctrl-mxs.c:140:3: error: implicit declaration of function 'free'

    Use kfree function instead.

    Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
    Acked-by: Devendra Naga <devendra.aaru@gmail.com>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

commit ea851f4f08eb366e829abb8f1b2f1741a19ed696
Author: Lee Jones <lee.jones@linaro.org>
Date:   Wed May 30 12:47:27 2012 +0800

    regulator: Change db8500-prcmu match names to reflect Device Tree

    The 'name' field in 'struct of_regulator_match' expects to match with
    its corresponding regulator device node in the Device Tree. This patch
    renames each of the regulators in the db8500-prcum regulator driver so
    this is true.

    Signed-off-by: Lee Jones <lee.jones@linaro.org>
    Acked-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

commit f7f3f1ad9ee13c962122e36752ef6908aff920a2
Author: Lee Jones <lee.jones@linaro.org>
Date:   Wed May 30 12:47:26 2012 +0800

    regulator: Change ab8500 match names to reflect Device Tree

    The 'name' field in 'struct of_regulator_match' expects to match with
    its corresponding regulator device node in the Device Tree. This patch
    renames each of the regulators in the ab8500 regulator driver so this
    is true.

    Signed-off-by: Lee Jones <lee.jones@linaro.org>
    Acked-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

commit 9d88fc0b3503e80ab1a5c9fb3b3f074302f44b33
Author: Sangbeom Kim <sbkim73@samsung.com>
Date:   Wed Jun 13 17:27:16 2012 +0900

    regulator: Fix the s5m8767a problem of the division by null

    If ramp_delay is 0, delay value can be divided by zero.
    This patch can fix the problem.

    Signed-off-by: Sangbeom Kim <sbkim73@samsung.com>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

commit 1268a172cdb00353f107e6cc964dccff29047077
Author: Jean Delvare <khali@linux-fr.org>
Date:   Sun Jun 17 18:05:06 2012 +0200

    hwmon: (coretemp) Drop needless initialization

    The value is overridden a few lines later.

    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>

commit 813441f16e5248e7fd6a4044e8adabf4ac3aaec9
Author: Guenter Roeck <linux@roeck-us.net>
Date:   Sun Jun 17 18:05:06 2012 +0200

    hwmon: (coretemp) Document TjMax for 3rd generation i5/i7 processors

    Tjmax values from Intel datasheets.

    Signed-off-by: Guenter Roeck <linux@roeck-us.net>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>

commit 41e58a1f2b90c88d94b4bd84beb9927a4c2704e9
Author: Guenter Roeck <linux@roeck-us.net>
Date:   Sun Jun 17 18:05:05 2012 +0200

    hwmon: (coretemp) Improve support for TjMax detection on Atom CPUs

    Atom CPUs don't have a register to retrieve TjMax. Detection so far was
    incomplete. Use the X86 model ID to improve it.

    Signed-off-by: Guenter Roeck <linux@roeck-us.net>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>

commit 5592906f8b01282ea3c2acaf641fd067ad4bb3dc
Author: Guenter Roeck <linux@roeck-us.net>
Date:   Sun Jun 17 18:05:05 2012 +0200

    hwmon: (coretemp) Add support for Atom D2000 and N2000 series CPU models

    Document the Atom series D2000 and N2000 (Cedar Trail) as being supported.
    List and set TjMax for those series.

    Cc: Fenghua Yu <fenghua.yu@intel.com>
    Cc: "R, Durgadoss" <durgadoss.r@intel.com>
    Signed-off-by: Guenter Roeck <linux@roeck-us.net>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>

commit fcc14ac1a86931f38da047cf8fb634c6db7b58bc
Author: Jean Delvare <khali@linux-fr.org>
Date:   Sun Jun 17 18:05:05 2012 +0200

    hwmon: (coretemp) Improve support of recent Atom CPU models

    Document the new Atom series (Tunnel Creek and Medfield) as being
    supported, and list TjMax for the Atom E600 series.

    Also enable the Atom tjmax heuristic for these Atom CPU models.

    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Reviewed-by: Guenter Roeck <guenter.roeck@ericsson.com>
    Cc: Alexander Stein <alexander.stein@systec-electronic.com>
    Cc: Fenghua Yu <fenghua.yu@intel.com>
    Cc: "R, Durgadoss" <durgadoss.r@intel.com>

commit fb09185a88cad9c59e22e84f8c0594303595e9af
Merge: 41a328b c4af5c4
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sun Jun 17 01:44:41 2012 -0700

    Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

    Pull drm fixes from Dave Airlie:
     "Radeon is most of the work, one regression, one BUG fix in the new
      prime code, some fixes to init code to make streamout not lock up the
      hardware, and just some code to enable users to test HDMI audio on
      later hw (its off by default).

      Intel adds edp edid caching for some strange Dell Vostros that black
      screen on startup if keep reading their EDID, and a fix for a DP
      regression.

      Otherwise fix for via/sis and one to stop udl binding to multiple
      non-video usb."

    * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
      drm/i915: cache the EDID for eDP panels
      Revert "drm/i915/dp: Use auxch precharge value of 5 everywhere"
      drm/i915: eDP aux needs vdd
      drm/i915: don't enumerate HDMID if an eDP panel is already active on the port
      drm/radeon: add support for STRMOUT_BASE_UPDATE on 7xx
      drm/radeon: add some additional 6xx/7xx/EG register init
      drm/radeon: enable HDMI on DCE5 (AKA NI excluding Aruba)
      drm sis: initialize object_idr
      drm via: initialize object_idr
      drm/radeon/prime: reserve/unreserve around pin
      drm/radeon: fix regression in dynpm due to multi-ring rework
      vga_switcheroo.h: fix pci_dev warning
      drm/udl: only bind to the video devices on the hub.

commit 6b03976288538a94e072bbfcd12d69a20daea8aa
Author: Ohad Ben-Cohen <ohad@wizery.com>
Date:   Mon May 21 16:31:12 2012 +0300

    remoteproc/omap: fix dev_err typo

    For some reason one of the dev_err invocations is using a wrong
    device so fix that.

    Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
    Cc: stable@vger.kernel.org

commit 41a328b95c00fa00ed5832c2876aee7186222438
Merge: 485802a 128789a
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sun Jun 17 00:20:47 2012 -0700

    Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

    Pull ARM SoC fixes from Olof Johansson:
     "A bit larger set than usual, unfortunately -- I've been sitting on
      them longer than I meant to so it's really more like 2 -rc pull
      requests in one, volume-wise.

      Nearly everything is fixes for fallout from the merge window, or other
      fixes for bugs.  The one exception is the highbank L2-enablement
      patch, but it was contained enough that I picked it up anyway:

       - i.MX fixes, mostly for clock and pinctrl changes
       - OMAP fixes, mostly PM-related
       - A patch to enable L2 on highbank
       - A couple of fixes for PXA, Kirkwood, Versatile"

    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (30 commits)
      ARM: Kirkwood: Fix clk problems modular ethernet driver
      arm: versatile: fix and enable PCI I/O space
      ARM: highbank: Add smc calls to enable/disable the L2
      ARM i.MX imx21ads: Fix overlapping static i/o mappings
      ARM: imx6: exit coherency when shutting down a cpu
      ARM: mx51: Add pinctrl_provide_dummies()
      ARM: mx31: Add pinctrl_provide_dummies()
      ARM: OMAP2+: Fix compile for CONFIG_TIDSPBRIDGE platform init code
      ARM: OMAP3: Fix omap3_l3_block_irq warning when CONFIG_BUG is not set
      ARM: OMAP: Fix MMC_OMAP build when only MMC_OMAP_HS is selected
      OMAP2+: UART: Add mechanism to probe uart pins and configure rx wakeup
      ARM: mmp: fix missing cascade_irq in irq handler
      ARM: dts: update memory size on brownstone
      ARM i.MX27 Visstrim M10: fix gpio handling.
      ARM i.MX53: Fix PLL4 base address
      ARM i.MX pllv2: make round_rate accurate
      ARM i.MX pllv2: use standard register set unconditionally
      ARM: OMAP: Fix lis3lv02d accelerometer to use gpio_to_irq
      ARM: imx: only call l2x0_init if it's available
      ARM: imx: only specify i2c device type once
      ...

commit 128789a8293653a4f889f2b1601eea07c00ff65e
Author: Andrew Lunn <andrew@lunn.ch>
Date:   Wed Jun 13 14:52:45 2012 +0200

    ARM: Kirkwood: Fix clk problems modular ethernet driver

    When the ethernet driver was built as a module, it would lock the
    machine when loaded. At boot the ethernet clks are unused, so get
    turned off.  Later, when the module is loaded, the probe function
    would access the hardware before the clock was restarted, and the
    machine would lock. It has also been determined that when the clk is
    turned off, the interface forgets its MAC address, which for most
    systems, is set by the boot loader.

    When the machine setup file creates a platform device for the
    interface, prepare and enable the clock for the interface. This will
    ensure it is not turned off. However, if the setup file only
    instantiates one platform device, the other will have its clk
    disabled, thus maybe saving a little power.

    Report-by: Simon Baatz <gmbnomis@gmail.com>
    Signed-off-by: Andrew Lunn <andrew@lunn.ch>
    Tested-by: Simon Baatz <gmbnomis@gmail.com>
    Signed-off-by: Olof Johansson <olof@lixom.net>

commit 9b0f7e399238c61f28539daeb65d72a8d7f91966
Author: Arnd Bergmann <arnd@arndb.de>
Date:   Mon Jun 11 09:03:58 2012 -0500

    arm: versatile: fix and enable PCI I/O space

    With commit 4d5fc58dbe34b (ARM: remove bunch of now unused
    mach/io.h files), the I/O space setup was completely broken on
    versatile. This patch fixes that and prepares for further
    I/O space clean-up.

    I/O space handling on the versatile platform is currently
    broken in multiple ways. Most importantly, the ports do
    not get mapped into the virtual address space at all.

    Also, there is some amount of confusion between PCI I/O
    space and other statically mapped MMIO registers in the
    platform code:

    * The __io_address() macro that is used to access the
      platform register maps to the same __io macro that gets
      used for I/O space.

    * The IO_SPACE_LIMIT is set to a value that is much larger
      than the total available space.

    * The I/O resource of the PCI bus is set to the physical
      address of the mapping, which is way outside of the
      actual I/O space limit as well as the address range that
      gets decoded by traditional PCI cards.

    * No attempt is made to stay outside of the ISA port range
      that some device drivers try access.

    * No resource gets requested as a child of ioport_resource,
      but an IORESOURCE_IO type mapping gets requested
      as a child of iomem_resource.

    This patch attempts to correct all of the above. This makes
    it possible to use virtio-pci based virtual devices as well
    as actual PCI cards including those with legacy ISA port
    ranges like VGA.

    Some of the issues seem to be duplicated on other platforms.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    [rob: update to 3.5-rc2 and io.h cleanup related changes]
    Signed-off-by: Rob Herring <rob.herring@calxeda.com>
    Tested-by: Robert Schwebel <r.schwebel@pengutronix.de>
    Signed-off-by: Olof Johansson <olof@lixom.net>

commit 7dea9e73614ba37914b8867dd0fef49193b22b8d
Merge: f9c15a1 10bd21c
Author: Olof Johansson <olof@lixom.net>
Date:   Sat Jun 16 18:36:52 2012 -0700

    Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes

    * 'fixes' of git://github.com/hzhuang1/linux:
      ARM: mmp: fix missing cascade_irq in irq handler
      ARM: dts: update memory size on brownstone

commit 485802a6c524e62b5924849dd727ddbb1497cc71
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sat Jun 16 17:25:17 2012 -0700

    Linux 3.5-rc3

commit d865983292cf1e526de8aba31870794909860d5b
Merge: c458175 a8c4a33
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sat Jun 16 17:01:41 2012 -0700

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

    Pull btrfs compile warning fixes from Chris Mason.

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
      Btrfs: cast devid to unsigned long long for printk %llu
      Btrfs: init old_generation in get_old_root

commit c458175eb61843fe9fd37ac3d56b701e98a8cf15
Merge: 88c144b 6699c8c
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sat Jun 16 17:00:15 2012 -0700

    Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

    Pull arch/tile update from Chris Metcalf:
     "This one-line bug fix unbreaks glibc robust mutexes (among other
      things no doubt), from code merged in during the 3.5 merge window but
      which we had been running internally at Tilera for almost a year."

    * 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
      tile: fix bug in get_user() for 4-byte values

commit 88c144b12a943d35500dbfc141c9b33955d2a88a
Merge: 9b15b81 b679895
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sat Jun 16 16:59:05 2012 -0700

    Merge tag 'fbdev-fixes-for-3.5-1' of git://github.com/schandinat/linux-2.6

    Pull fbdev fixes from Florian Tobias Schandinat:

     - two fixes for s3c-fb by Jingoo Han (including a fix for a potential
       division by zero)

     - a couple of randconfig fixes by Arnd Bergmann

     - a cleanup for bfin_adv7393fb by Emil Goode

    * tag 'fbdev-fixes-for-3.5-1' of git://github.com/schandinat/linux-2.6:
      video: s3c-fb: fix possible division by zero in s3c_fb_calc_pixclk
      video: s3c-fb: clear SHADOWCON register when clearing hardware window registers
      drivers/tosa: driver needs I2C and SPI to compile
      drivers/savagefb: use mdelay instead of udelay
      video/console: automatically select a font
      video/ili9320: do not mark exported functions __devexit
      drivers/video: use correct __devexit_p annotation
      video: bfin_adv7393fb: Convert to kstrtouint_from_user

commit 6699c8cda36f296e315068ed9bbe4f03e6ed4044
Author: Chris Metcalf <cmetcalf@tilera.com>
Date:   Sat Jun 16 16:53:06 2012 -0400

    tile: fix bug in get_user() for 4-byte values

    The definition of 32-bit values in the 64-bit tilegx architecture is that
    they should be sign-extended regardless of whether they are considered
    signed or unsigned by the compiler.  Accordingly, we need to use an
    "ld4s" rather than "ld4u" to load and sign-extend for get_user().

    This fixes glibc bug 14238 (see http://sourceware.org/bugzilla),
    introduced during the 3.5 merge window.

    Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>

commit b56a39ac263e5b8cafedd551a49c2105e68b98c2
Author: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Date:   Sat Jun 16 12:40:55 2012 +0800

    printk: return -EINVAL if the message len is bigger than the buf size

    Just like what devkmsg_read() does, return -EINVAL if the message len is
    bigger than the buf size, or it will trigger a segfault error.

    Acked-by: Kay Sievers <kay@vrfy.org>
    Acked-by: Fengguang Wu <wfg@linux.intel.com>
    Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 4a77a5a06ec66ed05199b301e7c25f42f979afdc
Author: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Date:   Sat Jun 16 21:21:51 2012 +0800

    printk: use mutex lock to stop syslog_seq from going wild

    Although syslog_seq and log_next_seq stuff are protected by logbuf_lock
    spin log, it's not enough. Say we have two processes A and B, and let
    syslog_seq = N, while log_next_seq = N + 1, and the two processes both
    come to syslog_print at almost the same time. And No matter which
    process get the spin lock first, it will increase syslog_seq by one,
    then release spin lock; thus later, another process increase syslog_seq
    by one again. In this case, syslog_seq is bigger than syslog_next_seq.
    And latter, it would make:
       wait_event_interruptiable(log_wait, syslog != log_next_seq)
    don't wait any more even there is no new write comes. Thus it introduce
    a infinite loop reading.

    I can easily see this kind of issue by the following steps:
      # cat /proc/kmsg # at meantime, I don't kill rsyslog
                       # So they are the two processes.
      # xinit          # I added drm.debug=6 in the kernel parameter line,
                       # so that it will produce lots of message and let that
                       # issue happen

    It's 100% reproducable on my side. And my disk will be filled up by
    /var/log/messages in a quite short time.

    So, introduce a mutex_lock to stop syslog_seq from going wild just like
    what devkmsg_read() does. It does fix this issue as expected.

    v2: use mutex_lock_interruptiable() instead (comments from Kay)

    Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
    Reviewed-by: Fengguang Wu <fengguang.wu@intel.com>
    Acked-By: Kay Sievers <kay@vrfy.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 667d1b48bcb66b89776ebefbaf05b358bc5907ce
Author: Will Deacon <will.deacon@arm.com>
Date:   Fri Jun 15 16:49:58 2012 +0100

    ARM: 7425/1: extable: ensure fixup entries are 4-byte aligned

    Fixup entries in the kernel exception tables should be 4-byte aligned
    since we return directly to them when handling a faulting instruction in
    the kernel.

    This patch adds the missing align directives to the fixup entries.

    Signed-off-by: Will Deacon <will.deacon@arm.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit c4af5c4597a7a5d64e058703e1328f315a59794e
Merge: 7c77bf2 d6f24d0
Author: Dave Airlie <airlied@redhat.com>
Date:   Sat Jun 16 14:45:17 2012 +0100

    Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes

    * 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
      drm/i915: cache the EDID for eDP panels
      Revert "drm/i915/dp: Use auxch precharge value of 5 everywhere"
      drm/i915: eDP aux needs vdd
      drm/i915: don't enumerate HDMID if an eDP panel is already active on the port

commit d6f24d0fa6cdf3431a2fe3330a74bc6c5871f496
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Thu Jun 14 15:28:33 2012 -0400

    drm/i915: cache the EDID for eDP panels

    They aren't going anywhere, and probing on DDC can cause the panel to
    blank briefly, so read them up front and cache them for later queries.

    v2: fix potential NULL derefs in intel_dp_get_edid_modes and
        intel_dp_get_edid (Jani)
        copy full EDID length, including extension blocks (Takashi)
        free EDID on teardown (Takashi)
    v3: malloc a new EDID buffer that's big enough for the memcpy (Chris)
    v4: change handling of NULL EDIDs, just preserve the NULL behavior
        across detects and mode list fetches rather than trying to re-fetch
        the EDID (Chris)
    v5: be glad that Chris is around to remind me to hit C-x C-s before
        committing.

    References: https://bugs.freedesktop.org/show_bug.cgi?id=46856
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

commit 6b4e0a93ff6e45714c72bdce193f719ed94810e3
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Thu Jun 14 22:15:00 2012 +0200

    Revert "drm/i915/dp: Use auxch precharge value of 5 everywhere"

    This reverts commit 092945e11c5b84f66dd08f0b87fb729715d377bc.

    This commit prevents a DP screen from properly training the link.
    Oddly enough it works, once the machine has been warm-booted with an
    older kernel.

    According to DP docs this _should_ have been the right precharge time.
    Also, the commit that originally introduces this was just general snb
    DP enabling and didn't mention any specific reason for this special
    value. Whatever, trust the reporter that this makes things worse and
    let's just revert it.

    v2: Less spelling fail.

    Cc: Adam Jackson <ajax@redhat.com>
    Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
    Reported-by: "Wouter M. Koolen" <W.M.Koolen-Wijkstra@cwi.nl>
    Buglink: https://lkml.org/lkml/2012/6/14/301
    Cc: stable@vger.kernel.org (only for 3.4)
    Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

commit 351cfc34db8decb0c5cc1aac7cf1780a0e45c8b1
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Tue Jun 12 13:20:47 2012 +0200

    drm/i915: eDP aux needs vdd

    The new oui probe has been missing these.

    This issue has been introduce in

    commit 0d198328538276c4459ef5de081e68ae60e6c4c2
    Author: Adam Jackson <ajax@redhat.com>
    Date:   Mon May 14 16:05:47 2012 -0400

        drm/i915/dp: Probe branch/sink OUIs

    v2: Do the eDP vdd dance of simply not probing the OUI on eDP panels
    as suggested by Chris Wilson.

    v3: Fix up the error path fail - I suck.

    Cc: Adam Jackson <ajax@redhat.com>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=50808
    Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
    Bugreport: http://permalink.gmane.org/gmane.comp.video.dri.devel/69695
    Tested-by: Yang Guang <guang.a.yang@intel.com>
    Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

commit b708a1d5ea7880b399dbd45cacafff6ae8d73171
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Mon Jun 11 14:39:56 2012 -0400

    drm/i915: don't enumerate HDMID if an eDP panel is already active on the port

    This prevents the HDMI detect functions from poking at an eDP
    connected panel, which can lead to trouble.

    [danvet: Note that we have some other reports of DP vs. HDMI fighting,
    but the general case is a much bigger fish to fry.]

    References: https://bugs.freedesktop.org/show_bug.cgi?id=42278
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

commit 7c77bf2a1a8bf67d580a3b189b37fded0a13ab78
Author: Alex Deucher <alexander.deucher@amd.com>
Date:   Thu Jun 14 22:06:37 2012 +0200

    drm/radeon: add support for STRMOUT_BASE_UPDATE on 7xx

    Required for streamout.  Bump drm minor.

    Marek v2: fix pkt->count check

    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
    Signed-off-by: Marek Olšák <maraeo@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit b866d1334ba2d544bc575d75357dea6bdcdc7f46
Author: Alex Deucher <alexander.deucher@amd.com>
Date:   Thu Jun 14 22:06:36 2012 +0200

    drm/radeon: add some additional 6xx/7xx/EG register init

    - SMX_SAR_CTL0 needs to be programmed correctly to prevent
    problems with memory exports in certain cases.
    - VC_ENHANCE needs to be initialized on 6xx/7xx.

    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Cc: stable@vger.kernel.org
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 6b53a0507b6e728c53f2fc60912a8511f151e5d8
Author: Rafał Miłecki <zajec5@gmail.com>
Date:   Mon Jun 11 12:34:01 2012 +0200

    drm/radeon: enable HDMI on DCE5 (AKA NI excluding Aruba)

    After recent changes HDMI code is ready to be enabled on DCE5. This
    patch just changes conditions to execute already present code on DCE5.

    Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
    Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
    Tested-by: Christian König <christian.koenig@amd.com>
    Tested-by: Andre Heider <a.heider@gmail.com>
    Tested-by: Zoltán Böszörményi <zboszor@pr.hu>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 648ccc7d35e3416fdc739d2e520e85de3125361b
Author: Márton Németh <nm127@freemail.hu>
Date:   Mon Jun 11 19:09:25 2012 +0200

    drm sis: initialize object_idr

    The filed object_idr of struct drm_sis_private was introduced with
    commit http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commitdiff;h=6de8a748881f1cd9d795454da2b6db616d5ca3d7 .

    The idr_init(&dev->object_name_idr) is called instead of
    idr_init(&dev_priv->object_idr) by mistake, leaving object_idr
    uninitialized. Correct this.

    This patch was not tested because of lack of hardware.

    Signed-off-by: Márton Németh <nm127@freemail.hu>
    Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    Cc: stable@vger.kernel.org
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit ce020ea53264f1460ae619cfc12f968dbd0b8974
Author: Márton Németh <nm127@freemail.hu>
Date:   Sun Jun 10 23:39:55 2012 +0200

    drm via: initialize object_idr

    The field obejct_idr of struct drm_via_private was introduced with the
    commit http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commitdiff;h=77ee8f3825054f23b17e9c8f728f061defd86cdc .
    In that patch idr_init(&dev->object_name_idr) was called instead of
    idr_init(&dev_priv->object_idr) by mistake, leaving the dev_priv->object_idr
    uninitialized. To be more exact, the object_idr buffer is filled with zeros
    because of kzalloc(), but the dev_priv->object_idr.lock spinlock can cause
    system freeze at lib/idr.c:move_to_free_list() when spin_lock_irqsave()
    is called on this spinlock.

    The patch was tested on Clevo D4J, model D410J laptop, on the following
    hardware, without AGP kernel module loaded:

      # lspci -s 01:00.0 -n
      01:00.0 0300: 1106:3108 (rev 01)
      # lspci -s 01:00.0 -v
      01:00.0 VGA compatible controller: VIA Technologies, Inc. K8M800/K8N800/K8N800A [S3 UniChrome Pro] (rev 01) (prog-if 00 [VGA controller])
              Subsystem: CLEVO/KAPOK Computer Device 4702
              Flags: bus master, 66MHz, medium devsel, latency 64, IRQ 16
              Memory at f0000000 (32-bit, prefetchable) [size=64M]
              Memory at d1000000 (32-bit, non-prefetchable) [size=16M]
              Expansion ROM at <unassigned> [disabled]
              Capabilities: [60] Power Management version 2
              Capabilities: [70] AGP version 3.0

    Signed-off-by: Márton Németh <nm127@freemail.hu>
    Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    Cc: stable@vger.kernel.org
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 489797d510dfbce15120492d7ef6f956928b99f2
Author: Dave Airlie <airlied@redhat.com>
Date:   Tue Jun 12 16:10:39 2012 +0100

    drm/radeon/prime: reserve/unreserve around pin

    I finally got to test this code a bit more and hit the ttm
    no reserved assert, so add the reservations around the pinning.

    Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 0ec0612a80f957000999c3f7b31a84e3558c719d
Author: Alex Deucher <alexander.deucher@amd.com>
Date:   Thu Jun 14 15:54:57 2012 -0400

    drm/radeon: fix regression in dynpm due to multi-ring rework

    Not all asics have all rings, so make sure the ring is ready
    before attempting to check it in the dynpm work handler.

    Fixes:
    https://bugzilla.kernel.org/show_bug.cgi?id=43367

    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Reviewed-by: Jerome Glisse <jglisse@redhat.com>
    Reviewed-by: Christian König <christian.koenig@amd.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit f8fee8f5acb5c3f82e02f2ae139a6f1e7b4eb583
Author: Randy Dunlap <rdunlap@xenotime.net>
Date:   Fri Jun 15 12:46:17 2012 -0700

    vga_switcheroo.h: fix pci_dev warning

    Fix warnings on some architectures/configs (not on x86):

    include/linux/vga_switcheroo.h:28:30: warning: 'struct pci_dev' declared inside parameter list [enabled by default]
    include/linux/vga_switcheroo.h:28:30: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default]

    Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
    Cc:	Takashi Iwai <tiwai@suse.de>
    Reported-by:	Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit e5a867a51d9b009f90d5dca6a320608e4e8a37ec
Author: Dave Airlie <airlied@redhat.com>
Date:   Sat Jun 16 07:41:28 2012 +0100

    drm/udl: only bind to the video devices on the hub.

    This is ported from udlfb.

    Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=832188
    Cc: stable@vger.kernel.org
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 9b15b817f3d62409290fd56fe3cbb076a931bb0a
Author: Hugh Dickins <hughd@google.com>
Date:   Fri Jun 15 17:55:50 2012 -0700

    swap: fix shmem swapping when more than 8 areas

    Minchan Kim reports that when a system has many swap areas, and tmpfs
    swaps out to the ninth or more, shmem_getpage_gfp()'s attempts to read
    back the page cannot locate it, and the read fails with -ENOMEM.

    Whoops.  Yes, I blindly followed read_swap_header()'s pte_to_swp_entry(
    swp_entry_to_pte()) technique for determining maximum usable swap
    offset, without stopping to realize that that actually depends upon the
    pte swap encoding shifting swap offset to the higher bits and truncating
    it there.  Whereas our radix_tree swap encoding leaves offset in the
    lower bits: it's swap "type" (that is, index of swap area) that was
    truncated.

    Fix it by reducing the SWP_TYPE_SHIFT() in swapops.h, and removing the
    broken radix_to_swp_entry(swp_to_radix_entry()) from read_swap_header().

    This does not reduce the usable size of a swap area any further, it
    leaves it as claimed when making the original commit: no change from 3.0
    on x86_64, nor on i386 without PAE; but 3.0's 512GB is reduced to 128GB
    per swapfile on i386 with PAE.  It's not a change I would have risked
    five years ago, but with x86_64 supported for ten years, I believe it's
    appropriate now.

    Hmm, and what if some architecture implements its swap pte with offset
    encoded below type? That would equally break the maximum usable swap
    offset check.  Happily, they all follow the same tradition of encoding
    offset above type, but I'll prepare a check on that for next.

    Reported-and-Reviewed-and-Tested-by: Minchan Kim <minchan@kernel.org>
    Signed-off-by: Hugh Dickins <hughd@google.com>
    Cc: stable@vger.kernel.org [3.1, 3.2, 3.3, 3.4]
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit f961f72836eb6c0fd76201f6f6b2fafff93c4cea
Author: Jan Kiszka <jan.kiszka@siemens.com>
Date:   Fri Jun 15 07:56:20 2012 -0600

    KVM: Fix PCI header check on device assignment

    The masking was wrong (must have been 0x7f), and there is no need to
    re-read the value as pci_setup_device already does this for us.

    Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=43339
    Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
    Acked-by: Alex Williamson <alex.williamson@redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

commit a2c2df8672f55195f101d9251117aa59e358d296
Merge: 873b779 ea80dad
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri Jun 15 17:39:32 2012 -0700

    Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

    Pull SCSI fixes from James Bottomley:
     "This is a couple of minor fixes, one for a preempt warning in the
      mpt2sas driver and one is a config failure with the new sd async
      domain."

    * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
      [SCSI] Fix sd_probe_domain config problem
      [SCSI] mpt2sas: Fix unsafe using smp_processor_id() in preemptible

commit 873b779d998fd70e17a3f2bff6a35f0e0a3b0f11
Merge: 56b880e e216c8c
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri Jun 15 17:37:23 2012 -0700

    Merge tag 'nfs-for-3.5-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

    Pull NFS client bugfixes from Trond Myklebust:
     "Highlights include:

       - Fix a couple of mount regressions due to the recent cleanups.
       - Fix an Oops in the open recovery code
       - Fix an rpc_pipefs upcall hang that results from some of the net
         namespace work from 3.4.x (stable kernel candidate).
       - Fix a couple of write and o_direct regressions that were found at
         last weeks Bakeathon testing event in Ann Arbor."

    * tag 'nfs-for-3.5-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
      NFS: add an endian notation for sparse
      NFSv4.1: integer overflow in decode_cb_sequence_args()
      rpc_pipefs: allow rpc_purge_list to take a NULL waitq pointer
      NFSv4 do not send an empty SETATTR compound
      NFSv2: EOF incorrectly set on short read
      NFS: Use the NFS_DEFAULT_VERSION for v2 and v3 mounts
      NFS: fix directio refcount bug on commit
      NFSv4: Fix unnecessary delegation returns in nfs4_do_open
      NFSv4.1: Convert another trivial printk into a dprintk
      NFS4: Fix open bug when pnfs module blacklisted
      NFS: Remove incorrect BUG_ON in nfs_found_client
      NFS: Map minor mismatch error to protocol not support error.
      NFS: Fix a commit bug
      NFS4: Set parsed mount data version to 4
      NFSv4.1: Ensure we clear session state flags after a session creation
      NFSv4.1: Convert a trivial printk into a dprintk
      NFSv4: Fix up decode_attr_mdsthreshold
      NFSv4: Fix an Oops in the open recovery code
      NFSv4.1: Fix a request leak on the back channel

commit 56b880e2e38da6c76c454052a93c0a92aa3586f7
Merge: 1043e3b c080e26
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri Jun 15 17:35:01 2012 -0700

    Merge branch 'fixes-for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

    Pull DMA-mapping fixes from Marek Szyprowski:
     "A set of minor fixes for dma-mapping code (ARM and x86) required for
      Contiguous Memory Allocator (CMA) patches merged in v3.5-rc1."

    * 'fixes-for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
      x86: dma-mapping: fix broken allocation when dma_mask has been provided
      ARM: dma-mapping: fix debug messages in dmabounce code
      ARM: mm: fix type of the arm_dma_limit global variable
      ARM: dma-mapping: Add missing static storage class specifier

commit 1043e3becfbae0bee618f9b4f9598b145c4774e1
Merge: 93dd048 f948501
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri Jun 15 17:28:20 2012 -0700

    Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

    Pull PowerPC fix from Paul Mackerras:
     "Just one commit, and a one-liner at that, but an important one;
      without it hard_irq_disable() does nothing on powerpc."

    * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
      Make hard_irq_disable() actually hard-disable interrupts

commit 93dd048dbde493fb1eb11cdc844be5fa9cd1c925
Merge: 069915b bc2df47
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri Jun 15 17:27:31 2012 -0700

    Merge branch 'for-3.5' of git://linux-nfs.org/~bfields/linux

    Pull two nfsd bugfixes from J. Bruce Fields.

    * 'for-3.5' of git://linux-nfs.org/~bfields/linux:
      nfsd4: BUG_ON(!is_spin_locked()) no good on UP kernels
      NFS: hard-code init_net for NFS callback transports

commit 069915b94642b05c9b45fee36862157026b36614
Merge: 41c8c53 b9e0d95
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri Jun 15 17:17:15 2012 -0700

    Merge tag 'stable/for-linus-3.5-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

    Pull five Xen bug-fixes from Konrad Rzeszutek Wilk:

     - When booting as PVHVM we would try to use PV console - but would not validate
       the parameters causing us to crash during restore b/c we re-use the wrong event
       channel.
     - When booting on machines with SR-IOV PCI bridge we didn't check for the bridge
       and tried to use it.
     - Under AMD machines would advertise the APERFMPERF resulting in needless amount
       of MSRs from the guest.
     - A global value (xen_released_pages) was not subtracted at bootup when pages
       were added back in. This resulted in the balloon worker having the wrong
       account of how many pages were truly released.
     - Fix dead-lock when xen-blkfront is run in the same domain as xen-blkback.

    * tag 'stable/for-linus-3.5-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
      xen: mark local pages as FOREIGN in the m2p_override
      xen/setup: filter APERFMPERF cpuid feature out
      xen/balloon: Subtract from xen_released_pages the count that is populated.
      xen/pci: Check for PCI bridge before using it.
      xen/events: Add WARN_ON when quick lookup found invalid type.
      xen/hvc: Check HVM_PARAM_CONSOLE_[EVTCHN|PFN] for correctness.
      xen/hvc: Fix error cases around HVM_PARAM_CONSOLE_PFN
      xen/hvc: Collapse error logic.

commit 41c8c535237e9cea522024548c5bc37f7d34a81f
Merge: 8e53ed1 b3a3dd0
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri Jun 15 17:10:02 2012 -0700

    Merge tag 'usb-3.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

    Pull USB fixes from Greg Kroah-Hartman:
     "Here are a bunch of tiny fixes for the USB core and drivers for
      3.5-rc3

      A bunch of gadget fixes, and new device ids, as well as some fixes for
      a number of different regressions that have been reported recently.
      We also fixed some PCI host controllers to resolve a long-standing bug
      with a whole class of host controllers that have been plaguing people
      for a number of kernel releases, preventing their systems from
      suspending properly.

      Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"

    * tag 'usb-3.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (41 commits)
      USB: fix gathering of interface associations
      usb: ehci-sh: fix illegal phy_init() running when platform_data is NULL
      usb: cdc-acm: fix devices not unthrottled on open
      Fix OMAP EHCI suspend/resume failure (i693)
      USB: ohci-hub: Mark ohci_finish_controller_resume() as __maybe_unused
      usb: use usb_serial_put in usb_serial_probe errors
      USB: EHCI: Fix build warning in xilinx ehci driver
      USB: fix PS3 EHCI systems
      xHCI: Increase the timeout for controller save/restore state operation
      xhci: Don't free endpoints in xhci_mem_cleanup()
      xhci: Fix invalid loop check in xhci_free_tt_info()
      xhci: Fix error path return value.
      USB: Checking the wrong variable in usb_disable_lpm()
      usb-storage: Add 090c:1000 to unusal-devs
      USB: serial-generic: use a single set of device IDs
      USB: serial: Enforce USB driver and USB serial driver match
      USB: add NO_D3_DURING_SLEEP flag and revert 151b61284776be2
      USB: option: add more YUGA device ids
      USB: mos7840: Fix compilation of usb serial driver
      USB: option: fix memory leak
      ...

commit 8e53ed10f871a077cc61374c74e0bbab25264208
Merge: 06da035 e58c5de
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri Jun 15 17:07:48 2012 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide

    Pull IDE fixes from David S. Miller:

    1) Two fixes to icside, one for a build failure and another for a
       warning.  From Christian Dietrich.

    2) Fix a bit operation that did erroneous masking, from Julia Lawall.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
      drivers/ide/ide-cs.c: adjust suspicious bit operation
      ide: icside.c: fix printk format string compile warning
      ide: icside.c: Fix compile with CONFIG_BLK_DEV_IDEDMA_ICS=n

commit a8c4a33b98b097e69cd1a10672c43d17ad0ffb25
Author: Chris Mason <chris.mason@fusionio.com>
Date:   Fri Jun 15 20:07:17 2012 -0400

    Btrfs: cast devid to unsigned long long for printk %llu

    Avoid warning in 32 bit machines

    Signed-off-by: Chris Mason <chris.mason@fusionio.com>

commit 06da03510e0cf669a2c434484b90c0ab09d2b086
Merge: c83119a 8a51178
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri Jun 15 17:07:06 2012 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

    Pull sparc update from David S. Miller:
     "This just removes some sparc headers that were never, ever, used."

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
      sparc: remove two unused headers

commit 4325edd0786fdd3909f9550e52a963b2fe54f78b
Author: Chris Mason <chris.mason@fusionio.com>
Date:   Fri Jun 15 20:02:02 2012 -0400

    Btrfs: init old_generation in get_old_root

    gcc was giving an uninit variable warning here.  Strictly
    speaking we don't need to init it, but this will make things
    much less error prone.

    Signed-off-by: Chris Mason <chris.mason@fusionio.com>

commit c83119a980166539bc14033d89e83cd2e4f2da52
Merge: ed21a66 161270f
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri Jun 15 16:59:19 2012 -0700

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

    Pull x86 fixes from Ingo Molnar.

    * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      x86/smp: Fix topology checks on AMD MCM CPUs
      x86/mm: Fix some kernel-doc warnings
      x86, um: Correct syscall table type attributes breaking gcc 4.8

commit ed21a66c1862499bb21c8e48a450e13fb830f46b
Merge: a95f9b6 a702704
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri Jun 15 16:58:10 2012 -0700

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

    Pull perf fixes from Ingo Molnar.

    * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      watchdog: Quiet down the boot messages
      perf/x86: Fix broken LBR fixup code
      tracing: Have tracing_off() actually turn tracing off

commit a95f9b6e092ed862278e08266207c7ab231076b4
Merge: a41b0e7 4a1e001
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri Jun 15 16:52:35 2012 -0700

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

    Pull core updates (RCU and locking) from Ingo Molnar:
     "Most of the diffstat comes from the RCU slow boot regression fixes,
      but there's also a debuggability improvements/fixes."

    * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      memblock: Document memblock_is_region_{memory,reserved}()
      rcu: Precompute RCU_FAST_NO_HZ timer offsets
      rcu: Move RCU_FAST_NO_HZ per-CPU variables to rcu_dynticks structure
      rcu: Update RCU_FAST_NO_HZ tracing for lazy callbacks
      rcu: RCU_FAST_NO_HZ detection of callback adoption
      spinlock: Indicate that a lockup is only suspected
      kdump: Execute kmsg_dump(KMSG_DUMP_PANIC) after smp_send_stop()
      panic: Make panic_on_oops configurable

commit a41b0e71563166762ee9d4905f3aa518a9348ed4
Merge: 718f58a 5134de28
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri Jun 15 16:07:24 2012 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

    Pull target updates from Nicholas Bellinger:
     "This series contains post merge qla_target.c / tcm_qla2xxx bugfixes
      from the past weeks, including the patch to allow target-core to use
      an optional session shutdown callback to help address an active I/O
      shutdown bug in tcm_qla2xxx code (Joern).

      Also included is a target regression bugfix releated to explict ALUA
      target port group CDB emulation that is CC'ed to stable (Roland)."

    * git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
      qla2xxx: Remove version.h header file inclusion
      tcm_qla2xxx: Handle malformed wwn strings properly
      tcm_qla2xxx: tcm_qla2xxx_handle_tmr() can be static
      qla2xxx: Don't leak commands we give up on in qlt_do_work()
      qla2xxx: Don't crash if we can't find cmd for failed CTIO
      tcm_qla2xxx: Don't insert nacls without sessions into the btree
      target: Return error to initiator if SET TARGET PORT GROUPS emulation fails
      tcm_qla2xxx: Clear session s_id + loop_id earlier during shutdown
      tcm_qla2xxx: Convert to TFO->put_session() usage
      target: Add TFO->put_session() caller for HW fabric session shutdown

commit 718f58ad61810b7d4a6c9178185495f762e90807
Merge: 424d54d 9c10640
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri Jun 15 16:04:37 2012 -0700

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

    Pull btrfs update from Chris Mason:
     "The dates look like I had to rebase this morning because there was a
      compiler warning for a printk arg that I had missed earlier.

      These are all fixes, including one to prevent using stale pointers for
      device names, and lots of fixes around transaction abort cleanups
      (Josef, Liu Bo).

      Jan Schmidt also sent in a number of fixes for the new reference
      number tracking code.

      Liu Bo beat me to updating the MAINTAINERS file.  Since he thought to
      also fix the git url, I kept his commit."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (24 commits)
      Btrfs: update MAINTAINERS info for BTRFS FILE SYSTEM
      Btrfs: destroy the items of the delayed inodes in error handling routine
      Btrfs: make sure that we've made everything in pinned tree clean
      Btrfs: avoid memory leak of extent state in error handling routine
      Btrfs: do not resize a seeding device
      Btrfs: fix missing inherited flag in rename
      Btrfs: fix incompat flags setting
      Btrfs: fix defrag regression
      Btrfs: call filemap_fdatawrite twice for compression
      Btrfs: keep inode pinned when compressing writes
      Btrfs: implement ->show_devname
      Btrfs: use rcu to protect device->name
      Btrfs: unlock everything properly in the error case for nocow
      Btrfs: fix btrfs_destroy_marked_extents
      Btrfs: abort the transaction if the commit fails
      Btrfs: wake up transaction waiters when aborting a transaction
      Btrfs: fix locking in btrfs_destroy_delayed_refs
      Btrfs: pass locked_page into extent_clear_unlock_delalloc if theres an error
      Btrfs: fix race in tree mod log addition
      Btrfs: add btrfs_next_old_leaf
      ...

commit e2ae715d66bf4becfb85eb84b7150e23cf27df30
Author: Kay Sievers <kay@vrfy.org>
Date:   Fri Jun 15 14:07:51 2012 +0200

    kmsg - kmsg_dump() use iterator to receive log buffer content

    Provide an iterator to receive the log buffer content, and convert all
    kmsg_dump() users to it.

    The structured data in the kmsg buffer now contains binary data, which
    should no longer be copied verbatim to the kmsg_dump() users.

    The iterator should provide reliable access to the buffer data, and also
    supports proper log line-aware chunking of data while iterating.

    Signed-off-by: Kay Sievers <kay@vrfy.org>
    Tested-by: Tony Luck <tony.luck@intel.com>
    Reported-by: Anton Vorontsov <anton.vorontsov@linaro.org>
    Tested-by: Anton Vorontsov <anton.vorontsov@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 3026b0e942c65c65c8fc80d391d004228b52b916
Author: Lubomir Schmidt <gentoo.lubomir@googlemail.com>
Date:   Fri Jun 15 15:12:17 2012 -0500

    staging: r8712u: Add new USB IDs

    There are two new devices for this driver.

    Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 8ed9eac4769407a8f0b93e381a3bc3ae81fa014b
Merge: a702704 cb9dd49
Author: Ingo Molnar <mingo@kernel.org>
Date:   Fri Jun 15 21:02:16 2012 +0200

    Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent

    Pull perf fixes from Arnaldo Carvalho de Melo:

    * Set name of tracepoints when reading the perf.data headers, so that
      we don't end up using the local ones, from /sys.

    * Fix default output file for perf stat, from Stephane Eranian.

    * Fix endian handling of features bitmask in perf.data header, from David Ahern.

    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@kernel.org>

commit 9c106405ddf893fcd04cd46555464417d2df8451
Author: Liu Bo <liubo2009@cn.fujitsu.com>
Date:   Thu Jun 14 02:23:25 2012 -0600

    Btrfs: update MAINTAINERS info for BTRFS FILE SYSTEM

    Update to the latest btrfs's maintainer mail and git repo.

    Signed-off-by: Liu Bo <liubo2009@cn.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason@fusionio.com>

commit 67cde3448d951b55088a6ea3bb1aee0160068fb9
Author: Miao Xie <miaox@cn.fujitsu.com>
Date:   Thu Jun 14 02:23:22 2012 -0600

    Btrfs: destroy the items of the delayed inodes in error handling routine

    the items of the delayed inodes were forgotten to be freed, this patch
    fixes it.

    Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason@fusionio.com>

commit ed0eaa14981e87a1e185b61e4ef621c440e3930c
Author: Liu Bo <liubo2009@cn.fujitsu.com>
Date:   Thu Jun 14 02:23:21 2012 -0600

    Btrfs: make sure that we've made everything in pinned tree clean

    Since we have two trees for recording pinned extents, we need to go through
    both of them to make sure that we've done everything clean.

    Signed-off-by: Liu Bo <liubo2009@cn.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason@fusionio.com>

commit 6e841e32b159e298debbb2cb0e9158e894fcaf05
Author: Liu Bo <liubo2009@cn.fujitsu.com>
Date:   Thu Jun 14 02:23:20 2012 -0600

    Btrfs: avoid memory leak of extent state in error handling routine

    We've forgotten to clear extent states in pinned tree, which will results in
    space counter mismatch and memory leak:

    WARNING: at fs/btrfs/extent-tree.c:7537 btrfs_free_block_groups+0x1f3/0x2e0 [btrfs]()
    ...
    space_info 2 has 8380416 free, is not full
    space_info total=12582912, used=4096, pinned=4096, reserved=0, may_use=0, readonly=4194304
    btrfs state leak: start 29364224 end 29376511 state 1 in tree ffff880075f20090 refs 1
    ...

    Signed-off-by: Liu Bo <liubo2009@cn.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason@fusionio.com>

commit 4e42ae1bdcda77fc958a17d7ff4ba5a9c9c207da
Author: Liu Bo <liubo2009@cn.fujitsu.com>
Date:   Thu Jun 14 02:23:19 2012 -0600

    Btrfs: do not resize a seeding device

    Seeding devices are not supposed to change any more.

    Signed-off-by: Liu Bo <liubo2009@cn.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason@fusionio.com>

commit bc1782374b128103ae9689e0753e0610f35b6bfd
Author: Liu Bo <liubo2009@cn.fujitsu.com>
Date:   Thu Jun 14 02:23:18 2012 -0600

    Btrfs: fix missing inherited flag in rename

    When we move a file into a directory with compression flag, we need to
    inherite BTRFS_INODE_COMPRESS and clear BTRFS_INODE_NOCOMPRESS as well.
    But if we move a file into a directory without compression flag, we need
    to clear both of them.

    It is the way how our setflags deals with compression flag, so keep
    the same behaviour here.

    Signed-off-by: Liu Bo <liubo2009@cn.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason@fusionio.com>

commit acbcabd2de05f331c51700773f701e90bd7f74dc
Merge: 69e380d 3310c36
Author: Chris Mason <chris.mason@fusionio.com>
Date:   Thu Jun 14 21:33:34 2012 -0400

    Merge branch 'for-chris' of git://git.jan-o-sch.net/btrfs-unstable into for-linus

commit f948501b36c6b3d9352ce212a197098a7e958971
Author: Paul Mackerras <paulus@samba.org>
Date:   Fri Jun 15 14:51:39 2012 +1000

    Make hard_irq_disable() actually hard-disable interrupts

    At present, hard_irq_disable() does nothing on powerpc because of
    this code in include/linux/interrupt.h:

        #ifndef hard_irq_disable
        #define hard_irq_disable()      do { } while(0)
        #endif

    So we need to make our hard_irq_disable be a macro.  It was previously
    a macro until commit 7230c56441 ("powerpc: Rework lazy-interrupt
    handling") changed it to a static inline function.

    Cc: stable@vger.kernel.org
    Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    --
     arch/powerpc/include/asm/hw_irq.h |    3 +++
     1 file changed, 3 insertions(+)

commit 69e380d176e73653e09ce2cf3a5dc09682a69229
Author: Li Zefan <lizefan@huawei.com>
Date:   Mon Jun 11 17:10:51 2012 +0800

    Btrfs: fix incompat flags setting

    It's a bug, but it happens to work, as BTRFS_COMPRESS_LZO == 2, which
    has only one bit set.

    Signed-off-by: Li Zefan <lizefan@huawei.com>

commit 6c282eb40ed6f64a51ff447707714df551d85b8e
Author: Li Zefan <lizefan@huawei.com>
Date:   Mon Jun 11 16:03:35 2012 +0800

    Btrfs: fix defrag regression

    If a file has 3 small extents:

    | ext1 | ext2 | ext3 |

    Running "btrfs fi defrag" will only defrag the last two extents, if those
    extent mappings hasn't been read into memory from disk.

    This bug was introduced by commit 17ce6ef8d731af5edac8c39e806db4c7e1f6956f
    ("Btrfs: add a check to decide if we should defrag the range")

    The cause is, that commit looked into previous and next extents using
    lookup_extent_mapping() only.

    While at it, remove the code that checks the previous extent, since
    it's sufficient to check the next extent.

    Signed-off-by: Li Zefan <lizefan@huawei.com>

commit 7ddf5a42d311d74fd9f7373cb56def0843c219f8
Author: Josef Bacik <josef@redhat.com>
Date:   Fri Jun 8 15:26:47 2012 -0400

    Btrfs: call filemap_fdatawrite twice for compression

    I removed this in an earlier commit and I was wrong.  Because compression
    can return from filemap_fdatawrite() without having actually set any of it's
    pages as writeback() it can make filemap_fdatawait() do essentially nothing,
    and then we won't find any ordered extents because they may not have been
    created yet.  So not only does this make fsync() completely useless, but it
    will also screw up if you truncate on a non-page aligned offset since we
    zero out the end and then wait on ordered extents and then call drop caches.
    We can drop the cache before the io completes and then we try to unpin the
    extent we just wrote we won't find it and everything goes sideways.  So fix
    this by putting it back and put a giant comment there to keep me from trying
    to remove it in the future.  Thanks,

    Signed-off-by: Josef Bacik <josef@redhat.com>

commit 8180ef8894fa402443205cff1e23417e8d3434df
Author: Josef Bacik <josef@redhat.com>
Date:   Fri Jun 8 15:16:12 2012 -0400

    Btrfs: keep inode pinned when compressing writes

    A user reported lots of problems using compression on the new code and it
    turns out part of the problem was that igrab() was failing when we added a
    new ordered extent.  This is because when writing out an inode under
    compression we immediately return without actually doing anything to the
    pages, and then in another thread at some point down the line actually do
    the ordered dance.  The problem is between the point that we start writeback
    and we actually add the ordered extent we could be trying to reclaim the
    inode, which makes igrab() return NULL.  So we need to do an igrab() when we
    create the async extent and then drop it when we are done with it.  This
    makes sure we stay pinned in memory until the ordered extent can get a
    reference on it and we are good to go.  With this patch we no longer panic
    in btrfs_finish_ordered_io().  Thanks,

    Signed-off-by: Josef Bacik <josef@redhat.com>

commit 9c5085c147989d48dfe74194b48affc23f376650
Author: Josef Bacik <josef@redhat.com>
Date:   Tue Jun 5 14:13:12 2012 -0400

    Btrfs: implement ->show_devname

    Because btrfs can remove the device that was mounted we need to have a
    ->show_devname so that in this case we can print out some other device in
    the file system to /proc/mount.  So if there are multiple devices in a btrfs
    file system we will just print the device with the lowest devid that we can
    find.  This will make everything consistent and deal with device removal
    properly.  The drawback is if you mount with a device that is higher than
    the lowest devicd it won't show up as the mounted device in /proc/mounts,
    but this is a small price to pay. This was inspired by Miao Xie's patch.
    Thanks,

    Reviewed-by: Miao Xie <miaox@cn.fujitsu.com>
    Signed-off-by: Josef Bacik <josef@redhat.com>

commit 606686eeac4550d2212bf3d621a810407ef5e9bf
Author: Josef Bacik <josef@redhat.com>
Date:   Mon Jun 4 14:03:51 2012 -0400

    Btrfs: use rcu to protect device->name

    Al pointed out that we can just toss out the old name on a device and add a
    new one arbitrarily, so anybody who uses device->name in printk could
    possibly use free'd memory.  Instead of adding locking around all of this he
    suggested doing it with RCU, so I've introduced a struct rcu_string that
    does just that and have gone through and protected all accesses to
    device->name that aren't under the uuid_mutex with rcu_read_lock().  This
    protects us and I will use it for dealing with removing the device that we
    used to mount the file system in a later patch.  Thanks,

    Reviewed-by: David Sterba <dsterba@suse.cz>
    Signed-off-by: Josef Bacik <josef@redhat.com>

commit 17ca04aff7e6171df684b7b65804df8830eb8c15
Author: Josef Bacik <josef@redhat.com>
Date:   Thu May 31 15:58:55 2012 -0400

    Btrfs: unlock everything properly in the error case for nocow

    I was getting hung on umount when a transaction was aborted because a range
    of one of the free space inodes was still locked.  This is because the nocow
    stuff doesn't unlock anything on error.  This fixed the problem and I
    verified that is what was happening.  Thanks,

    Signed-off-by: Josef Bacik <josef@redhat.com>

commit ee670f0af35871edb492db5ba406cef36d1b7c21
Author: Josef Bacik <josef@redhat.com>
Date:   Thu May 31 15:54:30 2012 -0400

    Btrfs: fix btrfs_destroy_marked_extents

    So we're forcing the eb's to have their ref count set to 1 so invalidatepage
    works but this breaks lots of things, for example root nodes, and is just
    plain wrong, we don't need to just evict all of this stuff.  Also drop the
    invalidatepage altogether and add a page_cache_release().  With this patch
    we no longer hang when trying to access the root nodes after an aborted
    transaction and we no longer leak memory.  Thanks,

    Signed-off-by: Josef Bacik <josef@redhat.com>

commit 7b8b92af58db347de64a237861fcf13374b34a9c
Author: Josef Bacik <josef@redhat.com>
Date:   Thu May 31 15:52:43 2012 -0400

    Btrfs: abort the transaction if the commit fails

    If a transaction commit fails we don't abort it so we don't set an error on
    the file system.  This patch fixes that by actually calling the abort stuff
    and then adding a check for a fs error in the transaction start stuff to
    make sure it is caught properly.  Thanks,

    Signed-off-by: Josef Bacik <josef@redhat.com>

commit d7096fc3ef8360f30f228344bc564d4f97d8a158
Author: Josef Bacik <josef@redhat.com>
Date:   Thu May 31 15:49:57 2012 -0400

    Btrfs: wake up transaction waiters when aborting a transaction

    I was getting lots of hung tasks and a NULL pointer dereference because we
    are not cleaning up the transaction properly when it aborts.  First we need
    to reset the running_transaction to NULL so we don't get a bad dereference
    for any start_transaction callers after this.  Also we cannot rely on
    waitqueue_active() since it's just a list_empty(), so just call wake_up()
    directly since that will do the barrier for us and such.  Thanks,

    Signed-off-by: Josef Bacik <josef@redhat.com>

commit b939d1ab76b4aa816343cdbd8b44ce9929a3b9ef
Author: Josef Bacik <josef@redhat.com>
Date:   Thu May 31 11:06:33 2012 -0400

    Btrfs: fix locking in btrfs_destroy_delayed_refs

    The transaction abort stuff was throwing warnings from the list debugging
    code because we do a list_del_init outside of the delayed_refs spin lock.
    The delayed refs locking makes baby Jesus cry so it's not hard to get wrong,
    but we need to take the ref head mutex to make sure it's not being processed
    currently, and so if it is we need to drop the spin lock and then take and
    drop the mutex and do the search again.  If we can take the mutex then we
    can safely remove the head from the list and carry on.  Now when the
    transaction aborts I don't get the list debugging warnings.  Thanks,

    Signed-off-by: Josef Bacik <josef@redhat.com>

commit beb42dd793193a3d4e72970bfa73cd8810f63cea
Author: Josef Bacik <josef@redhat.com>
Date:   Wed May 30 15:35:17 2012 -0400

    Btrfs: pass locked_page into extent_clear_unlock_delalloc if theres an error

    While doing my enospc work I got a transaction abortion that resulted in a
    panic when we tried to unlock_page() an already unlocked page.  This is
    because we aren't calling extent_clear_unlock_delalloc with the locked page
    so it was unlocking all the pages in the range.  This is wrong since
    __extent_writepage expects to have the page locked still unless we return
    *page_started as 1.  This should keep us from panicing.  Thanks,

    Signed-off-by: Josef Bacik <josef@redhat.com>

commit 9f77186dd13125bef301f9136b6075f5530f3d85
Author: Ben Chan <benchan@chromium.org>
Date:   Thu Jun 14 13:18:56 2012 -0700

    staging: gdm72xx: Release netlink socket properly

    This patch modifies the gdm72xx driver to properly release a netlink
    socket using netlink_kernel_release. It fixes the following kernel
    crash, which occurs after repeatedly suspending and resuming a system.

       kernel BUG at /home/benchan/trunk/src/third_party/kernel/files/mm/slub.c:3471!
       invalid opcode: 0000 [#1] SMP
       CPU 2
       Modules linked in: asix usbnet snd_hda_codec_hdmi
       snd_hda_codec_cirrus i2c_dev uinput snd_hda_intel snd_hda_codec
       snd_hwdep snd_pcm snd_timer bluetooth snd_page_alloc fuse aesni_intel
       cryptd isl29018(C) aes_x86_64 industrialio(C) memconsole nm10_gpio
       rtc_cmos nf_conntrack_ipv6 nf_defrag_ipv6 r8169 ath9k mac80211
       ip6table_filter ath9k_common ath9k_hw ath cfg80211 xt_mark ip6_tables
       uvcvideo videobuf2_core videodev videobuf2_vmalloc videobuf2_memops
       gdmwm(C) joydev

       Pid: 3125, comm: kworker/u:30 Tainted: G        WC   3.4.0 #1
       RIP: 0010:[<ffffffff810cda19>]  [<ffffffff810cda19>] kfree+0x67/0xca
       RSP: 0018:ffff880134977d60  EFLAGS: 00010246
       RAX: 4000000000000400 RBX: ffffffff818832a0 RCX: 0000000000000000
       RDX: 4000000000000000 RSI: 0000000000000000 RDI: ffffffff818832a0
       RBP: ffff880134977d80 R08: 00000000ffffffff R09: ffffea00000620c0
       R10: ffffffff8111b729 R11: ffff880149fb3840 R12: ffffffff81a08840
       R13: ffffffff813f5bc3 R14: ffffffff8138ed84 R15: 0000000000000000
       FS:  0000000000000000(0000) GS:ffff88014fb00000(0000) knlGS:0000000000000000
       CS:  0010 DS: 0000 ES: 0000 CR0: 000000008005003b
       CR2: 00007f7cad963110 CR3: 000000000180b000 CR4: 00000000000407e0
       DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
       DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
       Process kworker/u:30 (pid: 3125, threadinfo ffff880134976000, task ffff8801330647e0)
       Stack:
        0000000000000002 ffffffff818832a0 ffffffff81a08840 ffff880134977df0
        ffff880134977da0 ffffffff813f5bc3 ffff880134977df0 ffffffff81883250
        ffff880134977dd0 ffffffff8138e64c 0000000180150010 ffffffff81883250
       Call Trace:
        [<ffffffff813f5bc3>] ipv4_sysctl_exit_net+0x23/0x27
        [<ffffffff8138e64c>] ops_exit_list+0x27/0x50
        [<ffffffff8138ee72>] cleanup_net+0xee/0x17c
        [<ffffffff81040c64>] process_one_work+0x199/0x2b8
        [<ffffffff810416e4>] worker_thread+0x13c/0x222
        [<ffffffff810415a8>] ? manage_workers.isra.26+0x171/0x171
        [<ffffffff8104506d>] kthread+0x8b/0x93
        [<ffffffff8145b414>] kernel_thread_helper+0x4/0x10
        [<ffffffff81044fe2>] ? __init_kthread_worker+0x39/0x39
        [<ffffffff8145b410>] ? gs_change+0xb/0xb
       Code: 83 c4 10 49 83 3c 24 00 eb e4 48 83 fb 10 76 76 48 89 df e8 17
       e1 ff ff 49 89 c1 48 8b 00 a8 80 75 15 49 f7 01 00 c0 00 00 75 02
       <0f> 0b 4c 89 cf e8 b8 b4 fd ff eb 4f 4c 8b 55 08 49 8b 79 30 48
       RIP  [<ffffffff810cda19>] kfree+0x67/0xca
        RSP <ffff880134977d60>

    Signed-off-by: Ben Chan <benchan@chromium.org>
    Cc: Sage Ahn <syahn@gctsemi.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit a529ae4ba3acfd97210769e3445e8d8b07ca1112
Author: Jiri Kosina <jkosina@suse.cz>
Date:   Thu Jun 14 15:45:09 2012 +0200

    iio: drop wrong reference from Kconfig

    The documentation lives in drivers/staging/iio/Documentation, but
    according to Jonathan it's obsolete and needs fixing.

    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    Acked-by: Jonathan Cameron <jic23@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 1bd289d1e8e29c09be0e783a53f16a1dc80684be
Author: Manohar Vanga <manohar.vanga@cern.ch>
Date:   Thu Jun 14 15:57:01 2012 +0200

    vme: change maintainer e-mail address

    This changes my e-mail address from my work address to my personal
    one as I finish my contract with CERN at the end of June 2012. I
    will continue helping with maintaining the VME driver regardless.

    Signed-off-by: Manohar Vanga <manohar.vanga@cern.ch>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit c3b15452e253ab0629cd9e400d3fb6d76c76cb73
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date:   Tue Jun 5 16:43:53 2012 +0100

    Extcon: Don't try to create duplicate link names

    We can't create a link from the device to the compatibility switch class
    since we already create a link from the device to to the extcon class
    object and we try to use the same name for both links. This causes a loud
    complaint from sysfs on boot.

    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit b3a3dd074f7053ef824ad077e5331b52220ceba1
Author: Daniel Mack <zonque@gmail.com>
Date:   Tue Jun 12 20:23:52 2012 +0200

    USB: fix gathering of interface associations

    TEAC's UD-H01 (and probably other devices) have a gap in the interface
    number allocation of their descriptors:

      Configuration Descriptor:
        bLength                 9
        bDescriptorType         2
        wTotalLength          220
        bNumInterfaces          3
        [...]
        Interface Descriptor:
          bLength                 9
          bDescriptorType         4
          bInterfaceNumber        0
          bAlternateSetting       0
          [...]
        Interface Association:
          bLength                 8
          bDescriptorType        11
          bFirstInterface         2
          bInterfaceCount         2
          bFunctionClass          1 Audio
          bFunctionSubClass       0
          bFunctionProtocol      32
          iFunction               4
        Interface Descriptor:
          bLength                 9
          bDescriptorType         4
          bInterfaceNumber        2
          bAlternateSetting       0
          [...]

    Once a configuration is selected, usb_set_configuration() walks the
    known interfaces of a given configuration and calls find_iad() on
    each of them to set the interface association pointer the interface
    is included in.

    The problem here is that the loop variable is taken for the interface
    number in the comparison logic that gathers the association. Which is
    fine as long as the descriptors are sane.

    In the case above, however, the logic gets out of sync and the
    interface association fields of all interfaces beyond the interface
    number gap are wrong.

    Fix this by passing the interface's bInterfaceNumber to find_iad()
    instead.

    Signed-off-by: Daniel Mack <zonque@gmail.com>
    Reported-by: bEN <ml_all@circa.be>
    Reported-by: Ivan Perrone <ivanperrone@hotmail.com>
    Tested-by: ivan perrone <ivanperrone@hotmail.com>
    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 5897b038296ea84e501ba5f957e11939f8cf9be0
Author: Shimoda, Yoshihiro <yoshihiro.shimoda.uh@renesas.com>
Date:   Tue Jun 12 09:34:33 2012 +0900

    usb: ehci-sh: fix illegal phy_init() running when platform_data is NULL

    If the platform_data is not set, pdata will be uninitialized value.
    Since the driver has the following code, if the condition is true when
    the pdata is uninitialized value, the driver may jump to the illegal
    phy_init().

    	if (pdata && pdata->phy_init)
    		pdata->phy_init();

    This patch also fixes the following warning:

      CC      drivers/usb/host/ehci-hcd.o
    drivers/usb/host/ehci-sh.c: In function ‘ehci_hcd_sh_probe’:
    drivers/usb/host/ehci-sh.c:104: warning: ‘pdata’ may be used uninitialized in this function

    Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
    Acked-by: Alan Stern <stern@rowland.harvard.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 6c4707f3f8c44ec18282e1c014c80e1c257042f9
Author: Otto Meta <otto.patches@sister-shadow.de>
Date:   Wed Jun 6 18:46:21 2012 +0200

    usb: cdc-acm: fix devices not unthrottled on open

    Currently CDC-ACM devices stay throttled when their TTY is closed while
    throttled, stalling further communication attempts after the next open.

    Unthrottling during open/activate got lost starting with kernel
    3.0.0 and this patch reintroduces it.

    Signed-off-by: Otto Meta <otto.patches@sister-shadow.de>
    Cc: stable <stable@vger.kernel.org>
    Acked-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 7b33dc2b050b71de0e202885a26caffbc864d072
Author: Dan Carpenter <dan.carpenter@oracle.com>
Date:   Thu Jun 14 21:36:09 2012 +0300

    RDMA/ocrdma: Fix off by one in ocrdma_query_gid()

    The dev->sgid_tbl[] array is allocated in ocrdma_alloc_resources().
    It has OCRDMA_MAX_SGID elements so the test here is off by one.

    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Roland Dreier <roland@purestorage.com>

commit b9e0d95c041ca2d7ad297ee37c2e9cfab67a188f
Author: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Date:   Wed May 23 18:57:20 2012 +0100

    xen: mark local pages as FOREIGN in the m2p_override

    When the frontend and the backend reside on the same domain, even if we
    add pages to the m2p_override, these pages will never be returned by
    mfn_to_pfn because the check "get_phys_to_machine(pfn) != mfn" will
    always fail, so the pfn of the frontend will be returned instead
    (resulting in a deadlock because the frontend pages are already locked).

    INFO: task qemu-system-i38:1085 blocked for more than 120 seconds.
    "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
    qemu-system-i38 D ffff8800cfc137c0     0  1085      1 0x00000000
     ffff8800c47ed898 0000000000000282 ffff8800be4596b0 00000000000137c0
     ffff8800c47edfd8 ffff8800c47ec010 00000000000137c0 00000000000137c0
     ffff8800c47edfd8 00000000000137c0 ffffffff82213020 ffff8800be4596b0
    Call Trace:
     [<ffffffff81101ee0>] ? __lock_page+0x70/0x70
     [<ffffffff81a0fdd9>] schedule+0x29/0x70
     [<ffffffff81a0fe80>] io_schedule+0x60/0x80
     [<ffffffff81101eee>] sleep_on_page+0xe/0x20
     [<ffffffff81a0e1ca>] __wait_on_bit_lock+0x5a/0xc0
     [<ffffffff81101ed7>] __lock_page+0x67/0x70
     [<ffffffff8106f750>] ? autoremove_wake_function+0x40/0x40
     [<ffffffff811867e6>] ? bio_add_page+0x36/0x40
     [<ffffffff8110b692>] set_page_dirty_lock+0x52/0x60
     [<ffffffff81186021>] bio_set_pages_dirty+0x51/0x70
     [<ffffffff8118c6b4>] do_blockdev_direct_IO+0xb24/0xeb0
     [<ffffffff811e71a0>] ? ext3_get_blocks_handle+0xe00/0xe00
     [<ffffffff8118ca95>] __blockdev_direct_IO+0x55/0x60
     [<ffffffff811e71a0>] ? ext3_get_blocks_handle+0xe00/0xe00
     [<ffffffff811e91c8>] ext3_direct_IO+0xf8/0x390
     [<ffffffff811e71a0>] ? ext3_get_blocks_handle+0xe00/0xe00
     [<ffffffff81004b60>] ? xen_mc_flush+0xb0/0x1b0
     [<ffffffff81104027>] generic_file_aio_read+0x737/0x780
     [<ffffffff813bedeb>] ? gnttab_map_refs+0x15b/0x1e0
     [<ffffffff811038f0>] ? find_get_pages+0x150/0x150
     [<ffffffff8119736c>] aio_rw_vect_retry+0x7c/0x1d0
     [<ffffffff811972f0>] ? lookup_ioctx+0x90/0x90
     [<ffffffff81198856>] aio_run_iocb+0x66/0x1a0
     [<ffffffff811998b8>] do_io_submit+0x708/0xb90
     [<ffffffff81199d50>] sys_io_submit+0x10/0x20
     [<ffffffff81a18d69>] system_call_fastpath+0x16/0x1b

    The explanation is in the comment within the code:

    We need to do this because the pages shared by the frontend
    (xen-blkfront) can be already locked (lock_page, called by
    do_read_cache_page); when the userspace backend tries to use them
    with direct_IO, mfn_to_pfn returns the pfn of the frontend, so
    do_blockdev_direct_IO is going to try to lock the same pages
    again resulting in a deadlock.

    A simplified call graph looks like this:

    pygrub                          QEMU
    -----------------------------------------------
    do_read_cache_page              io_submit
      |                              |
    lock_page                       ext3_direct_IO
                                     |
                                    bio_add_page
                                     |
                                    lock_page

    Internally the xen-blkback uses m2p_add_override to swizzle (temporarily)
    a 'struct page' to have a different MFN (so that it can point to another
    guest). It also can easily find out whether another pfn corresponding
    to the mfn exists in the m2p, and can set the FOREIGN bit
    in the p2m, making sure that mfn_to_pfn returns the pfn of the backend.

    This allows the backend to perform direct_IO on these pages, but as a
    side effect prevents the frontend from using get_user_pages_fast on
    them while they are being shared with the backend.

    Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

commit bc2df47a408f2d64cf81bcfd0f6e3e14c84cb0ab
Author: J. Bruce Fields <bfields@redhat.com>
Date:   Tue Jun 12 08:28:48 2012 -0400

    nfsd4: BUG_ON(!is_spin_locked()) no good on UP kernels

    Most frequent symptom was a BUG triggering in expire_client, with the
    server locking up shortly thereafter.

    Introduced by 508dc6e110c6dbdc0bbe84298ccfe22de7538486 "nfsd41:
    free_session/free_client must be called under the client_lock".

    Cc: stable@kernel.org
    Cc: Benny Halevy <bhalevy@tonian.com>
    Signed-off-by: J. Bruce Fields <bfields@redhat.com>

commit 12918b10d59e975fd5241eef03ef9e6d5ea3dcfe
Author: Stanislav Kinsbursky <skinsbursky@parallels.com>
Date:   Fri Jun 1 13:55:47 2012 +0400

    NFS: hard-code init_net for NFS callback transports

    In case of destroying mount namespace on child reaper exit, nsproxy is zeroed
    to the point already. So, dereferencing of it is invalid.
    This patch hard-code "init_net" for all network namespace references for NFS
    callback services. This will be fixed with proper NFS callback
    containerization.

    Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
    Signed-off-by: J. Bruce Fields <bfields@redhat.com>

commit 3310c36eef330766fd23d50796287ad764929e24
Author: Jan Schmidt <list.btrfs@jan-o-sch.net>
Date:   Mon Jun 11 10:52:38 2012 +0200

    Btrfs: fix race in tree mod log addition

    When adding to the tree modification log, we grab two locks at different
    stages. We must not drop the outer lock until we're done with section
    protected by the inner lock. This moves the unlock call for the outer lock
    to the appropriate position.

    Signed-off-by: Jan Schmidt <list.btrfs@jan-o-sch.net>

commit 3d7806eca43e73a9721d2e09369200ed93036bd0
Author: Jan Schmidt <list.btrfs@jan-o-sch.net>
Date:   Mon Jun 11 08:29:29 2012 +0200

    Btrfs: add btrfs_next_old_leaf

    To make sense of the tree mod log, the backref walker not only needs
    btrfs_search_old_slot, but it also called btrfs_next_leaf, which in turn was
    calling btrfs_search_slot. This obviously didn't give the correct result.

    This commit adds btrfs_next_old_leaf, a drop-in replacement for
    btrfs_next_leaf with a time_seq parameter. If it is zero, it behaves exactly
    like btrfs_next_leaf. If it is non-zero, it will use btrfs_search_old_slot
    with this time_seq parameter.

    Signed-off-by: Jan Schmidt <list.btrfs@jan-o-sch.net>

commit a95236d99fa56766f11056903439f55fe5038bcf
Author: Jan Schmidt <list.btrfs@jan-o-sch.net>
Date:   Tue Jun 5 16:41:24 2012 +0200

    Btrfs: fix return value for __tree_mod_log_oldest_root

    In __tree_mod_log_oldest_root() we must return the found operation even if
    it's not a ROOT_REPLACE operation. Otherwise, the caller assumes that there
    are no operations to be rewinded and returns immediately.

    The code in the caller is modified to improve readability.

    Signed-off-by: Jan Schmidt <list.btrfs@jan-o-sch.net>

commit 8ba97a15e7d4f70b9af71fa1db86a28dd17ad1b2
Author: Jan Schmidt <list.btrfs@jan-o-sch.net>
Date:   Mon Jun 4 16:54:57 2012 +0200

    Btrfs: use btrfs_read_lock_root_node in get_old_root

    get_old_root could race with root node updates because we weren't locking
    the node early enough. Use btrfs_read_lock_root_node to grab the root locked
    in the very beginning and release the lock as soon as possible (just like
    btrfs_search_slot does).

    Signed-off-by: Jan Schmidt <list.btrfs@jan-o-sch.net>

commit f617e2fd52484fb74236a597d0f9068ec7d9d2dd
Author: Jan Schmidt <list.btrfs@jan-o-sch.net>
Date:   Thu Jun 14 16:10:13 2012 +0200

    Btrfs: remove obsolete btrfs_next_leaf call from __resolve_indirect_ref

    When resolving indirect refs, we used to call btrfs_next_leaf in case we
    didn't find an exact match. While we should find exact matches most of the
    time, in case we don't, we must continue searching. Treating those matches
    differently depending on the level we're searching doesn't make sense.

    Even worse, we might end up searching for a key larger than the largest, in
    which case there is no next_leaf and subsequent jobs would fail. This commit
    drops the bogous lines.

    Signed-off-by: Jan Schmidt <list.btrfs@jan-o-sch.net>

commit 2bea29b774ccb4bf32c7b299c677fccc5a1d8443
Author: Mircea Gherzan <mgherzan@gmail.com>
Date:   Mon Jun 11 23:52:25 2012 +0100

    ARM: 7421/1: bpf_jit: BPF_S_ANC_ALU_XOR_X support

    JIT support for the XOR operation introduced by the commit
    ffe06c17afbb.

    Signed-off-by: Mircea Gherzan <mgherzan@gmail.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit 2307574a50dcb0f9c13e541ca3a196f7554af977
Author: Rabin Vincent <rabin.vincent@stericsson.com>
Date:   Tue Jun 12 12:31:43 2012 +0100

    ARM: 7423/1: kprobes: run t32_simulate_ldr_literal() without insn slot

    t32_simulate_ldr_literal() can be run without an instruction slot, so it
    should be using DECODE_SIMULATEX instead of DECODE_EMULATEX.

    Acked-by: Jon Medhurst <tixy@yxit.co.uk>
    Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit b9b52918abe88d9135dd570fb394b9c432eb1cfd
Author: Lee Jones <lee.jones@linaro.org>
Date:   Tue Jun 12 10:49:51 2012 +0100

    ARM: 7422/1: mmc: mmci: Allocate platform memory during Device Tree boot

    When booting with Device Tree enabled, platform specific information
    is gathered by parsing the DT binary. Platform data is subsequently
    populated with the result. The memory required for this is not
    automatically allocated during Device Tree boot, so we'll do it here
    instead.

    Acked-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Lee Jones <lee.jones@linaro.org>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit 424d54d2dca03805942055e5b19926d33a7d1e31
Merge: 0953135 e32025a
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu Jun 14 15:46:59 2012 +0300

    Merge git://git.kernel.org/pub/scm/virt/kvm/kvm

    Pull kvm fix from Marcelo Tosatti:
     "Fix a spurious warning on CPU offline path"

    * git://git.kernel.org/pub/scm/virt/kvm/kvm:
      x86: kvmclock: remove check_and_clear_guest_paused warning

commit 095313595648b5d46525c27cef0a368e92634401
Merge: b532ff2 149ff9e
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu Jun 14 15:43:32 2012 +0300

    Merge tag 'pinctrl-fixes-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl

    Pull pinctrl fixes from Linus Walleij:
     - section markup fixes
     - clk_prepare() fix to conform to the clk API
     - memory leaks
     - incorrect debug messages
     - bad errorpaths
     - typos

    * tag 'pinctrl-fixes-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
      pinctrl: pinctrl-mxs: set platform driver data to NULL at errpath and at unregister
      pinctrl: pinctrl-mxs: Take care of frees if the kzalloc fails
      pinctrl: pinctrl-imx: fix incorrect debug message of maps
      pinctrl: pinctrl-imx: free if of_get_parent fails to get the parent node
      pinctrl: pinctrl-imx: free allocated pinctrl_map structure only once and use kernel facilities for IMX_PMX_DUMP
      pinctrl: nomadik: fix up typo
      pinctrl: nomadik: add clk_prepare() call
      pinctrl: fix a minor harmless typo
      pinctrl: sirf: mark of_device_id match table as __devinitconst

commit b532ff20bcf66536be05cc1d78311063b8bf1ee8
Merge: fea7c78 2e8b2b2
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu Jun 14 15:38:48 2012 +0300

    Merge tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

    Pull sound fixes from Takashi Iwai:

     - Fix a regression of USB-audio PCM assignment since 3.4
     - A few VGA-switcheroo-related fixes for proper HDMI audio enablement
     - Fixed the missing initializations of HD-audio verbs, which may have
       resulted in various breakage
     - Some driver-specific ASoC updates
     - A few fixes for the dynamic PCM code
     - The addition of pinctrl support for the i.MX audmux which didn't make
       it into -rc1 due to cross tree dependency issues
     - A few minor fixes in compress API codes

    * tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
      ALSA: hda - Don't forget to call init verbs added by fixup list
      ALSA: HDA: Pin fixup for Zotac Z68 motherboard
      ALSA: compress_core: cleanup pointers on stop
      ALSA: compress_core: don't wake up on pause
      ALSA: hda - Fix detection of Creative SoundCore3D controllers
      vga_switcheroo: Enable/disable audio clients at the right time
      ALSA: hda - HDMI Audio init all connectors when VGA-switcheroo is off
      vga_switcheroo: Fix error without CONFIG_VGA_SWITCHEROO
      ALSA: hda - Fix uninitialized HDMI controllers with VGA-switcheroo
      vga_switcheroo: Add a helper function to get the client state
      ALSA: usb-audio: Fix substream assignments
      ASoC: tegra: add MODULE_DEVICE_TABLE to tegra30_ahub
      ASoC: wm2000: Always use a 4s timeout for the firmware
      ASoC: dapm: Fix input list to use source widgets
      ASoC: dpcm: Fix dpcm_get_be() to check that DAI is BE
      ASoC: wm8994: Apply volume updates with clocks enabled
      ASoC: wm8994: Ensure all AIFnCLK events are run from the _late variants
      ASoC: imx-audmux: add pinctrl support
      ASoC: dapm: Fix connected widget capture path query.

commit fea7c7830d7fec130d2d396be582b23f84e325a1
Merge: 790b9d4 d6cb3e4
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu Jun 14 15:33:55 2012 +0300

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

    Pull networking fixes from David S. Miller:

    This has the fix for the wireless issues I ran into the other week as
    well as:

     1) Fix CAN c_can driver transmit handling resulting in BUG check
        triggers, from AnilKumar Ch.

     2) Fix packet drop monitor sleeping in atomic context, from Eric
        Dumazet.

     3) Fix mv643xx_eth driver build regression, from Andrew Lunn.

     4) Inetpeer freeing needs an RCU grace period in order to avoid races
        during tree invalidation.  From Eric Dumazet.

     5) Fix endianness bugs in xt_HMARK netfilter module, from Hans
        Schillstrom.

     6) Add proper module refcounting to l2tp_eth to avoid crash on module
        unload, from Eric Dumazet.

     7) Fix truncation of neighbour entry dumps due to logic errors in
        neigh_dump_info() and friends, from Eric Dumazet.

     8) The conversion of fib6_age() to dst_neigh_lookup() accidently
        reversed the logic of a flags test, fix from Thomas Graf.

     9) Fix checksum configuration in newer sky2 chips, from Stephen
        Hemminger.

    10) Revert BQL support in NIU driver, doesn't work.

    11) l2tp_ip_sendmsg() illegally uses a route without a proper reference.
        From Eric Dumazet.

    12) be2net driver references an SKB after it's potentially been freed,
        also from Eric Dumazet.

    13) Fix RCU stalls in dummy net driver init.  Also from Eric Dumazet.

    14) lpc_eth has several bugs in it's transmit engine leading to packet
        leaks and improper queue wakes, from Eric Dumazet.

    15) Apply short DMA workaround to more tg3 chips, from Matt Carlson.

    16) Add tilegx network driver.

    17) Bonding queue mapping for a packet can get corrupted, fix from Eric
        Dumazet.

    18) Fix bug in netpoll_send_udp() SKB management that can leave garbage
        in the payload in certain situations.  From Eric Dumazet.

    19) bnx2x driver interprets chip RX checksum offload incorrectly in
        encapsulation situations.  Fix from Eric Dumazet.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (75 commits)
      bnx2x: fix checksum validation
      netpoll: fix netpoll_send_udp() bugs
      bonding: Fix corrupted queue_mapping
      bonding:record primary when modify it via sysfs
      tilegx network driver: initial support
      tg3: Apply short DMA frag workaround to 5906
      net: stmmac: Fix clock en-/disable calls
      lpc_eth: fix tx completion
      lpc_eth: add missing ndo_change_mtu()
      dummy: fix rcu_sched self-detected stalls
      net: Reorder initialization in ip_route_output to fix gcc warning
      virtio-net: fix a race on 32bit arches
      r8169: avoid NAPI scheduling delay.
      net: Make linux/tcp.h C++ friendly (trivial)
      netdev: fix drivers/net/phy/ kernel-doc warnings
      net/core: fix kernel-doc warnings
      be2net: fix a race in be_xmit()
      l2tp: fix a race in l2tp_ip_sendmsg()
      mac80211: add back channel change flag
      NFC: Fix possible NULL ptr deref when getting the name of a socket
      ...

commit c080e26edc3a2a3cdfa4c430c663ee1c3bbd8fae
Author: Marek Szyprowski <m.szyprowski@samsung.com>
Date:   Thu Jun 14 14:01:30 2012 +0200

    x86: dma-mapping: fix broken allocation when dma_mask has been provided

    Commit 0a2b9a6ea93 ("X86: integrate CMA with DMA-mapping subsystem")
    broke memory allocation with dma_mask. This patch fixes possible kernel
    ops caused by lack of resetting page variable when jumping to 'again' label.

    Reported-by: Konrad Rzeszutek Wilk <konrad@darnok.org>
    Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
    Acked-by: Michal Nazarewicz <mina86@mina86.com>

commit a70270468234749741c5893ae78e5bb524771402
Author: Don Zickus <dzickus@redhat.com>
Date:   Wed Jun 13 09:35:48 2012 -0400

    watchdog: Quiet down the boot messages

    A bunch of bugzillas have complained how noisy the nmi_watchdog
    is during boot-up especially with its expected failure cases
    (like virt and bios resource contention).

    This is my attempt to quiet them down and keep it less confusing
    for the end user.  What I did is print the message for cpu0 and
    save it for future comparisons.  If future cpus have an
    identical message as cpu0, then don't print the redundant info.
    However, if a future cpu has a different message, happily print
    that loudly.

    Before the change, you would see something like:

        ..TIMER: vector=0x30 apic1=0 pin1=2 apic2=-1 pin2=-1
        CPU0: Intel(R) Core(TM)2 Quad CPU    Q9550  @ 2.83GHz stepping 0a
        Performance Events: PEBS fmt0+, Core2 events, Intel PMU driver.
        ... version:                2
        ... bit width:              40
        ... generic registers:      2
        ... value mask:             000000ffffffffff
        ... max period:             000000007fffffff
        ... fixed-purpose events:   3
        ... event mask:             0000000700000003
        NMI watchdog enabled, takes one hw-pmu counter.
        Booting Node   0, Processors  #1
        NMI watchdog enabled, takes one hw-pmu counter.
         #2
        NMI watchdog enabled, takes one hw-pmu counter.
         #3 Ok.
        NMI watchdog enabled, takes one hw-pmu counter.
        Brought up 4 CPUs
        Total of 4 processors activated (22607.24 BogoMIPS).

    After the change, it is simplified to:

        ..TIMER: vector=0x30 apic1=0 pin1=2 apic2=-1 pin2=-1
        CPU0: Intel(R) Core(TM)2 Quad CPU    Q9550  @ 2.83GHz stepping 0a
        Performance Events: PEBS fmt0+, Core2 events, Intel PMU driver.
        ... version:                2
        ... bit width:              40
        ... generic registers:      2
        ... value mask:             000000ffffffffff
        ... max period:             000000007fffffff
        ... fixed-purpose events:   3
        ... event mask:             0000000700000003
        NMI watchdog: enabled on all CPUs, permanently consumes one hw-PMU counter.
        Booting Node   0, Processors  #1 #2 #3 Ok.
        Brought up 4 CPUs

    V2: little changes based on Joe Perches' feedback
    V3: printk cleanup based on Ingo's feedback; checkpatch fix
    V4: keep printk as one long line
    V5: Ingo fix ups

    Reported-and-tested-by: Nathan Zimmer <nzimmer@sgi.com>
    Signed-off-by: Don Zickus <dzickus@redhat.com>
    Cc: nzimmer@sgi.com
    Cc: joe@perches.com
    Link: http://lkml.kernel.org/r/1339594548-17227-1-git-send-email-dzickus@redhat.com
    Signed-off-by: Ingo Molnar <mingo@kernel.org>

commit fdec53d5203ee3d44be7c09d1524e3a6287d46a7
Author: Javi Merino <javi.merino@arm.com>
Date:   Wed Jun 13 15:07:00 2012 +0100

    DMA: PL330: Fix racy mutex unlock

    pl330_update() stores a pointer to the thrd->req that finished, which
    contains a pointer to the corresponding pl330_req.  This is done with
    the pl330_lock held.  Then, it iterates through the req_done list,
    calling the callback for each of the requests that are done.  The
    problem is that the driver releases the lock before calling the
    callback for each of the callbacks.  pl330_submit_req() running in
    another processor can then acquire the lock and insert another request
    in one of the thrd->req that hasn't been processed yet, replacing the
    pointer to pl330_req there.  When the callback returns in
    pl330_update() and the next rqdone is popped from the list, it
    dereferences the pl330_req pointer to the just scheduled pl330_req,
    instead of the one that has finished, calling pl330 with the wrong r.

    This patch fixes this by storing the pointer to pl330_req directly in
    the list.

    Signed-off-by: Javi Merino <javi.merino@arm.com>
    Cc: Jassi Brar <jaswinder.singh@linaro.org>
    Acked-by: Jassi Brar <jaswinder.singh@linaro.org>
    Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>

commit 354ab8567ae3107a8cbe7228c3181990ba598aac
Author: Anand Gadiyar <gadiyar@ti.com>
Date:   Tue Jun 5 15:34:27 2012 +0300

    Fix OMAP EHCI suspend/resume failure (i693)

    Its observed with some PHY, the 60Mhz clock gets
    cut too soon for OMAP EHCI, leaving OMAP-EHCI in a bad state.

    So on starting port suspend, make sure the 60Mhz clock to EHCI
    is kept alive using an internal clock, so that EHCi can cleanly
    transition its hw state machine on a port suspend.

    Its not proven if this is the issue hit on USB3333,
    but the symptoms look very similar.

    Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
    Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
    Signed-off-by: Volodymyr Mieshkov <x0182794@ti.com>
    Acked-by: Alan Stern <stern@rowland.harvard.edu>
    Acked-by: Felipe Balbi <balbi@ti.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit c4828d96900453f1ad506b1488928307711a8b28
Author: Roland Stigge <stigge@antcom.de>
Date:   Mon Jun 11 21:38:29 2012 +0200

    USB: ohci-hub: Mark ohci_finish_controller_resume() as __maybe_unused

    ohci_finish_controller_resume() is intended to be used in platform specific
    drivers ohci-*.c, included from ohci-hcd.c. Some of them don't actually use
    ohci_finish_controller_resume(), so mark it as __maybe_unused.

    Signed-off-by: Roland Stigge <stigge@antcom.de>
    Acked-by: Alan Stern <stern@rowland.harvard.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 0658a3366db7e27fa32c12e886230bb58c414c92
Author: Jan Safrata <jan.nikitenko@gmail.com>
Date:   Tue May 22 14:04:50 2012 +0200

    usb: use usb_serial_put in usb_serial_probe errors

    The use of kfree(serial) in error cases of usb_serial_probe
    was invalid - usb_serial structure allocated in create_serial()
    gets reference of usb_device that needs to be put, so we need
    to use usb_serial_put() instead of simple kfree().

    Signed-off-by: Jan Safrata <jan.nikitenko@gmail.com>
    Acked-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 07828b10985393cd875eac1545fba47107e97bf9
Author: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Date:   Tue May 22 13:47:25 2012 -0300

    USB: EHCI: Fix build warning in xilinx ehci driver

    This fixes the following warning:
    In file included from drivers/usb/host/ehci-hcd.c:1246:0:
    drivers/usb/host/ehci-xilinx-of.c:293:2: warning: initialization from incompatible pointer type [enabled by default]
    drivers/usb/host/ehci-xilinx-of.c:293:2: warning: (near initialization for 'ehci_hcd_xilinx_of_driver.shutdown') [enabled by default]

    Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 4f7a67e2dd49fbfba002c453bc24bf00e701cc71
Author: Ricardo Martins <rasm@fe.up.pt>
Date:   Tue May 22 18:02:03 2012 +0100

    USB: fix PS3 EHCI systems

    After commit aaa0ef289afe9186f81e2340114ea413eef0492a "PS3 EHCI QH
    read work-around", Terratec Grabby (em28xx) stopped working with AMD
    Geode LX 800 (USB controller AMD CS5536). Since this is a PS3 only
    fix, the following patch adds a conditional block around it.

    Signed-off-by: Ricardo Martins <rasm@fe.up.pt>
    Acked-by: Alan Stern <stern@rowland.harvard.edu>
    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 57e04bdb3ea67d9e2e58b412eb21772188467df4
Merge: afff07e 622eb78
Author: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date:   Wed Jun 13 17:23:12 2012 -0700

    Merge tag 'for-usb-linus-2012-06-13' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-linus

    xhci: Bug fixes for 3.5

    Hi Greg,

    Here's five bug fixes for 3.5.  They fix some memory leaks in the
    bandwidth calculation code, fix a couple bugs in the USB3 Link PM
    patchset, and make system suspend and resume work on platforms with the
    AsMedia ASM1042 xHCI host controller.

    Sarah Sharp

commit 364ed2f4653d7c86ebedcc116a9cb34fd272867c
Author: Anton Vorontsov <anton.vorontsov@linaro.org>
Date:   Sat May 26 06:07:53 2012 -0700

    pstore/inode: Make pstore_fill_super() static

    There's no reason to extern it. The patch fixes the annoying sparse
    warning:

    CHECK   fs/pstore/inode.c
    fs/pstore/inode.c:264:5: warning: symbol 'pstore_fill_super' was not
    declared. Should it be static?

    Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
    Acked-by: Kees Cook <keescook@chromium.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 93cce049682a1aebd49766f29af363e5b8770aed
Author: Anton Vorontsov <anton.vorontsov@linaro.org>
Date:   Sat May 26 06:07:52 2012 -0700

    pstore/ram: Should zap persistent zone on unlink

    Otherwise, unlinked file will reappear on the next boot.

    Reported-by: Kees Cook <keescook@chromium.org>
    Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
    Acked-by: Kees Cook <keescook@chromium.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit fce397930475f7efc712a1345dc0dad269a10544
Author: Anton Vorontsov <anton.vorontsov@linaro.org>
Date:   Sat May 26 06:07:51 2012 -0700

    pstore/ram_core: Factor persistent_ram_zap() out of post_init()

    A handy function that we will use outside of ram_core soon. But
    so far just factor it out and start using it in post_init().

    Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
    Acked-by: Kees Cook <keescook@chromium.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 25b63da64708212985c06c7f8b089d356efdd9cf
Author: Anton Vorontsov <anton.vorontsov@linaro.org>
Date:   Sat May 26 06:07:50 2012 -0700

    pstore/ram_core: Do not reset restored zone's position and size

    Otherwise, the files will survive just one reboot, and on a subsequent
    boot they will disappear.

    Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 201e4aca5aa179e6c69a4dcd36a3562e56b8d670
Author: Anton Vorontsov <anton.vorontsov@linaro.org>
Date:   Sat May 26 06:07:49 2012 -0700

    pstore/ram: Should update old dmesg buffer before reading

    Without the update, we'll only see the new dmesg buffer after the
    reboot, but previously we could see it right away. Making an oops
    visible in pstore filesystem before reboot is a somewhat dubious
    feature, but removing it wasn't an intentional change, so let's
    restore it.

    For this we have to make persistent_ram_save_old() safe for calling
    multiple times, and also extern it.

    Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
    Acked-by: Kees Cook <keescook@chromium.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 622eb783fe6ff4c1baa47db16c3a5db97f9e6e50
Author: Andiry Xu <andiry.xu@gmail.com>
Date:   Wed Jun 13 10:51:57 2012 +0800

    xHCI: Increase the timeout for controller save/restore state operation

    When system software decides to power down the xHC with the intent of
    resuming operation at a later time, it will ask xHC to save the internal
    state and restore it when resume to correctly recover from a power event.
    Two bits are used to enable this operation: Save State and Restore State.

    xHCI spec 4.23.2 says software should "Set the Controller Save/Restore
    State flag in the USBCMD register and wait for the Save/Restore State
    Status flag in the USBSTS register to transition to '0'". However, it does
    not define how long software should wait for the SSS/RSS bit to transition
    to 0.

    Currently the timeout is set to 1ms. There is bug report
    (https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1002697)
    indicates that the timeout is too short for ASMedia ASM1042 host controller
    to save/restore the state successfully. Increase the timeout to 10ms helps to
    resolve the issue.

    This patch should be backported to stable kernels as old as 2.6.37, that
    contain the commit 5535b1d5f8885695c6ded783c692e3c0d0eda8ca "USB: xHCI:
    PCI power management implementation"

    Signed-off-by: Andiry Xu <andiry.xu@gmail.com>
    Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
    Cc: Ming Lei <ming.lei@canonical.com>
    Cc: stable@vger.kernel.org

commit 32f1d2c536d0c26c5814cb0e6a0606c42d02fac1
Author: Takashi Iwai <tiwai@suse.de>
Date:   Fri Jun 1 10:06:24 2012 +0200

    xhci: Don't free endpoints in xhci_mem_cleanup()

    This patch fixes a few issues introduced in the recent fix
    [f8a9e72d: USB: fix resource leak in xhci power loss path]

    - The endpoints listed in bw table are just links and each entry is an
     array member of dev->eps[].  But the commit above adds a kfree() call
     to these instances, and thus it results in memory corruption.

    - It clears only the first entry of rh_bw[], but there can be multiple
      ports.

    - It'd be safer to clear the list_head of ep as well, not only
      removing from the list, as it's checked in
      xhci_discover_or_reset_device().

    This patch should be backported to kernels as old as 3.2, that contain
    the commit 839c817ce67178ca3c7c7ad534c571bba1e69ebe "xhci: Store
    information about roothubs and TTs."

    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
    Reviewed-by: Oliver Neukum <oneukum@suse.de>
    Cc: <stable@vger.kernel.org>

commit 46ed8f00d8982e49f8fe2c1a9cea192f640cb3ba
Author: Takashi Iwai <tiwai@suse.de>
Date:   Fri Jun 1 10:06:23 2012 +0200

    xhci: Fix invalid loop check in xhci_free_tt_info()

    xhci_free_tt_info() may access the invalid memory when it removes the
    last entry but the list is not empty.  Then tt_next reaches to the
    list head but it still tries to check the tt_info of that entry.

    This patch fixes the bug and cleans up the messy code by rewriting
    with a simple list_for_each_entry_safe().

    This patch should be backported to kernels as old as 3.2, that contain
    the commit 839c817ce67178ca3c7c7ad534c571bba1e69ebe "xhci: Store
    information about roothubs and TTs."

    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
    Reviewed-by: Oliver Neukum <oneukum@suse.de>
    Cc: <stable@vger.kernel.org>

commit e25e62aecac42379e113c63a674a86ae3ebbec8d
Author: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Date:   Thu Jun 7 11:10:32 2012 -0700

    xhci: Fix error path return value.

    This patch fixes an issue discovered by Dan Carpenter:

    The patch 3b3db026414b: "xhci: Add infrastructure for host-specific
    LPM policies." from May 9, 2012, leads to the following warning:
    drivers/usb/host/xhci.c:3909 xhci_get_timeout_no_hub_lpm()
             warn: signedness bug returning '-22'

      3906          default:
      3907                  dev_warn(&udev->dev, "%s: Can't get timeout for non-U1 or U2 state.\n",
      3908                                  __func__);
      3909                  return -EINVAL;
                            ^^^^^^^^^^^^^^
    This should be a u16 like USB3_LPM_DISABLED or something.

      3910          }
      3911
      3912          if (sel <= max_sel_pel && pel <= max_sel_pel)
      3913                  return USB3_LPM_DEVICE_INITIATED;

    Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
    Reported-by: Dan Carpenter <dan.carpenter@oracle.com>

commit 55558c33d6d46cb6f426b729f4119e3b2f12f02b
Author: Dan Carpenter <dan.carpenter@oracle.com>
Date:   Tue May 22 20:54:34 2012 +0300

    USB: Checking the wrong variable in usb_disable_lpm()

    We check "u1_params" instead of checking "u2_params".

    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>

commit afff07e61a5243e14ee3f0a272a0380cd744a8a3
Author: Hans de Goede <hdegoede@redhat.com>
Date:   Wed Jun 13 11:44:58 2012 +0200

    usb-storage: Add 090c:1000 to unusal-devs

    This device gives a bogus answer to get_capacity(16):
    [ 8628.278614] scsi 8:0:0:0: Direct-Access     USB 2.0  USB Flash Drive  1100 PQ: 0 ANSI: 4
    [ 8628.279452] sd 8:0:0:0: Attached scsi generic sg4 type 0
    [ 8628.280338] sd 8:0:0:0: [sdd] 35747322042253313 512-byte logical blocks: (18.3 EB/15.8 EiB)

    So set the quirk flag to avoid using get_capacity(16) with it:
    [11731.386014] usb-storage 2-1.6:1.0: Quirks match for vid 090c pid 1000: 80000
    [11731.386075] scsi9 : usb-storage 2-1.6:1.0
    [11731.386172] usbcore: registered new interface driver usb-storage
    [11731.386175] USB Mass Storage support registered.
    [11732.387394] scsi 9:0:0:0: Direct-Access     USB 2.0  USB Flash Drive  1100 PQ: 0 ANSI: 4
    [11732.388462] sd 9:0:0:0: Attached scsi generic sg3 type 0
    [11732.389432] sd 9:0:0:0: [sdc] 7975296 512-byte logical blocks: (4.08 GB/3.80 GiB)

    Which makes the capacity look a lot more sane :)

    Signed-off-by: Hans de Goede <hdegoede@redhat.com>
    Tested-by: Simon Raffeiner <sturmflut@lieberbiber.de>
    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit d6cb3e41386f20fb0777d0b59a2def82c65d37f7
Author: Eric Dumazet <edumazet@google.com>
Date:   Tue Jun 12 23:50:04 2012 +0000

    bnx2x: fix checksum validation

    bnx2x driver incorrectly sets ip_summed to CHECKSUM_UNNECESSARY on
    encapsulated segments. TCP stack happily accepts frames with bad
    checksums, if they are inside a GRE or IPIP encapsulation.

    Our understanding is that if no IP or L4 csum validation was done by the
    hardware, we should leave ip_summed as is (CHECKSUM_NONE), since
    hardware doesn't provide CHECKSUM_COMPLETE support in its cqe.

    Then, if IP/L4 checksumming was done by the hardware, set
    CHECKSUM_UNNECESSARY if no error was flagged.

    Patch based on findings and analysis from Robert Evans

    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Cc: Eilon Greenstein <eilong@broadcom.com>
    Cc: Yaniv Rosner <yanivr@broadcom.com>
    Cc: Merav Sicron <meravs@broadcom.com>
    Cc: Tom Herbert <therbert@google.com>
    Cc: Robert Evans <evansr@google.com>
    Cc: Willem de Bruijn <willemb@google.com>
    Acked-by: Eilon Greenstein <eilong@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 954fba0274058d27c7c07b5ea07c41b3b7477894
Author: Eric Dumazet <edumazet@google.com>
Date:   Tue Jun 12 19:30:21 2012 +0000

    netpoll: fix netpoll_send_udp() bugs

    Bogdan Hamciuc diagnosed and fixed following bug in netpoll_send_udp() :

    "skb->len += len;" instead of "skb_put(skb, len);"

    Meaning that _if_ a network driver needs to call skb_realloc_headroom(),
    only packet headers would be copied, leaving garbage in the payload.

    However the skb_realloc_headroom() must be avoided as much as possible
    since it requires memory and netpoll tries hard to work even if memory
    is exhausted (using a pool of preallocated skbs)

    It appears netpoll_send_udp() reserved 16 bytes for the ethernet header,
    which happens to work for typicall drivers but not all.

    Right thing is to use LL_RESERVED_SPACE(dev)
    (And also add dev->needed_tailroom of tailroom)

    This patch combines both fixes.

    Many thanks to Bogdan for raising this issue.

    Reported-by: Bogdan Hamciuc <bogdan.hamciuc@freescale.com>
    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Tested-by: Bogdan Hamciuc <bogdan.hamciuc@freescale.com>
    Cc: Herbert Xu <herbert@gondor.apana.org.au>
    Cc: Neil Horman <nhorman@tuxdriver.com>
    Reviewed-by: Neil Horman <nhorman@tuxdriver.com>
    Reviewed-by: Cong Wang <xiyou.wangcong@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 49fbd3f1c3a67b99c053600a1cd7e5d0be48bed6
Author: Tomas Winkler <tomas.winkler@intel.com>
Date:   Mon Jun 11 12:18:31 2012 +0300

    misc: mei: set WDIOF_ALARMONLY on mei watchdog

    mei watchdog doesn't reboot the system it only produces event
    therefore mark it as WDIOF_ALARMONLY.

    This patch depends on:
    commit 2bbeed016dd96045ec82c3a309afddcc3a0db1d2
    Author: Alan Cox <alan@linux.intel.com>
    watchdog: Add a flag to indicate the watchdog doesn't reboot things

    Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 169dc388685f8a1c1e09546882a114ac850a5d6b
Author: Samuel Ortiz <sameo@linux.intel.com>
Date:   Mon Jun 11 12:18:30 2012 +0300

    misc: mei: Disable MSI when IRQ registration fails

    Since MSI is enabled right before that, we should disable it when
    registration fails.

    Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
    Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 0b84704a2d6fdf55a3dcdd2a1f2ac8b48913c84b
Author: Alan Stern <stern@rowland.harvard.edu>
Date:   Thu May 31 17:03:52 2012 -0400

    USB: serial-generic: use a single set of device IDs

    The usb-serial-generic driver uses different device IDs for its USB
    matching and its serial matching.  This can lead to problems: The
    driver can end up getting bound to a USB interface without being
    allowed to bind to the corresponding serial port.

    This patch (as1557) fixes the problem by using the same device ID
    table (the one that can be altered by the "vendor=" and "product="
    module parameters) for both purposes.  The unused table is removed.
    Now the driver will bind only to the intended devices.

    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    CC: Bjørn Mork <bjorn@mork.no>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 954c3f8a5f1b7716be9eee978b3bc85bae92d7c8
Author: Bjørn Mork <bjorn@mork.no>
Date:   Wed May 30 10:00:14 2012 +0200

    USB: serial: Enforce USB driver and USB serial driver match

    We need to make sure that the USB serial driver we find
    matches the USB driver whose probe we are currently
    executing. Otherwise we will end up with USB serial
    devices bound to the correct serial driver but wrong
    USB driver.

    An example of such cross-probing, where the usbserial_generic
    USB driver has found the sierra serial driver:

    May 29 18:26:15 nemi kernel: [ 4442.559246] usbserial_generic 4-4:1.0: Sierra USB modem converter detected
    May 29 18:26:20 nemi kernel: [ 4447.556747] usbserial_generic 4-4:1.2: Sierra USB modem converter detected
    May 29 18:26:25 nemi kernel: [ 4452.557288] usbserial_generic 4-4:1.3: Sierra USB modem converter detected

    sysfs view of the same problem:

    bjorn@nemi:~$ ls -l /sys/bus/usb/drivers/sierra/
    total 0
    --w------- 1 root root 4096 May 29 18:23 bind
    lrwxrwxrwx 1 root root    0 May 29 18:23 module -> ../../../../module/usbserial
    --w------- 1 root root 4096 May 29 18:23 uevent
    --w------- 1 root root 4096 May 29 18:23 unbind
    bjorn@nemi:~$ ls -l /sys/bus/usb-serial/drivers/sierra/
    total 0
    --w------- 1 root root 4096 May 29 18:23 bind
    lrwxrwxrwx 1 root root    0 May 29 18:23 module -> ../../../../module/sierra
    -rw-r--r-- 1 root root 4096 May 29 18:23 new_id
    lrwxrwxrwx 1 root root    0 May 29 18:32 ttyUSB0 -> ../../../../devices/pci0000:00/0000:00:1d.7/usb4/4-4/4-4:1.0/ttyUSB0
    lrwxrwxrwx 1 root root    0 May 29 18:32 ttyUSB1 -> ../../../../devices/pci0000:00/0000:00:1d.7/usb4/4-4/4-4:1.2/ttyUSB1
    lrwxrwxrwx 1 root root    0 May 29 18:32 ttyUSB2 -> ../../../../devices/pci0000:00/0000:00:1d.7/usb4/4-4/4-4:1.3/ttyUSB2
    --w------- 1 root root 4096 May 29 18:23 uevent
    --w------- 1 root root 4096 May 29 18:23 unbind

    bjorn@nemi:~$ ls -l /sys/bus/usb/drivers/usbserial_generic/
    total 0
    lrwxrwxrwx 1 root root    0 May 29 18:33 4-4:1.0 -> ../../../../devices/pci0000:00/0000:00:1d.7/usb4/4-4/4-4:1.0
    lrwxrwxrwx 1 root root    0 May 29 18:33 4-4:1.2 -> ../../../../devices/pci0000:00/0000:00:1d.7/usb4/4-4/4-4:1.2
    lrwxrwxrwx 1 root root    0 May 29 18:33 4-4:1.3 -> ../../../../devices/pci0000:00/0000:00:1d.7/usb4/4-4/4-4:1.3
    --w------- 1 root root 4096 May 29 18:33 bind
    lrwxrwxrwx 1 root root    0 May 29 18:33 module -> ../../../../module/usbserial
    --w------- 1 root root 4096 May 29 18:22 uevent
    --w------- 1 root root 4096 May 29 18:33 unbind
    bjorn@nemi:~$ ls -l /sys/bus/usb-serial/drivers/generic/
    total 0
    --w------- 1 root root 4096 May 29 18:33 bind
    lrwxrwxrwx 1 root root    0 May 29 18:33 module -> ../../../../module/usbserial
    -rw-r--r-- 1 root root 4096 May 29 18:33 new_id
    --w------- 1 root root 4096 May 29 18:22 uevent
    --w------- 1 root root 4096 May 29 18:33 unbind

    So we end up with a mismatch between the USB driver and the
    USB serial driver.  The reason for the above is simple: The
    USB driver probe will succeed if *any* registered serial
    driver matches, and will use that serial driver for all
    serial driver functions.

    This makes ref counting go wrong. We count the USB driver
    as used, but not the USB serial driver.  This may result
    in Oops'es as demonstrated by Johan Hovold <jhovold@gmail.com>:

    [11811.646396] drivers/usb/serial/usb-serial.c: get_free_serial 1
    [11811.646443] drivers/usb/serial/usb-serial.c: get_free_serial - minor base = 0
    [11811.646460] drivers/usb/serial/usb-serial.c: usb_serial_probe - registering ttyUSB0
    [11811.646766] usb 6-1: pl2303 converter now attached to ttyUSB0
    [11812.264197] USB Serial deregistering driver FTDI USB Serial Device
    [11812.264865] usbcore: deregistering interface driver ftdi_sio
    [11812.282180] USB Serial deregistering driver pl2303
    [11812.283141] pl2303 ttyUSB0: pl2303 converter now disconnected from ttyUSB0
    [11812.283272] usbcore: deregistering interface driver pl2303
    [11812.301056] USB Serial deregistering driver generic
    [11812.301186] usbcore: deregistering interface driver usbserial_generic
    [11812.301259] drivers/usb/serial/usb-serial.c: usb_serial_disconnect
    [11812.301823] BUG: unable to handle kernel paging request at f8e7438c
    [11812.301845] IP: [<f8e38445>] usb_serial_disconnect+0xb5/0x100 [usbserial]
    [11812.301871] *pde = 357ef067 *pte = 00000000
    [11812.301957] Oops: 0000 [#1] PREEMPT SMP
    [11812.301983] Modules linked in: usbserial(-) [last unloaded: pl2303]
    [11812.302008]
    [11812.302019] Pid: 1323, comm: modprobe Tainted: G        W    3.4.0-rc7+ #101 Dell Inc. Vostro 1520/0T816J
    [11812.302115] EIP: 0060:[<f8e38445>] EFLAGS: 00010246 CPU: 1
    [11812.302130] EIP is at usb_serial_disconnect+0xb5/0x100 [usbserial]
    [11812.302141] EAX: f508a180 EBX: f508a180 ECX: 00000000 EDX: f8e74300
    [11812.302151] ESI: f5050800 EDI: 00000001 EBP: f5141e78 ESP: f5141e58
    [11812.302160]  DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068
    [11812.302170] CR0: 8005003b CR2: f8e7438c CR3: 34848000 CR4: 000007d0
    [11812.302180] DR0: 00000000 DR1: 00000000 DR2: 00000000 DR3: 00000000
    [11812.302189] DR6: ffff0ff0 DR7: 00000400
    [11812.302199] Process modprobe (pid: 1323, ti=f5140000 task=f61e2bc0 task.ti=f5140000)
    [11812.302209] Stack:
    [11812.302216]  f8e3be0f f8e3b29c f8e3ae00 00000000 f513641c f5136400 f513641c f507a540
    [11812.302325]  f5141e98 c133d2c1 00000000 00000000 f509c400 f513641c f507a590 f5136450
    [11812.302372]  f5141ea8 c12f0344 f513641c f507a590 f5141ebc c12f0c67 00000000 f507a590
    [11812.302419] Call Trace:
    [11812.302439]  [<c133d2c1>] usb_unbind_interface+0x51/0x190
    [11812.302456]  [<c12f0344>] __device_release_driver+0x64/0xb0
    [11812.302469]  [<c12f0c67>] driver_detach+0x97/0xa0
    [11812.302483]  [<c12f001c>] bus_remove_driver+0x6c/0xe0
    [11812.302500]  [<c145938d>] ? __mutex_unlock_slowpath+0xcd/0x140
    [11812.302514]  [<c12f0ff9>] driver_unregister+0x49/0x80
    [11812.302528]  [<c1457df6>] ? printk+0x1d/0x1f
    [11812.302540]  [<c133c50d>] usb_deregister+0x5d/0xb0
    [11812.302557]  [<f8e37c55>] ? usb_serial_deregister+0x45/0x50 [usbserial]
    [11812.302575]  [<f8e37c8d>] usb_serial_deregister_drivers+0x2d/0x40 [usbserial]
    [11812.302593]  [<f8e3a6e2>] usb_serial_generic_deregister+0x12/0x20 [usbserial]
    [11812.302611]  [<f8e3acf0>] usb_serial_exit+0x8/0x32 [usbserial]
    [11812.302716]  [<c1080b48>] sys_delete_module+0x158/0x260
    [11812.302730]  [<c110594e>] ? mntput+0x1e/0x30
    [11812.302746]  [<c145c3c3>] ? sysenter_exit+0xf/0x18
    [11812.302746]  [<c107777c>] ? trace_hardirqs_on_caller+0xec/0x170
    [11812.302746]  [<c145c390>] sysenter_do_call+0x12/0x36
    [11812.302746] Code: 24 02 00 00 e8 dd f3 20 c8 f6 86 74 02 00 00 02 74 b4 8d 86 4c 02 00 00 47 e8 78 55 4b c8 0f b6 43 0e 39 f8 7f a9 8b 53 04 89 d8 <ff> 92 8c 00 00 00 89 d8 e8 0e ff ff ff 8b 45 f0 c7 44 24 04 2f
    [11812.302746] EIP: [<f8e38445>] usb_serial_disconnect+0xb5/0x100 [usbserial] SS:ESP 0068:f5141e58
    [11812.302746] CR2: 00000000f8e7438c

    Fix by only evaluating serial drivers pointing back to the
    USB driver we are currently probing.  This still allows two
    or more drivers to match the same device, running their
    serial driver probes to sort out which one to use.

    Cc: stable@vger.kernel.org # 3.0, 3.2, 3.3, 3.4
    Signed-off-by: Bjørn Mork <bjorn@mork.no>
    Reviewed-by: Felipe Balbi <balbi@ti.com>
    Tested-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 1e69d64a28cf3cabd095ada3a49f081c97f997dd
Author: Tomas Winkler <tomas.winkler@intel.com>
Date:   Tue May 29 16:39:12 2012 +0300

    misc: mei: fix stalled read

    This bug caused severe connectivity issue in the LMS application
    (LMS is described in  Documentation/misc-devices/mei/mei.txt)

    The bug was introduced in patch:
    commit 1ccb7b6249f9bc50678e2a383084ed0a34cc9239
    staging/mei: propagate error codes up in the write flow

    The patch has reverted the return value logic of some fo function but
    the conditional in _mei_irq_thread_read function was not swapped
    making read always entering the error path

    Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit a44cab4aff7e72e7052521121fd8ceca51351534
Author: Tomas Winkler <tomas.winkler@intel.com>
Date:   Tue May 29 16:39:11 2012 +0300

    misc: mei: unregister misc device in pci_remove function

    Since the misc device is registered only in the pci probe function
    it has to be also unregistered in the counterpart pci remove function
    and not in the module exit function.
    In case of probe failure the driver was oopsing in module exit function.

    Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit aa189ecdc0c7fad2166ba6d133df8bd214550f68
Author: Tomas Winkler <tomas.winkler@intel.com>
Date:   Tue May 29 16:39:10 2012 +0300

    misc: mei: set IRQF_ONESHOT for msi request_threaded_irq

    when the default irq quick handler is used then IRQF_ONESHOT must be set
    otherwise the request fails and following error is displayed:

    genirq: Threaded irq requested with handler=NULL and !ONESHOT for irq ...

    Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 1d29cfa57471a5e4b8a7c2a7433eeba170d3ad92
Author: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date:   Tue May 29 18:46:06 2012 -0700

    driver core: fixup reversed deferred probe order

    If driver requests probe deferral,
    it will be added to deferred_probe_pending_list
    by driver_deferred_probe_add(), but, it used list_add().
    Because of that, deferred probe will be run as reversed order.
    This patch uses list_add_tail(), and solved this issue.

    Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 790b9d4bb7614252e133d4a99ef18c1734d69163
Merge: c02feee 380622e
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Jun 13 23:19:34 2012 +0300

    Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh

    Pull SuperH fixes from Paul Mundt.

    * tag 'sh-for-linus' of git://github.com/pmundt/linux-sh:
      sh: Kill off additional asm-generic wrappers.
      sh: Setup CROSS_COMPILE at the top
      sh: Fix up link time defsym warnings.
      sh: use the new generic strnlen_user() function
      sh: switch to generic strncpy_from_user().
      sh: Kill off last dead UBC header
      serial: sh-sci: Make probe fail for ports that exceed the maximum count
      serial: sh-sci: Fix probe error paths
      clocksource: sh_tmu: Use clockevents_config_and_register().
      clocksource: sh_tmu: Convert timer lock to raw spinlock.
      clocksource: sh_mtu2: Convert timer lock to raw spinlock.
      clocksource: sh_cmt: Convert timer lock to raw spinlock.
      bug.h: need linux/kernel.h for TAINT_WARN.
      sh: convert to kbuild asm-generic support.
      sh64: Fix up fallout from generic init_task conversion.
      sh: arch/sh/kernel/process.c needs asm/fpu.h for unlazy_fpu().

commit c02feeea3dadf7e312f31d832c5d1799bd3bf7e1
Merge: 6ddb990 9473c4c
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Jun 13 23:18:41 2012 +0300

    Merge branch 'fixes-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds

    Pull led fixes from Bryan Wu.

    * 'fixes-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:
      leds: Make LEDS_ASIC3 and LEDS_RENESAS_TPU depend on LEDS_CLASS=y
      leds: fixed a coding style issue.
      leds: don't disable blinking when writing the same value to delay_on or delay_off

commit 6ddb99043cac53e30a38d68fe0835c901fbbbeb5
Merge: 7794f70 d8ce726
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Jun 13 23:17:12 2012 +0300

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

    Pull m68k update from Geert Uytterhoeven.

    This makes m68k use the generic library functions for the user-space
    strn[cpy|len] functions.

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
      m68k: Use generic strncpy_from_user(), strlen_user(), and strnlen_user()

commit c2fb8a3fa25513de8fedb38509b1f15a5bbee47b
Author: Alan Stern <stern@rowland.harvard.edu>
Date:   Wed Jun 13 11:20:19 2012 -0400

    USB: add NO_D3_DURING_SLEEP flag and revert 151b61284776be2

    This patch (as1558) fixes a problem affecting several ASUS computers:
    The machine crashes or corrupts memory when going into suspend if the
    ehci-hcd driver is bound to any controllers.  Users have been forced
    to unbind or unload ehci-hcd before putting their systems to sleep.

    After extensive testing, it was determined that the machines don't
    like going into suspend when any EHCI controllers are in the PCI D3
    power state.  Presumably this is a firmware bug, but there's nothing
    we can do about it except to avoid putting the controllers in D3
    during system sleep.

    The patch adds a new flag to indicate whether the problem is present,
    and avoids changing the controller's power state if the flag is set.
    Runtime suspend is unaffected; this matters only for system suspend.
    However as a side effect, the controller will not respond to remote
    wakeup requests while the system is asleep.  Hence USB wakeup is not
    functional -- but of course, this is already true in the current state
    of affairs.

    A similar patch has already been applied as commit
    151b61284776be2d6f02d48c23c3625678960b97 (USB: EHCI: fix crash during
    suspend on ASUS computers).  The patch supersedes that one and reverts
    it.  There are two differences:

    	The old patch added the flag at the USB level; this patch
    	adds it at the PCI level.

    	The old patch applied to all chipsets with the same vendor,
    	subsystem vendor, and product IDs; this patch makes an
    	exception for a known-good system (based on DMI information).

    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Tested-by: Dâniel Fraga <fragabr@gmail.com>
    Tested-by: Andrey Rahmatullin <wrar@wrar.name>
    Tested-by: Steven Rostedt <rostedt@goodmis.org>
    Cc: stable <stable@vger.kernel.org>
    Reviewed-by: Rafael J. Wysocki <rjw@sisk.pl>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit b67989515defba7412acff01162e5bb1f0f5923a
Author: Jingoo Han <jg1.han@samsung.com>
Date:   Mon Jun 11 11:27:27 2012 +0900

    video: s3c-fb: fix possible division by zero in s3c_fb_calc_pixclk

    Divider value can be zero and it makes division by zero
    from debug message in s3c_fb_calc_pixclk; therefore, it
    should be fixed.

    Signed-off-by: Jingoo Han <jg1.han@samsung.com>
    Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>

commit ecd57ae28eb34e2b34fac1c5b74bb876efa665c0
Author: Jingoo Han <jg1.han@samsung.com>
Date:   Mon Jun 11 11:26:41 2012 +0900

    video: s3c-fb: clear SHADOWCON register when clearing hardware window registers

    All bits of SHADOWCON register should be cleared when clearing
    hardware window registers; however, some bits of SHADOWCON register
    are not cleared previously.

    Signed-off-by: Jingoo Han <jg1.han@samsung.com>
    Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>

commit 7794f709c5897e8876801ff205cc758c0e7bc901
Merge: 94fa83c c3a21fc
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Jun 13 17:57:30 2012 +0300

    Merge tag 'omapdss-for-3.5-rc2' of git://gitorious.org/linux-omap-dss2/linux

    Pull omapdss build problem fix from Tomi Valkeinen:
     "Small fixes for omapdss driver.  Most importantly, fixes a build
      problem when debugfs or omapdss debug support is turned off, and fixes
      a suspend related crash."

    This has apparently been annoying rmk for a while..

    * tag 'omapdss-for-3.5-rc2' of git://gitorious.org/linux-omap-dss2/linux:
      OMAPDSS: fix registration of DPI and SDI devices
      OMAPDSS: DSI: Fix bug when calculating LP command interleaving parameters
      OMAPDSS: fix bogus WARN_ON in dss_runtime_put()
      OMAPDSS: Taal: fix compilation warning
      OMAPDSS: fix build when DEBUG_FS or DSS_DEBUG_SUPPORT disabled

commit 2e8b2b29d1f904353c3e54b342ccb8c66390dab8
Author: Takashi Iwai <tiwai@suse.de>
Date:   Wed Jun 13 16:47:32 2012 +0200

    ALSA: hda - Don't forget to call init verbs added by fixup list

    During the split to the auto-parser helper functions, the actual call
    of init verbs was lost.

    Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=43366

    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 25f42985825dd93f0593efe454e54c2aa13f7830
Author: Stephane Eranian <eranian@google.com>
Date:   Mon Jun 11 15:44:26 2012 +0200

    perf/x86: Fix broken LBR fixup code

    I noticed that the LBR fixups were not working anymore
    on programs where they used to. I tracked this down to
    a recent change to copy_from_user_nmi():

     db0dc75d640 ("perf/x86: Check user address explicitly in copy_from_user_nmi()")

    This commit added a call to __range_not_ok() to the
    copy_from_user_nmi() routine. The problem is that the logic
    of the test must be reversed. __range_not_ok() returns 0 if the
    range is VALID. We want to return early from copy_from_user_nmi()
    if the range is NOT valid.

    Signed-off-by: Stephane Eranian <eranian@google.com>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Acked-by: Arun Sharma <asharma@fb.com>
    Link: http://lkml.kernel.org/r/20120611134426.GA7542@quad
    Signed-off-by: Ingo Molnar <mingo@kernel.org>

commit 161270fc1f9ddfc17154e0d49291472a9cdef7db
Author: Borislav Petkov <borislav.petkov@amd.com>
Date:   Wed Jun 6 17:31:26 2012 +0200

    x86/smp: Fix topology checks on AMD MCM CPUs

    The warning below triggers on AMD MCM packages because physical package
    IDs on the cores of a _physical_ socket are the same. I.e., this field
    says which CPUs belong to the same physical package.

    However, the same two CPUs belong to two different internal, i.e.
    "logical" nodes in the same physical socket which is reflected in the
    CPU-to-node map on x86 with NUMA.

    Which makes this check wrong on the above topologies so circumvent it.

    [    0.444413] Booting Node   0, Processors  #1 #2 #3 #4 #5 Ok.
    [    0.461388] ------------[ cut here ]------------
    [    0.465997] WARNING: at arch/x86/kernel/smpboot.c:310 topology_sane.clone.1+0x6e/0x81()
    [    0.473960] Hardware name: Dinar
    [    0.477170] sched: CPU #6's mc-sibling CPU #0 is not on the same node! [node: 1 != 0]. Ignoring dependency.
    [    0.486860] Booting Node   1, Processors  #6
    [    0.491104] Modules linked in:
    [    0.494141] Pid: 0, comm: swapper/6 Not tainted 3.4.0+ #1
    [    0.499510] Call Trace:
    [    0.501946]  [<ffffffff8144bf92>] ? topology_sane.clone.1+0x6e/0x81
    [    0.508185]  [<ffffffff8102f1fc>] warn_slowpath_common+0x85/0x9d
    [    0.514163]  [<ffffffff8102f2b7>] warn_slowpath_fmt+0x46/0x48
    [    0.519881]  [<ffffffff8144bf92>] topology_sane.clone.1+0x6e/0x81
    [    0.525943]  [<ffffffff8144c234>] set_cpu_sibling_map+0x251/0x371
    [    0.532004]  [<ffffffff8144c4ee>] start_secondary+0x19a/0x218
    [    0.537729] ---[ end trace 4eaa2a86a8e2da22 ]---
    [    0.628197]  #7 #8 #9 #10 #11 Ok.
    [    0.807108] Booting Node   3, Processors  #12 #13 #14 #15 #16 #17 Ok.
    [    0.897587] Booting Node   2, Processors  #18 #19 #20 #21 #22 #23 Ok.
    [    0.917443] Brought up 24 CPUs

    We ran a topology sanity check test we have here on it and
    it all looks ok... hopefully :).

    Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
    Cc: Andreas Herrmann <andreas.herrmann3@amd.com>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Link: http://lkml.kernel.org/r/20120529135442.GE29157@aftab.osrc.amd.com
    Signed-off-by: Ingo Molnar <mingo@kernel.org>

commit fdb1117325ad719dc39e81209bc622d511db70e0
Author: Marek Szyprowski <m.szyprowski@samsung.com>
Date:   Wed Jun 13 14:04:58 2012 +0200

    ARM: dma-mapping: fix debug messages in dmabounce code

    This patch fixes the usage of uninitialized variables in dmabounce code
    intoduced by commit a227fb92 ('ARM: dma-mapping: remove offset parameter
    to prepare for generic dma_ops'):
    arch/arm/common/dmabounce.c: In function ‘dmabounce_sync_for_device’:
    arch/arm/common/dmabounce.c:409: warning: ‘off’ may be used uninitialized in this function
    arch/arm/common/dmabounce.c:407: note: ‘off’ was declared here
    arch/arm/common/dmabounce.c: In function ‘dmabounce_sync_for_cpu’:
    arch/arm/common/dmabounce.c:369: warning: ‘off’ may be used uninitialized in this function
    arch/arm/common/dmabounce.c:367: note: ‘off’ was declared here

    Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>

commit 5134de2815ac723ecfba4a1c7b2a90fa4d8dcfd9
Author: Sachin Kamat <sachin.kamat@linaro.org>
Date:   Sun Jun 3 22:27:01 2012 +0530

    qla2xxx: Remove version.h header file inclusion

    version.h header file is no longer required for qla_target code.

    Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
    Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

commit d4f75b567bb63b51e5ecd42af1e82d5aed5100dd
Author: Roland Dreier <roland@purestorage.com>
Date:   Mon Jun 11 18:31:31 2012 -0700

    tcm_qla2xxx: Handle malformed wwn strings properly

    If we make a variable an unsigned int and then expect it to be < 0 on
    a bad character, we're going to have a bad time.  Fix the tcm_qla2xxx
    code to actually notice if hex_to_bin() returns a negative variable.

    This was detected by the compiler warning:

        scsi/qla2xxx/tcm_qla2xxx.c: In function ‘tcm_qla2xxx_npiv_extract_wwn’:
        scsi/qla2xxx/tcm_qla2xxx.c:148:3: warning: comparison of unsigned expression >= 0 is always true [-Wtype-limits]

    Signed-off-by: Roland Dreier <roland@purestorage.com>
    Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

commit 9389c3c943da7e5f903eebf79d596601537afe01
Author: Roland Dreier <roland@purestorage.com>
Date:   Mon Jun 11 18:31:30 2012 -0700

    tcm_qla2xxx: tcm_qla2xxx_handle_tmr() can be static

    Signed-off-by: Roland Dreier <roland@purestorage.com>
    Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

commit fae9eaf81323eda64f28b9f4f4aeffb807e5b5f4
Author: Roland Dreier <roland@purestorage.com>
Date:   Mon Jun 11 18:23:16 2012 -0700

    qla2xxx: Don't leak commands we give up on in qlt_do_work()

    If we go to the "out_term:" exit path in qlt_do_work(), we call
    qlt_send_term_exchange() with a NULL cmd, which means that it can't
    possibly free the cmd for us.  Add an explicit call to free the
    command memory, so we don't leak the allocation.

    This will also fix warnings about "BUG qla_tgt_cmd_cachep: Objects
    remaining on kmem_cache_close" from slub when unloading the qla2xxx
    target module.

    Signed-off-by: Roland Dreier <roland@purestorage.com>
    Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

commit 092e1dc3f227ebef9ad45c26ef05c283ca4495a5
Author: Roland Dreier <roland@purestorage.com>
Date:   Mon Jun 11 18:23:15 2012 -0700

    qla2xxx: Don't crash if we can't find cmd for failed CTIO

    In qlt_do_ctio_completion(), there's no point in calling
    qlt_term_ctio_exchange() with a NULL cmd -- all that it does is crash
    in a NULL pointer dereference, since it does

    	qlt_send_term_exchange(vha, cmd, &cmd->atio, 1);

    and dereferencing &cmd->atio is a bad idea if cmd itself is NULL.

    If we really need to do this, we could take the values from the
    failed CTIO we're processing, but it's not clear if it's worth
    the replumbing to do that.

    Signed-off-by: Roland Dreier <roland@purestorage.com>
    Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

commit 3578ddba1ae93263d373e7bc85fd38d1f0368b78
Author: Roland Dreier <roland@purestorage.com>
Date:   Mon Jun 4 23:37:34 2012 -0700

    tcm_qla2xxx: Don't insert nacls without sessions into the btree

    When we create an explicit node ACL in tcm_qla2xxx_make_nodeacl(),
    there is a call to tcm_qla2xxx_setup_nacl_from_rport(), which puts the
    node ACL into the lport_fcport_map even though there is no session yet
    for the initiator.  Since the only time we remove entries from this
    map is when we free a session, this means that if we later delete this
    node ACL without the initiator ever creating a session, we'll leave
    the nacl pointer in the btree pointing at freed memory.

    This is especially bad if that initiator later does send us a command
    that would cause us to create a dynamic ACL and session: we'll find
    the stale freed nacl pointer in the btree and end up with use-after-free.

    We could add more code to clear the btree entry when deleting the
    explicit nacl, but the original insertion is pointless: without a
    session attached, we'll just have to update the entry when a session
    appears anyway.  So we can just delete tcm_qla2xxx_setup_nacl_from_rport()
    and the code that calls it.

    Signed-off-by: Roland Dreier <roland@purestorage.com>
    Cc: Chad Dupuis <chad.dupuis@qlogic.com>
    Cc: Giridhar Malavali <giridhar.malavali@qlogic.com>
    Cc: Arun Easi <arun.easi@qlogic.com>
    Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

commit 59e4f541baf728dbb426949bfa9f6862387ffd0e
Author: Roland Dreier <roland@purestorage.com>
Date:   Mon Jun 4 23:24:51 2012 -0700

    target: Return error to initiator if SET TARGET PORT GROUPS emulation fails

    The error paths in target_emulate_set_target_port_groups() are all
    essentially "rc = -EINVAL; goto out;" but the code at "out:" ignores
    rc and always returns success.  This means that even if eg explicit
    ALUA is turned off, the initiator will always see a good SCSI status
    for SET TARGET PORT GROUPS.

    Fix this by returning rc as is intended.  It appears this bug was
    added by the following patch:

    commit 05d1c7c0d0db4cc25548d9aadebb416888a82327
    Author: Andy Grover <agrover@redhat.com>
    Date:   Wed Jul 20 19:13:28 2011 +0000

        target: Make all control CDBs scatter-gather

    Signed-off-by: Roland Dreier <roland@purestorage.com>
    Cc: Andy Grover <agrover@redhat.com>
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

commit f2d5d9b90b095ab0e8097b2b0793f4a56ed98147
Author: Nicholas Bellinger <nab@linux-iscsi.org>
Date:   Fri May 18 15:37:53 2012 -0700

    tcm_qla2xxx: Clear session s_id + loop_id earlier during shutdown

    This patch adds a new tcm_qla2xxx_clear_sess_lookup() call to clear session
    specific s_id + loop_id entries used for se_node_acl pointer lookup ahead
    of releasing se_session within the process context workqueue callback in
    tcm_qla2xxx_free_session().

    It makes the call in existing tcm_qla2xxx_clear_nacl_from_fcport_map()
    code invoked from qlt_unreg_sess() in interrupt context w/ hardware_lock
    held, ahead of the process context callback into qlt_free_session_done()
    -> tcm_qla2xxx_free_session().

    We are doing this to address a race between incoming ATIO or TMR packets
    using stale se_node_acl pointer once session shutdown has been invoked via
    qlt_unreg_sess() in qla_target.c LLD code, and when the entire tcm_qla2xxx
    endpoint has not been forced into shutdown w/ echo 0 > ../$QLA2XXX_PORT/enable

    Cc: Joern Engel <joern@logfs.org>
    Cc: Roland Dreier <roland@purestorage.com>
    Cc: Arun Easi <arun.easi@qlogic.com>
    Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

commit 380622e9ff56201f9c3c1f153d1ca0a24324a1d4
Merge: 74ca431 cba8df4 3977407 1318002 d14a5fd
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Wed Jun 13 12:01:33 2012 +0900

    Merge branches 'sh/urgent', 'sh/core', 'sh/clockevents', 'sh/asm-generic' and 'sh/trivial' into sh-fixes-for-linus

commit 1318002aebadf18217ad3de677b6c96b8140dcff
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Wed Jun 13 11:59:47 2012 +0900

    sh: Kill off additional asm-generic wrappers.

    A few wrappers were overlooked in the initial conversion, take care of
    them now.

    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit d14a5fdc26986f7bac8376a339f336be18ba2a90
Author: Geert Uytterhoeven <geert@linux-m68k.org>
Date:   Sat May 12 22:39:07 2012 +0200

    sh: Setup CROSS_COMPILE at the top

    CROSS_COMPILE must be setup before using e.g. cc-option (and a few other
    as-*, cc-*, ld-* macros), else they will check against the wrong compiler
    when cross-compiling, and may invoke the cross compiler with wrong or
    suboptimal compiler options.

    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Cc: Paul Mundt <lethal@linux-sh.org>
    Cc: linux-sh@vger.kernel.org
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit aaf68b753313f1e67fd2e8996e32ab2813f441fa
Author: Joern Engel <joern@logfs.org>
Date:   Fri May 18 13:58:23 2012 -0700

    tcm_qla2xxx: Convert to TFO->put_session() usage

    This patch converts tcm_qla2xxx code to use an internal kref_put() for
    se_session->sess_kref in order to ensure that qla_hw_data->hardware_lock
    can be held while calling qlt_unreg_sess() for the final put.

    Signed-off-by: Joern Engel <joern@logfs.org>
    Cc: Roland Dreier <roland@purestorage.com>
    Cc: Arun Easi <arun.easi@qlogic.com>
    Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

commit 8e780be960c3e7000a94652bc56efeb3c932ee24
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Wed Jun 13 11:36:36 2012 +0900

    sh: Fix up link time defsym warnings.

    sh-linux-gnu-ld:--defsym 'jiffies=jiffies_64': ignoring invalid character `'' in expression

    For some reason ld has recently started complaining about the quotes, so just
    get rid of them, we don't need them for anything anyways.

    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 4149268e7816d719b0fde8e89aaa6db8c168fc43
Author: Joern Engel <joern@logfs.org>
Date:   Fri May 18 13:57:19 2012 -0700

    target: Add TFO->put_session() caller for HW fabric session shutdown

    This patch adds an optional target_core_fabric_ops->put_session() caller
    within the existing target_put_session() code path.

    This is required by tcm_qla2xxx code in order to invoke it's own fabric
    specific session shutdown handler using se_session->sess_kref.

    Signed-off-by: Joern Engel <joern@logfs.org>
    Cc: Roland Dreier <roland@purestorage.com>
    Cc: Arun Easi <arun.easi@qlogic.com>
    Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

commit cba8df4be3bdf10c86a26c458c5fc2ca978eeb2c
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Mon Jun 4 15:46:05 2012 +0900

    sh: use the new generic strnlen_user() function

    This discards both the _32 and _64 versions in favour of the consolidated
    generic one.

    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 0e100e11bd73be4e28e457cf5ad49a6892d5d1fe
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Fri May 25 13:02:48 2012 +0900

    sh: switch to generic strncpy_from_user().

    This kills off the special sh32/64 versions and adopts the generic
    version. It should be possible to optimize this for SH-4A unaligned
    loads, but this is a corner case that can be supported incrementally.

    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 74ca4313bdd0423a7917bbe74be3f27da8a39fe1
Author: Paul Bolle <pebolle@tiscali.nl>
Date:   Fri Jun 8 22:49:17 2012 +0200

    sh: Kill off last dead UBC header

    Commit 7025bec9125b0a02edcaf22c2dce753bf2c95480 ("sh: Kill off dead UBC
    headers.") skipped arch/sh/include/cpu-sh2a/cpu/ubc.h. Since nothing is
    using that header either, kill it off too.

    Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit b6c5ef6f6d3e46d6200b141c30ac000a11b851df
Author: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date:   Wed Jun 13 00:28:24 2012 +0200

    serial: sh-sci: Make probe fail for ports that exceed the maximum count

    The driver supports a maximum number of ports configurable at compile
    time. Make sure the probe() method fails when registering a port that
    exceeds the maximum instead of returning success without registering the
    port.

    This fixes a crash at system suspend time, when the driver tried to
    suspend a non-registered port using the UART core.

    Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 6dae14216c85eea13db7b12c469475c5d30e5499
Author: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date:   Wed Jun 13 00:28:23 2012 +0200

    serial: sh-sci: Fix probe error paths

    When probing fails, the driver must not try to cleanup resources that
    have not been initialized. Fix this.

    Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 0ef0be15fd2564767f114c249fc4af704d8e16f4
Author: 说不得 <gavin.kx@qq.com>
Date:   Mon May 28 21:31:29 2012 +0800

    USB: option: add more YUGA device ids

    Signed-off-by: gavin zhu <gavin.zhu@qq.com>
    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 6ebb017de9d59a18c3ff9648270e8f6abaa93438
Author: Andrew Lunn <andrew@lunn.ch>
Date:   Tue Jun 5 08:52:34 2012 +0200

    printk: Fix alignment of buf causing crash on ARM EABI

    Commit 7ff9554bb578ba02166071d2d487b7fc7d860d62, printk: convert
    byte-buffer to variable-length record buffer, causes systems using
    EABI to crash very early in the boot cycle. The first entry in struct
    log is a u64, which for EABI must be 8 byte aligned.

    Make use of __alignof__() so the compiler to decide the alignment, but
    allow it to be overridden using CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS,
    for systems which can perform unaligned access and want to save
    a few bytes of space.

    Tested on Orion5x and Kirkwood.

    Signed-off-by: Andrew Lunn <andrew@lunn.ch>
    Tested-by: Stephen Warren <swarren@wwwdotorg.org>
    Acked-by: Stephen Warren <swarren@wwwdotorg.org>
    Acked-by: Kay Sievers <kay@vrfy.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit b9c87663eead64c767e72a373ae6f8a94bead459
Author: Tony Zelenoff <antonz@parallels.com>
Date:   Tue Jun 5 17:58:04 2012 +0400

    USB: mos7840: Fix compilation of usb serial driver

    The __devinitconst section can't be referenced
    from usb_serial_device structure. Thus removed it as
    it done in other mos* device drivers.

    Error itself:
    WARNING: drivers/usb/serial/mos7840.o(.data+0x8): Section mismatch in reference
    from the variable moschip7840_4port_device to the variable
    .devinit.rodata:id_table
    The variable moschip7840_4port_device references
    the variable __devinitconst id_table

    [v2] no attach now

    Signed-off-by: Tony Zelenoff <antonz@parallels.com>
    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit b9c3aab315b51f81649a0d737c4c73783fbd8de0
Author: Johan Hovold <jhovold@gmail.com>
Date:   Tue May 29 18:22:48 2012 +0200

    USB: option: fix memory leak

    Fix memory leak introduced by commit 383cedc3bb435de7a2 ("USB: serial:
    full autosuspend support for the option driver") which allocates
    usb-serial data but never frees it.

    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 4273f9878b0a8271df055e3c8f2e7f08c6a4a2f4
Author: Johan Hovold <jhovold@gmail.com>
Date:   Tue May 29 17:57:52 2012 +0200

    USB: option: fix port-data abuse

    Commit 8b4c6a3ab596961b78465 ("USB: option: Use generic USB wwan code")
    moved option port-data allocation to usb_wwan_startup but still cast the
    port data to the old struct...

    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 1aa3c63cf0a79153ee13c8f82e4eb6c40b66a161
Author: Alan Cox <alan@linux.intel.com>
Date:   Tue May 22 20:45:13 2012 +0100

    USB: mct_u232: Fix incorrect TIOCMSET return

    The low level helper returns 1 on success. The ioctl should however return
    0. As this is the only user of the helper return, make the helper return 0 or
    an error code.

    Resolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id=43009
    Signed-off-by: Alan Cox <alan@linux.intel.com>
    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 42ca7da1c2363dbef4ba1b6917c4c02274b6a5e2
Author: Andrew Bird <ajb@spheresystems.co.uk>
Date:   Mon May 28 12:43:06 2012 +0100

    USB: option: Updated Huawei K4605 has better id

    Later firmwares for this device now have proper subclass and
    protocol info so we can identify it nicely without needing to use
    the blacklist. I'm not removing the old 0xff matching as there
    may be devices in the field that still need that.

    Signed-off-by: Andrew Bird <ajb@spheresystems.co.uk>
    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 19a3dd1575e954e8c004413bee3e12d3962f2525
Author: Tom Cassidy <tomas.cassidy@gmail.com>
Date:   Wed Jun 6 17:08:48 2012 +1000

    USB: serial: sierra: Add support for Sierra Wireless AirCard 320U modem

    Add support for Sierra Wireless AirCard 320U modem

    Signed-off-by: Tomas Cassidy <tomas.cassidy@gmail.com>
    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 5bbfa6f427c1d7244a5ee154ab8fa37265a5e049
Author: Mikko Tuumanen <mikko.tuumanen@qemsoftware.com>
Date:   Fri Jun 1 11:28:55 2012 +0300

    USB: serial: cp210x: add Optris MS Pro usb id

    Signed-off-by: Mikko Tuumanen <mikko.tuumanen@qemsoftware.com>
    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit e00a54d772210d450e5c1a801534c3c8a448549f
Author: Evan McNabb <evan@mcnabbs.org>
Date:   Fri May 25 22:46:14 2012 -0400

    USB: ftdi-sio: Add support for RT Systems USB-RTS01 serial adapter

    Add support for RT Systems USB-RTS01 USB to Serial adapter:
    http://www.rtsystemsinc.com/Photos/USBRTS01.html

    Tested by controlling Icom IC-718 amateur radio transceiver via hamlib.

    Signed-off-by: Evan McNabb <evan@mcnabbs.org>
    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit c41444ccfa33a1c20efa319e554cb531576e64a2
Author: Bjørn Mork <bjorn@mork.no>
Date:   Thu May 24 11:19:04 2012 +0200

    USB: qcserial: Add Sierra Wireless device IDs

    Some additional IDs found in the BSD/GPL licensed out-of-tree
    GobiSerial driver from Sierra Wireless.

    Signed-off-by: Bjørn Mork <bjorn@mork.no>
    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 4cbbb039a9719fb3bba73d255c6a95bc6dc6428b
Author: Bjørn Mork <bjorn@mork.no>
Date:   Sat May 19 19:20:50 2012 +0200

    USB: option: Add Vodafone/Huawei K5005 support

    Tested-by: Thomas Schäfer <tschaefer@t-online.de>
    Signed-off-by: Bjørn Mork <bjorn@mork.no>
    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit de102ef41f24a4c251c4a3838796bb27557d4d93
Author: Bjørn Mork <bjorn@mork.no>
Date:   Sat May 19 19:19:48 2012 +0200

    USB: cdc-wdm: Add Vodafone/Huawei K5005 support

    Tested-by: Thomas Schäfer <tschaefer@t-online.de>
    Signed-off-by: Bjørn Mork <bjorn@mork.no>
    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit e58c5de8f59d124907c993ea3126c69493b7eec7
Author: Julia Lawall <Julia.Lawall@lip6.fr>
Date:   Tue Jun 12 10:17:25 2012 -0400

    drivers/ide/ide-cs.c: adjust suspicious bit operation

    IO_DATA_PATH_WIDTH_8 is 0, so a bit-and with it is always false.  The
    value IO_DATA_PATH_WIDTH covers the bits of the IO_DATA_PATH constants, so
    first pick those bits and then make the test using !=.

    This problem was found using Coccinelle (http://coccinelle.lip6.fr/).

    Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 78d80c5a720ea370defa3e3124c0f7f7179bdfe5
Author: Linus Walleij <linus.walleij@linaro.org>
Date:   Wed May 23 21:18:46 2012 +0200

    serial/amba-pl011: move custom pin control to driver

    We had a boot regression in Ux500 in the merge window because
    two orthogonal pin control schemes for the PL011 were merged
    at the same time:

    - One using the .init() and .exit() hooks into the platform
      for Ux500 putting the pins into default vs sleep state
      respectively as the port was started/stopped.
      commit a09806607fd20bed2f8c41fe22793386790a14aa
      "ARM: ux500: switch to using pinctrl for uart0"

    - One hogging the default setting at PL011 probe()
      commit 258e055111d3cde2607e0d04eb91da2f7a59b591
      "serial: amba-pl011: adopt pinctrl support"

    To get a solution that works for both let's scrap the stuff
    in the platform callbacks, instead have the driver itself
    select default and sleep states when the port is
    started/stopped. Hopefully this works for all clients.
    Platform callbacks are bad for device tree migration anyway,
    so this rids us of another problem in Ux500.

    Cc: Shawn Guo <shawn.guo@linaro.org>
    Cc: Russell King <rmk+kernel@arm.linux.org.uk>
    Reported-by: Lee Jones <lee.jones@linaro.org>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Tested-by: Shawn Guo <shawn.guo@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit f109293f5889dd30477564a3ce2c901f4024a53e
Author: Randy Dunlap <rdunlap@xenotime.net>
Date:   Tue Jun 5 09:46:07 2012 -0700

    serial: fix serial_txx9.c build warning/typo

    Fix kconfig symbol test to use "defined":

    drivers/tty/serial/serial_txx9.c: warning: "CONFIG_CONSOLE_POLL" is not defined [-Wundef]

    Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 58bcd3322944f31c9a8b02694e221c645cf4ffd9
Author: Randy Dunlap <rdunlap@xenotime.net>
Date:   Fri Jun 8 18:51:23 2012 -0700

    serial: fix kernel-doc warnings in 8250.c

    Fix kernel-doc warnings in drivers/tty/serial/8250/8250.c:

    Warning(drivers/tty/serial/8250/8250.c:3128): No description found for parameter 'up'
    Warning(drivers/tty/serial/8250/8250.c:3128): Excess function parameter 'port' description in 'serial8250_register_8250_port'

    Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
    Acked-by: Alan Cox <alan@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 5ee31c6898ea5537fcea160999d60dc63bc0c305
Author: Eric Dumazet <edumazet@google.com>
Date:   Tue Jun 12 06:03:51 2012 +0000

    bonding: Fix corrupted queue_mapping

    In the transmit path of the bonding driver, skb->cb is used to
    stash the skb->queue_mapping so that the bonding device can set its
    own queue mapping.  This value becomes corrupted since the skb->cb is
    also used in __dev_xmit_skb.

    When transmitting through bonding driver, bond_select_queue is
    called from dev_queue_xmit.  In bond_select_queue the original
    skb->queue_mapping is copied into skb->cb (via bond_queue_mapping)
    and skb->queue_mapping is overwritten with the bond driver queue.

    Subsequently in dev_queue_xmit, __dev_xmit_skb is called which writes
    the packet length into skb->cb, thereby overwriting the stashed
    queue mappping.  In bond_dev_queue_xmit (called from hard_start_xmit),
    the queue mapping for the skb is set to the stashed value which is now
    the skb length and hence is an invalid queue for the slave device.

    If we want to save skb->queue_mapping into skb->cb[], best place is to
    add a field in struct qdisc_skb_cb, to make sure it wont conflict with
    other layers (eg : Qdiscc, Infiniband...)

    This patchs also makes sure (struct qdisc_skb_cb)->data is aligned on 8
    bytes :

    netem qdisc for example assumes it can store an u64 in it, without
    misalignment penalty.

    Note : we only have 20 bytes left in (struct qdisc_skb_cb)->data[].
    The largest user is CHOKe and it fills it.

    Based on a previous patch from Tom Herbert.

    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Reported-by: Tom Herbert <therbert@google.com>
    Cc: John Fastabend <john.r.fastabend@intel.com>
    Cc: Roland Dreier <roland@kernel.org>
    Acked-by: Neil Horman <nhorman@tuxdriver.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 8a93664df90db983cfede122f9b4ddb3a8284e52
Author: Weiping Pan <wpan@redhat.com>
Date:   Sun Jun 10 23:00:20 2012 +0000

    bonding:record primary when modify it via sysfs

    If we modify primary via sysfs and it is not a valid slave,
    we should record it for future use, and this behavior is the same with
    bond_check_params().

    Signed-off-by: Weiping Pan <wpan@redhat.com>
    Acked-by: Nicolas de Pesloüan <nicolas.2p.debian@free.fr>
    Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 5aa04d3af8916d890836ccaa9d146edee1e4c655
Merge: e3d62d7 d109e9a
Author: David S. Miller <davem@davemloft.net>
Date:   Tue Jun 12 15:18:15 2012 -0700

    Merge branch 'master' of git://1984.lsi.us.es/net

commit 33735a94afdfb39c550b952a40f77c60afdddfa5
Author: Lars-Peter Clausen <lars@metafoo.de>
Date:   Mon Jun 11 15:09:21 2012 +0200

    staging:iio:ad7298: Fix linker error due to missing IIO kfifo buffer

    The ad7298 drivers buffer implementation uses the IIO kfifo buffer, so it needs
    to select IIO_KFIFO_BUF. Otherwise (if no other driver selects the symbol) the
    following linker error will occur:

    drivers/built-in.o: In function `ad7298_register_ring_funcs_and_init':
    	(.text+0x245cf2): undefined reference to `iio_kfifo_allocate'
    drivers/built-in.o: In function `ad7298_register_ring_funcs_and_init':
    	(.text+0x245d7d): undefined reference to `iio_kfifo_free'
    drivers/built-in.o: In function `ad7298_ring_cleanup':
    	(.text+0x245dcd): undefined reference to `iio_kfifo_free'

    Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
    Reported-by: Randy Dunlap <rdunlap@xenotime.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 1b8487368bb0acedf23e226974b63aaaf2bfddbd
Author: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date:   Tue Jun 12 11:10:50 2012 -0700

    Revert "staging: usbip: bugfix for stack corruption on 64-bit architectures"

    This reverts commit 08224262adefb5e6460888b2490a96e1bc28aef5 as it's
    just not right.

    Reported-by: Ben Hutchings <ben@decadent.org.uk>
    Cc: stable <stable@vger.kernel.org>
    Cc: Bart Westgeest <bart@elbrys.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit edfe3bfc1b779ddda9bcff523eb022dda37b93c8
Author: David Henningsson <david.henningsson@canonical.com>
Date:   Tue Jun 12 13:15:12 2012 +0200

    ALSA: HDA: Pin fixup for Zotac Z68 motherboard

    Pin 0x1b was connected to the front panel connector, which according to
    the HDA standard should contain a mic and a headphone. In this case,
    the headphone was listed as "line out" by BIOS.

    Cc: stable@kernel.org
    BugLink: https://bugs.launchpad.net/bugs/993162
    Signed-off-by: David Henningsson <david.henningsson@canonical.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 8b21460ac6c0c88a0fec1cc70906c8e25c5aaa54
Author: Vinod Koul <vinod.koul@linux.intel.com>
Date:   Tue Jun 12 16:16:18 2012 +0530

    ALSA: compress_core: cleanup pointers on stop

    as the start can be called after stop again, we need to reset state

    Signed-off-by: Namarta Kohli <namartax.kohli@intel.com>
    Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 6b18f79399f25a0f8e2b915b2dcb8bf5c7aa470d
Author: Vinod Koul <vinod.koul@linux.intel.com>
Date:   Tue Jun 12 16:16:17 2012 +0530

    ALSA: compress_core: don't wake up on pause

    during pause the core should maintain the status-quo on the device and pointers
    and not wake up. If app needs it should call DROP explcitly.

    Signed-off-by: Namarta Kohli <namartax.kohli@intel.com>
    Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 94fa83c424321189ca24fb6cb4c0d224cdedc72d
Merge: 266ae4e a393c73
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Jun 12 18:48:17 2012 +0300

    Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

    Pull drm fixes from Dave Airlie:
     "As per your -rc2 announce, this is small and urgent only,

      The radeon one is for a regression in 3.4 so we need this one in your
      tree so we can send the stable one out, code in 3.4 broke some old
      userspaces.  The max props increase fixes spew being seen on a few
      machines.  And a ttm regression to fix some accounting issues that
      affect vmwgfx."

    * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
      drm/ttm: Fix buffer object metadata accounting regression v2
      drm: increase DRM_OBJECT_MAX_PROPERTY to 24
      drm/radeon: fix tiling and command stream checking on evergreen v3

commit 266ae4e6155419b3904f45b132db26d4b6fdceaf
Merge: 7452ca5 ead188f
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Jun 12 18:28:58 2012 +0300

    Merge tag 'writeback-lock-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux

    Pull writeback locking fix from Wu Fengguang:
     "fix unbalanced wb->list_lock in 3.5-rc1"

    * tag 'writeback-lock-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:
      writeback: Fix lock imbalance in writeback_sb_inodes()

commit a393c730ab69617c3291a3b0b2a228c9be2fc28c
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date:   Tue Jun 12 13:28:42 2012 +0200

    drm/ttm: Fix buffer object metadata accounting regression v2

    A regression was introduced in the 3.3 rc series, commit
    "drm/ttm: simplify memory accounting for ttm user v2",
    causing the metadata of buffer objects created using the ttm_bo_create()
    function to be accounted twice.
    That causes massive leaks with the vmwgfx driver running for example
    SpecViewperf Catia-03 test 2, eventually killing the app.

    Furthermore, the same commit introduces a regression where
    metadata accounting is leaked if a buffer object is
    initialized with an illegal size. This is also fixed with this commit.

    v2: Fixed an error path and removed an unused variable.

    Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
    Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
    Cc: Jerome Glisse <jglisse@redhat.com>
    Cc: stable@vger.kernel.org
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit fe4561680519019cc15d660862dce513ded2f3a7
Author: Paulo Zanoni <paulo.r.zanoni@intel.com>
Date:   Tue Jun 12 11:27:01 2012 -0300

    drm: increase DRM_OBJECT_MAX_PROPERTY to 24

    Before Kernel 3.5, no one was checking for the return value of
    drm_connector_attach_property, so we never noticed that we were unable
    to create some properties. Commit "drm: WARN() when
    drm_connector_attach_property fails" added a WARN when we fail to
    create a property, and the transition from "connector properties" to
    "object properties" changed the warning message a little bit.

    On i915 machines with many TV connectors we hit the maximum number of
    properties (since each TV connector uses a lot of properties), so we
    get a few backtraces in our logs. This commit increases the maximum
    number of properties to 24 hoping we'll have enough room for
    everybody.

    Chris suggested that we convert this code to "lists", but I believe
    this conversion can come after we make sure people's dmesgs are not
    spammed by our driver.

    Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
    Reported-by: Dave Jones <davej@redhat.com>
    Tested-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit cb9dd49e11f83d548c822d7022ac180b0518b25c
Author: Arnaldo Carvalho de Melo <acme@redhat.com>
Date:   Mon Jun 11 19:03:32 2012 -0300

    perf tools: Fix synthesizing tracepoint names from the perf.data headers

    We need to use the per event info snapshoted at record time to
    synthesize the events name, so do it just after reading the perf.data
    headers, when we already processed the /sys events data, otherwise we'll
    end up using the local /sys that only by sheer luck will have the same
    tracepoint ID -> real event association.

    Example:

      # uname -a
      Linux felicio.ghostprotocols.net 3.4.0-rc5+ #1 SMP Sat May 19 15:27:11 BRT 2012 x86_64 x86_64 x86_64 GNU/Linux
      # perf record -e sched:sched_switch usleep 1
      [ perf record: Woken up 1 times to write data ]
      [ perf record: Captured and wrote 0.015 MB perf.data (~648 samples) ]
      # cat /t/events/sched/sched_switch/id
      279
      # perf evlist -v
      sched:sched_switch: sample_freq=1, type: 2, config: 279, size: 80, sample_type: 1159, read_format: 7, disabled: 1, inherit: 1, mmap: 1, comm: 1, enable_on_exec: 1, sample_id_all: 1, exclude_guest: 1
      #

    So on the above machine the sched:sched_switch has tracepoint id 279, but on
    the machine were we'll analyse it it has a different id:

      $ cat /t/events/sched/sched_switch/id
      56
      $ perf evlist -i /tmp/perf.data
      kmem:mm_balancedirty_writeout
      $ cat /t/events/kmem/mm_balancedirty_writeout/id
      279

    With this fix:

      $ perf evlist -i /tmp/perf.data
      sched:sched_switch

    Reported-by: Dmitry Antipov <dmitry.antipov@linaro.org>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Cc: Mike Galbraith <efault@gmx.de>
    Cc: Namhyung Kim <namhyung@gmail.com>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Stephane Eranian <eranian@google.com>
    Link: http://lkml.kernel.org/n/tip-auwks8fpuhmrdpiefs55o5oz@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

commit 149ff9e1f240e7b57a02e0be5f74f21d0307d1d3
Author: Devendra Naga <devendra.aaru@gmail.com>
Date:   Sat Jun 9 17:32:31 2012 +0530

    pinctrl: pinctrl-mxs: set platform driver data to NULL at errpath and at unregister

    clear the platform data pointer when mxs_pinctrl_probe_dt fails,
    and also before the unregistering with pinctrl subsystem.

    Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

commit 0bf7481852c8ece4888c299ba0259b789c3dbde3
Author: Devendra Naga <devendra.aaru@gmail.com>
Date:   Sat Jun 9 17:31:23 2012 +0530

    pinctrl: pinctrl-mxs: Take care of frees if the kzalloc fails

    if there is no purecfg , the group pointer is allocated using kzalloc and if it
    fails to allocate, we wont free the new_map,

    if config is true, we call kmemdup and if it
    fails to do so we wont free the allocated group if there is no purecfg.

    fix this by doing the frees of new_map pointer and group pointers.

    Acked-by: Dong Aisheng <dong.aisheng@linaro.org>
    Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

commit e216c8c771c9a77f14d7e8b4131846b038f6c145
Author: Dan Carpenter <dan.carpenter@oracle.com>
Date:   Tue Jun 12 10:37:39 2012 +0300

    NFS: add an endian notation for sparse

    This is supposed to be a __be32 value.  Sparse complains a lot:

    fs/nfs/callback_xdr.c:699:30: warning: incorrect type in initializer (different base types)
    fs/nfs/callback_xdr.c:699:30:    expected unsigned int [unsigned] status
    fs/nfs/callback_xdr.c:699:30:    got restricted __be32 const [usertype] csr_status
    fs/nfs/callback_xdr.c:715:9: warning: cast to restricted __be32
    fs/nfs/callback_xdr.c:716:16: warning: incorrect type in return expression (different base types)
    fs/nfs/callback_xdr.c:716:16:    expected restricted __be32
    fs/nfs/callback_xdr.c:716:16:    got unsigned int [unsigned] status

    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit 0439f31c35d1da0b28988b308ea455e38e6a350d
Author: Dan Carpenter <dan.carpenter@oracle.com>
Date:   Tue Jun 12 10:37:08 2012 +0300

    NFSv4.1: integer overflow in decode_cb_sequence_args()

    This seems like it could overflow on 32 bits.  Use kmalloc_array() which
    has overflow protection built in.

    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit 67695f2eae210b0631fb92cf5649d0454953e230
Author: Dong Aisheng <dong.aisheng@linaro.org>
Date:   Fri Jun 8 21:33:12 2012 +0800

    pinctrl: pinctrl-imx: fix incorrect debug message of maps

    After create config map, the new_map pointer becomes point to
    PIN_MAP_TYPE_CONFIGS_PIN map rather than PIN_MAP_TYPE_MUX_GROUP map any more.
    Thus using new_map pointer to display the MUX_GROUP info is not correct.
    Using map pointer instead to show the correct MUX_GROUP map info.
    Original the debug message is:
    imx6q-pinctrl 20e0000.iomuxc: maps: function Yp group MX6Q_PAD_SD3_CMD num 12
    After fix it is:
    imx6q-pinctrl 20e0000.iomuxc: maps: function usdhc3 group usdhc3grp-1 num 11

    Reported-by: Richard Zhao <richard.zhao@freescale.com>
    Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

commit c71157c54a4f86e4f355dc6952268e8536013502
Author: Devendra Naga <devendra.aaru@gmail.com>
Date:   Thu Jun 7 22:19:26 2012 +0530

    pinctrl: pinctrl-imx: free if of_get_parent fails to get the parent node

    of_get_parent can return null if no parent node found, so the allocated new_map
    should be freed.

    Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
    Acked-by: Dong Aisheng <dong.aisheng@linaro.org>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

commit 3a86a5f8abb33956446ae31b1e9c149d7b2d1d21
Author: Devendra Naga <devendra.aaru@gmail.com>
Date:   Sat Jun 9 00:52:11 2012 +0530

    pinctrl: pinctrl-imx: free allocated pinctrl_map structure only once and use kernel facilities for IMX_PMX_DUMP

    a) as we allocate the pinctrl_map structure at imx_dt_node_to_map at  line 167, anyway
       if its an element, or a num_elements * (sizeof(type)) elements allocated to one single
       pointer must be freed only once.

    CASE. A)

    as new_map is not moved and allocated like,

    for (i = 0; i < MAX_ELEMS; i++) {
        new_map[i] = kmalloc(numelems * size, GFP_KERNEL);
    }

    its freed as

    for (i = 0; i < MAX_ELEMS; i++) {
        kfree(new_map[i]);
    }

    CASE. B)
    and its allocated like
            new_map = kmalloc(numelems * size, GFP_KERNEL);

    it just needs kfree not as case A's.

    b) use KERN_DEBUG facility for the IMX_PMX_DUMP macro.

    Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
    Acked-by: Dong Aisheng <dong.aisheng@linaro.org>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

commit e85bbc19d5a9ad2b48bf8f2fd3277d6fe58f23ce
Author: Linus Walleij <linus.walleij@stericsson.com>
Date:   Tue Jun 12 12:43:06 2012 +0200

    pinctrl: nomadik: fix up typo

    Commit a60b57eddaa8af6c02cf7bbeb58ebf82881f08ac
    "drivers/gpio: gpio-nomadik: Add support for irqdomains"
    changed GPIO offset calculations to have this form:
    (gpio % NMK_GPIO_PER_CHIP) except in this one place for
    setting sleep mode, where the conversion was all wrong, and
    instead mod:ing the GPIO with the IRQ base which does not
    make any sense.

    So fix this up so we can use sleepmode.

    Reviewed-by: Lee Jones <lee.jones@linaro.org>
    Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>

commit efec381ced2c0416c3765abce076896cf464dc0c
Author: Linus Walleij <linus.walleij@linaro.org>
Date:   Wed Jun 6 22:50:41 2012 +0200

    pinctrl: nomadik: add clk_prepare() call

    We now strictly require clk_prepare() calls to be issued before
    any clk_enable() calls.

    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

commit 7452ca511c217b9d7bbadf4680018555c7d9a7ce
Merge: b842971 70c778f
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Jun 12 07:39:58 2012 +0300

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

    Pull m68knommu from Greg Ungerer:
     "This contains five fixes.  Four fix build problems introduced by
      recent clean up and merging of the m68k timer and ptrace code.  The
      other fixes the 528x ColdFire CPU QSPI base address definition, missed
      in the ColdFire QSPI cleanup."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
      m68k: make syscall_trace_enter/leave exist for non-MMU classic m68k types
      m68knommu: fix 68360 local setting of timer interrupt handler
      m68knommu: fix 68328 local setting of timer interrupt handler
      m68k: fix inclusion of arch_gettimeoffset for non-MMU 68k classic CPU types
      m68knommu: m528x qspi definition fix

commit 3419ae781f1592b3d367107db6500090495490cd
Author: Stephen Warren <swarren@nvidia.com>
Date:   Mon Jun 11 11:27:19 2012 -0600

    ASoC: tegra+wm8903: turn of mic detect when card is removed

    If mic detect is left enabled and the WM8903 detects a status change,
    the WM8903 driver will make a callback against the free()d jack, which
    will cause a crash.

    This problem can be triggered by fully initializing an audio card, then
    removing and re-inserting the machine driver module.

    Signed-off-by: Stephen Warren <swarren@nvidia.com>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

commit 9473c4c16700ec965904f23234fd0f8677ce6231
Author: Axel Lin <axel.lin@gmail.com>
Date:   Sat Jun 9 07:41:42 2012 +0800

    leds: Make LEDS_ASIC3 and LEDS_RENESAS_TPU depend on LEDS_CLASS=y

    Otherwise, I got below build error when CONFIG_LEDS_CLASS=m.

      LD      init/built-in.o
    drivers/built-in.o: In function `asic3_led_probe':
    clkdev.c:(.devinit.text+0x4680): undefined reference to `led_classdev_register'
    drivers/built-in.o: In function `r_tpu_probe':
    clkdev.c:(.devinit.text+0x4838): undefined reference to `led_classdev_register'
    drivers/built-in.o: In function `asic3_led_remove':
    clkdev.c:(.devexit.text+0x564): undefined reference to `led_classdev_unregister'
    drivers/built-in.o: In function `r_tpu_remove':
    clkdev.c:(.devexit.text+0x5a0): undefined reference to `led_classdev_unregister'
    make: *** [vmlinux] Error 1

    Signed-off-by: Axel Lin <axel.lin@gmail.com>
    Signed-off-by: Bryan Wu <bryan.wu@canonical.com>

commit 9cd5ec5e5447f99ffb33ce39c1fcd0e3306e11d1
Author: Jeffrin Jose <ahiliation@yahoo.co.in>
Date:   Sun Jun 3 20:11:52 2012 +0800

    leds: fixed a coding style issue.

    Fixed a coding style issue relating to trailing
    white space error found by checkpatch.pl tool in drivers/leds/led-class.c

    Signed-off-by: Jeffrin Jose <ahiliation@yahoo.co.in>
    Signed-off-by: Bryan Wu <bryan.wu@canonical.com>

commit 3fbd8716da4c69ddbb76c022f3f4a0d50723c68f
Author: Rafal Prylowski <prylowski@metasoft.pl>
Date:   Mon May 28 23:35:54 2012 +0800

    leds: don't disable blinking when writing the same value to delay_on or delay_off

    Function led_set_software_blink() assumes that blink timer is still running,
    but commit 488bc35bf40df89d37486c1826b178a2fba36ce7 introduced disabling
    of blink timer before each call to led_set_software_blink().

    Correct led_software_blink():
    1) remove protection against reprogramming blink timer to the same values,
       because it only disables blinking now,
    2) remove unnecessary call to led_stop_software_blink().

    Signed-off-by: Rafal Prylowski <prylowski@metasoft.pl>
    Cc: Richard Purdie <rpurdie@rpsys.net>
    Signed-off-by: Bryan Wu <bryan.wu@canonical.com>

commit e32025a56403df4386cd61a741c0a36afe79ae8a
Author: Marcelo Tosatti <mtosatti@redhat.com>
Date:   Mon Jun 11 23:18:33 2012 -0300

    x86: kvmclock: remove check_and_clear_guest_paused warning

    CPU offline path calls the hrtimer interrupt handler with interrupts
    disabled, without touching preempt_count, triggering this warning.

    Remove the warning since it is supposed to be used from hrtimer
    interrupt context only.

    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

commit 70c778f7a1075cf688ef50ca52c464e7ea60b506
Author: Greg Ungerer <gerg@uclinux.org>
Date:   Wed May 23 13:43:52 2012 +1000

    m68k: make syscall_trace_enter/leave exist for non-MMU classic m68k types

    The assembler entry code calls directly to the syscall_trace_enter() and
    syscall_trace_leave() functions. But currently they are conditionaly
    compiled out for the non-MMU classic m68k CPU types (so 68328 for example),
    resulting in a link error:

          LD      vmlinux
        arch/m68k/platform/68328/built-in.o: In function `do_trace':
        (.text+0x1c): undefined reference to `syscall_trace_enter'
        arch/m68k/platform/68328/built-in.o: In function `do_trace':
        (.text+0x4c): undefined reference to `syscall_trace_leave'

    Change the conditional check that includes these functions to be true for
    the !defined(CONFIG_MMU) case as well.

    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
    Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

commit 1b461d7631f17804257ab1734bd95c05ab655f8b
Author: Greg Ungerer <gerg@uclinux.org>
Date:   Wed May 23 13:32:55 2012 +1000

    m68knommu: fix 68360 local setting of timer interrupt handler

    Compiling for 68360 based targets fails with:

        arch/m68k/platform/68360/config.c: In function ‘hw_tick’:
        arch/m68k/platform/68360/config.c:55:2: error: implicit declaration of function ‘arch_timer_interrupt’
        arch/m68k/platform/68360/config.c: At top level:
        arch/m68k/platform/68360/config.c:64:6: error: conflicting types for ‘hw_timer_init’
        arch/m68k/include/asm/machdep.h:36:13: note: previous declaration of ‘hw_timer_init’ was here

    Changes made to hw_timer_init() didn't get updated in the 68328 timer code.
    So process and call the "handler" arg that is now passed into that
    hw_timer_init() function.

    Signed-off-by: Greg Ungerer <gerg@uclinux.org>

commit dc5588ae3c597006095926c25634408257457a8f
Author: Greg Ungerer <gerg@uclinux.org>
Date:   Wed May 23 13:27:18 2012 +1000

    m68knommu: fix 68328 local setting of timer interrupt handler

    Compiling for 68328 based targets fails with:

        arch/m68k/platform/68328/timers.c: In function ‘hw_tick’:
        arch/m68k/platform/68328/timers.c:65:2: error: implicit declaration of function ‘arch_timer_interrupt’
        arch/m68k/platform/68328/timers.c: At top level:
        arch/m68k/platform/68328/timers.c:102:6: error: conflicting types for ‘hw_timer_init’
        arch/m68k/include/asm/machdep.h:36:13: note: previous declaration of ‘hw_timer_init’ was here

    Changes made to hw_timer_init() didn't get updated in the 68328 timer code.
    So process and call the "handler" arg that is now passed into that
    hw_timer_init() function.

    Signed-off-by: Greg Ungerer <gerg@uclinux.org>

commit b13b3f51ff7bec19ac1ba66e3623bfaa484af124
Author: Greg Ungerer <gerg@uclinux.org>
Date:   Wed May 23 11:32:45 2012 +1000

    m68k: fix inclusion of arch_gettimeoffset for non-MMU 68k classic CPU types

    When building for non-MMU based classic 68k CPU types (like the 68328 for
    example) you get a compilation error:

      CC      arch/m68k/kernel/time.o
    arch/m68k/kernel/time.c:91:5: error: redefinition of ‘arch_gettimeoffset’
    include/linux/time.h:145:19: note: previous definition of ‘arch_gettimeoffset’ was here

    The arch_gettimeoffset() code is included when building for these CPU types,
    but it shouldn't be. Those machine types do not have
    CONFIG_ARCH_USES_GETTIMEOFFSET set.

    The fix is simply to conditionally include the arch_gettimeoffset() code on
    that same config setting that specifies its use or not.

    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
    Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

commit f75b0d07da12e67559d51071391feaf0c265d292
Author: Steven King <sfking@fdwdc.com>
Date:   Sat May 5 13:40:44 2012 -0700

    m68knommu: m528x qspi definition fix

    The consolidation of the qspi code missed a definition for 528x.

    Signed-off-by: Steven King <sfking@fdwdc.com>
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>

commit c475c06f4bb689d6ad87d7512e036d6dface3160
Author: Peter Korsgaard <jacmet@sunsite.dk>
Date:   Tue Jun 12 08:27:04 2012 +0800

    hwrng: atmel-rng - fix data valid check

    Brown paper bag: Data valid is LSB of the ISR (status register), and NOT
    of ODATA (current random data word)!

    With this, rngtest is a lot happier. Before:

    rngtest 3
    Copyright (c) 2004 by Henrique de Moraes Holschuh
    This is free software; see the source for copying conditions.  There is NO warr.

    rngtest: starting FIPS tests...
    rngtest: bits received from input: 20000032
    rngtest: FIPS 140-2 successes: 3
    rngtest: FIPS 140-2 failures: 997
    rngtest: FIPS 140-2(2001-10-10) Monobit: 604
    rngtest: FIPS 140-2(2001-10-10) Poker: 996
    rngtest: FIPS 140-2(2001-10-10) Runs: 36
    rngtest: FIPS 140-2(2001-10-10) Long run: 0
    rngtest: FIPS 140-2(2001-10-10) Continuous run: 117
    rngtest: input channel speed: (min=622.371; avg=23682.481; max=28224.350)Kibitss
    rngtest: FIPS tests speed: (min=12.361; avg=12.718; max=12.861)Mibits/s
    rngtest: Program run time: 2331696 microsecondsx

    After:
    rngtest 3
    Copyright (c) 2004 by Henrique de Moraes Holschuh
    This is free software; see the source for copying conditions.  There is NO warr.

    rngtest: starting FIPS tests...
    rngtest: bits received from input: 20000032
    rngtest: FIPS 140-2 successes: 999
    rngtest: FIPS 140-2 failures: 1
    rngtest: FIPS 140-2(2001-10-10) Monobit: 0
    rngtest: FIPS 140-2(2001-10-10) Poker: 0
    rngtest: FIPS 140-2(2001-10-10) Runs: 1
    rngtest: FIPS 140-2(2001-10-10) Long run: 0
    rngtest: FIPS 140-2(2001-10-10) Continuous run: 0
    rngtest: input channel speed: (min=777.363; avg=43588.270; max=47870.711)Kibitss
    rngtest: FIPS tests speed: (min=11.943; avg=12.716; max=12.844)Mibits/s
    rngtest: Program run time: 1955282 microseconds

    Cc: stable@vger.kernel.org
    Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
    Reported-by: George Pontis <GPontis@z9.com>
    Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

commit 8a51178ed64dca418478996697611ef087fa22df
Author: Paul Bolle <pebolle@tiscali.nl>
Date:   Sat Jun 9 22:51:47 2012 +0000

    sparc: remove two unused headers

    Nothing includes these two headers. None of the macros they define are
    used anywhere in the tree. This was also the case in v2.6.12-rc2 and,
    presumably, every release in between. These two headers can safely be
    removed.

    Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 08224262adefb5e6460888b2490a96e1bc28aef5
Author: Bart Westgeest <bart@elbrys.com>
Date:   Mon Jun 11 12:13:08 2012 -0400

    staging: usbip: bugfix for stack corruption on 64-bit architectures

    Previously a 6 byte array (buf) was erroneously cast to a 8 byte long
    (event_bits) on 64-bit architectures which caused a stack corruption.

    Signed-off-by: Bart Westgeest <bart@elbrys.com>
    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit e3d62d7e8e05a6a4b08f4672385ae58fc0f132c4
Author: Chris Metcalf <cmetcalf@tilera.com>
Date:   Thu Jun 7 10:45:02 2012 +0000

    tilegx network driver: initial support

    This change adds support for the tilegx network driver based on the
    GXIO IORPC support in the tilegx software stack, using the on-chip
    mPIPE packet processing engine.

    Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit b7abee6ef888117f92db370620ebf116a38e3f4d
Author: Matt Carlson <mcarlson@broadcom.com>
Date:   Thu Jun 7 12:56:54 2012 +0000

    tg3: Apply short DMA frag workaround to 5906

    5906 devices also need the short DMA fragment workaround.  This patch
    makes the necessary change.

    Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
    Tested-by: Christian Kujau <lists@nerdbynature.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 78b10615ad295393a7d66ea57218171c0a07c059
Author: Randy Dunlap <rdunlap@xenotime.net>
Date:   Mon Jun 11 16:35:50 2012 -0700

    staging/comedi: fix build for USB not enabled

    Calls to optional subsystems cannot be made indiscriminately.
    Enclose all of the usb helper functions inside
    #if IS_ENABLED(CONFIG_USB)
    to fix these build errors.

    (The pci helper functions are OK since there are stubs in
    linux/pci.h for the called functions when PCI is not enabled.
    Possibly the same could be done for the called USB functions.)

    ERROR: "usb_deregister" [drivers/staging/comedi/comedi.ko] undefined!
    ERROR: "usb_register_driver" [drivers/staging/comedi/comedi.ko] undefined!

    Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
    Cc: Ian Abbott <abbotti@mev.co.uk>
    Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 883ffd6e64114495f68652721065149a2bbd9de6
Author: Stefan Roese <sr@denx.de>
Date:   Thu Jun 7 23:21:05 2012 +0000

    net: stmmac: Fix clock en-/disable calls

    clk_{un}prepare is mandatory for platforms using common clock framework.
    Since these drivers are used by SPEAr platform, which supports common
    clock framework, add clk_{un}prepare() support for them. Otherwise
    the clocks are not correctly en-/disabled and ethernet support doesn't
    work.

    Signed-off-by: Stefan Roese <sr@denx.de>
    Cc: Viresh Kumar <viresh.linux@gmail.com>
    Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 92123e068efa310b09e9943ac1cfd10ff6b6d2e4
Author: Jeff Layton <jlayton@redhat.com>
Date:   Mon Jun 11 10:03:42 2012 -0400

    rpc_pipefs: allow rpc_purge_list to take a NULL waitq pointer

    In the event that we don't have a dentry for a rpc_pipefs pipe, we still
    need to allow the queue_timeout job to clean out the queue. There's just
    no waitq to wake up in that event.

    Cc: stable@kernel.org
    Reported-by: Hans de Bruin <jmdebruin@xmsnet.nl>
    Reported-by: Joerg Platte <jplatte@naasa.net>
    Signed-off-by: Jeff Layton <jlayton@redhat.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit 2669940db8d02147181e338bb6db98394569f31a
Author: Andy Adamson <andros@netapp.com>
Date:   Wed May 30 16:12:24 2012 -0400

    NFSv4 do not send an empty SETATTR compound

    Commit 536e43d12b9517bbbf6114cd1a12be27857a4d7a ATTR_OPEN check can result in
    an ia_valid with only ATTR_FILE set, and no NFS_VALID_ATTRS attributes to
    request from the server.

    Signed-off-by: Andy Adamson <andros@netapp.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit 64f9a83665e4f168ff50ce1db9eb175f954048fa
Author: Sachin Prabhu <sprabhu@redhat.com>
Date:   Thu May 31 17:45:00 2012 +0100

    NFSv2: EOF incorrectly set on short read

    In cases where the server returns fewer bytes then those requested, we
    can incorrectly set the eof flag for the file. Fixing this allows the
    request to be retried with updated offset and count arguments.

    Signed-off-by: Sachin Prabhu <sprabhu@redhat.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit 3f16da51b0e533871d22a29682f3c3969d4f7e22
Author: Eric Dumazet <edumazet@google.com>
Date:   Mon Jun 11 07:21:36 2012 +0000

    lpc_eth: fix tx completion

    __lpc_handle_xmit() has two bugs :

    1) It can leak skbs in case TXSTATUS_ERROR is set

    2) It can wake up txqueue while no slot was freed.

    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Reported-by: Roland Stigge <stigge@antcom.de>
    Tested-by: Roland Stigge <stigge@antcom.de>
    Cc: Kevin Wells <kevin.wells@nxp.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit e30478598a8476d02e3b00caa89ce1a3b1dad54b
Author: Eric Dumazet <edumazet@google.com>
Date:   Sun Jun 10 23:24:00 2012 +0000

    lpc_eth: add missing ndo_change_mtu()

    lpc_eth does a copy of transmitted skbs to DMA area, without checking
    skb lengths, so can trigger buffer overflows :

    memcpy(pldat->tx_buff_v + txidx * ENET_MAXF_SIZE, skb->data, len);

    One way to get bigger skbs is to allow MTU changes above the 1500 limit.

    Calling eth_change_mtu() in ndo_change_mtu() makes sure this cannot
    happen.

    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Cc: Roland Stigge <stigge@antcom.de>
    Cc: Kevin Wells <kevin.wells@nxp.com>
    Acked-by: Roland Stigge <stigge@antcom.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit ed6be3dcfee0bb891efd6ea908ca32bea711085b
Merge: 16b0dc2 6aee4ca
Author: John W. Linville <linville@tuxdriver.com>
Date:   Mon Jun 11 14:36:48 2012 -0400

    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem

commit a3698a9b919d2a54e3348be48ab65d102b2f105d
Author: Parav Pandit <parav.pandit@emulex.com>
Date:   Mon Jun 11 16:39:20 2012 +0530

    RDMA/ocrdma: Fixed RQ error CQE polling

    Fix RQ/SRQ error CQE polling.  Return error CQE to consumer for error
    case which was not returned previously.

    Signed-off-by: Parav Pandit <parav.pandit@emulex.com>
    Signed-off-by: Roland Dreier <roland@purestorage.com>

commit 634c5796a5c60964faf9d51892571ffe36ad24d5
Author: Mahesh Vardhamanaiah <mahesh.vardhamanaiah@emulex.com>
Date:   Fri Jun 8 21:26:11 2012 +0530

    RDMA/ocrdma: Correct queue SGE calculation

    Fix max sge calculation for sq, rq, srq for all hardware types.

    Signed-off-by: Mahesh Vardhamanaiah <mahesh.vardhamanaiah@emulex.com>
    Signed-off-by: Roland Dreier <roland@purestorage.com>

commit 07bb54244e466f1517357f47a498574f97c31e08
Author: Mahesh Vardhamanaiah <mahesh.vardhamanaiah@emulex.com>
Date:   Fri Jun 8 21:25:52 2012 +0530

    RDMA/ocrdma: Correct reported max queue sizes

    Fix code to read the max wqe and max rqe values from mailbox response.

    Signed-off-by: Mahesh Vardhamanaiah <mahesh.vardhamanaiah@emulex.com>
    Signed-off-by: Roland Dreier <roland@purestorage.com>

commit 6ab6827ee99937834cc268298ee4eab1a651569e
Author: Parav Pandit <parav.pandit@emulex.com>
Date:   Fri Jun 8 21:25:25 2012 +0530

    RDMA/ocrdma: Fixed GID table for vlan and events

    1. Fix reporting GID table addition events.
    2. Enable vlan based GID entries only when VLAN is enabled at compile
       time (test CONFIG_VLAN_8021Q / CONFIG_VLAN_8021Q_MODULE).

    Signed-off-by: Parav Pandit <parav.pandit@emulex.com>
    Signed-off-by: Roland Dreier <roland@purestorage.com>

commit 8447c4d15e357a458c9051ddc84aa6c8b9c27000
Author: Chris Metcalf <cmetcalf@tilera.com>
Date:   Wed Jun 6 13:11:05 2012 -0400

    edac: Do alignment logic properly in edac_align_ptr()

    The logic was checking the sizeof the structure being allocated to
    determine whether an alignment fixup was required.  This isn't right;
    what we actually care about is the alignment of the actual pointer that's
    about to be returned.  This became an issue recently because struct
    edac_mc_layer has a size that is not zero modulo eight, so we were
    taking the correctly-aligned pointer and forcing it to be misaligned.
    On Tile this caused an alignment exception.

    Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

commit afb6a6a01b51b6712485ea045e2b882061d250d9
Author: Andy Gross <andy.gross@ti.com>
Date:   Thu May 24 11:44:22 2012 -0500

    staging: omapdrm: fix crash when freeing bad fb

    During unload, don't cleanup the framebuffer if it is not valid.

    Signed-off-by: Andy Gross <andy.gross@ti.com>
    Reviewed-by: Rob Clark <rob.clark@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 5fcb08befaf57faa1b00e514915c1660252b8c26
Author: Sasha Levin <levinsasha928@gmail.com>
Date:   Mon Jun 11 10:18:13 2012 -0500

    9p: BUG before corrupting memory

    The BUG_ON() in pack_sg_list() would get triggered only one time after we've
    corrupted some memory by sg_set_buf() into an invalid sg buffer.

    I'm still working on figuring out why I manage to trigger that bug...

    Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
    Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>

commit b9bc5ddb1b76d3f7ee14c533300aa95907c6969e
Author: Kim Phillips <kim.phillips@freescale.com>
Date:   Wed Jun 6 19:49:42 2012 -0500

    mpc85xx_edac: fix error: too few arguments to function 'edac_mc_alloc'

    commit ca0907b "edac: Remove the legacy EDAC ABI" broke mpc85xx_edac
    in the following manner:

    mpc85xx_edac.c:983:35: error: too few arguments to function 'edac_mc_alloc'

    this patch puts back the missing 'layers' argument.

    [mchehab@redhat.com: As Ben sent a similar fix, I added his SOB on this patch]
    Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
    Signed-off-by: Ben Collins <bcollins@ubuntu.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

commit 2cbb587d3bc41a305168e91b4f3c5b6944a12566
Author: Chen Gong <gong.chen@linux.intel.com>
Date:   Mon May 14 05:51:26 2012 -0300

    edac: fix the error about memory type detection on SandyBridge

    On SandyBridge, DDRIOA(Dev: 17 Func: 0 Offset: 328) is used
    to detect whether DIMM is RDIMM/LRDIMM, not TA(Dev: 15 Func: 0).

    Signed-off-by: Chen Gong <gong.chen@linux.intel.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

commit e35fca4791fcdd43dc1fd769797df40c562ab491
Author: Chen Gong <gong.chen@linux.intel.com>
Date:   Tue May 8 20:40:12 2012 -0300

    edac: avoid mce decoding crash after edac driver unloaded

    Some edac drivers register themselves as mce decoders via
    notifier_chain. But in current notifier_chain implementation logic,
    it doesn't accept same notifier registered twice. If so, it will be
    wrong when adding/removing the element from the list. For example,
    on one SandyBridge platform, remove module sb_edac and then trigger
    one error, it will hit oops because it has no mce decoder registered
    but related notifier_chain still points to an invalid callback
    function. Here is an example:

    Call Trace:
     [<ffffffff8150ef6a>] atomic_notifier_call_chain+0x1a/0x20
     [<ffffffff8102b936>] mce_log+0x46/0x180
     [<ffffffff8102eaea>] apei_mce_report_mem_error+0x4a/0x60
     [<ffffffff812e19d2>] ghes_do_proc+0x192/0x210
     [<ffffffff812e2066>] ghes_proc+0x46/0x70
     [<ffffffff812e20d8>] ghes_notify_sci+0x48/0x80
     [<ffffffff8150ef05>] notifier_call_chain+0x55/0x80
     [<ffffffff81076f1a>] __blocking_notifier_call_chain+0x5a/0x80
     [<ffffffff812aea11>] ? acpi_os_wait_events_complete+0x23/0x23
     [<ffffffff81076f56>] blocking_notifier_call_chain+0x16/0x20
     [<ffffffff812ddc4d>] acpi_hed_notify+0x19/0x1b
     [<ffffffff812b16bd>] acpi_device_notify+0x19/0x1b
     [<ffffffff812beb38>] acpi_ev_notify_dispatch+0x67/0x7f
     [<ffffffff812aea3a>] acpi_os_execute_deferred+0x29/0x36
     [<ffffffff81069dc2>] process_one_work+0x132/0x450
     [<ffffffff8106bbcb>] worker_thread+0x17b/0x3c0
     [<ffffffff8106ba50>] ? manage_workers+0x120/0x120
     [<ffffffff81070aee>] kthread+0x9e/0xb0
     [<ffffffff81514724>] kernel_thread_helper+0x4/0x10
     [<ffffffff81070a50>] ? kthread_freezable_should_stop+0x70/0x70
     [<ffffffff81514720>] ? gs_change+0x13/0x13
    Code: f3 49 89 d4 45 85 ed 4d 89 c6 48 8b 0f 74 48 48 85 c9 75 17 eb 41
    0f 1f 80 00 00 00 00 41 83 ed 01 4c 89 f9 74 22 4d 85 ff 74 1d <4c> 8b
    79 08 4c 89 e2 48 89 de 48 89 cf ff 11 4d 85 f6 74 04 41
    RIP  [<ffffffff8150eef6>] notifier_call_chain+0x46/0x80
     RSP <ffff88042868fb20>
    CR2: ffffffffa01af838
    ---[ end trace 0100930068e73e6f ]---
    BUG: unable to handle kernel paging request at fffffffffffffff8
    IP: [<ffffffff810705b0>] kthread_data+0x10/0x20
    PGD 1a0d067 PUD 1a0e067 PMD 0
    Oops: 0000 [#2] SMP

    Only i7core_edac and sb_edac have such issues because they have more
    than one memory controller which means they have to register mce
    decoder many times.

    Cc: <stable@vger.kernel.org> # 3.2 and upper
    Signed-off-by: Chen Gong <gong.chen@linux.intel.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

commit fc3e4d077d5c7a7bc1ad5bc143895b4e070e5a8b
Author: Stephane Eranian <eranian@google.com>
Date:   Tue May 15 13:11:11 2012 +0200

    perf stat: Fix default output file

    The following commit:

    commit 56f3bae70638b33477a6015fd362ccfe354fd3ee
    Author: Jim Cromie <jim.cromie@gmail.com>
    Date:   Wed Sep 7 17:14:00 2011 -0600

        perf stat: Add --log-fd <N> option to redirect stderr elsewhere

    introduced a bug in the way perf stat outputs the results by default,
    i.e., without the --log-fd or --output option. It would default to
    writing to file descriptor 0, i.e., stdin. Writing to stdin is allowed
    and is equivalent to writing to stdout. However, there is a major
    difference for any script that was already capturing the output of perf
    stat via redirection:

        perf stat >/tmp/log .... or perf stat 2>/tmp/log ....

    They would not capture anything anymore. They would have to do:
        perf stat 0>/tmp/log ...

    This breaks compatibility with existing scripts and does not look very
    natural.

    This patch fixes the problem by looking at output_fd only when it was
    modified by user (> 0). It also checks that the value if positive.
    Passing --log-fd 0 is ignored.

    I would also argue that defaulting to stderr for the results is not the
    right thing to do, though this patch does not address this specific
    issue.

    Signed-off-by: Stephane Eranian <eranian@google.com>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Jim Cromie <jim.cromie@gmail.com>
    Link: http://lkml.kernel.org/r/20120515111111.GA9870@quad
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

commit 80c0120a3cca30166c0ab8b24e44be67e97b79af
Author: David Ahern <dsahern@gmail.com>
Date:   Fri Jun 8 11:47:51 2012 -0300

    perf tools: Fix endianity swapping for adds_features bitmask

    Based on Jiri's latest attempt:
    https://lkml.org/lkml/2012/5/16/61

    Basically, adds_features should be byte swapped assuming unsigned
    longs are either 8-bytes (u64) or 4-bytes (u32).

        Fixes 32-bit ppc dumping 64-bit x86 feature data:
         ========
         captured on: Sun May 20 19:23:23 2012
         hostname : nxos-vdc-dev3
         os release : 3.4.0-rc7+
         perf version : 3.4.rc4.137.g978da3
         arch : x86_64
         nrcpus online : 16
         nrcpus avail : 16
         cpudesc : Intel(R) Xeon(R) CPU E5540 @ 2.53GHz
         cpuid : GenuineIntel,6,26,5
         total memory : 24680324 kB
        ...

    Verified 64-bit x86 can still dump feature data for 32-bit ppc.

    Signed-off-by: David Ahern <dsahern@gmail.com>
    Reviewed-by: Jiri Olsa <jolsa@redhat.com>
    Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Link: http://lkml.kernel.org/r/4FBBB539.5010805@gmail.com
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

commit f2a8ecaf6d7259cc70fb5898823eab9a2dd86570
Author: Takashi Iwai <tiwai@suse.de>
Date:   Mon Jun 11 15:51:54 2012 +0200

    ALSA: hda - Fix detection of Creative SoundCore3D controllers

    The PCI ID entries of Creative SoundCore3D HD-audio controllers should
    be before the wildcard for vendor = Creative.

    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 4986e5c7cd91817d0f58dd15073c9080d47980cf
Author: Marek Szyprowski <m.szyprowski@samsung.com>
Date:   Wed Jun 6 12:05:01 2012 +0200

    ARM: mm: fix type of the arm_dma_limit global variable

    arm_dma_limit stores physical address of maximal address accessible by DMA,
    so the phys_addr_t type makes much more sense for it instead of u32. This
    patch fixes the following build warning:

    arch/arm/mm/init.c:380: warning: comparison of distinct pointer types lacks a cast

    Reported-by: Russell King <linux@arm.linux.org.uk>
    Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>

commit e53f517ff236a0ec5413ff3935c53406b69bc1e2
Author: Sachin Kamat <sachin.kamat@linaro.org>
Date:   Wed Jun 6 08:03:35 2012 +0200

    ARM: dma-mapping: Add missing static storage class specifier

    Fixes the following sparse warnings:
    arch/arm/mm/dma-mapping.c:231:15: warning: symbol 'consistent_base' was not
    declared. Should it be static?
    arch/arm/mm/dma-mapping.c:326:8: warning: symbol 'coherent_pool_size' was not
    declared. Should it be static?

    Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
    Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>

commit 9c699e0a9566cfb6245284ce4857d7a06b02f3b1
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date:   Mon Jun 11 18:20:02 2012 +0800

    ASoC: wm8996: Mark the CODEC as cache only when powering off on boot

    Otherwise we might try to write to a powered off device.

    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

commit db1334098392e1278a113e629a7ae58a7453f83f
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date:   Mon Jun 11 18:23:13 2012 +0800

    ASoC: wm8996: Move reset before the initial regulator disable

    If we don't have control over the LDO but do have control over the other
    regulators then we may end up trying to write to a powered off device.

    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

commit 90ba6859ce914feff3632eeb7227b9f99c030ca9
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date:   Mon Jun 11 18:15:50 2012 +0800

    ASoC: wm8996: Remove spurious regulator_bulk_free()

    We're using demv_regulator_bulk_get() so don't need to manually free and
    this is in the CODEC driver not the I2C driver anyway.

    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

commit 9efc31b81d740487fd204fade0913ffa8cc97fc3
Author: Wanpeng Li <liwp@linux.vnet.ibm.com>
Date:   Sun Jun 10 10:50:52 2012 +0800

    x86/mm: Fix some kernel-doc warnings

    Fix kernel-doc warnings in arch/x86/mm/ioremap.c and
    arch/x86/mm/pageattr.c, just like this one:

      Warning(arch/x86/mm/ioremap.c:204):
         No description found for parameter 'phys_addr'
      Warning(arch/x86/mm/ioremap.c:204):
         Excess function parameter 'offset' description in 'ioremap_nocache'

    Signed-off-by: Wanpeng Li <liwp@linux.vnet.ibm.com>
    Cc: Gavin Shan <shangw@linux.vnet.ibm.com>
    Cc: Wanpeng Li <liwp.linux@gmail.com>
    Link: http://lkml.kernel.org/r/1339296652-2935-1-git-send-email-liwp.linux@gmail.com
    Signed-off-by: Ingo Molnar <mingo@kernel.org>

commit 4a1e001d2bb75c47a9cdbbfb66ae51daff1ddcba
Merge: eab3094 aa9b163
Author: Ingo Molnar <mingo@kernel.org>
Date:   Mon Jun 11 10:30:23 2012 +0200

    Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/urgent

    Merge RCU fixes from Paul E. McKenney:

     " This series has four patches, the major point of which is to eliminate
       some slowdowns (including boot-time slowdowns) resulting from some
       RCU_FAST_NO_HZ changes.  The issue with the changes is that posting timers
       from the idle loop has no effect if the CPU has entered dyntick-idle
       mode because the CPU has already computed its wakeup time, and posting
       a timer does not cause it to be recomputed.  The short-term fix is for
       RCU to precompute the timeout value so that the CPU's calculation is
       correct. "

    Signed-off-by: Ingo Molnar <mingo@kernel.org>

commit 16b0dc29c1af9df341428f4c49ada4f626258082
Author: Eric Dumazet <edumazet@google.com>
Date:   Sun Jun 10 21:11:57 2012 +0000

    dummy: fix rcu_sched self-detected stalls

    Trying to "modprobe dummy numdummies=30000" triggers :

    INFO: rcu_sched self-detected stall on CPU { 8} (t=60000 jiffies)

    After this splat, RTNL is locked and reboot is needed.

    We must call cond_resched() to avoid this, even holding RTNL.

    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 3977407e83129f53e43d3ac44be8702f59fa3f77
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Mon Jun 11 17:10:16 2012 +0900

    clocksource: sh_tmu: Use clockevents_config_and_register().

    This switches over to the now exported clockevents_config() and
    clockevents_config_and_register() helpers. This knocks off a
    long-standing TMU TODO item.

    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit c5d21c4b2a7765ab0600c8426374b50eb9f4a36f
Author: Roland Dreier <roland@purestorage.com>
Date:   Sun Jun 10 20:05:24 2012 +0000

    net: Reorder initialization in ip_route_output to fix gcc warning

    If I build with W=1, for every file that includes <net/route.h>, I get the warning

        include/net/route.h: In function 'ip_route_output':
        include/net/route.h:135:3: warning: initialized field overwritten [-Woverride-init]
        include/net/route.h:135:3: warning: (near initialization for 'fl4') [-Woverride-init]

    (This is with "gcc (Debian 4.6.3-1) 4.6.3")

    A fix seems pretty trivial: move the initialization of .flowi4_tos
    earlier.  As far as I can tell, this has no effect on code generation.

    Signed-off-by: Roland Dreier <roland@purestorage.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit c2225a57e596a308424e59abc7e864f866fe4493
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Fri May 25 13:39:09 2012 +0900

    clocksource: sh_tmu: Convert timer lock to raw spinlock.

    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 50393a92c89c603e2d043c9f0212d3bd66701c86
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Fri May 25 13:38:54 2012 +0900

    clocksource: sh_mtu2: Convert timer lock to raw spinlock.

    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 7d0c399fe94d4fe572eadc7405654a282e5df63d
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Fri May 25 13:36:43 2012 +0900

    clocksource: sh_cmt: Convert timer lock to raw spinlock.

    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 3777808873b0c49c5cf27e44c948dfb02675d578
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Mon Jun 11 14:29:58 2012 +0900

    bug.h: need linux/kernel.h for TAINT_WARN.

    asm-generic/bug.h uses taint flags that are only defined in
    linux/kernel.h, resulting in build failures on platforms that
    don't include linux/kernel.h some other way:

            arch/sh/include/asm/thread_info.h:172:2: error: 'TAINT_WARN' undeclared (first use in this function)

    Caused by commit edd63a2763bd ("set_restore_sigmask() is never called
    without SIGPENDING (and never should be)").

    Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit c1b88ee2bbb82c56ac24c70850004de9a43915d5
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date:   Sat Jun 9 11:27:17 2012 +0800

    ASoC: wm8904: Fix cache only management

    We should be using the regmap API consistently for all the cache only
    configuration and we should be going cache only before we power down
    the supplies.

    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

commit 433897f7408b556f7dfbb98c94deea02e634d2a7
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date:   Sat Jun 9 11:38:12 2012 +0800

    ASoC: wm8904: Fix GPIO and MICBIAS initialisation for regmap conversion

    We no longer have a flat ASoC cache so can't peer directly into the array
    any more but should instead use the register I/O functions to update the
    cache.

    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Cc: stable@vger.kernel.org (v3.4)

commit 972a55b62d592cfcd6d73577df8a52f1251ea9a7
Author: Qiao Zhou <zhouqiao@marvell.com>
Date:   Mon Jun 4 10:41:04 2012 +0800

    ASoC: fix pxa-ssp compiling issue under mach-mmp

    pxa-ssp.c uses API like cpu_is_pxa3xx(), cpu_is_pxa2xx(), which is
    defined under arch-pxa architecture, and drivers under mach-mmp
    can't find it. so just use ssp->type to replace that API.

    Signed-off-by: Qiao Zhou <zhouqiao@marvell.com>
    Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

commit 601722157b3f6be73623644eeae6f14940f0bd8f
Author: Qiao Zhou <zhouqiao@marvell.com>
Date:   Mon Jun 4 10:41:03 2012 +0800

    ARM: MMP: add pxa910-ssp into ssp_id_table

    add pxa910-ssp into ssp_id_table, and fix pxa-ssp compiling issue
    under mach-mmp architect.

    Signed-off-by: Qiao Zhou <zhouqiao@marvell.com>
    Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

commit 83a27052c3376793bc879e00e6e6805d6fb7aab9
Author: Eric Dumazet <edumazet@google.com>
Date:   Tue Jun 5 22:35:24 2012 +0000

    virtio-net: fix a race on 32bit arches

    commit 3fa2a1df909 (virtio-net: per cpu 64 bit stats (v2)) added a race
    on 32bit arches.

    We must use separate syncp for rx and tx path as they can be run at the
    same time on different cpus. Thus one sequence increment can be lost and
    readers spin forever.

    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Cc: Stephen Hemminger <shemminger@vyatta.com>
    Cc: Michael S. Tsirkin <mst@redhat.com>
    Cc: Jason Wang <jasowang@redhat.com>
    Acked-by: Rusty Russell <rusty@rustcorp.com.au>
    Acked-by: Michael S. Tsirkin <mst@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 7dbb491878a2c51d372a8890fa45a8ff80358af1
Author: françois romieu <romieu@fr.zoreil.com>
Date:   Sat Jun 9 10:53:16 2012 +0000

    r8169: avoid NAPI scheduling delay.

    While reworking the r8169 driver a few months ago to perform the
    smallest amount of work in the irq handler, I took care of avoiding
    any irq mask register operation in the slow work dedicated user
    context thread. The slow work thread scheduled an extra round of NAPI
    work which would ultimately set the irq mask register as required,
    thus keeping such irq mask operations in the NAPI handler.
    It would eventually race with the irq handler and delay NAPI execution
    for - assuming no further irq - a whole ksoftirqd period. Mildly a
    problem for rare link changes or corner case PCI events.

    The race was always lost after the last bh disabling lock had been
    removed from the work thread and people started wondering where those
    pesky "NOHZ: local_softirq_pending 08" messages came from.

    Actually the irq mask register _can_ be set up directly in the slow
    work thread.

    Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
    Reported-by: Dave Jones <davej@redhat.com>
    Tested-by: Marc Dionne <marc.c.dionne@gmail.com>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: Hayes Wang <hayeswang@realtek.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit d26098759cf6d32148649c165f87a7590bc25b89
Author: Jerome Glisse <jglisse@redhat.com>
Date:   Sat Jun 9 10:57:41 2012 -0400

    drm/radeon: fix tiling and command stream checking on evergreen v3

    Fix regresson since the introduction of command stream checking on
    evergreen (thread referenced below). Issue is cause by ddx allocating
    bo with formula width*height*bpp while programming the GPU command
    stream with ALIGN(height, 8). In some case (where page alignment does
    not hide the extra size bo should be according to height alignment)
    the kernel will reject the command stream.

    This patch reprogram the command stream to slice - 1 (slice is
    a derivative value from height) which avoid rejecting the command
    stream while keeping the value of command stream checking from a
    security point of view.

    This patch also fix wrong computation of layer size for 2D tiled
    surface. Which should fix issue when 2D color tiling is enabled.
    This dump the radeon KMS_DRIVER_MINOR so userspace can know if
    they are on a fixed kernel or not.

    https://lkml.org/lkml/2012/6/3/80
    https://bugs.freedesktop.org/show_bug.cgi?id=50892
    https://bugs.freedesktop.org/show_bug.cgi?id=50857

    !!! STABLE need a custom version of this patch for 3.4 !!!

    v2: actually bump the minor version and add comment about stable
    v3: do compute the height the ddx was trying to use

    [airlied: drop left over debug]

    Signed-off-by: Jerome Glisse <jglisse@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 30338cf09f82523d8747670f7363cc8af347c79f
Author: Sjur Brændeland <sjur.brandeland@stericsson.com>
Date:   Sun Jun 10 14:37:51 2012 +0300

    remoteproc: fix missing fault indication in error-path

    If rproc_find_rsc_table() fails, rproc_fw_boot() must set
    return-value before jumping to clean_up label. Otherwise no
    error value is returned.

    Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com>
    Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
    Cc: stable@vger.kernel.org

commit e981f6d41acda2ae8c05e60feb2cb97772b4a6e6
Author: Sjur Brændeland <sjur.brandeland@stericsson.com>
Date:   Sun Jun 10 14:37:07 2012 +0300

    remoteproc: fix print format warnings

    Fix compile warnings from GCC 4.6.1 when printing values of type size_t.

    drivers/remoteproc/remoteproc_core.c:251:6:
    warning: format ‘%x’ expects argument of type ‘unsigned int’,
    but argument 4 has type ‘size_t’ [-Wformat]
    drivers/remoteproc/remoteproc_core.c:938:9:
    warning: format ‘%u’ expects argument of type ‘unsigned int’,
    but argument 4 has type ‘size_t’ [-Wformat]
    drivers/remoteproc/remoteproc_core.c:1023:2:
    warning: format ‘%d’ expects argument of type ‘int’,
    but argument 4 has type ‘size_t’ [-Wformat]

    Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com>
    Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
    Cc: stable@vger.kernel.org

commit 8876d6b5f81f4e242a6660da22bbd92f17a8d058
Author: Paul Pluzhnikov <ppluzhnikov@google.com>
Date:   Sat Jun 9 07:53:03 2012 -0700

    net: Make linux/tcp.h C++ friendly (trivial)

    I originally sent this patch to <trivial@kernel.org>, but Jiri Kosina did
    not feel that this is fully appropriate for the trivial tree.

    Using linux/tcp.h from C++ results in:

    cat t.cc
    #include <linux/tcp.h>
    int main() { }

    g++ -c t.cc

    In file included from t.cc:1:
    /usr/include/linux/tcp.h:72: error: '__u32 __fswab32(__u32)' cannot appear in a constant-expression
    /usr/include/linux/tcp.h:72: error: a function call cannot appear in a constant-expression
    ...

    Attached trivial patch fixes this problem.

    Tested:
    - the t.cc above compiles with g++ and
    - the following program generates the same output before/after
      the patch:

    #include <linux/tcp.h>
    #include <stdio.h>

    int main ()
    {
    #define P(a) printf("%s: %08x\n", #a, (int)a)
     P(TCP_FLAG_CWR);
     P(TCP_FLAG_ECE);
     P(TCP_FLAG_URG);
     P(TCP_FLAG_ACK);
     P(TCP_FLAG_PSH);
     P(TCP_FLAG_RST);
     P(TCP_FLAG_SYN);
     P(TCP_FLAG_FIN);
     P(TCP_RESERVED_BITS);
     P(TCP_DATA_OFFSET);
    #undef P
     return 0;
    }

    Signed-off-by: Paul Pluzhnikov <ppluzhnikov@google.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 9271b0b4b2044c6db06051fe60bc58cdd4f17c7c
Author: Martin Pelikan <pelikan@storkhole.cz>
Date:   Sat Jun 9 21:22:11 2012 +0200

    x86, um: Correct syscall table type attributes breaking gcc 4.8

    The latest GCC 4.8 does some more checking on type attributes that
    break the build for ARCH=um -> fill them in.  Specifically, the
    "asmlinkage" attributes is now tested for consistency.

    Signed-off-by: Martin Pelikan <pelikan@storkhole.cz>
    Link: http://lkml.kernel.org/r/1339269731-10772-1-git-send-email-pelikan@storkhole.cz
    Acked-by: Richard Weinberger <richard@nod.at>
    Signed-off-by: H. Peter Anvin <hpa@zytor.com>

commit c5afc8da5b881633717bfc0510792428aa01fa3f
Author: Bryan Schumaker <bjschuma@netapp.com>
Date:   Fri Jun 8 11:32:56 2012 -0400

    NFS: Use the NFS_DEFAULT_VERSION for v2 and v3 mounts

    Older versions of nfs utils don't always pass a "vers=" mount option for
    NFS.  This chould lead to attempts at using NFS v0 due to a zeroed out
    nfs_parsed_mount_data struct.  I solve this by setting the default NFS
    version to NFS_DEFAULT_VERSION in the v2 and v3 cases (v4 has already been
    taken care of by a similar patch).

    Reported-by: Joerg Roedel <joro@&bytes.org>
    Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit 906369e43c29001c39c7dfed8a01b9dff24ace75
Author: Fred Isaman <iisaman@netapp.com>
Date:   Fri Jun 8 16:48:33 2012 -0400

    NFS: fix directio refcount bug on commit

    This reverts a hunk from commit 04277086577
    "NFS: Clean up - Simplify reference counting in fs/nfs/direct.c"

    The cleanups in that patch affect the write path, but by the time
    processing hits commit the removed reference has been added back by
    nfs_scan_commit_list().  Without this reversion, any page that is
    sent to commit holds on to an unbalanced reference that is never
    freed.  The immediate effect is an imbalance over the wire between
    OPENs and CLOSEs.

    Signed-off-by: Fred Isaman <iisaman@netapp.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit bcc2c9c3fff859e0eb019fe6fec26f9b8eba795c
Author: Olaf Hering <olaf@aepfle.de>
Date:   Thu May 31 16:40:06 2012 +0200

    Tools: hv: verify origin of netlink connector message

    The SuSE security team suggested to use recvfrom instead of recv to be
    certain that the connector message is originated from kernel.

    CVE-2012-2669

    Signed-off-by: Olaf Hering <olaf@aepfle.de>
    Signed-off-by: Marcus Meissner <meissner@suse.de>
    Signed-off-by: Sebastian Krahmer <krahmer@suse.de>
    Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 5fc05780b84d5227e6c15986f1bde488e52752bd
Author: Arnd Bergmann <arnd@arndb.de>
Date:   Tue May 15 15:03:01 2012 -0600

    drivers/tosa: driver needs I2C and SPI to compile

    This driver requires both SPI and I2C to build.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
    Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>

commit f5c3ac242d05c07f646824aba25a541af7464c82
Author: Arnd Bergmann <arnd@arndb.de>
Date:   Tue May 15 15:03:00 2012 -0600

    drivers/savagefb: use mdelay instead of udelay

    Long delays need to use mdelay on architectures such as ARM
    that cannot compute long timeouts in udelay.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
    Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>

commit d399099cbba92b247ac323a99ac4c5fa5b0ca68d
Author: Arnd Bergmann <arnd@arndb.de>
Date:   Tue May 15 15:02:59 2012 -0600

    video/console: automatically select a font

    The frame buffer console needs at least one font to be built into
    the kernel, so add the necessary Kconfig magic to guarantee that
    one of the available font is always on. If a user accidentally
    disables all fonts manually, the 8x16 font will be selected
    anyway.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
    Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>

commit ff9440465c82099ba3365930a97f90b3acfcc980
Author: Arnd Bergmann <arnd@arndb.de>
Date:   Tue May 15 15:02:58 2012 -0600

    video/ili9320: do not mark exported functions __devexit

    No symbol can be exported when the section is discarded - the only
    solution I could think of is not to mark symbols as __devexit
    when they are exported.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
    Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>

commit 6f32d03bc63ab27f5e21d40c4ec81e18d991f424
Author: Arnd Bergmann <arnd@arndb.de>
Date:   Tue May 15 15:02:57 2012 -0600

    drivers/video: use correct __devexit_p annotation

    __devexit functions are discarded when CONFIG_HOTPLUG
    is not set, so the symbol needs to be referenced carefully.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
    Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>

commit c91c3faea500da34d42a14735f1f67bb137b6413
Author: Takashi Iwai <tiwai@suse.de>
Date:   Sat Jun 9 08:46:42 2012 +0200

    vga_switcheroo: Enable/disable audio clients at the right time

    The audio clients have to be disabled before disabling the VGA and
    switching.  Similarly, enabling the audio client should be done at
    last.  Otherwise the audio-side operation stalls, eventually leading
    to Oops or lockups.

    Tested-by: Jörg-Volker Peetz <jvpeetz@web.de>
    Acked-by: Dave Airlie <airlied@redhat.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit f41ef2e7dc4515777810016612316c38f84275e7
Author: Randy Dunlap <rdunlap@xenotime.net>
Date:   Fri Jun 8 14:07:19 2012 +0000

    netdev: fix drivers/net/phy/ kernel-doc warnings

    Fix kernel-doc warnings in drivers/net/phy:

    Warning(drivers/net/phy/mdio_bus.c:109): No description found for parameter 'mdio_bus_np'
    Warning(drivers/net/phy/mdio_bus.c:109): Excess function parameter 'mdio_np' description in 'of_mdio_find_bus'

    Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit c6c4b97c6b7003e8082dd43db224c1d1f7a24aa2
Author: Randy Dunlap <rdunlap@xenotime.net>
Date:   Fri Jun 8 14:01:44 2012 +0000

    net/core: fix kernel-doc warnings

    Fix kernel-doc warnings in net/core:

    Warning(net/core/skbuff.c:3368): No description found for parameter 'delta_truesize'
    Warning(net/core/filter.c:628): No description found for parameter 'pfp'
    Warning(net/core/filter.c:628): Excess function parameter 'sk' description in 'sk_unattached_filter_create'

    Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit ead188f9f930fb5d7f0c49315a7fce3d8bd16b7e
Author: Jan Kara <jack@suse.cz>
Date:   Fri Jun 8 17:07:36 2012 +0200

    writeback: Fix lock imbalance in writeback_sb_inodes()

    Fix bug introduced by 169ebd90.  We have to have wb_list_lock locked when
    restarting writeback loop after having waited for inode writeback.

    Bug description by Ted Tso:

      I can reproduce this fairly easily by using ext4 w/o a journal, running
      under KVM with 1024megs memory, with fsstress (xfstests #13):

      [   45.153294] =====================================
      [   45.154784] [ BUG: bad unlock balance detected! ]
      [   45.155591] 3.5.0-rc1-00002-gb22b1f1 #124 Not tainted
      [   45.155591] -------------------------------------
      [   45.155591] flush-254:16/2499 is trying to release lock (&(&wb->list_lock)->rlock) at:
      [   45.155591] [<c022c3da>] writeback_sb_inodes+0x160/0x327
      [   45.155591] but there are no more locks to release!

    Reported-by: Theodore Ts'o <tytso@mit.edu>
    Tested-by: Theodore Ts'o <tytso@mit.edu>
    Signed-off-by: Jan Kara <jack@suse.cz>
    Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>

commit cd8f76c0a0c6fce0b2cf23c9bd0123f91453f46d
Author: Eric Dumazet <edumazet@google.com>
Date:   Thu Jun 7 22:59:59 2012 +0000

    be2net: fix a race in be_xmit()

    As soon as hardware is notified of a transmit, we no longer can assume
    skb can be dereferenced, as TX completion might have freed the packet.

    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Cc: Sathya Perla <sathya.perla@emulex.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 4399a4df98a63e30fd16e9d0cecc46ea92269e8f
Author: Eric Dumazet <edumazet@google.com>
Date:   Fri Jun 8 06:25:00 2012 +0000

    l2tp: fix a race in l2tp_ip_sendmsg()

    Commit 081b1b1bb27f (l2tp: fix l2tp_ip_sendmsg() route handling) added
    a race, in case IP route cache is disabled.

    In this case, we should not do the dst_release(&rt->dst), since it'll
    free the dst immediately, instead of waiting a RCU grace period.

    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Cc: James Chapman <jchapman@katalix.com>
    Cc: Denys Fedoryshchenko <denys@visp.net.lb>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 6aee4ca3d2217d3f76469e5ed576d62695f0912a
Author: Stanislaw Gruszka <sgruszka@redhat.com>
Date:   Thu Jun 7 14:47:21 2012 +0200

    mac80211: add back channel change flag

    commit 24398e39c8ee4a9d9123eed322b859ece4d16cac
    Author: Johannes Berg <johannes.berg@intel.com>
    Date:   Wed Mar 28 10:58:36 2012 +0200

        mac80211: set HT channel before association

    removed IEEE80211_CONF_CHANGE_CHANNEL argument from ieee80211_hw_config,
    which is required by iwl4965 driver, otherwise that driver does not
    configure channel properly and is not able to associate.

    Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 58d1eab7ef1d7ff8e448699dfd1a21b7f3303296
Author: Sasha Levin <levinsasha928@gmail.com>
Date:   Wed Jun 6 23:02:55 2012 +0200

    NFC: Fix possible NULL ptr deref when getting the name of a socket

    llcp_sock_getname() might get called before the LLCP socket was created.
    This condition isn't checked, and llcp_sock_getname will simply deref a
    NULL ptr in that case.

    This exists starting with d646960 ("NFC: Initial LLCP support").

    Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit d012d04e4d6312ea157b6cf19e9689af934f5aa7
Author: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Date:   Wed Jun 6 13:55:02 2012 +0200

    iwlwifi: disable the buggy chain extension feature in HW

    This feature has been reported to be buggy and enabled by
    default. We therefore need to disable it manually.

    Cc: stable@vger.kernel.org
    Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit d6ee27eb13beab94056e0de52d81220058ca2297
Author: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Date:   Wed Jun 6 09:13:36 2012 +0200

    iwlwifi: don't mess up the SCD when removing a key

    When we remove a key, we put a key index which was supposed
    to tell the fw that we are actually removing the key. But
    instead the fw took that index as a valid index and messed
    up the SRAM of the device.

    This memory corruption on the device mangled the data of
    the SCD. The impact on the user is that SCD queue 2 got
    stuck after having removed keys.
    The message is the log that was printed is:

    Queue 2 stuck for 10000ms

    This doesn't seem to fix the higher queues that get stuck
    from time to time.

    Cc: stable@vger.kernel.org [2.6.27+]
    Reviewed-by: Meenakshi Venkataraman <meenakshi.venkataraman@intel.com>
    Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit e7027075d0d8fe2d1bf7b0db24623328d2601d3c
Author: Hauke Mehrtens <hauke@hauke-m.de>
Date:   Tue Jun 5 20:58:20 2012 +0200

    bcma: fix null pointer in bcma_core_pci_irq_ctl

    pc could be null if hosttype != BCMA_HOSTTYPE_PCI.
    If we are on a device without a pci core this function is called with
    pc = null by b43 and brcmsmac. If the host type is PCI we have a pci
    core as well and pc can not be null.

    Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit e64add27e1b4874f589e550b4e0ca6715070373f
Author: Oleksij Rempel <bug-track@fisher-privat.net>
Date:   Tue Jun 5 20:39:32 2012 +0200

    b43: do not call ieee80211_unregister_hw if we are not registred

    this patch fixes kernel Oops on "rmmod b43" if firmware was not loaded:

    BUG: unable to handle kernel NULL pointer dereference at 0000000000000088
    IP: [<ffffffff8104e988>] drain_workqueue+0x25/0x142
    PGD 153ac6067 PUD 153b82067 PMD 0
    Oops: 0000 [#1] SMP

    Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit d2c8b15d0cb486f4938ba7f2af349d9d1220cb10
Author: Meenakshi Venkataraman <meenakshi.venkataraman@intel.com>
Date:   Tue Jun 5 20:24:37 2012 +0200

    iwlwifi: use correct supported firmware for 6035 and 6000g2

    My patch

       iwlwifi: use correct released ucode version

    did not correctly report supported firmware
    for the 6035 device. This patch fixes it. The
    minimum supported firmware version for 6035
    is v6.

    Also correct the minimum supported firmware
    version for the 6000g2 series of devices.

    Cc: stable@kernel.org
    Signed-off-by: Meenakshi Venkataraman <meenakshi.venkataraman@intel.com>
    Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit ce466579b1c92fce78bf5f74a3707f46e228d949
Author: Johannes Berg <johannes.berg@intel.com>
Date:   Tue Jun 5 15:42:55 2012 +0200

    wireless: add my new trees to MAINTAINERS

    Add my new trees to the MAINTAINERS file
    for the components that I maintain in the
    new trees.

    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 06cf5c4c5bea549235da1aace86b90d4ad0084f8
Author: Qasim Javed <qasimj@gmail.com>
Date:   Tue Jun 5 01:25:44 2012 -0500

    mac80211_hwsim: Set IEEE80211_STAT_ACK flag when userspace indicates that the frame has been acknowledged.

    The station fail average is not updated correctly since the
    IEEE80211_STAT_ACK flag is not set when using wmediumd with
    mac80211_hwsim. Set this flag when wmediumd indicates that the frame
    was successfully transmitted (eventually).

    Signed-off-by: Qasim Javed <qasimj@gmail.com>
    Signed-off-by: Javier Cardona <javier@cozybit.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 0fde0a8cfd0ede7f310d6a681c8e5a7cb3e32406
Author: Stanislaw Gruszka <sgruszka@redhat.com>
Date:   Wed May 16 11:06:21 2012 +0200

    rtl8187: ->brightness_set can not sleep

    Fix:

    BUG: sleeping function called from invalid context at kernel/workqueue.c:2547
    in_atomic(): 1, irqs_disabled(): 0, pid: 629, name: wpa_supplicant
    2 locks held by wpa_supplicant/629:
     #0:  (rtnl_mutex){+.+.+.}, at: [<c08b2b84>] rtnl_lock+0x14/0x20
     #1:  (&trigger->leddev_list_lock){.+.?..}, at: [<c0867f41>] led_trigger_event+0x21/0x80
    Pid: 629, comm: wpa_supplicant Not tainted 3.3.0-0.rc3.git5.1.fc17.i686
    Call Trace:
     [<c046a9f6>] __might_sleep+0x126/0x1d0
     [<c0457d6c>] wait_on_work+0x2c/0x1d0
     [<c045a09a>] __cancel_work_timer+0x6a/0x120
     [<c045a160>] cancel_delayed_work_sync+0x10/0x20
     [<f7dd3c22>] rtl8187_led_brightness_set+0x82/0xf0 [rtl8187]
     [<c0867f7c>] led_trigger_event+0x5c/0x80
     [<f7ff5e6d>] ieee80211_led_radio+0x1d/0x40 [mac80211]
     [<f7ff3583>] ieee80211_stop_device+0x13/0x230 [mac80211]

    Removing _sync is ok, because if led_on work is currently running
    it will be finished before led_off work start to perform, since
    they are always queued on the same mac80211 local->workqueue.

    Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=795176

    Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
    Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
    Acked-by: Hin-Tak Leung <htl10@users.sourceforge.net>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit aac495a8002bbf20e879572c6cf0789ab2ffb32b
Author: Stanislav Yakovlev <stas.yakovlev@gmail.com>
Date:   Mon May 14 19:06:19 2012 -0400

    net/wireless: ipw2100: Fix WARN_ON occurring in wiphy_register called by ipw2100_pci_init_one

    The problem was found by Larry Finger:
    http://marc.info/?l=linux-wireless&m=133702401700614&w=2

    The problem is identical to the one for ipw2200 which is already fixed:
    http://marc.info/?l=linux-wireless&m=133457257407196&w=2

    [   17.766431] ------------[ cut here ]------------
    [   17.766467] WARNING: at net/wireless/core.c:562 wiphy_register+0x34c/0x3c0 [cfg80211]()
    [   17.766471] Hardware name: Latitude D600
    [   17.766474] Modules linked in: ipw2100(+) libipw pcmcia cfg80211 ppdev parport_pc yenta_socket sr_mod pcmcia_rsrc parport iTCO_wdt cdrom sg rfkill pcmcia_
    core lib80211 tg3 video button battery ac iTCO_vendor_support joydev shpchp pcspkr pciehp pci_hotplug autofs4 radeon ttm drm_kms_helper uhci_hcd ehci_hcd rtc
    _cmos thermal drm hwmon i2c_algo_bit i2c_core processor usbcore usb_common ata_generic ata_piix ahci libahci libata
    [   17.766525] Pid: 474, comm: modprobe Not tainted 3.4.0-rc7-wl+ #6
    [   17.766528] Call Trace:
    [   17.766541]  [<c066ad08>] ? printk+0x28/0x2a
    [   17.766552]  [<c0230edd>] warn_slowpath_common+0x6d/0xa0
    [   17.766563]  [<e0b253bc>] ? wiphy_register+0x34c/0x3c0 [cfg80211]
    [   17.766573]  [<e0b253bc>] ? wiphy_register+0x34c/0x3c0 [cfg80211]
    [   17.766578]  [<c0230f2d>] warn_slowpath_null+0x1d/0x20
    [   17.766588]  [<e0b253bc>] wiphy_register+0x34c/0x3c0 [cfg80211]
    [   17.766605]  [<e0b5b0d6>] ipw2100_wdev_init+0x196/0x1c0 [ipw2100]
    [   17.766616]  [<e0b5d962>] ipw2100_pci_init_one+0x2b2/0x694 [ipw2100]
    [   17.766632]  [<c047ce52>] local_pci_probe+0x42/0xb0
    [   17.766637]  [<c047e2b0>] pci_device_probe+0x60/0x90
    [   17.766645]  [<c0376de2>] ? sysfs_create_link+0x12/0x20
    [   17.766654]  [<c050f1f6>] really_probe+0x56/0x2e0
    [   17.766659]  [<c037636d>] ? create_dir+0x5d/0xa0
    [   17.766667]  [<c0518c6b>] ? pm_runtime_barrier+0x3b/0xa0
    [   17.766672]  [<c050f5e4>] driver_probe_device+0x44/0xa0
    [   17.766677]  [<c047e227>] ? pci_match_device+0x97/0xa0
    [   17.766681]  [<c050f6c9>] __driver_attach+0x89/0x90
    [   17.766686]  [<c050f640>] ? driver_probe_device+0xa0/0xa0
    [   17.766691]  [<c050da2a>] bus_for_each_dev+0x3a/0x70
    [   17.766695]  [<c050ee6c>] driver_attach+0x1c/0x30
    [   17.766699]  [<c050f640>] ? driver_probe_device+0xa0/0xa0
    [   17.766704]  [<c050ea77>] bus_add_driver+0x187/0x280
    [   17.766710]  [<c045b9cd>] ? kset_find_obj+0x2d/0x60
    [   17.766715]  [<c047e2e0>] ? pci_device_probe+0x90/0x90
    [   17.766719]  [<c047e2e0>] ? pci_device_probe+0x90/0x90
    [   17.766724]  [<c050fb85>] driver_register+0x65/0x110
    [   17.766729]  [<c047e09d>] __pci_register_driver+0x3d/0xa0
    [   17.766738]  [<e09f705c>] ipw2100_init+0x5c/0x1000 [ipw2100]
    [   17.766743]  [<c020110f>] do_one_initcall+0x2f/0x170
    [   17.766749]  [<e09f7000>] ? 0xe09f6fff
    [   17.766757]  [<c0287ce8>] sys_init_module+0xa8/0x210
    [   17.766766]  [<c067a075>] syscall_call+0x7/0xb
    [   17.766769] ---[ end trace 559898c6bb0d1c75 ]---
    [   17.767093] ipw2100: probe of 0000:02:03.0 failed with error -5

    This warning appears only if we apply Ben Hutchings' fix
    http://marc.info/?l=linux-wireless&m=132720204412667&w=2
    for the bug reported by Cesare Leonardi
    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=656813
    with cfg80211 warning during device registration
    ("cfg80211: failed to add phy80211 symlink to netdev!").

    We separate device bring up and registration with network stack
    to avoid the problem.

    Signed-off-by: Stanislav Yakovlev <stas.yakovlev@gmail.com>
    Tested-by: Larry Finger <Larry.Finger@lwfinger.net>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 2d0dbc6ae8a5194aaecb9cfffb9053f38fce8b86
Author: Trond Myklebust <Trond.Myklebust@netapp.com>
Date:   Fri Jun 8 10:58:09 2012 -0400

    NFSv4: Fix unnecessary delegation returns in nfs4_do_open

    While nfs4_do_open() expects the fmode argument to be restricted to
    combinations of FMODE_READ and FMODE_WRITE, both nfs4_atomic_open()
    and nfs4_proc_create will pass the nfs_open_context->mode,
    which contains the full fmode_t.

    This patch ensures that nfs4_do_open strips the other fmode_t bits,
    fixing a problem in which the nfs4_do_open call would result in an
    unnecessary delegation return.

    Reported-by: Fred Isaman <iisaman@netapp.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Cc: stable@vger.kernel.org

commit 8393ec4a13889339bacfb8b038fb13716eef7a2b
Author: Steven Newbury <steve@snewbury.org.uk>
Date:   Fri Jun 8 13:06:29 2012 +0200

    ALSA: hda - HDMI Audio init all connectors when VGA-switcheroo is off

    When VGA_SWITCHEROO support is enabled hda_intel initialises the HDMI
    audio device on the current VGA device.  When it's not enabled it only
    initialises the HDMI device on the default VGA adaptor, this means
    secondary cards get no audio support which is very unhelpful for
    multi-seat!

    With this patch, when SUPPORT_VGA_SWITCHEROO is disabled hda_intel
    initialises all HDMI audio devices, not just the default VGA.

    [minor optimizations by tiwai]

    Signed-off-by: Steven Newbury <steve@snewbury.org.uk>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 505cff00de9c303b95c204eb4544066e3e707911
Author: Takashi Iwai <tiwai@suse.de>
Date:   Fri Jun 8 12:49:17 2012 +0200

    vga_switcheroo: Fix error without CONFIG_VGA_SWITCHEROO

    Fix a typo that is built only when CONFIG_VGA_SWITCHEROO=n.

    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 9ee6ddc9dada9cc4b2201631bc74fbf203183a10
Merge: db0dc75 f2bf1f6
Author: Ingo Molnar <mingo@kernel.org>
Date:   Fri Jun 8 12:23:22 2012 +0200

    Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/urgent

    Pull brown paper bag fix from Steve Rostedt.

    Signed-off-by: Ingo Molnar <mingo@kernel.org>

commit eab309494ae2b9e15f85520f00de3893162c2e43
Author: Stephen Boyd <sboyd@codeaurora.org>
Date:   Thu May 24 00:45:21 2012 -0700

    memblock: Document memblock_is_region_{memory,reserved}()

    At first glance one would think that memblock_is_region_memory()
    and memblock_is_region_reserved() would be implemented in the
    same way. Unfortunately they aren't and the former returns
    whether the region specified is a subset of a memory bank while
    the latter returns whether the region specified intersects with
    reserved memory.

    Document the two functions so that users aren't tempted to
    make the implementation the same between them and to clarify the
    purpose of the functions.

    Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
    Cc: Tejun Heo <tj@kernel.org>
    Link: http://lkml.kernel.org/r/1337845521-32755-1-git-send-email-sboyd@codeaurora.org
    Signed-off-by: Ingo Molnar <mingo@kernel.org>

commit 12b78a7f671aa91fd41899615bf6d171c925c3d7
Author: Takashi Iwai <tiwai@suse.de>
Date:   Thu Jun 7 12:15:16 2012 +0200

    ALSA: hda - Fix uninitialized HDMI controllers with VGA-switcheroo

    When VGA-switcheroo is built in but unused on systems with multiple
    graphics cards, the initializations of non-default graphics cards are
    skipped and never enabled (because the switcheroo is activated only
    when the controller supports).  The current behavior is for avoiding
    the system lockup by accessing the disabled GPU, but due to the recent
    change in VGA-switcheroo, it determines the state simply by checking
    with the default VGA device.  This is the culprit.

    Now with the new vga_switcheroo_get_client_state(), we can know the
    initial state of the bound GPU, thus can determine the initial audio
    client state more correctly.

    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit c8e9cf7bb240049117d2fa64d1540476c289396d
Author: Takashi Iwai <tiwai@suse.de>
Date:   Thu Jun 7 12:15:15 2012 +0200

    vga_switcheroo: Add a helper function to get the client state

    Add vga_switcheroo_get_client_state() to get the current state of the
    client.  This is necessary to determine the proper initial state of
    audio clients in HD-audio driver.

    Acked-by: Dave Airlie <airlied@redhat.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit f9c15a1b7d60b69f42b2808140a4713808a3bec1
Merge: 8e56130 febe9e0
Author: Olof Johansson <olof@lixom.net>
Date:   Fri Jun 8 00:43:39 2012 -0700

    Merge tag 'omap-fixes-for-v3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

    The biggest fix here is the long pending patch mux UART pins so PM
    retention idle works again.

    Also included are few other PM wake-up related fixes, and removal of
    dead cpu detection code.

    The other fixes are trivial build and randconfig related fixes.

    * tag 'omap-fixes-for-v3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
      ARM: OMAP2+: Fix compile for CONFIG_TIDSPBRIDGE platform init code
      ARM: OMAP3: Fix omap3_l3_block_irq warning when CONFIG_BUG is not set
      ARM: OMAP: Fix MMC_OMAP build when only MMC_OMAP_HS is selected
      OMAP2+: UART: Add mechanism to probe uart pins and configure rx wakeup
      ARM: OMAP: Fix lis3lv02d accelerometer to use gpio_to_irq
      ARM: OMAP: SoC detection: remove unused cpu_is macros
      ARM: OMAP3: clock data: cleanup AM3[35]x SoC detection
      arm: omap3: am35x: Don't mark missing features as present
      ARM: OMAP3: PM: fix shared PRCM interrupts: leave disabled at boot
      ARM: OMAP2+: INTC: fix suspend abort, set IRQCHIP_SKIP_SET_WAKE

commit 6a2b28ef036ab5c66fdc606fe97d9e5cb34ea409
Author: David S. Miller <davem@davemloft.net>
Date:   Fri Jun 8 00:28:16 2012 -0700

    Revert "niu: Add support for byte queue limits."

    This reverts commit efa230f2c68abab817f13473077f8d0cc74f43f3.

    BQL doesn't work with how this driver currently only takes TX
    interrupts every 1/4 of the TX ring.  That behavior needs to be fixed,
    but that's a larger non-trivial task and for now we have to revert
    BQL support as this makes the device currently completely unusable.

    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 8260ef075bd9848ce6a8004ec73b7454d410cc15
Author: Takashi Iwai <tiwai@suse.de>
Date:   Fri Jun 8 09:01:37 2012 +0200

    ALSA: usb-audio: Fix substream assignments

    In 3.5 kernel, the endpoint is assigned dynamically for the
    substreams, but the PCM assignment still checks the presence of the
    endpoint pointer.  This ended up in duplicated PCM substream creations
    at probing time, resulting in kernel warnings like:

    WARNING: at fs/proc/generic.c:586 proc_register+0x169/0x1a6()
    Pid: 1152, comm: modprobe Not tainted 3.5.0-rc1-00110-g71fae7e #2
    Call Trace:
     [<ffffffff8102a400>] warn_slowpath_common+0x83/0x9c
     [<ffffffff8102a4bc>] warn_slowpath_fmt+0x46/0x48
     [<ffffffff813829ad>] ? add_preempt_count+0x39/0x3b
     [<ffffffff811292f0>] proc_register+0x169/0x1a6
     [<ffffffff8112962e>] create_proc_entry+0x74/0x8c
     [<ffffffffa018eb63>] snd_info_register+0x3e/0xc3 [snd]
     [<ffffffffa01fde2e>] snd_pcm_new_stream+0xb1/0x404 [snd_pcm]
     [<ffffffffa024861f>] snd_usb_add_audio_stream+0xd2/0x230 [snd_usb_audio]
     [<ffffffffa0241d33>] ? snd_usb_parse_audio_format+0x252/0x34f [snd_usb_audio]
     [<ffffffff810d6b17>] ? kmem_cache_alloc_trace+0xab/0xbb
     [<ffffffffa0248c29>] snd_usb_parse_audio_interface+0x4ac/0x567 [snd_usb_audio]
     [<ffffffffa023f0ff>] snd_usb_create_stream+0xe9/0x125 [snd_usb_audio]
     [<ffffffffa023f9b1>] usb_audio_probe+0x62a/0x72c [snd_usb_audio]
     .....

    This patch fixes the regression by checking the fixed endpoint number
    for each substream instead of the endpoint pointer.

    Reported-and-tested-by: Jamie Heilman <jamie@audible.transient.net>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 33d5e332b9c5ce0bf3bfd44ca2127d1773b3f2ad
Author: Giuseppe CAVALLARO <peppe.cavallaro@st.com>
Date:   Thu Jun 7 19:25:07 2012 +0000

    stmmac: fix driver built w/ w/o both pci and platf modules

    The commit ba27ec66ffeb78cbf fixes the Kconfig of the
    driver when built as module allowing to select/unselect
    the PCI and Platform modules that are not anymore mutually
    exclusive. This patch fixes and guarantees that the driver
    builds on all the platforms w/ w/o PCI and when select/unselect
    the two stmmac supports. In case of there are some problems
    on both the configuration and the pci/pltf registration the
    module_init will fail.

    v2: set the CONFIG_STMMAC_PLATFORM enabled by default.
    I've just noticed that this can actually help on
    some configurations that don't enable any STMMAC
    options by default (e.g. SPEAr).

    v3: change printk level when do not register the driver.

    Reported-by: Fengguang Wu <wfg@linux.intel.com>
    Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 8e56130dcbcc0608c2531c61f93175e36a300e58
Author: Rob Herring <rob.herring@calxeda.com>
Date:   Wed Jun 6 17:20:10 2012 -0500

    ARM: highbank: Add smc calls to enable/disable the L2

    Linux runs in non-secure mode on highbank, so we need secure monitor calls
    to enable and disable the PL310. Rather than invent new smc calls, the same
    calling convention used by OMAP is used here.

    Signed-off-by: Rob Herring <rob.herring@calxeda.com>
    Signed-off-by: Olof Johansson <olof@lixom.net>

commit 69c5b7530651c8e375d2fbecd157a9a9a20c4cc9
Author: Stephen Warren <swarren@nvidia.com>
Date:   Thu Jun 7 17:58:31 2012 -0600

    ASoC: tegra: add MODULE_DEVICE_TABLE to tegra30_ahub

    This allows the module to automatically load when instantiated from
    device tree.

    Signed-off-by: Stephen Warren <swarren@nvidia.com>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

commit 3ff1ec27e9f567824e73316025a9025528494506
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date:   Fri Jun 8 06:53:48 2012 +0800

    ASoC: wm2000: Always use a 4s timeout for the firmware

    Rather than having varying timeouts depending on the transition always
    use a 4s timeout. This provides better diagnostics for clocking errors
    and ensures compatibility with current calibration firmwares.

    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

commit 90c6ce0d5482ee52b0a427115e185d488783164b
Author: Liam Girdwood <lrg@ti.com>
Date:   Tue Jun 5 19:27:15 2012 +0100

    ASoC: dapm: Fix input list to use source widgets

    We should only add source widgets to the input list.

    Signed-off-by: Liam Girdwood <lrg@ti.com>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

commit 35ea0655a1bcdb1dcb1c1d0c4b6b391ade9c6d01
Author: Liam Girdwood <lrg@ti.com>
Date:   Tue Jun 5 19:26:59 2012 +0100

    ASoC: dpcm: Fix dpcm_get_be() to check that DAI is BE

    Make sure that the dpcm_get_be() only returns BE DAI links.

    Signed-off-by: Liam Girdwood <lrg@ti.com>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

commit 6f4b3bf5dc0edb5b08d96486f35f5cbc24b72c40
Merge: 434978e 350ab15
Author: Olof Johansson <olof@lixom.net>
Date:   Thu Jun 7 14:59:28 2012 -0700

    Merge branch 'imx/fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes

    * 'imx/fixes' of git://git.pengutronix.de/git/imx/linux-2.6:
      ARM i.MX imx21ads: Fix overlapping static i/o mappings
      ARM i.MX27 Visstrim M10: fix gpio handling.
      ARM: imx: only call l2x0_init if it's available
      ARM: imx: only specify i2c device type once
      ARM: mx31_3ds: Fix build due to missing IMX_HAVE_PLATFORM_IMX_SSI

commit 434978e678605c8370d3d71e88796c264f70a8bf
Merge: a5ffdb3 cdd781a
Author: Olof Johansson <olof@lixom.net>
Date:   Thu Jun 7 14:59:02 2012 -0700

    Merge branch 'imx/clk-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes

    * 'imx/clk-fixes' of git://git.pengutronix.de/git/imx/linux-2.6:
      ARM i.MX53: Fix PLL4 base address
      ARM i.MX pllv2: make round_rate accurate
      ARM i.MX pllv2: use standard register set unconditionally

commit 2d8dbb04c63e5369988f008bc4df3359c01d8812
Author: Vincent Bernat <bernat@luffy.cx>
Date:   Tue Jun 5 03:41:42 2012 +0000

    snmp: fix OutOctets counter to include forwarded datagrams

    RFC 4293 defines ipIfStatsOutOctets (similar definition for
    ipSystemStatsOutOctets):

       The total number of octets in IP datagrams delivered to the lower
       layers for transmission.  Octets from datagrams counted in
       ipIfStatsOutTransmits MUST be counted here.

    And ipIfStatsOutTransmits:

       The total number of IP datagrams that this entity supplied to the
       lower layers for transmission.  This includes datagrams generated
       locally and those forwarded by this entity.

    Therefore, IPSTATS_MIB_OUTOCTETS must be incremented when incrementing
    IPSTATS_MIB_OUTFORWDATAGRAMS.

    IP_UPD_PO_STATS is not used since ipIfStatsOutRequests must not
    include forwarded datagrams:

       The total number of IP datagrams that local IP user-protocols
       (including ICMP) supplied to IP in requests for transmission.  Note
       that this counter does not include any datagrams counted in
       ipIfStatsOutForwDatagrams.

    Signed-off-by: Vincent Bernat <bernat@luffy.cx>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 278f015e9b67566991d4e831fe38e0ebbeef245e
Author: Dave Jones <davej@redhat.com>
Date:   Wed Jun 6 08:45:59 2012 +0000

    appletalk: Remove out of date message in printk

    I accidentally triggered this printk, which amused me for a few moments.
    Given we're post 2.2, we could just -EACCES, but does anyone even care about Appletalk now ?
    I figure it's better to leave sleeping dogs lie, and just update the message.

    Signed-off-by: Dave Jones <davej@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 5ff0feac88ced864f44adb145142269196fa79d9
Author: stephen hemminger <shemminger@vyatta.com>
Date:   Wed Jun 6 10:01:30 2012 +0000

    sky2: fix checksum bit management on some chips

    The newer flavors of Yukon II use a different method for receive
    checksum offload. This is indicated in the driver by the SKY2_HW_NEW_LE
    flag. On these newer chips, the BMU_ENA_RX_CHKSUM should not be set.

    The driver would get incorrectly toggle the bit, enabling the old
    checksum logic on these chips and cause a BUG_ON() assertion. If
    receive checksum was toggled via ethtool.

    Reported-by: Kirill Smelkov <kirr@mns.spb.ru>
    Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 8bd74516b1bd9308c17f67583134d93f777203ca
Author: Thomas Graf <tgraf@suug.ch>
Date:   Thu Jun 7 06:51:04 2012 +0000

    ipv6: fib: Restore NTF_ROUTER exception in fib6_age()

    Commit 5339ab8b1dd82 (ipv6: fib: Convert fib6_age() to
    dst_neigh_lookup().) seems to have mistakenly inverted the
    exception for cached NTF_ROUTER routes.

    Signed-off-by: Thomas Graf <tgraf@suug.ch>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 4bd6683bd400c8b1d2ad544bb155d86a5d10f91c
Author: Eric Dumazet <edumazet@google.com>
Date:   Thu Jun 7 04:58:35 2012 +0000

    net: neighbour: fix neigh_dump_info()

    Denys found out "ip neigh" output was truncated to
    about 54 neighbours.

    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Reported-by: Denys Fedoryshchenko <denys@visp.net.lb>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit a06998b88b1651c5f71c0e35f528bf2057188ead
Author: Eric Dumazet <edumazet@google.com>
Date:   Thu Jun 7 00:07:20 2012 +0000

    net: l2tp_eth: fix kernel panic on rmmod l2tp_eth

    We must prevent module unloading if some devices are still attached to
    l2tp_eth driver.

    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Reported-by: Denys Fedoryshchenko <denys@visp.net.lb>
    Tested-by: Denys Fedoryshchenko <denys@visp.net.lb>
    Cc: James Chapman <jchapman@katalix.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 350ab15bb2ffe7103bc6bf6c634f3c5b286eaf2a
Author: Jaccon Bastiaansen <jaccon.bastiaansen@gmail.com>
Date:   Mon Apr 30 11:53:43 2012 +0200

    ARM i.MX imx21ads: Fix overlapping static i/o mappings

    The statically defined I/O memory regions for the i.MX21 on chip
    peripherals and the on board I/O peripherals of the i.MX21ADS board
    overlap. This results in a kernel crash during startup. This is fixed
    by reducing the memory range for the on board I/O peripherals to the
    actually required range.

    Signed-off-by: Jaccon Bastiaansen <jaccon.bastiaansen@gmail.com>
    Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
    Cc: stable <stable@vger.kernel.org>

commit a5ffdb31a00c2560aa668c83c64d1d8e354a02da
Merge: 97114f3 602bf40
Author: Olof Johansson <olof@lixom.net>
Date:   Thu Jun 7 11:48:02 2012 -0700

    Merge branch 'imx/fixes-for-3.5' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes

    * 'imx/fixes-for-3.5' of git://git.linaro.org/people/shawnguo/linux-2.6:
      ARM: imx6: exit coherency when shutting down a cpu
      ARM: mx51: Add pinctrl_provide_dummies()
      ARM: mx31: Add pinctrl_provide_dummies()

    Signed-off-by: Olof Johansson <olof@lixom.net>

commit 97114f3982630d35a8a6367244f185a1c3277ad5
Merge: f8f5701 b0286f2
Author: Olof Johansson <olof@lixom.net>
Date:   Thu Jun 7 11:43:23 2012 -0700

    Merge tag 'imx-clk-common-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes

    From Sascha Hauer: "Some fixes for the fresh i.MX common clock support"

    Resolved trivial conflict in arch/arm/plat-mxc/include/mach/common.h.

    * tag 'imx-clk-common-fixes' of git://git.pengutronix.de/git/imx/linux-2.6:
      ARM: imx6q: prepare and enable init on clks directly instead of clk_get first
      ARM i.MX: remove now unnecessary argument from mxc_timer_init
      ARM: i.MX: change timer clock from ipg to perclk
      ARM i.MX5: fix gpt peripheral clock path

    Signed-off-by: Olof Johansson <olof@lixom.net>

commit 02c67525cf325131aa06c6b0c6fd457bd57161e3
Author: Trond Myklebust <Trond.Myklebust@netapp.com>
Date:   Thu Jun 7 13:45:53 2012 -0400

    NFSv4.1: Convert another trivial printk into a dprintk

    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit fb47ddc9d5ded3d202335ea29743b9242d54eb5a
Author: Fred Isaman <iisaman@netapp.com>
Date:   Thu Jun 7 11:42:12 2012 -0400

    NFS4: Fix open bug when pnfs module blacklisted

    Signed-off-by: Fred Isaman <iisaman@netapp.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit f07936f2c446bd5310e669c8e6eab3f812ea665a
Author: Trond Myklebust <Trond.Myklebust@netapp.com>
Date:   Thu Jun 7 10:21:03 2012 -0400

    NFS: Remove incorrect BUG_ON in nfs_found_client

    It is perfectly valid for nfs_get_client() to return a nfs_client that
    is in the process of setting up the NFSv4.1 session.

    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit 602bf40971d7f9a1ec0b7ba2b7e6427849828651
Author: Shawn Guo <shawn.guo@linaro.org>
Date:   Tue May 22 22:13:46 2012 +0800

    ARM: imx6: exit coherency when shutting down a cpu

    There is a system hang issue on imx6q which can easily be seen with
    running a cpu hotplug stress testing (hotplug secondary cores from
    user space via sysfs interface for thousands iterations).

    It turns out that the issue is caused by coherency of the cpu that
    is being shut down.  When shutting down a cpu, we need to have the
    cpu exit coherency to prevent it from receiving cache, TLB, or BTB
    maintenance operations broadcast by other CPUs in the cluster.

    Copy cpu_enter_lowpower() and cpu_leave_lowpower() from mach-vexpress
    to have coherency properly handled in platform_cpu_die(), thus fix
    the issue.

    Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
    Cc: stable@kernel.org

commit eb5558dd46dab1e3023f052f99979b0e2bfd1b19
Author: Fabio Estevam <fabio.estevam@freescale.com>
Date:   Sun May 20 14:21:09 2012 -0300

    ARM: mx51: Add pinctrl_provide_dummies()

    commit a2aa65a (ARM: imx: enable pinctrl dummy states) missed to add
    pinctrl_provide_dummies() for mx51.

    Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
    Signed-off-by: Shawn Guo <shawn.guo@linaro.org>

commit aa29cab3f12b14020011bcad28cc11f50725d68f
Author: Fabio Estevam <fabio.estevam@freescale.com>
Date:   Sun May 20 14:11:24 2012 -0300

    ARM: mx31: Add pinctrl_provide_dummies()

    commit a2aa65a (ARM: imx: enable pinctrl dummy states) missed to add
    pinctrl_provide_dummies() for mx31.

    Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
    Signed-off-by: Shawn Guo <shawn.guo@linaro.org>

commit d109e9af61a6d2fdf33dc615ab8b724a8e75a8a4
Author: Pablo Neira Ayuso <pablo@netfilter.org>
Date:   Mon Jun 4 13:31:04 2012 +0200

    netfilter: nf_ct_h323: fix bug in rtcp natting

    The nat_rtp_rtcp hook takes two separate parameters port and rtp_port.

    port is expected to be the real h245 address (found inside the packet).
    rtp_port is the even number closest to port (RTP ports are even and
    RTCP ports are odd).

    However currently, both port and rtp_port are having same value (both are
    rounded to nearest even numbers).

    This works well in case of openlogicalchannel with media (RTP/even) port.

    But in case of openlogicalchannel for media control (RTCP/odd) port,
    h245 address in the packet is wrongly modified to have an even port.

    I am attaching a pcap demonstrating the problem, for any further analysis.

    This behavior was introduced around v2.6.19 while rewriting the helper.

    Signed-off-by: Jagdish Motwani <jagdish.motwani@elitecore.com>
    Signed-off-by: Sanket Shah <sanket.shah@elitecore.com>
    Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

commit d1992b169d31f339dc5ea4e9f312567c8cf322a3
Author: Hans Schillstrom <hans@schillstrom.com>
Date:   Thu May 17 22:35:46 2012 +0000

    netfilter: xt_HMARK: fix endianness and provide consistent hashing

    This patch addresses two issues:

    a) Fix usage of u32 and __be32 that causes endianess warnings via sparse.
    b) Ensure consistent hashing in a cluster that is composed of big and
       little endian systems. Thus, we obtain the same hash mark in an
       heterogeneous cluster.

    Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Hans Schillstrom <hans@schillstrom.com>
    Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

commit 5a67ac572e102f7d877b8a3a18a59315186e3e99
Author: Sachin Kamat <sachin.kamat@linaro.org>
Date:   Mon Jun 4 17:09:45 2012 +0530

    DMA: PL330: Add missing static storage class specifier

    Fixes the following sparse warning:
    drivers/dma/pl330.c:2542:5: warning: symbol 'add_desc' was not declared. Should it be static?

    Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
    Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>

commit 8e2e27c7444ba7880aa0a4cb07a79de130d0ed93
Author: Richard Zhao <richard.zhao@freescale.com>
Date:   Mon Jun 4 09:17:24 2012 +0800

    dma: imx-sdma: buf_tail should be initialize in prepare function

    This fix audio underrun issue. When SNDRV_PCM_TRIGGER_STOP
    and SNDRV_PCM_TRIGGER_START, it calls prepare again. buf_tail
    should be reset to zero.
    So move buf_tail initialization into prepare function.

    Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
    Acked-by: Shawn Guo <shawn.guo@linaro.org>
    Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>

commit 30c1dc0ff30b5552e8af555265dbeac5637cbb48
Author: Tushar Behera <tushar.behera@linaro.org>
Date:   Wed May 23 16:47:31 2012 +0530

    dmaengine: pl330: dont complete descriptor for cyclic dma

    Commit eab215855803 ("dmaengine: pl330: dont complete descriptor for
    cyclic dma") wrongly completes descriptor for cyclic dma, hence following
    BUG_ON is still hit with cyclic DMA operations.

    kernel BUG at drivers/dma/dmaengine.h:53!

    Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
    Acked-by: Jassi Brar <jaswinder.singh@linaro.org>
    Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
    Cc: stable <stable@vger.kernel.org>

commit 279bf2e57c30c9a4482b2b6ede11b31c41e35e78
Author: Lars-Peter Clausen <lars@metafoo.de>
Date:   Tue Jun 5 18:16:31 2012 +0200

    staging:iio:ad7606: Re-add missing scale attribute

    Commit 50ac23be ("staging:iio:adc:ad7606 add local define for chan_spec
    structures.") accidentally removed the scale info_mask flag. This patch
    adds it back again.

    Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
    Cc: stable <stable@vger.kernel.org>  [3.2+]
    Acked-by: Jonathan Cameron <jic23@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit aa9b16306e3243229580ff889cc59fd66bf77973
Author: Paul E. McKenney <paul.mckenney@linaro.org>
Date:   Thu May 10 16:41:44 2012 -0700

    rcu: Precompute RCU_FAST_NO_HZ timer offsets

    When a CPU is entering dyntick-idle mode, tick_nohz_stop_sched_tick()
    calls rcu_needs_cpu() see if RCU needs that CPU, and, if not, computes the
    next wakeup time based on the timer wheels.  Only later, when actually
    entering the idle loop, rcu_prepare_for_idle() will be invoked.  In some
    cases, rcu_prepare_for_idle() will post timers to wake the CPU back up.
    But all for naught: The next wakeup time for the CPU has already been
    computed, and posting a timer afterwards does not force that wakeup
    time to be recomputed.  This means that rcu_prepare_for_idle()'s have
    no effect.

    This is not a problem on a busy system because something else will wake
    up the CPU soon enough.  However, on lightly loaded systems, the CPU
    might stay asleep for a considerable length of time.  If that CPU has
    a callback that the rest of the system is waiting on, the system might
    run very slowly or (in theory) even hang.

    This commit avoids this problem by having rcu_needs_cpu() give
    tick_nohz_stop_sched_tick() an estimate of when RCU will need the CPU
    to wake back up, which tick_nohz_stop_sched_tick() takes into account
    when programming the CPU's wakeup time.  An alternative approach is
    for rcu_prepare_for_idle() to use hrtimers instead of normal timers,
    but timers are much more efficient than are hrtimers for frequently
    and repeatedly posting and cancelling a given timer, which is exactly
    what RCU_FAST_NO_HZ does.

    Reported-by: Pascal Chapperon <pascal.chapperon@wanadoo.fr>
    Reported-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Paul E. McKenney <paul.mckenney@linaro.org>
    Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    Tested-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Tested-by: Pascal Chapperon <pascal.chapperon@wanadoo.fr>

commit 5955f7eecd77d6b440db278b266cfecdb72ecd00
Author: Paul E. McKenney <paul.mckenney@linaro.org>
Date:   Wed May 9 12:07:05 2012 -0700

    rcu: Move RCU_FAST_NO_HZ per-CPU variables to rcu_dynticks structure

    The RCU_FAST_NO_HZ code relies on a number of per-CPU variables.
    This works, but is hidden from someone scanning the data structures
    in rcutree.h.  This commit therefore converts these per-CPU variables
    to fields in the per-CPU rcu_dynticks structures.

    Suggested-by: Peter Zijlstra <peterz@infradead.org>
    Signed-off-by: Paul E. McKenney <paul.mckenney@linaro.org>
    Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    Tested-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Tested-by: Pascal Chapperon <pascal.chapperon@wanadoo.fr>

commit fd4b352687fd8604d49c190c4c9ea9e369fd42d5
Author: Paul E. McKenney <paul.mckenney@linaro.org>
Date:   Sat May 5 19:10:35 2012 -0700

    rcu: Update RCU_FAST_NO_HZ tracing for lazy callbacks

    In the current code, a short dyntick-idle interval (where there is
    at least one non-lazy callback on the CPU) and a long dyntick-idle
    interval (where there are only lazy callbacks on the CPU) are traced
    identically, which can be less than helpful.  This commit therefore
    emits different event traces in these two cases.

    Signed-off-by: Paul E. McKenney <paul.mckenney@linaro.org>
    Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    Tested-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Tested-by: Pascal Chapperon <pascal.chapperon@wanadoo.fr>

commit 8f5af6f1f2d09fe5eac86a5dc1731a5917c1503a
Author: Paul E. McKenney <paul.mckenney@linaro.org>
Date:   Fri May 4 08:31:53 2012 -0700

    rcu: RCU_FAST_NO_HZ detection of callback adoption

    In the present implementations of CPU hotplug, the outgoing CPU is
    guaranteed to run its stop-machine process on the way out, which
    will guarantee that RCU_FAST_NO_HZ forces the CPU out of dyntick-idle
    mode.

    However, new versions of CPU hotplug might not work this way.  This
    commit therefore removes this design constraint by explicitly notifying
    CPUs when they adopt non-lazy RCU callbacks.

    Signed-off-by: Paul E. McKenney <paul.mckenney@linaro.org>
    Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    Tested-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Tested-by: Pascal Chapperon <pascal.chapperon@wanadoo.fr>

commit f2bf1f6f5f89d031245067512449fc889b2f4bb2
Author: Steven Rostedt <srostedt@redhat.com>
Date:   Wed Jun 6 19:50:40 2012 -0400

    tracing: Have tracing_off() actually turn tracing off

    A recent update to have tracing_on/off() only affect the ftrace ring
    buffers instead of all ring buffers had a cut and paste error.
    The tracing_off() did the exact same thing as tracing_on() and
    would not actually turn off tracing. Unfortunately, tracing_off()
    is more important to be working than tracing_on() as this is a key
    development tool, as it lets the developer turn off tracing as soon
    as a problem is discovered. It is also used by panic and oops code.

    This bug also breaks the 'echo func:traceoff > set_ftrace_filter'

    Cc: <stable@vger.kernel.org> # 3.4
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

commit 967db0ea65b0bf8507a7643ac8f296c4f2c0a834
Author: Salman Qazi <sqazi@google.com>
Date:   Wed Jun 6 18:51:35 2012 -0700

    cgroup: make sure that decisions in __css_put are atomic

    __css_put is using atomic_dec on the ref count, and then
    looking at the ref count to make decisions.  This is prone
    to races, as someone else may decrement ref count between
    our decrement and our decision.  Instead, we should base our
    decisions on the value that we decremented the ref count to.

    (This results in an actual race on Google's kernel which I
    haven't been able to reproduce on the upstream kernel.  Having
    said that, it's still incorrect by inspection).

    Signed-off-by: Salman Qazi <sqazi@google.com>
    Acked-by: Li Zefan <lizefan@huawei.com>
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Cc: stable@vger.kernel.org

commit ea80dadec7a06889562b478cf0b87afbe62b7ac8
Author: James Bottomley <JBottomley@Parallels.com>
Date:   Wed Jun 6 14:54:13 2012 +0900

    [SCSI] Fix sd_probe_domain config problem

    With CONFIG_BLK_DEV_SD = n and CONFIG_PM = n, you get this compile failure:

    (.text+0x4f6c77): undefined reference to `scsi_sd_probe_domain'

    This was introduced by

    commit a7a20d103994fd760766e6c9d494daa569cbfe06
    Author: Dan Williams <dan.j.williams@intel.com>
    Date:   Thu Mar 22 17:05:11 2012 -0700

        [SCSI] sd: limit the scope of the async probe domain

    And happens because scsi_sd_probe_domain is conditionally defined but
    unconditionally used.  Fix this by making the symbol unconditionally defined.

    Reported-by: Randy Dunlap <rdunlap@xenotime.net>
    Cc: Dan Williams <dan.j.williams@intel.com>
    Tested-by: Randy Dunlap <rdunlap@xenotime.net>
    Signed-off-by: James Bottomley <JBottomley@Parallels.com>

commit da2e852612967a53d17de930929574444a67fb52
Merge: 55432d2 4e924fe
Author: David S. Miller <davem@davemloft.net>
Date:   Wed Jun 6 13:18:40 2012 -0700

    Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

    John Linville says:
    ====================
    Amitkumar Karwar gives us a cfg80211 fix that changes some state
    tracking in order to avoid a WARNING.

    Arik Nemtsov provide a mac80211 fix for an RCU-related race.

    Avinash Patil shares a pair of mwifiex fixes, one which invalidates
    some stale configuration data before a channel change and another to
    restrict hidden SSID support to zero-length SSIDs only.

    Chun-Yeow Yeoh brings a mac80211 fix for a mesh problem triggered
    when combining multiple mesh networks into one.

    Felix Fietkau provides a mac80211 lockdep fix.

    Joe Perches fixes a couple of thinkos related to bitwise operations.

    Johannes Berg comes through with a flurry of fixes.  The iwlwifi ones
    address a problem Linus recently reported, and some of the fallout
    discovered while fixing it.  The mac80211 fix properly cleans-up
    remain-on-channel work on an interface that is stopped.  The others
    are clean-ups for regressions caused by stricter checking of possible
    virtual interfaces supported by wireless drivers.

    Meenakshi Venkataraman provides a mac80211 fix for an off-by-one error.

    Seth Forshee provides a fix to make the wireless adapters used in
    some Mac boxes work after being in S3 power saving state.

    Stanislaw Gruszka offers a copule of fixes, a fix for a mac80211
    scanning regression and an rt2x00 fix to avoid some lockdep spew.

    Last but not least, Vinicius Costa Gomes provides a bluetooth fix
    for a typo that "was preventing important features of Bluetooth
    from working".
    ====================

    Signed-off-by: David S. Miller <davem@davemloft.net>

commit f25efd851cc8c0f63d74334bc784a437f4df8ee4
Author: Steve Dickson <steved@redhat.com>
Date:   Wed Jun 6 14:12:07 2012 -0400

    NFS: Map minor mismatch error to protocol not support error.

    Sservers that only have NFSv4.1 support the
    NFS4ERR_MINOR_VERS_MISMATCH error is return on
    v4.0 mounts. Mapping that error to EPROTONOSUPPORT
    will cause the mount to back off to v3 instead of
    failing.

    Signed-off-by: Steve Dickson <steved@redhat.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit 4e924fec591ef75076eab95954d90411862d3a87
Merge: dd03cff 2d4524a
Author: John W. Linville <linville@tuxdriver.com>
Date:   Wed Jun 6 14:02:56 2012 -0400

    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem

commit 2d4524ac18a3965051f6279aff5e9b1d72ac9d7f
Merge: 463454b ddcd0f4
Author: John W. Linville <linville@tuxdriver.com>
Date:   Wed Jun 6 13:57:05 2012 -0400

    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth

commit 55432d2b543a4b6dfae54f5c432a566877a85d90
Author: Eric Dumazet <edumazet@google.com>
Date:   Tue Jun 5 03:00:18 2012 +0000

    inetpeer: fix a race in inetpeer_gc_worker()

    commit 5faa5df1fa2024 (inetpeer: Invalidate the inetpeer tree along with
    the routing cache) added a race :

    Before freeing an inetpeer, we must respect a RCU grace period, and make
    sure no user will attempt to increase refcnt.

    inetpeer_invalidate_tree() waits for a RCU grace period before inserting
    inetpeer tree into gc_list and waking the worker. At that time, no
    concurrent lookup can find a inetpeer in this tree.

    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Cc: Steffen Klassert <steffen.klassert@secunet.com>
    Acked-by: Steffen Klassert <steffen.klassert@secunet.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit dd03cff23d694cfb0fdae80cb618e7ced05ea696
Author: Bjørn Mork <bjorn@mork.no>
Date:   Tue Jun 5 21:18:10 2012 +0000

    net: sierra_net: device IDs for Aircard 320U++

    Adding device IDs for Aircard 320U and two other devices
    found in the out-of-tree version of this driver.

    Cc: linux@sierrawireless.com
    Cc: Autif Khan <autif.mlist@gmail.com>
    Cc: Tom Cassidy <tomas.cassidy@gmail.com>
    Cc: stable@vger.kernel.org
    Signed-off-by: Bjørn Mork <bjorn@mork.no>
    Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 9a43a02648e8414b2a757437820aa928208fc42f
Author: Andrew Lunn <andrew@lunn.ch>
Date:   Wed Jun 6 06:40:43 2012 +0000

    mv643xx_eth: Fix compile error for architectures without clk.

    Commit 452503ebc (ARM: Orion: Eth: Add clk/clkdev support.) broke
    the building of the driver on architectures which don't have clk
    support. In particular PPC32 Pegasos which uses this driver.

    Add #ifdef around the clk API usage.

    Signed-off-by: Andrew Lunn <andrew@lunn.ch>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 027253c138a12b075e724f94b6cc43fd7071c14f
Author: Christian Dietrich <christian.dietrich@informatik.uni-erlangen.de>
Date:   Tue Jun 5 02:28:59 2012 +0000

    ide: icside.c: fix printk format string compile warning

    Use correct format string parameter for the peak datarate, and prevent
    uninitialized use of cycle_time.

    Signed-off-by: Christian Dietrich <christian.dietrich@informatik.uni-erlangen.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 32a527add871a51b3c06177849d18bf71e33b320
Author: Christian Dietrich <christian.dietrich@informatik.uni-erlangen.de>
Date:   Tue Jun 5 02:23:20 2012 +0000

    ide: icside.c: Fix compile with CONFIG_BLK_DEV_IDEDMA_ICS=n

    The icside driver can be configured without DMA support, but it
    doesn't compile then, because DMA operations are referenced.

    drivers/ide/icside.c:523: error: 'icside_v6_port_ops' undeclared
    drivers/ide/icside.c:522: error: 'icside_dma_init' undeclared

    Signed-off-by: Christian Dietrich<christian.dietrich@informatik.uni-erlangen.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit ba27ec66ffeb78cbf9f85e168b32551a9aaf2a34
Author: Giuseppe CAVALLARO <peppe.cavallaro@st.com>
Date:   Mon Jun 4 19:22:57 2012 +0000

    stmmac: fix driver Kconfig when built as module

    This patches fixes the driver when built as dynamic module.
    In fact, the platform part cannot be built and the probe fails
    (thanks to Bob Liu that reported this bug).

    v2: as D. Miller suggested, it is not necessary to make the
    pci and the platform code mutually exclusive.
    Having both could also help, at built time ,to verify that
    all the code is validated and compiles fine.

    v3: removed wrong Reviewed-by from the patch

    Reported-by: Bob Liu <lliubbo@gmail.com>
    cc: Rayagond Kokatanur <rayagond@vayavyalabs.com>
    Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 3d2377144ca66c98fa220bda5f945590cf5cfdc0
Author: Giuseppe CAVALLARO <peppe.cavallaro@st.com>
Date:   Mon Jun 4 19:22:56 2012 +0000

    stmmac: update driver's doc

    Fixed the driver's documentation that was obsolete and didn't
    report new platform fields (recently added).

    Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit ff3dd78cb8055bcb3a10e526044d8b54a773c612
Author: Giuseppe CAVALLARO <peppe.cavallaro@st.com>
Date:   Mon Jun 4 19:22:55 2012 +0000

    stmmac: fix driver's doc when run kernel-doc script

    Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit a3e545e9ab26892641ecac7cee30ea4b4e87977e
Author: Marek Vasut <marex@denx.de>
Date:   Mon May 21 06:33:27 2012 +0200

    mmc: mxs-mmc: Move of_match_table out of CONFIG_PM

    Signed-off-by: Marek Vasut <marex@denx.de>
    Acked-by: Shawn Guo <shawn.guo@linaro.org>
    Signed-off-by: Chris Ball <cjb@laptop.org>

commit 81ec1daa118ec9a04c0a907883872ae2996372bd
Author: Heiko Stübner <heiko@sntech.de>
Date:   Sun Jun 3 15:29:55 2012 +0200

    mmc: sdhci-s3c: pass IRQF ONESHOT to request threaded irq

    Fix a boot regression in existing kernels causing:

    genirq: Threaded irq requested with handler=NULL and !ONESHOT for irq XXX

    caused by 1c6c6952 (genirq: Reject bogus threaded irq requests).

    Signed-off-by: Heiko Stuebner <heiko@sntech.de>
    Signed-off-by: Chris Ball <cjb@laptop.org>

commit 85e727edb963459d13cdd9ce84c335d251a005a7
Author: Jaehoon Chung <jh80.chung@samsung.com>
Date:   Thu May 31 20:31:47 2012 +0900

    mmc: core: return an error on suspend if mmc_deselect_cards fails

    When mmc_host is not spi mode, mmc/sd is doing mmc_deselect_cards().
    mmc_deselect_cards could be returned error.
    If returned error, we can know something wrong when enter suspend.

    Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
    Signed-off-by: Chris Ball <cjb@laptop.org>

commit ebbe6f889f36d35f4d1757ba2ecc0af6150bf12b
Author: Tony Lindgren <tony@atomide.com>
Date:   Wed Jun 6 09:47:49 2012 -0400

    mmc: omap: Fix broken reg_shift initialization

    Commit fa550189 (mmc: core: Prevent eMMC VCC supply to be cut from late init)
    slightly affected timings for how things are done for the omap MMC driver
    causing the MMC cards not getting detected any longer.

    Turns out this was caused by buggy reg_shift initialization in the omap
    MMC driver that was happening after mmc_add_host() was being called.

    Fix this by initializing reg_shift before mmc_add_host() is called.

    Signed-off-by: Tony Lindgren <tony@atomide.com>
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Chris Ball <cjb@laptop.org>

commit 3caf41406dd67b412abae7df86cc2a09bef9621f
Author: Tony Lindgren <tony@atomide.com>
Date:   Wed Jun 6 09:45:50 2012 -0400

    mmc: omap: Fix NULL pointer dereference if mmc_omap_new_slot() fails

    Commit b01a4f1c (mmc: omap: convert to per instance workqueue) initializes
    the workqueue too late causing the following:

    Unable to handle kernel NULL pointer dereference at virtual address 00000000
    pgd = c0004000
    [00000000] *pgd=00000000
    Internal error: Oops: 5 [#1] SMP ARM
    Modules linked in:
    CPU: 0    Not tainted  (3.4.0-08218-gb48b2c3 #158)
    PC is at __queue_work+0x8/0x46c
    LR is at queue_work_on+0x38/0x40
    pc : [<c005bb4c>]    lr : [<c005c00c>]    psr: 60000193
    sp : c0691e1c  ip : 00000000  fp : c07374ac
    r10: c7aae400  r9 : c0395700  r8 : 00000100
    r7 : c0691e70  r6 : 00000000  r5 : 00000000  r4 : c7aae440
    r3 : 00000001  r2 : c7aae440  r1 : 00000000  r0 : 00000000
    Flags: nZCv  IRQs off  FIQs on  Mode SVC_32  ISA ARM  Segment kernel
    Control: 00c5387d  Table: 80004000  DAC: 00000017
    Process swapper/0 (pid: 0, stack limit = 0xc06902f8)
    Stack: (0xc0691e1c to 0xc0692000)

    Fix this by initializing the workqueue before mmc_omap_remove_slot()
    get called. Tested on n770, looks like n800 at least still has some
    other issue with MMC.

    Signed-off-by: Tony Lindgren <tony@atomide.com>
    Signed-off-by: Chris Ball <cjb@laptop.org>

commit 4f837791d90bca76384b665eb2649feab169cc13
Author: Tony Lindgren <tony@atomide.com>
Date:   Wed Jun 6 09:44:09 2012 -0400

    mmc: omap: Fix a section warning regression

    Commit b6e0703b (mmc: omap: make it behave well as a module) made some
    __devinit changes but missed one function causing a section warning:

    WARNING: vmlinux.o(.devinit.text+0x8604): Section mismatch in reference
    from the function mmc_omap_probe)

    The function __devinit mmc_omap_probe() references a function
    __init mmc_omap_new_slot().

    Signed-off-by: Tony Lindgren <tony@atomide.com>
    Acked-by: Felipe Balbi <balbi@ti.com>
    Signed-off-by: Chris Ball <cjb@laptop.org>

commit e419990b5e811027b1552cbc5b76a6cc180f7f48
Author: Seungwon Jeon <tgih.jun@samsung.com>
Date:   Tue May 22 13:01:21 2012 +0900

    mmc: dw_mmc: correct the calculation for CLKDIV

    In case of "host->bus_hz < slot->clock", divider value is
    miscalculated. And clock divider register value is multiple of 2. If
    calculated divider value is odd number, result can be over-clocking.

    Signed-off-by: Seungwon Jeon <tgih.jun@samsung.com>
    Acked-by: Will Newton <will.newton@gmail.com>
    Signed-off-by: Chris Ball <cjb@laptop.org>

commit fda5f736864c46324dbc50246ef1ca0e84ebf4ae
Author: Seungwon Jeon <tgih.jun@samsung.com>
Date:   Tue May 22 13:01:13 2012 +0900

    mmc: dw_mmc: fix incorrect setting of host->data of NULL

    Setting host->data to NULL is incorrect sequence in
    dw_mci_command_complete. This early setting makes the skip of
    dma_unmap_sg in dw_mci_dma_cleanup.

    Signed-off-by: Seungwon Jeon <tgih.jun@samsung.com>
    Acked-by: Will Newton <will.newton@gmail.com>
    Signed-off-by: Chris Ball <cjb@laptop.org>

commit 141a712a4eb09639dd4973a7c5e6999e3b8ae04a
Author: Seungwon Jeon <tgih.jun@samsung.com>
Date:   Tue May 22 13:01:03 2012 +0900

    mmc: dw_mmc: fix the IDMAC sw reset

    IDMAC may not be cleaned in driver probe if it has been already used in
    boot time. So IDMAC needs sw reset newly. And DMA interface reset
    precedes the internal DMAC reset. Additionally SDMMC_IDMAC_SWRESET is
    replaced with magic code.

    Signed-off-by: Seungwon Jeon <tgih.jun@samsung.com>
    Acked-by: Will Newton <will.newton@gmail.com>
    Signed-off-by: Chris Ball <cjb@laptop.org>

commit eed6c63cefaf935e6fb28c4dd9977a280ae544a8
Author: Seungwon Jeon <tgih.jun@samsung.com>
Date:   Sun May 20 13:27:21 2012 +0900

    mmc: dw_mmc: fix the transmission handling in IDMAC

    DTO interrupt can be later than transmit interrupt(IDMAC) in case of
    write. Current handling of IDMAC interrupt sets EVENT_DATA_COMPLETE as
    well as EVENT_XFER_COMPLETE regardless of DTO rising. This makes the
    current request finish in tasklet and permits the next request even
    though current data transfer is still in progress. As a result, sequence
    is broken and lock-up happens. Setting EVENT_DATA_COMPLETE is not proper
    after IDMAC interrupt. It should be taken after DTO interrupt is
    generated.

    Reported-by: Dmitry Shmidt <dimitrysh@android.com>
    Signed-off-by: Seungwon Jeon <tgih.jun@samsung.com>
    Signed-off-by: Hyeonsu Kim <hyeonsu.kim@samsung.com>
    Acked-by: Will Newton <will.newton@imgtec.com>
    Signed-off-by: Chris Ball <cjb@laptop.org>

commit d8ce7263e1bc3b6b2b906fec0c5037bc27d21d6a
Author: Geert Uytterhoeven <geert@linux-m68k.org>
Date:   Tue May 29 23:30:08 2012 +0200

    m68k: Use generic strncpy_from_user(), strlen_user(), and strnlen_user()

    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Acked-by: Greg Ungerer <gerg@uclinux.org>

commit 2a0fe914a38745f5b03534c4e4f4056cbd6978b8
Author: Yong Ding <yongd@marvell.com>
Date:   Tue May 15 13:09:43 2012 +0800

    mmc: sdio: fix setting card data bus width as 4-bit

    SDIO_CCCR_IF[1:0] in SDIO card is used for card data bus width
    setting as below:

         00b: 1-bit bus
         01b: Reserved
         10b: 4-bit bus
         11b: 8-bit bus (only for embedded SDIO)

    And sdio_enable_wide is for setting data bus width as 4-bit.
    But currently, it first reads the register, second OR' 1b with
    SDIO_CCCR_IF[1], and then writes it back.

    As we can see, this is based on such assumption that the
    SDIO_CCCR_IF[0] is always 0. Apparently, this is not right.

    Signed-off-by: Yong Ding <yongd@marvell.com>
    Acked-by: Philip Rakity <prakity@marvell.com>
    Signed-off-by: Chris Ball <cjb@laptop.org>

commit 693e5e2025278d90e1427f037e5ec8ea1ec7d5c4
Author: Nicolas Ferre <nicolas.ferre@atmel.com>
Date:   Wed Jun 6 12:19:44 2012 +0200

    mmc: atmel-mci: fix burst/chunk size modification

    The use of DMA slave config operation requires that the burst size
    (aka chunk size) is specified through this interface.
    Modify atmel-mci slave driver to use this specification on its side.

    Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
    Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
    Signed-off-by: Chris Ball <cjb@laptop.org>

commit b87cc1b5d3a96ef9f1b3a4f8ce7aaff18e96c994
Author: Ludovic Desroches <ludovic.desroches@atmel.com>
Date:   Wed May 23 15:52:15 2012 +0200

    mmc: atmel-mci: fix data timeout issue

    The data timeout timer was configured after mmc_add_host call. So, with bad
    timings, it was possible to have a mmc request causing mod_timer call on a
    non setup timer.

    Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
    Signed-off-by: Chris Ball <cjb@laptop.org>

commit 09eeff52bf20d485bcafc441f01c142c59c3da16
Author: Chris Ball <cjb@laptop.org>
Date:   Fri Jun 1 10:39:45 2012 -0400

    mmc: sdhci: Use DBG() instead of pr_warning() on large timeout

    3bdc9ba892d6 ("mmc: use really long write timeout to deal with crappy
    cards") in 3.4 increased the write timeout that the core sends to host
    drivers to 3 seconds.  This makes sdhci's "requested timeout too large"
    warning trigger on every write; so, change this pr_warning() to a DBG().

    Reported-by: Adrian Hunter <adrian.hunter@intel.com>
    Signed-off-by: Chris Ball <cjb@laptop.org>

commit 8a173b1476d126674104c7c5c6cef0bcd824b001
Author: Christian Borntraeger <borntraeger@de.ibm.com>
Date:   Tue May 29 11:18:44 2012 +0200

    spinlock: Indicate that a lockup is only suspected

    On an over-committed KVM system we got a:

      "BUG: spinlock lockup on CPU#2, swapper/2/0"

    message on the heavily contended virtio blk spinlock.

    While we might want to reconsider the locking of virtio-blk
    (lock is held while switching to the host) this patch tries to
    make the message clearer: the lockup is only suspected.

    Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
    Cc: Rusty Russell <rusty@rustcorp.com.au>
    Cc: Michael S. Tsirkin <mst@redhat.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Link: http://lkml.kernel.org/r/1338283124-7063-1-git-send-email-borntraeger@de.ibm.com
    Signed-off-by: Ingo Molnar <mingo@kernel.org>

commit c7f5f4ab10ce4e05b9f8877f1fd112faba71f175
Merge: eea5b55 62be73e
Author: Ingo Molnar <mingo@kernel.org>
Date:   Wed Jun 6 11:12:55 2012 +0200

    Merge branch 'core/debug' into core/urgent

    Merge two debugging patchlets that were waiting for
    preparatory commits to hit upstream.

    Signed-off-by: Ingo Molnar <mingo@kernel.org>

commit febe9e02d63ed8a42e7e9c75ea16117821f90f07
Author: Tony Lindgren <tony@atomide.com>
Date:   Wed Jun 6 01:42:20 2012 -0700

    ARM: OMAP2+: Fix compile for CONFIG_TIDSPBRIDGE platform init code

    Commit 7f28427b (ARM: OMAP2+: Move omap_dsp_reserve_sdram_memblock() to mach-omap2)
    moved DSP platform init code, but failed to include memblock.h causing:

    arch/arm/mach-omap2/dsp.c: In function 'omap_dsp_reserve_sdram_memblock':
    arch/arm/mach-omap2/dsp.c:58: error: implicit declaration of function 'arm_memblock_steal'

    Reported-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Signed-off-by: Tony Lindgren <tony@atomide.com>

commit 00d6bfaf20e723e3f4c9aa6bc0fb6636785a0701
Author: Tony Lindgren <tony@atomide.com>
Date:   Wed Jun 6 01:42:20 2012 -0700

    ARM: OMAP3: Fix omap3_l3_block_irq warning when CONFIG_BUG is not set

    Otherwise we will get:

    arch/arm/mach-omap2/omap_l3_smx.c: In function ‘omap3_l3_block_irq’:
    arch/arm/mach-omap2/omap_l3_smx.c:156: warning: unused variable ‘address’
    arch/arm/mach-omap2/omap_l3_smx.c:155: warning: unused variable ‘multi’
    arch/arm/mach-omap2/omap_l3_smx.c:154: warning: unused variable ‘initid’
    arch/arm/mach-omap2/omap_l3_smx.c:153: warning: unused variable ‘code’
    arch/arm/mach-omap2/omap_l3_smx.c: At top level:
    arch/arm/mach-omap2/omap_l3_smx.c:68: warning: ‘omap3_l3_code_string’ defined but not used
    arch/arm/mach-omap2/omap_l3_smx.c:90: warning: ‘omap3_l3_initiator_string’ defined but not used

    Fix it by always showing the L3 error.

    Signed-off-by: Tony Lindgren <tony@atomide.com>

commit f968cabcb1cd0c253fa25850970e5376f9eef065
Author: Tony Lindgren <tony@atomide.com>
Date:   Wed Jun 6 01:42:20 2012 -0700

    ARM: OMAP: Fix MMC_OMAP build when only MMC_OMAP_HS is selected

    If CONFIG_MMC_OMAP is not set and CONFIG_MMC_OMAP_HS is set,
    we can get error: redefinition of `omap242x_init_mmc' error.

    Fix it by removing MMC_OMAP_HS from MMC_OMAP ifdefs as they do
    not depend on each other.

    While at it, also prettify the formatting a bit.

    Signed-off-by: Tony Lindgren <tony@atomide.com>

commit 43e95f11ac0b06fec2c58431b092a60934d730e2
Author: John Fastabend <john.r.fastabend@intel.com>
Date:   Tue May 15 06:12:17 2012 +0000

    ixgbe: IXGBE_RXD_STAT_VP set even with Rx stripping enabled

    The hardware bit IXGBE_RXD_STAT_VP appears to be set even when Rx
    stripping is disabled. This results in passing frames up the stack
    which do not have the 802.1Q tag stripped but have the tci bits
    set as if it was.

    Working around this with a check for the feature flag bit. I
    would welcome any better ideas or a pointer to exactly which
    bits in the hardware register need to be cleared to get the
    IXGBE_RXD_STAT_VP bit to be set per data sheet.

    Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
    Acked-by: Alexander Duyck <alexander.h.duyck@intel.com>
    Tested-by: Marcus Dennis <marcusx.e.dennis@intel.com>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

commit 146d4cc98d660cbdeae52ae35a4d038d0dab6da5
Author: John Fastabend <john.r.fastabend@intel.com>
Date:   Tue May 15 05:59:26 2012 +0000

    ixgbe: fix_features rxvlan is independent of DCB and needs to be set

    DCB can be used independent of if RX VLAN stripping is enabled
    or disabled so remove erroneous check.

    Also enable or disable VLAN stripping when features are applied so
    hardware and feature flags are in sync.

    CC: Alexander Duyck <alexander.h.duyck@intel.com>
    Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
    Tested-by: Marcus Dennis <marcusx.e.dennis@intel.com>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

commit 470a54207ccf7045a59df727573bd9d148988582
Author: Bruce Allan <bruce.w.allan@intel.com>
Date:   Sat May 26 06:08:48 2012 +0000

    e1000e: test for valid check_reset_block function pointer

    commit 44abd5c12767a8c567dc4e45fd9aec3b13ca85e0 introduced NULL pointer
    dereferences when attempting to access the check_reset_block function
    pointer on 8257x and 80003es2lan non-copper devices.

    This fix should be applied back through 3.4.

    Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
    Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

commit a2c658505bf5c75516ee0a79287223e86a2474af
Author: nagalakshmi.nandigama@lsi.com <nagalakshmi.nandigama@lsi.com>
Date:   Tue Apr 17 11:25:04 2012 +0530

    [SCSI] mpt2sas: Fix unsafe using smp_processor_id() in preemptible

    When CONFIG_DEBUG_PREEMPT is enabled, bug is observed in the smp_processor_id().
    This is because smp_processor_id() is not called in preempt safe condition.

    To fix this issue, use raw_smp_processor_id instead of smp_processor_id.

    Signed-off-by: Nagalakshmi Nandigama <nagalakshmi.nandigama@lsi.com>
    CC: stable@vger.kernel.org
    Signed-off-by: James Bottomley <JBottomley@Parallels.com>

commit 9bce008bae8b57bc7b007bcc2071d1247a527120
Author: Trond Myklebust <Trond.Myklebust@netapp.com>
Date:   Tue Jun 5 18:32:03 2012 -0400

    NFS: Fix a commit bug

    The new commit code fails to copy the verifier into the wb_verf field
    of _all_ the nfs_page structures; it only copies it into the first entry.
    The consequence is that most requests end up failing to match in
    nfs_commit_release.

    Fix is to copy the verifier into the req->wb_verf field in
    nfs_write_completion.

    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Cc: Fred Isaman <iisaman@netapp.com>

commit 5c888aa43ee9872efe2a09e8c9f03db84f60dd28
Author: Emil Goode <emilgoode@gmail.com>
Date:   Tue May 29 18:57:00 2012 +0200

    video: bfin_adv7393fb: Convert to kstrtouint_from_user

    This patch removes a call to the deprecated simple_strtoul function
    and simplifies the code by replacing two function calls with one
    call to kstrtouint_from_user.

    -Simplify the adv7393_write_proc function by replacing the
     simple_strtoul and copy_from_user calls with one call
     to kstrtouint_from_user.

    -Change the count parameter from unsigned long to size_t as
     this is the type that the kstrtouint_from_user function expects.
     (size_t is what will be passed to the adv7393_write_proc function
     by the proc write handler function proc_file_write anyway)

    Signed-off-by: Emil Goode <emilgoode@gmail.com>
    Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>

commit 70b6eaee405d657927244067ab2a466425745a0e
Merge: c895305 c3a21fc
Author: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Date:   Tue Jun 5 21:46:54 2012 +0000

    Merge tag 'omapdss-for-3.5-rc2' of git://gitorious.org/linux-omap-dss2/linux into fbdev-for-linus

    Small fixes for omapdss driver. Most importantly, fixes a build problem when
    debugfs or omapdss debug support is turned off, and fixes a suspend related
    crash.

commit f2d0ed7134a15aff53aa9b09489a39bc69b1b211
Merge: f8f5701 08f75bf
Author: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date:   Wed Jun 6 05:05:13 2012 +0900

    Merge tag 'fixes-for-v3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus

    usb: fixes for v3.5-rc1

    Here you have the first set of fixes for our v3.5-rc cycle.

    It contains a set regression fixes caused by Ido's
    usb_endpoint_descriptor usage rework and a build
    fix to the musb driver caused by recent changes to
    the DaVinci tree.

    Nothing really major, the fixes are quite obvious.

commit cdf66442fab82916fe38f928b4f91815195a294c
Author: Bryan Schumaker <bjschuma@netapp.com>
Date:   Tue Jun 5 14:59:54 2012 -0400

    NFS4: Set parsed mount data version to 4

    This patch only affects mounting through "-t nfs4" since it doesn't set
    up an nfs version to use in the mount data.  The nfs client was trying
    to mount using NFS v0, causing either a BUG() or a protocol not
    supported message.

    Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit 463454b5dbd8dbab6e2fc6c557329e5b811b9c32
Author: Johannes Berg <johannes.berg@intel.com>
Date:   Tue Jun 5 12:16:50 2012 +0200

    cfg80211: fix interface combinations check

    If a given interface combination doesn't contain
    a required interface type then we missed checking
    that and erroneously allowed it even though iface
    type wasn't there at all. Add a check that makes
    sure that all interface types are accounted for.

    Cc: stable@kernel.org
    Reported-by: Mohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 0e1fa7ef25004b9c1a14147bce61c15c2f1c6744
Author: Johannes Berg <johannes.berg@intel.com>
Date:   Tue Jun 5 09:38:35 2012 +0200

    iwlwifi: unregister LEDs if mac80211 registration fails

    Otherwise the LEDs stick around and cause issues the
    next time around since they're still there but not
    really hooked up.

    Cc: stable@kernel.org
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit f69a23b795d6ee3673583146ed7efcbaaa5add18
Author: Johannes Berg <johannes.berg@intel.com>
Date:   Tue Jun 5 19:56:06 2012 +0200

    iwlwifi: fix double free/complete in firmware loading

    Linus reported that due to mac80211 failing to register
    the device (due to WoWLAN) his machine crashed etc. as
    we double-freed the vmalloc() firmware area. His patch
    to fix it was very similar to this one but I noticed
    that there's another bug in the area: we complete the
    completion before starting, so since we're running in
    a work struct context stop() could be called while in
    the middle of start() which will almost certainly lead
    to issues.

    Make a modification similar to his to avoid the double-
    free but also move the completion to another spot so it
    is only done after start() either finished or failed so
    that stop() can have a consistent state.

    Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit bda197f5d71d56b95a84c0ccbcb8ce2691106cca
Author: Trond Myklebust <Trond.Myklebust@netapp.com>
Date:   Tue Jun 5 10:22:14 2012 -0400

    NFSv4.1: Ensure we clear session state flags after a session creation

    Both nfs4_reset_session and nfs41_init_clientid need to clear all the
    session related state flags on success.

    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit c3a21fc79b6bc097d8b0e47498903a649a111127
Author: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date:   Tue Jun 5 13:17:32 2012 +0300

    OMAPDSS: fix registration of DPI and SDI devices

    The omapdss arch initialization code registers all the output devices as
    omap_devices. However, DPI and SDI are not proper omap_devices, as they
    do not have any corresponding HWMOD. This leads to crashes or problems
    when the platform code tries to use omap_device functions for DPI and
    SDI devices.

    One such crash was reported by John Stultz <johnstul@us.ibm.com>:

    [   18.756835] Unable to handle kernel NULL pointer dereference at
    virtual addr8
    [   18.765319] pgd = ea6b8000
    [   18.768188] [00000018] *pgd=aa942831, *pte=00000000, *ppte=00000000
    [   18.774749] Internal error: Oops: 17 [#1] SMP ARM
    [   18.779663] Modules linked in:
    [   18.782836] CPU: 0    Not tainted  (3.5.0-rc1-dirty #456)
    [   18.788482] PC is at _od_resume_noirq+0x1c/0x78
    [   18.793212] LR is at _od_resume_noirq+0x6c/0x78
    [   18.797943] pc : [<c00307ec>]    lr : [<c003083c>]    psr: 20000113
    [   18.797943] sp : ec3abe80  ip : ec3abdb8  fp : 00000006
    [   18.809936] r10: ec1148b8  r9 : c08a48f0  r8 : c00307d0
    [   18.815368] r7 : 00000000  r6 : 00000000  r5 : ec114800  r4 :
    ec114808
    [   18.822174] r3 : 00000000  r2 : 00000000  r1 : ec154fe8  r0 :
    00000006
    [   18.829010] Flags: nzCv  IRQs on  FIQs on  Mode SVC_32  ISA ARM
    Segment user
    [   18.836456] Control: 10c5387d  Table: aa6b804a  DAC: 00000015
    [   18.842437] Process sh (pid: 1139, stack limit = 0xec3aa2f0)
    [   18.848358] Stack: (0xec3abe80 to 0xec3ac000)

    DPI and SDI can be plain platform_devices. This patch changes the
    registration from omap_device_register() to platform_device_add().

    Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
    Reported-by: John Stultz <johnstul@us.ibm.com>
    Tested-by: Jean Pihet <jean.pihet@newoldbits.com>

commit 08106ac7c892cad769c5026cb9dd877a39aed603
Author: Trond Myklebust <Trond.Myklebust@netapp.com>
Date:   Tue Jun 5 10:08:24 2012 -0400

    NFSv4.1: Convert a trivial printk into a dprintk

    There is no need to bug the user about the server returning an error
    on destroy_session. The error will be handled by the state manager,
    without any need for further input from anyone else.
    So convert that printk into a debugging dprintk.

    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit 029c53473727f21c1dd73237e8d630a6f007a2fe
Author: Trond Myklebust <Trond.Myklebust@netapp.com>
Date:   Tue Jun 5 09:35:44 2012 -0400

    NFSv4: Fix up decode_attr_mdsthreshold

    Fix an incorrect use of 'likely()'. The FATTR4_WORD2_MDSTHRESHOLD
    bit is only expected in NFSv4.1 OPEN calls, and so is actually
    rather _unlikely_.

    decode_attr_mdsthreshold needs to clear FATTR4_WORD2_MDSTHRESHOLD
    from the attribute bitmap after it has decoded the data.

    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Cc: Andy Adamson <andros@netapp.com>

commit 1549210fcc17e9ae20c09ac8cd4c48a8dfd431bd
Author: Trond Myklebust <Trond.Myklebust@netapp.com>
Date:   Tue Jun 5 09:16:47 2012 -0400

    NFSv4: Fix an Oops in the open recovery code

    The open recovery code does not need to request a new value for the
    mdsthreshold, and so does not allocate a struct nfs4_threshold.
    The problem is that encode_getfattr_open() will still request an
    mdsthreshold, and so we end up Oopsing in decode_attr_mdsthreshold.

    This patch fixes encode_getfattr_open so that it doesn't request an
    mdsthreshold when the caller isn't asking for one. It also fixes
    decode_attr_mdsthreshold so that it errors if the server returns
    an mdsthreshold that we didn't ask for (instead of Oopsing).

    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Cc: Andy Adamson <andros@netapp.com>

commit bfd37bb5f681961e255fd2f346c20fdae2ef3f27
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date:   Tue Jun 5 12:31:32 2012 +0100

    ASoC: wm8994: Apply volume updates with clocks enabled

    Volume updates may not be acted upon if there is no clock applied when
    the volume update is written. Ensure this doesn't happen by writing out
    registers with volume updates after we enable each of the clocks.

    There are more registers updated than before as previously we were
    relying on wm_hubs to set those for controls it manages.

    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Cc: stable@vger.kernel.org

commit c8fdc1b56611faa7b38eab6b99da5e20113661ff
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date:   Tue Jun 5 12:25:19 2012 +0100

    ASoC: wm8994: Ensure all AIFnCLK events are run from the _late variants

    Ensure that all the actions get taken at appropriate times by calling the
    _PRE and _POST events for the aifNclk_ev functions explicitly.

    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Cc: stable@vger.kernel.org

commit 91930652a23de0873a157aa1d9962cb878d64451
Author: Govindraj.R <govindraj.raja@ti.com>
Date:   Tue Jun 5 04:04:11 2012 -0700

    OMAP2+: UART: Add mechanism to probe uart pins and configure rx wakeup

    The commit (bce492c0  ARM: OMAP2+: UART: Fix incorrect population of
    default uart pads) removed default uart pads that where getting populated
    and which was making rx pin wakeup capable. If uart pads were used in
    different mode by any other module then it would fail since the default
    pads took over all the uart pins forcefully. With removal of default pads
    the rx_pad wakeup for console uart while waking up from off mode is broken.

    Utilise the mux api available to probe the availability of mux pins
    in uart mode and probe for availability of uart pin in mux mode0
    if uart is available as uart pin itself then configure rx pin
    as wakeup capable.

    This patch itself doesn't cater to all boards. Boards using uart rx wakeup
    mechanism should ensure the usage of omap_serial_init_port by configuring
    required uart ports and pass necessary mux data, till then this probing of
    uart pins can cater to enabling of rx pad wakeup to most of the boards.

    This patch can also throw some boot warning from _omap_mux_get_by_name
    if pin is requested for availability is not present while dynamically probing
    the uart pins availability such boot warnings can be addressed only when board
    files are patched with omap_serial_init_port calls passing the right pads
    needed for a given port.

    Discussion Threads for reference:
    http://www.spinics.net/lists/linux-omap/msg69859.html
    http://www.spinics.net/lists/linux-omap/msg68659.html

    Cc: Felipe Balbi <balbi@ti.com>
    Cc: Kevin Hilman <khilman@ti.com>
    Cc: Russ Dill <russ.dill@gmail.com>
    Cc: Paul Walmsley <paul@pwsan.com>
    Cc: Ameya Palande <ameya.palande@ti.com>
    Signed-off-by: Govindraj.R <govindraj.raja@ti.com>
    [tony@atomide.com: updated to fix compile when CONFIG_OMAP_MUX is not set]
    Signed-off-by: Tony Lindgren <tony@atomide.com>

commit 10bd21c0547ba2834374ccdddbc6a984eeed432c
Author: Haojian Zhuang <haojian.zhuang@gmail.com>
Date:   Tue Jun 5 17:42:23 2012 +0800

    ARM: mmp: fix missing cascade_irq in irq handler

    While supporting board in non-DT mode, icu_data[i]->cascade_irq isn't
    assigned with correct value.

    Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>

commit 51ce29196dee3084387aa4448d75edc282a91685
Author: Haojian Zhuang <haojian.zhuang@gmail.com>
Date:   Tue Jun 5 16:42:38 2012 +0800

    ARM: dts: update memory size on brownstone

    The memory size on brownstone should be 128MB, not 64MB.

    Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>

commit 18847b42f8d157201550015296a222a9009a04da
Author: Javier Martin <javier.martin@vista-silicon.com>
Date:   Fri Jun 1 09:45:33 2012 +0200

    ARM i.MX27 Visstrim M10: fix gpio handling.

    Some GPIOs in Visstrim M10 are used without being registered.
    This leads to USB and video malfunctions. This patch registers
    those GPIOs to solve the issue.

    Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
    Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

commit e407fd655bf9b40c38cba29aa7d38149989798bb
Author: Lars-Peter Clausen <lars@metafoo.de>
Date:   Mon Jun 4 10:41:42 2012 +0200

    iio: Fix potential use after free

    There is no guarantee that the last reference to the iio device has already been
    dropped when iio_device_free is called. This means that we can up calling
    iio_dev_release after iio_device_free which will lead to a use after free. As
    the general rule the struct containing the device should always be freed in the
    release callback.

    This is what this patch does, it moves freeing the iio device struct as well as
    releasing the idr reference to the release callback. To ensure that the device
    is not freed before calling iio_device_free the device_unregister call in
    iio_device_unregister is broken apart. iio_device_unregister will now only call
    device_del to remove the device from the system and iio_device_free will call
    put_device to drop the reference we obtained in iio_devce_alloc.

    We also have to take care that calling iio_device_free without having called
    iio_device_register still works (i.e. this can happen if something failed during
    device initialization). For this to work properly two minor changes were
    necessary: channel_attr_list needs to be initialized in iio_device_alloc and we
    have to check whether the chrdev has been registered before releasing it in
    iio_device_release.

    This change also brings iio_device_unregister and iio_device_free more in sync
    with iio_device_register and iio_device_alloc which call device_add and
    device_initialize respectively.

    Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
    Acked-by: Jonathan Cameron <jic23@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 04723de09d034c1f1f871787ebbc6cc2e474dd2f
Author: Johan Hovold <jhovold@gmail.com>
Date:   Tue May 22 12:30:02 2012 +0200

    staging:iio: remove num_interrupt_lines from documentation

    Commit 5aa9618896e0ba49 ("staging:iio: remove broken support for
    multiple event interfaces.") removed the num_interrupt_lines field from
    struct iio_info but the documentation was never updated.

    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    Acked-by: Jonathan Cameron <jic23@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit d802bf6f098c134181397496cac8dbc80f441a75
Author: Michael Hennerich <michael.hennerich@analog.com>
Date:   Mon May 21 14:30:31 2012 +0200

    iio: documentation: Add out_altvoltage and friends

    Continuous frequency/clock generating devices, such as DDSs or PLLs
    should use out_altvoltage.

    Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
    Acked-by: Jonathan Cameron <jic23@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit ddcd0f41471a1e0394c8840a119ec3986a78462c
Author: Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
Date:   Thu May 31 22:53:39 2012 -0300

    Bluetooth: Fix checking the wrong flag when accepting a socket

    Most probably a typo, the check should have been for BT_SK_DEFER_SETUP
    instead of BT_DEFER_SETUP (which right now only represents a socket
    option).

    Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
    Acked-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
    Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

commit fcb6ff5e2cb83e1de10631f6621f45ca3401bf61
Author: Johannes Berg <johannes.berg@intel.com>
Date:   Mon Jun 4 13:43:11 2012 +0200

    iwlwifi: disable WoWLAN if !CONFIG_PM_SLEEP

    If CONFIG_PM_SLEEP is disabled, then iwlwifi doesn't
    support suspend/resume handlers and thus mac80211
    (correctly) refuses advertising WoWLAN. Disable
    WoWLAN in the driver in this case.

    Cc: stable@kernel.org
    Reported-by: Sebastian Kemper <sebastian_ml@gmx.net>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 794454ce72a298de6f4536ade597bdcc7dcde7c7
Author: Arik Nemtsov <arik@wizery.com>
Date:   Sun Jun 3 23:32:32 2012 +0300

    mac80211: fix non RCU-safe sta_list manipulation

    sta_info_cleanup locks the sta_list using rcu_read_lock however
    the delete operation isn't rcu safe. A race between sta_info_cleanup
    timer being called and a STA being removed can occur which leads
    to a panic while traversing sta_list. Fix this by switching to the
    RCU-safe versions.

    Cc: stable@vger.kernel.org
    Reported-by: Eyal Shapira <eyal@wizery.com>
    Signed-off-by: Arik Nemtsov <arik@wizery.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 69aaedd3cfd23b2c732e3cf1227370a35f5c89d4
Author: Seth Forshee <seth.forshee@canonical.com>
Date:   Fri Jun 1 09:13:17 2012 -0500

    bcma: add ext PA workaround for BCM4331 and BCM43431

    MacBook Pro models with BCM4331 wireless have been found to have the ext
    PA lines disabled after resuming from S3 without external power attach.
    This causes them to be unable to transmit. Add a workaround to ensure
    that the ext PA lines are enabled on BCM4331. Also extend all handling
    of ext PA line muxing to BCM43431 as is done in the Broadcom SDK.

    BugLink: http://bugs.launchpad.net/bugs/925577
    Cc: Arend van Spriel <arend@broadcom.com>
    Cc: Hauke Mehrtens <hauke@hauke-m.de>
    Cc: stable@vger.kernel.org
    Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit e5851dac2c95af7159716832300b9f50c62c648e
Author: Stanislaw Gruszka <sgruszka@redhat.com>
Date:   Fri Jun 1 11:29:40 2012 +0200

    rt2x00: use atomic variable for seqno

    Remove spinlock as atomic_t can be used instead. Note we use only 16
    lower bits, upper bits are changed but we impilcilty cast to u16.

    This fix possible deadlock on IBSS mode reproted by lockdep:

    =================================
    [ INFO: inconsistent lock state ]
    3.4.0-wl+ #4 Not tainted
    ---------------------------------
    inconsistent {IN-SOFTIRQ-W} -> {SOFTIRQ-ON-W} usage.
    kworker/u:2/30374 [HC0[0]:SC0[0]:HE1:SE1] takes:
     (&(&intf->seqlock)->rlock){+.?...}, at: [<f9979a20>] rt2x00queue_create_tx_descriptor+0x380/0x490 [rt2x00lib]
    {IN-SOFTIRQ-W} state was registered at:
      [<c04978ab>] __lock_acquire+0x47b/0x1050
      [<c0498504>] lock_acquire+0x84/0xf0
      [<c0835733>] _raw_spin_lock+0x33/0x40
      [<f9979a20>] rt2x00queue_create_tx_descriptor+0x380/0x490 [rt2x00lib]
      [<f9979f2a>] rt2x00queue_write_tx_frame+0x1a/0x300 [rt2x00lib]
      [<f997834f>] rt2x00mac_tx+0x7f/0x380 [rt2x00lib]
      [<f98fe363>] __ieee80211_tx+0x1b3/0x300 [mac80211]
      [<f98ffdf5>] ieee80211_tx+0x105/0x130 [mac80211]
      [<f99000dd>] ieee80211_xmit+0xad/0x100 [mac80211]
      [<f9900519>] ieee80211_subif_start_xmit+0x2d9/0x930 [mac80211]
      [<c0782e87>] dev_hard_start_xmit+0x307/0x660
      [<c079bb71>] sch_direct_xmit+0xa1/0x1e0
      [<c0784bb3>] dev_queue_xmit+0x183/0x730
      [<c078c27a>] neigh_resolve_output+0xfa/0x1e0
      [<c07b436a>] ip_finish_output+0x24a/0x460
      [<c07b4897>] ip_output+0xb7/0x100
      [<c07b2d60>] ip_local_out+0x20/0x60
      [<c07e01ff>] igmpv3_sendpack+0x4f/0x60
      [<c07e108f>] igmp_ifc_timer_expire+0x29f/0x330
      [<c04520fc>] run_timer_softirq+0x15c/0x2f0
      [<c0449e3e>] __do_softirq+0xae/0x1e0
    irq event stamp: 18380437
    hardirqs last  enabled at (18380437): [<c0526027>] __slab_alloc.clone.3+0x67/0x5f0
    hardirqs last disabled at (18380436): [<c0525ff3>] __slab_alloc.clone.3+0x33/0x5f0
    softirqs last  enabled at (18377616): [<c0449eb3>] __do_softirq+0x123/0x1e0
    softirqs last disabled at (18377611): [<c041278d>] do_softirq+0x9d/0xe0

    other info that might help us debug this:
     Possible unsafe locking scenario:

           CPU0
           ----
      lock(&(&intf->seqlock)->rlock);
      <Interrupt>
        lock(&(&intf->seqlock)->rlock);

     *** DEADLOCK ***

    4 locks held by kworker/u:2/30374:
     #0:  (wiphy_name(local->hw.wiphy)){++++.+}, at: [<c045cf99>] process_one_work+0x109/0x3f0
     #1:  ((&sdata->work)){+.+.+.}, at: [<c045cf99>] process_one_work+0x109/0x3f0
     #2:  (&ifibss->mtx){+.+.+.}, at: [<f98f005b>] ieee80211_ibss_work+0x1b/0x470 [mac80211]
     #3:  (&intf->beacon_skb_mutex){+.+...}, at: [<f997a644>] rt2x00queue_update_beacon+0x24/0x50 [rt2x00lib]

    stack backtrace:
    Pid: 30374, comm: kworker/u:2 Not tainted 3.4.0-wl+ #4
    Call Trace:
     [<c04962a6>] print_usage_bug+0x1f6/0x220
     [<c0496a12>] mark_lock+0x2c2/0x300
     [<c0495ff0>] ? check_usage_forwards+0xc0/0xc0
     [<c04978ec>] __lock_acquire+0x4bc/0x1050
     [<c0527890>] ? __kmalloc_track_caller+0x1c0/0x1d0
     [<c0777fb6>] ? copy_skb_header+0x26/0x90
     [<c0498504>] lock_acquire+0x84/0xf0
     [<f9979a20>] ? rt2x00queue_create_tx_descriptor+0x380/0x490 [rt2x00lib]
     [<c0835733>] _raw_spin_lock+0x33/0x40
     [<f9979a20>] ? rt2x00queue_create_tx_descriptor+0x380/0x490 [rt2x00lib]
     [<f9979a20>] rt2x00queue_create_tx_descriptor+0x380/0x490 [rt2x00lib]
     [<f997a5cf>] rt2x00queue_update_beacon_locked+0x5f/0xb0 [rt2x00lib]
     [<f997a64d>] rt2x00queue_update_beacon+0x2d/0x50 [rt2x00lib]
     [<f9977e3a>] rt2x00mac_bss_info_changed+0x1ca/0x200 [rt2x00lib]
     [<f9977c70>] ? rt2x00mac_remove_interface+0x70/0x70 [rt2x00lib]
     [<f98e4dd0>] ieee80211_bss_info_change_notify+0xe0/0x1d0 [mac80211]
     [<f98ef7b8>] __ieee80211_sta_join_ibss+0x3b8/0x610 [mac80211]
     [<c0496ab4>] ? mark_held_locks+0x64/0xc0
     [<c0440012>] ? virt_efi_query_capsule_caps+0x12/0x50
     [<f98efb09>] ieee80211_sta_join_ibss+0xf9/0x140 [mac80211]
     [<f98f0456>] ieee80211_ibss_work+0x416/0x470 [mac80211]
     [<c0496d8b>] ? trace_hardirqs_on+0xb/0x10
     [<c077683b>] ? skb_dequeue+0x4b/0x70
     [<f98f207f>] ieee80211_iface_work+0x13f/0x230 [mac80211]
     [<c045cf99>] ? process_one_work+0x109/0x3f0
     [<c045d015>] process_one_work+0x185/0x3f0
     [<c045cf99>] ? process_one_work+0x109/0x3f0
     [<f98f1f40>] ? ieee80211_teardown_sdata+0xa0/0xa0 [mac80211]
     [<c045ed86>] worker_thread+0x116/0x270
     [<c045ec70>] ? manage_workers+0x1e0/0x1e0
     [<c0462f64>] kthread+0x84/0x90
     [<c0462ee0>] ? __init_kthread_worker+0x60/0x60
     [<c083d382>] kernel_thread_helper+0x6/0x10

    Cc: stable@vger.kernel.org
    Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
    Acked-by: Helmut Schaa <helmut.schaa@googlemail.com>
    Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit f304a993190965f48baa49792d5ab2849ae26bf9
Author: Joe Perches <joe@perches.com>
Date:   Wed May 30 13:25:56 2012 -0700

    brcmfmac: Fix likely misuse of | for &

    Using | with a constant is always true.
    Likely this should have be &.

    Signed-off-by: Joe Perches <joe@perches.com>
    Acked-by: Arend van Spriel <arend@broadcom.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 5204267d2fd5e98fc52b44fec01ad10352642b78
Author: Joe Perches <joe@perches.com>
Date:   Wed May 30 13:25:54 2012 -0700

    mac80211: Fix likely misuse of | for &

    Using | with a constant is always true.
    Likely this should have be &.

    cc: Ben Greear <greearb@candelatech.com>
    Signed-off-by: Joe Perches <joe@perches.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit d8c7aae64cd2db5eccc631c29fa978a24fb1feef
Author: Felix Fietkau <nbd@openwrt.org>
Date:   Wed May 30 15:32:24 2012 +0200

    mac80211: add missing rcu_read_lock/unlock in agg-rx session timer

    Fixes a lockdep warning:

    ===================================================
    [ INFO: suspicious rcu_dereference_check() usage. ]
    ---------------------------------------------------
    net/mac80211/agg-rx.c:148 invoked rcu_dereference_check() without protection!

    other info that might help us debug this:

    rcu_scheduler_active = 1, debug_locks = 1
    1 lock held by arecord/11226:
     #0:  (&tid_agg_rx->session_timer){+.-...}, at: [<ffffffff81066bb0>] call_timer_fn+0x0/0x360

    stack backtrace:
    Pid: 11226, comm: arecord Not tainted 3.1.0-kml #16
    Call Trace:
     <IRQ>  [<ffffffff81093454>] lockdep_rcu_dereference+0xa4/0xc0
     [<ffffffffa02778c9>] sta_rx_agg_session_timer_expired+0xc9/0x110 [mac80211]
     [<ffffffffa0277800>] ? ieee80211_process_addba_resp+0x220/0x220 [mac80211]
     [<ffffffff81066c3a>] call_timer_fn+0x8a/0x360
     [<ffffffff81066bb0>] ? init_timer_deferrable_key+0x30/0x30
     [<ffffffff81477bb0>] ? _raw_spin_unlock_irq+0x30/0x70
     [<ffffffff81067049>] run_timer_softirq+0x139/0x310
     [<ffffffff81091d5e>] ? put_lock_stats.isra.25+0xe/0x40
     [<ffffffff810922ac>] ? lock_release_holdtime.part.26+0xdc/0x160
     [<ffffffffa0277800>] ? ieee80211_process_addba_resp+0x220/0x220 [mac80211]
     [<ffffffff8105cb78>] __do_softirq+0xc8/0x3c0
     [<ffffffff8108f088>] ? tick_dev_program_event+0x48/0x110
     [<ffffffff8108f16f>] ? tick_program_event+0x1f/0x30
     [<ffffffff81153b15>] ? putname+0x35/0x50
     [<ffffffff8147a43c>] call_softirq+0x1c/0x30
     [<ffffffff81004c55>] do_softirq+0xa5/0xe0
     [<ffffffff8105d1ee>] irq_exit+0xae/0xe0
     [<ffffffff8147ac6b>] smp_apic_timer_interrupt+0x6b/0x98
     [<ffffffff81479ab3>] apic_timer_interrupt+0x73/0x80
     <EOI>  [<ffffffff8146aac6>] ? free_debug_processing+0x1a1/0x1d5
     [<ffffffff81153b15>] ? putname+0x35/0x50
     [<ffffffff8146ab2b>] __slab_free+0x31/0x2ca
     [<ffffffff81477c3a>] ? _raw_spin_unlock_irqrestore+0x4a/0x90
     [<ffffffff81253b8f>] ? __debug_check_no_obj_freed+0x15f/0x210
     [<ffffffff81097054>] ? lock_release_nested+0x84/0xc0
     [<ffffffff8113ec55>] ? kmem_cache_free+0x105/0x250
     [<ffffffff81153b15>] ? putname+0x35/0x50
     [<ffffffff81153b15>] ? putname+0x35/0x50
     [<ffffffff8113ed8f>] kmem_cache_free+0x23f/0x250
     [<ffffffff81153b15>] putname+0x35/0x50
     [<ffffffff81146d8d>] do_sys_open+0x16d/0x1d0
     [<ffffffff81146e10>] sys_open+0x20/0x30
     [<ffffffff81478f42>] system_call_fastpath+0x16/0x1b

    Reported-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Felix Fietkau <nbd@openwrt.org>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 71ecfa1893034eeb1c93e02e22ee2ad26d080858
Author: Johannes Berg <johannes.berg@intel.com>
Date:   Thu May 31 15:09:27 2012 +0200

    mac80211: clean up remain-on-channel on interface stop

    When any interface goes down, it could be the one that we
    were doing a remain-on-channel with. We therefore need to
    cancel the remain-on-channel and flush the related work
    structs so they don't run after the interface has been
    removed or even destroyed.

    It's also possible in this case that an off-channel SKB
    was never transmitted, so free it if this is the case.
    Note that this can also happen if the driver finishes
    the off-channel period without ever starting it.

    Cc: stable@kernel.org
    Reported-by: Nirav Shah <nirav.j2.shah@intel.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 1ae2fc25a1289a84ca726541e3356ba5bcb7f7fe
Author: Johannes Berg <johannes.berg@intel.com>
Date:   Wed May 30 14:59:36 2012 +0200

    mac80211_hwsim: advertise interface combinations

    Enforcing interface combinations broke uses of hwsim
    with multiple virtual interfaces. Advertise that all
    combinations are possible to fix this.

    Reported-by: Nirav Shah <nirav.j2.shah@intel.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit bd34ab62a3297bd7685da11b0cbe05ae4cd8b02c
Author: Meenakshi Venkataraman <meenakshi.venkataraman@intel.com>
Date:   Wed May 30 11:39:33 2012 +0200

    mac80211: fix error in station state transitions during reconfig

    As part of hardware reconfig mac80211 tries
    to restore the station state to its values
    before the hardware reconfig, but it only
    goes to the last-state - 1. Fix this
    off-by-one error.

    Cc: stable@kernel.org [3.4]
    Signed-off-by: Meenakshi Venkataraman <meenakshi.venkataraman@intel.com>
    Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit a5fdde28b4f5fb756032e7ad2c6fcdcffde20958
Author: Johannes Berg <johannes.berg@intel.com>
Date:   Wed May 30 10:36:12 2012 +0200

    iwlwifi: fix TX power antenna access

    Since my commit
      iwlwifi: use valid TX/RX antenna from hw_params
    the config values are pure overrides, not the
    real values for all hardware. Therefore, the
    EEPROM TX power reading code checks the wrong
    values, it should check the hw_params values.

    Cc: stable@kernel.org [3.4]
    Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit b8bacc187aa5b59af9b9fa19b3ce4df5ad1db112
Author: Chun-Yeow Yeoh <yeohchunyeow@gmail.com>
Date:   Wed May 30 09:30:41 2012 +0800

    mac80211: Fix Unreachable Mesh Station Problem when joining to another MBSS

    Mesh station that joins an MBSS is reachable using mesh portal with 6
    address frame by mesh stations from another MBSS if these two different
    MBSSes are bridged. However, if the mesh station later moves into the
    same MBSS of those mesh stations, it is unreachable by mesh stations
    in the MBSS due to the mpp_paths table is not deleted. A quick fix
    is to perform mesh_path_lookup, if it is available for the target
    destination, mpp_path_lookup is not performed. When the mesh station
    moves back to its original MBSS, the mesh_paths will be deleted once
    expired. So, it will be reachable using mpp_path_lookup again.

    Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow@gmail.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 28f333666ea766fdfb25de3783ff56cd2d1c51f0
Author: Amitkumar Karwar <akarwar@marvell.com>
Date:   Tue May 29 15:39:06 2012 -0700

    cfg80211: use sme_state in ibss start/join path

    CFG80211_DEV_WARN_ON() at "net/wireless/ibss.c line 63"
    is unnecessarily triggered even after successful connection,
    when cfg80211_ibss_joined() is called by driver inside
    .join_ibss handler.

    This patch fixes the problem by changing 'sme_state' in ibss path
    and having WARN_ON() check for 'sme_state' similar to infra
    association.

    Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
    Signed-off-by: Bing Zhao <bzhao@marvell.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 7a1c99343c5305c47b5e078d1af2144f9026df40
Author: Avinash Patil <patila@marvell.com>
Date:   Tue May 29 15:39:05 2012 -0700

    mwifiex: support NL80211_HIDDEN_SSID_ZERO_LEN for uAP

    mwifiex uAP supports NL80211_HIDDEN_SSID_ZERO_LEN type of hidden
    SSID only. NL80211_HIDDEN_SSID_ZERO_CONTENTS is not supported.

    Signed-off-by: Avinash Patil <patila@marvell.com>
    Signed-off-by: Kiran Divekar <dkiran@marvell.com>
    Signed-off-by: Bing Zhao <bzhao@marvell.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit f0e3bd23418e1ec1aeac5fc36b74bf2f645b1244
Author: Avinash Patil <patila@marvell.com>
Date:   Tue May 29 15:39:04 2012 -0700

    mwifiex: invalidate bss config before setting channel for uAP

    Mark bss_config parameters as invalid before setting AP channel.
    This prevents from setting invalid parameters while setting AP
    channel to FW.

    Signed-off-by: Avinash Patil <patila@marvell.com>
    Signed-off-by: Kiran Divekar <dkiran@marvell.com>
    Signed-off-by: Bing Zhao <bzhao@marvell.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 925e64c3c512e9f4452eaa7d52fd4c1518b8fb11
Author: Stanislaw Gruszka <sgruszka@redhat.com>
Date:   Wed May 16 15:27:20 2012 +0200

    mac80211: run scan after finish connection monitoring

    commit 133d40f9a22bdfd2617a446f1e3209537c5415ec
    Author: Stanislaw Gruszka <sgruszka@redhat.com>
    Date:   Wed Mar 28 16:01:19 2012 +0200

        mac80211: do not scan and monitor connection in parallel

    add bug, which make possible to start a scan and never finish it, so
    make every new scanning request finish with -EBUSY error. This can
    happen on code paths where we finish connection monitoring and clear
    IEEE80211_STA_*_POLL flags, but do not check if scan was deferred.
    This patch fixes those code paths.

    Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit dc5cd894cace7bda4a743487a9f87d59a3f0a095
Author: Haiyang Zhang <haiyangz@microsoft.com>
Date:   Mon Jun 4 06:42:38 2012 +0000

    net/hyperv: Use wait_event on outstanding sends during device removal

    Change the busy-waiting/udelay to wait_event on outstanding sends.

    Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
    Reviewed-by: K. Y. Srinivasan <kys@microsoft.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 9ec0db71af04f4560e27a3c2f5a0411ba3155198
Author: Giuseppe CAVALLARO <peppe.cavallaro@st.com>
Date:   Mon Jun 4 05:51:18 2012 +0000

    net: icplus: fix interrupt mask

    This patch fixes the interrupt mask for IC101 A/G devices
    and now enables the link/speed/duplex interrupts.
    This is done by setting the "INTR pin used" bit and cleaning
    all the other bits in the Register 17.

    Reported-by: Stuart Menefy <stuart.menefy@st.com>
    Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 3ab2cdd02850d53d32369e51c0ae2dbcf8a66e55
Merge: bec4596 dc605db
Author: David S. Miller <davem@davemloft.net>
Date:   Mon Jun 4 11:51:37 2012 -0400

    Merge branch 'master' of git://gitorious.org/linux-can/linux-can

commit bec4596b4e6770c7037f21f6bd27567b152dc0d6
Author: Eric Dumazet <edumazet@google.com>
Date:   Mon Jun 4 00:18:19 2012 +0000

    drop_monitor: dont sleep in atomic context

    drop_monitor calls several sleeping functions while in atomic context.

     BUG: sleeping function called from invalid context at mm/slub.c:943
     in_atomic(): 1, irqs_disabled(): 0, pid: 2103, name: kworker/0:2
     Pid: 2103, comm: kworker/0:2 Not tainted 3.5.0-rc1+ #55
     Call Trace:
      [<ffffffff810697ca>] __might_sleep+0xca/0xf0
      [<ffffffff811345a3>] kmem_cache_alloc_node+0x1b3/0x1c0
      [<ffffffff8105578c>] ? queue_delayed_work_on+0x11c/0x130
      [<ffffffff815343fb>] __alloc_skb+0x4b/0x230
      [<ffffffffa00b0360>] ? reset_per_cpu_data+0x160/0x160 [drop_monitor]
      [<ffffffffa00b022f>] reset_per_cpu_data+0x2f/0x160 [drop_monitor]
      [<ffffffffa00b03ab>] send_dm_alert+0x4b/0xb0 [drop_monitor]
      [<ffffffff810568e0>] process_one_work+0x130/0x4c0
      [<ffffffff81058249>] worker_thread+0x159/0x360
      [<ffffffff810580f0>] ? manage_workers.isra.27+0x240/0x240
      [<ffffffff8105d403>] kthread+0x93/0xa0
      [<ffffffff816be6d4>] kernel_thread_helper+0x4/0x10
      [<ffffffff8105d370>] ? kthread_freezable_should_stop+0x80/0x80
      [<ffffffff816be6d0>] ? gs_change+0xb/0xb

    Rework the logic to call the sleeping functions in right context.

    Use standard timer/workqueue api to let system chose any cpu to perform
    the allocation and netlink send.

    Also avoid a loop if reset_per_cpu_data() cannot allocate memory :
    use mod_timer() to wait 1/10 second before next try.

    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Cc: Neil Horman <nhorman@tuxdriver.com>
    Reviewed-by: Neil Horman <nhorman@tuxdriver.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 08f75bf14fadaa81fe362d5acda9b77b113dd0a2
Author: Grazvydas Ignotas <notasas@gmail.com>
Date:   Sat May 26 00:21:33 2012 +0300

    usb: musb_gadget: fix crash caused by dangling pointer

    usb_ep_ops.disable must clear external copy of the endpoint descriptor,
    otherwise musb crashes after loading/unloading several gadget modules
    in a row:

    Unable to handle kernel paging request at virtual address bf013730
    pgd = c0004000
    [bf013730] *pgd=8f26d811, *pte=00000000, *ppte=00000000
    Internal error: Oops: 7 [#1]
    Modules linked in: g_cdc [last unloaded: g_file_storage]
    CPU: 0    Not tainted  (3.2.17 #647)
    PC is at musb_gadget_enable+0x4c/0x24c
    LR is at _raw_spin_lock_irqsave+0x4c/0x58
    [<c027c030>] (musb_gadget_enable+0x4c/0x24c) from [<bf01b760>] (gether_connect+0x3c/0x19c [g_cdc])
    [<bf01b760>] (gether_connect+0x3c/0x19c [g_cdc]) from [<bf01ba1c>] (ecm_set_alt+0x15c/0x180 [g_cdc])
    [<bf01ba1c>] (ecm_set_alt+0x15c/0x180 [g_cdc]) from [<bf01ecd4>] (composite_setup+0x85c/0xac4 [g_cdc])
    [<bf01ecd4>] (composite_setup+0x85c/0xac4 [g_cdc]) from [<c027b744>] (musb_g_ep0_irq+0x844/0x924)
    [<c027b744>] (musb_g_ep0_irq+0x844/0x924) from [<c027a97c>] (musb_interrupt+0x79c/0x864)
    [<c027a97c>] (musb_interrupt+0x79c/0x864) from [<c027aaa8>] (generic_interrupt+0x64/0x7c)
    [<c027aaa8>] (generic_interrupt+0x64/0x7c) from [<c00797cc>] (handle_irq_event_percpu+0x28/0x178)
    ...

    Cc: stable@vger.kernel.org # v3.1+
    Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
    Signed-off-by: Felipe Balbi <balbi@ti.com>

commit 6594b2d7b1ef8260e6e36ddc96bd37a40e39ba80
Author: Jon Povey <jon.povey@racelogic.co.uk>
Date:   Fri May 25 10:50:18 2012 +0900

    usb: musb: davinci: Fix build breakage

    This appears to have been broken by
    commit 5cfb19ac604a68c030b245561f575c2d1bac1d49
    (ARM: davinci: streamline sysmod access)

    For now, fix by hardcoding USB_PHY_CTRL and DM355_DEEPSLEEP

    Tested on DM365 with defconfig changes.

    Signed-off-by: Jon Povey <jon.povey@racelogic.co.uk>
    Acked-by: Sekhar Nori <nsekhar@ti.com>
    CC: Felipe Balbi <balbi@ti.com>
    Cc: <stable@vger.kernel.org> # v3.4.x
    Signed-off-by: Felipe Balbi <balbi@ti.com>

commit 80e91fd59bc5291c6fe322551f644a58cf2c5e98
Author: Christoph Fritz <chf.fritz@googlemail.com>
Date:   Mon Jun 4 17:24:03 2012 +0200

    usb: gadget: regression fix - usage of usb_ep

    This patch removes redundant pointer to struct usb_endpoint_descriptor which
    were missed in commit 79149b8:

     usb: gadget: Update fsl_udc_core to use usb_endpoint_descriptor inside the
     struct usb_ep

    Due to clock framework regressions, this patch is only compile tested!

    Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com>
    Signed-off-by: Felipe Balbi <balbi@ti.com>

commit 109f0f718375e12bfdee53f025d85d94efed32a3
Author: Ido Shayevitz <idos@codeaurora.org>
Date:   Mon Jun 4 13:35:28 2012 +0300

    usb: gadget: s3c-hsudc.c: Remove unneeded condition

    The removed condition is always true, since the endpoint descriptor is
    set prior to calling the enable endpoint.

    Signed-off-by: Ido Shayevitz <idos@codeaurora.org>
    Acked-by: Heiko Stuebner <heiko@sntech.de>
    Signed-off-by: Felipe Balbi <balbi@ti.com>

commit 0561ed440fbab943e1c881cab626bd7019647385
Author: Ido Shayevitz <idos@codeaurora.org>
Date:   Mon Jun 4 13:35:27 2012 +0300

    usb: gadget: s3c2410_udc: Remove unneeded condition

    The removed condition is always true, since the endpoint descriptor is
    set prior to calling the enable endpoint.

    Signed-off-by: Ido Shayevitz <idos@codeaurora.org>
    Signed-off-by: Felipe Balbi <balbi@ti.com>

commit 3ba0b31aed94167998defadfbf17d2196db05814
Author: Ido Shayevitz <idos@codeaurora.org>
Date:   Mon Jun 4 13:35:26 2012 +0300

    usb: gadget: pxa25x_udc: Remove unneeded condition

    The removed condition is always true, since the endpoint descriptor is
    set prior to calling the enable endpoint.

    Signed-off-by: Ido Shayevitz <idos@codeaurora.org>
    Signed-off-by: Felipe Balbi <balbi@ti.com>

commit 77964b3ce862262e4a22d4e5093c158f72439a0b
Author: Ido Shayevitz <idos@codeaurora.org>
Date:   Mon Jun 4 13:35:25 2012 +0300

    usb: gadget: omap_udc: Remove unneeded condition

    The removed condition is always true, since the endpoint descriptor is
    set prior to calling the enable endpoint.

    Signed-off-by: Ido Shayevitz <idos@codeaurora.org>
    Signed-off-by: Felipe Balbi <balbi@ti.com>

commit e0f4f9d4c9138c40738104f80bd5008517fc712d
Author: Ido Shayevitz <idos@codeaurora.org>
Date:   Mon Jun 4 13:35:24 2012 +0300

    usb: gadget: mv_udc_core: Remove unneeded condition

    The removed condition is always true, since the endpoint descriptor is
    set prior to calling the enable endpoint.

    Signed-off-by: Ido Shayevitz <idos@codeaurora.org>
    Acked-by: Yu Xu <yuxu@marvell.com>
    Signed-off-by: Felipe Balbi <balbi@ti.com>

commit aedaa44dd3214886d70fad92197b98a0ba286cb8
Author: Ido Shayevitz <idos@codeaurora.org>
Date:   Mon Jun 4 13:35:22 2012 +0300

    usb: gadget: goku_udc: Remove unneeded condition

    The removed condition is always true, since the endpoint descriptor is
    set prior to calling the enable endpoint.

    Signed-off-by: Ido Shayevitz <idos@codeaurora.org>
    Signed-off-by: Felipe Balbi <balbi@ti.com>

commit 1fa75972c7b9f165af102022aa0090fe0a3a6c16
Author: Ido Shayevitz <idos@codeaurora.org>
Date:   Mon Jun 4 13:35:21 2012 +0300

    usb: gadget: fsl_udc_core: Remove unneeded condition

    The removed condition is always true, since the endpoint descriptor is
    set prior to calling the enable endpoint.

    Signed-off-by: Ido Shayevitz <idos@codeaurora.org>
    Signed-off-by: Felipe Balbi <balbi@ti.com>

commit fc065a09524991a5138835c6499e895d6be14049
Author: Ido Shayevitz <idos@codeaurora.org>
Date:   Mon Jun 4 13:35:20 2012 +0300

    usb: gadget: fsl_qe_udc: Remove unneeded condition

    The removed condition is always true, since the endpoint descriptor is
    set prior to calling the enable endpoint.

    Signed-off-by: Ido Shayevitz <idos@codeaurora.org>
    Signed-off-by: Felipe Balbi <balbi@ti.com>

commit 820234c86b982205aeeebde1ad71ccfe6bc4cc80
Author: Ido Shayevitz <idos@codeaurora.org>
Date:   Mon Jun 4 13:35:19 2012 +0300

    usb: gadget: atmel_usba_udc: Remove unneeded condition

    The removed condition is always true, since the endpoint descriptor is
    set prior to calling the enable endpoint.

    Signed-off-by: Ido Shayevitz <idos@codeaurora.org>
    Signed-off-by: Felipe Balbi <balbi@ti.com>

commit cdd781ab1906d039c2a93078385645d2d5af8491
Author: Sascha Hauer <s.hauer@pengutronix.de>
Date:   Mon Jun 4 14:58:07 2012 +0200

    ARM i.MX53: Fix PLL4 base address

    MX53_DPLL4_BASE accidently returned the base address of PLL3.
    Fix this.

    Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
    Cc: stable@vger.kernel.org

commit 9ca41bccc39f5ebbbb515dfadb2e0f912168c8bd
Author: Sascha Hauer <s.hauer@pengutronix.de>
Date:   Mon Jun 4 14:51:32 2012 +0200

    ARM i.MX pllv2: make round_rate accurate

    in round_rate we made the assumption that we can set arbitrary
    frequencies and thus returned the input rate. This is not correct,
    for certain frequencies after setting a frequency with set_rate,
    recalc_rate will return different values. To fix this, introduce
    set_rate/recalc_rate functions which work on variables instead
    of registers directly. This way we can call these in round_rate
    to get the exact rate which we would get if we call set_rate
    with this value.

    Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

commit 6cc90d6de16532fe68b54ee6967894f7ca83affa
Author: Sascha Hauer <s.hauer@pengutronix.de>
Date:   Mon Jun 4 12:21:21 2012 +0200

    ARM i.MX pllv2: use standard register set unconditionally

    The i.MX5 PLL has two different register sets for setting the
    rate. One is used for the standard case and and is used for
    DVFS. Which one of them is used depends on a hardware input
    of the PLL. Current implementation reads back from the hardware
    which setting is used. This is bogus: If we ever want to implement
    DVFS we have to program both register sets and not only the one
    which happens to be used at the moment. For now, just use the
    standard register set uncondionally.

    Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

commit 4d5a0565cebf12c2ef854e4ac1961f13a710a950
Author: Jan Schmidt <list.btrfs@jan-o-sch.net>
Date:   Mon Apr 30 11:17:25 2012 +0200

    Btrfs: remove call to btrfs_header_nritems with no effect

    This is a leftover from cleanup patch 559af821. Before the cleanup,
    btrfs_header_nritems was called inside an if condition. As it has no side
    effects we need to preserve here, it should simply be dropped.

    Signed-off-by: Jan Schmidt <list.btrfs@jan-o-sch.net>

commit 2e063c305a3da896ec3db99e66891411d0e38820
Author: Archit Taneja <archit@ti.com>
Date:   Mon Jun 4 13:36:34 2012 +0530

    OMAPDSS: DSI: Fix bug when calculating LP command interleaving parameters

    In function dsi_compute_interleave_lp(), the escape clock/LP clock time period
    is calculated incorrectly. The escape clock/LP clock is calculated as:

    LP Clock(Hz) = DSI_FCLK(Hz) / lp_clk_div

    Since we are calculating the time period of LP clock, the LP clock divider
    should be multiplied with the time period of DSI_FCLK.

    Calculating incorrect value of txclkesc results in incorrect calculation of LP
    interleaving parameters, it also creates a possibility of a divide by zero
    error.

    Reported-by: Sureshkumar Manimuthu <mail2msuresh@ti.com>

    Signed-off-by: Archit Taneja <archit@ti.com>
    Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

commit a1c85ec03738421668becb973f35fe6e1501c6e6
Author: Richard Zhao <richard.zhao@freescale.com>
Date:   Mon Jun 4 09:42:54 2012 +0800

    ASoC: imx-audmux: add pinctrl support

    Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
    Acked-by: Dong Aisheng <dong.aisheng@linaro.org>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

commit d298caae9a920e1745599ddd4a19073d9a033df0
Author: Liam Girdwood <lrg@ti.com>
Date:   Fri Jun 1 18:03:00 2012 +0100

    ASoC: dapm: Fix connected widget capture path query.

    Make sure we check the correct path for capture.

    Signed-off-by: Liam Girdwood <lrg@ti.com>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

commit 4d04317f6efab7359ae56e50cc9c60e9804b5015
Author: Tony Lindgren <tony@atomide.com>
Date:   Mon Jun 4 00:13:25 2012 -0700

    ARM: OMAP: Fix lis3lv02d accelerometer to use gpio_to_irq

    Commit 3b511201 (ARM: OMAP: rx51: Platform support for lis3lv02d accelerometer)
    added support for lis3lv02d accelerometer.

    The patch was still using OMAP_GPIO_IRQ which no longer exists.

    Fix it by using gpio_to_irq().

    Signed-off-by: Tony Lindgren <tony@atomide.com>

commit ded884c2d7f627f4f5456bbeb9d174decc3e7261
Merge: 4564747 96f3994
Author: Tony Lindgren <tony@atomide.com>
Date:   Mon Jun 4 02:41:19 2012 -0700

    Merge branch 'for_3.5/cleanup/am3xxx-cpu-is-leftovers' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes

commit 4564747649db987722aa781280eb8325c6a5a1a8
Merge: f8f5701 1ce0299
Author: Tony Lindgren <tony@atomide.com>
Date:   Mon Jun 4 02:09:45 2012 -0700

    Merge branch 'for_3.5/fixes/pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes

commit 5025ce070e2dff80bcf015a34a82edcf78229287
Author: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date:   Wed May 23 17:02:26 2012 +0300

    OMAPDSS: fix bogus WARN_ON in dss_runtime_put()

    pm_runtime_put_sync() in dss_runtime_put() returns -EBUSY when any child
    of dss is still enabled. This happens, for example, when a display
    output is enabled and one dumps the clocks via debugfs. This causes
    dss_runtime_get & put to be called.

    While I couldn't find anything about this in the documentation and it
    wasn't immediately clear from runtime_pm code, it looks to me that
    pm_runtime_put_sync() returns -EBUSY to inform that things went fine,
    but the device could not be turned off as there are still child devices
    that are enabled. This is not a problem.

    This patch skips the WARN_ON if pm_runtime_put_sync() returns -EBUSY.

    Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

commit d1700f9258552294300083eb62f83262f21ae1db
Author: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date:   Wed May 23 16:56:09 2012 +0300

    OMAPDSS: Taal: fix compilation warning

    This patch fixes a warning:

    drivers/video/omap2/displays/panel-taal.c: In function
    ‘taal_num_errors_show’:
    drivers/video/omap2/displays/panel-taal.c:529: warning: ‘errors’ may be
    used uninitialized in this function

    Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

commit 0e9a126e95748e8283488818d98ae5bcb7b84515
Author: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date:   Wed May 23 16:45:09 2012 +0300

    OMAPDSS: fix build when DEBUG_FS or DSS_DEBUG_SUPPORT disabled

    If CONFIG_DEBUG_FS or CONFIG_OMAP2_DSS_DEBUG_SUPPORT is disabled, the
    build fails:

    drivers/video/omap2/dss/core.c:197:50: error: static declaration of
    'dss_debugfs_create_file' follows non-static declaration
    drivers/video/omap2/dss/dss.h:166:5: note: previous declaration of
    'dss_debugfs_create_file' was here

    This patch fixes the dummy dss_debugfs_create_file() so that the driver
    builds.

    Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

commit bc66468cee4c23856b2e51d711e62e4ef773001a
Author: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date:   Wed May 23 00:20:17 2012 +0200

    pinctrl: fix a minor harmless typo

    The way the for_each_maps() macro is currently used, using "i" instead of
    "_i_" works and is harmless. Still, this is a bug, that can trigger any
    time, if the code around that macro changes. Better fix it now.

    Acked-by: Stephen Warren <swarren@wwwdotorg.org>
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

commit 1253585d7cb12a365e9effaf2f0c7991d2404996
Author: Barry Song <Baohua.Song@csr.com>
Date:   Mon May 21 10:59:02 2012 +0800

    pinctrl: sirf: mark of_device_id match table as __devinitconst

    Signed-off-by: Barry Song <Baohua.Song@csr.com>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

commit dc605dbdb8dd152448ccb8d4c4d5bd9439965a20
Author: Joe Perches <joe@perches.com>
Date:   Wed May 30 13:25:55 2012 -0700

    can: cc770: Fix likely misuse of | for &

    Using | with a constant is always true.
    Likely this should have be &.

    Signed-off-by: Joe Perches <joe@perches.com>
    Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

commit f461f27a4436dbe691908fe08b867ef888848cc3
Author: AnilKumar Ch <anilkumar@ti.com>
Date:   Wed May 23 17:45:11 2012 +0530

    can: c_can: fix race condition in c_can_open()

    Fix the issue of C_CAN interrupts getting disabled forever when canconfig
    utility is used multiple times. According to NAPI usage we disable all
    the hardware interrupts in ISR and re-enable them in poll(). Current
    implementation calls napi_enable() after hardware interrupts are enabled.
    If we get any interrupts between these two steps then we do not process
    those interrupts because napi is not enabled. Mostly these interrupts
    come because of STATUS is not 0x7 or ERROR interrupts. If napi_enable()
    happens before HW interrupts enabled then c_can_poll() function will be
    called eventual re-enabling.

    This patch moves the napi_enable() call before interrupts enabled.

    Cc: stable@kernel.org # 2.6.39+
    Signed-off-by: AnilKumar Ch <anilkumar@ti.com>
    Acked-by: Wolfgang Grandegger <wg@grandegger.com>
    Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

commit 148c87c89e1a8863d3d965179f3ab1a06490569e
Author: AnilKumar Ch <anilkumar@ti.com>
Date:   Wed May 23 17:45:10 2012 +0530

    can: c_can: fix an interrupt thrash issue with c_can driver

    This patch fixes an interrupt thrash issue with c_can driver.

    In c_can_isr() function interrupts are disabled and enabled only in
    c_can_poll() function. c_can_isr() & c_can_poll() both read the
    irqstatus flag. However, irqstatus is always read as 0 in c_can_poll()
    because all C_CAN interrupts are disabled in c_can_isr(). This causes
    all interrupts to be re-enabled in c_can_poll() which in turn causes
    another interrupt since the event is not really handled. This keeps
    happening causing a flood of interrupts.

    To fix this, read the irqstatus register in isr and use the same cached
    value in the poll function.

    Cc: stable@kernel.org # 2.6.39+
    Signed-off-by: AnilKumar Ch <anilkumar@ti.com>
    Acked-by: Wolfgang Grandegger <wg@grandegger.com>
    Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

commit 617caccebe451716df21c069b079d5936ed7b0f3
Author: AnilKumar Ch <anilkumar@ti.com>
Date:   Wed May 23 17:45:09 2012 +0530

    can: c_can: fix "BUG! echo_skb is occupied!" during transmit

    This patch fixes an issue with transmit routine, which causes
    "can_put_echo_skb: BUG! echo_skb is occupied!" message when
    using "cansequence -p" on D_CAN controller.

    In c_can driver, while transmitting packets tx_echo flag holds
    the no of can frames put for transmission into the hardware.

    As the comment above c_can_do_tx() indicates, if we find any packet
    which is not transmitted then we should stop looking for more.
    In the current implementation this is not taken care of causing the
    said message.

    Also, fix the condition used to find if the packet is transmitted
    or not. Current code skips the first tx message object and ends up
    checking one extra invalid object.

    While at it, fix the comment on top of c_can_do_tx() to use the
    terminology "packet" instead of "package" since it is more
    standard.

    Cc: stable@kernel.org # 2.6.39+
    Signed-off-by: AnilKumar Ch <anilkumar@ti.com>
    Acked-by: Wolfgang Grandegger <wg@grandegger.com>
    Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

commit b3b02ae5865c2dcd506322e0fc6def59a042e72f
Author: Trond Myklebust <Trond.Myklebust@netapp.com>
Date:   Thu May 31 15:26:38 2012 -0400

    NFSv4.1: Fix a request leak on the back channel

    If the call to svc_process_common() fails, then the request
    needs to be freed before we can exit bc_svc_process.

    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Cc: stable@vger.kernel.org

commit 5e626254206a709c6e937f3dda69bf26c7344f6f
Author: Andre Przywara <andre.przywara@amd.com>
Date:   Tue May 29 13:07:31 2012 +0200

    xen/setup: filter APERFMPERF cpuid feature out

    Xen PV kernels allow access to the APERF/MPERF registers to read the
    effective frequency. Access to the MSRs is however redirected to the
    currently scheduled physical CPU, making consecutive read and
    compares unreliable. In addition each rdmsr traps into the hypervisor.
    So to avoid bogus readouts and expensive traps, disable the kernel
    internal feature flag for APERF/MPERF if running under Xen.
    This will
    a) remove the aperfmperf flag from /proc/cpuinfo
    b) not mislead the power scheduler (arch/x86/kernel/cpu/sched.c) to
       use the feature to improve scheduling (by default disabled)
    c) not mislead the cpufreq driver to use the MSRs

    This does not cover userland programs which access the MSRs via the
    device file interface, but this will be addressed separately.

    Signed-off-by: Andre Przywara <andre.przywara@amd.com>
    Cc: stable@vger.kernel.org # v3.0+
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

commit 58b7b53a36b0be8081fbfc91aeea24b83c20ca1b
Author: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date:   Tue May 29 12:36:43 2012 -0400

    xen/balloon: Subtract from xen_released_pages the count that is populated.

    We did not take into account that xen_released_pages would be
    used outside the initial E820 parsing code. As such we would
    did not subtract from xen_released_pages the count of pages
    that we had populated back (instead we just did a simple
    extra_pages = released - populated).

    The balloon driver uses xen_released_pages to set the initial
    current_pages count.  If this is wrong (too low) then when a new
    (higher) target is set, the balloon driver will request too many pages
    from Xen."

    This fixes errors such as:

    (XEN) memory.c:133:d0 Could not allocate order=0 extent: id=0 memflags=0 (51 of 512)
    during bootup and
    free_memory            : 0

    where the free_memory should be 128.

    Acked-by: David Vrabel <david.vrabel@citrix.com>
    [v1: Per David's review made the git commit better]
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

commit 780dbcd0eedec6528d777b668019dabb36badf1a
Author: Zhang, Yang Z <yang.z.zhang@intel.com>
Date:   Tue May 22 08:40:16 2012 +0000

    xen/pci: Check for PCI bridge before using it.

    Some SR-IOV devices may use more than one bus number, but there is no real bridges
    because that have internal routing mechanism. So need to check whether the bridge is
    existing before using it.

    Signed-off-by: Yang Zhang <yang.z.zhang@Intel.com>
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

commit 5e152e6c4b0da84c66cad56597b42c4ecedb0448
Author: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date:   Wed May 23 13:28:44 2012 -0400

    xen/events: Add WARN_ON when quick lookup found invalid type.

    All of the bind_XYZ_to_irq do a quick lookup to see if the
    event exists. And if it does, then the initialized IRQ number
    is returned instead of initializing a new IRQ number.

    This patch adds an extra logic to check that the type returned
    is proper one and that there is an IRQ handler setup for it.

    This patch has the benefit of being able to find drivers that
    are doing something naught.

    [v1: Enhanced based on Stefano's review]
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

commit f90da3c7a52ac0c8f07f4d6cd0a7f7677e831916
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date:   Fri May 18 16:58:03 2012 +0200

    ARM: imx: only call l2x0_init if it's available

    This fixes a build failure with CONFIG_CACHE_L2X0=n:

    	arch/arm/mach-imx/built-in.o: In function `imx3_init_l2x0':
    	imx53-dt.c:(.init.text+0x190): undefined reference to `l2x0_init'
    	make[2]: *** [.tmp_vmlinux1] Error 1
    	make[1]: *** [sub-make] Error 2
    	make: *** [all] Error 2

    When the l2 cache isn't enabled the quirk introduced in
    9524705 (MX35: Fix bogus L2 cache settings) doesn't need to be done
    either.

    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

commit 1064f8893ee1d16178d983928912057352362dc2
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date:   Wed May 2 22:08:07 2012 +0200

    ARM: imx: only specify i2c device type once

    The first argument of I2C_BOARD_INFO is used to assign .type, so drop
    second assignment.

    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

commit 3ef7cf1839061b275ee1fc59c042194dc452b7e2
Author: Fabio Estevam <fabio.estevam@freescale.com>
Date:   Mon May 21 16:09:06 2012 -0300

    ARM: mx31_3ds: Fix build due to missing IMX_HAVE_PLATFORM_IMX_SSI

    commit 5fb86e5 (ARM: mx31_3ds: Add sound support) missed to select IMX_HAVE_PLATFORM_IMX_SSI,
    which causes the following build error when only mx31_3ds is selected:

    arch/arm/mach-imx/built-in.o: In function `mx31_3ds_init':
    mach-mx31_3ds.c:(.init.text+0x15dc): undefined reference to `imx_add_imx_ssi'
    mach-mx31_3ds.c:(.init.text+0x16b8): undefined reference to `imx31_imx_ssi_data'

    Select IMX_HAVE_PLATFORM_IMX_SSI to fix it.

    Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
    Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

commit ec3d753c5f77ecce0f5d3b8ab603b54b4fd2a106
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Mon May 28 11:01:44 2012 +0900

    sh: convert to kbuild asm-generic support.

    Straightforward change to get rid of all of the header wrapper stubs.

    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 96f3994929c05a21d757a83613d2710b780ea2b4
Author: Kevin Hilman <khilman@ti.com>
Date:   Fri May 11 16:38:11 2012 -0700

    ARM: OMAP: SoC detection: remove unused cpu_is macros

    Remove multiple unused cpu_is_omap35xx macros.

    In particular, the cpu_is_omap35* macros for 3503, 3515, 3525 are removed
    because they are using omap_has_* feature checks and we want to
    remove specific feature detection from SoC family detection.

    There are no longer any cpu_is_* checks that depend on specific IP
    detection.

    Acked-by: Vaibhav Hiremath <hvaibhav@ti.com>
    Tested-by: Vaibhav Hiremath <hvaibhav@ti.com>
    Tested-by: Mark A. Greer <mgreer@animalcreek.com>
    Signed-off-by: Kevin Hilman <khilman@ti.com>

commit 00633d7c7a0243940fc616bee573bcf497db79b9
Author: Kevin Hilman <khilman@ti.com>
Date:   Wed Jan 4 15:33:17 2012 -0800

    ARM: OMAP3: clock data: cleanup AM3[35]x SoC detection

    Use the more generic SoC family soc_is_am35xx() instead of the specific
    cpu_is_omap3517() (which is being removed.)

    Acked-by: Vaibhav Hiremath <hvaibhav@ti.com>
    Tested-by: Vaibhav Hiremath <hvaibhav@ti.com>
    Tested-by: Mark A. Greer <mgreer@animalcreek.com>
    Cc: Paul Walmsley <paul@pwsan.com>
    Signed-off-by: Kevin Hilman <khilman@ti.com>

commit 5842f5768599094758931b74190cdf93641a8e35
Author: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date:   Wed May 23 12:56:59 2012 -0400

    xen/hvc: Check HVM_PARAM_CONSOLE_[EVTCHN|PFN] for correctness.

    We need to make sure that those parameters are setup to be correct.
    As such the value of 0 is deemed invalid and we find that we
    bail out. The hypervisor sets by default all of them to be zero
    and when the hypercall is done does a simple:

     a.value = d->arch.hvm_domain.params[a.index];

    Which means that if the Xen toolstack forgot to setup the proper
    HVM_PARAM_CONSOLE_EVTCHN (or the PFN one), we would get the
    default value of 0 and use that.

    CC: stable@kernel.org
    Fixes-Oracle-Bug: 14091238
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

commit a32c88b9386ce3df87f28dd46bdc3776cd6edf75
Author: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date:   Wed May 23 12:55:38 2012 -0400

    xen/hvc: Fix error cases around HVM_PARAM_CONSOLE_PFN

    We weren't resetting the parameter to be passed in to a
    known default. Nor were we checking the return value of
    hvm_get_parameter.

    CC: stable@kernel.org
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

commit 2e5ad6b9c45d43cc4e7b8ac5ded1c55a7c4a3893
Author: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date:   Wed May 23 12:53:11 2012 -0400

    xen/hvc: Collapse error logic.

    All of the error paths are doing the same logic. In which
    case we might as well collapse them in one path.

    CC: stable@kernel.org
    Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

commit 3a9485da969c1c23400430470db17c819ef51d7b
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Thu May 24 15:07:47 2012 +0900

    sh64: Fix up fallout from generic init_task conversion.

    In the generic init_task migration sh64 silently lost its
    fake_swapper_regs definition, resulting in link errors.

    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 936c163ab260b83b10d434715bf6bcd43b99d620
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Thu May 24 13:03:20 2012 +0900

    sh: arch/sh/kernel/process.c needs asm/fpu.h for unlazy_fpu().

    Linus tried to fix up sh fallout from the x86 fpu state cleanup merge and
    failed. Add the missing include to get it building again.

      CC      arch/sh/kernel/process.o
    arch/sh/kernel/process.c: In function 'arch_dup_task_struct':
    arch/sh/kernel/process.c:23:2: error: implicit declaration of function 'unlazy_fpu'

    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 62be73eafaa045d3233337303fb140f7f8a61135
Author: Seiji Aguchi <seiji.aguchi@hds.com>
Date:   Tue May 15 17:35:09 2012 -0400

    kdump: Execute kmsg_dump(KMSG_DUMP_PANIC) after smp_send_stop()

    This patch moves kmsg_dump(KMSG_DUMP_PANIC) below smp_send_stop(),
    to serialize the crash-logging process via smp_send_stop() and to
    thus retrieve a more stable crash image of all CPUs stopped.

    Signed-off-by: Seiji Aguchi <seiji.aguchi@hds.com>
    Acked-by: Don Zickus <dzickus@redhat.com>
    Cc: dle-develop@lists.sourceforge.net <dle-develop@lists.sourceforge.net>
    Cc: Satoru Moriya <satoru.moriya@hds.com>
    Cc: Tony Luck <tony.luck@intel.com>
    Cc: a.p.zijlstra@chello.nl <a.p.zijlstra@chello.nl>
    Link: http://lkml.kernel.org/r/5C4C569E8A4B9B42A84A977CF070A35B2E4D7A5CE2@USINDEVS01.corp.hds.com
    Signed-off-by: Ingo Molnar <mingo@kernel.org>

commit b0286f20c36d0c1e7537489daddaf574abf403dd
Author: Richard Zhao <richard.zhao@freescale.com>
Date:   Mon May 14 13:04:47 2012 +0800

    ARM: imx6q: prepare and enable init on clks directly instead of clk_get first

    This also removes the usboh3 clk from the initially turned on
    clocks which leaked in from an internal development tree.

    Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
    Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

commit 2cfb45188a997ba4c3348e98a999b36663a4646f
Author: Sascha Hauer <s.hauer@pengutronix.de>
Date:   Wed May 16 12:29:53 2012 +0200

    ARM i.MX: remove now unnecessary argument from mxc_timer_init

    As the timer code now does a clk_get to get its clock we don't
    need the struct clk argument anymore.
    This also changes the alternative EPIT timer to do a clk_get.

    Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

commit 1f152b48eaaf4918047e84777b01a6d687f066e9
Author: Richard Zhao <richard.zhao@freescale.com>
Date:   Tue May 15 15:34:40 2012 +0800

    ARM: i.MX: change timer clock from ipg to perclk

    Contrary to the ipg clock the perclk rate is not changed or
    gated in low power mode, so we choose perclk for gpt.

    With the port to the common clock framework as a side effect
    the timer used the rate returned from the peripheral clock
    but the hardware was still programmed to use the ipg clock,
    so this patch only changes the hardware to really use the
    clock it already assumed.

    Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
    Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

commit c040be003f16a1bdd7997cc4ab7fc5fd43acb03b
Author: Sascha Hauer <s.hauer@pengutronix.de>
Date:   Wed May 16 12:01:40 2012 +0200

    ARM i.MX5: fix gpt peripheral clock path

    - The gpt peripheral clk parent is per_root, not ipg
    - The register for selectin per_lp_apm and per_root is
      MXC_CCM_CBCMR, not MXC_CCM_CBCDR

    Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

commit 1ce029968718477149e7f1fb245a8e82c690cc4a
Author: Mark A. Greer <mgreer@animalcreek.com>
Date:   Mon Apr 30 16:57:09 2012 -0700

    arm: omap3: am35x: Don't mark missing features as present

    The Chip Identification register on the am35x family of SoCs
    has bits 12, 7:5, and 3:2 marked as reserved and are read as
    zeroes.  Unfortunately, on other omap SoCs, a 0 bit means a
    feature is "Full Use" so the OMAP3_CHECK_FEATURE() macro
    called by omap3_check_features() will incorrectly interpret
    those zeroes to mean that a feature is present even though it
    isn't.  To fix that, the feature bits that are incorrectly
    set (namely, OMAP3_HAS_IVA and OMAP3_HAS_ISP) need to be
    cleared after all of the calls to OMAP3_CHECK_FEATURE() in
    omap3_check_features() are made.

    Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
    [khilman@ti.com: use soc_is_am35xx() instead of cpu_is_am35xx()]
    Signed-off-by: Kevin Hilman <khilman@ti.com>

commit 99b59df04899a048d1a3ed8bc2b1263779816868
Author: Kevin Hilman <khilman@ti.com>
Date:   Fri Apr 27 16:05:51 2012 -0700

    ARM: OMAP3: PM: fix shared PRCM interrupts: leave disabled at boot

    By default, request_irq() will auto-enable the requested IRQ.

    For PRCM interrupts, we may want to avoid that until the PM core code
    is fully ready to handle the interrupts.  This is particularily true
    for IO pad interrupts on OMAP3, which are shared between the hwmod
    core and the PRM core.

    In order to avoid PRCM IO-chain interrupts until the PM core is ready
    to handle them, ready, set the IRQ_NOAUTOEN flag for the PRCM IO-chain
    interrupt,  which means it will remain disabled after request_irq().

    Then, explicitly enable the PRCM interrupts after the request_irq() in
    the PM core (but not in the hwmod core.)

    Special thanks to Tero Kristo for suggesting to isolate the fix to
    only the IO-chain interrupt on OMAP3 instead of all PRCM interrupts.

    Cc: Tero Kristo <t-kristo@ti.com>
    Acked-by: Paul Walmsley <paul@pwsan.com>
    Signed-off-by: Kevin Hilman <khilman@ti.com>

commit e3c83c2db458f1e040c5b4bb19773c458e0240a8
Author: NeilBrown <neilb@suse.de>
Date:   Wed Apr 25 13:05:24 2012 +1000

    ARM: OMAP2+: INTC: fix suspend abort, set IRQCHIP_SKIP_SET_WAKE

    Without an ->irq_set_wake() method in an irq_chip, calls to
    enable_irq_wake() will fail.  This also causes these interrupts to not
    be able to abort suspend (via check_wakeup_irqs() in late suspend.)

    Currently, we don't implement ->irq_set_wake() for INTC interrupts
    because they default to be wakeup enabled by setting the GRPSEL bits
    in PM init.  Even though there is no ->irq_set_wake(), we want
    enable_irq_wake() to succeed so these interrupts can abort suspend
    when necessary.

    To fix, set IRQCHIP_SKIP_SET_WAKE flag for all the INTC
    interrupts which avoids trying to check irq_chip->irq_set_wake()
    and failing when it doesn't exist.

    Longer term, we need to implement ->irq_set_wake() for the INTC
    which can manage the appropriate GRPSEL bits.

    Signed-off-by: NeilBrown <neilb@suse.de>
    [khilman@ti.com: rework changelog]
    Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
    Signed-off-by: Kevin Hilman <khilman@ti.com>

commit 2a01bb3885c9145dbb7583d5aa5f5d5504f6f46f
Author: Kyle McMartin <kmcmarti@redhat.com>
Date:   Wed Apr 11 08:15:29 2012 -0400

    panic: Make panic_on_oops configurable

    Several distros set this by default by patching panic_on_oops.
    It seems to fit with the BOOTPARAM_{HARD,SOFT}_PANIC options
    though, so let's add a Kconfig entry and reduce some more
    upstream delta.

    Signed-off-by: Kyle McMartin <kyle@redhat.com>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Link: http://lkml.kernel.org/r/20120411121529.GH26688@redacted.bos.redhat.com
    Signed-off-by: Ingo Molnar <mingo@kernel.org>