diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-29 11:48:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-29 11:48:05 -0700 |
| commit | 653c574a7df4760442162272169834d63c33f298 (patch) | |
| tree | 0d5d455e771ab39a2d20a5619003d263e6656b42 /include/net/tc_act/tc_ife.h | |
| parent | 00bf377d19ad3d80cbc7a036521279a86e397bfb (diff) | |
| parent | bcf4dd5f9ee096bd1510f838dd4750c35df4e38b (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
"Another two bug fixes for 4.7:
- The revert of patch which removed boot information for systems
using an intermediate boot kernel, e.g. the SLES12 grub setup.
- A fix for an incorrect inline assembly constraint that causes
broken code to be generated with gcc 4.8.5"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390: fix test_fp_ctl inline assembly contraints
Revert "s390/kdump: Clear subchannel ID to signal non-CCW/SCSI IPL"
Diffstat (limited to 'include/net/tc_act/tc_ife.h')
0 files changed, 0 insertions, 0 deletions