From patchwork Mon Jun 19 04:03:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 109723 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2768683vqr; Sun, 18 Jun 2023 21:25:02 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4MtMfGHyrKBatWvWAPSRSpLVQlhcHLkE6yo8wXIcjoyXbRvP4dWL7x7LfmC1t/VkUJE6e5 X-Received: by 2002:a17:903:1251:b0:1b2:5070:c1d5 with SMTP id u17-20020a170903125100b001b25070c1d5mr8949896plh.13.1687148702407; Sun, 18 Jun 2023 21:25:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687148702; cv=none; d=google.com; s=arc-20160816; b=LFavn5QvwZ/X8MyHeolroVSc08iGBGr/2GTkH/EyEH8fO5UTEFG8TH5ICJs8NP/EEa 8GNoGhXsJEhvG9aOiJrdrluxMDGzSTEbZWKRWKb3fFWOhwjcK5dmJyS0IiLQzvqWKjEN J1xzX4LfkumsPGUGxwDiOvcAyiYH4Gd1UbTakfgUhSzvrMiYrfqEWSFWIylZGTHyJEOf mvZeCSBoT782w4ykADuLMMCqgQh2oJJ0rmfakXx1Dnhc1qPuu47VNzAkzdoIuiHFDd2z ZqWbftwcSQ9cgbiXdBZNLqVw76LV5mSaPtuqJHX3Gclaf1oynZa4PBvUb0ahEJq9hO/9 Ll6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=TVJKR0fHhUqXJ3TbbCvXJXNSGk8DOs9SSkTVMI7js44=; b=mf12fbnI6PVbXhMRPn9beL6CcH94k5XSwvRca+sPIiLS2Cs+MGONJhJ+QuNW0TX5Yn n0tiZAksbGR5NLhGnzBcEvqN5RMVm+vtg77brbQmUcW6KJlQIvUm8QaN3txseMDTgIEY ryAeOQxS77QZEJVFWAGqA5ZfEkvZXamf/qWoTlJECfN0SyrDUzLTEFG5ZVRExh0CcxSt Isd+NMfNuDgKq6P9fiUa2Vq6HpjjgY2bID+osOvfZBLsWDDqo2ZIeLHQZyC+1PR+W5Wf 13AK+xZMpCWh5lpAxsqXk3FFXkb8VZgASF8DKVjeDiNJ4+CVPLNS6xrdiBWaEcXE51YR tsyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=RRsL5Hs+; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p12-20020a170902e74c00b001a9b4bda723si17423422plf.421.2023.06.18.21.24.49; Sun, 18 Jun 2023 21:25:02 -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; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=RRsL5Hs+; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229636AbjFSEDj (ORCPT + 99 others); Mon, 19 Jun 2023 00:03:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229456AbjFSEDh (ORCPT ); Mon, 19 Jun 2023 00:03:37 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F138FF; Sun, 18 Jun 2023 21:03:35 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Qkx2W7293z4wg8; Mon, 19 Jun 2023 14:03:31 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1687147412; bh=TVJKR0fHhUqXJ3TbbCvXJXNSGk8DOs9SSkTVMI7js44=; h=Date:From:To:Cc:Subject:From; b=RRsL5Hs+voOIPw2EbO1s+QfDR3X6tnQa8lp51qQl3AKX+O1vtEK/gBNFz2D3XEIkq r7+4QUsrPUPVobpg6yMoAFxehufDDI/L4apLtj/XOxZp0TX9egxrK4wNl5niE+n+Gc iqQMgyg2xQCoHuBQ/IhKNYIKIckYzmx+t17kCDbDw/h3NNyf81+4NdYWLdW753eBw7 of5tZHLX/eaL3PrPmh21PBGxZuEXUJPmK8/wzypx8dXBy0bMqzudqfGAvVOECzdVAs O+D0c24KTrR4RiP//USvQ/yRJyu0oASDeOOjytCMj3Mbjz1bvat+BI0wpXedFfVjwb VrJsyxJwL1clQ== Date: Mon, 19 Jun 2023 14:03:30 +1000 From: Stephen Rothwell To: Vlastimil Babka , Andrew Morton Cc: Catalin Marinas , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the slab tree with the mm tree Message-ID: <20230619140330.28437ac3@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769103638022589299?= X-GMAIL-MSGID: =?utf-8?q?1769103638022589299?= Hi all, Today's linux-next merge of the slab tree got a conflict in: mm/slab_common.c between commits: fef594ee7142 ("mm/slab: simplify create_kmalloc_cache() args and make it static") 6e6f174b6eda ("mm/slab: limit kmalloc() minimum alignment to dma_get_cache_alignment()") from the mm tree and commit: d5bf48574699 ("mm/slab_common: use SLAB_NO_MERGE instead of negative refcount") from the slab tree. I fixed it up (I think - see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc mm/slab_common.c index 43c008165f56,90ecaface410..000000000000 --- a/mm/slab_common.c