2016-03-01 22:33:12

by David Miller

Subject: Re: [net-next][PATCH v2 00/13] RDS: Major clean-up with couple of new features for 4.6

When I try to apply this series, it (strangely) fails on the first patch with:

Applying: RDS: Drop stale iWARP RDMA transport
error: removal patch leaves file contents
error: net/rds/iw.c: patch does not apply
error: removal patch leaves file contents
error: net/rds/iw.h: patch does not apply
error: removal patch leaves file contents
error: net/rds/iw_cm.c: patch does not apply
error: removal patch leaves file contents
error: net/rds/iw_rdma.c: patch does not apply
error: removal patch leaves file contents
error: net/rds/iw_recv.c: patch does not apply
error: removal patch leaves file contents
error: net/rds/iw_ring.c: patch does not apply
error: removal patch leaves file contents
error: net/rds/iw_send.c: patch does not apply
error: removal patch leaves file contents
error: net/rds/iw_stats.c: patch does not apply
error: removal patch leaves file contents
error: net/rds/iw_sysctl.c: patch does not apply

Please sort this out and respin, thanks.

2016-03-01 23:09:49

by Santosh Shilimkar

Subject: Re: [net-next][PATCH v2 00/13] RDS: Major clean-up with couple of new features for 4.6

On 3/1/2016 2:33 PM, David Miller wrote:
>
> When I try to apply this series, it (strangely) fails on the first patch with:
>
Strange indeed since patches and the tree is against net-next.

> Applying: RDS: Drop stale iWARP RDMA transport
> error: removal patch leaves file contents
This patch has file removals and looks like git am/apply won't
work when patch is formatted with "-D". Its good
for review but didn't realize it will create problem for
apply. Sorry for that but I didn't know this issue.

git merge or pull seems to work though when tried from branch
directly.

>
> Please sort this out and respin, thanks.
>
OK. Will send the same series again just with first
patch generated without -D option. Thanks !!

Regards,
Santosh