From: Greg KH <gregkh@linuxfoundation.org>
To: Anand Jain <anand.jain@oracle.com>
Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org,
linux-btrfs@vger.kernel.org, fdmanana@suse.com,
Nikolay Borisov <nborisov@suse.com>,
David Sterba <dsterba@suse.com>
Subject: Re: [PATCH 2/3] btrfs: export and rename qgroup_reserve_meta
Date: Fri, 13 Aug 2021 14:21:30 +0200 [thread overview]
Message-ID: <YRZjynr7gKodWEFC@kroah.com> (raw)
In-Reply-To: <4cdae9f94a8feae8f848574c214016ae6a923078.1628854236.git.anand.jain@oracle.com>
On Fri, Aug 13, 2021 at 08:12:24PM +0800, Anand Jain wrote:
> From: Nikolay Borisov <nborisov@suse.com>
>
> commit 80e9baed722c853056e0c5374f51524593cb1031 upstream
>
> Signed-off-by: Nikolay Borisov <nborisov@suse.com>
> Reviewed-by: David Sterba <dsterba@suse.com>
> Signed-off-by: David Sterba <dsterba@suse.com>
> Signed-off-by: Anand Jain <anand.jain@oracle.com>
>
> Conflicts:
> fs/btrfs/qgroup.h
What is with the conflicts lines?
I'll edit them out, but be more careful next time please...
next prev parent reply other threads:[~2021-08-13 12:21 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-13 12:12 [PATCH stable-5.4.y 0/3] btrfs: backport hang fixes due to commit c53e9653605d Anand Jain
2021-08-13 12:12 ` [PATCH 1/3] btrfs: qgroup: don't commit transaction when we already hold the handle Anand Jain
2021-08-13 12:12 ` [PATCH 2/3] btrfs: export and rename qgroup_reserve_meta Anand Jain
2021-08-13 12:21 ` Greg KH [this message]
2021-08-13 12:12 ` [PATCH 3/3] btrfs: don't flush from btrfs_delayed_inode_reserve_metadata Anand Jain
2021-08-13 12:26 ` [PATCH stable-5.4.y 0/3] btrfs: backport hang fixes due to commit c53e9653605d Greg KH
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=YRZjynr7gKodWEFC@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=anand.jain@oracle.com \
--cc=dsterba@suse.com \
--cc=fdmanana@suse.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nborisov@suse.com \
--cc=stable@vger.kernel.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 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.