From: Marc Zyngier <marc.zyngier@arm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Tony Lindgren <tony@atomide.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Felipe Balbi <balbi@ti.com>
Subject: Re: linux-next: manual merge of the pm tree with the omap tree
Date: Mon, 19 Oct 2015 08:16:03 +0100 [thread overview]
Message-ID: <20151019081603.0c5fbba8@arm.com> (raw)
In-Reply-To: <20151019115908.7f4d59d2@canb.auug.org.au>
On Mon, 19 Oct 2015 11:59:08 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
Hi Stephen,
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in:
>
> arch/arm/mach-omap2/timer.c
>
> between commits:
>
> 3afbb9afe2c4 ("arm: omap2: timer: move realtime_counter_init() around")
> 9c46ffcd5214 ("arm: omap2: timer: always call clocksource_of_init() when DT")
>
> from the omap tree and commit:
>
> 3722ed2380ad ("clocksource: cosmetic: Drop OF 'dependency' from symbols")
>
> from the pm tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
[...]
Looks great, thanks!
M.
--
Jazz is not dead. It just smells funny.
WARNING: multiple messages have this Message-ID (diff)
From: Marc Zyngier <marc.zyngier@arm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Tony Lindgren <tony@atomide.com>, <linux-next@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, Felipe Balbi <balbi@ti.com>
Subject: Re: linux-next: manual merge of the pm tree with the omap tree
Date: Mon, 19 Oct 2015 08:16:03 +0100 [thread overview]
Message-ID: <20151019081603.0c5fbba8@arm.com> (raw)
In-Reply-To: <20151019115908.7f4d59d2@canb.auug.org.au>
On Mon, 19 Oct 2015 11:59:08 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
Hi Stephen,
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in:
>
> arch/arm/mach-omap2/timer.c
>
> between commits:
>
> 3afbb9afe2c4 ("arm: omap2: timer: move realtime_counter_init() around")
> 9c46ffcd5214 ("arm: omap2: timer: always call clocksource_of_init() when DT")
>
> from the omap tree and commit:
>
> 3722ed2380ad ("clocksource: cosmetic: Drop OF 'dependency' from symbols")
>
> from the pm tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
[...]
Looks great, thanks!
M.
--
Jazz is not dead. It just smells funny.
next prev parent reply other threads:[~2015-10-19 7:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-19 0:59 linux-next: manual merge of the pm tree with the omap tree Stephen Rothwell
2015-10-19 7:16 ` Marc Zyngier [this message]
2015-10-19 7:16 ` Marc Zyngier
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=20151019081603.0c5fbba8@arm.com \
--to=marc.zyngier@arm.com \
--cc=balbi@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=sfr@canb.auug.org.au \
--cc=tony@atomide.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.