From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"Justin P. Mattock" <justinmattock@gmail•com>
Subject: Re: linux-next: manual merge of the staging tree with the usb tree
Date: Fri, 11 May 2012 07:44:02 -0700 [thread overview]
Message-ID: <20120511144402.GB5958@kroah.com> (raw)
In-Reply-To: <20120511151236.c554c07acc0f5809eaeb85b8@canb.auug.org.au>
On Fri, May 11, 2012 at 03:12:36PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/quatech_usb2/quatech_usb2.c between commit 38902cf9f6be
> ("USB: remove staging quatech_usb2 driver") from the usb tree and a
> couple of commits from the staging tree.
>
> The former removes the file, so I did that.
Wonderful, thanks for doing that.
greg k-h
next prev parent reply other threads:[~2012-05-11 14:44 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-11 5:12 linux-next: manual merge of the staging tree with the usb tree Stephen Rothwell
2012-05-11 14:44 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-05-01 4:09 Stephen Rothwell
2017-05-04 23:42 ` Greg KH
2013-06-18 4:55 Stephen Rothwell
2013-06-18 16:03 ` Greg KH
2012-09-19 4:35 Stephen Rothwell
2012-09-19 7:18 ` Greg KH
2012-04-24 4:48 Stephen Rothwell
2012-04-24 14:45 ` Greg KH
2012-04-23 5:11 Stephen Rothwell
2012-04-23 16:38 ` Greg KH
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=20120511144402.GB5958@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=justinmattock@gmail$(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