linux-kernel - linux-next: manual merge of the tip tree with the net-next 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>] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 7 Apr 2015 17:04:02 +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>,
	Peter Zijlstra <peterz@...radead.org>,
	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Alexei Starovoitov <ast@...mgrid.com>,
	Alexei Starovoitov <ast@...mgrid.com>
Subject: linux-next: manual merge of the tip tree with the net-next tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in
samples/bpf/Makefile between commit 91bc4822c3d6 ("tc: bpf: add
checksum helpers") from the net-next tree and commit b896c4f95ab4
("samples/bpf: Add simple non-portable kprobe filter example") (and
following) from the tip tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc samples/bpf/Makefile
index d24f51bca465,fe98fb226e6e..000000000000
--- a/samples/bpf/Makefile
+++ b/samples/bpf/Makefile
@@@ -17,7 -25,10 +25,11 @@@ tracex4-objs := bpf_load.o libbpf.o tra
  always := $(hostprogs-y)
  always += sockex1_kern.o
  always += sockex2_kern.o
 +always += tcbpf1_kern.o
+ always += tracex1_kern.o
+ always += tracex2_kern.o
+ always += tracex3_kern.o
+ always += tracex4_kern.o
  
  HOSTCFLAGS += -I$(objtree)/usr/include
  

Content of type "application/pgp-signature" skipped