From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751378AbdAYHjV (ORCPT ); Wed, 25 Jan 2017 02:39:21 -0500 Received: from www62.your-server.de ([213.133.104.62]:33571 "EHLO www62.your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751323AbdAYHjT (ORCPT ); Wed, 25 Jan 2017 02:39:19 -0500 Message-ID: <5888561F.9080503@iogearbox.net> Date: Wed, 25 Jan 2017 08:39:11 +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 , Shuah Khan , David Miller , Networking CC: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "bamvor.zhangjian@huawei.com" , Bamvor Jian Zhang Subject: Re: linux-next: manual merge of the kselftest tree with the net-next tree References: <20170125150321.0b377f57@canb.auug.org.au> In-Reply-To: <20170125150321.0b377f57@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 01/25/2017 05:03 AM, Stephen Rothwell wrote: > Hi Shuah, > > Today's linux-next merge of the kselftest tree got a conflict in: > > tools/testing/selftests/bpf/Makefile > > between commit: > > 62b64660262a ("bpf: add prog tag test case to bpf selftests") > > from the net-next tree and commit: > > 88baa78d1f31 ("selftests: remove duplicated all and clean target") > > from the kselftest 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!