Received: by 2002:a05:7412:d1aa:b0:fc:a2b0:25d7 with SMTP id ba42csp1311693rdb; Tue, 30 Jan 2024 14:52:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IEFHPc92A+p893GPXtqfw8LLjw+syOd6guGCrIpgBWvNicp4yV2cenK2e2Y1uYwy3XoG+cw X-Received: by 2002:a05:620a:918:b0:783:82af:f516 with SMTP id v24-20020a05620a091800b0078382aff516mr7832664qkv.62.1706655167506; Tue, 30 Jan 2024 14:52:47 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706655167; cv=pass; d=google.com; s=arc-20160816; b=Fkaay/BR/HZFbhuwTxcAiyRQGJi9t7T5/PxqzWvq0s+EAJfTfDYZ2IO8UOvPlFD6nm DuCuylW7lu3rqTD/s3eTu3eJaBJp3s8C6n/AqP7U8uxLx04VZiyZ9v6By00Z+Hj8nCx3 JqRhLVCrgajV+39PT/6pI93s+HIu0QVf2f+eveWuaJOuAsvt9EdxcoLKfdDkLKZmytZ7 WDSql/j9R+LF4iWu5Sc7RZ+0nbJrAUWIsMktZ5v1E+oEykRyLpMg9Tp4+R2iDNlI3SfM M81v1QQdgvLwXJ7rFElxCVqxQayOTU6MCTwZUOxCF16YXqS/nLgVi6+4XVlKLotVW3wy 942w== 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=6XIISc8ch5WBdNoc3WXfwX9OwjBJgr8GK3svOK/ZC8A=; fh=Hqv1krn0F0tgqp6x3vqjFNAsiIb97f0W+hLTO0ngMs4=; b=0DppXv3gKHqUeFj8Dn0TU7+TAsh3rr4QznwJSrvjo6dKHc/5soB05Hb68aaV1iMCEI VHuS2uoW5CYn1YaiQLsQVuSq9vESQf1jxJ/jHMOHAqD2//snkfIIkf+WEhE1jfhsu7Ob PepUrzOdnIhhYlwBSqpEwzOq2WlehFDHPmqp6wLxLryjGpf43YWSFBsyLBhLcMFRHfEP ZVL1SwceR0UuTIUMGniQqcDwJBgN8J/WhJSP6j8eTBhGXoBwhEik3Vxruq1OdR0JQR/v ufoZXpU628bCs5BwiLJJmgpO6vTXl0gO0fwP4KeKKYa2dtbY//F8MpG2akBuIgEN7xEz ow3A== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=m1OQJ4n3; 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-45432-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-45432-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 ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id g18-20020a05620a219200b0078329ed2894si7804800qka.525.2024.01.30.14.52.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 14:52:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-45432-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=m1OQJ4n3; 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-45432-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-45432-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 466391C23856 for ; Tue, 30 Jan 2024 22:52:47 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 136D079941; Tue, 30 Jan 2024 22:52:40 +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="m1OQJ4n3" 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 A3FC7762E7; Tue, 30 Jan 2024 22:52:35 +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=1706655159; cv=none; b=nhsWqQwBzAo+Dw/vbIciLVIn5iJQyehWQAWIT/EJUuO/xBnseGzyilbebaSgneWbhJgGGCFxWnw2fAYItg16+8J+9/IbscJOLheRGWxyWm3PDKJbkWliDjBOcLodFZQEhB0wBGHv/I9Z85xQP60+U1CbRdV2lGPar517aCo4FxU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706655159; c=relaxed/simple; bh=YyLYasP0pOILyLWowQmNGZjzxaGZdfhFwF8VS+XcsiY=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=B+CuIccpoKDOFm02CirrDFohpktmUS67M9ZQOYBgXEMsNcleT0o7bfVw8A7LbZIjGAqxbG/j1Rwjn8dD0eukWUl+uvZ8UWQgrvT86qK7G3AD8LbOTVbO4HOba4WCYB12raoacK46pZXDnz78Ni6tsgQy8/zBMx3pHB25YGHgya4= 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=m1OQJ4n3; 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=1706655153; bh=6XIISc8ch5WBdNoc3WXfwX9OwjBJgr8GK3svOK/ZC8A=; h=Date:From:To:Cc:Subject:From; b=m1OQJ4n31fLnwY7HZYy8bz7xI7bbGbiTsqYmKlRRdTOYm+4PF+jpPUt707NGYkzT/ QmS7IlNXbTuHngnNmPRkPf7uYD1PHacqffFjjEhIChyFAp6CdbKy2coBbupCUo2s4f IhxI01K++d2zwEE7xHUtBHPhGRic+a7vGC+ZH4PbxY4xjsQ2vbj+M7jeaD/pr9dgqI 9eDmtkPBdEIFDGCwN8Ae9gspE5cdqBfPsemtQhPq14UITGFR9Q02jgj7ufF057DU0d Rdh/qUm+Nt/nWQn25ZhsT1UzxWJLAeDY8FauRdzXWGe2d5N/x37KOLq+D41ybWR6+h O4h91p1VZmyYw== 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 4TPgRP06Gnz4wyl; Wed, 31 Jan 2024 09:52:32 +1100 (AEDT) Date: Wed, 31 Jan 2024 09:52:31 +1100 From: Stephen Rothwell To: Jonathan Corbet , Greg Kroah-Hartman Cc: Linux Kernel Mailing List , Linux Next Mailing List , Randy Dunlap , Udipto Goswami Subject: linux-next: manual merge of the jc_docs tree with the usb.current tree Message-ID: <20240131095231.292911c3@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_/8wyep8sWf56.W5L1XcqloAs"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/8wyep8sWf56.W5L1XcqloAs Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the jc_docs tree got a conflict in: Documentation/usb/gadget-testing.rst between commit: 20d03ae36ec0 ("usb: gadget: ncm: Fix indentations in documentation of NCM= section") from the usb.current tree and commit: e49bf650ab5b ("usb: gadget: fix max_segment_size malformed table") from the jc_docs tree. I fixed it up (these commits fix the same problem, I used the former) 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 --Sig_/8wyep8sWf56.W5L1XcqloAs Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmW5fa8ACgkQAVBC80lX 0Gw3uwf/YOTZq+29TPvAF+j/ZgECk+GQ/NjAKnNCVFCh/XTFXo9iUkpLb2LPnujP Oplx5cbwYVWwBbBvIwAm3guJhqVoKNIFCAGbDdDeFT4d9vWV9VU4B4Wy7BOjW/nT QCAGJMGFCa+sR61oZRidBjw3xAO7YQWwagU28tDSLc4Z1Z72U/86gl8loQe5YN7m DWcO69UzquW5rZpjYDj0r2dXDnCh76nMJ3zXxXaqQjk7oUfMQuYC5tkOpMwUIkVz /kQW0yAkuctHyLshZDMwfTM+qVcEP7GKrjnNrGeuZ7KXk/VbiEQlLm0nyZ3eTfDf x8ExIP0zvvsySurk0rUCz78PxmPpXQ== =dkJY -----END PGP SIGNATURE----- --Sig_/8wyep8sWf56.W5L1XcqloAs--