karo-tx-linux.git
6 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Thu, 5 Nov 2015 01:14:13 +0000 (12:14 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'

6 years agoMerge remote-tracking branch 'drm-misc/topic/drm-misc'
Stephen Rothwell [Thu, 5 Nov 2015 01:12:45 +0000 (12:12 +1100)]
Merge remote-tracking branch 'drm-misc/topic/drm-misc'

6 years agoMerge remote-tracking branch 'drm-tegra/drm/tegra/for-next'
Stephen Rothwell [Thu, 5 Nov 2015 01:11:32 +0000 (12:11 +1100)]
Merge remote-tracking branch 'drm-tegra/drm/tegra/for-next'

6 years agoMerge remote-tracking branch 'drm-intel/for-linux-next'
Stephen Rothwell [Thu, 5 Nov 2015 01:10:17 +0000 (12:10 +1100)]
Merge remote-tracking branch 'drm-intel/for-linux-next'

6 years agoMerge remote-tracking branch 'drm-panel/drm/panel/for-next'
Stephen Rothwell [Thu, 5 Nov 2015 01:09:05 +0000 (12:09 +1100)]
Merge remote-tracking branch 'drm-panel/drm/panel/for-next'

6 years agoMerge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Thu, 5 Nov 2015 01:06:36 +0000 (12:06 +1100)]
Merge remote-tracking branch 'drm/drm-next'

6 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Thu, 5 Nov 2015 01:04:29 +0000 (12:04 +1100)]
Merge remote-tracking branch 'l2-mtd/master'

6 years agoMerge remote-tracking branch 'rdma/for-next'
Stephen Rothwell [Thu, 5 Nov 2015 01:03:04 +0000 (12:03 +1100)]
Merge remote-tracking branch 'rdma/for-next'

Initial roundup of 4.4 merge window candidates

- "Checksum offload support in user space" enablement
- Misc cxgb4 fixes, add T6 support
- Misc usnic fixes
- 32 bit build warning fixes
- Misc ocrdma fixes
- Multicast loopback prevention extension
- Extend the GID cache to store and return attributes of GIDs
- Misc iSER updates
- iSER clustering update
- Network NameSpace support for rdma CM
- Work Request cleanup series
- New Memory Registration API

6 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Thu, 5 Nov 2015 01:01:49 +0000 (12:01 +1100)]
Merge remote-tracking branch 'bluetooth/master'

6 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Thu, 5 Nov 2015 00:59:58 +0000 (11:59 +1100)]
Merge remote-tracking branch 'slave-dma/next'

6 years agoMerge remote-tracking branch 'dlm/next'
Stephen Rothwell [Thu, 5 Nov 2015 00:58:44 +0000 (11:58 +1100)]
Merge remote-tracking branch 'dlm/next'

6 years agoMerge remote-tracking branch 'thermal-soc/next'
Stephen Rothwell [Thu, 5 Nov 2015 00:57:00 +0000 (11:57 +1100)]
Merge remote-tracking branch 'thermal-soc/next'

6 years agoMerge remote-tracking branch 'thermal/next'
Stephen Rothwell [Thu, 5 Nov 2015 00:55:16 +0000 (11:55 +1100)]
Merge remote-tracking branch 'thermal/next'

6 years agoMerge remote-tracking branch 'idle/next'
Stephen Rothwell [Thu, 5 Nov 2015 00:55:11 +0000 (11:55 +1100)]
Merge remote-tracking branch 'idle/next'

6 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Thu, 5 Nov 2015 00:43:41 +0000 (11:43 +1100)]
Merge remote-tracking branch 'pm/linux-next'

6 years agoMerge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Thu, 5 Nov 2015 00:42:23 +0000 (11:42 +1100)]
Merge remote-tracking branch 'libata/for-next'

6 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Thu, 5 Nov 2015 00:40:36 +0000 (11:40 +1100)]
Merge remote-tracking branch 'kbuild/for-next'

6 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Thu, 5 Nov 2015 00:38:12 +0000 (11:38 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'

6 years agoMerge branch 'jdelvare-hwmon/master'
Stephen Rothwell [Thu, 5 Nov 2015 00:36:57 +0000 (11:36 +1100)]
Merge branch 'jdelvare-hwmon/master'

6 years agoMerge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Thu, 5 Nov 2015 00:34:37 +0000 (11:34 +1100)]
Merge remote-tracking branch 'i2c/i2c/for-next'

6 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Thu, 5 Nov 2015 00:33:15 +0000 (11:33 +1100)]
Merge remote-tracking branch 'hid/for-next'

6 years agoMerge remote-tracking branch 'pci/next'
Stephen Rothwell [Thu, 5 Nov 2015 00:29:22 +0000 (11:29 +1100)]
Merge remote-tracking branch 'pci/next'

6 years agoMerge remote-tracking branch 'file-locks/linux-next'
Stephen Rothwell [Thu, 5 Nov 2015 00:21:53 +0000 (11:21 +1100)]
Merge remote-tracking branch 'file-locks/linux-next'

6 years agoMerge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Thu, 5 Nov 2015 00:20:10 +0000 (11:20 +1100)]
Merge remote-tracking branch 'xfs/for-next'

6 years agoMerge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Thu, 5 Nov 2015 00:18:58 +0000 (11:18 +1100)]
Merge remote-tracking branch 'ubifs/linux-next'

6 years agoMerge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Thu, 5 Nov 2015 00:17:46 +0000 (11:17 +1100)]
Merge remote-tracking branch 'v9fs/for-next'

6 years agoMerge remote-tracking branch 'overlayfs/overlayfs-next'
Stephen Rothwell [Thu, 5 Nov 2015 00:16:32 +0000 (11:16 +1100)]
Merge remote-tracking branch 'overlayfs/overlayfs-next'

6 years agoMerge remote-tracking branch 'orangefs/for-next'
Stephen Rothwell [Thu, 5 Nov 2015 00:15:20 +0000 (11:15 +1100)]
Merge remote-tracking branch 'orangefs/for-next'

6 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Thu, 5 Nov 2015 00:07:28 +0000 (11:07 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'

6 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Thu, 5 Nov 2015 00:05:37 +0000 (11:05 +1100)]
Merge remote-tracking branch 'nfs/linux-next'

6 years agoMerge remote-tracking branch 'gfs2/for-next'
Stephen Rothwell [Thu, 5 Nov 2015 00:04:25 +0000 (11:04 +1100)]
Merge remote-tracking branch 'gfs2/for-next'

6 years agoMerge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Thu, 5 Nov 2015 00:03:08 +0000 (11:03 +1100)]
Merge remote-tracking branch 'fscache/fscache'

6 years agoMerge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Thu, 5 Nov 2015 00:01:56 +0000 (11:01 +1100)]
Merge remote-tracking branch 'f2fs/dev'

6 years agoMerge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Wed, 4 Nov 2015 23:54:03 +0000 (10:54 +1100)]
Merge remote-tracking branch 'ext4/dev'

6 years agoMerge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Wed, 4 Nov 2015 23:52:50 +0000 (10:52 +1100)]
Merge remote-tracking branch 'ecryptfs/next'

6 years agoMerge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Wed, 4 Nov 2015 23:51:38 +0000 (10:51 +1100)]
Merge remote-tracking branch 'cifs/for-next'

6 years agoMerge remote-tracking branch 'ceph/master'
Stephen Rothwell [Wed, 4 Nov 2015 23:51:35 +0000 (10:51 +1100)]
Merge remote-tracking branch 'ceph/master'

6 years agoMerge remote-tracking branch 'tile/master'
Stephen Rothwell [Wed, 4 Nov 2015 23:50:19 +0000 (10:50 +1100)]
Merge remote-tracking branch 'tile/master'

6 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Wed, 4 Nov 2015 23:40:45 +0000 (10:40 +1100)]
Merge remote-tracking branch 's390/features'

6 years agoMerge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Wed, 4 Nov 2015 23:39:34 +0000 (10:39 +1100)]
Merge remote-tracking branch 'mpc5xxx/next'

6 years agoMerge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Wed, 4 Nov 2015 23:37:52 +0000 (10:37 +1100)]
Merge remote-tracking branch 'powerpc/next'

6 years agoMerge remote-tracking branch 'parisc-hd/for-next'
Stephen Rothwell [Wed, 4 Nov 2015 23:33:36 +0000 (10:33 +1100)]
Merge remote-tracking branch 'parisc-hd/for-next'

6 years agoMerge remote-tracking branch 'nios2/for-next'
Stephen Rothwell [Wed, 4 Nov 2015 23:32:24 +0000 (10:32 +1100)]
Merge remote-tracking branch 'nios2/for-next'

6 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Wed, 4 Nov 2015 23:31:13 +0000 (10:31 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

6 years agoMerge remote-tracking branch 'metag/for-next'
Stephen Rothwell [Wed, 4 Nov 2015 23:30:01 +0000 (10:30 +1100)]
Merge remote-tracking branch 'metag/for-next'

6 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Wed, 4 Nov 2015 23:28:50 +0000 (10:28 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'

6 years agoMerge remote-tracking branch 'ia64/next'
Stephen Rothwell [Wed, 4 Nov 2015 23:27:08 +0000 (10:27 +1100)]
Merge remote-tracking branch 'ia64/next'

6 years agoMerge remote-tracking branch 'h8300/h8300-next'
Stephen Rothwell [Wed, 4 Nov 2015 23:25:55 +0000 (10:25 +1100)]
Merge remote-tracking branch 'h8300/h8300-next'

6 years agoMerge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Wed, 4 Nov 2015 23:25:53 +0000 (10:25 +1100)]
Merge remote-tracking branch 'cris/for-next'

6 years agoMerge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Wed, 4 Nov 2015 23:24:42 +0000 (10:24 +1100)]
Merge remote-tracking branch 'c6x/for-linux-next'

6 years agoMerge remote-tracking branch 'arm64/for-next/core'
Stephen Rothwell [Wed, 4 Nov 2015 23:23:01 +0000 (10:23 +1100)]
Merge remote-tracking branch 'arm64/for-next/core'

6 years agoMerge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Wed, 4 Nov 2015 23:21:40 +0000 (10:21 +1100)]
Merge remote-tracking branch 'tegra/for-next'

6 years agoMerge remote-tracking branch 'sunxi/sunxi/for-next'
Stephen Rothwell [Wed, 4 Nov 2015 23:21:30 +0000 (10:21 +1100)]
Merge remote-tracking branch 'sunxi/sunxi/for-next'

6 years agoMerge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Wed, 4 Nov 2015 23:20:17 +0000 (10:20 +1100)]
Merge remote-tracking branch 'samsung/for-next'

6 years agoMerge remote-tracking branch 'rockchip/for-next'
Stephen Rothwell [Wed, 4 Nov 2015 23:19:56 +0000 (10:19 +1100)]
Merge remote-tracking branch 'rockchip/for-next'

6 years agoMerge remote-tracking branch 'renesas/next'
Stephen Rothwell [Wed, 4 Nov 2015 23:19:45 +0000 (10:19 +1100)]
Merge remote-tracking branch 'renesas/next'

6 years agoMerge remote-tracking branch 'qcom/qcom/for-next'
Stephen Rothwell [Wed, 4 Nov 2015 23:18:31 +0000 (10:18 +1100)]
Merge remote-tracking branch 'qcom/qcom/for-next'

6 years agoMerge remote-tracking branch 'omap-pending/for-next'
Stephen Rothwell [Wed, 4 Nov 2015 23:18:19 +0000 (10:18 +1100)]
Merge remote-tracking branch 'omap-pending/for-next'

6 years agoMerge remote-tracking branch 'omap/for-next'
Stephen Rothwell [Wed, 4 Nov 2015 23:18:00 +0000 (10:18 +1100)]
Merge remote-tracking branch 'omap/for-next'

6 years agoMerge remote-tracking branch 'mvebu/for-next'
Stephen Rothwell [Wed, 4 Nov 2015 23:17:50 +0000 (10:17 +1100)]
Merge remote-tracking branch 'mvebu/for-next'

6 years agoMerge remote-tracking branch 'keystone/next'
Stephen Rothwell [Wed, 4 Nov 2015 23:16:31 +0000 (10:16 +1100)]
Merge remote-tracking branch 'keystone/next'

6 years agoMerge remote-tracking branch 'imx-mxs/for-next'
Stephen Rothwell [Wed, 4 Nov 2015 23:16:22 +0000 (10:16 +1100)]
Merge remote-tracking branch 'imx-mxs/for-next'

6 years agoMerge remote-tracking branch 'berlin/berlin/for-next'
Stephen Rothwell [Wed, 4 Nov 2015 23:15:00 +0000 (10:15 +1100)]
Merge remote-tracking branch 'berlin/berlin/for-next'

6 years agoMerge remote-tracking branch 'at91/at91-next'
Stephen Rothwell [Wed, 4 Nov 2015 23:13:39 +0000 (10:13 +1100)]
Merge remote-tracking branch 'at91/at91-next'

6 years agoMerge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Wed, 4 Nov 2015 23:11:31 +0000 (10:11 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'

6 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Wed, 4 Nov 2015 23:10:18 +0000 (10:10 +1100)]
Merge remote-tracking branch 'arm/for-next'

6 years agoMerge remote-tracking branch 'arc/for-next'
Stephen Rothwell [Wed, 4 Nov 2015 23:09:08 +0000 (10:09 +1100)]
Merge remote-tracking branch 'arc/for-next'

6 years agoMerge remote-tracking branch 'asm-generic/master'
Stephen Rothwell [Wed, 4 Nov 2015 23:07:27 +0000 (10:07 +1100)]
Merge remote-tracking branch 'asm-generic/master'

6 years agoMerge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Wed, 4 Nov 2015 22:59:43 +0000 (09:59 +1100)]
Merge remote-tracking branch 'crypto-current/master'

6 years agoMerge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Wed, 4 Nov 2015 22:59:41 +0000 (09:59 +1100)]
Merge remote-tracking branch 'input-current/for-linus'

6 years agoMerge remote-tracking branch 'usb-chipidea-fixes/ci-for-usb-stable'
Stephen Rothwell [Wed, 4 Nov 2015 22:59:39 +0000 (09:59 +1100)]
Merge remote-tracking branch 'usb-chipidea-fixes/ci-for-usb-stable'

6 years agoMerge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Wed, 4 Nov 2015 22:59:35 +0000 (09:59 +1100)]
Merge remote-tracking branch 'sound-current/for-linus'

6 years agoMerge remote-tracking branch 'ipsec/master'
Stephen Rothwell [Wed, 4 Nov 2015 22:59:34 +0000 (09:59 +1100)]
Merge remote-tracking branch 'ipsec/master'

6 years agoMerge remote-tracking branch 'sparc/master'
Stephen Rothwell [Wed, 4 Nov 2015 22:59:31 +0000 (09:59 +1100)]
Merge remote-tracking branch 'sparc/master'

6 years agoALSA: hda - Apply pin fixup for HP ProBook 6550b
Takashi Iwai [Wed, 4 Nov 2015 21:39:16 +0000 (22:39 +0100)]
ALSA: hda - Apply pin fixup for HP ProBook 6550b

HP ProBook 6550b needs the same pin fixup applied to other HP B-series
laptops with docks for making its headphone and dock headphone jacks
working properly.  We just need to add the codec SSID to the list.

Bugzilla: https://bugzilla.kernel.org/attachment.cgi?id=191971
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
6 years agosparc64: Fix numa distance values
Nitin Gupta [Mon, 2 Nov 2015 21:30:24 +0000 (16:30 -0500)]
sparc64: Fix numa distance values

Orabug: 21896119

Use machine descriptor (MD) to get node latency
values instead of just using default values.

Testing:
On an T5-8 system with:
 - total nodes = 8
 - self latencies = 0x26d18
 - latency to other nodes = 0x3a598
   => latency ratio = ~1.5

output of numactl --hardware

 - before fix:

node distances:
node   0   1   2   3   4   5   6   7
  0:  10  20  20  20  20  20  20  20
  1:  20  10  20  20  20  20  20  20
  2:  20  20  10  20  20  20  20  20
  3:  20  20  20  10  20  20  20  20
  4:  20  20  20  20  10  20  20  20
  5:  20  20  20  20  20  10  20  20
  6:  20  20  20  20  20  20  10  20
  7:  20  20  20  20  20  20  20  10

 - after fix:

node distances:
node   0   1   2   3   4   5   6   7
  0:  10  15  15  15  15  15  15  15
  1:  15  10  15  15  15  15  15  15
  2:  15  15  10  15  15  15  15  15
  3:  15  15  15  10  15  15  15  15
  4:  15  15  15  15  10  15  15  15
  5:  15  15  15  15  15  10  15  15
  6:  15  15  15  15  15  15  10  15
  7:  15  15  15  15  15  15  15  10

Signed-off-by: Nitin Gupta <nitin.m.gupta@oracle.com>
Reviewed-by: Chris Hyser <chris.hyser@oracle.com>
Reviewed-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
6 years agosparc64: Don't restrict fp regs for no-fault loads
Rob Gardner [Sat, 31 Oct 2015 04:36:23 +0000 (22:36 -0600)]
sparc64: Don't restrict fp regs for no-fault loads

The function handle_ldf_stq() deals with no-fault ASI
loads and stores, but restricts fp registers to quad
word regs (ie, %f0, %f4 etc). This is valid for the
STQ case, but unnecessarily restricts loads, which
may be single precision, double, or quad. This results
in SIGFPE being raised for this instruction when the
source address is invalid:
ldda [%g1] ASI_PNF, %f2
but not for this one:
ldda [%g1] ASI_PNF, %f4
The validation check for quad register is moved to
within the STQ block so that loads are not affected
by the check.

An additional problem is that the calculation for freg
is incorrect when a single precision load is being
handled. This causes %f1 to be seen as %f32 etc,
and the incorrect register ends up being overwritten.
This code sequence demonstrates the problem:
ldd [%g1], %f32 ! g1 = valid address
lda [%i3] ASI_PNF, %f1  ! i3 = invalid address
std %f32, [%g1]
This is corrected by basing the freg calculation on
the load size.

Signed-off-by: Rob Gardner <rob.gardner@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
6 years agoiommu-common: Fix error code used in iommu_tbl_range_{alloc,free}().
David S. Miller [Wed, 4 Nov 2015 19:30:57 +0000 (11:30 -0800)]
iommu-common: Fix error code used in iommu_tbl_range_{alloc,free}().

The value returned from iommu_tbl_range_alloc() (and the one passed
in as a fourth argument to iommu_tbl_range_free) is not a DMA address,
it is rather an index into the IOMMU page table.

Therefore using DMA_ERROR_CODE is not appropriate.

Use a more type matching error code define, IOMMU_ERROR_CODE, and
update all users of this interface.

Reported-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
6 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
Linus Torvalds [Wed, 4 Nov 2015 18:12:43 +0000 (10:12 -0800)]
Merge git://git./linux/kernel/git/davem/ide

Pull IDE fixlet from David Miller:
 "Just a y2038 fix to the pdc202xx_new IDE driver"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  ide: pdc202xx_new: Replace timeval with ktime_t

6 years agoGFS2: Protect freeing directory hash table with i_lock spin_lock
Bob Peterson [Thu, 29 Oct 2015 15:03:41 +0000 (10:03 -0500)]
GFS2: Protect freeing directory hash table with i_lock spin_lock

This patch changes function gfs2_dir_hash_inval so it uses the
i_lock spin_lock to protect the in-core hash table, i_hash_cache.
This will prevent double-frees due to a race between gfs2_evict_inode
and inode invalidation.

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
6 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
Linus Torvalds [Wed, 4 Nov 2015 17:41:05 +0000 (09:41 -0800)]
Merge git://git./linux/kernel/git/davem/net-next

Pull networking updates from David Miller:

Changes of note:

 1) Allow to schedule ICMP packets in IPVS, from Alex Gartrell.

 2) Provide FIB table ID in ipv4 route dumps just as ipv6 does, from
    David Ahern.

 3) Allow the user to ask for the statistics to be filtered out of
    ipv4/ipv6 address netlink dumps.  From Sowmini Varadhan.

 4) More work to pass the network namespace context around deep into
    various packet path APIs, starting with the netfilter hooks.  From
    Eric W Biederman.

 5) Add layer 2 TX/RX checksum offloading to qeth driver, from Thomas
    Richter.

 6) Use usec resolution for SYN/ACK RTTs in TCP, from Yuchung Cheng.

 7) Support Very High Throughput in wireless MESH code, from Bob
    Copeland.

 8) Allow setting the ageing_time in switchdev/rocker.  From Scott
    Feldman.

 9) Properly autoload L2TP type modules, from Stephen Hemminger.

10) Fix and enable offload features by default in 8139cp driver, from
    David Woodhouse.

11) Support both ipv4 and ipv6 sockets in a single vxlan device, from
    Jiri Benc.

12) Fix CWND limiting of thin streams in TCP, from Bendik Rønning
    Opstad.

13) Fix IPSEC flowcache overflows on large systems, from Steffen
    Klassert.

14) Convert bridging to track VLANs using rhashtable entries rather than
    a bitmap.  From Nikolay Aleksandrov.

15) Make TCP listener handling completely lockless, this is a major
    accomplishment.  Incoming request sockets now live in the
    established hash table just like any other socket too.

    From Eric Dumazet.

15) Provide more bridging attributes to netlink, from Nikolay
    Aleksandrov.

16) Use hash based algorithm for ipv4 multipath routing, this was very
    long overdue.  From Peter Nørlund.

17) Several y2038 cures, mostly avoiding timespec.  From Arnd Bergmann.

18) Allow non-root execution of EBPF programs, from Alexei Starovoitov.

19) Support SO_INCOMING_CPU as setsockopt, from Eric Dumazet.  This
    influences the port binding selection logic used by SO_REUSEPORT.

20) Add ipv6 support to VRF, from David Ahern.

21) Add support for Mellanox Spectrum switch ASIC, from Jiri Pirko.

22) Add rtl8xxxu Realtek wireless driver, from Jes Sorensen.

23) Implement RACK loss recovery in TCP, from Yuchung Cheng.

24) Support multipath routes in MPLS, from Roopa Prabhu.

25) Fix POLLOUT notification for listening sockets in AF_UNIX, from Eric
    Dumazet.

26) Add new QED Qlogic river, from Yuval Mintz, Manish Chopra, and
    Sudarsana Kalluru.

27) Don't fetch timestamps on AF_UNIX sockets, from Hannes Frederic
    Sowa.

28) Support ipv6 geneve tunnels, from John W Linville.

29) Add flood control support to switchdev layer, from Ido Schimmel.

30) Fix CHECKSUM_PARTIAL handling of potentially fragmented frames, from
    Hannes Frederic Sowa.

31) Support persistent maps and progs in bpf, from Daniel Borkmann.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1790 commits)
  sh_eth: use DMA barriers
  switchdev: respect SKIP_EOPNOTSUPP flag in case there is no recursion
  net: sched: kill dead code in sch_choke.c
  irda: Delete an unnecessary check before the function call "irlmp_unregister_service"
  net: dsa: mv88e6xxx: include DSA ports in VLANs
  net: dsa: mv88e6xxx: disable SA learning for DSA and CPU ports
  net/core: fix for_each_netdev_feature
  vlan: Invoke driver vlan hooks only if device is present
  arcnet/com20020: add LEDS_CLASS dependency
  bpf, verifier: annotate verbose printer with __printf
  dp83640: Only wait for timestamps for packets with timestamping enabled.
  ptp: Change ptp_class to a proper bitmask
  dp83640: Prune rx timestamp list before reading from it
  dp83640: Delay scheduled work.
  dp83640: Include hash in timestamp/packet matching
  ipv6: fix tunnel error handling
  net/mlx5e: Fix LSO vlan insertion
  net/mlx5e: Re-eanble client vlan TX acceleration
  net/mlx5e: Return error in case mlx5e_set_features() fails
  net/mlx5e: Don't allow more than max supported channels
  ...

6 years agoMerge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Linus Torvalds [Wed, 4 Nov 2015 17:11:12 +0000 (09:11 -0800)]
Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto update from Herbert Xu:
 "API:

   - Add support for cipher output IVs in testmgr
   - Add missing crypto_ahash_blocksize helper
   - Mark authenc and des ciphers as not allowed under FIPS.

Algorithms:

   - Add CRC support to 842 compression
   - Add keywrap algorithm
   - A number of changes to the akcipher interface:
      + Separate functions for setting public/private keys.
      + Use SG lists.

Drivers:

   - Add Intel SHA Extension optimised SHA1 and SHA256
   - Use dma_map_sg instead of custom functions in crypto drivers
   - Add support for STM32 RNG
   - Add support for ST RNG
   - Add Device Tree support to exynos RNG driver
   - Add support for mxs-dcp crypto device on MX6SL
   - Add xts(aes) support to caam
   - Add ctr(aes) and xts(aes) support to qat
   - A large set of fixes from Russell King for the marvell/cesa driver"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (115 commits)
  crypto: asymmetric_keys - Fix unaligned access in x509_get_sig_params()
  crypto: akcipher - Don't #include crypto/public_key.h as the contents aren't used
  hwrng: exynos - Add Device Tree support
  hwrng: exynos - Fix missing configuration after suspend to RAM
  hwrng: exynos - Add timeout for waiting on init done
  dt-bindings: rng: Describe Exynos4 PRNG bindings
  crypto: marvell/cesa - use __le32 for hardware descriptors
  crypto: marvell/cesa - fix missing cpu_to_le32() in mv_cesa_dma_add_op()
  crypto: marvell/cesa - use memcpy_fromio()/memcpy_toio()
  crypto: marvell/cesa - use gfp_t for gfp flags
  crypto: marvell/cesa - use dma_addr_t for cur_dma
  crypto: marvell/cesa - use readl_relaxed()/writel_relaxed()
  crypto: caam - fix indentation of close braces
  crypto: caam - only export the state we really need to export
  crypto: caam - fix non-block aligned hash calculation
  crypto: caam - avoid needlessly saving and restoring caam_hash_ctx
  crypto: caam - print errno code when hash registration fails
  crypto: marvell/cesa - fix memory leak
  crypto: marvell/cesa - fix first-fragment handling in mv_cesa_ahash_dma_last_req()
  crypto: marvell/cesa - rearrange handling for sw padded hashes
  ...

6 years agoMerge branch 'for-linus' into next
Vinod Koul [Wed, 4 Nov 2015 17:03:41 +0000 (22:33 +0530)]
Merge branch 'for-linus' into next

6 years agodmaengine: edma: Add dummy driver skeleton for edma3-tptc
Peter Ujfalusi [Mon, 2 Nov 2015 13:21:40 +0000 (15:21 +0200)]
dmaengine: edma: Add dummy driver skeleton for edma3-tptc

The eDMA3 TPTC does not need any software configuration, but it is a
separate IP block in the SoC. In order the omap hwmod core to be able to
handle the TPTC resources correctly in regards of PM we need to have a
driver loaded for it.
This patch will add a dummy driver skeleton without probe or remove
callbacks provided.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Reported-by: Olof Johansson <olof@lixom.net>
Tested-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
6 years agoARC: [arcompact] Handle bus error from userspace as Interrupt not exception
Vineet Gupta [Fri, 30 Oct 2015 19:52:51 +0000 (01:22 +0530)]
ARC: [arcompact] Handle bus error from userspace as Interrupt not exception

Bus errors from userspace on ARCompact based cores are handled by core
as a high priority L2 interrupt but current code treated it as interrupt
Handling an interrupt like exception is certainly not going to go unnoticed.
(and it worked so far as we never saw a Bus error from userspace until
IPPK guys tested a DDR controller with ECC error detection etc hence
needed to explicitly trigger/handle such errors)

 - So move mem_service exception handler from common code into ARCv2 code.
 - In ARCompact code, define  mem_service as L2 interrupt handler which
   just drops down to pure kernel mode and goes of to enqueue SIGBUS

Reported-by: Nelson Pereira <npereira@synopsys.com>
Tested-by: Ana Martins <amartins@synopsys.com>
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
6 years agoBluetooth: Make LE only events conditional on supported commands
Marcel Holtmann [Wed, 4 Nov 2015 06:17:23 +0000 (07:17 +0100)]
Bluetooth: Make LE only events conditional on supported commands

For the LE only controllers, there are events that should not be enabled
if the corresponding command is not supported.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
6 years agoBluetooth: L2CAP: Add missing checks for invalid LE DCID
Johan Hedberg [Mon, 2 Nov 2015 12:39:17 +0000 (14:39 +0200)]
Bluetooth: L2CAP: Add missing checks for invalid LE DCID

When receiving a connect response we should make sure that the DCID is
within the valid range and that we don't already have another channel
allocated for the same DCID.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
6 years agoBluetooth: L2CAP: Fix checked range when allocating new CID
Johan Hedberg [Mon, 2 Nov 2015 12:39:16 +0000 (14:39 +0200)]
Bluetooth: L2CAP: Fix checked range when allocating new CID

The 'dyn_end' value is also a valid CID so it should be included in
the range of values checked.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
6 years agoBluetooth: L2CAP: Fix returning correct LE CoC response codes
Johan Hedberg [Mon, 2 Nov 2015 12:39:15 +0000 (14:39 +0200)]
Bluetooth: L2CAP: Fix returning correct LE CoC response codes

The core spec defines specific response codes for situations when the
received CID is incorrect. Add the defines for these and return them
as appropriate from the LE Connect Request handler function.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
6 years agoMerge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Wed, 4 Nov 2015 05:33:18 +0000 (21:33 -0800)]
Merge branch 'x86-platform-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 platform changes from Ingo Molnar:
 "Misc updates to the Intel MID and SGI UV platforms"

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/intel-mid: Make intel_mid_ops static
  arch/x86/intel-mid: Use kmemdup rather than duplicating its implementation
  x86/platform/uv: Implement simple dump failover if kdump fails
  x86/platform/uv: Insert per_cpu accessor function on uv_hub_nmi

6 years agoMerge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
Linus Torvalds [Wed, 4 Nov 2015 05:23:56 +0000 (21:23 -0800)]
Merge branch 'x86-mm-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 mm changes from Ingo Molnar:
 "The main changes are: continued PAT work by Toshi Kani, plus a new
  boot time warning about insecure RWX kernel mappings, by Stephen
  Smalley.

  The new CONFIG_DEBUG_WX=y warning is marked default-y if
  CONFIG_DEBUG_RODATA=y is already eanbled, as a special exception, as
  these bugs are hard to notice and this check already found several
  live bugs"

* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm: Warn on W^X mappings
  x86/mm: Fix no-change case in try_preserve_large_page()
  x86/mm: Fix __split_large_page() to handle large PAT bit
  x86/mm: Fix try_preserve_large_page() to handle large PAT bit
  x86/mm: Fix gup_huge_p?d() to handle large PAT bit
  x86/mm: Fix slow_virt_to_phys() to handle large PAT bit
  x86/mm: Fix page table dump to show PAT bit
  x86/asm: Add pud_pgprot() and pmd_pgprot()
  x86/asm: Fix pud/pmd interfaces to handle large PAT bit
  x86/asm: Add pud/pmd mask interfaces to handle large PAT bit
  x86/asm: Move PUD_PAGE macros to page_types.h
  x86/vdso32: Define PGTABLE_LEVELS to 32bit VDSO

6 years agoMerge branch 'x86-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Wed, 4 Nov 2015 05:05:40 +0000 (21:05 -0800)]
Merge branch 'x86-headers-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 sigcontext header cleanups from Ingo Molnar:
 "This series reorganizes and cleans up various aspects of the main
  sigcontext UAPI headers, such as unifying the data structures and
  updating/adding lots of comments to explain all the ABI details and
  quirks.  The headers can now also be built in user-space standalone"

* 'x86-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/headers: Clean up too long lines
  x86/headers: Remove <asm/sigcontext.h> references on the kernel side
  x86/headers: Remove direct sigcontext32.h uses
  x86/headers: Convert sigcontext_ia32 uses to sigcontext_32
  x86/headers: Unify 'struct sigcontext_ia32' and 'struct sigcontext_32'
  x86/headers: Make sigcontext pointers bit independent
  x86/headers: Move the 'struct sigcontext' definitions into the UAPI header
  x86/headers: Clean up the kernel's struct sigcontext types to be ABI-clean
  x86/headers: Convert uses of _fpstate_ia32 to _fpstate_32
  x86/headers: Unify 'struct _fpstate_ia32' and i386 struct _fpstate
  x86/headers: Unify register type definitions between 32-bit compat and i386
  x86/headers: Use ABI types consistently in sigcontext*.h
  x86/headers: Separate out legacy user-space structure definitions
  x86/headers: Clean up and better document uapi/asm/sigcontext.h
  x86/headers: Clean up uapi/asm/sigcontext32.h
  x86/headers: Fix (old) header file dependency bug in uapi/asm/sigcontext32.h

6 years agoMerge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
Linus Torvalds [Wed, 4 Nov 2015 04:50:26 +0000 (20:50 -0800)]
Merge branch 'x86-fpu-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 fpu changes from Ingo Molnar:
 "There are two main areas of changes:

   - Rework of the extended FPU state code to robustify the kernel's
     usage of cpuid provided xstate sizes - and related changes (Dave
     Hansen)"

   - math emulation enhancements: new modern FPU instructions support,
     with testcases, plus cleanups (Denys Vlasnko)"

* 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (23 commits)
  x86/fpu: Fixup uninitialized feature_name warning
  x86/fpu/math-emu: Add support for FISTTP instructions
  x86/fpu/math-emu, selftests: Add test for FISTTP instructions
  x86/fpu/math-emu: Add support for FCMOVcc insns
  x86/fpu/math-emu: Add support for F[U]COMI[P] insns
  x86/fpu/math-emu: Remove define layer for undocumented opcodes
  x86/fpu/math-emu, selftests: Add tests for FCMOV and FCOMI insns
  x86/fpu/math-emu: Remove !NO_UNDOC_CODE
  x86/fpu: Check CPU-provided sizes against struct declarations
  x86/fpu: Check to ensure increasing-offset xstate offsets
  x86/fpu: Correct and check XSAVE xstate size calculations
  x86/fpu: Add C structures for AVX-512 state components
  x86/fpu: Rework YMM definition
  x86/fpu/mpx: Rework MPX 'xstate' types
  x86/fpu: Add xfeature_enabled() helper instead of test_bit()
  x86/fpu: Remove 'xfeature_nr'
  x86/fpu: Rework XSTATE_* macros to remove magic '2'
  x86/fpu: Rename XFEATURES_NR_MAX
  x86/fpu: Rename XSAVE macros
  x86/fpu: Remove partial LWP support definitions
  ...

6 years agoMerge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
Linus Torvalds [Wed, 4 Nov 2015 04:12:10 +0000 (20:12 -0800)]
Merge branch 'x86-debug-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 kgdb fixlet from Ingo Molnar:
 "A single debugging related commit: compress the memory usage of a kgdb
  data structure"

* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/kgdb: Replace bool_int_array[NR_CPUS] with bitmap

6 years agoMerge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
Linus Torvalds [Wed, 4 Nov 2015 03:39:42 +0000 (19:39 -0800)]
Merge branch 'x86-cpu-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 cpu changes from Ingo Molnar:
 "Two changes in this cycle: a Kconfig help text enhancement, and an AMD
  CLZERO instruction capability detection and enumeration"

* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/cpu: Add CLZERO detection
  x86/Kconfig/cpus: Fix/complete CPU type help texts

6 years agoMerge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Wed, 4 Nov 2015 03:34:22 +0000 (19:34 -0800)]
Merge branch 'x86-cleanups-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 cleanups from Ingo Molnar:
 "An early_printk cleanup plus deinlining enhancements"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/early_printk: Set __iomem address space for IO
  x86/signal: Deinline get_sigframe, save 240 bytes
  x86: Deinline early_console_register, save 403 bytes
  x86/e820: Deinline e820_type_to_string, save 126 bytes

6 years agoMerge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
Linus Torvalds [Wed, 4 Nov 2015 03:28:37 +0000 (19:28 -0800)]
Merge branch 'x86-boot-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 boot cleanup from Ingo Molnar:
 "A single commit: remove an obsolete kcrash boot flag"

* 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/kexec: Remove obsolete 'in_crash_kexec' flag

6 years agodrm/i915: Fix locking around GuC firmware load
Daniel Stone [Tue, 3 Nov 2015 21:42:31 +0000 (21:42 +0000)]
drm/i915: Fix locking around GuC firmware load

The GuC firmware load requires struct_mutex to create a GEM object,
but this collides badly with request_firmware. Move struct_mutex
locking down into the loader itself, so we don't hold it across the
entire load process, including request_firmware.

[   20.451400] ======================================================
[   20.451420] [ INFO: possible circular locking dependency detected ]
[   20.451441] 4.3.0-rc5+ #1 Tainted: G        W
[   20.451457] -------------------------------------------------------
[   20.451477] plymouthd/371 is trying to acquire lock:
[   20.451494]  (&dev->struct_mutex){+.+.+.}, at: [<ffffffffa0093c62>]
drm_gem_mmap+0x112/0x290 [drm]
[   20.451538]
               but task is already holding lock:
[   20.451557]  (&mm->mmap_sem){++++++}, at: [<ffffffff811fd9ac>]
vm_mmap_pgoff+0x8c/0xf0
[   20.451591]
               which lock already depends on the new lock.

[   20.451617]
               the existing dependency chain (in reverse order) is:
[   20.451640]
               -> #3 (&mm->mmap_sem){++++++}:
[   20.451661]        [<ffffffff8110644e>] lock_acquire+0xce/0x1c0
[   20.451683]        [<ffffffff8120ec9a>] __might_fault+0x7a/0xa0
[   20.451705]        [<ffffffff8127e34e>] filldir+0x9e/0x130
[   20.451726]        [<ffffffff81295b86>] dcache_readdir+0x186/0x230
[   20.451748]        [<ffffffff8127e117>] iterate_dir+0x97/0x130
[   20.451769]        [<ffffffff8127e66a>] SyS_getdents+0x9a/0x130
[   20.451790]        [<ffffffff8184f2f2>] entry_SYSCALL_64_fastpath+0x12/0x76
[   20.451829]
               -> #2 (&sb->s_type->i_mutex_key#2){+.+.+.}:
[   20.451852]        [<ffffffff8110644e>] lock_acquire+0xce/0x1c0
[   20.451872]        [<ffffffff8184b516>] mutex_lock_nested+0x86/0x400
[   20.451893]        [<ffffffff81277790>] walk_component+0x1d0/0x2a0
[   20.451914]        [<ffffffff812779f0>] link_path_walk+0x190/0x5a0
[   20.451935]        [<ffffffff8127803b>] path_openat+0xab/0x1260
[   20.451955]        [<ffffffff8127a651>] do_filp_open+0x91/0x100
[   20.451975]        [<ffffffff81267e67>] file_open_name+0xf7/0x150
[   20.451995]        [<ffffffff81267ef3>] filp_open+0x33/0x60
[   20.452014]        [<ffffffff8157e1e7>] _request_firmware+0x277/0x880
[   20.452038]        [<ffffffff8157e9e4>] request_firmware_work_func+0x34/0x80
[   20.452060]        [<ffffffff810c7020>] process_one_work+0x230/0x680
[   20.452082]        [<ffffffff810c74be>] worker_thread+0x4e/0x450
[   20.452102]        [<ffffffff810ce511>] kthread+0x101/0x120
[   20.452121]        [<ffffffff8184f66f>] ret_from_fork+0x3f/0x70
[   20.452140]
               -> #1 (umhelper_sem){++++.+}:
[   20.452159]        [<ffffffff8110644e>] lock_acquire+0xce/0x1c0
[   20.452178]        [<ffffffff8184c5c1>] down_read+0x51/0xa0
[   20.452197]        [<ffffffff810c203b>]
usermodehelper_read_trylock+0x5b/0x130
[   20.452221]        [<ffffffff8157e147>] _request_firmware+0x1d7/0x880
[   20.452242]        [<ffffffff8157e821>] request_firmware+0x31/0x50
[   20.452262]        [<ffffffffa01b54a4>]
intel_guc_ucode_init+0xf4/0x400 [i915]
[   20.452305]        [<ffffffffa0213913>] i915_driver_load+0xd63/0x16e0 [i915]
[   20.452343]        [<ffffffffa00987d9>] drm_dev_register+0xa9/0xc0 [drm]
[   20.452369]        [<ffffffffa009ae3d>] drm_get_pci_dev+0x8d/0x1e0 [drm]
[   20.452396]        [<ffffffffa01521e4>] i915_pci_probe+0x34/0x50 [i915]
[   20.452421]        [<ffffffff81464675>] local_pci_probe+0x45/0xa0
[   20.452443]        [<ffffffff81465a6d>] pci_device_probe+0xfd/0x140
[   20.452464]        [<ffffffff8156a2e4>] driver_probe_device+0x224/0x480
[   20.452486]        [<ffffffff8156a5c8>] __driver_attach+0x88/0x90
[   20.452505]        [<ffffffff81567cf3>] bus_for_each_dev+0x73/0xc0
[   20.452526]        [<ffffffff81569a7e>] driver_attach+0x1e/0x20
[   20.452546]        [<ffffffff815695ae>] bus_add_driver+0x1ee/0x280
[   20.452566]        [<ffffffff8156b100>] driver_register+0x60/0xe0
[   20.453197]        [<ffffffff81464050>] __pci_register_driver+0x60/0x70
[   20.453845]        [<ffffffffa009b070>] drm_pci_init+0xe0/0x110 [drm]
[   20.454497]        [<ffffffffa027f092>] 0xffffffffa027f092
[   20.455156]        [<ffffffff81002123>] do_one_initcall+0xb3/0x200
[   20.455796]        [<ffffffff811d8c01>] do_init_module+0x5f/0x1e7
[   20.456434]        [<ffffffff8114c4e6>] load_module+0x2126/0x27d0
[   20.457071]        [<ffffffff8114cdf9>] SyS_finit_module+0xb9/0xf0
[   20.457738]        [<ffffffff8184f2f2>] entry_SYSCALL_64_fastpath+0x12/0x76
[   20.458370]
               -> #0 (&dev->struct_mutex){+.+.+.}:
[   20.459773]        [<ffffffff8110584f>] __lock_acquire+0x191f/0x1ba0
[   20.460451]        [<ffffffff8110644e>] lock_acquire+0xce/0x1c0
[   20.461074]        [<ffffffffa0093c88>] drm_gem_mmap+0x138/0x290 [drm]
[   20.461693]        [<ffffffff8121a5ec>] mmap_region+0x3ec/0x670
[   20.462298]        [<ffffffff8121abb2>] do_mmap+0x342/0x420
[   20.462901]        [<ffffffff811fd9d2>] vm_mmap_pgoff+0xb2/0xf0
[   20.463532]        [<ffffffff81218f62>] SyS_mmap_pgoff+0x1f2/0x290
[   20.464118]        [<ffffffff8102187b>] SyS_mmap+0x1b/0x30
[   20.464702]        [<ffffffff8184f2f2>] entry_SYSCALL_64_fastpath+0x12/0x76
[   20.465289]
               other info that might help us debug this:

[   20.467179] Chain exists of:
                 &dev->struct_mutex --> &sb->s_type->i_mutex_key#2 -->
&mm->mmap_sem

[   20.468928]  Possible unsafe locking scenario:

[   20.470161]        CPU0                    CPU1
[   20.470745]        ----                    ----
[   20.471325]   lock(&mm->mmap_sem);
[   20.471902]                                lock(&sb->s_type->i_mutex_key#2);
[   20.472538]                                lock(&mm->mmap_sem);
[   20.473118]   lock(&dev->struct_mutex);
[   20.473704]
                *** DEADLOCK ***

Signed-off-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
6 years agoMerge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
Linus Torvalds [Wed, 4 Nov 2015 02:59:10 +0000 (18:59 -0800)]
Merge branch 'x86-asm-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 asm changes from Ingo Molnar:
 "The main change in this cycle is another step in the big x86 system
  call interface rework by Andy Lutomirski, which moves most of the low
  level x86 entry code from assembly to C, for all syscall entries
  except native 64-bit system calls:

    arch/x86/entry/entry_32.S        | 182 ++++------
    arch/x86/entry/entry_64_compat.S | 547 ++++++++-----------------------
    194 insertions(+), 535 deletions(-)

  ... our hope is that the final remaining step (converting native
  64-bit system calls) will be less painful as all the previous steps,
  given that most of the legacies and quirks are concentrated around
  native 32-bit and compat environments"

* 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (47 commits)
  x86/entry/32: Fix FS and GS restore in opportunistic SYSEXIT
  x86/entry/32: Fix entry_INT80_32() to expect interrupts to be on
  um/x86: Fix build after x86 syscall changes
  x86/asm: Remove the xyz_cfi macros from dwarf2.h
  selftests/x86: Style fixes for the 'unwind_vdso' test
  x86/entry/64/compat: Document sysenter_fix_flags's reason for existence
  x86/entry: Split and inline syscall_return_slowpath()
  x86/entry: Split and inline prepare_exit_to_usermode()
  x86/entry: Use pt_regs_to_thread_info() in syscall entry tracing
  x86/entry: Hide two syscall entry assertions behind CONFIG_DEBUG_ENTRY
  x86/entry: Micro-optimize compat fast syscall arg fetch
  x86/entry: Force inlining of 32-bit syscall code
  x86/entry: Make irqs_disabled checks in exit code depend on lockdep
  x86/entry: Remove unnecessary IRQ twiddling in fast 32-bit syscalls
  x86/asm: Remove thread_info.sysenter_return
  x86/entry/32: Re-implement SYSENTER using the new C path
  x86/entry/32: Switch INT80 to the new C syscall path
  x86/entry/32: Open-code return tracking from fork and kthreads
  x86/entry/compat: Implement opportunistic SYSRETL for compat syscalls
  x86/vdso/compat: Wire up SYSENTER and SYSCSALL for compat userspace
  ...

6 years agoMerge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
Linus Torvalds [Wed, 4 Nov 2015 02:33:15 +0000 (18:33 -0800)]
Merge branch 'x86-apic-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 apic changes from Ingo Molnar:
 "The main changes in this cycle were:

   - Numachip updates: new hardware support, fixes and cleanups.
     (Daniel J Blueman)

   - misc smaller cleanups and fixlets"

* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/io_apic: Make eoi_ioapic_pin() static
  x86/irq: Drop unlikely before IS_ERR_OR_NULL
  x86/x2apic: Make stub functions available even if !CONFIG_X86_LOCAL_APIC
  x86/apic: Deinline various functions
  x86/numachip: Fix timer build conflict
  x86/numachip: Introduce Numachip2 timer mechanisms
  x86/numachip: Add Numachip IPI optimisations
  x86/numachip: Add Numachip2 APIC support
  x86/numachip: Cleanup Numachip support