public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Lachlan McIlroy <lachlan@sgi.com>
To: xfs@oss.sgi.com
Subject: Re: git tree updates....
Date: Mon, 20 Oct 2008 13:17:21 +1000	[thread overview]
Message-ID: <48FBF841.1060603@sgi.com> (raw)
In-Reply-To: <20081017054742.GH31761@disturbed>

Dave Chinner wrote:
> Lachlan,
> 
> I just noticed you've been updating the git tree. You might want to
> change the order that certain patches have been committed - the
> changes to the fs/inode.c needed to be committed before the changes
> to fs/xfs/xfs_inode.c that use them. They've been committed the
> wrong way around and about 20 commits apart, so there's significant
> region in the commit history where the kernel will fail to build.
> Given the distance between the commits, there's a fair chance that
> a git bisect could land in this range of compiliation failures.
> 
> Any chance of redoing these commits before you push to Linus so
> that they are ordered correctly in the git tree?

Yeah I'll try to get them back in the right order.  Our merge tools
conveniently missed anything outside fs/xfs so I didn't realise I had
missed them until after I merge all the XFS mods.  I just wanted to
get something out for linux-next and also since the cvs tree was busted.

Out of curiosity Dave, why didn't you send those changes directly to
Linus?

  reply	other threads:[~2008-10-20  2:16 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-17  5:47 git tree updates Dave Chinner
2008-10-20  3:17 ` Lachlan McIlroy [this message]
2008-10-20  5:35   ` Dave Chinner
2008-10-20 21:43 ` Christoph Hellwig
2008-10-21  2:00   ` Lachlan McIlroy

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=48FBF841.1060603@sgi.com \
    --to=lachlan@sgi.com \
    --cc=xfs@oss.sgi.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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