Re: linux-next: manual merge of the block tree with the mm tree

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

[-- Attachment #1: Type: text/plain, Size: 1998 bytes --]

Hi all,

On Wed, 14 Feb 2024 11:25:19 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the block tree got a conflict in:
> 
>   include/linux/sched.h
> 
> between commit:
> 
>   d9233ee073c9 ("mm: document memalloc_noreclaim_save() and memalloc_pin_save()")
> 
> from the mm-unstable branch of the mm tree and commit:
> 
>   06b23f92af87 ("block: update cached timestamp post schedule/preemption")
> 
> from the block 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.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc include/linux/sched.h
> index 5b27a548d863,15b7cb478d16..000000000000
> --- a/include/linux/sched.h
> +++ b/include/linux/sched.h
> @@@ -1642,9 -1641,8 +1642,9 @@@ extern struct pid *cad_pid
>   #define PF__HOLE__02000000	0x02000000
>   #define PF_NO_SETAFFINITY	0x04000000	/* Userland is not allowed to meddle with cpus_mask */
>   #define PF_MCE_EARLY		0x08000000      /* Early kill for mce process policy */
>  -#define PF_MEMALLOC_PIN		0x10000000	/* Allocation context constrained to zones which allow long term pinning. */
>  +#define PF_MEMALLOC_PIN		0x10000000	/* Allocations constrained to zones which allow long term pinning.
>  +						 * See memalloc_pin_save() */
> - #define PF__HOLE__20000000	0x20000000
> + #define PF_BLOCK_TS		0x20000000	/* plug has ts that needs updating */
>   #define PF__HOLE__40000000	0x40000000
>   #define PF_SUSPEND_TASK		0x80000000      /* This thread called freeze_processes() and should not be frozen */
>   

This is now a conflict between the mm-stable tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]