linux-kernel - linux-next: manual merge of the pinctrl 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>] [day] [month] [year] [list]

Message-Id: <20131213150247.db3f0bfa2a2ac01caa49c43a@canb.auug.org.au>
Date:	Fri, 13 Dec 2013 15:02:47 +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,
	Laurent Pinchart <laurent.pinchart+renesas@...asonboard.com>
Subject: linux-next: manual merge of the pinctrl tree with Linus'tree

Hi Linus,

Today's linux-next merge of the pinctrl tree got a conflict in
drivers/pinctrl/sh-pfc/pfc-sh7372.c between commit 71493de7e55a ("sh-pfc:
sh7372: Fix pin bias setup") from Linus' tree and commit 5b46ac3a7723
("sh-pfc: Rename sh_pfc window field to windows") from the pinctrl tree.

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

-- 
Cheers,
Stephen Rothwell <sfr@...b.auug.org.au>

diff --cc drivers/pinctrl/sh-pfc/pfc-sh7372.c
index cc097b693820,bcdd5c3cdcf0..000000000000
--- a/drivers/pinctrl/sh-pfc/pfc-sh7372.c
+++ b/drivers/pinctrl/sh-pfc/pfc-sh7372.c
@@@ -2584,8 -2573,8 +2573,8 @@@ static void __iomem *sh7372_pinmux_port
  		const struct sh7372_portcr_group *group =
  			&sh7372_portcr_offsets[i];
  
 -		if (i <= group->end_pin)
 +		if (pin <= group->end_pin)
- 			return pfc->window->virt + group->offset + pin;
+ 			return pfc->windows->virt + group->offset + pin;
  	}
  
  	return NULL;

Content of type "application/pgp-signature" skipped