From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jaegeuk Kim <jaegeuk@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>, Chao Yu <chao@kernel.org>,
Chao Yu <yuchao0@huawei.com>, Christoph Hellwig <hch@lst.de>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the block tree with the f2fs tree
Date: Thu, 17 Dec 2020 12:50:52 +1100 [thread overview]
Message-ID: <20201217125052.50be70b6@canb.auug.org.au> (raw)
In-Reply-To: <20201215071212.7a83aade@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2785 bytes --]
Hi all,
On Tue, 15 Dec 2020 07:12:12 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Thu, 3 Dec 2020 14:43:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the block tree got conflicts in:
> >
> > fs/f2fs/checkpoint.c
> > fs/f2fs/f2fs.h
> > fs/f2fs/super.c
> >
> > between commit:
> >
> > 5c0602188dc7 ("f2fs: fix kbytes written stat for multi-device case")
> >
> > from the f2fs tree and commits:
> >
> > 8446fe9255be ("block: switch partition lookup to use struct block_device")
> > 9499ffc75217 ("f2fs: remove a few bd_part checks")
> >
> > from the block tree.
> >
> > I fixed it up (I think, see below, fs/f2fs/f2fs.h and fs/f2fs/super.c
> > used the versions from the f2fs tree) and can carry the fix as
> > necessary. This is now fixed as far as linux-next is concerned, but any
> > non trivial conflicts should be mentioned to your upstream maintainer
> > when your tree is submitted for merging. You may also want to consider
> > cooperating with the maintainer of the conflicting tree to minimise any
> > particularly complex conflicts.
> >
> >
> > diff --cc fs/f2fs/checkpoint.c
> > index 14ba1519639e,54a1905af052..000000000000
> > --- a/fs/f2fs/checkpoint.c
> > +++ b/fs/f2fs/checkpoint.c
> > @@@ -1385,27 -1385,6 +1385,26 @@@ static void commit_checkpoint(struct f2
> > f2fs_submit_merged_write(sbi, META_FLUSH);
> > }
> >
> > +static inline u64 get_sectors_written(struct block_device *bdev)
> > +{
> > - return bdev->bd_part ?
> > - (u64)part_stat_read(bdev->bd_part, sectors[STAT_WRITE]) : 0;
> > ++ return (u64)part_stat_read(bdev, sectors[STAT_WRITE]) : 0;
> ^^^^
> With this removed.
>
> > +}
> > +
> > +u64 f2fs_get_sectors_written(struct f2fs_sb_info *sbi)
> > +{
> > + if (f2fs_is_multi_device(sbi)) {
> > + u64 sectors = 0;
> > + int i;
> > +
> > + for (i = 0; i < sbi->s_ndevs; i++)
> > + sectors += get_sectors_written(FDEV(i).bdev);
> > +
> > + return sectors;
> > + }
> > +
> > + return get_sectors_written(sbi->sb->s_bdev);
> > +}
> > +
> > static int do_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)
> > {
> > struct f2fs_checkpoint *ckpt = F2FS_CKPT(sbi);
> > diff --cc fs/f2fs/f2fs.h
> > index 5cd1b9f7cc53,49681a8d2b14..000000000000
> > --- a/fs/f2fs/f2fs.h
> > +++ b/fs/f2fs/f2fs.h
> > diff --cc fs/f2fs/super.c
> > index 47858e0c5e95,af9f449da64b..000000000000
> > --- a/fs/f2fs/super.c
> > +++ b/fs/f2fs/super.c
>
> Just a reminder that the above conflict still exists.
This is now a conflict between the f2fs tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-12-17 1:51 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-03 3:43 linux-next: manual merge of the block tree with the f2fs tree Stephen Rothwell
2020-12-03 3:47 ` Chao Yu
2020-12-03 3:57 ` Stephen Rothwell
2020-12-14 20:12 ` Stephen Rothwell
2020-12-17 1:50 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-11-22 3:42 Stephen Rothwell
2016-07-11 4:52 Stephen Rothwell
2016-06-20 2:37 Stephen Rothwell
2016-06-09 3:26 Stephen Rothwell
2016-06-09 3:34 ` Stephen Rothwell
2015-07-30 3:19 Stephen Rothwell
2014-01-06 6:03 Stephen Rothwell
2013-12-18 3:57 Stephen Rothwell
2013-12-12 2:57 Stephen Rothwell
2013-12-02 4:04 Stephen Rothwell
2013-11-26 1:00 Stephen Rothwell
2013-11-26 0:56 Stephen Rothwell
2013-11-01 3:29 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=20201217125052.50be70b6@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=axboe@kernel.dk \
--cc=chao@kernel.org \
--cc=hch@lst.de \
--cc=jaegeuk@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=yuchao0@huawei.com \
/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).