[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=4ff2c7b685bef7ae8e075f80abb0871886fd75a0
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

4ff2c7b by Alexis La Goutte (alexis.lagoutte@xxxxxxxxx):

    netlink: fix conflict
    
    'netlink-route.ifa_address' exists multiple times with NOT compatible types: FT_IPv4 and FT_IPv6
    
    Change-Id: I3ba350cfc479a7733d48bc07b4102c8220126247
    Reviewed-on: https://code.wireshark.org/review/28841
    Petri-Dish: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  b8e1d69   docsis-macmgmt: fix spelling-error-in-binary found by lintian
    adds  4ff2c7b   netlink: fix conflict


Summary of changes:
 epan/dissectors/packet-netlink-route.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)