From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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.3 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=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 E61A3C433E0 for ; Fri, 12 Mar 2021 03:21:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AEEFC64F93 for ; Fri, 12 Mar 2021 03:21:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231700AbhCLDVJ (ORCPT ); Thu, 11 Mar 2021 22:21:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229664AbhCLDUf (ORCPT ); Thu, 11 Mar 2021 22:20:35 -0500 Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6F774C061574 for ; Thu, 11 Mar 2021 19:20:35 -0800 (PST) Received: by mail-pf1-x42b.google.com with SMTP id l7so924570pfd.3 for ; Thu, 11 Mar 2021 19:20:35 -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=DjdNOMaFcU4e2foCYh5TokMVxHNn3j89oLkPqKd3dks=; b=dQTkq3E2hZr897kEwjHE4FBioepjDR/GJp30imWYUpbO/d7epEPNCzEaeoPOe8Sq25 8Bj0sqMt1zQFkagj0thE/swgzeHtc7S6jOCgfMbd6h+F56U+6tkWJLvzcsNPst18ybR4 KNJKgQMA0VNzn1v6G/Q0WM+IQ0oDPpOT7imYOWkQEr0i7HJwbjjuUFD8WbExDE6eWTzr z3QwYHOiEgh0UpI+xWfGoNZ5pYVbwrDrTsSn2yci7GEFAOZvHG+umNFswx+b3Y8s3d2k 8kYLtcf97BJaKjh1QNpA9i8UwcaTwbQuBEZNLrT60ydVVappiWLPCm4Sh+XhqSFpn01v 8OgQ== 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=DjdNOMaFcU4e2foCYh5TokMVxHNn3j89oLkPqKd3dks=; b=IOM/Mg2T9lxiI2WieWcdxbnlJ9/ZmYyWl7ddGAa+KBL44mUTAwIOZHRUXC+mlPcoLT s/X/meIwjYqQL+lInrYe8ZRKFumPitToOKb/sorzzJS8EQUlo+OkjY7XwK7EjhgViuMS TsUzINJv01eU3gXW7peeDhxIXX3dO5mP9QGj12nIryOMcu3Q2Qb+OQL4+5X9M17Q0Gw8 KodfXxIbjMMe1QR5O3GJwq6JMSia7h2sTm+y3GNrsqJY+NPRllNnyzDrdb8daa3fN4wn s+ooxCPhrchlkSlfAG7DiAbvcZtN36GW9zwPXIOoclIaCydv3H3K2Xud3h2lbnaHN45p zc1w== X-Gm-Message-State: AOAM533g1uMjFy7GkAoxeZDLa1IEHz/JEKuRzTVW11zuh3ovpaat7BpR BuyQ1C8vQIev9Vc4+aMJhUUuSg== X-Google-Smtp-Source: ABdhPJxQPggg8rqEw+UFpSTWLIJV06QXAWCnJSBaMZGDDK2QLUpzxmzKcAs5b71rutv8ot06LqOUfQ== X-Received: by 2002:a63:695:: with SMTP id 143mr9674961pgg.314.1615519234558; Thu, 11 Mar 2021 19:20:34 -0800 (PST) Received: from [192.168.1.134] ([66.219.217.173]) by smtp.gmail.com with ESMTPSA id n24sm3602575pgl.27.2021.03.11.19.20.33 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 11 Mar 2021 19:20:33 -0800 (PST) Subject: Re: linux-next: build failure after merge of the scsi-mkp tree To: Stephen Rothwell , "Martin K. Petersen" Cc: Christoph Hellwig , Douglas Gilbert , Linux Kernel Mailing List , Linux Next Mailing List References: <20210312141744.0022d5f5@canb.auug.org.au> From: Jens Axboe Message-ID: Date: Thu, 11 Mar 2021 20:20:32 -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: <20210312141744.0022d5f5@canb.auug.org.au> Content-Type: text/plain; charset=windows-1252 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 3/11/21 8:17 PM, Stephen Rothwell wrote: > Hi all, > > After merging the scsi-mkp tree, today's linux-next build (powerpc > ppc64_defconfig) failed like this: > > > drivers/scsi/sg.c: In function 'sg_mk_kern_bio': > drivers/scsi/sg.c:2958:17: error: 'BIO_MAX_PAGES' undeclared (first use in this function); did you mean 'BIO_MAX_VECS'? > 2958 | if (bvec_cnt > BIO_MAX_PAGES) > | ^~~~~~~~~~~~~ > | BIO_MAX_VECS > > Caused by commit > > b32ac463cb59 ("scsi: sg: NO_DXFER move to/from kernel buffers") > > interacting with commit > > a8affc03a9b3 ("block: rename BIO_MAX_PAGES to BIO_MAX_VECS") > > from the block tree. > > I have applied the following merge fix patch: > > From: Stephen Rothwell > Date: Fri, 12 Mar 2021 14:11:16 +1100 > Subject: [PATCH] scsi: sg: fix up for BIO_MAX_PAGES rename > > Signed-off-by: Stephen Rothwell > --- > drivers/scsi/sg.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c > index 2d4bbc1a1727..6b31b2bc8f9a 100644 > --- a/drivers/scsi/sg.c > +++ b/drivers/scsi/sg.c > @@ -2955,7 +2955,7 @@ sg_mk_kern_bio(int bvec_cnt) > { > struct bio *biop; > > - if (bvec_cnt > BIO_MAX_PAGES) > + if (bvec_cnt > BIO_MAX_VECS) > return NULL; > biop = bio_alloc(GFP_ATOMIC, bvec_cnt); > if (!biop) Looks good - fwiw, the block change will go into 5.12-rc3 to avoid having this issue over a merge window prep, so maybe SCSI can pull in -rc3 and get this resolved locally in that tree. I'll rebase the block-5.12 branch off -rc1 after this merge. -- Jens Axboe