linux-kernel - linux-next: manual merge of the moduleh tree with the gpio 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]

Date:	Fri, 14 Oct 2011 17:02:02 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Paul Gortmaker <paul.gortmaker@...driver.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Tomoya MORINAGA <tomoya-linux@....okisemi.com>,
	Grant Likely <grant.likely@...retlab.ca>
Subject: linux-next: manual merge of the moduleh tree with the gpio tree

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
drivers/gpio/gpio-pch.c between commit 38eb18a6f92d ("gpio-pch: Support
interrupt function") from the gpio tree and commit d331aa9b3a0b
("drivers/gpio: Fix drivers who are implicit users of module.h") from the
moduleh tree.

Just context changes.  I fxied it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/gpio/gpio-pch.c
index 46b5209,c9c4297..0000000
--- a/drivers/gpio/gpio-pch.c
+++ b/drivers/gpio/gpio-pch.c
@@@ -17,17 -17,10 +17,18 @@@
  #include <linux/kernel.h>
  #include <linux/pci.h>
  #include <linux/gpio.h>
 +#include <linux/interrupt.h>
 +#include <linux/irq.h>
+ #include <linux/module.h>
  
 -#define PCH_GPIO_ALL_PINS	0xfff /* Mask for GPIO pins 0 to 11 */
 -#define GPIO_NUM_PINS	12	/* Specifies number of GPIO PINS GPIO0-GPIO11 */
 +#define PCH_EDGE_FALLING	0
 +#define PCH_EDGE_RISING		BIT(0)
 +#define PCH_LEVEL_L		BIT(1)
 +#define PCH_LEVEL_H		(BIT(0) | BIT(1))
 +#define PCH_EDGE_BOTH		BIT(2)
 +#define PCH_IM_MASK		(BIT(0) | BIT(1) | BIT(2))
 +
 +#define PCH_IRQ_BASE		24
  
  struct pch_regs {
  	u32	ien;

Content of type "application/pgp-signature" skipped