Hi all,
On Mon, 9 Oct 2017 18:56:33 +0100 Mark Brown wrote:
>
> Today's linux-next merge of the drivers-x86 tree got a conflict in:
>
> Documentation/admin-guide/thunderbolt.rst
>
> between commit:
>
>e69b6c02b4c3b ("net: Add support for networking over Thunderbolt cable")
>
> from the
Hi Darren,
Today's linux-next merge of the drivers-x86 tree got a conflict in:
tools/Makefile
between commit:
a92bb546cff0 ("tools: rename tools/net directory to tools/bpf")
from the net-next tree and commit:
9d64fc08f6fe ("tools/wmi: add a sample for dell smbios communication over
WMI
On Mon, Oct 09, 2017 at 04:18:10PM -0700, Darren Hart wrote:
> I'm not sure how we would deal with it in the trees. Best to note this during
> the merge window - whichever goes in second. Test merge will identify the
> merge
> conflict, and we can include a note to Linus on the preference.
That
On Mon, Oct 09, 2017 at 08:56:34PM +0100, Mark Brown wrote:
> On Mon, Oct 09, 2017 at 10:43:01PM +0300, Mika Westerberg wrote:
>
> > If possible, I would rather move this chapter to be before "Networking
> > over Thunderbolt cable". Reason is that it then follows NVM flashing
> > chapter which is
On Mon, Oct 09, 2017 at 10:43:01PM +0300, Mika Westerberg wrote:
> If possible, I would rather move this chapter to be before "Networking
> over Thunderbolt cable". Reason is that it then follows NVM flashing
> chapter which is typically where you need to force power in the first
> place.
I guess
On Mon, Oct 09, 2017 at 06:56:33PM +0100, Mark Brown wrote:
> +Networking over Thunderbolt cable
> +-
> +Thunderbolt technology allows software communication across two hosts
> +connected by a Thunderbolt cable.
> +
> +It is possible to tunnel any kind of traff
Hi Darren,
[Apologies for multiple copies - for some reason vger seems to eat mails
I send from scripts, still trying to figure this out]
Today's linux-next merge of the drivers-x86 tree got a conflict in:
Documentation/admin-guide/thunderbolt.rst
between commit:
e69b6c02b4c3b ("net: Add
