[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20150320123303.GI2869@sirena.org.uk>
Date: Fri, 20 Mar 2015 12:33:03 +0000
From: Mark Brown <broonie@...nel.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Jonathan Corbet <corbet@....net>, linux-next@...r.kernel.org,
linux-kernel@...r.kernel.org,
Adrian Remonda <adrianremonda@...il.com>
Subject: Re: linux-next: manual merge of the spi tree with the jc_docs tree
On Fri, Mar 20, 2015 at 04:23:54PM +1100, Stephen Rothwell wrote:
> Clearly the one commit in the jc_docs tree is supposed to do the same
> as three commits in the spi tree. The jc_docs tree version has an
> older Author date, but a newer commit date ...
> I fixed it up (by using the spi tree version of the file) and can carry
> the fix as necessary (no action is required).
That's the fix I'd expect, thanks.
> BTW, there is a function in there called "unespcape" whose comment
> calls it "Unescape" which would make more sense.
Probably, yes...
Download attachment "signature.asc" of type "application/pgp-signature" (474 bytes)
Powered by blists - more mailing lists