linux-kernel - Re: linux-next: manual merge of the akpm-current tree with the sparc 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: <20140221.121959.1500262643643918996.davem@davemloft.net>
Date:	Fri, 21 Feb 2014 12:19:59 -0500 (EST)
From:	David Miller <davem@...emloft.net>
To:	dhowells@...hat.com
Cc:	sfr@...b.auug.org.au, akpm@...ux-foundation.org,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the akpm-current tree with the
 sparc tree

From: David Howells <dhowells@...hat.com>
Date: Fri, 21 Feb 2014 11:32:44 +0000

> Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> 
>> Today's linux-next merge of the akpm-current tree got a conflict in
>> drivers/sbus/char/jsflash.c between commit 967f038e491b ("Sparc:
>> sparc_cpu_model isn't in asm/system.h any more [ver #2]") from the sparc
>> tree and commit 695f43eb1721 ("asm/system.h: sparc: sparc_cpu_model isn't
>> in asm/system.h any more") from the akpm-current tree.
> 
> I think Andrew's is an old version.

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