diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-04-27 15:43:10 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-27 15:43:10 -0400 |
| commit | c0cc53162a0644dd57dce5e2fbb9bbafdc57d183 (patch) | |
| tree | 02393c85628c6ec7d0d942e880623b7f37cf3460 /include/linux/devpts_fs.h | |
| parent | net: ipv6: Use passed in table for nexthop lookups (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-dev-c0cc53162a0644dd57dce5e2fbb9bbafdc57d183.tar.xz linux-dev-c0cc53162a0644dd57dce5e2fbb9bbafdc57d183.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor overlapping changes in the conflicts.
In the macsec case, the change of the default ID macro
name overlapped with the 64-bit netlink attribute alignment
fixes in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/devpts_fs.h')
| -rw-r--r-- | include/linux/devpts_fs.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/devpts_fs.h b/include/linux/devpts_fs.h index 358a4db72a27..5871f292b596 100644 --- a/include/linux/devpts_fs.h +++ b/include/linux/devpts_fs.h @@ -27,11 +27,11 @@ int devpts_new_index(struct pts_fs_info *); void devpts_kill_index(struct pts_fs_info *, int); /* mknod in devpts */ -struct inode *devpts_pty_new(struct pts_fs_info *, dev_t, int, void *); +struct dentry *devpts_pty_new(struct pts_fs_info *, int, void *); /* get private structure */ -void *devpts_get_priv(struct inode *pts_inode); +void *devpts_get_priv(struct dentry *); /* unlink */ -void devpts_pty_kill(struct inode *inode); +void devpts_pty_kill(struct dentry *); #endif |