Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/nfc/microread/mei.c between commit 9593b0b1179c ("NFC: microread:
Fix build failure due to a new MEI bus API") from the wireless tree and
commit 63cd353c34a0 ("NFC: microread: Fix MEI build failure") from the
net-next tree.
I fixed it up (using the wireless tree version) and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell [email protected]
Hi John, Stephen,
On Tue, Apr 02, 2013 at 01:00:44PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in
> drivers/nfc/microread/mei.c between commit 9593b0b1179c ("NFC: microread:
> Fix build failure due to a new MEI bus API") from the wireless tree and
> commit 63cd353c34a0 ("NFC: microread: Fix MEI build failure") from the
> net-next tree.
John, sorry for the conflict.
I sent a patch to John for wireless-next that will fix it once it
ends up in net-next.
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/