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: <20110930003214.GB12606@ponder.secretlab.ca>
Date:	Thu, 29 Sep 2011 18:32:14 -0600
From:	Grant Likely <grant.likely@...retlab.ca>
To:	David Miller <davem@...emloft.net>
Cc:	david.daney@...ium.com, devicetree-discuss@...ts.ozlabs.org,
	linux-kernel@...r.kernel.org, netdev@...r.kernel.org
Subject: Re: [PATCH v2 0/3] netdev/of/phy: MDIO bus multiplexer support.

On Thu, Sep 29, 2011 at 04:31:12PM -0400, David Miller wrote:
> From: David Daney <david.daney@...ium.com>
> Date: Tue, 27 Sep 2011 16:26:52 -0700
> 
> > v2: Update bindings to use "reg" and "mdio-parent-bus" insutead of
> >     "cell-index" and "parent-bus"
> 
> Grant, when the final version of this patch set is ready how do
> you want to handle merging it in?
> 
> I think it would be safe to merge this via your tree, since the
> changes made to existing network driver files are rather trivial and
> thus merge conflict friendly.

Your tree or mine, I'm happy either way.  Even if there were
conflicts, they would be trivial.

Sure, I'll take care of merging it when I see an ack from you.

> Actually, I feel like we've discussed this before :-)

:)

g.

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ