linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/ethernet/intel/i40e/i40e_main.c between commit: f6bd09625ba6 ("i40e: enable VSI broadcast promiscuous mode instead of adding broadcast filter") from the net tree and commit: 3e25a8f31af1 ("i40e: add

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/ethernet/cavium/liquidio/lio_main.c between commit: 8e6ce7ebeb34 ("net: cavium: liquidio: Avoid dma_unmap_single on uninitialized ndata") from the net tree and commit: 6a885b60dad2 ("liquidio:

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/usb/r8152.c between commit: 2609af19362d ("r8152: fix runtime function for RTL8152") from the net tree and commit: a028a9e003f2 ("r8152: move the settings of PHY to a work queue") from the net-next

Re: linux-next: manual merge of the net-next tree with the net tree

On Mon, Jul 4, 2016 at 6:02 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/en.h > > between commit: > > 6cd392a082de ("net/mlx5e: Handle RQ flush in error cases") > >

Re: linux-next: manual merge of the net-next tree with the net tree

On Mon, Jul 4, 2016 at 6:07 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/en_main.c > > between commit: > > 29429f3300a3 ("net/mlx5e: Timeout if SQ doesn't flush

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/ethernet/mellanox/mlx5/core/en_main.c between commit: 29429f3300a3 ("net/mlx5e: Timeout if SQ doesn't flush during close") from the net tree and commit: 507f0c817f7a ("net/mlx5e: Add TXQ set max rate

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/ethernet/mellanox/mlx5/core/en.h between commit: 6cd392a082de ("net/mlx5e: Handle RQ flush in error cases") from the net tree and commit: cb3c7fd4f839 ("net/mlx5e: Support adaptive RX coalescing")

Re: linux-next: manual merge of the net-next tree with the net tree

On Mon, 2016-06-27 at 11:46 +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > net/sched/sch_netem.c > > between commit: > > 21de12ee5568 ("netem: fix a use after free") > > from the net tree and commit: > > 520ac30f4551

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/sched/sch_netem.c between commit: 21de12ee5568 ("netem: fix a use after free") from the net tree and commit: 520ac30f4551 ("net_sched: drop packets after root qdisc lock is released") from the net-next tree.

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/vrf.c between commit: 52fe705b493d ("net: vrf: replace hard tab with space in assignment") from the net tree and commits: 671cd19ade97 ("net: vrf: ipv4 support for local traffic to local addresses")

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/rds/tcp_listen.c between commit: 3bb549ae4c51 ("RDS: TCP: rds_tcp_accept_one() should transition socket from RESETTING to UP") from the net tree and commit: 0cb43965d42a ("RDS: split out connection specific

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/rds/tcp_connect.c between commit: 5c3da57d70f1 ("net: rds: fix coding style issues") from the net tree and commit: 0cb43965d42a ("RDS: split out connection specific state from rds_connection to

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/ethernet/qlogic/qed/qed_hsi.h between commit: b639f197210d ("qed: Add missing port-mode") from the net tree and commit: 351a4dedb34c ("qed: Utilize FW 8.10.3.0") from the net-next tree. I fixed it up

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/sched/act_police.c between commit: 53eb440f4ada ("net sched actions: introduce timestamp for firsttime use") from the net tree and commit: a03e6fe56971 ("act_police: fix a crash during removal") from the

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/ipv4/ip_gre.c between commit: e271c7b4420d ("gre: do not keep the GRE header around in collect medata mode") from the net tree and commit: 244a797bdcf1 ("gre: move iptunnel_pull_header down to ipgre_rcv")

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/netfilter/nf_conntrack_core.c between commit: 70d72b7e060e ("netfilter: conntrack: init all_locks to avoid debug warning") from the net tree and commit: a3efd81205b1 ("netfilter: conntrack: move generation

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: include/linux/netdevice.h between commit: 229740c63169 ("udp_offload: Set encapsulation before inner completes.") from the net tree and commit: 46aa2f30aa7f ("udp: Remove udp_offloads") from the net-next tree. I

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/core/rtnetlink.c between commit: 5f8e44741f9f ("net: fix infoleak in rtnetlink") from the net tree and commit: 270cb4d05b29 ("rtnl: align nlattr properly when needed") from the net-next tree. I fixed it up

Re: linux-next: manual merge of the net-next tree with the net tree

On Wed, Apr 27, 2016 at 5:01 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/en_main.c > > between commit: > > d8edd2469ace ("et/mlx5e: Fix minimum MTU") > > from the

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/ethernet/mellanox/mlx5/core/en_main.c between commit: d8edd2469ace ("et/mlx5e: Fix minimum MTU") from the net tree and commit: 0e405443e803 ("net/mlx5e: Improve set features ndo resiliency") from the

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/macsec.c between commit: 748164802c1b ("macsec: add missing macsec prefix in uapi") from the net tree and commit: f60d94c00968 ("macsec: use nla_put_u64_64bit()") from the net-next tree. I fixed it

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got conflicts in: include/linux/ipv6.h net/ipv6/addrconf.c between commit: 841645b5f2df ("ipv6: Revert optional address flusing on ifdown.") from the net tree and commits: 607ea7cda631 ("net/ipv6/addrconf: simplify sysctl

Re: linux-next: manual merge of the net-next tree with the net tree

Hi David, Stephen Rothwell writes: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/dsa/mv88e6xxx.c > > between commit: > > 207afda1b503 ("net: dsa: mv88e6xxx: share the same default FDB") > > from the net tree and commit:

Re: linux-next: manual merge of the net-next tree with the net tree

On Mon, 2016-04-18 at 11:31 +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > net/ipv4/udp.c > > between commit: > > d894ba18d4e4 ("soreuseport: fix ordering for mixed v4/v6 sockets") > > from the net tree and commit: > >

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/ipv4/udp.c between commit: d894ba18d4e4 ("soreuseport: fix ordering for mixed v4/v6 sockets") from the net tree and commit: ca065d0cf80f ("udp: no longer use SLAB_DESTROY_BY_RCU") from the net-next tree. I

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/dsa/mv88e6xxx.c between commit: 207afda1b503 ("net: dsa: mv88e6xxx: share the same default FDB") from the net tree and commit: 009a2b9843bf ("net: dsa: mv88e6xxx: add number of ports to info") from

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/tipc/subscr.c between commit: 4de13d7ed6ff ("tipc: fix nullptr crash during subscription cancel") from the net tree and commit: 7c13c6224123 ("tipc: introduce tipc_subscrb_subscribe() routine") (and following

Re: linux-next: manual merge of the net-next tree with the net tree

On 03/04/2016 03:09 AM, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/vxlan.c between commit: 4024fcf70556 ("vxlan: fix missing options_len update on RX with collect metadata") from the net tree and commit:

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/vxlan.c between commit: 4024fcf70556 ("vxlan: fix missing options_len update on RX with collect metadata") from the net tree and commit: 3288af0892e3 ("vxlan: move GBP header parsing to a separate

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/ethernet/mellanox/mlx5/core/en_tx.c between commit: b081da5ee186 ("net/mlx5e: Add rx/tx bytes software counters") from the net tree and commits: 9879515895ff ("net/mlx5e: Add TX stateless offloads for

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/ethernet/mellanox/mlx5/core/en_main.c between commit: 85082dba0a50 ("net/mlx5e: Correctly handle RSS indirection table when changing number of channels") from the net tree and commit: 08fb1dacdd76

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got conflicts in: drivers/net/ethernet/mellanox/mlx5/core/en.h between commit: b081da5ee186 ("net/mlx5e: Add rx/tx bytes software counters") from the net tree and commits: 89db09eb5979 ("net/mlx5e: Add TX inner packet counters")

Re: linux-next: manual merge of the net-next tree with the net tree

On 02/26/2016 01:13 AM, Stephen Rothwell wrote: [...] I fixed it up (see below) and can carry the fix as necessary (no action is required). Looks good to me, thanks Stephen! Best, Daniel

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: include/uapi/linux/bpf.h between commit: 2da897e51d7f ("bpf: fix csum setting for bpf_set_tunnel_key") from the net tree and commit: d5a3b1f69186 ("bpf: introduce BPF_MAP_TYPE_STACK_TRACE") from the net-next

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/phy/marvell.c between commit: 79be1a1c9090 ("phy: marvell: Fix and unify reg-init behavior") from the net tree and commit: 930b37ee8d84 ("net: phy: Add SGMII support for Marvell

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/phy/bcm7xxx.c between commit: c6dd213abe40 ("net: phy: bcm7xxx: Fix 40nm EPHY features") 815717d1473e ("net: phy: bcm7xxx: Remove wildcard entries" from the net tree and commit: 3125c081a593 ("net:

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/vxlan.c between commit: 72564b59ffc4 ("vxlan: Relax MTU constraints") from the net tree and commit: 1a8496ba4091 ("vxlan: consolidate output route calculation") from the net-next tree. I fixed it up

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/geneve.c between commit: a322a1bcf329 ("geneve: Fix IPv6 xmit stats update.") from the net tree and commit: abe492b4f50c ("geneve: UDP checksum configuration via netlink") from the net-next tree. I

Re: linux-next: manual merge of the net-next tree with the net tree

On 11/26/2015 01:01 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 commit: c9da161c6517 ("bpf: fix clearing on persistent program array maps") from the net tree and commit: f99bf205dab0 ("bpf: add

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: kernel/bpf/syscall.c between commit: c9da161c6517 ("bpf: fix clearing on persistent program array maps") from the net tree and commit: f99bf205dab0 ("bpf: add show_fdinfo handler for maps") from the net-next

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/ipv4/ipmr.c between commit: 0e615e9601a1 ("net: ipmr: fix static mfc/dev leaks on table destruction") from the net tree and commit: 7ef8f65df976 ("net: ipmr: fix code and comment style") from the net-next

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/ipv4/ipmr.c between commit: 44f49dd8b5a6 ("ipmr: fix possible race resulting from improper usage of IP_INC_STATS_BH() in preemptible context.") from the net tree and commit: 758ccac8e741 ("ipv4: Only compute

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/switchdev/switchdev.c between commit: 87aaf2caed84 ("switchdev: check if the vlan id is in the proper vlan range") from the net tree and commits: 7ea6eb3f56f4 ("switchdev: introduce transaction item queue for

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/usb/asix_common.c between commit: f6194bcf03e4 ("net: usb: asix: Fix crash on skb alloc failure") from the net tree and commit: 6a570814cd43 ("asix: Continue processing URB if no RX netdev buffer")

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/ipv4/inet_connection_sock.c between commit: 2306c704ce28 ("inet: fix race in reqsk_queue_unlink()") from the net tree and commit: 079096f103fa ("tcp/dccp: install syn_recv requests into ehash table") from the

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/ipv4/arp.c between commit: 63d008a4e9ee ("ipv4: send arp replies to the correct tunnel") from the net tree and commit: 0c4b51f0054c ("netfilter: Pass net into okfn") from the net-next tree. I fixed it up

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/usb/qmi_wwan.c between commit: a8079092c1bb (net: qmi_wwan: add HP lt4111 LTE/EV-DO/HSPA+ Gobi 4G Module) from the net tree and commit: 2070c48cf2b7 (qmi_wwan: Add support for Dell Wireless 5809e 4G

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/ethernet/cavium/Kconfig between commit: 22f54bf932a0 (net: thunderx: remove effective default y from Kconfig if ARCH_THUNDER=y) from the net tree and commit: 274b0b3984a9 (net: thunderx: Select

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/ethernet/ti/netcp_ethss.c between commit: 31a184b7acbc (net: netcp: ethss: cleanup gbe_probe() and gbe_remove() functions) from the net tree and commit: 489e8a2f09d7 (net: netcp: Fixes to CPSW

Re: linux-next: manual merge of the net-next tree with the net tree

On 07/30/2015 04:10 AM, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/bridge/br_multicast.c between commit: 544586f742b4 (bridge: mcast: give fast leave precedence over multicast router and querier) from the net tree and

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/bridge/br_multicast.c between commit: 544586f742b4 (bridge: mcast: give fast leave precedence over multicast router and querier) from the net tree and commit: 09cf0211f970 (bridge: mdb: fill state in

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/ipv4/ip_fragment.c between commit: 0e60d245a0be (inet: frag: change *_frag_mem_limit functions to take netns_frags as argument) from the net tree and commit: 14fe22e33462 (Revert ipv4: use skb coalescing in

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/bridge/br_mdb.c between commit: 5ebc784625ea (bridge: mdb: fix double add notification) from the net tree and commit: 09cf0211f970 (bridge: mdb: fill state in br_mdb_notify) from the net-next tree. I fixed

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/packet/af_packet.c between commit: 468479e6043c (packet: avoid out of bounds read in round robin fanout) from the net tree and commit: 3b3a5b0aab5b (packet: rollover huge flows before small flows) from the

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in drivers/net/phy/phy.c between commit c15e10e71ce3 (net: phy: Make sure phy_start() always re-enables the phy interrupts) from the net tree and commit 3e2186e02112 (net: phy: Add state machine state transitions debug prints)

Re: linux-next: manual merge of the net-next tree with the net tree

2015-05-20 19:59 GMT-07:00 Stephen Rothwell s...@canb.auug.org.au: Hi all, Today's linux-next merge of the net-next tree got a conflict in drivers/net/phy/phy.c between commit c15e10e71ce3 (net: phy: Make sure phy_start() always re-enables the phy interrupts) from the net tree and commit

<    1   2