linux-next: manual merge of the net-next tree

[Mark Brown]

Today's linux-next merge of the next-next tree got a conflict in
include/net/dst.h between e87b3998d (net: dst: provide accessor function
to dst->xfrm) in the net tree and a4023dd01 (dst.h: Remove extern from
function prototypes) in net-next.

I've fixed up as below and can carry as required.

diff --cc include/net/dst.h
index 3c4c944,211dcf1..0000000
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@@ -479,22 -478,10 +478,22 @@@ static inline struct dst_entry *xfrm_lo
  {
        return dst_orig;
  } 
 +
 +static inline struct xfrm_state *dst_xfrm(const struct dst_entry *dst)
 +{
 +      return NULL;
 +}
 +
  #else
- extern struct dst_entry *xfrm_lookup(struct net *net, struct dst_entry 
*dst_orig,
-                                    const struct flowi *fl, struct sock *sk,
-                                    int flags);
+ struct dst_entry *xfrm_lookup(struct net *net, struct dst_entry *dst_orig,
+                             const struct flowi *fl, struct sock *sk,
+                             int flags);
 +
 +/* skb attached with this dst needs transformation if dst->xfrm is valid */
 +static inline struct xfrm_state *dst_xfrm(const struct dst_entry *dst)
 +{
 +      return dst->xfrm;
 +}
  #endif
  
  #endif /* _NET_DST_H */

signature.asc
Description: Digital signature