linux-kernel - Re: linux-next: manual merge of the arm tree with the arm-current 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: <1286783316l.6006l.0l@i-dmzi_al.realan.de>
Date:	Mon, 11 Oct 2010 09:48:36 +0200
From:	Anders Larsen <al@...rsen.net>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Russell King <rmk@....linux.org.uk>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Greg Ungerer <gerg@...pgear.com>
Subject: Re: linux-next: manual merge of the arm tree with the arm-current
 tree

On 2010-10-11 03:24:41, Stephen Rothwell wrote:
> Today's linux-next merge of the arm tree got a conflict in
> arch/arm/mach-at91/include/mach/system.h between commit
> 5c189208b606a85b4e97109af70d59f10a42fdfd ("ARM: 6436/1: AT91: Fix
> power-saving in idle-mode on 926T processors") from the arm-current tree
> and commit cb809b1a5ebffca8cf0314b788919989e8e4ab5f ("AT91: fix use of
> clock disable on idle for AT91x40 devices") from the arm tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Acked-by: Anders Larsen <al@...rsen.net>

Thanks
Anders		(Author of "...6436/1...")

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