Doug / smarc-fsl-linux-kernel

29 Jan, 2013

3 commits

  • 6abb7c257   Merge tag 'regulator-3.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator ... Browse Code »

    Pull regulator fixes from Mark Brown:
    "Fairly small stuff - a build failure fix for ST platforms, an error
    checking fix and an update to the MAINTAINERS file for Liam."

    * tag 'regulator-3.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
    regulator: tps80031: Use IS_ERR to check return value of regulator_register()
    regulators: db8500: Fix compile failure for drivers/regulator/dbx500-prcmu.c
    regulator: MAINTAINERS: update email address

    Linus Torvalds
     
  • 51b919bae   Merge remote-tracking branch 'regulator/fix/lrg' into tmp Browse Code »
    Mark Brown
     
  • 22f837981   Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Browse Code »

    Pull networking updates from David Miller:
    "Much more accumulated than I would have liked due to an unexpected
    bout with a nasty flu:

    1) AH and ESP input don't set ECN field correctly because the
    transport head of the SKB isn't set correctly, fix from Li
    RongQing.

    2) If netfilter conntrack zones are disabled, we can return an
    uninitialized variable instead of the proper error code. Fix from
    Borislav Petkov.

    3) Fix double SKB free in ath9k driver beacon handling, from Felix
    Feitkau.

    4) Remove bogus assumption about netns cleanup ordering in
    nf_conntrack, from Pablo Neira Ayuso.

    5) Remove a bogus BUG_ON in the new TCP fastopen code, from Eric
    Dumazet. It uses spin_is_locked() in it's test and is therefore
    unsuitable for UP.

    6) Fix SELINUX labelling regressions added by the tuntap multiqueue
    changes, from Paul Moore.

    7) Fix CRC errors with jumbo frame receive in tg3 driver, from Nithin
    Nayak Sujir.

    8) CXGB4 driver sets interrupt coalescing parameters only on first
    queue, rather than all of them. Fix from Thadeu Lima de Souza
    Cascardo.

    9) Fix regression in the dispatch of read/write registers in dm9601
    driver, from Tushar Behera.

    10) ipv6_append_data miscalculates header length, from Romain KUNTZ.

    11) Fix PMTU handling regressions on ipv4 routes, from Steffen
    Klassert, Timo Teräs, and Julian Anastasov.

    12) In 3c574_cs driver, add necessary parenthesis to "x << y & z"
    expression. From Nickolai Zeldovich.

    13) macvlan_get_size() causes underallocation netlink message space,
    fix from Eric Dumazet.

    14) Avoid division by zero in xfrm_replay_advance_bmp(), from Nickolai
    Zeldovich. Amusingly the zero check was already there, we were
    just performing it after the modulus :-)

    15) Some more splice bug fixes from Eric Dumazet, which fix things
    mostly eminating from how we now more aggressively use high-order
    pages in SKBs.

    16) Fix size calculation bug when freeing hash tables in the IPSEC
    xfrm code, from Michal Kubecek.

    17) Fix PMTU event propagation into socket cached routes, from Steffen
    Klassert.

    18) Fix off by one in TX buffer release in netxen driver, from Eric
    Dumazet.

    19) Fix rediculous memory allocation requirements introduced by the
    tuntap multiqueue changes, from Jason Wang.

    20) Remove bogus AMD platform workaround in r8169 driver that causes
    major problems in normal operation, from Timo Teräs.

    21) virtio-net set affinity and select queue don't handle
    discontiguous cpu numbers properly, fix from Wanlong Gao.

    22) Fix a route refcounting issue in loopback driver, from Eric
    Dumazet. There's a similar fix coming that we might add to the
    macvlan driver as well.

    23) Fix SKB leaks in batman-adv's distributed arp table code, from
    Matthias Schiffer.

    24) r8169 driver gives descriptor ownership back the hardware before
    we're done reading the VLAN tag out of it, fix from Francois
    Romieu.

    25) Checksums not calculated properly in GRE tunnel driver fix from
    Pravin B Shelar.

    26) Fix SCTP memory leak on namespace exit."

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (101 commits)
    dm9601: support dm9620 variant
    SCTP: Free the per-net sysctl table on net exit. v2
    net: phy: icplus: fix broken INTR pin settings
    net: phy: icplus: Use the RGMII interface mode to configure clock delays
    IP_GRE: Fix kernel panic in IP_GRE with GRE csum.
    sctp: set association state to established in dupcook_a handler
    ip6mr: limit IPv6 MRT_TABLE identifiers
    r8169: fix vlan tag read ordering.
    net: cdc_ncm: use IAD provided by the USB core
    batman-adv: filter ARP packets with invalid MAC addresses in DAT
    batman-adv: check for more types of invalid IP addresses in DAT
    batman-adv: fix skb leak in batadv_dat_snoop_incoming_arp_reply()
    net: loopback: fix a dst refcounting issue
    virtio-net: reset virtqueue affinity when doing cpu hotplug
    virtio-net: split out clean affinity function
    virtio-net: fix the set affinity bug when CPU IDs are not consecutive
    can: pch_can: fix invalid error codes
    can: ti_hecc: fix invalid error codes
    can: c_can: fix invalid error codes
    r8169: remove the obsolete and incorrect AMD workaround
    ...

    Linus Torvalds
     

24 Jan, 2013

2 commits

17 Jan, 2013

2 commits

  • adbbf69d1   MAINTAINERS: Stephen Hemminger email change ... Browse Code »

    I changed my email because the vyatta.com mail server is now
    redirected to brocade.com; and the Brocade mail system
    is not friendly to Linux desktop users.

    Signed-off-by: Stephen Hemminger
    Signed-off-by: David S. Miller

    Stephen Hemminger
     
  • 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
     

16 Jan, 2013

1 commit

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

3 commits