commit cb097ef4c40af67ebe726d5da5c25d5bccb5658b
Author: Raja Sivaramakrishnan <raja@juniper.net>
Date:   Mon Oct 6 15:47:48 2014 -0700

    Ensure "scons vrouter" builds uvrouter and utils too (to avoid build breaks)

    Fixes bug 1374188.

commit 9c97927bff3f50f462570a83b7d45a570c58c9be
Author: Divakar <ddivakar@juniper.net>
Date:   Sun Oct 5 02:28:37 2014 -0700

    Bug:#1377581. Formatting Bridge table display

commit ff17558202d5c4b288b0443756025224e656c584
Author: Divakar <ddivakar@juniper.net>
Date:   Mon Sep 29 09:37:07 2014 -0700

    Fix for https://bugs.launchpad.net/juniperopenstack/+bug/1372262 a separate port list of link local ser

commit e457cab426f370476bc24c14e63d49ae30d1cbd3
Author: Wojciech Zmuda <woz@semihalf.com>
Date:   Mon Sep 29 16:30:11 2014 +0200

    Fix "symbol vrouter_dbg undefined" and "symbol vr_inet_vrf_stats undefined" errors.
    Errors occured while loading vrouter.ko module on FreeBSD.

commit 78306f449e0de38f572d50044c8b98d49cda9a0b
Author: Wojciech Zmuda <woz@semihalf.com>
Date:   Wed Sep 24 10:49:11 2014 +0200

    Fix coding-style and formatting of latest commit.
    Author: Wojciech Zmuda

commit f6f8f7930918808d3be33d6df9033ea2b73ab0da
Author: Ganesan Prabhakaran <gprabhak@juniper.net>
Date:   Thu Sep 25 16:21:10 2014 -0700

    Fix build issue in mainline

commit 23a2aac703cc2b781ee94e15fe740dead85b72a9
Author: ashoksingh <ashoksr@juniper.net>
Date:   Thu Sep 25 17:32:56 2014 +0530

    IPv6 changes
    (on behalf of Prabhakaran)

commit c6bab0328707c3fe4d9ce8d18a73e9e40c1a0bc5
Author: anandhk-juniper <anandhk@juniper.net>
Date:   Thu Sep 25 00:49:21 2014 +0530

    Fix compilation failure for ubuntu 3.13.0-36-generic (and above)

    From 3.13.0-36, ubuntu did

    while keeping the kernel version the same as 3.13.0-32. The only option
    that was left then was to check for definition of skb_get_rxhash
    Closes Bug:1373574

Change-Id: I55ed2fa036d4a0a68de9386ff7c9cf5d91bb1ef5
Disable GSO on vhost0 as there are issues with agent restart (due to a
vrouter issue which results in skb gso_size being reset to 0 when packets
are trapped to the agent)

Fixes bug 1379240

Change-Id: If09c0c24a48a93e9463abd175993d99cecd4ecf2
Closes-Bug: #1375976. If the packets received to Vrouter are on service isntance interface they are forced to L3 processing even if destination MAC of the packet does not match the VIF's MAC to enable service chaining

Change-Id: I0bcc2a9fb1b894671de7c265a7f57b980ae00ac9
Closes-Bug: #1380904. Treat Vlan tagged IP packets from VM as L2 packets. L3 well know packets and ARP packets are not processed any more in L3 block and are subjected to L2 looksup so that they are L2 bridged

Change-Id: Ie3e976d6f1a27b2be585096404d626714694bedd
Merge "Closes-Bug: #1375976. If the packets received to Vrouter are on service isntance interface they are forced to L3 processing even if destination MAC of the packet does not match the VIF's MAC to enable service chaining"
Pull in headers before checking if the packet is V4 or V6. Adjust pull_len appropriately and refresh header pointers after skb_may_pull

Change-Id: I2e07418720f69c7fa9b34ffe5a4f4753c34a38ed
Bug:#1381980 Vmware Changes 1)Tagging the ARP response with right vlan 2)Identiying the sub interface by doing VIF bridge lookup and by llking into sub interfaces 3)Correcting the VIF_TYPE everywhere 4) Inserting the Vlan tag in linux_rx_handler for ubuntu in the packet 5) Defining IP6OIP to differentiate v6 packets in tunnels

Change-Id: I975aa7a649687fa15b22371ae7842fa3f57c9169
Merge "Pull in headers before checking if the packet is V4 or V6. Adjust pull_len appropriately and refresh header pointers after skb_may_pull"
Merge remote-tracking branch 'upstream/master'

Conflicts:
	dp-core/vr_datapath.c
	dp-core/vr_nexthop.c
	linux/vrouter_mod.c
	utils/rt.c