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 E193CEB64DA for ; Fri, 16 Jun 2023 09:56:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231140AbjFPJ4w (ORCPT ); Fri, 16 Jun 2023 05:56:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230016AbjFPJ4v (ORCPT ); Fri, 16 Jun 2023 05:56:51 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CCAEF2D54 for ; Fri, 16 Jun 2023 02:56:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686909373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=LRrap5sa/SGfzSyFM8C7uu+zlqlVKh+fF2QdwlihjcY=; b=Pw3CnRYcZ9GVWnQNO85+LBW6dY50/k7NaQmhxUiFk2hg6aS9VeHPvC5+TFRPKX0UxRPfr6 ag9qadR9XpuwRgyvxDZ1UEmB22mq+dgRF5tUCLfoHUd2H1QDtEkhHYQD8rarxUMkMcftvk eBAiKvtZA7m+FiLoTHczAM9+NX8QLNI= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-558-JeIIq2TmOLOvMpnKv8FXmQ-1; Fri, 16 Jun 2023 05:56:07 -0400 X-MC-Unique: JeIIq2TmOLOvMpnKv8FXmQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 719CF101A52A; Fri, 16 Jun 2023 09:56:07 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.42.28.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2508A40D1B60; Fri, 16 Jun 2023 09:56:06 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 From: David Howells In-Reply-To: <20230615205014.8d7eb4457ca9bc676a79d2db@linux-foundation.org> References: <20230615205014.8d7eb4457ca9bc676a79d2db@linux-foundation.org> <20230616115856.3ce7682c@canb.auug.org.au> To: Andrew Morton Cc: dhowells@redhat.com, Stephen Rothwell , Jens Axboe , Linux Kernel Mailing List , Linux Next Mailing List , "Vishal Moola (Oracle)" Subject: Re: linux-next: manual merge of the block tree with the mm tree MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <424128.1686909362.1@warthog.procyon.org.uk> Date: Fri, 16 Jun 2023 10:56:02 +0100 Message-ID: <424129.1686909362@warthog.procyon.org.uk> X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org 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. David