1. 19 Jan, 2012 1 commit
  2. 18 Jan, 2012 9 commits
  3. 14 Jan, 2012 1 commit
  4. 12 Jan, 2012 29 commits
    • Dan Carpenter's avatar
      cifs: integer overflow in parse_dacl() · 7250170c
      Dan Carpenter authored
      On 32 bit systems num_aces * sizeof(struct cifs_ace *) could overflow
      leading to a smaller ppace buffer than we expected.
      Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Acked-by: default avatarJeff Layton <jlayton@samba.org>
      Signed-off-by: default avatarSteve French <smfrench@gmail.com>
      7250170c
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · a429638c
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (526 commits)
        ASoC: twl6040 - Add method to query optimum PDM_DL1 gain
        ALSA: hda - Fix the lost power-setup of seconary pins after PM resume
        ALSA: usb-audio: add Yamaha MOX6/MOX8 support
        ALSA: virtuoso: add S/PDIF input support for all Xonars
        ALSA: ice1724 - Support for ooAoo SQ210a
        ALSA: ice1724 - Allow card info based on model only
        ALSA: ice1724 - Create capture pcm only for ADC-enabled configurations
        ALSA: hdspm - Provide unique driver id based on card serial
        ASoC: Dynamically allocate the rtd device for a non-empty release()
        ASoC: Fix recursive dependency due to select ATMEL_SSC in SND_ATMEL_SOC_SSC
        ALSA: hda - Fix the detection of "Loopback Mixing" control for VIA codecs
        ALSA: hda - Return the error from get_wcaps_type() for invalid NIDs
        ALSA: hda - Use auto-parser for HP laptops with cx20459 codec
        ALSA: asihpi - Fix potential Oops in snd_asihpi_cmode_info()
        ALSA: hdsp - Fix potential Oops in snd_hdsp_info_pref_sync_ref()
        ALSA: hda/cirrus - support for iMac12,2 model
        ASoC: cx20442: add bias control over a platform provided regulator
        ALSA: usb-audio - Avoid flood of frame-active debug messages
        ALSA: snd-usb-us122l: Delete calls to preempt_disable
        mfd: Put WM8994 into cache only mode when suspending
        ...
      
      Fix up trivial conflicts in:
       - arch/arm/mach-s3c64xx/mach-crag6410.c:
      	renamed speyside_wm8962 to tobermory, added littlemill right
      	next to it
       - drivers/base/regmap/{regcache.c,regmap.c}:
      	duplicate diff that had already come in with other changes in
      	the regmap tree
      a429638c
    • Bjorn Helgaas's avatar
      x86/PCI: build amd_bus.o only when CONFIG_AMD_NB=y · 5cf9a4e6
      Bjorn Helgaas authored
      We only need amd_bus.o for AMD systems with PCI.  arch/x86/pci/Makefile
      already depends on CONFIG_PCI=y, so this patch just adds the dependency
      on CONFIG_AMD_NB.
      
      Cc: Yinghai Lu <yinghai@kernel.org>
      Cc: stable@kernel.org	# 2.6.34+ (needs adjustment for k8 -> amd rename)
      Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      5cf9a4e6
    • Takashi Iwai's avatar
      Merge branch 'topic/hda' into for-linus · 9e4ce164
      Takashi Iwai authored
      9e4ce164
    • Takashi Iwai's avatar
      Merge branch 'topic/misc' into for-linus · 627b7962
      Takashi Iwai authored
      627b7962
    • Takashi Iwai's avatar
      Merge branch 'for-3.3' of... · 29abceb6
      Takashi Iwai authored
      Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into topic/asoc
      29abceb6
    • Linus Torvalds's avatar
      Merge tag 'rmobile-for-linus' of git://github.com/pmundt/linux-sh · 4c4d285a
      Linus Torvalds authored
      SH/R-Mobile updates for 3.3 merge window.
      
      * tag 'rmobile-for-linus' of git://github.com/pmundt/linux-sh: (32 commits)
        arm: mach-shmobile: add a resource name for shdma
        ARM: mach-shmobile: r8a7779 SMP support V3
        ARM: mach-shmobile: Add kota2 defconfig.
        ARM: mach-shmobile: Add marzen defconfig.
        ARM: mach-shmobile: r8a7779 power domain support V2
        ARM: mach-shmobile: Fix up marzen build for recent GIC changes.
        ARM: mach-shmobile: r8a7779 PFC function support
        ARM: mach-shmobile: Flush caches in platform_cpu_die()
        ARM: mach-shmobile: Allow SoC specific CPU kill code
        ARM: mach-shmobile: Fix headsmp.S code to use CPUINIT
        ARM: mach-shmobile: clock-r8a7779: clkz/clkzs support
        ARM: mach-shmobile: clock-r8a7779: add DIV4 clock support
        ARM: mach-shmobile: Marzen LAN89218 support
        ARM: mach-shmobile: Marzen SCIF2/SCIF4 support
        ARM: mach-shmobile: r8a7779 PFC GPIO-only support V2
        ARM: mach-shmobile: r8a7779 and Marzen base support V2
        sh: pfc: Unlock register support
        sh: pfc: Variable bitfield width config register support
        sh: pfc: Add config_reg_helper() function
        sh: pfc: Convert index to field and value pair
        ...
      4c4d285a
    • Linus Torvalds's avatar
      Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh · 56c8bc3b
      Linus Torvalds authored
      SuperH updates for 3.3 merge window.
      
      * tag 'sh-for-linus' of git://github.com/pmundt/linux-sh: (38 commits)
        sh: magicpanelr2: Update for parse_mtd_partitions() fallout.
        sh: mach-rsk: Update for parse_mtd_partitions() fallout.
        sh: sh2a: Improve cache flush/invalidate functions
        sh: also without PM_RUNTIME pm_runtime.o must be built
        sh: add a resource name for shdma
        sh: Remove redundant try_to_freeze() invocations.
        sh: Ensure IRQs are enabled across do_notify_resume().
        sh: Fix up store queue code for subsys_interface changes.
        sh: clkfwk: sh_clk_init_parent() should be called after clk_register()
        sh: add platform_device for renesas_usbhs in board-sh7757lcr
        sh: modify clock-sh7757 for renesas_usbhs
        sh: pfc: ioremap() support
        sh: use ioread32/iowrite32 and mapped_reg for div6
        sh: use ioread32/iowrite32 and mapped_reg for div4
        sh: use ioread32/iowrite32 and mapped_reg for mstp32
        sh: extend clock struct with mapped_reg member
        sh: clkfwk: clock-sh73a0: all div6_clks use SH_CLK_DIV6_EXT()
        sh: clkfwk: clock-sh7724: all div6_clks use SH_CLK_DIV6_EXT()
        sh: clock-sh7723: add CLKDEV_ICK_ID for cleanup
        serial: sh-sci: Handle GPIO function requests.
        ...
      56c8bc3b
    • Linus Torvalds's avatar
      Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · b8bf17d3
      Linus Torvalds authored
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched: Fix lockup by limiting load-balance retries on lock-break
        sched: Fix CONFIG_CGROUP_SCHED dependency
        sched: Remove empty #ifdefs
      b8bf17d3
    • Paul Mundt's avatar
      sh: magicpanelr2: Update for parse_mtd_partitions() fallout. · 1c1744cc
      Paul Mundt authored
      Follows the RSK+ change for the same rationale.
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      1c1744cc
    • Paul Mundt's avatar
      sh: mach-rsk: Update for parse_mtd_partitions() fallout. · 603129af
      Paul Mundt authored
      The RSK+ setup code was doing some pretty dubious things with
      parse_mtd_partitions() in order to populate the physmap-flash map
      platform data. The physmap-flash driver contains all of the functionality
      that we require already, so simply drop the special casing and pad out
      the platform data accordingly.
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      603129af
    • Paul Mundt's avatar
      Merge branch 'sh/nommu' into sh-latest · b1bdd255
      Paul Mundt authored
      b1bdd255
    • Phil Edworthy's avatar
      sh: sh2a: Improve cache flush/invalidate functions · c1537b48
      Phil Edworthy authored
      The cache functions lock out interrupts for long periods; this patch
      reduces the impact when operating on large address ranges. In such
      cases it will:
      - Invalidate the entire cache rather than individual addresses.
      - Do nothing when flushing the operand cache in write-through mode.
      - When flushing the operand cache in write-back mdoe, index the
        search for matching addresses on the cache entires instead of the
        addresses to flush
      
      Note: sh2a__flush_purge_region was only invalidating the operand
      cache, this adds flush.
      Signed-off-by: default avatarPhil Edworthy <phil.edworthy@renesas.com>
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      c1537b48
    • Paul Mundt's avatar
      Merge branch 'sh/hwblk' into sh-latest · 9d14070f
      Paul Mundt authored
      9d14070f
    • Paul Mundt's avatar
      Merge branch 'sh/pm-runtime' into sh-latest · 9f06cf38
      Paul Mundt authored
      Conflicts:
      	arch/sh/kernel/cpu/sh4a/clock-sh7723.c
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      9f06cf38
    • Guennadi Liakhovetski's avatar
      sh: also without PM_RUNTIME pm_runtime.o must be built · d3442b2b
      Guennadi Liakhovetski authored
      When CONFIG_PM_RUNTIME is off, drivers/sh/pm_runtime.o still has to be
      built on sh platforms, because then it provides means to statically
      switch on device PM clocks.
      Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      d3442b2b
    • Shimoda, Yoshihiro's avatar
    • Paul Mundt's avatar
      e64e1b11
    • Shimoda, Yoshihiro's avatar
    • Linus Torvalds's avatar
      Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 9fc5c3e3
      Linus Torvalds authored
      * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/intel config: Fix the APB_TIMER selection
        x86/mrst: Add additional debug prints for pb_keys
        x86/intel config: Revamp configuration to allow for Moorestown and Medfield
        x86/intel/scu/ipc: Match the changes in the x86 configuration
        x86/apb: Fix configuration constraints
        x86: Fix INTEL_MID silly
        x86/Kconfig: Cyclone-timer depends on x86-summit
        x86: Reduce clock calibration time during slave cpu startup
        x86/config: Revamp configuration for MID devices
        x86/sfi: Kill the IRQ as id hack
      9fc5c3e3
    • Linus Torvalds's avatar
      Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 541048a1
      Linus Torvalds authored
      * 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, reboot: Fix typo in nmi reboot path
        x86, NMI: Add to_cpumask() to silence compile warning
        x86, NMI: NMI selftest depends on the local apic
        x86: Add stack top margin for stack overflow checking
        x86, NMI: NMI-selftest should handle the UP case properly
        x86: Fix the 32-bit stackoverflow-debug build
        x86, NMI: Add knob to disable using NMI IPIs to stop cpus
        x86, NMI: Add NMI IPI selftest
        x86, reboot: Use NMI instead of REBOOT_VECTOR to stop cpus
        x86: Clean up the range of stack overflow checking
        x86: Panic on detection of stack overflow
        x86: Check stack overflow in detail
      541048a1
    • Linus Torvalds's avatar
      Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · bcede2f6
      Linus Torvalds authored
      * 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, efi: Break up large initrd reads
        x86, efi: EFI boot stub support
        efi: Add EFI file I/O data types
        efi.h: Add boottime->locate_handle search types
        efi.h: Add graphics protocol guids
        efi.h: Add allocation types for boottime->allocate_pages()
        efi.h: Add efi_image_loaded_t
        efi.h: Add struct definition for boot time services
        x86: Don't use magic strings for EFI loader signature
        x86: Add missing bzImage fields to struct setup_header
      bcede2f6
    • Linus Torvalds's avatar
      Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · d0b9706c
      Linus Torvalds authored
      * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/numa: Add constraints check for nid parameters
        mm, x86: Remove debug_pagealloc_enabled
        x86/mm: Initialize high mem before free_all_bootmem()
        arch/x86/kernel/e820.c: quiet sparse noise about plain integer as NULL pointer
        arch/x86/kernel/e820.c: Eliminate bubble sort from sanitize_e820_map()
        x86: Fix mmap random address range
        x86, mm: Unify zone_sizes_init()
        x86, mm: Prepare zone_sizes_init() for unification
        x86, mm: Use max_low_pfn for ZONE_NORMAL on 64-bit
        x86, mm: Wrap ZONE_DMA32 with CONFIG_ZONE_DMA32
        x86, mm: Use max_pfn instead of highend_pfn
        x86, mm: Move zone init from paging_init() on 64-bit
        x86, mm: Use MAX_DMA_PFN for ZONE_DMA on 32-bit
      d0b9706c
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq · 02d92950
      Linus Torvalds authored
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq: (23 commits)
        [CPUFREQ] EXYNOS: Removed useless headers and codes
        [CPUFREQ] EXYNOS: Make EXYNOS common cpufreq driver
        [CPUFREQ] powernow-k8: Update copyright, maintainer and documentation information
        [CPUFREQ] powernow-k8: Fix indexing issue
        [CPUFREQ] powernow-k8: Avoid Pstate MSR accesses on systems supporting CPB
        [CPUFREQ] update lpj only if frequency has changed
        [CPUFREQ] cpufreq:userspace: fix cpu_cur_freq updation
        [CPUFREQ] Remove wall variable from cpufreq_gov_dbs_init()
        [CPUFREQ] EXYNOS4210: cpufreq code is changed for stable working
        [CPUFREQ] EXYNOS4210: Update frequency table for cpu divider
        [CPUFREQ] EXYNOS4210: Remove code about bus on cpufreq
        [CPUFREQ] s3c64xx: Use pr_fmt() for consistent log messages
        cpufreq: OMAP: fixup for omap_device changes, include <linux/module.h>
        cpufreq: OMAP: fix freq_table leak
        cpufreq: OMAP: put clk if cpu_init failed
        cpufreq: OMAP: only supports OPP library
        cpufreq: OMAP: dont support !freq_table
        cpufreq: OMAP: deny initialization if no mpudev
        cpufreq: OMAP: move clk name decision to init
        cpufreq: OMAP: notify even with bad boot frequency
        ...
      02d92950
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/battery-2.6 · b24ca57e
      Linus Torvalds authored
      * git://git.infradead.org/battery-2.6: (68 commits)
        power_supply: Mark da9052 driver as broken
        power_supply: Drop usage of nowarn variant of sysfs_create_link()
        s3c_adc_battery: Average over more than one adc sample
        power_supply: Add DA9052 battery driver
        isp1704_charger: Fix missing check
        jz4740-battery: Fix signedness bug
        power_supply: Assume mains power by default
        sbs-battery: Fix devicetree match table
        ARM: rx51: Add bq27200 i2c board info
        sbs-battery: Change power supply name
        devicetree-bindings: Propagate bq20z75->sbs rename to dt bindings
        devicetree-bindings: Add vendor entry for Smart Battery Systems
        sbs-battery: Rename internals to new name
        bq20z75: Rename to sbs-battery
        wm97xx_battery: Use DEFINE_MUTEX() for work_lock
        max8997_charger: Remove duplicate module.h
        lp8727_charger: Some minor fixes for the header
        lp8727_charger: Add header file
        power_supply: Convert drivers/power/* to use module_platform_driver()
        power_supply: Add "unknown" in power supply type
        ...
      b24ca57e
    • Linus Torvalds's avatar
      Merge branch 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux · 6296e5d3
      Linus Torvalds authored
      * 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux:
        slub: disallow changing cpu_partial from userspace for debug caches
        slub: add missed accounting
        slub: Extract get_freelist from __slab_alloc
        slub: Switch per cpu partial page support off for debugging
        slub: fix a possible memleak in __slab_alloc()
        slub: fix slub_max_order Documentation
        slub: add missed accounting
        slab: add taint flag outputting to debug paths.
        slub: add taint flag outputting to debug paths
        slab: introduce slab_max_order kernel parameter
        slab: rename slab_break_gfp_order to slab_max_order
      6296e5d3
    • Linus Torvalds's avatar
      Merge tag 'md-3.3-fixes' of git://neil.brown.name/md · c086ae4e
      Linus Torvalds authored
      Two bugfixes for md.
      
      One is a recently introduced regression that affects an unusual
      configuration with a guaranteed BUG_ON.  Has been tagged for -stable.
      The other is minor missing functionality.
      
      * tag 'md-3.3-fixes' of git://neil.brown.name/md:
        md/raid1: perform bad-block tests for WriteMostly devices too.
        md: notify the 'degraded' sysfs attribute on failure.
      c086ae4e
    • Linus Torvalds's avatar
      Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci · 7b67e751
      Linus Torvalds authored
      * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci: (80 commits)
        x86/PCI: Expand the x86_msi_ops to have a restore MSIs.
        PCI: Increase resource array mask bit size in pcim_iomap_regions()
        PCI: DEVICE_COUNT_RESOURCE should be equal to PCI_NUM_RESOURCES
        PCI: pci_ids: add device ids for STA2X11 device (aka ConneXT)
        PNP: work around Dell 1536/1546 BIOS MMCONFIG bug that breaks USB
        x86/PCI: amd: factor out MMCONFIG discovery
        PCI: Enable ATS at the device state restore
        PCI: msi: fix imbalanced refcount of msi irq sysfs objects
        PCI: kconfig: English typo in pci/pcie/Kconfig
        PCI/PM/Runtime: make PCI traces quieter
        PCI: remove pci_create_bus()
        xtensa/PCI: convert to pci_scan_root_bus() for correct root bus resources
        x86/PCI: convert to pci_create_root_bus() and pci_scan_root_bus()
        x86/PCI: use pci_scan_bus() instead of pci_scan_bus_parented()
        x86/PCI: read Broadcom CNB20LE host bridge info before PCI scan
        sparc32, leon/PCI: convert to pci_scan_root_bus() for correct root bus resources
        sparc/PCI: convert to pci_create_root_bus()
        sh/PCI: convert to pci_scan_root_bus() for correct root bus resources
        powerpc/PCI: convert to pci_create_root_bus()
        powerpc/PCI: split PHB part out of pcibios_map_io_space()
        ...
      
      Fix up conflicts in drivers/pci/msi.c and include/linux/pci_regs.h due
      to the same patches being applied in other branches.
      7b67e751
    • Magnus Damm's avatar
      ARM: mach-shmobile: r8a7779 SMP support V3 · f40aaf6d
      Magnus Damm authored
      This patch contains r8a7779 SMP support V3 - now including
      CPU hotplug offine and online support. The r8a7779 power
      domain code is tied together with SMP glue code which allows
      us to control the power domains via CPU hotplug.
      
      At this point the kernel boots with the 4 Cortex-A9 cores in
      SMP mode and all CPU cores except CPU0 can be hotplugged.
      
      The code in platsmp.c is quite far from pretty, but it is
      kept like that intentionally to avoid creating layers of
      code that will go away in the near future anyway. The code
      needs to be updated when some per-SoC handling code will be
      added to the ARM architecture, see the following patch for
      more information:
       "[RFC PATCH 0/3] Per SoC descriptor"
      Signed-off-by: default avatarMagnus Damm <damm@opensource.se>
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      f40aaf6d