linux-kernel - Re: [PATCH v6 0/8] Move device tree graph parsing helpers to drivers/of

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1394124630.3622.64.camel@paszta.hi.pengutronix.de>
Date:	Thu, 06 Mar 2014 17:50:30 +0100
From:	Philipp Zabel <p.zabel@...gutronix.de>
To:	Sylwester Nawrocki <s.nawrocki@...sung.com>
Cc:	Russell King - ARM Linux <linux@....linux.org.uk>,
	Tomi Valkeinen <tomi.valkeinen@...com>,
	Mauro Carvalho Chehab <m.chehab@...sung.com>,
	Guennadi Liakhovetski <g.liakhovetski@....de>,
	Grant Likely <grant.likely@...aro.org>,
	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
Subject: Re: [PATCH v6 0/8] Move device tree graph parsing helpers to
 drivers/of

Am Donnerstag, den 06.03.2014, 17:32 +0100 schrieb Sylwester Nawrocki:
> On 06/03/14 17:21, Philipp Zabel wrote:
> > Am Donnerstag, den 06.03.2014, 16:47 +0100 schrieb Sylwester Nawrocki:
> >> Yes, it's going to conflict with my patch series. I thought it could be
> >> put onto a stable a topic branch, e.g. at git://linuxtv.org/media_tree.git,
> >> which could be then pulled into the media master branch and anywhere
> >> else it is needed ?
> > 
> > Mauro, are you ok with handling the conflict in the merge, or should I
> > rebase on top of the media tree after you merged Sylwester's changes?
> 
> I could rebase and resolve any conflicts before sending my pull request
> to Mauro. I don't think it's a good idea to rebase this series onto the
> media tree, since it is touching drivers/of.

Excellent, thanks. I will send a pull request to Mauro and Russell
shortly.

regards
Philipp

--
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/