From: Christoph Hellwig <hch@infradead.org>
To: Felix Blyakher <felixb@sgi.com>
Cc: Christoph Hellwig <hch@infradead.org>, xfs@oss.sgi.com
Subject: Re: [PATCH 0/2, RESEND] [XFS] a couple of fixes
Date: Wed, 8 Apr 2009 09:33:50 -0400 [thread overview]
Message-ID: <20090408133350.GA12013@infradead.org> (raw)
In-Reply-To: <09C35383-EA8E-4EC2-A067-B3FA327AFF4C@sgi.com>
On Tue, Apr 07, 2009 at 11:45:33PM -0500, Felix Blyakher wrote:
>
> On Apr 6, 2009, at 5:28 PM, Christoph Hellwig wrote:
>
>> I've sucked these patches into my tree after reviewin and QAing them.
>> Felix, can you pull this and send it to Linus for 2.6.30?
>>
>> git://git.kernel.org/pub/scm/fs/xfs/xfs.git
>
> I did pull from your tree, and pushed to oss.
> But I stopped short from pushing the for-linus branch,
> and generating the pull request, as I'm again seeing
> the 'merge' commits. I'll try to sort it out tomorrow.
Note that you will always see some merge commits of both merged trees
touched the same files. What Linus objected was the large amount of
merge commits. The way to bring them down is to simply do less merges,
just stay on the same mainline level for a longer time and only merge
with mainline short before you prepare a pull or when you really need it
due to conflicting changes making it in.
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
prev parent reply other threads:[~2009-04-08 13:34 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-15 11:25 [PATCH 0/2, RESEND] [XFS] a couple of fixes Dave Chinner
2009-03-15 11:25 ` [PATCH 1/2] [XFS] Validate log feature fields correctly Dave Chinner
2009-03-15 15:15 ` Christoph Hellwig
2009-03-16 10:49 ` Dave Chinner
2009-03-16 10:50 ` Christoph Hellwig
2009-03-15 11:25 ` [PATCH 2/2] [XFS] Fix double free of inode Dave Chinner
2009-03-15 15:13 ` Christoph Hellwig
2009-04-06 22:28 ` [PATCH 0/2, RESEND] [XFS] a couple of fixes Christoph Hellwig
2009-04-08 4:45 ` Felix Blyakher
2009-04-08 13:33 ` Christoph Hellwig [this message]
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=20090408133350.GA12013@infradead.org \
--to=hch@infradead.org \
--cc=felixb@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