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,
H Hartley Sweeten <hartleys@visionengravers.com>,
Al Viro <viro@ZenIV.linux.org.uk>
Subject: linux-next: manual merge of the block tree with the vfs tree
Date: Tue, 18 May 2010 13:04:01 +1000 [thread overview]
Message-ID: <20100518130401.f6286112.sfr@canb.auug.org.au> (raw)
Hi Jens,
Today's linux-next merge of the block tree got a conflict in
fs/fs-writeback.c between commit 1c9539ad0dd1c3c3964ea35d5a355a0ed19c39c7
("fs-writeback.c: bitfields should be unsigned") from the vfs tree and
commit e913fc825dc685a444cb4c1d0f9d32f372f59861 ("writeback: fix
WB_SYNC_NONE writeback from umount") from the block tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc fs/fs-writeback.c
index 24e85ce,0f62957..0000000
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@@ -42,9 -42,10 +42,10 @@@ struct wb_writeback_args
long nr_pages;
struct super_block *sb;
enum writeback_sync_modes sync_mode;
- int for_kupdate:1;
- int range_cyclic:1;
- int for_background:1;
- int sb_pinned:1;
+ unsigned int for_kupdate:1;
+ unsigned int range_cyclic:1;
+ unsigned int for_background:1;
++ unsigned int sb_pinned:1;
};
/*
next reply other threads:[~2010-05-18 3:04 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-18 3:04 Stephen Rothwell [this message]
2010-05-18 15:37 ` linux-next: manual merge of the block tree with the vfs tree H Hartley Sweeten
2013-04-04 2:16 Stephen Rothwell
2015-01-27 3:57 Stephen Rothwell
2015-01-27 4:00 ` Jens Axboe
2015-01-27 4:54 ` Al Viro
2015-01-28 17:11 ` Christoph Hellwig
2015-01-29 5:15 ` Al Viro
2015-02-01 5:56 ` Al Viro
2015-02-02 8:06 ` Christoph Hellwig
2015-02-09 3:55 Stephen Rothwell
2016-12-12 1:31 Stephen Rothwell
2016-12-12 1:44 ` Al Viro
2016-12-12 2:00 ` Ming Lei
2017-02-02 2:44 Stephen Rothwell
2017-02-21 22:14 ` Stephen Rothwell
2018-05-29 4:33 Stephen Rothwell
2018-05-29 8:12 ` Christoph Hellwig
2018-05-29 14:22 ` Jens Axboe
2018-05-29 21:40 ` Stephen Rothwell
2018-05-29 22:17 ` Jens Axboe
2018-05-29 4:37 Stephen Rothwell
2019-12-20 1:36 Stephen Rothwell
2019-12-20 5:34 ` Jens Axboe
2020-01-20 1:40 ` Stephen Rothwell
2020-01-20 2:45 ` Jens Axboe
2020-01-20 2:57 ` Jens Axboe
2021-01-27 3:24 Stephen Rothwell
2022-05-23 2:28 Stephen Rothwell
2022-05-23 2:58 ` Jens Axboe
2022-05-23 22:54 ` Stephen Rothwell
2022-07-11 3:38 Stephen Rothwell
2022-07-11 3:57 Stephen Rothwell
2022-07-14 2:08 Stephen Rothwell
2022-07-14 16:36 ` Jens Axboe
2022-07-15 0:52 ` Al Viro
2022-07-15 1:04 ` Al Viro
2022-07-18 2:59 ` Stephen Rothwell
2022-07-18 4:58 ` Al Viro
2022-07-19 16:52 ` Jens Axboe
2022-07-20 2:45 ` Al Viro
2022-07-20 3:00 ` Jens Axboe
2022-07-15 3:09 Stephen Rothwell
2022-11-28 0:20 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=20100518130401.f6286112.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=hartleys@visionengravers.com \
--cc=jens.axboe@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=viro@ZenIV.linux.org.uk \
/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).