Re: linux-next: manual merge of the driver-core tree with thetrivial tree

[Greg KH]

On Wed, Jun 03, 2009 at 10:08:58AM +0200, Jiri Kosina wrote:
> On Wed, 3 Jun 2009, Stephen Rothwell wrote:
> 
> > Today's linux-next merge of the driver-core tree got a conflict in
> > Documentation/trace/ftrace.txt between commit
> > 9976d9daf91d146724ad9c336f74c60d2195c386 ("trivial: Miscellaneous
> > documentation typo fixes") from the trivial tree and commit
> > b6b8b2b9588b3e09fea0da0e86f6b8bcba827b65 ("debugfs: Fix terminology
> > inconsistency of dir name to mount debugfs filesystem") from the
> > driver-core tree.
> > 
> > The latter removes the text that is patched by the former.  I just used
> > the driver-core version.  I suggest that the part of the trivial tree
> > patch that touches this file be dropped.
> 
> Correct, the patch in trivial queue got obsoleted by the driver-core one. 
> I have just dropped the version I had.

Great, thanks for doing this.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/