From patchwork Sun Jul 30 23:37:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 128302 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp1722269vqg; Sun, 30 Jul 2023 17:25:56 -0700 (PDT) X-Google-Smtp-Source: APBJJlFMeYZkUh+iAWdZ0UicIx6YmzSFjeuSopqe8hd0Q5FvPKOvBvYrTYhN1e4fpFo9OYvuoqo+ X-Received: by 2002:a05:6a00:8c9:b0:657:bdf1:cce1 with SMTP id s9-20020a056a0008c900b00657bdf1cce1mr10428056pfu.25.1690763155940; Sun, 30 Jul 2023 17:25:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690763155; cv=none; d=google.com; s=arc-20160816; b=zWszCkQN9mQ467cELBT9+nvRLXgV0TOTX4ONDdko5HV7ZYGJGZUQdRX3/Iga5L0pbU BzdF/QBi5gx+PjNknLMGWHlWcRbVXy4VO9/3SciCqDvuXXoxVQWvuWrf5zgQLlf/6PyJ X46iSy6YGQ4ntmoNcUaeIKxxRUON3M1nZNev3TaJxKqKZkLlaAp027f3h3QVhGhkAZkr eScCukt8q3Wr1THciLxAxcgJxeE0O6IbVu4RVsq0nvV9ZFHOoOSeFjl3AnUHpZTQt9P6 X+kP739WOPULGD9ymzC/5fVWwKU6mGfsg0JefB1mzUqp+woEr4gG7ja57Q5AGM6/QBX1 uHdg== 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=mm6RxOwGfiU74ywzZ1i3ynNKnObG5WZOWaIhzscxZTE=; fh=MqhDYMc0tvX5a3KZEUI42fv60EwgzRGcQHEtuIniXl0=; b=SoQeVvH/qXOjyl14R2ydSe4eFXXpHEzyHiwEQIA00oIEBDMU4Wmfc2f4pPun/SljDC OZYbC4Hz8M7w20kTku6WwI+hOzHhDOpHgBKd/Ceoo+RkZxfXB5jzn0DU7RZsWOJVPLHi t0S/aW4Dozetho0Re9yqmqqoFj4EAxKTnnYenQJEnwnvGc6mFs8+/IPenEz5Bir8i8X6 7IaAhm/Thy8uvw1pr1Zdhi7oamXFQhjbKP3S7QVV0OYHhrZsxkU20VtW4yoqX1NHtDmI DH+8KPbmtINs2zIpXk1tbxv6/w1+KoIme7ujB9INCO4nI5Y2NVHmB5nQ9Sov9ZUtjv51 nQhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=rlGB8IBZ; 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 m17-20020a056a00081100b00686e19d20cbsi71335pfk.115.2023.07.30.17.25.39; Sun, 30 Jul 2023 17:25:55 -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=rlGB8IBZ; 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 S229671AbjG3Xhd (ORCPT + 99 others); Sun, 30 Jul 2023 19:37:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229449AbjG3Xhb (ORCPT ); Sun, 30 Jul 2023 19:37:31 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 935EDE7C; Sun, 30 Jul 2023 16:37:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1690760247; bh=mm6RxOwGfiU74ywzZ1i3ynNKnObG5WZOWaIhzscxZTE=; h=Date:From:To:Cc:Subject:From; b=rlGB8IBZAIw7rS6mwxOmPu2H3XN6sIG5y9/egkkDypKlueOEzuZXaXFIitixoBxQ0 dkIE3eU2d/S6ySwKJc2fSlA/Kl7wHW12FK8X9L2SEnipkdlTnoO4Y7KPmchyXLYPzE 2LHUMWTeT42L3RjMuBSj/6xWnW1PlmlHbGTN6JaksdnGqfY7ltxu3ncMwJqRg1Lciw mIrhuFpv0elH3a+BTRFFYn1uN5YQgzw5BQApL8DOo9kWOKGZNS7eo5X25nbKjkj6GE P8a0zKrQ4SayPDufjKfuHQD6EVtbv/YT1inF4bP7YXz6UOl7LP/Y78c2tHD0v5YFpT RqfOazTKaNtKQ== 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 (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4RDd8724Zrz4wbv; Mon, 31 Jul 2023 09:37:27 +1000 (AEST) Date: Mon, 31 Jul 2023 09:37:24 +1000 From: Stephen Rothwell To: Heiko Carstens , Vasily Gorbik , Christian Borntraeger , Andrew Morton Cc: Anastasia Eskova , Costa Shulyupin , Eric DeVolder , Linux Kernel Mailing List , Linux Next Mailing List , Sven Schnelle Subject: linux-next: manual merge of the s390 tree with the mm tree Message-ID: <20230731093724.1c75858d@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_BLOCKED,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: INBOX X-GMAIL-THRID: 1772893666634140344 X-GMAIL-MSGID: 1772893666634140344 Hi all, Today's linux-next merge of the s390 tree got a conflict in: arch/s390/Kconfig between commits: e86a64d19d20 ("s390/kexec: refactor for kernel/Kconfig.kexec") 54d5daef8143 ("kexec: rename ARCH_HAS_KEXEC_PURGATORY") from the mm tree and commits: 8cf57d7217c3 ("s390: add support for user-defined certificates") 37002bc6b603 ("docs: move s390 under arch") b90a64caf844 ("s390/cert_store: select CRYPTO_LIB_SHA256") from the s390 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/s390/Kconfig index 42c98931de2c,18bf754e1fad..000000000000 --- a/arch/s390/Kconfig