Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/sched/act_tunnel_key.c
between commit:
38230a3e0e09 ("net/sched: act_tunnel_key: fix NULL dereference when 'goto
chain' is used")
from the net tree and commit:
036bb44327f5 ("net: sched: change type of
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/sched/act_csum.c
between commit:
11a245e2f7bf ("net/sched: act_csum: fix NULL dereference when 'goto chain' is
used")
from the net tree and commit:
036bb44327f5 ("net: sched: change type of reference and bind
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/aquantia/atlantic/aq_hw.h
between commit:
94b3b542303f ("net: aquantia: vlan unicast address list correct handling")
from the net tree and commit:
c1af5427954b ("net: aquantia: Ethtool based
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/ipv4/fib_frontend.c
between commit:
2eabd764cb5512f1338 ("net: ipv4: add missing RTA_TABLE to rtm_ipv4_policy")
from the net tree and commit:
404eb77ea766260c45c ("ipv4: support sport, dport and ip_proto in
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/realtek/r8169.c
between commit:
3148dedfe79e ("r8169: fix powering up RTL8168h")
from the net tree and commit:
4f447d296982 ("r8169: drop member pll_power_ops from struct rtl8169_private")
Hi Anders,
On Wed, 9 May 2018 10:24:49 +0200 Anders Roxell
wrote:
>
> On 9 May 2018 at 06:19, Stephen Rothwell wrote:
> >
> > TEST_PROGS := run_netsocktests run_afpackettests test_bpf.sh netdevice.sh
> > rtnetlink.sh
> > - TEST_PROGS +=
On 9 May 2018 at 06:19, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> tools/testing/selftests/net/Makefile
>
> between commit:
>
> 1751eb42ddb5 ("selftests: net: use TEST_PROGS_EXTENDED")
>
> from the net tree
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
tools/testing/selftests/net/Makefile
between commit:
1751eb42ddb5 ("selftests: net: use TEST_PROGS_EXTENDED")
from the net tree and commits:
a7b15ab887e5 ("Merge
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/tls/tls_main.c
between commit:
98f0a39529e5 ("tls: fix use after free in tls_sk_proto_close")
from the net tree and commit:
f66de3ee2c16 ("net/tls: Split conf to rx + tx")
from the net-next tree.
I fixed it
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
kernel/bpf/syscall.c
between commit:
9ef09e35e521 ("bpf: fix possible spectre-v1 in find_and_alloc_map()")
from the net tree and commit:
a26ca7c982cb ("bpf: btf: Add pretty print support to the basic arraymap")
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
include/net/ip6_route.h
between commit:
edd7ceb78296 ("ipv6: Allow non-gateway ECMP for IPv6")
from the net tree and commit:
93c2fb253d17 ("net/ipv6: Rename fib6_info struct elements")
from the net-next tree.
I
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
tools/testing/selftests/net/Makefile
between commit:
9faedd643fd9 ("selftests: net: add in_netns.sh TEST_GEN_PROGS_EXTENDED")
from the net tree and commit:
a160725780e3 ("selftests: udp gso")
from the net-next
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/ipv4/xfrm4_policy.c
between commit:
d52e5a7e7ca4 ("ipv4: lock mtu in fnhe when received PMTU <
net.ipv4.route.min_pmtu")
from the net tree and commit:
68e813aa4307 ("net/ipv4: Remove fib table id from
Stephen Rothwell writes:
> Today's linux-next merge of the net-next tree got conflicts in:
>
> drivers/net/ethernet/mellanox/mlxsw/spectrum.h
> drivers/net/ethernet/mellanox/mlxsw/spectrum.c
>
> between commit:
>
> 663f1b26f9c1 ("mlxsw: spectrum: Prevent duplicate
Hi all,
Today's linux-next merge of the net-next tree got conflicts in:
drivers/net/ethernet/mellanox/mlxsw/spectrum.h
drivers/net/ethernet/mellanox/mlxsw/spectrum.c
between commit:
663f1b26f9c1 ("mlxsw: spectrum: Prevent duplicate mirrors")
from the net tree and commit:
a629ef210d89
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/phy/phy.c
between commit:
a2c054a896b8 ("net: phy: Tell caller result of phy_change()")
from the net tree and commit:
4fff2d33c707 ("net: phy: remove phy_error from phy_disable_interrupts")
from the
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/ipv6/netfilter/nft_fib_ipv6.c
between commit:
47b7e7f82802 ("netfilter: don't set F_IFACE on ipv6 fib lookups")
from the net tree and commit:
b75cc8f90f07 ("net/ipv6: Pass skb to route lookup")
from the
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/smc/smc_core.c
between commit:
2be922f31606 ("net/smc: use link_id of server in confirm link reply")
from the net tree and commit:
52bedf37bafe ("net/smc: process add/delete link messages")
from the net-next
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/mellanox/mlxsw/spectrum.c
between commit:
77d270967c5f ("mlxsw: spectrum: Fix handling of resource_size_param")
from the net tree and commit:
4f4bbf7c4e3d ("devlink: Perform cleanup of
Stephen Rothwell writes:
> Today's linux-next merge of the net-next tree got a conflict in:
>
> net/ipv4/ip_tunnel.c
>
> between commit:
>
> 4e994776e7bd ("ip_tunnel: Do not use mark in skb by default")
>
> from the net tree and commit:
>
> b0066da52ea5 ("ip_tunnel:
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/ipv4/ip_tunnel.c
between commit:
4e994776e7bd ("ip_tunnel: Do not use mark in skb by default")
from the net tree and commit:
b0066da52ea5 ("ip_tunnel: Rename & publish init_tunnel_flow")
from the net-next
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
kernel/bpf/verifier.c
between commit:
6f16101e6a8b ("bpf: mark dst unknown on inconsistent {s, u}bounds
adjustments")
from the net tree and commit:
f4d7e40a5b71 ("bpf: introduce function calls (verification)")
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/tun.c
between commit:
4df0bfc79904 ("tun: fix a memory leak for tfile->tx_array")
from the net tree and commits:
8bf5c4ee1889 ("tun: setup xdp_rxq_info")
5990a30510ed ("tun/tap: use ptr_ring instead
Hi all,
Today's linux-next merge of the net-next tree got conflicts in:
net/sched/sch_ingress.c
net/sched/sch_api.c
include/net/sch_generic.h
between commit:
81d947e2b8dd ("net, sched: fix panic when updating miniq {b,q}stats")
from the net tree and commits:
54160ef6ec64 ("net:
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/ipv6/ip6_output.c
between commit:
749439bfac6e ("ipv6: fix udpv6 sendmsg crash caused by too small MTU")
from the net tree and commit:
0f6c480f23f4 ("xfrm: Move dst->path into struct xfrm_dst")
from the
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/openvswitch/flow_netlink.c
between commit:
95a332088ecb ("Revert "openvswitch: Add erspan tunnel support."")
from the net tree and commit:
1d7e2ed22f8d ("net: erspan: refactor existing erspan code")
from the
On Mon, Jan 15, 2018 at 1:52 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> include/linux/mlx5/mlx5_ifc.h
>
> between commit:
>
> 8978cc921fc7 ("{net,ib}/mlx5: Don't disable local loopback multicast
>
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
include/linux/mlx5/mlx5_ifc.h
between commit:
8978cc921fc7 ("{net,ib}/mlx5: Don't disable local loopback multicast traffic
when needed")
from the net tree and commit:
40817cdbb695 ("net/mlx5: Add hairpin
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
kernel/bpf/verifier.c
between commit:
0c17d1d2c619 ("bpf: fix incorrect tracking of register size truncation")
from the net tree and commits:
f4d7e40a5b71 ("bpf: introduce function calls (verification)")
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/netronome/nfp/bpf/main.c
between commit:
d3f89b98e391 ("nfp: bpf: keep track of the offloaded program")
from the net tree and commit:
bd0b2e7fe611 ("net: xdp: make the stack take care of the
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/phy/marvell.c
between commit:
c505873eaece ("net: phy: marvell: Limit 88m1101 autoneg errata to 88E1145 as
well.")
from the net tree and commit:
80274abafc60 ("net: phy: remove generic settings for
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/phy/meson-gxl.c
between commit:
f1e2400a80ff ("net: phy: meson-gxl: detect LPA corruption")
from the net tree and commit:
80274abafc60 ("net: phy: remove generic settings for callbacks config_aneg
and
On Tue, Oct 31, 2017 at 5:58 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> net/sched/cls_api.c
>
> between commit:
>
> 822e86d997e4 ("net_sched: remove tcf_block_put_deferred()")
>
> from the net tree and
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/sched/cls_api.c
between commit:
822e86d997e4 ("net_sched: remove tcf_block_put_deferred()")
from the net tree and commit:
8c4083b30e56 ("net: sched: add block bind/unbind notif. and extended
block_get/put")
On 10/19/2017 03:05 PM, Mark Brown wrote:
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
tools/testing/selftests/bpf/test_verifier.c
between commit:
28e33f9d78eef ("bpf: disallow arithmetic operations on context pointer")
from the net tree and commit:
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
tools/testing/selftests/bpf/test_verifier.c
between commit:
28e33f9d78eef ("bpf: disallow arithmetic operations on context pointer")
from the net tree and commit:
22c8852624fc9 ("bpf: improve selftests and add
On Tue, Oct 17, 2017 at 02:30:29PM +0300, Sergei Shtylyov wrote:
> > diff --cc drivers/net/dsa/mv88e6060.c
> > index f123ed57630d,6173be889d95..
> > --- a/drivers/net/dsa/mv88e6060.c
> > +++ b/drivers/net/dsa/mv88e6060.c
>Your mail ends here.
Yes, that's the resulting diff.
Hello!
On 10/16/2017 12:36 PM, Mark Brown wrote:
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/dsa/mv88e6060.c
between commit:
3efc93c2bc243 ("net: dsa: mv88e6060: fix switch MAC address")
from the net tree and commit:
56c3ff9bf23e1 ("net: dsa:
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/dsa/mv88e6060.c
between commit:
3efc93c2bc243 ("net: dsa: mv88e6060: fix switch MAC address")
from the net tree and commit:
56c3ff9bf23e1 ("net: dsa: mv88e6060: setup random mac address")
from the
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/marvell/mvpp2.c
between commit:
4c2286826451 ("net: mvpp2: fix the mac address used when using PPv2.2")
from the net tree and commits:
09f8397553a2 ("net: mvpp2: introduce per-port nrxqs/ntxqs
On Wed, Aug 23, 2017 at 11:31:05AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> net/ipv6/ip6_fib.c
>
> between commit:
>
> c5cff8561d2d ("ipv6: add rcu grace period before freeing fib6_node")
>
> from the net tree and
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/ipv6/ip6_fib.c
between commit:
c5cff8561d2d ("ipv6: add rcu grace period before freeing fib6_node")
from the net tree and commit:
a460aa83963b ("ipv6: fib: Add helpers to hold / drop a reference on rt6_info")
Hi Neal,
On Sun, 6 Aug 2017 22:21:43 -0400 Neal Cardwell wrote:
>
> > I fixed it up (see below) and can carry the fix as necessary. This
> > is now fixed as far as linux-next is concerned, but any non trivial
> > conflicts should be mentioned to your upstream maintainer
On Sun, Aug 6, 2017 at 10:01 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> net/ipv4/tcp_output.c
>
> between commit:
>
> a2815817ffa6 ("tcp: enable xmit timer fix by having TLP use time when RTO
> should
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/ipv4/tcp_output.c
between commit:
a2815817ffa6 ("tcp: enable xmit timer fix by having TLP use time when RTO
should fire")
from the net tree and commit:
bb4d991a28cc ("tcp: adjust tail loss probe timeout")
On Thu, 3 Aug 2017 12:01:37 +1000
Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> drivers/net/hyperv/netvsc.c
>
> between commit:
>
> 4a0dee1ffe0e ("netvsc: Initialize 64-bit stats seqcount")
>
> from the
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/hyperv/netvsc.c
between commit:
4a0dee1ffe0e ("netvsc: Initialize 64-bit stats seqcount")
from the net tree and commit:
35fbbccfb417 ("netvsc: save pointer to parent netvsc_device in channel table")
On Mon, Jul 3, 2017 at 4:43 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got conflicts in:
>
> drivers/net/ethernet/mellanox/mlx5/core/health.c
> include/linux/mlx5/driver.h
>
> between commit:
>
> 2a0165a034ac ("net/mlx5:
Hi all,
Today's linux-next merge of the net-next tree got conflicts in:
drivers/net/ethernet/mellanox/mlx5/core/health.c
include/linux/mlx5/driver.h
between commit:
2a0165a034ac ("net/mlx5: Cancel delayed recovery work when unloading the
driver")
from the net tree and commit:
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/macvlan.c
between commits:
e26f43faa0d7 ("macvlan: Do not return error when setting the same mac
address")
18c8c54de9a6 ("macvlan: Let passthru macvlan correctly restore lower mac
address")
from the
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/core/rtnetlink.c
between commit:
db833d40ad32 ("rtnetlink: add IFLA_GROUP to ifla_policy")
from the net tree and commit:
3d3ea5af5c0b ("rtnl: Add support for netdev event to link messages")
from the net-next
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/batman-adv/routing.c
between commit:
a1a745ef980a ("batman-adv: fix memory leak when dropping packet from other
gateway")
from the net tree and commit:
22f0502ed9f3 ("batman-adv: Print correct function names
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/qlogic/qed/qed_debug.c
between commit:
ace17c369295 ("qed: fix dump of context data")
from the net tree and commit:
7b6859fbdcc4 ("qed: Utilize FW 8.20.0.0")
from the net-next tree.
I fixed
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/dsa/dsa2.c
between commit:
b07ac9894644 ("net: dsa: Fix stale cpu_switch reference after unbind then
bind")
from the net tree and commits:
8b0d3ea55587 ("net: dsa: store CPU port pointer in the tree")
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/phy/marvell.c
between commit:
898805e0cdf7 ("net: phy: fix marvell phy status reading")
from the net tree and commit:
e1dde8dc5b27 ("net: phy: marvell: Refactor some bigger functions")
from the
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/phy/marvell.c
between commit:
f2899788353c ("net: phy: marvell: Limit errata to 88m1101")
from the net tree and commit:
0c3439bc7773 ("net: phy: Marvell: checkpatch - Comments")
from the net-next
On 04/18/2017 02:18 AM, Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
kernel/bpf/syscall.c
between commits:
6b1bb01bcc5b ("bpf: fix cb access in socket filter programs on tail calls")
c2002f983767 ("bpf: fix checking xdp_adjust_head
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
kernel/bpf/syscall.c
between commits:
6b1bb01bcc5b ("bpf: fix cb access in socket filter programs on tail calls")
c2002f983767 ("bpf: fix checking xdp_adjust_head on tail calls")
from the net tree and commit:
On Thu, Apr 6, 2017 at 5:12 PM, Stephen Rothwell wrote:
> diff --cc net/sched/sch_generic.c
> index 1a2f9e964330,3e64d23e098c..
> --- a/net/sched/sch_generic.c
> +++ b/net/sched/sch_generic.c
> @@@ -794,8 -794,8 +794,8 @@@ static void attach_default_qdiscs(struc
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/sched/sch_generic.c
between commit:
92f9170621a1 ("net_sched: check noop_qdisc before qdisc_hash_add()")
from the net tree and commit:
49b499718fa1 ("net: sched: make default fifo qdiscs appear in the dump")
On Tue, Apr 04, 2017 at 11:13:57AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> net/core/flow_dissector.c
>
> between commit:
>
> ac6a3722fed6 ("flow dissector: correct size of storage for ARP")
>
> from the net tree and
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/core/flow_dissector.c
between commit:
ac6a3722fed6 ("flow dissector: correct size of storage for ARP")
from the net tree and commit:
9bf881ffc5c0 ("flow_dissector: Move ARP dissection into a separate
On 04/03/2017 04:07 AM, Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the net-next tree got conflicts in:
tools/testing/selftests/bpf/Makefile
tools/testing/selftests/bpf/test_verifier.c
between commit:
02ea80b1850e ("bpf: add various verifier test cases for
Hi all,
Today's linux-next merge of the net-next tree got conflicts in:
tools/testing/selftests/bpf/Makefile
tools/testing/selftests/bpf/test_verifier.c
between commit:
02ea80b1850e ("bpf: add various verifier test cases for self-tests")
from the net tree and commits:
6882804c916b
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/broadcom/genet/bcmmii.c
between commit:
31739eae738c ("net: bcmgenet: remove bcmgenet_internal_phy_setup()")
from the net tree and commit:
421380856d9c ("net: bcmgenet: add support for the
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/hyperv/netvsc.c
between commit:
e14b4db7a567 ("netvsc: fix race during initialization")
from the net tree and commits:
0d6dd35784e7 ("netvsc: need napi scheduled during removal")
6de38af611ca
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/cadence/macb.h
between commit:
dc97a89e726c ("net: macb: Fix 64 bit addressing support for GEM")
from the net tree and commit:
c2594d804d5c ("macb: Common code to enable ptp support for
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
between commit:
3e621b19b0bb ("net/mlx5e: Support TC encapsulation offloads with upper
devices")
from the net tree and commits:
75c33da82736 ("net/mlx5e: TC ipv4
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/mpls/af_mpls.c
between commit:
9f427a0e474a ("net: mpls: Fix multipath selection for LSR use case")
from the net tree and commit:
27d691056bde ("mpls: Packet stats")
from the net-next tree.
I fixed it up
Thu, Dec 01, 2016 at 02:41:59AM CET, s...@canb.auug.org.au wrote:
>Hi all,
>
>Today's linux-next merge of the net-next tree got a conflict in:
>
> net/sched/cls_flower.c
>
>between commit:
>
> 725cbb62e7ad ("sched: cls_flower: remove from hashtable only in case skip sw
> flag is not set")
>
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/sched/cls_flower.c
between commit:
725cbb62e7ad ("sched: cls_flower: remove from hashtable only in case skip sw
flag is not set")
from the net tree and commit:
13fa876ebd03 ("net/sched: cls_flower: merge
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/cadence/macb.c
between commit:
a0b44eea372b ("net: macb: fix the RX queue reset in macb_rx()")
from the net tree and commit:
b410d13e10db ("net: macb: Use variables with defaults for tx/rx
On Tue, Nov 29, 2016 at 11:22:32AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> drivers/net/ethernet/amd/xgbe/xgbe-main.c
>
> between commit:
>
> 91eefaabf102 ("amd-xgbe: Fix unused suspend handlers build warning")
>
>
On 11/29/2016 01:31 AM, Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/sched/cls_flower.c
between commit:
d936377414fa ("net, sched: respect rcu grace period on cls destruction")
from the net tree and commit:
13fa876ebd03
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/sched/cls_flower.c
between commit:
d936377414fa ("net, sched: respect rcu grace period on cls destruction")
from the net tree and commit:
13fa876ebd03 ("net/sched: cls_flower: merge filter delete/destroy
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/mellanox/mlx4/en_netdev.c
between commit:
b4353708f5a1 ("Revert "net/mlx4_en: Avoid unregister_netdev at shutdown
flow"")
from the net tree and commit:
67f8b1dcb9ee ("net/mlx4_en: Refactor
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/amd/xgbe/xgbe-main.c
between commit:
91eefaabf102 ("amd-xgbe: Fix unused suspend handlers build warning")
from the net tree and commit:
bd8255d8ba35 ("amd-xgbe: Prepare for supporting PCI
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
between commit:
ba1ffd74df74 ("stmmac: fix PTP support for GMAC4")
from the net tree and commit:
38ddc59d65b6 ("net: stmmac: replace all pr_xxx by their netdev_xxx
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
kernel/bpf/verifier.c
between commit:
f23cc643f9ba ("bpf: fix range arithmetic for bpf map access")
from the net tree and commit:
de464375daf0 ("bpf: Remove unused but set variables")
from the net-next tree.
I
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
include/linux/bpf_verifier.h
between commit:
f23cc643f9ba ("bpf: fix range arithmetic for bpf map access")
from the net tree and commit:
57a09bf0a416 ("bpf: Detect identical PTR_TO_MAP_VALUE_OR_NULL registers")
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
between commit:
ba1ffd74df74 ("stmmac: fix PTP support for GMAC4")
from the net tree and commit:
f8be0d78be6e ("net: ethernet: stmmac: change dma descriptors to
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/cavium/thunder/nicvf_main.c
between commit:
712c31853440 ("net: thunderx: Program LMAC credits based on MTU")
from the net tree and commit:
109cc16526c6 ("ethernet/cavium: use core min/max MTU
On Thu, Nov 10, 2016 at 1:50 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
>
> between commit:
> ee39fbc4447d ("net/mlx5: E-Switch, Set the
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
between commit:
ee39fbc4447d ("net/mlx5: E-Switch, Set the actions for offloaded rules
properly")
from the net tree and commit:
66958ed906b8 ("net/mlx5:
On Mon, Nov 7, 2016 at 5:25 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> net/netlink/genetlink.c
>
> between commit:
>
> 00ffc1ba02d8 ("genetlink: fix a memory leak on error path")
>
> from the net tree
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/netlink/genetlink.c
between commit:
00ffc1ba02d8 ("genetlink: fix a memory leak on error path")
from the net tree and commit:
2ae0f17df1cd ("genetlink: use idr to track families")
from the net-next tree.
I
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
include/net/udp.h
between commit:
286c72deabaa ("udp: must lock the socket in udp_disconnect()")
from the net tree and commit:
f970bd9e3a06 ("udp: implement memory accounting helpers")
from the net-next tree.
I
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/ibm/ibmvnic.c
between commit:
87737f8810db ("ibmvnic: Update MTU after device initialization")
from the net tree and commit:
d894be57ca92 ("ethernet: use net core MTU range checking in more
On Thu, Oct 20, 2016 at 11:01:42AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got conflicts in:
>
> include/linux/netdevice.h
> net/core/dev.c
>
> between commit:
>
> e4961b076885 ("net: core: Correctly iterate over lower adjacency list")
>
Hi all,
Today's linux-next merge of the net-next tree got conflicts in:
include/linux/netdevice.h
net/core/dev.c
between commit:
e4961b076885 ("net: core: Correctly iterate over lower adjacency list")
from the net tree and commit:
1a3f060c1a47 ("net: Introduce new api for walking
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/phy/Kconfig
between commit:
c2f57fb97da5 ("drivers: net: phy: mdio-xgene: Add hardware dependency")
from the net tree and commit:
d75b4a22b255 ("net: phy: Sort Makefile and Kconfig")
from the net-next
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/qlogic/qed/qed_dcbx.c
between commit:
561ed23331df ("qed: fix kzalloc-simple.cocci warnings")
from the net tree and commit:
2591c280c375 ("qed: Remove OOM messages")
from the net-next tree.
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/mediatek/mtk_eth_soc.c
between commits:
d3bd1ce4db8e ("net: ethernet: mediatek: remove redundant free_irq for
devm_request_irq allocated irq")
7c6b0d76fa02 ("net: ethernet: mediatek: fix logic
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
between commit:
e0d8b2908696 ("cxgb4: Fixes resource allocation for ULD's in kdump kernel")
from the net tree and commit:
94cdb8bb993a ("cxgb4: Add support for
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/dsa/mv88e6xxx/chip.c
between commit:
601bbae0bc10 ("dsa: mv88e6xxx: hide unused functions")
from the net tree and commit:
9c93829c014f ("net: dsa: mv88e6xxx: use the new PHY API")
from the net-next
On 08/15/2016 02:35 AM, Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
kernel/bpf/verifier.c
between commit:
747ea55e4f78 ("bpf: fix bpf_skb_in_cgroup helper naming")
from the net tree and commit:
60d20f9195b2 ("bpf: Add
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
kernel/bpf/verifier.c
between commit:
747ea55e4f78 ("bpf: fix bpf_skb_in_cgroup helper naming")
from the net tree and commit:
60d20f9195b2 ("bpf: Add bpf_current_task_under_cgroup helper")
from the net-next tree.
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
between commit:
ec25bc04ed8e ("net/mlx4_en: Add resilience in low memory systems")
from the net tree and commit:
9ecc2d86171a ("net/mlx4_en: add xdp forwarding and
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/sctp/input.c
between commit:
c74bfbdba0e8 ("sctp: load transport header after sk_filter")
from the net tree and commit:
3acb50c18d8d ("sctp: delay as much as possible skb_linearize")
from the net-next tree.
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/sched/sch_htb.c
between commit:
338ed9b4de57 ("net_sched: sch_htb: export class backlog in dumps")
from the net tree and commit:
0564bf0afae4 ("net/sched/sch_htb: clamp xstats tokens to fit into 32-bit int")
1 - 100 of 156 matches
Mail list logo