linux-kernel - Re: linux-next: manual merge of the idle-test tree with the 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]

Date:	Sun, 29 May 2011 22:50:52 -0400 (EDT)
From:	Len Brown <lenb@...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: manual merge of the idle-test tree with the  tree

> Today's linux-next merge of the idle-test tree got a conflict in
> arch/x86/include/asm/processor.h, arch/x86/kernel/cpu/common.c and
> arch/x86/kernel/process.c between commits from Linus' tree and similar
> commits from the idle-test tree.
> 
> I used the versions from Linus' tree as they seem to have been committed
> more recently (this may not be the correct solution).

I'll refresh the offending patch in idle-test -- upstream
changed out from under it.

thanks,
-Len
--
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/