linux-kernel - linux-next: manual merge of the gpio 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]

Date:	Wed, 28 May 2014 19:00:11 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Linus Walleij <linus.walleij@...aro.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Michael Welling <mwelling@...e.org>,
	Michael Stickel <ms@...able.de>
Subject: linux-next: manual merge of the gpio tree with Linus' tree

Hi Linus,

Today's linux-next merge of the gpio tree got a conflict in
drivers/gpio/gpio-mcp23s08.c between commit 99e4b98dbe3a ("gpio:
mcp23s08: Bug fix of SPI device tree registration") from Linus' tree
and commit 3e3bed913e8b ("gpio: mcp23s08: fixed count variable for
devicetree probing") from the gpio tree.

I fixed it up (one way - 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-mcp23s08.c
index 3d53fd6880d1,00fbb30b9b10..000000000000
--- a/drivers/gpio/gpio-mcp23s08.c
+++ b/drivers/gpio/gpio-mcp23s08.c
@@@ -894,11 -894,14 +894,12 @@@ static int mcp23s08_probe(struct spi_de
  			dev_err(&spi->dev, "invalid spi-present-mask\n");
  			return -ENODEV;
  		}
+ 
  		for (addr = 0; addr < ARRAY_SIZE(pdata->chip); addr++) {
- 			if ((spi_present_mask & (1 << addr)))
- 				chips++;
  			pullups[addr] = 0;
+ 			if (spi_present_mask & (1 << addr))
+ 				chips++;
  		}
 -		if (!chips)
 -			return -ENODEV;
  	} else {
  		type = spi_get_device_id(spi)->driver_data;
  		pdata = dev_get_platdata(&spi->dev);

Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)