From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 5 Jan 2014 06:10:45 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
X-Git-Tag: v4.9.8~7184
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d11739e6d83dc17a6b54cfa23f8d7872d9ef82e2;p=platform%2Fkernel%2Flinux-rpi3.git

Merge git://git./linux/kernel/git/davem/sparc

Pull sparc bugfixes from David Miller:

 1) Missing include can lead to build failure, from Kirill Tkhai.

 2) Use dev_is_pci() where applicable, from Yijing Wang.

 3) Enable irqs after we enable preemption in cpu startup path, from
    Kirill Tkhai.

 4) Revert a __copy_{to,from}_user_inatomic change that broke
    iov_iter_copy_from_user_atomic() and thus several tests in xfstests
    and LTP.  From Dave Kleikamp.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  Revert "sparc64: Fix __copy_{to,from}_user_inatomic defines."
  sparc64: smp_callin: Enable irqs after preemption is disabled
  sparc/PCI: Use dev_is_pci() to identify PCI devices
  sparc64: Fix build regression
---

d11739e6d83dc17a6b54cfa23f8d7872d9ef82e2