linux-kernel - linux-next: manual merge of the renesas tree with the leds 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]

Date:	Thu, 8 Aug 2013 15:49:08 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Simon Horman <horms@...ge.net.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jingoo Han <jg1.han@...sung.com>,
	Bryan Wu <cooloney@...il.com>,
	Laurent Pinchart <laurent.pinchart+renesas@...asonboard.com>
Subject: linux-next: manual merge of the renesas tree with the leds tree

Hi Simon,

Today's linux-next merge of the renesas tree got a conflict in
drivers/leds/leds-renesas-tpu.c between commit 33d693e59c42 ("leds: use
dev_get_platdata()") from the leds tree and commit ae3e4c277669 ("leds:
Remove leds-renesas-tpu driver") from the renesas tree.

I fixed it up (the latter removed the file, so I did that) 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