From: Stephen Rothwell <sfr@canb•auug.org.au>
To: James Morris <jmorris@namei•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
git@vger•kernel.org, Linus <torvalds@linux-foundation•org>,
John Johansen <john.johansen@canonical•com>
Subject: Re: linux-next: manual merge of the security-testing tree with the tree
Date: Thu, 30 Jun 2011 15:53:54 +1000 [thread overview]
Message-ID: <20110630155354.bdd620b5.sfr@canb.auug.org.au> (raw)
In-Reply-To: <alpine.LRH.2.00.1106301518430.13767@tundra.namei.org>
[-- Attachment #1: Type: text/plain, Size: 726 bytes --]
Hi James,
On Thu, 30 Jun 2011 15:22:33 +1000 (EST) James Morris <jmorris@namei•org> wrote:
>
> On Thu, 30 Jun 2011, Stephen Rothwell wrote:
>
> > I cannot merge commit bcd05ca10420 ("Merge branch 'for-security' of
> > git://git.kernel.org/pub/scm/linux/kernel/git/jj/apparmor-dev into next")
> > which is the child of the above two commits.
>
> Actually, I may have accidentally pulled upstream commits in via the
> above. I'll rebase my tree to the TOMOYO merge.
It does pull in v3.0-rc5, but that is already in my tree today, so I
still don't understand why the merge I did gets so messaed up.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next prev parent reply other threads:[~2011-06-30 5:53 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-30 4:29 linux-next: manual merge of the security-testing tree with the tree Stephen Rothwell
2011-06-30 4:33 ` Stephen Rothwell
2011-06-30 4:39 ` Stephen Rothwell
2011-06-30 5:22 ` James Morris
2011-06-30 5:53 ` Stephen Rothwell [this message]
2011-06-30 7:25 ` Uwe Kleine-König
2011-06-30 9:30 ` Stephen Rothwell
2011-06-30 12:17 ` Uwe Kleine-König
2011-06-30 16:20 ` Linus Torvalds
2011-06-30 18:52 ` Junio C Hamano
2011-06-30 19:13 ` Jeff King
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=20110630155354.bdd620b5.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=git@vger$(echo .)kernel.org \
--cc=jmorris@namei$(echo .)org \
--cc=john.johansen@canonical$(echo .)com \
--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