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

Message-Id: <20120629165836.95668052d64550c609453857@canb.auug.org.au>
Date:	Fri, 29 Jun 2012 16:58:36 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thierry Reding <thierry.reding@...onic-design.de>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jonghwan Choi <jhbird.choi@...sung.com>,
	Kukjin Kim <kgene.kim@...sung.com>,
	Sascha Hauer <s.hauer@...gutronix.de>
Subject: linux-next: manual merge of the pwm tree with the s5p tree

Hi Thierry,

Today's linux-next merge of the pwm tree got a conflict in
drivers/pwm/pwm-samsung.c between commit 8f748e20b806 ("ARM: SAMSUNG:
Remove unused variable 'running' on PWM") from the s5p tree (where it is
called arch/arm/plat-samsung/pwm.c) and commit 2663e766c56a ("ARM
Samsung: Move s3c pwm driver to pwm framework") from the pwm tree.

I fixed it up and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped