lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Date:	Sun, 15 Dec 2013 22:14:02 -0800
From:	Mike Turquette <mturquette@...aro.org>
To:	Alex Elder <alex.elder@...aro.org>
Cc:	Christian Daudt <bcm@...thebug.org>,
	Ian Campbell <ijc+devicetree@...lion.org.uk>,
	Mark Rutland <mark.rutland@....com>,
	Pawel Moll <pawel.moll@....com>,
	Rob Herring <rob.herring@...xeda.com>,
	Rob Landley <rob@...dley.net>,
	Russell King <linux@....linux.org.uk>,
	Stephen Warren <swarren@...dotorg.org>,
	Tim Kryger <tim.kryger@...aro.org>,
	"bcm-kernel-feedback-list@...adcom.com" 
	<bcm-kernel-feedback-list@...adcom.com>,
	"devicetree@...r.kernel.org" <devicetree@...r.kernel.org>,
	"linux-arm-kernel@...ts.infradead.org" 
	<linux-arm-kernel@...ts.infradead.org>,
	"linux-doc@...r.kernel.org" <linux-doc@...r.kernel.org>,
	LKML <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v2 2/3] clk: bcm281xx: add initial clock framework support

On Sun, Dec 15, 2013 at 8:29 PM, Alex Elder <alex.elder@...aro.org> wrote:
> In the mean time, I have created a new branch that
> is based on v3.13-rc4 (and includes Tim's prerequisite
> patches).  Pull request (still wrapped my my mailer)
> is below.

Hi Alex,

This isn't a mess but is pretty normal. Can you create a new branch
with only your 2 clock patches applied on top of my clk-next branch?
You should merge "ARM: dts: bcm281xx: define real clocks" through the
arm-soc tree. Then you can send another pull request to me which has
just the 2 bcm clock patches based on clk-next and everything will
eventually end up linux-next all together.

Just FYI if I took your pull request as-is then the clk-next tree
would become polluted with lots of extra bcm patches.

Regards,
Mike
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux - Powered by OpenVZ