Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932449AbbKQXPS (ORCPT ); Tue, 17 Nov 2015 18:15:18 -0500 Received: from ozlabs.org ([103.22.144.67]:37649 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754789AbbKQXPP (ORCPT ); Tue, 17 Nov 2015 18:15:15 -0500 Date: Wed, 18 Nov 2015 10:15:12 +1100 From: Stephen Rothwell To: Stephen Warren , Colin Cross , Olof Johansson , Thierry Reding , Simon Horman Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Kuninori Morimoto , Magnus Damm Subject: linux-next: manual merge of the tegra tree with the renesas tree Message-ID: <20151118101512.0691d12f@canb.auug.org.au> X-Mailer: Claws Mail 3.13.0 (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: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1226 Lines: 43 Hi all, Today's linux-next merge of the tegra tree got a conflict in: arch/arm64/configs/defconfig between commit: 727e8d0126e3 ("arm64: defconfig: renesas: Enable Renesas r8a7795 SoC") from the renesas tree and commit: 0a31289369f8 ("arm64: defconfig: Enable serial-tegra driver") from the tegra tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc arch/arm64/configs/defconfig index a260e3a46f01,3852c51330e2..000000000000 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@@ -118,9 -116,7 +118,10 @@@ CONFIG_SERIAL_SAMSUNG= CONFIG_SERIAL_SAMSUNG_UARTS_4=y CONFIG_SERIAL_SAMSUNG_UARTS=4 CONFIG_SERIAL_SAMSUNG_CONSOLE=y +CONFIG_SERIAL_SH_SCI=y +CONFIG_SERIAL_SH_SCI_NR_UARTS=11 +CONFIG_SERIAL_SH_SCI_CONSOLE=y + CONFIG_SERIAL_TEGRA=y CONFIG_SERIAL_MSM=y CONFIG_SERIAL_MSM_CONSOLE=y CONFIG_SERIAL_OF_PLATFORM=y -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/