lkml.org 
[lkml]   [2019]   [Apr]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: linux-next: manual merge of the char-misc tree with the char-misc.current tree
On Wed, Apr 3, 2019 at 1:07 PM Srinivas Kandagatla
<srinivas.kandagatla@linaro.org> wrote:
>
>
> On 03/04/2019 04:56, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the char-misc tree got a conflict in:
> >
> > drivers/misc/fastrpc.c
> >
> > between commit:
> >
> > 01b76c32e3f3 ("misc: fastrpc: add checked value for dma_set_mask")
> >
> > from the char-misc.current tree and commit:
> >
> > 977e6c8d1d18 ("misc: fastrpc: use correct spinlock variant")
> >
> > from the char-misc tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary. This
> > is now fixed as far as linux-next is concerned, but any non trivial
> Greg did request Bo YU to rebase this patch on top of char-misc tree.
Yes.The patch was v2 after rebasing char-misc tree.
>
> That would be a real fix for this conflict, until then this fixup should
> work.
Is there any modifies need me?
Anyway thank everyone!
>
> --srini
> > 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.
> >

\
 
 \ /
  Last update: 2019-04-03 08:40    [W:0.057 / U:0.028 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site