From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 31 Dec 2017 18:50:05 +0000 (-0800)
Subject: Merge tag 'driver-core-4.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4288e6b4dd60d2f80213de32eb7a71c4d63c0b77;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'driver-core-4.15-rc6' of git://git./linux/kernel/git/gregkh/driver-core

Pull driver core fixes from Greg KH:
 "Here are two driver core fixes for 4.15-rc6, resolving some reported
  issues.

  The first is a cacheinfo fix for DT based systems to resolve a
  reported issue that has been around for a while, and the other is to
  resolve a regression in the kobject uevent code that showed up in
  4.15-rc1.

  Both have been in linux-next for a while with no reported issues"

* tag 'driver-core-4.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  kobject: fix suppressing modalias in uevents delivered over netlink
  drivers: base: cacheinfo: fix cache type for non-architected system cache
---

4288e6b4dd60d2f80213de32eb7a71c4d63c0b77