Skip to content
  1. Oct 13, 2013
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · d64dab90
      Linus Torvalds authored
      Pull btrfs fixes from Chris Mason:
       "We've got more bug fixes in my for-linus branch:
      
        One of these fixes another corner of the compression oops from last
        time.  Miao nailed down some problems with concurrent snapshot
        deletion and drive balancing.
      
        I kept out one of his patches for more testing, but these are all
        stable"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: fix oops caused by the space balance and dead roots
        Btrfs: insert orphan roots into fs radix tree
        Btrfs: limit delalloc pages outside of find_delalloc_range
        Btrfs: use right root when checking for hash collision
      d64dab90
    • Linus Torvalds's avatar
      Merge tag 'sound-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · d192f0d5
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "All stable fixes except for a trivial headset mic fixup: the removal
        of bogus frame checks in snd-usb-usx2y driver that have regressed in
        the recent kernel versions, the HD-audio HDMI channel map fix, and a
        few HD-audio device-specific fixes"
      
      * tag 'sound-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - Sony VAIO Pro 13 (haswell) now has a working headset jack
        ALSA: hda - Add a headset mic model for ALC269 and friends
        ALSA: hda - Fix microphone for Sony VAIO Pro 13 (Haswell model)
        ALSA: hda - Add fixup for ASUS N56VZ
        ALSA: hda - hdmi: Fix channel map switch not taking effect
        ALSA: hda - Fix mono speakers and headset mic on Dell Vostro 5470
        ALSA: snd-usb-usx2y: remove bogus frame checks
      d192f0d5
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 6cc3026e
      Linus Torvalds authored
      Pull i2c fixes from Wolfram Sang:
       "We had various reports of problems with deferred probing in the I2C
        subsystem, so this pull requst is a little bigger than usual.
      
        Most issues should be addressed now so devices will be found
        correctly.  A few ususal driver bugfixes are in here, too"
      
      * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        i2c: i2c-mux-pinctrl: use deferred probe when adapter not found
        i2c: i2c-arb-gpio-challenge: use deferred probe when adapter not found
        i2c: i2c-mux-gpio: use deferred probing
        i2c: i2c-mux-gpio: don't ignore of_get_named_gpio errors
        i2c: omap: Clear ARDY bit twice
        i2c: Not all adapters have a parent
        i2c: i2c-stu300: replace platform_driver_probe to support deferred probing
        i2c: i2c-mxs: replace platform_driver_probe to support deferred probing
        i2c: i2c-imx: replace platform_driver_probe to support deferred probing
        i2c: i2c-designware-platdrv: replace platform_driver_probe to support deferred probing
      6cc3026e
    • Linus Torvalds's avatar
      Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · c786e90b
      Linus Torvalds authored
      Pull gcc "asm goto" miscompilation workaround from Ingo Molnar:
       "This is the fix for the GCC miscompilation discussed in the following
        lkml thread:
      
          [x86] BUG: unable to handle kernel paging request at 00740060
      
        The bug in GCC has been fixed by Jakub and the fix will be part of the
        GCC 4.8.2 release expected to be released next week - so the quirk's
        version test checks for <= 4.8.1.
      
        The quirk is only added to compiler-gcc4.h and not to the higher level
        compiler.h because all asm goto uses are behind a feature check"
      
      * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        compiler/gcc4: Add quirk for 'asm goto' miscompilation bug
      c786e90b
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 71ac3d19
      Linus Torvalds authored
      Pull x86 fixes from Ingo Molnar:
       "A build fix and a reboot quirk"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/reboot: Add reboot quirk for Dell Latitude E5410
        x86, build, pci: Fix PCI_MSI build on !SMP
      71ac3d19
    • Linus Torvalds's avatar
      Merge tag 'arc-fixes-for-3.12-part3' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc · ccaa8be8
      Linus Torvalds authored
      Pull ARC fix from Vineet Gupta:
       "Fix for broken gdb 'jump'"
      
      * tag 'arc-fixes-for-3.12-part3' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
        ARC: Ignore ptrace SETREGSET request for synthetic register "stop_pc"
      ccaa8be8
  2. Oct 12, 2013
    • Vineet Gupta's avatar
      ARC: Ignore ptrace SETREGSET request for synthetic register "stop_pc" · 5b242828
      Vineet Gupta authored
      
      
      ARCompact TRAP_S insn used for breakpoints, commits before exception is
      taken (updating architectural PC). So ptregs->ret contains next-PC and
      not the breakpoint PC itself. This is different from other restartable
      exceptions such as TLB Miss where ptregs->ret has exact faulting PC.
      gdb needs to know exact-PC hence ARC ptrace GETREGSET provides for
      @stop_pc which returns ptregs->ret vs. EFA depending on the
      situation.
      
      However, writing stop_pc (SETREGSET request), which updates ptregs->ret
      doesn't makes sense stop_pc doesn't always correspond to that reg as
      described above.
      
      This was not an issue so far since user_regs->ret / user_regs->stop_pc
      had same value and both writing to ptregs->ret was OK, needless, but NOT
      broken, hence not observed.
      
      With gdb "jump", they diverge, and user_regs->ret updating ptregs is
      overwritten immediately with stop_pc, which this patch fixes.
      
      Reported-by: default avatarAnton Kolesov <akolesov@synopsys.com>
      Signed-off-by: default avatarVineet Gupta <vgupta@synopsys.com>
      5b242828
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 46f37519
      Linus Torvalds authored
      Pull MIPS fix from Ralf Baechle:
       "Just one fix.  The stack protector was loading the value of the canary
        instead of its address"
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: stack protector: Fix per-task canary switch
      46f37519
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · cd4edf7a
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "All over the map..
      
         - nouveau:
           disable MSI, needs more work, will try again next merge window
         - radeon:
            audio + uvd regression fixes, dpm fixes, reset fixes
         - i915:
           the dpms fix might fix your haswell
      
        And one pain in the ass revert, so we have VGA arbitration that when
        implemented 4-5 years ago really hoped that GPUs could remove
        themselves from arbitration completely once they had a kernel driver.
      
        It seems Intel hw designers decided that was too nice a facility to
        allow us to have so they removed it when they went on-die (so since
        Ironlake at least).  Now Alex Williamson added support for VGA
        arbitration for newer GPUs however this now exposes itself to
        userspace as requireing arbitration of GPU VGA regions and the X
        server gets involved and disables things that it can't handle when VGA
        access is possibly required around every operation.
      
        So in order to not break userspace we just reverted things back to the
        old known broken status so maybe we can try and design out way out.
      
        Ville also had a patch to use stop machine for the two times Intel
        needs to access VGA space, that might be acceptable with some rework,
        but for now myself and Daniel agreed to just go back"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (23 commits)
        Revert "i915: Update VGA arbiter support for newer devices"
        Revert "drm/i915: Delay disabling of VGA memory until vgacon->fbcon handoff is done"
        drm/radeon: re-enable sw ACR support on pre-DCE4
        drm/radeon/dpm: disable bapm on TN asics
        drm/radeon: improve soft reset on CIK
        drm/radeon: improve soft reset on SI
        drm/radeon/dpm: off by one in si_set_mc_special_registers()
        drm/radeon/dpm/btc: off by one in btc_set_mc_special_registers()
        drm/radeon: forever loop on error in radeon_do_test_moves()
        drm/radeon: fix hw contexts for SUMO2 asics
        drm/radeon: fix typo in CP DMA register headers
        drm/radeon/dpm: disable multiple UVD states
        drm/radeon: use hw generated CTS/N values for audio
        drm/radeon: fix N/CTS clock matching for audio
        drm/radeon: use 64-bit math to calculate CTS values for audio (v2)
        drm/edid: catch kmalloc failure in drm_edid_to_speaker_allocation
        Revert "drm/fb-helper: don't sleep for screen unblank when an oops is in progress"
        drm/gma500: fix things after get/put page helpers
        drm/nouveau/mc: disable msi support by default, it's busted in tons of places
        drm/i915: Only apply DPMS to the encoder if enabled
        ...
      cd4edf7a
  3. Oct 11, 2013
    • David Henningsson's avatar
      ALSA: hda - Sony VAIO Pro 13 (haswell) now has a working headset jack · fbc78ad6
      David Henningsson authored
      
      
      Just got the positive confirmation from a tester:
      https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1227093/comments/28
      
      Signed-off-by: default avatarDavid Henningsson <david.henningsson@canonical.com>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      fbc78ad6
    • David Henningsson's avatar
      ALSA: hda - Add a headset mic model for ALC269 and friends · 7c478f03
      David Henningsson authored
      
      
      Using the headset mic model will cause the headset mic to be labeled
      "headset mic" instead of just "mic".
      
      Signed-off-by: default avatarDavid Henningsson <david.henningsson@canonical.com>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      7c478f03
    • David Henningsson's avatar
      ALSA: hda - Fix microphone for Sony VAIO Pro 13 (Haswell model) · 88cfcf86
      David Henningsson authored
      
      
      The external mic showed up with a precense detect of "always present",
      essentially disabling the internal mic. Therefore turn off presence
      detection for this pin.
      
      Note: The external mic seems not yet working, but an internal mic is
      certainly better than no mic at all.
      
      Cc: stable@vger.kernel.org
      BugLink: https://bugs.launchpad.net/bugs/1227093
      Signed-off-by: default avatarDavid Henningsson <david.henningsson@canonical.com>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      88cfcf86
    • Ingo Molnar's avatar
      compiler/gcc4: Add quirk for 'asm goto' miscompilation bug · 3f0116c3
      Ingo Molnar authored
      
      
      Fengguang Wu, Oleg Nesterov and Peter Zijlstra tracked down
      a kernel crash to a GCC bug: GCC miscompiles certain 'asm goto'
      constructs, as outlined here:
      
        http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
      
      Implement a workaround suggested by Jakub Jelinek.
      
      Reported-and-tested-by: default avatarFengguang Wu <fengguang.wu@intel.com>
      Reported-by: default avatarOleg Nesterov <oleg@redhat.com>
      Reported-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
      Suggested-by: default avatarJakub Jelinek <jakub@redhat.com>
      Reviewed-by: default avatarRichard Henderson <rth@twiddle.net>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: <stable@kernel.org>
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      3f0116c3
    • Dave Airlie's avatar
      Revert "i915: Update VGA arbiter support for newer devices" · ebff5fa9
      Dave Airlie authored
      This reverts commit 81b5c7bc
      
      .
      
      Adding drm/i915 into the vga arbiter chain means that X (in a piece of
      well-meant paranoia) will do a get/put on the vga decoding around
      _every_ accel call down into the ddx. Which results in some nice
      performance disasters [1]. This really breaks userspace, by disabling
      DRI for everyone, and stops OpenGL from working, this isn't limited
      to just the i915 but both the integrated and discrete GPUs on
      multi-gpu systems, in other words this causes untold worlds of pain,
      
      Ville tried to come up with a Great Hack to fiddle the required VGA
      I/O ops behind everyone's back using stop_machine, but that didn't
      really work out [2]. Given that we're fairly late in the -rc stage for
      such games let's just revert this all.
      
      One thing we might want to keep is to delay the disabling of the vga
      decoding until the fbdev emulation and the fbcon screen is set up. If
      we kill vga mem decoding beforehand fbcon can end up with a white
      square in the top-left corner it tried to save from the vga memory for
      a seamless transition. And we have bug reports on older platforms
      which seem to match these symptoms.
      
      But again that's something to play around with in -next.
      
      References: [1] http://lists.x.org/archives/xorg-devel/2013-September/037763.html
      References: [2] http://www.spinics.net/lists/intel-gfx/msg34062.html
      Cc: Alex Williamson <alex.williamson@redhat.com>
      Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
      Cc: Chris Wilson <chris@chris-wilson.co.uk>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      ebff5fa9
    • Dave Airlie's avatar
      Revert "drm/i915: Delay disabling of VGA memory until vgacon->fbcon handoff is done" · e1264ebe
      Dave Airlie authored
      This reverts commit 6e1b4fda
      
      .
      
      This is part of a revert due to a userspace breakage, better explained in the revert of 1a1a4cbf4906a13c0c377f708df5d94168e7b582.
      
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      e1264ebe
    • Dave Airlie's avatar
      Merge branch 'drm-fixes-3.12' of git://people.freedesktop.org/~agd5f/linux into drm-fixes · 23026285
      Dave Airlie authored
      Regression fixes for audio and UVD, several hang fixes,
      some DPM fixes.
      
      * 'drm-fixes-3.12' of git://people.freedesktop.org/~agd5f/linux:
        drm/radeon: re-enable sw ACR support on pre-DCE4
        drm/radeon/dpm: disable bapm on TN asics
        drm/radeon: improve soft reset on CIK
        drm/radeon: improve soft reset on SI
        drm/radeon/dpm: off by one in si_set_mc_special_registers()
        drm/radeon/dpm/btc: off by one in btc_set_mc_special_registers()
        drm/radeon: forever loop on error in radeon_do_test_moves()
        drm/radeon: fix hw contexts for SUMO2 asics
        drm/radeon: fix typo in CP DMA register headers
        drm/radeon/dpm: disable multiple UVD states
        drm/radeon: use hw generated CTS/N values for audio
        drm/radeon: fix N/CTS clock matching for audio
        drm/radeon: use 64-bit math to calculate CTS values for audio (v2)
        drm/edid: catch kmalloc failure in drm_edid_to_speaker_allocation
      23026285
    • Miao Xie's avatar
      Btrfs: fix oops caused by the space balance and dead roots · c00869f1
      Miao Xie authored
      
      
      When doing space balance and subvolume destroy at the same time, we met
      the following oops:
      
      kernel BUG at fs/btrfs/relocation.c:2247!
      RIP: 0010: [<ffffffffa04cec16>] prepare_to_merge+0x154/0x1f0 [btrfs]
      Call Trace:
       [<ffffffffa04b5ab7>] relocate_block_group+0x466/0x4e6 [btrfs]
       [<ffffffffa04b5c7a>] btrfs_relocate_block_group+0x143/0x275 [btrfs]
       [<ffffffffa0495c56>] btrfs_relocate_chunk.isra.27+0x5c/0x5a2 [btrfs]
       [<ffffffffa0459871>] ? btrfs_item_key_to_cpu+0x15/0x31 [btrfs]
       [<ffffffffa048b46a>] ? btrfs_get_token_64+0x7e/0xcd [btrfs]
       [<ffffffffa04a3467>] ? btrfs_tree_read_unlock_blocking+0xb2/0xb7 [btrfs]
       [<ffffffffa049907d>] btrfs_balance+0x9c7/0xb6f [btrfs]
       [<ffffffffa049ef84>] btrfs_ioctl_balance+0x234/0x2ac [btrfs]
       [<ffffffffa04a1e8e>] btrfs_ioctl+0xd87/0x1ef9 [btrfs]
       [<ffffffff81122f53>] ? path_openat+0x234/0x4db
       [<ffffffff813c3b78>] ? __do_page_fault+0x31d/0x391
       [<ffffffff810f8ab6>] ? vma_link+0x74/0x94
       [<ffffffff811250f5>] vfs_ioctl+0x1d/0x39
       [<ffffffff811258c8>] do_vfs_ioctl+0x32d/0x3e2
       [<ffffffff811259d4>] SyS_ioctl+0x57/0x83
       [<ffffffff813c3bfa>] ? do_page_fault+0xe/0x10
       [<ffffffff813c73c2>] system_call_fastpath+0x16/0x1b
      
      It is because we returned the error number if the reference of the root was 0
      when doing space relocation. It was not right here, because though the root
      was dead(refs == 0), but the space it held still need be relocated, or we
      could not remove the block group. So in this case, we should return the root
      no matter it is dead or not.
      
      Signed-off-by: default avatarMiao Xie <miaox@cn.fujitsu.com>
      Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
      Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
      c00869f1
    • Miao Xie's avatar
      Btrfs: insert orphan roots into fs radix tree · 14927d95
      Miao Xie authored
      
      
      Now we don't drop all the deleted snapshots/subvolumes before the space
      balance. It means we have to relocate the space which is held by the dead
      snapshots/subvolumes. So we must into them into fs radix tree, or we would
      forget to commit the change of them when doing transaction commit, and it
      would corrupt the metadata.
      
      Signed-off-by: default avatarMiao Xie <miaox@cn.fujitsu.com>
      Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
      Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
      14927d95
    • Josef Bacik's avatar
      Btrfs: limit delalloc pages outside of find_delalloc_range · 7bf811a5
      Josef Bacik authored
      
      
      Liu fixed part of this problem and unfortunately I steered him in slightly the
      wrong direction and so didn't completely fix the problem.  The problem is we
      limit the size of the delalloc range we are looking for to max bytes and then we
      try to lock that range.  If we fail to lock the pages in that range we will
      shrink the max bytes to a single page and re loop.  However if our first page is
      inside of the delalloc range then we will end up limiting the end of the range
      to a period before our first page.  This is illustrated below
      
      [0 -------- delalloc range --------- 256mb]
                                        [page]
      
      So find_delalloc_range will return with delalloc_start as 0 and end as 128mb,
      and then we will notice that delalloc_start < *start and adjust it up, but not
      adjust delalloc_end up, so things go sideways.  To fix this we need to not limit
      the max bytes in find_delalloc_range, but in find_lock_delalloc_range and that
      way we don't end up with this confusion.  Thanks,
      
      Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
      Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
      7bf811a5
    • Josef Bacik's avatar
      Btrfs: use right root when checking for hash collision · 4871c158
      Josef Bacik authored
      
      
      btrfs_rename was using the root of the old dir instead of the root of the new
      dir when checking for a hash collision, so if you tried to move a file into a
      subvol it would freak out because it would see the file you are trying to move
      in its current root.  This fixes the bug where this would fail
      
      btrfs subvol create test1
      btrfs subvol create test2
      mv test1 test2.
      
      Thanks to Chris Murphy for catching this,
      
      Cc: stable@vger.kernel.org
      Reported-by: default avatarChris Murphy <lists@colorremedies.com>
      Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
      Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
      4871c158
    • Kent Overstreet's avatar
      bcache: Fix a null ptr deref regression · 2fe80d3b
      Kent Overstreet authored
      Commit c0f04d88
      
       ("bcache: Fix flushes in writeback mode") was fixing
      a reported data corruption bug, but it seems some last minute
      refactoring or rebasing introduced a null pointer deref.
      
      Signed-off-by: default avatarKent Overstreet <kmo@daterainc.com>
      Cc: linux-stable <stable@vger.kernel.org> # >= v3.10
      Reported-by: default avatarGabriel de Perthuis <g2p.code@gmail.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      2fe80d3b
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · e3e8ded0
      Linus Torvalds authored
      Pull hwmon fix from Guenter Roeck:
       "Fix root cause of crash/error seen in applesmc driver"
      
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (applesmc) Always read until end of data
      e3e8ded0
    • Linus Torvalds's avatar
      Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · 2d9d0282
      Linus Torvalds authored
      Pull kbuild fix from Michal Marek:
       "Here is an ARM Makefile fix that you even acked.  After nobody wanted
        to take it, it ended up in the kbuild tree"
      
      * 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        arm, kbuild: make "make install" not depend on vmlinux
      2d9d0282
    • Linus Torvalds's avatar
      Merge git://www.linux-watchdog.org/linux-watchdog · f112bf85
      Linus Torvalds authored
      Pull watchdog fix from Wim Van Sebroeck:
       "Make sure that the hpwdt driver will not load auxilary iLO devices"
      
      * git://www.linux-watchdog.org/linux-watchdog:
        watchdog: hpwdt: Patch to ignore auxilary iLO devices
      f112bf85
    • Fengguang Wu's avatar
      kobject: show debug info on delayed kobject release · 0ff18e37
      Fengguang Wu authored
      
      
      Useful for locating buggy drivers on kernel oops.
      
      It may add dozens of new lines to boot dmesg. DEBUG_KOBJECT_RELEASE is
      hopefully only enabled in debug kernels (like maybe the Fedora rawhide
      one, or at developers), so being a bit more verbose is likely ok.
      
      Acked-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
      Signed-off-by: default avatarFengguang Wu <fengguang.wu@intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      0ff18e37
    • Mingarelli, Thomas's avatar
      watchdog: hpwdt: Patch to ignore auxilary iLO devices · 0821f20d
      Mingarelli, Thomas authored
      
      
      This patch is to prevent hpwdt from loading on any auxilary iLO devices defined
      after the initial (or main) iLO device. All auxilary iLO devices will have a
      subsystem device ID set to 0x1979 in order for hpwdt to differentiate between
      the two types.
      
      Signed-off-by: default avatarThomas Mingarelli <thomas.mingarelli@hp.com>
      Tested-by: default avatarLisa Mitchell <lisa.mitchell@hp.com>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      0821f20d
    • Linus Torvalds's avatar
      Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random · f715729e
      Linus Torvalds authored
      Pull /dev/random changes from Ted Ts'o:
       "These patches are designed to enable improvements to /dev/random for
        non-x86 platforms, in particular MIPS and ARM"
      
      * tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
        random: allow architectures to optionally define random_get_entropy()
        random: run random_int_secret_init() run after all late_initcalls
      f715729e
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 8273548c
      Linus Torvalds authored
      Pull kvm fixes from Paolo Bonzini:
       "Fixes for 3.12-rc5: two old PPC bugs and one new (3.12-rc2) x86 bug"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
        kvm: ppc: booke: check range page invalidation progress on page setup
        KVM: PPC: Book3S HV: Fix typo in saving DSCR
        KVM: nVMX: fix shadow on EPT
      8273548c
    • Linus Torvalds's avatar
      Merge tag 'spi-v3.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · bd7df5ad
      Linus Torvalds authored
      Pull spi fixes from Mark Brown:
       "This is all driver updates, mostly fixes for error handling paths
        except for the s3c64xx and hspi fixes for trying to use runtime PM
        before it is enabled and the pxa2xx fix for interactions between power
        management and interrupt handling"
      
      * tag 'spi-v3.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
        spi: atmel: Fix incorrect error path
        spi/hspi: fixup Runtime PM enable timing
        spi/s3c64xx: Ensure runtime PM is enabled prior to registration
        spi/clps711x: drop clk_put for devm_clk_get in spi_clps711x_probe()
        spi: fix return value check in dspi_probe()
        spi: mpc512x: fix error return code in mpc512x_psc_spi_do_probe()
        spi: clps711x: Don't call kfree() after spi_master_put/spi_unregister_master
        spi/pxa2xx: check status register as well to determine if the device is off
      bd7df5ad
    • Theodore Ts'o's avatar
      random: allow architectures to optionally define random_get_entropy() · 61875f30
      Theodore Ts'o authored
      
      
      Allow architectures which have a disabled get_cycles() function to
      provide a random_get_entropy() function which provides a fine-grained,
      rapidly changing counter that can be used by the /dev/random driver.
      
      For example, an architecture might have a rapidly changing register
      used to control random TLB cache eviction, or DRAM refresh that
      doesn't meet the requirements of get_cycles(), but which is good
      enough for the needs of the random driver.
      
      Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
      Cc: stable@vger.kernel.org
      61875f30
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20131008' of git://git.infradead.org/linux-mtd · b291a229
      Linus Torvalds authored
      Pull MTD fixes from Brian Norris:
       - fix a small memory leak in some new ONFI code
       - account for additional odd variations of Micron SPI flash
      
      Acked by David Woodhouse.
      
      * tag 'for-linus-20131008' of git://git.infradead.org/linux-mtd:
        mtd: m25p80: Fix 4 byte addressing mode for Micron devices.
        mtd: nand: fix memory leak in ONFI extended parameter page
      b291a229
  4. Oct 10, 2013