linux-kernel - linux-next: manual merge of the char-misc tree with the sound-asoc 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: <20130128215444.98524bf94e5fcd2035833055@canb.auug.org.au>
Date:	Mon, 28 Jan 2013 21:54:44 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>, Arnd Bergmann <arnd@...db.de>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Mark Brown <broonie@...nsource.wolfsonmicro.com>
Subject: linux-next: manual merge of the char-misc tree with the sound-asoc
 tree

Hi all,

Today's linux-next merge of the char-misc tree got a conflict in
include/linux/mfd/arizona/pdata.h between commit c94aa30edac4 ("ASoC:
arizona: Allow number of channels clocked to be restricted") from the
sound-asoc tree and commit 92a49871b378 ("extcon: arizona: Support use of
GPIO5 as an input to jack detection") from the char-misc 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 include/linux/mfd/arizona/pdata.h
index ec3e2a2,bcbe4fd..0000000
--- a/include/linux/mfd/arizona/pdata.h
+++ b/include/linux/mfd/arizona/pdata.h
@@@ -98,13 -96,15 +98,22 @@@ struct arizona_pdata 
  	/** Pin state for GPIO pins */
  	int gpio_defaults[ARIZONA_MAX_GPIO];
  
 +	/**
 +	 * Maximum number of channels clocks will be generated for,
 +	 * useful for systems where and I2S bus with multiple data
 +	 * lines is mastered.
 +	 */
 +	int max_channels_clocked[ARIZONA_MAX_AIF];
 +
+ 	/** GPIO5 is used for jack detection */
+ 	bool jd_gpio5;
+ 
+ 	/** Use the headphone detect circuit to identify the accessory */
+ 	bool hpdet_acc_id;
+ 
+ 	/** GPIO used for mic isolation with HPDET */
+ 	int hpdet_id_gpio;
+ 
  	/** GPIO for mic detection polarity */
  	int micd_pol_gpio;
  

Content of type "application/pgp-signature" skipped