linux-kernel - Re: linux-next: manual merge of the staging tree with the staging.current tree

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <20110609205111.GB32526@kroah.com>
Date:	Thu, 9 Jun 2011 13:51:11 -0700
From:	Greg KH <greg@...ah.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Arjan Mels <arjan.mels@....net>,
	matt mooney <mfm@...eddisk.com>
Subject: Re: linux-next: manual merge of the staging tree with the
 staging.current tree

On Thu, Jun 09, 2011 at 11:42:06AM -0700, Greg KH wrote:
> On Thu, Jun 09, 2011 at 04:58:04PM +1000, Stephen Rothwell wrote:
> > Hi Greg,
> > 
> > Today's linux-next merge of the staging tree got a conflict in
> > drivers/staging/usbip/stub_dev.c between commit d3ac07788017 ("staging:
> > usbip: bugfix prevent driver unbind") from the staging.current tree and
> > commit d012c2a5aca1 ("staging: usbip: stub_dev.c: move stub_driver
> > definition and update driver name") from the staging tree.
> > 
> > I fixed it up (see below) and can carry the fix as necessary.
> 
> Looks correct, thanks for doing this.

This should now be resolved.

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/