diff options
| author | David S. Miller <davem@davemloft.net> | 2016-02-23 06:09:14 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-02-23 06:09:14 +0100 |
| commit | b633353115e352d3c31c12d4c61978c810f05ea1 (patch) | |
| tree | 055174a1b31a3e10fd2c505788fe6487b0028d00 /fs/btrfs/delayed-inode.h | |
| parent | tools, bpf_asm: simplify parser rule for BPF extensions (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-b633353115e352d3c31c12d4c61978c810f05ea1.tar.xz linux-b633353115e352d3c31c12d4c61978c810f05ea1.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/phy/bcm7xxx.c
drivers/net/phy/marvell.c
drivers/net/vxlan.c
All three conflicts were cases of simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/btrfs/delayed-inode.h')
| -rw-r--r-- | fs/btrfs/delayed-inode.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h index f70119f25421..0167853c84ae 100644 --- a/fs/btrfs/delayed-inode.h +++ b/fs/btrfs/delayed-inode.h @@ -144,7 +144,7 @@ void btrfs_put_delayed_items(struct list_head *ins_list, int btrfs_should_delete_dir_index(struct list_head *del_list, u64 index); int btrfs_readdir_delayed_dir_index(struct dir_context *ctx, - struct list_head *ins_list); + struct list_head *ins_list, bool *emitted); /* for init */ int __init btrfs_delayed_inode_init(void); |