From: Jiri Pirko <jiri@resnulli•us>
To: Stephen Rothwell <sfr@canb•auug.org.au>
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, Matan Barak <matanb@mellanox•com>,
Jiri Pirko <jiri@mellanox•com>
Subject: Re: linux-next: manual merge of the rdma tree with the net-next tree
Date: Fri, 28 Aug 2015 08:35:15 +0200 [thread overview]
Message-ID: <20150828063515.GA2156@nanopsycho.orion> (raw)
In-Reply-To: <20150828112650.50b2ae58@canb.auug.org.au>
Fri, Aug 28, 2015 at 03:26:50AM CEST, sfr@canb•auug.org.au wrote:
>Hi Doug,
>
>Today's linux-next merge of the rdma tree got a conflict in:
>
> net/core/dev.c
>
>between commit:
>
> 0e4ead9d7b36 ("net: introduce change upper device notifier change info")
>
>from the net-next tree and commit:
>
> 133b5b93c734 ("net: Add info for NETDEV_CHANGEUPPER event")
>
>from the rdma tree.
>
>They are doing very similar things, but not identical.
>
>I fixed it up (see bottom of email and the below extra patch) and can
>carry the fix as necessary (no action is required unless something more
>correct is supplied, of course).
>
>From: Stephen Rothwell <sfr@canb•auug.org.au>
>Date: Fri, 28 Aug 2015 11:14:38 +1000
>Subject: [PATCH] net: merge change upper notifier changes
>
>Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
>---
<snip>
>diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
>index 0aa7d19ac85e..4ce420487d07 100644
>--- a/include/linux/netdevice.h
>+++ b/include/linux/netdevice.h
>@@ -2115,13 +2115,22 @@ struct netdev_notifier_change_info {
> unsigned int flags_changed;
> };
>
>+enum netdev_changeupper_event {
>+ NETDEV_CHANGEUPPER_LINK,
>+ NETDEV_CHANGEUPPER_UNLINK,
>+};
>+
I have this handled by "bool linking". So this is not needed.
> struct netdev_notifier_changeupper_info {
> struct netdev_notifier_info info; /* must be first */
>+ enum netdev_changeupper_event event;
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Other than this, looks good. Thanks
> struct net_device *upper_dev; /* new upper dev */
> bool master; /* is upper dev master */
> bool linking; /* is the nofication for link or unlink */
> };
>
next prev parent reply other threads:[~2015-08-28 6:35 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-28 1:26 linux-next: manual merge of the rdma tree with the net-next tree Stephen Rothwell
2015-08-28 6:35 ` Jiri Pirko [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
2016-01-05 1:51 Stephen Rothwell
2016-01-05 17:05 ` Or Gerlitz
2016-01-05 20:51 ` Stephen Rothwell
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=20150828063515.GA2156@nanopsycho.orion \
--to=jiri@resnulli$(echo .)us \
--cc=davem@davemloft$(echo .)net \
--cc=dledford@redhat$(echo .)com \
--cc=jiri@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=sfr@canb$(echo .)auug.org.au \
/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