Merge 4.9.261 into android-4.9-q
Changes in 4.9.261
btrfs: raid56: simplify tracking of Q stripe presence
btrfs: fix raid6 qstripe kmap
usbip: tools: fix build error for multiple definition
ALSA: ctxfi: cthw20k2: fix mask on conf to allow 4 bits
rsxx: Return -EFAULT if copy_to_user() fails
dm table: fix iterate_devices based device capability checks
dm table: fix DAX iterate_devices based device capability checks
iommu/amd: Fix sleeping in atomic in increase_address_space()
platform/x86: acer-wmi: Add new force_caps module parameter
PCI: Add function 1 DMA alias quirk for Marvell 9215 SATA controller
misc: eeprom_93xx46: Add quirk to support Microchip 93LC46B eeprom
Linux 4.9.261
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I1a6e472d8fffbfeee6b81830daa88d2446878b44