Date: Fri, 28 Oct 2005 13:08:14 -0700
From: Greg KH <greg@kroah.com>
To: Andrew Morton <akpm@osdl.org>, Linus Torvalds <torvalds@osdl.org>,
       gregkh@suse.de, linux-kernel@vger.kernel.org, david-b@pacbell.net
Subject: Re: [PATCH] pci device wakeup flags
Message-ID: <20051028200814.GB17478@kroah.com>
References: <11304810221338@kroah.com> <11304810223093@kroah.com> <20051028035116.112ba2ca.akpm@osdl.org> <20051028155044.GA11924@kroah.com> <20051028123434.09c5cb2f.akpm@osdl.org> <Pine.LNX.4.64.0510281247010.4664@g5.osdl.org> <20051028195654.GH4464@flint.arm.linux.org.uk>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20051028195654.GH4464@flint.arm.linux.org.uk>
User-Agent: Mutt/1.5.11
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1208
Lines: 31

On Fri, Oct 28, 2005 at 08:56:54PM +0100, Russell King wrote:
> On Fri, Oct 28, 2005 at 12:45:28PM -0700, Greg KH wrote:
> > Ugh, ok, at least I wasn't that far off.  I'll make sure to not send the
> > usb pm patches in the round of usb updates until that gets figured out.
> 
> On Fri, Oct 28, 2005 at 12:47:50PM -0700, Linus Torvalds wrote:
> > Just to verify: that one isn't in the current driver core tree, right? I 
> > assume that's in Greg's USB tree..
> 
> Greg,
> 
> Any chance of putting my driver model changes into the driver core tree?

They are in there already. :)

> ISTR the reason they ended up in the USB tree was because they clashed
> with the usb-pm patches.  However, if the usb-pm patches are
> problematical, I'd rather my driver model changes weren't held up.

They have not been held up.  I made the required usb-pm fixups already,
based on your patches.  They are dependant on your changes, not the
other way around.

thanks,

greg k-h
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/