From: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Al Viro <viro@ZenIV.linux.org.uk>,
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 vfs tree
Date: Thu, 14 Dec 2017 14:19:13 -0200 [thread overview]
Message-ID: <20171214141913.5c6ede97@vento.lan> (raw)
In-Reply-To: <20171211112854.42a7a70a@canb.auug.org.au>
Hi Stephen,
Em Mon, 11 Dec 2017 11:28:54 +1100
Stephen Rothwell <sfr@canb.auug.org.au> escreveu:
> Hi Mauro,
>
> Today's linux-next merge of the v4l-dvb-next tree got a conflict in:
>
> drivers/staging/media/lirc/lirc_zilog.c
>
> between commit:
>
> c23e0cb81e40 ("media: annotate ->poll() instances")
>
> from the vfs tree and commit:
>
> 28032a347ed0 ("media: staging: remove lirc_zilog driver")
>
> from the v4l-dvb-next tree.
>
> I fixed it up (I just removed the file) 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.
FYI,
I had to rebase the patch series on the top of media tree.
You'll likely be facing the same conflicts with vfs after the
rebase, with different changeset identifiers.
--
Thanks,
Mauro
next prev parent reply other threads:[~2017-12-14 16:19 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-11 0:28 linux-next: manual merge of the v4l-dvb-next tree with the vfs tree Stephen Rothwell
2017-12-14 16:19 ` Mauro Carvalho Chehab [this message]
2017-12-14 22:43 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2017-12-11 0:25 Stephen Rothwell
2017-12-11 0:22 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=20171214141913.5c6ede97@vento.lan \
--to=mchehab@osg.samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sean@mess.org \
--cc=sfr@canb.auug.org.au \
--cc=viro@ZenIV.linux.org.uk \
/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).