From: Theodore Tso <tytso@mit.edu>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jens Axboe <jens.axboe@oracle.com>
Subject: Re: linux-next: manual merge of the ext4 tree with Linus tree
Date: Thu, 17 Sep 2009 09:22:43 -0400 [thread overview]
Message-ID: <20090917132243.GB24438@mit.edu> (raw)
In-Reply-To: <20090917115653.2e3b6b49.sfr@canb.auug.org.au>
On Thu, Sep 17, 2009 at 11:56:53AM +1000, Stephen Rothwell wrote:
> Hi Theodore,
>
> Today's linux-next merge of the ext4 tree got a conflict in
> include/trace/events/ext4.h between commit
> 1fe06ad89255c211fe100d7f690d10b161398df8 ("writeback: get rid of
> wbc->for_writepages") from Linus tree and commits
> b3107b75b479ff8f0a8aba9cdb38ec13284ce7eb ("ext4: Fix spelling typo in the
> trace format for trace_ext4_da_writepages()") from the ext4 tree.
>
> I fixed it up (see below) and can carry the fix for a while.
Thanks, this is in a patch series which I'm preparing to push to
Linus, so I've fixed it up on my end.
- Ted
next prev parent reply other threads:[~2009-09-17 13:22 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-17 1:56 linux-next: manual merge of the ext4 tree with Linus tree Stephen Rothwell
2009-09-17 13:22 ` Theodore Tso [this message]
2009-09-17 13:30 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2023-06-27 0:39 linux-next: manual merge of the ext4 tree with Linus' tree Stephen Rothwell
2023-06-27 6:37 ` Christoph Hellwig
2023-06-27 7:26 ` Stephen Rothwell
2021-06-07 0:27 Stephen Rothwell
2020-12-17 23:12 Stephen Rothwell
2020-10-20 23:03 Stephen Rothwell
2019-09-19 11:44 Mark Brown
2016-03-21 0:29 Stephen Rothwell
2013-08-13 1:33 Stephen Rothwell
2011-03-25 1:56 Stephen Rothwell
2011-03-25 14:45 ` Tejun Heo
2011-03-25 16:30 ` Sedat Dilek
2011-03-25 19:58 ` Ted Ts'o
2011-02-14 2:19 Stephen Rothwell
2010-10-28 0:45 Stephen Rothwell
2010-05-22 5:50 Stephen Rothwell
2009-02-02 2:56 Stephen Rothwell
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=20090917132243.GB24438@mit.edu \
--to=tytso@mit.edu \
--cc=jens.axboe@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).