diff options
| author | David S. Miller <davem@davemloft.net> | 2015-07-31 23:52:20 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-07-31 23:52:20 -0700 |
| commit | 5510b3c2a173921374ec847848fb20b98e1c698a (patch) | |
| tree | c9e185281ef17280ce0dc30be7923124874736b0 /fs/btrfs/dev-replace.c | |
| parent | 17f901e8915cb922c2ca710835ef34f166f53ee9 (diff) | |
| parent | 7c764cec3703583247c4ab837c652975a3d41f4b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
arch/s390/net/bpf_jit_comp.c
drivers/net/ethernet/ti/netcp_ethss.c
net/bridge/br_multicast.c
net/ipv4/ip_fragment.c
All four conflicts were cases of simple overlapping
changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/btrfs/dev-replace.c')
| -rw-r--r-- | fs/btrfs/dev-replace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c index 862fbc206755..564a7de17d99 100644 --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c @@ -378,7 +378,7 @@ int btrfs_dev_replace_start(struct btrfs_root *root, ret = btrfs_kobj_add_device(tgt_device->fs_devices, tgt_device); if (ret) - btrfs_error(root->fs_info, ret, "kobj add dev failed"); + btrfs_err(root->fs_info, "kobj add dev failed %d\n", ret); printk_in_rcu(KERN_INFO "BTRFS: dev_replace from %s (devid %llu) to %s started\n", |