From: David Howells <dhowells@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: dhowells@redhat.com, Matthew Wilcox <willy@infradead.org>,
"Vishal Moola (Oracle)" <vishal.moola@gmail.com>,
Andrew Morton <akpm@linux-foundation.org>,
Steve French <smfrench@gmail.com>,
Steve French <stfrench@microsoft.com>,
Shyam Prasad N <nspmangalore@gmail.com>,
Rohith Surabattula <rohiths.msft@gmail.com>,
Tom Talpey <tom@talpey.com>, Paulo Alcantara <pc@cjr.nz>,
Jeff Layton <jlayton@kernel.org>,
linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-next@vger.kernel.org
Subject: Re: linux-next: manual merge of the mm-stable tree with the cifs tree
Date: Wed, 22 Feb 2023 08:27:50 +0000 [thread overview]
Message-ID: <3325858.1677054470@warthog.procyon.org.uk> (raw)
In-Reply-To: <20230222134927.459b036b@canb.auug.org.au>
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> OK, so in the merge of mm-stable, I used the cifs version of
> fs/cifs/file.c with this patch applied. The merge resolution for that
> file looks like this:
I checked it out and diffed it against mine. Looks right, thanks!
David
next prev parent reply other threads:[~2023-02-22 8:28 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-20 4:29 linux-next: manual merge of the mm-stable tree with the cifs tree Stephen Rothwell
2023-02-20 13:58 ` Matthew Wilcox
2023-02-20 8:01 ` Stephen Rothwell
2023-02-20 20:58 ` Matthew Wilcox
2023-02-21 6:44 ` Stephen Rothwell
2023-02-21 7:19 ` David Howells
2023-02-21 7:42 ` Stephen Rothwell
2023-02-21 14:39 ` David Howells
2023-02-21 14:55 ` Matthew Wilcox
2023-02-21 15:05 ` David Howells
2023-02-21 15:26 ` Matthew Wilcox
2023-02-21 15:20 ` David Howells
2023-02-21 15:30 ` Obsolete comment on page swizzling (written by Hugh)? David Howells
[not found] ` <2890066.1676993700@warthog.procyon.org.uk>
2023-02-21 22:41 ` Hugh Dickins
2023-02-22 2:49 ` linux-next: manual merge of the mm-stable tree with the cifs tree Stephen Rothwell
2023-02-22 8:27 ` David Howells [this message]
2023-02-22 12:13 ` Stephen Rothwell
2023-02-20 21:00 ` Steve French
2023-02-21 6:50 ` Stephen Rothwell
2023-02-20 14:29 ` David Howells
2023-02-20 15:12 ` Matthew Wilcox
2023-02-20 8:05 ` Stephen Rothwell
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=3325858.1677054470@warthog.procyon.org.uk \
--to=dhowells@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=jlayton@kernel.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nspmangalore@gmail.com \
--cc=pc@cjr.nz \
--cc=rohiths.msft@gmail.com \
--cc=sfr@canb.auug.org.au \
--cc=smfrench@gmail.com \
--cc=stfrench@microsoft.com \
--cc=tom@talpey.com \
--cc=vishal.moola@gmail.com \
--cc=willy@infradead.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).