* linux-next: manual merge of the tip tree with the tree
@ 2011-05-13 3:10 Stephen Rothwell
2011-05-13 8:03 ` Ralf Baechle
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2011-05-13 3:10 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Cc: linux-next, linux-kernel, Russell King, John Stultz, Ralf Baechle
[-- Attachment #1: Type: text/plain, Size: 471 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/mips/kernel/i8253.c between commit 2b9b7cd782a5 ("clocksource:
convert mips to generic i8253 clocksource") from the arm tree and commit
75c4fd8c7862 ("mips: convert to clocksource_register_hz/khz") from the
tip tree.
The former seems to supercede the latter, so I used the former.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the tip tree with the tree
2011-05-13 3:10 linux-next: manual merge of the tip tree with the tree Stephen Rothwell
@ 2011-05-13 8:03 ` Ralf Baechle
0 siblings, 0 replies; 6+ messages in thread
From: Ralf Baechle @ 2011-05-13 8:03 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
linux-next, linux-kernel, Russell King, John Stultz
On Fri, May 13, 2011 at 01:10:44PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in
> arch/mips/kernel/i8253.c between commit 2b9b7cd782a5 ("clocksource:
> convert mips to generic i8253 clocksource") from the arm tree and commit
> 75c4fd8c7862 ("mips: convert to clocksource_register_hz/khz") from the
> tip tree.
>
> The former seems to supercede the latter, so I used the former.
That's the right resolution, thanks!
Ralf
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the tip tree with the tree
@ 2014-03-11 19:03 Mark Brown
0 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2014-03-11 19:03 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Tomi Valkeinen
Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 405 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in drivers/video/fbdev/sgivwfb.c between commit 844901baede6b5 ("video: move fbdev to drivers/video/fbdev") from the omap2_dss tree and commit c5f9ee3d665a76 ("x86, platforms: Remove SGI Visual Workstation") from the tip tree.
I fixed it up by deleting the offending driver and can carry the fix as necessary (no action is required).
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* linux-next: manual merge of the tip tree with the tree
@ 2011-08-18 4:14 Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2011-08-18 4:14 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Cc: linux-next, linux-kernel, Randy Dunlap, Linus Torvalds
[-- Attachment #1: Type: text/plain, Size: 475 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/x86/mm/fault.c between commit cedf03bd9aa5 ("x86: fix mm/fault.c
build") from Linus' tree and commit fab1167c4698 ("x86, vsyscall: Add
missing <asm/fixmap.h> to arch/x86/mm/fault.c") from the tip tree.
These are both fixing the same problem but differently. Given the
comments in the latter, I have used its version.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* linux-next: manual merge of the tip tree with the tree
@ 2011-05-31 0:19 Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2011-05-31 0:19 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Cc: linux-next, linux-kernel, Len Brown, Borislav Petkov
[-- Attachment #1: Type: text/plain, Size: 551 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/x86/kernel/process.c between commit 8a27ef90237f ("x86 idle: fix
build warning for WARN_ONCE("idle=mwait")") from the idle-test tree and
commit 598e887d8b01 ("x86 idle: Fix mwait deprecation warning message")
from the tip tree.
Slightly different patches for the same warning. I fixed it up (using
the version from the idle-test tree which is more complete).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* linux-next: manual merge of the tip tree with the tree
@ 2009-08-17 6:50 Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2009-08-17 6:50 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Cc: linux-next, linux-kernel, Neil Horman, Jason Baron,
Frederic Weisbecker
Hi all,
Today's linux-next merge of the tip tree got a conflict in
kernel/trace/trace.h between commit
9ec04da7489d2c9ae01ea6e9b5fa313ccf3d35fb ("net: skb ftracer - Add actual
ftrace code to kernel (v3)") from the net tree and commit
64c12e0444fcc6b75eb49144ba46d43dbdc6bc8f ("tracing: Add individual
syscalls tracepoint id support") from the tip tree.
Just overlapping additions/removals. I fixed it up (see below) and can
carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc kernel/trace/trace.h
index 8a6281b,300ef78..0000000
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@@ -336,12 -317,6 +334,8 @@@ extern void __ftrace_bad_type(void)
TRACE_KMEM_ALLOC); \
IF_ASSIGN(var, ent, struct kmemtrace_free_entry, \
TRACE_KMEM_FREE); \
- IF_ASSIGN(var, ent, struct syscall_trace_enter, \
- TRACE_SYSCALL_ENTER); \
- IF_ASSIGN(var, ent, struct syscall_trace_exit, \
- TRACE_SYSCALL_EXIT); \
+ IF_ASSIGN(var, ent, struct trace_skb_event, \
+ TRACE_SKB_SOURCE); \
__ftrace_bad_type(); \
} while (0)
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-03-11 19:04 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-13 3:10 linux-next: manual merge of the tip tree with the tree Stephen Rothwell
2011-05-13 8:03 ` Ralf Baechle
-- strict thread matches above, loose matches on Subject: below --
2014-03-11 19:03 Mark Brown
2011-08-18 4:14 Stephen Rothwell
2011-05-31 0:19 Stephen Rothwell
2009-08-17 6:50 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).