linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
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: Fri, 15 Dec 2017 09:43:48 +1100	[thread overview]
Message-ID: <20171215094348.63f4da81@canb.auug.org.au> (raw)
In-Reply-To: <20171214141913.5c6ede97@vento.lan>

Hi Mauro,

On Thu, 14 Dec 2017 14:19:13 -0200 Mauro Carvalho Chehab <mchehab@osg.samsung.com> wrote:
>
> 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 for letting me know ... it was fine ("git rerere" is very useful :-))

-- 
Cheers,
Stephen Rothwell

  reply	other threads:[~2017-12-14 22:43 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
2017-12-14 22:43   ` Stephen Rothwell [this message]
  -- 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=20171215094348.63f4da81@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mchehab@osg.samsung.com \
    --cc=sean@mess.org \
    --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).