From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jiri Kosina <jkosina@suse.cz>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"\"André Goddard Rosa\"" <andre.goddard@gmail.com>,
"Bartlomiej Zolnierkiewicz" <bzolnier@gmail.com>,
"John W. Linville" <linville@tuxdriver.com>
Subject: linux-next: manual merge of the trivial tree with the wireless tree
Date: Tue, 17 Nov 2009 15:49:57 +1100 [thread overview]
Message-ID: <20091117154957.a23c959b.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 559 bytes --]
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
drivers/net/wireless/rt2x00/rt2800usb.h between various commits from the
wireless tree and commit 17530b1c635dfd1f258afc6b07b986b425d66ebd
("tree-wide: fix assorted typos all over the place") from the trivial
tree.
The wireless tree commits moved the code fixed by the trivial tree, but
also fixed it along the way, so I have ignored the trivial fixup for this
file.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next reply other threads:[~2009-11-17 4:49 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-17 4:49 Stephen Rothwell [this message]
2009-11-17 22:18 ` linux-next: manual merge of the trivial tree with the wireless tree Jiri Kosina
2009-11-17 23:38 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2013-08-21 4:20 Stephen Rothwell
2011-04-27 1:43 Stephen Rothwell
2011-04-27 9:22 ` Jiri Kosina
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
2009-06-03 5:22 Stephen Rothwell
2009-06-03 8:07 ` Jiri Kosina
2009-06-03 8:14 ` Johannes Berg
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=20091117154957.a23c959b.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=andre.goddard@gmail.com \
--cc=bzolnier@gmail.com \
--cc=jkosina@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linville@tuxdriver.com \
/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).