Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933746Ab1ETAXf (ORCPT ); Thu, 19 May 2011 20:23:35 -0400 Received: from out2.smtp.messagingengine.com ([66.111.4.26]:60885 "EHLO out2.smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933318Ab1ETAX2 (ORCPT ); Thu, 19 May 2011 20:23:28 -0400 X-Sasl-enc: 3AsXUOHcw76IqSl/+BYiDfcOZ1kk7kyKRmENh5AuEuny 1305851007 Date: Thu, 19 May 2011 17:24:01 -0700 From: Greg KH To: matt mooney Cc: matt mooney , linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: Re: [PATCH] staging: usbip: replace usbip_u{dbg,err,info} and printk with dev_ and pr_ Message-ID: <20110520002401.GA17623@kroah.com> References: <2db81796703063c0816d0d99040c6fbd6da50007.1305847719.git.mfm@muteddisk.com> <20110520000013.GA8908@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 914 Lines: 20 On Thu, May 19, 2011 at 05:17:45PM -0700, matt mooney wrote: > On Thu, May 19, 2011 at 5:00 PM, Greg KH wrote: > > Also, the merge window for the .40 tree for the staging tree is now > > closed, so I'll only take bugfixes for the usbip code for now. > > The userspace code isn't getting merged in .40, is it? Because my > patch "staging: usbip: userspace: stub_driver.c: update kernel module > name" actually relies on a change in my own tree, so I made a mistake > by thinking that it was needed right away to get the userspace tools > working. It's in my tree, so yes. You can send me patches to fix the problem, as I would recommend :) 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/