From: David S. Miller Date: Tue, 9 Dec 2014 23:24:56 +0000 (-0500) Subject: Merge branch 'bridge_mode' X-Git-Tag: omap-for-v3.19/fixes-rc1~125^2~27 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=627103797189e4e423848e1b2e2c4af879cb33ac;hp=4a5fdfe8b3669070112105573f2d7c487ec7ad0d;p=pandora-kernel.git Merge branch 'bridge_mode' Roopa Prabhu says: ==================== remove bridge mode BRIDGE_MODE_SWDEV BRIDGE_MODE_SWDEV was introduced to indicate switchdev offloads for bridging from user space (In other words to call into the hw switch port driver directly). But user can use existing BRIDGE_FLAGS_SELF to call into the hw switch port driver today. swdev mode is not required anymore. So, this patch removes it. v4 - v5 incorporate comments - Define BRIDGE_MODE_UNDEF to handle cases where mode is not defined - reverse the order of patches - include patch comments in all patches ==================== Signed-off-by: Roopa Prabhu Signed-off-by: David S. Miller ---