From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751548AbdF1Ibk (ORCPT ); Wed, 28 Jun 2017 04:31:40 -0400 Received: from ozlabs.org ([103.22.144.67]:54133 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751650AbdF1IbR (ORCPT ); Wed, 28 Jun 2017 04:31:17 -0400 Date: Wed, 28 Jun 2017 18:31:11 +1000 From: Stephen Rothwell To: Andrew Morton , Shuah Khan Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Orson Zhai , "Luis R. Rodriguez" Subject: linux-next: manual merge of the akpm-current tree with the kselftest tree Message-ID: <20170628183111.05680b34@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 all, Today's linux-next merge of the akpm-current tree got conflicts in: tools/testing/selftests/sysctl/common_tests tools/testing/selftests/sysctl/run_numerictests tools/testing/selftests/sysctl/run_stringtests between commit: d644437a1dc6 ("tools/testing/selftests/sysctl: Add pre-check to the value of writes_strict") from the kselftest tree and commit: fed7038685f3 ("test_sysctl: add generic script to expand on tests") from the akpm-current tree. I fixed it up (I removed the files and so, for now I have effectively dropped the kselftest tree patch) 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