Message ID | 20221014091146.6e5c71c8@canb.auug.org.au |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp505944wrs; Thu, 13 Oct 2022 15:23:22 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5zFaXRlUEKo/DBvVPwcKrn7LsHs0LBBOztW+Gef7Xc5BqUJJB9dSHzm6CcLt0kHK/SoOHA X-Received: by 2002:a17:902:cec9:b0:178:1da5:1075 with SMTP id d9-20020a170902cec900b001781da51075mr1952556plg.136.1665699801690; Thu, 13 Oct 2022 15:23:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665699801; cv=none; d=google.com; s=arc-20160816; b=MmVYpaGC0hKJkNmgXjIayZ9E7gM+G4vNksuRgISdwUUAq4HPEHr975LEsbRMOYMIzE ATZ9oP6jXv0dTldXMmXO2WmBeshVJe3tUJQkzltuA8rUyAf2OpZjtvP185Bd70FICkx+ Ela07qy2c6khuBa+36e5qKVnvpVtf95KSJ2lOo+mb4UC/iM6IiLnqr8zyjqjopmCejkV 9AKNEvJhy3JABq7A826z3UGQgCmQ7lSTfHVX1+pisrGaxZ4nAUPbFAxvpVH4R6F16NTk IKYDh62E024P/vtTeL6hycqTy7z9iNhg4uDCF+uJo+sbbqp8OlI/kuYoB9bLiWdaLBys B3tQ== 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=i+mX7jV1B0D9yOrXhGL0NkOVW598hkTqpVEzYb1LcFI=; b=NhWyIBmQkwYHcgEA6vCl6r7DzGgP3YvLbEcuedQ02kScPx0mwxNz4Qm5Dc4sFFsBcZ B1D3Gk4JjuM3BeCXZGbTTflb4y55EpwUdLbcnmrpJ/QK8LFKApBK1oH63tVZ6NB6JKJY 7hDZopJT9sYy16Nz6Rme5+Ztb700IGTQRdL2BmTtdGJBO4AVyywKMKcGPRVxngTm+kVk TiW5M2/c9DHcmIGUZlEeTzyAJZ3VS5rcbTNuxeD533+13Pdf/FIFd5qDpRWuZ8WUO5GA J/VMURTMA1Xl6qGXq3zk4yy+oYmUQvDKNODUExXshkYfz7E7nH5oy0gyeS4Ehj7RPQc3 /5NA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=oRPcsGo0; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id mp8-20020a17090b190800b002057a08d66asi753049pjb.23.2022.10.13.15.22.44; Thu, 13 Oct 2022 15:23:21 -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=oRPcsGo0; 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 S229701AbiJMWMs (ORCPT <rfc822;ouuuleilei@gmail.com> + 99 others); Thu, 13 Oct 2022 18:12:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36208 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229462AbiJMWMq (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 13 Oct 2022 18:12:46 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 857C3186D6D; Thu, 13 Oct 2022 15:12:43 -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 4MpP033bSXz4wgr; Fri, 14 Oct 2022 09:12:35 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1665699158; bh=i+mX7jV1B0D9yOrXhGL0NkOVW598hkTqpVEzYb1LcFI=; h=Date:From:To:Cc:Subject:From; b=oRPcsGo0ebqIjRDcowUiDp+krwMf38lKkNqsgZtHiKWIn369RzIzeEN/rHSL7jmO/ CX4P18Zshm4th+4UCSf5g3SScA1zELKjpOHMFCRKdEeKbytxTBFv6Id9EGwQdzU7mN yjL9WHp63NrZKlMghzuPqPWaGmFf2+Q8838MQQgW0GukP+XUZeR5Vjf3OcgcwgeVWs v4lu/63DVgEobZch0VUik1IhUaCpnFVRbakfeegSRGqGWoETI7Nmv5YW5ExZWa84yg hGjpP9WRA1ceS4G6lPmLULqobU5pns3MpXPROBUavVrrJ9Ap/qgQUyIcgD3kFhHxgJ udsEln8oLznKw== Date: Fri, 14 Oct 2022 09:11:46 +1100 From: Stephen Rothwell <sfr@canb.auug.org.au> To: Palmer Dabbelt <palmer@dabbelt.com>, Paul Walmsley <paul@pwsan.com> Cc: Andrew Morton <akpm@linux-foundation.org>, Jisheng Zhang <jszhang@kernel.org>, "Liam R. Howlett" <Liam.Howlett@oracle.com>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org>, Palmer Dabbelt <palmer@rivosinc.com> Subject: linux-next: manual merge of the risc-v tree with Linus' tree Message-ID: <20221014091146.6e5c71c8@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/bigP7HqE3vsNCRjg5k2J1US"; protocol="application/pgp-signature"; micalg=pgp-sha256 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 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746612835431280365?= X-GMAIL-MSGID: =?utf-8?q?1746612835431280365?= |
Series |
linux-next: manual merge of the risc-v tree with Linus' tree
|
|
Commit Message
Stephen Rothwell
Oct. 13, 2022, 10:11 p.m. UTC
Hi all, Today's linux-next merge of the risc-v tree got a conflict in: arch/riscv/kernel/vdso.c between commit: 9b580a1d60de ("riscv: use vma iterator for vdso") from Linus' tree and commit: a8616d2dc193 ("riscv: vdso: fix NULL deference in vdso_join_timens() when vfork") from the risc-v 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/riscv/kernel/vdso.c index 692e7ae3dcb8,4abc9aebdfae..000000000000 --- a/arch/riscv/kernel/vdso.c