Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1311256

linux-next: manual merge of the akpm-current tree with Linus' tree

Show all headers | View raw

Hi Andrew,

Today's linux-next merge of the akpm-current tree got lost of conflicts in:

  mm/huge_memory.c

between various commits in Linus' tree and the same or similar patches
in the akpm-current tree along with further changes to this file.

I can't possibly fix it up, so I just dropped the akpm-current tree
for today.

I do wish that you would publish your patch set for me just as you intend
to send it to Linus. :-(  I also wonder at how much exposure and testing
the subset that you have sent to Linus has had on it own given that the
version I have is from Jan 12.

Sorry, but I seem to end up in this mess almost every merge window.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

linux-next: manual merge of the akpm-current tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-01-18 04:30 +0100

csiph-web