All of lore.kernel.org
 help / color / mirror / Atom feed
From: Theodore Tso <tytso@mit.edu>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, Mingming Cao <cmm@us.ibm.com>,
	Jan Kara <jack@suse.cz>
Subject: Re: linux-next: manual merge of the ext4 tree with the  tree
Date: Thu, 26 Feb 2009 01:03:45 -0500	[thread overview]
Message-ID: <20090226060345.GC7227@mit.edu> (raw)
In-Reply-To: <20090225125254.6e94f404.sfr@canb.auug.org.au>

On Wed, Feb 25, 2009 at 12:52:54PM +1100, Stephen Rothwell wrote:
> Hi Ted,
> 
> Today's linux-next merge of the ext4 tree got a conflict in
> fs/ext4/ext4.h between commit 7c989bb2f1b18268968ce44c603f18a9854b1b85
> ("ext4: quota reservation for delayed allocation") from the quota tree
> and commit eafffefbb8cc3db4acebb75014091b473c60007d ("ext4: add
> EXT4_IOC_ALLOC_DA_BLKS ioctl") from the ext4 tree.
> 
> Just overlapping additions. I fixed it up (see below) and can carry the
> fix as necessary.

Thanks, I've moved up the function declaration to avoid the need for a
manual fixup.

						- Ted

  parent reply	other threads:[~2009-02-26  6:03 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-02-25  1:52 linux-next: manual merge of the ext4 tree with the tree Stephen Rothwell
2009-02-25  9:43 ` Jan Kara
2009-02-26  6:03 ` Theodore Tso [this message]
2009-02-26  8:36   ` Stephen Rothwell
2009-02-26 14:08     ` Theodore Tso
  -- strict thread matches above, loose matches on Subject: below --
2009-02-27  2:03 Stephen Rothwell
2009-03-03 19:09 ` Jan Kara

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=20090226060345.GC7227@mit.edu \
    --to=tytso@mit.edu \
    --cc=cmm@us.ibm.com \
    --cc=jack@suse.cz \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.