From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Catalin Marinas <catalin.marinas@arm•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Will Deacon <will.deacon@arm•com>,
Russell King <rmk@arm•linux.org.uk>,
Leif Lindholm <leif.lindholm@arm•com>
Subject: linux-next: manual merge of the catalin tree with the arm tree
Date: Thu, 9 Sep 2010 11:41:44 +1000 [thread overview]
Message-ID: <20100909114144.aa76efdb.sfr@canb.auug.org.au> (raw)
Hi Catalin,
Today's linux-next merge of the catalin tree got a conflict in
arch/arm/kernel/Makefile between commit
19852e59002fbba1c2c6ba0f154095a37ad2ac03 ("ARM: 6358/1: hw-breakpoint:
add HAVE_HW_BREAKPOINT to Kconfig") from the arm tree and commit
028543791a6c0652949046218da16ad0f744c158 ("ARM: Add SWP/SWPB emulation
for ARMv7 processors (v5)") from the catalin tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/arm/kernel/Makefile
index 5b9b268,d3430ee..0000000
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@@ -42,7 -42,7 +42,8 @@@ obj-$(CONFIG_KGDB) += kgdb.
obj-$(CONFIG_ARM_UNWIND) += unwind.o
obj-$(CONFIG_HAVE_TCM) += tcm.o
obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
+obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o
+ obj-$(CONFIG_SWP_EMULATE) += swp_emulate.o
obj-$(CONFIG_CRUNCH) += crunch.o crunch-bits.o
AFLAGS_crunch-bits.o := -Wa,-mcpu=ep9312
next reply other threads:[~2010-09-09 1:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-09 1:41 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-07-23 3:15 linux-next: manual merge of the catalin tree with the arm tree Stephen Rothwell
2010-07-23 3:15 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=20100909114144.aa76efdb.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=catalin.marinas@arm$(echo .)com \
--cc=leif.lindholm@arm$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rmk@arm$(echo .)linux.org.uk \
--cc=will.deacon@arm$(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