Eric Lee / smarc-fsl-linux-kernel

17 Jan, 2013

1 commit

  • c4ef9bc4f   MAINTAINERS: update email address for Timur Tabi ... Browse Code »

    Timur Tabi no longer works for Freescale, so update the email address
    and status for all of his maintained projects.

    Also mark the QE library as orphaned, for lack of interest in
    maintaining it.

    The CS4270 driver is marked as "Odd Fixes" because appropriate hardware
    is no longer available.

    Signed-off-by: Timur Tabi
    Signed-off-by: Linus Torvalds

    Timur Tabi
     

15 Jan, 2013

1 commit

  • 6843cc0e0   Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Browse Code »

    Pull networking fixes from David Miller:

    1) Fix regression allowing IP_TTL setting of zero, fix from Cong Wang.

    2) Fix leak regressions in tunap, from Jason Wang.

    3) be2net driver always returns IRQ_HANDLED in INTx handler, fix from
    Sathya Perla.

    4) qlge doesn't really support NETIF_F_TSO6, don't set that flag. Fix
    from Amerigo Wang.

    5) Add 802.11ad Atheros wil6210 driver, from Vladimir Kondratiev.

    6) Fix MTU calculations in mac80211 layer, from T Krishna Chaitanya.

    7) Station info layer of mac80211 needs to use del_timer_sync(), from
    Johannes Berg.

    8) tcp_read_sock() can loop forever, because we don't immediately stop
    when recv_actor() returns zero. Fix from Eric Dumazet.

    9) Fix WARN_ON() in tcp_cleanup_rbuf(). We have to use sk_eat_skb() in
    tcp_recv_skb() to handle the case where a large GRO packet is split
    up while it is use by a splice() operation. Fix also from Eric
    Dumazet.

    10) addrconf_get_prefix_route() in ipv6 tests flags incorrectly, it
    does:

    if (X && (p->flags & Y) != 0)

    when it really meant to go:

    if (X && (p->flags & X) != 0)

    fix from Romain Kuntz.

    11) Fix lost Kconfig dependency for bfin_mac driver hardware
    timestamping. From Lars-Peter Clausen.

    12) Fix regression in handling of RST without ACK in TCP, from Eric
    Dumazet.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (37 commits)
    be2net: fix unconditionally returning IRQ_HANDLED in INTx
    tuntap: fix leaking reference count
    tuntap: forbid calling TUNSETIFF when detached
    tuntap: switch to use rtnl_dereference()
    net, wireless: overwrite default_ethtool_ops
    qlge: remove NETIF_F_TSO6 flag
    tcp: accept RST without ACK flag
    net: ethernet: xilinx: Do not use NO_IRQ in axienet
    net: ethernet: xilinx: Do not use axienet on PPC
    bnx2x: Allow management traffic after boot from SAN
    bnx2x: Fix fastpath structures when memory allocation fails
    bfin_mac: Restore hardware time-stamping dependency on BF518
    tun: avoid owner checks on IFF_ATTACH_QUEUE
    bnx2x: move debugging code before the return
    tuntap: refuse to re-attach to different tun_struct
    ipv6: use addrconf_get_prefix_route for prefix route lookup [v2]
    ipv6: fix the noflags test in addrconf_get_prefix_route
    tcp: fix splice() and tcp collapsing interaction
    tcp: splice: fix an infinite loop in tcp_read_sock()
    net: prevent setting ttl=0 via IP_TTL
    ...

    Linus Torvalds
     

12 Jan, 2013

3 commits

10 Jan, 2013

1 commit

08 Jan, 2013

2 commits

05 Jan, 2013

19 commits

04 Jan, 2013

1 commit

  • 2318aa272   Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs ... Browse Code »

    Pull f2fs bug fixes from Jaegeuk Kim:
    "This patch-set includes two major bug fixes:
    - incorrect IUsed provided by *df -i*, and
    - lookup failure of parent inodes in corner cases.

    [Other Bug Fixes]
    - Fix error handling routines
    - Trigger recovery process correctly
    - Resolve build failures due to missing header files

    [Etc]
    - Add a MAINTAINERS entry for f2fs
    - Fix and clean up variables, functions, and equations
    - Avoid warnings during compilation"

    * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs:
    f2fs: unify string length declarations and usage
    f2fs: clean up unused variables and return values
    f2fs: clean up the start_bidx_of_node function
    f2fs: remove unneeded variable from f2fs_sync_fs
    f2fs: fix fsync_inode list addition logic and avoid invalid access to memory
    f2fs: remove unneeded initialization of nr_dirty in dirty_seglist_info
    f2fs: handle error from f2fs_iget_nowait
    f2fs: fix equation of has_not_enough_free_secs()
    f2fs: add MAINTAINERS entry
    f2fs: return a default value for non-void function
    f2fs: invalidate the node page if allocation is failed
    f2fs: add missing #include
    f2fs: do f2fs_balance_fs in front of dir operations
    f2fs: should recover orphan and fsync data
    f2fs: fix handling errors got by f2fs_write_inode
    f2fs: fix up f2fs_get_parent issue to retrieve correct parent inode number
    f2fs: fix wrong calculation on f_files in statfs
    f2fs: remove set_page_dirty for atomic f2fs_end_io_write

    Linus Torvalds
     

31 Dec, 2012

1 commit

  • 8d91a42e5   Merge tag 'omap-late-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc ... Browse Code »

    Pull late ARM cleanups for omap from Olof Johansson:
    "From Tony Lindgren:

    Here are few more patches to finish the omap changes for multiplatform
    conversion that are not strictly fixes, but were too complex to do
    with the dependencies during the merge window. Those are to move of
    serial-omap.h to platform_data, and the removal of remaining
    cpu_is_omap macro usage outside mach-omap2.

    Then there are several trivial fixes for typos and few minimal
    omap2plus_defconfig updates."

    * tag 'omap-late-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    arch/arm/mach-omap2/dpll3xxx.c: drop if around WARN_ON
    OMAP2: Fix a typo - replace regist with register.
    ARM/omap: use module_platform_driver macro
    ARM: OMAP2+: PMU: Remove unused header
    ARM: OMAP4: remove duplicated include from omap_hwmod_44xx_data.c
    ARM: OMAP2+: omap2plus_defconfig: enable twl4030 SoC audio
    ARM: OMAP2+: omap2plus_defconfig: Add tps65217 support
    ARM: OMAP2+: enable devtmpfs and devtmpfs automount
    ARM: OMAP2+: omap_twl: Change TWL4030_MODULE_PM_RECEIVER to TWL_MODULE_PM_RECEIVER
    ARM: OMAP2+: Drop plat/cpu.h for omap2plus
    ARM: OMAP: Split fb.c to remove last remaining cpu_is_omap usage
    MAINTAINERS: Add an entry for omap related .dts files

    Linus Torvalds
     

28 Dec, 2012

1 commit

18 Dec, 2012

7 commits

  • 0edd807dc   MAINTAINERS: add LP855x backlight driver entry ... Browse Code »

    Signed-off-by: Milo(Woogyom) Kim
    Cc: Richard Purdie
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Kim, Milo
     
  • 8f06ce3b5   MAINTAINERS: adjust for UAPI: firewire ... Browse Code »

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

    Stefan Richter
     
  • 5909c654a   Corentin has moved ... Browse Code »

    Signed-off-by: Corentin Chary
    Cc: Matthew Garrett
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Corentin Chary
     
  • ba28853da   MAINTAINERS: remove include/linux/ext3* ... Browse Code »

    Moved to fs/ext3/ext3.h by commit 4613ad180d19 ("ext3: move headers to
    fs/ext3/").

    Signed-off-by: Cesar Eduardo Barros
    Cc: Jan Kara
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Cesar Eduardo Barros
     
  • 9740153c4   MAINTAINERS: CHINESE MAINTAINERS mailing list is subscribers only ... Browse Code »

    Mark it so.

    Signed-off-by: Joe Perches
    Cc: Harry Wei
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • 50f29fbd3   MAINTAINERS: Add an entry for omap related .dts files ... Browse Code »

    All your omap .dts files are belong to us.

    Benoît has been doing a good job picking up most of the
    omap .dts files so far. Let's make sure we both get
    cc:ed for the related patches.

    The .dts patches need to be queued by us as separate
    patches from drivers and other code changes to avoid
    pointless merge conflists like we saw with v3.8
    networking changes.

    Cc: Benoît Cousson
    Signed-off-by: Tony Lindgren

    Tony Lindgren
     
  • 3c2e81ef3   Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux ... Browse Code »

    Pull DRM updates from Dave Airlie:
    "This is the one and only next pull for 3.8, we had a regression we
    found last week, so I was waiting for that to resolve itself, and I
    ended up with some Intel fixes on top as well.

    Highlights:
    - new driver: nvidia tegra 20/30/hdmi support
    - radeon: add support for previously unused DMA engines, more HDMI
    regs, eviction speeds ups and fixes
    - i915: HSW support enable, agp removal on GEN6, seqno wrapping
    - exynos: IPP subsystem support (image post proc), HDMI
    - nouveau: display class reworking, nv20->40 z compression
    - ttm: start of locking fixes, rcu usage for lookups,
    - core: documentation updates, docbook integration, monotonic clock
    usage, move from connector to object properties"

    * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (590 commits)
    drm/exynos: add gsc ipp driver
    drm/exynos: add rotator ipp driver
    drm/exynos: add fimc ipp driver
    drm/exynos: add iommu support for ipp
    drm/exynos: add ipp subsystem
    drm/exynos: support device tree for fimd
    radeon: fix regression with eviction since evict caching changes
    drm/radeon: add more pedantic checks in the CP DMA checker
    drm/radeon: bump version for CS ioctl support for async DMA
    drm/radeon: enable the async DMA rings in the CS ioctl
    drm/radeon: add VM CS parser support for async DMA on cayman/TN/SI
    drm/radeon/kms: add evergreen/cayman CS parser for async DMA (v2)
    drm/radeon/kms: add 6xx/7xx CS parser for async DMA (v2)
    drm/radeon: fix htile buffer size computation for command stream checker
    drm/radeon: fix fence locking in the pageflip callback
    drm/radeon: make indirect register access concurrency-safe
    drm/radeon: add W|RREG32_IDX for MM_INDEX|DATA based mmio accesss
    drm/exynos: support extended screen coordinate of fimd
    drm/exynos: fix x, y coordinates for right bottom pixel
    drm/exynos: fix fb offset calculation for plane
    ...

    Linus Torvalds
     

17 Dec, 2012

1 commit

16 Dec, 2012

1 commit

  • 2b8318881   Merge tag 'fbdev-for-3.8' of git://gitorious.org/linux-omap-dss2/linux ... Browse Code »

    Pull fbdev changes from Tomi Valkeinen:
    "OMAPDSS changes, including:
    - use dynanic debug prints
    - OMAP platform dependency removals
    - Creation of compat-layer, helping us to improve omapdrm
    - Misc cleanups, aiming to make omadss more in line with the upcoming
    common display framework

    Exynos DP changes for the 3.8 merge window:
    - Device Tree support for Samsung Exynos DP
    - SW Link training is cleaned up.
    - HPD interrupt is supported.

    Samsung Framebuffer changes for the 3.8 merge window:
    - The bit definitions of header file are updated.
    - Some minor typos are fixed.
    - Some minor bugs of s3c_fb_check_var() are fixed.

    FB related changes for SH Mobile, Freescale DIU

    Add support for the Solomon SSD1307 OLED Controller"

    * tag 'fbdev-for-3.8' of git://gitorious.org/linux-omap-dss2/linux: (191 commits)
    OMAPDSS: fix TV-out issue with DSI PLL
    Revert "OMAPFB: simplify locking"
    OMAPFB: remove silly loop in fb2display()
    OMAPFB: fix error handling in omapfb_find_best_mode()
    OMAPFB: use devm_kzalloc to allocate omapfb2_device
    OMAPDSS: DISPC: remove dispc fck uses
    OMAPDSS: DISPC: get dss clock rate from dss driver
    drivers/video/console/softcursor.c: remove redundant NULL check before kfree()
    drivers/video: add support for the Solomon SSD1307 OLED Controller
    OMAPDSS: use omapdss_compat_init() in other drivers
    OMAPDSS: export dispc functions
    OMAPDSS: export dss_feat functions
    OMAPDSS: export dss_mgr_ops functions
    OMAPDSS: separate compat files in the Makefile
    OMAPDSS: move display sysfs init to compat layer
    OMAPDSS: DPI: use dispc's check_timings
    OMAPDSS: DISPC: add dispc_ovl_check()
    OMAPDSS: move irq handling to dispc-compat
    OMAPDSS: move omap_dispc_wait_for_irq_interruptible_timeout to dispc-compat.c
    OMAPDSS: move blocking mgr enable/disable to compat layer
    ...

    Conflicts:
    arch/arm/mach-davinci/devices-da8xx.c
    arch/arm/plat-omap/common.c
    drivers/media/platform/omap/omap_vout.c

    Linus Torvalds
     

15 Dec, 2012

1 commit

  • c2714334b   Merge tag 'mvebu' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc ... Browse Code »

    Pull ARM SoC updates for Marvell mvebu/kirkwood from Olof Johansson:
    "This is a branch with updates for Marvell's mvebu/kirkwood platforms.
    They came in late-ish, and were heavily interdependent such that it
    didn't make sense to split them up across the cross-platform topic
    branches. So here they are (for the second release in a row) in a
    branch on their own."

    * tag 'mvebu' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (88 commits)
    arm: l2x0: add aurora related properties to OF binding
    arm: mvebu: add Aurora L2 Cache Controller to the DT
    arm: mvebu: add L2 cache support
    dma: mv_xor: fix error handling path
    dma: mv_xor: fix error checking of irq_of_parse_and_map()
    dma: mv_xor: use request_irq() instead of devm_request_irq()
    dma: mv_xor: clear the window override control registers
    arm: mvebu: fix address decoding armada_cfg_base() function
    ARM: mvebu: update defconfig with I2C and RTC support
    ARM: mvebu: Add SATA support for OpenBlocks AX3-4
    ARM: mvebu: Add support for the RTC in OpenBlocks AX3-4
    ARM: mvebu: Add support for I2C on OpenBlocks AX3-4
    ARM: mvebu: Add support for I2C controllers in Armada 370/XP
    arm: mvebu: Add hardware I/O Coherency support
    arm: plat-orion: Add coherency attribute when setup mbus target
    arm: dma mapping: Export a dma ops function arm_dma_set_mask
    arm: mvebu: Add SMP support for Armada XP
    arm: mm: Add support for PJ4B cpu and init routines
    arm: mvebu: Add IPI support via doorbells
    arm: mvebu: Add initial support for power managmement service unit
    ...

    Linus Torvalds