From patchwork Fri Apr 14 13:13:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 83402 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp382602vqo; Fri, 14 Apr 2023 06:28:34 -0700 (PDT) X-Google-Smtp-Source: AKy350ZmZEg5IIboyyfSrYJ0IaB2H6bDQ8QZgPm4Yf38tV7BHms/JXZjdebr4y2H63A7/M63c64g X-Received: by 2002:a05:6a00:cd3:b0:62d:d6ca:5834 with SMTP id b19-20020a056a000cd300b0062dd6ca5834mr8930944pfv.16.1681478914609; Fri, 14 Apr 2023 06:28:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681478914; cv=none; d=google.com; s=arc-20160816; b=YCQzpn0tCaXXREwgw73QjDkRCHdMQPHj5ZfVbECzSAaziWBI3QdzxlPBAhJSDTp2D4 n0XN8pwRedb1wwnWb+2HwjQ5Ld2rW3uacBtXg8ZsW0P/sSlBUKJ9VXvi1s4wJ57VfZmF TsDP3UrjY8tM5Yjdje7GK6R03pmlajCPt528BUbchuTAjHzFfbcVKtTCp4ec9dzw6iOD 9AXEcvjJRa1i6hkshsiTqGzhRgAUqQISeWeBrvKhSl6D8L1ZtZZAzXt05/9OOQ4v1o+F H7LJadZgvaRPTBc47oJIEIVJgCw4KjSl871j7i93bi1xXFtbxQhs1ohuX7HK2NNoGUA/ AcxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=NPvYxVFyhzJVZ1X8M7516ijtvGfavXlWxkIXKV5LbAs=; b=oTgnnr0DVuV/IAZnJRRYpuRxtIvHO/5noVbFvqmyE4EbDsYJJEGlNZIhm5xVhPRaBO qYdRfW/lsryfXhJFpBZmZXF007G1byetz0JAVCY7tw3aLerORKKlVvBFlB8fo52DIkRk 0ue7t02Y99mxIftD79X0CdlXbpUVIA6VcAmJOY6yTF9EHvDR56iRcbQCVm2Z3RKbXFFd d7UniRnXMFGEpBhYoOb6PkPlzqf15VcUcPFybpS7ULaT5G7VnKacMvFdmT/TTVHrA8gI l9mT0VBKx7qvc9X5FImmYQUKafk++64c1dCipihU4y8pHocz6wqnz1vM0WFQI31nVfkU NrJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ELIh4tGz; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c18-20020a056a00009200b00627d5397423si4383901pfj.145.2023.04.14.06.28.06; Fri, 14 Apr 2023 06:28:34 -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=@kernel.org header.s=k20201202 header.b=ELIh4tGz; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230083AbjDNNNo (ORCPT + 99 others); Fri, 14 Apr 2023 09:13:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229494AbjDNNNm (ORCPT ); Fri, 14 Apr 2023 09:13:42 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 91FDE3A8D; Fri, 14 Apr 2023 06:13:41 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2E5EE647AD; Fri, 14 Apr 2023 13:13:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2ADEDC433EF; Fri, 14 Apr 2023 13:13:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681478020; bh=jKSx0MxXc8qHaQ8KeJbSXbIdQoP+ohJUZhAj5Nn0cd4=; h=From:To:Cc:Subject:Date:From; b=ELIh4tGzxahT2biMJGnJDciRv2w82yxCBdurq0+p/4F68e4x2wv4VdZNWKGnqgPFC Hy+9NkMW5BzWY5PPQt/a7wVBE2qm49HoS0ygEyjKcXMyTu7ign3Hb3OFFvWdR5xWlS XcwtmOfCrGIJnBSiJnn+7t5PeVZMgxRWbaKI7dEy4USD23Xxem6BvZfw9hK+UCCSpS PJ9IoD8gRDDv3BLYoBD+E40rWA/o5/IZiE8QKosC1nIfU0McXO5u6uwydykEnUoXNg lS3QWIBMOV3VlcoYr4GC0qBr2kbBWpCzC8eIdi9puN2Hc63Nw7M+f6shios2gCgI+v ktE+qTfD/fj3Q== From: broonie@kernel.org To: Luis Chamberlain Cc: Andrew Morton , Florian Fainelli , Linux Kernel Mailing List , Linux Next Mailing List , Pankaj Raghav Subject: linux-next: manual merge of the modules tree with the mm-everything tree Date: Fri, 14 Apr 2023 14:13:30 +0100 Message-Id: <20230414131330.1053570-1-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,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?1763158434823192500?= X-GMAIL-MSGID: =?utf-8?q?1763158434823192500?= Hi all, Today's linux-next merge of the modules tree got a conflict in: scripts/gdb/linux/constants.py.in between commit: 96839cd89fa9f ("scripts/gdb: print interrupts") from the mm-everything tree and commit: b4aff7513df32 ("scripts/gdb: use mem instead of core_layout to get the module address") from the modules 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. +++ b/scripts/gdb/linux/constants.py.in @@@ -58,10 -54,9 +58,13 @@@ LX_VALUE(SB_NODIRATIME /* linux/htimer.h */ LX_GDBPARSED(hrtimer_resolution) +/* linux/irq.h */ +LX_GDBPARSED(IRQD_LEVEL) +LX_GDBPARSED(IRQ_HIDDEN) + + /* linux/module.h */ + LX_GDBPARSED(MOD_TEXT) + /* linux/mount.h */ LX_VALUE(MNT_NOSUID) LX_VALUE(MNT_NODEV) diff --cc scripts/gdb/linux/constants.py.in index 36fd2b1458531,8085d3693a055..0000000000000 --- a/scripts/gdb/linux/constants.py.in