diff mbox series

linux-next: manual merge of the risc-v tree with Linus' tree

Message ID 20240212095523.21f0579b@canb.auug.org.au
State New
Headers
Series linux-next: manual merge of the risc-v tree with Linus' tree |

Commit Message

Stephen Rothwell Feb. 11, 2024, 10:55 p.m. UTC 
  Hi all,

Today's linux-next merge of the risc-v tree got a conflict in:

  arch/riscv/include/asm/bitops.h

between commit:

  4356e9f841f7 ("work around gcc bugs with 'asm goto' with outputs")

from Linus' tree and commit:

  cb4ede926134 ("riscv: Avoid code duplication with generic bitops implementation")

from the risc-v 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 mbox series

Patch

diff --cc arch/riscv/include/asm/bitops.h
index 329d8244a9b3,c4c2173dfe99..000000000000
--- a/arch/riscv/include/asm/bitops.h