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

Message-ID: <20220921110032.7cd28114@canb.auug.org.au>
Date:   Wed, 21 Sep 2022 11:00:32 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>
Cc:     Colin Foster <colin.foster@...advantage.com>,
        Horatiu Vultur <horatiu.vultur@...rochip.com>,
        Lee Jones <lee@...nel.org>,
        Linus Walleij <linus.walleij@...aro.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the net-next tree with Linus' tree

Hi all,

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

  drivers/pinctrl/pinctrl-ocelot.c

between commit:

  c297561bc98a ("pinctrl: ocelot: Fix interrupt controller")

from Linus' tree and commit:

  181f604b33cd ("pinctrl: ocelot: add ability to be used in a non-mmio configuration")

from the net-next 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/pinctrl/pinctrl-ocelot.c
index c7df8c5fe585,340ca2373429..000000000000
--- a/drivers/pinctrl/pinctrl-ocelot.c
+++ b/drivers/pinctrl/pinctrl-ocelot.c
@@@ -2086,12 -2008,11 +2081,11 @@@ static int ocelot_pinctrl_probe(struct 
  
  	regmap_config.max_register = OCELOT_GPIO_SD_MAP * info->stride + 15 * 4;
  
- 	info->map = devm_regmap_init_mmio(dev, base, &regmap_config);
- 	if (IS_ERR(info->map)) {
- 		dev_err(dev, "Failed to create regmap\n");
- 		return PTR_ERR(info->map);
- 	}
+ 	info->map = ocelot_regmap_from_resource(pdev, 0, &regmap_config);
+ 	if (IS_ERR(info->map))
+ 		return dev_err_probe(dev, PTR_ERR(info->map),
+ 				     "Failed to create regmap\n");
 -	dev_set_drvdata(dev, info->map);
 +	dev_set_drvdata(dev, info);
  	info->dev = dev;
  
  	/* Pinconf registers */

Content of type "application/pgp-signature" skipped