From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Kukjin Kim <kgene.kim@samsung•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Joonyoung Shim <jy0922.shim@samsung•com>,
Kyungmin Park <kyungmin.park@samsung•com>,
Dmitry Torokhov <dmitry.torokhov@gmail•com>
Subject: Re: linux-next: manual merge of the input tree with the s5p tree
Date: Fri, 6 Aug 2010 10:24:19 +1000 [thread overview]
Message-ID: <20100806102419.3e875933.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20100722114655.1140fb61.sfr@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 918 bytes --]
Hi all,
On Thu, 22 Jul 2010 11:46:55 +1000 Stephen Rothwell <sfr@canb•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@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next prev parent reply other threads:[~2010-08-06 0:24 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-22 1:46 linux-next: manual merge of the input tree with the s5p tree Stephen Rothwell
2010-08-06 0:24 ` Stephen Rothwell [this message]
2010-08-06 0:43 ` Kukjin Kim
2010-08-06 1:43 ` Stephen Rothwell
2010-08-06 3:20 ` Joonyoung Shim
2010-08-06 5:15 ` Kukjin Kim
2010-08-06 4:33 ` Kukjin Kim
2010-08-06 5:17 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2011-11-11 2:11 Stephen Rothwell
2011-11-11 3:42 ` Dmitry Torokhov
2011-11-11 2:11 Stephen Rothwell
2011-11-11 3:41 ` Dmitry Torokhov
2011-11-11 5:57 ` Stephen Rothwell
2011-11-15 7:26 ` Kukjin Kim
2011-11-11 8:40 ` Thomas Abraham
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100806102419.3e875933.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dmitry.torokhov@gmail$(echo .)com \
--cc=jy0922.shim@samsung$(echo .)com \
--cc=kgene.kim@samsung$(echo .)com \
--cc=kyungmin.park@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox