Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752017AbbEFQKe (ORCPT ); Wed, 6 May 2015 12:10:34 -0400 Received: from hqemgate15.nvidia.com ([216.228.121.64]:11068 "EHLO hqemgate15.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751878AbbEFQKc (ORCPT ); Wed, 6 May 2015 12:10:32 -0400 X-PGP-Universal: processed; by hqnvupgp07.nvidia.com on Wed, 06 May 2015 09:09:04 -0700 Message-ID: <554A3CF7.6070503@nvidia.com> Date: Wed, 6 May 2015 12:10:31 -0400 From: Rhyland Klein User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: Thierry Reding CC: Peter De Schrijver , Mike Turquette , Stephen Warren , Stephen Boyd , Alexandre Courbot , , , Subject: Re: [PATCH v4 00/20] Tegra210 Clock Support References: <1430757460-9478-1-git-send-email-rklein@nvidia.com> <20150505131419.GA11535@ulmo.nvidia.com> <5548E7E9.3040802@nvidia.com> <20150506133748.GD9421@ulmo> In-Reply-To: <20150506133748.GD9421@ulmo> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2646 Lines: 72 On 5/6/2015 9:37 AM, Thierry Reding wrote: > * PGP Signed by an unknown key > > On Tue, May 05, 2015 at 11:55:21AM -0400, Rhyland Klein wrote: >> On 5/5/2015 9:14 AM, Thierry Reding wrote: >>>> Old Signed by an unknown key >>> >>> On Mon, May 04, 2015 at 12:37:20PM -0400, Rhyland Klein wrote: >>>> This patch series updates the tegra common clock driver and adds >>>> support for the Tegra210 clocks. The clocks in Tegra210 changed >>>> significantly in some ways from earlier generations, so to support >>>> them, we need to extend our base framework a bit and add some new >>>> features. >>>> >>>> Some patches here also address issues found while adding features >>>> and other cleanup type work. >>>> >>>> v4: >>>> - Fixed minor checkpatch errors and other typos >>>> - Rebased ontop of linux-next 20150504 >>> >>> Are you sure about this? It still doesn't apply cleanly to next-20150504 >>> for me. >> >> It is based off c9256b89d92154cffd36697b412d0a0176a8e2d2 "Add linux-next >> specific files for 20150504" >> >> What types of problems are you running into? > > I get this when applying the first patch: > > Applying: clk: tegra: Modify tegra_audio_clk_init to accept more plls > error: patch failed: drivers/clk/tegra/clk.h:258 > error: drivers/clk/tegra/clk.h: patch does not apply > Patch failed at 0001 clk: tegra: Modify tegra_audio_clk_init to accept more plls > The copy of the patch that failed is found in: > /home/thierry.reding/src/kernel/linux-work.git/.git/rebase-apply/patch > When you have resolved this problem, run "git am --continue". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort". > > Comparing again and looking at your internal tree it seems that in > addition to next-20150504 you also have this patch in your tree: > > clk: tegra: Fix comments for structure definitions > > After applying that I can apply the series without problems. I've picked > that patch up and will carry it in the Tegra clock branch. Hopefully the > Tegra210 clock patches will be ready in time for v4.2 so that I can take > them into the same branch. > > Thierry Ahh yes. I sent that patch a while back and Peter added his ack, but it isn't present in linux-next, and I had it in my tree. Sorry for the confusion. -rhyland > > * Unknown Key > * 0x7F3EB3A1 > -- nvpublic -- 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/