linux-next: manual merge of the tip tree with the s390 tree

linux-next: manual merge of the tip tree with the s390 tree

[Mark Brown]

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

Hi all,

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

  arch/s390/include/asm/rwsem.h

between commit:

   91a1fad759ffd ("s390: use generic rwsem implementation")

from the s390 tree and commit:

   a61ba2c8a48f1 ("locking/arch, s390: Add __down_read_killable()")

from the tip tree.

I fixed it up by re-deleting the 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.

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

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

[Stephen Rothwell]

Hi all,

On Wed, 11 Oct 2017 16:51:45 +0100 Mark Brown <broonie@kernel.org> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
> 
>   arch/s390/include/asm/rwsem.h
> 
> between commit:
> 
>    91a1fad759ffd ("s390: use generic rwsem implementation")
> 
> from the s390 tree and commit:
> 
>    a61ba2c8a48f1 ("locking/arch, s390: Add __down_read_killable()")
> 
> from the tip tree.
> 
> I fixed it up by re-deleting the 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.

Just a reminder that this conflict still exists.

-- 
Cheers,
Stephen Rothwell

linux-next: manual merge of the tip tree with the s390 tree

[broonie]

Hi all,

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

  arch/s390/kernel/setup.c

between commit:

  944c78376a39b ("s390: use init_thread_union aka initial stack for the first process")

from the s390 tree and commit:

  9ea7e6b62c2bd ("init: Mark [arch_call_]rest_init() __noreturn")

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/s390/kernel/setup.c
index 0903fe3566341,4259b6c505163..0000000000000
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c

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

[Stephen Rothwell]

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

Hi all,

On Fri, 10 Feb 2023 12:00:21 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
> 
>   arch/s390/kernel/idle.c
> 
> between commit:
> 
>   c01016299dc7 ("s390/idle: move idle time accounting to account_idle_time_irq()")
> 
> from the s390 tree and commit:
> 
>   89b3098703bd ("arch/idle: Change arch_cpu_idle() behavior: always exit with IRQs disabled")
> 
> 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/s390/kernel/idle.c
> index dd8351e76539,b04fb418307c..000000000000
> --- a/arch/s390/kernel/idle.c
> +++ b/arch/s390/kernel/idle.c
> @@@ -61,7 -57,15 +61,6 @@@ void noinstr arch_cpu_idle(void
>   
>   	/* psw_idle() returns with interrupts disabled. */
>   	psw_idle(idle, psw_mask);
> - 	raw_local_irq_enable();
>  -
>  -	/* Account time spent with enabled wait psw loaded as idle time. */
>  -	raw_write_seqcount_begin(&idle->seqcount);
>  -	idle_time = idle->clock_idle_exit - idle->clock_idle_enter;
>  -	idle->clock_idle_enter = idle->clock_idle_exit = 0ULL;
>  -	idle->idle_time += idle_time;
>  -	idle->idle_count++;
>  -	account_idle_time(cputime_to_nsecs(idle_time));
>  -	raw_write_seqcount_end(&idle->seqcount);
>   }
>   
>   static ssize_t show_idle_count(struct device *dev,

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

-- 
Cheers,
Stephen Rothwell

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

linux-next: manual merge of the tip tree with the s390 tree

[Stephen Rothwell]

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

Hi all,

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

  arch/s390/kernel/idle.c

between commit:

  c01016299dc7 ("s390/idle: move idle time accounting to account_idle_time_irq()")

from the s390 tree and commit:

  89b3098703bd ("arch/idle: Change arch_cpu_idle() behavior: always exit with IRQs disabled")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/s390/kernel/idle.c
index dd8351e76539,b04fb418307c..000000000000
--- a/arch/s390/kernel/idle.c
+++ b/arch/s390/kernel/idle.c
@@@ -61,7 -57,15 +61,6 @@@ void noinstr arch_cpu_idle(void
  
  	/* psw_idle() returns with interrupts disabled. */
  	psw_idle(idle, psw_mask);
- 	raw_local_irq_enable();
 -
 -	/* Account time spent with enabled wait psw loaded as idle time. */
 -	raw_write_seqcount_begin(&idle->seqcount);
 -	idle_time = idle->clock_idle_exit - idle->clock_idle_enter;
 -	idle->clock_idle_enter = idle->clock_idle_exit = 0ULL;
 -	idle->idle_time += idle_time;
 -	idle->idle_count++;
 -	account_idle_time(cputime_to_nsecs(idle_time));
 -	raw_write_seqcount_end(&idle->seqcount);
  }
  
  static ssize_t show_idle_count(struct device *dev,

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

linux-next: manual merge of the tip tree with the s390 tree

[Stephen Rothwell]

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

Hi all,

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

  arch/s390/kernel/stacktrace.c

between commit:

  78c98f907413 ("s390/unwind: introduce stack unwind API")

from the s390 tree and commit:

  6a28b4c2d93b ("s390/stacktrace: Remove the pointless ULONG_MAX marker")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/s390/kernel/stacktrace.c
index 89f9f63dca18,cc9ed9787068..000000000000
--- a/arch/s390/kernel/stacktrace.c
+++ b/arch/s390/kernel/stacktrace.c
@@@ -16,53 -41,29 +16,47 @@@
  
  void save_stack_trace(struct stack_trace *trace)
  {
 -	unsigned long sp;
 -
 -	sp = current_stack_pointer();
 -	dump_trace(save_address, trace, NULL, sp);
 +	struct unwind_state state;
 +
 +	unwind_for_each_frame(&state, current, NULL, 0) {
 +		if (trace->nr_entries >= trace->max_entries)
 +			break;
 +		if (trace->skip > 0)
 +			trace->skip--;
 +		else
 +			trace->entries[trace->nr_entries++] = state.ip;
 +	}
- 	if (trace->nr_entries < trace->max_entries)
- 		trace->entries[trace->nr_entries++] = ULONG_MAX;
  }
  EXPORT_SYMBOL_GPL(save_stack_trace);
  
  void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace)
  {
 -	unsigned long sp;
 -
 -	sp = tsk->thread.ksp;
 -	if (tsk == current)
 -		sp = current_stack_pointer();
 -	dump_trace(save_address_nosched, trace, tsk, sp);
 +	struct unwind_state state;
 +
 +	unwind_for_each_frame(&state, tsk, NULL, 0) {
 +		if (trace->nr_entries >= trace->max_entries)
 +			break;
 +		if (in_sched_functions(state.ip))
 +			continue;
 +		if (trace->skip > 0)
 +			trace->skip--;
 +		else
 +			trace->entries[trace->nr_entries++] = state.ip;
 +	}
- 	if (trace->nr_entries < trace->max_entries)
- 		trace->entries[trace->nr_entries++] = ULONG_MAX;
  }
  EXPORT_SYMBOL_GPL(save_stack_trace_tsk);
  
  void save_stack_trace_regs(struct pt_regs *regs, struct stack_trace *trace)
  {
 -	unsigned long sp;
 -
 -	sp = kernel_stack_pointer(regs);
 -	dump_trace(save_address, trace, NULL, sp);
 +	struct unwind_state state;
 +
 +	unwind_for_each_frame(&state, current, regs, 0) {
 +		if (trace->nr_entries >= trace->max_entries)
 +			break;
 +		if (trace->skip > 0)
 +			trace->skip--;
 +		else
 +			trace->entries[trace->nr_entries++] = state.ip;
 +	}
- 	if (trace->nr_entries < trace->max_entries)
- 		trace->entries[trace->nr_entries++] = ULONG_MAX;
  }
  EXPORT_SYMBOL_GPL(save_stack_trace_regs);

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

linux-next: manual merge of the tip tree with the s390 tree

[Stephen Rothwell]

Hi all,

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

  arch/s390/lib/spinlock.c

between commit:

  eb3b7b848fb3 ("s390/rwlock: introduce rwlock wait queueing")
(at least)

from the s390 tree and commit:

  6aa7de059173 ("locking/atomics: COCCINELLE/treewide: Convert trivial ACCESS_ONCE() patterns to READ_ONCE()/WRITE_ONCE()")

from the tip tree.

I fixed it up (the ACCESS_ONCE instances replaced in the latter were
removed by the former ... there was one more ACCESS_ONCE added, but I
left it in place) 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

linux-next: manual merge of the tip tree with the s390 tree

[Stephen Rothwell]

Hi all,

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

  arch/s390/lib/uaccess.c

between commit:

  cabc4abe8e36 ("s390/uaccess: remove uaccess_primary kernel parameter")

from the s390 tree and commit:

  ed79e946732e ("s390/uaccess, locking/static_keys: employ static_branch_likely()")

from the tip tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/s390/lib/uaccess.c
index 0d002a746bec,93cb1d09493d..000000000000
--- a/arch/s390/lib/uaccess.c
+++ b/arch/s390/lib/uaccess.c
@@@ -370,10 -370,23 +370,10 @@@ long __strncpy_from_user(char *dst, con
  }
  EXPORT_SYMBOL(__strncpy_from_user);
  
 -/*
 - * The "old" uaccess variant without mvcos can be enforced with the
 - * uaccess_primary kernel parameter. This is mainly for debugging purposes.
 - */
 -static int uaccess_primary __initdata;
 -
 -static int __init parse_uaccess_pt(char *__unused)
 -{
 -	uaccess_primary = 1;
 -	return 0;
 -}
 -early_param("uaccess_primary", parse_uaccess_pt);
 -
  static int __init uaccess_init(void)
  {
 -	if (!uaccess_primary && test_facility(27))
 +	if (test_facility(27))
- 		static_key_slow_inc(&have_mvcos);
+ 		static_branch_enable(&have_mvcos);
  	return 0;
  }
  early_initcall(uaccess_init);

linux-next: manual merge of the tip tree with the s390 tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/s390/Kconfig between commit ad2c429560fc ("s390/Kconfig: sort list
of arch selected config options") from the s390 tree and commit
6147a9d8070e ("irq_work: Remove CONFIG_HAVE_IRQ_WORK") from the tip tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/s390/Kconfig
index 17775cf,c15ba7d..0000000
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@@ -91,56 -128,17 +91,55 @@@ config S39
  	select ARCH_INLINE_WRITE_UNLOCK_BH
  	select ARCH_INLINE_WRITE_UNLOCK_IRQ
  	select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE
 -	select HAVE_UID16 if 32BIT
 +	select ARCH_SAVE_PAGE_KEYS if HIBERNATION
  	select ARCH_WANT_IPC_PARSE_VERSION
 -	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if 64BIT
 +	select BUILDTIME_EXTABLE_SORT
 +	select CLONE_BACKWARDS2
 +	select GENERIC_CLOCKEVENTS
 +	select GENERIC_CPU_DEVICES if !SMP
 +	select GENERIC_KERNEL_THREAD
  	select GENERIC_SMP_IDLE_THREAD
  	select GENERIC_TIME_VSYSCALL_OLD
 -	select GENERIC_CLOCKEVENTS
 -	select KTIME_SCALAR if 32BIT
 +	select HAVE_ALIGNED_STRUCT_PAGE if SLUB
 +	select HAVE_ARCH_JUMP_LABEL if !MARCH_G5
 +	select HAVE_ARCH_MUTEX_CPU_RELAX
  	select HAVE_ARCH_SECCOMP_FILTER
 +	select HAVE_ARCH_TRACEHOOK
 +	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if 64BIT
 +	select HAVE_BPF_JIT if 64BIT && PACK_STACK
 +	select HAVE_CMPXCHG_DOUBLE
 +	select HAVE_CMPXCHG_LOCAL
 +	select HAVE_C_RECORDMCOUNT
 +	select HAVE_DEBUG_KMEMLEAK
 +	select HAVE_DYNAMIC_FTRACE
 +	select HAVE_FTRACE_MCOUNT_RECORD
 +	select HAVE_FUNCTION_GRAPH_TRACER
 +	select HAVE_FUNCTION_TRACER
 +	select HAVE_FUNCTION_TRACE_MCOUNT_TEST
- 	select HAVE_IRQ_WORK
 +	select HAVE_KERNEL_BZIP2
 +	select HAVE_KERNEL_GZIP
 +	select HAVE_KERNEL_LZMA
 +	select HAVE_KERNEL_LZO
 +	select HAVE_KERNEL_XZ
 +	select HAVE_KPROBES
 +	select HAVE_KRETPROBES
 +	select HAVE_KVM if 64BIT
 +	select HAVE_MEMBLOCK
 +	select HAVE_MEMBLOCK_NODE_MAP
  	select HAVE_MOD_ARCH_SPECIFIC
 +	select HAVE_OPROFILE
 +	select HAVE_PERF_EVENTS
 +	select HAVE_REGS_AND_STACK_ACCESS_API
 +	select HAVE_SYSCALL_TRACEPOINTS
 +	select HAVE_SYSCALL_WRAPPERS
 +	select HAVE_UID16 if 32BIT
 +	select HAVE_VIRT_CPU_ACCOUNTING
 +	select INIT_ALL_POSSIBLE
 +	select KTIME_SCALAR if 32BIT
  	select MODULES_USE_ELF_RELA
 -	select CLONE_BACKWARDS2
 +	select SYSCTL_EXCEPTION_TRACE
 +	select USE_GENERIC_SMP_HELPERS if SMP
 +	select VIRT_CPU_ACCOUNTING
  
  config SCHED_OMIT_FRAME_POINTER
  	def_bool y

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the tip tree with the s390 tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/s390/kernel/smp.c between commit 8b646bd75908 ("[S390] rework smp
code") from the s390 tree and commit 5fbd036b552f ("sched: Cleanup
cpu_active madness") from the tip tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/s390/kernel/smp.c
index 64ebbcb,b0e28c4..0000000
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@@ -714,12 -544,12 +714,6 @@@ static void __cpuinit smp_start_seconda
  	ipi_call_lock();
  	set_cpu_online(smp_processor_id(), true);
  	ipi_call_unlock();
- 	/*
- 	 * Wait until the cpu which brought this one up marked it
- 	 * active before enabling interrupts.
- 	 */
- 	while (!cpumask_test_cpu(smp_processor_id(), cpu_active_mask))
- 		cpu_relax();
 -	__ctl_clear_bit(0, 28); /* Disable lowcore protection */
 -	S390_lowcore.restart_psw.mask =
 -		PSW_DEFAULT_KEY | PSW_MASK_BASE | PSW_MASK_EA | PSW_MASK_BA;
 -	S390_lowcore.restart_psw.addr =
 -		PSW_ADDR_AMODE | (unsigned long) psw_restart_int_handler;
 -	__ctl_set_bit(0, 28); /* Enable lowcore protection */
  	local_irq_enable();
  	/* cpu_idle will call schedule for us */
  	cpu_idle();

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the tip tree with the s390 tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/s390/kernel/time.c between commit
6342887c12d79c5a2c8c1de5be6f483e16a2acdd ("[S390] introduce
get_clock_monotonic") from the s390 tree and commit
23970e389e9cee43c4b41023935e1417271708b2 ("timekeeping: Introduce
read_boot_clock") from the tip tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/s390/kernel/time.c
index 6f0d86f,6bff1a1..0000000
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
@@@ -183,12 -182,14 +183,14 @@@ static void timing_alert_interrupt(__u1
  static void etr_reset(void);
  static void stp_reset(void);
  
- unsigned long read_persistent_clock(void)
+ void read_persistent_clock(struct timespec *ts)
  {
- 	struct timespec ts;
+ 	tod_to_timeval(get_clock() - TOD_UNIX_EPOCH, ts);
+ }
  
- 	tod_to_timeval(get_clock() - TOD_UNIX_EPOCH, &ts);
- 	return ts.tv_sec;
+ void read_boot_clock(struct timespec *ts)
+ {
 -	tod_to_timeval(sched_clock_base_cc - TOD_UNIX_EPOCH, ts);
++	tod_to_timeval(sched_clock_base - TOD_UNIX_EPOCH, ts);
  }
  
  static cycle_t read_tod_clock(struct clocksource *cs)