* linux-next: manual merge of the scsi-mkp tree with the vfs-brauner tree
@ 2026-11-17 23:25 Mark Brown
0 siblings, 0 replies; 3+ messages in thread
From: Mark Brown @ 2026-11-17 23:25 UTC (permalink / raw)
To: Martin K. Petersen
Cc: Christian Brauner, Linux Kernel Mailing List,
Linux Next Mailing List, Martin K. Petersen, Shao Mingyin
[-- 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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the scsi-mkp tree with the vfs-brauner tree
@ 2024-02-27 4:37 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2024-02-27 4:37 UTC (permalink / raw)
To: Martin K. Petersen, Christian Brauner
Cc: Bart Van Assche, Chuck Lever, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1123 bytes --]
Hi all,
Today's linux-next merge of the scsi-mkp tree got a conflict in:
include/linux/fs.h
between commit:
0e4a862174f2 ("libfs: Convert simple directory offsets to use a Maple Tree")
from the vfs-brauner tree and commit:
fe3944fb245a ("fs: Move enum rw_hint into a new header file")
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.
--
Cheers,
Stephen Rothwell
diff --cc include/linux/fs.h
index f69c082e0f16,bdabda5dc364..000000000000
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -43,7 -43,7 +43,8 @@@
#include <linux/cred.h>
#include <linux/mnt_idmapping.h>
#include <linux/slab.h>
+#include <linux/maple_tree.h>
+ #include <linux/rw_hint.h>
#include <asm/byteorder.h>
#include <uapi/linux/fs.h>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the scsi-mkp tree with the vfs-brauner tree
@ 2024-02-27 4:34 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2024-02-27 4:34 UTC (permalink / raw)
To: Martin K. Petersen, Christian Brauner
Cc: Bart Van Assche, Christoph Hellwig, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1653 bytes --]
Hi all,
Today's linux-next merge of the scsi-mkp tree got a conflict in:
fs/iomap/buffered-io.c
between commits:
dec3a7b3aa45 ("iomap: move the iomap_sector sector calculation out of iomap_add_to_ioend")
ae5535efd8c4 ("iomap: don't chain bios")
from the vfs-brauner tree and commit:
449813515d3e ("block, fs: Restore the per-bio/request data lifetime fields")
from the scsi-mkp tree.
I fixed it up (I think - 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 fs/iomap/buffered-io.c
index ae4e2026e59e,18e1fef53fbc..000000000000
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@@ -1687,11 -1666,11 +1687,12 @@@ static struct iomap_ioend *iomap_alloc_
bio = bio_alloc_bioset(wpc->iomap.bdev, BIO_MAX_VECS,
REQ_OP_WRITE | wbc_to_write_flags(wbc),
GFP_NOFS, &iomap_ioend_bioset);
- bio->bi_iter.bi_sector = sector;
+ bio->bi_iter.bi_sector = iomap_sector(&wpc->iomap, pos);
+ bio->bi_end_io = iomap_writepage_end_bio;
+ bio->bi_write_hint = inode->i_write_hint;
wbc_init_bio(wbc, bio);
- ioend = container_of(bio, struct iomap_ioend, io_inline_bio);
+ ioend = iomap_ioend_from_bio(bio);
INIT_LIST_HEAD(&ioend->io_list);
ioend->io_type = wpc->iomap.type;
ioend->io_flags = wpc->iomap.flags;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-11-17 23:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-17 23:25 linux-next: manual merge of the scsi-mkp tree with the vfs-brauner tree Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2024-02-27 4:37 Stephen Rothwell
2024-02-27 4:34 Stephen Rothwell
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®