From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jani Nikula <jani.nikula@intel.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: linux-next: manual merge of the v4l-dvb tree with Linus' tree
Date: Thu, 4 Aug 2016 11:02:26 +1000 [thread overview]
Message-ID: <20160804110226.46d29e94@canb.auug.org.au> (raw)
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]
next reply other threads:[~2016-08-04 1:02 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-04 1:02 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-10-01 0:33 linux-next: manual merge of the v4l-dvb tree with Linus' tree Stephen Rothwell
2021-10-01 6:46 ` Sean Young
2019-06-24 1:36 Stephen Rothwell
2019-06-06 0:43 Stephen Rothwell
2019-05-23 23:21 Stephen Rothwell
2019-01-31 23:22 Stephen Rothwell
2019-01-31 23:27 ` Stephen Rothwell
2015-09-07 23:20 Stephen Rothwell
2015-04-21 1:54 Stephen Rothwell
2015-04-21 7:49 ` Laurent Pinchart
2015-04-21 8:02 ` Stephen Rothwell
2015-04-21 9:56 ` Mauro Carvalho Chehab
2015-04-21 12:38 ` Laurent Pinchart
2015-04-21 13:12 ` Mauro Carvalho Chehab
2015-04-21 13:36 ` Philipp Zabel
2015-04-21 1:50 Stephen Rothwell
2015-04-10 3:53 Stephen Rothwell
2014-01-14 0:50 Stephen Rothwell
2013-08-29 2:48 Stephen Rothwell
2012-10-02 1:13 Stephen Rothwell
2012-06-19 1:29 Stephen Rothwell
2012-06-19 10:06 ` Jiri Kosina
2012-06-19 11:50 ` Hans de Goede
2012-06-19 11:52 ` Jiri Kosina
2011-07-29 3:17 Stephen Rothwell
2011-07-29 4:10 ` Mauro Carvalho Chehab
2011-07-29 7:29 ` Stephen Rothwell
2011-04-08 3:27 Stephen Rothwell
2011-03-22 1:00 Stephen Rothwell
2010-07-06 2:01 Stephen Rothwell
2010-05-13 1:52 Stephen Rothwell
2010-05-10 0:36 Stephen Rothwell
2010-05-11 23:23 ` Mauro Carvalho Chehab
2010-05-12 0:23 ` Stephen Rothwell
2010-05-10 0:32 Stephen Rothwell
2010-05-11 5:19 ` Hiremath, Vaibhav
2010-05-10 0:29 Stephen Rothwell
2010-04-07 1:00 Stephen Rothwell
2010-04-09 5:22 ` Mauro Carvalho Chehab
2010-04-09 7:13 ` Stephen Rothwell
2009-09-02 2:17 Stephen Rothwell
2009-09-03 2:12 ` Mauro Carvalho Chehab
2009-09-03 6:49 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160804110226.46d29e94@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=daniel.vetter@ffwll.ch \
--cc=jani.nikula@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab@osg.samsung.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).