From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932966AbaESUXf (ORCPT ); Mon, 19 May 2014 16:23:35 -0400 Received: from v094114.home.net.pl ([79.96.170.134]:51588 "HELO v094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S932478AbaESUXd (ORCPT ); Mon, 19 May 2014 16:23:33 -0400 From: "Rafael J. Wysocki" To: Stephen Rothwell , Kukjin Kim Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jonghwan Choi , Chanwoo Choi Subject: Re: linux-next: manual merge of the pm tree with the samsung tree Date: Mon, 19 May 2014 22:40:28 +0200 Message-ID: <1911725.FzcK6v311f@vostro.rjw.lan> User-Agent: KMail/4.11.5 (Linux/3.15.0-rc5+; KDE/4.11.5; x86_64; ; ) In-Reply-To: <20140519125124.6504764d@canb.auug.org.au> References: <20140519125124.6504764d@canb.auug.org.au> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Monday, May 19, 2014 12:51:24 PM Stephen Rothwell wrote: > > --Sig_/n+GoYBpTr9ERl.sTIEYr/Og > Content-Type: text/plain; charset=US-ASCII > Content-Transfer-Encoding: quoted-printable > > Hi Rafael, > > Today's linux-next merge of the pm tree got conflicts in > drivers/cpufreq/exynos-cpufreq.c and drivers/cpufreq/exynos-cpufreq.h > between commit 2b07f4085479 ("cpufreq: exynos: Fix the compile error") > from the samsung tree and commit e5eaa445b0dc ("cpufreq: exynos: Use > dev_err/info function instead of pr_err/info") from the pm tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). Thanks for fixing that Stephen! Kukjin, are you going to handle all Exynos cpufreq commits in the future? Rafael