From: Alan Cox <alan@lxorguk•ukuu.org.uk>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org
Subject: Re: linux-next: manual merge of the ttydev tree
Date: Tue, 22 Jul 2008 11:31:58 +0100 [thread overview]
Message-ID: <20080722113158.3ad57716@lxorguk.ukuu.org.uk> (raw)
In-Reply-To: <20080722163754.715cf9cb.sfr@canb.auug.org.au>
On Tue, 22 Jul 2008 16:37:54 +1000
Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Hi Alan,
>
> Today's linux-next merge of the ttydev tree got conflicts in
> drivers/char/istallion.c, drivers/char/mxser.c, drivers/char/specialix.c,
> drivers/char/synclink_gt.c, drivers/char/tty_io.c,
> drivers/usb/gadget/serial.c, drivers/usb/serial/cp2101.c,
> drivers/usb/serial/io_ti.c, drivers/usb/serial/ir-usb.c,
> drivers/usb/serial/usb-serial.c, include/linux/tty.h and
> net/bluetooth/rfcomm/tty.c mainly against Linus' tree.
>
> This is not unexpected since some of the ttydev tree has been merged, so I
> will drop it for today in the hope that things are better tomorrow.
I've fired the rest of the ttydev tree at Linus this morning now that
clashing stuff seems to have stopped being merged for a few hours. At
that point the ttydev tree should be empty. Andrew will push a few ip2
patches directly. Hopefully now there is a real tty devel tree it'll have
less clashes in future.
Thanks for the help in getting started with linux-next btw.
Alan
next prev parent reply other threads:[~2008-07-22 10:49 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-22 6:37 linux-next: manual merge of the ttydev tree Stephen Rothwell
2008-07-22 10:31 ` Alan Cox [this message]
-- 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-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:33 Stephen Rothwell
2008-07-12 18:59 ` Jesper Juhl
2008-07-12 20:29 ` Alan Cox
2008-07-13 1:20 ` 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=20080722113158.3ad57716@lxorguk.ukuu.org.uk \
--to=alan@lxorguk$(echo .)ukuu.org.uk \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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