summaryrefslogtreecommitdiff
path: root/include/soc/nps
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-02-06 10:55:08 -0500
committerDavid S. Miller <davem@davemloft.net>2017-02-06 10:55:08 -0500
commit89389b4d5524350e74974cf711fe4a18206c09d3 (patch)
tree0ac0b66637257c82b1cf6132a052ef2d60febd49 /include/soc/nps
parentebf6c9cb23d7e56eec8575a88071dec97ad5c6e2 (diff)
parentfd551bac4795854adaa87bad7e5136083719802b (diff)
Merge tag 'mac80211-for-davem-2017-02-06' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says: ==================== A few simple fixes: * fix FILS AEAD cipher usage to use the correct AAD vectors and to use synchronous algorithms * fix using mesh HT operation data from userspace * fix adding mesh vendor elements to beacons & plink frames ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/soc/nps')
0 files changed, 0 insertions, 0 deletions
by: Hanka Pavlikova <hanka@ucw.cz> Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Matt Fleming <matt@codeblueprint.co.uk> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Borislav Petkov <bp@suse.de> Cc: Laura Abbott <labbott@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Vojtech Pavlik <vojtech@ucw.cz> Cc: Waiman Long <waiman.long@hpe.com> Cc: linux-efi@vger.kernel.org Cc: stable@kernel.org # v4.8+ Fixes: 129766708 ("x86/efi: Only map RAM into EFI page tables if in mixed-mode") Link: http://lkml.kernel.org/r/20170127222552.22336-1-matt@codeblueprint.co.uk [ Tidied up the changelog and the comment. ] Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/ipv6/inet6_connection_sock.c')