linux-kernel - Re: [char-misc-next] mei: use module_pci

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Wed, 18 Jul 2012 06:24:39 -0700
From:	Greg KH <gregkh@...uxfoundation.org>
To:	"Winkler, Tomas" <tomas.winkler@...el.com>
Cc:	"arnd@...db.de" <arnd@...db.de>,
	"alan@...ux.intel.com" <alan@...ux.intel.com>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [char-misc-next] mei: use module_pci_driver

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/