From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754994AbcJFCoE (ORCPT ); Wed, 5 Oct 2016 22:44:04 -0400 Received: from ozlabs.org ([103.22.144.67]:59147 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754120AbcJFCoD (ORCPT ); Wed, 5 Oct 2016 22:44:03 -0400 Date: Thu, 6 Oct 2016 13:43:57 +1100 From: Stephen Rothwell To: Andrew Morton , Tejun Heo , Rusty Russell , Christoph Lameter , Ingo Molnar Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, zijun_hu Subject: linux-next: manual merge of the akpm-current tree with the percpu tree Message-ID: <20161006134357.06fe5655@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: mm/percpu.c between commits: 93c76b6b2faa ("mm/percpu.c: correct max_distance calculation for pcpu_embed_first_chunk()") 9b7396624a7b ("mm/percpu.c: fix potential memory leakage for pcpu_embed_first_chunk()") from the percpu tree and commit: 567f646230a5 ("mm/percpu.c: correct max_distance calculation for pcpu_embed_first_chunk()") from the akpm-current tree. There is one small differenve between 567f646230a5 and 9b7396624a7b and then further changes in 93c76b6b2faa. I fixed it up (using the percpu tree version) 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