Received: by 2002:a05:7412:798b:b0:fc:a2b0:25d7 with SMTP id fb11csp126545rdb; Wed, 21 Feb 2024 20:38:42 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXUbWh02iJIBhYAXIwueGx9QWVnFHzi5cI3vkqdHgn0/Dyszux6Z12ppyHZhS4sMIOjWZgK/GYeGOR/MJ2tUJvm6M9E9y5e5bZOtLGbgA== X-Google-Smtp-Source: AGHT+IE+VQr/9c3JUSmbddLUSYJX90rudcHrp59NdS3aUWGHs2L63VYd2SJWe6EM0uyeY/le9eDg X-Received: by 2002:a17:903:244f:b0:1d9:e1aa:f217 with SMTP id l15-20020a170903244f00b001d9e1aaf217mr2484659pls.22.1708576722423; Wed, 21 Feb 2024 20:38:42 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708576722; cv=pass; d=google.com; s=arc-20160816; b=JxdJNdR5AZc30MFI3vbrlxNd2rybewllWtj3AktixBKAUszMJ6egF9t1lzwBuL1Y68 mfac4wqc5y3FGqVD2hQixYzDuqwb6ckUb7IOKnx9c7NyoGd+aEYaYBprQG5dzl7qgJDM dWeONZZPJmfT+uDQ1e+ZCQgXS4xxrLaY9B0gZcH3Pd8ME/s6yNSK8xC8l45fINXVDpvO /2LhIQ92P8Or05ZcoR+BApvXMxBzCg2khJWTPNjyD2MNBPcEaLRiqMLIK84kIbLCFR18 5XVq7YIpLD951wc+p5rQyvu92K60UTlHfNWL2dspd+/QOwHOdfhlbpxv4TJ2Fz5E8MXh oRJQ== 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=U2MzncGXbDNzCtp+gQ0mCYGLNdNGYclqHp3bgczOtZw=; fh=SxDsysKtDv4S8/9QK4IUnwluZjHWPcx8ECXdBasWgcc=; b=wkb4qe6VnYtMquNV2COVvsWcyl7pfHTbVhFNWp2zXIbyeblnglf7gHqvoY7hCJgQtn eyUb5VuNG/51fV88hSNnjTBmQLPci5UVAGJSnbfPYKP8wZvZkVpLRm74bwGZsrxqXcTL B4YRRHSqyxV4Br1+qm+MByjtjVlItNrh94izH075NY9o+jmsSOpmZXmHw1g27uMDMnX9 eyE+BDtaj1N2riImzOqK0hYATYfb54Ii0UFqn1l+2Q83xXDHPM5LvvzNzFlOWKlx7vA7 s/AUEyIPIev33hlEs6qwg/89QGlYjp+nWU/ohf+uDEYcFLX6EHlghJBfl6sASYSX/P6k pt4A==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=b226THhz; 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-75905-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-75905-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id x18-20020a170902ea9200b001da31b60e39si8022749plb.653.2024.02.21.20.38.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Feb 2024 20:38:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-75905-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=b226THhz; 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-75905-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-75905-linux.lists.archive=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 D547D284891 for ; Thu, 22 Feb 2024 04:38:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 17E6A1C16; Thu, 22 Feb 2024 04:38:36 +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="b226THhz" 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 E670F10E6; Thu, 22 Feb 2024 04:38:31 +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=1708576715; cv=none; b=vC38pq7AFgw9ukYPVSQOzTU5BMtwluvv+6pZCY93vCM2wMhrOHEjQSMco+la/u9K7TwJdjcun5Cxk2Vkz+gW4islPzPcpnh8k/HSH9kwq5Z15xtB4gt7+yaGu+zWjuPugiCA5m+6sZdkVSo5utnXW9Uqbqxims+cd1SC5Ev4ghE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708576715; c=relaxed/simple; bh=YyiHPo6lpjIRrcpkojOn+UeZ2kGiQoAWAAYO9zWyQ4I=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=XVPbtAB1MJxLkhaxeabdZ+SayztcPYs78XnhBQ1Eqt8nQvmloEhLgg5JIsFeXZ5o297TncDYdj4RZDJSMSKp4+UnxJShC5+/lNvfSyiIuT64yHGxPSBpd4GHQRG7Xft7rzJ/YsCaHrf41cov0/A1I9h1kqvj5f4rGUWN9JUZZYo= 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=b226THhz; 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=1708576709; bh=U2MzncGXbDNzCtp+gQ0mCYGLNdNGYclqHp3bgczOtZw=; h=Date:From:To:Cc:Subject:From; b=b226THhzDEKCWHO1KuzBnZPQiqyJboqL3m3KC7VLI7ej3a1Hxxc9zVoOrVSHDj3JR ey+/KdHQf50s8kHSiAsSrdAW8oJgJN+x+m6oKxnSDPlbvFQ5inEHJtyuXGvE/cLDzd 6dPYXcVWL+dWwoc52cO93HVv0TV3fwZbU59CkIor/7ExXTdW1qNNqQ6qJVEpFPkhZ8 752nYisHwNqZEdmrVGuxwq338eKV+iiiSXT76vNnMB0fQEBihsPxrxPYu3YatAicf/ tPhPakIxzKk9QbfK1aey5ibTtdEtUQUYBIYOtoRjERmwLhH4508JmJe5sSirqUk+MY VUH4oUYOJqUuQ== 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 4TgL4N1bPmz4wc4; Thu, 22 Feb 2024 15:38:27 +1100 (AEDT) Date: Thu, 22 Feb 2024 15:38:26 +1100 From: Stephen Rothwell To: Greg KH , Mark Brown , Liam Girdwood Cc: Danila Tikhonov , Dmitry Baryshkov , Greg Kroah-Hartman , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the usb tree with the regulator tree Message-ID: <20240222153826.3f7eba10@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/Z2LrkZarDBZRFQAea+V8Pww"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/Z2LrkZarDBZRFQAea+V8Pww Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the usb tree got a conflict in: Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml between commits: ec29a4d9b7c7 ("dt-bindings: regulator: qcom,usb-vbus-regulator: Add PM615= 0 compatible") b9262cc1b988 ("regulator: dt-bindings: qcom,usb-vbus-regulator: add suppo= rt for PM4125") from the regulator tree and commit: ef6035d2f1f4 ("dt-bindings: regulator: qcom,usb-vbus-regulator: add suppo= rt for PMI632") from the usb 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. --=20 Cheers, Stephen Rothwell diff --cc Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulat= or.yaml index 8afb40c67af3,66dcd5ce03e6..000000000000 --- a/Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.y= aml +++ b/Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.y= aml @@@ -24,8 -24,7 +24,9 @@@ properties - qcom,pm8150b-vbus-reg - items: - enum: + - qcom,pm4125-vbus-reg + - qcom,pm6150-vbus-reg + - qcom,pmi632-vbus-reg - const: qcom,pm8150b-vbus-reg =20 reg: --Sig_/Z2LrkZarDBZRFQAea+V8Pww Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXWz8IACgkQAVBC80lX 0GwyJAf+OGHW0sj4omPVHNpX8Jv9mzrKQSNdi7VR8VfVyEB7Vut8/qXdBuHxqH3S rQTDE9OcWvKsv3QgL78oMMVqKraw8MhdVCdVfevtninI75jpnHjPW0nE7D6+W9Ez L4gdqWv2DFmQuufHGs9J59glcMxKSTvqy4fQpFKkCB84kckitPm/2pdfwj7Tk8DP Waw6Hq/c0vMQdszRKrw3JtJoDoXYhXY80f3OuEwAd8HrGbXCuer1tq6UK/8EOyvC aLcMq5MmX3iJ5Qw/lKmcBmmMmRwVKU2mBubTYB2zhthue4whvKxB3yy8+KojlpCr FFPNE+/FETXgFEV1rT4/SZM0ErAdJA== =ktSN -----END PGP SIGNATURE----- --Sig_/Z2LrkZarDBZRFQAea+V8Pww--