* linux-next: manual merge of the akpm tree with lots of trees
@ 2017-10-17 19:44 Mark Brown
2017-10-17 21:44 ` Andrew Morton
0 siblings, 1 reply; 3+ messages in thread
From: Mark Brown @ 2017-10-17 19:44 UTC (permalink / raw)
To: Andrew Morton; +Cc: Linux-Next Mailing List, Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 186 bytes --]
Hi Andrew,
Today's linux-next merge of (well, import of) the akpm tree got a
bunch of patches that were either applied or have conflicts with other
trees, apparmor and btrfs stand out.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the akpm tree with lots of trees
2017-10-17 19:44 linux-next: manual merge of the akpm tree with lots of trees Mark Brown
@ 2017-10-17 21:44 ` Andrew Morton
2017-10-17 23:21 ` Mark Brown
0 siblings, 1 reply; 3+ messages in thread
From: Andrew Morton @ 2017-10-17 21:44 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-Next Mailing List, Linux Kernel Mailing List
On Tue, 17 Oct 2017 20:44:19 +0100 Mark Brown <broonie@kernel.org> wrote:
> Hi Andrew,
>
> Today's linux-next merge of (well, import of) the akpm tree got a
> bunch of patches that were either applied or have conflicts with other
> trees, apparmor and btrfs stand out.
I don't know why that should be.
I have a cleanly applying linux-next.patch today (you fixed something?)
so I can do a fresh mmotm a couple hours from now.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the akpm tree with lots of trees
2017-10-17 21:44 ` Andrew Morton
@ 2017-10-17 23:21 ` Mark Brown
0 siblings, 0 replies; 3+ messages in thread
From: Mark Brown @ 2017-10-17 23:21 UTC (permalink / raw)
To: Andrew Morton; +Cc: Linux-Next Mailing List, Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 691 bytes --]
On Tue, Oct 17, 2017 at 02:44:46PM -0700, Andrew Morton wrote:
> On Tue, 17 Oct 2017 20:44:19 +0100 Mark Brown <broonie@kernel.org> wrote:
> > Today's linux-next merge of (well, import of) the akpm tree got a
> > bunch of patches that were either applied or have conflicts with other
> > trees, apparmor and btrfs stand out.
> I don't know why that should be.
> I have a cleanly applying linux-next.patch today (you fixed something?)
> so I can do a fresh mmotm a couple hours from now.
I did the fetch that went in today in the early hours of the morning
(well, the computer did). I did need to do fixups in the process of
building -next but I'm not sure if that's what you mean here.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-10-17 23:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-17 19:44 linux-next: manual merge of the akpm tree with lots of trees Mark Brown
2017-10-17 21:44 ` Andrew Morton
2017-10-17 23:21 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox