tree c11d2b5cef57909953a8c9324bf105632477c0ac
parent f4a75d2eb7b1e2206094b901be09adb31ba63681
parent 29448ec129c5c9c7ece2ef28c72a0dafd70c8af2
author Linus Torvalds <torvalds@linux-foundation.org> 1353263195 -1000
committer Linus Torvalds <torvalds@linux-foundation.org> 1353263195 -1000
mergetag object 29448ec129c5c9c7ece2ef28c72a0dafd70c8af2
 type commit
 tag upstream-linus
 tagger Jeff Garzik <jgarzik@redhat.com> 1353126884 -0500
 
 If you were going to shoot me for not sending these earlier, you would be
 right.  -rc6 beat me by ~2 hours it seems, and they really should have
 gone out long before that.
 
 These have been in libata-dev.git for a day or so (unfortunately
 linux-next is on vacation).  The main one is #1, with the others being
 minor bits.  #1 has multiple tested-by, and can be considered a
 regression fix IMO.
 
 1) Fix ACPI oops, https://bugzilla.kernel.org/show_bug.cgi?id=48211
 
 2) Temporary WARN_ONCE() debugging patch for further ACPI debugging.
    The code already oopses here, and so this merely gives slightly
    better info.  Related to https://bugzilla.kernel.org/show_bug.cgi?id=49151
    which has been bisected down to a patch that _exposes_ a latest bug,
    but said bisection target does not actually appear to be the root cause
    itself.
 
 3) sata_svw: fix longstanding error recovery bug, which was
    preventing kdump, by adding missing DMA-start bit check.  Core
    code was already checking DMA-start, but ancillary, less-used
    routines were not.  Fixed.
 
 4) sata_highbank: fix minor __init/__devinit warning
 
 5) Fix minor warning, if CONFIG_PM is set, but CONFIG_PM_SLEEP is not set
 
 6) pata_arasan: proper functioning requires clock setting
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIVAwUAUKcUVSWzCDIBeCsvAQIbhQ/+OUl+AcgvrF4+90Gv1TfuSSWlzEHjOQ/N
 CQdx5da2OQhOE3rGEyaqBRt5L+bM20QLimH67QvQirhx4+cm2DtE2VcUS2ZpMh5P
 BHnk2nuZb77m0XKbRc2u1DxxLq4HIYljKmJXnaCYp6d+o8E2ETdGIt9Zj9yxVscC
 v63M28L0ab31gisAIXAbNXx+/iS3mtfIl5G8u0b0XNVixO0f/uRc/rl1feB3UvJF
 GGRPZGExrCwy9RXMvqi+nRVu5HAHQ4iLp6aoMknR/URGvymmGE0h0tpiy05UfP64
 7O2hb9LJMVwSKuSkFVlRcKHKPrDisQs+bFT7a208AqVyAI3kv1ZHKDdcSRlGXnVd
 uy6jHL/+LKONefC3xjYoyctxZTCLIJCXg6lydwLG3R7HlrId3HVfnrukAvNo+nCR
 D47gV8llj9LIrQg8nyZvOwQR8CVXD8oUV2mPU/P6Br8otZ5dlfrCb5jqhzYfel+Z
 XPbBT/OIfO1JPVRGuyKlR3SCujT1x9VqETD0yj/XkxkDiKqOWbfMzu2beRQtYYsT
 ZDKd+niVxOjoLbDEIOEgRkoAdVgQ8EkH0+c12gmTho18UIvXj2NeZMyNw9/UX5p2
 VqT25aCG5vcffI+sSz1LTjWc6OAHNTW7dEkFlsAxyTIHe347yQwrATZ/iqhBj5Ci
 rpv517rYfl0=
 =V0y8
 -----END PGP SIGNATURE-----

Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

Pull libata fixes from Jeff Garzik:
 "If you were going to shoot me for not sending these earlier, you would
  be right.  -rc6 beat me by ~2 hours it seems, and they really should
  have gone out long before that.

  These have been in libata-dev.git for a day or so (unfortunately
  linux-next is on vacation).  The main one is #1, with the others being
  minor bits.  #1 has multiple tested-by, and can be considered a
  regression fix IMO.

   1) Fix ACPI oops:

        https://bugzilla.kernel.org/show_bug.cgi?id=48211

   2) Temporary WARN_ONCE() debugging patch for further ACPI debugging.

      The code already oopses here, and so this merely gives slightly
      better info.  Related to

        https://bugzilla.kernel.org/show_bug.cgi?id=49151

      which has been bisected down to a patch that _exposes_ a latest
      bug, but said bisection target does not actually appear to be the
      root cause itself.

   3) sata_svw: fix longstanding error recovery bug, which was
      preventing kdump, by adding missing DMA-start bit check.  Core
      code was already checking DMA-start, but ancillary, less-used
      routines were not.  Fixed.

   4) sata_highbank: fix minor __init/__devinit warning

   5) Fix minor warning, if CONFIG_PM is set, but CONFIG_PM_SLEEP is not
      set

   6) pata_arasan: proper functioning requires clock setting"

* tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [libata] PM callbacks should be conditionally compiled on CONFIG_PM_SLEEP
  sata_svw: check DMA start bit before reset
  libata debugging: Warn when unable to find timing descriptor based on xfer_mode
  sata_highbank: mark ahci_highbank_probe as __devinit
  pata_arasan: Initialize cf clock to 166MHz
  libata-acpi: Fix NULL ptr derference in ata_acpi_dev_handle