linux-next: manual merge of the backlight tree with the acpi tree

[Stephen Rothwell]

Hi Richard,

Today's linux-next merge of the backlight tree got a conflict in
drivers/platform/x86/thinkpad_acpi.c between commit
80a8d1228e90349b4514e8c925c061fa5cbcea75 ("thinkpad-acpi: fix sign of
ERESTARTSYS return") from the acpi tree and commit
9c2f754d86c96ef548c6c444a6b0da421105c76e ("backlight/thinkpad-acpi: issue
backlight class events") from the backlight tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/platform/x86/thinkpad_acpi.c
index db1c099,9a2e9a7..0000000
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@@ -6325,7 -6325,10 +6337,10 @@@ static int brightness_write(char *buf
  	 * Doing it this way makes the syscall restartable in case of EINTR
  	 */
  	rc = brightness_set(level);
+ 	if (!rc && ibm_backlight_device)
+ 		backlight_force_update(ibm_backlight_device,
+ 					BACKLIGHT_UPDATE_SYSFS);
 -	return (rc == -EINTR)? ERESTARTSYS : rc;
 +	return (rc == -EINTR)? -ERESTARTSYS : rc;
  }
  
  static struct ibm_struct brightness_driver_data = {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/