From: Mauro Carvalho Chehab <mchehab@kernel.org>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Sean Young <sean@mess.org>
Subject: Re: linux-next: manual merge of the v4l-dvb-next tree with the v4l-dvb tree
Date: Thu, 25 Apr 2019 12:23:20 -0300 [thread overview]
Message-ID: <20190425122320.2a2ee0f5@coco.lan> (raw)
In-Reply-To: <CAK8P3a1LDL51KW2jJdOacAxNP=Gk9YSdcP2LfX8ZasLOdcibDg@mail.gmail.com>
Em Tue, 23 Apr 2019 10:12:42 +0200
Arnd Bergmann <arnd@arndb.de> escreveu:
> On Tue, Apr 23, 2019 at 2:51 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Hi all,
> >
> > Today's linux-next merge of the v4l-dvb-next tree got a conflict in:
> >
> > drivers/media/platform/Kconfig
> >
> > between commit:
> >
> > 63604a143fe1 ("media: seco-cec: fix building with RC_CORE=m")
> >
> > from the v4l-dvb tree and commit:
> >
> > 81527254e151 ("media: seco: depend on CONFIG_RC_CORE=y when not a module")
> >
> > from the v4l-dvb-next tree.
> >
> > I fixed it up (I just used the v4l-dvb tree 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.
>
> Thanks!
>
> Both patches are correct, they just use slightly different syntax, so
> the merge is fine as well.
I just removed the one from fixes, keeping just the one on my master
branch.
Thanks,
Mauro
next prev parent reply other threads:[~2019-04-25 15:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-23 0:51 linux-next: manual merge of the v4l-dvb-next tree with the v4l-dvb tree Stephen Rothwell
2019-04-23 8:12 ` Arnd Bergmann
2019-04-25 15:23 ` Mauro Carvalho Chehab [this message]
2020-06-03 2:38 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=20190425122320.2a2ee0f5@coco.lan \
--to=mchehab@kernel.org \
--cc=arnd@arndb.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sean@mess.org \
--cc=sfr@canb.auug.org.au \
/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).