Hi all,
Today's linux-next merge of the gpio tree got a conflict in:
drivers/gpio/gpio-tegra186.c
between commit:
cc4c831811c2 ("gpio: tegra186: use devm_platform_ioremap_resource_byname()")
from the driver-core tree and commit:
2a3655056730 ("gpio: tegra186: Implement wake event support")
from the gpio tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpio/gpio-tegra186.c
index ef40fbe923cf,8a2a69178925..000000000000
--- a/drivers/gpio/gpio-tegra186.c
+++ b/drivers/gpio/gpio-tegra186.c
@@@ -407,6 -449,8 +449,7 @@@ static int tegra186_gpio_probe(struct p
unsigned int i, j, offset;
struct gpio_irq_chip *irq;
struct tegra_gpio *gpio;
+ struct device_node *np;
- struct resource *res;
char **names;
int err;
Attachment:
pgpOlybuvACy0.pgp
Description: OpenPGP digital signature
