From: Alex Shi <alex.shi@linaro.org>
Date: Thu, 21 Apr 2016 06:08:44 +0000 (+0800)
Subject: Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
X-Git-Tag: firefly_0821_release~176^2~405
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bab15641824ad77e5f3af9cc4b84308cba32aa7d;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

Conflicts:
	d_canonical_path in include/linux/dcache.h
---

bab15641824ad77e5f3af9cc4b84308cba32aa7d
diff --cc include/linux/dcache.h
index e7041ec48af8,f513dd855cb2..e4221f7c5b53
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@@ -161,7 -161,7 +161,8 @@@ struct dentry_operations 
  	struct vfsmount *(*d_automount)(struct path *);
  	int (*d_manage)(struct dentry *, bool);
  	struct inode *(*d_select_inode)(struct dentry *, unsigned);
 +	void (*d_canonical_path)(const struct dentry *, struct path *);
+ 	struct dentry *(*d_real)(struct dentry *, struct inode *);
  } ____cacheline_aligned;
  
  /*
diff --cc net/ipv6/exthdrs_core.c
index 835ec57c233b,9508a20fbf61..840a4388f860
--- a/net/ipv6/exthdrs_core.c
+++ b/net/ipv6/exthdrs_core.c
@@@ -253,14 -253,15 +253,18 @@@ int ipv6_find_hdr(const struct sk_buff 
  				if (target < 0 &&
  				    ((!ipv6_ext_hdr(hp->nexthdr)) ||
  				     hp->nexthdr == NEXTHDR_NONE)) {
 -					if (fragoff)
 +					if (fragoff) {
  						*fragoff = _frag_off;
 -					return hp->nexthdr;
 +						return hp->nexthdr;
 +					} else {
 +						return -EINVAL;
 +					}
  				}
- 				return -ENOENT;
+ 				if (!found)
+ 					return -ENOENT;
+ 				if (fragoff)
+ 					*fragoff = _frag_off;
+ 				break;
  			}
  			hdrlen = 8;
  		} else if (nexthdr == NEXTHDR_AUTH) {