]> www.infradead.org Git - users/willy/linux.git/log
users/willy/linux.git
6 years agoMerge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Sun, 9 Dec 2018 23:31:37 +0000 (10:31 +1100)]
Merge remote-tracking branch 'ecryptfs/next'

6 years agoMerge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 23:30:04 +0000 (10:30 +1100)]
Merge remote-tracking branch 'cifs/for-next'

6 years agoMerge remote-tracking branch 'btrfs-kdave/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 23:28:29 +0000 (10:28 +1100)]
Merge remote-tracking branch 'btrfs-kdave/for-next'

6 years agoMerge remote-tracking branch 'befs/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 23:26:43 +0000 (10:26 +1100)]
Merge remote-tracking branch 'befs/for-next'

6 years agoMerge remote-tracking branch 'fscrypt/master'
Stephen Rothwell [Sun, 9 Dec 2018 23:15:48 +0000 (10:15 +1100)]
Merge remote-tracking branch 'fscrypt/master'

6 years agoMerge remote-tracking branch 'xtensa/xtensa-for-next'
Stephen Rothwell [Sun, 9 Dec 2018 23:14:13 +0000 (10:14 +1100)]
Merge remote-tracking branch 'xtensa/xtensa-for-next'

6 years agoMerge remote-tracking branch 'sparc-next/master'
Stephen Rothwell [Sun, 9 Dec 2018 23:08:12 +0000 (10:08 +1100)]
Merge remote-tracking branch 'sparc-next/master'

6 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Sun, 9 Dec 2018 23:06:06 +0000 (10:06 +1100)]
Merge remote-tracking branch 's390/features'

6 years agoMerge remote-tracking branch 'risc-v/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 23:03:43 +0000 (10:03 +1100)]
Merge remote-tracking branch 'risc-v/for-next'

6 years agoMerge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Sun, 9 Dec 2018 23:01:40 +0000 (10:01 +1100)]
Merge remote-tracking branch 'powerpc/next'

6 years agoMerge remote-tracking branch 'parisc-hd/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 23:00:13 +0000 (10:00 +1100)]
Merge remote-tracking branch 'parisc-hd/for-next'

6 years agoMerge remote-tracking branch 'nios2/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 22:58:45 +0000 (09:58 +1100)]
Merge remote-tracking branch 'nios2/for-next'

6 years agoMerge remote-tracking branch 'nds32/next'
Stephen Rothwell [Sun, 9 Dec 2018 22:57:16 +0000 (09:57 +1100)]
Merge remote-tracking branch 'nds32/next'

6 years agoMerge remote-tracking branch 'mips/mips-next'
Stephen Rothwell [Sun, 9 Dec 2018 22:47:08 +0000 (09:47 +1100)]
Merge remote-tracking branch 'mips/mips-next'

6 years agoMerge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Sun, 9 Dec 2018 22:45:40 +0000 (09:45 +1100)]
Merge remote-tracking branch 'microblaze/next'

6 years agoMerge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 22:44:13 +0000 (09:44 +1100)]
Merge remote-tracking branch 'm68k/for-next'

6 years agoMerge remote-tracking branch 'ia64/next'
Stephen Rothwell [Sun, 9 Dec 2018 22:42:46 +0000 (09:42 +1100)]
Merge remote-tracking branch 'ia64/next'

6 years agoMerge remote-tracking branch 'csky/linux-next'
Stephen Rothwell [Sun, 9 Dec 2018 22:42:43 +0000 (09:42 +1100)]
Merge remote-tracking branch 'csky/linux-next'

6 years agoMerge remote-tracking branch 'clk/clk-next'
Stephen Rothwell [Sun, 9 Dec 2018 22:40:22 +0000 (09:40 +1100)]
Merge remote-tracking branch 'clk/clk-next'

6 years agoMerge remote-tracking branch 'arm64/for-next/core'
Stephen Rothwell [Sun, 9 Dec 2018 22:28:17 +0000 (09:28 +1100)]
Merge remote-tracking branch 'arm64/for-next/core'

6 years agoMerge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 22:25:54 +0000 (09:25 +1100)]
Merge remote-tracking branch 'tegra/for-next'

6 years agoMerge remote-tracking branch 'sunxi/sunxi/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 22:23:48 +0000 (09:23 +1100)]
Merge remote-tracking branch 'sunxi/sunxi/for-next'

6 years agoMerge remote-tracking branch 'samsung-krzk/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 22:22:21 +0000 (09:22 +1100)]
Merge remote-tracking branch 'samsung-krzk/for-next'

6 years agoMerge remote-tracking branch 'rockchip/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 22:20:39 +0000 (09:20 +1100)]
Merge remote-tracking branch 'rockchip/for-next'

6 years agoMerge remote-tracking branch 'renesas/next'
Stephen Rothwell [Sun, 9 Dec 2018 22:18:23 +0000 (09:18 +1100)]
Merge remote-tracking branch 'renesas/next'

6 years agoMerge remote-tracking branch 'qcom/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 22:16:06 +0000 (09:16 +1100)]
Merge remote-tracking branch 'qcom/for-next'

6 years agoMerge remote-tracking branch 'reset/reset/next'
Stephen Rothwell [Sun, 9 Dec 2018 22:13:40 +0000 (09:13 +1100)]
Merge remote-tracking branch 'reset/reset/next'

6 years agoMerge remote-tracking branch 'omap/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 22:11:57 +0000 (09:11 +1100)]
Merge remote-tracking branch 'omap/for-next'

6 years agoMerge remote-tracking branch 'mvebu/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 22:10:30 +0000 (09:10 +1100)]
Merge remote-tracking branch 'mvebu/for-next'

6 years agoMerge remote-tracking branch 'mediatek/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 22:09:03 +0000 (09:09 +1100)]
Merge remote-tracking branch 'mediatek/for-next'

6 years agoMerge remote-tracking branch 'keystone/next'
Stephen Rothwell [Sun, 9 Dec 2018 22:09:01 +0000 (09:09 +1100)]
Merge remote-tracking branch 'keystone/next'

6 years agoMerge remote-tracking branch 'imx-mxs/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 22:06:51 +0000 (09:06 +1100)]
Merge remote-tracking branch 'imx-mxs/for-next'

6 years agoMerge remote-tracking branch 'bcm2835/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 22:05:13 +0000 (09:05 +1100)]
Merge remote-tracking branch 'bcm2835/for-next'

6 years agoMerge remote-tracking branch 'at91/at91-next'
Stephen Rothwell [Sun, 9 Dec 2018 22:03:46 +0000 (09:03 +1100)]
Merge remote-tracking branch 'at91/at91-next'

6 years agoMerge remote-tracking branch 'aspeed/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 22:02:18 +0000 (09:02 +1100)]
Merge remote-tracking branch 'aspeed/for-next'

6 years agoMerge remote-tracking branch 'amlogic/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 22:00:39 +0000 (09:00 +1100)]
Merge remote-tracking branch 'amlogic/for-next'

6 years agoMerge remote-tracking branch 'actions/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 22:00:24 +0000 (09:00 +1100)]
Merge remote-tracking branch 'actions/for-next'

6 years agoMerge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 21:58:16 +0000 (08:58 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'

6 years agoMerge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Sun, 9 Dec 2018 21:54:26 +0000 (08:54 +1100)]
Merge remote-tracking branch 'arm-perf/for-next/perf'

6 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 21:52:26 +0000 (08:52 +1100)]
Merge remote-tracking branch 'arm/for-next'

6 years agoMerge remote-tracking branch 'dma-mapping/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 21:43:09 +0000 (08:43 +1100)]
Merge remote-tracking branch 'dma-mapping/for-next'

6 years agoMerge remote-tracking branch 'leaks/leaks-next'
Stephen Rothwell [Sun, 9 Dec 2018 21:42:57 +0000 (08:42 +1100)]
Merge remote-tracking branch 'leaks/leaks-next'

6 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 21:31:23 +0000 (08:31 +1100)]
Merge remote-tracking branch 'kbuild/for-next'

6 years agoMerge remote-tracking branch 'mmc-fixes/fixes'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:44 +0000 (08:23 +1100)]
Merge remote-tracking branch 'mmc-fixes/fixes'

6 years agoMerge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:44 +0000 (08:23 +1100)]
Merge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes'

6 years agoMerge remote-tracking branch 'scsi-fixes/fixes'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:43 +0000 (08:23 +1100)]
Merge remote-tracking branch 'scsi-fixes/fixes'

6 years agoMerge remote-tracking branch 'btrfs-fixes/next-fixes'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:39 +0000 (08:23 +1100)]
Merge remote-tracking branch 'btrfs-fixes/next-fixes'

6 years agoMerge remote-tracking branch 'nvdimm-fixes/libnvdimm-fixes'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:38 +0000 (08:23 +1100)]
Merge remote-tracking branch 'nvdimm-fixes/libnvdimm-fixes'

6 years agoMerge remote-tracking branch 'omap-fixes/fixes'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:36 +0000 (08:23 +1100)]
Merge remote-tracking branch 'omap-fixes/fixes'

6 years agoMerge remote-tracking branch 'mips-fixes/mips-fixes'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:35 +0000 (08:23 +1100)]
Merge remote-tracking branch 'mips-fixes/mips-fixes'

6 years agoMerge remote-tracking branch 'v4l-dvb-fixes/fixes'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:33 +0000 (08:23 +1100)]
Merge remote-tracking branch 'v4l-dvb-fixes/fixes'

6 years agoMerge remote-tracking branch 'ide/master'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:29 +0000 (08:23 +1100)]
Merge remote-tracking branch 'ide/master'

6 years agoMerge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:24 +0000 (08:23 +1100)]
Merge remote-tracking branch 'input-current/for-linus'

6 years agoMerge remote-tracking branch 'spi-fixes/for-linus'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:20 +0000 (08:23 +1100)]
Merge remote-tracking branch 'spi-fixes/for-linus'

6 years agoMerge remote-tracking branch 'regulator-fixes/for-linus'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:19 +0000 (08:23 +1100)]
Merge remote-tracking branch 'regulator-fixes/for-linus'

6 years agoMerge remote-tracking branch 'sound-asoc-fixes/for-linus'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:18 +0000 (08:23 +1100)]
Merge remote-tracking branch 'sound-asoc-fixes/for-linus'

6 years agoMerge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:17 +0000 (08:23 +1100)]
Merge remote-tracking branch 'sound-current/for-linus'

6 years agoMerge remote-tracking branch 'rdma-fixes/for-rc'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:17 +0000 (08:23 +1100)]
Merge remote-tracking branch 'rdma-fixes/for-rc'

6 years agoMerge remote-tracking branch 'netfilter/master'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:14 +0000 (08:23 +1100)]
Merge remote-tracking branch 'netfilter/master'

6 years agoMerge remote-tracking branch 'ipsec/master'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:13 +0000 (08:23 +1100)]
Merge remote-tracking branch 'ipsec/master'

6 years agoMerge remote-tracking branch 'bpf/master'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:12 +0000 (08:23 +1100)]
Merge remote-tracking branch 'bpf/master'

6 years agoMerge remote-tracking branch 'net/master'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:11 +0000 (08:23 +1100)]
Merge remote-tracking branch 'net/master'

6 years agoMerge remote-tracking branch 'powerpc-fixes/fixes'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:09 +0000 (08:23 +1100)]
Merge remote-tracking branch 'powerpc-fixes/fixes'

6 years agoMerge remote-tracking branch 'fixes/master'
Stephen Rothwell [Sun, 9 Dec 2018 21:13:08 +0000 (08:13 +1100)]
Merge remote-tracking branch 'fixes/master'

6 years agocifs: update internal module version number
Steve French [Tue, 6 Nov 2018 22:20:46 +0000 (16:20 -0600)]
cifs: update internal module version number

To version 2.15

Signed-off-by: Steve French <stfrench@microsoft.com>
6 years agocifs: remove set but not used variable 'smb_buf'
YueHaibing [Fri, 7 Dec 2018 07:05:38 +0000 (07:05 +0000)]
cifs: remove set but not used variable 'smb_buf'

Fixes gcc '-Wunused-but-set-variable' warning:

fs/cifs/sess.c: In function '_sess_auth_rawntlmssp_assemble_req':
fs/cifs/sess.c:1157:18: warning:
 variable 'smb_buf' set but not used [-Wunused-but-set-variable]

It never used since commit cc87c47d9d7a ("cifs: Separate rawntlmssp auth
from CIFS_SessSetup()")

Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
6 years agocifs: suppress some implicit-fallthrough warnings
Gustavo A. R. Silva [Mon, 26 Nov 2018 23:01:51 +0000 (10:01 +1100)]
cifs: suppress some implicit-fallthrough warnings

To avoid the warning:

     warning: this statement may fall through [-Wimplicit-fallthrough=]

Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Reviewed-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Steve French <stfrench@microsoft.com>
6 years agocifs: change smb2_query_eas to use the compound query-info helper
Ronnie Sahlberg [Mon, 26 Nov 2018 23:52:04 +0000 (09:52 +1000)]
cifs: change smb2_query_eas to use the compound query-info helper

Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
6 years agoAdd vers=3.0.2 as a valid option for SMBv3.0.2
Kenneth D'souza [Sat, 17 Nov 2018 05:03:30 +0000 (10:33 +0530)]
Add vers=3.0.2 as a valid option for SMBv3.0.2

Technically 3.02 is not the dialect name although that is more familiar to many,
so we should also accept the official dialect name (3.0.2 vs. 3.02) in vers=

Signed-off-by: Kenneth D'souza <kdsouza@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
6 years agocifs: create a helper function for compound query_info
Ronnie Sahlberg [Wed, 14 Nov 2018 22:40:18 +0000 (08:40 +1000)]
cifs: create a helper function for compound query_info

and convert statfs to use it.

Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
6 years agocifs: address trivial coverity warning
Steve French [Thu, 15 Nov 2018 06:33:05 +0000 (00:33 -0600)]
cifs: address trivial coverity warning

This is not actually a bug but as Coverity points out we shouldn't
be doing an "|=" on a value which hasn't been set (although technically
it was memset to zero so isn't a bug) and so might as well change
"|=" to "=" in this line

Detected by CoverityScan, CID#728535 ("Unitialized scalar variable")

Signed-off-by: Steve French <stfrench@microsoft.com>
Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com>
6 years agocifs: smb2 commands can not be negative, remove confusing check
Steve French [Wed, 14 Nov 2018 07:37:39 +0000 (01:37 -0600)]
cifs: smb2 commands can not be negative, remove confusing check

As Coverity points out le16_to_cpu(midEntry->Command) can not be less than zero.

Detected by CoverityScan, CID#1438650 ("Macro compares unsigned to 0")

Signed-off-by: Steve French <stfrench@microsoft.com>
Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com>
6 years agocifs: use a compound for setting an xattr
Ronnie Sahlberg [Tue, 6 Nov 2018 12:52:43 +0000 (22:52 +1000)]
cifs: use a compound for setting an xattr

Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
6 years agocifs: clean up indentation, replace spaces with tab
Colin Ian King [Sat, 3 Nov 2018 15:59:44 +0000 (15:59 +0000)]
cifs: clean up indentation, replace spaces with tab

Trivial fix to clean up indentation, replace spaces with tab

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
6 years agonet/sched: cls_flower: Reject duplicated rules also under skip_sw
Or Gerlitz [Sun, 9 Dec 2018 16:10:24 +0000 (18:10 +0200)]
net/sched: cls_flower: Reject duplicated rules also under skip_sw

Currently, duplicated rules are rejected only for skip_hw or "none",
hence allowing users to push duplicates into HW for no reason.

Use the flower tables to protect for that.

Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Paul Blakey <paulb@mellanox.com>
Reported-by: Chris Mi <chrism@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
6 years agoMerge branch 'bnxt_en-Bug-fixes'
David S. Miller [Sun, 9 Dec 2018 19:46:59 +0000 (11:46 -0800)]
Merge branch 'bnxt_en-Bug-fixes'

Michael Chan says:

====================
bnxt_en: Bug fixes.

The first patch fixes a regression on CoS queue setup, introduced
recently by the 57500 new chip support patches.  The rest are
fixes related to ring and resource accounting on the new 57500 chips.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
6 years agobnxt_en: Fix _bnxt_get_max_rings() for 57500 chips.
Michael Chan [Sun, 9 Dec 2018 12:01:02 +0000 (07:01 -0500)]
bnxt_en: Fix _bnxt_get_max_rings() for 57500 chips.

The CP rings are accounted differently on the new 57500 chips.  There
must be enough CP rings for the sum of RX and TX rings on the new
chips.  The current logic may be over-estimating the RX and TX rings.

The output parameter max_cp should be the maximum NQs capped by
MSIX vectors available for networking in the context of 57500 chips.
The existing code which uses CMPL rings capped by the MSIX vectors
works most of the time but is not always correct.

Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
6 years agobnxt_en: Fix NQ/CP rings accounting on the new 57500 chips.
Michael Chan [Sun, 9 Dec 2018 12:01:01 +0000 (07:01 -0500)]
bnxt_en: Fix NQ/CP rings accounting on the new 57500 chips.

The new 57500 chips have introduced the NQ structure in addition to
the existing CP rings in all chips.  We need to introduce a new
bnxt_nq_rings_in_use().  On legacy chips, the 2 functions are the
same and one will just call the other.  On the new chips, they
refer to the 2 separate ring structures.  The new function is now
called to determine the resource (NQ or CP rings) associated with
MSIX that are in use.

On 57500 chips, the RDMA driver does not use the CP rings so
we don't need to do the subtraction adjustment.

Fixes: 41e8d7983752 ("bnxt_en: Modify the ring reservation functions for 57500 series chips.")
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
6 years agobnxt_en: Keep track of reserved IRQs.
Michael Chan [Sun, 9 Dec 2018 12:01:00 +0000 (07:01 -0500)]
bnxt_en: Keep track of reserved IRQs.

The new 57500 chips use 1 NQ per MSIX vector, whereas legacy chips use
1 CP ring per MSIX vector.  To better unify this, add a resv_irqs
field to struct bnxt_hw_resc.  On legacy chips, we initialize resv_irqs
with resv_cp_rings.  On new chips, we initialize it with the allocated
MSIX resources.

Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
6 years agobnxt_en: Fix CNP CoS queue regression.
Michael Chan [Sun, 9 Dec 2018 12:00:59 +0000 (07:00 -0500)]
bnxt_en: Fix CNP CoS queue regression.

Recent changes to support the 57500 devices have created this
regression.  The bnxt_hwrm_queue_qportcfg() call was moved to be
called earlier before the RDMA support was determined, causing
the CoS queues configuration to be set before knowing whether RDMA
was supported or not.  Fix it by moving it to the right place right
after RDMA support is determined.

Fixes: 98f04cf0f1fc ("bnxt_en: Check context memory requirements from firmware.")
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
6 years agoMerge tag 'char-misc-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...
Linus Torvalds [Sun, 9 Dec 2018 18:43:17 +0000 (10:43 -0800)]
Merge tag 'char-misc-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc driver fixes from Greg KH:
 "Here are some small driver fixes for 4.20-rc6.

  There is a hyperv fix that for some reaon took forever to get into a
  shape that could be applied to the tree properly, but resolves a much
  reported issue. The others are some gnss patches, one a bugfix and the
  two others updates to the MAINTAINERS file to properly match the gnss
  files in the tree.

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

* tag 'char-misc-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  MAINTAINERS: exclude gnss from SIRFPRIMA2 regex matching
  MAINTAINERS: add gnss scm tree
  gnss: sirf: fix activation retry handling
  Drivers: hv: vmbus: Offload the handling of channels to two workqueues

6 years agoMerge tag 'staging-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
Linus Torvalds [Sun, 9 Dec 2018 18:35:33 +0000 (10:35 -0800)]
Merge tag 'staging-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging fixes from Greg KH:
 "Here are two staging driver bugfixes for 4.20-rc6.

  One is a revert of a previously incorrect patch that was merged a
  while ago, and the other resolves a possible buffer overrun that was
  found by code inspection.

  Both of these have been in the linux-next tree with no reported
  issues"

* tag 'staging-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  Revert commit ef9209b642f "staging: rtl8723bs: Fix indenting errors and an off-by-one mistake in core/rtw_mlme_ext.c"
  staging: rtl8712: Fix possible buffer overrun

6 years agoMerge branch 'fixes' into for-next
Olof Johansson [Sun, 9 Dec 2018 18:28:34 +0000 (10:28 -0800)]
Merge branch 'fixes' into for-next

* fixes:
  ARM: dts: imx7d-nitrogen7: Fix the description of the Wifi clock
  ARM: imx: update the cpu power up timing setting on i.mx6sx
  Revert "arm64: dts: marvell: add CPU Idle power state support on Armada 7K/8K"
  ARM: dts: imx7d-pico: Describe the Wifi clock
  ARM: dts: sun8i: a83t: bananapi-m3: increase vcc-pd voltage to 3.3V

6 years agoMerge tag 'mvebu-fixes-4.20-1' of git://git.infradead.org/linux-mvebu into fixes
Olof Johansson [Sun, 9 Dec 2018 18:28:02 +0000 (10:28 -0800)]
Merge tag 'mvebu-fixes-4.20-1' of git://git.infradead.org/linux-mvebu into fixes

mvebu fixes for 4.20

Adding CPU Idle state in the device tree for Armada 8040 seems to
breaks boot on some board, so let's revert it waiting for a better
solution.

* tag 'mvebu-fixes-4.20-1' of git://git.infradead.org/linux-mvebu:
  Revert "arm64: dts: marvell: add CPU Idle power state support on Armada 7K/8K"

Signed-off-by: Olof Johansson <olof@lixom.net>
6 years agoMerge tag 'sunxi-fixes-for-4.20' of https://git.kernel.org/pub/scm/linux/kernel/git...
Olof Johansson [Sun, 9 Dec 2018 18:27:17 +0000 (10:27 -0800)]
Merge tag 'sunxi-fixes-for-4.20' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into fixes

Allwinner fixes for 4.20

One small fix for a regulator range on the Banana Pi M3

* tag 'sunxi-fixes-for-4.20' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  ARM: dts: sun8i: a83t: bananapi-m3: increase vcc-pd voltage to 3.3V

Signed-off-by: Olof Johansson <olof@lixom.net>
6 years agoMerge tag 'imx-fixes-4.20-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawngu...
Olof Johansson [Sun, 9 Dec 2018 18:26:36 +0000 (10:26 -0800)]
Merge tag 'imx-fixes-4.20-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes

i.MX fixes for 4.20, round 3:
 - A couple of fixes on imx7d-pico and imx7d-nitrogen7 boards to correct
   the description of the Wifi clock.
 - Change SW2ISO count to get a safer ARM LDO ramp-up time, so that
   different boards can be covered. This fixes the ARM LDO failure seen
   on some customer boards.

* tag 'imx-fixes-4.20-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx7d-nitrogen7: Fix the description of the Wifi clock
  ARM: imx: update the cpu power up timing setting on i.mx6sx
  ARM: dts: imx7d-pico: Describe the Wifi clock

Signed-off-by: Olof Johansson <olof@lixom.net>
6 years agoMerge tag 'tty-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Linus Torvalds [Sun, 9 Dec 2018 18:24:29 +0000 (10:24 -0800)]
Merge tag 'tty-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull tty driver fixes from Greg KH:
 "Here are three small tty driver fixes for 4.20-rc6

  Nothing major, just some bug fixes for reported issues. Full details
  are in the shortlog.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'tty-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  kgdboc: fix KASAN global-out-of-bounds bug in param_set_kgdboc_var()
  tty: serial: 8250_mtk: always resume the device in probe.
  tty: do not set TTY_IO_ERROR flag if console port

6 years agoMerge tag 'usb-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Linus Torvalds [Sun, 9 Dec 2018 18:18:24 +0000 (10:18 -0800)]
Merge tag 'usb-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB fixes from Greg KH:
 "Here are some small USB fixes for 4.20-rc6

  The "largest" here are some xhci fixes for reported issues. Also here
  is a USB core fix, some quirk additions, and a usb-serial fix which
  required the export of one of the tty layer's functions to prevent
  code duplication. The tty maintainer agreed with this change.

  All of these have been in linux-next with no reported issues"

* tag 'usb-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  xhci: Prevent U1/U2 link pm states if exit latency is too long
  xhci: workaround CSS timeout on AMD SNPS 3.0 xHC
  USB: check usb_get_extra_descriptor for proper size
  USB: serial: console: fix reported terminal settings
  usb: quirk: add no-LPM quirk on SanDisk Ultra Flair device
  USB: Fix invalid-free bug in port_over_current_notify()
  usb: appledisplay: Add 27" Apple Cinema Display

6 years agoMerge tag '4.20-rc5-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6
Linus Torvalds [Sun, 9 Dec 2018 18:15:13 +0000 (10:15 -0800)]
Merge tag '4.20-rc5-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6

Pull cifs fixes from Steve French:
 "Three small fixes: a fix for smb3 direct i/o, a fix for CIFS DFS for
  stable and a minor cifs Kconfig fix"

* tag '4.20-rc5-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6:
  CIFS: Avoid returning EBUSY to upper layer VFS
  cifs: Fix separator when building path from dentry
  cifs: In Kconfig CONFIG_CIFS_POSIX needs depends on legacy (insecure cifs)

6 years agoMerge tag 'dax-fixes-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdim...
Linus Torvalds [Sun, 9 Dec 2018 17:54:04 +0000 (09:54 -0800)]
Merge tag 'dax-fixes-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm

Pull dax fixes from Dan Williams:
 "The last of the known regression fixes and fallout from the Xarray
  conversion of the filesystem-dax implementation.

  On the path to debugging why the dax memory-failure injection test
  started failing after the Xarray conversion a couple more fixes for
  the dax_lock_mapping_entry(), now called dax_lock_page(), surfaced.
  Those plus the bug that started the hunt are now addressed. These
  patches have appeared in a -next release with no issues reported.

  Note the touches to mm/memory-failure.c are just the conversion to the
  new function signature for dax_lock_page().

  Summary:

   - Fix the Xarray conversion of fsdax to properly handle
     dax_lock_mapping_entry() in the presense of pmd entries

   - Fix inode destruction racing a new lock request"

* tag 'dax-fixes-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  dax: Fix unlock mismatch with updated API
  dax: Don't access a freed inode
  dax: Check page->mapping isn't NULL

6 years agoMerge tag 'libnvdimm-fixes-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Sun, 9 Dec 2018 17:46:54 +0000 (09:46 -0800)]
Merge tag 'libnvdimm-fixes-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm

Pull libnvdimm fixes from Dan Williams:
 "A regression fix for the Address Range Scrub implementation, yes
  another one, and support for platforms that misalign persistent memory
  relative to the Linux memory hotplug section constraint. Longer term,
  support for sub-section memory hotplug would alleviate alignment
  waste, but until then this hack allows a 'struct page' memmap to be
  established for these misaligned memory regions.

  These have all appeared in a -next release, and thanks to Patrick for
  reporting and testing the alignment padding fix.

  Summary:

   - Unless and until the core mm handles memory hotplug units smaller
     than a section (128M), persistent memory namespaces must be padded
     to section alignment.

     The libnvdimm core already handled section collision with "System
     RAM", but some configurations overlap independent "Persistent
     Memory" ranges within a section, so additional padding injection is
     added for that case.

   - The recent reworks of the ARS (address range scrub) state machine
     to reduce the number of state flags inadvertantly missed a
     conversion of acpi_nfit_ars_rescan() call sites. Fix the regression
     whereby user-requested ARS results in a "short" scrub rather than a
     "long" scrub.

   - Fixup the unit tests to handle / test the 128M section alignment of
     mocked test resources.

* tag 'libnvdimm-fixes-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  acpi/nfit: Fix user-initiated ARS to be "ARS-long" rather than "ARS-short"
  libnvdimm, pfn: Pad pfn namespaces relative to other regions
  tools/testing/nvdimm: Align test resources to 128M

6 years agoMerge branch 'imx/defconfig' into for-next
Shawn Guo [Sun, 9 Dec 2018 13:03:42 +0000 (21:03 +0800)]
Merge branch 'imx/defconfig' into for-next

6 years agoMerge branch 'imx7ulp/dt' into for-next
Shawn Guo [Sun, 9 Dec 2018 13:03:36 +0000 (21:03 +0800)]
Merge branch 'imx7ulp/dt' into for-next

6 years agoMerge branch 'imx7d/pico' into for-next
Shawn Guo [Sun, 9 Dec 2018 13:03:30 +0000 (21:03 +0800)]
Merge branch 'imx7d/pico' into for-next

6 years agoMerge branch 'imx/dt' into for-next
Shawn Guo [Sun, 9 Dec 2018 13:03:24 +0000 (21:03 +0800)]
Merge branch 'imx/dt' into for-next

6 years agoMerge branch 'imx/soc' into for-next
Shawn Guo [Sun, 9 Dec 2018 13:03:14 +0000 (21:03 +0800)]
Merge branch 'imx/soc' into for-next

6 years agoMerge branch 'imx/drivers' into for-next
Shawn Guo [Sun, 9 Dec 2018 13:03:09 +0000 (21:03 +0800)]
Merge branch 'imx/drivers' into for-next

6 years agoARM: dts: imx7d-pico: Add the imx7d-pico-hobbit variant
Fabio Estevam [Thu, 6 Dec 2018 10:09:05 +0000 (08:09 -0200)]
ARM: dts: imx7d-pico: Add the imx7d-pico-hobbit variant

The imx7d-pico-hobbit contains a imx7d-pico SoM and a hobbit baseboard.

Add support for it.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
6 years agoARM: dts: imx7d-pico-pi: Extend peripherals support
Fabio Estevam [Thu, 6 Dec 2018 10:09:04 +0000 (08:09 -0200)]
ARM: dts: imx7d-pico-pi: Extend peripherals support

This adds following peripherals for the imx7d-pico-pi as:

 - LED
 - Touchscreen
 - GPIO

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
6 years agoARM: dts: imx7d-pico: Extend peripherals support
Fabio Estevam [Thu, 6 Dec 2018 10:09:03 +0000 (08:09 -0200)]
ARM: dts: imx7d-pico: Extend peripherals support

This extends the peripherals supported by the imx7d-pico.dtsi. It
adds:

 - I2C2
 - Flexcan (flexcan1 and flexcan2 ports)
 - USDHC1
 - UART (6 and 7 ports)
 - PWM (4 ports)
 - eCSPI3

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>