linux-next: manual merge of the char-misc tree with the driver-core tree

Path	csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the char-misc tree with the driver-core tree
Date	Wed, 01 Feb 2017 05:30:01 +0100
Message-ID	<t5UIp-1aG-9@gated-at.bofh.it> (permalink)
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201601; t=1485923306; bh=XUxQg7ppYIEfQJQCH8UkfVvTSHKHmG/TNUJZqYkl5cc=; h=Date:From:To:Cc:Subject:From; b=h+RpfTD3WZHCdvQAW3DdemNk9a3IVPtt7X0kUWjAjaS1f4YDnei9ef65dPJV0LPVO kD5H8bUbVpN/mel1cC7XYpLU61bobZTe6PFT/9gpJy0v11geowmmvqNvHfQSQtPW0M 9pCk03y4jmNjrZfrXelgAsZOfKTUgT/Xj1TvbXRE=
MIME-Version	1.0
Content-Type	text/plain; charset=US-ASCII
Content-Transfer-Encoding	7bit
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	40
Organization	linux.* mail to news gateway
X-Original-Cc	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "Luis R. Rodriguez" <mcgrof@kernel.org>, Alexander Dahl <post@lespocky.de>
X-Original-Date	Wed, 1 Feb 2017 15:28:26 +1100
X-Original-Message-ID	<20170201152826.3fe2c518@canb.auug.org.au>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1571264

Show key headers only | View raw

Hi all,

Today's linux-next merge of the char-misc tree got a conflict in:

  Documentation/driver-api/index.rst

between commit:

  113ccc38378b ("firmware: revamp firmware documentation")

from the driver-core tree and commit:

  cadf8106661c ("doc: convert UIO howto from docbook to sphinx")

from the char-misc 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/driver-api/index.rst
index 2359618746ec,c5a1cd0a4ae7..000000000000
--- a/Documentation/driver-api/index.rst
+++ b/Documentation/driver-api/index.rst
@@@ -31,7 -30,7 +31,8 @@@ available subsections can be seen below
     miscellaneous
     vme
     80211/index
 +   firmware/index
+    uio-howto
  
  .. only::  subproject and html

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

linux-next: manual merge of the char-misc tree with the driver-core  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-02-01 05:30 +0100

csiph-web