From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754639AbdHVG5W (ORCPT ); Tue, 22 Aug 2017 02:57:22 -0400 Received: from ozlabs.org ([103.22.144.67]:48581 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754565AbdHVG5V (ORCPT ); Tue, 22 Aug 2017 02:57:21 -0400 Date: Tue, 22 Aug 2017 16:57:19 +1000 From: Stephen Rothwell To: Andrew Morton , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Vlastimil Babka , Waiman Long Subject: linux-next: manual merge of the akpm-current tree with the tip tree Message-ID: <20170822165719.112d9186@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Andrew, 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()") 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. -- Cheers, Stephen Rothwell diff --cc init/main.c index aea41cf8f9a3,c401e5a38af3..000000000000 --- a/init/main.c +++ b/init/main.c @@@ -658,9 -651,8 +659,8 @@@ asmlinkage __visible void __init start_ initrd_start = 0; } #endif - page_ext_init(); - debug_objects_mem_init(); kmemleak_init(); + debug_objects_mem_init(); setup_per_cpu_pageset(); numa_policy_init(); if (late_time_init)