Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp1736645pxb; Fri, 25 Mar 2022 04:48:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxvCiwLcaZx8MKIcCIdjTLKUZL2JqC5KlZ7UYs1M2KZMImO7V9OoMLZdZEl3/a2SAJjHx8+ X-Received: by 2002:a17:907:3f86:b0:6db:b745:f761 with SMTP id hr6-20020a1709073f8600b006dbb745f761mr10656622ejc.610.1648208913580; Fri, 25 Mar 2022 04:48:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648208913; cv=none; d=google.com; s=arc-20160816; b=08B/jivJwThlCnoSqqHqlCNFUPIrq7JyOkOrb1m2UFHEz6y/rQizj/Wc8wLGwa5NMO Rw0ZxeBPmbRhW/0yiKdSPFgulSloMQCmC31wAx9RXcPftvoNeBw6B/wnVR3AyJTMDZGr +ni1LrKBeMFJyCLTabO7KiQkhpnsTTDjh+dy8doF9N/LzjYbY0i5rRxkiwA3zdNxOfip oTRTwcpjfAW3wbK2XOq0Xi6bdwwCEM5UCgS5SebuNFBBoU73YN8EN+NkX6HJvRpH3b5v G9xUFP7ke6jOQDm9x2TNGHLfVo8KYH/1e3yt0B1zAhlXKksBo+5rElybNZCrx0JomuKX qotA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:thread-index:thread-topic :content-transfer-encoding:mime-version:subject:references :in-reply-to:message-id:cc:to:from:date; bh=cqSppa/wIIYt+moo2mwQkRWZgIgKdE4UA6+NmSa9lec=; b=nV3rOGnuQwRicCuCsz7/tq0knWhwN6hbWzkpxiy/gRKTaCeSEYCgW9Lx+Yr2P09CRW +A28kfC65zHJK/mp0wc1kLKixfuMLQmZqiEhGjdsSpvbT535C45xgHk5YTxWIHbuDD3b rOmbA5FcFwtVIL41HkQQkYC/fMN5Ud3tA9pefVGYeRdVbLbOfxqAYuOF6BAy23+F1ggu m8lYENYnHEvw66h/JWDupRjW8mqfNu+O6JBDkgD7sFEOiFxYrjeRe5jKC3HYqpRUrVJU v+NcpEcyeX9b/gJNc8q0ScG2xshxoz8UGElCe7/AzfngBBBtjBfiVLSY4DZqfnxqskSV 4Byw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d21-20020a056402517500b00418e8ed6aacsi2400287ede.481.2022.03.25.04.48.08; Fri, 25 Mar 2022 04:48:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345200AbiCWWTc convert rfc822-to-8bit (ORCPT + 99 others); Wed, 23 Mar 2022 18:19:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235278AbiCWWTb (ORCPT ); Wed, 23 Mar 2022 18:19:31 -0400 Received: from lithops.sigma-star.at (lithops.sigma-star.at [195.201.40.130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EEEBB8FE5A for ; Wed, 23 Mar 2022 15:17:58 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by lithops.sigma-star.at (Postfix) with ESMTP id E3FC66081114; Wed, 23 Mar 2022 23:17:56 +0100 (CET) Received: from lithops.sigma-star.at ([127.0.0.1]) by localhost (lithops.sigma-star.at [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id 4-FDGu-sgWod; Wed, 23 Mar 2022 23:17:56 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by lithops.sigma-star.at (Postfix) with ESMTP id 949586081100; Wed, 23 Mar 2022 23:17:56 +0100 (CET) Received: from lithops.sigma-star.at ([127.0.0.1]) by localhost (lithops.sigma-star.at [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id hVRzrM2FeVZm; Wed, 23 Mar 2022 23:17:56 +0100 (CET) Received: from lithops.sigma-star.at (lithops.sigma-star.at [195.201.40.130]) by lithops.sigma-star.at (Postfix) with ESMTP id 70D0E605DEA9; Wed, 23 Mar 2022 23:17:56 +0100 (CET) Date: Wed, 23 Mar 2022 23:17:56 +0100 (CET) From: Richard Weinberger To: Stephen Rothwell Cc: Matthew Wilcox , linux-kernel , Linux Next Mailing List , chengzhihao1 Message-ID: <1214200498.178206.1648073876352.JavaMail.zimbra@nod.at> In-Reply-To: <20220324085653.4c4c5315@canb.auug.org.au> References: <20220315205259.71b4238a@canb.auug.org.au> <20220324085653.4c4c5315@canb.auug.org.au> Subject: Re: linux-next: manual merge of the folio tree with the ubifs-fixes tree MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT X-Originating-IP: [195.201.40.130] X-Mailer: Zimbra 8.8.12_GA_3807 (ZimbraWebClient - FF97 (Linux)/8.8.12_GA_3809) Thread-Topic: linux-next: manual merge of the folio tree with the ubifs-fixes tree Thread-Index: +v3+gZWbrfis+eeRRMLR6nh7swB4Kw== X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, T_SCC_BODY_TEXT_LINE,T_SPF_PERMERROR autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ----- Ursprüngliche Mail ----- > This is now a conflict between the ubifs-fixes tree and Linus' tree. Thanks for letting me know, I'll note this in my PR to Linus. Thanks, //richard