Hey Lukasz, On Wed, Nov 19, 2014 at 09:21:39AM +0100, Lukasz Majewski wrote: > Hi Eduardo, > <big cut> > > } > > On which branch should I apply this patch? > This is based in my -linus branch. That means I will send this for the next major window, not rc. The branch -fixes of thermal-soc include patches for rc windows. > I've tried to apply this patch on top of newest linux-soc-thermal/next: > git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git > branch: next > SHA1:4027494124fd88e5d51127eebba315de5d8d57c8 > > Unfortunately, it conflicts with: > "thermal: fix multiple disbalanced device node counters" > c2aad93c Vladimir Zapolskiy The -next branch is intended to contain patches for linux-next testing. I include the content of -linus and -fixes together to be tested in linux-next. However, as this patch has not been merged yet into -linus, I haven't rebuilt my -next branch. > > > -- > Best regards, > > Lukasz Majewski > > Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
Attachment:
signature.asc
Description: Digital signature
