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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20091126151619.5161466e.sfr@canb.auug.org.au>
Date:	Thu, 26 Nov 2009 15:16:19 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Richard Purdie <rpurdie@...ys.net>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Henrique de Moraes Holschuh <hmh@....eng.br>,
	Roel Kluin <roel.kluin@...il.com>,
	Len Brown <len.brown@...el.com>
Subject: linux-next: manual merge of the backlight tree with the acpi tree

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@...b.auug.org.au

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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/