From patchwork Wed Apr 26 14:43:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 87883 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp301635vqo; Wed, 26 Apr 2023 07:55:11 -0700 (PDT) X-Google-Smtp-Source: AKy350Z3U6rCUxW6mlFjDblFHgip3qeKm71HdWA35YWzB0twYESdAU7dPEaEuQcQ9hfcub6z/RMf X-Received: by 2002:a05:6a00:1904:b0:63d:2911:3683 with SMTP id y4-20020a056a00190400b0063d29113683mr26428228pfi.17.1682520911116; Wed, 26 Apr 2023 07:55:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682520911; cv=none; d=google.com; s=arc-20160816; b=t6xEuGL/9WUo4Y0fTWd4Y+1g+a90CD0sP2zma03Wk+LjEslqztKVfWmXlDDwFP7wpY lP54Qs7QKN25SYyhisvPq0jCqd+G5uThBXJiuHmEZtTZbj4xn/FvZCaI98sipv17rVPq KKYCe/97fucJheq/RvGf/XylrkJ7ys8asic4JAc8bBH6qQ3Mhjh+P14HHQLPCqYPTLTq dCrMnyQFPjLgV6nCwnYITV6fDarHsMN+iSTkOHRQCawZW0BCO/4IcOKe+mJ+gz1wjhUN FGIeEUV7k02g6F4xQBPiPa99EpeNRpGStnEjs1c2BLIlX2PGFsxhnyXEciFtEEsje1uh MywA== 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=kluh9Og9Uxc1rvLOntkU3IyXp4/fuHkWKHLxlF4NqL8=; b=M0kNqwZan4nvYRnhOSe5p9O5WWF1bLa5oJJ92njYDGYxgiFyCAB2P/2IQpZeCvcdFV LhRgKq2Mt8OQ7EvfDVP9DlHH4kqOCBKTBl5TTa3+frJF0PJpORQ5uv9to5oe55jAs1Mh +zXoRKbUntHPG/FUenCnWm4jmN04Djrv1XTvfKdH/J8WL4aMILuzqxwL0NJsBJCUv3WR GJfa2AJjg7TdrWG/EvGrHm7sVaxu8Ud8EbX+/9zAN83EXzs9PmR7mNEtTo6pf9lW51ux R1IR5hMSju1LZwpaFV73yvtblRjdS6JZt8vnm+uK+Rd1WOKK/vCWmeTg2TZ5fwLZ78pL +FEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=kcOAl7QU; 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 u62-20020a638541000000b00525048cb4dasi10149751pgd.555.2023.04.26.07.54.56; Wed, 26 Apr 2023 07:55:11 -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=kcOAl7QU; 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 S241487AbjDZOoJ (ORCPT + 99 others); Wed, 26 Apr 2023 10:44:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47884 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241486AbjDZOoE (ORCPT ); Wed, 26 Apr 2023 10:44:04 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 17B607A97; Wed, 26 Apr 2023 07:44:00 -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 A5E826373B; Wed, 26 Apr 2023 14:43:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 22503C433EF; Wed, 26 Apr 2023 14:43:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1682520239; bh=o0ldxJi8PjCdc85sGMxMwUUf04YrZqa91ZDhQtfywSU=; h=From:To:Cc:Subject:Date:From; b=kcOAl7QU+uaBJmdj32NAU/bV9DkoH9tlRwooYHR56OcpxYhHRh+2JKecumYIiF7js L64WmGs5TB/vwe9UCKn5VT+37dPmQ80bBh/z6oN8CfwnuE8hKddupGjX4miKXPpkaN P/BcXWEm1XuEOywdGGC9qE4ksc6mMH78NpiM+MqX9jk5vDJmhumS9SwWPccDzK5Eq/ 1bvBTqvH73gzn/mhcQpe6N7FKoC3s06Pbr6PQ+MmgsBjJ5v6+3umlZr01Wd+bc1F8E d05HYUeeRyro2Uvjte+KM/SeSwibVgQkRvEgialwlHrIO6PCpJmOE6j3AxfDHj8Yd5 W1dcR2fwVF+yg== From: broonie@kernel.org To: Bjorn Andersson , Mathieu Poirier Cc: Bjorn Andersson , Bjorn Andersson , Chris Lew , Deepak Kumar Singh , Linux Kernel Mailing List , Linux Next Mailing List , Sarannya S Subject: linux-next: manual merge of the rpmsg tree with the origin tree Date: Wed, 26 Apr 2023 15:43:54 +0100 Message-Id: <20230426144354.87429-1-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1764251047138498483?= X-GMAIL-MSGID: =?utf-8?q?1764251047138498483?= Hi all, Today's linux-next merge of the rpmsg tree got a conflict in: drivers/rpmsg/qcom_glink_native.c between commit: 0a7eee89e79eb ("rpmsg: glink: Transition intent request signaling to wait queue") from the origin tree and commit: 96a7a78517751 ("rpmsg: glink: Add support to handle signals command") from the rpmsg 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/drivers/rpmsg/qcom_glink_native.c diff --cc drivers/rpmsg/qcom_glink_native.c index 1beb40a1d3df2,208a5e9443cb9..0000000000000 --- a/drivers/rpmsg/qcom_glink_native.c