Eric Lee / linux-smarc-t335x-v3.2

24 Aug, 2010

1 commit

23 Aug, 2010

2 commits

  • 1dc7ce99b   xen: pvhvm: rename xen_emul_unplug=ignore to =unnnecessary ... Browse Code »

    It is not immediately clear what this option causes to become
    ignored. The actual meaning is that it is not necessary to unplug the
    emulated devices to safely use the PV ones, even if the platform does
    not support the unplug protocol. (pressumably the user will only add
    this option if they have ensured that their domain configuration is
    safe).

    I think xen_emul_unplug=unnecessary better captures this.

    Signed-off-by: Ian Campbell
    Acked-by: Jeremy Fitzhardinge
    Acked-by: Stefano Stabellini

    Ian Campbell
     
  • c93a4dfb3   xen: pvhvm: allow user to request no emulated device unplug ... Browse Code »

    this allows the user to disable pvhvm and revert to emulated devices
    in case of a system misconfiguration (e.g. initramfs with only
    emulated drivers in it).

    Signed-off-by: Ian Campbell
    Acked-by: Jeremy Fitzhardinge
    Acked-by: Stefano Stabellini

    Ian Campbell
     

21 Aug, 2010

3 commits

  • f6143a9b7   Documentation: fix ozlabs.org mailing list address ... Browse Code »

    This list moved to lists.ozlabs.org quite some time ago.

    Signed-off-by: Stephen Rothwell
    Signed-off-by: Linus Torvalds

    Stephen Rothwell
     
  • 1ee416805   Documentation: kernel-locking: mutex_trylock cannot be used in interrupt context ... Browse Code »

    Chapter 6 is right about mutex_trylock, but chapter 10 wasn't. This error
    was introduced during semaphore-to-mutex conversion of the Unreliable
    guide. :-)

    If user context which performs mutex_lock() or mutex_trylock() is
    preempted by interrupt context which performs mutex_trylock() on the same
    mutex instance, a deadlock occurs. This is because these functions do not
    disable local IRQs when they operate on mutex->wait_lock.

    Signed-off-by: Stefan Richter
    Acked-by: Rusty Russell
    Cc: Matthew Wilcox
    Cc: Randy Dunlap
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Stefan Richter
     
  • f2e41e910   revert "hwmon: f71882fg: add support for the Fintek F71808E" ... Browse Code »

    Revert commit 7721fea3d0fd93fb4d000eb737b444369358d6d3 ("hwmon:
    f71882fg: add support for the Fintek F71808E").

    Hans said:

    : A second review after I've received a data sheet for this device from
    : Fintek has turned up a few bugs.
    :
    : Unfortunately Giel (nor I) have time to fix this in time for the 2.6.36
    : cycle. Therefor I would like to see this patch reverted as not having any
    : support for the hwmon function of this superio chip is better then having
    : unreliable support.

    Cc: Giel van Schijndel
    Cc: Jean Delvare
    Cc: Hans de Goede
    Cc: Jonathan Cameron
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andrew Morton
     

19 Aug, 2010

1 commit

  • 86ea51d4a   Merge branch 'merge-devicetree' of git://git.secretlab.ca/git/linux-2.6 ... Browse Code »

    * 'merge-devicetree' of git://git.secretlab.ca/git/linux-2.6:
    spi.h: missing kernel-doc notation, please fix
    of: fix missing headers for of_address_to_resource() in MTD and SysACE drivers
    of: Fix missing includes
    ata: update for of_device to platform_device replacement
    microblaze: Fix of: eliminate of_device->node and dev_archdata->{of,prom}_node
    microblaze: Fix of/address: Merge all of the bus translation code
    booting-without-of: Remove nonexistent chapters from TOC, fix numbering

    Linus Torvalds
     

17 Aug, 2010

1 commit

16 Aug, 2010

3 commits

  • 217f09631   thinkpad-acpi: untangle ACPI/vendor backlight selection ... Browse Code »

    acpi_video_backlight_support() already tells us if ACPI is handling
    backlight control through the generic ACPI handle. It is better to just
    trust it.

    While at it, adjust down a printk priority, and test earlier for
    brightness_enable=0.

    Signed-off-by: Henrique de Moraes Holschuh
    Signed-off-by: Matthew Garrett

    Henrique de Moraes Holschuh
     
  • 2245ba2a3   Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 ... Browse Code »

    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
    gcc-4.6: ACPI: fix unused but set variables in ACPI
    ACPI thermal: make procfs I/F depend on CONFIG_ACPI_PROCFS
    ACPI video: make procfs I/F depend on CONFIG_ACPI_PROCFS
    ACPI processor: remove deprecated ACPI procfs I/F
    ACPI power_resource: remove unused procfs I/F
    ACPI: remove deprecated ACPI procfs I/F
    ACPI: introduce drivers/acpi/sysfs.c
    ACPI: introduce module parameter acpi.aml_debug_output
    ACPI: introduce drivers/acpi/debugfs.c
    ACPI, APEI, ERST debug support
    ACPI, APEI, Manage GHES as platform devices
    ACPI, APEI, Rename CPER and GHES severity constants
    ACPI, APEI, Fix a typo of error path of apei_resources_request
    ACPI / ACPICA: Fix reference counting problems with GPE handlers
    ACPI: Add the check of ADR flag in course of finding ACPI handle for PCI device
    ACPI / Sleep: Drop acpi_suspend_finish()
    ACPI / Sleep: Consolidate suspend and hibernation routines
    ACPI / Wakeup: Simplify enabling of wakeup devices
    ACPI / Sleep: Rework enabling wakeup devices
    ACPI / Sleep: Free NVS copy if suspending of devices fails

    Fixed up totally buggered "ACPI: fix unused but set variables in ACPI"
    patch that doesn't even compile in the merge.

    Thanks to Sedat Dilek for noticing the
    breakage before I even pulled. And a big "Grrr.." at Len for not even
    bothering to compile the tree before asking me to pull.

    Linus Torvalds
     
  • e2e96c663   Merge git://git.infradead.org/iommu-2.6 ... Browse Code »

    * git://git.infradead.org/iommu-2.6:
    intel-iommu: Fix 32-bit build warning with __cmpxchg()
    intr-remap: allow disabling source id checking

    Linus Torvalds
     

15 Aug, 2010

15 commits

14 Aug, 2010

1 commit

13 Aug, 2010

4 commits

  • 8357422d4   Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm: (33 commits)
    dm mpath: support discard
    dm stripe: support discards
    dm: split discard requests on target boundaries
    dm stripe: optimize sector division
    dm stripe: move sector translation to a function
    dm: error return error for discards
    dm delay: support discard
    dm: zero silently drop discards
    dm: use dm_target_offset macro
    dm: factor out max_io_len_target_boundary
    dm: use common __issue_target_request for flush and discard support
    dm: linear support discard
    dm crypt: simplify crypt_ctr
    dm crypt: simplify crypt_config destruction logic
    dm: allow autoloading of dm mod
    dm: rename map_info flush_request to target_request_nr
    dm ioctl: refactor dm_table_complete
    dm snapshot: implement merge
    dm: do not initialise full request queue when bio based
    dm ioctl: make bio or request based device type immutable
    ...

    Linus Torvalds
     
  • 1c00650c2   Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging ... Browse Code »

    * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
    i2c: I2C bus multiplexer driver pca954x
    i2c: Multiplexed I2C bus core support
    i2c: Use a separate mutex for userspace client lists
    i2c: Make i2c_default_probe self-sufficient
    i2c: Drop dummy variable
    i2c: Move adapter locking helpers to i2c-core
    V4L/DVB: Use custom I2C probing function mechanism
    i2c: Add support for custom probe function
    i2c-dev: Use memdup_user
    i2c-dev: Remove unnecessary kmalloc casts

    Linus Torvalds
     
  • 26df0766a   Merge branch 'params' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus ... Browse Code »

    * 'params' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: (22 commits)
    param: don't deref arg in __same_type() checks
    param: update drivers/acpi/debug.c to new scheme
    param: use module_param in drivers/message/fusion/mptbase.c
    ide: use module_param_named rather than module_param_call
    param: update drivers/char/ipmi/ipmi_watchdog.c to new scheme
    param: lock if_sdio's lbs_helper_name and lbs_fw_name against sysfs changes.
    param: lock myri10ge_fw_name against sysfs changes.
    param: simple locking for sysfs-writable charp parameters
    param: remove unnecessary writable charp
    param: add kerneldoc to moduleparam.h
    param: locking for kernel parameters
    param: make param sections const.
    param: use free hook for charp (fix leak of charp parameters)
    param: add a free hook to kernel_param_ops.
    param: silence .init.text references from param ops
    Add param ops struct for hvc_iucv driver.
    nfs: update for module_param_named API change
    AppArmor: update for module_param_named API change
    param: use ops in struct kernel_param, rather than get and set fns directly
    param: move the EXPORT_SYMBOL to after the definitions.
    ...

    Linus Torvalds
     
  • 14a4fa20a   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 ... Browse Code »

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
    ASoC: add AD1980 obsolete information
    ASoC: register cache should be 1 byte aligned for 1 byte long register
    ALSA: hda - Adding support for new IDT 92HD87XX codecs
    ASoC: Fix inverted mute controls for WM8580
    ALSA: HDA: Use model=auto for LG R510
    ALSA: hda - Update model entries in HD-Audio-Models.txt
    ALSA: hda: document VIA models
    ALSA: hda - patch_nvhdmi.c: Add missing codec IDs, unify names
    ALSA: hda - add support for Conexant CX20584
    ALSA: hda - New snd-hda-intel model/pin config for hp dv7-4000
    ALSA: hda - Fix missing stream for second ADC on Realtek ALC260 HDA codec
    ALSA: hda - Make converter setups sticky
    ALSA: hda - Add support for Acer ZGA ALC271 (1025:047c)
    sound/oss: Adjust confusing if indentation
    sound: oss: au1550_ac97.c removed duplicated #include
    ASoC: Fix for changed Eureka Kconfig symbol names

    Linus Torvalds
     

12 Aug, 2010

4 commits

  • dfe86cba7   mmc: add erase, secure erase, trim and secure trim operations ... Browse Code »

    SD/MMC cards tend to support an erase operation. In addition, eMMC v4.4
    cards can support secure erase, trim and secure trim operations that are
    all variants of the basic erase command.

    SD/MMC device attributes "erase_size" and "preferred_erase_size" have been
    added.

    "erase_size" is the minimum size, in bytes, of an erase operation. For
    MMC, "erase_size" is the erase group size reported by the card. Note that
    "erase_size" does not apply to trim or secure trim operations where the
    minimum size is always one 512 byte sector. For SD, "erase_size" is 512
    if the card is block-addressed, 0 otherwise.

    SD/MMC cards can erase an arbitrarily large area up to and
    including the whole card. When erasing a large area it may
    be desirable to do it in smaller chunks for three reasons:

    1. A single erase command will make all other I/O on the card
    wait. This is not a problem if the whole card is being erased, but
    erasing one partition will make I/O for another partition on the
    same card wait for the duration of the erase - which could be a
    several minutes.

    2. To be able to inform the user of erase progress.

    3. The erase timeout becomes too large to be very useful.
    Because the erase timeout contains a margin which is multiplied by
    the size of the erase area, the value can end up being several
    minutes for large areas.

    "erase_size" is not the most efficient unit to erase (especially for SD
    where it is just one sector), hence "preferred_erase_size" provides a good
    chunk size for erasing large areas.

    For MMC, "preferred_erase_size" is the high-capacity erase size if a card
    specifies one, otherwise it is based on the capacity of the card.

    For SD, "preferred_erase_size" is the allocation unit size specified by
    the card.

    "preferred_erase_size" is in bytes.

    Signed-off-by: Adrian Hunter
    Acked-by: Jens Axboe
    Cc: Kyungmin Park
    Cc: Madhusudhan Chikkature
    Cc: Christoph Hellwig
    Cc: Ben Gardiner
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Adrian Hunter
     
  • 7e507eb64   dm: allow autoloading of dm mod ... Browse Code »

    Add devname:mapper/control and MAPPER_CTRL_MINOR module alias
    to support dm-mod module autoloading.

    Signed-off-by: Kay Sievers
    Signed-off-by: Peter Rajnoha
    Signed-off-by: Alasdair G Kergon

    Peter Rajnoha
     
  • 9a94241af   i2c: Add support for custom probe function ... Browse Code »

    The probe method used by i2c_new_probed_device() may not be suitable
    for all cases. Let the caller provide its own, optional probe
    function.

    Signed-off-by: Jean Delvare
    Acked-by: Mauro Carvalho Chehab

    Jean Delvare
     
  • 062e27ec1   Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus:
    Squashfs: fix checkpatch.pl warnings
    Squashfs: fix filename typo
    Squashfs: update Kconfig and documentation for LZO
    Squashfs: fix block size use in LZO decompressor
    Squashfs: Add LZO compression support
    squashfs: fix filename in header comment
    Squashfs: Make XATTR config name consistent with other file systems
    squashfs: fix compiler inline warning

    Linus Torvalds
     

11 Aug, 2010

5 commits