lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <20140307115517.GI21483@n2100.arm.linux.org.uk> Date: Fri, 7 Mar 2014 11:55:17 +0000 From: Russell King - ARM Linux <linux@....linux.org.uk> To: Philipp Zabel <p.zabel@...gutronix.de> Cc: Mauro Carvalho Chehab <m.chehab@...sung.com>, Grant Likely <grant.likely@...aro.org>, Tomi Valkeinen <tomi.valkeinen@...com>, Guennadi Liakhovetski <g.liakhovetski@....de>, Rob Herring <robh+dt@...nel.org>, Laurent Pinchart <laurent.pinchart@...asonboard.com>, Kyungmin Park <kyungmin.park@...sung.com>, linux-kernel@...r.kernel.org, linux-media@...r.kernel.org, devicetree@...r.kernel.org, Sylwester Nawrocki <s.nawrocki@...sung.com> Subject: Re: [GIT PULL] Move device tree graph parsing helpers to drivers/of On Thu, Mar 06, 2014 at 06:13:20PM +0100, Philipp Zabel wrote: > Hi Mauro, Russell, > > I have temporarily removed the simplified bindings at Sylwester's > request and updated the branch with the acks. The following changes > since commit 0414855fdc4a40da05221fc6062cccbc0c30f169: > > Linux 3.14-rc5 (2014-03-02 18:56:16 -0800) > > are available in the git repository at: > > git://git.pengutronix.de/git/pza/linux.git topic/of-graph Okay, this has all gone wrong. Mauro has applied your changes as patches, and I've pulled this set of changes. So we're going to be all set for merge conflicts....... just fscking great. I really don't know why I bother trying to do the right thing sometimes. -- FTTC broadband for 0.8mile line: now at 9.7Mbps down 460kbps up... slowly improving, and getting towards what was expected from it. -- 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