From: Johannes Berg <johannes@sipsolutions.net>
To: Jiri Kosina <jkosina@suse.cz>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Matt LaPlante <kernel1@cyberdogtech.com>,
"John W. Linville" <linville@tuxdriver.com>
Subject: Re: linux-next: manual merge of the trivial tree with the wireless tree
Date: Wed, 03 Jun 2009 10:14:11 +0200 [thread overview]
Message-ID: <1244016851.7176.32.camel@johannes.local> (raw)
In-Reply-To: <alpine.LNX.2.00.0906031006270.7457@wotan.suse.de>
[-- Attachment #1: Type: text/plain, Size: 952 bytes --]
On Wed, 2009-06-03 at 10:07 +0200, Jiri Kosina wrote:
> On Wed, 3 Jun 2009, Stephen Rothwell wrote:
>
> > Today's linux-next merge of the trivial tree got a conflict in
> > Documentation/rfkill.txt between commit
> > c6d660ce29295d344fcdc3654274b4a0aad1a9c8 ("rfkill: rewrite") from the
> > wireless tree and commit 9976d9daf91d146724ad9c336f74c60d2195c386
> > ("trivial: Miscellaneous documentation typo fixes") from the trivial
> > tree.
> > I just used the version from the wireless tree since it has been
> > basically rewritten there (except I applied the "transmiter" to
> > "transmitter" fix - see below). Maybe the part of the trivial tree patch
> > that affects this file should be dropped.
>
> Hi,
>
> thanks for letting me know. I have dropped the Documentation/rfkill.txt
> hunk completely.
>
> Wireless guys, will you please apply the transmiter -> transmitter fix to
> your tree?
Will do.
johannes
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]
next prev parent reply other threads:[~2009-06-03 8:18 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-03 5:22 linux-next: manual merge of the trivial tree with the wireless tree Stephen Rothwell
2009-06-03 8:07 ` Jiri Kosina
2009-06-03 8:14 ` Johannes Berg [this message]
2009-11-17 4:49 Stephen Rothwell
2009-11-17 22:18 ` Jiri Kosina
2009-11-17 23:38 ` Stephen Rothwell
2011-04-11 3:28 Stephen Rothwell
2011-04-11 15:15 ` Justin P. Mattock
2011-04-11 15:17 ` Jiri Kosina
2011-04-11 15:24 ` Justin P. Mattock
2011-04-13 9:14 ` Jiri Kosina
2011-04-27 1:43 Stephen Rothwell
2011-04-27 9:22 ` Jiri Kosina
2013-08-21 4:20 Stephen Rothwell
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=1244016851.7176.32.camel@johannes.local \
--to=johannes@sipsolutions.net \
--cc=jkosina@suse.cz \
--cc=kernel1@cyberdogtech.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=sfr@canb.auug.org.au \
/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;
as well as URLs for NNTP newsgroup(s).