linux-kernel - linux-next: manual merge of the battery tree with the mfd 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: <20130206143120.73c66ac3eadced968f9dd2d5@canb.auug.org.au>
Date:	Wed, 6 Feb 2013 14:31:20 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Anton Vorontsov <avorontsov@...mvista.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jonas Aaberg <jonas.aberg@...ricsson.com>,
	Mian Yousaf Kaukab <mian.yousaf.kaukab@...ricsson.com>,
	Lee Jones <lee.jones@...aro.org>,
	Samuel Ortiz <sameo@...ux.intel.com>
Subject: linux-next: manual merge of the battery tree with the mfd tree

Hi Anton,

Today's linux-next merge of the battery tree got a conflict in
include/linux/mfd/abx500/ab8500.h between commit 1d843a6c8c20 ("mfd:
ab8500-core: Allow the possibility to dump all AB8500 registers") from
the mfd tree and commit 0ed5107fa860 ("ab8500-charger: Do not touch
VBUSOVV bits") from the battery 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/abx500/ab8500.h
index fa7173d,b9a6a84..0000000
--- a/include/linux/mfd/abx500/ab8500.h
+++ b/include/linux/mfd/abx500/ab8500.h
@@@ -345,12 -346,23 +350,32 @@@ static inline int is_ab8500_2p0(struct 
  	return (is_ab8500(ab) && (ab->chip_id == AB8500_CUT2P0));
  }
  
+ static inline int is_ab8505_1p0_or_earlier(struct ab8500 *ab)
+ {
+ 	return (is_ab8505(ab) && (ab->chip_id <= AB8500_CUT1P0));
+ }
+ 
+ static inline int is_ab8505_2p0(struct ab8500 *ab)
+ {
+ 	return (is_ab8505(ab) && (ab->chip_id == AB8500_CUT2P0));
+ }
+ 
+ static inline int is_ab9540_1p0_or_earlier(struct ab8500 *ab)
+ {
+ 	return (is_ab9540(ab) && (ab->chip_id <= AB8500_CUT1P0));
+ }
+ 
+ static inline int is_ab9540_2p0(struct ab8500 *ab)
+ {
+ 	return (is_ab9540(ab) && (ab->chip_id == AB8500_CUT2P0));
+ }
++
 +#ifdef CONFIG_AB8500_DEBUG
 +void ab8500_dump_all_banks(struct device *dev);
 +void ab8500_debug_register_interrupt(int line);
 +#else
 +static inline void ab8500_dump_all_banks(struct device *dev) {}
 +static inline void ab8500_debug_register_interrupt(int line) {}
 +#endif
 +
  #endif /* MFD_AB8500_H */

Content of type "application/pgp-signature" skipped