Messages in this thread | | | Date | Tue, 25 Mar 2014 00:31:46 -0400 (EDT) | Subject | Re: linux-next: manual merge of the net-next tree with the net tree | From | David Miller <> |
| |
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Tue, 25 Mar 2014 13:04:47 +1100
> Today's linux-next merge of the net-next tree got a conflict in > net/core/netpoll.c between commit c27f0872a344 ("netpoll: fix the skb > check in pkt_is_ns") from the net tree and commit 9c62a68d1311 ("netpoll: > Remove dead packet receive code (CONFIG_NETPOLL_TRAP)") from the net-next > tree. > > I fixed it up (the latter removes the code fixed by the former, so I did > that) and can carry the fix as necessary (no action is required).
That's a perfect resolution, thanks.
| |