2012-05-31 22:04:48

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: build rebase of the drivers-x86 tree

Hi Matthew,

Looking through the drivers-x86 tree rebase today, I noticed in commit
62cce7526629 ("toshiba_acpi: Only register backlight device when
interface is read/write") that a memset has been added in the wrong place
- about line 1100 in function toshiba_acpi_setup_backlight().

/me mutters about not rebasing before submitting to Linus ... :-(
--
Cheers,
Stephen Rothwell [email protected]

Attachments:
(No filename) (421.00 B)
 (No filename) (836.00 B)
 Download all attachments

2012-06-01 15:01:51

by Matthew Garrett

[permalink] [raw]
Subject: Re: linux-next: build rebase of the drivers-x86 tree

On Fri, Jun 01, 2012 at 08:04:04AM +1000, Stephen Rothwell wrote:
> Hi Matthew,
>
> Looking through the drivers-x86 tree rebase today, I noticed in commit
> 62cce7526629 ("toshiba_acpi: Only register backlight device when
> interface is read/write") that a memset has been added in the wrong place
> - about line 1100 in function toshiba_acpi_setup_backlight().

That was me mis-merging - three commits all touched the backlight code
and I screwed it up. My fault.

--
Matthew Garrett | [email protected]