From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751675AbcFVFZS (ORCPT ); Wed, 22 Jun 2016 01:25:18 -0400 Received: from ozlabs.org ([103.22.144.67]:45130 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751214AbcFVFZO (ORCPT ); Wed, 22 Jun 2016 01:25:14 -0400 Date: Wed, 22 Jun 2016 14:58:16 +1000 From: Stephen Rothwell To: Andrew Morton , Kees Cook Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Emese Revfy , Vladimir Davydov Subject: linux-next: manual merge of the akpm-current tree with the kspp tree Message-ID: <20160622145816.6451b896@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/page_alloc.c between commit: 0df42965deb7 ("latent_entropy: Add the extra_latent_entropy kernel parameter") from the kspp tree and commit: 6f4f5445297d ("mm: charge/uncharge kmemcg from generic page allocator paths") 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 mm/page_alloc.c index 02c7a0e6e66a,180f5afc5a1f..000000000000 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@@ -63,7 -63,7 +63,8 @@@ #include #include #include +#include + #include #include #include