From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Sep 2009 00:53:36 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=39695224bd84dc4be29abad93a0ec232a16fc519;p=linux-edison.git

Merge git://git./linux/kernel/git/jejb/scsi-misc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (209 commits)
  [SCSI] fix oops during scsi scanning
  [SCSI] libsrp: fix memory leak in srp_ring_free()
  [SCSI] libiscsi, bnx2i: make bound ep check common
  [SCSI] libiscsi: add completion function for drivers that do not need pdu processing
  [SCSI] scsi_dh_rdac: changes for rdac debug logging
  [SCSI] scsi_dh_rdac: changes to collect the rdac debug information during the initialization
  [SCSI] scsi_dh_rdac: move the init code from rdac_activate to rdac_bus_attach
  [SCSI] sg: fix oops in the error path in sg_build_indirect()
  [SCSI] mptsas : Bump version to 3.04.12
  [SCSI] mptsas : FW event thread and scsi mid layer deadlock in SYNCHRONIZE CACHE command
  [SCSI] mptsas : Send DID_NO_CONNECT for pending IOs of removed device
  [SCSI] mptsas : PAE Kernel more than 4 GB kernel panic
  [SCSI] mptsas : NULL pointer on big endian systems causing Expander not to tear off
  [SCSI] mptsas : Sanity check for phyinfo is added
  [SCSI] scsi_dh_rdac: Add support for Sun StorageTek ST2500, ST2510 and ST2530
  [SCSI] pmcraid: PMC-Sierra MaxRAID driver to support 6Gb/s SAS RAID controller
  [SCSI] qla2xxx: Update version number to 8.03.01-k6.
  [SCSI] qla2xxx: Properly delete rports attached to a vport.
  [SCSI] qla2xxx: Correct various NPIV issues.
  [SCSI] qla2xxx: Correct qla2x00_eh_wait_on_command() to wait correctly.
  ...
---

39695224bd84dc4be29abad93a0ec232a16fc519
diff --cc arch/s390/include/asm/timex.h
index 24aa1cda20a,a07e699bb65..68d9fea34b4
--- a/arch/s390/include/asm/timex.h
+++ b/arch/s390/include/asm/timex.h
@@@ -88,20 -88,14 +88,28 @@@ int get_sync_clock(unsigned long long *
  void init_cpu_timer(void);
  unsigned long long monotonic_clock(void);
  
+ void tod_to_timeval(__u64, struct timespec *);
+ 
+ static inline
+ void stck_to_timespec(unsigned long long stck, struct timespec *ts)
+ {
+ 	tod_to_timeval(stck - TOD_UNIX_EPOCH, ts);
+ }
+ 
  extern u64 sched_clock_base_cc;
  
 +/**
 + * get_clock_monotonic - returns current time in clock rate units
 + *
 + * The caller must ensure that preemption is disabled.
 + * The clock and sched_clock_base get changed via stop_machine.
 + * Therefore preemption must be disabled when calling this
 + * function, otherwise the returned value is not guaranteed to
 + * be monotonic.
 + */
 +static inline unsigned long long get_clock_monotonic(void)
 +{
 +	return get_clock_xt() - sched_clock_base_cc;
 +}
 +
  #endif