From patchwork Tue Apr 18 13:40:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 84854 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2866168vqo; Tue, 18 Apr 2023 06:50:42 -0700 (PDT) X-Google-Smtp-Source: AKy350bZGQmt9H7Q4kB/18C+diLCS+Rn2gi/GtJqotPfAdVtVkmEvPbTi58AZdhNB6F54Kk+5iYV X-Received: by 2002:a17:902:d511:b0:19e:ad18:da5c with SMTP id b17-20020a170902d51100b0019ead18da5cmr2712080plg.37.1681825842041; Tue, 18 Apr 2023 06:50:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681825842; cv=none; d=google.com; s=arc-20160816; b=DPcrBMfwoSxee0tl3tpGB4VmHkHvRwuqhiJHvvwjdvWV9D5sfOk/PA97RY3VXoHpom +vpzNZ37awtmkC0MUXR+EZY4njPuel4Haf5jMNP0sjWYa5BQXCcTJrllo1bYG3FfMxZR d75aCHAxJcdSRB1THZfbE6lsdlYF6lJ6iiOvigHIOr2T9PqHaFrcd7EyCt2d5iXqmCLj qYy7hPfLalj9RpT2EoKeEECeHID7Ya9uf7yjnSdzmeAXqWGfLZqjETZ5Qpb3d6j8T9h2 T015CkAGCzvvOfrhT+5ZN0tPm6XOG/cqOVETXEx5lfZo4l7r6hMJGPP1wIrazIqf2CJ3 Pt1A== 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=04oRkRCmTpJRYAMtPY6XYN0Ry+i5LVd5Aqoh5BoUBts=; b=DxcJGCEHu674lSt7tEAYiJlVf4NyxZOXU2JVWx7Ms1EMUtBhGh9SjY19Z/NOYiDGG5 CXSRM7oJhgxZcMkIUoXjmXT8rCa3I6GnsO40rlB1Lf9+j4d5Kx6zWV6z/vBZW6pZH7jf 0N6DtKgSeQgivZLPlFDON5nD8ro0wYATcXFYuLLt2aTIoQwEYrZ/KY4+Tatcc5T1tmEV 4q8ZC/iOBz7K/ChjmWzI5493/AHOugNGsxsvE5ACb0ENH0Zguq7ieNUtND3WxllF7CiE c4r9E1FqvET9rTzxDXCsmTTqva0+ucmt5m/9V7TRexd+g7w5c+OOcuiKUAwmjrQ4kLMn MlVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=jUCCiLjo; 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 w5-20020a170902e88500b001a64c3c8f01si1423979plg.604.2023.04.18.06.50.26; Tue, 18 Apr 2023 06:50:42 -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=jUCCiLjo; 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 S231432AbjDRNkW (ORCPT + 99 others); Tue, 18 Apr 2023 09:40:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56208 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230477AbjDRNkU (ORCPT ); Tue, 18 Apr 2023 09:40:20 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 21997210B; Tue, 18 Apr 2023 06:40:20 -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 B078962BD4; Tue, 18 Apr 2023 13:40:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2826CC433D2; Tue, 18 Apr 2023 13:40:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681825219; bh=yHZZr9lbmqRMgIawoEACPWeAMair9uMLVjV2HPRCkNU=; h=From:To:Cc:Subject:Date:From; b=jUCCiLjo7SQ8eRBAbb7yao1W41i0rlmUgl/dgo0tH62cowuC277QchWQrrzIRHvcX /gMdpGJNMGjrm11Z7/qve7i9URidQmcDoGX0IsEP/oJW67BBwJ2Fk71WFSf73NhoAQ 5veID3B4RO0ksV1/M3//sQNmLpsTaz8fiBXMHN1iCu/7aBpGJcZFdFppF7LpcsvKw0 2QDQ1nJOU9LGmO0+Myge7O1AWIzZKtnVcx53MpVdNw5CiXZKWJDTiymiNIqEsLXJpU aBcasELBj5HyHmVQTt0pz/GSRtWQr5PykEaKz11uIuQyPkJseS76QCq7kTt5MPN/Pj c1lEuWtyeycKw== From: broonie@kernel.org To: Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , Peter Zijlstra Cc: Heiko Carstens , Josh Poimboeuf , Linux Kernel Mailing List , Linux Next Mailing List , Vasily Gorbik Subject: linux-next: manual merge of the tip tree with the s390 tree Date: Tue, 18 Apr 2023 14:40:10 +0100 Message-Id: <20230418134010.69844-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?1763522213996101938?= X-GMAIL-MSGID: =?utf-8?q?1763522213996101938?= Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/s390/kernel/setup.c between commit: 944c78376a39b ("s390: use init_thread_union aka initial stack for the first process") from the s390 tree and commit: 9ea7e6b62c2bd ("init: Mark [arch_call_]rest_init() __noreturn") from the tip 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/arch/s390/kernel/setup.c diff --cc arch/s390/kernel/setup.c index 0903fe3566341,4259b6c505163..0000000000000 --- a/arch/s390/kernel/setup.c