13 Aug
2021
13 Aug
'21
12:21 p.m.
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...