Revision tags: v3.6-rc1 |
|
#
bb181e2e |
| 01-Aug-2012 |
NeilBrown <neilb@suse.de> |
Merge commit 'c039c332f23e794deb6d6f37b9f07ff3b27fb2cf' into md
Pull in pre-requisites for adding raid10 support to dm-raid.
|
#
1f815fae |
| 31-Jul-2012 |
Ingo Molnar <mingo@kernel.org> |
Merge branch 'linus' into timers/urgent
Merge in Linus's branch which already has timers/core merged.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
#
fcb06702 |
| 30-Jul-2012 |
Johannes Berg <johannes.berg@intel.com> |
Merge remote-tracking branch 'wireless/master' into mac80211
|
#
8407884d |
| 25-Jul-2012 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream
Two bits were appended to the end of the bitfield list in struct scsi_device. Resolve that conflict by including both bits.
Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream
Two bits were appended to the end of the bitfield list in struct scsi_device. Resolve that conflict by including both bits.
Conflicts: include/scsi/scsi_device.h
show more ...
|
#
d431adfb |
| 25-Jul-2012 |
Ingo Molnar <mingo@kernel.org> |
Merge branch 'linus' into x86/urgent
Merge in Linus's tree to avoid a conflict.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
#
6aeea3ec |
| 25-Jul-2012 |
Grant Likely <grant.likely@secretlab.ca> |
Merge remote-tracking branch 'origin' into irqdomain/next
|
#
3fad0953 |
| 22-Jul-2012 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull debug-for-linus git tree from Ingo Molnar.
Fix up trivial conflict in arch/x86/kernel/cpu/perf_event
Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull debug-for-linus git tree from Ingo Molnar.
Fix up trivial conflict in arch/x86/kernel/cpu/perf_event_intel.c due to a printk() having changed to a pr_info() differently in the two branches.
* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86: Move call to print_modules() out of show_regs() x86/mm: Mark free_initrd_mem() as __init x86/microcode: Mark microcode_id[] as __initconst x86/nmi: Clean up register_nmi_handler() usage x86: Save cr2 in NMI in case NMIs take a page fault (for i386) x86: Remove cmpxchg from i386 NMI nesting code x86: Save cr2 in NMI in case NMIs take a page fault x86/debug: Add KERN_<LEVEL> to bare printks, convert printks to pr_<level>
show more ...
|
Revision tags: v3.5, v3.5-rc7, v3.5-rc6, v3.5-rc5, v3.5-rc4, v3.5-rc3, v3.5-rc2, v3.5-rc1 |
|
#
c767a54b |
| 22-May-2012 |
Joe Perches <joe@perches.com> |
x86/debug: Add KERN_<LEVEL> to bare printks, convert printks to pr_<level>
Use a more current logging style:
- Bare printks should have a KERN_<LEVEL> for consistency's sake - Add pr_fmt where ap
x86/debug: Add KERN_<LEVEL> to bare printks, convert printks to pr_<level>
Use a more current logging style:
- Bare printks should have a KERN_<LEVEL> for consistency's sake - Add pr_fmt where appropriate - Neaten some macro definitions - Convert some Ok output to OK - Use "%s: ", __func__ in pr_fmt for summit - Convert some printks to pr_<level>
Message output is not identical in all cases.
Signed-off-by: Joe Perches <joe@perches.com> Cc: levinsasha928@gmail.com Link: http://lkml.kernel.org/r/1337655007.24226.10.camel@joe2Laptop [ merged two similar patches, tidied up the changelog ] Signed-off-by: Ingo Molnar <mingo@kernel.org>
show more ...
|
Revision tags: v3.4, v3.4-rc7, v3.4-rc6, v3.4-rc5, v3.4-rc4, v3.4-rc3, v3.4-rc2, v3.4-rc1, v3.3, v3.3-rc7, v3.3-rc6, v3.3-rc5, v3.3-rc4, v3.3-rc3, v3.3-rc2, v3.3-rc1, v3.2, v3.2-rc7, v3.2-rc6, v3.2-rc5, v3.2-rc4, v3.2-rc3, v3.2-rc2, v3.2-rc1, v3.1, v3.1-rc10, v3.1-rc9, v3.1-rc8, v3.1-rc7, v3.1-rc6, v3.1-rc5, v3.1-rc4, v3.1-rc3, v3.1-rc2, v3.1-rc1, v3.0, v3.0-rc7, v3.0-rc6, v3.0-rc5, v3.0-rc4, v3.0-rc3, v3.0-rc2, v3.0-rc1, v2.6.39, v2.6.39-rc7, v2.6.39-rc6, v2.6.39-rc5, v2.6.39-rc4, v2.6.39-rc3, v2.6.39-rc2, v2.6.39-rc1, v2.6.38, v2.6.38-rc8, v2.6.38-rc7, v2.6.38-rc6, v2.6.38-rc5, v2.6.38-rc4, v2.6.38-rc3, v2.6.38-rc2, v2.6.38-rc1, v2.6.37, v2.6.37-rc8, v2.6.37-rc7, v2.6.37-rc6, v2.6.37-rc5, v2.6.37-rc4, v2.6.37-rc3, v2.6.37-rc2, v2.6.37-rc1, v2.6.36, v2.6.36-rc8, v2.6.36-rc7, v2.6.36-rc6, v2.6.36-rc5, v2.6.36-rc4, v2.6.36-rc3, v2.6.36-rc2, v2.6.36-rc1, v2.6.35, v2.6.35-rc6, v2.6.35-rc5, v2.6.35-rc4, v2.6.35-rc3, v2.6.35-rc2, v2.6.35-rc1, v2.6.34, v2.6.34-rc7, v2.6.34-rc6, v2.6.34-rc5, v2.6.34-rc4, v2.6.34-rc3, v2.6.34-rc2, v2.6.34-rc1, v2.6.33, v2.6.33-rc8, v2.6.33-rc7, v2.6.33-rc6, v2.6.33-rc5, v2.6.33-rc4, v2.6.33-rc3, v2.6.33-rc2, v2.6.33-rc1, v2.6.32, v2.6.32-rc8, v2.6.32-rc7, v2.6.32-rc6, v2.6.32-rc5, v2.6.32-rc4, v2.6.32-rc3, v2.6.32-rc1, v2.6.32-rc2, v2.6.31, v2.6.31-rc9, v2.6.31-rc8, v2.6.31-rc7, v2.6.31-rc6, v2.6.31-rc5, v2.6.31-rc4, v2.6.31-rc3, v2.6.31-rc2, v2.6.31-rc1, v2.6.30, v2.6.30-rc8, v2.6.30-rc7, v2.6.30-rc6, v2.6.30-rc5, v2.6.30-rc4, v2.6.30-rc3, v2.6.30-rc2, v2.6.30-rc1, v2.6.29, v2.6.29-rc8, v2.6.29-rc7, v2.6.29-rc6, v2.6.29-rc5, v2.6.29-rc4, v2.6.29-rc3, v2.6.29-rc2, v2.6.29-rc1 |
|
#
a9de18eb |
| 31-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into stackprotector
Conflicts: arch/x86/include/asm/pda.h kernel/fork.c
|
Revision tags: v2.6.28 |
|
#
55fa5188 |
| 20-Dec-2008 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'topic/pcsp-fix' into topic/misc
|
#
0ff55519 |
| 19-Dec-2008 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fix/hda' into topic/hda
|
Revision tags: v2.6.28-rc9 |
|
#
e18d7af8 |
| 12-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc8' into x86/mm
|
Revision tags: v2.6.28-rc8, v2.6.28-rc7 |
|
#
7fbb8759 |
| 26-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc6' into core/debug
|
#
3e1d7a62 |
| 24-Nov-2008 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'linus' into core/futexes
|
Revision tags: v2.6.28-rc6, v2.6.28-rc5 |
|
#
a5a64498 |
| 10-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc4' into timers/rtc
Conflicts: drivers/rtc/rtc-cmos.c
|
Revision tags: v2.6.28-rc4, v2.6.28-rc3 |
|
#
7b3b6e42 |
| 31-Oct-2008 |
Takashi Iwai <tiwai@suse.de> |
Merge commit 'v2.6.28-rc2' into topic/asoc
|
#
d1a76187 |
| 28-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc2' into core/locking
Conflicts: arch/um/include/asm/system.h
|
#
2011a067 |
| 28-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc2' into x86/doc
|
#
7a9787e1 |
| 28-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks
|
#
5292ae11 |
| 27-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc2' into x86/uv
|
#
e21e696e |
| 06-Nov-2008 |
James Morris <jmorris@namei.org> |
Merge branch 'master' into next
|
#
4944dd62 |
| 27-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc2' into tracing/urgent
|
Revision tags: v2.6.28-rc2 |
|
#
8c82a17e |
| 24-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc1' into sched/urgent
|
Revision tags: v2.6.28-rc1 |
|
#
5b346539 |
| 23-Oct-2008 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (26 commits) x
Merge branch 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (26 commits) x86: canonicalize remaining header guards x86: drop double underscores from header guards x86: Fix ASM_X86__ header guards x86, um: get rid of uml-config.h x86, um: get rid of arch/um/Kconfig.arch x86, um: get rid of arch/um/os symlink x86, um: get rid of excessive includes of uml-config.h x86, um: get rid of header symlinks x86, um: merge Kconfig.i386 and Kconfig.x86_64 x86, um: get rid of sysdep symlink x86, um: trim the junk from uml ptrace-*.h x86, um: take vm-flags.h to sysdep x86, um: get rid of uml asm/arch x86, um: get rid of uml highmem.h x86, um: get rid of uml unistd.h x86, um: get rid of system.h -> system.h include x86, um: uml atomic.h is not needed anymore x86, um: untangle uml ldt.h x86, um: get rid of more uml asm/arch uses x86, um: remove dead header (uml module-generic.h; never used these days) ...
show more ...
|
#
1965aae3 |
| 23-Oct-2008 |
H. Peter Anvin <hpa@zytor.com> |
x86: Fix ASM_X86__ header guards
Change header guards named "ASM_X86__*" to "_ASM_X86_*" since:
a. the double underscore is ugly and pointless. b. no leading underscore violates namespace constrain
x86: Fix ASM_X86__ header guards
Change header guards named "ASM_X86__*" to "_ASM_X86_*" since:
a. the double underscore is ugly and pointless. b. no leading underscore violates namespace constraints.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
show more ...
|