From: broonie@kernel•org
To: Miklos Szeredi <miklos@szeredi•hu>
Cc: Christian Brauner <brauner@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Miklos Szeredi <mszeredi@redhat•com>,
Yang Xu <xuyang2018.jy@fujitsu•com>
Subject: linux-next: manual merge of the overlayfs tree with the origin tree
Date: Wed, 3 Aug 2022 12:58:44 +0100 [thread overview]
Message-ID: <20220803115844.53246-1-broonie@kernel.org> (raw)
Hi all,
FIXME: Add owner of second tree to To:
Add author(s)/SOB of conflicting commits.
Today's linux-next merge of the overlayfs tree got a conflict in:
fs/overlayfs/inode.c
between commit:
1aa5fef575a83 ("ovl: handle idmappings in ovl_get_acl()")
from the origin tree and commit:
ded536561a367 ("ovl: improve ovl_get_acl() if POSIX ACL support is off")
from the overlayfs tree.
I fixed it up (see below) 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.
next reply other threads:[~2022-08-03 11:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-03 11:58 broonie [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-08-03 12:26 linux-next: manual merge of the overlayfs tree with the origin tree broonie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220803115844.53246-1-broonie@kernel.org \
--to=broonie@kernel$(echo .)org \
--cc=brauner@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=miklos@szeredi$(echo .)hu \
--cc=mszeredi@redhat$(echo .)com \
--cc=xuyang2018.jy@fujitsu$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox