1. 05 Sep, 2013 10 commits
    • Linus Torvalds's avatar
      Merge tag 'fbdev-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux · 9ab073bc
      Linus Torvalds authored
      Pull fbdev changes from Tomi Valkeinen:
       - Improvements to da8xx-fb to make it support v2 of the LCDC IP, used
         eg in BeagleBone
       - Himax HX8369 controller support
       - Various small fixes and cleanups
      * tag 'fbdev-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (42 commits)
        video: da8xx-fb: fix the polarities of the hsync/vsync pulse
        video: da8xx-fb: support lcdc v2 timing register expansion
        video: da8xx-fb: fixing timing off by one errors
        video: da8xx-fb fixing incorrect porch mappings
        video: xilinxfb: replace devm_request_and_ioremap by devm_ioremap_resource
        fbmem: move EXPORT_SYMBOL annotation next to symbol declarations
        drivers: video: fbcmap: remove the redundency and incorrect checkings
        video: mxsfb: simplify use of devm_ioremap_resource
        Release efifb's colormap in efifb_destroy()
        at91/avr32/atmel_lcdfb: prepare clk before calling enable
        video: exynos: Ensure definitions match prototypes
        OMAPDSS: fix WARN_ON in 'alpha_blending_enabled' sysfs file
        OMAPDSS: HDMI: Fix possible NULL reference
        video: da8xx-fb: adding am33xx as dependency
        video: da8xx-fb: let compiler decide what to inline
        video: da8xx-fb: make clock naming consistent
        video: da8xx-fb: set upstream clock rate (if reqd)
        video: da8xx-fb: reorganize panel detection
        video: da8xx-fb: ensure non-null cfg in pdata
        video: da8xx-fb: use devres
    • Linus Torvalds's avatar
      Merge tag 'fbdev-3.12-omap-legacy-removal' of... · eced5a0a
      Linus Torvalds authored
      Merge tag 'fbdev-3.12-omap-legacy-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux
      Pull OMAP specific fbdev changes from Tomi Valkeinen:
       "I've got this pull request separate from the main fbdev pull request,
        as this contains a bunch of OMAP board file changes and thus could
        possibly be rejected in case of bad conflicts.
        The removal of the old display drivers depend on the board file
        changes, so Tony Lindgren suggested taking them together via fbdev
        tree.  These are in linux-next, and also Tony didn't see any conflicts
        with any of the branches he had, so they should go in clean.
         - Change the OMAP board files to use the new OMAP display drivers
         - Remove all the old drivers, and the related auxiliary code"
      * tag 'fbdev-3.12-omap-legacy-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (35 commits)
        OMAPDSS: rename omap_dss_device's 'device' field to 'dst'
        OMAPDSS: rename omap_dss_device's 'output' to 'src'
        OMAPDSS: DSS: remove legacy dss bus support
        OMAPDSS: RFBI: remove code related to old panel model
        OMAPDSS: VENC: remove code related to old panel model
        OMAPDSS: SDI: remove code related to old panel model
        OMAPDSS: DSI: remove code related to old panel model
        OMAPDSS: HDMI: remove code related to old panel model
        OMAPDSS: DPI: remove code related to old panel model
        OMAPDSS: remove all old panel drivers
        OMAPDSS: DPI: change regulator handling
        OMAPDSS: SDI: change regulator handling
        OMAPDSS: fix DPI and SDI device ids
        OMAPDSS: remove omap_dss_device->channel field
        OMAPDSS: RFBI: Mark RFBI as broken
        ARM: OMAP2+: Remove old display drivers from omap2plus_defconfig
        ARM: OMAP: AM3517EVM: use new display drivers
        ARM: OMAP: Zoom: use new display drivers
        ARM: OMAP: Pandora: use new display drivers
        ARM: OMAP: OMAP3EVM: use new display drivers
    • Linus Torvalds's avatar
      Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 7c049d08
      Linus Torvalds authored
      Pull main batch of InfiniBand/RDMA changes from Roland Dreier:
       - Large ocrdma HW driver update: add "fast register" work requests,
         fixes, cleanups
       - Add receive flow steering support for raw QPs
       - Fix IPoIB neighbour race that leads to crash
       - iSER updates including support for using "fast register" memory
       - IPv6 support for iWARP
       - XRC transport fixes
      * tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (54 commits)
        RDMA/ocrdma: Fix compiler warning about int/pointer size mismatch
        IB/iser: Fix redundant pointer check in dealloc flow
        IB/iser: Fix possible memory leak in iser_create_frwr_pool()
        IB/qib: Move COUNTER_MASK definition within qib_mad.h header guards
        RDMA/ocrdma: Fix passing wrong opcode to modify_srq
        RDMA/ocrdma: Fill PVID in UMC case
        RDMA/ocrdma: Add ABI versioning support
        RDMA/ocrdma: Consider multiple SGES in case of DPP
        RDMA/ocrdma: Fix for displaying proper link speed
        RDMA/ocrdma: Increase STAG array size
        RDMA/ocrdma: Dont use PD 0 for userpace CQ DB
        RDMA/ocrdma: FRMA code cleanup
        RDMA/ocrdma: For ERX2 irrespective of Qid, num_posted offset is 24
        RDMA/ocrdma: Fix to work with even a single MSI-X vector
        RDMA/ocrdma: Remove the MTU check based on Ethernet MTU
        RDMA/ocrdma: Add support for fast register work requests (FRWR)
        RDMA/ocrdma: Create IRD queue fix
        IB/core: Better checking of userspace values for receive flow steering
        IB/mlx4: Add receive flow steering support
        IB/core: Export ib_create/destroy_flow through uverbs
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 00341b53
      Linus Torvalds authored
      Pull i2c updates from Wolfram Sang:
         - OF and ACPI helpers are now included in the core, and not in
           external files anymore.  This removes dependency problems for
           modules and is cleaner, in general.
         - mv64xxx-driver gains fifo usage to support mv78230
         - imx-driver overhaul to support VF610
         - various cleanups, most notably related to devm_* and CONFIG_PM
         - driver bugfixes and smaller feature additions"
      * 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (51 commits)
        i2c: rcar: add rcar-H2 support
        i2c: sirf: retry 3 times as sometimes we get random noack and timeout
        i2c: sirf: support reverse direction of address
        i2c: sirf: fix the typo for setting bitrate to less than 100k
        i2c: sirf: we need to wait I2C_RESET status in resume
        i2c: sirf: reset i2c controller early after we get a noack
        i2c: designware: get SDA hold time, HCNT and LCNT configuration from ACPI
        i2c: designware: make HCNT/LCNT values configurable
        i2c: mpc: cleanup clock API use
        i2c: pnx: fix error return code in i2c_pnx_probe()
        i2c: ismt: add error return code in probe()
        i2c: mv64xxx: fix typo in binding documentation
        i2c: imx: use exact SoC revision to document binding
        i2c: move ACPI helpers into the core
        i2c: move OF helpers into the core
        i2c: mv64xxx: Fix timing issue on Armada XP (errata FE-8471889)
        i2c: mv64xxx: Add I2C Transaction Generator support
        i2c: powermac: fix return path on error
        Documentation: i2c: Fix example in instantiating-devices
        i2c: tiny-usb: do not use stack as URB transfer_buffer
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 45d9a222
      Linus Torvalds authored
      Pull vfs pile 1 from Al Viro:
       "Unfortunately, this merge window it'll have a be a lot of small piles -
        my fault, actually, for not keeping #for-next in anything that would
        resemble a sane shape ;-/
        This pile: assorted fixes (the first 3 are -stable fodder, IMO) and
        cleanups + %pd/%pD formats (dentry/file pathname, up to 4 last
        components) + several long-standing patches from various folks.
        There definitely will be a lot more (starting with Miklos'
        check_submount_and_drop() series)"
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (26 commits)
        direct-io: Handle O_(D)SYNC AIO
        direct-io: Implement generic deferred AIO completions
        add formats for dentry/file pathnames
        kvm eventfd: switch to fdget
        powerpc kvm: use fdget
        switch fchmod() to fdget
        switch epoll_ctl() to fdget
        switch copy_module_from_fd() to fdget
        git simplify nilfs check for busy subtree
        ibmasmfs: don't bother passing superblock when not needed
        don't pass superblock to hypfs_{mkdir,create*}
        don't pass superblock to hypfs_diag_create_files
        don't pass superblock to hypfs_vm_create_files()
        oprofile: get rid of pointless forward declarations of struct super_block
        oprofilefs_create_...() do not need superblock argument
        oprofilefs_mkdir() doesn't need superblock argument
        don't bother with passing superblock to oprofile_create_stats_files()
        oprofile: don't bother with passing superblock to ->create_files()
        don't bother passing sb to oprofile_create_files()
        coh901318: don't open-code simple_read_from_buffer()
    • Linus Torvalds's avatar
      Merge branch 'ipmi' · 2386a3b0
      Linus Torvalds authored
      Merge IPMI fixes from:
       "A few things for 3.12 from various people"
      * emailed patches from Corey Minyard <minyard@acm.org>:
        BMC support for PARISC machines
        Add MODULE_ALIAS for autoloading ipmi driver on ACPI systems
        ipmi: Initialize locals to avoid warning
        ipmi: info leak in compat_ipmi_ioctl()
    • Thomas Bogendoerfer's avatar
      BMC support for PARISC machines · fdbeb7de
      Thomas Bogendoerfer authored
      The last line of PARISC machines (C8000, RP34x0, etc.) have a BMC for
      controlling temperature, fan speed and other stuff.  The BMC is
      connected via a special bus and listed in the firmware device tree.
      This change adds support for these BMCs to the IPMI driver.
      Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
      Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Jordan_Hargrave@Dell.com's avatar
      Add MODULE_ALIAS for autoloading ipmi driver on ACPI systems · a798e2d2
      Jordan_Hargrave@Dell.com authored
      I'd submitted this about a year ago but it never made it upstream.
      The latest versions of the kernel drivers for ipmi can use ACPI to
      determine the type of BMC device used in the system.  The following
      patch adds a module alias so that udev will autoload the ipmi_si driver.
      Signed-off-by: default avatarJordan Hargrave <jordan_hargrave@dell.com>
      Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Corey Minyard's avatar
      ipmi: Initialize locals to avoid warning · f0ba9390
      Corey Minyard authored
      A couple of variables were getting warnings about being uninitialized.
      It was a false warning, but initialize them, anyway.
      Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Dan Carpenter's avatar
      ipmi: info leak in compat_ipmi_ioctl() · fa7df37b
      Dan Carpenter authored
      On x86_64 there is a 4 byte hole between ->recv_type and ->addr.
      Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
  2. 04 Sep, 2013 30 commits
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm · ae7a835c
      Linus Torvalds authored
      Pull KVM updates from Gleb Natapov:
       "The highlights of the release are nested EPT and pv-ticketlocks
        support (hypervisor part, guest part, which is most of the code, goes
        through tip tree).  Apart of that there are many fixes for all arches"
      Fix up semantic conflicts as discussed in the pull request thread..
      * 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (88 commits)
        ARM: KVM: Add newlines to panic strings
        ARM: KVM: Work around older compiler bug
        ARM: KVM: Simplify tracepoint text
        ARM: KVM: Fix kvm_set_pte assignment
        ARM: KVM: vgic: Bump VGIC_NR_IRQS to 256
        ARM: KVM: Bugfix: vgic_bytemap_get_reg per cpu regs
        ARM: KVM: vgic: fix GICD_ICFGRn access
        ARM: KVM: vgic: simplify vgic_get_target_reg
        KVM: MMU: remove unused parameter
        KVM: PPC: Book3S PR: Rework kvmppc_mmu_book3s_64_xlate()
        KVM: PPC: Book3S PR: Make instruction fetch fallback work for system calls
        KVM: PPC: Book3S PR: Don't corrupt guest state when kernel uses VMX
        KVM: x86: update masterclock when kvmclock_offset is calculated (v2)
        KVM: PPC: Book3S: Fix compile error in XICS emulation
        KVM: PPC: Book3S PR: return appropriate error when allocation fails
        arch: powerpc: kvm: add signed type cast for comparation
        KVM: x86: add comments where MMIO does not return to the emulator
        KVM: vmx: count exits to userspace during invalid guest emulation
        KVM: rename __kvm_io_bus_sort_cmp to kvm_io_bus_cmp
        kvm: optimize away THP checks in kvm_is_mmio_pfn()
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-3.12-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · cf39c8e5
      Linus Torvalds authored
      Pull Xen updates from Konrad Rzeszutek Wilk:
       "A couple of features and a ton of bug-fixes.  There is also some
        maintership changes.  Jeremy is enjoying the full-time work at the
        startup and as much as he would love to help - he can't find the time.
        I have a bunch of other things that I promised to work on - paravirt
        diet, get SWIOTLB working everywhere, etc, but haven't been able to
        find the time.
        As such both David Vrabel and Boris Ostrovsky have graciously
        volunteered to help with the maintership role.  They will keep the lid
        on regressions, bug-fixes, etc.  I will be in the background to help -
        but eventually there will be less of me doing the Xen GIT pulls and
        more of them.  Stefano is still doing the ARM/ARM64 and will continue
        on doing so.
         - Xen Trusted Platform Module (TPM) frontend driver - with the
           backend in MiniOS.
         - Scalability improvements in event channel.
         - Two extra Xen co-maintainers (David, Boris) and one going away (Jeremy)
         - Make the 1:1 mapping work during early bootup on selective regions.
         - Add scratch page to balloon driver to deal with unexpected code
           still holding on stale pages.
         - Allow NMIs on PV guests (64-bit only)
         - Remove unnecessary TLB flush in M2P code.
         - Fixes duplicate callbacks in Xen granttable code.
         - Fixes in PRIVCMD_MMAPBATCH ioctls to allow retries
         - Fix for events being lost due to rescheduling on different VCPUs.
         - More documentation"
      * tag 'stable/for-linus-3.12-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: (23 commits)
        hvc_xen: Remove unnecessary __GFP_ZERO from kzalloc
        drivers/xen-tpmfront: Fix compile issue with missing option.
        xen/balloon: don't set P2M entry for auto translated guest
        xen/evtchn: double free on error
        Xen: Fix retry calls into PRIVCMD_MMAPBATCH*.
        xen/pvhvm: Initialize xen panic handler for PVHVM guests
        xen/m2p: use GNTTABOP_unmap_and_replace to reinstate the original mapping
        xen: fix ARM build after 6efa20e4
        MAINTAINERS: Remove Jeremy from the Xen subsystem.
        xen/events: document behaviour when scanning the start word for events
        x86/xen: during early setup, only 1:1 map the ISA region
        x86/xen: disable premption when enabling local irqs
        swiotlb-xen: replace dma_length with sg_dma_len() macro
        swiotlb: replace dma_length with sg_dma_len() macro
        xen/balloon: set a mapping for ballooned out pages
        xen/evtchn: improve scalability by using per-user locks
        xen/p2m: avoid unneccesary TLB flush in m2p_remove_override()
        MAINTAINERS: Add in two extra co-maintainers of the Xen tree.
        MAINTAINERS: Update the Xen subsystem's with proper mailing list.
        xen: replace strict_strtoul() with kstrtoul()
    • Linus Torvalds's avatar
      Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · 3398d252
      Linus Torvalds authored
      Pull module updates from Rusty Russell:
       "Minor fixes mainly, including a potential use-after-free on remove
        found by CONFIG_DEBUG_KOBJECT_RELEASE which may be theoretical"
      * tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
        module: Fix mod->mkobj.kobj potentially freed too early
        kernel/params.c: use scnprintf() instead of sprintf()
        kernel/module.c: use scnprintf() instead of sprintf()
        module/lsm: Have apparmor module parameters work with no args
        module: Add NOARG flag for ops with param_set_bool_enable_only() set function
        module: Add flag to allow mod params to have no arguments
        modules: add support for soft module dependencies
        scripts/mod/modpost.c: permit '.cranges' secton for sh64 architecture.
        module: fix sprintf format specifier in param_get_byte()
    • Linus Torvalds's avatar
      Merge tag 'PTR_RET-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · 27703bb4
      Linus Torvalds authored
      Pull PTR_RET() removal patches from Rusty Russell:
       "PTR_RET() is a weird name, and led to some confusing usage.  We ended
        up with PTR_ERR_OR_ZERO(), and replacing or fixing all the usages.
        This has been sitting in linux-next for a whole cycle"
      [ There are still some PTR_RET users scattered about, with some of them
        possibly being new, but most of them existing in Rusty's tree too.  We
        have that
            #define PTR_RET(p) PTR_ERR_OR_ZERO(p)
        thing in <linux/err.h>, so they continue to work for now  - Linus ]
      * tag 'PTR_RET-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
        GFS2: Replace PTR_RET with PTR_ERR_OR_ZERO
        Btrfs: volume: Replace PTR_RET with PTR_ERR_OR_ZERO
        drm/cma: Replace PTR_RET with PTR_ERR_OR_ZERO
        sh_veu: Replace PTR_RET with PTR_ERR_OR_ZERO
        dma-buf: Replace PTR_RET with PTR_ERR_OR_ZERO
        drivers/rtc: Replace PTR_RET with PTR_ERR_OR_ZERO
        mm/oom_kill: remove weird use of ERR_PTR()/PTR_ERR().
        staging/zcache: don't use PTR_RET().
        remoteproc: don't use PTR_RET().
        pinctrl: don't use PTR_RET().
        acpi: Replace weird use of PTR_RET.
        s390: Replace weird use of PTR_RET.
        PTR_RET is now PTR_ERR_OR_ZERO(): Replace most.
        PTR_RET is now PTR_ERR_OR_ZERO
    • Linus Torvalds's avatar
      Merge tag 'dlm-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm · 6f3bc58d
      Linus Torvalds authored
      Pull dlm updates from David Teigland:
       "This set includes a workqueue cleanup and the removal of incorrect and
        unneeded signal blocking"
      * tag 'dlm-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
        dlm: remove signal blocking
        dlm: WQ_NON_REENTRANT is meaningless and going away
    • Linus Torvalds's avatar
      Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · ae67d9a8
      Linus Torvalds authored
      Pull ext4 updates from Ted Ts'o:
       "New features for 3.12:
         - Added aggressive extent caching using the extent status tree.  This
           can actually decrease memory usage in read-mostly workloads since
           the information is much more compactly stored in the extent status
           tree than if we had to keep the extent tree metadata blocks in the
           buffer cache.  This also improves Asynchronous I/O since it is it
           makes much less likely that we need to do metadata I/O to lookup
           the extent tree information.
         - Improve the recovery after corrupted allocation bitmaps are found
           when running in errors=ignore mode.
        Also fixed some writeback vs truncate races when using a blocksize
        less than the page size"
      * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (25 commits)
        ext4: allow specifying external journal by pathname mount option
        ext4: mark group corrupt on group descriptor checksum
        ext4: mark block group as corrupt on inode bitmap error
        ext4: mark block group as corrupt on block bitmap error
        ext4: fix type declaration of ext4_validate_block_bitmap
        ext4: error out if verifying the block bitmap fails
        jbd2: Fix endian mixing problems in the checksumming code
        ext4: isolate ext4_extents.h file
        ext4: Fix misspellings using 'codespell' tool
        ext4: convert write_begin methods to stable_page_writes semantics
        ext4: fix use of potentially uninitialized variables in debugging code
        ext4: fix lost truncate due to race with writeback
        ext4: simplify truncation code in ext4_setattr()
        ext4: fix ext4_writepages() in presence of truncate
        ext4: move test whether extent to map can be extended to one place
        ext4: fix warning in ext4_da_update_reserve_space()
        quota: provide interface for readding allocated space into reserved space
        ext4: avoid reusing recently deleted inodes in no journal mode
        ext4: allocate delayed allocation blocks before rename
        ext4: start handle at least possible moment when renaming files
    • Luck, Tony's avatar
      lockref: Implement lockref for Itanium · 71c7356f
      Luck, Tony authored
      All the cool kids are doing this, join in the fun.
      Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Linus Torvalds's avatar
      Merge tag 'sound-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 977dbfcf
      Linus Torvalds authored
      Pull sound updates from Takashi Iwai:
       "Changes are seen in a wide range of codes, mainly due to ASoC DAPM
        requirements; HD-audio shows a high peak in diffstat, it's just a
        removal of bunch of old static quirks.
        Some highlights:
         - HDPM: Updates for AIO/RayDAT support, TCO/sync support
         - RME96: Add PCM sync support
         - HD-audio:
           * A few HDMI/DP audio updates (CA assignment fix, stream switching
             fix, Intel DP device list support)
           * Device specific fixes (ASUS/CXT HP mic support, Thinkpad mic
             improvements, Chromebook fixes, STAC9228 Dell fixes)
           * Replace the all static quirks for AD codecs with the generic
           * WAKEEN support for handling irqs in the power saving mode
         - USB-audio: Clean up implicit fb handling and related codes
         - DAPM is now mandatory for ASoC CODEC drivers; all existing drivers
           have had some level of DAPM support added.  In addition, a lot of
           cleanups and improvements in DAPM.
         - Support for ASoC cross-platform compile test
         - New drivers and support for Analog Devices ADAU1702 and
           ADAU1401(a), Asahi Kasei Microdevices AK4554, Atmel AT91ASM9x5 and
           WM8904 based machines, Freescale S/PDIF and SSI AC'97, Renesas
           R-Car SoCs, Samsung Exynos5420 SoCs, Texas Instruments PCM1681 and
           PCM1792A and Wolfson Microelectronics WM8997
         - DT bindings for kirkwood and i.MX S/PDIF
         - Clean up and bug fixes: ssm2602, rt5640 and sgtl5000.
         - Core helpers for bitbanged AC'97 reset"
      * tag 'sound-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (375 commits)
        ALSA: hda - Re-setup HDMI pin and audio infoframe on stream switches
        ALSA: hda - hdmi: Fallback to ALSA allocation when selecting CA
        ASoC: mxs-sgtl5000: Configure the dai_links as unidirectional
        ASoC: soc-pcm: Allow to specify unidirectional dai_link
        ASoC: fsl_spdif: Staticse non-exported symbols
        ASoC: ssm2602: Fix cache sync
        ASoC: Remove unused sysfs_registered field from snd_soc_codec struct
        ASoC: Remove unused debugfs_dapm field from snd_soc_{platform,codec} struct
        ASoC: Remove unused control_type field from snd_soc_codec struct
        ASoC: fsl: Add one blank space after ':=' in Makefile
        ASoC: fsl: Add wrapping for dev_dbg() in fsl_spdif.c
        ASoC: rt5640: change widget sequence for depop
        ASoC: dapm: Fix auto-disable for inverted controls
        ASoC: fsl: Drop SND_SOC_FSL_UTILS from SND_SOC_IMX_SPDIF
        ASoC: Samsung: Do not queue cyclic buffers multiple times
        ASoC: ep93xx-i2s: Remove unnecessary dev_set_drvdata()
        ASoC: designware_i2s: Remove unnecessary dev_set_drvdata()
        ASoC: fsl_spdif: remove redundant dev_err call in fsl_spdif_probe()
        ASoC: fsl: Add S/PDIF machine driver
        ASoc: kirkwood: Use the Kirkwood audio driver in Dove boards
    • Linus Torvalds's avatar
      Merge tag 'pinctrl-v3.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · aa7054f5
      Linus Torvalds authored
      Pull pin control changes from Linus Walleij:
       "Here is the bulk of pin control changes for the v3.12 series.  Most of
        the relevant information is in the tag.
        I merged in v3.11-rc7 last week to get rid of a largeish conflict
        within the sunxi (AllWinner) driver in linux-next and fix up the
        non-trivial merge the right way.  That driver had a rather large fix
        adding locking late in the release cycle.
        Overall the bulk changes this time is cleanups and refactorings and
        not much new features, which is nice.
         - Refactorings for generic pin config handling in the core.
         - Factor out a set of device tree utilities for use in all drivers,
           to parse and allocate maps from the device tree.
         - Some fixes to the core such as more nitpicky locking.
         - Pushed down config array iteration into the drivers.
           This patch is necessary for drivers that want to iterate over
           configs and pile up a stack of alterations to the same register(s),
           or if the driver wants to take a local spinlock when committing the
         - A new driver for the Texas Instruments Palmas PMIC by Laxman
           Dewangan.  This is used on the Tegra systems.
         - A major cleanup and modernization of the PFC (Super Hitachi and ARM
           SHmobile) pin controller and subdrivers.
         - Support for the A20 and A31 sunxi (AllWinner) SoCs.
         - A huge pile of fixes and cleanups: Axel Lin, Jingoo Han Dan
           Carpenter, Julia Lawall and Sachin Kamat did an excellent job here"
      * tag 'pinctrl-v3.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (124 commits)
        pinctrl: sunxi: Fix off-by-one for valid offset range checking
        pinctrl: sunxi: drop lock on error path
        pinctrl: pinconf-generic: Remove ti prefix in dev_err messages
        pinctrl: rockchip: Implement .request() and .free() callbacks
        pinctrl: at91: fix get_pullup/down function return
        pinctrl: sh-pfc: remove unnecessary platform_set_drvdata()
        pinctrl: Add s5pv210 support to pinctrl-exynos
        pinctrl: utils: include export.h to avoid warnings
        pinctrl: s3c24xx: off by one in s3c24xx_eint_init()
        pinctrl: mvebu: testing the wrong variable
        pinctrl: abx500: fix bitwise AND test
        pinctrl: mvebu: Convert to use devm_ioremap_resource
        pinctrl: Pass all configs to driver on pin_config_set()
        pinctrl: tz1090-pdc: Convert to devm_ioremap_resource
        pinctrl: tz1090: Convert to devm_ioremap_resource
        pinctrl: tegra: Convert to devm_ioremap_resource
        pinctrl: rockchip: Simplify pin_to_bank equation
        pinctrl: spear: Convert to devm_ioremap_resource
        pinctrl: rockchip: Remove of_match_ptr macro for DT only driver
        pinctrl: palmas: PINCTRL_PALMAS needs to select PINMUX
    • Linus Torvalds's avatar
      Merge branch 'x86-spinlocks-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 816434ec
      Linus Torvalds authored
      Pull x86 spinlock changes from Ingo Molnar:
       "The biggest change here are paravirtualized ticket spinlocks (PV
        spinlocks), which bring a nice speedup on various benchmarks.
        The KVM host side will come to you via the KVM tree"
      * 'x86-spinlocks-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/kvm/guest: Fix sparse warning: "symbol 'klock_waiting' was not declared as static"
        kvm: Paravirtual ticketlocks support for linux guests running on KVM hypervisor
        kvm guest: Add configuration support to enable debug information for KVM Guests
        kvm uapi: Add KICK_CPU and PV_UNHALT definition to uapi
        xen, pvticketlock: Allow interrupts to be enabled while blocking
        x86, ticketlock: Add slowpath logic
        jump_label: Split jumplabel ratelimit
        x86, pvticketlock: When paravirtualizing ticket locks, increment by 2
        x86, pvticketlock: Use callee-save for lock_spinning
        xen, pvticketlocks: Add xen_nopvspin parameter to disable xen pv ticketlocks
        xen, pvticketlock: Xen implementation for PV ticket locks
        xen: Defer spinlock setup until boot CPU setup
        x86, ticketlock: Collapse a layer of functions
        x86, ticketlock: Don't inline _spin_unlock when using paravirt spinlocks
        x86, spinlock: Replace pv spinlocks with pv ticketlocks
    • Linus Torvalds's avatar
      Merge branch 'x86-smap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · f357a820
      Linus Torvalds authored
      Pull x86 SMAP fixes from Ingo Molnar:
       "Fixes for Intel SMAP support, to fix SIGSEGVs during bootup"
      * 'x86-smap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        Introduce [compat_]save_altstack_ex() to unbreak x86 SMAP
        x86, smap: Handle csum_partial_copy_*_user()
    • Linus Torvalds's avatar
      Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · b20c99eb
      Linus Torvalds authored
      Pull x86 RAS changes from Ingo Molnar:
       "[ The reason for drivers/ updates is that Boris asked for the
          drivers/edac/ changes to go via x86/ras in this cycle ]
        Main changes:
         - AMD CPUs:
            . Add ECC event decoding support for new F15h models
            . Various erratum fixes
            . Fix single-channel on dual-channel-controllers bug.
         - Intel CPUs:
            . UC uncorrectable memory error parsing fix
            . Add support for CMC (Corrected Machine Check) 'FF' (Firmware
              First) flag in the APEI HEST
         - Various cleanups and fixes"
      * 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        amd64_edac: Fix incorrect wraparounds
        amd64_edac: Correct erratum 505 range
        cpc925_edac: Use proper array termination
        x86/mce, acpi/apei: Only disable banks listed in HEST if mce is configured
        amd64_edac: Get rid of boot_cpu_data accesses
        amd64_edac: Add ECC decoding support for newer F15h models
        x86, amd_nb: Clarify F15h, model 30h GART and L3 support
        pci_ids: Add PCI device ID functions 3 and 4 for newer F15h models.
        x38_edac: Make a local function static
        i3200_edac: Make a local function static
        x86/mce: Pay no attention to 'F' bit in MCACOD when parsing 'UC' errors
        APEI/ERST: Fix error message formatting
        amd64_edac: Fix single-channel setups
        EDAC: Replace strict_strtol() with kstrtol()
        mce: acpi/apei: Soft-offline a page on firmware GHES notification
        mce: acpi/apei: Add a boot option to disable ff mode for corrected errors
        mce: acpi/apei: Honour Firmware First for MCA banks listed in APEI HEST CMC
    • Linus Torvalds's avatar
      Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · bb8c4701
      Linus Torvalds authored
      Pull x86 platform documentation fix from Ingo Molnar.
      * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/acpi: Correct out-of-date comment of __acpi_map_table()
    • Linus Torvalds's avatar
      Merge branch 'x86-paravirt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 05eebfb2
      Linus Torvalds authored
      Pull x86 paravirt changes from Ingo Molnar:
       "Hypervisor signature detection cleanup and fixes - the goal is to make
        KVM guests run better on MS/Hyperv and to generalize and factor out
        the code a bit"
      * 'x86-paravirt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: Correctly detect hypervisor
        x86, kvm: Switch to use hypervisor_cpuid_base()
        xen: Switch to use hypervisor_cpuid_base()
        x86: Introduce hypervisor_cpuid_base()
    • Linus Torvalds's avatar
      Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · cb3e4330
      Linus Torvalds authored
      Pull x86 mm changes from Ingo Molnar:
       "Misc smaller fixes:
         - a parse_setup_data() boot crash fix
         - a memblock and an __early_ioremap cleanup
         - turn the always-on CONFIG_ARCH_MEMORY_PROBE=y into a configurable
           option and turn it off - it's an unrobust debug facility, it
           shouldn't be enabled by default"
      * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: avoid remapping data in parse_setup_data()
        x86: Use memblock_set_current_limit() to set limit for memblock.
        mm: Remove unused variable idx0 in __early_ioremap()
        mm/hotplug, x86: Disable ARCH_MEMORY_PROBE by default
    • Linus Torvalds's avatar
      Merge branch 'x86-kaslr-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · aafcd5d7
      Linus Torvalds authored
      Pull x86 relocation changes from Ingo Molnar:
       "This tree contains a single change, ELF relocation handling in C - one
        of the kernel randomization patches that makes sense even without
        randomization present upstream"
      * 'x86-kaslr-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, relocs: Move ELF relocation handling to C
    • Linus Torvalds's avatar
      Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 6832d965
      Linus Torvalds authored
      Pull timers/nohz changes from Ingo Molnar:
       "It mostly contains fixes and full dynticks off-case optimizations, by
        Frederic Weisbecker"
      * 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (24 commits)
        nohz: Include local CPU in full dynticks global kick
        nohz: Optimize full dynticks's sched hooks with static keys
        nohz: Optimize full dynticks state checks with static keys
        nohz: Rename a few state variables
        vtime: Always debug check snapshot source _before_ updating it
        vtime: Always scale generic vtime accounting results
        vtime: Optimize full dynticks accounting off case with static keys
        vtime: Describe overriden functions in dedicated arch headers
        m68k: hardirq_count() only need preempt_mask.h
        hardirq: Split preempt count mask definitions
        context_tracking: Split low level state headers
        vtime: Fix racy cputime delta update
        vtime: Remove a few unneeded generic vtime state checks
        context_tracking: User/kernel broundary cross trace events
        context_tracking: Optimize context switch off case with static keys
        context_tracking: Optimize guest APIs off case with static key
        context_tracking: Optimize main APIs off case with static key
        context_tracking: Ground setup for static key use
        context_tracking: Remove full dynticks' hacky dependency on wide context tracking
        nohz: Only enable context tracking on full dynticks CPUs
    • Linus Torvalds's avatar
      Merge branch 'x86-fb-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 228abe73
      Linus Torvalds authored
      Pull x86 fb changes from Ingo Molnar:
       "This tree includes preparatory patches for SimpleDRM driver support,
        by David Herrmann.  They clean up x86 framebuffer support by creating
        simplefb devices wherever possible.  More background can be found at
      * 'x86-fb-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        fbdev: fbcon: select VT_HW_CONSOLE_BINDING
        fbdev: efifb: bind to efi-framebuffer
        fbdev: vesafb: bind to platform-framebuffer device
        fbdev: simplefb: add common x86 RGB formats
        x86: sysfb: move EFI quirks from efifb to sysfb
        x86: provide platform-devices for boot-framebuffers
        fbdev: simplefb: mark as fw and allocate apertures
        fbdev: simplefb: add init through platform_data
    • Linus Torvalds's avatar
      Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 1f9c52e1
      Linus Torvalds authored
      Pull x86 cpu feature fixes from Ingo Molnar:
       "Two small cpufeature support updates"
      * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: Fix override new_cpu_data.x86 with 486
        x86, cpufeature: Use new CC_HAVE_ASM_GOTO
    • Linus Torvalds's avatar
      Merge branches 'x86-boot-for-linus' and 'x86-cleanups-for-linus' of... · 9cb87aaf
      Linus Torvalds authored
      Merge branches 'x86-boot-for-linus' and 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
      Pull tiny x86 boot cleanups from Ingo Molnar.
      * 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/boot: Fix a sanity check in printf.c
      * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, boot: Fix warning due to undeclared strlen()
    • Linus Torvalds's avatar
      Merge branch 'x86-asmlinkage-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 2a475501
      Linus Torvalds authored
      Pull x86/asmlinkage changes from Ingo Molnar:
       "As a preparation for Andi Kleen's LTO patchset (link time
        optimizations using GCC's -flto which build time optimization has
        steadily increased in quality over the past few years and might
        eventually be usable for the kernel too) this tree includes a handful
        of preparatory patches that make function calling convention
        annotations consistent again:
         - Mark every function without arguments (or 64bit only) that is used
           by assembly code with asmlinkage()
         - Mark every function with parameters or variables that is used by
           assembly code as __visible.
        For the vanilla kernel this has documentation, consistency and
        debuggability advantages, for the time being"
      * 'x86-asmlinkage-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/asmlinkage: Fix warning in xen asmlinkage change
        x86, asmlinkage, vdso: Mark vdso variables __visible
        x86, asmlinkage, power: Make various symbols used by the suspend asm code visible
        x86, asmlinkage: Make dump_stack visible
        x86, asmlinkage: Make 64bit checksum functions visible
        x86, asmlinkage, paravirt: Add __visible/asmlinkage to xen paravirt ops
        x86, asmlinkage, apm: Make APM data structure used from assembler visible
        x86, asmlinkage: Make syscall tables visible
        x86, asmlinkage: Make several variables used from assembler/linker script visible
        x86, asmlinkage: Make kprobes code visible and fix assembler code
        x86, asmlinkage: Make various syscalls asmlinkage
        x86, asmlinkage: Make 32bit/64bit __switch_to visible
        x86, asmlinkage: Make _*_start_kernel visible
        x86, asmlinkage: Make all interrupt handlers asmlinkage / __visible
        x86, asmlinkage: Change dotraplinkage into __visible on 32bit
        x86: Fix sys_call_table type in asm/syscall.h
    • Linus Torvalds's avatar
      Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 3d7e5fc3
      Linus Torvalds authored
      Pull x86/asm changes from Ingo Molnar:
       "Main changes:
         - Apply low level mutex optimization on x86-64, by Wedson Almeida
         - Change bitops to be naturally 'long', by H Peter Anvin.
         - Add TSX-NI opcodes support to the x86 (instrumentation) decoder, by
           Masami Hiramatsu.
         - Add clang compatibility adjustments/workarounds, by Jan-Simon
      * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, doc: Update uaccess.h comment to reflect clang changes
        x86, asm: Fix a compilation issue with clang
        x86, asm: Extend definitions of _ASM_* with a raw format
        x86, insn: Add new opcodes as of June, 2013
        x86/ia32/asm: Remove unused argument in macro
        x86, bitops: Change bitops to be native operand size
        x86: Use asm-goto to implement mutex fast path on x86-64
    • Linus Torvalds's avatar
      Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 6924a467
      Linus Torvalds authored
      Pull x86/apic changes from Ingo Molnar:
       "Smaller fixes"
      * 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/ioapic: Check attr against the previous setting when programmed more than once
        x86/ioapic/kcrash: Prevent crash_kexec() from deadlocking on ioapic_lock
        x86/acpi: Fix incorrect sanity check in acpi_register_lapic()
    • Linus Torvalds's avatar
      Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · ac3c1c4f
      Linus Torvalds authored
      Pull timer changes from Ingo Molnar:
       "Various clocksource driver updates: extend the core with memory mapped
        hardware (mmio) support and add new (ARM) Moxart SoC and sun4i
        hardware support"
      * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (23 commits)
        clocksource: arch_timer: Add support for memory mapped timers
        clocksource: arch_timer: Push the read/write wrappers deeper
        Documentation: Add memory mapped ARM architected timer binding
        clocksource: arch_timer: Pass clock event to set_mode callback
        clocksource: arch_timer: Make register accessors less error-prone
        ARM: clocksource: moxart: documentation: Update device tree bindings document
        ARM: clocksource: moxart: Add bitops.h include
        ARM: clocksource: moxart: documentation: Fix device tree bindings document
        ARM: clocksource: Add support for MOXA ART SoCs
        clocksource: cadence_ttc: Reuse clocksource as sched_clock
        clocksource: cadence_ttc: Remove unused header
        clocksource: sun4i: Fix bug when switching from periodic to oneshot modes
        clocksource: sun4i: Cleanup parent clock setup
        clocksource: sun4i: Remove TIMER_SCAL variable
        clocksource: sun4i: Factor out some timer code
        clocksource: sun4i: Fix the next event code
        clocksource: sun4i: Don't forget to enable the clock we use
        clocksource: sun4i: Add clocksource and sched clock drivers
        clocksource: sun4i: rename AUTORELOAD define to RELOAD
        clocksource: sun4i: Wrap macros arguments in parenthesis
    • Linus Torvalds's avatar
      Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 5e0b3a4e
      Linus Torvalds authored
      Pull scheduler changes from Ingo Molnar:
       "Various optimizations, cleanups and smaller fixes - no major changes
        in scheduler behavior"
      * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched/fair: Fix the sd_parent_degenerate() code
        sched/fair: Rework and comment the group_imb code
        sched/fair: Optimize find_busiest_queue()
        sched/fair: Make group power more consistent
        sched/fair: Remove duplicate load_per_task computations
        sched/fair: Shrink sg_lb_stats and play memset games
        sched: Clean-up struct sd_lb_stat
        sched: Factor out code to should_we_balance()
        sched: Remove one division operation in find_busiest_queue()
        sched/cputime: Use this_cpu_add() in task_group_account_field()
        cpumask: Fix cpumask leak in partition_sched_domains()
        sched/x86: Optimize switch_mm() for multi-threaded workloads
        generic-ipi: Kill unnecessary variable - csd_flags
        numa: Mark __node_set() as __always_inline
        sched/fair: Cleanup: remove duplicate variable declaration
        sched/__wake_up_sync_key(): Fix nr_exclusive tasks which lead to WF_SYNC clearing
    • Linus Torvalds's avatar
      Merge branches 'perf-urgent-for-linus' and 'perf-core-for-linus' of... · 0d99b708
      Linus Torvalds authored
      Merge branches 'perf-urgent-for-linus' and 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
      Pull perf changes from Ingo Molnar:
       "As a first remark I'd like to point out that the obsolete '-f'
        (--force) option, which has not done anything for several releases,
        has been removed from 'perf record' and related utilities.  Everyone
        please update muscle memory accordingly! :-)
        Main changes on the perf kernel side:
         - Performance optimizations:
              . for trace events, by Steve Rostedt.
              . for time values, by Peter Zijlstra
         - New hardware support:
              . for Intel Silvermont (22nm Atom) CPUs, by Zheng Yan
              . for Intel SNB-EP uncore PMUs, by Zheng Yan
         - Enhanced hardware support:
              . for Intel uncore PMUs: add filter support for QPI boxes, by Zheng Yan
         - Core perf events code enhancements and fixes:
              . for full-nohz feature handling, by Frederic Weisbecker
              . for group events, by Jiri Olsa
              . for call chains, by Frederic Weisbecker
              . for event stream parsing, by Adrian Hunter
         - New ABI details:
              . Add attr->mmap2 attribute, by Stephane Eranian
              . Add PERF_EVENT_IOC_ID ioctl to return event ID, by Jiri Olsa
              . Export u64 time_zero on the mmap header page to allow TSC
                calculation, by Adrian Hunter
              . Add dummy software event, by Adrian Hunter.
              . Add a new PERF_SAMPLE_IDENTIFIER to make samples always
                parseable, by Adrian Hunter.
              . Make Power7 events available via sysfs, by Runzhen Wang.
         - Code cleanups and refactorings:
              . for nohz-full, by Frederic Weisbecker
              . for group events, by Jiri Olsa
         - Documentation updates:
              . for perf_event_type, by Peter Zijlstra
        Main changes on the perf tooling side (some of these tooling changes
        utilize the above kernel side changes):
         - Lots of 'perf trace' enhancements:
              . Make 'perf trace' command line arguments consistent with
                'perf record', by David Ahern.
              . Allow specifying syscalls a la strace, by Arnaldo Carvalho de Melo.
              . Add --verbose and -o/--output options, by Arnaldo Carvalho de Melo.
              . Support ! in -e expressions, to filter a list of syscalls,
                by Arnaldo Carvalho de Melo.
              . Arg formatting improvements to allow masking arguments in
                syscalls such as futex and open, where the some arguments are
                ignored and thus should not be printed depending on other args,
                by Arnaldo Carvalho de Melo.
              . Beautify futex open, openat, open_by_handle_at, lseek and futex
                syscalls, by Arnaldo Carvalho de Melo.
              . Add option to analyze events in a file versus live, so that
                one can do:
                 [root@zoo ~]# perf record -a -e raw_syscalls:* sleep 1
                 [ perf record: Woken up 0 times to write data ]
                 [ perf record: Captured and wrote 25.150 MB perf.data (~1098836 samples) ]
                 [root@zoo ~]# perf trace -i perf.data -e futex --duration 1
                    17.799 ( 1.020 ms): 7127 futex(uaddr: 0x7fff3f6c6674, op: 393, val: 1, utime: 0x7fff3f6c6470, ua
                   113.344 (95.429 ms): 7127 futex(uaddr: 0x7fff3f6c6674, op: 393, val: 1, utime: 0x7fff3f6c6470, uaddr2: 0x7fff3f6c6648, val3: 4294967
                   133.778 ( 1.042 ms): 18004 futex(uaddr: 0x7fff3f6c6674, op: 393, val: 1, utime: 0x7fff3f6c6470, uaddr2: 0x7fff3f6c6648, val3: 429496
                 [root@zoo ~]#
                By David Ahern.
              . Honor target pid / tid options when analyzing a file, by David Ahern.
              . Introduce better formatting of syscall arguments, including so
                far beautifiers for mmap, madvise, syscall return values,
                by Arnaldo Carvalho de Melo.
              . Handle HUGEPAGE defines in the mmap beautifier, by David Ahern.
         - 'perf report/top' enhancements:
              . Do annotation using /proc/kcore and /proc/kallsyms when
                available, removing the forced need for a vmlinux file kernel
                assembly annotation. This also improves this use case because
                vmlinux has just the initial kernel image, not what is actually
                in use after various code patchings by things like alternatives.
                By Adrian Hunter.
              . Add --ignore-callees=<regex> option to collapse undesired parts
                of call graphs, by Greg Price.
              . Simplify symbol filtering by doing it at machine class level,
                by Adrian Hunter.
              . Add support for callchains in the gtk UI, by Namhyung Kim.
              . Add --objdump option to 'perf top', by Sukadev Bhattiprolu.
         - 'perf kvm' enhancements:
              . Add option to print only events that exceed a specified time
                duration, by David Ahern.
              . Improve stack trace printing, by David Ahern.
              . Update documentation of the live command, by David Ahern
              . Add perf kvm stat live mode that combines aspects of 'perf kvm
                stat' record and report, by David Ahern.
              . Add option to analyze specific VM in perf kvm stat report, by
                David Ahern.
              . Do not require /lib/modules/* on a guest, by Jason Wessel.
         - 'perf script' enhancements:
              . Fix symbol offset computation for some dsos, by David Ahern.
              . Fix named threads support, by David Ahern.
              . Don't install scripting files files when perl/python support
                is disabled, by Arnaldo Carvalho de Melo.
         - 'perf test' enhancements:
              . Add various improvements and fixes to the "vmlinux matches
                kallsyms" 'perf test' entry, related to the /proc/kcore
                annotation feature. By Adrian Hunter.
              . Add sample parsing test, by Adrian Hunter.
              . Add test for reading object code, by Adrian Hunter.
              . Add attr record group sampling test, by Jiri Olsa.
              . Misc testing infrastructure improvements and other details,
                by Jiri Olsa.
         - 'perf list' enhancements:
              . Skip unsupported hardware events, by Namhyung Kim.
              . List pmu events, by Andi Kleen.
         - 'perf diff' enhancements:
              . Add support for more than two files comparison, by Jiri Olsa.
         - 'perf sched' enhancements:
              . Various improvements, including removing reliance on some
                scheduler tracepoints that provide the same information as the
                PERF_RECORD_{FORK,EXIT} events. By David Ahern.
              . Remove odd build stall by moving a large struct initialization
                from a local variable to a global one, by Namhyung Kim.
         - 'perf stat' enhancements:
              . Add --initial-delay option to skip measuring for a defined
                startup phase, by Andi Kleen.
         - Generic perf tooling infrastructure/plumbing changes:
              . Tidy up sample parsing validation, by Adrian Hunter.
              . Fix up jobserver setup in libtraceevent Makefile.
                by Arnaldo Carvalho de Melo.
              . Debug improvements, by Adrian Hunter.
              . Fix correlation of samples coming after PERF_RECORD_EXIT event,
                by David Ahern.
              . Improve robustness of the topology parsing code,
                by Stephane Eranian.
              . Add group leader sampling, that allows just one event in a group
                to sample while the other events have just its values read,
                by Jiri Olsa.
              . Add support for a new modifier "D", which requests that the
                event, or group of events, be pinned to the PMU.
                By Michael Ellerman.
              . Support callchain sorting based on addresses, by Andi Kleen
              . Prep work for multi perf data file storage, by Jiri Olsa.
              . libtraceevent cleanups, by Namhyung Kim.
        And lots and lots of other fixes and code reorganizations that did not
        make it into the list, see the shortlog, diffstat and the Git log for
      [ Also merge a leftover from the 3.11 cycle ]
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf: Prevent race in unthrottling code
      * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (237 commits)
        perf trace: Tell arg formatters the arg index
        perf trace: Add beautifier for open's flags arg
        perf trace: Add beautifier for lseek's whence arg
        perf tools: Fix symbol offset computation for some dsos
        perf list: Skip unsupported events
        perf tests: Add 'keep tracking' test
        perf tools: Add support for PERF_COUNT_SW_DUMMY
        perf: Add a dummy software event to keep tracking
        perf trace: Add beautifier for futex 'operation' parm
        perf trace: Allow syscall arg formatters to mask args
        perf: Convert kmalloc_node(...GFP_ZERO...) to kzalloc_node()
        perf: Export struct perf_branch_entry to userspace
        perf: Add attr->mmap2 attribute to an event
        perf/x86: Add Silvermont (22nm Atom) support
        perf/x86: use INTEL_UEVENT_EXTRA_REG to define MSR_OFFCORE_RSP_X
        perf trace: Handle missing HUGEPAGE defines
        perf trace: Honor target pid / tid options when analyzing a file
        perf trace: Add option to analyze events in a file versus live
        perf evlist: Add tracepoint lookup by name
        perf tests: Add a sample parsing test
    • Linus Torvalds's avatar
      Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 4689550b
      Linus Torvalds authored
      Pull core/locking changes from Ingo Molnar:
       "Main changes:
         - another mutex optimization, from Davidlohr Bueso
         - improved lglock lockdep tracking, from Michel Lespinasse
         - [ assorted smaller updates, improvements, cleanups. ]"
      * 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        generic-ipi/locking: Fix misleading smp_call_function_any() description
        hung_task debugging: Print more info when reporting the problem
        mutex: Avoid label warning when !CONFIG_MUTEX_SPIN_ON_OWNER
        mutex: Do not unnecessarily deal with waiters
        mutex: Fix/document access-once assumption in mutex_can_spin_on_owner()
        lglock: Update lockdep annotations to report recursive local locks
        lockdep: Introduce lock_acquire_exclusive()/shared() helper macros
    • Linus Torvalds's avatar
      Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · b854e4de
      Linus Torvalds authored
      Pull RCU updates from Ingo Molnar:
       "Main RCU changes this cycle were:
         - Full-system idle detection.  This is for use by Frederic
           Weisbecker's adaptive-ticks mechanism.  Its purpose is to allow the
           timekeeping CPU to shut off its tick when all other CPUs are idle.
         - Miscellaneous fixes.
         - Improved rcutorture test coverage.
         - Updated RCU documentation"
      * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (30 commits)
        nohz_full: Force RCU's grace-period kthreads onto timekeeping CPU
        nohz_full: Add full-system-idle state machine
        jiffies: Avoid undefined behavior from signed overflow
        rcu: Simplify _rcu_barrier() processing
        rcu: Make rcutorture emit online failures if verbose
        rcu: Remove unused variable from rcu_torture_writer()
        rcu: Sort rcutorture module parameters
        rcu: Increase rcutorture test coverage
        rcu: Add duplicate-callback tests to rcutorture
        doc: Fix memory-barrier control-dependency example
        rcu: Update RTFP documentation
        nohz_full: Add full-system-idle arguments to API
        nohz_full: Add full-system idle states and variables
        nohz_full: Add per-CPU idle-state tracking
        nohz_full: Add rcu_dyntick data for scalable detection of all-idle state
        nohz_full: Add Kconfig parameter for scalable detection of all-idle state
        nohz_full: Add testing information to documentation
        rcu: Eliminate unused APIs intended for adaptive ticks
        rcu: Select IRQ_WORK from TREE_PREEMPT_RCU
        rculist: list_first_or_null_rcu() should use list_entry_rcu()
    • Christoph Hellwig's avatar
      direct-io: Handle O_(D)SYNC AIO · 02afc27f
      Christoph Hellwig authored
      Call generic_write_sync() from the deferred I/O completion handler if
      O_DSYNC is set for a write request.  Also make sure various callers
      don't call generic_write_sync if the direct I/O code returns
      Based on an earlier patch from Jan Kara <jack@suse.cz> with updates from
      Jeff Moyer <jmoyer@redhat.com> and Darrick J. Wong <darrick.wong@oracle.com>.
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
    • Christoph Hellwig's avatar
      direct-io: Implement generic deferred AIO completions · 7b7a8665
      Christoph Hellwig authored
      Add support to the core direct-io code to defer AIO completions to user
      context using a workqueue.  This replaces opencoded and less efficient
      code in XFS and ext4 (we save a memory allocation for each direct IO)
      and will be needed to properly support O_(D)SYNC for AIO.
      The communication between the filesystem and the direct I/O code requires
      a new buffer head flag, which is a bit ugly but not avoidable until the
      direct I/O code stops abusing the buffer_head structure for communicating
      with the filesystems.
      Currently this creates a per-superblock unbound workqueue for these
      completions, which is taken from an earlier patch by Jan Kara.  I'm
      not really convinced about this use and would prefer a "normal" global
      workqueue with a high concurrency limit, but this needs further discussion.
      JK: Fixed ext4 part, dynamic allocation of the workqueue.
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>