1. 31 Jul, 2011 2 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils · 4d8a93c7
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils:
        cpupower: Do detect IDA (opportunistic processor performance) via cpuid
        cpupower: Show Intel turbo ratio support via ./cpupower frequency-info
        cpupowerutils: increase MAX_LINE_LEN
        cpupower: Rename package from cpupowerutils to cpupower
        cpupowerutils: Rename: libcpufreq->libcpupower
        cpupowerutils: use kernel version-derived version string
        cpupowerutils: utils - ConfigStyle bugfixes
        cpupowerutils: helpers - ConfigStyle bugfixes
        cpupowerutils: idle_monitor - ConfigStyle bugfixes
        cpupowerutils: lib - ConfigStyle bugfixes
        cpupowerutils: bench - ConfigStyle bugfixes
        cpupowerutils: do not update po files on each and every compile
        cpupowerutils: remove ccdv, use kernel quiet/verbose mechanism
        cpupowerutils: use COPYING, CREDITS from top-level directory
        cpupowerutils - cpufrequtils extended with quite some features
      4d8a93c7
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 · f33c596a
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
        smc91c92_cs.c: fix bogus compiler warning
        orinoco_cs: be more careful when matching cards with ID 0x0156:0x0002
        hostap_cs: support cards with "Version 01.02" as third product ID
        pcmcia: add PCMCIA_DEVICE_MANF_CARD_PROD_ID3
        pxa2xx pcmcia - stargate 2 use gpio array.
        pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.
        drivers:pcmcia:soc_common: make socket_init and socket_suspend optional
      f33c596a
  2. 30 Jul, 2011 20 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · 250f8e3d
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
        sungem: fix compile failure caused by trivial #include consolidation
      250f8e3d
    • Linus Torvalds's avatar
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging · 464c9098
      Linus Torvalds authored
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging: (24 commits)
        hwmon: (lm90) Refactor reading of config2 register
        hwmon: (lm90) Make SA56004 detection more robust
        hwmon: (lm90) Simplify handling of extended local temp register
        hwmon: (pmbus) Add client driver for LM25066, LM5064, and LM5066
        hwmon: (max34440) Add support for peak attributes
        hwmon: (max8688) Add support for peak attributes
        hwmon: (max16064) Add support for peak attributes
        hwmon: (adm1275) Add support for peak attributes
        hwmon: (pmbus) Add support for peak attributes
        hwmon: Add new attributes to sysfs ABI
        hwmon: (pmbus) Strengthen check for status register existence
        hwmon: (pmbus) Add support for virtual pages
        hwmon: (pmbus) Support reading and writing of word registers in device specific code
        hwmon: (pmbus) Increase attribute name size
        hwmon: (pmbus) Add ADP4000, NCP4200 and NCP4208 to list of supported devices
        hwmon: (pmbus) Add support for VID output voltage mode
        hwmon: (pmbus) Move PMBus drivers to drivers/hwmon/pmbus
        hwmon: (coretemp) Add core/pkg threshold support to Coretemp
        hwmon: (lm95241) Add support for LM95231
        hwmon: LM95245 driver
        ...
      464c9098
    • Vasiliy Kulikov's avatar
      shm: optimize locking and ipc_namespace getting · 4c677e2e
      Vasiliy Kulikov authored
      shm_lock() does a lookup of shm segment in shm_ids(ns).ipcs_idr, which
      is redundant as we already know shmid_kernel address.  An actual lock is
      also not required for reads until we really want to destroy the segment.
      
      exit_shm() and shm_destroy_orphaned() may avoid the loop by checking
      whether there is at least one segment in current ipc_namespace.
      
      The check of nsproxy and ipc_ns against NULL is redundant as exit_shm()
      is called from do_exit() before the call to exit_notify(), so the
      dereferencing current->nsproxy->ipc_ns is guaranteed to be safe.
      Reported-by: default avatarOleg Nesterov <oleg@redhat.com>
      Signed-off-by: default avatarVasiliy Kulikov <segoon@openwall.com>
      Acked-by: default avatarSerge Hallyn <serge.hallyn@canonical.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      4c677e2e
    • Vasiliy Kulikov's avatar
      shm: handle separate PID namespaces case · 5774ed01
      Vasiliy Kulikov authored
      shm_try_destroy_orphaned() and shm_try_destroy_current() didn't handle
      the case of separate PID namespaces, but a single IPC namespace.  If
      there are tasks with the same PID values using the same shmem object,
      the wrong destroy decision could be reached.
      
      On shm segment creation store the pointer to the creator task in
      shmid_kernel->shm_creator field and zero it on task exit.  Then
      use the ->shm_creator insread of shm_cprid in both functions.  As
      shmid_kernel object is already locked at this stage, no additional
      locking is needed.
      Signed-off-by: default avatarVasiliy Kulikov <segoon@openwall.com>
      Acked-by: default avatarSerge Hallyn <serge.hallyn@canonical.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      5774ed01
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · 6c6e3b82
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (71 commits)
        [SCSI] fcoe: cleanup cpu selection for incoming requests
        [SCSI] fcoe: add fip retry to avoid missing critical keep alive
        [SCSI] libfc: fix warn on in lport retry
        [SCSI] libfc: Remove the reference to FCP packet from scsi_cmnd in case of error
        [SCSI] libfc: cleanup sending SRR request
        [SCSI] libfc: two minor changes in comments
        [SCSI] libfc, fcoe: ignore rx frame with wrong xid info
        [SCSI] libfc: release exchg cache
        [SCSI] libfc: use FC_MAX_ERROR_CNT
        [SCSI] fcoe: remove unused ptype field in fcoe_rcv_info
        [SCSI] bnx2fc: Update copyright and bump version to 1.0.4
        [SCSI] bnx2fc: Tx BDs cache in write tasks
        [SCSI] bnx2fc: Do not arm CQ when there are no CQEs
        [SCSI] bnx2fc: hold tgt lock when calling cmd_release
        [SCSI] bnx2fc: Enable support for sequence level error recovery
        [SCSI] bnx2fc: HSI changes for tape
        [SCSI] bnx2fc: Handle REC_TOV error code from firmware
        [SCSI] bnx2fc: REC/SRR link service request and response handling
        [SCSI] bnx2fc: Support 'sequence cleanup' task
        [SCSI] dh_rdac: Associate HBA and storage in rdac_controller to support partitions in storage
        ...
      6c6e3b82
    • Linus Torvalds's avatar
      Merge branch 'slub/lockless' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 · c11abbba
      Linus Torvalds authored
      * 'slub/lockless' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: (21 commits)
        slub: When allocating a new slab also prep the first object
        slub: disable interrupts in cmpxchg_double_slab when falling back to pagelock
        Avoid duplicate _count variables in page_struct
        Revert "SLUB: Fix build breakage in linux/mm_types.h"
        SLUB: Fix build breakage in linux/mm_types.h
        slub: slabinfo update for cmpxchg handling
        slub: Not necessary to check for empty slab on load_freelist
        slub: fast release on full slab
        slub: Add statistics for the case that the current slab does not match the node
        slub: Get rid of the another_slab label
        slub: Avoid disabling interrupts in free slowpath
        slub: Disable interrupts in free_debug processing
        slub: Invert locking and avoid slab lock
        slub: Rework allocator fastpaths
        slub: Pass kmem_cache struct to lock and freeze slab
        slub: explicit list_lock taking
        slub: Add cmpxchg_double_slab()
        mm: Rearrange struct page
        slub: Move page->frozen handling near where the page->freelist handling occurs
        slub: Do not use frozen page flag but a bit in the page counters
        ...
      c11abbba
    • Linus Torvalds's avatar
      Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 · 1d3fe4a7
      Linus Torvalds authored
      * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (25 commits)
        kconfig: Introduce IS_ENABLED(), IS_BUILTIN() and IS_MODULE()
        xconfig: Abort close if configuration cannot be saved
        kconfig: fix missing "0x" prefix from S_HEX symbol in autoconf.h
        kconfig/nconf: remove useless conditionnal
        kconfig/nconf: prevent segfault on empty menu
        kconfig/nconf: use the generic menu_get_ext_help()
        nconfig: Avoid Wunused-but-set warning
        kconfig/conf: mark xfgets() private
        kconfig: remove pending prototypes for kconfig_load()
        kconfig/conf: add command line options' description
        kconfig/conf: reduce the scope of `defconfig_file'
        kconfig: use calloc() for expr allocation
        kconfig: introduce specialized printer
        kconfig: do not overwrite symbol direct dependency in assignment
        kconfig/gconf: silent missing prototype warnings
        kconfig/gconf: kill deadcode
        kconfig: nuke LKC_DIRECT_LINK cruft
        kconfig: nuke reference to SWIG
        kconfig: add missing <stdlib.h> inclusion
        kconfig: add missing <ctype.h> inclusion
        ...
      
      Fix up conflicts in scripts/kconfig/Makefile
      1d3fe4a7
    • Linus Torvalds's avatar
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 · 664a41b8
      Linus Torvalds authored
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (430 commits)
        [media] ir-mce_kbd-decoder: include module.h for its facilities
        [media] ov5642: include module.h for its facilities
        [media] em28xx: Fix DVB-C maxsize for em2884
        [media] tda18271c2dd: Fix saw filter configuration for DVB-C @6MHz
        [media] v4l: mt9v032: Fix Bayer pattern
        [media] V4L: mt9m111: rewrite set_pixfmt
        [media] V4L: mt9m111: fix missing return value check mt9m111_reg_clear
        [media] V4L: initial driver for ov5642 CMOS sensor
        [media] V4L: sh_mobile_ceu_camera: fix Oops when USERPTR mapping fails
        [media] V4L: soc-camera: remove soc-camera bus and devices on it
        [media] V4L: soc-camera: un-export the soc-camera bus
        [media] V4L: sh_mobile_csi2: switch away from using the soc-camera bus notifier
        [media] V4L: add media bus configuration subdev operations
        [media] V4L: soc-camera: group struct field initialisations together
        [media] V4L: soc-camera: remove now unused soc-camera specific PM hooks
        [media] V4L: pxa-camera: switch to using standard PM hooks
        [media] NetUP Dual DVB-T/C CI RF: force card hardware revision by module param
        [media] Don't OOPS if videobuf_dvb_get_frontend return NULL
        [media] NetUP Dual DVB-T/C CI RF: load firmware according card revision
        [media] omap3isp: Support configurable HS/VS polarities
        ...
      
      Fix up conflicts:
       - arch/arm/mach-omap2/board-rx51-peripherals.c:
           cleanup regulator supply definitions in mach-omap2
         vs
           OMAP3: RX-51: define vdds_csib regulator supply
       - drivers/staging/tm6000/tm6000-alsa.c (trivial)
      664a41b8
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · 983236b5
      Linus Torvalds authored
      * 'for-linus' of git://oss.sgi.com/xfs/xfs:
        xfs: Fix build breakage in xfs_iops.c when CONFIG_FS_POSIX_ACL is not set
      983236b5
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6 · 74aec4e0
      Linus Torvalds authored
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
        ecryptfs: Make inode bdi consistent with superblock bdi
        eCryptfs: Unlock keys needed by ecryptfsd
      74aec4e0
    • Linus Torvalds's avatar
      Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen · c32e7d66
      Linus Torvalds authored
      * 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen/balloon: Fix compile errors - missing header files.
        xen/grant: Fix compile warning.
        xen/pciback: remove duplicated #include
      c32e7d66
    • Greg Dietsche's avatar
      frv: remove unnecessary code · dbfe8987
      Greg Dietsche authored
      remove unnecessary code that matches this coccinelle pattern
      
      	if (...)
      		return ret;
      	return ret;
      Signed-off-by: default avatarGreg Dietsche <Gregory.Dietsche@cuw.edu>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      dbfe8987
    • James Bottomley's avatar
      ramoops: fix compile failure on parisc · 83c1b317
      James Bottomley authored
      Fixes this:
      
        drivers/char/ramoops.c: In function 'ramoops_init':
        drivers/char/ramoops.c:221: error: implicit declaration of function 'IS_ERR'
        drivers/char/ramoops.c:222: error: implicit declaration of function 'PTR_ERR'
      
      If it actually builds on other platforms, it's probably getting
      linux/err.h via some other #include.
      Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      83c1b317
    • Linus Torvalds's avatar
      Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 · f85f19de
      Linus Torvalds authored
      * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
        PCI: remove printks about disabled bridge windows
        PCI: fold pci_calc_resource_flags() into decode_bar()
        PCI: treat mem BAR type "11" (reserved) as 32-bit, not 64-bit, BAR
        PCI: correct pcie_set_readrq write size
        PCI: pciehp: change wait time for valid configuration access
        x86/PCI: Preserve existing pci=bfsort whitelist for Dell systems
        PCI: ARI is a PCIe v2 feature
        x86/PCI: quirks: Use pci_dev->revision
        PCI: Make the struct pci_dev * argument of pci_fixup_irqs const.
        PCI hotplug: cpqphp: use pci_dev->vendor
        PCI hotplug: cpqphp: use pci_dev->subsystem_{vendor|device}
        x86/PCI: config space accessor functions should not ignore the segment argument
        PCI: Assign values to 'pci_obff_signal_type' enumeration constants
        x86/PCI: reduce severity of host bridge window conflict warnings
        PCI: enumerate the PCI device only removed out PCI hieratchy of OS when re-scanning PCI
        PCI: PCIe AER: add aer_recover_queue
        x86/PCI: select direct access mode for mmconfig option
        PCI hotplug: Rename is_ejectable which also exists in dock.c
      f85f19de
    • Linus Torvalds's avatar
      Merge branch 'upstream/xen-tracing2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen · b993fdbc
      Linus Torvalds authored
      * 'upstream/xen-tracing2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
        xen/tracing: fix compile errors when tracing is disabled.
      b993fdbc
    • Linus Torvalds's avatar
      Merge branch 'at91/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc · 8f57be8e
      Linus Torvalds authored
      * 'at91/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
        at91: add arch specific ioremap support
        at91: factorize sram init
        at91: move register clocks to soc generic init
        at91: move clock subsystem init to soc generic init
        at91: use structure to store the current soc
        at91: remove AT91_DBGU offset from dbgu register macro
        at91: factorize at91 interrupts init to soc
        at91: introduce commom AT91_BASE_SYS
      8f57be8e
    • Linus Torvalds's avatar
      Merge branch 'next/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc · cb7dee8d
      Linus Torvalds authored
      * 'next/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (21 commits)
        arm/dt: tegra devicetree support
        arm/versatile: Add device tree support
        dt/irq: add irq_domain_generate_simple() helper
        irq: add irq_domain translation infrastructure
        dmaengine: imx-sdma: add device tree probe support
        dmaengine: imx-sdma: sdma_get_firmware does not need to copy fw_name
        dmaengine: imx-sdma: use platform_device_id to identify sdma version
        mmc: sdhci-esdhc-imx: add device tree probe support
        mmc: sdhci-pltfm: dt device does not pass parent to sdhci_alloc_host
        mmc: sdhci-esdhc-imx: get rid of the uses of cpu_is_mx()
        mmc: sdhci-esdhc-imx: do not reference platform data after probe
        mmc: sdhci-esdhc-imx: extend card_detect and write_protect support for mx5
        net/fec: add device tree probe support
        net: ibm_newemac: convert it to use of_get_phy_mode
        dt/net: add helper function of_get_phy_mode
        net/fec: gasket needs to be enabled for some i.mx
        serial/imx: add device tree probe support
        serial/imx: get rid of the uses of cpu_is_mx1()
        arm/dt: Add dtb make rule
        arm/dt: Add skeleton dtsi file
        ...
      cb7dee8d
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc · 49267fc8
      Linus Torvalds authored
      * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
        ARM: zynq: remove incorrectly deleted file
        ARM: tegra: only select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC
      49267fc8
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-watchdog · 2313bcdc
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-watchdog: (25 commits)
        watchdog: WatchDog Timer Driver Core - Add minimum and max timeout
        watchdog: WatchDog Timer Driver Core - Add ioctl call
        watchdog: WatchDog Timer Driver Core - Add nowayout feature
        watchdog: WatchDog Timer Driver Core - Add Magic Close feature
        watchdog: WatchDog Timer Driver Core - Add WDIOC_SETTIMEOUT and WDIOC_GETTIMEOUT ioctl
        watchdog: WatchDog Timer Driver Core - Add WDIOC_SETOPTIONS ioctl
        watchdog: WatchDog Timer Driver Core - Add WDIOC_KEEPALIVE ioctl
        watchdog: WatchDog Timer Driver Core - Add basic ioctl functionality
        watchdog: WatchDog Timer Driver Core - Add basic framework
        watchdog: hpwdt: add next gen HP servers
        watchdog: it8712f_wdt.c: improve includes
        watchdog: at91sam9/wdt: move register header to drivers
        watchdog: Add Xilinx watchdog timer driver
        watchdog: remove empty pm-functions
        watchdog: sp805: Flush posted writes in enable/disable.
        watchdog: sp805: Don't write 0 to the load value register.
        watchdog: imx2_wdt: add device tree probe support
        watchdog: s3c2410: Add support for device tree based probe
        watchdog: mpcore_wdt: Add suspend/resume support.
        watchdog: mtx1-wdt: use dev_{err,info} instead of printk()
        ...
      2313bcdc
    • Linus Torvalds's avatar
      ext2: remove duplicate 'ext2_get_acl()' define · 59ed2bb2
      Linus Torvalds authored
      When commit 4e34e719 ("fs: take the ACL checks to common code")
      changed the xyz_check_acl() functions into the more natural
      xyz_get_acl() interface, we grew two copies of the
      
        #define ext2_get_acl	NULL
      
      define for the non-acl case.
      
      Remove the extra one.
      Reported-by: default avatarMarco Stornelli <marco.stornelli@gmail.com>
      Cc: Christoph Hellwig <hch@lst.de>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      59ed2bb2
  3. 29 Jul, 2011 18 commits