Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/can/dev.c
between commit:
b552766c872f ("can: dev: prevent potential information leak in
can_fill_info()")
from Linus' tree and commits:
3e77f70e7345 ("can: dev: move driver related infrastructure into
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/switchdev/switchdev.c
between commit:
20776b465c0c ("net: switchdev: don't set port_obj_info->handled true when
-EOPNOTSUPP")
from Linus' tree and commits:
ffb68fc58e96 ("net: switchdev: remove the transaction
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
between commit:
57ac4a31c483 ("net/mlx5e: Correctly handle changing the number of queues when
the interface is down")
from Linus' tree and commit:
214baf22870c
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
include/net/net_namespace.h
between commit:
2a06b8982f8f ("net: reorder 'struct net' fields to avoid false sharing")
from Linus' tree and commit:
a30c7b429f2d ("net: introduce per-netns netdevice notifiers")
from
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c
between commit:
bf280c0387ebbf8ee ("ixgbe: fix double clean of Tx descriptors with xdp")
from Linus' tree and commit:
5c129241e2de79f09 ("ixgbe: add support for AF_XDP n
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/bluetooth/btusb.c
between commit:
1ffdb51f28e8ec ("Revert "Bluetooth: btusb: driver to enable the usb-wakeup
feature"")
from Linus' tree and commit:
9e45524a011107 ("Bluetooth: btusb: Fix suspend issue for
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/mac80211/cfg.c
between commit:
28c61a66abd6 ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule
432")
from Linus' tree and commit:
bd718fc11d5b ("mac80211: use STA info in rate_control_send_low()"
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/isdn/hisax/hfc_usb.c
between commit:
de6cc6515a44 ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule
153")
from Linus' tree and commit:
85993b8c9786 ("isdn: remove hisax driver")
from the ne
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/isdn/gigaset/i4l.c
between commit:
2874c5fd2842 ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule
152")
from Linus' tree and commit:
8e6c8aa3b52e ("isdn: gigaset: remove i4l support")
from
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/can/flexcan.c
between commit:
29c64b17a0bc ("can: flexcan: fix VF610 state transition issue")
from Linus' tree and commit:
99b7668c04b2 ("can: flexcan: adding platform specific details for LS1021A")
fr
From: Stephen Rothwell
Date: Fri, 10 Nov 2017 10:31:00 +1100
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> net/sched/cls_basic.c
> net/sched/cls_u32.c
>
> between commits:
>
> 0b2a59894b76 ("cls_basic: use tcf_exts_get_net() before call_rcu()")
> 3
On Thu, Nov 9, 2017 at 3:31 PM, Stephen Rothwell wrote:
> I fixed it up (I think - 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 when your tree
> is submitted for
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/sched/cls_basic.c
net/sched/cls_u32.c
between commits:
0b2a59894b76 ("cls_basic: use tcf_exts_get_net() before call_rcu()")
35c55fc156d8 ("cls_u32: use tcf_exts_get_net() before call_rcu()")
from Linus' tree a
On Mon, Oct 30, 2017 at 10:43:07AM -0700, Jakub Kicinski wrote:
> On Mon, 30 Oct 2017 17:02:24 +, Mark Brown wrote:
> > is submitted for merging. You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.
> Un
On Mon, 30 Oct 2017 17:02:24 +, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> drivers/net/ethernet/netronome/nfp/flower/action.c
>
> between commit:
>
> d309ae5c6a0064 ("nfp: refuse offloading filters that redirects to upper
> devi
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/ipv4/tcp_output.c
between commit:
5889e2c0e441d8 ("tcp: call tcp_rate_skb_sent() when retransmit with unaligned
skb->data")
from Linus' tree and commit:
e2080072ed2d98 ("tcp: new list for sent but unacked skbs
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
kernel/bpf/sockmap.c
between commit:
bfa640757e9378c ("bpf: rename sk_actions to align with bpf infrastructure")
from Linus' tree and commit:
6aaae2b6c4330a4 ("bpf: rename bpf_compute_data_end into
bpf_compute_dat
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/netronome/nfp/flower/action.c
between commit:
d309ae5c6a0064 ("nfp: refuse offloading filters that redirects to upper
devices")
from Linus' tree and commit:
62d3f60b4d065c ("nfp: use struct fi
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/rocker/rocker_ofdpa.c
between commit:
acb4b7df48b5 ("rocker: move dereference before free")
from Linus' tree and commit:
00fc0c51e35b ("rocker: Change world_ops API and implementation to be
sw
From: Stephen Rothwell
Date: Wed, 3 May 2017 11:07:03 +1000
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> arch/avr32/include/uapi/asm/socket.h
>
> between commit:
>
> 26202873bb51 ("avr32: remove support for AVR32 architecture")
>
> from Linus' tree a
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
arch/avr32/include/uapi/asm/socket.h
between commit:
26202873bb51 ("avr32: remove support for AVR32 architecture")
from Linus' tree and commits:
a2d133b1d465 ("sock: introduce SO_MEMINFO getsockopt")
6d4339028b35
On 3/23/17 5:10 PM, David Miller wrote:
From: Stephen Rothwell
Date: Fri, 24 Mar 2017 11:05:14 +1100
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
kernel/bpf/hashtab.c
between commit:
8c290e60fa2a ("bpf: fix hashmap extra_elems logic")
from Linus' tree and c
From: Stephen Rothwell
Date: Fri, 24 Mar 2017 11:05:14 +1100
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> kernel/bpf/hashtab.c
>
> between commit:
>
> 8c290e60fa2a ("bpf: fix hashmap extra_elems logic")
>
> from Linus' tree and commit:
>
> bcc6b1b
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
kernel/bpf/hashtab.c
between commit:
8c290e60fa2a ("bpf: fix hashmap extra_elems logic")
from Linus' tree and commit:
bcc6b1b7ebf8 ("bpf: Add hash of maps support")
from the net-next tree.
I fixed it up (see belo
am Gigi
>
>Subject: linux-next: manual merge of the net-next tree with Linus' tree
>
>Hi all,
>
>Today's linux-next merge of the net-next tree got a conflict in:
>
> net/sched/cls_matchall.c
>
>between commit:
>
> fd62d9f5c575 ("net/sch
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/sched/cls_matchall.c
between commit:
fd62d9f5c575 ("net/sched: matchall: Fix configuration race")
from Linus' tree and commit:
ec2507d2a306 ("net/sched: cls_matchall: Fix error path")
from the net-next tree.
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/sctp/sctp_diag.c
between commit:
1cceda784980 ("sctp: fix the issue sctp_diag uses lock_sock in rcu_read_lock")
from Linus' tree and commit:
d545caca827b ("net: inet: diag: expose the socket mark to privileged
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/sctp/outqueue.c
between commit:
be4947bf46cb ("sctp: change to check peer prsctp_capable when using prsctp
polices")
from Linus' tree and commit:
2c89791eeb6f ("sctp: remove the unnecessary state check in sctp
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/phy/fixed_phy.c
between commit:
69fc58a57e56 ("net: phy: Manage fixed PHY address space using IDA")
from Linus' tree and commit:
bf7afb29d545 ("phy: improve safety of fixed-phy MII register reading")
f
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/ipv4/ip_gre.c
between commits:
2090714e1d6e ("gre: build header correctly for collect metadata tunnels")
b7f8fe251e46 ("gre: do not pull header in ICMP error processing")
from Linus' tree and commit:
95f5c64c
Hi Stephen,
On mar., mars 15 2016, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got conflicts in:
>
> arch/arm/boot/dts/armada-xp-db.dts
> arch/arm/boot/dts/armada-xp-gp.dts
> arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
>
> between commit:
>
>
Hi all,
Today's linux-next merge of the net-next tree got conflicts in:
arch/arm/boot/dts/armada-xp-db.dts
arch/arm/boot/dts/armada-xp-gp.dts
arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
between commit:
d7d5a43c0d16 ("ARM: mvebu: fix overlap of Crypto SRAM with PCIe memory
window")
On 07/14/2015 03:46 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> net/bridge/br_mdb.c
>
> between commit:
>
> f1158b74e54f ("bridge: mdb: zero out the local br_ip variable before use")
>
> from Linus' tree and commit:
>
>
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/bridge/br_mdb.c
between commit:
f1158b74e54f ("bridge: mdb: zero out the local br_ip variable before use")
from Linus' tree and commit:
74fe61f17e99 ("bridge: mdb: add vlan support for user entries")
from the
On 05/27/2015 11:17 PM, Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/net/phy/amd-xgbe-phy.c between commit 983942a5eaca
("amd-xgbe-phy: Fix initial mode when autoneg is disabled") from Linus'
tree and commit 7c12aa08779c ("amd-xgbe: Move
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/net/phy/amd-xgbe-phy.c between commit 983942a5eaca
("amd-xgbe-phy: Fix initial mode when autoneg is disabled") from Linus'
tree and commit 7c12aa08779c ("amd-xgbe: Move the PHY support into
amd-xgbe") from the net-next
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
crypto/af_alg.c between commit 9399f0c51489 ("crypto: fix
af_alg_make_sg() conversion to iov_iter") from Linus' tree and commit
750d8065d88b ("crypto: Fix regressions caused by iov_iter changes")
from the net-next tree.
I fix
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/infiniband/hw/cxgb4/cm.c between commits 11b8e22d4d09
("RDMA/cxgb4: Fix vlan support") and 9eccfe109b27 ("RDMA/cxgb4: Add
support for iWARP Port Mapper user space service") from Linus' tree and
commits 92e7ae71726c ("i
emminger
> Subject: linux-next: manual merge of the net-next tree with Linus' tree
>
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in
> drivers/hv/channel_mgmt.c between commit d3ba720dd58c ("Drivers: hv:
> Eliminate the channe
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/hv/channel_mgmt.c between commit d3ba720dd58c ("Drivers: hv:
Eliminate the channel spinlock in the callback path") from Linus' tree
and commit 1b9d48f2a579 ("hyper-v: make uuid_le const") from the
net-next tree.
I fix
Hi Jeff,
On Tue, 17 Dec 2013 17:56:09 -0800 Jeff Kirsher
wrote:
>
> Your fix is fine, what I have in my tree is the following, so if you
> want to modify your change so that the resultant code looks like this:
>
> struct rtnl_link_stats64 *vsi_stats =
> i40e_get_vsi_stats_struct(vsi);
>
On Wed, 2013-12-18 at 12:46 +1100, Stephen Rothwell wrote:
> 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 3c325ced6aef
> ("i40e: fix null dereference") from Linus' tree and commit bc7d338fbb3f
> ("i40e: rei
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 3c325ced6aef
("i40e: fix null dereference") from Linus' tree and commit bc7d338fbb3f
("i40e: reinit flow for the main VSI") from the net-next tree.
I fixed it up (see
On 09/05/2013 07:19 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 2d98c29b6fb3 ("net: bridge:
convert MLDv2 Query MRC into msecs_to_jiffies for max_delay") from Linus'
tree and commit e3f5b17047de ("ne
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
net/ipv6/sit.c between commit 3d483058c8c8 ("ipv6: wire up
skb->encapsulation") from Linus' tree and commit 8b7ed2d91d6a
("iptunnels: remove net arg from iptunnel_xmit()") from the net-next tree.
I fixed it up (see below) and
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
net/bridge/br_multicast.c between commit 2d98c29b6fb3 ("net: bridge:
convert MLDv2 Query MRC into msecs_to_jiffies for max_delay") from Linus'
tree and commit e3f5b17047de ("net: ipv6: mld: get rid of MLDV2_MRC and
simplify ca
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c between commit
64c3b252e9fc ("net: stmmac: fixed the pbl setting with DT") from the
tree and commit e2a240c7d3bc ("driver:net:stmmac: Disable DMA store and
forward mode if
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
net/batman-adv/bat_iv_ogm.c between commit 7c24bbbeab41 ("batman-adv:
forward late OGMs from best next hop") from Linus' tree and commit
24a5deeb8a19 ("batman-adv: move ring_buffer helper functions in
bat_iv_ogm") from the net
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/net/xen-netback/netback.c between commit 94f950c4060c
("xen-netback: don't de-reference vif pointer after having called
xenvif_put()") from Linus' tree and commit e1f00a69ec26 ("xen-netback:
split event channels suppor
From: Stephen Rothwell
Date: Mon, 22 Apr 2013 13:09:39 +1000
> Today's linux-next merge of the net-next tree got a conflict in
> include/net/scm.h between commit 83f1b4ba917d ("net: fix incorrect
> credentials passing") from Linus' tree and commit 6b0ee8c036ec ("scm:
> Stop passing struct cred")
From: Stephen Rothwell
Date: Mon, 22 Apr 2013 13:03:24 +1000
> Today's linux-next merge of the net-next tree got a conflict in
> net/ipv4/tcp_input.c between commit 12fb3dd9dc3c ("tcp: call
> tcp_replace_ts_recent() from tcp_ack()") from Linus' tree and commit
> 9b717a8d2450 ("tcp: TLP loss detec
From: Stephen Rothwell
Date: Mon, 22 Apr 2013 12:43:34 +1000
> Today's linux-next merge of the net-next tree got a conflict in
> drivers/net/ethernet/emulex/benet/be_main.c between commit f11a869d4e38
> ("be2net: take care of __vlan_put_tag return value") from Linus' tree and
> commit 86a9bad3ab6
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
include/net/scm.h between commit 83f1b4ba917d ("net: fix incorrect
credentials passing") from Linus' tree and commit 6b0ee8c036ec ("scm:
Stop passing struct cred") from the net-next tree.
I fixed it up (see below) and can car
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
net/ipv4/tcp_input.c between commit 12fb3dd9dc3c ("tcp: call
tcp_replace_ts_recent() from tcp_ack()") from Linus' tree and commit
9b717a8d2450 ("tcp: TLP loss detection") from the net-next tree.
I fixed it up (see below) and
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/intel/igb/igb_main.c between commit f9d40f6a9921
("igb: Revert support for build_skb in igb") from Linus' tree and commit
b980ac18c95f ("igb: Fix code comments and whitespace") from the net-next
tree.
I f
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/emulex/benet/be_main.c between commit f11a869d4e38
("be2net: take care of __vlan_put_tag return value") from Linus' tree and
commit 86a9bad3ab6b ("net: vlan: add protocol argument to packet tagging
functio
From: Stephen Rothwell
Date: Wed, 27 Mar 2013 11:57:43 +1100
> Today's linux-next merge of the net-next tree got a conflict in
> include/net/ipip.h between commit 330305cc4a6b ("pv4: Fix ip-header
> identification for gso packets") from Linus' tree and commit c54419321455
> ("GRE: Refactor GRE tu
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
include/net/ipip.h between commit 330305cc4a6b ("pv4: Fix ip-header
identification for gso packets") from Linus' tree and commit c54419321455
("GRE: Refactor GRE tunneling code") from the net-next tree.
I just dropped the fil
From: Stephen Rothwell
Date: Tue, 12 Mar 2013 11:33:20 +1100
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in
> drivers/net/ethernet/intel/e1000e/netdev.c between commits 4e0855dff094
> ("e1000e: fix pci-device enable-counter balance") and 66148babe728
> ("e1000e: fi
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/intel/e1000e/netdev.c between commits 4e0855dff094
("e1000e: fix pci-device enable-counter balance") and 66148babe728
("e1000e: fix runtime power management transitions") from Linus' tree and
commit f0ff43
From: Stephen Rothwell
Date: Fri, 9 Nov 2012 10:53:18 +1100
> Today's linux-next merge of the net-next tree got a conflict in
> drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c between commit
> 477864ddd365 ("bnx2x: Disable FCoE for 57840 since not yet supported by
> FW") from Linus' tree and com
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c between commit
477864ddd365 ("bnx2x: Disable FCoE for 57840 since not yet supported by
FW") from Linus' tree and commit 55c11941e382 ("bnx2x: Support loading
cnic resources at r
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
Documentation/feature-removal-schedule.txt between commit 9c0ece069b32
("Get rid of Documentation/feature-removal.txt") from Linus' tree and
commits 965505015bec ("netfilter: remove xt_NOTRACK") and 7b55279f6a45
("NFC: Remove
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
net/batman-adv/bat_iv_ogm.c between commit 7caf69fb9c50 ("batman-adv: Fix
symmetry check / route flapping in multi interface setups") from Linus'
tree and commit bbb1f90efba8 ("batman-adv: Don't break statements after
assignme
On Thu, 2012-07-19 at 11:15 +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in
> drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c between commit
> 936597631dd3 ("ixgbevf: Prevent RX/TX statistics getting reset to zero")
> from Linus' tree
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c between commit
936597631dd3 ("ixgbevf: Prevent RX/TX statistics getting reset to zero")
from Linus' tree and various commits from the net-next tree.
I just used the version fr
66 matches
Mail list logo