From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751532AbdFGEj3 (ORCPT ); Wed, 7 Jun 2017 00:39:29 -0400 Received: from ozlabs.org ([103.22.144.67]:55401 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750831AbdFGEj2 (ORCPT ); Wed, 7 Jun 2017 00:39:28 -0400 Date: Wed, 7 Jun 2017 14:39:24 +1000 From: Stephen Rothwell To: Shuah Khan , Jonathan Corbet Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Mauro Carvalho Chehab , =?UTF-8?B?TWlja2HDq2wgU2FsYcO8bg==?= Subject: linux-next: manual merge of the kselftest tree with the jc_docs tree Message-ID: <20170607143924.708d9451@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: Documentation/dev-tools/index.rst between commit: 7fb2e8a49037 ("docs-rst: convert kgdb DocBook to ReST") from the jc_docs tree and commit: 5714b6531b49 ("Documentation/dev-tools: Use reStructuredText markups for kselftest") 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. -- Cheers, Stephen Rothwell diff --cc Documentation/dev-tools/index.rst index 4ac991dbddb7,e50054c6aeaa..000000000000 --- a/Documentation/dev-tools/index.rst +++ b/Documentation/dev-tools/index.rst @@@ -23,7 -23,7 +23,8 @@@ whole; patches welcome kmemleak kmemcheck gdb-kernel-debugging + kgdb + kselftest .. only:: subproject and html