linux-kernel - Re: linux-next: manual merge of the arm-soc tree with the arm 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: <20120106213142.bef2d9b63e09eb42234e2b01@canb.auug.org.au>
Date:	Fri, 6 Jan 2012 21:31:42 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Russell King - ARM Linux <linux@....linux.org.uk>
Cc:	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	linux-arm-kernel@...ts.infradead.org, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Nicolas Pitre <nicolas.pitre@...aro.org>,
	"Govindraj.R" <govindraj.raja@...com>,
	Kevin Hilman <khilman@...com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the arm tree

Hi Russell,

On Fri, 6 Jan 2012 08:48:41 +0000 Russell King - ARM Linux <linux@....linux.org.uk> wrote:
>
> On Fri, Jan 06, 2012 at 12:03:17PM +1100, Stephen Rothwell wrote:
> > 
> > Today's linux-next merge of the arm-soc tree got a conflict in
> > arch/arm/mach-omap2/pm34xx.c between commit e6ab10af962d ("ARM: OMAP:
> > convert idle handlers from pm_idle to arm_pm_idle") from the arm tree and
> > commit 2fd149645eb4 ("") from the arm-soc tree.
> 
> Err, there's an empty description of a commit in the arm-soc tree?

Sorry about that:

ARM: OMAP2+: UART: Remove omap_uart_can_sleep and add pm_qos

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped