Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the gpio tree with the driver-core tree
@ 2019-11-07  4:05 Stephen Rothwell
  0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2019-11-07  4:05 UTC (permalink / raw)
  To: Linus Walleij, Greg KH
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Bartosz Golaszewski, Thierry Reding

[-- Attachment #1: Type: text/plain, Size: 1161 bytes --]

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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread
* linux-next: manual merge of the gpio tree with the driver-core tree
@ 2012-11-29  4:57 Stephen Rothwell
  2012-11-29  5:17 ` Greg KH
  2012-11-30  0:01 ` Grant Likely
  0 siblings, 2 replies; 4+ messages in thread
From: Stephen Rothwell @ 2012-11-29  4:57 UTC (permalink / raw)
  To: Grant Likely
  Cc: linux-next, linux-kernel, Bill Pemberton, Greg KH, Linus Walleij

[-- Attachment #1: Type: text/plain, Size: 1974 bytes --]

Hi Grant,

Today's linux-next merge of the gpio tree got a conflict in
drivers/gpio/gpio-em.c between commit 3836309d9346 ("gpio: remove use of
__devinit") from the driver-core tree and commit 7385500a49b7 ("gpio/em:
convert to linear IRQ domain") from the gpio tree.

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

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

diff --cc drivers/gpio/gpio-em.c
index 320a718,b007063..0000000
--- a/drivers/gpio/gpio-em.c
+++ b/drivers/gpio/gpio-em.c
@@@ -234,41 -233,7 +233,7 @@@ static struct irq_domain_ops em_gio_irq
  	.map	= em_gio_irq_domain_map,
  };
  
- static int __devinit em_gio_irq_domain_init(struct em_gio_priv *p)
- {
- 	struct platform_device *pdev = p->pdev;
- 	struct gpio_em_config *pdata = pdev->dev.platform_data;
- 
- 	p->irq_base = irq_alloc_descs(pdata->irq_base, 0,
- 				      pdata->number_of_pins, numa_node_id());
- 	if (p->irq_base < 0) {
- 		dev_err(&pdev->dev, "cannot get irq_desc\n");
- 		return p->irq_base;
- 	}
- 	pr_debug("gio: hw base = %d, nr = %d, sw base = %d\n",
- 		 pdata->gpio_base, pdata->number_of_pins, p->irq_base);
- 
- 	p->irq_domain = irq_domain_add_legacy(pdev->dev.of_node,
- 					      pdata->number_of_pins,
- 					      p->irq_base, 0,
- 					      &em_gio_irq_domain_ops, p);
- 	if (!p->irq_domain) {
- 		irq_free_descs(p->irq_base, pdata->number_of_pins);
- 		return -ENXIO;
- 	}
- 
- 	return 0;
- }
- 
- static void em_gio_irq_domain_cleanup(struct em_gio_priv *p)
- {
- 	struct gpio_em_config *pdata = p->pdev->dev.platform_data;
- 
- 	irq_free_descs(p->irq_base, pdata->number_of_pins);
- 	/* FIXME: irq domain wants to be freed! */
- }
- 
 -static int __devinit em_gio_probe(struct platform_device *pdev)
 +static int em_gio_probe(struct platform_device *pdev)
  {
  	struct gpio_em_config *pdata = pdev->dev.platform_data;
  	struct em_gio_priv *p;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, back to index

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-07  4:05 linux-next: manual merge of the gpio tree with the driver-core tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2012-11-29  4:57 Stephen Rothwell
2012-11-29  5:17 ` Greg KH
2012-11-30  0:01 ` Grant Likely

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git