Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts were simple overlapping changes in microchip driver. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -211,7 +211,8 @@ typedef struct siginfo {
|
||||
#define __FPE_INVASC 12 /* invalid ASCII digit */
|
||||
#define __FPE_INVDEC 13 /* invalid decimal digit */
|
||||
#define FPE_FLTUNK 14 /* undiagnosed floating-point exception */
|
||||
#define NSIGFPE 14
|
||||
#define FPE_CONDTRAP 15 /* trap on condition */
|
||||
#define NSIGFPE 15
|
||||
|
||||
/*
|
||||
* SIGSEGV si_codes
|
||||
|
Reference in New Issue
Block a user