1. 04 May, 2013 1 commit
  2. 03 May, 2013 7 commits
    • Linus Torvalds's avatar
      Merge branch 'for-3.10' of git://linux-nfs.org/~bfields/linux · 1db77221
      Linus Torvalds authored
      Pull nfsd changes from J Bruce Fields:
       "Highlights include:
      
         - Some more DRC cleanup and performance work from Jeff Layton
      
         - A gss-proxy upcall from Simo Sorce: currently krb5 mounts to the
           server using credentials from Active Directory often fail due to
           limitations of the svcgssd upcall interface.  This replacement
           lifts those limitations.  The existing upcall is still supported
           for backwards compatibility.
      
         - More NFSv4.1 support: at this point, if a user with a current
           client who upgrades from 4.0 to 4.1 should see no regressions.  In
           theory we do everything a 4.1 server is required to do.  Patches
           for a couple minor exceptions are ready for 3.11, and with those
           and some more testing I'd like to turn 4.1 on by default in 3.11."
      
      Fix up semantic conflict as per Stephen Rothwell and linux-next:
      
      Commit 030d794b ("SUNRPC: Use gssproxy upcall for server RPCGSS
      authentication") adds two new users of "PDE(inode)->data", but we're
      supposed to use "PDE_DATA(inode)" instead since commit d9dda78b
      ("procfs: new helper - PDE_DATA(inode)").
      
      The old PDE() macro is no longer available since commit c30480b9
      ("proc: Make the PROC_I() and PDE() macros internal to procfs")
      
      * 'for-3.10' of git://linux-nfs.org/~bfields/linux: (60 commits)
        NFSD: SECINFO doesn't handle unsupported pseudoflavors correctly
        NFSD: Simplify GSS flavor encoding in nfsd4_do_encode_secinfo()
        nfsd: make symbol nfsd_reply_cache_shrinker static
        svcauth_gss: fix error return code in rsc_parse()
        nfsd4: don't remap EISDIR errors in rename
        svcrpc: fix gss-proxy to respect user namespaces
        SUNRPC: gssp_procedures[] can be static
        SUNRPC: define {create,destroy}_use_gss_proxy_proc_entry in !PROC case
        nfsd4: better error return to indicate SSV non-support
        nfsd: fix EXDEV checking in rename
        SUNRPC: Use gssproxy upcall for server RPCGSS authentication.
        SUNRPC: Add RPC based upcall mechanism for RPCGSS auth
        SUNRPC: conditionally return endtime from import_sec_context
        SUNRPC: allow disabling idle timeout
        SUNRPC: attempt AF_LOCAL connect on setup
        nfsd: Decode and send 64bit time values
        nfsd4: put_client_renew_locked can be static
        nfsd4: remove unused macro
        nfsd4: remove some useless code
        nfsd4: implement SEQ4_STATUS_RECALLABLE_STATE_REVOKED
        ...
      1db77221
    • Linus Torvalds's avatar
      Merge tag 'jfs-3.10' of git://github.com/kleikamp/linux-shaggy · 86652188
      Linus Torvalds authored
      Pull jfs fixes from David Kleikamp:
       "A couple fixes for jfs"
      
      (What's with the unhelpful pull request "explanations" from fs people
      today?)
      
      * tag 'jfs-3.10' of git://github.com/kleikamp/linux-shaggy:
        jfs: fix a couple races
        jfs: avoid undefined behavior from left-shifting by 32 bits
      86652188
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · 14a9e5c0
      Linus Torvalds authored
      Pull ext3/jbd fixes from Jan Kara:
       "A couple of ext3/jbd fixes"
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        jbd: use kmem_cache_zalloc for allocating journal head
        jbd: use kmem_cache_zalloc instead of kmem_cache_alloc/memset
        jbd: don't wait (forever) for stale tid caused by wraparound
        ext3: fix data=journal fast mount/umount hang
      14a9e5c0
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm · 8546dc1d
      Linus Torvalds authored
      Pull ARM updates from Russell King:
       "The major items included in here are:
      
         - MCPM, multi-cluster power management, part of the infrastructure
           required for ARMs big.LITTLE support.
      
         - A rework of the ARM KVM code to allow re-use by ARM64.
      
         - Error handling cleanups of the IS_ERR_OR_NULL() madness and fixes
           of that stuff for arch/arm
      
         - Preparatory patches for Cortex-M3 support from Uwe Kleine-König.
      
        There is also a set of three patches in here from Hugh/Catalin to
        address freeing of inappropriate page tables on LPAE.  You already
        have these from akpm, but they were already part of my tree at the
        time he sent them, so unfortunately they'll end up with duplicate
        commits"
      
      * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (77 commits)
        ARM: EXYNOS: remove unnecessary use of IS_ERR_VALUE()
        ARM: IMX: remove unnecessary use of IS_ERR_VALUE()
        ARM: OMAP: use consistent error checking
        ARM: cleanup: OMAP hwmod error checking
        ARM: 7709/1: mcpm: Add explicit AFLAGS to support v6/v7 multiplatform kernels
        ARM: 7700/2: Make cpu_init() notrace
        ARM: 7702/1: Set the page table freeing ceiling to TASK_SIZE
        ARM: 7701/1: mm: Allow arch code to control the user page table ceiling
        ARM: 7703/1: Disable preemption in broadcast_tlb*_a15_erratum()
        ARM: mcpm: provide an interface to set the SMP ops at run time
        ARM: mcpm: generic SMP secondary bringup and hotplug support
        ARM: mcpm_head.S: vlock-based first man election
        ARM: mcpm: Add baremetal voting mutexes
        ARM: mcpm: introduce helpers for platform coherency exit/setup
        ARM: mcpm: introduce the CPU/cluster power API
        ARM: multi-cluster PM: secondary kernel entry code
        ARM: cacheflush: add synchronization helpers for mixed cache state accesses
        ARM: cpu hotplug: remove majority of cache flushing from platforms
        ARM: smp: flush L1 cache in cpu_die()
        ARM: tegra: remove tegra specific cpu_disable()
        ...
      8546dc1d
    • Linus Torvalds's avatar
      Merge tag 'sound-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 9992ba72
      Linus Torvalds authored
      Pull sound updates from Takashi Iwai:
       "Mostly many small changes spread as seen in diffstat in sound/*
        directory by this update.  A significant change in the subsystem level
        is the introduction of snd_soc_component, which will help more generic
        handling of SoC and off-SoC components.
      
        Also, snd_BUG_ON() macro is enabled unconditionally now due to its
        misuses, so people might hit kernel warnings (it's a good thing for
        us).
      
         - compress-offload: support for capture by Charles Keepax
         - HD-audio: codec delay support by Dylan Reid
         - HD-audio: improvements/fixes in generic parser: better headphone
           mic and headset mic support, jack_modes hint consolidation, proper
           beep attach/detachment, generalized power filter controls by David
           Henningsson, et al
         - HD-audio: Improved management of HDMI codec pins/converters
         - HD-audio: Better pin/DAC assignment for VIA codecs
         - HD-audio: Haswell HDMI workarounds
         - HD-audio: ALC268 codec support, a few new quirks for Chromebooks
         - USB: regression fixes: USB-MIDI autopm fix, the recent ISO latency
           fix by Clemens Ladisch
         - USB: support for DSD formats by Daniel Mack
         - USB: A few UAC2 device endian/cock fixes by Eldad Zack
         - USB: quirks for Emu 192kHz support, Novation Twitch DJ controller,
           Yamaha THRxx devices
         - HDSPM: updates for TCO controls by Adrian Knoth
         - ASoC: Add a snd_soc_component object type for generic handling of
           SoC and off-SoC components by Kuninori Morimoto,
         - dmaengine: a large set of cleanups and conversions by Lars-Peter
           Clausen
         - ASoC DAPM: performance optimizations from Ryo Tsutsui
         - ASoC DAPM: support for mixer control sharing by Stephen Warren
         - ASoC: multiplatform ARM cleanups from Arnd Bergmann
         - ASoC: new codec drivers for AK5385 and TAS5086 from Daniel Mack"
      
      * tag 'sound-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (315 commits)
        ALSA: usb-audio: caiaq: fix endianness bug in snd_usb_caiaq_maschine_dispatch
        ALSA: asihpi: add format support check in snd_card_asihpi_capture_formats
        ALSA: pcm_format_to_bits strong-typed conversion
        ALSA: compress: fix the states to check for allowing read
        ALSA: hda - Move Thinkpad X220 to use auto parser
        ALSA: USB: adjust for changed 3.8 USB API
        ALSA: usb - Avoid unnecessary sample rate changes on USB 2.0 clock sources
        sound: oss/dmabuf: use dma_map_single
        ALSA: ali5451: use mdelay instead of large udelay constants
        ALSA: hda - Add the support for ALC286 codec
        ALSA: usb-audio: USB quirk for Yamaha THR10C
        ALSA: usb-audio: USB quirk for Yamaha THR5A
        ALSA: usb-audio: USB quirk for Yamaha THR10
        ALSA: usb-audio: Fix autopm error during probing
        ALSA: snd-usb: try harder to find USB_DT_CS_ENDPOINT
        ALSA: sound kconfig typo
        ALSA: emu10k1: Fix dock firmware loading
        ASoC: ux500: forward declare msp_i2s_platform_data
        ASoC: davinci-mcasp: Add Support BCLK-to-LRCLK ratio for TDM modes
        ASoC: davinci-pcm, davinci-mcasp: Clean up active_serializers
        ...
      9992ba72
    • Linus Torvalds's avatar
      Merge tag 'for-v3.10' of git://git.infradead.org/users/cbou/linux-pstore · 00fdffb5
      Linus Torvalds authored
      Pull pstore update from Anton Vorontsov:
      
       - A new platform data parameter to specify ECC configuration;
      
       - Rounding fixup to not waste memory in ecc_blocks;
      
       - Restore ECC information printouts;
      
       - A small code cleanup: use kmemdup where appropriate.
      
      * tag 'for-v3.10' of git://git.infradead.org/users/cbou/linux-pstore:
        pstore/ram: Restore ecc information block
        pstore/ram: Allow specifying ecc parameters in platform data
        pstore/ram: Include ecc_size when calculating ecc_block
        pstore: Replace calls to kmalloc and memcpy with kmemdup
      00fdffb5
    • Jan Kara's avatar
      Merge branch 'for_next' into for_linus · fb1c2d82
      Jan Kara authored
      fb1c2d82
  3. 02 May, 2013 32 commits
    • Al Viro's avatar
      ipc: fix GETALL/IPC_RM race for sysv semaphores · ce857229
      Al Viro authored
      
      
      We can step on WARN_ON_ONCE() in sem_getref() if a semaphore is removed
      just as we are about to call sem_getref() from semctl_main(); results
      are not pretty.
      
      We should fail with -EIDRM, same as if IPC_RM happened while we'd been
      doing allocation there.  This also expands sem_getref() at its only
      callsite (and fixed there), while sem_getref_and_unlock() is simply
      killed off - it has no callers at all.
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      Acked-by: default avatarDavidlohr Bueso <davidlohr.bueso@hp.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ce857229
    • Linus Torvalds's avatar
      Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux · 20a2078c
      Linus Torvalds authored
      Pull drm updates from Dave Airlie:
       "This is the main drm pull request for 3.10.
      
        Wierd bits:
         - OMAP drm changes required OMAP dss changes, in drivers/video, so I
           took them in here.
         - one more fbcon fix for font handover
         - VT switch avoidance in pm code
         - scatterlist helpers for gpu drivers - have acks from akpm
      
        Highlights:
         - qxl kms driver - driver for the spice qxl virtual GPU
      
        Nouveau:
         - fermi/kepler VRAM compression
         - GK110/nvf0 modesetting support.
      
        Tegra:
         - host1x core merged with 2D engine support
      
        i915:
         - vt switchless resume
         - more valleyview support
         - vblank fixes
         - modesetting pipe config rework
      
        radeon:
         - UVD engine support
         - SI chip tiling support
         - GPU registers initialisation from golden values.
      
        exynos:
         - device tree changes
         - fimc block support
      
        Otherwise:
         - bunches of fixes all over the place."
      
      * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (513 commits)
        qxl: update to new idr interfaces.
        drm/nouveau: fix build with nv50->nvc0
        drm/radeon: fix handling of v6 power tables
        drm/radeon: clarify family checks in pm table parsing
        drm/radeon: consolidate UVD clock programming
        drm/radeon: fix UPLL_REF_DIV_MASK definition
        radeon: add bo tracking debugfs
        drm/radeon: add new richland pci ids
        drm/radeon: add some new SI PCI ids
        drm/radeon: fix scratch reg handling for UVD fence
        drm/radeon: allocate SA bo in the requested domain
        drm/radeon: fix possible segfault when parsing pm tables
        drm/radeon: fix endian bugs in atom_allocate_fb_scratch()
        OMAPDSS: TFP410: return EPROBE_DEFER if the i2c adapter not found
        OMAPDSS: VENC: Add error handling for venc_probe_pdata
        OMAPDSS: HDMI: Add error handling for hdmi_probe_pdata
        OMAPDSS: RFBI: Add error handling for rfbi_probe_pdata
        OMAPDSS: DSI: Add error handling for dsi_probe_pdata
        OMAPDSS: SDI: Add error handling for sdi_probe_pdata
        OMAPDSS: DPI: Add error handling for dpi_probe_pdata
        ...
      20a2078c
    • Dave Airlie's avatar
      qxl: update to new idr interfaces. · 307b9c02
      Dave Airlie authored
      
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      307b9c02
    • Dave Airlie's avatar
      Merge branch 'server-fixes' into drm-next · d2dbaaf6
      Dave Airlie authored
      Merge the fixes for the server driver dirty update paths
      * server-fixes:
        drm/cirrus: deal with bo reserve fail in dirty update path
        drm/ast: deal with bo reserve fail in dirty update path
        drm/mgag200: deal with bo reserve fail in dirty update path
      d2dbaaf6
    • Dave Airlie's avatar
      Merge tag 'omapdss-for-3.10-fixes' of git://gitorious.org/linux-omap-dss2/linux into drm-next · 7e17fc0b
      Dave Airlie authored
      OMAPDSS fixes for 3.10:
      
      * Compilation fix when DSI is disabled in Kconfig
      * Basic deferred probe support to fix DT boot
      
      * tag 'omapdss-for-3.10-fixes' of git://gitorious.org/linux-omap-dss2/linux:
        OMAPDSS: TFP410: return EPROBE_DEFER if the i2c adapter not found
        OMAPDSS: VENC: Add error handling for venc_probe_pdata
        OMAPDSS: HDMI: Add error handling for hdmi_probe_pdata
        OMAPDSS: RFBI: Add error handling for rfbi_probe_pdata
        OMAPDSS: DSI: Add error handling for dsi_probe_pdata
        OMAPDSS: SDI: Add error handling for sdi_probe_pdata
        OMAPDSS: DPI: Add error handling for dpi_probe_pdata
        OMAPDSS: VENC: use platform_driver_register()
        OMAPDSS: HDMI: use platform_driver_register()
        OMAPDSS: RFBI: use platform_driver_register()
        OMAPDSS: DSI: use platform_driver_register()
        OMAPDSS: SDI: use platform_driver_register()
        OMAPDSS: DPI: use platform_driver_register()
        OMAPFB: defer probe if no displays
        OMAPFB: use module_platform_driver()
        OMAPDSS: Makefile: move omapfb after panels
        OMAPDSS: DPI: fix compilation if DSI not compiled in
      7e17fc0b
    • Dave Airlie's avatar
      Merge branch 'drm-next-3.10-2' of git://people.freedesktop.org/~agd5f/linux into drm-next · 61109488
      Dave Airlie authored
      Just some fixes that have accumulated over the last couple of
      weeks and some new PCI ids.
      
      * 'drm-next-3.10-2' of git://people.freedesktop.org/~agd5f/linux:
        drm/radeon: fix handling of v6 power tables
        drm/radeon: clarify family checks in pm table parsing
        drm/radeon: consolidate UVD clock programming
        drm/radeon: fix UPLL_REF_DIV_MASK definition
        radeon: add bo tracking debugfs
        drm/radeon: add new richland pci ids
        drm/radeon: add some new SI PCI ids
        drm/radeon: fix scratch reg handling for UVD fence
        drm/radeon: allocate SA bo in the requested domain
        drm/radeon: fix possible segfault when parsing pm tables
        drm/radeon: fix endian bugs in atom_allocate_fb_scratch()
      61109488
    • Linus Torvalds's avatar
      Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 0279b3c0
      Linus Torvalds authored
      Pull scheduler fixes from Ingo Molnar:
       "This fixes the cputime scaling overflow problems for good without
        having bad 32-bit overhead, and gets rid of the div64_u64_rem() helper
        as well."
      
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        Revert "math64: New div64_u64_rem helper"
        sched: Avoid prev->stime underflow
        sched: Do not account bogus utime
        sched: Avoid cputime scaling overflow
      0279b3c0
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 797994f8
      Linus Torvalds authored
      Pull crypto update from Herbert Xu:
      
       - XTS mode optimisation for twofish/cast6/camellia/aes on x86
      
       - AVX2/x86_64 implementation for blowfish/twofish/serpent/camellia
      
       - SSSE3/AVX/AVX2 optimisations for sha256/sha512
      
       - Added driver for SAHARA2 crypto accelerator
      
       - Fix for GMAC when used in non-IPsec secnarios
      
       - Added generic CMAC implementation (including IPsec glue)
      
       - IP update for crypto/atmel
      
       - Support for more than one device in hwrng/timeriomem
      
       - Added Broadcom BCM2835 RNG driver
      
       - Misc fixes
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (59 commits)
        crypto: caam - fix job ring cleanup code
        crypto: camellia - add AVX2/AES-NI/x86_64 assembler implementation of camellia cipher
        crypto: serpent - add AVX2/x86_64 assembler implementation of serpent cipher
        crypto: twofish - add AVX2/x86_64 assembler implementation of twofish cipher
        crypto: blowfish - add AVX2/x86_64 implementation of blowfish cipher
        crypto: tcrypt - add async cipher speed tests for blowfish
        crypto: testmgr - extend camellia test-vectors for camellia-aesni/avx2
        crypto: aesni_intel - fix Kconfig problem with CRYPTO_GLUE_HELPER_X86
        crypto: aesni_intel - add more optimized XTS mode for x86-64
        crypto: x86/camellia-aesni-avx - add more optimized XTS code
        crypto: cast6-avx: use new optimized XTS code
        crypto: x86/twofish-avx - use optimized XTS code
        crypto: x86 - add more optimized XTS-mode for serpent-avx
        xfrm: add rfc4494 AES-CMAC-96 support
        crypto: add CMAC support to CryptoAPI
        crypto: testmgr - add empty test vectors for null ciphers
        crypto: testmgr - add AES GMAC test vectors
        crypto: gcm - fix rfc4543 to handle async crypto correctly
        crypto: gcm - make GMAC work when dst and src are different
        hwrng: timeriomem - added devicetree hooks
        ...
      797994f8
    • Linus Torvalds's avatar
      Merge tag 'for-linus-v3.10-rc1' of git://oss.sgi.com/xfs/xfs · c8d85669
      Linus Torvalds authored
      Pull xfs update from Ben Myers:
       "For 3.10-rc1 we have a number of bug fixes and cleanups and a
        currently experimental feature from David Chinner, CRCs protection for
        metadata.  CRCs are enabled by using mkfs.xfs to create a filesystem
        with the feature bits set.
      
         - numerous fixes for speculative preallocation
         - don't verify buffers on IO errors
         - rename of random32 to prandom32
         - refactoring/rearrangement in xfs_bmap.c
         - removal of unused m_inode_shrink in struct xfs_mount
         - fix error handling of xfs_bufs and readahead
         - quota driven preallocation throttling
         - fix WARN_ON in xfs_vm_releasepage
         - add ratelimited printk for different alert levels
         - fix spurious forced shutdowns due to freed Extent Free Intents
         - remove some obsolete XLOG_CIL_HARD_SPACE_LIMIT() macros
         - remove some obsoleted comments
         - (experimental) CRC support for metadata"
      
      * tag 'for-linus-v3.10-rc1' of git://oss.sgi.com/xfs/xfs: (46 commits)
        xfs: fix da node magic number mismatches
        xfs: Remote attr validation fixes and optimisations
        xfs: Teach dquot recovery about CONFIG_XFS_QUOTA
        xfs: add metadata CRC documentation
        xfs: implement extended feature masks
        xfs: add CRC checks to the superblock
        xfs: buffer type overruns blf_flags field
        xfs: add buffer types to directory and attribute buffers
        xfs: add CRC protection to remote attributes
        xfs: split remote attribute code out
        xfs: add CRCs to attr leaf blocks
        xfs: add CRCs to dir2/da node blocks
        xfs: shortform directory offsets change for dir3 format
        xfs: add CRC checking to dir2 leaf blocks
        xfs: add CRC checking to dir2 data blocks
        xfs: add CRC checking to dir2 free blocks
        xfs: add CRC checks to block format directory blocks
        xfs: add CRC checks to remote symlinks
        xfs: split out symlink code into it's own file.
        xfs: add version 3 inode format with CRCs
        ...
      c8d85669
    • Linus Torvalds's avatar
      Merge tag 'for-linus-docs-2012-05-02' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci · a9586d9b
      Linus Torvalds authored
      Pull ReportingBugs rewrite from Sarah Sharp:
       "Here are the updates to ReportingBugs that were discussed and acked a
        couple weeks ago.  I've updated the fifth patch with your ack, as
        requested"
      
      * tag 'for-linus-docs-2012-05-02' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci:
        Docs: Move ref to Frohwalt Egerer to end of REPORTING-BUGS
        Docs: Add a tips section to REPORTING-BUGS.
        Docs: Expectations for bug reporters and maintainers
        Docs: Add info on supported kernels to REPORTING-BUGS.
        Docs: Add "Gather info" section to REPORTING-BUGS.
        Docs: Step-by-step directions for reporting bugs.
        Trivial: docs: Remove six-space indentation in REPORTING-BUGS.
      a9586d9b
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · a8bdf745
      Linus Torvalds authored
      Pull x86 fixes from Peter Anvin:
       "Two regression fixes:
      
        1. On 64 bits, we would set NX on non-NX-capable hardware (very rare
           in 64-bit land, but a nonzero subset.)
      
        2. Fix suspend/resume across kernel versions"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86-64, init: Do not set NX bits on non-NX capable hardware
        x86, gdt, hibernate: Store/load GDT for hibernate path.
      a8bdf745
    • Linus Torvalds's avatar
      Merge tag 'pinctrl-fixes-v3.10-1' of... · fbe8ed63
      Linus Torvalds authored
      Merge tag 'pinctrl-fixes-v3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
      
      Pull pinctrl fixes from Linus Walleij:
       "Two fixes to the pinctrl subsystem for v3.10:
         - A quite apparent mutex fix in an untested codepath
         - A compile warning fix in the plgpio driver"
      
      * tag 'pinctrl-fixes-v3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
        pinctrl: fix mutex deadlock in get_pinctrl_dev_from_of_node()
        pinctrl: plgpio: add CONFIG_PM_SLEEP to suspend/resume functions
      fbe8ed63
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 99bece77
      Linus Torvalds authored
      Pull i2c changes from Wolfram Sang:
      
       - an arbitration driver.  While the driver is quite simple, it caused
         discussion if we need additional arbitration on top of the one
         specified in the I2C standard.  Conclusion is that I accept a few
         generic mechanisms, but not very specific ones.
      
       - the core lost the detach_adapter() call.  It has no users anymore and
         was in the way for other cleanups.  attach_adapter() is sadly still
         there since there are users waiting to be converted.
      
       - the core gained a bus recovery infrastructure.  I2C defines a way to
         recover if the data line is stalled.  This mechanism is now in the
         core and drivers can now pass some data to make use of it.
      
       - bigger driver cleanups for designware, s3c2410
      
       - removing superfluous refcounting from drivers
      
       - removing Ben Dooks as second maintainer due to inactivity.  Thanks
         for all your work so far, Ben!
      
       - bugfixes, feature additions, devicetree fixups, simplifications...
      
      * 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (38 commits)
        i2c: xiic: must always write 16-bit words to TX_FIFO
        i2c: octeon: use HZ in timeout value
        i2c: octeon: Fix i2c fail problem when a process is terminated by a signal
        i2c: designware-pci: drop superfluous {get|put}_device
        i2c: designware-plat: drop superfluous {get|put}_device
        i2c: davinci: drop superfluous {get|put}_device
        MAINTAINERS: Ben Dooks is inactive regarding I2C
        i2c: mux: Add i2c-arb-gpio-challenge 'mux' driver
        i2c: at91: convert to dma_request_slave_channel_compat()
        i2c: mxs: do error checking and handling in PIO mode
        i2c: mxs: remove races in PIO code
        i2c-designware: switch to use runtime PM autosuspend
        i2c-designware: use usleep_range() in the busy-loop
        i2c-designware: enable/disable the controller properly
        i2c-designware: use dynamic adapter numbering on Lynxpoint
        i2c-designware-pci: use managed functions pcim_* and devm_*
        i2c-designware-pci: use dev_err() instead of printk()
        i2c-designware: move to managed functions (devm_*)
        i2c: remove CONFIG_HOTPLUG ifdefs
        i2c: s3c2410: Add SMBus emulation for block read
        ...
      99bece77
    • Linus Torvalds's avatar
      Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · 736a2dd2
      Linus Torvalds authored
      Pull virtio & lguest updates from Rusty Russell:
       "Lots of virtio work which wasn't quite ready for last merge window.
      
        Plus I dived into lguest again, reworking the pagetable code so we can
        move the switcher page: our fixmaps sometimes take more than 2MB now..."
      
      Ugh.  Annoying conflicts with the tcm_vhost -> vhost_scsi rename.
      Hopefully correctly resolved.
      
      * tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: (57 commits)
        caif_virtio: Remove bouncing email addresses
        lguest: improve code readability in lg_cpu_start.
        virtio-net: fill only rx queues which are being used
        lguest: map Switcher below fixmap.
        lguest: cache last cpu we ran on.
        lguest: map Switcher text whenever we allocate a new pagetable.
        lguest: don't share Switcher PTE pages between guests.
        lguest: expost switcher_pages array (as lg_switcher_pages).
        lguest: extract shadow PTE walking / allocating.
        lguest: make check_gpte et. al return bool.
        lguest: assume Switcher text is a single page.
        lguest: rename switcher_page to switcher_pages.
        lguest: remove RESERVE_MEM constant.
        lguest: check vaddr not pgd for Switcher protection.
        lguest: prepare to make SWITCHER_ADDR a variable.
        virtio: console: replace EMFILE with EBUSY for already-open port
        virtio-scsi: reset virtqueue affinity when doing cpu hotplug
        virtio-scsi: introduce multiqueue support
        virtio-scsi: push vq lock/unlock into virtscsi_vq_done
        virtio-scsi: pass struct virtio_scsi to virtqueue completion function
        ...
      736a2dd2
    • Linus Torvalds's avatar
      Merge tag 'vfio-for-v3.10' of git://github.com/awilliam/linux-vfio · 0b2e3b6b
      Linus Torvalds authored
      Pull vfio updates from Alex Williamson:
       "Changes include extension to support PCI AER notification to
        userspace, byte granularity of PCI config space and access to
        unarchitected PCI config space, better protection around IOMMU driver
        accesses, default file mode fix, and a few misc cleanups."
      
      * tag 'vfio-for-v3.10' of git://github.com/awilliam/linux-vfio:
        vfio: Set container device mode
        vfio: Use down_reads to protect iommu disconnects
        vfio: Convert container->group_lock to rwsem
        PCI/VFIO: use pcie_flags_reg instead of access PCI-E Capabilities Register
        vfio-pci: Enable raw access to unassigned config space
        vfio-pci: Use byte granularity in config map
        vfio: make local function vfio_pci_intx_unmask_handler() static
        VFIO-AER: Vfio-pci driver changes for supporting AER
        VFIO: Wrapper for getting reference to vfio_device
      0b2e3b6b
    • Dave Airlie's avatar
      drm/nouveau: fix build with nv50->nvc0 · f49e7259
      Dave Airlie authored
      
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      f49e7259
    • Russell King's avatar
      Merge branch 'cleanup' into for-linus · 33b9f582
      Russell King authored
      Conflicts:
      	arch/arm/plat-omap/dmtimer.c
      33b9f582
    • Russell King's avatar
      Merge branches 'devel-stable', 'entry', 'fixes', 'mach-types', 'misc' and... · 946342d0
      Russell King authored
      Merge branches 'devel-stable', 'entry', 'fixes', 'mach-types', 'misc' and 'smp-hotplug' into for-linus
      946342d0
    • Linus Torvalds's avatar
      Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost · e9589300
      Linus Torvalds authored
      Pull vhost cleanups and fixes from Michael Tsirkin:
       "Here are vhost cleanups and fixes by Asias He and myself.  They affect
        both vhost-net and vhost-scsi devices.  They also *depend* on both
        net-next and target-pending, where the net and target commits these
        changes depend on are already merged.  So merging through the common
        vhost tree."
      
      * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
        vhost_scsi: module rename
        tcm_vhost: header split up
        vhost: src file renames
        vhost: fix error handling in RESET_OWNER ioctl
        tcm_vhost: remove virtio-net.h dependency
        vhost: move per-vq net specific fields out to net
        tcm_vhost: document inflight ref-counting use
        vhost: move vhost-net zerocopy fields to net.c
        tcm_vhost: Wait for pending requests in vhost_scsi_flush()
        vhost: Allow device specific fields per vq
      e9589300
    • Russell King's avatar
      Merge commit '73053d97' into smp-hotplug · 5e45a0a1
      Russell King authored
      
      
      This is to fix a merge problem with mach-highbank/hotplug.c, which git
      silently resolves, but wrongly.  This commit contains the correct
      resolution.
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      5e45a0a1
    • Russell King's avatar
      ARM: EXYNOS: remove unnecessary use of IS_ERR_VALUE() · 008ca431
      Russell King authored
      
      
      s5p_register_gpio_interrupt() returns 0 or positive for success, and
      -ve for errors, so just use the standard >= 0 test.
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      008ca431
    • Russell King's avatar
      ARM: IMX: remove unnecessary use of IS_ERR_VALUE() · d98642c3
      Russell King authored
      
      
      device_register() returns -ve values for errors, and zero for success.
      There's no need to obfuscate the code with IS_ERR_VALUE().
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      d98642c3
    • Russell King's avatar
      ARM: OMAP: use consistent error checking · c48cd659
      Russell King authored
      
      
      Consistently check errors using the usual method used in the kernel
      for much of its history.  For instance:
      
      int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t)
      {
      	int div;
      	div = gpmc_calc_divider(t->sync_clk);
      	if (div < 0)
      		return div;
      static int gpmc_set_async_mode(int cs, struct gpmc_timings *t)
      {
      ...
      	return gpmc_cs_set_timings(cs, t);
      
      .....
      	ret = gpmc_set_async_mode(gpmc_onenand_data->cs, &t);
      	if (IS_ERR_VALUE(ret))
      		return ret;
      
      So, gpmc_cs_set_timings() thinks any negative return value is an error,
      but where we check that in higher levels, only a limited range are
      errors...
      
      There is only _one_ use of IS_ERR_VALUE() in arch/arm which is really
      appropriate, and that is in arch/arm/include/asm/syscall.h:
      
      static inline long syscall_get_error(struct task_struct *task,
      				     struct pt_regs *regs)
      {
      	unsigned long error = regs->ARM_r0;
      	return IS_ERR_VALUE(error) ? error : 0;
      }
      
      because this function really does have to differentiate between error
      return values and addresses which look like negative numbers (eg, from
      mmap()).
      
      So, here's a patch to remove them from OMAP, except for the above.
      Acked-by: default avatarTony Lindgren <tony@atomide.com>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      c48cd659
    • Russell King's avatar
      ARM: cleanup: OMAP hwmod error checking · 857835c6
      Russell King authored
      
      
      omap_hwmod_lookup() only returns NULL on error, never an error pointer.
      Checking the returned pointer using IS_ERR_OR_NULL() is needless
      overhead.  Use a simple !ptr check instead.
      
      OMAP devices (oh->od) always have a valid platform device attached (see
      omap_device_alloc()) so there's no point validating the platform device
      pointer (we will have already oopsed long before if this is not the
      case here.)
      
      Lastly, oh->od is only ever NULL or a valid omap device pointer - 'oh'
      comes from the statically declared hwmod tables, and the pointer is
      only filled in by omap_device_alloc() at a point where the omap device
      pointer must be valid.
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      857835c6
    • H. Peter Anvin's avatar
      x86-64, init: Do not set NX bits on non-NX capable hardware · 78d77df7
      H. Peter Anvin authored
      
      
      During early init, we would incorrectly set the NX bit even if the NX
      feature was not supported.  Instead, only set this bit if NX is
      actually available and enabled.  We already do very early detection of
      the NX bit to enable it in EFER, this simply extends this detection to
      the early page table mask.
      Reported-by: default avatarFernando Luis Vázquez Cao <fernando@oss.ntt.co.jp>
      Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
      Link: http://lkml.kernel.org/r/1367476850.5660.2.camel@nexus
      Cc: <stable@vger.kernel.org> v3.9
      78d77df7
    • Konrad Rzeszutek Wilk's avatar
      x86, gdt, hibernate: Store/load GDT for hibernate path. · cc456c4e
      Konrad Rzeszutek Wilk authored
      The git commite7a5cd06
      
      
      ("x86-64, gdt: Store/load GDT for ACPI S3 or hibernate/resume path
      is not needed.") assumes that for the hibernate path the booting
      kernel and the resuming kernel MUST be the same. That is certainly
      the case for a 32-bit kernel (see check_image_kernel and
      CONFIG_ARCH_HIBERNATION_HEADER config option).
      
      However for 64-bit kernels it is OK to have a different kernel
      version (and size of the image) of the booting and resuming kernels.
      Hence the above mentioned git commit introduces an regression.
      
      This patch fixes it by introducing a 'struct desc_ptr gdt_desc'
      back in the 'struct saved_context'. However instead of having in the
      'save_processor_state' and 'restore_processor_state' the
      store/load_gdt calls, we are only saving the GDT in the
      save_processor_state.
      
      For the restore path the lgdt operation is done in
      hibernate_asm_[32|64].S in the 'restore_registers' path.
      
      The apt reader of this description will recognize that only 64-bit
      kernels need this treatment, not 32-bit. This patch adds the logic
      in the 32-bit path to be more similar to 64-bit so that in the future
      the unification process can take advantage of this.
      
      [ hpa: this also reverts an inadvertent on-disk format change ]
      Suggested-by: default avatar"H. Peter Anvin" <hpa@zytor.com>
      Acked-by: default avatar"Rafael J. Wysocki" <rjw@sisk.pl>
      Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      Link: http://lkml.kernel.org/r/1367459610-9656-2-git-send-email-konrad.wilk@oracle.com
      
      Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
      cc456c4e
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 5a148af6
      Linus Torvalds authored
      Pull powerpc update from Benjamin Herrenschmidt:
       "The main highlights this time around are:
      
         - A pile of addition POWER8 bits and nits, such as updated
           performance counter support (Michael Ellerman), new branch history
           buffer support (Anshuman Khandual), base support for the new PCI
           host bridge when not using the hypervisor (Gavin Shan) and other
           random related bits and fixes from various contributors.
      
         - Some rework of our page table format by Aneesh Kumar which fixes a
           thing or two and paves the way for THP support.  THP itself will
           not make it this time around however.
      
         - More Freescale updates, including Altivec support on the new e6500
           cores, new PCI controller support, and a pile of new boards support
           and updates.
      
         - The usual batch of trivial cleanups & fixes"
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (156 commits)
        powerpc: Fix build error for book3e
        powerpc: Context switch the new EBB SPRs
        powerpc: Turn on the EBB H/FSCR bits
        powerpc: Replace CPU_FTR_BCTAR with CPU_FTR_ARCH_207S
        powerpc: Setup BHRB instructions facility in HFSCR for POWER8
        powerpc: Fix interrupt range check on debug exception
        powerpc: Update tlbie/tlbiel as per ISA doc
        powerpc: Print page size info during boot
        powerpc: print both base and actual page size on hash failure
        powerpc: Fix hpte_decode to use the correct decoding for page sizes
        powerpc: Decode the pte-lp-encoding bits correctly.
        powerpc: Use encode avpn where we need only avpn values
        powerpc: Reduce PTE table memory wastage
        powerpc: Move the pte free routines from common header
        powerpc: Reduce the PTE_INDEX_SIZE
        powerpc: Switch 16GB and 16MB explicit hugepages to a different page table format
        powerpc: New hugepage directory format
        powerpc: Don't truncate pgd_index wrongly
        powerpc: Don't hard code the size of pte page
        powerpc: Save DAR and DSISR in pt_regs on MCE
        ...
      5a148af6
    • Linus Torvalds's avatar
      Merge tag 'multiplatform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 99c6bcf4
      Linus Torvalds authored
      Pull ARM SoC multiplatform updates from Olof Johansson:
       "More multiplatform enablement for ARM platforms.  The ones converted
        in this branch are:
      
         - bcm2835
         - cns3xxx
         - sirf
         - nomadik
         - msx
         - spear
         - tegra
         - ux500
      
        We're getting close to having most of them converted!
      
        One of the larger platforms remaining is Samsung Exynos, and there are
        a bunch of supporting patches in this merge window for it.  There was
        a patch in this branch to a early version of multiplatform conversion,
        but it ended up being reverted due to need of more bake time.  The
        revert commit is part of the branch since it would have required
        rebasing multiple dependent branches and they were stable by then"
      
      * tag 'multiplatform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (70 commits)
        mmc: sdhci-s3c: Fix operation on non-single image Samsung platforms
        clocksource: nomadik-mtu: fix up clocksource/timer
        Revert "ARM: exynos: enable multiplatform support"
        ARM: SPEAr13xx: Fix typo "ARCH_HAVE_CPUFREQ"
        ARM: exynos: enable multiplatform support
        rtc: s3c: make header file local
        mtd: onenand/samsung: make regs-onenand.h file local
        thermal/exynos: remove unnecessary header inclusions
        mmc: sdhci-s3c: remove platform dependencies
        ARM: samsung: move mfc device definition to s5p-dev-mfc.c
        ARM: exynos: move debug-macro.S to include/debug/
        ARM: exynos: prepare for sparse IRQ
        ARM: exynos: introduce EXYNOS_ATAGS symbol
        ARM: tegra: build assembly files with -march=armv7-a
        ARM: Push selects for TWD/SCU into machine entries
        ARM: ux500: build hotplug.o for ARMv7-a
        ARM: ux500: move to multiplatform
        ARM: ux500: make remaining headers local
        ARM: ux500: make irqs.h local to platform
        ARM: ux500: get rid of <mach/[hardware|db8500-regs].h>
        ...
      99c6bcf4
    • Linus Torvalds's avatar
      Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 97b1007a
      Linus Torvalds authored
      Pull ARM SoC platform updates from Olof Johansson:
       "This branch contains part 1 of the platform updates for 3.10.  Among
        the highlights:
      
         - Support for the new Atmel Cortex-A5 based platforms (SAMA5D3)
         - New support for CSR SiRFatlas6 SoCs
         - A handful of updates for NVidia T114 (a.k.a. Tegra 4)
         - A bunch of updates for the shmobile platforms
         - A handful of updates for davinci
         - A few updates for Qualcomm MSM
         - Plus a handful of other patches, defconfig updates, etc."
      
      * tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (135 commits)
        ARM: tegra: pm: fix build error w/o PM_SLEEP
        ARM: davinci: ensure global variables are declared
        ARM: davinci: sram.c: fix incorrect type in assignment
        ARM: davinci: da8xx dt: make file local symbols static
        ARM: davinci: da8xx: add remoteproc support
        ARM: socfpga: Upgrade clk driver for socfpga to make use of dts clock entries
        ARM: socfpga: Add clock entries into device tree
        ARM: socfpga: Enable soft reset
        ARM: EXYNOS: replace cpumask by the corresponding macro
        ARM: EXYNOS: handle properly the return values
        ARM: EXYNOS: factor out the idle states
        ARM: OMAP4: Enable fix for Cortex-A9 erratas
        ARM: OMAP2+: Export SoC information to userspace
        ARM: OMAP2+: SoC name and revision unification
        ARM: OMAP2+: Move common part of late init into common function
        ARM: tegra: pm: remove duplicated include from pm.c
        ARM: davinci: da850: override mmc DT node device name
        ARM: davinci: da850: add mmc DT entries
        mmc: davinci_mmc: add DT support
        ARM: SAMSUNG: check processor type before cache restoration in resume
        ...
      97b1007a
    • Linus Torvalds's avatar
      Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · dfab34aa
      Linus Torvalds authored
      Pull ARM SoC device-tree updates from Olof Johansson:
       "Part 1 of device-tree updates for 3.10.  The bulk of the churn in this
        branch is due to i.MX moving from C-defined pin control over to device
        tree, which is a one-time conversion that will allow greater
        flexibility down the road.
      
        Besides that, there's PCI-e bindings for Marvell mvebu platforms and a
        handful of cleanups to tegra due to the new include file functionality
        of the device tree compiler"
      
      * tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (113 commits)
        arm: mvebu: PCIe Device Tree informations for Armada XP GP
        arm: mvebu: PCIe Device Tree informations for Armada 370 DB
        arm: mvebu: PCIe Device Tree informations for Armada 370 Mirabox
        arm: mvebu: PCIe Device Tree informations for Armada XP DB
        arm: mvebu: PCIe Device Tree informations for OpenBlocks AX3-4
        arm: mvebu: add PCIe Device Tree informations for Armada XP
        arm: mvebu: add PCIe Device Tree informations for Armada 370
        ARM: sunxi: unify osc24M_fixed and osc24M
        arm: vt8500: Add SDHC support to WM8505 DT
        ARM: dts: Add a 64 bits version of the skeleton device tree
        ARM: mvebu: Add Device Bus and CFI flash memory support to defconfig
        ARM: mvebu: Add support for NOR flash device on Openblocks AX3 board
        ARM: mvebu: Add support for NOR flash device on Armada XP-GP board
        ARM: mvebu: Add Device Bus support for Armada 370/XP SoC
        ARM: dts: imx6dl-wandboard: Add USB Host support
        ARM: dts: imx51 cpu node
        ARM: dts: Add missing imx27-phytec-phycore dtb target
        ARM: dts: Add NFC support for i.MX27 Phytec PCM038 module
        ARM: i.MX51: Add PATA support
        ARM: dts: Add initial support for Wandboard Dual-Lite
        ...
      dfab34aa
    • Linus Torvalds's avatar
      Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · a7726350
      Linus Torvalds authored
      Pull ARM SoC cleanup from Olof Johansson:
       "Here is a collection of cleanup patches.  Among the pieces that stand
        out are:
      
         - The deletion of h720x platforms
         - Split of at91 non-dt platforms to their own Kconfig file to keep
           them separate
         - General cleanups and refactoring of i.MX and MXS platforms
         - Some restructuring of clock tables for OMAP
         - Convertion of PMC driver for Tegra to dt-only
         - Some renames of sunxi -> sun4i (Allwinner A10)
         - ... plus a bunch of other stuff that I haven't mentioned"
      
      * tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (119 commits)
        ARM: i.MX: remove unused ARCH_* configs
        ARM i.MX53: remove platform ahci support
        ARM: sunxi: Rework the restart code
        irqchip: sunxi: Rename sunxi to sun4i
        irqchip: sunxi: Make use of the IRQCHIP_DECLARE macro
        clocksource: sunxi: Rename sunxi to sun4i
        clocksource: sunxi: make use of CLKSRC_OF
        clocksource: sunxi: Cleanup the timer code
        ARM: at91: remove trailing semicolon from macros
        ARM: at91/setup: fix trivial typos
        ARM: EXYNOS: remove "config EXYNOS_DEV_DRM"
        ARM: EXYNOS: change the name of USB ohci header
        ARM: SAMSUNG: Remove unnecessary code for dma
        ARM: S3C24XX: Remove unused GPIO drive strength register definitions
        ARM: OMAP4+: PM: Restore CPU power state to ON with clockdomain force wakeup method
        ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2412
        ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2410
        ARM: S3C24XX: Removed unneeded dependency on ARCH_S3C24XX for boards
        ARM: SAMSUNG: Fix typo "CONFIG_SAMSUNG_DEV_RTC"
        ARM: S5P64X0: Fix typo "CONFIG_S5P64X0_SETUP_SDHCI"
        ...
      a7726350
    • Linus Torvalds's avatar
      Merge tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 4d26aa30
      Linus Torvalds authored
      Pull ARM SoC non-critical fixes from Olof Johansson:
       "Here is a collection of fixes (and some intermixed cleanups) that were
        considered less important and thus not included in the later parts of
        the 3.9-rc cycle.
      
        It's a bit all over the map, contents wise.  A series of ux500 fixes
        and cleanups, a bunch of various fixes for OMAP and tegra, and some
        for Freescale i.MX and even Qualcomm MSM.
      
        Note that there's also a patch on this branch to globally turn off
        -Wmaybe-uninitialized when building with -Os.  It's been posted
        several times by Arnd and no dissent was raised, but nobody seemed
        interested to pick it up.  So here it is, as the topmost patch."
      
      * tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (70 commits)
        Turn off -Wmaybe-uninitialized when building with -Os
        ARM: orion5x: include linux/cpu.h
        ARM: tegra: call cpu_do_idle from C code
        ARM: u300: fix ages old copy/paste bug
        ARM: OMAP2+: add dependencies on ARCH_MULTI_V6/V7
        ARM: tegra: solve adr range issue with THUMB2_KERNEL enabled
        ARM: tegra: fix relocation truncated error when THUMB2_KERNEL enabled
        ARM: tegra: fix build error when THUMB2_KERNEL enabled
        ARM: msm: Fix uncompess.h tx underrun check
        ARM: vexpress: Remove A9 PMU compatible values for non-A9 platforms
        ARM: cpuimx27 and mbimx27: prepend CONFIG_ to Kconfig macro
        ARM: OMAP2+: fix typo "CONFIG_BRIDGE_DVFS"
        ARM: OMAP1: remove "config MACH_OMAP_HTCWIZARD"
        ARM: mach-imx: mach-imx6q: Fix sparse warnings
        ARM: mach-imx: src: Include "common.h
        ARM: mach-imx: gpc: Include "common.h"
        ARM: mach-imx: avic: Staticize *avic_base
        ARM: mach-imx: tzic: Staticize *tzic_base
        ARM: mach-imx: clk: Include "clk.h"
        ARM: mach-imx: clk-busy: Staticize clk_busy_mux_ops
        ...
      4d26aa30