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  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]
Date:	Mon, 10 Nov 2014 15:36:53 +1100
From:	Stephen Rothwell <>
To:	Greg KH <>, "Rafael J. Wysocki" <>
	Wolfram Sang <>,
	Mika Westerberg <>
Subject: Re: linux-next: manual merge of the driver-core tree with the  tree

Hi all,

On Mon, 10 Nov 2014 15:21:25 +1100 Stephen Rothwell <> wrote:
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/leds/leds-gpio.c between commit a43f2cbbb009 ("leds: leds-gpio:
> Make use of device property API") from the  tree and commit
> 81902d5f658f ("leds: drop owner assignment from platform_drivers") from
> the driver-core tree.

This involved the pm tree, of course.
Stephen Rothwell          

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists