From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Tue, 23 Feb 2010 13:26:19 +1100
Message-ID: <20100223132619.e6f5ff0e.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA1";
 boundary="Signature=_Tue__23_Feb_2010_13_26_19_+1100_OEfkwZWuAxQ9Lf8X"
Return-path: <linux-next-owner@vger.kernel.org>
Received: from chilli.pcug.org.au ([203.10.76.44]:57644 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752515Ab0BWC0c (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Mon, 22 Feb 2010 21:26:32 -0500
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <jens.axboe@oracle.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, dann frazier <dannf@hp.com>

--Signature=_Tue__23_Feb_2010_13_26_19_+1100_OEfkwZWuAxQ9Lf8X
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Jens,

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

usr/include/linux/cciss_ioctl.h:6: included file 'linux/cciss_defs.h' is no=
t exported

Caused by commit 429c42c9d246f5bda868495c09974312a0177328 ("cciss:
Consolidate duplicate bits in cciss_cmd.h & cciss_ioctl.h").

I have used the block tree from next-20100222 for today.
--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

--Signature=_Tue__23_Feb_2010_13_26_19_+1100_OEfkwZWuAxQ9Lf8X
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEARECAAYFAkuDPMsACgkQjjKRsyhoI8xKmACgkFrUIZJapGOXEbmEnShHgEhc
pm0Aniz60CD4/sgePHpEC3u2XcIbgKIP
=zGDJ
-----END PGP SIGNATURE-----

--Signature=_Tue__23_Feb_2010_13_26_19_+1100_OEfkwZWuAxQ9Lf8X--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Thu, 15 Apr 2010 12:42:22 +1000
Message-ID: <20100415124222.8e0e7132.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA1";
 boundary="Signature=_Thu__15_Apr_2010_12_42_22_+1000_15=DJSsZ0Rvv5DeR"
Return-path: <linux-next-owner@vger.kernel.org>
Received: from chilli.pcug.org.au ([203.10.76.44]:40727 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1756408Ab0DOCm2 (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Wed, 14 Apr 2010 22:42:28 -0400
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <jens.axboe@oracle.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Gui Jianfeng <guijianfeng@cn.fujitsu.com>, Divyesh Shah <dpshah@google.com>

--Signature=_Thu__15_Apr_2010_12_42_22_+1000_15=DJSsZ0Rvv5DeR
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Jens,

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

ERROR: "get_gendisk" [block/blk-cgroup.ko] undefined!
ERROR: "sched_clock" [block/blk-cgroup.ko] undefined!

Probably caused by commits 34d0f179d6dd711d3fc13c0820a456c59aae8048
("io-controller: Add a new interface "weight_device" for IO-Controller"),
9195291e5f05e01d67f9a09c756b8aca8f009089 ("blkio: Increment the blkio
cgroup stats for real now") and 812df48d127365ffd0869aa139738f572a86759c
("blkio: Add more debug-only per-cgroup stats").

I have used the version of the block tree from next-20100414 for today.
--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

--Signature=_Thu__15_Apr_2010_12_42_22_+1000_15=DJSsZ0Rvv5DeR
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEARECAAYFAkvGfQ4ACgkQjjKRsyhoI8wgbgCfaXMdyMN12sOnnqQMsdqUhikL
IokAnRYmz+TRmP4hx5dX4wBa9pe8aHlu
=XGmK
-----END PGP SIGNATURE-----

--Signature=_Thu__15_Apr_2010_12_42_22_+1000_15=DJSsZ0Rvv5DeR--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Divyesh Shah <dpshah@google.com>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Wed, 14 Apr 2010 22:23:25 -0700
Message-ID: <r2kaf41c7c41004142223m1464fd07u5617fe7332cb2ea@mail.gmail.com>
References: <20100415124222.8e0e7132.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: QUOTED-PRINTABLE
Return-path: <linux-next-owner@vger.kernel.org>
Received: from smtp-out.google.com ([74.125.121.35]:61824 "EHLO
	smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751328Ab0DOFXt convert rfc822-to-8bit (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Thu, 15 Apr 2010 01:23:49 -0400
In-Reply-To: <20100415124222.8e0e7132.sfr@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jens Axboe <jens.axboe@oracle.com>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Gui Jianfeng <guijianfeng@cn.fujitsu.com>

On Wed, Apr 14, 2010 at 7:42 PM, Stephen Rothwell <sfr@canb.auug.org.au=
> wrote:
> Hi Jens,
>
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> ERROR: "get_gendisk" [block/blk-cgroup.ko] undefined!
> ERROR: "sched_clock" [block/blk-cgroup.ko] undefined!

Hi Stephen,
     These errors seem to show up because the 2 symbols aren't
exported and hence when building as a module we don't have access to
these symbols. I'll send a patch to fix that shortly. Sorry for the
build breakage.

-Divyesh

>
> Probably caused by commits 34d0f179d6dd711d3fc13c0820a456c59aae8048
> ("io-controller: Add a new interface "weight_device" for IO-Controlle=
r"),
> 9195291e5f05e01d67f9a09c756b8aca8f009089 ("blkio: Increment the blkio
> cgroup stats for real now") and 812df48d127365ffd0869aa139738f572a867=
59c
> ("blkio: Add more debug-only per-cgroup stats").
>
> I have used the version of the block tree from next-20100414 for toda=
y.
> --
> Cheers,
> Stephen Rothwell =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0sfr@canb.auug=
=2Eorg.au
> http://www.canb.auug.org.au/~sfr/
>

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 15 Apr 2010 16:16:33 +1000
Message-ID: <20100415161633.a7950127.sfr@canb.auug.org.au>
References: <20100415124222.8e0e7132.sfr@canb.auug.org.au>
	<r2kaf41c7c41004142223m1464fd07u5617fe7332cb2ea@mail.gmail.com>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA1";
 boundary="Signature=_Thu__15_Apr_2010_16_16_33_+1000_ewFSoxtuYBNq+MTA"
Return-path: <linux-next-owner@vger.kernel.org>
Received: from chilli.pcug.org.au ([203.10.76.44]:52244 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1755423Ab0DOGQp (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Thu, 15 Apr 2010 02:16:45 -0400
In-Reply-To: <r2kaf41c7c41004142223m1464fd07u5617fe7332cb2ea@mail.gmail.com>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Divyesh Shah <dpshah@google.com>
Cc: Jens Axboe <jens.axboe@oracle.com>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Gui Jianfeng <guijianfeng@cn.fujitsu.com>

--Signature=_Thu__15_Apr_2010_16_16_33_+1000_ewFSoxtuYBNq+MTA
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Divyesh,

On Wed, 14 Apr 2010 22:23:25 -0700 Divyesh Shah <dpshah@google.com> wrote:
>
>      These errors seem to show up because the 2 symbols aren't
> exported and hence when building as a module we don't have access to
> these symbols. I'll send a patch to fix that shortly. Sorry for the
> build breakage.

Thanks.

--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

--Signature=_Thu__15_Apr_2010_16_16_33_+1000_ewFSoxtuYBNq+MTA
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEARECAAYFAkvGr0EACgkQjjKRsyhoI8x7hgCfXFFXPpwFu1OObCHdULw/lzar
ZWcAn2qmNnc4qNjcnjGQfvYiu7UJch+s
=mhlk
-----END PGP SIGNATURE-----

--Signature=_Thu__15_Apr_2010_16_16_33_+1000_ewFSoxtuYBNq+MTA--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <jens.axboe@oracle.com>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 15 Apr 2010 08:56:31 +0200
Message-ID: <20100415065630.GR27497@kernel.dk>
References: <20100415124222.8e0e7132.sfr@canb.auug.org.au> <r2kaf41c7c41004142223m1464fd07u5617fe7332cb2ea@mail.gmail.com> <20100415161633.a7950127.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-next-owner@vger.kernel.org>
Received: from 0122700014.0.fullrate.dk ([95.166.99.235]:48887 "EHLO kernel.dk"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752812Ab0DOG4c (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Thu, 15 Apr 2010 02:56:32 -0400
Content-Disposition: inline
In-Reply-To: <20100415161633.a7950127.sfr@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Divyesh Shah <dpshah@google.com>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Gui Jianfeng <guijianfeng@cn.fujitsu.com>

On Thu, Apr 15 2010, Stephen Rothwell wrote:
> Hi Divyesh,
> 
> On Wed, 14 Apr 2010 22:23:25 -0700 Divyesh Shah <dpshah@google.com> wrote:
> >
> >      These errors seem to show up because the 2 symbols aren't
> > exported and hence when building as a module we don't have access to
> > these symbols. I'll send a patch to fix that shortly. Sorry for the
> > build breakage.
> 
> Thanks.

for-next is now updated.

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Wed, 28 Apr 2010 13:52:58 +1000
Message-ID: <20100428135258.35e3efdb.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA1";
 boundary="Signature=_Wed__28_Apr_2010_13_52_58_+1000_a/4PJN9/kGiNi/9."
Return-path: <linux-next-owner@vger.kernel.org>
Received: from chilli.pcug.org.au ([203.10.76.44]:53113 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753717Ab0D1DxE (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Tue, 27 Apr 2010 23:53:04 -0400
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <jens.axboe@oracle.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org

--Signature=_Wed__28_Apr_2010_13_52_58_+1000_a/4PJN9/kGiNi/9.
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Jens,

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

include/linux/coda_psdev.h:4: included file 'linux/backing-dev.h' is not ex=
ported

Caused by commit 5163d90076729413cb882d3dd5c3d3cfb5b9f035 ("coda: add bdi
backing to mount session").

I have used the version of the block tree from next-20100427 for today.
--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

--Signature=_Wed__28_Apr_2010_13_52_58_+1000_a/4PJN9/kGiNi/9.
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEARECAAYFAkvXsRoACgkQjjKRsyhoI8ySfgCfRKL189UiT5DPsCRRjJcHUZid
i5UAn3xDqica4nSkk6cvpGEg1EeKc3w+
=jmKm
-----END PGP SIGNATURE-----

--Signature=_Wed__28_Apr_2010_13_52_58_+1000_a/4PJN9/kGiNi/9.--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <jens.axboe@oracle.com>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Wed, 28 Apr 2010 07:34:11 +0200
Message-ID: <20100428053410.GO27497@kernel.dk>
References: <20100428135258.35e3efdb.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-next-owner@vger.kernel.org>
Received: from 0122700014.0.fullrate.dk ([95.166.99.235]:34501 "EHLO kernel.dk"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752495Ab0D1FeN (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Wed, 28 Apr 2010 01:34:13 -0400
Content-Disposition: inline
In-Reply-To: <20100428135258.35e3efdb.sfr@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org

On Wed, Apr 28 2010, Stephen Rothwell wrote:
> Hi Jens,
> 
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> include/linux/coda_psdev.h:4: included file 'linux/backing-dev.h' is not exported
> 
> Caused by commit 5163d90076729413cb882d3dd5c3d3cfb5b9f035 ("coda: add bdi
> backing to mount session").
> 
> I have used the version of the block tree from next-20100427 for today.

Thanks Stephen, I'll fix it up.

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <jens.axboe@oracle.com>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 29 Apr 2010 09:31:04 +0200
Message-ID: <20100429073104.GE27497@kernel.dk>
References: <20100429135211.3ef89aa3.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-next-owner@vger.kernel.org>
Received: from 0122700014.0.fullrate.dk ([95.166.99.235]:35489 "EHLO kernel.dk"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1758056Ab0D3Qz2 (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Fri, 30 Apr 2010 12:55:28 -0400
Content-Disposition: inline
In-Reply-To: <20100429135211.3ef89aa3.sfr@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Dmitry Monakhov <dmonakhov@openvz.org>, Jiro SEKIBA <jir@unicus.jp>, Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>

On Thu, Apr 29 2010, Stephen Rothwell wrote:
> Hi Jens,
> 
> After merging the block tree, today's linux-next build (powerpc ppc64_defconfig)
> failed like this:
> 
> fs/nilfs2/the_nilfs.c: In function 'nilfs_discard_segments':
> fs/nilfs2/the_nilfs.c:673: error: 'DISCARD_FL_BARRIER' undeclared (first use in this function)
> 
> Caused by commit fbd9b09a177a481eda256447c881f014f29034fe ("blkdev:
> generalize flags for blkdev_issue_fn functions") interacting with commit
> e902ec9906e844f4613fa6190c6fa65f162dc86e ("nilfs2: issue discard request
> after cleaning segments") (which netered Linus' tree on about March 4 -
> before v2.6.34-rc1).
> 
> I applied the following patch for today (but have no way to test it).

It's correct, I'll merge this.

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Thu, 29 Apr 2010 13:52:11 +1000
Message-ID: <20100429135211.3ef89aa3.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <linux-kernel-owner@vger.kernel.org>
Sender: linux-kernel-owner@vger.kernel.org
To: Jens Axboe <jens.axboe@oracle.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Dmitry Monakhov <dmonakhov@openvz.org>, Jiro SEKIBA <jir@unicus.jp>, Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
List-Id: linux-next.vger.kernel.org

Hi Jens,

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

fs/nilfs2/the_nilfs.c: In function 'nilfs_discard_segments':
fs/nilfs2/the_nilfs.c:673: error: 'DISCARD_FL_BARRIER' undeclared (first use in this function)

Caused by commit fbd9b09a177a481eda256447c881f014f29034fe ("blkdev:
generalize flags for blkdev_issue_fn functions") interacting with commit
e902ec9906e844f4613fa6190c6fa65f162dc86e ("nilfs2: issue discard request
after cleaning segments") (which netered Linus' tree on about March 4 -
before v2.6.34-rc1).

I applied the following patch for today (but have no way to test it).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 29 Apr 2010 13:35:14 +1000
Subject: [PATCH] nilfs: fix for block layer API change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/nilfs2/the_nilfs.c |    4 +-
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c
index 33871f7..7081588 100644
--- a/fs/nilfs2/the_nilfs.c
+++ b/fs/nilfs2/the_nilfs.c
@@ -670,7 +670,7 @@ int nilfs_discard_segments(struct the_nilfs *nilfs, __u64 *segnump,
 						   start * sects_per_block,
 						   nblocks * sects_per_block,
 						   GFP_NOFS,
-						   DISCARD_FL_BARRIER);
+						   BLKDEV_IFL_BARRIER);
 			if (ret < 0)
 				return ret;
 			nblocks = 0;
@@ -680,7 +680,7 @@ int nilfs_discard_segments(struct the_nilfs *nilfs, __u64 *segnump,
 		ret = blkdev_issue_discard(nilfs->ns_bdev,
 					   start * sects_per_block,
 					   nblocks * sects_per_block,
-					   GFP_NOFS, DISCARD_FL_BARRIER);
+					   GFP_NOFS, BLKDEV_IFL_BARRIER);
 	return ret;
 }
 
-- 
1.7.1

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Tue, 18 May 2010 13:37:10 +1000
Message-ID: <20100518133710.8b1545dd.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA1";
 boundary="Signature=_Tue__18_May_2010_13_37_10_+1000_WyGs035oBlbgt_AN"
Return-path: <linux-next-owner@vger.kernel.org>
Received: from chilli.pcug.org.au ([203.10.76.44]:54839 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752469Ab0ERDhU (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Mon, 17 May 2010 23:37:20 -0400
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <jens.axboe@oracle.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Andrew Morton <akpm@linux-foundation.org>

--Signature=_Tue__18_May_2010_13_37_10_+1000_WyGs035oBlbgt_AN
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Jens,

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

block/blk-core.c: In function 'laptop_mode_timer_fn':
block/blk-core.c:503: error: too few arguments to function 'bdi_start_write=
back'

Caused by commit e913fc825dc685a444cb4c1d0f9d32f372f59861 ("writeback:
fix WB_SYNC_NONE writeback from umount") from the block tree interacting
with commit 42bd225c0ba7c95af39293d39a950c48e7e5cb23 (""laptop-mode: Make
flushes per-device" fix") also from the block tree.  The merge
6205ed4658a0df8c2879519977bbed6853014016 should have changed the code in
block/blk-core.c that moved from mm/page-writeback.c.

Mind you, I think that the change to laptop_mode_timer_fn in commit
e913fc825dc685a444cb4c1d0f9d32f372f59861 was wrong anyway (the 0 should
have been added at the end, surely).

I have used the block tree from next-20100517 for today.
--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

--Signature=_Tue__18_May_2010_13_37_10_+1000_WyGs035oBlbgt_AN
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEARECAAYFAkvyC2YACgkQjjKRsyhoI8zOZACgm+SatbD3aZxkIHqg5RCJ2kSK
/RsAn1Y/QtFB5B2AJSGTNBJ2H0BdlUD0
=sU3c
-----END PGP SIGNATURE-----

--Signature=_Tue__18_May_2010_13_37_10_+1000_WyGs035oBlbgt_AN--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <jens.axboe@oracle.com>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Tue, 18 May 2010 10:56:13 +0200
Message-ID: <20100518085613.GU25951@kernel.dk>
References: <20100518133710.8b1545dd.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-next-owner@vger.kernel.org>
Received: from 0122700014.0.fullrate.dk ([95.166.99.235]:45468 "EHLO kernel.dk"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1755624Ab0ERI4P (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Tue, 18 May 2010 04:56:15 -0400
Content-Disposition: inline
In-Reply-To: <20100518133710.8b1545dd.sfr@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Andrew Morton <akpm@linux-foundation.org>

On Tue, May 18 2010, Stephen Rothwell wrote:
> Hi Jens,
> 
> After merging the block tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> block/blk-core.c: In function 'laptop_mode_timer_fn':
> block/blk-core.c:503: error: too few arguments to function 'bdi_start_writeback'
> 
> Caused by commit e913fc825dc685a444cb4c1d0f9d32f372f59861 ("writeback:
> fix WB_SYNC_NONE writeback from umount") from the block tree interacting
> with commit 42bd225c0ba7c95af39293d39a950c48e7e5cb23 (""laptop-mode: Make
> flushes per-device" fix") also from the block tree.  The merge
> 6205ed4658a0df8c2879519977bbed6853014016 should have changed the code in
> block/blk-core.c that moved from mm/page-writeback.c.
> 
> Mind you, I think that the change to laptop_mode_timer_fn in commit
> e913fc825dc685a444cb4c1d0f9d32f372f59861 was wrong anyway (the 0 should
> have been added at the end, surely).
> 
> I have used the block tree from next-20100517 for today.

Thanks, it looks like a merge/commit error on for-next alone, for-2.6.35
is fine. I'll make sure this gets fixed up now.

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Tue, 18 May 2010 20:20:44 +1000
Message-ID: <20100518202044.a91d7f64.sfr@canb.auug.org.au>
References: <20100518133710.8b1545dd.sfr@canb.auug.org.au>
	<20100518085613.GU25951@kernel.dk>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA1";
 boundary="Signature=_Tue__18_May_2010_20_20_44_+1000_/JcCR4vjdd=uIip0"
Return-path: <linux-next-owner@vger.kernel.org>
Received: from chilli.pcug.org.au ([203.10.76.44]:38339 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1756134Ab0ERKU7 (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Tue, 18 May 2010 06:20:59 -0400
In-Reply-To: <20100518085613.GU25951@kernel.dk>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <jens.axboe@oracle.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Andrew Morton <akpm@linux-foundation.org>

--Signature=_Tue__18_May_2010_20_20_44_+1000_/JcCR4vjdd=uIip0
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Tue, 18 May 2010 10:56:13 +0200 Jens Axboe <jens.axboe@oracle.com> wrote:
>
> Thanks, it looks like a merge/commit error on for-next alone, for-2.6.35
> is fine. I'll make sure this gets fixed up now.

So why is for-2.6.35 different from for-next?

--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

--Signature=_Tue__18_May_2010_20_20_44_+1000_/JcCR4vjdd=uIip0
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEARECAAYFAkvyafwACgkQjjKRsyhoI8xYVwCgowl3aMBsWALlPBJVI6gfuk7K
Q/AAn2oO2OE1VE5wKqeqV/zqOk1vU5Kg
=vB96
-----END PGP SIGNATURE-----

--Signature=_Tue__18_May_2010_20_20_44_+1000_/JcCR4vjdd=uIip0--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <jens.axboe@oracle.com>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Tue, 18 May 2010 12:50:00 +0200
Message-ID: <20100518105000.GX25951@kernel.dk>
References: <20100518133710.8b1545dd.sfr@canb.auug.org.au> <20100518085613.GU25951@kernel.dk> <20100518202044.a91d7f64.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-next-owner@vger.kernel.org>
Received: from 0122700014.0.fullrate.dk ([95.166.99.235]:50916 "EHLO kernel.dk"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1756380Ab0ERKuD (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Tue, 18 May 2010 06:50:03 -0400
Content-Disposition: inline
In-Reply-To: <20100518202044.a91d7f64.sfr@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Andrew Morton <akpm@linux-foundation.org>

On Tue, May 18 2010, Stephen Rothwell wrote:
> On Tue, 18 May 2010 10:56:13 +0200 Jens Axboe <jens.axboe@oracle.com> wrote:
> >
> > Thanks, it looks like a merge/commit error on for-next alone, for-2.6.35
> > is fine. I'll make sure this gets fixed up now.
> 
> So why is for-2.6.35 different from for-next?

Because I had a for-linus branch at one point which was headed for
2.6.34 (which has been merged now) which was changed and merged with
for-2.6.35 to form for-next. But now it should just be a copy.

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Tue, 3 Aug 2010 13:12:02 +1000
Message-ID: <20100803131202.422af85f.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from chilli.pcug.org.au ([203.10.76.44]:45203 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753654Ab0HCDMI (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Mon, 2 Aug 2010 23:12:08 -0400
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig <hch@lst.de>, Yehuda Sadeh <yehuda@hq.newdream.net>, Sage Weil <sage@newdream.net>

Hi Jens,

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

fs/ceph/rbd.c: In function 'rbd_rq_fn':
fs/ceph/rbd.c:1101: error: implicit declaration of function 'blk_fs_request'
fs/ceph/rbd.c:1101: error: implicit declaration of function 'blk_barrier_rq'

Caused by commit fc734ac98dbce1e3d3e1e1359524c279a336ac49 ("block: remove
wrappers for request type/flags") interacting with commit
e7fdb915217126d23ff2aafb2d5fdce21b763df1 ("ceph-rbd: rados block device")
from the ceph tree.

I applied the following merge fix patch (Christoph, I assume that this
should be directly applicable to the ceph tree, right?):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 3 Aug 2010 13:08:18 +1000
Subject: [PATCH] ceph: update for removal of request flag wrappers

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/ceph/rbd.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fs/ceph/rbd.c b/fs/ceph/rbd.c
index 86c8b06..1fa2634 100644
--- a/fs/ceph/rbd.c
+++ b/fs/ceph/rbd.c
@@ -1098,7 +1098,8 @@ static void rbd_rq_fn(struct request_queue *q)
 		dout("fetched request\n");
 
 		/* filter out block requests we don't understand */
-		if (!blk_fs_request(rq) && !blk_barrier_rq(rq)) {
+		if ((rq->cmd_type != REQ_TYPE_FS) &&
+		    !(rq->cmd_flags & REQ_HARDBARRIER)) {
 			__blk_end_request_all(rq, 0);
 			goto next;
 		}
-- 
1.7.1

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Tue, 03 Aug 2010 09:46:05 +0200
Message-ID: <4C57C93D.5060900@kernel.dk>
References: <20100803131202.422af85f.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from 0122700014.0.fullrate.dk ([95.166.99.235]:39333 "EHLO kernel.dk"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751401Ab0HCHqI (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Tue, 3 Aug 2010 03:46:08 -0400
In-Reply-To: <20100803131202.422af85f.sfr@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig <hch@lst.de>, Yehuda Sadeh <yehuda@hq.newdream.net>, Sage Weil <sage@newdream.net>

On 2010-08-03 05:12, Stephen Rothwell wrote:
> Hi Jens,
> 
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> fs/ceph/rbd.c: In function 'rbd_rq_fn':
> fs/ceph/rbd.c:1101: error: implicit declaration of function 'blk_fs_request'
> fs/ceph/rbd.c:1101: error: implicit declaration of function 'blk_barrier_rq'
> 
> Caused by commit fc734ac98dbce1e3d3e1e1359524c279a336ac49 ("block: remove
> wrappers for request type/flags") interacting with commit
> e7fdb915217126d23ff2aafb2d5fdce21b763df1 ("ceph-rbd: rados block device")
> from the ceph tree.
> 
> I applied the following merge fix patch (Christoph, I assume that this
> should be directly applicable to the ceph tree, right?):

Yep, that'll work and should be applicable to ceph even when run outside
of the block tree merge.

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Christoph Hellwig <hch@lst.de>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Tue, 3 Aug 2010 10:26:55 +0200
Message-ID: <20100803082655.GA13029@lst.de>
References: <20100803131202.422af85f.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-next-owner@vger.kernel.org>
Received: from verein.lst.de ([213.95.11.210]:45981 "EHLO verein.lst.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752651Ab0HCI1I (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Tue, 3 Aug 2010 04:27:08 -0400
Content-Disposition: inline
In-Reply-To: <20100803131202.422af85f.sfr@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jens Axboe <axboe@kernel.dk>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig <hch@lst.de>, Yehuda Sadeh <yehuda@hq.newdream.net>, Sage Weil <sage@newdream.net>

On Tue, Aug 03, 2010 at 01:12:02PM +1000, Stephen Rothwell wrote:
> I applied the following merge fix patch (Christoph, I assume that this
> should be directly applicable to the ceph tree, right?):

Yes, it looks good.

> -		if (!blk_fs_request(rq) && !blk_barrier_rq(rq)) {
> +		if ((rq->cmd_type != REQ_TYPE_FS) &&
> +		    !(rq->cmd_flags & REQ_HARDBARRIER)) {
>  			__blk_end_request_all(rq, 0);
>  			goto next;

Although these days barriers are REQ_TYPE_FS anyway, so the second check
is superflous.

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Thu, 5 Aug 2010 11:47:25 +1000
Message-ID: <20100805114725.7e46da74.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA1";
 boundary="Signature=_Thu__5_Aug_2010_11_47_25_+1000_tzjg+SIWL8VjQrGQ"
Return-path: <linux-next-owner@vger.kernel.org>
Received: from chilli.pcug.org.au ([203.10.76.44]:44936 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1759277Ab0HEBre (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Wed, 4 Aug 2010 21:47:34 -0400
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Tejun Heo <tj@kernel.org>

--Signature=_Thu__5_Aug_2010_11_47_25_+1000_tzjg+SIWL8VjQrGQ
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Jens,

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

usr/include/linux/fs.h:11: included file 'linux/blk_types.h' is not exported

Caused by commit 9d3dbbcd9a84518ff5e32ffe671d06a48cf84fd9 ("bio, fs:
separate out bio_types.h and define READ/WRITE constants in terms of
BIO_RW_* flags").

I used the block tree from next-20100804 for today.
--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

--Signature=_Thu__5_Aug_2010_11_47_25_+1000_tzjg+SIWL8VjQrGQ
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iQEcBAEBAgAGBQJMWhgtAAoJEDMEi1NhKgbsFMQH/15JmPxZYfw79Ytc74XS6474
+BMABvnr+wiK1dIW2FK12Ax0IvsUrO4gIUR06toLJGMzylU2EkQnMnG4Y5zGDW7P
u5p6an22JhVLtLXFt3fLbu0wxW14N7Jpwu/8bw4lWZZqp4TqQbKRwz0IPAa/Q+nk
Wy2pIYMr61J7XD/gDUB0HZ1lMPPXrDsup3lyaFZBSZlzrwm9916bVfed+pfH60Vx
YyZ/erRILvUr1eLRUV4aeaeWD8WA8zY1iAmWkeAHtF6oyAenz8TKkgNH9d5dQvxs
4ykg1sypp1+0eoDYqkxPNgwBi+mMoCzxOjv4Rq933Pbqzpccu561eymgWEVgD0A=
=FVtf
-----END PGP SIGNATURE-----

--Signature=_Thu__5_Aug_2010_11_47_25_+1000_tzjg+SIWL8VjQrGQ--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 05 Aug 2010 08:35:26 +0200
Message-ID: <4C5A5BAE.9070301@kernel.dk>
References: <20100805114725.7e46da74.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from 0122700014.0.fullrate.dk ([95.166.99.235]:43654 "EHLO kernel.dk"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1758803Ab0HEGf2 (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Thu, 5 Aug 2010 02:35:28 -0400
In-Reply-To: <20100805114725.7e46da74.sfr@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Tejun Heo <tj@kernel.org>

On 2010-08-05 03:47, Stephen Rothwell wrote:
> Hi Jens,
> 
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> usr/include/linux/fs.h:11: included file 'linux/blk_types.h' is not exported
> 
> Caused by commit 9d3dbbcd9a84518ff5e32ffe671d06a48cf84fd9 ("bio, fs:
> separate out bio_types.h and define READ/WRITE constants in terms of
> BIO_RW_* flags").
> 
> I used the block tree from next-20100804 for today.

Thanks Stephen, I fixed this one up now and pushed it out.

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Mon, 9 Aug 2010 11:28:31 +1000
Message-ID: <20100809112831.0dc41e76.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA1";
 boundary="Signature=_Mon__9_Aug_2010_11_28_31_+1000_q7UUZdYMaK=Qjt5K"
Return-path: <linux-next-owner@vger.kernel.org>
Received: from chilli.pcug.org.au ([203.10.76.44]:46393 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1755132Ab0HIB2k (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Sun, 8 Aug 2010 21:28:40 -0400
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Stodden <daniel.stodden@citrix.com>, Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>

--Signature=_Mon__9_Aug_2010_11_28_31_+1000_q7UUZdYMaK=Qjt5K
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Jens,

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

drivers/block/xen-blkfront.c: In function 'blkif_release':
drivers/block/xen-blkfront.c:1238: error: label 'out' used but not defined

Caused by commit acfca3c622a009fb62b566604452ab9fb3a11019 ("blkfront:
Remove obsolete info->users").  I assume something went wrong in the
rebase ...

I have used the block tree from next-20100807 for today.
--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

--Signature=_Mon__9_Aug_2010_11_28_31_+1000_q7UUZdYMaK=Qjt5K
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iQEcBAEBAgAGBQJMX1m/AAoJEDMEi1NhKgbsHO0H/07xb0+oQO2PabLb4KyLV5Lr
hIn/mH5OK++Vber//bhcuX/j/DkGn/8Y80qXmir2w1OnfjTAJvxPLKUwx3gb2rMk
jE6e2hL69J6zDAMD6DEpdeU+mj/Fon/YmXykhg9Gd9jzyJd5M9M/Q3SYuX/41+VO
RJj/cNFMHCDqfhU2EmO4cTbPbiVwSZja6zABMppKJsBthA2CsgEAQRKYlpfmKFKa
2yoIRfdPCCsxqyyxj9teJmnTUIdzHjFZzqyXijj/GosU30OeJUCKtz8BU+gQaLrF
DcYgIninAYKcZYhQGkxNt44ZU94u1cn+5o2OOZIL4VQREZ2y1Dll4h6dtFrND7Y=
=Rgwh
-----END PGP SIGNATURE-----

--Signature=_Mon__9_Aug_2010_11_28_31_+1000_q7UUZdYMaK=Qjt5K--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Sun, 08 Aug 2010 21:50:57 -0400
Message-ID: <4C5F5F01.2090802@kernel.dk>
References: <20100809112831.0dc41e76.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from 0122700014.0.fullrate.dk ([95.166.99.235]:53855 "EHLO kernel.dk"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752917Ab0HIBvD (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Sun, 8 Aug 2010 21:51:03 -0400
In-Reply-To: <20100809112831.0dc41e76.sfr@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Stodden <daniel.stodden@citrix.com>, Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>

On 08/08/2010 09:28 PM, Stephen Rothwell wrote:
> Hi Jens,
> 
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/block/xen-blkfront.c: In function 'blkif_release':
> drivers/block/xen-blkfront.c:1238: error: label 'out' used but not defined
> 
> Caused by commit acfca3c622a009fb62b566604452ab9fb3a11019 ("blkfront:
> Remove obsolete info->users").  I assume something went wrong in the
> rebase ...
> 
> I have used the block tree from next-20100807 for today.

Oops, fixed up.

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Fri, 17 Sep 2010 11:37:38 +1000
Message-ID: <20100917113738.f8ecaf63.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA1";
 boundary="Signature=_Fri__17_Sep_2010_11_37_38_+1000_y.p0Wr2/iKA41cin"
Return-path: <linux-next-owner@vger.kernel.org>
Received: from chilli.pcug.org.au ([203.10.76.44]:40779 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752304Ab0IQBhv (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Thu, 16 Sep 2010 21:37:51 -0400
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig <hch@lst.de>, Jan Kara <jack@suse.cz>

--Signature=_Fri__17_Sep_2010_11_37_38_+1000_y.p0Wr2/iKA41cin
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Jens,

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

fs/ocfs2/file.c: In function 'ocfs2_sync_file':
fs/ocfs2/file.c:191: error: 'BLKDEV_IFL_WAIT' undeclared (first use in this=
 function)
fs/ocfs2/file.c:191: error: too many arguments to function 'blkdev_issue_fl=
ush'

Caused by commit dd3932eddf428571762596e17b65f5dc92ca361b ("block: remove
BLKDEV_IFL_WAIT") interacting with commit
04eda1a18019bb387dc7e97ee99979dd88dc608a ("ocfs2: Flush drive's caches on
fdatasync") that entered Linus' tree before v2.6.36-rc4.

I have used the block tree from next-20100916 for today.
--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

--Signature=_Fri__17_Sep_2010_11_37_38_+1000_y.p0Wr2/iKA41cin
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iQEcBAEBAgAGBQJMksZiAAoJEDMEi1NhKgbs3VcH/3LGbIPB051MrHrjeVS1rHNi
OuVkIlOz1QS3aEbDOh5dsWnPwwhvDJ70n2jGLdICGL0vQKG2S3oZGUdK0IhXdVUw
KNCo7vu5AoodCIpeLFsvgYXBAAZxhTIUMTL/bghjFdz6fK92e2pyjVlCgSHqcZ2b
XNeXly45O0eFkovyBxUigs5V4AabxfzY/TSMCaWSoyca7+ow2NwIr7LqZYzKMy09
NuYQwtyjNurYk6kvPZdMmvvdX3+HNAOGiDqO2tyda9G+gJoPKdZyu3kaReCgX+4e
kLVccEmd7PKjOHWw1E79VsOUn5YtyQSD76i9ydrjmwB20TCgFL9DaKE2Oo3Tb+s=
=reIW
-----END PGP SIGNATURE-----

--Signature=_Fri__17_Sep_2010_11_37_38_+1000_y.p0Wr2/iKA41cin--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Christoph Hellwig <hch@lst.de>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Fri, 17 Sep 2010 05:19:11 +0200
Message-ID: <20100917031911.GA25217@lst.de>
References: <20100917113738.f8ecaf63.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-next-owner@vger.kernel.org>
Received: from verein.lst.de ([213.95.11.210]:38914 "EHLO verein.lst.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1755751Ab0IQDTU (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Thu, 16 Sep 2010 23:19:20 -0400
Content-Disposition: inline
In-Reply-To: <20100917113738.f8ecaf63.sfr@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jens Axboe <axboe@kernel.dk>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig <hch@lst.de>, Jan Kara <jack@suse.cz>

On Fri, Sep 17, 2010 at 11:37:38AM +1000, Stephen Rothwell wrote:
> Hi Jens,
> 
> After merging the block tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> fs/ocfs2/file.c: In function 'ocfs2_sync_file':
> fs/ocfs2/file.c:191: error: 'BLKDEV_IFL_WAIT' undeclared (first use in this function)
> fs/ocfs2/file.c:191: error: too many arguments to function 'blkdev_issue_flush'
> 
> Caused by commit dd3932eddf428571762596e17b65f5dc92ca361b ("block: remove
> BLKDEV_IFL_WAIT") interacting with commit
> 04eda1a18019bb387dc7e97ee99979dd88dc608a ("ocfs2: Flush drive's caches on
> fdatasync") that entered Linus' tree before v2.6.36-rc4.


Justremove the last argument for blkdev_issue_flush and it'll be fine.
Unfortunately Jens' for-next branch which I based the patch again
doesn't include the ocfs2 commit yet.

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Mon, 11 Oct 2010 14:18:38 +1100
Message-ID: <20101011141838.fc59ee7c.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from chilli.pcug.org.au ([203.10.76.44]:57502 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752787Ab0JKDSp (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Sun, 10 Oct 2010 23:18:45 -0400
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Lukas Czerner <lczerner@redhat.com>, Theodore Ts'o <tytso@mit.edu>, Christoph Hellwig <hch@lst.de>

Hi Jens,

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

In file included from init/do_mounts.h:2,
                 from init/do_mounts_md.c:5:
include/linux/blkdev.h: In function 'sb_issue_zeroout':
include/linux/blkdev.h:900: error: too many arguments to function 'blkdev_issue_zeroout'

Caused by commit dd3932eddf428571762596e17b65f5dc92ca361b ("block: remove
BLKDEV_IFL_WAIT") interacting with commit
3be0ead7b05f0caaeb2f56b9902985b8120ef0cf ("Add helper function for
blkdev_issue_zeroout (sb_issue_discard)") from the ext4 tree.

I applied the following merge fixup patch which I can carry as necessary
(unless there is a better solution).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 11 Oct 2010 13:50:22 +1100
Subject: [PATCH] ext4: merge fix for blkdev_issue_zeroout API change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/ext4/extents.c      |    3 +--
 fs/ext4/ialloc.c       |    5 +----
 fs/ext4/resize.c       |    5 ++---
 include/linux/blkdev.h |    4 ++--
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index a0e6230..a130f02 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -2545,8 +2545,7 @@ static int ext4_ext_zeroout(struct inode *inode, struct ext4_extent *ex)
 	ee_len    = ext4_ext_get_actual_len(ex);
 	ee_pblock = ext_pblock(ex);
 
-	ret = sb_issue_zeroout(inode->i_sb, ee_pblock, ee_len,
-			       GFP_NOFS, BLKDEV_IFL_WAIT);
+	ret = sb_issue_zeroout(inode->i_sb, ee_pblock, ee_len, GFP_NOFS);
 	if (ret > 0)
 		ret = 0;
 
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index 87d228a..f7e25aa 100644
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -1238,7 +1238,6 @@ extern int ext4_init_inode_table(struct super_block *sb, ext4_group_t group,
 	handle_t *handle;
 	ext4_fsblk_t blk;
 	int num, ret = 0, used_blks = 0;
-	unsigned long flags = BLKDEV_IFL_WAIT;
 
 	/* This should not happen, but just to be sure check this */
 	if (sb->s_flags & MS_RDONLY) {
@@ -1303,9 +1302,7 @@ extern int ext4_init_inode_table(struct super_block *sb, ext4_group_t group,
 
 	ext4_debug("going to zero out inode table in group %d\n",
 		   group);
-	if (barrier)
-		flags |= BLKDEV_IFL_BARRIER;
-	ret = sb_issue_zeroout(sb, blk, num, GFP_NOFS, flags);
+	ret = sb_issue_zeroout(sb, blk, num, GFP_NOFS);
 	if (ret < 0)
 		goto err_out;
 
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
index 2f5e347..998a462 100644
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
@@ -229,7 +229,7 @@ static int setup_new_group_blocks(struct super_block *sb,
 	ext4_debug("clear inode table blocks %#04llx -> %#04llx\n",
 			block, sbi->s_itb_per_group);
 	err = sb_issue_zeroout(sb, gdblocks + start + 1, reserved_gdb,
-			       GFP_NOFS, BLKDEV_IFL_WAIT);
+			       GFP_NOFS);
 	if (err)
 		goto exit_bh;
 
@@ -244,8 +244,7 @@ static int setup_new_group_blocks(struct super_block *sb,
 	block = input->inode_table;
 	ext4_debug("clear inode table blocks %#04llx -> %#04llx\n",
 			block, sbi->s_itb_per_group);
-	err = sb_issue_zeroout(sb, block, sbi->s_itb_per_group,
-			       GFP_NOFS, BLKDEV_IFL_WAIT);
+	err = sb_issue_zeroout(sb, block, sbi->s_itb_per_group, GFP_NOFS);
 	if (err)
 		goto exit_bh;
 
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index a1dec60..1095272 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -892,12 +892,12 @@ static inline int sb_issue_discard(struct super_block *sb, sector_t block,
 				    gfp_mask, flags);
 }
 static inline int sb_issue_zeroout(struct super_block *sb, sector_t block,
-		sector_t nr_blocks, gfp_t gfp_mask, unsigned long flags)
+		sector_t nr_blocks, gfp_t gfp_mask)
 {
 	return blkdev_issue_zeroout(sb->s_bdev,
 				    block << (sb->s_blocksize_bits - 9),
 				    nr_blocks << (sb->s_blocksize_bits - 9),
-				    gfp_mask, flags);
+				    gfp_mask);
 }
 
 extern int blk_verify_command(unsigned char *cmd, fmode_t has_write_perm);
-- 
1.7.1

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Sat, 23 Oct 2010 13:51:33 +1100
Message-ID: <20101023135133.136f6e19.sfr@canb.auug.org.au>
References: <20101011141838.fc59ee7c.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from chilli.pcug.org.au ([203.10.76.44]:36708 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751605Ab0JWCvg (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Fri, 22 Oct 2010 22:51:36 -0400
In-Reply-To: <20101011141838.fc59ee7c.sfr@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Theodore Ts'o <tytso@mit.edu>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Lukas Czerner <lczerner@redhat.com>, Jens Axboe <axboe@kernel.dk>, Christoph Hellwig <hch@lst.de>, Linus <torvalds@linux-foundation.org>

Hi Ted,

On Mon, 11 Oct 2010 14:18:38 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the block tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> In file included from init/do_mounts.h:2,
>                  from init/do_mounts_md.c:5:
> include/linux/blkdev.h: In function 'sb_issue_zeroout':
> include/linux/blkdev.h:900: error: too many arguments to function 'blkdev_issue_zeroout'
> 
> Caused by commit dd3932eddf428571762596e17b65f5dc92ca361b ("block: remove
> BLKDEV_IFL_WAIT") interacting with commit
> 3be0ead7b05f0caaeb2f56b9902985b8120ef0cf ("Add helper function for
> blkdev_issue_zeroout (sb_issue_discard)") from the ext4 tree.
> 
> I applied the following merge fixup patch which I can carry as necessary
> (unless there is a better solution).

This fix (below) will now be necessary when the ext4 tree is merged with
Linus' tree.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 11 Oct 2010 13:50:22 +1100
Subject: [PATCH] ext4: merge fix for blkdev_issue_zeroout API change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/ext4/extents.c      |    3 +--
 fs/ext4/ialloc.c       |    5 +----
 fs/ext4/resize.c       |    5 ++---
 include/linux/blkdev.h |    4 ++--
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index a0e6230..a130f02 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -2545,8 +2545,7 @@ static int ext4_ext_zeroout(struct inode *inode, struct ext4_extent *ex)
 	ee_len    = ext4_ext_get_actual_len(ex);
 	ee_pblock = ext_pblock(ex);
 
-	ret = sb_issue_zeroout(inode->i_sb, ee_pblock, ee_len,
-			       GFP_NOFS, BLKDEV_IFL_WAIT);
+	ret = sb_issue_zeroout(inode->i_sb, ee_pblock, ee_len, GFP_NOFS);
 	if (ret > 0)
 		ret = 0;
 
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index 87d228a..f7e25aa 100644
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -1238,7 +1238,6 @@ extern int ext4_init_inode_table(struct super_block *sb, ext4_group_t group,
 	handle_t *handle;
 	ext4_fsblk_t blk;
 	int num, ret = 0, used_blks = 0;
-	unsigned long flags = BLKDEV_IFL_WAIT;
 
 	/* This should not happen, but just to be sure check this */
 	if (sb->s_flags & MS_RDONLY) {
@@ -1303,9 +1302,7 @@ extern int ext4_init_inode_table(struct super_block *sb, ext4_group_t group,
 
 	ext4_debug("going to zero out inode table in group %d\n",
 		   group);
-	if (barrier)
-		flags |= BLKDEV_IFL_BARRIER;
-	ret = sb_issue_zeroout(sb, blk, num, GFP_NOFS, flags);
+	ret = sb_issue_zeroout(sb, blk, num, GFP_NOFS);
 	if (ret < 0)
 		goto err_out;
 
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
index 2f5e347..998a462 100644
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
@@ -229,7 +229,7 @@ static int setup_new_group_blocks(struct super_block *sb,
 	ext4_debug("clear inode table blocks %#04llx -> %#04llx\n",
 			block, sbi->s_itb_per_group);
 	err = sb_issue_zeroout(sb, gdblocks + start + 1, reserved_gdb,
-			       GFP_NOFS, BLKDEV_IFL_WAIT);
+			       GFP_NOFS);
 	if (err)
 		goto exit_bh;
 
@@ -244,8 +244,7 @@ static int setup_new_group_blocks(struct super_block *sb,
 	block = input->inode_table;
 	ext4_debug("clear inode table blocks %#04llx -> %#04llx\n",
 			block, sbi->s_itb_per_group);
-	err = sb_issue_zeroout(sb, block, sbi->s_itb_per_group,
-			       GFP_NOFS, BLKDEV_IFL_WAIT);
+	err = sb_issue_zeroout(sb, block, sbi->s_itb_per_group, GFP_NOFS);
 	if (err)
 		goto exit_bh;
 
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index a1dec60..1095272 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -892,12 +892,12 @@ static inline int sb_issue_discard(struct super_block *sb, sector_t block,
 				    gfp_mask, flags);
 }
 static inline int sb_issue_zeroout(struct super_block *sb, sector_t block,
-		sector_t nr_blocks, gfp_t gfp_mask, unsigned long flags)
+		sector_t nr_blocks, gfp_t gfp_mask)
 {
 	return blkdev_issue_zeroout(sb->s_bdev,
 				    block << (sb->s_blocksize_bits - 9),
 				    nr_blocks << (sb->s_blocksize_bits - 9),
-				    gfp_mask, flags);
+				    gfp_mask);
 }
 
 extern int blk_verify_command(unsigned char *cmd, fmode_t has_write_perm);
-- 
1.7.1

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Thu, 23 Dec 2010 12:53:56 +1100
Message-ID: <20101223125356.9ce57329.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from chilli.pcug.org.au ([203.10.76.44]:54303 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752127Ab0LWByD (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Wed, 22 Dec 2010 20:54:03 -0500
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Tejun Heo <tj@kernel.org>, Nicholas Bellinger <nab@linux-iscsi.org>, James Bottomley <James.Bottomley@HansenPartnership.com>

Hi Jens,

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

drivers/target/target_core_iblock.c: In function 'iblock_create_virtdevice':
drivers/target/target_core_iblock.c:155: error: implicit declaration of function 'open_bdev_exclusive'
drivers/target/target_core_iblock.c:156: warning: assignment makes pointer from integer without a cast
drivers/target/target_core_iblock.c: In function 'iblock_free_device':
drivers/target/target_core_iblock.c:223: error: implicit declaration of function 'close_bdev_exclusive'
drivers/target/target_core_pscsi.c: In function 'pscsi_create_type_disk':
drivers/target/target_core_pscsi.c:463: error: implicit declaration of function 'open_bdev_exclusive'
drivers/target/target_core_pscsi.c:464: warning: assignment makes pointer from integer without a cast
drivers/target/target_core_pscsi.c:474: error: implicit declaration of function 'close_bdev_exclusive'

Caused by commit 759026ddf4bdcfc68d1d330c7a5a9aee026a77c3 ("[SCSI]
target: Add LIO target core v4.0.0-rc6") from the scsi tree interacting
with commits e525fd89d380c4a94c0d63913a1dd1a593ed25e7 ("block: make
blkdev_get/put() handle exclusive access") and
d4d77629953eabd3c14f6fa5746f6b28babfc55f ("block: clean up blkdev_get()
wrappers and their users") from the block tree.

We have better ways of deprecating/replacing interfaces ...

I have added the following fix up patch for today ... and can carry it as
necessary, though someone needs to remember to tell Linus when the latter
of the block and scsi trees get merged.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 23 Dec 2010 12:34:11 +1100
Subject: [PATCH] scsi: fix for open/close_bdev_exclusive going away

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/target/target_core_iblock.c |    6 +++---
 drivers/target/target_core_pscsi.c  |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c
index e99bfc2..0d55188 100644
--- a/drivers/target/target_core_iblock.c
+++ b/drivers/target/target_core_iblock.c
@@ -152,8 +152,8 @@ static struct se_device *iblock_create_virtdevice(
 	printk(KERN_INFO  "IBLOCK: Claiming struct block_device: %s\n",
 			ib_dev->ibd_udev_path);
 
-	bd = open_bdev_exclusive(ib_dev->ibd_udev_path,
-			FMODE_WRITE|FMODE_READ, ib_dev);
+	bd = blkdev_get_by_path(ib_dev->ibd_udev_path,
+			FMODE_WRITE|FMODE_READ|FMODE_EXCL, ib_dev);
 	if (!(bd))
 		goto failed;
 	/*
@@ -220,7 +220,7 @@ static void iblock_free_device(void *p)
 {
 	struct iblock_dev *ib_dev = p;
 
-	close_bdev_exclusive(ib_dev->ibd_bd, FMODE_WRITE|FMODE_READ);
+	blkdev_put(ib_dev->ibd_bd, FMODE_WRITE|FMODE_READ|FMODE_EXCL);
 	bioset_free(ib_dev->ibd_bio_set);
 	kfree(ib_dev);
 }
diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c
index 6a7495b..05924d1 100644
--- a/drivers/target/target_core_pscsi.c
+++ b/drivers/target/target_core_pscsi.c
@@ -460,10 +460,10 @@ static struct se_device *pscsi_create_type_disk(
 	 * Claim exclusive struct block_device access to struct scsi_device
 	 * for TYPE_DISK using supplied udev_path
 	 */
-	bd = open_bdev_exclusive(se_dev->se_dev_udev_path,
-				FMODE_WRITE|FMODE_READ, pdv);
+	bd = blkdev_get_by_path(se_dev->se_dev_udev_path,
+				FMODE_WRITE|FMODE_READ|FMODE_EXCL, pdv);
 	if (!(bd)) {
-		printk("pSCSI: open_bdev_exclusive() failed\n");
+		printk("pSCSI: blkdev_get_by_path() failed\n");
 		scsi_device_put(sd);
 		return NULL;
 	}
@@ -471,7 +471,7 @@ static struct se_device *pscsi_create_type_disk(
 
 	dev = pscsi_add_device_to_list(hba, se_dev, pdv, sd, dev_flags);
 	if (!(dev)) {
-		close_bdev_exclusive(pdv->pdv_bd, FMODE_WRITE|FMODE_READ);
+		blkdev_put(pdv->pdv_bd, FMODE_WRITE|FMODE_READ|FMODE_EXCL);
 		scsi_device_put(sd);
 		return NULL;
 	}
@@ -680,8 +680,8 @@ static void pscsi_free_device(void *p)
 		 * struct scsi_device with TYPE_DISK from pscsi_create_type_disk()
 		 */
 		if ((sd->type == TYPE_DISK) && pdv->pdv_bd) {
-			close_bdev_exclusive(pdv->pdv_bd,
-					FMODE_WRITE|FMODE_READ);
+			blkdev_put(pdv->pdv_bd,
+					FMODE_WRITE|FMODE_READ|FMODE_EXCL);
 			pdv->pdv_bd = NULL;
 		}
 		/*

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

From mboxrd@z Thu Jan  1 00:00:00 1970
From: "Nicholas A. Bellinger" <nab@linux-iscsi.org>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 23 Dec 2010 14:36:50 -0800
Message-ID: <1293143810.4649.169.camel@haakon2.linux-iscsi.org>
References: <20101223125356.9ce57329.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <20101223125356.9ce57329.sfr@canb.auug.org.au>
Sender: linux-kernel-owner@vger.kernel.org
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jens Axboe <axboe@kernel.dk>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Tejun Heo <tj@kernel.org>, James Bottomley <James.Bottomley@HansenPartnership.com>, Christoph Hellwig <hch@infradead.org>
List-Id: linux-next.vger.kernel.org

On Thu, 2010-12-23 at 12:53 +1100, Stephen Rothwell wrote:
> Hi Jens,
> 
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/target/target_core_iblock.c: In function 'iblock_create_virtdevice':
> drivers/target/target_core_iblock.c:155: error: implicit declaration of function 'open_bdev_exclusive'
> drivers/target/target_core_iblock.c:156: warning: assignment makes pointer from integer without a cast
> drivers/target/target_core_iblock.c: In function 'iblock_free_device':
> drivers/target/target_core_iblock.c:223: error: implicit declaration of function 'close_bdev_exclusive'
> drivers/target/target_core_pscsi.c: In function 'pscsi_create_type_disk':
> drivers/target/target_core_pscsi.c:463: error: implicit declaration of function 'open_bdev_exclusive'
> drivers/target/target_core_pscsi.c:464: warning: assignment makes pointer from integer without a cast
> drivers/target/target_core_pscsi.c:474: error: implicit declaration of function 'close_bdev_exclusive'
> 
> Caused by commit 759026ddf4bdcfc68d1d330c7a5a9aee026a77c3 ("[SCSI]
> target: Add LIO target core v4.0.0-rc6") from the scsi tree interacting
> with commits e525fd89d380c4a94c0d63913a1dd1a593ed25e7 ("block: make
> blkdev_get/put() handle exclusive access") and
> d4d77629953eabd3c14f6fa5746f6b28babfc55f ("block: clean up blkdev_get()
> wrappers and their users") from the block tree.
> 
> We have better ways of deprecating/replacing interfaces ...
> 
> I have added the following fix up patch for today ... and can carry it as
> necessary, though someone needs to remember to tell Linus when the latter
> of the block and scsi trees get merged.
> 

Hi Stephen and James,

Thank you for catching and fixing this breakage.  Please carry this
patch for now, and I will get this merged into my upstream tree when I
pull .38-rc1 from Linus.  The patch is fine so feel free to add my:

Acked-by: Nicholas A. Bellinger <nab@linux-iscsi.org>

Also now that drivers/target/ code is on the linux-next radar, I will
begin regularly build testing against a 'for-linux-next' branch to catch
any future issues before they appear on your side.

Thank you and warmest regards,

--nab

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 23 Dec 2010 12:34:11 +1100
> Subject: [PATCH] scsi: fix for open/close_bdev_exclusive going away
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/target/target_core_iblock.c |    6 +++---
>  drivers/target/target_core_pscsi.c  |   12 ++++++------
>  2 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c
> index e99bfc2..0d55188 100644
> --- a/drivers/target/target_core_iblock.c
> +++ b/drivers/target/target_core_iblock.c
> @@ -152,8 +152,8 @@ static struct se_device *iblock_create_virtdevice(
>  	printk(KERN_INFO  "IBLOCK: Claiming struct block_device: %s\n",
>  			ib_dev->ibd_udev_path);
>  
> -	bd = open_bdev_exclusive(ib_dev->ibd_udev_path,
> -			FMODE_WRITE|FMODE_READ, ib_dev);
> +	bd = blkdev_get_by_path(ib_dev->ibd_udev_path,
> +			FMODE_WRITE|FMODE_READ|FMODE_EXCL, ib_dev);
>  	if (!(bd))
>  		goto failed;
>  	/*
> @@ -220,7 +220,7 @@ static void iblock_free_device(void *p)
>  {
>  	struct iblock_dev *ib_dev = p;
>  
> -	close_bdev_exclusive(ib_dev->ibd_bd, FMODE_WRITE|FMODE_READ);
> +	blkdev_put(ib_dev->ibd_bd, FMODE_WRITE|FMODE_READ|FMODE_EXCL);
>  	bioset_free(ib_dev->ibd_bio_set);
>  	kfree(ib_dev);
>  }
> diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c
> index 6a7495b..05924d1 100644
> --- a/drivers/target/target_core_pscsi.c
> +++ b/drivers/target/target_core_pscsi.c
> @@ -460,10 +460,10 @@ static struct se_device *pscsi_create_type_disk(
>  	 * Claim exclusive struct block_device access to struct scsi_device
>  	 * for TYPE_DISK using supplied udev_path
>  	 */
> -	bd = open_bdev_exclusive(se_dev->se_dev_udev_path,
> -				FMODE_WRITE|FMODE_READ, pdv);
> +	bd = blkdev_get_by_path(se_dev->se_dev_udev_path,
> +				FMODE_WRITE|FMODE_READ|FMODE_EXCL, pdv);
>  	if (!(bd)) {
> -		printk("pSCSI: open_bdev_exclusive() failed\n");
> +		printk("pSCSI: blkdev_get_by_path() failed\n");
>  		scsi_device_put(sd);
>  		return NULL;
>  	}
> @@ -471,7 +471,7 @@ static struct se_device *pscsi_create_type_disk(
>  
>  	dev = pscsi_add_device_to_list(hba, se_dev, pdv, sd, dev_flags);
>  	if (!(dev)) {
> -		close_bdev_exclusive(pdv->pdv_bd, FMODE_WRITE|FMODE_READ);
> +		blkdev_put(pdv->pdv_bd, FMODE_WRITE|FMODE_READ|FMODE_EXCL);
>  		scsi_device_put(sd);
>  		return NULL;
>  	}
> @@ -680,8 +680,8 @@ static void pscsi_free_device(void *p)
>  		 * struct scsi_device with TYPE_DISK from pscsi_create_type_disk()
>  		 */
>  		if ((sd->type == TYPE_DISK) && pdv->pdv_bd) {
> -			close_bdev_exclusive(pdv->pdv_bd,
> -					FMODE_WRITE|FMODE_READ);
> +			blkdev_put(pdv->pdv_bd,
> +					FMODE_WRITE|FMODE_READ|FMODE_EXCL);
>  			pdv->pdv_bd = NULL;
>  		}
>  		/*
> 

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Fri, 7 Jan 2011 11:05:13 +1100
Message-ID: <20110107110513.30776114.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA1";
 boundary="Signature=_Fri__7_Jan_2011_11_05_13_+1100_Ghyg12MvjJJnxlfs"
Return-path: <linux-next-owner@vger.kernel.org>
Received: from chilli.pcug.org.au ([203.10.76.44]:51342 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751675Ab1AGAFW (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Thu, 6 Jan 2011 19:05:22 -0500
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org

--Signature=_Fri__7_Jan_2011_11_05_13_+1100_Ghyg12MvjJJnxlfs
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Jens,

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

arch/powerpc/platforms/built-in.o: In function `.pmf_get_function':
(.text+0x723c): undefined reference to `.kref_get'
arch/powerpc/platforms/built-in.o: In function `.pmf_unregister_driver':
(.text+0x72c8): undefined reference to `.kref_get'
arch/powerpc/platforms/built-in.o: In function `.pmf_do_functions':
(.text+0x793c): undefined reference to `.kref_get'
arch/powerpc/platforms/built-in.o: In function `.__pmf_find_function':
(.text+0x7c80): undefined reference to `.kref_get'
arch/powerpc/platforms/built-in.o: In function `.pmf_register_driver':
(.text+0x8044): undefined reference to `.kref_get'
arch/powerpc/platforms/built-in.o:(.text+0x8310): more undefined references=
 to `.kref_get' follow
lib/lib.a(kref.o):(__ksymtab+0x10): undefined reference to `kref_get'
drivers/built-in.o: In function `.get_current_tty':
(.text+0x60970): undefined reference to `.kref_get'
drivers/built-in.o: In function `.__proc_set_tty':
tty_io.c:(.text+0x61624): undefined reference to `.kref_get'
drivers/built-in.o: In function `.tty_init_dev':
(.text+0x64d2c): undefined reference to `.kref_get'
drivers/built-in.o: In function `.tty_open':
tty_io.c:(.text+0x64ee4): undefined reference to `.kref_get'
tty_io.c:(.text+0x64f20): undefined reference to `.kref_get'
drivers/built-in.o:tty_io.c:(.text+0x64f58): more undefined references to `=
.kref_get' follow

Caused by commit 15454034cb3021d8bb9d21b4f35072a809197fdd ("block: add
internal hd part table references") which removes kref_get() instead of
kref_test_and_get()!

This really wasn't tested, right?

I have used the block tree from next-20110106 for today.
--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

--Signature=_Fri__7_Jan_2011_11_05_13_+1100_Ghyg12MvjJJnxlfs
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iQEcBAEBAgAGBQJNJli5AAoJEDMEi1NhKgbsWAAH/jPZLsPI6msIebXnBOtSWif0
WsmUYQoeOgiVW9QLjOWCYgiMDF5TN8OnthmZ1zf1cSDotII+IKUdsmR1BpPfi6VA
rD+bwEgjhJcPty00so+k0kRrnFf+EzOUiOX+7EtGe/J0c/g0QGScW6X6MH0uy1i9
XWcB7Q8Y/E2EPLRszZfb3od6OsK6h2T6FEeVLUUOkUSflgKr8R8DB3+cC4v2sjiy
I94cy/9BIdvuEISyw6IT4GUlkeR7DEbiM/Z46jZYtqMvADXhM/EOc87qF1oGR4fR
vniXcrxll6AnOAzYFWKP4wYLkF8VoRSvWD46OlHdPzWerzO+1FR2t4capiBHmw4=
=nebS
-----END PGP SIGNATURE-----

--Signature=_Fri__7_Jan_2011_11_05_13_+1100_Ghyg12MvjJJnxlfs--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Fri, 07 Jan 2011 08:32:09 +0100
Message-ID: <4D26C179.7030704@kernel.dk>
References: <20110107110513.30776114.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <20110107110513.30776114.sfr@canb.auug.org.au>
Sender: linux-kernel-owner@vger.kernel.org
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
List-Id: linux-next.vger.kernel.org

On 2011-01-07 01:05, Stephen Rothwell wrote:
> Hi Jens,
> 
> After merging the block tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> arch/powerpc/platforms/built-in.o: In function `.pmf_get_function':
> (.text+0x723c): undefined reference to `.kref_get'
> arch/powerpc/platforms/built-in.o: In function `.pmf_unregister_driver':
> (.text+0x72c8): undefined reference to `.kref_get'
> arch/powerpc/platforms/built-in.o: In function `.pmf_do_functions':
> (.text+0x793c): undefined reference to `.kref_get'
> arch/powerpc/platforms/built-in.o: In function `.__pmf_find_function':
> (.text+0x7c80): undefined reference to `.kref_get'
> arch/powerpc/platforms/built-in.o: In function `.pmf_register_driver':
> (.text+0x8044): undefined reference to `.kref_get'
> arch/powerpc/platforms/built-in.o:(.text+0x8310): more undefined references to `.kref_get' follow
> lib/lib.a(kref.o):(__ksymtab+0x10): undefined reference to `kref_get'
> drivers/built-in.o: In function `.get_current_tty':
> (.text+0x60970): undefined reference to `.kref_get'
> drivers/built-in.o: In function `.__proc_set_tty':
> tty_io.c:(.text+0x61624): undefined reference to `.kref_get'
> drivers/built-in.o: In function `.tty_init_dev':
> (.text+0x64d2c): undefined reference to `.kref_get'
> drivers/built-in.o: In function `.tty_open':
> tty_io.c:(.text+0x64ee4): undefined reference to `.kref_get'
> tty_io.c:(.text+0x64f20): undefined reference to `.kref_get'
> drivers/built-in.o:tty_io.c:(.text+0x64f58): more undefined references to `.kref_get' follow
> 
> Caused by commit 15454034cb3021d8bb9d21b4f35072a809197fdd ("block: add
> internal hd part table references") which removes kref_get() instead of
> kref_test_and_get()!
> 
> This really wasn't tested, right?

Irk, it was tested and booted, but apparently I merged the first bad
version of the patch.

> I have used the block tree from next-20110106 for today.

Thanks, I'll get this fixed up now.


-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Sedat Dilek <sedat.dilek@googlemail.com>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Fri, 7 Jan 2011 11:52:08 +0100
Message-ID: <AANLkTinyaZfsYv43046LWgu8U3kg6_79y+PTFO1RxtnY@mail.gmail.com>
References: <20110107110513.30776114.sfr@canb.auug.org.au>
	<4D26C179.7030704@kernel.dk>
Reply-To: sedat.dilek@gmail.com
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: QUOTED-PRINTABLE
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mail-qy0-f181.google.com ([209.85.216.181]:55012 "EHLO
	mail-qy0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751385Ab1AGKwJ convert rfc822-to-8bit (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Fri, 7 Jan 2011 05:52:09 -0500
In-Reply-To: <4D26C179.7030704@kernel.dk>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org

On Fri, Jan 7, 2011 at 8:32 AM, Jens Axboe <axboe@kernel.dk> wrote:
> On 2011-01-07 01:05, Stephen Rothwell wrote:
>> Hi Jens,
>>
>> After merging the block tree, today's linux-next build (powerpc
>> ppc64_defconfig) failed like this:
>>
>> arch/powerpc/platforms/built-in.o: In function `.pmf_get_function':
>> (.text+0x723c): undefined reference to `.kref_get'
>> arch/powerpc/platforms/built-in.o: In function `.pmf_unregister_driv=
er':
>> (.text+0x72c8): undefined reference to `.kref_get'
>> arch/powerpc/platforms/built-in.o: In function `.pmf_do_functions':
>> (.text+0x793c): undefined reference to `.kref_get'
>> arch/powerpc/platforms/built-in.o: In function `.__pmf_find_function=
':
>> (.text+0x7c80): undefined reference to `.kref_get'
>> arch/powerpc/platforms/built-in.o: In function `.pmf_register_driver=
':
>> (.text+0x8044): undefined reference to `.kref_get'
>> arch/powerpc/platforms/built-in.o:(.text+0x8310): more undefined ref=
erences to `.kref_get' follow
>> lib/lib.a(kref.o):(__ksymtab+0x10): undefined reference to `kref_get=
'
>> drivers/built-in.o: In function `.get_current_tty':
>> (.text+0x60970): undefined reference to `.kref_get'
>> drivers/built-in.o: In function `.__proc_set_tty':
>> tty_io.c:(.text+0x61624): undefined reference to `.kref_get'
>> drivers/built-in.o: In function `.tty_init_dev':
>> (.text+0x64d2c): undefined reference to `.kref_get'
>> drivers/built-in.o: In function `.tty_open':
>> tty_io.c:(.text+0x64ee4): undefined reference to `.kref_get'
>> tty_io.c:(.text+0x64f20): undefined reference to `.kref_get'
>> drivers/built-in.o:tty_io.c:(.text+0x64f58): more undefined referenc=
es to `.kref_get' follow
>>
>> Caused by commit 15454034cb3021d8bb9d21b4f35072a809197fdd ("block: a=
dd
>> internal hd part table references") which removes kref_get() instead=
 of
>> kref_test_and_get()!
>>
>> This really wasn't tested, right?
>
> Irk, it was tested and booted, but apparently I merged the first bad
> version of the patch.
>
>> I have used the block tree from next-20110106 for today.
>
> Thanks, I'll get this fixed up now.
>
>
> --
> Jens Axboe
>

JFYI:
I pulled in patches from linux-2.6-block#for-next (up to commit
6573422f81efa3bd71848dc584c35d4318d3de0b):
"Merge branch 'for-2.6.38/core' into for-next"
=2E..into linux-next (next-20110107) and now I get:

$ grep block build_linux-next_next20110107.dileks.2.log
30886 blocks
  CC      fs/block_dev.o
  CC      mm/memblock.o
  CC      kernel/power/block_io.o
/home/sd/src/linux-2.6/linux-2.6.37/debian/build/source_i386_none/kerne=
l/trace/blktrace.c:999:2:
warning: passing argument 1 of =E2=80=98register_trace_block_bio_comple=
te=E2=80=99
from incompatible pointer type
/home/sd/src/linux-2.6/linux-2.6.37/debian/build/source_i386_none/inclu=
de/trace/events/block.h:240:1:
note: expected =E2=80=98void (*)(void *, struct request_queue *, struct=
 bio *,
int)=E2=80=99 but argument is of type =E2=80=98void (*)(void *, struct =
request_queue
*, struct bio *)=E2=80=99
/home/sd/src/linux-2.6/linux-2.6.37/debian/build/source_i386_none/kerne=
l/trace/blktrace.c:1038:2:
warning: passing argument 1 of =E2=80=98unregister_trace_block_bio_comp=
lete=E2=80=99
from incompatible pointer type
/home/sd/src/linux-2.6/linux-2.6.37/debian/build/source_i386_none/inclu=
de/trace/events/block.h:240:1:
note: expected =E2=80=98void (*)(void *, struct request_queue *, struct=
 bio *,
int)=E2=80=99 but argument is of type =E2=80=98void (*)(void *, struct =
request_queue
*, struct bio *)=E2=80=99
  CC      arch/x86/mm/memblock.o
  CC      block/elevator.o
  CC      block/blk-core.o
  CC      block/blk-tag.o
  CC      block/blk-sysfs.o
  CC      block/blk-flush.o
  CC      block/blk-settings.o
  CC      block/blk-ioc.o
  CC      block/blk-map.o
  CC      block/blk-exec.o
  CC      block/blk-merge.o
  CC      block/blk-softirq.o
  CC      block/blk-timeout.o
  CC      block/blk-iopoll.o
  CC      block/blk-lib.o
  CC      block/ioctl.o
  CC      block/genhd.o
  CC      block/scsi_ioctl.o
  CC      block/bsg.o
  CC      block/blk-cgroup.o
  CC      block/noop-iosched.o
  CC      block/deadline-iosched.o
  CC      block/cfq-iosched.o
  CC      block/blk-integrity.o
  LD      block/built-in.o

- Sedat -

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Fri, 7 Jan 2011 23:17:48 +1100
Message-ID: <20110107231748.76170ff3.sfr@canb.auug.org.au>
References: <20110107110513.30776114.sfr@canb.auug.org.au>
	<4D26C179.7030704@kernel.dk>
	<AANLkTinyaZfsYv43046LWgu8U3kg6_79y+PTFO1RxtnY@mail.gmail.com>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA1";
 boundary="Signature=_Fri__7_Jan_2011_23_17_48_+1100_XXYeebMryn8lA0g_"
Return-path: <linux-next-owner@vger.kernel.org>
Received: from chilli.pcug.org.au ([203.10.76.44]:43599 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751583Ab1AGMR5 (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Fri, 7 Jan 2011 07:17:57 -0500
In-Reply-To: <AANLkTinyaZfsYv43046LWgu8U3kg6_79y+PTFO1RxtnY@mail.gmail.com>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: sedat.dilek@gmail.com
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>, Sedat Dilek <sedat.dilek@googlemail.com>, Jens Axboe <axboe@kernel.dk>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org

--Signature=_Fri__7_Jan_2011_23_17_48_+1100_XXYeebMryn8lA0g_
Content-Type: text/plain; charset=UTF-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi All,

On Fri, 7 Jan 2011 11:52:08 +0100 Sedat Dilek <sedat.dilek@googlemail.com> =
wrote:
>
> JFYI:
> I pulled in patches from linux-2.6-block#for-next (up to commit
> 6573422f81efa3bd71848dc584c35d4318d3de0b):
> "Merge branch 'for-2.6.38/core' into for-next"
> ...into linux-next (next-20110107) and now I get:
>=20
> $ grep block build_linux-next_next20110107.dileks.2.log
> 30886 blocks
>   CC      fs/block_dev.o
>   CC      mm/memblock.o
>   CC      kernel/power/block_io.o
> /home/sd/src/linux-2.6/linux-2.6.37/debian/build/source_i386_none/kernel/=
trace/blktrace.c:999:2:
> warning: passing argument 1 of =E2=80=98register_trace_block_bio_complete=
=E2=80=99
> from incompatible pointer type
> /home/sd/src/linux-2.6/linux-2.6.37/debian/build/source_i386_none/include=
/trace/events/block.h:240:1:
> note: expected =E2=80=98void (*)(void *, struct request_queue *, struct b=
io *,
> int)=E2=80=99 but argument is of type =E2=80=98void (*)(void *, struct re=
quest_queue
> *, struct bio *)=E2=80=99
> /home/sd/src/linux-2.6/linux-2.6.37/debian/build/source_i386_none/kernel/=
trace/blktrace.c:1038:2:
> warning: passing argument 1 of =E2=80=98unregister_trace_block_bio_comple=
te=E2=80=99
> from incompatible pointer type
> /home/sd/src/linux-2.6/linux-2.6.37/debian/build/source_i386_none/include=
/trace/events/block.h:240:1:
> note: expected =E2=80=98void (*)(void *, struct request_queue *, struct b=
io *,
> int)=E2=80=99 but argument is of type =E2=80=98void (*)(void *, struct re=
quest_queue
> *, struct bio *)=E2=80=99

I reported that separately today and Mathieu Desnoyers (cc'd) has said
that he will supply a patch.

--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

--Signature=_Fri__7_Jan_2011_23_17_48_+1100_XXYeebMryn8lA0g_
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iQEcBAEBAgAGBQJNJwRsAAoJEDMEi1NhKgbsc8sIAJbLVWhsTX6lp8f454UYSNtP
F1DdLIxS9809frj/erhre2OT6ci4+WLioNp7mNC2WKjOH/zkZVq5cvV1CA7yNd+M
iGaW44tIwU9Ef4tpEcAKTUKflasHLRh/hFGtObcvbLCLQJ1Cei/7819zTlXTgLd8
R20HUqSPTXCWR/4qnPeoYweJj7I4Rs2sEC1RMNz3SgfhUmLBciQVHAOPZj0Y6zCv
R3l5E9N3UM+UZnHazxM4arTUuN3+3EIG9zKXxIQa5LizlJUmQLLpgfKWPYu+8mir
WgzT/C1q8u4R5YGZpGWGRyCGu/kIP48Oc09faJdgCillE+swlg9hdbGpXGHAqMs=
=mqw7
-----END PGP SIGNATURE-----

--Signature=_Fri__7_Jan_2011_23_17_48_+1100_XXYeebMryn8lA0g_--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Sedat Dilek <sedat.dilek@googlemail.com>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Fri, 7 Jan 2011 14:19:33 +0100
Message-ID: <AANLkTimpVMLGBnP33Ro8MBtW3GJjskg0bBK717Xf-Mh_@mail.gmail.com>
References: <20110107110513.30776114.sfr@canb.auug.org.au>
	<4D26C179.7030704@kernel.dk>
	<AANLkTinyaZfsYv43046LWgu8U3kg6_79y+PTFO1RxtnY@mail.gmail.com>
	<20110107231748.76170ff3.sfr@canb.auug.org.au>
Reply-To: sedat.dilek@gmail.com
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: QUOTED-PRINTABLE
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mail-qw0-f46.google.com ([209.85.216.46]:64807 "EHLO
	mail-qw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752629Ab1AGNTe convert rfc822-to-8bit (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Fri, 7 Jan 2011 08:19:34 -0500
In-Reply-To: <20110107231748.76170ff3.sfr@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>, Jens Axboe <axboe@kernel.dk>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org

On Fri, Jan 7, 2011 at 1:17 PM, Stephen Rothwell <sfr@canb.auug.org.au>=
 wrote:
> Hi All,
>
> On Fri, 7 Jan 2011 11:52:08 +0100 Sedat Dilek <sedat.dilek@googlemail=
=2Ecom> wrote:
>>
>> JFYI:
>> I pulled in patches from linux-2.6-block#for-next (up to commit
>> 6573422f81efa3bd71848dc584c35d4318d3de0b):
>> "Merge branch 'for-2.6.38/core' into for-next"
>> ...into linux-next (next-20110107) and now I get:
>>
>> $ grep block build_linux-next_next20110107.dileks.2.log
>> 30886 blocks
>> =C2=A0 CC =C2=A0 =C2=A0 =C2=A0fs/block_dev.o
>> =C2=A0 CC =C2=A0 =C2=A0 =C2=A0mm/memblock.o
>> =C2=A0 CC =C2=A0 =C2=A0 =C2=A0kernel/power/block_io.o
>> /home/sd/src/linux-2.6/linux-2.6.37/debian/build/source_i386_none/ke=
rnel/trace/blktrace.c:999:2:
>> warning: passing argument 1 of =E2=80=98register_trace_block_bio_com=
plete=E2=80=99
>> from incompatible pointer type
>> /home/sd/src/linux-2.6/linux-2.6.37/debian/build/source_i386_none/in=
clude/trace/events/block.h:240:1:
>> note: expected =E2=80=98void (*)(void *, struct request_queue *, str=
uct bio *,
>> int)=E2=80=99 but argument is of type =E2=80=98void (*)(void *, stru=
ct request_queue
>> *, struct bio *)=E2=80=99
>> /home/sd/src/linux-2.6/linux-2.6.37/debian/build/source_i386_none/ke=
rnel/trace/blktrace.c:1038:2:
>> warning: passing argument 1 of =E2=80=98unregister_trace_block_bio_c=
omplete=E2=80=99
>> from incompatible pointer type
>> /home/sd/src/linux-2.6/linux-2.6.37/debian/build/source_i386_none/in=
clude/trace/events/block.h:240:1:
>> note: expected =E2=80=98void (*)(void *, struct request_queue *, str=
uct bio *,
>> int)=E2=80=99 but argument is of type =E2=80=98void (*)(void *, stru=
ct request_queue
>> *, struct bio *)=E2=80=99
>
> I reported that separately today and Mathieu Desnoyers (cc'd) has sai=
d
> that he will supply a patch.
>
> --
> Cheers,
> Stephen Rothwell =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>

Hmm, I have pulled-in freshly from linux-2.6-block#for-next after you
published latest linux-next (next-20110107).
So, I guessed the (reported) issue is fixed, now.

- Sedat -

[1] http://git.kernel.org/?p=3Dlinux/kernel/git/axboe/linux-2.6-block.g=
it;a=3Dcommit;h=3Db7908c1035af7652cd613991b54dbff9c8b6bd3a

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Sat, 8 Jan 2011 01:22:11 +1100
Message-ID: <20110108012211.1e19f0f7.sfr@canb.auug.org.au>
References: <20110107110513.30776114.sfr@canb.auug.org.au>
	<4D26C179.7030704@kernel.dk>
	<AANLkTinyaZfsYv43046LWgu8U3kg6_79y+PTFO1RxtnY@mail.gmail.com>
	<20110107231748.76170ff3.sfr@canb.auug.org.au>
	<AANLkTimpVMLGBnP33Ro8MBtW3GJjskg0bBK717Xf-Mh_@mail.gmail.com>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA1";
 boundary="Signature=_Sat__8_Jan_2011_01_22_11_+1100_91nnHwaZBJ5k_2pw"
Return-path: <linux-next-owner@vger.kernel.org>
Received: from chilli.pcug.org.au ([203.10.76.44]:36873 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753534Ab1AGOWX (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Fri, 7 Jan 2011 09:22:23 -0500
In-Reply-To: <AANLkTimpVMLGBnP33Ro8MBtW3GJjskg0bBK717Xf-Mh_@mail.gmail.com>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: sedat.dilek@gmail.com
Cc: Sedat Dilek <sedat.dilek@googlemail.com>, Mathieu Desnoyers <mathieu.desnoyers@efficios.com>, Jens Axboe <axboe@kernel.dk>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org

--Signature=_Sat__8_Jan_2011_01_22_11_+1100_91nnHwaZBJ5k_2pw
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi,

On Fri, 7 Jan 2011 14:19:33 +0100 Sedat Dilek <sedat.dilek@googlemail.com> =
wrote:
>
> Hmm, I have pulled-in freshly from linux-2.6-block#for-next after you
> published latest linux-next (next-20110107).
> So, I guessed the (reported) issue is fixed, now.

No, the commit that caused the warnings was removed when I went back to
using the block tree from next-20110106.  So it will come back unless
fixed.

--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

--Signature=_Sat__8_Jan_2011_01_22_11_+1100_91nnHwaZBJ5k_2pw
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iQEcBAEBAgAGBQJNJyGTAAoJEDMEi1NhKgbstd4H/2jQzCcWw6jm5va7h8bF3aGH
ijv/UjpdVYC81UQoaXNGgDyRCrGa1ykFcWJenvKdOueJAeOK3QxvCR2T/Y4BPdgz
DWDAvtKl4ttFD0phmzKP8FCP9Ak+qmRpcQHRAzJq9aJsW0r5gAmwSBCfQZRO4hYk
fbZs1jPCtX2rHIxABznqMPWcikJYhNl4DxQnzk5d0GEeq66zYtzrtt5DJCaWhgqq
sBNuHSEjRexHqAfBJQ5g6Ww/6yTbAAAn2J9aWVNnfo1ziHfLPvQcrq7kZXGzrWMx
DwukcFeWvntKjTV5g5MBbsjH3HhEQcYg6T9v/qxvGcUk6oUYXIOxt21eKh+u8r4=
=dnhQ
-----END PGP SIGNATURE-----

--Signature=_Sat__8_Jan_2011_01_22_11_+1100_91nnHwaZBJ5k_2pw--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Fri, 07 Jan 2011 16:08:04 +0100
Message-ID: <4D272C54.5010406@kernel.dk>
References: <20110107110513.30776114.sfr@canb.auug.org.au>	<4D26C179.7030704@kernel.dk>	<AANLkTinyaZfsYv43046LWgu8U3kg6_79y+PTFO1RxtnY@mail.gmail.com>	<20110107231748.76170ff3.sfr@canb.auug.org.au>	<AANLkTimpVMLGBnP33Ro8MBtW3GJjskg0bBK717Xf-Mh_@mail.gmail.com> <20110108012211.1e19f0f7.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from 0122700014.0.fullrate.dk ([95.166.99.235]:42937 "EHLO kernel.dk"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752008Ab1AGPFg (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Fri, 7 Jan 2011 10:05:36 -0500
In-Reply-To: <20110108012211.1e19f0f7.sfr@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: sedat.dilek@gmail.com, Sedat Dilek <sedat.dilek@googlemail.com>, Mathieu Desnoyers <mathieu.desnoyers@efficios.com>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org

On 2011-01-07 15:22, Stephen Rothwell wrote:
> Hi,
> 
> On Fri, 7 Jan 2011 14:19:33 +0100 Sedat Dilek <sedat.dilek@googlemail.com> wrote:
>>
>> Hmm, I have pulled-in freshly from linux-2.6-block#for-next after you
>> published latest linux-next (next-20110107).
>> So, I guessed the (reported) issue is fixed, now.
> 
> No, the commit that caused the warnings was removed when I went back to
> using the block tree from next-20110106.  So it will come back unless
> fixed.

It is fixed in linux-2.6-block#for-next as-of earlier today, so if Sedat
pulled from there it should be gone.

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Sedat Dilek <sedat.dilek@googlemail.com>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Fri, 7 Jan 2011 19:04:56 +0100
Message-ID: <AANLkTim_Su1XTvvpFvPqv1xpkkUA3PEVDEVpXaODjYpt@mail.gmail.com>
References: <20110107110513.30776114.sfr@canb.auug.org.au>
	<4D26C179.7030704@kernel.dk>
	<AANLkTinyaZfsYv43046LWgu8U3kg6_79y+PTFO1RxtnY@mail.gmail.com>
	<20110107231748.76170ff3.sfr@canb.auug.org.au>
	<AANLkTimpVMLGBnP33Ro8MBtW3GJjskg0bBK717Xf-Mh_@mail.gmail.com>
	<20110108012211.1e19f0f7.sfr@canb.auug.org.au>
	<4D272C54.5010406@kernel.dk>
Reply-To: sedat.dilek@gmail.com
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary=0016367f9678b5b5660499457452
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <4D272C54.5010406@kernel.dk>
Sender: linux-kernel-owner@vger.kernel.org
To: Jens Axboe <axboe@kernel.dk>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>, Mathieu Desnoyers <mathieu.desnoyers@efficios.com>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
List-Id: linux-next.vger.kernel.org

--0016367f9678b5b5660499457452
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

On Fri, Jan 7, 2011 at 4:08 PM, Jens Axboe <axboe@kernel.dk> wrote:
> On 2011-01-07 15:22, Stephen Rothwell wrote:
>> Hi,
>>
>> On Fri, 7 Jan 2011 14:19:33 +0100 Sedat Dilek <sedat.dilek@googlemail.co=
m> wrote:
>>>
>>> Hmm, I have pulled-in freshly from linux-2.6-block#for-next after you
>>> published latest linux-next (next-20110107).
>>> So, I guessed the (reported) issue is fixed, now.
>>
>> No, the commit that caused the warnings was removed when I went back to
>> using the block tree from next-20110106. =C2=A0So it will come back unle=
ss
>> fixed.
>
> It is fixed in linux-2.6-block#for-next as-of earlier today, so if Sedat
> pulled from there it should be gone.
>
> --
> Jens Axboe
>
>

I guess 0002 should fix it, its not the case (patch + "big diff" attached).

- Sedat -

sd@tbox:~/src/linux-2.6/linux-2.6.37/debian/patches$ LC_ALL=3DC ls -l
linux-2.6-block-for-next/
total 44
-rw-r--r-- 1 sd sd  5903 Jan  7 10:33
0001-block-add-internal-hd-part-table-references.patch
-rw-r--r-- 1 sd sd  2382 Jan  7 10:33
0002-block-trace-event-block-fix-unassigned-field.patch
-rw-r--r-- 1 sd sd  3400 Jan  7 10:33
0003-block-cfq-don-t-use-atomic_t-for-cfq_queue.patch
-rw-r--r-- 1 sd sd  3387 Jan  7 10:33
0004-block-cfq-don-t-use-atomic_t-for-cfq_group.patch
-rw-r--r-- 1 sd sd   403 Jan  7 10:33 Shortlog
-rw-r--r-- 1 sd sd   527 Jan  7 10:33 diffstat
-rw-r--r-- 1 sd sd 12797 Jan  7 10:33 linux-2.6-block-for-next.patch

--0016367f9678b5b5660499457452
Content-Type: plain/text;
	name="0002-block-trace-event-block-fix-unassigned-field.patch"
Content-Disposition: attachment;
	filename="0002-block-trace-event-block-fix-unassigned-field.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_gine8qlz0

RnJvbSBiNzkwOGMxMDM1YWY3NjUyY2Q2MTM5OTFiNTRkYmZmOWM4YjZiZDNhIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBKZWZmIE1veWVyIDxqbW95ZXJAcmVkaGF0LmNvbT4KRGF0ZTog
VGh1LCA2IEphbiAyMDExIDIwOjQxOjQyICswMTAwClN1YmplY3Q6IFtQQVRDSCAyLzRdIGJsb2Nr
OiB0cmFjZSBldmVudCBibG9jayBmaXggdW5hc3NpZ25lZCBmaWVsZAoKVGhlICJlcnJvciIgZmll
bGQgaW4gYmxvY2tfYmlvX2NvbXBsZXRlIGlzIG5vdCBhc3NpZ25lZCwgbGVhdmluZyB0aGUgbWVt
b3J5IGFyZWEKdW5pbml0aWFsaXplZCAoa2VlcGluZyBnYXJiYWdlIGRhdGEpLiBQYXNzIGFuIGFk
ZGl0aW9uYWwgdHJhY2Vwb2ludCBhcmd1bWVudCB0bwp0aGlzIGV2ZW50IHRvIGluaXRpYWxpemUg
dGhpcyBmaWVsZC4KClNpZ25lZC1vZmYtYnk6IEplZmYgTW95ZXIgPGptb3llckByZWRoYXQuY29t
PgpTaWduZWQtb2ZmLWJ5OiBNYXRoaWV1IERlc25veWVycyA8bWF0aGlldS5kZXNub3llcnNAZWZm
aWNpb3MuY29tPgpDQzogU3RldmVuIFJvc3RlZHQgPHJvc3RlZHRAZ29vZG1pcy5vcmc+CkNDOiBG
cmVkZXJpYyBXZWlzYmVja2VyIDxmd2Vpc2JlY0BnbWFpbC5jb20+CkNDOiBJbmdvIE1vbG5hciA8
bWluZ29AZWx0ZS5odT4KQ0M6IFRob21hcyBHbGVpeG5lciA8dGdseEBsaW51dHJvbml4LmRlPgpD
QzogTGkgWmVmYW4gPGxpemZAY24uZnVqaXRzdS5jb20+CkNDOiBBbGFuLkJydW5lbGxlQGhwLmNv
bQpTaWduZWQtb2ZmLWJ5OiBKZW5zIEF4Ym9lIDxqYXhib2VAZnVzaW9uaW8uY29tPgotLS0KIGRy
aXZlcnMvbWQvZG0uYyAgICAgICAgICAgICAgfCAgICAyICstCiBpbmNsdWRlL3RyYWNlL2V2ZW50
cy9ibG9jay5oIHwgICAgNiArKysrLS0KIDIgZmlsZXMgY2hhbmdlZCwgNSBpbnNlcnRpb25zKCsp
LCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvbWQvZG0uYyBiL2RyaXZlcnMv
bWQvZG0uYwppbmRleCAwYTJiNTUxLi5mNDhhMmYzIDEwMDY0NAotLS0gYS9kcml2ZXJzL21kL2Rt
LmMKKysrIGIvZHJpdmVycy9tZC9kbS5jCkBAIC02MzAsNyArNjMwLDcgQEAgc3RhdGljIHZvaWQg
ZGVjX3BlbmRpbmcoc3RydWN0IGRtX2lvICppbywgaW50IGVycm9yKQogCQkJcXVldWVfaW8obWQs
IGJpbyk7CiAJCX0gZWxzZSB7CiAJCQkvKiBkb25lIHdpdGggbm9ybWFsIElPIG9yIGVtcHR5IGZs
dXNoICovCi0JCQl0cmFjZV9ibG9ja19iaW9fY29tcGxldGUobWQtPnF1ZXVlLCBiaW8pOworCQkJ
dHJhY2VfYmxvY2tfYmlvX2NvbXBsZXRlKG1kLT5xdWV1ZSwgYmlvLCBpb19lcnJvcik7CiAJCQli
aW9fZW5kaW8oYmlvLCBpb19lcnJvcik7CiAJCX0KIAl9CmRpZmYgLS1naXQgYS9pbmNsdWRlL3Ry
YWNlL2V2ZW50cy9ibG9jay5oIGIvaW5jbHVkZS90cmFjZS9ldmVudHMvYmxvY2suaAppbmRleCBi
NTZjNjVkLi5hYmE0MjFkIDEwMDY0NAotLS0gYS9pbmNsdWRlL3RyYWNlL2V2ZW50cy9ibG9jay5o
CisrKyBiL2luY2x1ZGUvdHJhY2UvZXZlbnRzL2Jsb2NrLmgKQEAgLTIwNiwxNSArMjA2LDE2IEBA
IFRSQUNFX0VWRU5UKGJsb2NrX2Jpb19ib3VuY2UsCiAgKiBibG9ja19iaW9fY29tcGxldGUgLSBj
b21wbGV0ZWQgYWxsIHdvcmsgb24gdGhlIGJsb2NrIG9wZXJhdGlvbgogICogQHE6IHF1ZXVlIGhv
bGRpbmcgdGhlIGJsb2NrIG9wZXJhdGlvbgogICogQGJpbzogYmxvY2sgb3BlcmF0aW9uIGNvbXBs
ZXRlZAorICogQGVycm9yOiBpbyBlcnJvciB2YWx1ZQogICoKICAqIFRoaXMgdHJhY2Vwb2ludCBp
bmRpY2F0ZXMgdGhlcmUgaXMgbm8gZnVydGhlciB3b3JrIHRvIGRvIG9uIHRoaXMKICAqIGJsb2Nr
IElPIG9wZXJhdGlvbiBAYmlvLgogICovCiBUUkFDRV9FVkVOVChibG9ja19iaW9fY29tcGxldGUs
CiAKLQlUUF9QUk9UTyhzdHJ1Y3QgcmVxdWVzdF9xdWV1ZSAqcSwgc3RydWN0IGJpbyAqYmlvKSwK
KwlUUF9QUk9UTyhzdHJ1Y3QgcmVxdWVzdF9xdWV1ZSAqcSwgc3RydWN0IGJpbyAqYmlvLCBpbnQg
ZXJyb3IpLAogCi0JVFBfQVJHUyhxLCBiaW8pLAorCVRQX0FSR1MocSwgYmlvLCBlcnJvciksCiAK
IAlUUF9TVFJVQ1RfX2VudHJ5KAogCQlfX2ZpZWxkKCBkZXZfdCwJCWRldgkJKQpAQCAtMjI4LDYg
KzIyOSw3IEBAIFRSQUNFX0VWRU5UKGJsb2NrX2Jpb19jb21wbGV0ZSwKIAkJX19lbnRyeS0+ZGV2
CQk9IGJpby0+YmlfYmRldi0+YmRfZGV2OwogCQlfX2VudHJ5LT5zZWN0b3IJCT0gYmlvLT5iaV9z
ZWN0b3I7CiAJCV9fZW50cnktPm5yX3NlY3Rvcgk9IGJpby0+Ymlfc2l6ZSA+PiA5OworCQlfX2Vu
dHJ5LT5lcnJvcgkJPSBlcnJvcjsKIAkJYmxrX2ZpbGxfcndicyhfX2VudHJ5LT5yd2JzLCBiaW8t
PmJpX3J3LCBiaW8tPmJpX3NpemUpOwogCSksCiAKLS0gCjEuNy40LnJjMAoK
--0016367f9678b5b5660499457452
Content-Type: plain/text; name="linux-2.6-block-for-next.patch"
Content-Disposition: attachment; filename="linux-2.6-block-for-next.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_gineazl41

SmVmZiBNb3llciAoMSk6CiAgICAgIGJsb2NrOiB0cmFjZSBldmVudCBibG9jayBmaXggdW5hc3Np
Z25lZCBmaWVsZAoKSmVucyBBeGJvZSAoMik6CiAgICAgIGJsb2NrOiBhZGQgaW50ZXJuYWwgaGQg
cGFydCB0YWJsZSByZWZlcmVuY2VzCiAgICAgIE1lcmdlIGJyYW5jaCAnZm9yLTIuNi4zOC9jb3Jl
JyBpbnRvIGZvci1uZXh0CgpTZWRhdCBEaWxlayAoMSk6CiAgICAgIE1lcmdlIGJyYW5jaCAnZm9y
LW5leHQnIG9mIGdpdDovL2dpdC5rZXJuZWwub3JnLy4uLi9heGJvZS9saW51eC0yLjYtYmxvY2sK
ClNoYW9odWEgTGkgKDIpOgogICAgICBibG9jayBjZnE6IGRvbid0IHVzZSBhdG9taWNfdCBmb3Ig
Y2ZxX3F1ZXVlCiAgICAgIGJsb2NrIGNmcTogZG9uJ3QgdXNlIGF0b21pY190IGZvciBjZnFfZ3Jv
dXAKCiBibG9jay9ibGstY29yZS5jICAgICAgICAgICAgIHwgICAgNiArKy0tCiBibG9jay9ibGst
bWVyZ2UuYyAgICAgICAgICAgIHwgICAgMiArLQogYmxvY2svY2ZxLWlvc2NoZWQuYyAgICAgICAg
ICB8ICAgNTAgKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0KIGJsb2Nr
L2dlbmhkLmMgICAgICAgICAgICAgICAgfCAgICAzICstCiBkcml2ZXJzL21kL2RtLmMgICAgICAg
ICAgICAgIHwgICAgMiArLQogZnMvcGFydGl0aW9ucy9jaGVjay5jICAgICAgICB8ICAgIDggKyst
LS0tCiBpbmNsdWRlL2xpbnV4L2dlbmhkLmggICAgICAgIHwgICAyNyArKysrKysrKysrKysrKysr
KysrKystCiBpbmNsdWRlL2xpbnV4L2tyZWYuaCAgICAgICAgIHwgICAgMSAtCiBpbmNsdWRlL3Ry
YWNlL2V2ZW50cy9ibG9jay5oIHwgICAgNiArKystCiBsaWIva3JlZi5jICAgICAgICAgICAgICAg
ICAgIHwgICAxMiAtLS0tLS0tLS0tCiAxMCBmaWxlcyBjaGFuZ2VkLCA2NyBpbnNlcnRpb25zKCsp
LCA1MCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9ibG9jay9ibGstY29yZS5jIGIvYmxvY2sv
YmxrLWNvcmUuYwppbmRleCA1MDBjMDgwLi4yZjQwMDJmIDEwMDY0NAotLS0gYS9ibG9jay9ibGst
Y29yZS5jCisrKyBiL2Jsb2NrL2Jsay1jb3JlLmMKQEAgLTcwLDcgKzcwLDcgQEAgc3RhdGljIHZv
aWQgZHJpdmVfc3RhdF9hY2N0KHN0cnVjdCByZXF1ZXN0ICpycSwgaW50IG5ld19pbykKIAkJcGFy
dF9zdGF0X2luYyhjcHUsIHBhcnQsIG1lcmdlc1tyd10pOwogCX0gZWxzZSB7CiAJCXBhcnQgPSBk
aXNrX21hcF9zZWN0b3JfcmN1KHJxLT5ycV9kaXNrLCBibGtfcnFfcG9zKHJxKSk7Ci0JCWlmICgh
a3JlZl90ZXN0X2FuZF9nZXQoJnBhcnQtPnJlZikpIHsKKwkJaWYgKCFoZF9zdHJ1Y3RfdHJ5X2dl
dChwYXJ0KSkgewogCQkJLyoKIAkJCSAqIFRoZSBwYXJ0aXRpb24gaXMgYWxyZWFkeSBiZWluZyBy
ZW1vdmVkLAogCQkJICogdGhlIHJlcXVlc3Qgd2lsbCBiZSBhY2NvdW50ZWQgb24gdGhlIGRpc2sg
b25seQpAQCAtODAsNyArODAsNyBAQCBzdGF0aWMgdm9pZCBkcml2ZV9zdGF0X2FjY3Qoc3RydWN0
IHJlcXVlc3QgKnJxLCBpbnQgbmV3X2lvKQogCQkJICogaXQgYXMgYW55IG90aGVyIHBhcnRpdGlv
bi4KIAkJCSAqLwogCQkJcGFydCA9ICZycS0+cnFfZGlzay0+cGFydDA7Ci0JCQlrcmVmX2dldCgm
cGFydC0+cmVmKTsKKwkJCWhkX3N0cnVjdF9nZXQocGFydCk7CiAJCX0KIAkJcGFydF9yb3VuZF9z
dGF0cyhjcHUsIHBhcnQpOwogCQlwYXJ0X2luY19pbl9mbGlnaHQocGFydCwgcncpOwpAQCAtMTgx
OCw3ICsxODE4LDcgQEAgc3RhdGljIHZvaWQgYmxrX2FjY291bnRfaW9fZG9uZShzdHJ1Y3QgcmVx
dWVzdCAqcmVxKQogCQlwYXJ0X3JvdW5kX3N0YXRzKGNwdSwgcGFydCk7CiAJCXBhcnRfZGVjX2lu
X2ZsaWdodChwYXJ0LCBydyk7CiAKLQkJa3JlZl9wdXQoJnBhcnQtPnJlZiwgX19kZWxldGVfcGFy
dGl0aW9uKTsKKwkJaGRfc3RydWN0X3B1dChwYXJ0KTsKIAkJcGFydF9zdGF0X3VubG9jaygpOwog
CX0KIH0KZGlmZiAtLWdpdCBhL2Jsb2NrL2Jsay1tZXJnZS5jIGIvYmxvY2svYmxrLW1lcmdlLmMK
aW5kZXggMjNlYTc0Yi4uZWE4NWUyMCAxMDA2NDQKLS0tIGEvYmxvY2svYmxrLW1lcmdlLmMKKysr
IGIvYmxvY2svYmxrLW1lcmdlLmMKQEAgLTM1Niw3ICszNTYsNyBAQCBzdGF0aWMgdm9pZCBibGtf
YWNjb3VudF9pb19tZXJnZShzdHJ1Y3QgcmVxdWVzdCAqcmVxKQogCQlwYXJ0X3JvdW5kX3N0YXRz
KGNwdSwgcGFydCk7CiAJCXBhcnRfZGVjX2luX2ZsaWdodChwYXJ0LCBycV9kYXRhX2RpcihyZXEp
KTsKIAotCQlrcmVmX3B1dCgmcGFydC0+cmVmLCBfX2RlbGV0ZV9wYXJ0aXRpb24pOworCQloZF9z
dHJ1Y3RfcHV0KHBhcnQpOwogCQlwYXJ0X3N0YXRfdW5sb2NrKCk7CiAJfQogfQpkaWZmIC0tZ2l0
IGEvYmxvY2svY2ZxLWlvc2NoZWQuYyBiL2Jsb2NrL2NmcS1pb3NjaGVkLmMKaW5kZXggMWFjMjBm
NS4uODQyNzY5NyAxMDA2NDQKLS0tIGEvYmxvY2svY2ZxLWlvc2NoZWQuYworKysgYi9ibG9jay9j
ZnEtaW9zY2hlZC5jCkBAIC05Niw3ICs5Niw3IEBAIHN0cnVjdCBjZnFfcmJfcm9vdCB7CiAgKi8K
IHN0cnVjdCBjZnFfcXVldWUgewogCS8qIHJlZmVyZW5jZSBjb3VudCAqLwotCWF0b21pY190IHJl
ZjsKKwlpbnQgcmVmOwogCS8qIHZhcmlvdXMgc3RhdGUgZmxhZ3MsIHNlZSBiZWxvdyAqLwogCXVu
c2lnbmVkIGludCBmbGFnczsKIAkvKiBwYXJlbnQgY2ZxX2RhdGEgKi8KQEAgLTIwNyw3ICsyMDcs
NyBAQCBzdHJ1Y3QgY2ZxX2dyb3VwIHsKIAlzdHJ1Y3QgYmxraW9fZ3JvdXAgYmxrZzsKICNpZmRl
ZiBDT05GSUdfQ0ZRX0dST1VQX0lPU0NIRUQKIAlzdHJ1Y3QgaGxpc3Rfbm9kZSBjZnFkX25vZGU7
Ci0JYXRvbWljX3QgcmVmOworCWludCByZWY7CiAjZW5kaWYKIAkvKiBudW1iZXIgb2YgcmVxdWVz
dHMgdGhhdCBhcmUgb24gdGhlIGRpc3BhdGNoIGxpc3Qgb3IgaW5zaWRlIGRyaXZlciAqLwogCWlu
dCBkaXNwYXRjaGVkOwpAQCAtMTAxNCw3ICsxMDE0LDcgQEAgY2ZxX2ZpbmRfYWxsb2NfY2ZxZyhz
dHJ1Y3QgY2ZxX2RhdGEgKmNmcWQsIHN0cnVjdCBjZ3JvdXAgKmNncm91cCwgaW50IGNyZWF0ZSkK
IAkgKiBlbGV2YXRvciB3aGljaCB3aWxsIGJlIGRyb3BwZWQgYnkgZWl0aGVyIGVsZXZhdG9yIGV4
aXQKIAkgKiBvciBjZ3JvdXAgZGVsZXRpb24gcGF0aCBkZXBlbmRpbmcgb24gd2hvIGlzIGV4aXRp
bmcgZmlyc3QuCiAJICovCi0JYXRvbWljX3NldCgmY2ZxZy0+cmVmLCAxKTsKKwljZnFnLT5yZWYg
PSAxOwogCiAJLyoKIAkgKiBBZGQgZ3JvdXAgb250byBjZ3JvdXAgbGlzdC4gSXQgbWlnaHQgaGFw
cGVuIHRoYXQgYmRpLT5kZXYgaXMKQEAgLTEwNTksNyArMTA1OSw3IEBAIHN0YXRpYyBzdHJ1Y3Qg
Y2ZxX2dyb3VwICpjZnFfZ2V0X2NmcWcoc3RydWN0IGNmcV9kYXRhICpjZnFkLCBpbnQgY3JlYXRl
KQogCiBzdGF0aWMgaW5saW5lIHN0cnVjdCBjZnFfZ3JvdXAgKmNmcV9yZWZfZ2V0X2NmcWcoc3Ry
dWN0IGNmcV9ncm91cCAqY2ZxZykKIHsKLQlhdG9taWNfaW5jKCZjZnFnLT5yZWYpOworCWNmcWct
PnJlZisrOwogCXJldHVybiBjZnFnOwogfQogCkBAIC0xMDcxLDcgKzEwNzEsNyBAQCBzdGF0aWMg
dm9pZCBjZnFfbGlua19jZnFxX2NmcWcoc3RydWN0IGNmcV9xdWV1ZSAqY2ZxcSwgc3RydWN0IGNm
cV9ncm91cCAqY2ZxZykKIAogCWNmcXEtPmNmcWcgPSBjZnFnOwogCS8qIGNmcXEgcmVmZXJlbmNl
IG9uIGNmcWcgKi8KLQlhdG9taWNfaW5jKCZjZnFxLT5jZnFnLT5yZWYpOworCWNmcXEtPmNmcWct
PnJlZisrOwogfQogCiBzdGF0aWMgdm9pZCBjZnFfcHV0X2NmcWcoc3RydWN0IGNmcV9ncm91cCAq
Y2ZxZykKQEAgLTEwNzksOCArMTA3OSw5IEBAIHN0YXRpYyB2b2lkIGNmcV9wdXRfY2ZxZyhzdHJ1
Y3QgY2ZxX2dyb3VwICpjZnFnKQogCXN0cnVjdCBjZnFfcmJfcm9vdCAqc3Q7CiAJaW50IGksIGo7
CiAKLQlCVUdfT04oYXRvbWljX3JlYWQoJmNmcWctPnJlZikgPD0gMCk7Ci0JaWYgKCFhdG9taWNf
ZGVjX2FuZF90ZXN0KCZjZnFnLT5yZWYpKQorCUJVR19PTihjZnFnLT5yZWYgPD0gMCk7CisJY2Zx
Zy0+cmVmLS07CisJaWYgKGNmcWctPnJlZikKIAkJcmV0dXJuOwogCWZvcl9lYWNoX2NmcWdfc3Qo
Y2ZxZywgaSwgaiwgc3QpCiAJCUJVR19PTighUkJfRU1QVFlfUk9PVCgmc3QtPnJiKSk7CkBAIC0x
MTg4LDcgKzExODksNyBAQCBzdGF0aWMgdm9pZCBjZnFfc2VydmljZV90cmVlX2FkZChzdHJ1Y3Qg
Y2ZxX2RhdGEgKmNmcWQsIHN0cnVjdCBjZnFfcXVldWUgKmNmcXEsCiAJCQljZnFfZ3JvdXBfc2Vy
dmljZV90cmVlX2RlbChjZnFkLCBjZnFxLT5jZnFnKTsKIAkJY2ZxcS0+b3JpZ19jZnFnID0gY2Zx
cS0+Y2ZxZzsKIAkJY2ZxcS0+Y2ZxZyA9ICZjZnFkLT5yb290X2dyb3VwOwotCQlhdG9taWNfaW5j
KCZjZnFkLT5yb290X2dyb3VwLnJlZik7CisJCWNmcWQtPnJvb3RfZ3JvdXAucmVmKys7CiAJCWdy
b3VwX2NoYW5nZWQgPSAxOwogCX0gZWxzZSBpZiAoIWNmcWQtPmNmcV9ncm91cF9pc29sYXRpb24K
IAkJICAgJiYgY2ZxcV90eXBlKGNmcXEpID09IFNZTkNfV09SS0xPQUQgJiYgY2ZxcS0+b3JpZ19j
ZnFnKSB7CkBAIC0yMDI1LDcgKzIwMjYsNyBAQCBzdGF0aWMgaW50IGNmcXFfcHJvY2Vzc19yZWZz
KHN0cnVjdCBjZnFfcXVldWUgKmNmcXEpCiAJaW50IHByb2Nlc3NfcmVmcywgaW9fcmVmczsKIAog
CWlvX3JlZnMgPSBjZnFxLT5hbGxvY2F0ZWRbUkVBRF0gKyBjZnFxLT5hbGxvY2F0ZWRbV1JJVEVd
OwotCXByb2Nlc3NfcmVmcyA9IGF0b21pY19yZWFkKCZjZnFxLT5yZWYpIC0gaW9fcmVmczsKKwlw
cm9jZXNzX3JlZnMgPSBjZnFxLT5yZWYgLSBpb19yZWZzOwogCUJVR19PTihwcm9jZXNzX3JlZnMg
PCAwKTsKIAlyZXR1cm4gcHJvY2Vzc19yZWZzOwogfQpAQCAtMjA2NSwxMCArMjA2NiwxMCBAQCBz
dGF0aWMgdm9pZCBjZnFfc2V0dXBfbWVyZ2Uoc3RydWN0IGNmcV9xdWV1ZSAqY2ZxcSwgc3RydWN0
IGNmcV9xdWV1ZSAqbmV3X2NmcXEpCiAJICovCiAJaWYgKG5ld19wcm9jZXNzX3JlZnMgPj0gcHJv
Y2Vzc19yZWZzKSB7CiAJCWNmcXEtPm5ld19jZnFxID0gbmV3X2NmcXE7Ci0JCWF0b21pY19hZGQo
cHJvY2Vzc19yZWZzLCAmbmV3X2NmcXEtPnJlZik7CisJCW5ld19jZnFxLT5yZWYgKz0gcHJvY2Vz
c19yZWZzOwogCX0gZWxzZSB7CiAJCW5ld19jZnFxLT5uZXdfY2ZxcSA9IGNmcXE7Ci0JCWF0b21p
Y19hZGQobmV3X3Byb2Nlc3NfcmVmcywgJmNmcXEtPnJlZik7CisJCWNmcXEtPnJlZiArPSBuZXdf
cHJvY2Vzc19yZWZzOwogCX0KIH0KIApAQCAtMjUzMiw5ICsyNTMzLDEwIEBAIHN0YXRpYyB2b2lk
IGNmcV9wdXRfcXVldWUoc3RydWN0IGNmcV9xdWV1ZSAqY2ZxcSkKIAlzdHJ1Y3QgY2ZxX2RhdGEg
KmNmcWQgPSBjZnFxLT5jZnFkOwogCXN0cnVjdCBjZnFfZ3JvdXAgKmNmcWcsICpvcmlnX2NmcWc7
CiAKLQlCVUdfT04oYXRvbWljX3JlYWQoJmNmcXEtPnJlZikgPD0gMCk7CisJQlVHX09OKGNmcXEt
PnJlZiA8PSAwKTsKIAotCWlmICghYXRvbWljX2RlY19hbmRfdGVzdCgmY2ZxcS0+cmVmKSkKKwlj
ZnFxLT5yZWYtLTsKKwlpZiAoY2ZxcS0+cmVmKQogCQlyZXR1cm47CiAKIAljZnFfbG9nX2NmcXEo
Y2ZxZCwgY2ZxcSwgInB1dF9xdWV1ZSIpOwpAQCAtMjgzNyw3ICsyODM5LDcgQEAgc3RhdGljIHZv
aWQgY2ZxX2luaXRfY2ZxcShzdHJ1Y3QgY2ZxX2RhdGEgKmNmcWQsIHN0cnVjdCBjZnFfcXVldWUg
KmNmcXEsCiAJUkJfQ0xFQVJfTk9ERSgmY2ZxcS0+cF9ub2RlKTsKIAlJTklUX0xJU1RfSEVBRCgm
Y2ZxcS0+Zmlmbyk7CiAKLQlhdG9taWNfc2V0KCZjZnFxLT5yZWYsIDApOworCWNmcXEtPnJlZiA9
IDA7CiAJY2ZxcS0+Y2ZxZCA9IGNmcWQ7CiAKIAljZnFfbWFya19jZnFxX3ByaW9fY2hhbmdlZChj
ZnFxKTsKQEAgLTI5NzMsMTEgKzI5NzUsMTEgQEAgY2ZxX2dldF9xdWV1ZShzdHJ1Y3QgY2ZxX2Rh
dGEgKmNmcWQsIGJvb2wgaXNfc3luYywgc3RydWN0IGlvX2NvbnRleHQgKmlvYywKIAkgKiBwaW4g
dGhlIHF1ZXVlIG5vdyB0aGF0IGl0J3MgYWxsb2NhdGVkLCBzY2hlZHVsZXIgZXhpdCB3aWxsIHBy
dW5lIGl0CiAJICovCiAJaWYgKCFpc19zeW5jICYmICEoKmFzeW5jX2NmcXEpKSB7Ci0JCWF0b21p
Y19pbmMoJmNmcXEtPnJlZik7CisJCWNmcXEtPnJlZisrOwogCQkqYXN5bmNfY2ZxcSA9IGNmcXE7
CiAJfQogCi0JYXRvbWljX2luYygmY2ZxcS0+cmVmKTsKKwljZnFxLT5yZWYrKzsKIAlyZXR1cm4g
Y2ZxcTsKIH0KIApAQCAtMzY3OSwxMyArMzY4MSwxMyBAQCBuZXdfcXVldWU6CiAJfQogCiAJY2Zx
cS0+YWxsb2NhdGVkW3J3XSsrOwotCWF0b21pY19pbmMoJmNmcXEtPnJlZik7Ci0KLQlzcGluX3Vu
bG9ja19pcnFyZXN0b3JlKHEtPnF1ZXVlX2xvY2ssIGZsYWdzKTsKLQorCWNmcXEtPnJlZisrOwog
CXJxLT5lbGV2YXRvcl9wcml2YXRlID0gY2ljOwogCXJxLT5lbGV2YXRvcl9wcml2YXRlMiA9IGNm
cXE7CiAJcnEtPmVsZXZhdG9yX3ByaXZhdGUzID0gY2ZxX3JlZl9nZXRfY2ZxZyhjZnFxLT5jZnFn
KTsKKworCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUocS0+cXVldWVfbG9jaywgZmxhZ3MpOworCiAJ
cmV0dXJuIDA7CiAKIHF1ZXVlX2ZhaWw6CkBAIC0zODYwLDYgKzM4NjIsMTAgQEAgc3RhdGljIHZv
aWQgKmNmcV9pbml0X3F1ZXVlKHN0cnVjdCByZXF1ZXN0X3F1ZXVlICpxKQogCWlmICghY2ZxZCkK
IAkJcmV0dXJuIE5VTEw7CiAKKwkvKgorCSAqIERvbid0IG5lZWQgdGFrZSBxdWV1ZV9sb2NrIGlu
IHRoZSByb3V0aW5lLCBzaW5jZSB3ZSBhcmUKKwkgKiBpbml0aWFsaXppbmcgdGhlIGlvc2NoZWR1
bGVyLCBhbmQgbm9ib2R5IGlzIHVzaW5nIGNmcWQKKwkgKi8KIAljZnFkLT5jaWNfaW5kZXggPSBp
OwogCiAJLyogSW5pdCByb290IHNlcnZpY2UgdHJlZSAqLwpAQCAtMzg3OSw3ICszODg1LDcgQEAg
c3RhdGljIHZvaWQgKmNmcV9pbml0X3F1ZXVlKHN0cnVjdCByZXF1ZXN0X3F1ZXVlICpxKQogCSAq
IFRha2UgYSByZWZlcmVuY2UgdG8gcm9vdCBncm91cCB3aGljaCB3ZSBuZXZlciBkcm9wLiBUaGlz
IGlzIGp1c3QKIAkgKiB0byBtYWtlIHN1cmUgdGhhdCBjZnFfcHV0X2NmcWcoKSBkb2VzIG5vdCB0
cnkgdG8ga2ZyZWUgcm9vdCBncm91cAogCSAqLwotCWF0b21pY19zZXQoJmNmcWctPnJlZiwgMSk7
CisJY2ZxZy0+cmVmID0gMTsKIAlyY3VfcmVhZF9sb2NrKCk7CiAJY2ZxX2Jsa2lvY2dfYWRkX2Js
a2lvX2dyb3VwKCZibGtpb19yb290X2Nncm91cCwgJmNmcWctPmJsa2csCiAJCQkJCSh2b2lkICop
Y2ZxZCwgMCk7CkBAIC0zODk5LDcgKzM5MDUsNyBAQCBzdGF0aWMgdm9pZCAqY2ZxX2luaXRfcXVl
dWUoc3RydWN0IHJlcXVlc3RfcXVldWUgKnEpCiAJICogd2lsbCBub3QgYXR0ZW1wdCB0byBmcmVl
IGl0LgogCSAqLwogCWNmcV9pbml0X2NmcXEoY2ZxZCwgJmNmcWQtPm9vbV9jZnFxLCAxLCAwKTsK
LQlhdG9taWNfaW5jKCZjZnFkLT5vb21fY2ZxcS5yZWYpOworCWNmcWQtPm9vbV9jZnFxLnJlZisr
OwogCWNmcV9saW5rX2NmcXFfY2ZxZygmY2ZxZC0+b29tX2NmcXEsICZjZnFkLT5yb290X2dyb3Vw
KTsKIAogCUlOSVRfTElTVF9IRUFEKCZjZnFkLT5jaWNfbGlzdCk7CmRpZmYgLS1naXQgYS9ibG9j
ay9nZW5oZC5jIGIvYmxvY2svZ2VuaGQuYwppbmRleCAwMDkzZGRmYS4uNmE1Yjc3MiAxMDA2NDQK
LS0tIGEvYmxvY2svZ2VuaGQuYworKysgYi9ibG9jay9nZW5oZC5jCkBAIC0xMjYzLDcgKzEyNjMs
OCBAQCBzdHJ1Y3QgZ2VuZGlzayAqYWxsb2NfZGlza19ub2RlKGludCBtaW5vcnMsIGludCBub2Rl
X2lkKQogCQkJcmV0dXJuIE5VTEw7CiAJCX0KIAkJZGlzay0+cGFydF90YmwtPnBhcnRbMF0gPSAm
ZGlzay0+cGFydDA7Ci0JCWtyZWZfaW5pdCgmZGlzay0+cGFydDAucmVmKTsKKworCQloZF9yZWZf
aW5pdCgmZGlzay0+cGFydDApOwogCiAJCWRpc2stPm1pbm9ycyA9IG1pbm9yczsKIAkJcmFuZF9p
bml0aWFsaXplX2Rpc2soZGlzayk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL21kL2RtLmMgYi9kcml2
ZXJzL21kL2RtLmMKaW5kZXggMGEzZWUwOC4uMGRlNjkyMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9t
ZC9kbS5jCisrKyBiL2RyaXZlcnMvbWQvZG0uYwpAQCAtNjI5LDcgKzYyOSw3IEBAIHN0YXRpYyB2
b2lkIGRlY19wZW5kaW5nKHN0cnVjdCBkbV9pbyAqaW8sIGludCBlcnJvcikKIAkJCXF1ZXVlX2lv
KG1kLCBiaW8pOwogCQl9IGVsc2UgewogCQkJLyogZG9uZSB3aXRoIG5vcm1hbCBJTyBvciBlbXB0
eSBmbHVzaCAqLwotCQkJdHJhY2VfYmxvY2tfYmlvX2NvbXBsZXRlKG1kLT5xdWV1ZSwgYmlvKTsK
KwkJCXRyYWNlX2Jsb2NrX2Jpb19jb21wbGV0ZShtZC0+cXVldWUsIGJpbywgaW9fZXJyb3IpOwog
CQkJYmlvX2VuZGlvKGJpbywgaW9fZXJyb3IpOwogCQl9CiAJfQpkaWZmIC0tZ2l0IGEvZnMvcGFy
dGl0aW9ucy9jaGVjay5jIGIvZnMvcGFydGl0aW9ucy9jaGVjay5jCmluZGV4IGMwMGIxMmQuLjlj
MjExMTkgMTAwNjQ0Ci0tLSBhL2ZzL3BhcnRpdGlvbnMvY2hlY2suYworKysgYi9mcy9wYXJ0aXRp
b25zL2NoZWNrLmMKQEAgLTM4MSwxMCArMzgxLDggQEAgc3RhdGljIHZvaWQgZGVsZXRlX3BhcnRp
dGlvbl9yY3VfY2Ioc3RydWN0IHJjdV9oZWFkICpoZWFkKQogCXB1dF9kZXZpY2UocGFydF90b19k
ZXYocGFydCkpOwogfQogCi12b2lkIF9fZGVsZXRlX3BhcnRpdGlvbihzdHJ1Y3Qga3JlZiAqcmVm
KQordm9pZCBfX2RlbGV0ZV9wYXJ0aXRpb24oc3RydWN0IGhkX3N0cnVjdCAqcGFydCkKIHsKLQlz
dHJ1Y3QgaGRfc3RydWN0ICpwYXJ0ID0gY29udGFpbmVyX29mKHJlZiwgc3RydWN0IGhkX3N0cnVj
dCwgcmVmKTsKLQogCWNhbGxfcmN1KCZwYXJ0LT5yY3VfaGVhZCwgZGVsZXRlX3BhcnRpdGlvbl9y
Y3VfY2IpOwogfQogCkBAIC00MDYsNyArNDA0LDcgQEAgdm9pZCBkZWxldGVfcGFydGl0aW9uKHN0
cnVjdCBnZW5kaXNrICpkaXNrLCBpbnQgcGFydG5vKQogCWtvYmplY3RfcHV0KHBhcnQtPmhvbGRl
cl9kaXIpOwogCWRldmljZV9kZWwocGFydF90b19kZXYocGFydCkpOwogCi0Ja3JlZl9wdXQoJnBh
cnQtPnJlZiwgX19kZWxldGVfcGFydGl0aW9uKTsKKwloZF9zdHJ1Y3RfcHV0KHBhcnQpOwogfQog
CiBzdGF0aWMgc3NpemVfdCB3aG9sZV9kaXNrX3Nob3coc3RydWN0IGRldmljZSAqZGV2LApAQCAt
NTA1LDcgKzUwMyw3IEBAIHN0cnVjdCBoZF9zdHJ1Y3QgKmFkZF9wYXJ0aXRpb24oc3RydWN0IGdl
bmRpc2sgKmRpc2ssIGludCBwYXJ0bm8sCiAJaWYgKCFkZXZfZ2V0X3VldmVudF9zdXBwcmVzcyhk
ZGV2KSkKIAkJa29iamVjdF91ZXZlbnQoJnBkZXYtPmtvYmosIEtPQkpfQUREKTsKIAotCWtyZWZf
aW5pdCgmcC0+cmVmKTsKKwloZF9yZWZfaW5pdChwKTsKIAlyZXR1cm4gcDsKIAogb3V0X2ZyZWVf
aW5mbzoKZGlmZiAtLWdpdCBhL2luY2x1ZGUvbGludXgvZ2VuaGQuaCBiL2luY2x1ZGUvbGludXgv
Z2VuaGQuaAppbmRleCA4NGI0OWEyLi5jMGQ1ZjY5IDEwMDY0NAotLS0gYS9pbmNsdWRlL2xpbnV4
L2dlbmhkLmgKKysrIGIvaW5jbHVkZS9saW51eC9nZW5oZC5oCkBAIC0xMTUsOCArMTE1LDggQEAg
c3RydWN0IGhkX3N0cnVjdCB7CiAjZWxzZQogCXN0cnVjdCBkaXNrX3N0YXRzIGRrc3RhdHM7CiAj
ZW5kaWYKKwlhdG9taWNfdCByZWY7CiAJc3RydWN0IHJjdV9oZWFkIHJjdV9oZWFkOwotCXN0cnVj
dCBrcmVmIHJlZjsKIH07CiAKICNkZWZpbmUgR0VOSERfRkxfUkVNT1ZBQkxFCQkJMQpAQCAtNTk4
LDcgKzU5OCw3IEBAIGV4dGVybiBzdHJ1Y3QgaGRfc3RydWN0ICogX19tdXN0X2NoZWNrIGFkZF9w
YXJ0aXRpb24oc3RydWN0IGdlbmRpc2sgKmRpc2ssCiAJCQkJCQkgICAgIHNlY3Rvcl90IGxlbiwg
aW50IGZsYWdzLAogCQkJCQkJICAgICBzdHJ1Y3QgcGFydGl0aW9uX21ldGFfaW5mbwogCQkJCQkJ
ICAgICAgICppbmZvKTsKLWV4dGVybiB2b2lkIF9fZGVsZXRlX3BhcnRpdGlvbihzdHJ1Y3Qga3Jl
ZiAqcmVmKTsKK2V4dGVybiB2b2lkIF9fZGVsZXRlX3BhcnRpdGlvbihzdHJ1Y3QgaGRfc3RydWN0
ICopOwogZXh0ZXJuIHZvaWQgZGVsZXRlX3BhcnRpdGlvbihzdHJ1Y3QgZ2VuZGlzayAqLCBpbnQp
OwogZXh0ZXJuIHZvaWQgcHJpbnRrX2FsbF9wYXJ0aXRpb25zKHZvaWQpOwogCkBAIC02MjcsNiAr
NjI3LDI5IEBAIGV4dGVybiBzc2l6ZV90IHBhcnRfZmFpbF9zdG9yZShzdHJ1Y3QgZGV2aWNlICpk
ZXYsCiAJCQkgICAgICAgY29uc3QgY2hhciAqYnVmLCBzaXplX3QgY291bnQpOwogI2VuZGlmIC8q
IENPTkZJR19GQUlMX01BS0VfUkVRVUVTVCAqLwogCitzdGF0aWMgaW5saW5lIHZvaWQgaGRfcmVm
X2luaXQoc3RydWN0IGhkX3N0cnVjdCAqcGFydCkKK3sKKwlhdG9taWNfc2V0KCZwYXJ0LT5yZWYs
IDEpOworCXNtcF9tYigpOworfQorCitzdGF0aWMgaW5saW5lIHZvaWQgaGRfc3RydWN0X2dldChz
dHJ1Y3QgaGRfc3RydWN0ICpwYXJ0KQoreworCWF0b21pY19pbmMoJnBhcnQtPnJlZik7CisJc21w
X21iX19hZnRlcl9hdG9taWNfaW5jKCk7Cit9CisKK3N0YXRpYyBpbmxpbmUgaW50IGhkX3N0cnVj
dF90cnlfZ2V0KHN0cnVjdCBoZF9zdHJ1Y3QgKnBhcnQpCit7CisJcmV0dXJuIGF0b21pY19pbmNf
bm90X3plcm8oJnBhcnQtPnJlZik7Cit9CisKK3N0YXRpYyBpbmxpbmUgdm9pZCBoZF9zdHJ1Y3Rf
cHV0KHN0cnVjdCBoZF9zdHJ1Y3QgKnBhcnQpCit7CisJaWYgKGF0b21pY19kZWNfYW5kX3Rlc3Qo
JnBhcnQtPnJlZikpCisJCV9fZGVsZXRlX3BhcnRpdGlvbihwYXJ0KTsKK30KKwogI2Vsc2UgLyog
Q09ORklHX0JMT0NLICovCiAKIHN0YXRpYyBpbmxpbmUgdm9pZCBwcmludGtfYWxsX3BhcnRpdGlv
bnModm9pZCkgeyB9CmRpZmYgLS1naXQgYS9pbmNsdWRlL2xpbnV4L2tyZWYuaCBiL2luY2x1ZGUv
bGludXgva3JlZi5oCmluZGV4IDA0ZjE5NGEuLmQ0YTYyYWIgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUv
bGludXgva3JlZi5oCisrKyBiL2luY2x1ZGUvbGludXgva3JlZi5oCkBAIC0yMyw3ICsyMyw2IEBA
IHN0cnVjdCBrcmVmIHsKIAogdm9pZCBrcmVmX2luaXQoc3RydWN0IGtyZWYgKmtyZWYpOwogdm9p
ZCBrcmVmX2dldChzdHJ1Y3Qga3JlZiAqa3JlZik7Ci1pbnQga3JlZl90ZXN0X2FuZF9nZXQoc3Ry
dWN0IGtyZWYgKmtyZWYpOwogaW50IGtyZWZfcHV0KHN0cnVjdCBrcmVmICprcmVmLCB2b2lkICgq
cmVsZWFzZSkgKHN0cnVjdCBrcmVmICprcmVmKSk7CiBpbnQga3JlZl9zdWIoc3RydWN0IGtyZWYg
KmtyZWYsIHVuc2lnbmVkIGludCBjb3VudCwKIAkgICAgIHZvaWQgKCpyZWxlYXNlKSAoc3RydWN0
IGtyZWYgKmtyZWYpKTsKZGlmZiAtLWdpdCBhL2luY2x1ZGUvdHJhY2UvZXZlbnRzL2Jsb2NrLmgg
Yi9pbmNsdWRlL3RyYWNlL2V2ZW50cy9ibG9jay5oCmluZGV4IGI1NmM2NWQuLmFiYTQyMWQgMTAw
NjQ0Ci0tLSBhL2luY2x1ZGUvdHJhY2UvZXZlbnRzL2Jsb2NrLmgKKysrIGIvaW5jbHVkZS90cmFj
ZS9ldmVudHMvYmxvY2suaApAQCAtMjA2LDE1ICsyMDYsMTYgQEAgVFJBQ0VfRVZFTlQoYmxvY2tf
YmlvX2JvdW5jZSwKICAqIGJsb2NrX2Jpb19jb21wbGV0ZSAtIGNvbXBsZXRlZCBhbGwgd29yayBv
biB0aGUgYmxvY2sgb3BlcmF0aW9uCiAgKiBAcTogcXVldWUgaG9sZGluZyB0aGUgYmxvY2sgb3Bl
cmF0aW9uCiAgKiBAYmlvOiBibG9jayBvcGVyYXRpb24gY29tcGxldGVkCisgKiBAZXJyb3I6IGlv
IGVycm9yIHZhbHVlCiAgKgogICogVGhpcyB0cmFjZXBvaW50IGluZGljYXRlcyB0aGVyZSBpcyBu
byBmdXJ0aGVyIHdvcmsgdG8gZG8gb24gdGhpcwogICogYmxvY2sgSU8gb3BlcmF0aW9uIEBiaW8u
CiAgKi8KIFRSQUNFX0VWRU5UKGJsb2NrX2Jpb19jb21wbGV0ZSwKIAotCVRQX1BST1RPKHN0cnVj
dCByZXF1ZXN0X3F1ZXVlICpxLCBzdHJ1Y3QgYmlvICpiaW8pLAorCVRQX1BST1RPKHN0cnVjdCBy
ZXF1ZXN0X3F1ZXVlICpxLCBzdHJ1Y3QgYmlvICpiaW8sIGludCBlcnJvciksCiAKLQlUUF9BUkdT
KHEsIGJpbyksCisJVFBfQVJHUyhxLCBiaW8sIGVycm9yKSwKIAogCVRQX1NUUlVDVF9fZW50cnko
CiAJCV9fZmllbGQoIGRldl90LAkJZGV2CQkpCkBAIC0yMjgsNiArMjI5LDcgQEAgVFJBQ0VfRVZF
TlQoYmxvY2tfYmlvX2NvbXBsZXRlLAogCQlfX2VudHJ5LT5kZXYJCT0gYmlvLT5iaV9iZGV2LT5i
ZF9kZXY7CiAJCV9fZW50cnktPnNlY3RvcgkJPSBiaW8tPmJpX3NlY3RvcjsKIAkJX19lbnRyeS0+
bnJfc2VjdG9yCT0gYmlvLT5iaV9zaXplID4+IDk7CisJCV9fZW50cnktPmVycm9yCQk9IGVycm9y
OwogCQlibGtfZmlsbF9yd2JzKF9fZW50cnktPnJ3YnMsIGJpby0+YmlfcncsIGJpby0+Ymlfc2l6
ZSk7CiAJKSwKIApkaWZmIC0tZ2l0IGEvbGliL2tyZWYuYyBiL2xpYi9rcmVmLmMKaW5kZXggNTJk
MDgzMS4uM2VmYjg4MiAxMDA2NDQKLS0tIGEvbGliL2tyZWYuYworKysgYi9saWIva3JlZi5jCkBA
IC0zNywxOCArMzcsNiBAQCB2b2lkIGtyZWZfZ2V0KHN0cnVjdCBrcmVmICprcmVmKQogfQogCiAv
KioKLSAqIGtyZWZfdGVzdF9hbmRfZ2V0IC0gaW5jcmVtZW50IHJlZmNvdW50IGZvciBvYmplY3Qg
b25seSBpZiByZWZjb3VudCBpcyBub3QKLSAqIHplcm8uCi0gKiBAa3JlZjogb2JqZWN0LgotICoK
LSAqIFJldHVybiBub24temVybyBpZiB0aGUgcmVmY291bnQgd2FzIGluY3JlbWVudGVkLCAwIG90
aGVyd2lzZQotICovCi1pbnQga3JlZl90ZXN0X2FuZF9nZXQoc3RydWN0IGtyZWYgKmtyZWYpCi17
Ci0JcmV0dXJuIGF0b21pY19pbmNfbm90X3plcm8oJmtyZWYtPnJlZmNvdW50KTsKLX0KLQotLyoq
CiAgKiBrcmVmX3B1dCAtIGRlY3JlbWVudCByZWZjb3VudCBmb3Igb2JqZWN0LgogICogQGtyZWY6
IG9iamVjdC4KICAqIEByZWxlYXNlOiBwb2ludGVyIHRvIHRoZSBmdW5jdGlvbiB0aGF0IHdpbGwg
Y2xlYW4gdXAgdGhlIG9iamVjdCB3aGVuIHRoZQo=
--0016367f9678b5b5660499457452--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Sedat Dilek <sedat.dilek@googlemail.com>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Fri, 7 Jan 2011 19:20:16 +0100
Message-ID: <AANLkTimpfhc+CpxBW1xtHxuU7jN3ix_fh36jjXTxDnxM@mail.gmail.com>
References: <20110107110513.30776114.sfr@canb.auug.org.au>
	<4D26C179.7030704@kernel.dk>
	<AANLkTinyaZfsYv43046LWgu8U3kg6_79y+PTFO1RxtnY@mail.gmail.com>
	<20110107231748.76170ff3.sfr@canb.auug.org.au>
	<AANLkTimpVMLGBnP33Ro8MBtW3GJjskg0bBK717Xf-Mh_@mail.gmail.com>
	<20110108012211.1e19f0f7.sfr@canb.auug.org.au>
	<4D272C54.5010406@kernel.dk>
	<AANLkTim_Su1XTvvpFvPqv1xpkkUA3PEVDEVpXaODjYpt@mail.gmail.com>
Reply-To: sedat.dilek@gmail.com
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: QUOTED-PRINTABLE
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mail-qy0-f181.google.com ([209.85.216.181]:36482 "EHLO
	mail-qy0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1755114Ab1AGSUR convert rfc822-to-8bit (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Fri, 7 Jan 2011 13:20:17 -0500
In-Reply-To: <AANLkTim_Su1XTvvpFvPqv1xpkkUA3PEVDEVpXaODjYpt@mail.gmail.com>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>, Mathieu Desnoyers <mathieu.desnoyers@efficios.com>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org

On Fri, Jan 7, 2011 at 7:04 PM, Sedat Dilek <sedat.dilek@googlemail.com=
> wrote:
> On Fri, Jan 7, 2011 at 4:08 PM, Jens Axboe <axboe@kernel.dk> wrote:
>> On 2011-01-07 15:22, Stephen Rothwell wrote:
>>> Hi,
>>>
>>> On Fri, 7 Jan 2011 14:19:33 +0100 Sedat Dilek <sedat.dilek@googlema=
il.com> wrote:
>>>>
>>>> Hmm, I have pulled-in freshly from linux-2.6-block#for-next after =
you
>>>> published latest linux-next (next-20110107).
>>>> So, I guessed the (reported) issue is fixed, now.
>>>
>>> No, the commit that caused the warnings was removed when I went bac=
k to
>>> using the block tree from next-20110106. =C2=A0So it will come back=
 unless
>>> fixed.
>>
>> It is fixed in linux-2.6-block#for-next as-of earlier today, so if S=
edat
>> pulled from there it should be gone.
>>
>> --
>> Jens Axboe
>>
>>
>
> I guess 0002 should fix it, its not the case (patch + "big diff" atta=
ched).
>
> - Sedat -
>
[...]

Missing "blktrace: add missing probe argument to block_bio_complete" pa=
tch.

- Sedat -

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Mon, 7 Mar 2011 13:39:57 +1100
Message-ID: <20110307133957.3b9d814c.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from chilli.pcug.org.au ([203.10.76.44]:48215 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753848Ab1CGCkA (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Sun, 6 Mar 2011 21:40:00 -0500
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Tejun Heo <tj@kernel.org>

Hi Jens,

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

block/blk-flush.c: In function 'flush_end_io':
block/blk-flush.c:217: error: too few arguments to function '__blk_run_queue'
block/blk-flush.c: In function 'flush_data_end_io':
block/blk-flush.c:271: error: too few arguments to function '__blk_run_queue'

Caused by commit ae1b1539622fb46e51b4d13b3f9e5f4c713f86ae ("block:
reimplement FLUSH/FUA to support merge") interacting with commit
1654e7411a1ad4999fe7890ef51d2a2bbb1fcf76 ("block: add @force_kblockd to
__blk_run_queue()") from Linus' tree.  My merge fix up was obviously not
sufficient.

I added this merge fix patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 7 Mar 2011 13:27:04 +1100
Subject: [PATCH] block: update for __blk_run_queue() API update

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 block/blk-flush.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/block/blk-flush.c b/block/blk-flush.c
index a867e3f..f9b0228 100644
--- a/block/blk-flush.c
+++ b/block/blk-flush.c
@@ -214,7 +214,7 @@ static void flush_end_io(struct request *flush_rq, int error)
 
 	/* after populating an empty queue, kick it to avoid stall */
 	if (queued && was_empty)
-		__blk_run_queue(q);
+		__blk_run_queue(q, false);
 }
 
 /**
@@ -268,7 +268,7 @@ static void flush_data_end_io(struct request *rq, int error)
 
 	/* after populating an empty queue, kick it to avoid stall */
 	if (blk_flush_complete_seq(rq, REQ_FSEQ_DATA, error) && was_empty)
-		__blk_run_queue(q);
+		__blk_run_queue(q, false);
 }
 
 /**
-- 
1.7.4.1

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Thu, 10 Mar 2011 14:08:43 +1100
Message-ID: <20110310140843.15fe4e6e.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA1";
 boundary="Signature=_Thu__10_Mar_2011_14_08_43_+1100_A3GiH+kX94SV73J2"
Return-path: <linux-next-owner@vger.kernel.org>
Received: from chilli.pcug.org.au ([203.10.76.44]:55501 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751750Ab1CJDIw (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Wed, 9 Mar 2011 22:08:52 -0500
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org

--Signature=_Thu__10_Mar_2011_14_08_43_+1100_A3GiH+kX94SV73J2
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Jens,

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

drivers/target/target_core_iblock.c: In function 'iblock_do_task':
drivers/target/target_core_iblock.c:425: error: 'struct request_queue' has =
no member named 'unplug_fn'
drivers/target/target_core_iblock.c:426: error: 'struct request_queue' has =
no member named 'unplug_fn'

Caused by commit 622f85400f0b ("block: remove per-queue plugging").  Grep
is your friend :-)

I have used the block tree from next-20110309 for today.
--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

--Signature=_Thu__10_Mar_2011_14_08_43_+1100_A3GiH+kX94SV73J2
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQEcBAEBAgAGBQJNeEC7AAoJEDMEi1NhKgbsWosIAIUCIFeJiwNf4BA4eyc9/CQQ
D80zTWpHzYfNM2WuNHpjxJZH6key7GDmOBpvEv2bmrkuqP0BdE4wNduprZp7cSI+
IljcVckaWgH3zVfD625XuTucYJS7uu/FgFVld9tZ0GaXq+XcfsuMLjnoDY+UUa6b
kendHz4wPPCKO38Uud9vPG43U8IGEYZr38l2SKYg/ZeJ68HsU/1tSZpyEN9s5UTK
XRSzu2pxfIECSGK63YFKrjKh1Ar3kM3N/0TRubT9uPjpHuwpX6Y/CV7PnEgAv/nP
RyI2wvQkmbitqHauKFzoaM0FzUFOUF9IEPfg3dhE9TChHTCw7SQfUj3ue2pzseY=
=B2F/
-----END PGP SIGNATURE-----

--Signature=_Thu__10_Mar_2011_14_08_43_+1100_A3GiH+kX94SV73J2--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 10 Mar 2011 08:15:43 +0100
Message-ID: <4D787A9F.80207@kernel.dk>
References: <20110310140843.15fe4e6e.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from 0122700014.0.fullrate.dk ([95.166.99.235]:56784 "EHLO kernel.dk"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1750893Ab1CJHPp (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Thu, 10 Mar 2011 02:15:45 -0500
In-Reply-To: <20110310140843.15fe4e6e.sfr@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org

On 2011-03-10 04:08, Stephen Rothwell wrote:
> Hi Jens,
> 
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/target/target_core_iblock.c: In function 'iblock_do_task':
> drivers/target/target_core_iblock.c:425: error: 'struct request_queue' has no member named 'unplug_fn'
> drivers/target/target_core_iblock.c:426: error: 'struct request_queue' has no member named 'unplug_fn'

Ah darn, recent merge. I'll fix this up.

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Mon, 14 Mar 2011 16:19:19 +1100
Message-ID: <20110314161919.15e6d983.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA1";
 boundary="Signature=_Mon__14_Mar_2011_16_19_19_+1100_pi37OvzeRJPvB/Ve"
Return-path: <linux-next-owner@vger.kernel.org>
Received: from chilli.pcug.org.au ([203.10.76.44]:39135 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752314Ab1CNFTa (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Mon, 14 Mar 2011 01:19:30 -0400
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jarkko Lavinen <jarkko.lavinen@nokia.com>, David Woodhouse <David.Woodhouse@intel.com>

--Signature=_Mon__14_Mar_2011_16_19_19_+1100_pi37OvzeRJPvB/Ve
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Jens,

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

drivers/mtd/mtd_blkdevs.c: In function 'mtd_blktrans_cease_background':
drivers/mtd/mtd_blkdevs.c:127: error: implicit declaration of function 'elv=
_queue_empty'

Caused by commit 7eaceaccab5f ("block: remove per-queue plugging")
interacting with commit c7519dbf6f4b ("mtd_blkdevs: Add background
processing support") from the mtd tree.

I have no idea how to fix this up, so I have reverted the above commit
from them mtd tree (along with commits a32159024620 "mtd: Add mtdswap
block driver" and 89d8d32060de "mtd: fix printf format warnings, mostly
lack of %zd for size_t, in mtdswap" that depend on it).

Jens, maybe you could advise the mtd guys.
--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

--Signature=_Mon__14_Mar_2011_16_19_19_+1100_pi37OvzeRJPvB/Ve
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQEcBAEBAgAGBQJNfaVXAAoJEDMEi1NhKgbscBcH/i7m9rmFclEsha93WvWIh+Ym
JSOpsavdTE76gYEqN6ENe5AOSB2xeAtOShXAW3qUsCx/udes0wnUu8C8mGnXGANq
G102oDCr66chKKVsVDd5wl1eioi+/Q2YbfhNQlFRqwgro3nDAwesaC2PxgHkcOP7
0hk5FKW4iNe/mR/84rcaeL9xkut4yckhslhE+BVEv2J9u+AyuvigwjB1rcW2sUWP
je0jr3fxCJakr6f56XaXkiytf2WEdLZrmiS2ZZEpKhBulkWM67vRzipD3ehlUusn
KX2APnOwgyRvyIocuh2hQ+s9CsJFqQg7b0xReYWTXatwLG5T5j+R0pUCF/B/OBI=
=ksrx
-----END PGP SIGNATURE-----

--Signature=_Mon__14_Mar_2011_16_19_19_+1100_pi37OvzeRJPvB/Ve--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 17 Mar 2011 10:32:18 +1100
Message-ID: <20110317103218.ca7f63bf.sfr@canb.auug.org.au>
References: <20110314161919.15e6d983.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA1";
 boundary="Signature=_Thu__17_Mar_2011_10_32_18_+1100_Os3_oUDzLFVHfYBp"
Return-path: <linux-next-owner@vger.kernel.org>
Received: from chilli.pcug.org.au ([203.10.76.44]:41592 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752077Ab1CPXcZ (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Wed, 16 Mar 2011 19:32:25 -0400
In-Reply-To: <20110314161919.15e6d983.sfr@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jarkko Lavinen <jarkko.lavinen@nokia.com>, David Woodhouse <David.Woodhouse@intel.com>

--Signature=_Thu__17_Mar_2011_10_32_18_+1100_Os3_oUDzLFVHfYBp
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi all,

On Mon, 14 Mar 2011 16:19:19 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>=20
> drivers/mtd/mtd_blkdevs.c: In function 'mtd_blktrans_cease_background':
> drivers/mtd/mtd_blkdevs.c:127: error: implicit declaration of function 'e=
lv_queue_empty'
>=20
> Caused by commit 7eaceaccab5f ("block: remove per-queue plugging")
> interacting with commit c7519dbf6f4b ("mtd_blkdevs: Add background
> processing support") from the mtd tree.
>=20
> I have no idea how to fix this up, so I have reverted the above commit
> from them mtd tree (along with commits a32159024620 "mtd: Add mtdswap
> block driver" and 89d8d32060de "mtd: fix printf format warnings, mostly
> lack of %zd for size_t, in mtdswap" that depend on it).
>=20
> Jens, maybe you could advise the mtd guys.

Ping?
--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

--Signature=_Thu__17_Mar_2011_10_32_18_+1100_Os3_oUDzLFVHfYBp
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQEcBAEBAgAGBQJNgUiCAAoJEDMEi1NhKgbsp4gH/2kLO/EC5qnGOqhc5tz6/BDA
4+kThupzkuiy9POijIW+3/UGBaHMqU0hlTQ6y/gILLp0EjYVTnV35hRygAX3wyhu
+Yi/cKhfh38nOC6E4BxdQ8U1Vhm2ta+OeRmwtNiPqW4xiiryrQnomrqOgVY+1aXV
8sw8lHuciIYgFVT22M+khS6msoZlXQILEKiEB28T6c2FiQX6fr53HqbQyzyLorui
WdgBDWimUPfRIHuYYoq07So4Q5fk7HrL6j7P1X+TuGpcwPtbevXNexJXOVFnrFmT
fiZN0L3wOU57Pom9YbCFiM9OObSo//umye3eAmwNacdztQO9rFF/FgF6uxCaDac=
=jcLF
-----END PGP SIGNATURE-----

--Signature=_Thu__17_Mar_2011_10_32_18_+1100_Os3_oUDzLFVHfYBp--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 17 Mar 2011 11:18:56 +0100
Message-ID: <4D81E010.1090808@kernel.dk>
References: <20110314161919.15e6d983.sfr@canb.auug.org.au> <20110317103218.ca7f63bf.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from 0122700014.0.fullrate.dk ([95.166.99.235]:45915 "EHLO kernel.dk"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751689Ab1CQKS6 (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Thu, 17 Mar 2011 06:18:58 -0400
In-Reply-To: <20110317103218.ca7f63bf.sfr@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jarkko Lavinen <jarkko.lavinen@nokia.com>, David Woodhouse <David.Woodhouse@intel.com>

On 2011-03-17 00:32, Stephen Rothwell wrote:
> Hi all,
> 
> On Mon, 14 Mar 2011 16:19:19 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> After merging the block tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/mtd/mtd_blkdevs.c: In function 'mtd_blktrans_cease_background':
>> drivers/mtd/mtd_blkdevs.c:127: error: implicit declaration of function 'elv_queue_empty'
>>
>> Caused by commit 7eaceaccab5f ("block: remove per-queue plugging")
>> interacting with commit c7519dbf6f4b ("mtd_blkdevs: Add background
>> processing support") from the mtd tree.
>>
>> I have no idea how to fix this up, so I have reverted the above commit
>> from them mtd tree (along with commits a32159024620 "mtd: Add mtdswap
>> block driver" and 89d8d32060de "mtd: fix printf format warnings, mostly
>> lack of %zd for size_t, in mtdswap" that depend on it).
>>
>> Jens, maybe you could advise the mtd guys.
> 
> Ping?

Can you point me at the commit in question? Generally, elv_queue_empty()
can be replaced by blk_peek_request().

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Woodhouse <david.woodhouse@intel.com>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 17 Mar 2011 10:36:10 +0000
Message-ID: <1300358170.2589.50.camel@macbook.infradead.org>
References: <20110314161919.15e6d983.sfr@canb.auug.org.au>
	 <20110317103218.ca7f63bf.sfr@canb.auug.org.au> <4D81E010.1090808@kernel.dk>
Mime-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mga11.intel.com ([192.55.52.93]:4406 "EHLO mga11.intel.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752614Ab1CQKgO (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Thu, 17 Mar 2011 06:36:14 -0400
In-Reply-To: <4D81E010.1090808@kernel.dk>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>, "linux-next@vger.kernel.org" <linux-next@vger.kernel.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, Jarkko Lavinen <jarkko.lavinen@nokia.com>

On Thu, 2011-03-17 at 10:18 +0000, Jens Axboe wrote:
> 
> Can you point me at the commit in question? Generally,
> elv_queue_empty()
> can be replaced by blk_peek_request(). 

The interesting commit is this one:
http://git.infradead.org/mtd-2.6.git/commitdiff/c7519dbf6

The point of it is to enable this
http://git.infradead.org/mtd-2.6.git/commitdiff/a32159024

-- 
David Woodhouse                            Open Source Technology Centre
David.Woodhouse@intel.com                              Intel Corporation

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 17 Mar 2011 11:45:35 +0100
Message-ID: <4D81E64F.2020909@kernel.dk>
References: <20110314161919.15e6d983.sfr@canb.auug.org.au>	 <20110317103218.ca7f63bf.sfr@canb.auug.org.au> <4D81E010.1090808@kernel.dk> <1300358170.2589.50.camel@macbook.infradead.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from 0122700014.0.fullrate.dk ([95.166.99.235]:36391 "EHLO kernel.dk"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752881Ab1CQKph (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Thu, 17 Mar 2011 06:45:37 -0400
In-Reply-To: <1300358170.2589.50.camel@macbook.infradead.org>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: David Woodhouse <david.woodhouse@intel.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>, "linux-next@vger.kernel.org" <linux-next@vger.kernel.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, Jarkko Lavinen <jarkko.lavinen@nokia.com>

On 2011-03-17 11:36, David Woodhouse wrote:
> On Thu, 2011-03-17 at 10:18 +0000, Jens Axboe wrote:
>>
>> Can you point me at the commit in question? Generally,
>> elv_queue_empty()
>> can be replaced by blk_peek_request(). 
> 
> The interesting commit is this one:
> http://git.infradead.org/mtd-2.6.git/commitdiff/c7519dbf6
> 
> The point of it is to enable this
> http://git.infradead.org/mtd-2.6.git/commitdiff/a32159024

OK, can you commit a change just changing that to blk_peek_request()?
That'll avoid the conflict.

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Tue, 22 Mar 2011 10:33:00 +1100
Message-ID: <20110322103300.c934a540.sfr@canb.auug.org.au>
References: <20110314161919.15e6d983.sfr@canb.auug.org.au>
	<20110317103218.ca7f63bf.sfr@canb.auug.org.au>
	<4D81E010.1090808@kernel.dk>
	<1300358170.2589.50.camel@macbook.infradead.org>
	<4D81E64F.2020909@kernel.dk>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA1";
 boundary="Signature=_Tue__22_Mar_2011_10_33_00_+1100_zB1BGkGCxpF5TIBL"
Return-path: <linux-next-owner@vger.kernel.org>
Received: from chilli.pcug.org.au ([203.10.76.44]:49623 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1755636Ab1CUXdJ (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Mon, 21 Mar 2011 19:33:09 -0400
In-Reply-To: <4D81E64F.2020909@kernel.dk>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: David Woodhouse <david.woodhouse@intel.com>
Cc: Jens Axboe <axboe@kernel.dk>, "linux-next@vger.kernel.org" <linux-next@vger.kernel.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, Jarkko Lavinen <jarkko.lavinen@nokia.com>

--Signature=_Tue__22_Mar_2011_10_33_00_+1100_zB1BGkGCxpF5TIBL
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Guys,

On Thu, 17 Mar 2011 11:45:35 +0100 Jens Axboe <axboe@kernel.dk> wrote:
>
> On 2011-03-17 11:36, David Woodhouse wrote:
> > On Thu, 2011-03-17 at 10:18 +0000, Jens Axboe wrote:
> >>
> >> Can you point me at the commit in question? Generally,
> >> elv_queue_empty()
> >> can be replaced by blk_peek_request().=20
> >=20
> > The interesting commit is this one:
> > http://git.infradead.org/mtd-2.6.git/commitdiff/c7519dbf6
> >=20
> > The point of it is to enable this
> > http://git.infradead.org/mtd-2.6.git/commitdiff/a32159024
>=20
> OK, can you commit a change just changing that to blk_peek_request()?
> That'll avoid the conflict.

I am still reverting those three commits from the mtd tree ...  David, I
assume that you are going to want to ask Linus to merge the mtd tree at
some point soon?
--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

--Signature=_Tue__22_Mar_2011_10_33_00_+1100_zB1BGkGCxpF5TIBL
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQEcBAEBAgAGBQJNh+AsAAoJEDMEi1NhKgbsgj8H/j8xgt9/yaPKWbY8Zvqqa9/M
WyII1zfhoI0lIXj6pRhac3AbiQgrumUnk+7Cc7fBpvatwVRvhWgXEJKIVNE84gqD
tYmIj06ase+h58zcg9Ma4w/kiA0/Id+tNu8KkR6IeAkn/lnYz1XGowt2HcG2pp+V
qtf9FTLDYa6B7dHzm1vRhjqu5qA0LAQMHmm8XirgUrwJMiU944IUWuc7GeK6t5Cp
cvPJWzE32TIWEDxsojfFLU0AKrkcb8TYD2i1HT3lzPSEuOaY4bH7lXWsV9h4ITS3
mEmRlshJiAyC1zf4goIzDBA/9o8VgtPTrj8AVhqgbiKjTvDN5S9wMZx1XBLt/Vg=
=YyJk
-----END PGP SIGNATURE-----

--Signature=_Tue__22_Mar_2011_10_33_00_+1100_zB1BGkGCxpF5TIBL--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Fri, 25 Mar 2011 14:30:49 +1100
Message-ID: <20110325143049.2e65091f.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from chilli.pcug.org.au ([203.10.76.44]:34988 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S934427Ab1CYDbD (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Thu, 24 Mar 2011 23:31:03 -0400
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Lars Ellenberg <lars.ellenberg@linbit.com>, Philipp Reisner <philipp.reisner@linbit.com>, Akinobu Mita <akinobu.mita@gmail.com>, Andrew Morton <akpm@linux-foundation.org>

Hi Jens,

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

drivers/block/drbd/drbd_bitmap.c: In function '__bm_find_next':
drivers/block/drbd/drbd_bitmap.c:1187: error: implicit declaration of function 'generic_find_next_zero_le_bit'
drivers/block/drbd/drbd_bitmap.c:1190: error: implicit declaration of function 'generic_find_next_le_bit'
drivers/block/drbd/drbd_bitmap.c: In function '__bm_change_bits_to':
drivers/block/drbd/drbd_bitmap.c:1290: error: implicit declaration of function 'generic___test_and_set_le_bit'
drivers/block/drbd/drbd_bitmap.c:1292: error: implicit declaration of function 'generic___test_and_clear_le_bit'
drivers/block/drbd/drbd_bitmap.c: In function 'drbd_bm_test_bit':
drivers/block/drbd/drbd_bitmap.c:1441: error: implicit declaration of function 'generic_test_le_bit'

Caused by commit 95a0f10cddbf ("drbd: store in-core bitmap little endian,
regardless of architecture") interacting with commit c4945b9ed472
("asm-generic: rename generic little-endian bitops functions") from
Linus' tree.

I applied the following merge fix patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 25 Mar 2011 14:27:57 +1100
Subject: [PATCH] drbd: update for bitop api changes

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/block/drbd/drbd_bitmap.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c
index f0ae63d..eb925fa 100644
--- a/drivers/block/drbd/drbd_bitmap.c
+++ b/drivers/block/drbd/drbd_bitmap.c
@@ -1184,10 +1184,10 @@ static unsigned long __bm_find_next(struct drbd_conf *mdev, unsigned long bm_fo,
 			p_addr = __bm_map_pidx(b, bm_bit_to_page_idx(b, bm_fo), km);
 
 			if (find_zero_bit)
-				i = generic_find_next_zero_le_bit(p_addr,
+				i = find_next_zero_bit_le(p_addr,
 						PAGE_SIZE*8, bm_fo & BITS_PER_PAGE_MASK);
 			else
-				i = generic_find_next_le_bit(p_addr,
+				i = find_next_bit_le(p_addr,
 						PAGE_SIZE*8, bm_fo & BITS_PER_PAGE_MASK);
 
 			__bm_unmap(p_addr, km);
@@ -1287,9 +1287,9 @@ static int __bm_change_bits_to(struct drbd_conf *mdev, const unsigned long s,
 			last_page_nr = page_nr;
 		}
 		if (val)
-			c += (0 == generic___test_and_set_le_bit(bitnr & BITS_PER_PAGE_MASK, p_addr));
+			c += (0 == __test_and_set_bit_le(bitnr & BITS_PER_PAGE_MASK, p_addr));
 		else
-			c -= (0 != generic___test_and_clear_le_bit(bitnr & BITS_PER_PAGE_MASK, p_addr));
+			c -= (0 != __test_and_clear_bit_le(bitnr & BITS_PER_PAGE_MASK, p_addr));
 	}
 	if (p_addr)
 		__bm_unmap(p_addr, km);
@@ -1438,7 +1438,7 @@ int drbd_bm_test_bit(struct drbd_conf *mdev, const unsigned long bitnr)
 		bm_print_lock_info(mdev);
 	if (bitnr < b->bm_bits) {
 		p_addr = bm_map_pidx(b, bm_bit_to_page_idx(b, bitnr));
-		i = generic_test_le_bit(bitnr & BITS_PER_PAGE_MASK, p_addr) ? 1 : 0;
+		i = test_bit_le(bitnr & BITS_PER_PAGE_MASK, p_addr) ? 1 : 0;
 		bm_unmap(p_addr);
 	} else if (bitnr == b->bm_bits) {
 		i = -1;
@@ -1482,7 +1482,7 @@ int drbd_bm_count_bits(struct drbd_conf *mdev, const unsigned long s, const unsi
 		ERR_IF (bitnr >= b->bm_bits) {
 			dev_err(DEV, "bitnr=%lu bm_bits=%lu\n", bitnr, b->bm_bits);
 		} else {
-			c += (0 != generic_test_le_bit(bitnr - (page_nr << (PAGE_SHIFT+3)), p_addr));
+			c += (0 != test_bit_le(bitnr - (page_nr << (PAGE_SHIFT+3)), p_addr));
 		}
 	}
 	if (p_addr)
-- 
1.7.4.1


-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Akinobu Mita <akinobu.mita@gmail.com>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Fri, 25 Mar 2011 13:08:51 +0900
Message-ID: <AANLkTimZb9x7-5maMU-jibxLdq1pW=CVE4ABXsX6jJRN@mail.gmail.com>
References: <20110325143049.2e65091f.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: QUOTED-PRINTABLE
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mail-qy0-f181.google.com ([209.85.216.181]:49522 "EHLO
	mail-qy0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1750831Ab1CYEIw convert rfc822-to-8bit (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Fri, 25 Mar 2011 00:08:52 -0400
In-Reply-To: <20110325143049.2e65091f.sfr@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jens Axboe <axboe@kernel.dk>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Lars Ellenberg <lars.ellenberg@linbit.com>, Philipp Reisner <philipp.reisner@linbit.com>, Andrew Morton <akpm@linux-foundation.org>

2011/3/25 Stephen Rothwell <sfr@canb.auug.org.au>:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 25 Mar 2011 14:27:57 +1100
> Subject: [PATCH] drbd: update for bitop api changes
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> =A0drivers/block/drbd/drbd_bitmap.c | =A0 12 ++++++------
> =A01 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/dr=
bd_bitmap.c
> index f0ae63d..eb925fa 100644
> --- a/drivers/block/drbd/drbd_bitmap.c
> +++ b/drivers/block/drbd/drbd_bitmap.c

Please remove "#include <asm-generic/bitops/le.h>" from this file.

> @@ -1184,10 +1184,10 @@ static unsigned long __bm_find_next(struct dr=
bd_conf *mdev, unsigned long bm_fo,
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0p_addr =3D __bm_map_pi=
dx(b, bm_bit_to_page_idx(b, bm_fo), km);
>
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (find_zero_bit)
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 i =3D g=
eneric_find_next_zero_le_bit(p_addr,
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 i =3D f=
ind_next_zero_bit_le(p_addr,
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=
 =A0 =A0 =A0 =A0 =A0 =A0PAGE_SIZE*8, bm_fo & BITS_PER_PAGE_MASK);
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0else
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 i =3D g=
eneric_find_next_le_bit(p_addr,
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 i =3D f=
ind_next_bit_le(p_addr,
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=
 =A0 =A0 =A0 =A0 =A0 =A0PAGE_SIZE*8, bm_fo & BITS_PER_PAGE_MASK);
>
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0__bm_unmap(p_addr, km)=
;
> @@ -1287,9 +1287,9 @@ static int __bm_change_bits_to(struct drbd_conf=
 *mdev, const unsigned long s,
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0last_page_nr =3D page_=
nr;
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0}
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (val)
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 c +=3D (0 =3D=3D generi=
c___test_and_set_le_bit(bitnr & BITS_PER_PAGE_MASK, p_addr));
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 c +=3D (0 =3D=3D __test=
_and_set_bit_le(bitnr & BITS_PER_PAGE_MASK, p_addr));
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0else
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 c -=3D (0 !=3D generic_=
__test_and_clear_le_bit(bitnr & BITS_PER_PAGE_MASK, p_addr));
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 c -=3D (0 !=3D __test_a=
nd_clear_bit_le(bitnr & BITS_PER_PAGE_MASK, p_addr));
> =A0 =A0 =A0 =A0}
> =A0 =A0 =A0 =A0if (p_addr)
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0__bm_unmap(p_addr, km);
> @@ -1438,7 +1438,7 @@ int drbd_bm_test_bit(struct drbd_conf *mdev, co=
nst unsigned long bitnr)
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0bm_print_lock_info(mdev);
> =A0 =A0 =A0 =A0if (bitnr < b->bm_bits) {
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0p_addr =3D bm_map_pidx(b, bm_bit_to_pa=
ge_idx(b, bitnr));
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 i =3D generic_test_le_bit(bitnr & BITS_=
PER_PAGE_MASK, p_addr) ? 1 : 0;
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 i =3D test_bit_le(bitnr & BITS_PER_PAGE=
_MASK, p_addr) ? 1 : 0;
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0bm_unmap(p_addr);
> =A0 =A0 =A0 =A0} else if (bitnr =3D=3D b->bm_bits) {
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0i =3D -1;
> @@ -1482,7 +1482,7 @@ int drbd_bm_count_bits(struct drbd_conf *mdev, =
const unsigned long s, const unsi
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0ERR_IF (bitnr >=3D b->bm_bits) {
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0dev_err(DEV, "bitnr=3D=
%lu bm_bits=3D%lu\n", bitnr, b->bm_bits);
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0} else {
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 c +=3D (0 !=3D generic_=
test_le_bit(bitnr - (page_nr << (PAGE_SHIFT+3)), p_addr));
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 c +=3D (0 !=3D test_bit=
_le(bitnr - (page_nr << (PAGE_SHIFT+3)), p_addr));
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0}
> =A0 =A0 =A0 =A0}
> =A0 =A0 =A0 =A0if (p_addr)
> --
> 1.7.4.1
>
>
> --
> Cheers,
> Stephen Rothwell =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0sfr@canb.auug=
=2Eorg.au
>

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Fri, 25 Mar 2011 16:25:36 +1100
Message-ID: <20110325162536.368d5160.sfr@canb.auug.org.au>
References: <20110325143049.2e65091f.sfr@canb.auug.org.au>
	<AANLkTimZb9x7-5maMU-jibxLdq1pW=CVE4ABXsX6jJRN@mail.gmail.com>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA1";
 boundary="Signature=_Fri__25_Mar_2011_16_25_36_+1100_EPu6g6G/V9PezDfc"
Return-path: <linux-next-owner@vger.kernel.org>
Received: from chilli.pcug.org.au ([203.10.76.44]:46561 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751695Ab1CYFZt (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Fri, 25 Mar 2011 01:25:49 -0400
In-Reply-To: <AANLkTimZb9x7-5maMU-jibxLdq1pW=CVE4ABXsX6jJRN@mail.gmail.com>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Jens Axboe <axboe@kernel.dk>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Lars Ellenberg <lars.ellenberg@linbit.com>, Philipp Reisner <philipp.reisner@linbit.com>, Andrew Morton <akpm@linux-foundation.org>

--Signature=_Fri__25_Mar_2011_16_25_36_+1100_EPu6g6G/V9PezDfc
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi,

On Fri, 25 Mar 2011 13:08:51 +0900 Akinobu Mita <akinobu.mita@gmail.com> wr=
ote:
>
> Please remove "#include <asm-generic/bitops/le.h>" from this file.

Indeed that is required, or in some circumstances you get these errors
(from a powerpc allyesonfig build):

In file included from drivers/block/drbd/drbd_bitmap.c:32:
include/asm-generic/bitops/le.h:45: error: conflicting types for 'test_bit_=
le'
arch/powerpc/include/asm/bitops.h:284: note: previous definition of 'test_b=
it_le' was here
include/asm-generic/bitops/le.h:50: error: redefinition of '__set_bit_le'
arch/powerpc/include/asm/bitops.h:291: note: previous definition of '__set_=
bit_le' was here
include/asm-generic/bitops/le.h:55: error: redefinition of '__clear_bit_le'
arch/powerpc/include/asm/bitops.h:296: note: previous definition of '__clea=
r_bit_le' was here
include/asm-generic/bitops/le.h:60: error: redefinition of 'test_and_set_bi=
t_le'
arch/powerpc/include/asm/bitops.h:301: note: previous definition of 'test_a=
nd_set_bit_le' was here
include/asm-generic/bitops/le.h:65: error: redefinition of 'test_and_clear_=
bit_le'
arch/powerpc/include/asm/bitops.h:306: note: previous definition of 'test_a=
nd_clear_bit_le' was here
include/asm-generic/bitops/le.h:70: error: redefinition of '__test_and_set_=
bit_le'
arch/powerpc/include/asm/bitops.h:311: note: previous definition of '__test=
_and_set_bit_le' was here
include/asm-generic/bitops/le.h:75: error: redefinition of '__test_and_clea=
r_bit_le'
arch/powerpc/include/asm/bitops.h:316: note: previous definition of '__test=
_and_clear_bit_le' was here

This is fixed by reverting commit f0ff1357ce39 ("drbd: need include for
bitops functions declarations").

--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

--Signature=_Fri__25_Mar_2011_16_25_36_+1100_EPu6g6G/V9PezDfc
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQEcBAEBAgAGBQJNjCdQAAoJEDMEi1NhKgbslQIH/RQZNNtcTKaVrST6/jETXB7a
Y48SFBZF/UDXCTqPWH6l1kP8e/erF+tm88rbMmcHq5//9+1EXboqrFQW/wVxSM2u
FeT/vZWMnauuJ/yGETxUAjIaaTafHX76+X1Qybq40/WLDm0VvnjXegTeLiG8lXd1
wo3nVTktmN2is7r/MlJeRZWMD14dylXvGng8+S8xTuHz7gSDA3YVa5t9dGYpzEcL
W3KgBJGzM406Z9aBmWkTAVavV98tIAIdKZ9M98LW76SUDLong4jHBKpwysL0UlP/
xAd4Mqb+aZuFS2qO6g0GnhCAf1vL/cPlX/irMpKqkXGZ267I/p0nRAg18jkiffM=
=+eaN
-----END PGP SIGNATURE-----

--Signature=_Fri__25_Mar_2011_16_25_36_+1100_EPu6g6G/V9PezDfc--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Wed, 1 Jun 2011 11:01:32 +1000
Message-ID: <20110601110132.5485aba4.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA1";
 boundary="Signature=_Wed__1_Jun_2011_11_01_32_+1000_Wlq_KLq=E81YqJ4Q"
Return-path: <linux-next-owner@vger.kernel.org>
Received: from chilli.pcug.org.au ([203.10.76.44]:45667 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S932986Ab1FABBr (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Tue, 31 May 2011 21:01:47 -0400
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Dan Carpenter <error27@gmail.com>, Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

--Signature=_Wed__1_Jun_2011_11_01_32_+1000_Wlq_KLq=E81YqJ4Q
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Jens,

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

drivers/block/xen-blkback/blkback.c: In function 'xen_blkif_init':
drivers/block/xen-blkback/blkback.c:812:6: error: 'blkback' undeclared (fir=
st use in this function)

Caused by commit 2a46117c6050 ("xen/blkback: potential null dereference
in error handling").

I have used the block tree from next-20110530 for today.
--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

--Signature=_Wed__1_Jun_2011_11_01_32_+1000_Wlq_KLq=E81YqJ4Q
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQEcBAEBAgAGBQJN5Y9sAAoJEDMEi1NhKgbsvS0H/A+RDOkr/aGoMzZEXh2OcHOQ
/AToiktAw1Gonva9zHQ1H2+vrASKfa6pC7zGmCbAbTIjLvUXhOEMO9gNS2Hqwjn/
ehLcBWDTvUn07it7BnQ8SsGlSCi3rMse1MLsQDczqE5lbTjqzJ6YqvLE/5gOThBV
dhpK/CLbzPg70PizAjz/iWz5/bmTqoHbSXyYU1iWqp+6lc/Lu/0OoGKQSSzFIhxs
+LWvwFthdUst+/rByvMWAn29r9ZrC9c7ITPMyVWhbBB6WZ4XJMH/iQPCxxclVGfv
ir2NxXA6Lct+mSwEnP8SXH8azGzRHtrpTm4/zYcw2VcxtK/Qn2jtGTvTAJ1QbFM=
=6GCT
-----END PGP SIGNATURE-----

--Signature=_Wed__1_Jun_2011_11_01_32_+1000_Wlq_KLq=E81YqJ4Q--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Wed, 01 Jun 2011 08:26:29 +0200
Message-ID: <4DE5DB95.8010106@kernel.dk>
References: <20110601110132.5485aba4.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from 0122700014.0.fullrate.dk ([95.166.99.235]:34326 "EHLO kernel.dk"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754443Ab1FAG0b (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Wed, 1 Jun 2011 02:26:31 -0400
In-Reply-To: <20110601110132.5485aba4.sfr@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Dan Carpenter <error27@gmail.com>, Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

On 2011-06-01 03:01, Stephen Rothwell wrote:
> Hi Jens,
> 
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/block/xen-blkback/blkback.c: In function 'xen_blkif_init':
> drivers/block/xen-blkback/blkback.c:812:6: error: 'blkback' undeclared (first use in this function)
> 
> Caused by commit 2a46117c6050 ("xen/blkback: potential null dereference
> in error handling").
> 
> I have used the block tree from next-20110530 for today.

Damn, sorry Stephen. Konrad, I'm rolling my tree back as not to
introduce bisection breakage in the tree. JFYI, so rebase yours as well
and lets try again.

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Wed, 1 Jun 2011 09:43:47 -0400
Message-ID: <20110601134347.GB4081@dumpdata.com>
References: <20110601110132.5485aba4.sfr@canb.auug.org.au>
 <4DE5DB95.8010106@kernel.dk>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-next-owner@vger.kernel.org>
Received: from rcsinet10.oracle.com ([148.87.113.121]:36787 "EHLO
	rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753879Ab1FANoS (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Wed, 1 Jun 2011 09:44:18 -0400
Content-Disposition: inline
In-Reply-To: <4DE5DB95.8010106@kernel.dk>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Dan Carpenter <error27@gmail.com>

On Wed, Jun 01, 2011 at 08:26:29AM +0200, Jens Axboe wrote:
> On 2011-06-01 03:01, Stephen Rothwell wrote:
> > Hi Jens,
> > 
> > After merging the block tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > drivers/block/xen-blkback/blkback.c: In function 'xen_blkif_init':
> > drivers/block/xen-blkback/blkback.c:812:6: error: 'blkback' undeclared (first use in this function)
> > 
> > Caused by commit 2a46117c6050 ("xen/blkback: potential null dereference
> > in error handling").
> > 
> > I have used the block tree from next-20110530 for today.
> 
> Damn, sorry Stephen. Konrad, I'm rolling my tree back as not to
> introduce bisection breakage in the tree. JFYI, so rebase yours as well
> and lets try again.

Done. Sorry about that - I pushed the right tree minutes after I sent the git
pull email, but it took forever.... anyhow just pushed it and rebased on your for-linux.
Will send out a seperate email for the git pull.

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Mon, 4 Jul 2011 13:48:42 +1000
Message-ID: <20110704134842.7ab89126.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA1";
 boundary="Signature=_Mon__4_Jul_2011_13_48_42_+1000_MvPJjcmSndX.7gU."
Return-path: <linux-next-owner@vger.kernel.org>
Received: from chilli.pcug.org.au ([203.10.76.44]:34338 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753737Ab1GDDsw (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Sun, 3 Jul 2011 23:48:52 -0400
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Johannes Stezenbach <js@sig21.net>, Arnd Bergmann <arnd@arndb.de>

--Signature=_Mon__4_Jul_2011_13_48_42_+1000_MvPJjcmSndX.7gU.
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Jens,

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

include/linux/fd.h:6: included file 'linux/compat.h' is not exported

Caused by commit 390192b30057 ("compat_ioctl: fix warning caused by
qemu").

I have used the block tree from next-20110701 for today.
--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

--Signature=_Mon__4_Jul_2011_13_48_42_+1000_MvPJjcmSndX.7gU.
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQEcBAEBAgAGBQJOETgaAAoJEDMEi1NhKgbsJiUH/1NPpRjt3Q3XW4ltDryCKITt
UonKRDpD51tXlfjhzTf6GQ8lTAW0OpJWCa5SAQ3YmplKEiV1tEJFqFdCQA/sGFf2
e7qgtTDn/MDwdEdPAyfzlEeEE/pT2WeEprdUj2UGvgp3vvN5YW3Flx36hZjWCbM/
unHNONpLbK3QEtX743XL2CyZWE9D8FD62f8bN5Mpi54ayoYVEz8OVS/4cN/QGf+8
OvN/DxrjVVRw0byfdByfzO+8pJad9o4v6WUEbJhCvKCUejoUKti209uF/ga6GWCO
qws6ZdnPJEQyA0Pu2gh/0afLZqGBaTzmIA8CRapLs/YRWwQU8Uyda89X8ErPkpE=
=9Wr0
-----END PGP SIGNATURE-----

--Signature=_Mon__4_Jul_2011_13_48_42_+1000_MvPJjcmSndX.7gU.--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Sat, 17 Sep 2011 21:18:47 +1000
Message-ID: <20110917211847.d6e0e401b06707eacccdf1c3@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA1";
 boundary="Signature=_Sat__17_Sep_2011_21_18_47_+1000_/sc5siKLc5uUrSw8"
Return-path: <linux-next-owner@vger.kernel.org>
Received: from calzone.tip.net.au ([203.10.76.15]:54966 "EHLO
	calzone.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751260Ab1IQLS6 (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Sat, 17 Sep 2011 07:18:58 -0400
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Sam Bradshaw <sbradshaw@micron.com>

--Signature=_Sat__17_Sep_2011_21_18_47_+1000_/sc5siKLc5uUrSw8
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Jens,

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

drivers/block/mtip32xx/mtip32xx.c:95: error: expected specifier-qualifier-l=
ist before 'compat_ulong_t'
drivers/block/mtip32xx/mtip32xx.c: In function 'exec_drive_taskfile':
drivers/block/mtip32xx/mtip32xx.c:1631: warning: cast from pointer to integ=
er of different size
drivers/block/mtip32xx/mtip32xx.c:1632: warning: cast from pointer to integ=
er of different size
drivers/block/mtip32xx/mtip32xx.c:1633: warning: cast from pointer to integ=
er of different size
drivers/block/mtip32xx/mtip32xx.c:1658: error: 'compat_long_t' undeclared (=
first use in this function)
drivers/block/mtip32xx/mtip32xx.c:1658: error: (Each undeclared identifier =
is reported only once
drivers/block/mtip32xx/mtip32xx.c:1658: error: for each function it appears=
 in.)
drivers/block/mtip32xx/mtip32xx.c:1663: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1663: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1663: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1663: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1663: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1663: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1663: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1663: warning: type defaults to 'int' in =
declaration of 'type name'
drivers/block/mtip32xx/mtip32xx.c:1668: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1668: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1668: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1668: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1668: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1668: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1668: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1668: warning: type defaults to 'int' in =
declaration of 'type name'
drivers/block/mtip32xx/mtip32xx.c:1708: warning: cast from pointer to integ=
er of different size
drivers/block/mtip32xx/mtip32xx.c:1729: warning: cast from pointer to integ=
er of different size
drivers/block/mtip32xx/mtip32xx.c:1871: warning: cast from pointer to integ=
er of different size
drivers/block/mtip32xx/mtip32xx.c:1872: warning: cast from pointer to integ=
er of different size
drivers/block/mtip32xx/mtip32xx.c:1922: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1922: warning: type defaults to 'int' in =
declaration of '__pu_val'
drivers/block/mtip32xx/mtip32xx.c:1922: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1922: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1922: warning: type defaults to 'int' in =
declaration of 'type name'
drivers/block/mtip32xx/mtip32xx.c:1922: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1922: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1922: warning: type defaults to 'int' in =
declaration of 'type name'
drivers/block/mtip32xx/mtip32xx.c:1922: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1922: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1922: warning: type defaults to 'int' in =
declaration of 'type name'
drivers/block/mtip32xx/mtip32xx.c:1922: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1922: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1922: warning: type defaults to 'int' in =
declaration of 'type name'
drivers/block/mtip32xx/mtip32xx.c:1922: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1922: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1922: warning: type defaults to 'int' in =
declaration of 'type name'
drivers/block/mtip32xx/mtip32xx.c:1922: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1927: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1927: warning: type defaults to 'int' in =
declaration of '__pu_val'
drivers/block/mtip32xx/mtip32xx.c:1927: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1927: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1927: warning: type defaults to 'int' in =
declaration of 'type name'
drivers/block/mtip32xx/mtip32xx.c:1927: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1927: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1927: warning: type defaults to 'int' in =
declaration of 'type name'
drivers/block/mtip32xx/mtip32xx.c:1927: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1927: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1927: warning: type defaults to 'int' in =
declaration of 'type name'
drivers/block/mtip32xx/mtip32xx.c:1927: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1927: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1927: warning: type defaults to 'int' in =
declaration of 'type name'
drivers/block/mtip32xx/mtip32xx.c:1927: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1927: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1927: warning: type defaults to 'int' in =
declaration of 'type name'
drivers/block/mtip32xx/mtip32xx.c:1927: error: 'struct mtip_compat_ide_task=
_request_s' has no member named 'in_size'

Caused by commit 49fdf3a7c4cf ("block: Add driver for Micron RealSSD pcie
flash cards").  Sorry I didn't spot it earlier ...

This driver assumes CONFIG_COMPAT is set.
--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

--Signature=_Sat__17_Sep_2011_21_18_47_+1000_/sc5siKLc5uUrSw8
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQEcBAEBAgAGBQJOdIIXAAoJEDMEi1NhKgbsBnEIAJbNym2DIe3Kntwll3kF8nzr
nTIZ8+PoComMbcb7NdkALVyvVWtSF3HEMPVEjzEH7MKUE90CGkVfxbeYXsHjpt3O
NCjSdT7xUzl7Jzetu3wj8CtwLWWkI7V+vGwXmNrSzOnbdzlXhucPuNzEIWtprnIJ
FxnxKU7nr5g0PrNDBWN10/bGgtfQs/LmwxuRQs4YBCLNMdB0ka3rQu+zyafJw3U/
Lkquybx6QRCeIEK84+ZrRSxPbsnG4gynWZ1WalmQyrt0O/ObCDidO8O9dtkuiNRh
gK8MndkilRKs82XsrQ5joluB18N81P00YzGqi6GPb0o1aR5+sv+zEdOWuAgbEFM=
=qS3/
-----END PGP SIGNATURE-----

--Signature=_Sat__17_Sep_2011_21_18_47_+1000_/sc5siKLc5uUrSw8--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Fri, 16 Dec 2011 12:50:01 +1100
Message-ID: <20111216125001.33635d34b5397292e6190b9a@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA256";
 boundary="Signature=_Fri__16_Dec_2011_12_50_01_+1100_Z=O9cjr_4MhogIjr"
Return-path: <linux-next-owner@vger.kernel.org>
Received: from calzone.tip.net.au ([203.10.76.15]:46751 "EHLO
	calzone.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1757710Ab1LPBuL (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Thu, 15 Dec 2011 20:50:11 -0500
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Tejun Heo <tj@kernel.org>, majianpeng <majianpeng@gmail.com>

--Signature=_Fri__16_Dec_2011_12_50_01_+1100_Z=O9cjr_4MhogIjr
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Jens,

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

block/cfq-iosched.c: In function 'cfq_init_queue':
block/cfq-iosched.c:3690:14: error: 'cic_index_lock' undeclared (first use =
in this function)
block/cfq-iosched.c:3691:15: error: 'cic_index_ida' undeclared (first use i=
n this function)
block/cfq-iosched.c:3691:34: error: 'struct cfq_data' has no member named '=
cic_index'

Presumably this was not build tested with CONFIG_CFQ_GROUP_IOSCHED set.

Caused by commit a73f730d013f ("block, cfq: move cfqd->cic_index to
q->id") interacting with commit 2984ff38ccf6 ("cfq-iosched: free
cic_index if blkio_alloc_blkg_stats fails").

I have used the block tree from next-20111215 for today.
--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

--Signature=_Fri__16_Dec_2011_12_50_01_+1100_Z=O9cjr_4MhogIjr
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAEBCAAGBQJO6qPJAAoJEECxmPOUX5FEBH8P/R4JTVvL3iOSxXeeYdUS6R5N
wVIajTEWivRJHk2OjJ8+MEgDdQfZ386vuuoCKzAKPmDWgERL6RQCCAkVfhGdeFyn
2ww+zQ8Ji4sCiv9VbsBrl31Fe5OQyORct54coo6JgcsfLVBHapqnCTcczGEIVq1t
qCtOJAhINEb+73hHEn5qP33qWhbhZitLX/kzpmEQ/LN9OZtIhTZmfBEd8gV3dGN9
vH58qVObefhDYKSziHVEVz4dkKeC2aT393bxU7xcC4zf04ptaES/MTkLFOzAig9K
128Y3f7wrB0W+mt1BcjU4V+VMV9scP3isHgavZAuXnicQQhoNafxx6gVkU/mUmBe
uaoImo/7PbUpq5hblVrrLbPBalcMr3w+5GYE/MIE9Yila4hpyfFZyP0WlCJuNGTJ
qUZIFSwvEq1AGhXeT/g1cRwHucUMsLqPmmofpRICHA2YJJsVjyM9PZ4y02ys7tKH
XDqLCuRcpEHyGGeO5k3m+c2lXnddRWg+qeYbnJgR7qsLpFcWvfKGeLHSIpcTUQPo
UuM6PrXmQ0sDfq2tKSU8iIFVl1/SALRL8N70CBgq7jygRU4sDgPkiUH3pbbRGz4h
KILwFOCS/3TxQftOV9Aw4ipoUOy7kvXLzZ43Mph73iO0OP6UngTf5vMYpcMEDUPk
lb9jzJ54lyzM4wc0Pzlg
=zQTV
-----END PGP SIGNATURE-----

--Signature=_Fri__16_Dec_2011_12_50_01_+1100_Z=O9cjr_4MhogIjr--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Fri, 16 Dec 2011 09:20:27 +0100
Message-ID: <4EEAFF4B.6000802@kernel.dk>
References: <20111216125001.33635d34b5397292e6190b9a@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <20111216125001.33635d34b5397292e6190b9a@canb.auug.org.au>
Sender: linux-kernel-owner@vger.kernel.org
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Tejun Heo <tj@kernel.org>, majianpeng <majianpeng@gmail.com>
List-Id: linux-next.vger.kernel.org

On 2011-12-16 02:50, Stephen Rothwell wrote:
> Hi Jens,
> 
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> block/cfq-iosched.c: In function 'cfq_init_queue':
> block/cfq-iosched.c:3690:14: error: 'cic_index_lock' undeclared (first use in this function)
> block/cfq-iosched.c:3691:15: error: 'cic_index_ida' undeclared (first use in this function)
> block/cfq-iosched.c:3691:34: error: 'struct cfq_data' has no member named 'cic_index'
> 
> Presumably this was not build tested with CONFIG_CFQ_GROUP_IOSCHED set.
> 
> Caused by commit a73f730d013f ("block, cfq: move cfqd->cic_index to
> q->id") interacting with commit 2984ff38ccf6 ("cfq-iosched: free
> cic_index if blkio_alloc_blkg_stats fails").
> 
> I have used the block tree from next-20111215 for today.

Sorry Stephen, I'll get this merge problem fixed up.

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Mon, 19 Dec 2011 14:19:29 +1100
Message-ID: <20111219141929.e27fd6b6ac0b9f6ae33f89c7@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA256";
 boundary="Signature=_Mon__19_Dec_2011_14_19_29_+1100_U=mnUbijSZNrzGYw"
Return-path: <linux-kernel-owner@vger.kernel.org>
Sender: linux-kernel-owner@vger.kernel.org
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Tejun Heo <tj@kernel.org>
List-Id: linux-next.vger.kernel.org

--Signature=_Mon__19_Dec_2011_14_19_29_+1100_U=mnUbijSZNrzGYw
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Jens,

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

ERROR: "ioc_cgroup_changed" [block/blk-cgroup.ko] undefined!

Caused by commit dc86900e0a8f ("block, cfq: move ioc ioprio/cgroup
changed handling to cic").

I have used the block tree from next-20111215 again today.
--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

--Signature=_Mon__19_Dec_2011_14_19_29_+1100_U=mnUbijSZNrzGYw
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAEBCAAGBQJO7q1BAAoJEECxmPOUX5FEJLUP/jlWgIID4FEsU5DcZq6PReWN
69+nyF8zhgFcV9HJ8XgptXIUIvph5opjwOoIdhI4pha4s7wDo5ptJuQXhr0w9DRO
S1J0uT5k8xjILubmHCRnpS4SseMdteObglUy3GrHQPTXyEx7SXAOKGdGZyu3XjQE
9Hp1fCZr0eoARZk4Dmph9ucGer+h4Cn6ZPFdnNqnC1wm7b/Dv4gSTgFrGBzJAIxE
PPWMDlmXdv3Udo6NQTaHoxMI+T8rjADqZtsnSpaNMP4QyvlNh+fbzqi+Yk+mJF2v
JwELC1OXXXRODfrDJr1SzgJdBSENHSsLoO0zfZSg3f/ruKQe96GdXa0TNS9feY0c
8Q+ltiP0aQs9UZ/bYZV+r89w6ktr4ZOk3PSTSgF32KmJDV7btM8k8t0PyFXuSg8h
fKvoJh13RLirzCubDNPJCJlJKTTAyJNWgNVpgUfJ9pMTWoj442L4okGslfvAsKgv
m3jyzL5oelKr/aFcYCVz2uClFKeW8fp5YW9E+bb55dcN6XuGkPaG6XevLmUgX+y2
PYkjE8gd+p7xXkDY18WN7fHZpjhjChyRp6Nk1oALGtTiXHXqy1G7CoBua+f8qeYB
aqnOJZyxnVuhmgKONdNxCvcgo0gGuGpngJtKYqDgfHiRB1EavLAayVTd27GV/Beg
PX+Jee4jSx9HthWZfjxD
=lAM4
-----END PGP SIGNATURE-----

--Signature=_Mon__19_Dec_2011_14_19_29_+1100_U=mnUbijSZNrzGYw--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Mon, 19 Dec 2011 10:37:57 +0100
Message-ID: <4EEF05F5.3050600@kernel.dk>
References: <20111219141929.e27fd6b6ac0b9f6ae33f89c7@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from merlin.infradead.org ([205.233.59.134]:44999 "EHLO
	merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751063Ab1LSJiD (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Mon, 19 Dec 2011 04:38:03 -0500
In-Reply-To: <20111219141929.e27fd6b6ac0b9f6ae33f89c7@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Tejun Heo <tj@kernel.org>

On 2011-12-19 04:19, Stephen Rothwell wrote:
> Hi Jens,
> 
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> ERROR: "ioc_cgroup_changed" [block/blk-cgroup.ko] undefined!
> 
> Caused by commit dc86900e0a8f ("block, cfq: move ioc ioprio/cgroup
> changed handling to cic").
> 
> I have used the block tree from next-20111215 again today.

Missing export, I've fixed it up and pushed out the change. Lets hope
tomorrows tree is more succesful :-)

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Sedat Dilek <sedat.dilek@googlemail.com>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Mon, 19 Dec 2011 10:45:58 +0100
Message-ID: <CA+icZUWrpTFPhM0cTQgvBPnMqT3zZufcxQ6c6wh7=EtkD4of9w@mail.gmail.com>
References: <20111219141929.e27fd6b6ac0b9f6ae33f89c7@canb.auug.org.au>
Reply-To: sedat.dilek@gmail.com
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: QUOTED-PRINTABLE
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mail-qy0-f174.google.com ([209.85.216.174]:41011 "EHLO
	mail-qy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751172Ab1LSJqB convert rfc822-to-8bit (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Mon, 19 Dec 2011 04:46:01 -0500
In-Reply-To: <20111219141929.e27fd6b6ac0b9f6ae33f89c7@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jens Axboe <axboe@kernel.dk>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Tejun Heo <tj@kernel.org>

Just FYI:

- block           git     git://git.kernel.dk/linux-2.6-block.git#for-n=
ext
+ block           git     git://git.kernel.dk/linux-block.git#for-next

- Sedat -

[1] http://git.kernel.org/?p=3Dlinux/kernel/git/next/linux-next.git;a=3D=
blob;f=3DNext/Trees#l130
[2] http://git.kernel.dk/?p=3Dlinux-block.git;a=3Dshortlog;h=3Drefs/hea=
ds/for-next

On Mon, Dec 19, 2011 at 4:19 AM, Stephen Rothwell <sfr@canb.auug.org.au=
> wrote:
> Hi Jens,
>
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> ERROR: "ioc_cgroup_changed" [block/blk-cgroup.ko] undefined!
>
> Caused by commit dc86900e0a8f ("block, cfq: move ioc ioprio/cgroup
> changed handling to cic").
>
> I have used the block tree from next-20111215 again today.
> --
> Cheers,
> Stephen Rothwell =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Mon, 19 Dec 2011 10:48:06 +0100
Message-ID: <4EEF0856.3040306@kernel.dk>
References: <20111219141929.e27fd6b6ac0b9f6ae33f89c7@canb.auug.org.au> <CA+icZUWrpTFPhM0cTQgvBPnMqT3zZufcxQ6c6wh7=EtkD4of9w@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from merlin.infradead.org ([205.233.59.134]:45734 "EHLO
	merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751063Ab1LSJsK (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Mon, 19 Dec 2011 04:48:10 -0500
In-Reply-To: <CA+icZUWrpTFPhM0cTQgvBPnMqT3zZufcxQ6c6wh7=EtkD4of9w@mail.gmail.com>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: sedat.dilek@gmail.com
Cc: Sedat Dilek <sedat.dilek@googlemail.com>, Stephen Rothwell <sfr@canb.auug.org.au>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Tejun Heo <tj@kernel.org>

On 2011-12-19 10:45, Sedat Dilek wrote:
> Just FYI:
> 
> - block           git     git://git.kernel.dk/linux-2.6-block.git#for-next
> + block           git     git://git.kernel.dk/linux-block.git#for-next

linux-block.git is the one that should be used, however the 2.6 one is
just a link to the new one. So old urls work just fine as well, it all
goes to the same spot.

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Mon, 19 Dec 2011 22:32:51 +1100
Message-ID: <20111219223251.b8e821261330831e4861b297@canb.auug.org.au>
References: <20111219141929.e27fd6b6ac0b9f6ae33f89c7@canb.auug.org.au>
	<CA+icZUWrpTFPhM0cTQgvBPnMqT3zZufcxQ6c6wh7=EtkD4of9w@mail.gmail.com>
	<4EEF0856.3040306@kernel.dk>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA256";
 boundary="Signature=_Mon__19_Dec_2011_22_32_51_+1100_d1TGDQCD3brYTt39"
Return-path: <linux-next-owner@vger.kernel.org>
Received: from calzone.tip.net.au ([203.10.76.15]:42068 "EHLO
	calzone.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751840Ab1LSLdF (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Mon, 19 Dec 2011 06:33:05 -0500
In-Reply-To: <4EEF0856.3040306@kernel.dk>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: sedat.dilek@gmail.com, Sedat Dilek <sedat.dilek@googlemail.com>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Tejun Heo <tj@kernel.org>

--Signature=_Mon__19_Dec_2011_22_32_51_+1100_d1TGDQCD3brYTt39
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Mon, 19 Dec 2011 10:48:06 +0100 Jens Axboe <axboe@kernel.dk> wrote:
>
> On 2011-12-19 10:45, Sedat Dilek wrote:
> > Just FYI:
> >=20
> > - block           git     git://git.kernel.dk/linux-2.6-block.git#for-n=
ext
> > + block           git     git://git.kernel.dk/linux-block.git#for-next
>=20
> linux-block.git is the one that should be used, however the 2.6 one is
> just a link to the new one. So old urls work just fine as well, it all
> goes to the same spot.

Thanks, guys. I have switched to that now.

--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

--Signature=_Mon__19_Dec_2011_22_32_51_+1100_d1TGDQCD3brYTt39
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAEBCAAGBQJO7yDjAAoJEECxmPOUX5FEfbIP/j0IfzR9fr0lrX7xSUSKWITy
df0m8r/1eQ8zryHvp8oedbaAGLlFXCLazcvH52Pn+L/93/dLN7M249qjX0muzxja
OAApVJNRjO3eCMHe1j9lO9pzO2z3+Ajp2vo7KstLff08G0IjQMbP/YhoWLUsRhCY
ttGxarC85aNxRP4qs6fMCdw15b6KoqiP+rDhEo8o0Ex+Mk57Ou4Mqmg7G0iV2J9D
h3Il1DMfbLA0l/5qbzpmbnFZKRxsr+NN8HUykf/idsWh1mTCDBk1uUI/kqTbMi54
L2vmMJ7fbs8DO80zqxan2LoRfgYHKkm+928LhqdakKEilSXanVb6d3ZE2ZWBYKFm
4kpEhJ1oxXW0G72NCkswQPyJzNvrcR+cIZc7/aJJb6qVntg3mSDw8R0SJ7pYXdQi
RelXDA3pzxvwqPuwPjY/XYHEuua+nhmQ+96B62Q4TMpG+AeAtx2dHDkRz09rPfWL
S7q6CWXyUYXc9AqElb+UI0K8TVhGRVhktXLZrAPkU8Xo8S7wnsz/g6QwaLyd7EuP
hXsP2Cmk58HNvSha550y0VVo4ycVIoXRjLl9k+tu8Uh7XtBqjqFJlk5UaLh9i56X
vTKqYPzdseIpSJHreWLx47siIO6B4KYMYFGNrvSmOr2pSI1YdHsZudOYsEN8eL3d
bVGJNXyxjf6Pro6hxzuh
=igWm
-----END PGP SIGNATURE-----

--Signature=_Mon__19_Dec_2011_22_32_51_+1100_d1TGDQCD3brYTt39--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tejun Heo <tj@kernel.org>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Mon, 19 Dec 2011 08:41:51 -0800
Message-ID: <20111219164151.GB24519@google.com>
References: <20111219141929.e27fd6b6ac0b9f6ae33f89c7@canb.auug.org.au>
 <4EEF05F5.3050600@kernel.dk>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mail-gy0-f174.google.com ([209.85.160.174]:33523 "EHLO
	mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751032Ab1LSQmA (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Mon, 19 Dec 2011 11:42:00 -0500
Content-Disposition: inline
In-Reply-To: <4EEF05F5.3050600@kernel.dk>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org

On Mon, Dec 19, 2011 at 10:37:57AM +0100, Jens Axboe wrote:
> Missing export, I've fixed it up and pushed out the change. Lets hope
> tomorrows tree is more succesful :-)

Oops, thanks Jens. :)

-- 
tejun

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Thu, 27 Sep 2012 13:27:00 +1000
Message-ID: <20120927132700.7e6ef4b714fb4a8251e68775@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA256";
 boundary="Signature=_Thu__27_Sep_2012_13_27_00_+1000_SCroD2VAo/P.GRyr"
Return-path: <linux-kernel-owner@vger.kernel.org>
Sender: linux-kernel-owner@vger.kernel.org
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Mikulas Patocka <mpatocka@redhat.com>, Alasdair G Kergon <agk@redhat.com>
List-Id: linux-next.vger.kernel.org

--Signature=_Thu__27_Sep_2012_13_27_00_+1000_SCroD2VAo/P.GRyr
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Jens,

After merging the block tree, today's linux-next build (x86
64_allmodconfig) failed like this:

usr/include/linux/fs.h:13: included file 'linux/percpu-rwsem.h' is not expo=
rted

Caused by commit 62ac665ff9fc ("blockdev: turn a rw semaphore into a
percpu rw semaphore").

I have used the block tree from next-20120926 for today.  This will also
affect the device-mapper tree which is based on the block tree (of which I
will also use the next-20120926 version).

--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

--Signature=_Thu__27_Sep_2012_13_27_00_+1000_SCroD2VAo/P.GRyr
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAEBCAAGBQJQY8eEAAoJEECxmPOUX5FEBWsP/0tfVlPWPrKJklc9ZZVtL0Y7
U3RFAgXtXGyMP85NdolzkNyP5SRNUbIMQwtWuUmChgyd/kZ9wcaOLq0CKMjX/htD
jtHSWzVJyoCmad66ZGYOzfq4UyUiPxO1y4YADAvrWivBihQkJWqrJ/Osy8HQW1Va
Mz93UYaeRTLfKuHpzRuV8ecZIgRpGiJwqiodRV4JL7eN4Opf16P8rdysJpE2fPCJ
vLBU+YoApHbKvSXeKPeUadP8oInyj0iwKef75pXPSPEqLRoOJrACj1OyJl0kazU9
veMYOQW6U40fRz0X5olh2xgy3unH9HjUY8tIwE5/1c+yz6TsqRPukjZOYdcNEbXZ
T5nx0BsSCXYTU3FzcSgUxwaop3V+N5kMxcSUaN20oqUKSv1P/5UREs6bN58n3PQX
1darjBZryZEPaRE34ilJtQZ4ZwPsiGKn05Soeh/k/4M+SUc04wC2EZn/WMPrDhm/
aQN+efF3k+9eNjmNbQapfetZq3SyR/VHLg2kt3jPNqkJ3hFWggvFRV8d6/XDhJmo
FKxfoJe4GlnHtuOIWNQngNztd8t86dl76EQ42HrivpodMt1bNvuGLsb+Luvex6T6
h0gzDVUWhUSsHHghycsRX206CI8OIj7ovTsoXoJm8HVA81IE/wBNMMqVbS9mht20
4ukPXOobosnE9qBLEDwS
=SVVZ
-----END PGP SIGNATURE-----

--Signature=_Thu__27_Sep_2012_13_27_00_+1000_SCroD2VAo/P.GRyr--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 27 Sep 2012 09:37:16 +0200
Message-ID: <5064022C.4080202@kernel.dk>
References: <20120927132700.7e6ef4b714fb4a8251e68775@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from casper.infradead.org ([85.118.1.10]:36281 "EHLO
	casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1756481Ab2I0Hhx (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Thu, 27 Sep 2012 03:37:53 -0400
In-Reply-To: <20120927132700.7e6ef4b714fb4a8251e68775@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Mikulas Patocka <mpatocka@redhat.com>, Alasdair G Kergon <agk@redhat.com>

On 09/27/2012 05:27 AM, Stephen Rothwell wrote:
> Hi Jens,
> 
> After merging the block tree, today's linux-next build (x86
> 64_allmodconfig) failed like this:
> 
> usr/include/linux/fs.h:13: included file 'linux/percpu-rwsem.h' is not exported
> 
> Caused by commit 62ac665ff9fc ("blockdev: turn a rw semaphore into a
> percpu rw semaphore").
> 
> I have used the block tree from next-20120926 for today.  This will also
> affect the device-mapper tree which is based on the block tree (of which I
> will also use the next-20120926 version).

Bah, sorry about that. I have fixed it up now.

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Wed, 10 Oct 2012 12:14:37 +1100
Message-ID: <20121010121437.4aa0979f4f680f16439e4955@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA256";
 boundary="Signature=_Wed__10_Oct_2012_12_14_37_+1100_BdUHvRyLD.8UUAyE"
Return-path: <linux-kernel-owner@vger.kernel.org>
Sender: linux-kernel-owner@vger.kernel.org
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Mikulas Patocka <mpatocka@redhat.com>, Michel Lespinasse <walken@google.com>, Andrew Morton <akpm@linux-foundation.org>
List-Id: linux-next.vger.kernel.org

--Signature=_Wed__10_Oct_2012_12_14_37_+1100_BdUHvRyLD.8UUAyE
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Jens,

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

fs/block_dev.c: In function 'set_blocksize':
fs/block_dev.c:135:2: error: implicit declaration of function 'prio_tree_em=
pty' [-Werror=3Dimplicit-function-declaration]

Caused by commit b87570f5d349 ("Fix a crash when block device is read and
block size is changed at the same time") interacting with commit
147e615f83c2 ("prio_tree: remove") which is now in Linus' tree.

I have added the following merge fix patch for today (this is a mash of
tow fix patches that used to be in Andrew's tree):

From: Andrew Morton <akpm@linux-foundation.org>
Subject: fs/block_dev.c:set_blocksize(): use mapping_mapped()

... instead of open-coding it.

Suggested-by: Mikulas Patocka <mpatocka@redhat.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff -puN fs/block_dev.c~fs-block_devc-set_blocksize-use-mapping_mapped fs/=
block_dev.c
--- a/fs/block_dev.c~fs-block_devc-set_blocksize-use-mapping_mapped
+++ a/fs/block_dev.c
@@ -132,8 +132,7 @@ int set_blocksize(struct block_device *b
 	/* Check that the block device is not memory mapped */
 	mapping =3D bdev->bd_inode->i_mapping;
 	mutex_lock(&mapping->i_mmap_mutex);
-	if (!prio_tree_empty(&mapping->i_mmap) ||
-	    !list_empty(&mapping->i_mmap_nonlinear)) {
+	if (mapping_mapped(mapping)) {
 		mutex_unlock(&mapping->i_mmap_mutex);
 		percpu_up_write(&bdev->bd_block_size_semaphore);
 		return -EBUSY;

--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

--Signature=_Wed__10_Oct_2012_12_14_37_+1100_BdUHvRyLD.8UUAyE
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAEBCAAGBQJQdMv9AAoJEECxmPOUX5FEvLYQAINj7W7rjbJyiumZjrISu73x
CreSTpfo+xZZpvdSlOiSy+5u1tmT7byQfalFynRG0kBVtn7CRxbzKDghRkscR+sM
m1+Mlg7mB96gDFULoXZwbEO/XVpDbKrJcFAuA8sNDpqZ+3kY+41q8T+idJ++EvBI
Yir1tIDQ6ZBbWMQ3n7nk408dIewjteEIFEE7NaE+cLah2Ew+TO7hiOR5WHM9GD5r
+siKa+u7Mv6xw5bj4ohtfNgYQKK85qpR6ZEIIdRhWuuE90Ou6sBjldf8LFw6L444
gjVlR50Z+ZCtLN69bvl9P7H12DYkMtv+fhPAnZ6MgdaD7CFOLYjqCd4EO1Nyzri0
5AYxc5O23PJxsjnOhv/qdmiwbOF4XTLqd6xm+ll7rRsqagecl0Znq/guRuJFoX1h
idNiD4OIGRK36jFiR87yRGd/pz9TvSDUw1tWsC7oYsX1RyXz4cHbQfwX87tJz1LW
Ab3seLQ6T0R0RuF6NMQYQykWr/qbGpP7vtzHc7KQZzmLiPUS8rzhfBIltLm+4T6t
M9QIzk7n7zddY70BQdzLiwnYXRKXqZfmxX0RqOKo5geuNS4fYad+GBzESJksAahG
OTUEBAcQd8Y7Xk7K3YoiP18K/H4axchKp3lyE6jsA24/Tns0tboFUEQEb4/N744o
8eADdUdkPwmFAimSaLfZ
=WaAV
-----END PGP SIGNATURE-----

--Signature=_Wed__10_Oct_2012_12_14_37_+1100_BdUHvRyLD.8UUAyE--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Wed, 6 Feb 2013 14:06:23 +1100
Message-ID: <20130206140623.04297c3ac2f0fa3437369ffe@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA256";
 boundary="Signature=_Wed__6_Feb_2013_14_06_23_+1100_CyaHjbJ=8D9xycG2"
Return-path: <linux-next-owner@vger.kernel.org>
Received: from haggis.pcug.org.au ([203.10.76.10]:50299 "EHLO
	members.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753785Ab3BFDGd (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Tue, 5 Feb 2013 22:06:33 -0500
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, josh.h.morris@us.ibm.com, Philip J Kelleher <pjk1939@linux.vnet.ibm.com>

--Signature=_Wed__6_Feb_2013_14_06_23_+1100_CyaHjbJ=8D9xycG2
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Jens,

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

drivers/block/rsxx/core.c:322:22: error: expected '=3D', ',', ';', 'asm' or=
 '__attribute__' before 'rsxx_pci_probe'
drivers/block/rsxx/core.c:513:23: error: expected '=3D', ',', ';', 'asm' or=
 '__attribute__' before 'rsxx_pci_remove'
drivers/block/rsxx/core.c:610:12: error: 'rsxx_pci_probe' undeclared here (=
not in a function)
drivers/block/rsxx/core.c:611:2: error: implicit declaration of function '_=
_devexit_p' [-Werror=3Dimplicit-function-declaration]
drivers/block/rsxx/core.c:611:25: error: 'rsxx_pci_remove' undeclared here =
(not in a function)
drivers/block/rsxx/core.c:51:8: warning: 'rsxx_disk_ida' defined but not us=
ed [-Wunused-variable]
drivers/block/rsxx/core.c:52:8: warning: 'rsxx_ida_lock' defined but not us=
ed [-Wunused-variable]
drivers/block/rsxx/core.c:219:13: warning: 'card_event_handler' defined but=
 not used [-Wunused-function]
drivers/block/rsxx/core.c:311:12: warning: 'rsxx_compatibility_check' defin=
ed but not used [-Wunused-function]

Caused by commit 8722ff8cdbfa ("block: IBM RamSan 70/80 device driver")
interacting with commit 54b956b90360 ("Remove __dev* markings from
init.h") from Linus' tree (as of v3.8-rc4).

I added the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 6 Feb 2013 14:03:13 +1100
Subject: [PATCH] block: remove new __devinit/exit annotations

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/block/rsxx/core.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/block/rsxx/core.c b/drivers/block/rsxx/core.c
index f752191..83dadbe 100644
--- a/drivers/block/rsxx/core.c
+++ b/drivers/block/rsxx/core.c
@@ -319,7 +319,7 @@ static int rsxx_compatibility_check(struct rsxx_cardinf=
o *card)
 	return 0;
 }
=20
-static int __devinit rsxx_pci_probe(struct pci_dev *dev,
+static int rsxx_pci_probe(struct pci_dev *dev,
 					const struct pci_device_id *id)
 {
 	struct rsxx_cardinfo *card;
@@ -510,7 +510,7 @@ failed_ida_get:
 	return st;
 }
=20
-static void __devexit rsxx_pci_remove(struct pci_dev *dev)
+static void rsxx_pci_remove(struct pci_dev *dev)
 {
 	struct rsxx_cardinfo *card =3D pci_get_drvdata(dev);
 	unsigned long flags;
@@ -608,7 +608,7 @@ static struct pci_driver rsxx_pci_driver =3D {
 	.name		=3D DRIVER_NAME,
 	.id_table	=3D rsxx_pci_ids,
 	.probe		=3D rsxx_pci_probe,
-	.remove		=3D __devexit_p(rsxx_pci_remove),
+	.remove		=3D rsxx_pci_remove,
 	.suspend	=3D rsxx_pci_suspend,
 	.shutdown	=3D rsxx_pci_shutdown,
 };
--=20
1.8.1

--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

--Signature=_Wed__6_Feb_2013_14_06_23_+1100_CyaHjbJ=8D9xycG2
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAEBCAAGBQJREcivAAoJEECxmPOUX5FErmcQAI5nPcNbfeCl0CC1mN+4Hd50
DISmjnNYvhHtPFVpDh6vF+OgZQ+8OPnA2sJ2XCUroVU5AtVUJWx6K3VtLOuI3xZF
VfRz13u2vJx7/GtuUkxuslpHB8s2P9W6Ar+D4jvXQiK2v8UOFF551h+IWzKBeGH/
qW/0lw5fDRkwPU56e9BlACDs3Pa44XSiG8TR9m9vTBi7Q+xbmte3baKmLf4GBZzm
VD7uuzxRWT6JGQ/Iuu1vuVrhkLq9YjfUICDO4jSJJymPob9QRBkrn2RRQIQCvCsO
RVgGMIMkac8+E0YecDY1nhf5bIk9O/9F4qJwPVb/ZBagbxcQW8tWZGU+OidpHxxv
x6UdPyYj3Kl67NVoPYhCdOXkzMVhRf1JA0YGxiE6H8FwLB4WMAMz62OQL+GEu4QG
1c3+zb9kuZPL1u7J0JO4kwRN2105RyEIrhz3qPi38hwCOez8tTd9YZWLMVIA24eP
JpZkgg6g7Pds8kl3be0kdbL6Bxyh/EOFicpFOsBMqrdJIgNRlOxOqyS2eO+hzDEN
23qUruXipgKzW+9DwSd6qSY8cxWrn769tlnZECjZBpoPk1GglXPHW6kw7u7vnnpg
MqXl/t4EUpQ0ngLRnNjnhzolAqNf3sjd9jKMFoh4bG/j93UfkI4v37DtLlS1syW/
bYVJDZE0JjoNA+LkzSqB
=IprU
-----END PGP SIGNATURE-----

--Signature=_Wed__6_Feb_2013_14_06_23_+1100_CyaHjbJ=8D9xycG2--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Wed, 6 Feb 2013 09:33:28 +0100
Message-ID: <20130206083328.GC15092@kernel.dk>
References: <20130206140623.04297c3ac2f0fa3437369ffe@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-next-owner@vger.kernel.org>
Received: from 173-166-109-252-newengland.hfc.comcastbusiness.net ([173.166.109.252]:57199
	"EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1752269Ab3BFIef (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Wed, 6 Feb 2013 03:34:35 -0500
Content-Disposition: inline
In-Reply-To: <20130206140623.04297c3ac2f0fa3437369ffe@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, josh.h.morris@us.ibm.com, Philip J Kelleher <pjk1939@linux.vnet.ibm.com>

On Wed, Feb 06 2013, Stephen Rothwell wrote:
> Hi Jens,
> 
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/block/rsxx/core.c:322:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'rsxx_pci_probe'
> drivers/block/rsxx/core.c:513:23: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'rsxx_pci_remove'
> drivers/block/rsxx/core.c:610:12: error: 'rsxx_pci_probe' undeclared here (not in a function)
> drivers/block/rsxx/core.c:611:2: error: implicit declaration of function '__devexit_p' [-Werror=implicit-function-declaration]
> drivers/block/rsxx/core.c:611:25: error: 'rsxx_pci_remove' undeclared here (not in a function)
> drivers/block/rsxx/core.c:51:8: warning: 'rsxx_disk_ida' defined but not used [-Wunused-variable]
> drivers/block/rsxx/core.c:52:8: warning: 'rsxx_ida_lock' defined but not used [-Wunused-variable]
> drivers/block/rsxx/core.c:219:13: warning: 'card_event_handler' defined but not used [-Wunused-function]
> drivers/block/rsxx/core.c:311:12: warning: 'rsxx_compatibility_check' defined but not used [-Wunused-function]
> 
> Caused by commit 8722ff8cdbfa ("block: IBM RamSan 70/80 device driver")
> interacting with commit 54b956b90360 ("Remove __dev* markings from
> init.h") from Linus' tree (as of v3.8-rc4).
> 
> I added the following merge fix patch:

Thanks Stephen, I merged it into the for-3.9/drivers branch and updated
for-next.

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Fri, 1 Nov 2013 15:01:53 +1100
Message-ID: <20131101150153.cc4b855937372d1670f2f4f8@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA256";
 boundary="Signature=_Fri__1_Nov_2013_15_01_53_+1100_LDmfcTyIsL9/_HlJ"
Return-path: <linux-next-owner@vger.kernel.org>
Received: from haggis.pcug.org.au ([203.10.76.10]:53968 "EHLO
	members.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1750708Ab3KAECE (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Fri, 1 Nov 2013 00:02:04 -0400
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org

--Signature=_Fri__1_Nov_2013_15_01_53_+1100_LDmfcTyIsL9/_HlJ
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Jens,

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

drivers/block/loop.c: In function 'lo_rw_aio':
drivers/block/loop.c:243:28: error: 'struct bio' has no member named 'bi_se=
ctor'
  loff_t pos =3D ((loff_t) bio->bi_sector << 9) + lo->lo_offset;
                            ^
drivers/block/loop.c:254:2: error: implicit declaration of function 'bio_io=
vec_idx' [-Werror=3Dimplicit-function-declaration]
  bvec =3D bio_iovec_idx(bio, bio->bi_idx);
  ^
drivers/block/loop.c:254:31: error: 'struct bio' has no member named 'bi_id=
x'
  bvec =3D bio_iovec_idx(bio, bio->bi_idx);
                               ^
drivers/block/loop.c: In function 'lo_discard':
drivers/block/loop.c:476:28: error: 'struct bio' has no member named 'bi_se=
ctor'
  loff_t pos =3D ((loff_t) bio->bi_sector << 9) + lo->lo_offset;
                            ^
drivers/block/loop.c:489:50: error: 'struct bio' has no member named 'bi_si=
ze'
  ret =3D file->f_op->fallocate(file, mode, pos, bio->bi_size);
                                                  ^

Basically caused by in incomplete merge between the block tree and the
aio-direct tree (see my previous email).

I was going to apply a merge fix patch, but I also got these:

In file included from include/linux/blkdev.h:18:0,
                 from drivers/block/ps3disk.c:22:
drivers/block/ps3disk.c: In function 'ps3disk_scatter_gather':
include/linux/bio.h:239:9: error: incompatible types when assigning to type=
 'struct bio_vec *' from type 'struct bio_vec'
   ((bvl =3D bio_iter_iovec((bio), (iter))), 1);  \
         ^
include/linux/bio.h:243:2: note: in expansion of macro '__bio_for_each_segm=
ent'
  __bio_for_each_segment(bvl, bio, iter, (bio)->bi_iter)
  ^
include/linux/blkdev.h:748:3: note: in expansion of macro 'bio_for_each_seg=
ment'
   bio_for_each_segment(bvl, _iter.bio, _iter.iter)
   ^
drivers/block/ps3disk.c:102:2: note: in expansion of macro 'rq_for_each_seg=
ment'
  rq_for_each_segment(bvec, req, iter) {
  ^
include/linux/bio.h:239:41: warning: left-hand operand of comma expression =
has no effect [-Wunused-value]
   ((bvl =3D bio_iter_iovec((bio), (iter))), 1);  \
                                         ^
include/linux/bio.h:243:2: note: in expansion of macro '__bio_for_each_segm=
ent'
  __bio_for_each_segment(bvl, bio, iter, (bio)->bi_iter)
  ^
include/linux/blkdev.h:748:3: note: in expansion of macro 'bio_for_each_seg=
ment'
   bio_for_each_segment(bvl, _iter.bio, _iter.iter)
   ^
drivers/block/ps3disk.c:102:2: note: in expansion of macro 'rq_for_each_seg=
ment'
  rq_for_each_segment(bvec, req, iter) {
  ^
include/linux/bio.h:240:45: error: request for member 'bv_len' in something=
 not a structure or union
       bio_advance_iter((bio), &(iter), (bvl).bv_len))
                                             ^
include/linux/bio.h:243:2: note: in expansion of macro '__bio_for_each_segm=
ent'
  __bio_for_each_segment(bvl, bio, iter, (bio)->bi_iter)
  ^
include/linux/blkdev.h:748:3: note: in expansion of macro 'bio_for_each_seg=
ment'
   bio_for_each_segment(bvl, _iter.bio, _iter.iter)
   ^
drivers/block/ps3disk.c:102:2: note: in expansion of macro 'rq_for_each_seg=
ment'
  rq_for_each_segment(bvec, req, iter) {
  ^
In file included from block/blk-merge.c:6:0:
block/blk-merge.c: In function '__blk_recalc_rq_segments':
include/linux/bio.h:174:25: warning: 'bvprv.bv_len' may be used uninitializ=
ed in this function [-Wmaybe-uninitialized]
  ((bvec_to_phys((vec1)) + (vec1)->bv_len) =3D=3D bvec_to_phys((vec2)))
                         ^
block/blk-merge.c:15:21: note: 'bvprv.bv_len' was declared here
  struct bio_vec bv, bvprv;
                     ^
In file included from block/blk-merge.c:6:0:
include/linux/bio.h:154:55: warning: 'bvprv.bv_offset' may be used uninitia=
lized in this function [-Wmaybe-uninitialized]
 #define bvec_to_phys(bv) (page_to_phys((bv)->bv_page) + (unsigned long) (b=
v)->bv_offset)
                                                       ^
block/blk-merge.c:15:21: note: 'bvprv.bv_offset' was declared here
  struct bio_vec bv, bvprv;
                     ^
In file included from arch/powerpc/include/asm/page.h:412:0,
                 from arch/powerpc/include/asm/thread_info.h:34,
                 from include/linux/thread_info.h:54,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:35,
                 from include/linux/time.h:5,
                 from include/linux/stat.h:18,
                 from include/linux/module.h:10,
                 from block/blk-merge.c:5:
include/asm-generic/memory_model.h:52:52: warning: 'bvprv.bv_page' may be u=
sed uninitialized in this function [-Wmaybe-uninitialized]
 #define __page_to_pfn(page) (unsigned long)((page) - vmemmap)
                                                    ^
block/blk-merge.c:15:21: note: 'bvprv.bv_page' was declared here
  struct bio_vec bv, bvprv;
                     ^

Some of this may be incomplete merge resolution on my part (help would
be appreciated), but some seems to maybe need more work.

I have used the block tree from next-20131031 for today.

--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

--Signature=_Fri__1_Nov_2013_15_01_53_+1100_LDmfcTyIsL9/_HlJ
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)

iQIcBAEBCAAGBQJScye2AAoJEMDTa8Ir7ZwVFSIP/R8g0xN5fVG7QrSvmbjm1XKE
sqtphDnrEXfkW9mX6j5lI0Z+y+kzrEwhMXGMA70G3eCJ08Qykri6NyAZ86YnWDSO
Wg3DoyQ9OPmjIzmbyC4rTQZN7nZLEXe4sStlewZolZTvhny9Dj2M1WZs8T5MVefW
FyWh9Tyub97d3sjGfQbCBd3tbwqPZ4fKjEQC2aZiaR8y5R4t2DKl+ERa803lvdfI
eAms+ScsIcnqUD+lzgpg9Sj9f/qZRsV7m+TieekAnrpa8Q/56KiXt2DUrJBOft5E
ro9/3glwvnEd4vyo9i5Yy6q903/yau/hhq0enMlCsx48R0t6ZOLzQluVC3i3MMXM
y5lHTMFAVBbXBflLad0bCaFvcy6AuORubmrHDLSZow1RDqvFBtvR4oZghl+pDy3Q
HA+c6FJ0tERAVgSTefqF/mmy8IqHSBVM+iQoA5vgWRfd6D8Q+CewFO5t+UPr77Gs
svyFGSF4SkCxaUU9p5jyxe8KeTKDHHKX/3mznAVE8qEhM5ezaGUxu71xdt7bMgWb
1nJME8IQ2by1oBvi8FynjPHK1CFX34oHYEUeQLvUDTT4Uhf2FW3XrDnviok7S90p
qpJF0fglAmtWDI1oLdVYQ+Yb7zoj2EV/1UhPxXKqM5GX/yEe4VKDnRqYyywKqBYW
eQz8LTEJcZw8asOcBkqJ
=CmHF
-----END PGP SIGNATURE-----

--Signature=_Fri__1_Nov_2013_15_01_53_+1100_LDmfcTyIsL9/_HlJ--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Mon, 4 Nov 2013 14:13:45 +1100
Message-ID: <20131104141345.b2699b2cc7cdc347c5735c5a@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA256";
 boundary="Signature=_Mon__4_Nov_2013_14_13_45_+1100_ovUmf_5AIKFA31xr"
Return-path: <linux-next-owner@vger.kernel.org>
Received: from haggis.pcug.org.au ([203.10.76.10]:56157 "EHLO
	members.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751305Ab3KDDN6 (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Sun, 3 Nov 2013 22:13:58 -0500
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Kent Overstreet <kmo@daterainc.com>

--Signature=_Mon__4_Nov_2013_14_13_45_+1100_ovUmf_5AIKFA31xr
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Jens,

[I merged the block tree *before* the aio-direct tree today ...]

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

In file included from include/linux/blkdev.h:18:0,
                 from drivers/block/ps3disk.c:22:
drivers/block/ps3disk.c: In function 'ps3disk_scatter_gather':
include/linux/bio.h:239:9: error: incompatible types when assigning to type=
 'struct bio_vec *' from type 'struct bio_vec'
   ((bvl =3D bio_iter_iovec((bio), (iter))), 1);  \
         ^
include/linux/bio.h:243:2: note: in expansion of macro '__bio_for_each_segm=
ent'
  __bio_for_each_segment(bvl, bio, iter, (bio)->bi_iter)
  ^
include/linux/blkdev.h:748:3: note: in expansion of macro 'bio_for_each_seg=
ment'
   bio_for_each_segment(bvl, _iter.bio, _iter.iter)
   ^
drivers/block/ps3disk.c:102:2: note: in expansion of macro 'rq_for_each_seg=
ment'
  rq_for_each_segment(bvec, req, iter) {
  ^
include/linux/bio.h:239:41: warning: left-hand operand of comma expression =
has no effect [-Wunused-value]
   ((bvl =3D bio_iter_iovec((bio), (iter))), 1);  \
                                         ^
include/linux/bio.h:243:2: note: in expansion of macro '__bio_for_each_segm=
ent'
  __bio_for_each_segment(bvl, bio, iter, (bio)->bi_iter)
  ^
include/linux/blkdev.h:748:3: note: in expansion of macro 'bio_for_each_seg=
ment'
   bio_for_each_segment(bvl, _iter.bio, _iter.iter)
   ^
drivers/block/ps3disk.c:102:2: note: in expansion of macro 'rq_for_each_seg=
ment'
  rq_for_each_segment(bvec, req, iter) {
  ^
include/linux/bio.h:240:45: error: request for member 'bv_len' in something=
 not a structure or union
       bio_advance_iter((bio), &(iter), (bvl).bv_len))
                                             ^
include/linux/bio.h:243:2: note: in expansion of macro '__bio_for_each_segm=
ent'
  __bio_for_each_segment(bvl, bio, iter, (bio)->bi_iter)
  ^
include/linux/blkdev.h:748:3: note: in expansion of macro 'bio_for_each_seg=
ment'
   bio_for_each_segment(bvl, _iter.bio, _iter.iter)
   ^
drivers/block/ps3disk.c:102:2: note: in expansion of macro 'rq_for_each_seg=
ment'
  rq_for_each_segment(bvec, req, iter) {
  ^

I am not quite sure which commit caused this (maybe ed2d2f9a8265 ("block:
Abstract out bvec iterator")?).  I have used the block tree from
next-20131031 again for today.

--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

--Signature=_Mon__4_Nov_2013_14_13_45_+1100_ovUmf_5AIKFA31xr
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)

iQIcBAEBCAAGBQJSdxDuAAoJEMDTa8Ir7ZwVL+QP/2sDT/b4yyta3syAHo7x7VTC
AptFX0cvvO4ztdMe2t+RXRaybTiLPl/Gh9k0uzLwV0dtk/bsyoudSgShcOyZUfPa
OGEaWZPRA/1Z5dxlyy9HKAT2keJDCPxjxL8kaHehfwytrngtMMcQUltO2f3HDjOk
aegUjiZx8+p2vnU9aWabZZ7Vc4pNVxrCHN6uPBm/u8N2rSubA/En4EXCW5hqEYau
MyhFdGcem209ebGP3HoMl9BBRRaYF4LoFLXlhgp/5dH5Qop6UP7n3F8c5rhkmnwM
AcHHasBlKePeoPcgDftg8Yw+NZjiERXDdD5HzdZEBmlIBSCIdESc6V98/eQmWAwF
CPiwjd1rlKkiOllQM9mfDt2zIZtF8BAiX61D10HOZxEXZZM4iuny4VlZ/OcKu2R9
UKN3DRzYzHpdRtvmTAjjXrOmzObXuSv+7+Jq2IdKJAFW49ELdQfBBn0rLDNr98gj
kCxdQdQ9qqtumQCA54k59/Qx/smB09BlGsd1pYP+NXPOmP1KylN6yjvs31UMbF+h
rx3KrvF9Fqkm4Hoh8rVTCpJN6b6gMOKXatrGagm6C6yM+kwW3ps0A2bNF55YrkCu
xhI/m31I+BEUaLuTpkxA7QgZScRempxh1iMwR77zUVPIhnv5IcMgz/A9EAZF3lUo
4MN6fsbOQ40V65jXHa+Y
=K/YD
-----END PGP SIGNATURE-----

--Signature=_Mon__4_Nov_2013_14_13_45_+1100_ovUmf_5AIKFA31xr--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Sun, 3 Nov 2013 20:23:41 -0700
Message-ID: <20131104032341.GD14163@kernel.dk>
References: <20131104141345.b2699b2cc7cdc347c5735c5a@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-next-owner@vger.kernel.org>
Received: from merlin.infradead.org ([205.233.59.134]:52812 "EHLO
	merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751963Ab3KDDXq (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Sun, 3 Nov 2013 22:23:46 -0500
Content-Disposition: inline
In-Reply-To: <20131104141345.b2699b2cc7cdc347c5735c5a@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Kent Overstreet <kmo@daterainc.com>

On Mon, Nov 04 2013, Stephen Rothwell wrote:
> Hi Jens,
> 
> [I merged the block tree *before* the aio-direct tree today ...]
> 
> After merging the block tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> In file included from include/linux/blkdev.h:18:0,
>                  from drivers/block/ps3disk.c:22:
> drivers/block/ps3disk.c: In function 'ps3disk_scatter_gather':
> include/linux/bio.h:239:9: error: incompatible types when assigning to type 'struct bio_vec *' from type 'struct bio_vec'
>    ((bvl = bio_iter_iovec((bio), (iter))), 1);  \
>          ^
> include/linux/bio.h:243:2: note: in expansion of macro '__bio_for_each_segment'
>   __bio_for_each_segment(bvl, bio, iter, (bio)->bi_iter)
>   ^
> include/linux/blkdev.h:748:3: note: in expansion of macro 'bio_for_each_segment'
>    bio_for_each_segment(bvl, _iter.bio, _iter.iter)
>    ^
> drivers/block/ps3disk.c:102:2: note: in expansion of macro 'rq_for_each_segment'
>   rq_for_each_segment(bvec, req, iter) {
>   ^
> include/linux/bio.h:239:41: warning: left-hand operand of comma expression has no effect [-Wunused-value]
>    ((bvl = bio_iter_iovec((bio), (iter))), 1);  \
>                                          ^
> include/linux/bio.h:243:2: note: in expansion of macro '__bio_for_each_segment'
>   __bio_for_each_segment(bvl, bio, iter, (bio)->bi_iter)
>   ^
> include/linux/blkdev.h:748:3: note: in expansion of macro 'bio_for_each_segment'
>    bio_for_each_segment(bvl, _iter.bio, _iter.iter)
>    ^
> drivers/block/ps3disk.c:102:2: note: in expansion of macro 'rq_for_each_segment'
>   rq_for_each_segment(bvec, req, iter) {
>   ^
> include/linux/bio.h:240:45: error: request for member 'bv_len' in something not a structure or union
>        bio_advance_iter((bio), &(iter), (bvl).bv_len))
>                                              ^
> include/linux/bio.h:243:2: note: in expansion of macro '__bio_for_each_segment'
>   __bio_for_each_segment(bvl, bio, iter, (bio)->bi_iter)
>   ^
> include/linux/blkdev.h:748:3: note: in expansion of macro 'bio_for_each_segment'
>    bio_for_each_segment(bvl, _iter.bio, _iter.iter)
>    ^
> drivers/block/ps3disk.c:102:2: note: in expansion of macro 'rq_for_each_segment'
>   rq_for_each_segment(bvec, req, iter) {
>   ^
> 
> I am not quite sure which commit caused this (maybe ed2d2f9a8265 ("block:
> Abstract out bvec iterator")?).  I have used the block tree from
> next-20131031 again for today.

Don't have ppc64 cross compiling handy, but the below should do the
trick.


diff --git a/drivers/block/ps3disk.c b/drivers/block/ps3disk.c
index 8d1a19ccff0a..c120d70d3fb3 100644
--- a/drivers/block/ps3disk.c
+++ b/drivers/block/ps3disk.c
@@ -94,7 +94,7 @@ static void ps3disk_scatter_gather(struct ps3_storage_device *dev,
 {
 	unsigned int offset = 0;
 	struct req_iterator iter;
-	struct bio_vec *bvec;
+	struct bio_vec bvec;
 	unsigned int i = 0;
 	size_t size;
 	void *buf;
@@ -105,14 +105,14 @@ static void ps3disk_scatter_gather(struct ps3_storage_device *dev,
 			__func__, __LINE__, i, bio_sectors(iter.bio),
 			iter.bio->bi_iter.bi_sector);
 
-		size = bvec->bv_len;
-		buf = bvec_kmap_irq(bvec, &flags);
+		size = bvec.bv_len;
+		buf = bvec_kmap_irq(&bvec, &flags);
 		if (gather)
 			memcpy(dev->bounce_buf+offset, buf, size);
 		else
 			memcpy(buf, dev->bounce_buf+offset, size);
 		offset += size;
-		flush_kernel_dcache_page(bvec->bv_page);
+		flush_kernel_dcache_page(bvec.bv_page);
 		bvec_kunmap_irq(buf, &flags);
 		i++;
 	}
@@ -129,7 +129,7 @@ static int ps3disk_submit_request_sg(struct ps3_storage_device *dev,
 
 #ifdef DEBUG
 	unsigned int n = 0;
-	struct bio_vec *bv;
+	struct bio_vec bv;
 	struct req_iterator iter;
 
 	rq_for_each_segment(bv, req, iter)

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Sun, 3 Nov 2013 20:32:19 -0700
Message-ID: <20131104033219.GE14163@kernel.dk>
References: <20131104141345.b2699b2cc7cdc347c5735c5a@canb.auug.org.au>
 <20131104032341.GD14163@kernel.dk>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-next-owner@vger.kernel.org>
Received: from merlin.infradead.org ([205.233.59.134]:52870 "EHLO
	merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751491Ab3KDDcX (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Sun, 3 Nov 2013 22:32:23 -0500
Content-Disposition: inline
In-Reply-To: <20131104032341.GD14163@kernel.dk>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Kent Overstreet <kmo@daterainc.com>

On Sun, Nov 03 2013, Jens Axboe wrote:
> On Mon, Nov 04 2013, Stephen Rothwell wrote:
> > Hi Jens,
> > 
> > [I merged the block tree *before* the aio-direct tree today ...]
> > 
> > After merging the block tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> > 
> > In file included from include/linux/blkdev.h:18:0,
> >                  from drivers/block/ps3disk.c:22:
> > drivers/block/ps3disk.c: In function 'ps3disk_scatter_gather':
> > include/linux/bio.h:239:9: error: incompatible types when assigning to type 'struct bio_vec *' from type 'struct bio_vec'
> >    ((bvl = bio_iter_iovec((bio), (iter))), 1);  \
> >          ^
> > include/linux/bio.h:243:2: note: in expansion of macro '__bio_for_each_segment'
> >   __bio_for_each_segment(bvl, bio, iter, (bio)->bi_iter)
> >   ^
> > include/linux/blkdev.h:748:3: note: in expansion of macro 'bio_for_each_segment'
> >    bio_for_each_segment(bvl, _iter.bio, _iter.iter)
> >    ^
> > drivers/block/ps3disk.c:102:2: note: in expansion of macro 'rq_for_each_segment'
> >   rq_for_each_segment(bvec, req, iter) {
> >   ^
> > include/linux/bio.h:239:41: warning: left-hand operand of comma expression has no effect [-Wunused-value]
> >    ((bvl = bio_iter_iovec((bio), (iter))), 1);  \
> >                                          ^
> > include/linux/bio.h:243:2: note: in expansion of macro '__bio_for_each_segment'
> >   __bio_for_each_segment(bvl, bio, iter, (bio)->bi_iter)
> >   ^
> > include/linux/blkdev.h:748:3: note: in expansion of macro 'bio_for_each_segment'
> >    bio_for_each_segment(bvl, _iter.bio, _iter.iter)
> >    ^
> > drivers/block/ps3disk.c:102:2: note: in expansion of macro 'rq_for_each_segment'
> >   rq_for_each_segment(bvec, req, iter) {
> >   ^
> > include/linux/bio.h:240:45: error: request for member 'bv_len' in something not a structure or union
> >        bio_advance_iter((bio), &(iter), (bvl).bv_len))
> >                                              ^
> > include/linux/bio.h:243:2: note: in expansion of macro '__bio_for_each_segment'
> >   __bio_for_each_segment(bvl, bio, iter, (bio)->bi_iter)
> >   ^
> > include/linux/blkdev.h:748:3: note: in expansion of macro 'bio_for_each_segment'
> >    bio_for_each_segment(bvl, _iter.bio, _iter.iter)
> >    ^
> > drivers/block/ps3disk.c:102:2: note: in expansion of macro 'rq_for_each_segment'
> >   rq_for_each_segment(bvec, req, iter) {
> >   ^
> > 
> > I am not quite sure which commit caused this (maybe ed2d2f9a8265 ("block:
> > Abstract out bvec iterator")?).  I have used the block tree from
> > next-20131031 again for today.
> 
> Don't have ppc64 cross compiling handy, but the below should do the
> trick.

Checked, works for me. Committed and for-next branch updated.

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Mon, 4 Nov 2013 14:39:51 +1100
Message-ID: <20131104143951.1c23224cf511123517395a17@canb.auug.org.au>
References: <20131104141345.b2699b2cc7cdc347c5735c5a@canb.auug.org.au>
	<20131104032341.GD14163@kernel.dk>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA256";
 boundary="Signature=_Mon__4_Nov_2013_14_39_51_+1100_hzCyGQ9xUeyRpUA7"
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <20131104032341.GD14163@kernel.dk>
Sender: linux-kernel-owner@vger.kernel.org
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Kent Overstreet <kmo@daterainc.com>
List-Id: linux-next.vger.kernel.org

--Signature=_Mon__4_Nov_2013_14_39_51_+1100_hzCyGQ9xUeyRpUA7
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Jens,

On Sun, 3 Nov 2013 20:23:41 -0700 Jens Axboe <axboe@kernel.dk> wrote:
>
> Don't have ppc64 cross compiling handy, but the below should do the

https://www.kernel.org/pub/tools/crosstool/

> trick.

That patch fixes it for me.

Compile-tested-by: Stephen Rothwell <sfr@canb.auug.org.au>

--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

--Signature=_Mon__4_Nov_2013_14_39_51_+1100_hzCyGQ9xUeyRpUA7
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)

iQIcBAEBCAAGBQJSdxcLAAoJEMDTa8Ir7ZwVEU8P/1OlkDBz4HppHAIeO3bnyjc0
/MtbBRMo8IFaTGUNeBpEB5i0Ku34fjVG93HpwBrwYzN7VlCwl7TWkKEQbDEHRza9
Xnxcc1wS1rIRoi5b+OIcUyJe4EC7Yo3ZvdLXm1h14R5vx3lsobDmz/yP9MacipZ+
PJJy11u2q4nA834hRwaga36UBXMtu1If1/M3sNpua80F1rxffna6z/IjgGr24zLE
02PeqniAFsJ1SFM39Q4p2tiOoUaZZQhEUGK4E6fp3J0Q/0g5/eqX7I1591ufr+xL
VRzrHwjlV19O7DrMzSrD10hfCVrvxmblIyiQEJm6PYqCoCceXc8QNiJHm8jd0rIB
6uXm7RicYZVMPhfxnHLQK8IsLI1F5/ajvQ5EJMI+H0wu7+6djiuIj2MR6pjAA3fb
6/bS7zpKUxGSQmlTsz7Yf3rvwPgeZWEAwZuxLamopEZDMj7LrP2GKWIijY5Dgx2n
lS2YL2A1aHfIb7hbmB8X1T1UUWSixvgmfY2679EqWk8SmrEtBC6glae6HPyU7dyq
nDm30AF+eriexSf+NEsYArVA2eqbMLRWj/1qbgMrPBvVJydOIAImN1dVMwVVma2F
hnYxTqHA6GMyNdIVbvoozHSdcw5Jf/oTkkQV60GJiRJf1tOU8ZOE9Lakdm3kRd7K
oYu9Kvy0P38IB2dMNG8Q
=/MUQ
-----END PGP SIGNATURE-----

--Signature=_Mon__4_Nov_2013_14_39_51_+1100_hzCyGQ9xUeyRpUA7--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Tue, 26 Nov 2013 13:30:01 +1100
Message-ID: <20131126133001.7cc9d05bdbd763ffa1e1dc4d@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA256";
 boundary="Signature=_Tue__26_Nov_2013_13_30_01_+1100_w/+ChGoWFVdsri4Y"
Return-path: <linux-kernel-owner@vger.kernel.org>
Sender: linux-kernel-owner@vger.kernel.org
To: Jens Axboe <axboe@kernel.dk>, Jaegeuk Kim <jaegeuk.kim@samsung.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Kent Overstreet <kmo@daterainc.com>, Chao Yu <chao2.yu@samsung.com>
List-Id: linux-next.vger.kernel.org

--Signature=_Tue__26_Nov_2013_13_30_01_+1100_w/+ChGoWFVdsri4Y
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Jens,

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

fs/f2fs/data.c: In function 'submit_read_page':
fs/f2fs/data.c:457:10: error: 'struct bio' has no member named 'bi_sector'
   io->bio->bi_sector =3D SECTOR_FROM_BLOCK(sbi, blk_addr);
          ^

Caused by commit 4f024f3797c4 ("block: Abstract out bvec iterator") from
the block tree interacting with commit 32cd69ef0893 ("f2fs: add a new
function to support for merging contiguous read") from the f2fs tree.

I added the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 26 Nov 2013 13:19:30 +1100
Subject: [PATCH] f2fs: cope with bvec iterator abstraction

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 728eedb1c0c6..8d31b83bfc89 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -454,7 +454,7 @@ alloc_new:
 	if (io->bio =3D=3D NULL) {
 		bio_blocks =3D MAX_BIO_BLOCKS(max_hw_blocks(sbi));
 		io->bio =3D f2fs_bio_alloc(bdev, bio_blocks);
-		io->bio->bi_sector =3D SECTOR_FROM_BLOCK(sbi, blk_addr);
+		io->bio->bi_iter.bi_sector =3D SECTOR_FROM_BLOCK(sbi, blk_addr);
 		io->bio->bi_end_io =3D read_end_io;
 	}
=20
--=20
1.8.4.3

--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

--Signature=_Tue__26_Nov_2013_13_30_01_+1100_w/+ChGoWFVdsri4Y
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)

iQIcBAEBCAAGBQJSlAepAAoJEMDTa8Ir7ZwV3KsP/j2keY3icILZfwAVbE8vzweU
XXAqq6H6hV2hawwBQZXyrvpl6TXR+LHjCtpQxk10mc8qmhNa/v2FaV58vadatUc4
SoxqT4EOBuXM9HmTlBdJZpRZgO0ho0IWtsq+8ZM/Tk/CV3GSNPD4UYGLPvTTnYSN
XIc0PWgvRXaaYZRfxf6Q7dJsEcdtR9JqZxffNfuE9bsL5Y9o/tlfZon+W4UxPXe4
ZxuRMt/FPITyBdJC0fiq/X75srDnaYXfG/7mIV8Rd4SlvKAIZ/FBSFxwiBFrNqB6
TZbd2PKAj7Xo2QxMh/7HRT+KaHO5tI4PIypZF2uYjAZQ8j1i7SronJXtDkI0n5PD
/bhrl9IM30Q3pAiheAfG52xdwq7hbkU/XaV0AFJBtD7rNH7+gJ4r7DsUkVtkXHmE
TfImBBYMDSyIlIlarJjidBN5QJgZnhyO47sXMq4MYtH6A97wF0ULf345wW7izMSF
6CfssrA67jpKZxQvJo2Ay6xYKrLn5yPshrDbyccMGX6xkk8EVEog6VcV1PlUPDhk
gur1DmYMGA8QcAiEv4seSwbgBLPKSsey7CaHV6t7t42RzgAvphrMYnuhYlkYfmW6
uGtsW6nHvwcgJ78fa+/x8tMqgUYH3o49kQpp1UDSCPMz9c02+olh41kt3a/ZXNGj
+njAog1O5Kh8jrpcq0Ly
=AaoT
-----END PGP SIGNATURE-----

--Signature=_Tue__26_Nov_2013_13_30_01_+1100_w/+ChGoWFVdsri4Y--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Tue, 11 Nov 2014 13:12:16 +1100
Message-ID: <20141111131216.3742d156@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/L.YyEyKKm3UkHSwFgiv2tvb"; protocol="application/pgp-signature"
Return-path: <linux-kernel-owner@vger.kernel.org>
Sender: linux-kernel-owner@vger.kernel.org
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Fabian Frederick <fabf@skynet.be>
List-Id: linux-next.vger.kernel.org

--Sig_/L.YyEyKKm3UkHSwFgiv2tvb
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Jens,

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

drivers/built-in.o: In function `cdrom_sysctl_handler':
cdrom_sysctl.c:(.text+0x156d92): undefined reference to `cdrom_mutex'
cdrom_sysctl.c:(.text+0x156da0): undefined reference to `cdrom_autoclose'
cdrom_sysctl.c:(.text+0x156dae): undefined reference to `cdrom_autoeject'
cdrom_sysctl.c:(.text+0x156dbc): undefined reference to `cdrom_debug'
cdrom_sysctl.c:(.text+0x156dca): undefined reference to `cdrom_lockdoor'
cdrom_sysctl.c:(.text+0x156dd8): undefined reference to `cdrom_check_media_=
type'
cdrom_sysctl.c:(.text+0x156e0b): undefined reference to `cdrom_list'
cdrom_sysctl.c:(.text+0x156e37): undefined reference to `cdrom_autoclose'
cdrom_sysctl.c:(.text+0x156e57): undefined reference to `cdrom_autoeject'
cdrom_sysctl.c:(.text+0x156e77): undefined reference to `cdrom_check_media_=
type'
cdrom_sysctl.c:(.text+0x156ea4): undefined reference to `cdrom_lockdoor'
cdrom_sysctl.c:(.text+0x156eb5): undefined reference to `cdrom_list'
cdrom_sysctl.c:(.text+0x15702e): undefined reference to `cdrom_mutex'
drivers/built-in.o: In function `cdrom_print_info.constprop.0':
cdrom_sysctl.c:(.text+0x1570f3): undefined reference to `cdrom_list'
cdrom_sysctl.c:(.text+0x157189): undefined reference to `cdrom_list'
drivers/built-in.o: In function `cdrom_sysctl_info':
cdrom_sysctl.c:(.text+0x1572c3): undefined reference to `cdrom_mutex'
cdrom_sysctl.c:(.text+0x1576dc): undefined reference to `cdrom_mutex'
drivers/built-in.o: In function `cdrom_sysctl_register':
(.text+0x157765): undefined reference to `cdrom_autoclose'
drivers/built-in.o: In function `cdrom_sysctl_register':
(.text+0x157781): undefined reference to `cdrom_autoeject'
drivers/built-in.o: In function `cdrom_sysctl_register':
(.text+0x15778e): undefined reference to `cdrom_debug'
drivers/built-in.o: In function `cdrom_sysctl_register':
(.text+0x15779b): undefined reference to `cdrom_lockdoor'
drivers/built-in.o: In function `cdrom_sysctl_register':
(.text+0x1577a8): undefined reference to `cdrom_check_media_type'

Probably caused by commit d01681d1457c ("cdrom: export sysctl code").
This build has CONFIG_SYSCTL=3Dy, CONFIG_BLK_DEV_IDECD=3Dm,
CONFIG_BLK_DEV_SR=3Dm, CONFIG_PARIDE_PCD=3Dm, CONFIG_CDROM_PKTCDVD=3Dm,
CONFIG_GDROM=3Dn.

I have used the block tree from next-20141110 for today.
--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

--Sig_/L.YyEyKKm3UkHSwFgiv2tvb
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCAAGBQJUYXCEAAoJEMDTa8Ir7ZwVtUQQAJNYcMamEpXrKpk5VaDkx/3j
aZp0Uv/6xHdMgEDjj28pX9ArK6NsTppv/AfbLTh9CgpZjTRWWMmkUc4bJOi/fwjk
MWU9HGTUcrSreNeUo/JIvAV5oY6Po/dyvQzIVFxRGlTSCVMLEXDojhdRvwP9SEkj
IN5eOKGwAv7IEnfLgTf96HXZ95IYX1kxXXUlwdN1ibS0jOWnajjxMlJf/kysq6wN
6cmMhle8jj7Fxh3ittWTH34rhcodjV7oRCjwMzQxoIIUcYI6Apd7n14EWR5Dc5ZZ
vt5fZgj+oinNduyFxXZbq7jP+Lw794ttNXfryQtZpkvrwjox7WlXKY9SRInz9Xjy
PrHZCoq6/S9XZfSvoLlbkgdwCw3onApmi/RUoIKFBGasNGP4RXfF/CxTZCSVHOCr
UWM9cTkc6kY00tyGBGt47Nd4Wk2bUZ8TXQvVr1sZTB2cYyKod5wsaQZr7zwd65NT
ROGFA1Lj+V+yjvkiGIUM5Lu6E624wy33qFCcyU+DykUuBCxLQDxVhV+EXiqfLgMk
nL0AtgsEc6oOXlAMsqII9SImqw2vqPbRKPQnIGqx3HQXfFU0qXt/+IuNzLVc8oL3
3SbMrGFB9G4LR5gr7Evxc/UDN4enL9rSgjT5RfR/4MsyAyMmUJgNolEGb6fI3coA
zDUEznC/uj6IVQRw0sMY
=XwRd
-----END PGP SIGNATURE-----

--Sig_/L.YyEyKKm3UkHSwFgiv2tvb--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Fabian Frederick <fabf@skynet.be>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Tue, 11 Nov 2014 12:20:19 +0100 (CET)
Message-ID: <318149421.176770.1415704819915.open-xchange@webmail.nmp.skynet.be>
References: <20141111131216.3742d156@canb.auug.org.au>
Reply-To: Fabian Frederick <fabf@skynet.be>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: QUOTED-PRINTABLE
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mailsec111.isp.belgacom.be ([195.238.20.107]:14239 "EHLO
	mailsec111.isp.belgacom.be" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1752832AbaKKLUW convert rfc822-to-8bit
	(ORCPT <rfc822;linux-next@vger.kernel.org>);
	Tue, 11 Nov 2014 06:20:22 -0500
In-Reply-To: <20141111131216.3742d156@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>, Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-kernel@vger.kernel.org, linux-next@vger.kernel.org



> On 11 November 2014 at 03:12 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
>
> Hi Jens,
>
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/built-in.o: In function `cdrom_sysctl_handler':
> cdrom_sysctl.c:(.text+0x156d92): undefined reference to `cdrom_mutex'
> cdrom_sysctl.c:(.text+0x156da0): undefined reference to `cdrom_autocl=
ose'
> cdrom_sysctl.c:(.text+0x156dae): undefined reference to `cdrom_autoej=
ect'
> cdrom_sysctl.c:(.text+0x156dbc): undefined reference to `cdrom_debug'
> cdrom_sysctl.c:(.text+0x156dca): undefined reference to `cdrom_lockdo=
or'
> cdrom_sysctl.c:(.text+0x156dd8): undefined reference to
> `cdrom_check_media_type'
> cdrom_sysctl.c:(.text+0x156e0b): undefined reference to `cdrom_list'
> cdrom_sysctl.c:(.text+0x156e37): undefined reference to `cdrom_autocl=
ose'
> cdrom_sysctl.c:(.text+0x156e57): undefined reference to `cdrom_autoej=
ect'
> cdrom_sysctl.c:(.text+0x156e77): undefined reference to
> `cdrom_check_media_type'
> cdrom_sysctl.c:(.text+0x156ea4): undefined reference to `cdrom_lockdo=
or'
> cdrom_sysctl.c:(.text+0x156eb5): undefined reference to `cdrom_list'
> cdrom_sysctl.c:(.text+0x15702e): undefined reference to `cdrom_mutex'
> drivers/built-in.o: In function `cdrom_print_info.constprop.0':
> cdrom_sysctl.c:(.text+0x1570f3): undefined reference to `cdrom_list'
> cdrom_sysctl.c:(.text+0x157189): undefined reference to `cdrom_list'
> drivers/built-in.o: In function `cdrom_sysctl_info':
> cdrom_sysctl.c:(.text+0x1572c3): undefined reference to `cdrom_mutex'
> cdrom_sysctl.c:(.text+0x1576dc): undefined reference to `cdrom_mutex'
> drivers/built-in.o: In function `cdrom_sysctl_register':
> (.text+0x157765): undefined reference to `cdrom_autoclose'
> drivers/built-in.o: In function `cdrom_sysctl_register':
> (.text+0x157781): undefined reference to `cdrom_autoeject'
> drivers/built-in.o: In function `cdrom_sysctl_register':
> (.text+0x15778e): undefined reference to `cdrom_debug'
> drivers/built-in.o: In function `cdrom_sysctl_register':
> (.text+0x15779b): undefined reference to `cdrom_lockdoor'
> drivers/built-in.o: In function `cdrom_sysctl_register':
> (.text+0x1577a8): undefined reference to `cdrom_check_media_type'
>
> Probably caused by commit d01681d1457c ("cdrom: export sysctl code").
> This build has CONFIG_SYSCTL=3Dy, CONFIG_BLK_DEV_IDECD=3Dm,
> CONFIG_BLK_DEV_SR=3Dm, CONFIG_PARIDE_PCD=3Dm, CONFIG_CDROM_PKTCDVD=3D=
m,
> CONFIG_GDROM=3Dn.
>
> I have used the block tree from next-20141110 for today.
> --
> Cheers,
> Stephen Rothwell=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
 =C2=A0 =C2=A0 sfr@canb.auug.org.au

Hi Stephen,

Problem is in Makefile:

obj-$(CONFIG_BLK_DEV_SR) +=3D cdrom.o
obj-$(CONFIG_PARIDE_PCD) +=3D cdrom.o
obj-$(CONFIG_CDROM_PKTCDVD) +=3D cdrom.o
+obj-$(CONFIG_SYSCTL) +=3D cdrom_sysctl.o

I tried cdrom-$(CONFIG_SYSCTL)=C2=A0 +=3D cdrom_sysctl.o
to add sysctl only when cdrom.o is created

but now

drivers/scsi/sr_mod.ko
drivers/ide/ide-cd_mod.ko
drivers/ide/ide-cd_mod.ko

can't find cdrom.c functions ...

Is there another way to do it ?

Regards,
=46abian

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Tue, 11 Nov 2014 08:27:41 -0700
Message-ID: <54622AED.9060205@kernel.dk>
References: <20141111131216.3742d156@canb.auug.org.au> <318149421.176770.1415704819915.open-xchange@webmail.nmp.skynet.be>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <318149421.176770.1415704819915.open-xchange@webmail.nmp.skynet.be>
Sender: linux-kernel-owner@vger.kernel.org
To: Fabian Frederick <fabf@skynet.be>, Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-kernel@vger.kernel.org, linux-next@vger.kernel.org
List-Id: linux-next.vger.kernel.org

On 2014-11-11 04:20, Fabian Frederick wrote:
>
>
>> On 11 November 2014 at 03:12 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>>
>> Hi Jens,
>>
>> After merging the block tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/built-in.o: In function `cdrom_sysctl_handler':
>> cdrom_sysctl.c:(.text+0x156d92): undefined reference to `cdrom_mutex'
>> cdrom_sysctl.c:(.text+0x156da0): undefined reference to `cdrom_autoclose'
>> cdrom_sysctl.c:(.text+0x156dae): undefined reference to `cdrom_autoeject'
>> cdrom_sysctl.c:(.text+0x156dbc): undefined reference to `cdrom_debug'
>> cdrom_sysctl.c:(.text+0x156dca): undefined reference to `cdrom_lockdoor'
>> cdrom_sysctl.c:(.text+0x156dd8): undefined reference to
>> `cdrom_check_media_type'
>> cdrom_sysctl.c:(.text+0x156e0b): undefined reference to `cdrom_list'
>> cdrom_sysctl.c:(.text+0x156e37): undefined reference to `cdrom_autoclose'
>> cdrom_sysctl.c:(.text+0x156e57): undefined reference to `cdrom_autoeject'
>> cdrom_sysctl.c:(.text+0x156e77): undefined reference to
>> `cdrom_check_media_type'
>> cdrom_sysctl.c:(.text+0x156ea4): undefined reference to `cdrom_lockdoor'
>> cdrom_sysctl.c:(.text+0x156eb5): undefined reference to `cdrom_list'
>> cdrom_sysctl.c:(.text+0x15702e): undefined reference to `cdrom_mutex'
>> drivers/built-in.o: In function `cdrom_print_info.constprop.0':
>> cdrom_sysctl.c:(.text+0x1570f3): undefined reference to `cdrom_list'
>> cdrom_sysctl.c:(.text+0x157189): undefined reference to `cdrom_list'
>> drivers/built-in.o: In function `cdrom_sysctl_info':
>> cdrom_sysctl.c:(.text+0x1572c3): undefined reference to `cdrom_mutex'
>> cdrom_sysctl.c:(.text+0x1576dc): undefined reference to `cdrom_mutex'
>> drivers/built-in.o: In function `cdrom_sysctl_register':
>> (.text+0x157765): undefined reference to `cdrom_autoclose'
>> drivers/built-in.o: In function `cdrom_sysctl_register':
>> (.text+0x157781): undefined reference to `cdrom_autoeject'
>> drivers/built-in.o: In function `cdrom_sysctl_register':
>> (.text+0x15778e): undefined reference to `cdrom_debug'
>> drivers/built-in.o: In function `cdrom_sysctl_register':
>> (.text+0x15779b): undefined reference to `cdrom_lockdoor'
>> drivers/built-in.o: In function `cdrom_sysctl_register':
>> (.text+0x1577a8): undefined reference to `cdrom_check_media_type'
>>
>> Probably caused by commit d01681d1457c ("cdrom: export sysctl code").
>> This build has CONFIG_SYSCTL=y, CONFIG_BLK_DEV_IDECD=m,
>> CONFIG_BLK_DEV_SR=m, CONFIG_PARIDE_PCD=m, CONFIG_CDROM_PKTCDVD=m,
>> CONFIG_GDROM=n.
>>
>> I have used the block tree from next-20141110 for today.
>> --
>> Cheers,
>> Stephen Rothwell                    sfr@canb.auug.org.au
>
> Hi Stephen,
>
> Problem is in Makefile:
>
> obj-$(CONFIG_BLK_DEV_SR) += cdrom.o
> obj-$(CONFIG_PARIDE_PCD) += cdrom.o
> obj-$(CONFIG_CDROM_PKTCDVD) += cdrom.o
> +obj-$(CONFIG_SYSCTL) += cdrom_sysctl.o
>
> I tried cdrom-$(CONFIG_SYSCTL)  += cdrom_sysctl.o
> to add sysctl only when cdrom.o is created
>
> but now
>
> drivers/scsi/sr_mod.ko
> drivers/ide/ide-cd_mod.ko
> drivers/ide/ide-cd_mod.ko
>
> can't find cdrom.c functions ...
>
> Is there another way to do it ?

The problem is, now you can have cdrom/sr modular, but cdrom_sysctl.o is 
linked in. That's just not going to work. Instead of jumping through 
hoops to make this work, leave the section in cdrom.c and hid it behind a

#if defined(CONFIG_SYSCTL)
...
#endif

at the bottom or something.

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Fabian Frederick <fabf@skynet.be>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Fri, 14 Nov 2014 17:19:55 +0100 (CET)
Message-ID: <1420366039.63212.1415981995308.open-xchange@webmail.nmp.skynet.be>
References: <20141111131216.3742d156@canb.auug.org.au> <318149421.176770.1415704819915.open-xchange@webmail.nmp.skynet.be> <54622AED.9060205@kernel.dk>
Reply-To: Fabian Frederick <fabf@skynet.be>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: QUOTED-PRINTABLE
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mailsec101.isp.belgacom.be ([195.238.20.97]:1582 "EHLO
	mailsec101.isp.belgacom.be" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S934046AbaKNQT5 convert rfc822-to-8bit
	(ORCPT <rfc822;linux-next@vger.kernel.org>);
	Fri, 14 Nov 2014 11:19:57 -0500
In-Reply-To: <54622AED.9060205@kernel.dk>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>, Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-kernel@vger.kernel.org, linux-next@vger.kernel.org



> On 11 November 2014 at 16:27 Jens Axboe <axboe@kernel.dk> wrote:
>
>
> On 2014-11-11 04:20, Fabian Frederick wrote:
> >
> >
> >> On 11 November 2014 at 03:12 Stephen Rothwell <sfr@canb.auug.org.a=
u> wrote:
> >>
> >>
> >> Hi Jens,
> >>
> >> After merging the block tree, today's linux-next build (x86_64
> >> allmodconfig) failed like this:
> >>
> >> drivers/built-in.o: In function `cdrom_sysctl_handler':
> >> cdrom_sysctl.c:(.text+0x156d92): undefined reference to `cdrom_mut=
ex'
> >> cdrom_sysctl.c:(.text+0x156da0): undefined reference to `cdrom_aut=
oclose'
> >> cdrom_sysctl.c:(.text+0x156dae): undefined reference to `cdrom_aut=
oeject'
> >> cdrom_sysctl.c:(.text+0x156dbc): undefined reference to `cdrom_deb=
ug'
> >> cdrom_sysctl.c:(.text+0x156dca): undefined reference to `cdrom_loc=
kdoor'
> >> cdrom_sysctl.c:(.text+0x156dd8): undefined reference to
> >> `cdrom_check_media_type'
> >> cdrom_sysctl.c:(.text+0x156e0b): undefined reference to `cdrom_lis=
t'
> >> cdrom_sysctl.c:(.text+0x156e37): undefined reference to `cdrom_aut=
oclose'
> >> cdrom_sysctl.c:(.text+0x156e57): undefined reference to `cdrom_aut=
oeject'
> >> cdrom_sysctl.c:(.text+0x156e77): undefined reference to
> >> `cdrom_check_media_type'
> >> cdrom_sysctl.c:(.text+0x156ea4): undefined reference to `cdrom_loc=
kdoor'
> >> cdrom_sysctl.c:(.text+0x156eb5): undefined reference to `cdrom_lis=
t'
> >> cdrom_sysctl.c:(.text+0x15702e): undefined reference to `cdrom_mut=
ex'
> >> drivers/built-in.o: In function `cdrom_print_info.constprop.0':
> >> cdrom_sysctl.c:(.text+0x1570f3): undefined reference to `cdrom_lis=
t'
> >> cdrom_sysctl.c:(.text+0x157189): undefined reference to `cdrom_lis=
t'
> >> drivers/built-in.o: In function `cdrom_sysctl_info':
> >> cdrom_sysctl.c:(.text+0x1572c3): undefined reference to `cdrom_mut=
ex'
> >> cdrom_sysctl.c:(.text+0x1576dc): undefined reference to `cdrom_mut=
ex'
> >> drivers/built-in.o: In function `cdrom_sysctl_register':
> >> (.text+0x157765): undefined reference to `cdrom_autoclose'
> >> drivers/built-in.o: In function `cdrom_sysctl_register':
> >> (.text+0x157781): undefined reference to `cdrom_autoeject'
> >> drivers/built-in.o: In function `cdrom_sysctl_register':
> >> (.text+0x15778e): undefined reference to `cdrom_debug'
> >> drivers/built-in.o: In function `cdrom_sysctl_register':
> >> (.text+0x15779b): undefined reference to `cdrom_lockdoor'
> >> drivers/built-in.o: In function `cdrom_sysctl_register':
> >> (.text+0x1577a8): undefined reference to `cdrom_check_media_type'
> >>
> >> Probably caused by commit d01681d1457c ("cdrom: export sysctl code=
").
> >> This build has CONFIG_SYSCTL=3Dy, CONFIG_BLK_DEV_IDECD=3Dm,
> >> CONFIG_BLK_DEV_SR=3Dm, CONFIG_PARIDE_PCD=3Dm, CONFIG_CDROM_PKTCDVD=
=3Dm,
> >> CONFIG_GDROM=3Dn.
> >>
> >> I have used the block tree from next-20141110 for today.
> >> --
> >> Cheers,
> >> Stephen Rothwell=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 sfr@canb.auug.org.au
> >
> > Hi Stephen,
> >
> > Problem is in Makefile:
> >
> > obj-$(CONFIG_BLK_DEV_SR) +=3D cdrom.o
> > obj-$(CONFIG_PARIDE_PCD) +=3D cdrom.o
> > obj-$(CONFIG_CDROM_PKTCDVD) +=3D cdrom.o
> > +obj-$(CONFIG_SYSCTL) +=3D cdrom_sysctl.o
> >
> > I tried cdrom-$(CONFIG_SYSCTL)=C2=A0 +=3D cdrom_sysctl.o
> > to add sysctl only when cdrom.o is created
> >
> > but now
> >
> > drivers/scsi/sr_mod.ko
> > drivers/ide/ide-cd_mod.ko
> > drivers/ide/ide-cd_mod.ko
> >
> > can't find cdrom.c functions ...
> >
> > Is there another way to do it ?
>
> The problem is, now you can have cdrom/sr modular, but cdrom_sysctl.o=
 is
> linked in. That's just not going to work. Instead of jumping through
> hoops to make this work, leave the section in cdrom.c and hid it behi=
nd a
>
> #if defined(CONFIG_SYSCTL)
> ...
> #endif
>
> at the bottom or something.
>
> --
> Jens Axboe
>

Hi Jens,

=C2=A0 =C2=A0It's already the case in current code so I'll drop this pa=
tch.
I've got a small question about another one:
(http://marc.info/?l=3Dlinux-kernel&m=3D141565102708591&w=3D2)

I was looking if there was a reason for calling

init_cdrom_command with 0 length in dvd_do_auth():

=C2=A0 =C2=A0memset(buf, 0, sizeof(buf));
=C2=A0 =C2=A0init_cdrom_command(&cgc, buf, 0, CGC_DATA_READ)
=C2=A0 =C2=A0 =C2=A0 =C2=A0
This doesn't impact setup_report_key/setup_send_key
calls -as those functions initialize cgc buflen again
depending on type argument- without DVD_INVALIDATE_AGID:
we call setup_report_key(&cgc, ai->lsa.agid, 0x3f);
where type is used for cmd[10]:

=C2=A0 =C2=A0cgc->cmd[10] =3D type | (agid << 6);

the switch(type) below doesn't have 0x3f case so we
go directly to

=C2=A0 =C2=A0cgc->cmd[9] =3D cgc->buflen;

I replaced the 2 lines above with

=C2=A0 =C2=A0init_cdrom_command(&cgc, buf, sizeof(buf), CGC_DATA_READ)

(as memset is already done during init_cdrom_command) but that would
change buflen in that case and subsequent cdo->generic_packet
behaviour or am I missing something ?

Regards,
=46abian

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Mon, 17 Nov 2014 14:44:15 +1100
Message-ID: <20141117144415.6af6c9d6@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/T6G/Cnpb4G3=+WCOXBQIoXo"; protocol="application/pgp-signature"
Return-path: <linux-kernel-owner@vger.kernel.org>
Sender: linux-kernel-owner@vger.kernel.org
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
List-Id: linux-next.vger.kernel.org

--Sig_/T6G/Cnpb4G3=+WCOXBQIoXo
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Jens,

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

ERROR: "blk_mq_free_request" [drivers/block/nvme.ko] undefined!

Caused by commit b94ebc3c7a0f ("NVMe: replace blk_put_request() with
blk_mq_free_request()").

I have used te block tree from next-20141114 for today.
--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

--Sig_/T6G/Cnpb4G3=+WCOXBQIoXo
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCAAGBQJUaW8VAAoJEMDTa8Ir7ZwViGwP/iLPwdUUtrC9UFEHEgIbLciq
yXNvVGWZysjavibjNxr+cdMchjqm8TDZW3IpGiQbgum8qNinaCccXj8wzSUOJchi
zYcKFQSn9XzaUhuErkCJa5V+b/WiFLnC2TpQI9fqDoz1qNF/FvN41AOlD8ESg19q
8OuvVZP0aP0cDByp+eJgiXSUZtm5HZuoiIAvDAjQQH2K0N2jnnieAMKWM4E7IOpP
EKtGqVwXC1CLq1bNnauNSs11VYbV4bDQTclGU7Doze9ppOIR0ororvXJ84Pp2rtS
9aqf9OidQVZvPnkmFTVGNaS06arrcPXBjfrVH57FGy43i/7nBRVNWvoEfiee5TuG
1yHLyqruYJ5l+7vUN7KvBnXTKycKQW13pu13/to2PBB/NGZvDTV1oultkzbMrZzr
GN5gTUh76gAr8Oc3pRcFgw5kgqBhpBMgyqjsxJPVr33YR8xQD8l5vp0QFTehB2cK
QAhS4hBho7BKnvXeSLTGMQEsYqqrkUca2qUkU5yel9zP7JeLW4wh4ZiTC4kCnHwI
BVq7DCjvMv3bJP4wpwzOgTkxyIr73MnvikYzugzAZiRCuJgMKA+EhzHeJnTD1yfB
bPknLmYRhJNft8Kh+HA9ylXlALfVeOVh87E+F+oezTIFznNACctIIVXSOZ5l0oxh
7M3mMHFIM69BC2ekMI3I
=E2fg
-----END PGP SIGNATURE-----

--Sig_/T6G/Cnpb4G3=+WCOXBQIoXo--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Mon, 17 Nov 2014 12:51:09 -0700
Message-ID: <546A51AD.50602@kernel.dk>
References: <20141117144415.6af6c9d6@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mail-pd0-f174.google.com ([209.85.192.174]:41826 "EHLO
	mail-pd0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751297AbaKQTvO (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Mon, 17 Nov 2014 14:51:14 -0500
Received: by mail-pd0-f174.google.com with SMTP id w10so2996354pde.19
        for <linux-next@vger.kernel.org>; Mon, 17 Nov 2014 11:51:13 -0800 (PST)
In-Reply-To: <20141117144415.6af6c9d6@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org

On 11/16/2014 08:44 PM, Stephen Rothwell wrote:
> Hi Jens,
>
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> ERROR: "blk_mq_free_request" [drivers/block/nvme.ko] undefined!
>
> Caused by commit b94ebc3c7a0f ("NVMe: replace blk_put_request() with
> blk_mq_free_request()").
>
> I have used te block tree from next-20141114 for today.

Thanks Stephen, fixed.

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Wed, 21 Jan 2015 14:45:58 +1100
Message-ID: <20150121144558.79cb2056@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/xTXcvTiRVXiAda2gd6Tm9Jj"; protocol="application/pgp-signature"
Return-path: <linux-kernel-owner@vger.kernel.org>
Sender: linux-kernel-owner@vger.kernel.org
To: Jens Axboe <axboe@kernel.dk>, Greg KH <greg@kroah.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Oleg Drokin <oleg.drokin@intel.com>, Andreas Dilger <andreas.dilger@intel.com>, Christoph Hellwig <hch@lst.de>
List-Id: linux-next.vger.kernel.org

--Sig_/xTXcvTiRVXiAda2gd6Tm9Jj
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Jens,

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

drivers/staging/lustre/lustre/llite/llite_lib.c: In function 'll_read_inode=
2':
drivers/staging/lustre/lustre/llite/llite_lib.c:1774:18: error: 'struct add=
ress_space' has no member named 'backing_dev_info'
  inode->i_mapping->backing_dev_info =3D &s2lsi(inode->i_sb)->lsi_bdi;
                  ^

Caused by commit b83ae6d42143 ("fs: remove mapping->backing_dev_info")
not updating the lustre code in the staging tree.

I have disabled the lustre code for today using the following.  Please
let me know if you fix the lustre code so that I can reenable it.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 21 Jan 2015 14:36:21 +1100
Subject: [PATCH] disable the lustre code for now

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/staging/lustre/lustre/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/staging/lustre/lustre/Kconfig b/drivers/staging/lustre=
/lustre/Kconfig
index 6725467ef4d0..37dd33f6597e 100644
--- a/drivers/staging/lustre/lustre/Kconfig
+++ b/drivers/staging/lustre/lustre/Kconfig
@@ -1,6 +1,7 @@
 config LUSTRE_FS
 	tristate "Lustre file system client support"
 	depends on INET && m && !MIPS && !XTENSA && !SUPERH
+	depends on BROKEN
 	select LNET
 	select CRYPTO
 	select CRYPTO_CRC32
--=20
2.1.4

--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

--Sig_/xTXcvTiRVXiAda2gd6Tm9Jj
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCAAGBQJUvyD7AAoJEMDTa8Ir7ZwVMZ4P+QGvKVp/QpLbIJg52ORh7rQ6
RJqX0T1aW3dQ41IpqBMBARjztctWxUinr93AwMVHSUPso1I1rA58c6R0r4ivpoAS
+an8UyMAJ67qG4r+ULnL9mnUjpRofPT/itKovR2OFJiLPKN7HAW5sVkFiG7KmogT
Ws8PSQL8JJmL4GNKWYikmiIdsYr2nt55pzdpLVoa9fZcj0yKPiEl2RrHpW8uYQqd
ACNhWHO842StArl8kE4vGtFMbUdtnf3jM2C7+pv+W41cppZMeLYBdlg9bZ5XEebj
nEJMyfILjopBAa+2reKM08NJWLgQT+/Qbn++90YtSKvAT/V1sdCdO9Nap3PT6Ows
2guEdmzM2HZOVuYKy9FOmOnzFIwUjye3rCQ+8lG4QPXNbAT56/Pn5bUKUbTTRQNr
wyjM8BGTmXgMo9fawVBccu+F8jOC6lfWNpcZxuHjLJGXKgJgmnP7Ran6VW9Ir4aB
gqbFOIgMdgMB8wNzGH7Ff3PfcagOR/glFqiR5E8bAT82akyyITiYYEC5Krc+QLfD
BQBE2qE0FlXAa6Ni1eJQt1bHy7G6jlcmhaCVh4usF9T9D+L+8qiqjU9LXPgtRTQu
u9Ljihyzv3DMy/l5tfLOdCGRhiGp0CbhJWLZux2jNA1u3zgwQxROUXeu2vyQaxTm
wbGfxPCJhqiHSfyWcTR2
=5urv
-----END PGP SIGNATURE-----

--Sig_/xTXcvTiRVXiAda2gd6Tm9Jj--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Mon, 9 Feb 2015 15:25:26 +1100
Message-ID: <20150209152526.1f2b749e@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/lIBdJTDjWUmiS_SVG5o_Yc_"; protocol="application/pgp-signature"
Return-path: <linux-next-owner@vger.kernel.org>
Received: from ozlabs.org ([103.22.144.67]:58279 "EHLO ozlabs.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753236AbbBIEZd (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Sun, 8 Feb 2015 23:25:33 -0500
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>, Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Tom Haynes <loghyr@primarydata.com>, Weston Andros Adamson <dros@primarydata.com>, Tao Peng <bergwolf@primarydata.com>, Christoph Hellwig <hch@lst.de>

--Sig_/lIBdJTDjWUmiS_SVG5o_Yc_
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Jens,

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

fs/nfs/flexfilelayout/flexfilelayout.c: In function 'ff_layout_mark_request=
_commit':
fs/nfs/flexfilelayout/flexfilelayout.c:1369:47: error: 'struct address_spac=
e' has no member named 'backing_dev_info'
   inc_bdi_stat(page_file_mapping(req->wb_page)->backing_dev_info,
                                               ^

Caused by commit b83ae6d42143 ("fs: remove mapping->backing_dev_info")
interacting with commit d67ae825a59d ("pnfs/flexfiles: Add the FlexFile
Layout Driver") from the nfs tree.

I have added this merge fix patch (assuming it is correct, someone
needs to tell Linus about this when the trees get merged):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 9 Feb 2015 15:20:12 +1100
Subject: [PATCH] pnfs/flexfiles: fix FlexFile Layout Driver for removal
 mapping->backing_dev_info

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

diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c b/fs/nfs/flexfilelayout=
/flexfilelayout.c
index f29fb7d7e8f8..c22ecaa86c1c 100644
--- a/fs/nfs/flexfilelayout/flexfilelayout.c
+++ b/fs/nfs/flexfilelayout/flexfilelayout.c
@@ -1366,7 +1366,7 @@ ff_layout_mark_request_commit(struct nfs_page *req,
 	spin_unlock(cinfo->lock);
 	if (!cinfo->dreq) {
 		inc_zone_page_state(req->wb_page, NR_UNSTABLE_NFS);
-		inc_bdi_stat(page_file_mapping(req->wb_page)->backing_dev_info,
+		inc_bdi_stat(inode_to_bdi(page_file_mapping(req->wb_page)->host),
 			     BDI_RECLAIMABLE);
 		__mark_inode_dirty(req->wb_context->dentry->d_inode,
 				   I_DIRTY_DATASYNC);
--=20
2.1.4

--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

--Sig_/lIBdJTDjWUmiS_SVG5o_Yc_
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCAAGBQJU2Da7AAoJEMDTa8Ir7ZwVCOYP/2+vvkx3AQSxOvJKyaBxOn6L
jEKSVhKRa0Xf7lj3E5k4RYicqaffkiGBnqfIblsqC2TCboMpKf+0shh02/CWFz76
+7+wveZJ8DPn4hK5WhHTiJiV0FpYND/aANOE1Ho0WIFd5SAaINLqiHIt6AMeiv/Q
gW3aNx9rdBve0Y01Xyt9OklxarG9rNU/yPoQiCI3r/5XNi63Xk3hXx5OAbJozlD2
WD76hNpB6oU1YeBBTKzdroETNIsvgokCPiW9mN60qHUhDenXMhKo3VzFQVjCNZh0
GSbQ0Q1yDsuPz2lKFFwANq55K5T5KY3Q1C2lIgnqm7XE2A5CxNxrLCy5iiDJ8GTM
IXnRCRYbzMGngqSm3P86RZFYqzy96Q/V3xPnzO4vXDODBQqguuyU4ggqGMzf69dp
xNBmqKYDREOz8fAGOEQi7dzOhaCKS7A7db1panv9B3Yzq5uV2QaJtJVMxu+uDRAL
h/YUt4qu93UIGJLAE4MZbsn5/yUB1iWwU7Q2cPm34gWkZuJswxMu49+XFr4Qrvmj
daOSx25PeQYu8TJ3rvE1a6j/s+zPHtJcxXr9FuPCeCmTptzMw31M2lLJ3bneVLnY
JDUPr9JTPxnUO/WEBQOMvpUJBx3o7uBE6hTzD4wRgHllRKaNVxCiiPnonDZzqELQ
8XbL5rWGq3q0sQFkZmBo
=rU1b
-----END PGP SIGNATURE-----

--Sig_/lIBdJTDjWUmiS_SVG5o_Yc_--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Thu, 30 Jul 2015 14:17:13 +1000
Message-ID: <20150730141713.001bf7d6@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from ozlabs.org ([103.22.144.67]:57749 "EHLO ozlabs.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1750759AbbG3ERP (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Thu, 30 Jul 2015 00:17:15 -0400
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig <hch@lst.de>, Greg KH <greg@kroah.com>, Oleg Drokin <oleg.drokin@intel.com>, Andreas Dilger <andreas.dilger@intel.com>

Hi Jens,

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

drivers/staging/lustre/lustre/llite/../include/obd_support.h:42:0,
                 from drivers/staging/lustre/lustre/llite/../include/lustre_cfg.h:225,
                 from drivers/staging/lustre/lustre/llite/../include/lustre_lib.h:55,
                 from drivers/staging/lustre/lustre/llite/lloop.c:105:
drivers/staging/lustre/lustre/llite/lloop.c: In function 'loop_handle_bio':
drivers/staging/lustre/lustre/llite/../include/linux/lustre_compat25.h:89:35: error: too many arguments to function 'bio_endio'
 #define cfs_bio_endio(a, b, c)    bio_endio((a), (c))
                                   ^
drivers/staging/lustre/lustre/llite/lloop.c:379:3: note: in expansion of macro 'cfs_bio_endio'
   cfs_bio_endio(bio, bio->bi_iter.bi_size, ret);
   ^
In file included from include/linux/blkdev.h:18:0,
                 from drivers/staging/lustre/lustre/llite/lloop.c:91:
include/linux/bio.h:442:13: note: declared here
 extern void bio_endio(struct bio *);
             ^

Caused by commit

  4246a0b63bd8 ("block: add a bi_error field to struct bio")

I added the following fix patch, but more is probably required:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 30 Jul 2015 14:10:57 +1000
Subject: [PATCH] block: lustre: temporary fix for bio_endio API change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/staging/lustre/lustre/include/linux/lustre_compat25.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h b/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
index 513c81f43d6e..1aac5a77c500 100644
--- a/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
+++ b/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
@@ -86,7 +86,7 @@
 		vfs_rename(old, old_dir, new, new_dir, NULL, 0)
 
 #define cfs_bio_io_error(a, b)   bio_io_error((a))
-#define cfs_bio_endio(a, b, c)    bio_endio((a), (c))
+#define cfs_bio_endio(a, b, c)    bio_endio((a))
 
 #define cfs_path_put(nd)     path_put(&(nd)->path)
 
-- 
2.4.6

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Christoph Hellwig <hch@lst.de>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 30 Jul 2015 08:19:51 +0200
Message-ID: <20150730061951.GA29312@lst.de>
References: <20150730141713.001bf7d6@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-next-owner@vger.kernel.org>
Received: from verein.lst.de ([213.95.11.211]:49298 "EHLO newverein.lst.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752856AbbG3GTy (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Thu, 30 Jul 2015 02:19:54 -0400
Content-Disposition: inline
In-Reply-To: <20150730141713.001bf7d6@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jens Axboe <axboe@kernel.dk>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig <hch@lst.de>, Greg KH <greg@kroah.com>, Oleg Drokin <oleg.drokin@intel.com>, Andreas Dilger <andreas.dilger@intel.com>

On Thu, Jul 30, 2015 at 02:17:13PM +1000, Stephen Rothwell wrote:
> Hi Jens,
> 
> After merging the block tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:

Can you please drop staging and especially lustre from these runs?
Conditions of the staging tree are they don't need to update.  Nevermind that
it never should have grown something as big and stale as lustre without
any prospects of being merged.

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 30 Jul 2015 22:24:30 +1000
Message-ID: <20150730222430.775c3079@canb.auug.org.au>
References: <20150730141713.001bf7d6@canb.auug.org.au>
	<20150730061951.GA29312@lst.de>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <20150730061951.GA29312@lst.de>
Sender: linux-kernel-owner@vger.kernel.org
To: Christoph Hellwig <hch@lst.de>
Cc: Jens Axboe <axboe@kernel.dk>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Greg KH <greg@kroah.com>, Oleg Drokin <oleg.drokin@intel.com>, Andreas Dilger <andreas.dilger@intel.com>
List-Id: linux-next.vger.kernel.org

Hi Christoph,

On Thu, 30 Jul 2015 08:19:51 +0200 Christoph Hellwig <hch@lst.de> wrote:
>
> Can you please drop staging and especially lustre from these runs?

One problem with that is that staging is expected to at least build.
and when Linus eventually merges this code in the block tree, he will
do an allmodconfig build and it will fail.  I don't really care about
how things get fixed in the staging tree (as you can see from the patch
I applied to get it to build) and sometimes mostly I just disable an
affected driver.  This was just as easy.

At least this way people know ahead of time that it needs an update.

> Conditions of the staging tree are they don't need to update.

See above - it is expected to build.  Linus himself asked me to make
sure that remains true.

> Nevermind that
> it never should have grown something as big and stale as lustre without
> any prospects of being merged.

You can have that discussion with Greg and the Lustre maintainers. :-)

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

From mboxrd@z Thu Jan  1 00:00:00 1970
From: "Drokin, Oleg" <oleg.drokin@intel.com>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 30 Jul 2015 14:38:24 +0000
Message-ID: <2253D7EC-7419-44B3-9C6F-B39552AC7DDA@intel.com>
References: <20150730141713.001bf7d6@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 8BIT
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mga11.intel.com ([192.55.52.93]:35845 "EHLO mga11.intel.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752644AbbG3Oi1 convert rfc822-to-8bit (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Thu, 30 Jul 2015 10:38:27 -0400
In-Reply-To: <20150730141713.001bf7d6@canb.auug.org.au>
Content-Language: en-US
Content-ID: <2AD5E4CA4C8F4A488B5DB6CCD9F687C8@intel.com>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jens Axboe <axboe@kernel.dk>, "<linux-next@vger.kernel.org>" <linux-next@vger.kernel.org>, "<linux-kernel@vger.kernel.org>" <linux-kernel@vger.kernel.org>, Christoph Hellwig <hch@lst.de>, Greg KH <greg@kroah.com>, "Dilger, Andreas" <andreas.dilger@intel.com>


On Jul 30, 2015, at 12:17 AM, Stephen Rothwell wrote:

> Hi Jens,
> 
> After merging the block tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/staging/lustre/lustre/llite/../include/obd_support.h:42:0,
>                 from drivers/staging/lustre/lustre/llite/../include/lustre_cfg.h:225,
>                 from drivers/staging/lustre/lustre/llite/../include/lustre_lib.h:55,
>                 from drivers/staging/lustre/lustre/llite/lloop.c:105:
> drivers/staging/lustre/lustre/llite/lloop.c: In function 'loop_handle_bio':
> drivers/staging/lustre/lustre/llite/../include/linux/lustre_compat25.h:89:35: error: too many arguments to function 'bio_endio'
> #define cfs_bio_endio(a, b, c)    bio_endio((a), (c))
>                                   ^
> drivers/staging/lustre/lustre/llite/lloop.c:379:3: note: in expansion of macro 'cfs_bio_endio'
>   cfs_bio_endio(bio, bio->bi_iter.bi_size, ret);
>   ^
> In file included from include/linux/blkdev.h:18:0,
>                 from drivers/staging/lustre/lustre/llite/lloop.c:91:
> include/linux/bio.h:442:13: note: declared here
> extern void bio_endio(struct bio *);
>             ^
> 
> Caused by commit
> 
>  4246a0b63bd8 ("block: add a bi_error field to struct bio")
> 
> I added the following fix patch, but more is probably required:

It looks like this in itself is enough, but we probably should be good to
kill those cfs_bio_* compat macros while we are at it.
I'll submit a patch, but not sure where to base it on.
If basing on current block tree's linux-next, then I get a bunch of errors about how
kstrto* are undefined, so I cannot really test this yet.

Thanks.

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 30 Jul 2015 14:10:57 +1000
> Subject: [PATCH] block: lustre: temporary fix for bio_endio API change
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/staging/lustre/lustre/include/linux/lustre_compat25.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h b/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
> index 513c81f43d6e..1aac5a77c500 100644
> --- a/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
> +++ b/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
> @@ -86,7 +86,7 @@
> 		vfs_rename(old, old_dir, new, new_dir, NULL, 0)
> 
> #define cfs_bio_io_error(a, b)   bio_io_error((a))
> -#define cfs_bio_endio(a, b, c)    bio_endio((a), (c))
> +#define cfs_bio_endio(a, b, c)    bio_endio((a))
> 
> #define cfs_path_put(nd)     path_put(&(nd)->path)
> 
> -- 
> 2.4.6
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/

From mboxrd@z Thu Jan  1 00:00:00 1970
From: green@linuxhacker.ru
Subject: [PATCH] staging/lustre/lloop: Update call to bio_endio() to match new prototype
Date: Thu, 30 Jul 2015 11:03:35 -0400
Message-ID: <1438268615-1685381-1-git-send-email-green@linuxhacker.ru>
References: <20150730141713.001bf7d6@canb.auug.org.au>
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <20150730141713.001bf7d6@canb.auug.org.au>
Sender: linux-kernel-owner@vger.kernel.org
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Christoph Hellwig <hch@lst.de>, Greg KH <greg@kroah.com>, Andreas Dilger <andreas.dilger@intel.com>, Oleg Drokin <green@linuxhacker.ru>, Oleg Drokin <oleg.drokin@intel.com>
List-Id: linux-next.vger.kernel.org

From: Oleg Drokin <green@linuxhacker.ru>

Also while we are at it, drop all cfs_bio_* wrappers.

Signed-off-by: Oleg Drokin <oleg.drokin@intel.com>
---
 drivers/staging/lustre/lustre/include/linux/lustre_compat25.h | 3 ---
 drivers/staging/lustre/lustre/llite/lloop.c                   | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h b/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
index 513c81f..c2a4ffd 100644
--- a/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
+++ b/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
@@ -85,9 +85,6 @@
 #define ll_vfs_rename(old, old_dir, mnt, new, new_dir, mnt1) \
 		vfs_rename(old, old_dir, new, new_dir, NULL, 0)
 
-#define cfs_bio_io_error(a, b)   bio_io_error((a))
-#define cfs_bio_endio(a, b, c)    bio_endio((a), (c))
-
 #define cfs_path_put(nd)     path_put(&(nd)->path)
 
 
diff --git a/drivers/staging/lustre/lustre/llite/lloop.c b/drivers/staging/lustre/lustre/llite/lloop.c
index cc00fd1..d614234 100644
--- a/drivers/staging/lustre/lustre/llite/lloop.c
+++ b/drivers/staging/lustre/lustre/llite/lloop.c
@@ -365,7 +365,7 @@ static void loop_make_request(struct request_queue *q, struct bio *old_bio)
 	loop_add_bio(lo, old_bio);
 	return;
 err:
-	cfs_bio_io_error(old_bio, old_bio->bi_iter.bi_size);
+	bio_io_error(old_bio);
 }
 
 
@@ -376,7 +376,7 @@ static inline void loop_handle_bio(struct lloop_device *lo, struct bio *bio)
 	while (bio) {
 		struct bio *tmp = bio->bi_next;
 		bio->bi_next = NULL;
-		cfs_bio_endio(bio, bio->bi_iter.bi_size, ret);
+		bio_endio(bio);
 		bio = tmp;
 	}
 }
-- 
2.1.0

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Subject: Re: [PATCH] staging/lustre/lloop: Update call to bio_endio() to
 match new prototype
Date: Fri, 31 Jul 2015 16:57:09 +0530
Message-ID: <20150731112709.GA8541@sudip-pc>
References: <20150730141713.001bf7d6@canb.auug.org.au>
 <1438268615-1685381-1-git-send-email-green@linuxhacker.ru>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mail-pa0-f46.google.com ([209.85.220.46]:35742 "EHLO
	mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751036AbbGaL1V (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Fri, 31 Jul 2015 07:27:21 -0400
Content-Disposition: inline
In-Reply-To: <1438268615-1685381-1-git-send-email-green@linuxhacker.ru>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: green@linuxhacker.ru
Cc: Jens Axboe <axboe@kernel.dk>, linux-next@vger.kernel.org, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Christoph Hellwig <hch@lst.de>, Greg KH <greg@kroah.com>, Andreas Dilger <andreas.dilger@intel.com>, Oleg Drokin <oleg.drokin@intel.com>

On Thu, Jul 30, 2015 at 11:03:35AM -0400, green@linuxhacker.ru wrote:
> From: Oleg Drokin <green@linuxhacker.ru>
> 
> Also while we are at it, drop all cfs_bio_* wrappers.
> 
> Signed-off-by: Oleg Drokin <oleg.drokin@intel.com>
> ---
Is it dependent on some other patch? This applies cleanly but is
breaking the build. "error: too few arguments to function bio_endio"

regards
sudip

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Oleg Drokin <green@linuxhacker.ru>
Subject: Re: [PATCH] staging/lustre/lloop: Update call to bio_endio() to match new prototype
Date: Fri, 31 Jul 2015 12:51:45 -0400
Message-ID: <0CCD5889-DAA6-4A16-B832-FB1307A868B6@linuxhacker.ru>
References: <20150730141713.001bf7d6@canb.auug.org.au> <1438268615-1685381-1-git-send-email-green@linuxhacker.ru> <20150731112709.GA8541@sudip-pc>
Mime-Version: 1.0 (Apple Message framework v1283)
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from linuxhacker.ru ([217.76.32.60]:41215 "EHLO fiona.linuxhacker.ru"
	rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP
	id S1751791AbbGaQwI (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Fri, 31 Jul 2015 12:52:08 -0400
In-Reply-To: <20150731112709.GA8541@sudip-pc>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Cc: Jens Axboe <axboe@kernel.dk>, linux-next@vger.kernel.org, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Christoph Hellwig <hch@lst.de>, Greg KH <greg@kroah.com>, Andreas Dilger <andreas.dilger@intel.com>

On Jul 31, 2015, at 7:27 AM, Sudip Mukherjee wrote:

> On Thu, Jul 30, 2015 at 11:03:35AM -0400, green@linuxhacker.ru wrote:
>> From: Oleg Drokin <green@linuxhacker.ru>
>> 
>> Also while we are at it, drop all cfs_bio_* wrappers.
>> 
>> Signed-off-by: Oleg Drokin <oleg.drokin@intel.com>
>> ---
> Is it dependent on some other patch? This applies cleanly but is
> breaking the build. "error: too few arguments to function bio_endio"

Yes, this is for block/linux-next specifically.
For current staging tree a corresponding one is 
http://www.gossamer-threads.com/lists/linux/kernel/2227687

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Tue, 6 Oct 2015 12:43:22 +1100
Message-ID: <20151006124322.2a50698e@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from ozlabs.org ([103.22.144.67]:54363 "EHLO ozlabs.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751441AbbJFBnY (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Mon, 5 Oct 2015 21:43:24 -0400
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig <hch@lst.de>, Ming Lei <ming.lei@canonical.com>

Hi Jens,

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

drivers/block/loop.c: In function 'lo_rw_aio_complete':
drivers/block/loop.c:474:2: error: too few arguments to function 'blk_mq_complete_request'
  blk_mq_complete_request(rq);
  ^
In file included from drivers/block/loop.h:14:0,
                 from drivers/block/loop.c:79:
include/linux/blk-mq.h:217:6: note: declared here
 void blk_mq_complete_request(struct request *rq, int error);
      ^

Caused by commit

  f4829a9b7a61 ("blk-mq: fix racy updates of rq->errors")

from Linus' tree interacting with commit

  bc07c10a3603 ("block: loop: support DIO & AIO")

from the block tree.

I added the this merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 6 Oct 2015 12:39:41 +1100
Subject: [PATCH] blk-mq: merge fix for "fix racy updates of rq->errors"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/block/loop.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index c692a3d812e4..9be61ad3163d 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -470,8 +470,7 @@ static void lo_rw_aio_complete(struct kiocb *iocb, long ret, long ret2)
 	else if (ret < 0)
 		ret = -EIO;
 
-	rq->errors = ret;
-	blk_mq_complete_request(rq);
+	blk_mq_complete_request(rq, ret);
 }
 
 static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd,
-- 
2.5.1

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

From mboxrd@z Thu Jan  1 00:00:00 1970
From: kbuild test robot <lkp@intel.com>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Tue, 6 Oct 2015 09:54:14 +0800
Message-ID: <201510060910.RcWMje2e%fengguang.wu@intel.com>
References: <20151006124322.2a50698e@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="VbJkn9YxBvnuCH5J"
Return-path: <linux-kernel-owner@vger.kernel.org>
Content-Disposition: inline
In-Reply-To: <20151006124322.2a50698e@canb.auug.org.au>
Sender: linux-kernel-owner@vger.kernel.org
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: kbuild-all@01.org, Jens Axboe <axboe@kernel.dk>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig <hch@lst.de>, Ming Lei <ming.lei@canonical.com>
List-Id: linux-next.vger.kernel.org


--VbJkn9YxBvnuCH5J
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi Stephen,

[auto build test ERROR on next-20151002 -- if it's inappropriate base, please ignore]

config: i386-randconfig-x006-201540 (attached as .config)
reproduce:
        # save the attached .config to linux build tree
        make ARCH=i386 

All errors (new ones prefixed by >>):

   drivers/block/loop.c: In function 'lo_rw_aio_complete':
>> drivers/block/loop.c:473:2: error: too many arguments to function 'blk_mq_complete_request'
     blk_mq_complete_request(rq, ret);
     ^
   In file included from drivers/block/loop.h:14:0,
                    from drivers/block/loop.c:79:
   include/linux/blk-mq.h:218:6: note: declared here
    void blk_mq_complete_request(struct request *rq);
         ^

vim +/blk_mq_complete_request +473 drivers/block/loop.c

   467	
   468		if (ret > 0)
   469			ret = 0;
   470		else if (ret < 0)
   471			ret = -EIO;
   472	
 > 473		blk_mq_complete_request(rq, ret);
   474	}
   475	
   476	static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd,

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

--VbJkn9YxBvnuCH5J
Content-Type: application/octet-stream
Content-Disposition: attachment; filename=".config.gz"
Content-Transfer-Encoding: base64

H4sICOgoE1YAAy5jb25maWcAjDxLd9u20vv+Cp30Lu5dpPErTnq+4wUEghIqkmABUJa84XFs
JfGpH7m23Cb//psB+ADIoXK7aTQzeA3mPaB//eXXGXvdPz1c7+9uru/vf8y+7B53z9f73e3s
89397v9miZoVys5EIu1vQJzdPb5+f3d3+vF8dvbb6W9Hb59vTmer3fPj7n7Gnx4/3315hdF3
T4+//ArUXBWpXNTnZ3NpZ3cvs8en/exlt/+lgW8+ntenJxc/gt/9D1kYqytupSrqRHCVCN0j
S6HTWqxFYQ0QWpHVVcGVFj2FqmxZ2TpVOmf24s3u/vPpyVvc95uWgmm+hJlT//PizfXzzdd3
3z+ev7tx53hxp6xvd5/9725cpvgqEWVtqrJU2vZLGsv4ymrGxRi3ZGtRZ8yKgm+tIgbnedX/
KIRIarOok5zVmSgWdtnjFqIQWvJaGob4MWJeLcbA5aWQi2Wwnjt9zrZ+ZyWv04T3WH1pRF5v
+HLBkqRm2UJpaZf5eF7OMjnXcC7gZMa2g/mXzNS8rGoNuA2FY3wJbJEFcExeiQG7jLBViVft
5mBasAGHWpTI5/ArldrYmi+rYjVBV7KFoMn8juRc6II5iSuVMXKeiQGJqUwpimQKfckKWy8r
WKXM4QKXTJMUjnksc5Q2m4/WcKJhalVamQNbEhBx4JEsFlOUiYBLd8djGYhnpFGgYSB4V9t6
YYbn9TJR8zRjgHzz9jOagLcv13/vbt/ubr7PYsDt9zf06lWp1VwEs6dyUwumsy38rnMRiE25
sAzYBkK9Fpm5OG3hnRqCMBhQ13f3d5/ePTzdvt7vXt79qypYLlCIBDPi3W8DfZT6z/pS6eA2
55XMEuCdqMXGr2e8rjmjtHAW7h4N0es3gLSDtFqJooYdm7wMzZC0tSjWcGbcXC7txelJi+Qa
5KDmKi8lyMKbbksNpLbCBCoHN8OytdAGBCwgDsE1q6waqMEKhBIM3OJKljRmDpgTGpVdhRYi
xGyupkZMrJ9dnQGis+nBrgjLPtjZcBRuKxw1xG+uDmFhi4fRZ8SOQMJYlYF2KmNRnC7e/Pvx
6XH3n+4azCUL+Gu2Zi1LPgLg/7nNAolWBqQ9/7MSlaCh/ZB+p8m8MuQZvESBzii9rZkFj7Ik
DpMuWZGE1qcyAuxwoN8V+OvBPTqldQjcEBiKcEchPFzQaQxo2Ozl9dPLj5f97qHXmM4TgQI6
E0A4KUCZpbqkMXwZijRCEpUzWVAwsM5gM+EI2/FcuZFIOYk4NK0znTEGYgYORtcuweMkkdU1
JdNGxGtxjAeMqmAMWHfLl4ka2umQJGGW0YPX4EoT9KQZQwe15RnBUGfV1v0FDt0xzufjooNI
tHYs4Sw0TxRZDhxiyR8VSZcrtP245da02ruH3fMLJStW8hXYVgHCEMrlFfpmqRLJQ2EsFGIk
SDgh+w4ZTAEuDFyDcZzRpt0JuPt39vrlr9ketjS7frydveyv9y+z65ubp9fH/d3jl8HeXIjB
uaoK66+82w2KhGN7jya2NTcJKgEXoL5AaMMZhrh6fUoqv2VmBUGkNSMN1LyamTFXSy1EXtoa
0EHsxiEi2gBfw9DUU8QrISVxEhwPu8gydGO5KuKZU1ZAaB34wB4IXp2lF8fnwTKwP0fgouKJ
teZKheKFoJXXPTifVBfHI+Im1nx/dNQvhchC8TleJMncli1g5wROQyUkLnCo57I4CSy/XDUZ
wgjiLjX07zhDCgZPpvbi+ENkfStIZ3woAiFv4pUssAMLrarShFfkQd4+0a7CE6TA4yuhD5GU
MpnwNu0aaxlfT09RgmuxB0cDCQo1SQKOjB/cfRMCH9w95HqH8I6hJME8WzVE9Pil4KtSQf6I
BsRC+kiZG4gVwOzzML6twDIW0WVhZFAYYjhwTw9o4TZo2kLYAamXFYwJp08BviDFDABsAQdT
nFBaFqdmyBa4chfa6iQOdTXLYTbvkYIYVSeD+BMAo+AOYJOBHeDioC4co0aznNEXxrucCJ20
yxmJOYchGhinAg6nkvAOvVLK5DgoOfiBYCW4KF0W6MzWYEzJTbnSdQnJPBYXAraWaf9jaIAH
K+UQikqUjWBxUIQczHI9cu7+hikw7nYEX8Evs83NGFJHdGBcCxtlTYGJE1laNwWVXnDjk1P2
E/KzOq3CVdLKiiD1F6WKziAXBcvSQAidG3eAbl0Xi6SUYAPLCb4sfcrZx7aSzhdYspZGtBNM
aa9LG8IdllzWf1ZSrwIOw4pzprUML9RVJRKRDOWnL121wUpTPyt3z5+fnh+uH292M/H37hHC
FQaBC8eABcKqwO1HU3TnaaoAiISN1+vcFQOIY61zP7p28YyPmnolg9yVWQgQV7S5yRhtrU1W
zSllzNQ8MmlbY0XuwuAakl6ZSu4qLsRQ8K6pzKIA3CmkM9nRnpUnpYyB43mLD8qDDaQucull
LsrPfEWDPOcfVV5CiD4XGSUwXSmko3cbcBVQUD8QdzToHEPBqc2KFHgi8XqqIh4xSCvwkjFi
gYgUQswofXUTSdDfnJXIx2EuuBqWbDxUC0siwOrSAzwUiyYpZSvdNh1iqdRqgMTiJmS4ejgp
wuG3lYtKVUQaY4D/mBs0CRpRYAN3uAW/jemSM6iujjxYRYsF2MMi8VXbhsE1K+WAjmfkvks5
zBwdbnkJiiOYjyoGuFxu4CZ7tHF7GHokjBfgGipdQDhrQT1CkzI0ICi9FJaYuDULujlwUuVD
eXH868V7WC1EEtQWw1JgS15idXjILA/1Ja0JXKKqicIpBlE+wW6LZMT+jOBooWpQXjtiDQQI
7nQo8YJDRBcZtiGSUMARDVxCIQ7OgsyuMjYRgI+oQRgVmUB6lR3nmhMqVWAtQjTlZqz8UnSu
FA1+ILjpXCVVBiqLxgOdvCYu2ngMaIfKx2V5rspto3u1zQI5g5ymAIsEx71kOgkQCpIq8PRN
8fx0hGCuy9N6wwVX67efrl92t7O/vGP89vz0+e7e5+wda5GsKfkR3OxO4shaYx/FCe4wrVHx
RmcpkKVBlGshUoP4JTR8LsYx6FsvjgZMHXLZV5JAG0Ir1aCqggT7ER2yT6RU0igF7ZWa4ZDn
d5XkuJA3opR0XtagUcc07aRaCXLJfQZ2vQrEa97ktd182TxhKRW6NUnI3CzC0R0wKmf2GYsV
Cy3tIJnheeJ6SM546FaOyuvn/R22Imf2x7fdSyg7QGili/AhBmQFJ7Om3CTK9KRBYJfKCOxr
pGpmbr7usGMRhmpS+RyuUCosdTbQBHQIdz7G8PTPi4cW2NauA/Ig6PM4XOBA2buZ9+LN7e76
FlRp1/dyTHEc5CmF6zWBfJQQVaAc8mGbrOv7MKvQx+r8ckCBtsWVvhM3jatxTpPoywFBU9Ho
7vH56Wb38vL0PNvDPbpa3ufd9f71Ob7TKzQ+yUT6CTHDRP85FQycrfB5fr8HROWlE6iQ2wgW
GwtWDNuKRCIUUfrOdFYaWmeRhOX9PEQdppeKtM7nMio5NLBxhSiYvrurpqOQMplVenSk0xPw
PJJSdi+NcM8WrgW7cC50iRzvFkILSKTAty2qqN8F3GNrqaNSaAs7UNfaCCoZWEHS0s7fx+nr
vMl6UprFmRviB5IE3X5+XuHtSAe1u0K5cuIg6czPPp7TBvb9AYQ1fBKX5xsadz41IXhbK6tc
yp+gD+Np+W6xdKUmX01safVhAv6RhnNdGUWXJnOXKIk4deyxl7LA/hKf2EiDPqUrh7nI2MS8
C6ESsdgcH8DW2cRN8a2Wm0l+ryXjp/UJ5YoQ9SESLyzOnNDzoF2esAdNuBPbOafQWB5r3mP4
+vV5SJIdT+Oa9zfgeTEyjKdGM19C9OVrrabKYzSIewxokoTzsyFYrQe2WRYyr3LXtkkh1cu2
F+9DvLMK3Ga5iXKApguDcbjIBKd6ADgjmE1/rCC4bcDuCqNXSy0GTDlBDlrCKj1GuBA+F5aR
c1U5j+DLUtiuTNG69jD3K9wLF3NxHJ7VN4cwg6FtX0OwVhkYPaa3ZA3G0YRVQz/IGcogbijd
6yZXQx6IQInZMh8BpRqDXd5IkEvVAiO3pYVWEJ67WnDzfAMtMWZRlC9zcsNHzg9A/rKnh8R3
6/x24Us0eVjzaKkxOTJLSG7GKFn8IfiAQ5mADGgLeVr4/K35Fe30+Jx+R2cVqOU8aCvLj6t4
CS2QManc+CZTaykkB30AxSdAnfz3dqVDATcoI9XhMa1zRiVlMbt7Evc8aDIqAq2dxIGYS9po
FwqbweCHSWyDOyNzb487P4sav+vclBkEPqfUkBZ5Qg45pgMIyMZVmhphL46+fzzy/w32EN9b
yYaVknK5hcg7SXRtfVVxgHfVqWl0CloKq9SiYMTrNhfvTqOdyWxDSUgDQ/soMxTjrI0P8TVD
JfoM+eDYdlM5KyoWyVy/I4+j3sL4wfFstXNnflz4qqebDtvsoZXxFTqRz+PYLgI3k4YTepZL
w5lOiOHNcSE4zliTLMZ14SZwBG1JlZueCsGdRJXWbcEZ+bNoeX9XLRnmE3bQXMaKPo9z2Fwu
NItBBySrza2Qt4uLoOs+By9AZiw+pobIuIqK4StDRSZtkppjtdo/OUn0xdnR7+ex/E0mMzG7
iSRneQlyaVwb8A8x0aumimpklzZ4UbqKYn6eCfALGCdRcqpVYZsqfT8izldbdsfF/KtSqUBb
ruZV0tcGrkzevvnsHXvzyhLYWdK5TDvK6UE/dVsNc9a57R9Mpf9wa0JrzPFdfd2bt8b/91kq
FuodBtsAK3o3PrNcjyq2zgKiengPOWG4Szty6S7arOeQImMTU1flRIfJu0aIXPFxtrq8OO80
C4Jo0Ky8GuttbjXtnBx3fNF0KhuPuNnHzhD0hiuIlE4QmtI37d2u6uOjI4pDV/XJ+6NIF67q
05h0MAs9zQVME1cFlhpfTkXqLTaCTmC5Zmbpmg6UYwTLIzHyA2nU6BuPG9fYPwoQGBo6qT40
3rXLYPxJ5FmbjuY6MSrWPV81BBtM+RXwUTLd1llixy3m0O42RmepbJlVi5GF9+gMm0vuBcLo
aVf59M/uefZw/Xj9Zfewe9y7AhfjpZw9fcPqZVTkakropCb4x+uYxGUZFuHDDlD/sj2w9+gF
k6CS2T/3QFQmRGSqAIYPURycuoO8vmQrMSjlhdDm9fRxeK8RfkH1qss8mm3QdMNNNRVcAuX2
2sH7kqlb1b/UpBOj3Dcta23pLdWqLKOVoi4h/O7aCu6RaeQCL/+EGOkS/Eff5238H73UYKru
YqYpVPAOBQUp/tWmG06ZzKiA778Lcd8F+D4SDinDb0McpGnj+5OgE4GpRt+0eMp4v34+yAJS
40eHvHFILda1WoNrkYnoPrSgLS6SC+5vOKVSPkfB+GiNObMQpFIexaMra0EhHiLgGvajBrCU
FaO5ExDmqYlduUILEIGom9/yxJcmZPS0O0YO4LLMh9fbz8MWCw13jU413rVdCp3HgbbfXWWs
Ah0zCR0h+SXdqzEvPt09TZNPVaf9XjnKhxrkw6h+wxcZfn8QQYGEC6pz6wgaIzyqLXhBnA9Z
jg2RmDMNB3JhlyoZUEOoU6GdWUKsfwlhYq2KbDuggX+Nnt07ESzFsFHfweMmfkgen97RLpYT
z1J6kjgK/gmxgID4ZyTaEOX6SAU3kHEselaW2BZSJQhf5HC45iNU79nioCcQBwbygHlSwKPQ
KSAavD7Eqs3zBu8iY4JE9Sltf8TS1w+HD80jAkjuyoxt63nGClKt0QVBKH1Zy+BFFz5CTp93
/33dPd78mL3cXN9HL85bMxAX/pxhWKj16N11h3TR+gMJhhsC3cjip1wtQZtg4eT4EAQ/iiym
X/wSg9BSGxDbiYLpaABehXs2+9P9qCKBLKOgSzrkCMBhyA7hzOH9DE4LjBvP+z8f7ueHmjoM
fcP9EWBfncx8HsrM7Pb57u+oowxkniNRntUnE6XzxpPls5LzdoopfWscVSOgcbsywMH/6ZeA
bhnkaQFaETeCSIoPA/PfIwbhS4z92GuCa21snOpD2B5etEu7SkjZIVzx1XgtCzWxpZ5Q8mU8
e48y+XBHZ74jmKtBvbflU+EedZzEE2aqWOiqiEcgcAlyHpOKXkK7pvjL1+vn3W2QIpB7jR5R
xCj3SS4+NGClT5dD0yVv73extYpjkhbiZDljSfRtdoTMRRF9eOLCSyyhmJ6Oq6rMyCcYXqKb
td3u5q8v7aFn/4bwYbbb3/z2n+BpLI8cJwYYC4WFADrQd+g89z8PkCRS090ij2ZFEAggCFeM
IX6GGNYuPKDscoYAyIv5yVEm/MPjwQkFRt2DDwrDvVRTZT23ByNHgPibuYgV0217xGr//XGb
GmO+OLEpY6voWfDSdW0miJkdcEO6dmC0dKmp+MFhmJGD59vt+0afgIMUfX162c9unh73z0/3
95COj6xu87V980C0L28Zqn5nOFYggrKz+73Uww4ey2TwNL4Q9v37o+Nw+oVQZFaTJ3UxD4+E
9efwd84lizmEEPcSrebkQw+cwRdrG6a8vbl+vp19er67/RI/tNliS5PidXL+4eT3iDsfT45+
p/rZfsPYmezq8L0kNDE8Xst4pIYLSGTwiXIDcEV4x1/3ddrREN1IpN7UdlO7+iUxBdyvKBaD
B1YddiIC7leocnwcCKdpHLq+/nZ3i+/C/rnb33wNZGo0tzXy/Qf6zUBLwktTbw6T4CznHw9s
EedYiGLgifDzknl77+L77uZ1f/3pfuf+/sfMfZCwf5m9m4mH1/vrgbeZyyLNLb4WDbsNEIlj
oa+L2fAx6VKwRIRPvZuhhmtZjlImvMMhJQnM4daDgFhhjjZ+1+zfqUkVlV/LnDtMpIAtG4rd
/p+n578wACOqcBACrgTlDaoiVGj8BXLJgsxok4ZfDOEv98c1BqDmw6A+iEGgqeYguJnkE21T
pPFdHSqO9VOgshnQtyhLwM/OVoKqhUjPkfZX6T9bar4a7rW87Gtwrh9PpedA5Hv1PGMmsseA
KYty+LtOlrwcrIJgTASp8mOD1kyX0YUCQpY9/z1kgRIq8mozJK1tVRQiI+ipKcJvqMN95u6k
dAl/W4CUqpWcyOL95GtLmT7EVUmwx2hUqujPXhtcfzjK+ONF1ywIeR1AmDJcRfrNTbYgHN7J
mV9oap3x/vuR2BhuGnFgo6dmCEj9XD8m0HMh7OBQmVYDiNPQeAbLyxYcbxL5jwjqEQaMgX8u
OmUIB3fIuaQqyh2aV3MZGLQOfimMvVQqIVBLywOR78FmAr6dZ4yYZi0WzBBw7Hy4wskYlZXk
PIUiT74VjPpTFh1eZhlkZtKQgxMO/zzIuCS4w+5vfdjYhrRw3CMpwi0BzHYQrwWZQ7bodlcX
b77ub769ic+TJ++n3t6D5lPZMgje4IMcgOBfvMGOYM70KjZjpS0bK5tux0PK5daFSeAL8jL6
vAQouo9qQvPhgQci/56Gek3vHefT8w6dKsQUewivJ/9SWD8VbG3i+4OeBhkj47/2NEDhN/kB
Gr9pLQrXiQ4Meuq+3G+KbqFZDchbVtMMCAl9b4Pad0iV2nJyKakpGxGR9K7ngcTD8V33uzAT
BEaO1rct06bO6DtGB2/E/7mlLovYuEjyBTKrh093j7vbWfMnnfoIMhxaN7IcDd1fP3/Z7adG
WKYXaNTD6jNFUKReEAhB64mIKz5ADbqcG9PG+u12IVi++RrnS4MjWvwrPJCO221JPy8ZUVMy
O6bysSGlCx2JqwxGjrfEP7JGh1NrM6Bcm8kcyGPh7sG//T9jT9fcNo7kX1Ht00zVzq4oWbZ0
VfsAkqCIiF8iKInKC8uXeG5ckzip2Nm5+/eHBkASTTasfciM1d34BoHuRn8oySpYWZ+Y6iwX
bz8eX16/f/vxBm5cb98+ffuy+PLtUUmWj18eXz4Bh/368zvg3TkzFYLXXNlNTn6SRt3L3m4Z
CpZqfub/6PIKdbM8YlEHuIyaqt+zeryvvRfQfDy1hzNWqEtdz6c7o20pbIl3sQl1PxlUeU6I
psKMOnRGJNG9mLrPDUq6vKSBuG9tBlQc+69HT5xM0dxN6ht319Yp8/j9+5fnT/oaWfzx9OX7
vGSRRM24Pv/1H11CCdzkNdMXMu3fgM/rCZVTDdg5K+zssgExZQqzhG4bNQdrNV8DaoCKRonP
/Znrro/CmM/fWzBnxd7l6wy0Zhe3prAW8Z4Dgofe81+VjKOomvLVUc9F21UGwCKKRPw6m3tc
UQdEq7nhhotez3gMXb0NpZA+fvoTvbj1Rafhvqr+Ax5FNPW7i8N9V4YfooI6HA1Fzypqaa5L
cxYBazeviaCTKaPdR7wlpjb8Lv2tHvxHLdcxtbANhMBztiT87nKuFrUT9NuPQzE5k8cngIay
j8tWjbOB4Fdv1uF2QMNx9Kx+qI3rhap37fR3J/a5Wm/wlJyE+LL4c8YK+9XQhorGBx72tnSs
7XWx7XIVoOeyEdrtzzU9FQ5NPqEZRIoIKWHMb6tnGcFZhnSo6iftGySqlmiENcy1XwJPW1ZV
GcdgUcVxNfnZ8SJCNo2rDVouVlExQaq0LJBgzjmHWdig82+EdkVm/9BhdZT0UjSkLbhTREIQ
u8atT+1/g/PoVoyDrL0qjj+ffj6pE+Sf1ql34nxu6bsopN4semzahFhvpIGJ6/TUQ3WksxlU
69uO8zpqjh45e7BM6I9yxB/fxTf8SM3qgA4TqlUlp1Fvdz06lnMRVepHwIbn86HFdT0H5kc9
PzN4lJYHPgcfk+O8vUj7HMxok6PFzApoD+zZaNOUDkY2LKSgNX8DPsMctNlVXx5fX59/t5wM
knWUKD/T1iqQeWnwTDvgm0gUMZ9oOAGhj447PBEATy5z2tMaBfiyoHcislkCv6Tcd0KeqdPO
Rd/Pu5OAjfbXeW3zGG/TyXJDc7m1uWeoVnlqQYmCmTgeTtxDBxXlExWzhRfhteFkZTCxVAlw
CCQRDW8bEhGxQsTUBmEeN4ceL0grlWHzi8Q5j+LIeW2MC4hcI8vsjFVFobrYmY6oQNRbVrw4
y4toXMMKB9ghHbuLOLfqkvSU4QU/O8XO5tB3dB7nXFvqnfNIuFh3MrSaCDxPfLOlCTxK37xy
A6DA5AGk20vnsNIQ+OqQtk1DFe8+eXBI5VT91pnBqkvZu5zZWn1x0ijpaCobKlGrB2tPODSH
xj7SePZH3YJNwbXDodzC4/Cibl/PFm9PrzjSqm7/0Kh1m37GcV1WXV4Wgo7Lk7K8Zubd18b2
+PTn09uifvz8/G3QKzhKImYYEedXF7OcQfSyM/4i6zJ3+1KXks+OZ9b+Y7VZvNhRfX769/On
J+o5Nz8IT6iHe3gyJMYVVkcO1rhjX0N2jcq8A0vGJG7drjmYNKbYOEtQsXl1vHJOqCtz7t3I
/bjUDy0AIkAYoRkC0P4yv8JYsYjNzMTzmYFC58jjUg9Imb2H9W5rZgM429AZpHBax2zQM/yI
GbVdRI3OGFEXmHUUNWiHPZV3ikmr2aBjgCaIN2NNafMdQHznTHpOHE2YAInHz0gTzDRxpvGX
33+AXdhvWt8226iaRor6nS0s6qa5dkAzE6+/vfzPlydHWWdLgE+XPKl1KK06YajrIGP28WPG
LYoczEHuNjuCQDeZUF21BU8y7JfWQqQS7xjYi6lizlUpIwy4iCIsixgDrQc1BsocwpRHk/Is
ExhwzmQPGQU7oesih5xH0ouTqR4UiQspXQRL1HFcV86bYQ+Zqjrq9sAcFVwiwq7GQasuAlIs
uI4JUbIHkQnZJBlZLNC5DXLaY7UvBl8lz0pwllTXMCSwwObJPVnN917V8kAU8boZokV2ZXHy
1xXxLIOQbF0KNtn0yeHSa1tIiOMiyJhw42iMYqYiZmhQVlB9MgE2WAaNxZ5Yxz3tRTF6JEUm
Qk1BcSFGsnXCOPUQHQKtjghEHYGnrWxQ/DcK27lZY0iCs49i8Ot9tyFL9a+/fX1+eX378fSl
++PtbzPCnMuUKJ9xN9DcAB5Xg6hH9u6oEy0QLq1NV9+ZbBAIYHohi05r0tc4jm0XoaC0pi05
CE9oNoOyAQUnjBDilnaUsBMxkaDtp36/Fz4c0Kqyyd3qYtUZ67ACvEq1QbHLC1gYRAVR98Y7
jfWEEBDGFSBIvTnSOaqfivveC1rjA9giEtMCCtSdGGlBAuh0XkKmMX4BsZzs449F8vz0BcLw
fv3686V/bPhFlfnVXk7u46SqqSo267Wr3QeFqICH91mbguIpbB13d7gODYKaJlVDSA0dB5UG
EyXqczaH4MXWvWtWgfo/m0LtfM9gnVjNFq5oK0B53lBUyXVyqYsNFKV0wpfBvsewIFP+cszn
8/zJghflnPc6mWjHKc8qcsepT6DJK3x49zAllJzoV4CGFTHLSjd6n/oMdEvqejeCp04oMOKT
izbBdbUOA6kobDTLEaeugpoNFI5/7lCPcXkyAyOacdGKpzR+wSOd8VsCda9jOenMgGasa0F/
pgPfXeO3J3mVTkw4cuWHDCLV6R3G3aUCS/JJihl1SiJ7TvO7Y9HuYdydFijcfA4WlufIjNgS
upldwB5Y5/CKIa1DgmaYFxEfwsMPngmz80B94RUEQMhtIIz+OCzVtp5GOwDDERvXl+YbG0og
jxtnaK7nb5mAAWqDU1ApIIRHgdCdCGgCPpAoG0oZwcB+ATGKI8x6YIxwNKVl0qHnDPU7j13N
rgJMK9AG/5NK7PWBYOCLOk9B57gym/DC2EW5B3ydADr88NVD1eckGH15jwW18ox69hgp5Enn
vZn1Q/fRWO8Tre8l6Y5usazdbh929/OhBKvt3bylotSDHOGuEa62wLVckOaXRseAufSsiLGf
lg3XOgN0xUmxN2GGHFh6XEJ7AKru+vyL+5LgAiOluukaUa1XHiP5jzWj40LpALLVEdwiZOcT
vWxLsTpd7unQGT3JyRd/qieI1JFrbM0oFY4lylC4WBeq4+OY4GtbovL6WjVlNokFOx9HHZLp
FPplCh1uYgCecyTd93DZUi4HPVbN+nwcCmiHENxTOM1M6/A/IwMZ16DaOjRRfKa6DukE4ADo
uJsrE6IQidK349L35qAOY2q0tcT7S38T+fPrJ+Ls54W6ACHshVxn5+UK1cfizWrTdnFF5iFS
V3F+xYeeCPOOSUdxV6WsMO4Lo/LGRJMREALKE0JmD85TEfUEqoTr3KT8QA/+CvjQeqJdikju
1it5t6SEUojKlXXS9c9Ql2ZWSoi2C86vcO074oXcbNabLk/2VUNDx1jGal4eJhTaA9NmtZC1
02aqLvXMuWCOoA6NSlGAksDRmlSx3Cm5jrn6fCGz1W65XE8hK9e3y65yozCbzdLRHllEmAYP
W6IAwB8Iet2T3bJ1hpBH9+uN82AUy+B+i17m7DtHCBwdfbDk1XK7cT5F/duy7P2O0uHlTs5T
DyjZ7FtLItnuDo0DfdrRCt+r5rfayIqK1d0q0DGIjIsRV5xOPlckGrjaNytH8rFAE7PE4YwN
WMnY99uHzYx8t45a5yKMwodgOUtnY6BevdOIVd+dVLwx6J2Ga7B5+t/H14UAhcXPrzpVi/XI
Hc0dIcr24rM6Gp6/w5+uQNKAAyQlUzhHhl0b8wABBmuPi6Tas8Xvzz++/qWaWnz+9teLtqQ0
RrVu/QxMWBiIKBXthqHPCTckxQBS/yho0zpg51VtUHu/vD19WSg+UfPBRhQbNM6RSAjwWCQF
70sfMgI3RKLCATSMmkep52WrzXTYfi/SZg5lFX1qAgnnlLWjSdoQo301YVdsj6XoVdmzjQ/I
buK3XjN1iuvsKKTZl3QkcF0cZYLWkNE43jEHg4aGYAqemo0gkgxbXffddtqEYP9F7eo//754
e/z+9PdFFP+mPjnHBXtgDBwmIkprA2vmsFK60KF0TcHAdSN2o+AMFe+RXqqH4uypeCKG28g3
D5F2T0WpNDU8K/f7iepQwyU8RzF5LeZ6JD2HTX80vE7WXkKoFZ0JBy9qEpFgof9LYSSTXngm
QsnoAtOtA1DIk4szIRtUXQ0t4NFn5UVndfZPeE9hJRw/IWlYrDGljHUAImGjGuFygD1lFFc3
oGOd9UwftNwNljwS+ALdNEgkA37TuC8XMat9HKliSMMSEq3UNZb1AaljvJFzANgKe9lZL5re
Qf118dfz2x8K+/KbTJLFy+ObOgwXz5An7PfHT07sBl0XS12N3QAac9i5AwOEyEkzQUBF/Mxm
9MeyFpQhnG5KrVcU3K/QW7bpg3YChwr80yBFtqJNsDU2oVKLuLGa+6Mjdw6jPNYp5xnaQAoI
Zy4V+9CiAlSDhixnoLvN/aRWbcNXsYba0wqtT2KkGQ59EUQH6S3v037Nxxk7PJmiGw97pNnL
vdtc1524mgmAKBlKfTfSjUmkwBVkmpGNjmCHDpG+fpMNxiacGh9cRiotrrpjVzBZsAqyBNOd
a1Il/qoL6iwgyc3kFIYaPXOnULzGXcyF/SpHEJjhj0F+vjoYWFsE+MhrPEnDOiOyAdodMw9C
TmdAZ7cl97xCGl02PcIkYwd+ndQGSfYab3WGu6erg9m4qMIcHfbW/Smi06UmJzkJ7GUgcMeR
fbDohHZm6Qszig2ySP38tlen+Wo7wYwXteEpOeeLYL27W/ySPP94uqh/v865sUTUHF7C0Rgs
rCt9h9VAIcOKingx4JH6c4SW8jp5ilTXVAkhU7X+3eN1Z5XnE9vG0o2JDLYO+LMD3YIjMR1P
LBMfZ16fkxVxEA1n6MboYdbluvdMfKe0oazLUxHXZShmxmAOjS+cLiaD6NZnDo8bp8pfGbyJ
KAl5GvlsnPIzsgICgBKgHEMPbIk4tT5UjQHHWGbYwAxbyWkLuFLn1i6aWv2BLFCb0K4qEgUE
WMtTGpuT0xv1ozvr5a8VQ925nThTOrGJhVOR5Z5EKqyOJs1bey8lg43CLmFKpJ+QG8/Ro5FS
hwedBF7DJKmkQiFolBmIszyaZQXPDWSJo6FmUpTsIBSLPo8mbV4Xn5Uw//zfP9+UFG9DtrAf
n/54fnv6BMmmqCFaV5AuP2+3/L71qJ5nVDaGeEWZF2hzQHRI4AcSqMwIQd06wuo/G+RnHW0e
aJZpJNjuSIJzWTecHkRzrVJateT0iMWsajgOt2pAOrQzHHc3KthzfPLyJlgHFDPqFsoaXk7i
sHLFdNLb2ahGGnmrJzmyqlY/t0EQwPJ4plaVXdNON3baizzyJRWCgE7tPvR7DrRw2NzocI3n
vY7ARJyeBECo8zc6QAqkG9XCfizRCy9rMnqgCkErigHhCbGpML6F8i17xGJ4fp3cl5SjkTMO
cy/hDya8o7+TMMphvmk7rLBo6dFHvi3XiH1ZrL2V0d+bCbDsiYKCxwXzgYZV0LK1mbus5TFT
G2qyN+Y1R+wsTjg80oBKeSYFjqZuQF1D74ABTc/DgPYkfh/QZ0rgc3smZIT65T0IorbjEaPX
OKYvXKedGJ9ymtE4Zbc+pniqkYuzlSfNtuKNPIyKUx8kKOAod0DIVzf7zj/CZ48mSUO6opLg
FawOYfCw66afAFFTyxDfKFce34Jz68mlMVSVnD6IRp6I+yzJzx+C7Y07IEXjSSs6GYJTYJbe
iNNFAOyI+fqn6zS9D9GPLr3k+C5SwDPtLSXUkU9p5+EmQNbnADDcp4+caFaD44g2N9VYX7fu
lvRZDQhPmSQPlp7AGcOEb1ebFu1VUU2TTQyoD/mN7ZKz+swznJ/qDJwSfQO3LLjfei9vedh7
wnUdrpQw5/ZDdYIVJRpXnrV3HfekDwTcVHZ2sZt3sfLiE7zdPomoxnv7ILfbO/rWAtQmUHXT
ituD/KiKtp5ojG6j1xpFxoTfwdIzrwlnWXHjiy6Y4tFyVKcF0Zeb3K63qxsf/Xa9WxInDGt9
l33BV4fp2Kelq6l8RIzlLGIckFOHBI45qRV0CpaHSTjbtPOxiRCy3nejm4CFRHDLlCk2IKWH
d+VgHpiIGzz/MSv3OILnMWNrnyx0zLxs0jHz7BbVWMuLblKO6MmJZWBZQ7IsEJq24QfMx9JW
MttgvfPEnAFUU9KHTL0N7nfv97BWVyo8wrhXZuo9lmp2vsHU1jGa+Pp+eXfjCwCmf+r0alGS
5YrrwM9a+hK5uUsl50e6SpHhBBky2q2Wa8pcBJXCMyTkznNNKFSw86C8+qu+lVxGxFkg82gX
RDv6sOSViAJfX1R9uyDwcPOAvLt1PMlGm22jwTc5yGq3l+A0SS5XVdece0wVYZk9VmoROH4W
niNWUAoLtxPXoqyU4IIGYGFdfNHD6I5kSGOnloanpwYdewZyoxQuAVHq1WXJPG5nDc1LOfWd
8XkNDl11KjyZVAELnk7RRNM+r/YiPhrlzlDWQLrLxrexBoL1LZ621X6KxKYGxKoidehx7DwN
xjxp28nPiaG0PCSOSlRJDTggNkjZNRjtk54d4M0cYoa6Sq/GqcRY0gmxUBCv1x9TZ3zRwKWb
Ojps1myX63bqYaFTq6fUeljmEVcSK3FXu8+6wCPwG9OKs7bxVBwJJYuzKf0ZnlAgETJZBtRR
amJEJHHTcGRgSK/CmNYfRvkDaBUn9bv47cM7eBFV2Ul60fbm9HTfZBVjk8mUjRKUWqSLBy9J
3gTLIIh8y6L51smqVIqtu3/AQJNGFiRWBE4EJDTAlBD2OhRNyIr9BLqvXLWqIVSzAFGBSWhf
YORwXSR8JDWnnZ8MYZSDPT6tdakyN0hxVeHEa1XVhTKext11sOo7zSaR/QA8j/+F0HlV0aeZ
RsLz5DQY5IgvJ415OCmghJBN3mZm1jIIC0jvC4KktS0yS9G1DiaMJsDA7B1tPGEnt4ExU3zR
UdAvz+DI98s8IPivi7dvivpp8fZHTzU7ri7MeTFXjejAWCMEXM7Qra1+g/892cke6eEFNHqm
/dLQhIyoABiz00wAy3+sNv/U8Zp6Uy9V5vPzK0zCZ5RfY7VcqoUZR6EG2TovXFWk7inFIzvf
JathJdG7tIxII2TVKfc6yiAfBWv/NTzsyrBA1w38HvYqJRY7EaHsDnAejHKQ+xzrXquD6vCD
t5DxfHeIl+8/37wWfaKo3GD1+qdxVf2KYUkC6bq00/UEA4+E5iEQgU0G40POqikmZ00tWovR
fTy9Pv34AtkkB7sg7OpvipUnyWkfUEPwobxOHiQNnJ99URl6PB2hAOZt5siHSh74NSxNQotR
D2FhHYurzWZLuRxMSHbjBI2Y5hA6xkED/KjuJW2LPW/v2KwCj8vHQBNllXwIyGeqgSY7HLBH
wYCBe+W9koDX24HT5ZuI3d8F9+93URFt74J3p81sIGLWsny7Xq09CO3qOm9PfbUP6w0lDo8k
kSTqzKs6WAUEouAXlJNxQEBEIFCKUbX1Mi2BacoLu7AriYK/JYqMMiJPhW8hlSivy703aCXP
VZwahPpu7zzLu1ab+d291Vyyu+V6SVTbNgfXl2fcsaxS+5VabBPtZX5EOO/R8LOr5AoxQz1Q
iVyVx39xIAGNkfp/Rd3fI5W6M1hlk1XMkNG1wh6ITu0i4WFZIlXPiNUhW3WS+hud5Oq+bjhp
G+X0kcMzAlZ/OW2Vpyg9iFstJWUEHLbHVnmkO+f6b2+HjHOiw71qqInkCD2ZYtRSb3YPd/Nl
jK6sop8QDR6mxuOybQjOUskjjE0bnHHQptv9Ok+r9NIpnu6di0ddWJDjhH5XMyQ6ki2dXkKj
YbakEka4w+Y4QDBArCAciWt65eJZ/LB9cC6gOQ573iB8HSh+5R289qvKW2S+gwhO6roQbeQJ
MeOShqeVEsjoJ1mXDmStsuBKUiy2a3yL0PTXbdTk+yCgFBaYsGlk1bud+Qm8s2HwdzdruPNX
EbPdcn3nx7meVwgH+7EufcuQsrySqfC85biUnJPKLUSyZxlr6X70L6eefuzLMhbU9eESKfZZ
7QRPAwIcQmjU/lR89Mw7R8ZyGFPSiAsD7cZlu1wGvtEYEvrscekU/xEE22VAN6RYj43RQpGN
5LkMAtJH0iXqz1SyCpG396esa0huABEWvBWe+cgPD4Fn8ymeRwem8MxwrESLZtMu733903/X
4Bt/o3/67wu20XTxpygM7kjFJOquPo88qx43Wj01CR+CSPLdQ3trD4OkD0qSUgqsC5kSmY/p
5mcJpBUrPohbUwSE6/9n7Eqa48aR9V/RcTpiOpo7WYc5sEhWFS2yyCZYi3SpUEvqtmK0OGT7
PfvfTyYAkgCYoHzwUvklFmJNALnU9E7A3ZT1C2DRH7q1HjHH4OBz7BeqkNcZjjfXWcqs7Djl
lz6+zMXN3y8xc28daXX59ey3TW8xUzc5P6Fzy48mEm/Mqlloaa+0g7c3fdfsdUFu3lUY9SMI
DfHDwi3m9VJ2KbuZtZZtBpZwDPXp+QN9zkU/yyICsOc4MQ2y3vV8yxJjHFU06LAPStsUY+ck
Ip1sa7VqWRQ68dmWyS1/IF8Q4TDy3+x2YXf3/sBtY8s/mivT0k53uEE4BzE4+M9LmTiBZxLh
b93cWZCzPvGy2HVMept22jFMUrNSHKI0alWukWrkIKIyaCSpyEowA6k2LH5kEgzAzuinTcnR
rpcZmgoaKm0ZPXFl6+DoMAuSHNu0LqTDlTHVQLvsWRhSVxQjQ6WIaSOxqA+uc+2SOW7qRHdO
IC7APt+9391jDJCZ04a+1+wwjrYoj6vk0vY3pseotmfSsKdCh05oHUj7NhIq6EMWM6L0juGF
kd62sL5ajA6nR9rmtrGpyFy2jH715Y6MLswW+wm+zPBqMgHXgAx3yOzx/enueX4NLqvOnQxl
qhGZBBIvdEgiFADH/CztC7zmGQzwCT7NeY0KZKZFhpa7ZjStZqdHkdYyJA2yFYZ9xz3Psf8E
FNpBv5Z1MbKQZRTnvtjnBd3B2gfQTwUqywYVHS06pgobTGs3sejsqHzlfmtq1ApHeW+vvyMD
UPgY4C8IRGAnmRd1Y2ryYBNVpS2QpuBhuwsjNdOGcjRbKIWoDAwzz0+WSSJh9Egl7WYXa5Zl
+7N9leQcblSyeLnRYbCsiy636TFIrnVWR/5yRnK7+NSnW9MxooX1IzZURvuI54zvMmfYCz7k
TDv67kfCXWvflQDesAqG8EdlwK/inKK5arkts6ayuKcb+qe/pGyxUjUKKq4fLudSW8xC0NEy
t0Yn31g77jRWe0Bvh0FLvskajzTSzMueomzrEkSffV7ptn+cDueeUjqjsyUVtofCt+1G+MFT
YTWsvCRcuAe/wSCZmTgrNwbphBEO8mY7rx5Gbmg2tC7y7rRgNnjsdOPFzl9FlKyKt6ZlpkaH
Zs3+pi2HtzXpwuCekCSmEXCzz3jwAHLPQON3jJcQaOowEzXQrifKdvDOTN+QnmxWdCL2/OyR
aXpnz5LYj37YGdCBtuWJCl+jxauqajV5FvTiyHQBZteSV64wBLfZrkALcdgYFdXEPoM/bW0Q
zACxnIR3B+JilJ5pClcJlH1BGrKpbPvDsdGemxDc6xqDSFou9IPCsm49+zpYMHz/tvUCOzK7
KSkq7v6KFtD0gwosyNUN+qJ8MSncjR5BbjbDmMdbt/lTt+paE11a8OZrQGzblqqoh1T+wgRt
oh2LEcBrm5RcaRDcQSrtJRyIIni30Bn7/vzt6cvz4w+YhVjF7PPTF7KesMesxWsqZFlVxV4N
ESYzFW8URvWQ3mbpKgwozVWd4weV2NAMUlDpmxX9m+p1YbXWS7z61bZZl/2c2Gap2kfjKRh9
Lk0NIdetK8gZ6J/R59L96FBkLrSLzEs39EO9ZpwY+WY1gHj2Dc46j8PIbBBBvbAgSSxBygQT
2lvaWq08h7vc06tQ4nWvVn7J1Fg+glL3OqUty7MedgxnP799oM6vvGtKOKeuQr10IEa+Y/Rh
yVbR2cz8aHF9IzHYJGfSNXcVQ/YQy+rJBxfOz59fvz2+XP2FzmgF/9W/XqCrn39ePb789fjw
8Phw9Yfk+h1k9nuYLL9pWiHY+OfzQh1Rk40/Cdg5uqxmPWnbhPMZVxU5zRRyXrByu+eOxXSp
3QBHpzVWBlWFyMDW6Q2cdcvKHJPFxpDSVGzrOcagKeri6Jl5WDZJPuzqrTkKPt0GcULrlSAM
5zGPWtD5itJHpiUVLrlcB8KSBFYI0tsPx872vgbMYvqDaFeqfoE55do/G/Nid6lh1dIjg4jJ
URuXujp82Ecg6HknW+HiaGHmeq7aleUgxOsH8tVsdhU/QIB7hUMrcPwhVse7h7sv37RVUcsm
Lxt8Aj9Y3qs5S7W3DajJ57De1tIxb2V5leH1b9ZNvznc3l4apnv7R7RPGwZCOxmoBuFyf8Pd
vP80F50W/VQZN0r8m5tvn8WuKttFWVdUH2ZcxEzVIGG8C/vD2hgMMvyS3tNIlJ4b7c3J/QlZ
TeMmFtwPP2CB9YcWlVvyJqHVjdDw96Vm9QX+5SIFJdOqpx/4oUk+4qaalcruO/qy5+TnJ3Qo
ObUvZoBC0Hj2aNlcvmlbTTCGn5YYQZhaFkHmcoEzC1r/Xg/iuJanBKu8pH1RTyxzz9oTJlf/
sT7/oAv/u29v73N5pW+htm/3/yXq2rcXN0wS4ft1am9UGY8CR1cE15nx7sJ4CjjhvYC4Y4RT
O1YQzRJGHpIweb+XxGZjbGycS3eOLXNCL7bSDHuU1XFwEunZDVNDmXCadI5vULnWHX/GF5Lx
48vb+8+rl7svX2Db5/vTbPLydHEw2XlMl+jt+MpATheOozBw3VgcDgiOuTCgMyzeBYpmPtFx
ZDlYwIZ+nrXPJnaTRNmK1EYjRAgBd0Tjl/obv6D1SRy51KUKh+VdqpFRdbM/c72zWRubm5KO
MvKBcIB8aLhZhjBgMos3H473IL+ST/YcPZ6TMDQqLzdbRdDko+nxx5e714f5eJJKurOGS/M9
pfOnjF3H6DJO1X0HCn1YPGz5lEqAhDdJGBMtc3ZDh3Dgvck/+KCuvIVRPssv625Yz28Wj9bh
IDxUG98lFYt+zokzThAkZuV+Sve3l76nbx7El+Lr7cIQsGqVCni8dp4VzV9uV6Rml4rP6yy1
VO11squScPhUJ35ojg8grlbBdCtXzvvRGILWg6VYrfrkPB82o2N16+CtLmWzM+qmbTJipueZ
71ETtkHrs4oIgYe6BosjcxLeFIsMLWDbyb0YqwHP2f39/5/kHUF9B8dBzW7FHQKKolK47t1g
wnLmBRbrW53Jcs5XSjlTwoSaiXuq1e8bAFWQkB/Enu/+71H/FiFhoiMj7fAzIswWs2HkwK9w
qKdpjcP1jYZSEtP6+RqPR8W11zh8RZ9NB3wrAGtUpjXdCMaRYwESK2COrBFKCoe6Rx9Z1n96
sW74iXf4GAilrbQnd5W+EL6sRTtLZCUKhU0jWXmhwJUv4QuIpGr3p6y35rVOexhoN1N7jclU
JKFWLY1B00/QEOqYODCwNaPSYWOeSYW4MWdUaqWry3eehaSoOhnj88NPC6LHBN+hP9AOd9zQ
iXxqCA8sJWsx+ZTvAPD+cjRDkgEiNg2Do2qT2Ivnmer2nVNR6N6oI+vgBmFMZIQiSBytfCoz
qLcabkoHEuqDePwJOExbwkBKLujgwA2pDtY4Vg5VBEJeGH+QOOYyCZUYBIOlBofK+wHRTkKl
i64SxzyXqtMwuLbpYVtcqj7zVoE7H3vbpso3JVP22AHp+tDxycHT9asgpF9n03PrOWfrrBeL
EJztdFt9hbx4rlH5LNeCJgv+t0+10FQKB28WVV5UwcWU4ixg+wiBLr+nakWJu7wPvuf2bC7z
6VE5oA2+qtSfIMdo9n6CKG99DCeFQuFEuDwndI1kGJV12R+2h+6gKtgZkE9geRy4gYWuTegJ
qdFgg9RBUTlCXdVEhaIPE6+sJZPOVBSOlRdQQWbyPj67FiBwHbo4hJaLA47Ioz8UoJhaVnSO
kKgSy+LIc6lcrxP0kbiQ6bXrIIeqAiSATVq74c6UEKYYPG1VsDqjKoP+K4gU/bl15+ScRZ5D
1RxD+CwOmhwdVLC6JhPzLRxajJKaNSaiOcvwGg5Ba6JJYjdxwg0NJN5mSyGhH4eMGi0blu1q
MhSDZNhWoZuoAa0UwHNIAASwlGoPACiBZoT5hZBqjTIgu3IXuT4xDcp1nRb1/IOB3uoOF6dm
pa9UBhyvrvlQJNoK75MsOkSC4VMWLH0gjOLO9Txy1vJIB6TzxZGDb7nk8gQQiCFLwxQ5PJcY
ZhzwPLJKCAXhR7lGxDQTADHRUHyLnCi0IC65gHIooo51Kocq4Cn0KPJtmUbRYndxjpD4Og7w
4qhcfTcm5bJxMPcH1XB6TJm1vkMvn1UdUfL6BMfEDglUeqzUMSXeKXBCJyPPTgrsE8OgToie
BirRVVW9ogYSbIwkL1kaiF5+QA5lhEitEJ2DmCBC8YpYexAI1BPNAOz7TFxilKxviF1rn/Uw
mokuQyCOQ+oDAILDq023cuJZkaf7qcqbJFwp07KttXi3I59UaiFFGS9eXBJqD86XEbkkeKuY
FM0kRAdUpxeQgBqjgHlOvLgO4vwMgoDc6/E0GJEuK8bggS0L4Fztzb/ukOUr7dpEBTyHXPJv
q4j2ZTt2w6mm90O2611iYgHZI9ZcIGfEgjNTjxklkrpwYz+mmqioMxfO+Qt1Bg7PdYjBDUB0
8nSL0bEqNcuCuF7quIFlRTS+wNY+tQOAeBNG57MM5UoWjhze0prIOfyIyLyuYYegpPPM9ZI8
ccmlNAWh0nFt2sgjT5x4S2MxhfZMPLI5y33qOZRPD5XhTIpHfRYvLSD9rs5CcvL0det+sD5x
lqWxAwwBPUAQWRTD0bNf1h5skhvAURKlSxn0rucSs+TYJ55P7sqnxI8Td0l0Ro6Vm88HLAe8
fF4aB4jJw+nEQBN0XCSyvqsstaziJLTEKte5oj2l/qjwwDTZEQcPgRQkNDwGUfpx81GPeqm2
u57pCHftuKrxHt9rU+3rJUlcT5BfPnA0lKP6AcSoSuiC4tJ3pa63MXAMsW63DQZNLNrLqbTE
r6RSbNKyE6HrfzkJhr268LhXC/VWE8iLnapqslQTRwZmvSI0Pn4aDaPbPv4X1US/XGu6ttNt
IdcIkcyL7YXu9rm7Q5JrV7JyMRvWFmm3yDGE5Fhmyj7I5brsrk9Nky8y5c3wJGZhSAHJU4pF
MohHUd6wWZXWms9CgbEmu+Q9WywGOP3AOX9cTrYbJ+SLLQYvaqu9aBaIUx+WvDpEMcJ08e7l
6/fXf4gcZHrFFsWgGOqqI3nfnNKbhvuB40Wc7r7df354+2fu/WwaIc2mHzMgmkJe/Ix1edGA
UAWmjgYo8slcdR5vqWTx2D4rVz6pzQFp+DVvNRm8hfqGE8He7cM+chPSFEi+DS1/Gp6p/fN5
6dv6YtulRNlSj4csO83+PGDgtlNOqWqm+VE4j0JcUTSryhr16Tn1RaXGILjpvPw2Lil0ImvR
SzAIU8rL1rbA2GYix2kgrbPLpuzbjO7Uka84dM1QT3p6rmMo0I7WKaP21FO6geVW+8wy8h2n
YGuzqiWGxLKXAN9qaWS8NXO9jWwhJUUSW7PbtUsDgYF0Lb5WkYiEcqtG4yd01zdL3h+xZ4h8
I0d8oZLrOgPZxjF6d53FXmAQQfg0xgt3DCxVv4wMAPHjdSwaQG1kFGNtbTLIX0sMSRzP8Ald
SVRtDIwrcGtJgqOzaOHs5BPLQFlv2zzTPxkNLVNvmCGDqs/vf919fXyY1lWMFK4tp+hhIVsc
/5Chod4+aN3YMpcJgWPKWukB9BnTMFauueaU2FreXp/uv16xp+en+7fXq/Xd/X+/PN+9qkF6
2VrPgqEutJFrVvJIdkruc1QT1IG8DnyELuuuzOk7YJ4WTRnNzLV8JhZLHiwvm8UcBgZb+rIq
9r3+TcKyEOvPDbZtOetstOA1sVleY9dZnc46bv3+dvdw//Zy9fXL4/3T30/3V2m9TtUBhslm
g4fbo/39/fUe3QRbPZnXm9wQHDhF6Aqq8wioKfNjl46rNcCeJfQc11FHbUwy9gBPnfZeEjtD
ZfScua+5TVWcM9KcduLZVVmuPJchwN0LOqqTSc7OH97NgjA+44V08cO/gGuzKAq1I1F9Esd8
pICkGSWO9HBOi4j0kW/WDqhuaGs/Uz8TaXXmYgQUu0ND4NmVUQBLGn4KkfOuR4MQVmaaYgNS
Ic+2ol1DYLZCWv7zkHbXS1ZJ6MalVF1CIkE3lxtFeKyi3kwCq1qmXebqyCy+Oc2lWWshxlVb
s7rJdW10hK6LuiXDuyOYJG2dOI6ZRpDpS7ERjxxK1Yb35KQWpPcwVwpKqJf7CVYfE0ZqEsyp
yUp10DQSvZDgXMUUMTGIfeTrD0mcWuw3nruuScedgGu6pFrKruip2B8IDYpfyuyUFLyuVIUm
SdWV7KXS7+DAUSuVm9pYJgiv1ahOqxJ7dpYOXDSqqSQ08tq8iXKGLOzDhLpb5Og1iOh6v8nz
itl+rMgW4nohQxnE0fkDnjp0qLtKjl3fJDBQjeXMjHGTrs+hbGtbPtzp1yC59PXT/fvb4/Pj
/bd3KcVwtfJycCg+d+HNGeYL8FwNCalwKE9r3w/P6KXMUGfQGKvWXwW2bkANwGTW5G1a1WTY
cNRFc51Q24OE7hrtrnTwVKZ9z6jsNqd67mziSTrtOHVkSCLbKjTo3BOlCU17gir7wCwGlkhS
ZWg4TM9lkgFJD8aSDAAGnFoetKfK9WJ/maeq/ZDUHBVjZDRF0GaatGCYfWJN7nd8edMNW7g0
Mtp1zIm6x1j+LTUcv2ebPVJdWg1ewLhmW6rEwdnQBWpgCQYkYd+dCRcGQ2gMFnlTM5uYowGF
pI1vpcodzEAS+ngUIEKvHJuqT1WnChMDuqM5CBc87FDr+tcTF17n8tvckY++AR0TyE2faIeJ
J836JIlCusQ0D/0V9RymsOzhn5ZooUF0JiE5sChISMAEokjMRFWFELxY1dFdsSW5RRlWZ4ro
o4TBRDuN1pg8cj01WFyqITbpHo5BqvbahJkOOiakZNXKdyglAo0n8mI3pXPAbSamD1oGE6Xf
o7IksUd2MSL0d4272BwRSx0FjeIp2eWIhglteaJxJVFAB4Q3uKLlDp1Jsgak68AaYPjRsONc
MbVNGDyqhGxCibUGXF7/qAogVpMasDrLytIf7bokJRKFYxCmiSZsN4dbDD9syftEHdAnXNgd
CFv2GTgIskS+UqBdzHsUrmfIXCydMBBGQjfyPbpHBiltsWBk8jQlKh0LHc+3FD3IdJaiUbb7
YDAs2DQYTJrkNsM8svZmSI8JMu0gNUTby3m4KW5KJXxATddTL48PT3dX92/vRPAikSpLa3QC
OCXWUNgTqwYkwKONAT3soWGsxjFJMZynS3PuLba1RLmX1c87WyFdZs8cfvQdBs2hnieOZV5w
6/0pR0E6BpVn0tL8aAo+AhBCT13ucQqk+22hveQLHrx9ZdcFRuCgvIBheRgByoM/RH3Whw0a
rU89OlLzWnxiuZ2DniHET3QopWkZhSj5Eeix5i/nVFGYkKmveMf17CoRabYIyz1ewBPeP5Sk
6FIuzdO2x+hdiZ4tBmHAy0DeC9raKj0g4DifXb52mdFEQBCBs5RXduiPrMmNmHEqiv4PmZZH
CgfaDtq4VyPEd5dir3u/6QYHVvSTF0gpNTlaAKmzAj24qLmXPYjLqnP9spNeXzVSXTBdTw1o
0ssdXVRX5F3a+1omrO+KtL7Vm6rEsKb7dbPPL0bQEaWS26Zrq8N2VvntIVXFZCD1PTAZ3yMc
KGm/dZ/YkrY7aU+BgrgnL5Yl+OmYEUnQ2aM9DSq0tFSqdH9jcT4jq5xR0ukIRtpgqpqmXafZ
tdHUwqcA2c64HvZ6fx32Z81Ru1gc0f08se4aXHztsq7OsHSNjjTG2HrGCpmlGxibWam5K5SL
b3os91DAsS1hNSsZZEXHeSTYM1gLDpb7BMleR0EQQdGWO6WBCw4ZMyaNhe3gVHswFr5L7Xt4
xNOeoppM7pkLBcpwZBcWtrAzWhp13A7oNp12C+56tULXq0b11GK2Xm7moMKf2mK2r6l4vcnm
m1p99i5FDQtmRzs41rMpzjf7hl22pMMgyQrr5hoHwexLoPmLWfPLMOpQ+cO8cj0OEsvYgNbl
xt5LwUBxVzHH9VxdSAhNjw9XdZ39gY+bg8sw9Sq0ZvzdE3I5DjpLU8LN0/vjCR0W/AtjVF65
/ir47SqdZYLV2ZSwFvdHfZOVRDPW5CD9oFay4jOdF37/9vKCT5J8OxzimE5FyZhqmHON3vI0
lYMLK9M9dL2oxzTsR6SbOwUXu+/d6/3T8/Pd+8/JI+G376/w77+B8/XrG/7nybv/99Xf72+v
3x5fH77+Zgqj7LCGNuReMhnIUtlcHu37VH28EkMBF1Z+3yUDut6/PfBiHx6H/8kKXGGUzDfu
6+zz4/MX+Af9Io5eudLvD09vSqov72/3j1/HhC9PPww9LjkSj/zK1Drq+zyNAzX6xkheJarR
piQXGOYxNIUwQdeNDOUsZa1Pu1ORizML/SCcLdlArXwvJSZWdfQ9Jy0zz6ecMQmmQ566fjCT
oeFkYhigTHSf0iiX4njrxaxuz7MVCrbny7rfXATGm777H2VX1uQ2jqT/ip42ZmNjonmI12z0
A0RSErt4maAkyi8Mta1uV0QdjqryTHt+/SIBksKR0MS+uKz8cCQSQCIBApkZXbrI7AtKSKiF
DeWJjo9fr69yPt30j1z5AZIgb/rYTRBiECLEMNR77IE6rheZwqjKODxGYYjtKJdWRK76OlcG
sM3yPBTbwF0bcuRk+aR4IUeOetA9AScvRh8CzXACbhz00oBqCOHYDr7Hh63UDzCbLspk03uE
NzQa9NLSwQvitVba9eVOGVgHcCDGTDRpOESI+AWAH67eUvhr/HxJSmE5gZpSPMSxxU3aJOk9
jT11xouZcHm+vl0mZYd5KhfZm6MXoiFbZzgK18ZYAWpkKKsjDUPZhfU0wPvk6LguIvjO8R0I
HG2wvn26vH+TWJa69/GZ6eF/XuHm76KuVV3UZoxh3yU6HwLg8/qm338RpbI18vsbU+5wdwct
FTRJFHh7Oi/p1eP7l+sT3Oh6Bb/K6vqh90/ky2+YJrEEXpQsbxnotCT9gOtnjIn31y/jF9GB
Yv3UF8f+UPM37KJDf7x/vD4//vu6YvalWGbR9OB+tZVvkckYW4FiT/m2qYPK51AVdBnqWtEk
jiMLmJMgCm05OWjJWfWeM1gYAiy0tIRj6mUfFfVC9H6HmsiVnTLJGASVll0syNiQeo4X42wN
KY9NaMHWVqwaSpYxoPfQyLCcJjRdr2ks624FJYPnql/QzE5Hz4jlZNvUgclvETdHsa8qRiIf
F+nEhYejuV1u25StHTaZxnFHQ5a1t1R6IIkWrVKdZJ6LOuKRExV94vqDTS4d0+j2w9Glb33H
7baWcVi5mcsEx60yWUm8X1dsI7Hazmb3rF75CfH7B1uML29fV397v3ww9fb4cf3vm4UuLx6w
GaH9xokTbO2Y0NCVH7EK4tFJnL9ucp+IITNw/lKTsl7IqC9ef2Icfrn8/nRd/c+K7ZyY6v6A
AER3eM26AQ2VwKBZfaVelmmMFXwGTAJklL9Tq2SkbMwuWStvyhaiHFCdt7H35ZscQPpcMqHJ
z0NvxEQ/XqXB3l2jdzxnWXvyx8W5VxysV7wkMYih0QrRfxoRFgexsCrcgVwdB70tN+cCrw5K
pcecukOiSWmeMZnrGFVzSAhcueh1qwGzj0VWErp6eaIkTfqCGGH96RhdwoYM6qONV0nZAuDo
bLJR7lgufvAxsolD4uLfc29ijsyAdzBee7btts0Pmes2Vq40LLTBaDQ49NMbLcj4wfYyTlFX
+9PU1OZdGa6F00GjmetBZbIe+lCL6TvNK9Tb3TyX/EAbYlmxgU6oNjg5Ncjg1rBSOZyorUFN
jAk3NSbW+SbbRIvMLYF5aqjTfeYlpWdOZj+M9KLTIfPYqoKdIC/w2pX9IgG560sv9h2M6Omj
YCLDtzubRgJ9Guv5CHUdb9yablBhAKeTorcOXdAYsTkPhYQ9/FqHlMAmbKESo2WzADGd/1a/
vn18WxFmlj9+ubz88vD6dr28rPrbBPsl5YtS1h/vLEVszLL9Gr6lA7zpAng9bmEMUNfXFo1N
WvmBrqvLXdb7wjG4Uv5ExzeuUgL0hbvAWTeamg8mOeoogHfyIQ48baQK2qgdLkrIcW15xjpX
55par6DZfbWnlpKgjgCmiRsb6w1Xxp6zHK7y2lSj4L/+nyz0KVzf8szR//jn48flSbZv2M7w
6ee0wfulLUt1JjCCsQLy5ZG1hC0Q9hVGSpWYm3Gap3PQgnlLvvrj9U2YQyoHTJP7yXD+Te3m
st7svcCgtZ6L0LSBDTe31k6gt4uTrT0nUE3Dw+bW14yZ1tBh5Y7Gu/Le1GC4JdQIr6XfMLsV
dV06KZ0wDDTztxi8wAmMOcB3IZ6DnuXOa4WvNXLfdAfqE63lNG16b7nf3b++Pr2vPuC07Z/X
p9fvq5frv2zKNTtU1Zmp5tkE371dvn+DG+HG/RGykz7jsB/wwFVuESf1eIhajqFu4yYkXKtl
85ckKqk+Fmzzo9dIC+w7PkdOTfdA1TKOBVEJ+XZbpLkcEE68Ydn10s7wuCMQEEQ6bhIEfoNh
1x7or24oQ/RU9Ok+7xrpPUTWSZ7v2I+xKtqCGYaFkmR8qOgUO0xNDfTtZobkIc3A7SbLj7gX
AylV2ZBsZPvH7PYhSKm676tfpWhj0ynr6tX4diLl4VGlsmMUyPc9ZyDdM2MpVAb9hNCidNHw
jHOCemj5qVIix3rgTGbbQS+xcz38Bj4HSYYH6gOQDTzWfWoNgjamxYMu5gmBy8xtj99ghmR1
czjmBHtWw1uXuIEhEkYb2y4vi6qoSXeGUJf2D/R88OyIyjWbBnqptnhkPDk54s4DecZdXhmF
Vafd1qIUGbyrCO4mEcBDVmoilm8zTM3ZeYrly4hp0TFVN35i41oFPg2lzt6mSfeWz75cEjxm
Kus8C4ctqfNyOQR4fP/+dPm5ai8v1ydtvPOE8xnrM4LMn9jDPCbEQZPAJZOx/OQ6bufSwdEm
jnjSq/Nye5izeXv8+qd6ys8HHZswbV/7a/Qqr6gdpsLY0jjkVpo4hn+7PF9Xv//44w82vzM9
aPp2I8t51hpchyCVMPWUVhn4pbzpFUbLMuWWCKNsmqYHo57cGeRQ2BY+hpdlB9+FnzUgbdoz
44UYQFGxgb0pi16rFLCOacm2GPISPFqNm3OPzQCWjp4pXjMAaM0AyDXfkG3T5cWuHvOaLV7K
QykuiX4/IejghSTsj5nihrP6+jK/Fa+1Aq4Fyuxk+Tbvujwb5bd6kJitWxAHSRVaReDBJhp9
Dlgj6QMPaqaUBBmmdYoqQF+UXDx9wf3+mOPv2xzf0rjXB/3HtYHGX1vhJxKQHok+JKHnTd55
2rGCTIdhi2clnT6emehc7AiMQQcY5lryem158w3r+w7X2Qxq2rw2QgHKCaib8dfJNlzYTzif
XXFUBzQQ9JdmM9kevGFOsYwMvLYiWuuCL2L0UQkM8Dx2gihWJzrp2PRs4HauGsYJSgL7DS9q
Cnqij3EgMnMMIscWBzxgiJTuTPvi08GiOaZEO01sE9n2bBzEZpgpMkr6s4s69xOYIhv2e0x7
jQEgzlGyytSivXmiQZmzQJKnuTLe8G/agNisC8AKfRIzyuhbTkdn2OL9ECafxcqBAZ83TCUX
lnn8cO4aRXC+ZlpOpJGkqSUU9JziTr8emyZrGmwbC2DP1mJfYaJnyz94zFD5IB32ZYMrQF/X
YKRjRiR+T47B3KsQXha8sNQKA5Jov2VGwUPkw3ZQmiDMPaXSKcaDvQ/5I0LLlMrZ3KmbKlcq
gVMabxgwGr/fust01TWj+PNKWM46tkGi+zxXF3ByaMYHN3EGlOqgVFc1DihTzPLzKS64SP6k
ucwxmJ3mswggpiWhdLqdfssIiBQA1igOz3XD53iDWFZNyRoJ2hNa5eTUw4IEaKvnZ2QIxH32
ywNKYqCKk7U7nsoc02i3dJQwm5vgZZCsjWPUaNbSyB9PJBaMh11SNv0ZqdTLlR/6DrFCCYq0
cRCggp3eGCJI0yv7KolxUmdNh3KwPO5CMOklvDmWlMg8EnfHwHOissU7YJOFroNejduxfSLp
9VvQuH25z+QXcGWzU96Swm/wmH9g6zfTJagektLYDDopSVoeek++CUWbQ51pP8eGUuPRjIrA
tp/N0QJ7I0Nr2eNrzZ/My+dCQGrTSiVkFcnrHVsBTGh/yvJWJXXkVDGrUCWmTSUuDDfbLRwa
qehvRA7KChSaM3uoTtXH3xMgzhfxxoEQ4NBKLa1iG7QOIL001h4go52nsKGnkkXQzTI0GJ2g
2ReqpQD1XZLGORlAaWb0V9/TyhcKfWTrINNn+BEpb2LXpOPW3sQjuHGhMGiYlftgTWYY6HIR
IsKeyrl47LU5bFXyNDpAPLrEmrb0Rwh3yzArHyzR+j8mohtyyu+mYGPEdR5cPY2UgqRJNMKj
rlTn896LADGoTC9x++zv/OagdOMfhg4EpmP7fngwx4zSz/mv4VotS3M4IyFwp/9UyAeuMnXU
Nt6c7yK1+DwDuQ7bk6WmgnJLXZmxNKXuoJJ41dPxuFL0Jt80uNschWN4Bmr7wDnN1RTda3J+
5BeHE0F0oRpcYELmfYuq2X5qowiKyNA43/Xsy8yodyGPbWaFKL0LM67u5bwP61DiCoRUyc5z
xC1615YfXgU76ztFDAFawiatvNgPeLLCoyqYtwl4VTVEleVsYNX8+E/kmVwgptMjCvhcuH27
Xt+/XJ6uq7Q9LLfOUvE45ZZ0ep+CZPmHOuMoV4blSGiHDBhAKCkMVT5D1DYYlhRtVmzxcnNL
wUU1gLuc6mAf+ZCEJbXU/dvndbR2TPHe6GaXSNinYiw3SmwRhi9uoY1SZWTy++xHzpgZ2obX
y797bc59yh/+Q6R18PVpbWg10DsN5dwyQwKrCaKc4Mcsy0xuP8WOG4JD0bvpZr/ad5igBb8/
aTLB6KPtHY+S6EBbc5TQvpgnAXl6+tfjy8v1TRrjt4+nmh1QrwuxUN2plfstxngWDo1F5/yn
/Hzqy3egDDRxrGjfFRUtxZbRwgUp0yBEL3yp6ZhRlMQieqS1NVFkokO/bXdEnQ2fBy8JI8db
pu7C24Kw9HdY4p8r4f/t0nuiM8xwg/NILEvRX9Rk0fAFNAOnatwfNkgOBpAMG06KAWMsa27i
Dza66s1KxmJE5iSLfN91MYAcXD9CRgRHIseWJxqsSHgHsbENaGzNF9/Ll2DDaEas+Y6xg8oW
AFQa1FXeKS3Aw1qJBi/TgzVKD12sAkZfYwIAuofTIzR94MchQod562EViwltAin1gxIH1l4Z
IHVPAC5zAVqLQ1jmADY0AQgRmQM9QkY/p1v4je6wOwyxFbDm8tcJQh88Z41147TIW1RAiTQ+
I5HnIo3kdDy97yED14gnOdE3Pds4NEj6qkA4zGnse4iUBB0X0q6vQkyvFFx62IgrKNnkpfzp
fZFQtU7W2HIn1p8YYc2+Mk0IIhSO+EGEKH0OKWeYChIg9bB9jBti2o4BvuMgPDMgcL2/rAAu
6K4MPX0XMNH9NdaWrvcw3cHICcIULOFo8dxQsdAROQEdUyfcRLCUo7pIUxFY5u8Zd7u+DNQY
bIvZt6vwdXpGcDkvaJfvhNsZq9Fpm+mWTQmllRe4iOwBCB1kqkyAhVFarYMQWS5pT1AlAXRs
BDN64CF6jtGZRRMiYwhcQlCC2EY9oV6ArQsMCBxsOAIQ6ScbHNiSJI4QtqSn7ndBXGpLAt8d
sFoX2BuQBf8GW/NmJPUxxqhPPC9CtJ7hTWwGxHN9pCIOYJbhqXK9wBnzIzIBT5WHzhNG93B6
4FrpSA/rns8keoAtcUDHehDoeNviCDN6ge4hs4DTkcmGnaYsdEs5mC3Ht2YWPrE1jHtZQCYA
0GNcnrF+MnSj44ObbwhxntCNInb6NNMxpQ90zMwAun6isdBx2SUh3uYEs+043cJnhPdxElva
G1v4x6wL7rPP0q7EwmdiqTex8I9ZKJyOjpXEwUwNoON8JpGDlp8oX64VOsI/M8ziAJkbYBRF
oc0sw7ZyVemFrodp1pZAtG+iBqUGkN/T5N9kMDuAf4hru0K+WrB8ndNJfUfSvKiL3vyWl7G1
3lr+cfq+puXpuwK7mibAyqy+ag9rxVYWzBMjoRa7AUIx8C9q1sroxuTuXPkx+mhbwAfS9aFq
0XI6yZnx4yo3vmkahnjMWp7jgezLg3wlf/4KMJ3O7IvMfIjAiLcc7Me4IX2fd2fuxa7e9ZK/
IIYq7uQORt7bBQhxog0hYS5PvGIk2hzkIGuIrIWeS3I47SzHwxyF2wyIOBZMdpDHiQf45iSL
lLc4Lx8K7EaoAPumHbdbPRM8Seiwb7ECLNivs5Gn6ShBndIB2nZNVjzkZ2pkaz3Xxe9mclh4
pLLirNN2Td1poTGlBDk8hzAaCC6kGvxkWcDYWS9HPrNG6KXt8mpToJoD0H1TKp4YxW9g6qdW
DJsqvk2ArNq+Oah3GDn9jH/9A+yQlg1+qw3QEymFV3OViXNnexoCcAHR+/Q8/amo9+i1Y8F5
TQs22eSnM0AvUx45Ui+szOvmaBM/tAfmlFbSRB2z3ywA+9EqTV2QLRalFdDuUG3KvCWZp3UV
gDtmuWhZFfy0z+HuOFo4MMZvG1bNgeYqw1UBcZCaba9LpWrA1V+OO0jkCQ5lX/ARYqmyZgvJ
Tq2t6dSBCfOU1BAgs2w6SftJRGTYtnnNWlJbwu3xBD0pzzW2inGYqZMy1ZTtRISHBXp1E4Le
HEZT4tdYlRRsObLVoznaVNOUBHwM10WKfUsQeq9gZorem12TpgS7OAIg06JGt0yvRTSi0MLL
MlmfRe/ISdo8h4cWenE9DE+2muVUAw51Wx40YlcV2krY5XlNqPxCbiGZLFTMBvitOavlylQj
S18cG0PHNC3NczzqFcf3TMdgd6ME2B1oP91nWXiQqQYPJ6J9k+TEogDXvpZahoJNBFVSn/Ou
mRp++wI10eza4fOZ7e87XV+KKNXwvQilp6wt4OCd/5qNFLhoglpG4P/VsHDaQrqXNqUQLqmV
wjavjOX27fXj9csrGmkXsj5ssEkHyKz2lveDKIPwAU5hELI2+7SwvWORPNqqROEJU6WRDhYF
Qsd9qjZZS1bXTLOl+VjnJ8ndM+L0C2Rzc6epSGIOmQ3XEAs0/iFPZbkuxpvdK88EJtJ42jNF
UdqLhDSbkqtJ2vNxo5c6bmmlSvhQtsVkVitdVquEExfshiiGlQKYV8tuY+j1/WOVilfkT/Ca
TP+kyssIo8FxeP9oVQwwCPaoTgc4n2A9G6d38KCMSWLsbULjyfoeepwyM1ibEBwVAevMwvfS
DWtblwwHz3X2rTHuxoLth9xwmDjXAD/0phxKrVv2z94TUkIVI0/E+pnVeUdijUVizdKoFL+I
qCSi6J02tZzb9XOljAPSo2oC1/fuJqBl7Lp3mtjF8Nae7RiRZiLMGzj3GVxpDyKUVLNHYugS
01swDPsp6Hf6dHl/t2lNktpGDr/IKd/G5LMt06ZvXy3705otVP9YceH0TQevbL5ev8OrfnAp
SFNarH7/8bHalA+g2EaarZ4vP+ebWJen99fV79fVy/X69fr1fxkvV6Wk/fXpO7+V9QzxIx5f
/njVGzKnxARRPF/+fHz5U/LpKKuaLI1lRxucBlaxYhOBf/h2jhio0I63wazQeXBcjabFdOBV
8R7P1Jd7NwCPX7vgO5Lt8l6fphzKIPZV15SmSNqnyweT5fNq9/TjuiovP2UHj7f8tNWVMp8Z
EM4PoYuvxAgwRdtjm/gym4dKxYdnRVh3fpWCEvP04Gu+qcuz3qjslOKvuiYQ39Jzzb4vmKGR
Y3c+Z30XhY6pBBkRV5twSeSgvuJR8kBUYl3yaErRfUZaJOXSm7JtBAaMeT+I9xKlkerri88R
ZoCrb5mWolTjwqIs8qoIsaO3CfNCVYYkO/SHQTOY8iPNtSnQFU2gz8Ay3zU9362rZFOblhYb
nff85F48PUdpiDlbEolgr6nptSITVqNS+7bPijFnWzCdB348hkQUkBteUPbnKDtH4Nwb7enh
UROz/DYdBNixDYvmRDomt07TxjntdfuBsgHGV5NtMUAIA70+cS0bvbUN8Jll0fow/8yFMXia
7U6ZNcn+4weyU0/eSLYfHJlouFdV2stDuP328/3xy+VJqCF8MLf78608ONLrmzo3kbpphbmW
5oUU1WbWPw0PzsNN7mcNY8WodK5aQREdN+pWarGPHPydNNd6tAJT1yJPHhQrHtxQZZ7Pg5R0
JpUbyMciP5kbDVz7T0rF9tJCTwLuBHKKFTzjOAiiGfkRtoeg03I81oeKWffbLbyI8qRuv749
fv92fWMdf7PL1V6fzUihaOUaOpM2m1t6X7UD8SLsHIh31NEsCGi+ZhBXULSn0jZZOmVWl1Rq
3q6dk2tGraw+qiwI/NBgps57z4s8vVETGT7uWArkKWJtSds1DwdtIu88Bx1S41CwOTuo+YU7
JmNBLIsNvMpqaNGrttF4GHPQrCpxO9bp/zX2bM2N2zr/FU+f2pmvbezE3uRhHyiJsrTWLbo4
zr5o0qybzWwTZxxnTvPvP4CkJF7AbGfOadYAxDtBAASB3AbFjQ3pWLiwYVI7Nxm8+KfnWRIS
oO3DN+oiuaxWoOo7VO3f3NAj355yOyYLdDoHCj4avGOHs0wYux4fWV1EZJApi2y4SbLlRHyA
SwjOJjshxAazFHyHJbv6QSFKnfAf1VHYj+vog3KKcuN5Vi/xoNAAB/6AQNitvXNIrLF1HwVr
OuuMRN/wIGQ+NQrkgl4YwvWxv6E01zzX8+Tmoa0tICjMNmt8dzqYhEQmGJkMJsS4xI5lAz8K
slJ/FzmCBtOPlt9swgXCDkU/cUAnMbxoJbFYBJ7yjpipN/anFhkspYkSI6f6ALLtIYiA1V0m
+C96YNWHLKycL1WRWRtTU4gUZc5AndN2MQJvgiYy29amcQ6lueXLtpEWezGnwScjzTaAtiIJ
Ya5HfhULwkg1JiEoqTJfrwEtOmatqxuVIIkobUPrWENh5BEmeikG33z5IHrSBb4AGojumsST
gV0goyRdgdBGXdKLSedM3GxW9jJpyyZJA6YWiobIWyN0Ws7zpk1DKoIFGmDVLY2C4C8ZtGAq
c4L1Mfw3GRRcVEoIJUqQB2G+OveEhZsIllRMFYEWqcvPrDbg0/wLQ1IQ4CpkV0vyKYxAq2fx
5jci8T0VAU9hl8vdbrBxPzk4Pa7mBDwnalkuPWmfFf5yeUYFJxmwRlSBAXi5OnNqCjO+LeGs
S6koHtMo6eELRujq3IbaDoECaMeVGIFLYkrIrLkCNSVCN0sKIhDm3JLks7imuViQbixyTNrz
pe67JYBtyDAXrQ3NwuXV3EwFLhAfZioeKOyM89ZsYtq7f32NtCJBCNimjRarq4W7oYQZ8K9/
Hp9//Dr/TSgT9TqYKSvA2zPGhSQ8ZWa/Tnd2v7lbEjXU3DmxsND2+PjwYBxNcrDgSF8bYR50
sAqHQONAeW2SsnWGecAnHI7WgDP6eDVIPwpmZRCGVedpjcptTqGGeySxz8WAPL6cMMT06+wk
R2Ua8mJ/+vvxnxOG4jw8//34MPsVB+90d3zYn9zxHoepZkWT8uLn7RdpDvUhw9A/TZMGoKi0
ZN5M+G8BZ0BhHMgTtMdYmbBwKQO+TSXrmhaoUwo3Hn1r6LKAUcyZ8Idbw9r7uDIWRWpMPMXl
bRLSwm+e7S40yo/rKXjjGRTAfBBDTe9YWNPqp0aTVqUZPcDG9SHtEeXQ/acmNTXl6qiX1ejK
KI8YZs8t8Q60CWv9slKgiDTPCCeqqNtQxEnQM3u3oRQLCHIYNyeR7wSzpX4Nsx1QMv4mDL8T
FpM1twWIP7ueFyxA/9KEFSKypwj7a5Tay4gFJkyFuxq+M1soxWcDUmpODGyXIiw0KZquWBky
t3jE7lk7+RqvY1RkAm2O8ZxDOdcMzDsSFEEVq9qJUiv00zJLBPYceKh3qCubsRFA8MV+Wbc/
CuqSGUJn0nSisHcLYMqsw12eQdmIZnNg8o0ZpUfCqYWIBkTVqGkpIjCpAu9H0z3iMH1TVZ2t
XIxLL/zncf98MqTbcfHRIwtQ0z49LcK+ZronCOt2ypiu2X2bs7n+7Ez+7sUWPfv3/NOlhYg4
fj6aJsOYreeLy9WFZuWdYFA/KNWLs1FxT40YTZ1If0w73yGuwkyhsG7SmooCgxQRps+VFJr1
DCPY8dAEAI8Ky+bcBIqwcaM3sFF3wVvapVd8V3ceV1bE5vFqQW8oZANUfBoNLUZIpcY7njB9
oq3Cq9DGxnaYYHjDw0Ljlk8hA4xjQ6eulwQy/axdZp7rgowGHEL/uv4098fD6+Hv0yx5f9kf
f9/OHt72rycqQEJyW/F6Sw5V0zoH+4jbXa60vL6ydqJbYVKXOR8pNaYrMSXIz6xC11kXUaH5
TmPiYbbB23UYwE2n0SdsyxGHYYIqZnwg0/YCbhgXFRUl/Odw/0NGwf3f4fhDH47pm77eXJ5R
mqpG0qTL86WRr8xEenJDaERhFPKrBZUkUyPCkH/v5OfVjpaZrBo+ndFpjjSyJF0tyIxXGo0K
LTKwsuq6X4dhD6N0YULz3AGnI/HK0MIQnik4Ubm4UlpHjcG68RZKlLVaecwvA8EVGVBuQutX
4wjNJqhRmOzQFRmwcCpNf/CkfSXA8l3FEGq5eXl8Fmtw4ixyEQpgc3g73hPxmGEKmjrs08vF
8tzYFnzbEtAgi0bodJCJQEZVSkZaS6RyB1yltU5lCc/bjjZrjBRtTgV7hwNCojF+iz6RLM2C
kpr3FBZdp8mpMknG/hkTBM0Eclbdgf4lsgIRF1NKrhKE9hFf758Opz1mnabsWE3LhXNS3tcY
F879+uXp9cGetwYIf23eX0/7p1kJ/OX748tvs1dU1f+G9kZuLXm7QfG9ZmFM81ckaMKqufUE
UesKEAqbmnki+uD7LMqeWQlmHdf8epS15c/Z+gBtfD6YzVTIfl1uh2ddZSG1PkoK0qjhUEGG
j/f9mlSkE6AHRAO8W5MyNTQqn03FwtG5dWgnMZhTp3q+pTVuvmtD4bcqvuP/nkCVH5zIHAO9
JNYCzUxaksLsqsUlbeVUFGh6+Aifs938YvmJCsA5UQjLFFG9QF1eUE4fEwUarQwFT2LqFhjS
OSXDKoImXy7118IKPLgNaByO52VtCDkpGdWpaA31EX4C+ynWVUmaDBDdlqWWukJA0HBgq6xb
ECyCjpI65Hk5/cCg/PpVP4IkI0wyvJwzQuoicghjb34S1qEJQH0vbq1vQdMzqTJ8HKi1e4B5
rhwm9ODhaZQmTLf6k1gEDopOK2xhRk0i+JWnmvYmM8sBABqntGO7vkYXM2OWYVduPANfc3TJ
CaU/SmamzIlzl5lWyS1w779eBeecNuAQe9BwGBkiqS1xLYZZJ14aGBTo6yJvf2SaHxG41kRn
VTi/3O3EcrY8wREN4lS/uCxy4fBDDZpOA2UYaa7EXZrqO1J6vlctjCrVvnGsgzDvN8BwRMGq
Z0brmhbfoLB6fj4/wx4m9Asmk/TiZ6TCKvBBQWlycfYJ2+SlaQE5X8xpWUzw+ZB8qpuHmmEK
fih9Sq6M/RGdTu6egUGDyP54Ohzddw010zZ1m3RwNNVBmY0CA3v+djw8ftNsSEVUl6nh+61A
fZDi17C6qXnP0qDYRmmu7cXB2beSFtKBWUWIMH6LOMMmRatZCowfxTbnGjsR0u91DHLImCMq
fjw+CRHSPbUio1/wEyMJk3My5pSB2uhX1BHPsr4ONMt6FEaB/u45ylPdrgE/bS4rQCErREBD
VFILOEd4nPYxaMGBEc84RR/qPg1idOXTAzqvy3INQoeWOktKgofDAwh+/sFQ30H/ANCUeuyi
DpsQVlOS9/gRipIsSM87FEKreX+D7/SUkdw8TRdWyOAJc96b/i8K1KMDCCY2oP1NBqqGh11N
G/6B5MLwWRMAEJUw341ok4XSK7Waf+GryyTiRVjfVp5HrILCMup+CaKF+cumgHrzQIyuYVbm
aMMGHDmqXwRimsQvVs808NAnEzq0YaxPkLasTfGWnBayyzBu7FkekUHrNnYSctLsg0/jhf9L
bCoj0+eQHeY7lIr0JYEujz26uch8P+PXRdmmsTYokQ1IJUBI3tqHbKSb2qhgal+grJ+nTQNr
hO7TdVe2tJlCYMKWur1mXVvGzYW1lWKx2D3TteV1xm4ttFQU7u6/Gym2Grn+DNu93PC4JsjM
SwqfwIIp16B4GSOikD7H1AFfBl942Pb4hkxT1RElPVWfXJi9ezSM3hTZzeh3OCr+jLaRYGoO
T0ub8mq1OjN3UpmlXGvNVyAy3GKjuLd/F9loaYzK5s+YtX+C1kVWCTjj87yBLyRkEuQlETVu
rB2vajF0V8XW/PPF+adJN4jtwgTIf6km0PWNs0Kq1/3bt8Psb6oPKj68JkkiYBMa1kkBgxMQ
VrMFxEbjq78UvR90kQ6R4u0IiO9E5ze8LvRareO1zSvnJ8UiJGLH2lbb1km35m0W6AUokGiu
bkPFPxb3hd0eSt/qW5DCc2P8S1DV1tzHx1lkFaUAMCWapB8PRNNZJE4huszEKhJ+yyfBJIw+
EANviwOrdO60LSvX5Jch7EyTsrnuWJN42Nd252tCnhbQYnOZl7mPOqmsFl8XuwtnmwBw5Suh
VoVPRUgIymwcxNdb2+1SokG6s+CjBX9a8wLSK6GMVhgkSZU39A5W+FiEBqJ0LIlHtvikbZ2t
6Yk9DIjxu7+p09Zob/cxM+EthvPXtwJl0tDvmuHHwNE+//L4eri8XF79Pv9FKzNrRlbXA6uj
C5xIMATau+fzT5+oiwWDBOMJvXswmhXIwiy9GH9j6HQ/Folxl2LhKFc/i+Tc1y6R6NhX8M8H
abXyDdLqylPl1fnKh9F97KxvFp56ri589Vzqtw6IgfMbF1V/6Z0JDDn4sy4DjTMXrAlT+vGy
Xi/l2KjjF3Rzz82eD2BP55Z22wYEfc+lU9CufDrF1U96MD+3h3bEUL6lBoHT8E2ZXvbUW7gR
2dmfoCcGsFxP9tKBIuRZm9IeyBNJ0fKOfEUyktQl6EhmCtURd4upykhD2UCyZjwzH2eMmJpz
0jlZ4dMQXyNGVN/ToiPvr4yx8bS57eqNlRNPo+ja+FKvMcpcz8nN/vi8/2f2/e7+x+PzwyQl
ivMIDaZxxtaNfXf1cnx8Pv2Y3T1/m3172r8+aAEuRnEQswuJizJNXAb9CrdjhuaMLc/Gs0NL
giMS+6qvhWsIOedDTAw6lER4eHoB0ff30+PTfga60v2PV9HWewk/UvE4lB/WDavRExAzarGW
TAmnCPOuaTEami4hxHBMyyI+z88WF+N53dZpBfwGLfemeFlzFonSAEl7fxSgIkb4XVBmtKQl
GFx5U5Dh+dyHgQlUyetmbLp2O4akDRdPkVAozllLhowSEVJuWNGq/laleDDU2OOg4G4dcVnD
2rrhbIPKNrq8UmIixsFCUUd3xNGAoyYl5+Pz2b9zs9OocEwJufP90+H4Pov2f709PMiVbo4g
37UYjcyTP1UWiYQid9MHNFIpJkVZdO1Qbct5nkH/3bEZMN65xKjIm75rpF5jfb2lPNYVSjoM
6teXCJb3Xr0dlFIik3SdAMHHfRENQmtFnJU3xILS0b6SxJLCrvtWZWJ5bEltHSdzlh3uf7y9
yA2e3D0/mO84QILvMJxDC5NCPtKWKNAXizUGg97oAyQX2IgS3Kzs2s/zyQEN2RVmRc81sgr4
tXa35iXptyzr+Oe5vhIRDNuvLCvyKlDHq8/PTOTQxhEsYtXYdhcJTIu4tGDCYGTTyTXHi8jH
NbDSDecV7Tg9eEvIku09BSdnXrmP0HBap+06+/VVOZm8/t/s6e20/3cP/9if7v/444/fNDO3
KLJugTu3fGf47cp1BC00lTq1C2jymxuJ6RtYuxXTg4JKAvEAT3AEw0qyJWyWCMDUiQZADIo7
JorWu5cHZ+iM6wVO30LFmCIQmHkWoydnY9UKOwEDDFhRCMwjX1sDOPsCSbArye68LYX/q3yD
TjsNq6FaC+kAtvc/rbFKpDDfpr4EfZImrDmmRE5Z5ppT67AzzgVjHgFpTy2A4OCuOMoHZvST
BrZ5IwnU4UftBnPwJ1kAvtJxlCkDSOC0xBnJsnGnL+ZWIbYpwcDy649sAGrWxCqBExHvBEnZ
VA15z+u6rIGPfJFigzZUOU1kWH1iGMePSiRtqMiSiQpjlmbyJLf2o0DkbAPzgsk99VUnUGk5
jqRxK4BfiaeL4iOyKUASI38wPzQaOEpg1D0srKAivDX8Rcfwc8PpWadwOonHK2FZ3UoGbMR5
kKxV7VA3zh0G2xAo3V6KZ+7w6vwn2HXNquQ/0cSVxVCkkKAk9XjgIH5kf5O2Cb6ta+yKJDoP
MZioWDN1ZJGgrVpsCqQUm88uJFQfylIstleLxKtWE2WtoWUdROYqA2VoF1foqCXoDZ4Pf1rc
RfJRhzOIWlFi0d4AIavM+o3yBk8SuyBF6E6+PejeOf/JdMOh0JRx7MDV4e3ApdgwQqfNoRap
nCxqT6jZaApWibd39jQNiEFzIIaM94FIN47sOsbwGMZNqYETt/gew60iwECPmEE6Ul+SjuEj
MazAgcydHhejGuMMn5C3bOjgo4EMy5zWDuoPuFyFGn0VS5B51zMQ6tKOZ49+sD21O0y1ctQY
UEeeZ/86y6JlcPxVvtMPnwhYDRxBkvPoD4dGPtAHwGSTnNWUTqVvwZHOOJU1Al/7zEpBTu7y
Hr2ncDhcaePtWZgl2v3ryZA3sk2kO9+JSFAiPGdjeQoGE7MH+c4rKwQtbE6LIwuZBNSGfsJN
HnO8xv1kAqWkuboYRUntpBKPiPA90ModfWx8wndRl9PxOAQBHm7FesjD7qfbAGFb0o9nBIEw
F9HOQQJfw4GatGgm8G11dF4T0Sjn51cX4r0TasTUBVqXZqBNlWFTG4ZA8eoO5Fffnbmczo09
wePBbsFh71oQzWnIKEA+n9L9WG3BUo01a2EnY1Aucgwahv7QXrOFVNDXkeH8ir+JD5TMAqzK
cCbDNzZD7nFUiTvDD5OzOrv9KCe5eKLT2gvK1PvKiLXM1R4k3L9tB8uXiOPZARuvSzIkuVI3
ds5yj8oO1paT8t1WkrMgzjrSWqseCLS1dMzSR35icc7pjs/VcPb79rbi/dnu8mzS+m0cjz7P
aVxnPcAzsXg+fj6fujJisTqyJyOeGzx+RHR+q+5IY5/K4zgq6Vpv4mfL7icNyGhvMc6psGLe
zVlWoAGkX0H5LUBcsAQGWSocmLXHFC1XRT6p2971O1rEcCsiswW+RDRnIo31aABVByxJcOTR
miOfa+zv346Pp3fXCC+yarxrDB6jTKOkCghkvcYABeoDz8mGHsqRQzDsXulXpwg0QUZ5r+Gz
ykY4VAve4BK4kJgqRl1R+zH9LtZdzEe0Mt5M7G5AwJylhS8V90iUs5DmSiMJzEp5S6aBHihY
BYsyL2uidQNKMxU6pkGXGA+1jyq8ZfojZTz61+ZQjyBMOlgwEXOSQMJBn+ccJ86aXY2ki0z7
cUo+LIYTQdeZ8NlCW4Nu3HWG863a5dTIabvOIqJf/Ntkn3+5e3m5Oz4djr+Muw3HHXU83Y9H
yDbmM3IJQxu1flpL6E6PBCNB1bUNkaISSr9bzTUO9834Qjc8vr+cDrN7jJ18OM6+7/950aMt
SmLQMtZMf99vgBcunLOIBLqkoGKEaZXoWoeNcT/CdUgCXdLa0I5HGEk4Xg7auAqjz9FQovPe
ZjNfV+uGObCcFWxN0Cq4W3pnhLAwqfsIc9BmUgBvnE/X8XxxmXeZgyi6jAa61SMvvO54xx2M
+GOczEPjJIZ0/ZID1rUJMHqnV6bGMBCjtiole7eDwNoUDs+6YfGzt9P3PShH93en/bcZf77H
zQAH2ux/j6fvM/b6erh/FKjo7nTnbIowzN2KCFiYMPjf4qwqs9v5+dnSIWj4tR6VVkE5fASi
wZjxIhBvWzEq9qvblCB0q23dcQiJyef6KxIFy3R3wnG5B+5M7NrRkzW5e/0+Ns+e6pAORDds
XSu2xFA41Oj/aCuDWch7uccHUG7dYanD8wUxMgIs37g6PRJIojECDoOQwT7xNwqo2vkZJsN1
VgbJtLQ14eyOiHKGGZHuMgK1OWE8w78uh8mjuZ4bVAPrb7gn8GJpJMSbEOf0I3e1khM2d5c3
LP7liughIJZkvr5hm6/ruR5cd+A01XI+Bv8KRaxgd0cw7q50gPXLS6pfiClSuSJIqWugK7qA
DKo64OvwgjjIyps4JSZ/QDhZYYbFxHKeZXpmoxGBniC+j5p2SX6xcmgjYpBi8dcpYJOwr8Sh
3rCsAdbmg6vhpvkhwQf1p5MjsK4MI6MJ75uGL0Q1NkHL3YEDiV3MhAfuhC600LI3o8PPcf/6
CqeFs/ZAjMCLFqeYrzISlMVqv5YO7PLCPV+zr+7KAlgyxpmu756/HZ5mxdvTX/ujfOt/d5LN
c5dxg0+4avLufOhEHaBtp+jcVYMYD8uWOFpN0EmowwkRDvBLikkyURdGkxUl8/RSMrVbMqCc
1ngJGyWe/SfiD8dupCIFYWzQ4Ahhl59QDiumOiRNEO8EsuqCTNE0XWCSaTiQ2i2Rc7c8u+pD
XuOFKDqh9eJWWb912YTNp9GZjsZKwyk3r6dBy+OYdE8+q9ryWtZgOT3JJbo/njDcAwhcryKQ
4+vjw/Pd6e2oHOoM07X0FteNBLVxb+Xim8+/jAqYMHNttsYTJOWtlH71ZZwM0oLVymAYD5su
e/zreHd8nx0Pb6fHZ10yk7qXrpMFaVtzDJtkeDVMxs4JTxnXRbN0b6rhaq5p6wIUxD6uy9x6
fKaTZLzwYAsMbN6mupf9gMLHpGgHRvtw2rp4DNaU4rttF+UFa0t3uHmO8TwTwberLDXFd9CJ
w7Q12H84X5kUrsQF9bRdb35lS3Uozn1oP1MksG14cEsGMtIJLojSWX3DPBHLJUVAWvwB92lq
OgbRd+TY8NKUYvDChIekCURYSqgw7xIhJgE1WTYS0Z4crIjK3DNmigbOLVGUaVRGaMRdOB6H
yAczGbVchw4n6DQIX0uiZIRSJcO5SFLDaUnDyVJ2XxE87V/5W+mPJkw80q+M0VWY1BeYUOFZ
TbvhTug26XLq0kNRoAdQ6DQoCL84MFNrnnrcr7+mhlPXiAgAsSAxhtQy7G3hBsNa3eBYc3Tm
K7PSEKt0KFpyL+kPsEINhY4NDcf1SsH6TV7pF1gjPMhJsJFt0Lil1M/WpgxT4LyCRdd6zEFk
W8Di9OsmCcILk95gfYkdvVF41FAW0Oha5+9Zadx94e+PNl+RmU8UR+463qiK9RiLB3zYJa1B
2de+ZbpsWtZRqsevjLSC8yo1BFmiI4CPI439YoCImq9TOIhM+QA92DKSCY7Nb3DAWFoQPRMh
/MQNFyD/H0P4ABQ93AEA

--VbJkn9YxBvnuCH5J--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ming Lei <ming.lei@canonical.com>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Tue, 6 Oct 2015 15:20:20 +0800
Message-ID: <CACVXFVMgwv-6GAh6_dY3iVn=kJ36HPXoh-tx3BTvxtZNLvUg3Q@mail.gmail.com>
References: <20151006124322.2a50698e@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Return-path: <linux-next-owner@vger.kernel.org>
Received: from youngberry.canonical.com ([91.189.89.112]:43164 "EHLO
	youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751497AbbJFHUX (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Tue, 6 Oct 2015 03:20:23 -0400
In-Reply-To: <20151006124322.2a50698e@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jens Axboe <axboe@kernel.dk>, "linux-next@vger.kernel.org" <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Christoph Hellwig <hch@lst.de>

On Tue, Oct 6, 2015 at 9:43 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Jens,
>
> After merging the block tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/block/loop.c: In function 'lo_rw_aio_complete':
> drivers/block/loop.c:474:2: error: too few arguments to function 'blk_mq_complete_request'
>   blk_mq_complete_request(rq);
>   ^
> In file included from drivers/block/loop.h:14:0,
>                  from drivers/block/loop.c:79:
> include/linux/blk-mq.h:217:6: note: declared here
>  void blk_mq_complete_request(struct request *rq, int error);
>       ^
>
> Caused by commit
>
>   f4829a9b7a61 ("blk-mq: fix racy updates of rq->errors")
>
> from Linus' tree interacting with commit
>
>   bc07c10a3603 ("block: loop: support DIO & AIO")
>
> from the block tree.
>
> I added the this merge fix patch:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 6 Oct 2015 12:39:41 +1100
> Subject: [PATCH] blk-mq: merge fix for "fix racy updates of rq->errors"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/block/loop.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/block/loop.c b/drivers/block/loop.c
> index c692a3d812e4..9be61ad3163d 100644
> --- a/drivers/block/loop.c
> +++ b/drivers/block/loop.c
> @@ -470,8 +470,7 @@ static void lo_rw_aio_complete(struct kiocb *iocb, long ret, long ret2)
>         else if (ret < 0)
>                 ret = -EIO;
>
> -       rq->errors = ret;
> -       blk_mq_complete_request(rq);
> +       blk_mq_complete_request(rq, ret);

This merge fix looks fine, thanks.

>  }
>
>  static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd,
> --
> 2.5.1
>
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Mark Brown <broonie@kernel.org>
Subject: linux-next: build failure after merge of the block tree
Date: Wed, 2 Dec 2015 16:19:36 +0000
Message-ID: <20151202161936.22b23668cf9dea9872b5079b@kernel.org>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA256";
 boundary="Signature=_Wed__2_Dec_2015_16_19_36_+0000_sQMh_mghtVdA_23T"
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mezzanine.sirena.org.uk ([106.187.55.193]:57846 "EHLO
	mezzanine.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1750945AbbLBQTw (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Wed, 2 Dec 2015 11:19:52 -0500
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>, Keith Busch <keith.busch@intel.com>, Christoph Hellwig <hch@lst.de>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org

--Signature=_Wed__2_Dec_2015_16_19_36_+0000_sQMh_mghtVdA_23T
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Jens,

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

/home/broonie/next/next/drivers/nvme/host/lightnvm.c: In function 'nvme_nvm=
_identity':
/home/broonie/next/next/drivers/nvme/host/lightnvm.c:279:27: error: 'struct=
 nvme_ns' has no member named 'dev'
  struct nvme_dev *dev =3D ns->dev;
                           ^
/home/broonie/next/next/drivers/nvme/host/lightnvm.c:292:32: error: derefer=
encing pointer to incomplete type 'struct nvme_dev'
  ret =3D nvme_submit_sync_cmd(dev->admin_q, (struct nvme_command *)&c,
                                ^
/home/broonie/next/next/drivers/nvme/host/lightnvm.c: In function 'nvme_nvm=
_get_l2p_tbl':
/home/broonie/next/next/drivers/nvme/host/lightnvm.c:317:27: error: 'struct=
 nvme_ns' has no member named 'dev'
  struct nvme_dev *dev =3D ns->dev;
                           ^
/home/broonie/next/next/drivers/nvme/host/lightnvm.c:319:36: error: derefer=
encing pointer to incomplete type 'struct nvme_dev'
  u32 len =3D queue_max_hw_sectors(dev->admin_q) << 9;
                                    ^
/home/broonie/next/next/drivers/nvme/host/lightnvm.c: In function 'nvme_nvm=
_get_bb_tbl':
/home/broonie/next/next/drivers/nvme/host/lightnvm.c:365:27: error: 'struct=
 nvme_ns' has no member named 'dev'
  struct nvme_dev *dev =3D ns->dev;
                           ^
/home/broonie/next/next/drivers/nvme/host/lightnvm.c:379:32: error: derefer=
encing pointer to incomplete type 'struct nvme_dev'
  ret =3D nvme_submit_sync_cmd(dev->admin_q, (struct nvme_command *)&c,
                                ^
/home/broonie/next/next/drivers/nvme/host/lightnvm.c: In function 'nvme_nvm=
_set_bb_tbl':
/home/broonie/next/next/drivers/nvme/host/lightnvm.c:422:27: error: 'struct=
 nvme_ns' has no member named 'dev'
  struct nvme_dev *dev =3D ns->dev;
                           ^
/home/broonie/next/next/drivers/nvme/host/lightnvm.c:432:32: error: derefer=
encing pointer to incomplete type 'struct nvme_dev'
  ret =3D nvme_submit_sync_cmd(dev->admin_q, (struct nvme_command *)&c,
                                ^
/home/broonie/next/next/drivers/nvme/host/lightnvm.c: In function 'nvme_nvm=
_create_dma_pool':
/home/broonie/next/next/drivers/nvme/host/lightnvm.c:521:27: error: 'struct=
 nvme_ns' has no member named 'dev'
  struct nvme_dev *dev =3D ns->dev;
                           ^
/home/broonie/next/next/drivers/nvme/host/lightnvm.c:523:34: error: derefer=
encing pointer to incomplete type 'struct nvme_dev'
  return dma_pool_create(name, dev->dev, PAGE_SIZE, PAGE_SIZE, 0);
                                  ^
/home/broonie/next/next/drivers/nvme/host/lightnvm.c: In function 'nvme_nvm=
_ns_supported':
/home/broonie/next/next/drivers/nvme/host/lightnvm.c:576:27: error: 'struct=
 nvme_ns' has no member named 'dev'
  struct nvme_dev *dev =3D ns->dev;
                           ^
In file included from /home/broonie/next/next/include/linux/list.h:8:0,
                 from /home/broonie/next/next/include/linux/pci.h:25,
                 from /home/broonie/next/next/drivers/nvme/host/nvme.h:18,
                 from /home/broonie/next/next/drivers/nvme/host/lightnvm.c:=
23:
/home/broonie/next/next/drivers/nvme/host/lightnvm.c:577:39: error: derefer=
encing pointer to incomplete type 'struct nvme_dev'
  struct pci_dev *pdev =3D to_pci_dev(dev->dev);
                                       ^
/home/broonie/next/next/include/linux/kernel.h:813:49: note: in definition =
of macro 'container_of'
  const typeof( ((type *)0)->member ) *__mptr =3D (ptr); \
                                                 ^
/home/broonie/next/next/drivers/nvme/host/lightnvm.c:577:25: note: in expan=
sion of macro 'to_pci_dev'
  struct pci_dev *pdev =3D to_pci_dev(dev->dev);
                         ^
/home/broonie/next/next/drivers/nvme/host/lightnvm.c: In function 'nvme_nvm=
_create_dma_pool':
/home/broonie/next/next/drivers/nvme/host/lightnvm.c:524:1: warning: contro=
l reaches end of non-void function [-Wreturn-type]
 }
 ^
/home/broonie/next/next/scripts/Makefile.build:258: recipe for target 'driv=
ers/nvme/host/lightnvm.o' failed
make[4]: *** [drivers/nvme/host/lightnvm.o] Error 1

Caused by commit 1c63dc66580d4b (nvme: split a new struct nvme_ctrl out of
struct nvme_dev) which replaced dev in struct nvme_ns with ctrl without
updating this user. I used the block tree from the last -next build
(3f3a8a218c2f) instead.

--Signature=_Wed__2_Dec_2015_16_19_36_+0000_sQMh_mghtVdA_23T
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQEcBAEBCAAGBQJWXxoYAAoJECTWi3JdVIfQlWAH/jUBqqtWhNJAHXYEK4GfvNOY
NRIpqJqCykR9g2lLPJ8u+O86MjLRZYxZQifm8z6wGzEu8F4zVClwkGJItLpnTe1/
9Ehocl0O45UMVpIBOa8Q08H3vg69B01wBfcDFLu5tOAMnkwBeGYreo+eEYYwqlpL
49kgk/VdSr7JrpObD8HaMNBwyl0oFhIfN64GnMfG4t2UpPmsMkiaSSOB6/OTQU1u
owZobY1n6k61leuMTYaIBHdhAjeY63tTxvnuVrJFNRvIvYhddX7rzoBORDq92SM/
syjRbfeJekq3sxdhvIRY1a42AqnVpTImJTquN1MkAn2f7PTN8NT/bshJa45e2f8=
=7c8o
-----END PGP SIGNATURE-----

--Signature=_Wed__2_Dec_2015_16_19_36_+0000_sQMh_mghtVdA_23T--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Christoph Hellwig <hch@lst.de>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Wed, 2 Dec 2015 17:45:27 +0100
Message-ID: <20151202164527.GA31048@lst.de>
References: <20151202161936.22b23668cf9dea9872b5079b@kernel.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-next-owner@vger.kernel.org>
Received: from verein.lst.de ([213.95.11.211]:59006 "EHLO newverein.lst.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751209AbbLBQpb (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Wed, 2 Dec 2015 11:45:31 -0500
Content-Disposition: inline
In-Reply-To: <20151202161936.22b23668cf9dea9872b5079b@kernel.org>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Mark Brown <broonie@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>, Keith Busch <keith.busch@intel.com>, Christoph Hellwig <hch@lst.de>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org

Looks like I didn't test with CONFIG_NVM enabled, and neither did
the build bot.

Most of this is really weird crazy shit in the lighnvm support, though.

Struct nvme_ns is a structure for the NVM I/O command set, and it has
no business poking into it.  Second this commit:

commit 47b3115ae7b799be8b77b0f024215ad4f68d6460
Author: Wenwei Tao <ww.tao0320@gmail.com>
Date:   Fri Nov 20 13:47:55 2015 +0100

    nvme: lightnvm: use admin queues for admin cmds

Does even more crazy stuff.  If a function gets a request_queue parameter
passed it'd better use that and not look for another one.

Quick patch below, but this code will need some more attention:

diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c
index d5622f9..09cf0b9 100644
--- a/drivers/nvme/host/lightnvm.c
+++ b/drivers/nvme/host/lightnvm.c
@@ -276,7 +276,6 @@ static int init_grps(struct nvm_id *nvm_id, struct nvme_nvm_id *nvme_nvm_id)
 static int nvme_nvm_identity(struct request_queue *q, struct nvm_id *nvm_id)
 {
 	struct nvme_ns *ns = q->queuedata;
-	struct nvme_dev *dev = ns->dev;
 	struct nvme_nvm_id *nvme_nvm_id;
 	struct nvme_nvm_command c = {};
 	int ret;
@@ -289,7 +288,7 @@ static int nvme_nvm_identity(struct request_queue *q, struct nvm_id *nvm_id)
 	if (!nvme_nvm_id)
 		return -ENOMEM;
 
-	ret = nvme_submit_sync_cmd(dev->admin_q, (struct nvme_command *)&c,
+	ret = nvme_submit_sync_cmd(ns->ctrl->admin_q, (struct nvme_command *)&c,
 				nvme_nvm_id, sizeof(struct nvme_nvm_id));
 	if (ret) {
 		ret = -EIO;
@@ -314,9 +313,8 @@ static int nvme_nvm_get_l2p_tbl(struct request_queue *q, u64 slba, u32 nlb,
 				nvm_l2p_update_fn *update_l2p, void *priv)
 {
 	struct nvme_ns *ns = q->queuedata;
-	struct nvme_dev *dev = ns->dev;
 	struct nvme_nvm_command c = {};
-	u32 len = queue_max_hw_sectors(dev->admin_q) << 9;
+	u32 len = queue_max_hw_sectors(ns->ctrl->admin_q) << 9;
 	u32 nlb_pr_rq = len / sizeof(u64);
 	u64 cmd_slba = slba;
 	void *entries;
@@ -334,10 +332,10 @@ static int nvme_nvm_get_l2p_tbl(struct request_queue *q, u64 slba, u32 nlb,
 		c.l2p.slba = cpu_to_le64(cmd_slba);
 		c.l2p.nlb = cpu_to_le32(cmd_nlb);
 
-		ret = nvme_submit_sync_cmd(dev->admin_q,
+		ret = nvme_submit_sync_cmd(ns->ctrl->admin_q,
 				(struct nvme_command *)&c, entries, len);
 		if (ret) {
-			dev_err(dev->dev, "L2P table transfer failed (%d)\n",
+			dev_err(ns->ctrl->dev, "L2P table transfer failed (%d)\n",
 									ret);
 			ret = -EIO;
 			goto out;
@@ -362,7 +360,7 @@ static int nvme_nvm_get_bb_tbl(struct request_queue *q, struct ppa_addr ppa,
 				void *priv)
 {
 	struct nvme_ns *ns = q->queuedata;
-	struct nvme_dev *dev = ns->dev;
+	struct nvme_ctrl *ctrl = ns->ctrl;
 	struct nvme_nvm_command c = {};
 	struct nvme_nvm_bb_tbl *bb_tbl;
 	int tblsz = sizeof(struct nvme_nvm_bb_tbl) + nr_blocks;
@@ -376,30 +374,30 @@ static int nvme_nvm_get_bb_tbl(struct request_queue *q, struct ppa_addr ppa,
 	if (!bb_tbl)
 		return -ENOMEM;
 
-	ret = nvme_submit_sync_cmd(dev->admin_q, (struct nvme_command *)&c,
+	ret = nvme_submit_sync_cmd(ctrl->admin_q, (struct nvme_command *)&c,
 								bb_tbl, tblsz);
 	if (ret) {
-		dev_err(dev->dev, "get bad block table failed (%d)\n", ret);
+		dev_err(ctrl->dev, "get bad block table failed (%d)\n", ret);
 		ret = -EIO;
 		goto out;
 	}
 
 	if (bb_tbl->tblid[0] != 'B' || bb_tbl->tblid[1] != 'B' ||
 		bb_tbl->tblid[2] != 'L' || bb_tbl->tblid[3] != 'T') {
-		dev_err(dev->dev, "bbt format mismatch\n");
+		dev_err(ctrl->dev, "bbt format mismatch\n");
 		ret = -EINVAL;
 		goto out;
 	}
 
 	if (le16_to_cpu(bb_tbl->verid) != 1) {
 		ret = -EINVAL;
-		dev_err(dev->dev, "bbt version not supported\n");
+		dev_err(ctrl->dev, "bbt version not supported\n");
 		goto out;
 	}
 
 	if (le32_to_cpu(bb_tbl->tblks) != nr_blocks) {
 		ret = -EINVAL;
-		dev_err(dev->dev, "bbt unsuspected blocks returned (%u!=%u)",
+		dev_err(ctrl->dev, "bbt unsuspected blocks returned (%u!=%u)",
 					le32_to_cpu(bb_tbl->tblks), nr_blocks);
 		goto out;
 	}
@@ -419,7 +417,6 @@ static int nvme_nvm_set_bb_tbl(struct request_queue *q, struct nvm_rq *rqd,
 								int type)
 {
 	struct nvme_ns *ns = q->queuedata;
-	struct nvme_dev *dev = ns->dev;
 	struct nvme_nvm_command c = {};
 	int ret = 0;
 
@@ -429,10 +426,10 @@ static int nvme_nvm_set_bb_tbl(struct request_queue *q, struct nvm_rq *rqd,
 	c.set_bb.nlb = cpu_to_le16(rqd->nr_pages - 1);
 	c.set_bb.value = type;
 
-	ret = nvme_submit_sync_cmd(dev->admin_q, (struct nvme_command *)&c,
+	ret = nvme_submit_sync_cmd(ns->ctrl->admin_q, (struct nvme_command *)&c,
 								NULL, 0);
 	if (ret)
-		dev_err(dev->dev, "set bad block table failed (%d)\n", ret);
+		dev_err(ns->ctrl->dev, "set bad block table failed (%d)\n", ret);
 	return ret;
 }
 
@@ -518,9 +515,8 @@ static int nvme_nvm_erase_block(struct request_queue *q, struct nvm_rq *rqd)
 static void *nvme_nvm_create_dma_pool(struct request_queue *q, char *name)
 {
 	struct nvme_ns *ns = q->queuedata;
-	struct nvme_dev *dev = ns->dev;
 
-	return dma_pool_create(name, dev->dev, PAGE_SIZE, PAGE_SIZE, 0);
+	return dma_pool_create(name, ns->ctrl->dev, PAGE_SIZE, PAGE_SIZE, 0);
 }
 
 static void nvme_nvm_destroy_dma_pool(void *pool)
@@ -573,8 +569,9 @@ void nvme_nvm_unregister(struct request_queue *q, char *disk_name)
 
 int nvme_nvm_ns_supported(struct nvme_ns *ns, struct nvme_id_ns *id)
 {
-	struct nvme_dev *dev = ns->dev;
-	struct pci_dev *pdev = to_pci_dev(dev->dev);
+	struct nvme_ctrl *ctrl = ns->ctrl;
+	/* XXX: this is poking into PCI structures from generic code! */
+	struct pci_dev *pdev = to_pci_dev(ctrl->dev);
 
 	/* QEMU NVMe simulator - PCI ID + Vendor specific bit */
 	if (pdev->vendor == PCI_VENDOR_ID_INTEL && pdev->device == 0x5845 &&

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Wed, 2 Dec 2015 14:07:34 -0700
Message-ID: <565F5D96.5050902@kernel.dk>
References: <20151202161936.22b23668cf9dea9872b5079b@kernel.org>
 <20151202164527.GA31048@lst.de>
Mime-Version: 1.0
Content-Type: text/plain; charset=windows-1252;
	format=flowed
Content-Transfer-Encoding: QUOTED-PRINTABLE
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <20151202164527.GA31048@lst.de>
Sender: linux-kernel-owner@vger.kernel.org
To: Christoph Hellwig <hch@lst.de>, Mark Brown <broonie@kernel.org>
Cc: Keith Busch <keith.busch@intel.com>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org
List-Id: linux-next.vger.kernel.org

On 12/02/2015 09:45 AM, Christoph Hellwig wrote:
> Looks like I didn't test with CONFIG_NVM enabled, and neither did
> the build bot.
>
> Most of this is really weird crazy shit in the lighnvm support, thoug=
h.
>
> Struct nvme_ns is a structure for the NVM I/O command set, and it has
> no business poking into it.  Second this commit:
>
> commit 47b3115ae7b799be8b77b0f024215ad4f68d6460
> Author: Wenwei Tao <ww.tao0320@gmail.com>
> Date:   Fri Nov 20 13:47:55 2015 +0100
>
>      nvme: lightnvm: use admin queues for admin cmds
>
> Does even more crazy stuff.  If a function gets a request_queue param=
eter
> passed it'd better use that and not look for another one.
>
> Quick patch below, but this code will need some more attention:

Christoph, for-4.5/nvme also fails if integrity isn't enabled:

   CC      drivers/nvme/host/core.o
drivers/nvme/host/core.c: In function =91__nvme_submit_user_cmd=92:
drivers/nvme/host/core.c:192:10: error: implicit declaration of functio=
n=20
=91bio_integrity_alloc=92 [-Werror=3Dimplicit-function-declaration]
     bip =3D bio_integrity_alloc(bio, GFP_KERNEL, 1);
           ^
drivers/nvme/host/core.c:192:8: warning: assignment makes pointer from=20
integer without a cast [-Wint-conversion]
     bip =3D bio_integrity_alloc(bio, GFP_KERNEL, 1);
         ^
drivers/nvme/host/core.c:198:7: error: dereferencing pointer to=20
incomplete type =91struct bio_integrity_payload=92
     bip->bip_iter.bi_size =3D meta_len;
        ^
drivers/nvme/host/core.c:201:10: error: implicit declaration of functio=
n=20
=91bio_integrity_add_page=92 [-Werror=3Dimplicit-function-declaration]
     ret =3D bio_integrity_add_page(bio, virt_to_page(meta),
           ^


--=20
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Keith Busch <keith.busch@intel.com>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Wed, 2 Dec 2015 21:14:00 +0000
Message-ID: <20151202211400.GB31364@localhost.localdomain>
References: <20151202161936.22b23668cf9dea9872b5079b@kernel.org>
 <20151202164527.GA31048@lst.de>
 <565F5D96.5050902@kernel.dk>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-kernel-owner@vger.kernel.org>
Content-Disposition: inline
In-Reply-To: <565F5D96.5050902@kernel.dk>
Sender: linux-kernel-owner@vger.kernel.org
To: Jens Axboe <axboe@kernel.dk>
Cc: Christoph Hellwig <hch@lst.de>, Mark Brown <broonie@kernel.org>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org
List-Id: linux-next.vger.kernel.org

On Wed, Dec 02, 2015 at 02:07:34PM -0700, Jens Axboe wrote:
> Christoph, for-4.5/nvme also fails if integrity isn't enabled:

I forgot about this since I've merged this in my repo to fix:

https://lkml.org/lkml/2015/10/26/546

That ok, or should we handle this differently?

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Wed, 2 Dec 2015 14:27:40 -0700
Message-ID: <565F624C.9090301@kernel.dk>
References: <20151202161936.22b23668cf9dea9872b5079b@kernel.org>
 <20151202164527.GA31048@lst.de> <565F5D96.5050902@kernel.dk>
 <20151202211400.GB31364@localhost.localdomain>
Mime-Version: 1.0
Content-Type: multipart/mixed;
 boundary="------------090104070608000009080408"
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mail-pf0-f170.google.com ([209.85.192.170]:33629 "EHLO
	mail-pf0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752561AbbLBV1o (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Wed, 2 Dec 2015 16:27:44 -0500
Received: by pfnn128 with SMTP id n128so1891422pfn.0
        for <linux-next@vger.kernel.org>; Wed, 02 Dec 2015 13:27:43 -0800 (PST)
In-Reply-To: <20151202211400.GB31364@localhost.localdomain>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Keith Busch <keith.busch@intel.com>
Cc: Christoph Hellwig <hch@lst.de>, Mark Brown <broonie@kernel.org>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org

This is a multi-part message in MIME format.
--------------090104070608000009080408
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit

On 12/02/2015 02:14 PM, Keith Busch wrote:
> On Wed, Dec 02, 2015 at 02:07:34PM -0700, Jens Axboe wrote:
>> Christoph, for-4.5/nvme also fails if integrity isn't enabled:
>
> I forgot about this since I've merged this in my repo to fix:
>
> https://lkml.org/lkml/2015/10/26/546
>
> That ok, or should we handle this differently?

I think that should make it compile, but the behavior will be a bit odd. 
If you pass in meta and integrity isn't enabled, you'll get an ENOMEM 
error. That seems a bit nonsensical.

We could make bio_integrity_alloc() return an error pointer. That way we 
could retain the ifdefs in the bip code, and not let it spread to drivers.

-- 
Jens Axboe


--------------090104070608000009080408
Content-Type: text/x-patch;
 name="int-err.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="int-err.patch"

diff --git a/block/bio-integrity.c b/block/bio-integrity.c
index f6325d573c10..e6ba501eb746 100644
--- a/block/bio-integrity.c
+++ b/block/bio-integrity.c
@@ -66,7 +66,7 @@ struct bio_integrity_payload *bio_integrity_alloc(struct bio *bio,
 	}
 
 	if (unlikely(!bip))
-		return NULL;
+		return ERR_PTR(-ENOMEM);
 
 	memset(bip, 0, sizeof(*bip));
 
@@ -89,7 +89,7 @@ struct bio_integrity_payload *bio_integrity_alloc(struct bio *bio,
 	return bip;
 err:
 	mempool_free(bip, bs->bio_integrity_pool);
-	return NULL;
+	return ERR_PTR(-ENOMEM);
 }
 EXPORT_SYMBOL(bio_integrity_alloc);
 
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index c61bde9921d2..f9c4e80c2441 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -190,8 +190,8 @@ int __nvme_submit_user_cmd(struct request_queue *q, struct nvme_command *cmd,
 			}
 
 			bip = bio_integrity_alloc(bio, GFP_KERNEL, 1);
-			if (!bip) {
-				ret = -ENOMEM;
+			if (IS_ERR(bip)) {
+				ret = PTR_ERR(bip);
 				goto out_free_meta;
 			}
 
diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c
index f29c69120054..d5891b6ea737 100644
--- a/drivers/target/target_core_iblock.c
+++ b/drivers/target/target_core_iblock.c
@@ -613,9 +613,9 @@ iblock_alloc_bip(struct se_cmd *cmd, struct bio *bio)
 	}
 
 	bip = bio_integrity_alloc(bio, GFP_NOIO, cmd->t_prot_nents);
-	if (!bip) {
+	if (IS_ERR(bip)) {
 		pr_err("Unable to allocate bio_integrity_payload\n");
-		return -ENOMEM;
+		return PTR_ERR(bip);
 	}
 
 	bip->bip_iter.bi_size = (cmd->data_length / dev->dev_attrib.block_size) *
diff --git a/include/linux/bio.h b/include/linux/bio.h
index b9b6e046b52e..5349e6816cbb 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -318,16 +318,6 @@ enum bip_flags {
 	BIP_IP_CHECKSUM		= 1 << 4, /* IP checksum */
 };
 
-#if defined(CONFIG_BLK_DEV_INTEGRITY)
-
-static inline struct bio_integrity_payload *bio_integrity(struct bio *bio)
-{
-	if (bio->bi_rw & REQ_INTEGRITY)
-		return bio->bi_integrity;
-
-	return NULL;
-}
-
 /*
  * bio integrity payload
  */
@@ -349,6 +339,16 @@ struct bio_integrity_payload {
 	struct bio_vec		bip_inline_vecs[0];/* embedded bvec array */
 };
 
+#if defined(CONFIG_BLK_DEV_INTEGRITY)
+
+static inline struct bio_integrity_payload *bio_integrity(struct bio *bio)
+{
+	if (bio->bi_rw & REQ_INTEGRITY)
+		return bio->bi_integrity;
+
+	return NULL;
+}
+
 static inline bool bio_integrity_flagged(struct bio *bio, enum bip_flags flag)
 {
 	struct bio_integrity_payload *bip = bio_integrity(bio);
@@ -795,6 +795,18 @@ static inline bool bio_integrity_flagged(struct bio *bio, enum bip_flags flag)
 	return false;
 }
 
+static inline void *bio_integrity_alloc(struct bio * bio, gfp_t gfp,
+								unsigned int nr)
+{
+	return ERR_PTR(-EINVAL);
+}
+
+static inline int bio_integrity_add_page(struct bio *bio, struct page *page,
+					unsigned int len, unsigned int offset)
+{
+	return 0;
+}
+
 #endif /* CONFIG_BLK_DEV_INTEGRITY */
 
 #endif /* CONFIG_BLOCK */

--------------090104070608000009080408--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Christoph Hellwig <hch@lst.de>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 3 Dec 2015 08:35:22 +0100
Message-ID: <20151203073522.GA12920@lst.de>
References: <20151202161936.22b23668cf9dea9872b5079b@kernel.org> <20151202164527.GA31048@lst.de> <565F5D96.5050902@kernel.dk> <20151202211400.GB31364@localhost.localdomain> <565F624C.9090301@kernel.dk>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-next-owner@vger.kernel.org>
Received: from verein.lst.de ([213.95.11.211]:33365 "EHLO newverein.lst.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1750858AbbLCHfY (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Thu, 3 Dec 2015 02:35:24 -0500
Content-Disposition: inline
In-Reply-To: <565F624C.9090301@kernel.dk>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: Keith Busch <keith.busch@intel.com>, Christoph Hellwig <hch@lst.de>, Mark Brown <broonie@kernel.org>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org

On Wed, Dec 02, 2015 at 02:27:40PM -0700, Jens Axboe wrote:
> On 12/02/2015 02:14 PM, Keith Busch wrote:
>> On Wed, Dec 02, 2015 at 02:07:34PM -0700, Jens Axboe wrote:
>>> Christoph, for-4.5/nvme also fails if integrity isn't enabled:
>>
>> I forgot about this since I've merged this in my repo to fix:
>>
>> https://lkml.org/lkml/2015/10/26/546
>>
>> That ok, or should we handle this differently?
>
> I think that should make it compile, but the behavior will be a bit odd. If 
> you pass in meta and integrity isn't enabled, you'll get an ENOMEM error. 
> That seems a bit nonsensical.
>
> We could make bio_integrity_alloc() return an error pointer. That way we 
> could retain the ifdefs in the bip code, and not let it spread to drivers.

This looks reasonable to me.

From mboxrd@z Thu Jan  1 00:00:00 1970
From: =?UTF-8?Q?Matias_Bj=c3=b8rling?= <m@bjorling.me>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 3 Dec 2015 09:39:01 +0100
Message-ID: <565FFFA5.6000003@bjorling.me>
References: <20151202161936.22b23668cf9dea9872b5079b@kernel.org>
 <20151202164527.GA31048@lst.de> <565F5D96.5050902@kernel.dk>
Mime-Version: 1.0
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mail-wm0-f48.google.com ([74.125.82.48]:34309 "EHLO
	mail-wm0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1758675AbbLCIjE (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Thu, 3 Dec 2015 03:39:04 -0500
Received: by wmvv187 with SMTP id v187so15489429wmv.1
        for <linux-next@vger.kernel.org>; Thu, 03 Dec 2015 00:39:03 -0800 (PST)
In-Reply-To: <565F5D96.5050902@kernel.dk>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>, Christoph Hellwig <hch@lst.de>, Mark Brown <broonie@kernel.org>
Cc: Keith Busch <keith.busch@intel.com>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org

On 12/02/2015 10:07 PM, Jens Axboe wrote:
> On 12/02/2015 09:45 AM, Christoph Hellwig wrote:
>> Looks like I didn't test with CONFIG_NVM enabled, and neither did
>> the build bot.
>>
>> Most of this is really weird crazy shit in the lighnvm support, though.
>>
>> Struct nvme_ns is a structure for the NVM I/O command set, and it has
>> no business poking into it.  Second this commit:
>>
>> commit 47b3115ae7b799be8b77b0f024215ad4f68d6460
>> Author: Wenwei Tao <ww.tao0320@gmail.com>
>> Date:   Fri Nov 20 13:47:55 2015 +0100
>>
>>      nvme: lightnvm: use admin queues for admin cmds
>>
>> Does even more crazy stuff.  If a function gets a request_queue parameter
>> passed it'd better use that and not look for another one.

A little crazy yes. The reason is that the NVMe admin queues and NVMe 
user queues are driven by different request queues. Previously this was 
patched up with having two queues in the lightnvm core. One for admin 
and another for user. But was later merged into a single queue.

We can pass both request queues into lightnvm core, but I prefer to 
handle it in some good way in the nvme-lightnvm integration.

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Christoph Hellwig <hch@lst.de>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 3 Dec 2015 10:06:38 +0100
Message-ID: <20151203090638.GA14329@lst.de>
References: <20151202161936.22b23668cf9dea9872b5079b@kernel.org> <20151202164527.GA31048@lst.de> <565F5D96.5050902@kernel.dk> <565FFFA5.6000003@bjorling.me>
Mime-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: QUOTED-PRINTABLE
Return-path: <linux-kernel-owner@vger.kernel.org>
Content-Disposition: inline
In-Reply-To: <565FFFA5.6000003@bjorling.me>
Sender: linux-kernel-owner@vger.kernel.org
To: Matias =?iso-8859-1?Q?Bj=F8rling?= <m@bjorling.me>
Cc: Jens Axboe <axboe@kernel.dk>, Christoph Hellwig <hch@lst.de>, Mark Brown <broonie@kernel.org>, Keith Busch <keith.busch@intel.com>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org
List-Id: linux-next.vger.kernel.org

On Thu, Dec 03, 2015 at 09:39:01AM +0100, Matias Bj=F8rling wrote:
> A little crazy yes. The reason is that the NVMe admin queues and NVMe=
 user=20
> queues are driven by different request queues. Previously this was pa=
tched=20
> up with having two queues in the lightnvm core. One for admin and ano=
ther=20
> for user. But was later merged into a single queue.

Why?  If you look at the current structure we have the admin queue
which is always allocated by the Low level driver, although it could an=
d
should move to the core eventually.  And then we have Command set speci=
fic
request_queues for the I/O queues.  One per NS for NVM currenly, either
one per NS or one globally for LightNVM, and in Fabrics I currently
have another magic one :)  Due to the tagset pointer in struct nvme_ctr=
l
that's really easy to handle.

From mboxrd@z Thu Jan  1 00:00:00 1970
From: =?UTF-8?Q?Matias_Bj=c3=b8rling?= <m@bjorling.me>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 3 Dec 2015 10:52:46 +0100
Message-ID: <566010EE.6050806@bjorling.me>
References: <20151202161936.22b23668cf9dea9872b5079b@kernel.org>
 <20151202164527.GA31048@lst.de> <565F5D96.5050902@kernel.dk>
 <565FFFA5.6000003@bjorling.me> <20151203090638.GA14329@lst.de>
Mime-Version: 1.0
Content-Type: text/plain; charset=windows-1252;
	format=flowed
Content-Transfer-Encoding: QUOTED-PRINTABLE
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mail-wm0-f41.google.com ([74.125.82.41]:36247 "EHLO
	mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S932496AbbLCJwt (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Thu, 3 Dec 2015 04:52:49 -0500
Received: by wmww144 with SMTP id w144so13572383wmw.1
        for <linux-next@vger.kernel.org>; Thu, 03 Dec 2015 01:52:48 -0800 (PST)
In-Reply-To: <20151203090638.GA14329@lst.de>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Christoph Hellwig <hch@lst.de>
Cc: Jens Axboe <axboe@kernel.dk>, Mark Brown <broonie@kernel.org>, Keith Busch <keith.busch@intel.com>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org

On 12/03/2015 10:06 AM, Christoph Hellwig wrote:
> On Thu, Dec 03, 2015 at 09:39:01AM +0100, Matias Bj=F8rling wrote:
>> A little crazy yes. The reason is that the NVMe admin queues and NVM=
e user
>> queues are driven by different request queues. Previously this was p=
atched
>> up with having two queues in the lightnvm core. One for admin and an=
other
>> for user. But was later merged into a single queue.
>
> Why?  If you look at the current structure we have the admin queue
> which is always allocated by the Low level driver, although it could =
and
> should move to the core eventually.  And then we have Command set spe=
cific
> request_queues for the I/O queues.  One per NS for NVM currenly, eith=
er
> one per NS or one globally for LightNVM, and in Fabrics I currently
> have another magic one :)  Due to the tagset pointer in struct nvme_c=
trl
> that's really easy to handle.
>

The identify geometry command and bad block commands are part of the=20
admin command set. Surely, as all these take a ns id, they can be moved=
=20
and be accessed naturally through the user queues.

Let me send out a revert for that patch.

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Christoph Hellwig <hch@lst.de>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 3 Dec 2015 10:57:26 +0100
Message-ID: <20151203095726.GA15428@lst.de>
References: <20151202161936.22b23668cf9dea9872b5079b@kernel.org> <20151202164527.GA31048@lst.de> <565F5D96.5050902@kernel.dk> <565FFFA5.6000003@bjorling.me> <20151203090638.GA14329@lst.de> <566010EE.6050806@bjorling.me>
Mime-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: QUOTED-PRINTABLE
Return-path: <linux-next-owner@vger.kernel.org>
Received: from verein.lst.de ([213.95.11.211]:33849 "EHLO newverein.lst.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S932655AbbLCJ52 (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Thu, 3 Dec 2015 04:57:28 -0500
Content-Disposition: inline
In-Reply-To: <566010EE.6050806@bjorling.me>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Matias =?iso-8859-1?Q?Bj=F8rling?= <m@bjorling.me>
Cc: Jens Axboe <axboe@kernel.dk>, Mark Brown <broonie@kernel.org>, Keith Busch <keith.busch@intel.com>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org

On Thu, Dec 03, 2015 at 10:52:46AM +0100, Matias Bj=F8rling wrote:
> The identify geometry command and bad block commands are part of the =
admin=20
> command set. Surely, as all these take a ns id, they can be moved and=
 be=20
> accessed naturally through the user queues.

Nah, these admin commands should go through the admin queue - but
having a request_queue as the argument to the callback just seems rathe=
r
off if it's not the right one.  Why can't you just pass the 'struct nvm=
_dev'
instead of the request_queue for these methods?

From mboxrd@z Thu Jan  1 00:00:00 1970
From: =?UTF-8?Q?Matias_Bj=c3=b8rling?= <m@bjorling.me>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 3 Dec 2015 11:09:03 +0100
Message-ID: <566014BF.3080702@bjorling.me>
References: <20151202161936.22b23668cf9dea9872b5079b@kernel.org>
 <20151202164527.GA31048@lst.de> <565F5D96.5050902@kernel.dk>
 <565FFFA5.6000003@bjorling.me> <20151203090638.GA14329@lst.de>
 <566010EE.6050806@bjorling.me> <20151203095726.GA15428@lst.de>
Mime-Version: 1.0
Content-Type: text/plain; charset=windows-1252;
	format=flowed
Content-Transfer-Encoding: QUOTED-PRINTABLE
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <20151203095726.GA15428@lst.de>
Sender: linux-kernel-owner@vger.kernel.org
To: Christoph Hellwig <hch@lst.de>
Cc: Jens Axboe <axboe@kernel.dk>, Mark Brown <broonie@kernel.org>, Keith Busch <keith.busch@intel.com>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org
List-Id: linux-next.vger.kernel.org



On 12/03/2015 10:57 AM, Christoph Hellwig wrote:
> On Thu, Dec 03, 2015 at 10:52:46AM +0100, Matias Bj=F8rling wrote:
>> The identify geometry command and bad block commands are part of the=
 admin
>> command set. Surely, as all these take a ns id, they can be moved an=
d be
>> accessed naturally through the user queues.
>
> Nah, these admin commands should go through the admin queue - but
> having a request_queue as the argument to the callback just seems rat=
her
> off if it's not the right one.  Why can't you just pass the 'struct n=
vm_dev'
> instead of the request_queue for these methods?
>

That'll work as well.

Similar to this?

diff --git i/drivers/lightnvm/core.c w/drivers/lightnvm/core.c
index 86ce887..4a8d1fe 100644
--- i/drivers/lightnvm/core.c
+++ w/drivers/lightnvm/core.c
@@ -74,7 +74,7 @@ EXPORT_SYMBOL(nvm_unregister_target);
  void *nvm_dev_dma_alloc(struct nvm_dev *dev, gfp_t mem_flags,
  							dma_addr_t *dma_handler)
  {
-	return dev->ops->dev_dma_alloc(dev->q, dev->ppalist_pool, mem_flags,
+	return dev->ops->dev_dma_alloc(dev, dev->ppalist_pool, mem_flags,
  								dma_handler);
  }
  EXPORT_SYMBOL(nvm_dev_dma_alloc);
@@ -246,7 +246,7 @@ static int nvm_init(struct nvm_dev *dev)
  	if (!dev->q || !dev->ops)
  		return ret;

-	if (dev->ops->identity(dev->q, &dev->identity)) {
+	if (dev->ops->identity(dev, &dev->identity)) {
  		pr_err("nvm: device could not be identified\n");
  		goto err;
  	}
@@ -326,8 +326,7 @@ int nvm_register(struct request_queue *q, char=20
*disk_name,
  	}

  	if (dev->ops->max_phys_sect > 1) {
-		dev->ppalist_pool =3D dev->ops->create_dma_pool(dev->q,
-								"ppalist");
+		dev->ppalist_pool =3D dev->ops->create_dma_pool(dev, "ppalist");
  		if (!dev->ppalist_pool) {
  			pr_err("nvm: could not create ppa pool\n");
  			ret =3D -ENOMEM;
diff --git i/drivers/nvme/host/lightnvm.c w/drivers/nvme/host/lightnvm.=
c
index 762c9a7..15f2acb 100644
--- i/drivers/nvme/host/lightnvm.c
+++ w/drivers/nvme/host/lightnvm.c
@@ -271,9 +271,9 @@ static int init_grps(struct nvm_id *nvm_id, struct=20
nvme_nvm_id *nvme_nvm_id)
  	return 0;
  }

-static int nvme_nvm_identity(struct request_queue *q, struct nvm_id=20
*nvm_id)
+static int nvme_nvm_identity(struct nvm_dev *nvmdev, struct nvm_id *nv=
m_id)
  {
-	struct nvme_ns *ns =3D q->queuedata;
+	struct nvme_ns *ns =3D nvmdev->q->queuedata;
  	struct nvme_dev *dev =3D ns->dev;
  	struct nvme_nvm_id *nvme_nvm_id;
  	struct nvme_nvm_command c =3D {};
@@ -308,10 +308,10 @@ out:
  	return ret;
  }

-static int nvme_nvm_get_l2p_tbl(struct request_queue *q, u64 slba, u32=
 nlb,
+static int nvme_nvm_get_l2p_tbl(struct nvm_dev *nvmdev, u64 slba, u32 =
nlb,
  				nvm_l2p_update_fn *update_l2p, void *priv)
  {
-	struct nvme_ns *ns =3D q->queuedata;
+	struct nvme_ns *ns =3D nvmdev->q->queuedata;
  	struct nvme_dev *dev =3D ns->dev;
  	struct nvme_nvm_command c =3D {};
  	u32 len =3D queue_max_hw_sectors(dev->admin_q) << 9;
@@ -415,10 +415,10 @@ out:
  	return ret;
  }

-static int nvme_nvm_set_bb_tbl(struct request_queue *q, struct nvm_rq =
*rqd,
+static int nvme_nvm_set_bb_tbl(struct nvm_dev *nvmdev, struct nvm_rq *=
rqd,
  								int type)
  {
-	struct nvme_ns *ns =3D q->queuedata;
+	struct nvme_ns *ns =3D nvmdev->q->queuedata;
  	struct nvme_dev *dev =3D ns->dev;
  	struct nvme_nvm_command c =3D {};
  	int ret =3D 0;
@@ -463,8 +463,9 @@ static void nvme_nvm_end_io(struct request *rq, int=
=20
error)
  	blk_mq_free_request(rq);
  }

-static int nvme_nvm_submit_io(struct request_queue *q, struct nvm_rq *=
rqd)
+static int nvme_nvm_submit_io(struct nvm_dev *dev, struct nvm_rq *rqd)
  {
+	struct request_queue *q =3D dev->q;
  	struct nvme_ns *ns =3D q->queuedata;
  	struct request *rq;
  	struct bio *bio =3D rqd->bio;
@@ -502,8 +503,9 @@ static int nvme_nvm_submit_io(struct request_queue=20
*q, struct nvm_rq *rqd)
  	return 0;
  }

-static int nvme_nvm_erase_block(struct request_queue *q, struct nvm_rq=
=20
*rqd)
+static int nvme_nvm_erase_block(struct nvm_dev *dev, struct nvm_rq *rq=
d)
  {
+	struct request_queue *q =3D dev->q;
  	struct nvme_ns *ns =3D q->queuedata;
  	struct nvme_nvm_command c =3D {};

@@ -515,9 +517,9 @@ static int nvme_nvm_erase_block(struct request_queu=
e=20
*q, struct nvm_rq *rqd)
  	return nvme_submit_sync_cmd(q, (struct nvme_command *)&c, NULL, 0);
  }

-static void *nvme_nvm_create_dma_pool(struct request_queue *q, char *n=
ame)
+static void *nvme_nvm_create_dma_pool(struct nvm_dev *nvmdev, char *na=
me)
  {
-	struct nvme_ns *ns =3D q->queuedata;
+	struct nvme_ns *ns =3D nvmdev->q->queuedata;
  	struct nvme_dev *dev =3D ns->dev;

  	return dma_pool_create(name, dev->dev, PAGE_SIZE, PAGE_SIZE, 0);
@@ -530,7 +532,7 @@ static void nvme_nvm_destroy_dma_pool(void *pool)
  	dma_pool_destroy(dma_pool);
  }

-static void *nvme_nvm_dev_dma_alloc(struct request_queue *q, void *poo=
l,
+static void *nvme_nvm_dev_dma_alloc(struct nvm_dev *dev, void *pool,
  				    gfp_t mem_flags, dma_addr_t *dma_handler)
  {
  	return dma_pool_alloc(pool, mem_flags, dma_handler);
diff --git i/include/linux/lightnvm.h w/include/linux/lightnvm.h
index 935ef38..034117b 100644
--- i/include/linux/lightnvm.h
+++ w/include/linux/lightnvm.h
@@ -183,17 +183,17 @@ struct nvm_block;

  typedef int (nvm_l2p_update_fn)(u64, u32, __le64 *, void *);
  typedef int (nvm_bb_update_fn)(struct ppa_addr, int, u8 *, void *);
-typedef int (nvm_id_fn)(struct request_queue *, struct nvm_id *);
-typedef int (nvm_get_l2p_tbl_fn)(struct request_queue *, u64, u32,
+typedef int (nvm_id_fn)(struct nvm_dev *, struct nvm_id *);
+typedef int (nvm_get_l2p_tbl_fn)(struct nvm_dev *, u64, u32,
  				nvm_l2p_update_fn *, void *);
  typedef int (nvm_op_bb_tbl_fn)(struct nvm_dev *, struct ppa_addr, int=
,
  				nvm_bb_update_fn *, void *);
-typedef int (nvm_op_set_bb_fn)(struct request_queue *, struct nvm_rq *=
,=20
int);
-typedef int (nvm_submit_io_fn)(struct request_queue *, struct nvm_rq *=
);
-typedef int (nvm_erase_blk_fn)(struct request_queue *, struct nvm_rq *=
);
-typedef void *(nvm_create_dma_pool_fn)(struct request_queue *, char *)=
;
+typedef int (nvm_op_set_bb_fn)(struct nvm_dev *, struct nvm_rq *, int)=
;
+typedef int (nvm_submit_io_fn)(struct nvm_dev *, struct nvm_rq *);
+typedef int (nvm_erase_blk_fn)(struct nvm_dev *, struct nvm_rq *);
+typedef void *(nvm_create_dma_pool_fn)(struct nvm_dev *, char *);
  typedef void (nvm_destroy_dma_pool_fn)(void *);
-typedef void *(nvm_dev_dma_alloc_fn)(struct request_queue *, void *, g=
fp_t,
+typedef void *(nvm_dev_dma_alloc_fn)(struct nvm_dev *, void *, gfp_t,
  								dma_addr_t *);
  typedef void (nvm_dev_dma_free_fn)(void *, void*, dma_addr_t);

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Christoph Hellwig <hch@lst.de>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 3 Dec 2015 11:21:32 +0100
Message-ID: <20151203102132.GA15905@lst.de>
References: <20151202161936.22b23668cf9dea9872b5079b@kernel.org> <20151202164527.GA31048@lst.de> <565F5D96.5050902@kernel.dk> <565FFFA5.6000003@bjorling.me> <20151203090638.GA14329@lst.de> <566010EE.6050806@bjorling.me> <20151203095726.GA15428@lst.de> <566014BF.3080702@bjorling.me>
Mime-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: QUOTED-PRINTABLE
Return-path: <linux-next-owner@vger.kernel.org>
Received: from verein.lst.de ([213.95.11.211]:33951 "EHLO newverein.lst.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751549AbbLCKVf (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Thu, 3 Dec 2015 05:21:35 -0500
Content-Disposition: inline
In-Reply-To: <566014BF.3080702@bjorling.me>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Matias =?iso-8859-1?Q?Bj=F8rling?= <m@bjorling.me>
Cc: Christoph Hellwig <hch@lst.de>, Jens Axboe <axboe@kernel.dk>, Mark Brown <broonie@kernel.org>, Keith Busch <keith.busch@intel.com>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org

On Thu, Dec 03, 2015 at 11:09:03AM +0100, Matias Bj=F8rling wrote:
> Similar to this?

=46or the interface yes.  Now just get rid of using nvme_ns entirely -
seems like you just want ns_id and lba_shift, and those should fit
well into nvm_dev I think.

From mboxrd@z Thu Jan  1 00:00:00 1970
From: =?UTF-8?Q?Matias_Bj=c3=b8rling?= <m@bjorling.me>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 3 Dec 2015 12:07:23 +0100
Message-ID: <5660226B.5070800@bjorling.me>
References: <20151202161936.22b23668cf9dea9872b5079b@kernel.org>
 <20151202164527.GA31048@lst.de> <565F5D96.5050902@kernel.dk>
 <565FFFA5.6000003@bjorling.me> <20151203090638.GA14329@lst.de>
 <566010EE.6050806@bjorling.me> <20151203095726.GA15428@lst.de>
 <566014BF.3080702@bjorling.me> <20151203102132.GA15905@lst.de>
Mime-Version: 1.0
Content-Type: text/plain; charset=windows-1252;
	format=flowed
Content-Transfer-Encoding: QUOTED-PRINTABLE
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <20151203102132.GA15905@lst.de>
Sender: linux-kernel-owner@vger.kernel.org
To: Christoph Hellwig <hch@lst.de>
Cc: Jens Axboe <axboe@kernel.dk>, Mark Brown <broonie@kernel.org>, Keith Busch <keith.busch@intel.com>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org
List-Id: linux-next.vger.kernel.org

On 12/03/2015 11:21 AM, Christoph Hellwig wrote:
> On Thu, Dec 03, 2015 at 11:09:03AM +0100, Matias Bj=F8rling wrote:
>> Similar to this?
>
> For the interface yes.  Now just get rid of using nvme_ns entirely -
> seems like you just want ns_id and lba_shift, and those should fit
> well into nvm_dev I think.
>

What is the reason to keep the nvme_ns internally to the nvme core?

We can definitely move ->nsid and the lba_shift into nvm_dev. Only thin=
g=20
I have is that it moves a small part of nvme logic into the lightnvm co=
re.

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Christoph Hellwig <hch@lst.de>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 3 Dec 2015 17:42:59 +0100
Message-ID: <20151203164259.GA14678@lst.de>
References: <20151202161936.22b23668cf9dea9872b5079b@kernel.org> <20151202164527.GA31048@lst.de> <565F5D96.5050902@kernel.dk> <565FFFA5.6000003@bjorling.me> <20151203090638.GA14329@lst.de> <566010EE.6050806@bjorling.me> <20151203095726.GA15428@lst.de> <566014BF.3080702@bjorling.me> <20151203102132.GA15905@lst.de> <5660226B.5070800@bjorling.me>
Mime-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: QUOTED-PRINTABLE
Return-path: <linux-next-owner@vger.kernel.org>
Received: from verein.lst.de ([213.95.11.211]:35625 "EHLO newverein.lst.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1750966AbbLCQnD (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Thu, 3 Dec 2015 11:43:03 -0500
Content-Disposition: inline
In-Reply-To: <5660226B.5070800@bjorling.me>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Matias =?iso-8859-1?Q?Bj=F8rling?= <m@bjorling.me>
Cc: Christoph Hellwig <hch@lst.de>, Jens Axboe <axboe@kernel.dk>, Mark Brown <broonie@kernel.org>, Keith Busch <keith.busch@intel.com>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org

On Thu, Dec 03, 2015 at 12:07:23PM +0100, Matias Bj=F8rling wrote:
> What is the reason to keep the nvme_ns internally to the nvme core?
>
> We can definitely move ->nsid and the lba_shift into nvm_dev. Only th=
ing I=20
> have is that it moves a small part of nvme logic into the lightnvm co=
re.

It's a structure specific to the NVM command set, and the block device
use to implement it in Linux.  Similar to how you wouldn't use the SCSI
disk driver data structures to implement the tape driver for example.

From mboxrd@z Thu Jan  1 00:00:00 1970
From: =?UTF-8?Q?Matias_Bj=c3=b8rling?= <m@bjorling.me>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Fri, 4 Dec 2015 13:16:21 +0100
Message-ID: <56618415.3010405@bjorling.me>
References: <20151202161936.22b23668cf9dea9872b5079b@kernel.org>
 <20151202164527.GA31048@lst.de> <565F5D96.5050902@kernel.dk>
 <565FFFA5.6000003@bjorling.me> <20151203090638.GA14329@lst.de>
 <566010EE.6050806@bjorling.me> <20151203095726.GA15428@lst.de>
 <566014BF.3080702@bjorling.me> <20151203102132.GA15905@lst.de>
 <5660226B.5070800@bjorling.me> <20151203164259.GA14678@lst.de>
Mime-Version: 1.0
Content-Type: text/plain; charset=windows-1252;
	format=flowed
Content-Transfer-Encoding: QUOTED-PRINTABLE
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mail-wm0-f43.google.com ([74.125.82.43]:35833 "EHLO
	mail-wm0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752990AbbLDMQY (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Fri, 4 Dec 2015 07:16:24 -0500
Received: by wmuu63 with SMTP id u63so59571819wmu.0
        for <linux-next@vger.kernel.org>; Fri, 04 Dec 2015 04:16:23 -0800 (PST)
In-Reply-To: <20151203164259.GA14678@lst.de>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Christoph Hellwig <hch@lst.de>
Cc: Jens Axboe <axboe@kernel.dk>, Mark Brown <broonie@kernel.org>, Keith Busch <keith.busch@intel.com>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org



On 12/03/2015 05:42 PM, Christoph Hellwig wrote:
> On Thu, Dec 03, 2015 at 12:07:23PM +0100, Matias Bj=F8rling wrote:
>> What is the reason to keep the nvme_ns internally to the nvme core?
>>
>> We can definitely move ->nsid and the lba_shift into nvm_dev. Only t=
hing I
>> have is that it moves a small part of nvme logic into the lightnvm c=
ore.
>
> It's a structure specific to the NVM command set, and the block devic=
e
> use to implement it in Linux.  Similar to how you wouldn't use the SC=
SI
> disk driver data structures to implement the tape driver for example.
>

Granted. Taking a step back and see how it would look in the=20
specification. For that case, the identify geometry should properly=20
replace the identify namespace command and extend the controller=20
identify with a method to expose identify geometry structures. It falls=
=20
back to that we don't have the appropriate bits in the specification (a=
s=20
there isn't a vendor specific command set (CSS) place at the moment).=20
I'll rather not (and patches properly won't be accepted) push specific=20
meanings to reserved bits in the standard, which then is overruled by=20
vendor specific pci id's.

The NVMe and LightNVM still shares some common ground as I/O=20
submission/completion still follows normal I/O submissions. The=20
Submission/Completion sizes (SQES/CQES), ONCS bits, number of namespace=
s=20
could properly be either abstracted or duplicated in vendor specific bi=
ts.

I'll work on getting ->nsid, and lba_shift abstracted away. However, th=
e=20
best solution will be to get some bits in the spec and implement it=20
appropriately.

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Mon, 7 Mar 2016 14:29:33 +1100
Message-ID: <20160307142933.44e5fc5e@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from ozlabs.org ([103.22.144.67]:38254 "EHLO ozlabs.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751341AbcCGD3f (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Sun, 6 Mar 2016 22:29:35 -0500
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Ming Lin <ming.l@ssi.samsung.com>, Keith Busch <keith.busch@intel.com>

Hi Jens,

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

ERROR: "nvme_kill_queues" [drivers/nvme/host/nvme.ko] undefined!

Caused by commit

  576d55d62566 ("nvme: split pci module out of core module")

interacting with commit

  69d9a99c258e ("NVMe: Move error handling to failed reset handler")

from Linus' tree.

I applied the merge fix patch below.  Maybe you should do a back merge
of Linus' tree and fix this up as well as the conflicts.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 7 Mar 2016 14:24:19 +1100
Subject: [PATCH] nvme: fix up for "split pci module out of core module"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/nvme/host/core.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index db47bbda06b3..e2d11d623e33 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1508,6 +1508,7 @@ void nvme_kill_queues(struct nvme_ctrl *ctrl)
 	}
 	mutex_unlock(&ctrl->namespaces_mutex);
 }
+EXPORT_SYMBOL_GPL(nvme_kill_queues);
 
 void nvme_stop_queues(struct nvme_ctrl *ctrl)
 {
-- 
2.7.0

-- 
Cheers,
Stephen Rothwell

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Tue, 26 Apr 2016 13:38:12 +1000
Message-ID: <20160426133812.366dc031@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from ozlabs.org ([103.22.144.67]:36667 "EHLO ozlabs.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751060AbcDZDiO (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Mon, 25 Apr 2016 23:38:14 -0400
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Nicolas Pitre <nicolas.pitre@linaro.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jens Axboe <axboe@kernel.dk>, Michal Marek <mmarek@suse.cz>, Randy Dunlap <rdunlap@infradead.org>

Hi Nicolas,

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

ERROR: ".blk_queue_write_cache" [drivers/block/virtio_blk.ko] undefined!
ERROR: ".blk_queue_write_cache" [drivers/block/ps3disk.ko] undefined!
ERROR: ".blk_queue_write_cache" [drivers/block/nbd.ko] undefined!

Caused by commit

  089095b8eef9 ("kbuild: better abstract vmlinux sequential prerequisites")

from the kbuild-pite tree.

I have reverted that commit for today.

-- 
Cheers,
Stephen Rothwell

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michal Marek <mmarek@suse.cz>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Tue, 26 Apr 2016 15:30:01 +0200
Message-ID: <571F6D59.8040402@suse.cz>
References: <20160426133812.366dc031@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mx2.suse.de ([195.135.220.15]:41328 "EHLO mx2.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752264AbcDZNaF (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Tue, 26 Apr 2016 09:30:05 -0400
In-Reply-To: <20160426133812.366dc031@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Nicolas Pitre <nicolas.pitre@linaro.org>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jens Axboe <axboe@kernel.dk>, Randy Dunlap <rdunlap@infradead.org>

On 2016-04-26 05:38, Stephen Rothwell wrote:
> Hi Nicolas,
> 
> After merging the block tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> ERROR: ".blk_queue_write_cache" [drivers/block/virtio_blk.ko] undefined!
> ERROR: ".blk_queue_write_cache" [drivers/block/ps3disk.ko] undefined!
> ERROR: ".blk_queue_write_cache" [drivers/block/nbd.ko] undefined!
> 
> Caused by commit
> 
>   089095b8eef9 ("kbuild: better abstract vmlinux sequential prerequisites")
> 
> from the kbuild-pite tree.
> 
> I have reverted that commit for today.

I can't reproduce this with today's linux-next and the revert reverted.
Also, CONFIG_TRIM_UNUSED_KSYMS is disabled in the defconfig as expected,
so I have no idea what went wrong.

Michal

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Tue, 26 Apr 2016 23:56:05 +1000
Message-ID: <20160426235605.6ce21e45@canb.auug.org.au>
References: <20160426133812.366dc031@canb.auug.org.au>
	<571F6D59.8040402@suse.cz>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from ozlabs.org ([103.22.144.67]:51979 "EHLO ozlabs.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1750835AbcDZN4I (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Tue, 26 Apr 2016 09:56:08 -0400
In-Reply-To: <571F6D59.8040402@suse.cz>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Michal Marek <mmarek@suse.cz>
Cc: Nicolas Pitre <nicolas.pitre@linaro.org>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jens Axboe <axboe@kernel.dk>, Randy Dunlap <rdunlap@infradead.org>

Hi Michal,

On Tue, 26 Apr 2016 15:30:01 +0200 Michal Marek <mmarek@suse.cz> wrote:
>
> On 2016-04-26 05:38, Stephen Rothwell wrote:
> > Hi Nicolas,
> > 
> > After merging the block tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> > 
> > ERROR: ".blk_queue_write_cache" [drivers/block/virtio_blk.ko] undefined!
> > ERROR: ".blk_queue_write_cache" [drivers/block/ps3disk.ko] undefined!
> > ERROR: ".blk_queue_write_cache" [drivers/block/nbd.ko] undefined!
> > 
> > Caused by commit
> > 
> >   089095b8eef9 ("kbuild: better abstract vmlinux sequential prerequisites")
> > 
> > from the kbuild-pite tree.
> > 
> > I have reverted that commit for today.  
> 
> I can't reproduce this with today's linux-next and the revert reverted.
> Also, CONFIG_TRIM_UNUSED_KSYMS is disabled in the defconfig as expected,
> so I have no idea what went wrong.

Yeah, I couldn't figure it out either, but the revert made it work for
me.  Could it be that I do incremental builds - so today, I would have
built commit b087ce990625 ("Merge remote-tracking branch 'input/next'")
which worked, then commit 9d67df654092 ("Merge remote-tracking branch
'block/for-next'") which failed.

The only suspect code in the block tree has been there since April 13
with no build failures.

Anyway, I can see how things go tomorrow, but I hate it when things
seem fragile like this.
-- 
Cheers,
Stephen Rothwell

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Nicolas Pitre <nicolas.pitre@linaro.org>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Tue, 26 Apr 2016 10:40:57 -0400 (EDT)
Message-ID: <alpine.LFD.2.20.1604261037410.5091@knanqh.ubzr>
References: <20160426133812.366dc031@canb.auug.org.au> <571F6D59.8040402@suse.cz> <v3THaCMkCzylcv3TJavAje@videotron.ca>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <v3THaCMkCzylcv3TJavAje@videotron.ca>
Sender: linux-kernel-owner@vger.kernel.org
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Michal Marek <mmarek@suse.cz>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jens Axboe <axboe@kernel.dk>, Randy Dunlap <rdunlap@infradead.org>
List-Id: linux-next.vger.kernel.org

On Tue, 26 Apr 2016, Stephen Rothwell wrote:

> Hi Michal,
> 
> On Tue, 26 Apr 2016 15:30:01 +0200 Michal Marek <mmarek@suse.cz> wrote:
> >
> > On 2016-04-26 05:38, Stephen Rothwell wrote:
> > > Hi Nicolas,
> > > 
> > > After merging the block tree, today's linux-next build (powerpc
> > > ppc64_defconfig) failed like this:
> > > 
> > > ERROR: ".blk_queue_write_cache" [drivers/block/virtio_blk.ko] undefined!
> > > ERROR: ".blk_queue_write_cache" [drivers/block/ps3disk.ko] undefined!
> > > ERROR: ".blk_queue_write_cache" [drivers/block/nbd.ko] undefined!
> > > 
> > > Caused by commit
> > > 
> > >   089095b8eef9 ("kbuild: better abstract vmlinux sequential prerequisites")
> > > 
> > > from the kbuild-pite tree.
> > > 
> > > I have reverted that commit for today.  
> > 
> > I can't reproduce this with today's linux-next and the revert reverted.
> > Also, CONFIG_TRIM_UNUSED_KSYMS is disabled in the defconfig as expected,
> > so I have no idea what went wrong.
> 
> Yeah, I couldn't figure it out either, but the revert made it work for
> me.  Could it be that I do incremental builds - so today, I would have
> built commit b087ce990625 ("Merge remote-tracking branch 'input/next'")
> which worked, then commit 9d67df654092 ("Merge remote-tracking branch
> 'block/for-next'") which failed.
> 
> The only suspect code in the block tree has been there since April 13
> with no build failures.
> 
> Anyway, I can see how things go tomorrow, but I hate it when things
> seem fragile like this.

If you can reproduce this build failure, could you try a make mrproper 
and attempt it again?  I, too, would like to find an explanation and a 
way to reproduce.


Nicolas

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Tue, 26 Apr 2016 08:41:54 -0600
Message-ID: <571F7E32.80208@kernel.dk>
References: <20160426133812.366dc031@canb.auug.org.au>
 <571F6D59.8040402@suse.cz> <v3THaCMkCzylcv3TJavAje@videotron.ca>
 <alpine.LFD.2.20.1604261037410.5091@knanqh.ubzr>
Mime-Version: 1.0
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mail-ig0-f174.google.com ([209.85.213.174]:38808 "EHLO
	mail-ig0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751951AbcDZOl5 (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Tue, 26 Apr 2016 10:41:57 -0400
Received: by mail-ig0-f174.google.com with SMTP id m9so15233632ige.1
        for <linux-next@vger.kernel.org>; Tue, 26 Apr 2016 07:41:56 -0700 (PDT)
In-Reply-To: <alpine.LFD.2.20.1604261037410.5091@knanqh.ubzr>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Nicolas Pitre <nicolas.pitre@linaro.org>, Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Michal Marek <mmarek@suse.cz>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Randy Dunlap <rdunlap@infradead.org>

On 04/26/2016 08:40 AM, Nicolas Pitre wrote:
> On Tue, 26 Apr 2016, Stephen Rothwell wrote:
>
>> Hi Michal,
>>
>> On Tue, 26 Apr 2016 15:30:01 +0200 Michal Marek <mmarek@suse.cz> wrote:
>>>
>>> On 2016-04-26 05:38, Stephen Rothwell wrote:
>>>> Hi Nicolas,
>>>>
>>>> After merging the block tree, today's linux-next build (powerpc
>>>> ppc64_defconfig) failed like this:
>>>>
>>>> ERROR: ".blk_queue_write_cache" [drivers/block/virtio_blk.ko] undefined!
>>>> ERROR: ".blk_queue_write_cache" [drivers/block/ps3disk.ko] undefined!
>>>> ERROR: ".blk_queue_write_cache" [drivers/block/nbd.ko] undefined!
>>>>
>>>> Caused by commit
>>>>
>>>>    089095b8eef9 ("kbuild: better abstract vmlinux sequential prerequisites")
>>>>
>>>> from the kbuild-pite tree.
>>>>
>>>> I have reverted that commit for today.
>>>
>>> I can't reproduce this with today's linux-next and the revert reverted.
>>> Also, CONFIG_TRIM_UNUSED_KSYMS is disabled in the defconfig as expected,
>>> so I have no idea what went wrong.
>>
>> Yeah, I couldn't figure it out either, but the revert made it work for
>> me.  Could it be that I do incremental builds - so today, I would have
>> built commit b087ce990625 ("Merge remote-tracking branch 'input/next'")
>> which worked, then commit 9d67df654092 ("Merge remote-tracking branch
>> 'block/for-next'") which failed.
>>
>> The only suspect code in the block tree has been there since April 13
>> with no build failures.
>>
>> Anyway, I can see how things go tomorrow, but I hate it when things
>> seem fragile like this.
>
> If you can reproduce this build failure, could you try a make mrproper
> and attempt it again?  I, too, would like to find an explanation and a
> way to reproduce.

I just took a look at it, and it doesn't make any sense to me...

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Wed, 27 Apr 2016 01:18:25 +1000
Message-ID: <20160427011825.06c64502@canb.auug.org.au>
References: <20160426133812.366dc031@canb.auug.org.au>
	<571F6D59.8040402@suse.cz>
	<v3THaCMkCzylcv3TJavAje@videotron.ca>
	<alpine.LFD.2.20.1604261037410.5091@knanqh.ubzr>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from ozlabs.org ([103.22.144.67]:34925 "EHLO ozlabs.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752370AbcDZPS2 (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Tue, 26 Apr 2016 11:18:28 -0400
In-Reply-To: <alpine.LFD.2.20.1604261037410.5091@knanqh.ubzr>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Nicolas Pitre <nicolas.pitre@linaro.org>
Cc: Michal Marek <mmarek@suse.cz>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jens Axboe <axboe@kernel.dk>, Randy Dunlap <rdunlap@infradead.org>

Hi Nicolas,

On Tue, 26 Apr 2016 10:40:57 -0400 (EDT) Nicolas Pitre <nicolas.pitre@linaro.org> wrote:
>
> If you can reproduce this build failure, could you try a make mrproper 
> and attempt it again?  I, too, would like to find an explanation and a 
> way to reproduce.

I reset my build tree to commit 9d67df654092 ("Merge remote-tracking
branch 'block/for-next'") and the build failed with:

ERROR: ".local_clock" [drivers/vhost/vhost_net.ko] undefined!
ERROR: ".local_clock" [drivers/misc/cxl/cxl.ko] undefined!

:-(

So I did a "make mrproper" and did the build again.

That built correctly.

Then I reset the tree to commit b087ce990625 ("Merge remote-tracking
branch 'input/next'"), did a "make mrproper", "make ppc64_defconfig",
"make" and that built correctly.  So I fast forwarded back to the block
tree merge and did "make ppc64_defconfig" and "make" and that failed
with:

ERROR: ".blk_queue_write_cache" [drivers/block/virtio_blk.ko] undefined!
ERROR: ".blk_queue_write_cache" [drivers/block/ps3disk.ko] undefined!
ERROR: ".blk_queue_write_cache" [drivers/block/nbd.ko] undefined!

Doing the revert made it build, then doing "reset --hard HEAD^" (i.e.
undoing the revert) also kept the build working.

These builds all have a separate object directory and are powerpc64le
hosted powerpc64be cross builds and use "make -j80".

-- 
Cheers,
Stephen Rothwell

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Nicolas Pitre <nicolas.pitre@linaro.org>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Tue, 26 Apr 2016 16:48:44 -0400 (EDT)
Message-ID: <alpine.LFD.2.20.1604261603310.5091@knanqh.ubzr>
References: <20160426133812.366dc031@canb.auug.org.au> <571F6D59.8040402@suse.cz> <v3THaCMkCzylcv3TJavAje@videotron.ca> <alpine.LFD.2.20.1604261037410.5091@knanqh.ubzr> <20160427011825.06c64502@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mail-qk0-f172.google.com ([209.85.220.172]:35738 "EHLO
	mail-qk0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752216AbcDZUst (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Tue, 26 Apr 2016 16:48:49 -0400
Received: by mail-qk0-f172.google.com with SMTP id q76so9628348qke.2
        for <linux-next@vger.kernel.org>; Tue, 26 Apr 2016 13:48:48 -0700 (PDT)
In-Reply-To: <20160427011825.06c64502@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>, Michal Marek <mmarek@suse.cz>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jens Axboe <axboe@kernel.dk>, Randy Dunlap <rdunlap@infradead.org>

On Wed, 27 Apr 2016, Stephen Rothwell wrote:

> Hi Nicolas,
> 
> On Tue, 26 Apr 2016 10:40:57 -0400 (EDT) Nicolas Pitre <nicolas.pitre@linaro.org> wrote:
> >
> > If you can reproduce this build failure, could you try a make mrproper 
> > and attempt it again?  I, too, would like to find an explanation and a 
> > way to reproduce.
> 
> I reset my build tree to commit 9d67df654092 ("Merge remote-tracking
> branch 'block/for-next'") and the build failed with:
> 
> ERROR: ".local_clock" [drivers/vhost/vhost_net.ko] undefined!
> ERROR: ".local_clock" [drivers/misc/cxl/cxl.ko] undefined!
> 
> :-(
> 
> So I did a "make mrproper" and did the build again.
> 
> That built correctly.
> 
[...]

OK!  After digging and diffing through 750 megabytes of make debug logs 
I finally found the explanation.  The if_changed directive is useless 
against phony targets.

@Stephen: could you replace the revert with the patch below in your tree?

@Michal: could you fold the patch below into commit 2441e78b19 in your tree?

diff --git a/Makefile b/Makefile
index ca46af5cc0..3a7b9a93b2 100644
--- a/Makefile
+++ b/Makefile
@@ -953,7 +953,7 @@ include/generated/autoksyms.h: FORCE
       cmd_link-vmlinux = $(CONFIG_SHELL) $< $(LD) $(LDFLAGS) $(LDFLAGS_vmlinux)
 quiet_cmd_link-vmlinux = LINK    $@
 
-vmlinux: scripts/link-vmlinux.sh vmlinux_prereq FORCE
+vmlinux: scripts/link-vmlinux.sh vmlinux_prereq $(vmlinux-deps) FORCE
 	+$(call if_changed,link-vmlinux)
 
 # Build samples along the rest of the kernel

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Wed, 27 Apr 2016 07:39:13 +1000
Message-ID: <20160427073913.0a34400d@canb.auug.org.au>
References: <20160426133812.366dc031@canb.auug.org.au>
	<571F6D59.8040402@suse.cz>
	<v3THaCMkCzylcv3TJavAje@videotron.ca>
	<alpine.LFD.2.20.1604261037410.5091@knanqh.ubzr>
	<20160427011825.06c64502@canb.auug.org.au>
	<alpine.LFD.2.20.1604261603310.5091@knanqh.ubzr>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from ozlabs.org ([103.22.144.67]:39772 "EHLO ozlabs.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752664AbcDZVjR (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Tue, 26 Apr 2016 17:39:17 -0400
In-Reply-To: <alpine.LFD.2.20.1604261603310.5091@knanqh.ubzr>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Nicolas Pitre <nicolas.pitre@linaro.org>
Cc: Michal Marek <mmarek@suse.cz>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jens Axboe <axboe@kernel.dk>, Randy Dunlap <rdunlap@infradead.org>

Hi Nicolas,

On Tue, 26 Apr 2016 16:48:44 -0400 (EDT) Nicolas Pitre <nicolas.pitre@linaro.org> wrote:
>
> OK!  After digging and diffing through 750 megabytes of make debug logs 
> I finally found the explanation.  The if_changed directive is useless 
> against phony targets.

Thanks for working this out.

> @Stephen: could you replace the revert with the patch below in your tree?

Will do, unless Michal beats me to it.

-- 
Cheers,
Stephen Rothwell

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michal Marek <mmarek@suse.cz>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Wed, 27 Apr 2016 11:02:08 +0200
Message-ID: <57208010.7030505@suse.cz>
References: <20160426133812.366dc031@canb.auug.org.au>
 <571F6D59.8040402@suse.cz> <v3THaCMkCzylcv3TJavAje@videotron.ca>
 <alpine.LFD.2.20.1604261037410.5091@knanqh.ubzr>
 <20160427011825.06c64502@canb.auug.org.au>
 <alpine.LFD.2.20.1604261603310.5091@knanqh.ubzr>
Mime-Version: 1.0
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mx2.suse.de ([195.135.220.15]:37800 "EHLO mx2.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751992AbcD0JCL (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Wed, 27 Apr 2016 05:02:11 -0400
In-Reply-To: <alpine.LFD.2.20.1604261603310.5091@knanqh.ubzr>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Nicolas Pitre <nicolas.pitre@linaro.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jens Axboe <axboe@kernel.dk>, Randy Dunlap <rdunlap@infradead.org>

On 2016-04-26 22:48, Nicolas Pitre wrote:
> On Wed, 27 Apr 2016, Stephen Rothwell wrote:
> 
>> Hi Nicolas,
>>
>> On Tue, 26 Apr 2016 10:40:57 -0400 (EDT) Nicolas Pitre <nicolas.pitre@linaro.org> wrote:
>>>
>>> If you can reproduce this build failure, could you try a make mrproper 
>>> and attempt it again?  I, too, would like to find an explanation and a 
>>> way to reproduce.
>>
>> I reset my build tree to commit 9d67df654092 ("Merge remote-tracking
>> branch 'block/for-next'") and the build failed with:
>>
>> ERROR: ".local_clock" [drivers/vhost/vhost_net.ko] undefined!
>> ERROR: ".local_clock" [drivers/misc/cxl/cxl.ko] undefined!
>>
>> :-(
>>
>> So I did a "make mrproper" and did the build again.
>>
>> That built correctly.
>>
> [...]
> 
> OK!  After digging and diffing through 750 megabytes of make debug logs 
> I finally found the explanation.  The if_changed directive is useless 
> against phony targets.
> 
> @Stephen: could you replace the revert with the patch below in your tree?
> 
> @Michal: could you fold the patch below into commit 2441e78b19 in your tree?

I prefer not to overwrite the topic branches unless necessary and I
wanted to credit Stephen, so I committed your patch with a fabricated
commit message and your signoff (since you wanted to fold it into a
patch that you had already signed off).

Michal

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Nicolas Pitre <nicolas.pitre@linaro.org>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Wed, 27 Apr 2016 09:46:37 -0400 (EDT)
Message-ID: <alpine.LFD.2.20.1604270946050.5091@knanqh.ubzr>
References: <20160426133812.366dc031@canb.auug.org.au> <571F6D59.8040402@suse.cz> <v3THaCMkCzylcv3TJavAje@videotron.ca> <alpine.LFD.2.20.1604261037410.5091@knanqh.ubzr> <20160427011825.06c64502@canb.auug.org.au> <alpine.LFD.2.20.1604261603310.5091@knanqh.ubzr>
 <57208010.7030505@suse.cz>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <57208010.7030505@suse.cz>
Sender: linux-kernel-owner@vger.kernel.org
To: Michal Marek <mmarek@suse.cz>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jens Axboe <axboe@kernel.dk>, Randy Dunlap <rdunlap@infradead.org>
List-Id: linux-next.vger.kernel.org

On Wed, 27 Apr 2016, Michal Marek wrote:

> On 2016-04-26 22:48, Nicolas Pitre wrote:
> > On Wed, 27 Apr 2016, Stephen Rothwell wrote:
> > 
> >> Hi Nicolas,
> >>
> >> On Tue, 26 Apr 2016 10:40:57 -0400 (EDT) Nicolas Pitre <nicolas.pitre@linaro.org> wrote:
> >>>
> >>> If you can reproduce this build failure, could you try a make mrproper 
> >>> and attempt it again?  I, too, would like to find an explanation and a 
> >>> way to reproduce.
> >>
> >> I reset my build tree to commit 9d67df654092 ("Merge remote-tracking
> >> branch 'block/for-next'") and the build failed with:
> >>
> >> ERROR: ".local_clock" [drivers/vhost/vhost_net.ko] undefined!
> >> ERROR: ".local_clock" [drivers/misc/cxl/cxl.ko] undefined!
> >>
> >> :-(
> >>
> >> So I did a "make mrproper" and did the build again.
> >>
> >> That built correctly.
> >>
> > [...]
> > 
> > OK!  After digging and diffing through 750 megabytes of make debug logs 
> > I finally found the explanation.  The if_changed directive is useless 
> > against phony targets.
> > 
> > @Stephen: could you replace the revert with the patch below in your tree?
> > 
> > @Michal: could you fold the patch below into commit 2441e78b19 in your tree?
> 
> I prefer not to overwrite the topic branches unless necessary and I
> wanted to credit Stephen, so I committed your patch with a fabricated
> commit message and your signoff (since you wanted to fold it into a
> patch that you had already signed off).

Fine with me.


Nicolas

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Fri, 16 Sep 2016 11:14:34 +1000
Message-ID: <20160916111434.43bcf04e@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <linux-kernel-owner@vger.kernel.org>
Sender: linux-kernel-owner@vger.kernel.org
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Josef Bacik <jbacik@fb.com>
List-Id: linux-next.vger.kernel.org

Hi Jens,

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

drivers/block/nbd.c:884:2: error: unknown field 'map_queue' specified in initializer
  .map_queue = blk_mq_map_queue,
  ^
/home/sfr/next/next/drivers/block/nbd.c:884:15: error: 'blk_mq_map_queue' undeclared here (not in a function)
  .map_queue = blk_mq_map_queue,
               ^

Caused by commit

  9151bcb4fb38 ("blk-mq: kill unused blk_mq_create_mq_map()")

interacting with commit

  fd8383fd88a2 ("nbd: convert to blkmq")

also in the block tree.

I have used the block tree from next-20160915 for today.

-- 
Cheers,
Stephen Rothwell

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 15 Sep 2016 22:13:36 -0600
Message-ID: <4c065ee5-865f-d0d5-103b-7c5a1749ad9f@kernel.dk>
References: <20160916111434.43bcf04e@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mail-pf0-f176.google.com ([209.85.192.176]:35415 "EHLO
        mail-pf0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1750730AbcIPENl (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Fri, 16 Sep 2016 00:13:41 -0400
Received: by mail-pf0-f176.google.com with SMTP id z123so23280465pfz.2
        for <linux-next@vger.kernel.org>; Thu, 15 Sep 2016 21:13:40 -0700 (PDT)
In-Reply-To: <20160916111434.43bcf04e@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Josef Bacik <jbacik@fb.com>

On 09/15/2016 07:14 PM, Stephen Rothwell wrote:
> Hi Jens,
>
> After merging the block tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> drivers/block/nbd.c:884:2: error: unknown field 'map_queue' specified in initializer
>   .map_queue = blk_mq_map_queue,
>   ^
> /home/sfr/next/next/drivers/block/nbd.c:884:15: error: 'blk_mq_map_queue' undeclared here (not in a function)
>   .map_queue = blk_mq_map_queue,
>                ^
>
> Caused by commit
>
>   9151bcb4fb38 ("blk-mq: kill unused blk_mq_create_mq_map()")
>
> interacting with commit
>
>   fd8383fd88a2 ("nbd: convert to blkmq")
>
> also in the block tree.

That's my fault, when merged together the nbd part needs an update. I've
pushed out a fix for it.

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Mon, 19 Sep 2016 16:18:34 +1000
Message-ID: <20160919161834.08302d33@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from ozlabs.org ([103.22.144.67]:39213 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1750933AbcISGSh (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Mon, 19 Sep 2016 02:18:37 -0400
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig <hch@lst.de>

Hi Jens,

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

In file included from block/blk-mq-pci.c:13:0:
include/linux/blk-mq.h:57:18: error: field 'kobj' has incomplete type
  struct kobject  kobj;
                  ^
include/linux/blk-mq.h:121:2: error: unknown type name 'softirq_done_fn'
  softirq_done_fn  *complete;
  ^
include/linux/blk-mq.h: In function 'blk_mq_rq_from_pdu':
include/linux/blk-mq.h:253:22: error: invalid application of 'sizeof' to incomplete type 'struct request'
  return pdu - sizeof(struct request);
                      ^
include/linux/blk-mq.h: In function 'blk_mq_rq_to_pdu':
include/linux/blk-mq.h:257:2: error: invalid use of undefined type 'struct request'
  return rq + 1;
  ^

Caused by commit

  973c4e372c8f ("blk-mq: provide a default queue mapping for PCI device")

include/linux/blk-mq.h does not include all the headers files that it
depends on, and building block/blk-mq-pci.c should depend on CONFIG_BLOCK.

I applied this fix patch (the block/blk-mq-pci.c may not be becessary):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 19 Sep 2016 15:50:16 +1000
Subject: [PATCH] blk_mq: linux/blk-mq.h does not include all the headers it
 depends on

and building block/blk-mq-pci.o should depend on CONFIG_BLOCK

Fixes: 973c4e372c8f ("blk-mq: provide a default queue mapping for PCI device")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 block/Kconfig      | 5 +++++
 block/Makefile     | 2 +-
 block/blk-mq-pci.c | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/block/Kconfig b/block/Kconfig
index 5136ad4bb6d5..1d4d624492fc 100644
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -125,4 +125,9 @@ config BLOCK_COMPAT
 	depends on BLOCK && COMPAT
 	default y
 
+config BLK_MQ_PCI
+	bool
+	depends on BLOCK && PCI
+	default y
+
 source block/Kconfig.iosched
diff --git a/block/Makefile b/block/Makefile
index 2447a0b1ef9c..37a0d93f97bb 100644
--- a/block/Makefile
+++ b/block/Makefile
@@ -22,4 +22,4 @@ obj-$(CONFIG_IOSCHED_CFQ)	+= cfq-iosched.o
 obj-$(CONFIG_BLOCK_COMPAT)	+= compat_ioctl.o
 obj-$(CONFIG_BLK_CMDLINE_PARSER)	+= cmdline-parser.o
 obj-$(CONFIG_BLK_DEV_INTEGRITY) += bio-integrity.o blk-integrity.o t10-pi.o
-obj-$(CONFIG_PCI)		+= blk-mq-pci.o
+obj-$(CONFIG_BLK_MQ_PCI)	+= blk-mq-pci.o
diff --git a/block/blk-mq-pci.c b/block/blk-mq-pci.c
index 33c7bd743c63..966c2169762e 100644
--- a/block/blk-mq-pci.c
+++ b/block/blk-mq-pci.c
@@ -10,6 +10,8 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  */
+#include <linux/kobject.h>
+#include <linux/blkdev.h>
 #include <linux/blk-mq.h>
 #include <linux/blk-mq-pci.h>
 #include <linux/pci.h>
-- 
2.8.1

-- 
Cheers,
Stephen Rothwell

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Christoph Hellwig <hch@lst.de>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Mon, 19 Sep 2016 15:48:03 +0200
Message-ID: <20160919134803.GA28585@lst.de>
References: <20160919161834.08302d33@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-next-owner@vger.kernel.org>
Received: from verein.lst.de ([213.95.11.211]:44090 "EHLO newverein.lst.de"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1758341AbcISNsG (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Mon, 19 Sep 2016 09:48:06 -0400
Content-Disposition: inline
In-Reply-To: <20160919161834.08302d33@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jens Axboe <axboe@kernel.dk>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig <hch@lst.de>

Thanks Stephen,

the fix looks good to me:

Reviewed-by: Christoph Hellwig <hch@lst.de>


I had actually seen the error earlier, but for the setups I got builbot
results moving the code to this new pci-dependent file fixed it.  I guess
that didn't went far enough.

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Mon, 19 Sep 2016 08:22:32 -0600
Message-ID: <1e8697fe-a8e5-a5b6-25db-c4676d36efdf@kernel.dk>
References: <20160919161834.08302d33@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mail-it0-f50.google.com ([209.85.214.50]:35368 "EHLO
        mail-it0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1755445AbcISOWe (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Mon, 19 Sep 2016 10:22:34 -0400
Received: by mail-it0-f50.google.com with SMTP id r192so69751937ita.0
        for <linux-next@vger.kernel.org>; Mon, 19 Sep 2016 07:22:34 -0700 (PDT)
In-Reply-To: <20160919161834.08302d33@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig <hch@lst.de>

On 09/19/2016 12:18 AM, Stephen Rothwell wrote:
> Hi Jens,
>
> After merging the block tree, today's linux-next build (powerpc
> allnoconfig) failed like this:
>
> In file included from block/blk-mq-pci.c:13:0:
> include/linux/blk-mq.h:57:18: error: field 'kobj' has incomplete type
>   struct kobject  kobj;
>                   ^
> include/linux/blk-mq.h:121:2: error: unknown type name 'softirq_done_fn'
>   softirq_done_fn  *complete;
>   ^
> include/linux/blk-mq.h: In function 'blk_mq_rq_from_pdu':
> include/linux/blk-mq.h:253:22: error: invalid application of 'sizeof' to incomplete type 'struct request'
>   return pdu - sizeof(struct request);
>                       ^
> include/linux/blk-mq.h: In function 'blk_mq_rq_to_pdu':
> include/linux/blk-mq.h:257:2: error: invalid use of undefined type 'struct request'
>   return rq + 1;
>   ^
>
> Caused by commit
>
>   973c4e372c8f ("blk-mq: provide a default queue mapping for PCI device")
>
> include/linux/blk-mq.h does not include all the headers files that it
> depends on, and building block/blk-mq-pci.c should depend on CONFIG_BLOCK.
>
> I applied this fix patch (the block/blk-mq-pci.c may not be becessary):

Added, thanks Stephen.

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Tue, 8 Nov 2016 14:21:40 +1100
Message-ID: <20161108142140.3232b3b2@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <linux-kernel-owner@vger.kernel.org>
Sender: linux-kernel-owner@vger.kernel.org
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Ming Lei <tom.leiming@gmail.com>, Christoph Hellwig <hch@lst.de>
List-Id: linux-next.vger.kernel.org

Hi Jens,

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

block/blk-flush.c: In function 'flush_data_end_io':
block/blk-flush.c:369:20: error: 'REQ_STARTED' undeclared (first use in this function)
  rq->cmd_flags &= ~REQ_STARTED;
                    ^

Caused by commit

  e806402130c9 ("block: split out request-only flags into a new namespace")

interacting with commit

  94d7dea448fa ("block: flush: fix IO hang in case of flood fua req")

from Linus' tree (v4.9-rc3).

I have applied the following merge fix patch for today (I don't know if
this is correct, but it does build):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 8 Nov 2016 14:08:03 +1100
Subject: [PATCH] block: fixup for "split out request-only flags into a new namespace"

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

diff --git a/block/blk-flush.c b/block/blk-flush.c
index 0a02e765fa14..0bef7432d725 100644
--- a/block/blk-flush.c
+++ b/block/blk-flush.c
@@ -366,7 +366,7 @@ static void flush_data_end_io(struct request *rq, int error)
 	elv_completed_request(q, rq);
 
 	/* for avoiding double accounting */
-	rq->cmd_flags &= ~REQ_STARTED;
+	rq->rq_flags &= ~RQF_STARTED;
 
 	/*
 	 * After populating an empty queue, kick it to avoid stall.  Read
-- 
2.10.2

-- 
Cheers,
Stephen Rothwell

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Mon, 7 Nov 2016 20:28:08 -0700
Message-ID: <17000722-fd27-9f88-e44b-999f11545b17@kernel.dk>
References: <20161108142140.3232b3b2@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mail-pf0-f169.google.com ([209.85.192.169]:35772 "EHLO
        mail-pf0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1752401AbcKHDfA (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Mon, 7 Nov 2016 22:35:00 -0500
Received: by mail-pf0-f169.google.com with SMTP id i88so99635064pfk.2
        for <linux-next@vger.kernel.org>; Mon, 07 Nov 2016 19:35:00 -0800 (PST)
In-Reply-To: <20161108142140.3232b3b2@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Ming Lei <tom.leiming@gmail.com>, Christoph Hellwig <hch@lst.de>

On 11/07/2016 08:21 PM, Stephen Rothwell wrote:
> Hi Jens,
>
> After merging the block tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> block/blk-flush.c: In function 'flush_data_end_io':
> block/blk-flush.c:369:20: error: 'REQ_STARTED' undeclared (first use in this function)
>   rq->cmd_flags &= ~REQ_STARTED;
>                     ^
>
> Caused by commit
>
>   e806402130c9 ("block: split out request-only flags into a new namespace")
>
> interacting with commit
>
>   94d7dea448fa ("block: flush: fix IO hang in case of flood fua req")
>
> from Linus' tree (v4.9-rc3).
>
> I have applied the following merge fix patch for today (I don't know if
> this is correct, but it does build):

It's correct, it needs to be applied if merging with master. It will
throw a real conflict as well, but this one tends to fly under the radar
since it merges cleanly.

I'll merge master into my for-next so you don't have to carry extra
patches for this.

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Thu, 1 Dec 2016 13:55:17 +1100
Message-ID: <20161201135517.273c9a4d@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from ozlabs.org ([103.22.144.67]:56007 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1753431AbcLAC4C (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Wed, 30 Nov 2016 21:56:02 -0500
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>, David Chinner <david@fromorbit.com>, xfs@oss.sgi.com
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig <hch@lst.de>

Hi Jens,

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

fs/iomap.c: In function 'iomap_dio_zero':
fs/iomap.c:725:38: error: 'WRITE_ODIRECT' undeclared (first use in this function)
  bio_set_op_attrs(bio, REQ_OP_WRITE, WRITE_ODIRECT);
                                      ^
fs/iomap.c:725:38: note: each undeclared identifier is reported only once for each function it appears in
fs/iomap.c: In function 'iomap_dio_actor':
fs/iomap.c:808:40: error: 'WRITE_ODIRECT' undeclared (first use in this function)
    bio_set_op_attrs(bio, REQ_OP_WRITE, WRITE_ODIRECT);
                                        ^
fs/iomap.c: In function 'iomap_dio_rw':
fs/iomap.c:933:9: error: implicit declaration of function 'blk_poll' [-Werror=implicit-function-declaration]
        !blk_poll(dio->submit.last_queue,
         ^

Caused by commits

  70fd76140a6c ("block,fs: use REQ_* flags directly")
  bbd7bb7017d5 ("block: move poll code to blk-mq")

interacting with commit

  ff6a9292e6f6 ("iomap: implement direct I/O")

from the xfs tree.

I love APIs changing :-(

I have applied the following merge fix patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 1 Dec 2016 13:45:33 +1100
Subject: [PATCH] iomap: fix up for blk_poll and WRITE_ODIRECT change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/iomap.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/iomap.c b/fs/iomap.c
index fc2446242935..c9d6c1176345 100644
--- a/fs/iomap.c
+++ b/fs/iomap.c
@@ -722,7 +722,7 @@ iomap_dio_zero(struct iomap_dio *dio, struct iomap *iomap, loff_t pos,
 	get_page(page);
 	if (bio_add_page(bio, page, len, 0) != len)
 		BUG();
-	bio_set_op_attrs(bio, REQ_OP_WRITE, WRITE_ODIRECT);
+	bio_set_op_attrs(bio, REQ_OP_WRITE, REQ_SYNC | REQ_IDLE);
 
 	atomic_inc(&dio->ref);
 	return submit_bio(bio);
@@ -805,7 +805,7 @@ iomap_dio_actor(struct inode *inode, loff_t pos, loff_t length,
 		}
 
 		if (dio->flags & IOMAP_DIO_WRITE) {
-			bio_set_op_attrs(bio, REQ_OP_WRITE, WRITE_ODIRECT);
+			bio_set_op_attrs(bio, REQ_OP_WRITE, REQ_SYNC | REQ_IDLE);
 			task_io_account_write(bio->bi_iter.bi_size);
 		} else {
 			bio_set_op_attrs(bio, REQ_OP_READ, 0);
@@ -930,7 +930,7 @@ iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter, struct iomap_ops *ops,
 
 			if (!(iocb->ki_flags & IOCB_HIPRI) ||
 			    !dio->submit.last_queue ||
-			    !blk_poll(dio->submit.last_queue,
+			    !blk_mq_poll(dio->submit.last_queue,
 					dio->submit.cookie))
 				io_schedule();
 		}
-- 
2.10.2

-- 
Cheers,
Stephen Rothwell

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Wed, 30 Nov 2016 20:00:36 -0700
Message-ID: <be0dd730-037a-2f42-489a-2a1fc90c8932@kernel.dk>
References: <20161201135517.273c9a4d@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mail-pf0-f171.google.com ([209.85.192.171]:33101 "EHLO
        mail-pf0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1752576AbcLADAk (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Wed, 30 Nov 2016 22:00:40 -0500
Received: by mail-pf0-f171.google.com with SMTP id d2so42928885pfd.0
        for <linux-next@vger.kernel.org>; Wed, 30 Nov 2016 19:00:40 -0800 (PST)
In-Reply-To: <20161201135517.273c9a4d@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>, David Chinner <david@fromorbit.com>, xfs@oss.sgi.com
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig <hch@lst.de>

On 11/30/2016 07:55 PM, Stephen Rothwell wrote:
> Hi Jens,
> 
> After merging the block tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> fs/iomap.c: In function 'iomap_dio_zero':
> fs/iomap.c:725:38: error: 'WRITE_ODIRECT' undeclared (first use in this function)
>   bio_set_op_attrs(bio, REQ_OP_WRITE, WRITE_ODIRECT);
>                                       ^
> fs/iomap.c:725:38: note: each undeclared identifier is reported only once for each function it appears in
> fs/iomap.c: In function 'iomap_dio_actor':
> fs/iomap.c:808:40: error: 'WRITE_ODIRECT' undeclared (first use in this function)
>     bio_set_op_attrs(bio, REQ_OP_WRITE, WRITE_ODIRECT);
>                                         ^
> fs/iomap.c: In function 'iomap_dio_rw':
> fs/iomap.c:933:9: error: implicit declaration of function 'blk_poll' [-Werror=implicit-function-declaration]
>         !blk_poll(dio->submit.last_queue,
>          ^
> 
> Caused by commits
> 
>   70fd76140a6c ("block,fs: use REQ_* flags directly")
>   bbd7bb7017d5 ("block: move poll code to blk-mq")
> 
> interacting with commit
> 
>   ff6a9292e6f6 ("iomap: implement direct I/O")
> 
> from the xfs tree.
> 
> I love APIs changing :-(

It's a necessary evil...

This could have been avoided with the XFS tree pulling in the block
changes, but that obviously has other implications. Something to watch
for when the XFS tree is sent in for the merge window, however.

> I have applied the following merge fix patch for today.

The fix is correct.

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 1 Dec 2016 14:02:43 +1100
Message-ID: <20161201140243.2554a006@canb.auug.org.au>
References: <20161201135517.273c9a4d@canb.auug.org.au>
        <be0dd730-037a-2f42-489a-2a1fc90c8932@kernel.dk>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <be0dd730-037a-2f42-489a-2a1fc90c8932@kernel.dk>
Sender: linux-kernel-owner@vger.kernel.org
To: Jens Axboe <axboe@kernel.dk>
Cc: David Chinner <david@fromorbit.com>, xfs@oss.sgi.com, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig <hch@lst.de>
List-Id: linux-next.vger.kernel.org

Hi Jens,

On Wed, 30 Nov 2016 20:00:36 -0700 Jens Axboe <axboe@kernel.dk> wrote:
>
> On 11/30/2016 07:55 PM, Stephen Rothwell wrote:
> > 
> > I love APIs changing :-(  
> 
> It's a necessary evil...

Yeah

> This could have been avoided with the XFS tree pulling in the block
> changes, but that obviously has other implications. Something to watch
> for when the XFS tree is sent in for the merge window, however.

Indeed.  Or the block tree, which ever comes last.

> > I have applied the following merge fix patch for today.  
> 
> The fix is correct.

Thanks.

-- 
Cheers,
Stephen Rothwell

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Wed, 30 Nov 2016 20:04:53 -0700
Message-ID: <e1f0ec6b-454e-a20c-a655-4302e952644a@kernel.dk>
References: <20161201135517.273c9a4d@canb.auug.org.au>
 <be0dd730-037a-2f42-489a-2a1fc90c8932@kernel.dk>
 <20161201140243.2554a006@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mail-pf0-f171.google.com ([209.85.192.171]:36292 "EHLO
        mail-pf0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1751937AbcLADE5 (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Wed, 30 Nov 2016 22:04:57 -0500
Received: by mail-pf0-f171.google.com with SMTP id 189so42959778pfz.3
        for <linux-next@vger.kernel.org>; Wed, 30 Nov 2016 19:04:57 -0800 (PST)
In-Reply-To: <20161201140243.2554a006@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Chinner <david@fromorbit.com>, xfs@oss.sgi.com, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig <hch@lst.de>

On 11/30/2016 08:02 PM, Stephen Rothwell wrote:
> Hi Jens,
> 
> On Wed, 30 Nov 2016 20:00:36 -0700 Jens Axboe <axboe@kernel.dk> wrote:
>>
>> On 11/30/2016 07:55 PM, Stephen Rothwell wrote:
>>>
>>> I love APIs changing :-(  
>>
>> It's a necessary evil...
> 
> Yeah
> 
>> This could have been avoided with the XFS tree pulling in the block
>> changes, but that obviously has other implications. Something to watch
>> for when the XFS tree is sent in for the merge window, however.
> 
> Indeed.  Or the block tree, which ever comes last.

Sure, but I usually try and push in the first few days since other trees
depend on mine. So it's more likely that the XFS tree will run into the
issue.

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Mon, 30 Jan 2017 12:43:50 +1100
Message-ID: <20170130124350.36a57549@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from ozlabs.org ([103.22.144.67]:51293 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1751553AbdA3Bnx (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Sun, 29 Jan 2017 20:43:53 -0500
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig <hch@lst.de>

Hi Jens,

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

drivers/nvme/host/scsi.c: In function 'nvme_scsi_translate':
drivers/nvme/host/scsi.c:2350:9: error: 'BLK_MAX_CDB' undeclared (first use in this function)
  u8 cmd[BLK_MAX_CDB];
         ^
drivers/nvme/host/scsi.c:2350:9: note: each undeclared identifier is reported only once for each function it appears in
drivers/nvme/host/scsi.c:2350:5: warning: unused variable 'cmd' [-Wunused-variable]
  u8 cmd[BLK_MAX_CDB];
     ^
drivers/nvme/host/scsi.c: In function 'nvme_sg_io':
drivers/nvme/host/scsi.c:2454:20: error: 'BLK_MAX_CDB' undeclared (first use in this function)  
  if (hdr.cmd_len > BLK_MAX_CDB)
                    ^

Caused by commit

  82ed4db499b8 ("block: split scsi_request out of struct request")

I have used the block tree from next-20170125 for today.

-- 
Cheers,
Stephen Rothwell

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Sun, 29 Jan 2017 18:53:42 -0700
Message-ID: <5f2da80f-c6fe-8c45-0e56-819aae7d925c@kernel.dk>
References: <20170130124350.36a57549@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <20170130124350.36a57549@canb.auug.org.au>
Sender: linux-kernel-owner@vger.kernel.org
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig <hch@lst.de>
List-Id: linux-next.vger.kernel.org

On 01/29/2017 06:43 PM, Stephen Rothwell wrote:
> Hi Jens,
> 
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/nvme/host/scsi.c: In function 'nvme_scsi_translate':
> drivers/nvme/host/scsi.c:2350:9: error: 'BLK_MAX_CDB' undeclared (first use in this function)
>   u8 cmd[BLK_MAX_CDB];
>          ^
> drivers/nvme/host/scsi.c:2350:9: note: each undeclared identifier is reported only once for each function it appears in
> drivers/nvme/host/scsi.c:2350:5: warning: unused variable 'cmd' [-Wunused-variable]
>   u8 cmd[BLK_MAX_CDB];
>      ^
> drivers/nvme/host/scsi.c: In function 'nvme_sg_io':
> drivers/nvme/host/scsi.c:2454:20: error: 'BLK_MAX_CDB' undeclared (first use in this function)  
>   if (hdr.cmd_len > BLK_MAX_CDB)
>                     ^
> 
> Caused by commit
> 
>   82ed4db499b8 ("block: split scsi_request out of struct request")
> 
> I have used the block tree from next-20170125 for today.

Huh, I wonder how that snuck past my allmodconfig builds, that looks
like a clear failure.


-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Sun, 29 Jan 2017 20:07:28 -0700
Message-ID: <a6d77e7a-2c5c-9dd9-f270-278dc3a5b060@kernel.dk>
References: <20170130124350.36a57549@canb.auug.org.au>
 <5f2da80f-c6fe-8c45-0e56-819aae7d925c@kernel.dk>
Mime-Version: 1.0
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mail-it0-f54.google.com ([209.85.214.54]:38781 "EHLO
        mail-it0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1750994AbdA3DHb (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Sun, 29 Jan 2017 22:07:31 -0500
Received: by mail-it0-f54.google.com with SMTP id c7so93017803itd.1
        for <linux-next@vger.kernel.org>; Sun, 29 Jan 2017 19:07:31 -0800 (PST)
In-Reply-To: <5f2da80f-c6fe-8c45-0e56-819aae7d925c@kernel.dk>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig <hch@lst.de>

On 01/29/2017 06:53 PM, Jens Axboe wrote:
> On 01/29/2017 06:43 PM, Stephen Rothwell wrote:
>> Hi Jens,
>>
>> After merging the block tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/nvme/host/scsi.c: In function 'nvme_scsi_translate':
>> drivers/nvme/host/scsi.c:2350:9: error: 'BLK_MAX_CDB' undeclared (first use in this function)
>>   u8 cmd[BLK_MAX_CDB];
>>          ^
>> drivers/nvme/host/scsi.c:2350:9: note: each undeclared identifier is reported only once for each function it appears in
>> drivers/nvme/host/scsi.c:2350:5: warning: unused variable 'cmd' [-Wunused-variable]
>>   u8 cmd[BLK_MAX_CDB];
>>      ^
>> drivers/nvme/host/scsi.c: In function 'nvme_sg_io':
>> drivers/nvme/host/scsi.c:2454:20: error: 'BLK_MAX_CDB' undeclared (first use in this function)  
>>   if (hdr.cmd_len > BLK_MAX_CDB)
>>                     ^
>>
>> Caused by commit
>>
>>   82ed4db499b8 ("block: split scsi_request out of struct request")
>>
>> I have used the block tree from next-20170125 for today.
> 
> Huh, I wonder how that snuck past my allmodconfig builds, that looks
> like a clear failure.

Fixed, sorry about that.

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Christoph Hellwig <hch@lst.de>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Mon, 30 Jan 2017 07:34:57 +0100
Message-ID: <20170130063457.GA2592@lst.de>
References: <20170130124350.36a57549@canb.auug.org.au> <5f2da80f-c6fe-8c45-0e56-819aae7d925c@kernel.dk>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-next-owner@vger.kernel.org>
Received: from verein.lst.de ([213.95.11.211]:47500 "EHLO newverein.lst.de"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1751922AbdA3GnW (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Mon, 30 Jan 2017 01:43:22 -0500
Content-Disposition: inline
In-Reply-To: <5f2da80f-c6fe-8c45-0e56-819aae7d925c@kernel.dk>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig <hch@lst.de>

On Sun, Jan 29, 2017 at 06:53:42PM -0700, Jens Axboe wrote:
> Huh, I wonder how that snuck past my allmodconfig builds, that looks
> like a clear failure.

I also did tons of test builds and never saw it, not sure why
the NVMe-SCSI code still someone how an implicit include of scsi_cmnd.h.

But in the end it should not be using the defintion anyway, and I sent
a patch on Saturday so that it doesn't:

	[PATCH 1/5] nvme/scsi: don't rely on BLK_MAX_CDB

might make sense to expedite that.

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Tue, 18 Apr 2017 13:02:29 +1000
Message-ID: <20170418130229.04289bd6@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <netdev-owner@vger.kernel.org>
Sender: netdev-owner@vger.kernel.org
To: Jens Axboe <axboe@kernel.dk>, David Miller <davem@davemloft.net>, Networking <netdev@vger.kernel.org>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Josef Bacik <josef@toxicpanda.com>, Johannes Berg <johannes.berg@intel.com>
List-Id: linux-next.vger.kernel.org

Hi all,

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

drivers/block/nbd.c: In function 'nbd_genl_connect':
drivers/block/nbd.c:1662:10: error: too few arguments to function 'nla_parse_nested'
    ret = nla_parse_nested(socks, NBD_SOCK_MAX, attr,
          ^
In file included from include/net/rtnetlink.h:5:0,
                 from include/net/sch_generic.h:12,
                 from include/linux/filter.h:20,
                 from include/net/sock.h:64,
                 from drivers/block/nbd.c:32:
include/net/netlink.h:754:19: note: declared here
 static inline int nla_parse_nested(struct nlattr *tb[], int maxtype,
                   ^
drivers/block/nbd.c: In function 'nbd_genl_reconfigure':
drivers/block/nbd.c:1818:10: error: too few arguments to function 'nla_parse_nested'
    ret = nla_parse_nested(socks, NBD_SOCK_MAX, attr,
          ^
In file included from include/net/rtnetlink.h:5:0,
                 from include/net/sch_generic.h:12,
                 from include/linux/filter.h:20,
                 from include/net/sock.h:64,
                 from drivers/block/nbd.c:32:
include/net/netlink.h:754:19: note: declared here
 static inline int nla_parse_nested(struct nlattr *tb[], int maxtype,
                   ^

Caused by commits

  e46c7287b1c2 ("nbd: add a basic netlink interface")
  b7aa3d39385d ("nbd: add a reconfigure netlink command")

interacting with commit

  fceb6435e852 ("netlink: pass extended ACK struct to parsing functions")

from the net-next tree.

I have applied the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 18 Apr 2017 12:59:05 +1000
Subject: [PATCH] nbd: fix up for nla_parse_nested() API change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/block/nbd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index b78f23ce2395..5049d19f3940 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -1660,7 +1660,7 @@ static int nbd_genl_connect(struct sk_buff *skb, struct genl_info *info)
 				goto out;
 			}
 			ret = nla_parse_nested(socks, NBD_SOCK_MAX, attr,
-					       nbd_sock_policy);
+					       nbd_sock_policy, NULL);
 			if (ret != 0) {
 				printk(KERN_ERR "nbd: error processing sock list\n");
 				ret = -EINVAL;
@@ -1816,7 +1816,7 @@ static int nbd_genl_reconfigure(struct sk_buff *skb, struct genl_info *info)
 				goto out;
 			}
 			ret = nla_parse_nested(socks, NBD_SOCK_MAX, attr,
-					       nbd_sock_policy);
+					       nbd_sock_policy, NULL);
 			if (ret != 0) {
 				printk(KERN_ERR "nbd: error processing sock list\n");
 				ret = -EINVAL;
-- 
2.11.0

-- 
Cheers,
Stephen Rothwell

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Tue, 2 May 2017 11:07:04 +1000
Message-ID: <20170502110704.79bb7760@canb.auug.org.au>
References: <20170418130229.04289bd6@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from ozlabs.org ([103.22.144.67]:55593 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1750796AbdEBBHH (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Mon, 1 May 2017 21:07:07 -0400
In-Reply-To: <20170418130229.04289bd6@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>, David Miller <davem@davemloft.net>, Networking <netdev@vger.kernel.org>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Josef Bacik <josef@toxicpanda.com>, Johannes Berg <johannes.berg@intel.com>, Linus <torvalds@linux-foundation.org>

Hi all,

On Tue, 18 Apr 2017 13:02:29 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the block tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> drivers/block/nbd.c: In function 'nbd_genl_connect':
> drivers/block/nbd.c:1662:10: error: too few arguments to function 'nla_parse_nested'
>     ret = nla_parse_nested(socks, NBD_SOCK_MAX, attr,
>           ^
> In file included from include/net/rtnetlink.h:5:0,
>                  from include/net/sch_generic.h:12,
>                  from include/linux/filter.h:20,
>                  from include/net/sock.h:64,
>                  from drivers/block/nbd.c:32:
> include/net/netlink.h:754:19: note: declared here
>  static inline int nla_parse_nested(struct nlattr *tb[], int maxtype,
>                    ^
> drivers/block/nbd.c: In function 'nbd_genl_reconfigure':
> drivers/block/nbd.c:1818:10: error: too few arguments to function 'nla_parse_nested'
>     ret = nla_parse_nested(socks, NBD_SOCK_MAX, attr,
>           ^
> In file included from include/net/rtnetlink.h:5:0,
>                  from include/net/sch_generic.h:12,
>                  from include/linux/filter.h:20,
>                  from include/net/sock.h:64,
>                  from drivers/block/nbd.c:32:
> include/net/netlink.h:754:19: note: declared here
>  static inline int nla_parse_nested(struct nlattr *tb[], int maxtype,
>                    ^
> 
> Caused by commits
> 
>   e46c7287b1c2 ("nbd: add a basic netlink interface")
>   b7aa3d39385d ("nbd: add a reconfigure netlink command")
> 
> interacting with commit
> 
>   fceb6435e852 ("netlink: pass extended ACK struct to parsing functions")
> 
> from the net-next tree.
> 
> I have applied the following merge fix patch:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 18 Apr 2017 12:59:05 +1000
> Subject: [PATCH] nbd: fix up for nla_parse_nested() API change
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/block/nbd.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
> index b78f23ce2395..5049d19f3940 100644
> --- a/drivers/block/nbd.c
> +++ b/drivers/block/nbd.c
> @@ -1660,7 +1660,7 @@ static int nbd_genl_connect(struct sk_buff *skb, struct genl_info *info)
>  				goto out;
>  			}
>  			ret = nla_parse_nested(socks, NBD_SOCK_MAX, attr,
> -					       nbd_sock_policy);
> +					       nbd_sock_policy, NULL);
>  			if (ret != 0) {
>  				printk(KERN_ERR "nbd: error processing sock list\n");
>  				ret = -EINVAL;
> @@ -1816,7 +1816,7 @@ static int nbd_genl_reconfigure(struct sk_buff *skb, struct genl_info *info)
>  				goto out;
>  			}
>  			ret = nla_parse_nested(socks, NBD_SOCK_MAX, attr,
> -					       nbd_sock_policy);
> +					       nbd_sock_policy, NULL);
>  			if (ret != 0) {
>  				printk(KERN_ERR "nbd: error processing sock list\n");
>  				ret = -EINVAL;
> -- 
> 2.11.0

So, this merge fix is now needed when the net-next tree is merged (as
Linus has merged the block tree).

-- 
Cheers,
Stephen Rothwell

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Mon, 1 May 2017 19:09:34 -0600
Message-ID: <5CC6C5A2-B648-45F4-ACD4-AB27CE9AF9BF@kernel.dk>
References: <20170418130229.04289bd6@canb.auug.org.au> <20170502110704.79bb7760@canb.auug.org.au>
Mime-Version: 1.0 (1.0)
Content-Type: text/plain;
        charset=us-ascii
Content-Transfer-Encoding: quoted-printable
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mail-pg0-f53.google.com ([74.125.83.53]:35311 "EHLO
        mail-pg0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1751784AbdEBBJg (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Mon, 1 May 2017 21:09:36 -0400
Received: by mail-pg0-f53.google.com with SMTP id o3so47072079pgn.2
        for <linux-next@vger.kernel.org>; Mon, 01 May 2017 18:09:36 -0700 (PDT)
In-Reply-To: <20170502110704.79bb7760@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Miller <davem@davemloft.net>, Networking <netdev@vger.kernel.org>, Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Josef Bacik <josef@toxicpanda.com>, Johannes Berg <johannes.berg@intel.com>, Linus <torvalds@linux-foundation.org>


> On May 1, 2017, at 7:07 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:=

>=20
> Hi all,
>=20
>> On Tue, 18 Apr 2017 13:02:29 +1000 Stephen Rothwell <sfr@canb.auug.org.au=
> wrote:
>>=20
>> After merging the block tree, today's linux-next build (powerpc
>> ppc64_defconfig) failed like this:
>>=20
>> drivers/block/nbd.c: In function 'nbd_genl_connect':
>> drivers/block/nbd.c:1662:10: error: too few arguments to function 'nla_pa=
rse_nested'
>>    ret =3D nla_parse_nested(socks, NBD_SOCK_MAX, attr,
>>          ^
>> In file included from include/net/rtnetlink.h:5:0,
>>                 from include/net/sch_generic.h:12,
>>                 from include/linux/filter.h:20,
>>                 from include/net/sock.h:64,
>>                 from drivers/block/nbd.c:32:
>> include/net/netlink.h:754:19: note: declared here
>> static inline int nla_parse_nested(struct nlattr *tb[], int maxtype,
>>                   ^
>> drivers/block/nbd.c: In function 'nbd_genl_reconfigure':
>> drivers/block/nbd.c:1818:10: error: too few arguments to function 'nla_pa=
rse_nested'
>>    ret =3D nla_parse_nested(socks, NBD_SOCK_MAX, attr,
>>          ^
>> In file included from include/net/rtnetlink.h:5:0,
>>                 from include/net/sch_generic.h:12,
>>                 from include/linux/filter.h:20,
>>                 from include/net/sock.h:64,
>>                 from drivers/block/nbd.c:32:
>> include/net/netlink.h:754:19: note: declared here
>> static inline int nla_parse_nested(struct nlattr *tb[], int maxtype,
>>                   ^
>>=20
>> Caused by commits
>>=20
>>  e46c7287b1c2 ("nbd: add a basic netlink interface")
>>  b7aa3d39385d ("nbd: add a reconfigure netlink command")
>>=20
>> interacting with commit
>>=20
>>  fceb6435e852 ("netlink: pass extended ACK struct to parsing functions")
>>=20
>> from the net-next tree.
>>=20
>> I have applied the following merge fix patch:
>>=20
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Tue, 18 Apr 2017 12:59:05 +1000
>> Subject: [PATCH] nbd: fix up for nla_parse_nested() API change
>>=20
>> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> ---
>> drivers/block/nbd.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>=20
>> diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
>> index b78f23ce2395..5049d19f3940 100644
>> --- a/drivers/block/nbd.c
>> +++ b/drivers/block/nbd.c
>> @@ -1660,7 +1660,7 @@ static int nbd_genl_connect(struct sk_buff *skb, st=
ruct genl_info *info)
>>                goto out;
>>            }
>>            ret =3D nla_parse_nested(socks, NBD_SOCK_MAX, attr,
>> -                           nbd_sock_policy);
>> +                           nbd_sock_policy, NULL);
>>            if (ret !=3D 0) {
>>                printk(KERN_ERR "nbd: error processing sock list\n");
>>                ret =3D -EINVAL;
>> @@ -1816,7 +1816,7 @@ static int nbd_genl_reconfigure(struct sk_buff *skb=
, struct genl_info *info)
>>                goto out;
>>            }
>>            ret =3D nla_parse_nested(socks, NBD_SOCK_MAX, attr,
>> -                           nbd_sock_policy);
>> +                           nbd_sock_policy, NULL);
>>            if (ret !=3D 0) {
>>                printk(KERN_ERR "nbd: error processing sock list\n");
>>                ret =3D -EINVAL;
>> --=20
>> 2.11.0
>=20
> So, this merge fix is now needed when the net-next tree is merged (as
> Linus has merged the block tree).

Indeed, I have warned Linus about it. Thanks Stephen.=20

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Tue, 2 May 2017 11:37:20 +1000
Message-ID: <20170502113720.0e5a6ab4@canb.auug.org.au>
References: <20170418130229.04289bd6@canb.auug.org.au>
        <20170502110704.79bb7760@canb.auug.org.au>
        <5CC6C5A2-B648-45F4-ACD4-AB27CE9AF9BF@kernel.dk>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from ozlabs.org ([103.22.144.67]:45843 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1750969AbdEBBhX (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Mon, 1 May 2017 21:37:23 -0400
In-Reply-To: <5CC6C5A2-B648-45F4-ACD4-AB27CE9AF9BF@kernel.dk>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: David Miller <davem@davemloft.net>, Networking <netdev@vger.kernel.org>, Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Josef Bacik <josef@toxicpanda.com>, Johannes Berg <johannes.berg@intel.com>, Linus <torvalds@linux-foundation.org>

Hi Jens,

On Mon, 1 May 2017 19:09:34 -0600 Jens Axboe <axboe@kernel.dk> wrote:
>
> Indeed, I have warned Linus about it. Thanks Stephen. 

Thanks.

BTW, (unusually) I did not see your pull request(s) ...

-- 
Cheers,
Stephen Rothwell

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Mon, 1 May 2017 19:45:33 -0600
Message-ID: <C69884CB-D09A-4E65-88C0-C6F4D6213FFF@kernel.dk>
References: <20170418130229.04289bd6@canb.auug.org.au> <20170502110704.79bb7760@canb.auug.org.au> <5CC6C5A2-B648-45F4-ACD4-AB27CE9AF9BF@kernel.dk> <20170502113720.0e5a6ab4@canb.auug.org.au>
Mime-Version: 1.0 (1.0)
Content-Type: text/plain;
        charset=us-ascii
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mail-pg0-f45.google.com ([74.125.83.45]:36698 "EHLO
        mail-pg0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1750782AbdEBBpf (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Mon, 1 May 2017 21:45:35 -0400
Received: by mail-pg0-f45.google.com with SMTP id t7so52640453pgt.3
        for <linux-next@vger.kernel.org>; Mon, 01 May 2017 18:45:35 -0700 (PDT)
In-Reply-To: <20170502113720.0e5a6ab4@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Miller <davem@davemloft.net>, Networking <netdev@vger.kernel.org>, Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Josef Bacik <josef@toxicpanda.com>, Johannes Berg <johannes.berg@intel.com>, Linus <torvalds@linux-foundation.org>

On May 1, 2017, at 7:37 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> Hi Jens,
> 
>> On Mon, 1 May 2017 19:09:34 -0600 Jens Axboe <axboe@kernel.dk> wrote:
>> 
>> Indeed, I have warned Linus about it. Thanks Stephen. 
> 
> Thanks.
> 
> BTW, (unusually) I did not see your pull request(s) ...

I CC'ed linux-block, so they showed up there at least. 

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Tue, 13 Jun 2017 14:10:34 +1000
Message-ID: <20170613141034.72f19b4a@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from ozlabs.org ([103.22.144.67]:44185 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1751853AbdFMEKg (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Tue, 13 Jun 2017 00:10:36 -0400
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>, David Sterba <dsterba@suse.cz>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Christoph Hellwig <hch@lst.de>, Liu Bo <bo.li.liu@oracle.com>

Hi Jens,

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

fs/btrfs/inode.c: In function 'btrfs_endio_direct_read':
fs/btrfs/inode.c:8278:7: error: 'struct bio' has no member named 'bi_error'
    bio->bi_error = 0;
       ^

Caused by commit

  4e4cbee93d56 ("block: switch bios to blk_status_t")

interacting with commit

  674d8fe747c8 ("Btrfs: tolerate errors if we have retried successfully")

from the btrfs-kdave tree.

I appled that following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Jun 2017 14:01:24 +1000
Subject: [PATCH] btrfs: merge fix for "block: switch bios to blk_status_t"

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

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index d2ec62ad4998..15af1ef31a45 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -8275,7 +8275,7 @@ static void btrfs_endio_direct_read(struct bio *bio)
 	if (dip->flags & BTRFS_DIO_ORIG_BIO_SUBMITTED) {
 		err = btrfs_subio_endio_read(inode, io_bio, err);
 		if (!err)
-			bio->bi_error = 0;
+			bio->bi_status = 0;
 	}
 
 	unlock_extent(&BTRFS_I(inode)->io_tree, dip->logical_offset,
-- 
2.11.0

-- 
Cheers,
Stephen Rothwell

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Tue, 13 Jun 2017 20:54:09 +1000
Message-ID: <20170613205409.4b7e06f9@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from ozlabs.org ([103.22.144.67]:43855 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1751895AbdFMKyM (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Tue, 13 Jun 2017 06:54:12 -0400
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>, Martin Schwidefsky <schwidefsky@de.ibm.com>, Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Christoph Hellwig <hch@lst.de>, Sebastian Ott <sebott@linux.vnet.ibm.com>

Hi Jall,

After merging the block tree, today's linux-next build (s390x
s390-defconfig) failed like this:

drivers/s390/block/scm_blk.c:293:10: error: 'BLK_MQ_RQ_QUEUE_BUSY' undeclared (first use in this function)
drivers/s390/block/scm_blk.c:327:9: error: 'BLK_MQ_RQ_QUEUE_OK' undeclared (first use in this function)

Caused by commit

  fc17b6534eb8 ("blk-mq: switch ->queue_rq return value to blk_status_t")

interacting with commit

  12d907626539 ("s390/scm: convert to blk-mq")

from the s390 tree.

Is the following the correct merge fixup?

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Jun 2017 20:51:32 +1000
Subject: [PATCH] s390: fix up for "blk-mq: switch ->queue_rq return value to
 blk_status_t"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/s390/block/scm_blk.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/s390/block/scm_blk.c b/drivers/s390/block/scm_blk.c
index 42018a20f2b7..2cd6123c8f18 100644
--- a/drivers/s390/block/scm_blk.c
+++ b/drivers/s390/block/scm_blk.c
@@ -290,7 +290,7 @@ static int scm_blk_request(struct blk_mq_hw_ctx *hctx,
 	spin_lock(&sq->lock);
 	if (!scm_permit_request(bdev, req)) {
 		spin_unlock(&sq->lock);
-		return BLK_MQ_RQ_QUEUE_BUSY;
+		return BLK_STS_RESOURCE;
 	}
 
 	scmrq = sq->scmrq;
@@ -299,7 +299,7 @@ static int scm_blk_request(struct blk_mq_hw_ctx *hctx,
 		if (!scmrq) {
 			SCM_LOG(5, "no request");
 			spin_unlock(&sq->lock);
-			return BLK_MQ_RQ_QUEUE_BUSY;
+			return BLK_STS_RESOURCE;
 		}
 		scm_request_init(bdev, scmrq);
 		sq->scmrq = scmrq;
@@ -315,7 +315,7 @@ static int scm_blk_request(struct blk_mq_hw_ctx *hctx,
 
 		sq->scmrq = NULL;
 		spin_unlock(&sq->lock);
-		return BLK_MQ_RQ_QUEUE_BUSY;
+		return BLK_STS_RESOURCE;
 	}
 	blk_mq_start_request(req);
 
@@ -324,7 +324,7 @@ static int scm_blk_request(struct blk_mq_hw_ctx *hctx,
 		sq->scmrq = NULL;
 	}
 	spin_unlock(&sq->lock);
-	return BLK_MQ_RQ_QUEUE_OK;
+	return BLK_STS_OK;
 }
 
 static int scm_blk_init_hctx(struct blk_mq_hw_ctx *hctx, void *data,
-- 
2.11.0

-- 
Cheers,
Stephen Rothwell

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Sebastian Ott <sebott@linux.vnet.ibm.com>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 15 Jun 2017 16:50:48 +0200 (CEST)
Message-ID: <alpine.LFD.2.20.1706151649160.1848@schleppi>
References: <20170613205409.4b7e06f9@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:47832 "EHLO
        mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK)
        by vger.kernel.org with ESMTP id S1752548AbdFOOu4 (ORCPT
        <rfc822;linux-next@vger.kernel.org>);
        Thu, 15 Jun 2017 10:50:56 -0400
Received: from pps.filterd (m0098410.ppops.net [127.0.0.1])
        by mx0a-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v5FEmgKH063963
        for <linux-next@vger.kernel.org>; Thu, 15 Jun 2017 10:50:55 -0400
Received: from e06smtp14.uk.ibm.com (e06smtp14.uk.ibm.com [195.75.94.110])
        by mx0a-001b2d01.pphosted.com with ESMTP id 2b3ujvtbya-1
        (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)
        for <linux-next@vger.kernel.org>; Thu, 15 Jun 2017 10:50:55 -0400
Received: from localhost
        by e06smtp14.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted
        for <linux-next@vger.kernel.org> from <sebott@linux.vnet.ibm.com>;
        Thu, 15 Jun 2017 15:50:53 +0100
In-Reply-To: <20170613205409.4b7e06f9@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jens Axboe <axboe@kernel.dk>, Martin Schwidefsky <schwidefsky@de.ibm.com>, Heiko Carstens <heiko.carstens@de.ibm.com>, Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Christoph Hellwig <hch@lst.de>

On Tue, 13 Jun 2017, Stephen Rothwell wrote:
> After merging the block tree, today's linux-next build (s390x
> s390-defconfig) failed like this:
> 
> drivers/s390/block/scm_blk.c:293:10: error: 'BLK_MQ_RQ_QUEUE_BUSY' undeclared (first use in this function)
> drivers/s390/block/scm_blk.c:327:9: error: 'BLK_MQ_RQ_QUEUE_OK' undeclared (first use in this function)
> 
> Caused by commit
> 
>   fc17b6534eb8 ("blk-mq: switch ->queue_rq return value to blk_status_t")
> 
> interacting with commit
> 
>   12d907626539 ("s390/scm: convert to blk-mq")
> 
> from the s390 tree.
> 
> Is the following the correct merge fixup?

Yes, that looks good!

Thanks,
Sebastian

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Sebastian Ott <sebott@linux.vnet.ibm.com>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Mon, 19 Jun 2017 11:00:23 +0200 (CEST)
Message-ID: <alpine.LFD.2.20.1706191056510.1794@schleppi>
References: <20170613205409.4b7e06f9@canb.auug.org.au> <alpine.LFD.2.20.1706151649160.1848@schleppi>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:44456 "EHLO
        mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK)
        by vger.kernel.org with ESMTP id S1753591AbdFSJAb (ORCPT
        <rfc822;linux-next@vger.kernel.org>);
        Mon, 19 Jun 2017 05:00:31 -0400
Received: from pps.filterd (m0098399.ppops.net [127.0.0.1])
        by mx0a-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v5J8xFPa011213
        for <linux-next@vger.kernel.org>; Mon, 19 Jun 2017 05:00:30 -0400
Received: from e06smtp15.uk.ibm.com (e06smtp15.uk.ibm.com [195.75.94.111])
        by mx0a-001b2d01.pphosted.com with ESMTP id 2b64mrgdxx-1
        (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)
        for <linux-next@vger.kernel.org>; Mon, 19 Jun 2017 05:00:30 -0400
Received: from localhost
        by e06smtp15.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted
        for <linux-next@vger.kernel.org> from <sebott@linux.vnet.ibm.com>;
        Mon, 19 Jun 2017 10:00:28 +0100
In-Reply-To: <alpine.LFD.2.20.1706151649160.1848@schleppi>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jens Axboe <axboe@kernel.dk>, Martin Schwidefsky <schwidefsky@de.ibm.com>, Heiko Carstens <heiko.carstens@de.ibm.com>, Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Christoph Hellwig <hch@lst.de>

On Thu, 15 Jun 2017, Sebastian Ott wrote:
> On Tue, 13 Jun 2017, Stephen Rothwell wrote:
> > After merging the block tree, today's linux-next build (s390x
> > s390-defconfig) failed like this:
> > 
> > drivers/s390/block/scm_blk.c:293:10: error: 'BLK_MQ_RQ_QUEUE_BUSY' undeclared (first use in this function)
> > drivers/s390/block/scm_blk.c:327:9: error: 'BLK_MQ_RQ_QUEUE_OK' undeclared (first use in this function)
> > 
> > Caused by commit
> > 
> >   fc17b6534eb8 ("blk-mq: switch ->queue_rq return value to blk_status_t")
> > 
> > interacting with commit
> > 
> >   12d907626539 ("s390/scm: convert to blk-mq")
> > 
> > from the s390 tree.
> > 
> > Is the following the correct merge fixup?
> 
> Yes, that looks good!

Ok, we should also adjust the return code to fix this:

drivers/s390/block/scm_blk.c:426:2: warning: initialization from incompatible pointer type [enabled by default]
  .queue_rq = scm_blk_request,
  ^

diff --git a/drivers/s390/block/scm_blk.c b/drivers/s390/block/scm_blk.c
index 2cd6123c8f18..4279685901bf 100644
--- a/drivers/s390/block/scm_blk.c
+++ b/drivers/s390/block/scm_blk.c
@@ -278,8 +278,8 @@ struct scm_queue {
 	spinlock_t lock;
 };
 
-static int scm_blk_request(struct blk_mq_hw_ctx *hctx,
-			   const struct blk_mq_queue_data *qd)
+static blk_status_t scm_blk_request(struct blk_mq_hw_ctx *hctx,
+				    const struct blk_mq_queue_data *qd)
 {
 	struct scm_device *scmdev = hctx->queue->queuedata;
 	struct scm_blk_dev *bdev = dev_get_drvdata(&scmdev->dev);

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Tue, 20 Jun 2017 11:45:17 +1000
Message-ID: <20170620114517.7f0090b9@canb.auug.org.au>
References: <20170613205409.4b7e06f9@canb.auug.org.au>
        <alpine.LFD.2.20.1706151649160.1848@schleppi>
        <alpine.LFD.2.20.1706191056510.1794@schleppi>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <alpine.LFD.2.20.1706191056510.1794@schleppi>
Sender: linux-kernel-owner@vger.kernel.org
To: Sebastian Ott <sebott@linux.vnet.ibm.com>
Cc: Jens Axboe <axboe@kernel.dk>, Martin Schwidefsky <schwidefsky@de.ibm.com>, Heiko Carstens <heiko.carstens@de.ibm.com>, Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Christoph Hellwig <hch@lst.de>
List-Id: linux-next.vger.kernel.org

Hi Sebastian,

On Mon, 19 Jun 2017 11:00:23 +0200 (CEST) Sebastian Ott <sebott@linux.vnet.ibm.com> wrote:
>
> Ok, we should also adjust the return code to fix this:
> 
> drivers/s390/block/scm_blk.c:426:2: warning: initialization from incompatible pointer type [enabled by default]
>   .queue_rq = scm_blk_request,
>   ^
> 
> diff --git a/drivers/s390/block/scm_blk.c b/drivers/s390/block/scm_blk.c
> index 2cd6123c8f18..4279685901bf 100644
> --- a/drivers/s390/block/scm_blk.c
> +++ b/drivers/s390/block/scm_blk.c
> @@ -278,8 +278,8 @@ struct scm_queue {
>  	spinlock_t lock;
>  };
>  
> -static int scm_blk_request(struct blk_mq_hw_ctx *hctx,
> -			   const struct blk_mq_queue_data *qd)
> +static blk_status_t scm_blk_request(struct blk_mq_hw_ctx *hctx,
> +				    const struct blk_mq_queue_data *qd)
>  {
>  	struct scm_device *scmdev = hctx->queue->queuedata;
>  	struct scm_blk_dev *bdev = dev_get_drvdata(&scmdev->dev);
> 

Good point, I have done that today.  The complete fix up patch now
looks like this:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Jun 2017 20:51:32 +1000
Subject: [PATCH] s390: fix up for "blk-mq: switch ->queue_rq return value to
 blk_status_t"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/s390/block/scm_blk.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/s390/block/scm_blk.c b/drivers/s390/block/scm_blk.c
index 42018a20f2b7..0071febac9e6 100644
--- a/drivers/s390/block/scm_blk.c
+++ b/drivers/s390/block/scm_blk.c
@@ -278,7 +278,7 @@ struct scm_queue {
 	spinlock_t lock;
 };
 
-static int scm_blk_request(struct blk_mq_hw_ctx *hctx,
+static blk_status_t scm_blk_request(struct blk_mq_hw_ctx *hctx,
 			   const struct blk_mq_queue_data *qd)
 {
 	struct scm_device *scmdev = hctx->queue->queuedata;
@@ -290,7 +290,7 @@ static int scm_blk_request(struct blk_mq_hw_ctx *hctx,
 	spin_lock(&sq->lock);
 	if (!scm_permit_request(bdev, req)) {
 		spin_unlock(&sq->lock);
-		return BLK_MQ_RQ_QUEUE_BUSY;
+		return BLK_STS_RESOURCE;
 	}
 
 	scmrq = sq->scmrq;
@@ -299,7 +299,7 @@ static int scm_blk_request(struct blk_mq_hw_ctx *hctx,
 		if (!scmrq) {
 			SCM_LOG(5, "no request");
 			spin_unlock(&sq->lock);
-			return BLK_MQ_RQ_QUEUE_BUSY;
+			return BLK_STS_RESOURCE;
 		}
 		scm_request_init(bdev, scmrq);
 		sq->scmrq = scmrq;
@@ -315,7 +315,7 @@ static int scm_blk_request(struct blk_mq_hw_ctx *hctx,
 
 		sq->scmrq = NULL;
 		spin_unlock(&sq->lock);
-		return BLK_MQ_RQ_QUEUE_BUSY;
+		return BLK_STS_RESOURCE;
 	}
 	blk_mq_start_request(req);
 
@@ -324,7 +324,7 @@ static int scm_blk_request(struct blk_mq_hw_ctx *hctx,
 		sq->scmrq = NULL;
 	}
 	spin_unlock(&sq->lock);
-	return BLK_MQ_RQ_QUEUE_OK;
+	return BLK_STS_OK;
 }
 
 static int scm_blk_init_hctx(struct blk_mq_hw_ctx *hctx, void *data,
-- 
2.11.0

-- 
Cheers,
Stephen Rothwell

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Wed, 28 Jun 2017 18:04:56 +1000
Message-ID: <20170628180456.30cb9242@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from ozlabs.org ([103.22.144.67]:42407 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1750829AbdF1IFA (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Wed, 28 Jun 2017 04:05:00 -0400
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, "Martin K. Petersen" <martin.petersen@oracle.com>, Michael Ellerman <mpe@ellerman.id.au>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, PowerPC <linuxppc-dev@lists.ozlabs.org>

Hi Jens,

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

fs/fcntl.o: In function `do_fcntl': 
fcntl.c:(.text+0x6d4): undefined reference to `__get_user_bad'
fcntl.c:(.text+0x730): undefined reference to `__get_user_bad'

Probably caused by commit

  c75b1d9421f8 ("fs: add fcntl() interface for setting/getting write life time hints")

On powerpc (at least) you cannot use get_user() to fetch anything larger
than "unsigned long" i.e. 32 bits on 32 bit powerpc.

This has been discussed before (and, I think, a fix attempted).

For now I have applied the following patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Jun 2017 17:50:31 +1000
Subject: [PATCH] fs: don't read an enum directly from a u64 __user *

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/fcntl.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/fs/fcntl.c b/fs/fcntl.c
index 24e233c75a33..19825eb7c40d 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -277,6 +277,7 @@ static long fcntl_rw_hint(struct file *file, unsigned int cmd,
 {
 	struct inode *inode = file_inode(file);
 	u64 *argp = (u64 __user *)arg;
+	u64 h;
 	enum rw_hint hint;
 
 	switch (cmd) {
@@ -285,8 +286,9 @@ static long fcntl_rw_hint(struct file *file, unsigned int cmd,
 			return -EFAULT;
 		return 0;
 	case F_SET_FILE_RW_HINT:
-		if (get_user(hint, argp))
+		if (copy_from_user(&h, argp, sizeof(h)))
 			return -EFAULT;
+		hint = (enum rw_hint)h;
 		if (!rw_hint_valid(hint))
 			return -EINVAL;
 
@@ -299,8 +301,9 @@ static long fcntl_rw_hint(struct file *file, unsigned int cmd,
 			return -EFAULT;
 		return 0;
 	case F_SET_RW_HINT:
-		if (get_user(hint, argp))
+		if (copy_from_user(&h, argp, sizeof(h)))
 			return -EFAULT;
+		hint = (enum rw_hint)h;
 		if (!rw_hint_valid(hint))
 			return -EINVAL;
 
-- 
2.11.0

-- 
Cheers,
Stephen Rothwell

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Wed, 28 Jun 2017 06:43:41 -0600
Message-ID: <664cc88d-18a5-18c4-5bce-4d4352d15f4f@kernel.dk>
References: <20170628180456.30cb9242@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mail-pf0-f176.google.com ([209.85.192.176]:33295 "EHLO
        mail-pf0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1751489AbdF1Mno (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Wed, 28 Jun 2017 08:43:44 -0400
Received: by mail-pf0-f176.google.com with SMTP id e7so33029911pfk.0
        for <linux-next@vger.kernel.org>; Wed, 28 Jun 2017 05:43:43 -0700 (PDT)
In-Reply-To: <20170628180456.30cb9242@canb.auug.org.au>
Content-Language: en-US
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, "Martin K. Petersen" <martin.petersen@oracle.com>, Michael Ellerman <mpe@ellerman.id.au>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, PowerPC <linuxppc-dev@lists.ozlabs.org>

On 06/28/2017 02:04 AM, Stephen Rothwell wrote:
> Hi Jens,
> 
> After merging the block tree, today's linux-next build (powerpc
> allnoconfig) failed like this:
> 
> fs/fcntl.o: In function `do_fcntl': 
> fcntl.c:(.text+0x6d4): undefined reference to `__get_user_bad'
> fcntl.c:(.text+0x730): undefined reference to `__get_user_bad'
> 
> Probably caused by commit
> 
>   c75b1d9421f8 ("fs: add fcntl() interface for setting/getting write life time hints")
> 
> On powerpc (at least) you cannot use get_user() to fetch anything larger
> than "unsigned long" i.e. 32 bits on 32 bit powerpc.
> 
> This has been discussed before (and, I think, a fix attempted).

Gah, thanks for letting me know. I'll test your patch and queue it
up to fix this issue.

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Wed, 28 Jun 2017 08:01:20 -0600
Message-ID: <2bd17edb-4a5b-5bf8-7074-1156a5249325@kernel.dk>
References: <20170628180456.30cb9242@canb.auug.org.au>
 <664cc88d-18a5-18c4-5bce-4d4352d15f4f@kernel.dk>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <664cc88d-18a5-18c4-5bce-4d4352d15f4f@kernel.dk>
Content-Language: en-US
Sender: linux-kernel-owner@vger.kernel.org
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, "Martin K. Petersen" <martin.petersen@oracle.com>, Michael Ellerman <mpe@ellerman.id.au>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, PowerPC <linuxppc-dev@lists.ozlabs.org>
List-Id: linux-next.vger.kernel.org

On 06/28/2017 06:43 AM, Jens Axboe wrote:
> On 06/28/2017 02:04 AM, Stephen Rothwell wrote:
>> Hi Jens,
>>
>> After merging the block tree, today's linux-next build (powerpc
>> allnoconfig) failed like this:
>>
>> fs/fcntl.o: In function `do_fcntl': 
>> fcntl.c:(.text+0x6d4): undefined reference to `__get_user_bad'
>> fcntl.c:(.text+0x730): undefined reference to `__get_user_bad'
>>
>> Probably caused by commit
>>
>>   c75b1d9421f8 ("fs: add fcntl() interface for setting/getting write life time hints")
>>
>> On powerpc (at least) you cannot use get_user() to fetch anything larger
>> than "unsigned long" i.e. 32 bits on 32 bit powerpc.
>>
>> This has been discussed before (and, I think, a fix attempted).
> 
> Gah, thanks for letting me know. I'll test your patch and queue it
> up to fix this issue.

But put_user() is fine? Just checking here, since the change adds
both a u64 put and get user.

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Wed, 28 Jun 2017 09:11:32 -0600
Message-ID: <2c4503f8-8284-2578-3622-03529cc8bffe@kernel.dk>
References: <20170628180456.30cb9242@canb.auug.org.au>
 <664cc88d-18a5-18c4-5bce-4d4352d15f4f@kernel.dk>
 <2bd17edb-4a5b-5bf8-7074-1156a5249325@kernel.dk>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <2bd17edb-4a5b-5bf8-7074-1156a5249325@kernel.dk>
Content-Language: en-US
Sender: linux-kernel-owner@vger.kernel.org
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, "Martin K. Petersen" <martin.petersen@oracle.com>, Michael Ellerman <mpe@ellerman.id.au>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, PowerPC <linuxppc-dev@lists.ozlabs.org>
List-Id: linux-next.vger.kernel.org

On 06/28/2017 08:01 AM, Jens Axboe wrote:
> On 06/28/2017 06:43 AM, Jens Axboe wrote:
>> On 06/28/2017 02:04 AM, Stephen Rothwell wrote:
>>> Hi Jens,
>>>
>>> After merging the block tree, today's linux-next build (powerpc
>>> allnoconfig) failed like this:
>>>
>>> fs/fcntl.o: In function `do_fcntl': 
>>> fcntl.c:(.text+0x6d4): undefined reference to `__get_user_bad'
>>> fcntl.c:(.text+0x730): undefined reference to `__get_user_bad'
>>>
>>> Probably caused by commit
>>>
>>>   c75b1d9421f8 ("fs: add fcntl() interface for setting/getting write life time hints")
>>>
>>> On powerpc (at least) you cannot use get_user() to fetch anything larger
>>> than "unsigned long" i.e. 32 bits on 32 bit powerpc.
>>>
>>> This has been discussed before (and, I think, a fix attempted).
>>
>> Gah, thanks for letting me know. I'll test your patch and queue it
>> up to fix this issue.
> 
> But put_user() is fine? Just checking here, since the change adds
> both a u64 put and get user.

I just changed all 4, at least that provides some symmetry in how
we copy things in and out for that set of fcntls.

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 29 Jun 2017 07:33:22 +1000
Message-ID: <20170629073322.1b007407@canb.auug.org.au>
References: <20170628180456.30cb9242@canb.auug.org.au>
        <664cc88d-18a5-18c4-5bce-4d4352d15f4f@kernel.dk>
        <2bd17edb-4a5b-5bf8-7074-1156a5249325@kernel.dk>
        <2c4503f8-8284-2578-3622-03529cc8bffe@kernel.dk>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from ozlabs.org ([103.22.144.67]:36919 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1751548AbdF1Vd0 (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Wed, 28 Jun 2017 17:33:26 -0400
In-Reply-To: <2c4503f8-8284-2578-3622-03529cc8bffe@kernel.dk>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, "Martin K. Petersen" <martin.petersen@oracle.com>, Michael Ellerman <mpe@ellerman.id.au>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, PowerPC <linuxppc-dev@lists.ozlabs.org>

Hi Jens,

On Wed, 28 Jun 2017 09:11:32 -0600 Jens Axboe <axboe@kernel.dk> wrote:
>
> On 06/28/2017 08:01 AM, Jens Axboe wrote:
> > But put_user() is fine? Just checking here, since the change adds
> > both a u64 put and get user.  

Yes, put_user is fine (it does 2 4 byte moves.  The asm is there to do
the 8 byte get_user, but the surrounding C code uses an unsigned long
for the destination in all cases (some other arches do the same).  I
don't remember why it is like that.

> I just changed all 4, at least that provides some symmetry in how
> we copy things in and out for that set of fcntls.

OK, thanks.

-- 
Cheers,
Stephen Rothwell

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Guenter Roeck <linux@roeck-us.net>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Tue, 4 Jul 2017 08:15:57 -0700
Message-ID: <20170704151557.GA22088@roeck-us.net>
References: <20170613205409.4b7e06f9@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-next-owner@vger.kernel.org>
Received: from bh-25.webhostbox.net ([208.91.199.152]:40606 "EHLO
        bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1752342AbdGDPQC (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Tue, 4 Jul 2017 11:16:02 -0400
Content-Disposition: inline
In-Reply-To: <20170613205409.4b7e06f9@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jens Axboe <axboe@kernel.dk>, Martin Schwidefsky <schwidefsky@de.ibm.com>, Heiko Carstens <heiko.carstens@de.ibm.com>, Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Christoph Hellwig <hch@lst.de>, Sebastian Ott <sebott@linux.vnet.ibm.com>

On Tue, Jun 13, 2017 at 08:54:09PM +1000, Stephen Rothwell wrote:
> Hi Jall,
> 
> After merging the block tree, today's linux-next build (s390x
> s390-defconfig) failed like this:
> 
> drivers/s390/block/scm_blk.c:293:10: error: 'BLK_MQ_RQ_QUEUE_BUSY' undeclared (first use in this function)
> drivers/s390/block/scm_blk.c:327:9: error: 'BLK_MQ_RQ_QUEUE_OK' undeclared (first use in this function)
> 
> Caused by commit
> 
>   fc17b6534eb8 ("blk-mq: switch ->queue_rq return value to blk_status_t")
> 
> interacting with commit
> 
>   12d907626539 ("s390/scm: convert to blk-mq")
> 
> from the s390 tree.
> 
> Is the following the correct merge fixup?
> 

The failure made int into Linus' tree, but the fix didn't. Is the fix pending
in some other queue or does it have to be (re-)submitted ?

Guenter

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 13 Jun 2017 20:51:32 +1000
> Subject: [PATCH] s390: fix up for "blk-mq: switch ->queue_rq return value to
>  blk_status_t"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/s390/block/scm_blk.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/s390/block/scm_blk.c b/drivers/s390/block/scm_blk.c
> index 42018a20f2b7..2cd6123c8f18 100644
> --- a/drivers/s390/block/scm_blk.c
> +++ b/drivers/s390/block/scm_blk.c
> @@ -290,7 +290,7 @@ static int scm_blk_request(struct blk_mq_hw_ctx *hctx,
>  	spin_lock(&sq->lock);
>  	if (!scm_permit_request(bdev, req)) {
>  		spin_unlock(&sq->lock);
> -		return BLK_MQ_RQ_QUEUE_BUSY;
> +		return BLK_STS_RESOURCE;
>  	}
>  
>  	scmrq = sq->scmrq;
> @@ -299,7 +299,7 @@ static int scm_blk_request(struct blk_mq_hw_ctx *hctx,
>  		if (!scmrq) {
>  			SCM_LOG(5, "no request");
>  			spin_unlock(&sq->lock);
> -			return BLK_MQ_RQ_QUEUE_BUSY;
> +			return BLK_STS_RESOURCE;
>  		}
>  		scm_request_init(bdev, scmrq);
>  		sq->scmrq = scmrq;
> @@ -315,7 +315,7 @@ static int scm_blk_request(struct blk_mq_hw_ctx *hctx,
>  
>  		sq->scmrq = NULL;
>  		spin_unlock(&sq->lock);
> -		return BLK_MQ_RQ_QUEUE_BUSY;
> +		return BLK_STS_RESOURCE;
>  	}
>  	blk_mq_start_request(req);
>  
> @@ -324,7 +324,7 @@ static int scm_blk_request(struct blk_mq_hw_ctx *hctx,
>  		sq->scmrq = NULL;
>  	}
>  	spin_unlock(&sq->lock);
> -	return BLK_MQ_RQ_QUEUE_OK;
> +	return BLK_STS_OK;
>  }
>  
>  static int scm_blk_init_hctx(struct blk_mq_hw_ctx *hctx, void *data,

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Wed, 5 Jul 2017 07:40:18 +1000
Message-ID: <20170705074018.5cfee177@canb.auug.org.au>
References: <20170613205409.4b7e06f9@canb.auug.org.au>
        <20170704151557.GA22088@roeck-us.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from ozlabs.org ([103.22.144.67]:36471 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1752248AbdGDVkV (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Tue, 4 Jul 2017 17:40:21 -0400
In-Reply-To: <20170704151557.GA22088@roeck-us.net>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Guenter Roeck <linux@roeck-us.net>
Cc: Jens Axboe <axboe@kernel.dk>, Martin Schwidefsky <schwidefsky@de.ibm.com>, Heiko Carstens <heiko.carstens@de.ibm.com>, Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Christoph Hellwig <hch@lst.de>, Sebastian Ott <sebott@linux.vnet.ibm.com>

Hi Guenter,

On Tue, 4 Jul 2017 08:15:57 -0700 Guenter Roeck <linux@roeck-us.net> wrote:
>
> On Tue, Jun 13, 2017 at 08:54:09PM +1000, Stephen Rothwell wrote:
> > 
> > After merging the block tree, today's linux-next build (s390x
> > s390-defconfig) failed like this:
> > 
> > drivers/s390/block/scm_blk.c:293:10: error: 'BLK_MQ_RQ_QUEUE_BUSY' undeclared (first use in this function)
> > drivers/s390/block/scm_blk.c:327:9: error: 'BLK_MQ_RQ_QUEUE_OK' undeclared (first use in this function)
> > 
> > Caused by commit
> > 
> >   fc17b6534eb8 ("blk-mq: switch ->queue_rq return value to blk_status_t")
> > 
> > interacting with commit
> > 
> >   12d907626539 ("s390/scm: convert to blk-mq")
> > 
> > from the s390 tree.
> > 
> > Is the following the correct merge fixup?
> >   
> 
> The failure made int into Linus' tree, but the fix didn't. Is the fix pending
> in some other queue or does it have to be (re-)submitted ?

It will be my in fixes tree today and until it appears in Linus' or the
s390 tree.

-- 
Cheers,
Stephen Rothwell

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Thu, 24 Aug 2017 13:32:03 +1000
Message-ID: <20170824133203.18512289@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from ozlabs.org ([103.22.144.67]:44283 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1751062AbdHXDcF (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Wed, 23 Aug 2017 23:32:05 -0400
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Christoph Hellwig <hch@lst.de>

Hi Jens,

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

block/bio-integrity.c: In function '__bio_integrity_endio':
block/bio-integrity.c:388:51: error: 'struct bio' has no member named 'bi_bdev'
  struct blk_integrity *bi = bdev_get_integrity(bio->bi_bdev);
                                                   ^

Caused by commit

  74d46992e0d9 ("block: replace bi_bdev with a gendisk pointer and partitions index")

interacting with commit

  c775d2098d35 ("bio-integrity: Fix regression if profile verify_fn is NULL")

from Linus' tree (before v4.13-rc5).

This should have been fixed up in commit

  3b8848b41130 ("Merge branch 'master' into for-next")

I have used the block tree from next-20170823 for today.

-- 
Cheers,
Stephen Rothwell

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 24 Aug 2017 13:34:55 +1000
Message-ID: <20170824133455.7fb963ca@canb.auug.org.au>
References: <20170824133203.18512289@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from ozlabs.org ([103.22.144.67]:45245 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1751215AbdHXDe5 (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Wed, 23 Aug 2017 23:34:57 -0400
In-Reply-To: <20170824133203.18512289@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Christoph Hellwig <hch@lst.de>

Hi all,

On Thu, 24 Aug 2017 13:32:03 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> block/bio-integrity.c: In function '__bio_integrity_endio':
> block/bio-integrity.c:388:51: error: 'struct bio' has no member named 'bi_bdev'
>   struct blk_integrity *bi = bdev_get_integrity(bio->bi_bdev);
>                                                    ^
> 
> Caused by commit
> 
>   74d46992e0d9 ("block: replace bi_bdev with a gendisk pointer and partitions index")
> 
> interacting with commit
> 
>   c775d2098d35 ("bio-integrity: Fix regression if profile verify_fn is NULL")
> 
> from Linus' tree (before v4.13-rc5).
> 
> This should have been fixed up in commit
> 
>   3b8848b41130 ("Merge branch 'master' into for-next")
> 
> I have used the block tree from next-20170823 for today.

The other remaining reference to bi_bdev is in Documentation/block/biodoc.txt.

-- 
Cheers,
Stephen Rothwell

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Christoph Hellwig <hch@lst.de>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 24 Aug 2017 10:44:10 +0200
Message-ID: <20170824084410.GC19313@lst.de>
References: <20170824133203.18512289@canb.auug.org.au> <20170824133455.7fb963ca@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-next-owner@vger.kernel.org>
Received: from verein.lst.de ([213.95.11.211]:48472 "EHLO newverein.lst.de"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1751191AbdHXIoL (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Thu, 24 Aug 2017 04:44:11 -0400
Content-Disposition: inline
In-Reply-To: <20170824133455.7fb963ca@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jens Axboe <axboe@kernel.dk>, Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Christoph Hellwig <hch@lst.de>

Hi Stephen,

Keith already sent a patch for this, it was a rebase failure :(

The documentation one is intentional - the document is completely
out of data, so doctoring around a bit won't help.  I'll try to find
some time to replace it with a sane new doc that use the ReST stuff
to not duplicate the structure. 

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 24 Aug 2017 18:54:13 +1000
Message-ID: <20170824185413.01229bab@canb.auug.org.au>
References: <20170824133203.18512289@canb.auug.org.au>
        <20170824133455.7fb963ca@canb.auug.org.au>
        <20170824084410.GC19313@lst.de>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <20170824084410.GC19313@lst.de>
Sender: linux-kernel-owner@vger.kernel.org
To: Christoph Hellwig <hch@lst.de>
Cc: Jens Axboe <axboe@kernel.dk>, Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
List-Id: linux-next.vger.kernel.org

Hi Christoph,

On Thu, 24 Aug 2017 10:44:10 +0200 Christoph Hellwig <hch@lst.de> wrote:
>
> Keith already sent a patch for this, it was a rebase failure :(

Ah, OK, thanks.

> The documentation one is intentional - the document is completely
> out of data, so doctoring around a bit won't help.  I'll try to find
> some time to replace it with a sane new doc that use the ReST stuff
> to not duplicate the structure. 

Seems like a plan.

-- 
Cheers,
Stephen Rothwell

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Thu, 26 Jul 2018 14:56:24 +1000
Message-ID: <20180726145624.13a604ed@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/ah2dOQSZExKWY5aI/4O+/7H"; protocol="application/pgp-signature"
Return-path: <linux-kernel-owner@vger.kernel.org>
Sender: linux-kernel-owner@vger.kernel.org
To: Jens Axboe <axboe@kernel.dk>, Doug Ledford <dledford@redhat.com>, Jason Gunthorpe <jgg@mellanox.com>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Steve Wise <swise@opengridcomputing.com>, Christoph Hellwig <hch@lst.de>
List-Id: linux-next.vger.kernel.org

--Sig_/ah2dOQSZExKWY5aI/4O+/7H
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:

drivers/nvme/target/rdma.c: In function 'nvmet_rdma_find_get_device':
drivers/nvme/target/rdma.c:894:26: error: 'struct ib_device_attr' has no me=
mber named 'max_sge'; did you mean 'max_cqe'?
     cm_id->device->attrs.max_sge) - 1;
                          ^
drivers/nvme/target/rdma.c:893:21: note: in expansion of macro 'max'
  inline_sge_count =3D max(cm_id->device->attrs.max_sge_rd,
                     ^~~
In file included from include/linux/list.h:9:0,
                 from include/linux/module.h:9,
                 from drivers/nvme/host/rdma.c:15:
drivers/nvme/host/rdma.c: In function 'nvme_rdma_find_get_device':
drivers/nvme/host/rdma.c:381:23: error: 'struct ib_device_attr' has no memb=
er named 'max_sge'; did you mean 'max_cqe'?
      ndev->dev->attrs.max_sge - 1);
                       ^
drivers/nvme/host/rdma.c:380:30: note: in expansion of macro 'min'
  ndev->num_inline_segments =3D min(NVME_RDMA_MAX_INLINE_SEGMENTS,
                              ^~~

Caused by commits

  64a741c1eaa8 ("nvme-rdma: support up to 4 segments of inline data")
  0d5ee2b2ab4f ("nvmet-rdma: support max(16KB, PAGE_SIZE) inline data")

interacting with commit

  33023fb85a42 ("IB/core: add max_send_sge and max_recv_sge attributes")

from the rdma tree.

I have applied the following merge fix patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 26 Jul 2018 14:32:15 +1000
Subject: [PATCH] nvme-dma: merge fix up for replacement of max_sge

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/nvme/host/rdma.c   | 2 +-
 drivers/nvme/target/rdma.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index cfa0319fcd1c..368fe5ac0c6b 100644
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -378,7 +378,7 @@ nvme_rdma_find_get_device(struct rdma_cm_id *cm_id)
 	}
=20
 	ndev->num_inline_segments =3D min(NVME_RDMA_MAX_INLINE_SEGMENTS,
-					ndev->dev->attrs.max_sge - 1);
+					ndev->dev->attrs.max_send_sge - 1);
 	list_add(&ndev->entry, &device_list);
 out_unlock:
 	mutex_unlock(&device_list_mutex);
diff --git a/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c
index 86121a7a19b2..8c30ac7d8078 100644
--- a/drivers/nvme/target/rdma.c
+++ b/drivers/nvme/target/rdma.c
@@ -891,7 +891,7 @@ nvmet_rdma_find_get_device(struct rdma_cm_id *cm_id)
=20
 	inline_page_count =3D num_pages(port->inline_data_size);
 	inline_sge_count =3D max(cm_id->device->attrs.max_sge_rd,
-				cm_id->device->attrs.max_sge) - 1;
+				cm_id->device->attrs.max_send_sge) - 1;
 	if (inline_page_count > inline_sge_count) {
 		pr_warn("inline_data_size %d cannot be supported by device %s. Reducing =
to %lu.\n",
 			port->inline_data_size, cm_id->device->name,
--=20
2.18.0

--=20
Cheers,
Stephen Rothwell

--Sig_/ah2dOQSZExKWY5aI/4O+/7H
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAltZVHgACgkQAVBC80lX
0GxQPwgAj6B7/m8Al58wnDTVGjm9jvMAbnfhuee1TeW4u2jfYOTUw4xfeclDenn6
7xPXXDLHZDF/2rNhO7Wp9CniEywtkoxYHhX5LKNNr/YBAaG1CUImZTnm6sasHFDN
EhFi8aTScahyN05wlXcwbSAcz3rm8SwLb0VH8F/YdulbIa0q7w2arCcNERa/sgpR
3iUFnKwnap3zDNe8sKApQrh3eWcNe0h98Ve8hGAO4qYX7z5dhk0PgJ3mQ6/mr5DP
/8Eb8eVJYe1R9jnW+UQyy6ATdZnv8A3smmCwaxWpQnOoGEYl1UWn8UsV6P4JS/U5
NrgD721lyStmeAHDb9BwdstbmZGtBw==
=4RTM
-----END PGP SIGNATURE-----

--Sig_/ah2dOQSZExKWY5aI/4O+/7H--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Christoph Hellwig <hch@lst.de>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 26 Jul 2018 10:48:33 +0200
Message-ID: <20180726084833.GA23310@lst.de>
References: <20180726145624.13a604ed@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-kernel-owner@vger.kernel.org>
Content-Disposition: inline
In-Reply-To: <20180726145624.13a604ed@canb.auug.org.au>
Sender: linux-kernel-owner@vger.kernel.org
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jens Axboe <axboe@kernel.dk>, Doug Ledford <dledford@redhat.com>, Jason Gunthorpe <jgg@mellanox.com>, Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Steve Wise <swise@opengridcomputing.com>, Christoph Hellwig <hch@lst.de>
List-Id: linux-next.vger.kernel.org

On Thu, Jul 26, 2018 at 02:56:24PM +1000, Stephen Rothwell wrote:
> diff --git a/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c
> index 86121a7a19b2..8c30ac7d8078 100644
> --- a/drivers/nvme/target/rdma.c
> +++ b/drivers/nvme/target/rdma.c
> @@ -891,7 +891,7 @@ nvmet_rdma_find_get_device(struct rdma_cm_id *cm_id)
>  
>  	inline_page_count = num_pages(port->inline_data_size);
>  	inline_sge_count = max(cm_id->device->attrs.max_sge_rd,
> -				cm_id->device->attrs.max_sge) - 1;
> +				cm_id->device->attrs.max_send_sge) - 1;

This should be max_recv_sge.

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 26 Jul 2018 18:45:47 +1000
Message-ID: <20180726184547.67a3fc8e@canb.auug.org.au>
References: <20180726145624.13a604ed@canb.auug.org.au>
        <20180726084833.GA23310@lst.de>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/70p9RtVLeQqjD+QhWGJrsdY"; protocol="application/pgp-signature"
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <20180726084833.GA23310@lst.de>
Sender: linux-kernel-owner@vger.kernel.org
To: Christoph Hellwig <hch@lst.de>
Cc: Jens Axboe <axboe@kernel.dk>, Doug Ledford <dledford@redhat.com>, Jason Gunthorpe <jgg@mellanox.com>, Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Steve Wise <swise@opengridcomputing.com>
List-Id: linux-next.vger.kernel.org

--Sig_/70p9RtVLeQqjD+QhWGJrsdY
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Christoph,

On Thu, 26 Jul 2018 10:48:33 +0200 Christoph Hellwig <hch@lst.de> wrote:
>
> On Thu, Jul 26, 2018 at 02:56:24PM +1000, Stephen Rothwell wrote:
> > diff --git a/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c
> > index 86121a7a19b2..8c30ac7d8078 100644
> > --- a/drivers/nvme/target/rdma.c
> > +++ b/drivers/nvme/target/rdma.c
> > @@ -891,7 +891,7 @@ nvmet_rdma_find_get_device(struct rdma_cm_id *cm_id)
> > =20
> >  	inline_page_count =3D num_pages(port->inline_data_size);
> >  	inline_sge_count =3D max(cm_id->device->attrs.max_sge_rd,
> > -				cm_id->device->attrs.max_sge) - 1;
> > +				cm_id->device->attrs.max_send_sge) - 1; =20
>=20
> This should be max_recv_sge.

Thanks, I will fix up my resolution for tomorrow.

--=20
Cheers,
Stephen Rothwell

--Sig_/70p9RtVLeQqjD+QhWGJrsdY
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAltZijsACgkQAVBC80lX
0GxAygf/XFg0MfBLbXfHngI2FwBMjRTkdEzxg+2C50gqm9q7Rp4+XEK7fBgKZEJ8
b8eifsulcO8JdjqJc7BzDMI25Us18AGoZAhzAFckj0w6VU1P1KcmOIOEzmg6G1CB
PEt0AbJ0c1lhQMUy1ZP5zu6SqJMHcledv9h2UwjdJOdXUvfIOH3oSFYfe97jzzrn
gtUgPuKvYT2NZ7+Hio5h03NhZyqnFpIuWrFgTaooG4UVbGbzdTEBw05Gid+Byz3p
cEQbrcEZvKoLL3OkMuRkAMnmUodWrkBOONdnBV7mjjJLvjyo/fFk+mcXcKZm000l
Xl1z2lMzi866pAwMn8snHqmLaveUug==
=GNdC
-----END PGP SIGNATURE-----

--Sig_/70p9RtVLeQqjD+QhWGJrsdY--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: "Steve Wise" <swise@opengridcomputing.com>
Subject: RE: linux-next: build failure after merge of the block tree
Date: Thu, 26 Jul 2018 07:32:16 -0500
Message-ID: <011b01d424dc$b0a69820$11f3c860$@opengridcomputing.com>
References: <20180726145624.13a604ed@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain;
        charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <20180726145624.13a604ed@canb.auug.org.au>
Content-Language: en-us
Sender: linux-kernel-owner@vger.kernel.org
To: 'Stephen Rothwell' <sfr@canb.auug.org.au>, 'Jens Axboe' <axboe@kernel.dk>, 'Doug Ledford' <dledford@redhat.com>, 'Jason Gunthorpe' <jgg@mellanox.com>
Cc: 'Linux-Next Mailing List' <linux-next@vger.kernel.org>, 'Linux Kernel Mailing List' <linux-kernel@vger.kernel.org>, 'Christoph Hellwig' <hch@lst.de>
List-Id: linux-next.vger.kernel.org

Hey Stephen:

> I have applied the following merge fix patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 26 Jul 2018 14:32:15 +1000
> Subject: [PATCH] nvme-dma: merge fix up for replacement of max_sge
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/nvme/host/rdma.c   | 2 +-
>  drivers/nvme/target/rdma.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
> index cfa0319fcd1c..368fe5ac0c6b 100644
> --- a/drivers/nvme/host/rdma.c
> +++ b/drivers/nvme/host/rdma.c
> @@ -378,7 +378,7 @@ nvme_rdma_find_get_device(struct rdma_cm_id
> *cm_id)
>  	}
> 
>  	ndev->num_inline_segments =
> min(NVME_RDMA_MAX_INLINE_SEGMENTS,
> -					ndev->dev->attrs.max_sge - 1);
> +					ndev->dev->attrs.max_send_sge - 1);
>  	list_add(&ndev->entry, &device_list);
>  out_unlock:
>  	mutex_unlock(&device_list_mutex);
> diff --git a/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c
> index 86121a7a19b2..8c30ac7d8078 100644
> --- a/drivers/nvme/target/rdma.c
> +++ b/drivers/nvme/target/rdma.c
> @@ -891,7 +891,7 @@ nvmet_rdma_find_get_device(struct rdma_cm_id
> *cm_id)
> 
>  	inline_page_count = num_pages(port->inline_data_size);
>  	inline_sge_count = max(cm_id->device->attrs.max_sge_rd,
> -				cm_id->device->attrs.max_sge) - 1;
> +				cm_id->device->attrs.max_send_sge) - 1;

This should actually be max_recv_sge.

Thanks!

Steve.

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 26 Jul 2018 10:48:21 -0700
Message-ID: <a65a6023-a527-b9c6-0d78-a175d47f55cf@kernel.dk>
References: <20180726145624.13a604ed@canb.auug.org.au>
 <20180726084833.GA23310@lst.de>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <20180726084833.GA23310@lst.de>
Content-Language: en-US
Sender: linux-kernel-owner@vger.kernel.org
To: Christoph Hellwig <hch@lst.de>, Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Doug Ledford <dledford@redhat.com>, Jason Gunthorpe <jgg@mellanox.com>, Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Steve Wise <swise@opengridcomputing.com>
List-Id: linux-next.vger.kernel.org

On 7/26/18 1:48 AM, Christoph Hellwig wrote:
> On Thu, Jul 26, 2018 at 02:56:24PM +1000, Stephen Rothwell wrote:
>> diff --git a/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c
>> index 86121a7a19b2..8c30ac7d8078 100644
>> --- a/drivers/nvme/target/rdma.c
>> +++ b/drivers/nvme/target/rdma.c
>> @@ -891,7 +891,7 @@ nvmet_rdma_find_get_device(struct rdma_cm_id *cm_id)
>>  
>>  	inline_page_count = num_pages(port->inline_data_size);
>>  	inline_sge_count = max(cm_id->device->attrs.max_sge_rd,
>> -				cm_id->device->attrs.max_sge) - 1;
>> +				cm_id->device->attrs.max_send_sge) - 1;
> 
> This should be max_recv_sge.

Why do we even have this conflicts to begin with?


-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Christoph Hellwig <hch@lst.de>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 26 Jul 2018 19:56:43 +0200
Message-ID: <20180726175643.GA10765@lst.de>
References: <20180726145624.13a604ed@canb.auug.org.au> <20180726084833.GA23310@lst.de> <a65a6023-a527-b9c6-0d78-a175d47f55cf@kernel.dk>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-kernel-owner@vger.kernel.org>
Content-Disposition: inline
In-Reply-To: <a65a6023-a527-b9c6-0d78-a175d47f55cf@kernel.dk>
Sender: linux-kernel-owner@vger.kernel.org
To: Jens Axboe <axboe@kernel.dk>
Cc: Christoph Hellwig <hch@lst.de>, Stephen Rothwell <sfr@canb.auug.org.au>, Doug Ledford <dledford@redhat.com>, Jason Gunthorpe <jgg@mellanox.com>, Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Steve Wise <swise@opengridcomputing.com>
List-Id: linux-next.vger.kernel.org

On Thu, Jul 26, 2018 at 10:48:21AM -0700, Jens Axboe wrote:
> >>  	inline_page_count = num_pages(port->inline_data_size);
> >>  	inline_sge_count = max(cm_id->device->attrs.max_sge_rd,
> >> -				cm_id->device->attrs.max_sge) - 1;
> >> +				cm_id->device->attrs.max_send_sge) - 1;
> > 
> > This should be max_recv_sge.
> 
> Why do we even have this conflicts to begin with?

Because the nvme code added a new user of max_sges while the RDMA tree
split it into two separate fields.  We discussed this a while ago when
the issue came up.

From mboxrd@z Thu Jan  1 00:00:00 1970
From: "Steve Wise" <swise@opengridcomputing.com>
Subject: RE: linux-next: build failure after merge of the block tree
Date: Thu, 26 Jul 2018 12:59:35 -0500
Message-ID: <00b801d4250a$69e2a9f0$3da7fdd0$@opengridcomputing.com>
References: <20180726145624.13a604ed@canb.auug.org.au> <20180726084833.GA23310@lst.de> <a65a6023-a527-b9c6-0d78-a175d47f55cf@kernel.dk> <20180726175643.GA10765@lst.de>
Mime-Version: 1.0
Content-Type: text/plain;
        charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <20180726175643.GA10765@lst.de>
Content-Language: en-us
Sender: linux-kernel-owner@vger.kernel.org
To: 'Christoph Hellwig' <hch@lst.de>, 'Jens Axboe' <axboe@kernel.dk>
Cc: 'Stephen Rothwell' <sfr@canb.auug.org.au>, 'Doug Ledford' <dledford@redhat.com>, 'Jason Gunthorpe' <jgg@mellanox.com>, 'Linux-Next Mailing List' <linux-next@vger.kernel.org>, 'Linux Kernel Mailing List' <linux-kernel@vger.kernel.org>
List-Id: linux-next.vger.kernel.org



> -----Original Message-----
> From: Christoph Hellwig <hch@lst.de>
> Sent: Thursday, July 26, 2018 12:57 PM
> To: Jens Axboe <axboe@kernel.dk>
> Cc: Christoph Hellwig <hch@lst.de>; Stephen Rothwell
> <sfr@canb.auug.org.au>; Doug Ledford <dledford@redhat.com>; Jason
> Gunthorpe <jgg@mellanox.com>; Linux-Next Mailing List <linux-
> next@vger.kernel.org>; Linux Kernel Mailing List <linux-
> kernel@vger.kernel.org>; Steve Wise <swise@opengridcomputing.com>
> Subject: Re: linux-next: build failure after merge of the block tree
> 
> On Thu, Jul 26, 2018 at 10:48:21AM -0700, Jens Axboe wrote:
> > >>  	inline_page_count = num_pages(port->inline_data_size);
> > >>  	inline_sge_count = max(cm_id->device->attrs.max_sge_rd,
> > >> -				cm_id->device->attrs.max_sge) - 1;
> > >> +				cm_id->device->attrs.max_send_sge) -
1;
> > >
> > > This should be max_recv_sge.
> >
> > Why do we even have this conflicts to begin with?
> 
> Because the nvme code added a new user of max_sges while the RDMA tree
> split it into two separate fields.  We discussed this a while ago when
> the issue came up.

See: https://www.spinics.net/lists/linux-rdma/msg66208.html 

Steve.

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bart Van Assche <bart.vanassche@wdc.com>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 26 Jul 2018 13:54:45 -0700
Message-ID: <bddc1cad-5646-edf5-2253-9490717ae8e5@wdc.com>
References: <20180726145624.13a604ed@canb.auug.org.au>
 <20180726084833.GA23310@lst.de>
 <a65a6023-a527-b9c6-0d78-a175d47f55cf@kernel.dk>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <a65a6023-a527-b9c6-0d78-a175d47f55cf@kernel.dk>
Content-Language: en-US
Sender: linux-kernel-owner@vger.kernel.org
To: Jens Axboe <axboe@kernel.dk>, Christoph Hellwig <hch@lst.de>, Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Doug Ledford <dledford@redhat.com>, Jason Gunthorpe <jgg@mellanox.com>, Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Steve Wise <swise@opengridcomputing.com>
List-Id: linux-next.vger.kernel.org

On 07/26/18 10:48, Jens Axboe wrote:
> On 7/26/18 1:48 AM, Christoph Hellwig wrote:
>> On Thu, Jul 26, 2018 at 02:56:24PM +1000, Stephen Rothwell wrote:
>>> diff --git a/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c
>>> index 86121a7a19b2..8c30ac7d8078 100644
>>> --- a/drivers/nvme/target/rdma.c
>>> +++ b/drivers/nvme/target/rdma.c
>>> @@ -891,7 +891,7 @@ nvmet_rdma_find_get_device(struct rdma_cm_id *cm_id)
>>>   
>>>   	inline_page_count = num_pages(port->inline_data_size);
>>>   	inline_sge_count = max(cm_id->device->attrs.max_sge_rd,
>>> -				cm_id->device->attrs.max_sge) - 1;
>>> +				cm_id->device->attrs.max_send_sge) - 1;
>>
>> This should be max_recv_sge.
> 
> Why do we even have this conflicts to begin with?

Hello Jens,

A detailed description of why that change is necessary is available at
https://www.spinics.net/lists/linux-rdma/msg65954.html. As far as I know
the entire RDMA community supports that change.

Bart.

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Thu, 26 Jul 2018 14:13:55 -0700
Message-ID: <3e162f1d-f252-0f76-8929-fa9a0f566cb2@kernel.dk>
References: <20180726145624.13a604ed@canb.auug.org.au>
 <20180726084833.GA23310@lst.de>
 <a65a6023-a527-b9c6-0d78-a175d47f55cf@kernel.dk>
 <bddc1cad-5646-edf5-2253-9490717ae8e5@wdc.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <bddc1cad-5646-edf5-2253-9490717ae8e5@wdc.com>
Content-Language: en-US
Sender: linux-kernel-owner@vger.kernel.org
To: Bart Van Assche <bart.vanassche@wdc.com>, Christoph Hellwig <hch@lst.de>, Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Doug Ledford <dledford@redhat.com>, Jason Gunthorpe <jgg@mellanox.com>, Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Steve Wise <swise@opengridcomputing.com>
List-Id: linux-next.vger.kernel.org

On 7/26/18 1:54 PM, Bart Van Assche wrote:
> On 07/26/18 10:48, Jens Axboe wrote:
>> On 7/26/18 1:48 AM, Christoph Hellwig wrote:
>>> On Thu, Jul 26, 2018 at 02:56:24PM +1000, Stephen Rothwell wrote:
>>>> diff --git a/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c
>>>> index 86121a7a19b2..8c30ac7d8078 100644
>>>> --- a/drivers/nvme/target/rdma.c
>>>> +++ b/drivers/nvme/target/rdma.c
>>>> @@ -891,7 +891,7 @@ nvmet_rdma_find_get_device(struct rdma_cm_id *cm_id)
>>>>   
>>>>   	inline_page_count = num_pages(port->inline_data_size);
>>>>   	inline_sge_count = max(cm_id->device->attrs.max_sge_rd,
>>>> -				cm_id->device->attrs.max_sge) - 1;
>>>> +				cm_id->device->attrs.max_send_sge) - 1;
>>>
>>> This should be max_recv_sge.
>>
>> Why do we even have this conflicts to begin with?
> 
> Hello Jens,
> 
> A detailed description of why that change is necessary is available at
> https://www.spinics.net/lists/linux-rdma/msg65954.html. As far as I know
> the entire RDMA community supports that change.

Thanks - I'm not against the change, I just always get a little
suspicious when we have merge conflicts across subsystems. But this
one seems warranted.

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Fri, 27 Jul 2018 08:16:31 +1000
Message-ID: <20180727081631.6ff269f3@canb.auug.org.au>
References: <20180726145624.13a604ed@canb.auug.org.au>
        <011b01d424dc$b0a69820$11f3c860$@opengridcomputing.com>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/wt27Km8KLsVssy_rgxtCJoy"; protocol="application/pgp-signature"
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <011b01d424dc$b0a69820$11f3c860$@opengridcomputing.com>
Sender: linux-kernel-owner@vger.kernel.org
To: Steve Wise <swise@opengridcomputing.com>
Cc: 'Jens Axboe' <axboe@kernel.dk>, 'Doug Ledford' <dledford@redhat.com>, 'Jason Gunthorpe' <jgg@mellanox.com>, 'Linux-Next Mailing List' <linux-next@vger.kernel.org>, 'Linux Kernel Mailing List' <linux-kernel@vger.kernel.org>, 'Christoph Hellwig' <hch@lst.de>
List-Id: linux-next.vger.kernel.org

--Sig_/wt27Km8KLsVssy_rgxtCJoy
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Steve,

On Thu, 26 Jul 2018 07:32:16 -0500 "Steve Wise" <swise@opengridcomputing.co=
m> wrote:
>
> > diff --git a/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c
> > index 86121a7a19b2..8c30ac7d8078 100644
> > --- a/drivers/nvme/target/rdma.c
> > +++ b/drivers/nvme/target/rdma.c
> > @@ -891,7 +891,7 @@ nvmet_rdma_find_get_device(struct rdma_cm_id
> > *cm_id)
> >=20
> >  	inline_page_count =3D num_pages(port->inline_data_size);
> >  	inline_sge_count =3D max(cm_id->device->attrs.max_sge_rd,
> > -				cm_id->device->attrs.max_sge) - 1;
> > +				cm_id->device->attrs.max_send_sge) - 1; =20
>=20
> This should actually be max_recv_sge.

Yeah, Christoph pointed that out as well.  I will correct it today.

Thanks
--=20
Cheers,
Stephen Rothwell

--Sig_/wt27Km8KLsVssy_rgxtCJoy
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAltaSD8ACgkQAVBC80lX
0Gzr7AgAg+5MfrWwP3KVTHw++7ts7KFnKaOxr6zNy+MsZbGDYFddVg6me5ACm2yX
87Q2uFRg78bk+eE7smqsWbn+iMJ+G6VhDXqJ+H/ZaW4R5A9LPtAO5mSi47oKB6rs
SvIk7Mh4yhbgbsDdxbUrmwAM72hLQJtAxspnrvAdelo49//RVHGJgA5cv+t8nWzo
c4YLntNOyZxrw1/uispe29f0xq2YablEYBUIiqYTl9hfNEdDQ8Vr3h0x7XjhraMN
FPlZNT0uVEfMF9F4lm3xer0igSsybx5I2tYl7dBV8D+vjRvTh2xgfM2QywOOeZoO
Q3aaqXaA576itEUJRrsdUuJIJ7/w5w==
=XlMQ
-----END PGP SIGNATURE-----

--Sig_/wt27Km8KLsVssy_rgxtCJoy--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Tue, 31 Jul 2018 13:07:00 +1000
Message-ID: <20180731130700.3ff50dce@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/.jhLpF1cCZWW_8sMHa+0.c+"; protocol="application/pgp-signature"
Return-path: <linux-kernel-owner@vger.kernel.org>
Sender: linux-kernel-owner@vger.kernel.org
To: Jens Axboe <axboe@kernel.dk>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Max Gurtovoy <maxg@mellanox.com>
List-Id: linux-next.vger.kernel.org

--Sig_/.jhLpF1cCZWW_8sMHa+0.c+
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Jens,

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

drivers/scsi/sd.o: In function `sd_done':
sd.c:(.text+0x1050): undefined reference to `t10_pi_complete'

Presuably caused by commit

  10c41ddd6132 ("block: move dif_prepare/dif_complete functions to block la=
yer")

# CONFIG_BLK_DEV_INTEGRITY is not set
CONFIG_BLK_DEV_SD=3Dy

I have used the block tree from next-20180730 for today.

--=20
Cheers,
Stephen Rothwell

--Sig_/.jhLpF1cCZWW_8sMHa+0.c+
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAltf0lQACgkQAVBC80lX
0Gwzpwf/X1pEYcETqY2fL0QFgQAhpmOPUON7wZpj6z13jGvyYZxnBNtcRbO27xzC
VQDdXosoalPiBbV9eEaAVZ+AH939rXbdiNExxswEaGki6Www3oPhu2JfaulgMZv9
Lw1Y1/RplTLqKLWo9RkyNwc1CoSL0ajP8+uRLwdVxpvNxa38wpWsb5Ejxo+omZfc
riXmy82x9mSyS7D4FadRugMJTQiUixNgvy490PGvuZuDvzs88LYsF4D0vo2KXtin
ZKBErWxcj9ewsUO5L/gXv8HCgBaEkpyJWLXwfXKAV8oUd9HypjEXQNEUKOWX8YT2
JVDWxh4F/RU0FpZV8VMHRvkTZmLRlg==
=7edz
-----END PGP SIGNATURE-----

--Sig_/.jhLpF1cCZWW_8sMHa+0.c+--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Tue, 31 Jul 2018 08:59:57 -0600
Message-ID: <847d1024-7e9d-65e2-356e-6fc3ffbece1e@kernel.dk>
References: <20180731130700.3ff50dce@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <20180731130700.3ff50dce@canb.auug.org.au>
Content-Language: en-US
Sender: linux-kernel-owner@vger.kernel.org
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Max Gurtovoy <maxg@mellanox.com>
List-Id: linux-next.vger.kernel.org

On 7/30/18 9:07 PM, Stephen Rothwell wrote:
> Hi Jens,
> 
> After merging the block tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> drivers/scsi/sd.o: In function `sd_done':
> sd.c:(.text+0x1050): undefined reference to `t10_pi_complete'
> 
> Presuably caused by commit
> 
>   10c41ddd6132 ("block: move dif_prepare/dif_complete functions to block layer")
> 
> # CONFIG_BLK_DEV_INTEGRITY is not set
> CONFIG_BLK_DEV_SD=y
> 
> I have used the block tree from next-20180730 for today.

Thanks, I fixed it up just now, next one should be fine again.

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Wed, 15 Aug 2018 11:43:03 +1000
Message-ID: <20180815114303.685b1789@canb.auug.org.au>
References: <20180726145624.13a604ed@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/vIDoGTdWW5ed7pS+zOHyQVZ"; protocol="application/pgp-signature"
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <20180726145624.13a604ed@canb.auug.org.au>
Sender: linux-kernel-owner@vger.kernel.org
To: Doug Ledford <dledford@redhat.com>, Jason Gunthorpe <jgg@mellanox.com>
Cc: Jens Axboe <axboe@kernel.dk>, Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Steve Wise <swise@opengridcomputing.com>, Christoph Hellwig <hch@lst.de>
List-Id: linux-next.vger.kernel.org

--Sig_/vIDoGTdWW5ed7pS+zOHyQVZ
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Thu, 26 Jul 2018 14:56:24 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>=20
> drivers/nvme/target/rdma.c: In function 'nvmet_rdma_find_get_device':
> drivers/nvme/target/rdma.c:894:26: error: 'struct ib_device_attr' has no =
member named 'max_sge'; did you mean 'max_cqe'?
>      cm_id->device->attrs.max_sge) - 1;
>                           ^
> drivers/nvme/target/rdma.c:893:21: note: in expansion of macro 'max'
>   inline_sge_count =3D max(cm_id->device->attrs.max_sge_rd,
>                      ^~~
> In file included from include/linux/list.h:9:0,
>                  from include/linux/module.h:9,
>                  from drivers/nvme/host/rdma.c:15:
> drivers/nvme/host/rdma.c: In function 'nvme_rdma_find_get_device':
> drivers/nvme/host/rdma.c:381:23: error: 'struct ib_device_attr' has no me=
mber named 'max_sge'; did you mean 'max_cqe'?
>       ndev->dev->attrs.max_sge - 1);
>                        ^
> drivers/nvme/host/rdma.c:380:30: note: in expansion of macro 'min'
>   ndev->num_inline_segments =3D min(NVME_RDMA_MAX_INLINE_SEGMENTS,
>                               ^~~
>=20
> Caused by commits
>=20
>   64a741c1eaa8 ("nvme-rdma: support up to 4 segments of inline data")
>   0d5ee2b2ab4f ("nvmet-rdma: support max(16KB, PAGE_SIZE) inline data")
>=20
> interacting with commit
>=20
>   33023fb85a42 ("IB/core: add max_send_sge and max_recv_sge attributes")
>=20
> from the rdma tree.
>=20
> I have applied the following merge fix patch for today:
>=20
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 26 Jul 2018 14:32:15 +1000
> Subject: [PATCH] nvme-dma: merge fix up for replacement of max_sge
>=20
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/nvme/host/rdma.c   | 2 +-
>  drivers/nvme/target/rdma.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>=20
> diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
> index cfa0319fcd1c..368fe5ac0c6b 100644
> --- a/drivers/nvme/host/rdma.c
> +++ b/drivers/nvme/host/rdma.c
> @@ -378,7 +378,7 @@ nvme_rdma_find_get_device(struct rdma_cm_id *cm_id)
>  	}
> =20
>  	ndev->num_inline_segments =3D min(NVME_RDMA_MAX_INLINE_SEGMENTS,
> -					ndev->dev->attrs.max_sge - 1);
> +					ndev->dev->attrs.max_send_sge - 1);
>  	list_add(&ndev->entry, &device_list);
>  out_unlock:
>  	mutex_unlock(&device_list_mutex);
> diff --git a/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c
> index 86121a7a19b2..8c30ac7d8078 100644
> --- a/drivers/nvme/target/rdma.c
> +++ b/drivers/nvme/target/rdma.c
> @@ -891,7 +891,7 @@ nvmet_rdma_find_get_device(struct rdma_cm_id *cm_id)
> =20
>  	inline_page_count =3D num_pages(port->inline_data_size);
>  	inline_sge_count =3D max(cm_id->device->attrs.max_sge_rd,
> -				cm_id->device->attrs.max_sge) - 1;
> +				cm_id->device->attrs.max_send_sge) - 1;
>  	if (inline_page_count > inline_sge_count) {
>  		pr_warn("inline_data_size %d cannot be supported by device %s. Reducin=
g to %lu.\n",
>  			port->inline_data_size, cm_id->device->name,
> --=20
> 2.18.0

This is now needed (with the max_send_sge -> max_recv_sge update in
drivers/nvme/target/rdma.c patch) when I merge the rdma tree with
Linus' tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/vIDoGTdWW5ed7pS+zOHyQVZ
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAltzhScACgkQAVBC80lX
0GychQf/dqHMr+UL/drg6+TnENanCESJSaskwmcKgvscSabzZG3lQXj3PBb1Lca9
MkbaG8MSrMRDe7tRspzPNnsFIOShDsY3NhPRb3mqlak4f78uskFl0qNWn4rpXUx0
RO9umzHx1+n+sB1hUG94/2dvmr1SiBmw0zXH18ltEkUHsV3N9BK163TOtPweg411
VxxD6+CkcIGWVHesrkk5ZcX/hjVHOmSwZ7OHkpttLkTew7kcAvpqbknc8mJn6+2J
5J/o43fQ6+EmqkSLpw2jMP9nJzrpSKSZBtRpyc+zYdkJf/qWVwwR1Bb2CszUrLfb
OCC9LGI+YsKUVoBNtaqPwmnWIMkZ8w==
=7siD
-----END PGP SIGNATURE-----

--Sig_/vIDoGTdWW5ed7pS+zOHyQVZ--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Wed, 16 Jan 2019 13:35:52 +1100
Message-ID: <20190116133552.37436b9c@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/qYOt_5uLb3ymrivCw=yJuQI"; protocol="application/pgp-signature"
Return-path: <linux-kernel-owner@vger.kernel.org>
Sender: linux-kernel-owner@vger.kernel.org
To: Jens Axboe <axboe@kernel.dk>, Anna Schumaker <Anna.Schumaker@Netapp.com>, Trond Myklebust <trondmy@gmail.com>, NFS Mailing List <linux-nfs@vger.kernel.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Ming Lei <ming.lei@redhat.com>
List-Id: linux-next.vger.kernel.org

--Sig_/qYOt_5uLb3ymrivCw=yJuQI
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

net/sunrpc/xprtsock.c: In function 'xs_flush_bvec':
net/sunrpc/xprtsock.c:390:2: error: implicit declaration of function 'for_e=
ach_bvec'; did you mean 'for_each_net'? [-Werror=3Dimplicit-function-declar=
ation]
  for_each_bvec(bv, bvec, bi, bi)
  ^~~~~~~~~~~~~
  for_each_net
net/sunrpc/xprtsock.c:390:33: error: expected ';' before 'flush_dcache_page'
  for_each_bvec(bv, bvec, bi, bi)
                                 ^
                                 ;
   flush_dcache_page(bv.bv_page);
   ~~~~~~~~~~~~~~~~~             =20

Caused by commit

  f3effe4c1240 ("block: rename bvec helpers")

interacting with commit

  6a829eb8619f ("SUNRPC: Fix TCP receive code on archs with flush_dcache_pa=
ge()")

from the nfs-anna tree.

[I love API changes :-(]

I have applied the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 16 Jan 2019 13:32:59 +1100
Subject: [PATCH] SUNRPC: merge fix for "block: rename bvec helpers"

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

diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 7754aa3e434f..47f29cc23f27 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -387,7 +387,7 @@ xs_flush_bvec(const struct bio_vec *bvec, size_t count,=
 size_t seek)
 	struct bio_vec bv;
=20
 	bvec_iter_advance(bvec, &bi, seek & PAGE_MASK);
-	for_each_bvec(bv, bvec, bi, bi)
+	for_each_segment(bv, bvec, bi, bi)
 		flush_dcache_page(bv.bv_page);
 }
 #else
--=20
2.20.1

--=20
Cheers,
Stephen Rothwell

--Sig_/qYOt_5uLb3ymrivCw=yJuQI
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlw+mIgACgkQAVBC80lX
0Gzuwwf+La/pohlEBDONJUvWmXyLlrYiTe4dk8pUR+R6ScpuMamN+xMQGOuTCHQj
5GNZuNvy2Rvh2H/r4qO3nGJxhWoJoDf8a1bffEK6Kveh6smUm1Ygfgz5DYyym9zN
CaaqG5cZtWDV02w4ipNiRVGBJqcUSuptKAXIxCZuxY7LYUCVFYv43vBLOKSB4BP9
/LkF53i/CF/cKUUHjqTcNEm61N1CO5lVPbCQHKg36Nrk+D09rYRuAdsS2KQHWSkZ
0UgqJBV5thYlLe43UaMcLAzbi6oUc3/GnP3phG+ocGvL4FIFbuA1GCZqX+7aLQQz
rHZCfdywXSNbL1creWVMxbsEgWudMQ==
=9hhs
-----END PGP SIGNATURE-----

--Sig_/qYOt_5uLb3ymrivCw=yJuQI--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Wed, 16 Jan 2019 13:48:24 +1100
Message-ID: <20190116134824.74c2d7da@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/2Jb9UHR.9gaR=CVdBX_Jlm4"; protocol="application/pgp-signature"
Return-path: <linux-kernel-owner@vger.kernel.org>
Sender: linux-kernel-owner@vger.kernel.org
To: Jens Axboe <axboe@kernel.dk>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Ming Lei <ming.lei@redhat.com>, Christoph Hellwig <hch@lst.de>, Omar Sandoval <osandov@fb.com>
List-Id: linux-next.vger.kernel.org

--Sig_/2Jb9UHR.9gaR=CVdBX_Jlm4
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/gfs2/lops.c: In function 'gfs2_end_log_read':
fs/gfs2/lops.c:394:39: error: macro "bio_for_each_segment_all" requires 4 a=
rguments, but only 3 given
  bio_for_each_segment_all(bvec, bio, i) {
                                       ^
fs/gfs2/lops.c:394:2: error: 'bio_for_each_segment_all' undeclared (first u=
se in this function); did you mean 'bio_first_page_all'?
  bio_for_each_segment_all(bvec, bio, i) {
  ^~~~~~~~~~~~~~~~~~~~~~~~
  bio_first_page_all
fs/gfs2/lops.c:394:2: note: each undeclared identifier is reported only onc=
e for each function it appears in
fs/gfs2/lops.c:394:26: error: expected ';' before '{' token
  bio_for_each_segment_all(bvec, bio, i) {
                          ^              ~
                          ;

Caused by commit

  eb754eb2a953 ("block: allow bio_for_each_segment_all() to iterate over mu=
lti-page bvec")

One instance of bio_for_each_segment_all() was missed.

I have applied the following fix patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 16 Jan 2019 13:44:02 +1100
Subject: [PATCH] block: fix up for bio_for_each_segment_all() API change

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

diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
index ef68bf6232e7..15deefeaafd0 100644
--- a/fs/gfs2/lops.c
+++ b/fs/gfs2/lops.c
@@ -390,8 +390,9 @@ static void gfs2_end_log_read(struct bio *bio)
 	struct page *page;
 	struct bio_vec *bvec;
 	int i;
+	struct bvec_iter_all iter_all;
=20
-	bio_for_each_segment_all(bvec, bio, i) {
+	bio_for_each_segment_all(bvec, bio, i, iter_all) {
 		page =3D bvec->bv_page;
 		if (bio->bi_status) {
 			int err =3D blk_status_to_errno(bio->bi_status);
--=20
2.20.1

--=20
Cheers,
Stephen Rothwell

--Sig_/2Jb9UHR.9gaR=CVdBX_Jlm4
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlw+m3gACgkQAVBC80lX
0GwoHQf+P6tzwemxAKhgg71igIacjJmsdrVXibDJl934znQDD/Pp5u+7pOYTgREk
4JEJXNX4/1E26k9dNBGE3CV0wUF2sLAsyvQ2PQ8BGO4deIUBUuieBAwtzOMISfsh
cn+MZPvmwBVCehVoWNyooNHsZ2OHMOzjyjx1UMs1FNtYTXKzbRuoH7JzeN9JCpjz
AsRoYsmBFjNxYTOFQFKgQs/rCcNOPNR8nNgNNIrDQbT82Mx2qHcJkX1+WZhgrzri
QAnCpnr2N9fwfSQmq7RORKkgLUTF35l4bdnF/ARhY8Z6CtONhaN6W7daGsejGzXu
JDgdvLChYR4btxvpVfm+6to4W+2Cbg==
=8hO2
-----END PGP SIGNATURE-----

--Sig_/2Jb9UHR.9gaR=CVdBX_Jlm4--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ming Lei <ming.lei@redhat.com>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Wed, 16 Jan 2019 10:48:33 +0800
Message-ID: <20190116024832.GA26146@ming.t460p>
References: <20190116133552.37436b9c@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-kernel-owner@vger.kernel.org>
Content-Disposition: inline
In-Reply-To: <20190116133552.37436b9c@canb.auug.org.au>
Sender: linux-kernel-owner@vger.kernel.org
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jens Axboe <axboe@kernel.dk>, Anna Schumaker <Anna.Schumaker@Netapp.com>, Trond Myklebust <trondmy@gmail.com>, NFS Mailing List <linux-nfs@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
List-Id: linux-next.vger.kernel.org

On Wed, Jan 16, 2019 at 01:35:52PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the block tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> net/sunrpc/xprtsock.c: In function 'xs_flush_bvec':
> net/sunrpc/xprtsock.c:390:2: error: implicit declaration of function 'for_each_bvec'; did you mean 'for_each_net'? [-Werror=implicit-function-declaration]
>   for_each_bvec(bv, bvec, bi, bi)
>   ^~~~~~~~~~~~~
>   for_each_net
> net/sunrpc/xprtsock.c:390:33: error: expected ';' before 'flush_dcache_page'
>   for_each_bvec(bv, bvec, bi, bi)
>                                  ^
>                                  ;
>    flush_dcache_page(bv.bv_page);
>    ~~~~~~~~~~~~~~~~~              
> 
> Caused by commit
> 
>   f3effe4c1240 ("block: rename bvec helpers")
> 
> interacting with commit
> 
>   6a829eb8619f ("SUNRPC: Fix TCP receive code on archs with flush_dcache_page()")
> 
> from the nfs-anna tree.
> 
> [I love API changes :-(]
> 
> I have applied the following merge fix patch:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 16 Jan 2019 13:32:59 +1100
> Subject: [PATCH] SUNRPC: merge fix for "block: rename bvec helpers"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  net/sunrpc/xprtsock.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
> index 7754aa3e434f..47f29cc23f27 100644
> --- a/net/sunrpc/xprtsock.c
> +++ b/net/sunrpc/xprtsock.c
> @@ -387,7 +387,7 @@ xs_flush_bvec(const struct bio_vec *bvec, size_t count, size_t seek)
>  	struct bio_vec bv;
>  
>  	bvec_iter_advance(bvec, &bi, seek & PAGE_MASK);
> -	for_each_bvec(bv, bvec, bi, bi)
> +	for_each_segment(bv, bvec, bi, bi)
>  		flush_dcache_page(bv.bv_page);
>  }
>  #else

This fix is correct, thanks!

Thanks,
Ming

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ming Lei <ming.lei@redhat.com>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Wed, 16 Jan 2019 10:50:50 +0800
Message-ID: <20190116025048.GB26146@ming.t460p>
References: <20190116134824.74c2d7da@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-kernel-owner@vger.kernel.org>
Content-Disposition: inline
In-Reply-To: <20190116134824.74c2d7da@canb.auug.org.au>
Sender: linux-kernel-owner@vger.kernel.org
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jens Axboe <axboe@kernel.dk>, Linux Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Christoph Hellwig <hch@lst.de>, Omar Sandoval <osandov@fb.com>
List-Id: linux-next.vger.kernel.org

On Wed, Jan 16, 2019 at 01:48:24PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> fs/gfs2/lops.c: In function 'gfs2_end_log_read':
> fs/gfs2/lops.c:394:39: error: macro "bio_for_each_segment_all" requires 4 arguments, but only 3 given
>   bio_for_each_segment_all(bvec, bio, i) {
>                                        ^
> fs/gfs2/lops.c:394:2: error: 'bio_for_each_segment_all' undeclared (first use in this function); did you mean 'bio_first_page_all'?
>   bio_for_each_segment_all(bvec, bio, i) {
>   ^~~~~~~~~~~~~~~~~~~~~~~~
>   bio_first_page_all
> fs/gfs2/lops.c:394:2: note: each undeclared identifier is reported only once for each function it appears in
> fs/gfs2/lops.c:394:26: error: expected ';' before '{' token
>   bio_for_each_segment_all(bvec, bio, i) {
>                           ^              ~
>                           ;
> 
> Caused by commit
> 
>   eb754eb2a953 ("block: allow bio_for_each_segment_all() to iterate over multi-page bvec")
> 
> One instance of bio_for_each_segment_all() was missed.
> 
> I have applied the following fix patch for today.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 16 Jan 2019 13:44:02 +1100
> Subject: [PATCH] block: fix up for bio_for_each_segment_all() API change
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  fs/gfs2/lops.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
> index ef68bf6232e7..15deefeaafd0 100644
> --- a/fs/gfs2/lops.c
> +++ b/fs/gfs2/lops.c
> @@ -390,8 +390,9 @@ static void gfs2_end_log_read(struct bio *bio)
>  	struct page *page;
>  	struct bio_vec *bvec;
>  	int i;
> +	struct bvec_iter_all iter_all;
>  
> -	bio_for_each_segment_all(bvec, bio, i) {
> +	bio_for_each_segment_all(bvec, bio, i, iter_all) {
>  		page = bvec->bv_page;
>  		if (bio->bi_status) {
>  			int err = blk_status_to_errno(bio->bi_status);

Yeah, we need the fix, and I just posted it minutes ago, sorry for
the trouble, :-(

https://marc.info/?l=linux-block&m=154760499205773&w=2

Thanks,
Ming

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Wed, 16 Jan 2019 13:55:54 +1100
Message-ID: <20190116135554.34af6248@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/5l9rOBvNehAdBfDnosL6lYb"; protocol="application/pgp-signature"
Return-path: <linux-kernel-owner@vger.kernel.org>
Sender: linux-kernel-owner@vger.kernel.org
To: Jens Axboe <axboe@kernel.dk>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Ming Lei <ming.lei@redhat.com>, Christoph Hellwig <hch@lst.de>, Omar Sandoval <osandov@fb.com>, Eric Biggers <ebiggers@google.com>
List-Id: linux-next.vger.kernel.org

--Sig_/5l9rOBvNehAdBfDnosL6lYb
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/verity/verify.c: In function 'fsverity_verify_bio':
fs/verity/verify.c:272:38: error: macro "bio_for_each_segment_all" requires=
 4 arguments, but only 3 given
   bio_for_each_segment_all(bv, bio, i)
                                      ^
fs/verity/verify.c:272:3: error: unknown type name 'bio_for_each_segment_al=
l'
   bio_for_each_segment_all(bv, bio, i)
   ^~~~~~~~~~~~~~~~~~~~~~~~
fs/verity/verify.c:273:19: error: expected ')' before '->' token
    SetPageError(bv->bv_page);
                   ^~
                   )
fs/verity/verify.c:277:37: error: macro "bio_for_each_segment_all" requires=
 4 arguments, but only 3 given
  bio_for_each_segment_all(bv, bio, i) {
                                     ^
fs/verity/verify.c:277:2: error: 'bio_for_each_segment_all' undeclared (fir=
st use in this function); did you mean 'bio_first_page_all'?
  bio_for_each_segment_all(bv, bio, i) {
  ^~~~~~~~~~~~~~~~~~~~~~~~
  bio_first_page_all
fs/verity/verify.c:277:2: note: each undeclared identifier is reported only=
 once for each function it appears in
fs/verity/verify.c:277:26: error: expected ';' before '{' token
  bio_for_each_segment_all(bv, bio, i) {
                          ^            ~
                          ;

Caused by commit

  eb754eb2a953 ("block: allow bio_for_each_segment_all() to iterate over mu=
lti-page bvec")

interacting with commit

  281bf3cdf27a ("fs-verity: add data verification hooks for ->readpages()")

I have applied the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 16 Jan 2019 13:53:07 +1100
Subject: [PATCH] fs-verity: fix up for bio_for_each_segment_all() API change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/verity/verify.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/fs/verity/verify.c b/fs/verity/verify.c
index e308f22475e8..dbd388ef32e1 100644
--- a/fs/verity/verify.c
+++ b/fs/verity/verify.c
@@ -266,15 +266,16 @@ void fsverity_verify_bio(struct bio *bio)
 	struct ahash_request *req;
 	struct bio_vec *bv;
 	int i;
+	struct bvec_iter_all iter_all;
=20
 	req =3D ahash_request_alloc(vi->hash_alg->tfm, GFP_KERNEL);
 	if (unlikely(!req)) {
-		bio_for_each_segment_all(bv, bio, i)
+		bio_for_each_segment_all(bv, bio, i, iter_all)
 			SetPageError(bv->bv_page);
 		return;
 	}
=20
-	bio_for_each_segment_all(bv, bio, i) {
+	bio_for_each_segment_all(bv, bio, i, iter_all) {
 		struct page *page =3D bv->bv_page;
=20
 		if (!PageError(page) && !verify_page(inode, vi, req, page))
--=20
2.20.1

--=20
Cheers,
Stephen Rothwell

--Sig_/5l9rOBvNehAdBfDnosL6lYb
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlw+nToACgkQAVBC80lX
0GzeBgf/bcz25oCIjCLN3OoVy3PZIKxFbzN5ocGv09AquEq4bkm79eqB/Hu647z6
grLWVozgu2SAjVLuwvuhIfZCTvYwLRk1mMcJb2jewhvOVqLDmDxtN/58sYRdjEoa
z1kQLDSHyoG9fSBCzUO3V2wLvg3cXqA8mY3/KgWh8/X698IqHfB5Tx3R6sPJG3Cq
EQTER5RC9+bpnbuT5YsnPrk/xGX7gkLo6hsmzaEVaAaA6bO0xyyRbdSg1KfIO+2m
3NOV2vPerYXnug7+5fBujsswzLo7jCiWtcKdGmG1GaSiPXzBgxxZNlUKqBJZwR4x
euA8NwXEUCfpI7elfLihZSVTjnbhIA==
=EzU2
-----END PGP SIGNATURE-----

--Sig_/5l9rOBvNehAdBfDnosL6lYb--

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: build failure after merge of the block tree
Date: Mon, 6 May 2019 15:07:07 +1000
Message-ID: <20190506150707.618f013d@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/gcMpqtS=NShUJ79kEyb321h"; protocol="application/pgp-signature"
Return-path: <linux-kernel-owner@vger.kernel.org>
Sender: linux-kernel-owner@vger.kernel.org
To: Jens Axboe <axboe@kernel.dk>, Steven Whitehouse <swhiteho@redhat.com>, Bob Peterson <rpeterso@redhat.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Christoph Hellwig <hch@lst.de>, Abhi Das <adas@redhat.com>, Andreas Gruenbacher <agruenba@redhat.com>
List-Id: linux-next.vger.kernel.org

--Sig_/gcMpqtS=NShUJ79kEyb321h
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Jens,

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

fs/gfs2/lops.c: In function 'gfs2_end_log_read':
fs/gfs2/lops.c:394:49: error: macro "bio_for_each_segment_all" passed 4 arg=
uments, but takes just 3
  bio_for_each_segment_all(bvec, bio, i, iter_all) {
                                                 ^
fs/gfs2/lops.c:394:2: error: 'bio_for_each_segment_all' undeclared (first u=
se in this function); did you mean 'bio_first_page_all'?
  bio_for_each_segment_all(bvec, bio, i, iter_all) {
  ^~~~~~~~~~~~~~~~~~~~~~~~
  bio_first_page_all
fs/gfs2/lops.c:394:2: note: each undeclared identifier is reported only onc=
e for each function it appears in
fs/gfs2/lops.c:394:26: error: expected ';' before '{' token
  bio_for_each_segment_all(bvec, bio, i, iter_all) {
                          ^                        ~
                          ;

Caused by commit

  2b070cfe582b ("block: remove the i argument to bio_for_each_segment_all")

interacting with commit

  e21e191994af ("gfs2: read journal in large chunks")

from the gfs2 tree.

I have applied the following patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 6 May 2019 14:57:42 +1000
Subject: [PATCH] gfs2: fix for "block: remove the i argument to bio_for_eac=
h_segment_all"

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

diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
index 3b3dd2ef53f7..33ab662c9aac 100644
--- a/fs/gfs2/lops.c
+++ b/fs/gfs2/lops.c
@@ -388,10 +388,9 @@ static void gfs2_end_log_read(struct bio *bio)
 {
 	struct page *page;
 	struct bio_vec *bvec;
-	int i;
 	struct bvec_iter_all iter_all;
=20
-	bio_for_each_segment_all(bvec, bio, i, iter_all) {
+	bio_for_each_segment_all(bvec, bio, iter_all) {
 		page =3D bvec->bv_page;
 		if (bio->bi_status) {
 			int err =3D blk_status_to_errno(bio->bi_status);
--=20
2.20.1

--=20
Cheers,
Stephen Rothwell

--Sig_/gcMpqtS=NShUJ79kEyb321h
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlzPwPsACgkQAVBC80lX
0GwaqQf+Kb93aXAqHVmB3fNXzovRjENYa+yP4ysCuDIp+VjqvWM9OQicrMA4Ma44
DECEBder32fMiEMuj1m2SMt7+jYAxZbKvd7lg4EU+v2XLWPnFFrPLG4Vay7x3YM6
iqbzUi+AcDIIpuPKBta/o41KDWQLkI8MVMVAVbTNka0PKnMT9c20KeK77gi+rZMc
fg+imuEQgvztuYLS1+BpZAVxTpD4IQ+eJdTEIob9M9ZWMTibGWZ391C1YCSoOi4H
QmJXxx1XSnPOp7ivw0jESunwjBr/kwPglbqTxfiVg9E56zVI3Kw7HoWSQLlcxgvQ
jfTYQLR0MBJS6j1osKybBDFV7mefpA==
=CEyL
-----END PGP SIGNATURE-----

--Sig_/gcMpqtS=NShUJ79kEyb321h--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=K3uQ=UU=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,
	SPF_PASS autolearn=ham autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 924C5C43613
	for <linux-next@archiver.kernel.org>; Fri, 21 Jun 2019 03:56:22 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.kernel.org (Postfix) with ESMTP id EEF5320675
	for <linux-next@archiver.kernel.org>; Fri, 21 Jun 2019 03:56:21 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="AAwQsW5D"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1725948AbfFUD4V (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Thu, 20 Jun 2019 23:56:21 -0400
Received: from bilbo.ozlabs.org ([203.11.71.1]:33271 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1725906AbfFUD4V (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Thu, 20 Jun 2019 23:56:21 -0400
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 45VPxZ0GD0z9s4V;
        Fri, 21 Jun 2019 13:56:16 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;
        s=201702; t=1561089378;
        bh=T49oJThNAqg4VC+1Nc2pJIUqqDnxAZAKozmYg6nR75c=;
        h=Date:From:To:Cc:Subject:From;
        b=AAwQsW5DdEAAOtKp0Wah9pnHy27ZH0W7uNkAhS+1p6uRNLztFkDXnLWwmpqyeePjO
         Vju0+acdkhUEaxqV9difvs2Po7OG53M4wwajFOPJOnHYrBxL3OCzGWr3rjuLr0mq0i
         ZdS8/+UBfvWJOqqpy0BN1Hww9x18gZLTJeuo46XZXP1FSjHDstE32U8bJGtnueI7r5
         QddxubpR17sxnH1EbzwNRJyPR6jz4ZDT6suU66hO4XEEh1AJ/Lwn4h3xZj0sd7Su4X
         l95v0ewR6OsgfgoopYoxQYED9aHYwxAtqpstuHIcNOMo9YxlfDx88mOcxy9ujdG7gx
         ABWsucvChshWw==
Date:   Fri, 21 Jun 2019 13:56:16 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Christoph Hellwig <hch@lst.de>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20190621135616.20299058@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_//CvIe62J8Or=KdtE5_1Awk0"; protocol="application/pgp-signature"
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_//CvIe62J8Or=KdtE5_1Awk0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Jens,

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

ERROR: "css_next_descendant_pre" [block/bfq.ko] undefined!

Probably caused by commit

  8060c47ba853 ("block: rename CONFIG_DEBUG_BLK_CGROUP to CONFIG_BFQ_CGROUP=
_DEBUG")

I have used the block tree from next-20190620 for today.

--=20
Cheers,
Stephen Rothwell

--Sig_//CvIe62J8Or=KdtE5_1Awk0
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl0MVWAACgkQAVBC80lX
0GxALAf/ekDm3cV+cRRAqR1ZSokpv8VXJKHzRkqYQ/SFIOCxYWW8euN54tUZZ9VT
xZo0JDvvqL/j5mxGQFzKkBTP8ycnayqzLn9+qeiXbiTHYrJLuv/N9TNhwh+SWEYD
JjLhxbGRKBCPVpwVjBjNUaUhe/Rn0fOybCh3Z0zGKB0rarTMjzWrDDZGk+rUyhp1
eVzqLIs8k4VnzO6nzoPz5N9eB2ynSQGcNZAyApc5u1W2vxArRI+IMgKFWBSmz2Jm
E9RHVMGQuXddMqI9hBwdrWnN+bwhVUFVgyCauhYtFvB8NjZzVe3aAaCOudcWSPG8
ULINEliaRHgaD/E6xXGyUVn7bdu9lg==
=X4Hh
-----END PGP SIGNATURE-----

--Sig_//CvIe62J8Or=KdtE5_1Awk0--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=K3uQ=UU=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_MUTT autolearn=ham
	autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 653F2C43613
	for <linux-next@archiver.kernel.org>; Fri, 21 Jun 2019 08:19:07 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.kernel.org (Postfix) with ESMTP id 3DAED214AF
	for <linux-next@archiver.kernel.org>; Fri, 21 Jun 2019 08:19:07 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1726045AbfFUITG (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Fri, 21 Jun 2019 04:19:06 -0400
Received: from verein.lst.de ([213.95.11.211]:36563 "EHLO newverein.lst.de"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1726030AbfFUITG (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Fri, 21 Jun 2019 04:19:06 -0400
Received: by newverein.lst.de (Postfix, from userid 2407)
        id 92F8868C4E; Fri, 21 Jun 2019 10:18:36 +0200 (CEST)
Date:   Fri, 21 Jun 2019 10:18:36 +0200
From:   Christoph Hellwig <hch@lst.de>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Jens Axboe <axboe@kernel.dk>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Christoph Hellwig <hch@lst.de>
Subject: Re: linux-next: build failure after merge of the block tree
Message-ID: <20190621081836.GB17718@lst.de>
References: <20190621135616.20299058@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20190621135616.20299058@canb.auug.org.au>
User-Agent: Mutt/1.5.17 (2007-11-01)
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On Fri, Jun 21, 2019 at 01:56:16PM +1000, Stephen Rothwell wrote:
> Hi Jens,
> 
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> ERROR: "css_next_descendant_pre" [block/bfq.ko] undefined!

I think the culprit is "bfq-iosched: move bfq_stat_recursive_sum into the only
caller" as that starts using css_next_descendant_pre in bfq.

I'll send a patch to export it.

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=K3uQ=UU=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,
	SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 6F92EC43613
	for <linux-next@archiver.kernel.org>; Fri, 21 Jun 2019 08:36:50 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.kernel.org (Postfix) with ESMTP id EEB78208C3
	for <linux-next@archiver.kernel.org>; Fri, 21 Jun 2019 08:36:49 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="BrskgRFT"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1726057AbfFUIgt (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Fri, 21 Jun 2019 04:36:49 -0400
Received: from ozlabs.org ([203.11.71.1]:47631 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1726055AbfFUIgt (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Fri, 21 Jun 2019 04:36:49 -0400
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 45VX994m0Fz9s3l;
        Fri, 21 Jun 2019 18:36:45 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;
        s=201702; t=1561106206;
        bh=ZlhWhI4DfW1N6bmx8poJ/T6Z6DiwcVEOB8XO8Mu/ruo=;
        h=Date:From:To:Cc:Subject:In-Reply-To:References:From;
        b=BrskgRFT8quZnsC5nJzlwIRCiJ7WDzODd0kKqWUZDdgWqWS5HAmI5gcPuULc3PlbR
         vOFP7y6Th620AGQqR1ncPLvexiGHurH8UTejZ8DMNGjfZHa/mG5qUV8urDAhiGDngl
         GhWCMTAnM0MAR0EaZA/QcT7n5dX9JaSldqsos8gLvvrU4HWEwdHvTYwI3fimEIBiFO
         uOXtkxJhxL6yJH8+Tc/MeGpeet4q8L91FK0/mdHb/jueFCWsl0ETGkCYN08UzmhkVz
         7p9i/v6ktRGtei4FbNwDNcm/2v3EEdQisOdzWNmidFTAAPiyL90HaUNM+LQFs/CxPW
         81foCDv2byyrw==
Date:   Fri, 21 Jun 2019 18:36:43 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Christoph Hellwig <hch@lst.de>
Cc:     Jens Axboe <axboe@kernel.dk>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the block tree
Message-ID: <20190621183643.0e9f3fbd@canb.auug.org.au>
In-Reply-To: <20190621081836.GB17718@lst.de>
References: <20190621135616.20299058@canb.auug.org.au>
        <20190621081836.GB17718@lst.de>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/t_mFD+sROxCPJ=pV27kzbzz"; protocol="application/pgp-signature"
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/t_mFD+sROxCPJ=pV27kzbzz
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Christoph,

On Fri, 21 Jun 2019 10:18:36 +0200 Christoph Hellwig <hch@lst.de> wrote:
>
> On Fri, Jun 21, 2019 at 01:56:16PM +1000, Stephen Rothwell wrote:
> > Hi Jens,
> >=20
> > After merging the block tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >=20
> > ERROR: "css_next_descendant_pre" [block/bfq.ko] undefined! =20
>=20
> I think the culprit is "bfq-iosched: move bfq_stat_recursive_sum into the=
 only
> caller" as that starts using css_next_descendant_pre in bfq.
>=20
> I'll send a patch to export it.

Thanks.

--=20
Cheers,
Stephen Rothwell

--Sig_/t_mFD+sROxCPJ=pV27kzbzz
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl0MlxsACgkQAVBC80lX
0GwWswf/eJZbR3bc56RwbI8GYx87fxwAg6ggyAQMAG2Lazt5yD9bsMT4HVwwpArK
US93+lcBfQfN/5BDEyegFyDc/F0uMBRAeGBWWSzjENesUIMZ4D22wMBMZj/LzQJm
H1jBBVxt+OISoVp8pQJFNPoGW1aZYwpQ4tderJOJ8Tq+dnKaeJYQMoJTnTjlnhpR
GlX5zLyJq7RuQf4LhcX8t5xSsMLgqTt5q6nJz7OMKTcjidYLPmBqPHTHh2M8K01g
5cMC6k3eySpISYC0/LK7Pi+XRkEM3GyVWF0VE+HnwPYPsffm6MyDJ7JgVfk8zVMe
Zy1nSiLrq0jhSvNCtbnDBnph+fS+fA==
=gusO
-----END PGP SIGNATURE-----

--Sig_/t_mFD+sROxCPJ=pV27kzbzz--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=APSk=VI=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,
	SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham
	autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 5BDBEC74A42
	for <linux-next@archiver.kernel.org>; Thu, 11 Jul 2019 05:04:15 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.kernel.org (Postfix) with ESMTP id 1FA3321530
	for <linux-next@archiver.kernel.org>; Thu, 11 Jul 2019 05:04:15 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="rJ2e5TnR"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1725963AbfGKFEO (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Thu, 11 Jul 2019 01:04:14 -0400
Received: from bilbo.ozlabs.org ([203.11.71.1]:45429 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1727874AbfGKFEO (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Thu, 11 Jul 2019 01:04:14 -0400
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 45kkVf4lVGz9sDB;
        Thu, 11 Jul 2019 15:04:10 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;
        s=201702; t=1562821451;
        bh=7Nxg3ylgJpNFggaAHZGA41O1MIYbZXvBamiEMnBnJ8g=;
        h=Date:From:To:Cc:Subject:From;
        b=rJ2e5TnRCgaLWvHL0zKcuVrf2MSW9Yy1udGydqbpTbMaZVPmZZdpOAYjR3yteEQdC
         oXWfWjEwPtSVXnTVLqvWsP9On6xd4sYKuVYJyTM0El8Q8Hr1koe5jaZQjxleXfWGP7
         O6Ipi7zjcJzI3EW0ta3GRGTfBURom0jfQwfLGzRg9bF9gv9f5jH/LA9DtMFEqcTiJy
         hBtbjqS7PdpdWswkrSuaCr3lhPTHSD6BSSDYVXTwzY8dXIhP8ptngbfIsxw+Ma7MCQ
         uYqkntJQ5h2SPPnyxw9Zn+EgDmxCC0cSu909stGGsZ0vSiKaNfNXFKQmHlHQ5HI6QU
         4XWn+EF14sv8g==
Date:   Thu, 11 Jul 2019 15:04:09 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>,
        "Darrick J. Wong" <darrick.wong@oracle.com>,
        David Chinner <david@fromorbit.com>, linux-xfs@vger.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>, Christoph Hellwig <hch@lst.de>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20190711150409.2455206a@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/B5NooziqED55ovJZ4cwZzQ."; protocol="application/pgp-signature"
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/B5NooziqED55ovJZ4cwZzQ.
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

fs/xfs/xfs_aops.c: In function 'xfs_add_to_ioend':
fs/xfs/xfs_aops.c:799:2: error: implicit declaration of function 'wbc_accou=
nt_io'; did you mean 'blk_account_rq'? [-Werror=3Dimplicit-function-declara=
tion]
  wbc_account_io(wbc, page, len);
  ^~~~~~~~~~~~~~
  blk_account_rq

Caused by commit

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

interacting with commit

  adfb5fb46af0 ("xfs: implement cgroup aware writeback")

from the xfs tree.

I have applied the following merge fix patch:

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

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

diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index 761248ee2778..f16d5f196c6b 100644
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -796,7 +796,7 @@ xfs_add_to_ioend(
 	}
=20
 	wpc->ioend->io_size +=3D len;
-	wbc_account_io(wbc, page, len);
+	wbc_account_cgroup_owner(wbc, page, len);
 }
=20
 STATIC void
--=20
2.20.1

--=20
Cheers,
Stephen Rothwell

--Sig_/B5NooziqED55ovJZ4cwZzQ.
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl0mw0kACgkQAVBC80lX
0Gzj6ggAoP4l5jKOrhf+ZYoxXF2wQNPz4FfAT31AaniMR/4ElvqovcKvbGrTSRRs
CY2k3XkFEjxjVLmL/tXSeJsxjn1L9E4DEOVP56vRZ7/9xKHFKio/5o7Qbi2vxcLH
jLGqPV+dwQFXMf4uPp8+z9xUrdJUmiOamoM9jOTMDFw5yjUoaeikqjsWc0QzwBbh
4D4xUv+qKCiTWJZCjCV6UsE0wJ+cP118k9ozuVpRThXw4IxjVzVB7HLEXIpzs0C1
uyigm8Nr3zloqhq/TNT62tCnsbHZA1Z053YxJfJPICX/YVYfjDZFFXoh9nVYj4+z
y+eWN4mmzSx20x3Y55wqmUKhViKNpA==
=HzFB
-----END PGP SIGNATURE-----

--Sig_/B5NooziqED55ovJZ4cwZzQ.--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=APSk=VI=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,
	SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham
	autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id CEDA9C74A42
	for <linux-next@archiver.kernel.org>; Thu, 11 Jul 2019 05:15:11 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.kernel.org (Postfix) with ESMTP id 9AF6620872
	for <linux-next@archiver.kernel.org>; Thu, 11 Jul 2019 05:15:11 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="TmF19Edy"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1726683AbfGKFPL (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Thu, 11 Jul 2019 01:15:11 -0400
Received: from ozlabs.org ([203.11.71.1]:39323 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1726296AbfGKFPK (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Thu, 11 Jul 2019 01:15:10 -0400
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 45kklJ4BVfz9sBt;
        Thu, 11 Jul 2019 15:15:08 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;
        s=201702; t=1562822108;
        bh=A15oo3lnPBgimcgWn2uZygbu1s4lzeQ81MYn/Qa33K4=;
        h=Date:From:To:Cc:Subject:From;
        b=TmF19EdyXP1K7C9nH/XuS3+7l8a+wYFgFHCLK1/OFJzTaS8X5OwRcW6PQH8VWMYPH
         0ShbiCyAOToFRs2xMQv9TgVNBobfTkv1v2h94Z3XnhimtHva4gaWXT8kpTnM8x5GT8
         veSzwLRQi2PXlEJWxyqQ+VlBkDuT2OgkXUF786L86tFnV3TSV4KdGA5sbLf9glAe1m
         tAnKquVK8OiPr1ZSz/1NEouSpuFNK7m7+MgvMyet9pwN9XatvQs4VSkHYz/PO55+uh
         h0xFwAqdUwZqChuK3L01LAWTbtrvB/6rdNYNWGkd3Yu8poKZE8wSUWWd9pmh5qoHHQ
         EF76t3vJDBgxw==
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-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--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--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=APSk=VI=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-8.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,
	SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham
	autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id D6F88C742A2
	for <linux-next@archiver.kernel.org>; Thu, 11 Jul 2019 20:17:43 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.kernel.org (Postfix) with ESMTP id A15F920872
	for <linux-next@archiver.kernel.org>; Thu, 11 Jul 2019 20:17:43 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
	s=default; t=1562876263;
	bh=ecxQia7h6zY6lkWAw+wdMlXxzbuuZS5Qi/XXUMkiRSE=;
	h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From;
	b=ExwcEk+m2nWxlBMNlcg3/lc7WrSXPdZot+cnXD0drKwdRNlbCeO9Sm6CvnfDo7/sM
	 rpXKHYFBTsmwMdXcAtLNM5pYJjsZqeEeTDe3dmjvo4VVyu+4cLaXhY2LI6THWRTSHy
	 HWfHT7glzD3CLIPrFaJQftg56jaO9M/HBb8fVvu8=
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728593AbfGKURn (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Thu, 11 Jul 2019 16:17:43 -0400
Received: from mail-pl1-f196.google.com ([209.85.214.196]:36407 "EHLO
        mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1726207AbfGKURm (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Thu, 11 Jul 2019 16:17:42 -0400
Received: by mail-pl1-f196.google.com with SMTP id k8so3606634plt.3;
        Thu, 11 Jul 2019 13:17:42 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20161025;
        h=sender:date:from:to:cc:subject:message-id:references:mime-version
         :content-disposition:in-reply-to:user-agent;
        bh=N9MaYRqFkwAqF71ONnWTbJHi2D4rYHtA0InGA4H4rtg=;
        b=jRwO0RU1eD9uhuPJB7SM4XRu53do87oN8eoHLUW6PVVlTBOGDG6d2h/dRHNfz1pzLD
         3GMYzI6zSDRQWN+Xoo2ZzIDTqZKzTudzwmH4OHBxRvP2KujXlP3iVMEV02h3x78JMN0I
         VdwG1G++4ju7anDfUgVsizF+90IE+a3p5Fcux5x/M0o1QYIWVHsttw1HScD4Lovd99Z+
         NVDaJKY2G7H3wNa71683ET7L5nemHP4SjzsAS5TjIHgl9QnczSmU6aRGT69id6YrWsi/
         KZ1nWIqiPhksGN7A9+KjmZV6eBYv7BP+PTEAQeojBrCOZyDxzExqsG9g2T+I7DCsLQ7w
         22sQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:sender:date:from:to:cc:subject:message-id
         :references:mime-version:content-disposition:in-reply-to:user-agent;
        bh=N9MaYRqFkwAqF71ONnWTbJHi2D4rYHtA0InGA4H4rtg=;
        b=JNlrFUuu8xVvIKomRso3IaCr+yknEBL2q8Xfaw8pGhQItuT/fwRWjhAvqJE4tpUue5
         MaXPFhqLUi4WDZwiz9+lY6OWu1IZBIMSkJkA+OjdENtigxicqzcmq6MtmAuf6IW67PHP
         yhyb9e6Bzi4qFYwe/Q9z5KujVqiVstzRkQnMiaydgGItOTI5+KVcQhMCwkJtRFbdq/5c
         X79fcfDhZUYI+gHVOV5PDFxP0ZpIrk0ife3uCNQNxhj2rfvfFcTW8N71sUh0CFqzEhgn
         5TLGLgzz7WpOfyrV9DcRm26mSwZP1jdPhYT4QwX5hC+xjGoxbHn8U2wYkAjGt1b53jCr
         HXWw==
X-Gm-Message-State: APjAAAWxYwVXjZNCZniK7sqlJNrNBwn4Hxa/NsWi+qb1Sowgu4dZFoHm
        i7cqNO4z4NfByyVRsVMxMPM=
X-Google-Smtp-Source: APXvYqyN8jV+gtWrH9cp4npV6WpiaPT8McmMqTbhekQ4Aituc/lP2flHFGQoYVZe04X31XueQMx80g==
X-Received: by 2002:a17:902:2aab:: with SMTP id j40mr6422191plb.76.1562876261867;
        Thu, 11 Jul 2019 13:17:41 -0700 (PDT)
Received: from localhost ([2620:10d:c091:500::3:4153])
        by smtp.gmail.com with ESMTPSA id e63sm5911276pgc.62.2019.07.11.13.17.39
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Thu, 11 Jul 2019 13:17:39 -0700 (PDT)
Date:   Thu, 11 Jul 2019 13:17:36 -0700
From:   Tejun Heo <tj@kernel.org>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Jens Axboe <axboe@kernel.dk>, Jaegeuk Kim <jaegeuk@kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Chao Yu <yuchao0@huawei.com>
Subject: Re: linux-next: build failure after merge of the block tree
Message-ID: <20190711201736.GQ657710@devbig004.ftw2.facebook.com>
References: <20190711151507.7ec1fd18@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20190711151507.7ec1fd18@canb.auug.org.au>
User-Agent: Mutt/1.5.21 (2010-09-15)
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

Hello,

Yeah, my patche series raced with 8648de2c581e ("f2fs: add bio cache
for IPU").  Jens, can you please apply this one too?

On Thu, Jul 11, 2019 at 03:15:07PM +1000, Stephen Rothwell wrote:
> 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)
>  	}
>  
>  	if (fio->io_wbc)
> -		wbc_account_io(fio->io_wbc, page, PAGE_SIZE);
> +		wbc_account_cgroup_owner(fio->io_wbc, page, PAGE_SIZE);

  Acked-by: Tejun Heo <tj@kernel.org>

Thanks.

-- 
tejun

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=APSk=VI=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,
	HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,
	USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 4771AC742A2
	for <linux-next@archiver.kernel.org>; Thu, 11 Jul 2019 20:36:59 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.kernel.org (Postfix) with ESMTP id 11C3821537
	for <linux-next@archiver.kernel.org>; Thu, 11 Jul 2019 20:36:59 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel-dk.20150623.gappssmtp.com header.i=@kernel-dk.20150623.gappssmtp.com header.b="f5ixLevq"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728414AbfGKUg6 (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Thu, 11 Jul 2019 16:36:58 -0400
Received: from mail-pg1-f193.google.com ([209.85.215.193]:41444 "EHLO
        mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727956AbfGKUg6 (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Thu, 11 Jul 2019 16:36:58 -0400
Received: by mail-pg1-f193.google.com with SMTP id q4so3481263pgj.8
        for <linux-next@vger.kernel.org>; Thu, 11 Jul 2019 13:36:58 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20150623.gappssmtp.com; s=20150623;
        h=subject:to:cc:references:from:message-id:date:user-agent
         :mime-version:in-reply-to:content-language:content-transfer-encoding;
        bh=U05ONlBbPINFuimdTBUsOatUpH+2O9AcUBX+vMez/GE=;
        b=f5ixLevqIWQvivZ74pOXO929BcoCqmvzjZt0NEzOGVs7/8VfCjVUseMFq28qP41b27
         cOSPs1pq8IYk6wGAz1bRA9/AXypLdgaVcgTIp7BbjCQ+m6OqNUXyptfSqS8hQVvBU/O9
         NwzkTnyiPV5ItHlSsN30DKTmsB1znkoXR0lL7kRLhI+fl/KziS4Wjbk2WC9OA3bPIYtO
         RpwywCQ/EA/W+6Z9xHcZvxrIe5QOCoBPuvDSHWo89ggxEQrm54Hgxc+O89Si9YaZnJ4q
         f3DUt0VLnz4vss2+iw94D7wOidx2m/b3XiYE2TngB/aTZHyGN+TXGlBpw5eEpAvSrqdP
         RNBg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:subject:to:cc:references:from:message-id:date
         :user-agent:mime-version:in-reply-to:content-language
         :content-transfer-encoding;
        bh=U05ONlBbPINFuimdTBUsOatUpH+2O9AcUBX+vMez/GE=;
        b=b8BFWDpe0rTh3eMPiVG682sVvr+HwTAEcW9E4lwrk9gMXt7fbbjQDUlAtjEh/gXZnu
         pepsnFqEzK9e7Br8MSvMz3NUTIYD5wW771zGDKlyarCAGpj4IZzJO9Tb8hESCO+z5A8G
         pFQM5PXbf2XLDmcYhsAifboE2RonlXxzF7Um0GX3W8uhH4BV8nnmgCbhL6zMfwpz71Ph
         E98WzPpPzA+9RrJLK8ucZZIhI6toYM6P8H+jf3Ovve+Wqee46oqtHQGKEZqIN+a5Vq/r
         j1tvOUtgGMGHNsq1Y8RVgdfCVWcWFZOkW9AK2NbXqn2sHKZOlQ5Hz6C9YfarQXQ3SjcO
         1GQw==
X-Gm-Message-State: APjAAAWktUJfDBSJcszizSJk7YAVDd5f4yw0Tiwr3FbloAikZLYDIMgU
        qrdzs527kJJliy36c8ysNpA=
X-Google-Smtp-Source: APXvYqwt6420DCq/8aOZYasWpu+xq8Gcs291fC8EGXWmzL2/e3Wyu/TIHN36Mskj2KVBn2eC9v6zxg==
X-Received: by 2002:a17:90a:d343:: with SMTP id i3mr7310376pjx.15.1562877417701;
        Thu, 11 Jul 2019 13:36:57 -0700 (PDT)
Received: from [192.168.1.121] (66.29.164.166.static.utbb.net. [66.29.164.166])
        by smtp.gmail.com with ESMTPSA id q126sm6651473pfq.123.2019.07.11.13.36.56
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Thu, 11 Jul 2019 13:36:56 -0700 (PDT)
Subject: Re: linux-next: build failure after merge of the block tree
To:     Tejun Heo <tj@kernel.org>, Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Jaegeuk Kim <jaegeuk@kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Chao Yu <yuchao0@huawei.com>
References: <20190711151507.7ec1fd18@canb.auug.org.au>
 <20190711201736.GQ657710@devbig004.ftw2.facebook.com>
From:   Jens Axboe <axboe@kernel.dk>
Message-ID: <8c18d276-d8e9-148e-ba05-604e7a4d9dec@kernel.dk>
Date:   Thu, 11 Jul 2019 14:36:54 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101
 Thunderbird/60.7.2
MIME-Version: 1.0
In-Reply-To: <20190711201736.GQ657710@devbig004.ftw2.facebook.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 7/11/19 2:17 PM, Tejun Heo wrote:
> Hello,
> 
> Yeah, my patche series raced with 8648de2c581e ("f2fs: add bio cache
> for IPU").  Jens, can you please apply this one too?

I can't really, as that commit isn't in Linus's tree yet. I'll
keep an eye out for what hits mainline, I'll probably ship what
I have on Monday.

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=10KW=YV=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,
	SPF_PASS autolearn=no autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id C9463CA9EAF
	for <linux-next@archiver.kernel.org>; Mon, 28 Oct 2019 02:59:49 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.kernel.org (Postfix) with ESMTP id 88BE5208C0
	for <linux-next@archiver.kernel.org>; Mon, 28 Oct 2019 02:59:49 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="RyJvM3Ql"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727658AbfJ1C7t (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Sun, 27 Oct 2019 22:59:49 -0400
Received: from bilbo.ozlabs.org ([203.11.71.1]:57343 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1727395AbfJ1C7t (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Sun, 27 Oct 2019 22:59:49 -0400
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 471fZp0xqSz9sPc;
        Mon, 28 Oct 2019 13:59:45 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;
        s=201702; t=1572231586;
        bh=A99ViC7xdtIhVkC13zYqRE2VkM66MXhtZs7WENWuq6M=;
        h=Date:From:To:Cc:Subject:From;
        b=RyJvM3Ql7sOS1kVJskXSEHLpAxu2pooYLlRv7GkREEWWHvslnt0mjtzZxhWnOXkLc
         MBLBopoPB1aQTvRJI5YunFbFu0Ix7fKvm9/Q3JpuoM3YU0vRQP87s/yNZg1rwO00Gv
         Qhu6Z5uQULiozWdviKOatijAXtHHazuebUA9D5laLDk8QZK/EOVFjS9V3g2Yj93SwH
         8gR1L6co3BoVlxMaqO2HlXmrSJ/KSVeMIfEfKGmFan1TfyAcI214cx3qS/5aljxIxO
         Y10B69MR8dHgQ//ttwe6SEyKJQM9D0Ns6wYo7OsAACkW07aAMx3Ok1bvmS2GF36Yef
         PEJo4+JXU9I9A==
Date:   Mon, 28 Oct 2019 13:59:45 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20191028135945.5b2ed0fa@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/S7w7HW1IKwIM54Qtue1azez";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/S7w7HW1IKwIM54Qtue1azez
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/io_uring.c: In function '__io_sqe_files_unregister':
fs/io_uring.c:3010:12: error: invalid storage class for function 'io_sqe_fi=
les_unregister'
 3010 | static int io_sqe_files_unregister(struct io_ring_ctx *ctx)
      |            ^~~~~~~~~~~~~~~~~~~~~~~
fs/io_uring.c:3010:1: warning: ISO C90 forbids mixed declarations and code =
[-Wdeclaration-after-statement]
 3010 | static int io_sqe_files_unregister(struct io_ring_ctx *ctx)
      | ^~~~~~

Caused by commit

  ed9e02e4bad1 ("io_uring: support for larger fixed file sets")

I have used the block tree from next-20191025 for today.

--=20
Cheers,
Stephen Rothwell

--Sig_/S7w7HW1IKwIM54Qtue1azez
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl22WaEACgkQAVBC80lX
0GzRkggAgblmq0ejT4v2cuEjt39vjRaXd0cqVEglJGBiFqcGAt4jsH26hDVmtT0b
zI1czC3rOZH0DIHIcVjoLrUVVFKJ+39f4YJH/QKfTHbXsaMH806T0jrGDmZ0Xys2
STBT7yTDUktcUb78/hxlzU9LmZqtMi4BPmByIlVoqYy24aYI8+NnM4lPobpRJziW
vOemwb2x2x0h6kN2blNyoYv2BYOMuGHcQc6JXiCVIj1tF0oS7vg4LNSPccRrvDH9
YBdfd/bTo2vDXz/G55RKC/NtmXwToU3a+k15BGlz7jv062+68PgG/f3Zd1RbJv3H
i+jc4h0V3/8gLykvVhi+b/Wo1vQuyQ==
=8Ee+
-----END PGP SIGNATURE-----

--Sig_/S7w7HW1IKwIM54Qtue1azez--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=10KW=YV=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.2 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,
	HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,
	USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 0938BCA9EAF
	for <linux-next@archiver.kernel.org>; Mon, 28 Oct 2019 03:25:12 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.kernel.org (Postfix) with ESMTP id C836C20679
	for <linux-next@archiver.kernel.org>; Mon, 28 Oct 2019 03:25:11 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel-dk.20150623.gappssmtp.com header.i=@kernel-dk.20150623.gappssmtp.com header.b="iqavAp5G"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1729576AbfJ1DZL (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Sun, 27 Oct 2019 23:25:11 -0400
Received: from mail-pg1-f193.google.com ([209.85.215.193]:45525 "EHLO
        mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727119AbfJ1DZL (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Sun, 27 Oct 2019 23:25:11 -0400
Received: by mail-pg1-f193.google.com with SMTP id r1so5859995pgj.12
        for <linux-next@vger.kernel.org>; Sun, 27 Oct 2019 20:25:09 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20150623.gappssmtp.com; s=20150623;
        h=subject:to:cc:references:from:message-id:date:user-agent
         :mime-version:in-reply-to:content-language:content-transfer-encoding;
        bh=iuuv5uDzwQjuDzXqpsithGymUPeE73L3D0NeEzp8Q00=;
        b=iqavAp5G7CGwQYt0MWbkcL6EzvmJ+n3PRBTotiKoMMZjLT6V4QFfwpTr+u+vwScKD3
         KpVutZfM/P9dzi5rPohWCEOKxw/+MDYaZJ7evH+VuGZUyWFoNsa296gMKRSkhfQ51ZGR
         AgGsF8JqqNnY1CZn3OIIShlpQOZY41kmWdA5swBm3Mj+mwOVYEQVxC8p/7fdnD+0nr0T
         mVLJwZ+7g3Su4tEENVu3y3hcWGRx3/gSpmcsNFCFvVAmsLyoCH9a81g3aF+eE7vnrWtq
         FxT9W1WvQNEjC9uz3Tbv0Fk2rMA0MrGR5tpvAZB8w2SxwRGWp9rKcpiB8i4j5m1nSO8j
         6xvg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:subject:to:cc:references:from:message-id:date
         :user-agent:mime-version:in-reply-to:content-language
         :content-transfer-encoding;
        bh=iuuv5uDzwQjuDzXqpsithGymUPeE73L3D0NeEzp8Q00=;
        b=XLMNXY8ZoW9v43dk4dUIiLs3uXTNds5qzWajXiNKYYBvlKvtsi+W8M33EVctbc4WX5
         nIsGS/sqKplsXah84Auh0hvMz9ECclYJHyr3izud7E9l4LyEiVd6kgY6ww0faj/L433G
         SforXweYd8aL2WBZEK0ZsGnzgcbrpKrw3BVghBWxiujVLryJoStapg3kp2V+HoUHCRxC
         UQ82JAjR3UEkJnnuWnNl0YyXUn+ypWOD81FHFqlbn/aJXWSI8wpeZs3GDmLNpLkveeBF
         8zCZuIzzFbazh/NlW/qQcRLrJ1UXq+EYB+aO1Iq3Cvkp3/1msU+NcDhcTCVtm+TCo3PI
         wVFg==
X-Gm-Message-State: APjAAAVKy/FkiJ1cAK45NZsnlZxF3nvDgbyQNR4OgXRBbEoFDwjQ6H1X
        Mt1fcrXq5LAdxvtBP/cGPOR9YXx+NgoYUg==
X-Google-Smtp-Source: APXvYqzaXi4g/x7LVLX5SWooWOl0YI/9dw1mF1GZ4B5OOrCrUhnAkiY+AyLAxR53ILruyo2LWer3cQ==
X-Received: by 2002:a17:90a:4804:: with SMTP id a4mr3869284pjh.102.1572233109088;
        Sun, 27 Oct 2019 20:25:09 -0700 (PDT)
Received: from [192.168.1.188] ([66.219.217.79])
        by smtp.gmail.com with ESMTPSA id k124sm10106917pga.83.2019.10.27.20.25.06
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Sun, 27 Oct 2019 20:25:07 -0700 (PDT)
Subject: Re: linux-next: build failure after merge of the block tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
References: <20191028135945.5b2ed0fa@canb.auug.org.au>
From:   Jens Axboe <axboe@kernel.dk>
Message-ID: <27de542b-aa30-78e4-40ad-4a024e42e643@kernel.dk>
Date:   Sun, 27 Oct 2019 21:25:04 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101
 Thunderbird/60.9.0
MIME-Version: 1.0
In-Reply-To: <20191028135945.5b2ed0fa@canb.auug.org.au>
Content-Type: text/plain; charset=windows-1252
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 10/27/19 8:59 PM, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> fs/io_uring.c: In function '__io_sqe_files_unregister':
> fs/io_uring.c:3010:12: error: invalid storage class for function 'io_sqe_files_unregister'
>   3010 | static int io_sqe_files_unregister(struct io_ring_ctx *ctx)
>        |            ^~~~~~~~~~~~~~~~~~~~~~~
> fs/io_uring.c:3010:1: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
>   3010 | static int io_sqe_files_unregister(struct io_ring_ctx *ctx)
>        | ^~~~~~
> 
> Caused by commit
> 
>    ed9e02e4bad1 ("io_uring: support for larger fixed file sets")
> 
> I have used the block tree from next-20191025 for today.

Ah shoot, forgot to update for-next, I did fix this silly error
yesterday. If you're up for it, pull for-next again in 2 min and I'll
have it updated. If not, I guess it'll be there in the next one. Usually
doesn't matter, only asking because syzbot keeps flagging the same issue
that is also fixed.

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=1TkL=23=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,
	SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no
	version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 73A00C33C9B
	for <linux-next@archiver.kernel.org>; Mon,  6 Jan 2020 01:30:36 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.kernel.org (Postfix) with ESMTP id 11ECA21775
	for <linux-next@archiver.kernel.org>; Mon,  6 Jan 2020 01:30:36 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="W1Pg0Ikb"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1726825AbgAFBae (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Sun, 5 Jan 2020 20:30:34 -0500
Received: from ozlabs.org ([203.11.71.1]:50345 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1726731AbgAFBae (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Sun, 5 Jan 2020 20:30:34 -0500
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 47rdHS6FrZz9sR1;
        Mon,  6 Jan 2020 12:30:28 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;
        s=201702; t=1578274230;
        bh=yMDpAd1QOKFjQar6fmYKLCg+bdrTlcJiiHW/xzSmJDU=;
        h=Date:From:To:Cc:Subject:From;
        b=W1Pg0Ikbf7pht31LX0B7lwOCDSnxE3PdmFg/ffmp/ul7eMnkqHv1QDkvUX0KdYIZ1
         2kffyE0d8my7N2RmaISOtbdIW4CUpaF5ZRLfCtxbm6pbwLfBlOyp6JXKZWH21DTEjo
         S0JM43ksTPIf2hpuVqO6E+GVu55lcdzd6DQTnDzzNf7RGbbfZ3vnoxXalFdSGYpAGl
         HzOROSE+Qc24Gqn6j1ULuBHgSIO4hUSGA7TUFYObz7zysVTND5oPp8O3pWp3kXDIfy
         ZHgD3sB3PrsGM1e6fnh9DUiuiBamRybJan6LrcjuGtLCY2mGAoxKjH7GOXST5dDKx/
         qChEIc/At24Yg==
Date:   Mon, 6 Jan 2020 12:30:27 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>, Al Viro <viro@ZenIV.linux.org.uk>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Aleksa Sarai <cyphar@cyphar.com>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20200106123027.1a162197@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Pqe+0R3zoI8vqIGsIjsOL5B";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/Pqe+0R3zoI8vqIGsIjsOL5B
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

fs/open.c:977:12: error: conflicting types for 'build_open_flags'
  977 | inline int build_open_flags(const struct open_how *how,
      |            ^~~~~~~~~~~~~~~~
In file included from /home/sfr/next/next/fs/open.c:36:
fs/internal.h:127:12: note: previous declaration of 'build_open_flags' was =
here
  127 | extern int build_open_flags(int flags, umode_t mode, struct open_fl=
ags *op);
      |            ^~~~~~~~~~~~~~~~

Caused by commits

  4e9e15c9426e ("fs: make build_open_flags() available internally")
  3bba3e571bc8 ("io_uring: add support for IORING_OP_OPENAT")

interacting with commit

  0a51692d49ec ("open: introduce openat2(2) syscall")

from the vfs tree.

I have applied the following fix up patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 20 Dec 2019 11:50:51 +1100
Subject: [PATCH] io_uring: fix up for "open: introduce openat2(2) syscall"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/internal.h | 3 ++-
 fs/io_uring.c | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/fs/internal.h b/fs/internal.h
index 166134be439f..dabf747c14fd 100644
--- a/fs/internal.h
+++ b/fs/internal.h
@@ -124,7 +124,8 @@ extern struct file *do_filp_open(int dfd, struct filena=
me *pathname,
 		const struct open_flags *op);
 extern struct file *do_file_open_root(struct dentry *, struct vfsmount *,
 		const char *, const struct open_flags *);
-extern int build_open_flags(int flags, umode_t mode, struct open_flags *op=
);
+extern struct open_how build_open_how(int flags, umode_t mode);
+extern int build_open_flags(const struct open_how *how, struct open_flags =
*op);
=20
 long do_sys_ftruncate(unsigned int fd, loff_t length, int small);
 long do_faccessat(int dfd, const char __user *filename, int mode);
diff --git a/fs/io_uring.c b/fs/io_uring.c
index c770c2c0eb52..60ebdea1d8c6 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -2476,16 +2476,18 @@ static int io_openat(struct io_kiocb *req, struct i=
o_kiocb **nxt,
 		     bool force_nonblock)
 {
 	struct open_flags op;
+	struct open_how how;
 	struct file *file;
 	int ret;
=20
-	ret =3D build_open_flags(req->open.flags, req->open.mode, &op);
+	how =3D build_open_how(req->open.flags, req->open.mode);
+	ret =3D build_open_flags(&how, &op);
 	if (ret)
 		goto err;
 	if (force_nonblock)
 		op.lookup_flags |=3D LOOKUP_NONBLOCK;
=20
-	ret =3D get_unused_fd_flags(req->open.flags);
+	ret =3D get_unused_fd_flags(how.flags);
 	if (ret < 0)
 		goto err;
=20
--=20
2.24.0

--=20
Cheers,
Stephen Rothwell

--Sig_/Pqe+0R3zoI8vqIGsIjsOL5B
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl4SjbMACgkQAVBC80lX
0Gzf4AgAh3FFiUW5b1cLfbDX6dNTw7MYybIsttqrSvB8zf98dtkz9pb4vMYwaGC+
w0RlNABraY/NnNz7QJIjhwx+vbSM0LUwpt1bWidnPSvfdOwduPVonaRrDsACzmTw
ZbfcQTqh/yqJpRuPc6sxCiai6SIT7LB59iVPKwhqim9bunO25qBg68QC4iiHzLGW
Ggc0i3PsuOvdgLIi2PmiEiRxUwuF49OOEMTtNHGgpkoDPz0TQwtN+E1YPCdwe+gv
kUcfyF5Io0Br2WkRw9iAGy4YfTYYeL07PjspfCuv9lC1M6qEHJgsh7shgvYk0mVu
6yVN1dLdqP5karbSWA/GdEQdT5qoLg==
=JwN7
-----END PGP SIGNATURE-----

--Sig_/Pqe+0R3zoI8vqIGsIjsOL5B--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=Xd6n=24=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.2 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,
	HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,
	USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 915D4C33C99
	for <linux-next@archiver.kernel.org>; Tue,  7 Jan 2020 04:04:07 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.kernel.org (Postfix) with ESMTP id 67139207E0
	for <linux-next@archiver.kernel.org>; Tue,  7 Jan 2020 04:04:07 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel-dk.20150623.gappssmtp.com header.i=@kernel-dk.20150623.gappssmtp.com header.b="myu93md+"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727517AbgAGEED (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Mon, 6 Jan 2020 23:04:03 -0500
Received: from mail-pl1-f194.google.com ([209.85.214.194]:38022 "EHLO
        mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727464AbgAGEED (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Mon, 6 Jan 2020 23:04:03 -0500
Received: by mail-pl1-f194.google.com with SMTP id f20so22661610plj.5
        for <linux-next@vger.kernel.org>; Mon, 06 Jan 2020 20:04:03 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20150623.gappssmtp.com; s=20150623;
        h=subject:to:cc:references:from:message-id:date:user-agent
         :mime-version:in-reply-to:content-language:content-transfer-encoding;
        bh=B0oNcIbjX5zAsLAEn09krQRymHbBDEiH3zomLTcEFpM=;
        b=myu93md+K1gu02JO88k7yN9Y6B86Slj8V1E6ZeDSpjG/M1GrkEq2zwlkcX4ccVK9dR
         f2JYbWg2BCyTGaDza1xIipIUzbAoyA5NDV22jh9SvrB4k+JZ7EBvJuwM/SOqrIUaHX+a
         f6M4HwJMr3UGINwkTUQI96firweny1al2DHp3NCqZ7CKJsIetYQ37gtDyCGk+QzHrs3U
         5B3cAf1zGgFM5DtrKp4hxs61XkLDidZYaXk79QwCROzkgc93KjGlUF7oxya/Puuc0WCq
         RVf+uD04i+6BnI76OYXVKH3m6nALjqppDVivgxp9GVjcnxjO/XNfA8p7KAQm23kpqBKo
         U8ig==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:subject:to:cc:references:from:message-id:date
         :user-agent:mime-version:in-reply-to:content-language
         :content-transfer-encoding;
        bh=B0oNcIbjX5zAsLAEn09krQRymHbBDEiH3zomLTcEFpM=;
        b=oMJRiXpPmGkkOtTNqPkhpiucGBvR+spqgyd86Ha4+JINxrNdRYYzSwgDmUMtzwcJuE
         Gv3rA6CAQtzrlyGkIrpZKzogvTDwMfEFQvUQtQoBi43D6rN65Mjit71fW5moDObm/550
         YKBzbmtFYWWOYwzGKy/5nPotUu+SHTv0STt7c59jKaaTcevAzUM3bs3xKsu5YW4apkZD
         yUckNUKISyFut7rysVg7N5zA3cafrbj/R5w6ZsJLDdPQYzX5U07KcC8E9IVDFnWM6+hX
         APio6+9mDBCljhzGJ61nEaushgsCLP/aMcwGnflQOcTOb+ms9w4ng8YjXVnVRgsRFQr7
         hkFQ==
X-Gm-Message-State: APjAAAVNOUSpaNdujrb1lkQ1OJXlR9tkDk1BDx12CvTxPD6Z3q1adxKi
        P9bB/xNlBQvP31gbwthl+0aYBA==
X-Google-Smtp-Source: APXvYqzXjszYS29e6Cmc8oD0Uo47Epqq0SwJS5FoW3J5N9rDmzynHTOTAmnXz4a7BB73s4DdnM1hFg==
X-Received: by 2002:a17:902:9045:: with SMTP id w5mr108602172plz.46.1578369842559;
        Mon, 06 Jan 2020 20:04:02 -0800 (PST)
Received: from [192.168.1.188] ([66.219.217.145])
        by smtp.gmail.com with ESMTPSA id l22sm27604050pjc.0.2020.01.06.20.04.01
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Mon, 06 Jan 2020 20:04:02 -0800 (PST)
Subject: Re: linux-next: build failure after merge of the block tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Al Viro <viro@ZenIV.linux.org.uk>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Aleksa Sarai <cyphar@cyphar.com>
References: <20200106123027.1a162197@canb.auug.org.au>
From:   Jens Axboe <axboe@kernel.dk>
Message-ID: <e9a87175-64c9-46da-4737-72987a53e836@kernel.dk>
Date:   Mon, 6 Jan 2020 21:04:01 -0700
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.2.2
MIME-Version: 1.0
In-Reply-To: <20200106123027.1a162197@canb.auug.org.au>
Content-Type: text/plain; charset=windows-1252
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 1/5/20 6:30 PM, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the block tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> fs/open.c:977:12: error: conflicting types for 'build_open_flags'
>   977 | inline int build_open_flags(const struct open_how *how,
>       |            ^~~~~~~~~~~~~~~~
> In file included from /home/sfr/next/next/fs/open.c:36:
> fs/internal.h:127:12: note: previous declaration of 'build_open_flags' was here
>   127 | extern int build_open_flags(int flags, umode_t mode, struct open_flags *op);
>       |            ^~~~~~~~~~~~~~~~
> 
> Caused by commits
> 
>   4e9e15c9426e ("fs: make build_open_flags() available internally")
>   3bba3e571bc8 ("io_uring: add support for IORING_OP_OPENAT")
> 
> interacting with commit
> 
>   0a51692d49ec ("open: introduce openat2(2) syscall")
> 
> from the vfs tree.
> 
> I have applied the following fix up patch for today:

Thanks Stephen - I'll pull in the VFS tree and rebase the 5.6 io_uring
bits on that. Then I'll send it out for review again, haven't heard from
Al on the non-block open change.

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=Nl4r=3B=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no
	version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 54508C3F68F
	for <linux-next@archiver.kernel.org>; Sun, 12 Jan 2020 18:32:40 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.kernel.org (Postfix) with ESMTP id 3CBDF21569
	for <linux-next@archiver.kernel.org>; Sun, 12 Jan 2020 18:32:40 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1733152AbgALScj (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Sun, 12 Jan 2020 13:32:39 -0500
Received: from zeniv.linux.org.uk ([195.92.253.2]:38282 "EHLO
        ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1732957AbgALScj (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Sun, 12 Jan 2020 13:32:39 -0500
Received: from viro by ZenIV.linux.org.uk with local (Exim 4.92.3 #3 (Red Hat Linux))
        id 1iqi2N-006mo9-2h; Sun, 12 Jan 2020 18:32:35 +0000
Date:   Sun, 12 Jan 2020 18:32:35 +0000
From:   Al Viro <viro@zeniv.linux.org.uk>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Aleksa Sarai <cyphar@cyphar.com>
Subject: Re: linux-next: build failure after merge of the block tree
Message-ID: <20200112183235.GO8904@ZenIV.linux.org.uk>
References: <20200106123027.1a162197@canb.auug.org.au>
 <e9a87175-64c9-46da-4737-72987a53e836@kernel.dk>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <e9a87175-64c9-46da-4737-72987a53e836@kernel.dk>
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On Mon, Jan 06, 2020 at 09:04:01PM -0700, Jens Axboe wrote:
> On 1/5/20 6:30 PM, Stephen Rothwell wrote:
> > Hi all,
> > 
> > After merging the block tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> > 
> > fs/open.c:977:12: error: conflicting types for 'build_open_flags'
> >   977 | inline int build_open_flags(const struct open_how *how,
> >       |            ^~~~~~~~~~~~~~~~
> > In file included from /home/sfr/next/next/fs/open.c:36:
> > fs/internal.h:127:12: note: previous declaration of 'build_open_flags' was here
> >   127 | extern int build_open_flags(int flags, umode_t mode, struct open_flags *op);
> >       |            ^~~~~~~~~~~~~~~~
> > 
> > Caused by commits
> > 
> >   4e9e15c9426e ("fs: make build_open_flags() available internally")
> >   3bba3e571bc8 ("io_uring: add support for IORING_OP_OPENAT")
> > 
> > interacting with commit
> > 
> >   0a51692d49ec ("open: introduce openat2(2) syscall")
> > 
> > from the vfs tree.
> > 
> > I have applied the following fix up patch for today:
> 
> Thanks Stephen - I'll pull in the VFS tree and rebase the 5.6 io_uring
> bits on that. Then I'll send it out for review again, haven't heard from
> Al on the non-block open change.

FWIW, I don't believe that your approach is workable.  First of all,
*ANY* transition out of RCU mode can lead to blocking.  You need to
acquire several references (mount and dentry, at the very least).
Suppose the last one fails (->d_seq mismatch).  Now you suddenly
have to drop the one(s) you've acquired.  And both dput() and mntput()
are fundamentally blocking operations.

It simply does not work.  You could cobble up something that kinda-sorta
works, if your added flag had
	* caused hard failure on unlazy_child()
	* caused hard failure on unlazy_walk() with any symlinks in stack
	* caused hard failure on unlazy_walk() if it would've been required
to grab root
	* made unlazy_walk() go through very careful dance if it's just
about nd->path; I'm not sure how well that could be done, but theoretically
it's not impossible.

But for open() it's not going to work at all.  Any open for write => you
will have to wait if you run into fs freeze.  O_TRUNC => you've got IO
to do.  Worst of all, once you've dropped out of RCU mode, *YOU* *CAN'T*
*FAIL*.  Because that means blocking operations.  So you need to verify
that you won't run into a blocking ->open(), IMA deciding to play silly
buggers and read through the entire file, etc., etc. _before_ dropping
out of RCU mode.

do_last() is messy enough as it is; adding _this_ is completely out of
question.

Jens, if you have a workable plan on that non-blocking open of yours,
post it in full details.  Until then - NAK, and that's about as hard one
as I ever had to give.

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=JT2A=3C=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.2 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,
	HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,
	USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id A2597C33CAE
	for <linux-next@archiver.kernel.org>; Mon, 13 Jan 2020 17:09:06 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.kernel.org (Postfix) with ESMTP id 75E5E222C2
	for <linux-next@archiver.kernel.org>; Mon, 13 Jan 2020 17:09:06 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel-dk.20150623.gappssmtp.com header.i=@kernel-dk.20150623.gappssmtp.com header.b="WKqIN2x4"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728920AbgAMRJF (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Mon, 13 Jan 2020 12:09:05 -0500
Received: from mail-io1-f65.google.com ([209.85.166.65]:45062 "EHLO
        mail-io1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728916AbgAMRJE (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Mon, 13 Jan 2020 12:09:04 -0500
Received: by mail-io1-f65.google.com with SMTP id i11so10568296ioi.12
        for <linux-next@vger.kernel.org>; Mon, 13 Jan 2020 09:09:04 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20150623.gappssmtp.com; s=20150623;
        h=subject:to:cc:references:from:message-id:date:user-agent
         :mime-version:in-reply-to:content-language:content-transfer-encoding;
        bh=HwOMSNU0BOcmSRdPEWKuyZX5aZw+rCZHEo3YxXXPbFY=;
        b=WKqIN2x4arw2oKUauJg3IzH0Qjl/mB5DQfhbHOo9RwqOxk1NJAI/DXrWhbYvac3FUU
         6z14DZZMo1fvXjZbp/NMHMaMWa3xcDbxdnXLXMKhGK0DYjmHTKtTpAyFbGxMVFVSK4mQ
         1M6o9th63zQJ7uVxLbmFHDx+V1IVk0PBWnWfHNjj+DAROwY9Sz1zLTOGUkAyjytc3LXw
         TNAFCePAGIquBokzfdvjK5TWHwCsRtCc2XevcbVtPPT5OePT53zNlRKrZNAEC982It9U
         98EWBsgK2gb1Hf8NPxoFa/rIm/s4UpeMeR4NOEZDdBcoKet82/f4Me+lSg19PNK4sKHP
         i49A==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:subject:to:cc:references:from:message-id:date
         :user-agent:mime-version:in-reply-to:content-language
         :content-transfer-encoding;
        bh=HwOMSNU0BOcmSRdPEWKuyZX5aZw+rCZHEo3YxXXPbFY=;
        b=Pq/BsrLl79PxnPZeKwm0Wa+2w+ekbC3r346YcEXFwdzJQKfFlEc9k51iKN8d2lmtAc
         THaKY20lnqN/3wKBQ5QT3Aam/B/oozoxZtQkIW/ChwbH35I6u+Za1hgm0wRcCwGQlvcA
         TK22ZuCvXpHrGCkEWu6Z6LVnshebfRSCCOpJVjoy3tQxdWqQev4z3vlG1KBm8rV/UGSA
         YLl6qc3UdkKRF5EJUsMFpyvRyXzVSQDQjt8lJVE6kgBu7X9JmaKwDq7dVPhTYWEtzCiG
         slBs1kBV+WcqwTEIS4sAYFgaghNHTQ5nPjKBGRPtX/tBTuXjVUpNOamTtOh20XNz8gJS
         388w==
X-Gm-Message-State: APjAAAVMfM8qRjh4/Tz5JelxVVjfX0KVXiJ6MInHDTLQ+/KofVzaAY7K
        8FEUk29aI61dBqx3BumQtYjs1A==
X-Google-Smtp-Source: APXvYqy68d9Ng4v1S+3XbifY4an9Sl2hEGBXR3rUtx/ooElUc+fi5+WPRSFy8jmCisZsF0cjR9P+zg==
X-Received: by 2002:a6b:c986:: with SMTP id z128mr13473801iof.8.1578935343131;
        Mon, 13 Jan 2020 09:09:03 -0800 (PST)
Received: from [192.168.1.159] ([65.144.74.34])
        by smtp.gmail.com with ESMTPSA id x62sm4000954ill.86.2020.01.13.09.09.02
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Mon, 13 Jan 2020 09:09:02 -0800 (PST)
Subject: Re: linux-next: build failure after merge of the block tree
To:     Al Viro <viro@zeniv.linux.org.uk>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Aleksa Sarai <cyphar@cyphar.com>
References: <20200106123027.1a162197@canb.auug.org.au>
 <e9a87175-64c9-46da-4737-72987a53e836@kernel.dk>
 <20200112183235.GO8904@ZenIV.linux.org.uk>
From:   Jens Axboe <axboe@kernel.dk>
Message-ID: <b177c427-ca94-bbbf-b09d-6f2faef4121c@kernel.dk>
Date:   Mon, 13 Jan 2020 10:09:01 -0700
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.2.2
MIME-Version: 1.0
In-Reply-To: <20200112183235.GO8904@ZenIV.linux.org.uk>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 1/12/20 11:32 AM, Al Viro wrote:
> On Mon, Jan 06, 2020 at 09:04:01PM -0700, Jens Axboe wrote:
>> On 1/5/20 6:30 PM, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> After merging the block tree, today's linux-next build (arm
>>> multi_v7_defconfig) failed like this:
>>>
>>> fs/open.c:977:12: error: conflicting types for 'build_open_flags'
>>>   977 | inline int build_open_flags(const struct open_how *how,
>>>       |            ^~~~~~~~~~~~~~~~
>>> In file included from /home/sfr/next/next/fs/open.c:36:
>>> fs/internal.h:127:12: note: previous declaration of 'build_open_flags' was here
>>>   127 | extern int build_open_flags(int flags, umode_t mode, struct open_flags *op);
>>>       |            ^~~~~~~~~~~~~~~~
>>>
>>> Caused by commits
>>>
>>>   4e9e15c9426e ("fs: make build_open_flags() available internally")
>>>   3bba3e571bc8 ("io_uring: add support for IORING_OP_OPENAT")
>>>
>>> interacting with commit
>>>
>>>   0a51692d49ec ("open: introduce openat2(2) syscall")
>>>
>>> from the vfs tree.
>>>
>>> I have applied the following fix up patch for today:
>>
>> Thanks Stephen - I'll pull in the VFS tree and rebase the 5.6 io_uring
>> bits on that. Then I'll send it out for review again, haven't heard from
>> Al on the non-block open change.
> 
> FWIW, I don't believe that your approach is workable.  First of all,
> *ANY* transition out of RCU mode can lead to blocking.  You need to
> acquire several references (mount and dentry, at the very least).
> Suppose the last one fails (->d_seq mismatch).  Now you suddenly
> have to drop the one(s) you've acquired.  And both dput() and mntput()
> are fundamentally blocking operations.
> 
> It simply does not work.  You could cobble up something that kinda-sorta
> works, if your added flag had
> 	* caused hard failure on unlazy_child()
> 	* caused hard failure on unlazy_walk() with any symlinks in stack
> 	* caused hard failure on unlazy_walk() if it would've been required
> to grab root
> 	* made unlazy_walk() go through very careful dance if it's just
> about nd->path; I'm not sure how well that could be done, but theoretically
> it's not impossible.
> 
> But for open() it's not going to work at all.  Any open for write => you
> will have to wait if you run into fs freeze.  O_TRUNC => you've got IO
> to do.  Worst of all, once you've dropped out of RCU mode, *YOU* *CAN'T*
> *FAIL*.  Because that means blocking operations.  So you need to verify
> that you won't run into a blocking ->open(), IMA deciding to play silly
> buggers and read through the entire file, etc., etc. _before_ dropping
> out of RCU mode.
> 
> do_last() is messy enough as it is; adding _this_ is completely out of
> question.

Thanks Al, that's useful! Sounds like the lookup is doable, but the open
part is just a wasp nest of "don't even go there". For now, I'll drop
the lookup change and just have the io_uring open punt to async. With
that, I don't need any non-blocking guarantees. That is workable for
now.

> Jens, if you have a workable plan on that non-blocking open of yours,
> post it in full details.  Until then - NAK, and that's about as hard one
> as I ever had to give.

It's like the other io_uring opcodes - we prefer to try a non-blocking
attempt first, and if that fails, then we go async. I have no grand
async open design, was just hoping I could make it work with minimal
effort. That's obviously not doable. I would not mind working on
actually making it doable, but that's a bigger project than I originally
wanted to take on.

So the most likely outcome longer term is for io_uring to adopt a syslet
type of approach to this, where we always just just call the open
helper, and if we need to block/reschedule, then we move context to an
appropriate worker thread. Time is better spent there rather than trying
to make every useful system call provide a sane non-blocking path, I
think.

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=JT2A=3C=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.2 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,
	HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,
	USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 9A298C33CAE
	for <linux-next@archiver.kernel.org>; Mon, 13 Jan 2020 17:26:07 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.kernel.org (Postfix) with ESMTP id 70284206DA
	for <linux-next@archiver.kernel.org>; Mon, 13 Jan 2020 17:26:07 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel-dk.20150623.gappssmtp.com header.i=@kernel-dk.20150623.gappssmtp.com header.b="ErBcpsTU"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728757AbgAMR0H (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Mon, 13 Jan 2020 12:26:07 -0500
Received: from mail-io1-f67.google.com ([209.85.166.67]:42973 "EHLO
        mail-io1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728755AbgAMR0G (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Mon, 13 Jan 2020 12:26:06 -0500
Received: by mail-io1-f67.google.com with SMTP id n11so10644320iom.9
        for <linux-next@vger.kernel.org>; Mon, 13 Jan 2020 09:26:06 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20150623.gappssmtp.com; s=20150623;
        h=subject:from:to:cc:references:message-id:date:user-agent
         :mime-version:in-reply-to:content-language:content-transfer-encoding;
        bh=OBo5QAcEDxGNV5JO3U4yYbvOSrdNw7cnut5xbdJ0JFY=;
        b=ErBcpsTU/dY0+ucL8Uvl71+Q0Jk2VPys6QfyJacCBO+HF19I22Nm6DMlWCBiFbLH4e
         IMP7y0aHE2NbLhKAAn+aTDPvMpxQ98DPcC1NAJaavpOAQ9hbVjwXElO9x42lJ3YSnsVs
         Swmun/yCXm5RQDS1N5Pdj2dRwbuBxO+4JFIfQG8C83azOFwBdCaleRcnq8WjVk2F2gvg
         A1aVxd7IfY8o+gKQYZFBW9VTVOrpws0v0s+dy9vHy7U4MGMGe0tJat/7tIoMNy/DkWJZ
         n6CrVFyoQx+cMLzp4n1xUBrxTY/iWW1P1hy9w/Qq8jlj0m87ebLqu5uWSQvFOkqqKGka
         4c7g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:subject:from:to:cc:references:message-id:date
         :user-agent:mime-version:in-reply-to:content-language
         :content-transfer-encoding;
        bh=OBo5QAcEDxGNV5JO3U4yYbvOSrdNw7cnut5xbdJ0JFY=;
        b=OYL5fPnx9tps9GZTs21bkKzVzDDqnrzfOIx3md2wSj79mf8BrGvdh8ST+JAkj2nwAj
         wdNYSSzVz6JGlTtShnoU4BaT170iT/rrATmDI1n0u7C1kO3iezSN2VkRr5SIl6zT46lZ
         +5gKn8u63IAu+2EaxIKsF2ZQ7yzAdOgSmZjCpP6ZPIkHjdmRIYrIQ4g8mtYzSrshTyLK
         p/sOdjtrOgsELN6BwVbyuWsydkH+IMAMka5GaPqz0KsQM68KDowUHnW0EqPJWOD7vHZD
         fYfAPT3I+bj47K9tJbN7SqR/gkhSZ9ygdJg58FsMVl8G0HK6oM4D0yVZSdgpJ+GLoXvZ
         uqAQ==
X-Gm-Message-State: APjAAAV56G2NQhnmFHuj5HTisXSzJyy5gxWlkNWSP6AyZHgZs+ejNMoy
        lo2GZkXopN72+EJvT2uubcEpcA==
X-Google-Smtp-Source: APXvYqwrd/2oigoHJfTKGhXRWXCkcVDoRwthNe9zY4vrGrg95oL2IbJ4U7OdT/i61M1Q9zStL3lXnw==
X-Received: by 2002:a5e:a906:: with SMTP id c6mr13023272iod.244.1578936365987;
        Mon, 13 Jan 2020 09:26:05 -0800 (PST)
Received: from [192.168.1.159] ([65.144.74.34])
        by smtp.gmail.com with ESMTPSA id h85sm3988412ili.22.2020.01.13.09.26.05
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Mon, 13 Jan 2020 09:26:05 -0800 (PST)
Subject: Re: linux-next: build failure after merge of the block tree
From:   Jens Axboe <axboe@kernel.dk>
To:     Al Viro <viro@zeniv.linux.org.uk>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Aleksa Sarai <cyphar@cyphar.com>
References: <20200106123027.1a162197@canb.auug.org.au>
 <e9a87175-64c9-46da-4737-72987a53e836@kernel.dk>
 <20200112183235.GO8904@ZenIV.linux.org.uk>
 <b177c427-ca94-bbbf-b09d-6f2faef4121c@kernel.dk>
Message-ID: <889551c4-c4a7-dc49-c3b2-7c5ff5c8c0e7@kernel.dk>
Date:   Mon, 13 Jan 2020 10:26:04 -0700
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.2.2
MIME-Version: 1.0
In-Reply-To: <b177c427-ca94-bbbf-b09d-6f2faef4121c@kernel.dk>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 1/13/20 10:09 AM, Jens Axboe wrote:
> On 1/12/20 11:32 AM, Al Viro wrote:
>> On Mon, Jan 06, 2020 at 09:04:01PM -0700, Jens Axboe wrote:
>>> On 1/5/20 6:30 PM, Stephen Rothwell wrote:
>>>> Hi all,
>>>>
>>>> After merging the block tree, today's linux-next build (arm
>>>> multi_v7_defconfig) failed like this:
>>>>
>>>> fs/open.c:977:12: error: conflicting types for 'build_open_flags'
>>>>   977 | inline int build_open_flags(const struct open_how *how,
>>>>       |            ^~~~~~~~~~~~~~~~
>>>> In file included from /home/sfr/next/next/fs/open.c:36:
>>>> fs/internal.h:127:12: note: previous declaration of 'build_open_flags' was here
>>>>   127 | extern int build_open_flags(int flags, umode_t mode, struct open_flags *op);
>>>>       |            ^~~~~~~~~~~~~~~~
>>>>
>>>> Caused by commits
>>>>
>>>>   4e9e15c9426e ("fs: make build_open_flags() available internally")
>>>>   3bba3e571bc8 ("io_uring: add support for IORING_OP_OPENAT")
>>>>
>>>> interacting with commit
>>>>
>>>>   0a51692d49ec ("open: introduce openat2(2) syscall")
>>>>
>>>> from the vfs tree.
>>>>
>>>> I have applied the following fix up patch for today:
>>>
>>> Thanks Stephen - I'll pull in the VFS tree and rebase the 5.6 io_uring
>>> bits on that. Then I'll send it out for review again, haven't heard from
>>> Al on the non-block open change.
>>
>> FWIW, I don't believe that your approach is workable.  First of all,
>> *ANY* transition out of RCU mode can lead to blocking.  You need to
>> acquire several references (mount and dentry, at the very least).
>> Suppose the last one fails (->d_seq mismatch).  Now you suddenly
>> have to drop the one(s) you've acquired.  And both dput() and mntput()
>> are fundamentally blocking operations.
>>
>> It simply does not work.  You could cobble up something that kinda-sorta
>> works, if your added flag had
>> 	* caused hard failure on unlazy_child()
>> 	* caused hard failure on unlazy_walk() with any symlinks in stack
>> 	* caused hard failure on unlazy_walk() if it would've been required
>> to grab root
>> 	* made unlazy_walk() go through very careful dance if it's just
>> about nd->path; I'm not sure how well that could be done, but theoretically
>> it's not impossible.
>>
>> But for open() it's not going to work at all.  Any open for write => you
>> will have to wait if you run into fs freeze.  O_TRUNC => you've got IO
>> to do.  Worst of all, once you've dropped out of RCU mode, *YOU* *CAN'T*
>> *FAIL*.  Because that means blocking operations.  So you need to verify
>> that you won't run into a blocking ->open(), IMA deciding to play silly
>> buggers and read through the entire file, etc., etc. _before_ dropping
>> out of RCU mode.
>>
>> do_last() is messy enough as it is; adding _this_ is completely out of
>> question.
> 
> Thanks Al, that's useful! Sounds like the lookup is doable, but the open
> part is just a wasp nest of "don't even go there". For now, I'll drop
> the lookup change and just have the io_uring open punt to async. With
> that, I don't need any non-blocking guarantees. That is workable for
> now.

Forgot to mention, I'll implement your addition for the lookup part,
since I still need that for the statx addition. But the open itself
will not use any of that, I'll leave that as-is and just go async.

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=8YV8=3X=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,
	SPF_PASS autolearn=no autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 37709C35249
	for <linux-next@archiver.kernel.org>; Mon,  3 Feb 2020 00:04:32 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.kernel.org (Postfix) with ESMTP id BA0F1206E6
	for <linux-next@archiver.kernel.org>; Mon,  3 Feb 2020 00:04:31 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="VGAJ0MTM"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1726912AbgBCAEb (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Sun, 2 Feb 2020 19:04:31 -0500
Received: from bilbo.ozlabs.org ([203.11.71.1]:38785 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1726443AbgBCAEa (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Sun, 2 Feb 2020 19:04:30 -0500
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 489p3H70lHz9sRh;
        Mon,  3 Feb 2020 11:04:27 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;
        s=201702; t=1580688268;
        bh=tcS71z/0GWmowIg5o7L/X7n3pR9UYX7ERG7fepo7dVw=;
        h=Date:From:To:Cc:Subject:From;
        b=VGAJ0MTMTz1P6qu66LxUuDOOQBAyaLPI3ngCo87iBAuTo2bTg8Y3R3L0yVzoe6gV1
         Z3ZXyZ0xUhsMYY3qC/TptOdRO+et8nyUFXJxXnYcAOCjf9Q/Jn+xva8cl0Lm3kshzf
         e8Y8jP/McrImdk+soZ4XYmlJ2KLnKOYGngIzWiTk0Pv3f8OYXB2aPtEYDHRNPYw4Yd
         XV9X/5fXmfWDf27gVVYCVBNHiyYCDaqXFiknNHABQK979nFfQJdvX5G/sM6vSTny81
         PfImfqrC1vHuJS5zgReT73tCNvOYc1E/F2jINEK7in0pz7f8jAcOYynFqb5U5rQZ5N
         mf7nsAilM6dnQ==
Date:   Mon, 3 Feb 2020 11:04:26 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20200203110426.6ceca414@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/sMt7r46TAOWkHLL5pPR9qXT";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/sMt7r46TAOWkHLL5pPR9qXT
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

In file included from drivers/vhost/vhost.c:13:
include/linux/eventfd.h:43:22: error: unknown type name 'eventfd_wake_count'
   43 | DECLARE_PER_CPU(int, eventfd_wake_count);
      |                      ^~~~~~~~~~~~~~~~~~
include/linux/eventfd.h: In function 'eventfd_signal_count':
include/linux/eventfd.h:47:9: error: implicit declaration of function 'this=
_cpu_read' [-Werror=3Dimplicit-function-declaration]
   47 |  return this_cpu_read(eventfd_wake_count);
      |         ^~~~~~~~~~~~~
include/linux/eventfd.h:47:23: error: 'eventfd_wake_count' undeclared (firs=
t use in this function); did you mean 'eventfd_signal_count'?
   47 |  return this_cpu_read(eventfd_wake_count);
      |                       ^~~~~~~~~~~~~~~~~~
      |                       eventfd_signal_count
include/linux/eventfd.h:47:23: note: each undeclared identifier is reported=
 only once for each function it appears in

Caused by commit

  9a9f718763cf ("eventfd: track eventfd_signal() recursion depth")

I have used the block tree from next-20200131 for today.

--=20
Cheers,
Stephen Rothwell

--Sig_/sMt7r46TAOWkHLL5pPR9qXT
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl43Y4oACgkQAVBC80lX
0GwBFggAjDOY3xHh/zDK7mPorje1srkW5wHKlSpuW5eZW6UTjkcY0Ne6Y9uiFzJE
lseS8X0xxg0hpSQtHCyuag3fZhcNSMotQeEc9YHHIBDRoQFur9U29PZ/6NPRadYS
62htCqZAeX87+T0eD17JqGg86m0VXKaAO3fCvVWj819tAX8djPF2XEyIVmTyk4Kd
MRUDo82EFm3dx1oAMPCyXjNN1yNXw+AqLmCdJ45H8vVSWu5rXkCK3eJqJBdZwD2Z
tMcjMbtZ2sXBDkSsVI3/mjiFlJgC0bdLnq2Q02/NJgGjpl0Au6JsYvtDu/JlxmZw
3ei5qUqzZtZWe9rSf+QBbzD1Q+3GYA==
=KSeT
-----END PGP SIGNATURE-----

--Sig_/sMt7r46TAOWkHLL5pPR9qXT--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=8YV8=3X=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.2 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,
	HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,
	USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id DD4C8C33C9E
	for <linux-next@archiver.kernel.org>; Mon,  3 Feb 2020 04:13:02 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.kernel.org (Postfix) with ESMTP id 9A15B20679
	for <linux-next@archiver.kernel.org>; Mon,  3 Feb 2020 04:13:02 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel-dk.20150623.gappssmtp.com header.i=@kernel-dk.20150623.gappssmtp.com header.b="VilCGki/"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727159AbgBCENC (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Sun, 2 Feb 2020 23:13:02 -0500
Received: from mail-pl1-f193.google.com ([209.85.214.193]:34927 "EHLO
        mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727156AbgBCENC (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Sun, 2 Feb 2020 23:13:02 -0500
Received: by mail-pl1-f193.google.com with SMTP id g6so5310145plt.2
        for <linux-next@vger.kernel.org>; Sun, 02 Feb 2020 20:13:01 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20150623.gappssmtp.com; s=20150623;
        h=subject:to:cc:references:from:message-id:date:user-agent
         :mime-version:in-reply-to:content-language:content-transfer-encoding;
        bh=dIrUPTnZvDwUp0R7l94JshTdtBhQRESPBxjrDmzBrdM=;
        b=VilCGki/nsp0khzP7Z+TmtsWQMMqU+mbNC3ccbFitSDEf+1jKnXg4usCKBo++RDKFf
         MDsgSLjPhqltMgm6sqDYd6xMwPuCS7WO+oixZ77xwfvOaE0NFCNiD3T2GXORqS1NmDT4
         VKrBOz9qRANHpMIG2rlJutTaY9xi5eh7uwXORboNHOlMq7DZstA+qFek0wY6LlUNehLv
         4tBxdPkwZ19YEOz23nNe6zEtYjxfiA9dzEne9XUBNaQAtalgcKyfeTKbwXLSNGD86GET
         IzWR1/FPU36B6xicm4Z5KPfQ5zE4aLsKcx7NG4vNmK9RmECWGKfWNWpwhG1j28AvIZQe
         1vkA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:subject:to:cc:references:from:message-id:date
         :user-agent:mime-version:in-reply-to:content-language
         :content-transfer-encoding;
        bh=dIrUPTnZvDwUp0R7l94JshTdtBhQRESPBxjrDmzBrdM=;
        b=YGZeV8gk0Zdekf0E5U0SdJoszrV1fiiyXPqGWsSZ15LCfeNeuzWq3F0m3PbSdKWJkP
         dhZ/LYZVAAjkftgXPIpoxQEi11mbpX/Gxo0eXvFcTVKn5z8LfgpQVTHxyaoR2glE7EmW
         vTKHLiuHUrsx+xcRkF3TAwoWZB6jh4cYh1kKAZyJC6TLBT4pNEAkM/9MT7AWh6dLaDsc
         1WKl3Yi8FFdtlpCuKbMWgi+dDDVkGU6L7D7kl8xiBm02sq8RTsODucJxDtW9lVO9diWG
         Zwg4ElKrqLr36+OE8rQ9ZWHUj7bZjXJT89q1zdYBGHgU4R7ZRvh1qtxIk/bRtfHghfQR
         dG4Q==
X-Gm-Message-State: APjAAAWJP5d4B7Km3EGA8wNSPvmL9XfNKrZGfZuKBAPfKyHnqe4I1Ncy
        FwxcQOgmZp1/VZMabUQDVcnmmufYoWI=
X-Google-Smtp-Source: APXvYqxQZHCWlp5qmDphiuPsGQqccqa4TLIW+Tcop2vkbJNf3d28rxW0c3Fi9SkYBo50utQyV/WKGQ==
X-Received: by 2002:a17:90a:178f:: with SMTP id q15mr27802458pja.132.1580703181309;
        Sun, 02 Feb 2020 20:13:01 -0800 (PST)
Received: from [192.168.1.188] ([66.219.217.145])
        by smtp.gmail.com with ESMTPSA id l37sm18338795pjb.15.2020.02.02.20.13.00
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Sun, 02 Feb 2020 20:13:00 -0800 (PST)
Subject: Re: linux-next: build failure after merge of the block tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
References: <20200203110426.6ceca414@canb.auug.org.au>
From:   Jens Axboe <axboe@kernel.dk>
Message-ID: <aa90c06f-c0bd-7a32-b35e-85d71ffe3bf9@kernel.dk>
Date:   Sun, 2 Feb 2020 21:12:59 -0700
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.4.1
MIME-Version: 1.0
In-Reply-To: <20200203110426.6ceca414@canb.auug.org.au>
Content-Type: text/plain; charset=windows-1252
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 2/2/20 5:04 PM, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the block tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> In file included from drivers/vhost/vhost.c:13:
> include/linux/eventfd.h:43:22: error: unknown type name 'eventfd_wake_count'
>    43 | DECLARE_PER_CPU(int, eventfd_wake_count);
>       |                      ^~~~~~~~~~~~~~~~~~
> include/linux/eventfd.h: In function 'eventfd_signal_count':
> include/linux/eventfd.h:47:9: error: implicit declaration of function 'this_cpu_read' [-Werror=implicit-function-declaration]
>    47 |  return this_cpu_read(eventfd_wake_count);
>       |         ^~~~~~~~~~~~~
> include/linux/eventfd.h:47:23: error: 'eventfd_wake_count' undeclared (first use in this function); did you mean 'eventfd_signal_count'?
>    47 |  return this_cpu_read(eventfd_wake_count);
>       |                       ^~~~~~~~~~~~~~~~~~
>       |                       eventfd_signal_count
> include/linux/eventfd.h:47:23: note: each undeclared identifier is reported only once for each function it appears in
> 
> Caused by commit
> 
>   9a9f718763cf ("eventfd: track eventfd_signal() recursion depth")
> 
> I have used the block tree from next-20200131 for today.

Doh, missed include, didn't fail on x86-64. Fixed it up, should work
tomorrow.

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=9yUA=3Y=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,
	SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable
	autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 748C7C35247
	for <linux-next@archiver.kernel.org>; Tue,  4 Feb 2020 00:26:10 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.kernel.org (Postfix) with ESMTP id 422C120720
	for <linux-next@archiver.kernel.org>; Tue,  4 Feb 2020 00:26:10 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="o5qaJ+vM"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1726930AbgBDA0E (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Mon, 3 Feb 2020 19:26:04 -0500
Received: from ozlabs.org ([203.11.71.1]:47245 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1726369AbgBDA0E (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Mon, 3 Feb 2020 19:26:04 -0500
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 48BQTh6513z9sVq;
        Tue,  4 Feb 2020 11:26:00 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;
        s=201702; t=1580775961;
        bh=IzeSB1JA+5+yWUhdAoaDKlStkEb4KtlAKroT6KOh75k=;
        h=Date:From:To:Cc:Subject:From;
        b=o5qaJ+vMM312813ssE2+dDh2yC0BlXuxGklvhDwqFI2ZUK9B2yokVbGNich+TOfOF
         sAejUy0yjn5JuVJXch4cNGWzVP2yApBWJWgPWXqoA7QhPyISUrt8Qmo/Cz8qTEKTxz
         cu7DEnpE6gIcIebkuKOa9tEflnkW/qI2qYQ30kQVuHEXnki60cWOihgEJ+Yf5diABN
         t6fzfARVcdI+a5WPD8psk6jM+pYCRxCbSuC16vrXupznayFcISDiQKg9broVlNEuu+
         cmstvHMX76Kz2sYnKUyEmDpCmpsBv5osrd2Gt6YHwndvpgwbnEQOZeBcfJ+4vGQxX0
         Cm+pTHdvBPzGQ==
Date:   Tue, 4 Feb 2020 11:25:55 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20200204112555.0f1b1490@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/b/Aj3Hdi.3EGAh74frIhOng";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/b/Aj3Hdi.3EGAh74frIhOng
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

In file included from include/linux/eventfd.h:15,
                 from drivers/vhost/vhost.c:13:
include/linux/percpu-defs.h:50:34: error: 'PER_CPU_BASE_SECTION' undeclared=
 here (not in a function); did you mean 'PER_CPU_FIRST_SECTION'?
   50 |  __percpu __attribute__((section(PER_CPU_BASE_SECTION sec))) \
      |                                  ^~~~~~~~~~~~~~~~~~~~
include/linux/percpu-defs.h:101:9: note: in expansion of macro '__PCPU_ATTR=
S'
  101 |  extern __PCPU_ATTRS(sec) __typeof__(type) name
      |         ^~~~~~~~~~~~
include/linux/percpu-defs.h:112:2: note: in expansion of macro 'DECLARE_PER=
_CPU_SECTION'
  112 |  DECLARE_PER_CPU_SECTION(type, name, "")
      |  ^~~~~~~~~~~~~~~~~~~~~~~
include/linux/eventfd.h:44:1: note: in expansion of macro 'DECLARE_PER_CPU'
   44 | DECLARE_PER_CPU(int, eventfd_wake_count);
      | ^~~~~~~~~~~~~~~
include/linux/percpu-defs.h:112:38: error: expected ')' before string const=
ant
  112 |  DECLARE_PER_CPU_SECTION(type, name, "")
      |                                      ^~
include/linux/percpu-defs.h:50:55: note: in definition of macro '__PCPU_ATT=
RS'
   50 |  __percpu __attribute__((section(PER_CPU_BASE_SECTION sec))) \
      |                                                       ^~~
include/linux/percpu-defs.h:112:2: note: in expansion of macro 'DECLARE_PER=
_CPU_SECTION'
  112 |  DECLARE_PER_CPU_SECTION(type, name, "")
      |  ^~~~~~~~~~~~~~~~~~~~~~~
include/linux/eventfd.h:44:1: note: in expansion of macro 'DECLARE_PER_CPU'
   44 | DECLARE_PER_CPU(int, eventfd_wake_count);
      | ^~~~~~~~~~~~~~~
include/linux/percpu-defs.h:50:59: error: expected identifier or '(' before=
 ')' token
   50 |  __percpu __attribute__((section(PER_CPU_BASE_SECTION sec))) \
      |                                                           ^
include/linux/percpu-defs.h:101:9: note: in expansion of macro '__PCPU_ATTR=
S'
  101 |  extern __PCPU_ATTRS(sec) __typeof__(type) name
      |         ^~~~~~~~~~~~
include/linux/percpu-defs.h:112:2: note: in expansion of macro 'DECLARE_PER=
_CPU_SECTION'
  112 |  DECLARE_PER_CPU_SECTION(type, name, "")
      |  ^~~~~~~~~~~~~~~~~~~~~~~
include/linux/eventfd.h:44:1: note: in expansion of macro 'DECLARE_PER_CPU'
   44 | DECLARE_PER_CPU(int, eventfd_wake_count);
      | ^~~~~~~~~~~~~~~
include/linux/eventfd.h: In function 'eventfd_signal_count':
include/linux/eventfd.h:48:23: error: 'eventfd_wake_count' undeclared (firs=
t use in this function); did you mean 'eventfd_signal_count'?
   48 |  return this_cpu_read(eventfd_wake_count);
      |                       ^~~~~~~~~~~~~~~~~~
include/linux/percpu-defs.h:319:9: note: in definition of macro '__pcpu_siz=
e_call_return'
  319 |  typeof(variable) pscr_ret__;     \
      |         ^~~~~~~~
include/linux/eventfd.h:48:9: note: in expansion of macro 'this_cpu_read'
   48 |  return this_cpu_read(eventfd_wake_count);
      |         ^~~~~~~~~~~~~
include/linux/eventfd.h:48:23: note: each undeclared identifier is reported=
 only once for each function it appears in
   48 |  return this_cpu_read(eventfd_wake_count);
      |                       ^~~~~~~~~~~~~~~~~~
include/linux/percpu-defs.h:319:9: note: in definition of macro '__pcpu_siz=
e_call_return'
  319 |  typeof(variable) pscr_ret__;     \
      |         ^~~~~~~~
include/linux/eventfd.h:48:9: note: in expansion of macro 'this_cpu_read'
   48 |  return this_cpu_read(eventfd_wake_count);
      |         ^~~~~~~~~~~~~
include/linux/percpu-defs.h:508:53: error: implicit declaration of function=
 'this_cpu_read_1'; did you mean 'this_cpu_read'? [-Werror=3Dimplicit-funct=
ion-declaration]
  508 | #define this_cpu_read(pcp)  __pcpu_size_call_return(this_cpu_read_,=
 pcp)
      |                                                     ^~~~~~~~~~~~~~
include/linux/percpu-defs.h:322:23: note: in definition of macro '__pcpu_si=
ze_call_return'
  322 |  case 1: pscr_ret__ =3D stem##1(variable); break;   \
      |                       ^~~~
include/linux/eventfd.h:48:9: note: in expansion of macro 'this_cpu_read'
   48 |  return this_cpu_read(eventfd_wake_count);
      |         ^~~~~~~~~~~~~
include/linux/percpu-defs.h:508:53: error: implicit declaration of function=
 'this_cpu_read_2'; did you mean 'this_cpu_read'? [-Werror=3Dimplicit-funct=
ion-declaration]
  508 | #define this_cpu_read(pcp)  __pcpu_size_call_return(this_cpu_read_,=
 pcp)
      |                                                     ^~~~~~~~~~~~~~
include/linux/percpu-defs.h:323:23: note: in definition of macro '__pcpu_si=
ze_call_return'
  323 |  case 2: pscr_ret__ =3D stem##2(variable); break;   \
      |                       ^~~~
include/linux/eventfd.h:48:9: note: in expansion of macro 'this_cpu_read'
   48 |  return this_cpu_read(eventfd_wake_count);
      |         ^~~~~~~~~~~~~
include/linux/percpu-defs.h:508:53: error: implicit declaration of function=
 'this_cpu_read_4'; did you mean 'this_cpu_read'? [-Werror=3Dimplicit-funct=
ion-declaration]
  508 | #define this_cpu_read(pcp)  __pcpu_size_call_return(this_cpu_read_,=
 pcp)
      |                                                     ^~~~~~~~~~~~~~
include/linux/percpu-defs.h:324:23: note: in definition of macro '__pcpu_si=
ze_call_return'
  324 |  case 4: pscr_ret__ =3D stem##4(variable); break;   \
      |                       ^~~~
include/linux/eventfd.h:48:9: note: in expansion of macro 'this_cpu_read'
   48 |  return this_cpu_read(eventfd_wake_count);
      |         ^~~~~~~~~~~~~
include/linux/percpu-defs.h:508:53: error: implicit declaration of function=
 'this_cpu_read_8'; did you mean 'this_cpu_read'? [-Werror=3Dimplicit-funct=
ion-declaration]
  508 | #define this_cpu_read(pcp)  __pcpu_size_call_return(this_cpu_read_,=
 pcp)
      |                                                     ^~~~~~~~~~~~~~
include/linux/percpu-defs.h:325:23: note: in definition of macro '__pcpu_si=
ze_call_return'
  325 |  case 8: pscr_ret__ =3D stem##8(variable); break;   \
      |                       ^~~~
include/linux/eventfd.h:48:9: note: in expansion of macro 'this_cpu_read'
   48 |  return this_cpu_read(eventfd_wake_count);
      |         ^~~~~~~~~~~~~

Caused by commit

  230665a4f25c ("eventfd: track eventfd_signal() recursion depth")

I have added the following patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 4 Feb 2020 11:20:12 +1100
Subject: [PATCH] eventfd: include percpu.h instead of percpu-defs.h

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 include/linux/eventfd.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/eventfd.h b/include/linux/eventfd.h
index 02e794816c12..224e8334042b 100644
--- a/include/linux/eventfd.h
+++ b/include/linux/eventfd.h
@@ -12,7 +12,7 @@
 #include <linux/fcntl.h>
 #include <linux/wait.h>
 #include <linux/err.h>
-#include <linux/percpu-defs.h>
+#include <linux/percpu.h>
=20
 /*
  * CAREFUL: Check include/uapi/asm-generic/fcntl.h when defining
--=20
2.24.1

--=20
Cheers,
Stephen Rothwell

--Sig_/b/Aj3Hdi.3EGAh74frIhOng
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl44uhMACgkQAVBC80lX
0GwzdAf/eU4AUYpoXQ41Sld5p8MfgaFsAu80RPyfs4OHZVDYpOmAuphYaxIekbuh
3BZs2jCGIZheOWa99f+pWme+ioNojbKwjdGcG7n0kzYVW3aFNYnEqWj23gsU0KMP
KEXXZqTH789vQq3Kn4laLAbH0iVkccjoIqaePidXs+AZtH7wdNMHriIQaYwVIgeq
zyVQeJ3lNB5CmbHE6FR7UsB71HF7v2QesoOjYzplsoGvUD4D2IF/4Ch2PvIjjpn1
rXcs2GDf2WEkQVEU0fUUbTemdfs4XYout4FMuiY7XTvsUkEeLg/1YpqFv04tzxhD
wfK4thaaXvYxDe3PqeP2K0f21gDVfA==
=/ysx
-----END PGP SIGNATURE-----

--Sig_/b/Aj3Hdi.3EGAh74frIhOng--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=9yUA=3Y=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,
	HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,
	USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 1D27CC35247
	for <linux-next@archiver.kernel.org>; Tue,  4 Feb 2020 00:28:39 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.kernel.org (Postfix) with ESMTP id CF62720732
	for <linux-next@archiver.kernel.org>; Tue,  4 Feb 2020 00:28:38 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel-dk.20150623.gappssmtp.com header.i=@kernel-dk.20150623.gappssmtp.com header.b="cPhAokTZ"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1726924AbgBDA2i (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Mon, 3 Feb 2020 19:28:38 -0500
Received: from mail-pg1-f196.google.com ([209.85.215.196]:33923 "EHLO
        mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1726834AbgBDA2i (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Mon, 3 Feb 2020 19:28:38 -0500
Received: by mail-pg1-f196.google.com with SMTP id j4so8751826pgi.1
        for <linux-next@vger.kernel.org>; Mon, 03 Feb 2020 16:28:38 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20150623.gappssmtp.com; s=20150623;
        h=subject:to:cc:references:from:message-id:date:user-agent
         :mime-version:in-reply-to:content-language:content-transfer-encoding;
        bh=vAhBNULLMh9XOTvTdD4G3os1qV1uXBckyQ+ldlyDpfU=;
        b=cPhAokTZ9kQlxDMTNKVdWb25SdZQI8UBNjRVl3ZSbzLxuAeFM6nmq3+LvH5C//TF72
         KnmhtKKTDOHe+qmvVNbgnDAq2Img5xAMjhjYPLWv+sLiUToMmBjdRXFhceXTZHrF2ZbY
         QAgYwXicceFkzvpgstFkXqu24LkxVf4tauXIa/0VhQSciw8bdJEQn5AkAx2RfGETBATL
         sTUJK4WpvdJJ+lHg8NEvi1TaCek47dl7BprkR5UbBzvJ0SEB9KQamt7iu86LmxJXmwnt
         /6C7kujevhxm1/7+UJB4473pqpmOeMG8UwOChUsbyZ0K12JZ/+PasYw2ROZpLYfmIVgv
         Wfnw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:subject:to:cc:references:from:message-id:date
         :user-agent:mime-version:in-reply-to:content-language
         :content-transfer-encoding;
        bh=vAhBNULLMh9XOTvTdD4G3os1qV1uXBckyQ+ldlyDpfU=;
        b=pTWPW/SYD1C/hBayGOeqqRAZ4O9WsbpZhvJGnvv3BgJrprAse+juKLNTWTdLwCb69s
         0eOdJsIKk8SS/aOeIz9sqXbUs8VSQpBb/eKa7QZs+UfkR/59oaHV8FUVsl/PT2hTfRuX
         Agj939XQe1nPRPZU+CsjIq/LjtNqNhHTpIPASCwOEEPOVpA7FcJUCjH9vAzBwpsFCoMB
         bLcbnhgpbalO13JQuyp2EeQayyUSNnCQi5joKKg/0o9mhHA1vg1UzaWKY5VL2WTP/6xJ
         YChacj/gIMV1PQhI/3Sjf+vruKVyEE4C0uZlozMfOiaDTprIBNwT/viTpTxEg/CIOAzn
         IKOg==
X-Gm-Message-State: APjAAAVXPU7lYG1NCmyUm9UzZy3ZwyLnZuCG1pWpV/ZKlmH+EErq5VDv
        ztDXtXjVTaT74pgCiAU4aiFBXih0iM8=
X-Google-Smtp-Source: APXvYqwUc9cZI7DMbGryZAH6VeR/EOia6vpZadPgVDPS+m5PjCNf3yY9tmflych0xth95EjpIgFBDg==
X-Received: by 2002:aa7:864b:: with SMTP id a11mr27630304pfo.175.1580776117631;
        Mon, 03 Feb 2020 16:28:37 -0800 (PST)
Received: from [192.168.1.188] ([66.219.217.145])
        by smtp.gmail.com with ESMTPSA id g13sm17438595pfo.169.2020.02.03.16.28.36
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Mon, 03 Feb 2020 16:28:37 -0800 (PST)
Subject: Re: linux-next: build failure after merge of the block tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
References: <20200204112555.0f1b1490@canb.auug.org.au>
From:   Jens Axboe <axboe@kernel.dk>
Message-ID: <eaad4710-872e-a0fd-33df-747d16c8c293@kernel.dk>
Date:   Mon, 3 Feb 2020 17:28:36 -0700
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.4.1
MIME-Version: 1.0
In-Reply-To: <20200204112555.0f1b1490@canb.auug.org.au>
Content-Type: text/plain; charset=windows-1252
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 2/3/20 5:25 PM, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the block tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:

[snip]

Thanks, apparently we needed two includes... I've folded in your
fix.

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=y4mM=45=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-0.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,
	SPF_PASS autolearn=no autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 13E46C2BAEE
	for <linux-next@archiver.kernel.org>; Thu, 12 Mar 2020 02:55:24 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.kernel.org (Postfix) with ESMTP id 2AE4E20754
	for <linux-next@archiver.kernel.org>; Thu, 12 Mar 2020 02:55:24 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="W2oLLbCL"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S2387453AbgCLCzX (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Wed, 11 Mar 2020 22:55:23 -0400
Received: from bilbo.ozlabs.org ([203.11.71.1]:35017 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S2387411AbgCLCzW (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Wed, 11 Mar 2020 22:55:22 -0400
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 48dD2v63WJz9sPR;
        Thu, 12 Mar 2020 13:55:19 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;
        s=201702; t=1583981720;
        bh=tNuE4pMHJsDFqfR4K0o7svKUZNv989qG/lN6kWNQRu8=;
        h=Date:From:To:Cc:Subject:From;
        b=W2oLLbCLWwKO2sfg7N1V+zy5c56izuOfv4giH8lq7rYps+l51UIEF2c0Z370d9+fM
         +Rc9H6p3uK9xZIDaFEcPVDulRxGlwb/LdAs9Le3AIQuYgns6pTSatWcXEoUcXoh2cz
         PhXOAfwXITJ0S5K9pnWTGrlgsAa0RiECj4pEpkhXXvofGK3TzODO6sGLoyNB3fAVub
         NAzHmTcen5cRxz55QMfeG2ajQ7zUubbLNi/fuMYF216ZjxasJfpXO0pCq5l9qib5Ig
         bC07TAq6xqvjBH5uQjYvzthUjC9vzUsYKXA3zJ+LnPlR+kkpCC9hMTUFpvDhvTswcD
         IOgzp8Zz/KQ+g==
Date:   Thu, 12 Mar 2020 13:54:57 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Matteo Croce <mcroce@redhat.com>,
        "Martin K. Petersen" <martin.petersen@oracle.com>,
        Coly Li <colyli@suse.de>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20200312135457.6891749e@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Diut.1vghMyFUg_7Vp5MzOl";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/Diut.1vghMyFUg_7Vp5MzOl
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:

In file included from fs/erofs/xattr.h:10,
                 from fs/erofs/inode.c:7:
fs/erofs/inode.c: In function 'erofs_read_inode':
fs/erofs/internal.h:197:31: error: 'PAGE_SECTORS_SHIFT' undeclared (first u=
se in this function); did you mean 'PA_SECTION_SHIFT'?
  197 | #define LOG_SECTORS_PER_BLOCK PAGE_SECTORS_SHIFT
      |                               ^~~~~~~~~~~~~~~~~~
fs/erofs/inode.c:122:30: note: in expansion of macro 'LOG_SECTORS_PER_BLOCK'
  122 |   inode->i_blocks =3D nblks << LOG_SECTORS_PER_BLOCK;
      |                              ^~~~~~~~~~~~~~~~~~~~~
fs/erofs/internal.h:197:31: note: each undeclared identifier is reported on=
ly once for each function it appears in
  197 | #define LOG_SECTORS_PER_BLOCK PAGE_SECTORS_SHIFT
      |                               ^~~~~~~~~~~~~~~~~~
fs/erofs/inode.c:122:30: note: in expansion of macro 'LOG_SECTORS_PER_BLOCK'
  122 |   inode->i_blocks =3D nblks << LOG_SECTORS_PER_BLOCK;
      |                              ^~~~~~~~~~~~~~~~~~~~~
In file included from fs/erofs/data.c:7:
fs/erofs/data.c: In function 'erofs_read_raw_page':
fs/erofs/internal.h:197:31: error: 'PAGE_SECTORS_SHIFT' undeclared (first u=
se in this function); did you mean 'PA_SECTION_SHIFT'?
  197 | #define LOG_SECTORS_PER_BLOCK PAGE_SECTORS_SHIFT
      |                               ^~~~~~~~~~~~~~~~~~
fs/erofs/data.c:226:4: note: in expansion of macro 'LOG_SECTORS_PER_BLOCK'
  226 |    LOG_SECTORS_PER_BLOCK;
      |    ^~~~~~~~~~~~~~~~~~~~~
fs/erofs/internal.h:197:31: note: each undeclared identifier is reported on=
ly once for each function it appears in
  197 | #define LOG_SECTORS_PER_BLOCK PAGE_SECTORS_SHIFT
      |                               ^~~~~~~~~~~~~~~~~~
fs/erofs/data.c:226:4: note: in expansion of macro 'LOG_SECTORS_PER_BLOCK'
  226 |    LOG_SECTORS_PER_BLOCK;
      |    ^~~~~~~~~~~~~~~~~~~~~
fs/erofs/data.c: In function 'erofs_bmap':
fs/erofs/internal.h:197:31: error: 'PAGE_SECTORS_SHIFT' undeclared (first u=
se in this function); did you mean 'PA_SECTION_SHIFT'?
  197 | #define LOG_SECTORS_PER_BLOCK PAGE_SECTORS_SHIFT
      |                               ^~~~~~~~~~~~~~~~~~
fs/erofs/data.c:351:16: note: in expansion of macro 'LOG_SECTORS_PER_BLOCK'
  351 |   if (block >> LOG_SECTORS_PER_BLOCK >=3D blks)
      |                ^~~~~~~~~~~~~~~~~~~~~

Caused by commit

  61c7d3d5e015 ("block: refactor duplicated macros")

I have used the block tree from next-20200311 for today.

--=20
Cheers,
Stephen Rothwell

--Sig_/Diut.1vghMyFUg_7Vp5MzOl
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl5ppIEACgkQAVBC80lX
0GwmQwf/VHjGajtoyfJ/T3FbAbp1hR0sNYropgqBbs5jJ4y5Zt7iZFibLfqEALv3
b0OCHo4r3lYUpLZ2cl+Yfp6ItoC6wHiYWh2WEQwZ/AmRNfxgfr1otGxYkvYSb7aq
tdwhvCkdxkg/fJYfo96ysPfVFS74X2c8+pCL/hi5UsRxF4jvZ9C71vtthO7PLaQe
B1iwxuPRXCy07MI+m68vM/ZIw/hW8/6aN6Xrk5QQJZHe+KyA52Dw3yg2/2rJowrY
xXlxsnX4rM8g6+x1tvBhp+8zXPc582TC+WoyPrkHr60+W0LPTSPmpH2tHPh2Q909
Hzi005MkFVxw3VfZxJCX+y7aPWT7QA==
=xl+s
-----END PGP SIGNATURE-----

--Sig_/Diut.1vghMyFUg_7Vp5MzOl--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=y4mM=45=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-0.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 796D2C4CECE
	for <linux-next@archiver.kernel.org>; Thu, 12 Mar 2020 10:13:36 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.kernel.org (Postfix) with ESMTP id 5A3D620716
	for <linux-next@archiver.kernel.org>; Thu, 12 Mar 2020 10:13:36 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="gm6FGjZs"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1726752AbgCLKNf (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Thu, 12 Mar 2020 06:13:35 -0400
Received: from us-smtp-1.mimecast.com ([207.211.31.81]:33835 "EHLO
        us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL)
        by vger.kernel.org with ESMTP id S1725978AbgCLKNd (ORCPT
        <rfc822;linux-next@vger.kernel.org>);
        Thu, 12 Mar 2020 06:13:33 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
        s=mimecast20190719; t=1584008012;
        h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
         to:to:cc:cc:mime-version:mime-version:content-type:content-type:
         in-reply-to:in-reply-to:references:references;
        bh=ejjCb6q7RFGex98QgUcKFdkFFuRhyJT6HKlrMbk1V7o=;
        b=gm6FGjZscELt61+WdcUcexOyYRglg6O1LyIhYMHaXiQzwuZ6FX2L/Br7kWTOMSwoE+sy8x
        994/vdtLnl19f3HlJXsT/bGrIrnuUP0by9x/D/yA4HYYLLKbnKRgxIZuKVr/NW8jN0bd6T
        QTxNkzUcA2lhbNwYbjRPAOkt6LM9TEI=
Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com
 [209.85.208.69]) (Using TLS) by relay.mimecast.com with ESMTP id
 us-mta-291-PPjdMHr9OgWNf8K8V24qZQ-1; Thu, 12 Mar 2020 06:13:28 -0400
X-MC-Unique: PPjdMHr9OgWNf8K8V24qZQ-1
Received: by mail-ed1-f69.google.com with SMTP id r30so4428670edi.9
        for <linux-next@vger.kernel.org>; Thu, 12 Mar 2020 03:13:28 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:mime-version:references:in-reply-to:from:date
         :message-id:subject:to:cc;
        bh=ejjCb6q7RFGex98QgUcKFdkFFuRhyJT6HKlrMbk1V7o=;
        b=qDDglIqU0qiVh0DQ2r5dpA2xLk9HCx31zMa9C6M9OOZokYEDtFqTEV1j3LUVg1YJs9
         +E+7g06rIzdt20C0cU0znOeYu0+g03XRcmXTqg9iwBdW9ASgavm73pTBvtfnk4Pgvn93
         KZnMtnnaIHkXHzlYN1+z1/JRuXtA/zklLpcER3Gb/EG6qxPrsu9zUW1/+uNh3hs3rQ3i
         F8otBqb81fsIGM/F9rRzWBNuUZo2FsQWMpqDe5m3xbqxRZDzqdgfVHSAjiaDnMF8BAo6
         UTR6WnbJqkWYS2HW/f6M+NuggGZLakV6S+D+IpRxDTY67kLWXx6RJdrQ/Qnh/pg8e2lx
         z2+A==
X-Gm-Message-State: ANhLgQ0M8Ije4Qp3F7Cii9kQ5N9q+M95aPew9X4Q/9PpI00gEbloJQP6
        aDd7iC2OCPEgT1imwSi260IXc/Z9WUEy1pleODNxL9bGZtjfFBzKYA4R6wWycsppNQEVbrX5N/5
        W9wKuA9ed+hVuSO3DCQe5xnO+gW8ryxp1V27jVA==
X-Received: by 2002:a17:906:52c9:: with SMTP id w9mr6171793ejn.70.1584008007514;
        Thu, 12 Mar 2020 03:13:27 -0700 (PDT)
X-Google-Smtp-Source: ADFU+vvpEEsl+KDmI2d5YoafqKJXuS1jFr+++rr3fY/v2Mogk34K+lvAjJl+ymSHsNqgBDuc+bVz8D/6j6haGwk/nZA=
X-Received: by 2002:a17:906:52c9:: with SMTP id w9mr6171780ejn.70.1584008007278;
 Thu, 12 Mar 2020 03:13:27 -0700 (PDT)
MIME-Version: 1.0
References: <20200312135457.6891749e@canb.auug.org.au>
In-Reply-To: <20200312135457.6891749e@canb.auug.org.au>
From:   Matteo Croce <mcroce@redhat.com>
Date:   Thu, 12 Mar 2020 11:12:51 +0100
Message-ID: <CAGnkfhztbmpP0=KT-iNbkUGKerhX04ENFsexA4_2cP_RUs0Png@mail.gmail.com>
Subject: Re: linux-next: build failure after merge of the block tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Jens Axboe <axboe@kernel.dk>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        "Martin K. Petersen" <martin.petersen@oracle.com>,
        Coly Li <colyli@suse.de>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On Thu, Mar 12, 2020 at 3:55 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> In file included from fs/erofs/xattr.h:10,
>                  from fs/erofs/inode.c:7:
> fs/erofs/inode.c: In function 'erofs_read_inode':
> fs/erofs/internal.h:197:31: error: 'PAGE_SECTORS_SHIFT' undeclared (first use in this function); did you mean 'PA_SECTION_SHIFT'?
>   197 | #define LOG_SECTORS_PER_BLOCK PAGE_SECTORS_SHIFT
>       |                               ^~~~~~~~~~~~~~~~~~
> fs/erofs/inode.c:122:30: note: in expansion of macro 'LOG_SECTORS_PER_BLOCK'
>   122 |   inode->i_blocks = nblks << LOG_SECTORS_PER_BLOCK;
>       |                              ^~~~~~~~~~~~~~~~~~~~~
> fs/erofs/internal.h:197:31: note: each undeclared identifier is reported only once for each function it appears in
>   197 | #define LOG_SECTORS_PER_BLOCK PAGE_SECTORS_SHIFT
>       |                               ^~~~~~~~~~~~~~~~~~
> fs/erofs/inode.c:122:30: note: in expansion of macro 'LOG_SECTORS_PER_BLOCK'
>   122 |   inode->i_blocks = nblks << LOG_SECTORS_PER_BLOCK;
>       |                              ^~~~~~~~~~~~~~~~~~~~~
> In file included from fs/erofs/data.c:7:
> fs/erofs/data.c: In function 'erofs_read_raw_page':
> fs/erofs/internal.h:197:31: error: 'PAGE_SECTORS_SHIFT' undeclared (first use in this function); did you mean 'PA_SECTION_SHIFT'?
>   197 | #define LOG_SECTORS_PER_BLOCK PAGE_SECTORS_SHIFT
>       |                               ^~~~~~~~~~~~~~~~~~
> fs/erofs/data.c:226:4: note: in expansion of macro 'LOG_SECTORS_PER_BLOCK'
>   226 |    LOG_SECTORS_PER_BLOCK;
>       |    ^~~~~~~~~~~~~~~~~~~~~
> fs/erofs/internal.h:197:31: note: each undeclared identifier is reported only once for each function it appears in
>   197 | #define LOG_SECTORS_PER_BLOCK PAGE_SECTORS_SHIFT
>       |                               ^~~~~~~~~~~~~~~~~~
> fs/erofs/data.c:226:4: note: in expansion of macro 'LOG_SECTORS_PER_BLOCK'
>   226 |    LOG_SECTORS_PER_BLOCK;
>       |    ^~~~~~~~~~~~~~~~~~~~~
> fs/erofs/data.c: In function 'erofs_bmap':
> fs/erofs/internal.h:197:31: error: 'PAGE_SECTORS_SHIFT' undeclared (first use in this function); did you mean 'PA_SECTION_SHIFT'?
>   197 | #define LOG_SECTORS_PER_BLOCK PAGE_SECTORS_SHIFT
>       |                               ^~~~~~~~~~~~~~~~~~
> fs/erofs/data.c:351:16: note: in expansion of macro 'LOG_SECTORS_PER_BLOCK'
>   351 |   if (block >> LOG_SECTORS_PER_BLOCK >= blks)
>       |                ^~~~~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
>   61c7d3d5e015 ("block: refactor duplicated macros")
>
> I have used the block tree from next-20200311 for today.
>
> --
> Cheers,
> Stephen Rothwell

Hi,

I was building a kernel without erofs. Just including
include/linux/blkdev.h will fix it, should I amend the
patch or send a fix?

Cheers,


--
Matteo Croce
per aspera ad upstream


From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=y4mM=45=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,
	HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,
	USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 7E8C7C2BB1D
	for <linux-next@archiver.kernel.org>; Thu, 12 Mar 2020 13:07:23 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.kernel.org (Postfix) with ESMTP id 4B92E2073E
	for <linux-next@archiver.kernel.org>; Thu, 12 Mar 2020 13:07:23 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel-dk.20150623.gappssmtp.com header.i=@kernel-dk.20150623.gappssmtp.com header.b="E+os28dR"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727196AbgCLNHW (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Thu, 12 Mar 2020 09:07:22 -0400
Received: from mail-io1-f68.google.com ([209.85.166.68]:37918 "EHLO
        mail-io1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1726194AbgCLNHW (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Thu, 12 Mar 2020 09:07:22 -0400
Received: by mail-io1-f68.google.com with SMTP id c25so4952213ioi.5
        for <linux-next@vger.kernel.org>; Thu, 12 Mar 2020 06:07:20 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20150623.gappssmtp.com; s=20150623;
        h=subject:to:cc:references:from:message-id:date:user-agent
         :mime-version:in-reply-to:content-language:content-transfer-encoding;
        bh=mUPVwLwbl+qGOG5kVPBNHG9adxeUh8JOP6RdVyzLB/I=;
        b=E+os28dRCW2/v1ohMkOsikz/8hYa7mpints86TuEemrPaYqU6XFgB2aiT2cRuJY/fb
         nWSpMZV5DwN1EbY83N0wRV2dr4MAFwDe3mDlmZpLuL3F1aEClDztKuAC8FExEsIW2QB2
         bTWsm3Zev9Fi9+yVqLGy6MqlDPxW8PksROSMyEp7FAj6gDltIaD9ndaQE+X805buhieW
         n57qicJpBwPBLvI8tHA7wVnhwRY8RfTWtsSIZgRa28eYts4CKOHUhgesF0EyDskOIXls
         benlZXj9g43xMpir3r2H0EHiCmH7U+NlkRhcYsmy8/hNWwdkY/z2/yp6k+ORpIkBiuVo
         eQJQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:subject:to:cc:references:from:message-id:date
         :user-agent:mime-version:in-reply-to:content-language
         :content-transfer-encoding;
        bh=mUPVwLwbl+qGOG5kVPBNHG9adxeUh8JOP6RdVyzLB/I=;
        b=nU3emKNN6ynP2C4zE+/CqNkj+4pP3Kx2QYLZW0oSS7vXrHbarFDMcfJNYKcUiJqwgj
         CwRFjPOR9KmhHFSp1ASpedeeo+pT8T07vW9KQ58yFi8g7xCZohDeL1AQF+eGWCrreJVm
         iqrkr/aA94P1UiTyNrpgGxrjMqRKAOCU7dsp4hZmlYKHuEg7zkJYxIoEsKcJFIR/rj2L
         v+vHEuJBZvcQNF7IJw1a+63OHObBC3gegWLqNIZPLaBhkMOHhkjbgdRdsRI6qtoTNymS
         ggrdpBjjRjiDiQCClmgTgUnuEWzIgjfAV0L9Jf4YAm+OjoNoB9B4odgppm9GR4ZBwrbJ
         PE/Q==
X-Gm-Message-State: ANhLgQ0CFe0mgJ9XlLCTQGD3G/uZTwy59EGSQhfh7FrrYGBydhtoO2CU
        obCNxiX2TtjauKKPFPwUCejmPPXYX8ISLg==
X-Google-Smtp-Source: ADFU+vt+fR4+B0ZCsiefMYIUrjnUtYF3XYvh9X83QTCCEfHOKk7fQk2p9JzHbDUoxsiC7hW/VvgQLA==
X-Received: by 2002:a5d:984e:: with SMTP id p14mr7593477ios.115.1584018439543;
        Thu, 12 Mar 2020 06:07:19 -0700 (PDT)
Received: from [192.168.1.159] ([65.144.74.34])
        by smtp.gmail.com with ESMTPSA id n18sm5383585ilq.38.2020.03.12.06.07.18
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Thu, 12 Mar 2020 06:07:19 -0700 (PDT)
Subject: Re: linux-next: build failure after merge of the block tree
To:     Matteo Croce <mcroce@redhat.com>,
        Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        "Martin K. Petersen" <martin.petersen@oracle.com>,
        Coly Li <colyli@suse.de>
References: <20200312135457.6891749e@canb.auug.org.au>
 <CAGnkfhztbmpP0=KT-iNbkUGKerhX04ENFsexA4_2cP_RUs0Png@mail.gmail.com>
From:   Jens Axboe <axboe@kernel.dk>
Message-ID: <baefdc44-d7cb-4e9e-c46c-b37012cfc40d@kernel.dk>
Date:   Thu, 12 Mar 2020 07:07:17 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.4.1
MIME-Version: 1.0
In-Reply-To: <CAGnkfhztbmpP0=KT-iNbkUGKerhX04ENFsexA4_2cP_RUs0Png@mail.gmail.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 3/12/20 4:12 AM, Matteo Croce wrote:
> On Thu, Mar 12, 2020 at 3:55 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Hi all,
>>
>> After merging the block tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> In file included from fs/erofs/xattr.h:10,
>>                  from fs/erofs/inode.c:7:
>> fs/erofs/inode.c: In function 'erofs_read_inode':
>> fs/erofs/internal.h:197:31: error: 'PAGE_SECTORS_SHIFT' undeclared (first use in this function); did you mean 'PA_SECTION_SHIFT'?
>>   197 | #define LOG_SECTORS_PER_BLOCK PAGE_SECTORS_SHIFT
>>       |                               ^~~~~~~~~~~~~~~~~~
>> fs/erofs/inode.c:122:30: note: in expansion of macro 'LOG_SECTORS_PER_BLOCK'
>>   122 |   inode->i_blocks = nblks << LOG_SECTORS_PER_BLOCK;
>>       |                              ^~~~~~~~~~~~~~~~~~~~~
>> fs/erofs/internal.h:197:31: note: each undeclared identifier is reported only once for each function it appears in
>>   197 | #define LOG_SECTORS_PER_BLOCK PAGE_SECTORS_SHIFT
>>       |                               ^~~~~~~~~~~~~~~~~~
>> fs/erofs/inode.c:122:30: note: in expansion of macro 'LOG_SECTORS_PER_BLOCK'
>>   122 |   inode->i_blocks = nblks << LOG_SECTORS_PER_BLOCK;
>>       |                              ^~~~~~~~~~~~~~~~~~~~~
>> In file included from fs/erofs/data.c:7:
>> fs/erofs/data.c: In function 'erofs_read_raw_page':
>> fs/erofs/internal.h:197:31: error: 'PAGE_SECTORS_SHIFT' undeclared (first use in this function); did you mean 'PA_SECTION_SHIFT'?
>>   197 | #define LOG_SECTORS_PER_BLOCK PAGE_SECTORS_SHIFT
>>       |                               ^~~~~~~~~~~~~~~~~~
>> fs/erofs/data.c:226:4: note: in expansion of macro 'LOG_SECTORS_PER_BLOCK'
>>   226 |    LOG_SECTORS_PER_BLOCK;
>>       |    ^~~~~~~~~~~~~~~~~~~~~
>> fs/erofs/internal.h:197:31: note: each undeclared identifier is reported only once for each function it appears in
>>   197 | #define LOG_SECTORS_PER_BLOCK PAGE_SECTORS_SHIFT
>>       |                               ^~~~~~~~~~~~~~~~~~
>> fs/erofs/data.c:226:4: note: in expansion of macro 'LOG_SECTORS_PER_BLOCK'
>>   226 |    LOG_SECTORS_PER_BLOCK;
>>       |    ^~~~~~~~~~~~~~~~~~~~~
>> fs/erofs/data.c: In function 'erofs_bmap':
>> fs/erofs/internal.h:197:31: error: 'PAGE_SECTORS_SHIFT' undeclared (first use in this function); did you mean 'PA_SECTION_SHIFT'?
>>   197 | #define LOG_SECTORS_PER_BLOCK PAGE_SECTORS_SHIFT
>>       |                               ^~~~~~~~~~~~~~~~~~
>> fs/erofs/data.c:351:16: note: in expansion of macro 'LOG_SECTORS_PER_BLOCK'
>>   351 |   if (block >> LOG_SECTORS_PER_BLOCK >= blks)
>>       |                ^~~~~~~~~~~~~~~~~~~~~
>>
>> Caused by commit
>>
>>   61c7d3d5e015 ("block: refactor duplicated macros")
>>
>> I have used the block tree from next-20200311 for today.
>>
>> --
>> Cheers,
>> Stephen Rothwell
> 
> Hi,
> 
> I was building a kernel without erofs. Just including
> include/linux/blkdev.h will fix it, should I amend the
> patch or send a fix?

I'll drop the patch. I was worried about the patch to begin with,
something like this really should be done through cocinelle so there's
less concern of a stupid mistake.

On top of that, somewhat miffed that you'd have a v3 of a patch, yet
haven't bothered to even _compile_ the parts you touch. That's
inexcusable.

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=y4mM=45=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-0.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 1221EC10DCE
	for <linux-next@archiver.kernel.org>; Thu, 12 Mar 2020 13:57:57 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.kernel.org (Postfix) with ESMTP id D18092071B
	for <linux-next@archiver.kernel.org>; Thu, 12 Mar 2020 13:57:56 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="b4cLlbH/"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727007AbgCLN54 (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Thu, 12 Mar 2020 09:57:56 -0400
Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:40672 "EHLO
        us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org
        with ESMTP id S1727315AbgCLN5z (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Thu, 12 Mar 2020 09:57:55 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
        s=mimecast20190719; t=1584021475;
        h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
         to:to:cc:cc:mime-version:mime-version:content-type:content-type:
         in-reply-to:in-reply-to:references:references;
        bh=zN4QMURyGwKx3cAee714OPFc7P9COefkkQIboHHsPiY=;
        b=b4cLlbH/M20XfCMS3zZGUNMS4cch7ECxEKdxOLqOCV2cCLBOO6LvgQf2pepl484leR7Xe6
        MLeYer4eNZ77PcgmHV1MUoTtM+er9IzSVkWJLUPDFC5NpcwzuXjaddqfHdFQi0qannk/GV
        VwlobabxTVebaswjCRdooKrZ9+junXc=
Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com
 [209.85.208.70]) (Using TLS) by relay.mimecast.com with ESMTP id
 us-mta-5-kY7sMz9yN42bDFN1g4Jzyw-1; Thu, 12 Mar 2020 09:57:53 -0400
X-MC-Unique: kY7sMz9yN42bDFN1g4Jzyw-1
Received: by mail-ed1-f70.google.com with SMTP id ce13so4888762edb.11
        for <linux-next@vger.kernel.org>; Thu, 12 Mar 2020 06:57:53 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:mime-version:references:in-reply-to:from:date
         :message-id:subject:to:cc;
        bh=zN4QMURyGwKx3cAee714OPFc7P9COefkkQIboHHsPiY=;
        b=uDRjLj+OGOvBvWTO6+SNY4rSrm1rE82/ez6nmdLHcQ4z1LIxayWOoRm1nZNt3GDxO7
         4sCwqlzvzLyRiPAByAeFgi/5YqIGW7hGmpEH18Sir+wPJamPew+3Q4O+ddYenmlVlyEC
         zK6rfPgLkzRFd4oHI11iYcgoBKq3DQOzfjDt1CVS2AFFY/5dulHIske9SbjyqXUSJBfc
         7tQ7NOT124CJDrsRueQhxaqZkn/ZI0Kibo3B/QFjCOJ8HAdhrmnpkhsBm89+kDQkaU1Z
         hbqhfDNOx13V+YQkQIMt4EU+u++BwyeEIPsqtE7FXedYNrDQ8Rd0z1dxN4+SZi0S/Aw+
         Q23w==
X-Gm-Message-State: ANhLgQ2b5AYeJz7Aw1XoDRtnby3LpM6vqsRCI+z219kUPBlYw3qOygQD
        rTJv3qPO1Y0VBV1LdQ9HOwfFTwWvJ+NUnlqt6K4auFhMgwX0NQeqxOpLYAUTIFmjM04IvSYpDna
        dVkkBLXCd01CNPIUJOGzo7D7TjWws/UHlUmxVew==
X-Received: by 2002:a17:906:5612:: with SMTP id f18mr6523580ejq.69.1584021471316;
        Thu, 12 Mar 2020 06:57:51 -0700 (PDT)
X-Google-Smtp-Source: ADFU+vsUtkqlkRV/GlGhEeYx9r/TPkyiRvoHliJiGVUd6Iiw+RSeU1vRnD18gxm/fh7ts3d837ziKCzb6VyrqOkaKx8=
X-Received: by 2002:a17:906:5612:: with SMTP id f18mr6523556ejq.69.1584021470975;
 Thu, 12 Mar 2020 06:57:50 -0700 (PDT)
MIME-Version: 1.0
References: <20200312135457.6891749e@canb.auug.org.au> <CAGnkfhztbmpP0=KT-iNbkUGKerhX04ENFsexA4_2cP_RUs0Png@mail.gmail.com>
 <baefdc44-d7cb-4e9e-c46c-b37012cfc40d@kernel.dk>
In-Reply-To: <baefdc44-d7cb-4e9e-c46c-b37012cfc40d@kernel.dk>
From:   Matteo Croce <mcroce@redhat.com>
Date:   Thu, 12 Mar 2020 14:57:14 +0100
Message-ID: <CAGnkfhwJR0CTy51o5F_YjgXCn7RK7=X1PcNbjhT-Xpw5zg3REg@mail.gmail.com>
Subject: Re: linux-next: build failure after merge of the block tree
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        "Martin K. Petersen" <martin.petersen@oracle.com>,
        Coly Li <colyli@suse.de>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On Thu, Mar 12, 2020 at 2:07 PM Jens Axboe <axboe@kernel.dk> wrote:
>
> On 3/12/20 4:12 AM, Matteo Croce wrote:
> > On Thu, Mar 12, 2020 at 3:55 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >>
> >> Hi all,
> >>
> >> After merging the block tree, today's linux-next build (x86_64
> >> allmodconfig) failed like this:
> >>
> >> In file included from fs/erofs/xattr.h:10,
> >>                  from fs/erofs/inode.c:7:
> >> fs/erofs/inode.c: In function 'erofs_read_inode':
> >> fs/erofs/internal.h:197:31: error: 'PAGE_SECTORS_SHIFT' undeclared (first use in this function); did you mean 'PA_SECTION_SHIFT'?
> >>   197 | #define LOG_SECTORS_PER_BLOCK PAGE_SECTORS_SHIFT
> >>       |                               ^~~~~~~~~~~~~~~~~~
> >> fs/erofs/inode.c:122:30: note: in expansion of macro 'LOG_SECTORS_PER_BLOCK'
> >>   122 |   inode->i_blocks = nblks << LOG_SECTORS_PER_BLOCK;
> >>       |                              ^~~~~~~~~~~~~~~~~~~~~
> >> fs/erofs/internal.h:197:31: note: each undeclared identifier is reported only once for each function it appears in
> >>   197 | #define LOG_SECTORS_PER_BLOCK PAGE_SECTORS_SHIFT
> >>       |                               ^~~~~~~~~~~~~~~~~~
> >> fs/erofs/inode.c:122:30: note: in expansion of macro 'LOG_SECTORS_PER_BLOCK'
> >>   122 |   inode->i_blocks = nblks << LOG_SECTORS_PER_BLOCK;
> >>       |                              ^~~~~~~~~~~~~~~~~~~~~
> >> In file included from fs/erofs/data.c:7:
> >> fs/erofs/data.c: In function 'erofs_read_raw_page':
> >> fs/erofs/internal.h:197:31: error: 'PAGE_SECTORS_SHIFT' undeclared (first use in this function); did you mean 'PA_SECTION_SHIFT'?
> >>   197 | #define LOG_SECTORS_PER_BLOCK PAGE_SECTORS_SHIFT
> >>       |                               ^~~~~~~~~~~~~~~~~~
> >> fs/erofs/data.c:226:4: note: in expansion of macro 'LOG_SECTORS_PER_BLOCK'
> >>   226 |    LOG_SECTORS_PER_BLOCK;
> >>       |    ^~~~~~~~~~~~~~~~~~~~~
> >> fs/erofs/internal.h:197:31: note: each undeclared identifier is reported only once for each function it appears in
> >>   197 | #define LOG_SECTORS_PER_BLOCK PAGE_SECTORS_SHIFT
> >>       |                               ^~~~~~~~~~~~~~~~~~
> >> fs/erofs/data.c:226:4: note: in expansion of macro 'LOG_SECTORS_PER_BLOCK'
> >>   226 |    LOG_SECTORS_PER_BLOCK;
> >>       |    ^~~~~~~~~~~~~~~~~~~~~
> >> fs/erofs/data.c: In function 'erofs_bmap':
> >> fs/erofs/internal.h:197:31: error: 'PAGE_SECTORS_SHIFT' undeclared (first use in this function); did you mean 'PA_SECTION_SHIFT'?
> >>   197 | #define LOG_SECTORS_PER_BLOCK PAGE_SECTORS_SHIFT
> >>       |                               ^~~~~~~~~~~~~~~~~~
> >> fs/erofs/data.c:351:16: note: in expansion of macro 'LOG_SECTORS_PER_BLOCK'
> >>   351 |   if (block >> LOG_SECTORS_PER_BLOCK >= blks)
> >>       |                ^~~~~~~~~~~~~~~~~~~~~
> >>
> >> Caused by commit
> >>
> >>   61c7d3d5e015 ("block: refactor duplicated macros")
> >>
> >> I have used the block tree from next-20200311 for today.
> >>
> >> --
> >> Cheers,
> >> Stephen Rothwell
> >
> > Hi,
> >
> > I was building a kernel without erofs. Just including
> > include/linux/blkdev.h will fix it, should I amend the
> > patch or send a fix?
>
> I'll drop the patch. I was worried about the patch to begin with,
> something like this really should be done through cocinelle so there's
> less concern of a stupid mistake.
>
> On top of that, somewhat miffed that you'd have a v3 of a patch, yet
> haven't bothered to even _compile_ the parts you touch. That's
> inexcusable.
>
> --
> Jens Axboe
>

I apologize, I was using a config with all in it but erofs, which was
moved from staging in 5.4:

$ grep -e BRD -e ZRAM -e DAX -e MD_RAID -e SDHCI= -e EXT2 -e SWAP -e
DM_RAID -e EROFS .config
CONFIG_SWAP=y
# CONFIG_MEMCG_SWAP is not set
CONFIG_ARCH_USE_BUILTIN_BSWAP=y
CONFIG_ARCH_WANTS_THP_SWAP=y
CONFIG_THP_SWAP=y
# CONFIG_FRONTSWAP is not set
CONFIG_MD_RAID0=y
CONFIG_MD_RAID1=y
CONFIG_MD_RAID10=y
CONFIG_MD_RAID456=y
CONFIG_DM_RAID=y
CONFIG_MMC_SDHCI=y
CONFIG_DAX=y
CONFIG_DEV_DAX=y
CONFIG_EXT2_FS=y
# CONFIG_EXT2_FS_XATTR is not set
# CONFIG_FS_DAX is not set
# CONFIG_EROFS_FS is not set

I'm running coccinelle with this change appended, and also an all allyesconfig

--- a/fs/erofs/internal.h
+++ b/fs/erofs/internal.h
@@ -16,6 +16,7 @@
 #include <linux/magic.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+#include <linux/blkdev.h>
 #include "erofs_fs.h"

Regards,
-- 
Matteo Croce
per aspera ad upstream


From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=l1oP=46=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,
	HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,
	URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 1CB14C2BB1D
	for <linux-next@archiver.kernel.org>; Fri, 13 Mar 2020 07:24:41 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.kernel.org (Postfix) with ESMTP id EAC9C2074F
	for <linux-next@archiver.kernel.org>; Fri, 13 Mar 2020 07:24:40 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=aol.com header.i=@aol.com header.b="eSAB+HVC"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1726464AbgCMHYk (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Fri, 13 Mar 2020 03:24:40 -0400
Received: from sonic308-54.consmr.mail.gq1.yahoo.com ([98.137.68.30]:37946
        "EHLO sonic308-54.consmr.mail.gq1.yahoo.com" rhost-flags-OK-OK-OK-OK)
        by vger.kernel.org with ESMTP id S1726486AbgCMHYk (ORCPT
        <rfc822;linux-next@vger.kernel.org>);
        Fri, 13 Mar 2020 03:24:40 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aol.com; s=a2048; t=1584084279; bh=jRfvjRpjOhYlkhIr0XQ/wEIX8N5uTxdHsF8eKRaYLFY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From:Subject; b=eSAB+HVCuchZHbSuzDoR3ZMtynd2DizQCgY6BHcIvT7kqePfaPKmuZTWOTsyz+hOAc1mZRzB4tzd8+Uto3Riedi6diBRBunqegfH30rISJSMWO6EB5mJmXzUYgblRYBtD4vhci5SUWuhbRCLIuZZalRUKAmSa30qs8zYobOg6bazarjssEK2QV7gU6lXgZdgxvUIUBAE2jToi222yevJjDZvWlZMvpgX5bviFAgZ8/cRyu7R1Tw9Kk3UKreX8hksZVihTLgqDaetG58Ryvh3L7zWDO0BgWAkLIXC02w59hvmlc5FyJVJzTwU5Alr91kOiaiP+zjrRcl1xfqh8W9MeA==
X-YMail-OSG: rpXF1YgVM1nVpHB76raampumoUS40UfNqAf575G9WIlMTZ290k7kACwYEzuYtSi
 qb4vKN.lWBvSdgds98YdS5_gw.iLrU3uCcwwWWUJLzxt6YWa83Ne0KLZFaEnjBBm_Xj0cMlubASO
 _Uz0F7Ld2CJSBCmhlSoHHkyetL3bgW8G.uUChMSHJGIGxieT6HffQBsXCr0ZMfbGeFy2hZV65niG
 QFPGgFW_ZkrHwO1mJIL8Iy9GlEcwJJ5y7gjf2WXSa807ALFbfhCavFeixRwwNXWRdeFok6NiQJmF
 lX_cQ1QnvVR7JszITcXT6yqS5kbCePFiWjaKbO_jME3B3MZ6NW.PB.wvt4ggMMP9N5dOduE.vRmR
 .AU50hfRgbWJ9RXlziVJ06kHWP6Xq8afNUwreVoNReyUSL7pPWEtOxiCbV6i8ECLNjpjt9pGlIVQ
 i0xD2V734Rc.TAb07P1Cq8hwylST.zCf5Jo8s7YxLj5mKtmhOeSv51sy._5E6r5sC6.jxLXLLkPu
 gHBsuT1FJFTNBy208yYkSzrR6g0ILxP.2qt1tL4Lkb2h7FSi5URL_ggyYnOE6hwG.POQlS25KVXp
 JDrFx5nFfJbs_Ru_4GrDWRgGTFUoyXWjrEE5UrekXFo_a.WnGbfQTirpTo4mvhbafZngJLhiTpqF
 TGVULdm2l1f1a1.qmuTT.myX8RYSxjibp.g8glNPq7nikGNYekIQLpi_OLtmrGWgWwn48rqoHzge
 _f.m82xe4a0KvkM1K7LV48eOXpT7zYCSIBaDeZ6_T3vemBeFNID2QQv4mn8pYq3DvfeaHE6IWy9D
 FJ9Flld4d4RrJqhkQP_hXIOHR8Gld200wYI.V0CBEbQYYiXmSx5S1wMJpz3Kqary9Ln9LW_sbkIh
 EC3hhgo76HZb6wGbQQQ9LCd4Xib5f3cNvwZ9z1GNoUnMKUnv4Dbv3iVJi_L5LeyfWgZiDXNMCEc.
 djbb9v9fcOr6qvYvIGAD3g.JX8odytpvP0y4phwX9kPGvHzF.yxif.QiTaDQvGOGl3pP5wTBYrS6
 vBg_vshxLtFBXd7WkJlEuSTvsN_bEXBvupbIQHE96DkwnKyD7_D6BPCBoUmnRSe7xcO8sDvU66wh
 i4a2YX3hFBdwx9ErMZ067USVf74nRozDvX48b3eOGxxplaDKikq5znvv23XeauD2lRpNSAv4T7Q7
 KiWstk38M_s34EYkuC0cOWxsq5ri9boaQS352KZ7JcxyWs08Uy_jy_S6nUjrjPpsZOjDDEPzUakh
 OXzqm9VtT3lnGEbEklnX9ipOpFTf2cU8wg_GNufHBa6OMD.EbZ8oIdyjXkVzlF_4mAKpW58_H59y
 BshpHLGbBcOrY3NeX.U0nfACLrdoCY_3Z0nvpCQTLs31h2VEGg2TF6UMu1gAbpG0FY1VFQYDXFXZ
 HuxHa.6vDSSrWuWeYft4fnkIllTs-
Received: from sonic.gate.mail.ne1.yahoo.com by sonic308.consmr.mail.gq1.yahoo.com with HTTP; Fri, 13 Mar 2020 07:24:39 +0000
Received: by smtp408.mail.ir2.yahoo.com (Oath Hermes SMTP Server) with ESMTPA ID 2fbb703a4b7fb9b494252cd558df4793;
          Fri, 13 Mar 2020 07:24:32 +0000 (UTC)
Date:   Fri, 13 Mar 2020 15:24:24 +0800
From:   Gao Xiang <hsiangkao@aol.com>
To:     Matteo Croce <mcroce@redhat.com>
Cc:     Jens Axboe <axboe@kernel.dk>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        "Martin K. Petersen" <martin.petersen@oracle.com>,
        Coly Li <colyli@suse.de>
Subject: Re: linux-next: build failure after merge of the block tree
Message-ID: <20200313072416.GA7651@hsiangkao-HP-ZHAN-66-Pro-G1>
References: <20200312135457.6891749e@canb.auug.org.au>
 <CAGnkfhztbmpP0=KT-iNbkUGKerhX04ENFsexA4_2cP_RUs0Png@mail.gmail.com>
 <baefdc44-d7cb-4e9e-c46c-b37012cfc40d@kernel.dk>
 <CAGnkfhwJR0CTy51o5F_YjgXCn7RK7=X1PcNbjhT-Xpw5zg3REg@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAGnkfhwJR0CTy51o5F_YjgXCn7RK7=X1PcNbjhT-Xpw5zg3REg@mail.gmail.com>
User-Agent: Mutt/1.10.1 (2018-07-13)
X-Mailer: WebService/1.1.15342 hermes Apache-HttpAsyncClient/4.1.4 (Java/1.8.0_241)
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

Hi Matteo,

On Thu, Mar 12, 2020 at 02:57:14PM +0100, Matteo Croce wrote:

[]

> 
> I'm running coccinelle with this change appended, and also an all allyesconfig

I just notice this topic as a part of regular mailing list reading...

I didn't see this change before, but it seems that's a trivial patch
at least from EROFS part.

And maybe yes, testing allyesconfig (or allmodconfig) in advance
is better just for the sake of dependency safety...

For the new following part, feel free to add my

Acked-by: Gao Xiang <gaoxiang25@huawei.com>

if it's of some use (If it's useless, please ignore the above words.)

Thanks,
Gao Xiang

> 
> --- a/fs/erofs/internal.h
> +++ b/fs/erofs/internal.h
> @@ -16,6 +16,7 @@
>  #include <linux/magic.h>
>  #include <linux/slab.h>
>  #include <linux/vmalloc.h>
> +#include <linux/blkdev.h>
>  #include "erofs_fs.h"
> 
> Regards,
> -- 
> Matteo Croce
> per aspera ad upstream
> 

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=suqh=6W=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,
	SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no
	version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 22653C38A2A
	for <linux-next@archiver.kernel.org>; Fri,  8 May 2020 05:28:39 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id A36A120735
	for <linux-next@archiver.kernel.org>; Fri,  8 May 2020 05:28:38 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="a66yDCyd"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1725897AbgEHF2i (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Fri, 8 May 2020 01:28:38 -0400
Received: from ozlabs.org ([203.11.71.1]:38673 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1725875AbgEHF2h (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Fri, 8 May 2020 01:28:37 -0400
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 49JJlR68jPz9sSk;
        Fri,  8 May 2020 15:28:35 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;
        s=201702; t=1588915716;
        bh=dQc43ogTgSb8NPgTzBm/D7KQjb0ycLXQsSyJCR301ZE=;
        h=Date:From:To:Cc:Subject:From;
        b=a66yDCydRrudsOc7jI5grRLoXAQgJfeNogtTdGSt9MPgHDe/yMxZenaYLHgONJRst
         deTnzErClPdLgUpbKMnO4m6acFr3GHX1rkZEZbWS+7gOnBj2tJUNFV7nlM9caxN/in
         7QkbqkJvOXXOX/MZJwFb3I8f8R2vMF5gP4FhggbrfRR3f4PV1PdQ2n6JLrRxvGjVoz
         jKTrdxPQYLW1V1XlRQbiUmwCUsrUmKfNHBvGHXZW0eE8ZqsxtU9V/2uXLqkSSxH3Sn
         +d9R/auMCClWXA6RnzFm+p3uLQpovFqDW2563I9sevgIvkAMTRh6D7wOUXESacjAL4
         AIfj6EUkwMV8A==
Date:   Fri, 8 May 2020 15:28:33 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Yufen Yu <yuyufen@huawei.com>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20200508152833.7e840076@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/hmqVjdEB8aFiTqUt97aKeGF";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/hmqVjdEB8aFiTqUt97aKeGF
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:

In file included from include/linux/kernel.h:15,
                 from include/linux/list.h:9,
                 from include/linux/module.h:12,
                 from block/bfq-iosched.c:116:
block/bfq-iosched.c: In function 'bfq_set_next_ioprio_data':
block/bfq-iosched.c:4980:5: error: implicit declaration of function 'bdi_de=
v_name'; did you mean 'blkg_dev_name'? [-Werror=3Dimplicit-function-declara=
tion]
 4980 |     bdi_dev_name(bfqq->bfqd->queue->backing_dev_info),
      |     ^~~~~~~~~~~~

Caused by commit

  0f6438fca125 ("bdi: use bdi_dev_name() to get device name")

I have applied the following patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 8 May 2020 15:23:50 +1000
Subject: [PATCH] bdi: bdi_dev_name() needs backing-dev.h

Fixes: 0f6438fca125 ("bdi: use bdi_dev_name() to get device name")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 block/bfq-iosched.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
index 4d4fe44a9eea..3d411716d7ee 100644
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -123,6 +123,7 @@
 #include <linux/ioprio.h>
 #include <linux/sbitmap.h>
 #include <linux/delay.h>
+#include <linux/backing-dev.h>
=20
 #include "blk.h"
 #include "blk-mq.h"
--=20
2.26.2

--=20
Cheers,
Stephen Rothwell

--Sig_/hmqVjdEB8aFiTqUt97aKeGF
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl607gEACgkQAVBC80lX
0GxdIwgAo98U9fDp3r4sqmd92szVIhSq/U9RqtWdGJg07HB7y6C9OAX2naNnyEDF
P79BpmaaoBkcmI+yc1VhhcNW7YRCUPOJ98PY92lqiWy9fw+oAJAwOUwTnFH70X9W
UMri2AqD6OCJma1Y7KTrLkJ3e1pLqMPBE/dAVq96KAuhNo+1XlpPOqL9+LxbHPm3
yPDt1mUUQFsMG78eyKmJoZEMPUXWV/f11LhfiG4li9CsPHpeWiSk171PT3WAtP3s
z3fq6DioiMCMSYk7dvEYzoRBCumpcTyVsslPwNJjbG2DCaPuYU73L7HGzYYqWVx2
JbgFMzt4gun5Ck3vdqqSPyuWqXBWkA==
=T44d
-----END PGP SIGNATURE-----

--Sig_/hmqVjdEB8aFiTqUt97aKeGF--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=suqh=6W=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.2 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,
	HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,
	USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id DDB92C47247
	for <linux-next@archiver.kernel.org>; Fri,  8 May 2020 15:48:22 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id BEE9A21841
	for <linux-next@archiver.kernel.org>; Fri,  8 May 2020 15:48:22 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel-dk.20150623.gappssmtp.com header.i=@kernel-dk.20150623.gappssmtp.com header.b="nKgQQLul"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727950AbgEHPsV (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Fri, 8 May 2020 11:48:21 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60330 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1726636AbgEHPsV (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Fri, 8 May 2020 11:48:21 -0400
Received: from mail-io1-xd43.google.com (mail-io1-xd43.google.com [IPv6:2607:f8b0:4864:20::d43])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 696F2C061A0C
        for <linux-next@vger.kernel.org>; Fri,  8 May 2020 08:48:20 -0700 (PDT)
Received: by mail-io1-xd43.google.com with SMTP id y26so2250369ioj.2
        for <linux-next@vger.kernel.org>; Fri, 08 May 2020 08:48:20 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20150623.gappssmtp.com; s=20150623;
        h=subject:to:cc:references:from:message-id:date:user-agent
         :mime-version:in-reply-to:content-language:content-transfer-encoding;
        bh=3Yj/VWnxuwVscg+Ow0r6vDZvPUhARSnW2zWYKwQkrpg=;
        b=nKgQQLullofD+pnK7JXZAiS3ATo+bky/bI583PXN4MSy5nR/lcFS/WE9d4TqceYGSQ
         vwbmFJK1RFdd+ZyTeBd6sDd8iRLQIMqly96rE/eg/e0dpib+xK5gonq1nzfqsGGTi3cj
         tkpSJL2Z2PLhFzmZFFpNEgCVbrhFAnGTyzU51KrzqgTiPDnLY7+kQfakiJmiXrUfDgTS
         +5Xs4mbMOrqTnCVycdLFSHSw4zJYElSY/m9hFi5B6bNn5zguLK55+PmXSC5cAvGgyv4A
         vzNQjvyo6QKDzwEOLYd0PoaDqP64eIZScGIGoC7O1djDtAgyqpfCAPzcQyCfQeY/7Cgp
         Ap7w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:subject:to:cc:references:from:message-id:date
         :user-agent:mime-version:in-reply-to:content-language
         :content-transfer-encoding;
        bh=3Yj/VWnxuwVscg+Ow0r6vDZvPUhARSnW2zWYKwQkrpg=;
        b=l65WTx9ep3T7ADDivSJK2gyiO1DpkNCLKwzddS5kNDyc5Kst0B02j6A9QjzZR8qlqY
         xn4FgJgyVGMuU1hsICQQCIJbjmCTVaYJhpZddtM/kxFdy37oJIFkExlUGAEK6bSeHu4a
         PiU6FxyweantT8vNEn1qnIe0WPmdIJJiavVA+p78TAgUV0Hlks32B6dh0erVU1ChqfP8
         UqMRouR/JKX6aIp8tTxgOmt/ObtPuA7olIEaUAEe+epUd86bZArBKb9kQ/ESKFBgOVv+
         +en1p4z29JMwwL0GxxeweyVj8VSJuvzdkWTPkFHVNryLuZuGr1/zqYwAyqBY6tAvX7JV
         r3tQ==
X-Gm-Message-State: AGi0PuairolXSe80tTjDnwJCbBxS8HX99t1ptxPkk6m7sMs4glLE74qc
        izTt/HElUODsAEJYLMFL3sH0VQ==
X-Google-Smtp-Source: APiQypIwoCayfrJ+5VgfQJCl3htbKpqdhZ706qrKsseh3LXYReBHJ75Lu/8AozesVU13tEq/sC961A==
X-Received: by 2002:a05:6602:2e0b:: with SMTP id o11mr3143321iow.94.1588952899835;
        Fri, 08 May 2020 08:48:19 -0700 (PDT)
Received: from [192.168.1.159] ([65.144.74.34])
        by smtp.gmail.com with ESMTPSA id y15sm942871ilg.21.2020.05.08.08.48.19
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Fri, 08 May 2020 08:48:19 -0700 (PDT)
Subject: Re: linux-next: build failure after merge of the block tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Yufen Yu <yuyufen@huawei.com>
References: <20200508152833.7e840076@canb.auug.org.au>
From:   Jens Axboe <axboe@kernel.dk>
Message-ID: <c2c822b9-c5d9-d145-9a05-25ed02f14ad0@kernel.dk>
Date:   Fri, 8 May 2020 09:48:18 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.7.0
MIME-Version: 1.0
In-Reply-To: <20200508152833.7e840076@canb.auug.org.au>
Content-Type: text/plain; charset=windows-1252
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 5/7/20 11:28 PM, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> In file included from include/linux/kernel.h:15,
>                  from include/linux/list.h:9,
>                  from include/linux/module.h:12,
>                  from block/bfq-iosched.c:116:
> block/bfq-iosched.c: In function 'bfq_set_next_ioprio_data':
> block/bfq-iosched.c:4980:5: error: implicit declaration of function 'bdi_dev_name'; did you mean 'blkg_dev_name'? [-Werror=implicit-function-declaration]
>  4980 |     bdi_dev_name(bfqq->bfqd->queue->backing_dev_info),
>       |     ^~~~~~~~~~~~
> 
> Caused by commit
> 
>   0f6438fca125 ("bdi: use bdi_dev_name() to get device name")
> 
> I have applied the following patch for today.

Thanks Stephen, I have added it.

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=UVIl=6Z=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,
	SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no
	version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id CF860C47255
	for <linux-next@archiver.kernel.org>; Mon, 11 May 2020 04:28:09 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 79796207FF
	for <linux-next@archiver.kernel.org>; Mon, 11 May 2020 04:28:09 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="GNPCe7UQ"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1725854AbgEKE2I (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Mon, 11 May 2020 00:28:08 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58910 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL)
        by vger.kernel.org with ESMTP id S1725840AbgEKE2I (ORCPT
        <rfc822;linux-next@vger.kernel.org>);
        Mon, 11 May 2020 00:28:08 -0400
Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B059C061A0C;
        Sun, 10 May 2020 21:28:08 -0700 (PDT)
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 49L7GC31HRz9sRf;
        Mon, 11 May 2020 14:28:02 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;
        s=201702; t=1589171285;
        bh=yBNPGPJvyInqkgXgt21qKXVWdj+gpMXL9nih+47URB0=;
        h=Date:From:To:Cc:Subject:From;
        b=GNPCe7UQlUM5gX6gOKIeWIGxZOjs3jiRQ2UKNgwTKgexZBSbcVDyPX5AgbrbUjuFH
         ND8iyjDf9/2aMvuvVsXidgPL2gTYM5S8Q8rwJNFEa35wjl85zDq9t7EnklShUx7x8y
         WmyQdNdArOV3BjbVD5sIgX2zVh99GaF8W9XeY/K7G3Gk+5P+4QWW0v79p2dJSPS6oz
         i9eneL0RBPWaW/nl2ZjsdYGPPbPaERo+FG27F8OFx+44DsjrLK3ta2+g3evf7OVupT
         GP9574bc4B2Yixt9zJ+O7Sb6ZfZHw8laU2dAVkl5EkU88XHA++dHmrjhbHEH+akEDk
         6el7KQjD8LE6w==
Date:   Mon, 11 May 2020 14:27:56 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Christoph Hellwig <hch@lst.de>, Jan Kara <jack@suse.cz>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Bart Van Assche <bvanassche@acm.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20200511142756.1b7ef706@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/R_hSrhV=U6k=lMgYIz9KNWa";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/R_hSrhV=U6k=lMgYIz9KNWa
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:

drivers/block/aoe/aoeblk.c: In function 'aoeblk_gdalloc':
drivers/block/aoe/aoeblk.c:410:21: error: 'struct backing_dev_info' has no =
member named 'name'
  410 |  q->backing_dev_info->name =3D "aoe";
      |                     ^~

Caused by commit

  1cd925d58385 ("bdi: remove the name field in struct backing_dev_info")

I applied the following patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 11 May 2020 14:19:30 +1000
Subject: [PATCH] bdi: fix up for "remove the name field in struct
 backing_dev_info"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/block/aoe/aoeblk.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index a27804d71e12..5ca7216e9e01 100644
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -407,7 +407,6 @@ aoeblk_gdalloc(void *vp)
 	WARN_ON(d->gd);
 	WARN_ON(d->flags & DEVFL_UP);
 	blk_queue_max_hw_sectors(q, BLK_DEF_MAX_SECTORS);
-	q->backing_dev_info->name =3D "aoe";
 	q->backing_dev_info->ra_pages =3D READ_AHEAD / PAGE_SIZE;
 	d->bufpool =3D mp;
 	d->blkq =3D gd->queue =3D q;
--=20
2.26.2

--=20
Cheers,
Stephen Rothwell

--Sig_/R_hSrhV=U6k=lMgYIz9KNWa
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl641EwACgkQAVBC80lX
0GyHDgf+KGWDOig/y4JfUGEQy6Zav4bXJrhAUxeBXnjvUVVfavUSE7TMimRQVeB2
23dP+BNMaM7acCqPuXgbkw2wPArY40/96sw+mA11p3ekvY0YXTKhaz8PRW6YobDY
QfAX/bz92cx1vH3+wmoCqi4shoY6iUzxf0gSYKQTW0a5EGFC+6msHk33jg5+zWOd
WygWr0amXgopn5ETKi/xV4CsFEgROPaILSJtgd4Yx90lI+5JVMj/MtzTSwlv3NPm
ZFKNZh+Dxlq3X6Z+ObMUTD7bCc/Ys/1IaWck43j7+iaLhiLGypniGB4zGw+uGj59
RZBDVxO/o2N65pUPIumVdZ1z9O9jeA==
=8OUk
-----END PGP SIGNATURE-----

--Sig_/R_hSrhV=U6k=lMgYIz9KNWa--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=UVIl=6Z=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.2 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,
	HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,
	USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 99FD6C47255
	for <linux-next@archiver.kernel.org>; Mon, 11 May 2020 15:06:46 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 7356320736
	for <linux-next@archiver.kernel.org>; Mon, 11 May 2020 15:06:46 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel-dk.20150623.gappssmtp.com header.i=@kernel-dk.20150623.gappssmtp.com header.b="OhYCfZln"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1729485AbgEKPGq (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Mon, 11 May 2020 11:06:46 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45342 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL)
        by vger.kernel.org with ESMTP id S1728638AbgEKPGp (ORCPT
        <rfc822;linux-next@vger.kernel.org>);
        Mon, 11 May 2020 11:06:45 -0400
Received: from mail-pj1-x1043.google.com (mail-pj1-x1043.google.com [IPv6:2607:f8b0:4864:20::1043])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 244A8C061A0E
        for <linux-next@vger.kernel.org>; Mon, 11 May 2020 08:06:44 -0700 (PDT)
Received: by mail-pj1-x1043.google.com with SMTP id ms17so7937461pjb.0
        for <linux-next@vger.kernel.org>; Mon, 11 May 2020 08:06:44 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20150623.gappssmtp.com; s=20150623;
        h=subject:to:cc:references:from:message-id:date:user-agent
         :mime-version:in-reply-to:content-language:content-transfer-encoding;
        bh=iT+tdYyqRDgvuVMsZ4OGGMIEPSaNDFZn3C4PrbVyaUU=;
        b=OhYCfZln8xjCNrXA2rqmTU75wVWvESusZ6O14FJhML3HhfyAo7i7ldiGJ31d4HVsNv
         r87WYM0ILVN5YPujOd+ZKcuR1R8IV9MQPiL/pz0J1GRV8Ph3SUHQQpmF8mo9EZWGPmQV
         QbP0EE4Wc4FVU/awlsy5wHBbjHR6UJa+NCBtbvE/6RpjHKdYVp/YvhahaEuOFpkXRXNz
         w8clS7Ftclvee0JAVShDNPtDgelorrDCSng1VrJKlVcveB1ZUWCk7hKpGXkelddoV8Y3
         ERutYhF4O4Ayp1f5xMqVinb43IrePCtwteTV/2VtvHbFha9CuOjk4Va4iFVSQGMJOGzR
         8OUA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:subject:to:cc:references:from:message-id:date
         :user-agent:mime-version:in-reply-to:content-language
         :content-transfer-encoding;
        bh=iT+tdYyqRDgvuVMsZ4OGGMIEPSaNDFZn3C4PrbVyaUU=;
        b=qpDg9WSkFfqM9uOeArXBr6woz/SDvWjk5UNwXVoPmGqnBBAzwErag4qLUg4tlFaT4d
         nBWjCQQcfmKCVwf0jhhCXkL6U+mINyW/Q0/CkDGw+2hGXStf0SAEnvocdlLGuR2hbMOn
         MPrRP9i25KJA3PhFnvISMwMyCcDtzOKupTe2zbOcNqF5eBY3d1avZeYpU4k186ySnBsQ
         fX3oQFRWDxpgjfZLiTvJ9egQXKGU5Tgmm1TCnZJdF5+d0MsdVyKYxaJpnS5nO61LZSZA
         3djmuc9EaZnRJDtzHJaZCgvPyyYxI0HgRTo3CcpJjZ/f/qf7UxLofZWE16WQlGv5zUbS
         YPWA==
X-Gm-Message-State: AGi0PuYelZICkt4PQb86bp0HXvd1WkpKa4i8fJdtduiH1VXJpcqCzNhk
        pytMmw8z/tPoJZe6/webFXesXA==
X-Google-Smtp-Source: APiQypLprHSOYRv+5f5iwrFg5ANEyN/qPI/31A2kr4NNqRxzEAw55I2AEq2Rnk8oRGwlwY3KhEaD9w==
X-Received: by 2002:a17:90a:f40f:: with SMTP id ch15mr19417129pjb.178.1589209603637;
        Mon, 11 May 2020 08:06:43 -0700 (PDT)
Received: from ?IPv6:2605:e000:100e:8c61:2dd6:4c58:486d:263e? ([2605:e000:100e:8c61:2dd6:4c58:486d:263e])
        by smtp.gmail.com with ESMTPSA id e10sm9395447pfl.195.2020.05.11.08.06.42
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Mon, 11 May 2020 08:06:42 -0700 (PDT)
Subject: Re: linux-next: build failure after merge of the block tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Christoph Hellwig <hch@lst.de>, Jan Kara <jack@suse.cz>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Bart Van Assche <bvanassche@acm.org>
References: <20200511142756.1b7ef706@canb.auug.org.au>
From:   Jens Axboe <axboe@kernel.dk>
Message-ID: <74a0ddc6-8637-c821-7128-4431261b0c12@kernel.dk>
Date:   Mon, 11 May 2020 09:06:41 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.7.0
MIME-Version: 1.0
In-Reply-To: <20200511142756.1b7ef706@canb.auug.org.au>
Content-Type: text/plain; charset=windows-1252
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 5/10/20 10:27 PM, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/block/aoe/aoeblk.c: In function 'aoeblk_gdalloc':
> drivers/block/aoe/aoeblk.c:410:21: error: 'struct backing_dev_info' has no member named 'name'
>   410 |  q->backing_dev_info->name = "aoe";
>       |                     ^~
> 
> Caused by commit
> 
>   1cd925d58385 ("bdi: remove the name field in struct backing_dev_info")

Gah, thanks Stephen. This series is looking less and less impressive,
fallout for both 5.7 and 5.8, in terms of build testing (none).

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=UVIl=6Z=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=no
	autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id DCFF7C47255
	for <linux-next@archiver.kernel.org>; Mon, 11 May 2020 15:17:53 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id C2B29206D5
	for <linux-next@archiver.kernel.org>; Mon, 11 May 2020 15:17:53 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728556AbgEKPRx (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Mon, 11 May 2020 11:17:53 -0400
Received: from verein.lst.de ([213.95.11.211]:36656 "EHLO verein.lst.de"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1726410AbgEKPRx (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Mon, 11 May 2020 11:17:53 -0400
Received: by verein.lst.de (Postfix, from userid 2407)
        id EB87768BFE; Mon, 11 May 2020 17:17:49 +0200 (CEST)
Date:   Mon, 11 May 2020 17:17:49 +0200
From:   Christoph Hellwig <hch@lst.de>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Christoph Hellwig <hch@lst.de>, Jan Kara <jack@suse.cz>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Bart Van Assche <bvanassche@acm.org>
Subject: Re: linux-next: build failure after merge of the block tree
Message-ID: <20200511151749.GA29295@lst.de>
References: <20200511142756.1b7ef706@canb.auug.org.au> <74a0ddc6-8637-c821-7128-4431261b0c12@kernel.dk>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <74a0ddc6-8637-c821-7128-4431261b0c12@kernel.dk>
User-Agent: Mutt/1.5.17 (2007-11-01)
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On Mon, May 11, 2020 at 09:06:41AM -0600, Jens Axboe wrote:
> On 5/10/20 10:27 PM, Stephen Rothwell wrote:
> > Hi all,
> > 
> > After merging the block tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > drivers/block/aoe/aoeblk.c: In function 'aoeblk_gdalloc':
> > drivers/block/aoe/aoeblk.c:410:21: error: 'struct backing_dev_info' has no member named 'name'
> >   410 |  q->backing_dev_info->name = "aoe";
> >       |                     ^~
> > 
> > Caused by commit
> > 
> >   1cd925d58385 ("bdi: remove the name field in struct backing_dev_info")
> 
> Gah, thanks Stephen. This series is looking less and less impressive,
> fallout for both 5.7 and 5.8, in terms of build testing (none).

And the sad part is that it has been sitting out there exposed to the
buildbot for weeks.  Sigh.

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=UVIl=6Z=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.2 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,
	HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,
	USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 151C1C54E8D
	for <linux-next@archiver.kernel.org>; Mon, 11 May 2020 15:28:30 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id E9106206D5
	for <linux-next@archiver.kernel.org>; Mon, 11 May 2020 15:28:29 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel-dk.20150623.gappssmtp.com header.i=@kernel-dk.20150623.gappssmtp.com header.b="WkH6I4MX"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1729811AbgEKP22 (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Mon, 11 May 2020 11:28:28 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48750 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL)
        by vger.kernel.org with ESMTP id S1726173AbgEKP21 (ORCPT
        <rfc822;linux-next@vger.kernel.org>);
        Mon, 11 May 2020 11:28:27 -0400
Received: from mail-pl1-x643.google.com (mail-pl1-x643.google.com [IPv6:2607:f8b0:4864:20::643])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 95502C061A0C
        for <linux-next@vger.kernel.org>; Mon, 11 May 2020 08:28:26 -0700 (PDT)
Received: by mail-pl1-x643.google.com with SMTP id t16so4078774plo.7
        for <linux-next@vger.kernel.org>; Mon, 11 May 2020 08:28:26 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20150623.gappssmtp.com; s=20150623;
        h=subject:to:cc:references:from:message-id:date:user-agent
         :mime-version:in-reply-to:content-language:content-transfer-encoding;
        bh=sU6/Ap1ejE6vLfYumdjwgHoh2Gd0VUeSHIvSaou8lbY=;
        b=WkH6I4MXB4YwCmjTwfC9sYSwt75AgJ+dqhYinn/45vvg7OHLvtfhBrLP8vBgxvEfhf
         tuLrZuazYIHXGpIvEqWrLUIGPplFgTesIX+FvwDKx8QYQgDfeDrTcEnYtl5snfKUqOb4
         +27RxtciXPvLwM6njCKRBqpsb9ffD0AsaauSLROIkeCDVEergyaYGoHx62blUScRW10A
         WzD0iLST7rdFLY0Yrkv2UHmXsqXXTdCcM9BuzAIwJ+6UvAVR+fTahnWlOVV9d6xc4o5g
         rUVVFlL36ApWWGBYHi2V6M/pmnu1jHrT7oEdXuL+bpCgMhMLchnz4SVJVfWUxlY7a2SJ
         /yhQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:subject:to:cc:references:from:message-id:date
         :user-agent:mime-version:in-reply-to:content-language
         :content-transfer-encoding;
        bh=sU6/Ap1ejE6vLfYumdjwgHoh2Gd0VUeSHIvSaou8lbY=;
        b=sL7e80LWypdzUG1JpaZXJwvfHG29xvF5q2NPeWLgWCjsM8zgdJb1QEvrrwPSKOs84c
         VcrvI4Wn3F8MfTwUBg38wtssDV/cxZh3jTYGgp+tkyjfKC/mOTUgTYCIoqVaguQKNOaV
         cBaFYKTFbtyhLEfFGX/yColktYR3k+iUg8eUuTuW8Yl1iSnwGCWb3VkzzqiX9gVF7LQf
         mLFjLv3JBsMZPlmO+Y4AH3aemfsDkEuyy4EBtmInv/GzI5DE5xe1e3xip7sCAUmcdB2b
         2eqyUu/m2FUbo8B3EnlAuyofAtGphNvxPs6p9ITEJEB2YnvImQ6+NG6FsMeAm54vBzhu
         UjCg==
X-Gm-Message-State: AGi0PuYzICSaWt+GIp8aa1dFRpNZ3EIEIR88y/YWtnAEjKeh04NF56dn
        LwwGOQc9L4D72nOoedjfT4QZGw==
X-Google-Smtp-Source: APiQypJ839OdEAVyroEW6HDW3lotjBrNt50hVB0MDGzX9Xkb+EriFzeC7/X6yWfaIRwuKdO5G74DuQ==
X-Received: by 2002:a17:902:bc86:: with SMTP id bb6mr15384209plb.243.1589210905743;
        Mon, 11 May 2020 08:28:25 -0700 (PDT)
Received: from ?IPv6:2605:e000:100e:8c61:2dd6:4c58:486d:263e? ([2605:e000:100e:8c61:2dd6:4c58:486d:263e])
        by smtp.gmail.com with ESMTPSA id y7sm9563873pfq.21.2020.05.11.08.28.24
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Mon, 11 May 2020 08:28:24 -0700 (PDT)
Subject: Re: linux-next: build failure after merge of the block tree
To:     Christoph Hellwig <hch@lst.de>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Jan Kara <jack@suse.cz>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Bart Van Assche <bvanassche@acm.org>
References: <20200511142756.1b7ef706@canb.auug.org.au>
 <74a0ddc6-8637-c821-7128-4431261b0c12@kernel.dk>
 <20200511151749.GA29295@lst.de>
From:   Jens Axboe <axboe@kernel.dk>
Message-ID: <20234840-c9f4-1e68-14f1-57b1ccd1c730@kernel.dk>
Date:   Mon, 11 May 2020 09:28:23 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.7.0
MIME-Version: 1.0
In-Reply-To: <20200511151749.GA29295@lst.de>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 5/11/20 9:17 AM, Christoph Hellwig wrote:
> On Mon, May 11, 2020 at 09:06:41AM -0600, Jens Axboe wrote:
>> On 5/10/20 10:27 PM, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> After merging the block tree, today's linux-next build (x86_64
>>> allmodconfig) failed like this:
>>>
>>> drivers/block/aoe/aoeblk.c: In function 'aoeblk_gdalloc':
>>> drivers/block/aoe/aoeblk.c:410:21: error: 'struct backing_dev_info' has no member named 'name'
>>>   410 |  q->backing_dev_info->name = "aoe";
>>>       |                     ^~
>>>
>>> Caused by commit
>>>
>>>   1cd925d58385 ("bdi: remove the name field in struct backing_dev_info")
>>
>> Gah, thanks Stephen. This series is looking less and less impressive,
>> fallout for both 5.7 and 5.8, in terms of build testing (none).
> 
> And the sad part is that it has been sitting out there exposed to the
> buildbot for weeks.  Sigh.

Indeed, I do wish the build bot was a bit more expedient (as in 24h turn
around would be good), and reliable. Seems hit or miss, don't fully trust
it and this series is an example of why.

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=h0B2=64=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,
	SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham
	autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 207E0C433E0
	for <linux-next@archiver.kernel.org>; Thu, 14 May 2020 08:57:48 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id C9602206B6
	for <linux-next@archiver.kernel.org>; Thu, 14 May 2020 08:57:47 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="SxFDJft/"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1726169AbgENI5r (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Thu, 14 May 2020 04:57:47 -0400
Received: from bilbo.ozlabs.org ([203.11.71.1]:59711 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1726087AbgENI5r (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Thu, 14 May 2020 04:57:47 -0400
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 49N560671bz9sV7;
        Thu, 14 May 2020 18:57:44 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;
        s=201702; t=1589446665;
        bh=f+jbpOYr2BueXAYyks2x++b+r5NDkVQ3+2C6KvwHuEQ=;
        h=Date:From:To:Cc:Subject:From;
        b=SxFDJft/s9tO2tETt6wEbJd+SnjsIdmEGFey6c12jyhqqV2INDAqHXRx1tvjTwVMH
         5WHJM9R3ESyou1wGsFjpHJA2nf0nZE732gM/TihvW71OJW2jrJqXBWWE56hXQJUoIL
         JVOzVmI+Aaft3IBeH91n4dzQft2ElOjzczttHQGfcae4ySKtumiZ45amZSVFSq7RFc
         BXsiodZUQ1C5an0B5q2j9ulgzvnFC3UKc56uIaT7hb+Ghh+uYZe/2sqKDYEqatkRa4
         IhSDAV3rLsdpAX+SFjedBHGTNWej++Iv6sgmVSakxmIMSl2hx70ZXpQQwiI9JNBv72
         eAL74YrQI561Q==
Date:   Thu, 14 May 2020 18:57:37 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Ming Lei <ming.lei@redhat.com>,
        Bart Van Assche <bvanassche@acm.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20200514185737.701b40dd@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/.ExBTlx8YTB9nd1mswu28VR";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/.ExBTlx8YTB9nd1mswu28VR
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
allnoconfig) failed like this:

In file included from include/linux/blk-cgroup.h:23,
                 from include/linux/writeback.h:14,
                 from include/linux/memcontrol.h:22,
                 from include/linux/swap.h:9,
                 from include/linux/suspend.h:5,
                 from arch/x86/kernel/asm-offsets.c:13:
include/linux/blkdev.h: In function 'blk_io_schedule':
include/linux/blkdev.h:1857:26: error: 'sysctl_hung_task_timeout_secs' unde=
clared (first use in this function)
 1857 |  unsigned long timeout =3D sysctl_hung_task_timeout_secs * HZ / 2;
      |                          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  e6249cdd46e4 ("block: add blk_io_schedule() for avoiding task hung in syn=
c dio")

linux/sched/sysctl.h was not included since CONFIG_BLOCK is not defined.
I have applied the following patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 14 May 2020 18:48:32 +1000
Subject: [PATCH] fix for "block: add blk_io_schedule() for avoiding task hu=
ng in sync dio"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 include/linux/blkdev.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 5360696d85ff..bf99a723673b 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -4,6 +4,7 @@
=20
 #include <linux/sched.h>
 #include <linux/sched/clock.h>
+#include <linux/sched/sysctl.h>
=20
 #ifdef CONFIG_BLOCK
=20
@@ -27,7 +28,6 @@
 #include <linux/percpu-refcount.h>
 #include <linux/scatterlist.h>
 #include <linux/blkzoned.h>
-#include <linux/sched/sysctl.h>
=20
 struct module;
 struct scsi_ioctl_command;
--=20
2.26.2

--=20
Cheers,
Stephen Rothwell

--Sig_/.ExBTlx8YTB9nd1mswu28VR
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl69CAEACgkQAVBC80lX
0Gy03ggApI7/YToKbRoFj73vKJWy+xfQg+3/ObkRZyoNfg1qOSEmhlRSpkRtDPDM
mLM11SFYFbq+L67PacpAJcuaVykmqTZ3zkuw6A9RxgLQ9tqhF2eqAIwcWgv+OLj5
AJ5SyV7F9e3MqsvJfqob6qw/g1c7k8Qm5u0mGqBbUxG7e6D0SR6H+LKwKwKtVDG1
pXtgNO53RwkPCid6F+ErviOffWi+cE2/ydegrfJYfZTMUga7CJynFcOtnDiQ/B1K
mTClnpQH12Q7ScaY12WuWpDFwbLqz+rmJZBHaYHMfx8XGxZcTiOTDnW6hs69ULBm
eYzMEw1opB1tTxwdWCcinYpmCrQd/Q==
=vw1D
-----END PGP SIGNATURE-----

--Sig_/.ExBTlx8YTB9nd1mswu28VR--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=h0B2=64=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.2 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,
	HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,
	USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 985EEC433E0
	for <linux-next@archiver.kernel.org>; Thu, 14 May 2020 14:07:02 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 7606620728
	for <linux-next@archiver.kernel.org>; Thu, 14 May 2020 14:07:02 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel-dk.20150623.gappssmtp.com header.i=@kernel-dk.20150623.gappssmtp.com header.b="kN0PmvDM"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727050AbgENOHA (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Thu, 14 May 2020 10:07:00 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60088 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL)
        by vger.kernel.org with ESMTP id S1726197AbgENOG7 (ORCPT
        <rfc822;linux-next@vger.kernel.org>);
        Thu, 14 May 2020 10:06:59 -0400
Received: from mail-pf1-x442.google.com (mail-pf1-x442.google.com [IPv6:2607:f8b0:4864:20::442])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C0ABC061A0E
        for <linux-next@vger.kernel.org>; Thu, 14 May 2020 07:06:59 -0700 (PDT)
Received: by mail-pf1-x442.google.com with SMTP id n18so1365271pfa.2
        for <linux-next@vger.kernel.org>; Thu, 14 May 2020 07:06:59 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20150623.gappssmtp.com; s=20150623;
        h=subject:to:cc:references:from:message-id:date:user-agent
         :mime-version:in-reply-to:content-language:content-transfer-encoding;
        bh=Q6a5nhhtlwC3I5RzWhkpkIibe9GsSPKfDndfMfvdcTU=;
        b=kN0PmvDMVtljFEv8ZZiWnVY21ZcFZaTdWSR1rQHlizhryKZoT6g9M4GrlsOwKVeqJq
         ntH4vWDYpi91xUTxHfxrLJIJzhXSE+RLmZiXwTZ9Owk/SsspqFBnyMD8YCSLlgaSkK46
         eF0z/hFDoYIVfwK9h6M5JYCKKus1Bv7kWrO2ZNsAMHINFO3qgY1FwSzhCeiVmBwXTGNg
         cHPze5zERq3uZ3+sW6yXhCusceImIEWPrA6W5Dzj8mfjw3giik3sNdVcQCk0KFgbY77k
         eeStU+Y2el2jtJs633pADino/pFOdlt+CZ8sNVncMD6jYCxLRfcV+UUaD0iyePkQydpt
         hnbg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:subject:to:cc:references:from:message-id:date
         :user-agent:mime-version:in-reply-to:content-language
         :content-transfer-encoding;
        bh=Q6a5nhhtlwC3I5RzWhkpkIibe9GsSPKfDndfMfvdcTU=;
        b=aA+AO4AkoJDEYDsZlP/+utuSN9HExRUdZHPtfoYqZLCsq8HDLo4qm/qjvU19FgZ6Eu
         J4odUMZcn0YhwJGs/vENZg1iiud85Zc4FkfitzTG3DWKGUss9c538z5rg5IFvDnhyhqP
         19tk9m0NEVHDQV8vKcpjTe2w4op0b8T+vo+HMIxTgU6MoVcq7/0kLqCPHCfLKqN72VD1
         ue6mlX8Kg5tLrgs5K0Jz4FBYx7ggIXOJzE3/kvOPsP/qN+vfsqibGM1XQBX/HzuiK+Cs
         tvmjC7Gb+S5FqSo/bnxRwETDFCujlCkN+Aoxv4fUzzhg0KLsTrbycjK/GpDRGw9SRAM4
         4+tw==
X-Gm-Message-State: AOAM533mlI20OlC+6WN2PGckVzVipnmgkHKBs+6TryHAk++Hvg0egKZ5
        WzD5aWcWud3BFQB2I/Wi8mjZ3LxE4hw=
X-Google-Smtp-Source: ABdhPJznyMcs2R1vd0kHKH4cBcFVIp8kNX0MWajfDDv2D4gE7p+9fLnw22AzwjVOeCG7+qIXLh5N4w==
X-Received: by 2002:a63:5225:: with SMTP id g37mr4043696pgb.230.1589465219177;
        Thu, 14 May 2020 07:06:59 -0700 (PDT)
Received: from ?IPv6:2605:e000:100e:8c61:a45a:373e:9b20:39ea? ([2605:e000:100e:8c61:a45a:373e:9b20:39ea])
        by smtp.gmail.com with ESMTPSA id g16sm2450843pfh.217.2020.05.14.07.06.56
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Thu, 14 May 2020 07:06:57 -0700 (PDT)
Subject: Re: linux-next: build failure after merge of the block tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Ming Lei <ming.lei@redhat.com>,
        Bart Van Assche <bvanassche@acm.org>
References: <20200514185737.701b40dd@canb.auug.org.au>
From:   Jens Axboe <axboe@kernel.dk>
Message-ID: <b2fafdce-2616-cad4-79c8-c8186e4e0272@kernel.dk>
Date:   Thu, 14 May 2020 08:06:55 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.7.0
MIME-Version: 1.0
In-Reply-To: <20200514185737.701b40dd@canb.auug.org.au>
Content-Type: text/plain; charset=windows-1252
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 5/14/20 2:57 AM, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the block tree, today's linux-next build (x86_64
> allnoconfig) failed like this:
> 
> In file included from include/linux/blk-cgroup.h:23,
>                  from include/linux/writeback.h:14,
>                  from include/linux/memcontrol.h:22,
>                  from include/linux/swap.h:9,
>                  from include/linux/suspend.h:5,
>                  from arch/x86/kernel/asm-offsets.c:13:
> include/linux/blkdev.h: In function 'blk_io_schedule':
> include/linux/blkdev.h:1857:26: error: 'sysctl_hung_task_timeout_secs' undeclared (first use in this function)
>  1857 |  unsigned long timeout = sysctl_hung_task_timeout_secs * HZ / 2;
>       |                          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> 
> Caused by commit
> 
>   e6249cdd46e4 ("block: add blk_io_schedule() for avoiding task hung in sync dio")
> 
> linux/sched/sysctl.h was not included since CONFIG_BLOCK is not defined.
> I have applied the following patch for today.

Sorry about that, it's fixed in the current tree.

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=TyMk=7E=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,
	SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no
	version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 347C0C433E0
	for <linux-next@archiver.kernel.org>; Fri, 22 May 2020 11:32:08 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id B363F206C3
	for <linux-next@archiver.kernel.org>; Fri, 22 May 2020 11:32:07 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="UELXjqvx"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1729409AbgEVLcH (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Fri, 22 May 2020 07:32:07 -0400
Received: from ozlabs.org ([203.11.71.1]:43707 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1728281AbgEVLcH (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Fri, 22 May 2020 07:32:07 -0400
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 49T48N6qQhz9sSW;
        Fri, 22 May 2020 21:32:04 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;
        s=201702; t=1590147125;
        bh=urgcefr/YlkmkNAFUGmo68RW1ttwHwPL72RDkV/bRug=;
        h=Date:From:To:Cc:Subject:From;
        b=UELXjqvxyjEzBQEmziHCTCjvFZZXw3i1dyiYfnwYTU7HH0c+SjOWJxFKvAthJAIRR
         sDRhEy+YQ+7+01HOZb8wvlKoWxN7BdV7tR/hTZ102qbSTzMO9xvKL/kKoBFY/y6ObH
         J64pNUcsOsz8y0tGvCUpwZiql4kXz0x5O8fTFBa32qTpmHkM3cdO+l85CvmigQRTop
         VYOgfrjKW3qDBBeKAbfN521oG9U0s1wa1NVjj2CcFC3giyyrTZyAjtQj9iGLHfzU0I
         Pz2PAv+PJYMKhT0QC/qIUhmWx6ungZxtPiZwImGYIlCOu3UJ+JvjsOkNiEgL6D+q8M
         Yhqxv1qoP4muw==
Date:   Fri, 22 May 2020 21:32:02 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Christoph Hellwig <hch@lst.de>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20200522213202.38ebe825@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/UtxBkTtJCi6+=X/EUuCRSf3";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/UtxBkTtJCi6+=X/EUuCRSf3
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
allnoconfig) failed like this:

fs/libfs.c: In function 'generic_file_fsync':
fs/libfs.c:1116:9: error: too few arguments to function 'blkdev_issue_flush'
 1116 |  return blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL);
      |         ^~~~~~~~~~~~~~~~~~
In file included from fs/libfs.c:7:
include/linux/blkdev.h:1875:19: note: declared here
 1875 | static inline int blkdev_issue_flush(struct block_device *bdev, gfp=
_t gfp_mask,
      |                   ^~~~~~~~~~~~~~~~~~

Caused by commit

  c64644ce363b ("block: remove the error_sector argument to blkdev_issue_fl=
ush")

I have applied the following patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 22 May 2020 21:21:54 +1000
Subject: [PATCH] block: fix for "remove the error_sector argument to
 blkdev_issue_flush"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 include/linux/blkdev.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 95f1e6db31e2..7d10f4e63232 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1872,8 +1872,7 @@ static inline bool blk_needs_flush_plug(struct task_s=
truct *tsk)
 	return false;
 }
=20
-static inline int blkdev_issue_flush(struct block_device *bdev, gfp_t gfp_=
mask,
-				     sector_t *error_sector)
+static inline int blkdev_issue_flush(struct block_device *bdev, gfp_t gfp_=
mask)
 {
 	return 0;
 }
--=20
2.26.2

--=20
Cheers,
Stephen Rothwell

--Sig_/UtxBkTtJCi6+=X/EUuCRSf3
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl7HuDMACgkQAVBC80lX
0GytSwf/alxMhLVCRbD9KdpHpaYkX6KYezj3KR2eLqmgHHoSwhzMcORdLy6C8HHE
kDCggkIeBNgKN4AFUUFg5k6koY/CPEoQVV0hWwrb6hrkLjYnEFuXXq1lVTLbAWzE
0mBRhxS6EIZffZ+JdRQrGz32b3asxOLQXMObLSm4y0qAGYZOWeCRMSUceUj3ZL6p
nEMprJflPODk6jA1KmEcuwN3fnkphi5EOhsoscZhlP0cvQokC2Ug9us+Udkkbzj/
dq/sE1Hx7mk3bKm6Vbyi9PbveEFo1Fzy8j3bPCsNYLd2kRoTI+z3Wny/I3rc3ZV6
DgyMoFSPbCU4XxCZunKHW0yzWTFjBw==
=E/X4
-----END PGP SIGNATURE-----

--Sig_/UtxBkTtJCi6+=X/EUuCRSf3--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=TyMk=7E=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,
	HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,
	USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 7FA0CC433E0
	for <linux-next@archiver.kernel.org>; Fri, 22 May 2020 14:46:31 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 5910C2053B
	for <linux-next@archiver.kernel.org>; Fri, 22 May 2020 14:46:31 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel-dk.20150623.gappssmtp.com header.i=@kernel-dk.20150623.gappssmtp.com header.b="lxlss0Zn"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1730490AbgEVOq2 (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Fri, 22 May 2020 10:46:28 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56408 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1730119AbgEVOqZ (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Fri, 22 May 2020 10:46:25 -0400
Received: from mail-pg1-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5AB1CC05BD43
        for <linux-next@vger.kernel.org>; Fri, 22 May 2020 07:46:25 -0700 (PDT)
Received: by mail-pg1-x544.google.com with SMTP id f4so5081573pgi.10
        for <linux-next@vger.kernel.org>; Fri, 22 May 2020 07:46:25 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20150623.gappssmtp.com; s=20150623;
        h=subject:to:cc:references:from:message-id:date:user-agent
         :mime-version:in-reply-to:content-language:content-transfer-encoding;
        bh=PP3NlRQyU9hVtOdAQG1RX9CTlatqPKoXALMeR0iOkSU=;
        b=lxlss0ZnfC4Z/AbhW67TOHU6mhwsl1MwL6RchBIVSr/q+I2CV8QoajVGUif9/k/4sk
         U/t7cSReHxUX/OESlDS5lVyoJVYFtCzkNBSJ8iskjmqqfmuJpp0LSgBFO8YmuJiE4qqu
         PZsB+Gj7MFYbLow6WLjiKlbkYZJt9cXBYrFOFdV+7HT7H4tyKre3aZalNxIF1wbK6SWo
         2RQO994KR8W0zBxufyyT3KUGbdwoMkvZoYYcePbIhBHPsqbUIL0wWNNbPf+KWy2ix2WO
         JSGx86NTWKao51q6tFo82+UH2Hta73TUuqGLCATWgF1MyeynsJfhdtlWnON4Pvs+Lbnh
         TNDg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:subject:to:cc:references:from:message-id:date
         :user-agent:mime-version:in-reply-to:content-language
         :content-transfer-encoding;
        bh=PP3NlRQyU9hVtOdAQG1RX9CTlatqPKoXALMeR0iOkSU=;
        b=IgWLjUVIWvmPdJd4yunLkxMKJG0hN1DcnvJ6R9iUFxzZv96CgKDlF6YQuMz7VIoNj2
         I9QbxdLKXglNGNYNXqKul/7/bhjMMks/ywrOiDe9vOpyi5aFVWFDSIQAlYE/GHXEVYb4
         dqnoLdy7DrOfwYdZtw55x+nrELvmomaFMH28n7lVGUCbGQ9r2KJAk9ZdjamUSP2vyRe4
         zgMLHg8HPeqch9ttSztG59G79DqKsspFZClEkGD/8VID+AvLifud586q0kbfBcBRLqnz
         /tYMn79Rvb3pjy2zu83vqH324DllxDOaVky3WXV9fWcLBOqD/4I04LEfgQUOW0x5P3x0
         JG2Q==
X-Gm-Message-State: AOAM530pygzAdk81Qn+qz5BQaJNk4Dfmhu0Q+xQ8WkJ8m/78/kX2eRlK
        dl8nO+WL5uwY4GkaBtCgCO78Jg==
X-Google-Smtp-Source: ABdhPJyOskFVbu5Q7jztS/JY+dJEhfz7pdsgkS1G8FHxMjsxcwx7mtvJ/wUGWknKrnr7P9rFJfWeCA==
X-Received: by 2002:aa7:9510:: with SMTP id b16mr4234538pfp.265.1590158784741;
        Fri, 22 May 2020 07:46:24 -0700 (PDT)
Received: from ?IPv6:2605:e000:100e:8c61:892a:d4e5:be12:19f? ([2605:e000:100e:8c61:892a:d4e5:be12:19f])
        by smtp.gmail.com with ESMTPSA id mn19sm7014158pjb.8.2020.05.22.07.46.23
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Fri, 22 May 2020 07:46:24 -0700 (PDT)
Subject: Re: linux-next: build failure after merge of the block tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Christoph Hellwig <hch@lst.de>
References: <20200522213202.38ebe825@canb.auug.org.au>
From:   Jens Axboe <axboe@kernel.dk>
Message-ID: <7bb2cb93-062c-4ef5-4986-5dd82694edfe@kernel.dk>
Date:   Fri, 22 May 2020 08:46:22 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.7.0
MIME-Version: 1.0
In-Reply-To: <20200522213202.38ebe825@canb.auug.org.au>
Content-Type: text/plain; charset=windows-1252
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 5/22/20 5:32 AM, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the block tree, today's linux-next build (x86_64
> allnoconfig) failed like this:
> 
> fs/libfs.c: In function 'generic_file_fsync':
> fs/libfs.c:1116:9: error: too few arguments to function 'blkdev_issue_flush'
>  1116 |  return blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL);
>       |         ^~~~~~~~~~~~~~~~~~
> In file included from fs/libfs.c:7:
> include/linux/blkdev.h:1875:19: note: declared here
>  1875 | static inline int blkdev_issue_flush(struct block_device *bdev, gfp_t gfp_mask,
>       |                   ^~~~~~~~~~~~~~~~~~
> 
> Caused by commit
> 
>   c64644ce363b ("block: remove the error_sector argument to blkdev_issue_flush")

Gah, I'll fold in the fix. Thanks Stephen.

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=xhI4=7H=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,
	SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no
	version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id EE635C433DF
	for <linux-next@archiver.kernel.org>; Mon, 25 May 2020 05:08:55 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 9860720825
	for <linux-next@archiver.kernel.org>; Mon, 25 May 2020 05:08:55 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="n1htx9JQ"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S2388539AbgEYFIy (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Mon, 25 May 2020 01:08:54 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42898 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S2388211AbgEYFIy (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Mon, 25 May 2020 01:08:54 -0400
Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 67ABEC061A0E;
        Sun, 24 May 2020 22:08:50 -0700 (PDT)
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 49VlVj0b3qz9sSg;
        Mon, 25 May 2020 15:08:44 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;
        s=201702; t=1590383327;
        bh=F+DJJAfNWOCcSHZcR2Yj5hkGS2U1BgJDwkdg9LBXq5c=;
        h=Date:From:To:Cc:Subject:From;
        b=n1htx9JQiezUvnpufuv61/+O2hTe5aQzE7L6HJG+6xnzH073neKdT9fvdn8kHf+zO
         ec91O71NFuZyq3/Jh25S14A0vmq3RbImBG3Ofl3PRDch2CroZLy65OgWB1N8N6EwXR
         RjWvgPtKTzHZn7zwueXngv648s0twWLGNgi1Fs1Of2zfP24wP6QyXGwjABKFZOjypl
         qZ4KmvAjB/KE+m092GHQQA9k7HrX7zaa1rMwkVoys7Y1XJMD4fMg3vN71c7Pba6zIu
         pcfT/PfQ4EMoYI1tVrXyKyPLZ1FztSCVJRMS/TpL36hcNmRN26wIRd73odGGLxpCzP
         NKKLHMSo3MFOw==
Date:   Mon, 25 May 2020 15:08:37 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>, David Sterba <dsterba@suse.cz>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Goldwyn Rodrigues <rgoldwyn@suse.com>,
        Johannes Thumshirn <jthumshirn@suse.de>,
        Christoph Hellwig <hch@lst.de>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20200525150837.54fe6977@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/7gBx1a6cPvmeoXQ7VXvq9OV";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/7gBx1a6cPvmeoXQ7VXvq9OV
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

mm/filemap.c: In function 'generic_file_buffered_read':
mm/filemap.c:2075:9: error: 'written' undeclared (first use in this functio=
n); did you mean 'writeb'?
 2075 |     if (written) {
      |         ^~~~~~~
      |         writeb

Caused by commit

  23d513106fd8 ("mm: support async buffered reads in generic_file_buffered_=
read()")

from the block tree interacting with commit

  6e66f10f2cac ("fs: export generic_file_buffered_read()")

from the btrfs tree.

[Aside: that btrfs tree commit talks about "correct the comments and variab=
le
    names", but changes "written" to "copied" in the function definition
    but to "already_read" in the header file declaration ...]

I ave applied the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 25 May 2020 15:00:44 +1000
Subject: [PATCH] mm: fix up for "fs: export generic_file_buffered_read()" m=
erge

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

diff --git a/mm/filemap.c b/mm/filemap.c
index 742998883d9c..208095551a17 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2072,7 +2072,7 @@ ssize_t generic_file_buffered_read(struct kiocb *iocb,
 			 * serialisations and why it's safe.
 			 */
 			if (iocb->ki_flags & IOCB_WAITQ) {
-				if (written) {
+				if (copied) {
 					put_page(page);
 					goto out;
 				}
--=20
2.26.2

--=20
Cheers,
Stephen Rothwell

--Sig_/7gBx1a6cPvmeoXQ7VXvq9OV
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl7LUtUACgkQAVBC80lX
0GwWdAgAlG7GWe4av20SGsQef429kNxCI2e2YZDzj4Vh0OZOQpSSuD8vzFFUpO0H
RlyfnpMcIhHxhd0hrU7995vEfUz13+nty5oViOGbd4eX7L3nJr9Btf1EEAMKZ/FG
b3VnvC4JA5ZwgVfB17lCcDhDHrKhO52QKdrUcxBLIg3OXV3mUjslM32H9/JQnPx/
PZKz/UAOvqmDAjYo1PdoL4FKdwRerKV3KORDCZCSIXjhBJ3tvsFWDfZfVnNkIGwp
jftYrog/AHSRtfQBr+F3+BXlWKYjX2nDqOXhdAHeYP37h3n7cuowrpCClF99S42z
2Wr6jp7R719uLkGSKEisZpoOrAWhBQ==
=+/BU
-----END PGP SIGNATURE-----

--Sig_/7gBx1a6cPvmeoXQ7VXvq9OV--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=xhI4=7H=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.2 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,
	HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,
	USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 8DDA7C433E0
	for <linux-next@archiver.kernel.org>; Mon, 25 May 2020 19:03:48 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 6B9AB2068D
	for <linux-next@archiver.kernel.org>; Mon, 25 May 2020 19:03:48 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel-dk.20150623.gappssmtp.com header.i=@kernel-dk.20150623.gappssmtp.com header.b="S3wCwl5Z"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1729559AbgEYTDs (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Mon, 25 May 2020 15:03:48 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60948 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1726596AbgEYTDr (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Mon, 25 May 2020 15:03:47 -0400
Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D30BC05BD43
        for <linux-next@vger.kernel.org>; Mon, 25 May 2020 12:03:47 -0700 (PDT)
Received: by mail-pf1-x443.google.com with SMTP id v2so4042094pfv.7
        for <linux-next@vger.kernel.org>; Mon, 25 May 2020 12:03:47 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20150623.gappssmtp.com; s=20150623;
        h=subject:to:cc:references:from:message-id:date:user-agent
         :mime-version:in-reply-to:content-language:content-transfer-encoding;
        bh=+zZvfQ9uHEcIup7MCl+X+CsUnoR1rGvk/AB5eqrO2gc=;
        b=S3wCwl5Zq/JaG4MuDdB4aCHBce7iBLI4XtmboFqCQK4GIuePZwfBYQJJdtXr1k7hUh
         5V7zvNPvjam68fJZZ0kNFKU+122AjlSTJgmLYrC8BAOwmIwSOUSOZpZkcylUlBthYDAy
         Fa7AsXyZm662yGHDrguZvBPg/HvU4AULESaJ+U1KsywvLDTBN+yuIbnC25LT54M34Fhm
         ZvOjkZk3XYyiC34o6cllfK/WSSPkXML5JbvyTxLmQNiA+K0ATMPAugPyp7mTwajppvad
         HwOU06CdBST0cIt00v9uVoOCMUiUMndEMjEXtAudlZcWg1DWH8Vo94MSedJDnxlviJZK
         gB3A==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:subject:to:cc:references:from:message-id:date
         :user-agent:mime-version:in-reply-to:content-language
         :content-transfer-encoding;
        bh=+zZvfQ9uHEcIup7MCl+X+CsUnoR1rGvk/AB5eqrO2gc=;
        b=kYbOTx6M5BKX2og961ZlSrgycO5U2Ju+Df8uJ9hxAIyFz6qDG4LGUerl6yos3uxLLI
         kxZicCpI7Vzoth3lYNboLLKFltFr1v+0u/+9m8c0NmvP44L3R2xIUHS0IXfypmov8nQj
         8lOECyXmeyGjVu9/J8d+JxTYl9Vmq7nvPoyoLRQ2Al9fu6hbBTTH2WuEq3UUM4ZeSlKD
         wyf/af+MAZ8yCbxHhTk6XK2EEKJyOmF/1Hj0Uv7ZUtiuHf30ai594awXEnGyoeTGA1TM
         iZBFEwwa/MP5pqaMyGBYnGvms4DjPi4t9vXBQGplL0gfMLf0xZakHTVt2X6QoQP1SQca
         ht9A==
X-Gm-Message-State: AOAM531S554N+IGGf2xTfCE8iY8UzrEL7MKV6kK9LTdu1RE+X4xYC/ZK
        Mv6PqJqpQN8Qe/YKmtS8BkrvBg==
X-Google-Smtp-Source: ABdhPJxsO2BATErq1hdRMq+47FTRMwcZqrwtKyAss+sFid9AQbw59BL9UQzeUW9fi2iigF0qEz0ZNg==
X-Received: by 2002:a63:34cd:: with SMTP id b196mr10800118pga.2.1590433427045;
        Mon, 25 May 2020 12:03:47 -0700 (PDT)
Received: from ?IPv6:2605:e000:100e:8c61:3c00:cb1c:41a3:c8d? ([2605:e000:100e:8c61:3c00:cb1c:41a3:c8d])
        by smtp.gmail.com with ESMTPSA id u20sm13638359pfn.144.2020.05.25.12.03.45
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Mon, 25 May 2020 12:03:46 -0700 (PDT)
Subject: Re: linux-next: build failure after merge of the block tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        David Sterba <dsterba@suse.cz>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Goldwyn Rodrigues <rgoldwyn@suse.com>,
        Johannes Thumshirn <jthumshirn@suse.de>,
        Christoph Hellwig <hch@lst.de>
References: <20200525150837.54fe6977@canb.auug.org.au>
From:   Jens Axboe <axboe@kernel.dk>
Message-ID: <c0e6af76-46d8-ccf0-3874-0751f7622caf@kernel.dk>
Date:   Mon, 25 May 2020 13:03:44 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.7.0
MIME-Version: 1.0
In-Reply-To: <20200525150837.54fe6977@canb.auug.org.au>
Content-Type: text/plain; charset=windows-1252
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 5/24/20 11:08 PM, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the block tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> mm/filemap.c: In function 'generic_file_buffered_read':
> mm/filemap.c:2075:9: error: 'written' undeclared (first use in this function); did you mean 'writeb'?
>  2075 |     if (written) {
>       |         ^~~~~~~
>       |         writeb
> 
> Caused by commit
> 
>   23d513106fd8 ("mm: support async buffered reads in generic_file_buffered_read()")
> 
> from the block tree interacting with commit
> 
>   6e66f10f2cac ("fs: export generic_file_buffered_read()")
> 
> from the btrfs tree.
> 
> [Aside: that btrfs tree commit talks about "correct the comments and variable
>     names", but changes "written" to "copied" in the function definition
>     but to "already_read" in the header file declaration ...]
> 
> I ave applied the following merge fix patch:

Looks like a frivolous change... Thanks for fixing this up Stephen.

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=3UI+=7I=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,
	SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 45B0EC433E0
	for <linux-next@archiver.kernel.org>; Tue, 26 May 2020 04:36:37 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id C8672207ED
	for <linux-next@archiver.kernel.org>; Tue, 26 May 2020 04:36:36 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="V5Uh8HJB"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1725774AbgEZEgg (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Tue, 26 May 2020 00:36:36 -0400
Received: from ozlabs.org ([203.11.71.1]:59261 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1725773AbgEZEgg (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Tue, 26 May 2020 00:36:36 -0400
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 49WLl50fF7z9sRK;
        Tue, 26 May 2020 14:36:32 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;
        s=201702; t=1590467794;
        bh=4v8ocGM/APo2sSgppiU/a6nI3q4TeGO4rhe21S8OGMo=;
        h=Date:From:To:Cc:Subject:In-Reply-To:References:From;
        b=V5Uh8HJBzGV7gcBzXAj8zRUgdsUcf4HxCOU4Fwqb2ObX2nf/TFqzbFgXYhx85LoTq
         dxT277ChkPmq147KLwFVatU9YyVLPr4En646pqvi8T4NuqUqHCPzttLvknIIhTQdoo
         4CbsVgsjR8qbRXpx908nBDiUMXdexy5CtcNTWlPNu5dsEzGWQAJVOI/xnUOFJMT0an
         iJaTRq6aT/r/m8ZhVuAqFGToaMk2ra6wcB0shi+Pp8dZicO7MB9xwPNuFtCYPSgtAq
         l0OU9lYL5dpeS0gum+9XqlTGVetUQJLJCx6tXhAjAH7rJ6+tQMf0pWOjnDrLC68RrF
         ex0qYuxE8keGw==
Date:   Tue, 26 May 2020 14:36:30 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     David Sterba <dsterba@suse.cz>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Goldwyn Rodrigues <rgoldwyn@suse.com>,
        Johannes Thumshirn <jthumshirn@suse.de>,
        Christoph Hellwig <hch@lst.de>
Subject: Re: linux-next: build failure after merge of the block tree
Message-ID: <20200526143630.7e7fbc79@canb.auug.org.au>
In-Reply-To: <c0e6af76-46d8-ccf0-3874-0751f7622caf@kernel.dk>
References: <20200525150837.54fe6977@canb.auug.org.au>
        <c0e6af76-46d8-ccf0-3874-0751f7622caf@kernel.dk>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/pxLirPxGa6MugXWK9gm1DQd";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/pxLirPxGa6MugXWK9gm1DQd
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Mon, 25 May 2020 13:03:44 -0600 Jens Axboe <axboe@kernel.dk> wrote:
>
> On 5/24/20 11:08 PM, Stephen Rothwell wrote:
> >=20
> > After merging the block tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> >=20
> > mm/filemap.c: In function 'generic_file_buffered_read':
> > mm/filemap.c:2075:9: error: 'written' undeclared (first use in this fun=
ction); did you mean 'writeb'?
> >  2075 |     if (written) {
> >       |         ^~~~~~~
> >       |         writeb
> >=20
> > Caused by commit
> >=20
> >   23d513106fd8 ("mm: support async buffered reads in generic_file_buffe=
red_read()")
> >=20
> > from the block tree interacting with commit
> >=20
> >   6e66f10f2cac ("fs: export generic_file_buffered_read()")
> >=20
> > from the btrfs tree.
> >=20
> > [Aside: that btrfs tree commit talks about "correct the comments and va=
riable
> >     names", but changes "written" to "copied" in the function definition
> >     but to "already_read" in the header file declaration ...]
> >=20
> > I ave applied the following merge fix patch: =20
>=20
> Looks like a frivolous change... Thanks for fixing this up Stephen.

The variable name change has been removed from the btrfs tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/pxLirPxGa6MugXWK9gm1DQd
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl7MnM4ACgkQAVBC80lX
0GxN0QgAkrTNBQkQoE+E8c1r8/lTP6z3sg4vMtkaNdAvj1KqOvGJ8nDw99s4APYR
v4KnZ64ZjgK6Rc0mTwK05QRG80OvzLLTewpyINAT5bMzq9SjP3TIbKeYu1gINDZC
nZD6mhryuq56q5gL4ifP+yshLjVg4kH8kn5rkREH+DK1uK1q4nUD+mfO871wUtCY
CMVMC5pvRf+jOpgpYzAq+mLuEXfoVVkNCrBnqZuXpAKi29e878NTsrz9t9QkblxD
1XZFaymjGGQ2f+nTSdjcBbhur/io3fQsrdpt5J/WgTlMnJMXK8yHPhRWPRZ98OjG
cehbze+Hm6NMqtV9mN9wYanu//NgVA==
=HJ9b
-----END PGP SIGNATURE-----

--Sig_/pxLirPxGa6MugXWK9gm1DQd--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=3UI+=7I=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,
	HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,
	USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id C3036C433E0
	for <linux-next@archiver.kernel.org>; Tue, 26 May 2020 13:53:40 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 9CC2F2086A
	for <linux-next@archiver.kernel.org>; Tue, 26 May 2020 13:53:40 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel-dk.20150623.gappssmtp.com header.i=@kernel-dk.20150623.gappssmtp.com header.b="uWQHN09L"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1729085AbgEZNxh (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Tue, 26 May 2020 09:53:37 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40994 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728283AbgEZNxh (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Tue, 26 May 2020 09:53:37 -0400
Received: from mail-pl1-x644.google.com (mail-pl1-x644.google.com [IPv6:2607:f8b0:4864:20::644])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 78FC7C03E96E
        for <linux-next@vger.kernel.org>; Tue, 26 May 2020 06:53:37 -0700 (PDT)
Received: by mail-pl1-x644.google.com with SMTP id a13so8719969pls.8
        for <linux-next@vger.kernel.org>; Tue, 26 May 2020 06:53:37 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20150623.gappssmtp.com; s=20150623;
        h=subject:to:cc:references:from:message-id:date:user-agent
         :mime-version:in-reply-to:content-language:content-transfer-encoding;
        bh=uMNgaG6xJWfxbhj/av+CAUmXsi69iufIz9696TQYiKc=;
        b=uWQHN09LppWoFpxMndAZIfR7haL72VD3ldLDHtqItNHm8e3D2dphntouLS+B4WonTK
         MiABkJicdNbsTfvcIuG+/m1tqjP8dJnp3Q46OCsHLzKD7xYKg/i76wDy045kdcnMaeDf
         YnVgCeRMf6ML38RhjEyeJK/4/sHk1WfPeJTVHZuPDr8XAB4Jloab/aee1KKgTcVxemnV
         GI3pPVNS1U4Uqd+ApGQoq5U1towXyetLmNY2OPBHIIzzl6HomNiNUI+G3ilSFUHVxtzM
         1IvbCeYmLPjOemFVFSuVAe4z3aqTMGjR5zyYghh9jnp2Fr9ob7kK63VKy354ugUPepI0
         zK/Q==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:subject:to:cc:references:from:message-id:date
         :user-agent:mime-version:in-reply-to:content-language
         :content-transfer-encoding;
        bh=uMNgaG6xJWfxbhj/av+CAUmXsi69iufIz9696TQYiKc=;
        b=WW/R+zpmn+G4Iag+KG5dy+h4TQYr5aj+Of2bJu0g78IZEekYyDheXNwJCQguoaKN4G
         kKigEAYe1MkDixqMYo0vCIsQQfvF7Dk8CwdjukKjFHFSanyzQfUXBQchWbtXA85eQNEH
         h+fRgj+lqE7f8mVwm2h6lPbk/N4H5C1rwQ0cGNuH1B6lB8iACIpeMAALgH+Fpi7J+Oz8
         xqiuXqw1D2MgWvzPr9irSIxK1z3xXFIv0w38zuS1InUKt0rV+SRazCy2OLGZfiut/jVd
         ca5+9qtZ6IR1X7bQ76kvJz1KnJxa6JRaB/jwWbKb4udlYFLnNtZP8Jhc1mMqcJdtx+Ym
         h13Q==
X-Gm-Message-State: AOAM531HEN9hKTDC11gxShZereoOHnJhvhWlhgSXDfnpSsPk6rMBgNr0
        V2gNvMvfeOD0dypAKOy2gj0+9TDK4Wd0/w==
X-Google-Smtp-Source: ABdhPJxh34GNEboejhY3krw53dAsQQkEXHaHUfhIgeQl3e+VNf16EWSQ3J7RwvcUhsTlRNuNIeslWw==
X-Received: by 2002:a17:90a:ad08:: with SMTP id r8mr27366554pjq.154.1590501217028;
        Tue, 26 May 2020 06:53:37 -0700 (PDT)
Received: from ?IPv6:2605:e000:100e:8c61:a9e6:df54:e55e:4c47? ([2605:e000:100e:8c61:a9e6:df54:e55e:4c47])
        by smtp.gmail.com with ESMTPSA id b4sm12253334pfo.140.2020.05.26.06.53.35
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Tue, 26 May 2020 06:53:36 -0700 (PDT)
Subject: Re: linux-next: build failure after merge of the block tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     David Sterba <dsterba@suse.cz>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Goldwyn Rodrigues <rgoldwyn@suse.com>,
        Johannes Thumshirn <jthumshirn@suse.de>,
        Christoph Hellwig <hch@lst.de>
References: <20200525150837.54fe6977@canb.auug.org.au>
 <c0e6af76-46d8-ccf0-3874-0751f7622caf@kernel.dk>
 <20200526143630.7e7fbc79@canb.auug.org.au>
From:   Jens Axboe <axboe@kernel.dk>
Message-ID: <b2418ce5-839d-43d4-e5ea-416be9f63b1a@kernel.dk>
Date:   Tue, 26 May 2020 07:53:34 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.7.0
MIME-Version: 1.0
In-Reply-To: <20200526143630.7e7fbc79@canb.auug.org.au>
Content-Type: text/plain; charset=windows-1252
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 5/25/20 10:36 PM, Stephen Rothwell wrote:
> Hi all,
> 
> On Mon, 25 May 2020 13:03:44 -0600 Jens Axboe <axboe@kernel.dk> wrote:
>>
>> On 5/24/20 11:08 PM, Stephen Rothwell wrote:
>>>
>>> After merging the block tree, today's linux-next build (arm
>>> multi_v7_defconfig) failed like this:
>>>
>>> mm/filemap.c: In function 'generic_file_buffered_read':
>>> mm/filemap.c:2075:9: error: 'written' undeclared (first use in this function); did you mean 'writeb'?
>>>  2075 |     if (written) {
>>>       |         ^~~~~~~
>>>       |         writeb
>>>
>>> Caused by commit
>>>
>>>   23d513106fd8 ("mm: support async buffered reads in generic_file_buffered_read()")
>>>
>>> from the block tree interacting with commit
>>>
>>>   6e66f10f2cac ("fs: export generic_file_buffered_read()")
>>>
>>> from the btrfs tree.
>>>
>>> [Aside: that btrfs tree commit talks about "correct the comments and variable
>>>     names", but changes "written" to "copied" in the function definition
>>>     but to "already_read" in the header file declaration ...]
>>>
>>> I ave applied the following merge fix patch:  
>>
>> Looks like a frivolous change... Thanks for fixing this up Stephen.
> 
> The variable name change has been removed from the btrfs tree.

Thanks - I'd encourage that name changing late in the merge window
instead. The change is obviously fine, but a) it should not be done in
an unrelated change, and b) it can be done without risking causing silly
merge issues.

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=WYMY=7P=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,
	SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable
	autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 59EB4C433E0
	for <linux-next@archiver.kernel.org>; Tue,  2 Jun 2020 03:25:40 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 314A42063A
	for <linux-next@archiver.kernel.org>; Tue,  2 Jun 2020 03:25:40 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="M9DVMqvt"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1725850AbgFBDZj (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Mon, 1 Jun 2020 23:25:39 -0400
Received: from bilbo.ozlabs.org ([203.11.71.1]:60011 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1725841AbgFBDZj (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Mon, 1 Jun 2020 23:25:39 -0400
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 49bcr12wTkz9sSc;
        Tue,  2 Jun 2020 13:25:37 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;
        s=201702; t=1591068337;
        bh=nzoTYbaXyfXc47fBDdkURKW1uFAuykUoq+QlJU0prVo=;
        h=Date:From:To:Cc:Subject:From;
        b=M9DVMqvtqZEECGRyogmkRx6Jhw6/01uXC2NLUMpiFtLj4BDy1Mn5UEqWwPzOeLRMn
         jFKY75EIxSxUL3gHSslp18WPLzR/5UrwHV1FSkdg2Lda28isa+kNq4oBq/ncIdiIrW
         82vaKwkcvWBJGFSOGhxBthFVkW5vsxm4ad46/El1L0m1XfuvuwZAuUWWK8c+gYerol
         thtLZpSMOoldCbMOzX2Z/6sA9qS+Ig/kGpv6KJVX3r+6XJ+dVXSl4QRmnylN+9dVOS
         d9D1HY8407dnVsLRrnLImW1Phxgw3CWuRlKorB3zfI67syEfOfZr9Y2wdPQa6StUbJ
         Az3olXoEBr73A==
Date:   Tue, 2 Jun 2020 13:25:36 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>, Doug Ledford <dledford@redhat.com>,
        Jason Gunthorpe <jgg@mellanox.com>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Yamin Friedman <yaminf@mellanox.com>,
        Max Gurtovoy <maxg@mellanox.com>,
        Christoph Hellwig <hch@lst.de>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20200602132536.5b190c52@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/As8rJFZ+_i0nEPiIonuf1/d";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/As8rJFZ+_i0nEPiIonuf1/d
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:

In file included from include/linux/device.h:15,
                 from include/rdma/ib_verbs.h:43,
                 from include/rdma/mr_pool.h:8,
                 from drivers/nvme/host/rdma.c:10:
drivers/nvme/host/rdma.c: In function 'nvme_rdma_create_queue_ib':
drivers/nvme/host/rdma.c:550:24: error: 'idx' undeclared (first use in this=
 function); did you mean 'ida'?
  550 |     queue->queue_size, idx);
      |                        ^~~
include/linux/dev_printk.h:104:32: note: in definition of macro 'dev_err'
  104 |  _dev_err(dev, dev_fmt(fmt), ##__VA_ARGS__)
      |                                ^~~~~~~~~~~

Caused by commit

  583f69304b91 ("nvme-rdma: use new shared CQ mechanism")

from the rdma tree interacting with commit

  5ec5d3bddc6b ("nvme-rdma: add metadata/T10-PI support")

from the block tree.

I applied the following merge fix patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 2 Jun 2020 13:16:30 +1000
Subject: [PATCH] fix up for merge conflict with rdma tree

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

diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index 6507b06d672d..4f0216e9f43d 100644
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -547,7 +547,7 @@ static int nvme_rdma_create_queue_ib(struct nvme_rdma_q=
ueue *queue)
 		if (ret) {
 			dev_err(queue->ctrl->ctrl.device,
 				"failed to initialize PI MR pool sized %d for QID %d\n",
-				queue->queue_size, idx);
+				queue->queue_size, nvme_rdma_queue_idx(queue));
 			goto out_destroy_mr_pool;
 		}
 	}
--=20
2.26.2

--=20
Cheers,
Stephen Rothwell

--Sig_/As8rJFZ+_i0nEPiIonuf1/d
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl7VxrAACgkQAVBC80lX
0Gz6Hwf+Myjv5fN0xUq4uyKtlsSycukPoxLzBIYizELH6+sMGnm0JmOSZb1AjzN4
/k59dBgC/FLZawlgFdIvawbAX8HqVrsltcjifVgi9lgMhmNtEgqnLjeJXRxK8N77
ky4XM981f6y3qqMTjUTBK79xuDUjTptpQ55hcad+LQOZCb0gDE2TM7etpSdMU+Yv
KyZpcSPsERCvUaAN6XjD9X6db7EEwxB1xXhe+ilE6jb9y9w6UlQ9/WCLH20ZOVKU
5h/dSksRViSNW5GBLtsAG2cldqkpGPABs9cJvUZoUQxdxjqCmZrXkpwZuk4BGo8R
1OaspULgfyez2rf1IDWqyE4/czbITw==
=YRvk
-----END PGP SIGNATURE-----

--Sig_/As8rJFZ+_i0nEPiIonuf1/d--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=STCe=A2=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-4.1 required=3.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 80BD2C433DF
	for <linux-next@archiver.kernel.org>; Wed, 15 Jul 2020 02:14:28 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 40AA220758
	for <linux-next@archiver.kernel.org>; Wed, 15 Jul 2020 02:14:28 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="sl1cn0xr"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1726892AbgGOCO1 (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Tue, 14 Jul 2020 22:14:27 -0400
Received: from ozlabs.org ([203.11.71.1]:43087 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1726396AbgGOCO1 (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Tue, 14 Jul 2020 22:14:27 -0400
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4B61D10Lnjz9sQt;
        Wed, 15 Jul 2020 12:14:24 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;
        s=201702; t=1594779265;
        bh=x5qy5Ql+78M5FEN2qcySDNOA2DzrgzQoHNS5zgAWbuo=;
        h=Date:From:To:Cc:Subject:From;
        b=sl1cn0xrPaywVl+jIg2uNO2ghJ7ubo2VatvWtriHmP/DkDrg79WVVpgzVhebogKxM
         EiQX0y5ot921v9azxPrqubGeCqgiOoQXijzWWi4kPYehPLt3ArwFUKPekfrH/tDd9k
         JQ6dbv/fPLjjrz/DCCkYl5pTwesn5HLogbxSxqzGVQRUYmCrLiJbABQs14qW8wDd10
         fnQl/VPXvyCavwqZ/zEICp5j1Gqekwbmfrybzz0hX2nBxVt4V7GgPODG5gCk9HFfyS
         XsT+VwNBaUZjqz+j/GPRaxDKey1kTiICIDO1sFt82LYL3lgdMdYViljF3zJ6JcbN7t
         CqinfDR3vZO9w==
Date:   Wed, 15 Jul 2020 12:14:23 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20200715121423.6c20731b@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/zHMNky4_eNOtOABo7nmMj_B";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/zHMNky4_eNOtOABo7nmMj_B
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

block/blk-timeout.c: In function 'blk_round_jiffies':
block/blk-timeout.c:96:14: error: 'CONFIG_HZ_ROUGH_MASK' undeclared (first =
use in this function)
   96 |  return (j + CONFIG_HZ_ROUGH_MASK) + 1;
      |              ^~~~~~~~~~~~~~~~~~~~

Caused by commit

  91ba0f529364 ("block: relax jiffies rounding for timeouts")

CONFIG_HZ_ROUGH_MASK is not defined for this build even though
CONFIG_HZ_100 is set. The arm arch does not include kernel/Kconfig.hz.

I have reverted that commit for today.

--=20
Cheers,
Stephen Rothwell

--Sig_/zHMNky4_eNOtOABo7nmMj_B
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl8OZn8ACgkQAVBC80lX
0GymkQf/Tu4diojhWkbXGAG8O3MpFmDlUFeQ6OOZk3gJ/9RMvNwjB6zEUF4i6ZzL
jqQt4IwLeYP20yigdE8lrF6/x30PrxlD7Q1WW1c+lKt1LJ4ZYNyX99uhHWXl2kC5
obTu66RplNgUr4/XIwRnXqTqyXvAO2qHXG3eYAXFwwBwgasY9wDwZ1zCzwLVyBw9
1rMwJIybRNXWwyZVhqNDHJQSk6F7EwaMhghGxdRtqjemPK1xtrykAzJYrXT9Fpy+
fOMZY0cQxS6jC+WXRqzgEx/C3XpJE/i0jDJhfjMhm0GZ130bXfHRImBZrWgXHdJk
G6WwVoKrXqRxql7u7H80tuPT+lz8Gg==
=jY+6
-----END PGP SIGNATURE-----

--Sig_/zHMNky4_eNOtOABo7nmMj_B--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=STCe=A2=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-4.0 required=3.0 tests=BAYES_00,
	HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS
	autolearn=no autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 99F19C433DF
	for <linux-next@archiver.kernel.org>; Wed, 15 Jul 2020 09:24:45 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 73E4F2064B
	for <linux-next@archiver.kernel.org>; Wed, 15 Jul 2020 09:24:45 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1729791AbgGOJYp (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Wed, 15 Jul 2020 05:24:45 -0400
Received: from mail-oi1-f196.google.com ([209.85.167.196]:42217 "EHLO
        mail-oi1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1729672AbgGOJYo (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Wed, 15 Jul 2020 05:24:44 -0400
Received: by mail-oi1-f196.google.com with SMTP id t4so1682859oij.9;
        Wed, 15 Jul 2020 02:24:44 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:mime-version:references:in-reply-to:from:date
         :message-id:subject:to:cc;
        bh=pS8//2m4a4+oXS1cjEaSO4xVTkKzDBQAW/L3md+hqzg=;
        b=c7fAJUmpNjx+e6b7a6RDnF++/0VNQvdRnHJFhVWqX9Z7CyET9HWHqI3Ts/x1tuMYWc
         68vvq/0wouobyrIPRTkFgAQSTUbI/OM848B4XBKTPUkt/T16KZVoy0jnBx7fXN8+apWa
         gZXiDJCxdNq83D4Bih8GsO+BqvLDt7j4bLklx+X6UMlVHlDoMKiqqTT1Tt6dGoysrR71
         fL8TyZUybirt/o4aYcPI8rFRyk2a6HPyeyHlalSEImnFUdL2TfnQmlJf4oUD2BtxcrN7
         YeHbKw9vyIz8GBUxroPWFFXaoG2xlFzU9nYdf1JmhHXT0CDAn1ebnr375OUpi4QuUM3K
         YUnQ==
X-Gm-Message-State: AOAM531vUFwzTZ6Qm8/0KjyrZyN6qYThpadAm+egBO/K23L69J51Y5D/
        rtsJPmNhoUhD/Zov3F1XngdiYF0Up8VWTNOJ4a4vCqfldUc=
X-Google-Smtp-Source: ABdhPJxsOpD6PZBT3rQkWJj7eFLJzhE+VvgtXf6ganwrw77cxSR8jVVbpQ1j8HH0LqdZcqUSBi4IfKu9KiTn7V+ivWI=
X-Received: by 2002:aca:ac10:: with SMTP id v16mr6693336oie.153.1594805083719;
 Wed, 15 Jul 2020 02:24:43 -0700 (PDT)
MIME-Version: 1.0
References: <20200715121423.6c20731b@canb.auug.org.au>
In-Reply-To: <20200715121423.6c20731b@canb.auug.org.au>
From:   Geert Uytterhoeven <geert@linux-m68k.org>
Date:   Wed, 15 Jul 2020 11:24:32 +0200
Message-ID: <CAMuHMdWMmP_YHEwnqmuTMw4-+LSieRaSHeqPLYLZyLq+O7zhyQ@mail.gmail.com>
Subject: Re: linux-next: build failure after merge of the block tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Jens Axboe <axboe@kernel.dk>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On Wed, Jul 15, 2020 at 4:26 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> After merging the block tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> block/blk-timeout.c: In function 'blk_round_jiffies':
> block/blk-timeout.c:96:14: error: 'CONFIG_HZ_ROUGH_MASK' undeclared (first use in this function)
>    96 |  return (j + CONFIG_HZ_ROUGH_MASK) + 1;
>       |              ^~~~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
>   91ba0f529364 ("block: relax jiffies rounding for timeouts")
>
> CONFIG_HZ_ROUGH_MASK is not defined for this build even though
> CONFIG_HZ_100 is set. The arm arch does not include kernel/Kconfig.hz.
>
> I have reverted that commit for today.

(as I don't have the original patch in my email, I'm commenting here)

    +config HZ_ROUGH_MASK
    +       int
    +       default 127 if HZ_100
    +       default 255 if HZ_250 || HZ_300
    +       default 1023 if HZ_1000

What about other HZ_* values?

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=STCe=A2=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-5.5 required=3.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A,
	SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=no autolearn_force=no
	version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id BC2CAC433ED
	for <linux-next@archiver.kernel.org>; Wed, 15 Jul 2020 15:08:09 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 9242420672
	for <linux-next@archiver.kernel.org>; Wed, 15 Jul 2020 15:08:09 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel-dk.20150623.gappssmtp.com header.i=@kernel-dk.20150623.gappssmtp.com header.b="bAXyF5mn"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727837AbgGOPIJ (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Wed, 15 Jul 2020 11:08:09 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57414 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1725912AbgGOPII (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Wed, 15 Jul 2020 11:08:08 -0400
Received: from mail-il1-x144.google.com (mail-il1-x144.google.com [IPv6:2607:f8b0:4864:20::144])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9957AC061755
        for <linux-next@vger.kernel.org>; Wed, 15 Jul 2020 08:08:08 -0700 (PDT)
Received: by mail-il1-x144.google.com with SMTP id h16so2239907ilj.11
        for <linux-next@vger.kernel.org>; Wed, 15 Jul 2020 08:08:08 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20150623.gappssmtp.com; s=20150623;
        h=subject:to:cc:references:from:message-id:date:user-agent
         :mime-version:in-reply-to:content-language:content-transfer-encoding;
        bh=N2Tc17Rr4p8/CnE9/Q69Mw8vNfjf1wSeomUtzrfVVt4=;
        b=bAXyF5mnFFNR50WGQCzoR4y0e+YNErNmhCFIzAXmeEtskZ7YDy+JJQIW87Ox8yK/vB
         rwIwwOP6uTHi8U6q0Pad9dFtVOntIC5IJtLE5CKpTeiotgrWDY50fKatgrtcfdYUUnhN
         Zi8Ip7+cnsbF+I9HXiuhpj9cCmF0fxr90MjB7LXT0hgfOK/6RScSZbxcSMoo9ANXRXlP
         lGHrWhatHeSzlG2kFnOurhmusDInccD2yNh+pvPnM9UqTA8v7TuOO2bU4hogfiDWQgv5
         SXPUq3OtKkytIWOpLAos/2TRw5XbiaJZej4OIefJXGRnTRHXfDjDi1tHtInU33l5qCtB
         AV9g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:subject:to:cc:references:from:message-id:date
         :user-agent:mime-version:in-reply-to:content-language
         :content-transfer-encoding;
        bh=N2Tc17Rr4p8/CnE9/Q69Mw8vNfjf1wSeomUtzrfVVt4=;
        b=E/jXsnGWsAzLVp24OGHd6T6FPYFnvv7ThHfSZ7Y596eIMjjS3p20KlG0PRGIw8G+mr
         AOHflqSk5D7s7HCA9cOcjZ50lYJB/B28Lw0yIdAgbmy3M9ixKaXhssA7ljImr39UdaE3
         DXifApGJ23J0/W+1C2BsDDYXUud+9xQiC/3olkkxV76CSyT47Sdq6ZkcFOIgQUOJC3Nh
         5hUS1fiobotWkgt+6bqn1DlYiCafEFj6GhAngsKzn48exbjdPmTDArOgOeoRRoscQ+5l
         yF+1M2LM9itY5Nh5DV9pISj5M+M8whN6rndxf0JTHAU7ZM9sAqqFzgSX2uxcGnYEkO6v
         02UA==
X-Gm-Message-State: AOAM533Hs+K+us0+4nKIwTuECO4X78yZJjL7EWXRynPj1T6pN9TGiiXX
        z3do7yghmlqAA5QzAYZ/W/gyMw==
X-Google-Smtp-Source: ABdhPJwFgGIm9OBMGPtFlk9DjAAg1pLSFUTqlyBWPGuVv1d4Ker51JWjIoh/EMy1vWoA1unf4T5oow==
X-Received: by 2002:a92:48da:: with SMTP id j87mr10913166ilg.197.1594825687973;
        Wed, 15 Jul 2020 08:08:07 -0700 (PDT)
Received: from [192.168.1.58] ([65.144.74.34])
        by smtp.gmail.com with ESMTPSA id r2sm1271254iop.34.2020.07.15.08.08.07
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Wed, 15 Jul 2020 08:08:07 -0700 (PDT)
Subject: Re: linux-next: build failure after merge of the block tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
References: <20200715121423.6c20731b@canb.auug.org.au>
From:   Jens Axboe <axboe@kernel.dk>
Message-ID: <22e580c4-be3d-5917-b8dd-4a212f5160f3@kernel.dk>
Date:   Wed, 15 Jul 2020 09:08:06 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.10.0
MIME-Version: 1.0
In-Reply-To: <20200715121423.6c20731b@canb.auug.org.au>
Content-Type: text/plain; charset=windows-1252
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 7/14/20 8:14 PM, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the block tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> block/blk-timeout.c: In function 'blk_round_jiffies':
> block/blk-timeout.c:96:14: error: 'CONFIG_HZ_ROUGH_MASK' undeclared (first use in this function)
>    96 |  return (j + CONFIG_HZ_ROUGH_MASK) + 1;
>       |              ^~~~~~~~~~~~~~~~~~~~
> 
> Caused by commit
> 
>   91ba0f529364 ("block: relax jiffies rounding for timeouts")
> 
> CONFIG_HZ_ROUGH_MASK is not defined for this build even though
> CONFIG_HZ_100 is set. The arm arch does not include kernel/Kconfig.hz.
> 
> I have reverted that commit for today.

Thanks, I'll take a look.

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=STCe=A2=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-5.5 required=3.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A,
	SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=no autolearn_force=no
	version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 939D7C433F8
	for <linux-next@archiver.kernel.org>; Wed, 15 Jul 2020 15:08:29 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 6EEC9206E9
	for <linux-next@archiver.kernel.org>; Wed, 15 Jul 2020 15:08:29 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel-dk.20150623.gappssmtp.com header.i=@kernel-dk.20150623.gappssmtp.com header.b="bUXUkD3l"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728266AbgGOPI3 (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Wed, 15 Jul 2020 11:08:29 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57468 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728265AbgGOPI2 (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Wed, 15 Jul 2020 11:08:28 -0400
Received: from mail-io1-xd41.google.com (mail-io1-xd41.google.com [IPv6:2607:f8b0:4864:20::d41])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F336C061755
        for <linux-next@vger.kernel.org>; Wed, 15 Jul 2020 08:08:28 -0700 (PDT)
Received: by mail-io1-xd41.google.com with SMTP id y2so2594483ioy.3
        for <linux-next@vger.kernel.org>; Wed, 15 Jul 2020 08:08:28 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20150623.gappssmtp.com; s=20150623;
        h=subject:to:cc:references:from:message-id:date:user-agent
         :mime-version:in-reply-to:content-language:content-transfer-encoding;
        bh=Nv9vjEvfHuWgzOSTm31gduIcyNjGsqlPyVwRk5nczoY=;
        b=bUXUkD3lLd7CHIozSS1/iIJPQyuZ6XiRImkOzjZFuEKQYveJa8bvjkII4VrHqfCqMU
         kuH0pRPkIg7ziheSSHRqmgaCLg+h687dh1YSYtlAy/Oe40JhyvgtSpkpIJNObK4UHNk3
         w8LIPDDexzUbBOc2wL97+8+aAqyXbHRwE92d91l7W+RqFxlA+WdSZTMS/UrFz4RJpqG6
         qvYqRMcCBkudZwWItAJdGZ7pehhefaPhbvpdXWcL1BdR0CHkq8il16cFJanrVGhGPT/X
         fvL3TrLvlSDCPgwwGI4UvyjwtlSyFSYDh0IyRCGSOpc7hzToCvCY9IIn2NgeGNMzoVgl
         lhNg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:subject:to:cc:references:from:message-id:date
         :user-agent:mime-version:in-reply-to:content-language
         :content-transfer-encoding;
        bh=Nv9vjEvfHuWgzOSTm31gduIcyNjGsqlPyVwRk5nczoY=;
        b=k11mRxancY1S4BdGuDuPEATTRr72evxLeJMEZgsowTei0X3HwO7wgJhr5ywWm6BMLL
         MG/zuWpiOAVsoQsv9T+kbLqYWKy1mIqezSpA8IAI75j7vbkMZYHFNXfe31ZrhzZzvLTY
         DNWB9jcMxYE5W88Wd4um+rJ7QjCJSiqFhUZHo11EAQMAoydw2vgLPsSKdnTRQuDvHAgF
         rP4Jfx1aH14xV7XJNi5GQAJ6b3c9QeI98V2+hsXwqNMJboACQ6BVHXnbv3eyD4sLJm+7
         OkAiJz8crIvOHNK20gIFQZ2qGQwywgJFnWp/K3RMneKnw9Y8mP0QkU3nZvJSTDlDzd2d
         ikeA==
X-Gm-Message-State: AOAM5334dWiQ7qTJ41ltCK8AbftQ2YFtQJnYkXeAE7wpArBdomyKYflM
        J7uPXqUeSB+VA0Nng9g+MuniqJCKAj90AQ==
X-Google-Smtp-Source: ABdhPJzdiEqUABXsSiG1oRYxRlOkdtBGQtYGSyurLmSFVJmSliG4jn3im7aBaoRs2jNie6rFFZhMWQ==
X-Received: by 2002:a05:6638:2172:: with SMTP id p18mr12320831jak.63.1594825707956;
        Wed, 15 Jul 2020 08:08:27 -0700 (PDT)
Received: from [192.168.1.58] ([65.144.74.34])
        by smtp.gmail.com with ESMTPSA id f206sm1205356ilh.75.2020.07.15.08.08.27
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Wed, 15 Jul 2020 08:08:27 -0700 (PDT)
Subject: Re: linux-next: build failure after merge of the block tree
To:     Geert Uytterhoeven <geert@linux-m68k.org>,
        Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
References: <20200715121423.6c20731b@canb.auug.org.au>
 <CAMuHMdWMmP_YHEwnqmuTMw4-+LSieRaSHeqPLYLZyLq+O7zhyQ@mail.gmail.com>
From:   Jens Axboe <axboe@kernel.dk>
Message-ID: <6bc36827-83a7-3695-530d-4b90c08b92c7@kernel.dk>
Date:   Wed, 15 Jul 2020 09:08:26 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.10.0
MIME-Version: 1.0
In-Reply-To: <CAMuHMdWMmP_YHEwnqmuTMw4-+LSieRaSHeqPLYLZyLq+O7zhyQ@mail.gmail.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 7/15/20 3:24 AM, Geert Uytterhoeven wrote:
> On Wed, Jul 15, 2020 at 4:26 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> After merging the block tree, today's linux-next build (arm
>> multi_v7_defconfig) failed like this:
>>
>> block/blk-timeout.c: In function 'blk_round_jiffies':
>> block/blk-timeout.c:96:14: error: 'CONFIG_HZ_ROUGH_MASK' undeclared (first use in this function)
>>    96 |  return (j + CONFIG_HZ_ROUGH_MASK) + 1;
>>       |              ^~~~~~~~~~~~~~~~~~~~
>>
>> Caused by commit
>>
>>   91ba0f529364 ("block: relax jiffies rounding for timeouts")
>>
>> CONFIG_HZ_ROUGH_MASK is not defined for this build even though
>> CONFIG_HZ_100 is set. The arm arch does not include kernel/Kconfig.hz.
>>
>> I have reverted that commit for today.
> 
> (as I don't have the original patch in my email, I'm commenting here)
> 
>     +config HZ_ROUGH_MASK
>     +       int
>     +       default 127 if HZ_100
>     +       default 255 if HZ_250 || HZ_300
>     +       default 1023 if HZ_1000
> 
> What about other HZ_* values?

Which other ones do we have?

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=STCe=A2=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-4.0 required=3.0 tests=BAYES_00,
	HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS
	autolearn=no autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id D9C0FC433E2
	for <linux-next@archiver.kernel.org>; Wed, 15 Jul 2020 15:22:24 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id BC2BB20672
	for <linux-next@archiver.kernel.org>; Wed, 15 Jul 2020 15:22:24 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1725832AbgGOPWY (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Wed, 15 Jul 2020 11:22:24 -0400
Received: from mail-ot1-f68.google.com ([209.85.210.68]:39920 "EHLO
        mail-ot1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1725798AbgGOPWY (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Wed, 15 Jul 2020 11:22:24 -0400
Received: by mail-ot1-f68.google.com with SMTP id 18so1745877otv.6;
        Wed, 15 Jul 2020 08:22:23 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:mime-version:references:in-reply-to:from:date
         :message-id:subject:to:cc;
        bh=Rsv1c9eB/tCtTHdeCJGRATFVUgVys8lI2UmJmc98OKo=;
        b=NDoDhSZ7vwnugKj/p3+OHoA8j/JBKo38XOEnT1cy/nbsadMsDag8IKKNC/w8Q/obdA
         u/wm898H85ePCaYVTg8XMqB4EgAppDik5quncndr8TtqdyQ+pScUR8s3hkSd3xzXqVKC
         bR/8dHApqTws2T8ICCioo76rAMSXB8lHUHwkebV+XkWVsX95aYOP7JVGoxiU+N7iqRlP
         2vpcJDOZb4/6Qu+8433INkrLMxMsMtklc4RHVJENM6YEdxRQk1nHbLvI6nS3P2F04LrE
         N1gCpmLlJvRH6XaFEOBioo3oXKMHAQd52IWwhFzFmc8XN3oZEpTlwokmf+seZJ+f2L9u
         jcyg==
X-Gm-Message-State: AOAM530vfM2VLQYKMuEt5zqfqbzcFns+Dj5l+kV0EYhJegT7Asjg8qMl
        3eaoFNMPaUQCisSnp0Db6mZe1iMI7fFeH9vQSvVSllL7TlQ=
X-Google-Smtp-Source: ABdhPJxGq3tVdyw6liOjZ+4tE3zElVO3AArR6jCMi7VtW+YTmYvo4wB07qnrEIzTrp5A6o5ErgZwj2cqUNywZl8LihY=
X-Received: by 2002:a9d:1b0d:: with SMTP id l13mr117304otl.145.1594826542998;
 Wed, 15 Jul 2020 08:22:22 -0700 (PDT)
MIME-Version: 1.0
References: <20200715121423.6c20731b@canb.auug.org.au> <CAMuHMdWMmP_YHEwnqmuTMw4-+LSieRaSHeqPLYLZyLq+O7zhyQ@mail.gmail.com>
 <6bc36827-83a7-3695-530d-4b90c08b92c7@kernel.dk> <CAMuHMdU3uRV+8ep0YRKuqBitkfVchh1L7=+RVxCAL0rMrQHAiQ@mail.gmail.com>
In-Reply-To: <CAMuHMdU3uRV+8ep0YRKuqBitkfVchh1L7=+RVxCAL0rMrQHAiQ@mail.gmail.com>
From:   Geert Uytterhoeven <geert@linux-m68k.org>
Date:   Wed, 15 Jul 2020 17:22:11 +0200
Message-ID: <CAMuHMdW78E0xe2ogeF0tAK3EN0vBr-B1RBOQTqi4t_9ByUiEEw@mail.gmail.com>
Subject: Re: linux-next: build failure after merge of the block tree
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

Hi Jens,

> On Wed, Jul 15, 2020 at 5:08 PM Jens Axboe <axboe@kernel.dk> wrote:
> > On 7/15/20 3:24 AM, Geert Uytterhoeven wrote:
> > > On Wed, Jul 15, 2020 at 4:26 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >> After merging the block tree, today's linux-next build (arm
> > >> multi_v7_defconfig) failed like this:
> > >>
> > >> block/blk-timeout.c: In function 'blk_round_jiffies':
> > >> block/blk-timeout.c:96:14: error: 'CONFIG_HZ_ROUGH_MASK' undeclared (first use in this function)
> > >>    96 |  return (j + CONFIG_HZ_ROUGH_MASK) + 1;
> > >>       |              ^~~~~~~~~~~~~~~~~~~~
> > >>
> > >> Caused by commit
> > >>
> > >>   91ba0f529364 ("block: relax jiffies rounding for timeouts")
> > >>
> > >> CONFIG_HZ_ROUGH_MASK is not defined for this build even though
> > >> CONFIG_HZ_100 is set. The arm arch does not include kernel/Kconfig.hz.
> > >>
> > >> I have reverted that commit for today.
> > >
> > > (as I don't have the original patch in my email, I'm commenting here)
> > >
> > >     +config HZ_ROUGH_MASK
> > >     +       int
> > >     +       default 127 if HZ_100
> > >     +       default 255 if HZ_250 || HZ_300
> > >     +       default 1023 if HZ_1000
> > >
> > > What about other HZ_* values?
> >
> > Which other ones do we have?
>
> $ git grep "\<HZ_[0-9]" -- "*Kconf*"
> arch/alpha/Kconfig:     default HZ_128 if ALPHA_QEMU
> arch/alpha/Kconfig:     default HZ_1200 if ALPHA_RAWHIDE
> arch/alpha/Kconfig:     default HZ_1024

And ARC allows you to enter any integer value:

    config HZ
            int "Timer Frequency"
            default 100

So probably you want to derive something from the integer value itself.

Note that not all architectures include kernel/Kconfig.hz.

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=STCe=A2=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-4.0 required=3.0 tests=BAYES_00,
	HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS
	autolearn=no autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 44205C433DF
	for <linux-next@archiver.kernel.org>; Wed, 15 Jul 2020 15:17:50 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 2AECA2072E
	for <linux-next@archiver.kernel.org>; Wed, 15 Jul 2020 15:17:50 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1725854AbgGOPRt (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Wed, 15 Jul 2020 11:17:49 -0400
Received: from mail-oo1-f65.google.com ([209.85.161.65]:41830 "EHLO
        mail-oo1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1725798AbgGOPRt (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Wed, 15 Jul 2020 11:17:49 -0400
Received: by mail-oo1-f65.google.com with SMTP id z23so532764ood.8;
        Wed, 15 Jul 2020 08:17:48 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:mime-version:references:in-reply-to:from:date
         :message-id:subject:to:cc;
        bh=07w6zT5p/JCkvgft7yXEC/Da1EqLXDyJjPcjdIL2ruY=;
        b=KoMvZJ1RW4uWbsZKFZ9bC1+dI5SSa8lqHPWx75S0zYDU89uIOn06moxwurD+92arSZ
         zGVnhrSKaCuVkLJ59DWZiDJ/eX9/xipW2zQ0GCsKdb4iJn4G+OblwNVorj3baaFGzrmW
         fBPRalF9btvo4Kl1ad7+PLRMArDaHrRHSERVR6QSWnz7DJhAiKQfUpDAWiBuFjnhq5zk
         +QVBy1+GLKJ0wpGrfLBNApN7aG9EwNIwAOXKLK/SguCgcxVnw4B2udohI74kwz+1cuxX
         yTGfkHK6oDzfBIjvOKzjUpQ5kqwVRQj3GlB1EfLUDB9JsnDGn1OVruIgDfAmmG18hfEQ
         kTtQ==
X-Gm-Message-State: AOAM530FqIOrvxhWTC+rUVbJ25PhboNH3dIP6yttCfPcGVvpKqBMETF5
        9bWOMkf7uRIrsYsxNP+yNsYF7kHe2ab/I3WSZ/LtpFLTSb0=
X-Google-Smtp-Source: ABdhPJzcvtdOKs6/rlkfC19wWNicku4ArAC1wkLz5s5+/Yr9O9b5VZw4xWj+dHNs3IyqCFesO3GORRMCWTrweiBD89g=
X-Received: by 2002:a4a:5209:: with SMTP id d9mr9977302oob.40.1594826268060;
 Wed, 15 Jul 2020 08:17:48 -0700 (PDT)
MIME-Version: 1.0
References: <20200715121423.6c20731b@canb.auug.org.au> <CAMuHMdWMmP_YHEwnqmuTMw4-+LSieRaSHeqPLYLZyLq+O7zhyQ@mail.gmail.com>
 <6bc36827-83a7-3695-530d-4b90c08b92c7@kernel.dk>
In-Reply-To: <6bc36827-83a7-3695-530d-4b90c08b92c7@kernel.dk>
From:   Geert Uytterhoeven <geert@linux-m68k.org>
Date:   Wed, 15 Jul 2020 17:17:36 +0200
Message-ID: <CAMuHMdU3uRV+8ep0YRKuqBitkfVchh1L7=+RVxCAL0rMrQHAiQ@mail.gmail.com>
Subject: Re: linux-next: build failure after merge of the block tree
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

Hi Jens,

On Wed, Jul 15, 2020 at 5:08 PM Jens Axboe <axboe@kernel.dk> wrote:

> On 7/15/20 3:24 AM, Geert Uytterhoeven wrote:
> > On Wed, Jul 15, 2020 at 4:26 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >> After merging the block tree, today's linux-next build (arm
> >> multi_v7_defconfig) failed like this:
> >>
> >> block/blk-timeout.c: In function 'blk_round_jiffies':
> >> block/blk-timeout.c:96:14: error: 'CONFIG_HZ_ROUGH_MASK' undeclared (first use in this function)
> >>    96 |  return (j + CONFIG_HZ_ROUGH_MASK) + 1;
> >>       |              ^~~~~~~~~~~~~~~~~~~~
> >>
> >> Caused by commit
> >>
> >>   91ba0f529364 ("block: relax jiffies rounding for timeouts")
> >>
> >> CONFIG_HZ_ROUGH_MASK is not defined for this build even though
> >> CONFIG_HZ_100 is set. The arm arch does not include kernel/Kconfig.hz.
> >>
> >> I have reverted that commit for today.
> >
> > (as I don't have the original patch in my email, I'm commenting here)
> >
> >     +config HZ_ROUGH_MASK
> >     +       int
> >     +       default 127 if HZ_100
> >     +       default 255 if HZ_250 || HZ_300
> >     +       default 1023 if HZ_1000
> >
> > What about other HZ_* values?
>
> Which other ones do we have?

$ git grep "\<HZ_[0-9]" -- "*Kconf*"
arch/alpha/Kconfig:     default HZ_128 if ALPHA_QEMU
arch/alpha/Kconfig:     default HZ_1200 if ALPHA_RAWHIDE
arch/alpha/Kconfig:     default HZ_1024
arch/alpha/Kconfig:     config HZ_32
arch/alpha/Kconfig:     config HZ_64
arch/alpha/Kconfig:     config HZ_128
arch/alpha/Kconfig:     config HZ_256
arch/alpha/Kconfig:     config HZ_1024
arch/alpha/Kconfig:     config HZ_1200
arch/alpha/Kconfig:     default 32 if HZ_32
arch/alpha/Kconfig:     default 64 if HZ_64
arch/alpha/Kconfig:     default 128 if HZ_128
arch/alpha/Kconfig:     default 256 if HZ_256
arch/alpha/Kconfig:     default 1200 if HZ_1200
arch/arm/Kconfig:config HZ_100
arch/arm/Kconfig:config HZ_200
arch/arm/Kconfig:config HZ_250
arch/arm/Kconfig:config HZ_300
arch/arm/Kconfig:config HZ_500
arch/arm/Kconfig:config HZ_1000
arch/arm/Kconfig:       default 100 if HZ_100
arch/arm/Kconfig:       default 200 if HZ_200
arch/arm/Kconfig:       default 250 if HZ_250
arch/arm/Kconfig:       default 300 if HZ_300
arch/arm/Kconfig:       default 500 if HZ_500
arch/mips/Kconfig:      default HZ_250
arch/mips/Kconfig:      config HZ_24
arch/mips/Kconfig:      config HZ_48
arch/mips/Kconfig:      config HZ_100
arch/mips/Kconfig:      config HZ_128
arch/mips/Kconfig:      config HZ_250
arch/mips/Kconfig:      config HZ_256
arch/mips/Kconfig:      config HZ_1000
arch/mips/Kconfig:      config HZ_1024
arch/mips/Kconfig:      default 24 if HZ_24
arch/mips/Kconfig:      default 48 if HZ_48
arch/mips/Kconfig:      default 100 if HZ_100
arch/mips/Kconfig:      default 128 if HZ_128
arch/mips/Kconfig:      default 250 if HZ_250
arch/mips/Kconfig:      default 256 if HZ_256
arch/mips/Kconfig:      default 1000 if HZ_1000
arch/mips/Kconfig:      default 1024 if HZ_1024
kernel/Kconfig.hz:      default HZ_250
kernel/Kconfig.hz:      config HZ_100
kernel/Kconfig.hz:      config HZ_250
kernel/Kconfig.hz:      config HZ_300
kernel/Kconfig.hz:      config HZ_1000
kernel/Kconfig.hz:      default 100 if HZ_100
kernel/Kconfig.hz:      default 250 if HZ_250
kernel/Kconfig.hz:      default 300 if HZ_300
kernel/Kconfig.hz:      default 1000 if HZ_1000

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=STCe=A2=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-5.5 required=3.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A,
	SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=no autolearn_force=no
	version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id AC95EC433E5
	for <linux-next@archiver.kernel.org>; Wed, 15 Jul 2020 15:25:20 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 899B72065E
	for <linux-next@archiver.kernel.org>; Wed, 15 Jul 2020 15:25:20 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel-dk.20150623.gappssmtp.com header.i=@kernel-dk.20150623.gappssmtp.com header.b="eZCm30jQ"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1726431AbgGOPZU (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Wed, 15 Jul 2020 11:25:20 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60100 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1725797AbgGOPZT (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Wed, 15 Jul 2020 11:25:19 -0400
Received: from mail-il1-x142.google.com (mail-il1-x142.google.com [IPv6:2607:f8b0:4864:20::142])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ABCC5C061755
        for <linux-next@vger.kernel.org>; Wed, 15 Jul 2020 08:25:19 -0700 (PDT)
Received: by mail-il1-x142.google.com with SMTP id r12so2313995ilh.4
        for <linux-next@vger.kernel.org>; Wed, 15 Jul 2020 08:25:19 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20150623.gappssmtp.com; s=20150623;
        h=subject:to:cc:references:from:message-id:date:user-agent
         :mime-version:in-reply-to:content-language:content-transfer-encoding;
        bh=BiW/jN3rL+5vGHysOrPdpgcbXQ4vTbW3++qctnxB/PU=;
        b=eZCm30jQ/Qc+jKEddMFpjDPUVEJDOJ2pl/XK/6BHPnks2yC1LwQwIKyv72gOpCc6lc
         lV81aiqejy5GKid9iK4bdpHGG/fBYBLb5XGkgsdTCfkIjXi2/GWPuKIalBW0LrzcNSrU
         XcsZZBEuWTXwmSEhKlt7lzekUjfaG5Lsamwwlenik2+LS3CnQKlul6rk9OLweAfWtFQC
         1jZPq65bO0bPOuDCA8LxZgIdSEZ9UTt3m3z4V7IKYgYsre3DSs0nLb5odTdPgmqx2AQY
         VENjRQfFl1AyCQ7C6PfzkuQd0KL0GmxDixcrjek12RxJJX0P9gBC0BYi2B2+soPTUwsp
         M1Cg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:subject:to:cc:references:from:message-id:date
         :user-agent:mime-version:in-reply-to:content-language
         :content-transfer-encoding;
        bh=BiW/jN3rL+5vGHysOrPdpgcbXQ4vTbW3++qctnxB/PU=;
        b=lwEdJ4ousgDUmquWYA0v6OqWwuU1tZSGiOUgR0dV6GWbRFKBkudxC6kVGVl4iHkpC0
         QqDCtfO2a68ccmW0IiMu9ikPROvdwn5miE4Kz4ASbXbgURg2gbMSjQyqiVzzchatJc2n
         EU/0F06DlBjheE/4GsmdlvlzRxSFzuv0pOtI/tI6Q5TTt7jgeyvZqZOqHPC6vP9H2W7B
         BL2wTMSWK+ZSkq7rhJ8OWHJCAqmQvjy0TB3lzOQDKNGjC1o2da3rWafHej2Zw3qLS+Pf
         U0iMfdZE/7zrvFjHhwVqKTwjMeOeK4tM+NvNoBgO1WdJErbrXesoTzqLOcgc2Ga0tvIq
         tyIw==
X-Gm-Message-State: AOAM5335lLy0Lp+X6OGRNxxj5j+CDsa5KNKXPBokojH/+GQa6q6o0F9g
        TQzZZfUieTc2O8xiSZPETLHsYw==
X-Google-Smtp-Source: ABdhPJwCzhW5e78PQkSIJCl8zdBuhNHkvJMbJPY3jb2g/z33Q628vl8nCYLAPnihmkQZXphfIS5mwg==
X-Received: by 2002:a92:8b0e:: with SMTP id i14mr9796070ild.307.1594826718885;
        Wed, 15 Jul 2020 08:25:18 -0700 (PDT)
Received: from [192.168.1.58] ([65.144.74.34])
        by smtp.gmail.com with ESMTPSA id a13sm1211031ilk.19.2020.07.15.08.25.18
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Wed, 15 Jul 2020 08:25:18 -0700 (PDT)
Subject: Re: linux-next: build failure after merge of the block tree
To:     Geert Uytterhoeven <geert@linux-m68k.org>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
References: <20200715121423.6c20731b@canb.auug.org.au>
 <CAMuHMdWMmP_YHEwnqmuTMw4-+LSieRaSHeqPLYLZyLq+O7zhyQ@mail.gmail.com>
 <6bc36827-83a7-3695-530d-4b90c08b92c7@kernel.dk>
 <CAMuHMdU3uRV+8ep0YRKuqBitkfVchh1L7=+RVxCAL0rMrQHAiQ@mail.gmail.com>
 <CAMuHMdW78E0xe2ogeF0tAK3EN0vBr-B1RBOQTqi4t_9ByUiEEw@mail.gmail.com>
From:   Jens Axboe <axboe@kernel.dk>
Message-ID: <44248db6-ff4d-aa83-a89e-dd712d540577@kernel.dk>
Date:   Wed, 15 Jul 2020 09:25:17 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.10.0
MIME-Version: 1.0
In-Reply-To: <CAMuHMdW78E0xe2ogeF0tAK3EN0vBr-B1RBOQTqi4t_9ByUiEEw@mail.gmail.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 7/15/20 9:22 AM, Geert Uytterhoeven wrote:
> Hi Jens,
> 
>> On Wed, Jul 15, 2020 at 5:08 PM Jens Axboe <axboe@kernel.dk> wrote:
>>> On 7/15/20 3:24 AM, Geert Uytterhoeven wrote:
>>>> On Wed, Jul 15, 2020 at 4:26 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>>>> After merging the block tree, today's linux-next build (arm
>>>>> multi_v7_defconfig) failed like this:
>>>>>
>>>>> block/blk-timeout.c: In function 'blk_round_jiffies':
>>>>> block/blk-timeout.c:96:14: error: 'CONFIG_HZ_ROUGH_MASK' undeclared (first use in this function)
>>>>>    96 |  return (j + CONFIG_HZ_ROUGH_MASK) + 1;
>>>>>       |              ^~~~~~~~~~~~~~~~~~~~
>>>>>
>>>>> Caused by commit
>>>>>
>>>>>   91ba0f529364 ("block: relax jiffies rounding for timeouts")
>>>>>
>>>>> CONFIG_HZ_ROUGH_MASK is not defined for this build even though
>>>>> CONFIG_HZ_100 is set. The arm arch does not include kernel/Kconfig.hz.
>>>>>
>>>>> I have reverted that commit for today.
>>>>
>>>> (as I don't have the original patch in my email, I'm commenting here)
>>>>
>>>>     +config HZ_ROUGH_MASK
>>>>     +       int
>>>>     +       default 127 if HZ_100
>>>>     +       default 255 if HZ_250 || HZ_300
>>>>     +       default 1023 if HZ_1000
>>>>
>>>> What about other HZ_* values?
>>>
>>> Which other ones do we have?
>>
>> $ git grep "\<HZ_[0-9]" -- "*Kconf*"
>> arch/alpha/Kconfig:     default HZ_128 if ALPHA_QEMU
>> arch/alpha/Kconfig:     default HZ_1200 if ALPHA_RAWHIDE
>> arch/alpha/Kconfig:     default HZ_1024
> 
> And ARC allows you to enter any integer value:
> 
>     config HZ
>             int "Timer Frequency"
>             default 100
> 
> So probably you want to derive something from the integer value itself.
> 
> Note that not all architectures include kernel/Kconfig.hz.

I've dropped the dependency on Kconfig solving it, and just made it
an initcall setup to generate the mask. That should work on all archs
and not be dependent on fixed HZ settings.

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=TrZl=DA=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,
	MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED
	autolearn=ham autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id D015AC4363D
	for <linux-next@archiver.kernel.org>; Wed, 23 Sep 2020 04:34:26 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 1ABEB214F1
	for <linux-next@archiver.kernel.org>; Wed, 23 Sep 2020 04:34:26 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="Nr9X3j4z"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1726807AbgIWEeZ (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Wed, 23 Sep 2020 00:34:25 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54876 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1726802AbgIWEeZ (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Wed, 23 Sep 2020 00:34:25 -0400
Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D0DBC061755;
        Tue, 22 Sep 2020 21:34:25 -0700 (PDT)
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4Bx51C1K0Zz9sS8;
        Wed, 23 Sep 2020 14:34:23 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;
        s=201702; t=1600835663;
        bh=rWyXm4FwJi84iyOR3I5pzw6zG34ItOmSSYW1HqrboOI=;
        h=Date:From:To:Cc:Subject:From;
        b=Nr9X3j4zzYMHgAkCtdCCdl2b7r4RGlm1w+8KtU7iA1Dgi7lt7b1rhcJJaZ9Zbudl8
         RwEu951rM8bH7KH4ZaF8FGbMG1rW5LNwxlHc3HbK5niYoEwutQXYHU/dey+ViLPgLV
         VcPLwRs6EJv8IsmF4K248OKWadDGN19PRNKMf7cpikIyNq+WTkBty3dqwvLcAPfKee
         SRleWX+gwo6xeU6ZMnyY+hD1m5hv9W+CdDV/USGkDvxMn1LLT2M1QSU4vwneMxHdwd
         IfILx9urRTbajHCvpFG+PCV8W3TIfo20Q9eWUxUzB5jaFM9qySkg3sU4xkerqJgxMt
         r/k4aiunVZvgw==
Date:   Wed, 23 Sep 2020 14:34:22 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20200923143422.413c3e97@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/e7FLB01PJw=LROj=WPavc7E";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/e7FLB01PJw=LROj=WPavc7E
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

fs/io_uring.c: In function 'io_resubmit_prep':
fs/io_uring.c:2357:10: error: 'struct io_kiocb' has no member named 'io'
 2357 |  if (!req->io) {
      |          ^~

Caused by commit

  8f3d749685e4 ("io_uring: don't re-setup vecs/iter in io_resumit_prep() is=
 already there")

from Linus' tree interacting with commit

  76c917267129 ("io_uring: get rid of req->io/io_async_ctx union")

from the block tree.

I added the following merge resolution:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 23 Sep 2020 14:30:01 +1000
Subject: [PATCH] fix up for "io_uring: get rid of req->io/io_async_ctx unio=
n"

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

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 5aefea5bb383..0a72f4eed845 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -2354,7 +2354,7 @@ static bool io_resubmit_prep(struct io_kiocb *req, in=
t error)
 		goto end_req;
 	}
=20
-	if (!req->io) {
+	if (!req->async_data) {
 		ret =3D io_import_iovec(rw, req, &iovec, &iter, false);
 		if (ret < 0)
 			goto end_req;
--=20
2.28.0

--=20
Cheers,
Stephen Rothwell

--Sig_/e7FLB01PJw=LROj=WPavc7E
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl9q0E4ACgkQAVBC80lX
0GxMjAf8DZJ/ntWgK+7IARJ50yQps7SaOovSbmqCYqrGSBOFdDn8z9qYehWZrBJR
ZbAUoAjAU1VHybVi/BYVtnW9h17ra04zJDTCNIwPEnZ/0CVQcuVwA8n30DPvaOXz
z07YqRLcTE1mTmvCRHNOaoA55dVj/4rlSiqh/tK4WuBDXpT/05JPW4SCcRGpFVr4
S9jsia3OCxRHxKB0rNKUhO6E0S98f6ReSSIqHhjdGdgVlh4W+/+KQn/wXjorM5aT
1yx47hUUru6clxmSkykPNfuSPtQeewpxS59tYJGxwdO32GKzG7/3m5K1BmHUHhBI
dog420o9lkycazAoKLV0s0TLfjlQ9A==
=8uyx
-----END PGP SIGNATURE-----

--Sig_/e7FLB01PJw=LROj=WPavc7E--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,
	INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED
	autolearn=unavailable autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 765DCC64E8A
	for <linux-next@archiver.kernel.org>; Wed,  2 Dec 2020 04:02:52 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 15F972082D
	for <linux-next@archiver.kernel.org>; Wed,  2 Dec 2020 04:02:51 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728086AbgLBECf (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Tue, 1 Dec 2020 23:02:35 -0500
Received: from ozlabs.org ([203.11.71.1]:60617 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1727005AbgLBECf (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Tue, 1 Dec 2020 23:02:35 -0500
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4Cm4zN5Q9Bz9sSf;
        Wed,  2 Dec 2020 15:01:51 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;
        s=201702; t=1606881713;
        bh=B9J8C0KrgdXeYlmEmzq3VAVeilwaaAUPotN8wo9Ayok=;
        h=Date:From:To:Cc:Subject:From;
        b=BIvrcCAf0DhaD38btlsV94fX26Z0KG9UR8gdW/WR26y+NYVStzGx2s+6OAqoTvDRQ
         V5yztQnr0nKd8wfLAb6Uw9/KJUuyWMkwARhHtVVEf1MHiknUTkx/iItYBXb78MdXjO
         oYMnrXW+6VRZ7JiEp5/o7AinCF+GAlQKkSZm+y4arWTvztuyDUwVK+jT+sGfPolDmh
         c7mgjGlhoGEEylDUmYeIJJhewp1+M/hDZR79Npr/NzFzSiAiVyUMjGXgkveN0i1YSE
         pUKhbPdP8Iw+5IqhLrLkIQj21D2TEulytX/oEgTaVtZex7g67qQ5rTs42EVZ5L2036
         HRtMtA6mbXHIg==
Date:   Wed, 2 Dec 2020 15:01:49 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>, David Sterba <dsterba@suse.com>
Cc:     Damien Le Moal <damien.lemoal@wdc.com>,
        Naohiro Aota <naohiro.aota@wdc.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: linux-next: build failure after merge of the block tree
Message-ID: <20201202150149.42543862@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/gZra8JwowWxMDVPKQPN+6ov";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/gZra8JwowWxMDVPKQPN+6ov
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/btrfs/zoned.c: In function 'btrfs_get_dev_zone_info':
fs/btrfs/zoned.c:168:21: error: 'struct block_device' has no member named '=
bd_part'; did you mean 'bd_partno'?
  168 |  nr_sectors =3D bdev->bd_part->nr_sects;
      |                     ^~~~~~~
      |                     bd_partno
fs/btrfs/zoned.c: In function 'btrfs_sb_log_location_bdev':
fs/btrfs/zoned.c:508:21: error: 'struct block_device' has no member named '=
bd_part'; did you mean 'bd_partno'?
  508 |  nr_sectors =3D bdev->bd_part->nr_sects;
      |                     ^~~~~~~
      |                     bd_partno
fs/btrfs/zoned.c: In function 'btrfs_reset_sb_log_zones':
fs/btrfs/zoned.c:606:21: error: 'struct block_device' has no member named '=
bd_part'; did you mean 'bd_partno'?
  606 |  nr_sectors =3D bdev->bd_part->nr_sects;
      |                     ^~~~~~~
      |                     bd_partno

Caused by commits

  a782483cc1f8 ("block: remove the nr_sects field in struct hd_struct")
  0d02129e76ed ("block: merge struct block_device and struct hd_struct")

interacting with commits

  ab3ea6d0e65c ("btrfs: get zone information of zoned block devices")
  1a4b440a1c2b ("btrfs: implement log-structured superblock for ZONED mode")

from the btrfs tree.

I applied the following merge fix patch (which may, or may not, be
correct but fixes the build).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 2 Dec 2020 14:55:04 +1100
Subject: [PATCH] fixup for "block: merge struct block_device and struct
 hd_struct"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/btrfs/zoned.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c
index 155545180046..c38846659019 100644
--- a/fs/btrfs/zoned.c
+++ b/fs/btrfs/zoned.c
@@ -165,7 +165,7 @@ int btrfs_get_dev_zone_info(struct btrfs_device *device)
 	if (!zone_info)
 		return -ENOMEM;
=20
-	nr_sectors =3D bdev->bd_part->nr_sects;
+	nr_sectors =3D bdev_nr_sectors(bdev);
 	zone_sectors =3D bdev_zone_sectors(bdev);
 	/* Check if it's power of 2 (see is_power_of_2) */
 	ASSERT(zone_sectors !=3D 0 && (zone_sectors & (zone_sectors - 1)) =3D=3D =
0);
@@ -505,7 +505,7 @@ int btrfs_sb_log_location_bdev(struct block_device *bde=
v, int mirror, int rw,
 		return -EINVAL;
 	zone_size =3D zone_sectors << SECTOR_SHIFT;
 	zone_sectors_shift =3D ilog2(zone_sectors);
-	nr_sectors =3D bdev->bd_part->nr_sects;
+	nr_sectors =3D bdev_nr_sectors(bdev);
 	nr_zones =3D nr_sectors >> zone_sectors_shift;
=20
 	sb_zone =3D sb_zone_number(zone_sectors_shift + SECTOR_SHIFT, mirror);
@@ -603,7 +603,7 @@ int btrfs_reset_sb_log_zones(struct block_device *bdev,=
 int mirror)
=20
 	zone_sectors =3D bdev_zone_sectors(bdev);
 	zone_sectors_shift =3D ilog2(zone_sectors);
-	nr_sectors =3D bdev->bd_part->nr_sects;
+	nr_sectors =3D bdev_nr_sectors(bdev);
 	nr_zones =3D nr_sectors >> zone_sectors_shift;
=20
 	sb_zone =3D sb_zone_number(zone_sectors_shift + SECTOR_SHIFT, mirror);
--=20
2.29.2

--=20
Cheers,
Stephen Rothwell

--Sig_/gZra8JwowWxMDVPKQPN+6ov
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl/HEa0ACgkQAVBC80lX
0Gxa1Qf9Ea4iqccc3oQt0k/44YdydlXN0MI91ZunY6rhUcLYpJmx/JJ9JjZoGhCu
FntKQpqZptvxmxk0fIPN+0apPzOsz9GN/Sz0yvImqm64TLhUtmGSrllnt0unCXTw
xZef4MBMZTjj4GqS7cfHmBrpn2ocmzLQrTRrVl4fYEv3JIinbkXInV0NuC8T2qI+
vb7ynJ84QwFQ3hbaEwpDGpf1jyQ5IhMNUMk41gCZFe8/iJpPN6l0dTtB81rQvs9A
e0XLmJ7+d6zJy8nYEkF5eODTTJX0kU50EjsC2k3dgybLfGAkpVcxb5Qkm+1wJTPe
YrgWWkSQeDHDN9z2tOii7Z8s4+Fv7w==
=B42h
-----END PGP SIGNATURE-----

--Sig_/gZra8JwowWxMDVPKQPN+6ov--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-5.2 required=3.0 tests=BAYES_00,
	HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,
	USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id E4EF7C64E8A
	for <linux-next@archiver.kernel.org>; Wed,  2 Dec 2020 07:20:51 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 83C41206A4
	for <linux-next@archiver.kernel.org>; Wed,  2 Dec 2020 07:20:51 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S2387640AbgLBHUf (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Wed, 2 Dec 2020 02:20:35 -0500
Received: from verein.lst.de ([213.95.11.211]:52736 "EHLO verein.lst.de"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S2387639AbgLBHUf (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Wed, 2 Dec 2020 02:20:35 -0500
Received: by verein.lst.de (Postfix, from userid 2407)
        id 409FA67373; Wed,  2 Dec 2020 08:19:53 +0100 (CET)
Date:   Wed, 2 Dec 2020 08:19:53 +0100
From:   Christoph Hellwig <hch@lst.de>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Jens Axboe <axboe@kernel.dk>, David Sterba <dsterba@suse.com>,
        Damien Le Moal <damien.lemoal@wdc.com>,
        Naohiro Aota <naohiro.aota@wdc.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: build failure after merge of the block tree
Message-ID: <20201202071953.GA1022@lst.de>
References: <20201202150149.42543862@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20201202150149.42543862@canb.auug.org.au>
User-Agent: Mutt/1.5.17 (2007-11-01)
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On Wed, Dec 02, 2020 at 03:01:49PM +1100, Stephen Rothwell wrote:
> I applied the following merge fix patch (which may, or may not, be
> correct but fixes the build).

The fixes are exactly what I would have done.  Thanks!

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,
	INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED
	autolearn=ham autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 2635FC433FE
	for <linux-next@archiver.kernel.org>; Mon,  7 Dec 2020 03:10:52 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id E14672312D
	for <linux-next@archiver.kernel.org>; Mon,  7 Dec 2020 03:10:51 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1726484AbgLGDKg (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Sun, 6 Dec 2020 22:10:36 -0500
Received: from bilbo.ozlabs.org ([203.11.71.1]:39345 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1726482AbgLGDKf (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Sun, 6 Dec 2020 22:10:35 -0500
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4Cq7b36XfXz9sVs;
        Mon,  7 Dec 2020 14:09:51 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;
        s=201702; t=1607310593;
        bh=5bh4tlGoUL+1XncBIhF/LpWGb65TQqPGNgtGe+PXrV0=;
        h=Date:From:To:Cc:Subject:From;
        b=jxmi+mSGmjZITruorZ0kkMOF9O5pg0Vvo2xrLAVm2Q9Z9gAvfF0FvvoZVENeEgEWt
         MSFoC7P7inCFz83TsGqzyss4t6MIlGxTjYyiHiWRNckA1LMREDPasGybn6KwsxQfw8
         z4J5Gawg1XRLDfDfo8j40i4qoUHUQO7peDRBtoJ1mo6CUKTq69ioIFCDPwIObRnaGU
         XbjhtiwZq93as04l1exa+SSFQihZ9z0rkPhi1IVyELPTBhhBFcfROAEOXDOxWLPfuO
         RBezhvI3oAIf/io4Gd2xO731hs3iyXcjR0u9zZTXp/FiQwpZq67gk7eZpVjV9V2OsF
         DUt8YOH9t5+Sw==
Date:   Mon, 7 Dec 2020 14:09:51 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Alexei Starovoitov <ast@kernel.org>,
        Networking <netdev@vger.kernel.org>
Cc:     David Miller <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Florent Revest <revest@chromium.org>,
        Florent Revest <revest@google.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20201207140951.4c04f26f@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/5kRkZNS/rNEXgq/a/ECeDM6";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/5kRkZNS/rNEXgq/a/ECeDM6
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

fs/io_uring.c: In function 'io_shutdown':
fs/io_uring.c:3782:9: error: too many arguments to function 'sock_from_file'
 3782 |  sock =3D sock_from_file(req->file, &ret);
      |         ^~~~~~~~~~~~~~
In file included from fs/io_uring.c:63:
include/linux/net.h:243:16: note: declared here
  243 | struct socket *sock_from_file(struct file *file);
      |                ^~~~~~~~~~~~~~

Caused by commit

  36f4fa6886a8 ("io_uring: add support for shutdown(2)")

interacting with commit

  dba4a9256bb4 ("net: Remove the err argument from sock_from_file")

from the bpf-next tree.

I have applied the following merge fix patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 7 Dec 2020 14:04:10 +1100
Subject: [PATCH] fixup for "net: Remove the err argument from sock_from_fil=
e"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/io_uring.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/io_uring.c b/fs/io_uring.c
index cd997264dbab..91d08408f1fe 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -3779,9 +3779,9 @@ static int io_shutdown(struct io_kiocb *req, bool for=
ce_nonblock)
 	if (force_nonblock)
 		return -EAGAIN;
=20
-	sock =3D sock_from_file(req->file, &ret);
+	sock =3D sock_from_file(req->file);
 	if (unlikely(!sock))
-		return ret;
+		return -ENOTSOCK;
=20
 	ret =3D __sys_shutdown_sock(sock, req->shutdown.how);
 	io_req_complete(req, ret);
--=20
2.29.2

--=20
Cheers,
Stephen Rothwell

--Sig_/5kRkZNS/rNEXgq/a/ECeDM6
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl/NnP8ACgkQAVBC80lX
0Gy0WQf9GaIM5CBSqUjd7N8Mw2U6mjQytrpDmJxXIlAEOic/wBwRrwkQBzjYm4Bh
qW68SyvoswdL/oYgw3N07QXs3Ktf7P0f3Ul5w70ugh0rHVMW6Q7E7dnuwtxRPCI6
qKKyBe0yXMHj/jJLSP6L4ki+N5ltUdULO3V22XrqPGbYt0xBs1BSXn3nYlQEHn8L
MwX8O69VO260FJHPz6+7MglxFW7df2WaRBsprGqfUHMY6QDVcENafpIu9wWyinRH
lhyCL09pO0l4S21N6JXbJCUbXdY4bDS3EC+fgd3t5FpIzCkCy8XGwlywTmVBc/ow
2VKP4fiZVOEsoxpbeHA6Bl41dZYeHw==
=ds5/
-----END PGP SIGNATURE-----

--Sig_/5kRkZNS/rNEXgq/a/ECeDM6--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH,
	DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,
	URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 3C2E7C4167B
	for <linux-next@archiver.kernel.org>; Mon,  7 Dec 2020 20:11:32 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 0AFE82389F
	for <linux-next@archiver.kernel.org>; Mon,  7 Dec 2020 20:11:32 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727106AbgLGUKs (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Mon, 7 Dec 2020 15:10:48 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37020 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727057AbgLGUKs (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Mon, 7 Dec 2020 15:10:48 -0500
Received: from mail-ej1-x641.google.com (mail-ej1-x641.google.com [IPv6:2a00:1450:4864:20::641])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AAFEFC061793
        for <linux-next@vger.kernel.org>; Mon,  7 Dec 2020 12:10:01 -0800 (PST)
Received: by mail-ej1-x641.google.com with SMTP id m19so21276368ejj.11
        for <linux-next@vger.kernel.org>; Mon, 07 Dec 2020 12:10:01 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=chromium.org; s=google;
        h=message-id:subject:from:to:cc:date:in-reply-to:references
         :user-agent:mime-version:content-transfer-encoding;
        bh=VHkQ+nvBXFrXSg5QgxUT/Yn56AfAZWnctyqudGP7iUE=;
        b=NdkdTrrA5p42HjeOlz0rWUorqj4muvH/RFJi6l0l8OboMEXUxYIhoqM/MZcqMfKzvp
         1srKSYLbICw0sW1Fd0OTzJEwV+++qWSaXwR/mDhEns1bzJ2gUA4fOtBKsZKQQO1Ici7e
         yVDYDHeBuxEl6p6QsI6bTUH9jQ464LXMNjy9k=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to
         :references:user-agent:mime-version:content-transfer-encoding;
        bh=VHkQ+nvBXFrXSg5QgxUT/Yn56AfAZWnctyqudGP7iUE=;
        b=NuyU8kNKOXwOZAkEeCIHjdO79XYsP9oiP3qiCE8zU67NdRh7rdHbZSg6MpVpSlJ67T
         r25cRfePS2Bv2PTpSI7bL1Nqt6CL7Mp6JLqy0Wx0nZswy0kSewBRj2gsjHIqxsGIP++x
         Wq9uDAp96dgq7VnPKmQtW/11C6KPxbszQSYijgJp3jgxSKNJt7aaLaJJTg5uKbxw9oMO
         BuBGAQ3slL3D27zZsnSRUuxMpP8rVPkF+CIzoSeyu11on3StN3IjqIPpFACMz+7CUTWm
         O21kIau0BtHZhnvqwuF4O5qdclShF+WSbf5RcSC4/udSNC3XgjkkkOeRr5UuMZDw5tNB
         /c7A==
X-Gm-Message-State: AOAM531lCX/0zxsgrHfD6oNY+wLTEOL4Tl0vSSZeF5G3yh30gwzr64kH
        Eq3rb/wV+Asos6PiOUzozcPFmg==
X-Google-Smtp-Source: ABdhPJx2HCFhhVuarEHcEMJ8qFlJOBz7hbByeE4q9TY68GtLeatN4Gj6Gt/PZIN2M6/ugn08HNdi0w==
X-Received: by 2002:a17:906:1393:: with SMTP id f19mr20374282ejc.431.1607371800463;
        Mon, 07 Dec 2020 12:10:00 -0800 (PST)
Received: from ?IPv6:2a04:ee41:4:1318:ea45:a00:4d43:48fc? ([2a04:ee41:4:1318:ea45:a00:4d43:48fc])
        by smtp.gmail.com with ESMTPSA id t8sm14048952eju.69.2020.12.07.12.09.59
        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
        Mon, 07 Dec 2020 12:09:59 -0800 (PST)
Message-ID: <046e725cf72ddae459cc9f5624402a1590307524.camel@chromium.org>
Subject: Re: linux-next: build failure after merge of the block tree
From:   Florent Revest <revest@chromium.org>
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Jens Axboe <axboe@kernel.dk>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Alexei Starovoitov <ast@kernel.org>,
        Networking <netdev@vger.kernel.org>
Cc:     David Miller <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Florent Revest <revest@google.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Date:   Mon, 07 Dec 2020 21:09:59 +0100
In-Reply-To: <20201207140951.4c04f26f@canb.auug.org.au>
References: <20201207140951.4c04f26f@canb.auug.org.au>
Content-Type: text/plain; charset="UTF-8"
User-Agent: Evolution 3.36.4-2 
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On Mon, 2020-12-07 at 14:09 +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the block tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> fs/io_uring.c: In function 'io_shutdown':
> fs/io_uring.c:3782:9: error: too many arguments to function
> 'sock_from_file'
>  3782 |  sock = sock_from_file(req->file, &ret);
>       |         ^~~~~~~~~~~~~~
> In file included from fs/io_uring.c:63:
> include/linux/net.h:243:16: note: declared here
>   243 | struct socket *sock_from_file(struct file *file);
>       |                ^~~~~~~~~~~~~~
> 
> Caused by commit
> 
>   36f4fa6886a8 ("io_uring: add support for shutdown(2)")
> 
> interacting with commit
> 
>   dba4a9256bb4 ("net: Remove the err argument from sock_from_file")
> 
> from the bpf-next tree.
> 
> I have applied the following merge fix patch.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 7 Dec 2020 14:04:10 +1100
> Subject: [PATCH] fixup for "net: Remove the err argument from
> sock_from_file"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  fs/io_uring.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/io_uring.c b/fs/io_uring.c
> index cd997264dbab..91d08408f1fe 100644
> --- a/fs/io_uring.c
> +++ b/fs/io_uring.c
> @@ -3779,9 +3779,9 @@ static int io_shutdown(struct io_kiocb *req,
> bool force_nonblock)
>  	if (force_nonblock)
>  		return -EAGAIN;
>  
> -	sock = sock_from_file(req->file, &ret);
> +	sock = sock_from_file(req->file);
>  	if (unlikely(!sock))
> -		return ret;
> +		return -ENOTSOCK;
>  
>  	ret = __sys_shutdown_sock(sock, req->shutdown.how);
>  	io_req_complete(req, ret);
> -- 
> 2.29.2


Thanks Stephen, this looks good to me.


From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,
	INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED
	autolearn=unavailable autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 06701C4361B
	for <linux-next@archiver.kernel.org>; Mon, 14 Dec 2020 04:19:04 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id A089A20725
	for <linux-next@archiver.kernel.org>; Mon, 14 Dec 2020 04:19:03 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S2438550AbgLNESr (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Sun, 13 Dec 2020 23:18:47 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35866 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1725911AbgLNESr (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Sun, 13 Dec 2020 23:18:47 -0500
Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D9555C0613CF;
        Sun, 13 Dec 2020 20:18:06 -0800 (PST)
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4CvSmX4mstz9sT6;
        Mon, 14 Dec 2020 15:18:04 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;
        s=201702; t=1607919484;
        bh=Ap4veYE6g8S6YKlenbtrX+KmmgQamRiHcRuH1VqFN+s=;
        h=Date:From:To:Cc:Subject:From;
        b=V1vNNohqhMdlrFbS4ZZYvngSMFee7gyh97cqz97pWhDiVPHQ3W+37m+OicYCvzBNs
         35VbiBgIa3+H60yTvjMsoCIiVHvSTKHJAcmG9uJ8PpHA8bwQCYXW+IjLbB4AbdsjLm
         QknQECl8GNvV+myaxH/3ynDOt84b/mqtmGNx2mqCXF0Za7CEKE8hoKOxW6rCr8GACg
         ClQLit/z1Q9nsseSvLo0/nqHxrWTW+0zZ+bqIDKARFShx3dWmSqppmiFQhyuesnW64
         URNx8PH32Zdhk0GhODELBUFxdWyUjxXWG0pcGTo5c3vZxgJoorV0SU3F1OQJyhFaWx
         e0pnOjUbqO0Sw==
Date:   Mon, 14 Dec 2020 15:18:03 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Christoph Hellwig <hch@lst.de>, Song Liu <songliubraving@fb.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20201214151803.411b3b41@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/rgN3xbXPFOB5eCTLP4HJp/x";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/rgN3xbXPFOB5eCTLP4HJp/x
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

drivers/md/raid0.c: In function 'raid0_handle_discard':
drivers/md/raid0.c:511:26: error: passing argument 1 of 'trace_block_bio_re=
map' from incompatible pointer type [-Werror=3Dincompatible-pointer-types]
  511 |    trace_block_bio_remap(bdev_get_queue(rdev->bdev),
      |                          ^~~~~~~~~~~~~~~~~~~~~~~~~~
      |                          |
      |                          struct request_queue *
In file included from include/trace/events/block.h:11,
                 from drivers/md/raid0.c:17:
include/trace/events/block.h:458:23: note: expected 'struct bio *' but argu=
ment is of type 'struct request_queue *'
  458 |  TP_PROTO(struct bio *bio, dev_t dev, sector_t from),
      |           ~~~~~~~~~~~~^~~
include/linux/tracepoint.h:238:34: note: in definition of macro '__DECLARE_=
TRACE'
  238 |  static inline void trace_##name(proto)    \
      |                                  ^~~~~
include/linux/tracepoint.h:411:24: note: in expansion of macro 'PARAMS'
  411 |  __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args),  \
      |                        ^~~~~~
include/linux/tracepoint.h:547:2: note: in expansion of macro 'DECLARE_TRAC=
E'
  547 |  DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
      |  ^~~~~~~~~~~~~
include/linux/tracepoint.h:547:22: note: in expansion of macro 'PARAMS'
  547 |  DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
      |                      ^~~~~~
include/trace/events/block.h:456:1: note: in expansion of macro 'TRACE_EVEN=
T'
  456 | TRACE_EVENT(block_bio_remap,
      | ^~~~~~~~~~~
include/trace/events/block.h:458:2: note: in expansion of macro 'TP_PROTO'
  458 |  TP_PROTO(struct bio *bio, dev_t dev, sector_t from),
      |  ^~~~~~~~
drivers/md/raid0.c:512:5: warning: passing argument 2 of 'trace_block_bio_r=
emap' makes integer from pointer without a cast [-Wint-conversion]
  512 |     discard_bio, disk_devt(mddev->gendisk),
      |     ^~~~~~~~~~~
      |     |
      |     struct bio *
In file included from include/trace/events/block.h:11,
                 from drivers/md/raid0.c:17:
include/trace/events/block.h:458:34: note: expected 'dev_t' {aka 'unsigned =
int'} but argument is of type 'struct bio *'
  458 |  TP_PROTO(struct bio *bio, dev_t dev, sector_t from),
      |                            ~~~~~~^~~
include/linux/tracepoint.h:238:34: note: in definition of macro '__DECLARE_=
TRACE'
  238 |  static inline void trace_##name(proto)    \
      |                                  ^~~~~
include/linux/tracepoint.h:411:24: note: in expansion of macro 'PARAMS'
  411 |  __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args),  \
      |                        ^~~~~~
include/linux/tracepoint.h:547:2: note: in expansion of macro 'DECLARE_TRAC=
E'
  547 |  DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
      |  ^~~~~~~~~~~~~
include/linux/tracepoint.h:547:22: note: in expansion of macro 'PARAMS'
  547 |  DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
      |                      ^~~~~~
include/trace/events/block.h:456:1: note: in expansion of macro 'TRACE_EVEN=
T'
  456 | TRACE_EVENT(block_bio_remap,
      | ^~~~~~~~~~~
include/trace/events/block.h:458:2: note: in expansion of macro 'TP_PROTO'
  458 |  TP_PROTO(struct bio *bio, dev_t dev, sector_t from),
      |  ^~~~~~~~
drivers/md/raid0.c:511:4: error: too many arguments to function 'trace_bloc=
k_bio_remap'
  511 |    trace_block_bio_remap(bdev_get_queue(rdev->bdev),
      |    ^~~~~~~~~~~~~~~~~~~~~
In file included from include/trace/events/block.h:11,
                 from drivers/md/raid0.c:17:
include/linux/tracepoint.h:238:21: note: declared here
  238 |  static inline void trace_##name(proto)    \
      |                     ^~~~~~
include/linux/tracepoint.h:411:2: note: in expansion of macro '__DECLARE_TR=
ACE'
  411 |  __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args),  \
      |  ^~~~~~~~~~~~~~~
include/linux/tracepoint.h:547:2: note: in expansion of macro 'DECLARE_TRAC=
E'
  547 |  DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
      |  ^~~~~~~~~~~~~
include/trace/events/block.h:456:1: note: in expansion of macro 'TRACE_EVEN=
T'
  456 | TRACE_EVENT(block_bio_remap,
      | ^~~~~~~~~~~

Caused by commit

  1c02fca620f7 ("block: remove the request_queue argument to the block_bio_=
remap tracepoint")

interacting with commit

  57a0f3a81ef2 ("Revert "md: add md_submit_discard_bio() for submitting dis=
card bio"")

from Linus' tree.

I have applied the following merge fix:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 14 Dec 2020 15:14:26 +1100
Subject: [PATCH] fixup for "block: remove the request_queue argument to the=
 block_bio_remap tracepoint"

conflicting with

"Revert "md: add md_submit_discard_bio() for submitting discard bio""

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/md/raid0.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index 8f5b0143d8c6..67f157f2525d 100644
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -508,8 +508,8 @@ static void raid0_handle_discard(struct mddev *mddev, s=
truct bio *bio)
 		bio_chain(discard_bio, bio);
 		bio_clone_blkg_association(discard_bio, bio);
 		if (mddev->gendisk)
-			trace_block_bio_remap(bdev_get_queue(rdev->bdev),
-				discard_bio, disk_devt(mddev->gendisk),
+			trace_block_bio_remap(discard_bio,
+				disk_devt(mddev->gendisk),
 				bio->bi_iter.bi_sector);
 		submit_bio_noacct(discard_bio);
 	}
--=20
2.29.2

--=20
Cheers,
Stephen Rothwell

--Sig_/rgN3xbXPFOB5eCTLP4HJp/x
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl/W53sACgkQAVBC80lX
0GwR3wf/VaRztQkjmysC3E5kSROkNLTnSAoLIAi6it6wcBMXe0I+SK5E+DJK/pOt
QMVrL2Xx235qjTU3Zuqjr470XVtvrTX8PfBZnLOeiIqZ0IpyZ8xdbWyyQLWwc2O/
t621f+alBHBW0Q9F+YwuL6CQY0PV3S9Pw+9OJ+Q12VQ9niyRQXecrNfr9yJnJJxj
Msp0KdhKuNRqzGZmtjn+gFUkmIDyAVVCboKgr5CwnwQsdqzyfScuwnJiKWiCGtqm
ewdk2HwlqgA6PuKoeTGTbJ66x7bSQ7sPt6uRpeQmaXnaWSH5N9XUX4S1v91OtSvs
ZUdg+A6TMqMZXmFncMjaW88mPf7f9A==
=QpF7
-----END PGP SIGNATURE-----

--Sig_/rgN3xbXPFOB5eCTLP4HJp/x--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-15.2 required=3.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH,
	MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,
	USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id CA912C2BB40
	for <linux-next@archiver.kernel.org>; Mon, 14 Dec 2020 20:14:40 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 99B23207A2
	for <linux-next@archiver.kernel.org>; Mon, 14 Dec 2020 20:14:40 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S2503085AbgLNUNf (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Mon, 14 Dec 2020 15:13:35 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42566 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S2502894AbgLNUN2 (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Mon, 14 Dec 2020 15:13:28 -0500
Received: from mail-il1-x141.google.com (mail-il1-x141.google.com [IPv6:2607:f8b0:4864:20::141])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A1164C061794
        for <linux-next@vger.kernel.org>; Mon, 14 Dec 2020 12:12:48 -0800 (PST)
Received: by mail-il1-x141.google.com with SMTP id k8so17035816ilr.4
        for <linux-next@vger.kernel.org>; Mon, 14 Dec 2020 12:12:48 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20150623.gappssmtp.com; s=20150623;
        h=subject:to:cc:references:from:message-id:date:user-agent
         :mime-version:in-reply-to:content-language:content-transfer-encoding;
        bh=R0djdFVfiLhwXdPF2sC9wzpfiMJReCx8378wS8crAdQ=;
        b=pzzIA8Xr2kWo6YeaYZQFCcJ3kK0f8401/xEebM0O0EzI2aLnrHSHPLZ1PPXCUmfXXT
         7cficpyqJPnmKFUyKyGakkBHKJx55Y4IhTGX1oS5WZn7DXqKIsXP3CM0tmI9QgQUv/vu
         w/rTD2bxwdXn2HSUgYjipNKFAexktjoGxY2rrrSo6HmMCig35Bm5dQHcMurBfVdtZkG1
         9133kDZVHLUZ2Ezio2UbfYz//hfQmEHEz10KuqS6BELq0qOPLKIxtXXSw/oOJXL1HnFo
         49FsLXLmvloJgKBqY3wMxak3+sTvidjAXn1SbZCix5fH/Kbev+vZkBdKJOy2wubXnUvx
         LI4Q==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:subject:to:cc:references:from:message-id:date
         :user-agent:mime-version:in-reply-to:content-language
         :content-transfer-encoding;
        bh=R0djdFVfiLhwXdPF2sC9wzpfiMJReCx8378wS8crAdQ=;
        b=mimn53EhG1iPO6vR5BAmHqmEc+eaYFqtGCbAn1fG8LXqWDcGzBijWTRzlm/PAAmvcV
         T8Zy7VKDw3HYlGBvN82EUEpS5uYSMYr8GlocHY+iORcWNNu5OqhkYyoiKEVzpsL9kJLm
         2D0evYeIblA115dm9rqQr52FUQp6HHApV5xFZW47d2yKjDNAN+tUHIddMQFANks/XfRO
         fyT0jJU0VdAG0zbYOrkAcO+bME/b5CqDWS6q1QTnUgP3ukmG0FdRxCBecReSdARFrmSp
         GXJjd+x/rwV9sTul9HSmYUGqxKqjoXIfGNCOLs629tpB+/TzJNrQ4L9ijPXtXaEAWSlN
         6IgQ==
X-Gm-Message-State: AOAM533grlP12kfAS3j8P8t28ng6zz4mQrrPVS5plFEAnjdCiHOjLR8Y
        1wqrIBx5RplLQrSN6sUzXFerQMCBLHO+uQ==
X-Google-Smtp-Source: ABdhPJyWvwY0fr/Z+wReYHmlL4RUVHFaF5Dfr2o72c7PuHUh42UbVrPCveuFak52cuHdYL0KPhG5ZA==
X-Received: by 2002:a05:6e02:b28:: with SMTP id e8mr38310171ilu.240.1607976767621;
        Mon, 14 Dec 2020 12:12:47 -0800 (PST)
Received: from [192.168.1.30] ([65.144.74.34])
        by smtp.gmail.com with ESMTPSA id y15sm11746584ili.65.2020.12.14.12.12.46
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Mon, 14 Dec 2020 12:12:47 -0800 (PST)
Subject: Re: linux-next: build failure after merge of the block tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        David Sterba <dsterba@suse.com>
Cc:     Damien Le Moal <damien.lemoal@wdc.com>,
        Naohiro Aota <naohiro.aota@wdc.com>,
        Christoph Hellwig <hch@lst.de>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20201202150149.42543862@canb.auug.org.au>
 <20201215070956.6852e939@canb.auug.org.au>
From:   Jens Axboe <axboe@kernel.dk>
Message-ID: <25c43226-f937-0866-9c0b-46867bd04cc7@kernel.dk>
Date:   Mon, 14 Dec 2020 13:12:46 -0700
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.10.0
MIME-Version: 1.0
In-Reply-To: <20201215070956.6852e939@canb.auug.org.au>
Content-Type: text/plain; charset=windows-1252
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 12/14/20 1:09 PM, Stephen Rothwell wrote:
> Hi all,
> 
> On Wed, 2 Dec 2020 15:01:49 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Hi all,
>>
>> After merging the block tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> fs/btrfs/zoned.c: In function 'btrfs_get_dev_zone_info':
>> fs/btrfs/zoned.c:168:21: error: 'struct block_device' has no member named 'bd_part'; did you mean 'bd_partno'?
>>   168 |  nr_sectors = bdev->bd_part->nr_sects;
>>       |                     ^~~~~~~
>>       |                     bd_partno
>> fs/btrfs/zoned.c: In function 'btrfs_sb_log_location_bdev':
>> fs/btrfs/zoned.c:508:21: error: 'struct block_device' has no member named 'bd_part'; did you mean 'bd_partno'?
>>   508 |  nr_sectors = bdev->bd_part->nr_sects;
>>       |                     ^~~~~~~
>>       |                     bd_partno
>> fs/btrfs/zoned.c: In function 'btrfs_reset_sb_log_zones':
>> fs/btrfs/zoned.c:606:21: error: 'struct block_device' has no member named 'bd_part'; did you mean 'bd_partno'?
>>   606 |  nr_sectors = bdev->bd_part->nr_sects;
>>       |                     ^~~~~~~
>>       |                     bd_partno
>>
>> Caused by commits
>>
>>   a782483cc1f8 ("block: remove the nr_sects field in struct hd_struct")
>>   0d02129e76ed ("block: merge struct block_device and struct hd_struct")
>>
>> interacting with commits
>>
>>   ab3ea6d0e65c ("btrfs: get zone information of zoned block devices")
>>   1a4b440a1c2b ("btrfs: implement log-structured superblock for ZONED mode")
>>
>> from the btrfs tree.
>>
>> I applied the following merge fix patch (which may, or may not, be
>> correct but fixes the build).
>>
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Wed, 2 Dec 2020 14:55:04 +1100
>> Subject: [PATCH] fixup for "block: merge struct block_device and struct
>>  hd_struct"
>>
>> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> ---
>>  fs/btrfs/zoned.c | 6 +++---
>>  1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c
>> index 155545180046..c38846659019 100644
>> --- a/fs/btrfs/zoned.c
>> +++ b/fs/btrfs/zoned.c
>> @@ -165,7 +165,7 @@ int btrfs_get_dev_zone_info(struct btrfs_device *device)
>>  	if (!zone_info)
>>  		return -ENOMEM;
>>  
>> -	nr_sectors = bdev->bd_part->nr_sects;
>> +	nr_sectors = bdev_nr_sectors(bdev);
>>  	zone_sectors = bdev_zone_sectors(bdev);
>>  	/* Check if it's power of 2 (see is_power_of_2) */
>>  	ASSERT(zone_sectors != 0 && (zone_sectors & (zone_sectors - 1)) == 0);
>> @@ -505,7 +505,7 @@ int btrfs_sb_log_location_bdev(struct block_device *bdev, int mirror, int rw,
>>  		return -EINVAL;
>>  	zone_size = zone_sectors << SECTOR_SHIFT;
>>  	zone_sectors_shift = ilog2(zone_sectors);
>> -	nr_sectors = bdev->bd_part->nr_sects;
>> +	nr_sectors = bdev_nr_sectors(bdev);
>>  	nr_zones = nr_sectors >> zone_sectors_shift;
>>  
>>  	sb_zone = sb_zone_number(zone_sectors_shift + SECTOR_SHIFT, mirror);
>> @@ -603,7 +603,7 @@ int btrfs_reset_sb_log_zones(struct block_device *bdev, int mirror)
>>  
>>  	zone_sectors = bdev_zone_sectors(bdev);
>>  	zone_sectors_shift = ilog2(zone_sectors);
>> -	nr_sectors = bdev->bd_part->nr_sects;
>> +	nr_sectors = bdev_nr_sectors(bdev);
>>  	nr_zones = nr_sectors >> zone_sectors_shift;
>>  
>>  	sb_zone = sb_zone_number(zone_sectors_shift + SECTOR_SHIFT, mirror);
> 
> Just a reminder that I am still applying the above merge fix.

I sent in my core changes, but they haven't been pulled yet. So I guess
we're dealing with a timing situation... David, did you send in the btrfs
pull yet?

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,
	INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED
	autolearn=ham autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 7B58AC2BB9A
	for <linux-next@archiver.kernel.org>; Mon, 14 Dec 2020 20:17:20 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 49EA9207A0
	for <linux-next@archiver.kernel.org>; Mon, 14 Dec 2020 20:17:20 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S2502931AbgLNURS (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Mon, 14 Dec 2020 15:17:18 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42120 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1729523AbgLNUKr (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Mon, 14 Dec 2020 15:10:47 -0500
Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D9CF4C0613D3;
        Mon, 14 Dec 2020 12:10:00 -0800 (PST)
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4Cvsts4m7Dz9sTX;
        Tue, 15 Dec 2020 07:09:57 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;
        s=201702; t=1607976598;
        bh=bOGZIK/EC9dOWE8oJ5/EF1E5GiCSPIErQvZ4/oVKtHk=;
        h=Date:From:To:Cc:Subject:In-Reply-To:References:From;
        b=ZH6JVIgfgS5BqpFH6DYnnCcxYmySaWdzxYDUB7ubFw7A4JeioJko7wED2SyY7Y3xs
         beCWzatZoHKsF0BJou/BJKd1zB9/RS3U7XGlvFuqgjo5tGlQgvGFlO2JP66hF9iYtJ
         uLtyGZ/XXmWE4YYn846uyLdXV4BJ7xUlFhstdCJnfoLj7BRP1HgsdhXBIGswJRnyXN
         ie8el/QzC2hBUx3fsrRHAyqNyGuvlkZkTcR5W+MxzPXUv4Xd/K44T1fLu5bZYFRWTK
         83l3TDD937xlIwnE5mkK+zkaHUDYZOH0+Fl2V3CSyaOfsjYJ8ZyzLm5K/CAdk8eew6
         s6YvfS/Mlmw4w==
Date:   Tue, 15 Dec 2020 07:09:56 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>, David Sterba <dsterba@suse.com>
Cc:     Damien Le Moal <damien.lemoal@wdc.com>,
        Naohiro Aota <naohiro.aota@wdc.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: build failure after merge of the block tree
Message-ID: <20201215070956.6852e939@canb.auug.org.au>
In-Reply-To: <20201202150149.42543862@canb.auug.org.au>
References: <20201202150149.42543862@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/V+8HwfLtgijqLM864dR=WCo";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/V+8HwfLtgijqLM864dR=WCo
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Wed, 2 Dec 2020 15:01:49 +1100 Stephen Rothwell <sfr@canb.auug.org.au> w=
rote:
>
> Hi all,
>=20
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>=20
> fs/btrfs/zoned.c: In function 'btrfs_get_dev_zone_info':
> fs/btrfs/zoned.c:168:21: error: 'struct block_device' has no member named=
 'bd_part'; did you mean 'bd_partno'?
>   168 |  nr_sectors =3D bdev->bd_part->nr_sects;
>       |                     ^~~~~~~
>       |                     bd_partno
> fs/btrfs/zoned.c: In function 'btrfs_sb_log_location_bdev':
> fs/btrfs/zoned.c:508:21: error: 'struct block_device' has no member named=
 'bd_part'; did you mean 'bd_partno'?
>   508 |  nr_sectors =3D bdev->bd_part->nr_sects;
>       |                     ^~~~~~~
>       |                     bd_partno
> fs/btrfs/zoned.c: In function 'btrfs_reset_sb_log_zones':
> fs/btrfs/zoned.c:606:21: error: 'struct block_device' has no member named=
 'bd_part'; did you mean 'bd_partno'?
>   606 |  nr_sectors =3D bdev->bd_part->nr_sects;
>       |                     ^~~~~~~
>       |                     bd_partno
>=20
> Caused by commits
>=20
>   a782483cc1f8 ("block: remove the nr_sects field in struct hd_struct")
>   0d02129e76ed ("block: merge struct block_device and struct hd_struct")
>=20
> interacting with commits
>=20
>   ab3ea6d0e65c ("btrfs: get zone information of zoned block devices")
>   1a4b440a1c2b ("btrfs: implement log-structured superblock for ZONED mod=
e")
>=20
> from the btrfs tree.
>=20
> I applied the following merge fix patch (which may, or may not, be
> correct but fixes the build).
>=20
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 2 Dec 2020 14:55:04 +1100
> Subject: [PATCH] fixup for "block: merge struct block_device and struct
>  hd_struct"
>=20
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  fs/btrfs/zoned.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>=20
> diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c
> index 155545180046..c38846659019 100644
> --- a/fs/btrfs/zoned.c
> +++ b/fs/btrfs/zoned.c
> @@ -165,7 +165,7 @@ int btrfs_get_dev_zone_info(struct btrfs_device *devi=
ce)
>  	if (!zone_info)
>  		return -ENOMEM;
> =20
> -	nr_sectors =3D bdev->bd_part->nr_sects;
> +	nr_sectors =3D bdev_nr_sectors(bdev);
>  	zone_sectors =3D bdev_zone_sectors(bdev);
>  	/* Check if it's power of 2 (see is_power_of_2) */
>  	ASSERT(zone_sectors !=3D 0 && (zone_sectors & (zone_sectors - 1)) =3D=
=3D 0);
> @@ -505,7 +505,7 @@ int btrfs_sb_log_location_bdev(struct block_device *b=
dev, int mirror, int rw,
>  		return -EINVAL;
>  	zone_size =3D zone_sectors << SECTOR_SHIFT;
>  	zone_sectors_shift =3D ilog2(zone_sectors);
> -	nr_sectors =3D bdev->bd_part->nr_sects;
> +	nr_sectors =3D bdev_nr_sectors(bdev);
>  	nr_zones =3D nr_sectors >> zone_sectors_shift;
> =20
>  	sb_zone =3D sb_zone_number(zone_sectors_shift + SECTOR_SHIFT, mirror);
> @@ -603,7 +603,7 @@ int btrfs_reset_sb_log_zones(struct block_device *bde=
v, int mirror)
> =20
>  	zone_sectors =3D bdev_zone_sectors(bdev);
>  	zone_sectors_shift =3D ilog2(zone_sectors);
> -	nr_sectors =3D bdev->bd_part->nr_sects;
> +	nr_sectors =3D bdev_nr_sectors(bdev);
>  	nr_zones =3D nr_sectors >> zone_sectors_shift;
> =20
>  	sb_zone =3D sb_zone_number(zone_sectors_shift + SECTOR_SHIFT, mirror);

Just a reminder that I am still applying the above merge fix.

--=20
Cheers,
Stephen Rothwell

--Sig_/V+8HwfLtgijqLM864dR=WCo
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl/XxpQACgkQAVBC80lX
0GxhNwgAhiawlO9QrGibxvUMdbTgEUUrZd+IUONEPsj8nwuflNiyn3wDnIEwetlS
9eF4TbD47ETTC588SASuLdfyOwDuC8VzbW570n6wzk6qNrtsYha0Uq4w2Ye+SC9n
lrCYhYlRXySq9YajvAGaS+uUJkVd2O5nhqXbQVfj4dFAmL4Q6I3BP2Ln8k+RZYUl
KjJpLFHpOCemUGdiEc+HxQlb8gI+cjhLvT5ttLzVGUBmIZsH98MvjsIcGfV3NeBp
UH2U2sPxZwD6EzwLlhALDKjaK/oV2LMNmBd6svf5R7QSbuhPXqJ4yh4nwZGC4o43
HnxWCKVTF5El1ZDz8QluIA0Mp8HyYg==
=OCtM
-----END PGP SIGNATURE-----

--Sig_/V+8HwfLtgijqLM864dR=WCo--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,
	INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED
	autolearn=ham autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id AAFF6C2BB40
	for <linux-next@archiver.kernel.org>; Mon, 14 Dec 2020 20:30:52 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 74E4C2226A
	for <linux-next@archiver.kernel.org>; Mon, 14 Dec 2020 20:30:52 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S2503317AbgLNUa3 (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Mon, 14 Dec 2020 15:30:29 -0500
Received: from ozlabs.org ([203.11.71.1]:60493 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S2388483AbgLNUa2 (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Mon, 14 Dec 2020 15:30:28 -0500
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4CvtKc0wX8z9sS8;
        Tue, 15 Dec 2020 07:29:40 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;
        s=201702; t=1607977781;
        bh=oCRoJqFc/+FmU+nNV9clfFzmex118Yv1qsU3bjLcBnE=;
        h=Date:From:To:Cc:Subject:In-Reply-To:References:From;
        b=i6tne6tcJtRXZHFQLpAsZA1tPQ67yQhTER+d7zEcSRu4Ik2ZD+QIAxp0KrpPTbOd8
         GRhrL8rD2aU3rzmEUxuzHjQBpOqT0rvfgTJZQ1BYmr1z/2ibmzt0AL+2Oa6Wvas64f
         ww6QnzzqpZqwpuquovArQqST/2uSVTJcvLlSFfayirl2UYD3/EJDEU9YbhXNL+kIJd
         Q9TXTKDIBkVgpLc7CrzTkaqEH9g6MTTqXqs4ZHU25Wu4JKdiF72xvL/TbNIinF1PJe
         EuMcRCpQ4lln0p65Td8AI3bH8YezsBRORyMjIsrLY8A75kZHzEdyAZru6H3QYFO8SX
         0gRAYte5g/FZA==
Date:   Tue, 15 Dec 2020 07:29:39 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Alexei Starovoitov <ast@kernel.org>,
        Networking <netdev@vger.kernel.org>
Cc:     David Miller <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Florent Revest <revest@chromium.org>,
        Florent Revest <revest@google.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the block tree
Message-ID: <20201215072939.6a665cf3@canb.auug.org.au>
In-Reply-To: <20201207140951.4c04f26f@canb.auug.org.au>
References: <20201207140951.4c04f26f@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/T3rfAfpL0zH0ZZAbOzmD5q/";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/T3rfAfpL0zH0ZZAbOzmD5q/
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Mon, 7 Dec 2020 14:09:51 +1100 Stephen Rothwell <sfr@canb.auug.org.au> w=
rote:
>
> After merging the block tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>=20
> fs/io_uring.c: In function 'io_shutdown':
> fs/io_uring.c:3782:9: error: too many arguments to function 'sock_from_fi=
le'
>  3782 |  sock =3D sock_from_file(req->file, &ret);
>       |         ^~~~~~~~~~~~~~
> In file included from fs/io_uring.c:63:
> include/linux/net.h:243:16: note: declared here
>   243 | struct socket *sock_from_file(struct file *file);
>       |                ^~~~~~~~~~~~~~
>=20
> Caused by commit
>=20
>   36f4fa6886a8 ("io_uring: add support for shutdown(2)")
>=20
> interacting with commit
>=20
>   dba4a9256bb4 ("net: Remove the err argument from sock_from_file")
>=20
> from the bpf-next tree.
>=20
> I have applied the following merge fix patch.
>=20
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 7 Dec 2020 14:04:10 +1100
> Subject: [PATCH] fixup for "net: Remove the err argument from sock_from_f=
ile"
>=20
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  fs/io_uring.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>=20
> diff --git a/fs/io_uring.c b/fs/io_uring.c
> index cd997264dbab..91d08408f1fe 100644
> --- a/fs/io_uring.c
> +++ b/fs/io_uring.c
> @@ -3779,9 +3779,9 @@ static int io_shutdown(struct io_kiocb *req, bool f=
orce_nonblock)
>  	if (force_nonblock)
>  		return -EAGAIN;
> =20
> -	sock =3D sock_from_file(req->file, &ret);
> +	sock =3D sock_from_file(req->file);
>  	if (unlikely(!sock))
> -		return ret;
> +		return -ENOTSOCK;
> =20
>  	ret =3D __sys_shutdown_sock(sock, req->shutdown.how);
>  	io_req_complete(req, ret);

Just a reminder that I am still applying this merge fix.

--=20
Cheers,
Stephen Rothwell

--Sig_/T3rfAfpL0zH0ZZAbOzmD5q/
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl/XyzMACgkQAVBC80lX
0GwWUggAn7ql1hC2UGt+piu1oNbFBTkKpQNJI+21jK5WrWX/d+g5vSUIY8irk49Z
8amRkh7n+b8Bk1IIpIjsYswk431MWYaXJ4s2iQ+/GW8PFZz2aTpVlMWmvyhh8uV3
F6IwGPSB3q7Kcq3AH0/eRQQf8J3HB11r+l0CJzZ6TMMiFZMSIIHvKaUertWbHK0w
2Z8tXXwJjr4uVQjl90T0HLWlRsorAf6BMfDQ8/mfgcJrVS+1O55/MzTOZ7VobJGu
NbBtxK1WVCC5zWY04CjWDVVhlYTsE9sb5jfW43mu7sH3GQ8TLZUiaONaIuqqqfQc
6Gg1Q6c4ZYL55G2rL9zr/e/u4fmNhg==
=RpZP
-----END PGP SIGNATURE-----

--Sig_/T3rfAfpL0zH0ZZAbOzmD5q/--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-5.2 required=3.0 tests=BAYES_00,
	HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,
	USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id F1E89C4361B
	for <linux-next@archiver.kernel.org>; Mon, 14 Dec 2020 21:38:34 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 9121321534
	for <linux-next@archiver.kernel.org>; Mon, 14 Dec 2020 21:38:34 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1730595AbgLNVie (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Mon, 14 Dec 2020 16:38:34 -0500
Received: from mx2.suse.de ([195.135.220.15]:33808 "EHLO mx2.suse.de"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1727156AbgLNVid (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Mon, 14 Dec 2020 16:38:33 -0500
X-Virus-Scanned: by amavisd-new at test-mx.suse.de
Received: from relay2.suse.de (unknown [195.135.221.27])
        by mx2.suse.de (Postfix) with ESMTP id 3059DAC7F;
        Mon, 14 Dec 2020 21:37:52 +0000 (UTC)
Received: by ds.suse.cz (Postfix, from userid 10065)
        id 28C83DA7C3; Mon, 14 Dec 2020 22:36:13 +0100 (CET)
Date:   Mon, 14 Dec 2020 22:36:12 +0100
From:   David Sterba <dsterba@suse.cz>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        David Sterba <dsterba@suse.com>,
        Damien Le Moal <damien.lemoal@wdc.com>,
        Naohiro Aota <naohiro.aota@wdc.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: build failure after merge of the block tree
Message-ID: <20201214213612.GS6430@suse.cz>
Reply-To: dsterba@suse.cz
Mail-Followup-To: dsterba@suse.cz, Jens Axboe <axboe@kernel.dk>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        David Sterba <dsterba@suse.com>,
        Damien Le Moal <damien.lemoal@wdc.com>,
        Naohiro Aota <naohiro.aota@wdc.com>, Christoph Hellwig <hch@lst.de>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20201202150149.42543862@canb.auug.org.au>
 <20201215070956.6852e939@canb.auug.org.au>
 <25c43226-f937-0866-9c0b-46867bd04cc7@kernel.dk>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <25c43226-f937-0866-9c0b-46867bd04cc7@kernel.dk>
User-Agent: Mutt/1.5.23.1-rc1 (2014-03-12)
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On Mon, Dec 14, 2020 at 01:12:46PM -0700, Jens Axboe wrote:
> On 12/14/20 1:09 PM, Stephen Rothwell wrote:
> > Just a reminder that I am still applying the above merge fix.
> 
> I sent in my core changes, but they haven't been pulled yet. So I guess
> we're dealing with a timing situation... David, did you send in the btrfs
> pull yet?

Yes
https://lore.kernel.org/lkml/cover.1607955523.git.dsterba@suse.com/

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-5.7 required=3.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no
	version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 3FC92C4361B
	for <linux-next@archiver.kernel.org>; Mon, 14 Dec 2020 21:43:47 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id ED9A322258
	for <linux-next@archiver.kernel.org>; Mon, 14 Dec 2020 21:43:46 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S2393552AbgLNVnq (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Mon, 14 Dec 2020 16:43:46 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56554 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S2392109AbgLNVnq (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Mon, 14 Dec 2020 16:43:46 -0500
Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18277C0613D3;
        Mon, 14 Dec 2020 13:43:06 -0800 (PST)
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4CvvyG1V2zz9s0b;
        Tue, 15 Dec 2020 08:43:01 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;
        s=201702; t=1607982182;
        bh=9zZ4CaJ1f9yKLix26zpf+IqButEHk07/UblP1CruQGc=;
        h=Date:From:To:Cc:Subject:In-Reply-To:References:From;
        b=b4mnC5oIz14QoU6jId/JtbDuMe3QiiUOgA//4uhZK4fzI/Chn0GElyK0t+q0fNNrW
         e6AppecIgxshLXVCFBg6017mH8SABibD2B+tzk5/F/d/QVuqyAukAp/wxnfpkHg6u5
         AESmYw431tOcc+bAGzFa93Z0HhGVn2BvyBSuLp5z/Q5Fz39ncThG1u8ejtzTes8Xn6
         NkYIY1xedppB0OnztVQS6om0GwdR4MkP1F22u+K7CXZoC9fkD2nfMcoW57OkyCtuL1
         8o1i8R9BvNnKolrRkxWj4Zai6HuA2CtBM2VOPwsPuZYg3XSN2rll0TR+fjilemDubn
         16Clny3iNcTug==
Date:   Tue, 15 Dec 2020 08:43:00 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     David Sterba <dsterba@suse.cz>
Cc:     Jens Axboe <axboe@kernel.dk>, David Sterba <dsterba@suse.com>,
        Damien Le Moal <damien.lemoal@wdc.com>,
        Naohiro Aota <naohiro.aota@wdc.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: build failure after merge of the block tree
Message-ID: <20201215084300.3543c433@canb.auug.org.au>
In-Reply-To: <20201214213612.GS6430@suse.cz>
References: <20201202150149.42543862@canb.auug.org.au>
        <20201215070956.6852e939@canb.auug.org.au>
        <25c43226-f937-0866-9c0b-46867bd04cc7@kernel.dk>
        <20201214213612.GS6430@suse.cz>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/yP56w+C5xgj2Oxokg8e0qTf";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/yP56w+C5xgj2Oxokg8e0qTf
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi David,

On Mon, 14 Dec 2020 22:36:12 +0100 David Sterba <dsterba@suse.cz> wrote:
>
> On Mon, Dec 14, 2020 at 01:12:46PM -0700, Jens Axboe wrote:
> > On 12/14/20 1:09 PM, Stephen Rothwell wrote: =20
> > > Just a reminder that I am still applying the above merge fix. =20
> >=20
> > I sent in my core changes, but they haven't been pulled yet. So I guess
> > we're dealing with a timing situation... David, did you send in the btr=
fs
> > pull yet? =20
>=20
> Yes
> https://lore.kernel.org/lkml/cover.1607955523.git.dsterba@suse.com/

I would expect you *both* to at least mention this conflict to Linus ...

--=20
Cheers,
Stephen Rothwell

--Sig_/yP56w+C5xgj2Oxokg8e0qTf
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl/X3GQACgkQAVBC80lX
0GwUOAf7BCupZhrH2m2TJVGAUKCPwPHu4YXNRd6qZwz5TD6ZnwIh9coLFVzi8DaO
ReDNKTw1vJDUK8x5Aa+J4AWvsRIZehVTjX1b7l0TMizYHLL/6xR+GUEBauaIUjmE
z4T/vheB0eP+hfqvOdOhAe6YKoODs9ShXzQyHZNPPaG6YY91qjhwLYVmqE3HpLdl
ScOH8T8PvuafJMbKaJoDGUHI5Tn39NiP4poo06mKQzD0ssAkm0YRrTklQnCjUe8n
bpM2h0G+n7vuq3il6uMCRtciu0Z5pNUuCrbv3fWrZqPxAGEBWvEITMb4lYcx4CA5
nTEUUH3aSi40uo3kCrZ5v9R1XlslJQ==
=A+gw
-----END PGP SIGNATURE-----

--Sig_/yP56w+C5xgj2Oxokg8e0qTf--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-5.2 required=3.0 tests=BAYES_00,
	HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,
	URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id D0E49C4361B
	for <linux-next@archiver.kernel.org>; Mon, 14 Dec 2020 21:57:22 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 8675C22210
	for <linux-next@archiver.kernel.org>; Mon, 14 Dec 2020 21:57:22 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S2390837AbgLNV5G (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Mon, 14 Dec 2020 16:57:06 -0500
Received: from mx2.suse.de ([195.135.220.15]:53014 "EHLO mx2.suse.de"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1731377AbgLNV5G (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Mon, 14 Dec 2020 16:57:06 -0500
X-Virus-Scanned: by amavisd-new at test-mx.suse.de
Received: from relay2.suse.de (unknown [195.135.221.27])
        by mx2.suse.de (Postfix) with ESMTP id 07896AC90;
        Mon, 14 Dec 2020 21:56:25 +0000 (UTC)
Received: by ds.suse.cz (Postfix, from userid 10065)
        id 3135CDA7C3; Mon, 14 Dec 2020 22:54:46 +0100 (CET)
Date:   Mon, 14 Dec 2020 22:54:46 +0100
From:   David Sterba <dsterba@suse.cz>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Jens Axboe <axboe@kernel.dk>, David Sterba <dsterba@suse.com>,
        Damien Le Moal <damien.lemoal@wdc.com>,
        Naohiro Aota <naohiro.aota@wdc.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: build failure after merge of the block tree
Message-ID: <20201214215445.GT6430@suse.cz>
Reply-To: dsterba@suse.cz
Mail-Followup-To: dsterba@suse.cz, Stephen Rothwell <sfr@canb.auug.org.au>,
        Jens Axboe <axboe@kernel.dk>, David Sterba <dsterba@suse.com>,
        Damien Le Moal <damien.lemoal@wdc.com>,
        Naohiro Aota <naohiro.aota@wdc.com>, Christoph Hellwig <hch@lst.de>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20201202150149.42543862@canb.auug.org.au>
 <20201215070956.6852e939@canb.auug.org.au>
 <25c43226-f937-0866-9c0b-46867bd04cc7@kernel.dk>
 <20201214213612.GS6430@suse.cz>
 <20201215084300.3543c433@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20201215084300.3543c433@canb.auug.org.au>
User-Agent: Mutt/1.5.23.1-rc1 (2014-03-12)
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On Tue, Dec 15, 2020 at 08:43:00AM +1100, Stephen Rothwell wrote:
> Hi David,
> 
> On Mon, 14 Dec 2020 22:36:12 +0100 David Sterba <dsterba@suse.cz> wrote:
> >
> > On Mon, Dec 14, 2020 at 01:12:46PM -0700, Jens Axboe wrote:
> > > On 12/14/20 1:09 PM, Stephen Rothwell wrote:  
> > > > Just a reminder that I am still applying the above merge fix.  
> > > 
> > > I sent in my core changes, but they haven't been pulled yet. So I guess
> > > we're dealing with a timing situation... David, did you send in the btrfs
> > > pull yet?  
> > 
> > Yes
> > https://lore.kernel.org/lkml/cover.1607955523.git.dsterba@suse.com/
> 
> I would expect you *both* to at least mention this conflict to Linus ...

2nd paragraph in the mail

"There are no merge conflicts against current master branch, in past
 weeks some conflicts emerged in linux-next but IIRC were trivial."

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-5.7 required=3.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no
	version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 57695C4361B
	for <linux-next@archiver.kernel.org>; Mon, 14 Dec 2020 22:02:22 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 222112226A
	for <linux-next@archiver.kernel.org>; Mon, 14 Dec 2020 22:02:22 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727013AbgLNWCP (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Mon, 14 Dec 2020 17:02:15 -0500
Received: from ozlabs.org ([203.11.71.1]:56513 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1730517AbgLNWCN (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Mon, 14 Dec 2020 17:02:13 -0500
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4CvwMb0WKqz9sSn;
        Tue, 15 Dec 2020 09:01:30 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;
        s=201702; t=1607983291;
        bh=qmia65so9Mk+dno5qTwFh5y8LiTEShWkZNN7F5/2YjA=;
        h=Date:From:To:Cc:Subject:In-Reply-To:References:From;
        b=aZM5YD05i0GtVLEutBW4m3RLAkpITnkRFoMcVT9cIBa8jko6h6VHxTp/MBA76kR/J
         Yzxq1V+L3PreKy2eYO/ETi6DBFsDjKKXi+jpRdju2Q+pwiLeWXg3G1rml5hE0J2Ggw
         4NAc98sn81VGKhACIE5/wmRxPc8GMnXniGa5CZTsZrXu6HKBTOSN4wp6784KNZjlNo
         rfD2Wi0Yvxq9gFSvxmZObyWagynStWDw6QgAST2wkL1jQEHe0fctVWtaRLrPGmxLC9
         MrCrIhYm1ZolbWemsAXPL1wmVSvYtkrqKuQZAGVNegEKR/ybVwHYg7rJi6gu2GF0qr
         ub6gaVcACxq6Q==
Date:   Tue, 15 Dec 2020 09:01:29 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     David Sterba <dsterba@suse.cz>
Cc:     Jens Axboe <axboe@kernel.dk>, David Sterba <dsterba@suse.com>,
        Damien Le Moal <damien.lemoal@wdc.com>,
        Naohiro Aota <naohiro.aota@wdc.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: build failure after merge of the block tree
Message-ID: <20201215090129.47344ce7@canb.auug.org.au>
In-Reply-To: <20201214215445.GT6430@suse.cz>
References: <20201202150149.42543862@canb.auug.org.au>
        <20201215070956.6852e939@canb.auug.org.au>
        <25c43226-f937-0866-9c0b-46867bd04cc7@kernel.dk>
        <20201214213612.GS6430@suse.cz>
        <20201215084300.3543c433@canb.auug.org.au>
        <20201214215445.GT6430@suse.cz>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/WvO_tZwrn/um/PblLvp0R5R";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/WvO_tZwrn/um/PblLvp0R5R
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi David,

On Mon, 14 Dec 2020 22:54:46 +0100 David Sterba <dsterba@suse.cz> wrote:
>
> On Tue, Dec 15, 2020 at 08:43:00AM +1100, Stephen Rothwell wrote:
> >=20
> > On Mon, 14 Dec 2020 22:36:12 +0100 David Sterba <dsterba@suse.cz> wrote=
: =20
> > >
> > > On Mon, Dec 14, 2020 at 01:12:46PM -0700, Jens Axboe wrote: =20
> > > > On 12/14/20 1:09 PM, Stephen Rothwell wrote:   =20
> > > > > Just a reminder that I am still applying the above merge fix.   =
=20
> > > >=20
> > > > I sent in my core changes, but they haven't been pulled yet. So I g=
uess
> > > > we're dealing with a timing situation... David, did you send in the=
 btrfs
> > > > pull yet?   =20
> > >=20
> > > Yes
> > > https://lore.kernel.org/lkml/cover.1607955523.git.dsterba@suse.com/ =
=20
> >=20
> > I would expect you *both* to at least mention this conflict to Linus ..=
. =20
>=20
> 2nd paragraph in the mail
>=20
> "There are no merge conflicts against current master branch, in past
>  weeks some conflicts emerged in linux-next but IIRC were trivial."

No worries then, thanks.

--=20
Cheers,
Stephen Rothwell

--Sig_/WvO_tZwrn/um/PblLvp0R5R
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl/X4LkACgkQAVBC80lX
0GwHgwf/bM/idF7PHRTNWHnfugW6Ypx9+x9Wh+g63FI25BMLcfWBx0UzWj51NgWm
6N+yHKrwTUwkp+sG65Oqz96vNHO8B1hD3VVypMoSbtHRIHWUcuyXGmg5KWTRYIuK
vdZuo/UFbD186MRI4iX5CatnH3MlFfsgnWB8MWblUrNtg3KfZ4YKmKG0L2F498hR
bl663TfjNsekMivy+bb7t4Rafy3U0oQdv/7h3UiKGv3dpm2uqwtDdFiXHwGtf1ym
VCCU+cCJhVcpe0mjyRLmcOO3rL20mFsHi4AVuHbEKUKR8z4jJji+LJfkJSC3peCT
L3GMAzFjJvXXaC+Jy2n+Y0Lg7/zYxA==
=jXiI
-----END PGP SIGNATURE-----

--Sig_/WvO_tZwrn/um/PblLvp0R5R--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,
	INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED
	autolearn=ham autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 94F5CC433E0
	for <linux-next@archiver.kernel.org>; Tue,  2 Feb 2021 02:58:15 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 5CF1464E91
	for <linux-next@archiver.kernel.org>; Tue,  2 Feb 2021 02:58:15 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S229612AbhBBC57 (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Mon, 1 Feb 2021 21:57:59 -0500
Received: from bilbo.ozlabs.org ([203.11.71.1]:41895 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S229537AbhBBC56 (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Mon, 1 Feb 2021 21:57:58 -0500
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4DV8cD0DdXz9tjt;
        Tue,  2 Feb 2021 13:57:16 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;
        s=201702; t=1612234636;
        bh=5xkzDG4WtUNuRhGuN7jmw2R75twvSA4l6Hb78ZxgOb0=;
        h=Date:From:To:Cc:Subject:From;
        b=lmX0MWQZPTIVfi/2Ns6f+WpVd9hSAAgpiH4/JQCHTW8wDPjZSLUc6/PCkN9aUXeNf
         ClhRud9vDq67PvrqumdILcSX55gVsc+3gz5EfgrZ6JWwPm7tOzDMzPLYQSoJGT6d9Z
         CQrRKodycRMj8z55o9rO9cXleSZGDj9gaPBSX407QfE87MgfvtuKLfJrMNMapAGBuc
         pinwiEbbPIM4kyN7GJeduqvLkxu/DaKtquGxUT0JaQVGJoat47o3yBDmwLeq0UOZGT
         Ey4ZESjRKDdwPqJPHUJ1v9mMXwT7HzQ/lydS/JkhRa6+ieq4NR6aXk4qkA6ThJeQ/6
         p8ngvoLqFsR5g==
Date:   Tue, 2 Feb 2021 13:57:14 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>, David Sterba <dsterba@suse.cz>
Cc:     Christoph Hellwig <hch@lst.de>, David Sterba <dsterba@suse.com>,
        Johannes Thumshirn <johannes.thumshirn@wdc.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20210202135714.6470f476@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/8khiC8Fh8Zx.ODu4O_E0T+r";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/8khiC8Fh8Zx.ODu4O_E0T+r
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

block/bio.c: In function 'bio_add_zone_append_page':
block/bio.c:860:31: error: 'struct bio' has no member named 'bi_disk'
  860 |  struct request_queue *q =3D bio->bi_disk->queue;
      |                               ^~

Caused by commit

  309dca309fc3 ("block: store a block_device pointer in struct bio")

interacting with commit

  9f678097f3de ("block: add bio_add_zone_append_page")

from the btrfs tree.

I applied the following merge fix up for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 2 Feb 2021 13:54:29 +1100
Subject: [PATCH] block: bio: fix up for bi_disk removal

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

diff --git a/block/bio.c b/block/bio.c
index bf3ab1b5c844..e3b9d3e0a196 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -857,7 +857,7 @@ EXPORT_SYMBOL(bio_add_pc_page);
 int bio_add_zone_append_page(struct bio *bio, struct page *page,
 			     unsigned int len, unsigned int offset)
 {
-	struct request_queue *q =3D bio->bi_disk->queue;
+	struct request_queue *q =3D bio->bi_bdev->bd_disk->queue;
 	bool same_page =3D false;
=20
 	if (WARN_ON_ONCE(bio_op(bio) !=3D REQ_OP_ZONE_APPEND))
--=20
2.29.2

--=20
Cheers,
Stephen Rothwell

--Sig_/8khiC8Fh8Zx.ODu4O_E0T+r
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmAYv4oACgkQAVBC80lX
0GxIKQf/TO4TRaSRFH79dXjUG4PrYe9bD0eL84a5m9p98qU6djvh9QkPu+f7ol8S
ff6TDkaz0vnsotrf1/wncNoY0s5aq5N/J/T+O1yjO4v7TYkr+fkMOeKZ74kebT/Z
bhnII8dNJ368I6RDZe3lnCSviup722xguvFQ8cdVq4wL4cPc23QDJcXgxDyScCFY
BSSi/LnCprRHdWI23l7A1HayrKEnwauLguf1CVXeVdO3gyNh5B324jZX6XVp9FHA
qopRo1fM7nPft+9QEqSua10rVZkLFxZg8u2pTyE2fGcTsuYlnwTY/WfBeCGgY2oQ
+/AhVNocOJpDWP67SyRJ0j+BXVnPSw==
=yT/Q
-----END PGP SIGNATURE-----

--Sig_/8khiC8Fh8Zx.ODu4O_E0T+r--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,
	INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED
	autolearn=ham autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 4CF2CC433E0
	for <linux-next@archiver.kernel.org>; Tue,  2 Feb 2021 03:17:22 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 14A6764EB9
	for <linux-next@archiver.kernel.org>; Tue,  2 Feb 2021 03:17:22 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S230197AbhBBDRF (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Mon, 1 Feb 2021 22:17:05 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52564 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229612AbhBBDRF (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Mon, 1 Feb 2021 22:17:05 -0500
Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B49CDC061573;
        Mon,  1 Feb 2021 19:16:24 -0800 (PST)
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4DV92C5wFMz9tkB;
        Tue,  2 Feb 2021 14:16:19 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;
        s=201702; t=1612235781;
        bh=l4RrMfoAysP2CJv3Uqtn4njr4JIiAXCp+xF92OzvXqU=;
        h=Date:From:To:Cc:Subject:In-Reply-To:References:From;
        b=GYLuFAkjk3DzgLqPkf+07TaxBCb6ShKOuGxTGu47OVi+9wzqW/4plulOnS+u4Yq/L
         UtYw4S3i5HOM7rNkRWyI3k2kQA6/2zsFBJ8OtcElC0khq8f1pEz7V2DH7cG2uySYMC
         oWh4syDrHY5iiA5tTpg2xt4gDlE9AijXkq8E3NsCiaxeYKsrjkFQUFcVUQ9Z7At59V
         67qcN8Ix4W/geSNEDjiwR3m5cFGdy6zs9oQu4ftLKpvNGUhCve+aJA4DwhRmiuxD8+
         WRZ+sxyJ9b6C+qKcEs55mNkytp5LD69KjyBD5KGpm9xjuYhtA6cNE57IsYjWC27mw/
         XmLoSOYlflH2Q==
Date:   Tue, 2 Feb 2021 14:16:18 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>, David Sterba <dsterba@suse.cz>
Cc:     Christoph Hellwig <hch@lst.de>, David Sterba <dsterba@suse.com>,
        Johannes Thumshirn <johannes.thumshirn@wdc.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Naohiro Aota <naohiro.aota@wdc.com>
Subject: Re: linux-next: build failure after merge of the block tree
Message-ID: <20210202141618.4a3a9470@canb.auug.org.au>
In-Reply-To: <20210202135714.6470f476@canb.auug.org.au>
References: <20210202135714.6470f476@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/on58PgwYTw5=sPogN.H4R1=";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/on58PgwYTw5=sPogN.H4R1=
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Tue, 2 Feb 2021 13:57:14 +1100 Stephen Rothwell <sfr@canb.auug.org.au> w=
rote:
>
> After merging the block tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>=20
> block/bio.c: In function 'bio_add_zone_append_page':
> block/bio.c:860:31: error: 'struct bio' has no member named 'bi_disk'
>   860 |  struct request_queue *q =3D bio->bi_disk->queue;
>       |                               ^~
>=20
> Caused by commit
>=20
>   309dca309fc3 ("block: store a block_device pointer in struct bio")
>=20
> interacting with commit
>=20
>   9f678097f3de ("block: add bio_add_zone_append_page")
>=20
> from the btrfs tree.
>=20
> I applied the following merge fix up for today.
>=20
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 2 Feb 2021 13:54:29 +1100
> Subject: [PATCH] block: bio: fix up for bi_disk removal
>=20
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  block/bio.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>=20
> diff --git a/block/bio.c b/block/bio.c
> index bf3ab1b5c844..e3b9d3e0a196 100644
> --- a/block/bio.c
> +++ b/block/bio.c
> @@ -857,7 +857,7 @@ EXPORT_SYMBOL(bio_add_pc_page);
>  int bio_add_zone_append_page(struct bio *bio, struct page *page,
>  			     unsigned int len, unsigned int offset)
>  {
> -	struct request_queue *q =3D bio->bi_disk->queue;
> +	struct request_queue *q =3D bio->bi_bdev->bd_disk->queue;
>  	bool same_page =3D false;
> =20
>  	if (WARN_ON_ONCE(bio_op(bio) !=3D REQ_OP_ZONE_APPEND))
> --=20
> 2.29.2

This then lead to the following in my x86_64 allmodconfig build:

fs/btrfs/zoned.c: In function 'btrfs_record_physical_zoned':
fs/btrfs/zoned.c:1286:21: error: 'struct bio' has no member named 'bi_disk'
 1286 |  ordered->disk =3D bio->bi_disk;
      |                     ^~
fs/btrfs/zoned.c:1287:23: error: 'struct bio' has no member named 'bi_partn=
o'
 1287 |  ordered->partno =3D bio->bi_partno;
      |                       ^~

Do to the above block tree commit interacting with commit

  bccc13e5fe0c ("btrfs: use ZONE_APPEND write for ZONED btrfs")

from the btrfs tree.

For which I applied the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 2 Feb 2021 14:08:44 +1100
Subject: [PATCH] block: btrfs: another fix up for bi_disk removal

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/btrfs/zoned.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c
index 334a54be587d..4829ffc5275b 100644
--- a/fs/btrfs/zoned.c
+++ b/fs/btrfs/zoned.c
@@ -1283,8 +1283,8 @@ void btrfs_record_physical_zoned(struct inode *inode,=
 u64 file_offset,
 		return;
=20
 	ordered->physical =3D physical;
-	ordered->disk =3D bio->bi_disk;
-	ordered->partno =3D bio->bi_partno;
+	ordered->disk =3D bio->bi_bdev->bd_disk;
+	ordered->partno =3D bio->bi_bdev->bd_partno;
=20
 	btrfs_put_ordered_extent(ordered);
 }
--=20
2.29.2

--=20
Cheers,
Stephen Rothwell

--Sig_/on58PgwYTw5=sPogN.H4R1=
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmAYxAIACgkQAVBC80lX
0Gxuvgf+PMYsZd3gUrbJXToN6ov+U947+Orgk+9q1S4d4jl1zoDXs1B4ojQ0x1Cg
43XGdMGy6H1xUMS7CdzYnBpUNDeEF5AP0aW/byvGINZnnVY4bsVgBj4hGbaq+RvF
HqWkBOBT3qDEB6MdCcCefeqA3sW4BJtPNyNOTDUjYDanRp36lgPypN46sMWNQbko
vp2i1hyqzkjWl51Jv2YYdTUOtP1vmc4hXYoaaI1pzCOcHFYeoEiU8nYzOh80BaPk
oQ4bWrxOGpyIvCX28yDIJ3KtQ7lY0Z9bQ8X05AdzNXlxb+wqIYGVJhvJnGkQ1b0h
g8XO7QtTuEK9YHSKicsR2Uk71hEHYw==
=wAOW
-----END PGP SIGNATURE-----

--Sig_/on58PgwYTw5=sPogN.H4R1=--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-5.2 required=3.0 tests=BAYES_00,
	HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,
	USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id F1591C433E0
	for <linux-next@archiver.kernel.org>; Tue,  2 Feb 2021 06:56:07 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id C399264EE1
	for <linux-next@archiver.kernel.org>; Tue,  2 Feb 2021 06:56:07 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S232108AbhBBGzv (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Tue, 2 Feb 2021 01:55:51 -0500
Received: from verein.lst.de ([213.95.11.211]:44369 "EHLO verein.lst.de"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S232042AbhBBGzv (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Tue, 2 Feb 2021 01:55:51 -0500
Received: by verein.lst.de (Postfix, from userid 2407)
        id 2D0776736F; Tue,  2 Feb 2021 07:55:08 +0100 (CET)
Date:   Tue, 2 Feb 2021 07:55:08 +0100
From:   Christoph Hellwig <hch@lst.de>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Jens Axboe <axboe@kernel.dk>, David Sterba <dsterba@suse.cz>,
        Christoph Hellwig <hch@lst.de>,
        David Sterba <dsterba@suse.com>,
        Johannes Thumshirn <johannes.thumshirn@wdc.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Naohiro Aota <naohiro.aota@wdc.com>
Subject: Re: linux-next: build failure after merge of the block tree
Message-ID: <20210202065508.GB10640@lst.de>
References: <20210202135714.6470f476@canb.auug.org.au> <20210202141618.4a3a9470@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20210202141618.4a3a9470@canb.auug.org.au>
User-Agent: Mutt/1.5.17 (2007-11-01)
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

Both fixups look good to me, thanks.

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,
	INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED
	autolearn=unavailable autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 3067CC433DB
	for <linux-next@archiver.kernel.org>; Sun, 14 Feb 2021 22:28:32 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id E51FE64E27
	for <linux-next@archiver.kernel.org>; Sun, 14 Feb 2021 22:28:31 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S229881AbhBNWZA (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Sun, 14 Feb 2021 17:25:00 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45780 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229789AbhBNWZA (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Sun, 14 Feb 2021 17:25:00 -0500
Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1207CC061574;
        Sun, 14 Feb 2021 14:24:20 -0800 (PST)
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4Df1xD5BDnz9rx8;
        Mon, 15 Feb 2021 09:24:16 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;
        s=201702; t=1613341457;
        bh=wqgr1aEs2mYxaw6/K4Djf1vXOMJNvkfKoHMr/nVHG5o=;
        h=Date:From:To:Cc:Subject:In-Reply-To:References:From;
        b=kNAYuq6S9pTZuRNhcoiEcp1DkBIQkFYIgL4MJPcBxTxGztR4vlF8WoIJQvZPuSaF9
         rPY7iPUaAZXGoPXgq0s1YsNyGHcJP7Rw39aV4V7jJg/9wCOIqyVvUiHlO6qmWqTMji
         nZyN+7uwbXqZeBN4HAI5BWNgYYBAg0QSnEfFqfnRuSuGGiw07i8MyilKDIpycCKSk7
         ncWOAxytB8Zy4tHP9WK15YtCWxHZErxfZdRESYwXihQW6MehRQTFoIBUT61dsOAT4t
         LJ/Bl+PGdMno4lCMPTltX35L46D1Iat7lMoV6X5VdvQohiKY4MlHmkUnbSjYiH5AwI
         rzlQy8FNsUb0Q==
Date:   Mon, 15 Feb 2021 09:24:15 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>, David Sterba <dsterba@suse.cz>
Cc:     Christoph Hellwig <hch@lst.de>, David Sterba <dsterba@suse.com>,
        Johannes Thumshirn <johannes.thumshirn@wdc.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Naohiro Aota <naohiro.aota@wdc.com>
Subject: Re: linux-next: build failure after merge of the block tree
Message-ID: <20210215092415.4d8df749@canb.auug.org.au>
In-Reply-To: <20210202141618.4a3a9470@canb.auug.org.au>
References: <20210202135714.6470f476@canb.auug.org.au>
        <20210202141618.4a3a9470@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/wc0OkUrOkQpsuyeiHlisEGR";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/wc0OkUrOkQpsuyeiHlisEGR
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Tue, 2 Feb 2021 14:16:18 +1100 Stephen Rothwell <sfr@canb.auug.org.au> w=
rote:
>
> On Tue, 2 Feb 2021 13:57:14 +1100 Stephen Rothwell <sfr@canb.auug.org.au>=
 wrote:
> >
> > After merging the block tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> >=20
> > block/bio.c: In function 'bio_add_zone_append_page':
> > block/bio.c:860:31: error: 'struct bio' has no member named 'bi_disk'
> >   860 |  struct request_queue *q =3D bio->bi_disk->queue;
> >       |                               ^~
> >=20
> > Caused by commit
> >=20
> >   309dca309fc3 ("block: store a block_device pointer in struct bio")
> >=20
> > interacting with commit
> >=20
> >   9f678097f3de ("block: add bio_add_zone_append_page")

Now

  ae29333fa644 ("block: add bio_add_zone_append_page")

> >=20
> > from the btrfs tree.
> >=20
> > I applied the following merge fix up for today.
> >=20
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Tue, 2 Feb 2021 13:54:29 +1100
> > Subject: [PATCH] block: bio: fix up for bi_disk removal
> >=20
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> >  block/bio.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >=20
> > diff --git a/block/bio.c b/block/bio.c
> > index bf3ab1b5c844..e3b9d3e0a196 100644
> > --- a/block/bio.c
> > +++ b/block/bio.c
> > @@ -857,7 +857,7 @@ EXPORT_SYMBOL(bio_add_pc_page);
> >  int bio_add_zone_append_page(struct bio *bio, struct page *page,
> >  			     unsigned int len, unsigned int offset)
> >  {
> > -	struct request_queue *q =3D bio->bi_disk->queue;
> > +	struct request_queue *q =3D bio->bi_bdev->bd_disk->queue;
> >  	bool same_page =3D false;
> > =20
> >  	if (WARN_ON_ONCE(bio_op(bio) !=3D REQ_OP_ZONE_APPEND))
> > --=20
> > 2.29.2 =20
>=20
> This then lead to the following in my x86_64 allmodconfig build:
>=20
> fs/btrfs/zoned.c: In function 'btrfs_record_physical_zoned':
> fs/btrfs/zoned.c:1286:21: error: 'struct bio' has no member named 'bi_dis=
k'
>  1286 |  ordered->disk =3D bio->bi_disk;
>       |                     ^~
> fs/btrfs/zoned.c:1287:23: error: 'struct bio' has no member named 'bi_par=
tno'
>  1287 |  ordered->partno =3D bio->bi_partno;
>       |                       ^~
>=20
> Do to the above block tree commit interacting with commit
>=20
>   bccc13e5fe0c ("btrfs: use ZONE_APPEND write for ZONED btrfs")

Now

  d8e3fb106f39 ("btrfs: zoned: use ZONE_APPEND write for zoned mode")

>=20
> from the btrfs tree.
>=20
> For which I applied the following merge fix patch:
>=20
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 2 Feb 2021 14:08:44 +1100
> Subject: [PATCH] block: btrfs: another fix up for bi_disk removal
>=20
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  fs/btrfs/zoned.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>=20
> diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c
> index 334a54be587d..4829ffc5275b 100644
> --- a/fs/btrfs/zoned.c
> +++ b/fs/btrfs/zoned.c
> @@ -1283,8 +1283,8 @@ void btrfs_record_physical_zoned(struct inode *inod=
e, u64 file_offset,
>  		return;
> =20
>  	ordered->physical =3D physical;
> -	ordered->disk =3D bio->bi_disk;
> -	ordered->partno =3D bio->bi_partno;
> +	ordered->disk =3D bio->bi_bdev->bd_disk;
> +	ordered->partno =3D bio->bi_bdev->bd_partno;
> =20
>  	btrfs_put_ordered_extent(ordered);
>  }
> --=20
> 2.29.2

With the merge window about to open, this is a reminder that this
conflict still exists.

I am still applying both these merge fix ups.

--=20
Cheers,
Stephen Rothwell

--Sig_/wc0OkUrOkQpsuyeiHlisEGR
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmApow8ACgkQAVBC80lX
0GxsWwf7BelogexUJj7LQShzCWfIB1IB8Nh3k+fmmR/g3PYu143zQMesuSvpq2dq
X/tXtWITqYLTsYwclu9Y5EZ6HrzEcNOsTOqZBsCJrkxLAbX1wxO8/fNdsIY/gEhl
5FZ6l5BY3F6QCzQLo43nT3rfM9Ihr0LnY6oVN9Y51VkgwPOgs6Zy1L/BFU85jlOm
kHBIwlfxd55KU2V4EFrvoqGWQNX9aOUnAmLvU2O+jzhYyDloTbYoGOMp+RPGP9oH
URUUlbM1/D4fkFKMiYFzT2fmQcbmYYVEzqlqtlqwhpArlGXVQUFyUPnokwUoET86
T60WU6j+cbapyTsdAGQX3UNe58Qv4A==
=zH4b
-----END PGP SIGNATURE-----

--Sig_/wc0OkUrOkQpsuyeiHlisEGR--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-5.8 required=3.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 129F6C433DB
	for <linux-next@archiver.kernel.org>; Tue, 23 Feb 2021 01:43:37 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id C914564DF3
	for <linux-next@archiver.kernel.org>; Tue, 23 Feb 2021 01:43:36 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S230270AbhBWBnU (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Mon, 22 Feb 2021 20:43:20 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34394 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S230258AbhBWBnU (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Mon, 22 Feb 2021 20:43:20 -0500
Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5BACC061574;
        Mon, 22 Feb 2021 17:42:39 -0800 (PST)
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4Dl1yP3JMpz9sS8;
        Tue, 23 Feb 2021 12:42:37 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;
        s=201702; t=1614044557;
        bh=gVNsiXGE2bRlvKPDsjmJ5KtA6gn9a3CHhl4fzKMgUjc=;
        h=Date:From:To:Cc:Subject:From;
        b=ATV/jPlA3Ez3zCBKWpuBnZ0pAGwVm4JQQ1EtdJUHJj1qmUd08xMfqKDM/JHQgrWxo
         U0UlMyN/6YveIiKB1TdV+C7IGOyoQmrX5bttbMl3nf1IDzc7zTCtaAX2SFLYLBsJE2
         uzwyC7A2EQRCDrDmXOJrRJKZQ+6cMITgV6ctQ4dlzkutbL/p1GB0Qu2ecqwHgBL0JB
         oxbAnpi0h8ZjvH+TRikhr3WfRaVFCjTJcal3MefhBptqOnlLZixk8o47l/XA8g5IwI
         Q7XfwTLBI3KeQIOPDPD1Ehm+TTRVPIAFrHMFyW6I/kg5gPmzyP62N5/ZQcW0BKxoaN
         WL/j5O5qiHO2Q==
Date:   Tue, 23 Feb 2021 12:42:36 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20210223124236.7bdf0871@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/.F.nGcB8KBgDtD__V1h+=2t";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/.F.nGcB8KBgDtD__V1h+=2t
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

fs/io_uring.c: In function 'io_sq_thread':
fs/io_uring.c:6787:3: error: implicit declaration of function 'io_ctx_disab=
le_sqo_submit' [-Werror=3Dimplicit-function-declaration]
 6787 |   io_ctx_disable_sqo_submit(ctx);
      |   ^~~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  a6afa091d06a ("io_uring: move SQPOLL thread io-wq forked worker")

I have used the block tree from next-20210222 for today.

--=20
Cheers,
Stephen Rothwell

--Sig_/.F.nGcB8KBgDtD__V1h+=2t
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmA0XYwACgkQAVBC80lX
0GyK2ggAn9cF4SJ+05mFAkByWQmm3o7loRWxJqNoAFlaciqKXSatmRw8tgmC9Xw3
EmTQsoFbyjY8Fr3KHGkZZCGE5sjMttPM8VunyQPng/EBTqV9IoFGKESFoYmPtS4d
Lf+DQJqDcwKHlhK5XPhKi2vhbob4vtjxnfMtDvQ1YfA7d9aQz6uP87TLxahhpO2+
+3VJQAK7emcOLW/Pzv/y3Og5mE3fHy1X61+KTmGtCXSATaxN6XuYHuz7I3hBy8c+
ejVbB+rPj6Fg8PFMI6lh31QDwBzjajLRFphR9wNGA2cSUVkoFK+ru1zkGvZ9404Z
dzdIjOO02770ENF4KRLj83GsoUj/Iw==
=zFF+
-----END PGP SIGNATURE-----

--Sig_/.F.nGcB8KBgDtD__V1h+=2t--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-5.3 required=3.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A,
	SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=no autolearn_force=no
	version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 3EF9AC433DB
	for <linux-next@archiver.kernel.org>; Tue, 23 Feb 2021 02:33:27 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 15B8B64E41
	for <linux-next@archiver.kernel.org>; Tue, 23 Feb 2021 02:33:27 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S230306AbhBWCd0 (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Mon, 22 Feb 2021 21:33:26 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45396 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S230141AbhBWCdY (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Mon, 22 Feb 2021 21:33:24 -0500
Received: from mail-pg1-x534.google.com (mail-pg1-x534.google.com [IPv6:2607:f8b0:4864:20::534])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 216F8C06174A
        for <linux-next@vger.kernel.org>; Mon, 22 Feb 2021 18:32:44 -0800 (PST)
Received: by mail-pg1-x534.google.com with SMTP id g4so825339pgj.0
        for <linux-next@vger.kernel.org>; Mon, 22 Feb 2021 18:32:44 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20150623.gappssmtp.com; s=20150623;
        h=subject:to:cc:references:from:message-id:date:user-agent
         :mime-version:in-reply-to:content-language:content-transfer-encoding;
        bh=GIWAFhm0yAXQbjsvqea5+Fb3rjUr7WgrcLGVKsm40RE=;
        b=vOBhoN7p0hdxqBusqwkXV+lLO0nu4NI5mUmh0D3GO0jhVODgSIvLpE9zD5mYLsaePh
         KGBe1wBD1X/fccVCUgl3jA9X2m7gYRZPdfawrBfQKn01PdcSFzVZuDQRVDbvDgsZgPgn
         HzSNJBelB3liMcaRL/jrcFrWPeHKrkBYbpqI4Tl03VD611W26y46fMeGtU8PJFGXxxjm
         a5T2xx2Iu+v3r4KhWZ9REgtrQEZRyZgVzA7GaEpvtkPe18kv5sCzWmFF3nHIoDyW4UDz
         7ANwRSlP8psIBHRV5uGJR0jeDSZOaBAqoKPfUcw92/vDiaq1U2XRjPWpa4yX7VWCzgdL
         3UCw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:subject:to:cc:references:from:message-id:date
         :user-agent:mime-version:in-reply-to:content-language
         :content-transfer-encoding;
        bh=GIWAFhm0yAXQbjsvqea5+Fb3rjUr7WgrcLGVKsm40RE=;
        b=NrHEEEmXZdlZTyJQ719CDWRb5/B8kHRQ7IyQcTQi4w0iVFBcDXAJe3RSrUOIFuOrGi
         n+JNaHdoxusyvIXkA8ixhzQaf8ehGWDoE8SPbDfHN/VCmnO9zVj71i7BD0yNJm+/mID+
         QtvsadifrjZm75qBVde3bkg4kAj6xmUnq1vz2Nec9rtdlnBASuHLsWNDRMpOEbdS+zF7
         qDJGdb94y0NZYZBb1osGoELHcCU4dtCj0dtuTIZuUNNIaHNGrxfG/Dt0nkdOtZDZwp51
         +qK2EpjDjC2c0oiHpjIaMQ9tEh4l3iJc/qAjXtB0FVZoaruyv3vsy56YyQfDh6tAje/W
         fXNg==
X-Gm-Message-State: AOAM530DS0PoyJwQMXy1X+HP6X9kVndwNMbAlgYe1msLmPqh+I1xsF/n
        sysNMpk8CRDbuPKm7S5s6sTzGfv1xPTOnA==
X-Google-Smtp-Source: ABdhPJzr5dOsca7Y6QpIEUtMluuZOZxocSOfKydvprVVOIoPBBUw7L8PfToqcbL1+gk3x7RNV1r0dg==
X-Received: by 2002:a05:6a00:1502:b029:1d2:72e7:a9db with SMTP id q2-20020a056a001502b02901d272e7a9dbmr210954pfu.42.1614047563032;
        Mon, 22 Feb 2021 18:32:43 -0800 (PST)
Received: from ?IPv6:2620:10d:c085:21e8::11af? ([2620:10d:c090:400::5:c361])
        by smtp.gmail.com with ESMTPSA id j73sm21479975pfd.170.2021.02.22.18.32.41
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Mon, 22 Feb 2021 18:32:42 -0800 (PST)
Subject: Re: linux-next: build failure after merge of the block tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20210223124236.7bdf0871@canb.auug.org.au>
From:   Jens Axboe <axboe@kernel.dk>
Message-ID: <0c64e6f1-e793-5def-af03-c66221d6b4c4@kernel.dk>
Date:   Mon, 22 Feb 2021 19:32:40 -0700
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.10.0
MIME-Version: 1.0
In-Reply-To: <20210223124236.7bdf0871@canb.auug.org.au>
Content-Type: text/plain; charset=windows-1252
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 2/22/21 6:42 PM, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the block tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> fs/io_uring.c: In function 'io_sq_thread':
> fs/io_uring.c:6787:3: error: implicit declaration of function 'io_ctx_disable_sqo_submit' [-Werror=implicit-function-declaration]
>  6787 |   io_ctx_disable_sqo_submit(ctx);
>       |   ^~~~~~~~~~~~~~~~~~~~~~~~~
> 
> Caused by commit
> 
>   a6afa091d06a ("io_uring: move SQPOLL thread io-wq forked worker")
> 
> I have used the block tree from next-20210222 for today.

You got very unlucky, that bad commit only lasted for about 1-2 min.

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-5.8 required=3.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 40E5DC4338F
	for <linux-next@archiver.kernel.org>; Tue, 10 Aug 2021 10:31:39 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 27FED60E9B
	for <linux-next@archiver.kernel.org>; Tue, 10 Aug 2021 10:31:39 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S231688AbhHJKcA (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Tue, 10 Aug 2021 06:32:00 -0400
Received: from ozlabs.org ([203.11.71.1]:60013 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S239045AbhHJKb7 (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Tue, 10 Aug 2021 06:31:59 -0400
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4GkTlD4QSNz9sRR;
        Tue, 10 Aug 2021 20:31:35 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1628591496;
        bh=MReQHuDSQSRyaLKya4YJSHkkokyUvKDV4rZHCUVOo9w=;
        h=Date:From:To:Cc:Subject:From;
        b=mMB6IxNU8nDT7DzLxHPKBl4JWy+re8UxY/CwPq5ZR0s0LdTM6gl7std6eHlrNVuJX
         08IJbCXsyQm22daiNYqlUnar5+/GCfrZt5dyl24YG4XJCX7R6xKc1AYO1J4OlUrGvm
         DzSgLIFtE7+mHQ6+2jj+7S4Ga5WV7Of1qWMxPCkrH7YFVkh+0pj6LKkwFUPMM5GLPS
         6FhMfGJeLs186l4ucLc2e9h+TZk52Jpeeb6ZBmi8gOLwhi3zs8e9NXe6si/MUhuqW1
         6RtUht0u4NHt1GlbuSjN2DAt0iDh6HNKclazYh8puwM5I4u6eoM4Vn4MQtlzg19XzJ
         /sdiNgmJFCB+Q==
Date:   Tue, 10 Aug 2021 20:31:34 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Christoph Hellwig <hch@lst.de>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20210810203135.7eb7b01a@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/n=5DrvZNE8yPU4kfr7exugS";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/n=5DrvZNE8yPU4kfr7exugS
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

mm/page-writeback.c:2044:6: error: redefinition of 'laptop_sync_completion'
 2044 | void laptop_sync_completion(void)
      |      ^~~~~~~~~~~~~~~~~~~~~~
In file included from include/linux/memcontrol.h:22,
                 from include/linux/swap.h:9,
                 from mm/page-writeback.c:20:
include/linux/writeback.h:345:20: note: previous definition of 'laptop_sync=
_completion' was here
  345 | static inline void laptop_sync_completion(void) { }
      |                    ^~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  5ed964f8e54e ("mm: hide laptop_mode_wb_timer entirely behind the BDI API")

This build does not have CONFIG_BLOCK set.

--=20
Cheers,
Stephen Rothwell

--Sig_/n=5DrvZNE8yPU4kfr7exugS
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmESVYcACgkQAVBC80lX
0GwuAwf/QGq9DJ/XQu+tSinoG1lJhOu/lSlN52C53itoGSu3pVplA0VnkxJOVEx6
uIQcNNK4dpUY9aM6TzWJTjCkPUiA0i0NLUEWKrLd8MN0f58fmCJlQfChMkKyHwtr
jtiHNmge4l54oHOWpuD6ATn7zGhHNsvbzVMMV0OlZ+WMVyb92MdG8PZHfupq7a2C
SlQ/xV/0wUxQ4fqhCuyG9IkzrJYxZmwtTMdmKI3l6C6C3js9n6H0KUQD+dRJjL32
aSKjvrdzBV+ko/F45exIclyqTA5Bb6oHoK6cfVWrrkZDpjvqM8Zj3D3rNyjAjolK
oT1Hm4KyPAI71QZBBCamvBaiqOrInw==
=XgCK
-----END PGP SIGNATURE-----

--Sig_/n=5DrvZNE8yPU4kfr7exugS--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-5.8 required=3.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no
	version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 9E5C5C4338F
	for <linux-next@archiver.kernel.org>; Tue, 10 Aug 2021 10:52:55 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 78E6C60F13
	for <linux-next@archiver.kernel.org>; Tue, 10 Aug 2021 10:52:55 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S239933AbhHJKxP (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Tue, 10 Aug 2021 06:53:15 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41650 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S239934AbhHJKxK (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Tue, 10 Aug 2021 06:53:10 -0400
Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7BCF0C061798;
        Tue, 10 Aug 2021 03:52:48 -0700 (PDT)
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4GkVCc4Hd6z9sT6;
        Tue, 10 Aug 2021 20:52:44 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1628592764;
        bh=vtV72N/6CXOBMdQ8dnyKzP6eHxhfD9bbPPt/kxc714s=;
        h=Date:From:To:Cc:Subject:In-Reply-To:References:From;
        b=Xr0XHJojlnUMD9eSnSpyIjYffahV2dZ3E/LJbSw+WRR1bdtreiHXh+I4e2t9gZFmu
         X5PxiJ2M9n9l/f9+Fx5Sa2IxKTRzBw22PrS3rzqoZmlR3JSBfI6dOr/ydncQKxhBoO
         zOqEY4L5ZjX48JlbmSEBPx277ikorjlD82AWdqu6Caic1wfHpZVV7COJlaH9yLQPEt
         Ll/Rm6Oft1EaV2Sevi2mOyANVz8W+hyyd8GKK5sgRxRiIEz/z7WMRklDsz+TjawwR4
         zaYKi2HRmz+iSyfF0dPDaymtqEPbv4wLIVP1aD8Wf/zzy7rAt4sZnhRHiUOXPgyKcw
         FfQhwWWoB1I7g==
Date:   Tue, 10 Aug 2021 20:52:43 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     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: build failure after merge of the block tree
Message-ID: <20210810205243.25dfa994@canb.auug.org.au>
In-Reply-To: <20210810203135.7eb7b01a@canb.auug.org.au>
References: <20210810203135.7eb7b01a@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/IQVe25qW/YHVMv4WEmyNRjS";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/IQVe25qW/YHVMv4WEmyNRjS
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Tue, 10 Aug 2021 20:31:34 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> After merging the block tree, today's linux-next build (or32
> or1ksim_defconfig) failed like this:
>=20
> mm/page-writeback.c:2044:6: error: redefinition of 'laptop_sync_completio=
n'
>  2044 | void laptop_sync_completion(void)
>       |      ^~~~~~~~~~~~~~~~~~~~~~
> In file included from include/linux/memcontrol.h:22,
>                  from include/linux/swap.h:9,
>                  from mm/page-writeback.c:20:
> include/linux/writeback.h:345:20: note: previous definition of 'laptop_sy=
nc_completion' was here
>   345 | static inline void laptop_sync_completion(void) { }
>       |                    ^~~~~~~~~~~~~~~~~~~~~~
>=20
> Caused by commit
>=20
>   5ed964f8e54e ("mm: hide laptop_mode_wb_timer entirely behind the BDI AP=
I")
>=20
> This build does not have CONFIG_BLOCK set.

These as well:

In file included from include/linux/workqueue.h:9,
                 from include/linux/mm_types.h:16,
                 from include/linux/mmzone.h:21,
                 from include/linux/gfp.h:6,
                 from include/linux/xarray.h:14,
                 from include/linux/radix-tree.h:19,
                 from include/linux/fs.h:15,
                 from include/linux/backing-dev.h:13,
                 from mm/backing-dev.c:5:
mm/backing-dev.c: In function 'bdi_alloc':
mm/backing-dev.c:821:42: error: 'laptop_mode_timer_fn' undeclared (first us=
e in this function)
  821 |  timer_setup(&bdi->laptop_mode_wb_timer, laptop_mode_timer_fn, 0);
      |                                          ^~~~~~~~~~~~~~~~~~~~
include/linux/timer.h:126:28: note: in definition of macro '__init_timer'
  126 |  init_timer_key((_timer), (_fn), (_flags), NULL, NULL)
      |                            ^~~
mm/backing-dev.c:821:2: note: in expansion of macro 'timer_setup'
  821 |  timer_setup(&bdi->laptop_mode_wb_timer, laptop_mode_timer_fn, 0);
      |  ^~~~~~~~~~~
mm/backing-dev.c:821:42: note: each undeclared identifier is reported only =
once for each function it appears in
  821 |  timer_setup(&bdi->laptop_mode_wb_timer, laptop_mode_timer_fn, 0);
      |                                          ^~~~~~~~~~~~~~~~~~~~
include/linux/timer.h:126:28: note: in definition of macro '__init_timer'
  126 |  init_timer_key((_timer), (_fn), (_flags), NULL, NULL)
      |                            ^~~
mm/backing-dev.c:821:2: note: in expansion of macro 'timer_setup'
  821 |  timer_setup(&bdi->laptop_mode_wb_timer, laptop_mode_timer_fn, 0);
      |  ^~~~~~~~~~~

--=20
Cheers,
Stephen Rothwell

--=20
Cheers,
Stephen Rothwell

--Sig_/IQVe25qW/YHVMv4WEmyNRjS
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmESWnsACgkQAVBC80lX
0GzN6gf/R0jYgtK1azA+j9YEOzbEPlFHvwOdYZKLLHJbSv0dLFv+wIAct7BzO7Ql
BfbYg3yE3o8gfU4jOoQArdREi+aU+WQwjxfHND7M8N0Re6EBsWvaRt94KyO9g/s0
B7OJ7ykFK1JdyzhkU3mFf3Ym3T7rZWzk4q+44WQN/dX9dM5GA+Zgu7d3Aj3TuuuF
PqUgSmf6yItJLq8HY1kFQEgnRCxZjwiJNpk9j1DcjnqBqXYT3JyC2QGJpjKuyk3q
lmxA3ChaOuTnBrH7sElgDAEGRQ2av5BvM6pxQcY6fNNgYosJJkfqSi3teZ77LemN
dZP9IkRd4vl23xElgNfB7lcFrY0cKQ==
=wr1A
-----END PGP SIGNATURE-----

--Sig_/IQVe25qW/YHVMv4WEmyNRjS--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-15.2 required=3.0 tests=BAYES_00,
	HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH,
	MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1
	autolearn=ham autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id E032EC432BE
	for <linux-next@archiver.kernel.org>; Tue, 10 Aug 2021 12:58:18 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id BC7A36101E
	for <linux-next@archiver.kernel.org>; Tue, 10 Aug 2021 12:58:18 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S233409AbhHJM6j (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Tue, 10 Aug 2021 08:58:39 -0400
Received: from verein.lst.de ([213.95.11.211]:36051 "EHLO verein.lst.de"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S239354AbhHJM6j (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Tue, 10 Aug 2021 08:58:39 -0400
Received: by verein.lst.de (Postfix, from userid 2407)
        id BE33568B05; Tue, 10 Aug 2021 14:58:13 +0200 (CEST)
Date:   Tue, 10 Aug 2021 14:58:13 +0200
From:   Christoph Hellwig <hch@lst.de>
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Jens Axboe <axboe@kernel.dk>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the block tree
Message-ID: <20210810125813.GA9836@lst.de>
References: <20210810203135.7eb7b01a@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20210810203135.7eb7b01a@canb.auug.org.au>
User-Agent: Mutt/1.5.17 (2007-11-01)
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

The patch below fixes it.

---
>From 28be8f9a9da95d54b7fce80332bf2c62abfcdf73 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Tue, 10 Aug 2021 14:39:24 +0200
Subject: writeback: make the laptop_mode prototypes available unconditionally

Fix the !CONFIG_BLOCK build after the recent cleanup.

Fixes: 5ed964f8e54e ("mm: hide laptop_mode_wb_timer entirely behind the BDI API")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 include/linux/writeback.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index 667e86cfbdcf..270677dc4f36 100644
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -336,14 +336,9 @@ static inline void cgroup_writeback_umount(void)
 /*
  * mm/page-writeback.c
  */
-#ifdef CONFIG_BLOCK
 void laptop_io_completion(struct backing_dev_info *info);
 void laptop_sync_completion(void);
-void laptop_mode_sync(struct work_struct *work);
 void laptop_mode_timer_fn(struct timer_list *t);
-#else
-static inline void laptop_sync_completion(void) { }
-#endif
 bool node_dirty_ok(struct pglist_data *pgdat);
 int wb_domain_init(struct wb_domain *dom, gfp_t gfp);
 #ifdef CONFIG_CGROUP_WRITEBACK
-- 
2.30.2


From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-5.3 required=3.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A,
	SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=no autolearn_force=no
	version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id E5AF6C4338F
	for <linux-next@archiver.kernel.org>; Tue, 10 Aug 2021 13:01:38 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id C6C7D6024A
	for <linux-next@archiver.kernel.org>; Tue, 10 Aug 2021 13:01:38 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S241066AbhHJNB7 (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Tue, 10 Aug 2021 09:01:59 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43200 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S238155AbhHJNB7 (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Tue, 10 Aug 2021 09:01:59 -0400
Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 95922C061798
        for <linux-next@vger.kernel.org>; Tue, 10 Aug 2021 06:01:37 -0700 (PDT)
Received: by mail-pl1-x62e.google.com with SMTP id e19so7342436pla.10
        for <linux-next@vger.kernel.org>; Tue, 10 Aug 2021 06:01:37 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20150623.gappssmtp.com; s=20150623;
        h=subject:to:cc:references:from:message-id:date:user-agent
         :mime-version:in-reply-to:content-language:content-transfer-encoding;
        bh=pSUZ1V/TT3GxnZ/SQCtnrpNBlM+RKsjso4hfU/Kzd+M=;
        b=seVT7c78HqYysBY0+TO7yVtcssykcqXRPxR4swEdDLNIkiVACBQO7y8Zs/cxbyqDcP
         RGIbuMcKu8DndKAPDzCHUHXE3cQ+nMGa81IPBQOAgnIuOKR5ep4iBfl5CTqBbG2knG5+
         +Z/wSlWaevje/G3ktuzZ14oZAXi+gyozYBZLjvZr6+4JL8x6nrjcOpLpLvWZWccZQGHa
         g8dvZCXPjlGWiqLsHUwGelCWtoH5nn5gTn3k7lepQahjkBEWtbEV8G3E2EGDg2e8Kj91
         9tiXvWZV9a2Gi+ANXDw/j6EYiVPXOdivfZj5kl09P12mhCEBxQN9Fwwn+SB/gMfNwAkw
         CjaQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:subject:to:cc:references:from:message-id:date
         :user-agent:mime-version:in-reply-to:content-language
         :content-transfer-encoding;
        bh=pSUZ1V/TT3GxnZ/SQCtnrpNBlM+RKsjso4hfU/Kzd+M=;
        b=nZjp23IYL/0hBdovv2PzkULA+Ze/mkpOSxTDWWh2Z0T53KV1cn4FB++6iTCDzK6FOt
         kri8zYeWVtuFJvtrfZHMoQqQxb5rIOuUJMlxUJCkSs15B2HsRJSy3WTipzywDSxFo2Tb
         x3YuNrYBhvlutzLhOhVFpByQOnFvC7xwtKwAolUZHISROslrmyUatjhnp8doKK1j588/
         qsPVG/9dlPc5lMsnrihK6G7vyNouctz/i/u6zAv7I4mxLenvFN6T2X5cF+pMG6Ms7yFI
         RQcbZXTVYRU5C8tMSwWeX73n2LRB1FlUZZfswcsHMYnLWqpC5QrtpXJBxJrVGSejDEX6
         LEGA==
X-Gm-Message-State: AOAM531E3fm+tkyCaR9Zx/6p65EVrPlXD06aqkl6fGs+xvxB3mQEzrHJ
        MBWChl4o54o8lKQYugIJXv56AvK/biy8RwUM
X-Google-Smtp-Source: ABdhPJyMtSRuDNVK02DsgMAnla5RRq9IyzqIWOXPwpSmIGPzjS2YjIqAyP5ag735Uktpxwnm0Ynctw==
X-Received: by 2002:a63:c04a:: with SMTP id z10mr862519pgi.99.1628600496790;
        Tue, 10 Aug 2021 06:01:36 -0700 (PDT)
Received: from [192.168.1.116] ([198.8.77.61])
        by smtp.gmail.com with ESMTPSA id n11sm3260977pjh.23.2021.08.10.06.01.35
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Tue, 10 Aug 2021 06:01:36 -0700 (PDT)
Subject: Re: linux-next: build failure after merge of the block tree
To:     Christoph Hellwig <hch@lst.de>,
        Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20210810203135.7eb7b01a@canb.auug.org.au>
 <20210810125813.GA9836@lst.de>
From:   Jens Axboe <axboe@kernel.dk>
Message-ID: <2d4a112b-8ea0-3440-6c63-c3d1463b7577@kernel.dk>
Date:   Tue, 10 Aug 2021 07:01:33 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.10.0
MIME-Version: 1.0
In-Reply-To: <20210810125813.GA9836@lst.de>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 8/10/21 6:58 AM, Christoph Hellwig wrote:
> The patch below fixes it.
> 

Added, thanks.

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-5.8 required=3.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no
	version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 4C8BEC4338F
	for <linux-next@archiver.kernel.org>; Tue, 10 Aug 2021 13:22:48 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 2F6CF61019
	for <linux-next@archiver.kernel.org>; Tue, 10 Aug 2021 13:22:48 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S239546AbhHJNXI (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Tue, 10 Aug 2021 09:23:08 -0400
Received: from ozlabs.org ([203.11.71.1]:37463 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S241125AbhHJNXI (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Tue, 10 Aug 2021 09:23:08 -0400
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4GkYXh56l5z9sRK;
        Tue, 10 Aug 2021 23:22:44 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1628601764;
        bh=NFwioJRExZKheUfbSG5XQmLDZTya4JG8A68oX5rmLEo=;
        h=Date:From:To:Cc:Subject:In-Reply-To:References:From;
        b=Ig5DIzGWOnK1TngS/e/zWZ1UHmcvM7734X5g+7Koyo/dW/t/YtN56dfgS7hCT2RMg
         mugJjYBeXK9nDsg2+s5e585xiO3/P4VdjGgRTWZPBzSYAkhlzOVIJqiQ/NUl33Zk0F
         JuY+weskooejJ0KSK+5f/9ze8/MLV4jJmnym42GJk0lUzI8kz3eVffGYV3a7ERs/ev
         EqF+sIoIVBQBIabiEpa/Hvqc+7jQeC6YlKtg84CaPZk1eDK6tImjHtR5sQcwIa3385
         tFE0tEmHBGsdp5O60QaG7oN1QtLIwJSIleFYEIp3fbDkTcfUs9nJrTp1/Vy8UEdC4D
         qD6pOqVZsOUtw==
Date:   Tue, 10 Aug 2021 23:22:43 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Christoph Hellwig <hch@lst.de>
Cc:     Jens Axboe <axboe@kernel.dk>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the block tree
Message-ID: <20210810232243.24fdd7a9@canb.auug.org.au>
In-Reply-To: <20210810125813.GA9836@lst.de>
References: <20210810203135.7eb7b01a@canb.auug.org.au>
        <20210810125813.GA9836@lst.de>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/eiVGTQQV1cv4narcLUfkCOg";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/eiVGTQQV1cv4narcLUfkCOg
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Christoph,

On Tue, 10 Aug 2021 14:58:13 +0200 Christoph Hellwig <hch@lst.de> wrote:
>
> The patch below fixes it.

Thanks for the fast response.

--=20
Cheers,
Stephen Rothwell

--Sig_/eiVGTQQV1cv4narcLUfkCOg
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmESfaMACgkQAVBC80lX
0Gy/Igf+MvufYbtjn7fr7rZvIDYiJD4DvRZmeP5vnMOpah8egaxgn51Z7EI6pWLL
Uk6qYIJiiPeyc/9bTDMQ7FwKCQ60TktnNIcfB7Q/JXlG5O2DWG1w3JI5h/ei1+m5
lBiafe7XBSj4H7+WClSD0RInD47255NDkzTnWDF2uRfPAdBvH+aUVWOlsxZpi48M
2Ie4HYC9Q134q/Gaa+eELKB3lj5X856krHdnPev8gUtNO9EZbVCH+77uTEb67EhM
7E0o2QsirfKFPlOF4owcGAYTA1tXaVM+twQE7Hl+02UoPM5LKfkKF2kLN2xWfgDh
6Mtb2rCVTY5lE4iwKy/prFhAgLm0iQ==
=AlNu
-----END PGP SIGNATURE-----

--Sig_/eiVGTQQV1cv4narcLUfkCOg--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 6DAE6C433EF
	for <linux-next@archiver.kernel.org>; Wed,  9 Mar 2022 02:17:23 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S231437AbiCICSS (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Tue, 8 Mar 2022 21:18:18 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39226 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S231463AbiCICSO (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Tue, 8 Mar 2022 21:18:14 -0500
Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2602D4BB9F;
        Tue,  8 Mar 2022 18:16:43 -0800 (PST)
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4KCwmn03NQz4xdl;
        Wed,  9 Mar 2022 13:16:40 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1646792201;
        bh=VwI//tQIQAdqCrHep6aDLdGNbxUz0LjiCk90+ut2RWM=;
        h=Date:From:To:Cc:Subject:From;
        b=SsX63T7huM3YT+oy37pD5qm1Q1EYx00qhnslhffm7+7GUrSySxjJL3VGV4PmN66R+
         F8QumgEcErLfPGXnwfrUeoyFSTZ7evwyh46h3i+nqLWAoGblQiyJmRuxEvEeN+vggR
         O2VQrd8iqt3ntE6CY0YKekjOBRnpgXcWxfXn+CN6yKlabbgTSoclXmeWeynvO4I3OV
         0R8n75+wcVoHTHJeE5emdLxaBHFZa33CYCgg7hRsJS7Zpma6YGZp8UXXKxq5SLTCf2
         ZYejDMDTMshXjCXvRl+wD49kcrMlBNc7XHohzRI68mivdP4FSpwvuMIrUb5LLJNYMl
         Dn57V8miZ8hcQ==
Date:   Wed, 9 Mar 2022 13:16:38 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20220309131638.26600d10@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/o1oZLvcQFRW3bb5QHtpbH6f";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/o1oZLvcQFRW3bb5QHtpbH6f
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:

In file included from block/blk-mq-debugfs-zoned.c:7:
block/blk-mq-debugfs.h:24:42: error: 'struct blk_mq_hw_ctx' declared inside=
 parameter list will not be visible outside of this definition or declarati=
on [-Werror]
   24 |                                   struct blk_mq_hw_ctx *hctx);
      |                                          ^~~~~~~~~~~~~
block/blk-mq-debugfs.h:25:44: error: 'struct blk_mq_hw_ctx' declared inside=
 parameter list will not be visible outside of this definition or declarati=
on [-Werror]
   25 | void blk_mq_debugfs_unregister_hctx(struct blk_mq_hw_ctx *hctx);
      |                                            ^~~~~~~~~~~~~
block/blk-mq-debugfs.h:32:47: error: 'struct blk_mq_hw_ctx' declared inside=
 parameter list will not be visible outside of this definition or declarati=
on [-Werror]
   32 |                                        struct blk_mq_hw_ctx *hctx);
      |                                               ^~~~~~~~~~~~~
block/blk-mq-debugfs.h:33:50: error: 'struct blk_mq_hw_ctx' declared inside=
 parameter list will not be visible outside of this definition or declarati=
on [-Werror]
   33 | void blk_mq_debugfs_unregister_sched_hctx(struct blk_mq_hw_ctx *hct=
x);
      |                                                  ^~~~~~~~~~~~~
cc1: all warnings being treated as errors

I have no idea what has caused this.

I have used the block tree from next-20220308 for today.

--=20
Cheers,
Stephen Rothwell

--Sig_/o1oZLvcQFRW3bb5QHtpbH6f
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmIoDgYACgkQAVBC80lX
0GxK0gf+Mxo+helPcFBZ+5bzPh5oUI7iNLAI7lIz93bU4oPyOEiIOXHBjednfV5K
bZ9W2+kGlbgJggh3C2kkyQaEzPz/p5cPxABg0CSWaraQExeK6CZBldb9/dJXL4+x
Rn/TzpOVS5kJz2uX5LSvVV1w0nd9y+EKrpP0elWSnA8Apt4BJWxAIUgxsf0WLfWa
03nDaV8vzqF9LSQ0pY1BAGatlvnvEE7kR9MeergtPGqchB8U0Fi8g2M6CZCGvU9Y
zJRFYEA3dv3VfbZLcLvGWJAwV4FLCaBLOSlaW7QdUOrP+JEpEtIsIlxQtK1UoFa9
khlK4MaNlubBudUuD+KoKbGaYm1xEw==
=UwC6
-----END PGP SIGNATURE-----

--Sig_/o1oZLvcQFRW3bb5QHtpbH6f--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id F14B9C433F5
	for <linux-next@archiver.kernel.org>; Wed,  9 Mar 2022 02:33:13 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S231455AbiCICeJ (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Tue, 8 Mar 2022 21:34:09 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60066 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S231446AbiCICeI (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Tue, 8 Mar 2022 21:34:08 -0500
Received: from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com [IPv6:2607:f8b0:4864:20::52e])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C110030F40
        for <linux-next@vger.kernel.org>; Tue,  8 Mar 2022 18:33:10 -0800 (PST)
Received: by mail-pg1-x52e.google.com with SMTP id o26so750678pgb.8
        for <linux-next@vger.kernel.org>; Tue, 08 Mar 2022 18:33:10 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20210112.gappssmtp.com; s=20210112;
        h=message-id:date:mime-version:user-agent:subject:content-language:to
         :cc:references:from:in-reply-to:content-transfer-encoding;
        bh=tvi+CbjBZiaWt83v4DDYcOeSUIz7fvyu9NHoATP31MQ=;
        b=EHu3Vgl6G16UPOPzkJySlDlLsFfXzlh5uKmwP/vkUh55Tapii0hN3/FDBrGZSecMgH
         Ubq68jw4L9Kw5h5+9ZjEBI4azPkOAS61alAvOM/Y+tVJwb9C1/jWnuWICAlf80Npnokr
         7D7atmo5BBTY37TbExAkqA2RxthXeulom6/EwJiHqk+KWA8Omr9KWa6fNmTu22CIsWz0
         D+ftNx4mMWq2/x0/XmYW/CQ4mc8GgZXZ1hWSux7CYx4mcQq4f3/qNSdaJNKVKxpmKih9
         hZfOwKYVqERYhctPnn7hGSL8BYwqyRo9ATLwSR45S/XqLaZXijMjyxk5CyvEOQ9VEIsR
         EkNQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20210112;
        h=x-gm-message-state:message-id:date:mime-version:user-agent:subject
         :content-language:to:cc:references:from:in-reply-to
         :content-transfer-encoding;
        bh=tvi+CbjBZiaWt83v4DDYcOeSUIz7fvyu9NHoATP31MQ=;
        b=1chPNQ1zzb+ITUyqvycdXbuErjQX/2GbK3zU6sini2is2ve/fwhOHEPETYjGjjFgHg
         3QVkW1x74EphBu/hIGEYFgvlZGf9Y85XAVZrmrOgBuQT0VZE+ouogKUT6Pvl6rf3JeGH
         m0e4cBmxJPLdxNLUO/ZCwGh8MhZzMsS83XhjkmK1kNLdNqAYr++ArvshRATQndj5seLr
         T73kJrgrArTjzli1Cnh1Rjn87Z4hFd6zES+6l7pZHImDnCA4IEZLdrIoO+NpOyAWV+zL
         ViqVsqrWTfeQWzxzPGE9BVudopRfGksQ8hgNEmfEPpnTNcnQUn2vo+YjY3N95IMGxMAW
         g+Zw==
X-Gm-Message-State: AOAM532NqINRtHifFp56830PIsIFkaFdw5m9BFtGv40P4xnw+gfr1Jv7
        vfGxxCB0b0Ko2vR4ksxiw5rWyQ==
X-Google-Smtp-Source: ABdhPJx0UxqWu9BRtnm2GIMgJ2kxbnOX7bMhCwWVJJ5KuFPttt/KLmBTAfSEbY5yBquyE115vcpfaQ==
X-Received: by 2002:a05:6a00:190f:b0:4f3:a81d:c4c3 with SMTP id y15-20020a056a00190f00b004f3a81dc4c3mr21434773pfi.45.1646793190222;
        Tue, 08 Mar 2022 18:33:10 -0800 (PST)
Received: from [192.168.1.100] ([198.8.77.157])
        by smtp.gmail.com with ESMTPSA id f4-20020aa782c4000000b004f6f0334a51sm434924pfn.126.2022.03.08.18.33.09
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Tue, 08 Mar 2022 18:33:09 -0800 (PST)
Message-ID: <fac2395b-9ad7-4c57-3d4a-ce6ba097ffb3@kernel.dk>
Date:   Tue, 8 Mar 2022 19:33:08 -0700
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux aarch64; rv:91.0) Gecko/20100101
 Thunderbird/91.6.1
Subject: Re: linux-next: build failure after merge of the block tree
Content-Language: en-US
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20220309131638.26600d10@canb.auug.org.au>
From:   Jens Axboe <axboe@kernel.dk>
In-Reply-To: <20220309131638.26600d10@canb.auug.org.au>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 3/8/22 7:16 PM, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> In file included from block/blk-mq-debugfs-zoned.c:7:
> block/blk-mq-debugfs.h:24:42: error: 'struct blk_mq_hw_ctx' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
>    24 |                                   struct blk_mq_hw_ctx *hctx);
>       |                                          ^~~~~~~~~~~~~
> block/blk-mq-debugfs.h:25:44: error: 'struct blk_mq_hw_ctx' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
>    25 | void blk_mq_debugfs_unregister_hctx(struct blk_mq_hw_ctx *hctx);
>       |                                            ^~~~~~~~~~~~~
> block/blk-mq-debugfs.h:32:47: error: 'struct blk_mq_hw_ctx' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
>    32 |                                        struct blk_mq_hw_ctx *hctx);
>       |                                               ^~~~~~~~~~~~~
> block/blk-mq-debugfs.h:33:50: error: 'struct blk_mq_hw_ctx' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
>    33 | void blk_mq_debugfs_unregister_sched_hctx(struct blk_mq_hw_ctx *hctx);
>       |                                                  ^~~~~~~~~~~~~
> cc1: all warnings being treated as errors

It just needs a forward declaration. I'll fix it up.

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id B8B87C433F5
	for <linux-next@archiver.kernel.org>; Wed,  9 Mar 2022 02:42:30 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S231545AbiCICn0 (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Tue, 8 Mar 2022 21:43:26 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33638 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S231539AbiCICnY (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Tue, 8 Mar 2022 21:43:24 -0500
Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E52263D8
        for <linux-next@vger.kernel.org>; Tue,  8 Mar 2022 18:42:25 -0800 (PST)
Received: by mail-pl1-x633.google.com with SMTP id r12so770176pla.1
        for <linux-next@vger.kernel.org>; Tue, 08 Mar 2022 18:42:25 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20210112.gappssmtp.com; s=20210112;
        h=message-id:date:mime-version:user-agent:subject:content-language
         :from:to:cc:references:in-reply-to:content-transfer-encoding;
        bh=Nq5oE57ceqvDWxpK4wSnF7NhZzcG0ii3WOnYPCtmIiE=;
        b=CNPHgBnxRO/Su5D1rwSEpCeJKBF/8Fxmi3tFXt1piWtM1cyMre2UFDm4pVUHO7Po5T
         5ZjjgKLIaEMhlpwAAcIfO4WzBLpBNwkzBHT+cdq99A02yqM7efp0c3BLeMSGk3EMCoDb
         4cJF5MD3orXBH/qfc6uNkcyMLL1xZsp5IXz+7v3IM5AUtOS4V1S05Q27Ha4u06GkL83C
         jQxYH38e30FN/jamRg5s1smFzCrSmTHmqsG4oB7uRwpz0EJ47MJ7NbZBOa/5s8bQ7Vdk
         hc2Jc3PM7qg9NQpTeBW7U/z3Zv/6gzElgVSFICvHjUnjcGrzWW3g2z6tO30QBHod7fQF
         ySxA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20210112;
        h=x-gm-message-state:message-id:date:mime-version:user-agent:subject
         :content-language:from:to:cc:references:in-reply-to
         :content-transfer-encoding;
        bh=Nq5oE57ceqvDWxpK4wSnF7NhZzcG0ii3WOnYPCtmIiE=;
        b=kIWPoTpaAhQAwbped31j6jiR/B9VdtwG0+Pqfe0AGYrucnxf38IrMnQrKjTOnw9LNF
         UkbGrXGdoUuGqk3cvnZjyZZ63bqQ17+D/AwuQTVez+JtHKFr0u0nQJDVFF8r6MU+hiqO
         rJ7QZlu6aLQME9isTgTaWLT38qtszavCFHaiP1K1kmXMHrOH8WSXdsHC+tt7nZQZQZiB
         t/HMuJIjMDbYYYbqtjJESQhy+aMOUwGyZM/gsX0OILRz1Yt1099f3n7ihJEI2M3A97b0
         e3tDqJz0+oPxC6XuAKby7kidyhbz7B/w0uuaClZEakdBnqUSArkq6qFIaJM2oYXeEBlU
         qIYw==
X-Gm-Message-State: AOAM532ayJ5dNzX001dFClgiOsUw3KgNMxDKuWgn2JSRDxdoIrciJlQn
        zLV4/vMnCuSUVHdAFbhSdH0NJA==
X-Google-Smtp-Source: ABdhPJyaTCleWFwk3rJ0H3rrAq8MB+MdZpKF/eeKm8eSpSTUKIbuOQZGbaX8IrOEsf/H0mnZzQ0WKA==
X-Received: by 2002:a17:90a:4f0b:b0:1be:e320:3e62 with SMTP id p11-20020a17090a4f0b00b001bee3203e62mr8040905pjh.124.1646793745041;
        Tue, 08 Mar 2022 18:42:25 -0800 (PST)
Received: from [192.168.1.100] ([198.8.77.157])
        by smtp.gmail.com with ESMTPSA id o185-20020a6341c2000000b0036fb987b25fsm434188pga.38.2022.03.08.18.42.24
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Tue, 08 Mar 2022 18:42:24 -0800 (PST)
Message-ID: <52b0a497-fa46-fadd-d6ea-a5d4d5ce90e8@kernel.dk>
Date:   Tue, 8 Mar 2022 19:42:23 -0700
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux aarch64; rv:91.0) Gecko/20100101
 Thunderbird/91.6.1
Subject: Re: linux-next: build failure after merge of the block tree
Content-Language: en-US
From:   Jens Axboe <axboe@kernel.dk>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20220309131638.26600d10@canb.auug.org.au>
 <fac2395b-9ad7-4c57-3d4a-ce6ba097ffb3@kernel.dk>
In-Reply-To: <fac2395b-9ad7-4c57-3d4a-ce6ba097ffb3@kernel.dk>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 3/8/22 7:33 PM, Jens Axboe wrote:
> On 3/8/22 7:16 PM, Stephen Rothwell wrote:
>> Hi all,
>>
>> After merging the block tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> In file included from block/blk-mq-debugfs-zoned.c:7:
>> block/blk-mq-debugfs.h:24:42: error: 'struct blk_mq_hw_ctx' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
>>    24 |                                   struct blk_mq_hw_ctx *hctx);
>>       |                                          ^~~~~~~~~~~~~
>> block/blk-mq-debugfs.h:25:44: error: 'struct blk_mq_hw_ctx' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
>>    25 | void blk_mq_debugfs_unregister_hctx(struct blk_mq_hw_ctx *hctx);
>>       |                                            ^~~~~~~~~~~~~
>> block/blk-mq-debugfs.h:32:47: error: 'struct blk_mq_hw_ctx' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
>>    32 |                                        struct blk_mq_hw_ctx *hctx);
>>       |                                               ^~~~~~~~~~~~~
>> block/blk-mq-debugfs.h:33:50: error: 'struct blk_mq_hw_ctx' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
>>    33 | void blk_mq_debugfs_unregister_sched_hctx(struct blk_mq_hw_ctx *hctx);
>>       |                                                  ^~~~~~~~~~~~~
>> cc1: all warnings being treated as errors
> 
> It just needs a forward declaration. I'll fix it up.

Fixed and pushed out.

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id C2168C433EF
	for <linux-next@archiver.kernel.org>; Wed,  4 May 2022 01:40:42 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S239545AbiEDBoO (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Tue, 3 May 2022 21:44:14 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49190 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S235416AbiEDBoO (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Tue, 3 May 2022 21:44:14 -0400
Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 325891A80F;
        Tue,  3 May 2022 18:40:38 -0700 (PDT)
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4KtKKF1wQhz4xTX;
        Wed,  4 May 2022 11:40:32 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1651628434;
        bh=QxQ5k3WeRy9fAPYUqZ8f27VNj5G0iGKr5OMkwJuFqZU=;
        h=Date:From:To:Cc:Subject:From;
        b=ZzrTCVnG49PdQY6hsudTqAGovpdIRJR5tPZ6yz2ifD5EL087CmVZFkve8QTptVqd0
         zy3NIx4Ph2jgL2BADQXz5wbykwSuxUyZB1Li1jklyjXOfhAsB4hosWeQM+kuaAo7Z4
         cZ/rJ8X1Ra3NsT9+EdoQfkzw01AI+7866YbklF1zWSDCq64Webx+YvEkRKrYqzGC+1
         4zZlHZiVDmhrwZuCK8qHZhVi/x46O3saXsq6yjPMDgkElpe4MpL9Wy1L22zSkgkMUF
         nelLrkGAC9wzTpDn30yrceS0iq7pkw23QrCl2iGCFb1cQEE4siqQtYnWG6r7qlMun6
         sSOr5qcOlKVRQ==
Date:   Wed, 4 May 2022 11:40:31 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Christoph Hellwig <hch@lst.de>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20220504114031.40747e03@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/hX0vgwFIKurJsaX.xISZtGw";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/hX0vgwFIKurJsaX.xISZtGw
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:

drivers/block/xen-blkback/xenbus.c: In function 'xen_blkbk_discard':
drivers/block/xen-blkback/xenbus.c:578:31: error: unused variable 'q' [-Wer=
ror=3Dunused-variable]
  578 |         struct request_queue *q =3D bdev_get_queue(bdev);
      |                               ^
cc1: all warnings being treated as errors

Caused by commit

  c899b2353386 ("xen-blkback: use bdev_discard_alignment")

I have applied the following fix patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 4 May 2022 11:26:59 +1000
Subject: [PATCH] xen-blkback: remove unused variable

Fixes: c899b2353386 ("xen-blkback: use bdev_discard_alignment")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/block/xen-blkback/xenbus.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback=
/xenbus.c
index 04c90cb8955f..97de13b14175 100644
--- a/drivers/block/xen-blkback/xenbus.c
+++ b/drivers/block/xen-blkback/xenbus.c
@@ -575,7 +575,6 @@ static void xen_blkbk_discard(struct xenbus_transaction=
 xbt, struct backend_info
 	int err;
 	int state =3D 0;
 	struct block_device *bdev =3D be->blkif->vbd.bdev;
-	struct request_queue *q =3D bdev_get_queue(bdev);
=20
 	if (!xenbus_read_unsigned(dev->nodename, "discard-enable", 1))
 		return;
--=20
2.35.1

--=20
Cheers,
Stephen Rothwell

--Sig_/hX0vgwFIKurJsaX.xISZtGw
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEyBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmJx2Y8ACgkQAVBC80lX
0GwNhQf47figcnswL2Xb/amERNfqXFce8a5yN7B8wxqYYEckDD27lB3L6irl7zrE
V7HGi/B219Pw5Cml7SKBk/pldokFeDd7y1ERUFqeVySDqMSsKuZeAv4W2y6v26cR
z5iFoZ/gfkE/sS38t0nhwCvRBwpaeoSfedLaMylmn9blS93JINvcSmSQK7gTjZ0S
o2jgnkcntsf3ZeFlnaD61aWmeVY7Kkcnqb/qYLtmAh4Wikep6csJIusxZdJepymE
0+V88MPV/uWg6ruBLXIrAHV8JlZQP9Opbu38QD0V5FLlHQYGHJfrrNBdkluCWYCe
QlvuQowqct6uWLCLofON175y0XRd
=YgK5
-----END PGP SIGNATURE-----

--Sig_/hX0vgwFIKurJsaX.xISZtGw--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 41B94C433EF
	for <linux-next@archiver.kernel.org>; Wed,  4 May 2022 11:25:56 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1345970AbiEDL3a (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Wed, 4 May 2022 07:29:30 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40546 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S243785AbiEDL33 (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Wed, 4 May 2022 07:29:29 -0400
Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E87E91DA4C
        for <linux-next@vger.kernel.org>; Wed,  4 May 2022 04:25:53 -0700 (PDT)
Received: by mail-pj1-x1035.google.com with SMTP id gj17-20020a17090b109100b001d8b390f77bso4927174pjb.1
        for <linux-next@vger.kernel.org>; Wed, 04 May 2022 04:25:53 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20210112.gappssmtp.com; s=20210112;
        h=message-id:date:mime-version:user-agent:subject:content-language:to
         :cc:references:from:in-reply-to:content-transfer-encoding;
        bh=5mO6F1EOrQXM0niTfrnYByiFhvGDeihM4EKAM1KLnBE=;
        b=qd/tf+lgyDOp6PwSYhwcCPZg/ueUtY5F6beEU8PGWzlKMUyyqWdDN4WlCy7UXmxOO0
         zhxNXbjXsHsShD+r7OjaNob9/d4ikbBnB+QatUmSmRI/yPgTZNEQQsRHYMyCcfcV6dbD
         ESKy6b3a1lbd1AhEAEAvHbB9pP91pVGwRXiCAZEqdMvtgbehdvOcj8D2tQMxPKMXNG0d
         6bVCQQCYwlxEh9n30XhR1Lis+RzLSpFaZRzKGAM+JARolal1HzSbVBCHDfkyeMy38I1T
         GIEeuxjQai51T2mtz5pBczpa5quGZycMKAUr8cABRWK+iU8k9gVCbd9VMBZAilVNcWT7
         P/tA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20210112;
        h=x-gm-message-state:message-id:date:mime-version:user-agent:subject
         :content-language:to:cc:references:from:in-reply-to
         :content-transfer-encoding;
        bh=5mO6F1EOrQXM0niTfrnYByiFhvGDeihM4EKAM1KLnBE=;
        b=7cXGu/aFqfD8KyNptOP3xyj/y/ZPiUBBFwybPKrWTjLLYnljN7dWMfE1BUZBki8IAb
         N2SgrR6h6lYaRP0zNdRhoy0IIax9DT176QaCR4PfdTEhqnJbsc4P2AkcPkt73e5r/yB1
         u7jIwv7cw21f+tlcJgUCoBtrCxk4Iko7DxgAdzGQ7FUsqKr6Ena+/bZU7IyyZhMsn3pe
         VSt5xMD6uzOxzqyU/6/km744jaCUaLTWe1Y+x3XAvxriRqkL7t0Ss3xb3a2LqKAl4bDB
         Ff+XnkgUg6vcJpz3QaPLn3Pq8PSLRK8gkWDfWWkVObAr8MedmqaTLa9SVQz0YBvgCed9
         6N+A==
X-Gm-Message-State: AOAM531JWFHycphLtQMDXTmxbHFjfn57R6+hXU/XI6ypB0896OgXl5rp
        C/Y26f1NO0ui2CDdbrbMDwiBww==
X-Google-Smtp-Source: ABdhPJxqqqrvzTPqgyL2pdh/okD59AmwKigCkPQUbGkQFASydql8esLb16vUQyp7oCaCmJJy6DxtJw==
X-Received: by 2002:a17:902:d505:b0:15e:8b5c:bbe3 with SMTP id b5-20020a170902d50500b0015e8b5cbbe3mr20725950plg.38.1651663553340;
        Wed, 04 May 2022 04:25:53 -0700 (PDT)
Received: from [192.168.4.166] (cpe-72-132-29-68.dc.res.rr.com. [72.132.29.68])
        by smtp.gmail.com with ESMTPSA id v21-20020a631515000000b003c14af50603sm14807220pgl.27.2022.05.04.04.25.52
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Wed, 04 May 2022 04:25:52 -0700 (PDT)
Message-ID: <a4844963-3887-ffe6-d219-efee3e859356@kernel.dk>
Date:   Wed, 4 May 2022 05:25:51 -0600
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux aarch64; rv:91.0) Gecko/20100101
 Thunderbird/91.8.1
Subject: Re: linux-next: build failure after merge of the block tree
Content-Language: en-US
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Christoph Hellwig <hch@lst.de>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20220504114031.40747e03@canb.auug.org.au>
From:   Jens Axboe <axboe@kernel.dk>
In-Reply-To: <20220504114031.40747e03@canb.auug.org.au>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 5/3/22 7:40 PM, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/block/xen-blkback/xenbus.c: In function 'xen_blkbk_discard':
> drivers/block/xen-blkback/xenbus.c:578:31: error: unused variable 'q' [-Werror=unused-variable]
>   578 |         struct request_queue *q = bdev_get_queue(bdev);
>       |                               ^
> cc1: all warnings being treated as errors
> 
> Caused by commit
> 
>   c899b2353386 ("xen-blkback: use bdev_discard_alignment")

Thanks, folded in the fix.

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 9EA2CC433F5
	for <linux-next@archiver.kernel.org>; Mon, 23 May 2022 02:49:29 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1353117AbiEWCt2 (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Sun, 22 May 2022 22:49:28 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34554 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S234211AbiEWCt0 (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Sun, 22 May 2022 22:49:26 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6962C36E1D;
        Sun, 22 May 2022 19:49:24 -0700 (PDT)
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4L61xt02W1z4xD8;
        Mon, 23 May 2022 12:49:21 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1653274162;
        bh=8vRrqTTTdaOdgjSyiFkBry6La19dq3qrUOHOFmITwwM=;
        h=Date:From:To:Cc:Subject:From;
        b=kQjXVig3BrrDkctZY3mC0Pl/OEc/TcXgNDjlPgSAGT+ikHn40yxT5TjYmNiTRJHYp
         6MiWA+DMhyw44xRHAw/a5kOrmeKWak0P8M/6d7gwRLVPgwBTybMtaexhl5Co8O0rZa
         Rw1AbNXBvF5f9GFBkMcrmtagi6boTUZH0Pxpx1Gl4iHp97eOVW7Y55RfuHJLw2sVMg
         328/J/i4mb3r6H0hlakmo0u4NnhnliZrvDSyIsdl50WsqAaaYg5g0tvV90WS/G/dzC
         WmtLwcarJ+hn+o7+rLa988v6crud0gzhyf26tRg7fLmyZ7fDGl6YHQqH9xqDOxQ/yB
         Llnz8tqGW+OOw==
Date:   Mon, 23 May 2022 12:49:21 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Coly Li <colyli@suse.de>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20220523124921.7d6bbf34@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/ZtyPrewlH62vDJ+OMJGI0ml";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/ZtyPrewlH62vDJ+OMJGI0ml
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:

drivers/md/bcache/btree.c: In function 'bch_btree_check':
drivers/md/bcache/btree.c:2073:1: error: the frame size of 2184 bytes is la=
rger than 2048 bytes [-Werror=3Dframe-larger-than=3D]
 2073 | }
      | ^

Caused by commit

  c766acd3d78e ("bcache: improve multithreaded bch_btree_check()")

struct btree_check_state is very large to put on the stack :-(

I have reverted that commit for today.

--=20
Cheers,
Stephen Rothwell

--Sig_/ZtyPrewlH62vDJ+OMJGI0ml
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmKK9jEACgkQAVBC80lX
0GwF2wf9HjrIEdKFVp9p1ny33ibl0ftizJ4Z9NUW2D4hkeGZr7i8LWMnwPA6dW+u
DvHyu1oHT5AQZdPdOYzI/ScSy9MMs74ApxYJja7x+JQAfZ4pdhKXLQjk1GAav32e
ndFUyn9aeczJGtUj4ktQZzgKVqFKzwzToTP/AwQW16gQHnoWucn+wK7V4gBQo+kp
2Q7jz1FonSknbSdjQ7j+A2zCyjt19nJdN/GjdIBZuMv3wbLB6+dWpHLp1rRE7wHH
HOk7uPqlLgnrk5EbRYR5LD3dRWN9IKCQ/u50e8RSyfO/RH+yvus1twnYgba4JQvD
9QdOvNftaO9qPuQqw1fG7jp+QwzA2A==
=2S6x
-----END PGP SIGNATURE-----

--Sig_/ZtyPrewlH62vDJ+OMJGI0ml--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 40939C433EF
	for <linux-next@archiver.kernel.org>; Mon, 23 May 2022 02:52:14 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1348956AbiEWCwN (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Sun, 22 May 2022 22:52:13 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40454 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S230395AbiEWCwM (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Sun, 22 May 2022 22:52:12 -0400
Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [IPv6:2607:f8b0:4864:20::62b])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 561231EADE
        for <linux-next@vger.kernel.org>; Sun, 22 May 2022 19:52:10 -0700 (PDT)
Received: by mail-pl1-x62b.google.com with SMTP id a13so1356175plh.6
        for <linux-next@vger.kernel.org>; Sun, 22 May 2022 19:52:10 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20210112.gappssmtp.com; s=20210112;
        h=message-id:date:mime-version:user-agent:subject:content-language:to
         :cc:references:from:in-reply-to:content-transfer-encoding;
        bh=rvYIyk1yb20798ouuDUQxf3Rwf5JHSIlW3fsEoAcKMg=;
        b=Zc5IjWlWFQ7egKRL58nFYhMlVqHAp88MafypBjzxVXnl1Z+jU3XSfrsqFlmDm6out9
         NZpOyahDej5a1393DubgBMSzwNDWOe7gP17vAqkUvAls6FOd3AiizK7ec0jSxs2Rj+Zv
         16NMD/B9srrP4cejxXORlceBPaSD7nYE0tM7D3HrkkgFvj84p6e5gDFWC8OrUD+BbI3A
         AfwBpxj/SqyIuTYQyq1YVC/iPljmTDVQpBZAvatV8X3kwTtKHC+Vt/xLrDTOm8aFJp+r
         NNG5KVb7rfvypQr96amiuxqbkRxiu36L2AqCZEdThq5J0SpPI3MctaCeUA1djDnfk43V
         O87g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20210112;
        h=x-gm-message-state:message-id:date:mime-version:user-agent:subject
         :content-language:to:cc:references:from:in-reply-to
         :content-transfer-encoding;
        bh=rvYIyk1yb20798ouuDUQxf3Rwf5JHSIlW3fsEoAcKMg=;
        b=5RCFk9G8gD5TR+5wdYFgLr4EcsN1SVg1bl7+TpxdnIgREpiglPVfq4LC3C6zDDg/rq
         2j2eXLIqP2G++ic3A/FEtMda/dOsliNeb6EElCRcFQopCneODrJpzGZmXCbt6geH33oG
         fZooX1dvoDJ2wrucRFSXmO+pOl+DlnsLmYSoURDbFXSKdERV9cqwZ63KGHuXssFBSDsc
         5eSWs5WXcYDyMxSYXj01tw7qyPNeoB1lL/CYx/qqrphTaECUT8VZ41oy4GJQf8pgyQMv
         wNkG1AK0wEbZqseRTGqyCaKaW1XJw5Ky9BN39cTfm+YjRdsVeFqkABLHrYcyYkLksO3M
         YuXg==
X-Gm-Message-State: AOAM5307zWuxA4eSD86jFk0ppsPGwa6UZoYpxO2E8y7MKHxQFBmGOGA2
        Q+vr+G+k2i2kBFxHCJAh2eNbUA==
X-Google-Smtp-Source: ABdhPJyaBjpk+NdPSFZh+kl+4SogHky0a9Ra0JCghE4MT6zExngfwomvnpjPNjO7cKgxh1Hpn7e8Ng==
X-Received: by 2002:a17:90b:4b52:b0:1df:c1ef:2cd1 with SMTP id mi18-20020a17090b4b5200b001dfc1ef2cd1mr24154304pjb.130.1653274329849;
        Sun, 22 May 2022 19:52:09 -0700 (PDT)
Received: from [192.168.1.100] ([198.8.77.157])
        by smtp.gmail.com with ESMTPSA id 1-20020a170902c10100b0015e8d4eb228sm3809450pli.114.2022.05.22.19.52.09
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Sun, 22 May 2022 19:52:09 -0700 (PDT)
Message-ID: <df3ffbac-2f4e-df03-8b29-8e2e4bb69fac@kernel.dk>
Date:   Sun, 22 May 2022 20:52:08 -0600
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux aarch64; rv:91.0) Gecko/20100101
 Thunderbird/91.9.0
Subject: Re: linux-next: build failure after merge of the block tree
Content-Language: en-US
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Coly Li <colyli@suse.de>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20220523124921.7d6bbf34@canb.auug.org.au>
From:   Jens Axboe <axboe@kernel.dk>
In-Reply-To: <20220523124921.7d6bbf34@canb.auug.org.au>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 5/22/22 8:49 PM, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/md/bcache/btree.c: In function 'bch_btree_check':
> drivers/md/bcache/btree.c:2073:1: error: the frame size of 2184 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
>  2073 | }
>       | ^
> 
> Caused by commit
> 
>   c766acd3d78e ("bcache: improve multithreaded bch_btree_check()")
> 
> struct btree_check_state is very large to put on the stack :-(
> 
> I have reverted that commit for today.

Thanks, I'll drop it. It's not part of the initial request sent to
Linus, exactly because it arrived late.

Coly, I'm dropping this series.

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 8054CC4332F
	for <linux-next@archiver.kernel.org>; Mon, 23 May 2022 06:12:40 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S230211AbiEWGMj (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Mon, 23 May 2022 02:12:39 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43142 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S236374AbiEWGMF (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Mon, 23 May 2022 02:12:05 -0400
Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7518AE3D;
        Sun, 22 May 2022 23:12:04 -0700 (PDT)
Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512)
        (No client certificate requested)
        by smtp-out2.suse.de (Postfix) with ESMTPS id 968A71F383;
        Mon, 23 May 2022 06:05:13 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa;
        t=1653285913; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc:
         mime-version:mime-version:content-type:content-type:
         content-transfer-encoding:content-transfer-encoding:
         in-reply-to:in-reply-to:references:references;
        bh=A48QX/vupAuDBBHOJLZZB2SN4uoXt1Za4zzMoiIYE6M=;
        b=NUPGG7/Cyb8PISM5MQxuSK/EtfR77Nk33xy/KVu+F1Y55Kruti902KJPmGMnxMWEzCwe3Z
        OojVdGzwPekil0h+LKdnJ2ZLrDrZ8bBpm4rbDCUvVCPQIWwlBM3MS4KkS6CA7NRd/Yse0I
        ENeLjrrNb+U5ef1j9y7FD0KvuSX5tNo=
DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de;
        s=susede2_ed25519; t=1653285913;
        h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc:
         mime-version:mime-version:content-type:content-type:
         content-transfer-encoding:content-transfer-encoding:
         in-reply-to:in-reply-to:references:references;
        bh=A48QX/vupAuDBBHOJLZZB2SN4uoXt1Za4zzMoiIYE6M=;
        b=AZLHrLi9ozj4GGOxPypKkh9E2+zcGbXAWjfJzhE2IDXmfNR4y7bw0+qvaL5pEATHPz2oHS
        QXXScIvxSgAQyFCA==
Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512)
        (No client certificate requested)
        by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 5C93D13AA5;
        Mon, 23 May 2022 06:05:12 +0000 (UTC)
Received: from dovecot-director2.suse.de ([192.168.254.65])
        by imap2.suse-dmz.suse.de with ESMTPSA
        id 9YIHCBgki2IHdwAAMHmgww
        (envelope-from <colyli@suse.de>); Mon, 23 May 2022 06:05:12 +0000
Message-ID: <f1a9c46e-59a6-7b68-fd17-6f2563e24e98@suse.de>
Date:   Mon, 23 May 2022 14:05:08 +0800
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0)
 Gecko/20100101 Thunderbird/91.9.1
Subject: Re: linux-next: build failure after merge of the block tree
Content-Language: en-US
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Stephen Rothwell <sfr@canb.auug.org.au>
References: <20220523124921.7d6bbf34@canb.auug.org.au>
 <df3ffbac-2f4e-df03-8b29-8e2e4bb69fac@kernel.dk>
From:   Coly Li <colyli@suse.de>
In-Reply-To: <df3ffbac-2f4e-df03-8b29-8e2e4bb69fac@kernel.dk>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 5/23/22 10:52 AM, Jens Axboe wrote:
> On 5/22/22 8:49 PM, Stephen Rothwell wrote:
>> Hi all,
>>
>> After merging the block tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/md/bcache/btree.c: In function 'bch_btree_check':
>> drivers/md/bcache/btree.c:2073:1: error: the frame size of 2184 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
>>   2073 | }
>>        | ^
>>
>> Caused by commit
>>
>>    c766acd3d78e ("bcache: improve multithreaded bch_btree_check()")
>>
>> struct btree_check_state is very large to put on the stack :-(
>>
>> I have reverted that commit for today.

Hi Jens,

> Thanks, I'll drop it. It's not part of the initial request sent to
> Linus, exactly because it arrived late.
>
> Coly, I'm dropping this series.

Yes please. Should I re-submit the fixed series to you in later -RC 
round, or wait for 5.20 merge window?


Thanks.

Coly Li




From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 8B0FCC433F5
	for <linux-next@archiver.kernel.org>; Mon, 23 May 2022 12:31:35 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S235540AbiEWMbd (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Mon, 23 May 2022 08:31:33 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37628 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S235546AbiEWMbb (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Mon, 23 May 2022 08:31:31 -0400
Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8CFD72B267
        for <linux-next@vger.kernel.org>; Mon, 23 May 2022 05:31:29 -0700 (PDT)
Received: by mail-pf1-x433.google.com with SMTP id f21so1202822pfa.3
        for <linux-next@vger.kernel.org>; Mon, 23 May 2022 05:31:29 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20210112.gappssmtp.com; s=20210112;
        h=message-id:date:mime-version:user-agent:subject:content-language:to
         :cc:references:from:in-reply-to:content-transfer-encoding;
        bh=drc5LnU//nothzoPqQ8d1G4VXl7oy7LH+bWASwffyS0=;
        b=cUjzWmvkn1g+Ctnqb9MUltJvIF5FuQsDRBOLVuQ/2DACJACoScCPORIK0YNVEvtYJW
         7mnjzKll6XZsFk9zw0VVRjk+GagEMU1q1FQvFN/qMWvY9SQ2+58l9+WcPpN5ix29NgGi
         u4Xo4WZXPKpkd5RcyH7ClkcGPRfSEYtuskl+1oSh6sezlpOlByJQ/Aypi7bUJO2mhgLv
         bYMaAOyvdXmmHNNgMOnY7f9Wi/bvXJZKBPJ3S6Xs/5mMvjwOF21UH7F6qGOHwpt2c9N1
         EK5FTv6xjaUIz9dNJRsle5vJmw3rwCWHp4zT2F48v9wMPTqHpoDaYiQseopL6Xq4PswJ
         ZqYQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20210112;
        h=x-gm-message-state:message-id:date:mime-version:user-agent:subject
         :content-language:to:cc:references:from:in-reply-to
         :content-transfer-encoding;
        bh=drc5LnU//nothzoPqQ8d1G4VXl7oy7LH+bWASwffyS0=;
        b=2L0ivx4/2/GdohvsxQ9OEkRDRwq6MOnz79hPAl6RsS82u+VzVUhB8V+3400P1EsMHh
         0NZHDFQdaE/GOBq4ScpYTJXZYNpKO/7FvVO3EdNZD10q8asNe6qvX8d5196y0NnW7bbH
         PDIGOa9dd7QnQTs11bJYvMybZzAyLh1OSaDjyZCEjRNondj+mwmM7pWsaPAuVIGZZca9
         KRg4NLvtbeZHArtMABuyg7tLrI6FQ1iQIMMGcc7zdRZu0XxvKAru7pSo1nThUs2u1CD7
         OU+kl7h/SGwja7oMlrkVRjlfUqpE/+amNTzNqTYtt19J/K28pZxOfduqux13ma84BICk
         ekzQ==
X-Gm-Message-State: AOAM531jgh/1tEx8vsHw4qBFGPHMY8lm+X8c/c5KFraOt59/ELD8lekp
        LvwBpoZM5Pc806BWWxBEng1RYkKdRpvKqA==
X-Google-Smtp-Source: ABdhPJwgWclUcyvYUV+ZStu0nHJ4/FYeTiOk1bWWebykY/Rdx+WsX/KSJ4QAglqBV2Jfvlj9RLHc4Q==
X-Received: by 2002:a63:3194:0:b0:3f6:a28:77cf with SMTP id x142-20020a633194000000b003f60a2877cfmr19688940pgx.264.1653309089024;
        Mon, 23 May 2022 05:31:29 -0700 (PDT)
Received: from [192.168.1.100] ([198.8.77.157])
        by smtp.gmail.com with ESMTPSA id b16-20020a170902b61000b0015ec71f72d6sm4995468pls.253.2022.05.23.05.31.28
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Mon, 23 May 2022 05:31:28 -0700 (PDT)
Message-ID: <b12eb111-ea5f-e396-d7b3-249bf1e45e9d@kernel.dk>
Date:   Mon, 23 May 2022 06:31:27 -0600
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux aarch64; rv:91.0) Gecko/20100101
 Thunderbird/91.9.0
Subject: Re: linux-next: build failure after merge of the block tree
Content-Language: en-US
To:     Coly Li <colyli@suse.de>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Stephen Rothwell <sfr@canb.auug.org.au>
References: <20220523124921.7d6bbf34@canb.auug.org.au>
 <df3ffbac-2f4e-df03-8b29-8e2e4bb69fac@kernel.dk>
 <f1a9c46e-59a6-7b68-fd17-6f2563e24e98@suse.de>
From:   Jens Axboe <axboe@kernel.dk>
In-Reply-To: <f1a9c46e-59a6-7b68-fd17-6f2563e24e98@suse.de>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 5/23/22 12:05 AM, Coly Li wrote:
> On 5/23/22 10:52 AM, Jens Axboe wrote:
>> On 5/22/22 8:49 PM, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> After merging the block tree, today's linux-next build (x86_64
>>> allmodconfig) failed like this:
>>>
>>> drivers/md/bcache/btree.c: In function 'bch_btree_check':
>>> drivers/md/bcache/btree.c:2073:1: error: the frame size of 2184 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
>>>   2073 | }
>>>        | ^
>>>
>>> Caused by commit
>>>
>>>    c766acd3d78e ("bcache: improve multithreaded bch_btree_check()")
>>>
>>> struct btree_check_state is very large to put on the stack :-(
>>>
>>> I have reverted that commit for today.
> 
> Hi Jens,
> 
>> Thanks, I'll drop it. It's not part of the initial request sent to
>> Linus, exactly because it arrived late.
>>
>> Coly, I'm dropping this series.
> 
> Yes please. Should I re-submit the fixed series to you in later -RC
> round, or wait for 5.20 merge window?

Just resubmit it when it's been fixed, then we'll figure it out at that
point. As mentioned in the original email, at the very least it needs a
linux-next soak for a weeks time. If the patches are simple enough and
don't cause odd build errors/warnings, then we can still make this
release if need be.

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 7922CC43334
	for <linux-next@archiver.kernel.org>; Fri, 15 Jul 2022 04:03:05 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S232428AbiGOEDE (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Fri, 15 Jul 2022 00:03:04 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36702 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S231527AbiGOEDD (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Fri, 15 Jul 2022 00:03:03 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01205753A6;
        Thu, 14 Jul 2022 21:03:02 -0700 (PDT)
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4Lkd4N4YLxz4xdJ;
        Fri, 15 Jul 2022 14:03:00 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1657857781;
        bh=6FhosIXeEv2iTJLL5/mJDR7ocd4WCVkI3wdrLqoSDvA=;
        h=Date:From:To:Cc:Subject:From;
        b=RCBxP/U7RRClN8Q47tF/erVKZajk4Pdhgx35GcKLWEKbWq6swi620UUmFcT0roK6m
         Lmw3A0Jyz3vK8FV1QBOYHgyNCRTvMHACpRWjYZrQIfi6Y5Is2/x5Mxxtpae8YegiHZ
         vwMT+vfnJ1smCpVvI1EVW8sbnMhlt65Ss6cgywxujoUfo6GqbPjx98svy0tfa39fDV
         ZuvxWNrdmjftc19LlE1Hct0n55dhOBEdHE95RMqXv/x7bln6gDuu0Xg/Pyjj1UWBUN
         V8NTiobL9QItYDPAQvzjyy3Dqs9Tj+7D7QP0vok/ci8GCpSuUQR6xypL5zG3FsOT90
         V4ZYzrYNyM66Q==
Date:   Fri, 15 Jul 2022 14:02:59 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>, Al Viro <viro@zeniv.linux.org.uk>
Cc:     "Jason A. Donenfeld" <Jason@zx2c4.com>,
        Ming Lei <ming.lei@redhat.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20220715140259.205ef267@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/+OQ6gAo3wG1LmmGCWmeXDZe";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/+OQ6gAo3wG1LmmGCWmeXDZe
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:

drivers/block/ublk_drv.c:951:19: error: 'no_llseek' undeclared here (not in=
 a function); did you mean 'noop_llseek'?
  951 |         .llseek =3D no_llseek,
      |                   ^~~~~~~~~
      |                   noop_llseek

Caused by commit

  71f28f3136af ("ublk_drv: add io_uring based userspace block driver")

interacting with commit

  8804bffa93a1 ("fs: remove no_llseek")

from the vfs tree.

I have applied the following merge resolution patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 15 Jul 2022 13:59:09 +1000
Subject: [PATCH] fix up for "fs: remove no_llseek"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/block/ublk_drv.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c
index f10c4319dc1f..52fd0af8a4f2 100644
--- a/drivers/block/ublk_drv.c
+++ b/drivers/block/ublk_drv.c
@@ -948,7 +948,6 @@ static const struct file_operations ublk_ch_fops =3D {
 	.owner =3D THIS_MODULE,
 	.open =3D ublk_ch_open,
 	.release =3D ublk_ch_release,
-	.llseek =3D no_llseek,
 	.uring_cmd =3D ublk_ch_uring_cmd,
 	.mmap =3D ublk_ch_mmap,
 };
--=20
2.35.1

--=20
Cheers,
Stephen Rothwell

--Sig_/+OQ6gAo3wG1LmmGCWmeXDZe
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmLQ5vMACgkQAVBC80lX
0GzEPAf/d/Lk1QwzVOaTpNM4HE/Mtaaakk+BZgrvdSVRrnElSdkSNYElg2CMJy+e
rd53OQRaRLX8opjb02OMgFgXn6lTYZ2lvd/xJCrSCOEPTURWNN7FLTIfijzAAfjQ
9MqfTCTkz7rUmbuHvGOXeVIgpv1p7f3D0DtFMQg5w3NrG59gLsoShOH0TDLQMPVm
tJJW233atlQu35ZFgfEa63iAbWmPrF+mwTdt5yR+dt/Y+Dh4uyRM5QPC8WAzqZrQ
yTNdQCE2eQA4C025WIxw7NZwE/cHGwqRVvO6QVFyNe+MOYbQzuiox1lAyjhLtU8M
AKcZ2oEgHeO5DZryWNKU3QZgUccdEQ==
=KLS7
-----END PGP SIGNATURE-----

--Sig_/+OQ6gAo3wG1LmmGCWmeXDZe--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 64EBEC433EF
	for <linux-next@archiver.kernel.org>; Fri, 15 Jul 2022 04:10:37 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S230192AbiGOEKe (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Fri, 15 Jul 2022 00:10:34 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41580 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S230241AbiGOEKc (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Fri, 15 Jul 2022 00:10:32 -0400
Received: from zeniv.linux.org.uk (zeniv.linux.org.uk [IPv6:2a03:a000:7:0:5054:ff:fe1c:15ff])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 29BB978204;
        Thu, 14 Jul 2022 21:10:30 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
        d=linux.org.uk; s=zeniv-20220401; h=Sender:In-Reply-To:Content-Type:
        MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To:
        Content-Transfer-Encoding:Content-ID:Content-Description;
        bh=FP50lK3xBTOjUUYYSIIFEqkI1PWnVPpuFJpL7i8sB7o=; b=qs+DNpZUXt9BxlyoZA7Ych79ee
        vuQoJvRtmATeiPIQH6uTZmJloklIblBL6q/t8gYc2MoXZRM1lbRlGzgPlvhg63l99XFPx7aQV6M9w
        9lmK7V/ZLOfVIFg6DUQw4SGK3YnZe/vK8n8Ok/DArSW5V4AsO5Li039nAYq1dhWeod5HlMzX3ZVvj
        p7462low2+6S6ciSxaBvDrAR295YIEuUCdael1ia3VYm9X33NxK0vlmVZy/Jnzd1gypnaa+W3/7iA
        tY0mJDwV2o0HRDHxNECfISt+qvfQMcsXeOY84+bBB5Jzc9tYJQDGAAReAbLShhzS6/noUTty7E+Kr
        rfCnLLBw==;
Received: from viro by zeniv.linux.org.uk with local (Exim 4.95 #2 (Red Hat Linux))
        id 1oCCeh-00CAeg-0X;
        Fri, 15 Jul 2022 04:10:19 +0000
Date:   Fri, 15 Jul 2022 05:10:18 +0100
From:   Al Viro <viro@zeniv.linux.org.uk>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Jens Axboe <axboe@kernel.dk>,
        "Jason A. Donenfeld" <Jason@zx2c4.com>,
        Ming Lei <ming.lei@redhat.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linus Torvalds <torvalds@linux-foundation.org>
Subject: Re: linux-next: build failure after merge of the block tree
Message-ID: <YtDoqhuAt6Sv6qgV@ZenIV>
References: <20220715140259.205ef267@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20220715140259.205ef267@canb.auug.org.au>
Sender: Al Viro <viro@ftp.linux.org.uk>
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On Fri, Jul 15, 2022 at 02:02:59PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/block/ublk_drv.c:951:19: error: 'no_llseek' undeclared here (not in a function); did you mean 'noop_llseek'?
>   951 |         .llseek = no_llseek,
>       |                   ^~~~~~~~~
>       |                   noop_llseek
> 
> Caused by commit
> 
>   71f28f3136af ("ublk_drv: add io_uring based userspace block driver")
> 
> interacting with commit
> 
>   8804bffa93a1 ("fs: remove no_llseek")
> 
> from the vfs tree.

I suspect that it would be a good idea to slap
#define no_llseek NULL
into include/linux/fs.h for the merge window, then remove it (and all
stray no_llseek initializers) at -rc1.  Linus, would you be OK with
that approach?

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id CD40CC43334
	for <linux-next@archiver.kernel.org>; Fri, 15 Jul 2022 14:43:03 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S234847AbiGOOnC (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Fri, 15 Jul 2022 10:43:02 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33040 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S233247AbiGOOnB (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Fri, 15 Jul 2022 10:43:01 -0400
Received: from mail-il1-x12d.google.com (mail-il1-x12d.google.com [IPv6:2607:f8b0:4864:20::12d])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2AF4774DCC
        for <linux-next@vger.kernel.org>; Fri, 15 Jul 2022 07:43:01 -0700 (PDT)
Received: by mail-il1-x12d.google.com with SMTP id o2so1189860ill.6
        for <linux-next@vger.kernel.org>; Fri, 15 Jul 2022 07:43:01 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20210112.gappssmtp.com; s=20210112;
        h=message-id:date:mime-version:user-agent:subject:content-language:to
         :cc:references:from:in-reply-to:content-transfer-encoding;
        bh=xk8a+l++rWgkTq50yVGHgr4FTNm3uMWmqHNOlMKJ2yY=;
        b=irIFRF1PGBXVjKT0EyhMeBzL5zNDmcf66s6OkDheHVZQB2sAlNPjyphmxT8EzehMGm
         emD+ckTpKwGESRVErzWPSOFgBul4XR9AcSwF+cxbJCRCZZcy05kvoWkmdQAjfEQlZTiu
         QL+YvQyGVecx9suRhd8rf9xH6wrVLuodCn5dAgXiEWgjgEMY5nWvBirv6OZWKequkcdf
         XcOXwYaLnd47/88sJ9YyT4n9o7+XVrzfxKg5lK6DYIvNMDn5xZ/Y810rzxsdwWx+KsHf
         6OXeleobam8ufdSfdGY7O6lAu/N4/xECWlaLPtY+V+KwR9TgnGXiVwVfgb1anPBe5Zhz
         hUIQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20210112;
        h=x-gm-message-state:message-id:date:mime-version:user-agent:subject
         :content-language:to:cc:references:from:in-reply-to
         :content-transfer-encoding;
        bh=xk8a+l++rWgkTq50yVGHgr4FTNm3uMWmqHNOlMKJ2yY=;
        b=53RiZa5IKzTKgXwAlVI0+kqZACcXumVn+IkePG/Q+By97hG94UtcL9tQWYAd25SUkN
         XOQTfNncs3Tr7FV4mYXRaB+zaAmwARBsA01CuXShlDu52nEPzhNOZn3eifBquYsn5B9U
         Bnj77TuUGC8KX9VsCCNdXQAYmU1ixcMYODaxoK8JyUwXAeIns9gXxku4KfbGDPZdSX20
         gOLhpOsIvAFlGyLU4mKX2XC4jIcokyHTTb7pCeAZoQgpG7uBqGTgeO7vYbZp62Kos0Px
         ASeEYnuzP8ZR9f7fGFPR06IvmSpO2sULbMKTR8Id/uEz/PCIz6aP/RaCPaGQwUevqK8f
         sgSA==
X-Gm-Message-State: AJIora96GEsWMA27eo82+9HtNY07IPMVL5DC0SOonaJ63lf87dgY+1Z+
        cuojBdlA2tPw09sHkWjCucNpWM3iDdG+Dg==
X-Google-Smtp-Source: AGRyM1vw6arlVWDR2sztJ/KCl9xkKybS345EYMCO/XurHiZLInhyDg7mRHdbJ9zCdNKHER8AmvDSkw==
X-Received: by 2002:a05:6e02:4d1:b0:2dc:f85:2fed with SMTP id f17-20020a056e0204d100b002dc0f852fedmr7497276ils.94.1657896180444;
        Fri, 15 Jul 2022 07:43:00 -0700 (PDT)
Received: from [192.168.1.172] ([207.135.234.126])
        by smtp.gmail.com with ESMTPSA id w4-20020a92db44000000b002db4e72ead5sm1760167ilq.50.2022.07.15.07.42.59
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Fri, 15 Jul 2022 07:42:59 -0700 (PDT)
Message-ID: <5614fbc0-509a-6341-bef2-8857f4fe610e@kernel.dk>
Date:   Fri, 15 Jul 2022 08:42:57 -0600
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux aarch64; rv:91.0) Gecko/20100101
 Thunderbird/91.10.0
Subject: Re: linux-next: build failure after merge of the block tree
Content-Language: en-US
To:     Al Viro <viro@zeniv.linux.org.uk>,
        Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     "Jason A. Donenfeld" <Jason@zx2c4.com>,
        Ming Lei <ming.lei@redhat.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linus Torvalds <torvalds@linux-foundation.org>
References: <20220715140259.205ef267@canb.auug.org.au>
 <YtDoqhuAt6Sv6qgV@ZenIV>
From:   Jens Axboe <axboe@kernel.dk>
In-Reply-To: <YtDoqhuAt6Sv6qgV@ZenIV>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 7/14/22 10:10 PM, Al Viro wrote:
> On Fri, Jul 15, 2022 at 02:02:59PM +1000, Stephen Rothwell wrote:
>> Hi all,
>>
>> After merging the block tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/block/ublk_drv.c:951:19: error: 'no_llseek' undeclared here (not in a function); did you mean 'noop_llseek'?
>>   951 |         .llseek = no_llseek,
>>       |                   ^~~~~~~~~
>>       |                   noop_llseek
>>
>> Caused by commit
>>
>>   71f28f3136af ("ublk_drv: add io_uring based userspace block driver")
>>
>> interacting with commit
>>
>>   8804bffa93a1 ("fs: remove no_llseek")
>>
>> from the vfs tree.
> 
> I suspect that it would be a good idea to slap
> #define no_llseek NULL
> into include/linux/fs.h for the merge window, then remove it (and all
> stray no_llseek initializers) at -rc1.  Linus, would you be OK with
> that approach?

Not Linus, but I think that's a good idea as it'll reduce the pain for
any new users added in other trees.

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 959F8C43334
	for <linux-next@archiver.kernel.org>; Fri, 15 Jul 2022 17:33:54 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S230412AbiGORdx (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Fri, 15 Jul 2022 13:33:53 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40148 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S230244AbiGORdv (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Fri, 15 Jul 2022 13:33:51 -0400
Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC5AF13E1F
        for <linux-next@vger.kernel.org>; Fri, 15 Jul 2022 10:33:49 -0700 (PDT)
Received: by mail-ej1-x62d.google.com with SMTP id os14so10192145ejb.4
        for <linux-next@vger.kernel.org>; Fri, 15 Jul 2022 10:33:49 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=linux-foundation.org; s=google;
        h=mime-version:references:in-reply-to:from:date:message-id:subject:to
         :cc;
        bh=WfVY8tQkbJO6PFTeEdb3SLzVsb+vAJ4gu2cqddeKcwU=;
        b=WtFzaSIsuNUvPl7xOKFYOFPvsJouVmlPm4dcWspJ2KV0T8TEcZOUPwMlZTZin7eUzc
         M03B4Ba2wgC01WT86nG/RqZdmXFKRLM5KSi3IJZRPPITaaCu5osjkPul2SiUrgSPu0Ni
         WG2+1rfWIjUPk4hHmR5kQyiVAh5WGUhBY+kfY=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20210112;
        h=x-gm-message-state:mime-version:references:in-reply-to:from:date
         :message-id:subject:to:cc;
        bh=WfVY8tQkbJO6PFTeEdb3SLzVsb+vAJ4gu2cqddeKcwU=;
        b=4NGEMTVYXWHan68a1BpoB2hVLCEEJlCId318Ffd3fB5SzypIAoT2Jx/pJRL98fnwGQ
         cMKFb+9SyO+/3fPkYTaufETJcaardzsnAH695RphasMTCJiFhn4qMy8PbFJRfXKEoulD
         5PAlYaLqS9qLUPQyXl75jhzMYrNOKyNp7u2cb/5z0n6nu6pvuF8cLC9JD4ANrfm/L4q6
         5cKIdCZjfHxi2AzZil7fP+6DBk6zSEawT9WPBRTGAfmJYL+FHZyAMlUnHBopzt56D8Dw
         SCY/0zOOCCX6vJZ8w/dSmfX9v2CIlZR5syirZuRyajft/W5s6NJ1V5XSoVpHsT0tcYVj
         NWRQ==
X-Gm-Message-State: AJIora8Kxz44t/VxlLXsOhGrCbIHHk9rILQqClU3HNsVH8H4y/C5dJZ9
        WIFh4KWqAe2/ez5+tVVwiH/GiKw0YlE52JUc+n4=
X-Google-Smtp-Source: AGRyM1u5ioS9941IfH/soIeQbengwMxCHlJrS3rHMXVfs0Etve2XXgQHFbZLo8Gq3Co4uP0DjTOrRA==
X-Received: by 2002:a17:906:4fcb:b0:716:ddcd:d124 with SMTP id i11-20020a1709064fcb00b00716ddcdd124mr14799279ejw.488.1657906428170;
        Fri, 15 Jul 2022 10:33:48 -0700 (PDT)
Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com. [209.85.221.51])
        by smtp.gmail.com with ESMTPSA id l9-20020a1709060cc900b007263713cfe9sm2273802ejh.169.2022.07.15.10.33.47
        for <linux-next@vger.kernel.org>
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Fri, 15 Jul 2022 10:33:47 -0700 (PDT)
Received: by mail-wr1-f51.google.com with SMTP id bu1so7632151wrb.9
        for <linux-next@vger.kernel.org>; Fri, 15 Jul 2022 10:33:47 -0700 (PDT)
X-Received: by 2002:a5d:69c2:0:b0:21d:807c:a892 with SMTP id
 s2-20020a5d69c2000000b0021d807ca892mr13544923wrw.274.1657906426849; Fri, 15
 Jul 2022 10:33:46 -0700 (PDT)
MIME-Version: 1.0
References: <20220715140259.205ef267@canb.auug.org.au> <YtDoqhuAt6Sv6qgV@ZenIV>
 <5614fbc0-509a-6341-bef2-8857f4fe610e@kernel.dk>
In-Reply-To: <5614fbc0-509a-6341-bef2-8857f4fe610e@kernel.dk>
From:   Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri, 15 Jul 2022 10:33:30 -0700
X-Gmail-Original-Message-ID: <CAHk-=wjzpt7T+iuOd9pDR4Mkb+2SCoxi3H2uL+DTGTX+Ur5cGw@mail.gmail.com>
Message-ID: <CAHk-=wjzpt7T+iuOd9pDR4Mkb+2SCoxi3H2uL+DTGTX+Ur5cGw@mail.gmail.com>
Subject: Re: linux-next: build failure after merge of the block tree
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Al Viro <viro@zeniv.linux.org.uk>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        "Jason A. Donenfeld" <Jason@zx2c4.com>,
        Ming Lei <ming.lei@redhat.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On Fri, Jul 15, 2022 at 7:43 AM Jens Axboe <axboe@kernel.dk> wrote:
>
> On 7/14/22 10:10 PM, Al Viro wrote:
> >
> > I suspect that it would be a good idea to slap
> > #define no_llseek NULL
> > into include/linux/fs.h for the merge window, then remove it (and all
> > stray no_llseek initializers) at -rc1.  Linus, would you be OK with
> > that approach?
>
> Not Linus, but I think that's a good idea as it'll reduce the pain for
> any new users added in other trees.

Yeah, sounds fine to me too.

                   Linus

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 8306FC433EF
	for <linux-next@archiver.kernel.org>; Sun, 17 Jul 2022 03:44:29 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S229688AbiGQDn5 (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Sat, 16 Jul 2022 23:43:57 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57200 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229544AbiGQDnp (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Sat, 16 Jul 2022 23:43:45 -0400
Received: from zeniv.linux.org.uk (zeniv.linux.org.uk [IPv6:2a03:a000:7:0:5054:ff:fe1c:15ff])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B81DA17E1C;
        Sat, 16 Jul 2022 20:43:40 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
        d=linux.org.uk; s=zeniv-20220401; h=Sender:In-Reply-To:Content-Type:
        MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To:
        Content-Transfer-Encoding:Content-ID:Content-Description;
        bh=2mx2X58K8c+j/QnAaGla9w1PWtaRUet0IYdVU2W0SsA=; b=cnPcVeeo3JZZP+OOibGpfeN0l2
        yQlc8I3TEbfmBDOoWkP3fBJamMjnutIa2Y6WV8/ihqZGoTfWHLQc8TvhI/wLJ1EPAjehPuGm6Pg0v
        LAMgb5jyRKAXZYjUO0eTZ5GzbwJoitapwX45javoH1mlFLXb0ck3uteN25AjSakxHzZisLAThwecg
        dZ3g9owyXBMTnSixejtjFq24pr3ybX48UdRz29l+MHS88hniSxajoKdmTG9j0v73zYjqPnK8on5kF
        q9LCnsG1A8/xxiYtOn0EdVLSvqQ5igq2qrf3w2dfAMRCcO6N7q+g8U3xULonwZBMQK+PiFIGxcCYK
        e/QPvfDQ==;
Received: from viro by zeniv.linux.org.uk with local (Exim 4.95 #2 (Red Hat Linux))
        id 1oCvBn-00Cp7j-G4;
        Sun, 17 Jul 2022 03:43:27 +0000
Date:   Sun, 17 Jul 2022 04:43:27 +0100
From:   Al Viro <viro@zeniv.linux.org.uk>
To:     Linus Torvalds <torvalds@linux-foundation.org>
Cc:     Jens Axboe <axboe@kernel.dk>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        "Jason A. Donenfeld" <Jason@zx2c4.com>,
        Ming Lei <ming.lei@redhat.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the block tree
Message-ID: <YtOFXz/lCthJh5Eh@ZenIV>
References: <20220715140259.205ef267@canb.auug.org.au>
 <YtDoqhuAt6Sv6qgV@ZenIV>
 <5614fbc0-509a-6341-bef2-8857f4fe610e@kernel.dk>
 <CAHk-=wjzpt7T+iuOd9pDR4Mkb+2SCoxi3H2uL+DTGTX+Ur5cGw@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAHk-=wjzpt7T+iuOd9pDR4Mkb+2SCoxi3H2uL+DTGTX+Ur5cGw@mail.gmail.com>
Sender: Al Viro <viro@ftp.linux.org.uk>
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On Fri, Jul 15, 2022 at 10:33:30AM -0700, Linus Torvalds wrote:
> On Fri, Jul 15, 2022 at 7:43 AM Jens Axboe <axboe@kernel.dk> wrote:
> >
> > On 7/14/22 10:10 PM, Al Viro wrote:
> > >
> > > I suspect that it would be a good idea to slap
> > > #define no_llseek NULL
> > > into include/linux/fs.h for the merge window, then remove it (and all
> > > stray no_llseek initializers) at -rc1.  Linus, would you be OK with
> > > that approach?
> >
> > Not Linus, but I think that's a good idea as it'll reduce the pain for
> > any new users added in other trees.
> 
> Yeah, sounds fine to me too.

OK, branch rearranged (#work.lseek-2 now), along with #for-next.

After that we have no_llseek defined to NULL and all its instances
consisting of
1) that define
2) a bunch of initializers of .llseek
3) one mentioning in Documentation/filesystems/porting.rst

So if you could run

git grep -l -w no_llseek | grep -v porting.rst | while read i; do
	sed -i '/\<no_llseek\>/d' $i
done

just before -rc1, it would deal with the problem with minimal
conflicts during the merge window.

FWIW, right now diffstat of that branch is
 Documentation/filesystems/porting.rst |  8 ++++++++
 drivers/dma-buf/dma-buf.c             |  1 -
 drivers/gpu/drm/drm_file.c            |  3 +--
 drivers/vfio/vfio.c                   |  2 +-
 fs/coredump.c                         |  4 ++--
 fs/file_table.c                       |  2 ++
 fs/open.c                             |  2 ++
 fs/overlayfs/copy_up.c                |  3 +--
 fs/read_write.c                       | 17 +++--------------
 fs/splice.c                           | 10 ++++------
 include/linux/fs.h                    |  2 +-
 kernel/bpf/bpf_iter.c                 |  3 +--
 12 files changed, 26 insertions(+), 31 deletions(-)

without any changes in file_operations initializers.  With 270-odd
more lines removed by the loop above...

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 924B8C43334
	for <linux-next@archiver.kernel.org>; Thu, 21 Jul 2022 03:11:42 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S229874AbiGUDLk (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Wed, 20 Jul 2022 23:11:40 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39902 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229649AbiGUDLj (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Wed, 20 Jul 2022 23:11:39 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6F1C520BDD;
        Wed, 20 Jul 2022 20:11:37 -0700 (PDT)
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4LpHfH32D2z4x1f;
        Thu, 21 Jul 2022 13:11:34 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1658373096;
        bh=WrX66Z+kbLW7AE5ClgZGgpn3AoDiYXk1lHbgmg5iv5E=;
        h=Date:From:To:Cc:Subject:From;
        b=R2XLmPyhlQ7Jw6zM5cN+G+NNPMd9pwMn6VTUDeDDrNSiCD0dudjEuJ7OcNj3nzm/E
         8LatozH2kP8eKYDQWAyeFve2YoxpLH09pfx2apIyEyPKn6Vd62j4oxfMQpN3pxxyKc
         vf0/6Aj4+PV+FXWKj77cVVrN6rQDNfe9kshcVk1+p6utR5B03/saRmC3erLwBZg/+S
         bORLVt4wDai165uGxdhnXUDUIiw3Iz0hycGxdAUCVgDyK8aBSX+pCEqaF9nLbxmQCs
         NL1okfgYHZ1FSi2cCRcbJeGHU3iHZGYEn9UA/GeovIuTKCOPfRq7DHCMgNFCwMpLxt
         UtzJKvc972TBg==
Date:   Thu, 21 Jul 2022 13:11:32 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Christoph Hellwig <hch@lst.de>, Song Liu <song@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20220721131132.070be166@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/i_TL0w7IMtiRDWOEXsNOfGU";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/i_TL0w7IMtiRDWOEXsNOfGU
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:

drivers/md/md.c:717:22: error: 'mddev_find' defined but not used [-Werror=
=3Dunused-function]
  717 | static struct mddev *mddev_find(dev_t unit)
      |                      ^~~~~~~~~~
cc1: all warnings being treated as errors

Caused by commit

  4500d5c17910 ("md: simplify md_open")

I have applied the following patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 21 Jul 2022 13:03:16 +1000
Subject: [PATCH] fix for "md: simplify md_open"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/md/md.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/md/md.c b/drivers/md/md.c
index fa500ae9863b..673a39042208 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -714,6 +714,7 @@ static dev_t mddev_alloc_unit(void)
 	return dev;
 }
=20
+#ifndef MODULE
 static struct mddev *mddev_find(dev_t unit)
 {
 	struct mddev *mddev;
@@ -729,6 +730,7 @@ static struct mddev *mddev_find(dev_t unit)
=20
 	return mddev;
 }
+#endif
=20
 static struct mddev *mddev_alloc(dev_t unit)
 {
--=20
2.35.1
--=20
Cheers,
Stephen Rothwell

--Sig_/i_TL0w7IMtiRDWOEXsNOfGU
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmLYw+QACgkQAVBC80lX
0GxWTQf/caRcsFoIuiMqcmcxvJ/isHvU7KhPxz7FAJV/dQS/VhS3ShYoOeGUfYB+
57bJSa1pM7YvOee6JCjxWNNp67tRdDHq5ovePMiieX9e7fegC6x5GIbHhqQ861yL
8dAkvjVfDkrhV/zTAypQT5DEHarhirkxTdTkjsaumXZQR5P9pOX61PgpKCEopdyg
0x4KDEuuMx4stCTQ70ox8d/YlgN7BK9tB5YwEO93FuH5onncBtqWCKxoLFzSo1+p
A/5oeZEauUk/+akUB3FdLAIbY14kp19YNJEmPITpTRaU4/jkVtFknjUWjUyLVceZ
8H4gIU/rytxBe+OhUp46tPoL308eHw==
=+ZKm
-----END PGP SIGNATURE-----

--Sig_/i_TL0w7IMtiRDWOEXsNOfGU--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id B910FC433EF
	for <linux-next@archiver.kernel.org>; Thu, 21 Jul 2022 04:24:06 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S229831AbiGUEYF (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Thu, 21 Jul 2022 00:24:05 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55436 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229569AbiGUEYE (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Thu, 21 Jul 2022 00:24:04 -0400
Received: from verein.lst.de (verein.lst.de [213.95.11.211])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3425E5142B;
        Wed, 20 Jul 2022 21:24:03 -0700 (PDT)
Received: by verein.lst.de (Postfix, from userid 2407)
        id B1ACE68AFE; Thu, 21 Jul 2022 06:23:59 +0200 (CEST)
Date:   Thu, 21 Jul 2022 06:23:59 +0200
From:   Christoph Hellwig <hch@lst.de>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Jens Axboe <axboe@kernel.dk>, Christoph Hellwig <hch@lst.de>,
        Song Liu <song@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the block tree
Message-ID: <20220721042359.GA18984@lst.de>
References: <20220721131132.070be166@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20220721131132.070be166@canb.auug.org.au>
User-Agent: Mutt/1.5.17 (2007-11-01)
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On Thu, Jul 21, 2022 at 01:11:32PM +1000, Stephen Rothwell wrote:
> I have applied the following patch for today.

Thanks, the fixup does look god to me:

Reviewed-by: Christoph Hellwig <hch@lst.de>

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 1A6F3C433EF
	for <linux-next@archiver.kernel.org>; Thu, 21 Jul 2022 16:51:40 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S230036AbiGUQvi (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Thu, 21 Jul 2022 12:51:38 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56142 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229750AbiGUQvh (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Thu, 21 Jul 2022 12:51:37 -0400
Received: from mail-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CED8F8BA93
        for <linux-next@vger.kernel.org>; Thu, 21 Jul 2022 09:51:36 -0700 (PDT)
Received: by mail-io1-xd34.google.com with SMTP id h145so1777156iof.9
        for <linux-next@vger.kernel.org>; Thu, 21 Jul 2022 09:51:36 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20210112.gappssmtp.com; s=20210112;
        h=message-id:date:mime-version:user-agent:subject:content-language:to
         :cc:references:from:in-reply-to:content-transfer-encoding;
        bh=kBrKJZxEJZScbYIdNWQ41kmJ2go5hgyJDa02gwDJF0E=;
        b=JGqQrlpABav9cLjPPE1rHTgN59BibGQ4hJ5TJSJYkj58k5n0aJ1eb75lj8ke5Y9Te+
         BQ9FFJTBMeZYpEqc3h+SOjJ+zI5WNdSaJneaImxRcXc8PRLzRUeiU5whjQ0F0DB62ugN
         ttV1bm2j3r+aGrJGyqlrgW6WO9qhu1Mep8Fg3DEqT1s66lMJ1RbmCBEp3Yn0CD0RzLHd
         TA3hf7GxdEgMUi/v5f3Wru1phU6LvHeC+kPdmBAIfjxuTtKGEgW00rtOi+UmdJfsehkF
         k7u9+SBqGfEFcS0av+EV2SRqRKmOnhlBDg/N0gVo5L5yof5t6KDKxttxSGpeDNYa+dPz
         OJxA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20210112;
        h=x-gm-message-state:message-id:date:mime-version:user-agent:subject
         :content-language:to:cc:references:from:in-reply-to
         :content-transfer-encoding;
        bh=kBrKJZxEJZScbYIdNWQ41kmJ2go5hgyJDa02gwDJF0E=;
        b=Ceu+13WCxHo9hYntPSQYl6KWrineHDcKOswVtOrM9QOR04DetWgP6wyuPPWLTcHujS
         JImuPFWLQMsUEDWpXgA4cygPUfuqOtdfAEmtgkaGerJKkaHiBvQ0/sztKNZz+C3FRiLm
         haRyHE+ZhMAQOgg0KwQE5fxMbDIaSpWVd/ToVN0mWZE8+iX7wl7fC/4Hb3mJV125IBwA
         D6/Dkxz8C8sNSKmybTsLdHG/uxYcPr+AS5wvY8Bv2UYSU1lIRJ9HKFCmGssxxuva2r9U
         pZ2InDCCslUIHOMiQ44/LY+V8cC91qTa3+pNOrTUZSwl7EzMSihhDMnWuPEg2zBcgPYH
         cJow==
X-Gm-Message-State: AJIora+XMidgrwk6uXSBaQ0JWKdooMhvYwICPPBNWUqFG9F5sDSzXXMK
        3+qtk45Ndp+6okhsvhDJ+Z0HSg==
X-Google-Smtp-Source: AGRyM1uRD8hgPo4nuRYApW45Md6Bu64OmRjSJ3pILNJHFypbmR46S+hC6Vj5iy3RRAs4vImkzF7qPg==
X-Received: by 2002:a05:6638:260a:b0:341:4bda:9c2c with SMTP id m10-20020a056638260a00b003414bda9c2cmr16638569jat.160.1658422296180;
        Thu, 21 Jul 2022 09:51:36 -0700 (PDT)
Received: from [192.168.1.172] ([207.135.234.126])
        by smtp.gmail.com with ESMTPSA id n4-20020a056602340400b00674f9fb1531sm1019863ioz.30.2022.07.21.09.51.35
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Thu, 21 Jul 2022 09:51:35 -0700 (PDT)
Message-ID: <7ceaa46e-ae1c-5bf6-bb60-f1a67ddd1fde@kernel.dk>
Date:   Thu, 21 Jul 2022 10:51:34 -0600
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux aarch64; rv:91.0) Gecko/20100101
 Thunderbird/91.10.0
Subject: Re: linux-next: build failure after merge of the block tree
Content-Language: en-US
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Christoph Hellwig <hch@lst.de>, Song Liu <song@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20220721131132.070be166@canb.auug.org.au>
From:   Jens Axboe <axboe@kernel.dk>
In-Reply-To: <20220721131132.070be166@canb.auug.org.au>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 7/20/22 9:11 PM, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/md/md.c:717:22: error: 'mddev_find' defined but not used [-Werror=unused-function]
>   717 | static struct mddev *mddev_find(dev_t unit)
>       |                      ^~~~~~~~~~
> cc1: all warnings being treated as errors
> 
> Caused by commit
> 
>   4500d5c17910 ("md: simplify md_open")
> 
> I have applied the following patch for today.

Thanks, I turned that commit message into a real patch and added it.

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id CDE79C19F21
	for <linux-next@archiver.kernel.org>; Wed, 27 Jul 2022 04:09:24 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S240241AbiG0EJW (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Wed, 27 Jul 2022 00:09:22 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49938 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S240323AbiG0EJQ (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Wed, 27 Jul 2022 00:09:16 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ECAD12E9CA;
        Tue, 26 Jul 2022 21:09:13 -0700 (PDT)
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4Lt0f01pRwz4x1b;
        Wed, 27 Jul 2022 14:09:11 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1658894952;
        bh=HdMybXKiD136ksZcJduRwx5J+ELUOOdg7AtPYNgYzMg=;
        h=Date:From:To:Cc:Subject:From;
        b=uDVutVSlXJ/OIo2VLBBSDWX/Ar3Vtu5A+EvRdCSChQyp4kHlsohqpAvSkVzzimAlg
         EyZ8ZsMrXZAenQd0iZygTlK8MWnax/4v/iVc1S4Z0WpBo+07wyFLflDwHSMmaoykFN
         prjpYBdh/j4XNKp7Dgx8arkWXoQLzrAWpr4YG6jtmwxBFUD186gl4NznCyv/gN59cv
         W9ihorRHgwVOhmhad8hDkoGzCmNKCKYEttQUsuKvZqLXrCM8sTkqwmX/ySj91HyoBe
         TaZZzy0f8U36BhShUW/hql5Q0DZIPKKu7kOjvzasxpbcwNUhPorL5+J51yPJJDE6ro
         HQMI37ys+qtYg==
Date:   Wed, 27 Jul 2022 14:09:10 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Pavel Begunkov <asml.silence@gmail.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20220727140910.172a91c1@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/p_29Og4caOb4/bwF=FeFjcE";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/p_29Og4caOb4/bwF=FeFjcE
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

In file included from include/linux/kernel.h:20,
                 from io_uring/notif.c:1:
io_uring/notif.c: In function 'io_alloc_notif':
io_uring/notif.c:52:23: error: implicit declaration of function 'io_alloc_r=
eq_refill'; did you mean 'io_rsrc_refs_refill'? [-Werror=3Dimplicit-functio=
n-declaration]
   52 |         if (unlikely(!io_alloc_req_refill(ctx)))
      |                       ^~~~~~~~~~~~~~~~~~~
include/linux/compiler.h:78:45: note: in definition of macro 'unlikely'
   78 | # define unlikely(x)    __builtin_expect(!!(x), 0)
      |                                             ^
io_uring/notif.c:54:17: error: implicit declaration of function 'io_alloc_r=
eq'; did you mean 'xa_alloc_irq'? [-Werror=3Dimplicit-function-declaration]
   54 |         notif =3D io_alloc_req(ctx);
      |                 ^~~~~~~~~~~~
      |                 xa_alloc_irq
io_uring/notif.c:54:15: warning: assignment to 'struct io_kiocb *' from 'in=
t' makes pointer from integer without a cast [-Wint-conversion]
   54 |         notif =3D io_alloc_req(ctx);
      |               ^

Caused by commit

  fbe6f6bc3210 ("io_uring/zc: notification completion optimisation")

I have used the block tree from next-20220726 for today.

--=20
Cheers,
Stephen Rothwell

--Sig_/p_29Og4caOb4/bwF=FeFjcE
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmLgumYACgkQAVBC80lX
0GyNWgf+OI+2JKDjxr2l5G0pCbqFpaW6pdCad4Hjnt4NkTRa5XyjUPkJEHCqMWHF
UGI5Mn5dwHFr6JMra95dXduwxRfbrU1ARAl92OFbVxjc/AbcviXtILSVeO7AQWx+
jHMrHWvGoytG2bNh/C1d9G6jcC8urQBb1YdxXcAPd8ciIizsp/gUn+693FTOW/PJ
Kvj0AKqbvMATlbNsA7RJxBm5ZMUeKN34rZzVjBeagfVzKsBReEjF/9lvSm6Ig/qc
H5HjKE0PgKWHKQia2DyUs9G38h5aDtx5a+mYVU4PfaPt020pXTONqFVnmuE+cMTS
gDWeE82//Oq1MwQnzNmhckO6YVpeMQ==
=l2Wu
-----END PGP SIGNATURE-----

--Sig_/p_29Og4caOb4/bwF=FeFjcE--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 55115C28D13
	for <linux-next@archiver.kernel.org>; Mon, 22 Aug 2022 04:46:23 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S230526AbiHVEqV (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Mon, 22 Aug 2022 00:46:21 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33086 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229562AbiHVEqV (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Mon, 22 Aug 2022 00:46:21 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 76DB11E3C0;
        Sun, 21 Aug 2022 21:46:19 -0700 (PDT)
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4MB0Dn1HLPz4wgn;
        Mon, 22 Aug 2022 14:46:16 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1661143577;
        bh=PRPjNL9OqgsyzZoS7vFE/y8nJQbhGK73LvTpUznB0Ic=;
        h=Date:From:To:Cc:Subject:From;
        b=ODXXdh0O1XZJXeyHhIQqyWglRStXAltYiSwRNyd2Bai/J15jbTmGejgjdNM//goeA
         ssyvgHTns0b1+CBmr0tDW+T2aPu9epwUQqsAwmhg6mYGLjUkaMVS4lj9N0a2FjERjT
         K4xla1IzXdrENMsBKmM5fTvYj8234EQCrqS3SQMj29PO29Biou7e/NTEmmFZSmFFpk
         FM8+mA7binC6/Wn5ibEn/yiLK/xswuE0P2Sa6aPA2rpDgsYaz9hS6twGJS81TZSgKj
         GRoZploS5Pr8SR/zJgPVULmpdSeI7WhEmHWm4pEmpAWKG1xvsjBIJuyKK40rOcHQf4
         fDgTw/gjbCfJw==
Date:   Mon, 22 Aug 2022 14:46:13 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Bart Van Assche <bvanassche@acm.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20220822144613.6e6ce950@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/qRNm9vP81sVp7B8pV3z+oRm";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/qRNm9vP81sVp7B8pV3z+oRm
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

drivers/scsi/qlogicpti.c: In function 'qpti_map_queues':
drivers/scsi/qlogicpti.c:828:24: error: 'return' with a value, in function =
returning void [-Werror=3Dreturn-type]
  828 |                 return -1;
      |                        ^
drivers/scsi/qlogicpti.c:817:13: note: declared here
  817 | static void qpti_map_queues(struct qlogicpti *qpti)
      |             ^~~~~~~~~~~~~~~
drivers/scsi/qlogicpti.c:839:24: error: 'return' with a value, in function =
returning void [-Werror=3Dreturn-type]
  839 |                 return -1;
      |                        ^
drivers/scsi/qlogicpti.c:817:13: note: declared here
  817 | static void qpti_map_queues(struct qlogicpti *qpti)
      |             ^~~~~~~~~~~~~~~
drivers/scsi/qlogicpti.c: In function 'qpti_sbus_probe':
drivers/scsi/qlogicpti.c:1394:1: warning: label 'fail_free_irq' defined but=
 not used [-Wunused-label]
 1394 | fail_free_irq:
      | ^~~~~~~~~~~~~
cc1: some warnings being treated as errors

Caused by commit

  f19f2c966b2f ("block: Change the return type of blk_mq_map_queues() into =
void")

I have applied the following fix up patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 22 Aug 2022 14:40:02 +1000
Subject: [PATCH] fix up for "block: Change the return type of blk_mq_map_qu=
eues() into void"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/scsi/qlogicpti.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c
index a5aa716e9086..5bddfe0233b2 100644
--- a/drivers/scsi/qlogicpti.c
+++ b/drivers/scsi/qlogicpti.c
@@ -825,7 +825,7 @@ static void qpti_map_queues(struct qlogicpti *qpti)
 	if (qpti->res_cpu =3D=3D NULL ||
 	    qpti->res_dvma =3D=3D 0) {
 		printk("QPTI: Cannot map response queue.\n");
-		return -1;
+		return;
 	}
=20
 	qpti->req_cpu =3D dma_alloc_coherent(&op->dev,
@@ -836,7 +836,7 @@ static void qpti_map_queues(struct qlogicpti *qpti)
 		dma_free_coherent(&op->dev, QSIZE(RES_QUEUE_LEN),
 				  qpti->res_cpu, qpti->res_dvma);
 		printk("QPTI: Cannot map request queue.\n");
-		return -1;
+		return;
 	}
 	memset(qpti->res_cpu, 0, QSIZE(RES_QUEUE_LEN));
 	memset(qpti->req_cpu, 0, QSIZE(QLOGICPTI_REQ_QUEUE_LEN));
@@ -1391,7 +1391,6 @@ static int qpti_sbus_probe(struct platform_device *op)
 			  qpti->req_cpu, qpti->req_dvma);
 #undef QSIZE
=20
-fail_free_irq:
 	free_irq(qpti->irq, qpti);
=20
 fail_unmap_regs:
--=20
2.35.1

--=20
Cheers,
Stephen Rothwell

--Sig_/qRNm9vP81sVp7B8pV3z+oRm
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmMDChUACgkQAVBC80lX
0Gxxwgf/bZgcmGzBLWoulYmJvl6HdNI8D1gF6mze7dOxQBsCuIPY7wkb2WGCtnYO
9jqpD82TQ6we0Q0W7QtjNhmk0I+r6kNPKnkQNjgpKyw6gWSvNDK0hQtwxjA8Hy/C
sdOEhDuo04GzlnCs2eNr2UZwXMley7vG8fDbyXKZvL55jx9J9kUYGzgAOrE+vSZD
8kU26wmFpvP/8+T7RPdkaRsOTBfvufsUVudKDZwqjgLdeZCC37a4BPj9kjmCYj5u
gMQ83E2Ij91PeE5suEmo9bC6XB/Z5j3On9DlWD14JundbHB5sWwFAvOHd+VE1jAC
o11TXt83N++yZj2urezErYluDjDFlw==
=7my4
-----END PGP SIGNATURE-----

--Sig_/qRNm9vP81sVp7B8pV3z+oRm--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 1B45AC28D13
	for <linux-next@archiver.kernel.org>; Mon, 22 Aug 2022 13:56:08 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S235453AbiHVN4G (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Mon, 22 Aug 2022 09:56:06 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41866 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S235452AbiHVN4E (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Mon, 22 Aug 2022 09:56:04 -0400
Received: from mail-io1-xd36.google.com (mail-io1-xd36.google.com [IPv6:2607:f8b0:4864:20::d36])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DFCDF39B8B
        for <linux-next@vger.kernel.org>; Mon, 22 Aug 2022 06:56:01 -0700 (PDT)
Received: by mail-io1-xd36.google.com with SMTP id y187so8347138iof.0
        for <linux-next@vger.kernel.org>; Mon, 22 Aug 2022 06:56:01 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20210112.gappssmtp.com; s=20210112;
        h=content-transfer-encoding:in-reply-to:from:references:cc:to
         :content-language:subject:user-agent:mime-version:date:message-id
         :from:to:cc;
        bh=jYizavyTgywCgwQKlhKWtAmK5JRzYKWfldfefWnHvqQ=;
        b=BcHg7Ilvx8dMtVT2ok7ZjdCsPkYPQLubtEg/E5wKsN83qxas71SnESKJUFb8IkOPTP
         YKJhnN5obj9pJBVbQcPusRL5SutptSq+YU0Fe9n7GFZiCJlI7s3pdfcvqiVQrz0/rUEf
         xQcaSMGs7EEY1E9AR7cesdhyhcORUgWaGxfWL+IUZA1euaP/gYRuMTYftJ+qryGGZotD
         LY7/NCN4SykzINS/p/IUS+Up6LEI84krRDkd5u021Pkano6cj0jPr/fXFbofqX/U/qZh
         sBPhcXGesD3cXUg7XkAWP5c4WpT7U0U6D3z+gUfH+gpnAPuVV6qCSqybDKnISo2ybN9c
         WbMw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20210112;
        h=content-transfer-encoding:in-reply-to:from:references:cc:to
         :content-language:subject:user-agent:mime-version:date:message-id
         :x-gm-message-state:from:to:cc;
        bh=jYizavyTgywCgwQKlhKWtAmK5JRzYKWfldfefWnHvqQ=;
        b=CCjfX8a+19TK//oj9q2uzjWGkhLVIZwigx6g1ju+ojfPjOMbcWfINCR6MQo1+qDHyn
         Fm3mtEWewCL7/FInOpTG0AF9g8sFrGUQ9WOpNGH2prpy3ttquucL5Err4Ry+XBfPHnlN
         Ps0716GkR5UdGWmyFKZ5cpLFga7kMIhFwJcuo/aKDYigPgTZ/hhIHyqmPW72UtL0Hc1W
         Qduknh/XiXhkmXDg4kmnlaxutK5h7a/cMVn03ag9+taz2qVeuq+VH90jCMX4hsc+BJ3X
         IG0ftz2SStyUYQ6UR3QZPmzClOoW5MS9/UGk6N4C8N5nGk210uBzwz231mnFXNSGIGgl
         yxrg==
X-Gm-Message-State: ACgBeo1+J3QllCbcHBaEnJ5pHS9HznwVvPkTn5ald6yJ4Bt5aoBiYW1X
        FlHA5y0NwvZvDlBYeUNniL9ljQ==
X-Google-Smtp-Source: AA6agR6LrKlLmFHdBy8a12lUVu6COjHRqGOr+6F0NKq18fTUyWItG5SkTgwVznKY1hOFhjYuhVr5mA==
X-Received: by 2002:a05:6638:1485:b0:348:b986:6e62 with SMTP id j5-20020a056638148500b00348b9866e62mr7602798jak.236.1661176561281;
        Mon, 22 Aug 2022 06:56:01 -0700 (PDT)
Received: from [192.168.1.94] ([207.135.234.126])
        by smtp.gmail.com with ESMTPSA id l6-20020a0566022dc600b0067bcc80ac23sm5823763iow.1.2022.08.22.06.55.59
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Mon, 22 Aug 2022 06:56:00 -0700 (PDT)
Message-ID: <911717ae-3955-08dd-ad53-a6488ef8127b@kernel.dk>
Date:   Mon, 22 Aug 2022 07:55:58 -0600
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux aarch64; rv:102.0) Gecko/20100101
 Thunderbird/102.1.2
Subject: Re: linux-next: build failure after merge of the block tree
Content-Language: en-US
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Bart Van Assche <bvanassche@acm.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20220822144613.6e6ce950@canb.auug.org.au>
From:   Jens Axboe <axboe@kernel.dk>
In-Reply-To: <20220822144613.6e6ce950@canb.auug.org.au>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 8/21/22 4:46 AM, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the block tree, today's linux-next build (sparc defconfig)
> failed like this:
> 
> drivers/scsi/qlogicpti.c: In function 'qpti_map_queues':
> drivers/scsi/qlogicpti.c:828:24: error: 'return' with a value, in function returning void [-Werror=return-type]
>   828 |                 return -1;
>       |                        ^
> drivers/scsi/qlogicpti.c:817:13: note: declared here
>   817 | static void qpti_map_queues(struct qlogicpti *qpti)
>       |             ^~~~~~~~~~~~~~~
> drivers/scsi/qlogicpti.c:839:24: error: 'return' with a value, in function returning void [-Werror=return-type]
>   839 |                 return -1;
>       |                        ^
> drivers/scsi/qlogicpti.c:817:13: note: declared here
>   817 | static void qpti_map_queues(struct qlogicpti *qpti)
>       |             ^~~~~~~~~~~~~~~
> drivers/scsi/qlogicpti.c: In function 'qpti_sbus_probe':
> drivers/scsi/qlogicpti.c:1394:1: warning: label 'fail_free_irq' defined but not used [-Wunused-label]
>  1394 | fail_free_irq:
>       | ^~~~~~~~~~~~~
> cc1: some warnings being treated as errors
> 
> Caused by commit
> 
>   f19f2c966b2f ("block: Change the return type of blk_mq_map_queues() into void")
> 
> I have applied the following fix up patch for today.

Folded in, thanks Stephen.

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id BC4BFC28D13
	for <linux-next@archiver.kernel.org>; Mon, 22 Aug 2022 15:34:47 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S236672AbiHVPeq (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Mon, 22 Aug 2022 11:34:46 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43774 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S235769AbiHVPek (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Mon, 22 Aug 2022 11:34:40 -0400
Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D8FD193D8;
        Mon, 22 Aug 2022 08:34:39 -0700 (PDT)
Received: by mail-pj1-f45.google.com with SMTP id ds12-20020a17090b08cc00b001fae6343d9fso6050883pjb.0;
        Mon, 22 Aug 2022 08:34:39 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20210112;
        h=content-transfer-encoding:in-reply-to:from:references:cc:to
         :content-language:subject:user-agent:mime-version:date:message-id
         :x-gm-message-state:from:to:cc;
        bh=WvGCX5RcgGpvmpad8RF+/lCyvenp0spczq3lhcwfI2s=;
        b=M9PKeJYdZNlJB3ab/U7dw4DDzyE8Mq3Xr7Uq4cWX7k8fiZ7roAKpN4k3G3WVwmCDF9
         lOM+NZ48rVtojCi3BTNtMGuMxbuxtjM05qlVDtM/C4RsMOhT95jryXFDRD2xbNs7TSeN
         AJ+b3jXCxRj2cY5FliC7ieX4Zi4syRquLwcFMYyTnIxQaMBkZSq7vTVW5iTOemoPVcgI
         Xz5g1hoVllX58DqTEFgmBCx/I1xm7SlijxOJAZOgsCOdt9rtlN1XprBeSWsIwiWvwQEk
         EXS1TBULCo+yTQURr7i5Q12L04K4lxEeyRUVXDjKWXa5JBgxTAxF0dy1x2VonwewgcEA
         E00g==
X-Gm-Message-State: ACgBeo1b/ddd8AW0LmkvCdtkO/OVkEstDWdLTrlcF/CAFpocUYYYM4a9
        6jnteWgu7xuRRYWhmLpxpwF3Z1RZlp4=
X-Google-Smtp-Source: AA6agR5KQgniXwJQr00kJ7wmtahMVVrn5DoX89VVD0EbgC39h1dVuYvydgEh2kyKVcZEpusPWH2Leg==
X-Received: by 2002:a17:90a:4d8d:b0:1fa:9cc6:3408 with SMTP id m13-20020a17090a4d8d00b001fa9cc63408mr22869816pjh.245.1661182478686;
        Mon, 22 Aug 2022 08:34:38 -0700 (PDT)
Received: from [192.168.3.217] ([98.51.102.78])
        by smtp.gmail.com with ESMTPSA id i68-20020a628747000000b0053659f296a0sm4640685pfe.8.2022.08.22.08.34.36
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Mon, 22 Aug 2022 08:34:37 -0700 (PDT)
Message-ID: <3848cd00-b4e8-17f6-32d6-011170f293da@acm.org>
Date:   Mon, 22 Aug 2022 08:34:35 -0700
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.1.2
Subject: Re: linux-next: build failure after merge of the block tree
Content-Language: en-US
To:     Jens Axboe <axboe@kernel.dk>,
        Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20220822144613.6e6ce950@canb.auug.org.au>
 <911717ae-3955-08dd-ad53-a6488ef8127b@kernel.dk>
From:   Bart Van Assche <bvanassche@acm.org>
In-Reply-To: <911717ae-3955-08dd-ad53-a6488ef8127b@kernel.dk>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 8/22/22 06:55, Jens Axboe wrote:
> On 8/21/22 4:46 AM, Stephen Rothwell wrote:
>> Hi all,
>>
>> After merging the block tree, today's linux-next build (sparc defconfig)
>> failed like this:
>>
>> drivers/scsi/qlogicpti.c: In function 'qpti_map_queues':
>> drivers/scsi/qlogicpti.c:828:24: error: 'return' with a value, in function returning void [-Werror=return-type]
>>    828 |                 return -1;
>>        |                        ^
>> drivers/scsi/qlogicpti.c:817:13: note: declared here
>>    817 | static void qpti_map_queues(struct qlogicpti *qpti)
>>        |             ^~~~~~~~~~~~~~~
>> drivers/scsi/qlogicpti.c:839:24: error: 'return' with a value, in function returning void [-Werror=return-type]
>>    839 |                 return -1;
>>        |                        ^
>> drivers/scsi/qlogicpti.c:817:13: note: declared here
>>    817 | static void qpti_map_queues(struct qlogicpti *qpti)
>>        |             ^~~~~~~~~~~~~~~
>> drivers/scsi/qlogicpti.c: In function 'qpti_sbus_probe':
>> drivers/scsi/qlogicpti.c:1394:1: warning: label 'fail_free_irq' defined but not used [-Wunused-label]
>>   1394 | fail_free_irq:
>>        | ^~~~~~~~~~~~~
>> cc1: some warnings being treated as errors
>>
>> Caused by commit
>>
>>    f19f2c966b2f ("block: Change the return type of blk_mq_map_queues() into void")
>>
>> I have applied the following fix up patch for today.
> 
> Folded in, thanks Stephen.

Hi Jens,

Please drop Stephen's patch and fold in this patch instead:

diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c
index a5aa716e9086..57f2f4135a06 100644
--- a/drivers/scsi/qlogicpti.c
+++ b/drivers/scsi/qlogicpti.c
@@ -814,7 +814,7 @@ static void qpti_get_clock(struct qlogicpti *qpti)
  /* The request and response queues must each be aligned
   * on a page boundary.
   */
-static void qpti_map_queues(struct qlogicpti *qpti)
+static int qpti_map_queues(struct qlogicpti *qpti)
  {
  	struct platform_device *op = qpti->op;

@@ -840,6 +840,7 @@ static void qpti_map_queues(struct qlogicpti *qpti)
  	}
  	memset(qpti->res_cpu, 0, QSIZE(RES_QUEUE_LEN));
  	memset(qpti->req_cpu, 0, QSIZE(QLOGICPTI_REQ_QUEUE_LEN));
+	return 0;
  }

  const char *qlogicpti_info(struct Scsi_Host *host)
@@ -1338,7 +1339,8 @@ static int qpti_sbus_probe(struct platform_device *op)
  	/* Clear out scsi_cmnd array. */
  	memset(qpti->cmd_slots, 0, sizeof(qpti->cmd_slots));

-	qpti_map_queues(qpti);
+	if (qpti_map_queues(qpti) < 0)
+		goto fail_free_irq;

  	/* Load the firmware. */
  	if (qlogicpti_load_firmware(qpti))

Thanks,

Bart.

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id B7451C32774
	for <linux-next@archiver.kernel.org>; Mon, 22 Aug 2022 15:40:44 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S229727AbiHVPkm (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Mon, 22 Aug 2022 11:40:42 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49464 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S235691AbiHVPkU (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Mon, 22 Aug 2022 11:40:20 -0400
Received: from mail-il1-x130.google.com (mail-il1-x130.google.com [IPv6:2607:f8b0:4864:20::130])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 50C08DF91
        for <linux-next@vger.kernel.org>; Mon, 22 Aug 2022 08:40:18 -0700 (PDT)
Received: by mail-il1-x130.google.com with SMTP id y19so2867819ilq.9
        for <linux-next@vger.kernel.org>; Mon, 22 Aug 2022 08:40:18 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20210112.gappssmtp.com; s=20210112;
        h=content-transfer-encoding:in-reply-to:from:references:cc:to
         :content-language:subject:user-agent:mime-version:date:message-id
         :from:to:cc;
        bh=hKfslifaQKjtXKGYCYA22ph+Gl/ofGy8Kdp1BhQIblc=;
        b=oXLBmNofJ4AUCzyeXRoPey1wZOTvHudO2aMmTbPKKFOH4nOvYi4j8/9mI900I89x9U
         erpNHRYuCMeRzQmugr19d+yFdVj/gg+BKrANNBsaVWsQciOtcCYe4NoVa6qeyNVMA3rs
         SIKjQTXnVBOF03WNmj55RuMWS3YlZIwquIa6Nrzy9fE53aEhgGqQ/on6EcvXkQtRIjAM
         tLxthyQCWxltl2V9TDDAF5vq2XQzQ7vYnVGZ4KB0bZuTqS+3MBbD1WJUmNaQKpjYOGvm
         ABsvEL9iL3Y8fcnHSr22LroIO2WkE7Zg9qC2awaR/4YpSpLYm4OjPFwjwNe2+ywSy12R
         NtfQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20210112;
        h=content-transfer-encoding:in-reply-to:from:references:cc:to
         :content-language:subject:user-agent:mime-version:date:message-id
         :x-gm-message-state:from:to:cc;
        bh=hKfslifaQKjtXKGYCYA22ph+Gl/ofGy8Kdp1BhQIblc=;
        b=fxLQW4FOeM+esQfYcrnAFzjHc8ViIVEAibdyFhJH9922LFjujEBjFewgz3fBs4lxET
         nq2xUXWuuQKwMzcM2OgOlJSo/b1+isHg4OJgrPbGE5KMd04np0PMLuKuuHJyPZjEwJO5
         8DA7JuU8r/a1Ib0fL43I7ac5dQxay6bTxBOc5AI2SJQCwlf/d2A/3B8ggenuSqqZeEFS
         TPsj0s9j2dJpYyVFK+IRq09akbV/21DKszq/NBvFFh6KPnhi3Zppi+znez+so1Uhg7t1
         IxLvKMfCphaofmlMc5v9Gkt10w4egqQZl/nVmWYyO5dRSJlotCzmWR7//bOoOc/OcBhw
         fVYA==
X-Gm-Message-State: ACgBeo1cJ8Y2I9ZmAUgHnzj3/oMhToObsrQpJTZkitgab8x2is0S+vo6
        VZvMRUIStT6S4cjpDFEMNfU02Q==
X-Google-Smtp-Source: AA6agR5dmKV0OR4o9n9g3iWgsuASoCq5JZxLBGeWzTR0e2frRmi8e0qeWqjT/Dz2QiLiJ+wNeLiNwA==
X-Received: by 2002:a92:d5cf:0:b0:2e9:4cb4:57e4 with SMTP id d15-20020a92d5cf000000b002e94cb457e4mr7013935ilq.224.1661182817641;
        Mon, 22 Aug 2022 08:40:17 -0700 (PDT)
Received: from [192.168.1.94] ([207.135.234.126])
        by smtp.gmail.com with ESMTPSA id e96-20020a028669000000b00349c4b20185sm2737009jai.116.2022.08.22.08.40.16
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Mon, 22 Aug 2022 08:40:17 -0700 (PDT)
Message-ID: <4a9d2d6f-2b07-7331-6507-e19cd8e4f2ff@kernel.dk>
Date:   Mon, 22 Aug 2022 09:40:15 -0600
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux aarch64; rv:102.0) Gecko/20100101
 Thunderbird/102.1.2
Subject: Re: linux-next: build failure after merge of the block tree
Content-Language: en-US
To:     Bart Van Assche <bvanassche@acm.org>,
        Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20220822144613.6e6ce950@canb.auug.org.au>
 <911717ae-3955-08dd-ad53-a6488ef8127b@kernel.dk>
 <3848cd00-b4e8-17f6-32d6-011170f293da@acm.org>
From:   Jens Axboe <axboe@kernel.dk>
In-Reply-To: <3848cd00-b4e8-17f6-32d6-011170f293da@acm.org>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 8/22/22 9:34 AM, Bart Van Assche wrote:
> On 8/22/22 06:55, Jens Axboe wrote:
>> On 8/21/22 4:46 AM, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> After merging the block tree, today's linux-next build (sparc defconfig)
>>> failed like this:
>>>
>>> drivers/scsi/qlogicpti.c: In function 'qpti_map_queues':
>>> drivers/scsi/qlogicpti.c:828:24: error: 'return' with a value, in function returning void [-Werror=return-type]
>>> ?? 828 |???????????????? return -1;
>>> ?????? |??????????????????????? ^
>>> drivers/scsi/qlogicpti.c:817:13: note: declared here
>>> ?? 817 | static void qpti_map_queues(struct qlogicpti *qpti)
>>> ?????? |???????????? ^~~~~~~~~~~~~~~
>>> drivers/scsi/qlogicpti.c:839:24: error: 'return' with a value, in function returning void [-Werror=return-type]
>>> ?? 839 |???????????????? return -1;
>>> ?????? |??????????????????????? ^
>>> drivers/scsi/qlogicpti.c:817:13: note: declared here
>>> ?? 817 | static void qpti_map_queues(struct qlogicpti *qpti)
>>> ?????? |???????????? ^~~~~~~~~~~~~~~
>>> drivers/scsi/qlogicpti.c: In function 'qpti_sbus_probe':
>>> drivers/scsi/qlogicpti.c:1394:1: warning: label 'fail_free_irq' defined but not used [-Wunused-label]
>>> ? 1394 | fail_free_irq:
>>> ?????? | ^~~~~~~~~~~~~
>>> cc1: some warnings being treated as errors
>>>
>>> Caused by commit
>>>
>>> ?? f19f2c966b2f ("block: Change the return type of blk_mq_map_queues() into void")
>>>
>>> I have applied the following fix up patch for today.
>>
>> Folded in, thanks Stephen.
> 
> Hi Jens,
> 
> Please drop Stephen's patch and fold in this patch instead:

Done - please check the end result, both yours and Stephen's had to be
manually applied.

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 6FFF5C28D13
	for <linux-next@archiver.kernel.org>; Mon, 22 Aug 2022 16:06:23 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S235733AbiHVQGU (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Mon, 22 Aug 2022 12:06:20 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49928 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S236049AbiHVQGP (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Mon, 22 Aug 2022 12:06:15 -0400
Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C5652ED4C;
        Mon, 22 Aug 2022 09:06:14 -0700 (PDT)
Received: by mail-pj1-f53.google.com with SMTP id t2-20020a17090a4e4200b001f21572f3a4so11818226pjl.0;
        Mon, 22 Aug 2022 09:06:14 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20210112;
        h=content-transfer-encoding:in-reply-to:from:references:cc:to
         :content-language:subject:user-agent:mime-version:date:message-id
         :x-gm-message-state:from:to:cc;
        bh=A1lAI+RysD9M2zZlMWCFJOu0yk3MiDlnKNAKjdWT4/4=;
        b=z7VQcv/UEoBmFishnYrC/kHLzNdN/FBHvZ2i9HP/NhzdxV9rJ3ttSz7f0LIC84DArW
         7jGiy8w5/MAUPubTr30e5rv/lCj/X9kNmKPK5Mb5kn5UiJFCto4sfpyu4MhpAL7gXh64
         tyO9dEeWxDmY1DxGaXHLIqe399ye2iN4x5F90CvTX6cMgNUVhBA4libnV352pXeATvcw
         j+X7EF0L2W0ChMnSDalWs9h/pRQkLvTbJsEdVKj2AjR28aIhyQ3bTtSpL9f6g6PfM3oo
         sFeoDWsKiQaMQEsVRB2QevDdPeBlIS8nZzl2hrYgXZyoaW+2YD8otClaXLsv8Mc57Opz
         Vl3w==
X-Gm-Message-State: ACgBeo12PpUtjEq3c0iOx45PKw1JNIV4iEMGJALmRgY4N5nI93xIj9XA
        7P/hBIFfpq6EPC8J9u+UvM6OGT3Wyls=
X-Google-Smtp-Source: AA6agR613ZfPjUp9dXPEQAopwB5EREFuHQSD4atXkG57WKcBXRiGpZciDRnH7bx13zFFxlGC6FeVIA==
X-Received: by 2002:a17:90a:64c1:b0:1fa:d891:adc0 with SMTP id i1-20020a17090a64c100b001fad891adc0mr21896638pjm.147.1661184374056;
        Mon, 22 Aug 2022 09:06:14 -0700 (PDT)
Received: from [192.168.3.217] ([98.51.102.78])
        by smtp.gmail.com with ESMTPSA id i9-20020a170902c94900b001641b2d61d4sm8654704pla.30.2022.08.22.09.06.12
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Mon, 22 Aug 2022 09:06:13 -0700 (PDT)
Message-ID: <5b659baa-8451-b4a1-2ad4-0423faac4642@acm.org>
Date:   Mon, 22 Aug 2022 09:06:11 -0700
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.1.2
Subject: Re: linux-next: build failure after merge of the block tree
Content-Language: en-US
To:     Jens Axboe <axboe@kernel.dk>,
        Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20220822144613.6e6ce950@canb.auug.org.au>
 <911717ae-3955-08dd-ad53-a6488ef8127b@kernel.dk>
 <3848cd00-b4e8-17f6-32d6-011170f293da@acm.org>
 <4a9d2d6f-2b07-7331-6507-e19cd8e4f2ff@kernel.dk>
From:   Bart Van Assche <bvanassche@acm.org>
In-Reply-To: <4a9d2d6f-2b07-7331-6507-e19cd8e4f2ff@kernel.dk>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 8/22/22 08:40, Jens Axboe wrote:
> Done - please check the end result, both yours and Stephen's had to be
> manually applied.

Hi Jens,

There is a difference between the qlogicpti source code in your tree and in
the master branch. Is this change intentional?

Thanks,

Bart.

$ PAGER= git diff origin/master..axboe-block/for-next drivers/scsi/qlogicpti*
diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c
index 57f2f4135a06..87b60bf9ad3b 100644
--- a/drivers/scsi/qlogicpti.c
+++ b/drivers/scsi/qlogicpti.c
@@ -1339,7 +1339,7 @@ static int qpti_sbus_probe(struct platform_device *op)
         /* Clear out scsi_cmnd array. */
         memset(qpti->cmd_slots, 0, sizeof(qpti->cmd_slots));

-       if (qpti_map_queues(qpti) < 0)
+       if (qpti_map_queues(qpti))
                 goto fail_free_irq;

         /* Load the firmware. */


From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 3DC92C28D13
	for <linux-next@archiver.kernel.org>; Mon, 22 Aug 2022 16:07:31 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S235811AbiHVQHa (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Mon, 22 Aug 2022 12:07:30 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50910 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S235261AbiHVQH2 (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Mon, 22 Aug 2022 12:07:28 -0400
Received: from mail-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A56E31EED
        for <linux-next@vger.kernel.org>; Mon, 22 Aug 2022 09:07:26 -0700 (PDT)
Received: by mail-il1-x134.google.com with SMTP id q16so5913530ile.1
        for <linux-next@vger.kernel.org>; Mon, 22 Aug 2022 09:07:26 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20210112.gappssmtp.com; s=20210112;
        h=content-transfer-encoding:in-reply-to:from:references:cc:to
         :content-language:subject:user-agent:mime-version:date:message-id
         :from:to:cc;
        bh=mu4GdUlV+WQe3SYqD8p4Ychr4IxygsX0pgrZ5aKEYrc=;
        b=xEQErVzJm3zlyAIKaQObJgyJvM1/IfPFH4lJphGGU/mMk4iXOOMmOkVvCQRrv0G8xQ
         iScFlp7nd95L3k1XV00fO0a8HRoaQolZZwkm+gBKbfW3Wm30CmlX0l0j+l2LHgaxBesn
         H28fnQp9sFbLsR1UEOxi6U8P3zDqQ5wYDDqnb/t2Rb86MWPq+GsCBLYtyYPsE9g4O1HL
         +998kMsFyef3asaVe40/T800OMHU+VcUtIZYCPUun8f1KOrMeTE/BlAzBJ/CRBPGTgW9
         qhR3XSukpBFv8nk03VU8+C/H4p3duoCmL8yhH1RozOYKB8QulhgNfB62+PoHHQupobwL
         vqYQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20210112;
        h=content-transfer-encoding:in-reply-to:from:references:cc:to
         :content-language:subject:user-agent:mime-version:date:message-id
         :x-gm-message-state:from:to:cc;
        bh=mu4GdUlV+WQe3SYqD8p4Ychr4IxygsX0pgrZ5aKEYrc=;
        b=fx8f+CBnuBqPLl8jfyH3AZ9zxpYFuZPUIaJq/qAj0SfW8CQEocLvRnbUr5unSVgjPE
         qdCj2I3aG3Hk9QGpRFyJkuIKv+pr3+0mY+Usu4mhsmkEwEsYsfR+GXduyOlMcgmp3nT0
         mNlicSE8w/VvASs68mzH9wIE7HM8BLdUsefXkkNitgbgTnb00UVl0FCqkhnfA0C96bh8
         XYMuFxnNNmf3nebY8KDdz0d9+5qXlQhAm+8OlQ0WHl9HRNWTQ5FHEKgbTjcT9Rn2xjGd
         8GXprh+cyTkEzstONacZNTUu47VFa5ZKWyPQ5Tbv04YFeRyjILre5RtwC1yQKG9tCw+2
         VJWg==
X-Gm-Message-State: ACgBeo0oJTdul7C6pjA7K7j3rBCsE4xmPe2G1j3I46efgV8Trv2BdVms
        d4nhkbv4rU8EX1MIuzAqDWLe1g==
X-Google-Smtp-Source: AA6agR6JWd8v85pRNtwiGo+7ah75D+0zAkZyQnmJ53oFS75A9pjxRz+3UIV1Cw4PllRLTrmvZaKS6Q==
X-Received: by 2002:a05:6e02:2162:b0:2e5:d70a:3af5 with SMTP id s2-20020a056e02216200b002e5d70a3af5mr10138250ilv.3.1661184445953;
        Mon, 22 Aug 2022 09:07:25 -0700 (PDT)
Received: from [192.168.1.94] ([207.135.234.126])
        by smtp.gmail.com with ESMTPSA id e21-20020a0566380cd500b00349ed059d12sm256855jak.75.2022.08.22.09.07.25
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Mon, 22 Aug 2022 09:07:25 -0700 (PDT)
Message-ID: <2d8b47ac-c343-2310-141a-88b54109dbdf@kernel.dk>
Date:   Mon, 22 Aug 2022 10:07:23 -0600
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux aarch64; rv:102.0) Gecko/20100101
 Thunderbird/102.1.2
Subject: Re: linux-next: build failure after merge of the block tree
Content-Language: en-US
To:     Bart Van Assche <bvanassche@acm.org>,
        Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20220822144613.6e6ce950@canb.auug.org.au>
 <911717ae-3955-08dd-ad53-a6488ef8127b@kernel.dk>
 <3848cd00-b4e8-17f6-32d6-011170f293da@acm.org>
 <4a9d2d6f-2b07-7331-6507-e19cd8e4f2ff@kernel.dk>
 <5b659baa-8451-b4a1-2ad4-0423faac4642@acm.org>
From:   Jens Axboe <axboe@kernel.dk>
In-Reply-To: <5b659baa-8451-b4a1-2ad4-0423faac4642@acm.org>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 8/22/22 10:06 AM, Bart Van Assche wrote:
> On 8/22/22 08:40, Jens Axboe wrote:
>> Done - please check the end result, both yours and Stephen's had to be
>> manually applied.
> 
> Hi Jens,
> 
> There is a difference between the qlogicpti source code in your tree and in
> the master branch. Is this change intentional?

I did notice that, we can just make them identical. Won't really matter,
but might as well keep them consistent.

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 27580C4332F
	for <linux-next@archiver.kernel.org>; Tue,  4 Oct 2022 21:50:57 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S230091AbiJDVuz (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Tue, 4 Oct 2022 17:50:55 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41984 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S230088AbiJDVuy (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Tue, 4 Oct 2022 17:50:54 -0400
Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A50B24BF3;
        Tue,  4 Oct 2022 14:50:52 -0700 (PDT)
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4Mhrx33dWtz4x1D;
        Wed,  5 Oct 2022 08:50:47 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1664920248;
        bh=HN953pU94xEC8/scIinqRGHHD4tIEtXg2hyrS0Rhh6I=;
        h=Date:From:To:Cc:Subject:From;
        b=sP0hne8BlkgvGc4ZWxP8Pgjxf0jPgKd/LTMyiQU/OqZL/e72l8G874U5iYTOtVwsH
         eNEztP2xkNtk0dJ8wMI+eaBJgqapWHiCgcL1nD3oSYLdYO7Y/e3ojyg2gu6wWyVEp8
         svrdVHOd+/ozz/Izi5fNTicQQXRH+xI1+IfVLNlBchqfFS8YZN1CsYRl6b5r7BygCi
         tyCDTvaRlgCYs68PunGrNXXHGqJGJb2SD7xfHSpR3zDXpwm1Ss+CMLqowe3EwVd3JU
         /56WWhMJ07c21SaJ+73Vo5sTVafv2mOrFMxJ8pcpf+8yC/8C2sDyNwukeo7PYtyWKz
         fdtF/7lf4A/NQ==
Date:   Wed, 5 Oct 2022 08:50:46 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Anuj Gupta <anuj20.g@samsung.com>,
        Kanchan Joshi <joshi.k@samsung.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20221005085046.1adefcfc@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/4SvURcv27ADnxUpzgNmKe=o";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/4SvURcv27ADnxUpzgNmKe=o
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

After merging the block tree, today's linux-next build (when
CONFIG_IO_URING is not set) failed like this:

include/linux/io_uring.h:65:12: error: unused function 'io_uring_cmd_import=
_fixed' [-Werror,-Wunused-function]

Caused by commit

  a9216fac3ed8 ("io_uring: add io_uring_cmd_import_fixed")

"inline" is missing.

--=20
Cheers,
Stephen Rothwell

--Sig_/4SvURcv27ADnxUpzgNmKe=o
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmM8qrYACgkQAVBC80lX
0GxZhQf+PybKqigT6rwDjdh5P2jT2209luw5NxmpjWZuJLwvcPbBZ+3pVFF02EDT
RBgen8Pv/bH6dS/I1UkgZCfQgqsT5EFWbA6enQq3HOYLG9gzrSZokMKF0lfuCffs
yml7H6WgofhvHRgj3IoDKCV9HveiEqUs8l4VyrYrWh1T33UanaWMUl+WQU1+h1DQ
tzUj84fCjIgPgoqOPxjvQPoraAE3Bd9FRy7FPi1i0MmX+VW24BvG+Uj7wAXgwJky
JmSRKwPdHP5SyiN0PETRF7MQzuLvjW06K1RMCAdcwkvC9eWV4/xBJgVUOB30cqWZ
5JUZMETsTInCtywotOCUaVTFIHa0Wg==
=L8/f
-----END PGP SIGNATURE-----

--Sig_/4SvURcv27ADnxUpzgNmKe=o--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 73283C433F5
	for <linux-next@archiver.kernel.org>; Tue,  4 Oct 2022 22:15:04 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S230094AbiJDWPC (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Tue, 4 Oct 2022 18:15:02 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45998 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S230160AbiJDWPA (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Tue, 4 Oct 2022 18:15:00 -0400
Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 42A0120184
        for <linux-next@vger.kernel.org>; Tue,  4 Oct 2022 15:14:57 -0700 (PDT)
Received: by mail-pf1-x42c.google.com with SMTP id w2so14321481pfb.0
        for <linux-next@vger.kernel.org>; Tue, 04 Oct 2022 15:14:57 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20210112.gappssmtp.com; s=20210112;
        h=content-transfer-encoding:in-reply-to:from:references:cc:to
         :content-language:subject:user-agent:mime-version:date:message-id
         :from:to:cc:subject:date;
        bh=5L01wecfli+mbpc2reA9sYX86GK31JmxkVaD77jT208=;
        b=tx0mpRPVbWB2tbZ5dEJJrMPJ2+Nc4lEHC0shmxNtCSS6FagmNv2w3S0bWvTi/aZgxy
         vG5cZsCR70+8nyrcLUZf+8lB/+7DOJk1lP4skbXJ+FcqZwxIwAZSOvxJkZOVn/+WhTUJ
         3oUNkCeAwXzlz7WjqFmyPZiX1poLE326R3XpuMbSAvxswchVfLhpkWWHGQCYPp1Pf/pf
         WbUrJiVTi8CbUW3QUsnvVa4JLx6lcZgDYLaPwSAuEVUdg+ZzHKEUGe7HCzOpyV7v0Su8
         VmIkAgfSIIfADOi5DPqvfNm/jJqWVTWqjqkN+QSv71HAO66tFmCzVj5zjfHo9Wmm3jb9
         1QAQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20210112;
        h=content-transfer-encoding:in-reply-to:from:references:cc:to
         :content-language:subject:user-agent:mime-version:date:message-id
         :x-gm-message-state:from:to:cc:subject:date;
        bh=5L01wecfli+mbpc2reA9sYX86GK31JmxkVaD77jT208=;
        b=OK2ihyI38gXq5MF8pi9XMTOgxv35GUYpgK61YCOaLq47xXoh4ldtghpRfcRTtuF7dM
         S7sQI++vE0XaYwCEttjFEdrWTNZZF84mh5HV8G8VjHEUfI9vTUrOfAGMKvLoti/+QBJg
         481zV05DowqvgkLF97PLCnCRac5h1c/PJPpYyrNwZTJ/dlFLXVJo0yroMEQpaR2bKGFs
         P6TDh6pWgA6uAJKFSGs87hSdiYVHrhH5HbUS9Puru7Hm+FXUuAEttJf1zUjPqTc+Zhwd
         861syShJ/3M7URdNvJVWuXy7L56TxCI9dvwTvzGtSIA3ueBMwGiL8gkeXXt0GCLMggUD
         kUhA==
X-Gm-Message-State: ACrzQf3CsUad3rTmzKxKCVoD9YudlUfLNjkPtW2iCf5ekTBCaCudXsZ6
        3C0W8iKSZ3w94V7WQwvyx2tyfg==
X-Google-Smtp-Source: AMsMyM557Y3Ml2t31BNEn1s1Jmf8Up6yq+hdDSraVclt2hzN9xsg77NdjSwXVnWg7KdtzJaEn4lhTA==
X-Received: by 2002:a63:8543:0:b0:44c:be7c:78a9 with SMTP id u64-20020a638543000000b0044cbe7c78a9mr12289218pgd.221.1664921696449;
        Tue, 04 Oct 2022 15:14:56 -0700 (PDT)
Received: from ?IPV6:2600:380:4b7a:dece:391e:b400:2f06:c12f? ([2600:380:4b7a:dece:391e:b400:2f06:c12f])
        by smtp.gmail.com with ESMTPSA id p2-20020a17090a930200b0020669c8bd87sm30720pjo.36.2022.10.04.15.14.55
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Tue, 04 Oct 2022 15:14:56 -0700 (PDT)
Message-ID: <080c1152-1965-48cb-5834-d521bbf316e2@kernel.dk>
Date:   Tue, 4 Oct 2022 16:14:54 -0600
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux aarch64; rv:102.0) Gecko/20100101
 Thunderbird/102.3.0
Subject: Re: linux-next: build failure after merge of the block tree
Content-Language: en-US
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Anuj Gupta <anuj20.g@samsung.com>,
        Kanchan Joshi <joshi.k@samsung.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20221005085046.1adefcfc@canb.auug.org.au>
From:   Jens Axboe <axboe@kernel.dk>
In-Reply-To: <20221005085046.1adefcfc@canb.auug.org.au>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 10/4/22 3:50 PM, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the block tree, today's linux-next build (when
> CONFIG_IO_URING is not set) failed like this:
> 
> include/linux/io_uring.h:65:12: error: unused function 'io_uring_cmd_import_fixed' [-Werror,-Wunused-function]
> 
> Caused by commit
> 
>   a9216fac3ed8 ("io_uring: add io_uring_cmd_import_fixed")
> 
> "inline" is missing.

I forgot to pull in the branch post adding that patch... Pulled in
now.

-- 
Jens Axboe



From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 59FF0C4332F
	for <linux-next@archiver.kernel.org>; Wed, 16 Nov 2022 01:36:08 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S231665AbiKPBgH (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Tue, 15 Nov 2022 20:36:07 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53774 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229575AbiKPBgH (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Tue, 15 Nov 2022 20:36:07 -0500
Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5FBDC165B4;
        Tue, 15 Nov 2022 17:36:04 -0800 (PST)
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4NBlxV6fc2z4xDK;
        Wed, 16 Nov 2022 12:35:58 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1668562559;
        bh=m1XHF8llPa7pw5nIxGLJkMt7l8j+r6J1+/3Hk0NmZEg=;
        h=Date:From:To:Cc:Subject:From;
        b=GLA2XPdtkpVerQX20bUt+beKDGkPgAD1qaHrEbmhb6osTA8nWoSlwECsbYpin/UFT
         NMNZRYMgI+te4Z7xqC4sEJ2300wmq/icabpEvqLyFPhLxTDlpG1T+Ummk2hki6rktR
         Zv+kLx6CFC/qD2Sgnr5Y2y7j4VOqZsB5i8XwPVzTJiH/7+HBR6bQk9KFjANew9AnmJ
         /UBmWhCbbM/j2wi6Fvgg2m/Mgy3ufQ78dVGpuLe7mp3y+yn1oPSUkYCq1MTB0HoiqW
         T7L+8twZqRM9DUhtGUa/p73B6ZuWda2gsvZsWo2gT2SFU0bdh5dawo4Ydv+i7Kie3z
         Ov/v9vqaRWHnQ==
Date:   Wed, 16 Nov 2022 12:35:56 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Ammar Faizi <ammarfaizi2@gnuweeb.org>,
        Stefan Metzmacher <metze@samba.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20221116123556.79a7bbd8@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Xr/iw1wiKQizx0y_MS3Ex7r";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/Xr/iw1wiKQizx0y_MS3Ex7r
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:

In file included from <command-line>:
./usr/include/linux/io_uring.h:672:41: error: field 'timeout' has incomplet=
e type
  672 |         struct __kernel_timespec        timeout;
      |                                         ^~~~~~~
make[4]: *** [/home/sfr/next/next/usr/include/Makefile:91: usr/include/linu=
x/io_uring.hdrtest] Error 1

Caused by commit

  958bfdd734b6 ("io_uring: uapi: Don't force linux/time_types.h for userspa=
ce")

I have used the block tree from next-20221115 for today.

--=20
Cheers,
Stephen Rothwell

--Sig_/Xr/iw1wiKQizx0y_MS3Ex7r
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmN0PnwACgkQAVBC80lX
0Gw4RwgAnho18sbwThzt6T+G1zpj3qsZhMiLmHPBihJ7oL6QaNq5p2gshrTv5/jJ
tTUG9Tj9L5MqPYPjnejrvH+yypJysFMmfVQx7i1ph3iWMDMS/poUWg+YwulUy2To
+bEK6nHurMyvAJqiYinWIJ4b+K7E4squ7MAPJPIFMGM/OSdYbpjrkCkXJOJhifzM
UZBOiVisQHawgrSr0iBXaZ5sY2a/r3FuuCnUhm8kYtNdfp753GfevGx71Jxk11zj
0DITK3/JtziaJ/FbQ+1sTAaq4iJBs3ERVvsbZxxbJkwDvdWeVqcSuToBS/M7+Oxw
8FFlQnBJ/Ki4abC9I4AtdfShVa5VuQ==
=p/BZ
-----END PGP SIGNATURE-----

--Sig_/Xr/iw1wiKQizx0y_MS3Ex7r--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@vger.kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 63436C3DA7A
	for <linux-next@archiver.kernel.org>; Fri,  6 Jan 2023 00:19:19 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S236063AbjAFATS (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Thu, 5 Jan 2023 19:19:18 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42848 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S236040AbjAFATR (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Thu, 5 Jan 2023 19:19:17 -0500
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A2D43D5D2;
        Thu,  5 Jan 2023 16:19:16 -0800 (PST)
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4Np3qQ6yd8z4x1D;
        Fri,  6 Jan 2023 11:19:14 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1672964355;
        bh=KWKLdIiyKFcqGgna5qmNCmw34VszfaI+yRthltHHztE=;
        h=Date:From:To:Cc:Subject:From;
        b=V3zGY8s3BnNIwjz+Vb/zGdNg8CWGuEYoykr+Enq2pTOeTJLtYGYMywf6XiMj3EZBA
         3YiAgo3c9R82MmY1KMtclZwZ/+4FdesPbzDHGsRvWX8ZBJaZWHVgwFV8CgJdyzML0i
         WKbPNx8IeVW948SNviVrMHUqpJtqqrOsKGJ+2Khqszzwl4tiViIGqz36AYbFBYc+LP
         jZA6RM8Gpk3caIsQznSD3s8opXx7tc1dfdntdUIPHwcmhS3SKXkd0CTmblIvbt2KeA
         8V0PVOHe31U8fEUWkWsSjTpv4xexoL1a4nJhazbFGXnScSMvEUD6bseBL+BTdYTu8y
         zT28L82HWhKYw==
Date:   Fri, 6 Jan 2023 11:19:13 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>,
        "Martin K. Petersen" <martin.petersen@oracle.com>
Cc:     Lukas Bulwahn <lukas.bulwahn@gmail.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20230106111913.660c8983@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/=hQL=sN.5byfU9l8wN3xDLH";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/=hQL=sN.5byfU9l8wN3xDLH
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:

ERROR: modpost: "scsi_device_from_queue" [drivers/block/pktcdvd.ko] undefin=
ed!

Caused by commit

  4b83e99ee709 ("Revert "pktcdvd: remove driver."")

interacting with commit

  7936f8b232fc ("scsi: core: Remove leftovers due to pktcdvd being removed")

from the scsi-fixes tree.

I have reverted that latter commit for today.

--=20
Cheers,
Stephen Rothwell

--Sig_/=hQL=sN.5byfU9l8wN3xDLH
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmO3aQEACgkQAVBC80lX
0Gy34gf/SS9Ra3I9Ch6HLNpnDyvyOIM/AvY9bXGEWOJoo+8VbXBAyyEyiDPSlnTo
bCblGaBjNO8nvfb13juYIYDOXnTcdDjJLPyhHhcmOkDv5TWOhv+fygJfVl3DnSxe
yV/E30ZSxbTTW2hlyw0WOrGXZcKQhw2X/eD+cclh7TlqfBTqqVz0YaBK8KBBlU56
VPpCMjYI8GIkIY8o+gCYi77dE8Fx5tkXSi1gLKozvTc+N5eNUFcqh/ajz9rc+7ai
l5srStRcdMOLDzFIgCKmBtWnX5drFpmBDKP7ANMJ7yZHuH2PatH6hoHE0GXf1jEx
t/gPl7ZLznLjSQdQw/qs+1I90K7M1Q==
=Q3uY
-----END PGP SIGNATURE-----

--Sig_/=hQL=sN.5byfU9l8wN3xDLH--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@vger.kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 51FE1C3DA7A
	for <linux-next@archiver.kernel.org>; Fri,  6 Jan 2023 02:54:33 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S229451AbjAFCyc (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Thu, 5 Jan 2023 21:54:32 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50730 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229579AbjAFCyb (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Thu, 5 Jan 2023 21:54:31 -0500
Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 159471B1CE;
        Thu,  5 Jan 2023 18:54:30 -0800 (PST)
Received: from pps.filterd (m0246627.ppops.net [127.0.0.1])
        by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3061Z4dF031473;
        Fri, 6 Jan 2023 02:54:17 GMT
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=to : cc : subject :
 from : message-id : references : date : in-reply-to : content-type :
 mime-version; s=corp-2022-7-12;
 bh=P+9sXquTAOln9S6fwoUtaBSSFPEAbKEDn6gM+ZiByv0=;
 b=SzIN0IwKPiVJLxUpoIe2PU0zOXGVdNTQv/ncK+nysbMUey8uI8ZRa07IgKI3tA3k4OgY
 KCrX0434PGAPAA4f/yj3Xy1axDglA4Ed58lbuSESSkCkBIUb7bRHJysrWr1FoZkocXcd
 smnPmbM2XeVkLJr2wDgUpgT7/Pujvg4SAdS5mpaFTGmQgMjRZGwWQOkQn61DMaCLSTqe
 UFvuY1yYz33zNwJ209e6HcrmPNzTBwdHLu5H9SioIG4a5jecb0OulCqeOF0fB32dfuy3
 dUOGpx7e0mFeZbVspwJoCXmMxsLtHkjHGcsXPVoKPOJeZZkY/aH4OLyuQqwkJnltS9rl rw== 
Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223])
        by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3mtbp12car-1
        (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);
        Fri, 06 Jan 2023 02:54:16 +0000
Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1])
        by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 30610RTg007489;
        Fri, 6 Jan 2023 02:54:15 GMT
Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2168.outbound.protection.outlook.com [104.47.55.168])
        by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3mwft0gupk-1
        (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);
        Fri, 06 Jan 2023 02:54:15 +0000
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
 b=kiKN/BNkXsznKMSN5TVXYGcK+DqByXs6K6AIMupKBwmggP7Z9ZPZrVC+lpRPNAVUB3Pi7JHSce4rqLphndNILHuLcK26YGGOkKsqIZ5hp8HL29U9XF4tVDh5UMEki0bk3t83u7P7C8SFGmgWWK9mWl9Hix2c55uHhhhQI6ECXIR/Gxo1ZOz9naB8reqE+H1qVe9VIYAf3StuKPbVsQdr1A179DIt3Mw9XSl2ez8buPgoGXtdSaFe+53aD4GAhmjR2KG8FQ2q17BsIpOb7kd2NliH07Vs5oM6VgGoJCRjGnc/yTHH0973wQqywjjaamP52l9ldfQznhrBnbA0vlZRXw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;
 s=arcselector9901;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;
 bh=P+9sXquTAOln9S6fwoUtaBSSFPEAbKEDn6gM+ZiByv0=;
 b=mdIOPB3K49ViLT9rnXr0wlfAiujSIT1dPioboGr1QkjmFt0VDZtjBLwtMkmGlMgGB1mvJdChULHdMDVcfyCDo3eHxO2rjPdNRxoaOHHh4TG4IHg0F6JlkjhoL/j1OqmHfW1wDNc1pT25pEakBslTYN3J7DgF9BpoXwBTtJfOF6JD6GuCK50H5xY93lwul2YuUun33tSZDE9dSZXC7lYDJ16lzbnAHzLhBlSYtWUDSmEx8cibEVFGmmgjk4flt7Zi8YIupWUZmoLVMvJOH4eaetGAnFr+C9NoP29oIgYkSZpF79GcQ4eCSiMfiLTIGaXD7JxihPX6AtDn2K0tHxsBfw==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass
 smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com;
 dkim=pass header.d=oracle.com; arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
 bh=P+9sXquTAOln9S6fwoUtaBSSFPEAbKEDn6gM+ZiByv0=;
 b=Dl82+dwjcs35iAfr8TsI9CP3jIdpLw5wLAY/lxEF1HG5yI93O7jBJfaMVDmWebuc09SiT6RHlu9YTlohfZow71uDOuEks98st2yXShPSxB/41Dh9naxaAhUt1+IWpL+GyxDg1QaoukNWcfJJuj7cqhap3Xd9VyvCtoSO1THgVjk=
Received: from PH0PR10MB4759.namprd10.prod.outlook.com (2603:10b6:510:3d::12)
 by CY8PR10MB7315.namprd10.prod.outlook.com (2603:10b6:930:7e::7) with
 Microsoft SMTP Server (version=TLS1_2,
 cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.19; Fri, 6 Jan
 2023 02:54:13 +0000
Received: from PH0PR10MB4759.namprd10.prod.outlook.com
 ([fe80::25bc:7f6f:954:ca22]) by PH0PR10MB4759.namprd10.prod.outlook.com
 ([fe80::25bc:7f6f:954:ca22%2]) with mapi id 15.20.5944.019; Fri, 6 Jan 2023
 02:54:13 +0000
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Jens Axboe <axboe@kernel.dk>,
        "Martin K. Petersen" <martin.petersen@oracle.com>,
        Lukas Bulwahn <lukas.bulwahn@gmail.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the block tree
From:   "Martin K. Petersen" <martin.petersen@oracle.com>
Organization: Oracle Corporation
Message-ID: <yq1fsco1ii3.fsf@ca-mkp.ca.oracle.com>
References: <20230106111913.660c8983@canb.auug.org.au>
Date:   Thu, 05 Jan 2023 21:53:58 -0500
In-Reply-To: <20230106111913.660c8983@canb.auug.org.au> (Stephen Rothwell's
        message of "Fri, 6 Jan 2023 11:19:13 +1100")
Content-Type: text/plain
X-ClientProxiedBy: SN6PR2101CA0027.namprd21.prod.outlook.com
 (2603:10b6:805:106::37) To PH0PR10MB4759.namprd10.prod.outlook.com
 (2603:10b6:510:3d::12)
MIME-Version: 1.0
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: PH0PR10MB4759:EE_|CY8PR10MB7315:EE_
X-MS-Office365-Filtering-Correlation-Id: bd4fc2c9-15fe-4f4f-4fdf-08daef914ac8
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info:  
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH0PR10MB4759.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(136003)(39860400002)(396003)(346002)(376002)(366004)(451199015)(316002)(478600001)(6486002)(26005)(558084003)(36916002)(86362001)(6506007)(186003)(54906003)(6916009)(6666004)(8936002)(41300700001)(2906002)(5660300002)(66556008)(8676002)(66476007)(66946007)(6512007)(4326008)(38100700002);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?BC8Zh6YjeMoW2qdEMOF7KYypl5b+awky9/7yvh3MOIPTcFMahSR4eKgCkUYm?=
 =?us-ascii?Q?52TBOmi8t0Cf+7butcBl1QnZBgdg3WQpAsLnnwlgDMHTaqaUNx/ty2uOB4Td?=
 =?us-ascii?Q?pyFThznhhohzI5vELw3w6IixNkLeN81C0t0AyTDHfXkKOnQkLCxg47obml4K?=
 =?us-ascii?Q?hAxloPbziVk2pvHY+k3I7vTH+zk35srxiHNOV17r7VX9bD2w2KSjVLOsQQ2T?=
 =?us-ascii?Q?CWB4TNx2a7tZBBAt0VMjp4aYdnF1o/uIRTcF6ZAvlMAfo9ArOkYgri++p39q?=
 =?us-ascii?Q?8ioMMzYj5FbBMZ5164iGYKWUCp2fYqq45yxXjl4SvzviOPNt3oQxQepdTEsl?=
 =?us-ascii?Q?IKrwXfpVc2k9TSETxN4v2tSiYyDjELmnHB0wNk32YOZJJynwix9GVWCDfC25?=
 =?us-ascii?Q?jlUHk+kSvD7tHArNipCu8dLjJLW+uayn65GOKF2hnLiLr0MbDh2ENLHDXL98?=
 =?us-ascii?Q?wFMYzhEHGoxKrP/ax9d/G5SHcagJf0yMCFq43eKF0W0w6AwYR1TU+uv+KIW1?=
 =?us-ascii?Q?LV1CzuRDS9YpeOo1cUgQxZz/lv3uLQZKiDbTn2j73jt0V0cXN05DVxUo6dAl?=
 =?us-ascii?Q?etFwlZ423zZ+oiWZhFQmT+AwVMihXIMFLBu1a8VKXALg6cYyUtqAiZkcHmGK?=
 =?us-ascii?Q?JAOyPeROA+35Ks8lWH21xfm9TodWXhNPlML3o5/AT/J/4npPtkTYaa+NcShV?=
 =?us-ascii?Q?igT94467rcBOpLQ1esvXgDhom566Zb1QdkKRqcbyENxUrsJAsPF1YWzBhXbR?=
 =?us-ascii?Q?ZC6u8dpcXNWcx+vM4dpyZj86Qgbu7qfNCNFXAYS2ljilhipt+3u8hMBOae80?=
 =?us-ascii?Q?zIDekOeCREFuqfgU6Z4t3DGlmG6n6uKMe+WE8SPqbBMoBaoG8qBserjjWdSI?=
 =?us-ascii?Q?vqIBbdK6Hvg37OFqHrtA2we8xMImnYjJB9xyNr7FrQ/eP5p/e7/wjugvn8JA?=
 =?us-ascii?Q?sa1XizzigNpdb2sXrHsNeNhm62wUAvhH8Ol2u9s0/5rYaSXA/gSGhOiPZ887?=
 =?us-ascii?Q?l9IKIBguEW/AGIovU4+RwiQOhhjoxibe8J8qfZiVj9o/54nYWocGtvoE5hy5?=
 =?us-ascii?Q?ikbI4SPErujYADNKBfLMnKLEmvhCHmYQUox/oYs4kjrhRMpCSd1mXHW6p7g5?=
 =?us-ascii?Q?pWLAMSViwBPFkSxJXulbLB3cq/EIM/COyPdBi+P7EQvjeqKkBjlBuXowU/n1?=
 =?us-ascii?Q?kBEaqOn2u07PKWFySEZU9iffEVK9sfRqbkmURy9HhFt1tW7mIrWUkAb8b+U0?=
 =?us-ascii?Q?oYRCR1tyhyOUfQ/ZNWtDmUkpRCu8qvhLgJiumtAdHmm15U6fzXa3N+US5tbR?=
 =?us-ascii?Q?40XWeZ6moO18KTwRj2FgMHnzzKcHkgYQiI3j2l0jOzIDNoHvmUSvSpg0pxSb?=
 =?us-ascii?Q?Y7MuOJEcn23KtvZTS+j9UV1Y2uMOqF0znfewN3cjdSrL5oxerR+9s+huoId0?=
 =?us-ascii?Q?3V1LZo9nkRT3vWm2ZkdMB8FHxya7clBM+reXvtNEpELMD6HOTEAEhmt8n/Bf?=
 =?us-ascii?Q?GvdW/KFsSf8MvroFM0epc/Wfrob+Cj7+W0a7QQuAo974WFt40idofNthtooK?=
 =?us-ascii?Q?oVuaOBj3S+JI5Pg9rF402M+nZjE2Op85VkyJAbvdjHyB5Ydxlss1ndnFZ0TM?=
 =?us-ascii?Q?HA=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0:  
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: bd4fc2c9-15fe-4f4f-4fdf-08daef914ac8
X-MS-Exchange-CrossTenant-AuthSource: PH0PR10MB4759.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2023 02:54:13.6377
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: NJ6GhsCb+smFiqvUTl/M5yT64YdC6QNOlKPqTGp5x05uClmTLplGbRq1u24/yjaZM8Ibn38w9EMcC9MLHNSVZOnRX2MfxjOGyibrOxIMcfI=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB7315
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1
 definitions=2023-01-05_14,2023-01-05_02,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 mlxlogscore=660 adultscore=0
 spamscore=0 malwarescore=0 bulkscore=0 phishscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000
 definitions=main-2301060020
X-Proofpoint-GUID: ui3ytYDrpj0Zqp31HQt79TXHuso2YztK
X-Proofpoint-ORIG-GUID: ui3ytYDrpj0Zqp31HQt79TXHuso2YztK
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org


Stephen,

>   4b83e99ee709 ("Revert "pktcdvd: remove driver."")

Missed the revert, I'll drop the SCSI patch.

Thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@vger.kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id E24FBC46467
	for <linux-next@archiver.kernel.org>; Thu, 19 Jan 2023 23:13:27 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S230472AbjASXN0 (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Thu, 19 Jan 2023 18:13:26 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56274 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S230459AbjASXNA (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Thu, 19 Jan 2023 18:13:00 -0500
Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D18171BDA;
        Thu, 19 Jan 2023 15:07:05 -0800 (PST)
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4NydYg5Y5Pz4xyB;
        Fri, 20 Jan 2023 10:07:03 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1674169624;
        bh=AUNkEbOWS6yryE3zKFWOtGrLQV0LUL9PLQAx+MWRktw=;
        h=Date:From:To:Cc:Subject:From;
        b=LZsC1RlsVMz2rVsQM6pn/Iyns396gjQBynzMYaovl1mh7ydQut8uKnLaQLLfZ7+qa
         dhbvlHtsAv+X6kM3c6fS4rJVckLBIcLWUO7/Sgs5QARtxb0Eg9Azh81ZHGed43Qyfs
         YW7FHC7NCKoTwGuZrehX3rgwSbbt5P6f3rq2mXFqk/DZ75NZ9lJKNW6T3Nkb4d2Kyc
         l4HdB5ikNXxhwbhf2tGRpn/sLvyye3b6MY1moHHQhohLH4emtoZPPpewf8z5BLvhHQ
         BXpE9rXgs8HXZ4MM6ptwYXwtq3izlRyxCdHbw9N4vqlYaICdbYWQLnNp6T9qWRrW/P
         nmLi2HzZpKTAg==
Date:   Fri, 20 Jan 2023 10:07:02 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>,
        Christian Brauner <christian@brauner.io>,
        Seth Forshee <sforshee@kernel.org>
Cc:     Christian Brauner <brauner@kernel.org>,
        Ming Lei <ming.lei@redhat.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20230120100702.3d50dbb8@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/XU/02PuEmecstByf5LvN/aR";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/XU/02PuEmecstByf5LvN/aR
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:

drivers/block/ublk_drv.c: In function 'ublk_char_dev_permission':
drivers/block/ublk_drv.c:2032:32: error: passing argument 1 of 'inode_permi=
ssion' from incompatible pointer type [-Werror=3Dincompatible-pointer-types]
 2032 |         err =3D inode_permission(&init_user_ns,
      |                                ^~~~~~~~~~~~~
      |                                |
      |                                struct user_namespace *
In file included from drivers/block/ublk_drv.c:15:
include/linux/fs.h:2474:22: note: expected 'struct mnt_idmap *' but argumen=
t is of type 'struct user_namespace *'
 2474 | int inode_permission(struct mnt_idmap *, struct inode *, int);
      |                      ^~~~~~~~~~~~~~~~~~

Caused by commit

  56f5160bc1b8 ("ublk_drv: add mechanism for supporting unprivileged ublk d=
evice")

interacting with commit

  4609e1f18e19 ("fs: port ->permission() to pass mnt_idmap")

from the vfs-idmapping tree.

I have applied the following merge fix patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 20 Jan 2023 09:58:46 +1100
Subject: [PATCH] fixup for "ublk_drv: add mechanism for supporting unprivil=
eged ublk device"

interacting with "fs: port ->permission() to pass mnt_idmap"

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

diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c
index 9f32553cb938..d47d87be098f 100644
--- a/drivers/block/ublk_drv.c
+++ b/drivers/block/ublk_drv.c
@@ -2029,7 +2029,7 @@ static int ublk_char_dev_permission(struct ublk_devic=
e *ub,
 	if (stat.rdev !=3D ub->cdev_dev.devt || !S_ISCHR(stat.mode))
 		goto exit;
=20
-	err =3D inode_permission(&init_user_ns,
+	err =3D inode_permission(&nop_mnt_idmap,
 			d_backing_inode(path.dentry), mask);
 exit:
 	path_put(&path);
--=20
2.35.1

--=20
Cheers,
Stephen Rothwell

--Sig_/XU/02PuEmecstByf5LvN/aR
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmPJzRYACgkQAVBC80lX
0GxWFwgAnfHhaol7tcVGBA2EHWoRw+YqWK8SwDX9Kyd9oZe3aJFsM2mrrCFC+x2z
g7qB9yFNh4HmHNcAdGjC4mPQpGgJgoo/XKYM3ui5Rt+tFt6KyQWXk0N7GwtySzeA
a7HIRv900oE5b7JlqwBEU7zhrGF5G588COj6vn5RrWaLTy4WHk0wSpXbzvF3h9zT
o5flxK0QZvHXRlbK8Wx6uGjbfFe8xB2gOo290szdaBqruGKX7SR5CqXSGxVF2SKB
lQQ0ARQgWFEmgg2sayZ/ugvGYN2YFP93MVyzixp+kSW24tMvKWdl0y0dinkzf51p
sP1xMpmxPShYP3jA33eCURiGW91r9A==
=yC4Q
-----END PGP SIGNATURE-----

--Sig_/XU/02PuEmecstByf5LvN/aR--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@vger.kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 1AF37C6FD1F
	for <linux-next@archiver.kernel.org>; Wed, 22 Mar 2023 23:33:37 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S229992AbjCVXdg (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Wed, 22 Mar 2023 19:33:36 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46574 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229670AbjCVXde (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Wed, 22 Mar 2023 19:33:34 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C845B20A03;
        Wed, 22 Mar 2023 16:33:26 -0700 (PDT)
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4PhlCT1w7jz4x4r;
        Thu, 23 Mar 2023 10:33:25 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1679528005;
        bh=9f11EWXC83jy/U6MAOs+3NlbCygEy0ALYbtabQn2CFM=;
        h=Date:From:To:Cc:Subject:From;
        b=G9fq5a+tJHyNOISPewt9aVQfukJEzFSEabgWs8owJdGsBMhTieZ1jpfStmC/8msfK
         Cp9MhA+bKv/Kj+7JnhcRA3HMKkmPl+wNEoyamdHfTFgda1yRR03SUIllkBZeRS0wwn
         HoS4hXPH6deUm8iOqTFoocowO+aTir/fUs2Ws5qmlnMBrl8UQzJm2woWLIH8gNzJC0
         No3mUkECgCtmEV7QYvg13Gf5cQWwwjtSKUrlad9dtZx3mkGUXCuPcZWBonpsl0CyJm
         O/3yjrP209mtKWi4MuwOu5j+v7533wpy9tOEjBRmUTDThlfaDSQ1yRXwIKBDVaV41o
         tu+xwFAg+mtXw==
Date:   Thu, 23 Mar 2023 10:33:24 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>,
        Andrew Morton <akpm@linux-foundation.org>
Cc:     Lorenzo Stoakes <lstoakes@gmail.com>,
        David Howells <dhowells@redhat.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20230323103324.222dbdbc@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/kLeb+iJqftKXW_gE/e58pRH";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/kLeb+iJqftKXW_gE/e58pRH
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

In file included from arch/powerpc/include/asm/cmpxchg.h:6,
                 from arch/powerpc/include/asm/atomic.h:11,
                 from include/linux/atomic.h:7,
                 from include/crypto/hash.h:11,
                 from lib/iov_iter.c:2:
lib/iov_iter.c: In function 'copy_page_to_iter_atomic':
lib/iov_iter.c:546:22: error: implicit declaration of function 'iov_iter_is=
_pipe'; did you mean 'iov_iter_is_bvec'? [-Werror=3Dimplicit-function-decla=
ration]
  546 |         if (unlikely(iov_iter_is_pipe(i))) {
      |                      ^~~~~~~~~~~~~~~~
include/linux/compiler.h:78:45: note: in definition of macro 'unlikely'
   78 | # define unlikely(x)    __builtin_expect(!!(x), 0)
      |                                             ^
lib/iov_iter.c:547:26: error: implicit declaration of function 'copy_page_t=
o_iter_pipe'; did you mean 'copy_page_to_iter'? [-Werror=3Dimplicit-functio=
n-declaration]
  547 |                 copied =3D copy_page_to_iter_pipe(page, offset, byt=
es, i);
      |                          ^~~~~~~~~~~~~~~~~~~~~~
      |                          copy_page_to_iter

Caused by commit

  a53f5dee3448 ("iov_iter: Kill ITER_PIPE")

interacting with commit

  c4cf24ce34b7 ("iov_iter: add copy_page_to_iter_atomic()")

from the mm tree.

I have reverted that mm tree commit (and the following two commits)
for today.

--=20
Cheers,
Stephen Rothwell

--Sig_/kLeb+iJqftKXW_gE/e58pRH
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmQbkEQACgkQAVBC80lX
0GwAeAgAkiiRafmFwNG31P6QLwkfj0bRW4Sn+6OpwzyUEdtxLy7ffcI1aYK/ZETE
5ZcQFo1kZS+SgUGBhMdnX50VJdAwYaStLS2euUTzg7Xr9GccHpE+/iSIehB2K1xR
2s+Cvo097pH1BstYWFpNLTX9LgMTNfG9Ohpusg3Y9NUUGzG290QvwiF3weDhndGE
4rAJUeGy2xTHRikL1jpITy3Vte6nqrI0SjcAgTbFTWipubZ6raRBhPj/orQkJF7+
v3OugTU338DQHtvp1GiV+bDJCdKdIL4Vn3RyKfqdzDF7AV6f144cWXAaOcD5LYrc
6mXYONYTtVa5ZFM22FxhVXlx9C74Yg==
=mmPH
-----END PGP SIGNATURE-----

--Sig_/kLeb+iJqftKXW_gE/e58pRH--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@vger.kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 2EFDBC6FD1F
	for <linux-next@archiver.kernel.org>; Wed, 22 Mar 2023 23:59:40 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S229669AbjCVX7j (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Wed, 22 Mar 2023 19:59:39 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59436 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229484AbjCVX7i (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Wed, 22 Mar 2023 19:59:38 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA5E119114;
        Wed, 22 Mar 2023 16:59:35 -0700 (PDT)
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4Phlnf1wD5z4x80;
        Thu, 23 Mar 2023 10:59:34 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1679529574;
        bh=KIke8oEsNLt3y5zFOoJ6KgGQKeAub2/Zlsgqf1VHrR8=;
        h=Date:From:To:Cc:Subject:In-Reply-To:References:From;
        b=RBgodTKPmofTfkDjaWyfeThFYUD/UXjjeJVpVyCMJaJa83XY3NGI9sZYBY0PGF+OH
         r6Pg27ABBqPGiI7+9SpcrbH+qa1zAWTGrUaKwJG6FOBMbaGkVVn7IiBdGYJM4EamWb
         fKvBaN8f+9rG7gtVS2NV4JbC3IvTwjFUBaWILh288dTf7VFCQJX4QohJri3lUjgNhy
         MefqundI5e+5J5vn6aCC/oiVN98036uAFUMblZeUXFTUVZA2BF53SIx4bD4XJegk7v
         9+cimx9dX3uL0owDNYltuUteUXHIOE3Rg8lY+jmfBC320LYlXvnLMD5yS3g6a0nkk5
         eObEHhcOnZv3A==
Date:   Thu, 23 Mar 2023 10:59:33 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>,
        Andrew Morton <akpm@linux-foundation.org>
Cc:     Lorenzo Stoakes <lstoakes@gmail.com>,
        David Howells <dhowells@redhat.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the block tree
Message-ID: <20230323105933.13a0297a@canb.auug.org.au>
In-Reply-To: <20230323103324.222dbdbc@canb.auug.org.au>
References: <20230323103324.222dbdbc@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/ED1RWZz0zVB5Us_eWv2dxvL";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/ED1RWZz0zVB5Us_eWv2dxvL
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Thu, 23 Mar 2023 10:33:24 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> After merging the block tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>=20
> In file included from arch/powerpc/include/asm/cmpxchg.h:6,
>                  from arch/powerpc/include/asm/atomic.h:11,
>                  from include/linux/atomic.h:7,
>                  from include/crypto/hash.h:11,
>                  from lib/iov_iter.c:2:
> lib/iov_iter.c: In function 'copy_page_to_iter_atomic':
> lib/iov_iter.c:546:22: error: implicit declaration of function 'iov_iter_=
is_pipe'; did you mean 'iov_iter_is_bvec'? [-Werror=3Dimplicit-function-dec=
laration]
>   546 |         if (unlikely(iov_iter_is_pipe(i))) {
>       |                      ^~~~~~~~~~~~~~~~
> include/linux/compiler.h:78:45: note: in definition of macro 'unlikely'
>    78 | # define unlikely(x)    __builtin_expect(!!(x), 0)
>       |                                             ^
> lib/iov_iter.c:547:26: error: implicit declaration of function 'copy_page=
_to_iter_pipe'; did you mean 'copy_page_to_iter'? [-Werror=3Dimplicit-funct=
ion-declaration]
>   547 |                 copied =3D copy_page_to_iter_pipe(page, offset, b=
ytes, i);
>       |                          ^~~~~~~~~~~~~~~~~~~~~~
>       |                          copy_page_to_iter
>=20
> Caused by commit
>=20
>   a53f5dee3448 ("iov_iter: Kill ITER_PIPE")
>=20
> interacting with commit
>=20
>   c4cf24ce34b7 ("iov_iter: add copy_page_to_iter_atomic()")
>=20
> from the mm tree.
>=20
> I have reverted that mm tree commit (and the following two commits)
> for today.

Having now read the followup messages to the merge conflict report, I
have gone back and fixed it up as suggested (see my other reply).

--=20
Cheers,
Stephen Rothwell

--Sig_/ED1RWZz0zVB5Us_eWv2dxvL
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmQblmUACgkQAVBC80lX
0GwjSwgAkbGag85HRogYTAhTPX19tOyvN5E92zUVFi6ZGj8Lt6JT8WSoVDxAQWv+
xDCw3hQCvVUemDr37J95QGyx3Q29jsCVsoOqx7dwx1Yw0G+ItpaeQR4E0Majd5FP
2kW3JdncegJL0YV+Dbb+6R9UbmeakdXh8BDkn9GhIXGJMl8GJU6KGvQKcDzyUpwv
coMQkepmTT/AjSZU7R1LV2y0bt+B7eUpxDOwLLe4CELOL6RQjDV8sy9BSZue0BL6
meakPoFhcORd9UbrJk6ZhLgYjqaVZ67YbUUnIJuALAfhjV1B/jawL7xyX6psJ9Nn
/oiPNqdJwMFFXmVu/wf8ltf8rpoHDg==
=cQ+/
-----END PGP SIGNATURE-----

--Sig_/ED1RWZz0zVB5Us_eWv2dxvL--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@vger.kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 3706CC74A5B
	for <linux-next@archiver.kernel.org>; Fri, 24 Mar 2023 01:57:18 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S231143AbjCXB5R (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Thu, 23 Mar 2023 21:57:17 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44140 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S231135AbjCXB5N (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Thu, 23 Mar 2023 21:57:13 -0400
Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D144B252A9;
        Thu, 23 Mar 2023 18:57:09 -0700 (PDT)
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4PjQLq634vz4x4r;
        Fri, 24 Mar 2023 12:57:07 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1679623028;
        bh=oHihvewVwDnXNl4zUqa8R15d/bxI1Sr8bzJkv0X3MpE=;
        h=Date:From:To:Cc:Subject:From;
        b=PmV+MbdAIcOKnyoID8DeC8lpkf5nXNWvbiqC5wMqtQNkIR7KNLeyec4Stc1aJWDZk
         yrtcLsR/Ibrw27P4EZX2dZxMJ8B6h+0apWNvsvPNJAz04LNxMXu2NAOOcwK1C/GHDH
         cSHW9QUCW99B+syUqMEkRgYTGqhXHOS8ESwVIxFJh5Scgjri5TgaohDx7/FaTxC+bl
         tFSZ31ONCiYb+xvv4JvvEGQn3otH8au5QKCDSwdZ0bqBMPKmrVYUPuz+PrA1zCFl9h
         DWV3pIIetflHZY1dyPHlb8A1IlUZ5eIELziIpi/BZkHNNVf39Nyqjj+GXtf7BNRlM4
         fDsDLQ5TxI9JQ==
Date:   Fri, 24 Mar 2023 12:57:06 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>,
        Andrew Morton <akpm@linux-foundation.org>
Cc:     Lorenzo Stoakes <lstoakes@gmail.com>,
        David Howells <dhowells@redhat.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20230324125706.2c6d955d@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/yP/MIZnYfmpXjMQbYCd6QXM";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/yP/MIZnYfmpXjMQbYCd6QXM
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

In file included from arch/powerpc/include/asm/cmpxchg.h:6,
                 from arch/powerpc/include/asm/atomic.h:11,
                 from include/linux/atomic.h:7,
                 from include/crypto/hash.h:11,
                 from lib/iov_iter.c:2:
lib/iov_iter.c: In function 'copy_page_to_iter_nofault':
lib/iov_iter.c:497:22: error: implicit declaration of function 'iov_iter_is=
_pipe'; did you mean 'iov_iter_is_bvec'? [-Werror=3Dimplicit-function-decla=
ration]
  497 |         if (unlikely(iov_iter_is_pipe(i)))
      |                      ^~~~~~~~~~~~~~~~
include/linux/compiler.h:78:45: note: in definition of macro 'unlikely'
   78 | # define unlikely(x)    __builtin_expect(!!(x), 0)
      |                                             ^
lib/iov_iter.c:498:24: error: implicit declaration of function 'copy_page_t=
o_iter_pipe'; did you mean 'copy_page_to_iter'? [-Werror=3Dimplicit-functio=
n-declaration]
  498 |                 return copy_page_to_iter_pipe(page, offset, bytes, =
i);
      |                        ^~~~~~~~~~~~~~~~~~~~~~
      |                        copy_page_to_iter

Caused by commit

  a53f5dee3448 ("iov_iter: Kill ITER_PIPE")

interacting with commit

  14116ab76dc2 ("iov_iter: add copy_page_to_iter_nofault()")

from the mm tree.

I have applied the following merge fix patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 24 Mar 2023 12:44:44 +1100
Subject: [PATCH] fix up for "iov_iter: add copy_page_to_iter_nofault()"

interatcing with "iov_iter: Kill ITER_PIPE"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 lib/iov_iter.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/iov_iter.c b/lib/iov_iter.c
index 9f4ec9adc036..f7b06366882b 100644
--- a/lib/iov_iter.c
+++ b/lib/iov_iter.c
@@ -494,8 +494,6 @@ size_t copy_page_to_iter_nofault(struct page *page, uns=
igned offset, size_t byte
 		return 0;
 	if (WARN_ON_ONCE(i->data_source))
 		return 0;
-	if (unlikely(iov_iter_is_pipe(i)))
-		return copy_page_to_iter_pipe(page, offset, bytes, i);
 	page +=3D offset / PAGE_SIZE; // first subpage
 	offset %=3D PAGE_SIZE;
 	while (1) {
--=20
2.39.2

--=20
Cheers,
Stephen Rothwell

--Sig_/yP/MIZnYfmpXjMQbYCd6QXM
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmQdA3IACgkQAVBC80lX
0GyzEgf/Se7iOpy7IJjKB2Wl8RN4aPMUQnF6+M1wfPTazJEpQtkXFRoNxDLnbCcZ
u9q87HxjmPbRiTxD+OMN+SCO2Fvcy5MnYNQpTH54ab3vob3s2CdkIf3ZOBgFfPPh
2LuZdGJsoWVMNAej23z8seWeFwO0Yih+3x+nkXK4/IQuBW/WEPLxo4jbWmi3Swlk
p3p7G/iR9xYWo7QkTiWe18n5YuauanJKyvde/0zBsHWODqvFgYU1KA0PqOORnLBY
Hc7v12RpcCjBQ3PMhm9eeqUtHz+nbtVkslf1wKT53lQiQSdAND9Gu1J9YuSKh/nh
48nMd+lQR1mVl9WqLOSM4XDJVafFqQ==
=B619
-----END PGP SIGNATURE-----

--Sig_/yP/MIZnYfmpXjMQbYCd6QXM--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@vger.kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id C9B64C77B7A
	for <linux-next@archiver.kernel.org>; Thu,  1 Jun 2023 00:50:20 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S230007AbjFAAuU (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Wed, 31 May 2023 20:50:20 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59194 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229476AbjFAAuT (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Wed, 31 May 2023 20:50:19 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 33A4B119;
        Wed, 31 May 2023 17:50:17 -0700 (PDT)
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4QWnbk75bZz4x4G;
        Thu,  1 Jun 2023 10:50:08 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1685580611;
        bh=eA7eocgBkId8q1Rlgtwq2v76SjWFhVtNa0dJ+BXsGdI=;
        h=Date:From:To:Cc:Subject:From;
        b=s8VwonAWvpwiuxncBmIEe7+p9sl+l2t0bG074II/TRNLkWveV9aJSWWbqy5/VL/vu
         YEHCEKiBmdD55IVvHSx390vnu1SN6OzmTkdkAs9lkddXcGFInGLeI/yRBu6QlJANIL
         6ipZ/cuqjNQX5ce+hhodkr6bc0algjqdQEIahktAX7x6dpfN1jqBuqZasKUcI0TPw0
         B7Y0vjjF0We7HuqdnSjqTUV5BpUMi2hoaJ61g8vk/Bha1YRGGxjXMBkuv1H0bJ7Psi
         suN9nHskg82j3ItmZGNKu2cK5k8ii7FH//5geo29pkkv+xP7/hAkaQKk0TZ0awUjoX
         +rWFEHMgbraXQ==
Date:   Thu, 1 Jun 2023 10:50:06 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Johannes Thumshirn <johannes.thumshirn@wdc.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20230601105006.199a32ee@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/=kVi1+ymLEM5YE_QaP+1+Vd";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/=kVi1+ymLEM5YE_QaP+1+Vd
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:

In file included from include/linux/slab.h:15,
                 from drivers/md/raid1.c:26:
drivers/md/raid1.c: In function 'alloc_behind_master_bio':
include/linux/gfp.h:320:36: error: passing argument 1 of 'free_pages' makes=
 integer from pointer without a cast [-Werror=3Dint-conversion]
  320 | #define free_page(addr) free_pages((addr), 0)
      |                                    ^~~~~~
      |                                    |
      |                                    struct page *
drivers/md/raid1.c:1151:25: note: in expansion of macro 'free_page'
 1151 |                         free_page(page);
      |                         ^~~~~~~~~
include/linux/gfp.h:303:38: note: expected 'long unsigned int' but argument=
 is of type 'struct page *'
  303 | extern void free_pages(unsigned long addr, unsigned int order);
      |                        ~~~~~~~~~~~~~~^~~~

Caused by commit

  6473bc325644 ("md: check for failure when adding pages in alloc_behind_ma=
ster_bio")

I have used the block tree from next-20230531 for today.

--=20
Cheers,
Stephen Rothwell

--Sig_/=kVi1+ymLEM5YE_QaP+1+Vd
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmR36z4ACgkQAVBC80lX
0GwgEQgAoehI9uDduHv7XyN1kvBumduCQsO8BMe/bNKP8n4hFT/ZqS5Vvhm1jejl
Qz0mllM32YnyV+A+TOkJM8wlhLku33glrR4CDQlSz1NTtuwNLfnbsfFPZRWxH3k9
dpEZHCfmW7XhsK1hHxI9ZnEIjU8EvElnyKswYr9/8HejbwrGa2QWRfL5fwSDHjLN
igJ714nXPs0qxhXx1XsPoM/MAnFl+1nyIJa3SZM15Fj3VDwPBrFkh7RtqodnIKRB
wWG4YPtcuk2slkDX2qW2f4yv/hde6He/PPCFpsa7uRXuLT/IO46qt+skRkIWFivm
tGHUV2CGMAqmZeQY7BivAtqFBAiPcg==
=RNiC
-----END PGP SIGNATURE-----

--Sig_/=kVi1+ymLEM5YE_QaP+1+Vd--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@vger.kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id D1580C77B7A
	for <linux-next@archiver.kernel.org>; Thu,  1 Jun 2023 08:27:33 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S232094AbjFAI1b (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Thu, 1 Jun 2023 04:27:31 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39422 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S232127AbjFAI1W (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Thu, 1 Jun 2023 04:27:22 -0400
Received: from esa4.hgst.iphmx.com (esa4.hgst.iphmx.com [216.71.154.42])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0486F193;
        Thu,  1 Jun 2023 01:27:16 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple;
  d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com;
  t=1685608037; x=1717144037;
  h=from:to:cc:subject:date:message-id:references:
   in-reply-to:content-id:content-transfer-encoding:
   mime-version;
  bh=GGsBDKdeW6O6g37ucrw/W8UPa6fL4BirW+KkoAI34u8=;
  b=CVHx9tB8SM4wzNuU/xi/YUquAd7eAs8x9lyTFfXylJLxFKupXVoZmi6A
   NfyMBWEBjoc193ifOQikx+15Nr81QCJH352hEBcZjVJO20WsQQ7WjvtPy
   sTMeCBWVOhDrL+UcZ8r1h7Y5gGFKSqgMbVliOitqChB7VbfEo46SKB1Fs
   4MrjrRTN0kFAVsKBZD5aTTPBlvuwb5Y71ux83JfHn7OAT8kLpqTptAxtI
   Gwz/xdjyBooGKZnB1h12YEyMloRQj36y+eh1OQoWJ/+mIcFT3filXZvYL
   8n3VMvNDayTkWOlE3h1jnqUXdbS/AAwhesm2f4jM5pPlZh4Pm+gQ6ikrT
   w==;
X-IronPort-AV: E=Sophos;i="6.00,209,1681142400"; 
   d="scan'208";a="230288324"
Received: from mail-co1nam11lp2177.outbound.protection.outlook.com (HELO NAM11-CO1-obe.outbound.protection.outlook.com) ([104.47.56.177])
  by ob1.hgst.iphmx.com with ESMTP; 01 Jun 2023 16:27:15 +0800
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
 b=C5zFNSIf4RuYQav9ydRkqzS7iNPQh0n1XUR9DZ2TrlzVbeDg0pm2iKrgIrIpZ2xpv0f15PgGTqA6pgePQOBpHDBGRyszakPWyyC1MWDN1giCRkTXNRmA5LmtepOJICe2HkkSVNaSlHm+8h1LVysHsidyyvnaKsGaLM7QAOoyAKuRmoawnFflphJ0WI1/vUS/wp02Hlx3tRh0IznIlA80hR1O3jFtBUHv9KyJpYaaiF9qK0mJegcCMu7zyLljmdA8934aKGILj9mXhgk8BmTK3YXGrOOB/UBOGM+36xBNnVTt4Hh/HMMzMHTFApX7Czu6SaPBLNg2576pv5DtkQMOJw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;
 s=arcselector9901;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;
 bh=GGsBDKdeW6O6g37ucrw/W8UPa6fL4BirW+KkoAI34u8=;
 b=LO9fPYGZr8nJzDlToy8Cu1T4mEhwimwJsLJzCq2PTlenv7epKq+yEX7bkpL+Z+iHktV5obR7dKurnHRlQg3HTu3wS5ZMMGrBVCFwM6oY4AXi50dXdA4ajILAE9oa62iW+Oj6vHfejICS18yrRvoG3t0YtGnAh2hUSDJkqnrCicQyJLHCpcjftGtk3q6zx3sEEqDogEjEEWfNors62E9IzV/GXrnINMzQ37p8uVG4DPhxOEOC6PXh2iMZlFGuE0bnPX4VPd6Ea3iGjBHo4Fjr/lOTE3pLC5n9YvvGnp6lhUXGzIV/OBOUDM3JFrpyANBWJTJi3L6PkrqnazlxVGW+2g==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass
 smtp.mailfrom=wdc.com; dmarc=pass action=none header.from=wdc.com; dkim=pass
 header.d=wdc.com; arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
 bh=GGsBDKdeW6O6g37ucrw/W8UPa6fL4BirW+KkoAI34u8=;
 b=G0xyTI2QPnvdt1lmhVSt8MK54hw83a0Omvi+vJcQsXuUd0fV29ngIxgAFDbfdPWUpMz/rixLMMSU4aB1++Cp5622aaiWUQ/B40S3gZ1U8LT217uummiaq5ocv8gHCsibvysWeXWRGtCHWoq/68kmMlybecQjgPu6fPz2HNWXuZM=
Received: from PH0PR04MB7416.namprd04.prod.outlook.com (2603:10b6:510:12::17)
 by BY1PR04MB8749.namprd04.prod.outlook.com (2603:10b6:a03:532::8) with
 Microsoft SMTP Server (version=TLS1_2,
 cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.24; Thu, 1 Jun
 2023 08:27:13 +0000
Received: from PH0PR04MB7416.namprd04.prod.outlook.com
 ([fe80::8c4d:6283:7b41:ed6f]) by PH0PR04MB7416.namprd04.prod.outlook.com
 ([fe80::8c4d:6283:7b41:ed6f%7]) with mapi id 15.20.6433.022; Thu, 1 Jun 2023
 08:27:12 +0000
From:   Johannes Thumshirn <Johannes.Thumshirn@wdc.com>
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Jens Axboe <axboe@kernel.dk>
CC:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the block tree
Thread-Topic: linux-next: build failure after merge of the block tree
Thread-Index: AQHZlCMajQjeNxowR0m7582L4M3PgK91nXKA
Date:   Thu, 1 Jun 2023 08:27:12 +0000
Message-ID: <012599f4-61cf-47df-0fda-4294d8573b83@wdc.com>
References: <20230601105006.199a32ee@canb.auug.org.au>
In-Reply-To: <20230601105006.199a32ee@canb.auug.org.au>
Accept-Language: en-US
Content-Language: en-US
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
user-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0)
 Gecko/20100101 Thunderbird/102.11.0
authentication-results: dkim=none (message not signed)
 header.d=none;dmarc=none action=none header.from=wdc.com;
x-ms-publictraffictype: Email
x-ms-traffictypediagnostic: PH0PR04MB7416:EE_|BY1PR04MB8749:EE_
x-ms-office365-filtering-correlation-id: 45f4d6a4-62f5-4c34-5be8-08db6279ffcd
wdcipoutbound: EOP-TRUE
x-ms-exchange-senderadcheck: 1
x-ms-exchange-antispam-relay: 0
x-microsoft-antispam: BCL:0;
x-microsoft-antispam-message-info:  
x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH0PR04MB7416.namprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(136003)(376002)(366004)(396003)(346002)(39860400002)(451199021)(83380400001)(66946007)(66556008)(64756008)(76116006)(66446008)(91956017)(71200400001)(6512007)(6506007)(66476007)(110136005)(186003)(2616005)(54906003)(86362001)(2906002)(5660300002)(8676002)(8936002)(478600001)(31696002)(38070700005)(4326008)(122000001)(82960400001)(38100700002)(316002)(36756003)(41300700001)(53546011)(6486002)(31686004)(43740500002)(45980500001)(414714003)(473944003);DIR:OUT;SFP:1102;
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?utf-8?B?NHhoL01LcGFBc2JHTkRaV2RvMVp6TWNoVzdXeklwaTJZRXJqMGpEL1pVMkM2?=
 =?utf-8?B?djVCS1l1T3JKcWtKS1FpbmZTSGRWOG1tVHFiU2FYVEtqZittMzV0dmdSeTdh?=
 =?utf-8?B?VjRWR0tZL0Rpcm5saGhGbEwrUUFoNUpuL1JtMy9pclM4V2EyM0gwRlNKbW0v?=
 =?utf-8?B?RmhZcExZa1RPWmRvaGNPYjRVRDhMd3BmNHlGUE4vaTNrQmVFN3JrMmJVRTBz?=
 =?utf-8?B?OTFScG1ZTVNrZnpBcTdaODVIeVVnangwbERsUmhBb0VVUUlTVXdVSjNqSiti?=
 =?utf-8?B?ay9DT0pxMmdIQ05TYTBZMm5seU1wc1hBaUZLbkh2TXZCL2tRS1NlWXRrK0Uw?=
 =?utf-8?B?dzNWWnl5WWIyeTQyVmJkSkpSMEQ4N2hRYmFGcTdzakwvM1oybUFaVlpRVGU5?=
 =?utf-8?B?ZHB2eGtxUUJmNHE1bjZjN3VYa2tLMFhLc3VMWktQbmRHM2xQM2RCcHgvSXVQ?=
 =?utf-8?B?NC94SHlmWFRHSU0rbGVrcmNWcmRNL0ZnZ3hFdHpPSXVXYzdaZWhKaTVwWGlM?=
 =?utf-8?B?MjRVRHhDMktpZkFjcE9iZUwxLzFDTzhpVTllY2VXaGpIQTlxT2d6TTRqU2lz?=
 =?utf-8?B?ZUNReUJFOTM5RzBtNzQzYTVaUzBDcENPN1NBcTQvTjJHaXBpUnhGZzI3SFVC?=
 =?utf-8?B?M0s1aDc2VUNaSXpNUVNVcjFCb1JEeTFOam1WTnhlRmZMTnpHakNFN0JaWG9H?=
 =?utf-8?B?ZjlRNGR6Ym96UnNEckc3SThESW1XeFVSSzE2VUxITkE0eFZrR2hzR2lRYXJE?=
 =?utf-8?B?c1ZwZXpsNUFydVF1VzJsREptSUFWZzVmQTRmWm5XUmtFU08vSE9QVjBGMnpl?=
 =?utf-8?B?OFZlSWxtWmtUbzZzdjNlRXdrc0xjYTZTKzNCWWNqdHpXcXd5dzdIMDIxYmJU?=
 =?utf-8?B?MHlsOEd6NjNBVEZzQzBMMmhNV0RBL0hGeVErQXFVNG81TlBnUjNVZyszdDBN?=
 =?utf-8?B?NUdObklocmtUVm0zbmlheXl5L0d0ME50aVBueFdmbHJrUW9iejJPNkc3c0k4?=
 =?utf-8?B?Y09wTEQ2TE1GQ1Y5SU1mMFJRaWc1SWZuejRwL0lpMExGYjNITWlNVlArY3B0?=
 =?utf-8?B?T1J4M1NVUE82WnV3TFNpR1BLOFVXS3liVkV5WE1LMWdnb0xMNWlTTzRaNEZj?=
 =?utf-8?B?eVp2SVhzM1JhY1E5YVZDbks2OVF3b2llYlNubSt5S09KbFh5YVpWemYvK2FW?=
 =?utf-8?B?cHhhdmRyMllHRDRMRWpOeEQ4NWRhOEFDdnpZTm9tUUZGWmhYWTVHa2FQSFdk?=
 =?utf-8?B?TXBuSlArVFNVOWdVMXdiNzNGbGIvdEd1YU54MDlHbkIzcHJYaERHa0Uwc25s?=
 =?utf-8?B?QkRKM1oyOWhNZkt3ZkpYenRzN3NIdXhsUTRJd3AxZlFKNTlxUitqRXBtYzVF?=
 =?utf-8?B?UXd1ZlRScTZTWlFVU0FxSGdQc2tka3VCMGhUblZ3dWdlNFR4eTZkUTBSNlV5?=
 =?utf-8?B?RktLdWd6MVZhZ2dEaXNMaXBFcWZCTnNWZmZoSFBtdVZzS0NMeFJzMXhyeVlu?=
 =?utf-8?B?U0V2Y3hWUmh6NThVVDY1N1dRRTZUMWxRZ3lZemtGWkNVLzJ3cDBkOGVvMUNQ?=
 =?utf-8?B?UUFCZmlXOS95dC9ZSWRXcVZESERDaUhMSU9xdjZsUU52c09zZXVZdXRJWWcz?=
 =?utf-8?B?dGhGREt3NXBvaGI0SERSOWFwaVVScGUzRDQ0VngrbW0xY1ZVdDB2cm41c0N2?=
 =?utf-8?B?OWMrZFg4N0J4bmRpYXlSWng3U0FYemRhTzBWUHhwMDB5TVFMTlVGbGZQZU5i?=
 =?utf-8?B?TmdTOFYxRGhwWGxvRldzV1lpNW9qM2Z6OWVqY0pYWGI0elR1UWI0U0Jwbm1h?=
 =?utf-8?B?UmlBemlnZnRSNmNoYVlEelVWM2hKSFRrTFJTU2NpV3hTMy9iSTBKNVBvczBQ?=
 =?utf-8?B?QnNkU0xGblF5UXZIZDFrL2NVeS9RUEJNNkRUeU1xeDNvVWxIRHNzTkhOU25l?=
 =?utf-8?B?dVVVRVJVM2NMNkFkVnRwdTVnR3pFai9YYkladjlQTk9YNklrQnYra3h4NGl0?=
 =?utf-8?B?SEo1U3hlY1NpeTc5cXA4QzRBUTc0cTFya0JlNmVtR28wclRWUFo1bmdOV3R3?=
 =?utf-8?B?QldsNkFnVHhJN0ovUDF2NjVycVRXeTJVWG15U3hLR1BtWUFwR3FYTzNuZEdv?=
 =?utf-8?B?OTZRMXRQT0I5TU9tNjZuVldtOTQyaTAyUXpyeVpLNTlJbEJKa1pHbVlSWCtZ?=
 =?utf-8?B?NkEyOStKNEpqS1RoY3hFVVJ5U2FPaHg4NGNUMkJWbElvUVdZRThSSlpnR3VM?=
 =?utf-8?B?UUx6K2YzdWU5Y05mWStoQzIvRm9BPT0=?=
Content-Type: text/plain; charset="utf-8"
Content-ID: <533B94255DB9B045BABF618DF3E3F702@namprd04.prod.outlook.com>
Content-Transfer-Encoding: base64
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0:  
X-OriginatorOrg: wdc.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: PH0PR04MB7416.namprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 45f4d6a4-62f5-4c34-5be8-08db6279ffcd
X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Jun 2023 08:27:12.4827
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: wftbhG14tp6iJnfivN/x/ibFQa7gzngcGFi8XbZ81KhMjUGojd9mYiPH1mEYGChZdMRe29nRQpWG6Onbq3TqgyN+WZPp5zVQQgE1W2IslJY=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR04MB8749
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

T24gMDEuMDYuMjMgMDI6NTAsIFN0ZXBoZW4gUm90aHdlbGwgd3JvdGU6DQo+IEhpIGFsbCwNCj4g
DQo+IEFmdGVyIG1lcmdpbmcgdGhlIGJsb2NrIHRyZWUsIHRvZGF5J3MgbGludXgtbmV4dCBidWls
ZCAoeDg2XzY0DQo+IGFsbG1vZGNvbmZpZykgZmFpbGVkIGxpa2UgdGhpczoNCj4gDQo+IEluIGZp
bGUgaW5jbHVkZWQgZnJvbSBpbmNsdWRlL2xpbnV4L3NsYWIuaDoxNSwNCj4gICAgICAgICAgICAg
ICAgICBmcm9tIGRyaXZlcnMvbWQvcmFpZDEuYzoyNjoNCj4gZHJpdmVycy9tZC9yYWlkMS5jOiBJ
biBmdW5jdGlvbiAnYWxsb2NfYmVoaW5kX21hc3Rlcl9iaW8nOg0KPiBpbmNsdWRlL2xpbnV4L2dm
cC5oOjMyMDozNjogZXJyb3I6IHBhc3NpbmcgYXJndW1lbnQgMSBvZiAnZnJlZV9wYWdlcycgbWFr
ZXMgaW50ZWdlciBmcm9tIHBvaW50ZXIgd2l0aG91dCBhIGNhc3QgWy1XZXJyb3I9aW50LWNvbnZl
cnNpb25dDQo+ICAgMzIwIHwgI2RlZmluZSBmcmVlX3BhZ2UoYWRkcikgZnJlZV9wYWdlcygoYWRk
ciksIDApDQo+ICAgICAgIHwgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBefn5+
fn4NCj4gICAgICAgfCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwNCj4gICAg
ICAgfCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0cnVjdCBwYWdlICoNCj4g
ZHJpdmVycy9tZC9yYWlkMS5jOjExNTE6MjU6IG5vdGU6IGluIGV4cGFuc2lvbiBvZiBtYWNybyAn
ZnJlZV9wYWdlJw0KPiAgMTE1MSB8ICAgICAgICAgICAgICAgICAgICAgICAgIGZyZWVfcGFnZShw
YWdlKTsNCj4gICAgICAgfCAgICAgICAgICAgICAgICAgICAgICAgICBefn5+fn5+fn4NCj4gaW5j
bHVkZS9saW51eC9nZnAuaDozMDM6Mzg6IG5vdGU6IGV4cGVjdGVkICdsb25nIHVuc2lnbmVkIGlu
dCcgYnV0IGFyZ3VtZW50IGlzIG9mIHR5cGUgJ3N0cnVjdCBwYWdlIConDQo+ICAgMzAzIHwgZXh0
ZXJuIHZvaWQgZnJlZV9wYWdlcyh1bnNpZ25lZCBsb25nIGFkZHIsIHVuc2lnbmVkIGludCBvcmRl
cik7DQo+ICAgICAgIHwgICAgICAgICAgICAgICAgICAgICAgICB+fn5+fn5+fn5+fn5+fl5+fn4N
Cj4gDQo+IENhdXNlZCBieSBjb21taXQNCj4gDQo+ICAgNjQ3M2JjMzI1NjQ0ICgibWQ6IGNoZWNr
IGZvciBmYWlsdXJlIHdoZW4gYWRkaW5nIHBhZ2VzIGluIGFsbG9jX2JlaGluZF9tYXN0ZXJfYmlv
IikNCj4gDQo+IEkgaGF2ZSB1c2VkIHRoZSBibG9jayB0cmVlIGZyb20gbmV4dC0yMDIzMDUzMSBm
b3IgdG9kYXkuDQo+IA0KDQpUaGlzIG9idmlvdXNseSBoYXMgdG8gYmU6DQpkaWZmIC0tZ2l0IGEv
ZHJpdmVycy9tZC9yYWlkMS5jIGIvZHJpdmVycy9tZC9yYWlkMS5jDQppbmRleCBmZjg5ODM5NDU1
ZWMuLjM1NzBkYTYzOTY5YiAxMDA2NDQNCi0tLSBhL2RyaXZlcnMvbWQvcmFpZDEuYw0KKysrIGIv
ZHJpdmVycy9tZC9yYWlkMS5jDQpAQCAtMTE0OCw3ICsxMTQ4LDcgQEAgc3RhdGljIHZvaWQgYWxs
b2NfYmVoaW5kX21hc3Rlcl9iaW8oc3RydWN0IHIxYmlvICpyMV9iaW8sDQogICAgICAgICAgICAg
ICAgICAgICAgICBnb3RvIGZyZWVfcGFnZXM7DQogDQogICAgICAgICAgICAgICAgaWYgKCFiaW9f
YWRkX3BhZ2UoYmVoaW5kX2JpbywgcGFnZSwgbGVuLCAwKSkgew0KLSAgICAgICAgICAgICAgICAg
ICAgICAgZnJlZV9wYWdlKHBhZ2UpOw0KKyAgICAgICAgICAgICAgICAgICAgICAgcHV0X3BhZ2Uo
cGFnZSk7DQogICAgICAgICAgICAgICAgICAgICAgICBnb3RvIGZyZWVfcGFnZXM7DQogICAgICAg
ICAgICAgICAgfQ0KIA0KDQpCdXQgSSB3b25kZXIgd2h5IEkgZGludCBzZWUgaXQgaW4gbXkgYWxs
bW9kY29uZmlnIGJ1aWxkLiANCg0KSmVucyBjYW4geW91IGZvbGQgdGhhdCBpbiBvciBkbyB5b3Ug
d2FudCBtZSB0byB1cGRhdGUgdGhlIHBhdGNoPw0K

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@vger.kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 24A1FC77B7A
	for <linux-next@archiver.kernel.org>; Thu,  1 Jun 2023 15:15:24 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S233640AbjFAPPX (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Thu, 1 Jun 2023 11:15:23 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55102 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S233520AbjFAPPW (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Thu, 1 Jun 2023 11:15:22 -0400
Received: from mail-il1-x131.google.com (mail-il1-x131.google.com [IPv6:2607:f8b0:4864:20::131])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E7F5B3
        for <linux-next@vger.kernel.org>; Thu,  1 Jun 2023 08:15:21 -0700 (PDT)
Received: by mail-il1-x131.google.com with SMTP id e9e14a558f8ab-33d0c740498so411105ab.0
        for <linux-next@vger.kernel.org>; Thu, 01 Jun 2023 08:15:21 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20221208.gappssmtp.com; s=20221208; t=1685632521; x=1688224521;
        h=content-transfer-encoding:in-reply-to:from:references:cc:to
         :content-language:subject:user-agent:mime-version:date:message-id
         :from:to:cc:subject:date:message-id:reply-to;
        bh=o+F3XMekuXHuWIgCSsQ++NIeXO+URcOh8EvMjy2nv14=;
        b=doSleAE9iQ/fpG1saj/46RDsYLT1lJm+nUEQsc0hOBi+JduFCGX96cOElqbWWtLJF4
         otk+cVw4cPewhN61uTgHXhQ1aIa4zlsFklZ41SKrLAeCn2hYw4OkhYIZxFjYyPN3BmZL
         awbRRWPTT2o0041A9dZq2lnUA6vVwNL/muHUvut5+YwI+K7PbOeVAqUGmL/+IhXzhNmT
         ZLHEpBB2gMuTXIG542iAz5cyOSEebnKuIhZ4OntHaLZdaeNUhbVUQniG7iHVdRN1q3/f
         bmXELU8QSBhq8dtaUJCuMVD0UCxVP4rDRSwBOmtJLuKLwLWNshaLztUOWIW1m3CB92eP
         h8ww==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20221208; t=1685632521; x=1688224521;
        h=content-transfer-encoding:in-reply-to:from:references:cc:to
         :content-language:subject:user-agent:mime-version:date:message-id
         :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
        bh=o+F3XMekuXHuWIgCSsQ++NIeXO+URcOh8EvMjy2nv14=;
        b=gY+3mAgWKrvYeEwcyzLKta26vQnpHc+jS2DQYTv+vZKBFvjTHzdNGe17qowMxillmp
         5w4eMSdEtrvH4QjwvWJVLmYymOUEJifCACU57AUxFA/N+RSnKgtkWu9B4FAkIkQlWrdQ
         DOH8di58nPY6KWQquAPRBTWVTXdwxhsTj2t8vTek4zOe+cLKk0T6Y6ZgQFATJ35d+6G3
         rt3QhA5XmPZDGk09svFO6BMp8K2nvKdG1nxQC/CEAxSMU305zU9GXGDF/0Oa88jDBY5a
         zMgITtbjXG9d9Up2BDmBOMoutCh3a01oazjUs0S5FFqvyVou6Nq66DWriemhgMqMlnlT
         TuKQ==
X-Gm-Message-State: AC+VfDwmrJijy4DUsxmLpIMOX0rDmjSXRMPcKr8+BhnuSWxT6eACA3Jl
        +9MzbZulQ2nJ7VzbFgSTgYxIn1nTtYkZ+Ro7Mfk=
X-Google-Smtp-Source: ACHHUZ4aDwWmm0SZGc5Yo3Cxv+brXsxD3GkC3hDRE0VQJCew9TUC5FzFyjCzBbRrX2pALjky/Pryvw==
X-Received: by 2002:a92:3652:0:b0:33b:1b5d:9723 with SMTP id d18-20020a923652000000b0033b1b5d9723mr3255265ilf.3.1685632520982;
        Thu, 01 Jun 2023 08:15:20 -0700 (PDT)
Received: from [192.168.1.94] ([96.43.243.2])
        by smtp.gmail.com with ESMTPSA id h17-20020a92d091000000b0033079f435f7sm3862149ilh.65.2023.06.01.08.14.21
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Thu, 01 Jun 2023 08:14:30 -0700 (PDT)
Message-ID: <416030d0-f8f1-23b0-875c-ad75880aca4f@kernel.dk>
Date:   Thu, 1 Jun 2023 09:14:09 -0600
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux aarch64; rv:102.0) Gecko/20100101
 Thunderbird/102.11.0
Subject: Re: linux-next: build failure after merge of the block tree
Content-Language: en-US
To:     Johannes Thumshirn <Johannes.Thumshirn@wdc.com>,
        Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20230601105006.199a32ee@canb.auug.org.au>
 <012599f4-61cf-47df-0fda-4294d8573b83@wdc.com>
From:   Jens Axboe <axboe@kernel.dk>
In-Reply-To: <012599f4-61cf-47df-0fda-4294d8573b83@wdc.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 6/1/23 2:27 AM, Johannes Thumshirn wrote:
> On 01.06.23 02:50, Stephen Rothwell wrote:
>> Hi all,
>>
>> After merging the block tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> In file included from include/linux/slab.h:15,
>>                  from drivers/md/raid1.c:26:
>> drivers/md/raid1.c: In function 'alloc_behind_master_bio':
>> include/linux/gfp.h:320:36: error: passing argument 1 of 'free_pages' makes integer from pointer without a cast [-Werror=int-conversion]
>>   320 | #define free_page(addr) free_pages((addr), 0)
>>       |                                    ^~~~~~
>>       |                                    |
>>       |                                    struct page *
>> drivers/md/raid1.c:1151:25: note: in expansion of macro 'free_page'
>>  1151 |                         free_page(page);
>>       |                         ^~~~~~~~~
>> include/linux/gfp.h:303:38: note: expected 'long unsigned int' but argument is of type 'struct page *'
>>   303 | extern void free_pages(unsigned long addr, unsigned int order);
>>       |                        ~~~~~~~~~~~~~~^~~~
>>
>> Caused by commit
>>
>>   6473bc325644 ("md: check for failure when adding pages in alloc_behind_master_bio")
>>
>> I have used the block tree from next-20230531 for today.
>>
> 
> This obviously has to be:
> diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
> index ff89839455ec..3570da63969b 100644
> --- a/drivers/md/raid1.c
> +++ b/drivers/md/raid1.c
> @@ -1148,7 +1148,7 @@ static void alloc_behind_master_bio(struct r1bio *r1_bio,
>                         goto free_pages;
>  
>                 if (!bio_add_page(behind_bio, page, len, 0)) {
> -                       free_page(page);
> +                       put_page(page);
>                         goto free_pages;
>                 }
>  
> 
> But I wonder why I dint see it in my allmodconfig build. 
> 
> Jens can you fold that in or do you want me to update the patch?

Done

-- 
Jens Axboe



From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 15ED0AD39;
	Thu, 21 Dec 2023 03:01:27 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="msOHwjfu"
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
	s=201702; t=1703127686;
	bh=S0WymPy34W2d4KzOacMTp93C73SdBRl/bJcClUs3eoQ=;
	h=Date:From:To:Cc:Subject:From;
	b=msOHwjfu7US9+VCSsdS1JvVAofWaoFe70cw9xuT7t/u7pDUj6MsSMSCeKLXLXJj0d
	 eQ/I8y1voSqwcS6BdP8AOw5PzAw9CPjScO7jnu7ZCC8AKEs0Q1Dy80oUBgxYfIeBvP
	 TCAmE3I6X7/l/URdHiMROLiDL3R3Z2mVxFYcRRFK67scTe4vLqQgpQUS9gD8NIUeuo
	 a+oqN1f0Uupr+tgJ6sELHxEt5o/zw2cZs9cqLqXDuEGZZVT2RNAQ++5C59MssKK6Or
	 IdsJylkweHI5VNlWDCP5Wv7MbBeWgZUA9fY9Y8ZO4pelOPu0Slwo7XsFEspyJIAcz1
	 PrlKXr66DEKLw==
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by mail.ozlabs.org (Postfix) with ESMTPSA id 4SwZvV3xSRz4x5m;
	Thu, 21 Dec 2023 14:01:26 +1100 (AEDT)
Date: Thu, 21 Dec 2023 14:01:24 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jens Axboe <axboe@kernel.dk>
Cc: Christoph Hellwig <hch@lst.de>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20231221140124.16418659@canb.auug.org.au>
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/OqGlL=TCOqe9Hw_H4pzM0/q";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/OqGlL=TCOqe9Hw_H4pzM0/q
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:

ERROR: modpost: "disk_clear_zoned" [drivers/scsi/sd_mod.ko] undefined!

Caused by commit

  d73e93b4dfab ("block: simplify disk_set_zoned")

I have used the block tree from next-20231220 for today.

--=20
Cheers,
Stephen Rothwell

--Sig_/OqGlL=TCOqe9Hw_H4pzM0/q
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWDqoQACgkQAVBC80lX
0GxFgAf9GRxZ9eE3qM7WS9sJzmUmBQLp6b95Ab4n2cwqm7Jy51zrwBbLebEQb5nC
j4RZVunCTL6zqvEjNr+Tme21GthEnzm55/lu8vqsbDz5FIkrTIVcoVhSDN/BUGDo
Hyor18lkc75tIHU70HAJVn4fctOJXTnviSuTcJdIV0n625NqzvGkseNOTQR3Do31
4XTGHMvcBiIYS4bIsyjKyxw4Sp6kxGSKP7YJJAcCX+uE2WDBvISj9H/rJ19YUOu6
DqRn2Y6bZX3ZOv46zhDRMuhDo7ij3B4oWggirlniMm0LppfjhNz2lWP4Nc05eYGi
H2o6I22dZ2zUDxC7Y7DHd8+cbRVH1A==
=nq7S
-----END PGP SIGNATURE-----

--Sig_/OqGlL=TCOqe9Hw_H4pzM0/q--

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail-oa1-f51.google.com (mail-oa1-f51.google.com [209.85.160.51])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9E37B522D
	for <linux-next@vger.kernel.org>; Thu, 21 Dec 2023 03:11:08 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="Lb02DA8y"
Received: by mail-oa1-f51.google.com with SMTP id 586e51a60fabf-2037ef59df0so38481fac.1
        for <linux-next@vger.kernel.org>; Wed, 20 Dec 2023 19:11:08 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1703128267; x=1703733067; darn=vger.kernel.org;
        h=content-transfer-encoding:in-reply-to:from:references:cc:to
         :content-language:subject:user-agent:mime-version:date:message-id
         :from:to:cc:subject:date:message-id:reply-to;
        bh=GmEy/1G532CwG4AT34Q355aJksdu1DlJSbYzFg/dkLY=;
        b=Lb02DA8yI0ZzNiZMrd7deVBNfSO1uEPUEQkNKQ37Rxprq1KJqCeqNEK5PXfhy4RRLX
         mr4X/xbtZLv7tTbnm7eRRgWIMQDP+QE8t6O8V8Hfh1XsO2oW4nBOX7gDSFOH4ixA+Q/E
         o4X3tRH4Ic8d+TKvH5cvP4LaI43QBn0DwJCRGLa52H9ityQQyeKUykYnfKMF1EUgvdoa
         +YKz+959qzQMrpchlsVLfR1UloI8GTMrF0OpVqmaH4Q/Qr9f6IN8J1Py5cYqMyI57Nzf
         63HJiWUNmhvf9bHiGE20lNPSGbegNlYVOaXECz6Jtrcqt3/x3V3bWogwz5vd9MtYmoiS
         XAbg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1703128267; x=1703733067;
        h=content-transfer-encoding:in-reply-to:from:references:cc:to
         :content-language:subject:user-agent:mime-version:date:message-id
         :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
        bh=GmEy/1G532CwG4AT34Q355aJksdu1DlJSbYzFg/dkLY=;
        b=Ld8aCszjxrLx8EINbySkW29rwaJ9j6Wv/YvNyxrIgx2lbUuTWXw7lkze55AWAy3W3h
         ORlDYWmYzWOYnBWZxBNmdPVzH05tc4+/2bW0DRv1vxTDorusxGARxDCTRp0ekU4pPPVE
         3oOjaR+mqDco95JLvQyiHNsg4LgKWm2Ycu8pJEU44DRH6Tqy6jKN9BQmCMGKX2Pn0W29
         CmpAMHs3hl2hEpnDuNOwBppQX8QjHdjMBLm7nwn84hWzhYC3WTQp5kgfssX4aMG2ATBe
         ajjdL9yHQkBy1/bamH8Oy74BraDVK5mYRweGudtS5tmU5SC+3/Bp2tBFw5L73c8mOLdw
         9Q/Q==
X-Gm-Message-State: AOJu0YwQ7u/0rxKH3d2hzQ7Y6Vj3mavuxiuBtn4pLnKXx2Kj5yiw/jsc
	Gsm8vuWX2wAzsnoz4lDB9k7a0w==
X-Google-Smtp-Source: AGHT+IFDsk18QMxGkQpEbC1aT1ITuGrkbqfiR5rv1/05sf2oXeBRRGrXZKdrnOA470/dBajOFYhwOQ==
X-Received: by 2002:a05:6358:5284:b0:172:d475:20b0 with SMTP id g4-20020a056358528400b00172d47520b0mr14803788rwa.3.1703128267299;
        Wed, 20 Dec 2023 19:11:07 -0800 (PST)
Received: from [192.168.1.150] ([198.8.77.194])
        by smtp.gmail.com with ESMTPSA id u3-20020a056a00124300b006ce39a397b9sm476306pfi.48.2023.12.20.19.11.06
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Wed, 20 Dec 2023 19:11:06 -0800 (PST)
Message-ID: <afa3550e-f522-4243-a7ef-da171628c345@kernel.dk>
Date: Wed, 20 Dec 2023 20:11:05 -0700
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: linux-next: build failure after merge of the block tree
Content-Language: en-US
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Christoph Hellwig <hch@lst.de>,
 Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
 Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20231221140124.16418659@canb.auug.org.au>
From: Jens Axboe <axboe@kernel.dk>
In-Reply-To: <20231221140124.16418659@canb.auug.org.au>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

On 12/20/23 8:01 PM, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> ERROR: modpost: "disk_clear_zoned" [drivers/scsi/sd_mod.ko] undefined!
> 
> Caused by commit
> 
>   d73e93b4dfab ("block: simplify disk_set_zoned")

Oops, yes that's missing an export. I'll queue on up.

-- 
Jens Axboe



From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from verein.lst.de (verein.lst.de [213.95.11.211])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id DC4F39461;
	Thu, 21 Dec 2023 05:26:03 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=lst.de
Received: by verein.lst.de (Postfix, from userid 2407)
	id CC00168C7B; Thu, 21 Dec 2023 06:25:59 +0100 (CET)
Date: Thu, 21 Dec 2023 06:25:59 +0100
From: Christoph Hellwig <hch@lst.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jens Axboe <axboe@kernel.dk>, 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: build failure after merge of the block tree
Message-ID: <20231221052559.GB24611@lst.de>
References: <20231221140124.16418659@canb.auug.org.au>
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20231221140124.16418659@canb.auug.org.au>
User-Agent: Mutt/1.5.17 (2007-11-01)

On Thu, Dec 21, 2023 at 02:01:24PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> ERROR: modpost: "disk_clear_zoned" [drivers/scsi/sd_mod.ko] undefined!

Oops, yes - disk_clear_zoned needs an export to allow for a modular sd
driver.  I'll send a fix.

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id B467C14882B;
	Fri, 10 May 2024 03:10:05 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1715310610; cv=none; b=mzCDeagMKd+MqJVYZMGCpcK5loMWsLwnPiDVzxxTncHkPcYl5BmUD1Y2+lxj2FOAmJMurQKKmAqA+xKXLTftIgxMd/HJrBwaKjoOPPUUNKBhv3A4Y1iDWPuKYf2GgQvFxs8/5DrnC6K3nklAVSbB2NtXi+N+qlozP/FXJPr2jY0=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1715310610; c=relaxed/simple;
	bh=QuOINjcFX6oWWss922e1TM2DKRD7Tn6ri+SmvpyWv9A=;
	h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=rXIY3l6OdZYwTNs59sHyUc4ARV64PFoEkZJJPnQG/wB6dv1Mc+OLBOxD4pofnNnACUXfsVsxw72vUlkanw91B8o5dNDWqkr/u6nVv2GLsVgxCevaRYQjcJ+IMcyF5QpMibPGhCXelE7Yg5tq5XXbL3VDZ1ZU+qPZKmn/6g9e31I=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=AzjyrkUZ; arc=none smtp.client-ip=150.107.74.76
Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="AzjyrkUZ"
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
	s=201702; t=1715310604;
	bh=zIu1WBLBpuAIUz5eXi4REEW5GA6h3Sk+aWeTT7FQQbo=;
	h=Date:From:To:Cc:Subject:From;
	b=AzjyrkUZMufbbbS3P8/BHIg/lSSxVqoTOahyzqyV3UQxwoyy0rjrfm7A/Ivx2jXl4
	 qxWBheElFEegldRXjat/x0eyQIdDvvnUb2CvcqqobVLUTCRY0hGPNI/tEraqSE8SGD
	 6EPTu5rvhioYR9w77yS0yvVb+GzWpLTy/LGOehHkfqz96bdGzvfGKMXYjpSvaP/IfQ
	 L08jctxC7tp+WVHtsL8QrMGthM8dqsxe5umwCS7pG3V/BZmH7mCYEFAgAHgDLsLxP1
	 QsJVyqlqy2hDhVfuOzUQQfD1DtqRh08CIJIRHgxYGPchidbcz0uuIMYRZupMtKCJYn
	 ARQ3FEHZ7jncQ==
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by mail.ozlabs.org (Postfix) with ESMTPSA id 4VbDQM6G7dz4wc5;
	Fri, 10 May 2024 13:10:03 +1000 (AEST)
Date: Fri, 10 May 2024 13:10:03 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jens Axboe <axboe@kernel.dk>, Al Viro <viro@zeniv.linux.org.uk>
Cc: Damien Le Moal <dlemoal@kernel.org>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20240510131003.70f46881@canb.auug.org.au>
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/CA8QBtHjdZ7LNPB0JHKF2Uf";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/CA8QBtHjdZ7LNPB0JHKF2Uf
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:

block/blk-zoned.c: In function 'blk_zone_write_plug_bio_endio':
block/blk-zoned.c:1260:25: error: 'struct block_device' has no member named=
 'bd_has_submit_bio'
 1260 |         if (bio->bi_bdev->bd_has_submit_bio)
      |                         ^~
block/blk-zoned.c: In function 'blk_zone_wplug_bio_work':
block/blk-zoned.c:1329:17: error: 'struct block_device' has no member named=
 'bd_has_submit_bio'
 1329 |         if (bdev->bd_has_submit_bio)
      |                 ^~

Caused by commit

  dd291d77cc90 ("block: Introduce zone write plugging")

interacting with commit

  ac2b6f9dee8f ("bdev: move ->bd_has_subit_bio to ->__bd_flags")

from the vfs tree.

I have applied the following merge resolution patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 10 May 2024 12:59:09 +1000
Subject: [PATCH] fix up for "bdev: move ->bd_has_subit_bio to ->__bd_flags"

interacting with "block: Introduce zone write plugging".

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 block/blk-zoned.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/block/blk-zoned.c b/block/blk-zoned.c
index 57d367ada1f2..03aa4eead39e 100644
--- a/block/blk-zoned.c
+++ b/block/blk-zoned.c
@@ -1257,7 +1257,7 @@ void blk_zone_write_plug_bio_endio(struct bio *bio)
 	 * is not called. So we need to schedule execution of the next
 	 * plugged BIO here.
 	 */
-	if (bio->bi_bdev->bd_has_submit_bio)
+	if (bdev_test_flag(bio->bi_bdev, BD_HAS_SUBMIT_BIO))
 		disk_zone_wplug_unplug_bio(disk, zwplug);
=20
 	/* Drop the reference we took when entering this function. */
@@ -1326,7 +1326,7 @@ static void blk_zone_wplug_bio_work(struct work_struc=
t *work)
 	 * path for BIO-based devices will not do that. So drop this extra
 	 * reference here.
 	 */
-	if (bdev->bd_has_submit_bio)
+	if (bdev_test_flag(bdev, BD_HAS_SUBMIT_BIO))
 		blk_queue_exit(bdev->bd_disk->queue);
=20
 put_zwplug:
--=20
2.43.0

--=20
Cheers,
Stephen Rothwell

--Sig_/CA8QBtHjdZ7LNPB0JHKF2Uf
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmY9kAsACgkQAVBC80lX
0GwbEAf/adypU03m99zkCNZ0GBjnS+iK2E9ZNM04woxhPKQMknfgOkLaQLyfaFHD
oL9n2SIzPZ+sh44ulM9QSh+XO2zjSMtbpB4pQMBxc+OOMHVJZxwJlo82iupPldZF
wt8xut7Cstu+gu44o2YBKV4C0zVgf0jnMCgJKCO7eIAcvbZONAE8kELVmszYkRUZ
JfuDqfmUVFDYsxLp7mWtPpusLCo8Whbw4YXMcSmCVjgQaO6GMDFw/+0jwedoRiBj
jHNMcQ8bFt2dIrUciIXJBklnqVIBQ6aqEOvhIsgQpOtvLZaJdZnSz7ju9Z86yCf/
km+Nzq5AR+Uo23Z6IJGqtPkLMqxvHQ==
=oZHg
-----END PGP SIGNATURE-----

--Sig_/CA8QBtHjdZ7LNPB0JHKF2Uf--

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5640915279B;
	Fri, 10 May 2024 07:22:26 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1715325746; cv=none; b=mdIb1Yuq97lPhNNwI6x4Ow8LgfgvRnLhQ5bWNJOqc9vmtFsDUL0CQBKvo/N7+LAm/+QGhule8qNtO5d5xpmCPz6KcV/4+owqh9uZ1Z9c4PBBCR+uHozR1J6U3O2isBSrgPlygBoabvup9SsP2JW0p/ampzWEXHBLuznaLly1+eU=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1715325746; c=relaxed/simple;
	bh=EzdfZ0kpf3fhUbIFDljCEYBvplIrKON70GWCiQd1UDM=;
	h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:
	 In-Reply-To:Content-Type; b=VaRo/XLDdR4il2fdNXqZsc4jwpfLFF6cLyxsLEW6tJYyzXbqsD6bh987+rfZUBiEza59Gl1YyXWtjx/LSWouzRH1U8V3MasfGXpm+TOk7spqhfF+vMpW0Ysqan3sSe7t3YfBwj15ybwgKGu/fcKnveHYXMnpF3LA43ztW5QdOe4=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iQPMddhw; arc=none smtp.client-ip=10.30.226.201
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="iQPMddhw"
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4962DC113CC;
	Fri, 10 May 2024 07:22:25 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
	s=k20201202; t=1715325746;
	bh=EzdfZ0kpf3fhUbIFDljCEYBvplIrKON70GWCiQd1UDM=;
	h=Date:Subject:To:Cc:References:From:In-Reply-To:From;
	b=iQPMddhweUBjd9ncDSrkcRN3oMPdHf4DboeeRHGz8m9kRzalpIecEE5K2u4Kr6CBR
	 x9HZsB/Cvuz1fw69VhodG65NIhgtGF/miuq7c5g4WoCaZVUD18fMjRI9TAofvOyOo3
	 iJSf23KyS6oZdoU/77MnMhxNbOcJJeTTQ8Tt8pCndYkk0W7yg2vnl58omSssN4zZ8X
	 wgoE8y3xFTEiFIOmFrSe2TO13uUPNH8fBKDWa/CkDu+cOHS/N9igs8yKIStmugXkw5
	 I9wHUEcxnHf8oe5XHnLN1I2lIrRYFEtrkt3fypgnjgG/F2l/c9OFa0MpvgaVxOxdxF
	 VO9LiiMR4fWtw==
Message-ID: <3f293b59-0992-4d39-8473-283a8dcbbf43@kernel.org>
Date: Fri, 10 May 2024 16:22:24 +0900
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: linux-next: build failure after merge of the block tree
To: Stephen Rothwell <sfr@canb.auug.org.au>, Jens Axboe <axboe@kernel.dk>,
 Al Viro <viro@zeniv.linux.org.uk>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
 Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20240510131003.70f46881@canb.auug.org.au>
From: Damien Le Moal <dlemoal@kernel.org>
Content-Language: en-US
Organization: Western Digital Research
In-Reply-To: <20240510131003.70f46881@canb.auug.org.au>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

On 5/10/24 12:10, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> block/blk-zoned.c: In function 'blk_zone_write_plug_bio_endio':
> block/blk-zoned.c:1260:25: error: 'struct block_device' has no member named 'bd_has_submit_bio'
>  1260 |         if (bio->bi_bdev->bd_has_submit_bio)
>       |                         ^~
> block/blk-zoned.c: In function 'blk_zone_wplug_bio_work':
> block/blk-zoned.c:1329:17: error: 'struct block_device' has no member named 'bd_has_submit_bio'
>  1329 |         if (bdev->bd_has_submit_bio)
>       |                 ^~
> 
> Caused by commit
> 
>   dd291d77cc90 ("block: Introduce zone write plugging")
> 
> interacting with commit
> 
>   ac2b6f9dee8f ("bdev: move ->bd_has_subit_bio to ->__bd_flags")
> 
> from the vfs tree.
> 
> I have applied the following merge resolution patch.

Looks good to me. Thanks Stephen !

> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 10 May 2024 12:59:09 +1000
> Subject: [PATCH] fix up for "bdev: move ->bd_has_subit_bio to ->__bd_flags"
> 
> interacting with "block: Introduce zone write plugging".
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  block/blk-zoned.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/block/blk-zoned.c b/block/blk-zoned.c
> index 57d367ada1f2..03aa4eead39e 100644
> --- a/block/blk-zoned.c
> +++ b/block/blk-zoned.c
> @@ -1257,7 +1257,7 @@ void blk_zone_write_plug_bio_endio(struct bio *bio)
>  	 * is not called. So we need to schedule execution of the next
>  	 * plugged BIO here.
>  	 */
> -	if (bio->bi_bdev->bd_has_submit_bio)
> +	if (bdev_test_flag(bio->bi_bdev, BD_HAS_SUBMIT_BIO))
>  		disk_zone_wplug_unplug_bio(disk, zwplug);
>  
>  	/* Drop the reference we took when entering this function. */
> @@ -1326,7 +1326,7 @@ static void blk_zone_wplug_bio_work(struct work_struct *work)
>  	 * path for BIO-based devices will not do that. So drop this extra
>  	 * reference here.
>  	 */
> -	if (bdev->bd_has_submit_bio)
> +	if (bdev_test_flag(bdev, BD_HAS_SUBMIT_BIO))
>  		blk_queue_exit(bdev->bd_disk->queue);
>  
>  put_zwplug:

-- 
Damien Le Moal
Western Digital Research


From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3C5BD85C42;
	Mon, 13 May 2024 23:53:38 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1715644421; cv=none; b=IrJsyPu/cQURE+wbywi3PLOThEZOgUpBrVH7fLyUZgZ+yKhlJzbvF2it2USWMDHEkb10DRA+ed/uI4zEpWPqirqdwtndeltHG8IiMOXfkqmZDYKbqOVWygXBmLULkIUHvqffw+C/4hbSw4QgVlbWkzezPwrpg9yGS7JNwMas/zE=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1715644421; c=relaxed/simple;
	bh=R/KylpXSXNvGKAiTGKjpx8UwgnUX+GBGMiz5pPzku6s=;
	h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References:
	 MIME-Version:Content-Type; b=fOphjwz3PevUhH3djBFlNNnjfOnoF/DW8VCOdm3AcX4NaaP/D/PS20NmzWmozagWhklLjofng8wrviBFBiHNNyKRznb2ZUY50wW8LaNrlAuA5HIe5XjXTphq6YCpxr7uukA8rY5XAzZmTWKDY7Lu7WKr9XAzmDIVn4CxorTvBos=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=luRtVw/9; arc=none smtp.client-ip=150.107.74.76
Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="luRtVw/9"
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
	s=201702; t=1715644417;
	bh=nrX0QnSujQBcrtoDk0rMMTUg0PNEV0q40s3RZ7bbSG4=;
	h=Date:From:To:Cc:Subject:In-Reply-To:References:From;
	b=luRtVw/9c5vJtIXfTK3jZAetTYnmiLMQfjZDWIWVXnCvgH77gnB56xkHocfQJNL+r
	 chWcXETXg8CdgBdS38EWVf5W/PHUF06x59Y6qUXwIrOQFLiTbXZNXG83s3XpDTqsxA
	 w2NP68VvF/+XNmqxPZ5T1qtAOJJAmVt/sollEYAvatSGsCKbekdbCXGD5wk/yzoDOC
	 +rhDOmL31lgkUYpRnwAc+5hRdpCJcbLvuKDwIPWvs4RaSNK6bUgVFTC1QbmcbJAusH
	 Ef+geWdhxThLJD7bifBI7PuYRPUiycXdMVXLO5SDk4cYGBjMsjxSCcEgNVnxZ9kZFG
	 toRpkjZGyV7Mw==
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by mail.ozlabs.org (Postfix) with ESMTPSA id 4Vdbsr6PlMz4wbr;
	Tue, 14 May 2024 09:53:36 +1000 (AEST)
Date: Tue, 14 May 2024 09:53:36 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@zeniv.linux.org.uk>
Cc: Jens Axboe <axboe@kernel.dk>, Damien Le Moal <dlemoal@kernel.org>, Linux
 Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the block tree
Message-ID: <20240514095336.5b805453@canb.auug.org.au>
In-Reply-To: <20240510131003.70f46881@canb.auug.org.au>
References: <20240510131003.70f46881@canb.auug.org.au>
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/fo57KRCbyFjjZQkD81OmLOp";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/fo57KRCbyFjjZQkD81OmLOp
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Fri, 10 May 2024 13:10:03 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>=20
> block/blk-zoned.c: In function 'blk_zone_write_plug_bio_endio':
> block/blk-zoned.c:1260:25: error: 'struct block_device' has no member nam=
ed 'bd_has_submit_bio'
>  1260 |         if (bio->bi_bdev->bd_has_submit_bio)
>       |                         ^~
> block/blk-zoned.c: In function 'blk_zone_wplug_bio_work':
> block/blk-zoned.c:1329:17: error: 'struct block_device' has no member nam=
ed 'bd_has_submit_bio'
>  1329 |         if (bdev->bd_has_submit_bio)
>       |                 ^~
>=20
> Caused by commit
>=20
>   dd291d77cc90 ("block: Introduce zone write plugging")
>=20
> interacting with commit
>=20
>   ac2b6f9dee8f ("bdev: move ->bd_has_subit_bio to ->__bd_flags")
>=20
> from the vfs tree.
>=20
> I have applied the following merge resolution patch.
>=20
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 10 May 2024 12:59:09 +1000
> Subject: [PATCH] fix up for "bdev: move ->bd_has_subit_bio to ->__bd_flag=
s"
>=20
> interacting with "block: Introduce zone write plugging".
>=20
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  block/blk-zoned.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>=20
> diff --git a/block/blk-zoned.c b/block/blk-zoned.c
> index 57d367ada1f2..03aa4eead39e 100644
> --- a/block/blk-zoned.c
> +++ b/block/blk-zoned.c
> @@ -1257,7 +1257,7 @@ void blk_zone_write_plug_bio_endio(struct bio *bio)
>  	 * is not called. So we need to schedule execution of the next
>  	 * plugged BIO here.
>  	 */
> -	if (bio->bi_bdev->bd_has_submit_bio)
> +	if (bdev_test_flag(bio->bi_bdev, BD_HAS_SUBMIT_BIO))
>  		disk_zone_wplug_unplug_bio(disk, zwplug);
> =20
>  	/* Drop the reference we took when entering this function. */
> @@ -1326,7 +1326,7 @@ static void blk_zone_wplug_bio_work(struct work_str=
uct *work)
>  	 * path for BIO-based devices will not do that. So drop this extra
>  	 * reference here.
>  	 */
> -	if (bdev->bd_has_submit_bio)
> +	if (bdev_test_flag(bdev, BD_HAS_SUBMIT_BIO))
>  		blk_queue_exit(bdev->bd_disk->queue);
> =20
>  put_zwplug:
> --=20
> 2.43.0

This is now a semantic conflict between the vfs tree and Linus' tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/fo57KRCbyFjjZQkD81OmLOp
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZCqAAACgkQAVBC80lX
0Gxclwf/V6HIcsyWW98hZSKTFWyKVQIoS2XYHiiXXKaE6iKD6jiKvJnk/Km/CCIN
uTJPZOvarDDIylH5r+Eg2Y6u6wNIq85qhlOWbBWwoVmvK9SX5GN4jo77mJEoT6SB
tca64lvZA/XCKBjloC7p8GK+4e7YVGVNA7tS85oQVUELJq74/5kQGouYSopGheJY
Z/cP8hEu+9ehVBlHp6ndEpAPcU2WFVcPsWhaXm+fAzI/Qt3vJgAgGx4btWXVdKN0
/Dy5jYyeCnQE9Slt3TgIhkXkw2ZvRMtt+maHKXn0bPYf25WHam4aCY1WN0sPk0S1
tR4v4sAXHpDJng7IaZcRbqqLkXAr2A==
=p9oD
-----END PGP SIGNATURE-----

--Sig_/fo57KRCbyFjjZQkD81OmLOp--

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 58B2084FBA;
	Fri, 21 Jun 2024 15:40:31 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1718984432; cv=none; b=BoEDDMHaUwq7NYzcBGePUQ7VJCezawKHm6znlJF6qsQ0b99Wx2hhVvuaGwtylUWEHXH8r6OdRVhXkOrAH3pKrdWJhbjrSXQjIY1GdsM0GsiIDhL6zsB7LZaLVYUzW0E/1AjnjxWN5byaGJoWmcV5VM72oz9amZrQ3DZW0y9805g=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1718984432; c=relaxed/simple;
	bh=OxLZ01Q4rKpn9nahG7smR9yP/lKHOyiMDvY7tTjmwjE=;
	h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type:
	 Content-Disposition; b=u1sJcx/GzxT/fx/nlKKXCFPy8FWuxYfEs1ihCEWjgDyS1Yizg5XlQcWLGm3x7e+QTQecScjiCr1oJk7RKkIJ9QrgLNJlYHxO4AbS9KhRC8dsmUoCRDQorlP+HfsxYGA33bT0TRbLa52Jq68/OOZ11b8tfcVj7vinpXaFYH+l7zg=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WLQmNHKS; arc=none smtp.client-ip=10.30.226.201
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="WLQmNHKS"
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 49AC7C2BBFC;
	Fri, 21 Jun 2024 15:40:29 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
	s=k20201202; t=1718984430;
	bh=OxLZ01Q4rKpn9nahG7smR9yP/lKHOyiMDvY7tTjmwjE=;
	h=Date:From:To:Cc:Subject:From;
	b=WLQmNHKSQzDP5ozjFKrGiG8rLbc6gUqk4duBlW2+em9kbgUpVfi2bDI5pJ3j8OqnR
	 0GXG2inZ3nA1eqNmkwYCY3ojYQUpKOqPQmNdng3cx54tcG4e5QGFT429K+UD0fmvUh
	 8sIIJJKjBwFDdMXAcu2T5vTrXurs9vICFGHpUqUU2ZEmhu7uQuQpX3Uqc/QBAR4MBM
	 df75fF3zeAlOfs9K0Yj+Cht4+mFutvTRooHMUeIOowsZmh5y1KpMcA9y3xk0RNkkqZ
	 mhpja+8FFBlE/trTCMsH1+4/X3Wj6xYSdK55UJCMZkznkCngDH5fK2VQ805dE1tCNM
	 0EMd5N2+skzKQ==
Date: Fri, 21 Jun 2024 16:40:26 +0100
From: Mark Brown <broonie@kernel.org>
To: Jens Axboe <axboe@kernel.dk>,
	Himanshu Madhani <himanshu.madhani@oracle.com>,
	"Martin K. Petersen" <martin.petersen@oracle.com>,
	John Garry <john.g.garry@oracle.com>,
	Keith Busch <kbusch@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <ZnWe6sXMxm4RXBcM@sirena.org.uk>
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="c8bBl3qlcgbS79K7"
Content-Disposition: inline


--c8bBl3qlcgbS79K7
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi all,

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

In file included from /tmp/next/build/include/linux/printk.h:10,
                 from /tmp/next/build/include/linux/kernel.h:31,
                 from /tmp/next/build/block/blk-settings.c:5:
/tmp/next/build/block/blk-settings.c: In function 'blk_validate_atomic_write_limits':
/tmp/next/build/include/asm-generic/div64.h:222:35: warning: comparison of distinct pointer types lacks a cast
  222 |         (void)(((typeof((n)) *)0) == ((uint64_t *)0));  \
      |                                   ^~
/tmp/next/build/include/linux/once_lite.h:28:41: note: in definition of macro 'DO_ONCE_LITE_IF'
   28 |                 bool __ret_do_once = !!(condition);                     \
      |                                         ^~~~~~~~~
/tmp/next/build/block/blk-settings.c:200:21: note: in expansion of macro 'WARN_ON_ONCE'
  200 |                 if (WARN_ON_ONCE(do_div(chunk_sectors, boundary_sectors)))
      |                     ^~~~~~~~~~~~
/tmp/next/build/block/blk-settings.c:200:34: note: in expansion of macro 'do_div'
  200 |                 if (WARN_ON_ONCE(do_div(chunk_sectors, boundary_sectors)))
      |                                  ^~~~~~
/tmp/next/build/include/asm-generic/div64.h:234:32: warning: right shift count >= width of type [-Wshift-count-overflow]
  234 |         } else if (likely(((n) >> 32) == 0)) {          \
      |                                ^~
/tmp/next/build/include/linux/once_lite.h:28:41: note: in definition of macro 'DO_ONCE_LITE_IF'
   28 |                 bool __ret_do_once = !!(condition);                     \
      |                                         ^~~~~~~~~
/tmp/next/build/block/blk-settings.c:200:21: note: in expansion of macro 'WARN_ON_ONCE'
  200 |                 if (WARN_ON_ONCE(do_div(chunk_sectors, boundary_sectors)))
      |                     ^~~~~~~~~~~~
/tmp/next/build/include/asm-generic/div64.h:234:20: note: in expansion of macro 'likely'
  234 |         } else if (likely(((n) >> 32) == 0)) {          \
      |                    ^~~~~~
/tmp/next/build/block/blk-settings.c:200:34: note: in expansion of macro 'do_div'
  200 |                 if (WARN_ON_ONCE(do_div(chunk_sectors, boundary_sectors)))
      |                                  ^~~~~~
/tmp/next/build/include/asm-generic/div64.h:238:36: error: passing argument 1 of '__div64_32' from incompatible pointer type [-Werror=incompatible-pointer-types]
  238 |                 __rem = __div64_32(&(n), __base);       \
      |                                    ^~~~
      |                                    |
      |                                    unsigned int *
/tmp/next/build/include/linux/once_lite.h:28:41: note: in definition of macro 'DO_ONCE_LITE_IF'
   28 |                 bool __ret_do_once = !!(condition);                     \
      |                                         ^~~~~~~~~
/tmp/next/build/block/blk-settings.c:200:21: note: in expansion of macro 'WARN_ON_ONCE'
  200 |                 if (WARN_ON_ONCE(do_div(chunk_sectors, boundary_sectors)))
      |                     ^~~~~~~~~~~~
/tmp/next/build/block/blk-settings.c:200:34: note: in expansion of macro 'do_div'
  200 |                 if (WARN_ON_ONCE(do_div(chunk_sectors, boundary_sectors)))
      |                                  ^~~~~~
In file included from /tmp/next/build/include/linux/math.h:6,
                 from /tmp/next/build/include/linux/kernel.h:27,
                 from /tmp/next/build/block/blk-settings.c:5:
/tmp/next/build/arch/arm/include/asm/div64.h:24:45: note: expected 'uint64_t *' {aka 'long long unsigned int *'} but argument is of type 'unsigned int *'
   24 | static inline uint32_t __div64_32(uint64_t *n, uint32_t base)
      |                                   ~~~~~~~~~~^
cc1: some warnings being treated as errors


Caused by commit

  9da3d1e912f ("block: Add core atomic write support")

I have used the version from yesterday instead.

--c8bBl3qlcgbS79K7
Content-Type: application/pgp-signature; name="signature.asc"

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

iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmZ1nukACgkQJNaLcl1U
h9BLSQf9FYDRLLA4CfM/8znj9w9t2q4Kyqpw0aX14AwxNfZavIf1KFL4G8gJEMvC
u1vv1c0r6Vnv0bQZ55lUUBhDjFRqAXo/DOCdTPGJWTZt/i7Ob2oTuXLBgC5SQNgp
SJWo8K0UFPwnPfv5Ol6gBvzD84ePWr8bgxwfCBJr5sVoViCplAaM2lc0+u3pYcvr
Jo1e6woYRk/zmjPysgeC7CaYZ+hjJ6LIyVpnpBklC1YPAVm0O1m6Ac7XOdDCj2lJ
N0SzHUKAMWUuG2w3gP/Rv9bHHloHmz6audDNMF4v78Tm/7F5ENzey292q+NAKdCS
LFb2KpN9utEIcccZlmqyw+LyDjezxQ==
=wob+
-----END PGP SIGNATURE-----

--c8bBl3qlcgbS79K7--

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail-oo1-f51.google.com (mail-oo1-f51.google.com [209.85.161.51])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7124D155740
	for <linux-next@vger.kernel.org>; Fri, 21 Jun 2024 15:58:33 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.51
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1718985515; cv=none; b=NdZAfRTTRjBe3bl/3+CMR53I5QeEmls1Pl3ECK73go/h0p9WctlxL9HpyEMoHLgFTnVvLSet+6AWbHFkdFsVl7xtMK0UhBra+iurq/dZRHNZ5xlD2gszzd6yAUomjM/+up6nY5EgHwihIP1tDHS4xuZCBlFSavBqtccr5x0PN84=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1718985515; c=relaxed/simple;
	bh=3UIMAYr0GTp2I66AHFUjwMyTq9B2vZn8DbyR5JzRAN8=;
	h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:
	 In-Reply-To:Content-Type; b=mhezoCT5beoC3ApNGqkZ7sqTtQNXFdAKbdUYnosq1qcDlIvg87rbA4oEcnrbRhFbSSG1KEckg99bgrpom4+dRsfNd8AJqJPsZ8PROLymIrT409+1xnefNi+E9VY2cqCjtzse0nLCw/+5A9Lgr8VbRbSlhjKhbkAFWWlMxIy24gg=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=Vq2mQA1/; arc=none smtp.client-ip=209.85.161.51
Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="Vq2mQA1/"
Received: by mail-oo1-f51.google.com with SMTP id 006d021491bc7-5c1b75d6bebso159890eaf.2
        for <linux-next@vger.kernel.org>; Fri, 21 Jun 2024 08:58:33 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1718985512; x=1719590312; darn=vger.kernel.org;
        h=content-transfer-encoding:in-reply-to:from:content-language
         :references:cc:to:subject:user-agent:mime-version:date:message-id
         :from:to:cc:subject:date:message-id:reply-to;
        bh=zI5gho4SWI3tLX2PaKtRVIXf0XZ8P9P7DFyRR6lK/8o=;
        b=Vq2mQA1/4sibyU3HX5irzwwxXD3S+4uCfw/16g8tS0tscEaOn6lr5TONB4WVADym75
         Yep9E5E6jIYxc5knz+LGz08n2DsJgbLeUNw6oLV6YR6Rfzv6iJSsTdBDT2cOZTQkFMts
         o5v9DUXfIQJDFKbc1ynFoZMOiHcirr2qRvmKI1hrf3AyvfJ7jYM1GF0EEmZpV8KrWtWh
         xLhYNXfTz21Uzo8Ye4SmWro679yDRB8M3OI2qOqyZk/JXnD6o+XIshaaYmvTqNSJS8fl
         9S1hyrsbmfwgcmSxzmoHKaZMuqF0eo+VhzVo/Mahyr8a3slQP2l3sE+6lL8S/cyCIIrH
         zqng==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1718985512; x=1719590312;
        h=content-transfer-encoding:in-reply-to:from:content-language
         :references:cc:to:subject:user-agent:mime-version:date:message-id
         :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
        bh=zI5gho4SWI3tLX2PaKtRVIXf0XZ8P9P7DFyRR6lK/8o=;
        b=h36Ld7JBZiBakjAs4nvLh+w4obd2idDY7hx1xJd/EJHLc1sR67hakOzjshviYDJ7aT
         XTHheABGfdlZLjn7X1+oP2Vi9p4dPC/ap350GMzO9CDYkK6ADkdsQsZ3YkVscp7XV2Y6
         8zbXnLEy6iyN1NnvKGLzmAbfQl/ZC/R5bRFwF4GSB/zwvLA+pPc/OOl36nxWglcAYNya
         srNvaZ2oE+XJKumnezcsQHcaTjoIBxojlWYSdJuZOUG4qAuCLdjTASCKa4ChzCDfQXpi
         nocMN6pP8sSR6ZC7D0csJEXf8PNmjDljkWLkVnmEley8jbDUPbabR6OOaeWz/anMbwjT
         QLhw==
X-Forwarded-Encrypted: i=1; AJvYcCUsBOwUqaqPCbnPX/UL2onjMZCqlzbk0BYBljnzeO3xlNyMrDdp8T9HXlwgBFdjtLifMo/0tQ5VywoYqRkAlqC4KugNMQicnWkHbA==
X-Gm-Message-State: AOJu0YzvBZB7tI/wV6zTqktQXFy5txlRbvsz7WariSsS+1mtS6RT2dWs
	gcSGMyia9lUtKL0whcaIr6riMBIyEih8GR7lxofdUxTX4fKfUVuyL/g69uG6sF0=
X-Google-Smtp-Source: AGHT+IFSRIaKMyH4YhiGk4aGWXjVi8ieLNZJUsWApX35VL2Ivfcnqmp9Q1f4xA4Rgv0Gvi8B5KHeiQ==
X-Received: by 2002:a4a:a34c:0:b0:5bd:ad72:15d3 with SMTP id 006d021491bc7-5c1adba8ce3mr8163825eaf.1.1718985512480;
        Fri, 21 Jun 2024 08:58:32 -0700 (PDT)
Received: from [192.168.1.116] ([96.43.243.2])
        by smtp.gmail.com with ESMTPSA id 006d021491bc7-5c1d55da4a0sm308713eaf.21.2024.06.21.08.58.31
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Fri, 21 Jun 2024 08:58:32 -0700 (PDT)
Message-ID: <670625c0-a288-4166-9209-2eccc5ee97c3@kernel.dk>
Date: Fri, 21 Jun 2024 09:58:29 -0600
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: linux-next: build failure after merge of the block tree
To: Mark Brown <broonie@kernel.org>,
 Himanshu Madhani <himanshu.madhani@oracle.com>,
 "Martin K. Petersen" <martin.petersen@oracle.com>,
 John Garry <john.g.garry@oracle.com>, Keith Busch <kbusch@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
 Linux Next Mailing List <linux-next@vger.kernel.org>
References: <ZnWe6sXMxm4RXBcM@sirena.org.uk>
Content-Language: en-US
From: Jens Axboe <axboe@kernel.dk>
In-Reply-To: <ZnWe6sXMxm4RXBcM@sirena.org.uk>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

On 6/21/24 9:40 AM, Mark Brown wrote:
> Hi all,
> 
> After merging the block tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> In file included from /tmp/next/build/include/linux/printk.h:10,
>                  from /tmp/next/build/include/linux/kernel.h:31,
>                  from /tmp/next/build/block/blk-settings.c:5:
> /tmp/next/build/block/blk-settings.c: In function 'blk_validate_atomic_write_limits':
> /tmp/next/build/include/asm-generic/div64.h:222:35: warning: comparison of distinct pointer types lacks a cast
>   222 |         (void)(((typeof((n)) *)0) == ((uint64_t *)0));  \
>       |                                   ^~
> /tmp/next/build/include/linux/once_lite.h:28:41: note: in definition of macro 'DO_ONCE_LITE_IF'
>    28 |                 bool __ret_do_once = !!(condition);                     \
>       |                                         ^~~~~~~~~
> /tmp/next/build/block/blk-settings.c:200:21: note: in expansion of macro 'WARN_ON_ONCE'
>   200 |                 if (WARN_ON_ONCE(do_div(chunk_sectors, boundary_sectors)))
>       |                     ^~~~~~~~~~~~
> /tmp/next/build/block/blk-settings.c:200:34: note: in expansion of macro 'do_div'
>   200 |                 if (WARN_ON_ONCE(do_div(chunk_sectors, boundary_sectors)))
>       |                                  ^~~~~~
> /tmp/next/build/include/asm-generic/div64.h:234:32: warning: right shift count >= width of type [-Wshift-count-overflow]
>   234 |         } else if (likely(((n) >> 32) == 0)) {          \
>       |                                ^~
> /tmp/next/build/include/linux/once_lite.h:28:41: note: in definition of macro 'DO_ONCE_LITE_IF'
>    28 |                 bool __ret_do_once = !!(condition);                     \
>       |                                         ^~~~~~~~~
> /tmp/next/build/block/blk-settings.c:200:21: note: in expansion of macro 'WARN_ON_ONCE'
>   200 |                 if (WARN_ON_ONCE(do_div(chunk_sectors, boundary_sectors)))
>       |                     ^~~~~~~~~~~~
> /tmp/next/build/include/asm-generic/div64.h:234:20: note: in expansion of macro 'likely'
>   234 |         } else if (likely(((n) >> 32) == 0)) {          \
>       |                    ^~~~~~
> /tmp/next/build/block/blk-settings.c:200:34: note: in expansion of macro 'do_div'
>   200 |                 if (WARN_ON_ONCE(do_div(chunk_sectors, boundary_sectors)))
>       |                                  ^~~~~~
> /tmp/next/build/include/asm-generic/div64.h:238:36: error: passing argument 1 of '__div64_32' from incompatible pointer type [-Werror=incompatible-pointer-types]
>   238 |                 __rem = __div64_32(&(n), __base);       \
>       |                                    ^~~~
>       |                                    |
>       |                                    unsigned int *
> /tmp/next/build/include/linux/once_lite.h:28:41: note: in definition of macro 'DO_ONCE_LITE_IF'
>    28 |                 bool __ret_do_once = !!(condition);                     \
>       |                                         ^~~~~~~~~
> /tmp/next/build/block/blk-settings.c:200:21: note: in expansion of macro 'WARN_ON_ONCE'
>   200 |                 if (WARN_ON_ONCE(do_div(chunk_sectors, boundary_sectors)))
>       |                     ^~~~~~~~~~~~
> /tmp/next/build/block/blk-settings.c:200:34: note: in expansion of macro 'do_div'
>   200 |                 if (WARN_ON_ONCE(do_div(chunk_sectors, boundary_sectors)))
>       |                                  ^~~~~~
> In file included from /tmp/next/build/include/linux/math.h:6,
>                  from /tmp/next/build/include/linux/kernel.h:27,
>                  from /tmp/next/build/block/blk-settings.c:5:
> /tmp/next/build/arch/arm/include/asm/div64.h:24:45: note: expected 'uint64_t *' {aka 'long long unsigned int *'} but argument is of type 'unsigned int *'
>    24 | static inline uint32_t __div64_32(uint64_t *n, uint32_t base)
>       |                                   ~~~~~~~~~~^
> cc1: some warnings being treated as errors

We need something ala:

diff --git a/block/blk-settings.c b/block/blk-settings.c
index 37fe4c8f6b6b..cd33eaba4610 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -175,7 +175,7 @@ static void blk_atomic_writes_update_limits(struct queue_limits *lim)
 
 static void blk_validate_atomic_write_limits(struct queue_limits *lim)
 {
-	unsigned int chunk_sectors = lim->chunk_sectors;
+	u64 chunk_sectors = lim->chunk_sectors;
 	unsigned int boundary_sectors;
 
 	if (!lim->atomic_write_hw_max)

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 84C0750A80;
	Fri, 21 Jun 2024 17:03:07 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32
ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1718989389; cv=fail; b=mFKWRdnBkY0SSwqjWUW7+kd+yfM2bjxsg6Bjxem6xSg639mhCrURLr5mlljY22rwow3oxIqQ5xLhqvxBLAoI4ZrKatNNXchh8U6C5EM91Q9PctiXgArlNy1eHQURSO/qcZCQTcLgx8PKYdRWNU6+lCdlDy5Gjeb5w776Gyckdmg=
ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1718989389; c=relaxed/simple;
	bh=7AIjB6uHJ9zcQOlNzzsU3MUgTkTEoQgNdl2Wfdd5og0=;
	h=Message-ID:Date:Subject:To:Cc:References:From:In-Reply-To:
	 Content-Type:MIME-Version; b=FEjvMsh4lN40wPv5xgjXq2Qdnp6bCbKr5PUf8gHPyntmjeg9Ihx7UXn2gdG4dXjcn1gJNy1KcF2qXYwPdTCJDbsoS1a28K8NqH+LJLerNSAvIRsp9lqnizxW1d5LWqg9ZTX4voqDVsyIQf8OY0lOq8dSUhfRUmKOBK9/JqlRdwk=
ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=CzihfSta; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=CqX40lrR; arc=fail smtp.client-ip=205.220.177.32
Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="CzihfSta";
	dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="CqX40lrR"
Received: from pps.filterd (m0333520.ppops.net [127.0.0.1])
	by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 45LEXcw6026327;
	Fri, 21 Jun 2024 17:02:55 GMT
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=
	message-id:date:subject:to:cc:references:from:in-reply-to
	:content-type:content-transfer-encoding:mime-version; s=
	corp-2023-11-20; bh=raMqml6rV4nNsjUiSBuicXR/s0dF/L72fxERWEtODLQ=; b=
	CzihfStaQ+RQlQQRtPS6Xuvee2jRB/MGihmDoTWNl8HmIOXIxb8QPx+LKni7NleO
	nI3+A4HlQnIxg2AjGN2vxbN7NF5AV4M7NF9RQp2bp6mWq7DpoZ4IDB3DiE6gr6pW
	Ewjn6wyz78GOU+h2QjkigD5Qv54tU04oyR6Ps9zS9nYNbq0q+C3U/daPCVFxgYLT
	0E8DoiAIYq1bORB9C8CWGX1oc3xJ1jyPjmgJg7yQI1qBu/M0tM3c9yzkufez/yXB
	NnQputx5K9F0+PKER0lW4ru2NFvrR53k3nr15/KBGih9NqzF/fFI7nNZyh2N0YQz
	6Swlivt1mNpMNjEs+Fy1/w==
Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2])
	by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3yvrkft646-1
	(version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);
	Fri, 21 Jun 2024 17:02:55 +0000 (GMT)
Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1])
	by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 45LGrJvr039970;
	Fri, 21 Jun 2024 17:02:54 GMT
Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2045.outbound.protection.outlook.com [104.47.66.45])
	by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3yvrn4k26j-1
	(version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);
	Fri, 21 Jun 2024 17:02:54 +0000
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
 b=Ypnssmco3qKLW7kgtk4hh6heXeiu+k8VMzSbMZ3CyFcOh/tawSEvh5wkoX2bPSmpdG7slnBMoxkMmr084ZgaohdCD2qptZJ7h2vYHhNSIETJxUercv6Y8OdQTjp0v2QkCpup89nJBIrD7YwdyF+Y7lqsAs2SVi1ge3IR+CMe/zBRJbk5BQGJcNs9uN5kpLxGXiMJ7O7nLvWm0h2UY0AZMLUqcxqOZN54WQKyn7HSyW90EGBiHdJJO2F0IZ32FE9NDvuQZ3FFFekr3Ef0OKEwmBkHzGnACFdDuLXBWpSZ8jKM+W6nPJ/6GOjuMon3drkhGrp5RFuG1R4Gd8R3MPMQdw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;
 s=arcselector9901;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;
 bh=raMqml6rV4nNsjUiSBuicXR/s0dF/L72fxERWEtODLQ=;
 b=OVjhgu60wjHMU0EzIwm2wpLxu91VzC4nMysasf4r1ibRKxNFLJXeSZBKGBP2zOdqEcWJ4WpeTjV8QlTtCgOARPXhDl75Hu2BXgyp6nnvQNMA4eZGqiZVlre+ITM8KXUEQCLiQl2byZzZWoR9CZ4hmoW/7dGvDl05tmdgq/d9nCcFki1gelKYoGPVSxTDOKMo8TEbgdVBYTGQ1htKjv3dukRyWD0B/tyz14OKQv1vc+Kp+Vd8vrkouRJB6rVSrzrogYaKbL4urHW28zokRt9ihSZo7M+jm+gexkPHzaDLnprXwN/OPDB8F7HHqespxw3QhapbN64do4Ucg/zO2YVdKA==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass
 smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com;
 dkim=pass header.d=oracle.com; arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
 bh=raMqml6rV4nNsjUiSBuicXR/s0dF/L72fxERWEtODLQ=;
 b=CqX40lrRGT0jcntDQyW4RtoFRoF9CVOgbfiVqPDTo0aeJJoSWsvSGPAbtFFpNQvVzHv0EFGWe49AOGYGVSx2QPfcgwXEYnmt0ij7ptZS1Gut00p+xjk1tHJ/U6OGm2udMiQH+QU79nIejAGaTOH/u6efSUSq31Y2V3ddZWYLqMc=
Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20)
 by SA2PR10MB4521.namprd10.prod.outlook.com (2603:10b6:806:117::16) with
 Microsoft SMTP Server (version=TLS1_2,
 cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7698.21; Fri, 21 Jun
 2024 17:02:52 +0000
Received: from DM6PR10MB4313.namprd10.prod.outlook.com
 ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com
 ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.7698.020; Fri, 21 Jun 2024
 17:02:52 +0000
Message-ID: <b098bd2d-f308-4383-b348-98f9904ca28a@oracle.com>
Date: Fri, 21 Jun 2024 18:02:47 +0100
User-Agent: Mozilla Thunderbird
Subject: Re: linux-next: build failure after merge of the block tree
To: Jens Axboe <axboe@kernel.dk>, Mark Brown <broonie@kernel.org>,
        Himanshu Madhani <himanshu.madhani@oracle.com>,
        "Martin K. Petersen" <martin.petersen@oracle.com>,
        Keith Busch <kbusch@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <ZnWe6sXMxm4RXBcM@sirena.org.uk>
 <670625c0-a288-4166-9209-2eccc5ee97c3@kernel.dk>
Content-Language: en-US
From: John Garry <john.g.garry@oracle.com>
Organization: Oracle Corporation
In-Reply-To: <670625c0-a288-4166-9209-2eccc5ee97c3@kernel.dk>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
X-ClientProxiedBy: AS4P192CA0014.EURP192.PROD.OUTLOOK.COM
 (2603:10a6:20b:5da::14) To DM6PR10MB4313.namprd10.prod.outlook.com
 (2603:10b6:5:212::20)
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|SA2PR10MB4521:EE_
X-MS-Office365-Filtering-Correlation-Id: 803ef683-483f-411c-87a6-08dc9213fcb2
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;ARA:13230037|376011|1800799021|366013;
X-Microsoft-Antispam-Message-Info: 
	=?utf-8?B?LzM3Zm9rVDd4alFuYXNmaEJPekQzZDhlM2lSVW9HZFlKVTE1VGJiSkRrazBi?=
 =?utf-8?B?TE9tUWhibkZLa2pWSXppUUhkQUZLSzN0N1puUWdxYWNHN0t5R3hHQ0VVa0Nk?=
 =?utf-8?B?QVJlNWVVKzJ5MlhJVmpmZUJ6dFM5UTlHdHphbkgrak85U0gwZ29wWit0SzhB?=
 =?utf-8?B?Y09PRnhXMnM0OGQ3RDVSMkxBWjNIMjhnL0VGR1FOUWFCcy9lcW9IT3JsZDFJ?=
 =?utf-8?B?QkFKOVhZYWJmTFZpRHpBQlBwWUsxS09NUFNUSThJdytXYnR3b1A3ekU2VFd2?=
 =?utf-8?B?RkFVODFQMU9pL1lMV05jK1Ezb1FvcVE0VDA3N3VaTE1mT1dKejQ5RnFlUi96?=
 =?utf-8?B?UUwvNnpQTVUxSnRBditBbklrekxLays5NURvcXBmSmF4d2VpYzIvcWVjZkVE?=
 =?utf-8?B?OGxCZ0xMTC83emRKeEo3T1lScXlGS2tvc3hsc01MRFRiYTkwbjRibU1IMUtj?=
 =?utf-8?B?eWRiOFpodjd4VGxqblI1MCtsK1BYcG8rdTRMZW9JUnlwU2EweGxqRENVL0NN?=
 =?utf-8?B?d0ZGUnNncGdDQmlPVDF2OVd5ZVVQMkdGVWMzSlVqdmFLTEFSeXBYN2I1bEJC?=
 =?utf-8?B?TnV3Rmh5UEt1RkNjS1RHcmJHcHlvV2dLOFI1Tm1mV2ZEOVdZUEZjenhXUmg1?=
 =?utf-8?B?RXJQZTNITUQxbHkvZFFaU2pYS1RldW9ENE8xaUhwZFQ1TjdXUEZ6MHRjWlNX?=
 =?utf-8?B?WUJLTHNzTkZHTlA0QTBJclBhaTFSdnBOdHhPakVWdzRhT3ZFMGg3bmhJR0xi?=
 =?utf-8?B?ZlViVHhLWnNoYVYrc2pWS0Z3Mmw0N2dJdHRLOTlpODdDbEh5SjltTmNac25E?=
 =?utf-8?B?SGo5TU5rUTRPMVZ4S0ZnK1EyNzBTVmRyYU5XR0E0dmlZUnJZNUFKUTlkeFJR?=
 =?utf-8?B?MEpPS1NXNzZmYkVVUTY1eGhwOVNTODU4dDZuRzFGM0w3c2prMXIzM1pXeHVF?=
 =?utf-8?B?U0VrcEsxRzlSYWpBOTh3c0x3NUI0Q2NNWGZzL3B3cjlKUG81V2hOQ0VmRGs0?=
 =?utf-8?B?MDdLRU9rdGxEWDBDT0JHTXZDRjh0T1FjM3NLR1pVMnFDb0tvT1o1Y0hXc3pa?=
 =?utf-8?B?OUdQSXZ1NDBYS1RHd0ZhOEtTT2tnb2ZCUXNrejJ5dStiUFJyRVp5Y1ZoRFAv?=
 =?utf-8?B?RmdudTlHTGY1b1BxVXVlY05wNStWYVppdkppTlloT3lMbW02TzdZVTFoN3VN?=
 =?utf-8?B?cTF6bnp0QzhqcDBFRW1DVUpJU0E3ZVoyYyt0MmhUdjFFRGJTalJ2R0wwekhx?=
 =?utf-8?B?MWVNOW93Z1RPdktkS2Y4T0ZwaGYwaVY4U3VodVZtdkc4V2RrSFJGQUE5R00x?=
 =?utf-8?B?TThsZUhoTkczTlhNQ0xaL04rZFJRNUcraW84RjV3WmVadmxCdlBMekRWWmdD?=
 =?utf-8?B?YXpQaDdEcFAyQUttRXRKK0U4UkZKNVB0cklRVmhHNnFMYzVFTCtaSDluSUZJ?=
 =?utf-8?B?TU4rVXk2K0dmNUJtcEs4blp4cFZMbVdXdlNXNTE4SWFWaXlNVEVOODNjY3pM?=
 =?utf-8?B?WmlmUzZjSkxsV1Zva0lSN3NkVVZnejMzelNzeTc4dnJHaFlGbzBDdDNJeE1W?=
 =?utf-8?B?UDVudEFneGp1eW9yUjl5aTZrTG5oQ3AwZDR3Y25rTWdUNCtRRE5BcFZzQUha?=
 =?utf-8?B?d2RhUUFxM3FZbnZVWmVVRTB0MDRzMndKc0h5VjdZdm1XT0hZSmtDSElRRXZZ?=
 =?utf-8?B?cDRZaEgxY3pETkxDYjdpbjk0TTF4cU80dWdSaTNFZVMrSE5WN3lhakpxT2Vr?=
 =?utf-8?Q?ugsfPXPXAfiTmdRDu5TAp/O9DXd0YRcomSmKhXn?=
X-Forefront-Antispam-Report: 
	CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230037)(376011)(1800799021)(366013);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?utf-8?B?enhwTHZPdFVaekpZOC82Q2JBbWRib00vV1Y4L2xrZjNsU3k5V0MxUG5FNXI4?=
 =?utf-8?B?R2JOaVNhWHQxejhHVzJXQjZQYTZuNHdBb3EwdXJBNG1nR2RCTDBIYXRDY2gv?=
 =?utf-8?B?SExpZkpnRDR5U3ZvaDhlU1BHYU1tc252K1RkOHFycFlrTEtaOXlSNFJlYVg4?=
 =?utf-8?B?NDU0U3RVVXJlWHlsSi9tTWZvbEMvVk1FTk1McWRLaFgwclJVNythVDE0Z3Ja?=
 =?utf-8?B?RXBtWUYzU0ZuR1hnZmh6WUtGcEFzdWlDWWR2NzZBWmY5UTN1T2JpY2pwUyt3?=
 =?utf-8?B?MjVIaFJqREwzRXlLN3A3UUNjZDlnKytrTkVLMlp3SXlmdmpXK0Y2VGw1cjFG?=
 =?utf-8?B?SUFwVGJIL203aXVWSS9YQXh3azhMOU16dWIyUkdmS1Y0aWJsS0Y4QXRjUys2?=
 =?utf-8?B?Sk1xc2Z6SFljc0JkS1BhYTFkaEIyRXRYNFBRdGV0SGMrL1J5ZUtlNDNZRW01?=
 =?utf-8?B?T3R2M2NjZmhiVWhtYWhzd2dvSGVBVWJkZG45bmxOSHB0elJwc2tzUEdodDZT?=
 =?utf-8?B?SFRkRmpINE1YcVBNdXR3eEFMbmZvSTR1NDVlYnlrUjdEYXNDWjVxVVVvVC9m?=
 =?utf-8?B?dmRkNzhwVVQ2Myt2NVNTUHdMUnR1TjdKdEFnWTY5S1B2L3RaWWpSK0VMVHJB?=
 =?utf-8?B?dC9SWWE4cHo2RHB0L3p5OWxBVzV6Qyt1WFBoWVk1Y2JJSVYybTdMUjJsUXNM?=
 =?utf-8?B?dmxIZjM0QmpqczExYmFENnpmREtuSVBDMjBFRHZUakkvV1EyZGQ4a0IwYnlY?=
 =?utf-8?B?L0ZDSTg3K3pJOVMzOWt6aEZsQ0lPNXVrSlFoTlZQYzEyU0FSbmJVMGRia2Uz?=
 =?utf-8?B?VjM2UXpjb1pHZFlkc3pzcVFVSDh5MGZqMEFLNmFwU2ZWMDZjUWlVb0dHR0dp?=
 =?utf-8?B?bGJiZ2VxbjVWV3JQajFOTjlhMGo1emYxeUtNS3dtMjVialF3T0ZISG95ZUlI?=
 =?utf-8?B?RkMxY0hrb1BqTjYrQlJGaVNra3pTUlZRK1NaRVlVUkZUQVJ1dFhWQlQraUd3?=
 =?utf-8?B?eG1YVFpWTncxMjNCeXE5RWliUFVUWVBuNjdNaHM4cUpBaUoyR1A2cXdkS0Jh?=
 =?utf-8?B?RG5RWHhqNklkU2VudC9iTUNqOS9XU3orMVVBV09lUTNYYlQ0V1V0akNkb05M?=
 =?utf-8?B?cDdmU3RLdldEdW9sSlBsMjlMdWQzMUlsSTh5WnZ4VG1yV2lLSGg1amVpRkxM?=
 =?utf-8?B?eWdlaFpxU2pENGJVdEc1SVQrVUZ1NjBwcXVmQnlRS0ZQb21BR2hpZmNteGVm?=
 =?utf-8?B?YUhIblJBaTlxY2Y2UzlndERWcjh0eFZUbFFNQUZPRkt6aGtsdW82OFErN2p3?=
 =?utf-8?B?SEluVzAvNU16RUQ0ZkZTYll1MVVYY1hXSWUrRGhCUmJTQkp2aW9pS1E0cDll?=
 =?utf-8?B?TU1BUExjamk1cTdlM0Q2R0NUcVhDcFc2bytpUHlkSk9wWFVMUWY3ZHRUSExL?=
 =?utf-8?B?QmFGdWN4MFpVR3BmQlVoWkc1QzQ5TERUblZsSFczMzAvK29ISE96S29HelBP?=
 =?utf-8?B?NU9lcGZ4UzNFQnNQZEp2STZwU1dwQkNjc0k2NlhQUHc2NXdvbVRQYXd5VjJt?=
 =?utf-8?B?OXVFMThVUm9VKzJqRWsvZU53RkM0bkQ4Ull1WkFXeVdac2ljN29rbnR0MmhN?=
 =?utf-8?B?YktXZUN0NGpYa2N4NWE4cWpwUWY4dTVoVGFOWWZDRytnTHpISGxwVWg3MUEr?=
 =?utf-8?B?WFVZcXNtV3QyUGZZczZlYk1nTDROam5iZDNYNjRkN2lRWmJlU1c5MWxIamtR?=
 =?utf-8?B?ckhUMXdWbXdnL3dWcitGcFhwdG5wbm0xSis5YlRjYUxabFdzcmNQVFBFbmoy?=
 =?utf-8?B?OXdLMi8xWnl1blo2aTl3UlN2aHZzT01IR0gxWlFpelpzSiswazdtR3JWcG5u?=
 =?utf-8?B?c1FoOGhqYlJ4YVFLSExRcVdodXE0NGhSU3RFNWx6TWZVSkgvY3BycXpQWURN?=
 =?utf-8?B?T0NBb3B1ZXIvN0t6R1Evb1BLT21rZFZDZ0RjNTIzN1VuUk1tejRNOGhTU3dk?=
 =?utf-8?B?bmhpYVRwRlBZaWJ6MUFmUnhLS2dRS2tiWTFZTnQ1SEhQTWN6dHhyMzZzK0lH?=
 =?utf-8?B?Rzk5MGZrUnBrd0dEVjExcjNIVTRXcnYxWndxUHB2bGN2MTh5K3lXVURDT04w?=
 =?utf-8?B?bHRxc01yRktMVE5sTVBJR1FsbHAzRXczUm1nKzg1Yi9yaDB5ME5zKzNIV2hX?=
 =?utf-8?B?cHc9PQ==?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	 
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 803ef683-483f-411c-87a6-08dc9213fcb2
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2024 17:02:52.3731
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: O7b8erFc5sM/RECj9vFRBaaAAoyOrfpSnNbXmP3XzRGgGag7nTi9dqdILl130dXnY/WSfkBBJCk9SrnsOli2LA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR10MB4521
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16
 definitions=2024-06-21_08,2024-06-21_01,2024-05-17_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0
 phishscore=0 spamscore=0 mlxlogscore=999 adultscore=0 bulkscore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2406180000 definitions=main-2406210123
X-Proofpoint-GUID: K2h_DQsF_D4UcRz4RhWmebT_XLHMKjl9
X-Proofpoint-ORIG-GUID: K2h_DQsF_D4UcRz4RhWmebT_XLHMKjl9

On 21/06/2024 16:58, Jens Axboe wrote:
> On 6/21/24 9:40 AM, Mark Brown wrote:
>> Hi all,
>>
>> After merging the block tree, today's linux-next build (arm
>> multi_v7_defconfig) failed like this:
>>
>> In file included from /tmp/next/build/include/linux/printk.h:10,
>>                   from /tmp/next/build/include/linux/kernel.h:31,
>>                   from /tmp/next/build/block/blk-settings.c:5:
>> /tmp/next/build/block/blk-settings.c: In function 'blk_validate_atomic_write_limits':
>> /tmp/next/build/include/asm-generic/div64.h:222:35: warning: comparison of distinct pointer types lacks a cast
>>    222 |         (void)(((typeof((n)) *)0) == ((uint64_t *)0));  \
>>        |                                   ^~
>> /tmp/next/build/include/linux/once_lite.h:28:41: note: in definition of macro 'DO_ONCE_LITE_IF'
>>     28 |                 bool __ret_do_once = !!(condition);                     \
>>        |                                         ^~~~~~~~~
>> /tmp/next/build/block/blk-settings.c:200:21: note: in expansion of macro 'WARN_ON_ONCE'
>>    200 |                 if (WARN_ON_ONCE(do_div(chunk_sectors, boundary_sectors)))
>>        |                     ^~~~~~~~~~~~
>> /tmp/next/build/block/blk-settings.c:200:34: note: in expansion of macro 'do_div'
>>    200 |                 if (WARN_ON_ONCE(do_div(chunk_sectors, boundary_sectors)))
>>        |                                  ^~~~~~
>> /tmp/next/build/include/asm-generic/div64.h:234:32: warning: right shift count >= width of type [-Wshift-count-overflow]
>>    234 |         } else if (likely(((n) >> 32) == 0)) {          \
>>        |                                ^~
>> /tmp/next/build/include/linux/once_lite.h:28:41: note: in definition of macro 'DO_ONCE_LITE_IF'
>>     28 |                 bool __ret_do_once = !!(condition);                     \
>>        |                                         ^~~~~~~~~
>> /tmp/next/build/block/blk-settings.c:200:21: note: in expansion of macro 'WARN_ON_ONCE'
>>    200 |                 if (WARN_ON_ONCE(do_div(chunk_sectors, boundary_sectors)))
>>        |                     ^~~~~~~~~~~~
>> /tmp/next/build/include/asm-generic/div64.h:234:20: note: in expansion of macro 'likely'
>>    234 |         } else if (likely(((n) >> 32) == 0)) {          \
>>        |                    ^~~~~~
>> /tmp/next/build/block/blk-settings.c:200:34: note: in expansion of macro 'do_div'
>>    200 |                 if (WARN_ON_ONCE(do_div(chunk_sectors, boundary_sectors)))
>>        |                                  ^~~~~~
>> /tmp/next/build/include/asm-generic/div64.h:238:36: error: passing argument 1 of '__div64_32' from incompatible pointer type [-Werror=incompatible-pointer-types]
>>    238 |                 __rem = __div64_32(&(n), __base);       \
>>        |                                    ^~~~
>>        |                                    |
>>        |                                    unsigned int *
>> /tmp/next/build/include/linux/once_lite.h:28:41: note: in definition of macro 'DO_ONCE_LITE_IF'
>>     28 |                 bool __ret_do_once = !!(condition);                     \
>>        |                                         ^~~~~~~~~
>> /tmp/next/build/block/blk-settings.c:200:21: note: in expansion of macro 'WARN_ON_ONCE'
>>    200 |                 if (WARN_ON_ONCE(do_div(chunk_sectors, boundary_sectors)))
>>        |                     ^~~~~~~~~~~~
>> /tmp/next/build/block/blk-settings.c:200:34: note: in expansion of macro 'do_div'
>>    200 |                 if (WARN_ON_ONCE(do_div(chunk_sectors, boundary_sectors)))
>>        |                                  ^~~~~~
>> In file included from /tmp/next/build/include/linux/math.h:6,
>>                   from /tmp/next/build/include/linux/kernel.h:27,
>>                   from /tmp/next/build/block/blk-settings.c:5:
>> /tmp/next/build/arch/arm/include/asm/div64.h:24:45: note: expected 'uint64_t *' {aka 'long long unsigned int *'} but argument is of type 'unsigned int *'
>>     24 | static inline uint32_t __div64_32(uint64_t *n, uint32_t base)
>>        |                                   ~~~~~~~~~~^
>> cc1: some warnings being treated as errors

I did a i386 build, and no complaints.

Now I see that the asm-generic version for 32b architectures check for a 
64b dividend, but x86_32 does not. As for arm32, its version of do_div 
expects a uint64_t *.

Maybe this would not be a bad change to have:

--- a/arch/x86/include/asm/div64.h
+++ b/arch/x86/include/asm/div64.h
@@ -22,6 +22,7 @@
  #define do_div(n, base)                                                \
  ({                                                             \
         unsigned long __upper, __low, __high, __mod, __base;    \
+       (void)(((typeof((n)) *)0) == ((uint64_t *)0));          \
         __base = (base);                                        \
         if (__builtin_constant_p(__base) && is_power_of_2(__base)) { \
                 __mod = n & (__base - 1);                       \

to catch this same error on i386.


> 
> We need something ala:
> 
> diff --git a/block/blk-settings.c b/block/blk-settings.c
> index 37fe4c8f6b6b..cd33eaba4610 100644
> --- a/block/blk-settings.c
> +++ b/block/blk-settings.c
> @@ -175,7 +175,7 @@ static void blk_atomic_writes_update_limits(struct queue_limits *lim)
>   
>   static void blk_validate_atomic_write_limits(struct queue_limits *lim)
>   {
> -	unsigned int chunk_sectors = lim->chunk_sectors;
> +	u64 chunk_sectors = lim->chunk_sectors;
>   	unsigned int boundary_sectors;
>   
>   	if (!lim->atomic_write_hw_max)
> 

Sure, but I think that we can also use the following, since both are 
unsigned int:
	if (WARN_ON_ONCE(chunk_sectors % boundary_sectors))

I'll send a fix.

John


From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail-oa1-f50.google.com (mail-oa1-f50.google.com [209.85.160.50])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 10B9816A392
	for <linux-next@vger.kernel.org>; Fri, 21 Jun 2024 17:57:13 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.50
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1718992637; cv=none; b=XFV92xZIYYYWV/yaNUxeTKCwfpuB8hj2U+eVcC0E6DEvo/0+1Vaek+WNjDpOLzyJj6AqkX8MZcdtoXgbl2hHwOytJvwKQZW1Uy5UOLOgU0gDd091QkU6QLDlL9XrKVF3RK1i4Mc81hEdyhkNvOG+IU8/jvjPI+AX97x9HqySE2U=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1718992637; c=relaxed/simple;
	bh=huiiGge3N5NRabnHhvGTRpLAvVUJYtR2Isze4gc0Iyg=;
	h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:
	 In-Reply-To:Content-Type; b=TXDOsMZN/DKHi1FtWA/Xutc/kzIaSNnr9PCClXHgxXMuT5XGztFhXzteV1jYO+cnx0tYKubSqf+WGDmSDlRjjTLqDM/eXRZCCI21eVazO0XaOkM5upEU6Gt4koCJoP2jIcnJGr/Hj2mwz2l5r+r4Dj3Y2s3mcCtwFlxYT3Ol9p0=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=cD5wxEsr; arc=none smtp.client-ip=209.85.160.50
Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="cD5wxEsr"
Received: by mail-oa1-f50.google.com with SMTP id 586e51a60fabf-25cb022c0e6so226018fac.0
        for <linux-next@vger.kernel.org>; Fri, 21 Jun 2024 10:57:13 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1718992633; x=1719597433; darn=vger.kernel.org;
        h=content-transfer-encoding:in-reply-to:from:content-language
         :references:cc:to:subject:user-agent:mime-version:date:message-id
         :from:to:cc:subject:date:message-id:reply-to;
        bh=u2uqp7TElEavi/tTlIJQ2pRjgF4RKNZn5WN+PGY/J3c=;
        b=cD5wxEsrGUsk9P88rSupFociznSs3d59o3z5E7zbGRE0CsVLBLnls5xUtJ0wSbfBMz
         UXd9Ndcz+LRitcDj2j7k53Emgx0c/BHhDyJHMzsDX5H6XTqrbTZqjo8Cl5aRGYDMJj0M
         SmsgI0nMob2lqc/vmji2rZIvGbmMYZWQuXStWqffmxzpbWt30eQqvCZecvb4XDrM2keI
         u7qN6z4OZ/c6WHvZZvb3xyjld2032TDG+rn5BUgp3a4MDCJaOi+Pa7klEf7dyfu83iwM
         sTGCkQdpXLOn4wlPBn2sQm05u4G1xVYfEb7mUC5E33bFH3zE/LzCCYoTfnFBmDmW+dao
         Urfw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1718992633; x=1719597433;
        h=content-transfer-encoding:in-reply-to:from:content-language
         :references:cc:to:subject:user-agent:mime-version:date:message-id
         :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
        bh=u2uqp7TElEavi/tTlIJQ2pRjgF4RKNZn5WN+PGY/J3c=;
        b=cpYciYaOYKFpp8QMKXe3sCPo59ZHFm+8QagWUN7QEgSBX7DsCFGn+TywefmZcjrS0j
         jg6bOSKhwKk4hYlTIfMCChO/X19kN27y7KulZFDk3wKuALKs0Km+IUVFN1eeRCysIJ7M
         bj9X7WWnD1VH8ypg3j7mV5wZW2Qtq5mtirztgJtG44f5iEsyjyYdKOZ55obM5Uh4zQVj
         zEmSsNatYxi0pMGFou+AyOQ/JL6bL/IFSI52kBI5UhDe6wPhAgutRRntfSBLVz3ZQNs0
         S5iCbEFAKA7geclYH+gwrGldXvevsC25GcrkQKJ4Z1VKjat1LCVRTbvOeqMHeJAPW1Jd
         84gQ==
X-Forwarded-Encrypted: i=1; AJvYcCUq9N7mXRwDfBmxH9Z8j9CARmaginlAaqZyC9NVysM8mqp1BgaYIkqWgPdEnwA6ICmu/nTbgrtE14ZjBXcO49KDu4kjBfoV5oWUDQ==
X-Gm-Message-State: AOJu0YynQQimxqetnskuzZDb/cyGDhQYsAVQtNX9ScqBYiyt655SpUNY
	yzGDAGzatpD6sLSFz5++fkmtl0VidvbZrfJ49XYojWC5QiycKR8N1xhHYCoHkyc=
X-Google-Smtp-Source: AGHT+IGi0WX+0vM76rlJSCntcANXU1jeQRrj9IofAe0fvrLTEz82eLwYCIjJ+BpSxkmkMO/qy/bddg==
X-Received: by 2002:a05:6808:150f:b0:3d2:2356:d271 with SMTP id 5614622812f47-3d51b9654ebmr11015214b6e.1.1718992633179;
        Fri, 21 Jun 2024 10:57:13 -0700 (PDT)
Received: from [192.168.1.116] ([96.43.243.2])
        by smtp.gmail.com with ESMTPSA id 5614622812f47-3d53451bd94sm389075b6e.33.2024.06.21.10.57.12
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Fri, 21 Jun 2024 10:57:12 -0700 (PDT)
Message-ID: <b765d200-4e0f-48b1-a962-7dfa1c4aef9c@kernel.dk>
Date: Fri, 21 Jun 2024 11:57:05 -0600
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: linux-next: build failure after merge of the block tree
To: John Garry <john.g.garry@oracle.com>, Mark Brown <broonie@kernel.org>,
 Himanshu Madhani <himanshu.madhani@oracle.com>,
 "Martin K. Petersen" <martin.petersen@oracle.com>,
 Keith Busch <kbusch@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
 Linux Next Mailing List <linux-next@vger.kernel.org>
References: <ZnWe6sXMxm4RXBcM@sirena.org.uk>
 <670625c0-a288-4166-9209-2eccc5ee97c3@kernel.dk>
 <b098bd2d-f308-4383-b348-98f9904ca28a@oracle.com>
Content-Language: en-US
From: Jens Axboe <axboe@kernel.dk>
In-Reply-To: <b098bd2d-f308-4383-b348-98f9904ca28a@oracle.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

On 6/21/24 11:02 AM, John Garry wrote:
> Sure, but I think that we can also use the following, since both are unsigned int:
>     if (WARN_ON_ONCE(chunk_sectors % boundary_sectors))
> 
> I'll send a fix.

Good point, yeah that's better as it's just 32-bit types regardless.

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id AB6D6259494;
	Fri, 20 Dec 2024 02:10:58 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1734660664; cv=none; b=BYLfgxk246LAdLnD5WLtL60oG7nGi4Ym69fG3bgwOmDJc7t33PPekdmYy6qhtmPnaPpqgnPAgkeLHfVfxz0bTgYmO+q7Jmtyt4o3w18LTOc0Gmfg3y+9NWJj9JueGFD64e4dtrulba/gPxJU2zSOsWqZJ/o42Bn46Wub+KwkLAw=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1734660664; c=relaxed/simple;
	bh=yvXcrqfLAEeOMmwnp65nZg6Oqt6GkZRJJ04ICdzuiHk=;
	h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=qVCEia6FCmRQaznD1EbVv1SH2XuyvgRd7Hm3ZkW/2P+N1XK2ljlHNoYs3o6YDC3brZQMjRP1IlOXBbwIN/AyGZPKpEpakguYVpicE4Y2QtuP/Y8Uc3ZYLfzt1RvxQ0HoyhEM9tC/QzBXAEkCmJzlfm5ObxNyMMwt3LtlwnK2WGI=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=VfUxAR/E; arc=none smtp.client-ip=150.107.74.76
Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="VfUxAR/E"
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
	s=201702; t=1734660651;
	bh=uINIwQUrhjeGTeNUhPp1/QA9zM/u2zZUa3PtEpz4Vnc=;
	h=Date:From:To:Cc:Subject:From;
	b=VfUxAR/Elvdj84Fb1gzsqtbW6dEoT4Vol1SwwczJmZz8AxMJX77cirbto+ZJQShL7
	 fTJbgobrmzSEHZwQt/29Nq8AEnB8CLkmpeQneUuYDPj5G1JHFuv3Jc88soCcO8IbAX
	 Sv+uWsIWnsXovawoqSkVza3ysy8GU9yjKzJI6LSKO5wXjgZDDiLuREJQDL/HaAwViF
	 DcLKZMhtUbQfqb1jzJn5wSuTTDzvTtDy5X9/hxNINrn8sSmu3S8MAl5byQOn5UE5hd
	 /DQM2yVpU4rTwKwp9XgZ5numo8FqBsDBNTBhT9IR8vY6D4fKoIHgMo9r+54BOPL0XN
	 EV4UybrB7WuRg==
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(Client did not present a certificate)
	by mail.ozlabs.org (Postfix) with ESMTPSA id 4YDrVg147hz4wyV;
	Fri, 20 Dec 2024 13:10:50 +1100 (AEDT)
Date: Fri, 20 Dec 2024 13:10:54 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jens Axboe <axboe@kernel.dk>
Cc: Christoph Hellwig <hch@lst.de>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20241220131054.7f6e7959@canb.auug.org.au>
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/9UEKTBo3GQ2ZSd.Cvc=sM5n";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/9UEKTBo3GQ2ZSd.Cvc=sM5n
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:

error[E0425]: cannot find value `BLK_MQ_F_SHOULD_MERGE` in crate `bindings`
  --> rust/kernel/block/mq/tag_set.rs:55:38
   |
55 |                     flags: bindings::BLK_MQ_F_SHOULD_MERGE,
   |                                      ^^^^^^^^^^^^^^^^^^^^^ not found i=
n `bindings`

error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0425`.

Caused by commit

  9377b95cda73 ("block: remove BLK_MQ_F_SHOULD_MERGE")

I have applied the following patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 20 Dec 2024 12:43:38 +1100
Subject: [PATCH] fixup for "block: remove BLK_MQ_F_SHOULD_MERGE"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 rust/kernel/block/mq/tag_set.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust/kernel/block/mq/tag_set.rs b/rust/kernel/block/mq/tag_set=
.rs
index d7f175a05d99..00ddcc71dfa2 100644
--- a/rust/kernel/block/mq/tag_set.rs
+++ b/rust/kernel/block/mq/tag_set.rs
@@ -52,7 +52,7 @@ pub fn new(
                     numa_node: bindings::NUMA_NO_NODE,
                     queue_depth: num_tags,
                     cmd_size,
-                    flags: bindings::BLK_MQ_F_SHOULD_MERGE,
+                    flags: 0,
                     driver_data: core::ptr::null_mut::<crate::ffi::c_void>=
(),
                     nr_maps: num_maps,
                     ..tag_set
--=20
2.45.2

--=20
Cheers,
Stephen Rothwell

--Sig_/9UEKTBo3GQ2ZSd.Cvc=sM5n
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmdk0i4ACgkQAVBC80lX
0GwMDAgAlwYBsrL4DHnP/ssTjVq13fCGkU7H6N1aE59SwGe00gRMdXerqcyVwHrB
akJ7K8KHWo/UAWKsUC+XBlrNFaQZfgoU8DuX9nNUxW8KmbF+eaqv0FXU2SSNruJD
dg7hxDWuR9X4aM3rdYtsorQyBtG6rJEUPBT40Qi5INRmp1pa57Sxx2btpQHZ9Du8
1K4ZnX7BOzemAY+KY/ZMsozm3y9d8nw8K2eLxwtyDxjYcKHIbRX1FoiMLKeQZiqa
69sRVCFrueiu9dvfxucGCbxV5Dpgdi8o97kW6xBK64xdbm/znN9LgKPm8zMxEf+9
XzvBmSFBL9ZbEFtmvHocAOxiia/0fQ==
=jA8o
-----END PGP SIGNATURE-----

--Sig_/9UEKTBo3GQ2ZSd.Cvc=sM5n--

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8B7D6149C50;
	Fri, 10 Jan 2025 01:44:10 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1736473459; cv=none; b=c1dA1qy8PScqOQaQxHgRRt/BCzTr9JL2lSNZL6xWQrYsA1XUh9AO5l2AQLqQM9ZLE4jf8+uGOM8UJ4y/wF1cKM25RIzIbDE9KlOkoDw/PeNpwyDi4CHe/LuBnLLla4JCt9aaNsntd5ubGDEuMY1YtuRjS/A+zuiMGIb02NCjISQ=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1736473459; c=relaxed/simple;
	bh=QHkrxdgcdWWerA2WUGyi/mnyg4tIP8o1XE9qzv/9G+4=;
	h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=sBqHsxmNBLW5nLN0Sj8fzjN9Modii3qX8CQL5pj98qahsK+4DWNRWG6UiR/W0wmR/bPMJUnxBfXsumlU4c4aIi/jsT4qEPUn8iD/OPAjY9CmjPvuoA52AYqxPyPRwvGkVCb8L0RTi7IzPuzcTWLQsx24vGpkdzI296sNuGqZZh0=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=aacoLbbL; arc=none smtp.client-ip=150.107.74.76
Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="aacoLbbL"
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
	s=201702; t=1736473442;
	bh=Kaz/wzTXAIRBYQe4VTBIfWIMMWuFfgds2SHO3oWJi6I=;
	h=Date:From:To:Cc:Subject:From;
	b=aacoLbbLXDv1JmHKvqtN9h19FWH6PDO2pAoKl5V1OJ+luqompTp2ieONg4P7Fw/Uk
	 rRolcxx7BXJT+9/4vyzYX+Q06I5HGL3Lh2BDFzlTI2U6Q7P3T7dNpm4JFuu+4Kc+2u
	 hWNXzYfWgve/Bg3UePDrjCP9EiNjCvHP71PmS1FiqU7hrXx9HLeFSuXezvnC3RaZXe
	 sj9pAciuLDYKT1Kq3+tFCQOFvTqJirR/yiahsDCsKJZ/DAmTtUEvjGCbvWp5ZZw6aZ
	 WgBJgVyTH3evXvFLM6eKsVUNjE+ZtyIS5kFLkbQZC7SWgjLnrPgm/iiGEG8/K9w47w
	 dZPPEJX5G/XLQ==
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(Client did not present a certificate)
	by mail.ozlabs.org (Postfix) with ESMTPSA id 4YTkw15swBz4wcZ;
	Fri, 10 Jan 2025 12:44:00 +1100 (AEDT)
Date: Fri, 10 Jan 2025 12:44:06 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jens Axboe <axboe@kernel.dk>, Andrew Morton <akpm@linux-foundation.org>
Cc: Pavel Begunkov <asml.silence@gmail.com>, Luiz Capitulino
 <luizcap@redhat.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20250110124406.17190e3a@canb.auug.org.au>
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Fv1X7+wOTMVsEK8Sk.S_XYk";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/Fv1X7+wOTMVsEK8Sk.S_XYk
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

io_uring/memmap.c: In function 'io_region_allocate_pages':
io_uring/memmap.c:173:24: error: implicit declaration of function 'alloc_pa=
ges_bulk_array_node'; did you mean 'alloc_pages_bulk_node'? [-Wimplicit-fun=
ction-declaration]
  173 |         nr_allocated =3D alloc_pages_bulk_array_node(gfp, NUMA_NO_N=
ODE,
      |                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~
      |                        alloc_pages_bulk_node

Caused by commit

  1e21df691ffa ("io_uring/memmap: implement kernel allocated regions")

interacting with commit

  4f6a90a13f78 ("mm: alloc_pages_bulk: rename API")

from the mm-unstable branch of the mm tree.

I have applied the following merge fix up patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 10 Jan 2025 12:40:38 +1100
Subject: [PATCH] fix up for "io_uring/memmap: implement kernel allocated
 regions"

interacting with "mm: alloc_pages_bulk: rename API" from the mm tree

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 io_uring/memmap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/io_uring/memmap.c b/io_uring/memmap.c
index dda846190fbd..361134544427 100644
--- a/io_uring/memmap.c
+++ b/io_uring/memmap.c
@@ -170,8 +170,8 @@ static int io_region_allocate_pages(struct io_ring_ctx =
*ctx,
 		goto done;
 	}
=20
-	nr_allocated =3D alloc_pages_bulk_array_node(gfp, NUMA_NO_NODE,
-						   mr->nr_pages, pages);
+	nr_allocated =3D alloc_pages_bulk_node(gfp, NUMA_NO_NODE,
+					     mr->nr_pages, pages);
 	if (nr_allocated !=3D mr->nr_pages) {
 		if (nr_allocated)
 			release_pages(pages, nr_allocated);
--=20
2.45.2

--=20
Cheers,
Stephen Rothwell

--Sig_/Fv1X7+wOTMVsEK8Sk.S_XYk
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmeAe2YACgkQAVBC80lX
0GwYdwf/eeP1uuIQYb9g6YlwbXeBc03LwO42bC4We5uLe41g6VtOvvkUP6xfljPP
hhaxN/nJfjU5vdZ2SKOeOw34jlKFSOJFKCsZvVSm1w2z1Qg/V45XOZBMXQBjzf5n
+rkiTKNHkQfsu+3KZEni9DbpgbTCNjEFiXpwwRRuTcLmoU+zFvElEPjnxdJt01cY
QGKTjHvj/OdMykgGaxfVHUatma0/zaAvXucwMYiQQESUlxnz6S1PmDqSvMcdxzli
Cmp4d5nUwqdSVoh7QQNazGWtViRINf1UKcwXQI7Fu+obpnIA1UJE9p+SWFX4rINZ
UZvZ7rutH9kQFYcpkOKl1/yVjUr+GA==
=e+zn
-----END PGP SIGNATURE-----

--Sig_/Fv1X7+wOTMVsEK8Sk.S_XYk--

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 278E5BA33
	for <linux-next@vger.kernel.org>; Fri, 10 Jan 2025 02:37:35 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1736476657; cv=none; b=ud1alM93kCxYD1p1DWcnMFuWiyyxQ243tGincDN2iNDOMQDIesQDwVjGtNQ63bFpbSmrQ9FWyWfuEa0VZqs06JilYRzdbcnyrAPMnDTyO+PfHUhFb2sUDoQTu0Fa4Tw23t0kcVvH+W40cBLXFN2jnytllkE9LoE6wxXB4yIBxu4=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1736476657; c=relaxed/simple;
	bh=d8JLSt/7x+a4PR4VnKjcXmbryZnd9iBNqirOwP1lxUc=;
	h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:
	 In-Reply-To:Content-Type; b=AVGeISJuDmf14NzGYLRn7cap2qZ5lgGIZy8jFw2PAiLQB4N4CB60/4wpAUCs9YoB+YxclojisdKPTHXsSNmOygjLRDTHLuU4uZtvWIRjK6wIOWFsw5WlLYR1sVfLjz3DtFqDAIIOmfs7io8cXadkLabuU19qeh61KmQUrlVnPIk=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=RcZ1vxZQ; arc=none smtp.client-ip=170.10.129.124
Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="RcZ1vxZQ"
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1736476655;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding:
	 in-reply-to:in-reply-to:references:references;
	bh=MGAkIhM+wsGLYMADWWeVmLkjV+10rpZrygLc3FpSM/c=;
	b=RcZ1vxZQuZEQ/deQyMM6AaAEbj+VA1ks736CbKc5pCnkPdHTkV7Cav8o7DDySFOV3VhPA7
	2S9zDdIZ6+x7aqzuelUrtfo6PH15B+PZiEEWvVFY8xTM+bmReWznu3HwNeHVwJNhm+vAAD
	j80e+9CUEGJVMz87KU7HWp7+dS8LQLE=
Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com
 [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS
 (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id
 us-mta-669-VfspqfPcOo-ykQXIuEiFSQ-1; Thu, 09 Jan 2025 21:37:33 -0500
X-MC-Unique: VfspqfPcOo-ykQXIuEiFSQ-1
X-Mimecast-MFC-AGG-ID: VfspqfPcOo-ykQXIuEiFSQ
Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7b6e5c9ef38so249948185a.1
        for <linux-next@vger.kernel.org>; Thu, 09 Jan 2025 18:37:33 -0800 (PST)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1736476653; x=1737081453;
        h=content-transfer-encoding:in-reply-to:from:content-language
         :references:cc:to:subject:user-agent:mime-version:date:message-id
         :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
        bh=MGAkIhM+wsGLYMADWWeVmLkjV+10rpZrygLc3FpSM/c=;
        b=UbKPPbFHjQ3sHd4BuCgEfKRvY3hirrwCbr7Pmg8CAyCSIdcPehNrfBIlufuQK9lWGg
         iMpgae+xjp1oe6O9Jb8UoV+efagZzs8hPl7iKAkK/m6ItzNlk3YJEdRdS3n3oRj9IfDb
         g2+8OiEB9PtWX4Nmijy/0fxXQOGtHk+EMTQNeGH4LDCQcAET87j3QY0g/EaxdFO368Bx
         aUFRzafebjB69x82Ij7A543j/D7sBc9+6nTBeC1CUkNr77BC0bj19dOabBRzQStWKUQL
         rRywuQKsR1+ywl44SOrefaMCmeqksSvxS3XXxcWrxKQthfECOtjR+ZlNSE0K7n1BxxPZ
         qrDA==
X-Forwarded-Encrypted: i=1; AJvYcCXxDVybiZzkEQQjhRyRCWtj69LihbKMVhoKCM7t6DKqMLNKZt4ee6xngIF1mrHJRNRv5dIghYjTrrOZ@vger.kernel.org
X-Gm-Message-State: AOJu0YwdpN6xB889a193nlh0BfeNQX2lsWQR7WPwmx3BNQUrTHPJPKGS
	mepCSVXVdHKYChYsXcL23AoOj8AbljWoKGS5Z175SpGL2RDDoYsA4ZAnjC+p2j05Mn/pwPCUCv4
	CmBBhzicScguo6kzWnR7Bt+tjqJ2Vjd5kkChL+usXPmHejMKquSYDrqxDiSE=
X-Gm-Gg: ASbGncvedeQuE68JL9PHfeg/ktYoVMl+m186Y6IZdKhubbQO5NEI7/ABRPMRWdhxL1W
	/e3XlijIYSoKTMuKJs+Mw6IEqkvAssBM3VN0xUaigElVovhHBhMYQQNPe2nqJ+QaygaQmkXHb4O
	OuIbbUNQr91DNgnxTFoEUhy/IomBChv3H49gKyuhu+8Zg0pl1l+yqbg6CUpwfkt74YT/AqPrg2N
	1+OR4PPGCmZv3y4+jyGWa5vDWwf7bN0NdJcejYh3+p1RfWlwRRoe3S1Fswnrr9egVWZuAn2D+MW
	sj6y25dg9U2q5Iz8XxI2uCkPZ7uR8JHOTw6QtDBPZA==
X-Received: by 2002:a05:620a:1904:b0:7b1:1fdd:d54f with SMTP id af79cd13be357-7bce128b3a5mr956978985a.29.1736476653411;
        Thu, 09 Jan 2025 18:37:33 -0800 (PST)
X-Google-Smtp-Source: AGHT+IFEG1MA/wTZxtZG4sKgfbBjzwXhY4u+xybj3Iv//JeDXViBk2i48CR+t2xiovmpmwKsGJObTg==
X-Received: by 2002:a05:620a:1904:b0:7b1:1fdd:d54f with SMTP id af79cd13be357-7bce128b3a5mr956977385a.29.1736476653153;
        Thu, 09 Jan 2025 18:37:33 -0800 (PST)
Received: from [192.168.2.110] (bras-base-aylmpq0104w-grc-14-70-52-22-87.dsl.bell.ca. [70.52.22.87])
        by smtp.gmail.com with ESMTPSA id d75a77b69052e-46c8734107esm4899691cf.44.2025.01.09.18.37.32
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Thu, 09 Jan 2025 18:37:32 -0800 (PST)
Message-ID: <a603ade1-0d86-498c-b793-49ff5f43972a@redhat.com>
Date: Thu, 9 Jan 2025 21:37:32 -0500
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: linux-next: build failure after merge of the block tree
To: Stephen Rothwell <sfr@canb.auug.org.au>, Jens Axboe <axboe@kernel.dk>,
 Andrew Morton <akpm@linux-foundation.org>
Cc: Pavel Begunkov <asml.silence@gmail.com>,
 Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
 Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20250110124406.17190e3a@canb.auug.org.au>
Content-Language: en-US, en-CA
From: Luiz Capitulino <luizcap@redhat.com>
In-Reply-To: <20250110124406.17190e3a@canb.auug.org.au>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit

On 2025-01-09 20:44, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the block tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> io_uring/memmap.c: In function 'io_region_allocate_pages':
> io_uring/memmap.c:173:24: error: implicit declaration of function 'alloc_pages_bulk_array_node'; did you mean 'alloc_pages_bulk_node'? [-Wimplicit-function-declaration]
>    173 |         nr_allocated = alloc_pages_bulk_array_node(gfp, NUMA_NO_NODE,
>        |                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~
>        |                        alloc_pages_bulk_node
> 
> Caused by commit
> 
>    1e21df691ffa ("io_uring/memmap: implement kernel allocated regions")
> 
> interacting with commit
> 
>    4f6a90a13f78 ("mm: alloc_pages_bulk: rename API")
> 
> from the mm-unstable branch of the mm tree.
> 
> I have applied the following merge fix up patch.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 10 Jan 2025 12:40:38 +1100
> Subject: [PATCH] fix up for "io_uring/memmap: implement kernel allocated
>   regions"
> 
> interacting with "mm: alloc_pages_bulk: rename API" from the mm tree

This looks correct to me, thanks for fixing:

Reviewed-by: Luiz Capitulino <luizcap@redhat.com>

> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>   io_uring/memmap.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/io_uring/memmap.c b/io_uring/memmap.c
> index dda846190fbd..361134544427 100644
> --- a/io_uring/memmap.c
> +++ b/io_uring/memmap.c
> @@ -170,8 +170,8 @@ static int io_region_allocate_pages(struct io_ring_ctx *ctx,
>   		goto done;
>   	}
>   
> -	nr_allocated = alloc_pages_bulk_array_node(gfp, NUMA_NO_NODE,
> -						   mr->nr_pages, pages);
> +	nr_allocated = alloc_pages_bulk_node(gfp, NUMA_NO_NODE,
> +					     mr->nr_pages, pages);
>   	if (nr_allocated != mr->nr_pages) {
>   		if (nr_allocated)
>   			release_pages(pages, nr_allocated);


From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 073512EAE6;
	Mon, 13 Jan 2025 01:52:21 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1736733147; cv=none; b=J/A+jJ+79rUyZEW95LaYKEIS+3xd2nHjukdbrceCLDyHH7jA3wNUIBR4Nex9VZef3j3BoBh8p09j7V3kR7JDTzeNWrZ4y3wJGkKqJuDbclLN1XfrjSts7EnsukTqwe8pZa3t+GDUeMXqXusyCsHw/TAnhY4rzj4uvaKB9EZiRNs=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1736733147; c=relaxed/simple;
	bh=bnv0R/WAemvRPpgEEFWu8QH7irOaGM5Oe5Kuti5x0Gk=;
	h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=ne+Tc7OFkY9CcZ9NoTP1Wx+BHS2BMAOMGxdjsdbI8nQPZRyEqvzHhUgv9ZQ+s8ZArGc4iaNjcPNbSe3VYNGBj/jAT7ioMCUfIwuAiak1gZivYogD1JM+eK+8/jILn2aXKmbZHzAyXtRUoNf/qDAJkVXrghb9RIVEVov47aoNE/8=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=ZGjFb8tS; arc=none smtp.client-ip=150.107.74.76
Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="ZGjFb8tS"
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
	s=201702; t=1736733132;
	bh=lodxSqV28S/ay/+Deuyigy53IxS+/cTc3p72f2T4tmU=;
	h=Date:From:To:Cc:Subject:From;
	b=ZGjFb8tS+q06Z0VHELqOAou2FM4xZMg0L0Bp+4Hu9gK+Sd0Q831FdH+k0PkTe+hom
	 NYs1AG7C5EROtXPW2eJ7Wp17Q03hVSVm5/V85jFw9rvZZEqRX2+WT3iGDRPdSKUPJy
	 sWCBBtpbjrrje9Az33y8tBoD6rSYZxz6YZi2s7URruE3T6RrAtRiiGd4adN+0/nIpd
	 p+wfi4AnawLr1DDXOxP+VwDl1LALqRoIfmuhYmJSdchXv1pj6s63O7uoDZdurAePZU
	 7M44Hd397Wo5KEsaBjaNB54MDtGKYsPkjdFO/3KEiVcSWQC3PAKgQVvTzKqxrxafL/
	 kjBEfce4PXrKA==
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(Client did not present a certificate)
	by mail.ozlabs.org (Postfix) with ESMTPSA id 4YWZy36b2Cz4wcs;
	Mon, 13 Jan 2025 12:52:11 +1100 (AEDT)
Date: Mon, 13 Jan 2025 12:51:42 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jens Axboe <axboe@kernel.dk>
Cc: Song Liu <song@kernel.org>, Yu Kuai <yukuai3@huawei.com>, Linux Kernel
 Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20250113125142.001f056b@canb.auug.org.au>
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/J6wiZ8M60efcmDuY94T/IbG";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/J6wiZ8M60efcmDuY94T/IbG
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

make[5]: *** No rule to make target 'drivers/md/md-linear.o', needed by 'dr=
ivers/md/built-in.a'.  Stop.

Looks like a missed "git add".

Caused by commit

  7ad00dd67641 ("md: reintroduce md-linear")

I have used the block tree from next-20250110 for today.

--=20
Cheers,
Stephen Rothwell

--Sig_/J6wiZ8M60efcmDuY94T/IbG
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmeEca4ACgkQAVBC80lX
0GwLjgf7BreJ2il3pJiitKhNEJeVZ/VLHnBP1Pua9kdsqW1zTe6XBFIKStaN6HyJ
6qB1HLJn/hojCVN5oB8gCumXlkYBjX1ZLNGt/eUBh2BUL4MjXYVIaXCjSyHPnmzE
9uzcy2riyCAXXcCpyxcydlInJIfLloViUw8poZHa0++OqzSNKCtp+wIstVsQHWuR
mvSt24xXNVFLr2aoQZA9VzYoDcbrDarZRcozTuX/Js5pCPDACs0D5+0pa1V/s/3d
RQskIOGFvNnYTwk7eE2uon4AgVthWbeU6FFFsDNX2MfXZInbmkTPlFFWt+WZaxn+
H3Xkui1v7hmSQomW0EOMiU5b7VAUYQ==
=jVCh
-----END PGP SIGNATURE-----

--Sig_/J6wiZ8M60efcmDuY94T/IbG--

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1C112450F2;
	Mon, 13 Jan 2025 02:13:41 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.51
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1736734424; cv=none; b=E8nsu/uNvt7Ov4GzxOzuKK+MeXvUF8SPduqAiK42T9YE5nfVUkSu/L6uJYBt4DgGrYk4G1Pg69uVy9YWwOe6zcgBbEGkN5utNxCzyHbDXNOTnoYL11DalXkV+R3MtqbEtjlL1SghBh85c8OQ4YJYlyQ3ug9MGEnaKOXNU91NLro=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1736734424; c=relaxed/simple;
	bh=RD0L4+GgKysgCemDuDDOMwaX0nbBMSsTLoUHQH78V08=;
	h=Subject:To:Cc:References:From:Message-ID:Date:MIME-Version:
	 In-Reply-To:Content-Type; b=KgTm1O+RCUbXXUCzoZi9xD57rhsOcekZF8hTfe4KocupkMjIikZedilW8YVANZq50Ey2wq55W30N8rl9qo4shUu33XbCnMM/x2t+dtK2xtEyBhttACJNEVqAwIsng5nK8O0W1KAgo2Knaq2/LkQSkuoMMcjef+cUQYntT83MS5A=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.51
Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huaweicloud.com
Received: from mail.maildlp.com (unknown [172.19.163.216])
	by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4YWbQH3nYdz4f3jLh;
	Mon, 13 Jan 2025 10:13:11 +0800 (CST)
Received: from mail02.huawei.com (unknown [10.116.40.252])
	by mail.maildlp.com (Postfix) with ESMTP id 1825C1A0C13;
	Mon, 13 Jan 2025 10:13:33 +0800 (CST)
Received: from [10.174.176.73] (unknown [10.174.176.73])
	by APP3 (Coremail) with SMTP id _Ch0CgB3ysTLdoRnnqsrAw--.32446S3;
	Mon, 13 Jan 2025 10:13:32 +0800 (CST)
Subject: Re: linux-next: build failure after merge of the block tree
To: Stephen Rothwell <sfr@canb.auug.org.au>, Jens Axboe <axboe@kernel.dk>
Cc: Song Liu <song@kernel.org>,
 Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
 Linux Next Mailing List <linux-next@vger.kernel.org>,
 "yukuai (C)" <yukuai3@huawei.com>
References: <20250113125142.001f056b@canb.auug.org.au>
From: Yu Kuai <yukuai1@huaweicloud.com>
Message-ID: <138ea43c-223b-ac64-bff7-9ccb5f3dbd7a@huaweicloud.com>
Date: Mon, 13 Jan 2025 10:13:31 +0800
User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101
 Thunderbird/60.8.0
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
In-Reply-To: <20250113125142.001f056b@canb.auug.org.au>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
X-CM-TRANSID:_Ch0CgB3ysTLdoRnnqsrAw--.32446S3
X-Coremail-Antispam: 1UD129KBjvdXoW7Xr1fAFWkKr1kKFWxuFWfXwb_yoWxCFXEkF
	4qy3s7Cw18Xws7CrW5ta9I934ak3WjqryqqFykKr48uF1xXa17W3Z8C3WUX3W5JFZ2qFZx
	Cr1aqwn5CrW09jkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT
	9fnUUIcSsGvfJTRUUUb4AYFVCjjxCrM7AC8VAFwI0_Gr0_Xr1l1xkIjI8I6I8E6xAIw20E
	Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l8cAvFVAK0II2c7xJM28CjxkF64kEwV
	A0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2Ix0cI8IcVCY1x02
	67AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I
	0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40E
	x7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x
	0Yz7v_Jr0_Gr1lF7xvr2IY64vIr41lc7I2V7IY0VAS07AlzVAYIcxG8wCY1x0262kKe7AK
	xVWUAVWUtwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F4
	0E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1l
	IxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxV
	AFwI0_Jr0_Gr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j
	6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Jr0_GrUvcSsGvfC2KfnxnUUI43ZEXa7IU1veHD
	UUUUU==
X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/

Hi,

在 2025/01/13 9:51, Stephen Rothwell 写道:
> Hi all,
> 
> After merging the block tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> make[5]: *** No rule to make target 'drivers/md/md-linear.o', needed by 'drivers/md/built-in.a'.  Stop.
> 
> Looks like a missed "git add".
> 
> Caused by commit
> 
>    7ad00dd67641 ("md: reintroduce md-linear")

So, I do checked today's linux-next tree, the above commit is not here.

2b88851f583d (HEAD -> master, tag: next-20250110, origin/master) Add 
linux-next specific files for 20250110

Are you sure about this report?

Thanks,
Kuai

> 
> I have used the block tree from next-20250110 for today.
> 


From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id CE26E13C8F3;
	Mon, 13 Jan 2025 02:37:33 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1736735857; cv=none; b=RGmyeqmY6QdjNMZeg1zVYUsqIwfhd163WKbeJzhVVGxmflEbuoGUw+6AEl3BEIizdtjBrb3uOr0VBvrdqg2p5jp8gTe/3rwc0x7PmzX3gm5W/ITbp/CSBLq6GMCBgwAkvco6jVBxxdKoZ+Y4xalbQH3By4BSJHPqQmk4KWYUXPo=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1736735857; c=relaxed/simple;
	bh=pFW5mOGHu3V9iCs8rXTPJc952AlpLbu59iDfcyZ79js=;
	h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References:
	 MIME-Version:Content-Type; b=TQShs4AqXU7zF3cYRsePLoW0Gg3PLn9vRTqnS6hmgqqM158JvuN8uHd+UGQuajZj2SsKrI9ylxpKmz5st2LBtGjGqwc8xR0tU7OVNaqKg/V+Tv+bga+sdCeyIgZ0Yke777OfXGjcMmCbb652LlKVilroAosAr4hZ0RKFprEDfQs=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=vERb9DFb; arc=none smtp.client-ip=150.107.74.76
Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="vERb9DFb"
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
	s=201702; t=1736735844;
	bh=oKPSd4r/LKBAkEq9y3/vZTP82JiJE45JvpaJy819wpg=;
	h=Date:From:To:Cc:Subject:In-Reply-To:References:From;
	b=vERb9DFbUFVb1D5LNGjG46UqfJkDPJ1BhHi1F9NsoysPfssqpMOP3bohapJ/wnRnP
	 yGz1ApdDD5wymdfVgqcSdnZQ0aImJcIWxMlfQgO+ykxmJ8dGBsxjPFu3h1AGG/YA7G
	 nNot4zJ/p7GCH1rvPJn+LkO0anIWNgZBOnn2Y8xvo4ylKHiKssJdtCtcxddxj/N3i/
	 aKr1CpnArpNm1iGUE36+e88fdA1GoE6g+zIGtLhDDQW5aSk1wZeX5DZ4CCI8v6X+lp
	 8ZNbVZO14tJKda6wffa4StVm6WWYLBGB4jggcnsKHxvG5up48KEpRMIVDwaIddASA9
	 S3x3hqRZdCf6Q==
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(Client did not present a certificate)
	by mail.ozlabs.org (Postfix) with ESMTPSA id 4YWbyD3DtSz4w2H;
	Mon, 13 Jan 2025 13:37:24 +1100 (AEDT)
Date: Mon, 13 Jan 2025 13:37:30 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Yu Kuai <yukuai1@huaweicloud.com>
Cc: Jens Axboe <axboe@kernel.dk>, Song Liu <song@kernel.org>, Linux Kernel
 Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, "yukuai (C)" <yukuai3@huawei.com>
Subject: Re: linux-next: build failure after merge of the block tree
Message-ID: <20250113133730.6f56fc79@canb.auug.org.au>
In-Reply-To: <138ea43c-223b-ac64-bff7-9ccb5f3dbd7a@huaweicloud.com>
References: <20250113125142.001f056b@canb.auug.org.au>
	<138ea43c-223b-ac64-bff7-9ccb5f3dbd7a@huaweicloud.com>
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/5mBWJuvxpLzn1_H2Ql0m=I1";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/5mBWJuvxpLzn1_H2Ql0m=I1
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

Hi Kuai,

On Mon, 13 Jan 2025 10:13:31 +0800 Yu Kuai <yukuai1@huaweicloud.com> wrote:
>
> =E5=9C=A8 2025/01/13 9:51, Stephen Rothwell =E5=86=99=E9=81=93:
> >=20
> > After merging the block tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> >=20
> > make[5]: *** No rule to make target 'drivers/md/md-linear.o', needed by=
 'drivers/md/built-in.a'.  Stop.
> >=20
> > Looks like a missed "git add".
> >=20
> > Caused by commit
> >=20
> >    7ad00dd67641 ("md: reintroduce md-linear") =20
>=20
> So, I do checked today's linux-next tree, the above commit is not here.
>=20
> 2b88851f583d (HEAD -> master, tag: next-20250110, origin/master) Add linu=
x-next specific files for 20250110
>=20
> Are you sure about this report?

That is last Friday's linux-next release.  Today's is not released yet
... and the commit won't be in there because I used an old version of
the block tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/5mBWJuvxpLzn1_H2Ql0m=I1
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmeEfGsACgkQAVBC80lX
0GygwQgAiWvEUin+x3VXuL0RDrCd73FZPaQ79XI/4gkFzaFdIfxyC0/eqfYCOfr7
73NDm9sUSAjcMHbOW/OJihDjXTW4+kfLIBca26262LhUg2TAqyXOYuz8pm1hKGug
MMoWQMBgPHL2cGQZ1v/yzIXlQGHFYx34+FWT5lQdwxP6x9wfqhzukYuvVe3j626n
/Od9obSOFmurMPQ2gd65lIDeW6e8Lm8vs0/neMjTm4DOHEv3RoM/x974Hvim6enr
zUct939B118GW/wonhfXH/swVHJbcAQEhAzVuzX0oCuCnbbx+X4hNYd5+zOwNmpw
3ISis/Fjk6EOgCf0h5WquWaccDai4g==
=8rBY
-----END PGP SIGNATURE-----

--Sig_/5mBWJuvxpLzn1_H2Ql0m=I1--

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 09FD71BEF76;
	Mon, 13 Jan 2025 06:03:50 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1736748231; cv=none; b=dogI5ZMvOKzx12KJT/Ws13U37gWv1P9P7AVP6WnaU5bFTNyd0/NBYJ6MHEqJ0KeLKqtLNXk/QNyIm+B3OB/37C3HvGNfUUd5wpR4F/2wQv7rd8oNXxmLK/KvLP0cRoMdwH19Ge1agvr790WkcNh2eTlSxNx2LrDmgKIfqu5xi9Q=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1736748231; c=relaxed/simple;
	bh=w2Zqc27gjBUrgoX9mF8X6OIA77qNOEZkhnAkQbgIht8=;
	h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject:
	 To:Cc:Content-Type; b=lg23HAm0qnv6XjIfAX0h/Ol+c56//0DuNUJrr+TvoiiJ646WT6n4QgtsEHCqL+qUU0ZycHrvD0BR3OsohLlRJGfNcFWF4SYwGJIhA2W/F32FYYAvaVkh5WokuAm+PPxdQHq79bONelqb/Q5XWAnmR+Hg86+JCtuNtLu03Q/QwFM=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FgjYYtbY; arc=none smtp.client-ip=10.30.226.201
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="FgjYYtbY"
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9FC42C4CEE2;
	Mon, 13 Jan 2025 06:03:50 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
	s=k20201202; t=1736748230;
	bh=w2Zqc27gjBUrgoX9mF8X6OIA77qNOEZkhnAkQbgIht8=;
	h=References:In-Reply-To:From:Date:Subject:To:Cc:From;
	b=FgjYYtbY0MtSIVVgMYw8+hfz8+z8Df2p4LBFLATsOizx/2YfEcct+WU9GMyuqbG7n
	 izwErBfjbP3jrPFp3+53K4qXxhsuu2+5AqXOPA3snEqZNnNLPuMcI9NLtoybXeTgEt
	 61sAztZcKSD7YmRtzdb0/1h6q6FLxlfWPsdS88TLW1pNGQ9JXAtRnHZM+EVldbkkF3
	 XvvqUb/Wg2Ps3sRkkwkpM1j1ipw2c3YjvDre2FNaJoeoBhX42A9bHh5pFPgyCXFQ8+
	 R+7mdFypk+BdUT3n1p4mnpzwwjOTK3aKxyzI6OdLerTyhrtnTeUmCPqfSZOvsBW3+y
	 NogL/eYK+4LeQ==
Received: by mail-io1-f49.google.com with SMTP id ca18e2360f4ac-84cdacbc373so129213739f.1;
        Sun, 12 Jan 2025 22:03:50 -0800 (PST)
X-Forwarded-Encrypted: i=1; AJvYcCXciTwaI7zDrhmyUd2XNPoNSDM2MJM9mSyLocnBjnTxD0jBqtaxBXZZsldavev5mvuqQgFmTGvDJ1OZIA==@vger.kernel.org, AJvYcCXlW2cnkCEt9+E/E1efFyxfVVMDo821JFD4gqjI4nnR+IjhsL+BDFpxf65ZFxOY6twqHOIG3V04MMstJmA=@vger.kernel.org
X-Gm-Message-State: AOJu0YyfXGJ9h7KqHLVB9iR7LHbgtrOu5/ksZW3ntyc4PPqjb04hGd0A
	RaEQP1RiDpBVpqeaJJxHLryCA33SsbtzxexiabfOyjF9goEG9QqQMgmY7FP+y2yMmSiLjD/kVXd
	RoFfVJhzoUBx2zelFgGDiyfJJal8=
X-Google-Smtp-Source: AGHT+IEnNe/eHtP+FlgJyhQGYYhFb+FAcch8j6JeEEwbwsm2dCoL4uRWStnuxthNgoRv3FcM1NbQgPDK/PoYlrYwAgI=
X-Received: by 2002:a05:6e02:20ee:b0:3a7:819c:5129 with SMTP id
 e9e14a558f8ab-3ce3a8bb524mr155104005ab.18.1736748230009; Sun, 12 Jan 2025
 22:03:50 -0800 (PST)
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
References: <20250113125142.001f056b@canb.auug.org.au>
In-Reply-To: <20250113125142.001f056b@canb.auug.org.au>
From: Song Liu <song@kernel.org>
Date: Sun, 12 Jan 2025 22:03:39 -0800
X-Gmail-Original-Message-ID: <CAPhsuW7WBeHR=tqNFq3Fv6jsH0hF_VjJ9_4+kwFzfvA6tectzA@mail.gmail.com>
X-Gm-Features: AbW1kvZLS8gPGNxtb5vp6qQLEONocrWFWBT7D4L5DvgYbyQSozOpmqy_KjfV_JI
Message-ID: <CAPhsuW7WBeHR=tqNFq3Fv6jsH0hF_VjJ9_4+kwFzfvA6tectzA@mail.gmail.com>
Subject: Re: linux-next: build failure after merge of the block tree
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jens Axboe <axboe@kernel.dk>, Yu Kuai <yukuai3@huawei.com>, 
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, 
	Linux Next Mailing List <linux-next@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Sun, Jan 12, 2025 at 5:52=E2=80=AFPM Stephen Rothwell <sfr@canb.auug.org=
.au> wrote:
>
> Hi all,
>
> After merging the block tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> make[5]: *** No rule to make target 'drivers/md/md-linear.o', needed by '=
drivers/md/built-in.a'.  Stop.
>
> Looks like a missed "git add".
>
> Caused by commit
>
>   7ad00dd67641 ("md: reintroduce md-linear")
>
> I have used the block tree from next-20250110 for today.

It was my fault. git-am hit a conflict, then I messed it up when
trying to apply the patch manually.

I will send a fix soon.

Song

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail-io1-f53.google.com (mail-io1-f53.google.com [209.85.166.53])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id F20ED22CF12
	for <linux-next@vger.kernel.org>; Mon, 13 Jan 2025 14:16:10 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.53
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1736777772; cv=none; b=B8SU1XJfRMw3C86ruN9XcORb76AIFURTlJGYXQaSFj5ftEYnZz1HWfkCojIKOWQmUnwKJU7QVUkuSOy2lXIQMay1xQ9/qbv2I/EuHsXA6hLpWMxIRwE2BAXX4+ajHsw6voLSAnirzxSx/SenxF2g714XgkXOtlEnwGnElBvRLZ4=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1736777772; c=relaxed/simple;
	bh=YsBwo0LosVTctopRwN5cmooU+vOzhUer8hU+iOrMuxo=;
	h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:
	 In-Reply-To:Content-Type; b=GReqwNYDCHVfjONahtk38shQqPZPDn5FKM16rZjkeBZqWPe6eFiwe/+xaef26u1fRC3++rQaCMC4QONAlWz8o14qrAsZijduE6ECJYuZGXe0QMEI05gp9u2S1OyOdFoCNKR8oLyhaatQiIrr5lo0CFQp2ypWP+oGJhsnw6QrdDg=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=ShAW1y/Y; arc=none smtp.client-ip=209.85.166.53
Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="ShAW1y/Y"
Received: by mail-io1-f53.google.com with SMTP id ca18e2360f4ac-844e12f702dso148976939f.3
        for <linux-next@vger.kernel.org>; Mon, 13 Jan 2025 06:16:10 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1736777770; x=1737382570; darn=vger.kernel.org;
        h=content-transfer-encoding:in-reply-to:from:content-language
         :references:cc:to:subject:user-agent:mime-version:date:message-id
         :from:to:cc:subject:date:message-id:reply-to;
        bh=GEhOR+92cA4nIi97CMuOZcNU2oAyXbWgYwXXymSEJTU=;
        b=ShAW1y/YF37lDkzqrqTglOkNm9qXudh1Gl74T3aiI7AjsRGxuYsPupv7Jpctssv0oz
         PVzlEp9+tBqpiJ9OfI0zrBY/kLm5Ao/3QFGi2eSS7cY2qzd+cFGdpCeIx2UFyJRLUvL3
         7cehEQ0rK2C9nG9OjoqZvMtAAa524zQ2x2thSpxIW7w1eg8u60ixP811UHk36sSr671K
         31GSwHt/uhH99OSz196T4IjVryG1mjmrZRti8VQ5AJdoWbWgA3TVTVLJkTof5YmMbp/0
         QrnAUMwkxFi+jzl/lGSQaCLnaPwhwV5Og3VMo8UnYDJRR/TUWUpMVMuEs8tRZWHdkAsa
         Yd5A==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1736777770; x=1737382570;
        h=content-transfer-encoding:in-reply-to:from:content-language
         :references:cc:to:subject:user-agent:mime-version:date:message-id
         :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
        bh=GEhOR+92cA4nIi97CMuOZcNU2oAyXbWgYwXXymSEJTU=;
        b=ZJWlj4xweNRl2+x2K3IOTNqRV4CReEUCziA0yRHQUXgK53/h9rKQzni+BgtQy0glmW
         BkwkrVdaA0vxZOfp7HuJs5IFagRs5Fcr9q55ZvsulfwmhDDOmC/pfuNbtoGz3pOrc/3p
         DPu/8DP7l/iB+nEziKpLUTPJi7b9C7esNOQ2p2XdAdsHDGFpYWLwCzeKeKocxUjYdALO
         2b5VFiyMxxdH5HsRU0FyRBdk+9J+HdgdWmejmhH7RNqYnbLoVWvfymJvOvrCS23c9Wtg
         +LEHCN2/OBoaOu8nM0Tr5nxa51FcBJZ0wHQAMgWPY+ARj2fEZKOimvH/vqn0j+PpX611
         kFMw==
X-Forwarded-Encrypted: i=1; AJvYcCW8CwxpH5cr/0Im6x+zFYKvMrAvkRFssknqASpAUFyF+rv3O4awJDqwsfiA2VA3i7gA7sjU/ZgZg1o2@vger.kernel.org
X-Gm-Message-State: AOJu0Yz9uvItSrg6kswl27CDbyAHSFtUypk4KsmW4Lt/PhtOs3j4adIf
	wSZ7uw7sNaCkd9c/SzlX+QFdjpt6MrK1PvxDWB3lVR0XEvthfooaBm7rgQB+u8UY8YWbIEHMyDN
	J
X-Gm-Gg: ASbGncuoULIoT5MlkaxW+o1yNoSxjwfAfsc5o03qxkz+KL41fNGNDL17gqWLB56L69s
	IOhVE4/z00AihY6Nu72VFxnZEiOTXR10pf71tr3wZY+3EoXEChMF17DCBB4KViRYZDwEpZYgnon
	HPz9mp01jVUl8eDn8CUqwCAu2/vpAeQiiZy68RVF4wQNgkYcGYKxKma9ZV1Z4VAYr9JzEhHtJR8
	lvAvS4gxBo/pFtvO9GVFDg/4Vw/5Yt1ApepN8XSaBxAiyZ8VFbx
X-Google-Smtp-Source: AGHT+IF89vwyQreClDu+jlg1tet7IbNQU91u5Is2tUYWgypmRBNudVqaOsjvgZ/awv4H1vPOA9Ri9A==
X-Received: by 2002:a05:6602:4192:b0:84a:5201:41ff with SMTP id ca18e2360f4ac-84ce00c84d6mr1885427139f.3.1736777770083;
        Mon, 13 Jan 2025 06:16:10 -0800 (PST)
Received: from [192.168.1.116] ([96.43.243.2])
        by smtp.gmail.com with ESMTPSA id ca18e2360f4ac-84d61fc893bsm272796939f.43.2025.01.13.06.16.09
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Mon, 13 Jan 2025 06:16:09 -0800 (PST)
Message-ID: <d3ef3372-f896-492c-8ae5-29efc216bf7b@kernel.dk>
Date: Mon, 13 Jan 2025 07:16:08 -0700
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: linux-next: build failure after merge of the block tree
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Song Liu <song@kernel.org>, Yu Kuai <yukuai3@huawei.com>,
 Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
 Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20250113125142.001f056b@canb.auug.org.au>
Content-Language: en-US
From: Jens Axboe <axboe@kernel.dk>
In-Reply-To: <20250113125142.001f056b@canb.auug.org.au>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

On 1/12/25 6:51 PM, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the block tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> make[5]: *** No rule to make target 'drivers/md/md-linear.o', needed by 'drivers/md/built-in.a'.  Stop.
> 
> Looks like a missed "git add".
> 
> Caused by commit
> 
>   7ad00dd67641 ("md: reintroduce md-linear")
> 
> I have used the block tree from next-20250110 for today.

I've dropped the md tree for now, current tree should be good
again. Sorry about that :/

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0C59E2E406;
	Tue, 21 Jan 2025 07:39:24 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1737445168; cv=none; b=s61uINB+vo2lvcmMKqcahUXSqhcCXLRr4cyiAep/I8LcEkK53Ec2bFpfCc+6+w6Bh0u6OJoJjktig3zGifC82zbOi1p7ZMWtfUpgxt5rejaFRV54zgpHuLESdNQR75CDOIR54S9RsbfQSMpm1+VXD0+QhfNx7qk5C6Yh2B9bC1Y=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1737445168; c=relaxed/simple;
	bh=tYvpctSgcorLbdiJc50qeoHG+VlnI17wI0rEQsQiey0=;
	h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References:
	 MIME-Version:Content-Type; b=Y7qSPESj/MY4NbxoEzOfaUHStcKLH57AZPEn+s83Q5HA/MMQ7i+YfW0br/lhFUF9oiXlVXd6FGlrTBOWwuPHcw5yfC8jZpDSiWzPp37Y1e7r92PbH0mzsgSEAABTi6iHr+Cib43WPqSdywgHbl+jZiMggUYy3KddYLg6mFDSLPU=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=ON8oavsI; arc=none smtp.client-ip=150.107.74.76
Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="ON8oavsI"
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
	s=201702; t=1737445155;
	bh=3emuC3l+hVYUJSxGhO69XR7+1fqRaPiP1GK6oD0i4k4=;
	h=Date:From:To:Cc:Subject:In-Reply-To:References:From;
	b=ON8oavsIvqxYSo3KQAaWtoxpErmLt/LlUKR0a7BwD6P7Y3EP03i4ixmIdDaOxsALK
	 9tkqS0CFsTG2sLrftuiU9O7qonpv9fSCrQvOxxqx+zyn5qDf3RTRgNZAkFo1ZjP2Qu
	 Xcyr2XcsvphbcPwkflPdCSTT3GoErU3+ASxtw1JgN5z1f7WjpR3FRiLe+C7rSGkR85
	 UcITNqjZKq3r4yTtGA7z7juTORgZqiNWYEEMQMaZpR+rty4L4Mq4gMUI16nCSobznD
	 7lZ0WVM1wF8kvy5WzujXQnNNws1rBGfYBOnQg61ek2t7UDasgYV8V8Hwsn2fP3YM3k
	 vzKcPcsMXwPig==
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(Client did not present a certificate)
	by mail.ozlabs.org (Postfix) with ESMTPSA id 4YcfGp5QdHz4x2c;
	Tue, 21 Jan 2025 18:39:14 +1100 (AEDT)
Date: Tue, 21 Jan 2025 18:39:22 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Jens Axboe <axboe@kernel.dk>, Pavel Begunkov <asml.silence@gmail.com>,
 Luiz Capitulino <luizcap@redhat.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the block tree
Message-ID: <20250121183922.48b19f85@canb.auug.org.au>
In-Reply-To: <20250110124406.17190e3a@canb.auug.org.au>
References: <20250110124406.17190e3a@canb.auug.org.au>
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/rZDfjjYNN4LXNx1_zk1yTIQ";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/rZDfjjYNN4LXNx1_zk1yTIQ
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Fri, 10 Jan 2025 12:44:06 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> After merging the block tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>=20
> io_uring/memmap.c: In function 'io_region_allocate_pages':
> io_uring/memmap.c:173:24: error: implicit declaration of function 'alloc_=
pages_bulk_array_node'; did you mean 'alloc_pages_bulk_node'? [-Wimplicit-f=
unction-declaration]
>   173 |         nr_allocated =3D alloc_pages_bulk_array_node(gfp, NUMA_NO=
_NODE,
>       |                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~
>       |                        alloc_pages_bulk_node
>=20
> Caused by commit
>=20
>   1e21df691ffa ("io_uring/memmap: implement kernel allocated regions")

That commit is now in Linus' tree.

> interacting with commit
>=20
>   4f6a90a13f78 ("mm: alloc_pages_bulk: rename API")

That is now commit

  8c3cbdcf4d82 ("mm: alloc_pages_bulk: rename API")

in the mm-stable tree.

> I have applied the following merge fix up patch.
>=20
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 10 Jan 2025 12:40:38 +1100
> Subject: [PATCH] fix up for "io_uring/memmap: implement kernel allocated
>  regions"
>=20
> interacting with "mm: alloc_pages_bulk: rename API" from the mm tree
>=20
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  io_uring/memmap.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>=20
> diff --git a/io_uring/memmap.c b/io_uring/memmap.c
> index dda846190fbd..361134544427 100644
> --- a/io_uring/memmap.c
> +++ b/io_uring/memmap.c
> @@ -170,8 +170,8 @@ static int io_region_allocate_pages(struct io_ring_ct=
x *ctx,
>  		goto done;
>  	}
> =20
> -	nr_allocated =3D alloc_pages_bulk_array_node(gfp, NUMA_NO_NODE,
> -						   mr->nr_pages, pages);
> +	nr_allocated =3D alloc_pages_bulk_node(gfp, NUMA_NO_NODE,
> +					     mr->nr_pages, pages);
>  	if (nr_allocated !=3D mr->nr_pages) {
>  		if (nr_allocated)
>  			release_pages(pages, nr_allocated);
> --=20
> 2.45.2

--=20
Cheers,
Stephen Rothwell

--Sig_/rZDfjjYNN4LXNx1_zk1yTIQ
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmePTyoACgkQAVBC80lX
0Gy1zAf/WynbnRTfH7SAuONlSmL5ZMvF5XOWcdA46PwEI2aQK89RQVcgH/8ovlt3
FGSI19LEvkn7LBtjXGqs1auI/smls1Ldc+cIo6dIUsfb+hbbbaUs977+l8iUl+xZ
f+tQogGLFAiEbpTgHIvUHhCKHTfequLyQuAO1/kFhd+hINAs4RMdGQ4Xk/tcnSxU
jDdjB8eXnx45vjdvgC5UUTsI5ylUQvh/vehyHyf3h+/aqNjycSGUqoQaRmoqpneZ
HyDPYfL0VnJmi8C3vR6aJv9vmNO4J4HUpJ2x/V34502o5SGVwY4vZt+C8VpQW48c
kan1QM8jDDgcnsgwqXUSdsnJRa8J2w==
=6YZI
-----END PGP SIGNATURE-----

--Sig_/rZDfjjYNN4LXNx1_zk1yTIQ--

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id B5D371494D9
	for <linux-next@vger.kernel.org>; Tue, 21 Jan 2025 13:57:53 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1737467875; cv=none; b=ZXYZdu/07hUMX49UlK8TwzRc/AVwONE08WkhV77YJUguMXSVQ0leCV3MI/KQ+qi5vGChWWaQmrc2IC/Oxd1MVFrdBKclpXUBW/VxeOPIWabf3QzSbM3li+/1sFuUO59ToGJrZpPRdg/8ww/sY98aSSQ/7Dg4xIhbNIahuPacSRA=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1737467875; c=relaxed/simple;
	bh=YH0mZTykvqfob4eYO74TZwQPEuM63S7m9FPvrCAJwug=;
	h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:
	 In-Reply-To:Content-Type; b=E+0N5i7xMEMyyW56AMPX0pbCDykLpNvMoYDW99zJuSiQY+AWLPNlhDLn8hJg6GSaYn3N3bOdZo8rHDUdrRYEW0poU/xoKk1/l4rBkFv17P2WEmNkJRubYx0GcamEuzZhlJxBHhsH22LotBgYDp5g02LhyK2enHHrqynGs9ylL9Y=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=cDt4NTYy; arc=none smtp.client-ip=170.10.133.124
Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="cDt4NTYy"
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1737467872;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding:
	 in-reply-to:in-reply-to:references:references;
	bh=zJX/YCxYCUtK9PUpq/ALixLKG7LZ7+cBqFrHlbGI5vY=;
	b=cDt4NTYymVKHZyxxjl80T9ztBOEKoi4zL2A46WiW4eqa9LRdhP6B+kn0g6PdRs7DyNhiSY
	DdWD1dXJJV1FCvfkQPe6QnbARXbR2tfnYkpa55+3XtjGRsEJaRtnV0NPFb9J1VFJKukZG8
	kGSn11ZuLraf62wSwuOaKN8J9fAtszQ=
Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com
 [209.85.219.72]) by relay.mimecast.com with ESMTP with STARTTLS
 (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id
 us-mta-90-kE-_LpG-McGZcCVZMk-ERQ-1; Tue, 21 Jan 2025 08:57:51 -0500
X-MC-Unique: kE-_LpG-McGZcCVZMk-ERQ-1
X-Mimecast-MFC-AGG-ID: kE-_LpG-McGZcCVZMk-ERQ
Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-6d8f0b1023bso59562986d6.0
        for <linux-next@vger.kernel.org>; Tue, 21 Jan 2025 05:57:51 -0800 (PST)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1737467870; x=1738072670;
        h=content-transfer-encoding:in-reply-to:from:content-language
         :references:cc:to:subject:user-agent:mime-version:date:message-id
         :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
        bh=zJX/YCxYCUtK9PUpq/ALixLKG7LZ7+cBqFrHlbGI5vY=;
        b=ILKdpqzY9If3Z0xTKTjwOILYC3pBFriQaEw/j9lAiTRNpt+OReO9v7U06vumFfZUZR
         eeem5zmIE9umxxHemOnuNBiLGqTzuzmK8zDVFOQFYrvI/H9I2yNiK49o/QFmJB5/Vlgc
         /uJH0bS2rfS2DCq0BDakdArO+Cm9/5jtGSJYsYKcHhJbbBpK2+MUp/LJTI6aXn5bI4RK
         z3vsDATJ+WQl/KmbS1gtZWxIdLaKRf+RhajzlJBI8OS1IalIN6RnKOZyH9lt0gGRGs01
         SmyCD6QPd8pLivAUyZ4AAK5CLOfS6koo3W8gYNupVcPl3y2FSqR2yj/B6mr6d0oL4SyK
         dycg==
X-Forwarded-Encrypted: i=1; AJvYcCVfcTwK0682YIhJlQ6Rdl19C6cINjmVkDFn9Fq7C7HmJPs0j/m+fqV5gRGStzMYgdgH2rHyNbmQ+KyC@vger.kernel.org
X-Gm-Message-State: AOJu0Yy6sZfuyEgrIfqJwYPaypJMAkJtoS3zWtZkFNTxPNfuoVs12djj
	zZT7KSNprhySAWdzWiNwghsj4bsaOQ5giTeDoSNrreG1KAX4M61vXpGUEb6LsALFtCKJUgw+zpx
	g8LbNTUCTNyS9kYLqbiMiy9skE2qg3TnUAc/myEkQX3lCG3bms1uYjwZ8rlg=
X-Gm-Gg: ASbGncvR4DzizPAWY98OasG/PlzVlrocWHJ4mBKJUH4q45b+yCxTEeqLNPC2//YZHIV
	1IUdTpE1zeM0itXZU+zPk+iTiJHzCFmu43uANm4Kr11+GBekF4ddNAePTz87Trjr/aS1PCwiFNQ
	CfbDZ7zZyfWJhJCLKWI/MW2TR4jLcZGW9MxKTlq22CFkEQKYBTZjKfjXtoEQ5cgUPxLzLEu9PIV
	iPuqo7VlFeC72nLuROYCI01vy3yilrAZkwpBNNnefj7j1AJZIK9fw81heScnwfvCZOmWg==
X-Received: by 2002:a05:6214:19c8:b0:6d8:cff9:f373 with SMTP id 6a1803df08f44-6e1b21c4106mr248908406d6.30.1737467870693;
        Tue, 21 Jan 2025 05:57:50 -0800 (PST)
X-Google-Smtp-Source: AGHT+IGrW1G4KF26gmctunHzLVawvNGLTdnSaba/6HsQ5RGPIZMmAa9pY0xNz2ahL1pY9BS3lXyYCg==
X-Received: by 2002:a05:6214:19c8:b0:6d8:cff9:f373 with SMTP id 6a1803df08f44-6e1b21c4106mr248908016d6.30.1737467870305;
        Tue, 21 Jan 2025 05:57:50 -0800 (PST)
Received: from [192.168.2.110] ([70.52.22.87])
        by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6e1afcd66c2sm51324886d6.75.2025.01.21.05.57.49
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Tue, 21 Jan 2025 05:57:50 -0800 (PST)
Message-ID: <054a35c4-a604-4afa-8288-13cae3f74286@redhat.com>
Date: Tue, 21 Jan 2025 08:57:39 -0500
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: linux-next: build failure after merge of the block tree
To: Stephen Rothwell <sfr@canb.auug.org.au>,
 Andrew Morton <akpm@linux-foundation.org>
Cc: Jens Axboe <axboe@kernel.dk>, Pavel Begunkov <asml.silence@gmail.com>,
 Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
 Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20250110124406.17190e3a@canb.auug.org.au>
 <20250121183922.48b19f85@canb.auug.org.au>
Content-Language: en-US, en-CA
From: Luiz Capitulino <luizcap@redhat.com>
In-Reply-To: <20250121183922.48b19f85@canb.auug.org.au>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit

On 2025-01-21 02:39, Stephen Rothwell wrote:
> Hi all,
> 
> On Fri, 10 Jan 2025 12:44:06 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> After merging the block tree, today's linux-next build (powerpc
>> ppc64_defconfig) failed like this:
>>
>> io_uring/memmap.c: In function 'io_region_allocate_pages':
>> io_uring/memmap.c:173:24: error: implicit declaration of function 'alloc_pages_bulk_array_node'; did you mean 'alloc_pages_bulk_node'? [-Wimplicit-function-declaration]
>>    173 |         nr_allocated = alloc_pages_bulk_array_node(gfp, NUMA_NO_NODE,
>>        |                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~
>>        |                        alloc_pages_bulk_node
>>
>> Caused by commit
>>
>>    1e21df691ffa ("io_uring/memmap: implement kernel allocated regions")
> 
> That commit is now in Linus' tree.
> 
>> interacting with commit
>>
>>    4f6a90a13f78 ("mm: alloc_pages_bulk: rename API")
> 
> That is now commit
> 
>    8c3cbdcf4d82 ("mm: alloc_pages_bulk: rename API")
> 
> in the mm-stable tree.

Should I resend against latest Linus tree? I thought we were going with
your fixup...

> 
>> I have applied the following merge fix up patch.
>>
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Fri, 10 Jan 2025 12:40:38 +1100
>> Subject: [PATCH] fix up for "io_uring/memmap: implement kernel allocated
>>   regions"
>>
>> interacting with "mm: alloc_pages_bulk: rename API" from the mm tree
>>
>> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> ---
>>   io_uring/memmap.c | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/io_uring/memmap.c b/io_uring/memmap.c
>> index dda846190fbd..361134544427 100644
>> --- a/io_uring/memmap.c
>> +++ b/io_uring/memmap.c
>> @@ -170,8 +170,8 @@ static int io_region_allocate_pages(struct io_ring_ctx *ctx,
>>   		goto done;
>>   	}
>>   
>> -	nr_allocated = alloc_pages_bulk_array_node(gfp, NUMA_NO_NODE,
>> -						   mr->nr_pages, pages);
>> +	nr_allocated = alloc_pages_bulk_node(gfp, NUMA_NO_NODE,
>> +					     mr->nr_pages, pages);
>>   	if (nr_allocated != mr->nr_pages) {
>>   		if (nr_allocated)
>>   			release_pages(pages, nr_allocated);
>> -- 
>> 2.45.2
> 


From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail-il1-f182.google.com (mail-il1-f182.google.com [209.85.166.182])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id A459D1F4E39
	for <linux-next@vger.kernel.org>; Tue, 21 Jan 2025 14:40:39 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.182
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1737470442; cv=none; b=t5LiF5c1dzwhnT/tQUcneH6dNRxaJdSmAqJhScWkyguhxXEOLEcSoO49WqnpbALQRRPLC0HF5jfPBUzQ92cQtUOt2bH68JsMJh+uPe5yY98DHHL/oRQPkK3PX/Qx3iqGrU2Il/m1BtjcbP0+u522VXydEXbbd0ybiAjH5euqAv4=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1737470442; c=relaxed/simple;
	bh=VRazz4YgaKaKkH+Q+PTOffho7RikIBc9f6CQv0sH+6o=;
	h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:
	 In-Reply-To:Content-Type; b=Gyl8GDn14Ja6DE103S96f7BNd+18EXBb166Qz8NWHqvDIA3/tU+0YIVJTaMUBbAaaNQ0aynraT23Xuj5ef0uYvsuq4CYOzJHc1Nwipp56b6EwO2e4DbAYpE1zkbGSdM4nKsJXE3+iGadVrAxZD6VGT8wArscwgVy/BTOHRZlp8c=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=UCNCexHk; arc=none smtp.client-ip=209.85.166.182
Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="UCNCexHk"
Received: by mail-il1-f182.google.com with SMTP id e9e14a558f8ab-3ce8c069840so41903245ab.3
        for <linux-next@vger.kernel.org>; Tue, 21 Jan 2025 06:40:39 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1737470438; x=1738075238; darn=vger.kernel.org;
        h=content-transfer-encoding:in-reply-to:from:content-language
         :references:cc:to:subject:user-agent:mime-version:date:message-id
         :from:to:cc:subject:date:message-id:reply-to;
        bh=j5jdKp/+Hi9ij8teyNO2OtKlUfNmR1Rhm7rROvhrCNQ=;
        b=UCNCexHkvqBnPjdlC2pXn9YajcctdvCd0pSFZ0e3I/Yq5FZTHQv4G+voKPYr+Uq0HA
         nXZUaLLfpT6lL4o9bMmxDp3omXdIkB0YP2N3yUrncXOYvcG8Fo/VKRNRG9o9kPsucJLb
         RmGqWEKEB9WE6kXcl8J7MOmmTTpHwm/2G13smGcD4iND5p600N2j+i/BdfF5vkSKUVs8
         Bfv1pwU4r/iZWuSWePtb45JB4tenrzpmVnh1RRleYRD8m1e48CwcAFI5rj4097dnZO+I
         oVKgflTAj7cEEqrEsmTDcPMubWDYVcWYcELdgbci5HA3cbwWMzGvOi20OwuWGBfhTJjo
         YV1g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1737470438; x=1738075238;
        h=content-transfer-encoding:in-reply-to:from:content-language
         :references:cc:to:subject:user-agent:mime-version:date:message-id
         :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
        bh=j5jdKp/+Hi9ij8teyNO2OtKlUfNmR1Rhm7rROvhrCNQ=;
        b=L2fPOBpXJxd+sUglTniUhA5CBfNGFojIOojf1/EhmqXRMC3aBVr+2FPTqsZ7mjuAt4
         80/8czZKzu7i1Ty0t0RFBN1bGO1FXbvN4Ptm/1wfmj7wnesTMhyKjakzbyrZ6REuNpA0
         JwJUmpCCOwIBOxhLJjKUMLr+a3m73Qd7JGJq1BogEom/2o3dUgy84fd3NVqhvJLsCsge
         RSD1RKvEpcFsRF61Ihz1gYeBMa0rtzHsiWAKG7QEzYZwF1C4vHha80mC6dwkAqoFFJzy
         lMcgeULxH8JS7Ch5GueB6phAJ/E3m8k9lfHcrXwEWx0WizAD/U8kL2Glfsph9rrlLO4G
         0tug==
X-Forwarded-Encrypted: i=1; AJvYcCUvtlgZo71Z2uiDk9+6wnoKXF0EbYyNyUMzFEv/ShebLft0gF1TeAhi9UvBxS3tOdMdDLMBe0tYbgSa@vger.kernel.org
X-Gm-Message-State: AOJu0YxG9fgCJo5DYrexJizOcpPVc1fQ9gHTUx1l/VwnMKJ3ZMmb7GfB
	P/Dimxp1abzKEhoUnWCxeAe48a+TITsnMqoHjlKo+XgKNsVOFL0N38fzc82v7uc=
X-Gm-Gg: ASbGncsLRbHH53m0hNrVOuttr6VraAbJufucU0J4O86VLkjTVAydPU30DTUfj8d2KjM
	e1szUzpIULMMrq6T0rEfi1xTr7/6bG6Mu914gvoMViANme0BVR4oIfzobvXzVJ30cyj+SRDw2sA
	4qR7fd09OLoi9sQtZTdlLcB6mGADmWhHuxi+yzQc2NMT9OeXVKQSt6/urj9s2w/k/TWMajneU1o
	KNbNmyssl+GL808rZelriv11mAyDomwe9JvbtANgZtVxATyWlUG3ZyTsVTx11l4yA==
X-Google-Smtp-Source: AGHT+IGacHJLComIK0Xi07AT+A149ypcJ07yZkhfQT2l+Sy+73baK1HxmRskAfX57csBOXzUBe6VCA==
X-Received: by 2002:a92:c26b:0:b0:3a7:d792:d6c4 with SMTP id e9e14a558f8ab-3cf744beabemr172488285ab.21.1737470438369;
        Tue, 21 Jan 2025 06:40:38 -0800 (PST)
Received: from [192.168.1.116] ([96.43.243.2])
        by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3cf71a9e8b8sm29352635ab.27.2025.01.21.06.40.36
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Tue, 21 Jan 2025 06:40:37 -0800 (PST)
Message-ID: <48d04a52-8f84-44c3-bf14-95fe9a3e9e06@kernel.dk>
Date: Tue, 21 Jan 2025 07:40:36 -0700
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: linux-next: build failure after merge of the block tree
To: Luiz Capitulino <luizcap@redhat.com>,
 Stephen Rothwell <sfr@canb.auug.org.au>,
 Andrew Morton <akpm@linux-foundation.org>
Cc: Pavel Begunkov <asml.silence@gmail.com>,
 Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
 Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20250110124406.17190e3a@canb.auug.org.au>
 <20250121183922.48b19f85@canb.auug.org.au>
 <054a35c4-a604-4afa-8288-13cae3f74286@redhat.com>
Content-Language: en-US
From: Jens Axboe <axboe@kernel.dk>
In-Reply-To: <054a35c4-a604-4afa-8288-13cae3f74286@redhat.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On 1/21/25 6:57 AM, Luiz Capitulino wrote:
> On 2025-01-21 02:39, Stephen Rothwell wrote:
>> Hi all,
>>
>> On Fri, 10 Jan 2025 12:44:06 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>>
>>> After merging the block tree, today's linux-next build (powerpc
>>> ppc64_defconfig) failed like this:
>>>
>>> io_uring/memmap.c: In function 'io_region_allocate_pages':
>>> io_uring/memmap.c:173:24: error: implicit declaration of function 'alloc_pages_bulk_array_node'; did you mean 'alloc_pages_bulk_node'? [-Wimplicit-function-declaration]
>>>    173 |         nr_allocated = alloc_pages_bulk_array_node(gfp, NUMA_NO_NODE,
>>>        |                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~
>>>        |                        alloc_pages_bulk_node
>>>
>>> Caused by commit
>>>
>>>    1e21df691ffa ("io_uring/memmap: implement kernel allocated regions")
>>
>> That commit is now in Linus' tree.
>>
>>> interacting with commit
>>>
>>>    4f6a90a13f78 ("mm: alloc_pages_bulk: rename API")
>>
>> That is now commit
>>
>>    8c3cbdcf4d82 ("mm: alloc_pages_bulk: rename API")
>>
>> in the mm-stable tree.
> 
> Should I resend against latest Linus tree? I thought we were going with
> your fixup...

As long as it gets mentioned when the pull request goes out, Linus is
usually quite happy to just fix it up while merging.

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 600D81F192A
	for <linux-next@vger.kernel.org>; Tue, 21 Jan 2025 14:43:44 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1737470626; cv=none; b=WaRgUUJPHHJGrvfyPx9mol7rXECBjETTBYBcExb5YloCbn6FgGvoN39JGMdAN6XTl3eYj61u2e1kxt5Ca1U8WBD9cxj1kvI1WCXHwxDLf8PoyQ4+YsbvzW6UIExUMPqaia9BgpEsGaoyFmsYzQcwB6i5DymV94GON/GefjaJGZQ=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1737470626; c=relaxed/simple;
	bh=OY50ZguIBzRsOVPbQOk93Sa5ytCfUt5W8ZLPHNu6ZV0=;
	h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:
	 In-Reply-To:Content-Type; b=qywLWR+Qjqkmf82zBD4FWfDnNyHtYKxQREIIvk7Homhel1sEAO7R/FYychMsXaZJ5yQSvO0IN20W9aK+CNxSkEUDlqaCuDnxsDQfz8qVEzN7C5H7PrkT+4ggY0s1UZEADkcBhyrghJLVgxBakfKeDihakTaAjS+LASVZAnD+5pE=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=DVeyyImI; arc=none smtp.client-ip=170.10.133.124
Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="DVeyyImI"
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1737470623;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding:
	 in-reply-to:in-reply-to:references:references;
	bh=2W7asi9HRh4r0ivC++MeqiIIQQRprVDeUn0WV1tUD9E=;
	b=DVeyyImIwDgA9esgZR12z/+0RrAJFpbAh3swJOJHRDfsy5UxlAnkWSfLPDyEKAqJDH1uQ6
	ZDeCT42Rk7VBQIJYXYvygBL4HyFR37WpgDs6E5MZJbkVhBFiR4WXFlcBzodwYAP1fA6H8m
	Nf4iQWdaIoGNODQz1nAJ92+q2j3yROI=
Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com
 [209.85.219.72]) by relay.mimecast.com with ESMTP with STARTTLS
 (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id
 us-mta-274-VEGzfDfGOb2kTY_TmJiYxQ-1; Tue, 21 Jan 2025 09:43:41 -0500
X-MC-Unique: VEGzfDfGOb2kTY_TmJiYxQ-1
X-Mimecast-MFC-AGG-ID: VEGzfDfGOb2kTY_TmJiYxQ
Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-6e1e06456c1so20235346d6.1
        for <linux-next@vger.kernel.org>; Tue, 21 Jan 2025 06:43:41 -0800 (PST)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1737470621; x=1738075421;
        h=content-transfer-encoding:in-reply-to:from:content-language
         :references:cc:to:subject:user-agent:mime-version:date:message-id
         :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
        bh=2W7asi9HRh4r0ivC++MeqiIIQQRprVDeUn0WV1tUD9E=;
        b=KWBFX/cM3j00MC5ilmbbUz8x4Y5pdAXIYx/LoaUsge6TbK9viWuQfaIE6xhBHVi/fF
         d578bLV68cchtVmHzq3F73eMlysawtB0m8r5oHvpaU9UHacKTsbrAg+5jhYoXMapo/XK
         5VbTPvCio3WRr0WNd+1hkmHiq8JRx/uH/+4RZyN7JEkPzwRHhacOdtUx7RM2XqCdX4Ui
         RRUX2sxArgOCxcvJ5q8eRGMCoCdFxQwK8J7mMpJzoqqafMZ9w4Bn6KUEDwq0bpB8T2Cx
         3AcqV/49VB3Bk46D8rfWZKohLzwm9cbXUq7mo76YY4b43MrxLI3gUX2IZjplhhqsgz3I
         RNLQ==
X-Forwarded-Encrypted: i=1; AJvYcCXBgG35eBIAT7T4kKqA3zhTboI+hEbHmrjn6pOOtXg+uU+aMHd2kbrwa7Jh9rCGDtrTTa7wySY5JZvJ@vger.kernel.org
X-Gm-Message-State: AOJu0YxCDmzCwHC1isDtcZdIIfAIrhimqLNRoJZkbjmZgHtZ5n0rVWum
	RtX5EHKd0ztNC4EmtFh/wcSdL6urZRpsIjJf+lsq5PKttuN84B1GG8JTo8e8guwkj+D7A/pRR/O
	HiAvHHCgYqe79ESgN7e0EkYEGMn1NC8Q/tj4p6wYIExroodMfa7BCcbrTz1A=
X-Gm-Gg: ASbGncvGcdi+EYOown8/Cxitp+xa9TNOeefNVohFouO0pn40jLEsidmaxeeAJb3Kekd
	1wMJpLgQwiWEmfjgBURILgBXlnq2s1Z9p5xgyFOsmbvc09oxRPTOkLdKM+X9qy3T1iNrR6cJYvC
	0tT5hQbocygc9nROzsLlfmTZKVFhaP8X4zHUNInWbuJb7PvGdFhIGmvqi6ijRktWkOMKkT/7LmQ
	/p/3seDz22HwpRb2m9O86Cqzz4KYhp3fmgMOi4y+zxBMFtXuKyZtB9PUcDWjsIFxxaMTnepnpna
	WgSzejCKALLukA9D9bzZey/GKoE5oA1oEeunzDKbdoPJF6Tbwx54KCY=
X-Received: by 2002:a05:6214:d4b:b0:6e1:728c:a5d2 with SMTP id 6a1803df08f44-6e1b2732a91mr265004526d6.6.1737470621441;
        Tue, 21 Jan 2025 06:43:41 -0800 (PST)
X-Google-Smtp-Source: AGHT+IHPg2wACA4e32ElLFEXRS3jAfr5GTh3ckinlRuDB3gw6M1OzCWuweMZKgYO32Q7nSEj0LsYnA==
X-Received: by 2002:a05:6214:d4b:b0:6e1:728c:a5d2 with SMTP id 6a1803df08f44-6e1b2732a91mr265004286d6.6.1737470621179;
        Tue, 21 Jan 2025 06:43:41 -0800 (PST)
Received: from [192.168.2.110] (bras-base-aylmpq0104w-grc-14-70-52-22-87.dsl.bell.ca. [70.52.22.87])
        by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6e1afce883bsm51588986d6.108.2025.01.21.06.43.40
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Tue, 21 Jan 2025 06:43:40 -0800 (PST)
Message-ID: <be10a3a8-17f6-4913-9027-ca40380e223f@redhat.com>
Date: Tue, 21 Jan 2025 09:43:33 -0500
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: linux-next: build failure after merge of the block tree
To: Jens Axboe <axboe@kernel.dk>, Stephen Rothwell <sfr@canb.auug.org.au>,
 Andrew Morton <akpm@linux-foundation.org>
Cc: Pavel Begunkov <asml.silence@gmail.com>,
 Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
 Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20250110124406.17190e3a@canb.auug.org.au>
 <20250121183922.48b19f85@canb.auug.org.au>
 <054a35c4-a604-4afa-8288-13cae3f74286@redhat.com>
 <48d04a52-8f84-44c3-bf14-95fe9a3e9e06@kernel.dk>
Content-Language: en-US, en-CA
From: Luiz Capitulino <luizcap@redhat.com>
In-Reply-To: <48d04a52-8f84-44c3-bf14-95fe9a3e9e06@kernel.dk>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit

On 2025-01-21 09:40, Jens Axboe wrote:
> On 1/21/25 6:57 AM, Luiz Capitulino wrote:
>> On 2025-01-21 02:39, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> On Fri, 10 Jan 2025 12:44:06 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>>>
>>>> After merging the block tree, today's linux-next build (powerpc
>>>> ppc64_defconfig) failed like this:
>>>>
>>>> io_uring/memmap.c: In function 'io_region_allocate_pages':
>>>> io_uring/memmap.c:173:24: error: implicit declaration of function 'alloc_pages_bulk_array_node'; did you mean 'alloc_pages_bulk_node'? [-Wimplicit-function-declaration]
>>>>     173 |         nr_allocated = alloc_pages_bulk_array_node(gfp, NUMA_NO_NODE,
>>>>         |                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~
>>>>         |                        alloc_pages_bulk_node
>>>>
>>>> Caused by commit
>>>>
>>>>     1e21df691ffa ("io_uring/memmap: implement kernel allocated regions")
>>>
>>> That commit is now in Linus' tree.
>>>
>>>> interacting with commit
>>>>
>>>>     4f6a90a13f78 ("mm: alloc_pages_bulk: rename API")
>>>
>>> That is now commit
>>>
>>>     8c3cbdcf4d82 ("mm: alloc_pages_bulk: rename API")
>>>
>>> in the mm-stable tree.
>>
>> Should I resend against latest Linus tree? I thought we were going with
>> your fixup...
> 
> As long as it gets mentioned when the pull request goes out, Linus is
> usually quite happy to just fix it up while merging.

Cool, thanks Jens.


From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 206782E8B7C;
	Wed, 22 Oct 2025 05:25:56 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1761110762; cv=none; b=G7dQxVfRJ1Ns5Nzq11YS4ubwnDoZKC0ep1WtOL1MmAOFQzk7aOnZtUDba1vB7PjADVmFS3cyAIr+vcVIburaWHBDews2mfYt9o+VjFyVL/1ttupJxyWrgmg+S49f/wdpsdv/q7Z8A0hMC8Aqc2RZgGkvx9Z5KomeGrPEq/7nEb4=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1761110762; c=relaxed/simple;
	bh=mXpas3Q7II2E3RIoc0YNALZ0k7lZjrC4FDNfZkG9wws=;
	h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=JFxuqj9HF8rKnGeJioWLNZ5q8GpNe4i7sfFwuKfQo2YlImuyTUqTZtTbg7elSRZBj15jlS2JV6qN2cdu8fAtkdSIBYzr+zkVsGMNw5Wypnfms5kbsWnsTrnMHSlHWJst1JOTxaBWyFxYFMpxBG+WzCTp4a8jmgUhWXsbviue7So=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=Hn48pNTX; arc=none smtp.client-ip=150.107.74.76
Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="Hn48pNTX"
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
	s=202503; t=1761110755;
	bh=Czzn4YjA0DxoPNd1smsST42zqWunupnU/PC+dbX27q0=;
	h=Date:From:To:Cc:Subject:From;
	b=Hn48pNTXmbmy0HLGHugXg6Mara41fmRu4FlwF1r5eBInq3XSbdg9W4Ug6CpEerpTc
	 zMDglorDskudJJoadv4JKEzi9fGA+aNSE7ax65IJV+zrwkrVUjiYU+KK82IChi9xj3
	 NlYHOsAwE25JMDLi6ijibjHgHQm6PkLe5pwyo9S8J1iaTyrbTTjWfHLhX/rLvN7eDR
	 4O2h6ielaXzohBVKnuU7MU7kVywl2mVisMjo6uPkHZ5OYtaIXfx9POsudCp5Ozmubd
	 mvAJMV8lo3uhXxPgP5Vrh/gekeg2Yd0aUsKvKtMsB3ISvFwPx0i80Thrb3nArlDRBX
	 2N25eV2OMMlRQ==
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(Client did not present a certificate)
	by mail.ozlabs.org (Postfix) with ESMTPSA id 4cryLV6bXTz4w9Q;
	Wed, 22 Oct 2025 16:25:54 +1100 (AEDT)
Date: Wed, 22 Oct 2025 16:25:53 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jens Axboe <axboe@kernel.dk>
Cc: Keith Busch <kbusch@kernel.org>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, "kernelci.org bot" <bot@kernelci.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20251022162553.5dfb4df9@canb.auug.org.au>
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/4Cy70XElTL/JV3ERhJ7mIjd";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/4Cy70XElTL/JV3ERhJ7mIjd
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 defconfig
clang-17) failed like this:

io_uring/fdinfo.c:103:22: error: variable 'sqe' is uninitialized when used =
here [-Werror,-Wuninitialized]
  103 |                 opcode =3D READ_ONCE(sqe->opcode);
      |                                    ^~~
./include/asm-generic/rwonce.h:50:14: note: expanded from macro 'READ_ONCE'
   50 |         __READ_ONCE(x);                                            =
     \
        AR      drivers/irqchip/built-in.a
|                     ^
./include/asm-generic/rwonce.h:44:72: note: expanded from macro '__READ_ONC=
E'
   44 | #define __READ_ONCE(x)  (*(const volatile __unqual_scalar_typeof(x)=
 *)&(x))
      |                                                                    =
     ^
io_uring/fdinfo.c:92:27: note: initialize the variable 'sqe' to silence thi=
s warning
   92 |                 struct io_uring_sqe *sqe;
      |                                         ^
      |                                          =3D NULL
1 error generated.

Introduced by commit

  31dc41afdef2 ("io_uring: add support for IORING_SETUP_SQE_MIXED")

See the KerneCI report here:
https://d.kernelci.org/i/maestro:764471d48b9e1faab06d96f79a325cdcf2a995b7

--=20
Cheers,
Stephen Rothwell

--Sig_/4Cy70XElTL/JV3ERhJ7mIjd
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmj4auEACgkQAVBC80lX
0GzLvQf/XqMj9cyI3VRKC3CHrDrAvKoc++cyQw284WK6XLPsZjJ0DxBQWyt5xe/F
0yodv5ebJzP/KaF+HBHVaVCihu2sFX6GXHdO9kNnnQFaWVqLA3hAevfyTyv+kV7m
4e8lv3x8HIIYsKwJLttnWgkUAqm9F5wOD6C3eYBGQIIevkUNQs+9M7x2WRYpLnQs
cVzj2ZINDhbSYv7UQCmgd/hwp0VCbM6fpwIjmKRv0Fu6cCKk4xg4uY5zDMJ7dvbu
xlthtgjEZ+JrPkapChii41+gx5l5IudVA4iFXNaw57vRtND6cw8cus/H1PoT7K0f
fC5KBSiMsN83SYDqiFZWK4cANlI5KA==
=tgp6
-----END PGP SIGNATURE-----

--Sig_/4Cy70XElTL/JV3ERhJ7mIjd--

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail-io1-f52.google.com (mail-io1-f52.google.com [209.85.166.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id E8F5C25E824
	for <linux-next@vger.kernel.org>; Wed, 22 Oct 2025 17:17:09 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.52
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1761153431; cv=none; b=shG2e57agPmpK3LMvlTFpvY5QLlragS60gmKGv/K4WVRQ0QpzA9WpUQwS12AylE6nj9Wnc6dE0qLa2TufFqVq/HUPvmDVEA9g9jSs/2Rxm3QXMi9s3iiDfG1/zOMI5L7+0cirkx2XQGIpRrhAAGoFq0qi9+rRFp5xb/3Sh0POnY=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1761153431; c=relaxed/simple;
	bh=cX31mC1L5QeuvgXHfSdRp6tkkzvVsV4FrGOl48ObzNQ=;
	h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:
	 In-Reply-To:Content-Type; b=pB0hAUkIatCpUg6kPa3c6tViBF7vRtTXd9wvfxztE+iQX3lLyXQ3+SVxpwVoMJPJ78KJ5kGif8uZjDNCmy6RhPVVA4sv7yzq9hb9mnH4cVjLraHR8b4TWQHYm0wi4N+arGCS/rZjo8XBzYquP5wTP+eqBsJDMHv9gsmeobSXOZY=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=sQnweMMP; arc=none smtp.client-ip=209.85.166.52
Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="sQnweMMP"
Received: by mail-io1-f52.google.com with SMTP id ca18e2360f4ac-938bf212b72so300472239f.1
        for <linux-next@vger.kernel.org>; Wed, 22 Oct 2025 10:17:09 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1761153429; x=1761758229; darn=vger.kernel.org;
        h=content-transfer-encoding:in-reply-to:from:content-language
         :references:cc:to:subject:user-agent:mime-version:date:message-id
         :from:to:cc:subject:date:message-id:reply-to;
        bh=oM0p7h+Z2nS57Gy1ZwM4EQuA8iN1fOsBzNSYLHluowU=;
        b=sQnweMMP8CHMyL/HofxPazvE2sQZqBbJyLLpS22VnD4YxdW0kOi9lAABioRKBGCUA4
         tKTf1OWgqwDKmOsqvxkHItgzLpjp5cSk9kbOIwVvTVHAKFVv/l39ptgHMID8ikMSqoNO
         LdRECG/pOqp8aAgysKgTmF/iOy5PjFyZ11SnOGR/qv7qkxfkaYc9jJPCOMXxpRl9yRTm
         TE0ZmOwAMezyksZfTncysBTDg+BTxhy2NqnjCxrtNpd8FmFgXd05LuT5tYMvUxSFXSA/
         PNrAtz5LsjBRo/GBnzAWAxIsRxJPgxhPPAnLRht1UikO4p9BvVMnd8fDYCCJWb4qOBLw
         RnbQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1761153429; x=1761758229;
        h=content-transfer-encoding:in-reply-to:from:content-language
         :references:cc:to:subject:user-agent:mime-version:date:message-id
         :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
        bh=oM0p7h+Z2nS57Gy1ZwM4EQuA8iN1fOsBzNSYLHluowU=;
        b=qAq6t4/iEp8Mz5SgXP1qCdnKibRWMhG/bWPqky252GLbsyuxRo4UdIeIe+Tty0wOi0
         TxVyDoMmsRT205HYhUp3gD8IDU7koQhXwJ4rnFosisnjPBKTQ79oipkkMRz9dzc8v5Dm
         0OhCiL9Wi3i7Q4OL8rxVf4I2bFLeUzvrpp5Gr66tzdw00APiN7Xf36YZfUUMwASG5SI1
         T/kZblRz8tjjOhoqtU4KjPUH+COv0oDw+5XECZz44rzxexJm8aTyv4AOrlxtAivfQz2R
         Va1oUevBFkXM5u/qKpDOPPYeA2t7CJRW78b//+TzS2JYr9X5AcC+txB4t/cbOXYqmMHk
         BJtA==
X-Forwarded-Encrypted: i=1; AJvYcCVT9bVQXok6LU+paMzcgzuE5RXdf9LOynAHoNhNutcniZEG0H1nXEGZk/N5EfLCRQ/TQpIvh+EIz6es@vger.kernel.org
X-Gm-Message-State: AOJu0YxsMmDbj6q2L9m4d9Sq9rX0YMNBWVgCEVKobt8zmJ/p3oSAdflQ
	00HD+HmrHLXaHr0N0pUyPUH9JLSD5WOzf2YtJmYbt09LiC7sVFB6DBv6EHvi6CKeNQc=
X-Gm-Gg: ASbGncuYCw1XZu7JzhZUIip8eeNoB/ZIil3Kpr3tiwn3sLcuYYNZzz5Ll10uX9okgPB
	STe62qQtMR21h+AFg4ptHUMWRk+8gwJqebcCS+XRTmM6f7tePcOL7aw4Xhcx/XOY/7WlEMazwXY
	pBGeugxplXgpWrB8C8MENRhXnX1vHigXbZekATMIGmy5hl7Z4VA/T7EbEty6ibVAuPL6u5IaUi8
	5HlyGCKPBUjDQQxoSq+is/VlC2KJVE/yR7jCASvMSW8/qUVt6UZIqXZpqtDPQ6A7yX4ByscROSn
	kL3nHoiRXFl8k5KoYh3LL21lxRNlZtQ8eUIDSRgwuwE/nezR8eEJCZJSfRsOMlGDVj2z5Af9T7M
	uN+QXnbApyCO7DASdeHhe2IXM+eSrTZeTXBELpUKkSzPVNatu5c9xFnPi6itZcHWDaYIbuDcLYD
	JsUPfXKq8=
X-Google-Smtp-Source: AGHT+IFUrihliDU05HOaF3fbvtBAn1yJOynaHNfNlRjVB5r/r069hQQXDKG1Iw5Jmp0bDAblcl9BMQ==
X-Received: by 2002:a05:6e02:1565:b0:430:b59b:5f2b with SMTP id e9e14a558f8ab-430c5268fd7mr274791525ab.16.1761153428803;
        Wed, 22 Oct 2025 10:17:08 -0700 (PDT)
Received: from [192.168.1.116] ([96.43.243.2])
        by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-5a8a9630bf1sm5375401173.17.2025.10.22.10.17.08
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Wed, 22 Oct 2025 10:17:08 -0700 (PDT)
Message-ID: <a9074897-4bbc-4b46-8783-0084c5ab5d4d@kernel.dk>
Date: Wed, 22 Oct 2025 11:17:07 -0600
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: linux-next: build failure after merge of the block tree
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Keith Busch <kbusch@kernel.org>,
 Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
 Linux Next Mailing List <linux-next@vger.kernel.org>,
 "kernelci.org bot" <bot@kernelci.org>
References: <20251022162553.5dfb4df9@canb.auug.org.au>
Content-Language: en-US
From: Jens Axboe <axboe@kernel.dk>
In-Reply-To: <20251022162553.5dfb4df9@canb.auug.org.au>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

On 10/21/25 11:25 PM, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the block tree, today's linux-next build (x86_64 defconfig
> clang-17) failed like this:
> 
> io_uring/fdinfo.c:103:22: error: variable 'sqe' is uninitialized when used here [-Werror,-Wuninitialized]
>   103 |                 opcode = READ_ONCE(sqe->opcode);
>       |                                    ^~~
> ./include/asm-generic/rwonce.h:50:14: note: expanded from macro 'READ_ONCE'
>    50 |         __READ_ONCE(x);                                                 \
>         AR      drivers/irqchip/built-in.a
> |                     ^
> ./include/asm-generic/rwonce.h:44:72: note: expanded from macro '__READ_ONCE'
>    44 | #define __READ_ONCE(x)  (*(const volatile __unqual_scalar_typeof(x) *)&(x))
>       |                                                                         ^
> io_uring/fdinfo.c:92:27: note: initialize the variable 'sqe' to silence this warning
>    92 |                 struct io_uring_sqe *sqe;
>       |                                         ^
>       |                                          = NULL
> 1 error generated.
> 
> Introduced by commit
> 
>   31dc41afdef2 ("io_uring: add support for IORING_SETUP_SQE_MIXED")

Yep sorry about that, the current tree should be fine.

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id B160632D0DC;
	Mon, 19 Jan 2026 18:02:20 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1768845740; cv=none; b=a+96NQ+kgisohWDecrYHb0Eutb9v+A4tri5RA+OL1DupEp0voJVKlHbIQfnSRgegZXMZOb/DKJWFOFfkY/kd9q0yNY1iZjww1vC7bfzFwnVV3v/7txrpbQcCj5+g59aZBA4sixD7SD4T6/DKH4LfS3RLMZWD8EQfzJXTOn+GdvU=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1768845740; c=relaxed/simple;
	bh=I1da9P0nDVLM2LzitSpLBr8yOSo3FKe7UCk6SpYxb7I=;
	h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type:
	 Content-Disposition; b=ZOmQOn1I1ziskbqSIVP54ibF8mzcB45HKMG+ulSgCSk9grus2xJ0faxbZE+vSQClwyZMWrkR3S1iAkRZ/tFeihW2a3//9KUc285hvByWKa6RDhCI5d38fuotjRoS+fzpFGXsy/rJ/eV4fg4TGc5/QoSWgCAHR0nDV+u/eVi7LKU=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hDPkjupp; arc=none smtp.client-ip=10.30.226.201
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hDPkjupp"
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 38CFBC116C6;
	Mon, 19 Jan 2026 18:02:19 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
	s=k20201202; t=1768845740;
	bh=I1da9P0nDVLM2LzitSpLBr8yOSo3FKe7UCk6SpYxb7I=;
	h=Date:From:To:Cc:Subject:From;
	b=hDPkjuppYgm2YbFa6a05kKx4kqRtImvSGk9chCVG+bVKIqQvDjtyIpjoZRqob37of
	 p7zBPMRTWd+7KVXIDhNa1ZTrCrHxaTCo5CTaI8azc9kkDvTXsKZQYTvWCaexgNuIi/
	 1xt+ok2guJgRLd3LtUxaFTGqZHg0VY9RwbM//S30VikiSLGZTp22BAlPH9OKtvc5Z5
	 a44894rMm7sLFp60pLe0LigCUmK/HFZ3QxHtOmroHirknEoZE2CLCdSh51vl9RnNKQ
	 pByQwqXOHd3+iFsWHuz4JGWVGokoCB+zGPxsG1m32XFjh5oUtuor5GAqefIw92U96M
	 NNp8nHB0iQMGQ==
Date: Mon, 19 Jan 2026 18:02:16 +0000
From: Mark Brown <broonie@kernel.org>
To: Jens Axboe <axboe@kernel.dk>, Tamir Duberstein <tamird@gmail.com>,
	Miguel Ojeda <ojeda@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <aW5xqLq7gatOy1DV@sirena.org.uk>
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi all,

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

error: unused import: `c_str`
 --> /tmp/next/build/drivers/block/rnull/configfs.rs:6:5
  |
6 |     c_str,
  |     ^^^^^
  |
  = note: `-D unused-imports` implied by `-D warnings`
  = help: to override `-D warnings` add `#[allow(unused_imports)]`

error: aborting due to 1 previous error

Caused by commit

  4cef2fcda3ada (rnull: replace `kernel::c_str!` with C-Strings)

I have used the version from 20260116 instead.

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail-oa1-f50.google.com (mail-oa1-f50.google.com [209.85.160.50])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8A2C032AADA
	for <linux-next@vger.kernel.org>; Mon, 19 Jan 2026 18:05:20 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.50
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1768845922; cv=none; b=DjHAdWBG+abBcgcLzTqoCzJTZyUiJr/kbRlFbPfoCdEEnPA+bibVJ1fSF/OU4GNcu2Xfoo2MDui76NXxwEngVjau3mS0Dc1WmJ7/A3Rduj3px0XjU7f73w7pzu9QKLaapONckc2UK//EyDjEQJOeTsZRNu6liM1+u/+VCS3udrc=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1768845922; c=relaxed/simple;
	bh=YdybMpAz4wBeMaKydaaknVw0GLCvs7AI95I7y5/prHc=;
	h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:
	 In-Reply-To:Content-Type; b=ItmWMI68BxXuv+rQx8/UpQ8eDvnSe0qRHNwW4lowERye3dJwerKAC//I5AALMm+M/Cf4SoTCHgLSRZhQv79ecED0MY7ats4OkvLaaVEF/9gC/UYXC9MDdvQcixtH3LBA20Yhpzo3fL/FKFVKrkttx8AJqGbC0fYZOfWvXEoL0Qo=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=rtfLjtwG; arc=none smtp.client-ip=209.85.160.50
Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="rtfLjtwG"
Received: by mail-oa1-f50.google.com with SMTP id 586e51a60fabf-4042fe53946so1764188fac.3
        for <linux-next@vger.kernel.org>; Mon, 19 Jan 2026 10:05:20 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1768845919; x=1769450719; darn=vger.kernel.org;
        h=content-transfer-encoding:in-reply-to:from:content-language
         :references:cc:to:subject:user-agent:mime-version:date:message-id
         :from:to:cc:subject:date:message-id:reply-to;
        bh=20fQ8Sv0fSbbtiRLRh0tSGwNNg1vKWJ2yewxK7xovDw=;
        b=rtfLjtwGQeVP5/FyUBK5nIQqX2zExxsd01FHAm0f19wCdeoLleOIl5vocmcFr1ZT1H
         zQqkpzKKPvgiXpFb7IyIyiJ5F+v2693zlQClw44LamsD2q3I4jPSDBKsvo/yTto6xC7c
         PmZAfvSh/Ow6Z7dmcS+yriqxLuM+FtDt0L7uHRAgL3iN5IWRqh65Uud27cG0CLmzHRXW
         NavkaWmzlOfsR4UXtTvyiVXWIqHrAXEMn4lWo53Kf/xw29V1SKAD/+QiPVp201lXWPx4
         mNYIiwdejzqyUiR7DZMd9UAi6aCAP/vAjyLKgjZ69qEq0dz6QO6MmsbPgRqR7vC8HsGr
         Xo2Q==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1768845919; x=1769450719;
        h=content-transfer-encoding:in-reply-to:from:content-language
         :references:cc:to:subject:user-agent:mime-version:date:message-id
         :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id
         :reply-to;
        bh=20fQ8Sv0fSbbtiRLRh0tSGwNNg1vKWJ2yewxK7xovDw=;
        b=fm1E73NAoP4IHIi9Vgo7H2P3Y0ls5mmgrvosRu10RWjfKSs5JSPmVa7AYfTr6A1zOE
         vpmVxL2tRGa71dVRn66E6+0OGHS5Gxe24jZbGblUI0GpQnuAdPjIG8kE+aGX/wVzWHr0
         ElulCf/16apPGeZUFKrOEw6/3nI1XyYrH2M41zBPzh5AQEN63wftAUYMwT/02zeJNP0/
         /e+xpSTSvaeKzZXCZSH2Jd2q/N+ygcuZEPamnkAxe6pG5p2iyIvAk7jpHM/CQ3aNuDBE
         sfR6WkNJTv52gPegsm/laMZfPyMK9HGuA4645WzrCImFERlR1UkuB0gUJXiwIjUu/DZX
         1Rew==
X-Forwarded-Encrypted: i=1; AJvYcCVdvgNz3jc4lB4LlnpANVfe6lpAYBVizvegitQ4FpfevSZl0ON3NHqleVtFJRgNGOxyKn+XGWhNf/pF@vger.kernel.org
X-Gm-Message-State: AOJu0Yz2cOeQ3Rqcry+NNSl5J4xlhiWNxO2Fx1P670ebog5WsmmGb6os
	m/9IbZHnb2q1KnIN7A7zg5KAyM/CnoD1sItpDy6QZgxTn/pURrRJWKeVaUggDOrVwHI=
X-Gm-Gg: AY/fxX5tRUnSWVJUUKgzqJIdgxoMaxGEMwvNNWbAAqjOI5omvV/YBkL9/hKQxUIw4d5
	ex5oDpm2qQ1K/19k8gofkpiwCiiqSoGB1hQPPdfycOzma9iWFyq9PEcWARbYjuF/ZcKdb/MGVAT
	M4d9RjpqhMz6keCuACOwFFuROft/dkjnDuu6j3C54c5kw3GGrXxEHB2io6ykBRHR6V6t0/yLzt2
	Z2iQfb005MQxQjEpgw2Lx8177SlYXikBtkYq57YVDaZEkU7XEtd8KsOqVuIhluPcxmgYlnek+cG
	fU8dv0oq9MZ9F00oAs1KsUU246AloSp+0yuIFKBwMVy1g6Ny4W7ihWPHDa8rKrvpfs6SyLCBO6U
	CcpIad+Mx1J82V8kCk6CJOboLwhinOGt25a2KT4vV658i4OMgJZnQi0Pe7//5zbHHews293kawq
	vpoz8/HP49vx6RV68rm566lKjLXckdY4ThGcgL/RrEhWilppGX8rfiPtbEuqxUcGnozbIYcA==
X-Received: by 2002:a05:6871:3867:b0:3e8:8e57:a7a0 with SMTP id 586e51a60fabf-4044d0a5d10mr5450426fac.55.1768845919462;
        Mon, 19 Jan 2026 10:05:19 -0800 (PST)
Received: from [192.168.1.150] ([198.8.77.157])
        by smtp.gmail.com with ESMTPSA id 586e51a60fabf-4044bb545b9sm7282400fac.9.2026.01.19.10.05.18
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Mon, 19 Jan 2026 10:05:18 -0800 (PST)
Message-ID: <7481981a-1441-40cf-9924-de1466a9f33b@kernel.dk>
Date: Mon, 19 Jan 2026 11:05:17 -0700
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: linux-next: build failure after merge of the block tree
To: Mark Brown <broonie@kernel.org>, Tamir Duberstein <tamird@gmail.com>,
 Miguel Ojeda <ojeda@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
 Linux Next Mailing List <linux-next@vger.kernel.org>,
 Andreas Hindborg <a.hindborg@kernel.org>
References: <aW5xqLq7gatOy1DV@sirena.org.uk>
Content-Language: en-US
From: Jens Axboe <axboe@kernel.dk>
In-Reply-To: <aW5xqLq7gatOy1DV@sirena.org.uk>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

On 1/19/26 11:02 AM, Mark Brown wrote:
> Hi all,
> 
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> error: unused import: `c_str`
>  --> /tmp/next/build/drivers/block/rnull/configfs.rs:6:5
>   |
> 6 |     c_str,
>   |     ^^^^^
>   |
>   = note: `-D unused-imports` implied by `-D warnings`
>   = help: to override `-D warnings` add `#[allow(unused_imports)]`
> 
> error: aborting due to 1 previous error
> 
> Caused by commit
> 
>   4cef2fcda3ada (rnull: replace `kernel::c_str!` with C-Strings)
> 
> I have used the version from 20260116 instead.

Adding Andreas too. This is a bit annoying as other stuff in the
block/io_uring tree would be nice to get exposed...


-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9B84C329376;
	Mon, 19 Jan 2026 18:13:49 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1768846429; cv=none; b=OCNjX5RRI+0Rwku95vjExzksYceaqzfQZv4Q9o4HuadpPpqeRw8B42UiJsAxmukBuRQ+FiO4tQJpd9cTg7ArDbu7VymT16Qu0uXT3xrvgbpkvijoM+OdnvR57wZAuM3Cr0eqUii61PzOcjWkRPj4jamRoveYFFpgRMRZ3nIbI8c=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1768846429; c=relaxed/simple;
	bh=DPjqcAB7aD16V2wcnpHyR804aSgUWPXOlEifFvCK7m4=;
	h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version:
	 Content-Type:Content-Disposition:In-Reply-To; b=Db6l7qJJrGpABWpXAcUOpbu7tCQPVzspwZiVm9iBqHMCPgv0JH0CpBkG5Bus1T3lW/8HSFf48Oay7wYhWyLb+ONHfyDUcp71PzHLCIyXMx4e+ZBlcwRPJbEy0TRPe3wt4DEBVUyh5JjB5WdKDZC/W4WbKN1p7VRqKX8YR1wA/0E=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MbwCjtpS; arc=none smtp.client-ip=10.30.226.201
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="MbwCjtpS"
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2234FC116C6;
	Mon, 19 Jan 2026 18:13:47 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
	s=k20201202; t=1768846429;
	bh=DPjqcAB7aD16V2wcnpHyR804aSgUWPXOlEifFvCK7m4=;
	h=Date:From:To:Cc:Subject:References:In-Reply-To:From;
	b=MbwCjtpSJpJ+cwFfP8/JRA/trE0uCsO2J/IBYT5/wx+erQH7ytlYaJCZ4ls8nDO4z
	 e+mdxsbcqYxlcn1mfwHGz+orByBFDKokxxWvcte8rRvCl8G4yT74hVrR1BcPaUyIbP
	 A673SyaEjJMcNAlcVmdvW8Hz14Mbfhh6wADjyho/b5bLI+NIW0coruS4iFLHHrw3pK
	 NEs5m6hGlIncP8NvInnFIg9rjEzowlD8fIZwHh1Jo15fM4IvAQaHzuNgzF7b25LYMJ
	 ZCpBWgwp4mw5RED5isBBz7htFIlRT/3SVAKUiluBJyCpbAU98nUwocm69O1kxLtaDF
	 kySy6hUA9qzow==
Date: Mon, 19 Jan 2026 18:13:45 +0000
From: Mark Brown <broonie@kernel.org>
To: Jens Axboe <axboe@kernel.dk>, Tamir Duberstein <tamird@gmail.com>,
	Miguel Ojeda <ojeda@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the block tree
Message-ID: <fc855e76-5f3a-458e-82f9-f43c7d23932e@sirena.org.uk>
References: <aW5xqLq7gatOy1DV@sirena.org.uk>
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="1lhmSA1PfL40k6Lq"
Content-Disposition: inline
In-Reply-To: <aW5xqLq7gatOy1DV@sirena.org.uk>
X-Cookie: Does not include installation.


--1lhmSA1PfL40k6Lq
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Mon, Jan 19, 2026 at 06:02:20PM +0000, Mark Brown wrote:

> Caused by commit

>   4cef2fcda3ada (rnull: replace `kernel::c_str!` with C-Strings)

> I have used the version from 20260116 instead.

Actually that's been there for a while so I'll just revert the commit
instead.

--1lhmSA1PfL40k6Lq
Content-Type: application/pgp-signature; name="signature.asc"

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

iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmludFgACgkQJNaLcl1U
h9DI2wf/bMxge9hADL7LBI13hyV7Ucsmco5BaGEVybZkcskCL5+xgB4JFmL61uMN
BFNVkF9teY+aDzozM7qiIsEcDnrVpy+BQ/Nm3sx9dCpy/xs5hmtxjekQrE9KztoD
z+umVZZtFq00EdTKHt+F8W/IzLmrAkmz5AnilTJVg3eo17i9dOhUF/TFnKgpX/jH
FggXOPBnYJ/RNcEFB0g+W5SvN3UFZokv25Ya8tKDQreAhlsLxa74raY/uXDaOLfY
4N9gcfuHwVeYhyza55+yW0kgynLF8Rf7QU0jnG2cs75P7AnXIC/7vr8Ie/DhdAuL
uzf1xtJoEUy4vR7ASir/heJJXItaug==
=0RHI
-----END PGP SIGNATURE-----

--1lhmSA1PfL40k6Lq--

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail-lj1-f170.google.com (mail-lj1-f170.google.com [209.85.208.170])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 45D59218AAB
	for <linux-next@vger.kernel.org>; Mon, 19 Jan 2026 18:18:47 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=209.85.208.170
ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1768846728; cv=pass; b=qwQexV/c+engYWyuj8wBBKkI27TxbJa/dYPGvfxll+S/bC0Aevg8EotSRCupKMCVmTw3AeH6GM6W+c6cKF9AzJABbA/cMZdaBIsBWpb5wLCDQRFX1fSAu6MOVKQZLTJmdfvEGeenrxXPuny1oKDs9iG1dYw+UiHCa0s18eZteQg=
ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1768846728; c=relaxed/simple;
	bh=S7QYILs7Ukapbl8xvW6yp1JD+qbAnO2iSQz+gu3ar+w=;
	h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject:
	 To:Cc:Content-Type; b=C/8xL5tR6Dq+NbiQ0ZHyZctWgh3E4oqho06WqTkhcCtFtyYtCTvXuOGzS925BcFQIeV50rUCFHTjUU/eShaNJaUoTJ4aja2gk+cU3c9H/Zpb5PjQBuLmYqoMlBHp4qMT4RLuDOLGCxXmc6EAwaxNaqE5htBUH6fVeqEXw2Hs068=
ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=PcbCWRrR; arc=pass smtp.client-ip=209.85.208.170
Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PcbCWRrR"
Received: by mail-lj1-f170.google.com with SMTP id 38308e7fff4ca-382fd8aaa6eso41804431fa.1
        for <linux-next@vger.kernel.org>; Mon, 19 Jan 2026 10:18:47 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1768846725; cv=none;
        d=google.com; s=arc-20240605;
        b=QkFCJZki4KutWENUAQb02CWTrYFtJl/nDjRebH110WWlvLRG2MVh5uVMGh5p8tk8L7
         LZRlyB7q5O0w9LPErM57CKCTK64VV4RlY8i9ktelBUm7XKNegeyWO3qQ1NI7EqxOlgQD
         lBmmHLdQiou16btTcY/vaOLWNihBKjpyPcVLYK06LfGVBAFvaYMM3IosM4Puiap3cHsS
         ksgYJoXDFsJk1ntmLGJxQY0CoIDAmbBI7mS3cOUE1CUVj0x5bn3DAGbl3eYQVyzXYOVw
         Hj6+gQ1ixM2tg6hDzPMXjP9vjBY3jORXez9ljZ/D07KwBht+YpHaHXOCNfq+r4B8fMM5
         nnaA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605;
        h=content-transfer-encoding:cc:to:subject:message-id:date:from
         :in-reply-to:references:mime-version:dkim-signature;
        bh=eDRwgnqkCJgkf2SIVs7EYEtSBYNgt3Ob1eVFdFvJmeE=;
        fh=CvVja23DxKzbl8DQ90K+QFGqFU6npIwPqd2jEijhxcE=;
        b=iW4WFmfP5TgoRW8jrOp/5Np4kiOUYu44j4+8JoxkiW5Ml1H6nH5WKxnP4GOgoRys/P
         Y9zf/YCLOLrPnpKMGpCsCu74cpBQLnjU9HHdLFrHr+763em1ZyTJ1X0bcRJj138Mx86p
         rdkiNtDGpkOWjkDDgTJBN3D5RW8xAK7xL4CP6ADzx/eyADrsweduHbUDEBtNlfdu7LS2
         Tzrlzom24qqtZwK/HnO9MoaVcRUCAtj0EjBlZIGq8hYFyAdLA7bQOQjKjnHqMtvWpqTG
         7B4ldokD9z9CR4lrWHDlcEgNpWqE/00849iggY2vW+0Rw7pzV619wRu9S+Svs6BKRIVS
         EopA==;
        darn=vger.kernel.org
ARC-Authentication-Results: i=1; mx.google.com; arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20230601; t=1768846725; x=1769451525; darn=vger.kernel.org;
        h=content-transfer-encoding:cc:to:subject:message-id:date:from
         :in-reply-to:references:mime-version:from:to:cc:subject:date
         :message-id:reply-to;
        bh=eDRwgnqkCJgkf2SIVs7EYEtSBYNgt3Ob1eVFdFvJmeE=;
        b=PcbCWRrRvmPCiT00tJM/+LUr12OrY41ZTTOTAZAxoW5oqYImwe2zgMc6XZ/LIHiSHs
         rjVlU0MENMwWGTFHyjKxZrqOTducf23pOSEOygqp8Enx70wyvEZ95UinnFIgbgcVLIvg
         9pyPacdV3CR5gmkR/CDW79tlXb+oU8HU4DYIeVDmri2ad+mFu2SBFOfxsuJ0OlWh0W/F
         wcNU22bgnsMXReGKcXuL/Ry7kwbDBx/YQobZs2SIRp1u8tLDUkje923KpPmXiPLzjkJF
         aVFWR1m2Wcy9SI5miXo602V47mb0P636WBgOTKPEW8uCXm14mzxYDDaW0Yb8WhG3Wmvm
         wxAA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1768846725; x=1769451525;
        h=content-transfer-encoding:cc:to:subject:message-id:date:from
         :in-reply-to:references:mime-version:x-gm-gg:x-gm-message-state:from
         :to:cc:subject:date:message-id:reply-to;
        bh=eDRwgnqkCJgkf2SIVs7EYEtSBYNgt3Ob1eVFdFvJmeE=;
        b=o47O67UHY02u/vdzfrKazdugvgwCxEQA+6/j5UVfsKBGhjsZTnanJRweFBc6jnGMhO
         wycxguZR4WS9jwSLy+bn5j5xmiAnvuWPT5mumd+/195us4xMtxydeDVOHB1Z9iEHLQ8j
         dWEJN8eNXDt4aQk87q7nwBnI9I8/mn5Y+ApGkZgCS7KLJBG830jMWh0xQGkwb7RGOuGo
         BelOfKuKRBFIvBMqYJ5a5bzWjfxWkwSMT+IAUB5vot04jyXdfTMVRTqHIhwqgb3/GmId
         AP4ezZLzjuE5h0o3ceT/hsEYvRrEtxGAN+zbIZyM9dtxJNprX2FpRdHnL5jEDnU7mqOA
         OUPQ==
X-Forwarded-Encrypted: i=1; AJvYcCVt6LdUqMLFVAFhJav2GS70JVRmuKz9pP+hcy6cdqBmPNRrz5kw+e2X2N2h09aZxuPfybkaznPeIK3P@vger.kernel.org
X-Gm-Message-State: AOJu0Yz6gJLST/1VmBpRIrx6MaL+t52tZ4c0TzeAZCay4CbOtGkCSI0Q
	EASrNktL7Ok2Uy5iq1mJ0FgKtVzP+w+kmiiEjA8eLnELX37Ae4ZBujmXM9i90QM7L96n6K64ndz
	Pad8FZE1wX+Buoks+mBjgl9eHh6SabGw=
X-Gm-Gg: AY/fxX6z96tWnPBfs6YO2KZhZDvqK4pRqV/Tj0GCh0xVub4v70ZWkJGaJkDT9sD8ZLd
	3eELC+1DT1QRpG7ZB7HWLPY97iozIZvETo9kHqqzawFbBGrNcOh6JXhFEDx+RnGQcTykB2s8xpk
	B8D4t9LfpoDx4+0mNuYmYK3N2WPJbDUBkTnV7Ek8z1AH00iImebKi0q0qwMvJ7xK9SuepIf5l61
	G7vxvpHuBTROyv4f6antAaMFeYNYheUu+vsdUQiF4fmixvujxIP3yV4ovARKyGGV/tjymPnI/+5
	9RSKfT2CbBYzvlE4J6X4NsS6RFuBXQKyh2WUJX4FnjxSCzUi+Cb4U3q1Nf2y7FrP6UIrTFNQKPL
	mUmzCpZCcIDyJerWSw1HSyoYP9m1ZQwuV/ZN6oMZ+mQ==
X-Received: by 2002:a05:651c:985:b0:37b:97b7:a048 with SMTP id
 38308e7fff4ca-383841b546emr48876181fa.17.1768846725132; Mon, 19 Jan 2026
 10:18:45 -0800 (PST)
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
References: <aW5xqLq7gatOy1DV@sirena.org.uk> <fc855e76-5f3a-458e-82f9-f43c7d23932e@sirena.org.uk>
In-Reply-To: <fc855e76-5f3a-458e-82f9-f43c7d23932e@sirena.org.uk>
From: Tamir Duberstein <tamird@gmail.com>
Date: Mon, 19 Jan 2026 13:18:09 -0500
X-Gm-Features: AZwV_Qhc_8l8-PqDP0lP7BLMUIAF8h6RJKfxU_5cld04yjk5njUVIvjEx7EpnB0
Message-ID: <CAJ-ks9=V_JmzEaXUrHPm6K-DyTgkxEhrPCW=2ZgDJpc+4Z83_A@mail.gmail.com>
Subject: Re: linux-next: build failure after merge of the block tree
To: Mark Brown <broonie@kernel.org>, Andreas Hindborg <a.hindborg@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>, Miguel Ojeda <ojeda@kernel.org>, 
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, 
	Linux Next Mailing List <linux-next@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Mon, Jan 19, 2026 at 1:13=E2=80=AFPM Mark Brown <broonie@kernel.org> wro=
te:
>
> On Mon, Jan 19, 2026 at 06:02:20PM +0000, Mark Brown wrote:
>
> > Caused by commit
>
> >   4cef2fcda3ada (rnull: replace `kernel::c_str!` with C-Strings)
>
> > I have used the version from 20260116 instead.
>
> Actually that's been there for a while so I'll just revert the commit
> instead.

Ah yes, this is the combination of
https://lore.kernel.org/all/20251222-cstr-configfs-v1-1-cc1665c51c43@gmail.=
com/
and https://lore.kernel.org/all/20251222-cstr-block-v1-1-fdab28bb7367@gmail=
.com/
going through different trees. With both changes, the import becomes
unused. Can the import be removed as part of the merge commit?

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 03E7D318142;
	Mon, 19 Jan 2026 18:20:38 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1768846839; cv=none; b=W83XZHVCMFv8IKywK/xZvhTwPrjjj/EM+oHkVR+4O/79H7pdUFarqHeyS+gmV+vC3NozkFkUFymgU2n7+WHm+Rg85UoeUeNz4fJP2meHIq+LM7k6izaKC5fjw6BhD3zf4iJeh7Fl2FWq7xTAkiXHvYbDvlOyKRgO1MMCQIGXN3s=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1768846839; c=relaxed/simple;
	bh=LdRY6iucm53TfUNQVTI238DCic1LdNWFeofO49kLJHo=;
	h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version:
	 Content-Type:Content-Disposition:In-Reply-To; b=X11rmDmAv+Ehi69NdXxiRw1MSTOHcUmRzBCg6tfADbh3302YM2yyianqrjvAbjOviTfm1yLe3rIylq+X2824hG+imaIvmVNHtRH3lZh7KLp4PNmmrqNSwUR6mhkKmXosR6nuyucFB4MzXyDIDU0WlFXrQkDHNoc0hagU4DcJM9M=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WOQlRh2A; arc=none smtp.client-ip=10.30.226.201
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="WOQlRh2A"
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 37366C19422;
	Mon, 19 Jan 2026 18:20:37 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
	s=k20201202; t=1768846838;
	bh=LdRY6iucm53TfUNQVTI238DCic1LdNWFeofO49kLJHo=;
	h=Date:From:To:Cc:Subject:References:In-Reply-To:From;
	b=WOQlRh2ALchoe/iYkO/HT5Ps6J9EE1CI4EVKmmaQlD/qDwAKJ1WDdkAFXL0r22mk+
	 lITulSIslefprPs9dnYGOjdYT49f+5KGQUj1Uy3HpHoe4UT1PKyGyWTYrH90xMhCef
	 D6e/DetQE0DfVAZo42in/P9GUbG+HBu9T0yzcrCXmc4THwJ/9QkLOYYfDAL4f/uFqh
	 gDp9zTKTocBK832RMFzU6EHkxE66LgTZJkBpZYTZUD5UBwFq2P/tWGqnVGS0vYMOWz
	 g3fpGvY3Id+Fk/41dDK/kR/1oIA9ZKP2X4Oi8HcEw+iZ0PEminu0qljuREfEX2zVzA
	 V+IBjARP3SVlA==
Date: Mon, 19 Jan 2026 18:20:34 +0000
From: Mark Brown <broonie@kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: Tamir Duberstein <tamird@gmail.com>, Miguel Ojeda <ojeda@kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Andreas Hindborg <a.hindborg@kernel.org>
Subject: Re: linux-next: build failure after merge of the block tree
Message-ID: <b5e4e92c-91bf-457e-8cd8-5bbb926ab6b9@sirena.org.uk>
References: <aW5xqLq7gatOy1DV@sirena.org.uk>
 <7481981a-1441-40cf-9924-de1466a9f33b@kernel.dk>
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="+PE2sBpg9sNeU+gn"
Content-Disposition: inline
In-Reply-To: <7481981a-1441-40cf-9924-de1466a9f33b@kernel.dk>
X-Cookie: Does not include installation.


--+PE2sBpg9sNeU+gn
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Mon, Jan 19, 2026 at 11:05:17AM -0700, Jens Axboe wrote:
> On 1/19/26 11:02 AM, Mark Brown wrote:

> > Caused by commit

> >   4cef2fcda3ada (rnull: replace `kernel::c_str!` with C-Strings)

> > I have used the version from 20260116 instead.

> Adding Andreas too. This is a bit annoying as other stuff in the
> block/io_uring tree would be nice to get exposed...

Like I said in the other mail it turns out this has been there for a
while (something has triggered the rust build I think, I *thought* I'd
had the toolchain on the build machine already but ICBW and might've put
it on after the release on Friday) so I'm going to do a revert instead
and everything else will get picked up.

--+PE2sBpg9sNeU+gn
Content-Type: application/pgp-signature; name="signature.asc"

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

iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmludfEACgkQJNaLcl1U
h9DvaAf/eIMQpprjJ+Xiv17o0qCdJJxCDRD15CJv4ded3urgmsZIVm4OyLMt7woV
OH0k3XibZ1okBwSbUREwgjCkjpiJGy68x2EsrHWbRD0e1NGfKd1dkeh+fYEyunip
oQOn+rz8Iexp1/2gbX+LNDkBUo5T3u+4Ut0iUflfsxLEGbezzoDKBwCtsBZlCQHO
HF2bXUjwjnjJsPeBhebOA2YwQ3eTcssMlr3IR2keKewmWk/Myy2X5X+hBPIMAJq0
jkxuMYM5fyOCBq9p995PxAVA6lSd+ZSowiS6WmU/lAPxzYsBNSST5KnCYzkdt6jS
Eb1REHLL4vOX1w4o9h3JWR1porYtWQ==
=tF6O
-----END PGP SIGNATURE-----

--+PE2sBpg9sNeU+gn--

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7DD7F2773C6;
	Mon, 19 Jan 2026 18:54:02 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1768848842; cv=none; b=jsb9cTrEOBntFwS3lN4jK42BYfwXCuY1CNb2WzG7ddzt3oa7IAfc6CkjmwxwLQcoIwgxvy0UpW4KlFAMexQYenqdSft0VVDAygQcK7evsj9fLU/DRBsF2gpHJt1h6xtdyTnUG6rj8Q9hiAuExm3oYprYqFnav/gRUEkb2mQeZAg=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1768848842; c=relaxed/simple;
	bh=otdp204VLN47IZwbNbnZPPxzmbM8MHuDiDV5ZEEyles=;
	h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version:
	 Content-Type:Content-Disposition:In-Reply-To; b=VkU4SziaHZBphEautWYsD0RCCKirq/wT+rBh9cxo/ZZjMRZokwPrtaeLhr5jt5GT5Z/OYBtYHWCL8yN/Yk2gM/GAFCAZbcpJktGqAKw6/wH9rxj31O5cFCjmefSwGuMyGn+NBuDhiNG/nkAurpkpy18Eb4A/PQlPExlDIIimIag=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ldvSI1X7; arc=none smtp.client-ip=10.30.226.201
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ldvSI1X7"
Received: by smtp.kernel.org (Postfix) with ESMTPSA id CAFFBC116C6;
	Mon, 19 Jan 2026 18:54:00 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
	s=k20201202; t=1768848842;
	bh=otdp204VLN47IZwbNbnZPPxzmbM8MHuDiDV5ZEEyles=;
	h=Date:From:To:Cc:Subject:References:In-Reply-To:From;
	b=ldvSI1X77CKhhFizj5gD01vnR5tnbqD1X6jUny7IcNsV9vLfMSuX5EMNKWcTYEkQX
	 h9NfmgqMXjiRVchtpIUcG7tl6D1sg0dQeQVRY7h2B4RFMPd3HX5FtrDpyuTDzBh+oR
	 guGAaeC+1ihQQk7NK53P7KmfBX7yTTAW3qgYS/saqI/UmAntVy6E0aSgjeJh6utYMa
	 1Ygc4hDT6oCcMyk7wj7ssBJ1GDxsS9jUinaimsfyN4nGUt4piIOGJbsSSiVhtMZp5M
	 T+RMGeAHib4+1qPMibn3GWRxzAYRarM8NZL0zMTJcDjRXL3C31sVUWMMMuCOMvgaPq
	 j3ampdmRCGUTA==
Date: Mon, 19 Jan 2026 18:53:57 +0000
From: Mark Brown <broonie@kernel.org>
To: Tamir Duberstein <tamird@gmail.com>
Cc: Andreas Hindborg <a.hindborg@kernel.org>, Jens Axboe <axboe@kernel.dk>,
	Miguel Ojeda <ojeda@kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the block tree
Message-ID: <27b562ca-d79b-4f80-be71-ebf5e26ed9ab@sirena.org.uk>
References: <aW5xqLq7gatOy1DV@sirena.org.uk>
 <fc855e76-5f3a-458e-82f9-f43c7d23932e@sirena.org.uk>
 <CAJ-ks9=V_JmzEaXUrHPm6K-DyTgkxEhrPCW=2ZgDJpc+4Z83_A@mail.gmail.com>
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="P4q8oaxhu/lOV53N"
Content-Disposition: inline
In-Reply-To: <CAJ-ks9=V_JmzEaXUrHPm6K-DyTgkxEhrPCW=2ZgDJpc+4Z83_A@mail.gmail.com>
X-Cookie: Does not include installation.


--P4q8oaxhu/lOV53N
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Mon, Jan 19, 2026 at 01:18:09PM -0500, Tamir Duberstein wrote:
> On Mon, Jan 19, 2026 at 1:13=E2=80=AFPM Mark Brown <broonie@kernel.org> w=
rote:
> > On Mon, Jan 19, 2026 at 06:02:20PM +0000, Mark Brown wrote:

> > > Caused by commit

> > >   4cef2fcda3ada (rnull: replace `kernel::c_str!` with C-Strings)

> > > I have used the version from 20260116 instead.

> > Actually that's been there for a while so I'll just revert the commit
> > instead.

> Ah yes, this is the combination of
> https://lore.kernel.org/all/20251222-cstr-configfs-v1-1-cc1665c51c43@gmai=
l.com/
> and https://lore.kernel.org/all/20251222-cstr-block-v1-1-fdab28bb7367@gma=
il.com/
> going through different trees. With both changes, the import becomes
> unused. Can the import be removed as part of the merge commit?

I could do that as a merge fixup instead of the revert, I'll have a look
at some point but not for today.  Someone will need to work out how this
works when things go to Linus...

--P4q8oaxhu/lOV53N
Content-Type: application/pgp-signature; name="signature.asc"

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

iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmlufcUACgkQJNaLcl1U
h9CAOQf9G9F1hgcpKKT7REZGX5EsY9O4xkfzGnt4uHPIbW74oTV28DVnK2qOL9++
N7c7eYitswzvcAgu9SWRrchREorWAPdjL51/4mFudpkA5ma7EzUrJQT11xa+O0Ou
yQHUrIVjR32kUsS0mJLEzVrAxEq4+TN2FDOYa1gijKPwCYX/SRXbMGFa5AHmP1oa
QtTeR74yhxa2OT7YRPVWmjIrJmfvF3aJ7DewW0Aj+wJmH/YzTIeStlsTRV9lvOgU
+I3eRu/p/qwmd3yguD8QX0pChy/Lm8X3s7qtgfDG8tzGJvtIiZui5bEzjhA+/Bqa
HpHtpzhDndILaMhB9A37e1MZ4lVrPw==
=zl/9
-----END PGP SIGNATURE-----

--P4q8oaxhu/lOV53N--

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail-dl1-f42.google.com (mail-dl1-f42.google.com [74.125.82.42])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6AA2738F946
	for <linux-next@vger.kernel.org>; Mon, 19 Jan 2026 18:59:40 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=74.125.82.42
ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1768849181; cv=pass; b=ltILTNOr5xnUvzWl0bghzB6kzIkNJFgSWIJFuqz65pofO/zt+rRwCyTUrsvuFh9mRxRQwA0DE/wYuqm6fAHXmpr8YalQFh/GEjajvpc0y3wT1HC3CPdjcvbUog3J80Bqui0sAwWrv2lHJWa+gwrCQSuxKyeQGKtbVpdo/hwL+xo=
ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1768849181; c=relaxed/simple;
	bh=o9DAEU4AWsCcCNOLp3bYlK7zyrFJ2w2sHYHHHj3Uc48=;
	h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject:
	 To:Cc:Content-Type; b=a4X2Er3Z0oCqNcoFiokoPU1EkKyRDBWZl1nfHM5r2CLdobfMyrZlxTgPFNXi+sr7PKfFhDWod+rseHZgjAUevJmfTjst2B1CtpSJbyYtLEWVW6z/2bG0inK+MF0MPJc3sAmTuS2BOJO0YSQ/PFDlCyo9Wt31uYmOUaTv9ZQ06TI=
ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=DeMq27vR; arc=pass smtp.client-ip=74.125.82.42
Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="DeMq27vR"
Received: by mail-dl1-f42.google.com with SMTP id a92af1059eb24-12336c0ae91so418952c88.2
        for <linux-next@vger.kernel.org>; Mon, 19 Jan 2026 10:59:40 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1768849179; cv=none;
        d=google.com; s=arc-20240605;
        b=Jmz6CZhIL/1HfDBpgzJGLGZxm/2hcL4Q1fkods1RSQMWC429SUoecjsWRk6/wHZ8BD
         EfyU1Z2OwnBnTtjSNjKyeF3vCN+z0NMxSJWgm50aLav0sb1XJ5S/uiY1hZT3sQU/h1pV
         CYvvolxLX809kR3MyjMB0aa27Vrr0BPd3+NvsGE/c6v9GEB3SmPUC7mPP2+U0EaYx1uP
         3LlPTKmAS2dO9yJz4pPIyKDAwlz9dOw2z+wphd8rUMjmFPQ+oxm4mfAc+2crOFQwoMY2
         J2sWDpp7/n2jwa6I1bcl7pW+IY+2H8TMs1EkO1aiyT/RGviKHHMK/amD0UxvKVIN3E8M
         dBAQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605;
        h=content-transfer-encoding:cc:to:subject:message-id:date:from
         :in-reply-to:references:mime-version:dkim-signature;
        bh=xg4DehDqwFRzg85T0/oFHNEkKmDOZJTQ7vEaeDzNVNY=;
        fh=fnFW9xXqQE9fN84JFvBf0PGm5w9Q2mnLhdLXO+F/3qE=;
        b=VY717Ue/OdKSM8HIpmW4MNr2aVQrJMdh/pK0e65iO3+TZqGCkbmyluWpDx95aiLW8q
         l6cGz4lCJ3N7nPT+rdYiLSsbcwyC9tLEt6jtn55ERL1iFH/BaeVgbTkUnRxTT/4leHq6
         kUtcEK3UMUJe2snPT3ZMIInFf1bhpHDEFv9uCYSwDO83g+VKn8Uyr2b61FsTaVpaYwNn
         oLl4lt1J1bRJVVdoF6QTMv7j+KGJhwH/JHITgPFLRfmI5JP+hcpGMQn/drBlJVJ1SuSS
         F8/BwJQMRxPNREl8EuZuiRd291LHFO96XBrNkLVELW2ALOJfjWVdDD/SCQqzSQg/Runp
         8JvQ==;
        darn=vger.kernel.org
ARC-Authentication-Results: i=1; mx.google.com; arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20230601; t=1768849179; x=1769453979; darn=vger.kernel.org;
        h=content-transfer-encoding:cc:to:subject:message-id:date:from
         :in-reply-to:references:mime-version:from:to:cc:subject:date
         :message-id:reply-to;
        bh=xg4DehDqwFRzg85T0/oFHNEkKmDOZJTQ7vEaeDzNVNY=;
        b=DeMq27vR9Uf2Q8YXORJ1h6mGDUlqoF5SXez5GsDMoPT3Mq71EgjL+NFlibYcSJyI/N
         ZO22CacQ1LjE+xQi1PlIT0q4iqsi1r+IGlBKsNIaeCJ6ziQ44q5EsqZ1EMhjY/9NEAlI
         FTXXvDtb0kTqyQIqy/OHpnbNStx9n6lqzIAlhJVxeEIAR+gsfWKrdI+NsMBwGBOhF9nK
         BezJvV/fOW9M81CmyXDTXg6/S+92kNEZ4WKfvrIKPG3UG3HZ5kAjIvKnr+ziB1LhlWcU
         7UpBH9JrqS5jnsCSNPSC1TEceXmoV0Rw4FbqFJxt0mbNLO/JrmbPYU93ts2+h2To01K8
         6fRA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1768849179; x=1769453979;
        h=content-transfer-encoding:cc:to:subject:message-id:date:from
         :in-reply-to:references:mime-version:x-gm-gg:x-gm-message-state:from
         :to:cc:subject:date:message-id:reply-to;
        bh=xg4DehDqwFRzg85T0/oFHNEkKmDOZJTQ7vEaeDzNVNY=;
        b=L+RmE6YhorM4+0wuflnMcJ6Ot4x0ekVo66k7NpBif+icnN8rIVq8urWa6+zNsoq7m/
         /yOgsvEp0ew7YrzrSN7+mA2UHBFLyvX22rZiCcAn4LuXJN85Ob7o/ze7zCvlgan6Our3
         TGpWppId8rzBUbHqXGLGBQcnuSyhMCQ7vnHYK26ZpjN/xBTH+uL7XekuX8loTr9c0QJU
         F9uW+C5D7Og6X6Td8viiMDckHJ1g8kGl0fTBIXb40uBgXIJKKfTK8pWB0qF/8nEWQUGq
         mbCuX2PRCtAL6wk3urrvVyhRw1brooYe9j8WeIGGcqVmxbZIbGQ1DJLg2SQhn14J/PE0
         85Ig==
X-Forwarded-Encrypted: i=1; AJvYcCXMaXD299S4LwPDzlSIon6qQ3L9yG6X+CZsiCw8zQ0yG+YuJi2GaQGRIaLT7gWWrHZovirBqoeUYmrd@vger.kernel.org
X-Gm-Message-State: AOJu0Yz2OyrXk0FA709ELcDpvxAn3TtURj6DiJ8PoEPBmpwL+xPbS8Yk
	+G3VKAIja0lBXVDSTPAKdfSnsTvoIHfL6cN4mKenOZx65LZQWegomNyzLWOlxHGrdd8XqSPOBIK
	3bRcY77BYtcfN/unxBvbY+ffkZO1BrqQ=
X-Gm-Gg: AZuq6aK3+0YK9oWecVy+orrqMoGyuknKref8TkCUL6CUVMaRl0B4LeimK3e576YLEK5
	T97CCpIWcUDw9X0514wUkuTDWoWkLjhM+hKrWnvUPAvDjc4AZF0oLPZ18l+jmowAME/K9+pDwB6
	7YVdG8kLPjbov6uDobkamIWnFuCsCt9wg/BilY0dCSXyUCpvGVzLr0R8cRtz4KnSBFgS8fOJRYM
	WPxFZ0LHo1gOT0WJ18IbvLcibkvlek6PN9vOeeYlPq2V/9mcjRbEhe7wfNHtsIjrcWratY7ihRZ
	7K4uftLj2eNoM5TAyqsbD5jJVj4ZpEiyeGADr56ZxQQv1FFPI8ergCl2z0buf32ER/HJUiO5JqF
	A8ayuFxpA48ZV
X-Received: by 2002:a05:7301:9bcb:b0:2b6:f142:44ce with SMTP id
 5a478bee46e88-2b6f6f81a7emr140167eec.2.1768849179489; Mon, 19 Jan 2026
 10:59:39 -0800 (PST)
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
References: <aW5xqLq7gatOy1DV@sirena.org.uk> <fc855e76-5f3a-458e-82f9-f43c7d23932e@sirena.org.uk>
 <CAJ-ks9=V_JmzEaXUrHPm6K-DyTgkxEhrPCW=2ZgDJpc+4Z83_A@mail.gmail.com> <27b562ca-d79b-4f80-be71-ebf5e26ed9ab@sirena.org.uk>
In-Reply-To: <27b562ca-d79b-4f80-be71-ebf5e26ed9ab@sirena.org.uk>
From: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Date: Mon, 19 Jan 2026 19:59:26 +0100
X-Gm-Features: AZwV_QhrbLqABUGQ2JbKBKnFaIudzalL-h29KJ5-rDXu-pVaHqcTE4CDgaHe2bw
Message-ID: <CANiq72nS94wv50XyOJq5CeiVQvb0+3mNdWxJpFy_+2FH1x4RYQ@mail.gmail.com>
Subject: Re: linux-next: build failure after merge of the block tree
To: Mark Brown <broonie@kernel.org>
Cc: Tamir Duberstein <tamird@gmail.com>, Andreas Hindborg <a.hindborg@kernel.org>, 
	Jens Axboe <axboe@kernel.dk>, Miguel Ojeda <ojeda@kernel.org>, 
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, 
	Linux Next Mailing List <linux-next@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Mon, Jan 19, 2026 at 7:54=E2=80=AFPM Mark Brown <broonie@kernel.org> wro=
te:
>
> I could do that as a merge fixup instead of the revert, I'll have a look
> at some point but not for today.  Someone will need to work out how this
> works when things go to Linus...

That would be great, thanks Mark!

And, indeed, when the PRs are sent to Linus, ideally the submitters
should warn him about it (at least that is what I usually do for other
Rust conflicts -- I usually point him to the resolution in -next
and/or a custom merge pre-PR).

By the way, I will send you the details we briefly talked about in LPC
for the Rust bits.

Cheers,
Miguel

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8C2443921F4;
	Mon, 19 Jan 2026 19:05:27 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1768849527; cv=none; b=Vw7XUmcm0APV2ikzdhFeuJHC+vlrPRd7MVHNS2DNrW7eeqmnffhOfr1UK2k/kngOWkmabiOaPPpBf1uCWl8l8T6vL9A8yLKg+93dfSWHkr8amFa4Y9rkn6QjBsNquTBGxuLFSa8Ydqsj+Jm9nOh7rvf7CGvBGj/s1DAhypUa9ik=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1768849527; c=relaxed/simple;
	bh=1UXo/ckQadGKjEIh+2fot6KVpHFbw83nV/ffKOfR9EM=;
	h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version:
	 Content-Type:Content-Disposition:In-Reply-To; b=dwZPUZLtIhx2sTvhk5IWi3IxsK+YwGHrbFKp1flSfuQPFTjoGOlKSM70o5JIq5S0dHIvLSF3hHcJSVANkjCO53gYzNMKyFDu3JKdHUfrIZ6suJFxcB85qVAwALfqv864+/yuVx0htUsUyUMn0ieshEK1HI3hi7swdzc7pc13rOc=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RtDmI7H0; arc=none smtp.client-ip=10.30.226.201
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="RtDmI7H0"
Received: by smtp.kernel.org (Postfix) with ESMTPSA id DA065C19422;
	Mon, 19 Jan 2026 19:05:25 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
	s=k20201202; t=1768849527;
	bh=1UXo/ckQadGKjEIh+2fot6KVpHFbw83nV/ffKOfR9EM=;
	h=Date:From:To:Cc:Subject:References:In-Reply-To:From;
	b=RtDmI7H06UsfeT0zdXsWI47xKGGa/QTohS+pB6qIxwJsWxJTWDKPoDZjHjmT0x/Mw
	 qSG6xF0huXLHx953PLNshlJAYSqApbQuvSMYW7EBFNVWlhZJI/o6HWxcx4BUeS/VM4
	 nPrCM766RG+MG5DQQWp9QX9x/SOOCbEOn1BLqkASgxpDyu2uuVgKaWjLbXouvAEC8L
	 puybj1ARhQLQ6PFz84U01EyKX3QBR2ZKVioeqYxn4wu8mBtKMJyMQ4Nb51ToRGPk5x
	 DOIE2HqxGg2SWHpNO/S3EWcXCtrkDe6SUQi+jhiOR1wPWxMaL/Zfm8vFakov9BaKqX
	 7O9leTiJl+Mew==
Date: Mon, 19 Jan 2026 19:05:23 +0000
From: Mark Brown <broonie@kernel.org>
To: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Cc: Tamir Duberstein <tamird@gmail.com>,
	Andreas Hindborg <a.hindborg@kernel.org>,
	Jens Axboe <axboe@kernel.dk>, Miguel Ojeda <ojeda@kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the block tree
Message-ID: <aa4bc767-8128-440c-a2a2-81fbb6992a8d@sirena.org.uk>
References: <aW5xqLq7gatOy1DV@sirena.org.uk>
 <fc855e76-5f3a-458e-82f9-f43c7d23932e@sirena.org.uk>
 <CAJ-ks9=V_JmzEaXUrHPm6K-DyTgkxEhrPCW=2ZgDJpc+4Z83_A@mail.gmail.com>
 <27b562ca-d79b-4f80-be71-ebf5e26ed9ab@sirena.org.uk>
 <CANiq72nS94wv50XyOJq5CeiVQvb0+3mNdWxJpFy_+2FH1x4RYQ@mail.gmail.com>
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="qzk/1lXegHHyNoH/"
Content-Disposition: inline
In-Reply-To: <CANiq72nS94wv50XyOJq5CeiVQvb0+3mNdWxJpFy_+2FH1x4RYQ@mail.gmail.com>
X-Cookie: Does not include installation.


--qzk/1lXegHHyNoH/
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Mon, Jan 19, 2026 at 07:59:26PM +0100, Miguel Ojeda wrote:

> By the way, I will send you the details we briefly talked about in LPC
> for the Rust bits.

:) What I have figured out ready for deployment (I'm introducing one
thing per day, today is kselftest) is:

  ./scripts/config --file foo/.config --enable RUST
  make LLVM=1 rustdoc rusftmt

though it looks like allmodconfig has actually picked up CONFIG_RUST so
I might just be able to add the rustdoc/fmt to that.  I might split the
two makes for ease of reporting.

--qzk/1lXegHHyNoH/
Content-Type: application/pgp-signature; name="signature.asc"

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

iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmlugHIACgkQJNaLcl1U
h9Cm+Qf9HuZckYpxdaygyhySX2iH8y5XOjqaK1JpfhnWACTGUzaSL1V95002eeai
YNLNjUp6+S8ZuBStW0MMs1/0OnBCNc/bs3pY5Y5nBGJ/6NsGO9VPz5Ov8XA+BP+r
2msak1L3h2Rf/F0qT4Xh719KoUqN4B6rlPhDmzUnsApZ4BNEhBvRJhftOlD4koSs
AixN/ob4XcmHqS5ygEMGMUPTvcjZne8xHYqGcpaMXj/TLGnnhbU7O1dAvCWCPspV
SM6cwR4CjafjlbUW4We0QC5slvEYD64PdGefOmc3BcWofto/36pswaDGFaAf8U1t
tQyvPd8belVb7E4pfa9ivPXkgh/kiQ==
=/fpM
-----END PGP SIGNATURE-----

--qzk/1lXegHHyNoH/--

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail-oi1-f171.google.com (mail-oi1-f171.google.com [209.85.167.171])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5BD3A2DD60E
	for <linux-next@vger.kernel.org>; Mon, 19 Jan 2026 20:31:48 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.171
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1768854710; cv=none; b=sdXWCPt44WCoXgu6Je+OofLdPjzHLD4Ppz3qwxHaPh9Aud77UvMPlRMcWOeM3pgyYruG/tGzMM6HKXJxQ/bvBH/UjK1XP4jBUZwd2PKiLWx0wNBmnwReac2zkyounUWH9qSyYJfyzH/G9RYRx/ZXd9K8lunt2LQ/eRSX8mN0fvM=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1768854710; c=relaxed/simple;
	bh=iC8NAI660WqK2YHEXo/QTsywt2GY23tG6yij0o2E8dk=;
	h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:
	 In-Reply-To:Content-Type; b=PFnXnmNZb3mP+6xic4z5O0BJS+Bgla6Y4npip90KjDvMKG9Pu6vHHpJYbwWWIJ6EGJAthP23S04NwxzZx0rmTr2VhYjVVKahSaGZpOLiT4sgwX2QibPIphKxRpOk9wDaKJTD8whfM/nir7DTmlzIGw9ZxWjMy15VddS9HyrO8Sw=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=b5S5Ry5k; arc=none smtp.client-ip=209.85.167.171
Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="b5S5Ry5k"
Received: by mail-oi1-f171.google.com with SMTP id 5614622812f47-45c838069e5so2815290b6e.0
        for <linux-next@vger.kernel.org>; Mon, 19 Jan 2026 12:31:48 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1768854707; x=1769459507; darn=vger.kernel.org;
        h=content-transfer-encoding:in-reply-to:from:content-language
         :references:cc:to:subject:user-agent:mime-version:date:message-id
         :from:to:cc:subject:date:message-id:reply-to;
        bh=O+JJKJlNNn7d1kYRSZXPVl0LNnvOQMGv58DtJ6neH+I=;
        b=b5S5Ry5kSjRxuwWdqMzmAqBWZmvT065LltCfqaRqdDgGb7KhCHqBCLC5pjZ3N/PhMB
         lTQTcMsM65iLUmGdV+Xv9NSzJ88jmaENvXoDlsvP4ymX71qtCDUndjDvzmdOLHCEMUXl
         T59ZU65cyheJi46rdeNAeIt2ac/vByznM/Kfm4ouqf3v18gtErVlGDZiNMv49H1ElYBr
         FGcJAOKUZH/cq4qMwm1z4vOyqyDDMdRInFerGP4p8tm3FBiGW0Mb/EOvk4vKRO5xJB/w
         CHJV4joeVETHdKRWzAp1O8FrM5EHeTEPGpZUeKh7NpFVT9/sicXlxLN4SUPIU2+HHqf/
         /RKQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1768854707; x=1769459507;
        h=content-transfer-encoding:in-reply-to:from:content-language
         :references:cc:to:subject:user-agent:mime-version:date:message-id
         :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id
         :reply-to;
        bh=O+JJKJlNNn7d1kYRSZXPVl0LNnvOQMGv58DtJ6neH+I=;
        b=F9HGiHgsTtHlTc35YnQEzhvS4H5pEvYJ561cqVJV0baAZytUtmnSS1NVzB0MTINpQc
         bgI02YARXUOrI4C6usEvjg7P06dM2Poh0cZlk0shYH41vIkg1gPdM5BB/evkEQR6Nxeh
         PsQY9uFfDAc94DINEqIAMQPwk2rJK6DEmmHeObv7a2qh6/VAvokixUGAW0Vvtn17XHMV
         oFpOZq3FeVGz/NAsFQ3qfJ/CYI9dHix+4lkDehc/JRnaxP6wG4y575hZ/qYKbBojUVk4
         xGymKP0KlTbmrI7S7fiybuV8KbKXgbQ3goT7YeokTh00JWF4rHtYeLKcB05bXI2enIzv
         eNtA==
X-Forwarded-Encrypted: i=1; AJvYcCVpVW+AMEKlEY2VonffYnIz/DAP7RZO/6x1NKfPZh5txisiiMr2vK89sckinMcM4diXvJfeFK5lOVS1@vger.kernel.org
X-Gm-Message-State: AOJu0YxYgbgcq028bFSzeQcNeCE+rx4icmomiyWI32tkoNEPfYf5ylbn
	MTkYcCAalbjD9LIitmyCBZ5XJf/ibc90jiO5oy7j/35jkiU1POp4sg5P/4AMHqUx+Y3W2FzR+8q
	w2KV+
X-Gm-Gg: AY/fxX6Onn01CS+4HRTHUQsxCSFMb/lWra+Wj8PTwV9TuIF0QzpYVkwA2qKBgIgVmdt
	mEP5LXTRsVh7bbliP76Nt+9VF3qwq2ATIOgbrngJ1QwnEomXKmT9K/rVysuHPHF2BzNgAFLwNSg
	UOaxfVQWp+wJa9gempI/IvnrIZcXFf1UQpJMceqbaM/zWBQWKBxEpTBL21gCjdbZEMa+wR6Tpxz
	AsrBANo4hP0jNW6n9fpU8NWPlrdpgGYKW0hYRCRjTexM3+hYJpMqWCjRnc5sjNVwf6wjqvARyCA
	3CQ/KqPHbaA+8v5A/LAHy/IK7XZRmd4DtHHe9uBTCKCszICOexgC1cb+FOfHuxSDNHkl9QayXgO
	+IE2c5UjYirSXuYa4/HBLuiKnL7lDSn+aE4OqwCVFMZV3o6FQ/yAro73ZZ4/veT2y/tIgZ7WB+U
	8Q0BPNrVsYN5sgN/bOO3ToAwX+POPdf9lv0GDvVAfyr6t5l8SO1Mt325EyPKs9bz6a+ezmbQ==
X-Received: by 2002:a05:6808:15a1:b0:45a:8af6:24d4 with SMTP id 5614622812f47-45c9c09141cmr5435792b6e.41.1768854707396;
        Mon, 19 Jan 2026 12:31:47 -0800 (PST)
Received: from [192.168.1.150] ([198.8.77.157])
        by smtp.gmail.com with ESMTPSA id 5614622812f47-45c9e03e82esm5949017b6e.15.2026.01.19.12.31.46
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Mon, 19 Jan 2026 12:31:46 -0800 (PST)
Message-ID: <493fac19-4299-4d8c-823b-12eaa79ce010@kernel.dk>
Date: Mon, 19 Jan 2026 13:31:46 -0700
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: linux-next: build failure after merge of the block tree
To: Mark Brown <broonie@kernel.org>
Cc: Tamir Duberstein <tamird@gmail.com>, Miguel Ojeda <ojeda@kernel.org>,
 Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
 Linux Next Mailing List <linux-next@vger.kernel.org>,
 Andreas Hindborg <a.hindborg@kernel.org>
References: <aW5xqLq7gatOy1DV@sirena.org.uk>
 <7481981a-1441-40cf-9924-de1466a9f33b@kernel.dk>
 <b5e4e92c-91bf-457e-8cd8-5bbb926ab6b9@sirena.org.uk>
Content-Language: en-US
From: Jens Axboe <axboe@kernel.dk>
In-Reply-To: <b5e4e92c-91bf-457e-8cd8-5bbb926ab6b9@sirena.org.uk>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

On 1/19/26 11:20 AM, Mark Brown wrote:
> On Mon, Jan 19, 2026 at 11:05:17AM -0700, Jens Axboe wrote:
>> On 1/19/26 11:02 AM, Mark Brown wrote:
> 
>>> Caused by commit
> 
>>>   4cef2fcda3ada (rnull: replace `kernel::c_str!` with C-Strings)
> 
>>> I have used the version from 20260116 instead.
> 
>> Adding Andreas too. This is a bit annoying as other stuff in the
>> block/io_uring tree would be nice to get exposed...
> 
> Like I said in the other mail it turns out this has been there for a
> while (something has triggered the rust build I think, I *thought* I'd
> had the toolchain on the build machine already but ICBW and might've put
> it on after the release on Friday) so I'm going to do a revert instead
> and everything else will get picked up.

Perfect, thanks!

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6077134847B;
	Tue, 20 Jan 2026 09:29:05 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1768901345; cv=none; b=MZtg7NqFLBl3dV0PL/qJhgf+ocWrLpOndboyzV6tp3oZham/VWBb6gQYRSwciFoY0Vik9bH1jY4G3qf7YPkABe0r1gZ0/dklTTm/0/nSR7OHPr2a/cknmcalt9ksEchfCuGgy/cdK8Ila/545ifgdIoxO3aGshS/ieL8qXahQxk=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1768901345; c=relaxed/simple;
	bh=uej1CiIoXBIfJShNq7bpoCYGkjlemjo7/C4thrxh3ug=;
	h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID:
	 MIME-Version:Content-Type; b=VZsavAwrUpOoVBsO8J3VadQ8EnJzrT8+NXM/8aG/lpKKHp8lDu+bJmCvEK7ZM1/4Lsu6nNUbkSSwMzv8boOFhY589uabsbDocp/vGHMy38YlPiLkMLVKuFGZhPeo+8i90A30nPHFXgvLwsC3Vi4vGTdbkBAKjzZNdlHoMB6vrqE=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VAQEnMSg; arc=none smtp.client-ip=10.30.226.201
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="VAQEnMSg"
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7FFB1C16AAE;
	Tue, 20 Jan 2026 09:29:02 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
	s=k20201202; t=1768901344;
	bh=uej1CiIoXBIfJShNq7bpoCYGkjlemjo7/C4thrxh3ug=;
	h=From:To:Cc:Subject:In-Reply-To:References:Date:From;
	b=VAQEnMSgSvbR+9OvFhXYJDf+TlxDvomU91wzaY5Gi+VZFmQtjEcuKySTaF0JIU0eW
	 +fBKWWc6Imp3Ykr1GhoYkuL9sQ1vnPwfYoDu6pWrLLlD/or2kG/YBn4LaznAXVWvcN
	 bHxriqUOBwirnJM1iKOFl2DXSfIZ2LuM1RyTR+yLYfR/j7YgP/lNN3hqBoAS+OHapI
	 glo8R6ebHCzvvrfSkfQOiX2OP6mTMz8VWQsuN3L8DXgvRfNiW9IHRjPjVf9vIkRyTI
	 1e7xWq6jGYJ8HMXLzpGEKLhbtK+eJtX881usrfr6Vpw5+adg3QH5a5DT41KqHJOsnq
	 oc8NCKJ49ZKNg==
From: Andreas Hindborg <a.hindborg@kernel.org>
To: Jens Axboe <axboe@kernel.dk>, Mark Brown <broonie@kernel.org>, Tamir
 Duberstein <tamird@gmail.com>, Miguel Ojeda <ojeda@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next
 Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the block tree
In-Reply-To: <7481981a-1441-40cf-9924-de1466a9f33b@kernel.dk>
References: <aW5xqLq7gatOy1DV@sirena.org.uk>
 <AUJCMNBUg3qSjldH9SHrWsNs5Xg9zAm0Jdq_qlXbcVcyxFnJMFkzTicAmDlaQpvQ-mC4jmGovePldoNa0G2khQ==@protonmail.internalid>
 <7481981a-1441-40cf-9924-de1466a9f33b@kernel.dk>
Date: Tue, 20 Jan 2026 10:28:56 +0100
Message-ID: <87y0lsoco7.fsf@t14s.mail-host-address-is-not-set>
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: text/plain

"Jens Axboe" <axboe@kernel.dk> writes:
Hi Mark,

> On 1/19/26 11:02 AM, Mark Brown wrote:
>> Hi all,
>>
>> After merging the block tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> error: unused import: `c_str`
>>  --> /tmp/next/build/drivers/block/rnull/configfs.rs:6:5
>>   |
>> 6 |     c_str,
>>   |     ^^^^^
>>   |
>>   = note: `-D unused-imports` implied by `-D warnings`
>>   = help: to override `-D warnings` add `#[allow(unused_imports)]`
>>
>> error: aborting due to 1 previous error
>>
>> Caused by commit
>>
>>   4cef2fcda3ada (rnull: replace `kernel::c_str!` with C-Strings)
>>
>> I have used the version from 20260116 instead.
>
> Adding Andreas too. This is a bit annoying as other stuff in the
> block/io_uring tree would be nice to get exposed...
>

I am not sure how I missed that.

Can you apply the following as resolution when merging the block tree?

diff --git a/drivers/block/rnull/configfs.rs b/drivers/block/rnull/configfs.rs
index 2f5a7da03af5d..bfe998d31eb95 100644
--- a/drivers/block/rnull/configfs.rs
+++ b/drivers/block/rnull/configfs.rs
@@ -3,7 +3,6 @@
 use super::{NullBlkDevice, THIS_MODULE};
 use kernel::{
     block::mq::gen_disk::{GenDisk, GenDiskBuilder},
-    c_str,
     configfs::{self, AttributeOperations},
     configfs_attrs,
     fmt::{self, Write as _},


Best regards,
Andreas Hindborg



From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail-dl1-f53.google.com (mail-dl1-f53.google.com [74.125.82.53])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 85FF23D410E
	for <linux-next@vger.kernel.org>; Tue, 20 Jan 2026 22:08:58 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=74.125.82.53
ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1768946942; cv=pass; b=jLqsX+Y5ie+Ytc9nT3cMBw5BWGukrvHX6d008Dcryn0gC6BEDtfSn2OV/5LfmmQCVFLjsRoHw1K4Jy/NXqMjKUOwkn0rgivWvrY04Og4ai7ueGxPL0K5cm+qrQvuyo2m0Bqp58U2sIoTis0UeWrQ2LJ76pHhINik7z3RvOZkCCk=
ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1768946942; c=relaxed/simple;
	bh=z1bB8kSjZa9JR9hWpCGXZYW8uom6DdNyXKm2SLrmLeM=;
	h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject:
	 To:Cc:Content-Type; b=jYnXrfvglxfYV70cpq7ecw5xfEBLNJS8SUMntaztCJPP4zUIVUA1ykl7raq4mu81u4MiuDSLdLkS4/pgddVsyGtFX48znDg4M7WTWuWwuHBc6BDmV9RxHO+Ozja7lqrEg/40IEVLY6BGsUbJbaL2OMbmBSy8QQrtN2Vp8h0pMKI=
ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=CJUow7EV; arc=pass smtp.client-ip=74.125.82.53
Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CJUow7EV"
Received: by mail-dl1-f53.google.com with SMTP id a92af1059eb24-1233608c7e9so407085c88.2
        for <linux-next@vger.kernel.org>; Tue, 20 Jan 2026 14:08:58 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1768946935; cv=none;
        d=google.com; s=arc-20240605;
        b=VbrM1r85Qi38Ga/Co5agtnMbdcla0IHnzDEJ5neTWD7c1K/uP45TICrh18L8ErWt2C
         rcuYC8dbGrhQ4p2DdqIQStayUHj/TycjUd6LjmJoOGW1fEUOHyT+cjfunAxwlcXWQhEK
         J9QJed/uHOaIe9oc5rcC/uajyn7w5uxu8Z7YIw3a4NO/mEVyOcEY2sSPMUn2+KIYOJtd
         N2kTQwibzhsb5N4lcdvrPsVoS/pRxTVnQkywIbQUCyxeQkn5Bks+LS3bxL5KwIiG1ZZ5
         wMjRT6e0Kzy7Hv/rlONQ1HEAj6TZpXPgAmJ6+Djj2kCIYtq1U9S755rFFgbTU+5m3tKX
         Tgjw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605;
        h=content-transfer-encoding:cc:to:subject:message-id:date:from
         :in-reply-to:references:mime-version:dkim-signature;
        bh=z7bY4pt0TpwLdWyK3UcQIm5nIRWEvAUNKg7Ktb/sGrs=;
        fh=C2sBImAtLhpQTGUaEiUfh5pZqDgjcRXxBY6fDduizOY=;
        b=A5hfm/zlwbm3nwOC2J9HtXKfw5GqI+vo1PcxRA1FYrhVYKRnhpZOHYzhLMy9ieUZKD
         9teYpbfmW2PoyH8zeZ59c5YTYCZ+6REL/3n842S8Cwv6LQnyx3+sTrnGWpDJ0vR5rWkh
         7nbbrIIlxalb1FlSMQQV1/5G33YOfFn57b5vo5UGtgxP7WMPnnATG8Mlk88yk3FFphFE
         bHwNFHDaFCjxcmIoHUUWoGFhxLbBdkDJUFJkI7w+x8zMkLy89foQUXlXPch9kgyBKEMd
         b+z77Tzpg0wLQe0XE43gJMvZrFFtE9oIAZBka3iKC4qXzr5lRJmxtUiayQrkxoDgD1oQ
         Jrlw==;
        darn=vger.kernel.org
ARC-Authentication-Results: i=1; mx.google.com; arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20230601; t=1768946935; x=1769551735; darn=vger.kernel.org;
        h=content-transfer-encoding:cc:to:subject:message-id:date:from
         :in-reply-to:references:mime-version:from:to:cc:subject:date
         :message-id:reply-to;
        bh=z7bY4pt0TpwLdWyK3UcQIm5nIRWEvAUNKg7Ktb/sGrs=;
        b=CJUow7EVN/kPlCTOpu+1fLLR2gmtefuIwCw/PtedUQFYVL40RaGyG9KfwZNyLOSdzp
         YWbn/ACOkusWRk/DlLEeZANf9i6PNC6U+E9hQk8AaYhw3gB9JgGv37yorvZpArQb7I+Q
         BqKhKwbXVw1q7Mo2LdEChE1mwR3GHfbj+eoYs5sqS9BmOZ5EKljTpbg8HEbA20KlsIL3
         YtuYzne42Vd9ZyoqjFX3TFwkbnskyPgELh8WQFPlBiTtPw6HFC/PJukkM7W3mz8j2GYS
         vMtXAJ+QW8vtCL0OxvS5k9Mbo+X0iEvalZfWMYagR8u9NTD4ILiL9dbcXOZID35bCvgx
         QXRw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1768946935; x=1769551735;
        h=content-transfer-encoding:cc:to:subject:message-id:date:from
         :in-reply-to:references:mime-version:x-gm-gg:x-gm-message-state:from
         :to:cc:subject:date:message-id:reply-to;
        bh=z7bY4pt0TpwLdWyK3UcQIm5nIRWEvAUNKg7Ktb/sGrs=;
        b=tRh18PDpld+mrYbveAjy7JsweS8ds/5P/iCTcug1hssflyaBDsUr8ohsqy5Ee3E31V
         EJgjCPvUHdSAoPSzMyfedSpBTX988IGceBubF/ruZTyPkNBO4wrMis3sM49SKLjeNAHc
         BP9vKQmjBBeMlRgVPby3W8HpL9aO1mRKMv5qrtEE+mG3oQyElgumfN92VvfW4oJXBizG
         V4MSyYJXVK4QQk5i5oJh30uKQIyD5F9JxaTu6QKK/HaHuE3KUubDactwGvzYHBA11/9C
         S3t0nbWnJssAPilILSzQWmlREzLi/6Hr94UQkrD4bilxMSocL6TIwdvdiZCY8jir22jo
         FlTQ==
X-Forwarded-Encrypted: i=1; AJvYcCVdLP4fXVSAe2yE9rV2fEj3cI8gMHv1ihP2eo0k4sWV5aL/JXOOVxcJ4+2rraUyWahVDtK5Y1GsDjk3@vger.kernel.org
X-Gm-Message-State: AOJu0YyAbvvpBzVvZCcd/4hsYE5iTPDmQLJxJHGQ6/ZCAdCb2OCnXYCN
	MG0bO+1bSxVHOiFGMOhFql/7h8xG9t+6jUWS6WldWKvc1HBMeTZ6C+OQdMgC/F4xXT0hgPgj7H6
	0RDVAbZJ4x2QSZU6N0WE/x6mYBJbB8tE=
X-Gm-Gg: AZuq6aKqJ6FcrLZgh5UM3aV0MVp11B/zE0yBCWYBPXBPlaldJV+1k9r7wn8HsUUwI13
	wJB/mXwQZnun1eHm+73KJ58dsVQ7V5Cxpw6cQSnNddryw+90jPFCGo7O97VULWNMaKHE5bZMCqd
	oNAgEg9Y2CgjR7FW+adUF7D7DjkxdO52iNP+AGsqUjbTtUUUSGJTizk7eRm6U4HKWoHaXpzjpwv
	icAJgtbhyjiGJcP3I/TmWTs+j+UOCsrjxAutr2RxXb5EU4thu7KYTkFtZdGgJhNDLUPgt4IMwIV
	fPabTvOqZO6BGt3/uSlHahKsmssBAAvoZ1BRx+4HlspU+wpSfAw2m4Xxe2WaT2ulR4pmZjpfZ2s
	K3N59u/EoKNfC
X-Received: by 2002:a05:7301:4196:b0:2ae:5b23:1601 with SMTP id
 5a478bee46e88-2b6b380ec2fmr6526477eec.0.1768946933909; Tue, 20 Jan 2026
 14:08:53 -0800 (PST)
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
References: <aW5xqLq7gatOy1DV@sirena.org.uk> <fc855e76-5f3a-458e-82f9-f43c7d23932e@sirena.org.uk>
 <CAJ-ks9=V_JmzEaXUrHPm6K-DyTgkxEhrPCW=2ZgDJpc+4Z83_A@mail.gmail.com>
 <27b562ca-d79b-4f80-be71-ebf5e26ed9ab@sirena.org.uk> <CANiq72nS94wv50XyOJq5CeiVQvb0+3mNdWxJpFy_+2FH1x4RYQ@mail.gmail.com>
 <aa4bc767-8128-440c-a2a2-81fbb6992a8d@sirena.org.uk>
In-Reply-To: <aa4bc767-8128-440c-a2a2-81fbb6992a8d@sirena.org.uk>
From: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Date: Tue, 20 Jan 2026 23:08:40 +0100
X-Gm-Features: AZwV_QjLtYDILmpKHWe3iMB1h0JQyHghHH-t9TiUCmEBYDe7OUkU46R4cUv7SAQ
Message-ID: <CANiq72njSUPt2CvjBiNyKw1KHSgnMdcBnXNL_pHV4iURYL1n6g@mail.gmail.com>
Subject: Re: linux-next: build failure after merge of the block tree
To: Mark Brown <broonie@kernel.org>
Cc: Tamir Duberstein <tamird@gmail.com>, Andreas Hindborg <a.hindborg@kernel.org>, 
	Jens Axboe <axboe@kernel.dk>, Miguel Ojeda <ojeda@kernel.org>, 
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, 
	Linux Next Mailing List <linux-next@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Mon, Jan 19, 2026 at 8:05=E2=80=AFPM Mark Brown <broonie@kernel.org> wro=
te:
>
> :) What I have figured out ready for deployment (I'm introducing one
> thing per day, today is kselftest) is:
>
>   ./scripts/config --file foo/.config --enable RUST
>   make LLVM=3D1 rustdoc rusftmt
>
> though it looks like allmodconfig has actually picked up CONFIG_RUST so
> I might just be able to add the rustdoc/fmt to that.  I might split the
> two makes for ease of reporting.

That is great, thanks!

`rustfmt` + `rustdoc` already cover the most important bits, indeed. I
definitely recommend separating them.

Are you checking the `git status` after `make ... rustfmt` or similar?
Otherwise, you may want to use `rustfmtcheck` instead.

Apart from those, the other main one is adding `CLIPPY=3D1` to your main
`make` line (i.e. not as a new line or command, but in the normal
build one -- the reason is it would otherwise rebuild all the Rust
code constantly if you set/unset it back and forth).

`CLIPPY=3D1` will catch stuff that we want to keep clean, i.e. if there
is a positive, then it should be fixed, thus it would be great if it
is run on linux-next integration. It will break the build with
`WERROR=3Dy` (it just adds more warnings to the compiler), so I think
you should be able to just reuse your workflow/automation.

There are others, but they are not really important compared to that one.

More details on what I told Linus back then:

    https://lore.kernel.org/rust-for-linux/CANiq72kkjGVAtWNZjz5VGen4xoVLfRa=
+Wv399PUO=3DEfcA4TEfQ@mail.gmail.com/

Thanks Mark!

Cheers,
Miguel

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2A0A24968F7;
	Wed, 21 Jan 2026 14:56:56 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1769007417; cv=none; b=tqu85ey6B+J6zc3Fc5MXHabP0Mw+BvWURnf3Li1AZBZwfwYCl+UELnuwDegchl7Ai+M2zf3Vb/1ERhXBf1fKXJ+18ILCdqbEpWev/xoFCqu+QD4iDI8erp9705XIwCayZmVo9GQrnE0bZYlXFG/0hu+AE4daF9ph6uoibPysqlU=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1769007417; c=relaxed/simple;
	bh=9YTT/qT1y7z6jx9j8nFJC5ykVWV2gTWA4ah0iqMhrUY=;
	h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version:
	 Content-Type:Content-Disposition:In-Reply-To; b=ubFmcWPapl/acBMlss9ROILX5Ol92TkJ3Ns7rGxuFxpZsGTbUh6GnVqvh276HYrBw1h2ueIXaDUhS1hNY97f02P5kHCQv6DpojKXGHCpf66/jHkrPIYM3hieFBmh7Wq8z4Ls1fPAQ3uvJmOV1uqLLtKYrYnLel83Xs1eJ1Mspng=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=J2DJ3cux; arc=none smtp.client-ip=10.30.226.201
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="J2DJ3cux"
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 42797C4CEF1;
	Wed, 21 Jan 2026 14:56:55 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
	s=k20201202; t=1769007416;
	bh=9YTT/qT1y7z6jx9j8nFJC5ykVWV2gTWA4ah0iqMhrUY=;
	h=Date:From:To:Cc:Subject:References:In-Reply-To:From;
	b=J2DJ3cuxMiPeNcs+3iBItvCzn9UrmWAEFfYkcuKa4F4Xhl857occgwnwMXn7JGF8i
	 9P6Il63Hm2FUgD5WxSs1AgR+VMVEQ04x44Bj4Zm9PH64orA4kKYz0eYRcPKJogCHRj
	 NQrsl3LPdOQ3BGD0CRrkD2oP42eCGhYXcxlOq+Nfgbi2zQ8ohGdKKox/0inGqSsft/
	 3q5CfuuJaqEq+l4azb8xa7RvzWLmStJ4Zr2UZgWrnlhe0G05Uyzx0w1ViLAIBdEKJ9
	 a439FmtOlTozdgadmymUngmBodS/MQ2nw66u04HiuctkAxkvqH9pmh+MNRaDLb8o1O
	 ct5noBxt2BBvw==
Date: Wed, 21 Jan 2026 14:56:52 +0000
From: Mark Brown <broonie@kernel.org>
To: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Cc: Tamir Duberstein <tamird@gmail.com>,
	Andreas Hindborg <a.hindborg@kernel.org>,
	Jens Axboe <axboe@kernel.dk>, Miguel Ojeda <ojeda@kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the block tree
Message-ID: <b17da8b5-6640-46ea-ba73-d2f4a08e246c@sirena.org.uk>
References: <aW5xqLq7gatOy1DV@sirena.org.uk>
 <fc855e76-5f3a-458e-82f9-f43c7d23932e@sirena.org.uk>
 <CAJ-ks9=V_JmzEaXUrHPm6K-DyTgkxEhrPCW=2ZgDJpc+4Z83_A@mail.gmail.com>
 <27b562ca-d79b-4f80-be71-ebf5e26ed9ab@sirena.org.uk>
 <CANiq72nS94wv50XyOJq5CeiVQvb0+3mNdWxJpFy_+2FH1x4RYQ@mail.gmail.com>
 <aa4bc767-8128-440c-a2a2-81fbb6992a8d@sirena.org.uk>
 <CANiq72njSUPt2CvjBiNyKw1KHSgnMdcBnXNL_pHV4iURYL1n6g@mail.gmail.com>
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="GNZ8fgGYI+rqJD/6"
Content-Disposition: inline
In-Reply-To: <CANiq72njSUPt2CvjBiNyKw1KHSgnMdcBnXNL_pHV4iURYL1n6g@mail.gmail.com>
X-Cookie: Eschew obfuscation.


--GNZ8fgGYI+rqJD/6
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Tue, Jan 20, 2026 at 11:08:40PM +0100, Miguel Ojeda wrote:

> Are you checking the `git status` after `make ... rustfmt` or similar?
> Otherwise, you may want to use `rustfmtcheck` instead.

I'll update my notes to rustfmtcheck, I presume that exits with an error
if it fails?  I'm not actually doing any of this Rust stuff yet, the
builds that are done are just what happens when all*config sees a Rust
toolchain installed.  I've got a small pile of things I'm going through
one at a time. =20

We do really want things to respect O=3D, all the -next builds are using
that, so if anything shows up in the source tree that's a concern.  I am
bodging that for the kselftest build at the minute but it's not great.

> `CLIPPY=3D1` will catch stuff that we want to keep clean, i.e. if there
> is a positive, then it should be fixed, thus it would be great if it
> is run on linux-next integration. It will break the build with
> `WERROR=3Dy` (it just adds more warnings to the compiler), so I think
> you should be able to just reuse your workflow/automation.

That is not going to be usable if it fails -Werror builds, Rust is only
enabled by the all*config configurations and they turn on -Werror
through the same process that they turn on Rust.  We really need -Werror
to pass.  I can set CLIPPY=3D1 for other configs then if they enable Rust
they'll need to pass cleanly but then it'll just explode when turned on
if there's lots of warnings which doesn't seem like it'll help Rust
adoption.  If we were starting from a point where the build was clean
then it'd be more viable.

> More details on what I told Linus back then:

>     https://lore.kernel.org/rust-for-linux/CANiq72kkjGVAtWNZjz5VGen4xoVLf=
Ra+Wv399PUO=3DEfcA4TEfQ@mail.gmail.com/

I should be able to run rust-analyzer to verify that it doesn't error at
least, it looks like rust-analyzer unconditionally outputs into the
current source tree, but it is just one specific file so it's less of an
issue than random cruft.

Running rusttest is a bit weird in that it requires a kernel config but
seems to work fine so I can do that, I was already planning to run KUnit:

|   RUSTC T  /home/broonie/git/linux/rust/macros/lib.rs
|=20
| running 0 tests
|
| test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered ou=
t; finished in 0.00s
|
|   RUSTDOC T /home/broonie/git/linux/rust/macros/lib.rs
|
| running 10 tests
| ii........
| test result: ok. 8 passed; 0 failed; 2 ignored; 0 measured; 0 filtered ou=
t; finished in 0.34s

The build seems rather serialised but it's not that big so not a big
deal.

--GNZ8fgGYI+rqJD/6
Content-Type: application/pgp-signature; name="signature.asc"

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

iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmlw6TMACgkQJNaLcl1U
h9ANvQf/euByicnQQ0xxi/nQSbPgowgSQ6Syla73Z4hKrO2fUF9iK8mQCsDl0BR2
OLcukeepH482N5Oi5SwhkkFcThWzx9KJBghyapNAbFLVK/yLlC+NQ7yKiM+zZ7KD
ICIycfB3n+luEWww0qij3yXfRv64UR/Mous8gWMPgU2OncwEMzKZxytAtpjXyS2w
tJw0HFfhu4HdCEwwKzv7FH8l1AVsz8yL+8SvEofBsPx2yF1xHEBlXC3ivnz8M/au
M+bh3N3jlw9Y9gkTmTgQS6UQNTR0aaxJBIr656n3iFtPnNR8Q+wURqLQd7Cgkf5y
Nm9LOBK+s7n6s4r/7GB4KVN9n9cKsw==
=vLaz
-----END PGP SIGNATURE-----

--GNZ8fgGYI+rqJD/6--

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail-dl1-f45.google.com (mail-dl1-f45.google.com [74.125.82.45])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 01B2C33D6E1
	for <linux-next@vger.kernel.org>; Wed, 21 Jan 2026 18:55:54 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=74.125.82.45
ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1769021758; cv=pass; b=KiEku9ghg+lEhX0yt28dTB7IMrk7NQ4FMl+MmRwdsm57MbsDgLSGejqzbQuVJleXYo4hbSR5ffh0xeZoVl/Vv+HTCw/Jv/mxyx3zVFbPUqpwKMpfEJmXh/AvLVKe6WXM8/7AyJXP7krz4+8dYP0inX8jRsL3gPBVyNIvnlh6xYg=
ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1769021758; c=relaxed/simple;
	bh=xeIw87+gbAq7el87SXtq/6EM2kQ3xkCeRq3UvJvvZB0=;
	h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject:
	 To:Cc:Content-Type; b=JP7sDG4sQBRm5NX9NDTDhPfcVWnvORqAMmqDvVLwEcBu0CZhkYLw7Rj2trPUau51Fw/9VgW9+sRMvwSTXNY4Gdkr5usppVvfQdQ04EtFYjQIckMFequmzYURPVlwwZQ59sn7MUzTrvJWBUzuK4FNRBgk7G17Xf9o7xF4BPnxKMs=
ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=g2EZH91A; arc=pass smtp.client-ip=74.125.82.45
Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="g2EZH91A"
Received: by mail-dl1-f45.google.com with SMTP id a92af1059eb24-1233608c7e9so29415c88.2
        for <linux-next@vger.kernel.org>; Wed, 21 Jan 2026 10:55:54 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1769021752; cv=none;
        d=google.com; s=arc-20240605;
        b=fOHiIBxaF4qWxqHyL24OpzTzQIi/DQ5ow4TBT9FyR9h6Au1JBEo9CJyAYkmjs5OJvS
         W2Z9DhYovlZ2kYR2PV9q7GnbXIlXtH1AnV33DTSaNN2JiJ7TxheqmguJFkQcMVmzHqzc
         NWaMH4gIZJ50PWVSNJJU/xu8iFVxgl+KHxIGLrrFVA6XTtAwZ6HlBQ+JtX9bkRD4i3P/
         JaNYIJVKoqo0DM163qPFWR4AFaNg4MhaF+/AKAWmG2esoG1UfzEZRPjSID6CDOEesSis
         UaDoQqs54GxHESeGljt5Mw+CGa2MY2A6gbFhDLlfYNf540IF6tiVS58F7YOECJ+ULA0H
         IpuQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605;
        h=content-transfer-encoding:cc:to:subject:message-id:date:from
         :in-reply-to:references:mime-version:dkim-signature;
        bh=nHG8tTRfzHw94zzrYAHAUzJvAxMVDyhnSEwoj4O9f58=;
        fh=U3ksuDb+FLUMYetzRfAAPSZOB3dsw8En7Ce7renx1XA=;
        b=hH4dw/Em6LKQM0ut0Zp0Ggv23tSVxS5p/kyO/Xk+jTZz1mxL3PU1HUKyMG5Oaz9c1M
         mAm37kfNqpwhWkiPyjYcrEk3NaxDlmlHWFumY/KQFFoawgOSt34tHyamOUI/1i26b+sS
         hyGFK08Ez5kSqvoidHFj9oTVkz7Ce8tkJWn69Ltg2xyjHxDOIc6o/aJcWG6LAnegw7xO
         d714MGzkcxhM5BQ849s1VRquDYQyVBn0VY+bOx8ETSTmGRCtSs/01FZg5cHVZ6tY1RZW
         zG+pq+s3A8W/WPCp6pQ3NMGuqNTtbB4BELnP3KN4UyrdWYLGfXvJrmF9lorhtEBjCREg
         jOKg==;
        darn=vger.kernel.org
ARC-Authentication-Results: i=1; mx.google.com; arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20230601; t=1769021752; x=1769626552; darn=vger.kernel.org;
        h=content-transfer-encoding:cc:to:subject:message-id:date:from
         :in-reply-to:references:mime-version:from:to:cc:subject:date
         :message-id:reply-to;
        bh=nHG8tTRfzHw94zzrYAHAUzJvAxMVDyhnSEwoj4O9f58=;
        b=g2EZH91AnJc8AkHjMVo8tueswdsjo9LUH0XwuVs/tg5d1p67gqKE285yDfkPkmY95e
         w8ZR7RtSMZ04AiWzK2RRnfn36cb8XGFBPiyPzYjpBGszj7OYRPkxSrAPpmFjaZeQMCBm
         gKbtR1JYiq6Y4369qa1QNNX+PLkkUl53A9L7Su/P1tiopmnUgaByexptOk50HgoVsNo4
         FqvfdYAAEKo0/mTU5JAOZS1+8ranDXpAF/lOXeAfGr0FE2gEUVUFxEaGXzhV7i1I148A
         VZrvWr74Y6VxtdlXIJtRmZNnErASRPqRRyRD9MEIkPFOTSaRETIOEMsN/VSrZ9LP9QUc
         Hf8g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1769021752; x=1769626552;
        h=content-transfer-encoding:cc:to:subject:message-id:date:from
         :in-reply-to:references:mime-version:x-gm-gg:x-gm-message-state:from
         :to:cc:subject:date:message-id:reply-to;
        bh=nHG8tTRfzHw94zzrYAHAUzJvAxMVDyhnSEwoj4O9f58=;
        b=o9+0Ro+/PTDuqWMhdTS4F94TKswUJkZ5C0S0dy04iooldp9Ulb9MV1zLp432Lu811H
         97pW9kJ5eWFUWKXOGPjj/6gmP38j3L/xicxsVN6dz0VmAVAuy1/EOhR7v1QwUEt4ijc8
         LzvQjj2suXi2B3Du9qXI5Cv2EJPqJu+3CiEanVIW4hkVlybkOB/NlYNGI2ZAazA9jJqt
         zPVxRNB2diy4Ap3tm37jzoVHTu5VQgcqy/chlFUwlqkLmp3TodepPNdwivVRO+yzgPaU
         esZawbOUzL6vNOPAsWoNFVgj+N6kfaVR3UJJEqVR316XowCY0vT51DZ+IQEvT2LPqHNN
         g0SA==
X-Forwarded-Encrypted: i=1; AJvYcCURhxIVU9AKt4bCNLF3mZ+34WTWnkTojVSsELg3s6D0C8XYytbov4bT2URKrITEwOsUcEPv3UA8mnr4@vger.kernel.org
X-Gm-Message-State: AOJu0Yx/6PdbC4o/DOXtyfoA4Ouh7W2jhEE/hpf+KmDxQcxfXVV1lxg0
	g6TvnXG8UQoZJBWg/XvdipMdOt/8NR7o8rSZNiWHZV7pp52RHpMPjW7Xi2Nm8Cthm5cngugueS9
	I8n8UAIb8/DH9VLbYZaVVnLWdIoHmrvw=
X-Gm-Gg: AZuq6aLB5uhqeWDFmq514vTSq9txqu/I89YgZPtHm6pCkuxu2WFz5xJ7p1pmMwLMUpi
	5WdGS4BlQ9VhUBUfpdv6xlXzLAOGiWwbsUqKcPAEL/aXsiUuA0YU6+JBuEzOAmpbEsOaNaRrXzY
	YhhRT6eWWn8CF0lLGRMnVZgW3EXWsb+l0xXYHtXjHx/THFfK0no93Xz7ntRZnF7YT2mDByBZxZV
	/yV6UGlPohKyPP6+RsXchxxOIlh3pxl39wJdk4TQxtIaB7I2Ys+4ZmdJyE2iaBcpsJfI/6F6IIT
	LGUugqVB/XXGMDpLS5rCPqGVDSVPgZfh7QFUYXi/orhQp5tTI9/ptoBXsIcuFv6tNP3P3fPLHdB
	YbGudDN5ZRIFr
X-Received: by 2002:a05:7301:1286:b0:2ae:5f73:1968 with SMTP id
 5a478bee46e88-2b6b3ecb13dmr6787656eec.2.1769021751747; Wed, 21 Jan 2026
 10:55:51 -0800 (PST)
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
References: <aW5xqLq7gatOy1DV@sirena.org.uk> <fc855e76-5f3a-458e-82f9-f43c7d23932e@sirena.org.uk>
 <CAJ-ks9=V_JmzEaXUrHPm6K-DyTgkxEhrPCW=2ZgDJpc+4Z83_A@mail.gmail.com>
 <27b562ca-d79b-4f80-be71-ebf5e26ed9ab@sirena.org.uk> <CANiq72nS94wv50XyOJq5CeiVQvb0+3mNdWxJpFy_+2FH1x4RYQ@mail.gmail.com>
 <aa4bc767-8128-440c-a2a2-81fbb6992a8d@sirena.org.uk> <CANiq72njSUPt2CvjBiNyKw1KHSgnMdcBnXNL_pHV4iURYL1n6g@mail.gmail.com>
 <b17da8b5-6640-46ea-ba73-d2f4a08e246c@sirena.org.uk>
In-Reply-To: <b17da8b5-6640-46ea-ba73-d2f4a08e246c@sirena.org.uk>
From: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Date: Wed, 21 Jan 2026 19:55:39 +0100
X-Gm-Features: AZwV_QjUvg_avF4Efiz0niieqAhIejZgNq3bpQMKYiUHa8aZ5nunCXSR-yxpcXs
Message-ID: <CANiq72kT9ThJcr5W0OhBmbwKZCpULjUehNjijTt8W09yB0CxSg@mail.gmail.com>
Subject: Re: linux-next: build failure after merge of the block tree
To: Mark Brown <broonie@kernel.org>, David Gow <davidgow@google.com>
Cc: Tamir Duberstein <tamird@gmail.com>, Andreas Hindborg <a.hindborg@kernel.org>, 
	Jens Axboe <axboe@kernel.dk>, Miguel Ojeda <ojeda@kernel.org>, 
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, 
	Linux Next Mailing List <linux-next@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Wed, Jan 21, 2026 at 3:56=E2=80=AFPM Mark Brown <broonie@kernel.org> wro=
te:
>
> I'll update my notes to rustfmtcheck, I presume that exits with an error
> if it fails?  I'm not actually doing any of this Rust stuff yet, the
> builds that are done are just what happens when all*config sees a Rust
> toolchain installed.  I've got a small pile of things I'm going through
> one at a time.

Yeah, the `rustfmtcheck` target just returns non-zero (and the diff)
if formatting is required.

> We do really want things to respect O=3D, all the -next builds are using
> that, so if anything shows up in the source tree that's a concern.  I am
> bodging that for the kselftest build at the minute but it's not great.

Not sure what you mean about `O=3D`. Using `O=3D` is supported (both for
the subdir and external dir cases which are slightly different in the
build system). Modulo bugs, of course.

If you mean to ask whether `rustfmt` creates files: no, it replaces
in-place, i.e. by `git status` I meant you would see modified files,
not new ones.

> That is not going to be usable if it fails -Werror builds, Rust is only
> enabled by the all*config configurations and they turn on -Werror
> through the same process that they turn on Rust.  We really need -Werror
> to pass.  I can set CLIPPY=3D1 for other configs then if they enable Rust
> they'll need to pass cleanly but then it'll just explode when turned on
> if there's lots of warnings which doesn't seem like it'll help Rust
> adoption.  If we were starting from a point where the build was clean
> then it'd be more viable.

I am not sure I understand. `CLIPPY=3D1` is intended to be clean, and
over time I have sent patches to trees that break that (same for
`rustfmt` and `rustdoc`).

Things should already be generally clean modulo small bits that appear
from time to time. I just ran an `allmodconfig` in next-20260121 with
Rust 1.92.0 and I saw one `rustfmt` issue, one `rustdoc` and one
`CLIPPY=3D1` one -- I just sent patches for all (a couple appeared
today, the last one is in a driver I was not enabling in my regular CI
runs so I missed that one but it is nevertheless new in v6.19).

I have put you in Cc so that you can see the usual things that you may
spot when merging trees if the maintainers didn't do it.

That is why if you could enforce this in linux-next it would help a
lot, instead of fixing trees after the fact like in the emails above.
Things will still slip through, of course, depending on
configs/arch/... etc., but it would definitely help catch most of it.

i.e. what I am saying is that trees ideally should not be merged at
all if they trigger `CLIPPY=3D1` warnings (of course, exceptions can be
made when needed, e.g. on an emergency).

> I should be able to run rust-analyzer to verify that it doesn't error at
> least, it looks like rust-analyzer unconditionally outputs into the
> current source tree, but it is just one specific file so it's less of an
> issue than random cruft.

No, it outputs to `O=3D` -- if that is not working for you, please let me k=
now.

i.e. that should not be a problem even for e.g. read-only srctrees.

> Running rusttest is a bit weird in that it requires a kernel config but
> seems to work fine so I can do that, I was already planning to run KUnit:

We used the `rusttest` target more in the past, before I made the
KUnit integration of the doctests, but it really doesn't do much
nowadays and carries a fair bit of complexity on the build system. My
current thinking is to migrate those tests and then just make it no-op
until we find a better use case if any for the target name. So it
isn't critical if you don't run it.

Now, you mention KUnit, and that is very interesting!

The overwhelming majority of our tests are all in fact KUnit-based,
e.g. these are our doctests (i.e. examples that are built and ran as
tests):

    [  2.714912] # rust_doctests_kernel: pass:283 fail:0 skip:0 total:283

but we also have a few other suites that come from `#[test]`s
("normal" unit tests), e.g.:

     [  2.260774] # rust_atomics: pass:6 fail:0 skip:0 total:6

So, do you mean you plan to run them under QEMU for x86_64 or arm64 or
similar? That would be amazing for us! I didn't know you planned to do
runtime tests.

For x86_64 and arm64 things should work fine and it would be great to
enforce it in linux-next already (I check the KUnit results in several
trees, including stable/LTSs).

Now, if you mean UML to run them, that is still best-effort with Rust,
and it may or may not be completely clean at certain moments (Cc'ing
David, who has been driving that and done a ton of work there).

Cheers,
Miguel

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4B9853570A0
	for <linux-next@vger.kernel.org>; Thu, 22 Jan 2026 06:36:28 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=209.85.221.42
ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1769063790; cv=pass; b=dwpFra0Gv57TuCR74MAhZnXltRzdOnXKFtvUwI/kfYWeM99gf7Amq9v2YF2rIFB1aLIkRrJdvf00J7bIPTUwBhMEuePuy/MXQL3XqxoUUsvJUGkDjyscPRXcg7FTnAARzJA8BLzX2EglGGPn1SlSgmRGLE3a8efbuRG7dzQTnDM=
ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1769063790; c=relaxed/simple;
	bh=3t5XgmNdWoTSZOqD+xQnIwR2zAKu2BajszBmmP+XSeI=;
	h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject:
	 To:Cc:Content-Type; b=Xe588wN7o8lHSqw1r1e5nwA2w9Js/LKXy7QpIk7ReFWeSbSa7lwugEetvpHpoNqNycD66tD0klV9SAKubHM1B7TLm98DvIh1KJjfNqrTpccIkGT3Aab3/Y4XIGQFDB3oAjQaOD20H+Heu7E7uyFq3terNS6pwDVcN3Z5EdggsTg=
ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=sTUWaGsa; arc=pass smtp.client-ip=209.85.221.42
Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=google.com
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="sTUWaGsa"
Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-4359249bbacso1013619f8f.0
        for <linux-next@vger.kernel.org>; Wed, 21 Jan 2026 22:36:28 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1769063786; cv=none;
        d=google.com; s=arc-20240605;
        b=lYCG/oRnlDTUEuhUBH5Cmd/vdzo53gtdifIgM4E4ZuWh5Zls4BZq5xzPYjFSlUMxrG
         QAhpNkbv3HErIY84m+UNsTnT9F8S0N2qJ2Wo4Q/TK7Loukmna1Dkb9bGsyKzvvdKG1M0
         /T941Dv+/+uR60tVaElUE3ZWFZVPxJkjCBMmgQ/07aE1PFU7fCbkdLNxgJRAMi/NZ7gq
         EAkCH0tN12tql9VkGlwShBv/zS8M44Q5vOaZBU9PjX2KKX+7fLzLTcubby9zEV0ITz5y
         llD4Xn4cOlOP2czCw090YLfx8cCBhAl+Dl12c1i+zcJvEyqKNTs//JzPAE8ipQIlYGBF
         cQJw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605;
        h=cc:to:subject:message-id:date:from:in-reply-to:references
         :mime-version:dkim-signature;
        bh=QddNQZle1f13I3IZ1I6r4CCUwCZgeMOKhRKhoQFIlaQ=;
        fh=ZjZJ4DDbhhsagRPPz6UY/rpV3M5mtULXNIWz32WzqEk=;
        b=QoT2JrP0NHrpjU68ADMeX7iXOQYEEfERlBFw6io2tzdgEySt6bJpHKwxsurNx62Kjw
         wZAnl5hFoO075oAFCq+XwKdcGbUCffJy+j187t70JXsQwysg4IiCP3yK5NWDTnMTgLyy
         HDcRPNI81U9j1/OCXgP3E8DzW0EDgSawTy2SrvqxgqgLnwyvGhqvZJ9x5+qsVNXmoO0s
         eF9HTA1HQx4ZpX9EZ/d0JcXe2X6MC8NffBlu933YewXj8TFbVEwQhRC/Wx8tup018HXm
         Pj5vETKNMjdj/zjlq1EUpMPiGWUgD/5CyMmwY9kolIPSYn5TIC13vIEwafdPjuiaW/4G
         40Gw==;
        darn=vger.kernel.org
ARC-Authentication-Results: i=1; mx.google.com; arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=google.com; s=20230601; t=1769063786; x=1769668586; darn=vger.kernel.org;
        h=cc:to:subject:message-id:date:from:in-reply-to:references
         :mime-version:from:to:cc:subject:date:message-id:reply-to;
        bh=QddNQZle1f13I3IZ1I6r4CCUwCZgeMOKhRKhoQFIlaQ=;
        b=sTUWaGsaBnkJwaMmQMBNFr9mil/FjVDE6m7MR+sUxb0C1wJoW5RGQwgwH7zqXWPlZ+
         Q4iZshK06aikqNOrBWNDFBJI8mMY2ozzSyXy55Sl15REls4kMycZJWkF7ePy8DGB5nz+
         0zZ5SGgwyLyS4DYzzo+cKnHORJ/zd+7nf1powkEU/VdhNWjhBSoxDuA6+/RRkHVPB6fm
         AZotJDSK7gwK1xNZAenyn5o52wuSDt+yl8QJkEqKeEGlFnHpPNatIwVlEflEp+2I12Gx
         /pYBi8sZblhOQU35Dg3cI9p9GBCN2VGrOfmOaW6sSWLD+TwvHtgHAR+gxltVXCseOBkI
         VKxA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1769063786; x=1769668586;
        h=cc:to:subject:message-id:date:from:in-reply-to:references
         :mime-version:x-gm-gg:x-gm-message-state:from:to:cc:subject:date
         :message-id:reply-to;
        bh=QddNQZle1f13I3IZ1I6r4CCUwCZgeMOKhRKhoQFIlaQ=;
        b=pQPJY3H6wCf4YJtCL9IYw+8FI/O/P5PuJA6MyYPWHhcmuyKXlad3XKDnhA2/HAy5Vc
         ntvng4cLVdLP6KVVhjsRCi32IXLY9Ty75w0V7qc4xM8Opi2ivuCrYtfSq1vASAiPQFtc
         xXOpkukRgV7URsoTrQmdoBGn8nu8M1+V0/x3VFNGuqqbRptj1BOr7nqFdclHXIV6OQQP
         fR+EgoBSpyMn8NhizgSCQ/5l2DikfXNjvR7eCGIMpFXdlSY19pnR24r6KHFzTbKbKEKA
         QMD3KbHhhKeuLMc3hcnW2hDNbS1m0cwWK/AWoyyI4xN3LdAUfpbgqEhJC4KLHk1nuIMC
         w9bQ==
X-Forwarded-Encrypted: i=1; AJvYcCVZ+VYuZQaUhaVxN32pQKJrhqYPw/QrObzdEE2JtnnAHzeimBh4EV8HTALu0TiLx5l7xgUlKTqXNuzj@vger.kernel.org
X-Gm-Message-State: AOJu0YwNW6JvIbTuGIgTU7RI3/TOJ6vU9Dxnc7MBLPL9o6wUzhckn2ci
	5GTOWr5BuyStQT4T0AQpkXqM1jxiQFwsLMx0PHV1P+7tyw9JrFKnKvRqDbc0MyBqmzzR3nvePq5
	O/gE+j+ekKZ3tY9w6vwTVAM1CAHCgckfJPqCwcXDR
X-Gm-Gg: AZuq6aIbFHQQ/ib2FK3mEtNCCGGHepPjeweF8MYkmUy5lFz6AFnKWGvxSiFRNoWiGSD
	aFcOlbTQehHNumRsJ/vgJr/fImJsLTMZEw+CLdG7oX2gKzMxbYIBm1bUKbzYmDWj5l3/Mdn7byo
	46FvxbO/z1G+4TFSuwe2bHTyTGClML3T8o3GRhPaz/nnxCyVsLDZFMjYGwc7+m1iy3dYxa+az0D
	ve5uUMHhG3U/UHtgglyRhIE17q6Iz/rlwFmj/dsO0rstUTdYXzdDF0/6TXZASi4Q0cyXA==
X-Received: by 2002:a5d:5d0e:0:b0:435:953e:5897 with SMTP id
 ffacd0b85a97d-435a5fe530emr3281854f8f.25.1769063786320; Wed, 21 Jan 2026
 22:36:26 -0800 (PST)
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
References: <aW5xqLq7gatOy1DV@sirena.org.uk> <fc855e76-5f3a-458e-82f9-f43c7d23932e@sirena.org.uk>
 <CAJ-ks9=V_JmzEaXUrHPm6K-DyTgkxEhrPCW=2ZgDJpc+4Z83_A@mail.gmail.com>
 <27b562ca-d79b-4f80-be71-ebf5e26ed9ab@sirena.org.uk> <CANiq72nS94wv50XyOJq5CeiVQvb0+3mNdWxJpFy_+2FH1x4RYQ@mail.gmail.com>
 <aa4bc767-8128-440c-a2a2-81fbb6992a8d@sirena.org.uk> <CANiq72njSUPt2CvjBiNyKw1KHSgnMdcBnXNL_pHV4iURYL1n6g@mail.gmail.com>
 <b17da8b5-6640-46ea-ba73-d2f4a08e246c@sirena.org.uk> <CANiq72kT9ThJcr5W0OhBmbwKZCpULjUehNjijTt8W09yB0CxSg@mail.gmail.com>
In-Reply-To: <CANiq72kT9ThJcr5W0OhBmbwKZCpULjUehNjijTt8W09yB0CxSg@mail.gmail.com>
From: David Gow <davidgow@google.com>
Date: Thu, 22 Jan 2026 14:36:14 +0800
X-Gm-Features: AZwV_QgCYGOiclsgn3tTwOXhStV919vEJ5uDE25GpJKzoqRutT5r7UPqnWXEZvQ
Message-ID: <CABVgOS=DHdF6XmVUKH1zTML3kV7ozy8BG4o1dyd07BnngpYx4A@mail.gmail.com>
Subject: Re: linux-next: build failure after merge of the block tree
To: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Cc: Mark Brown <broonie@kernel.org>, Tamir Duberstein <tamird@gmail.com>, 
	Andreas Hindborg <a.hindborg@kernel.org>, Jens Axboe <axboe@kernel.dk>, Miguel Ojeda <ojeda@kernel.org>, 
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, 
	Linux Next Mailing List <linux-next@vger.kernel.org>
Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-256;
	boundary="0000000000009b86370648f44279"

--0000000000009b86370648f44279
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Thu, 22 Jan 2026 at 02:55, Miguel Ojeda
<miguel.ojeda.sandonis@gmail.com> wrote:
>
> On Wed, Jan 21, 2026 at 3:56=E2=80=AFPM Mark Brown <broonie@kernel.org> w=
rote:

(...snnip...)

> > Running rusttest is a bit weird in that it requires a kernel config but
> > seems to work fine so I can do that, I was already planning to run KUni=
t:
>
> We used the `rusttest` target more in the past, before I made the
> KUnit integration of the doctests, but it really doesn't do much
> nowadays and carries a fair bit of complexity on the build system. My
> current thinking is to migrate those tests and then just make it no-op
> until we find a better use case if any for the target name. So it
> isn't critical if you don't run it.
>
> Now, you mention KUnit, and that is very interesting!
>
> The overwhelming majority of our tests are all in fact KUnit-based,
> e.g. these are our doctests (i.e. examples that are built and ran as
> tests):
>
>     [  2.714912] # rust_doctests_kernel: pass:283 fail:0 skip:0 total:283
>
> but we also have a few other suites that come from `#[test]`s
> ("normal" unit tests), e.g.:
>
>      [  2.260774] # rust_atomics: pass:6 fail:0 skip:0 total:6
>
> So, do you mean you plan to run them under QEMU for x86_64 or arm64 or
> similar? That would be amazing for us! I didn't know you planned to do
> runtime tests.
>
> For x86_64 and arm64 things should work fine and it would be great to
> enforce it in linux-next already (I check the KUnit results in several
> trees, including stable/LTSs).
>
> Now, if you mean UML to run them, that is still best-effort with Rust,
> and it may or may not be completely clean at certain moments (Cc'ing
> David, who has been driving that and done a ton of work there).

The UML Rust support is pretty stable for the core Rust bits, KUnit
tests, etc. It can get a little broken from time to time with new
drivers, gcc-based builds (instead of LLVM=3D1), or 32-bit builds.
Ideally, those will work as well --- everything seems fine at the
moment --- and you shouldn't have any problems with just running:

./tools/testing/kunit/kunit.py run --kconfig_add CONFIG_RUST=3Dy
--make_options LLVM=3D1

But do let me know if anything is broken.

Cheers,
-- David

--0000000000009b86370648f44279
Content-Type: application/pkcs7-signature; name="smime.p7s"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="smime.p7s"
Content-Description: S/MIME Cryptographic Signature

MIIUnQYJKoZIhvcNAQcCoIIUjjCCFIoCAQExDzANBglghkgBZQMEAgEFADALBgkqhkiG9w0BBwGg
ghIEMIIGkTCCBHmgAwIBAgIQfofDAVIq0iZG5Ok+mZCT2TANBgkqhkiG9w0BAQwFADBMMSAwHgYD
VQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSNjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UE
AxMKR2xvYmFsU2lnbjAeFw0yMzA0MTkwMzUzNDdaFw0zMjA0MTkwMDAwMDBaMFQxCzAJBgNVBAYT
AkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSowKAYDVQQDEyFHbG9iYWxTaWduIEF0bGFz
IFI2IFNNSU1FIENBIDIwMjMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDYydcdmKyg
4IBqVjT4XMf6SR2Ix+1ChW2efX6LpapgGIl63csmTdJQw8EcbwU9C691spkltzTASK2Ayi4aeosB
mk63SPrdVjJNNTkSbTowej3xVVGnYwAjZ6/qcrIgRUNtd/mbtG7j9W80JoP6o2Szu6/mdjb/yxRM
KaCDlloE9vID2jSNB5qOGkKKvN0x6I5e/B1Y6tidYDHemkW4Qv9mfE3xtDAoe5ygUvKA4KHQTOIy
VQEFpd/ZAu1yvrEeA/egkcmdJs6o47sxfo9p/fGNsLm/TOOZg5aj5RHJbZlc0zQ3yZt1wh+NEe3x
ewU5ZoFnETCjjTKz16eJ5RE21EmnCtLb3kU1s+t/L0RUU3XUAzMeBVYBEsEmNnbo1UiiuwUZBWiJ
vMBxd9LeIodDzz3ULIN5Q84oYBOeWGI2ILvplRe9Fx/WBjHhl9rJgAXs2h9dAMVeEYIYkvW+9mpt
BIU9cXUiO0bky1lumSRRg11fOgRzIJQsphStaOq5OPTb3pBiNpwWvYpvv5kCG2X58GfdR8SWA+fm
OLXHcb5lRljrS4rT9MROG/QkZgNtoFLBo/r7qANrtlyAwPx5zPsQSwG9r8SFdgMTHnA2eWCZPOmN
1Tt4xU4v9mQIHNqQBuNJLjlxvalUOdTRgw21OJAFt6Ncx5j/20Qw9FECnP+B3EPVmQIDAQABo4IB
ZTCCAWEwDgYDVR0PAQH/BAQDAgGGMDMGA1UdJQQsMCoGCCsGAQUFBwMCBggrBgEFBQcDBAYJKwYB
BAGCNxUGBgkrBgEEAYI3FQUwEgYDVR0TAQH/BAgwBgEB/wIBADAdBgNVHQ4EFgQUM7q+o9Q5TSoZ
18hmkmiB/cHGycYwHwYDVR0jBBgwFoAUrmwFo5MT4qLn4tcc1sfwf8hnU6AwewYIKwYBBQUHAQEE
bzBtMC4GCCsGAQUFBzABhiJodHRwOi8vb2NzcDIuZ2xvYmFsc2lnbi5jb20vcm9vdHI2MDsGCCsG
AQUFBzAChi9odHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24uY29tL2NhY2VydC9yb290LXI2LmNydDA2
BgNVHR8ELzAtMCugKaAnhiVodHRwOi8vY3JsLmdsb2JhbHNpZ24uY29tL3Jvb3QtcjYuY3JsMBEG
A1UdIAQKMAgwBgYEVR0gADANBgkqhkiG9w0BAQwFAAOCAgEAVc4mpSLg9A6QpSq1JNO6tURZ4rBI
MkwhqdLrEsKs8z40RyxMURo+B2ZljZmFLcEVxyNt7zwpZ2IDfk4URESmfDTiy95jf856Hcwzdxfy
jdwx0k7n4/0WK9ElybN4J95sgeGRcqd4pji6171bREVt0UlHrIRkftIMFK1bzU0dgpgLMu+ykJSE
0Bog41D9T6Swl2RTuKYYO4UAl9nSjWN6CVP8rZQotJv8Kl2llpe83n6ULzNfe2QT67IB5sJdsrNk
jIxSwaWjOUNddWvCk/b5qsVUROOuctPyYnAFTU5KY5qhyuiFTvvVlOMArFkStNlVKIufop5EQh6p
jqDGT6rp4ANDoEWbHKd4mwrMtvrh51/8UzaJrLzj3GjdkJ/sPWkDbn+AIt6lrO8hbYSD8L7RQDqK
C28FheVr4ynpkrWkT7Rl6npWhyumaCbjR+8bo9gs7rto9SPDhWhgPSR9R1//WF3mdHt8SKERhvtd
NFkE3zf36V9Vnu0EO1ay2n5imrOfLkOVF3vtAjleJnesM/R7v5tMS0tWoIr39KaQNURwI//WVuR+
zjqIQVx5s7Ta1GgEL56z0C5GJoNE1LvGXnQDyvDO6QeJVThFNgwkossyvmMAaPOJYnYCrYXiXXle
A6TpL63Gu8foNftUO0T83JbV/e6J8iCOnGZwZDrubOtYn1QwggWDMIIDa6ADAgECAg5F5rsDgzPD
hWVI5v9FUTANBgkqhkiG9w0BAQwFADBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBS
NjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjAeFw0xNDEyMTAwMDAw
MDBaFw0zNDEyMTAwMDAwMDBaMEwxIDAeBgNVBAsTF0dsb2JhbFNpZ24gUm9vdCBDQSAtIFI2MRMw
EQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWduMIICIjANBgkqhkiG9w0BAQEF
AAOCAg8AMIICCgKCAgEAlQfoc8pm+ewUyns89w0I8bRFCyyCtEjG61s8roO4QZIzFKRvf+kqzMaw
iGvFtonRxrL/FM5RFCHsSt0bWsbWh+5NOhUG7WRmC5KAykTec5RO86eJf094YwjIElBtQmYvTbl5
KE1SGooagLcZgQ5+xIq8ZEwhHENo1z08isWyZtWQmrcxBsW+4m0yBqYe+bnrqqO4v76CY1DQ8BiJ
3+QPefXqoh8q0nAue+e8k7ttU+JIfIwQBzj/ZrJ3YX7g6ow8qrSk9vOVShIHbf2MsonP0KBhd8hY
dLDUIzr3XTrKotudCd5dRC2Q8YHNV5L6frxQBGM032uTGL5rNrI55KwkNrfw77YcE1eTtt6y+OKF
t3OiuDWqRfLgnTahb1SK8XJWbi6IxVFCRBWU7qPFOJabTk5aC0fzBjZJdzC8cTflpuwhCHX85mEW
P3fV2ZGXhAps1AJNdMAU7f05+4PyXhShBLAL6f7uj+FuC7IIs2FmCWqxBjplllnA8DX9ydoojRoR
h3CBCqiadR2eOoYFAJ7bgNYl+dwFnidZTHY5W+r5paHYgw/R/98wEfmFzzNI9cptZBQselhP00sI
ScWVZBpjDnk99bOMylitnEJFeW4OhxlcVLFltr+Mm9wT6Q1vuC7cZ27JixG1hBSKABlwg3mRl5HU
Gie/Nx4yB9gUYzwoTK8CAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8w
HQYDVR0OBBYEFK5sBaOTE+Ki5+LXHNbH8H/IZ1OgMB8GA1UdIwQYMBaAFK5sBaOTE+Ki5+LXHNbH
8H/IZ1OgMA0GCSqGSIb3DQEBDAUAA4ICAQCDJe3o0f2VUs2ewASgkWnmXNCE3tytok/oR3jWZZip
W6g8h3wCitFutxZz5l/AVJjVdL7BzeIRka0jGD3d4XJElrSVXsB7jpl4FkMTVlezorM7tXfcQHKs
o+ubNT6xCCGh58RDN3kyvrXnnCxMvEMpmY4w06wh4OMd+tgHM3ZUACIquU0gLnBo2uVT/INc053y
/0QMRGby0uO9RgAabQK6JV2NoTFR3VRGHE3bmZbvGhwEXKYV73jgef5d2z6qTFX9mhWpb+Gm+99w
MOnD7kJG7cKTBYn6fWN7P9BxgXwA6JiuDng0wyX7rwqfIGvdOxOPEoziQRpIenOgd2nHtlx/gsge
/lgbKCuobK1ebcAF0nu364D+JTf+AptorEJdw+71zNzwUHXSNmmc5nsE324GabbeCglIWYfrexRg
emSqaUPvkcdM7BjdbO9TLYyZ4V7ycj7PVMi9Z+ykD0xF/9O5MCMHTI8Qv4aW2ZlatJlXHKTMuxWJ
U7osBQ/kxJ4ZsRg01Uyduu33H68klQR4qAO77oHl2l98i0qhkHQlp7M+S8gsVr3HyO844lyS8Hn3
nIS6dC1hASB+ftHyTwdZX4stQ1LrRgyU4fVmR3l31VRbH60kN8tFWk6gREjI2LCZxRWECfbWSUnA
ZbjmGnFuoKjxguhFPmzWAtcKZ4MFWsmkEDCCBeQwggPMoAMCAQICEAGEC3/wSMy6MPZFqg/DMj8w
DQYJKoZIhvcNAQELBQAwVDELMAkGA1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2Ex
KjAoBgNVBAMTIUdsb2JhbFNpZ24gQXRsYXMgUjYgU01JTUUgQ0EgMjAyMzAeFw0yNTEwMTMyMzQ3
NDlaFw0yNjA0MTEyMzQ3NDlaMCQxIjAgBgkqhkiG9w0BCQEWE2RhdmlkZ293QGdvb2dsZS5jb20w
ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7T8v6fZyfEDlp38NMe4GOXuodILGOFXh6
iVuecsKchx1gCg5Qebyxm+ndfb6ePkd2zzsBOkBJmYrx4G009e+oyTnynr5KXvucs+wLlgm53QU7
6pYikvqTM2hezoWz48Ve/6Jq/6I/eAzKGhn4E/3zG15ETIeMpPFy/E7/lGqq+HFRCb6s0tl/QWhC
BiR+n2UvmXbVWPSR51aRAifsKqiuraeU5g9bGCcbuvdbiYQf1AzNDilkvA6FfUaOPTzVj3rgMyZb
mnZpzWOV1bfib3tYXd2x4IvUS3xlvrap0g9EiDxJKUhCskOf7dPTjaS/kku768Y6U/sDVH5ptgvP
Dxz3AgMBAAGjggHgMIIB3DAeBgNVHREEFzAVgRNkYXZpZGdvd0Bnb29nbGUuY29tMA4GA1UdDwEB
/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDBAYIKwYBBQUHAwIwHQYDVR0OBBYEFHZtY3XkWtC2
e2Idfk+0JyK7BLzzMFgGA1UdIARRME8wCQYHZ4EMAQUBAjBCBgorBgEEAaAyCgMDMDQwMgYIKwYB
BQUHAgEWJmh0dHBzOi8vd3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkvMAwGA1UdEwEB/wQC
MAAwgZoGCCsGAQUFBwEBBIGNMIGKMD4GCCsGAQUFBzABhjJodHRwOi8vb2NzcC5nbG9iYWxzaWdu
LmNvbS9jYS9nc2F0bGFzcjZzbWltZWNhMjAyMzBIBggrBgEFBQcwAoY8aHR0cDovL3NlY3VyZS5n
bG9iYWxzaWduLmNvbS9jYWNlcnQvZ3NhdGxhc3I2c21pbWVjYTIwMjMuY3J0MB8GA1UdIwQYMBaA
FDO6vqPUOU0qGdfIZpJogf3BxsnGMEYGA1UdHwQ/MD0wO6A5oDeGNWh0dHA6Ly9jcmwuZ2xvYmFs
c2lnbi5jb20vY2EvZ3NhdGxhc3I2c21pbWVjYTIwMjMuY3JsMA0GCSqGSIb3DQEBCwUAA4ICAQBo
hqjbVaHxZoT6HHUuwQcTlbgXpuVi59bQPrSwb/6Pn1t3h3SLeuUCvOYpoQjxlWy/FexsPW+nWS0I
PUmWpt6sxbIRTKPfb7cPk32XezfnA0jexucybiXzkZKTrbI7zoMOzDIWpTKYZAonB9Zzi7Dso4An
ZOtz/E3yhdR/q1MK30d5fiCS0vorEd0Oy8Jzcc7TJ2HGMzEEXiFFvVrJYJHvfYOeXE4ywAG6YWO0
x78+bXeB9vkeWHhOYKyYXuAXrnHASddEICg1QlJCHDAISMC1Wn/tjqTMTt3sDAe+dhi9V1FEGTbG
g9PxPVP4huJEMIBu/MWNMzHfiW4E7eCHVPrmtX7CFDlMik7qsgQBbO5h6EcxBamhIflfMgoISsRJ
Vyll2E5BNVwkNstMgU3WMg5yIaQcuGFgFnMTrQcaLEEFPV3cCP9pgXovYDirnB7FKNdCZNHfeBY1
HEXJ2jIPDP6nWSbYoRry0TvPgxh5ZeM5+sc1L7kY75C8U4FV3t4qdC+p7rgqfAggdvDPa5BJbTRg
KAzwyf3z7XUrYp38pXybmDnsEcRNBIOEqBXoiBxZXaKQqaY921nWAroMM/6I6CVpTnu6JEeQkoi4
IgGIEaTFPcgAjvpDQ8waLJL84EP6rbLW6dop+97BXbeO9L/fFf40kBhve6IggpJSeU9RdCQ5czGC
Al0wggJZAgEBMGgwVDELMAkGA1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExKjAo
BgNVBAMTIUdsb2JhbFNpZ24gQXRsYXMgUjYgU01JTUUgQ0EgMjAyMwIQAYQLf/BIzLow9kWqD8My
PzANBglghkgBZQMEAgEFAKCBxzAvBgkqhkiG9w0BCQQxIgQgUBQYa7HQFyutjk2gBGcOez2QWO7W
B1yRAURNXrX2mWAwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMjYw
MTIyMDYzNjI2WjBcBgkqhkiG9w0BCQ8xTzBNMAsGCWCGSAFlAwQBKjALBglghkgBZQMEARYwCwYJ
YIZIAWUDBAECMAoGCCqGSIb3DQMHMAsGCSqGSIb3DQEBBzALBglghkgBZQMEAgEwDQYJKoZIhvcN
AQEBBQAEggEASGmqUrSVG4r8nkQDRe/r1NOP5zTavajUvW20jmVd5j8ZTac5dw3MfJtOyYpIKn4f
NzMplg3PDkijgZ46UW6OLtgya/bnI02aFF18PCHgyZP+btO6VG0qXYcA2jktIwolJIHfmdMo4P5m
eRYIpFj7SHCiBwlI1QhiUKodFr3gqyUwflFcAuobqoZSx3MXvTzWozHj/5pkFhe/8PbKdPq+MuCa
bXXBTDduM3o1Gc0yrNatG7xN5jbOLlbCJ4xa5kfBLvH/Io46ngaHlm5QrljrecrZnwxC5FYBPPJE
oV7yqcP9bCpLAyg/dhb/iod5ed8MxQ8zu9p2SolbM6gTGHRSuQ==
--0000000000009b86370648f44279--

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8171843D50F;
	Thu, 22 Jan 2026 12:13:16 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1769083996; cv=none; b=stCmhk4we3yVlFStcweQzINaLQvQ0uxfcUxioD7sFG5wxQZzhVd/fXPoHSIfst5X6gT7qa+vltdqHgBuCkCuN9QrLEku4la5Q8wh4oIkNkJt5wAz9jUmD6Q2VDS2ISDcdhj7OIvfiEsX77Xshm0AFW0przR+N/D3KkbLj5HaAaw=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1769083996; c=relaxed/simple;
	bh=jhpgN/O8oGBKjvwE9kChMxn+SglWsPjK3/TEsnXjqWw=;
	h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version:
	 Content-Type:Content-Disposition:In-Reply-To; b=qzE2dfIXibHApCkcO3t0cN5SCoTyKExrkJ6ADYOa/CNq1ydjPZMe0GEMjNg5EQeQrpP1zsYKuBbKdtrTrSgxtQt5p7cgvfI03u2N8Igzs4cDRYyhkLecJ7C8q1sVrPocoOpJ8RG2M1ED/233OguhszZhgTNh9JoIX3plhf4somo=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=narPZWfU; arc=none smtp.client-ip=10.30.226.201
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="narPZWfU"
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4C477C116C6;
	Thu, 22 Jan 2026 12:13:14 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
	s=k20201202; t=1769083996;
	bh=jhpgN/O8oGBKjvwE9kChMxn+SglWsPjK3/TEsnXjqWw=;
	h=Date:From:To:Cc:Subject:References:In-Reply-To:From;
	b=narPZWfUWUJ2s4Lkz+rnXLHXswjLwx0j/A85Ev69AMnp+ahRRuiP+SJMK6lJGtArR
	 yGIXSTcVEI3LsZdd/QuVQidAfZW3EtK9Yqh2SAST/okc88a6K19L8mv2lliBGEueDG
	 VptEfY7rFjPCwJklAYTw4KA/FWcr/rdOQ82amLCu+TWgInHVvs7f49sphmcOPaGXwv
	 ud+6tI7r3VwEZW1i/uPKOxRfl5rAP15ATFnlqmnS3cHdEoVra6gT31ijbSddjPg8GX
	 yvNmQcLd5Mb7di2oiwX4OJBGpbfhakZ+9MPrACA9StA2xEIc9DRAjOLnFh71ANf++f
	 r7PnAxazkDaaQ==
Date: Thu, 22 Jan 2026 12:13:11 +0000
From: Mark Brown <broonie@kernel.org>
To: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Cc: David Gow <davidgow@google.com>, Tamir Duberstein <tamird@gmail.com>,
	Andreas Hindborg <a.hindborg@kernel.org>,
	Jens Axboe <axboe@kernel.dk>, Miguel Ojeda <ojeda@kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the block tree
Message-ID: <8cc01720-427d-4cec-b4d0-721b22c47552@sirena.org.uk>
References: <aW5xqLq7gatOy1DV@sirena.org.uk>
 <fc855e76-5f3a-458e-82f9-f43c7d23932e@sirena.org.uk>
 <CAJ-ks9=V_JmzEaXUrHPm6K-DyTgkxEhrPCW=2ZgDJpc+4Z83_A@mail.gmail.com>
 <27b562ca-d79b-4f80-be71-ebf5e26ed9ab@sirena.org.uk>
 <CANiq72nS94wv50XyOJq5CeiVQvb0+3mNdWxJpFy_+2FH1x4RYQ@mail.gmail.com>
 <aa4bc767-8128-440c-a2a2-81fbb6992a8d@sirena.org.uk>
 <CANiq72njSUPt2CvjBiNyKw1KHSgnMdcBnXNL_pHV4iURYL1n6g@mail.gmail.com>
 <b17da8b5-6640-46ea-ba73-d2f4a08e246c@sirena.org.uk>
 <CANiq72kT9ThJcr5W0OhBmbwKZCpULjUehNjijTt8W09yB0CxSg@mail.gmail.com>
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="ekuCCvqRL9kAMAAc"
Content-Disposition: inline
In-Reply-To: <CANiq72kT9ThJcr5W0OhBmbwKZCpULjUehNjijTt8W09yB0CxSg@mail.gmail.com>
X-Cookie: Don't read everything you believe.


--ekuCCvqRL9kAMAAc
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Wed, Jan 21, 2026 at 07:55:39PM +0100, Miguel Ojeda wrote:
> On Wed, Jan 21, 2026 at 3:56=E2=80=AFPM Mark Brown <broonie@kernel.org> w=
rote:

> > We do really want things to respect O=3D, all the -next builds are using
> > that, so if anything shows up in the source tree that's a concern.  I am
> > bodging that for the kselftest build at the minute but it's not great.

> Not sure what you mean about `O=3D`. Using `O=3D` is supported (both for
> the subdir and external dir cases which are slightly different in the
> build system). Modulo bugs, of course.

> If you mean to ask whether `rustfmt` creates files: no, it replaces
> in-place, i.e. by `git status` I meant you would see modified files,
> not new ones.

I was asking because you were mentioning checking git status and since
we are doing out of tree builds there should be nothing changing in the
source at all.  I think with the way we get trees to the build machine
it won't make a difference in the end though if no new files are
created so it'll actually be fine...

> > That is not going to be usable if it fails -Werror builds, Rust is only
> > enabled by the all*config configurations and they turn on -Werror
> > through the same process that they turn on Rust.  We really need -Werror
> > to pass.  I can set CLIPPY=3D1 for other configs then if they enable Ru=
st
> > they'll need to pass cleanly but then it'll just explode when turned on
> > if there's lots of warnings which doesn't seem like it'll help Rust
> > adoption.  If we were starting from a point where the build was clean
> > then it'd be more viable.

> I am not sure I understand. `CLIPPY=3D1` is intended to be clean, and
> over time I have sent patches to trees that break that (same for
> `rustfmt` and `rustdoc`).

I've been seeing people saying "oh, just ignore the warnings" on the Tyr
issues so it wasn't clear to me that people were expecting things to be
clean.  If things are generally clean that's fine, and I can hold the
trees back in -next if they introduce errors like I would with anything
else that does that.

> That is why if you could enforce this in linux-next it would help a
> lot, instead of fixing trees after the fact like in the emails above.
> Things will still slip through, of course, depending on
> configs/arch/... etc., but it would definitely help catch most of it.

Right, and there's the issues with things only being built in which you
said you expected to be resolved soonish.  Let's see how it goes - I'll
wait until the build is clean before enabling things (that had been my
intention with building at all, I didn't really register that all*config
would turn on Rust when the toolchains).

> > I should be able to run rust-analyzer to verify that it doesn't error at
> > least, it looks like rust-analyzer unconditionally outputs into the
> > current source tree, but it is just one specific file so it's less of an
> > issue than random cruft.

> No, it outputs to `O=3D` -- if that is not working for you, please let me=
 know.
>=20
> i.e. that should not be a problem even for e.g. read-only srctrees.

Ah, great.  I got confused by the make rule just having a plain
redirect to rust-project.json with no irectory prefix.

> > Running rusttest is a bit weird in that it requires a kernel config but
> > seems to work fine so I can do that, I was already planning to run KUni=
t:

> We used the `rusttest` target more in the past, before I made the
> KUnit integration of the doctests, but it really doesn't do much
> nowadays and carries a fair bit of complexity on the build system. My
> current thinking is to migrate those tests and then just make it no-op
> until we find a better use case if any for the target name. So it
> isn't critical if you don't run it.

OK, if the plan is more to phase it out for the time being then I'll
just skip it.

> Now, you mention KUnit, and that is very interesting!

> The overwhelming majority of our tests are all in fact KUnit-based,
> e.g. these are our doctests (i.e. examples that are built and ran as
> tests):

>     [  2.714912] # rust_doctests_kernel: pass:283 fail:0 skip:0 total:283

> but we also have a few other suites that come from `#[test]`s
> ("normal" unit tests), e.g.:

>      [  2.260774] # rust_atomics: pass:6 fail:0 skip:0 total:6

> So, do you mean you plan to run them under QEMU for x86_64 or arm64 or
> similar? That would be amazing for us! I didn't know you planned to do
> runtime tests.

My current initial plan is:

    ./tools/testing/kunit/kunit.py run --alltests --build_dir ../kunit --ar=
ch arm64

but I didn't actually turn that on, I want to write a wrapper that
reports any failures in a mail ready format.  I'm not seeing rust in
tools/testing/kunit/configs/all_tests.config though so Rust wouldn't get
enabled?

> Now, if you mean UML to run them, that is still best-effort with Rust,
> and it may or may not be completely clean at certain moments (Cc'ing
> David, who has been driving that and done a ton of work there).

I can't use UML as my build host is arm64 and UML is x86_64 only so that
won't be an issue for me.

--ekuCCvqRL9kAMAAc
Content-Type: application/pgp-signature; name="signature.asc"

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

iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmlyFFYACgkQJNaLcl1U
h9CrLAf/aoASzSH7II1//qR6yAMAyMgqn9qpLdlxiCYHKT8379EisJp+x2jXm3bP
89OQKIe3mphMvxOcZZfS8aYR5bQogPAWHCIQwa6wezxB9ilD1vOt795u1tkox5eQ
WLbzXsOFM5FLRvi6OrbMguEyxG4KXVPb7XesBsruIjGI2s1iDDY6Fen/MuzHa5sH
IWdoFhLHYbA71B/tGxl0+pMcvXPOLaQWcbwcjP1IR2WFGTXlfMil9yXor9sZTFa5
aa+oMPIui44az9egKd2P7umJBMPECN5dGHcdWBgzbWRhlv39PU4/TaFwtmGfQElY
m2a9jQnLCfmpFIxt3y/Vf8/nWt105A==
=53h5
-----END PGP SIGNATURE-----

--ekuCCvqRL9kAMAAc--

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 545D92BD033;
	Thu, 22 Jan 2026 18:25:11 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1769106311; cv=none; b=sT59VLCmpADg2KELsm91AoNc0ulsUnTeKl8I1yjXqEXhJFqSc30WpN+ovPycXdqFEHQ6RmmExj36BPuOCBcD+4Yfc2CKf5+ft6IjVTGVPu7e2aUZfer0CoZ07PzXObqG+IccfW+n2heFDeRxvK+fqLFQVlLSPOcdOjlmJD+zFFQ=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1769106311; c=relaxed/simple;
	bh=zL2gFPFI22aw+eEzv1uPLP5RhqkpvCt7uScDUQ6q3Lw=;
	h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID:
	 MIME-Version:Content-Type; b=pJuXzhxJOQPG2tTwaJxC5a3CrMjd3ct4cgHTAPlCsGfTIyYSf/DfSKkkszTZCrzCl3IUsKayc+8cJXdl8lxwpYklxOoqVotORxw05m8CtIVDJl21VaPANubvgzXnhEIMXfjVmYwav84UjaP2Qjqf47iZ+WiNSUoMTH/IXW0sI0o=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZDOLcq0Q; arc=none smtp.client-ip=10.30.226.201
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ZDOLcq0Q"
Received: by smtp.kernel.org (Postfix) with ESMTPSA id B34E5C116C6;
	Thu, 22 Jan 2026 18:25:07 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
	s=k20201202; t=1769106309;
	bh=zL2gFPFI22aw+eEzv1uPLP5RhqkpvCt7uScDUQ6q3Lw=;
	h=From:To:Cc:Subject:In-Reply-To:References:Date:From;
	b=ZDOLcq0Qza/TwH3Q3iDdOaWtD3TB3QqbwTlbmJwKOHA3SCxvydoniXxNSaWqGvdyW
	 NuNXgvWIWKE4TOFY6PfvjW4rrxq7rZ0JwuLjRpilMc5CfKxwB17QCDqaR+A8N8MIk8
	 UVytNXRDlQiLd3XrddG8HmQMQIceEO5tltGFNGVsN28rJTBeAucnM//6Ym4rwDjqQQ
	 D7MRzHDSkg6ZI3KjfenWCS6wauVai69mcYsYoZUCUgSt5F6I+llInppTNl69+pWhd2
	 tTUj9ENJ46I1pwjMAfeR+zXx9u5QzVtl28uWGY4QAlVvi5Z/8IgD9ui2Vc5giQG9iX
	 xOz0iVUtLU6bA==
From: Andreas Hindborg <a.hindborg@kernel.org>
To: Mark Brown <broonie@kernel.org>, Miguel Ojeda
 <miguel.ojeda.sandonis@gmail.com>
Cc: David Gow <davidgow@google.com>, Tamir Duberstein <tamird@gmail.com>, Jens
 Axboe <axboe@kernel.dk>, Miguel Ojeda <ojeda@kernel.org>, Linux Kernel
 Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the block tree
In-Reply-To: <8cc01720-427d-4cec-b4d0-721b22c47552@sirena.org.uk>
References: <aW5xqLq7gatOy1DV@sirena.org.uk>
 <fc855e76-5f3a-458e-82f9-f43c7d23932e@sirena.org.uk>
 <CAJ-ks9=V_JmzEaXUrHPm6K-DyTgkxEhrPCW=2ZgDJpc+4Z83_A@mail.gmail.com>
 <27b562ca-d79b-4f80-be71-ebf5e26ed9ab@sirena.org.uk>
 <CANiq72nS94wv50XyOJq5CeiVQvb0+3mNdWxJpFy_+2FH1x4RYQ@mail.gmail.com>
 <aa4bc767-8128-440c-a2a2-81fbb6992a8d@sirena.org.uk>
 <CANiq72njSUPt2CvjBiNyKw1KHSgnMdcBnXNL_pHV4iURYL1n6g@mail.gmail.com>
 <b17da8b5-6640-46ea-ba73-d2f4a08e246c@sirena.org.uk>
 <CANiq72kT9ThJcr5W0OhBmbwKZCpULjUehNjijTt8W09yB0CxSg@mail.gmail.com>
 <vTqxQtPb82EIUJtln5_7rGW5a8ot7hGZeTwDlTSiQPJwSr8IZ5COad9CBcZY9jg8YssEH6NyvESidrBA1sx4JA==@protonmail.internalid>
 <8cc01720-427d-4cec-b4d0-721b22c47552@sirena.org.uk>
Date: Thu, 22 Jan 2026 19:25:00 +0100
Message-ID: <874iodtshv.fsf@t14s.mail-host-address-is-not-set>
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable

"Mark Brown" <broonie@kernel.org> writes:

> On Wed, Jan 21, 2026 at 07:55:39PM +0100, Miguel Ojeda wrote:
>> On Wed, Jan 21, 2026 at 3:56=E2=80=AFPM Mark Brown <broonie@kernel.org> =
wrote:
>
>> > We do really want things to respect O=3D, all the -next builds are usi=
ng
>> > that, so if anything shows up in the source tree that's a concern.  I =
am
>> > bodging that for the kselftest build at the minute but it's not great.
>
>> Not sure what you mean about `O=3D`. Using `O=3D` is supported (both for
>> the subdir and external dir cases which are slightly different in the
>> build system). Modulo bugs, of course.
>
>> If you mean to ask whether `rustfmt` creates files: no, it replaces
>> in-place, i.e. by `git status` I meant you would see modified files,
>> not new ones.
>
> I was asking because you were mentioning checking git status and since
> we are doing out of tree builds there should be nothing changing in the
> source at all.  I think with the way we get trees to the build machine
> it won't make a difference in the end though if no new files are
> created so it'll actually be fine...

The `rustfmt` target will change the source directory even when building
with `O=3D...`, if it decides formatting changes are required.


Best regards,
Andreas Hindborg



From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 87AA72652B6;
	Fri, 23 Jan 2026 17:43:03 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1769190183; cv=none; b=dJh6LN+S9D4nQ4FwjjlzSK1yBBbJB6bLej9Vqt0XApIZfeod76DRXFG6DkPda+SkLOcE39+X+tyDi8BhrPGMjjdgqdFZYhvZ8g83ECEpR32DgE2wsoG/ku7wAi52Zv156JnU7Hlu+ElW6j+8w6/q15ZS1pWIY6uMqBwYUJcP2mg=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1769190183; c=relaxed/simple;
	bh=FQYhr2rxEtvxx5dj0UjbQ+jBRiNZsXlWZ1dYSQlSL9s=;
	h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type:
	 Content-Disposition; b=LimRi7+AVI8zrVw6h4ZDU/Z7eoMO6uRSoFWzosTyOju0kBKDnSfJcJ9PUSaZ8vY0Lts7UsVRlpbaeUS0o7qCKytPsQOlwM9aZojSqeu7dMRFRReYxwuiGFmH0h72XBj+LxYa+l4xYt6VVeqDUNytX1AKMyWtKekzm0DN+f2Cs4I=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=IfKb6wy0; arc=none smtp.client-ip=10.30.226.201
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="IfKb6wy0"
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 41A1BC4CEF1;
	Fri, 23 Jan 2026 17:43:02 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
	s=k20201202; t=1769190183;
	bh=FQYhr2rxEtvxx5dj0UjbQ+jBRiNZsXlWZ1dYSQlSL9s=;
	h=Date:From:To:Cc:Subject:From;
	b=IfKb6wy0ngHYBAjYknDO5UiyUN+l6u/T4pGORMtqmSxAMjSAr96fyl8jaOs0EFjBq
	 38ozpgpvjbhe+hH0PA5z7LP3Rb5dVnTTKBEF4GwZV9nDFGxDwUlPYr9by65cl2lGRJ
	 iSiyVQnCYuWlzDtVoYWgLLrKAisH6fbZs7O/XNSYpJ/LBggsRLCfazR+OBUl6sRT5a
	 lka/xfFq7+lFz3L4XWeTUrZdZl6nfwqG3n3vd6DOrFMuY735U4QRVeJRKZsuYhrB9L
	 xfNsZRAh0ZZ7C43T+u6VX+5bTQuqRXOmj06Xc/ffJqWfwLM4deG8tzGhKDcEeInuXE
	 dGsVR2LiV25ag==
Date: Fri, 23 Jan 2026 17:42:59 +0000
From: Mark Brown <broonie@kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <aXOzI6sVTBTdJE5j@sirena.org.uk>
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi all,

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

In file included from /tmp/next/build/include/linux/string.h:386,
                 from /tmp/next/build/include/linux/bitmap.h:13,
                 from /tmp/next/build/include/linux/cpumask.h:11,
                 from /tmp/next/build/arch/x86/include/asm/paravirt.h:21,
                 from /tmp/next/build/arch/x86/include/asm/cpuid/api.h:57,
                 from /tmp/next/build/arch/x86/include/asm/processor.h:19,
                 from /tmp/next/build/include/linux/sched.h:13,
                 from /tmp/next/build/include/linux/io_uring.h:5,
                 from /tmp/next/build/io_uring/bpf_filter.c:7:
In function 'fortify_memset_chk',
    inlined from 'io_uring_populate_bpf_ctx' at /tmp/next/build/io_uring/bpf_filter.c:33:2:
/tmp/next/build/include/linux/fortify-string.h:480:25: error: call to '__write_overflow_field' declared with attribute warning: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Werror=attribute-warning]
  480 |                         __write_overflow_field(p_size_field, size);
      |                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors

Caused by commit

  f1e3672e49e2c (io_uring: add support for BPF filtering for opcode restrictions)

I have used the tree from 20260122 instead.

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail-oi1-f173.google.com (mail-oi1-f173.google.com [209.85.167.173])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 44A263EBF09
	for <linux-next@vger.kernel.org>; Fri, 23 Jan 2026 18:00:59 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.173
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1769191261; cv=none; b=tJ9gOZ+PxP5FTIHofhT2CYnWrgaTiJWfkIEUQUxem9LW/7USQBytxqv9kZNIhLXPaaEY/Sc/sMazMNdUA+4ARSbZRvQ8j0TDNNH2dlehJItEuZJd3zrXlID+aePx9iHF4kfRxPnFcEEdAq3h9ajZ9BmjXFl7IFP88jE34UWSJ08=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1769191261; c=relaxed/simple;
	bh=HG8KgjEPaPNnDoUuHfEZrus4aJDzD0BmQZ8Q7j4fWcA=;
	h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:
	 In-Reply-To:Content-Type; b=iycGBGB7dsP9h8xEHe3HfK5AA9v+kESG2+l9lo4DX0JStprcl1sZJeVMiAN8zgIl887PgXPgtTwOkYM7OwrZi/pe9MsDlKEiP8ShTEO3tRHXJn7U7O0md8Ogir+OEq8RbzhNE5oXmL6fnBEiW8fVNE3eKGnExoLxoY4srDFTWf4=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=CJKeBS7U; arc=none smtp.client-ip=209.85.167.173
Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="CJKeBS7U"
Received: by mail-oi1-f173.google.com with SMTP id 5614622812f47-45c958d480aso777495b6e.1
        for <linux-next@vger.kernel.org>; Fri, 23 Jan 2026 10:00:59 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1769191258; x=1769796058; darn=vger.kernel.org;
        h=content-transfer-encoding:in-reply-to:from:content-language
         :references:cc:to:subject:user-agent:mime-version:date:message-id
         :from:to:cc:subject:date:message-id:reply-to;
        bh=oQaE181ppOlEYSq+SNMh1azWF7TvP0ivnIMtoU6cvx0=;
        b=CJKeBS7UYn3Jy1WpgUiibt/IDf+vLKtMcihjAMV6FpBk747V17PXfWFeOHjuP3/uMr
         LlEI52kysTSJ01BBGb4AvfsCTcU/YHZC31AhgVkeNgcY+DCKgqWrnAT6iGBKAHlzAlND
         mpkeBSy9dDwP6cjTLOkNhTySbBhJXwPXR6HuXxCL+aJK2c4GjAV778ATgEdvbDWy1hlI
         BjiDvf9s9/4AIwzpDQzim4YYF+IeFOWrv37MfdpHBWjF4nmnr4rXQ2eZ1P/m9Bp7EPNi
         OvNc9XC3Ky+F+FfvLwjaat08mMqSUjR2K4g5TuGuXiFL9xZwn8PafbmzSlWWuUG6BxQe
         waJw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1769191258; x=1769796058;
        h=content-transfer-encoding:in-reply-to:from:content-language
         :references:cc:to:subject:user-agent:mime-version:date:message-id
         :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id
         :reply-to;
        bh=oQaE181ppOlEYSq+SNMh1azWF7TvP0ivnIMtoU6cvx0=;
        b=uM2s0znBCByCMxpAug+Cs94XUKv/h5gUgjH4xIJQCWqb1QpKPR8RhmMushiol3cTvB
         4dpH33dLEXY8MICCJ9r1ij/q7yPrac+gbh76PlzDXevfiOrgVKctvJTvFr2uvUXd1htn
         EHEbSN4fpBW5O48Jvxs4xh0U30yMbmMqnFkL5KpmE9gMwjxvWWZG6PBl1LK5KhgFgNn6
         JisKZohiE0QzasQ78TnUMtL5y0imSIsC4+7vEH1DdNhNsJuOl2SteIVRi9Ibuo3IFb8p
         eSG6XqMCqp5I8Nu49sHgwxc7EU0egFEyjDaMKko9c4boI8LPVroSkFvrJCRqyhZXx+VQ
         YPHg==
X-Forwarded-Encrypted: i=1; AJvYcCW4PLTxA/oTfZCn/yRnVjLQfuVTENInBkjMw1slWqs2wh/chjB2WwAqFl+oGbViPCbdub4hgs1dsCZ1@vger.kernel.org
X-Gm-Message-State: AOJu0YyFStLjzfvUNrm7j928r7vTiQpYcPyMg6CHHFJP+WSCQ073mFq1
	xAJh+44bT0GFAJrR9CdJTjRclAdEzUYktJ2LspLS6HnEQ20qbbHcCLDBEdxX77R4KLzKVnMpFRf
	O1IfFSMo=
X-Gm-Gg: AZuq6aLkfnUitQWcAXgIXaWCE4xdqPIBfPRzozJ1Hzp2781qr5D3X3kvluk8zYUdoQk
	jNmEeyM/KVADS2zNAGf6481NG3s4c6G1fdPNuoPfYFxWUpJ3xoOO/xziPZtI+aaPPUS6bx9DZZt
	WFaeIghIPA6uZl10/aCVAO/foCZeHoeWItvIARlf2g+JoIob004JEFORT5BOeuyeXAeoLkv9fcI
	YnvPR858lV8xv8R0mk5MhfHwtIOKm7JSJykmqtFZ1+PTOXtoaxTBnC+ynjOIDwaV1IB+327O71k
	yUdZfdkWaJGiqeMYaL5HnAyppwnqIOYNzJbH+RG4OoK+ojs/DiP9DYXhyTyySkvY+1I9gD7g1PK
	AUAm31JxsjCfs4W/plRwzvJIQ6KZypVk+cAJvZLZXSftKTWURgxqSpm/i4rK862OEDzogQbtsE0
	0kAMJaZs09G+UVhhk1vqrdNajKTmSCz6tzkNjfbBtiYr8PIqiDvwHP8La83nQM0HpD05RZ
X-Received: by 2002:a05:6808:2384:b0:45c:9a6e:1ea1 with SMTP id 5614622812f47-45eb1d52cd7mr1481429b6e.66.1769191257983;
        Fri, 23 Jan 2026 10:00:57 -0800 (PST)
Received: from [192.168.1.102] ([96.43.243.2])
        by smtp.gmail.com with ESMTPSA id 5614622812f47-45eb425513asm1501767b6e.17.2026.01.23.10.00.56
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Fri, 23 Jan 2026 10:00:57 -0800 (PST)
Message-ID: <cb962e32-7d04-44a1-b99c-4d1889ffdbf5@kernel.dk>
Date: Fri, 23 Jan 2026 11:00:55 -0700
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: linux-next: build failure after merge of the block tree
To: Mark Brown <broonie@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
 Linux Next Mailing List <linux-next@vger.kernel.org>
References: <aXOzI6sVTBTdJE5j@sirena.org.uk>
Content-Language: en-US
From: Jens Axboe <axboe@kernel.dk>
In-Reply-To: <aXOzI6sVTBTdJE5j@sirena.org.uk>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

On 1/23/26 10:42 AM, Mark Brown wrote:
> Hi all,
> 
> After merging the block tree, today's linux-next build (x86 allmodconfig)
> failed like this:
> 
> In file included from /tmp/next/build/include/linux/string.h:386,
>                  from /tmp/next/build/include/linux/bitmap.h:13,
>                  from /tmp/next/build/include/linux/cpumask.h:11,
>                  from /tmp/next/build/arch/x86/include/asm/paravirt.h:21,
>                  from /tmp/next/build/arch/x86/include/asm/cpuid/api.h:57,
>                  from /tmp/next/build/arch/x86/include/asm/processor.h:19,
>                  from /tmp/next/build/include/linux/sched.h:13,
>                  from /tmp/next/build/include/linux/io_uring.h:5,
>                  from /tmp/next/build/io_uring/bpf_filter.c:7:
> In function 'fortify_memset_chk',
>     inlined from 'io_uring_populate_bpf_ctx' at /tmp/next/build/io_uring/bpf_filter.c:33:2:
> /tmp/next/build/include/linux/fortify-string.h:480:25: error: call to '__write_overflow_field' declared with attribute warning: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Werror=attribute-warning]
>   480 |                         __write_overflow_field(p_size_field, size);
>       |                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> cc1: all warnings being treated as errors
> 
> Caused by commit
> 
>   f1e3672e49e2c (io_uring: add support for BPF filtering for opcode restrictions)

Huh, that am I missing here? The struct looks as follows:

struct io_uring_bpf_ctx {
	__u64	user_data;
	__u8	opcode;
	__u8	sqe_flags;
	__u8	pad[6];
	union {
		__u64	resv[6];
		struct {
			__u32	family;
			__u32	type;
			__u32	protocol;
		} socket;
		struct {
			__u64	flags;
			__u64	mode;
			__u64	resolve;
		} open;
	};
};

and the offending line is:

memset(bctx->pad, 0, sizeof(bctx->pad) + sizeof(bctx->resv));

which should clear from offset 10 (start of pad) for a total of 6 + 48
bytes, which is 54 bytes. The size of the struct is 64b.

I guess the part it doesn't like is that it thinks we're clearing the
pad field, which would of course be way overwriting it. Guess we can do
something ala:

memset((void *) bctx + offsetof(struct io_uring_bpf_ctx, pad), 0,
	sizeof(bctx->pad) + sizeof(bctx->resv));

to make it happier.

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail-oa1-f48.google.com (mail-oa1-f48.google.com [209.85.160.48])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5D9951E32D6
	for <linux-next@vger.kernel.org>; Fri, 23 Jan 2026 18:06:45 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.48
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1769191606; cv=none; b=Guq50AnE6Q8bBSjMZPO6xZpf/83pwFLAHA/Bca0WSt0vsx70dVZtMjD3j9N6aLvsEnPByr4DOy46dUWETeaCK3Y4jRkp33Ychonh/yKsfwch3GdeD9xi5MbzJz62KqGzOSxVPn2PnjuFgfPpWgfl1teccwTBA2opjRz3FxcqnYo=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1769191606; c=relaxed/simple;
	bh=2EGgR3GBmBJ+5qQacb7fj+D3wJ3GLkF9thM5uPiZDJM=;
	h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References:
	 In-Reply-To:Content-Type; b=fKWDJKNLtdKjIlyX9SBvULtPhg9aJl2J46hc37XLDdbCE6YTiOYAmtC0Fh2UBgSQH+fvc2q4OxhdY9FcCYgACO8h8RtO1xcPnodHVZkx3K5uVcTrJTfbe+UZW8tJU0K8K2gXgbSViYdfaWxo9xeWRxvkFwjiV2JAO2WRWTXWBzY=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=K366xk/v; arc=none smtp.client-ip=209.85.160.48
Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="K366xk/v"
Received: by mail-oa1-f48.google.com with SMTP id 586e51a60fabf-4086661715cso2048474fac.2
        for <linux-next@vger.kernel.org>; Fri, 23 Jan 2026 10:06:45 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1769191604; x=1769796404; darn=vger.kernel.org;
        h=content-transfer-encoding:in-reply-to:content-language:references
         :cc:to:from:subject:user-agent:mime-version:date:message-id:from:to
         :cc:subject:date:message-id:reply-to;
        bh=7syuOmgx3tF+hj3ojVc4WkafcJnKBtlCQ4ZjxuK7PJs=;
        b=K366xk/vMwE2+lMmuOID/XGcP5Uc6vbgRcgGRTGMn8dyk1MjGID+iL4912G1SFK8Fa
         d9Aavdk0gAHbGXcPO2a3rXPqQdDs3fFNF37D17d9BJhUtI8Pt6wasySxo3fHryk/BBzs
         3TamS4RI57hEWRwxzgD5SfgqNwIPHnew/5FAelc2xFcXpUNbMKHSTHoJwFFU5xgFNCRA
         M394oEm0VN9ZlMKW4mzRyt9e1tvOyKIN8/65ZKXl3/y59fLVSnMQnKj/Sydic583QzIE
         576bvoxsTFu/Xplr7gbTG2u8aH9/0Ei2u4QrsIvpFv0qa3AiuiXEBQ5djPhF3lxi5RR3
         qj1A==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1769191604; x=1769796404;
        h=content-transfer-encoding:in-reply-to:content-language:references
         :cc:to:from:subject:user-agent:mime-version:date:message-id:x-gm-gg
         :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
        bh=7syuOmgx3tF+hj3ojVc4WkafcJnKBtlCQ4ZjxuK7PJs=;
        b=WkNKzUBwmPWD2lIa+kx6a2tAl+41bucV/ZJQbXVRN9NK7sAlzPxwQ5YlAXJSNKvq3J
         WfUbzWei8/6iuJ+F9zUmEj2lSOxab+Pawmegumuf/+U66O7cMLdBZjEeCidJkE7RAr0z
         +4gPZ5bd+0G9LyZKdgc3Sj994iTbAhImf6jzc0lQZf07SNpyJGCEbSOBliEK4oo9ulyW
         9qO73zc/levlzO9i6HdCrNEMu6sgH8hAJmrKXu/GqcGMLIsZ+Au0dKYWvYpNgftxSTbf
         81vhTGrK3lQNWAy8AvArh0vQIixJZ4hKcwXBlhSLD04oNOvRyL58hEv9HvtCg8D/776B
         ynkg==
X-Forwarded-Encrypted: i=1; AJvYcCW5gQVMug3BobG8ZjctBfNBTbWux9223YOCBYUoLXOVHWRYR5PbIOa2OZi8C/rjTnFxV50vjN4VX5vD@vger.kernel.org
X-Gm-Message-State: AOJu0Yy5dFaia6pLxI18aKHbHkJJOhDMYiYsu4nT5SCY6tP3kFzSe5uW
	vn6ghkaV7A9ACrrQs+GwPg8Yo6ckDAstxG2lnWsuWm0aGFO4DeWKW1vxScaxoTcyEE4=
X-Gm-Gg: AZuq6aLZkI1GmYQga7CkhaX/sux17tG2dO84oU3TbeOHpnUkiLLEWNYtXjDY9YSGFMF
	+HSR5Ce7gZdb8pHJtfp0VXMA6y8nOxZxrDbm2xBbFhgoNsZWZEakpSZUnORhZNrvgGquP87/qWV
	XEkbKia2t6623dm+memSVtWvKD1D9ToLu8ZRGX7I7mplma65jaRTPDP9JDfkxZ3MqX+tWLLAHAD
	34IINwvyT70H8ocC+3JO3kinlsbz17PplBtxkXC5HkShjSulujExTNjgQqtzb6vs5SBKo9KpD3g
	E1+I2BJl+ud6uTSFiqyHdO3z1v3nWGvnJlX36xs+5c6WDmPXLhenxFtNmUzTCQgh4f3ERFFSaSg
	6EOIZn/gyvtxnxY9sgOjauNBZfS8QZD/eDD42XVkOM8PYFtl0q6AafTU7XalfbkPfPAyIypEh/z
	R7QNULD88c9Md4IcqELurX6PGZKAia6aRfVftKWbN3Iz3i0LgWaV1MTWY3Ber6v/NaXb5b
X-Received: by 2002:a05:687c:409e:b0:3ec:4089:f963 with SMTP id 586e51a60fabf-408bdbb08b1mr918837fac.44.1769191604214;
        Fri, 23 Jan 2026 10:06:44 -0800 (PST)
Received: from [192.168.1.102] ([96.43.243.2])
        by smtp.gmail.com with ESMTPSA id 586e51a60fabf-408af890291sm1885938fac.9.2026.01.23.10.06.43
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Fri, 23 Jan 2026 10:06:43 -0800 (PST)
Message-ID: <ed061c97-9d4f-41c1-a340-1b1e57985e50@kernel.dk>
Date: Fri, 23 Jan 2026 11:06:43 -0700
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: linux-next: build failure after merge of the block tree
From: Jens Axboe <axboe@kernel.dk>
To: Mark Brown <broonie@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
 Linux Next Mailing List <linux-next@vger.kernel.org>
References: <aXOzI6sVTBTdJE5j@sirena.org.uk>
 <cb962e32-7d04-44a1-b99c-4d1889ffdbf5@kernel.dk>
Content-Language: en-US
In-Reply-To: <cb962e32-7d04-44a1-b99c-4d1889ffdbf5@kernel.dk>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

On 1/23/26 11:00 AM, Jens Axboe wrote:
> On 1/23/26 10:42 AM, Mark Brown wrote:
>> Hi all,
>>
>> After merging the block tree, today's linux-next build (x86 allmodconfig)
>> failed like this:
>>
>> In file included from /tmp/next/build/include/linux/string.h:386,
>>                  from /tmp/next/build/include/linux/bitmap.h:13,
>>                  from /tmp/next/build/include/linux/cpumask.h:11,
>>                  from /tmp/next/build/arch/x86/include/asm/paravirt.h:21,
>>                  from /tmp/next/build/arch/x86/include/asm/cpuid/api.h:57,
>>                  from /tmp/next/build/arch/x86/include/asm/processor.h:19,
>>                  from /tmp/next/build/include/linux/sched.h:13,
>>                  from /tmp/next/build/include/linux/io_uring.h:5,
>>                  from /tmp/next/build/io_uring/bpf_filter.c:7:
>> In function 'fortify_memset_chk',
>>     inlined from 'io_uring_populate_bpf_ctx' at /tmp/next/build/io_uring/bpf_filter.c:33:2:
>> /tmp/next/build/include/linux/fortify-string.h:480:25: error: call to '__write_overflow_field' declared with attribute warning: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Werror=attribute-warning]
>>   480 |                         __write_overflow_field(p_size_field, size);
>>       |                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> cc1: all warnings being treated as errors
>>
>> Caused by commit
>>
>>   f1e3672e49e2c (io_uring: add support for BPF filtering for opcode restrictions)
> 
> Huh, that am I missing here? The struct looks as follows:
> 
> struct io_uring_bpf_ctx {
> 	__u64	user_data;
> 	__u8	opcode;
> 	__u8	sqe_flags;
> 	__u8	pad[6];
> 	union {
> 		__u64	resv[6];
> 		struct {
> 			__u32	family;
> 			__u32	type;
> 			__u32	protocol;
> 		} socket;
> 		struct {
> 			__u64	flags;
> 			__u64	mode;
> 			__u64	resolve;
> 		} open;
> 	};
> };
> 
> and the offending line is:
> 
> memset(bctx->pad, 0, sizeof(bctx->pad) + sizeof(bctx->resv));
> 
> which should clear from offset 10 (start of pad) for a total of 6 + 48
> bytes, which is 54 bytes. The size of the struct is 64b.
> 
> I guess the part it doesn't like is that it thinks we're clearing the
> pad field, which would of course be way overwriting it. Guess we can do
> something ala:
> 
> memset((void *) bctx + offsetof(struct io_uring_bpf_ctx, pad), 0,
> 	sizeof(bctx->pad) + sizeof(bctx->resv));
> 
> to make it happier.

Folded that in and pushed it out, should be happy for you now. I wonder
if we have a helper for that...

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 433C421C9E5;
	Fri, 23 Jan 2026 19:34:05 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1769196846; cv=none; b=Sw9JN6Nm6+i6xm6WMWGl0v0PcwGjhj9EUF8LakzYqB3ZZL/6vZLRmUQzjcwMLNnFC9RTZlBitF5kHy6wDjoHmhcqdtscXDAuKn936IYMGGOasQ8Yb4TmKtLAidYtqrY53lgld/lplQZi38BeDs9gWnWkfBOFav92XxjQs2/RBzE=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1769196846; c=relaxed/simple;
	bh=C1hDKoccvnXwqFf6jIwRffYDiTPm81MZ1Wk7IAPPrC8=;
	h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version:
	 Content-Type:Content-Disposition:In-Reply-To; b=r690gH3L7BRk9W+dCC5cShGSk2I2go1Bl0c+qsOzqBA2JrxF+J2rW5Il1zOoSU07YA/RRDZTc9ng/glQMsmP2SkRD8TzBYLjcG0w/OGBECkJN15r8O081pFr45VAxDyZpWBEHhvGNKt1KxF7usic6uMkYzYKopUoCIrVGIQrLt4=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FyvIF4I7; arc=none smtp.client-ip=10.30.226.201
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="FyvIF4I7"
Received: by smtp.kernel.org (Postfix) with ESMTPSA id B9F31C4CEF1;
	Fri, 23 Jan 2026 19:34:04 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
	s=k20201202; t=1769196845;
	bh=C1hDKoccvnXwqFf6jIwRffYDiTPm81MZ1Wk7IAPPrC8=;
	h=Date:From:To:Cc:Subject:References:In-Reply-To:From;
	b=FyvIF4I78htQlfjOAZRq5puqSgpTm55jV9mYpkzWIO8pOlH2bXcFoytPakTacwTq6
	 MF+5naccU1LEgyT6+ruipBRgHEW7rArcOKiC1hZBhMLFr+TdlgMuKKiPwGOXyL0SgW
	 WvoFEtidRYDFFmjBBV1+jv4T0bap7FFFGbTT2+nokuJAJDnYwbC9k8E5tuhOQMgrIU
	 ZpkFbVgc3aC1cmkBr1+KGX0U48kdSrwDrlZ2em2R5w0DfpFqNtc7C7gSSe75tB2d+u
	 rejHk+CaJo5YCenI1k6W5/IhtvIGzkandkPFpxJB8g8zROuopAYhvwM4ObTTxQLABk
	 EdZj8+jVsJ/IA==
Date: Fri, 23 Jan 2026 19:34:01 +0000
From: Mark Brown <broonie@kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the block tree
Message-ID: <521f2cf0-45c4-4e20-be36-aded868edaf9@sirena.org.uk>
References: <aXOzI6sVTBTdJE5j@sirena.org.uk>
 <cb962e32-7d04-44a1-b99c-4d1889ffdbf5@kernel.dk>
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="iTcJTDvr9wN09WiY"
Content-Disposition: inline
In-Reply-To: <cb962e32-7d04-44a1-b99c-4d1889ffdbf5@kernel.dk>
X-Cookie: HAIR TONICS, please!!


--iTcJTDvr9wN09WiY
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Fri, Jan 23, 2026 at 11:00:55AM -0700, Jens Axboe wrote:
> On 1/23/26 10:42 AM, Mark Brown wrote:

> >     inlined from 'io_uring_populate_bpf_ctx' at /tmp/next/build/io_uring/bpf_filter.c:33:2:
> > /tmp/next/build/include/linux/fortify-string.h:480:25: error: call to '__write_overflow_field' declared with attribute warning: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Werror=attribute-warning]
> >   480 |                         __write_overflow_field(p_size_field, size);
> >       |                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

...

> memset(bctx->pad, 0, sizeof(bctx->pad) + sizeof(bctx->resv));

> which should clear from offset 10 (start of pad) for a total of 6 + 48
> bytes, which is 54 bytes. The size of the struct is 64b.

I think so, it's checking that you're not overflowing the field you
specified rather than the struct containing the field.

> I guess the part it doesn't like is that it thinks we're clearing the
> pad field, which would of course be way overwriting it. Guess we can do
> something ala:

> memset((void *) bctx + offsetof(struct io_uring_bpf_ctx, pad), 0,
> 	sizeof(bctx->pad) + sizeof(bctx->resv));

> to make it happier.

Lovely.

--iTcJTDvr9wN09WiY
Content-Type: application/pgp-signature; name="signature.asc"

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

iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmlzzSkACgkQJNaLcl1U
h9DpwAf/QbhlkUtpPiG6Aba91DDjepPQayVktgoBo7cBuLAzc0LB1Klw4SRCPvdn
SNpNKSccUxp/w5xrIujWwrmaxa2u25fjBgRhh7G3K5LmIhSwz7t1PbPdAQRlmYnL
827zvWmT+OE+EkGnkMYG+CM2yBwBJNEtHwLplSOBAMENTT6L48+YE76FW3B/ZM1Y
99bkiOcHjo9xxerIydsr6g5MODgDD9+zWm533Ca+19muimphVtFGvfN4dwxkv20l
bLWw8wHCIo4lGZtZpoQE3Jo8EPvL75Ho8NCEXXg4TFk1tP6a+yqDsfgu4jNBg14T
9n+G1LZmwBUqjk1YDbhYnwqAbS3gFw==
=3jhM
-----END PGP SIGNATURE-----

--iTcJTDvr9wN09WiY--

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3E738256C8B;
	Sat, 24 Jan 2026 11:47:35 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1769255261; cv=none; b=XLdizPn8twrfq1eC2T3XNCM/Ap7W/yXnHv2ea9iIzja1bCi+T0xwRj6kIycbaAHeqrPksBYVyFJNphEhbYgTsjKBlNPiUopPzq7W46GOdETDTmFKeHH771xIdGIvRQqt0cxir6rD8ij3JtWtQNz0gO5NIh+j4engfmvvX70oP5A=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1769255261; c=relaxed/simple;
	bh=iincRLQN8qCEKPF7i86sLhdZ46a3U2mvDd0AhMq0rsc=;
	h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References:
	 MIME-Version:Content-Type; b=o7zn4y1UO7BCGj9QrYlekMBLHS4pEIiX+8aWgEJDQSxAWK/uJ6VtiKKAFpjq1+X4/HBbCvwJWKZHrW3S5G4jtErfDcE6Q3WjgMHQlDqNrz+mfQADzXxcXeyU4rYcU78N7hlKVt6ncdIvnozlL/HxARm/Y2TUGXB61BO/3WpOkoM=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=Wm5Pfs+A; arc=none smtp.client-ip=150.107.74.76
Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="Wm5Pfs+A"
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
	s=202503; t=1769255253;
	bh=3sDVQWlad4FBCe1xSzGexS2jbHGDgA5u4eJ2uQ1LPuo=;
	h=Date:From:To:Cc:Subject:In-Reply-To:References:From;
	b=Wm5Pfs+AW4MJZ8Dv2sQAudwO+Zj2AH7enMbXuNEGM/aE7E8O3s65fppMLawxU5lXB
	 WNL9LKklmllJn7+ZnZqhCFvEuIGBo+trrtdmrUdC4NdQZQ2zxwmQeCyws0ykl7FWR7
	 yrFwGQICE7ObFuwrIpI42x5FIHOw6gSgQv9+1zfl5ZmZI3s1Mshes7QT7eqbIkDXyH
	 710BQY4/6TOntVXNQkRhvrQ0NeNv/M+XZTZB3VESh/ycvAIzEmWAQ3GJbTYpKm+gRY
	 Lb6D2LhjGV2xbFZSlJiJnpN/7JYs1cvksOt2qljnKQ0Wlvmh3kQIWU8aER5XVcijtL
	 ahHVX9RfYPX0g==
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(Client did not present a certificate)
	by mail.ozlabs.org (Postfix) with ESMTPSA id 4dytMS5lKWz4wCJ;
	Sat, 24 Jan 2026 22:47:31 +1100 (AEDT)
Date: Sat, 24 Jan 2026 22:46:35 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jens Axboe <axboe@kernel.dk>
Cc: Mark Brown <broonie@kernel.org>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the block tree
Message-ID: <20260124114635.10bff99f@canb.auug.org.au>
In-Reply-To: <ed061c97-9d4f-41c1-a340-1b1e57985e50@kernel.dk>
References: <aXOzI6sVTBTdJE5j@sirena.org.uk>
	<cb962e32-7d04-44a1-b99c-4d1889ffdbf5@kernel.dk>
	<ed061c97-9d4f-41c1-a340-1b1e57985e50@kernel.dk>
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/tg+SWH5ISw9R97voRA78AW2";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/tg+SWH5ISw9R97voRA78AW2
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Jens,

On Fri, 23 Jan 2026 11:06:43 -0700 Jens Axboe <axboe@kernel.dk> wrote:
>
> On 1/23/26 11:00 AM, Jens Axboe wrote:
> > On 1/23/26 10:42 AM, Mark Brown wrote: =20
> >> Hi all,
> >>
> >> After merging the block tree, today's linux-next build (x86 allmodconf=
ig)
> >> failed like this:
> >>
> >> In file included from /tmp/next/build/include/linux/string.h:386,
> >>                  from /tmp/next/build/include/linux/bitmap.h:13,
> >>                  from /tmp/next/build/include/linux/cpumask.h:11,
> >>                  from /tmp/next/build/arch/x86/include/asm/paravirt.h:=
21,
> >>                  from /tmp/next/build/arch/x86/include/asm/cpuid/api.h=
:57,
> >>                  from /tmp/next/build/arch/x86/include/asm/processor.h=
:19,
> >>                  from /tmp/next/build/include/linux/sched.h:13,
> >>                  from /tmp/next/build/include/linux/io_uring.h:5,
> >>                  from /tmp/next/build/io_uring/bpf_filter.c:7:
> >> In function 'fortify_memset_chk',
> >>     inlined from 'io_uring_populate_bpf_ctx' at /tmp/next/build/io_uri=
ng/bpf_filter.c:33:2:
> >> /tmp/next/build/include/linux/fortify-string.h:480:25: error: call to =
'__write_overflow_field' declared with attribute warning: detected write be=
yond size of field (1st parameter); maybe use struct_group()? [-Werror=3Dat=
tribute-warning]
> >>   480 |                         __write_overflow_field(p_size_field, s=
ize);
> >>       |                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=
~~~~
> >> cc1: all warnings being treated as errors
> >>
> >> Caused by commit
> >>
> >>   f1e3672e49e2c (io_uring: add support for BPF filtering for opcode re=
strictions) =20
> >=20
> > Huh, that am I missing here? The struct looks as follows:
> >=20
> > struct io_uring_bpf_ctx {
> > 	__u64	user_data;
> > 	__u8	opcode;
> > 	__u8	sqe_flags;
> > 	__u8	pad[6];
> > 	union {
> > 		__u64	resv[6];
> > 		struct {
> > 			__u32	family;
> > 			__u32	type;
> > 			__u32	protocol;
> > 		} socket;
> > 		struct {
> > 			__u64	flags;
> > 			__u64	mode;
> > 			__u64	resolve;
> > 		} open;
> > 	};
> > };
> >=20
> > and the offending line is:
> >=20
> > memset(bctx->pad, 0, sizeof(bctx->pad) + sizeof(bctx->resv));
> >=20
> > which should clear from offset 10 (start of pad) for a total of 6 + 48
> > bytes, which is 54 bytes. The size of the struct is 64b.
> >=20
> > I guess the part it doesn't like is that it thinks we're clearing the
> > pad field, which would of course be way overwriting it. Guess we can do
> > something ala:
> >=20
> > memset((void *) bctx + offsetof(struct io_uring_bpf_ctx, pad), 0,
> > 	sizeof(bctx->pad) + sizeof(bctx->resv));
> >=20
> > to make it happier. =20
>=20
> Folded that in and pushed it out, should be happy for you now. I wonder
> if we have a helper for that...

The origin warning did suggest using struct_group().

--=20
Cheers,
Stephen Rothwell

--Sig_/tg+SWH5ISw9R97voRA78AW2
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAml0sRsACgkQAVBC80lX
0GyK7ggAj4F7G/F/DFZ+B1ml62CWWou/LvifNSGAtTiUR1rHNdYm7or/Hv3xfw05
99rlFRsQwHNTe9N2eoEXfu3jqUGpGHNuBhmSTFJtYDNb3Lenbosr31Eh1o9FjLc6
gfiKLjpB4v1ZVjqdCHTeufnbGEj/A90yttAc8j3fbtD+1GqAFDlVqx21I56HBgGq
QBxTDyQDfs4BRtF/wbZUAxwFYe3PiKY/qe7uj65tC1bZ2Yq9q3+jCLIjYBuKYrYN
0naDEeUI2vnjzVRTBN9nPU8v78QWuFm0p71XyN8MVCme849gUCNLJ+iMiSuqgbkP
J3MRiiXFG+EPx/j+cLm6crykF5rPOw==
=pgrE
-----END PGP SIGNATURE-----

--Sig_/tg+SWH5ISw9R97voRA78AW2--

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail-oa1-f52.google.com (mail-oa1-f52.google.com [209.85.160.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 651A821C9F9
	for <linux-next@vger.kernel.org>; Sat, 24 Jan 2026 15:00:25 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.52
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1769266827; cv=none; b=tvdKFdQhqfcOCy/xsf0Zi/KVBBYxQKwNKNQu9mCe8Cuo1B//LDOYXmNFzJowi76vmPN01Zmet9cBwXEw/C6HxVYjEP76Jx2VSeKvw76N74RktqdUuRaA7opgwFEl/2rC1UB1eFfA6dEMcMfMs57bEj/IjMEoduKnC9IVVG0beD4=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1769266827; c=relaxed/simple;
	bh=6HrUoe1kZh/iI+guNdW5pOruzGgoM4/QRAGeumTZ9wE=;
	h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:
	 In-Reply-To:Content-Type; b=Llzjd6koY1rLCY6HkdNXngiEi9Y9ViJA2oCmnKDYdAVekcHHdiG7iMQs5tTufmzsydVmMTtdEcT5F84ltGS9cxD7VluDXW9P0qyAeXNSvLNYkzWeC4L5qJ93BUI20QpfKziOt36fwIheAWsBWCNp09kknBNyFHIusdryjFNT91U=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=dirwl1mJ; arc=none smtp.client-ip=209.85.160.52
Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="dirwl1mJ"
Received: by mail-oa1-f52.google.com with SMTP id 586e51a60fabf-4042fe53946so1013464fac.3
        for <linux-next@vger.kernel.org>; Sat, 24 Jan 2026 07:00:25 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1769266824; x=1769871624; darn=vger.kernel.org;
        h=content-transfer-encoding:in-reply-to:from:content-language
         :references:cc:to:subject:user-agent:mime-version:date:message-id
         :from:to:cc:subject:date:message-id:reply-to;
        bh=KPQY7I+g/cUTl6X/qpTV4vJTMxd/5TTcOzc9jOcFEvM=;
        b=dirwl1mJIc3w1Y3WNlbHi4ZkPxnZMHns+OPbZzK/FD2pu1crBFb6GKnICGDWoYhsHV
         qj/ay6fB6w4sGwX1g8O7b3JCRwTTohDJEpkvzrHuaiVblTX0DSlvkCF12FcZo6XTsaux
         l15vSrEYdArtnqE8y30/a4EjtUqKE4JWwti91mHkveU4VdO/xv2BWK/SbxgR/Q573/o6
         Sh4cNZK9otrGYSK6vOZScNvPm/uIt/jlRnBy0fVGDSlTxibghRB1P9ibGtmw/waYAJtE
         VoLlat5keLip/wVZNRPL0hS5U26zEBdTDYOHajAzuUAuQGBCY7rPPw/HKEP0L/gFbSsH
         qDrQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1769266824; x=1769871624;
        h=content-transfer-encoding:in-reply-to:from:content-language
         :references:cc:to:subject:user-agent:mime-version:date:message-id
         :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id
         :reply-to;
        bh=KPQY7I+g/cUTl6X/qpTV4vJTMxd/5TTcOzc9jOcFEvM=;
        b=dLC+BWPbEpfSk3HCZHnYXyGw3AsiNZ7IvBAIpsXtAIz0zSYVIE3n6Cx04O8u0Zpaet
         jKMfVSz8CNiAxG+8U+7/sin5zzTstI1mE+qOi6hZeCU0Xrgaut7cZm1MISt+p26XIjtz
         bGghXf9S5tCAlHKEvIEevoipQUMqJ5Bwuqk7W7xKeUXFbzCXzEN1WC+Oa5LHLO2xHmQ5
         81GPHmdri23batipYxxrnXerFhj3LpEl4WCy8/HUdAJvID0W7euC6SWbcjBmzW/UAVIc
         7HUTHU/PwZCvleaaO/ClSJM/8HRyzY+3L8UmoTHjIKx12hMaP+1hO1Cxx9Y8qhVc+GhS
         wT5A==
X-Forwarded-Encrypted: i=1; AJvYcCV0yt3EJnRFhlFSc+J7JhF0UoRavPvvWcSuDltnYTpA4iudObT4+yeLk+lFzqWp5Y4sdq+cfZyG7JXD@vger.kernel.org
X-Gm-Message-State: AOJu0YykqcHblRz/XkDfU8pPmWc4T/ST0DmC1oen/rcEu3K0YEcrUape
	RCKF4Z5XydHv+bzd8F4+XjxZzPqZySKcAHaBnj1bYiaxvQOKv+5YVKz0wsd1jXemqHI=
X-Gm-Gg: AZuq6aLynrw1iqD5SbCN4iBm1W/6q87pIuDe80xCgp3NlBPko77eoiPon7Y5wKJfofW
	crdtIDV3QMTJrRNUpoa/1789wsSaLcZNh2L2Rq0zDicaUZcCMLyv6hoAlYU0qKwiIcGrU5CcjpJ
	ztfLyoz2WdUUjIGcuw9oKdy7rtVBWx/sIsYBcvLTdhOr8sVCM5RCx7YMk2RMuVX6o3umRZESlM0
	RbHexTR005/rKtyotvQkE+jTuvLgiipnvE9LejRMSC0EXlDCEOdZl89vAPPGkUt00R3txx4wLhj
	Rjnahs0Tw1Beudb8uK+uEMas9mV0WaKdCjTGOg1Nv+GCxHUGRMcxTXNzCvYKQLkMWNSyVL5z+/X
	LQ9+dXm8HdsHaqMc3urPT54FkcDF7S3l/IfOPh2nsvKsM/PZQbDGCCEkbYKMxiNzlWvRi37TarJ
	KeMtzoViGuITDRMwItaR2VGK+v0eAHG2V2SXKAWUFrLIJJ+X6l0pNZtC81U4DUTk88uJFVDw==
X-Received: by 2002:a05:6871:5225:b0:404:3805:1dde with SMTP id 586e51a60fabf-408ab3b3b5cmr3355162fac.8.1769266823625;
        Sat, 24 Jan 2026 07:00:23 -0800 (PST)
Received: from [192.168.1.150] ([198.8.77.157])
        by smtp.gmail.com with ESMTPSA id 586e51a60fabf-408af88d1c2sm3749680fac.8.2026.01.24.07.00.22
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Sat, 24 Jan 2026 07:00:22 -0800 (PST)
Message-ID: <5e31c5fc-15e5-4ef1-944e-b4ba097829ed@kernel.dk>
Date: Sat, 24 Jan 2026 08:00:21 -0700
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: linux-next: build failure after merge of the block tree
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Mark Brown <broonie@kernel.org>,
 Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
 Linux Next Mailing List <linux-next@vger.kernel.org>
References: <aXOzI6sVTBTdJE5j@sirena.org.uk>
 <cb962e32-7d04-44a1-b99c-4d1889ffdbf5@kernel.dk>
 <ed061c97-9d4f-41c1-a340-1b1e57985e50@kernel.dk>
 <20260124114635.10bff99f@canb.auug.org.au>
Content-Language: en-US
From: Jens Axboe <axboe@kernel.dk>
In-Reply-To: <20260124114635.10bff99f@canb.auug.org.au>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

On 1/24/26 4:46 AM, Stephen Rothwell wrote:
> Hi Jens,
> 
> On Fri, 23 Jan 2026 11:06:43 -0700 Jens Axboe <axboe@kernel.dk> wrote:
>>
>> On 1/23/26 11:00 AM, Jens Axboe wrote:
>>> On 1/23/26 10:42 AM, Mark Brown wrote:  
>>>> Hi all,
>>>>
>>>> After merging the block tree, today's linux-next build (x86 allmodconfig)
>>>> failed like this:
>>>>
>>>> In file included from /tmp/next/build/include/linux/string.h:386,
>>>>                  from /tmp/next/build/include/linux/bitmap.h:13,
>>>>                  from /tmp/next/build/include/linux/cpumask.h:11,
>>>>                  from /tmp/next/build/arch/x86/include/asm/paravirt.h:21,
>>>>                  from /tmp/next/build/arch/x86/include/asm/cpuid/api.h:57,
>>>>                  from /tmp/next/build/arch/x86/include/asm/processor.h:19,
>>>>                  from /tmp/next/build/include/linux/sched.h:13,
>>>>                  from /tmp/next/build/include/linux/io_uring.h:5,
>>>>                  from /tmp/next/build/io_uring/bpf_filter.c:7:
>>>> In function 'fortify_memset_chk',
>>>>     inlined from 'io_uring_populate_bpf_ctx' at /tmp/next/build/io_uring/bpf_filter.c:33:2:
>>>> /tmp/next/build/include/linux/fortify-string.h:480:25: error: call to '__write_overflow_field' declared with attribute warning: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Werror=attribute-warning]
>>>>   480 |                         __write_overflow_field(p_size_field, size);
>>>>       |                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>>> cc1: all warnings being treated as errors
>>>>
>>>> Caused by commit
>>>>
>>>>   f1e3672e49e2c (io_uring: add support for BPF filtering for opcode restrictions)  
>>>
>>> Huh, that am I missing here? The struct looks as follows:
>>>
>>> struct io_uring_bpf_ctx {
>>> 	__u64	user_data;
>>> 	__u8	opcode;
>>> 	__u8	sqe_flags;
>>> 	__u8	pad[6];
>>> 	union {
>>> 		__u64	resv[6];
>>> 		struct {
>>> 			__u32	family;
>>> 			__u32	type;
>>> 			__u32	protocol;
>>> 		} socket;
>>> 		struct {
>>> 			__u64	flags;
>>> 			__u64	mode;
>>> 			__u64	resolve;
>>> 		} open;
>>> 	};
>>> };
>>>
>>> and the offending line is:
>>>
>>> memset(bctx->pad, 0, sizeof(bctx->pad) + sizeof(bctx->resv));
>>>
>>> which should clear from offset 10 (start of pad) for a total of 6 + 48
>>> bytes, which is 54 bytes. The size of the struct is 64b.
>>>
>>> I guess the part it doesn't like is that it thinks we're clearing the
>>> pad field, which would of course be way overwriting it. Guess we can do
>>> something ala:
>>>
>>> memset((void *) bctx + offsetof(struct io_uring_bpf_ctx, pad), 0,
>>> 	sizeof(bctx->pad) + sizeof(bctx->resv));
>>>
>>> to make it happier.  
>>
>> Folded that in and pushed it out, should be happy for you now. I wonder
>> if we have a helper for that...
> 
> The origin warning did suggest using struct_group().

Right, and I do use that in io_uring in other spots already, but it's
pretty ugly for user facing structs. Both because they are harder to
read, and because it's bleeding internal detail into userspace. So don't
really like that for this use case.

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail-dy1-f181.google.com (mail-dy1-f181.google.com [74.125.82.181])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id C340C239E80
	for <linux-next@vger.kernel.org>; Mon, 26 Jan 2026 14:31:56 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=74.125.82.181
ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1769437918; cv=pass; b=KWYyfM/Qae/6Q7aT+6HvjRjnmLuz+dLbSdaeFadQ4SlmE3vZ/Xbta11ji55E2seh0oHRVvHfITCN5W0EcDEQyzTcbKqsEhZWFx8Jj/pXWNqh7xRkV1dcYLyoAOeWCCPGVR1TyIyctz3hBoOy1WaslhHl/QJEibiCRXex8j4DfrQ=
ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1769437918; c=relaxed/simple;
	bh=xi++//p9mPgCpqvLhDy3ZiOM7NuFTZ1rJLnz2axqRFc=;
	h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject:
	 To:Cc:Content-Type; b=h8msFJW44t8uFfSCnp4TOsMDD4rm7FYg6+wabCwmH3CwVg7iYuqFF5U4lngTrUXPt89c24vCcSPGSABZ+1+XLNtn7YRdwpnpZAulqCx7J17hksBAMNsBHLT/xq4msAjGoSRK5zMjvvOyVxQ1OabqgqgPyA4XDTe6qbn+dBq1HXY=
ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=eXKUevzw; arc=pass smtp.client-ip=74.125.82.181
Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eXKUevzw"
Received: by mail-dy1-f181.google.com with SMTP id 5a478bee46e88-2b718524994so209902eec.1
        for <linux-next@vger.kernel.org>; Mon, 26 Jan 2026 06:31:56 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1769437916; cv=none;
        d=google.com; s=arc-20240605;
        b=c7xRomEMRZIE5DuYhIjudjZurxaEBABw8pUnEYeA8DydK1hF1orSErBp/d5da9IBTL
         pSr/ZSeR/WmjgCHiZa3m1+2RtQnYnx2weTvfXB/VpePZgwUfFHkC5Dc1KW+B1nEUn4XQ
         mxkCM+DBJgbQSumstTQxLIgOPBFYRorgWERrC4GaocOPOVHl1MANhqAKaEsxCrMK7ZNU
         XGsJZr2GZ3vZUsDWOPdptW3z203s85UK3+5XiWFVP6F6RfPHmMda3G3H3obDlN84BNcd
         KG2S7hIz9JGHE0XEXZhHeS+qGopLDh5mo8W6ESukdvSFCL3gpc9M8jEYQTgg0TVsXdCu
         8F6g==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605;
        h=content-transfer-encoding:cc:to:subject:message-id:date:from
         :in-reply-to:references:mime-version:dkim-signature;
        bh=xi++//p9mPgCpqvLhDy3ZiOM7NuFTZ1rJLnz2axqRFc=;
        fh=8QVfzxcm24vprt6cVVOkov7CblmXwAVygyjrGju2pJU=;
        b=IWBCVfY+iB56M1I2xTLrkvX4JOhL4rY+Z/+k05XRdN5Ek3/OQhnQsxxi5YPmBFJGcW
         HYGBHTldakcdXEtX+NvVaFRY2KuvsjdMmhlM4iYMVIr2+cOQyMlU4UnQRRKemM+xbHkG
         LHo4NgTVrQ4Q/qGOtuKxa/fxNAQdQyHsypf2eLekA53VlZnU3HAow6E9hQfaHeB+7ZRG
         a+agD7KZc8hzegNFv0gN984aEO45FFconaajI1LFGjhmbSQAmMuyQ7nHeKLPuUe5mbhF
         KTRqt2PRFKkktgY7z/KFewusSo8f7YJEQgiyzT248Rt+/ybI+DTVn6OlQxeet8jew5K7
         Jt8A==;
        darn=vger.kernel.org
ARC-Authentication-Results: i=1; mx.google.com; arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20230601; t=1769437916; x=1770042716; darn=vger.kernel.org;
        h=content-transfer-encoding:cc:to:subject:message-id:date:from
         :in-reply-to:references:mime-version:from:to:cc:subject:date
         :message-id:reply-to;
        bh=xi++//p9mPgCpqvLhDy3ZiOM7NuFTZ1rJLnz2axqRFc=;
        b=eXKUevzwdoAicv7M+hOqijDOLWs5dkDxldHf3ENyVVMzn5EHps+SPwcFwq0y0smZGT
         RLDJCd6KbG+v2YPFZD6oclAOH/G0EgStHMyy7fGqVY34VEcbsDrerN1SdziKMWu4Hj/I
         avFfuGW0h01vqGLBBHqmSuyNHXJXbzpsGOO1ELFO4ez2lrPQIaWVD2j9a+gMYgNt/fyS
         rh73Nug1t+Md1IVwrpFH3wiYcRSNVbNcEJAkZnPr+o+8++GWFNavaohKPyOKEhxCKxDG
         Lbauv9I89tF20pAN7eCml/TjD3c560haE00rOuAt+7/HPSzZ4T4Xlg+picBKqYlvcnf1
         EBgQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1769437916; x=1770042716;
        h=content-transfer-encoding:cc:to:subject:message-id:date:from
         :in-reply-to:references:mime-version:x-gm-gg:x-gm-message-state:from
         :to:cc:subject:date:message-id:reply-to;
        bh=xi++//p9mPgCpqvLhDy3ZiOM7NuFTZ1rJLnz2axqRFc=;
        b=hzkJOV8+RRiLbHt5fWAYRUaXhhoW77CBkeDFwGCh1+8PJPnWYVZGt0TdHT2VWC4GaH
         VrCE+CBIlguHsduIS1pUUMyE257616IcSW9OGDVAHCTfbPMiwb8wdugpcN01A3ATZJEI
         Sh5WNFm3IG5MUj94dmlpQlyl+dqLn/+7IzAnGLEUYc5i5cFOksLCdg/+amJYJD6jaIZN
         dPCY3/6O1r5gavbcmwJ2ChWES3QG/G2sXtsghktblt97QGZd+Co7i33u7P+zWEbnLmuz
         YQ8dVVxGm5rzOBnITb76ViINE+V+y0ubpOe84QuHyzMISd7fv3vedQO95Gn5mKCod/ut
         n/tw==
X-Forwarded-Encrypted: i=1; AJvYcCV7TotxcuwP7DYOtAOujaOCB33Sp5ZZ3sso2orM2H/i/0Fp9QrZasEsbDFQa3gfKxXxCTYsfNbtaTpW@vger.kernel.org
X-Gm-Message-State: AOJu0YyDmGOTsUwy6MI6o979ycNHOEPx6OgY/VlsV6AJPvr0Z4tCac7B
	pyU0edy+mAW8lJZ6NbFVsqZ/cJ7togf51YGOuD+FGZK8GrTxbvrAs7cjAsHXHEoswvRLgWybJ9+
	KCWcpo5AJ8VZyQARmugnH0+uYJ93Wzwc=
X-Gm-Gg: AZuq6aJqNZnhkGGzZVlXk5eG4fUKsc37Ag4kkUVk0U4L/YrvA/cnFmGGJVIJgzP2VGD
	6z/sShVFbabClQZpbP8YkFaUH5acmBwDvBKyDoM4z2Q/lUtqbBe/mLRs88L95KkCLHjR1Lvwien
	rLT6TQTYFOefjevgF69tPEX7Lh4gNKuL1SGo+OKHVgFhVahtkDmyrEUOwTSKmioWpKgGgEodecp
	g16GaTvIX1uOlO6KN8g73eIezO7jbSOIxw/7uwrGnBuzuaHnh95UsJGTJYSedBezBhlq28Mupem
	KVUnY7pV5We15NO2+iHBfCEJcQzoLU/lXOsvDyqaAlHAouABaLh5nyWaFeiBwAeeRCeaZD9sJmi
	UQwbLYuzvcBraRh1LFJ0YPi0=
X-Received: by 2002:a05:7300:730c:b0:2b7:103a:7697 with SMTP id
 5a478bee46e88-2b764828e58mr1098566eec.5.1769437915831; Mon, 26 Jan 2026
 06:31:55 -0800 (PST)
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
References: <aW5xqLq7gatOy1DV@sirena.org.uk> <fc855e76-5f3a-458e-82f9-f43c7d23932e@sirena.org.uk>
 <CAJ-ks9=V_JmzEaXUrHPm6K-DyTgkxEhrPCW=2ZgDJpc+4Z83_A@mail.gmail.com>
 <27b562ca-d79b-4f80-be71-ebf5e26ed9ab@sirena.org.uk> <CANiq72nS94wv50XyOJq5CeiVQvb0+3mNdWxJpFy_+2FH1x4RYQ@mail.gmail.com>
 <aa4bc767-8128-440c-a2a2-81fbb6992a8d@sirena.org.uk> <CANiq72njSUPt2CvjBiNyKw1KHSgnMdcBnXNL_pHV4iURYL1n6g@mail.gmail.com>
 <b17da8b5-6640-46ea-ba73-d2f4a08e246c@sirena.org.uk> <CANiq72kT9ThJcr5W0OhBmbwKZCpULjUehNjijTt8W09yB0CxSg@mail.gmail.com>
 <CABVgOS=DHdF6XmVUKH1zTML3kV7ozy8BG4o1dyd07BnngpYx4A@mail.gmail.com>
In-Reply-To: <CABVgOS=DHdF6XmVUKH1zTML3kV7ozy8BG4o1dyd07BnngpYx4A@mail.gmail.com>
From: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Date: Mon, 26 Jan 2026 15:31:42 +0100
X-Gm-Features: AZwV_QgGEyw9CJb-uZGi9661oycpowA5WWyOeY0XaeNPcbQBd660gLmJIyINtH4
Message-ID: <CANiq72n7EspYnQ-8WLhVAdqsPk1B6=gVmMiWdoCwMxkHC-boKA@mail.gmail.com>
Subject: Re: linux-next: build failure after merge of the block tree
To: David Gow <davidgow@google.com>
Cc: Mark Brown <broonie@kernel.org>, Tamir Duberstein <tamird@gmail.com>, 
	Andreas Hindborg <a.hindborg@kernel.org>, Jens Axboe <axboe@kernel.dk>, Miguel Ojeda <ojeda@kernel.org>, 
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, 
	Linux Next Mailing List <linux-next@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Thu, Jan 22, 2026 at 7:36=E2=80=AFAM David Gow <davidgow@google.com> wro=
te:
>
> The UML Rust support is pretty stable for the core Rust bits, KUnit
> tests, etc. It can get a little broken from time to time with new
> drivers, gcc-based builds (instead of LLVM=3D1), or 32-bit builds.
> Ideally, those will work as well --- everything seems fine at the
> moment --- and you shouldn't have any problems with just running:
>
> ./tools/testing/kunit/kunit.py run --kconfig_add CONFIG_RUST=3Dy
> --make_options LLVM=3D1
>
> But do let me know if anything is broken.

Thanks David!

Cheers,
Miguel

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail-dy1-f171.google.com (mail-dy1-f171.google.com [74.125.82.171])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id EAB571EB5CE
	for <linux-next@vger.kernel.org>; Mon, 26 Jan 2026 14:42:36 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=74.125.82.171
ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1769438559; cv=pass; b=iel4KXdbn5c7scAbI61fshLDt6XzUzkO+cs2gAyNe6bJiqXhcoqFy6e0tTDpPGE0xcrFvf+u4AUpIoptCGk3eTIULOVKN6EXmcm/LiT3ks7TPzGHocqyhdT67JiK9jVtD3/syUaM/T8aNDcT0KJZ1rHKoDh3kOSDnvnqguCfp2U=
ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1769438559; c=relaxed/simple;
	bh=ic6xgOXHwcgP5YxtzZmaJC+J29ldNfKYx8Ee0BY9QaY=;
	h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject:
	 To:Cc:Content-Type; b=Hi4luMuXJ3HzwiymCOeRqhbmHCgYl6cFHWRgO/9LZ39HQxIT7YXcXV/7ROSyh4UsUXBcHMzLuSicjR81nSzel0RrGQOlCYht591XsIk1NF/N8vt+HbYH0WwdY/fX+hh0h8YlRuGdIvMjQd/MNoBcHRzgPUoa9stbHs0rcARRWDQ=
ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=dUGzEv1H; arc=pass smtp.client-ip=74.125.82.171
Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dUGzEv1H"
Received: by mail-dy1-f171.google.com with SMTP id 5a478bee46e88-2b6aa67a792so248332eec.3
        for <linux-next@vger.kernel.org>; Mon, 26 Jan 2026 06:42:36 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1769438555; cv=none;
        d=google.com; s=arc-20240605;
        b=eVeQ9ItVkjw9AdcYi8KREdJX6jqRiszdxAZfdLVmzr634ApFoRqXVM4hE+cyFanEI3
         //5xdW1cZHa4Fp0Il7hWSOwaItPwDrVBxLPjRI0MNaohtvpXAq6v1Xpv7toebjiE8/Ie
         w7h5yu4vSbALaWUVQTTySkf/g/2UFgJMenYPL6EZdlDLaZQiynK36a3U0S1E+AXDYeKG
         6MMrYPOHIKutcDpM2jDi9ll0IChwhkf/7VN29zMxyLJKt6w+ChoyOTwsQstRnMHb3eyJ
         TwQMSiIt2jssPtySKonjtjSGzNcgnsNjFhQV8pP4cztPBmhaFNihkumLKuNs9gbIB0gK
         jH6Q==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605;
        h=content-transfer-encoding:cc:to:subject:message-id:date:from
         :in-reply-to:references:mime-version:dkim-signature;
        bh=ic6xgOXHwcgP5YxtzZmaJC+J29ldNfKYx8Ee0BY9QaY=;
        fh=/LbJw9LPYCcUnMnG0Q4Y3Uq4FGtZNgYZ1R6Vtmp6YCo=;
        b=HnmgOmJRBrVsTiJvcr8alq+M+AUG1KrnASdMbePfnRBq42tOiOZO5IAosx4Vk9UNk4
         uARmOPTKI/EKFeV40N2pGSFRSMPERjI77K92PtnumecXJjTNSIJJkMziaIANeEMq30lj
         wNHtsysURO+m7pCWtMASdIysJzguNLUc8H3D7jq0i53E4FcYOhyMpBOMVGoMAFKcWtf7
         ewl/ch2AvyGMIKHxaVjlSithGE6ddcMvKzloion0iKy7Nvbl6xyrF79y06ItRzmpawFX
         K/WlSN4T7MtNmG/wXvrJ89dJ0UU0JOLSlgf5xSPzPv9XobUdEUjpNE+1LQN9uxYQgV8w
         L/6A==;
        darn=vger.kernel.org
ARC-Authentication-Results: i=1; mx.google.com; arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20230601; t=1769438555; x=1770043355; darn=vger.kernel.org;
        h=content-transfer-encoding:cc:to:subject:message-id:date:from
         :in-reply-to:references:mime-version:from:to:cc:subject:date
         :message-id:reply-to;
        bh=ic6xgOXHwcgP5YxtzZmaJC+J29ldNfKYx8Ee0BY9QaY=;
        b=dUGzEv1HUQyi8IZ2pXDh1xgx3xwuJF8LnrUvH+GGMzt5wqlmPWZIy8K1/HDTNckGKA
         bwN0NOutklRebKsa4rWw7TMGNPwa5Kn7tZCndqJnQhikW7CKJFlOy/NmqRNVbC//qxN0
         FIaarRImCJTi1Yd1wI94m0UUhu92y4FumGxiUKVJsHOn2UzCjpt/gAPyXMu4OcAL9lFu
         EroTurA73fV+qDGo7ukChLPvyeOawzzN9x7MLKhZdy+1Q63q5xb5HwI2ijJcboXMxJEv
         07Fuvtv67H9fN5zoYRmaT6XOXUvN7RANOw3Vx3X0fltdL1/lg3VrIsWpOw1Uvk/POUYO
         4Uyg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1769438555; x=1770043355;
        h=content-transfer-encoding:cc:to:subject:message-id:date:from
         :in-reply-to:references:mime-version:x-gm-gg:x-gm-message-state:from
         :to:cc:subject:date:message-id:reply-to;
        bh=ic6xgOXHwcgP5YxtzZmaJC+J29ldNfKYx8Ee0BY9QaY=;
        b=dgnqTYE4KQBqWXPs4dhjNoxIs/0rsfh+sr59NnxIdq9awxKPtRzlpksgM2fBUS7MqQ
         gWoUPPu3yTq0dQDI5dgGwhtixngSqoq5KXM9L6Bmy2ev6ejrOVdWQRnoMAcs7smJAq/9
         /W+OBvSzYSeSJkbkDt23a91KcHUTTPYYx11I1yZkrFwuaGUdxbLZdhvFkzQvthEYP4ck
         awpHPejH77sg0+nTc2tgQQpv9SLIz1UN3rpQK/lTxu8NZEdIyl5cEl2uD8qywZYumM8J
         qRAfF/gyaXt+bcsVx1huJ2sxtJRKv7k3/R/S2S6Gp/JvY+wRqUdlnfd+MZKt3zSmA9YP
         Bn0w==
X-Forwarded-Encrypted: i=1; AJvYcCXvCKMDNeOYgkhPHyoFa0tqhw4rTD9dBN3EMdOE/lBhsW4bGqPcRha3k1NSqYmkbcGG7jlpHG1BHDnE@vger.kernel.org
X-Gm-Message-State: AOJu0YwYO2D3cXGgLijXx8tbw0AzAeYVuGA3IaiIWesyedb+Vky4T6ci
	PBUCasdJGPS81YI3Id8VMD5Q1fVZv4u+Fd+HXIB79r36dxM8z8JhmZkRSdMRBgqz1eCFdoC9uXc
	Faym3g41qQ1pA+d7J1aaJiG4Dfr40uD8=
X-Gm-Gg: AZuq6aLM08OJaQy1h2qs5xHLQaDHuTFYrA7hGMgHUFIxoK/IPFEh4xX4rZp0xfvew89
	y3xT3b0AIdxFXTI9chXxgZK+lk9m62xv3qdEX7BzA5wdix2tIDFIeokCWi2cE0PlCOm+dx3eKde
	tvizvHEYqi8628vZpDL1csCxFxQqh1OT51E0dBTcL5ErusLIrUaveblzxAknZan9Uw6DS8/tDYZ
	Wya4JijK37G9Nc9HvCO64dc/5tg9agu23r0DMPtbC+p7lyK10jpU3pMUZQXnrT37XHslQXaW0Ov
	2fabvLQBdolW6g+WDDeM3dRawMMJUS3/AD0zmdevvCFJCtRgKyq4oldG3sEqOptmjLuzfUtEsV+
	2GQ45HbBwdHfi
X-Received: by 2002:a05:7301:4090:b0:2ae:5245:d50e with SMTP id
 5a478bee46e88-2b7648b942dmr1130225eec.8.1769438554939; Mon, 26 Jan 2026
 06:42:34 -0800 (PST)
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
References: <aW5xqLq7gatOy1DV@sirena.org.uk> <fc855e76-5f3a-458e-82f9-f43c7d23932e@sirena.org.uk>
 <CAJ-ks9=V_JmzEaXUrHPm6K-DyTgkxEhrPCW=2ZgDJpc+4Z83_A@mail.gmail.com>
 <27b562ca-d79b-4f80-be71-ebf5e26ed9ab@sirena.org.uk> <CANiq72nS94wv50XyOJq5CeiVQvb0+3mNdWxJpFy_+2FH1x4RYQ@mail.gmail.com>
 <aa4bc767-8128-440c-a2a2-81fbb6992a8d@sirena.org.uk> <CANiq72njSUPt2CvjBiNyKw1KHSgnMdcBnXNL_pHV4iURYL1n6g@mail.gmail.com>
 <b17da8b5-6640-46ea-ba73-d2f4a08e246c@sirena.org.uk> <CANiq72kT9ThJcr5W0OhBmbwKZCpULjUehNjijTt8W09yB0CxSg@mail.gmail.com>
 <vTqxQtPb82EIUJtln5_7rGW5a8ot7hGZeTwDlTSiQPJwSr8IZ5COad9CBcZY9jg8YssEH6NyvESidrBA1sx4JA==@protonmail.internalid>
 <8cc01720-427d-4cec-b4d0-721b22c47552@sirena.org.uk> <874iodtshv.fsf@t14s.mail-host-address-is-not-set>
In-Reply-To: <874iodtshv.fsf@t14s.mail-host-address-is-not-set>
From: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Date: Mon, 26 Jan 2026 15:42:22 +0100
X-Gm-Features: AZwV_QjKPlKEO5pENzOQcmRwF6qJf_ONCrDq6jkrVHKEPLGTmI7QYLpuPHyjJ8M
Message-ID: <CANiq72kyjMLcs-JW4EQy+ewwxAbSdbbstBs5fB=2kG_9iRYNZQ@mail.gmail.com>
Subject: Re: linux-next: build failure after merge of the block tree
To: Andreas Hindborg <a.hindborg@kernel.org>
Cc: Mark Brown <broonie@kernel.org>, David Gow <davidgow@google.com>, 
	Tamir Duberstein <tamird@gmail.com>, Jens Axboe <axboe@kernel.dk>, Miguel Ojeda <ojeda@kernel.org>, 
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, 
	Linux Next Mailing List <linux-next@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Thu, Jan 22, 2026 at 7:25=E2=80=AFPM Andreas Hindborg <a.hindborg@kernel=
.org> wrote:
>
> The `rustfmt` target will change the source directory even when building
> with `O=3D...`, if it decides formatting changes are required.

Yeah, if that is not desired, please use `rustfmtcheck` instead (i.e.
it will work in a read-only srctree).

Cheers,
Miguel

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail-dy1-f180.google.com (mail-dy1-f180.google.com [74.125.82.180])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 355AF23EAB0
	for <linux-next@vger.kernel.org>; Mon, 26 Jan 2026 14:44:15 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=74.125.82.180
ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1769438656; cv=pass; b=biy9hUQrXcD8o9BSu95/2IUL1fQKwaEUH/+deSgYKS3T4UmuwyRaY9MHD4kBmLLlFsSRbEbz292ZigjDMkIa2/sIyAzFosXBzP2fMRPeFXCfwXs7bEfXKrMLhP4oxuDZ43YrU3wnCVi9GG9s/DW0zxVM6XYQ23avRpc3w98oWac=
ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1769438656; c=relaxed/simple;
	bh=LJh0QQhVWuL5mMofb+0u1T7nrTT1zf5DiT8JEavO5Jg=;
	h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject:
	 To:Cc:Content-Type; b=iueTMlXK+MZTuhzaxq9dcDtAXQ/XFFjoeRiZ+wNdwLXWoFMEwCNCXllKqLn9Vi8rSrVM2rl1njlrtEXn3oDHV6dEyOTItCHd4NRacrd277fB2+1VdN0dVZM6jWVyeOQAPb7C3DikXmLEfDeiO9MoGyyvEWXMW7Nw0+k9R6bXRps=
ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=FRU4VpCr; arc=pass smtp.client-ip=74.125.82.180
Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FRU4VpCr"
Received: by mail-dy1-f180.google.com with SMTP id 5a478bee46e88-2ae5283dae8so292468eec.2
        for <linux-next@vger.kernel.org>; Mon, 26 Jan 2026 06:44:15 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1769438654; cv=none;
        d=google.com; s=arc-20240605;
        b=Cn3AnkXOq0r+PYzDSQU/ToyyihL+aqs0jwtBRMztB76QeckBm9/5CAH7Mjm80b9Iu7
         9mQFWv8tg5N83ZmK9FEG76jEOrdGWnymD/7uqKGgmEnlPSXLdB9miiFFg5wiBjAH1A9Q
         gxvQxq5khpcSysijtyjyEyUlJV+/Zt9K2Htx3iPYUny19fDE2644hyatS+rD9N5/INCQ
         88lGGNmnwPBe5a+GL78P0J3a2/PlqVvOLQ74DenzcN1Fw1HMZsOxrk+lIxSTICx3xhHZ
         l0TWagdSydmZegqXcoQOLgyXly2GfT9h7yMs6gJAov7uYk8jpinELp5hkVr9pWnCYlIk
         RecA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605;
        h=content-transfer-encoding:cc:to:subject:message-id:date:from
         :in-reply-to:references:mime-version:dkim-signature;
        bh=3voJ36VQ7H+1J7+hgsJ0Y8uFrYQ1/j+5BjmXKDJ/9y4=;
        fh=zumd6+gxHdpmIe3hNkDitKlxtqTDi286fS/mueHE2Jk=;
        b=J6BMEfxge4AbRH9n68rSPKCiS/AD3LXSdNeTAzt2kF29rzsOguODNCiu5NlJhTj0pX
         8o7CgNcsDxzJ4N5nVkZZ3viwsxtgZeRf8SXe0zCUGTGeFV4UCvEZXBgoY74Ns6fDPH0Y
         CZpTGHiPZitZAhtiLc2PS5rTimAe8gkplbntjeei8gQpkLErYMs4Oy1UJS+Pf8NHJ4SZ
         seI5HsE5hbjQgJM7ld/LLcP40B7ZSC/GwvXOu2iDTxx6hch10zF+heSG6tGzjfBZqn3k
         mDQJiTyNA9CaXgAlt6FKYXJE2RkKsAysg3m1ki72aoq44YgxZUixdeUmz6yUuLb+mrD8
         8eAg==;
        darn=vger.kernel.org
ARC-Authentication-Results: i=1; mx.google.com; arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20230601; t=1769438654; x=1770043454; darn=vger.kernel.org;
        h=content-transfer-encoding:cc:to:subject:message-id:date:from
         :in-reply-to:references:mime-version:from:to:cc:subject:date
         :message-id:reply-to;
        bh=3voJ36VQ7H+1J7+hgsJ0Y8uFrYQ1/j+5BjmXKDJ/9y4=;
        b=FRU4VpCr8aeOZKNXGCpAQlKchOpgNPoxH/w+F0ndX/kfgixqqxdMsgbbb9RQcuZv1n
         on4KLVixIseg9fCTekb3oC/lY2LV7qSce91UkwxxUABWoq7VMcaHzSZQCRy5EXX53Pa1
         ztHVCtFQNiCNLwIcq4ENG3hYbljDBC7IKVtpTT6rlFN2HJotyiG5vQZTfRTHAbL90kRA
         IfU6YVOWI0krLG2SShQvToa/tg5dlizv1MdVYlKNpr6C+BjTfZstQyIOJ2gEtqBmX4+T
         Snt4A/jDD6Lb7GJkb4bITczP69LwKCK9bHxUi1c2zms4ETb8PnDszbRD00GFreo7yzUC
         Rqkg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1769438654; x=1770043454;
        h=content-transfer-encoding:cc:to:subject:message-id:date:from
         :in-reply-to:references:mime-version:x-gm-gg:x-gm-message-state:from
         :to:cc:subject:date:message-id:reply-to;
        bh=3voJ36VQ7H+1J7+hgsJ0Y8uFrYQ1/j+5BjmXKDJ/9y4=;
        b=GhbMt45vKoARisiEWPVLAHXmYLgCcj3Pr8GQXhB0OL6F+NxhBAGZLW6lm5ntN6s40o
         3eNVjcPv6hQbsK1VS8WaiFm2QZwHq2U4QD8iG/EohdXpu/kqk9YxAjaf2jVT4udxGddl
         /mzlc+76avOVlUEH5MOsOxEihQwTLsv97DEga0iXDJZ/iq2R3Z6gmN9t7BN1QjBCUuCP
         f1WosIPnD2oa4T97sC64SSAy3URiRQTUyy9/sAGb6Vxc7mzIsNrAyuyrBqf5BdQ7PQ2R
         bjH9nK6QEygNxaar1JGDwOgPTh65+ZgJDx4NUZS/pjro9UvrNTEQEJIbXRwU9ecl/bAJ
         n9tQ==
X-Forwarded-Encrypted: i=1; AJvYcCXyvF1uC5VdgynhXB0UyzuW7cpOm25Z36nkRkBdZq29FAACRxkKyqwC7wdodQdM9/OPqa2s4WqK4v0u@vger.kernel.org
X-Gm-Message-State: AOJu0YyAfIE376WLGW41/USaW1V5Rotc9nheI1HvuprLJpnjVenz4sVz
	Br7yY1txc8Sqq9ZF0Pdl5ooI1sr0QfgAM1YLgoltk2HnXj/UDR/rfUDyDH+tij+XamtArHyY8Hl
	Ld060DnOryYbxatICG8IXi8It29024iE=
X-Gm-Gg: AZuq6aKUrmhSCScSvajVJWpwFiVW1o5VghfashYpeAqT+7BSiLeRudyqS75U441w+pJ
	MZtKEc9snwK/NcJ0up7m/0Qc3hfLJVjaIOm3SJVjQWPwIWGgpWiDWpvyISH8PGBgLv0dZPSH0q2
	aJYMNYUChyBJAieFSNAyiG8ToUWk/a5jmKU7+g4YrJ6gEZqUc99pN5hvq5p8qx9shlyQLDQcoPY
	Iy4VaW4vFpZlnwqLkR/rACabqq/kovURmWd3BtTv1axeqA9cqx8ZkIhEQGle+581iFZB51wq5qZ
	F+22ilKK8eUCzH6JHhsWrU3tv/CaiGNYe0wFNXIGqe2C6yYYPK2EDxHm6xO/AmgsKWbDarA53eb
	7aFFnbbI3dNXg
X-Received: by 2002:a05:7301:1f14:b0:2b7:3835:21f0 with SMTP id
 5a478bee46e88-2b76420a89amr1320783eec.2.1769438652774; Mon, 26 Jan 2026
 06:44:12 -0800 (PST)
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
References: <aW5xqLq7gatOy1DV@sirena.org.uk> <fc855e76-5f3a-458e-82f9-f43c7d23932e@sirena.org.uk>
 <CAJ-ks9=V_JmzEaXUrHPm6K-DyTgkxEhrPCW=2ZgDJpc+4Z83_A@mail.gmail.com>
 <27b562ca-d79b-4f80-be71-ebf5e26ed9ab@sirena.org.uk> <CANiq72nS94wv50XyOJq5CeiVQvb0+3mNdWxJpFy_+2FH1x4RYQ@mail.gmail.com>
 <aa4bc767-8128-440c-a2a2-81fbb6992a8d@sirena.org.uk> <CANiq72njSUPt2CvjBiNyKw1KHSgnMdcBnXNL_pHV4iURYL1n6g@mail.gmail.com>
 <b17da8b5-6640-46ea-ba73-d2f4a08e246c@sirena.org.uk> <CANiq72kT9ThJcr5W0OhBmbwKZCpULjUehNjijTt8W09yB0CxSg@mail.gmail.com>
 <8cc01720-427d-4cec-b4d0-721b22c47552@sirena.org.uk>
In-Reply-To: <8cc01720-427d-4cec-b4d0-721b22c47552@sirena.org.uk>
From: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Date: Mon, 26 Jan 2026 15:44:00 +0100
X-Gm-Features: AZwV_Qidl8ty2AScb3KSrTRKYFxtLK_Fh3mcXtu073HjEZStpDba9YnG3wE_bxM
Message-ID: <CANiq72nX8UHAjz51skA9r6gKxc1BCUxkBsVRqoMrnsMNYjp_5g@mail.gmail.com>
Subject: Re: linux-next: build failure after merge of the block tree
To: Mark Brown <broonie@kernel.org>
Cc: David Gow <davidgow@google.com>, Tamir Duberstein <tamird@gmail.com>, 
	Andreas Hindborg <a.hindborg@kernel.org>, Jens Axboe <axboe@kernel.dk>, Miguel Ojeda <ojeda@kernel.org>, 
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, 
	Linux Next Mailing List <linux-next@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Thu, Jan 22, 2026 at 1:13=E2=80=AFPM Mark Brown <broonie@kernel.org> wro=
te:
>
> I was asking because you were mentioning checking git status and since
> we are doing out of tree builds there should be nothing changing in the
> source at all.  I think with the way we get trees to the build machine
> it won't make a difference in the end though if no new files are
> created so it'll actually be fine...

Ah, I see.

I would recommend the `rustfmtcheck` target, since it will not change
any files (i.e. it will work in a read-only srctree).

> I've been seeing people saying "oh, just ignore the warnings" on the Tyr
> issues so it wasn't clear to me that people were expecting things to be
> clean.  If things are generally clean that's fine, and I can hold the
> trees back in -next if they introduce errors like I would with anything
> else that does that.

Hmm... If someone said that, then that is definitely wrong (and I and
others would see it sooner or later in CI).

The build log should be clean of warnings (all compiler, `rustdoc` and
Clippy ones).

Perhaps they were referring to "ignoring" as in using local
`#[allow(...)]` (or `expect`) attributes in the source file? That is
fine (where reasonable), since it is very localized (less than
file-scope, like the GCC/Clang diagnostic pragma but less verbose and
better integrated). It is also why we can be a bit more liberal in
enabling lints that may have a few false positives compared to the C
side.

> Ah, great.  I got confused by the make rule just having a plain
> redirect to rust-project.json with no irectory prefix.

Yeah, it is because it is invoked from the objtree, so it appears
there, not in the srctree.

> My current initial plan is:
>
>     ./tools/testing/kunit/kunit.py run --alltests --build_dir ../kunit --=
arch arm64
>
> but I didn't actually turn that on, I want to write a wrapper that
> reports any failures in a mail ready format.  I'm not seeing rust in
> tools/testing/kunit/configs/all_tests.config though so Rust wouldn't get
> enabled?

Yeah, you would need the `--kconfig_add CONFIG_RUST=3Dy` that David
mentioned, e.g. this seems to enable in the config the Rust ones for
me in a x86_64 host:

    ./tools/testing/kunit/kunit.py run --alltests --build_dir ../kunit
--arch x86_64 --kconfig_add CONFIG_RUST=3Dy

The Rust ones get enabled even without `--alltests`.

I am not sure what the policies are around `all_tests.config` though,
e.g. the file says it is meant for UML, and I also see a recent revert
in that file due to unmet dependencies:

    ERROR:root:Not all Kconfig options selected in kunitconfig were in
the generated .config.
    This is probably due to unsatisfied dependencies.
    Missing: CONFIG_INIT_STACK_ALL_PATTERN=3Dy

And indeed if I add `CONFIG_RUST=3Dy` to the file, and run without a
Rust toolchain available, then it breaks similarly.

But if it is fine somehow to add `CONFIG_RUST=3Dy` there even if people
do not have Rust available etc., then great.

David can probably say more about this.

Cheers,
Miguel

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id C784A229B2A;
	Wed, 28 Jan 2026 13:47:48 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1769608068; cv=none; b=goAyi49d/4+CZvVtt/04b2R2FNuH91WOF9nqcC9cpVsfqFf2eq06woWydXgzn3LuKD7hJDAQ6ICCYMg/ELKiw2gzFPUsvqfvLh+zZfqc0XIlC01ok/uNlFndNCGxCAcgTywHUATYveyMt7c5ghrlOqXuel7YUuchVvkUKAylTjQ=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1769608068; c=relaxed/simple;
	bh=XEmnXYh3PBADttOUR3u3h1vqFJal0VhqdZ+jtSQBTEE=;
	h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type:
	 Content-Disposition; b=m6WDGPzZoC1vo1of/SSJQo9FlJnctdfAdoQeWjbXPccURdjx5JzKnrKaFrB7qqVqPf5MTsqjKbkZ1wTnuhAuWvtI5vtzfAi81w8JwJZ1xkP5KYa+HFa6Hb2/bJaCww0+7mWfuSCj2FLABVP6cIPy5aJM0mP8CZ+OxVf7BbEf/Xk=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=M+eGMFmx; arc=none smtp.client-ip=10.30.226.201
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="M+eGMFmx"
Received: by smtp.kernel.org (Postfix) with ESMTPSA id CC059C4CEF1;
	Wed, 28 Jan 2026 13:47:46 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
	s=k20201202; t=1769608068;
	bh=XEmnXYh3PBADttOUR3u3h1vqFJal0VhqdZ+jtSQBTEE=;
	h=Date:From:To:Cc:Subject:From;
	b=M+eGMFmx/pALKNwAQOgNcBkyab8zqXSOVZRIxw5cnp26p3ky0DMvF/l6qdEjg1fJZ
	 KANweiIMD62H6/oVVpW31fzgETI06kpesmpSCLAmIMWTimfedC1itty3UgXn0i0X1Y
	 hH/brzBIWlppNFmPola/qjDXAYRcIZMclsdYIwC0kfaad0BT9854yScVnH2VuNLa0O
	 vdPC1TQaONT6llh97/lQrQy6jISc55lkMGTYKQSxOJeXkZsloh+z93enUqshSCOkv+
	 hQEN2b25vVr8wwjgs7sTMaLjotxiooIuWWyP2AF/wRycNDMkScObLx8daQ+gYF4Xmq
	 q+tHnS9g1LkUA==
Date: Wed, 28 Jan 2026 13:47:44 +0000
From: Mark Brown <broonie@kernel.org>
To: Keith Busch <kbusch@kernel.org>, Kanchan Joshi <joshi.k@samsung.com>,
	Qu Wenruo <wqu@suse.com>, David Sterba <dsterba@suse.com>,
	Jens Axboe <axboe@kernel.dk>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <aXoTgCb9tP_PQA-n@sirena.org.uk>
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="byOhuxqJcGiHcD5B"
Content-Disposition: inline


--byOhuxqJcGiHcD5B
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi all,

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

/tmp/next/build/fs/btrfs/inode.c: In function 'zero_last_folio':
/tmp/next/build/fs/btrfs/inode.c:869:32: error: implicit declaration of fun=
ction 'bio_last_bvec_all'; did you mean 'bio_first_bvec_all'? [-Wimplicit-f=
unction-declaration]
  869 |         struct bio_vec *bvec =3D bio_last_bvec_all(bio);
      |                                ^~~~~~~~~~~~~~~~~
      |                                bio_first_bvec_all
/tmp/next/build/fs/btrfs/inode.c:869:32: error: initialization of 'struct b=
io_vec *' from 'int' makes pointer from integer without a cast [-Wint-conve=
rsion]
/tmp/next/build/fs/btrfs/inode.c: In function 'round_up_last_block':
/tmp/next/build/fs/btrfs/inode.c:881:32: error: initialization of 'struct b=
io_vec *' from 'int' makes pointer from integer without a cast [-Wint-conve=
rsion]
  881 |         struct bio_vec *bvec =3D bio_last_bvec_all(bio);
      |                                ^~~~~~~~~~~~~~~~~

Caused by commit

   68a1d4ad30e5d (btrfs: switch to btrfs_compress_bio() interface for compr=
essed writes)
 =20
=66rom the btrfs tree interacting with commit

   72a41750f1a35 (block: remove bio_last_bvec_all)

=66rom the block tree.  I have reverted the latter commit and can carry as
needed.

--byOhuxqJcGiHcD5B
Content-Type: application/pgp-signature; name="signature.asc"

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

iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAml6E38ACgkQJNaLcl1U
h9AikQgAhZbYxMaccMxq/QZaW0Ht3Ske9e1ZnO5mO8OyWF9HwAj/eB/u8r727/hg
U9K0j1hCMFAX3GR5cLZbcVrpLETL7RyLgG41YTqmM+iUN7KOOFzhD9Hgqaydfkr6
+af//ofcwdiTI5Su4K/Aq+9HY4EFa3fnGeUmByf7KHnJlQsZxyuQUVi3afHoKw+T
fGuordMAs6kvJ2sz4Nmc6NP+TgOF0CXDoqpck+FvqK16l4VYIvRYTpT+oStlioX8
6Zo/1yvzZW1SfTzlVggmm+aMIr23DnWTPpteZ1Ppy2xH+yHZ6nSIVL1ccPwoIn4F
JdgCCqTLfaejcP13Ig8zHU/ol82ZPg==
=Ow9T
-----END PGP SIGNATURE-----

--byOhuxqJcGiHcD5B--

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id D415D3A901C;
	Fri,  6 Mar 2026 14:09:56 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1772806196; cv=none; b=EpT3Bm64PspDolDYDVt5SQTD1AfW+Nhw5LGOxqwe1aACDDKTanDdtquRBnOBUl/byhh7JgrRivT/DWJX/x7ONxFlVcp0ElsECSyx8vSV3PhrO42gZ4t+nks8oQdGGOIULU6rsed57HaNgHUudzfODE8kXI3TPd6eqzx0/a8Mzm4=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1772806196; c=relaxed/simple;
	bh=VIOqD51JU3arGYgG3kmhzG+v3vV+BJOpVAC9j6+aeUY=;
	h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type:
	 Content-Disposition; b=cY3Zgil9St7zVSBTh8rhU/af24PybiZKNiiNJaR/pHrX308yBlOco9l0r1++I03cEAjCIqXPn+e7VXE1zcrexkG/9CbqPyFUbNp4YzRIJEDzfAx2wN5mvcqT7nPh0vTgn2OamYaTuqQSx5AgdW7edxiK48T+trtSz5xxqScCxJs=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XR0L4uVs; arc=none smtp.client-ip=10.30.226.201
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="XR0L4uVs"
Received: by smtp.kernel.org (Postfix) with ESMTPSA id A0902C2BCB0;
	Fri,  6 Mar 2026 14:09:55 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
	s=k20201202; t=1772806196;
	bh=VIOqD51JU3arGYgG3kmhzG+v3vV+BJOpVAC9j6+aeUY=;
	h=Date:From:To:Cc:Subject:From;
	b=XR0L4uVsWJTI1PsboGlI1xJu54yoskcW6RKO0FDBpOjKTR/0xouEeOVsnsb2dC4Lj
	 +FgowI4sLCyw/h9mjFezJdhjfiSOaQolSktEORsLVoUz6MkLdnG2dgXDTidTRSaNrR
	 0zfUosehjpOYmw4xPDkLsAPEoMpXM9iUiAW5sAhnwH8aOpZL6LOpyfjXsEL07qTQ3T
	 OXYMZRm9zF/Gn0zanR5PxZSYqzjumFOlAa3yyh5f3H6QUglGOl9+KLSfaAJ+ugoHcU
	 yBkTm+xgah6famiLIRZ1CjCah9IlpEPXCSe7SW5EHGIAozwFT9nD3ftu1fPCWQ5z9J
	 0Z3/bEiBz5bPg==
Date: Fri, 6 Mar 2026 14:09:52 +0000
From: Mark Brown <broonie@kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <aargMJFh-37NAsbc@sirena.org.uk>
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="IQNwqNuXbv4/M+cj"
Content-Disposition: inline


--IQNwqNuXbv4/M+cj
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi all,

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

/tmp/next/build/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c: In function 'iwl_dbgfs_sram_read':
/tmp/next/build/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c:135:15: error: implicit declaration of function 'simple_copy_to_iter'; did you mean '_copy_to_iter'? [-Wimplicit-function-declaration]
  135 |         ret = simple_copy_to_iter(buf, &iocb->ki_pos, pos, to);
      |               ^~~~~~~~~~~~~~~~~~~
      |               _copy_to_iter
make[9]: *** [/tmp/next/build/scripts/Makefile.build:289

Caused by commit

  4f2ea80dc6c44 (fixup! treewide: fix remaining read/write iterator conversion issues)

I suspect I ought to be applying a merge fixup however since the block
tree obviously isn't intended to be in the state it's in anyway I've
merged the version from 20260305 for now instead.

--IQNwqNuXbv4/M+cj
Content-Type: application/pgp-signature; name="signature.asc"

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

iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmmq4DAACgkQJNaLcl1U
h9BfIwf+IHChtxF6IqDcpNpVgpNDo6o10M0kRc1EnzKnWNFeITWmyO/2ZCdM5aXQ
o45Pi1CXJl9FBA5ciKRkOhFpgqmykkuX942aw83PHF4T2CckvdYnuUcIPOQlI65V
01OValaHabpGCsukWg1PxT3Qd5bChW+hnG9JmWrolkHkf0zWg7Pvz9Z3A+MEELtV
+ipzqim7jS4qwynDNHPsH2yt23WGYcYO5PkfneBoi7fK+u0riHtCqIWtAmdVbgBL
0I5PAdSo2V3UwmSPy1L65tzKMN+fRQyjqQaGzSrje3yXotV6GPDDDmPFqBZ3IcpZ
ywQA4K2vMJMQ+SPElMPluy50t99fQw==
=PJ/B
-----END PGP SIGNATURE-----

--IQNwqNuXbv4/M+cj--

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail-vs1-f48.google.com (mail-vs1-f48.google.com [209.85.217.48])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 67016342177
	for <linux-next@vger.kernel.org>; Fri,  6 Mar 2026 14:13:46 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.217.48
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1772806428; cv=none; b=DcPIDxSnU3ZSS8gcFmRFU0rxjiap47uDeWEZDCdOkWybZByTcbbqfxtkM+me3b6Olir6sl/KX6phzdfOdTfDHMelz0zrHqwmaNqGVDB4RW4JmEmZ+a9+PmvsoxGs8c0Hnb3Nnke1FJ0I2FHouqKwqpo/dEzF0Z/3iIlFi2uZXS0=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1772806428; c=relaxed/simple;
	bh=ZyUFO4AlSnqVpcWmctFa9ah2L/c1bifcZ1/Q2SIbKks=;
	h=Content-Type:From:Mime-Version:Subject:Date:Message-Id:References:
	 Cc:In-Reply-To:To; b=Lrk/gX1AV7yOj5CH78oS7jTEtez5Ld6+Ejiu12D4/EzM/27A1+uI0H9Cy6OXX/vEfzBvVrfoVF/YPX1M/uv5oVG0VD/XQ8MKDMU8gNvXNekHUvJoUC8yoWMWd7Ga9mPwl/sC/B77eV1k4amqoCEjWCJ6a3G7/GlfUTvO1OKEeWE=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=UrJdq1gz; arc=none smtp.client-ip=209.85.217.48
Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="UrJdq1gz"
Received: by mail-vs1-f48.google.com with SMTP id ada2fe7eead31-5fff13d5a19so181858137.0
        for <linux-next@vger.kernel.org>; Fri, 06 Mar 2026 06:13:46 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1772806425; x=1773411225; darn=vger.kernel.org;
        h=to:in-reply-to:cc:references:message-id:date:subject:mime-version
         :from:content-transfer-encoding:from:to:cc:subject:date:message-id
         :reply-to;
        bh=n06DdaI/vzZT1206sO8RqlYgBmcCnT4QAakgEHnE+0Q=;
        b=UrJdq1gzC12hYCYhsc/w8u39XQTboUbEEpbRB6fuf7Z8zlqjduKyn6iLq6eQi32sgD
         JWvQ+VIaOiV9zIfA47SMx+L7LZIyV7BWzwH5Y9d/KclBqlrg8/k2atcNlVrpACjA/Jaj
         Yz9WhWwcBxIDyoXx8mdKryqsdzTUQuVDE+T6RM3x1Tp66ZTs1OwpMfokKNgDa/dmCwR8
         5AIPbwG63OS43YrUih/agkAzORZAZ/Lfsale39q7JQn2lWzMB20Hc7RHyNjj7HrYC83p
         9ufVg5zZjhaajtOTW4L9LhBtVnDYLrUCJt4YMjbOJhmDkQbi2Rsdk1vgAqu561D6cRV2
         qNMQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1772806425; x=1773411225;
        h=to:in-reply-to:cc:references:message-id:date:subject:mime-version
         :from:content-transfer-encoding:x-gm-gg:x-gm-message-state:from:to
         :cc:subject:date:message-id:reply-to;
        bh=n06DdaI/vzZT1206sO8RqlYgBmcCnT4QAakgEHnE+0Q=;
        b=ANVZ22yVPewrbyyAvAhRi2FvaiWWsP71lDehz8Fi8e33fuqJ4jq2xTUQA14XLaETGT
         r0NfkfS4OCYIMatV27Am4LSmAchOv/iCPj437afSuvylrKlK6jGeXiU9b+i2L2Nzl2md
         p3znacXCVOb6K6/HnG28rLz9uL+lyt1GW0UG/DKy6Jj4rfaDiL35E80sPtk/k9pFbpcX
         PzhlthYEIllf5xwVAaUY8n5fyM+3NpqPAPzl1HqpfXQi3MY2V8seufQtJtpfFF6bJF9n
         p1UfcaHmL/6ZnIxHQckfd9lkL76OUQCMq0tYnDLWHa549HTz6PUAESTJfo1jzBUw/h9V
         nIFQ==
X-Forwarded-Encrypted: i=1; AJvYcCWhUAr010hbKAVyLMAKopx+C6wQEh1+F1c6OC+s/TOA0rRrHk/Qsg2vvCAktABjJZMKfu1J2lmZmdCf@vger.kernel.org
X-Gm-Message-State: AOJu0Yxks/0o56Ld/RIYEgii2K0lxGFCcc9ovvxIsIf1aiHOLE4ncfkn
	m2MHLPVdsMZjHv9NNjn/f/ZGcVzUlJG9skmEiH9pgetlePeYVOObHJWpZ4KtX99o2SZNJtRjm2y
	Lbz/7
X-Gm-Gg: ATEYQzztcH8jEnD2G06IFMQ2s05z19MlRv+iqQMxSx6FNnFhnQ/xrWcJJQ5euIMQFRj
	+zN00HmFNUA2QvYDbUHWKgxNI+dor1hJ+UDhKad6sWqJtwheuhIsj194fOQhamfB3nPFeYUgkk2
	iQL3NW5KLgzrEn9kYTSTYKwS5laVovdXmOYPm+UjAmHTIxIimNwvn56b6yclGYfnMTEsuiyJWvA
	SqhxRHgUnHYgV6a5DEbaEilwCDjlrqmzyQlUTOTPkUocfyWBNe2VYc9wlvo4Ye8jnQ9+9YAJpER
	s9F3yNh9tjRnQ0ImTQoPSHy9GHCJXjDkHoa2w0AKA7MR1Z5F0lU/FpmQ92INR8bOh8nZjHSgzQP
	+3mQsLwQW9YK04ZeR+ONlwkIC5E6lE3xGwuUkVh2bq+iDNVouhSVJ3BnGtyIbmWtJghppohCzor
	mY/tyxQeAkEEQzLF1tZzKsSQfQ+nMjmduJ9BlQE/VOs74HEcxa1Hjcb/z2VAopuHzFOpNESsBdw
	GcSOOnJlOeSIJC1g3lK3r/HJ+RMwne/gfg9gHw=
X-Received: by 2002:a05:6102:c8c:b0:5ff:eaf0:6e77 with SMTP id ada2fe7eead31-5ffeaf07962mr514254137.17.1772806424785;
        Fri, 06 Mar 2026 06:13:44 -0800 (PST)
Received: from smtpclient.apple ([2605:59c0:119b:6708:5c05:eb1b:dd7f:fb41])
        by smtp.gmail.com with ESMTPSA id a1e0cc1a2514c-94e7b57031fsm1503049241.13.2026.03.06.06.13.44
        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
        Fri, 06 Mar 2026 06:13:44 -0800 (PST)
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
From: Jens Axboe <axboe@kernel.dk>
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
Mime-Version: 1.0 (1.0)
Subject: Re: linux-next: build failure after merge of the block tree
Date: Fri, 6 Mar 2026 09:13:33 -0500
Message-Id: <218A0752-97E0-4291-99B3-6D7D1283A513@kernel.dk>
References: <aargMJFh-37NAsbc@sirena.org.uk>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
 linux-next@vger.kernel.org
In-Reply-To: <aargMJFh-37NAsbc@sirena.org.uk>
To: Mark Brown <broonie@kernel.org>
X-Mailer: iPhone Mail (23D127)

On Mar 6, 2026, at 9:09=E2=80=AFAM, Mark Brown <broonie@kernel.org> wrote:
>=20
> =EF=BB=BFHi all,
>=20
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>=20
> /tmp/next/build/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c: In funct=
ion 'iwl_dbgfs_sram_read':
> /tmp/next/build/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c:135:15: e=
rror: implicit declaration of function 'simple_copy_to_iter'; did you mean '=
_copy_to_iter'? [-Wimplicit-function-declaration]
>  135 |         ret =3D simple_copy_to_iter(buf, &iocb->ki_pos, pos, to);
>      |               ^~~~~~~~~~~~~~~~~~~
>      |               _copy_to_iter
> make[9]: *** [/tmp/next/build/scripts/Makefile.build:289
>=20
> Caused by commit
>=20
>  4f2ea80dc6c44 (fixup! treewide: fix remaining read/write iterator convers=
ion issues)
>=20
> I suspect I ought to be applying a merge fixup however since the block
> tree obviously isn't intended to be in the state it's in anyway I've
> merged the version from 20260305 for now instead.
> <signature.asc>

What branch are you merging? rw_iter is just a test branch. Next should only=
 be merging my for-next branch. I=E2=80=99ll check later if I messed up, if t=
he above commit is in my for-next by some accident, just drop my tree for to=
day and I=E2=80=99ll take a look later when I=E2=80=99m on my laptop.=20


From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 38DAF1A6821;
	Fri,  6 Mar 2026 14:29:01 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1772807341; cv=none; b=AmI0nwXp9a+PuqLVJfG251j+iaAbK/5IQHUc1Bw/YY1CR/umZzCJ3cHKR7oaC5sPdPl8GVGXcKD9B9l5GH9KQL+9fQPtru+vCrpGbuxQ0Jm2kKROrhv6URcJnU+BtEhflSPn+UM6LPxg/aTUOxjSaUhBGwcGRHCcw1Ola4rTI+c=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1772807341; c=relaxed/simple;
	bh=YtNiMYnwE8YcuPU7Pu79/HiaBUNg1xHyKb0YQ233szw=;
	h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version:
	 Content-Type:Content-Disposition:In-Reply-To; b=OvK3U2asHKtEKojz2OoMM1UL6Vcfy6fpdPKe79C3Jtpyf+HvjCdxMVJuSMX2adIfHyQPHtdHr30IsASwmxfVny2BJ/UrVnbibIBxrm+FBG8bBgrkxr9KAE051T6HbY+7h1e2kFvPeac37OJ3/1Mj1mdqIbkWoxPgfYOI9maj16c=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=M/6vnMft; arc=none smtp.client-ip=10.30.226.201
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="M/6vnMft"
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 45F6AC4CEF7;
	Fri,  6 Mar 2026 14:29:00 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
	s=k20201202; t=1772807341;
	bh=YtNiMYnwE8YcuPU7Pu79/HiaBUNg1xHyKb0YQ233szw=;
	h=Date:From:To:Cc:Subject:References:In-Reply-To:From;
	b=M/6vnMftdhh4DPnkgEMcArC33MHbYenhcl+rtYzCewSebX2Xns7B7gczMvKIzG2Ad
	 XaVGE0N4RqN+fzsOnoF23dYym10fvbNJmC+pWhIEQF2DkDXTL8cQtJ1hR4Q1doxumA
	 n+R4prde7DXSDYYqhj7YclIfpYRKIOPi8EnbWAJ4bZTgwFtXgpxjt8mTPR1fid9Uto
	 zMgXMq3ijskxbSTuPZeiQtM55mvCGbOM1+A2SLl04/Lya3AYgLC06pJ52asU/6wQg7
	 GuWkK9uEbKMm7YRwc3wvGJrudHMx0SPzf/lDSwL3wQzTuiR6zyGCMggtyptljgzjkq
	 hL7kKVJxupUdg==
Date: Fri, 6 Mar 2026 14:28:57 +0000
From: Mark Brown <broonie@kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	linux-next@vger.kernel.org
Subject: Re: linux-next: build failure after merge of the block tree
Message-ID: <e7a09f3f-777c-446c-aaf2-0e01ec45b48f@sirena.org.uk>
References: <aargMJFh-37NAsbc@sirena.org.uk>
 <218A0752-97E0-4291-99B3-6D7D1283A513@kernel.dk>
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="0HObocPonmNFMU3t"
Content-Disposition: inline
In-Reply-To: <218A0752-97E0-4291-99B3-6D7D1283A513@kernel.dk>
X-Cookie: A nuclear war can ruin your whole day.


--0HObocPonmNFMU3t
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Fri, Mar 06, 2026 at 09:13:33AM -0500, Jens Axboe wrote:
> On Mar 6, 2026, at 9:09=E2=80=AFAM, Mark Brown <broonie@kernel.org> wrote:

> > I suspect I ought to be applying a merge fixup however since the block
> > tree obviously isn't intended to be in the state it's in anyway I've
> > merged the version from 20260305 for now instead.
> > <signature.asc>

> What branch are you merging? rw_iter is just a test branch. Next should o=
nly be merging my for-next branch. I=E2=80=99ll check later if I messed up,=
 if the above commit is in my for-next by some accident, just drop my tree =
for today and I=E2=80=99ll take a look later when I=E2=80=99m on my laptop.=
=20

It's the for-next branch, the current HEAD of which is the merge
e356b1868a62cf4a650b451a7296ea4762038666.  The first parent of that is
the fixup commit, the second is a merge up of block-7.0.  Looks like the
fixup ended up on the wrong branch perhaps?

--0HObocPonmNFMU3t
Content-Type: application/pgp-signature; name="signature.asc"

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

iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmmq5KgACgkQJNaLcl1U
h9BvEwf+IYCy3J2F612kYVimtC3cMOGHd0s98KxTWFMdJf6Dc//wcGTin/wuwJ6v
EnqtsfOCJGct+JWs2gPw5w7i/DvDRL6NKHIEIG9WUgQg2li1xlEpSL0aot7SEYpg
amhaW3D9XtjJ+lgivhabm8tvwpFCSvC5zyYPVGd2n3/KKtbgGW1qT3jw1DL0Z1FF
fkbJWpj493grq2SHGXfiDcKUoz+g9oyHM6T5J+zUTQvW9xeg8sZpPgGKfJbnmx0N
xxWiw0Px8WgWz67Nc94W5zrvjQgqZS941Usu0wfR8ijWmsc1taSDGb6Xbpuxq5em
82T+dMFB7Ou89KTOoydApRlV/qcSHw==
=Yfld
-----END PGP SIGNATURE-----

--0HObocPonmNFMU3t--

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail-ot1-f52.google.com (mail-ot1-f52.google.com [209.85.210.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id A4D5429B76F
	for <linux-next@vger.kernel.org>; Fri,  6 Mar 2026 15:42:38 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.52
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1772811760; cv=none; b=d/36FS3/dbBbihtVOsOarGldY/dqESXpDG2roqPbl3ehGZJDK9FOjUQwsNr0PdjRcg1Tq6yP94DtPfXtvvjCJ9AxhfEPSG5/usukC554c9LsAQbpxemuQR8OJB7WNn2HkMwZhAS2JkmfjiOa4oPY13nxCKKu2AcrEJW5oFSgOAg=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1772811760; c=relaxed/simple;
	bh=zbnb9qEu4r5kFGVjr4gr25RHs/KZHxbNqBZ3W/oYT04=;
	h=Content-Type:From:Mime-Version:Subject:Date:Message-Id:References:
	 Cc:In-Reply-To:To; b=OYa9eG/qs9gaFOhtBIGX1SWwzWeg0G3Dk6CEgr/sQx08osIEeZXn1vwZCgJQpFLaLcgh5ePFJjy2KobpAFdjMSr91StzMvo45y6Bf6WRlN6CSk3Dq0U9iWJwfI7EbaSZj88+6k44WM4XVUtTQtQzofnzGzTU1TrcXx+7b0X8xkA=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=HdYNzaEo; arc=none smtp.client-ip=209.85.210.52
Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="HdYNzaEo"
Received: by mail-ot1-f52.google.com with SMTP id 46e09a7af769-7d598f60eeaso7040415a34.2
        for <linux-next@vger.kernel.org>; Fri, 06 Mar 2026 07:42:38 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1772811757; x=1773416557; darn=vger.kernel.org;
        h=to:in-reply-to:cc:references:message-id:date:subject:mime-version
         :from:content-transfer-encoding:from:to:cc:subject:date:message-id
         :reply-to;
        bh=sO/bBNwgjxlDIgCtRV0T8xOQKKnpxyENZ3fIK2wOD0c=;
        b=HdYNzaEoiAv5ndA2+fzYnOMqmxnmfB6juJEp0RMO6WxGa8rijojrzm9yobURZ+ikxG
         lT30nrtPojuEN2ZAuiT6Rx/OxANH8sZb6lWXqojXjoNMs3POoxNxr/WOKzKkEuKSYYBD
         Iw7+DoZ6xvolxW3G8PpC0u2TKiWyl2B69vAk5NkDJd1KKb1ZDqEQSUZwqfMX4ry68yv3
         a3nApS/HOF+yI3MEYeBzxXljqNRyoVJIBxddpWCv+2/IbKZMH5jCOKHZlH0af+vfxis9
         AKDmz1obgGDQYmp1e08FHg2IQFobWcuVvFxUvIFKBztnswke/SSVdzYN46noAIRYEGAP
         ECVw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1772811757; x=1773416557;
        h=to:in-reply-to:cc:references:message-id:date:subject:mime-version
         :from:content-transfer-encoding:x-gm-gg:x-gm-message-state:from:to
         :cc:subject:date:message-id:reply-to;
        bh=sO/bBNwgjxlDIgCtRV0T8xOQKKnpxyENZ3fIK2wOD0c=;
        b=rBeI45JHxadYYcGVnaBIK1QggdS+tucw5dOPx8SRobKRoOfP7w3kAzMShkC7vaOkSn
         W3WGeu/8kj97s4ObCgwiV+39SeRFb7lGJnn5EXh+IOGOdDJhk4UfY5AhTQ0ml9E8SSky
         AHDAjlbW3II8k/X6jJypSgs0x6rcCzIGyLcZy4jlBc/2e4ZbuV8nFFGXCTIK511i2tuw
         jU054JPXNJR1kBcKO8D6XwgNaHjj462RXBKfa4AgYleEUcKpG+X/0pV/hL88YLlu9TTu
         NW46GjXj+rq5Y/7d4VTUHLo2tpVdWHOencids3KPaUTibBPdmHLoJNG9PFJxBxdrEb2C
         mYuA==
X-Forwarded-Encrypted: i=1; AJvYcCVdy3gColPGX14EoTqzmQVWpguXniBaFBcpw/NOoMNxYNSVg8lwllraVrEFJOrEN6cIMfrEPRFpHpnW@vger.kernel.org
X-Gm-Message-State: AOJu0YzW0Tu2/qE07YE4okqDqo/Ybed20LU5keWAcwFwinQJPpOREp57
	4fzu3E/SEpBc3xAjmXbsP+JGgtsrzbKkHxq9JUhJ8ukqrLsz6dSIUAKuJHblJT8Npjj+3SjtgW1
	1hiWH
X-Gm-Gg: ATEYQzy7lILOIOFV0E2x7ceLqLGLj0mBXQudIw3HOeSgetcF16mONZ0xlyBnUrIRmEW
	lyAom5COvYpNDXI+Xq158noc0Gvyq8tE5YAbWNvIAmesH9oLQL29tKojDOCJji9GjPs9jFjO+hV
	TU4lKJ4rmuqcoCRgIkO+avsRxNgaqLx44XbILXNF/evoHH3ihnmIeLIOKf9avIAlpX6dsVbg7QY
	W57jjb/YFusY1fLTVv/s2WnwPdlRwmW4TBJxCvDyLjU194L9CBFbfd1Q9UIqmPw3LMYorwos4QP
	hTutqbPivEV6WhTwzvnlm5h91jQlptI330WUQrZ50Zxq5OuUpQNSqCiy5YBs+7C6JVRRLayqxwC
	ySngsaGUVGAiz6PDx+tBT0zc9a9skPqFM1juWd9xcll+Bm74Ktkbf4kqfT1Xuahb+AjIAWVGoX0
	+Y08GWQd2JhccWNTF0CReFNUL/oM2wYIxfTBfEpRk5/wUjGCTF/f/199v+wXiTIy4T5eUL1y7ka
	g1A2YtgrPcKfdicCF8jJwgqBdhN4Bh9Tbo2SNQ=
X-Received: by 2002:a05:6830:3811:b0:7d1:9572:9111 with SMTP id 46e09a7af769-7d726e73cbdmr1647778a34.1.1772811757387;
        Fri, 06 Mar 2026 07:42:37 -0800 (PST)
Received: from smtpclient.apple ([2605:59c0:119b:6708:954a:2978:67c4:6498])
        by smtp.gmail.com with ESMTPSA id 46e09a7af769-7d728d12337sm1060250a34.14.2026.03.06.07.42.36
        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
        Fri, 06 Mar 2026 07:42:36 -0800 (PST)
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
From: Jens Axboe <axboe@kernel.dk>
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
Mime-Version: 1.0 (1.0)
Subject: Re: linux-next: build failure after merge of the block tree
Date: Fri, 6 Mar 2026 10:42:25 -0500
Message-Id: <19E0B569-A6C2-4DE4-A010-20F4E199198D@kernel.dk>
References: <e7a09f3f-777c-446c-aaf2-0e01ec45b48f@sirena.org.uk>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
 linux-next@vger.kernel.org
In-Reply-To: <e7a09f3f-777c-446c-aaf2-0e01ec45b48f@sirena.org.uk>
To: Mark Brown <broonie@kernel.org>
X-Mailer: iPhone Mail (23D127)

On Mar 6, 2026, at 9:29=E2=80=AFAM, Mark Brown <broonie@kernel.org> wrote:
>=20
> =EF=BB=BFOn Fri, Mar 06, 2026 at 09:13:33AM -0500, Jens Axboe wrote:
>> On Mar 6, 2026, at 9:09=E2=80=AFAM, Mark Brown <broonie@kernel.org> wrote=
:
>=20
>>> I suspect I ought to be applying a merge fixup however since the block
>>> tree obviously isn't intended to be in the state it's in anyway I've
>>> merged the version from 20260305 for now instead.
>>> <signature.asc>
>=20
>> What branch are you merging? rw_iter is just a test branch. Next should o=
nly be merging my for-next branch. I=E2=80=99ll check later if I messed up, i=
f the above commit is in my for-next by some accident, just drop my tree for=
 today and I=E2=80=99ll take a look later when I=E2=80=99m on my laptop.
>=20
> It's the for-next branch, the current HEAD of which is the merge
> e356b1868a62cf4a650b451a7296ea4762038666.  The first parent of that is
> the fixup commit, the second is a merge up of block-7.0.  Looks like the
> fixup ended up on the wrong branch perhaps?

Yeah just have! I=E2=80=99ll sort it out, thanks for letting me know.=20


From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail-yx1-f42.google.com (mail-yx1-f42.google.com [74.125.224.42])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 40EFD18B0A
	for <linux-next@vger.kernel.org>; Fri,  6 Mar 2026 21:45:46 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.224.42
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1772833547; cv=none; b=Q5kUoRmgedWS7DtzS4IVWSe2xXTFiRuWQ9wlKY5k0YGpxXeb+64i738EBq4a7J2mhAnMi7LaDOAgBMb48VPBsE/oWPwGAWGAyWegwizJbNSI9ZwWUHBqkmyLwvcVibcludaqkLCs5ONPsl2PB/ZmmEbueiPhNfV2OrTyzhAeyU0=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1772833547; c=relaxed/simple;
	bh=ygiioQO7YI1Z6+YdsvW6u0Sg9VNyGI3V5/zfCTppg/8=;
	h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References:
	 In-Reply-To:Content-Type; b=huHlsEFTl3vu8s4NbZ09BZQ59nKTXbw62BFYdt1WO/uogDVeZ9peFKu4tF7vTLnB75UGKKQWhX7NGz0dPvLwyhEsTVgiKPI7CKfNcuqkPp54ZDnwQm0m+XxH3xiS4qFnYFm7Z+1TiJIwF5COLcQwWSuJLGdZy3QL8Siz63AR02Q=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=HXM4gRak; arc=none smtp.client-ip=74.125.224.42
Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="HXM4gRak"
Received: by mail-yx1-f42.google.com with SMTP id 956f58d0204a3-64aedd812baso8728107d50.3
        for <linux-next@vger.kernel.org>; Fri, 06 Mar 2026 13:45:46 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1772833545; x=1773438345; darn=vger.kernel.org;
        h=content-transfer-encoding:in-reply-to:content-language:references
         :cc:to:from:subject:user-agent:mime-version:date:message-id:from:to
         :cc:subject:date:message-id:reply-to;
        bh=FUeQCHJX6OavYXwy7bj/hOulhUCnwzMyCKLTg4avOsk=;
        b=HXM4gRak6ooehdTKLWKnpRQYFt2TbAI6pllfdiSbjMJyxgZPODcdqgLYsCfMwc+rub
         /8617/X257zld3mOXbQLL+rT+Vmdv7wwmhBh+h52BNFgmds/0d9lZcc55GftgZj/Afsc
         vlgTMxET2Cy/sWGnBxkf0bFWwG7opQcawuGUFqs5usyovnaAK7llf5WIkdfNcvRIrmey
         /qFffgDiMFGf3gt7vSZfG2HFf2cGnzrW16x3fKT7ea8LEt803KrIBNogM6789BFq25YM
         saHo8B4HGKFDyxyU7uavf4rKj4Nqzh4t4cw/H17lRGIJb2bii/hJCmrZNjHoDDb4pgnU
         JFmw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1772833545; x=1773438345;
        h=content-transfer-encoding:in-reply-to:content-language:references
         :cc:to:from:subject:user-agent:mime-version:date:message-id:x-gm-gg
         :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
        bh=FUeQCHJX6OavYXwy7bj/hOulhUCnwzMyCKLTg4avOsk=;
        b=tgIJN1u2Fx/BgNCYZCh/3xa18eQQmvQBga3n+2IztjQK61QttK/Ckv/s04fwDCjuxy
         6TpVEd0UkmAAte5bsBZBpMtf1uHsBR0VTL7bq28remvv2W4URSUG5bGs19mClYSf7Igg
         YAbfhSbUI/e3fY8v8h190+n8BB2JYnNBIJEgiEWxt/CKD3E7xfn+myoBJT74xYgxu6mP
         aG+WXy/GSbVJcwuK55U/nnIbdknrxyHxJqs6dfc1mfQdOWN9BD/bxKyT26ShyeYCo4Np
         eOc6cKGT10I1H8Rd2fVu+42zMyYD0/EV+DlRSbtND63cyaYaJuv3XpyL2wes+mA7G8JI
         FaUw==
X-Forwarded-Encrypted: i=1; AJvYcCW3KF0bSKxJJTEwhcX+NC8Napyb/2j4cmgPDUZXInjGmetGwBvuCwOKG12jcXnvuUEnKgVWn/I95Oqs@vger.kernel.org
X-Gm-Message-State: AOJu0YzejCrGu/vzV00WjfwTmj3qsr1/DPe7J70Fhuo5PNH38Opdw3bV
	SKuj0lUyo9h0LpKaqVbOqI5W5HvlnUE4+VFGsnHiW6HYeHwurkzlz1CDiGLp99WzO6Y=
X-Gm-Gg: ATEYQzxZPiQGggbtUS+u575rYVGPcNeWQkhVO+IDbxHYrjwhJ76C++3t8V/HebH0v5E
	vbXlDbkvR71dCehpPZfKr4TmmqGHdf5M8WValccM30CxnhlDV31oVswn5H3yeJDTIzcQgXUIQjD
	YOWGseOS8gGyz/L1aFB6XPhAxZDQ3P5xMWAVPFi8BfaqG9xEF73+tVQButFtafwnFqN6ZkW+1v9
	Ofih0RhISExKzrKZhbfJaldhjAWQS83Q2XoOMVsHMuGoE2Me5zhwT09DM+CIXOG/b4nJylh26eE
	DnnpXTa1J3SWRWCV7uKR6uHguDanpW9pJbjt6F8KAukEMUImTRGogdnUrMUoXPXw9fc9HALYRRx
	V23J+wkp+VydYsS80N6mH0IlBasVy1l8Gocj++4fzwwRlNbhIMG6rdUtZDIs/IbMpfH63d3WjU3
	VAhD83/cluk0VYWuuqH0ul89EJ+biYCZfHxc7qf5/BPymJA49oPiXZcFX3t/h8b6L54DKG0FjLh
	L5orxp4rYoSySur3w==
X-Received: by 2002:a05:690e:1510:b0:64c:9a36:ffe8 with SMTP id 956f58d0204a3-64d14203ac0mr3579672d50.39.1772833545340;
        Fri, 06 Mar 2026 13:45:45 -0800 (PST)
Received: from ?IPV6:2601:703:4183:37b0::7115? ([2601:703:4183:37b0::7115])
        by smtp.gmail.com with ESMTPSA id 956f58d0204a3-64d175d325dsm1278141d50.4.2026.03.06.13.45.44
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Fri, 06 Mar 2026 13:45:44 -0800 (PST)
Message-ID: <d6867023-20ba-49fa-bca0-3837389a5588@kernel.dk>
Date: Fri, 6 Mar 2026 14:45:43 -0700
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: linux-next: build failure after merge of the block tree
From: Jens Axboe <axboe@kernel.dk>
To: Mark Brown <broonie@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
 linux-next@vger.kernel.org
References: <e7a09f3f-777c-446c-aaf2-0e01ec45b48f@sirena.org.uk>
 <19E0B569-A6C2-4DE4-A010-20F4E199198D@kernel.dk>
Content-Language: en-US
In-Reply-To: <19E0B569-A6C2-4DE4-A010-20F4E199198D@kernel.dk>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On 3/6/26 8:42 AM, Jens Axboe wrote:
> On Mar 6, 2026, at 9:29 AM, Mark Brown <broonie@kernel.org> wrote:
>>
>> ﻿On Fri, Mar 06, 2026 at 09:13:33AM -0500, Jens Axboe wrote:
>>> On Mar 6, 2026, at 9:09 AM, Mark Brown <broonie@kernel.org> wrote:
>>
>>>> I suspect I ought to be applying a merge fixup however since the block
>>>> tree obviously isn't intended to be in the state it's in anyway I've
>>>> merged the version from 20260305 for now instead.
>>>> <signature.asc>
>>
>>> What branch are you merging? rw_iter is just a test branch. Next should only be merging my for-next branch. I’ll check later if I messed up, if the above commit is in my for-next by some accident, just drop my tree for today and I’ll take a look later when I’m on my laptop.
>>
>> It's the for-next branch, the current HEAD of which is the merge
>> e356b1868a62cf4a650b451a7296ea4762038666.  The first parent of that is
>> the fixup commit, the second is a merge up of block-7.0.  Looks like the
>> fixup ended up on the wrong branch perhaps?
> 
> Yeah just have! I’ll sort it out, thanks for letting me know. 

Sorted out now!

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 23B1038F658;
	Fri, 10 Apr 2026 12:21:43 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1775823704; cv=none; b=OiA2kkNHKxDEynTWD/J9M9MBJTKMZCUhLfvWpHX2PN4MVpt3KEYMe1w01fuDTGyKhHAPU83VtLUvug41ffCQwHNvMGrp13lNEL3hVyDdtxj7YqueNVMiiqLl7KprEotXS/mACPRgoFBW2l2cxA1vN8hmYCammyBP7X0ysPFzoB0=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1775823704; c=relaxed/simple;
	bh=Xd1HFyjA1HFTkCeNPhG8WYVIqMjZB+SZd/jotYdislU=;
	h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type:
	 Content-Disposition; b=VrWg0IPNeKxtYoYSG2r1uLjgxGNc3LXLOYDpeBOdrF/zsSoxSZPUZXW6FtHC0240RUdhs2B6Hde3s36gcc9euNR4ETD1cFkggp4kA0tTg/Pu9j7zyYP9buUVWdRuDf1vXbhFeuNUdVfmCDmidsqreusJUyHKnj6G3ifg5XjFXZI=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=L63Ui2K0; arc=none smtp.client-ip=10.30.226.201
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="L63Ui2K0"
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 93C47C19421;
	Fri, 10 Apr 2026 12:21:43 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
	s=k20201202; t=1775823703;
	bh=Xd1HFyjA1HFTkCeNPhG8WYVIqMjZB+SZd/jotYdislU=;
	h=Date:From:To:Cc:Subject:From;
	b=L63Ui2K0Uy853ErqlMY+4MTa5qcOk7uQi1TWXS3XouxeVRlCi5i7zxtXY+0zbQbuc
	 LeGWkh/CHkHe+C1qu0QAH2HkpYxHyiSGM0usucGsmmvblJPxvic/6i1G74a6ChoX8C
	 3yPX/9aTP5YeIM4bBDHpcM0hmenjNiztwvE0hNJzzZgr3SsoGw0RJFqDx+ldvBn7Ze
	 Lh1x32nROND7kgK8ws6uDBqDsCddq0NmrmLhNh+SWDFzA3ufcTZwzQ897ivipxxeV4
	 WUXREZmtqGzc3IXM/T300bDfVzzfxB5mR/zHy1bfKKzE/8f5sRbwpGjwu77PhvfhQS
	 Z0T1UzGQR4uCw==
Received: by finisterre.sirena.org.uk (Postfix, from userid 1000)
	id 1D60E1AC58B5; Fri, 10 Apr 2026 13:21:41 +0100 (BST)
Date: Fri, 10 Apr 2026 13:21:41 +0100
From: Mark Brown <broonie@kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <adjrVagmLJaozz5o@sirena.co.uk>
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="xYILvh1IlfvuN+zD"
Content-Disposition: inline


--xYILvh1IlfvuN+zD
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi all,

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

/tmp/next/build/io_uring/zcrx.c: In function 'zcrx_register_netdev':
/tmp/next/build/io_uring/zcrx.c:816:15: error: implicit
declaration of function '__net_mp_open_rxq'; did you mean
'netif_mp_open_rxq'? [-Wimplicit-function-declaration]
  816 |         ret =3D __net_mp_open_rxq(ifq->netdev, if_rxq, &mp_param, N=
ULL);
      |               ^~~~~~~~~~~~~~~~~ netif_mp_open_rxq

Caused by commit

   1e91c98bc9a8ef (net: Slightly simplify net_mp_{open,close}_rxq)

interacting with block tree changes.  I have fixed this up as per below
and can carry as needed

=46rom d5971ccec3525c71d28cb40bc4a6c9596f354b48 Mon Sep 17 00:00:00 2001
=46rom: Mark Brown <broonie@kernel.org>
Date: Fri, 10 Apr 2026 13:14:23 +0100
Subject: [PATCH] io_uring: Fix up build for "net: Slightly simplify
 net_mp_{open,close}_rxq"

/tmp/next/build/io_uring/zcrx.c: In function 'zcrx_register_netdev':
/tmp/next/build/io_uring/zcrx.c:816:15: error: implicit
declaration of function '__net_mp_open_rxq'; did you mean
'netif_mp_open_rxq'? [-Wimplicit-function-declaration]
  816 |         ret =3D __net_mp_open_rxq(ifq->netdev, if_rxq, &mp_param, N=
ULL);
      |               ^~~~~~~~~~~~~~~~~ netif_mp_open_rxq

Signed-off-by: Mark Brown <broonie@kernel.org>
---
 io_uring/zcrx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/io_uring/zcrx.c b/io_uring/zcrx.c
index 593b1d39a5eb44..f2e08c19e74cef 100644
--- a/io_uring/zcrx.c
+++ b/io_uring/zcrx.c
@@ -813,7 +813,7 @@ static int zcrx_register_netdev(struct io_zcrx_ifq *ifq,
 		mp_param.rx_page_size =3D 1U << ifq->niov_shift;
 	mp_param.mp_ops =3D &io_uring_pp_zc_ops;
 	mp_param.mp_priv =3D ifq;
-	ret =3D __net_mp_open_rxq(ifq->netdev, if_rxq, &mp_param, NULL);
+	ret =3D netif_mp_open_rxq(ifq->netdev, if_rxq, &mp_param, NULL);
 	if (ret)
 		goto netdev_put_unlock;
=20
--=20
2.47.3


--xYILvh1IlfvuN+zD
Content-Type: application/pgp-signature; name="signature.asc"

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

iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmnY61QACgkQJNaLcl1U
h9ARyAf9F9R9SCxpKhvaVajV4jQ+fPTyiwbSfiHZaC27A11Y2hcL5AOw/fCiSW6l
qgS7VyLTUHGn56Gns0E/7q/dMnYymyMxZH7AN+7A3jmkNMEGc/tMH0HJj3/aF5Ny
5YHI+VDNwFeJZM78aj8uZIoLctFUC/dJWgMyt+mijkac8iZzz3p+p73Tjvu91b2Y
2D3oPG4ZgUk1Ieu0+N7dPeI8iPLoQ8ir9PairjinGewF07XGbOdZ0jeHXPQadKU2
r7IDW+SiTft1cawTBnlvUtB/CJw2fKOgfLcpA4ic/brfXriCzLkTMF7n5+ZScGy0
/vqZjboAUKMz3N/oRnT3QfWqFLs1kQ==
=IKxi
-----END PGP SIGNATURE-----

--xYILvh1IlfvuN+zD--

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id EE57A336895;
	Wed, 15 Apr 2026 11:32:00 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.9
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1776252722; cv=none; b=bvDJqD9c1djeudQ630QntgpyRGqylNiizKj2jqKEAufhK6g66Z/S746rLVs/gVvc8lQg6lfOcLZHPXF3heUM5qCcjX8/bDtWct1qKAOm5v2bg8dUeDsq9oS2azE6GsHJj3Sny3i5FYmud5akHkKeQ3vXk3Pn9Brn8ShtA8JFPyU=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1776252722; c=relaxed/simple;
	bh=b8Aw/7fg+0u6Dp1TPRNyvG4hmUQiFunmewx4V1vTlrM=;
	h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version:
	 Content-Type:Content-Disposition:In-Reply-To; b=TES/lbOTiKgxDCBmfM9uZIzqKB7ZuBzW8fXiVNkvX0kD9wp02wJ2pfxIuN/5XFzk9Z4iBX2Q/BnnyA4+SA7w5F6nnrIdbcD8G01FDsqqGmaELC6xSliOTiqlDWzXuk0DaNVYXtw/2ilqg24Hs/Kv30NPlxDqEdfu/bhpyCtwUHA=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=fUvUvaBZ; arc=none smtp.client-ip=198.175.65.9
Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="fUvUvaBZ"
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;
  d=intel.com; i=@intel.com; q=dns/txt; s=Intel;
  t=1776252721; x=1807788721;
  h=date:from:to:cc:subject:message-id:references:
   mime-version:in-reply-to;
  bh=b8Aw/7fg+0u6Dp1TPRNyvG4hmUQiFunmewx4V1vTlrM=;
  b=fUvUvaBZSaYQiJ4pxwkf0m077CKwi8qqIRlvUWkcKJNJVhXAu2URvq0c
   R60l85KYj/yWjmjPoFY4WpiEMpH0DajGxM46hLTQyIxDadu2o/cG8RUug
   bjp5VTVNYcqjXErw7TGKtRqzGPeOU4ViG6SBa1EMlfohOq9AAX4ZfK+P1
   5LQwJTNpIw0jWeO4eu4P2EkAMZyz9a4qHnYjOnx6fKUlPVzbSna3HOhwa
   n2NKLRTJMTch6YpkFqrmAEkKw57cxA4v/RZWg2+tgxnYShw44N9eYk9em
   MOvjzY/b0pMBoTf3BLHpfKPh1CeM1RuR8vR7o+xwkXU87lRgwQeZVRfMu
   w==;
X-CSE-ConnectionGUID: uWOu0icpRrW5uZl56tGMCQ==
X-CSE-MsgGUID: fm7kOO70SBOjfXg4yL+hIw==
X-IronPort-AV: E=McAfee;i="6800,10657,11759"; a="99867489"
X-IronPort-AV: E=Sophos;i="6.23,179,1770624000"; 
   d="scan'208";a="99867489"
Received: from fmviesa007.fm.intel.com ([10.60.135.147])
  by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Apr 2026 04:32:00 -0700
X-CSE-ConnectionGUID: fAb+rIAnSHKVuXFK92Yccw==
X-CSE-MsgGUID: hs+metJkTLWqtrWCrpD9lA==
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="6.23,179,1770624000"; 
   d="scan'208";a="227214118"
Received: from lkp-server01.sh.intel.com (HELO 7f3b36e5d6a5) ([10.239.97.150])
  by fmviesa007.fm.intel.com with ESMTP; 15 Apr 2026 04:31:59 -0700
Received: from kbuild by 7f3b36e5d6a5 with local (Exim 4.98.2)
	(envelope-from <lkp@intel.com>)
	id 1wCyTM-000000000RV-3t9W;
	Wed, 15 Apr 2026 11:31:56 +0000
Date: Wed, 15 Apr 2026 19:31:49 +0800
From: kernel test robot <lkp@intel.com>
To: Mark Brown <broonie@kernel.org>, Jens Axboe <axboe@kernel.dk>
Cc: oe-kbuild-all@lists.linux.dev,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the block tree
Message-ID: <202604151948.oJFK3dlv-lkp@intel.com>
References: <adjrVagmLJaozz5o@sirena.co.uk>
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <adjrVagmLJaozz5o@sirena.co.uk>

Hi Mark,

kernel test robot noticed the following build errors:

[auto build test ERROR on axboe/for-next]
[also build test ERROR on isilence/zcrx/for-next]
[cannot apply to linus/master v7.0 next-20260414]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Mark-Brown/linux-next-build-failure-after-merge-of-the-block-tree/20260415-013341
base:   https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git for-next
patch link:    https://lore.kernel.org/r/adjrVagmLJaozz5o%40sirena.co.uk
patch subject: linux-next: build failure after merge of the block tree
config: sh-allmodconfig (https://download.01.org/0day-ci/archive/20260415/202604151948.oJFK3dlv-lkp@intel.com/config)
compiler: sh4-linux-gcc (GCC) 15.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260415/202604151948.oJFK3dlv-lkp@intel.com/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202604151948.oJFK3dlv-lkp@intel.com/

All errors (new ones prefixed by >>):

   io_uring/zcrx.c: In function 'zcrx_register_netdev':
>> io_uring/zcrx.c:812:15: error: implicit declaration of function 'netif_mp_open_rxq'; did you mean 'net_mp_open_rxq'? [-Wimplicit-function-declaration]
     812 |         ret = netif_mp_open_rxq(ifq->netdev, if_rxq, &mp_param, NULL);
         |               ^~~~~~~~~~~~~~~~~
         |               net_mp_open_rxq


vim +812 io_uring/zcrx.c

   781	
   782	static int zcrx_register_netdev(struct io_zcrx_ifq *ifq,
   783					struct io_uring_zcrx_ifq_reg *reg,
   784					struct io_uring_zcrx_area_reg *area)
   785	{
   786		struct pp_memory_provider_params mp_param = {};
   787		unsigned if_rxq = reg->if_rxq;
   788		int ret;
   789	
   790		ifq->netdev = netdev_get_by_index_lock(current->nsproxy->net_ns,
   791							reg->if_idx);
   792		if (!ifq->netdev)
   793			return -ENODEV;
   794	
   795		netdev_hold(ifq->netdev, &ifq->netdev_tracker, GFP_KERNEL);
   796	
   797		ifq->dev = netdev_queue_get_dma_dev(ifq->netdev, if_rxq);
   798		if (!ifq->dev) {
   799			ret = -EOPNOTSUPP;
   800			goto netdev_put_unlock;
   801		}
   802		get_device(ifq->dev);
   803	
   804		ret = io_zcrx_create_area(ifq, area, reg);
   805		if (ret)
   806			goto netdev_put_unlock;
   807	
   808		if (reg->rx_buf_len)
   809			mp_param.rx_page_size = 1U << ifq->niov_shift;
   810		mp_param.mp_ops = &io_uring_pp_zc_ops;
   811		mp_param.mp_priv = ifq;
 > 812		ret = netif_mp_open_rxq(ifq->netdev, if_rxq, &mp_param, NULL);
   813		if (ret)
   814			goto netdev_put_unlock;
   815	
   816		ifq->if_rxq = if_rxq;
   817		ret = 0;
   818	netdev_put_unlock:
   819		netdev_unlock(ifq->netdev);
   820		return ret;
   821	}
   822	

-- 
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.16])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 52E3830C631;
	Wed, 15 Apr 2026 14:26:13 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.16
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1776263174; cv=none; b=WZt2b5t86a29mIi66/JGeZNSyyM6+Krx0N2vdXBHRYtrSeJPnlvTZqu9+KsT6aI0eHd0NXBuo+QCSR6Edr0x9/RplrXFKG8D/fcVX2SxUjPK9YoNdychFE6tP/7iKoBiHWWivvR9Z/MjuRaE0/EUKz+9JaC6YOCu4lmnUCV4dbs=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1776263174; c=relaxed/simple;
	bh=RSueRU8EklLeI/w5J8cftxdUjuHFxU1yWrCgyi1xq4k=;
	h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version:
	 Content-Type:Content-Disposition:In-Reply-To; b=PqwTrAew09InQTKtAz6RSPCZuno9R4SMDbvnVf9AC+GbzexCPhN+h7JKFfXkYpwhwLH1y5FUty/OjNiDurzh5613/FwyYsVg3ChjVG6NQbDV0Al/Ybs892LE7b8eMtxWt4r4R1IGxYchePSnjkkQvqQE+RRZprDcaKdyFnjiEkU=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=f95s+nPC; arc=none smtp.client-ip=198.175.65.16
Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="f95s+nPC"
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;
  d=intel.com; i=@intel.com; q=dns/txt; s=Intel;
  t=1776263173; x=1807799173;
  h=date:from:to:cc:subject:message-id:references:
   mime-version:in-reply-to;
  bh=RSueRU8EklLeI/w5J8cftxdUjuHFxU1yWrCgyi1xq4k=;
  b=f95s+nPC0Q66dT0yP8FbOOpFXZBJe0EwHvbX4rQsGsBab08eUGzqhkEO
   E32HsapGGl4clwjxE2QYprFYmNwhZlKGDfTuBY2ltUIMfy42fWUz5MaBm
   lF/dYnvAkBy4e9V/16X4Mzm/tXu9Xvn9dnu5gX65cl2NpK0SsKGj92f4P
   T7/V6mvOUgvolSvya46GEYTUtjBQqhunHRSa7iiayO2wFwsKLVXmPRtHv
   WUkgiHf7VVyZieVrE54RTw79NEQwFVHrkwmAInFek9tEenfv7WaHIErVk
   pEFgaHtuhxM+hNztWrdjPP/VD0ib60t6IAaP3uJoFQkHl5qwbbxSR9v+c
   g==;
X-CSE-ConnectionGUID: BJ0FXlAQTLaJQ286TCMkdw==
X-CSE-MsgGUID: sRZJr9nkRfyhpLVWHdURxQ==
X-IronPort-AV: E=McAfee;i="6800,10657,11760"; a="77423473"
X-IronPort-AV: E=Sophos;i="6.23,179,1770624000"; 
   d="scan'208";a="77423473"
Received: from orviesa003.jf.intel.com ([10.64.159.143])
  by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Apr 2026 07:26:13 -0700
X-CSE-ConnectionGUID: YqUucAghRXSP92Rqxdd/dQ==
X-CSE-MsgGUID: HdXzh76ES3ujmcVn1KfxVg==
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="6.23,179,1770624000"; 
   d="scan'208";a="234466918"
Received: from lkp-server01.sh.intel.com (HELO 7f3b36e5d6a5) ([10.239.97.150])
  by orviesa003.jf.intel.com with ESMTP; 15 Apr 2026 07:26:11 -0700
Received: from kbuild by 7f3b36e5d6a5 with local (Exim 4.98.2)
	(envelope-from <lkp@intel.com>)
	id 1wD1Bw-000000000Zd-2oop;
	Wed, 15 Apr 2026 14:26:08 +0000
Date: Wed, 15 Apr 2026 22:25:45 +0800
From: kernel test robot <lkp@intel.com>
To: Mark Brown <broonie@kernel.org>, Jens Axboe <axboe@kernel.dk>
Cc: llvm@lists.linux.dev, oe-kbuild-all@lists.linux.dev,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the block tree
Message-ID: <202604152229.1a2cJtU9-lkp@intel.com>
References: <adjrVagmLJaozz5o@sirena.co.uk>
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <adjrVagmLJaozz5o@sirena.co.uk>

Hi Mark,

kernel test robot noticed the following build errors:

[auto build test ERROR on axboe/for-next]
[also build test ERROR on isilence/zcrx/for-next]
[cannot apply to linus/master v7.0 next-20260414]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Mark-Brown/linux-next-build-failure-after-merge-of-the-block-tree/20260415-013341
base:   https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git for-next
patch link:    https://lore.kernel.org/r/adjrVagmLJaozz5o%40sirena.co.uk
patch subject: linux-next: build failure after merge of the block tree
config: loongarch-randconfig-001-20260415 (https://download.01.org/0day-ci/archive/20260415/202604152229.1a2cJtU9-lkp@intel.com/config)
compiler: clang version 18.1.8 (https://github.com/llvm/llvm-project 3b5b5c1ec4a3095ab096dd780e84d7ab81f3d7ff)
rustc: rustc 1.88.0 (6b00bc388 2025-06-23)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260415/202604152229.1a2cJtU9-lkp@intel.com/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202604152229.1a2cJtU9-lkp@intel.com/

All errors (new ones prefixed by >>):

>> io_uring/zcrx.c:812:8: error: call to undeclared function 'netif_mp_open_rxq'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
     812 |         ret = netif_mp_open_rxq(ifq->netdev, if_rxq, &mp_param, NULL);
         |               ^
   io_uring/zcrx.c:812:8: note: did you mean 'net_mp_open_rxq'?
   include/net/page_pool/memory_provider.h:26:5: note: 'net_mp_open_rxq' declared here
      26 | int net_mp_open_rxq(struct net_device *dev, unsigned ifq_idx,
         |     ^
   1 error generated.


vim +/netif_mp_open_rxq +812 io_uring/zcrx.c

   781	
   782	static int zcrx_register_netdev(struct io_zcrx_ifq *ifq,
   783					struct io_uring_zcrx_ifq_reg *reg,
   784					struct io_uring_zcrx_area_reg *area)
   785	{
   786		struct pp_memory_provider_params mp_param = {};
   787		unsigned if_rxq = reg->if_rxq;
   788		int ret;
   789	
   790		ifq->netdev = netdev_get_by_index_lock(current->nsproxy->net_ns,
   791							reg->if_idx);
   792		if (!ifq->netdev)
   793			return -ENODEV;
   794	
   795		netdev_hold(ifq->netdev, &ifq->netdev_tracker, GFP_KERNEL);
   796	
   797		ifq->dev = netdev_queue_get_dma_dev(ifq->netdev, if_rxq);
   798		if (!ifq->dev) {
   799			ret = -EOPNOTSUPP;
   800			goto netdev_put_unlock;
   801		}
   802		get_device(ifq->dev);
   803	
   804		ret = io_zcrx_create_area(ifq, area, reg);
   805		if (ret)
   806			goto netdev_put_unlock;
   807	
   808		if (reg->rx_buf_len)
   809			mp_param.rx_page_size = 1U << ifq->niov_shift;
   810		mp_param.mp_ops = &io_uring_pp_zc_ops;
   811		mp_param.mp_priv = ifq;
 > 812		ret = netif_mp_open_rxq(ifq->netdev, if_rxq, &mp_param, NULL);
   813		if (ret)
   814			goto netdev_put_unlock;
   815	
   816		ifq->if_rxq = if_rxq;
   817		ret = 0;
   818	netdev_put_unlock:
   819		netdev_unlock(ifq->netdev);
   820		return ret;
   821	}
   822	

-- 
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7730F319852;
	Wed, 27 May 2026 14:16:47 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1779891408; cv=none; b=WR0rrOcHKzLBv1hFzY9mm7vTZ90Rt4KCDOA2VCRbtvnzghOHCohh7aDGWxF2godp6mmcLqSwvevi6H20+wNLEuaxSjVrhcb4BL7QhHa4s5RRdb3OEvZPmgfOXsxC+CatYsBa6BgsiVlBoPoHcOe9lgcDPkTGCLyABu2ugYu34ps=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1779891408; c=relaxed/simple;
	bh=rBJ7OEcpzX0ty1W1oU0GkLNAo4q6tJy5chLR4emqiXU=;
	h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type:
	 Content-Disposition; b=biCKfi4p37tXCKZMh3kRi02c6ivzxsxwK2Ghma4mz4ZU7902KnXVvb70Tx/brpBCTZ0ediOsllCFz0DbXW0OyicAQErVXnyv7jycLEIRnfToh9QjWc4JRgMeMxpnYayDYj0XQh6TmsNN+SqGEfJE318AA0uyW+t+rSo5oTuZ1ro=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=evtNM+7V; arc=none smtp.client-ip=100.103.45.18
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="evtNM+7V"
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 15F641F000E9;
	Wed, 27 May 2026 14:16:45 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org;
	s=k20260515; t=1779891407;
	bh=jmeYr36B3ddjtnomFK/HAMLXKdAGWqgpOPH1Z2Q/8Bw=;
	h=Date:From:To:Cc:Subject;
	b=evtNM+7VtCoJcH8yEKBJtykbWrpLfUEInXViAK+f+EHEFIeKIjhuZXjrT6k+oTkrz
	 gxSBauAmb1rbqrcDET0y5/tbaGM7iJrE0cUft36DSSBrSy77zmk62SqUIdh7XKXyUU
	 KN0MD5d1Xl+Oe7TinL0HHDowZ3ORxg9eAPFqRi9tN1H61XLaxICd3qw06GlJZbU4UU
	 mgT6gDbYHgFHqzSdTfFnQgAc4WaApdSd6mnuve3Umd0jOcjd+3KCnGgvO3uUtbohiP
	 k3iWOSq//22i2U6x8To/7Ni/4MpBri76+BqFuYfrq7O1YhW1m4BS++Vd5PkKXcGK9p
	 SAFmrUVW6uSKQ==
Date: Wed, 27 May 2026 15:16:43 +0100
From: Mark Brown <broonie@kernel.org>
To: Jens Axboe <axboe@kernel.dk>, Miguel Ojeda <ojeda@kernel.org>,
	Mateusz Nowicki <mateusz.nowicki@posteo.net>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <ahb8y-KE12lOUIVz@sirena.org.uk>
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="TZhMIX8GS/PUZHHd"
Content-Disposition: inline


--TZhMIX8GS/PUZHHd
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi all,

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

ERROR:root:error[E0308]: mismatched types
   --> /tmp/next/build/rust/kernel/block/mq/operations.rs:274:28
    |
274 | init_request: Some(Self::init_request_callback),
    |                       ---- ^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected fn
    |                       pointer, found fn item | arguments to this
    |                       enum variant are incorrect
    |
    = note: expected fn pointer `unsafe extern "C" fn(_, _, _, i32) -> _`
                  found fn item `unsafe extern "C" fn(_, _, _, u32) -> _ {OperationsVTable::<T>::init_request_callback}`
help: the type constructed contains `unsafe extern "C"
fn(*mut blk_mq_tag_set, *mut bindings::request, u32, u32) -> i32
{OperationsVTable::<T>::init_request_callback}` due to the type of the
argument passed
   --> /tmp/next/build/rust/kernel/block/mq/operations.rs:274:23
    |
274 | init_request: Some(Self::init_request_callback),
    |                       ^^^^^---------------------------^
    |                            | this argument influences the type of
    |                            `Some`
note: tuple variant defined here
   --> /usr/lib/rustlib/src/rust/library/core/src/option.rs:580:5
    |
580 | Some(#[stable(feature = "rust1", since = "1.0.0")] T),
    |     ^^^^

error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0308`.

We build with --kconfig_add CONFIG_KASAN=y --kconfig_add CONFIG_RUST=y
(and would also do an allmodconfig which picks up CONFIG_RUST=y in any
case since there's a usable rustc installed).

Caused by commit

  b040a1a4523d9 (block: switch numa_node to int in blk_mq_hw_ctx and init_request)

possibly interacting with some rust change but I'm not sure.  I have
used the tree from next-20260526 instead.

--TZhMIX8GS/PUZHHd
Content-Type: application/pgp-signature; name="signature.asc"

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

iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmoW/MoACgkQJNaLcl1U
h9CUTAf+I+SYj2SrIEDUI/inkUzCf+JGF5tloCVY1WXDBp8+7CJs8DHL/yQ/Df1n
0PrzgMnMD0n6hIfDwE8jXqwH6/rMZLn4h41i4WJOsEF1axkEAFh5kTC/4KRNPfAh
SF7c5tC0lOMTAHTn4n3jCLd8juIbjMwrivkhjyVNscm5ll4wnX0gBx5WEP3KmhHn
BafhQYOLxOV63rre+xJYbb6JbCAuEN9jtY/M0OCw12InhXaw3zcmnjKc7vWNUkZ/
LKJLImRnL4PCVOZHPMgDXoRfIwKzOlPFxTVvABHkgDKNsiJ5NtvtvrTvBi8vchuz
SwY1BplMqaoOWNFUGUkTl4gdUPT4fw==
=kykK
-----END PGP SIGNATURE-----

--TZhMIX8GS/PUZHHd--

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail-oa1-f42.google.com (mail-oa1-f42.google.com [209.85.160.42])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2C0C5175A67
	for <linux-next@vger.kernel.org>; Wed, 27 May 2026 14:39:18 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.42
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1779892761; cv=none; b=RHRjAAMp7VPpgDpEQAX6B+Fypte47qQeyeZUMXy1w4Q5flz23MA5KKp5Ttq0NC/kEmlffN0Lg0b7Chldb0rAkbK8LhDAD9akXos1AquEJIdZxNR+UMXgqpEPywOlaaqoahOrswoHEEwCrcQ9r6EHF3NuivX3YbVSk6qtHohd5qY=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1779892761; c=relaxed/simple;
	bh=iNNuF3NFB+bDro+iXGS0Xw2qo7pYutUvcJ3gRzDJeLE=;
	h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:
	 In-Reply-To:Content-Type; b=s4U6dLNIxhXWF7HnOFhr2+hhILmvs6q2ftBqwqQy9vdqhw3sU4IM4zgWOwV7IvbQrekejVr2B3AU6GR+EDI4URB8zstxQe+boPkuaPrvWtYOjw3wkaaovsnMic2IOuchSQR2w8ui5aLDG855ZLKbG+aLuTy0fGpY/Vn3XpHAzxI=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20251104.gappssmtp.com header.i=@kernel-dk.20251104.gappssmtp.com header.b=TNPRzYvh; arc=none smtp.client-ip=209.85.160.42
Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel-dk.20251104.gappssmtp.com header.i=@kernel-dk.20251104.gappssmtp.com header.b="TNPRzYvh"
Received: by mail-oa1-f42.google.com with SMTP id 586e51a60fabf-43bfe055ffbso1360979fac.1
        for <linux-next@vger.kernel.org>; Wed, 27 May 2026 07:39:18 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20251104.gappssmtp.com; s=20251104; t=1779892758; x=1780497558; darn=vger.kernel.org;
        h=content-transfer-encoding:in-reply-to:from:content-language
         :references:cc:to:subject:user-agent:mime-version:date:message-id
         :from:to:cc:subject:date:message-id:reply-to;
        bh=qRJ9q98QXLZCyuVnKUhn9nMR1KutQ1mTTMcfu5SCdhE=;
        b=TNPRzYvhPJJCXYG/909pyqFAGCRj9PSu2mRARLI7BNJYoXn39xZ36JxCZutMf24ifi
         +Puvwrs28J6Wjf5qJMfXLpgJwfc1mkDChY7NGoNvQ/rKDHRbLVUqDonr5w4j83eUWyce
         E+J4ikdji/zli1CQ/UmdqPSVmoakj1/B1KrYyGQOV19xvrqc1pRs3T3SSYghm7V2GVAe
         r4pCxBYVsDHeIrsLzzVHbuSt7NVSSNdIWiWwJ34j8khp9xLrwHcFZPfJr+djgCD9nhFd
         PPEfJUjGLynGyITlwHFZIXlqkFuO89VvhX8g6+qSk75aBF7aMZ5/ssB/IKUOwiMaKrT5
         1bkQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20251104; t=1779892758; x=1780497558;
        h=content-transfer-encoding:in-reply-to:from:content-language
         :references:cc:to:subject:user-agent:mime-version:date:message-id
         :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id
         :reply-to;
        bh=qRJ9q98QXLZCyuVnKUhn9nMR1KutQ1mTTMcfu5SCdhE=;
        b=Uz0NyvTDkcxkoCamSrlEeRv54oCuvEDl5bf8aCXGOWf1fEQ97maltVa1vTFRteZ1zF
         wiU0yQycKDpYfFpDYG2OWZ7Wo9vUg+QSPZtaqs51QGV4E7bXonL47tYEy2flW+4OWoDT
         A8Xm7hwMwIzlG3Lki7IG77y3w0oXgs0k5M1FYi9jZZTyNNzkeCUwzHfQ7M1YS21ii33h
         W+Gz3BJimIgh/qjXsudEXrJB62wqMvrP6gMdA6S812vCIx1ANmzm+EnxhQAsbs4g6ymL
         M8UzSAbXcvqmr7GpEIbzt4UVBefVsgBaXIhrwtAOUNQbGfm4MqRHIENK2aqlOgqBVgHR
         r18Q==
X-Forwarded-Encrypted: i=1; AFNElJ8rsXBBY9vDXc/IAd/5acPHaTGHgLzPEoBE2MIoyB+mm2eSKe85c/XSIo+t88QHdCE0QZFgU2b6lmip@vger.kernel.org
X-Gm-Message-State: AOJu0Yz+ZTrdDtkTykgtuglb3UJ+o9qtaC/5Hm6e1kvQGzik3R55m2Bv
	sxlgyU02UXrANdn5w40HIxjetQd6bcK9wa0e5E51goXVTWRPvSf2H/bpnB79Z3Zz+KQ=
X-Gm-Gg: Acq92OFFQbQcbbIXeagQepRAd/SWxhtKfVkf3z2j1Yq8eeMSEGZsoGGE7ljWbx+MJbM
	RAC9QMbZCSgbG0Q3Tbs/JWK0gFfR07mnFvAnxZzd68mCaK3T1Rpe6z+ccHWV7t7+3iZtZ+mAR6s
	Xen3AziAyeNCtmuB3uon8wxeweHo0TkLsPfd2Q/1w/RrhLcQa/Lm0J5UR5taH+bZO52KDQ+q11K
	wvaln9idx0gnFq4JJxG2ZsunhYCAHd4fdVTBhys59B3JLqUFnM+Fvew8dYGTCPtxkIKcip17Lsc
	WK+hx4p4Hk9FaCCQGFNozlS02PI5Xk4YBBBoy0PwtRHWJqhyaykND1NwNXo5r62SCZDKM3WrDeZ
	Qj7O7PzJRzeUoxcRaL6RLYeHRzztU8P5jfSjYcPVh0BFSfYQ44NejqFNp2x0Lw3hSN5b6sWqN0G
	rquokNOaOhdExfZNZhoD002jY1qIEkmE8+M/CTKEv7DVXDAqZb9JhqvAf1JQYiSEqydnhy2H/xC
	WJEl8fe1W7pjl5D/0Y=
X-Received: by 2002:a05:6870:8186:b0:43b:8eba:7da3 with SMTP id 586e51a60fabf-43b8ebac653mr11314004fac.4.1779892757998;
        Wed, 27 May 2026 07:39:17 -0700 (PDT)
Received: from [192.168.1.102] ([96.43.243.2])
        by smtp.gmail.com with ESMTPSA id 586e51a60fabf-43b635d1551sm16738730fac.5.2026.05.27.07.39.16
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Wed, 27 May 2026 07:39:17 -0700 (PDT)
Message-ID: <a9f231c8-f48a-4743-97f7-6ce7f545b400@kernel.dk>
Date: Wed, 27 May 2026 08:39:16 -0600
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: linux-next: build failure after merge of the block tree
To: Mark Brown <broonie@kernel.org>, Miguel Ojeda <ojeda@kernel.org>,
 Mateusz Nowicki <mateusz.nowicki@posteo.net>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
 Linux Next Mailing List <linux-next@vger.kernel.org>
References: <ahb8y-KE12lOUIVz@sirena.org.uk>
Content-Language: en-US
From: Jens Axboe <axboe@kernel.dk>
In-Reply-To: <ahb8y-KE12lOUIVz@sirena.org.uk>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

On 5/27/26 8:16 AM, Mark Brown wrote:
> Hi all,
> 
> After merging the block tree, today's linux-next build (arm64 kunit)
> failed like this:
> 
> ERROR:root:error[E0308]: mismatched types
>    --> /tmp/next/build/rust/kernel/block/mq/operations.rs:274:28
>     |
> 274 | init_request: Some(Self::init_request_callback),
>     |                       ---- ^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected fn
>     |                       pointer, found fn item | arguments to this
>     |                       enum variant are incorrect
>     |
>     = note: expected fn pointer `unsafe extern "C" fn(_, _, _, i32) -> _`
>                   found fn item `unsafe extern "C" fn(_, _, _, u32) -> _ {OperationsVTable::<T>::init_request_callback}`
> help: the type constructed contains `unsafe extern "C"
> fn(*mut blk_mq_tag_set, *mut bindings::request, u32, u32) -> i32
> {OperationsVTable::<T>::init_request_callback}` due to the type of the
> argument passed
>    --> /tmp/next/build/rust/kernel/block/mq/operations.rs:274:23
>     |
> 274 | init_request: Some(Self::init_request_callback),
>     |                       ^^^^^---------------------------^
>     |                            | this argument influences the type of
>     |                            `Some`
> note: tuple variant defined here
>    --> /usr/lib/rustlib/src/rust/library/core/src/option.rs:580:5
>     |
> 580 | Some(#[stable(feature = "rust1", since = "1.0.0")] T),
>     |     ^^^^
> 
> error: aborting due to 1 previous error
> 
> For more information about this error, try `rustc --explain E0308`.
> 
> We build with --kconfig_add CONFIG_KASAN=y --kconfig_add CONFIG_RUST=y
> (and would also do an allmodconfig which picks up CONFIG_RUST=y in any
> case since there's a usable rustc installed).
> 
> Caused by commit
> 
>   b040a1a4523d9 (block: switch numa_node to int in blk_mq_hw_ctx and init_request)

Fixed in the current tree.

> possibly interacting with some rust change but I'm not sure.  I have
> used the tree from next-20260526 instead.

Hmm, not sure we should let rust build issues gate whether a tree is
current in -next or not. For, by far, most systems, it's not a
requirement for a functional device.

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 844183E8354;
	Wed, 27 May 2026 14:55:14 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1779893715; cv=none; b=HJ0AVToikZtOG47ELJIhmfupsrLCXB07v0IPfjpNCkt+evLb9zfDpuFBPvjX7MC2CU32wCZITyoeK0+NmdEeGe3GoxXVu/Nz+pwkCwn2pgq1o6c3kNQkdNumjbpQ89/jDv3kvywOZXjFUTFxZmfRt76EXmsms+u2IZW0xAI85WY=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1779893715; c=relaxed/simple;
	bh=EfxgGApQH1gWAMa5v9UCC+t06ZtgrNzqzhSQ2slwTYw=;
	h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version:
	 Content-Type:Content-Disposition:In-Reply-To; b=OP6bKgLH++tymLdIRRikdE/w3FbHgIy3R7+wx5ryJQmCK4XYzHcuBCr1ooHpGwXqN3RcMgOav0xmWB4rNBTiYsd7B2HLESTL6Zl8UanbY3J0GVz1YQJIyrlVZw81ydzU50yC50q5JXCHb4GWRuCxv0wyr0XmtnQ+4e5FmllTIkA=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NRgW0iaS; arc=none smtp.client-ip=100.103.45.18
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="NRgW0iaS"
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 10D621F000E9;
	Wed, 27 May 2026 14:55:12 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org;
	s=k20260515; t=1779893714;
	bh=/NHQQ19B7OvzwEOiVWJzlzaWxCvQnjhNy/B4qsCMWjk=;
	h=Date:From:To:Cc:Subject:References:In-Reply-To;
	b=NRgW0iaSF6pVtY1uZUeVcnaOFkDx5GT3mTrhFt/LVwoPyTjgDXNJx5tBzSTZ8XxsV
	 5V4xDMl7F7P6q+eO5D0XsfC05QZdQD+4AwDujUa/dl4gxSt4ZQME6155oUGL6Mc1LH
	 /ALMAWt6+mQw8Z/dR1n0olw/t9bxdMjFKqoHGgEByer1mBapFmhpWtiZiTgbPKt2Ll
	 RCp+raPBgb/8aiatv2AUeyu7G40FgIQx4ENzdBHFyBA3O+q/6RSZZjo9MqJcdwMSAs
	 VxdHo/mvB+N2IT7vFm8x00wwvgSVQZuE0E19/AXDN9ODqZX+6oNBjgIReqQf5/SfMV
	 g76fb0EhZqoKg==
Date: Wed, 27 May 2026 15:55:10 +0100
From: Mark Brown <broonie@kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: Miguel Ojeda <ojeda@kernel.org>,
	Mateusz Nowicki <mateusz.nowicki@posteo.net>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the block tree
Message-ID: <d2ba5386-03a7-41c6-ba67-b44ffa85e403@sirena.org.uk>
References: <ahb8y-KE12lOUIVz@sirena.org.uk>
 <a9f231c8-f48a-4743-97f7-6ce7f545b400@kernel.dk>
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="AnqOLkpe5mTo13+U"
Content-Disposition: inline
In-Reply-To: <a9f231c8-f48a-4743-97f7-6ce7f545b400@kernel.dk>
X-Cookie: You are fairminded, just and loving.


--AnqOLkpe5mTo13+U
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Wed, May 27, 2026 at 08:39:16AM -0600, Jens Axboe wrote:
> On 5/27/26 8:16 AM, Mark Brown wrote:

> > possibly interacting with some rust change but I'm not sure.  I have
> > used the tree from next-20260526 instead.

> Hmm, not sure we should let rust build issues gate whether a tree is
> current in -next or not. For, by far, most systems, it's not a
> requirement for a functional device.

That's also true for a huge proportion of the issues that get caught
with an allmodconfig, and allnoconfig is not exactly a realistic
configuration either.  It's not just runtime issues, it's also issues
that come up in people's coverage tests.  TBH the rust stuff originally
got turned on because I ran the allmodconfig on a machine that happened
to have a usable rustc installed, I was intending to enable it at some
point anyway.

--AnqOLkpe5mTo13+U
Content-Type: application/pgp-signature; name="signature.asc"

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

iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmoXBc0ACgkQJNaLcl1U
h9BnNQf/ZAt9T7/SQjZ9OpIkezCSTrMbiFfDI91s1oPBE8c6IFF4c20ULJNStn2m
gq07/P/RNkhZDqUL2leWb/1Kx2WHJUocddSNyDeD5UeJeS3AMBSeV0Pze9Ij8k8T
1MZRdsW3vrTIOpkjPYouhYlETHe7FqftYkoxMr/8vA6zSqpvsHd5e098tSBVj+lr
N51WFXtZ09r8S45z9ul0DZV7O8hwyS3TskbwsxgmXiKrLl8l63eo2mOMl8WWjoTc
2Z8/YIgqg6sFgtyV1WlROtw82TLxEUUBMEh8bhiyJBNt7E529C+N+91CshODwQ1R
RkSgpdff4NDumFVG/9tr+4KphxBhpw==
=BDTs
-----END PGP SIGNATURE-----

--AnqOLkpe5mTo13+U--

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail-ot1-f46.google.com (mail-ot1-f46.google.com [209.85.210.46])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id CF38332D7F8
	for <linux-next@vger.kernel.org>; Wed, 27 May 2026 15:00:05 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.46
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1779894008; cv=none; b=DlOEdZ1Gd5axpEKuaSxqfXTPIyMNcoOtCVY97TRLh6tDIaB3iYK5Rn4zUTLYpmKFMVbD2CcuaRr1ccuTqdpUa4NK3EuHXUOCPK7MPwn+TLhtkfeJVm0D9a+ARr2ReiNr3eHpKGjn5HneQU6mDhLeB7nXKdYUJmYcnaYTio8Q0mM=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1779894008; c=relaxed/simple;
	bh=W6WhPVRO6ttAZZCOzwzG1k5gaQCk7jvT2zmQGpzO5iI=;
	h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:
	 In-Reply-To:Content-Type; b=kUOqV2cInovUP/9TPpL2dnbUgQhwFr/2pFChDPXCcVyDVdpiKK6N5s1Cjg7KM0p8LaTDU6S4XUgZPlnvials1ObG/GVKKDfnaCx6hGu6WBo75SWgLXZaox+a9FT6WwR2oRgw77n1nAJpPp+yTVtovxatiPwbfx2qzDILBURXRJc=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20251104.gappssmtp.com header.i=@kernel-dk.20251104.gappssmtp.com header.b=f5psM39H; arc=none smtp.client-ip=209.85.210.46
Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel-dk.20251104.gappssmtp.com header.i=@kernel-dk.20251104.gappssmtp.com header.b="f5psM39H"
Received: by mail-ot1-f46.google.com with SMTP id 46e09a7af769-7dcdd1b492eso11533015a34.1
        for <linux-next@vger.kernel.org>; Wed, 27 May 2026 08:00:05 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20251104.gappssmtp.com; s=20251104; t=1779894004; x=1780498804; darn=vger.kernel.org;
        h=content-transfer-encoding:in-reply-to:from:content-language
         :references:cc:to:subject:user-agent:mime-version:date:message-id
         :from:to:cc:subject:date:message-id:reply-to;
        bh=GhdKEt8RLrSHFZHMt1CU6xq88LShxo+BGCrAl1tL8fo=;
        b=f5psM39HIpU0XmTCmASo+f3SrCPNBbYnfDCI681PXUEGHG4ivysNVyx/E0O+yt/wUO
         oDC7YS3kTSm3YyDpCqyiCmWsW7SQtCvWALg1MojD+Xeja7olSzMFuqYl00SCwtH3Y+Cu
         dWRkmKMpSTwV0TLJgcCZJvddezacmt2pwGg1p3xePnU425AILtw8JLAyN74x2Dn+PZcy
         70eIJpgEdNCqkhRqrBltYhPglvVqisFksYZ1rVWJLUdRZrz71tKcHTiBqS9or3sl2meQ
         XQnPsbwWLvnWMyTA+feO7H/cA2X1Dk3DZcpY47B5x7xywZrIxdMNUh1zAWsQySOcp8M9
         ZuCw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20251104; t=1779894004; x=1780498804;
        h=content-transfer-encoding:in-reply-to:from:content-language
         :references:cc:to:subject:user-agent:mime-version:date:message-id
         :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id
         :reply-to;
        bh=GhdKEt8RLrSHFZHMt1CU6xq88LShxo+BGCrAl1tL8fo=;
        b=NRGhQu1jBZX7Z0djKYYA4j1VI4NhMmWBmg9AWsfTXL1czbZunqqBjh/hwClnXn7Cm7
         o4RRTBHTNdJ2Fv1bW5fGKtE/PyjK5xdM+nAyVpMlB9gyUbAgVHDleomqtmnrfJikFQh/
         yOmtEbR4mmVX6nY06ef0oXnl88NvxdzSkL2tSKRAmSwQTT7PWmgLiAYfHQA3OkN/KI9v
         4LUAEbbPMusFPDml1A1J/5vflaklH+xrz7wjfCIBrxF2NHHJgtT69JyukGON9XttHnFW
         yrwPiKxfjC+NG4YDSkd7SIRRg8IZH2a2WSDQOrtJziDL6DNDD24GeMNc6YEr0DCWEqD/
         OKNA==
X-Forwarded-Encrypted: i=1; AFNElJ/8eXq7eRxHmhQMHh2kSpa6OdYmbt0RHypLfldXH2qWWK9jB9uot6JyGs/65g2Ye3DqzVaPVkbl56f7@vger.kernel.org
X-Gm-Message-State: AOJu0YyJpUPJgMHeB3YlDbT8+YLfBneNHNSdlNv+6sqrIEvVWbN/qTon
	RZeSdS0CSzxjoK9m8xG4AU7G7XYMI/SMKcY+T+4VHBNmhZ+Q7JdiRqr2sMFi14eQWBiatutCFu2
	KFklUAiE=
X-Gm-Gg: Acq92OHLBQdE234lP0vNOJkFEyqDDcVlHRwoCrKA5MnE4Qq+kt86Pcng0ddcVTGssUw
	0PWjPWZKYmCVkVY+i9ovWuq8vtkjkuJu5LqRGG8BYYlCNZkvgSXGKjEuKTwkcGFSNwpaXXt/RVA
	xGmT1fu304s0GgZoDAHGB9pwXFSuqHjoJSL3VR1mx302wr8xjgcvmfZi6kSPvOfPS515MVaAvjg
	DaBh8Dp2Lau4ED+dLrAwM9Ft17gLk2vjCFp9BaZQSrBHz3sVGqjAUtM7n816Y3UdyY2sCaeMerp
	162LHUjWgqijHjPnxLzhnYe/rhAGhetTJbVSMSIKN5Ps2iX4Z3tygxXH6oxxeWj4VpPWMWAPfKW
	1JgSzyxo11dCVHs6on5aMvqJR+1xNu0y+DK/47CGSoB63taGvfsZNIFDkEnNmcuuFX0P6aecCH6
	8D9vMqGWZECuybdhmQOMfXgEFde+zeKoI5IEaILXg9jYy+I49NbjJ8XzQ778D5uhhZalCQd7cvB
	lV4++xdaK9LX8iTea0=
X-Received: by 2002:a9d:6a50:0:b0:7de:cf3f:1b3d with SMTP id 46e09a7af769-7e5ea37d7c9mr9991989a34.7.1779894004187;
        Wed, 27 May 2026 08:00:04 -0700 (PDT)
Received: from [192.168.1.102] ([96.43.243.2])
        by smtp.gmail.com with ESMTPSA id 46e09a7af769-7e606459f67sm11649519a34.3.2026.05.27.08.00.03
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Wed, 27 May 2026 08:00:03 -0700 (PDT)
Message-ID: <3f516364-f281-4671-9890-bf00e7c5b041@kernel.dk>
Date: Wed, 27 May 2026 09:00:02 -0600
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: linux-next: build failure after merge of the block tree
To: Mark Brown <broonie@kernel.org>
Cc: Miguel Ojeda <ojeda@kernel.org>,
 Mateusz Nowicki <mateusz.nowicki@posteo.net>,
 Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
 Linux Next Mailing List <linux-next@vger.kernel.org>
References: <ahb8y-KE12lOUIVz@sirena.org.uk>
 <a9f231c8-f48a-4743-97f7-6ce7f545b400@kernel.dk>
 <d2ba5386-03a7-41c6-ba67-b44ffa85e403@sirena.org.uk>
Content-Language: en-US
From: Jens Axboe <axboe@kernel.dk>
In-Reply-To: <d2ba5386-03a7-41c6-ba67-b44ffa85e403@sirena.org.uk>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

On 5/27/26 8:55 AM, Mark Brown wrote:
> On Wed, May 27, 2026 at 08:39:16AM -0600, Jens Axboe wrote:
>> On 5/27/26 8:16 AM, Mark Brown wrote:
> 
>>> possibly interacting with some rust change but I'm not sure.  I have
>>> used the tree from next-20260526 instead.
> 
>> Hmm, not sure we should let rust build issues gate whether a tree is
>> current in -next or not. For, by far, most systems, it's not a
>> requirement for a functional device.
> 
> That's also true for a huge proportion of the issues that get caught
> with an allmodconfig, and allnoconfig is not exactly a realistic
> configuration either.

While that is true, the big difference here is that everybody should
build allmodconfig themselves, but only a (much) smaller subset of those
have rust enabled/available.

> that come up in people's coverage tests.  TBH the rust stuff originally
> got turned on because I ran the allmodconfig on a machine that happened
> to have a usable rustc installed, I was intending to enable it at some
> point anyway.

I think it's good to have coverage, but I think it should be more of the
notification variety than a gating factor. For this particular time and
branch it didn't matter, but sometimes I shove things in there that I
absolutely need a quick test turn-around on. For exposure reasons. And
getting a -next cycle delay on that would be unfortunate, and I think
also unwarranted if the only issue is that the rust build broke.

Does highlight that apparently my build no longer does rust builds,
which it did used to... Something to look into on my end.

Not trying to start a debate, just voicing my opinion on the matter :-)

-- 
Jens Axboe

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 681A737C90B;
	Wed, 27 May 2026 16:02:51 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1779897772; cv=none; b=s58175AxF+GYKYjPI40oQ+f9X9vO0igD0M5FyWZ9L9OM2jyI2NM00Kx6004TTtwOPNhyM5XWMyc8J1tsEmYB44xIxkctWaP9+9gPyzBef543/h7Rb2m58v1qW9xowBCK0/o0J7qiXHDveDYqW8HjU+4z6hKetXevdHi5xHOW07s=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1779897772; c=relaxed/simple;
	bh=81JQs5ogj/xYD4Xnsr3UPI7lfhQ5IyAkvbUIkuUOG6w=;
	h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version:
	 Content-Type:Content-Disposition:In-Reply-To; b=ZA9I3xxlgttpAAvaagZV0qHTODLEFKQmh+TFDapdsXAVOfQ9+yZNR/YqJ0LFMUPkyVFxKfwCFZcxUJ5baf6XbAwZyOYRBvNZMkphzlXCzc5wuryxI0HQQNWPJSVZsjmN2JRuFsgiXPLAPPjCA4FLB3T9BKhVbgkMB7HOs6vmaps=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=JKz9jO36; arc=none smtp.client-ip=100.103.45.18
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="JKz9jO36"
Received: by smtp.kernel.org (Postfix) with ESMTPSA id C69A91F000E9;
	Wed, 27 May 2026 16:02:49 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org;
	s=k20260515; t=1779897771;
	bh=9y/lj6HguzXRoAURDXWldpYQZVg33Om3iW5WPUp6RSc=;
	h=Date:From:To:Cc:Subject:References:In-Reply-To;
	b=JKz9jO36G/yBq4V0DSuP6eaMY0YRT2kV5LyjEa/r4ZAOkdAGJvdgL9ttSeJYkI56L
	 Zt2Wj4YK5Z3LAznZRltF+2PwbKYarltl0AjrDQR5EEpfPfLYKKTN216wa2FlwdquMG
	 kAkAV1vsfiNnw3k16Rv7EeZ1cRbNsmrkuYoOyPYuJ8yti/6Pwpwbtp+Ae/tOQqJdzc
	 6xD0qiWqscj6dRBj5mGbHSqtKkK7PfmAS9K7hTlOF5hHLiAlNNuR86L0UDZhaPTVGA
	 RmCEj9moW/TlqAssEP+e09dzBszg4Aa4t7/JmSKBuNPecQHCpKGE4zz3P6sMHWTnuG
	 3wuURrJ+XtIYg==
Date: Wed, 27 May 2026 17:02:46 +0100
From: Mark Brown <broonie@kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: Miguel Ojeda <ojeda@kernel.org>,
	Mateusz Nowicki <mateusz.nowicki@posteo.net>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the block tree
Message-ID: <a241fab2-f78b-4d61-8f6e-8b2ab3050d58@sirena.org.uk>
References: <ahb8y-KE12lOUIVz@sirena.org.uk>
 <a9f231c8-f48a-4743-97f7-6ce7f545b400@kernel.dk>
 <d2ba5386-03a7-41c6-ba67-b44ffa85e403@sirena.org.uk>
 <3f516364-f281-4671-9890-bf00e7c5b041@kernel.dk>
Precedence: bulk
X-Mailing-List: linux-next@vger.kernel.org
List-Id: <linux-next.vger.kernel.org>
List-Subscribe: <mailto:linux-next+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-next+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="Eb5uLCg/PR1XTDCb"
Content-Disposition: inline
In-Reply-To: <3f516364-f281-4671-9890-bf00e7c5b041@kernel.dk>
X-Cookie: You are fairminded, just and loving.


--Eb5uLCg/PR1XTDCb
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Wed, May 27, 2026 at 09:00:02AM -0600, Jens Axboe wrote:
> On 5/27/26 8:55 AM, Mark Brown wrote:
> > On Wed, May 27, 2026 at 08:39:16AM -0600, Jens Axboe wrote:

> >> Hmm, not sure we should let rust build issues gate whether a tree is
> >> current in -next or not. For, by far, most systems, it's not a
> >> requirement for a functional device.

> > That's also true for a huge proportion of the issues that get caught
> > with an allmodconfig, and allnoconfig is not exactly a realistic
> > configuration either.

> While that is true, the big difference here is that everybody should
> build allmodconfig themselves, but only a (much) smaller subset of those
> have rust enabled/available.

Personally I had to install a cross toolchain to be able to cover this
x86_64 stuff everyone seems to think is important. :)

More seriously I'd hope that people maintaining stuff that interacts
with rust have a rust toolchain available, it sounds like you do but it
silently got turned off without you realising.  If we're getting into a
situation where rust is routinely getting broken by not obviously
related stuff we might want to reevaluate that in general, not just for
-next but so far I've mostly seen what rust breakage I encounter be due
to rust specific changes which really ought to have been tested by
someone with a rust toolchain.  TBH given that rust conflicts come up
moderately often I think I need to have the build coverage just to catch
my own obvious errors.

> > that come up in people's coverage tests.  TBH the rust stuff originally
> > got turned on because I ran the allmodconfig on a machine that happened
> > to have a usable rustc installed, I was intending to enable it at some
> > point anyway.

> I think it's good to have coverage, but I think it should be more of the
> notification variety than a gating factor. For this particular time and
> branch it didn't matter, but sometimes I shove things in there that I
> absolutely need a quick test turn-around on. For exposure reasons. And
> getting a -next cycle delay on that would be unfortunate, and I think
> also unwarranted if the only issue is that the rust build broke.

OTOH part of what we're looking for is ensuring that we don't spend the
early part of the release cycle sorting out build issues that came in
during the merge window.  I agree that there's competing needs in there,
and we also have fun with things like both x86_64 and allmodconfig
turning on -Werror which opens us up to toolchain differences causing
trouble.

One trouble with notification only for things that break the build is
that it becomes hard to detect and work with it sensibly, and one build
break can easily mask another build break.

> Does highlight that apparently my build no longer does rust builds,
> which it did used to... Something to look into on my end.

Do you have KASAN turned on, or are you doing something like
allmodconfig which turns it on?  There was a change to make rust
incompatible with KASAN when used with GCC:

  https://lore.kernel.org/r/20260408-kasan-rust-sw-tags-v3-1-e07964d14363@google.com

that caused me issues.

> Not trying to start a debate, just voicing my opinion on the matter :-)

--Eb5uLCg/PR1XTDCb
Content-Type: application/pgp-signature; name="signature.asc"

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

iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmoXFaYACgkQJNaLcl1U
h9BVBQf+Osj3eiwH4rW+DHrKFLPJDM4QirZuqG6yLPaOH0o9Wb0AH8c6X0y6oNUi
YnlQi98wM+CGEI8BfscEOh2cx5kSmIJo5dRWPmM4ERElwno2ZTztgT/fOCUGMgUv
OBZK7ghGG5UucN5dJe27PPZ1A2KfqKd51hqChkiRLEyZ1e8vPr1AZ6HBYGK0v5Op
cABQRDYOaFni4v7jZc0Zon5xxMWmoiAy/YIHw8RxgWOEgw6FrBXkvCtiuj+DjoQX
r74i+eBK0A0qQ/2PfvkbR1PYBgTKvUdx3PU+5ghbwxvmH2tloXJiLcAp8+QEB0Ul
mQcR5GjcwO6CfPp3+lvGsoDNnSZwQw==
=BqS+
-----END PGP SIGNATURE-----

--Eb5uLCg/PR1XTDCb--

