* linux-next: manual merge of the block tree with the btrfs-fixes tree
@ 2025-01-07 2:26 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2025-01-07 2:26 UTC (permalink / raw)
To: Jens Axboe, David Sterba
Cc: David Sterba, Gabriel Krisman Bertazi, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 878 bytes --]
Hi all,
Today's linux-next merge of the block tree got a conflict in:
io_uring/uring_cmd.c
between commits:
dadf03cfd4ea ("io_uring/cmd: rename struct uring_cache to io_uring_cmd_data")
3347fa658a1b ("io_uring/cmd: add per-op data to struct io_uring_cmd_data")
from the btrfs-fixes tree and commit:
e9447dc0b18d ("io_uring/uring_cmd: Allocate async data through generic helper")
from the block tree.
I fixed it up (I removed io_uring_async_get() from this file) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2025-01-07 2:26 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-01-07 2:26 linux-next: manual merge of the block tree with the btrfs-fixes tree 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®