From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Steve French <smfrench@gmail.com>,
CIFS <linux-cifs@vger.kernel.org>,
David Howells <dhowells@redhat.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Steve French <stfrench@microsoft.com>
Subject: linux-next: manual merge of the cifs tree with the fscache tree
Date: Thu, 20 Jan 2022 09:43:28 +1100 [thread overview]
Message-ID: <20220120094328.1e7015cb@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 746 bytes --]
Hi all,
Today's linux-next merge of the cifs tree got conflicts in:
fs/cifs/file.c
fs/cifs/fscache.h
between commit:
a91e6e1c8074 ("cifs: Support fscache indexing rewrite")
from the fscache tree and commit:
70431bfd825d ("cifs: Support fscache indexing rewrite")
from the cifs tree.
I fixed it up (I just used the latter version) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-01-19 22:43 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-19 22:43 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-12-16 12:43 linux-next: manual merge of the cifs tree with the fscache tree broonie
2021-12-17 19:38 ` Steve French
2021-12-17 19:47 ` David Howells
2021-12-19 23:46 ` Stephen Rothwell
2021-12-02 22:41 Stephen Rothwell
2021-12-05 21:56 ` Stephen Rothwell
2021-12-07 21:12 ` David Howells
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=20220120094328.1e7015cb@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dhowells@redhat.com \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=smfrench@gmail.com \
--cc=stfrench@microsoft.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.