From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org,
Elina Pasheva <epasheva@sierrawireless•com>,
Alan Cox <alan@lxorguk•ukuu.org.uk>
Subject: Re: linux-next: manual merge of the usb tree with the ttydevtree
Date: Wed, 29 Apr 2009 10:52:49 -0700 [thread overview]
Message-ID: <20090429175249.GB29144@kroah.com> (raw)
In-Reply-To: <20090429162228.752887ac.sfr@canb.auug.org.au>
On Wed, Apr 29, 2009 at 04:22:28PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/serial/sierra.c between commit
> e675a5b8305a4d244273c34698ba411ddcc0f42a ("tty-usb-use-port") from the
> ttydev tree and commit 7b8163621c22ea34636314da663b9cdea50342be ("USB:
> serial: sierra driver debug info visibility improvement") from the usb
> tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Looks good to me, thanks.
Alan, are your changes going to be for .30, or are they pending for .31?
thanks,
greg k-h
next prev parent reply other threads:[~2009-04-29 17:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-29 6:22 linux-next: manual merge of the usb tree with the ttydevtree Stephen Rothwell
2009-04-29 17:52 ` Greg KH [this message]
2009-04-30 3:27 ` 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=20090429175249.GB29144@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=alan@lxorguk$(echo .)ukuu.org.uk \
--cc=epasheva@sierrawireless$(echo .)com \
--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