History

Merge tag 'kvmarm-for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

kvmarm updates for 4.11 - GICv3 save restore - Cache flushing fixes - MSI injection fix for GICv3 ITS - Physical timer emulation support

Paolo Bonzini committed 9 years ago

Commit 2e751df2 parents a0e136d 7b6b463295 files · +3818 −1399Browse files

Showing the changes to include/uapi/linux (3 of 295 files). Show all

Unified · Split

3 files
  1. include/uapi/linux/nl80211.h +3 −1
  2. include/uapi/linux/pkt_cls.h +1 −1
  3. include/uapi/linux/tc_act/tc_bpf.h +1 −1
include/uapi/linux/nl80211.h+3−1
@@ -1772,7 +1772,9 @@ enum nl80211_commands { · 1771 unmodified lines
17721772 *
17731773 * @NL80211_ATTR_OPMODE_NOTIF: Operating mode field from Operating Mode
17741774 * Notification Element based on association request when used with
1775− * %NL80211_CMD_NEW_STATION; u8 attribute.
1775+ * %NL80211_CMD_NEW_STATION or %NL80211_CMD_SET_STATION (only when
1776+ * %NL80211_FEATURE_FULL_AP_CLIENT_STATE is supported, or with TDLS);
1777+ * u8 attribute.
17761778 *
17771779 * @NL80211_ATTR_VENDOR_ID: The vendor ID, either a 24-bit OUI or, if
17781780 * %NL80211_VENDOR_ID_IS_LINUX is set, a special Linux ID (not used yet)
include/uapi/linux/pkt_cls.h+1−1
@@ -397,7 +397,7 @@ enum { · 396 unmodified lines
397397 TCA_BPF_NAME,
398398 TCA_BPF_FLAGS,
399399 TCA_BPF_FLAGS_GEN,
400− TCA_BPF_DIGEST,
400+ TCA_BPF_TAG,
401401 __TCA_BPF_MAX,
402402 };
403403
include/uapi/linux/tc_act/tc_bpf.h+1−1
@@ -27,7 +27,7 @@ enum { · 26 unmodified lines
2727 TCA_ACT_BPF_FD,
2828 TCA_ACT_BPF_NAME,
2929 TCA_ACT_BPF_PAD,
30− TCA_ACT_BPF_DIGEST,
30+ TCA_ACT_BPF_TAG,
3131 __TCA_ACT_BPF_MAX,
3232 };
3333 #define TCA_ACT_BPF_MAX (__TCA_ACT_BPF_MAX - 1)