From: Alan Cox <alan@lxorguk•ukuu.org.uk>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Greg KH <greg@kroah•com>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Elina Pasheva <epasheva@sierrawireless•com>
Subject: Re: linux-next: manual merge of the usb tree with the ttydev tree
Date: Wed, 10 Jun 2009 11:06:17 +0100 [thread overview]
Message-ID: <20090610110617.58e73a37@lxorguk.ukuu.org.uk> (raw)
In-Reply-To: <20090610184114.fe8a849e.sfr@canb.auug.org.au>
On Wed, 10 Jun 2009 18:41:14 +1000
Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Hi Greg, Alan,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/serial/sierra.c between commit
> 968b6bc702be2b0953212f1ca56b1dc889c1c72d ("tty-usb-sierra-add-urb-funcs")
> from the ttydev tree and various commits from the usb tree.
>
> There is some overlap between the ttydev patch and the usb patches. I
> have just used the version of this file from USB tree (since it seems
> that there are many more changes there).
>
> Please sort this out ...
Already working on this and getting all the patches into the ttydev tree.
Sierra are also now checking over my merge to check its ok.
Alan
next prev parent reply other threads:[~2009-06-10 10:05 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-10 8:41 linux-next: manual merge of the usb tree with the ttydev tree Stephen Rothwell
2009-06-10 10:06 ` Alan Cox [this message]
2009-06-10 11:09 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2009-06-05 5:41 Stephen Rothwell
2009-06-05 17:42 ` Greg KH
2009-06-05 5:34 Stephen Rothwell
2009-06-05 17:42 ` Greg KH
2009-06-03 8:13 Stephen Rothwell
2009-06-03 8:07 Stephen Rothwell
2009-06-03 8:55 ` Alan Cox
2009-06-03 10:46 ` Stephen Rothwell
2009-06-03 15:00 ` Greg KH
2009-06-03 7:55 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=20090610110617.58e73a37@lxorguk.ukuu.org.uk \
--to=alan@lxorguk$(echo .)ukuu.org.uk \
--cc=epasheva@sierrawireless$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--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