archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <>
To: Ohad Ben-Cohen <>
	Kevin Hilman <>, Arnd Bergmann <>
Subject: linux-next: manual merge of the hwspinlock tree with the arm-soc tree
Date: Tue, 11 Oct 2011 19:05:34 +1100	[thread overview]
Message-ID: <> (raw)

[-- Attachment #1: Type: text/plain, Size: 1300 bytes --]

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.
Stephen Rothwell          

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),
  				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,
 -		retval = PTR_ERR(od);
 +		retval = PTR_ERR(pdev);
  	return retval;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2011-10-11  8:05 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-11  8:05 Stephen Rothwell [this message]
2011-10-11  8:15 ` linux-next: manual merge of the hwspinlock tree with the arm-soc tree Ohad Ben-Cohen
2011-11-01  6:56 Stephen Rothwell
2011-11-01  7:23 ` Ohad Ben-Cohen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).