Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Tue, 9 Jul 2019 09:51:09 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Greg KH <greg@kroah.com>, Arnd Bergmann <arnd@arndb.de>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Vitaly Lubart <vitaly.lubart@intel.com>,
        Tomas Winkler <tomas.winkler@intel.com>
Subject: Re: linux-next: manual merge of the char-misc tree with the
 driver-core tree
Message-ID: <20190709095109.3b75679b@canb.auug.org.au>
In-Reply-To: <20190620153552.1392079c@canb.auug.org.au>
References: <20190620153552.1392079c@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/JAf6ezzsaM1jlJtn1/V9/8e"; protocol="application/pgp-signature"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/JAf6ezzsaM1jlJtn1/V9/8e
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Thu, 20 Jun 2019 15:35:52 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> Today's linux-next merge of the char-misc tree got a conflict in:
>=20
>   drivers/misc/mei/debugfs.c
>=20
> between commit:
>=20
>   5666d896e838 ("mei: no need to check return value of debugfs_create fun=
ctions")
>=20
> from the driver-core tree and commit:
>=20
>   b728ddde769c ("mei: Convert to use DEFINE_SHOW_ATTRIBUTE macro")
>=20
> from the char-misc tree.
>=20
> 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
> --=20
> Cheers,
> Stephen Rothwell
>=20
> diff --cc drivers/misc/mei/debugfs.c
> index df6bf8b81936,47cfd5005e1b..000000000000
> --- a/drivers/misc/mei/debugfs.c
> +++ b/drivers/misc/mei/debugfs.c
> @@@ -233,22 -154,46 +154,21 @@@ void mei_dbgfs_deregister(struct mei_de
>    *
>    * @dev: the mei device structure
>    * @name: the mei device name
>  - *
>  - * Return: 0 on success, <0 on failure.
>    */
>  -int mei_dbgfs_register(struct mei_device *dev, const char *name)
>  +void mei_dbgfs_register(struct mei_device *dev, const char *name)
>   {
>  -	struct dentry *dir, *f;
>  +	struct dentry *dir;
>  =20
>   	dir =3D debugfs_create_dir(name, NULL);
>  -	if (!dir)
>  -		return -ENOMEM;
>  -
>   	dev->dbgfs_dir =3D dir;
>  =20
>  -	f =3D debugfs_create_file("meclients", S_IRUSR, dir,
>  -				dev, &mei_dbgfs_meclients_fops);
>  -	if (!f) {
>  -		dev_err(dev->dev, "meclients: registration failed\n");
>  -		goto err;
>  -	}
>  -	f =3D debugfs_create_file("active", S_IRUSR, dir,
>  -				dev, &mei_dbgfs_active_fops);
>  -	if (!f) {
>  -		dev_err(dev->dev, "active: registration failed\n");
>  -		goto err;
>  -	}
>  -	f =3D debugfs_create_file("devstate", S_IRUSR, dir,
>  -				dev, &mei_dbgfs_devstate_fops);
>  -	if (!f) {
>  -		dev_err(dev->dev, "devstate: registration failed\n");
>  -		goto err;
>  -	}
>  -	f =3D debugfs_create_file("allow_fixed_address", S_IRUSR | S_IWUSR, di=
r,
>  -				&dev->allow_fixed_address,
>  -				&mei_dbgfs_allow_fa_fops);
>  -	if (!f) {
>  -		dev_err(dev->dev, "allow_fixed_address: registration failed\n");
>  -		goto err;
>  -	}
>  -	return 0;
>  -err:
>  -	mei_dbgfs_deregister(dev);
>  -	return -ENODEV;
>  +	debugfs_create_file("meclients", S_IRUSR, dir, dev,
> - 			    &mei_dbgfs_fops_meclients);
> ++			    &mei_dbgfs_meclients_fops);
>  +	debugfs_create_file("active", S_IRUSR, dir, dev,
> - 			    &mei_dbgfs_fops_active);
> ++			    &mei_dbgfs_active_fops);
>  +	debugfs_create_file("devstate", S_IRUSR, dir, dev,
> - 			    &mei_dbgfs_fops_devstate);
> ++			    &mei_dbgfs_devstate_fops);
>  +	debugfs_create_file("allow_fixed_address", S_IRUSR | S_IWUSR, dir,
>  +			    &dev->allow_fixed_address,
> - 			    &mei_dbgfs_fops_allow_fa);
> ++			    &mei_dbgfs_allow_fa_fops);
>   }
> -=20

I am still getting this conflict (the commit ids may have changed).
Just a reminder in case you think Linus may need to know.

--=20
Cheers,
Stephen Rothwell

--Sig_/JAf6ezzsaM1jlJtn1/V9/8e
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl0j1u0ACgkQAVBC80lX
0GyhyQf9FQt0FBrBQjpamrC9fp5pVC77qxrBjEZB6lJ/sEOJROGM2c+9vui6LvWX
Z/WbXzvpJ1texDifmB76cIlv6bsefhxzIKxBF4fC7ty4NOWATvHYJ0EqyLA8PjeO
lRrYLDOxpDz76Mvcy0L44+vdSOLuXa+XQwX2vE2JOE+7dmJOSyQVe+iy0V5jVcph
6jAtNw7j5fbwgxyd1/EM/0CSLMk0GNbnTBpED/pGyD+3/s7tgDln3e/4qoVaSqME
VEmjdtPxuScc7pylRr8vdN2vT7k8Ds9UidHoid/UM2sh8qhJNjyDKC94+gNVMVen
Sc0KDDTIm4UH9GdYy5HG3V/MbMDI3g==
=JMsA
-----END PGP SIGNATURE-----

--Sig_/JAf6ezzsaM1jlJtn1/V9/8e--