From patchwork Tue Jun 13 05:10:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 107090 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp316172vqr; Mon, 12 Jun 2023 22:27:52 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ40HZBFDl2iStgdqCAiuptl3bDf7iJE7kdhkSTWtg9YMx5dRoSzBQf9xhxQ0D69hIrh7c0q X-Received: by 2002:a05:6a00:2d24:b0:665:bd58:c934 with SMTP id fa36-20020a056a002d2400b00665bd58c934mr1328261pfb.8.1686634071641; Mon, 12 Jun 2023 22:27:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686634071; cv=none; d=google.com; s=arc-20160816; b=wTkJAxLP+gxR246rJVBjJz8LBhYJO4t6WHAo0YdS5UHGIch3c3zNFh/c5NDbZFb0DX XRIGBF0Wet7ukhPkacFIeCE01Tt8WloUyj+/0TG0T3WTS4O0dO/8CUqmFQQ8wkwscUoF ki2jJaFKsIT/2VIvZy0uElxOIIGquRL5VCOwOcYw74Jru0ggw3b8ktJ6fzDgqj1DUS/v kuaGSXSePGcClLlt4bAUcAwwDXaLe4//QBeOFCnkRQAF0u35noc3Btg4Nd4G94pxi5Lq ZJu4VvBaoY8YMUufS3CSFhyyZmiUuspwxDWWjWk6SYus6ATJTR1GsZKd6id+kvLsbUSm QxIg== 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=gS8ZgeG/D1C4ve6OwfzP8KEIIec23uK77blgMCsGrYw=; b=h/qcfeaEygTrF3fwgcqcL9B3GulwVowB/DreGObLP7cpy1pDNoNikVcALiMxA5QSOZ oo0Ya3ZZ48wQJbnNDID6xEh1qUWWxyHxfPIrlhR3G76VZDmpMLjZTbCKlHumqDk9WMgJ b/LBv7aOWtrzbZxMelA2haDNzE/wi3CqOptCyvEs9Xyg59h2sndwmSA0qlBrUYtWW/+7 A4RDDm2zYnvRcxDgP2eZASCyTR46MhRXgT6MtKq8ebMQINFaRvc7aPqoufV6FauY1yYo /wV94syu1AelGBefLUq8ypqvbm7jbIfuPVJz+ymJRCtViqEJYYX28zi8fGuettmunz6g gHGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="XPwh/mVb"; 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 v123-20020a626181000000b0064d6a514682si7937747pfb.366.2023.06.12.22.27.38; Mon, 12 Jun 2023 22:27:51 -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="XPwh/mVb"; 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 S239929AbjFMFKV (ORCPT + 99 others); Tue, 13 Jun 2023 01:10:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232951AbjFMFKT (ORCPT ); Tue, 13 Jun 2023 01:10:19 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 088C5138; Mon, 12 Jun 2023 22:10:17 -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 4QgGpB6jTDz4x4F; Tue, 13 Jun 2023 15:10:10 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1686633011; bh=gS8ZgeG/D1C4ve6OwfzP8KEIIec23uK77blgMCsGrYw=; h=Date:From:To:Cc:Subject:From; b=XPwh/mVbl9Cf7Eqk1skPZjZM9y0POt3mFK4facadGxtXq5BIdv7Co28S/LtO3uvSC GpYfGHgvpDY+zv1E54CdcUOAySL3dLJannqpQjWAp6WCSIv2s5XrSIOHr5nlnEfPm6 FXyyKk95MG9rk3+rY6XtXm5okR2KOkgCjA0eJ6FK1VOEpuzLAOAgM3kWnRivwg+NIO HX9GN7mJ6ZpLOEj8cuZxQs4XGmtgiCFugAvJBD/u4wKlYb/gieYg4UcWRnoI1X4agr TVFNjgKep+OXlJrGyRwps9Wcv1cJZbyXBLGcKDufHOYDrW3Mx6Edk+Ky28ExOMTyNY QznVwGyh92ylg== Date: Tue, 13 Jun 2023 15:10:08 +1000 From: Stephen Rothwell To: Vlastimil Babka , Thomas Bogendoerfer Cc: Linux Kernel Mailing List , Linux Next Mailing List , Paul Cercueil Subject: linux-next: manual merge of the slab tree with the mips tree Message-ID: <20230613151008.28167567@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,URIBL_BLOCKED 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?1768564008315589449?= X-GMAIL-MSGID: =?utf-8?q?1768564008315589449?= Hi all, Today's linux-next merge of the slab tree got a conflict in: arch/mips/configs/ci20_defconfig between commit: e94c1e492139 ("MIPS: configs: CI20: Regenerate defconfig") from the mips tree and commit: eb07c4f39c3e ("mm/slab: rename CONFIG_SLAB to CONFIG_SLAB_DEPRECATED") from the slab tree. I fixed it up (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 arch/mips/configs/ci20_defconfig index 920b27977dac,28eb15a1ffc4..000000000000 --- a/arch/mips/configs/ci20_defconfig