linux-kernel - linux-next: manual merge of the pinctrl tree with the battery 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 for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Date:	Mon, 4 Feb 2013 16:45:06 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Linus Walleij <linus.walleij@...aro.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jonas Aaberg <jonas.aberg@...ricsson.com>,
	Anton Vorontsov <avorontsov@...mvista.com>,
	Lee Jones <lee.jones@...aro.org>,
	Linus Walleij <linus.walleij@...aro.org>
Subject: linux-next: manual merge of the pinctrl tree with the battery tree

Hi Linus,

Today's linux-next merge of the pinctrl tree got a conflict in
include/linux/mfd/abx500/ab8500.h between commit 0ed5107fa860
("ab8500-charger: Do not touch VBUSOVV bits") from the battery tree and
commit 56813f798e8c ("mfd: ab8500: update header file and version
detection") from the pinctrl tree.

I fixed it up (the former is a subset of the latter) and can carry the
fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped