Code

Sync up with Linus#46

Code

Merged

dabrace merged 52 commits intodabrace:masterdabrace/linux:masterfrom torvalds:mastertorvalds/linux:masterCopy head branch name to clipboardMar 3, 2015

+279-131

Commits

Commits on Feb 21, 2015

• kprobes/x86: Use 5-byte NOP when the code might be modified by ftrace

  Show description for 650b7b2
  

  pmladek

  authored and

  Ingo Molnar

  committed
  650b7b2

• kprobes/x86: Check for invalid ftrace location in __recover_probed_insn()

  Show description for 2a6730c
  

  pmladek

  authored and

  Ingo Molnar

  committed
  2a6730c

Commits on Feb 22, 2015

• x86/cpu/intel: Fix trivial typo in intel_tlb_table[]

  Show description for a927792
  

  Yannick Guerrini

  authored and

  Ingo Molnar

  committed
  a927792

Commits on Feb 23, 2015

• perf bench: Fix order of arguments to memcpy_alloc_mem

  Show description for e17fdae
  

  bmerry

  authored and

  acmel

  committed
  e17fdae

• gpiolib: of: allow of_gpiochip_find_and_xlate to find more than one chip per node

  Show description for 9cf75e9
  

  Hans Holmberg

  authored and

  linusw

  committed
  9cf75e9

• gpio: tps65912: fix wrong container_of arguments

  Show description for 2f97c20
  

  vianpl

  authored and

  linusw

  committed
  2f97c20

Commits on Feb 24, 2015

• x86/platform/intel-mid: Fix trivial printk message typo in intel_mid_arch_setup()

  Show description for 579deee
  

  Yannick Guerrini

  authored and

  Ingo Molnar

  committed
  579deee

• metag: Fix KSTK_EIP() and KSTK_ESP() macros

  Show description for c2996cb
  

  James Hogan

  committed
  c2996cb

• thermal: ti-soc-thermal: bandgap: Fix build warning if !CONFIG_PM_SLEEP

  Show description for 3992b62
  

  Grygorii Strashko

  authored and

  Eduardo Valentin

  committed
  3992b62

• ti-soc-thermal: Delete an unnecessary check before the function call "cpufreq_cooling_unregister"

  Show description for 9ca9be2
  

  elfring

  authored and

  Eduardo Valentin

  committed
  9ca9be2

• thermal: Introduce dummy functions when thermal is not defined

  Show description for 12ca718
  

  nmenon

  authored and

  Eduardo Valentin

  committed
  12ca718

• thermal: rcar: Fix race condition between init and interrupt

  Show description for 0b37a83
  

  geertu

  authored and

  Eduardo Valentin

  committed
  0b37a83

• thermal: rcar: Make error and remove paths symmetrical with init

  Show description for ac71c70
  

  geertu

  authored and

  Eduardo Valentin

  committed
  ac71c70

• thermal: exynos: Clean-up code to use oneline entry for exynos compatible table

  Show description for b71d399
  

  chanwoochoi

  authored and

  Eduardo Valentin

  committed
  b71d399

Commits on Feb 25, 2015

• md/raid1: fix read balance when a drive is write-mostly.

  Show description for d1901ef
  

  Tomáš Hodek

  authored and

  neilbrown

  committed
  d1901ef

• raid5: check faulty flag for array status during recovery.

  Show description for 16d9cfa
  

  Eric Mei

  authored and

  neilbrown

  committed
  16d9cfa

• md: mark some attributes as pre-alloc

  Show description for 750f199
  neilbrown

  committed
  750f199

• clockevents: asm9260: Fix compilation error with sparc/sparc64 allyesconfig

  Show description for a8b1b9f
  dlezcano

  committed
  a8b1b9f

• clocksource: mtk: Fix race conditions in probe code

  Show description for d4a19eb
  

  mbgg

  authored and

  dlezcano

  committed
  d4a19eb

• clocksource: pxa: Fix section mismatch

  Show description for 6f2116e
  

  rjarzmik

  authored and

  dlezcano

  committed
  6f2116e

• Merge branch 'clockevents/4.0-rc1' of git://git.linaro.org/people/daniel.lezcano/linux into timers/urgent

  Show description for e3eff6f
  

  Ingo Molnar

  committed
  e3eff6f

• perf tools: Define _GNU_SOURCE on pthread_attr_setaffinity_np feature check

  Show description for 8eb7338
  

  Josh Boyer

  authored and

  acmel

  committed
  8eb7338

• perf tools: Fix pthread_attr_setaffinity_np build error

  Show description for 95a09cf
  

  ahunter6

  authored and

  acmel

  committed
  95a09cf

• perf tools: Fix probing for PERF_FLAG_FD_CLOEXEC flag

  Show description for 48536c9
  

  ahunter6

  authored and

  acmel

  committed
  48536c9

• perf top: Fix SIGBUS on sparc64

  Show description for a73b6c1
  

  David Ahern

  authored and

  acmel

  committed
  a73b6c1

• perf symbols: Define EM_AARCH64 for older OSes

  Show description for e370a3d
  

  David Ahern

  authored and

  acmel

  committed
  e370a3d

• perf tools: Make sparc64 arch point to sparc

  Show description for 4861f87
  

  David Ahern

  authored and

  acmel

  committed
  4861f87

Commits on Feb 28, 2015

• tools/thermal: tmon: add --target-temp parameter

  Show description for 4cc32cb
  

  computersforpeace

  authored and

  zhang-rui

  committed
  4cc32cb

• tools/thermal: tmon: add min/max macros

  Show description for a90b6b0
  

  computersforpeace

  authored and

  zhang-rui

  committed
  a90b6b0

• tools/thermal: tmon: tui: don't hard-code dialog window size assumptions

  Show description for 0e7b766
  

  computersforpeace

  authored and

  zhang-rui

  committed
  0e7b766

• tools/thermal: tmon: fixup tui windowing calculations

  Show description for 3bbcc52
  

  computersforpeace

  authored and

  zhang-rui

  committed
  3bbcc52

• tools/thermal: tmon: add .gitignore

  Show description for 3dc3712
  

  computersforpeace

  authored and

  zhang-rui

  committed
  3dc3712

• tools/thermal: tmon: support cross-compiling

  Show description for 1b0eaa2
  

  computersforpeace

  authored and

  zhang-rui

  committed
  1b0eaa2

• tools/thermal: tmon: use pkg-config to determine library dependencies

  Show description for 96a0d99
  

  computersforpeace

  authored and

  zhang-rui

  committed
  96a0d99

• tools/thermal: tmon: silence 'set but not used' warnings

  Show description for 986ffe0
  

  computersforpeace

  authored and

  zhang-rui

  committed
  986ffe0

• thermal/intel_powerclamp: add id for Avoton SoC

  Show description for 3a4562a
  

  miguelinux

  authored and

  zhang-rui

  committed
  3a4562a

• thermal: int340x_thermal: Ignore missing _ART, _TRT tables

  Show description for f126079
  

  spandruvada

  authored and

  zhang-rui

  committed
  f126079

• Merge branch 'tmon-fixes' of .git into next

  zhang-rui

  committed
  5912e26

• Merge branch 'linus' into x86/urgent, to merge dependent patch

  Show description for 5838d18
  

  Ingo Molnar

  committed
  5838d18

• x86: Init per-cpu shadow copy of CR4 on 32-bit CPUs too

  Show description for 5b2bdbc
  

  rostedt

  authored and

  Ingo Molnar

  committed
  5b2bdbc

Commits on Mar 1, 2015

• locking/rtmutex: Set state back to running on error

  Show description for 9d3e2d0
  

  Sebastian Andrzej Siewior

  authored and

  Ingo Molnar

  committed
  9d3e2d0

• Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent

  Show description for 021f5f1
  

  Ingo Molnar

  committed
  021f5f1

• Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

  Show description for 2ea51b8
  torvalds

  committed
  2ea51b8

• Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

  Show description for d7b48fe
  torvalds

  committed
  d7b48fe

• Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

  Show description for 640c0f5
  torvalds

  committed
  640c0f5

• Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

  Show description for a38ecbb
  torvalds

  committed
  a38ecbb

Commits on Mar 2, 2015

• Merge tag 'metag-fixes-v4.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag

  Show description for 49db1f0
  torvalds

  committed
  49db1f0

• Merge tag 'md/4.0-fixes' of git://neil.brown.name/md

  Show description for 1a6f77a
  torvalds

  committed
  1a6f77a

• Merge branch 'fixes-for-4.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal

  Show description for 10d6dfc
  torvalds

  committed
  10d6dfc

• Merge tag 'gpio-v4.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio

  Show description for 023a600
  torvalds

  committed
  023a600

Commits on Mar 3, 2015

• drm/i915: Fix modeset state confusion in the load detect code

  Show description for 9128b04
  

  danvet

  authored and

  torvalds

  committed
  9128b04

• Linux 4.0-rc2

  torvalds

  committed
  13a7a6a