git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: linux-next: manual merge of the security-testing tree with the tree

From
SRStephen Rothwell <sfr@canb.auug.org.au>
Date
Jun 30, 2011, 05:53 UTC
Message-ID
<20110630155354.bdd620b5.sfr@canb.auug.org.au>
In-Reply-To
<alpine.LRH.2.00.1106301518430.13767@tundra.namei.org>
Hi James,
On Thu, 30 Jun 2011 15:22:33 +1000 (EST) James Morris <jmorris@namei.org> wrote:
Show 9 quoted lines
>
> 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/
Previous: James MorrisNext: Uwe Kleine-König
Message 5 of 11 in “linux-next: manual merge of the security-testing tree with the tree”
  1. Stephen RothwellJun 30, 2011
  2. Stephen RothwellJun 30, 2011
  3. Stephen RothwellJun 30, 2011
  4. James MorrisJun 30, 2011
  5. Stephen RothwellJun 30, 2011
  6. Uwe Kleine-KönigJun 30, 2011
  7. Stephen RothwellJun 30, 2011
  8. Uwe Kleine-KönigJun 30, 2011
  9. Linus TorvaldsJun 30, 2011
  10. Junio C HamanoJun 30, 2011
  11. Jeff KingJun 30, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.