From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Matt LaPlante <kernel1@cyberdogtech.com>,
Jiri Kosina <jkosina@suse.cz>, GeunSik Lim <leemgs1@gmail.com>
Subject: linux-next: manual merge of the driver-core tree with the trivial tree
Date: Wed, 3 Jun 2009 17:13:12 +1000 [thread overview]
Message-ID: <20090603171312.b80e30bb.sfr@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2009-06-03 7:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-03 7:13 Stephen Rothwell [this message]
2009-06-03 8:08 ` Jiri Kosina
2009-06-03 14:59 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090603171312.b80e30bb.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=greg@kroah.com \
--cc=jkosina@suse.cz \
--cc=kernel1@cyberdogtech.com \
--cc=leemgs1@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®