Merge branch 'upstream' into bugfix-video

Update bugfix-video branch to 2.5-rc1
so I don't have to again resolve the
conflict in these patches vs. upstream.

Conflicts:
	drivers/gpu/drm/gma500/psb_drv.c

	text conflict: add comment vs delete neighboring line

	keep just this:
	/* igd_opregion_init(&dev_priv->opregion_dev); */
	/* acpi_video_register(); */

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 2 insertions, 0 deletions

diff --git a/include/net/ipip.h b/include/net/ipip.h
index a32654d52730..a93cf6d7e94b 100644
--- a/include/net/ipip.h
+++ b/include/net/ipip.h
@@ -54,8 +54,10 @@ struct ip_tunnel_prl_entry {
                                                                         \
         err = ip_local_out(skb);                                        \
         if (likely(net_xmit_eval(err) == 0)) {                          \
+                u64_stats_update_begin(&(stats1)->syncp);               \
                 (stats1)->tx_bytes += pkt_len;                          \
                 (stats1)->tx_packets++;                                 \
+                u64_stats_update_end(&(stats1)->syncp);                 \
         } else {                                                        \
                 (stats2)->tx_errors++;                                  \
                 (stats2)->tx_aborted_errors++;                          \