From: Tony Lindgren <tony@atomide•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Olof Johansson <olof@lixom•net>, Arnd Bergmann <arnd@arndb•de>,
linux-arm-kernel@lists•infradead.org, linux-next@vger•kernel.org,
linux-kernel@vger•kernel.org, Suman Anna <s-anna@ti•com>,
Omar Ramirez Luna <omar.ramirez@copitl•com>,
Loic Pallardy <loic.pallardy@st•com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the mailbox tree
Date: Thu, 20 Jun 2013 23:53:10 -0700 [thread overview]
Message-ID: <20130621065310.GK5523@atomide.com> (raw)
In-Reply-To: <20130621164149.598b39bb78b6015057d03f6f@canb.auug.org.au>
* Stephen Rothwell <sfr@canb•auug.org.au> [130620 23:48]:
> Hi all,
>
> On Fri, 21 Jun 2013 16:26:56 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> >
> > Today's linux-next merge of the arm-soc tree got a conflict in
> > drivers/mailbox/Kconfig between commit a1824eaab70f ("mailbox: OMAP:
> > introduce mailbox framework") from the mailbox tree and commit
> > c869c75c16b3 ("mailbox/omap: move the OMAP mailbox framework to drivers")
> > from the arm-soc tree.
> >
> > I fixed it up (I suspect not properly - see below) and can carry the fix
> > as necessary (no action is required).
> >
> > It looks like we have two different versions of these changes in
> > linux-next now, so please clean it all up. i.e. can I just drop the
> > mailbox tree now?
>
> OK, things went steeply downhill from here, so I went back and removed
> the mailbox tree ...
I think Olof dropped the earlier version of the mailbox branch, and
remerged the updated mailbox branch. So if there was also yet another
mailbox branch being pulled into Linux next, then yes, dropping it is
the way to go.
Regards,
Tony
next prev parent reply other threads:[~2013-06-21 6:53 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-21 6:26 linux-next: manual merge of the arm-soc tree with the mailbox tree Stephen Rothwell
2013-06-21 6:41 ` Stephen Rothwell
2013-06-21 6:53 ` Tony Lindgren [this message]
2013-06-21 7:01 ` Olof Johansson
2013-06-21 7:12 ` Tony Lindgren
2013-06-21 7:36 ` Arnd Bergmann
2013-06-21 15:24 ` Suman Anna
2013-06-24 5:29 ` Stephen Rothwell
2013-06-21 7:48 ` Jassi Brar
-- strict thread matches above, loose matches on Subject: below --
2013-06-21 6:14 Stephen Rothwell
2013-06-21 6:08 Stephen Rothwell
2013-06-21 6:45 ` Tony Lindgren
2013-06-21 16:39 ` Anna, Suman
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=20130621065310.GK5523@atomide.com \
--to=tony@atomide$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=loic.pallardy@st$(echo .)com \
--cc=olof@lixom$(echo .)net \
--cc=omar.ramirez@copitl$(echo .)com \
--cc=s-anna@ti$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/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