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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F879EB64D8 for ; Fri, 16 Jun 2023 16:07:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229470AbjFPQHm (ORCPT ); Fri, 16 Jun 2023 12:07:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229518AbjFPQHk (ORCPT ); Fri, 16 Jun 2023 12:07:40 -0400 Received: from mail-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 30C27269E for ; Fri, 16 Jun 2023 09:07:39 -0700 (PDT) Received: by mail-io1-xd34.google.com with SMTP id ca18e2360f4ac-77dcff76e35so4747739f.1 for ; Fri, 16 Jun 2023 09:07:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20221208.gappssmtp.com; s=20221208; t=1686931658; x=1689523658; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=lBiz/Mt5xWYRFji0Ec1DEEBKtDnpmQmcZ7A3+2PxUAM=; b=fseNIKgGtGh/yQpHAf7O0q1/PqxDuAyDIjFrgrZHnQ2iu7jD8UZjnjtcHHG+GvMemZ C8u4Z6BfJ4oKB005waeqrzvWXol32cpK221xxlxLCJYz1Jfqk0e5zuK5s/vC1FxqHSkj UHQhmBXvy3K4ZZ3IXHZmCDJkgKT2J0Q+BOj4xK2wenDvuyqDDsZX3oxqG/2AYTs338u3 DFF5IZP2oMNi3MBosSoZDCOp8AJqBKdc2LDBM2AJ2lXk7g2II29M6H74Vdm6Bm86fkRi OkY4D3uRVtkAt/fK51v7m9G21RygdwsPlBoXBAdG0DrYHthIycpKhMB16OHLkyNvzM/t yG9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686931658; x=1689523658; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=lBiz/Mt5xWYRFji0Ec1DEEBKtDnpmQmcZ7A3+2PxUAM=; b=Gs7RM6Rz2nygTSG6W3l2k7/quuLiB93y7L8DH7/OWuaO1UGTJ3okpp3p6qDA/cvMJk cdezj3aw7v8roiqHhCL2N/LeopSquI14yrAXVhZ9Zu8LIfLoOUVi+rlEEAFHPVTZCmSq 1q36XedaiQwp6jHfIXgQ0Ximu/SAMA/Ua381oZCal4x9YuObPoJk1IMIn/E5Seb3mM+I gihaSwcyPNhFRVvLwGcip5YiStodjOv+riO1r0qcbAdILoNUxjVxR5IwO7LKnNjCOXIb Yc47f58ICDCuk8V1Gx1PySp945xcmXbH5cBzkIBVn2iaV6TKeYiGeA7GY5rkHOG19FTA Yn0w== X-Gm-Message-State: AC+VfDw8GlLIpd9zQAO8MmwSLWQ77xzxRX8Yr8wf9ZtEwZwJ9dRWE3aX 68j862FhXa503RVFZ7OkNCmUQA== X-Google-Smtp-Source: ACHHUZ4ykMsGxl3b0JpxqzrQSJ0WPNS/m1X/Lg9u0n4XlXZ7r1WDBYg03nhOe2qA3mZ/h4hM5qI/VQ== X-Received: by 2002:a6b:b744:0:b0:77e:23a7:c9eb with SMTP id h65-20020a6bb744000000b0077e23a7c9ebmr92463iof.0.1686931658573; Fri, 16 Jun 2023 09:07:38 -0700 (PDT) Received: from [192.168.1.94] ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id ed13-20020a056638290d00b004161870da90sm6387967jab.151.2023.06.16.09.07.37 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 16 Jun 2023 09:07:37 -0700 (PDT) Message-ID: Date: Fri, 16 Jun 2023 10:07:36 -0600 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux aarch64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: Re: linux-next: manual merge of the block tree with the mm tree Content-Language: en-US To: David Howells , Andrew Morton Cc: Stephen Rothwell , Linux Kernel Mailing List , Linux Next Mailing List , "Vishal Moola (Oracle)" References: <20230615205014.8d7eb4457ca9bc676a79d2db@linux-foundation.org> <20230616115856.3ce7682c@canb.auug.org.au> <424129.1686909362@warthog.procyon.org.uk> From: Jens Axboe In-Reply-To: <424129.1686909362@warthog.procyon.org.uk> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On 6/16/23 3:56?AM, David Howells wrote: > Andrew Morton wrote: > >> That's getting a bit nasty. Maybe David's patches are in the wrong >> tree. > > You'd need to discuss that one with Jens. The patches you'd have to > transfer also touch a number of block-related files. Looking at > block/for-next, there don't seem to be many other patches touching > those files, but I've seen patches from Christoph that will need to be > applied on top of mine. It's definitely a bit of a mess now, but for-6.5/block also depends on these changes and make further tweaks on the block front. for-6.5/splice is stable, so just pull that in? -- Jens Axboe