Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

In netdevice.h we removed the structure in net-next that is being
changes in 'net'.  In macsec.c and rtnetlink.c we have overlaps
between fixes in 'net' and the u64 attribute changes in 'net-next'.

The mlx5 conflicts have to do with vxlan support dependencies.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 12 insertions, 2 deletions

diff --git a/arch/x86/kernel/sysfb_efi.c b/arch/x86/kernel/sysfb_efi.c
index b285d4e8c68e..5da924bbf0a0 100644
--- a/arch/x86/kernel/sysfb_efi.c
+++ b/arch/x86/kernel/sysfb_efi.c
@@ -106,14 +106,24 @@ static int __init efifb_set_system(const struct dmi_system_id *id)
                                         continue;
                                 for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
                                         resource_size_t start, end;
+                                        unsigned long flags;
+
+                                        flags = pci_resource_flags(dev, i);
+                                        if (!(flags & IORESOURCE_MEM))
+                                                continue;
+
+                                        if (flags & IORESOURCE_UNSET)
+                                                continue;
+
+                                        if (pci_resource_len(dev, i) == 0)
+                                                continue;
 
                                         start = pci_resource_start(dev, i);
-                                        if (start == 0)
-                                                break;
                                         end = pci_resource_end(dev, i);
                                         if (screen_info.lfb_base >= start &&
                                             screen_info.lfb_base < end) {
                                                 found_bar = 1;
+                                                break;
                                         }
                                 }
                         }