Eric Lee / smarc-fsl-linux-kernel

07 Dec, 2011

1 commit

09 Nov, 2011

28 commits

07 Nov, 2011

1 commit

  • 32aaeffbd   Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux ... Browse Code »

    * 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
    Revert "tracing: Include module.h in define_trace.h"
    irq: don't put module.h into irq.h for tracking irqgen modules.
    bluetooth: macroize two small inlines to avoid module.h
    ip_vs.h: fix implicit use of module_get/module_put from module.h
    nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
    include: replace linux/module.h with "struct module" wherever possible
    include: convert various register fcns to macros to avoid include chaining
    crypto.h: remove unused crypto_tfm_alg_modname() inline
    uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
    pm_runtime.h: explicitly requires notifier.h
    linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
    miscdevice.h: fix up implicit use of lists and types
    stop_machine.h: fix implicit use of smp.h for smp_processor_id
    of: fix implicit use of errno.h in include/linux/of.h
    of_platform.h: delete needless include
    acpi: remove module.h include from platform/aclinux.h
    miscdevice.h: delete unnecessary inclusion of module.h
    device_cgroup.h: delete needless include
    net: sch_generic remove redundant use of
    net: inet_timewait_sock doesnt need
    ...

    Fix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in
    - drivers/media/dvb/frontends/dibx000_common.c
    - drivers/media/video/{mt9m111.c,ov6650.c}
    - drivers/mfd/ab3550-core.c
    - include/linux/dmaengine.h

    Linus Torvalds
     

05 Nov, 2011

1 commit

  • b4fdcb02f   Merge branch 'for-3.2/core' of git://git.kernel.dk/linux-block ... Browse Code »

    * 'for-3.2/core' of git://git.kernel.dk/linux-block: (29 commits)
    block: don't call blk_drain_queue() if elevator is not up
    blk-throttle: use queue_is_locked() instead of lockdep_is_held()
    blk-throttle: Take blkcg->lock while traversing blkcg->policy_list
    blk-throttle: Free up policy node associated with deleted rule
    block: warn if tag is greater than real_max_depth.
    block: make gendisk hold a reference to its queue
    blk-flush: move the queue kick into
    blk-flush: fix invalid BUG_ON in blk_insert_flush
    block: Remove the control of complete cpu from bio.
    block: fix a typo in the blk-cgroup.h file
    block: initialize the bounce pool if high memory may be added later
    block: fix request_queue lifetime handling by making blk_queue_cleanup() properly shutdown
    block: drop @tsk from attempt_plug_merge() and explain sync rules
    block: make get_request[_wait]() fail if queue is dead
    block: reorganize throtl_get_tg() and blk_throtl_bio()
    block: reorganize queue draining
    block: drop unnecessary blk_get/put_queue() in scsi_cmd_ioctl() and blk_get_tg()
    block: pass around REQ_* flags instead of broken down booleans during request alloc/free
    block: move blk_throtl prototypes to block/blk.h
    block: fix genhd refcounting in blkio_policy_parse_and_set()
    ...

    Fix up trivial conflicts due to "mddev_t" -> "struct mddev" conversion
    and making the request functions be of type "void" instead of "int" in
    - drivers/md/{faulty.c,linear.c,md.c,md.h,multipath.c,raid0.c,raid1.c,raid10.c,raid5.c}
    - drivers/staging/zram/zram_drv.c

    Linus Torvalds
     

01 Nov, 2011

1 commit

25 Oct, 2011

5 commits

  • 7670c7010   Merge branch 'for-linus' of git://github.com/gregungerer/m68knommu ... Browse Code »

    * 'for-linus' of git://github.com/gregungerer/m68knommu:
    m68k: drop unused Kconfig symbols
    m68k: drop unused Kconfig symbols
    m68knommu: create common externs for _ram* vars
    m68knommu: remove extern declarations of memory_start/memory_end from mm/init
    m68knommu: use generic section names in mm/init code
    m68knommu: use generic section names in setup code
    m68k: merge the mmu and non-mmu traps.c files
    m68k: move hardware vector setting from traps.c to its own file
    m68k: merge mmu and non-mmu include/asm/entry.h files
    m68k: merge the mmu and non-mmu kernel/Makefiles
    m68k: merge mmu and non-mmu arch Makefiles
    m68k: reorganize Kconfig options to improve mmu/non-mmu selections
    m68knommu: fix problems with SPI/GPIO on ColdFire 520x
    m68k: fix memcpy to unmatched/unaligned source and dest on 68000

    Linus Torvalds
     
  • 59e525341   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: (59 commits)
    MAINTAINERS: linux-m32r is moderated for non-subscribers
    linux@lists.openrisc.net is moderated for non-subscribers
    Drop default from "DM365 codec select" choice
    parisc: Kconfig: cleanup Kernel page size default
    Kconfig: remove redundant CONFIG_ prefix on two symbols
    cris: remove arch/cris/arch-v32/lib/nand_init.S
    microblaze: add missing CONFIG_ prefixes
    h8300: drop puzzling Kconfig dependencies
    MAINTAINERS: microblaze-uclinux@itee.uq.edu.au is moderated for non-subscribers
    tty: drop superfluous dependency in Kconfig
    ARM: mxc: fix Kconfig typo 'i.MX51'
    Fix file references in Kconfig files
    aic7xxx: fix Kconfig references to READMEs
    Fix file references in drivers/ide/
    thinkpad_acpi: Fix printk typo 'bluestooth'
    bcmring: drop commented out line in Kconfig
    btmrvl_sdio: fix typo 'btmrvl_sdio_sd6888'
    doc: raw1394: Trivial typo fix
    CIFS: Don't free volume_info->UNC until we are entirely done with it.
    treewide: Correct spelling of successfully in comments
    ...

    Linus Torvalds
     
  • bc74ee976   m68k: Finally remove leftover markers sections ... Browse Code »

    Markers have removed already twice:

    1: fc5377668c3d808e1d53c4aee152c836f55c3490
    2: eb878b3bc0349344dbf70c51bf01fc734d5cf2d3

    But a little bit is still here.

    Signed-off-by: Tkhai Kirill
    Signed-off-by: Geert Uytterhoeven

    Kirill Tkhai
     
  • 8b223432f   m68k/mac: Fix mac_irq_pending() for PSC MACE and SCC ... Browse Code »

    Add missing return statement. The docs say that the level 4 PSC IRQs
    relate to MACE DMA and SCC. Since those drivers don't call
    mac_irq_pending() this patch has no affect. But it should be fixed all the
    same, since it can be useful for MACE debugging.

    Signed-off-by: Finn Thain
    Signed-off-by: Geert Uytterhoeven

    Finn Thain
     
  • 75a23850c   m68k/mac: Fix compiler warning in via_read_time() ... Browse Code »

    The algorithm described in the comment compares two reads from the RTC but
    the code actually reads once and compares the result to an uninitialized
    value. This causes the compiler to warn, "last_result maybe used
    uninitialized". Make the code match the comment, fix the warning and
    perhaps improve reliability. Tested on a Quadra 700.

    Signed-off-by: Finn Thain
    Signed-off-by: Geert Uytterhoeven

    Finn Thain
     

21 Oct, 2011

2 commits

19 Oct, 2011

1 commit