History

Merge tag 'usb-serial-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus

Johan writes: USB-serial fixes for v4.6-rc3 Here are some new device ids.

Greg Kroah-Hartman committed 10 years ago

Commit 636c8a82 parents 39ec5cb d48d569241 files · +2174 −1421Browse files

Showing the changes to include/uapi (2 of 241 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/bpf.h +1 −0
  2. include/uapi/linux/stddef.h +4 −0
include/uapi/linux/bpf.h+1−0
@@ -375,6 +375,7 @@ struct bpf_tunnel_key { · 374 unmodified lines
375 };375 };
376 __u8 tunnel_tos;376 __u8 tunnel_tos;
377 __u8 tunnel_ttl;377 __u8 tunnel_ttl;
378 __u16 tunnel_ext;
378 __u32 tunnel_label;379 __u32 tunnel_label;
379};380};
380 381
include/uapi/linux/stddef.h+4−0
@@ -1 +1,5 @@
1#include <linux/compiler.h>1#include <linux/compiler.h>
2
3#ifndef __always_inline
4#define __always_inline inline
5#endif