Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Stephen Warren <swarren@nvidia.com>, Colin Cross <ccross@android.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Tony Prisk <linux@prisktech.co.nz>,
	Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
	linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the tegra tree with the arm-soc tree
Date: Wed, 16 Jan 2013 14:14:11 +1100
Message-ID: <20130116141411.8fadedee54ed35dc0eddd288@canb.auug.org.au> (raw)


[-- Attachment #1: Type: text/plain, Size: 997 bytes --]

Hi all,

Today's linux-next merge of the tegra tree got a conflict in
drivers/clocksource/Makefile between commit ff7ec345f0ec ("timer: vt8500:
Move timer code to drivers/clocksource") from the arm-soc tree and commit
ac0fd9eca3ba ("ARM: tegra: move timer.c to drivers/clocksource/") from
the tegra tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/clocksource/Makefile
index 440449c,b5cc507..0000000
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@@ -17,6 -17,6 +17,7 @@@ obj-$(CONFIG_CLKSRC_DBX500_PRCMU)	+= cl
  obj-$(CONFIG_ARMADA_370_XP_TIMER)	+= time-armada-370-xp.o
  obj-$(CONFIG_ARCH_BCM2835)	+= bcm2835_timer.o
  obj-$(CONFIG_SUNXI_TIMER)	+= sunxi_timer.o
 +obj-$(CONFIG_VT8500_TIMER)	+= vt8500_timer.o
+ obj-$(CONFIG_ARCH_TEGRA)	+= tegra20_timer.o
  
  obj-$(CONFIG_CLKSRC_ARM_GENERIC)	+= arm_generic.o

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply index

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-16  3:14 Stephen Rothwell [this message]
2013-01-16  3:49 ` Tony Prisk
2013-01-16  4:32   ` Stephen Warren
2013-01-16  4:52     ` Tony Prisk
2013-01-16 16:27       ` Olof Johansson
2013-01-16 17:08         ` Stephen Warren
2013-01-16 17:35           ` Olof Johansson
  -- strict thread matches above, loose matches on Subject: below --
2020-03-26 22:27 Stephen Rothwell
2020-03-27 13:18 ` Thierry Reding
2020-03-27 13:50   ` Arnd Bergmann
2019-06-25  0:12 Stephen Rothwell
2015-12-02 11:46 Mark Brown
2013-03-18  4:31 Stephen Rothwell
2013-03-18 15:23 ` Stephen Warren
2013-03-18 15:49   ` Arnd Bergmann
2013-02-02 11:52 Stephen Rothwell
2013-02-02 11:45 Stephen Rothwell
2013-01-23  5:30 Stephen Rothwell
2013-01-23  5:25 Stephen Rothwell
2013-01-16  3:10 Stephen Rothwell
2013-01-16  3:12 ` 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=20130116141411.8fadedee54ed35dc0eddd288@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=arnd@arndb.de \
    --cc=ccross@android.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linux@prisktech.co.nz \
    --cc=olof@lixom.net \
    --cc=swarren@nvidia.com \
    /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

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git