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,
"K. Y. Srinivasan" <kys@microsoft.com>,
Thomas Meyer <thomas@m3y3r.de>, Jiri Kosina <jikos@jikos.cz>
Subject: Re: linux-next: manual merge of the staging tree with the hid tree
Date: Thu, 1 Dec 2011 10:39:56 -0800 [thread overview]
Message-ID: <20111201183956.GA32559@kroah.com> (raw)
In-Reply-To: <20111201035113.GA7647@kroah.com>
On Wed, Nov 30, 2011 at 07:51:13PM -0800, Greg KH wrote:
> On Thu, Dec 01, 2011 at 02:39:52PM +1100, Stephen Rothwell wrote:
> > Hi Greg,
> >
> > Today's linux-next merge of the staging tree got a conflict in
> > drivers/hid/hid-hyperv.c between commit b95f5bcb811e ("HID: Move the
> > hid-hyperv driver out of staging") from the hid tree and various commits
> > from the staging tree (this was drivers/staging/hv/hv_mouse.c).
> >
> > The commit message says that all the changes that happened when this file
> > moved from staging have also been applied to the staging file, so I just
> > used the version from the hid tree.
>
> Ok, that's fine, Jiri, want me to just delete the driver from my tree
> now to remove any of these conflicts?
I've removed it from my tree now.
thanks,
greg k-h
next prev parent reply other threads:[~2011-12-01 18:40 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-01 3:39 linux-next: manual merge of the staging tree with the hid tree Stephen Rothwell
2011-12-01 3:51 ` Greg KH
2011-12-01 10:12 ` KY Srinivasan
2011-12-01 19:46 ` Jiri Kosina
2011-12-01 19:54 ` KY Srinivasan
2011-12-01 18:39 ` Greg KH [this message]
2011-12-01 19:42 ` Jiri Kosina
2011-12-01 3:40 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=20111201183956.GA32559@kroah.com \
--to=greg@kroah.com \
--cc=jikos@jikos.cz \
--cc=kys@microsoft.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=thomas@m3y3r.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).