From: Mark Brown <broonie@kernel.org>
To: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Christian Brauner <brauner@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
"Martin K. Petersen" <mkp@kernel.org>,
Shao Mingyin <shao.mingyin@zte.com.cn>
Subject: linux-next: manual merge of the scsi-mkp tree with the vfs-brauner tree
Date: Tue, 17 Nov 2026 23:25:43 +0000 [thread overview]
Message-ID: <avzid_ZRuSyAKfRd@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1928 bytes --]
Hi all,
Today's linux-next merge of the scsi-mkp tree got a conflict in:
drivers/scsi/scsi_devinfo.c
between commit:
6d14b93c111a1 ("scsi: core: let procfs copy in writes")
from the vfs-brauner tree and commit:
787fd1429b360 ("scsi: scsi_devinfo: Return an error when the proc write fails")
from the scsi-mkp 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 drivers/scsi/scsi_devinfo.c
index d9093851b23e0,b1f3bcd739b46..0000000000000
--- a/drivers/scsi/scsi_devinfo.c
+++ b/drivers/scsi/scsi_devinfo.c
@@@ -678,14 -683,37 +678,19 @@@ static const struct seq_operations scsi
* To use, echo "vendor:model:flag" > /proc/scsi/device_info
*/
static ssize_t proc_scsi_devinfo_write(struct file *file,
- const char __user *buf,
+ char *buffer,
size_t length, loff_t *ppos)
{
- char *buffer;
- ssize_t err = length;
+ int ret;
+
- if (!buf || length>PAGE_SIZE)
+ if (length == PAGE_SIZE && buffer[PAGE_SIZE-1])
return -EINVAL;
- buffer = kmalloc(PAGE_SIZE, GFP_KERNEL);
- if (!buffer)
- return -ENOMEM;
- if (copy_from_user(buffer, buf, length)) {
- err =-EFAULT;
- goto out;
- }
-
- if (length < PAGE_SIZE)
- buffer[length] = '\0';
- else if (buffer[PAGE_SIZE-1]) {
- err = -EINVAL;
- goto out;
- }
- scsi_dev_info_list_add_str(buffer);
+ ret = scsi_dev_info_list_add_str(buffer);
+ if (ret)
+ return ret;
+
-out:
- kfree(buffer);
- return err;
+ return length;
}
static const struct proc_ops scsi_devinfo_proc_ops = {
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2026-11-17 23:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-17 23:25 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-02-27 4:37 Stephen Rothwell
2024-02-27 4:34 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=avzid_ZRuSyAKfRd@sirena.org.uk \
--to=broonie@kernel.org \
--cc=brauner@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=mkp@kernel.org \
--cc=shao.mingyin@zte.com.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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
all inboxes | Powered by JetHome®