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

Conflicts:
	d_canonical_path in include/linux/dcache.h

diff --cc drivers/net/tun.c
Simple merge

diff --cc fs/dcache.c
Simple merge

diff --cc fs/ext4/ext4.h
Simple merge

diff --cc include/linux/dcache.h
index e7041ec48af8557c26dc3113fc7c9b853668e897,f513dd855cb2154495628681aeb154184dc42550..e4221f7c5b53a82492a2a03ac5d47bcd93d3ee5e
--- 1/include/linux/dcache.h
--- 2/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/ipv4/devinet.c
Simple merge

diff --cc net/ipv4/fib_frontend.c
Simple merge

diff --cc net/ipv4/ip_output.c
Simple merge

diff --cc net/ipv4/tcp_ipv4.c
Simple merge

diff --cc net/ipv4/udp.c
Simple merge

diff --cc net/ipv6/exthdrs_core.c
index 835ec57c233b64dcb8a789975d52cb8f0c749d66,9508a20fbf61432f561202edbe40b59e63c3489e..840a4388f860dc713431be32f3193332533024f2
--- 1/net/ipv6/exthdrs_core.c
--- 2/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) {

diff --cc net/ipv6/udp.c
Simple merge