Hi Jon,

Sorry, I cannot apply the series to net-next tree. Below is what I met
error:

Applying: tipc: refactor function tipc_enable_bearer()
Applying: tipc: some cleanups in the file discover.c
Applying: tipc: remove restrictions on node address values
Applying: tipc: allow closest-first lookup algorithm when legacy address
is configured
Applying: tipc: remove direct accesses to own_addr field in struct tipc_net
error: patch failed: net/tipc/name_distr.c:382
error: net/tipc/name_distr.c: patch does not apply
Patch failed at 0005 tipc: remove direct accesses to own_addr field in
struct tipc_net
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In my local tree, the series ("tipc: obsolete zone concept") has been
merged. So I think you need to rebase the patches.

Thanks,
Ying

On 03/16/2018 11:58 PM, Jon Maloy wrote:
> We introduce a 128-bit free-format node identity as an alternative to the
> legacy <Zone.Cluster.Node> structured 32-bit node address.
> 
> We also make configuration of this identity optional; if a bearer is 
> enabled without a pre-configured node id it will set it automatically
> based on the used interface's MAC or IP address.
> 
> Jon Maloy (8):
>   tipc: refactor function tipc_enable_bearer()
>   tipc: some cleanups in the file discover.c
>   tipc: remove restrictions on node address values
>   tipc: allow closest-first lookup algorithm when legacy address is
>     configured
>   tipc: remove direct accesses to own_addr field in struct tipc_net
>   tipc: add 128-bit node identifier
>   tipc: handle collisions of 32-bit node address hash values
>   tipc: obtain node identity from interface by default
> 
>  include/uapi/linux/tipc_netlink.h |   2 +
>  net/tipc/addr.c                   | 128 +++++++------
>  net/tipc/addr.h                   |  37 ++--
>  net/tipc/bearer.c                 | 152 +++++++--------
>  net/tipc/bearer.h                 |   2 +-
>  net/tipc/core.c                   |   6 +-
>  net/tipc/core.h                   |  13 +-
>  net/tipc/discover.c               | 383 
> +++++++++++++++++++++++---------------
>  net/tipc/discover.h               |   8 +-
>  net/tipc/link.c                   |  33 ++--
>  net/tipc/link.h                   |   4 +-
>  net/tipc/msg.h                    |  23 ++-
>  net/tipc/name_distr.c             |  17 +-
>  net/tipc/name_table.c             |  14 +-
>  net/tipc/net.c                    |  80 ++++----
>  net/tipc/net.h                    |   5 +-
>  net/tipc/node.c                   | 101 ++++++++--
>  net/tipc/node.h                   |   8 +-
>  net/tipc/socket.c                 |  23 +--
>  net/tipc/udp_media.c              |  13 ++
>  20 files changed, 630 insertions(+), 422 deletions(-)
> 

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
tipc-discussion mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tipc-discussion

Reply via email to