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

Message-Id: <20100806102419.3e875933.sfr@canb.auug.org.au>
Date:	Fri, 6 Aug 2010 10:24:19 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Kukjin Kim <kgene.kim@...sung.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Joonyoung Shim <jy0922.shim@...sung.com>,
	Kyungmin Park <kyungmin.park@...sung.com>,
	Dmitry Torokhov <dmitry.torokhov@...il.com>
Subject: Re: linux-next: manual merge of the input tree with the s5p tree

Hi all,

On Thu, 22 Jul 2010 11:46:55 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the input tree got a conflict in
> arch/arm/plat-samsung/include/plat/keypad.h between commit
> 1e3241300503df18a098dd35098f6975dcf622e2 ("ARM: SAMSUNG: Add keypad
> device support") from the s5p tree and commit
> 0fffed27f92d9d7a34de9fe017b7082b5958bb93 ("Input: samsung-keypad - Add
> samsung keypad driver") from the input tree.
> 
> This just looks like two versions of the same driver (or two drivers
> sharing the same header) - please sort this out.  I have fixed up the
> header for today (by including both versions where necessary).

I got this again (something obviously changed a little) but the input
tree version is now in Linus' tree.  Please fix this up.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped