Received: by 2002:a05:6a10:8a4d:0:0:0:0 with SMTP id dn13csp739041pxb;
        Fri, 13 Aug 2021 05:24:32 -0700 (PDT)
X-Google-Smtp-Source: ABdhPJxEJ5b9ABFrehGxbPWI8L10+s+5mj2nfzY5btBLab2XFOwT1DXVZRctH3Gt+FbN6dtjyRR4
X-Received: by 2002:a17:906:85cc:: with SMTP id i12mr2096878ejy.405.1628857472284;
        Fri, 13 Aug 2021 05:24:32 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1628857472; cv=none;
        d=google.com; s=arc-20160816;
        b=UTfcsjoBYwuNTHuHsXEdZYQA2/P2lBSkD6/XgME+plrPdpyF6GdtBiNdGVcAqKWVhD
         EEKoVTxTwJddd98Mlg1osepwAUBCW2FQBF/D8CjTywy0JJJxqUVb10WIN/ZiqTq8ol0z
         RuFRwzd1g47UZ24Qr9LvVMfaaWns6BvfpBpGSCCF2xE8Ofk3vdeahhWgDkRfnPQC7fcG
         PQxMe60X27/r7Vb56o4jTzDslt8v4rspIURgWnkJg56uTJ5m5hqUcdKXHt5MgRYf3Ay2
         z2QhnkYyMbz9OZqzQrE1xLubGKoXkGUWSGcVmbla9gxmEuJ5lnszi7J1SIlhKZoN7jyI
         YnUg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
        h=list-id:precedence:in-reply-to:content-disposition:mime-version
         :references:message-id:subject:cc:to:from:date:dkim-signature;
        bh=mSmE86s3H1IuM2i8FKu9wn+dtyUu8ULv4USOqVF/JwQ=;
        b=Q5J4Z5B2i9zFkRQsXmFwtMvcRxl9Sb4jCNYZ6AX9LO0NVSVcV+0T8gm7+zX0Lv3OnA
         ubyWWswWpGGHQR+RSqTziPD0QkVAiT9jIAvkaqUQgDrFukSJFFpMf+Dji5xWfk44a5En
         StvJ5DSx282703E0GFs1zrhcxGcqfD9FeAhVzRSshG2ryFepU70lmat2pEF6nwnX2jFr
         QVmF+EIMf8xcIaAFJ+xPASyoS15PH5fRjf5rYRdvJ233pAQT5aDAd4FFNCH4dtzZuLmK
         oMxE72TOxd4O7PO5DgCgV26dC5eIOmWQAmDd0ozqLOZVlSt+dYeTo38jum+Bv4U3ocl6
         XWkg==
ARC-Authentication-Results: i=1; mx.google.com;
       dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=SRq5Zy5U;
       spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
       dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18])
        by mx.google.com with ESMTP id kx11si1564950ejc.554.2021.08.13.05.24.08;
        Fri, 13 Aug 2021 05:24:32 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Authentication-Results: mx.google.com;
       dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=SRq5Zy5U;
       spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
       dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S240466AbhHMMWA (ORCPT <rfc822;lishoy@gmail.com> + 99 others);
        Fri, 13 Aug 2021 08:22:00 -0400
Received: from mail.kernel.org ([198.145.29.99]:54052 "EHLO mail.kernel.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S240455AbhHMMV7 (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Fri, 13 Aug 2021 08:21:59 -0400
Received: by mail.kernel.org (Postfix) with ESMTPSA id 8EE0A60F00;
        Fri, 13 Aug 2021 12:21:32 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org;
        s=korg; t=1628857293;
        bh=ZhfFwXuesXGdt1/e9LvTpBXt1NX3V5RBx9BA1t8YokE=;
        h=Date:From:To:Cc:Subject:References:In-Reply-To:From;
        b=SRq5Zy5Uip6yzubkgCW2cZ81zKdO9i2E1acrxf5FCOOyaetDKF+DRG/yP7fuunZJO
         7OQ733ZrPynBp4RLiMhI7Fksi4h0PV3OpGpf2R5QkwS1Gq1DjQpcWzs2X2HlWw17vj
         /Zec0jzaMVGu8KeZbcQas+NURDSYaFTkV6nqHaIY=
Date:   Fri, 13 Aug 2021 14:21:30 +0200
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
Message-ID: <YRZjynr7gKodWEFC@kroah.com>
References: <cover.1628854236.git.anand.jain@oracle.com>
 <4cdae9f94a8feae8f848574c214016ae6a923078.1628854236.git.anand.jain@oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <4cdae9f94a8feae8f848574c214016ae6a923078.1628854236.git.anand.jain@oracle.com>
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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...