<feed xmlns='http://www.w3.org/2005/Atom'>
<title>linux.git/net/core/ethtool.c, branch v4.13</title>
<subtitle>Linux kernel source tree</subtitle>
<link rel='alternate' type='text/html' href='https://git.tavy.me/linux.git/'/>
<entry>
<title>ethtool: don't open-code memdup_user()</title>
<updated>2017-06-30T06:04:10+00:00</updated>
<author>
<name>Al Viro</name>
<email>viro@zeniv.linux.org.uk</email>
</author>
<published>2017-05-13T22:31:26+00:00</published>
<link rel='alternate' type='text/html' href='https://git.tavy.me/linux.git/commit/?id=30e7e3ecf39e578ffab6d5944c79c1d30dee0d3f'/>
<id>30e7e3ecf39e578ffab6d5944c79c1d30dee0d3f</id>
<content type='text'>
Signed-off-by: Al Viro &lt;viro@zeniv.linux.org.uk&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Signed-off-by: Al Viro &lt;viro@zeniv.linux.org.uk&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>net: Add ESP offload features</title>
<updated>2017-04-14T08:05:36+00:00</updated>
<author>
<name>Steffen Klassert</name>
<email>steffen.klassert@secunet.com</email>
</author>
<published>2017-04-14T08:05:36+00:00</published>
<link rel='alternate' type='text/html' href='https://git.tavy.me/linux.git/commit/?id=c7ef8f0c020ac43c8a692bf989017c06ab1fdf0f'/>
<id>c7ef8f0c020ac43c8a692bf989017c06ab1fdf0f</id>
<content type='text'>
This patch adds netdev features to configure IPsec offloads.

Signed-off-by: Steffen Klassert &lt;steffen.klassert@secunet.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This patch adds netdev features to configure IPsec offloads.

Signed-off-by: Steffen Klassert &lt;steffen.klassert@secunet.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>ethtool: add CRC32 as an RSS hash function</title>
<updated>2017-03-10T00:39:58+00:00</updated>
<author>
<name>Jakub Kicinski</name>
<email>jakub.kicinski@netronome.com</email>
</author>
<published>2017-03-08T16:57:00+00:00</published>
<link rel='alternate' type='text/html' href='https://git.tavy.me/linux.git/commit/?id=abb521e36b9286c262971974ebaeda2d67dadd86'/>
<id>abb521e36b9286c262971974ebaeda2d67dadd86</id>
<content type='text'>
CRC32 engines are usually easily available in hardware and generate
OK spread for RSS hash.  Add CRC32 RSS hash function to ethtool API.

Signed-off-by: Jakub Kicinski &lt;jakub.kicinski@netronome.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
CRC32 engines are usually easily available in hardware and generate
OK spread for RSS hash.  Add CRC32 RSS hash function to ethtool API.

Signed-off-by: Jakub Kicinski &lt;jakub.kicinski@netronome.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>sched/headers: Prepare to move signal wakeup &amp; sigpending methods from &lt;linux/sched.h&gt; into &lt;linux/sched/signal.h&gt;</title>
<updated>2017-03-02T07:42:32+00:00</updated>
<author>
<name>Ingo Molnar</name>
<email>mingo@kernel.org</email>
</author>
<published>2017-02-02T18:15:33+00:00</published>
<link rel='alternate' type='text/html' href='https://git.tavy.me/linux.git/commit/?id=174cd4b1e5fbd0d74c68cf3a74f5bd4923485512'/>
<id>174cd4b1e5fbd0d74c68cf3a74f5bd4923485512</id>
<content type='text'>
Fix up affected files that include this signal functionality via sched.h.

Acked-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
Cc: Mike Galbraith &lt;efault@gmx.de&gt;
Cc: Peter Zijlstra &lt;peterz@infradead.org&gt;
Cc: Thomas Gleixner &lt;tglx@linutronix.de&gt;
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar &lt;mingo@kernel.org&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Fix up affected files that include this signal functionality via sched.h.

Acked-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
Cc: Mike Galbraith &lt;efault@gmx.de&gt;
Cc: Peter Zijlstra &lt;peterz@infradead.org&gt;
Cc: Thomas Gleixner &lt;tglx@linutronix.de&gt;
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar &lt;mingo@kernel.org&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net</title>
<updated>2017-02-07T21:29:30+00:00</updated>
<author>
<name>David S. Miller</name>
<email>davem@davemloft.net</email>
</author>
<published>2017-02-07T21:29:30+00:00</published>
<link rel='alternate' type='text/html' href='https://git.tavy.me/linux.git/commit/?id=3efa70d78f218e4c9276b0bac0545e5184c1c47b'/>
<id>3efa70d78f218e4c9276b0bac0545e5184c1c47b</id>
<content type='text'>
The conflict was an interaction between a bug fix in the
netvsc driver in 'net' and an optimization of the RX path
in 'net-next'.

Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
The conflict was an interaction between a bug fix in the
netvsc driver in 'net' and an optimization of the RX path
in 'net-next'.

Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>net: remove support for per driver ndo_busy_poll()</title>
<updated>2017-02-03T22:28:29+00:00</updated>
<author>
<name>Eric Dumazet</name>
<email>edumazet@google.com</email>
</author>
<published>2017-02-03T02:43:28+00:00</published>
<link rel='alternate' type='text/html' href='https://git.tavy.me/linux.git/commit/?id=79e7fff47b7bb4124ef970a13eac4fdeddd1fc25'/>
<id>79e7fff47b7bb4124ef970a13eac4fdeddd1fc25</id>
<content type='text'>
We added generic support for busy polling in NAPI layer in linux-4.5

No network driver uses ndo_busy_poll() anymore, we can get rid
of the pointer in struct net_device_ops, and its use in sk_busy_loop()

Saves NETIF_F_BUSY_POLL features bit.

Signed-off-by: Eric Dumazet &lt;edumazet@google.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
We added generic support for busy polling in NAPI layer in linux-4.5

No network driver uses ndo_busy_poll() anymore, we can get rid
of the pointer in struct net_device_ops, and its use in sk_busy_loop()

Saves NETIF_F_BUSY_POLL features bit.

Signed-off-by: Eric Dumazet &lt;edumazet@google.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>ethtool: do not vzalloc(0) on registers dump</title>
<updated>2017-02-03T16:13:00+00:00</updated>
<author>
<name>Stanislaw Gruszka</name>
<email>sgruszka@redhat.com</email>
</author>
<published>2017-02-02T12:32:10+00:00</published>
<link rel='alternate' type='text/html' href='https://git.tavy.me/linux.git/commit/?id=3808d34838184fd29088d6b3a364ba2f1c018fb6'/>
<id>3808d34838184fd29088d6b3a364ba2f1c018fb6</id>
<content type='text'>
If -&gt;get_regs_len() callback return 0, we allocate 0 bytes of memory,
what print ugly warning in dmesg, which can be found further below.

This happen on mac80211 devices where ieee80211_get_regs_len() just
return 0 and driver only fills ethtool_regs structure and actually
do not provide any dump. However I assume this can happen on other
drivers i.e. when for some devices driver provide regs dump and for
others do not. Hence preventing to to print warning in ethtool code
seems to be reasonable.

ethtool: vmalloc: allocation failure: 0 bytes, mode:0x24080c2(GFP_KERNEL|__GFP_HIGHMEM|__GFP_ZERO)
&lt;snip&gt;
Call Trace:
[&lt;ffffffff813bde47&gt;] dump_stack+0x63/0x8c
[&lt;ffffffff811b0a1f&gt;] warn_alloc+0x13f/0x170
[&lt;ffffffff811f0476&gt;] __vmalloc_node_range+0x1e6/0x2c0
[&lt;ffffffff811f0874&gt;] vzalloc+0x54/0x60
[&lt;ffffffff8169986c&gt;] dev_ethtool+0xb4c/0x1b30
[&lt;ffffffff816adbb1&gt;] dev_ioctl+0x181/0x520
[&lt;ffffffff816714d2&gt;] sock_do_ioctl+0x42/0x50
&lt;snip&gt;
Mem-Info:
active_anon:435809 inactive_anon:173951 isolated_anon:0
 active_file:835822 inactive_file:196932 isolated_file:0
 unevictable:0 dirty:8 writeback:0 unstable:0
 slab_reclaimable:157732 slab_unreclaimable:10022
 mapped:83042 shmem:306356 pagetables:9507 bounce:0
 free:130041 free_pcp:1080 free_cma:0
Node 0 active_anon:1743236kB inactive_anon:695804kB active_file:3343288kB inactive_file:787728kB unevictable:0kB isolated(anon):0kB isolated(file):0kB mapped:332168kB dirty:32kB writeback:0kB shmem:0kB shmem_thp: 0kB shmem_pmdmapped: 0kB anon_thp: 1225424kB writeback_tmp:0kB unstable:0kB pages_scanned:0 all_unreclaimable? no
Node 0 DMA free:15900kB min:136kB low:168kB high:200kB active_anon:0kB inactive_anon:0kB active_file:0kB inactive_file:0kB unevictable:0kB writepending:0kB present:15984kB managed:15900kB mlocked:0kB slab_reclaimable:0kB slab_unreclaimable:0kB kernel_stack:0kB pagetables:0kB bounce:0kB free_pcp:0kB local_pcp:0kB free_cma:0kB
lowmem_reserve[]: 0 3187 7643 7643
Node 0 DMA32 free:419732kB min:28124kB low:35152kB high:42180kB active_anon:541180kB inactive_anon:248988kB active_file:1466388kB inactive_file:389632kB unevictable:0kB writepending:0kB present:3370280kB managed:3290932kB mlocked:0kB slab_reclaimable:217184kB slab_unreclaimable:4180kB kernel_stack:160kB pagetables:984kB bounce:0kB free_pcp:2236kB local_pcp:660kB free_cma:0kB
lowmem_reserve[]: 0 0 4456 4456

Signed-off-by: Stanislaw Gruszka &lt;sgruszka@redhat.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
If -&gt;get_regs_len() callback return 0, we allocate 0 bytes of memory,
what print ugly warning in dmesg, which can be found further below.

This happen on mac80211 devices where ieee80211_get_regs_len() just
return 0 and driver only fills ethtool_regs structure and actually
do not provide any dump. However I assume this can happen on other
drivers i.e. when for some devices driver provide regs dump and for
others do not. Hence preventing to to print warning in ethtool code
seems to be reasonable.

ethtool: vmalloc: allocation failure: 0 bytes, mode:0x24080c2(GFP_KERNEL|__GFP_HIGHMEM|__GFP_ZERO)
&lt;snip&gt;
Call Trace:
[&lt;ffffffff813bde47&gt;] dump_stack+0x63/0x8c
[&lt;ffffffff811b0a1f&gt;] warn_alloc+0x13f/0x170
[&lt;ffffffff811f0476&gt;] __vmalloc_node_range+0x1e6/0x2c0
[&lt;ffffffff811f0874&gt;] vzalloc+0x54/0x60
[&lt;ffffffff8169986c&gt;] dev_ethtool+0xb4c/0x1b30
[&lt;ffffffff816adbb1&gt;] dev_ioctl+0x181/0x520
[&lt;ffffffff816714d2&gt;] sock_do_ioctl+0x42/0x50
&lt;snip&gt;
Mem-Info:
active_anon:435809 inactive_anon:173951 isolated_anon:0
 active_file:835822 inactive_file:196932 isolated_file:0
 unevictable:0 dirty:8 writeback:0 unstable:0
 slab_reclaimable:157732 slab_unreclaimable:10022
 mapped:83042 shmem:306356 pagetables:9507 bounce:0
 free:130041 free_pcp:1080 free_cma:0
Node 0 active_anon:1743236kB inactive_anon:695804kB active_file:3343288kB inactive_file:787728kB unevictable:0kB isolated(anon):0kB isolated(file):0kB mapped:332168kB dirty:32kB writeback:0kB shmem:0kB shmem_thp: 0kB shmem_pmdmapped: 0kB anon_thp: 1225424kB writeback_tmp:0kB unstable:0kB pages_scanned:0 all_unreclaimable? no
Node 0 DMA free:15900kB min:136kB low:168kB high:200kB active_anon:0kB inactive_anon:0kB active_file:0kB inactive_file:0kB unevictable:0kB writepending:0kB present:15984kB managed:15900kB mlocked:0kB slab_reclaimable:0kB slab_unreclaimable:0kB kernel_stack:0kB pagetables:0kB bounce:0kB free_pcp:0kB local_pcp:0kB free_cma:0kB
lowmem_reserve[]: 0 3187 7643 7643
Node 0 DMA32 free:419732kB min:28124kB low:35152kB high:42180kB active_anon:541180kB inactive_anon:248988kB active_file:1466388kB inactive_file:389632kB unevictable:0kB writepending:0kB present:3370280kB managed:3290932kB mlocked:0kB slab_reclaimable:217184kB slab_unreclaimable:4180kB kernel_stack:160kB pagetables:984kB bounce:0kB free_pcp:2236kB local_pcp:660kB free_cma:0kB
lowmem_reserve[]: 0 0 4456 4456

Signed-off-by: Stanislaw Gruszka &lt;sgruszka@redhat.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>net: ethtool: convert large order kmalloc allocations to vzalloc</title>
<updated>2017-01-31T18:28:06+00:00</updated>
<author>
<name>Alexei Starovoitov</name>
<email>ast@fb.com</email>
</author>
<published>2017-01-31T02:25:18+00:00</published>
<link rel='alternate' type='text/html' href='https://git.tavy.me/linux.git/commit/?id=4d1ceea8516cd6adf21f6b75995e2a7d4f376f9b'/>
<id>4d1ceea8516cd6adf21f6b75995e2a7d4f376f9b</id>
<content type='text'>
under memory pressure 'ethtool -S' command may warn:
[ 2374.385195] ethtool: page allocation failure: order:4, mode:0x242c0c0
[ 2374.405573] CPU: 12 PID: 40211 Comm: ethtool Not tainted
[ 2374.423071] Call Trace:
[ 2374.423076]  [&lt;ffffffff8148cb29&gt;] dump_stack+0x4d/0x64
[ 2374.423080]  [&lt;ffffffff811667cb&gt;] warn_alloc_failed+0xeb/0x150
[ 2374.423082]  [&lt;ffffffff81169cd3&gt;] ? __alloc_pages_direct_compact+0x43/0xf0
[ 2374.423084]  [&lt;ffffffff8116a25c&gt;] __alloc_pages_nodemask+0x4dc/0xbf0
[ 2374.423091]  [&lt;ffffffffa0023dc2&gt;] ? cmd_exec+0x722/0xcd0 [mlx5_core]
[ 2374.423095]  [&lt;ffffffff811b3dcc&gt;] alloc_pages_current+0x8c/0x110
[ 2374.423097]  [&lt;ffffffff81168859&gt;] alloc_kmem_pages+0x19/0x90
[ 2374.423099]  [&lt;ffffffff81186e5e&gt;] kmalloc_order_trace+0x2e/0xe0
[ 2374.423101]  [&lt;ffffffff811c0084&gt;] __kmalloc+0x204/0x220
[ 2374.423105]  [&lt;ffffffff816c269e&gt;] dev_ethtool+0xe4e/0x1f80
[ 2374.423106]  [&lt;ffffffff816b967e&gt;] ? dev_get_by_name_rcu+0x5e/0x80
[ 2374.423108]  [&lt;ffffffff816d6926&gt;] dev_ioctl+0x156/0x560
[ 2374.423111]  [&lt;ffffffff811d4c68&gt;] ? mem_cgroup_commit_charge+0x78/0x3c0
[ 2374.423117]  [&lt;ffffffff8169d542&gt;] sock_do_ioctl+0x42/0x50
[ 2374.423119]  [&lt;ffffffff8169d9c3&gt;] sock_ioctl+0x1b3/0x250
[ 2374.423121]  [&lt;ffffffff811f0f42&gt;] do_vfs_ioctl+0x92/0x580
[ 2374.423123]  [&lt;ffffffff8100222b&gt;] ? do_audit_syscall_entry+0x4b/0x70
[ 2374.423124]  [&lt;ffffffff8100287c&gt;] ? syscall_trace_enter_phase1+0xfc/0x120
[ 2374.423126]  [&lt;ffffffff811f14a9&gt;] SyS_ioctl+0x79/0x90
[ 2374.423127]  [&lt;ffffffff81002bb0&gt;] do_syscall_64+0x50/0xa0
[ 2374.423129]  [&lt;ffffffff817e19bc&gt;] entry_SYSCALL64_slow_path+0x25/0x25

~1160 mlx5 counters ~= order 4 allocation which is unlikely to succeed
under memory pressure. Convert them to vzalloc() as ethtool_get_regs() does.
Also take care of drivers without counters similar to
commit 67ae7cf1eeda ("ethtool: Allow zero-length register dumps again")
and reduce warn_on to warn_on_once.

Signed-off-by: Alexei Starovoitov &lt;ast@kernel.org&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
under memory pressure 'ethtool -S' command may warn:
[ 2374.385195] ethtool: page allocation failure: order:4, mode:0x242c0c0
[ 2374.405573] CPU: 12 PID: 40211 Comm: ethtool Not tainted
[ 2374.423071] Call Trace:
[ 2374.423076]  [&lt;ffffffff8148cb29&gt;] dump_stack+0x4d/0x64
[ 2374.423080]  [&lt;ffffffff811667cb&gt;] warn_alloc_failed+0xeb/0x150
[ 2374.423082]  [&lt;ffffffff81169cd3&gt;] ? __alloc_pages_direct_compact+0x43/0xf0
[ 2374.423084]  [&lt;ffffffff8116a25c&gt;] __alloc_pages_nodemask+0x4dc/0xbf0
[ 2374.423091]  [&lt;ffffffffa0023dc2&gt;] ? cmd_exec+0x722/0xcd0 [mlx5_core]
[ 2374.423095]  [&lt;ffffffff811b3dcc&gt;] alloc_pages_current+0x8c/0x110
[ 2374.423097]  [&lt;ffffffff81168859&gt;] alloc_kmem_pages+0x19/0x90
[ 2374.423099]  [&lt;ffffffff81186e5e&gt;] kmalloc_order_trace+0x2e/0xe0
[ 2374.423101]  [&lt;ffffffff811c0084&gt;] __kmalloc+0x204/0x220
[ 2374.423105]  [&lt;ffffffff816c269e&gt;] dev_ethtool+0xe4e/0x1f80
[ 2374.423106]  [&lt;ffffffff816b967e&gt;] ? dev_get_by_name_rcu+0x5e/0x80
[ 2374.423108]  [&lt;ffffffff816d6926&gt;] dev_ioctl+0x156/0x560
[ 2374.423111]  [&lt;ffffffff811d4c68&gt;] ? mem_cgroup_commit_charge+0x78/0x3c0
[ 2374.423117]  [&lt;ffffffff8169d542&gt;] sock_do_ioctl+0x42/0x50
[ 2374.423119]  [&lt;ffffffff8169d9c3&gt;] sock_ioctl+0x1b3/0x250
[ 2374.423121]  [&lt;ffffffff811f0f42&gt;] do_vfs_ioctl+0x92/0x580
[ 2374.423123]  [&lt;ffffffff8100222b&gt;] ? do_audit_syscall_entry+0x4b/0x70
[ 2374.423124]  [&lt;ffffffff8100287c&gt;] ? syscall_trace_enter_phase1+0xfc/0x120
[ 2374.423126]  [&lt;ffffffff811f14a9&gt;] SyS_ioctl+0x79/0x90
[ 2374.423127]  [&lt;ffffffff81002bb0&gt;] do_syscall_64+0x50/0xa0
[ 2374.423129]  [&lt;ffffffff817e19bc&gt;] entry_SYSCALL64_slow_path+0x25/0x25

~1160 mlx5 counters ~= order 4 allocation which is unlikely to succeed
under memory pressure. Convert them to vzalloc() as ethtool_get_regs() does.
Also take care of drivers without counters similar to
commit 67ae7cf1eeda ("ethtool: Allow zero-length register dumps again")
and reduce warn_on to warn_on_once.

Signed-off-by: Alexei Starovoitov &lt;ast@kernel.org&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>net: ethtool: Initialize buffer when querying device channel settings</title>
<updated>2017-01-18T19:58:23+00:00</updated>
<author>
<name>Eran Ben Elisha</name>
<email>eranbe@mellanox.com</email>
</author>
<published>2017-01-17T17:19:17+00:00</published>
<link rel='alternate' type='text/html' href='https://git.tavy.me/linux.git/commit/?id=31a86d137219373c3222ca5f4f912e9a4d8065bb'/>
<id>31a86d137219373c3222ca5f4f912e9a4d8065bb</id>
<content type='text'>
Ethtool channels respond struct was uninitialized when querying device
channel boundaries settings. As a result, unreported fields by the driver
hold garbage.  This may cause sending unsupported params to driver.

Fixes: 8bf368620486 ('ethtool: ensure channel counts are within bounds ...')
Signed-off-by: Eran Ben Elisha &lt;eranbe@mellanox.com&gt;
Signed-off-by: Tariq Toukan &lt;tariqt@mellanox.com&gt;
CC: John W. Linville &lt;linville@tuxdriver.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Ethtool channels respond struct was uninitialized when querying device
channel boundaries settings. As a result, unreported fields by the driver
hold garbage.  This may cause sending unsupported params to driver.

Fixes: 8bf368620486 ('ethtool: ensure channel counts are within bounds ...')
Signed-off-by: Eran Ben Elisha &lt;eranbe@mellanox.com&gt;
Signed-off-by: Tariq Toukan &lt;tariqt@mellanox.com&gt;
CC: John W. Linville &lt;linville@tuxdriver.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net</title>
<updated>2016-11-27T04:42:21+00:00</updated>
<author>
<name>David S. Miller</name>
<email>davem@davemloft.net</email>
</author>
<published>2016-11-27T04:42:21+00:00</published>
<link rel='alternate' type='text/html' href='https://git.tavy.me/linux.git/commit/?id=0b42f25d2f123bb7fbd3565d003a8ea9e1e810fe'/>
<id>0b42f25d2f123bb7fbd3565d003a8ea9e1e810fe</id>
<content type='text'>
udplite conflict is resolved by taking what 'net-next' did
which removed the backlog receive method assignment, since
it is no longer necessary.

Two entries were added to the non-priv ethtool operations
switch statement, one in 'net' and one in 'net-next, so
simple overlapping changes.

Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
udplite conflict is resolved by taking what 'net-next' did
which removed the backlog receive method assignment, since
it is no longer necessary.

Two entries were added to the non-priv ethtool operations
switch statement, one in 'net' and one in 'net-next, so
simple overlapping changes.

Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
</pre>
</div>
</content>
</entry>
</feed>
