From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the tip tree with the net-next tree Date: Wed, 1 Nov 2017 18:15:54 +1100 Message-ID: <20171101181554.1826e8c8@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Sender: linux-kernel-owner@vger.kernel.org To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , David Miller , Networking Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Yonghong Song List-Id: linux-next.vger.kernel.org Hi all, Today's linux-next merge of the tip tree got a conflict in: kernel/trace/bpf_trace.c between commits: 97562633bcba ("bpf: perf event change needed for subsequent bpf helpers") and more changes ... from the net-next tree and commit: 7d9285e82db5 ("perf/bpf: Extend the perf_event_read_local() interface, a.k.a. "bpf: perf event change needed for subsequent bpf helpers"") from the tip tree. I fixed it up (I just used the version from the net-next tree) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell