On Mon, Oct 29, 2018 at 5:29 AM Stephen Rothwell wrote:
>
> Hi all,
>
> Today's linux-next merge of the drivers-x86 tree got a conflict in:
>
> drivers/platform/x86/intel_telemetry_debugfs.c
>
> between commit:
>
> f2c4db1bd807 ("x86/cpu: Sanitize FAM6_ATOM naming")
>
> from Linus' tree and
On Mon, Oct 29, 2018 at 5:29 AM Stephen Rothwell wrote:
>
> Hi all,
>
> Today's linux-next merge of the drivers-x86 tree got a conflict in:
>
> drivers/platform/x86/intel_telemetry_debugfs.c
>
> between commit:
>
> f2c4db1bd807 ("x86/cpu: Sanitize FAM6_ATOM naming")
>
> from Linus' tree and
Hi all,
Today's linux-next merge of the drivers-x86 tree got a conflict in:
drivers/platform/x86/intel_telemetry_debugfs.c
between commit:
f2c4db1bd807 ("x86/cpu: Sanitize FAM6_ATOM naming")
from Linus' tree and commit:
1a7938a632ce ("platform/x86: intel_telemetry: Get rid of custom
Hi all,
Today's linux-next merge of the drivers-x86 tree got a conflict in:
drivers/platform/x86/intel_telemetry_debugfs.c
between commit:
f2c4db1bd807 ("x86/cpu: Sanitize FAM6_ATOM naming")
from Linus' tree and commit:
1a7938a632ce ("platform/x86: intel_telemetry: Get rid of custom
Hi Darren,
On Tue, 2 Jun 2015 20:27:50 -0700 Darren Hart wrote:
>
> Thanks for the heads' up. This happens because my -next branch is based on
> *-rc1
> as I think was recommended at the last kernel summit. Since rc1 I sent Linus
> the
> G50-30, but by rc6 I didn't feel good about sending the
On Tue, Jun 02, 2015 at 04:07:23PM +1000, Stephen Rothwell wrote:
> Hi Darren,
>
> Today's linux-next merge of the drivers-x86 tree got a conflict in
> drivers/platform/x86/ideapad-laptop.c between commit 9b071a43553d
> ("ideapad_laptop: Add Lenovo G40-30 to devices without radio switch")
> from
Hi Darren,
Today's linux-next merge of the drivers-x86 tree got a conflict in
drivers/platform/x86/ideapad-laptop.c between commit 9b071a43553d
("ideapad_laptop: Add Lenovo G40-30 to devices without radio switch")
from Linus' tree and commit 4fa9dabcffc8 ("ideapad_laptop: Lenovo
G50-30 fix rfkill
Hi Darren,
On Tue, 2 Jun 2015 20:27:50 -0700 Darren Hart dvh...@infradead.org wrote:
Thanks for the heads' up. This happens because my -next branch is based on
*-rc1
as I think was recommended at the last kernel summit. Since rc1 I sent Linus
the
G50-30, but by rc6 I didn't feel good
On Tue, Jun 02, 2015 at 04:07:23PM +1000, Stephen Rothwell wrote:
Hi Darren,
Today's linux-next merge of the drivers-x86 tree got a conflict in
drivers/platform/x86/ideapad-laptop.c between commit 9b071a43553d
(ideapad_laptop: Add Lenovo G40-30 to devices without radio switch)
from Linus'
Hi Darren,
Today's linux-next merge of the drivers-x86 tree got a conflict in
drivers/platform/x86/ideapad-laptop.c between commit 9b071a43553d
(ideapad_laptop: Add Lenovo G40-30 to devices without radio switch)
from Linus' tree and commit 4fa9dabcffc8 (ideapad_laptop: Lenovo
G50-30 fix rfkill
10 matches
Mail list logo
