| Message ID | 20240220143919.40257e7b@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel+bounces-72276-ouuuleilei=gmail.com@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp174186dyc;
Mon, 19 Feb 2024 19:39:40 -0800 (PST)
X-Forwarded-Encrypted: i=3;
AJvYcCUh4sXko/Y14USuIjRBUnU2hDcY24Cw2Yy6aF76Czw0XwtBgu/m5vV3dsM7uDVxkDOGoZi2/WPUKde2MuyGFoLJDp0+sg==
X-Google-Smtp-Source:
AGHT+IE/nuITyqwdppgdzgrqkjHshukQplNwus9c483f8Thd1dj/Z5XPaek1gPs/1O/pP2imEo7l
X-Received: by 2002:a05:6808:1b2c:b0:3c1:55ff:8c7b with SMTP id
bx44-20020a0568081b2c00b003c155ff8c7bmr6031477oib.6.1708400379738;
Mon, 19 Feb 2024 19:39:39 -0800 (PST)
ARC-Seal: i=2; a=rsa-sha256; t=1708400379; cv=pass;
d=google.com; s=arc-20160816;
b=wMYoT/KxFBdBtJTNgE8GLvqcKP/ItAKXM7EKh4a54V1MCV0zFhLy3BIQ5F+reMLGBL
3yum2Sdzt8Ibgvi3dLs8Jdee5FNJyH3Tikgcn9VIKowKRLxtPhO51CXrsl3McaV5+2ig
v2sdbxmrjGAvc1vkW5s80HyEROUipkYf3XuMrN6GGcwinPfa8tkpblNAqFg6sJ+8cyYy
nlw4iVxCaxo6cxbOOe8s1s7H6ajSCgonWRJB3Zi6u8/GYZqrrzXodsKkMQeV7f+hu1K2
Mnowsn6sbCeoHgQl5XEUitbaoun2k0KE9+1Wea5FEEHAawhM3IK6ZRRk6EUyB/HyVxF6
uAOQ==
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=pcOAcbKO6ZfnI423BMyfLs6/TkEfSl8q4nsCTKKF2sk=;
fh=G5v6E1dmZXhOMl/GX2K6WKabmutWeu+rBNLl4pkxwDU=;
b=s6g0fdN1nAP6iUa1nSrCXlHxv/Sx1gxJHr0+5OHrmRmS8St4GHaMOgQODljnq6e/50
sY1XF9H66I2/mG1PrskcR6K97UQIkLB0tfpR/2tHupxSsOAIefEaZGWVjkPzrxmoo/6z
36KLXCC2rgwlVU27Q+JaeqLLU7VDKVTADERHuRti/HK75BIs7tMtFTa3uG8zNVGbe+M+
pOi1bZqO5bCqExbfAwiUowJC0zs/pQfy54Gj6zIuAExgx3kIuBU5/cvxNyuVUtixt1+0
BvmOYnoUS6LY5GOksGY5DjVyAehMqVuHESAQtbtehWjJWthIEblYP3zXD8SeTA0q7ohe
u/HA==;
dara=google.com
ARC-Authentication-Results: i=2; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=ZY0niVGy;
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-72276-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:45e3:2400::1 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-72276-ouuuleilei=gmail.com@vger.kernel.org";
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org.
[2604:1380:45e3:2400::1])
by mx.google.com with ESMTPS id
dq22-20020a056a020f9600b005dc5dc82729si5539231pgb.541.2024.02.19.19.39.39
for <ouuuleilei@gmail.com>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 19 Feb 2024 19:39:39 -0800 (PST)
Received-SPF: pass (google.com: domain of
linux-kernel+bounces-72276-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=ZY0niVGy;
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-72276-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:45e3:2400::1 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-72276-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 5CAAF28204E
for <ouuuleilei@gmail.com>; Tue, 20 Feb 2024 03:39:39 +0000 (UTC)
Received: from localhost.localdomain (localhost.localdomain [127.0.0.1])
by smtp.subspace.kernel.org (Postfix) with ESMTP id 2697B535A5;
Tue, 20 Feb 2024 03:39:27 +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="ZY0niVGy"
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 0D09833CF1;
Tue, 20 Feb 2024 03:39:21 +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=1708400364; cv=none;
b=h9j1fy+RV+74ayz2YWP5oPXXz8MUNDw5Ovyp98xLR49RM7FQoiBQWTpHzdTLtqfxWONLJNtImA6HhMvJpJVu2j0B5rwG+5caEwtRFAOKNpUnxmLqN10NMNbBLS658Q8PfmBHND2BMoDxe9FzaQ8c2k4jb/lJND+Qb5vWKjluwmw=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1708400364; c=relaxed/simple;
bh=7Y2sELjhel+6UxDpWMq0yReaC59tBmcYHAmG1877bbU=;
h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type;
b=E8ICyvuzEBjtVt+DmMzMm1hfsSHYCjJVLvP71Pb70yUk6REjOPYqczSrDgD9FnPjpVVDjN9/WoOD465zisX/9PxT/tVHia4W6SdvWYklC2Wegfc3xb0Y49OLJIDSp32vHN3XcsVdcAWyU/i5CMWjVonTbeqdA6/ViZWUegBc3E0=
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=ZY0niVGy; 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=1708400360;
bh=pcOAcbKO6ZfnI423BMyfLs6/TkEfSl8q4nsCTKKF2sk=;
h=Date:From:To:Cc:Subject:From;
b=ZY0niVGyjPW6TKiUMTjTm6asv4znW2vuz0lGHcu7cEZWkbYNj3x7QGOXZ+IIwhtul
6D+w8H9TFo7q7zjE6XvGAq1nc3pWN0AtNfHpQM+lXaBlWrFA2cZR7U24z3cj39R8K+
rzPU4U6QFv9famAKXky293jt3ZKDerlHgYKgFRGx/IfVGICjuN2Z9cV+/3OGE8HvwW
4QZOWAOg8Se17tNfIOjvjIP3+u6/IAz1ssY32W4sJRB6JEdPgINAq4/nRYnN5l2zzQ
broXmxyuBZS9Bbvm2WKnwuxeUIrj8SV536xL9YlrIjt6GNhzaGTzUB1r+kjm5TYCd8
6oM4US9o//DXQ==
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 4Tf4s36R6jz4wc1;
Tue, 20 Feb 2024 14:39:19 +1100 (AEDT)
Date: Tue, 20 Feb 2024 14:39:19 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Heikki Krogerus
<heikki.krogerus@linux.intel.com>, Linux Kernel Mailing List
<linux-kernel@vger.kernel.org>, Linux Next Mailing List
<linux-next@vger.kernel.org>, Xu Yang <xu.yang_2@nxp.com>
Subject: linux-next: manual merge of the usb tree with the usb.current tree
Message-ID: <20240220143919.40257e7b@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_/vjSNruKW=5aAeRpaXByyGmo";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1791387636350846877
X-GMAIL-MSGID: 1791387636350846877
|
| Series |
linux-next: manual merge of the usb tree with the usb.current tree
|
|
Commit Message
Stephen Rothwell
Feb. 20, 2024, 3:39 a.m. UTC
Hi all,
Today's linux-next merge of the usb tree got a conflict in:
drivers/usb/roles/class.c
between commit:
b787a3e78175 ("usb: roles: don't get/set_role() when usb_role_switch is unregistered")
from the usb.current tree and commit:
9a270ec7bfb0 ("usb: roles: Link the switch to its connector")
from the usb tree.
I fixed it up (I think - 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.
Comments
On Tue, Feb 20, 2024 at 02:39:19PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the usb tree got a conflict in: > > drivers/usb/roles/class.c > > between commit: > > b787a3e78175 ("usb: roles: don't get/set_role() when usb_role_switch is unregistered") > > from the usb.current tree and commit: > > 9a270ec7bfb0 ("usb: roles: Link the switch to its connector") > > from the usb tree. > > I fixed it up (I think - 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. Looks good, thanks! greg k-h
On Tue, Feb 20, 2024 at 02:39:19PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the usb tree got a conflict in: > > drivers/usb/roles/class.c > > between commit: > > b787a3e78175 ("usb: roles: don't get/set_role() when usb_role_switch is unregistered") > > from the usb.current tree and commit: > > 9a270ec7bfb0 ("usb: roles: Link the switch to its connector") > > from the usb tree. > > I fixed it up (I think - 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. Should now be fixed up in my usb-next branch, thanks! greg k-h
diff --cc drivers/usb/roles/class.c index 70165dd86b5d,4ad03c93c17f..000000000000 --- a/drivers/usb/roles/class.c