[lkml]   [2016]   [Oct]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the staging tree with the net-next tree
Hi Greg,

Today's linux-next merge of the staging tree got a conflict in:


between commit:

9c22b4a34edd ("net: use core MTU range checking in wireless drivers")

from the net-next tree and commit:

84ad1efa7d2b ("staging: wlan-ng: fix block comment warnings in p80211netdev.c")

from the staging tree.

I fixed it up (the former removed the code updates by the latter, so I
just did that) 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
merging. You may also want to consider cooperating with the maintainer
of the conflicting tree to minimise any particularly complex conflicts.

Stephen Rothwell

 \ /
  Last update: 2016-10-21 03:22    [W:0.027 / U:0.152 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site