Messages in this thread | | | Subject | Re: linux-next: manual merge of the akpm-current tree with the tip tree | From | Vlastimil Babka <> | Date | Wed, 23 Aug 2017 08:39:51 +0200 |
| |
On 08/22/2017 08:57 AM, Stephen Rothwell wrote: > Hi Andrew,
Hi,
> Today's linux-next merge of the akpm-current tree got a conflict in: > > init/main.c > > between commit: > > caba4cbbd27d ("debugobjects: Make kmemleak ignore debug objects") > > from the tip tree and commit: > > 50a7dc046b58 ("mm, page_ext: move page_ext_init() after page_alloc_init_late()")
This patch can be also dropped from mmotm. It was a RFC and review suggested a different approach which I didn't get to try yet. (The other patches in the series should be fine to stay in any case).
> from the akpm-current tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. >
| |