All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Anna Schumaker <Anna.Schumaker@Netapp.com>,
	Trond Myklebust <trondmy@gmail.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Christoph Hellwig <hch@lst.de>, Kairui Song <kasong@tencent.com>,
	NFS Mailing List <linux-nfs@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the nfs-anna tree with the mm-stable tree
Date: Mon, 15 Jul 2024 06:13:06 +0200	[thread overview]
Message-ID: <20240715041306.GA2229@lst.de> (raw)
In-Reply-To: <20240715114759.16a86e78@canb.auug.org.au>

Thanks Stephen,

the fix looks good.

Anna, given that the commit is near the head of your branch I can
resend (or you can just fix up directy) to use folio_pos instead of
folio_file_pos to avoid the harder to fix part of the conflict.


      reply	other threads:[~2024-07-15  4:13 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-15  0:58 linux-next: manual merge of the nfs-anna tree with the mm-stable tree Stephen Rothwell
2024-07-15  1:47 ` Stephen Rothwell
2024-07-15  4:13   ` Christoph Hellwig [this message]

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=20240715041306.GA2229@lst.de \
    --to=hch@lst.de \
    --cc=Anna.Schumaker@Netapp.com \
    --cc=akpm@linux-foundation.org \
    --cc=kasong@tencent.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linux-nfs@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=trondmy@gmail.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.