Conflicts were simple overlapping changes in microchip driver.
Showing the changes to include/uapi (1 of 1035 files). Show all
Unified · Split
| @@ -211,7 +211,8 @@ typedef struct siginfo { · 210 unmodified lines | |||
| 211 | #define __FPE_INVASC 12 /* invalid ASCII digit */ | 211 | #define __FPE_INVASC 12 /* invalid ASCII digit */ |
| 212 | #define __FPE_INVDEC 13 /* invalid decimal digit */ | 212 | #define __FPE_INVDEC 13 /* invalid decimal digit */ |
| 213 | #define FPE_FLTUNK 14 /* undiagnosed floating-point exception */ | 213 | #define FPE_FLTUNK 14 /* undiagnosed floating-point exception */ |
| 214 | #define NSIGFPE 14 | 214 | #define FPE_CONDTRAP 15 /* trap on condition */ |
| 215 | #define NSIGFPE 15 | ||
| 215 | 216 | ||
| 216 | /* | 217 | /* |
| 217 | * SIGSEGV si_codes | 218 | * SIGSEGV si_codes |