Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1354867 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2016-03-10 06:30 +0100 |
| Last post | 2016-03-10 21:40 +0100 |
| Articles | 3 — 3 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the akpm tree with the tip tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-03-10 06:30 +0100
Re: linux-next: manual merge of the akpm tree with the tip tree Ingo Molnar <mingo@kernel.org> - 2016-03-10 09:10 +0100
Re: linux-next: manual merge of the akpm tree with the tip tree Andrew Morton <akpm@linux-foundation.org> - 2016-03-10 21:40 +0100
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-03-10 06:30 +0100 |
| Subject | linux-next: manual merge of the akpm tree with the tip tree |
| Message-ID | <rb1kC-2ok-5@gated-at.bofh.it> |
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.
--
Cheers,
Stephen Rothwell
[toc] | [next] | [standalone]
| From | Ingo Molnar <mingo@kernel.org> |
|---|---|
| Date | 2016-03-10 09:10 +0100 |
| Message-ID | <rb3Pr-446-5@gated-at.bofh.it> |
| In reply to | #1354867 |
* Stephen Rothwell <sfr@canb.auug.org.au> 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.
Thanks,
Ingo
[toc] | [prev] | [next] | [standalone]
| From | Andrew Morton <akpm@linux-foundation.org> |
|---|---|
| Date | 2016-03-10 21:40 +0100 |
| Message-ID | <rbfxg-3Go-7@gated-at.bofh.it> |
| In reply to | #1354908 |
On Thu, 10 Mar 2016 09:00:25 +0100 Ingo Molnar <mingo@kernel.org> wrote:
>
> * Stephen Rothwell <sfr@canb.auug.org.au> 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.
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web