Hi Nick, Jesper,
On Mon, 28 Jul 2008 19:41:10 +1000 Nick Andrew <nick@xxxxxxxxxxxxxxx> wrote:
>
> On Mon, Jul 28, 2008 at 01:37:07PM +1000, Stephen Rothwell wrote:
> > Today's linux-next merge of the trivial tree got a conflict in
> > Documentation/edac.txt between commit
> > 327dafb1c61c9da7b95ac6cc7634a2340cc9509c ("edac: core fix redundant sysfs
> > controls to parameters") from Linus' tree and commit
> > 0bb08241ce68aaa70b7b804b4d6319d8bad3ae24 ("Tighten up the use of loose")
> > from the trivial tree.
>
> Should we drop the patch or alternately split it into one patch
> per affected file? This must be at least the 3rd time this patch
> has conflicted with other changes.
Can you send all of the trivial tree (that is in -next) to Linus (asking
nicely if he will take it), please? Doing that will require rebasing at
least the above patch (or merging Linus' tree (at least up to the commit
above)) and fixing the conflicts. It has been in its current state since
May 20 ...
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpIpLKMYKSnL.pgp
Description: PGP signature
