From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751328AbdBAE2f (ORCPT ); Tue, 31 Jan 2017 23:28:35 -0500 Received: from ozlabs.org ([103.22.144.67]:59791 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750917AbdBAE2e (ORCPT ); Tue, 31 Jan 2017 23:28:34 -0500 Date: Wed, 1 Feb 2017 15:28:26 +1100 From: Stephen Rothwell To: Greg KH , Arnd Bergmann Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "Luis R. Rodriguez" , Alexander Dahl Subject: linux-next: manual merge of the char-misc tree with the driver-core tree Message-ID: <20170201152826.3fe2c518@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 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