diff options
| author | David S. Miller <davem@davemloft.net> | 2015-04-06 21:52:19 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-04-06 22:34:15 -0400 |
| commit | c85d6975ef923cffdd56de3e0e6aba0977282cff (patch) | |
| tree | cb497deea01827951809c9c7c0f1c22780c146be /include/linux/lcm.h | |
| parent | 60302ff631f0f3eac0ec592e128b776f0676b397 (diff) | |
| parent | f22e6e847115abc3a0e2ad7bb18d243d42275af1 (diff) | |
| download | op-kernel-dev-c85d6975ef923cffdd56de3e0e6aba0977282cff.zip op-kernel-dev-c85d6975ef923cffdd56de3e0e6aba0977282cff.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/mellanox/mlx4/cmd.c
net/core/fib_rules.c
net/ipv4/fib_frontend.c
The fib_rules.c and fib_frontend.c conflicts were locking adjustments
in 'net' overlapping addition and removal of code in 'net-next'.
The mlx4 conflict was a bug fix in 'net' happening in the same
place a constant was being replaced with a more suitable macro.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/lcm.h')
| -rw-r--r-- | include/linux/lcm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/lcm.h b/include/linux/lcm.h index 7bf01d7..1ce79a7 100644 --- a/include/linux/lcm.h +++ b/include/linux/lcm.h @@ -4,5 +4,6 @@ #include <linux/compiler.h> unsigned long lcm(unsigned long a, unsigned long b) __attribute_const__; +unsigned long lcm_not_zero(unsigned long a, unsigned long b) __attribute_const__; #endif /* _LCM_H */ |
