linux-next: manual merge of the staging tree with the driver-core tree

linux-next: manual merge of the staging tree with the driver-core tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1244 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/Kconfig drivers/Makefile between commit de55d8716ac5 ("Extcon
(external connector): import Android's switch class and modify") from the
driver-core tree and commits a980e046098b ("IIO: Move the core files to
drivers/iio") and db3b9e990e75 ("Staging: VME: move VME drivers out of
staging") from the staging tree.

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

diff --cc drivers/Kconfig
index 0233ad9,e245779..0000000
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@@ -140,6 -140,8 +140,10 @@@ source "drivers/virt/Kconfig
  
  source "drivers/devfreq/Kconfig"
  
 +source "drivers/extcon/Kconfig"
 +
+ source "drivers/iio/Kconfig"
+ 
+ source "drivers/vme/Kconfig"
+ 
  endmenu
diff --cc drivers/Makefile
index c41dfa9,08b78e0..0000000
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@@ -134,4 -134,5 +134,6 @@@ obj-$(CONFIG_VIRT_DRIVERS)	+= virt
  obj-$(CONFIG_HYPERV)		+= hv/
  
  obj-$(CONFIG_PM_DEVFREQ)	+= devfreq/
 +obj-$(CONFIG_EXTCON)		+= extcon/
+ obj-$(CONFIG_IIO)		+= iio/
+ obj-$(CONFIG_VME_BUS)		+= vme/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the staging tree with the driver-core tree

[Greg KH]

On Fri, Apr 27, 2012 at 02:31:14PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/Kconfig drivers/Makefile between commit de55d8716ac5 ("Extcon
> (external connector): import Android's switch class and modify") from the
> driver-core tree and commits a980e046098b ("IIO: Move the core files to
> drivers/iio") and db3b9e990e75 ("Staging: VME: move VME drivers out of
> staging") from the staging tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Thanks, that looks correct.

greg k-h

Re: linux-next: manual merge of the staging tree with the driver-core tree

[Greg KH]

On Thu, May 10, 2012 at 05:34:01PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/misc/Makefile between commit 6a7e2618b3db ("misc: MAX8997: Remove
> max8997-muic driver") from the driver-core tree and commit ffc2825c2942
> ("Staging: mei: move the mei code out of staging") from the staging tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Looks good to me, thanks for this.

greg k-h

linux-next: manual merge of the staging tree with the driver-core tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 835 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/misc/Makefile between commit 6a7e2618b3db ("misc: MAX8997: Remove
max8997-muic driver") from the driver-core tree and commit ffc2825c2942
("Staging: mei: move the mei code out of staging") from the staging tree.

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

diff --cc drivers/misc/Makefile
index b26495a,0f6af6a..0000000
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@@ -48,3 -48,5 +48,4 @@@ obj-y				+= lis3lv02d
  obj-y				+= carma/
  obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o
  obj-$(CONFIG_ALTERA_STAPL)	+=altera-stapl/
 -obj-$(CONFIG_MAX8997_MUIC)	+= max8997-muic.o
+ obj-$(CONFIG_INTEL_MEI)		+= mei/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the staging tree with the driver-core tree

[Greg KH]

On Tue, Apr 24, 2012 at 02:48:37PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got conflicts in
> drivers/staging/android/Kconfig and drivers/staging/android/Makefile
> between commit 449a2bf5e881 ("Remove "switch" class in
> drivers/staging/android/switch") from the driver-core tree and commit
> ef2353d26bdc ("android-alarm: Remove unused android alarm in-kernel
> interfaces") from the staging tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Thanks, that looks fine.

greg k-h

linux-next: manual merge of the staging tree with the driver-core tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1555 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got conflicts in
drivers/staging/android/Kconfig and drivers/staging/android/Makefile
between commit 449a2bf5e881 ("Remove "switch" class in
drivers/staging/android/switch") from the driver-core tree and commit
ef2353d26bdc ("android-alarm: Remove unused android alarm in-kernel
interfaces") from the staging tree.

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

diff --cc drivers/staging/android/Kconfig
index c706635,84ac619..0000000
--- a/drivers/staging/android/Kconfig
+++ b/drivers/staging/android/Kconfig
@@@ -53,7 -52,9 +53,7 @@@ config ANDROID_LOW_MEMORY_KILLE
  	---help---
  	  Register processes to be killed when memory is low
  
- config ANDROID_INTF_ALARM
 -source "drivers/staging/android/switch/Kconfig"
 -
+ config ANDROID_INTF_ALARM_DEV
  	bool "Android alarm driver"
  	depends on RTC_CLASS
  	default n
diff --cc drivers/staging/android/Makefile
index 045d17b,b4be69f..0000000
--- a/drivers/staging/android/Makefile
+++ b/drivers/staging/android/Makefile
@@@ -6,5 -6,5 +6,4 @@@ obj-$(CONFIG_ANDROID_RAM_CONSOLE)	+= ra
  obj-$(CONFIG_ANDROID_TIMED_OUTPUT)	+= timed_output.o
  obj-$(CONFIG_ANDROID_TIMED_GPIO)	+= timed_gpio.o
  obj-$(CONFIG_ANDROID_LOW_MEMORY_KILLER)	+= lowmemorykiller.o
- obj-$(CONFIG_ANDROID_INTF_ALARM)	+= alarm.o
 -obj-$(CONFIG_ANDROID_SWITCH)		+= switch/
  obj-$(CONFIG_ANDROID_INTF_ALARM_DEV)	+= alarm-dev.o

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the staging tree with the driver-core tree

[Greg KH]

On Mon, Nov 28, 2011 at 03:22:22PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/iio/adc/ad799x_core.c between commit 6e5af184f810
> ("staging:iio: Use module_i2c_driver to register I2C drivers") from the
> tree and commit 55e4390cb04e ("staging:iio: Add missing
> MODULE_DEVICE_TABLE and MODULE_ALIAS") from the staging tree.
> 
> Just context differences.  I fixed it up (see below) and can carry the
> fix as necessary.

Looks great, thanks.

greg k-h

linux-next: manual merge of the staging tree with the driver-core tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 983 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/iio/adc/ad799x_core.c between commit 6e5af184f810
("staging:iio: Use module_i2c_driver to register I2C drivers") from the
tree and commit 55e4390cb04e ("staging:iio: Add missing
MODULE_DEVICE_TABLE and MODULE_ALIAS") from the staging tree.

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

diff --cc drivers/staging/iio/adc/ad799x_core.c
index c0d2f88,5bedb19..0000000
--- a/drivers/staging/iio/adc/ad799x_core.c
+++ b/drivers/staging/iio/adc/ad799x_core.c
@@@ -934,4 -944,6 +935,3 @@@ module_i2c_driver(ad799x_driver)
  MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
  MODULE_DESCRIPTION("Analog Devices AD799x ADC");
  MODULE_LICENSE("GPL v2");
- MODULE_ALIAS("i2c:ad799x");
 -
 -module_init(ad799x_init);
 -module_exit(ad799x_exit);

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]