1. 11 Jan, 2011 26 commits
  2. 10 Jan, 2011 14 commits
    • Alex Elder's avatar
      Merge branch 'master' into for-linus-merged · 92f1c008
      Alex Elder authored
      This merge pulls the XFS master branch into the latest Linus master.
      This results in a merge conflict whose best fix is not obvious.
      I manually fixed the conflict, in "fs/xfs/xfs_iget.c".
      Dave Chinner had done work that resulted in RCU freeing of inodes
      separate from what Nick Piggin had done, and their results differed
      slightly in xfs_inode_free().  The fix updates Nick's call_rcu()
      with the use of VFS_I(), while incorporating needed updates to some
      XFS inode fields implemented in Dave's series.  Dave's RCU callback
      function has also been removed.
      Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
    • Linus Torvalds's avatar
      Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 5b2eef96
      Linus Torvalds authored
      * 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (390 commits)
        drm/radeon/kms: disable underscan by default
        drm/radeon/kms: only enable hdmi features if the monitor supports audio
        drm: Restore the old_fb upon modeset failure
        drm/nouveau: fix hwmon device binding
        radeon: consolidate asic-specific function decls for pre-r600
        vga_switcheroo: comparing too few characters in strncmp()
        drm/radeon/kms: add NI pci ids
        drm/radeon/kms: don't enable pcie gen2 on NI yet
        drm/radeon/kms: add radeon_asic struct for NI asics
        drm/radeon/kms/ni: load default sclk/mclk/vddc at pm init
        drm/radeon/kms: add ucode loader for NI
        drm/radeon/kms: add support for DCE5 display LUTs
        drm/radeon/kms: add ni_reg.h
        drm/radeon/kms: add bo blit support for NI
        drm/radeon/kms: always use writeback/events for fences on NI
        drm/radeon/kms: adjust default clock/vddc tracking for pm on DCE5
        drm/radeon/kms: add backend map workaround for barts
        drm/radeon/kms: fill gpu init for NI asics
        drm/radeon/kms: add disabled vbios accessor for NI asics
        drm/radeon/kms: handle NI thermal controller
    • Linus Torvalds's avatar
      Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · 8adbf8d4
      Linus Torvalds authored
      * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        i2c: Constify i2c_client where possible
        i2c-algo-bit: Complain about masters which can't read SCL
        i2c-algo-bit: Refactor adapter registration
        i2c: Add generic I2C multiplexer using GPIO API
        i2c-nforce2: Remove unnecessary cast of pci_get_drvdata
        i2c-i801: Include <linux/slab.h>
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin · 0be8c8bd
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (52 commits)
        Blackfin: encode cpu-rev into uImage name
        Blackfin: bf54x: don't ack GPIO ints when unmasking them
        Blackfin: sram_free_with_lsl: do not ignore return value of sram_free
        Blackfin: boards: add missing "static" to peripheral lists
        Blackfin: DNP5370: new board port
        Blackfin: bf518f-ezbrd: fix dsa resources
        Blackfin: move "-m elf32bfin" to general LDFLAGS
        Blackfin: kgdb_test: make sure to initialize num2
        Blackfin: kgdb: disable preempt schedule when running single step in kgdb
        Blackfin: kgdb: disable interrupt when single stepping in ADEOS
        Blackfin: SMP: kgdb: apply anomaly 257 work around
        Blackfin: fix building IPIPE code when XIP is enabled
        Blackfin: SMP: kgdb: flush core internal write buffer before flushinv
        Blackfin: sport_uart resources: remove unused secondary RX/TX pins
        Blackfin: tll6527m: fix spelling in unused code (struct name)
        Blackfin: bf527-ezkit: add adau1373 chip address
        Blackfin: no-mpu: fix masking of small uncached dma region
        Blackfin: pm: drop irq save/restore in standby and suspend to mem callback
        MAINTAINERS: update Analog Devices support info
        Blackfin: dpmc.h: pull in new pll.h
    • Arnaldo Carvalho de Melo's avatar
      perf session: Fix infinite loop in __perf_session__process_events · 3d03e2ea
      Arnaldo Carvalho de Melo authored
      In this if statement:
              if (head + event->header.size >= mmap_size) {
                      if (mmaps[map_idx]) {
                              munmap(mmaps[map_idx], mmap_size);
                              mmaps[map_idx] = NULL;
                      page_offset = page_size * (head / page_size);
                      file_offset += page_offset;
                      head -= page_offset;
                      goto remap;
      With, for instance, these values:
      We end up endlessly looping back to remap. Off by one.
      Problem introduced in 55b44629
      Reported-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      Reported-by: default avatarIngo Molnar <mingo@elte.hu>
      Reported-by: default avatarDavid Ahern <daahern@cisco.com>
      Bisected-by: default avatarDavid Ahern <daahern@cisco.com>
      Tested-by: default avatarDavid Ahern <daahern@cisco.com>
      Cc: David Ahern <daahern@cisco.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Stephane Eranian <eranian@google.com>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Tom Zanussi <tzanussi@gmail.com>
      LKML-Reference: <new-submission>
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
    • Linus Torvalds's avatar
      Merge branch 'driver-core-next' of... · e54be894
      Linus Torvalds authored
      Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
      * 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
        driver core: Document that device_rename() is only for networking
        sysfs: remove useless test from sysfs_merge_group
        driver-core: merge private parts of class and bus
        driver core: fix whitespace in class_attr_string
    • Linus Torvalds's avatar
      Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · 949f6711
      Linus Torvalds authored
      * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (510 commits)
        staging: speakup: fix failure handling
        staging: usbip: remove double giveback of URB
        Staging: batman-adv: Remove batman-adv from staging
        Staging: hv: Use only one txf buffer per channel and kmalloc/GFP_KERNEL on initialize
        staging: hv: remove unneeded osd_schedule_callback
        staging: hv: convert channel_mgmt.c to not call osd_schedule_callback
        staging: hv: convert vmbus_on_msg_dpc to not call osd_schedule_callback
        staging: brcm80211: Fix WL_<type> logging macros
        Staging: IIO: DDS: AD9833 / AD9834 driver
        Staging: IIO: dds.h convenience macros
        Staging: IIO: Direct digital synthesis abi documentation
        staging: brcm80211: Convert ETHER_TYPE_802_1X to ETH_P_PAE
        staging: brcm80211: Remove unused ETHER_TYPE_<foo> #defines
        staging: brcm80211: Remove ETHER_HDR_LEN, use ETH_HLEN
        staging: brcm80211: Convert ETHER_ADDR_LEN to ETH_ALEN
        staging: brcm80211: Convert ETHER_IS<FOO> to is_<foo>_ether_addr
        staging: brcm80211: Remove unused ether_<foo> #defines and struct
        staging: brcm80211: Convert ETHER_IS_MULTI to is_multicast_ether_addr
        staging: brcm80211: Remove unused #defines ETHER_<foo>_LOCALADDR
        Staging: comedi: Fix checkpatch.pl issues in file s526.c
      Fix up trivial conflict in drivers/video/udlfb.c
    • Arnaldo Carvalho de Melo's avatar
      perf evsel: Support perf_evsel__open(cpus > 1 && threads > 1) · 0252208e
      Arnaldo Carvalho de Melo authored
      And a test for it:
      [acme@felicio linux]$ perf test
       1: vmlinux symtab matches kallsyms: Ok
       2: detect open syscall event: Ok
       3: detect open syscall event on all cpus: Ok
      [acme@felicio linux]$
      Translating C the test does:
      1. generates different number of open syscalls on each CPU
         by using sched_setaffinity
      2. Verifies that the expected number of events is generated
         on each CPU
      It works as expected.
      LKML-Reference: <new-submission>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Stephane Eranian <eranian@google.com>
      Cc: Tom Zanussi <tzanussi@gmail.com>
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of... · 443e6221
      Linus Torvalds authored
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: (36 commits)
        sony-laptop: support new hotkeys on the P, Z and EC series
        platform/x86: Consistently select LEDS Kconfig options
        sony-laptop: fix sparse non-ANSI function warning
        intel_ips: fix sparse non-ANSI function warning
        Support KHLB2 in the compal laptop driver
        acer-wmi: Enabled Acer Launch Manager mode
        [PATCH] intel_pmic_gpio: modify EOI handling following change of kernel irq subsystem
        ACPI Thinkpad: We must always call va_end() after va_start() but do not do so in thinkpad_acpi.c::acpi_evalf()
        acer-wmi: Initialize wlan/bluetooth/wwan rfkill software block state
        acer-wmi: Detect the WiFi/Bluetooth/3G devices available
        acer-wmi: Add 3G rfkill sysfs file
        acer-wmi: Add acer wmi hotkey events support
        platform/x86: Kconfig: Replace select by depends on ACPI_WMI
        ideapad: pass ideapad_priv as argument (part 2)
        ideapad: pass ideapad_priv as argument (part 1)
        ideapad: add markups, unify comments and return result when init
        ideapad: add hotkey support
        ideapad: let camera power control entry under platform driver
        ideapad: add platform driver for ideapad
        fujitsu-laptop: fix compiler warning on pnp_ids
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · 0caca697
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68knommu: Need to check __get_user()/__put_user() result
        m68knommu: signal.c __user annotations
        m68knommu: Equivalent of "m68k: handle new gcc's"
        m68knommu: f_pcr has been gone since headers' merge
        m68knommu: Don't lose state if sigframe setup fails
        m68knommu: Handle multiple pending signals
        m68knommu: Switch to saner sigsuspend
        m68knommu: Don't bother with SA_ONESHOT
        m68k: Check __get_user()/__put_user() return value
        m68k: Missing syscall_trace() on sigreturn
        m68k: Fix stack mangling logics in sigreturn
        m68k: If we fail to set sigframe up, just leave regs alone...
        m68k: Don't lose state if sigframe setup fails
        m68k: Simplify the singlestepping handling in signals
        m68k: Switch to saner sigsuspend()
        m68k: Resetting sa_handler in local copy of k_sigaction is pointless
        m68k/sun3: Kill pte_unmap() warnings
    • Linus Torvalds's avatar
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 · ecacc6c7
      Linus Torvalds authored
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
        [IA64] Avoid array overflow if there are too many cpus in SRAT table
        [IA64] Remove unlikely from cpu_is_offline
        [IA64] irq_ia64, use set_irq_chip
        [IA64] perfmon: Change vmalloc to vzalloc and drop memset.
        [IA64] eliminate race condition in smp_flush_tlb_mm
    • Linus Torvalds's avatar
      Merge branch 'for-torvalds' of... · e773202e
      Linus Torvalds authored
      Merge branch 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson
      * 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
        ux500: allow 5500 and 8500 to be built together
        ux500: modem_irq is only for 5500
        ux500: dynamic SOC detection
        ux500: rename MOP board Kconfig
        ux500: remove build-time changing macros
    • Linus Torvalds's avatar
      Merge branch 'msm-smp' of git://codeaurora.org/quic/kernel/davidb/linux-msm · abf8792d
      Linus Torvalds authored
      * 'msm-smp' of git://codeaurora.org/quic/kernel/davidb/linux-msm:
        msm: add SMP support for msm
        msm: hotplug: support cpu hotplug on msm
        msm: timer: SMP timer support for msm
        msm: scm-boot: Support for setting cold/warm boot addresses
        msm: Secure Channel Manager (SCM) support
    • Jean Delvare's avatar
      i2c: Constify i2c_client where possible · 0cc43a18
      Jean Delvare authored
      Helper functions for I2C and SMBus transactions don't modify the
      i2c_client that is passed to them, so it can be marked const.
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>