|
Revision tags: v2.6.29-rc8 |
|
| #
d95c3578 |
| 11-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'x86/core' into cpus4096
|
| #
e14eee56 |
| 11-Mar-2009 |
Benjamin Herrenschmidt <benh@kernel.crashing.org> |
Merge commit 'origin/master' into next
|
| #
e161183b |
| 10-Mar-2009 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
efdcd41b |
| 09-Mar-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'topic/vmaster-update' into topic/docbook-fix
|
| #
d15c22e7 |
| 08-Mar-2009 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge commit 'v2.6.29-rc7' into next
|
| #
7df4edb0 |
| 05-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/iommu
|
| #
a140feab |
| 05-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.29-rc7' into core/locking
|
|
Revision tags: v2.6.29-rc7 |
|
| #
d4fc7cea |
| 03-Mar-2009 |
Felix Blyakher <felixb@sgi.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
c02368a9 |
| 02-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into irq/genirq
|
| #
4434e515 |
| 26-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branches 'sched/cleanups', 'sched/urgent' and 'linus' into sched/core
|
| #
8e818179 |
| 26-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'x86/core' into perfcounters/core
Conflicts:
arch/x86/kernel/apic/apic.c
arch/x86/kernel/irqinit_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
2e31add2 |
| 25-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'x86/urgent' into x86/pat
|
| #
87b20307 |
| 24-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'x86/core' into core/percpu
|
| #
a852cbfa |
| 24-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branches 'x86/acpi', 'x86/apic', 'x86/asm', 'x86/cleanups', 'x86/mm', 'x86/signal' and 'x86/urgent'; commit 'v2.6.29-rc6' into x86/core
|
| #
e70049b9 |
| 24-Feb-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
|
| #
dc731ca6 |
| 23-Feb-2009 |
H. Peter Anvin <hpa@linux.intel.com> |
Merge branch 'x86/urgent' into x86/mce2
|
|
Revision tags: v2.6.29-rc6 |
|
| #
fc6fc7f1 |
| 22-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/apic
Conflicts:
arch/x86/mach-default/setup.c
Semantic conflict resolution:
arch/x86/kernel/setup.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
2702e0a4 |
| 22-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into timers/hpet
|
| #
3b6f7b9b |
| 20-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'x86/urgent' into x86/core
|
| #
72c26c9a |
| 19-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into tracing/blktrace
Conflicts:
block/blktrace.c
Semantic merge:
kernel/trace/blktrace.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
|
Revision tags: v2.6.29-rc5, v2.6.29-rc4, v2.6.29-rc3, v2.6.29-rc2, v2.6.29-rc1, v2.6.28, v2.6.28-rc9, v2.6.28-rc8, v2.6.28-rc7, v2.6.28-rc6, v2.6.28-rc5, v2.6.28-rc4, v2.6.28-rc3, v2.6.28-rc2, v2.6.28-rc1 |
|
| #
b2aaf8f7 |
| 15-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into stackprotector
Conflicts:
arch/x86/kernel/Makefile
include/asm-x86/pda.h
|
| #
467388f2 |
| 24-Feb-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
|
| #
5acfac5a |
| 22-Feb-2009 |
Len Brown <len.brown@intel.com> |
Merge branches 'release', 'bugzilla-12011', 'bugzilla-12632', 'misc' and 'suspend' into release
|
| #
610d18f4 |
| 18-Feb-2009 |
Davide Libenzi <davidel@xmailserver.org> |
timerfd: add flags check
As requested by Michael, add a missing check for valid flags in
timerfd_settime(), and make it return EINVAL in case some extra bits are
set.
Michael said:
If this is to be
timerfd: add flags check
As requested by Michael, add a missing check for valid flags in
timerfd_settime(), and make it return EINVAL in case some extra bits are
set.
Michael said:
If this is to be any use to userland apps that want to check flag
support (perhaps it is too late already), then the sooner we get it
into the kernel the better: 2.6.29 would be good; earlier stables as
well would be even better.
[akpm@linux-foundation.org: remove unused TFD_FLAGS_SET]
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com>
Signed-off-by: Davide Libenzi <davidel@xmailserver.org>
Cc: <stable@kernel.org> [2.6.27.x, 2.6.28.x]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
show more ...
|
| #
7a9787e1 |
| 28-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks
|