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
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.
--
Cheers,
Stephen Rothwell
diff --cc drivers/misc/fastrpc.c
index 36d0d5c9cfba,c4cc8e53243d..000000000000
--- a/drivers/misc/fastrpc.c
+++ b/drivers/misc/fastrpc.c
@@@ -1184,7 -1314,7 +1314,8 @@@ static int fastrpc_cb_probe(struct plat
struct fastrpc_session_ctx *sess;
struct device *dev = &pdev->dev;
int i, sessions = 0;
+ int rc;
+ unsigned long flags;
cctx = dev_get_drvdata(dev->parent);
if (!cctx)
@@@ -1213,12 -1343,8 +1344,12 @@@
}
}
cctx->sesscount++;
- spin_unlock(&cctx->lock);
+ spin_unlock_irqrestore(&cctx->lock, flags);
- dma_set_mask(dev, DMA_BIT_MASK(32));
+ rc = dma_set_mask(dev, DMA_BIT_MASK(32));
+ if (rc) {
+ dev_err(dev, "32-bit DMA enable failed\n");
+ return rc;
+ }
return 0;
}
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.
That would be a real fix for this conflict, until then this fixup should
work.
--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.
>
On Wed, Apr 3, 2019 at 1:07 PM Srinivas Kandagatla
<[email protected]> 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.
> >