History

Merge tag 'at24-4.16-updates-for-wolfram' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into i2c/for-4.16

"AT24 updates for 4.16 merge window The driver has been converted to using regmap instead of raw i2c and smbus calls which shrank the code significantly. Device tree binding document has been cleaned up. Device tree support in the driver has been improved and we now support all at24 models as well as two new DT properties (no-read-rollover and wp-gpios). We no longer user unreadable magic values for driver data as the way it was implemented caused problems for some EEPROM models - we switched to regular structs. Aside from that, there's a bunch of coding style fixes and minor improvements all over the place."

Wolfram Sang committed 8 years ago

Commit fddfa222 parents 639136d 0f30aca1661 files · +18206 −11312Browse files

Showing the changes to include/uapi/linux (5 of 1661 files). Show all

Unified · Split

5 files
  1. include/uapi/linux/bpf_perf_event.h +2 −3
  2. include/uapi/linux/kvm.h +2 −2
  3. include/uapi/linux/pkt_sched.h +0 −1
  4. include/uapi/linux/rtnetlink.h +1 −0
  5. include/uapi/linux/usb/ch9.h +3 −0
include/uapi/linux/bpf_perf_event.h+2−3
@@ -8,11 +8,10 @@ · 7 unmodified lines
88 #ifndef _UAPI__LINUX_BPF_PERF_EVENT_H__
99 #define _UAPI__LINUX_BPF_PERF_EVENT_H__
1010
11−#include <linux/types.h>
12−#include <linux/ptrace.h>
11+#include <asm/bpf_perf_event.h>
1312
1413 struct bpf_perf_event_data {
15− struct pt_regs regs;
14+ bpf_user_pt_regs_t regs;
1615 __u64 sample_period;
1716 };
1817
include/uapi/linux/kvm.h+2−2
@@ -630,9 +630,9 @@ struct kvm_s390_irq { · 629 unmodified lines
630630
631631 struct kvm_s390_irq_state {
632632 __u64 buf;
633− __u32 flags;
633+ __u32 flags; /* will stay unused for compatibility reasons */
634634 __u32 len;
635− __u32 reserved[4];
635+ __u32 reserved[4]; /* will stay unused for compatibility reasons */
636636 };
637637
638638 /* for KVM_SET_GUEST_DEBUG */
include/uapi/linux/pkt_sched.h+0−1
@@ -256,7 +256,6 @@ struct tc_red_qopt { · 255 unmodified lines
256256 #define TC_RED_ECN 1
257257 #define TC_RED_HARDDROP 2
258258 #define TC_RED_ADAPTATIVE 4
259−#define TC_RED_OFFLOADED 8
260259 };
261260
262261 struct tc_red_xstats {
include/uapi/linux/rtnetlink.h+1−0
@@ -557,6 +557,7 @@ enum { · 556 unmodified lines
557557 TCA_PAD,
558558 TCA_DUMP_INVISIBLE,
559559 TCA_CHAIN,
560+ TCA_HW_OFFLOAD,
560561 __TCA_MAX
561562 };
562563
include/uapi/linux/usb/ch9.h+3−0
@@ -880,6 +880,8 @@ struct usb_wireless_cap_descriptor { /* Ultra Wide Band */ · 879 unmodified lines
880880 __u8 bReserved;
881881 } __attribute__((packed));
882882
883+#define USB_DT_USB_WIRELESS_CAP_SIZE 11
884+
883885 /* USB 2.0 Extension descriptor */
884886 #define USB_CAP_TYPE_EXT 2
885887
@@ -1072,6 +1074,7 @@ struct usb_ptm_cap_descriptor { · 186 unmodified lines
10721074 __u8 bDevCapabilityType;
10731075 } __attribute__((packed));
10741076
1077+#define USB_DT_USB_PTM_ID_SIZE 3
10751078 /*
10761079 * The size of the descriptor for the Sublink Speed Attribute Count
10771080 * (SSAC) specified in bmAttributes[4:0].