diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-22 19:31:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-22 19:31:07 -0700 |
| commit | fadd2ce5a3680fb265694f573cbfb8bcb7d6c9d5 (patch) | |
| tree | 2394d6f51dd41f0917acdd0f19339750862219cd /net/bridge/br_stp_if.c | |
| parent | Merge tag 'acpi-4.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (diff) | |
| parent | efi-pstore: Fix write/erase id tracking (diff) | |
| download | linux-dev-fadd2ce5a3680fb265694f573cbfb8bcb7d6c9d5.tar.xz linux-dev-fadd2ce5a3680fb265694f573cbfb8bcb7d6c9d5.zip | |
Merge tag 'pstore-v4.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull pstore fix from Kees Cook:
"Marta noticed another misbehavior in EFI pstore, which this fixes.
Hopefully this is the last of the v4.12 fixes for pstore!"
* tag 'pstore-v4.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
efi-pstore: Fix write/erase id tracking
Diffstat (limited to 'net/bridge/br_stp_if.c')
0 files changed, 0 insertions, 0 deletions