From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Ben Dooks <ben-linux@fluff•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Pannaga Bhushan <p.bhushan@samsung•com>
Subject: linux-next: manual merge of the samsung tree with the tree
Date: Thu, 20 May 2010 11:04:11 +1000 [thread overview]
Message-ID: <20100520110411.c16ea156.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 545 bytes --]
Hi Ben,
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-s5pv210/gpiolib.c between commit
ea5f50706385b61c1c0d24271bbe7c6e93129fbc ("ARM: S5PV210: Add GPIOlib
support") from Linus' tree and commit
026fcae436e846b0cc1db8d4af11890dfdde3689 ("ARM: S5PV210: Add S5PV210 GPIO
support") from the samsung tree.
Two versions of the same commit. I used the version in Linus' tree as
that was dated later.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next reply other threads:[~2010-05-20 1:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-20 1:04 Stephen Rothwell [this message]
2010-05-20 1:46 ` linux-next: manual merge of the samsung tree with the tree Ben Dooks
-- strict thread matches above, loose matches on Subject: below --
2014-05-23 1:20 Stephen Rothwell
2014-05-23 2:02 ` Kukjin Kim
2014-12-01 0:06 Stephen Rothwell
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=20100520110411.c16ea156.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ben-linux@fluff$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=p.bhushan@samsung$(echo .)com \
/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