All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
	<linux-arm-kernel@lists.infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Omar Ramirez Luna <omar.luna@linaro.org>,
	Joerg Roedel <joro@8bytes.org>, Paul Walmsley <paul@pwsan.com>,
	Mike Turquette <mturquette@ti.com>
Subject: linux-next: manual merge of the arm-soc tree with the iommu tree
Date: Tue, 4 Dec 2012 15:42:03 +1100	[thread overview]
Message-ID: <20121204154203.f0e7e87d1ae99e5c528434f8@canb.auug.org.au> (raw)

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/clock44xx_data.c between commit 298ea44f211d ("ARM:
OMAP4: hwmod data: ipu and dsp to use parent clocks instead of leaf
clocks") from the iommu tree and commit 13a5b6228679 ("ARM: OMAP44xx:
clock: drop obsolete clock data") from the arm-soc tree.

I just deleted the file as the latter did and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
	linux-arm-kernel@lists.infradead.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Omar Ramirez Luna <omar.luna@linaro.org>,
	Joerg Roedel <joro@8bytes.org>, Paul Walmsley <paul@pwsan.com>,
	Mike Turquette <mturquette@ti.com>
Subject: linux-next: manual merge of the arm-soc tree with the iommu tree
Date: Tue, 4 Dec 2012 15:42:03 +1100	[thread overview]
Message-ID: <20121204154203.f0e7e87d1ae99e5c528434f8@canb.auug.org.au> (raw)

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/clock44xx_data.c between commit 298ea44f211d ("ARM:
OMAP4: hwmod data: ipu and dsp to use parent clocks instead of leaf
clocks") from the iommu tree and commit 13a5b6228679 ("ARM: OMAP44xx:
clock: drop obsolete clock data") from the arm-soc tree.

I just deleted the file as the latter did and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

WARNING: multiple messages have this Message-ID (diff)
From: sfr@canb.auug.org.au (Stephen Rothwell)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the arm-soc tree with the iommu tree
Date: Tue, 4 Dec 2012 15:42:03 +1100	[thread overview]
Message-ID: <20121204154203.f0e7e87d1ae99e5c528434f8@canb.auug.org.au> (raw)

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/clock44xx_data.c between commit 298ea44f211d ("ARM:
OMAP4: hwmod data: ipu and dsp to use parent clocks instead of leaf
clocks") from the iommu tree and commit 13a5b6228679 ("ARM: OMAP44xx:
clock: drop obsolete clock data") from the arm-soc tree.

I just deleted the file as the latter did and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20121204/3c83aa90/attachment.sig>

             reply	other threads:[~2012-12-04  4:42 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-04  4:42 Stephen Rothwell [this message]
2012-12-04  4:42 ` linux-next: manual merge of the arm-soc tree with the iommu tree Stephen Rothwell
2012-12-04  4:42 ` Stephen Rothwell
2012-12-04 11:06 ` Joerg Roedel
2012-12-04 11:06   ` Joerg Roedel
2012-12-04 11:10   ` Ohad Ben-Cohen
2012-12-04 11:10     ` Ohad Ben-Cohen
2012-12-06 22:54     ` Omar Ramirez Luna
2012-12-06 22:54       ` Omar Ramirez Luna
2012-12-06 22:54       ` Omar Ramirez Luna
2012-12-07  0:59       ` Paul Walmsley
2012-12-07  0:59         ` Paul Walmsley
2012-12-07  1:39         ` Omar Ramirez Luna
2012-12-07  1:39           ` Omar Ramirez Luna
2012-12-07  1:40           ` Paul Walmsley
2012-12-07  1:40             ` Paul Walmsley
2013-02-07  4:44 Stephen Rothwell
2013-02-07  4:44 ` Stephen Rothwell
2013-02-07  4:44 ` Stephen Rothwell
2013-02-07  4:48 Stephen Rothwell
2013-02-07  4:48 ` Stephen Rothwell
2013-02-07  4:48 ` 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=20121204154203.f0e7e87d1ae99e5c528434f8@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=arnd@arndb.de \
    --cc=joro@8bytes.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mturquette@ti.com \
    --cc=olof@lixom.net \
    --cc=omar.luna@linaro.org \
    --cc=paul@pwsan.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
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.