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 0201FC00140 for ; Mon, 8 Aug 2022 12:20:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242600AbiHHMUW (ORCPT ); Mon, 8 Aug 2022 08:20:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45946 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239232AbiHHMUS (ORCPT ); Mon, 8 Aug 2022 08:20:18 -0400 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39CA2277 for ; Mon, 8 Aug 2022 05:20:12 -0700 (PDT) Received: by mail-wr1-x42c.google.com with SMTP id z17so10687713wrq.4 for ; Mon, 08 Aug 2022 05:20:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=szeredi.hu; s=google; h=date:from:to:cc:subject:message-id:mime-version:content-disposition; bh=EGJh6H4Q+/4Jo4xNeP066GXEwQs4C4KMootOF9X7m5E=; b=m0qzJA/eP/VqrChusdQ4L8wxmlBRjqB1YRFbmJndfdkiQbKMoJKc+AEViatMKM3Png 9E3SiqQXL6dLmfKG65A9rBnCsuEipXMZ7mmzY6C0vA0prs4C+YMj+qBIVJDr1oAZgNGi OmrhFHKz7YCVGe6CNhJzWTUM0EQVbEWv6FMS4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=EGJh6H4Q+/4Jo4xNeP066GXEwQs4C4KMootOF9X7m5E=; b=cHF8UX1U9elQ/CdvlGIGAREbQyXS5GXiQEa7xTI7NMzqcQkgDx1VjpyKe3evpF4z+G TivFWNiZa3ThdvDHYjQd4ZHYBMyTaogE63zkR5Xc81QivlZbavvSz0OzPocYIvgt+EeY I+PhdYONClwPvIqtr1IB8Uy4FZ+8+X4eMLsM4L3Sv3hP7CSblKuZaZIhtLasuZeZBHtb BSb/qq9dbPveaxOkKKxKpoiecSi5/Q/X+sN1XmeOJmE9gk+xa360Ua8mZ4z65Lpc/q1A NPljDNldq5ypwB7hgFWA1Kawe4Yzhz6YP1ZGXYsSDNO4Aeo6QcMESpNJVcChKixElugl GdXw== X-Gm-Message-State: ACgBeo0gesMbaTtg6qILY81lBoyfQKpD0gjQo8UlXQfV8sGHTe9ge3BW /Q6RCFO8LkcimMpqlUxuufW4KA== X-Google-Smtp-Source: AA6agR60elkz35zB7183HO8LE91+Te3/f/Ds1v/OD1bLTXqK+UVHlZSUlbrlcejfmICbANVtDEPA3A== X-Received: by 2002:adf:fc47:0:b0:220:5f01:6a10 with SMTP id e7-20020adffc47000000b002205f016a10mr11672087wrs.7.1659961210759; Mon, 08 Aug 2022 05:20:10 -0700 (PDT) Received: from miu.piliscsaba.redhat.com (87-97-117-187.pool.digikabel.hu. [87.97.117.187]) by smtp.gmail.com with ESMTPSA id f7-20020a5d6647000000b002217aed23b4sm8150586wrw.12.2022.08.08.05.20.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Aug 2022 05:20:09 -0700 (PDT) Date: Mon, 8 Aug 2022 14:20:02 +0200 From: Miklos Szeredi To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-unionfs@vger.kernel.org Subject: [GIT PULL] overlayfs update for 6.0 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, Please pull from: git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git tags/ovl-update-6.0 This is just a small update. There's a merge conflict with the mnt-userns series from Christian. This should be resolved by moving the "#ifdef CONFIG_FS_POSIX_ACL" up, to include the newly introduced ovl_idmap_posix_acl() helper. Thanks, Miklos --- Jiachen Zhang (1): ovl: drop WARN_ON() dentry is NULL in ovl_encode_fh() Miklos Szeredi (1): ovl: warn if trusted xattr creation fails William Dean (1): ovl: fix spelling mistakes Yang Li (1): ovl: fix some kernel-doc comments Yang Xu (1): ovl: improve ovl_get_acl() if POSIX ACL support is off --- fs/overlayfs/export.c | 2 +- fs/overlayfs/inode.c | 4 +++- fs/overlayfs/namei.c | 4 ++-- fs/overlayfs/overlayfs.h | 6 ++++++ fs/overlayfs/super.c | 13 +++++++++---- 5 files changed, 21 insertions(+), 8 deletions(-)