All of lore.kernel.org
 help / color / mirror / Atom feed
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,
	Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>,
	Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>,
	"John W. Linville" <linville@tuxdriver.com>
Subject: linux-next: manual merge of the trivial tree with the  tree
Date: Mon, 9 Nov 2009 15:43:05 +1100	[thread overview]
Message-ID: <20091109154305.49d3eb7c.sfr@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 599 bytes --]

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
drivers/net/wireless/rt2x00/rt2800usb.c between commit
fcf5154118849cca3cdf424e83f863225d8173e7 ("rt2800: add rt2800lib (part
three)") from the wireless tree and commit
305409a25f7df3c359ba67cbeb62763eeb7156e9 ("tree-wide: fix some typos and
punctuation in comments") from the trivial tree.

The misspelling is moved to a new file
(drivers/net/wireless/rt2x00/rt2800lib.c), but I didn't bother fixing it up.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

             reply	other threads:[~2009-11-09  4:43 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-11-09  4:43 Stephen Rothwell [this message]
2009-11-09  8:45 ` linux-next: manual merge of the trivial tree with the tree Jiri Kosina
2009-11-09 15:08   ` Bartlomiej Zolnierkiewicz
2009-11-09 15:25     ` Jiri Kosina
  -- strict thread matches above, loose matches on Subject: below --
2012-05-22  4:54 Stephen Rothwell
2012-05-22  9:16 ` Jiri Kosina
2012-05-22 11:53   ` John Crispin
2011-06-14  4:31 Stephen Rothwell
2011-06-14  8:42 ` Jiri Kosina
2011-06-14  4:25 Stephen Rothwell
2010-11-09  2:27 Stephen Rothwell
2010-11-19 16:08 ` Jiri Kosina
2010-02-08  4:48 Stephen Rothwell
2010-02-08  4:49 ` Stephen Rothwell
2010-02-09 10:01 ` Jiri Kosina
2009-07-31  4:39 Stephen Rothwell
2009-08-08  0:13 ` Jiri Kosina
2009-08-08  0:46   ` Stephen Rothwell
2009-03-12  4:43 Stephen Rothwell
2009-03-12 10:27 ` Jiri Kosina
2009-02-04  6:59 Stephen Rothwell
2009-02-05 12:59 ` Jiri Kosina
2009-02-05 22:23   ` 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=20091109154305.49d3eb7c.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=bzolnier@gmail.com \
    --cc=cascardo@holoscopio.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.