diff options
| author | David S. Miller <davem@davemloft.net> | 2016-05-15 13:32:12 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-15 13:32:48 -0400 |
| commit | 909b27f706433a0b3dff79aa259de63aafe40a42 (patch) | |
| tree | c13cda633379cdbef701e730027b6a19ba6b267e /MAINTAINERS | |
| parent | 8fbb89c6fbfd1cda9ae413cd1e042837a8edbdeb (diff) | |
| parent | 272911b889f47aa5bc3e004804fc2382f0ac6ce6 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The nf_conntrack_core.c fix in 'net' is not relevant in 'net-next'
because we no longer have a per-netns conntrack hash.
The ip_gre.c conflict as well as the iwlwifi ones were cases of
overlapping changes.
Conflicts:
drivers/net/wireless/intel/iwlwifi/mvm/tx.c
net/ipv4/ip_gre.c
net/netfilter/nf_conntrack_core.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b57df66532d2..458304bfe2d5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11315,6 +11315,20 @@ F: include/trace/ F: kernel/trace/ F: tools/testing/selftests/ftrace/ +TRACING MMIO ACCESSES (MMIOTRACE) +M: Steven Rostedt <rostedt@goodmis.org> +M: Ingo Molnar <mingo@kernel.org> +R: Karol Herbst <karolherbst@gmail.com> +R: Pekka Paalanen <ppaalanen@gmail.com> +S: Maintained +L: linux-kernel@vger.kernel.org +L: nouveau@lists.freedesktop.org +F: kernel/trace/trace_mmiotrace.c +F: include/linux/mmiotrace.h +F: arch/x86/mm/kmmio.c +F: arch/x86/mm/mmio-mod.c +F: arch/x86/mm/testmmiotrace.c + TRIVIAL PATCHES M: Jiri Kosina <trivial@kernel.org> T: git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git |