On Tue, Jun 08, 2021 at 11:19:58PM +0000, Saleem, Shiraz wrote:
> > Subject: Re: [PATCH rdma-next v1] irdma: Use list_last_entry/list_first_entry
> >
> > On Tue, Jun 08, 2021 at 04:14:16PM -0500, Shiraz Saleem wrote:
> > > Use list_last_entry and list_first_entry instead of using prev and
> > > next pointers.
> > >
> > > Reported-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
> > > Signed-off-by: Shiraz Saleem <shiraz.saleem@xxxxxxxxx>
> > > v0->v1: create patch on more recent git version
> > >
> > > drivers/infiniband/hw/irdma/puda.c | 2 +-
> > > drivers/infiniband/hw/irdma/utils.c | 4 ++--
> > > 2 files changed, 3 insertions(+), 3 deletions(-)
> >
> > This still doesn't apply to the rdma tree.. You need to use the exact rdma tree, not
> > wherever this came from.
> >
> > Anyhow I fixed it up by hand.
> >
>
> I am not really sure what is going on. This applies cleanly for me
> to the tip of for-next.
It is git magic because you have the right blobs and I don't
> diff --git a/drivers/infiniband/hw/irdma/utils.c b/drivers/infiniband/hw/irdma/utils.c
> index 8f04347be52c..b4b91cb81cca 100644
^^^^^^^^^^^^
This is the right blob, but the v1 from before had this:
index 8ce3535cdc21..81e590fb77b1 100644
And I don't have 8ce3535cdc21 at all. So git gives up if things aren't
a perfect match.
You have 8ce3535cdc21 so when you tried to apply your own patch it
would have done a 3 way merge and fixed it.
This is why it is important to actually generate diffs against common
commits that other people have because it allows git magic to work
properly. Even if the diffs are nearly identical having the blob be
correct covers alot of sins.
What I tell other people to do is publish everything they send in a
branch in a git repo and I then just keep a local copy of it up to
date and get the needed stuff from there.
Jason
