From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 984ABC43217 for ; Fri, 25 Nov 2022 00:25:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229767AbiKYAZw (ORCPT ); Thu, 24 Nov 2022 19:25:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229514AbiKYAZu (ORCPT ); Thu, 24 Nov 2022 19:25:50 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 24401827E1; Thu, 24 Nov 2022 16:25:49 -0800 (PST) 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 ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4NJFyH2lrNz4xN7; Fri, 25 Nov 2022 11:25:43 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1669335944; bh=vHhDHdhQ7cy7gKTzyyO1n/uhTQymw8N+AlJaDSAhm5E=; h=Date:From:To:Cc:Subject:From; b=gkLHTHL/y+UXYwxPnxRlm7TeDdYy80Klq8S+aq5Z4AouPdP4TC7qXWFaxHzZw8k/F kpOWRTTYeKbkG1YX4WMZCeHTz0yaJXu7NGW/5unfzEFSRy6gyvT5ciZlFW0U3hRlKM 7d1zQWkI2ZXV9U2v6UqAPFFx/Yf+M04qB2ddPJs4AZ2/EGEa+CYxJMm0huXBqkuGJs jKHalYGRxyF3PqwAGVMQ47pdHAjvUTz3dDXirPLdnXObjj/gyyT2RGmHy7aR0gptag pmliEAJiqi/T/Cvhw78EIycQODGKm4WwdwU+LL83kzbRAqOcNO1mTmYPDv2bVaaUfF /thV6r/5IX72w== Date: Fri, 25 Nov 2022 11:25:42 +1100 From: Stephen Rothwell To: Greg KH , Arnd Bergmann , Florian Fainelli Cc: Greg Kroah-Hartman , Linux Kernel Mailing List , Linux Next Mailing List , Yang Yingliang , Yuan Can Subject: linux-next: manual merge of the char-misc tree with the broadcom tree Message-ID: <20221125112542.466ebc42@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/xr_1ppfyl/dfmvx4mdFtLbM"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/xr_1ppfyl/dfmvx4mdFtLbM Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the char-misc tree got a conflict in: drivers/firmware/raspberrypi.c between commit: 117bd98daca0 ("firmware: raspberrypi: Use dev_err_probe() to simplify cod= e") from the broadcom tree and commit: 7b51161696e8 ("firmware: raspberrypi: fix possible memory leak in rpi_fir= mware_probe()") from the char-misc 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 drivers/firmware/raspberrypi.c index ec07bf26e5eb,dba315f675bc..000000000000 --- a/drivers/firmware/raspberrypi.c +++ b/drivers/firmware/raspberrypi.c @@@ -288,9 -268,13 +288,11 @@@ static int rpi_firmware_probe(struct pl fw->cl.tx_block =3D true; =20 fw->chan =3D mbox_request_channel(&fw->cl, 0); - if (IS_ERR(fw->chan)) - return dev_err_probe(dev, PTR_ERR(fw->chan), - "Failed to get mbox channel\n"); + if (IS_ERR(fw->chan)) { + int ret =3D PTR_ERR(fw->chan); - if (ret !=3D -EPROBE_DEFER) - dev_err(dev, "Failed to get mbox channel: %d\n", ret); + kfree(fw); - return ret; ++ return dev_err_probe(dev, ret, "Failed to get mbox channel\n"); + } =20 init_completion(&fw->c); kref_init(&fw->consumers); --Sig_/xr_1ppfyl/dfmvx4mdFtLbM Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmOAC4YACgkQAVBC80lX 0GxjFQf/aLHUbFePwhLqPE3Mv3ruJuMUYVgdD4CF1kmbIaepxlt6vtFqRhG+yFC1 lp2cMnnwBJO8j2bsF06u7Csstr3+Gr4Q1yq0MFBkXzv7j4KddroX+o1+eoWkJsHD V1EDOXYEjaRV2eJBSXs3JABUQjdzw89h4mf4qMBtj50YbUjSQ3IpKSUArcuVZbAJ 6XLq0gfiAeb6q0zjiyYp9oIE9UI43+fXyiRIfxTkX+OCN7RmIW/gNbiCpev9zf3v uF+6ZspocPYNREjphgcFXAu2QMWPZnaJVjNyR3q6j5tL9w2FQZ9Qr7LUy+E1Y8Ji owCiJjgYTJ9JQfQ9znNVyjqwO7PyYA== =dpQS -----END PGP SIGNATURE----- --Sig_/xr_1ppfyl/dfmvx4mdFtLbM--