linux-kernel - linux-next: manual merge of the tracing tree with the net tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20090522161519.97c8968b.sfr@canb.auug.org.au>
Date:	Fri, 22 May 2009 16:15:19 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"David S. Miller" <davem@...emloft.net>,
	Neil Horman <nhorman@...driver.com>,
	Steven Rostedt <srostedt@...hat.com>
Subject: linux-next: manual merge of the tracing tree with the net tree

Hi all,

Today's linux-next merge of the tracing tree got a conflict in
net/core/drop_monitor.c between commit
4ea7e38696c7e798c47ebbecadfd392f23f814f9 ("dropmon: add ability to detect
when hardware dropsrxpackets") from the net tree and commit
ad8d75fff811a6a230f7f43b05a6483099349533 ("tracing/events: move trace
point headers into include/trace/events") from the tracing tree.

I fixed it up (see below) and can carry the fix as necessary.  I suspect
that trace/napi.h should eventually go into trace/events as well.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc net/core/drop_monitor.c
index a6c2ac2,b75b6ce..0000000
--- a/net/core/drop_monitor.c
+++ b/net/core/drop_monitor.c
@@@ -22,10 -22,8 +22,10 @@@
  #include <linux/timer.h>
  #include <linux/bitops.h>
  #include <net/genetlink.h>
 +#include <net/netevent.h>
  
- #include <trace/skb.h>
+ #include <trace/events/skb.h>
 +#include <trace/napi.h>
  
  #include <asm/unaligned.h>
  
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/