1. 11 Dec, 2013 4 commits
    • Tejun Heo's avatar
      kernfs: s/sysfs_dirent/kernfs_node/ and rename its friends accordingly · 324a56e1
      Tejun Heo authored
      kernfs has just been separated out from sysfs and we're already in
      full conflict mode.  Nothing can make the situation any worse.  Let's
      take the chance to name things properly.
      
      This patch performs the following renames.
      
      * s/sysfs_elem_dir/kernfs_elem_dir/
      * s/sysfs_elem_symlink/kernfs_elem_symlink/
      * s/sysfs_elem_attr/kernfs_elem_file/
      * s/sysfs_dirent/kernfs_node/
      * s/sd/kn/ in kernfs proper
      * s/parent_sd/parent/
      * s/target_sd/target/
      * s/dir_sd/parent/
      * s/to_sysfs_dirent()/rb_to_kn()/
      * misc renames of local vars when they conflict with the above
      
      Because md, mic and gpio dig into sysfs details, this patch ends up
      modifying them.  All are sysfs_dirent renames and trivial.  While we
      can avoid these by introducing a dummy wrapping struct sysfs_dirent
      around kernfs_node, given the limited usage outside kernfs and sysfs
      proper, I don't think such workaround is called for.
      
      This patch is strictly rename only and doesn't introduce any
      functional difference.
      
      - mic / gpio renames were missing.  Spotted by kbuild test robot.
      Signed-off-by: default avatarTejun Heo <tj@kernel.org>
      Cc: Neil Brown <neilb@suse.de>
      Cc: Linus Walleij <linus.walleij@linaro.org>
      Cc: Ashutosh Dixit <ashutosh.dixit@intel.com>
      Cc: kbuild test robot <fengguang.wu@intel.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      324a56e1
    • Linus Walleij's avatar
      Documentation: start documenting driver design patterns · a8b1c019
      Linus Walleij authored
      After realizing that we tend to tell developers the same thing over
      and over, let's attempt to document some commin design patterns
      used in the device drivers. The idea is that this can be extended
      so I just start out with two well-known design patterns.
      
      Cc: Rob Landley <rob@landley.net>
      Cc: Mark Brown <broonie@kernel.org>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: Grant Likely <grant.likely@linaro.org>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      a8b1c019
    • Tejun Heo's avatar
      sysfs: fix use-after-free in sysfs_kill_sb() · a7560a01
      Tejun Heo authored
      While restructuring the [u]mount path, 4b93dc9b ("sysfs, kernfs:
      prepare mount path for kernfs") incorrectly updated sysfs_kill_sb() so
      that it first kills super_block and then tries to dereference its
      namespace tag to drop it.  Fix it by caching namespace tag before
      killing the superblock and then drop the cached namespace tag.
      Signed-off-by: default avatarTejun Heo <tj@kernel.org>
      Reported-by: default avatarYuanhan Liu <yuanhan.liu@linux.intel.com>
      Tested-by: default avatarYuanhan Liu <yuanhan.liu@linux.intel.com>
      Tested-by: default avatarVlastimil Babka <vbabka@suse.cz>
      Link: http://lkml.kernel.org/g/20131205031051.GC5135@yliu-dev.sh.intel.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      a7560a01
    • Tejun Heo's avatar
      sysfs: bail early from kernfs_file_mmap() to avoid spurious lockdep warning · 9b2db6e1
      Tejun Heo authored
      This is v3.14 fix for the same issue that a8b14744 ("sysfs: give
      different locking key to regular and bin files") addresses for v3.13.
      Due to the extensive kernfs reorganization in v3.14 branch, the same
      fix couldn't be ported as-is.  The v3.13 fix was ignored while merging
      it into v3.14 branch.
      
      027a485d ("sysfs: use a separate locking class for open files
      depending on mmap") assigned different lockdep key to
      sysfs_open_file->mutex depending on whether the file implements mmap
      or not in an attempt to avoid spurious lockdep warning caused by
      merging of regular and bin file paths.
      
      While this restored some of the original behavior of using different
      locks (at least lockdep is concerned) for the different clases of
      files.  The restoration wasn't full because now the lockdep key
      assignment depends on whether the file has mmap or not instead of
      whether it's a regular file or not.
      
      This means that bin files which don't implement mmap will get assigned
      the same lockdep class as regular files.  This is problematic because
      file_operations for bin files still implements the mmap file operation
      and checking whether the sysfs file actually implements mmap happens
      in the file operation after grabbing @sysfs_open_file->mutex.  We
      still end up adding locking dependency from mmap locking to
      sysfs_open_file->mutex to the regular file mutex which triggers
      spurious circular locking warning.
      
      For v3.13, a8b14744 ("sysfs: give different locking key to regular
      and bin files") fixed it by giving sysfs_open_file->mutex different
      lockdep keys depending on whether the file is regular or bin instead
      of whether mmap exists or not; however, due to the way sysfs is now
      layered behind kernfs, this approach is no longer viable.  kernfs can
      tell whether a sysfs node has mmap implemented or not but can't tell
      whether a bin file from a regular one.
      
      This patch updates kernfs such that kernfs_file_mmap() checks
      SYSFS_FLAG_HAS_MMAP and bail before grabbing sysfs_open_file->mutex so
      that it doesn't add spurious locking dependency from mmap to
      sysfs_open_file->mutex and changes sysfs so that it specifies
      kernfs_ops->mmap iff the sysfs file implements mmap.  Combined, this
      ensures that sysfs_open_file->mutex is grabbed under mmap path iff the
      sysfs file actually implements mmap.  As sysfs_open_file->mutex is
      already given a different lockdep key if mmap is implemented, this
      removes the spurious locking dependency.
      Signed-off-by: default avatarTejun Heo <tj@kernel.org>
      Reported-by: default avatarDave Jones <davej@redhat.com>
      Link: http://lkml.kernel.org/g/20131203184324.GA11320@redhat.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      9b2db6e1
  2. 10 Dec, 2013 1 commit
    • Tejun Heo's avatar
      Merge branch 'driver-core-linus' into driver-core-next · 13ccb93f
      Tejun Heo authored
      a8b14744 ("sysfs: give different locking key to regular and bin
      files") in driver-core-linus modifies sysfs_open_file() so that it
      gives out different locking classes to sysfs_open_files depending on
      whether the file is bin or not.  Due to the massive kernfs
      reorganization in driver-core-next, this naturally causes merge
      conflict in fs/sysfs/file.c.
      
      Due to the way things are split between kernfs and sysfs in
      driver-core-next, the same fix can't easily be applied to
      driver-core-next.  This merge simply ignores the offending commit.  A
      following patch will implement a separate fix for the issue.
      Signed-off-by: default avatarTejun Heo <tj@kernel.org>
      13ccb93f
  3. 09 Dec, 2013 9 commits
  4. 08 Dec, 2013 3 commits
    • Tejun Heo's avatar
      sysfs: give different locking key to regular and bin files · a8b14744
      Tejun Heo authored
      027a485d ("sysfs: use a separate locking class for open files
      depending on mmap") assigned different lockdep key to
      sysfs_open_file->mutex depending on whether the file implements mmap
      or not in an attempt to avoid spurious lockdep warning caused by
      merging of regular and bin file paths.
      
      While this restored some of the original behavior of using different
      locks (at least lockdep is concerned) for the different clases of
      files.  The restoration wasn't full because now the lockdep key
      assignment depends on whether the file has mmap or not instead of
      whether it's a regular file or not.
      
      This means that bin files which don't implement mmap will get assigned
      the same lockdep class as regular files.  This is problematic because
      file_operations for bin files still implements the mmap file operation
      and checking whether the sysfs file actually implements mmap happens
      in the file operation after grabbing @sysfs_open_file->mutex.  We
      still end up adding locking dependency from mmap locking to
      sysfs_open_file->mutex to the regular file mutex which triggers
      spurious circular locking warning.
      
      Fix it by restoring the original behavior fully by differentiating
      lockdep key by whether the file is regular or bin, instead of the
      existence of mmap.
      Signed-off-by: default avatarTejun Heo <tj@kernel.org>
      Reported-by: default avatarDave Jones <davej@redhat.com>
      Link: http://lkml.kernel.org/g/20131203184324.GA11320@redhat.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      a8b14744
    • Bjorn Helgaas's avatar
      kobject: remove kset from sysfs immediately in kset_unregister() · 35a5fe69
      Bjorn Helgaas authored
      There's no "unlink from sysfs" interface for ksets, so I think callers of
      kset_unregister() expect the kset to be removed from sysfs immediately,
      without waiting for the last reference to be released.
      
      This patch makes the sysfs removal happen immediately, so the caller may
      create a new kset with the same name as soon as kset_unregister() returns.
      Without this, every caller has to call "kobject_del(&kset->kobj)" first
      unless it knows it will never create a new kset with the same name.
      
      This sometimes shows up on module unload and reload, where the reload fails
      because it tries to create a kobject with the same name as one from the
      original load that still exists.  CONFIG_DEBUG_KOBJECT_RELEASE=y makes this
      problem easier to hit.
      Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      35a5fe69
    • Bjorn Helgaas's avatar
      kobject: delay kobject release for random time · 89c86a64
      Bjorn Helgaas authored
      When CONFIG_DEBUG_KOBJECT_RELEASE=y, delay kobject release functions for a
      random time between 1 and 8 seconds, which effectively changes the order in
      which they're called.
      Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      89c86a64
  5. 06 Dec, 2013 11 commits
    • Linus Torvalds's avatar
      Linux 3.13-rc3 · 374b1057
      Linus Torvalds authored
      374b1057
    • Linus Torvalds's avatar
      Merge tag 'trace-fixes-3.13-rc2' of... · 843f4f4b
      Linus Torvalds authored
      Merge tag 'trace-fixes-3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
      
      Pull tracing fix from Steven Rostedt:
       "A regression showed up that there's a large delay when enabling all
        events.  This was prevalent when FTRACE_SELFTEST was enabled which
        enables all events several times, and caused the system bootup to
        pause for over a minute.
      
        This was tracked down to an addition of a synchronize_sched()
        performed when system call tracepoints are unregistered.
      
        The synchronize_sched() is needed between the unregistering of the
        system call tracepoint and a deletion of a tracing instance buffer.
        But placing the synchronize_sched() in the unreg of *every* system
        call tracepoint is a bit overboard.  A single synchronize_sched()
        before the deletion of the instance is sufficient"
      
      * tag 'trace-fixes-3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Only run synchronize_sched() at instance deletion time
      843f4f4b
    • Linus Torvalds's avatar
      Merge git://git.kvack.org/~bcrl/aio-next · c537aba0
      Linus Torvalds authored
      Pull aio fix from Benjamin LaHaise:
       "AIO fix from Gu Zheng that fixes a GPF that Dave Jones uncovered with
        trinity"
      
      * git://git.kvack.org/~bcrl/aio-next:
        aio: clean up aio ring in the fail path
      c537aba0
    • Linus Torvalds's avatar
      Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 7adfff58
      Linus Torvalds authored
      Pull SCSI fixes from James Bottomley:
       "This is a set of nine fixes (and one author update).
      
        The libsas one should fix discovery in eSATA devices, the WRITE_SAME
        one is the largest, but it should fix a lot of problems we've been
        getting with the emulated RAID devices (they've been effectively lying
        about support and then firmware has been choking on the commands).
      
        The rest are various crash, hang or warn driver fixes"
      
      * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        [SCSI] bfa: Fix crash when symb name set for offline vport
        [SCSI] enclosure: fix WARN_ON in dual path device removing
        [SCSI] pm80xx: Tasklets synchronization fix.
        [SCSI] pm80xx: Resetting the phy state.
        [SCSI] pm80xx: Fix for direct attached device.
        [SCSI] pm80xx: Module author addition
        [SCSI] hpsa: return 0 from driver probe function on success, not 1
        [SCSI] hpsa: do not discard scsi status on aborted commands
        [SCSI] Disable WRITE SAME for RAID and virtual host adapter drivers
        [SCSI] libsas: fix usage of ata_tf_to_fis
      7adfff58
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 470abdcf
      Linus Torvalds authored
      Pull IMA fixes from James Morris:
       "Here are two more fixes for IMA"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        ima: properly free ima_template_entry structures
        ima: Do not free 'entry' before it is initialized
      470abdcf
    • Linus Torvalds's avatar
      Merge tag 'dt-fixes-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux · 24cb4120
      Linus Torvalds authored
      Pull devicetree fixes from Rob Herring:
       - Various DT binding documentation updates
       - Add Kumar Gala and remove Stephen Warren as DT binding maintainers
      
      * tag 'dt-fixes-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
        dt: binding: reword PowerPC 8xxx GPIO documentation
        ARM: tegra: delete nvidia,tegra20-spi.txt binding
        hwmon: ntc_thermistor: Fix typo (pullup-uV -> pullup-uv)
        of: add vendor prefix for GMT
        clk: exynos: Fix typos in DT bindings documentation
        of: Add vendor prefix for LG Corporation
        Documentation: net: fsl-fec.txt: Add phy-supply entry
        ARM: dts: doc: Document missing binding for omap5-mpu
        dt-bindings: add ARMv8 PMU binding
        MAINTAINERS: remove swarren from DT bindings
        MAINTAINERS: Add Kumar to Device Tree Binding maintainers group
      24cb4120
    • Gu Zheng's avatar
      aio: clean up aio ring in the fail path · d1b94327
      Gu Zheng authored
      Clean up the aio ring file in the fail path of aio_setup_ring
      and ioctx_alloc. And maybe it can fix the GPF issue reported by
      Dave Jones:
      https://lkml.org/lkml/2013/11/25/898Signed-off-by: default avatarGu Zheng <guz.fnst@cn.fujitsu.com>
      Signed-off-by: default avatarBenjamin LaHaise <bcrl@kvack.org>
      d1b94327
    • James Morris's avatar
      Merge branch 'free-memory' of... · bfb26328
      James Morris authored
      Merge branch 'free-memory' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into for-linus
      bfb26328
    • Linus Torvalds's avatar
      Merge tag 'pm-3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 002acf1f
      Linus Torvalds authored
      Pull power management fixes from Rafael Wysocki:
      
       - cpufreq regression fix from Bjørn Mork restoring the pre-3.12
         behavior of the framework during system suspend/hibernation to avoid
         garbage sysfs files from being left behind in case of a suspend error
      
       - PNP regression fix to restore the correct states of devices after
         resume from hibernation broken in 3.12.  From Dmitry Torokhov.
      
       - cpuidle fix to prevent cpuidle device unregistration from crashing
         due to a NULL pointer dereference if cpuidle has been disabled from
         the kernel command line.  From Konrad Rzeszutek Wilk.
      
       - intel_idle fix for the C6 state definition on Intel Avoton/Rangeley
         processors from Arne Bockholdt.
      
       - Power capping framework fix to make the energy_uj sysfs attribute
         work in accordance with the documentation.  From Srinivas Pandruvada.
      
       - epoll fix to make it ignore the EPOLLWAKEUP flag if the kernel has
         been compiled with CONFIG_PM_SLEEP unset (in which case that flag
         should not have any effect).  From Amit Pundir.
      
       - cpufreq fix to prevent governor sysfs files from being lost over
         system suspend/resume in some (arguably unusual) situations.  From
         Viresh Kumar.
      
      * tag 'pm-3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        PowerCap: Fix mode for energy counter
        PNP: fix restoring devices after hibernation
        cpuidle: Check for dev before deregistering it.
        epoll: drop EPOLLWAKEUP if PM_SLEEP is disabled
        cpufreq: fix garbage kobjects on errors during suspend/resume
        cpufreq: suspend governors on system suspend/hibernate
        intel_idle: Fixed C6 state on Avoton/Rangeley processors
      002acf1f
    • Rafael J. Wysocki's avatar
      Merge branches 'pm-epoll', 'pnp' and 'powercap' · 8e703009
      Rafael J. Wysocki authored
      * pm-epoll:
        epoll: drop EPOLLWAKEUP if PM_SLEEP is disabled
      
      * pnp:
        PNP: fix restoring devices after hibernation
      
      * powercap:
        PowerCap: Fix mode for energy counter
      8e703009
    • Rafael J. Wysocki's avatar
      Merge branches 'pm-cpuidle' and 'pm-cpufreq' · 7cdcec99
      Rafael J. Wysocki authored
      * pm-cpuidle:
        cpuidle: Check for dev before deregistering it.
        intel_idle: Fixed C6 state on Avoton/Rangeley processors
      
      * pm-cpufreq:
        cpufreq: fix garbage kobjects on errors during suspend/resume
        cpufreq: suspend governors on system suspend/hibernate
      7cdcec99
  6. 05 Dec, 2013 12 commits
    • Linus Torvalds's avatar
      Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile · b52b342d
      Linus Torvalds authored
      Pull arch/tile ftrace bug fix from Chris Metcalf:
       "This fixes a build failure with allyesconfig reported by Fengguang Wu
        and fixed by Tony Lu"
      
      * 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
        ftrace: default to tilegx if ARCH=tile is specified
      b52b342d
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · 5ee54061
      Linus Torvalds authored
      Pull block layer fixes from Jens Axboe:
       "A small collection of fixes for the current series. It contains:
      
         - A fix for a use-after-free of a request in blk-mq.  From Ming Lei
      
         - A fix for a blk-mq bug that could attempt to dereference a NULL rq
           if allocation failed
      
         - Two xen-blkfront small fixes
      
         - Cleanup of submit_bio_wait() type uses in the kernel, unifying
           that.  From Kent
      
         - A fix for 32-bit blkg_rwstat reading.  I apologize for this one
           looking mangled in the shortlog, it's entirely my fault for missing
           an empty line between the description and body of the text"
      
      * 'for-linus' of git://git.kernel.dk/linux-block:
        blk-mq: fix use-after-free of request
        blk-mq: fix dereference of rq->mq_ctx if allocation fails
        block: xen-blkfront: Fix possible NULL ptr dereference
        xen-blkfront: Silence pfn maybe-uninitialized warning
        block: submit_bio_wait() conversions
        Update of blkg_stat and blkg_rwstat may happen in bh context
      5ee54061
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-3.13-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 29be6345
      Linus Torvalds authored
      Pull NFS client bugfixes from Trond Myklebust:
       - Stable fix for a NFSv4.1 delegation and state recovery deadlock
       - Stable fix for a loop on irrecoverable errors when returning
         delegations
       - Fix a 3-way deadlock between layoutreturn, open, and state recovery
       - Update the MAINTAINERS file with contact information for Trond
         Myklebust
       - Close needs to handle NFS4ERR_ADMIN_REVOKED
       - Enabling v4.2 should not recompile nfsd and lockd
       - Fix a couple of compile warnings
      
      * tag 'nfs-for-3.13-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
        nfs: fix do_div() warning by instead using sector_div()
        MAINTAINERS: Update contact information for Trond Myklebust
        NFSv4.1: Prevent a 3-way deadlock between layoutreturn, open and state recovery
        SUNRPC: do not fail gss proc NULL calls with EACCES
        NFSv4: close needs to handle NFS4ERR_ADMIN_REVOKED
        NFSv4: Update list of irrecoverable errors on DELEGRETURN
        NFSv4 wait on recovery for async session errors
        NFS: Fix a warning in nfs_setsecurity
        NFS: Enabling v4.2 should not recompile nfsd and lockd
      29be6345
    • Tony Lu's avatar
      ftrace: default to tilegx if ARCH=tile is specified · 2d8eedad
      Tony Lu authored
      This matches the existing behavior in arch/tile/Makefile for defconfig.
      
      Reported-by: fengguang.wu@intel.com
      Acked-by: default avatarSteven Rostedt <rostedt@goodmis.org>
      Signed-off-by: default avatarTony Lu <zlu@tilera.com>
      Signed-off-by: default avatarChris Metcalf <cmetcalf@tilera.com>
      2d8eedad
    • Steven Rostedt's avatar
      tracing: Only run synchronize_sched() at instance deletion time · 3ccb0123
      Steven Rostedt authored
      It has been reported that boot up with FTRACE_SELFTEST enabled can take a
      very long time. There can be stalls of over a minute.
      
      This was tracked down to the synchronize_sched() called when a system call
      event is disabled. As the self tests enable and disable thousands of events,
      this makes the synchronize_sched() get called thousands of times.
      
      The synchornize_sched() was added with d562aff9 "tracing: Add support
      for SOFT_DISABLE to syscall events" which caused this regression (added
      in 3.13-rc1).
      
      The synchronize_sched() is to protect against the events being accessed
      when a tracer instance is being deleted. When an instance is being deleted
      all the events associated to it are unregistered. The synchronize_sched()
      makes sure that no more users are running when it finishes.
      
      Instead of calling synchronize_sched() for all syscall events, we only
      need to call it once, after the events are unregistered and before the
      instance is deleted. The event_mutex is held during this action to
      prevent new users from enabling events.
      
      Link: http://lkml.kernel.org/r/20131203124120.427b9661@gandalf.local.homeReported-by: default avatarPetr Mladek <pmladek@suse.cz>
      Acked-by: default avatarTom Zanussi <tom.zanussi@linux.intel.com>
      Acked-by: default avatarPetr Mladek <pmladek@suse.cz>
      Tested-by: default avatarPetr Mladek <pmladek@suse.cz>
      Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
      3ccb0123
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · ef1e4e32
      Linus Torvalds authored
      Pull btrfs MAINTAINERS file update:
       "I'm still getting settled into new devel hardware etc, but I do have
        one commit for the next rc.
      
        This changes my email over to fb.com, and adds a MAINTAINERS entry for
        Josef as well"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: update the MAINTAINERS file
      ef1e4e32
    • Linus Torvalds's avatar
      Merge tag 'fbdev-fixes-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux · 59fb2f0e
      Linus Torvalds authored
      Pull minor fbdev fixes from Tomi Valkeinen.
      
      * tag 'fbdev-fixes-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
        video: vt8500: fix error handling in probe()
        atmel_lcdfb: fix module autoload
        fbdev: sh_mobile_meram: Fix defined but not used compiler warnings
        video: kyro: fix incorrect sizes when copying to userspace
        ARM: OMAPFB: panel-sony-acx565akm: fix bad unlock balance
      59fb2f0e
    • Linus Torvalds's avatar
      Merge tag 'sound-3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 09759d1e
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "A usual pattern of half ASoC and half HD-audio fixes, although
        HD-audio fixups have more volumes, in addition to a couple of trivial
        fixes.  Nothing to worry much is found here.
      
        For ASoC side: a few fixes for PCM rate constraints calculations,
        regmap byte-order fix, the rest driver specific fixes (atmel, fsl,
        omap, kirkwood, wm codecs).
      
        For HD-audio: Dell headset and mono out fix, ELD update in polling
        mode, ALC283 Chromebook fixes, a few fixes for old AD codecs and
        MBA2, one regression fix"
      
      * tag 'sound-3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (30 commits)
        ALSA: hda - Fix silent output on MacBook Air 2,1
        ALSA: hda - Fix missing ELD info when using jackpoll_ms parameter
        ALSA: hda/realtek - remove hp_automute_hook from alc283_fixup_chromebook
        ASoC: wm8731: fix dsp mode configuration
        ALSA: hda/realtek - Independent of model for HP
        ALSA: hda - Fix headset mic input after muted internal mic (Dell/Realtek)
        ALSA: hda - Use always amps for auto-mute on AD1986A codec
        ALSA: hda/analog - Handle inverted EAPD properly in vmaster hook
        ALSA: hda - Another fixup for ASUS laptop with ALC660 codec
        ALSA: atmel: Fix possible array overflow
        ALSA: hda - Fix complete_all() timing in deferred probes
        ALSA: hda - Fix bad EAPD setup for HP machines with AD1984A
        ASoC: core: fix devres parameter in devm_snd_soc_register_card()
        ASoC: omap: n810: Convert to clk_prepare_enable/clk_disable_unprepare
        ASoC: fsl: set correct platform drvdata in pcm030_fabric_probe()
        ASoC: fsl: imx-pcm-fiq: Remove unused 'runtime' variable
        ASoC: fsl: imx-pcm-fiq: remove bogus period delta calculation
        ALSA: hda - Fix silent output on ASUS W7J laptop
        ASoC: core: Use consistent byte ordering in snd_soc_bytes_get
        ALSA: dice: fix array limits in dice_proc_read()
        ...
      09759d1e
    • Linus Torvalds's avatar
      Merge tag 'pinctrl-v3.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · da1965d3
      Linus Torvalds authored
      Pull pin control fixes from Linus Walleij:
      
       - Minor bug fixes for the Rockchip, ST-Ericsson abx500, Renesas PFC
         r8a7740 and sh7372.
      
       - Compilation warning fixes.
      
      * tag 'pinctrl-v3.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
        sh-pfc: sh7372: Fix pin bias setup
        sh-pfc: r8a7740: Fix pin bias setup
        pinctrl: abx500: Fix header file include guard
        pinctrl: rockchip: missing unlock on error in rockchip_set_pull()
        pinctrl: abx500: fix some more bitwise AND tests
        pinctrl: rockchip: testing the wrong variable
      da1965d3
    • Ming Lei's avatar
      blk-mq: fix use-after-free of request · 0d11e6ac
      Ming Lei authored
      If accounting is on, we will do the IO completion accounting after
      we have freed the request. Fix that by moving it sooner instead.
      Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
      0d11e6ac
    • Linus Torvalds's avatar
      Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 53c6de50
      Linus Torvalds authored
      Pull x86 and EFI fixes from Peter Anvin:
       "Half of these are EFI-related:
      
        The by far biggest change is the change to hold off the deletion of a
        sysfs entry while a backend scan is in progress.  This is to avoid
        calling kmemdup() while under a spinlock.
      
        The other major change is for each entry in the EFI pstore backend to
        get a unique identifier, as required by the pstore filesystem proper.
      
        The other changes are:
      
        A fix to the recent consolidation and optimization of using "asm goto"
        with read-modify-write operation, which broke the bitops; specifically
        in such a way that we could end up generating invalid code.
      
        A build hack to make sure we compile with -mno-sse.  icc, and most
        likely future versions of gcc, can generate SSE instructions unless we
        tell it not to.
      
        A comment-only patch to a change the was due in part to an unpublished
        erratum; now when the erratum is published we want to add a comment
        explaining why"
      
      * 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/apic, doc: Justification for disabling IO APIC before Local APIC
        x86, bitops: Correct the assembly constraints to testing bitops
        x86-64, build: Always pass in -mno-sse
        efi-pstore: Make efi-pstore return a unique id
        x86/efi: Fix earlyprintk off-by-one bug
        efivars, efi-pstore: Hold off deletion of sysfs entry until the scan is completed
      53c6de50
    • Fenghua Yu's avatar
      x86/apic, doc: Justification for disabling IO APIC before Local APIC · 2885432a
      Fenghua Yu authored
      Since erratum AVR31 in "Intel Atom Processor C2000 Product Family
      Specification Update" is now published, I added a justification
      comment for disabling IO APIC before Local APIC, as changed in commit:
      
      522e6646 x86/apic: Disable I/O APIC before shutdown of the local APIC
      Signed-off-by: default avatarFenghua Yu <fenghua.yu@intel.com>
      Link: http://lkml.kernel.org/r/1386202069-51515-1-git-send-email-fenghua.yu@intel.comSigned-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
      2885432a