linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: linux-next@vger.kernel.org, Nick Andrew <nick@nick-andrew.net>,
	Jesper Juhl <jesper.juhl@gmail.com>
Subject: linux-next: manual merge of the ttydev tree
Date: Tue, 1 Jul 2008 21:33:10 +1000	[thread overview]
Message-ID: <20080701213310.3fcdeb8c.sfr@canb.auug.org.au> (raw)

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

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/usb/serial/ftdi_sio.c between commit
0bb08241ce68aaa70b7b804b4d6319d8bad3ae24 ("Tighten up the use of loose")
from the trivial tree and commit ce8194a09dee5b7e101467aba6b7cd5617b1cd0f
("23-usb-serial-api-change") from the ttydev tree.

The conflict is just in a comment.  I have applied the spelling
correction from the former to the version of the file from the ttydev
tree.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

             reply	other threads:[~2008-07-01 11:33 UTC|newest]

Thread overview: 71+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-01 11:33 Stephen Rothwell [this message]
2008-07-12 18:59 ` linux-next: manual merge of the ttydev tree Jesper Juhl
2008-07-12 20:29   ` Alan Cox
2008-07-13  1:20   ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2008-12-11  6:26 Stephen Rothwell
2008-12-11 10:21 ` Alan Cox
2008-12-11 14:46   ` Dan Williams
2008-09-19  2:57 Stephen Rothwell
2008-09-19  2:53 Stephen Rothwell
2008-08-25  8:33 Stephen Rothwell
2008-08-25  8:24 Stephen Rothwell
2008-08-22  5:51 Stephen Rothwell
2008-08-21  8:03 Stephen Rothwell
2008-08-21 10:21 ` Alan Cox
2008-08-21 12:14   ` Stephen Rothwell
2008-08-19  7:43 Stephen Rothwell
2008-08-19 19:57 ` Greg KH
2008-08-18  6:08 Stephen Rothwell
2008-08-14  5:50 Stephen Rothwell
2008-08-12  6:58 Stephen Rothwell
2008-08-12 20:42 ` Greg KH
2008-08-12  6:55 Stephen Rothwell
2008-07-23  6:47 Stephen Rothwell
2008-07-22  6:37 Stephen Rothwell
2008-07-22 10:31 ` Alan Cox
2008-07-21  7:20 Stephen Rothwell
2008-07-18  8:48 Stephen Rothwell
2008-07-18  8:41 Stephen Rothwell
2008-07-18  8:28 Stephen Rothwell
2008-07-18  8:23 Stephen Rothwell
2008-07-18  8:20 Stephen Rothwell
2008-07-18  8:49 ` Alan Cox
2008-07-18 10:49   ` Adrian Bunk
2008-07-18 10:55     ` David Miller
2008-07-18 11:00       ` Adrian Bunk
2008-07-04  9:11 Stephen Rothwell
2008-07-04 15:41 ` Alan Cox
2008-07-01 14:12 Stephen Rothwell
2008-07-01 14:16 ` Alan Cox
2008-07-01 14:09 Stephen Rothwell
2008-07-01 14:14 ` Alan Cox
2008-07-01 14:07 Stephen Rothwell
2008-07-01 14:12 ` Alan Cox
2008-07-01 14:43   ` Adrian Bunk
2008-07-01 15:42     ` Alan Cox
2008-07-01 16:45       ` Adrian Bunk
2008-07-01 14:04 Stephen Rothwell
2008-07-01 13:56 Stephen Rothwell
2008-07-01 13:54 Stephen Rothwell
2008-07-01 13:43 Stephen Rothwell
2008-07-01 12:43 Stephen Rothwell
2008-07-01 14:09 ` Alan Cox
2008-07-01 15:07   ` David Woodhouse
2008-07-01 15:29     ` Alan Cox
2008-07-02  9:01       ` David Woodhouse
2008-07-02  9:17         ` Alan Cox
2008-07-02  9:50           ` David Woodhouse
2008-07-02  9:43             ` Alan Cox
2008-07-01 12:35 Stephen Rothwell
2008-07-01 11:57 Stephen Rothwell
2008-07-01 11:59 ` Felipe Balbi
2008-07-01 15:25   ` Greg KH
2008-07-01 11:44 Stephen Rothwell
2008-07-01 11:37 Stephen Rothwell
2008-07-01 11:23 Stephen Rothwell
2008-07-01 11:17 Stephen Rothwell
2008-07-01 11:10 Stephen Rothwell
2008-07-01 11:56 ` Alan Cox
2008-07-01 16:18   ` David Brownell
2008-07-01 16:27     ` Alan Cox
2008-07-01 10:59 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=20080701213310.3fcdeb8c.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=alan@lxorguk.ukuu.org.uk \
    --cc=jesper.juhl@gmail.com \
    --cc=linux-next@vger.kernel.org \
    --cc=nick@nick-andrew.net \
    /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).