From: Thierry Reding <thierry.reding@gmail•com>
To: Sebastian Hesselbarth <sebastian.hesselbarth@gmail•com>,
Jason Cooper <jason@lakedaemon•net>
Cc: linux-next@vger•kernel.org
Subject: linux-next: manual merge of the mvebu tree
Date: Tue, 22 Oct 2013 17:10:49 +0200 [thread overview]
Message-ID: <1382454649-16442-5-git-send-email-treding@nvidia.com> (raw)
In-Reply-To: <1382454649-16442-1-git-send-email-treding@nvidia.com>
Today's linux-next merge of the mvebu tree got conflicts in
arch/arm/mach-kirkwood/board-dt.c
caused by commits a169e3a (ARM: kirkwood: remove custom .init_time hook)
and 14867b4 (ARM: kirkwood: remove lagacy clk workarounds).
I fixed them up (see below). Please verify that the resolution looks good.
Thanks,
Thierry
---
diff --cc arch/arm/mach-kirkwood/board-dt.c
index 9caa4fe,44bc6b9..ab2e586
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@@ -17,14 -19,10 +19,9 @@@
#include <linux/of_net.h>
#include <linux/of_platform.h>
#include <linux/clk-provider.h>
- #include <linux/dma-mapping.h>
- #include <linux/irqchip.h>
- #include <linux/kexec.h>
-#include <linux/clocksource.h>
+ #include <linux/slab.h>
#include <asm/mach/arch.h>
- #include <asm/mach/map.h>
#include <mach/bridge-regs.h>
- #include <linux/platform_data/usb-ehci-orion.h>
- #include <plat/irq.h>
#include <plat/common.h>
#include "common.h"
next prev parent reply other threads:[~2013-10-22 15:13 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-21 15:36 linux-next: Tree for Oct 21 Thierry Reding
2013-10-21 23:20 ` linux-next: Tree for Oct 21 (panel-simple.c) Randy Dunlap
2013-10-22 8:10 ` Thierry Reding
2013-10-22 0:58 ` linux-next: Tree for Oct 21 (sound/pci/hda/patch_hdmi.c) Randy Dunlap
2013-10-22 7:42 ` Takashi Iwai
2013-10-22 15:10 ` linux-next: manual merge of the net-next tree Thierry Reding
2013-10-22 15:10 ` linux-next: manual merge of the wireless-next tree Thierry Reding
2013-10-22 15:10 ` linux-next: manual merge of the drm tree Thierry Reding
2013-10-22 15:10 ` linux-next: manual merge of the arm-soc tree Thierry Reding
2013-10-23 12:19 ` Tony Lindgren
2013-10-22 15:10 ` Thierry Reding [this message]
2013-10-23 8:59 ` linux-next: manual merge of the mvebu tree Jason Cooper
-- strict thread matches above, loose matches on Subject: below --
2013-10-09 14:14 linux-next: Tree for Oct 9 Thierry Reding
2013-10-09 14:14 ` linux-next: manual merge of the mvebu tree Thierry Reding
2013-10-09 14:21 ` Jason Cooper
2013-10-09 14:37 ` Jason Cooper
2013-10-10 10:57 ` Thierry Reding
2013-10-10 11:40 ` Jason Cooper
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=1382454649-16442-5-git-send-email-treding@nvidia.com \
--to=thierry.reding@gmail$(echo .)com \
--cc=jason@lakedaemon$(echo .)net \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sebastian.hesselbarth@gmail$(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