linux-kernel - Re: linux-next: bad merge in the libata 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: <20130605025104.GN14916@htj.dyndns.org>
Date:	Tue, 4 Jun 2013 19:51:04 -0700
From:	Tejun Heo <tj@...nel.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: bad merge in the libata tree

On Wed, Jun 05, 2013 at 10:13:39AM +1000, Stephen Rothwell wrote:
> Hi Tejun,
> 
> The top commit of the libata tree is a merge that leaves some conflict
> markers in drivers/ata/sata_rcar.c ...
> 
> I will use yesterday's tree for today.

Sorry, I messed up while moving a sata_rcar build warning fix patch
from for-3.11 to for-3.10-fixes.  My apologies.  Fixed up.  Should be
okay now.

Thanks a lot.

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