linux-kernel - Re: linux-next: manual merge of 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 for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20160101020103.GB29040@htj.duckdns.org>
Date:	Thu, 31 Dec 2015 21:01:03 -0500
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,
	Jaedon Shin <jaedon.shin@...il.com>
Subject: Re: linux-next: manual merge of the libata tree

Hello, Stephen.

On Thu, Dec 31, 2015 at 12:29:15PM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the libata tree got conflicts all over teh
> place due to commit:
> 
>   53fab927a8fc ("ata: ahci_brcmstb: add support for MIPS-based platforms")
> 
> from the libata tree which seem to contain most (if not all) of Linus'
> tree :-(.

That's me messing up the branch.  Will rebase the tree.  Sorry about
the mess.

Thanks.

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