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=-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 15392C433B4 for ; Tue, 27 Apr 2021 18:31:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CC2E2613ED for ; Tue, 27 Apr 2021 18:31:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236571AbhD0ScV (ORCPT ); Tue, 27 Apr 2021 14:32:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230219AbhD0ScU (ORCPT ); Tue, 27 Apr 2021 14:32:20 -0400 Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20CCAC061574 for ; Tue, 27 Apr 2021 11:31:37 -0700 (PDT) Received: by mail-lf1-x130.google.com with SMTP id 4so35273583lfp.11 for ; Tue, 27 Apr 2021 11:31:37 -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=gZr+uThAt0ciiksb5ytQDUkfPwWrBd07uVSgmxyj1eE=; b=gXB/ev241A+ABixVHuF9uRXX2mdp46DZLus2UrKHidpghpb8UTG1oK9rLlZSG14lu2 oyJS2lcfpHAvsJ/yLkCwJ206dAagh8K5AtMj9DZ2VaOEmTqTjgd/6PzhpBp/fJYskUja 4roVrTYHPkKU2t6wth7V8TjlUfD6U7WLpwahk= 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=gZr+uThAt0ciiksb5ytQDUkfPwWrBd07uVSgmxyj1eE=; b=FXFteCJpUYxWphBVOGvZWVKC2tzAR+sj833qYtPO7ZbiV1/F5bVL3nLraPTdCHCjvl JIPnrrcoQr434Rz+IgXPIW83Uhpf+se04eNfAMKLLcaejfbv3pzNK4WOPIgNdcWQ8T+T sjFqWqNm4yYNog5VdIHW67NAPgM2+YcE54PL0n8mYEYVjiogjuDEyEvNdUyjQUpsJE55 4sSXYyIu5StD7TUgXqWOvfUvImS3hnkCMvdAHJzqNaZvf3ErU+LqOwtOeNJwKpy2Q9aZ d82VDFPIzJ3gq0a37NEXLyOqODDzspKrwjavLz6qyhDRMRG40H+3Yg5tIQXwOwzerdfz 0ZbQ== X-Gm-Message-State: AOAM530M4TP1gAqQqfuc9OytxKmtPqlPSMmq+GpaVIEpdnEGaVGOxQRD tgE0Nbc4pbasei+69h13w+L3G2d3jQQm5kaz X-Google-Smtp-Source: ABdhPJzr8A1Op1BAdaooshvh33rjUz8DibX+TCTmzHzkivpke0ooUfw1r39F6BXoYGz3BmwvUQr+jg== X-Received: by 2002:a05:6512:717:: with SMTP id b23mr4621443lfs.210.1619548295460; Tue, 27 Apr 2021 11:31:35 -0700 (PDT) Received: from mail-lj1-f170.google.com (mail-lj1-f170.google.com. [209.85.208.170]) by smtp.gmail.com with ESMTPSA id r14sm139178lfi.198.2021.04.27.11.31.34 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 27 Apr 2021 11:31:35 -0700 (PDT) Received: by mail-lj1-f170.google.com with SMTP id a13so15486384ljp.2 for ; Tue, 27 Apr 2021 11:31:34 -0700 (PDT) X-Received: by 2002:a2e:880f:: with SMTP id x15mr15839732ljh.507.1619548294774; Tue, 27 Apr 2021 11:31:34 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Linus Torvalds Date: Tue, 27 Apr 2021 11:31:19 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [git pull] fileattr series from Miklos To: Al Viro , Josef Bacik , David Sterba Cc: Linux Kernel Mailing List , linux-fsdevel , Miklos Szeredi Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org On Mon, Apr 26, 2021 at 3:42 PM Al Viro wrote: > > The branch is straight from Miklos' tree (it's #fileattr_v6 there), > sat merged into vfs.git #for-next for a while. Not sure what's the normal > way to do pull requests in situations like that - do you prefer a reference > to my tree (as below) or to mszeredi/vfs.git? This is fine. The only downside here is that there was no signed tag, which I would have preferred - either from you or from Milkos. We've had this a couple of times before, and I've started trying to "document" it with a "Pull X from Y via Z" thing. See for example git show 836d7f0572ca 70cd33d34c60 which is a similar kind of thing where Borislav just forwarded Ard's work (and it has happened in the past a couple of times without those kinds of notices). Btw, unrelated to that, this pull request got a conflict with 64708539cd23 ("btrfs: use btrfs_inode_lock/btrfs_inode_unlock inode lock helpers") which I think I sorted out correctly (the "inode_lock()" is now done by the VFS layer for the fileattr things, and the btrfs use of "btrfs_inode_lock/btrfs_inode_unlock" ended up being undone). But just to be safe I'm cc'ing the btrfs people involved. Please double-check that I didn't screw something up. (Note: it doesn't show up as a conflict in the merge itself, because each piece was a straight "take the case from one side or the other", and in this case "take it from the fileattr" side meant that the inode_[un]lock -> btrfs_inode_[un]lock conversion for the fileattr cases just went away). Linus