From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mauro Carvalho Chehab <mchehab@osg•samsung.com>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Hans Verkuil <hans.verkuil@cisco•com>,
Arnd Bergmann <arnd@arndb•de>
Subject: linux-next: manual merge of the v4l-dvb tree with the v4l-dvb-fixes tree
Date: Mon, 5 Jun 2017 12:03:11 +1000 [thread overview]
Message-ID: <20170605120311.0edff177@canb.auug.org.au> (raw)
Hi Mauro,
Today's linux-next merge of the v4l-dvb tree got a conflict in:
include/media/cec-notifier.h
between commit:
e94c32818d86 ("[media] cec: rename MEDIA_CEC_NOTIFIER to CEC_NOTIFIER")
from the v4l-dvb-fixes tree and commit:
79eddc992ea4 ("[media] cec-notifier.h: handle unreachable CONFIG_CEC_CORE")
from the v4l-dvb tree.
I fixed it up (I just used the former version) 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
next reply other threads:[~2017-06-05 2:03 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-05 2:03 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-01-09 0:10 linux-next: manual merge of the v4l-dvb tree with the v4l-dvb-fixes tree Stephen Rothwell
2020-01-09 7:05 ` Mauro Carvalho Chehab
2020-11-06 0:19 Stephen Rothwell
2022-09-27 12:34 broonie
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=20170605120311.0edff177@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=hans.verkuil@cisco$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab@osg$(echo .)samsung.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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