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:   Thu, 20 Jun 2019 15:35:52 +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: linux-next: manual merge of the char-misc tree with the driver-core
 tree
Message-ID: <20190620153552.1392079c@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/s4hH9bWg9WYbiPbQg4cMoeu"; protocol="application/pgp-signature"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/s4hH9bWg9WYbiPbQg4cMoeu
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/misc/mei/debugfs.c

between commit:

  5666d896e838 ("mei: no need to check return value of debugfs_create funct=
ions")

from the driver-core tree and commit:

  b728ddde769c ("mei: Convert to use DEFINE_SHOW_ATTRIBUTE macro")

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/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, dir,
 -				&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

--Sig_/s4hH9bWg9WYbiPbQg4cMoeu
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl0LGzgACgkQAVBC80lX
0Gx+/Qf/S15uY6Nn5ycxBmC3UidN6Uf+3Pj/x4SMY2uGl7t0VgNceWCt0jw3ltbA
q8j2KbhW7Qb0exvqptpwllSfmURa58UVBmJKZtM4KSOUCBCEGf1hfSebhjSrLjSE
PIt/1w8wkImag0yJEKYQUKQf6fy6L2USTYJUUl+02igmha+vw05+wFuQMBsbG36G
1sHUiCRosU3ZVvlnGVniFhcVOsAV4up7rckKop2iwQ8AmjgaKBDqJ89qh/ry12uA
4QYU9N6KdGzNvCsldDH5eyRX16lKAuXCZ7G4WdB2Oquo+oOvQCPY3E2kmhgtzscm
Y/ZivqOFhflKtmvT88WAS2tkU0Nqig==
=r+OW
-----END PGP SIGNATURE-----

--Sig_/s4hH9bWg9WYbiPbQg4cMoeu--