On Thu, Feb 28, 2019 at 03:52:01PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/fsl-dpaa2/ethsw/ethsw.c
>
> between commit:
>
> 570b68c8ddde ("staging: fsl-dpaa2: ethsw: Handle SWITCHDEV_PORT_ATTR_SET")
>
>
Hi all,
Today's linux-next merge of the staging tree got a conflict in:
drivers/staging/fsl-dpaa2/ethsw/ethsw.c
between commit:
570b68c8ddde ("staging: fsl-dpaa2: ethsw: Handle SWITCHDEV_PORT_ATTR_SET")
from the net-next tree and commit:
11f27765f611 ("staging: fsl-dpaa2: ethsw: Add mis
Hi all,
Today's linux-next merge of the staging tree got a conflict in:
drivers/staging/irda/net/af_irda.c
between commit:
9b2c45d479d0 ("net: make getname() functions return length rather than use
int* parameter")
from the net-next tree and commit:
d64c2a76123f ("staging: irda: remove
On Wed, Dec 07, 2016 at 03:04:47PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/slicoss/slicoss.c
>
> between commit:
>
> a52ad514fdf3 ("net: deprecate eth_change_mtu, remove usage")
>
> from the net-next
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
drivers/staging/slicoss/slicoss.c
between commit:
a52ad514fdf3 ("net: deprecate eth_change_mtu, remove usage")
from the net-next tree and commit:
0af72df267f2 ("staging: slicoss: remove the staging driver")
from t
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
drivers/staging/unisys/include/iochannel.h
between commit:
d0c2c9973ecd ("net: use core MTU range checking in virt drivers")
from the net-next tree and commit:
b18f9c676f93 ("staging: unisys: include: fix pound def
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
drivers/staging/wlan-ng/p80211netdev.c
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 war
On Wed, Jul 16, 2014 at 04:43:22PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/cxt1e1/linux.c between commit c835a6773314 ("net: set
> name_assign_type in alloc_netdev()") from the net-next tree and commit
> 14b596c
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/cxt1e1/linux.c between commit c835a6773314 ("net: set
name_assign_type in alloc_netdev()") from the net-next tree and commit
14b596c9d80b ("staging: cxt1e1: remove driver") from the staging tree.
I fixed it up
On Wed, May 28, 2014 at 06:28:24PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/rtl8821ae/core.c between commit 77be2c54c5bd
> ("mac80211: add vif to flush call") from the net-next tree and commit
> 0cd05ba54a53 ("st
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/rtl8821ae/core.c between commit 77be2c54c5bd
("mac80211: add vif to flush call") from the net-next tree and commit
0cd05ba54a53 ("staging: rtl8821ae: core.c: Remove version specific
code") from the staging tree
Stephen Rothwell writes:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/wlags49_h2/wl_netdev.c between commit 8d4ade284a41
> ("wlags49_h2: Call dev_kfree/consume_skb_any instead of dev_kfree_skb")
> from the net-next tree and commit fed3ffd8f7ef ("
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/wlags49_h2/wl_netdev.c between commit 8d4ade284a41
("wlags49_h2: Call dev_kfree/consume_skb_any instead of dev_kfree_skb")
from the net-next tree and commit fed3ffd8f7ef ("staging: wlags49_h2:
reindent wl_netde
On Mon, Mar 17, 2014 at 07:08:42PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/wlan-ng/cfg80211.c between commit 3ead0d2e220e ("wlan-ng:
> fixup staging driver for removal of ieee80211_dsss_chan_to_freq") from
> the
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/wlan-ng/cfg80211.c between commit 3ead0d2e220e ("wlan-ng:
fixup staging driver for removal of ieee80211_dsss_chan_to_freq") from
the net-next tree and commit 4e5e9d7c66f0 ("staging: wlan-ng: replace
function ie
On Wed, May 29, 2013 at 02:14:22PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/silicom/bpctl_mod.c between commit 351638e7deee ("net:
> pass info struct via netdevice notifier") from the net-next tree and
> commit f
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/silicom/bpctl_mod.c between commit 351638e7deee ("net:
pass info struct via netdevice notifier") from the net-next tree and
commit f84b075178b4 ("Staging: silicom: Fixed error 'do not initialise
statics to 0 or
On Wed, Jan 23, 2013 at 03:45:25PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/et131x/et131x.c between commit f9a8f83b04e0 ("net: phy:
> remove flags argument from phy_{attach, connect, connect_direct}") from
> the
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/et131x/et131x.c between commit f9a8f83b04e0 ("net: phy:
remove flags argument from phy_{attach, connect, connect_direct}") from
the net-next tree and commit 26ef1021c1c7 ("staging: et131x: Modify block
comments
19 matches
Mail list logo