* linux-next: manual merge of the block tree with the ubifs tree
@ 2009-09-02 5:36 Stephen Rothwell
2009-09-02 5:42 ` Artem Bityutskiy
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2009-09-02 5:36 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-next, linux-kernel, Artem Bityutskiy
[-- 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 --]
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: linux-next: manual merge of the block tree with the ubifs tree
2009-09-02 5:36 linux-next: manual merge of the block tree with the ubifs tree Stephen Rothwell
@ 2009-09-02 5:42 ` Artem Bityutskiy
0 siblings, 0 replies; 2+ messages in thread
From: Artem Bityutskiy @ 2009-09-02 5:42 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Jens Axboe, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org
On 09/02/2009 08:36 AM, ext Stephen Rothwell wrote:
> 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.
Yeah, I remove the call because it is not needed anymore.
--
Best Regards,
Artem Bityutskiy (Артём Битюцкий)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-09-02 5:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-02 5:36 linux-next: manual merge of the block tree with the ubifs tree Stephen Rothwell
2009-09-02 5:42 ` Artem Bityutskiy
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).