Permalink
Commits on Dec 19, 2009
  1. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/mattst88/alpha-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
      alpha: Convert BUG() to use unreachable()
      alpha: Add minimal support for software performance events
      alpha: Wire up missing/new syscalls
    torvalds committed Dec 19, 2009
  2. Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/k…

    …ernel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
      sata_mv: remove pointless NULL test
      pata_hpt3x2n: fix clock turnaround
      libata: fix reporting of drained bytes when clearing DRQ
      sata_mv: add power management support for the PCI controllers.
      sata_mv: store the board_idx into the host private data
      pata_octeon_cf: use resource_size(), to fix resource sizing bug
      libata: use the WRITE_SAME_16 define
      sata_mv: move the PCI bar description initialization code
      sata_mv: add power management support for the platform driver
      sata_mv: support clkdev framework
      sata_mv: increase PIO IORDY timeout
    
    Fixed crazy mode-change in merge.
    torvalds committed Dec 19, 2009
  3. Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    …inux/kernel/git/tip/linux-2.6-tip
    
    * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      perf session: Make events_stats u64 to avoid overflow on 32-bit arches
      hw-breakpoints: Fix hardware breakpoints -> perf events dependency
      perf events: Dont report side-band events on each cpu for per-task-per-cpu events
      perf events, x86/stacktrace: Fix performance/softlockup by providing a special frame pointer-only stack walker
      perf events, x86/stacktrace: Make stack walking optional
      perf events: Remove unused perf_counter.h header file
      perf probe: Check new event name
      kprobe-tracer: Check new event/group name
      perf probe: Check whether debugfs path is correct
      perf probe: Fix libdwarf include path for Debian
    torvalds committed Dec 19, 2009
  4. Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/li…

    …nux/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, irq: Allow 0xff for /proc/irq/[n]/smp_affinity on an 8-cpu system
      Makefile: Unexport LC_ALL instead of clearing it
      x86: Fix objdump version check in arch/x86/tools/chkobjdump.awk
      x86: Reenable TSC sync check at boot, even with NONSTOP_TSC
      x86: Don't use POSIX character classes in gen-insn-attr-x86.awk
      Makefile: set LC_CTYPE, LC_COLLATE, LC_NUMERIC to C
      x86: Increase MAX_EARLY_RES; insufficient on 32-bit NUMA
      x86: Fix checking of SRAT when node 0 ram is not from 0
      x86, cpuid: Add "volatile" to asm in native_cpuid()
      x86, msr: msrs_alloc/free for CONFIG_SMP=n
      x86, amd: Get multi-node CPU info from NodeId MSR instead of PCI config space
      x86: Add IA32_TSC_AUX MSR and use it
      x86, msr/cpuid: Register enough minors for the MSR and CPUID drivers
      initramfs: add missing decompressor error check
      bzip2: Add missing checks for malloc returning NULL
      bzip2/lzma/gzip: pre-boot malloc doesn't return NULL on failure
    torvalds committed Dec 19, 2009
  5. 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: (25 commits)
      sched: Fix broken assertion
      sched: Assert task state bits at build time
      sched: Update task_state_arraypwith new states
      sched: Add missing state chars to TASK_STATE_TO_CHAR_STR
      sched: Move TASK_STATE_TO_CHAR_STR near the TASK_state bits
      sched: Teach might_sleep() about preemptible RCU
      sched: Make warning less noisy
      sched: Simplify set_task_cpu()
      sched: Remove the cfs_rq dependency from set_task_cpu()
      sched: Add pre and post wakeup hooks
      sched: Move kthread_bind() back to kthread.c
      sched: Fix select_task_rq() vs hotplug issues
      sched: Fix sched_exec() balancing
      sched: Ensure set_task_cpu() is never called on blocked tasks
      sched: Use TASK_WAKING for fork wakups
      sched: Select_task_rq_fair() must honour SD_LOAD_BALANCE
      sched: Fix task_hot() test order
      sched: Fix set_cpu_active() in cpu_down()
      sched: Mark boot-cpu active before smp_init()
      sched: Fix cpu_clock() in NMIs, on !CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
      ...
    torvalds committed Dec 19, 2009
  6. Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    …inux/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:
      sys: Fix missing rcu protection for __task_cred() access
      signals: Fix more rcu assumptions
      signal: Fix racy access to __task_cred in kill_pid_info_as_uid()
    torvalds committed Dec 19, 2009
  7. Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm…

    …/linux/kernel/git/tip/linux-2.6-tip
    
    * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      timers: Remove duplicate setting of new_base in __mod_timer()
      clockevents: Prevent clockevent_devices list corruption on cpu hotplug
    torvalds committed Dec 19, 2009
  8. Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

    * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
      [S390] Use strim instead of strstrip to avoid false warnings.
      [S390] qdio: add counter for input queue full condition
      [S390] qdio: remove superfluous log entries and WARN_ONs.
      [S390] ptrace: dont abuse PT_PTRACED
      [S390] cio: fix channel path vary
      [S390] drivers: Correct size given to memset
      [S390] tape: Add pr_fmt() macro to all tape source files
      [S390] rename NT_PRXSTATUS to NT_S390_HIGHREGS
      [S390] tty: PTR_ERR return of wrong pointer in fs3270_open()
      [S390] s390: PTR_ERR return of wrong pointer in fallback_init_cip()
      [S390] dasd: PTR_ERR return of wrong pointer in
      [S390] dasd: move dasd-diag kmsg to dasd
      [S390] cio: fix drvdata usage for the console subchannel
      [S390] wire up sys_recvmmsg
    torvalds committed Dec 19, 2009
  9. fix more leaks in audit_tree.c tag_chunk()

    Several leaks in audit_tree didn't get caught by commit
    318b6d3, including the leak on normal
    exit in case of multiple rules refering to the same chunk.
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Al Viro committed with torvalds Dec 19, 2009
  10. fix braindamage in audit_tree.c untag_chunk()

    ... aka "Al had badly fscked up when writing that thing and nobody
    noticed until Eric had fixed leaks that used to mask the breakage".
    
    The function essentially creates a copy of old array sans one element
    and replaces the references to elements of original (they are on cyclic
    lists) with those to corresponding elements of new one.  After that the
    old one is fair game for freeing.
    
    First of all, there's a dumb braino: when we get to list_replace_init we
    use indices for wrong arrays - position in new one with the old array
    and vice versa.
    
    Another bug is more subtle - termination condition is wrong if the
    element to be excluded happens to be the last one.  We shouldn't go
    until we fill the new array, we should go until we'd finished the old
    one.  Otherwise the element we are trying to kill will remain on the
    cyclic lists...
    
    That crap used to be masked by several leaks, so it was not quite
    trivial to hit.  Eric had fixed some of those leaks a while ago and the
    shit had hit the fan...
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Al Viro committed with torvalds Dec 19, 2009
Commits on Dec 18, 2009
  1. watchdog: update geodewdt for new MFGPT API

    Update to the new cs5535_mfgpt* API.  The geode-specific wording should
    eventually be dropped from this driver...
    
    Signed-off-by: Andres Salomon <dilinger@collabora.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Andres Salomon committed with torvalds Dec 18, 2009
  2. [S390] Use strim instead of strstrip to avoid false warnings.

    Cc: Michael Holzheu <holzheu@linux.vnet.ibm.com>
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Heiko Carstens committed with Martin Schwidefsky Dec 18, 2009
  3. [S390] qdio: add counter for input queue full condition

    Add a counter to the qdio performance statistics that indicates that no
    free buffers were left in the input queue. If the counter gets increased
    it means that the qdio adapter filled all available buffers and possibly
    had more buffers ready but could not transmit them.
    
    Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Jan Glauber committed with Martin Schwidefsky Dec 18, 2009
  4. [S390] qdio: remove superfluous log entries and WARN_ONs.

    * Don't write debug feature log entries for sl, slsb and sbal since these
      elements can be located from the qdio_q pointer which is also logged.
    * Convert WARN_ON for wrong alignment of sbal to BUG_ON.
    * Remove WARN_ON's for wrong alignment of q / qib / slib since these
      alignments should be guaranteed by kmem_cache_alloc alignment /
      struct aligned attribute / __get_free_page.
    
    Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Jan Glauber committed with Martin Schwidefsky Dec 18, 2009
  5. [S390] ptrace: dont abuse PT_PTRACED

    Nobody except ptrace itself should use task->ptrace or PT_PTRACED
    directly, change arch/s390/kernel/traps.c to use the helper.
    
    Signed-off-by: Oleg Nesterov <oleg@redhat.com>
    Acked-by: Roland McGrath <roland@redhat.com>
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    utrace committed with Martin Schwidefsky Dec 18, 2009
  6. [S390] cio: fix channel path vary

    Channel path vary is currently broken: channel paths which are varied
    offline are still used by Linux. The reason for this is that:
    
     * the path mask indicating which paths of an I/O device can be used
       is reset by each internal I/O request
     * the logic that checks if a path group is already in its designated
       target state incorrectly interprets the result "is correctly set"
       as "is correctly set and available"
    
    Fix this by resetting the path mask only for internal I/O requests
    which affect the path mask and by correcting the pgid check logic.
    
    Signed-off-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    oberpar committed with Martin Schwidefsky Dec 18, 2009
  7. [S390] drivers: Correct size given to memset

    Memset should be given the size of the structure, not the size of the pointer.
    
    The semantic patch that makes this change is as follows:
    (http://coccinelle.lip6.fr/)
    
    // <smpl>
    @@
    type T;
    T *x;
    expression E;
    @@
    
    memset(x, E, sizeof(
    + *
     x))
    // </smpl>
    
    Signed-off-by: Julia Lawall <julia@diku.dk>
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    JuliaLawall committed with Martin Schwidefsky Dec 18, 2009
  8. [S390] tape: Add pr_fmt() macro to all tape source files

    Without defining the pr_fmt() macro, the "tape: " prefix will not be
    printed when using the pr_xxx printk macros. This patch adds the
    missing definitions.
    
    Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    michael-holzheu committed with Martin Schwidefsky Dec 18, 2009
  9. [S390] rename NT_PRXSTATUS to NT_S390_HIGHREGS

    The elf notes number for the upper register halves is s390 specific.
    Change the name of the elf notes to include S390.
    
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Martin Schwidefsky committed with Martin Schwidefsky Dec 18, 2009
  10. [S390] tty: PTR_ERR return of wrong pointer in fs3270_open()

    Return the PTR_ERR of the correct pointer.
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    RoelKluin committed with Martin Schwidefsky Dec 18, 2009
  11. [S390] s390: PTR_ERR return of wrong pointer in fallback_init_cip()

    Return the PTR_ERR of the correct pointer.
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    RoelKluin committed with Martin Schwidefsky Dec 18, 2009
  12. [S390] dasd: PTR_ERR return of wrong pointer in

    Return the PTR_ERR of the correct pointer.
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    RoelKluin committed with Martin Schwidefsky Dec 18, 2009
  13. [S390] dasd: move dasd-diag kmsg to dasd

    The DIAG discipline does not have a own driver name. It shows up as
    dasd-eckd or dasd-fba. So messages for dasd-diag are moved to the
    generic dasd part.
    
    Signed-off-by: Stefan Haberland <stefan.haberland@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Stefan Haberland committed with Martin Schwidefsky Dec 18, 2009
  14. [S390] cio: fix drvdata usage for the console subchannel

    Using dev_set_drvdata prior to device_register will force the driver core
    to kmalloc its private data. Since we use this for the console subchannel
    lets set the drvdata before taking the subchannels spinlock.
    
    Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    sebott committed with Martin Schwidefsky Dec 18, 2009
  15. [S390] wire up sys_recvmmsg

    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Heiko Carstens committed with Martin Schwidefsky Dec 18, 2009
  16. perf session: Make events_stats u64 to avoid overflow on 32-bit arches

    Pekka Enberg reported weird percentages in perf report. It
    turns out we are overflowing a 32-bit variables in struct
    events_stats on 32-bit architectures.
    
    Before:
    
     [acme@ana linux-2.6-tip]$ perf report -i pekka.perf.data 2> /dev/null | head -10
       281.96%       Xorg                        b710a561  [.] 0x000000b710a561
       140.15%       Xorg  [kernel]                        [k] __initramfs_end
        51.56%   metacity  libgobject-2.0.so.0.2000.1      [.] 0x00000000026e46
        35.12%  evolution  libcairo.so.2.10800.6           [.] 0x000000000203bd
        33.84%   metacity  libpthread-2.9.so               [.] 0x00000000007a3d
    
    After:
    
     [acme@ana linux-2.6-tip]$ perf report -i pekka.perf.data 2> /dev/null | head -10
        30.04%       Xorg                       b710a561   [.] 0x000000b710a561
        14.93%       Xorg  [kernel]                        [k] __initramfs_end
         5.49%   metacity  libgobject-2.0.so.0.2000.1      [.] 0x00000000026e46
         3.74%  evolution  libcairo.so.2.10800.6           [.] 0x000000000203bd
         3.61%   metacity  libpthread-2.9.so               [.] 0x00000000007a3d
    
    Reported-by: Pekka Enberg <penberg@cs.helsinki.fi>
    Tested-by: Pekka Enberg <penberg@cs.helsinki.fi>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Mike Galbraith <efault@gmx.de>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Paul Mackerras <paulus@samba.org>
    LKML-Reference: <1261148583-20395-1-git-send-email-acme@infradead.org>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Arnaldo Carvalho de Melo committed with Ingo Molnar Dec 18, 2009
  17. hw-breakpoints: Fix hardware breakpoints -> perf events dependency

    The kbuild's select command doesn't propagate through the config
    dependencies.
    
    Hence the current rules of hardware breakpoint's config can't
    ensure perf can never be disabled under us.
    
    We have:
    
    config X86
    	selects HAVE_HW_BREAKPOINTS
    
    config HAVE_HW_BREAKPOINTS
    	select PERF_EVENTS
    
    config PERF_EVENTS
    	[...]
    
    x86 will select the breakpoints but that won't propagate to perf
    events. The user can still disable the latter, but it is
    necessary for the breakpoints.
    
    What we need is:
    
     - x86 selects HAVE_HW_BREAKPOINTS and PERF_EVENTS
     - HAVE_HW_BREAKPOINTS depends on PERF_EVENTS
    
    so that we ensure PERF_EVENTS is enabled and frozen for x86.
    
    This fixes the following kind of build errors:
    
     In file included from arch/x86/kernel/hw_breakpoint.c:31:
     include/linux/hw_breakpoint.h: In function 'hw_breakpoint_addr':
     include/linux/hw_breakpoint.h:39: error: 'struct perf_event' has no member named 'attr'
    
    v2: Select also ANON_INODES from x86, required for perf
    
    Reported-by: Cyrill Gorcunov <gorcunov@gmail.com>
    Reported-by: Michal Marek <mmarek@suse.cz>
    Reported-by: Andrew Randrianasulu <randrik_a@yahoo.com>
    Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Randy Dunlap <randy.dunlap@oracle.com>
    Cc: K.Prasad <prasad@linux.vnet.ibm.com>
    LKML-Reference: <1261010034-7786-1-git-send-regression-fweisbec@gmail.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    fweisbec committed with Ingo Molnar Dec 17, 2009
  18. alpha: Convert BUG() to use unreachable()

    Use the new unreachable() macro instead of for(;;);
    
    Signed-off-by: David Daney <ddaney@caviumnetworks.com>
    CC: Richard Henderson <rth@twiddle.net>
    CC: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
    CC: linux-alpha@vger.kernel.org
    Signed-off-by: Matt Turner <mattst88@gmail.com>
    David Daney committed with mattst88 Dec 10, 2009
  19. alpha: Add minimal support for software performance events

    In the kernel the patch enables configuration of the perf event
    option, adds the perf_event_open syscall, and includes a minimal
    architecture specific asm/perf_event.h header file.
    
    Signed-off-by: Michael Cree <mcree@orcon.net.nz>
    Cc: Richard Henderson <rth@twiddle.net>
    Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Matt Turner <mattst88@gmail.com>
    Michael Cree committed with mattst88 Dec 8, 2009
  20. alpha: Wire up missing/new syscalls

    This wire up the: fallocate, timerfd_create, timerfd_settime,
    timerfd_gettime, signalfd4, eventfd2, epoll_create1, dup3, pipe2,
    inotify_init1, preadv, pwritev and rt_tgsigqueueinfo syscalls for
    the alpha port.
    
    For umount2, alpha have an "old" and "new" version called: oldumount and
    umount; so ignore umount2.
    
    Rebased on top of 6e17e8b by Matt
    Turner.
    
    Signed-off-by: Daniele Calore <orkaan@orkaan.org>
    Cc: Richard Henderson <rth@twiddle.net>
    Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
    Signed-off-by: Matt Turner <mattst88@gmail.com>
    Daniele Calore committed with mattst88 Dec 8, 2009
  21. x86, irq: Allow 0xff for /proc/irq/[n]/smp_affinity on an 8-cpu system

    John Blackwood reported:
    > on an older Dell PowerEdge 6650 system with 8 cpus (4 are hyper-threaded),
    > and  32 bit (x86) kernel, once you change the irq smp_affinity of an irq
    > to be less than all cpus in the system, you can never change really the
    > irq smp_affinity back to be all cpus in the system (0xff) again,
    > even though no error status is returned on the "/bin/echo ff >
    > /proc/irq/[n]/smp_affinity" operation.
    >
    > This is due to that fact that BAD_APICID has the same value as
    > all cpus (0xff) on 32bit kernels, and thus the value returned from
    > set_desc_affinity() via the cpu_mask_to_apicid_and() function is treated
    > as a failure in set_ioapic_affinity_irq_desc(), and no affinity changes
    > are made.
    
    set_desc_affinity() is already checking if the incoming cpu mask
    intersects with the cpu online mask or not. So there is no need
    for the apic op cpu_mask_to_apicid_and() to check again
    and return BAD_APICID.
    
    Remove the BAD_APICID return value from cpu_mask_to_apicid_and()
    and also fix set_desc_affinity() to return -1 instead of using BAD_APICID
    to represent error conditions (as cpu_mask_to_apicid_and() can return
    logical or physical apicid values and BAD_APICID is really to represent
    bad physical apic id).
    
    Reported-by: John Blackwood <john.blackwood@ccur.com>
    Root-caused-by: John Blackwood <john.blackwood@ccur.com>
    Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
    LKML-Reference: <1261103386.2535.409.camel@sbs-t61>
    Signed-off-by: H. Peter Anvin <hpa@zytor.com>
    Suresh Siddha committed with H. Peter Anvin Dec 18, 2009
  22. Linux 2.6.33-rc1

    torvalds committed Dec 18, 2009
  23. Merge branch 'cpumask-cleanups' of git://git.kernel.org/pub/scm/linux…

    …/kernel/git/rusty/linux-2.6-for-linus
    
    * 'cpumask-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
      cpumask: rename tsk_cpumask to tsk_cpus_allowed
      cpumask: don't recommend set_cpus_allowed hack in Documentation/cpu-hotplug.txt
      cpumask: avoid dereferencing struct cpumask
      cpumask: convert drivers/idle/i7300_idle.c to cpumask_var_t
      cpumask: use modern cpumask style in drivers/scsi/fcoe/fcoe.c
      cpumask: avoid deprecated function in mm/slab.c
      cpumask: use cpu_online in kernel/perf_event.c
    torvalds committed Dec 18, 2009
  24. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/jmorris/security-testing-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
      Keys: KEYCTL_SESSION_TO_PARENT needs TIF_NOTIFY_RESUME architecture support
      NOMMU: Optimise away the {dac_,}mmap_min_addr tests
      security/min_addr.c: make init_mmap_min_addr() static
      keys: PTR_ERR return of wrong pointer in keyctl_get_security()
    torvalds committed Dec 18, 2009
  25. Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    …inux/kernel/git/tmlind/linux-omap-2.6
    
    * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
      OMAP3: serial - fix bug introduced in
      mfd: twl: fix twl4030 rename for remaining driver, board files
      USB ehci: replace mach header with plat
      omap3: Allow EHCI to be built on OMAP3
    torvalds committed Dec 18, 2009