summaryrefslogtreecommitdiff
path: root/drivers
AgeCommit message (Collapse)AuthorFilesLines
2017-01-12Merge remote-tracking branch 'usb-chipidea-next/ci-for-usb-next'Stephen Rothwell1-24/+6
2017-01-12Merge remote-tracking branch 'usb/usb-next'Stephen Rothwell6-32/+24
2017-01-12Merge remote-tracking branch 'ipmi/for-next'Stephen Rothwell4-5/+5
2017-01-12Merge remote-tracking branch 'drivers-x86/for-next'Stephen Rothwell7-44/+72
2017-01-12Merge remote-tracking branch 'irqchip/irqchip/for-next'Stephen Rothwell2-9/+23
2017-01-12Merge remote-tracking branch 'edac-amd/for-next'Stephen Rothwell1-1/+1
2017-01-12Merge remote-tracking branch 'tip/auto-latest'Stephen Rothwell4-41/+95
2017-01-12Merge remote-tracking branch 'spi/for-next'Stephen Rothwell17-110/+160
2017-01-12rapidio: use get_user_pages_unlocked()Lorenzo Stoakes1-6/+5
Moving from get_user_pages() to get_user_pages_unlocked() simplifies the code and takes advantage of VM_FAULT_RETRY functionality when faulting in pages. Link: http://lkml.kernel.org/r/20170103205024.6704-1-lstoakes@gmail.com Signed-off-by: Lorenzo Stoakes <lstoakes@gmail.com> Cc: Matt Porter <mporter@kernel.crashing.org> Cc: Alexandre Bounine <alexandre.bounine@idt.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2017-01-12Merge remote-tracking branch 'devicetree/for-next'Stephen Rothwell6-11/+25
2017-01-12mm, dax: change pmd_fault() to take only vmf parameterDave Jiang1-9/+9
pmd_fault() and related functions really only need the vmf parameter since the additional parameters are all included in the vmf struct. Remove the additional parameter and simplify pmd_fault() and friends. Link: http://lkml.kernel.org/r/1484085142-2297-8-git-send-email-ross.zwisler@linux.intel.com Signed-off-by: Dave Jiang <dave.jiang@intel.com> Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com> Reviewed-by: Jan Kara <jack@suse.cz> Cc: Dave Chinner <david@fromorbit.com> Cc: Dave Jiang <dave.jiang@intel.com> Cc: Matthew Wilcox <mawilcox@microsoft.com> Cc: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2017-01-12mm, dax: make pmd_fault() and friends be the same as fault()Dave Jiang1-9/+7
Instead of passing in multiple parameters in the pmd_fault() handler, a vmf can be passed in just like a fault() handler. This will simplify code and remove the need for the actual pmd fault handlers to allocate a vmf. Related functions are also modified to do the same. Link: http://lkml.kernel.org/r/1484085142-2297-7-git-send-email-ross.zwisler@linux.intel.com Signed-off-by: Dave Jiang <dave.jiang@intel.com> Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com> Reviewed-by: Jan Kara <jack@suse.cz> Cc: Dave Chinner <david@fromorbit.com> Cc: Matthew Wilcox <mawilcox@microsoft.com> Cc: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2017-01-12drivers/memstick/core/memstick.c: avoid -Wnonnull warningArnd Bergmann1-1/+1
gcc-7 produces a harmless false-postive warning about a possible NULL pointer access: drivers/memstick/core/memstick.c: In function 'h_memstick_read_dev_id': drivers/memstick/core/memstick.c:309:3: error: argument 2 null where non-null expected [-Werror=nonnull] memcpy(mrq->data, buf, mrq->data_len); This can't happen because the caller sets the command to 'MS_TPC_READ_REG', which causes the data direction to be 'READ' and the NULL pointer not accessed. As a simple workaround for the warning, we can pass a pointer to the data that we actually want to read into. This is not needed here, but also harmless, and lets the compiler know that the access is ok. Link: http://lkml.kernel.org/r/20170111144143.548867-1-arnd@arndb.de Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Alex Dubov <oakad@yahoo.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2017-01-12memory_hotplug: make zone_can_shift() return a boolean valueYasuaki Ishimatsu1-2/+2
online_{kernel|movable} is used to change the memory zone to ZONE_{NORMAL|MOVABLE} and online the memory. To check that memory zone can be changed, zone_can_shift() is used. Currently the function returns minus integer value, plus integer value and 0. When the function returns minus or plus integer value, it means that the memory zone can be changed to ZONE_{NORNAL|MOVABLE}. But when the function returns 0, there is 2 meanings. One of the meanings is that the memory zone does not need to be changed. For example, when memory is in ZONE_NORMAL and onlined by online_kernel the memory zone does not need to be changed. Another meaning is that the memory zone cannot be changed. When memory is in ZONE_NORMAL and onlined by online_movable, the memory zone may not be changed to ZONE_MOVALBE due to memory online limitation(see Documentation/memory-hotplug.txt). In this case, memory must not be onlined. The patch changes the return type of zone_can_shift() so that memory online operation fails when memory zone cannot be changed as follows: Before applying patch: # grep -A 35 "Node 2" /proc/zoneinfo Node 2, zone Normal <snip> node_scanned 0 spanned 8388608 present 7864320 managed 7864320 # echo online_movable > memory4097/state # grep -A 35 "Node 2" /proc/zoneinfo Node 2, zone Normal <snip> node_scanned 0 spanned 8388608 present 8388608 managed 8388608 online_movable operation succeeded. But memory is onlined as ZONE_NORMAL, not ZONE_MOVABLE. After applying patch: # grep -A 35 "Node 2" /proc/zoneinfo Node 2, zone Normal <snip> node_scanned 0 spanned 8388608 present 7864320 managed 7864320 # echo online_movable > memory4097/state bash: echo: write error: Invalid argument # grep -A 35 "Node 2" /proc/zoneinfo Node 2, zone Normal <snip> node_scanned 0 spanned 8388608 present 7864320 managed 7864320 online_movable operation failed because of failure of changing the memory zone from ZONE_NORMAL to ZONE_MOVABLE Fixes: df429ac03936 ("memory-hotplug: more general validation of zone during online") Link: http://lkml.kernel.org/r/2f9c3837-33d7-b6e5-59c0-6ca4372b2d84@gmail.com Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com> Reviewed-by: Reza Arbab <arbab@linux.vnet.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2017-01-12Merge remote-tracking branch 'iommu/next'Stephen Rothwell1-12/+11
2017-01-12Merge remote-tracking branch 'tpmdd/next'Stephen Rothwell8-128/+190
2017-01-12Merge remote-tracking branch 'regulator/for-next'Stephen Rothwell1-2/+4
2017-01-12Merge remote-tracking branch 'battery/for-next'Stephen Rothwell16-1207/+740
2017-01-12Merge remote-tracking branch 'mfd/for-mfd-next'Stephen Rothwell15-482/+1302
2017-01-12Merge remote-tracking branch 'md/for-next'Stephen Rothwell10-289/+597
2017-01-12Merge remote-tracking branch 'mmc/next'Stephen Rothwell33-173/+713
2017-01-12Merge remote-tracking branch 'input/next'Stephen Rothwell7-731/+64
2017-01-12Merge remote-tracking branch 'sound-asoc/for-next'Stephen Rothwell1-0/+50
2017-01-12Merge remote-tracking branch 'regmap/for-next'Stephen Rothwell2-6/+5
2017-01-12Merge remote-tracking branch 'sunxi/sunxi/for-next'Stephen Rothwell4-4/+24
2017-01-12Merge remote-tracking branch 'mali-dp/for-upstream/mali-dp'Stephen Rothwell1-7/+8
2017-01-12Merge remote-tracking branch 'drm-misc/for-linux-next'Stephen Rothwell8-5/+38
2017-01-12Merge remote-tracking branch 'drm-intel/for-linux-next'Stephen Rothwell33-558/+915
2017-01-12Merge remote-tracking branch 'drm-panel/drm/panel/for-next'Stephen Rothwell1-1/+1
2017-01-12Merge remote-tracking branch 'drm/drm-next'Stephen Rothwell343-5905/+14195
2017-01-12Merge remote-tracking branch 'crypto/master'Stephen Rothwell29-107/+3441
2017-01-12Merge remote-tracking branch 'nand/nand/next'Stephen Rothwell3-28/+135
2017-01-12Merge remote-tracking branch 'mtd/master'Stephen Rothwell4-7/+7
2017-01-12Merge remote-tracking branch 'rdma-leon/rdma-next'Stephen Rothwell110-432/+13489
2017-01-12Merge remote-tracking branch 'rdma/for-next'Stephen Rothwell24-210/+182
Updates for 4.11 kernel merge window - rxe driver updates - ioctl cleanups - ETH_P_IBOE declaration cleanup # gpg: Signature made Wed 11 Jan 2017 08:54:12 AEDT # gpg: using RSA key B826A3330E572FDD # gpg: Can't check signature: No public key
2017-01-12Merge remote-tracking branch 'mac80211-next/master'Stephen Rothwell2-3/+2
2017-01-12Merge remote-tracking branch 'net-next/master'Stephen Rothwell389-7512/+11481
2017-01-12Merge remote-tracking branch 'thermal-soc/next'Stephen Rothwell1-53/+100
2017-01-12Merge remote-tracking branch 'thermal/next'Stephen Rothwell5-209/+62
2017-01-12Merge remote-tracking branch 'fbdev/fbdev-for-next'Stephen Rothwell8-52/+102
2017-01-12Merge remote-tracking branch 'v4l-dvb/master'Stephen Rothwell9-172/+188
2017-01-12Merge remote-tracking branch 'hwmon-staging/hwmon-next'Stephen Rothwell71-873/+1278
2017-01-12Merge remote-tracking branch 'hid/for-next'Stephen Rothwell19-878/+239
2017-01-12Merge remote-tracking branch 'vfs/for-next'Stephen Rothwell4-113/+70
2017-01-11Merge branch 'devel' into for-nextLinus Walleij44-1752/+5081
2017-01-11Merge branch 'devel' into for-nextLinus Walleij12-56/+78
2017-01-12Merge remote-tracking branch 's390/features'Stephen Rothwell14-125/+187
2017-01-12Merge remote-tracking branch 'mips/mips-for-linux-next'Stephen Rothwell2-4/+7
2017-01-12Merge remote-tracking branch 'clk/clk-next'Stephen Rothwell23-100/+2252
2017-01-12Merge remote-tracking branch 'tegra/for-next'Stephen Rothwell8-0/+1004