From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750816AbdAXEpa (ORCPT ); Mon, 23 Jan 2017 23:45:30 -0500 Received: from ozlabs.org ([103.22.144.67]:47807 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750709AbdAXEp2 (ORCPT ); Mon, 23 Jan 2017 23:45:28 -0500 Date: Tue, 24 Jan 2017 15:45:24 +1100 From: Stephen Rothwell To: Shuah Khan , David Miller , Networking Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, David Herrmann , Daniel Mack , Bamvor Jian Zhang , "bamvor.zhangjian@huawei.com" Subject: linux-next: manual merge of the kselftest tree with the net-next tree Message-ID: <20170124154524.2a993739@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Shuah, Today's linux-next merge of the kselftest tree got a conflict in: tools/testing/selftests/bpf/Makefile between commit: 4d3381f5a322 ("bpf: Add tests for the lpm trie map") 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. P.S. Shuah, that kselftest commit has a different email address in its Author and Signed-off-by. -- Cheers, Stephen Rothwell diff --cc tools/testing/selftests/bpf/Makefile index 064a3e5f2836,058351b0694f..000000000000 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@@ -1,13 -1,7 +1,7 @@@ CFLAGS += -Wall -O2 -I../../../../usr/include - test_objs = test_verifier test_maps test_lru_map test_lpm_map -TEST_GEN_PROGS = test_verifier test_maps test_lru_map ++TEST_GEN_PROGS = test_verifier test_maps test_lru_map test_lpm_map - TEST_PROGS := test_verifier test_maps test_lru_map test_lpm_map test_kmod.sh - TEST_FILES := $(test_objs) - - all: $(test_objs) + TEST_PROGS := test_kmod.sh include ../lib.mk - - clean: - $(RM) $(test_objs)