From: linux@arm.linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] pxa: patches for next merge window
Date: Thu, 25 Feb 2010 20:51:13 +0000 [thread overview]
Message-ID: <20100225205113.GF3101@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <f17812d71002241849m6b37f601h7eef1a723b2d0335@mail.gmail.com>
On Thu, Feb 25, 2010 at 10:49:03AM +0800, Eric Miao wrote:
> Russell,
>
> Please help pull from below, thanks.
>
> The following changes since commit 724e6d3fe8003c3f60bf404bf22e4e331327c596:
> Linus Torvalds (1):
> Linux 2.6.33-rc8
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git devel
Err, you've rebased your tree since I last pulled it, and this now results
in the following, and a load of duplicated commits between the two trees.
This is not nice, please don't rebase stuff which I've already pulled.
I'm going to think about what to do about this; I can't trivially drop
your previous work from my tree.
diff --cc arch/arm/mach-pxa/raumfeld.c
index 06717d7,3184bdc..0000000
--- a/arch/arm/mach-pxa/raumfeld.c
+++ b/arch/arm/mach-pxa/raumfeld.c
@@@ -231,6 -231,10 +231,13 @@@ static mfp_cfg_t raumfeld_connector_pin
GPIO26_SSP2_FRM,
GPIO27_SSP2_TXD,
GPIO29_SSP2_EXTCLK,
++<<<<<<< HEAD:arch/arm/mach-pxa/raumfeld.c
++=======
+
+ /* LEDs */
+ GPIO35_GPIO | MFP_LPM_PULL_LOW,
+ GPIO36_GPIO | MFP_LPM_DRIVE_HIGH,
++>>>>>>> aa4efff73f7ccf59efbc1fc98c31b43b70dc3731:arch/arm/mach-pxa/raumfeld.c
};
static mfp_cfg_t raumfeld_speaker_pin_config[] __initdata = {
@@@ -277,6 -281,10 +284,13 @@@
GPIO87_SSP1_TXD,
GPIO88_SSP1_RXD,
GPIO90_SSP1_SYSCLK,
++<<<<<<< HEAD:arch/arm/mach-pxa/raumfeld.c
++=======
+
+ /* LEDs */
+ GPIO35_GPIO | MFP_LPM_PULL_LOW,
+ GPIO36_GPIO | MFP_LPM_DRIVE_HIGH,
++>>>>>>> aa4efff73f7ccf59efbc1fc98c31b43b70dc3731:arch/arm/mach-pxa/raumfeld.c
};
/*
next prev parent reply other threads:[~2010-02-25 20:51 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-25 2:49 [GIT PULL] pxa: patches for next merge window Eric Miao
2010-02-25 20:51 ` Russell King - ARM Linux [this message]
2010-02-25 21:29 ` Russell King - ARM Linux
2010-02-26 2:50 ` Eric Miao
2010-02-26 9:05 ` Eric Miao
2010-02-28 16:14 ` Russell King - ARM Linux
2010-03-01 0:42 ` Nicolas Pitre
2010-03-01 13:23 ` Eric Miao
2010-03-01 15:16 ` Russell King - ARM Linux
2010-03-02 4:48 ` Eric Miao
2010-03-01 9:39 ` Uwe Kleine-König
2010-03-01 9:48 ` Russell King - ARM Linux
2010-03-01 10:11 ` Paul Mundt
2010-03-01 10:27 ` Uwe Kleine-König
2010-03-02 0:33 ` Stephen Rothwell
2010-03-01 10:12 ` Uwe Kleine-König
2010-03-01 16:40 ` Linus Torvalds
2010-03-01 16:58 ` Linus Torvalds
2010-03-01 17:07 ` Russell King - ARM Linux
-- strict thread matches above, loose matches on Subject: below --
2010-12-22 9:09 Eric Miao
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=20100225205113.GF3101@n2100.arm.linux.org.uk \
--to=linux@arm.linux.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).