From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752377AbdBTJtQ (ORCPT ); Mon, 20 Feb 2017 04:49:16 -0500 Received: from www62.your-server.de ([213.133.104.62]:36792 "EHLO www62.your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750920AbdBTJtO (ORCPT ); Mon, 20 Feb 2017 04:49:14 -0500 Message-ID: <58AAB0AC.9080601@iogearbox.net> Date: Mon, 20 Feb 2017 10:02:36 +0100 From: Daniel Borkmann User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Stephen Rothwell , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , David Miller , Networking CC: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Masami Hiramatsu Subject: Re: linux-next: manual merge of the tip tree with the net-next tree References: <20170220122227.54f04c2a@canb.auug.org.au> In-Reply-To: <20170220122227.54f04c2a@canb.auug.org.au> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Authenticated-Sender: daniel@iogearbox.net Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 02/20/2017 02:22 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tip tree got a conflict in: > > kernel/extable.c > > between commit: > > 74451e66d516 ("bpf: make jited programs visible in traces") > > from the net-next tree and commit: > > 5b485629ba0d ("kprobes, extable: Identify kprobes trampolines as kernel text area") > > from the tip tree. > > I fixed it up (see below) 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. Looks good to me, thanks!