Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756190AbbBCSZN (ORCPT ); Tue, 3 Feb 2015 13:25:13 -0500 Received: from mail-ie0-f177.google.com ([209.85.223.177]:43245 "EHLO mail-ie0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756096AbbBCSZL convert rfc822-to-8bit (ORCPT ); Tue, 3 Feb 2015 13:25:11 -0500 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8BIT To: Stephen Rothwell , "Olof Johansson" , "Arnd Bergmann" , linux-arm-kernel@lists.infradead.org From: Mike Turquette In-Reply-To: <20150203163140.3edfe607@canb.auug.org.au> Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "Tero Kristo" , "Tony Lindgren" References: <20150203163140.3edfe607@canb.auug.org.au> Message-ID: <20150203182505.421.11849@quantum> User-Agent: alot/0.3.5 Subject: Re: linux-next: manual merge of the clk tree with the arm-soc tree Date: Tue, 03 Feb 2015 10:25:05 -0800 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 849 Lines: 26 Quoting Stephen Rothwell (2015-02-02 21:31:40) > Hi Mike, > > Today's linux-next merge of the clk tree got a conflict in > arch/arm/mach-omap2/cclock3xxx_data.c between commit ca662ee7b8a8 > ("ARM: OMAP2+: Remove unused ti81xx platform init code") from the > arm-soc tree and commit d6540b193719 ("ARM: OMAP3: remove legacy clock > data") from the clk tree. > > I fixed it up (the latter removed the file, so I did that) and can > carry the fix as necessary (no action is required). That is the correct fix. Thanks, Mike > > -- > Cheers, > Stephen Rothwell sfr@canb.auug.org.au -- 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/