On Thu, 10 Mar 2016 09:00:25 +0100 Ingo Molnar <mingo@xxxxxxxxxx> wrote:
>
> * Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> > Hi Andrew,
> >
> > Today's linux-next merge of the akpm tree got a conflict in:
> >
> > drivers/gpu/drm/omapdrm/omap_gem.c
> >
> > between commit:
> >
> > f6e45661f9be ("dma, mm/pat: Rename dma_*_writecombine() to dma_*_wc()")
> >
> > from the tip tree and patch:
> >
> > "dma-mapping: rename dma_*_writecombine() to dma_*_wc()"
> >
> > from the akpm tree.
> >
> > These a basically the same patch, so I dropped the one from the akpm tree.
>
> Andrew, what's your preference for merging it? I can drop it too.
>
I've dropped the -mm copy. That's what I do in 99.99% of cases. Which
means that if the version which was in someone else's -next tree later
gets lost (happens sometimes), the patch is lost altogether.
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
