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

Message-ID: <20121129064831.GD28582@avionic-0098.adnet.avionic-design.de>
Date:	Thu, 29 Nov 2012 07:48:32 +0100
From:	Thierry Reding <thierry.reding@...onic-design.de>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Bill Pemberton <wfp5p@...ginia.edu>, Greg KH <greg@...ah.com>,
	Peter Ujfalusi <peter.ujfalusi@...com>
Subject: Re: linux-next: manual merge of the pwm tree with the driver-core
 tree

On Thu, Nov 29, 2012 at 04:29:45PM +1100, Stephen Rothwell wrote:
> Hi Thierry,
> 
> Today's linux-next merge of the pwm tree got a conflict in
> drivers/pwm/pwm-twl6030.c between commit fd1091125a1d ("pwm: remove use
> of __devexit_p") from the driver-core tree and commit 6179a58ec7e2 ("pwm:
> Remove pwm-twl6030 driver") from the pwm tree.
> 
> I fixed it up (the latter removed the file) and can carry the fix as
> necessary (no action is required).

Great, thanks!

Thierry

Content of type "application/pgp-signature" skipped