From patchwork Thu Jun 15 02:45:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 108241 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp359973vqr; Wed, 14 Jun 2023 19:58:40 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4AI7S6Cul8QJqUvfmh85EVak5nsLkQDXTVHEbXke5VIDu79ukdKTO3RPF5II/4wcifY/Wb X-Received: by 2002:a05:6a20:7fa3:b0:112:1e0d:14ae with SMTP id d35-20020a056a207fa300b001121e0d14aemr3801433pzj.7.1686797919816; Wed, 14 Jun 2023 19:58:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686797919; cv=none; d=google.com; s=arc-20160816; b=YFpPglD4t//k6jSaBrQ/VEOedisjROSizle60hhzzAr+I1dC1aVER18WjeatOxzS19 xpJwO5lsO+u/F0QekwkRBiWmndrd4SNBw2vkIdbSmZM6HI2asguXuehvHjQkmdvmqBQT XgZpldQiKEfFpkvycFisUOnap97LQ7tpVW1ZIU9m22WSKpkirIGvwjjtKy/RwHfix1yG dwJx9O9SPTdvVRzlQx9C3f14fcJEcL+V2rZhp1RTfQyDooXkp/pH4MPXA4VLgwCXws0/ 5mK60s66ouktXqqSRFH2ngf5yF2DaIbCLR2e84VQ7Lytm5k1v2NA/dgfFxCT6dLUJnys xUDA== 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=nKyzclnLPcWFjNYP7oi3eE77p75xY/56CGKsZnifZvg=; b=tTnw/MNy+2dS2/gUy5q0c7muYfphBF2GtDbR0OTkNvRLRg1Sxl6sK0nlxbcbaO0mE6 I80DzQCxdokDr5IZPLa22PLUoX5Ije5j4h4Uo01eXNmUkkQLW4iIXDLwRS1ClMoOjSpx JkUN1fiNjkS5VCkKi9Mg4F2eiP7CBjsJhRhlK0XHuAXcaUpg1A5jfODtQSQC86zWQA+S WaW38KrtQN628+F12qGM5xRUlebB8hFW4UeSeYQoY8cV+OkD2eloeQ4UimOSG73t9P/U 6PNFOYzK9N8rFXL4/adk2M53e2oHapb3DaWTyL79PzYBVTBO3nZnXx8HC/tIKZtfUaVn BZXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=FsF1vWY5; 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 i20-20020aa796f4000000b00647514cfd36si10920150pfq.242.2023.06.14.19.58.27; Wed, 14 Jun 2023 19:58:39 -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=FsF1vWY5; 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 S242296AbjFOCqI (ORCPT + 99 others); Wed, 14 Jun 2023 22:46:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37294 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232620AbjFOCqH (ORCPT ); Wed, 14 Jun 2023 22:46:07 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C3B342126; Wed, 14 Jun 2023 19:46:05 -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 4QhRVy57Csz4wjF; Thu, 15 Jun 2023 12:46:02 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1686797163; bh=nKyzclnLPcWFjNYP7oi3eE77p75xY/56CGKsZnifZvg=; h=Date:From:To:Cc:Subject:From; b=FsF1vWY5Ns92exTXpbe/LmG54Y1xUzqv54VbSdGu/EIiiKtFkmsFbzPat6VI+JVnQ kK3QRe1a3dvlMAbnA1P5RE2VDTIEGDED7u6bGAKpN1fHe9ks/fk2/8hdbajlpfpOBZ dVW2rNYdjivBIRCsB5YWN2xZVOCvZVBjlafMU+01e0nkZ1KzRkP9u28RTJDIuWZst8 iZsYSdgfviRUYDWz2//nXg/7He6xozKt2aDfIUXIOAscklFTrYxL5BWnT6uPQ3COvP +aVc4+yXoc63NctDkEJO1gv2ZRbjTcjvnngk1QLCh1A0M3IF5g0HzsQylUt2p2+t6X lLkSANyORFV0Q== Date: Thu, 15 Jun 2023 12:45:58 +1000 From: Stephen Rothwell To: Christoffer Dall , Marc Zyngier , Catalin Marinas , Will Deacon Cc: Linux Kernel Mailing List , Linux Next Mailing List , Mark Rutland , Oliver Upton Subject: linux-next: manual merge of the kvm-arm tree with the arm64 tree Message-ID: <20230615124558.2cea58b3@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?1768734133794306999?= X-GMAIL-MSGID: =?utf-8?q?1768735815522102636?= Hi all, Today's linux-next merge of the kvm-arm tree got a conflict in: arch/arm64/kernel/kaslr.c between commit: 6e13b6b923b3 ("arm64: kaslr: split kaslr/module initialization") e46b7103aef3 ("arm64: module: move module randomization to module.c") from the arm64 tree and commit: 0ddc312b7c73 ("arm64: Turn kaslr_feature_override into a generic SW feature override") from the kvm-arm 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/arm64/kernel/kaslr.c index 17f96a19781d,5d4ce7f5f157..000000000000 --- a/arch/arm64/kernel/kaslr.c