commit e946217e4fdaa67681bbabfa8e6b18641921f750
Merge: a186576... 60063a6...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Oct 28 09:52:25 2008 -0700

    Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (31 commits)
      ftrace: fix current_tracer error return
      tracing: fix a build error on alpha
      ftrace: use a real variable for ftrace_nop in x86
      tracing/ftrace: make boot tracer select the sched_switch tracer
      tracepoint: check if the probe has been registered
      asm-generic: define DIE_OOPS in asm-generic
      trace: fix printk warning for u64
      ftrace: warning in kernel/trace/ftrace.c
      ftrace: fix build failure
      ftrace, powerpc, sparc64, x86: remove notrace from arch ftrace file
      ftrace: remove ftrace hash
      ftrace: remove mcount set
      ftrace: remove daemon
      ftrace: disable dynamic ftrace for all archs that use daemon
      ftrace: add ftrace warn on to disable ftrace
      ftrace: only have ftrace_kill atomic
      ftrace: use probe_kernel
      ftrace: comment arch ftrace code
      ftrace: return error on failed modified text.
      ftrace: dynamic ftrace process only text section
      ...

commit a1865769254dd4eefbc1e857d17bc2a77d5f8580
Merge: 0d8762c... e45948b...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Oct 28 09:50:11 2008 -0700

    Merge branch 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm
    
    * 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm:
      KVM: ia64: Makefile fix for forcing to re-generate asm-offsets.h
      KVM: Future-proof device assignment ABI
      KVM: ia64: Fix halt emulation logic
      KVM: Fix guest shared interrupt with in-kernel irqchip
      KVM: MMU: sync root on paravirt TLB flush

commit 0d8762c9ee40cf83d5dbf3a22843bc566912b592
Merge: cf76ddd... 6afe40b...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Oct 28 09:49:27 2008 -0700

    Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      lockdep: fix irqs on/off ip tracing
      lockdep: minor fix for debug_show_all_locks()
      x86: restore the old swiotlb alloc_coherent behavior
      x86: use GFP_DMA for 24bit coherent_dma_mask
      swiotlb: remove panic for alloc_coherent failure
      xen: compilation fix of drivers/xen/events.c on IA64
      xen: portability clean up and some minor clean up for xencomm.c
      xen: don't reload cr3 on suspend
      kernel/resource: fix reserve_region_with_split() section mismatch
      printk: remove unused code from kernel/printk.c

commit cf76dddb22c019f03ada6479210f894f19bd591b
Merge: 8ca6215... 3786fc7...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Oct 28 09:48:25 2008 -0700

    Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      irq: make variable static

commit 8ca6215502462f564d7bcae2d8dcc825aa95d743
Merge: f8245e9... 4078e35...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Oct 28 09:46:20 2008 -0700

    Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      sched: fix documentation reference for sched_min_granularity_ns
      sched: virtual time buddy preemption
      sched: re-instate vruntime based wakeup preemption
      sched: weaken sync hint
      sched: more accurate min_vruntime accounting
      sched: fix a find_busiest_group buglet
      sched: add CONFIG_SMP consistency

commit f8245e91a5121acc435e509aa56cd04d445a74c7
Merge: b30fc14... 60817c9...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Oct 28 09:45:31 2008 -0700

    Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86, memory hotplug: remove wrong -1 in calling init_memory_mapping()
      x86: keep the /proc/meminfo page count correct
      x86/uv: memory allocation at initialization
      xen: fix Xen domU boot with batched mprotect

commit b30fc14c5c94728baa42b7c17d83ea17185b5c40
Merge: 3c136f2... ea4bfdf...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Oct 28 09:44:59 2008 -0700

    Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
    
    * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
      [S390] s390: Fix build for !CONFIG_S390_GUEST + CONFIG_VIRTIO_CONSOLE
      [S390] No more 4kb stacks.
      [S390] Change default IPL method to IPL_VM.
      [S390] tape: disable interrupts in tape_open and tape_release
      [S390] appldata: unsigned ops->size cannot be negative
      [S390] tape block: complete request with correct locking
      [S390] Fix sysdev class file creation.
      [S390] pgtables: Fix race in enable_sie vs. page table ops
      [S390] qdio: remove incorrect memset
      [S390] qdio: prevent double qdio shutdown in case of I/O errors

commit 3c136f29ba5ae8dfcae4958bbcb581420b43a74d
Merge: 49fdf67... 87943ac...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Oct 28 09:42:48 2008 -0700

    Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
      libata: ahci enclosure management bit mask
      libata: ahci enclosure management led sync
      pata_ninja32: suspend/resume support
      libata: Fix LBA48 on pata_it821x RAID volumes.
      libata: clear saved xfer_mode and ncq_enabled on device detach
      sata_sil24: configure max read request size to 4k
      libata: add missing kernel-doc
      libata: fix device iteration bugs
      ahci: Add support for Promise PDC42819
      ata: Switch all my stuff to a common address

commit 60063a66236c15f5613f91390631e06718689782
Author: Steven Rostedt <rostedt@goodmis.org>
Date:   Tue Oct 28 10:44:24 2008 -0400

    ftrace: fix current_tracer error return
    
    The commit (in linux-tip) c2931e05ec5965597cbfb79ad332d4a29aeceb23
     ( ftrace: return an error when setting a nonexistent tracer )
    added useful code that would error when a bad tracer was written into
    the current_tracer file.
    
    But this had a bug if the amount written was more than the amount read by
    that code. The first iteration would set the tracer correctly, but since
    it did not consume the rest of what was written (usually whitespace), the
    userspace utility would continue to write what was not consumed. This
    second iteration would fail to find a tracer and return -EINVAL. Funny
    thing is that the tracer would have already been set.
    
    This patch just consumes all the data that is written to the file.
    
    Signed-off-by: Steven Rostedt <srostedt@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit e45948b071d8be59044ac232d99a2ca83fd93266
Author: Xiantao Zhang <xiantao.zhang@intel.com>
Date:   Thu Oct 23 10:37:06 2008 +0800

    KVM: ia64: Makefile fix for forcing to re-generate asm-offsets.h
    
    To avoid using stale asm-offsets.h.
    
    Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
    Signed-off-by: Avi Kivity <avi@redhat.com>

commit bb45e202e695dea8657bb03a01d1522c37558672
Author: Avi Kivity <avi@redhat.com>
Date:   Sun Oct 19 16:39:45 2008 +0200

    KVM: Future-proof device assignment ABI
    
    Reserve some space so we can add more data.
    
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit decc90162a99b4e51c534ab63f9b6fc5cb0f2596
Author: Xiantao Zhang <xiantao.zhang@intel.com>
Date:   Thu Oct 16 15:58:15 2008 +0800

    KVM: ia64: Fix halt emulation logic
    
    Common halt logic was changed by x86 and did not update ia64.  This patch
    updates halt for ia64.
    
    Fixes a regression causing guests to hang with more than 2 vcpus.
    
    Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
    Signed-off-by: Avi Kivity <avi@redhat.com>

commit 5550af4df179e52753d3a43a788a113ad8cd95cd
Author: Sheng Yang <sheng@linux.intel.com>
Date:   Wed Oct 15 20:15:06 2008 +0800

    KVM: Fix guest shared interrupt with in-kernel irqchip
    
    Every call of kvm_set_irq() should offer an irq_source_id, which is
    allocated by kvm_request_irq_source_id(). Based on irq_source_id, we
    identify the irq source and implement logical OR for shared level
    interrupts.
    
    The allocated irq_source_id can be freed by kvm_free_irq_source_id().
    
    Currently, we support at most sizeof(unsigned long) different irq sources.
    
    [Amit: - rebase to kvm.git HEAD
           - move definition of KVM_USERSPACE_IRQ_SOURCE_ID to common file
           - move kvm_request_irq_source_id to the update_irq ioctl]
    
    [Xiantao: - Add kvm/ia64 stuff and make it work for kvm/ia64 guests]
    
    Signed-off-by: Sheng Yang <sheng@linux.intel.com>
    Signed-off-by: Amit Shah <amit.shah@redhat.com>
    Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
    Signed-off-by: Avi Kivity <avi@redhat.com>

commit 6ad9f15c94822c3f067a7d443f3b414e08b34460
Author: Marcelo Tosatti <mtosatti@redhat.com>
Date:   Wed Oct 15 07:45:08 2008 -0200

    KVM: MMU: sync root on paravirt TLB flush
    
    The pvmmu TLB flush handler should request a root sync, similarly to
    a native read-write CR3.
    
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
    Signed-off-by: Avi Kivity <avi@redhat.com>

commit 6afe40b4dace385d7ba2faf24b352f066f3b71bf
Author: Heiko Carstens <heiko.carstens@de.ibm.com>
Date:   Tue Oct 28 11:14:58 2008 +0100

    lockdep: fix irqs on/off ip tracing
    
    Impact: fix lockdep lock-api-caller output when irqsoff tracing is enabled
    
    81d68a96 "ftrace: trace irq disabled critical timings" added wrappers around
    trace_hardirqs_on/off_caller. However these functions use
    __builtin_return_address(0) to figure out which function actually disabled
    or enabled irqs. The result is that we save the ips of trace_hardirqs_on/off
    instead of the real caller. Not very helpful.
    
    However since the patch from Steven the ip already gets passed. So use that
    and get rid of __builtin_return_address(0) in these two functions.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit ea4bfdf52a5a84492cce881baadc5fab36adeade
Author: Christian Borntraeger <borntraeger@de.ibm.com>
Date:   Tue Oct 28 11:10:22 2008 +0100

    [S390] s390: Fix build for !CONFIG_S390_GUEST + CONFIG_VIRTIO_CONSOLE
    
    The s390 kernel does not compile if virtio console is enabled, but guest
    support is disabled:
    
      LD      .tmp_vmlinux1
    arch/s390/kernel/built-in.o: In function `setup_arch':
    /space/linux-2.5/arch/s390/kernel/setup.c:773: undefined reference to
    `s390_virtio_console_init'
    
    The fix is related to
    commit 99e65c92f2bbf84f43766a8bf701e36817d62822
    Author: Christian Borntraeger <borntraeger@de.ibm.com>
    Date:   Fri Jul 25 15:50:04 2008 +0200
        KVM: s390: Fix guest kconfig
    
    Which changed the build process to build kvm_virtio.c only if CONFIG_S390_GUEST
    is set. We must ifdef the prototype in the header file accordingly.
    
    Reported-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

commit 7f5a8ba6b0297ca941f43f8f5cbf0e5c8c4dd916
Author: Heiko Carstens <heiko.carstens@de.ibm.com>
Date:   Tue Oct 28 11:10:21 2008 +0100

    [S390] No more 4kb stacks.
    
    We got a stack overflow with a small stack configuration on a 32 bit
    system. It just looks like as 4kb isn't enough and too dangerous.
    So lets get rid of 4kb stacks on 32 bit.
    
    But one thing I completely dislike about the call trace below is that
    just for debugging or tracing purposes sprintf gets called (cio_start_key):
    
    	/* process condition code */
    	sprintf(dbf_txt, "ccode:%d", ccode);
    	CIO_TRACE_EVENT(4, dbf_txt);
    
    But maybe its just me who thinks that this could be done better.
    
        <4>Kernel stack overflow.
        <4>Modules linked in: dm_multipath sunrpc bonding qeth_l2 dm_mod qeth ccwgroup vmur
        <4>CPU: 1 Not tainted 2.6.27-30.x.20081015-s390default #1
        <4>Process httpd (pid: 3807, task: 20ae2df8, ksp: 1666fb78)
        <4>Krnl PSW : 040c0000 8027098a (number+0xe/0x348)
        <4>           R:0 T:1 IO:0 EX:0 Key:0 M:1 W:0 P:0 AS:0 CC:0 PM:0
        <4>Krnl GPRS: 00d43318 0027097c 1666f277 9666f270
        <4>           00000000 00000000 0000000a ffffffff
        <4>           9666f270 1666f228 1666f277 1666f098
        <4>           00000002 80270982 80271016 1666f098
        <4>Krnl Code: 8027097e: f0340dd0a7f1	srp	3536(4,%r0),2033(%r10),4
        <4>           80270984: 0f00		clcl	%r0,%r0
        <4>           80270986: a7840001		brc	8,80270988
        <4>          >8027098a: 18ef		lr	%r14,%r15
        <4>           8027098c: a7faff68		ahi	%r15,-152
        <4>           80270990: 18bf		lr	%r11,%r15
        <4>           80270992: 18a2		lr	%r10,%r2
        <4>           80270994: 1893		lr	%r9,%r3
    
    Modified calltrace with annotated stackframe size of each function:
    
    stackframe size
        |
     0 304 vsnprintf+850 [0x271016]
     1  72 sprintf+74 [0x271522]
     2  56 cio_start_key+262 [0x2d4c16]
     3  56 ccw_device_start_key+222 [0x2dfe92]
     4  56 ccw_device_start+40 [0x2dff28]
     5  48 raw3215_start_io+104 [0x30b0f8]
     6  56 raw3215_write+494 [0x30ba0a]
     7  40 con3215_write+68 [0x30bafc]
     8  40 __call_console_drivers+146 [0x12b0fa]
     9  32 _call_console_drivers+102 [0x12b192]
    10  64 release_console_sem+268 [0x12b614]
    11 168 vprintk+462 [0x12bca6]
    12  72 printk+68 [0x12bfd0]
    13 256 __print_symbol+50 [0x15a882]
    14  56 __show_trace+162 [0x103d06]
    15  32 show_trace+224 [0x103e70]
    16  48 show_stack+152 [0x103f20]
    17  56 dump_stack+126 [0x104612]
    18  96 __alloc_pages_internal+592 [0x175004]
    19  80 cache_alloc_refill+776 [0x196f3c]
    20  40 __kmalloc+258 [0x1972ae]
    21  40 __alloc_skb+94 [0x328086]
    22  32 pskb_copy+50 [0x328252]
    23  32 skb_realloc_headroom+110 [0x328a72]
    24 104 qeth_l2_hard_start_xmit+378 [0x7803bfde]
    25  56 dev_hard_start_xmit+450 [0x32ef6e]
    26  56 __qdisc_run+390 [0x3425d6]
    27  48 dev_queue_xmit+410 [0x331e06]
    28  40 ip_finish_output+308 [0x354ac8]
    29  56 ip_output+218 [0x355b6e]
    30  24 ip_local_out+56 [0x354584]
    31 120 ip_queue_xmit+300 [0x355cec]
    32  96 tcp_transmit_skb+812 [0x367da8]
    33  40 tcp_push_one+158 [0x369fda]
    34 112 tcp_sendmsg+852 [0x35d5a0]
    35 240 sock_sendmsg+164 [0x32035c]
    36  56 kernel_sendmsg+86 [0x32064a]
    37  88 sock_no_sendpage+98 [0x322b22]
    38 104 tcp_sendpage+70 [0x35cc1e]
    39  48 sock_sendpage+74 [0x31eb66]
    40  64 pipe_to_sendpage+102 [0x1c4b2e]
    41  64 __splice_from_pipe+120 [0x1c5340]
    42  72 splice_from_pipe+90 [0x1c57e6]
    43  56 generic_splice_sendpage+38 [0x1c5832]
    44  48 do_splice_from+104 [0x1c4c38]
    45  48 direct_splice_actor+52 [0x1c4c88]
    46  80 splice_direct_to_actor+180 [0x1c4f80]
    47  72 do_splice_direct+70 [0x1c5112]
    48  64 do_sendfile+360 [0x19de18]
    49  72 sys_sendfile64+126 [0x19df32]
    50 336 sysc_do_restart+18 [0x111a1a]
    
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

commit 46e7951f9431b5e6bfbeb3044fdb4b522f58101c
Author: Heiko Carstens <heiko.carstens@de.ibm.com>
Date:   Tue Oct 28 11:10:20 2008 +0100

    [S390] Change default IPL method to IPL_VM.
    
    allyesconfig and allmodconfig built kernels have a tape IPL record.
    A the vmreader record makes much more sense, since hardly anybody will
    ever IPL a kernel from tape. So change the default.
    As I side effect I can test these kernels without fiddling around with
    the kernel config ;)
    
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

commit b3c21e4919c8598c58faaa0a650dc398baddd993
Author: Frank Munzert <munzert@de.ibm.com>
Date:   Tue Oct 28 11:10:19 2008 +0100

    [S390] tape: disable interrupts in tape_open and tape_release
    
    Get tape device lock with interrupts disabled. Otherwise lockdep will issue a
    warning similar to:
    
    =================================
    [ INFO: inconsistent lock state ]
    2.6.27 #1
    ---------------------------------
    inconsistent {in-hardirq-W} -> {hardirq-on-W} usage.
    vol_id/2903 [HC0[0]:SC0[0]:HE1:SE1] takes:
     (sch->lock){++..}, at: [<000003e00004c7a2>] tape_open+0x42/0x1a4 [tape]
    {in-hardirq-W} state was registered at:
      [<000000000007ce5c>] __lock_acquire+0x894/0xa74
      [<000000000007d0ce>] lock_acquire+0x92/0xb8
      [<0000000000345154>] _spin_lock+0x5c/0x9c
      [<0000000000202264>] do_IRQ+0x124/0x1f0
      [<0000000000026610>] io_return+0x0/0x8
    
    irq event stamp: 847
    hardirqs last  enabled at (847): [<000000000007aca6>] trace_hardirqs_on+0x2a/0x38
    hardirqs last disabled at (846): [<0000000000076ca2>] trace_hardirqs_off+0x2a/0x38
    softirqs last  enabled at (0): [<000000000004909e>] copy_process+0x43e/0x11f4
    softirqs last disabled at (0): [<0000000000000000>] 0x0
    
    other info that might help us debug this:
    1 lock held by vol_id/2903:
     #0:  (&bdev->bd_mutex){--..}, at: [<000000000010e0f4>] do_open+0x78/0x358
    
    stack backtrace:
    CPU: 1 Not tainted 2.6.27 #1},
    Process vol_id (pid: 2903, task: 000000003d4c0000, ksp: 000000003d4e3b10)
    0400000000000000 000000003d4e3830 0000000000000002 0000000000000000
           000000003d4e38d0 000000003d4e3848 000000003d4e3848 00000000000168a8
           0000000000000000 000000003d4e3b10 0000000000000000 0000000000000000
           000000003d4e3830 000000000000000c 000000003d4e3830 000000003d4e38a0
           000000000034aa98 00000000000168a8 000000003d4e3830 000000003d4e3880
    Call Trace:
    ([<000000000001681c>] show_trace+0x138/0x158)
     [<0000000000016902>] show_stack+0xc6/0xf8
     [<00000000000170d4>] dump_stack+0xb0/0xc0
     [<0000000000078810>] print_usage_bug+0x1e8/0x228
     [<000000000007a71c>] mark_lock+0xb14/0xd24
     [<000000000007cd5a>] __lock_acquire+0x792/0xa74
     [<000000000007d0ce>] lock_acquire+0x92/0xb8
     [<0000000000345154>] _spin_lock+0x5c/0x9c
     [<000003e00004c7a2>] tape_open+0x42/0x1a4 [tape]
     [<000003e00005185c>] tapeblock_open+0x98/0xd0 [tape]
    
    Signed-off-by: Frank Munzert <munzert@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

commit 13f8b7c5e6fa13622592042f3b5aa88ba785cec2
Author: Roel Kluin <roel.kluin@gmail.com>
Date:   Tue Oct 28 11:10:18 2008 +0100

    [S390] appldata: unsigned ops->size cannot be negative
    
    unsigned ops->size cannot be negative
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

commit 7a4a1ccd44c85c7d92b20a361e3854431c6935e0
Author: Frank Munzert <munzert@de.ibm.com>
Date:   Tue Oct 28 11:10:17 2008 +0100

    [S390] tape block: complete request with correct locking
    
    __blk_end_request must be called with request queue lock held. We need to use
    blk_end_request rather than  __blk_end_request.
    
    Signed-off-by: Frank Munzert <munzert@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

commit da5aae7036692fa8d03da1b705c76fd750ed9e38
Author: Heiko Carstens <heiko.carstens@de.ibm.com>
Date:   Tue Oct 28 11:10:16 2008 +0100

    [S390] Fix sysdev class file creation.
    
    Use sysdev_class_create_file() to create create sysdev class attributes
    instead of sysfs_create_file(). Using sysfs_create_file() wasn't a very
    good idea since the show and store functions have a different amount of
    parameters for sysfs files and sysdev class files.
    In particular the pointer to the buffer is the last argument and
    therefore accesses to random memory regions happened.
    Still worked surprisingly well until we got a kernel panic.
    
    Cc: stable@kernel.org
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

commit 250cf776f74b5932a1977d0489cae9206e2351dd
Author: Christian Borntraeger <borntraeger@de.ibm.com>
Date:   Tue Oct 28 11:10:15 2008 +0100

    [S390] pgtables: Fix race in enable_sie vs. page table ops
    
    The current enable_sie code sets the mm->context.pgstes bit to tell
    dup_mm that the new mm should have extended page tables. This bit is also
    used by the s390 specific page table primitives to decide about the page
    table layout - which means context.pgstes has two meanings. This can cause
    any kind of bugs. For example  - e.g. shrink_zone can call
    ptep_clear_flush_young while enable_sie is running. ptep_clear_flush_young
    will test for context.pgstes. Since enable_sie changed that value of the old
    struct mm without changing the page table layout ptep_clear_flush_young will
    do the wrong thing.
    The solution is to split pgstes into two bits
    - one for the allocation
    - one for the current state
    
    Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

commit 2c78091405d6f54748b1fac78c45f2a799e3073a
Author: Jan Glauber <jang@linux.vnet.ibm.com>
Date:   Tue Oct 28 11:10:14 2008 +0100

    [S390] qdio: remove incorrect memset
    
    Remove the memset since zeroing the string is not needed and use
    snprintf instead of sprintf.
    
    Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

commit 7c045aa2c8eb731996b0c5c6552356b8946e6894
Author: Jan Glauber <jang@linux.vnet.ibm.com>
Date:   Tue Oct 28 11:10:13 2008 +0100

    [S390] qdio: prevent double qdio shutdown in case of I/O errors
    
    In case of I/O errors on a qdio subchannel qdio_shutdown may be
    called twice by the qdio driver and by zfcp. Remove the
    superfluous shutdown from qdio and let the upper layer driver
    handle the error condition.
    
    Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

commit 46fec7ac40e452a2ea5e63648d98b6bb2b5898f9
Author: qinghuang feng <qhfeng.kernel@gmail.com>
Date:   Tue Oct 28 17:24:28 2008 +0800

    lockdep: minor fix for debug_show_all_locks()
    
    When we failed to get tasklist_lock eventually (count equals 0),
    we should only print " ignoring it.\n", and not print
    " locked it.\n" needlessly.
    
    Signed-off-by: Qinghuang Feng <qhfeng.kernel@gmail.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 21798a84ab383cdac0e7ee3368e0792b718b867d
Author: Frederic Weisbecker <fweisbec@gmail.com>
Date:   Tue Oct 28 09:43:26 2008 +0100

    tracing: fix a build error on alpha
    
    Impact: build fix on Alpha
    
    When tracing is enabled, some arch have included <linux/irqflags.h>
    on their <asm/system.h> but others like alpha or m68k don't.
    
    Build error on alpha:
    
    kernel/trace/trace.c: In function 'tracing_cpumask_write':
    kernel/trace/trace.c:2145: error: implicit declaration of function 'raw_local_irq_disable'
    kernel/trace/trace.c:2162: error: implicit declaration of function 'raw_local_irq_enable'
    
    Tested on Alpha through a cross-compiler (should correct a similar issue on m68k).
    
    Reported-by: Alexey Dobriyan <adobriyan@gmail.com>
    Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 60817c9b31ef7897d60bca2f384cbc316a3fdd8b
Author: Shaohua Li <shaohua.li@intel.com>
Date:   Mon Oct 27 13:03:18 2008 -0700

    x86, memory hotplug: remove wrong -1 in calling init_memory_mapping()
    
    Impact: fix crash with memory hotplug
    
    Shuahua Li found:
    
    | I just did some experiments on a desktop for memory hotplug and this bug
    | triggered a crash in my test.
    |
    | Yinghai's suggestion also fixed the bug.
    
    We don't need to round it, just remove that extra -1
    
    Signed-off-by: Yinghai <yinghai@kernel.org>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 87943acf60898a3efb6b5ee85d4cc789898bf5e8
Author: David Milburn <dmilburn@redhat.com>
Date:   Mon Oct 13 14:38:36 2008 -0500

    libata: ahci enclosure management bit mask
    
    Enclosure management bit mask definitions.
    
    Signed-off-by: David Milburn <dmilburn@redhat.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit eb40963c835c69681af516388a2a92b57e2f0fe7
Author: David Milburn <dmilburn@redhat.com>
Date:   Thu Oct 16 09:26:19 2008 -0500

    libata: ahci enclosure management led sync
    
    Synchronize ahci_sw_activity and ahci_sw_activity_blink with ata_port lock.
    
    Signed-off-by: David Milburn <dmilburn@redhat.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit e7c0d217cdaa837d30bc265eddac4d176969fd68
Author: Alan Cox <alan@redhat.com>
Date:   Fri Oct 17 19:08:31 2008 +0100

    pata_ninja32: suspend/resume support
    
    I had assumed that the standard recovery would be sufficient for this
    hardware but it isn't. Fix up the other registers on resume as needed. See
    bug #11735
    
    Signed-off-by: Alan Cox <alan@redhat.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 054e5f616b5becdc096b793407dc33fe379749ac
Author: Ondrej Zary <linux@rainbow-software.org>
Date:   Sun Oct 26 18:10:19 2008 -0400

    libata: Fix LBA48 on pata_it821x RAID volumes.
    
    [http://lkml.org/lkml/2008/10/18/82]
    
    Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
    Acked-by: Alan Cox <alan@redhat.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 90484ebfc96c5dc5c498ed72cf2d370575db9b76
Author: Tejun Heo <tj@kernel.org>
Date:   Sun Oct 26 15:43:03 2008 +0900

    libata: clear saved xfer_mode and ncq_enabled on device detach
    
    libata EH saves xfer_mode and ncq_enabled at start to later set
    DUBIOUS_XFER flag if it has changed.  These values need to be cleared
    on device detach such that hot device swap doesn't accidentally miss
    DUBIOUS_XFER.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit e8b3b5e9f54512bfdb7c154da07ec0408cbd6c56
Author: Tejun Heo <tj@kernel.org>
Date:   Sat Oct 25 14:26:54 2008 +0900

    sata_sil24: configure max read request size to 4k
    
    Due to request posting limitations, bandwidth of sil3132 is limited to
    around 120MB/s with the minimum pci-e payload size (128bytes) which is
    used by most consumer systems.  However, write throughput can be
    slightly (~3%) increased by increasing the max read requeset size.
    Configure it to 4k which is the maximum supported.  This optimization
    is also done by SIMG's windows driver.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 3cd8ddbd86e4ea6f2f6582da217651f048d76130
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date:   Sun Oct 26 20:19:32 2008 -0700

    libata: add missing kernel-doc
    
    Fix libata missing kernel-doc:
    
    Warning(lin2628-rc2//drivers/ata/libata-core.c:4562): No description
    found for parameter 'tag'
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 4a9c7b3359889399aacb94019bbdfc9f38d4cff7
Author: Tejun Heo <tj@kernel.org>
Date:   Mon Oct 27 19:59:23 2008 +0900

    libata: fix device iteration bugs
    
    There were several places where only enabled devices should be
    iterated over but device enabledness wasn't checked.
    
    * IDENTIFY data 40 wire check in cable_is_40wire()
    * xfer_mode/ncq_enabled saving in ata_scsi_error()
    * DUBIOUS_XFER handling in ata_set_mode()
    
    While at it, reformat comments in cable_is_40wire().
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit c77a036beceabbfd85b366193685cb49f38292bd
Author: Mark Nelson <mdnelson8@gmail.com>
Date:   Thu Oct 23 14:08:16 2008 +1100

    ahci: Add support for Promise PDC42819
    
    Add an appropriate entry for the Promise PDC42819 controller. It has an
    AHCI mode and so far works correctly with board_ahci.
    
    This chip is found on Promise's FastTrak TX2650 (2 port) and TX4650 (4 port)
    software-based RAID cards (for which there is a binary driver, t3sas) and
    can be found on some motherboards, for example the MSI K9A2 Platinum,
    which calls the chip a Promise T3 controller.
    
    Although this controller also supports SAS devices, its default bootup mode
    is AHCI and the binary driver has to do some magic to get the chip into the
    appropriate mode to drive SAS disks.
    
    Seeing as no documentation is provided by Promise, adding this entry to the
    ahci driver allows the controller to be useful to people as a SATA
    controller (with no ill effects on the system if a SAS disk is connected -
    probing of the port just times out with "link online but device
    misclassified"), without having to resort to using the binary driver. Users
    who require SAS or the proprietary software raid can get this functionality
    using the binary driver.
    
    Signed-off-by: Mark Nelson <mdnelson8@gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit ab77163008c596aad9624ceab190d840c0143fa8
Author: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date:   Mon Oct 27 15:09:10 2008 +0000

    ata: Switch all my stuff to a common address
    
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 49fdf6785fd660e18a1eb4588928f47e9fa29a9a
Merge: b70a6b2... 43a49cb...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Oct 27 11:41:51 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
    
    * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
      libata: fix NCQ devices behind port multipliers
      scsi: make sure that scsi_init_shared_tag_map() doesn't overwrite existing map

commit 43a49cbdf31e812c0d8f553d433b09b421f5d52c
Author: Jens Axboe <jens.axboe@oracle.com>
Date:   Mon Oct 27 19:23:06 2008 +0100

    libata: fix NCQ devices behind port multipliers
    
    For devices behind sata port multipliers, we have to make sure that
    they share a tag map since all tags for that PMP must be unique.
    
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit 3070f69b66b7ab2f02d8a2500edae07039c38508
Author: Jens Axboe <jens.axboe@oracle.com>
Date:   Mon Oct 27 19:20:59 2008 +0100

    scsi: make sure that scsi_init_shared_tag_map() doesn't overwrite existing map
    
    Right now callers have to check whether scsi_host->bqt is already
    set up, it's much cleaner to just have scsi_init_shared_tag_map()
    does this check on its own.
    
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit 3afa39493de510c33c56ddc76e6e1af7f87c5392
Author: Yinghai Lu <yinghai@kernel.org>
Date:   Sat Oct 25 22:58:21 2008 -0700

    x86: keep the /proc/meminfo page count correct
    
    Impact: get correct page count in /proc/meminfo
    
    found page count in /proc/meminfo is nor correct on 1G system in VirtualBox 2.0.4
    
    # cat /proc/meminfo
    MemTotal:        1017508 kB
    MemFree:          822700 kB
    Buffers:            1456 kB
    Cached:            26632 kB
    SwapCached:            0 kB
    ...
    Hugepagesize:       2048 kB
    DirectMap4k:      4032 kB
    DirectMap2M:  18446744073709549568 kB
    
    with this patch get:
    ...
    DirectMap4k:      4032 kB
    DirectMap2M:   1044480 kB
    
    which is consistent to kernel_page_tables
    ---[ Low Kernel Mapping ]---
    0xffff880000000000-0xffff880000001000           4K     RW     PCD     GLB x  pte
    0xffff880000001000-0xffff88000009f000         632K     RW             GLB x  pte
    0xffff88000009f000-0xffff8800000a0000           4K     RW     PCD     GLB x  pte
    0xffff8800000a0000-0xffff880000200000        1408K     RW             GLB x  pte
    0xffff880000200000-0xffff88003fe00000        1020M     RW         PSE GLB x  pmd
    0xffff88003fe00000-0xffff88003fff0000        1984K     RW             GLB NX pte
    0xffff88003fff0000-0xffff880040000000          64K                           pte
    0xffff880040000000-0xffff888000000000         511G                           pud
    0xffff888000000000-0xffffc20000000000       58880G                           pgd
    
    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    Acked-by: Suresh Siddha <suresh.b.siddha@intel.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 4078e359c4688541a0093fde0dff35dc7190c4f5
Author: Jiri Kosina <jkosina@suse.cz>
Date:   Mon Oct 27 17:41:58 2008 +0100

    sched: fix documentation reference for sched_min_granularity_ns
    
    Impact: documentation fix
    
    sched-design-CFS.txt wrongly references sched_granularity_ns sysctl,
    as its name in fact is sched_min_granularity_ns.
    
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit b70a6b27ed4cbb9ea7a4e1abc080ed65692ecb9b
Merge: 1d63e72... 3a63913...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Oct 27 09:54:23 2008 -0700

    Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
    
    * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (33 commits)
      MIPS: lemote/lm2e: Added io_map_base to pci controller
      MIPS: TXx9: Make firmware parameter passing more robust
      MIPS: Markeins: Remove unnecessary define and cleanup comments, etc.
      MIPS: Markeins: Extract ll_emma2rh_* functions
      MIPS: Markeins: Remove runtime debug prints
      MIPS: EMMA: Fold arch/mips/emma/{common,markeins}/irq*.c into markeins/irq.c
      MIPS: EMMA2RH: Remove emma2rh_gpio_irq_base
      MIPS: EMMA2RH: Remove emma2rh_sw_irq_base
      MIPS: EMMA2RH: Remove emma2rh_irq_base global variable
      MIPS: EMMA2RH: Remove emma2rh_sync on read operation
      MIPS: EMMA: Move <asm/emma2rh> to <asm/emma> dir
      MIPS: EMMA: Move arch/mips/emma2rh/ into arch/mips/emma/
      MIPS: EMMA: Kconfig reorganization
      MIPS: Add CONFIG_CPU_R5500 for NEC VR5500 series processors
      MIPS: RB532: Disable the right device
      MIPS: Add support for NXP PNX833x (STB222/5) into linux kernel
      MIPS: TXx9: CONFIG_TOSHIBA_RBTX4939 spelling
      MIPS: Fix KGDB build error
      INPUT: sgi_btns: Add license specification
      MIPS: IP22: ip22-int.c header file weeding.
      ...

commit 1d63e726408dfdb3e10ed8f00c383b30ebb333d3
Merge: 31390d0... cd1f70fd...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Oct 27 09:37:16 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
      firewire: fw-sbp2: fix races
      firewire: fw-sbp2: delay first login to avoid retries
      firewire: fw-ohci: initialization failure path fixes
      firewire: fw-ohci: don't leak dma memory on module removal
      firewire: fix struct fw_node memory leak
      firewire: Survive more than 256 bus resets

commit 31390d0fde1ac9cf47002729660ffd7cd2ae1d75
Merge: 6634160... 0a9b863...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Oct 27 09:36:33 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ALSA: ASoC: Blackfin: update SPORT0 port selector (v2)
      ALSA: hda - Restore default pin configs for realtek codecs
      sound: use a common working email address
      pci: use pci_ioremap_bar() in sound/

commit 3a63913f607832a2629545467e715a40ec930c32
Author: Zhang Le <r0bertz@gentoo.org>
Date:   Mon Oct 27 23:33:24 2008 +0000

    MIPS: lemote/lm2e: Added io_map_base to pci controller
    
    Signed-off-by: Zhang Le <r0bertz@gentoo.org>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 97b0511ce125b0cb95d73b198c1bdbb3cebc4de2
Author: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Date:   Mon Oct 27 15:25:49 2008 +0100

    MIPS: TXx9: Make firmware parameter passing more robust
    
    When booting Linux on a txx9 board with VxWorks boot loader, it crashes in
    prom_getenv(), as VxWorks doesn't pass firmware parameters in a0-a3 (in my
    case, the actual leftover values in these registers were 0x80002000,
    0x80001fe0, 0x2000, and 0x20).
    
    Make the parsing of argc, argv, and envp a bit more robust by checking if
    argc is a number below CKSEG0, and argv/envp point to CKSEG0.
    
    Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
    Acked-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit d1a8e2a6da5bea09452495748891a4ea9e42035e
Author: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
Date:   Fri Oct 24 01:36:33 2008 +0900

    MIPS: Markeins: Remove unnecessary define and cleanup comments, etc.
    
    Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 49618d652b2fe9c63808c7a2cc7089aa594cf521
Author: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
Date:   Fri Oct 24 01:35:59 2008 +0900

    MIPS: Markeins: Extract ll_emma2rh_* functions
    
    These functions are completely ineffective.
    
    Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit a9c2aa17a8b8b7a813d31e66da5d31cfdd006f4b
Author: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
Date:   Fri Oct 24 01:33:10 2008 +0900

    MIPS: Markeins: Remove runtime debug prints
    
    Remove runtime db_* macros as we don't need them any more.  In general,
    such helpers are useful for initial porting, but once approved, they are
    not indispensable.
    
    Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 9ae9fd79af28d6488e97311a3b60379b59ff4c90
Author: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
Date:   Fri Oct 24 01:32:40 2008 +0900

    MIPS: EMMA: Fold arch/mips/emma/{common,markeins}/irq*.c into markeins/irq.c
    
    Current EMMA2RH irq code is mess.  Before cleaning it up, gather them
    in one place as a first step.
    
    Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit fcb3cfe7f087fb27c35be911791883fb725055b1
Author: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
Date:   Fri Oct 24 01:32:11 2008 +0900

    MIPS: EMMA2RH: Remove emma2rh_gpio_irq_base
    
    Let's use immediate value, instead.  This also saves memory footprint,
    and probably a little bit faster.
    
    Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 68ed1ca9120506b2a0f80e4542deea24f89081ab
Author: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
Date:   Fri Oct 24 01:31:43 2008 +0900

    MIPS: EMMA2RH: Remove emma2rh_sw_irq_base
    
    Let's use immediate value, instead.  This also saves memory footprint,
    and probably a little bit faster.
    
    Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 9b6c04bc9726edf2655dd69d2e40c0ae4f07e525
Author: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
Date:   Fri Oct 24 01:31:16 2008 +0900

    MIPS: EMMA2RH: Remove emma2rh_irq_base global variable
    
    Let's use immediate value, instead.  This also saves memory footprint,
    and probably a little bit faster.
    
    Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 27bd804582d9a45cad8304e703c9de65ddd67bc5
Author: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
Date:   Fri Oct 24 01:30:48 2008 +0900

    MIPS: EMMA2RH: Remove emma2rh_sync on read operation
    
    It's totally a waste of CPU cycles.
    
    Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit d91f2cbe698cf70b50099343dac1ec8061bfd045
Author: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
Date:   Fri Oct 24 01:30:20 2008 +0900

    MIPS: EMMA: Move <asm/emma2rh> to <asm/emma> dir
    
    We'll put all EMMA related headers there in the future.
    
    Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit f27655e34171b0ae9ea5a0aadae894e817f0f875
Author: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
Date:   Fri Oct 24 01:29:16 2008 +0900

    MIPS: EMMA: Move arch/mips/emma2rh/ into arch/mips/emma/
    
    git mv arch/mips/{emma2rh,emma} and fixups Makefiles.  We'll put all NEC
    EMMA series based machines there in the future.
    
    Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit cd741b604b94a4d5bebf2672626ffec7de44652c
Author: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
Date:   Fri Oct 24 06:00:01 2008 +0900

    MIPS: EMMA: Kconfig reorganization
    
    - Move EMMA related stuff into arch/mips/emma/Kconfig
    - Create CONFIG_SOC_EMMA* to handle more EMMA SoCs effectively
    - Rename CONFIG_MARKEINS into CONFIG_NEC_MARKEINS
    
    Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 542c1020ac1cbc2f50934086ad893384a2cbd233
Author: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
Date:   Fri Oct 24 01:27:57 2008 +0900

    MIPS: Add CONFIG_CPU_R5500 for NEC VR5500 series processors
    
    We already have sufficient infrastructure to support VR5500 and VR5500A
    series processors.  Here's a Makefile support to make it selectable by
    ports, and enable it for NEC EMMA2RH Markeins board.
    
    This patch also fixes a confused target help, and adds 1Gb PageMask bits
    supported by VR5500 and its variants.
    
    Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit bc4c4e832a203f66959e5eb2ecc56b0b9525173e
Author: Phil Sutter <n0-1@freewrt.org>
Date:   Mon Oct 27 02:29:57 2008 +0100

    MIPS: RB532: Disable the right device
    
    Signed-off-by: Florian Fainelli <florian@openwrt.org>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit edb6310aaa0dfc3da303a4ba6dff9dce3fbaa8d3
Author: Daniel Laird <daniel.j.laird@nxp.com>
Date:   Mon Jun 16 15:49:21 2008 +0100

    MIPS: Add support for NXP PNX833x (STB222/5) into linux kernel
    
    The following patch add support for the NXP PNX833x SOC.  More
    specifically it adds support for the STB222/5 variant. It fixes
    the vectored interrupt issue.
    
    Signed-off-by: daniel.j.laird <daniel.j.laird@nxp.com>
    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 537fa37c8606793b9998c35de0abfcb7d549a3f2
Author: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Date:   Thu Oct 23 16:43:13 2008 +0200

    MIPS: TXx9: CONFIG_TOSHIBA_RBTX4939 spelling
    
    Fix a typo in the comment for the TOSHIBA_RBTX4939 config option
    
    Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
    Acked-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit f6a3176a18b724154e7beede0e10da56e47abe2b
Author: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Date:   Sat Oct 25 17:30:35 2008 +0900

    MIPS: Fix KGDB build error
    
    In file included from include/linux/ptrace.h:49,
                     from arch/mips/kernel/kgdb.c:25:
    /home/yuasa/src/linux/test/mips/linux/arch/mips/include/asm/ptrace.h:123: error: expected declaration specifiers or '...' before '__s64'
    /home/yuasa/src/linux/test/mips/linux/arch/mips/include/asm/ptrace.h:124: error: expected declaration specifiers or '...' before '__s64'
    /home/yuasa/src/linux/test/mips/linux/arch/mips/include/asm/ptrace.h:126: error: expected declaration specifiers or '...' before '__u32'
    /home/yuasa/src/linux/test/mips/linux/arch/mips/include/asm/ptrace.h:127: error: expected declaration specifiers or '...' before '__u32'
    make[1]: *** [arch/mips/kernel/kgdb.o] Error 1
    
    Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 4c2bdcdc62e7a07bd0786fd2048e4ac97ae74e6e
Author: Dmitri Vorobiev <dmitri.vorobiev@movial.fi>
Date:   Sat Oct 25 01:46:57 2008 +0300

    INPUT: sgi_btns: Add license specification
    
    The SGI Volume Button interface driver uses GPL-only symbols
    platform_driver_unregister and platform_driver_register, but
    lacks license specification. Thus, when compiled as a module,
    this driver cannot be installed. This patch fixes this by
    adding the MODULE_LICENSE() specification.
    
    Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev@movial.fi>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 2f123e503dccde75550a0384982d5070d41b8a52
Author: Ralf Baechle <ralf@linux-mips.org>
Date:   Sat Oct 25 15:51:48 2008 +0100

    MIPS: IP22: ip22-int.c header file weeding.
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 14823ccbf8c3209a84a544e846feaf886cb59be9
Author: Dmitri Vorobiev <dmitri.vorobiev@movial.fi>
Date:   Sat Oct 25 01:46:56 2008 +0300

    MIPS: IP22: Small cleanups
    
    The following functions
    
    disable_local1_irq()
    disable_local2_irq()
    disable_local3_irq()
    
    are needlessly defined global, so make them static. While at it, fix a
    whitespace error in the same file.
    
    Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev@movial.fi>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 1ba5a1767416cfa4fa37096e160e764c56e1460a
Author: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Date:   Tue Oct 21 00:01:06 2008 +0900

    MIPS: RBTX4939: Add smc91x support
    
    Add smc91x platform device to RBTX4939 board and some hacks for big endian.
    
    Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit bc89b2bdefa5f56133d0b19a220880d4ada62560
Author: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Date:   Mon Oct 20 23:28:50 2008 +0900

    MIPS: TXx9: 7 segment LED support
    
    Add sysfs interface for 7 segment LED and implement access routine for
    RBTX4939.
    
    Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit f591eb1e6896e26675e91a319cc93f3800dbaad4
Author: Manuel Lauss <mano@roarinelk.homelinux.net>
Date:   Tue Oct 21 08:59:14 2008 +0200

    MIPS: Alchemy: Wire up SD controller on DB/PB1200 boards.
    
    Add au1xmmc platform data for PB1200/DB1200 boards and wire up the 2 SD
    controllers for them.
    
    Signed-off-by: Manuel Lauss <mano@roarinelk.homelinux.net>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit fa36b04386422951a7c73f9210403d1a2eaffe92
Author: Florian Fainelli <florian@openwrt.org>
Date:   Fri Oct 24 19:53:55 2008 +0200

    MIPS: RB532: Set gpio interrupt status and level for CompactFlash
    
    This patch sets the correct interrupt status and level
    in order to get the CompactFlash adapter working.
    
    Signed-off-by: Florian Fainelli <florian@openwrt.org>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 052ac71c4b85e5ce7e70d4f9b3555caa647d884a
Author: Adrian Bunk <bunk@kernel.org>
Date:   Sun Oct 12 16:01:35 2008 +0300

    MIPS: RB532: Fix build error
    
    mips/pci/fixup-rc32434.c must #include <asm/mach-rc32434/irq.h>
    
    This patch fixes the following compile error caused by
    commit 606a083b1e1a357cb66454e4581b80f1a67d8368
    (MIPS: RB532: Cleanup the headers again):
    
    <--  snip  -->
    
    ...
      CC      arch/mips/pci/fixup-rc32434.o
    arch/mips/pci/fixup-rc32434.c: In function 'pcibios_map_irq':
    arch/mips/pci/fixup-rc32434.c:46: error: 'GROUP4_IRQ_BASE' undeclared (first use in this function)
    arch/mips/pci/fixup-rc32434.c:46: error: (Each undeclared identifier is reported only once
    arch/mips/pci/fixup-rc32434.c:46: error: for each function it appears in.)
    make[2]: *** [arch/mips/pci/fixup-rc32434.o] Error 1
    
    <--  snip  -->
    
    A virtually identical patch was also submitted by Yoichi Yuasa
    <yoichi_yuasa@tripeaks.co.jp>.
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Acked-by: Florian Fainelli <florian@openwrt.org>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit c944013518cc3ba407057e9ee910d0258c0a47dd
Author: David Daney <ddaney@caviumnetworks.com>
Date:   Fri Oct 24 09:31:13 2008 -0700

    MIPS: Fix KGDB build error
    
    <asm/ptrace.h> is exported to userland so can't include <linux/ptrace.h>,
    so replace the C99 types with their basic C type equivalents.
    
    Bug originally reported and initial patch by Yoichi Yuasa
    <yoichi_yuasa@tripeaks.co.jp>.
    
    Signed-off-by: David Daney <ddaney@caviumnetworks.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit fb498e2570eedc6c9c3d165e370624dfc3aed97b
Author: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Date:   Sat Oct 25 01:17:23 2008 +0900

    MIPS: Set ENOSYS to errno on illegal system call number for syscall(2)
    
    Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit bda8229bdd087167f463ad5e74299987924f8137
Author: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Date:   Sat Oct 25 01:17:22 2008 +0900

    MIPS: Set positive error number to errno on illegal_syscall
    
    Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 7920c4d658ff2b0f7b8acf3bd7c700875c2bc163
Author: Ralf Baechle <ralf@linux-mips.org>
Date:   Sat Oct 18 13:23:10 2008 +0100

    MIPS: SMP: Don't reenable interrupts in stop_this_cpu; use WAIT instruction.
    
    Noticed by Anirban Sinha <ASinha@zeugmasystems.com>; patch by me.
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit f67ae98352284d7ac1e03f3a872e33c68ea35a5b
Author: David Daney <ddaney@caviumnetworks.com>
Date:   Fri Oct 17 17:48:53 2008 -0700

    MIPS: Don't unmap the memory for dma_sync*.
    
    We were getting away with this for so long only because the only platform
    with a non-empty plat_unmap_dma_mem() doesn't call dma_sync_sg_for_cpu()
    and dma_sync_sg_for_device() from its commonly used drivers.
    
    Signed-off-by: David Daney <ddaney@caviumnetworks.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit b517531ce53794f2a2eae1fff1d1216b9db4da9f
Author: Zhaolei <zhaolei@cn.fujitsu.com>
Date:   Fri Oct 17 19:12:35 2008 +0800

    MIPS: Fix debugfs_create_*'s error checking method for mips/kernel/
    
    debugfs_create_*() returns NULL on error.  Make its callers return -ENODEV
    on error.
    
    Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
    Acked-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit ecab1f4479abb88d739bc1aac5545e8399fbad66
Author: Zhaolei <zhaolei@cn.fujitsu.com>
Date:   Fri Oct 17 19:12:30 2008 +0800

    MIPS: Fix debugfs_create_*'s error checking method for arch/mips/math-emu/
    
    debugfs_create_*() returns NULL on error.  Make its caller debugfs_fpuemu
    return -ENODEV on error.
    
    Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 0a9b86381c76e9d33a9b6edb66aef32d7a3306e3
Merge: bfd4e66... c3e5203... e044c39... 2f1e593... 2f5ad54...
Author: Takashi Iwai <tiwai@suse.de>
Date:   Mon Oct 27 17:08:11 2008 +0100

    Merge branches 'topic/fix/asoc', 'topic/fix/hda', 'topic/fix/misc' and 'topic/pci-ioremap-bar' into for-linus

commit c3e5203bed1999df716e3c7119f6749523eb952f
Author: Cliff Cai <cliff.cai@analog.com>
Date:   Mon Oct 27 17:09:25 2008 +0800

    ALSA: ASoC: Blackfin: update SPORT0 port selector (v2)
    
    - Setting the TFS pin selector for SPORT 0 based on whether the selected
      port id F or G. If the port is F then no conflict should exist for the
      TFS. When Port G is selected and EMAC then there is a conflict between
      the PHY interrupt line and TFS.  Current settings prevent the conflict
      by ignoring the TFS pin when Port G is selected. This allows both
      ssm2602 using Port G and EMAC concurrently.
    
     - some code cleanup
    
    Signed-off-by: Cliff Cai <cliff.cai@analog.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>
    Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit e044c39ae258678d6ebb09fccb2a0fdf7ec51847
Author: Takashi Iwai <tiwai@suse.de>
Date:   Mon Oct 27 16:56:24 2008 +0100

    ALSA: hda - Restore default pin configs for realtek codecs
    
    Some machines have broken BIOS resume that doesn't restore the default
    pin configuration properly, which results in a wrong detection of HP
    pin.  This causes a silent speaker output due to missing HP detection.
    Related bug: Novell bug#406101
    	https://bugzilla.novell.com/show_bug.cgi?id=406101
    
    This patch fixes the issue by saving/restoring the default pin configs
    by the driver itself.
    
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 8115f3f0c939c5db0fe3c6c6c58911fd3a205b1e
Author: Steven Rostedt <rostedt@goodmis.org>
Date:   Fri Oct 24 09:12:17 2008 -0400

    ftrace: use a real variable for ftrace_nop in x86
    
    Impact: avoid section mismatch warning, clean up
    
    The dynamic ftrace determines which nop is safe to use at start up.
    When it finds a safe nop for patching, it sets a pointer called ftrace_nop
    to point to the code. All call sites are then patched to this nop.
    
    Later, when tracing is turned on, this ftrace_nop variable is again used
    to compare the location to make sure it is a nop before we update it to
    an mcount call. If this fails just once, a warning is printed and ftrace
    is disabled.
    
    Rakib Mullick noted that the code that sets up the nop is a .init section
    where as the nop itself is in the .text section. This is needed because
    the nop is used later on after boot up. The problem is that the test of the
    nop jumps back to the setup code and causes a "section mismatch" warning.
    
    Rakib first recommended to convert the nop to .init.text, but as stated
    above, this would fail since that text is used later.
    
    The real solution is to extend Rabik's patch, and to make the ftrace_nop
    into an array, and just save the code from the assembly to this array.
    
    Now the section can stay as an init section, and we have a nop to use
    later on.
    
    Reported-by: Rakib Mullick <rakib.mullick@gmail.com>
    Signed-off-by: Steven Rostedt <srostedt@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit ea31e72d753e5817a97de552f152d0cb55c7defc
Author: Frederic Weisbecker <fweisbec@gmail.com>
Date:   Wed Oct 22 19:26:23 2008 +0200

    tracing/ftrace: make boot tracer select the sched_switch tracer
    
    Impact: build fix
    
    If the boot tracer is selected but not the sched_switch,
    there will be a build failure:
    
     kernel/built-in.o: In function `boot_trace_init':
     trace_boot.c:(.text+0x5ee38): undefined reference to `sched_switch_trace'
     kernel/built-in.o: In function `disable_boot_trace':
     (.text+0x5eee1): undefined reference to `tracing_stop_cmdline_record'
     kernel/built-in.o: In function `enable_boot_trace':
     (.text+0x5ef11): undefined reference to `tracing_start_cmdline_record'
    
    This patch fixes it.
    
    Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit f66af459a931f25807e1df7915b2b66bb5978d82
Author: Frederic Weisbecker <fweisbec@gmail.com>
Date:   Wed Oct 22 19:14:55 2008 +0200

    tracepoint: check if the probe has been registered
    
    Impact: fix kernel crash that can trigger during tracing
    
    If we try to remove a probe that has not been already registered,
    the tracepoint_entry_remove_probe() function will dereference a NULL
    pointer.
    
    Check the probe before removing it to avoid crashes.
    
    Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
    Acked-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
    Acked-by: Steven Rostedt <srostedt@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 6634160abfdbac39bd5ebda516b15b078a0f598e
Merge: 526719b... 8b5f12d...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Oct 27 08:41:13 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      syncookies: fix inclusion of tcp options in syn-ack
      libertas: free sk_buff with kfree_skb
      btsdio: free sk_buff with kfree_skb
      Phonet: do not reply to indication reset packets
      Phonet: include generic link-layer header size in MAX_PHONET_HEADER

commit 526719ba51e7d7bd31f7af9ab04b015b70096685
Author: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date:   Mon Oct 27 15:19:48 2008 +0000

    Switch to a valid email address...
    
    Signed-off-by: Alan Cox <alan@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 77122d0b5d1fb2276b1fe7bce6366f22b2f96606
Author: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date:   Mon Oct 27 15:10:23 2008 +0000

    Tidy up addresses in random drivers
    
    Signed-off-by: Alan Cox <alan@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit b9b54aa2a60dcd9c06b76f6610e1b466bc93e3cd
Author: Eric Miao <eric.miao@marvell.com>
Date:   Mon Oct 27 17:48:50 2008 +0800

    leds: da903x: fix the building failure of incomplete type of 'work'
    
    The leds-da903x LED driver was missing the proper #include of
    linux/workqueue.h, but happened to compile on ARM due to implied
    includes through other header files.
    
    We do need the explict include on other architectures (reported at least
    for x86-64).
    
    Reported-tested-and-acked-by: Jean Delvare <khali@linux-fr.org>
    Signed-off-by: Eric Miao <eric.miao@marvell.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 2f1e593d4209d0194f9639c5d11aa91171435963
Author: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date:   Mon Oct 27 15:21:19 2008 +0000

    sound: use a common working email address
    
    Signed-off-by: Alan Cox <alan@redhat.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit ef020ab0109aa5cd6eac2e93519b7641c9862828
Author: Cliff Wickman <cpw@sgi.com>
Date:   Thu Oct 23 17:54:05 2008 -0500

    x86/uv: memory allocation at initialization
    
    Impact: on SGI UV platforms, fix boot crash
    
    UV initialization is currently called too late to call alloc_bootmem_pages().
    The current sequence is:
    
     start_kernel()
       mem_init()
         free_all_bootmem()           <--- discard of bootmem
       rest_init()
         kernel_init()
           smp_prepare_cpus()
           native_smp_prepare_cpus()
             uv_system_init()         <--- uses alloc_bootmem_pages()
    
    It should be calling kmalloc().
    
    Signed-off-by: Cliff Wickman <cpw@sgi.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 9f32d21c981bb638d0991ce5675a20337312066b
Author: Chris Lalancette <clalance@redhat.com>
Date:   Thu Oct 23 17:40:25 2008 -0700

    xen: fix Xen domU boot with batched mprotect
    
    Impact: fix guest kernel boot crash on certain configs
    
    Recent i686 2.6.27 kernels with a certain amount of memory (between
    736 and 855MB) have a problem booting under a hypervisor that supports
    batched mprotect (this includes the RHEL-5 Xen hypervisor as well as
    any 3.3 or later Xen hypervisor).
    
    The problem ends up being that xen_ptep_modify_prot_commit() is using
    virt_to_machine to calculate which pfn to update.  However, this only
    works for pages that are in the p2m list, and the pages coming from
    change_pte_range() in mm/mprotect.c are kmap_atomic pages.  Because of
    this, we can run into the situation where the lookup in the p2m table
    returns an INVALID_MFN, which we then try to pass to the hypervisor,
    which then (correctly) denies the request to a totally bogus pfn.
    
    The right thing to do is to use arbitrary_virt_to_machine, so that we
    can be sure we are modifying the right pfn.  This unfortunately
    introduces a performance penalty because of a full page-table-walk,
    but we can avoid that penalty for pages in the p2m list by checking if
    virt_addr_valid is true, and if so, just doing the lookup in the p2m
    table.
    
    The attached patch implements this, and allows my 2.6.27 i686 based
    guest with 768MB of memory to boot on a RHEL-5 hypervisor again.
    Thanks to Jeremy for the suggestions about how to fix this particular
    issue.
    
    Signed-off-by: Chris Lalancette <clalance@redhat.com>
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    Cc: Chris Lalancette <clalance@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 5209f08dc8e5f520ca81b87fa9a7142f58a109f4
Author: Jonas Bonn <jonas.bonn@gmail.com>
Date:   Sat Oct 25 11:49:20 2008 +0200

    asm-generic: define DIE_OOPS in asm-generic
    
    Impact: build fix
    
    DIE_OOPS is now used in the generic trace handling code so it needs to
    be defined for all architectures.  Define it in asm-generic so that it's
    available to all by default and doesn't cause build errors for
    architectures that rely on the generic implementation.
    
    Signed-off-by: Jonas Bonn <jonas.bonn@gmail.com>
    Acked-by: Steven Rostedt <srostedt@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit e2862c9470beb842d3f1c1965b03a2112114c160
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date:   Mon Oct 27 17:43:28 2008 +1100

    trace: fix printk warning for u64
    
    A powerpc ppc64_defconfig build produces these warnings:
    
    kernel/trace/ring_buffer.c: In function 'rb_add_time_stamp':
    kernel/trace/ring_buffer.c:969: warning: format '%llu' expects type 'long long unsigned int', but argument 2 has type 'u64'
    kernel/trace/ring_buffer.c:969: warning: format '%llu' expects type 'long long unsigned int', but argument 3 has type 'u64'
    kernel/trace/ring_buffer.c:969: warning: format '%llu' expects type 'long long unsigned int', but argument 4 has type 'u64'
    
    Just cast the u64s to unsigned long long like we do everywhere else.
    
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Acked-by: Steven Rostedt <srostedt@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 4944dd62de21230af039eda7cd218e9a09021d11
Merge: f17845e... 0173a32...
Author: Ingo Molnar <mingo@elte.hu>
Date:   Mon Oct 27 10:50:54 2008 +0100

    Merge commit 'v2.6.28-rc2' into tracing/urgent

commit 8b5f12d04b2e93842f3dda01f029842047bf3f81
Author: Florian Westphal <fw@strlen.de>
Date:   Sun Oct 26 23:10:12 2008 -0700

    syncookies: fix inclusion of tcp options in syn-ack
    
    David Miller noticed that commit
    33ad798c924b4a1afad3593f2796d465040aadd5 '(tcp: options clean up')
    did not move the req->cookie_ts check.
    This essentially disabled commit 4dfc2817025965a2fc78a18c50f540736a6b5c24
    '[Syncookies]: Add support for TCP options via timestamps.'.
    
    This restores the original logic.
    
    Signed-off-by: Florian Westphal <fw@strlen.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit b700a98c70401c2a48e509b91b47f58a883806bc
Author: Sergio Luis <sergio@larces.uece.br>
Date:   Sun Oct 26 23:09:27 2008 -0700

    libertas: free sk_buff with kfree_skb
    
    free sk_buff with kfree_skb, instead of kree
    
    Signed-off-by: Sergio Luis <sergio@larces.uece.br>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit cbfd24a75f98fe731547d3bc995f3a1f1fed6b20
Author: Sergio Luis <sergio@larces.uece.br>
Date:   Sun Oct 26 23:08:48 2008 -0700

    btsdio: free sk_buff with kfree_skb
    
    free sk_buff with kfree_skb, instead of kree
    
    Signed-off-by: Sergio Luis <sergio@larces.uece.br>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit c3a90c788b743303c4d824780a3a7271693fb64a
Author: Remi Denis-Courmont <remi.denis-courmont@nokia.com>
Date:   Sun Oct 26 23:07:25 2008 -0700

    Phonet: do not reply to indication reset packets
    
    This fixes a potential error packet loop.
    
    Signed-off-by: Remi Denis-Courmont <remi.denis-courmont@nokia.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit e214a8cc7a81f20ed7cb4f6373cf15048556bbac
Author: Remi Denis-Courmont <remi.denis-courmont@nokia.com>
Date:   Sun Oct 26 23:06:31 2008 -0700

    Phonet: include generic link-layer header size in MAX_PHONET_HEADER
    
    This fixes an OOPS in hard_header if a Phonet address is assigned to a
    non-Phonet network interface.
    
    Signed-off-by: Remi Denis-Courmont <remi.denis-courmont@nokia.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit f8d56f1771e4867acc461146764b4feeb5245669
Merge: 3d6eadc... 92850bb...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sun Oct 26 16:42:18 2008 -0700

    Merge branch 'for-linus' of git://neil.brown.name/md
    
    * 'for-linus' of git://neil.brown.name/md:
      md: allow extended partitions on md devices.
      md: use sysfs_notify_dirent to notify changes to md/dev-xxx/state
      md: use sysfs_notify_dirent to notify changes to md/array_state

commit 3d6eadcb5008beca1b289983ffd7771d1e947bac
Merge: a483ab1... 2a0bd75...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sun Oct 26 16:40:59 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
      Input: psmouse - add support for Elantech touchpads
      Input: i8042 - add Blue FB5601 to noloop exception table

commit a483ab1dddf86a0e8924e94cf838eed602602b39
Merge: eba966a... 9c36645...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sun Oct 26 16:37:37 2008 -0700

    Merge branch 'for-linus' of git://git.o-hand.com/linux-mfd
    
    * 'for-linus' of git://git.o-hand.com/linux-mfd:
      mfd: Make WM8400 depend on I2C until SPI is submitted
      mfd: add missing Kconfig entry for da903x

commit eba966a4e780199e31e8fd1d21bc9d187b1c9eaf
Merge: ecc96e7... ae5d82c...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sun Oct 26 16:35:41 2008 -0700

    Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb
    
    * 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb:
      uwb: build UWB before USB/WUSB

commit ecc96e79202ed7225f7a2e2b7cb5a9e09fc74aa6
Merge: a1a739c... cc6e0bb...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sun Oct 26 16:34:14 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
      HID: Add support for Sony Vaio VGX-TP1E
      HID: fix lock imbalance in hiddev
      HID: fix lock imbalance in hidraw
      HID: fix hidbus/appletouch device binding regression
      HID: add hid_type to general hid struct
      HID: quirk for OLED devices present in ASUS G50/G70/G71
      HID: Remove "default m" for Thrustmaster and Zeroplus
      HID: fix hidraw_exit section mismatch
      HID: add support for another Gyration remote control
      Revert "HID: Invert HWHEEL mappings for some Logitech mice"

commit a1a739c56ad031b8bf8b3804f568ac88899f8dd7
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date:   Sat Oct 25 17:24:36 2008 -0700

    docbooks: fix fatal filename errors
    
    Fix docbook fatal errors (file location changed):
    
    docproc: lin2628-rc1/include/asm-x86/io_32.h: No such file or directory
    make[1]: *** [Documentation/DocBook/deviceiobook.xml] Error 1
    
    docproc: lin2628-rc1/include/asm-x86/atomic_32.h: No such file or directory
    make[1]: *** [Documentation/DocBook/kernel-api.xml] Error 1
    
    docproc: lin2628-rc1/include/asm-x86/mca_dma.h: No such file or directory
    make[1]: *** [Documentation/DocBook/mcabook.xml] Error 1
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 890c78c2d681a8dc89c78eb9177990cad3a77dc3
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date:   Sat Oct 25 17:06:43 2008 -0700

    kernel-doc: allow more whitespace in macros
    
    Allow macros that are annotated with kernel-doc to contain whitespace
    between the '#' and "define".  It's valid and being used, so allow it.
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 7eea5b897eb6bbb79d7e6e398f4fbb61fcee57c7
Merge: 0173a32... 9fb3c5c...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sun Oct 26 16:29:12 2008 -0700

    Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
      leds-hp-disk: fix build warning
      ACPI: Oops in ACPI with git latest
      ACPI suspend: build fix for ACPI_SLEEP=n && XEN_SAVE_RESTORE=y.
      toshiba_acpi: always call input_sync() after input_report_switch()
      ACPI: Always report a sync event after a lid state change
      ACPI: cpufreq, processor: fix compile error in drivers/acpi/processor_perflib.c
      i7300_idle: Fix compile warning CONFIG_I7300_IDLE_IOAT_CHANNEL not defined
      i7300_idle: Cleanup based review comments
      i7300_idle: Disable ioat channel only on platforms where ile driver can load

commit cd1f70fdb4823c97328a1f151f328eb36fafd579
Author: Jay Fenlason <fenlason@redhat.com>
Date:   Fri Oct 24 15:26:20 2008 -0400

    firewire: fw-sbp2: fix races
    
    1: There is a small race between queue_delayed_work() and its
       corresponding kref_get().  Do the kref_get first, and _put it again
       if the queue_delayed_work() failed, so there is no chance of the
       kref going to zero while the work is scheduled.
    2: An SBP2_LOGOUT_REQUEST could be sent out with a login_id full of
       garbage.  Initialize it to an invalid value so we can tell if we
       ever got a valid login_id.
    3: The node ID and generation may have changed but the new values may
       not yet have been recorded in lu and tgt when the final logout is
       attempted.  Use the latest values from the device in
       sbp2_release_target().
    
    Signed-off-by: Jay Fenlason <fenlason@redhat.com>
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit 0dcfeb7e3c8695c5aa3677dda8efb9bef2e7e64d
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date:   Wed Oct 22 00:28:36 2008 +0200

    firewire: fw-sbp2: delay first login to avoid retries
    
    This optimizes firewire-sbp2's device probe for the case that the local
    node and the SBP-2 node were discovered at the same time.  In this case,
    fw-core's bus management work and fw-sbp2's login and SCSI probe work
    are scheduled in parallel (in the globally shared workqueue and in
    fw-sbp2's workqueue, respectively).  The bus reset from fw-core may then
    disturb and extremely delay the login and SCSI probe because the latter
    fails with several command timeouts and retries and has to be retried
    from scratch.
    
    We avoid this particular situation of sbp2_login() and fw_card_bm_work()
    running in parallel by delaying the first sbp2_login() a little bit.
    
    This is meant to be a short-term fix for
    https://bugzilla.redhat.com/show_bug.cgi?id=466679.  In the long run,
    the SCSI probe, i.e. fw-sbp2's call of __scsi_add_device(), should be
    parallelized with sbp2_reconnect().
    
    Problem reported and fix tested and confirmed by Alex Kanavin.
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit 7007a0765e33bf89182e069e35ec6009fa54f610
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date:   Sun Oct 26 09:50:31 2008 +0100

    firewire: fw-ohci: initialization failure path fixes
    
    Fix leaks when pci_probe fails.  Simplify error log strings.
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit a55709ba9d27053471f9fca8ee76b41ecefc14cd
Author: Jay Fenlason <fenlason@redhat.com>
Date:   Wed Oct 22 15:59:42 2008 -0400

    firewire: fw-ohci: don't leak dma memory on module removal
    
    The transmit and receive context dma memory was not being freed on
    module removal.  Neither was the config rom memory.  Fix that.
    
    The ab->next assignment is pure paranoia.
    
    Signed-off-by: Jay Fenlason <fenlason@redhat.com>
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit 77e557191701afa55ae7320d42ad6458a2ad292e
Author: Jay Fenlason <fenlason@redhat.com>
Date:   Thu Oct 16 18:00:15 2008 -0400

    firewire: fix struct fw_node memory leak
    
    With the bus_resets patch applied, it is easy to see this memory leak
    by repeatedly resetting the firewire bus while running slabtop in
    another window.  Just watch kmalloc-32 grow and grow...
    
    Signed-off-by: Jay Fenlason <fenlason@redhat.com>
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit 4f9740d4f5a17fa6a1b097fa3ccdfb7246660307
Author: Jay Fenlason <fenlason@redhat.com>
Date:   Thu Oct 16 15:51:59 2008 -0400

    firewire: Survive more than 256 bus resets
    
    The "color" is used during the topology building after a bus reset,
    hovever in "struct fw_node"s it is stored in a u8, but in struct fw_card
    it is stored in an int.  When the value wraps in one struct, but not
    the other, disaster strikes.
    
    Signed-off-by: Jay Fenlason <fenlason@redhat.com>
    
    Fixes http://bugzilla.kernel.org/show_bug.cgi?id=10922.
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit 9fb3c5ca3dabe06758c35f790c68e273ed749e19
Merge: 438f8de... f371be6...
Author: Len Brown <len.brown@intel.com>
Date:   Sat Oct 25 04:07:44 2008 -0400

    Merge branch 'i7300_idle' into release

commit 438f8de46bc261b35d84771ae9992cfff3ff4dd8
Author: Len Brown <len.brown@intel.com>
Date:   Sat Oct 25 03:52:16 2008 -0400

    leds-hp-disk: fix build warning
    
    drivers/leds/leds-hp-disk.c:59: warning: passing argument 4 of ‘acpi_evaluate_integer’ from incompatible pointer type
    
    Signed-off-by: Len Brown <len.brown@intel.com>

commit f8123381bae8d581d81f24b55719db3d9a6a262c
Author: Rafael J. Wysocki <rjw@sisk.pl>
Date:   Fri Oct 24 21:50:31 2008 +0200

    ACPI: Oops in ACPI with git latest
    
    ACPI Warning (nseval-0168): Insufficient arguments - method [_OSC] needs 5, found 4 [20080926]
    ACPI Warning (nspredef-0252): \_SB_.PCI0._OSC: Parameter count mismatch - ASL declared 5, expected 4 [20080926]
    ACPI Error (nspredef-0163): \_SB_.PCI0._OSC: Missing expected return value [20080926]
    BUG: unable to handle kernel NULL pointer dereference at 00000000
    IP: [<c0237671>] acpi_run_osc+0xa1/0x170
    
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Tested-by: James Bottomley <James.Bottomley@HansenPartnership.com>
    Signed-off-by: Len Brown <len.brown@intel.com>

commit 92daa7b53b76984565dfdfda5d9c679884121fb2
Author: Rafael J. Wysocki <rjw@sisk.pl>
Date:   Thu Oct 23 21:46:43 2008 +0200

    ACPI suspend: build fix for ACPI_SLEEP=n && XEN_SAVE_RESTORE=y.
    
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Signed-off-by: Len Brown <len.brown@intel.com>

commit cab08969188e2da09923fe9c4a99ec9b934b0708
Author: Len Brown <len.brown@intel.com>
Date:   Fri Oct 24 15:39:47 2008 -0400

    toshiba_acpi: always call input_sync() after input_report_switch()
    
    Signed-off-by: Len Brown <len.brown@intel.com>

commit df316e939100e789b3c5d4d102619ccf5834bd00
Author: Guillem Jover <guillem.jover@nokia.com>
Date:   Fri Oct 24 00:28:33 2008 +0300

    ACPI: Always report a sync event after a lid state change
    
    Currently not always an EV_SYN event is reported to userland
    after the EV_SW SW_LID event has been sent. This is easy to verify
    by using “input-events” from input-utils and just closing and opening
    the lid.
    
    Signed-off-by: Guillem Jover <guillem.jover@nokia.com>
    Signed-off-by: Len Brown <len.brown@intel.com>

commit 16be87ea170ae6cfaa9f47f79d14f7577d8cb420
Author: Miao Xie <miaox@cn.fujitsu.com>
Date:   Fri Oct 24 17:22:04 2008 +0800

    ACPI: cpufreq, processor: fix compile error in drivers/acpi/processor_perflib.c
    
    When trying to build 2.6.28-rc1 on ia64, make aborts with:
    
      CC      drivers/acpi/processor_perflib.o
      drivers/acpi/processor_perflib.c:41:28: error: asm/cpufeature.h: No such file or directory
      drivers/acpi/processor_perflib.c: In function ‘acpi_processor_get_performance_info’:
      drivers/acpi/processor_perflib.c:364: error: implicit declaration of function ‘boot_cpu_has’
      drivers/acpi/processor_perflib.c:364: error: ‘X86_FEATURE_EST’ undeclared (first use in this function)
      drivers/acpi/processor_perflib.c:364: error: (Each undeclared identifier is reported only once
      drivers/acpi/processor_perflib.c:364: error: for each function it appears in.)
      make[2]: *** [drivers/acpi/processor_perflib.o] Error 1
      make[1]: *** [drivers/acpi] Error 2
      make: *** [drivers] Error 2
    
    this patch fix it.
    
    Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
    Acked-by: Thomas Renninger <trenn@suse.de>
    Signed-off-by: Len Brown <len.brown@intel.com>

commit f371be6352cdde3df2253b76acb979480e93ce4f
Author: Venki Pallipadi <venkatesh.pallipadi@intel.com>
Date:   Thu Oct 23 15:39:06 2008 -0700

    i7300_idle: Fix compile warning CONFIG_I7300_IDLE_IOAT_CHANNEL not defined
    
    When I7300_idle driver is not configured, there is a compile time
    warning about IDLE_IOAT_CHANNEL not defined. Fix it.
    
    Reported-by: Suresh Siddha <suresh.b.siddha@intel.com>
    Reported-by: Arjan van de Ven <arjan@linux.intel.com>
    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>

commit 33093e186c8f80b443fafb1d347a140bdd2b86c6
Author: Venki Pallipadi <venkatesh.pallipadi@intel.com>
Date:   Wed Oct 22 16:51:03 2008 -0700

    i7300_idle: Cleanup based review comments
    
    Cleanup of i7300 idle driver based on review comments from Randy Dunlap,
    Andi Kleen and Len Brown.
    
    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>

commit 3ad0b02e4c1d5feba44b8ff48dccd1ba61a826b0
Author: Venki Pallipadi <venkatesh.pallipadi@intel.com>
Date:   Wed Oct 22 16:34:52 2008 -0700

    i7300_idle: Disable ioat channel only on platforms where ile driver can load
    
    Based on input from Andi Kleen:
    share the platform detection code with ioat_dma and disable the channel in
    dma engine only for specific platforms.
    
    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>

commit 9c366452e0b2df06f3ce0aabc6a53c94c595cd00
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date:   Fri Oct 24 17:16:11 2008 +0200

    mfd: Make WM8400 depend on I2C until SPI is submitted
    
    Otherwise we could build in WM8400 but not I2C.
    
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Samuel Ortiz <sameo@openedhand.com>

commit 8e2eaabfd9f7d375a1bb202e644ce2dcc0659592
Author: Samuel Ortiz <sameo@openedhand.com>
Date:   Fri Oct 24 17:10:05 2008 +0200

    mfd: add missing Kconfig entry for da903x
    
    This one was accidentally left out during the rc1 mfd merge.
    
    Signed-off-by: Samuel Ortiz <sameo@openedhand.com>

commit ae5d82cb8d600989338bbda5ea38f5c0ff47175a
Author: David Vrabel <david.vrabel@csr.com>
Date:   Fri Oct 24 16:46:22 2008 +0100

    uwb: build UWB before USB/WUSB
    
    The WHCI-HCD driver in drivers/usb/host/ depends on the umc driver in
    drivers/uwb/.
    
    Signed-off-by: David Vrabel <david.vrabel@csr.com>

commit f17845e5d97ead8fbdadfd40039e058ec7cf4a42
Author: Ingo Molnar <mingo@elte.hu>
Date:   Fri Oct 24 12:47:10 2008 +0200

    ftrace: warning in kernel/trace/ftrace.c
    
    this warning:
    
      kernel/trace/ftrace.c:189: warning: ‘frozen_record_count’ defined but not used
    
    triggers because frozen_record_count is only used in the KCONFIG_MARKERS
    case. Move the variable it there.
    
    Alas, this frozen-record facility seems to have little use. The
    frozen_record_count variable is not used by anything, nor the flags.
    
    So this section might need a bit of dead-code-removal care as well.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 3f3a490480d8ab96e0fe30a41f80f14e6a0c579d
Author: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date:   Fri Oct 24 11:06:16 2008 +0200

    sched: virtual time buddy preemption
    
    Since we moved wakeup preemption back to virtual time, it makes sense to move
    the buddy stuff back as well. The purpose of the buddy scheduling is to allow
    a quickly scheduling pair of tasks to run away from the group as far as a
    regular busy task would be allowed under wakeup preemption.
    
    This has the advantage that the pair can ping-pong for a while, enjoying
    cache-hotness. Without buddy scheduling other tasks would interleave destroying
    the cache.
    
    Also, it saves a word in cfs_rq.
    
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Acked-by: Mike Galbraith <efault@gmx.de>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 464b75273f64be7c81fee975bd6ca9593df3427b
Author: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date:   Fri Oct 24 11:06:15 2008 +0200

    sched: re-instate vruntime based wakeup preemption
    
    The advantage is that vruntime based wakeup preemption has a better
    conceptual model. Here wakeup_gran = 0 means: preempt when 'fair'.
    Therefore wakeup_gran is the granularity of unfairness we allow in order
    to make progress.
    
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Acked-by: Mike Galbraith <efault@gmx.de>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 0d13033bc9257fe65c1aa25e84568b1608da0901
Author: Mike Galbraith <efault@gmx.de>
Date:   Fri Oct 24 11:06:14 2008 +0200

    sched: weaken sync hint
    
    Mysql+oltp and pgsql+oltp peaks are still shifted right. The below puts
    the peaks back to 1 client/server pair per core.
    
    Use the avg_overlap information to weaken the sync hint.
    
    Signed-off-by: Mike Galbraith <efault@gmx.de>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 1af5f730fc1bf7c62ec9fb2d307206e18bf40a69
Author: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date:   Fri Oct 24 11:06:13 2008 +0200

    sched: more accurate min_vruntime accounting
    
    Mike noticed the current min_vruntime tracking can go wrong and skip the
    current task. If the only remaining task in the tree is a nice 19 task
    with huge vruntime, new tasks will be inserted too far to the right too,
    causing some interactibity issues.
    
    min_vruntime can only change due to the leftmost entry disappearing
    (dequeue_entity()), or by the leftmost entry being incremented past the
    next entry, which elects a new leftmost (__update_curr())
    
    Due to the current entry not being part of the actual tree, we have to
    compare the leftmost tree entry with the current entry, and take the
    leftmost of these two.
    
    So create a update_min_vruntime() function that takes computes the
    leftmost vruntime in the system (either tree of current) and increases
    the cfs_rq->min_vruntime if the computed value is larger than the
    previously found min_vruntime. And call this from the two sites we've
    identified that can change min_vruntime.
    
    Reported-by: Mike Galbraith <efault@gmx.de>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Acked-by: Mike Galbraith <efault@gmx.de>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 01c8c57d668d94f1036d9ab11a22aa24ca16a35d
Author: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date:   Fri Oct 24 11:06:12 2008 +0200

    sched: fix a find_busiest_group buglet
    
    In one of the group load balancer patches:
    
    	commit 408ed066b11cf9ee4536573b4269ee3613bd735e
    	Author: Peter Zijlstra <a.p.zijlstra@chello.nl>
    	Date:   Fri Jun 27 13:41:28 2008 +0200
    	Subject: sched: hierarchical load vs find_busiest_group
    
    The following change:
    
    -               if (max_load - this_load + SCHED_LOAD_SCALE_FUZZ >=
    +               if (max_load - this_load + 2*busiest_load_per_task >=
                                            busiest_load_per_task * imbn) {
    
    made the condition always true, because imbn is [1,2].
    Therefore, remove the 2*, and give the it a fair chance.
    
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Acked-by: Mike Galbraith <efault@gmx.de>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516
Merge: 4ce72a2... 57f8f7b...
Author: Ingo Molnar <mingo@elte.hu>
Date:   Fri Oct 24 12:48:46 2008 +0200

    Merge commit 'v2.6.28-rc1' into sched/urgent

commit 03967c5267b0e7312d1d55dc814d94cf190ca573
Author: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date:   Thu Oct 23 23:14:29 2008 +0900

    x86: restore the old swiotlb alloc_coherent behavior
    
    This restores the old swiotlb alloc_coherent behavior (before the
    alloc_coherent rewrite):
    
      http://lkml.org/lkml/2008/8/12/200
    
    The old alloc_coherent avoids GFP_DMA allocation first and if the
    allocated address is not fit for the device's coherent_dma_mask, then
    dma_alloc_coherent does GFP_DMA allocation. If it fails,
    alloc_coherent calls swiotlb_alloc_coherent (in short, we rarely used
    swiotlb_alloc_coherent).
    
    After the alloc_coherent rewrite, dma_alloc_coherent
    (include/asm-x86/dma-mapping.h) directly calls swiotlb_alloc_coherent.
    It means that we possibly can't handle a device having dma_masks >
    24bit < 32bits since swiotlb_alloc_coherent doesn't have the above
    GFP_DMA retry mechanism.
    
    This patch fixes x86's swiotlb alloc_coherent to use the GFP_DMA retry
    mechanism, which dma_generic_alloc_coherent() provides now
    (pci-nommu.c and GART IOMMU driver also use
    dma_generic_alloc_coherent).
    
    Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 75bebb7f0c2a709812cccb4d3151a21b012c5cad
Author: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date:   Thu Oct 23 20:46:55 2008 +0900

    x86: use GFP_DMA for 24bit coherent_dma_mask
    
    dma_alloc_coherent (include/asm-x86/dma-mapping.h) avoids GFP_DMA
    allocation first and if the allocated address is not fit for the
    device's coherent_dma_mask, then dma_alloc_coherent does GFP_DMA
    allocation. This is because dma_alloc_coherent avoids precious GFP_DMA
    zone if possible. This is also how the old dma_alloc_coherent
    (arch/x86/kernel/pci-dma.c) works.
    
    However, if the coherent_dma_mask of a device is 24bit, there is no
    point to go into the above GFP_DMA retry mechanism. We had better use
    GFP_DMA in the first place.
    
    Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    Tested-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit a2b89b596c5a0b288adac84b17bdda6bde8d144e
Author: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date:   Thu Oct 23 18:42:03 2008 +0900

    swiotlb: remove panic for alloc_coherent failure
    
    swiotlb_alloc_coherent calls panic() when allocated swiotlb pages is
    not fit for a device's dma mask. However, alloc_coherent failure is
    not a disaster at all. AFAIK, none of other x86 and IA64 IOMMU
    implementations don't crash in case of alloc_coherent failure.
    
    There are some drivers that don't check alloc_coherent failure but not
    many (about ten and I've already started to fix some of
    them). alloc_coherent returns NULL in case of failure so it's likely
    that these guilty drivers crash immediately. So swiotlb doesn't need
    to call panic() just for them.
    
    Reported-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    Tested-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit ff3c536291ce96ef6f45704cd37eaed71127dd42
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Tue Oct 14 17:50:44 2008 -0700

    xen: compilation fix of drivers/xen/events.c on IA64
    
    use set_xen_guest_handle() instead of direct assigning.
    
    > linux-2.6/drivers/xen/events.c: In function 'xen_poll_irq':
    > linux-2.6/drivers/xen/events.c:757: error: incompatible types in assignment
    > make[4]: *** [drivers/xen/events.o] Error 1
    
    Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    Cc: Isaku Yamahata <yamahata@valinux.co.jp>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 75909fd619d15400e7c6d0fc3af09838ee8b166e
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Tue Oct 14 17:50:41 2008 -0700

    xen: portability clean up and some minor clean up for xencomm.c
    
    clean up of xencomm.c. is_phys_contiguous() is arch dependent
    function that depends on how virtual memory are laid out.
    So split out the function into arch specific code.
    
    Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    Cc: Isaku Yamahata <yamahata@valinux.co.jp>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Cc: "Luck, Tony" <tony.luck@intel.com>

commit ed6e5e507e4752c3fb1090d0601f46e7a78c860e
Author: Jeremy Fitzhardinge <jeremy@goop.org>
Date:   Tue Oct 14 17:50:40 2008 -0700

    xen: don't reload cr3 on suspend
    
    It isn't necessary, and it makes the code needlessly non-portable.
    
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    Cc: Isaku Yamahata <yamahata@valinux.co.jp>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit bea92112415635ecb7e681355834413c7c048f67
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Wed Oct 22 19:31:11 2008 +0900

    kernel/resource: fix reserve_region_with_split() section mismatch
    
    Impact: cleanup, small kernel text size reduction, no functionality changed
    
    reserve_region_with_split() calls in to __reserve_region_with_split(),
    which is an __init function. The only caller of reserve_region_with_split()
    is an __init function, so make it __init too.
    
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit acff181d3574244e651913df77332e897b88bff4
Author: roel kluin <roel.kluin@gmail.com>
Date:   Tue Oct 21 19:49:09 2008 -0400

    printk: remove unused code from kernel/printk.c
    
    both log_buf_copy() and log_buf_len are unused.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 66b0de3569b00f61978782b9f97aa4803dbec0fb
Author: Ingo Molnar <mingo@elte.hu>
Date:   Thu Oct 23 16:11:03 2008 +0200

    ftrace: fix build failure
    
    fix:
    
     kernel/trace/ftrace.c: In function 'ftrace_release':
     kernel/trace/ftrace.c:271: error: implicit declaration of function 'ftrace_release_hash'
    
    release_hash is not needed without dftraced.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 15adc048986f6b54b6044f2b6fc4b48f49413e2f
Author: Steven Rostedt <rostedt@goodmis.org>
Date:   Thu Oct 23 09:33:08 2008 -0400

    ftrace, powerpc, sparc64, x86: remove notrace from arch ftrace file
    
    The entire file of ftrace.c in the arch code needs to be marked
    as notrace. It is much cleaner to do this from the Makefile with
    CFLAGS_REMOVE_ftrace.o.
    
    [ powerpc already had this in its Makefile. ]
    
    Signed-off-by: Steven Rostedt <srostedt@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 08f5ac906d2c0faf96d608c54a0b03177376da8d
Author: Steven Rostedt <rostedt@goodmis.org>
Date:   Thu Oct 23 09:33:07 2008 -0400

    ftrace: remove ftrace hash
    
    The ftrace hash was used by the ftrace_daemon code. The record ip function
    would place the calling address (ip) into the hash. The daemon would later
    read the hash and modify that code.
    
    The hash complicates the code. This patch removes it.
    
    Signed-off-by: Steven Rostedt <srostedt@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 4d296c24326783bff1282ac72f310d8bac8df413
Author: Steven Rostedt <rostedt@goodmis.org>
Date:   Thu Oct 23 09:33:06 2008 -0400

    ftrace: remove mcount set
    
    The arch dependent function ftrace_mcount_set was only used by the daemon
    start up code. This patch removes it.
    
    Signed-off-by: Steven Rostedt <srostedt@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit cb7be3b2fc2cf089ee52b16f0fd9ebb29e9944e1
Author: Steven Rostedt <rostedt@goodmis.org>
Date:   Thu Oct 23 09:33:05 2008 -0400

    ftrace: remove daemon
    
    The ftrace daemon is complex and error prone.  This patch strips it out
    of the code.
    
    Signed-off-by: Steven Rostedt <srostedt@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 07c4cc1cdaa08fcb6c0275dd7be49eae37260169
Author: Steven Rostedt <rostedt@goodmis.org>
Date:   Thu Oct 23 09:33:04 2008 -0400

    ftrace: disable dynamic ftrace for all archs that use daemon
    
    The ftrace daemon is complex and can cause nasty races if something goes
    wrong. Since it affects all of the kernel, this patch disables dynamic
    ftrace from any arch that depends on the daemon. Until the archs are
    ported over to the new MCOUNT_RECORD method, I am disabling dynamic
    ftrace from them.
    
    Note: I am leaving in the arch/<arch>/kernel/ftrace.c code alone since
    that can be used when the arch is ported to MCOUNT_RECORD. To port
    the arch to MCOUNT_RECORD, the scripts/recordmcount.pl needs to be
    updated. I will make that easier to do for 2.6.29. For 28, we will keep
    the archs disabled.
    
    Signed-off-by: Steven Rostedt <srostedt@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 6912896e994ddaf06cc0f6d3f2098bc4b59bdd84
Author: Steven Rostedt <rostedt@goodmis.org>
Date:   Thu Oct 23 09:33:03 2008 -0400

    ftrace: add ftrace warn on to disable ftrace
    
    Add ftrace warn on to disable ftrace as well as report a warning.
    
    [ Thanks to Andrew Morton for suggesting using the WARN_ON return value ]
    
    Signed-off-by: Steven Rostedt <srostedt@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 81adbdc029ecc416d56563e7f159100181dd711d
Author: Steven Rostedt <rostedt@goodmis.org>
Date:   Thu Oct 23 09:33:02 2008 -0400

    ftrace: only have ftrace_kill atomic
    
    When an anomaly is detected, we need a way to completely disable
    ftrace. Right now we have two functions: ftrace_kill and ftrace_kill_atomic.
    The ftrace_kill tries to do it in a "nice" way by converting everything
    back to a nop.
    
    The "nice" way is dangerous itself, so this patch removes it and only
    has the "atomic" version, which is all that is needed.
    
    Signed-off-by: Steven Rostedt <srostedt@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit ab9a0918cbf0fa8883301838df8dbc8fc085ff50
Author: Steven Rostedt <rostedt@goodmis.org>
Date:   Thu Oct 23 09:33:01 2008 -0400

    ftrace: use probe_kernel
    
    Andrew Morton suggested using the proper API for reading and writing
    kernel areas that might fault.
    
    Signed-off-by: Steven Rostedt <srostedt@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 76aefee57657428fb77cbd8624119c1a440bee44
Author: Steven Rostedt <rostedt@goodmis.org>
Date:   Thu Oct 23 09:33:00 2008 -0400

    ftrace: comment arch ftrace code
    
    Add comments to explain what is happening in the x86 arch ftrace code.
    
    Signed-off-by: Steven Rostedt <srostedt@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 593eb8a2d63e95772a5f22d746f18a997c5ee463
Author: Steven Rostedt <rostedt@goodmis.org>
Date:   Thu Oct 23 09:32:59 2008 -0400

    ftrace: return error on failed modified text.
    
    Have the ftrace_modify_code return error values:
    
      -EFAULT on error of reading the address
    
      -EINVAL if what is read does not match what it expected
    
      -EPERM  if the write fails to update after a successful match.
    
    Signed-off-by: Steven Rostedt <srostedt@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 34698bcbdf7b0629d6c873b5da7c63073fb45361
Author: Steven Rostedt <rostedt@goodmis.org>
Date:   Thu Oct 23 09:32:58 2008 -0400

    ftrace: dynamic ftrace process only text section
    
    The text section stays in memory without ever leaving. With the exception
    of modules, but modules know how to handle that case. With the dynamic
    ftrace tracer, we need to make sure that it does not try to modify code
    that no longer exists. The only safe section is .text.
    
    This patch changes the recordmcount script to only record the mcount calls
    in the .text sections.
    
    Signed-off-by: Steven Rostedt <srostedt@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit dce9d18adde74b8e36b9e4a8a49ddf066bad0b3b
Author: Steven Rostedt <rostedt@goodmis.org>
Date:   Thu Oct 23 09:32:57 2008 -0400

    ftrace: handle generic arch calls
    
    The recordmcount script requires that the actual arch is passed in.
    This works well when ARCH=i386 or ARCH=x86_64 but does not handle the
    case of ARCH=x86.
    
    This patch adds a parameter to the function to pass in the number of
    bits of the architecture. So that it can determine if x86 should be
    run for x86_64 or i386 archs.
    
    Signed-off-by: Steven Rostedt <srostedt@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit cc6e0bbb47f02fd36cd55b3189c0c79079096ab8
Author: Jiri Kosina <jkosina@suse.cz>
Date:   Thu Oct 23 12:58:38 2008 +0200

    HID: Add support for Sony Vaio VGX-TP1E
    
    The Sony Vaio VGX-TP1E multimedia PC has a wireless keyboard with
    a touchpad.
    
    The mouse pointer is wrongly declared as constant non-data variable, which make
    HID code to completely ignore all the "Pointer" usages.
    Fix the report descriptor before it enters the parser to contain touchpad
    pointer description that is correctly parsable (declaring data rather than
    constant).
    
    Reported-by: Stefan Hundhammer <sh@suse.de>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit eb9910894d7857c273e049b297fd6251e5ecc43e
Author: Jiri Slaby <jirislaby@gmail.com>
Date:   Thu Oct 23 01:47:34 2008 +0200

    HID: fix lock imbalance in hiddev
    
    Don't forget to unlock_kernel() in hiddev_ioctl_usage().
    Added in 7961df16819085b8a357720d89d0239036e6af2a
    (HID: Switch hiddev to unlocked_ioctl).
    
    Corresponing sparse warning:
    drivers/hid/usbhid/hiddev.c:515:10: warning: context imbalance in 'hiddev_ioctl_usage': wrong count at exit
    drivers/hid/usbhid/hiddev.c:515:10:    context 'kernel_lock': wanted 0, got 1
    
    Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit 0f2c5945a917e776ccd394f0e1924e9502c2795f
Author: Jiri Slaby <jirislaby@gmail.com>
Date:   Thu Oct 23 01:47:30 2008 +0200

    HID: fix lock imbalance in hidraw
    
    Add omitted unlock_kernel() to hidraw_ioctl().
    Added in 979c407e3b89b606e810fa494ef316896eadbfad
    (HID: Push down BKL into ioctl handler in hidraw).
    
    Corresponing sparse warning:
    drivers/hid/hidraw.c:267:9: warning: context imbalance in 'hidraw_ioctl': wrong count at exit
    drivers/hid/hidraw.c:267:9:    context 'kernel_lock': wanted 0, got 1
    
    Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit 6ae2a0765ab764da11cc305058ee5333810228f4
Author: Steven Rostedt <rostedt@goodmis.org>
Date:   Mon Oct 13 10:22:06 2008 -0400

    ring-buffer: fix free page
    
    The pages of a buffer was originally pointing to the page struct, it
    now points to the page address. The freeing of the page still uses
    the page frame free "__free_page" instead of the correct free_page to
    the address.
    
    Signed-off-by: Steven Rostedt <srostedt@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 06d1cd267ca0a2a76beb9a762465572dd3d0cce6
Author: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Date:   Tue Oct 14 14:19:15 2008 +0100

    tracing/fastboot: fix row order in bootgraph.pl
    
    When bootgraph.pl parses a file, it gives one row for each initcall's
    pid.  But they are displayed in random (perl hash) order.  Let's
    sort the pids by the start time of their first initcall instead.
    
    This helps trace module initcalls, where each has a separate pid.
    bootgraph.pl will show module initcalls during the initramfs; it may
    also be adapted to show subsequent module initcalls.
    
    Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
    Acked-by: Frédéric Weisbecker <fweisbec@gmail.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 2a813f8cd8ce91d588a595c5709502dece3af289
Author: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Date:   Tue Oct 14 14:18:07 2008 +0100

    tracing/fastboot: fix bootgraph.pl to run with "use strict"
    
    As a perl novice, I would prefer to have the benefit of the interpreters'
    wisdom.  It turns out there were already some warnings, so let's fix them.
    
    Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
    Acked-by: Frédéric Weisbecker <fweisbec@gmail.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit b4d8e4736c94e78fd846dca0c95a3a0710582584
Author: Jiri Slaby <jirislaby@gmail.com>
Date:   Wed Oct 22 14:47:18 2008 +0200

    HID: fix hidbus/appletouch device binding regression
    
    The appletouch mouse devices are grabbed by the hid bus and not
    released even if apple driver says ENODEV (as expected) -- these
    are composite USB devices, for which we only ignore the mouse
    interface. This is currently not handled by hidbus code properly.
    
    Move the ignoring one level upper to forbid the hid layer to grab the
    device.
    
    Reported-by: Justin Mattock <justinmattock@gmail.com>
    Reported-by: Steven Noonan <steven@uplinklabs.net>
    Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit a73a63701f8f23e70674b3c5e367a0a726c18468
Author: Jiri Slaby <jirislaby@gmail.com>
Date:   Wed Oct 22 14:45:11 2008 +0200

    HID: add hid_type to general hid struct
    
    Add type to the hid structure to distinguish to which device type
    (now only mouse) we are talking to. Needed for per device type ignore
    list support.
    
    Note: this patch leaves the type as unknown for bluetooth devices,
    there is not support for this in the hidp code.
    
    Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit 4ce72a2c063a7fa8e42a9435440ae3364115a58d
Author: Li Zefan <lizf@cn.fujitsu.com>
Date:   Wed Oct 22 15:25:26 2008 +0800

    sched: add CONFIG_SMP consistency
    
    a patch from Henrik Austad did this:
    
    >> Do not declare select_task_rq as part of sched_class when CONFIG_SMP is
    >> not set.
    
    Peter observed:
    
    > While a proper cleanup, could you do it by re-arranging the methods so
    > as to not create an additional ifdef?
    
    Do not declare select_task_rq and some other methods as part of sched_class
    when CONFIG_SMP is not set.
    
    Also gather those methods to avoid CONFIG_SMP mess.
    
    Idea-by: Henrik Austad <henrik.austad@gmail.com>
    Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
    Acked-by: Peter Zijlstra <peterz@infradead.org>
    Acked-by: Henrik Austad <henrik@austad.us>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 17d80fd07d35ae1d231b3378ee4f00ace54f9d31
Author: Peter Zijlstra <peterz@infradead.org>
Date:   Tue Oct 21 16:31:18 2008 +0200

    tracing: create tracers menu
    
    We seem to have plenty tracers, lets create a menu and not clutter
    the already cluttered debug menu more.
    
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Acked-by: Frédéric Weisbecker <fweisbec@gmail.com>
    Acked-by: Steven Rostedt <rostedt@goodmis.org>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit debfcaf93ed500a051489db6646d71f29fe86a68
Merge: 2515ddc... 81520a1...
Author: Ingo Molnar <mingo@elte.hu>
Date:   Wed Oct 22 09:08:14 2008 +0200

    Merge branch 'tracing/ftrace' into tracing/urgent

commit 3786fc710c32b61464c322e5cd0c3d1d34ae72d0
Author: roel kluin <roel.kluin@gmail.com>
Date:   Tue Oct 21 19:49:09 2008 -0400

    irq: make variable static
    
    This variable is only used in the source file, so make it static.
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 2f5ad54ea6e2e38156bfb889964deee991f3087a
Author: Arjan van de Ven <arjan@linux.intel.com>
Date:   Sun Sep 28 16:20:09 2008 -0700

    pci: use pci_ioremap_bar() in sound/
    
    Use the newly introduced pci_ioremap_bar() function in sound/.
    pci_ioremap_bar() just takes a pci device and a bar number, with the goal
    of making it really hard to get wrong, while also having a central place
    to stick sanity checks.
    
    Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 92850bbd71228730c80efd491e7427650188d359
Author: NeilBrown <neilb@suse.de>
Date:   Tue Oct 21 13:25:32 2008 +1100

    md: allow extended partitions on md devices.
    
    The new extended partition support provides a much nicer was
    to have partitions on md devices that the 'mdp' alternate major.
    We cannot really get rid of 'mdp' at this time, but we can
    enable extended partitions as that will probably make life
    easier for sysadmins.
    
    Signed-off-by: NeilBrown <neilb@suse.de>

commit 3c0ee63a64a20351ed6c16ec797e1f8c850741ea
Author: NeilBrown <neilb@suse.de>
Date:   Tue Oct 21 13:25:28 2008 +1100

    md: use sysfs_notify_dirent to notify changes to md/dev-xxx/state
    
    The 'state' file for a device reports, for example, when the device
    has failed.  Changes should be reported to userspace ASAP without
    the possibility of blocking on low-memory.  sysfs_notify does
    have that possibility (as it takes a mutex which can be held
    across a kmalloc) so use sysfs_notify_dirent instead.
    
    Signed-off-by: NeilBrown <neilb@suse.de>

commit b62b75905d571c29262a6c38cf9e5f089c203871
Author: NeilBrown <neilb@suse.de>
Date:   Tue Oct 21 13:25:21 2008 +1100

    md: use sysfs_notify_dirent to notify changes to md/array_state
    
    Now that we have sysfs_notify_dirent, use it to notify changes
    to md/array_state.
    As sysfs_notify_dirent can be called in atomic context, we can
    remove the delayed notify and the MD_NOTIFY_ARRAY_STATE flag.
    
    Signed-off-by: NeilBrown <neilb@suse.de>

commit 81520a1b0649d0701205b818714a8c1e1cfbbb5b
Author: Steven Rostedt <rostedt@goodmis.org>
Date:   Mon Oct 6 21:24:18 2008 -0400

    ftrace: stack tracer only record when on stack
    
    The stack trace API does not record if the stack is not on the current
    task's stack. That is, if the stack is the interrupt stack or NMI stack,
    the output does not show. Also, the size of those stacks are not
    consistent with the size of the thread stack, this makes the calculation
    of the stack size usually bogus.
    
    This all confuses the stack tracer. I unfortunately do not have time to
    fix all these problems, but this patch does record the worst stack when
    the stack pointer is on the tasks stack (instead of bogus numbers).
    
    The patch simply returns if the stack pointer is not on the task's stack.
    
    Signed-off-by: Steven Rostedt <srostedt@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 3ce83aea86bf46fd1bff59d2e6d16f48fdce22fc
Author: Steven Rostedt <rostedt@goodmis.org>
Date:   Mon Oct 6 19:06:13 2008 -0400

    ftrace: rename the ftrace tracer to function
    
    To avoid further confusion between the ftrace infrastructure and the
    function tracer. This patch renames the "ftrace" function tracer
    to "function".
    
    Now in available_tracers, instead of "ftrace" there will be "function".
    
    This makes more sense, since people will not know exactly what the
    "ftrace" tracer does.
    
    Signed-off-by: Steven Rostedt <srostedt@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 606576ce816603d9fe1fb453a88bc6eea16ca709
Author: Steven Rostedt <rostedt@goodmis.org>
Date:   Mon Oct 6 19:06:12 2008 -0400

    ftrace: rename FTRACE to FUNCTION_TRACER
    
    Due to confusion between the ftrace infrastructure and the gcc profiling
    tracer "ftrace", this patch renames the config options from FTRACE to
    FUNCTION_TRACER.  The other two names that are offspring from FTRACE
    DYNAMIC_FTRACE and FTRACE_MCOUNT_RECORD will stay the same.
    
    This patch was generated mostly by script, and partially by hand.
    
    Signed-off-by: Steven Rostedt <srostedt@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit c2db8054c1eaf99983d8deee347876b01c26c2cf
Author: Steven Rostedt <rostedt@goodmis.org>
Date:   Mon Oct 6 19:06:11 2008 -0400

    ftrace: fix depends
    
    A lot of tracers have HAVE_FTRACE as a dependent config where it
    really should not. The HAVE_FTRACE is a misnomer (soon to be fixed)
    and describes if the architecture has the function tracer (mcount)
    implemented. The ftrace infrastructure is implemented in all archs.
    
    Signed-off-by: Steven Rostedt <srostedt@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit bd95b88d9e51fcbf392a7e90338a8fcc3499cbd6
Author: Steven Rostedt <rostedt@goodmis.org>
Date:   Thu Oct 16 09:31:27 2008 -0400

    ftrace: release functions from hash
    
    The x86 architecture uses a static recording of mcount caller locations
    and is not affected by this patch.
    
    For architectures still using the dynamic ftrace daemon, this patch is
    critical. It removes the race between the recording of a function that
    calls mcount, the unloading of a module, and the ftrace daemon updating
    the call sites.
    
    This patch adds the releasing of the hash functions that the daemon uses
    to update the mcount call sites. When a module is unloaded, not only
    are the replaced call site table update, but now so is the hash recorded
    functions that the ftrace daemon will use.
    
    Again, architectures that implement MCOUNT_RECORD are not affected by
    this (which currently only x86 has).
    
    Signed-off-by: Steven Rostedt <srostedt@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit c513867561eeb07d24a0bdda1a18a8f91921a301
Author: Steven Rostedt <rostedt@goodmis.org>
Date:   Tue Oct 14 18:08:48 2008 -0400

    ftrace: do not enclose logic in WARN_ON
    
    In ftrace, logic is defined in the WARN_ON_ONCE, which can become a
    nop with some configs. This patch fixes it.
    
    Signed-off-by: Steven Rostedt <srostedt@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit ac2d98998c32fcdc8d8919b7a4536a7945fd0422
Author: Jiri Kosina <jkosina@suse.cz>
Date:   Mon Oct 20 12:37:43 2008 +0200

    HID: quirk for OLED devices present in ASUS G50/G70/G71
    
    The new revision of OLED device (0x0b05/0x175b) found in ASUS G50/G70/G71
    should be ignored the same way we currently do for 0x1726, so that asus_oled
    driver can make use of the device.
    
    Reported-by: Costin Grigoras <costin.grigoras@cern.ch>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit 550cb3c3c1fa48171c6358b8641bd01119f5386f
Author: Andi Kleen <ak@linux.intel.com>
Date:   Sun Oct 19 20:34:31 2008 +0200

    HID: Remove "default m" for Thrustmaster and Zeroplus
    
    No reason at all to make these obscure drivers default m
    
    Signed-off-by: Andi Kleen <ak@linux.intel.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit 3e10e879a8c334a5927d800a3663a24d562cfa31
Merge: 98d9c66... 0cfd810...
Author: Ingo Molnar <mingo@elte.hu>
Date:   Sun Oct 19 19:04:47 2008 +0200

    Merge branch 'linus' into tracing-v28-for-linus-v3
    
    Conflicts:
    	init/main.c
    	kernel/module.c
    	scripts/bootgraph.pl

commit 140ae3eb6feb6ae96ba1ff073049beb985ea00e8
Author: Jiri Slaby <jirislaby@gmail.com>
Date:   Fri Oct 17 18:04:48 2008 +0200

    HID: fix hidraw_exit section mismatch
    
    hidraw_exit() marked as __exit is called from __init function
    from HID core. Remove the section placement from that function.
    
    Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit 1e093206734568e780c2717da1c89b97e9471954
Author: Jiri Kosina <jkosina@suse.cz>
Date:   Fri Oct 17 11:52:23 2008 +0200

    HID: add support for another Gyration remote control
    
    There is a slightly different Gyration remote control, which
    requires the quirks we already have in place for the 0x0002 PID,
    plus KEY_MEDIA mapping is different.
    
    Reported-by: Marc Randolph <mrand@pobox.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit 022b7024d4bb1f9a2f30021a2672a0f940ebfa7a
Author: Dan Nicholson <dbn.lists@gmail.com>
Date:   Fri Oct 17 11:29:46 2008 +0200

    Revert "HID: Invert HWHEEL mappings for some Logitech mice"
    
    This reverts commit 740f370dc61dc478d891d7d47660bb3ae39ddb4f.
    
    It turned out to be correct in the first place: a positive value should
    be sent when the wheel is moved to the right, and a negative value when
    moved to the left. This is the behavior expected by the Xorg evdev
    driver. I must have had a remapping somewhere else in my system when
    originally testing this. Testing on another system shows that the
    unpatched kernel is correct.
    
    Here is a bug report from Mandriva that brought the problem to my
    attention:
    
        https://qa.mandriva.com/show_bug.cgi?id=44309#c19
    
    Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit 2a0bd75e5e687a9c34921e942c18477ea7ec2d63
Author: Arjan Opmeer <arjan@opmeer.net>
Date:   Thu Oct 16 22:10:19 2008 -0400

    Input: psmouse - add support for Elantech touchpads
    
    This is version 5 of the driver. Relative mode support has been
    dropped (users wishing to use touchpad in relative mode can use
    standard PS/2 protocol emulation done in hardware). The driver
    supports both original version of Elantech protocol and the newer
    one used by touchpads installed in EeePC.
    
    Signed-off-by: Arjan Opmeer <arjan@opmeer.net>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

commit 2c6f2cb83b239b7d45da9246cafd27ee615ee35b
Author: Stefan Bader <stefan.bader@canonical.com>
Date:   Thu Oct 16 22:00:56 2008 -0400

    Input: i8042 - add Blue FB5601 to noloop exception table
    
    Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>