From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marc Zyngier Subject: Re: linux-next: manual merge of the pm tree with the omap tree Date: Mon, 19 Oct 2015 08:16:03 +0100 Message-ID: <20151019081603.0c5fbba8@arm.com> References: <20151019115908.7f4d59d2@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from foss.arm.com ([217.140.101.70]:47981 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751618AbbJSHQN (ORCPT ); Mon, 19 Oct 2015 03:16:13 -0400 In-Reply-To: <20151019115908.7f4d59d2@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: "Rafael J. Wysocki" , Tony Lindgren , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Felipe Balbi On Mon, 19 Oct 2015 11:59:08 +1100 Stephen Rothwell wrote: Hi Stephen, > Hi Rafael, > > Today's linux-next merge of the pm tree got a conflict in: > > arch/arm/mach-omap2/timer.c > > between commits: > > 3afbb9afe2c4 ("arm: omap2: timer: move realtime_counter_init() around") > 9c46ffcd5214 ("arm: omap2: timer: always call clocksource_of_init() when DT") > > from the omap tree and commit: > > 3722ed2380ad ("clocksource: cosmetic: Drop OF 'dependency' from symbols") > > from the pm tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). > [...] Looks great, thanks! M. -- Jazz is not dead. It just smells funny. From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753269AbbJSHQP (ORCPT ); Mon, 19 Oct 2015 03:16:15 -0400 Received: from foss.arm.com ([217.140.101.70]:47981 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751618AbbJSHQN (ORCPT ); Mon, 19 Oct 2015 03:16:13 -0400 Date: Mon, 19 Oct 2015 08:16:03 +0100 From: Marc Zyngier To: Stephen Rothwell Cc: "Rafael J. Wysocki" , Tony Lindgren , , , Felipe Balbi Subject: Re: linux-next: manual merge of the pm tree with the omap tree Message-ID: <20151019081603.0c5fbba8@arm.com> In-Reply-To: <20151019115908.7f4d59d2@canb.auug.org.au> References: <20151019115908.7f4d59d2@canb.auug.org.au> Organization: ARM Ltd X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; arm-unknown-linux-gnueabihf) 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 On Mon, 19 Oct 2015 11:59:08 +1100 Stephen Rothwell wrote: Hi Stephen, > Hi Rafael, > > Today's linux-next merge of the pm tree got a conflict in: > > arch/arm/mach-omap2/timer.c > > between commits: > > 3afbb9afe2c4 ("arm: omap2: timer: move realtime_counter_init() around") > 9c46ffcd5214 ("arm: omap2: timer: always call clocksource_of_init() when DT") > > from the omap tree and commit: > > 3722ed2380ad ("clocksource: cosmetic: Drop OF 'dependency' from symbols") > > from the pm tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). > [...] Looks great, thanks! M. -- Jazz is not dead. It just smells funny.