Yuval Mintz ce7fa78ce1 bnx2x: Fix compilation when CONFIG_BNX2X_SRIOV is not set ...

Commit 05cc5a39dd ("bnx2x: add vlan filtering offload") has broken
compilation when CONFIG_BNX2X_SRIOV is not set.

Signed-off-by: Yuval Mintz <Yuval.Mintz@qlogic.com>
Signed-off-by: Ariel Elior <Ariel.Elior@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2015-07-30 09:52:18 -07:00

..

accessibility

…

acpi

Merge branches 'pm-cpuidle', 'pm-cpufreq' and 'acpi-resources'

2015-07-16 23:47:19 +02:00

amba

…

android

…

ata

Update Viresh Kumar's email address

2015-07-17 16:39:53 -07:00

atm

…

auxdisplay

…

base

Fix firmware loader uevent buffer NULL pointer dereference

2015-07-09 11:20:01 -07:00

bcma

…

block

NVMe: Reread partitions on metadata formats

2015-07-15 15:36:47 -06:00

bluetooth

Bluetooth: btbcm: allow btbcm_read_verbose_config to fail on Apple

2015-07-14 22:54:55 +02:00

bus

Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2015-06-26 11:54:29 -07:00

cdrom

…

char

Merge tag 'tpm-fixes-for-4.2-rc2' of https://github.com/PeterHuewe/linux-tpmdd into for-linus

2015-07-15 21:46:59 +10:00

clk

Update Viresh Kumar's email address

2015-07-17 16:39:53 -07:00

clocksource

clocksource/imx: Define clocksource for mx27

2015-07-07 10:44:45 +02:00

connector

…

cpufreq

Merge branches 'pm-cpuidle', 'pm-cpufreq' and 'acpi-resources'

2015-07-16 23:47:19 +02:00

cpuidle

suspend-to-idle: Prevent RCU from complaining about tick_freeze()

2015-07-09 22:59:49 +02:00

crypto

crypto: nx - Fix reentrancy bugs

2015-07-08 15:14:13 +08:00

dca

…

devfreq

…

dio

…

dma

Update Viresh Kumar's email address

2015-07-17 16:39:53 -07:00

dma-buf

…

edac

Merge tag 'edac_urgent_for_4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

2015-07-03 12:10:12 -07:00

eisa

…

extcon

extcon: Redefine the unique id of supported external connectors without 'enum extcon' type

2015-06-12 17:01:42 -07:00

firewire

…

firmware

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

2015-07-03 15:20:57 -07:00

fmc

…

gpio

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2015-07-18 10:27:12 -07:00

gpu

drm/ttm: improve uncached page deallocation.

2015-07-17 18:18:04 +10:00

hid

Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'for-4.2/rmi', 'for-4.2/sensor-hub', 'for-4.2/sjoy', 'for-4.2/sony' and 'for-4.2/wacom' into for-linus

2015-06-22 16:23:43 +02:00

hsi

Merge tag 'module-implicit-v4.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2015-07-02 10:25:22 -07:00

hv

Drivers: hv: vmbus: Allocate ring buffer memory in NUMA aware fashion

2015-06-12 16:58:33 -07:00

hwmon

hwmon: (w83627ehf) Use swap() in w82627ehf_swap_tempreg()

2015-07-03 14:39:06 +02:00

hwspinlock

hwspinlock: qcom: Correct msb in regmap_field

2015-07-01 16:15:05 +03:00

hwtracing/coresight

…

i2c

i2c: Mark instantiated device nodes with OF_POPULATE

2015-07-09 22:25:54 +02:00

ide

Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2015-07-01 10:49:25 -07:00

idle

…

iio

Merge tag 'iio-fixes-for-4.2b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus

2015-07-13 14:19:22 -07:00

infiniband

net/mlx4: Prepare VLAN macros for 802.1ad Hardware accelerated support

2015-07-27 15:00:37 -07:00

input

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2015-07-11 11:16:04 -07:00

iommu

Merge tag 'iommu-fixes-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

2015-07-01 14:44:22 -07:00

ipack

…

irqchip

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2015-07-18 10:27:12 -07:00

isdn

isdn/gigaset: drop unused ldisc methods

2015-07-15 17:24:45 -07:00

leds

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds

2015-07-01 19:09:11 -07:00

lguest

Merge branch 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2015-06-22 17:59:09 -07:00

macintosh

macintosh/nvram: Remove as unused

2015-06-15 16:42:37 +10:00

mailbox

Merge tag 'module_init-alternate_initcall-v4.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2015-07-02 10:36:29 -07:00

mcb

…

md

Merge tag 'dm-4.2-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm

2015-07-17 20:53:57 -07:00

media

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds

2015-07-01 19:09:11 -07:00

memory

Merge branch 'fixes-rc1' into omap-for-v4.2/fixes

2015-07-06 05:33:17 -07:00

memstick

memstick: remove deprecated use of pci api

2015-06-30 19:44:57 -07:00

message

fusion: remove dead MTRR code

2015-06-13 08:44:14 -07:00

mfd

Update Viresh Kumar's email address

2015-07-17 16:39:53 -07:00

misc

Merge tag 'powerpc-4.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

2015-07-10 12:16:59 -07:00

mmc

Update Viresh Kumar's email address

2015-07-17 16:39:53 -07:00

mtd

Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2015-07-01 10:49:25 -07:00

net

bnx2x: Fix compilation when CONFIG_BNX2X_SRIOV is not set

2015-07-30 09:52:18 -07:00

nfc

Merge tag 'char-misc-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

2015-06-26 14:51:15 -07:00

ntb

NTB: Add split BAR output for debugfs stats

2015-07-04 14:09:32 -04:00

nubus

…

nvdimm

nvdimm: Fix return value of nvdimm_bus_init() if class_create() fails

2015-06-30 14:30:34 -04:00

of

of_mdio: add new DT property 'managed' to specify the PHY management type

2015-07-21 16:12:55 -07:00

oprofile

…

parisc

…

parport

parport: check exclusive access before register

2015-06-12 16:58:33 -07:00

pci

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2015-07-01 15:19:35 -07:00

pcmcia

Merge tag 'module-implicit-v4.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2015-07-02 10:25:22 -07:00

phy

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2015-06-27 12:44:34 -07:00

pinctrl

Merge tag 'pinctrl-v4.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl

2015-07-21 15:27:27 -07:00

platform

intel_scu_ipc: move local memory initialization out of a mutex

2015-07-14 11:02:44 -07:00

pnp

ACPI / PNP: Reserve ACPI resources at the fs_initcall_sync stage

2015-07-06 23:52:21 +02:00

power

Merge tag 'module-builtin_driver-v4.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2015-07-02 10:42:13 -07:00

powercap

…

pps

…

ps3

…

ptp

…

pwm

Merge tag 'pwm/for-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm

2015-06-23 13:32:38 -07:00

rapidio

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2015-06-23 14:08:54 -07:00

ras

…

regulator

Merge tag 'module-implicit-v4.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2015-07-02 10:25:22 -07:00

remoteproc

remoteproc: fix !CONFIG_OF build breakage

2015-06-18 11:44:41 +03:00

reset

…

rpmsg

…

rtc

rtc: armada38x: Remove unused variable from armada38x_rtc_set_time()

2015-07-18 00:42:31 +02:00

s390

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

2015-07-15 13:12:44 -07:00

sbus

…

scsi

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2015-07-19 14:18:00 -07:00

sfi

…

sh

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2015-07-01 15:19:35 -07:00

sn

…

soc

Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2015-07-02 14:40:49 -07:00

spi

Merge remote-tracking branches 'spi/topic/sirf', 'spi/topic/spidev' and 'spi/topic/zynq' into spi-next

2015-06-18 00:19:56 +01:00

spmi

…

ssb

…

staging

staging: vt6656: check ieee80211_bss_conf bssid not NULL

2015-07-14 19:34:57 -07:00

target

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2015-07-04 14:13:43 -07:00

tc

…

thermal

Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2015-07-01 10:49:25 -07:00

thunderbolt

…

tty

Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2015-07-02 14:40:49 -07:00

uio

uio: pruss: Drop depends on ARCH_DAVINCI_DA850 from config

2015-06-12 17:01:43 -07:00

usb

configfs: fix kernel infoleak through user-controlled format string

2015-07-17 16:39:53 -07:00

uwb

…

vfio

Merge tag 'vfio-v4.2-rc1' of git://github.com/awilliam/linux-vfio

2015-06-28 12:32:13 -07:00

vhost

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2015-07-04 14:13:43 -07:00

video

stifb: Implement hardware accelerated copyarea

2015-07-10 21:44:19 +02:00

virt

…

virtio

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

2015-07-03 16:02:25 -07:00

vlynq

…

vme

vme: tsi148: depend on HAS_DMA for Kconfig

2015-06-12 17:31:05 -07:00

w1

w1: use correct lock on error in w1_seq_show()

2015-06-12 16:58:33 -07:00

watchdog

Update Viresh Kumar's email address

2015-07-17 16:39:53 -07:00

xen

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2015-07-04 14:13:43 -07:00

zorro

…

Kconfig

libnvdimm, nfit: initial libnvdimm infrastructure and NFIT support

2015-06-24 21:24:10 -04:00

Makefile

Merge tag 'libnvdimm-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/nvdimm

2015-06-29 10:34:42 -07:00