linux-kernel - Re: linux-next: manual merge of the staging tree with the l2-mtd 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] [day] [month] [year] [list]

Message-ID: <1325063055.1165.103.camel@sauron.fi.intel.com>
Date:	Wed, 28 Dec 2011 11:04:15 +0200
From:	Artem Bityutskiy <dedekind1@...il.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Greg KH <greg@...ah.com>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the staging tree with the l2-mtd
 tree

On Wed, 2011-12-28 at 10:54 +0200, Artem Bityutskiy wrote:
> On Wed, 2011-12-28 at 17:54 +1100, Stephen Rothwell wrote:
> > Hi Greg,
> > 
> > Today's linux-next merge of the staging tree got a conflict in
> > drivers/staging/spectra/lld_mtd.c between a series of commits from the
> > l2-mtd tree and commit be7f39c5ecf5 ("Staging: delete spectra driver")
> > from the staging tree.
> > 
> > I just removed the file.
> 
> Oh, it is in staging, I somehow missed that and pushed a small clean-up
> to the MTD tree (because the driver is an MTD driver). I'll kill that
> commit now.
> 
> Apologies for the hassle.

Actually, I was thinking about a different commit. Anyway, thanks for
fixing this up - removing the file is fine.

-- 
Best Regards,
Artem Bityutskiy

Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)