Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Thu, 11 Jul 2019 15:15:07 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>, Jaegeuk Kim <jaegeuk@kernel.org>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Tejun Heo <tj@kernel.org>, Chao Yu <yuchao0@huawei.com>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20190711151507.7ec1fd18@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/fQ6oCqxHszi+mJrDNm=bKkS"; protocol="application/pgp-signature"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/fQ6oCqxHszi+mJrDNm=bKkS
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

After merging the block tree, today's linux-next build (x86_64
allmodconfig) failed like this:

fs/f2fs/data.c: In function 'f2fs_merge_page_bio':
fs/f2fs/data.c:516:3: error: implicit declaration of function 'wbc_account_=
io'; did you mean 'blk_account_rq'? [-Werror=3Dimplicit-function-declaratio=
n]
   wbc_account_io(fio->io_wbc, page, PAGE_SIZE);
   ^~~~~~~~~~~~~~
   blk_account_rq

Caused by commit

  34e51a5e1a6e ("blkcg, writeback: Rename wbc_account_io() to wbc_account_c=
group_owner()")

interacting with commit

  8648de2c581e ("f2fs: add bio cache for IPU")

from the f2fs tree.

I added the following merge fix patch or today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 11 Jul 2019 15:13:21 +1000
Subject: [PATCH] f2fs: fix for wbc_account_io rename

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/f2fs/data.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 323306630f93..4eb2f3920140 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -513,7 +513,7 @@ int f2fs_merge_page_bio(struct f2fs_io_info *fio)
 	}
=20
 	if (fio->io_wbc)
-		wbc_account_io(fio->io_wbc, page, PAGE_SIZE);
+		wbc_account_cgroup_owner(fio->io_wbc, page, PAGE_SIZE);
=20
 	inc_page_count(fio->sbi, WB_DATA_TYPE(page));
=20
--=20
2.20.1

--=20
Cheers,
Stephen Rothwell

--Sig_/fQ6oCqxHszi+mJrDNm=bKkS
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl0mxdsACgkQAVBC80lX
0Gyumgf/UyFml7MpbpYLD24HTtwSzldMXQGaillCox1LdkDuLoyaoFD46ik8w8Ob
Jsf9tsY7i6Qa/UxLdyeQ9d5VmHXvvCMHr3m9EoT7pD6D3GHGnzZrl1dtJ1pk6gr5
MfuWjM4nfBL6dRkfk9ncExi6bE7SpnReh5Om2+RfyVuHhKwfcqSLoiR2BoZZbSkI
/6IsAbypmqJMz2R80C7jcHC4a6UhW7d+Ec6zFGTC6l2OKxOEmcOZI+QDtOcHG1pJ
wh81kfAYZvJtC2TeIEVWrZZIERFDxiQZg/cty+BfZ4XNQKeMVohVVNHi1pZSy01Q
U3zzmRxikc0gFLdKUHUmRnONb9P5jw==
=yale
-----END PGP SIGNATURE-----

--Sig_/fQ6oCqxHszi+mJrDNm=bKkS--