Subject: Re: linux-next: manual merge of the net tree

From: David Miller <[email-masked]>
Date: Wed, 02 Jul 2008 21:13:45 -0700 (PDT)

From: Stephen Rothwell <[email-masked]>
Date: Thu, 3 Jul 2008 13:56:41 +1000

> Today's linux-next merge of the net tree got a conflict in  between
> commit 16d752397301b95abaa95cbaf9e785d221872311 ("thermal: Create
> CONFIG_THERMAL_HWMON=n") from Linus' tree and commit
> ecbed6a41900126e7b9509e12a8d0cc22176e3eb ("sctp: Mark GET_PEER|
> LOCAL_ADDR_OLD deprecated") from the net tree.
> 
> I just took both new entries.

Yep, that's the thing to do here.

Thanks!