]> git.kernelconcepts.de Git - karo-tx-linux.git/log
karo-tx-linux.git
8 years agoMerge remote-tracking branch 'dwmw2-iommu/master'
Stephen Rothwell [Thu, 5 Nov 2015 02:08:04 +0000 (13:08 +1100)]
Merge remote-tracking branch 'dwmw2-iommu/master'

8 years agoMerge remote-tracking branch 'iommu/next'
Stephen Rothwell [Thu, 5 Nov 2015 02:06:06 +0000 (13:06 +1100)]
Merge remote-tracking branch 'iommu/next'

8 years agoMerge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Thu, 5 Nov 2015 02:04:22 +0000 (13:04 +1100)]
Merge remote-tracking branch 'watchdog/master'

8 years agoMerge remote-tracking branch 'security/next'
Stephen Rothwell [Thu, 5 Nov 2015 01:54:46 +0000 (12:54 +1100)]
Merge remote-tracking branch 'security/next'

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

8 years agoMerge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Thu, 5 Nov 2015 01:51:39 +0000 (12:51 +1100)]
Merge remote-tracking branch 'omap_dss2/for-next'

8 years agonext-20150925/battery
Stephen Rothwell [Thu, 5 Nov 2015 01:46:42 +0000 (12:46 +1100)]
next-20150925/battery

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

8 years agoMerge remote-tracking branch 'mfd/for-mfd-next'
Stephen Rothwell [Thu, 5 Nov 2015 01:27:26 +0000 (12:27 +1100)]
Merge remote-tracking branch 'mfd/for-mfd-next'

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

8 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Thu, 5 Nov 2015 01:24:23 +0000 (12:24 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'

8 years agoMerge remote-tracking branch 'device-mapper/for-next'
Stephen Rothwell [Thu, 5 Nov 2015 01:22:28 +0000 (12:22 +1100)]
Merge remote-tracking branch 'device-mapper/for-next'

8 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Thu, 5 Nov 2015 01:18:26 +0000 (12:18 +1100)]
Merge remote-tracking branch 'block/for-next'

8 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Thu, 5 Nov 2015 01:17:12 +0000 (12:17 +1100)]
Merge remote-tracking branch 'input/next'

8 years agoMerge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Thu, 5 Nov 2015 01:15:29 +0000 (12:15 +1100)]
Merge remote-tracking branch 'modules/modules-next'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

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

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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'

8 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>
8 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>
8 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>
8 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>
8 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.kernel.org/pub/scm/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

8 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>
8 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.kernel.org/pub/scm/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
  ...

8 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.kernel.org/pub/scm/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
  ...

8 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

8 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>
8 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>