litmus-rt.git/Makefile, branch wip-timer-trace The LITMUS^RT kernel. Merge commit 'v2.6.36' into wip-merge-2.6.36 2010-10-23T05:01:49+00:00 Andrea Bastoni bastoni@cs.unc.edu 2010-10-23T05:01:49+00:00 3dd41424090a0ca3a660218d06afe6ff4441bad3 Conflicts: Makefile arch/x86/include/asm/unistd_32.h arch/x86/kernel/syscall_table_32.S kernel/sched.c kernel/time/tick-sched.c Relevant API and functions changes (solved in this commit): - (API) .enqueue_task() (enqueue_task_litmus), dequeue_task() (dequeue_task_litmus), [litmus/sched_litmus.c] - (API) .select_task_rq() (select_task_rq_litmus) [litmus/sched_litmus.c] - (API) sysrq_dump_trace_buffer() and sysrq_handle_kill_rt_tasks() [litmus/sched_trace.c] - struct kfifo internal buffer name changed (buffer -> buf) [litmus/sched_trace.c] - add_wait_queue_exclusive_locked -> __add_wait_queue_tail_exclusive [litmus/fmlp.c] - syscall numbers for both x86_32 and x86_64 
Conflicts:
	Makefile
	arch/x86/include/asm/unistd_32.h
	arch/x86/kernel/syscall_table_32.S
	kernel/sched.c
	kernel/time/tick-sched.c

Relevant API and functions changes (solved in this commit):
- (API) .enqueue_task() (enqueue_task_litmus),
  dequeue_task() (dequeue_task_litmus),
  [litmus/sched_litmus.c]
- (API) .select_task_rq() (select_task_rq_litmus)
  [litmus/sched_litmus.c]
- (API) sysrq_dump_trace_buffer() and sysrq_handle_kill_rt_tasks()
  [litmus/sched_trace.c]
- struct kfifo internal buffer name changed (buffer -> buf)
  [litmus/sched_trace.c]
- add_wait_queue_exclusive_locked -> __add_wait_queue_tail_exclusive
  [litmus/fmlp.c]
- syscall numbers for both x86_32 and x86_64
Linux 2.6.36 2010-10-20T20:30:22+00:00 Linus Torvalds torvalds@linux-foundation.org 2010-10-20T20:30:22+00:00 f6f94e2ab1b33f0082ac22d71f66385a60d8157f 






Linux 2.6.36-rc8
2010-10-14T23:26:43+00:00

Linus Torvalds
torvalds@linux-foundation.org

2010-10-14T23:26:43+00:00

cd07202cc8262e1669edff0d97715f3dd9260917












Linux 2.6.36-rc7
2010-10-06T20:39:52+00:00

Linus Torvalds
torvalds@linux-foundation.org

2010-10-06T20:39:52+00:00

cb655d0f3d57c23db51b981648e452988c0223f9












Linux 2.6.36-rc6
2010-09-29T01:01:22+00:00

Linus Torvalds
torvalds@linux-foundation.org

2010-09-29T01:01:22+00:00

899611ee7d373e5eeda08e9a8632684e1ebbbf00












Linux 2.6.36-rc5
2010-09-20T23:56:53+00:00

Linus Torvalds
torvalds@linux-foundation.org

2010-09-20T23:56:53+00:00

b30a3f6257ed2105259b404d419b4964e363928c












Linux 2.6.36-rc4
2010-09-12T23:07:37+00:00

Linus Torvalds
torvalds@linux-foundation.org

2010-09-12T23:07:37+00:00

49553c2ef88749dd502687f4eb9c258bb10a4f44












Linux 2.6.36-rc3
2010-08-29T15:36:04+00:00

Linus Torvalds
torvalds@linux-foundation.org

2010-08-29T15:36:04+00:00

2bfc96a127bc1cc94d26bfaa40159966064f9c8c












Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
2010-08-24T01:28:24+00:00

Linus Torvalds
torvalds@linux-foundation.org

2010-08-24T01:28:24+00:00

c70662ec47191eb235bb1d0a1466b923b7a08a94

* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  setlocalversion: Ignote SCMs above the linux source tree
  makefile: not need to regenerate kernel.release file when make kernelrelease
  fixes for using make 3.82
  kconfig: fix segfault when detecting recursive dependency
  kconfig: fix savedefconfig with choice marked optional





* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  setlocalversion: Ignote SCMs above the linux source tree
  makefile: not need to regenerate kernel.release file when make kernelrelease
  fixes for using make 3.82
  kconfig: fix segfault when detecting recursive dependency
  kconfig: fix savedefconfig with choice marked optional







Linux 2.6.36-rc2
2010-08-23T00:43:29+00:00

Linus Torvalds
torvalds@linux-foundation.org

2010-08-23T00:43:29+00:00

76be97c1fc945db08aae1f1b746012662d643e97