linux-kernel - Re: linux-next: manual merge of the asm-generic tree with Linus' 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: <200906121005.33490.arnd@arndb.de>
Date:	Fri, 12 Jun 2009 10:05:32 +0200
From:	Arnd Bergmann <arnd@...db.de>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Peter Zijlstra <a.p.zijlstra@...llo.nl>,
	Ingo Molnar <mingo@...e.hu>
Subject: Re: linux-next: manual merge of the asm-generic tree with Linus' tree

On Friday 12 June 2009, Stephen Rothwell wrote:
> Today's linux-next merge of the asm-generic tree got a conflict in
> include/asm-generic/atomic.h between commit
> 53e111a730ea8b002d57dd226098c12789993329 ("x86: Fix atomic_long_xchg() on
> 64bit") from Linus' tree and commit
> 72099ed2719fc5829bd79c6ca9d1783ed026eb37 ("asm-generic: rename atomic.h
> to atomic-long.h") from the asm-generic tree.
> 
> I applied the fix from the former patch to atomic-long.h

Hi Stephen,

I pulled Linus' tree into the asm-generic tree now and fixed the two conflicts
in the same way you did. I thought about doing a rebase on his tree instead,
but wasn't sure what works better.

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