07 Nov, 2011

21 commits

  • * 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
    Revert "tracing: Include module.h in define_trace.h"
    irq: don't put module.h into irq.h for tracking irqgen modules.
    bluetooth: macroize two small inlines to avoid module.h
    ip_vs.h: fix implicit use of module_get/module_put from module.h
    nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
    include: replace linux/module.h with "struct module" wherever possible
    include: convert various register fcns to macros to avoid include chaining
    crypto.h: remove unused crypto_tfm_alg_modname() inline
    uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
    pm_runtime.h: explicitly requires notifier.h
    linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
    miscdevice.h: fix up implicit use of lists and types
    stop_machine.h: fix implicit use of smp.h for smp_processor_id
    of: fix implicit use of errno.h in include/linux/of.h
    of_platform.h: delete needless include
    acpi: remove module.h include from platform/aclinux.h
    miscdevice.h: delete unnecessary inclusion of module.h
    device_cgroup.h: delete needless include
    net: sch_generic remove redundant use of
    net: inet_timewait_sock doesnt need
    ...

    Fix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in
    - drivers/media/dvb/frontends/dibx000_common.c
    - drivers/media/video/{mt9m111.c,ov6650.c}
    - drivers/mfd/ab3550-core.c
    - include/linux/dmaengine.h

    Linus Torvalds
     
  • * 'writeback-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:
    writeback: Add a 'reason' to wb_writeback_work
    writeback: send work item to queue_io, move_expired_inodes
    writeback: trace event balance_dirty_pages
    writeback: trace event bdi_dirty_ratelimit
    writeback: fix ppc compile warnings on do_div(long long, unsigned long)
    writeback: per-bdi background threshold
    writeback: dirty position control - bdi reserve area
    writeback: control dirty pause time
    writeback: limit max dirty pause time
    writeback: IO-less balance_dirty_pages()
    writeback: per task dirty rate limit
    writeback: stabilize bdi->dirty_ratelimit
    writeback: dirty rate control
    writeback: add bg_threshold parameter to __bdi_update_bandwidth()
    writeback: dirty position control
    writeback: account per-bdi accumulated dirtied pages

    Linus Torvalds
     
  • * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
    target: use ->exectute_task for all CDB emulation
    target: remove SCF_EMULATE_CDB_ASYNC
    target: refactor transport_emulate_control_cdb
    target: pass the se_task to the CDB emulation callback
    target: split core_scsi3_emulate_pr
    target: split core_scsi2_emulate_crh
    target: Add generic active I/O shutdown logic
    target: add back error handling in transport_complete_task
    target/pscsi: blk_make_request() returns an ERR_PTR()
    target: Remove core TRANSPORT_FREE_CMD_INTR usage
    target: Make TFO->check_stop_free return free status
    iscsi-target: Fix non-immediate TMR handling
    iscsi-target: Add missing CMDSN_LOWER_THAN_EXP check in iscsit_handle_scsi_cmd
    target: Avoid double list_del for aborted se_tmr_req
    target: Minor cleanups to core_tmr_drain_tmr_list
    target: Fix wrong se_tmr being added to drain_tmr_list
    target: Fix incorrect se_cmd assignment in core_tmr_drain_tmr_list
    target: Check -ENOMEM to signal QUEUE_FULL from fabric callbacks
    tcm_loop: Add explict read buffer memset for SCF_SCSI_CONTROL_SG_IO_CDB
    target: Fix compile warning w/ missing module.h include

    Linus Torvalds
     
  • * 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
    scsi: drop unused Kconfig symbol
    pci: drop unused Kconfig symbol
    stmmac: drop unused Kconfig symbol
    x86: drop unused Kconfig symbol
    powerpc: drop unused Kconfig symbols
    powerpc: 40x: drop unused Kconfig symbol
    mips: drop unused Kconfig symbols
    openrisc: drop unused Kconfig symbols
    arm: at91: drop unused Kconfig symbol
    samples: drop unused Kconfig symbol
    m32r: drop unused Kconfig symbol
    score: drop unused Kconfig symbols
    sh: drop unused Kconfig symbol
    um: drop unused Kconfig symbol
    sparc: drop unused Kconfig symbol
    alpha: drop unused Kconfig symbol

    Fix up trivial conflict in drivers/net/ethernet/stmicro/stmmac/Kconfig
    as per Michal: the STMMAC_DUAL_MAC config variable is still unused and
    should be deleted.

    Linus Torvalds
     
  • * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
    script/checkpatch.pl: warn about deprecated use of EXTRA_{A,C,CPP,LD}FLAGS
    tags, powerpc: Update tags.sh to support _GLOBAL symbols
    scripts: add extract-vmlinux

    Linus Torvalds
     
  • * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
    scripts/kconfig/nconf: add KEY_HOME / KEY_END for dialog_inputbox
    scripts/kconfig/nconf: fix editing long strings
    scripts/kconfig/nconf: dynamically alloc dialog_input_result
    scripts/kconfig/nconf: fix memmove's length arg
    scripts/kconfig/nconf: fix typo: unknow => unknown
    kconfig: fix set but not used variables
    kconfig: handle SIGINT in menuconfig
    kconfig: fix __enabled_ macros definition for invisible and un-selected symbols
    kconfig: factor code in menu_get_ext_help()
    kbuild: Fix help text not displayed in choice option.
    kconfig/nconf: nuke unreferenced `nohelp_text'
    kconfig/streamline_config.pl: merge local{mod,yes}config
    kconfig/streamline_config.pl: use options to determine operating mode
    kconfig/streamline_config.pl: directly access LSMOD from the environment

    Linus Torvalds
     
  • * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
    Kbuild: append missing-syscalls to the default target list
    genksyms: Regenerate lexer and parser
    genksyms: Do not expand internal types
    genksyms: Minor parser cleanup
    Makefile: remove a duplicated line
    fixdep: fix extraneous dependencies
    scripts/Makefile.build: do not reference EXTRA_CFLAGS as CFLAGS replacement
    kbuild: prevent make from deleting _shipped files
    kbuild: Do not delete empty files in make distclean

    Linus Torvalds
     
  • This removes the use of the special "macbookair_fn_keys" keyboard
    translation table for the MacBookAir4,x models (ie the 2011 refresh).
    They use the standard apple_fn_keys[] translation. Apparently only the
    old MacBook Air's need a different translation table.

    This mirrors the change that commit da617c7cb915 ("HID: consolidate
    MacbookAir 4,1 mappings") did for the WELLSPRING6A ones, but does it for
    the WELLSPRING6 model used on the MacBookAir4,2.

    Reported-and-tested-by: Dirk Hohndel
    Cc: Jiri Kosina
    Cc: Joshua V Dillon
    Cc: Chase Douglas
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • * 'stable/vmalloc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    net: xen-netback: use API provided by xenbus module to map rings
    block: xen-blkback: use API provided by xenbus module to map rings
    xen: use generic functions instead of xen_{alloc, free}_vm_area()

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
    ceph/super.c: quiet sparse noise
    ceph/mds_client.c: quiet sparse noise
    ceph: use new D_COMPLETE dentry flag
    ceph: clear parent D_COMPLETE flag when on dentry prune

    Linus Torvalds
     
  • * git://github.com/rustyrussell/linux:
    module,bug: Add TAINT_OOT_MODULE flag for modules not built in-tree
    module: Enable dynamic debugging regardless of taint

    Linus Torvalds
     
  • * 'rmobile-latest' of git://github.com/pmundt/linux-sh: (21 commits)
    ARM: mach-shmobile: ag5evm needs CONFIG_I2C
    ARM: mach-shmobile: sh73a0 and AG5EVM PINT support
    ARM: mach-shmobile: Add support for PINT though INTC macros
    ARM: mach-shmobile: SDHI0 GPIO hotplug for AG5EVM
    ARM: mach-shmobile: Use common INTC IRQ code on sh73a0
    ARM: mach-shmobile: Use common INTC IRQ code on sh7372
    ARM: mach-shmobile: Use common INTC IRQ code on sh7377
    ARM: mach-shmobile: Use common INTC IRQ code on sh7367
    ARM: mach-shmobile: sh73a0 GPIO IRQ support
    ARM: sh7372 ap4evb NOR Flash USB boot fix
    ARM: mach-shmobile: sh7372 Mackerel NOR Flash USB boot fix
    sh: intc: Allow triggering on both edges for ARM SoCs
    ARM: mach-shmobile: Break out INTC IRQ code
    ARM: mach-shmobile: Kota2 SDHI0 and SDHI1 support
    ARM: mach-shmobile: Kota2 SCIFA4 and SCIFB support
    ARM: mach-shmobile: Kota2 MMCIF support
    ARM: mach-shmobile: Kota2 GPIO LEDs support
    ARM: mach-shmobile: Kota2 GPIO Keys support
    ARM: mach-shmobile: Kota2 KEYSC support
    ARM: mach-shmobile: Kota2 SCIFA2 and SMSC911X support
    ...

    Linus Torvalds
     
  • * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (106 commits)
    powerpc/p3060qds: Add support for P3060QDS board
    powerpc/83xx: Add shutdown request support to MCU handling on MPC8349 MITX
    powerpc/85xx: Make kexec to interate over online cpus
    powerpc/fsl_booke: Fix comment in head_fsl_booke.S
    powerpc/85xx: issue 15 EOI after core reset for FSL CoreNet devices
    powerpc/8xxx: Fix interrupt handling in MPC8xxx GPIO driver
    powerpc/85xx: Add 'fsl,pq3-gpio' compatiable for GPIO driver
    powerpc/86xx: Correct Gianfar support for GE boards
    powerpc/cpm: Clear muram before it is in use.
    drivers/virt: add ioctl for 32-bit compat on 64-bit to fsl-hv-manager
    powerpc/fsl_msi: add support for "msi-address-64" property
    powerpc/85xx: Setup secondary cores PIR with hard SMP id
    powerpc/fsl-booke: Fix settlbcam for 64-bit
    powerpc/85xx: Adding DCSR node to dtsi device trees
    powerpc/85xx: clean up FPGA device tree nodes for Freecsale QorIQ boards
    powerpc/85xx: fix PHYS_64BIT selection for P1022DS
    powerpc/fsl-booke: Fix setup_initial_memory_limit to not blindly map
    powerpc: respect mem= setting for early memory limit setup
    powerpc: Update corenet64_smp_defconfig
    powerpc: Update mpc85xx/corenet 32-bit defconfigs
    ...

    Fix up trivial conflicts in:
    - arch/powerpc/configs/40x/hcu4_defconfig
    removed stale file, edited elsewhere
    - arch/powerpc/include/asm/udbg.h, arch/powerpc/kernel/udbg.c:
    added opal and gelic drivers vs added ePAPR driver
    - drivers/tty/serial/8250.c
    moved UPIO_TSI to powerpc vs removed UPIO_DWAPB support

    Linus Torvalds
     
  • * 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
    ARM: PXA: fix includes in pxa2xx_cm_x2xx PCMCIA driver
    ARM: PXA: fix gpio-pxa.h build errors
    ARM: 7142/1: davinci: mark GPIO implementation complex
    ARM: 7134/1: Revert "EXYNOS4: Fix routing timer interrupt to offline CPU"
    ARM: PXA: eseries: fix eseries_register_clks section mismatch warning
    ARM: PXA: fix lubbock PCMCIA driver build error

    Linus Torvalds
     
  • Use of the GPL or a compatible licence doesn't necessarily make the code
    any good. We already consider staging modules to be suspect, and this
    should also be true for out-of-tree modules which may receive very
    little review.

    Signed-off-by: Ben Hutchings
    Reviewed-by: Dave Jones
    Acked-by: Greg Kroah-Hartman
    Signed-off-by: Rusty Russell (patched oops-tracing.txt)

    Ben Hutchings
     
  • Dynamic debugging is currently disabled for tainted modules, except
    for TAINT_CRAP. This prevents use of dynamic debugging for
    out-of-tree modules once the next patch is applied.

    This condition was apparently intended to avoid a crash if a force-
    loaded module has an incompatible definition of dynamic debug
    structures. However, a administrator that forces us to load a module
    is claiming that it *is* compatible even though it fails our version
    checks. If they are mistaken, there are any number of ways the module
    could crash the system.

    As a side-effect, proprietary and other tainted modules can now use
    dynamic_debug.

    Signed-off-by: Ben Hutchings
    Acked-by: Mathieu Desnoyers
    Signed-off-by: Rusty Russell

    Ben Hutchings
     
  • * 'next/move' of git://git.linaro.org/people/arnd/arm-soc:
    ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos
    ARM: EXYNOS4: convert MCT to percpu interrupt API
    ARM: SAMSUNG: Add clk enable/disable of pwm
    ARM: SAMSUNG: Fix compile error due to kfree

    Linus Torvalds
     
  • * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
    hwmon: (w83627ehf) Fix broken driver init
    hwmon: (coretemp) Fix for non-SMP builds

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
    ALSA: hda - Revert the check of NO_PRESENCE pincfg default bit
    ALSA: hda - Fix a regression for DMA-position check with CA0110
    ALSA: hda - Fix silent output regression with ALC861
    ALSA: control: remove compilation warning on 32-bit
    ALSA: ua101: fix crash when unplugging

    Linus Torvalds
     
  • Commit 2265cef2 (hwmon: (w83627ehf) Properly report PECI and AMD-SI
    sensor types) results in kernel panic if data->temp_label was not
    initialized.
    The problem was found with chip W83627DHG-P.

    Add check if data->temp->label was set before use.

    Based on incomplete patch by Alexander Beregalov.

    Reported-by: Alexander Beregalov
    Tested-by: Alexander Beregalov
    Cc: stable@kernel.org
    Signed-off-by: Guenter Roeck
    Signed-off-by: Jean Delvare

    Guenter Roeck
     
  • The definition of TO_ATTR_NO in the non-SMP case is wrong. As the SMP
    definition resolves to the correct value, just use this for both
    cases.

    Without this fix the temperature attributes are named temp0_* instead
    of temp2_*, so libsensors won't pick them. Broken since kernel 3.0.

    Signed-off-by: Jean Delvare
    Tested-by: Phil Sutter
    Cc: stable@kernel.org
    Acked-by: Durgadoss R
    Acked-by: Guenter Roeck

    Jean Delvare
     

06 Nov, 2011

19 commits

  • The implementation on commit [08a1f5eb: ALSA: hda - Check NO_PRESENCE
    pincfg default bit] seems like a mis-interpretation of specification.
    The spec gives the reversed bit definition. But, following the spec
    also causes to change so many existing device configurations, thus we
    can't change it so easily for now. For 3.2-rc1, it's safer to revert
    this check (actually this patch comments out the code).

    We may re-introduced the fixed version once after the wider test-case
    coverages are done.

    Signed-off-by: Takashi Iwai

    Takashi Iwai
     
  • The regression-fix in 3.1 for the check of DMA-position validity caused
    yet another regression for CA0110. As usual, this hardware seems working
    only with LPIB properly. Adding the appropriate driver-caps bit to force
    LPIB fixes the problem.

    Reported-and-tested-by: Andres Freund
    Cc: [v3.1]
    Signed-off-by: Takashi Iwai

    Takashi Iwai
     
  • The 3.1 kernel has a regression for ALC861 codec where no sound output
    is heard with the default setup. It's because the amps in DACs aren't
    properly unmuted while the output mixers are assigned only to pins.

    This patch fixes the missing initialization of DACs when no mixer is
    assigned to them.

    Tested-by: Andrea Iob
    Cc: [v3.1+]
    Signed-off-by: Takashi Iwai

    Takashi Iwai
     
  • This was introduced by 'ALSA: control: add support for ENUMERATED user
    space controls' which adds a u64 variable that gets cast to a pointer:

    sound/core/control.c: In function 'snd_ctl_elem_init_enum_names':
    sound/core/control.c:1089: warning: cast to pointer from integer of different size

    Cast to uintptr_t before casting to pointer to avoid the warning.

    Signed-off-by: Olof Johansson
    [cl: replace long with uintptr_t]
    Signed-off-by: Clemens Ladisch
    Signed-off-by: Takashi Iwai

    Olof Johansson
     
  • If the device is unplugged while running, it is possible for a PCM
    device to be closed after the disconnect callback has returned. This
    means that kill_stream_urb() and disable_iso_interface() would try to
    access already-invalid or freed USB data structures.

    The function free_usb_related_resources() was intended to prevent this,
    but forgot to clear the affected variables.

    Reported-and-tested-by: Olivier Courtay
    Signed-off-by: Clemens Ladisch
    Cc: 2.6.33+
    Signed-off-by: Takashi Iwai

    Clemens Ladisch
     
  • The arch/arm/mach-exynos4 directory (CONFIG_ARCH_EXYNOS4) has
    made for plaforms based on EXYNOS4 SoCs. But since upcoming
    Samsung's SoCs such as EXYNOS5 (ARM Cortex A15) can reuse most
    codes in current mach-exynos4, one mach-exynos directory will
    be used for them.

    This patch changes to CONFIG_ARCH_EXYNOS (arch/arm/mach-exynos)
    but keeps original CONFIG_ARCH_EXYNOS4 in mach-exynos/Kconfig to
    avoid changing in driver side.

    Cc: Arnd Bergmann
    Cc: Russell King
    Signed-off-by: Kukjin Kim

    Kukjin Kim
     
  • MCT recently gained per cpu interrupts, and missed the fact that
    ARM has moved to a genirq based implementation.

    This patch converts the driver to the new API.

    Boot tested on Origen.

    Cc: Kukjin Kim
    Signed-off-by: Marc Zyngier
    Signed-off-by: Kukjin Kim

    Marc Zyngier
     
  • PWM timers use pclk("timers" clk) as parent clk. If this pclk is the
    disabled state when PWM driver is probed, then it causes wrong read and
    write operation about registers of PWM.

    Signed-off-by: Joonyoung Shim
    Signed-off-by: Kyungmin Park
    Signed-off-by: Kukjin Kim

    Joonyoung Shim
     
  • Fix following build error.
    arch/arm/plat-samsung/dev-backlight.c: In function 'samsung_bl_set':
    arch/arm/plat-samsung/dev-backlight.c:145: error: implicit declaration of function 'kfree'

    Signed-off-by: Jonghwan Choi
    Signed-off-by: Kukjin Kim

    Jonghwan Choi
     
  • Quiet the sparse noise:

    warning: symbol 'create_fs_client' was not declared. Should it be static?
    warning: symbol 'destroy_fs_client' was not declared. Should it be static?

    Signed-off-by: H Hartley Sweeten
    Cc: Sage Weil
    ceph-devel@vger.kernel.org
    Signed-off-by: Sage Weil

    H Hartley Sweeten
     
  • Quiet the following sparse noise:

    warning: symbol 'get_nonsnap_parent' was not declared. Should it be static?
    warning: symbol 'done_closing_sessions' was not declared. Should it be static?

    Local functions don't need external visability. Make them static.

    Signed-off-by: H Hartley Sweeten
    Cc: Sage Weil
    Signed-off-by: Sage Weil

    H Hartley Sweeten
     
  • We used to use a flag on the directory inode to track whether the dcache
    contents for a directory were a complete cached copy. Switch to a dentry
    flag CEPH_D_COMPLETE that is safely updated by ->d_prune().

    Signed-off-by: Sage Weil

    Sage Weil
     
  • * 'next/devel2' of git://git.linaro.org/people/arnd/arm-soc: (30 commits)
    ARM: mmp: register internal sram bank
    ARM: mmp: register audio sram bank
    ARM: mmp: add sram allocator
    gpio/samsung: Complain loudly if we don't know the SoC
    ARM: S3C64XX: Fix SoC identification for S3C64xx devices
    ARM: S3C2443: Remove redundant s3c_register_clocks call for init_clocks
    ARM: S3C24XX: Add devname for hsmmc1 pclk
    ARM: S3C24XX: use clk_get_rate to init fclk in common_setup_clocks
    ARM: S3C2443: Accommodate cpufreq frequency scheme in armdiv
    ARM: S3C2443: handle unset armdiv values gracefully
    ARM: S3C2443: Add get_rate operation for clk_armdiv
    ARM: S3C2416: Add comment describing the armdiv/armclk
    ARM: S3C2443: Move clk_arm and clk_armdiv to common code
    ARM: S3C24XX: Add infrastructure to transmit armdiv to common code
    ARM: S3C2416: Add armdiv_mask constant
    ARM: EXYNOS4: Add support for M-5MOLS camera on Nuri board
    ARM: EXYNOS4: Enable MFC on ORIGEN
    ARM: SAMSUNG: Add support s3c2416-adc for S3C2416/S3C2450
    ARM: SAMSUNG: Add support s3c2443-adc for S3C2443
    ARM: SAMSUNG: Allow overriding of adc device name for S3C24XX
    ...

    Linus Torvalds
     
  • * 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc: (79 commits)
    ARM: SAMSUNG: Move fimc plat. device from board files to plat-samsung
    ARM: SAMSUNG: Cleanup resources by using macro
    ARM: SAMSUNG: Cleanup plat-samsung/devs.c and devs.h
    ARM: S5P: To merge devs.c files to one devs.c
    ARM: S3C64XX: To merge devs.c files to one devs.c
    ARM: S3C24XX: To merge s3c24xx devs.c files to one devs.c
    ARM: S5P64X0: Add Power Management support
    ARM: S5P: Make the sleep code common for S5P series SoCs
    ARM: S5P: Make the common S5P PM code conditionally compile
    ARM: SAMSUNG: Move S5P header files to plat-samsung
    ARM: SAMSUNG: Move S3C24XX header files to plat-samsung
    ARM: SAMSUNG: Moving each SoC support header files
    ARM: SAMSUNG: Consolidate plat/pll.h
    ARM: SAMSUNG: Consolidate plat/pwm-clock.h
    ARM: SAMSUNG: Cleanup mach/clkdev.h
    ARM: SAMSUNG: remove sdhci default configuration setup platform helper
    ARM: EXYNOS4: Add FIMC device on SMDKV310 board
    ARM: EXYNOS4: Add header file protection macros
    ARM: EXYNOS4: Add usb ehci device to the SMDKV310
    ARM: S3C2443: Add hsspi-clock from pclk and rename S3C2443 hsspi sclk
    ...

    Fix up conflicts in
    - arch/arm/mach-exynos4/{Kconfig,clock.c}
    ARM_CPU_SUSPEND, various random device tables (gah!)
    - drivers/gpio/Makefile
    sa1100 gpio added, samsung gpio drivers merged

    Linus Torvalds
     
  • Update my email address in MAINTAINERS.

    Signed-off-by: Tyler Hicks
    Signed-off-by: Linus Torvalds

    Tyler Hicks
     
  • * 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
    PM / Freezer: Revert 27920651fe "PM / Freezer: Make fake_signal_wake_up() wake TASK_KILLABLE tasks too"
    PM / Freezer: Reimplement wait_event_freezekillable using freezer_do_not_count/freezer_count
    USB: Update last_busy time after autosuspend fails
    PM / Runtime: Automatically retry failed autosuspends
    PM / QoS: Remove redundant check
    PM / OPP: Fix build when CONFIG_PM_OPP is not set
    PM / Runtime: Fix runtime accounting calculation error
    PM / Sleep: Update freezer documentation
    PM / Sleep: Remove unused symbol 'suspend_cpu_hotplug'
    PM / Sleep: Fix race between CPU hotplug and freezer
    ACPI / PM: Add Sony VPCEB17FX to nonvs blacklist

    Linus Torvalds
     
  • * git://www.linux-watchdog.org/linux-watchdog:
    watchdog: Convert wm831x driver to watchdog core
    watchdog: s3c2410: convert to use the watchdog framework
    Documentation: watchdog: add guide how to convert drivers to new framework
    watchdog: iTCO_wdt.c - problems with newer hardware due to SMI clearing
    watchdog: Add WDIOC_GETTIMELEFT ioctl support to w83627 watchdog driver
    watchdog: irq: Remove IRQF_DISABLED
    watchdog: Octeon: Mark octeon_wdt interrupt as IRQF_NO_THREAD
    watchdog: sc520_wdt: Remove unnecessary cast.

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (45 commits)
    [SCSI] Fix block queue and elevator memory leak in scsi_alloc_sdev
    [SCSI] scsi_dh_alua: Fix the time inteval for alua rtpg commands
    [SCSI] scsi_transport_iscsi: Fix documentation os parameter
    [SCSI] mv_sas: OCZ RevoDrive3 & zDrive R4 support
    [SCSI] libfc: improve flogi retries to avoid lport stuck
    [SCSI] libfc: avoid exchanges collision during lport reset
    [SCSI] libfc: fix checking FC_TYPE_BLS
    [SCSI] edd: Treat "XPRS" host bus type the same as "PCI"
    [SCSI] isci: overriding max_concurr_spinup oem parameter by max(oem, user)
    [SCSI] isci: revert bcn filtering
    [SCSI] isci: Fix hard reset timeout conditions.
    [SCSI] isci: No need to manage the pending reset bit on pending requests.
    [SCSI] isci: Remove redundant isci_request.ttype field.
    [SCSI] isci: Fix task management for SMP, SATA and on dev remove.
    [SCSI] isci: No task_done callbacks in error handler paths.
    [SCSI] isci: Handle task request timeouts correctly.
    [SCSI] isci: Fix tag leak in tasks and terminated requests.
    [SCSI] isci: Immediately fail I/O to removed devices.
    [SCSI] isci: Lookup device references through requests in completions.
    [SCSI] ipr: add definitions for additional adapter
    ...

    Linus Torvalds
     
  • The includes in the pxa2xx_cm_x2xx PCMCIA driver are rather random;
    the driver doesn't require anything from these headers except the
    cpu_is_xxx() macros which come from another include.

    The concern is that it's getting these definitions via mach/system.h,
    which is supposed to only be included by arch/arm/kernel/process.c.
    As this header is scheduled for cleanup (and elimination) keeping
    the status quo will cause build errors. So lets fix properly and
    independent of the future work.

    Signed-off-by: Russell King

    Russell King