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
Date: Thu, 20 Jun 2019 15:35:52 +1000 [thread overview]
Message-ID: <20190620153552.1392079c@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2887 bytes --]
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 functions")
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.
--
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;
dir = debugfs_create_dir(name, NULL);
- if (!dir)
- return -ENOMEM;
-
dev->dbgfs_dir = dir;
- f = 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 = 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 = 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 = 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);
}
-
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-06-20 5:36 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-20 5:35 Stephen Rothwell [this message]
2019-06-20 6:20 ` linux-next: manual merge of the char-misc tree with the driver-core tree Greg KH
2019-07-08 23:51 ` Stephen Rothwell
2019-07-09 7:12 ` Winkler, Tomas
2019-07-10 6:00 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2025-09-08 6:25 Stephen Rothwell
2025-09-08 8:57 ` Greg KH
2019-07-01 9:09 Stephen Rothwell
2019-07-01 18:39 ` Nathan Chancellor
2019-07-01 21:53 ` Stephen Rothwell
2019-07-01 20:04 ` Nathan Chancellor
2019-07-01 21:58 ` Stephen Rothwell
2019-07-02 14:18 ` Jean-Philippe Brucker
2019-07-02 15:18 ` Joerg Roedel
2019-07-02 15:23 ` Michael S. Tsirkin
2019-07-02 15:58 ` Joerg Roedel
2019-07-02 17:05 ` Michael S. Tsirkin
2019-07-02 21:41 ` Stephen Rothwell
2019-07-03 8:41 ` Suzuki K Poulose
2019-07-12 0:53 ` Stephen Rothwell
2019-07-15 20:22 ` Mathieu Poirier
2019-06-13 5:53 Stephen Rothwell
2019-06-13 6:10 ` Greg KH
2019-07-08 23:20 ` Stephen Rothwell
2019-07-08 23:25 ` Nadav Amit
2019-07-09 6:15 ` Greg KH
2019-07-12 7:45 ` Greg KH
2017-02-01 4:28 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190620153552.1392079c@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tomas.winkler@intel$(echo .)com \
--cc=vitaly.lubart@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox