From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933079AbcHDBCa (ORCPT ); Wed, 3 Aug 2016 21:02:30 -0400 Received: from ozlabs.org ([103.22.144.67]:35894 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751351AbcHDBC3 (ORCPT ); Wed, 3 Aug 2016 21:02:29 -0400 Date: Thu, 4 Aug 2016 11:02:26 +1000 From: Stephen Rothwell To: Mauro Carvalho Chehab Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jani Nikula , Daniel Vetter Subject: linux-next: manual merge of the v4l-dvb tree with Linus' tree Message-ID: <20160804110226.46d29e94@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 Mauro, Today's linux-next merge of the v4l-dvb tree got a conflict in: Documentation/DocBook/Makefile between commit: 88e196b337d6 ("Documentation/DocBook: remove gpu.tmpl") from Linus' tree and commit: 43f71d93a0cb ("doc-rst: Remove the media docbook") from the v4l-dvb 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/DocBook/Makefile index 8e6dd4b14314,2bfd664b5e35..000000000000 --- a/Documentation/DocBook/Makefile +++ b/Documentation/DocBook/Makefile @@@ -16,11 -16,9 +16,9 @@@ DOCBOOKS := z8530book.xml device-driver genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \ 80211.xml debugobjects.xml sh.xml regulator.xml \ alsa-driver-api.xml writing-an-alsa-driver.xml \ - tracepoint.xml media_api.xml w1.xml \ - tracepoint.xml gpu.xml w1.xml \ ++ tracepoint.xml w1.xml \ writing_musb_glue_layer.xml crypto-API.xml iio.xml - include Documentation/DocBook/media/Makefile - ### # The build process is as follows (targets): # (xmldocs) [by docproc]