* linux-next: manual merge of the driver-core tree with the trivial tree
@ 2009-06-03 7:13 Stephen Rothwell
2009-06-03 8:08 ` Jiri Kosina
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2009-06-03 7:13 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Matt LaPlante, Jiri Kosina, GeunSik Lim
[-- Attachment #1: Type: text/plain, Size: 704 bytes --]
Hi Greg,
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the driver-core tree with the trivial tree
2009-06-03 7:13 linux-next: manual merge of the driver-core tree with the trivial tree Stephen Rothwell
@ 2009-06-03 8:08 ` Jiri Kosina
2009-06-03 14:59 ` Greg KH
0 siblings, 1 reply; 3+ messages in thread
From: Jiri Kosina @ 2009-06-03 8:08 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Greg KH, linux-next, linux-kernel, Matt LaPlante, GeunSik Lim
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.
Thanks,
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the driver-core tree with the trivial tree
2009-06-03 8:08 ` Jiri Kosina
@ 2009-06-03 14:59 ` Greg KH
0 siblings, 0 replies; 3+ messages in thread
From: Greg KH @ 2009-06-03 14:59 UTC (permalink / raw)
To: Jiri Kosina
Cc: Stephen Rothwell, linux-next, linux-kernel, Matt LaPlante, GeunSik Lim
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-06-03 15:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-06-03 7:13 linux-next: manual merge of the driver-core tree with the trivial tree Stephen Rothwell
2009-06-03 8:08 ` Jiri Kosina
2009-06-03 14:59 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).