From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jeff Layton <jlayton@kernel•org>,
Ilya Dryomov <idryomov@gmail•com>,
David Howells <dhowells@redhat•com>
Cc: Jakob Koschel <jakobkoschel@gmail•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the ceph tree with the fscache tree
Date: Thu, 26 May 2022 10:46:50 +1000 [thread overview]
Message-ID: <20220526104650.73fc943f@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1383 bytes --]
Hi all,
Today's linux-next merge of the ceph tree got a conflict in:
fs/ceph/caps.c
between commit:
713423282ae1 ("netfs: Fix gcc-12 warning by embedding vfs inode in netfs_i_context")
from the fscache tree and commit:
3ffa9d6f991f ("ceph: replace usage of found with dedicated list iterator variable")
from the ceph 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.
--
Cheers,
Stephen Rothwell
diff --cc fs/ceph/caps.c
index a0467bca39fa,bf2e94005598..000000000000
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@@ -3181,11 -3202,10 +3202,10 @@@ void ceph_put_cap_refs_no_check_caps(st
void ceph_put_wrbuffer_cap_refs(struct ceph_inode_info *ci, int nr,
struct ceph_snap_context *snapc)
{
- struct inode *inode = &ci->vfs_inode;
+ struct inode *inode = &ci->netfs.inode;
- struct ceph_cap_snap *capsnap = NULL;
+ struct ceph_cap_snap *capsnap = NULL, *iter;
int put = 0;
bool last = false;
- bool found = false;
bool flush_snaps = false;
bool complete_capsnap = false;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2022-05-26 0:47 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20220526104650.73fc943f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dhowells@redhat$(echo .)com \
--cc=idryomov@gmail$(echo .)com \
--cc=jakobkoschel@gmail$(echo .)com \
--cc=jlayton@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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