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 S1752276AbcAFIHh (ORCPT <rfc822;w@1wt.eu>);
	Wed, 6 Jan 2016 03:07:37 -0500
Received: from mx2.suse.de ([195.135.220.15]:51872 "EHLO mx2.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751997AbcAFIHe (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Wed, 6 Jan 2016 03:07:34 -0500
Subject: Re: linux-next: manual merge of the akpm-current tree with the kbuild
 tree
To: Stephen Rothwell <sfr@canb.auug.org.au>,
        Andrew Morton <akpm@linux-foundation.org>
References: <20160106175423.07e00c12@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
From: Michal Marek <mmarek@suse.cz>
Message-ID: <568CCB42.7090203@suse.cz>
Date: Wed, 6 Jan 2016 09:07:30 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101
 Thunderbird/38.3.0
MIME-Version: 1.0
In-Reply-To: <20160106175423.07e00c12@canb.auug.org.au>
Content-Type: text/plain; charset=windows-1252
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

On 2016-01-06 07:54, Stephen Rothwell wrote:
> Hi Andrew,
> 
> Today's linux-next merge of the akpm-current tree got a conflict in:
> 
>   scripts/tags.sh
> 
> between commit:
> 
>   93209d65c1d3 ("tags: Unify emacs and exuberant rules")
> 
> from the kbuild tree and commit:
> 
>   ef0e95208c33 ("page-flags: drop __TestClearPage*() helpers")
> 
> from the akpm-current tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

That's correct, thanks.

Michal