diff options
| author | David S. Miller <davem@davemloft.net> | 2016-05-09 15:59:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-09 15:59:24 -0400 |
| commit | e800072c18f0d7b89a80fa46dceb3d080c80e09c (patch) | |
| tree | 8da6cb7944762a60ec37594720c1ad2757631c2f /drivers/firmware/qemu_fw_cfg.c | |
| parent | e8ed77dfa90dd79c5343415a4bbbfdab9787b35a (diff) | |
| parent | b507146bb6b9ac0c0197100ba3e299825a21fed3 (diff) | |
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>
Diffstat (limited to 'drivers/firmware/qemu_fw_cfg.c')
| -rw-r--r-- | drivers/firmware/qemu_fw_cfg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/qemu_fw_cfg.c b/drivers/firmware/qemu_fw_cfg.c index 815c4a5cae54..1b95475b6aef 100644 --- a/drivers/firmware/qemu_fw_cfg.c +++ b/drivers/firmware/qemu_fw_cfg.c | |||
| @@ -77,7 +77,7 @@ static inline u16 fw_cfg_sel_endianness(u16 key) | |||
| 77 | static inline void fw_cfg_read_blob(u16 key, | 77 | static inline void fw_cfg_read_blob(u16 key, |
| 78 | void *buf, loff_t pos, size_t count) | 78 | void *buf, loff_t pos, size_t count) |
| 79 | { | 79 | { |
| 80 | u32 glk; | 80 | u32 glk = -1U; |
| 81 | acpi_status status; | 81 | acpi_status status; |
| 82 | 82 | ||
| 83 | /* If we have ACPI, ensure mutual exclusion against any potential | 83 | /* If we have ACPI, ensure mutual exclusion against any potential |