linux-next: manual merge of the rust-fixes tree with the origin tree

[Mark Brown]

Hi all,

Today's linux-next merge of the rust-fixes tree got a conflict in:

  rust/bindgen_parameters

between commit:

  bc6f2a284c633 ("rust: fwctl: declare cfi_encoding for fwctl_rpc_scope")

from the origin tree and commits:

  01f3e6b4b1c8c ("rust: irq: declare cfi_encoding for irqreturn")
  39fe6892fd52f ("rust: hrtimer: declare cfi_encoding for hrtimer_restart")
  7d109178cd644 ("rust: dma: declare cfi_encoding for dma_data_direction")

from the rust-fixes 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 rust/bindgen_parameters
index 39aae62dca669,8577e7663e027..0000000000000
--- a/rust/bindgen_parameters
+++ b/rust/bindgen_parameters
@@@ -27,8 -27,12 +27,14 @@@
  --opaque-type spinlock
  
  # enums that appear in indirect function calls should specify a cfi type
+ --newtype-enum dma_data_direction
+ --with-attribute-custom-enum=dma_data_direction='#[cfi_encoding="18dma_data_direction"]'
 +--newtype-enum fwctl_rpc_scope
 +--with-attribute-custom-enum=fwctl_rpc_scope='#[cfi_encoding="15fwctl_rpc_scope"]'
+ --newtype-enum hrtimer_restart
+ --with-attribute-custom-enum=hrtimer_restart='#[cfi_encoding="15hrtimer_restart"]'
+ --newtype-enum irqreturn
+ --with-attribute-custom-enum=irqreturn='#[cfi_encoding="9irqreturn"]'
  --newtype-enum lru_status
  --with-attribute-custom-enum=lru_status='#[cfi_encoding="10lru_status"]'

Attachment: signature.asc
Description: PGP signature