Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/ethernet/rocker/rocker.c

The rocker commit was two overlapping changes, one to rename
the ->vport member to ->pport, and another making the bitmask
expression use '1ULL' instead of plain '1'.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 2 deletions

diff --git a/fs/hppfs/hppfs.c b/fs/hppfs/hppfs.c
index 5f2755117ce7..043ac9d77262 100644
--- a/fs/hppfs/hppfs.c
+++ b/fs/hppfs/hppfs.c
@@ -678,10 +678,10 @@ static struct inode *get_inode(struct super_block *sb, struct dentry *dentry)
                 return NULL;
         }
 
-        if (S_ISDIR(dentry->d_inode->i_mode)) {
+        if (d_is_dir(dentry)) {
                 inode->i_op = &hppfs_dir_iops;
                 inode->i_fop = &hppfs_dir_fops;
-        } else if (S_ISLNK(dentry->d_inode->i_mode)) {
+        } else if (d_is_symlink(dentry)) {
                 inode->i_op = &hppfs_link_iops;
                 inode->i_fop = &hppfs_file_fops;
         } else {