From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Alan Cox <alan@lxorguk•ukuu.org.uk>,
Elina Pasheva <epasheva@sierrawireless•com>
Subject: linux-next: manual merge of the usb tree with the ttydev tree
Date: Wed, 10 Jun 2009 18:41:14 +1000 [thread overview]
Message-ID: <20090610184114.fe8a849e.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 580 bytes --]
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 ...
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2009-06-10 8:41 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-10 8:41 Stephen Rothwell [this message]
2009-06-10 10:06 ` linux-next: manual merge of the usb tree with the ttydev tree Alan Cox
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=20090610184114.fe8a849e.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=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 \
/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