| Message ID | 20230725094013.2dfb0168@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp2145235vqg;
Mon, 24 Jul 2023 17:41:03 -0700 (PDT)
X-Google-Smtp-Source:
APBJJlH4OZh4UWEDlARzm9d2+Cw5zqGdmL67Shj0biTm6ptWxMj0eCOtoQ3ZdYfK2GCsTckG4rhr
X-Received: by 2002:a05:6808:1144:b0:396:4977:e148 with SMTP id
u4-20020a056808114400b003964977e148mr16368316oiu.9.1690245662844;
Mon, 24 Jul 2023 17:41:02 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1690245662; cv=none;
d=google.com; s=arc-20160816;
b=fOv+dvYCCDiZpgAzWmKLP8EA0pUZDSU1iRHeZ4Ls0B8u+u91JtCOER+IKPxE2jgczZ
BLfAfgGAAaoQxwkR+EOAqFZfI633/zXrpRLD4q9YJNc9veoJ6VMWIz1Nc4B173qDGpZy
DYDFovJEeu4qSVX7ZD/7uujA3vI/EgkOoZv5L3p/7OcJTWv5BHomIN0U1ICDc+PKFVJy
Q+M8gAXa2DRqaHfVqKx11te4qfEO9HWsR3UpAOQE6pBHiAX9oLWKgYuWtZBJ91nRhNgK
OTaX73l/bbJAzGKXF8K20iepA56uFvd8vJmzo4QLIARg75KLHdDqsDr3kfDG0YS8T7GP
DI+A==
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=6TF4rTDCnEeLmpa+s/bHmP4F9sA3NfG4Z+Y5NgPOx6o=;
fh=ksDOGB8Ek4qKaPRPX/DCrZylo/+n7m2mI50e6Q8FJ2U=;
b=Gcw4gBsptnEYCO98xIMFJY2s+2UOH63WeTPs+6ynx6uq+XchomWQqFfPlHxKTd0DTd
zdobSCau/rFL5sSD9ZeEGoe9vQ9Uiea1i4Oj6Ris72uIodznFmmdQAwB2yX51bm1any8
8iLzzTuqsRZFvKcYXmD4JGqvVRaWi2UPci7+jd2rK4HB7w498X+ZqrOeEbdkbzq2QIOV
fjssBMlwuoqM0RDoHQNZv0YmREe2ozNf+/M5Vo+lPrUDVN4CZvQDIygY7J4HQw3lcPzI
nq5ou/+kOpGil5dAw8zseJ6QN3tdqTMOkZrYnoqcwUfYSWoenzV1zxzdxis7TgX1PisQ
7utQ==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=mmFjBMv1;
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
o28-20020a634e5c000000b0055acc7f8088si10405384pgl.301.2023.07.24.17.40.49;
Mon, 24 Jul 2023 17:41: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=mmFjBMv1;
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 S229978AbjGXXkU (ORCPT <rfc822;kautuk.consul.80@gmail.com>
+ 99 others); Mon, 24 Jul 2023 19:40:20 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44348 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229608AbjGXXkT (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Mon, 24 Jul 2023 19:40:19 -0400
Received: from gandalf.ozlabs.org (mail.ozlabs.org
[IPv6:2404:9400:2221:ea00::3])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 229951700;
Mon, 24 Jul 2023 16:40:18 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1690242016;
bh=6TF4rTDCnEeLmpa+s/bHmP4F9sA3NfG4Z+Y5NgPOx6o=;
h=Date:From:To:Cc:Subject:From;
b=mmFjBMv1NncnWp1P3bsXTwpPKa2LTG+OKU1jOxXBRW8yPQwZHpVFi8VYRJu6s4ZM4
QPfq/KrLFX7gsYtQAhquY3cFPMk+BDZLIdWDB5bHUhLHsrdDnmL3AAfHFByqaVadWR
iOnuAAQeqrR8u5J4d0TJDlD4qcwG8jKsVJ09w9gO/6qHjmardwp7P83CLl8U+8HSv0
dAagsQeprGqg/Ww+huEN3clrX0nztdUJncSxM4zrliQ2CWc9Mz2HI7GI3Gok8LGE+h
LT3iKzZkn29xGunrS+Q2BZ8XaBQ2HQrCAQfD/NDIexK3xOIbh1Y5CWcZmmaTyqlNqK
9jUjQ8Su9hGtQ==
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 4R8xV74Z3Gz4wZw;
Tue, 25 Jul 2023 09:40:15 +1000 (AEST)
Date: Tue, 25 Jul 2023 09:40:13 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Heiko Carstens <hca@linux.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>,
Christian Borntraeger <borntraeger@de.ibm.com>,
Andrew Morton <akpm@linux-foundation.org>
Cc: Anastasia Eskova <anastasia.eskova@ibm.com>,
Costa Shulyupin <costa.shul@redhat.com>,
Eric DeVolder <eric.devolder@oracle.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the s390 tree with the mm tree
Message-ID: <20230725094013.2dfb0168@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/B8tY7A9iU/ozSC9TTOSK89E";
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,
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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1772351036206356342
X-GMAIL-MSGID: 1772351036206356342
|
| Series |
linux-next: manual merge of the s390 tree with the mm tree
|
|
Commit Message
Stephen Rothwell
July 24, 2023, 11:40 p.m. UTC
Hi all,
Today's linux-next merge of the s390 tree got a conflict in:
arch/s390/Kconfig
between commit:
b2d2d291f588 ("s390/kexec: refactor for kernel/Kconfig.kexec")
from the mm tree and commits:
8cf57d7217c3 ("s390: add support for user-defined certificates")
37002bc6b603 ("docs: move s390 under arch")
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 736548e4163e,d9d50a7a2016..000000000000 --- a/arch/s390/Kconfig