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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EFE5DC7EE2A for ; Wed, 10 May 2023 12:48:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236681AbjEJMso (ORCPT ); Wed, 10 May 2023 08:48:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45290 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236922AbjEJMsn (ORCPT ); Wed, 10 May 2023 08:48:43 -0400 Received: from mail-pg1-x531.google.com (mail-pg1-x531.google.com [IPv6:2607:f8b0:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 29C146EA7 for ; Wed, 10 May 2023 05:48:42 -0700 (PDT) Received: by mail-pg1-x531.google.com with SMTP id 41be03b00d2f7-524db748169so1081614a12.1 for ; Wed, 10 May 2023 05:48:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20221208.gappssmtp.com; s=20221208; t=1683722921; x=1686314921; 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=+xXs0HtZHqu7tTCcsx3Q063YwdD+crlfQPAG+dHyu10=; b=UYUfSSBX3QGHV109YPLRewZmojsppjLaECSLSMqY7GGwscu/5VGGLgk8UjRYh7xAqK lZMp4nx15R2WWgpNkQWOTPDmAAOIlxiSyp7V5TUAGgaGiJh3iSJPTg/e+UI5Xn8D1vlY mJFQ2Fo+D3AiSaUb/NDmJGcJObolShzfJ0lOSgzbS+JCF+PeXHHIU5OUuEDVQKSDBSCU wg6Zh9p4ZruY1266EgHZRyWvuZMMjieD6LWUlqqRozk23LXAMeN+S7P9k14VAtLeoec5 6RZRemknUaZu23oWQizu0qqTiZ4tX0JGyxNZUalzsYh4FSLgLk4vx/6lLHWUyJxVLVnN I4Hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683722921; x=1686314921; 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=+xXs0HtZHqu7tTCcsx3Q063YwdD+crlfQPAG+dHyu10=; b=jGa4B89Ds21KeJTutSbnnm/8Pc7v3WqKLZG1n3/7XYOxQcgsnj9640DS/nR8YUHnKl xhcIFAKg0NEnKgnQztF4KjxbeupDd3TJ/Ojyaj+8gNyLKOECorkFxp72Gvr6ejrg+Efo d34NU/tAs1KbGIas9YUXQ6HGruNZIQbOXl4TugCdQBM5D/RKcgnr4LIE7Q5yBQ4YMYc7 tOqdFcVwOKVD+9PjaSBSCKWe+N5JtoCijMjrYzNwINfD4OcUUsEr2oIUF5iqgG0I4ydG mRcA+9YSj11nvC/25qG2eMGZ5orOLk4qU7CSBXauWnPd4WZDFpW6DyC5QrsIK2g04qn1 UqoQ== X-Gm-Message-State: AC+VfDxZHI5rMM3VlRDay6fibTAXSG9aUZ1D6ELf2Ekjo6zOPoA+8whe bkjTweGW8DQpzF9Btvjh5O2dPw== X-Google-Smtp-Source: ACHHUZ4n3g3YZxN0Xv7bR5yHrpV7ihLYfxnP5uvoiaDzQnxPHkCez/Nuf+FvSmaVFBxDA9uCtbv4Bw== X-Received: by 2002:a17:90b:1b0c:b0:250:d8e1:d326 with SMTP id nu12-20020a17090b1b0c00b00250d8e1d326mr1648076pjb.0.1683722921167; Wed, 10 May 2023 05:48:41 -0700 (PDT) Received: from [192.168.1.136] ([198.8.77.157]) by smtp.gmail.com with ESMTPSA id om8-20020a17090b3a8800b002471deb13fcsm13697933pjb.6.2023.05.10.05.48.40 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 10 May 2023 05:48:40 -0700 (PDT) Message-ID: Date: Wed, 10 May 2023 06:48:39 -0600 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux aarch64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: linux-next: manual merge of the block tree with the vfs-idmapping tree Content-Language: en-US To: Stephen Rothwell , Christian Brauner , Seth Forshee Cc: Linux Kernel Mailing List , Linux Next Mailing List References: <20230510105543.165f102b@canb.auug.org.au> From: Jens Axboe In-Reply-To: <20230510105543.165f102b@canb.auug.org.au> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On 5/9/23 6:55 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the block tree got a conflict in: > > fs/pipe.c > > between commit: > > 2b10649c2316 ("pipe: enable handling of IOCB_NOWAIT") > > from the vfs-idmapping tree and commit: > > 3f6ded8dd89d ("pipe: check for IOCB_NOWAIT alongside O_NONBLOCK") > > from the block tree. > > The former added > > const bool nonblock = iocb->ki_flags & IOCB_NOWAIT; > > and then did > > - if (filp->f_flags & O_NONBLOCK) { > + if (filp->f_flags & O_NONBLOCK || nonblock) { > > while the latter just did > > - if (filp->f_flags & O_NONBLOCK) { > + if (filp->f_flags & O_NONBLOCK || iocb->ki_flags & IOCB_NOWAIT) { > > so I just used the former though I suspect that the former may be a > previous version of these changes?). > > I fixed it up (see above) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. Yes, since Linus didn't like the original approach, it was redone and that particular patch was originally forgotten and then redone without the 'nonblock' variable. So you should just ignore the old version, and Christian should just drop that branch from his for-next tree as it's dead. -- Jens Axboe