From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andy Lutomirski <luto@amacapital•net>
Cc: Paul McKenney <paulmck@linux•vnet.ibm.com>,
"linux-next@vger•kernel.org" <linux-next@vger•kernel.org>,
"linux-kernel@vger•kernel.org" <linux-kernel@vger•kernel.org>
Subject: Re: linux-next: question about the luto-misc tree
Date: Fri, 26 Dec 2014 12:33:36 +1100 [thread overview]
Message-ID: <20141226123336.30fba599@canb.auug.org.au> (raw)
In-Reply-To: <CALCETrXfc5SpjOUfRuj7d5Kzushjucw-njcGT+XW6L26c3BFyA@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 850 bytes --]
Hi Andy,
On Mon, 22 Dec 2014 11:16:56 -0800 Andy Lutomirski <luto@amacapital•net> wrote:
>
> I'm re-adding the branch, since 3.19-rc1 is out, the change appears to
> still exist as-is in your tree, and it merges cleanly and builds in
> the latest -next for me. Let me know if this will be problematic for
> any reason.
So, now we have a problem because Paul has rebased a whole set of
commits that you have in your tree. Commits c6dc129cf2d1 to
f58d100f65ae in your tree Paul has rebased on top of v3.19-rc1. If you
are going to base your tree on (part of) Paul's tree, then Paul has to
agree to not rebase that part of his tree or you have to keep a watch
on his tree and rebase you tree on top of those rebased commits.
Really, the first should happen.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2014-12-26 1:33 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-14 6:57 linux-next: question about the luto-misc tree Stephen Rothwell
2014-12-14 7:26 ` Andy Lutomirski
2014-12-14 12:03 ` Paul E. McKenney
2014-12-14 16:29 ` Andy Lutomirski
2014-12-14 17:37 ` Paul E. McKenney
2014-12-14 17:41 ` Andy Lutomirski
2014-12-14 18:17 ` Paul E. McKenney
2014-12-22 19:16 ` Andy Lutomirski
2014-12-26 1:33 ` Stephen Rothwell [this message]
2014-12-26 17:02 ` Paul E. McKenney
2014-12-28 18:17 ` Andy Lutomirski
[not found] ` <CALCETrWaT019BZoyhp-CkcCiEXYEumvjF2pA6GHk0Mo-sPngTQ@mail.gmail.com>
2014-12-31 13:16 ` Paul E. McKenney
2014-12-14 12:04 ` 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=20141226123336.30fba599@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=luto@amacapital$(echo .)net \
--cc=paulmck@linux$(echo .)vnet.ibm.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