linux-kernel - linux-next: manual merge of the trivial tree with the omap 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-next>] [day] [month] [year] [list]

Message-Id: <20101213134457.d0fb1e13.sfr@canb.auug.org.au>
Date:	Mon, 13 Dec 2010 13:44:57 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jiri Kosina <jkosina@...e.cz>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Kevin Hilman <khilman@...prootsystems.com>,
	Tony Lindgren <tony@...mide.com>, <linux-omap@...r.kernel.org>,
	Lionel Debroux <lionel_debroux@...oo.fr>
Subject: linux-next: manual merge of the trivial tree with the omap tree

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
arch/arm/mach-omap2/pm24xx.c between commit
e83df17f178360a8e7874441bca04a710c869e42 ("OMAP2+: PM/serial: fix console
semaphore acquire during suspend") from the omap tree and commit
2f55ac072f5344519348c0c94b3d2f4cca46847b ("suspend: constify
platform_suspend_ops") from the trivial tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/arm/mach-omap2/pm24xx.c
index aaeea49,aa9764e..0000000
--- a/arch/arm/mach-omap2/pm24xx.c
+++ b/arch/arm/mach-omap2/pm24xx.c
@@@ -354,13 -326,7 +354,13 @@@ static void omap2_pm_finish(void
  	enable_hlt();
  }
  
 +static void omap2_pm_end(void)
 +{
 +	suspend_state = PM_SUSPEND_ON;
 +}
 +
- static struct platform_suspend_ops omap_pm_ops = {
+ static const struct platform_suspend_ops omap_pm_ops = {
 +	.begin		= omap2_pm_begin,
  	.prepare	= omap2_pm_prepare,
  	.enter		= omap2_pm_enter,
  	.finish		= omap2_pm_finish,
--
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/