Eric Lee / smarc-fsl-linux-kernel

27 May, 2010

24 commits

26 May, 2010

16 commits

  • 63a644032   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: update documentation to include description of xattr layout
    squashfs: fix name reading in squashfs_xattr_get
    squashfs: constify xattr handlers
    squashfs: xattr fix sparse warnings
    squashfs: xattr_lookup sparse fix
    squashfs: add xattr support configure option
    squashfs: add new extended inode types
    squashfs: add support for xattr reading
    squashfs: add xattr id support

    Linus Torvalds
     
  • f45471cbd   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid ... Browse Code »

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
    HID: roccat: fix build failure if built as module
    HID: roccat: propagate special events of roccat hardware to userspace
    HID: Add the GYR4101US USB ID to hid-gyration
    HID: fix hid-roccat-kone for bin_attr API change

    Linus Torvalds
     
  • 2214482cb   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:
    ALSA: emu10k1: allow high-resolution mixer controls
    ALSA: pcm: fix delta calculation at boundary wraparound
    ALSA: hda_intel: fix handling of non-completion stream interrupts
    ALSA: usb/caiaq: fix Traktor Kontrol X1 ABS_HAT2X axis
    ALSA: hda: Fix model quirk for Dell M1730
    ALSA: hda - iMac9,1 sound fixes
    ALSA: hda: Use LPIB for Toshiba A100-259
    ALSA: hda: Use LPIB for Acer Aspire 5110
    ALSA: aw2-alsa.c: use pci_ids.h defines and fix checkpatch.pl noise
    ALSA: usb-audio: add support for Akai MPD16
    ALSA: pcm: fix the fix of the runtime->boundary calculation

    Linus Torvalds
     
  • 13da9e200   Revert "endian: #define __BYTE_ORDER" ... Browse Code »

    This reverts commit b3b77c8caef1750ebeea1054e39e358550ea9f55, which was
    also totally broken (see commit 0d2daf5cc858 that reverted the crc32
    version of it). As reported by Stephen Rothwell, it causes problems on
    big-endian machines:

    > In file included from fs/jfs/jfs_types.h:33,
    > from fs/jfs/jfs_incore.h:26,
    > from fs/jfs/file.c:22:
    > fs/jfs/endian24.h:36:101: warning: "__LITTLE_ENDIAN" is not defined

    The kernel has never had that crazy "__BYTE_ORDER == __LITTLE_ENDIAN"
    model. It's not how we do things, and it isn't how we _should_ do
    things. So don't go there.

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

    Linus Torvalds
     
  • 4e89e8f61   nuc900: add maintainer entries for Wan ZongShun ... Browse Code »

    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Wan ZongShun
     
  • 0d2daf5cc   revert "crc32: use __BYTE_ORDER macro for endian detection" ... Browse Code »

    It doesn't work on big-endian - those architectures don't define
    __LITTLE_ENDIAN.

    Cc: Joakim Tjernlund
    Reported-by: Stephen Rothwell
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andrew Morton
     
  • cc68e3be7   fs/fscache/object-list.c: fix warning on 32-bit ... Browse Code »

    fs/fscache/object-list.c: In function 'fscache_objlist_lookup':
    fs/fscache/object-list.c:105: warning: cast to pointer from integer of different size

    Acked-by: David Howells
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andrew Morton
     
  • 3c7b20454   nommu: allow private mappings of read-only devices ... Browse Code »

    Slightly rearrange the logic that determines capabilities and vm_flags.
    Disable BDI_CAP_MAP_DIRECT in all cases if the device can't support the
    protections. Allow private readonly mappings of readonly backing devices.

    Signed-off-by: Bernd Schmidt
    Signed-off-by: Mike Frysinger
    Acked-by: David McCullough
    Acked-by: Greg Ungerer
    Acked-by: Paul Mundt
    Acked-by: David Howells
    Cc: Hugh Dickins
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Bernd Schmidt
     
  • 0cae3457b   mempolicy: ERR_PTR dereference in mpol_shared_policy_init() ... Browse Code »

    The original code called mpol_put(new) while "new" was an ERR_PTR.

    Signed-off-by: Dan Carpenter
    Cc: Lee Schermerhorn
    Cc: KOSAKI Motohiro
    Cc: Christoph Lameter
    Acked-by: David Rientjes
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Dan Carpenter
     
  • d21921215   Merge branch 'fix/hda' into for-linus Browse Code »
    Takashi Iwai
     
  • 899f45303   squashfs: update documentation to include description of xattr layout ... Browse Code »

    Signed-off-by: Phillip Lougher

    Phillip Lougher
     
  • b1cdc4670   Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (63 commits)
    drivers/net/usb/asix.c: Fix pointer cast.
    be2net: Bug fix to avoid disabling bottom half during firmware upgrade.
    proc_dointvec: write a single value
    hso: add support for new products
    Phonet: fix potential use-after-free in pep_sock_close()
    ath9k: remove VEOL support for ad-hoc
    ath9k: change beacon allocation to prefer the first beacon slot
    sock.h: fix kernel-doc warning
    cls_cgroup: Fix build error when built-in
    macvlan: do proper cleanup in macvlan_common_newlink() V2
    be2net: Bug fix in init code in probe
    net/dccp: expansion of error code size
    ath9k: Fix rx of mcast/bcast frames in PS mode with auto sleep
    wireless: fix sta_info.h kernel-doc warnings
    wireless: fix mac80211.h kernel-doc warnings
    iwlwifi: testing the wrong variable in iwl_add_bssid_station()
    ath9k_htc: rare leak in ath9k_hif_usb_alloc_tx_urbs()
    ath9k_htc: dereferencing before check in hif_usb_tx_cb()
    rt2x00: Fix rt2800usb TX descriptor writing.
    rt2x00: Fix failed SLEEP->AWAKE and AWAKE->SLEEP transitions.
    ...

    Linus Torvalds
     
  • ce7d02261   Merge branch 'alpha-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6 ... Browse Code »

    * 'alpha-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
    alpha: simplify and optimize sched_find_first_bit
    alpha: invoke oom-killer from page fault
    Convert alpha to use clocksources instead of arch_gettimeoffset

    Linus Torvalds
     
  • b142ebb61   Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
    driver core: add devname module aliases to allow module on-demand auto-loading

    Linus Torvalds
     
  • 218ce7351   Revert "module: drop the lock while waiting for module to complete initialization." ... Browse Code »

    This reverts commit 480b02df3aa9f07d1c7df0cd8be7a5ca73893455, since
    Rafael reports that it causes occasional kernel paging request faults in
    load_module().

    Dropping the module lock and re-taking it deep in the call-chain is
    definitely not the right thing to do. That just turns the mutex from a
    lock into a "random non-locking data structure" that doesn't actually
    protect what it's supposed to protect.

    Requested-and-tested-by: Rafael J. Wysocki
    Cc: Rusty Russell
    Cc: Brandon Philips
    Cc: Andrew Morton
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • f925b1303   drivers/net/usb/asix.c: Fix pointer cast. ... Browse Code »

    Stephen Rothwell reports the following new warning:

    drivers/net/usb/asix.c: In function 'asix_rx_fixup':
    drivers/net/usb/asix.c:325: warning: cast from pointer to integer of different size
    drivers/net/usb/asix.c:354: warning: cast from pointer to integer of different size

    The code just cares about the low alignment bits, so use
    an "unsigned long" cast instead of one to "u32".

    Signed-off-by: David S. Miller

    David S. Miller