linux-kernel - linux-next: manual merge of the v4l-dvb 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]

Date:	Fri, 29 Jul 2011 13:17:35 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Mauro Carvalho Chehab <mchehab@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Oleg Drokin <green@...uxhacker.ru>,
	Tony Lindgren <tony@...mide.com>,
	Linus <torvalds@...ux-foundation.org>,
	Kalle Jokiniemi <kalle.jokiniemi@...ia.com>
Subject: linux-next: manual merge of the v4l-dvb tree with Linus' tree

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
arch/arm/mach-omap2/board-rx51-peripherals.c between commit 786b01a8c1db
("cleanup regulator supply definitions in mach-omap2") from Linus' tree
and commit 75ccf268d504 ("[media] OMAP3: RX-51: define vdds_csib
regulator supply") from the v4l-dvb tree.

I fixed it up (see below) and can carry the fix as necessary.  I am sure
Linus' will cope with this merge fixup as well, so you do not need to
rebase/merge to his current tree before sending a pull request.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/arm/mach-omap2/board-rx51-peripherals.c
index cc503aa,17e5685..0000000
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@@ -414,17 -358,17 +414,21 @@@ static struct omap2_hsmmc_info mmc[] __
  	{}	/* Terminator */
  };
  
 -static struct regulator_consumer_supply rx51_vmmc1_supply =
 -	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0");
 +static struct regulator_consumer_supply rx51_vmmc1_supply[] = {
 +	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"),
 +};
  
 -static struct regulator_consumer_supply rx51_vaux2_supply =
 -	REGULATOR_SUPPLY("vdds_csib", "omap3isp");
++static struct regulator_consumer_supply rx51_vaux2_supply[] = {
++	REGULATOR_SUPPLY("vdds_csib", "omap3isp"),
++};
+ 
 -static struct regulator_consumer_supply rx51_vaux3_supply =
 -	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1");
 +static struct regulator_consumer_supply rx51_vaux3_supply[] = {
 +	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"),
 +};
  
 -static struct regulator_consumer_supply rx51_vsim_supply =
 -	REGULATOR_SUPPLY("vmmc_aux", "omap_hsmmc.1");
 +static struct regulator_consumer_supply rx51_vsim_supply[] = {
 +	REGULATOR_SUPPLY("vmmc_aux", "omap_hsmmc.1"),
 +};
  
  static struct regulator_consumer_supply rx51_vmmc2_supplies[] = {
  	/* tlv320aic3x analog supplies */
@@@ -479,6 -427,8 +483,8 @@@ static struct regulator_init_data rx51_
  		.valid_ops_mask		= REGULATOR_CHANGE_MODE
  					| REGULATOR_CHANGE_STATUS,
  	},
 -	.num_consumer_supplies	= 1,
 -	.consumer_supplies	= &rx51_vaux2_supply,
++	.num_consumer_supplies	= ARRAY_SIZE(rx51_vaux2_supply),
++	.consumer_supplies	= rx51_vaux2_supply,
  };
  
  /* VAUX3 - adds more power to VIO_18 rail */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/