From: Greg KH <gregkh@linuxfoundation.org>
To: "Winkler, Tomas" <tomas.winkler@intel.com>
Cc: "arnd@arndb.de" <arnd@arndb.de>,
"alan@linux.intel.com" <alan@linux.intel.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [char-misc-next] mei: use module_pci_driver
Date: Wed, 18 Jul 2012 06:24:39 -0700 [thread overview]
Message-ID: <20120718132439.GA18827@kroah.com> (raw)
In-Reply-To: <5B8DA87D05A7694D9FA63FD143655C1B143952@HASMSX103.ger.corp.intel.com>
On Wed, Jul 18, 2012 at 07:42:32AM +0000, Winkler, Tomas wrote:
> > > Right, my mistake I haven't checked it directly with your tree, I
> > > need to wait till you merge the upstream in.
> >
> > Merge what "upstream"?
>
> The doesn't apply because the
> commit a44cab4aff7e72e7052521121fd8ceca51351534
> misc: mei: unregister misc device in pci_remove function
>
> is only in Linus' master branch.
>
> Your branch char-misc-next is still at v3.5-rc2
> I believe that in some point you'll merge the whole Linus' master
> branch into your char-misc-next branch, right?
Ah, yes, sorry, I didn't realize we needed the merge. It's now done.
Care to resend your patch (in the proper format as discussed) so that I
can queue it up?
thanks,
greg k-h
prev parent reply other threads:[~2012-07-18 13:24 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-17 8:23 [char-misc-next] mei: use module_pci_driver Tomas Winkler
2012-07-17 8:23 ` Tomas Winkler
2012-07-17 12:41 ` Arnd Bergmann
2012-07-17 13:01 ` Winkler, Tomas
2012-07-17 17:17 ` Greg KH
2012-07-17 20:04 ` Winkler, Tomas
2012-07-17 20:40 ` Greg KH
2012-07-18 7:42 ` Winkler, Tomas
2012-07-18 13:24 ` Greg KH [this message]
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=20120718132439.GA18827@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=alan@linux.intel.com \
--cc=arnd@arndb.de \
--cc=linux-kernel@vger.kernel.org \
--cc=tomas.winkler@intel.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.