linux-kernel - Re: linux-next: manual merge of the pwm 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-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20160503110343.GM6292@sirena.org.uk>
Date:	Tue, 3 May 2016 12:03:43 +0100
From:	Mark Brown <broonie@...nel.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Thierry Reding <thierry.reding@...il.com>,
	Liam Girdwood <lgirdwood@...il.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Boris Brezillon <boris.brezillon@...e-electrons.com>,
	Laxman Dewangan <ldewangan@...dia.com>
Subject: Re: linux-next: manual merge of the pwm tree with the regulator tree

On Tue, May 03, 2016 at 06:25:09PM +1000, Stephen Rothwell wrote:

> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Please send me a pull request for the regulator commits you've added.

Download attachment "signature.asc" of type "application/pgp-signature" (474 bytes)