History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Three sets of overlapping changes, two in the packet scheduler and one in the meson-gxl PHY driver.

David S. Miller committed 8 years ago

Commit c30abd52 parents 28dc4c8 f3b5ad8446 files · +2942 −3463Browse files

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

Unified · Split

3 files
  1. include/uapi/linux/kvm.h +2 −2
  2. include/uapi/linux/pkt_sched.h +0 −1
  3. include/uapi/linux/rtnetlink.h +1 −0
include/uapi/linux/kvm.h+2−2
@@ -630,9 +630,9 @@ struct kvm_s390_irq { · 629 unmodified lines
630 630
631struct kvm_s390_irq_state {631struct kvm_s390_irq_state {
632 __u64 buf;632 __u64 buf;
633 __u32 flags;633 __u32 flags; /* will stay unused for compatibility reasons */
634 __u32 len;634 __u32 len;
635 __u32 reserved[4];635 __u32 reserved[4]; /* will stay unused for compatibility reasons */
636};636};
637 637
638/* for KVM_SET_GUEST_DEBUG */638/* for KVM_SET_GUEST_DEBUG */
include/uapi/linux/pkt_sched.h+0−1
@@ -256,7 +256,6 @@ struct tc_red_qopt { · 255 unmodified lines
256#define TC_RED_ECN 1256#define TC_RED_ECN 1
257#define TC_RED_HARDDROP 2257#define TC_RED_HARDDROP 2
258#define TC_RED_ADAPTATIVE 4258#define TC_RED_ADAPTATIVE 4
259#define TC_RED_OFFLOADED 8
260};259};
261 260
262struct tc_red_xstats {261struct tc_red_xstats {
include/uapi/linux/rtnetlink.h+1−0
@@ -557,6 +557,7 @@ enum { · 556 unmodified lines
557 TCA_PAD,557 TCA_PAD,
558 TCA_DUMP_INVISIBLE,558 TCA_DUMP_INVISIBLE,
559 TCA_CHAIN,559 TCA_CHAIN,
560 TCA_HW_OFFLOAD,
560 __TCA_MAX561 __TCA_MAX
561};562};
562 563

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t