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:
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/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
31 matches
Mail list logo
