linux-kernel - linux-next: manual merge of the battery 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: <20130130221357.bf022183e79305f38613b524@canb.auug.org.au>
Date:	Wed, 30 Jan 2013 22:13:57 +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,
	Lee Jones <lee.jones@...aro.org>,
	Samuel Ortiz <sameo@...ux.intel.com>,
	Johan Bjornstedt <johan.bjornstedt@...ricsson.com>,
	Henrik Solver <henrik.solver@...ricsson.com>
Subject: linux-next: manual merge of the battery tree with Linus' tree

Hi Anton,

Today's linux-next merge of the battery tree got a conflict in
include/linux/mfd/abx500/ab8500-bm.h between commit 00441b5e6b98 ("mfd:
Fix compile errors and warnings when !CONFIG_AB8500_BM") from Linus' tree
and commit 3988a4df3499 ("ab8500_bm: Skip first CCEOC irq for instant
current") 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-bm.h
index 9bd037d,e2a1e6d..0000000
--- a/include/linux/mfd/abx500/ab8500-bm.h
+++ b/include/linux/mfd/abx500/ab8500-bm.h
@@@ -437,8 -438,38 +441,13 @@@ int ab8500_fg_inst_curr_started(struct 
  int ab8500_fg_inst_curr_done(struct ab8500_fg *di);
  
  #else
 -int ab8500_fg_inst_curr_started(struct ab8500_fg *di)
 -{
 -	return 0;
 -}
 +static struct abx500_bm_data ab8500_bm_data;
  
 -int ab8500_fg_inst_curr_done(struct ab8500_fg *di)
 -{
 -	return 0;
 -}
 -static void ab8500_fg_reinit(void)
 -{
 -}
 -static void ab8500_charger_usb_state_changed(u8 bm_usb_state, u16 mA)
 -{
 -}
 -static struct ab8500_btemp *ab8500_btemp_get(void)
 -{
 -	return NULL;
 -}
 -static int ab8500_btemp_get_batctrl_temp(struct ab8500_btemp *btemp)
++int ab8500_fg_inst_curr_started(struct ab8500_fg *di)
+ {
+ 	return 0;
+ }
 -struct ab8500_fg *ab8500_fg_get(void)
 -{
 -	return NULL;
 -}
 -static int ab8500_fg_inst_curr_blocking(struct ab8500_fg *dev)
 -{
 -	return -ENODEV;
 -}
+ 
  static inline int ab8500_fg_inst_curr_start(struct ab8500_fg *di)
  {
  	return -ENODEV;

Content of type "application/pgp-signature" skipped