From: Arnd Bergmann <arnd@arndb•de>
To: Tony Lindgren <tony@atomide•com>
Cc: Olof Johansson <olof@lixom•net>,
Stephen Rothwell <sfr@canb•auug.org.au>,
"linux-arm-kernel@lists•infradead.org"
<linux-arm-kernel@lists•infradead.org>,
linux-next@vger•kernel.org,
"linux-kernel@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: Fri, 21 Jun 2013 09:36:09 +0200 [thread overview]
Message-ID: <201306210936.09593.arnd@arndb.de> (raw)
In-Reply-To: <20130621071239.GM5523@atomide.com>
On Friday 21 June 2013, Tony Lindgren wrote:
> > I wonder if this mess is caused by the fact that I did the revert
> > instead of rebuilding our for-next and dropping the merge in the first
> > place.
> >
> > I'll rebuild our for-next (or maybe Arnd will beat me to it) before
> > next linux-next build, i.e. Sunday night my time.
>
> Could be, especially if some of the commits are the same in the reverted
> branch and newly merged branch as git might think that some merges have
> been already resolved the right way earlier.
I already rebuilt the arm-soc tree before Stephen started with today's
linux-next, so I think the conflict is elsewhere.
It's probably best if Suman Anna rebases the mailbox tree on top of
the omap mailbox branch that I took.
Arnd
next prev parent reply other threads:[~2013-06-21 7:36 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
2013-06-21 7:01 ` Olof Johansson
2013-06-21 7:12 ` Tony Lindgren
2013-06-21 7:36 ` Arnd Bergmann [this message]
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=201306210936.09593.arnd@arndb.de \
--to=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 \
--cc=tony@atomide$(echo .)com \
/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