From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Or Gerlitz <ogerlitz@mellanox•com>
Cc: Doug Ledford <dledford@redhat•com>,
David Miller <davem@davemloft•net>,
netdev@vger•kernel.org, linux-next@vger•kernel.org,
linux-kernel@vger•kernel.org,
Saeed Mahameed <saeedm@mellanox•com>,
Achiad Shochat <achiad@mellanox•com>,
Matan Barak <matanb@mellanox•com>,
Leon Romanovsky <leonro@mellanox•com>
Subject: Re: linux-next: manual merge of the rdma tree with the net-next tree
Date: Wed, 6 Jan 2016 07:51:31 +1100 [thread overview]
Message-ID: <20160106075131.4f7f0608@canb.auug.org.au> (raw)
In-Reply-To: <568BF7D4.8080304@mellanox.com>
Hi Or,
On Tue, 5 Jan 2016 19:05:24 +0200 Or Gerlitz <ogerlitz@mellanox•com> wrote:
>
> On 1/5/2016 3:51 AM, Stephen Rothwell wrote:
> > Hi Doug,
> >
> > Today's linux-next merge of the rdma tree got conflicts in:
> >
> > drivers/net/ethernet/mellanox/mlx5/core/vport.c
> > include/linux/mlx5/mlx5_ifc.h
> > include/linux/mlx5/vport.h
> >
> > between commits:
> >
> > e1d7d349c69d ("net/mlx5: Update access functions to Query/Modify vport MAC address")
> > e75465148b7d ("net/mlx5: Introduce access functions to modify/query vport state")
> >
> > from the net-next tree and commit:
> >
> > e5f6175c5b66 ("net/mlx5_core: Break down the vport mac address query function")
> >
> > from the rdma tree and maybe some others.
> >
> > I have no hope of fixing this stuff up, so I have dropped the rdma tree
> > again for today. There is similar functionality being introduced in
> > both trees ... please sort this mess out ...
>
> Hi Stephen,
>
> Saeed/Matan and Co are working here on a fix which would solve the
> conflict.
Wonderful.
> We have the basic patch and people will be testing it later/tomorrow.
>
> Could you please advice how would it be possible to provide you the
> git rerere output -- the pre-image and post-images files from .git/rr-cache?
Just send me a (private) email (no need to bother the list) with the
pre and post image files attached, thanks.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
next prev parent reply other threads:[~2016-01-05 20:51 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-05 1:51 linux-next: manual merge of the rdma tree with the net-next tree Stephen Rothwell
2016-01-05 17:05 ` Or Gerlitz
2016-01-05 20:51 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-03-16 0:58 Stephen Rothwell
2016-03-16 14:27 ` Maor Gottlieb
2016-03-16 17:18 ` Linus Torvalds
2016-03-16 17:35 ` Doug Ledford
2016-03-16 17:44 ` Linus Torvalds
2016-03-23 23:04 ` Or Gerlitz
2016-03-23 23:23 ` Linus Torvalds
2016-03-16 20:52 ` Stephen Rothwell
2016-03-16 21:01 ` Linus Torvalds
2016-03-16 21:15 ` Andrew Lunn
2016-03-16 22:35 ` Stephen Rothwell
2015-08-28 1:26 Stephen Rothwell
2015-08-28 6:35 ` Jiri Pirko
2015-06-17 3:20 Michael Ellerman
2015-06-15 8:12 Michael Ellerman
2015-06-15 8:11 Michael Ellerman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160106075131.4f7f0608@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=achiad@mellanox$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=dledford@redhat$(echo .)com \
--cc=leonro@mellanox$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=matanb@mellanox$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=ogerlitz@mellanox$(echo .)com \
--cc=saeedm@mellanox$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox