From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4BAB8C43334 for ; Wed, 6 Jul 2022 11:01:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:In-Reply-To:References:Cc:To :Subject:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=9lGrqut0edrJguZhz1F2p1nIl9lfXNr/RPWxfcBEopU=; b=fZUDTD54nvxj0gb7BstXcXaC24 b8uBhiWNOjvSZ4w8+lQ6bZWWCgf1+dFOXpZ9P6r7ByGqfv19MPvviIlOym70KjPZ4n7It14KrK0KH H9tq8WBagYCNU09s9CbDu8Qi1E0rXAPvsf7f0HzS06M1h2AUgTBYYKxXfZ8OsU4SnTzL7yCaLNmvU Q0W2r0vUUGke4vEJuvmtIcP3KYqg6hDZOtCOlrdCNyJ9V8z5Cu1exkXLlO4iaQblwzF6isWJW96Pj 14GVHOHrpjRVfEiGqQONxb0gPtqJkE9wuXdtjoyZikh3sJYFHwZ58SWkr+2zQPQHv5FM7ALr4QI25 M8el0lWA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o92my-00947i-AS; Wed, 06 Jul 2022 11:01:48 +0000 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o92mr-0093hu-Hc for kexec@lists.infradead.org; Wed, 06 Jul 2022 11:01:43 +0000 Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 266B1OtG013215; Wed, 6 Jul 2022 11:01:26 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=date : from : subject : to : cc : references : in-reply-to : message-id : content-type : content-transfer-encoding : mime-version; s=pp1; bh=9ECjS3YJuJOkzGYX4kmrLNyDsW1B8QqHQli/hHQnEXs=; b=UZu+WVzqwQjDMo7kk3Kr6nVqfRl37ih5x0dTpnlTw3Xpq09XBpopaHqVQ30oKcbW/Hpg GTdt1WXKUYykwv0RZ7/Vggt0deKq1ud5GG4wRwgetiqJk2hWvF99yMF10J0ySDmFAIKZ TE9oxRnMw49l/2itW5MERAxzu6aqJA3CuA4I8vOdRQxU3mKz2sRJlIKH95XqU7m3Ub34 aNeWtEhbpJD78MqVZoITd8+xdrADGF1xmvkdC0ssFIbr73U7DESpbxori8u/QpSWaZod FflVBmfyQcah4CsCz5jOi6FTxMgWILEcSDLQb8AT1sPYDR0Ydsa9AD43YnhOcUG8z2MD Vw== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3h58449nka-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 06 Jul 2022 11:01:25 +0000 Received: from m0098409.ppops.net (m0098409.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 266B1PcX013295; Wed, 6 Jul 2022 11:01:25 GMT Received: from ppma04ams.nl.ibm.com (63.31.33a9.ip4.static.sl-reverse.com [169.51.49.99]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3h58449n69-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 06 Jul 2022 11:01:24 +0000 Received: from pps.filterd (ppma04ams.nl.ibm.com [127.0.0.1]) by ppma04ams.nl.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 266Apkjq004078; Wed, 6 Jul 2022 11:01:01 GMT Received: from b06avi18878370.portsmouth.uk.ibm.com (b06avi18878370.portsmouth.uk.ibm.com [9.149.26.194]) by ppma04ams.nl.ibm.com with ESMTP id 3h4v4jrv5h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 06 Jul 2022 11:01:00 +0000 Received: from d06av24.portsmouth.uk.ibm.com (mk.ibm.com [9.149.105.60]) by b06avi18878370.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 266B17dL33030612 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 6 Jul 2022 11:01:07 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BE5964204B; Wed, 6 Jul 2022 11:00:58 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 549A142042; Wed, 6 Jul 2022 11:00:58 +0000 (GMT) Received: from localhost (unknown [9.43.110.188]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP; Wed, 6 Jul 2022 11:00:58 +0000 (GMT) Date: Wed, 06 Jul 2022 16:30:56 +0530 From: "Naveen N. Rao" Subject: Re: [PATCH 1/2] kexec_file: Drop weak attribute from functions To: Baoquan He , Coiby Xu Cc: Andrew Morton , Eric Biederman , kexec@lists.infradead.org, linux-kernel@vger.kernel.org References: <2cd7ca1fe4d6bb6ca38e3283c717878388ed6788.1656659357.git.naveen.n.rao@linux.vnet.ibm.com> <20220706015308.heynqgictt47r3c5@Rk> In-Reply-To: <20220706015308.heynqgictt47r3c5@Rk> User-Agent: astroid/4d6b06ad (https://github.com/astroidmail/astroid) Message-Id: <1657104347.v93p7p5tyq.naveen@linux.ibm.com> X-TM-AS-GCONF: 00 X-Proofpoint-GUID: nJ-Me_QQzVIrPD4117nUAeO-rFpIwr2d X-Proofpoint-ORIG-GUID: IijnEIfkgsui5T0NgaOcUb5DTntEzaCq X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-07-06_06,2022-06-28_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 priorityscore=1501 lowpriorityscore=0 phishscore=0 suspectscore=0 impostorscore=0 adultscore=0 mlxlogscore=796 spamscore=0 mlxscore=0 bulkscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000 definitions=main-2207060043 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220706_040141_878172_C6D75463 X-CRM114-Status: GOOD ( 17.57 ) X-BeenThere: kexec@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "kexec" Errors-To: kexec-bounces+kexec=archiver.kernel.org@lists.infradead.org Hi Coiby, Coiby Xu wrote: > Hi Baoquan and Naveen, > > On Mon, Jul 04, 2022 at 12:10:00PM +0800, Baoquan He wrote: >>On 07/01/22 at 01:04pm, Naveen N. Rao wrote: >>> Drop __weak attribute from functions in kexec_file.c: >>> - arch_kexec_kernel_image_probe() >>> - arch_kimage_file_post_load_cleanup() >>> - arch_kexec_kernel_image_load() >>> - arch_kexec_locate_mem_hole() >>> - arch_kexec_kernel_verify_sig() >>> >>> arch_kexec_kernel_image_load() calls into kexec_image_load_default(), so >>> drop the static attribute for the latter. >>> >>> arch_kexec_kernel_verify_sig() is not overridden by any architecture, so >>> drop the __weak attribute. >> >>The dropping of arch_kexec_kernel_verify_sig() conflicts with patch 1 of >>anotherpatchset, and the other patches in the patchset depends on the >>patch 1. >> >>[PATCH v9 0/4] unify the keyrings of arm64 and s390 with x86 to verify kexec'ed kernel signature >> >>Hi, Naveen, Coiby, >> >>Please negotiate how to solve the conflict. > > Thanks Baoquan for letting me know of this conflict. Naveen, how about > resolving the conflict based on which patch is merged first? If your > patch set is going to be merged early, I will resolve the conflict in my > patch set, and vice versa. Sure, that's fair. It looks like Andrew has queued up this series though: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git/log/?h=mm-nonmm-unstable The conflict itself is trivial, so it should be straightforward to address it. Thanks, Naveen _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec