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 S933403AbcCNCTH (ORCPT <rfc822;w@1wt.eu>);
	Sun, 13 Mar 2016 22:19:07 -0400
Received: from ozlabs.org ([103.22.144.67]:52325 "EHLO ozlabs.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S933354AbcCNCSz (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Sun, 13 Mar 2016 22:18:55 -0400
Date: Mon, 14 Mar 2016 13:18:52 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
        "H. Peter Anvin" <hpa@zytor.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Ralf Baechle <ralf@linux-mips.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        Qais Yousef <qais.yousef@imgtec.com>,
        Hauke Mehrtens <hauke@hauke-m.de>
Subject: linux-next: manual merge of the tip tree with the mips tree
Message-ID: <20160314131852.20068d5a@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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  arch/mips/Kconfig

between commit:

  7a50e4688dab ("MIPS: Fix build error when SMP is used without GIC")

from the mips tree and commit:

  7eb8c99db26c ("MIPS: Delete smp-gic.c")

from the tip tree.

I fixed it up (I used the tip tree version since that removed the lines
updated by the mips tree patch) and can carry the fix as necessary
(no action is required).

-- 
Cheers,
Stephen Rothwell