From: Stephen Rothwell <sfr@canb•auug.org.au>
To: James Morris <jmorris@namei•org>
Cc: Linus Torvalds <torvalds@linux-foundation•org>,
Casey Schaufler <casey@schaufler-ca•com>,
linux-next@vger•kernel.org,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: Re: linux-next: unusual update of the security tree
Date: Fri, 7 Dec 2012 08:27:30 +1100 [thread overview]
Message-ID: <20121207082730.bef9a35c7a75cc433a8a0faf@canb.auug.org.au> (raw)
In-Reply-To: <CA+55aFwJDtofV36R_ot8qj31BCGwBgDsGOKRkMRhRLamf5M+mw@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 664 bytes --]
Hi James,
On Thu, 6 Dec 2012 08:25:21 -0800 Linus Torvalds <torvalds@linux-foundation•org> wrote:
>
> Have people pulled that thing into anything else? Because quite
> frankly, I think it's unsalvageable except with a rebase.
So to be explicit, I think you need to do this:
- tell as many people as possible that you are going to rebase
your tree
- reset your tree back to the point just before you pulled Casey's
tree (3f0cc6ae8662).
- Casey needs to rebase his tree on top of yours
- then after Casey has tested his tree again you can repull his
new tree.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2012-12-06 21:27 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-27 23:16 linux-next: unusual update of the security tree Stephen Rothwell
2012-11-27 23:28 ` Stephen Rothwell
2012-11-27 23:30 ` Linus Torvalds
2012-11-27 23:57 ` Stephen Rothwell
2012-11-27 23:45 ` Casey Schaufler
2012-11-28 0:01 ` Stephen Rothwell
[not found] ` <CA+55aFwdk9FiW4u_f-Dq6+jtuD9kY-zBqPpMVc2OHJFnzaAbzA@mail.gmail.com>
2012-12-03 15:26 ` James Morris
2012-12-06 13:25 ` James Morris
2012-12-06 16:25 ` Linus Torvalds
2012-12-06 21:27 ` Stephen Rothwell [this message]
2012-12-06 23:21 ` James Morris
2012-12-06 23:56 ` Casey Schaufler
2012-12-13 2:24 ` Stephen Rothwell
2012-12-14 3:11 ` James Morris
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=20121207082730.bef9a35c7a75cc433a8a0faf@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=casey@schaufler-ca$(echo .)com \
--cc=jmorris@namei$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=torvalds@linux-foundation$(echo .)org \
/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