linux-kernel - linux-next: manual merge of the hwspinlock tree with the arm-soc 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: <20111011190534.b3663a8392cc0905b6c4a466@canb.auug.org.au>
Date:	Tue, 11 Oct 2011 19:05:34 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Ohad Ben-Cohen <ohad@...ery.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Kevin Hilman <khilman@...com>, Arnd Bergmann <arnd@...db.de>
Subject: linux-next: manual merge of the hwspinlock tree with the arm-soc
 tree

Hi Ohad,

Today's linux-next merge of the hwspinlock tree got a conflict in
arch/arm/mach-omap2/hwspinlock.c between commit 3528c58eb9e8 ("OMAP:
omap_device: when building return platform_device instead of
omap_device") from the arm-soc tree and commit c3c1250e93a7
("hwspinlock/core/omap: fix id issues on multiple hwspinlock devices")
from the hwspinlock 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/hwspinlock.c
index 0b3ae9d,eb7e509..0000000
--- a/arch/arm/mach-omap2/hwspinlock.c
+++ b/arch/arm/mach-omap2/hwspinlock.c
@@@ -48,13 -53,14 +53,14 @@@ int __init hwspinlocks_init(void
  	if (oh == NULL)
  		return -EINVAL;
  
- 	pdev = omap_device_build(dev_name, 0, oh, NULL, 0,
 -	od = omap_device_build(dev_name, 0, oh, &omap_hwspinlock_pdata,
++	pdev = omap_device_build(dev_name, 0, oh, &omap_hwspinlock_pdata,
+ 				sizeof(struct hwspinlock_pdata),
  				omap_spinlock_latency,
  				ARRAY_SIZE(omap_spinlock_latency), false);
 -	if (IS_ERR(od)) {
 +	if (IS_ERR(pdev)) {
  		pr_err("Can't build omap_device for %s:%s\n", dev_name,
  								oh_name);
 -		retval = PTR_ERR(od);
 +		retval = PTR_ERR(pdev);
  	}
  
  	return retval;

Content of type "application/pgp-signature" skipped