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
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
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
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
>-Original Message-
>From: netdev-ow...@vger.kernel.org [mailto:netdev-ow...@vger.kernel.org] On
>Behalf Of Stephen Rothwell
>Sent: Thursday, February 02, 2017 3:50 AM
>To: David Miller ; Networking
>Cc: linux-n...@vger.kernel.org; linux-kernel@vger.kernel.org; Yotam Gigi
>
>Subject: linux
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:
>
>
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:
>
>
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
> -Original Message-
> From: Stephen Rothwell [mailto:s...@canb.auug.org.au]
> Sent: Wednesday, June 4, 2014 8:14 PM
> To: David Miller; net...@vger.kernel.org
> Cc: linux-n...@vger.kernel.org; linux-kernel@vger.kernel.org; KY Srinivasan;
> Greg Kroah-Hartman; stephen hemminger
> Subject:
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
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
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
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
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
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
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
22 matches
Mail list logo
