Eric Lee / smarc-fsl-linux-kernel

13 Jan, 2012

1 commit

10 Jan, 2012

1 commit

  • 12e555089   Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging ... Browse Code »

    * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (466 commits)
    net/hyperv: Add support for jumbo frame up to 64KB
    net/hyperv: Add NETVSP protocol version negotiation
    net/hyperv: Remove unnecessary kmap_atomic in netvsc driver
    staging/rtl8192e: Register against lib80211
    staging/rtl8192e: Convert to lib80211_crypt_info
    staging/rtl8192e: Convert to lib80211_crypt_data and lib80211_crypt_ops
    staging/rtl8192e: Add lib80211.h to rtllib.h
    staging/mei: add watchdog device registration wrappers
    drm/omap: GEM, deal with cache
    staging: vt6656: int.c, int.h: Change return of function to void
    staging: usbip: removed unused definitions from header
    staging: usbip: removed dead code from receive function
    staging:iio: Drop {mark,unmark}_in_use callbacks
    staging:iio: Drop buffer mark_param_change callback
    staging:iio: Drop the unused buffer enable() and is_enabled() callbacks
    staging:iio: Drop buffer busy flag
    staging:iio: Make sure a device is only opened once at a time
    staging:iio: Disallow modifying buffer size when buffer is enabled
    staging:iio: Disallow changing scan elements in all buffered modes
    staging:iio: Use iio_buffer_enabled instead of open coding it
    ...

    Fix up conflict in drivers/staging/iio/adc/ad799x_core.c (removal of
    module_init due to using module_i2c_driver() helper, next to removal of
    MODULE_ALIAS due to using MODULE_DEVICE_TABLE instead).

    Linus Torvalds
     

09 Jan, 2012

1 commit

  • 98793265b   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial ... Browse Code »

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits)
    Kconfig: acpi: Fix typo in comment.
    misc latin1 to utf8 conversions
    devres: Fix a typo in devm_kfree comment
    btrfs: free-space-cache.c: remove extra semicolon.
    fat: Spelling s/obsolate/obsolete/g
    SCSI, pmcraid: Fix spelling error in a pmcraid_err() call
    tools/power turbostat: update fields in manpage
    mac80211: drop spelling fix
    types.h: fix comment spelling for 'architectures'
    typo fixes: aera -> area, exntension -> extension
    devices.txt: Fix typo of 'VMware'.
    sis900: Fix enum typo 'sis900_rx_bufer_status'
    decompress_bunzip2: remove invalid vi modeline
    treewide: Fix comment and string typo 'bufer'
    hyper-v: Update MAINTAINERS
    treewide: Fix typos in various parts of the kernel, and fix some comments.
    clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR
    gpio: Kconfig: drop unknown symbol 'CS5535_GPIO'
    leds: Kconfig: Fix typo 'D2NET_V2'
    sound: Kconfig: drop unknown symbol ARCH_CLPS7500
    ...

    Fix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new
    kconfig additions, close to removed commented-out old ones)

    Linus Torvalds
     

17 Dec, 2011

1 commit

14 Dec, 2011

25 commits

10 Dec, 2011

1 commit

09 Dec, 2011

8 commits

02 Dec, 2011

1 commit

28 Nov, 2011

1 commit

  • dfd8ee92a   Staging: comedi: fix integer overflow in do_insnlist_ioctl() ... Browse Code »

    There is a potential integer overflow in do_insnlist_ioctl() if
    userspace passes in a large insnlist.n_insns. The call to kmalloc()
    would allocate a small buffer, leading to a memory corruption.

    The bug was reported by Dan Carpenter
    and Haogang Chen . The patch was suggested by
    Ian Abbott and Lars-Peter Clausen .

    Reported-by: Dan Carpenter
    Reported-by: Haogang Chen .
    Cc: Ian Abbott
    Cc: Lars-Peter Clausen
    Signed-off-by: Xi Wang
    Signed-off-by: Greg Kroah-Hartman

    Xi Wang