David S. Miller
f9aa9dc7d2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
All conflicts were simple overlapping changes except perhaps
for the Thunder driver.
That driver has a change_mtu method explicitly for sending
a message to the hardware. If that fails it returns an
error.
Normally a driver doesn't need an ndo_change_mtu method becuase those
are usually just range changes, which are now handled generically.
But since this extra operation is needed in the Thunder driver, it has
to stay.
However, if the message send fails we have to restore the original
MTU before the change because the entire call chain expects that if
an error is thrown by ndo_change_mtu then the MTU did not change.
Therefore code is added to nicvf_change_mtu to remember the original
MTU, and to restore it upon nicvf_update_hw_max_frs() failue.
Signed-off-by: David S. Miller <davem@davemloft.net>
2016-11-22 13:27:16 -05:00
block: Fix secure erase
2016-08-16 09:16:51 -06:00
bpf: add helper for retrieving current numa node id
2016-10-22 17:05:52 -04:00
ftrace: Add more checks for FTRACE_FL_DISABLED in processing ip records
2016-11-14 16:31:49 -05:00
This release cycle is rather small. Just a few fixes to tracing.
2016-10-06 11:48:41 -07:00
Disable the __builtin_return_address() warning globally after all
2016-10-12 10:23:41 -07:00
cpufreq: schedutil: New governor based on scheduler utilization data
2016-04-02 01:09:12 +02:00
ring-buffer: Prevent overflow of size in ring_buffer_resize()
2016-05-13 16:44:20 -04:00
This release cycle is rather small. Just a few fixes to tracing.
2016-10-06 11:48:41 -07:00
tracing: Have max_latency be defined for HWLAT_TRACER as well
2016-09-12 09:59:46 -04:00
tracing: Add NMI tracing in hwlat detector
2016-09-02 12:47:55 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2016-05-17 16:26:30 -07:00
tracing: Show the preempt count of when the event was called
2016-06-20 09:54:21 -04:00
tracing: Use temp buffer when filtering events
2016-05-03 17:59:24 -04:00
tracing: Fix use-after-free in hist_register_trigger()
2016-08-02 15:16:30 -04:00
tracing: Call traceoff trigger after event is recorded
2016-09-23 09:47:59 -04:00
ftrace: Have set_ftrace_pid use the bitmap like events do
2016-06-20 09:54:19 -04:00
This release cycle is rather small. Just a few fixes to tracing.
2016-10-06 11:48:41 -07:00
tracing: Add NMI tracing in hwlat detector
2016-09-02 12:47:55 -04:00
tracing: Remove redundant reset per-CPU buff in irqsoff tracer
2016-03-18 16:39:11 -04:00
ftrace: kprobe: uprobe: Add x8/x16/x32/x64 for hexadecimal types
2016-08-23 15:38:09 -03:00
tracing: Expose CPU physical addresses (resource values) for PCI devices
2016-06-20 09:54:22 -04:00
tracing: Fix typoes in code comment and printk in trace_nop.c
2016-03-08 11:23:57 -05:00
tracing: Add NMI tracing in hwlat detector
2016-09-02 12:47:55 -04:00
tracing: Handle NULL formats in hold_module_trace_bprintk_format()
2016-06-20 09:46:12 -04:00
ftrace: kprobe: uprobe: Show u8/u16/u32/u64 types in decimal
2016-08-23 17:06:38 -03:00
ftrace: kprobe: uprobe: Show u8/u16/u32/u64 types in decimal
2016-08-23 17:06:38 -03:00
kernel/...: convert pr_warning to pr_warn
2016-03-22 15:36:02 -07:00
tracing/syscalls: fix multiline in error message text
2016-09-29 10:25:23 +02:00
This release cycle is rather small. Just a few fixes to tracing.
2016-10-06 11:48:41 -07:00
tracing: Handle tracing_map_alloc_elts() error path correctly
2016-04-26 09:40:30 -04:00
tracing: Update some tracing_map constants and comments
2016-04-19 12:16:06 -04:00
f9aa9dc7d2