From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jens Axboe <jens.axboe@oracle•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Artem Bityutskiy <Artem.Bityutskiy@nokia•com>
Subject: linux-next: manual merge of the block tree with the ubifs tree
Date: Wed, 2 Sep 2009 15:36:57 +1000 [thread overview]
Message-ID: <20090902153657.dc174bf6.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 612 bytes --]
Hi Jens,
Today's linux-next merge of the block tree got a conflict in
fs/ubifs/super.c between commit 887ee17117fd23e962332b353d250ac9e090b20f
("UBIFS: remove unneeded call from ubifs_sync_fs") from the ubifs tree
and commit 0184fca792940a9e4058b2c63b3f334326a4c7af ("writeback: move
super_block argument to struct writeback_control") from the block tree.
The former removes the code that the latter changes. I just used the
version from the ubifs tree. I can carry this fixup as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2009-09-02 5:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-02 5:36 Stephen Rothwell [this message]
2009-09-02 5:42 ` linux-next: manual merge of the block tree with the ubifs tree Artem Bityutskiy
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=20090902153657.dc174bf6.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Artem.Bityutskiy@nokia$(echo .)com \
--cc=jens.axboe@oracle$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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