1. 24 Oct, 2012 4 commits
  2. 23 Oct, 2012 13 commits
  3. 22 Oct, 2012 16 commits
  4. 21 Oct, 2012 2 commits
    • Dave Airlie's avatar
      Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes · 64acba6a
      Dave Airlie authored
      Daniel writes:
      The big thing is the disabling of the hsw support by default, cc: stable.
      We've aimed for basic hsw support in 3.6, but due to a few bad
      happenstances we've screwed up and only 3.8 will have better modeset
      support than vesa. To avoid yet another round of fallout from such a
      gaffle on for the next platform we've added a module option to disable
      early hw support by default. That should also give us more flexibility in
      bring-up.
      
       Otherwise just small fixes:
       - 3 fixes from Egbert for sdvo corner cases
       - invert-brightness quirk entry from Egbert
       - revert a dp link training change, it regresses some setups
       - and shut up a spurious WARN in our gem fault handler.
       - regression fix for an oops on bit17 swizzling machines, introduce in 3.7
       - another no-lvds quirk
      
      * 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
        drm/i915: Initialize obj->pages before use by i915_gem_object_do_bit17_swizzle()
        drm/i915: Add no-lvds quirk for Supermicro X7SPA-H
        drm/i915: Insert i915_preliminary_hw_support variable.
        drm/i915: shut up spurious WARN in the gtt fault handler
        Revert "drm/i915: Try harder to complete DP training pattern 1"
        DRM/i915: Restore sdvo_flags after dtd->mode->dtd Roundrtrip.
        DRM/i915: Don't clone SDVO LVDS with analog.
        DRM/i915: Add QUIRK_INVERT_BRIGHTNESS for NCR machines.
        DRM/i915: Don't delete DPLL Multiplier during DAC init.
      64acba6a
    • Jean Delvare's avatar
      Documentation: Reflect the new location of the NMI watchdog info · fd058733
      Jean Delvare authored
      Commit 9919cba7 ("watchdog: Update documentation") moved the
      NMI watchdog documentation from nmi_watchdog.txt to
      lockup-watchdogs.txt. Update the index file accordingly.
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      Cc: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
      Cc: Randy Dunlap <rdunlap@xenotime.net>
      Cc: Don Zickus <dzickus@redhat.com>
      Link: http://lkml.kernel.org/r/20121021120551.4656d99b@endymion.delvareSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
      fd058733
  5. 20 Oct, 2012 5 commits
    • Linus Torvalds's avatar
      Linux 3.7-rc2 · 6f0c0580
      Linus Torvalds authored
      6f0c0580
    • Linus Torvalds's avatar
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64 · 198190a1
      Linus Torvalds authored
      Pull arm64 fixes from Catalin Marinas:
       "Main changes:
         - AArch64 Linux compilation fixes following 3.7-rc1 changes
           (MODULES_USE_ELF_RELA, update_vsyscall() prototype)
         - Unnecessary register setting in start_thread() (thanks to Al Viro)
         - ptrace fixes"
      
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
        arm64: fix alignment padding in assembly code
        arm64: ptrace: use HW_BREAKPOINT_EMPTY type for disabled breakpoints
        arm64: ptrace: make structure padding explicit for debug registers
        arm64: No need to set the x0-x2 registers in start_thread()
        arm64: Ignore memory blocks below PHYS_OFFSET
        arm64: Fix the update_vsyscall() prototype
        arm64: Select MODULES_USE_ELF_RELA
        arm64: Remove duplicate inclusion of mmu_context.h in smp.c
      198190a1
    • Marc Zyngier's avatar
      arm64: fix alignment padding in assembly code · aeed41a9
      Marc Zyngier authored
      An interesting effect of using the generic version of linkage.h
      is that the padding is defined in terms of x86 NOPs, which can have
      even more interesting effects when the assembly code looks like this:
      
      ENTRY(func1)
      	mov	x0, xzr
      ENDPROC(func1)
      	// fall through
      ENTRY(func2)
      	mov	x0, #1
      	ret
      ENDPROC(func2)
      
      Admittedly, the code is not very nice. But having code from another
      architecture doesn't look completely sane either.
      
      The fix is to add arm64's version of linkage.h, which causes the insertion
      of proper AArch64 NOPs.
      Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      aeed41a9
    • Kees Cook's avatar
      use clamp_t in UNAME26 fix · 31fd84b9
      Kees Cook authored
      The min/max call needed to have explicit types on some architectures
      (e.g. mn10300). Use clamp_t instead to avoid the warning:
      
        kernel/sys.c: In function 'override_release':
        kernel/sys.c:1287:10: warning: comparison of distinct pointer types lacks a cast [enabled by default]
      Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
      Signed-off-by: default avatarKees Cook <keescook@chromium.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      31fd84b9
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 8c1bee68
      Linus Torvalds authored
      Pull perf fixes from Ingo Molnar:
       "Assorted small fixes"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf python: Properly link with libtraceevent
        perf hists browser: Add back callchain folding symbol
        perf tools: Fix build on sparc.
        perf python: Link with libtraceevent
        perf python: Initialize 'page_size' variable
        tools lib traceevent: Fix missed freeing of subargs in free_arg() in filter
        lib tools traceevent: Add back pevent assignment in __pevent_parse_format()
        perf hists browser: Fix off-by-two bug on the first column
        perf tools: Remove warnings on JIT samples for srcline sort key
        perf tools: Fix segfault when using srcline sort key
        perf: Require exclude_guest to use PEBS - kernel side enforcement
        perf tool: Precise mode requires exclude_guest
      8c1bee68