28 Mar, 2011

4 commits

  • Fix ipc/util.c kernel-doc warnings:

    Warning(ipc/util.c:336): No description found for parameter 'ns'
    Warning(ipc/util.c:620): No description found for parameter 'ns'
    Warning(ipc/util.c:790): No description found for parameter 'ns'

    Signed-off-by: Randy Dunlap
    Reviewed-by: Jesper Juhl
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     
  • Fix mm/memory.c incorrect kernel-doc function notation:

    Warning(mm/memory.c:3718): Cannot understand * @access_remote_vm - access another process' address space
    on line 3718 - I thought it was a doc line

    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     
  • Omit the segment prefix in the UP case. GS is not used then
    and we will generate segfaults if cmpxchg16b is used otherwise.

    Signed-off-by: Christoph Lameter
    Signed-off-by: Linus Torvalds

    Christoph Lameter
     
  • When m_start returns an error, the seq_file logic will still call m_stop
    with that error entry, so we'd better make sure that we check it before
    using it as a vma.

    Introduced by commit ec6fd8a4355c ("report errors in /proc/*/*map*
    sanely"), which replaced NULL with various ERR_PTR() cases.

    (On ia64, you happen to get a unaligned fault instead of a page fault,
    since the address used is generally some random error code like -EPERM)

    Reported-by: Anca Emanuel
    Reported-by: Tony Luck
    Cc: Al Viro
    Cc: Américo Wang
    Cc: Stephen Wilson
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     

26 Mar, 2011

36 commits

  • * 'syscore' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
    Introduce ARCH_NO_SYSDEV_OPS config option (v2)
    cpufreq: Use syscore_ops for boot CPU suspend/resume (v2)
    KVM: Use syscore_ops instead of sysdev class and sysdev
    PCI / Intel IOMMU: Use syscore_ops instead of sysdev class and sysdev
    timekeeping: Use syscore_ops instead of sysdev class and sysdev
    x86: Use syscore_ops instead of sysdev classes and sysdevs

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
    RDMA/nes: Fix test of uninitialized netdev

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (55 commits)
    [SCSI] tcm_loop: Add multi-fabric Linux/SCSI LLD fabric module
    [SCSI] qla4xxx: Use polling mode for disable interrupt mailbox completion
    [SCSI] Revert "[SCSI] Retrieve the Caching mode page"
    [SCSI] bnx2fc: IO completion not processed due to missed wakeup
    [SCSI] qla4xxx: Update driver version to 5.02.00-k6
    [SCSI] qla4xxx: masking required bits of add_fw_options during initialization
    [SCSI] qla4xxx: added new function qla4xxx_relogin_all_devices
    [SCSI] qla4xxx: add support for ql4xsess_recovery_tmo cmd line param
    [SCSI] qla4xxx: Add support for ql4xmaxqdepth command line parameter
    [SCSI] qla4xxx: cleanup function qla4xxx_process_ddb_changed
    [SCSI] qla4xxx: Prevent other port reinitialization during remove_adapter
    [SCSI] qla4xxx: remove unused ddb flag DF_NO_RELOGIN
    [SCSI] qla4xxx: cleanup DDB relogin logic during initialization
    [SCSI] qla4xxx: Do not retry ISP82XX initialization if H/W state is failed
    [SCSI] qla4xxx: Do not send mbox command if FW is in failed state
    [SCSI] qla4xxx: cleanup qla4xxx_initialize_ddb_list()
    [SCSI] ses: add subenclosure support
    [SCSI] bnx2fc: Bump version to 1.0.1
    [SCSI] bnx2fc: Remove unnecessary module state checks
    [SCSI] bnx2fc: Fix MTU issue by using static MTU
    ...

    Linus Torvalds
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
    kdb: add usage string of 'per_cpu' command
    kgdb,x86_64: fix compile warning found with sparse
    kdb: code cleanup to use macro instead of value
    kgdboc,kgdbts: strlen() doesn't count the terminator

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (56 commits)
    route: Take the right src and dst addresses in ip_route_newports
    ipv4: Fix nexthop caching wrt. scoping.
    ipv4: Invalidate nexthop cache nh_saddr more correctly.
    net: fix pch_gbe section mismatch warning
    ipv4: fix fib metrics
    mlx4_en: Removing HW info from ethtool -i report.
    net_sched: fix THROTTLED/RUNNING race
    drivers/net/a2065.c: Convert release_resource to release_region/release_mem_region
    drivers/net/ariadne.c: Convert release_resource to release_region/release_mem_region
    bonding: fix rx_handler locking
    myri10ge: fix rmmod crash
    mlx4_en: updated driver version to 1.5.4.1
    mlx4_en: Using blue flame support
    mlx4_core: reserve UARs for userspace consumers
    mlx4_core: maintain available field in bitmap allocator
    mlx4: Add blue flame support for kernel consumers
    mlx4_en: Enabling new steering
    mlx4: Add support for promiscuous mode in the new steering model.
    mlx4: generalization of multicast steering.
    mlx4_en: Reporting HW revision in ethtool -i
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
    PCI: Disable ASPM when _OSC control is not granted for PCIe services
    PCI: Changing ASPM policy, via /sys, to POWERSAVE could cause NMIs
    PCI: PCIe links may not get configured for ASPM under POWERSAVE mode
    PCI/ACPI: Report ASPM support to BIOS if not disabled from command line

    Linus Torvalds
     
  • * git://git.infradead.org/battery-2.6: (30 commits)
    bq20z75: Fix time and temp units
    bq20z75: Fix issues with present and suspend
    z2_battery: Fix count of properties
    s3c_adc_battery: Fix method names when PM not set
    z2_battery: Add MODULE_DEVICE_TABLE
    ds2782_battery: Add MODULE_DEVICE_TABLE
    bq20z75: Add MODULE_DEVICE_TABLE
    power_supply: Update power_supply_is_watt_property
    bq20z75: Add i2c retry mechanism
    bq20z75: Add optional battery detect gpio
    twl4030_charger: Make the driver atomic notifier safe
    bq27x00: Use single i2c_transfer call for property read
    bq27x00: Cleanup bq27x00_i2c_read
    bq27x00: Minor cleanups
    bq27x00: Give more specific reports on battery status
    bq27x00: Add MODULE_DEVICE_TABLE
    bq27x00: Add new properties
    bq27x00: Poll battery state
    bq27x00: Cache battery registers
    bq27x00: Add bq27000 support
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm:
    dm stripe: implement merge method
    dm mpath: allow table load with no priority groups
    dm mpath: fail message ioctl if specified path is not valid
    dm ioctl: add flag to wipe buffers for secure data
    dm ioctl: prepare for crypt key wiping
    dm crypt: wipe keys string immediately after key is set
    dm: add flakey target
    dm: fix opening log and cow devices for read only tables

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
    Input: tsc2005 - fix locking issue
    Input: tsc2005 - use relative jiffies to schedule the watchdog
    Input: tsc2005 - driver should depend on GENERIC_HARDIRQS

    Linus Torvalds
     
  • …l/git/tip/linux-2.6-tip

    * 'irq-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (23 commits)
    genirq: Expand generic show_interrupts()
    gpio: Fold irq_set_chip/irq_set_handler to irq_set_chip_and_handler
    gpio: Cleanup genirq namespace
    arm: ep93xx: Add basic interrupt info
    arm/gpio: Remove three copies of broken and racy debug code
    xtensa: Use generic show_interrupts()
    xtensa: Convert genirq namespace
    xtensa: Use generic IRQ Kconfig and set GENERIC_HARDIRQS_NO_DEPRECATED
    xtensa: Convert s6000 gpio irq_chip to new functions
    xtensa: Convert main irq_chip to new functions
    um: Use generic show_interrupts()
    um: Convert genirq namespace
    m32r: Use generic show_interrupts()
    m32r: Convert genirq namespace
    h8300: Use generic show_interrupts()
    h8300: Convert genirq namespace
    avr32: Cleanup eic_set_irq_type()
    avr32: Use generic show_interrupts()
    avr: Cleanup genirq namespace
    avr32: Use generic IRQ config, enable GENERIC_HARDIRQS_NO_DEPRECATED
    ...

    Fix up trivial conflict in drivers/gpio/timbgpio.c

    Linus Torvalds
     
  • …l/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, doc: Update sched-design-CFS.txt
    sched: Remove unused 'rq' variable and cpu_rq() call from alloc_fair_sched_group()
    sched.h: Fix a typo ("its")
    sched: Fix yield_to kernel-doc

    Linus Torvalds
     
  • …/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, x86: Complain louder about BIOSen corrupting CPU/PMU state and continue
    perf, x86: P4 PMU - Read proper MSR register to catch unflagged overflows
    perf symbols: Look at .dynsym again if .symtab not found
    perf build-id: Add quirk to deal with perf.data file format breakage
    perf session: Pass evsel in event_ops->sample()
    perf: Better fit max unprivileged mlock pages for tools needs
    perf_events: Fix stale ->cgrp pointer in update_cgrp_time_from_cpuctx()
    perf top: Fix uninitialized 'counter' variable
    tracing: Fix set_ftrace_filter probe function display
    perf, x86: Fix Intel fixed counters base initialization

    Linus Torvalds
     
  • …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:
    genirq: Provide locked setter for chip, handler, name
    genirq: Provide a lockdep helper
    genirq; Remove the last leftovers of the old sparse irq code

    Linus Torvalds
     
  • …/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:
    futex: Fix WARN_ON() test for UP
    WARN_ON_SMP(): Allow use in if() statements on UP
    x86, dumpstack: Use %pB format specifier for stack trace
    vsprintf: Introduce %pB format specifier
    lockdep: Remove unused 'factor' variable from lockdep_stats_show()

    Linus Torvalds
     
  • …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: DT: Cleanup namespace and call irq_set_irq_type() unconditional
    x86: DT: Fix return condition in irq_create_of_mapping()
    x86, mpparse: Move check_slot into CONFIG_X86_IO_APIC context

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
    m68k: merge m68k and m68knommu arch directories

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
    sparc32: Fix multiple RTC detections on SUN4D

    Linus Torvalds
     
  • * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
    [S390] cmpxchg: implement cmpxchg64()
    [S390] xchg/cmpxchg: move to own header file
    [S390] ccwgroup_driver: remove duplicate members
    [S390] ccw_bus_type: make it static
    [S390] ccw_driver: remove duplicate members
    [S390] qdio: prevent handling of buffers if count is zero
    [S390] setup: register bss section as resource
    [S390] setup: simplify setup_resources()
    [S390] wire up sys_syncfs
    [S390] wire up sys_clock_adjtime
    [S390] wire up sys_open_by_handle_at
    [S390] wire up sys_name_to_handle_at
    [S390] oprofile: disable hw sampling for CONFIG_32BIT
    [S390] early: limit savesys cmd string handling
    [S390] early: Fix possible overlapping data buffer

    Linus Torvalds
     
  • * 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: (49 commits)
    MIPS: JZ4740: Set nand ecc offsets for the qi_lb60 board
    MIPS: JZ4740: qi_lb60: Add gpio-charger device
    MIPS: Wire up syncfs(2).
    MIPS: Hook up name_to_handle_at, open_by_handle_at and clock_adjtime syscalls.
    MIPS: VR41xx: Convert to new irq_chip functions
    MIPS: TXx9: Convert to new irq_chip functions
    MIPS: SNI: Convert to new irq_chip functions
    MIPS: Sibyte: Convert to new irq_chip functions
    MIPS: IP32: Convert to new irq_chip functions
    MIPS: IP27: Convert to new irq_chip functions
    MIPS: IP22/IP28: Convert to new irq_chip functions
    MIPS: RB532: Convert to new irq_chip functions
    MIPS: PowerTV: Convert to new irq_chip functions
    MIPS: PNX8550: Convert to new irq_chip functions
    MIPS: PNX83xx: Convert to new irq_chip functions
    MIPS: msp71xx: Convert to new irq_chip functions
    MIPS: Loongson: Convert to new irq_chip functions
    MIPS: Use generic show_interrupts()
    MIPS: SMTC: Cleanup the hook mess and use irq_data
    MIPS: SMTC: Use irq_data in smtc_forward_irq()
    ...

    Linus Torvalds
     
  • commit b515498 ("userns: add a user namespace owner of ipc ns") added a
    user namespace owner of ipc ns, but it also introduced a use after free in
    free_ipc_ns().

    Signed-off-by: Xiaotian Feng
    Acked-by: "Serge E. Hallyn"
    Acked-by: David Howells
    Cc: "Eric W. Biederman"
    Cc: Daniel Lezcano
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Xiaotian Feng
     
  • Commit 0bc825d240ab ("codafs: fix compile warning when CONFIG_SYSCTL=n")
    introduces build breakage, when CONFIG_PROC_SYSCTL=n and
    CONFIG_CODA_FS=y:

    fs/built-in.o: In function `init_coda':
    psdev.c:(.init.text+0xc02): undefined reference to `coda_sysctl_init'
    psdev.c:(.init.text+0xc7c): undefined reference to `coda_sysctl_clean'
    fs/built-in.o: In function `exit_coda':
    psdev.c:(.exit.text+0xa9): undefined reference to `coda_sysctl_clean'
    make: *** [.tmp_vmlinux1] Error 1

    Signed-off-by: Rakib Mullick
    Reported-by: Ingo Molnar
    Acked-by: Randy Dunlap
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Rakib Mullick
     
  • Signed-off-by: Maxim Levitsky
    Acked-by: Alex Dubov
    Cc: FUJITA Tomonori
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Maxim Levitsky
     
  • Signed-off-by: Namhyung Kim
    Signed-off-by: Jason Wessel

    Namhyung Kim
     
  • Fix sparse warning:

    arch/x86/kernel/kgdb.c:123:9: warning: switch with no cases

    Reported-by: Namhyung Kim
    Signed-off-by: Jason Wessel

    Jason Wessel
     
  • It's better to use macro KDB_BASE_CMD_MAX instead of 50

    Signed-off-by: Jovi Zhang
    Signed-off-by: Jason Wessel

    Jovi Zhang
     
  • This is an off by one because strlen() doesn't count the null
    terminator. We strcpy() these strings into an array of size
    MAX_CONFIG_LEN.

    Signed-off-by: Dan Carpenter
    Signed-off-by: Jason Wessel

    Dan Carpenter
     
  • The jz4740 nand driver now requires that the ecc offsets are set.

    Signed-off-by: Lars-Peter Clausen
    Cc: linux-mips@linux-mips.org
    Cc: linux-kernel@vger.kernel.org
    Patchwork: https://patchwork.linux-mips.org/patch/2058/
    Signed-off-by: Ralf Baechle

    Lars-Peter Clausen
     
  • Register the gpio-charger device which reports whether device is currently
    charging or not.

    Signed-off-by: Lars-Peter Clausen
    Cc: linux-mips@linux-mips.org
    Cc: linux-kernel@vger.kernel.org
    Patchwork: https://patchwork.linux-mips.org/patch/2059/
    Signed-off-by: Ralf Baechle

    Lars-Peter Clausen
     
  • Signed-off-by: Ralf Baechle

    Ralf Baechle
     
  • These system calls we recently added.

    32-bit ABIs need compat handling for sys_clock_adjtime().

    o32 also needs compat handling for sys_open_by_handle_at();

    Signed-off-by: David Daney
    To: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/2165/
    Signed-off-by: Ralf Baechle

    David Daney
     
  • And cleanup direct access to irq_desc[].

    Signed-off-by: Thomas Gleixner
    To: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/2208/
    Patchwork: https://patchwork.linux-mips.org/patch/2209/
    Signed-off-by: Ralf Baechle

    Thomas Gleixner
     
  • Signed-off-by: Thomas Gleixner
    To: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/2207/
    Signed-off-by: Ralf Baechle

    Thomas Gleixner
     
  • Signed-off-by: Thomas Gleixner
    To: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/2206/
    Signed-off-by: Ralf Baechle

    Thomas Gleixner
     
  • Signed-off-by: Thomas Gleixner
    To: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/2205/
    Signed-off-by: Ralf Baechle

    Thomas Gleixner
     
  • Signed-off-by: Thomas Gleixner
    To: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/2204/
    Signed-off-by: Ralf Baechle

    Thomas Gleixner
     
  • Signed-off-by: Thomas Gleixner
    To: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/2203/
    Signed-off-by: Ralf Baechle

    Thomas Gleixner