linux-kernel - linux-next: manual merge of the driver-core tree with the mfd 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: <20121129144302.f19a1984d498e0cebae8d5d0@canb.auug.org.au>
Date:	Thu, 29 Nov 2012 14:43:02 +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,
	Bill Pemberton <wfp5p@...ginia.edu>,
	Laxman Dewangan <ldewangan@...dia.com>,
	Samuel Ortiz <sameo@...ux.intel.com>
Subject: linux-next: manual merge of the driver-core tree with the mfd tree

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/gpio/gpio-tps6586x.c between commit fe39f2f4dc84 ("mfd: Implement
tps6586x gpio_to_irq") from the mfd tree and commit 3836309d9346 ("gpio:
remove use of __devinit") 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-tps6586x.c
index 62e9e1c,c1b82da..0000000
--- a/drivers/gpio/gpio-tps6586x.c
+++ b/drivers/gpio/gpio-tps6586x.c
@@@ -80,15 -80,7 +80,15 @@@ static int tps6586x_gpio_output(struct 
  				val, mask);
  }
  
 +static int tps6586x_gpio_to_irq(struct gpio_chip *gc, unsigned offset)
 +{
 +	struct tps6586x_gpio *tps6586x_gpio = to_tps6586x_gpio(gc);
 +
 +	return tps6586x_irq_get_virq(tps6586x_gpio->parent,
 +				TPS6586X_INT_PLDO_0 + offset);
 +}
 +
- static int __devinit tps6586x_gpio_probe(struct platform_device *pdev)
+ static int tps6586x_gpio_probe(struct platform_device *pdev)
  {
  	struct tps6586x_platform_data *pdata;
  	struct tps6586x_gpio *tps6586x_gpio;

Content of type "application/pgp-signature" skipped