Skip to content

3.10.10-stable review

Greg Kroah-Hartman lkml stable 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest74 patches 4 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/74KVM: s390: move kvm_guest_enter,exit closer to siearch/s390/kvm/kvm-s390.c+14 -70 replies
2/74mac80211: dont wait for TX status forevernet/mac80211/mlme.c+12 -30 replies
3/74ACPI: add _STA evaluation at do_acpi_find_child()drivers/acpi/glue.c+4 -20 replies
4/74ACPI: Try harder to resolve _ADR collisions for bridgesdrivers/acpi/glue.c drivers/pci/pci-acpi.c include/acpi/acpi_bus.h+98 -220 replies
5/74ARC: gdbserver breakage in Big-Endian configuration #1arch/arc/include/asm/ptrace.h arch/arc/kernel/entry.S+4 -20 replies
6/74ARC: gdbserver breakage in Big-Endian configuration #2arch/arc/include/asm/syscall.h+2 -30 replies
7/74ARM: at91: at91sam9x5 RTC is not compatible with at91rm9200 onearch/arm/boot/dts/at91sam9x5.dtsi+1 -10 replies
8/74NFC: llcp: Fix non blocking sockets connectionsnet/nfc/llcp.h net/nfc/llcp_sock.c+6 -30 replies
9/74iwlwifi: mvm: correctly configure MCAST in AP modedrivers/net/wireless/iwlwifi/mvm/fw-api-mac.h drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c drivers/net/wireless/iwlwifi/mvm/mvm.h+13 -20 replies
10/74iwlwifi: mvm: fix MCAST in AP modedrivers/net/wireless/iwlwifi/mvm/tx.c+1 -10 replies
11/74iwlwifi: mvm: properly tell the fw that a STA is awakedrivers/net/wireless/iwlwifi/mvm/sta.c+1 -70 replies
12/74iwlwifi: mvm: dont set the MCAST queue in STAs queue listdrivers/net/wireless/iwlwifi/mvm/mac-ctxt.c drivers/net/wireless/iwlwifi/mvm/sta.c+1 -70 replies
13/74iwlwifi: mvm: take the seqno from packet if transmit faileddrivers/net/wireless/iwlwifi/mvm/tx.c+2 -20 replies
14/74iwlwifi: mvm: unregister leds when registration faileddrivers/net/wireless/iwlwifi/mvm/mac80211.c+5 -10 replies
15/74iwlwifi: bump required firmware API version for 3160/7260drivers/net/wireless/iwlwifi/iwl-7000.c+6 -60 replies
16/74iwlwifi: mvm: adjust firmware D3 configuration APIdrivers/net/wireless/iwlwifi/mvm/fw-api-d3.h+3 -10 replies
17/74tracing: Do not call kmem_cache_free() on allocation failurekernel/trace/trace_events.c+1 -60 replies
18/74tracing/kprobe: Wait for disabling all running kprobe handlerskernel/trace/trace_kprobe.c+17 -40 replies
19/74tracing: Introduce trace_create_cpu_file() and tracing_get_cpu()kernel/trace/trace.c+36 -140 replies
20/74tracing: Change tracing_pipe_fops() to rely on tracing_get_cpu()kernel/trace/trace.c+7 -90 replies
21/74tracing: Change tracing_buffers_fops to rely on tracing_get_cpu()kernel/trace/trace.c+4 -50 replies
22/74tracing: Change tracing_stats_fops to rely on tracing_get_cpu()kernel/trace/trace.c+6 -70 replies
23/74tracing: Change tracing_entries_fops to rely on tracing_get_cpu()kernel/trace/trace.c+12 -370 replies
24/74tracing: Change tracing_fops/snapshot_fops to rely on tracing_get_cpu()kernel/trace/trace.c+22 -280 replies
25/74ftrace: Add check for NULL regs if ops has SAVE_REGS setkernel/trace/ftrace.c+14 -40 replies
26/74tracing: Turn event/id->i_private into call->event.typekernel/trace/trace_events.c+12 -50 replies
27/74tracing: Change event_enable/disable_read() to verify i_private != NULLkernel/trace/trace_events.c+19 -90 replies
28/74tracing: Change event_filter_read/write to verify i_private != NULLkernel/trace/trace_events.c kernel/trace/trace_events_filter.c+25 -180 replies
29/74tracing: Change f_start() to take event_mutex and verify i_private != NULLkernel/trace/trace_events.c+9 -40 replies
30/74tracing: Introduce remove_event_file_dir()kernel/trace/trace_events.c+23 -240 replies
31/74tracing: Change remove_event_file_dir() to clear "d_subdirs"->i_privatekernel/trace/trace_events.c+15 -320 replies
32/74tracing: trace_remove_event_call() should fail if call/file is in useinclude/linux/ftrace_event.h kernel/trace/trace_events.c+34 -30 replies
33/74tracing/kprobes: Fail to unregister if probe event files are in usekernel/trace/trace_kprobe.c+15 -60 replies
34/74tracing/uprobes: Fail to unregister if probe event files are in usekernel/trace/trace_uprobe.c+38 -130 replies
35/74ftrace: Check module functions being traced on reloadkernel/trace/ftrace.c+62 -90 replies
36/74xen/smp: initialize IPI vectors before marking CPU onlinearch/x86/xen/smp.c+9 -20 replies
37/74ARC: [lib] strchr breakage in Big-endian configurationarch/arc/lib/strchr-700.S+10 -00 replies
38/74zd1201: do not use stack as URB transfer_bufferdrivers/net/wireless/zd1201.c+3 -10 replies
39/74VFS: collect_mounts() should return an ERR_PTRfs/namespace.c+1 -10 replies
40/74x86: Dont clear olpc_ofw_header when sentinel is detectedarch/x86/include/asm/bootparam_utils.h+2 -20 replies
41/74xen/events: initialize local per-cpu mask for all possible eventsdrivers/xen/events.c+1 -10 replies
42/74xen/events: mask events when changing their VCPU bindingdrivers/xen/events.c+11 -00 replies
43/74ARM: davinci: nand: specify ecc strengtharch/arm/mach-davinci/board-dm355-leopard.c arch/arm/mach-davinci/board-dm644x-evm.c arch/arm/mach-davinci/board-dm646x-evm.c +1 more+4 -00 replies
44/74ARM: at91/DT: fix at91sam9n12ek memory nodearch/arm/boot/dts/at91sam9n12ek.dts+2 -20 replies
45/74arm64: perf: fix array out of bounds access in armpmu_map_hw_event()arch/arm64/kernel/perf_event.c+6 -10 replies
46/74arm64: perf: fix event validation for software group leadersarch/arm64/kernel/perf_event.c+3 -00 replies
47/74ARM: 7816/1: CONFIG_KUSER_HELPERS: fix help textarch/arm/mm/Kconfig+6 -30 replies
48/74staging: comedi: bug-fix NULL pointer dereference on failed attachdrivers/staging/comedi/drivers.c+1 -10 replies
49/74drm/radeon/r7xx: fix copy paste typo in golden register setupdrivers/gpu/drm/radeon/rv770.c+6 -60 replies
50/74drm/radeon: fix UVD message buffer validationdrivers/gpu/drm/radeon/radeon_uvd.c+8 -00 replies
51/74drm/radeon: fix WREG32_OR macro setting bits in a registerdrivers/gpu/drm/radeon/radeon.h+1 -10 replies
52/74drm/i915: Invalidate TLBs for the rings after a resetdrivers/gpu/drm/i915/i915_reg.h drivers/gpu/drm/i915/intel_ringbuffer.c+14 -00 replies
53/74of: fdt: fix memory initialization for expanded DTdrivers/of/fdt.c+2 -00 replies
54/74nilfs2: remove double bio_put() in nilfs_end_bio_write() for BIO_EOPNOTSUPP errorfs/nilfs2/segbuf.c+1 -20 replies
55/74nilfs2: fix issue with counting number of bio requests for BIO_EOPNOTSUPP error detectionfs/nilfs2/segbuf.c+1 -10 replies
56/74drivers/platform/olpc/olpc-ec.c: initialise earlierdrivers/platform/olpc/olpc-ec.c+1 -10 replies
57/74usb: phy: fix build breakagedrivers/usb/phy/phy-fsl-usb.h drivers/usb/phy/phy-fsm-usb.c+2 -20 replies
58/74sata_fsl: save irqs while coalescingdrivers/ata/sata_fsl.c+3 -20 replies
59/74Hostap: copying wrong data prism2_ioctl_giwaplist()drivers/net/wireless/hostap/hostap_ioctl.c+2 -20 replies
60/74libata: apply behavioral quirks to sil3826 PMPdrivers/ata/libata-pmp.c+6 -60 replies
61/74iwlwifi: dvm: fix calling ieee80211_chswitch_done() with NULLdrivers/net/wireless/iwlwifi/dvm/mac80211.c+4 -10 replies
62/74iwlwifi: pcie: disable L1 Active after pci_enable_devicedrivers/net/wireless/iwlwifi/pcie/trans.c+5 -50 replies
63/74SCSI: zfcp: fix lock imbalance by reworking request queue lockingdrivers/s390/scsi/zfcp_qdio.c include/linux/wait.h+59 -60 replies
64/74SCSI: zfcp: fix schedule-inside-lock in scsi_device list loopsdrivers/s390/scsi/zfcp_erp.c+22 -70 replies
65/74SCSI: lpfc: Dont force CONFIG_GENERIC_CSUM ondrivers/scsi/Kconfig+0 -10 replies
66/74SCSI: sg: Fix user memory corruption when SG_IO is interrupted by a signalfs/bio.c+15 -50 replies
67/74Revert "x86 get_unmapped_area(): use proper mmap base for bottom-up direction"arch/x86/kernel/sys_x86_64.c arch/x86/mm/mmap.c include/linux/sched.h+2 -30 replies
68/74x86 get_unmapped_area: Access mmap_legacy_base through mm_struct memberarch/x86/kernel/sys_x86_64.c arch/x86/mm/mmap.c include/linux/mm_types.h+6 -30 replies
69/74x86/xen: do not identity map UNUSABLE regions in the machine E820arch/x86/xen/setup.c+22 -00 replies
70/74mei: me: fix reset state machinedrivers/misc/mei/hw-me.c+3 -10 replies
71/74mei: dont have to clean the state on power updrivers/misc/mei/init.c+2 -10 replies
72/74mei: me: fix waiting for hw readydrivers/misc/mei/hw-me.c+7 -30 replies
73/74md: bcache: io.c: fix a potential NULL pointer dereferencedrivers/md/bcache/io.c+2 -00 replies
74/74bcache: FUA fixesdrivers/md/bcache/btree.c drivers/md/bcache/journal.c drivers/md/bcache/request.c+34 -40 replies

Reviews trailers per patch

18 of 74 patches have a Reviewed-by or Acked-by.

PatchMasami HiramatsuSteve HodgsonSrivatsa S. BhatYinghai LuEmmanuel GrumbachShuah KhanVladimir LalovBjorn HelgaasAnton KolesovIlan PeerOleg NesterovRyusuke KonishiJan BeulichThiago MacieiraAlexander SverdlinDavid MilburnJeff Shorey
1/74
2/74
3/74
4/74T-b A-b
5/74T-b
6/74
7/74
8/74
9/74R-b
10/74
11/74
12/74
13/74
14/74
15/74
16/74
17/74
18/74
19/74
20/74
21/74
22/74
23/74
24/74
25/74
26/74R-b
27/74R-b
28/74R-b
29/74R-b
30/74R-b
31/74R-b
32/74R-b
33/74A-b
34/74A-b
35/74T-b
36/74A-b
37/74Debugged-by
38/74
39/74
40/74A-b
41/74
42/74R-b
43/74
44/74
45/74
46/74
47/74
48/74
49/74
50/74
51/74
52/74T-b
53/74A-b
54/74A-b T-b
55/74A-b T-b
56/74
57/74
58/74
59/74
60/74
61/74R-b
62/74
63/74
64/74
65/74
66/74T-b
67/74
68/74Reported-and-tested-by
69/74
70/74T-b
71/74T-b
72/74T-b
73/74
74/74

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 17 reviewers.

Read the v1 thread

Cover letter [ 00/74] 3.10.10-stable review

This is the start of the stable review cycle for the 3.10.10 release. There are 74 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.

Responses should be made by Thu Aug 29 01:03:56 UTC 2013. Anything received after that time might be too late.

The whole patch series can be found in one patch at:

	kernel.org/pub/linux/kernel/v3.0/stable-review/patch-3.10.10-rc1.gz

and the diffstat can be found below.

thanks,

greg k-h

-------------
Pseudo-Shortlog of commits:

Greg Kroah-Hartman <[email protected]>

    Linux 3.10.10-rc1

Kent Overstreet <[email protected]>
bcache: FUA fixes

Kumar Amit Mehta <[email protected]>
md: bcache: io.c: fix a potential NULL pointer dereference

Tomas Winkler <[email protected]>
mei: me: fix waiting for hw ready

Tomas Winkler <[email protected]>
mei: don't have to clean the state on power up

Tomas Winkler <[email protected]>
mei: me: fix reset state machine

David Vrabel <[email protected]>
x86/xen: do not identity map UNUSABLE regions in the machine E820

Radu Caragea <[email protected]>
x86 get_unmapped_area: Access mmap_legacy_base through mm_struct member

Linus Torvalds <[email protected]>
Revert "x86 get_unmapped_area(): use proper mmap base for bottom-up direction"

Roland Dreier <[email protected]>
SCSI: sg: Fix user memory corruption when SG_IO is interrupted by a signal

Anton Blanchard <[email protected]>
SCSI: lpfc: Don't force CONFIG_GENERIC_CSUM on

Martin Peschke <[email protected]>
SCSI: zfcp: fix schedule-inside-lock in scsi_device list loops

Martin Peschke <[email protected]>
SCSI: zfcp: fix lock imbalance by reworking request queue locking

Emmanuel Grumbach <[email protected]>
iwlwifi: pcie: disable L1 Active after pci_enable_device

Stanislaw Gruszka <[email protected]>
iwlwifi: dvm: fix calling ieee80211_chswitch_done() with NULL

Terry Suereth <[email protected]>
libata: apply behavioral quirks to sil3826 PMP

Dan Carpenter <[email protected]>
Hostap: copying wrong data prism2_ioctl_giwaplist()

Anthony Foiani <[email protected]>
sata_fsl: save irqs while coalescing

Anatolij Gustschin <[email protected]>
usb: phy: fix build breakage

Daniel Drake <[email protected]>
drivers/platform/olpc/olpc-ec.c: initialise earlier

Vyacheslav Dubeyko <[email protected]>
nilfs2: fix issue with counting number of bio requests for BIO_EOPNOTSUPP error detection

Vyacheslav Dubeyko <[email protected]>
nilfs2: remove double bio_put() in nilfs_end_bio_write() for BIO_EOPNOTSUPP error

Wladislav Wiebe <[email protected]>
of: fdt: fix memory initialization for expanded DT

Chris Wilson <[email protected]>
drm/i915: Invalidate TLBs for the rings after a reset

Rafał Miłecki <[email protected]>
drm/radeon: fix WREG32_OR macro setting bits in a register

Christian König <[email protected]>
drm/radeon: fix UVD message buffer validation

Alex Deucher <[email protected]>
drm/radeon/r7xx: fix copy paste typo in golden register setup

Ian Abbott <[email protected]>
staging: comedi: bug-fix NULL pointer dereference on failed attach

Nicolas Pitre <[email protected]>
ARM: 7816/1: CONFIG_KUSER_HELPERS: fix help text

Will Deacon <[email protected]>
arm64: perf: fix event validation for software group leaders

Will Deacon <[email protected]>
arm64: perf: fix array out of bounds access in armpmu_map_hw_event()

Nicolas Ferre <[email protected]>
ARM: at91/DT: fix at91sam9n12ek memory node

Sekhar Nori <[email protected]>
ARM: davinci: nand: specify ecc strength

David Vrabel <[email protected]>
xen/events: mask events when changing their VCPU binding

David Vrabel <[email protected]>
xen/events: initialize local per-cpu mask for all possible events

Daniel Drake <[email protected]>
x86: Don't clear olpc_ofw_header when sentinel is detected

Dan Carpenter <[email protected]>
VFS: collect_mounts() should return an ERR_PTR

Jussi Kivilinna <[email protected]>
zd1201: do not use stack as URB transfer_buffer

Joern Rennecke <[email protected]>
ARC: [lib] strchr breakage in Big-endian configuration

Chuck Anderson <[email protected]>
xen/smp: initialize IPI vectors before marking CPU online

Steven Rostedt (Red Hat) <[email protected]>
ftrace: Check module functions being traced on reload

Steven Rostedt (Red Hat) <[email protected]>
tracing/uprobes: Fail to unregister if probe event files are in use

Steven Rostedt (Red Hat) <[email protected]>
tracing/kprobes: Fail to unregister if probe event files are in use

Oleg Nesterov <[email protected]>
tracing: trace_remove_event_call() should fail if call/file is in use

Oleg Nesterov <[email protected]>

    tracing: Change remove_event_file_dir() to clear "d_subdirs"->i_private

Oleg Nesterov <[email protected]>
tracing: Introduce remove_event_file_dir()

Oleg Nesterov <[email protected]>

    tracing: Change f_start() to take event_mutex and verify i_private != NULL

Oleg Nesterov <[email protected]>

    tracing: Change event_filter_read/write to verify i_private != NULL

Oleg Nesterov <[email protected]>

    tracing: Change event_enable/disable_read() to verify i_private != NULL

Oleg Nesterov <[email protected]>

    tracing: Turn event/id->i_private into call->event.type

Steven Rostedt (Red Hat) <[email protected]>
ftrace: Add check for NULL regs if ops has SAVE_REGS set

Oleg Nesterov <[email protected]>
tracing: Change tracing_fops/snapshot_fops to rely on tracing_get_cpu()

Oleg Nesterov <[email protected]>
tracing: Change tracing_entries_fops to rely on tracing_get_cpu()

Oleg Nesterov <[email protected]>
tracing: Change tracing_stats_fops to rely on tracing_get_cpu()

Oleg Nesterov <[email protected]>
tracing: Change tracing_buffers_fops to rely on tracing_get_cpu()

Oleg Nesterov <[email protected]>
tracing: Change tracing_pipe_fops() to rely on tracing_get_cpu()

Oleg Nesterov <[email protected]>
tracing: Introduce trace_create_cpu_file() and tracing_get_cpu()

Masami Hiramatsu <[email protected]>
tracing/kprobe: Wait for disabling all running kprobe handlers

Namhyung Kim <[email protected]>
tracing: Do not call kmem_cache_free() on allocation failure

Johannes Berg <[email protected]>
iwlwifi: mvm: adjust firmware D3 configuration API

Johannes Berg <[email protected]>
iwlwifi: bump required firmware API version for 3160/7260

Emmanuel Grumbach <[email protected]>
iwlwifi: mvm: unregister leds when registration failed

Emmanuel Grumbach <[email protected]>
iwlwifi: mvm: take the seqno from packet if transmit failed

Emmanuel Grumbach <[email protected]>
iwlwifi: mvm: don't set the MCAST queue in STA's queue list

Emmanuel Grumbach <[email protected]>
iwlwifi: mvm: properly tell the fw that a STA is awake

Emmanuel Grumbach <[email protected]>
iwlwifi: mvm: fix MCAST in AP mode

Emmanuel Grumbach <[email protected]>
iwlwifi: mvm: correctly configure MCAST in AP mode

Samuel Ortiz <[email protected]>
NFC: llcp: Fix non blocking sockets connections

Nicolas Ferre <[email protected]>
ARM: at91: at91sam9x5 RTC is not compatible with at91rm9200 one

Vineet Gupta <[email protected]>
ARC: gdbserver breakage in Big-Endian configuration #2

Vineet Gupta <[email protected]>
ARC: gdbserver breakage in Big-Endian configuration #1

Rafael J. Wysocki <[email protected]>
ACPI: Try harder to resolve _ADR collisions for bridges

Jeff Wu <[email protected]>
ACPI: add _STA evaluation at do_acpi_find_child()

Johannes Berg <[email protected]>
mac80211: don't wait for TX status forever

Dominik Dingel <[email protected]>
KVM: s390: move kvm_guest_enter,exit closer to sie

-------------

Diffstat:

 Makefile                                      |   4 +-
 arch/arc/include/asm/ptrace.h                 |   2 +
 arch/arc/include/asm/syscall.h                |   5 +-
 arch/arc/kernel/entry.S                       |   4 +-
 arch/arc/lib/strchr-700.S                     |  10 ++
 arch/arm/boot/dts/at91sam9n12ek.dts           |   4 +-
 arch/arm/boot/dts/at91sam9x5.dtsi             |   2 +-
 arch/arm/mach-davinci/board-dm355-leopard.c   |   1 +
 arch/arm/mach-davinci/board-dm644x-evm.c      |   1 +
 arch/arm/mach-davinci/board-dm646x-evm.c      |   1 +
 arch/arm/mach-davinci/board-neuros-osd2.c     |   1 +
 arch/arm/mm/Kconfig                           |   9 +-
 arch/arm64/kernel/perf_event.c                |  10 +-
 arch/s390/kvm/kvm-s390.c                      |  21 ++-
 arch/x86/include/asm/bootparam_utils.h        |   4 +-
 arch/x86/kernel/sys_x86_64.c                  |   2 +-
 arch/x86/mm/mmap.c                            |   8 +-
 arch/x86/xen/setup.c                          |  22 +++
 arch/x86/xen/smp.c                            |  11 +-
 drivers/acpi/glue.c                           |  95 ++++++++++--
 drivers/ata/libata-pmp.c                      |  12 +-
 drivers/ata/sata_fsl.c                        |   5 +-
 drivers/gpu/drm/i915/i915_reg.h               |   2 +
 drivers/gpu/drm/i915/intel_ringbuffer.c       |  12 ++
 drivers/gpu/drm/radeon/radeon.h               |   2 +-
 drivers/gpu/drm/radeon/radeon_uvd.c           |   8 ++
 drivers/gpu/drm/radeon/rv770.c                |  12 +-
 drivers/md/bcache/btree.c                     |  23 ++-
 drivers/md/bcache/io.c                        |   2 +
 drivers/md/bcache/journal.c                   |   2 +-
 drivers/md/bcache/request.c                   |  13 +-
 drivers/misc/mei/hw-me.c                      |  14 +-
 drivers/misc/mei/init.c                       |   3 +-
 drivers/net/wireless/hostap/hostap_ioctl.c    |   4 +-
 drivers/net/wireless/iwlwifi/dvm/mac80211.c   |   5 +-
 drivers/net/wireless/iwlwifi/iwl-7000.c       |  12 +-
 drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h  |   4 +-
 drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h |   8 +-
 drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c   |  11 +-
 drivers/net/wireless/iwlwifi/mvm/mac80211.c   |   6 +-
 drivers/net/wireless/iwlwifi/mvm/mvm.h        |   1 +
 drivers/net/wireless/iwlwifi/mvm/sta.c        |  11 +-
 drivers/net/wireless/iwlwifi/mvm/tx.c         |   6 +-
 drivers/net/wireless/iwlwifi/pcie/trans.c     |  10 +-
 drivers/net/wireless/zd1201.c                 |   4 +-
 drivers/of/fdt.c                              |   2 +
 drivers/pci/pci-acpi.c                        |  15 +-
 drivers/platform/olpc/olpc-ec.c               |   2 +-
 drivers/s390/scsi/zfcp_erp.c                  |  29 +++-
 drivers/s390/scsi/zfcp_qdio.c                 |   8 +-
 drivers/scsi/Kconfig                          |   1 -
 drivers/staging/comedi/drivers.c              |   2 +-
 drivers/usb/phy/phy-fsl-usb.h                 |   2 +-
 drivers/usb/phy/phy-fsm-usb.c                 |   2 +-
 drivers/xen/events.c                          |  13 +-
 fs/bio.c                                      |  20 ++-
 fs/namespace.c                                |   2 +-
 fs/nilfs2/segbuf.c                            |   5 +-
 include/acpi/acpi_bus.h                       |   6 +-
 include/linux/ftrace_event.h                  |   2 +-
 include/linux/mm_types.h                      |   1 +
 include/linux/sched.h                         |   1 -
 include/linux/wait.h                          |  57 ++++++++
 kernel/trace/ftrace.c                         |  89 ++++++++++--
 kernel/trace/trace.c                          | 173 +++++++++++-----------
 kernel/trace/trace_events.c                   | 198 ++++++++++++++++----------
 kernel/trace/trace_events_filter.c            |  17 +--
 kernel/trace/trace_kprobe.c                   |  42 ++++--
 kernel/trace/trace_uprobe.c                   |  51 +++++--
 net/mac80211/mlme.c                           |  15 +-
 net/nfc/llcp.h                                |   1 +
 net/nfc/llcp_sock.c                           |   8 +-
 72 files changed, 811 insertions(+), 362 deletions(-)