* linux-next: manual merge of the block tree with the jc_docs tree
@ 2019-06-25 4:42 Stephen Rothwell
2019-07-09 0:08 ` Stephen Rothwell
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2019-06-25 4:42 UTC (permalink / raw)
To: Jens Axboe, Jonathan Corbet
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Mauro Carvalho Chehab, Akinobu Mita, Christoph Hellwig
[-- Attachment #1: Type: text/plain, Size: 3937 bytes --]
Hi all,
Today's linux-next merge of the block tree got a conflict in:
Documentation/fault-injection/nvme-fault-injection.txt
between commit:
10ffebbed550 ("docs: fault-injection: convert docs to ReST and rename to *.rst")
from the jc_docs tree and commit:
7e31d8215fd8 ("Documentation: nvme: add an example for nvme fault injection")
from the block tree.
I fixed it up (I removed the file and applied the following patch) 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.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 25 Jun 2019 14:39:46 +1000
Subject: [PATCH] Documentation: nvme: fix for change to rst
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
.../fault-injection/nvme-fault-injection.rst | 58 +++++++++++++++++++
1 file changed, 58 insertions(+)
diff --git a/Documentation/fault-injection/nvme-fault-injection.rst b/Documentation/fault-injection/nvme-fault-injection.rst
index bbb1bf3e8650..cdb2e829228e 100644
--- a/Documentation/fault-injection/nvme-fault-injection.rst
+++ b/Documentation/fault-injection/nvme-fault-injection.rst
@@ -118,3 +118,61 @@ Message from dmesg::
cpu_startup_entry+0x6f/0x80
start_secondary+0x187/0x1e0
secondary_startup_64+0xa5/0xb0
+
+Example 3: Inject an error into the 10th admin command
+------------------------------------------------------
+
+::
+
+ echo 100 > /sys/kernel/debug/nvme0/fault_inject/probability
+ echo 10 > /sys/kernel/debug/nvme0/fault_inject/space
+ echo 1 > /sys/kernel/debug/nvme0/fault_inject/times
+ nvme reset /dev/nvme0
+
+Expected Result::
+
+ After NVMe controller reset, the reinitialization may or may not succeed.
+ It depends on which admin command is actually forced to fail.
+
+Message from dmesg::
+
+ nvme nvme0: resetting controller
+ FAULT_INJECTION: forcing a failure.
+ name fault_inject, interval 1, probability 100, space 1, times 1
+ CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.2.0-rc2+ #2
+ Hardware name: MSI MS-7A45/B150M MORTAR ARCTIC (MS-7A45), BIOS 1.50 04/25/2017
+ Call Trace:
+ <IRQ>
+ dump_stack+0x63/0x85
+ should_fail+0x14a/0x170
+ nvme_should_fail+0x38/0x80 [nvme_core]
+ nvme_irq+0x129/0x280 [nvme]
+ ? blk_mq_end_request+0xb3/0x120
+ __handle_irq_event_percpu+0x84/0x1a0
+ handle_irq_event_percpu+0x32/0x80
+ handle_irq_event+0x3b/0x60
+ handle_edge_irq+0x7f/0x1a0
+ handle_irq+0x20/0x30
+ do_IRQ+0x4e/0xe0
+ common_interrupt+0xf/0xf
+ </IRQ>
+ RIP: 0010:cpuidle_enter_state+0xc5/0x460
+ Code: ff e8 8f 5f 86 ff 80 7d c7 00 74 17 9c 58 0f 1f 44 00 00 f6 c4 02 0f 85 69 03 00 00 31 ff e8 62 aa 8c ff fb 66 0f 1f 44 00 00 <45> 85 ed 0f 88 37 03 00 00 4c 8b 45 d0 4c 2b 45 b8 48 ba cf f7 53
+ RSP: 0018:ffffffff88c03dd0 EFLAGS: 00000246 ORIG_RAX: ffffffffffffffdc
+ RAX: ffff9dac25a2ac80 RBX: ffffffff88d53760 RCX: 000000000000001f
+ RDX: 0000000000000000 RSI: 000000002d958403 RDI: 0000000000000000
+ RBP: ffffffff88c03e18 R08: fffffff75e35ffb7 R09: 00000a49a56c0b48
+ R10: ffffffff88c03da0 R11: 0000000000001b0c R12: ffff9dac25a34d00
+ R13: 0000000000000006 R14: 0000000000000006 R15: ffffffff88d53760
+ cpuidle_enter+0x2e/0x40
+ call_cpuidle+0x23/0x40
+ do_idle+0x201/0x280
+ cpu_startup_entry+0x1d/0x20
+ rest_init+0xaa/0xb0
+ arch_call_rest_init+0xe/0x1b
+ start_kernel+0x51c/0x53b
+ x86_64_start_reservations+0x24/0x26
+ x86_64_start_kernel+0x74/0x77
+ secondary_startup_64+0xa4/0xb0
+ nvme nvme0: Could not set queue count (16385)
+ nvme nvme0: IO queues not created
--
2.20.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: linux-next: manual merge of the block tree with the jc_docs tree
2019-06-25 4:42 linux-next: manual merge of the block tree with the jc_docs tree Stephen Rothwell
@ 2019-07-09 0:08 ` Stephen Rothwell
2019-07-09 2:45 ` Christoph Hellwig
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2019-07-09 0:08 UTC (permalink / raw)
To: Jens Axboe, Jonathan Corbet
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Mauro Carvalho Chehab, Akinobu Mita, Christoph Hellwig
[-- Attachment #1: Type: text/plain, Size: 4349 bytes --]
Hi all,
On Tue, 25 Jun 2019 14:42:26 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the block tree got a conflict in:
>
> Documentation/fault-injection/nvme-fault-injection.txt
>
> between commit:
>
> 10ffebbed550 ("docs: fault-injection: convert docs to ReST and rename to *.rst")
>
> from the jc_docs tree and commit:
>
> 7e31d8215fd8 ("Documentation: nvme: add an example for nvme fault injection")
>
> from the block tree.
>
> I fixed it up (I removed the file and applied the following patch) 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.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 25 Jun 2019 14:39:46 +1000
> Subject: [PATCH] Documentation: nvme: fix for change to rst
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> .../fault-injection/nvme-fault-injection.rst | 58 +++++++++++++++++++
> 1 file changed, 58 insertions(+)
>
> diff --git a/Documentation/fault-injection/nvme-fault-injection.rst b/Documentation/fault-injection/nvme-fault-injection.rst
> index bbb1bf3e8650..cdb2e829228e 100644
> --- a/Documentation/fault-injection/nvme-fault-injection.rst
> +++ b/Documentation/fault-injection/nvme-fault-injection.rst
> @@ -118,3 +118,61 @@ Message from dmesg::
> cpu_startup_entry+0x6f/0x80
> start_secondary+0x187/0x1e0
> secondary_startup_64+0xa5/0xb0
> +
> +Example 3: Inject an error into the 10th admin command
> +------------------------------------------------------
> +
> +::
> +
> + echo 100 > /sys/kernel/debug/nvme0/fault_inject/probability
> + echo 10 > /sys/kernel/debug/nvme0/fault_inject/space
> + echo 1 > /sys/kernel/debug/nvme0/fault_inject/times
> + nvme reset /dev/nvme0
> +
> +Expected Result::
> +
> + After NVMe controller reset, the reinitialization may or may not succeed.
> + It depends on which admin command is actually forced to fail.
> +
> +Message from dmesg::
> +
> + nvme nvme0: resetting controller
> + FAULT_INJECTION: forcing a failure.
> + name fault_inject, interval 1, probability 100, space 1, times 1
> + CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.2.0-rc2+ #2
> + Hardware name: MSI MS-7A45/B150M MORTAR ARCTIC (MS-7A45), BIOS 1.50 04/25/2017
> + Call Trace:
> + <IRQ>
> + dump_stack+0x63/0x85
> + should_fail+0x14a/0x170
> + nvme_should_fail+0x38/0x80 [nvme_core]
> + nvme_irq+0x129/0x280 [nvme]
> + ? blk_mq_end_request+0xb3/0x120
> + __handle_irq_event_percpu+0x84/0x1a0
> + handle_irq_event_percpu+0x32/0x80
> + handle_irq_event+0x3b/0x60
> + handle_edge_irq+0x7f/0x1a0
> + handle_irq+0x20/0x30
> + do_IRQ+0x4e/0xe0
> + common_interrupt+0xf/0xf
> + </IRQ>
> + RIP: 0010:cpuidle_enter_state+0xc5/0x460
> + Code: ff e8 8f 5f 86 ff 80 7d c7 00 74 17 9c 58 0f 1f 44 00 00 f6 c4 02 0f 85 69 03 00 00 31 ff e8 62 aa 8c ff fb 66 0f 1f 44 00 00 <45> 85 ed 0f 88 37 03 00 00 4c 8b 45 d0 4c 2b 45 b8 48 ba cf f7 53
> + RSP: 0018:ffffffff88c03dd0 EFLAGS: 00000246 ORIG_RAX: ffffffffffffffdc
> + RAX: ffff9dac25a2ac80 RBX: ffffffff88d53760 RCX: 000000000000001f
> + RDX: 0000000000000000 RSI: 000000002d958403 RDI: 0000000000000000
> + RBP: ffffffff88c03e18 R08: fffffff75e35ffb7 R09: 00000a49a56c0b48
> + R10: ffffffff88c03da0 R11: 0000000000001b0c R12: ffff9dac25a34d00
> + R13: 0000000000000006 R14: 0000000000000006 R15: ffffffff88d53760
> + cpuidle_enter+0x2e/0x40
> + call_cpuidle+0x23/0x40
> + do_idle+0x201/0x280
> + cpu_startup_entry+0x1d/0x20
> + rest_init+0xaa/0xb0
> + arch_call_rest_init+0xe/0x1b
> + start_kernel+0x51c/0x53b
> + x86_64_start_reservations+0x24/0x26
> + x86_64_start_kernel+0x74/0x77
> + secondary_startup_64+0xa4/0xb0
> + nvme nvme0: Could not set queue count (16385)
> + nvme nvme0: IO queues not created
> --
> 2.20.1
I am still getting this conflict (the commit ids may have changed).
Just a reminder in case you think Linus may need to know.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: linux-next: manual merge of the block tree with the jc_docs tree
2019-07-09 0:08 ` Stephen Rothwell
@ 2019-07-09 2:45 ` Christoph Hellwig
0 siblings, 0 replies; 8+ messages in thread
From: Christoph Hellwig @ 2019-07-09 2:45 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Jens Axboe, Jonathan Corbet, Linux Next Mailing List,
Linux Kernel Mailing List, Mauro Carvalho Chehab, Akinobu Mita,
Christoph Hellwig
Next time it would be really helpful if fixups to nvme documentation
went through the nvme/block tree..
On Tue, Jul 09, 2019 at 10:08:30AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> On Tue, 25 Jun 2019 14:42:26 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the block tree got a conflict in:
> >
> > Documentation/fault-injection/nvme-fault-injection.txt
> >
> > between commit:
> >
> > 10ffebbed550 ("docs: fault-injection: convert docs to ReST and rename to *.rst")
> >
> > from the jc_docs tree and commit:
> >
> > 7e31d8215fd8 ("Documentation: nvme: add an example for nvme fault injection")
> >
> > from the block tree.
> >
> > I fixed it up (I removed the file and applied the following patch) 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.
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Tue, 25 Jun 2019 14:39:46 +1000
> > Subject: [PATCH] Documentation: nvme: fix for change to rst
> >
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> > .../fault-injection/nvme-fault-injection.rst | 58 +++++++++++++++++++
> > 1 file changed, 58 insertions(+)
> >
> > diff --git a/Documentation/fault-injection/nvme-fault-injection.rst b/Documentation/fault-injection/nvme-fault-injection.rst
> > index bbb1bf3e8650..cdb2e829228e 100644
> > --- a/Documentation/fault-injection/nvme-fault-injection.rst
> > +++ b/Documentation/fault-injection/nvme-fault-injection.rst
> > @@ -118,3 +118,61 @@ Message from dmesg::
> > cpu_startup_entry+0x6f/0x80
> > start_secondary+0x187/0x1e0
> > secondary_startup_64+0xa5/0xb0
> > +
> > +Example 3: Inject an error into the 10th admin command
> > +------------------------------------------------------
> > +
> > +::
> > +
> > + echo 100 > /sys/kernel/debug/nvme0/fault_inject/probability
> > + echo 10 > /sys/kernel/debug/nvme0/fault_inject/space
> > + echo 1 > /sys/kernel/debug/nvme0/fault_inject/times
> > + nvme reset /dev/nvme0
> > +
> > +Expected Result::
> > +
> > + After NVMe controller reset, the reinitialization may or may not succeed.
> > + It depends on which admin command is actually forced to fail.
> > +
> > +Message from dmesg::
> > +
> > + nvme nvme0: resetting controller
> > + FAULT_INJECTION: forcing a failure.
> > + name fault_inject, interval 1, probability 100, space 1, times 1
> > + CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.2.0-rc2+ #2
> > + Hardware name: MSI MS-7A45/B150M MORTAR ARCTIC (MS-7A45), BIOS 1.50 04/25/2017
> > + Call Trace:
> > + <IRQ>
> > + dump_stack+0x63/0x85
> > + should_fail+0x14a/0x170
> > + nvme_should_fail+0x38/0x80 [nvme_core]
> > + nvme_irq+0x129/0x280 [nvme]
> > + ? blk_mq_end_request+0xb3/0x120
> > + __handle_irq_event_percpu+0x84/0x1a0
> > + handle_irq_event_percpu+0x32/0x80
> > + handle_irq_event+0x3b/0x60
> > + handle_edge_irq+0x7f/0x1a0
> > + handle_irq+0x20/0x30
> > + do_IRQ+0x4e/0xe0
> > + common_interrupt+0xf/0xf
> > + </IRQ>
> > + RIP: 0010:cpuidle_enter_state+0xc5/0x460
> > + Code: ff e8 8f 5f 86 ff 80 7d c7 00 74 17 9c 58 0f 1f 44 00 00 f6 c4 02 0f 85 69 03 00 00 31 ff e8 62 aa 8c ff fb 66 0f 1f 44 00 00 <45> 85 ed 0f 88 37 03 00 00 4c 8b 45 d0 4c 2b 45 b8 48 ba cf f7 53
> > + RSP: 0018:ffffffff88c03dd0 EFLAGS: 00000246 ORIG_RAX: ffffffffffffffdc
> > + RAX: ffff9dac25a2ac80 RBX: ffffffff88d53760 RCX: 000000000000001f
> > + RDX: 0000000000000000 RSI: 000000002d958403 RDI: 0000000000000000
> > + RBP: ffffffff88c03e18 R08: fffffff75e35ffb7 R09: 00000a49a56c0b48
> > + R10: ffffffff88c03da0 R11: 0000000000001b0c R12: ffff9dac25a34d00
> > + R13: 0000000000000006 R14: 0000000000000006 R15: ffffffff88d53760
> > + cpuidle_enter+0x2e/0x40
> > + call_cpuidle+0x23/0x40
> > + do_idle+0x201/0x280
> > + cpu_startup_entry+0x1d/0x20
> > + rest_init+0xaa/0xb0
> > + arch_call_rest_init+0xe/0x1b
> > + start_kernel+0x51c/0x53b
> > + x86_64_start_reservations+0x24/0x26
> > + x86_64_start_kernel+0x74/0x77
> > + secondary_startup_64+0xa4/0xb0
> > + nvme nvme0: Could not set queue count (16385)
> > + nvme nvme0: IO queues not created
> > --
> > 2.20.1
>
> I am still getting this conflict (the commit ids may have changed).
> Just a reminder in case you think Linus may need to know.
>
> --
> Cheers,
> Stephen Rothwell
---end quoted text---
^ permalink raw reply [flat|nested] 8+ messages in thread
* linux-next: manual merge of the block tree with the jc_docs tree
@ 2025-07-16 5:02 Stephen Rothwell
2025-07-16 6:12 ` Bagas Sanjaya
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Stephen Rothwell @ 2025-07-16 5:02 UTC (permalink / raw)
To: Jens Axboe, Jonathan Corbet
Cc: Bagas Sanjaya, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 5377 bytes --]
Hi all,
Today's linux-next merge of the block tree got a conflict in:
Documentation/userspace-api/ioctl/ioctl-number.rst
between commit:
15afd5def819 ("Documentation: ioctl-number: Extend "Include File" column width")
from the jc_docs tree and commit:
1cea5180f2f8 ("block: remove pktcdvd driver")
from the block 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 Documentation/userspace-api/ioctl/ioctl-number.rst
index 677456c31228,4f1532a251d2..000000000000
--- a/Documentation/userspace-api/ioctl/ioctl-number.rst
+++ b/Documentation/userspace-api/ioctl/ioctl-number.rst
@@@ -223,32 -219,31 +223,31 @@@ Code Seq# Include Fil
fs/xfs/linux-2.6/xfs_ioctl32.h,
include/linux/falloc.h,
linux/fs.h,
-'X' all fs/ocfs2/ocfs_fs.h conflict!
+'X' all fs/ocfs2/ocfs_fs.h conflict!
- 'X' 01 linux/pktcdvd.h conflict!
'Z' 14-15 drivers/message/fusion/mptctl.h
-'[' 00-3F linux/usb/tmc.h USB Test and Measurement Devices
- <mailto:gregkh@linuxfoundation.org>
-'a' all linux/atm*.h, linux/sonet.h ATM on linux
- <http://lrcwww.epfl.ch/>
-'a' 00-0F drivers/crypto/qat/qat_common/adf_cfg_common.h conflict! qat driver
-'b' 00-FF conflict! bit3 vme host bridge
- <mailto:natalia@nikhefk.nikhef.nl>
-'b' 00-0F linux/dma-buf.h conflict!
-'c' 00-7F linux/comstats.h conflict!
-'c' 00-7F linux/coda.h conflict!
-'c' 00-1F linux/chio.h conflict!
-'c' 80-9F arch/s390/include/asm/chsc.h conflict!
+'[' 00-3F linux/usb/tmc.h USB Test and Measurement Devices
+ <mailto:gregkh@linuxfoundation.org>
+'a' all linux/atm*.h, linux/sonet.h ATM on linux
+ <http://lrcwww.epfl.ch/>
+'a' 00-0F drivers/crypto/qat/qat_common/adf_cfg_common.h conflict! qat driver
+'b' 00-FF conflict! bit3 vme host bridge
+ <mailto:natalia@nikhefk.nikhef.nl>
+'b' 00-0F linux/dma-buf.h conflict!
+'c' 00-7F linux/comstats.h conflict!
+'c' 00-7F linux/coda.h conflict!
+'c' 00-1F linux/chio.h conflict!
+'c' 80-9F arch/s390/include/asm/chsc.h conflict!
'c' A0-AF arch/x86/include/asm/msr.h conflict!
-'d' 00-FF linux/char/drm/drm.h conflict!
-'d' 02-40 pcmcia/ds.h conflict!
+'d' 00-FF linux/char/drm/drm.h conflict!
+'d' 02-40 pcmcia/ds.h conflict!
'd' F0-FF linux/digi1.h
-'e' all linux/digi1.h conflict!
-'f' 00-1F linux/ext2_fs.h conflict!
-'f' 00-1F linux/ext3_fs.h conflict!
-'f' 00-0F fs/jfs/jfs_dinode.h conflict!
-'f' 00-0F fs/ext4/ext4.h conflict!
-'f' 00-0F linux/fs.h conflict!
-'f' 00-0F fs/ocfs2/ocfs2_fs.h conflict!
+'e' all linux/digi1.h conflict!
+'f' 00-1F linux/ext2_fs.h conflict!
+'f' 00-1F linux/ext3_fs.h conflict!
+'f' 00-0F fs/jfs/jfs_dinode.h conflict!
+'f' 00-0F fs/ext4/ext4.h conflict!
+'f' 00-0F linux/fs.h conflict!
+'f' 00-0F fs/ocfs2/ocfs2_fs.h conflict!
'f' 13-27 linux/fscrypt.h
'f' 81-8F linux/fsverity.h
'g' 00-0F linux/usb/gadgetfs.h
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: linux-next: manual merge of the block tree with the jc_docs tree
2025-07-16 5:02 Stephen Rothwell
@ 2025-07-16 6:12 ` Bagas Sanjaya
2025-07-16 13:31 ` Jonathan Corbet
2025-07-29 1:46 ` Stephen Rothwell
2 siblings, 0 replies; 8+ messages in thread
From: Bagas Sanjaya @ 2025-07-16 6:12 UTC (permalink / raw)
To: Stephen Rothwell, Jens Axboe, Jonathan Corbet
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 5305 bytes --]
On Wed, Jul 16, 2025 at 03:02:34PM +1000, Stephen Rothwell wrote:
> 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.
> <snipped>...
> diff --cc Documentation/userspace-api/ioctl/ioctl-number.rst
> index 677456c31228,4f1532a251d2..000000000000
> --- a/Documentation/userspace-api/ioctl/ioctl-number.rst
> +++ b/Documentation/userspace-api/ioctl/ioctl-number.rst
> @@@ -223,32 -219,31 +223,31 @@@ Code Seq# Include Fil
> fs/xfs/linux-2.6/xfs_ioctl32.h,
> include/linux/falloc.h,
> linux/fs.h,
> -'X' all fs/ocfs2/ocfs_fs.h conflict!
> +'X' all fs/ocfs2/ocfs_fs.h conflict!
> - 'X' 01 linux/pktcdvd.h conflict!
> 'Z' 14-15 drivers/message/fusion/mptctl.h
> -'[' 00-3F linux/usb/tmc.h USB Test and Measurement Devices
> - <mailto:gregkh@linuxfoundation.org>
> -'a' all linux/atm*.h, linux/sonet.h ATM on linux
> - <http://lrcwww.epfl.ch/>
> -'a' 00-0F drivers/crypto/qat/qat_common/adf_cfg_common.h conflict! qat driver
> -'b' 00-FF conflict! bit3 vme host bridge
> - <mailto:natalia@nikhefk.nikhef.nl>
> -'b' 00-0F linux/dma-buf.h conflict!
> -'c' 00-7F linux/comstats.h conflict!
> -'c' 00-7F linux/coda.h conflict!
> -'c' 00-1F linux/chio.h conflict!
> -'c' 80-9F arch/s390/include/asm/chsc.h conflict!
> +'[' 00-3F linux/usb/tmc.h USB Test and Measurement Devices
> + <mailto:gregkh@linuxfoundation.org>
> +'a' all linux/atm*.h, linux/sonet.h ATM on linux
> + <http://lrcwww.epfl.ch/>
> +'a' 00-0F drivers/crypto/qat/qat_common/adf_cfg_common.h conflict! qat driver
> +'b' 00-FF conflict! bit3 vme host bridge
> + <mailto:natalia@nikhefk.nikhef.nl>
> +'b' 00-0F linux/dma-buf.h conflict!
> +'c' 00-7F linux/comstats.h conflict!
> +'c' 00-7F linux/coda.h conflict!
> +'c' 00-1F linux/chio.h conflict!
> +'c' 80-9F arch/s390/include/asm/chsc.h conflict!
> 'c' A0-AF arch/x86/include/asm/msr.h conflict!
> -'d' 00-FF linux/char/drm/drm.h conflict!
> -'d' 02-40 pcmcia/ds.h conflict!
> +'d' 00-FF linux/char/drm/drm.h conflict!
> +'d' 02-40 pcmcia/ds.h conflict!
> 'd' F0-FF linux/digi1.h
> -'e' all linux/digi1.h conflict!
> -'f' 00-1F linux/ext2_fs.h conflict!
> -'f' 00-1F linux/ext3_fs.h conflict!
> -'f' 00-0F fs/jfs/jfs_dinode.h conflict!
> -'f' 00-0F fs/ext4/ext4.h conflict!
> -'f' 00-0F linux/fs.h conflict!
> -'f' 00-0F fs/ocfs2/ocfs2_fs.h conflict!
> +'e' all linux/digi1.h conflict!
> +'f' 00-1F linux/ext2_fs.h conflict!
> +'f' 00-1F linux/ext3_fs.h conflict!
> +'f' 00-0F fs/jfs/jfs_dinode.h conflict!
> +'f' 00-0F fs/ext4/ext4.h conflict!
> +'f' 00-0F linux/fs.h conflict!
> +'f' 00-0F fs/ocfs2/ocfs2_fs.h conflict!
> 'f' 13-27 linux/fscrypt.h
> 'f' 81-8F linux/fsverity.h
> 'g' 00-0F linux/usb/gadgetfs.h
The resolution looks good, thanks!
--
An old man doll... just what I always wanted! - Clara
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: manual merge of the block tree with the jc_docs tree
2025-07-16 5:02 Stephen Rothwell
2025-07-16 6:12 ` Bagas Sanjaya
@ 2025-07-16 13:31 ` Jonathan Corbet
2025-07-16 21:32 ` Stephen Rothwell
2025-07-29 1:46 ` Stephen Rothwell
2 siblings, 1 reply; 8+ messages in thread
From: Jonathan Corbet @ 2025-07-16 13:31 UTC (permalink / raw)
To: Stephen Rothwell, Jens Axboe
Cc: Bagas Sanjaya, Linux Kernel Mailing List, Linux Next Mailing List
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi all,
>
> Today's linux-next merge of the block tree got a conflict in:
>
> Documentation/userspace-api/ioctl/ioctl-number.rst
>
> between commit:
>
> 15afd5def819 ("Documentation: ioctl-number: Extend "Include File" column width")
>
> from the jc_docs tree and commit:
>
> 1cea5180f2f8 ("block: remove pktcdvd driver")
>
> from the block 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.
That seems like an awful lot of fallout given that the block side, in
its entirety, just removes a single line. I guess the resolution is
correct - thanks - but I don't quite understand why the conflict is so
widespread.
jon
> diff --cc Documentation/userspace-api/ioctl/ioctl-number.rst
> index 677456c31228,4f1532a251d2..000000000000
> --- a/Documentation/userspace-api/ioctl/ioctl-number.rst
> +++ b/Documentation/userspace-api/ioctl/ioctl-number.rst
> @@@ -223,32 -219,31 +223,31 @@@ Code Seq# Include Fil
> fs/xfs/linux-2.6/xfs_ioctl32.h,
> include/linux/falloc.h,
> linux/fs.h,
> -'X' all fs/ocfs2/ocfs_fs.h conflict!
> +'X' all fs/ocfs2/ocfs_fs.h conflict!
> - 'X' 01 linux/pktcdvd.h conflict!
> 'Z' 14-15 drivers/message/fusion/mptctl.h
> -'[' 00-3F linux/usb/tmc.h USB Test and Measurement Devices
> - <mailto:gregkh@linuxfoundation.org>
> -'a' all linux/atm*.h, linux/sonet.h ATM on linux
> - <http://lrcwww.epfl.ch/>
> -'a' 00-0F drivers/crypto/qat/qat_common/adf_cfg_common.h conflict! qat driver
> -'b' 00-FF conflict! bit3 vme host bridge
> - <mailto:natalia@nikhefk.nikhef.nl>
> -'b' 00-0F linux/dma-buf.h conflict!
> -'c' 00-7F linux/comstats.h conflict!
> -'c' 00-7F linux/coda.h conflict!
> -'c' 00-1F linux/chio.h conflict!
> -'c' 80-9F arch/s390/include/asm/chsc.h conflict!
> +'[' 00-3F linux/usb/tmc.h USB Test and Measurement Devices
> + <mailto:gregkh@linuxfoundation.org>
> +'a' all linux/atm*.h, linux/sonet.h ATM on linux
> + <http://lrcwww.epfl.ch/>
> +'a' 00-0F drivers/crypto/qat/qat_common/adf_cfg_common.h conflict! qat driver
> +'b' 00-FF conflict! bit3 vme host bridge
> + <mailto:natalia@nikhefk.nikhef.nl>
> +'b' 00-0F linux/dma-buf.h conflict!
> +'c' 00-7F linux/comstats.h conflict!
> +'c' 00-7F linux/coda.h conflict!
> +'c' 00-1F linux/chio.h conflict!
> +'c' 80-9F arch/s390/include/asm/chsc.h conflict!
> 'c' A0-AF arch/x86/include/asm/msr.h conflict!
> -'d' 00-FF linux/char/drm/drm.h conflict!
> -'d' 02-40 pcmcia/ds.h conflict!
> +'d' 00-FF linux/char/drm/drm.h conflict!
> +'d' 02-40 pcmcia/ds.h conflict!
> 'd' F0-FF linux/digi1.h
> -'e' all linux/digi1.h conflict!
> -'f' 00-1F linux/ext2_fs.h conflict!
> -'f' 00-1F linux/ext3_fs.h conflict!
> -'f' 00-0F fs/jfs/jfs_dinode.h conflict!
> -'f' 00-0F fs/ext4/ext4.h conflict!
> -'f' 00-0F linux/fs.h conflict!
> -'f' 00-0F fs/ocfs2/ocfs2_fs.h conflict!
> +'e' all linux/digi1.h conflict!
> +'f' 00-1F linux/ext2_fs.h conflict!
> +'f' 00-1F linux/ext3_fs.h conflict!
> +'f' 00-0F fs/jfs/jfs_dinode.h conflict!
> +'f' 00-0F fs/ext4/ext4.h conflict!
> +'f' 00-0F linux/fs.h conflict!
> +'f' 00-0F fs/ocfs2/ocfs2_fs.h conflict!
> 'f' 13-27 linux/fscrypt.h
> 'f' 81-8F linux/fsverity.h
> 'g' 00-0F linux/usb/gadgetfs.h
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: linux-next: manual merge of the block tree with the jc_docs tree
2025-07-16 13:31 ` Jonathan Corbet
@ 2025-07-16 21:32 ` Stephen Rothwell
0 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2025-07-16 21:32 UTC (permalink / raw)
To: Jonathan Corbet
Cc: Jens Axboe, Bagas Sanjaya, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 403 bytes --]
Hi Jon,
On Wed, 16 Jul 2025 07:31:25 -0600 Jonathan Corbet <corbet@lwn.net> wrote:
>
> That seems like an awful lot of fallout given that the block side, in
> its entirety, just removes a single line. I guess the resolution is
> correct - thanks - but I don't quite understand why the conflict is so
> widespread.
Its just the "git diff" context, I guess.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: manual merge of the block tree with the jc_docs tree
2025-07-16 5:02 Stephen Rothwell
2025-07-16 6:12 ` Bagas Sanjaya
2025-07-16 13:31 ` Jonathan Corbet
@ 2025-07-29 1:46 ` Stephen Rothwell
2 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2025-07-29 1:46 UTC (permalink / raw)
To: Jonathan Corbet
Cc: Jens Axboe, Bagas Sanjaya, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 5695 bytes --]
Hi all,
On Wed, 16 Jul 2025 15:02:34 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the block tree got a conflict in:
>
> Documentation/userspace-api/ioctl/ioctl-number.rst
>
> between commit:
>
> 15afd5def819 ("Documentation: ioctl-number: Extend "Include File" column width")
>
> from the jc_docs tree and commit:
>
> 1cea5180f2f8 ("block: remove pktcdvd driver")
>
> from the block 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 Documentation/userspace-api/ioctl/ioctl-number.rst
> index 677456c31228,4f1532a251d2..000000000000
> --- a/Documentation/userspace-api/ioctl/ioctl-number.rst
> +++ b/Documentation/userspace-api/ioctl/ioctl-number.rst
> @@@ -223,32 -219,31 +223,31 @@@ Code Seq# Include Fil
> fs/xfs/linux-2.6/xfs_ioctl32.h,
> include/linux/falloc.h,
> linux/fs.h,
> -'X' all fs/ocfs2/ocfs_fs.h conflict!
> +'X' all fs/ocfs2/ocfs_fs.h conflict!
> - 'X' 01 linux/pktcdvd.h conflict!
> 'Z' 14-15 drivers/message/fusion/mptctl.h
> -'[' 00-3F linux/usb/tmc.h USB Test and Measurement Devices
> - <mailto:gregkh@linuxfoundation.org>
> -'a' all linux/atm*.h, linux/sonet.h ATM on linux
> - <http://lrcwww.epfl.ch/>
> -'a' 00-0F drivers/crypto/qat/qat_common/adf_cfg_common.h conflict! qat driver
> -'b' 00-FF conflict! bit3 vme host bridge
> - <mailto:natalia@nikhefk.nikhef.nl>
> -'b' 00-0F linux/dma-buf.h conflict!
> -'c' 00-7F linux/comstats.h conflict!
> -'c' 00-7F linux/coda.h conflict!
> -'c' 00-1F linux/chio.h conflict!
> -'c' 80-9F arch/s390/include/asm/chsc.h conflict!
> +'[' 00-3F linux/usb/tmc.h USB Test and Measurement Devices
> + <mailto:gregkh@linuxfoundation.org>
> +'a' all linux/atm*.h, linux/sonet.h ATM on linux
> + <http://lrcwww.epfl.ch/>
> +'a' 00-0F drivers/crypto/qat/qat_common/adf_cfg_common.h conflict! qat driver
> +'b' 00-FF conflict! bit3 vme host bridge
> + <mailto:natalia@nikhefk.nikhef.nl>
> +'b' 00-0F linux/dma-buf.h conflict!
> +'c' 00-7F linux/comstats.h conflict!
> +'c' 00-7F linux/coda.h conflict!
> +'c' 00-1F linux/chio.h conflict!
> +'c' 80-9F arch/s390/include/asm/chsc.h conflict!
> 'c' A0-AF arch/x86/include/asm/msr.h conflict!
> -'d' 00-FF linux/char/drm/drm.h conflict!
> -'d' 02-40 pcmcia/ds.h conflict!
> +'d' 00-FF linux/char/drm/drm.h conflict!
> +'d' 02-40 pcmcia/ds.h conflict!
> 'd' F0-FF linux/digi1.h
> -'e' all linux/digi1.h conflict!
> -'f' 00-1F linux/ext2_fs.h conflict!
> -'f' 00-1F linux/ext3_fs.h conflict!
> -'f' 00-0F fs/jfs/jfs_dinode.h conflict!
> -'f' 00-0F fs/ext4/ext4.h conflict!
> -'f' 00-0F linux/fs.h conflict!
> -'f' 00-0F fs/ocfs2/ocfs2_fs.h conflict!
> +'e' all linux/digi1.h conflict!
> +'f' 00-1F linux/ext2_fs.h conflict!
> +'f' 00-1F linux/ext3_fs.h conflict!
> +'f' 00-0F fs/jfs/jfs_dinode.h conflict!
> +'f' 00-0F fs/ext4/ext4.h conflict!
> +'f' 00-0F linux/fs.h conflict!
> +'f' 00-0F fs/ocfs2/ocfs2_fs.h conflict!
> 'f' 13-27 linux/fscrypt.h
> 'f' 81-8F linux/fsverity.h
> 'g' 00-0F linux/usb/gadgetfs.h
This is now a conflict between the jd_docs tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2025-07-29 1:47 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-25 4:42 linux-next: manual merge of the block tree with the jc_docs tree Stephen Rothwell
2019-07-09 0:08 ` Stephen Rothwell
2019-07-09 2:45 ` Christoph Hellwig
-- strict thread matches above, loose matches on Subject: below --
2025-07-16 5:02 Stephen Rothwell
2025-07-16 6:12 ` Bagas Sanjaya
2025-07-16 13:31 ` Jonathan Corbet
2025-07-16 21:32 ` Stephen Rothwell
2025-07-29 1:46 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).