linux-kernel - linux-next: manual merge of the driver-core tree with Linus' 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: <20130123151552.1b8723dfa9c9a5dd75f7fec2@canb.auug.org.au>
Date:	Wed, 23 Jan 2013 15:15:52 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Thierry Reding <thierry.reding@...onic-design.de>,
	Linus Walleij <linus.walleij@...aro.org>
Subject: linux-next: manual merge of the driver-core tree with Linus' tree

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/gpio/gpio-mvebu.c between commit 11c0ceec073c ("gpio: mvebu:
Don't free chip label memory") from Linus' tree and commit 641d03422a59
("gpio: Convert to devm_ioremap_resource()") from the driver-core tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/gpio/gpio-mvebu.c
index 6819d63,bf6c7c9..0000000
--- a/drivers/gpio/gpio-mvebu.c
+++ b/drivers/gpio/gpio-mvebu.c
@@@ -544,10 -545,10 +545,9 @@@ static int mvebu_gpio_probe(struct plat
  	mvchip->chip.of_node = np;
  
  	spin_lock_init(&mvchip->lock);
- 	mvchip->membase = devm_request_and_ioremap(&pdev->dev, res);
- 	if (! mvchip->membase) {
- 		dev_err(&pdev->dev, "Cannot ioremap\n");
- 		return -ENOMEM;
+ 	mvchip->membase = devm_ioremap_resource(&pdev->dev, res);
+ 	if (IS_ERR(mvchip->membase)) {
 -		kfree(mvchip->chip.label);
+ 		return PTR_ERR(mvchip->membase);
  	}
  
  	/* The Armada XP has a second range of registers for the
@@@ -559,10 -560,12 +559,10 @@@
  			return -ENODEV;
  		}
  
- 		mvchip->percpu_membase = devm_request_and_ioremap(&pdev->dev, res);
- 		if (! mvchip->percpu_membase) {
- 			dev_err(&pdev->dev, "Cannot ioremap\n");
- 			return -ENOMEM;
+ 		mvchip->percpu_membase = devm_ioremap_resource(&pdev->dev,
+ 							       res);
+ 		if (IS_ERR(mvchip->percpu_membase)) {
 -			kfree(mvchip->chip.label);
+ 			return PTR_ERR(mvchip->percpu_membase);
  		}
  	}
  

Content of type "application/pgp-signature" skipped