| Message ID | 20240208133855.53695262@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel+bounces-57393-ouuuleilei=gmail.com@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id
ma11csp2645211dyb;
Wed, 7 Feb 2024 18:39:25 -0800 (PST)
X-Google-Smtp-Source:
AGHT+IFdZFNRD3NFrLYrwxEeGteFjfsNW2t7F3cckc6g8RCLn3m/rqxHWA60rxR8AQ0oGS+0Uj2K
X-Received: by 2002:a17:906:32da:b0:a38:b54:7c5b with SMTP id
k26-20020a17090632da00b00a380b547c5bmr4895602ejk.19.1707359965089;
Wed, 07 Feb 2024 18:39:25 -0800 (PST)
ARC-Seal: i=2; a=rsa-sha256; t=1707359965; cv=pass;
d=google.com; s=arc-20160816;
b=LsMO/7Z4GjYG/cGVKVr8ifv559Y0GLRfXnrKqWrNdNiUfq+YOPFxFvzh9aWczWjH1+
eL2mPgapgqC8vTvPqFieUMLAaQD1GrXdsdtuupAghKMha5hnvCfDQ5cYDEyMYf+Q06FH
kipJMT05lyoAWvmBmWSKSm8F/Ab90E9bO0lcusYkqlY4ucU55mxJnD2/ieBsi0o/OKPN
v3MgnA+DKeSo3lrKyvmfm98ncElbEQ6N/I8bhZZDLkfhwHRgINiw9CDmzd4kYBRMTqkz
09p++e1wTa/8U8K8pTI58Ko0A/y0Mg9kkaeas1JncDVCd6JnSXD9X/7M4F6op49JWUMY
C0ng==
ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence
:message-id:subject:cc:to:from:date:dkim-signature;
bh=O/hM/ULATvS+zlv7841P46Mbj8sqxkUxtFHEQxvQfYw=;
fh=4tROFI/u1LoZIaMpJ8zXcmJ7Ld2vIONpjV3+0rEuPdc=;
b=MCAXKCrZIg35tXKQVIdpm8/+fNo4COm0xpl9HWjXTHa/kRngAGDGwe2R2LGrwVPXw9
iHK6E4tphYTyuoGhLxh9lq7FlRt3l/RbmJLCYN0yFi9meMKR9hcVS5JSgrndEV2Kc6Th
ftN3FtmMCLPye/LOTnmT2nDh0fmBCkP7GjGlnJnzHvvGdj5wOi0T663ajovjDDQ9avaM
BtoZ/oPMTTDLnvQ++KeqIZ+8VRAn5cFKxvdg6KB218SuySGNvi3pySkD4cyvOtBHy5Hr
FPKiXDx+ojm0al++k6OREGhwfSmsIRLZaJJzWnjn3xQPpvJs+/OynAD3HkxaJ+JQX5jE
qxmA==;
dara=google.com
ARC-Authentication-Results: i=2; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=OLqnm4Sc;
arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass
dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au);
spf=pass (google.com: domain of
linux-kernel+bounces-57393-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:4601:e00::3 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-57393-ouuuleilei=gmail.com@vger.kernel.org";
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
X-Forwarded-Encrypted: i=2;
AJvYcCVU4dYQRbwU3P04KH4MeooB43XGONq23lJBWZgUQNkqxN374NgQY2x3md7zM441YbsxQrl+oq3EIZ5Ehy/ju4lmULyEuw==
Received: from am.mirrors.kernel.org (am.mirrors.kernel.org.
[2604:1380:4601:e00::3])
by mx.google.com with ESMTPS id
v14-20020a1709064e8e00b00a379de3bcbbsi1504546eju.15.2024.02.07.18.39.24
for <ouuuleilei@gmail.com>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 07 Feb 2024 18:39:25 -0800 (PST)
Received-SPF: pass (google.com: domain of
linux-kernel+bounces-57393-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=OLqnm4Sc;
arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass
dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au);
spf=pass (google.com: domain of
linux-kernel+bounces-57393-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:4601:e00::3 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-57393-ouuuleilei=gmail.com@vger.kernel.org";
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org
[52.25.139.140])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by am.mirrors.kernel.org (Postfix) with ESMTPS id 7C8AF1F230B4
for <ouuuleilei@gmail.com>; Thu, 8 Feb 2024 02:39:24 +0000 (UTC)
Received: from localhost.localdomain (localhost.localdomain [127.0.0.1])
by smtp.subspace.kernel.org (Postfix) with ESMTP id 92A591D6B6;
Thu, 8 Feb 2024 02:39:06 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au
header.b="OLqnm4Sc"
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.subspace.kernel.org (Postfix) with ESMTPS id A9E241CD21;
Thu, 8 Feb 2024 02:38:59 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
arc=none smtp.client-ip=150.107.74.76
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
t=1707359943; cv=none;
b=p5cXTL8Y0ecfcOBdwMm88Rx6Yw7knn6mrLePluHXmipLYmWiSBuyHiksmswSIZI0RW7aKhnEPuFYojMUGRNgvrJXZDs5eZ0AxH9/A68U0ZfOiIQRRb8SRmSWgazGp1nXGh5sNXR79qvocTt0l6gRf3ckgppP5J83eez4A+4rF40=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1707359943; c=relaxed/simple;
bh=w7w4OKPE4XQdyOY1mTyI4o6ppGWfuRd1PHiDn3TVltI=;
h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type;
b=Jn+k68CvhLSVVehQOPzA0BBGnI5GBW5+JhtyGba/6H3NCzzLSDq0pgXBFwCc2fzdMB8WP43FBpP+NhY8JgrJ4NZ1BwrN50Y+tnTI9ECq+QYA3CKroS9s5uFDL0AuGRO/ETd5n8rdPyaLC82LYchlpl/8r9QX3+KJEzI7LT3c1tA=
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
dmarc=pass (p=none dis=none) header.from=canb.auug.org.au;
spf=pass smtp.mailfrom=canb.auug.org.au;
dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au
header.b=OLqnm4Sc; arc=none smtp.client-ip=150.107.74.76
Authentication-Results: smtp.subspace.kernel.org;
dmarc=pass (p=none dis=none) header.from=canb.auug.org.au
Authentication-Results: smtp.subspace.kernel.org;
spf=pass smtp.mailfrom=canb.auug.org.au
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1707359937;
bh=O/hM/ULATvS+zlv7841P46Mbj8sqxkUxtFHEQxvQfYw=;
h=Date:From:To:Cc:Subject:From;
b=OLqnm4ScfzDsyVIWgOHCiJLk/H2TbNEjxcISzXfiuqgBqQ+w4D+/hVMVDUP6/FD7F
3iqAT03KmVo+0qCun8j6+yedwLbINN8rY32I3tDefUS7q73O5S2yURxFEH+fM3Uyib
3yr9a1oZT3vE+xdP8cXGCRiZdAHqPNXMouCs3BL2hAzLzmxbKPMC3LPFqgW5kDF0ln
dfoOyZOM7+yGsfW/dX8oleIa3zmX9AhezvUeIEr4i3rtptCE3t+XPazfPlD3kC/BPN
RSDppLstOY36puk+oH+Od9ydGxtPzZVh/RygWNLi0beiCvaYq1dGzGf1TEQodImnby
4oCg38sleVzXQ==
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 X25519 server-signature RSA-PSS (4096 bits) server-digest
SHA256)
(No client certificate requested)
by mail.ozlabs.org (Postfix) with ESMTPSA id 4TVh4w6HfMz4wbr;
Thu, 8 Feb 2024 13:38:56 +1100 (AEDT)
Date: Thu, 8 Feb 2024 13:38:55 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Bjorn Andersson <andersson@kernel.org>, Mathieu Poirier
<mathieu.poirier@linaro.org>, Ulf Hansson <ulf.hansson@linaro.org>
Cc: Andrew Davis <afd@ti.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 rpmsg tree with the pmdomain tree
Message-ID: <20240208133855.53695262@canb.auug.org.au>
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/ubV/oSdQ66uQ2x.P757eQ2V";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1790296682344840633
X-GMAIL-MSGID: 1790296682344840633
|
| Series |
linux-next: manual merge of the rpmsg tree with the pmdomain tree
|
|
Commit Message
Stephen Rothwell
Feb. 8, 2024, 2:38 a.m. UTC
Hi all,
Today's linux-next merge of the rpmsg tree got a conflict in:
drivers/remoteproc/imx_dsp_rproc.c
between commit:
ab2ce14d02c0 ("remoteproc: imx_dsp_rproc: Convert to dev_pm_domain_attach|detach_list()")
from the pmdomain tree and commit:
8f12de7913af ("remoteproc: imx_dsp_rproc: Use devm_rproc_alloc() helper")
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.
diff --cc drivers/remoteproc/imx_dsp_rproc.c index d73727a5828a,56a799cb8b36..000000000000 --- a/drivers/remoteproc/imx_dsp_rproc.c