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

Re: SCSI trees, merges and git status

From
JBJames Bottomley <james.bottomley@steeleye.com>
Date
Apr 18, 2005, 23:14 UTC
Message-ID
<1113866092.4998.92.camel@mulgrave>
In-Reply-To
<Pine.LNX.4.58.0504181429570.15725@ppc970.osdl.org>
On Mon, 2005-04-18 at 14:39 -0700, Linus Torvalds wrote:
Show 9 quoted lines
> > Linus, the rc-fixes repo is ready for applying ... it's the same one I
> > announced on linux-scsi and lkml a while ago just with the git date
> > information updated to be correct (the misc one should wait until after
> > 2.6.12 is final).
> 
> Ok. Can you verify? I did a "git diff" between your old head and my new
> head, and it did not show any SCSI files (only the expected arm etc stuff
> that you didn't have in your), so it all _looks_ good. But hey, just to
> make sure that I didn't do anything stupid..
Actually, the verify fails, according to bitkeeper.

It looks like the merge tree has contamination from the scsi-misc-2.6 tree ... possibly because the hosting system got the merged objects when I pushed.

Could you strip it back and I'll check out the repos on www.parisc- linux.org?

Thanks,
James
Previous: Linus TorvaldsNext: Linus Torvalds
Message 3 of 13 in “SCSI trees, merges and git status”
  1. James BottomleyApr 18, 2005
  2. Linus TorvaldsApr 18, 2005
  3. James BottomleyApr 18, 2005
  4. Linus TorvaldsApr 19, 2005
  5. David WoodhouseApr 19, 2005
  6. James BottomleyApr 19, 2005
  7. David WoodhouseApr 19, 2005
  8. James BottomleyApr 19, 2005
  9. Linus TorvaldsApr 19, 2005
  10. James BottomleyApr 19, 2005
  11. Linus TorvaldsApr 19, 2005
  12. Junio C HamanoApr 18, 2005
  13. Petr BaudisApr 18, 2005

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.