linux-kernel - linux-next: manual merge of the gpio tree with the regulator 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, 3 Feb 2012 13:44:15 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Grant Likely <grant.likely@...retlab.ca>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Mark Brown <broonie@...nsource.wolfsonmicro.com>,
	Liam Girdwood <lrg@...mlogic.co.uk>,
	Laxman Dewangan <ldewangan@...dia.com>
Subject: linux-next: manual merge of the gpio tree with the regulator tree

Hi Grant,

Today's linux-next merge of the gpio tree got a conflict in
include/linux/mfd/tps65910.h between commit 1e0c66f49762 ("regulator:
tps65910: Sleep control through external inputs") from the regulator tree
and commit 290705988073 ("gpio: tps65910: Add sleep control support")
from the gpio tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc include/linux/mfd/tps65910.h
index fa6c6bf,9071902..0000000
--- a/include/linux/mfd/tps65910.h
+++ b/include/linux/mfd/tps65910.h
@@@ -786,7 -786,7 +793,8 @@@ struct tps65910_board 
  	int irq_base;
  	int vmbch_threshold;
  	int vmbch2_threshold;
 +	unsigned long regulator_ext_sleep_control[TPS65910_NUM_REGS];
+ 	bool en_gpio_sleep[TPS6591X_MAX_NUM_GPIO];
  	struct regulator_init_data *tps65910_pmic_init_data[TPS65910_NUM_REGS];
  };
  

Content of type "application/pgp-signature" skipped