linux-kernel - linux-next: manual merge of the gpio tree with the pinctrl 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: <20160216143728.61372efa@canb.auug.org.au>
Date:	Tue, 16 Feb 2016 14:37:28 +1100
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,
	Krzysztof Adamski <krzysztof.adamski@...to.com>
Subject: linux-next: manual merge of the gpio tree with the pinctrl tree

Hi Linus,

Today's linux-next merge of the gpio tree got a conflict in:

  drivers/pinctrl/sunxi/pinctrl-sunxi.c

between commit:

  be2d107f4433 ("pinctrl: sunxi: Use pin number when calling sunxi_pmx_set")

from the pinctrl tree and commit:

  6cee3821e4e4 ("gpio/pinctrl: sunxi: stop poking around in private vars")

from the gpio tree.

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

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/pinctrl/sunxi/pinctrl-sunxi.c
index 96f64a104a62,3e95bfe66a06..000000000000
--- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
@@@ -457,9 -457,8 +457,9 @@@ static int sunxi_pinctrl_gpio_get(struc
  	struct sunxi_pinctrl *pctl = gpiochip_get_data(chip);
  	u32 reg = sunxi_data_reg(offset);
  	u8 index = sunxi_data_offset(offset);
- 	u32 set_mux = pctl->desc->irq_read_needs_mux &&
- 			test_bit(FLAG_USED_AS_IRQ, &chip->desc[offset].flags);
+ 	bool set_mux = pctl->desc->irq_read_needs_mux &&
+ 		gpiochip_line_is_irq(chip, offset);
 +	u32 pin = offset + chip->base;
  	u32 val;
  
  	if (set_mux)