Re: linux-next: manual merge of the staging tree with the v4l-dvb tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the staging tree with the v4l-dvb tree
Date	2017-04-07 00:00 +0200
Message-ID	<ttnBE-6sT-9@gated-at.bofh.it> (permalink)
References	<tt6r8-36F-5@gated-at.bofh.it> <ttkX7-4XH-1@gated-at.bofh.it> <ttlgu-54H-5@gated-at.bofh.it> <ttmme-5MY-7@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi Sean,

On Thu, 6 Apr 2017 21:39:05 +0100 Sean Young <sean@mess.org> wrote:
>
> I think this is happening:
> 
> On the v4l-dvb tree, 5cd6522 modifies both lirc_sasem.c and lirc_sir.c;
> then both files are removed. Now 87ddb91067b9 is merged from the staging
> tree and both files don't exist any more, so it no longer applies even
> though the patch is the same.

That is exactly right, but ...

> If I drop 87ddb91067b9 from staging-next, I can merge it to v4l-dvb, 
> otherwise I get merge conflicts.

The resolution is trivial, so don't worry about it.

-- 
Cheers,
Stephen Rothwell

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the staging tree with the v4l-dvb tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-04-06 05:40 +0200
  Re: linux-next: manual merge of the staging tree with the v4l-dvb  tree Sean Young <sean@mess.org> - 2017-04-06 21:10 +0200
    Re: linux-next: manual merge of the staging tree with the v4l-dvb  tree Greg KH <greg@kroah.com> - 2017-04-06 21:30 +0200
      Re: linux-next: manual merge of the staging tree with the v4l-dvb  tree Sean Young <sean@mess.org> - 2017-04-06 22:40 +0200
        Re: linux-next: manual merge of the staging tree with the v4l-dvb  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-04-07 00:00 +0200

csiph-web