Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp4546261imm;
        Wed, 30 May 2018 07:35:49 -0700 (PDT)
X-Google-Smtp-Source: ADUXVKJ39Q4s0WsFRkPaHA39VTtJGAagbehhNGq6EqM6mnMzTtLC1njgQMv0cgDzaYxk5hyapx5t
X-Received: by 2002:a63:9a02:: with SMTP id o2-v6mr2412210pge.439.1527690949726;
        Wed, 30 May 2018 07:35:49 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1527690949; cv=none;
        d=google.com; s=arc-20160816;
        b=XLpiPegfnalv5xyHjNI+HFj/W9+8YMXwsqw/KPjHZwyDLsjrvoypGWaLxryB4U7Ws2
         +rHXKzD8Sb62W8eyfUvKJoya598ULi8pbe+k33BuLv0TC6rjY713gV4wHbn3A9xJtMmx
         0KQqgzHmo4M2nkduv7pMWX0WhRiggQC3MvaWAaRvpyhn8+zyfzFoiXdPISc9HdAJ0MVK
         7f5JQsvg00soVmclc5B6upJT1+FEu1bdjYj8FmsbeER57cDQ2UEpM8mRpf+JhFwQ3yvP
         yE3q+TrbWX8dgo4pM0/W5KLfwOVMuBB/I+dadXQCRPU3SwWuGp/ey468HImD5+bvF2ij
         uwbA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
        h=list-id:precedence:sender:content-transfer-encoding
         :content-language:in-reply-to:mime-version:user-agent:date
         :message-id:from:references:cc:to:subject:dkim-signature
         :arc-authentication-results;
        bh=BO6RRZbK74CvKdbqgOhte9ixOIFkhXpx0on1ySVNrY0=;
        b=oJFRIinUMo3s9/1MlA7cH7ET3Y0fg+BoQlXLvXLPCEbpgROjcdVeByHxyvpWJzCj8M
         bixCaxk1YO78rSp+tj915TAhef7fc2hg1DPYtu+Qv0rf27aEuQDJDi1uOOiW/G0BfrF6
         QuVAYwrQrqRg3rV/lfPK/fObbxAT2FQ6berLtBapYfFaeAhWvHbi+a2D2MxljNS9LzNS
         H34nUvXxXcULBV6S1VYW8bZd0Wik6W8tDPshl1z8Nsry40xpUM0T2Hn4yI2eD2wjW5JD
         YAz2UOrMetE/wcheUOEDqrjVBYYLm0KvCOwFmAiBYENkIxh0qlREYqj3L0361YIozU1j
         hM+Q==
ARC-Authentication-Results: i=1; mx.google.com;
       dkim=pass header.i=@kernel.org header.s=default header.b=Q8y+hZbH;
       spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
       dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67])
        by mx.google.com with ESMTP id s88-v6si35047539pfe.290.2018.05.30.07.35.35;
        Wed, 30 May 2018 07:35:49 -0700 (PDT)
Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Authentication-Results: mx.google.com;
       dkim=pass header.i=@kernel.org header.s=default header.b=Q8y+hZbH;
       spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
       dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1753751AbeE3Oep (ORCPT <rfc822;fezhang.suse@gmail.com>
        + 99 others); Wed, 30 May 2018 10:34:45 -0400
Received: from mail.kernel.org ([198.145.29.99]:39494 "EHLO mail.kernel.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1753454AbeE3Oem (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 30 May 2018 10:34:42 -0400
Received: from [192.168.0.101] (unknown [49.77.239.126])
        (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
        (No client certificate requested)
        by mail.kernel.org (Postfix) with ESMTPSA id CCE722086A;
        Wed, 30 May 2018 14:34:39 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
        s=default; t=1527690882;
        bh=YCcpCAmRFTGDizUGXRCyFIdypW5v6n1pNfxog9ee9zg=;
        h=Subject:To:Cc:References:From:Date:In-Reply-To:From;
        b=Q8y+hZbHH565GsO+OYwPMAr3Y50rS+Mip/i5o2K3NsqvqDlx8oNeT3RqJ5giy2doa
         Ehsfx7Y8oQWRB7hwUFG49pAxA55/DwFvQGHsNfu94FX2JLymvSOSI5uyGy8cxIBKEX
         cS00DBzsf8jgnOaawe6oqRhzA50yp6LdNvttLSNg=
Subject: Re: [PATCH] f2fs-tools: do not ignore *.rej in git
To:     Yunlong Song <yunlong.song@huawei.com>, jaegeuk@kernel.org,
        yuchao0@huawei.com, yunlong.song@icloud.com
Cc:     miaoxie@huawei.com, bintian.wang@huawei.com, shengyong1@huawei.com,
        heyunlei@huawei.com, linux-f2fs-devel@lists.sourceforge.net,
        linux-kernel@vger.kernel.org
References: <1527664249-147982-1-git-send-email-yunlong.song@huawei.com>
From:   Chao Yu <chao@kernel.org>
Message-ID: <1ace47d8-14ac-152a-fbcc-83a8cbe793f1@kernel.org>
Date:   Wed, 30 May 2018 22:34:08 +0800
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101
 Thunderbird/52.8.0
MIME-Version: 1.0
In-Reply-To: <1527664249-147982-1-git-send-email-yunlong.song@huawei.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 2018/5/30 15:10, Yunlong Song wrote:
> When using git apply --reject to resolve the conflicts, we should better
> see all the *.rej clear, or we will miss merging some *.rej patches.
> 
> Signed-off-by: Yunlong Song <yunlong.song@huawei.com>

Reviewed-by: Chao Yu <yuchao0@huawei.com>

Thanks,