From: Jan Kara <jack@suse•cz>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Theodore Tso <tytso@MIT•EDU>,
linux-next@vger•kernel.org, Mingming Cao <cmm@us•ibm.com>
Subject: Re: linux-next: manual merge of the ext4 tree with the tree
Date: Wed, 25 Feb 2009 10:43:59 +0100 [thread overview]
Message-ID: <20090225094359.GA27960@duck.suse.cz> (raw)
In-Reply-To: <20090225125254.6e94f404.sfr@canb.auug.org.au>
On Wed 25-02-09 12:52:54, Stephen Rothwell wrote:
> 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.
Honza
--
Jan Kara <jack@suse•cz>
SUSE Labs, CR
next prev parent reply other threads:[~2009-02-25 9:44 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 [this message]
2009-02-26 6:03 ` Theodore Tso
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=20090225094359.GA27960@duck.suse.cz \
--to=jack@suse$(echo .)cz \
--cc=cmm@us$(echo .)ibm.com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tytso@MIT$(echo .)EDU \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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