From patchwork Wed Jan 31 00:59:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 194419 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2087:b0:106:209c:c626 with SMTP id gs7csp1596985dyb; Tue, 30 Jan 2024 17:01:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IHDZor/jATNeX9nes3s9yhPPvM1hKtsU6fwx0FqocDuvIpAdcKhZGn+/vJJdQ610mmeUgiU X-Received: by 2002:a05:6358:5d8c:b0:178:a3ea:b86 with SMTP id s12-20020a0563585d8c00b00178a3ea0b86mr1114620rwm.17.1706662903685; Tue, 30 Jan 2024 17:01:43 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706662903; cv=pass; d=google.com; s=arc-20160816; b=I9ZNTwWlDRE65YLQRKWnfz6Lzi75zhcolK4Bfc6+eA5QJuoYAFJlRSQP3oZbkOIIu5 WZPCe/6UClt72aBEN38Y1Kb+oxBIum7cX7VZ96Mf15kcP8EKjGcSfH8hHbKR/JvMC89A VbUIa6RVbOay34mgndqm5/a/FZPqeilCeQItJrpgZSWDmoo2VWEDegl7cnxCLKxgJmQn om5B/H/xbPSKsX0oqKc0L3Wa2m4mlhIGOwaZxyGps/hhyzXnSMOP11sBjlQvRF4nhz4z vC5mszl3eK/7CN+QnIA5Xa7DSPkJ//hBlkm26766fhgI6raC4TeGbUJU2vdDiZW8SpxZ 25ZQ== 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=wjVD1WbRSrw5Ycre1uFpDlv9VdOGrAXKq18adQUu1sM=; fh=lQIk5VFWs5dc4OudNqtomPIxbfTSvQnvwFs6O6a8/i4=; b=kisNQSPbqD/gZmwCIU+nNIizfzLFmsh2Xpu8c7TqEKIiH+agBEn60mWWZ5nNaLK5CY o4X2BNJsPXO97XlMXftPwHX/kXpt9tlT41m4PiKLvVoRIlrGjmXkzpp09/uuvn2ZaAKd HRSuG/sEHAP+69c6Y1Hhzd3rUL/3B1TinVqULI/mYP7LmcX66JpPRdpNfXndXBSasuBC wXKj3goUeuXEXpgsUhE2VPovAE2DL+4HB/8/TJQUtUgcWWjy+cYGz9azas+Quq7fO0sm NseLnjrdemdlmoE0YkpC6uzJTHb+9Ql5RvuvBydDMVU2JBIwCvYvD4fXAJJkHzPx16Yo 84BA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=BcR4dqQL; 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-45557-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-45557-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au X-Forwarded-Encrypted: i=1; AJvYcCUQaaPvk/gKkavTkeAYCHS8wRug5PGiwn/PwYiIZ8OvJY/wWxbTykaMvwtvt0EYtzpiy8amNA309RMJk3zxn6rTaXLmcQ== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id 82-20020a630155000000b005cf94b8d9ddsi8423380pgb.869.2024.01.30.17.01.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 17:01:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-45557-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=BcR4dqQL; 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-45557-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-45557-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 sy.mirrors.kernel.org (Postfix) with ESMTPS id 52E12B25811 for ; Wed, 31 Jan 2024 01:00:16 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6DB5ECA7D; Wed, 31 Jan 2024 00:59:38 +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="BcR4dqQL" 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 EBF0215D0; Wed, 31 Jan 2024 00:59:28 +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=1706662775; cv=none; b=scjTu/22tU1hx7UV8NUQxbIDy4Aapael611lhe+duXaffIbmmPG5s1c4dSYudqjfM2MGFZ/8wvuj97189WrqFqXh6pr2g3imWabr+7W1+7dFlJI7HalqmTyBRNNlzDMXrVWC+AGcvJa2U3nt0hXhdpO9JVR5gUp0IaoNkV9ZXF4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706662775; c=relaxed/simple; bh=QiAGZ5YlDQ9/BN4wTc+dq6HR05vGiESwMYzkZwr6Q5g=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=TqYELSdMjTgiEuka8JaC1s44XBy5nfPTAx0vixQZeXWipwlgqZCEsF9yTJZBF/H2fYz4toV9lYaUV6Vv9GnkUcUrLxpyqqv9Ha+w/UrLPp6tMV+ZDFT2Q+/zR08nXhQ92cgRgKrSDNkGg0XyVeWRCUjfHdp671ewpfs16zUTLyI= 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=BcR4dqQL; 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=1706662767; bh=wjVD1WbRSrw5Ycre1uFpDlv9VdOGrAXKq18adQUu1sM=; h=Date:From:To:Cc:Subject:From; b=BcR4dqQLIyYWEgm9s8Df6TLz1Tz2oHgYRLJYGlzny3WgI5XZl9TTDDDt40cKRtSTc PoaFTwwLHXjyZo5OyS1Vc1snNlCBnLWF7mHqgtjDdaZOBxet9y5yACtX+KJMZR+2fL XJEq6r3dYpn6TYqr73Hgkajy7qz01Nl3S6XTrRHDntgykODed28fisR4h6fllUB7xC btXaVaQq/yOdlpiMC7rV4XOxiqw5pJ4FSWczhiYnDwQAOfCwl0Hn3gIbeZEAmwKsw6 dvyC7afOvs+TKRkj4osA7xEqJ/4TuRVbQsRtoVtTdB4MgQ5az7QNZdMGT0nTcfJsVg OzvA47YKMa4cw== 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 4TPkFp16Wlz4x5k; Wed, 31 Jan 2024 11:59:25 +1100 (AEDT) Date: Wed, 31 Jan 2024 11:59:25 +1100 From: Stephen Rothwell To: Bartosz Golaszewski , Jonathan Corbet Cc: Bartosz Golaszewski , Kent Gibson , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the gpio-brgl tree with the jc_docs tree Message-ID: <20240131115838.4af8131c@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789565761005021374 X-GMAIL-MSGID: 1789565761005021374 Hi all, Today's linux-next merge of the gpio-brgl tree got a conflict in: Documentation/userspace-api/index.rst between commit: 8722435d325b ("docs: rework the userspace-api top page") from the jc_docs tree and commit: 32a0a0da530e ("Documentation: gpio: add chardev userspace API documentation") from the gpio-brgl 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 Documentation/userspace-api/index.rst index 67d663cf2ff2,ee58d92c53c7..000000000000 --- a/Documentation/userspace-api/index.rst