linux-next: manual merge of the s390 tree

linux-next: manual merge of the s390 tree

[Stephen Rothwell]

Hi Martin,

Today's linux-next merge of the s390 tree got a conflict in
drivers/s390/scsi/zfcp_erp.c between commit
fca55b6fb587e42c7761ee30bd1a6c313a9270c9 ("[SCSI] zfcp: fix deadlock
between wq triggered port scan and ERP") from the scsi-rc-fixes tree and
commit c70beccd971850d07d0dc5afcd5e1c6580c7e1e5 ("[S390] zfcp: Report
microcode level through service level interface") from the s390 tree.

I fixed it up (by taking both changes - see below) and can carry the
fix.  Someone should check that it is correct.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/s390/scsi/zfcp_erp.c
index c557ba3,e63eebf..0000000
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@@ -1281,10 -1283,11 +1284,13 @@@ static void zfcp_erp_action_cleanup(str
  		break;
  
  	case ZFCP_ERP_ACTION_REOPEN_ADAPTER:
- 		if (result != ZFCP_ERP_SUCCEEDED)
+ 		if (result != ZFCP_ERP_SUCCEEDED) {
+ 			unregister_service_level(&adapter->service_level);
  			zfcp_erp_rports_del(adapter);
- 		else
 -		} else
++		} else {
+ 			register_service_level(&adapter->service_level);
 +			schedule_work(&adapter->scan_work);
++		}
  		zfcp_adapter_put(adapter);
  		break;
  	}

Re: linux-next: manual merge of the s390 tree

[Martin Schwidefsky]

On Tue, 2008-12-02 at 09:39 +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the s390 tree got a conflict in
> drivers/s390/scsi/zfcp_erp.c between commit
> fca55b6fb587e42c7761ee30bd1a6c313a9270c9 ("[SCSI] zfcp: fix deadlock
> between wq triggered port scan and ERP") from the scsi-rc-fixes tree
> and
> commit c70beccd971850d07d0dc5afcd5e1c6580c7e1e5 ("[S390] zfcp: Report
> microcode level through service level interface") from the s390 tree.
> 
> I fixed it up (by taking both changes - see below) and can carry the
> fix.  Someone should check that it is correct.

Your fixup is fine.

-- 
blue skies,
  Martin.

"Reality continues to ruin my life." - Calvin.

Re: linux-next: manual merge of the s390 tree

[Stephen Rothwell]

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

Hi Martin,

On Tue, 02 Dec 2008 09:12:11 +0100 Martin Schwidefsky <schwidefsky@de.ibm.com> wrote:
>
> Your fixup is fine.

Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

linux-next: manual merge of the s390 tree

[Stephen Rothwell]

Hi Martin,

Today's linux-next merge of the s390 tree got a conflict in
drivers/char/Kconfig drivers/char/Makefile between commit
d5e54913433fff89609adfc4b96fefcf807a9030 ("powerpc: udbg-based backend
for hvc_console") from the powerpc tree and commit
c7f224c72b6973056497af6bb69efce6d5a19e86 ("[S390] s390/hvc_console: z/VM
IUCV hypervisor console support") from the s390 tree.

Just overlapping additions. I fixed it up (see below) and can carry the
fix.  The conflict could be eliminated by one of the two sets of changes
moving slightly in the files (I am hinting about the s390 ones here as
Paul does not like rebasing his tree ...).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/char/Kconfig
index f57907a,755adf7..0000000
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@@ -631,12 -631,16 +631,22 @@@ config HVC_XE
  	help
  	  Xen virtual console device driver
  
 +config HVC_UDBG
 +       bool "udbg based fake hypervisor console"
 +       depends on PPC && EXPERIMENTAL
 +       select HVC_DRIVER
 +       default n
 +
+ config HVC_IUCV
+ 	bool "z/VM IUCV Hypervisor console support (VM only)"
+ 	depends on S390
+ 	select HVC_DRIVER
+ 	select IUCV
+ 	default y
+ 	help
+ 	  This driver provides a Hypervisor console (HVC) back-end to access
+ 	  a Linux (console) terminal via a z/VM IUCV communication path.
+ 
  config VIRTIO_CONSOLE
  	tristate "Virtio console"
  	depends on VIRTIO
diff --cc drivers/char/Makefile
index 52e1552,36151ba..0000000
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@@ -50,7 -50,7 +50,8 @@@ obj-$(CONFIG_HVC_BEAT)		+= hvc_beat.
  obj-$(CONFIG_HVC_DRIVER)	+= hvc_console.o
  obj-$(CONFIG_HVC_IRQ)		+= hvc_irq.o
  obj-$(CONFIG_HVC_XEN)		+= hvc_xen.o
 +obj-$(CONFIG_HVC_UDBG)		+= hvc_udbg.o
+ obj-$(CONFIG_HVC_IUCV)		+= hvc_iucv.o
  obj-$(CONFIG_VIRTIO_CONSOLE)	+= virtio_console.o
  obj-$(CONFIG_RAW_DRIVER)	+= raw.o
  obj-$(CONFIG_SGI_SNSC)		+= snsc.o snsc_event.o

Re: linux-next: manual merge of the s390 tree

[Martin Schwidefsky]

On Thu, 2008-11-20 at 10:13 +1100, Stephen Rothwell wrote:
> Just overlapping additions. I fixed it up (see below) and can carry the
> fix.  The conflict could be eliminated by one of the two sets of changes
> moving slightly in the files (I am hinting about the s390 ones here as
> Paul does not like rebasing his tree ...).

Ok, done. I moved the HCV_ICUV option before HVC_BEAT.

-- 
blue skies,
  Martin.

"Reality continues to ruin my life." - Calvin.

Re: linux-next: manual merge of the s390 tree

[Stephen Rothwell]

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

Hi Martin,

On Thu, 20 Nov 2008 12:10:14 +0100 Martin Schwidefsky <schwidefsky@de.ibm.com> wrote:
>
> On Thu, 2008-11-20 at 10:13 +1100, Stephen Rothwell wrote:
> > Just overlapping additions. I fixed it up (see below) and can carry the
> > fix.  The conflict could be eliminated by one of the two sets of changes
> > moving slightly in the files (I am hinting about the s390 ones here as
> > Paul does not like rebasing his tree ...).
> 
> Ok, done. I moved the HCV_ICUV option before HVC_BEAT.

Thanks - just makes my life a little easier :-)

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

linux-next: manual merge of the s390 tree

[Stephen Rothwell]

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

Hi Martin, Heiko,

Today's linux-next merge of the s390 tree got conflicts in
drivers/s390/net/qeth_l2_main.c and drivers/s390/net/qeth_l3_main.c
between commit 0f5623c9ebfc6576c5682ab3b335c57812f6c87e ("qeth: remove
non-recover-thread checkings") from the net-current tree and commit
fef944b54d0cf71d1f775532439f2e1c3ff3d29b ("[S390] convert qeth printks to
dev_xxx and pr_xxx macros.") from the s390 tree.

Overlapping removals. So I removed the whole sections i.e. used the
net-current version.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

linux-next: manual merge of the s390 tree

[Stephen Rothwell]

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

Hi Martin,

Today's linux-next merge of the s390 tree got a conflict in
drivers/s390/net/netiucv.c between commit
b11b60b796cc45f9f34c9149b1becde0db9bcdde ("s390: bus_id -> dev_name
conversions") from the driver-core tree and commit
9b6fd7ada6c3e068120fa230a760c6238c1ec427 ("[S390] Cleanup netiucv printk
messages") from the s390 tree.

The latter removes some code that the former changes.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

linux-next: manual merge of the s390 tree

[Stephen Rothwell]

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

Hi Martin, Greg,

Today's linux-next merge of the s390 tree got a conflict in
drivers/s390/cio/qdio.c between commit
4836b98e1d4c0b5e86ce4e071321367cf28885c4 ("s390: bus_id -> dev_name
conversions") from the driver-core tree and commit
bc3817177fc931f0ade32808e4cb61be2f0999fb ("[S390] qdio: Repair timeout
handling for qdio_shutdown") from the s390 tree.

It is a simple near overlap of changes, and I fixed it up.  I can carry
the fixup.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: manual merge of the s390 tree

[Greg KH]

On Tue, Jun 24, 2008 at 01:45:46PM +1000, Stephen Rothwell wrote:
> Hi Martin, Greg,
> 
> Today's linux-next merge of the s390 tree got a conflict in
> drivers/s390/cio/qdio.c between commit
> 4836b98e1d4c0b5e86ce4e071321367cf28885c4 ("s390: bus_id -> dev_name
> conversions") from the driver-core tree and commit
> bc3817177fc931f0ade32808e4cb61be2f0999fb ("[S390] qdio: Repair timeout
> handling for qdio_shutdown") from the s390 tree.
> 
> It is a simple near overlap of changes, and I fixed it up.  I can carry
> the fixup.

Great, thanks for doing this.

greg k-h