Re: linux-next: manual merge of the akpm tree with the sparc-next tree

2013-11-14 Thread David Miller
From: Stephen Rothwell Date: Fri, 15 Nov 2013 16:00:00 +1100 > [Forgot to cc Dave] Yes, I told Linus about this conflict when I sent in my sparc pull request this afternoon. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kern

Re: linux-next: manual merge of the akpm tree with the sparc-next tree

2013-11-14 Thread Stephen Rothwell
[Forgot to cc Dave] On Fri, 15 Nov 2013 15:57:33 +1100 Stephen Rothwell wrote: > > Hi Andrew, > > Today's linux-next merge of the akpm tree got a conflict in > arch/sparc/mm/init_64.c between commit 37b3a8ff3e08 ("sparc64: Move from > 4MB to 8MB huge pages") from the sparc-next tree and commit

linux-next: manual merge of the akpm tree with the sparc-next tree

2013-11-14 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in arch/sparc/mm/init_64.c between commit 37b3a8ff3e08 ("sparc64: Move from 4MB to 8MB huge pages") from the sparc-next tree and commit "sparc: handle pgtable_page_ctor() fail" from the akpm tree. I fixed it up (see below) and ca

Re: linux-next: manual merge of the akpm tree with the sparc-next tree

2013-03-21 Thread David Miller
From: Stephen Rothwell Date: Thu, 21 Mar 2013 16:33:28 +1100 > Today's linux-next merge of the akpm tree got a conflict in > arch/sparc/mm/init_64.c between commit ce835e513a93 ("sparc64: Do not > change num_physpages during initmem freeing") from the sparc-next tree > and commit "mm/SPARC: use c

linux-next: manual merge of the akpm tree with the sparc-next tree

2013-03-20 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in arch/sparc/mm/init_64.c between commit ce835e513a93 ("sparc64: Do not change num_physpages during initmem freeing") from the sparc-next tree and commit "mm/SPARC: use common help functions to free reserved pages" from the akpm