From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BBC4FC433E0 for ; Wed, 12 Aug 2020 06:53:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A1FF62076B for ; Wed, 12 Aug 2020 06:53:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726673AbgHLGxR (ORCPT ); Wed, 12 Aug 2020 02:53:17 -0400 Received: from mx2.suse.de ([195.135.220.15]:40748 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726255AbgHLGxR (ORCPT ); Wed, 12 Aug 2020 02:53:17 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id D4E89AB71; Wed, 12 Aug 2020 06:53:37 +0000 (UTC) Received: by ds.suse.cz (Postfix, from userid 10065) id D56A8DA81B; Wed, 12 Aug 2020 08:52:14 +0200 (CEST) Date: Wed, 12 Aug 2020 08:52:14 +0200 From: David Sterba To: Qu Wenruo Cc: linux-btrfs@vger.kernel.org, Jungyeon Yoon Subject: Re: [PATCH v4 0/4] btrfs: Enhanced runtime defence against fuzzed images Message-ID: <20200812065214.GX2026@twin.jikos.cz> Reply-To: dsterba@suse.cz Mail-Followup-To: dsterba@suse.cz, Qu Wenruo , linux-btrfs@vger.kernel.org, Jungyeon Yoon References: <20200812060509.71590-1-wqu@suse.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200812060509.71590-1-wqu@suse.com> User-Agent: Mutt/1.5.23.1-rc1 (2014-03-12) Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org On Wed, Aug 12, 2020 at 02:05:05PM +0800, Qu Wenruo wrote: > v4: > - Remove one patch which is already merged > A little surprised by the fact that git can't detecth such case. I've looked at it and that's a normal patch from git perspective, there's not even a conflict in the context, you're adding a new hunk. That it's the same one that's a few lines below is caused by intermediate changes, but that's what happens with any other patch.