From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752645AbbHRIrD (ORCPT <rfc822;w@1wt.eu>);
	Tue, 18 Aug 2015 04:47:03 -0400
Received: from ozlabs.org ([103.22.144.67]:34041 "EHLO ozlabs.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751677AbbHRIq7 (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Tue, 18 Aug 2015 04:46:59 -0400
Date: Tue, 18 Aug 2015 18:46:57 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
        Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        Jan Kara <jack@suse.cz>, Vladimir Davydov <vdavydov@parallels.com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the
 v4l-dvb tree
Message-ID: <20150818184657.4df65698@canb.auug.org.au>
In-Reply-To: <20150818184448.439d5c2e@canb.auug.org.au>
References: <20150818184448.439d5c2e@canb.auug.org.au>
X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.28; x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Andrew,

On Tue, 18 Aug 2015 18:44:48 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
> 
>   mm/Kconfig

Also
  mm/Makefile

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au