diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-16 12:13:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-16 12:13:52 -0800 |
| commit | 41aa5e5d712ba3a5f4fac0bbd6d976d70f9aed06 (patch) | |
| tree | ec555969824093468a81faeca6f3c40e9f8bf6a5 /net/ipv4/arp.c | |
| parent | Merge tag 'trace-v4.15-rc4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace (diff) | |
| parent | ALSA: seq: Make ioctls race-free (diff) | |
| download | linux-dev-41aa5e5d712ba3a5f4fac0bbd6d976d70f9aed06.tar.xz linux-dev-41aa5e5d712ba3a5f4fac0bbd6d976d70f9aed06.zip | |
Merge tag 'sound-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"A few small last-minute fixes that should sneak into 4.15:
- remove a spurious WARN_ON() triggered by syzkaller
- fix for ioctl races in ALSA sequencer
- two trivial HD-audio fixup entries"
* tag 'sound-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: seq: Make ioctls race-free
ALSA: pcm: Remove yet superfluous WARN_ON()
ALSA: hda - Apply the existing quirk to iMac 14,1
ALSA: hda - Apply headphone noise quirk for another Dell XPS 13 variant
Diffstat (limited to 'net/ipv4/arp.c')
0 files changed, 0 insertions, 0 deletions