From: Andrew Morton <akpm@linux-foundation.org>
To: Jason Cooper <jason@lakedaemon.net>
Cc: Olof Johansson <olof@lixom.net>, Andrew Lunn <andrew@lunn.ch>,
Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jingoo Han <jg1.han@samsung.com>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org
Subject: Re: linux-next: manual merge of the akpm tree with the arm-soc tree
Date: Tue, 12 Mar 2013 13:20:07 -0700 [thread overview]
Message-ID: <20130312132007.d1336d28311d3fbda324942d@linux-foundation.org> (raw)
In-Reply-To: <20130312115339.GF12700@titan.lakedaemon.net>
On Tue, 12 Mar 2013 07:53:39 -0400 Jason Cooper <jason@lakedaemon.net> wrote:
> On Tue, Mar 12, 2013 at 04:37:39AM -0700, Olof Johansson wrote:
> > On Tue, Mar 12, 2013 at 4:12 AM, Jason Cooper <jason@lakedaemon.net> wrote:
> > > On Tue, Mar 12, 2013 at 07:25:09AM +0100, Andrew Lunn wrote:
> > >> On Tue, Mar 12, 2013 at 02:47:14PM +1100, Stephen Rothwell wrote:
> > >> > Hi Andrew,
> > >> >
> > >> > Today's linux-next merge of the akpm tree got a conflict in
> > >> > drivers/rtc/rtc-mv.c between commit 89c58c198b25 ("rtc: rtc-mv: Add
> > >> > support for clk to avoid lockups") from the arm-soc tree and commit "rtc:
> > >> > rtc-mv: use devm_rtc_device_register()" from the akpm tree.
> > >> >
> > >> > I fixed it up (I think - see below) and can carry the fix as necessary
> > >> > (no action is required).
> > >>
> > >> Hi Stephan
> > >>
> > >> Looks O.K. to me.
> > >>
> > >> Acked-by: Andrew Lunn <andrew@lunn.ch>
> > >
> > > Same here,
> > >
> > > Acked-by: Jason Cooper <jason@lakedaemon.net>
> >
> > We should make sure that future RTC changes get queued through AKPM
> > and not through us to avoid these kind of conflicts. Same as other
> > driver subsystems..
>
> I agree, however, this patch is part of a four patch series fixing a
> single problem reported by Simon Baatz:
>
> 89c58c1 rtc: rtc-mv: Add support for clk to avoid lockups
> de88747 gpio: mvebu: Add clk support to prevent lockup
> 7bf5b40 ARM: kirkwood: fix to retain gbe MAC addresses for DT kernels
> 93fff4c ARM: kirkwood: of_serial: fix clock gating by removing clock-frequency
Yep, don't go out of your way to avoid the cross-tree conflicts - we
fix those up all the time. It's best to keep a patch series like this
all in one place.
next prev parent reply other threads:[~2013-03-12 20:20 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-12 3:47 linux-next: manual merge of the akpm tree with the arm-soc tree Stephen Rothwell
2013-03-12 6:25 ` Andrew Lunn
2013-03-12 11:12 ` Jason Cooper
2013-03-12 11:37 ` Olof Johansson
2013-03-12 11:53 ` Jason Cooper
2013-03-12 12:48 ` Arnd Bergmann
2013-03-12 13:32 ` Jason Cooper
2013-03-12 20:20 ` Andrew Morton [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-06-21 7:36 Stephen Rothwell
2013-06-21 7:33 Stephen Rothwell
2012-05-17 7:18 Stephen Rothwell
2012-05-14 9:24 Stephen Rothwell
2012-05-14 21:57 ` Turquette, Mike
2012-02-29 6:21 Stephen Rothwell
2012-02-29 6:32 ` Yong Zhang
2012-02-29 6:54 ` Haojian Zhuang
2012-02-29 7:11 ` 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=20130312132007.d1336d28311d3fbda324942d@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=andrew@lunn.ch \
--cc=arnd@arndb.de \
--cc=jason@lakedaemon.net \
--cc=jg1.han@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).