From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dave Airlie <airlied@linux.ie>,
Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Hans Verkuil <hans.verkuil@cisco.com>,
Peter Ujfalusi <peter.ujfalusi@ti.com>
Subject: linux-next: manual merge of the drm tree with the v4l-dvb tree
Date: Wed, 13 Jul 2016 12:25:14 +1000 [thread overview]
Message-ID: <20160713122514.5689c628@canb.auug.org.au> (raw)
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/media/platform/omap/omap_voutdef.h
between commit:
77430f0396af ("[media] omap_vout: use control framework")
from the v4l-dvb tree and commit:
781a162244a2 ("[media] omap_vout: Switch to use the video/omapfb_dss.h header file")
from the drm 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 drivers/media/platform/omap/omap_voutdef.h
index 49de1475e473,94b5d65afb19..000000000000
--- a/drivers/media/platform/omap/omap_voutdef.h
+++ b/drivers/media/platform/omap/omap_voutdef.h
@@@ -11,8 -11,7 +11,8 @@@
#ifndef OMAP_VOUTDEF_H
#define OMAP_VOUTDEF_H
+#include <media/v4l2-ctrls.h>
- #include <video/omapdss.h>
+ #include <video/omapfb_dss.h>
#include <video/omapvrfb.h>
#define YUYV_BPP 2
next reply other threads:[~2016-07-13 2:25 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-13 2:25 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-03-01 1:20 linux-next: manual merge of the drm tree with the v4l-dvb tree Stephen Rothwell
2022-03-01 1:20 ` Stephen Rothwell
2018-07-27 4:36 Stephen Rothwell
2018-07-27 4:36 ` Stephen Rothwell
2018-07-27 7:57 ` Philipp Zabel
2018-07-27 7:57 ` Philipp Zabel
2018-07-27 10:32 ` Mauro Carvalho Chehab
2018-07-27 10:32 ` Mauro Carvalho Chehab
2017-04-11 0:27 Stephen Rothwell
2016-07-19 1:21 Stephen Rothwell
2015-04-15 3:49 Stephen Rothwell
2015-04-15 9:00 ` Philipp Zabel
2015-04-15 3:33 Stephen Rothwell
2015-04-15 3:33 ` Stephen Rothwell
2015-04-15 9:09 ` Philipp Zabel
2015-04-17 3:07 ` Dave Airlie
2015-04-17 17:12 ` Philipp Zabel
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=20160713122514.5689c628@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=airlied@linux.ie \
--cc=hans.verkuil@cisco.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab@osg.samsung.com \
--cc=peter.ujfalusi@ti.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.