* linux-next: manual merge of the signal tree with the tip tree
@ 2012-05-23 6:02 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2012-05-23 6:02 UTC (permalink / raw)
To: Al Viro
Cc: linux-next, linux-kernel, Richard Weinberger,
Anna-Maria Gleixner, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin, Peter Zijlstra
[-- Attachment #1: Type: text/plain, Size: 844 bytes --]
Hi Al,
Today's linux-next merge of the signal tree got a conflict in
arch/um/Kconfig.common between commit 875c9d09b5a6 ("um: Use generic time
config") from the tip tree and commit 985a94a96d29 ("um: Remove
CONFIG_IRQ_RELEASE_METHOD") from the signal 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/um/Kconfig.common
index 806185d,43ef890..0000000
--- a/arch/um/Kconfig.common
+++ b/arch/um/Kconfig.common
@@@ -53,11 -52,10 +53,6 @@@ config GENERIC_BU
default y
depends on BUG
- # Used in kernel/irq/manage.c and include/linux/irq.h
- config IRQ_RELEASE_METHOD
- bool
- default y
-
-config GENERIC_CLOCKEVENTS
- bool
- default y
-
config HZ
int
default 100
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the signal tree with the tip tree
@ 2012-09-20 7:03 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2012-09-20 7:03 UTC (permalink / raw)
To: Al Viro
Cc: linux-next, linux-kernel, Suresh Siddha, Thomas Gleixner,
Ingo Molnar, H. Peter Anvin, Peter Zijlstra
[-- Attachment #1: Type: text/plain, Size: 1176 bytes --]
Hi Al,
Today's linux-next merge of the signal tree got a conflict in
arch/x86/kernel/process_32.c between commit 304bceda6a18 ("x86, fpu: use
non-lazy fpu restore for processors supporting xsave") from the tip tree
and commits 450ca1f882ab ("x86: get rid of TIF_IRET hackery") and
5daca7153d68 ("x86, um/x86: switch to generic sys_execve and
kernel_execve") from the signal 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/x86/kernel/process_32.c
index b9ff83c,9e84b4f..0000000
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@@ -190,6 -190,16 +190,12 @@@ start_thread(struct pt_regs *regs, unsi
regs->cs = __USER_CS;
regs->ip = new_ip;
regs->sp = new_sp;
+ regs->flags = X86_EFLAGS_IF;
+ /*
- * Free the old FP and other extended state
- */
- free_thread_xstate(current);
- /*
+ * force it to the iret return path by making it look as if there was
+ * some work pending.
+ */
+ set_thread_flag(TIF_NOTIFY_RESUME);
}
EXPORT_SYMBOL_GPL(start_thread);
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the signal tree with the tip tree
@ 2012-05-24 5:51 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2012-05-24 5:51 UTC (permalink / raw)
To: Al Viro
Cc: linux-next, linux-kernel, Oleg Nesterov, Andrew Morton,
Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
[-- Attachment #1: Type: text/plain, Size: 887 bytes --]
Hi Al,
Today's linux-next merge of the signal tree got a conflict in
kernel/fork.c between commit 0ea86208345b (sched, mm: Rework sched_
{fork,exec} node assignment"") from the tip tree and commit 4d82c317564d
("task_work_add: generic process-context callbacks") from the signal tree.
I fixed it up (as discussed - see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc kernel/fork.c
index 5f7d197,1a1faaf..0000000
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@@ -1419,6 -1409,8 +1419,7 @@@ static struct task_struct *copy_process
* We dont wake it up yet.
*/
p->group_leader = p;
- INIT_LIST_HEAD(&p->thread_group);
+ INIT_HLIST_HEAD(&p->task_works);
/* Now that the task is set up, run cgroup callbacks if
* necessary. We need to run them before the task is visible
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-09-20 7:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-05-23 6:02 linux-next: manual merge of the signal tree with the tip tree Stephen Rothwell
2012-05-24 5:51 Stephen Rothwell
2012-09-20 7:03 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).