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: <DE6BB9BF2B09415FACB0F74F3CF4CF5C@Main>
Date:	Tue, 28 Jun 2011 16:07:25 +0200
From:	"Arjan Mels" <arjan.mels@....net>
To:	"Greg KH" <greg@...ah.com>,
	"Stephen Rothwell" <sfr@...b.auug.org.au>
Cc:	<linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
	"matt mooney" <mfm@...eddisk.com>
Subject: Re: linux-next: manual merge of the staging tree with the staging.current tree

Greg, Stephen,

Below mentioned patch does not seem to have made it into the linux-next tree 
(and other stable branches).

What do I need to do to correct this?

Best Regards,

Arjan

> > 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




-----Original Message----- 
From: Greg KH
Sent: Thursday, June 09, 2011 22:51
To: Stephen Rothwell
Cc: linux-next@...r.kernel.org ; linux-kernel@...r.kernel.org ; Arjan Mels ; 
matt mooney
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/