Re: linux-next: manual merge of the tip tree with the vfs tree

From: Stephen Rothwell
Date: Tue Aug 04 2020 - 21:03:15 EST

Hi all,

On Mon, 27 Jul 2020 15:35:10 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Today's linux-next merge of the tip tree got a conflict in:
> arch/x86/include/asm/fpu/xstate.h
> between commit:
> c196049cc732 ("x86: switch to ->regset_get()")
> from the vfs tree and commit:
> ce711ea3cab9 ("perf/x86/intel/lbr: Support XSAVES/XRSTORS for LBR context switch")
> from the tip 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 arch/x86/include/asm/fpu/xstate.h
> index f691ea1bc086,1559554af931..000000000000
> --- a/arch/x86/include/asm/fpu/xstate.h
> +++ b/arch/x86/include/asm/fpu/xstate.h
> @@@ -71,8 -103,9 +103,9 @@@ extern void __init update_regset_xstate
> void *get_xsave_addr(struct xregs_state *xsave, int xfeature_nr);
> const void *get_xsave_field_ptr(int xfeature_nr);
> int using_compacted_format(void);
> + int xfeature_size(int xfeature_nr);
> -int copy_xstate_to_kernel(void *kbuf, struct xregs_state *xsave, unsigned int offset, unsigned int size);
> -int copy_xstate_to_user(void __user *ubuf, struct xregs_state *xsave, unsigned int offset, unsigned int size);
> +struct membuf;
> +void copy_xstate_to_kernel(struct membuf to, struct xregs_state *xsave);
> int copy_kernel_to_xstate(struct xregs_state *xsave, const void *kbuf);
> int copy_user_to_xstate(struct xregs_state *xsave, const void __user *ubuf);
> void copy_supervisor_to_kernel(struct xregs_state *xsave);

This is now a conflict between the vfs tree and Linus' tree.

Stephen Rothwell

Attachment: pgpsbhi9pmqjT.pgp
Description: OpenPGP digital signature