]> git.ipfire.org Git - people/ms/linux.git/commitdiff
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Dec 2015 21:01:23 +0000 (13:01 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Dec 2015 21:01:23 +0000 (13:01 -0800)
Pull perf fixes from Ingo Molnar:
 "This tree includes four core perf fixes for misc bugs, three fixes to
  x86 PMU drivers, and two updates to old email addresses"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf: Do not send exit event twice
  perf/x86/intel: Fix INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_NA macro
  perf/x86/intel: Make L1D_PEND_MISS.FB_FULL not constrained on Haswell
  perf: Fix PERF_EVENT_IOC_PERIOD deadlock
  treewide: Remove old email address
  perf/x86: Fix LBR call stack save/restore
  perf: Update email address in MAINTAINERS
  perf/core: Robustify the perf_cgroup_from_task() RCU checks
  perf/core: Fix RCU problem with cgroup context switching code

1  2 
MAINTAINERS

diff --combined MAINTAINERS
index 69c8a9c3289adbe64a7e68e134372515d1fd2e0f,a45fe3538d2f31e4b020b1b1f23a4eafc9b7f78d..38df53f828e1ea9036957d93d3cf744164e2f3c1
@@@ -318,7 -318,7 +318,7 @@@ M: Zhang Rui <rui.zhang@intel.com
  L:    linux-acpi@vger.kernel.org
  W:    https://01.org/linux-acpi
  S:    Supported
 -F:    drivers/acpi/video.c
 +F:    drivers/acpi/acpi_video.c
  
  ACPI WMI DRIVER
  L:    platform-driver-x86@vger.kernel.org
@@@ -1847,7 -1847,7 +1847,7 @@@ S:      Supporte
  F:    drivers/net/wireless/ath/ath6kl/
  
  WILOCITY WIL6210 WIRELESS DRIVER
 -M:    Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
 +M:    Maya Erez <qca_merez@qca.qualcomm.com>
  L:    linux-wireless@vger.kernel.org
  L:    wil6210@qca.qualcomm.com
  S:    Supported
@@@ -1931,7 -1931,7 +1931,7 @@@ S:      Supporte
  F:    drivers/i2c/busses/i2c-at91.c
  
  ATMEL ISI DRIVER
 -M:    Josh Wu <josh.wu@atmel.com>
 +M:    Ludovic Desroches <ludovic.desroches@atmel.com>
  L:    linux-media@vger.kernel.org
  S:    Supported
  F:    drivers/media/platform/soc_camera/atmel-isi.c
@@@ -1950,8 -1950,7 +1950,8 @@@ S:      Supporte
  F:    drivers/net/ethernet/cadence/
  
  ATMEL NAND DRIVER
 -M:    Josh Wu <josh.wu@atmel.com>
 +M:    Wenyou Yang <wenyou.yang@atmel.com>
 +M:    Josh Wu <rainyfeeling@outlook.com>
  L:    linux-mtd@lists.infradead.org
  S:    Supported
  F:    drivers/mtd/nand/atmel_nand*
@@@ -6367,7 -6366,6 +6367,7 @@@ F:      arch/*/include/asm/pmem.
  LIGHTNVM PLATFORM SUPPORT
  M:    Matias Bjorling <mb@lightnvm.io>
  W:    http://github/OpenChannelSSD
 +L:    linux-block@vger.kernel.org
  S:    Maintained
  F:    drivers/lightnvm/
  F:    include/linux/lightnvm.h
@@@ -8286,7 -8284,7 +8286,7 @@@ F:      include/linux/delayacct.
  F:    kernel/delayacct.c
  
  PERFORMANCE EVENTS SUBSYSTEM
- M:    Peter Zijlstra <a.p.zijlstra@chello.nl>
+ M:    Peter Zijlstra <peterz@infradead.org>
  M:    Ingo Molnar <mingo@redhat.com>
  M:    Arnaldo Carvalho de Melo <acme@kernel.org>
  L:    linux-kernel@vger.kernel.org
@@@ -9427,10 -9425,8 +9427,10 @@@ F:    include/scsi/sg.
  
  SCSI SUBSYSTEM
  M:    "James E.J. Bottomley" <JBottomley@odin.com>
 -L:    linux-scsi@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
 +M:    "Martin K. Petersen" <martin.petersen@oracle.com>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
 +L:    linux-scsi@vger.kernel.org
  S:    Maintained
  F:    drivers/scsi/
  F:    include/scsi/
@@@ -10905,9 -10901,9 +10905,9 @@@ S:   Maintaine
  F:    drivers/media/tuners/tua9001*
  
  TULIP NETWORK DRIVERS
 -M:    Grant Grundler <grundler@parisc-linux.org>
  L:    netdev@vger.kernel.org
 -S:    Maintained
 +L:    linux-parisc@vger.kernel.org
 +S:    Orphan
  F:    drivers/net/ethernet/dec/tulip/
  
  TUN/TAP driver