1. 25 Feb, 2014 3 commits
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20140225' of git://git.infradead.org/linux-mtd · e4cc60cb
      Linus Torvalds authored
      Pull MTD fixes from Brian Norris:
       "Two main MTD fixes:
      
        1. Read retry counting was off by one, so if we had a true ECC error
           (i.e., no retry voltage threshold would give a clean read), we
           would end up returning -EINVAL on the Nth mode instead of -EBADMSG
           after then (N-1)th mode
      
        2. The OMAP NAND driver had some of its ECC layouts wrong when
           introduced in 3.13, causing incompatibilities between the
           bootloader on-flash layout and the layout expected in Linux.  The
           expected layouts are now documented in the commit messages, and we
           plan to add this under Documentation/mtd/nand/ eventually"
      
      * tag 'for-linus-20140225' of git://git.infradead.org/linux-mtd:
        mtd: nand: omap: fix ecclayout->oobfree->length
        mtd: nand: omap: fix ecclayout->oobfree->offset
        mtd: nand: omap: fix ecclayout to be in sync with u-boot NAND driver
        mtd: nand: fix off-by-one read retry mode counting
      e4cc60cb
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · c378a656
      Linus Torvalds authored
      Pull m68k update from Geert Uytterhoeven:
        - More barrier.h consolidation
        - Sched_[gs]etattr() syscalls
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68k: Wire up sched_setattr and sched_getattr
        m68k: Switch to asm-generic/barrier.h
        m68k: Sort arch/m68k/include/asm/Kbuild
      c378a656
    • Linus Torvalds's avatar
      Merge tag 'xtensa-next-20140224' of git://github.com/czankel/xtensa-linux · bafb8192
      Linus Torvalds authored
      Pull tensa fixes from Chris Zankel:
       "This series includes fixes for potentially serious bugs in the
        routines spilling processor registers to stack, as well as other
        issues and compiler errors and warnings.
      
         - allow booting xtfpga on boards with new uBoot and >128MBytes memory
         - drop nonexistent GPIO32 support from fsf variant
         - don't select USE_GENERIC_SMP_HELPERS
         - enable common clock framework support, set up ethoc clock on xtfpga
         - wire up sched_setattr and sched_getattr syscalls.
         - fix system call to spill the processor registers to stack.
         - improve kernel macro to spill the processor registers
         - export ccount_freq symbol
         - fix undefined symbol warning"
      
      * tag 'xtensa-next-20140224' of git://github.com/czankel/xtensa-linux:
        xtensa: wire up sched_setattr and sched_getattr syscalls
        xtensa: xtfpga: set ethoc clock frequency
        xtensa: xtfpga: use common clock framework
        xtensa: support common clock framework
        xtensa: no need to select USE_GENERIC_SMP_HELPERS
        xtensa: fsf: drop nonexistent GPIO32 support
        xtensa: don't pass high memory to bootmem allocator
        xtensa: fix fast_syscall_spill_registers
        xtensa: fix fast_syscall_spill_registers
        xtensa: save current register frame in fast_syscall_spill_registers_fixup
        xtensa: introduce spill_registers_kernel macro
        xtensa: export ccount_freq
        xtensa: fix warning '"CONFIG_OF" is not defined'
      bafb8192
  2. 24 Feb, 2014 7 commits
  3. 23 Feb, 2014 13 commits
  4. 22 Feb, 2014 7 commits
    • Greg Kroah-Hartman's avatar
      Revert "tty: Set correct tty name in 'active' sysfs attribute" · 5c0a2450
      Greg Kroah-Hartman authored
      This reverts commit d8a5dc30.
      
      This breaks plymouth installs, either because plymouth is using the file
      "incorrectly" or because the patch is incorrect.  Either way, this needs
      to be reverted until it is all figured out.
      Reported-by: default avatarJosh Boyer <jwboyer@fedoraproject.org>
      Reported-by: default avatarRay Strode <halfline@gmail.com>
      Cc: Lennart Poettering <lennart@poettering.net>
      Cc: Kay Sievers <kay@vrfy.org>
      Cc: Jiri Slaby <jslaby@suse.cz>
      Cc: David Herrmann <dh.herrmann@gmail.com>
      Cc: Werner Fink <werner@suse.de>
      Cc: Hannes Reinecke <hare@suse.de>
      Cc: stable <stable@vger.kernel.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      5c0a2450
    • Linus Torvalds's avatar
      Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 5580723f
      Linus Torvalds authored
      Pull scheduler fixes from Ingo Molnar:
       "Misc fixlets: a fair number of them resulting from the new
        SCHED_DEADLINE code"
      
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched/deadline: Remove useless dl_nr_total
        sched/deadline: Test for CPU's presence explicitly
        sched: Add 'flags' argument to sched_{set,get}attr() syscalls
        sched: Fix information leak in sys_sched_getattr()
        sched,numa: add cond_resched to task_numa_work
        sched/core: Make dl_b->lock IRQ safe
        sched/core: Fix sched_rt_global_validate
        sched/deadline: Fix overflow to handle period==0 and deadline!=0
        sched/deadline: Fix bad accounting of nr_running
      5580723f
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 9b3e7c9b
      Linus Torvalds authored
      Pull perf fixes from Ingo Molnar:
       "Misc fixlets from all around the place"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf/x86/uncore: Fix IVT/SNB-EP uncore CBOX NID filter table
        perf/x86: Correctly use FEATURE_PDCM
        perf, nmi: Fix unknown NMI warning
        perf trace: Fix ioctl 'request' beautifier build problems on !(i386 || x86_64) arches
        perf trace: Add fallback definition of EFD_SEMAPHORE
        perf list: Fix checking for supported events on older kernels
        perf tools: Handle PERF_RECORD_HEADER_EVENT_TYPE properly
        perf probe: Do not add offset twice to uprobe address
        perf/x86: Fix Userspace RDPMC switch
        perf/x86/intel/p6: Add userspace RDPMC quirk for PPro
      9b3e7c9b
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · 0f0ca143
      Linus Torvalds authored
      Pull hwmon fix from Guenter Roeck:
       "Fix writing the minimum temperature in max1668 driver"
      
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (max1668) Fix writing the minimum temperature
      0f0ca143
    • Linus Torvalds's avatar
      Merge branch 'xfs-fixes-for-3.14-rc4' of git://oss.sgi.com/xfs/xfs · 645ceee8
      Linus Torvalds authored
      Pull xfs fixes from Dave Chinner:
       "This is the first pull request I've had to do for you, so I'm still
        sorting things out.  The reason I'm sending this and not Ben should be
        obvious from the first commit below - SGI has stepped down from the
        XFS maintainership role.  As such, I'd like to take another
        opportunity to thank them for their many years of effort maintaining
        XFS and supporting the XFS community that they developed from the
        ground up.
      
        So I haven't had time to work things like signed tags into my
        workflows yet, so this is just a repo branch I'm asking you to pull
        from.  And yes, I named the branch -rc4 because I wanted the fixes in
        rc4, not because the branch was for merging into -rc3.  Probably not
        right, either.
      
        Anyway, I should have everything sorted out by the time the next merge
        window comes around.  If there's anything that you don't like in the
        pull req, feel free to flame me unmercifully.
      
        The changes are fixes for recent regressions and important thinkos in
        verification code:
      
              - a log vector buffer alignment issue on ia32
              - timestamps on truncate got mangled
              - primary superblock CRC validation fixes and error message
                sanitisation"
      
      * 'xfs-fixes-for-3.14-rc4' of git://oss.sgi.com/xfs/xfs:
        xfs: limit superblock corruption errors to actual corruption
        xfs: skip verification on initial "guess" superblock read
        MAINTAINERS: SGI no longer maintaining XFS
        xfs: xfs_sb_read_verify() doesn't flag bad crcs on primary sb
        xfs: ensure correct log item buffer alignment
        xfs: ensure correct timestamp updates from truncate
      645ceee8
    • Ingo Molnar's avatar
      Merge tag 'perf-urgent-for-mingo' of... · a9d3f94e
      Ingo Molnar authored
      Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
      
      Pull perf/urgent fixes from Arnaldo Carvalho de Melo:
      
        * Handle PERF_RECORD_HEADER_EVENT_TYPE properly. (Jiri Olsa)
      
        * Fix checking for supported events on older kernels in
          'perf list' (Vince Weaver)
      
        * Do not add offset twice to uprobe address in
          'perf probe' (Masami Hiramatsu)
      
        * Fix perf trace's ioctl 'request' beautifier build problems
          on !(i386 || x86_64) arches (Arnaldo Carvalho de Melo)
      
        * Fix 'perf trace' build by adding a fallback definition for
          EFD_SEMAPHORE (Ben Hutchings)
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      a9d3f94e
    • Krzysztof Kozlowski's avatar
      regulator: max14577: Fix invalid return value on DT parse success · 08221fc4
      Krzysztof Kozlowski authored
      This fixes bug introduced in 667a6b7a (regulator: max14577: Add missing
      of_node_put). The DTS parsing function returned number of matched
      regulators as success status which then was compared against 0 in probe.
      
      Result was a probe fail after successful parsing the DTS:
      max14577-regulator: probe of max14577-regulator failed with error 2
      Signed-off-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
      Reviwed-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
      Signed-off-by: default avatarMark Brown <broonie@linaro.org>
      08221fc4
  5. 21 Feb, 2014 10 commits