linux-next: manual merge of the block tree with the btrfs-fixes tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- 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 --]