]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
8 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Mon, 2 Nov 2015 00:05:26 +0000 (11:05 +1100)]
Merge remote-tracking branch 'slave-dma/next'

8 years agoMerge remote-tracking branch 'thermal-soc/next'
Stephen Rothwell [Mon, 2 Nov 2015 00:03:41 +0000 (11:03 +1100)]
Merge remote-tracking branch 'thermal-soc/next'

8 years agoMerge remote-tracking branch 'thermal/next'
Stephen Rothwell [Mon, 2 Nov 2015 00:02:01 +0000 (11:02 +1100)]
Merge remote-tracking branch 'thermal/next'

8 years agoMerge remote-tracking branch 'idle/next'
Stephen Rothwell [Mon, 2 Nov 2015 00:01:56 +0000 (11:01 +1100)]
Merge remote-tracking branch 'idle/next'

8 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Sun, 1 Nov 2015 23:53:48 +0000 (10:53 +1100)]
Merge remote-tracking branch 'pm/linux-next'

8 years agoMerge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Sun, 1 Nov 2015 23:52:33 +0000 (10:52 +1100)]
Merge remote-tracking branch 'libata/for-next'

8 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Sun, 1 Nov 2015 23:50:48 +0000 (10:50 +1100)]
Merge remote-tracking branch 'kbuild/for-next'

8 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Sun, 1 Nov 2015 23:48:42 +0000 (10:48 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'

8 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Sun, 1 Nov 2015 23:47:34 +0000 (10:47 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

8 years agoMerge branch 'jdelvare-hwmon/master'
Stephen Rothwell [Sun, 1 Nov 2015 23:46:23 +0000 (10:46 +1100)]
Merge branch 'jdelvare-hwmon/master'

8 years agoMerge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Sun, 1 Nov 2015 23:44:14 +0000 (10:44 +1100)]
Merge remote-tracking branch 'i2c/i2c/for-next'

8 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Sun, 1 Nov 2015 23:42:59 +0000 (10:42 +1100)]
Merge remote-tracking branch 'hid/for-next'

8 years agoMerge remote-tracking branch 'pci/next'
Stephen Rothwell [Sun, 1 Nov 2015 23:39:29 +0000 (10:39 +1100)]
Merge remote-tracking branch 'pci/next'

8 years agoMerge remote-tracking branch 'file-locks/linux-next'
Stephen Rothwell [Sun, 1 Nov 2015 23:32:44 +0000 (10:32 +1100)]
Merge remote-tracking branch 'file-locks/linux-next'

8 years agoMerge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Sun, 1 Nov 2015 23:31:32 +0000 (10:31 +1100)]
Merge remote-tracking branch 'xfs/for-next'

8 years agoMerge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Sun, 1 Nov 2015 23:30:22 +0000 (10:30 +1100)]
Merge remote-tracking branch 'ubifs/linux-next'

8 years agoMerge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Sun, 1 Nov 2015 23:29:13 +0000 (10:29 +1100)]
Merge remote-tracking branch 'v9fs/for-next'

8 years agoMerge remote-tracking branch 'overlayfs/overlayfs-next'
Stephen Rothwell [Sun, 1 Nov 2015 23:28:01 +0000 (10:28 +1100)]
Merge remote-tracking branch 'overlayfs/overlayfs-next'

8 years agoMerge remote-tracking branch 'orangefs/for-next'
Stephen Rothwell [Sun, 1 Nov 2015 23:26:52 +0000 (10:26 +1100)]
Merge remote-tracking branch 'orangefs/for-next'

8 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Sun, 1 Nov 2015 23:20:07 +0000 (10:20 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'

8 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Sun, 1 Nov 2015 23:18:18 +0000 (10:18 +1100)]
Merge remote-tracking branch 'nfs/linux-next'

8 years agoMerge remote-tracking branch 'gfs2/for-next'
Stephen Rothwell [Sun, 1 Nov 2015 23:17:08 +0000 (10:17 +1100)]
Merge remote-tracking branch 'gfs2/for-next'

8 years agoMerge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Sun, 1 Nov 2015 23:15:55 +0000 (10:15 +1100)]
Merge remote-tracking branch 'fscache/fscache'

8 years agoMerge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Sun, 1 Nov 2015 23:14:46 +0000 (10:14 +1100)]
Merge remote-tracking branch 'f2fs/dev'

8 years agoMerge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Sun, 1 Nov 2015 23:07:57 +0000 (10:07 +1100)]
Merge remote-tracking branch 'ext4/dev'

8 years agoMerge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Sun, 1 Nov 2015 23:06:47 +0000 (10:06 +1100)]
Merge remote-tracking branch 'ecryptfs/next'

8 years agoMerge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Sun, 1 Nov 2015 23:05:38 +0000 (10:05 +1100)]
Merge remote-tracking branch 'cifs/for-next'

8 years agoMerge remote-tracking branch 'ceph/master'
Stephen Rothwell [Sun, 1 Nov 2015 23:05:35 +0000 (10:05 +1100)]
Merge remote-tracking branch 'ceph/master'

8 years agoMerge remote-tracking branch 'tile/master'
Stephen Rothwell [Sun, 1 Nov 2015 23:04:22 +0000 (10:04 +1100)]
Merge remote-tracking branch 'tile/master'

8 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Sun, 1 Nov 2015 22:56:12 +0000 (09:56 +1100)]
Merge remote-tracking branch 's390/features'

8 years agoMerge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Sun, 1 Nov 2015 22:55:03 +0000 (09:55 +1100)]
Merge remote-tracking branch 'mpc5xxx/next'

8 years agoMerge remote-tracking branch 'fsl/next'
Stephen Rothwell [Sun, 1 Nov 2015 22:53:29 +0000 (09:53 +1100)]
Merge remote-tracking branch 'fsl/next'

8 years agoMerge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Sun, 1 Nov 2015 22:51:51 +0000 (09:51 +1100)]
Merge remote-tracking branch 'powerpc/next'

8 years agoMerge remote-tracking branch 'parisc-hd/for-next'
Stephen Rothwell [Sun, 1 Nov 2015 22:48:07 +0000 (09:48 +1100)]
Merge remote-tracking branch 'parisc-hd/for-next'

8 years agoMerge remote-tracking branch 'nios2/for-next'
Stephen Rothwell [Sun, 1 Nov 2015 22:46:59 +0000 (09:46 +1100)]
Merge remote-tracking branch 'nios2/for-next'

8 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Sun, 1 Nov 2015 22:45:51 +0000 (09:45 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

8 years agoMerge remote-tracking branch 'metag/for-next'
Stephen Rothwell [Sun, 1 Nov 2015 22:44:41 +0000 (09:44 +1100)]
Merge remote-tracking branch 'metag/for-next'

8 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Sun, 1 Nov 2015 22:43:32 +0000 (09:43 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'

8 years agoMerge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Sun, 1 Nov 2015 22:42:24 +0000 (09:42 +1100)]
Merge remote-tracking branch 'm68k/for-next'

8 years agoMerge remote-tracking branch 'ia64/next'
Stephen Rothwell [Sun, 1 Nov 2015 22:40:45 +0000 (09:40 +1100)]
Merge remote-tracking branch 'ia64/next'

8 years agoMerge remote-tracking branch 'h8300/h8300-next'
Stephen Rothwell [Sun, 1 Nov 2015 22:39:36 +0000 (09:39 +1100)]
Merge remote-tracking branch 'h8300/h8300-next'

8 years agoMerge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Sun, 1 Nov 2015 22:38:28 +0000 (09:38 +1100)]
Merge remote-tracking branch 'cris/for-next'

8 years agoMerge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Sun, 1 Nov 2015 22:37:18 +0000 (09:37 +1100)]
Merge remote-tracking branch 'c6x/for-linux-next'

8 years agoMerge remote-tracking branch 'arm64/for-next/core'
Stephen Rothwell [Sun, 1 Nov 2015 22:31:08 +0000 (09:31 +1100)]
Merge remote-tracking branch 'arm64/for-next/core'

8 years agoMerge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Sun, 1 Nov 2015 22:29:51 +0000 (09:29 +1100)]
Merge remote-tracking branch 'tegra/for-next'

8 years agoMerge remote-tracking branch 'sunxi/sunxi/for-next'
Stephen Rothwell [Sun, 1 Nov 2015 22:29:41 +0000 (09:29 +1100)]
Merge remote-tracking branch 'sunxi/sunxi/for-next'

8 years agoMerge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Sun, 1 Nov 2015 22:28:32 +0000 (09:28 +1100)]
Merge remote-tracking branch 'samsung/for-next'

8 years agoMerge remote-tracking branch 'rockchip/for-next'
Stephen Rothwell [Sun, 1 Nov 2015 22:28:11 +0000 (09:28 +1100)]
Merge remote-tracking branch 'rockchip/for-next'

8 years agoMerge remote-tracking branch 'renesas/next'
Stephen Rothwell [Sun, 1 Nov 2015 22:28:00 +0000 (09:28 +1100)]
Merge remote-tracking branch 'renesas/next'

8 years agoMerge remote-tracking branch 'qcom/qcom/for-next'
Stephen Rothwell [Sun, 1 Nov 2015 22:26:49 +0000 (09:26 +1100)]
Merge remote-tracking branch 'qcom/qcom/for-next'

8 years agoMerge remote-tracking branch 'omap-pending/for-next'
Stephen Rothwell [Sun, 1 Nov 2015 22:26:38 +0000 (09:26 +1100)]
Merge remote-tracking branch 'omap-pending/for-next'

8 years agoMerge remote-tracking branch 'omap/for-next'
Stephen Rothwell [Sun, 1 Nov 2015 22:26:21 +0000 (09:26 +1100)]
Merge remote-tracking branch 'omap/for-next'

8 years agoMerge remote-tracking branch 'mvebu/for-next'
Stephen Rothwell [Sun, 1 Nov 2015 22:26:20 +0000 (09:26 +1100)]
Merge remote-tracking branch 'mvebu/for-next'

8 years agoMerge remote-tracking branch 'keystone/next'
Stephen Rothwell [Sun, 1 Nov 2015 22:24:53 +0000 (09:24 +1100)]
Merge remote-tracking branch 'keystone/next'

8 years agoMerge remote-tracking branch 'imx-mxs/for-next'
Stephen Rothwell [Sun, 1 Nov 2015 22:24:44 +0000 (09:24 +1100)]
Merge remote-tracking branch 'imx-mxs/for-next'

8 years agoMerge remote-tracking branch 'berlin/berlin/for-next'
Stephen Rothwell [Sun, 1 Nov 2015 22:23:26 +0000 (09:23 +1100)]
Merge remote-tracking branch 'berlin/berlin/for-next'

8 years agoMerge remote-tracking branch 'at91/at91-next'
Stephen Rothwell [Sun, 1 Nov 2015 22:22:07 +0000 (09:22 +1100)]
Merge remote-tracking branch 'at91/at91-next'

8 years agoMerge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Sun, 1 Nov 2015 22:20:04 +0000 (09:20 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'

8 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Sun, 1 Nov 2015 22:18:05 +0000 (09:18 +1100)]
Merge remote-tracking branch 'arm/for-next'

8 years agoMerge remote-tracking branch 'arc/for-next'
Stephen Rothwell [Sun, 1 Nov 2015 22:10:53 +0000 (09:10 +1100)]
Merge remote-tracking branch 'arc/for-next'

8 years agoMerge remote-tracking branch 'asm-generic/master'
Stephen Rothwell [Sun, 1 Nov 2015 22:09:15 +0000 (09:09 +1100)]
Merge remote-tracking branch 'asm-generic/master'

8 years agoMerge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes'
Stephen Rothwell [Sun, 1 Nov 2015 22:08:06 +0000 (09:08 +1100)]
Merge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes'

8 years agoMerge remote-tracking branch 'usb-chipidea-fixes/ci-for-usb-stable'
Stephen Rothwell [Sun, 1 Nov 2015 22:07:59 +0000 (09:07 +1100)]
Merge remote-tracking branch 'usb-chipidea-fixes/ci-for-usb-stable'

8 years agoMerge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Sun, 1 Nov 2015 22:07:56 +0000 (09:07 +1100)]
Merge remote-tracking branch 'sound-current/for-linus'

8 years agoMerge remote-tracking branch 'net/master'
Stephen Rothwell [Sun, 1 Nov 2015 22:07:54 +0000 (09:07 +1100)]
Merge remote-tracking branch 'net/master'

8 years agoMerge remote-tracking branch 'sparc/master'
Stephen Rothwell [Sun, 1 Nov 2015 22:07:53 +0000 (09:07 +1100)]
Merge remote-tracking branch 'sparc/master'

8 years agoMerge remote-tracking branch 'arm-current/fixes'
Stephen Rothwell [Sun, 1 Nov 2015 22:07:47 +0000 (09:07 +1100)]
Merge remote-tracking branch 'arm-current/fixes'

8 years agonet: bcmgenet: Software reset EPHY after power on
Florian Fainelli [Fri, 30 Oct 2015 01:11:35 +0000 (18:11 -0700)]
net: bcmgenet: Software reset EPHY after power on

The EPHY on GENET v1->v3 is extremely finicky, and will show occasional
failures based on the timing and reset sequence, ranging from duplicate
packets, to extremely high latencies.

Perform an additional software reset, and re-configuration to make sure it is
in a consistent and working state.

Fixes: 6ac3ce8295e6 ("net: bcmgenet: Remove excessive PHY reset")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
8 years agoMerge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Sun, 1 Nov 2015 19:45:26 +0000 (11:45 -0800)]
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Thomas Gleixner:
 "This set of updates contains:

   - Another bugfix for the pathologic vm86 machinery.  Clear
     thread.vm86 on fork to prevent corrupting the parent state.  This
     comes along with an update to the vm86 selftest case

   - Fix another corner case in the ioapic setup code which causes a
     boot crash on some oddball systems

   - Fix the fallout from the dma allocation consolidation work, which
     leads to a NULL pointer dereference when the allocation code is
     called with a NULL device"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/vm86: Set thread.vm86 to NULL on fork/clone
  selftests/x86: Add a fork() to entry_from_vm86 to catch fork bugs
  x86/ioapic: Prevent NULL pointer dereference in setup_ioapic_dest()
  x86/dma-mapping: Fix arch_dma_alloc_attrs() oops with NULL dev

8 years agoMerge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Sun, 1 Nov 2015 19:39:03 +0000 (11:39 -0800)]
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer fixes from Thomas Gleixner:
 "The last round of minimalistic fixes for clocksource drivers:

   - Prevent multiple shutdown of the sh_mtu2 clocksource

   - Annotate a bunch of clocksource/schedclock functions with notrace
     to prevent an annoying ftrace recursion issue"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource/drivers/sh_mtu2: Fix multiple shutdown call issue
  clocksource/drivers/digicolor: Prevent ftrace recursion
  clocksource/drivers/fsl_ftm_timer: Prevent ftrace recursion
  clocksource/drivers/vf_pit_timer: Prevent ftrace recursion
  clocksource/drivers/prima2: Prevent ftrace recursion
  clocksource/drivers/samsung_pwm_timer: Prevent ftrace recursion
  clocksource/drivers/pistachio: Prevent ftrace recursion
  clocksource/drivers/arm_global_timer: Prevent ftrace recursion

8 years agoMerge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Sun, 1 Nov 2015 19:33:04 +0000 (11:33 -0800)]
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull irq fixes from Thomas Gleixner:
 "The last two one-liners for 4.3 from the irqchip space:

   - Regression fix for armada SoC which addresses the fallout from the
     set_irq_flags() cleanup

   - Add the missing propagation of the irq_set_type() callback to the
     parent interrupt controller of the tegra interrupt chip"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip/tegra: Propagate IRQ type setting to parent
  irqchip/armada-370-xp: Fix regression by clearing IRQ_NOAUTOEN

8 years agonet: smsc911x: Fix crash if loopback test fails
Pavel Fedin [Thu, 29 Oct 2015 06:45:22 +0000 (09:45 +0300)]
net: smsc911x: Fix crash if loopback test fails

On certain hardware in certain situations loopback test fails and the
driver gets removed. During mdiobus_unregister() instance of PHY driver
gets disposed. But by this time it has already been started using
phy_connect_direct().

PHY driver uses DELAYED_WORK in order to maintain its state. Attempting
to dispose the driver without calling phy_disconnect() causes deallocation
of DELAYED_WORK being active. This shortly causes a bad crash in timer
code.

The problem can be discovered by enabling CONFIG_DEBUG_OBJECTS_TIMERS and
CONFIG_DEBUG_OBJECTS_FREE

Signed-off-by: Pavel Fedin <p.fedin@samsung.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
8 years agotipc: linearize arriving NAME_DISTR and LINK_PROTO buffers
Jon Paul Maloy [Wed, 28 Oct 2015 17:09:53 +0000 (13:09 -0400)]
tipc: linearize arriving NAME_DISTR and LINK_PROTO buffers

Testing of the new UDP bearer has revealed that reception of
NAME_DISTRIBUTOR, LINK_PROTOCOL/RESET and LINK_PROTOCOL/ACTIVATE
message buffers is not prepared for the case that those may be
non-linear.

We now linearize all such buffers before they are delivered up to the
generic reception layer.

In order for the commit to apply cleanly to 'net' and 'stable', we do
the change in the function tipc_udp_recv() for now. Later, we will post
a commit to 'net-next' moving the linearization to generic code, in
tipc_named_rcv() and tipc_link_proto_rcv().

Fixes: commit d0f91938bede ("tipc: add ip/udp media type")
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
8 years agofec: Use gpio_set_value_cansleep()
Fabio Estevam [Wed, 28 Oct 2015 12:20:30 +0000 (10:20 -0200)]
fec: Use gpio_set_value_cansleep()

We are in a context where we can sleep, and the FEC PHY reset gpio
may be on an I2C expander. Use the cansleep() variant when
setting the GPIO value.

Based on a patch from Russell King for pci-mvebu.c.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
8 years ago[SMB3] Fix build so persistent handles disabled if SMB2 support not configured
Steve French [Sun, 1 Nov 2015 05:07:13 +0000 (00:07 -0500)]
[SMB3] Fix build so persistent handles disabled if SMB2 support not configured

Signed-off-by: Steve French <steve.french@primarydata.com>
8 years agoMerge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Linus Torvalds [Sun, 1 Nov 2015 04:36:07 +0000 (21:36 -0700)]
Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC fixes from Olof Johansson:
 "This should be our final batch of fixes for 4.3:

   - A patch from Sudeep Holla that fixes annotation of wakeup sources
     properly, old unused format seems to have spread through copying.

   - Two patches from Tony for OMAP.  One dealing with MUSB setup
     problems due to runtime PM being enabled too early on the parent
     device.  The other fixes IRQ numbering for OMAP1"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  usb: musb: omap2430: Fix regression caused by driver core change
  ARM: OMAP1: fix incorrect INT_DMA_LCD
  ARM: dts: fix gpio-keys wakeup-source property

8 years agoMerge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Linus Torvalds [Sun, 1 Nov 2015 04:26:04 +0000 (21:26 -0700)]
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI fixes from James Bottomley:
 "This is three essential bug fixes for various SCSI parts.

  The only affected users are SCSI multi-path via device handler
  (basically all the enterprise) and mvsas users.  The dh bugs are an
  async entanglement in boot resulting in a serious WARN_ON trip and a
  use after free on remove leading to a crash with strict memory
  accounting.  The mvsas bug manifests as a null deref oops but only on
  abort sequences; however, these can commonly occur with SATA attached
  devices, hence the fix"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi_dh: don't try to load a device handler during async probing
  scsi_dh: fix use-after-free when removing scsi device
  mvsas: Fix NULL pointer dereference in mvs_slot_task_free

8 years agoMerge tag 'md/4.3-rc7-fixes' of git://neil.brown.name/md
Linus Torvalds [Sun, 1 Nov 2015 04:20:49 +0000 (21:20 -0700)]
Merge tag 'md/4.3-rc7-fixes' of git://neil.brown.name/md

Pull md bug fixes from Neil Brown:
 "Two more bug fixes for md.

  One bugfix for a list corruption in raid5 because of incorrect
  locking.

  Other for possible data corruption when a recovering device is failed,
  removed, and re-added.

  Both tagged for -stable"

* tag 'md/4.3-rc7-fixes' of git://neil.brown.name/md:
  Revert "md: allow a partially recovered device to be hot-added to an array."
  md/raid5: fix locking in handle_stripe_clean_event()

8 years agoAdd resilienthandles mount parm
Steve French [Tue, 6 Oct 2015 04:17:27 +0000 (23:17 -0500)]
Add resilienthandles mount parm

Since many servers (Windows clients, and non-clustered servers) do not
support persistent handles but do support resilient handles, allow
the user to specify a mount option "resilienthandles" in order
to get more reliable connections and less chance of data loss
(at least when SMB2.1 or later).  Default resilient handle
timeout (120 seconds to recent Windows server) is used.

Reviewed-by: Pavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: Steve French <steve.french@primarydata.com>
8 years agoSend durable handle v2 contexts when use of persistent handles required
Steve French [Sat, 3 Oct 2015 23:23:44 +0000 (18:23 -0500)]
Send durable handle v2 contexts when use of persistent handles required

Reviewed-by: Pavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: Steve French <steve.french@primarydata.com>
8 years agoDisplay persistenthandles in /proc/mounts for SMB3 shares if enabled
Steve French [Thu, 1 Oct 2015 02:07:59 +0000 (21:07 -0500)]
Display persistenthandles in /proc/mounts for SMB3 shares if enabled

Signed-off-by: Steve French <steve.french@primarydata.com>
Reviewed-by: Pavel Shilovsky <pshilovsky@samba.org>
8 years agoEnable checking for continuous availability and persistent handle support
Steve French [Thu, 1 Oct 2015 01:58:41 +0000 (20:58 -0500)]
Enable checking for continuous availability and persistent handle support

Validate "persistenthandles" and "nopersistenthandles" mount options against
the support the server claims in negotiate and tree connect SMB3 responses.

Signed-off-by: Steve French <steve.french@primarydata.com>
Reviewed-by: Pavel Shilovsky <pshilovsky@samba.org>
8 years agoAdd parsing for new mount option controlling persistent handles
Steve French [Wed, 30 Sep 2015 02:49:28 +0000 (21:49 -0500)]
Add parsing for new mount option controlling persistent handles

"nopersistenthandles" and "persistenthandles" mount options added.
The former will not request persistent handles on open even when
SMB3 negotiated and Continuous Availability share.  The latter
will request persistent handles (as long as server notes the
capability in protocol negotiation) even if share is not Continuous
Availability share.

Signed-off-by: Steve French <steve.french@primarydata.com>
Reviewed-by: Pavel Shilovsky <pshilovsky@samba.org>
8 years agoupdate signing code
Steve French [Fri, 25 Sep 2015 01:28:00 +0000 (20:28 -0500)]
update signing code

Prepare for encryption support.  Add decryption and encryption key generation.

Thanks to Metze for helping with this.

Reviewed-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Steve French <steve.french@primarydata.com>
8 years agoAllow duplicate extents in SMB3 not just SMB3.1.1
Steve French [Fri, 2 Oct 2015 02:40:10 +0000 (21:40 -0500)]
Allow duplicate extents in SMB3 not just SMB3.1.1

Enable duplicate extents (cp --reflink) ioctl for SMB3.0 not just
SMB3.1.1 since have verified that this works to Windows 2016
(REFS) and additional testing done at recent plugfest with
SMB3.0 not just SMB3.1.1  This will also make it easier
for Samba.

Signed-off-by: Steve French <steve.french@primarydata.com>
Reviewed-by: David Disseldorp <ddiss@suse.de>
8 years agoMerge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Linus Torvalds [Sat, 31 Oct 2015 23:16:51 +0000 (16:16 -0700)]
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Pull drm fixes from Dave Airlie:
 "Two drm atomic core fixes.

  And two radeon patches needed to fix a backlight regression on some
  older hardware"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm: Correct arguments to list_tail_add in create blob ioctl
  drm: crtc: integer overflow in drm_property_create_blob()
  drm/radeon: fix dpms when driver backlight control is disabled
  drm/radeon: move bl encoder assignment into bl init

8 years agohwmon: (fam15h_power) Add max compute unit accumulated power
Huang Rui [Fri, 30 Oct 2015 09:56:57 +0000 (17:56 +0800)]
hwmon: (fam15h_power) Add max compute unit accumulated power

This patch adds a member in fam15h_power_data which specifies the
maximum accumulated power in a compute unit.

Signed-off-by: Huang Rui <ray.huang@amd.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
8 years agohwmon: (fam15h_power) Enable power1_input on AMD Carrizo
Huang Rui [Fri, 30 Oct 2015 09:56:56 +0000 (17:56 +0800)]
hwmon: (fam15h_power) Enable power1_input on AMD Carrizo

This patch enables power1_input attribute for Carrizo platform.

Signed-off-by: Huang Rui <ray.huang@amd.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
8 years agohwmon: (fam15h_power) Refactor attributes for dynamically added
Huang Rui [Fri, 30 Oct 2015 09:56:55 +0000 (17:56 +0800)]
hwmon: (fam15h_power) Refactor attributes for dynamically added

Attributes depend on the CPU model the driver gets loaded on.
Therefore, add those attributes dynamically at init time. This is more
flexible to control the different attributes on different platforms.

Suggested-by: Borislav Petkov <bp@alien8.de>
Signed-off-by: Huang Rui <ray.huang@amd.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
8 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
Linus Torvalds [Sat, 31 Oct 2015 22:19:36 +0000 (15:19 -0700)]
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

Pull Ceph fix from Sage Weil:
 "This sets the stable pages flag on the RBD block device when we have
  CRCs enabled.  (This is necessary since the default assumption for
  block devices changed in 3.9)"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  rbd: require stable pages if message data CRCs are enabled

8 years agoMerge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer...
Linus Torvalds [Sat, 31 Oct 2015 21:49:19 +0000 (14:49 -0700)]
Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs

Pull overlayfs bug fixes from Miklos Szeredi:
 "This contains fixes for bugs that appeared in earlier kernels (all are
  marked for -stable)"

* 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
  ovl: free lower_mnt array in ovl_put_super
  ovl: free stack of paths in ovl_fill_super
  ovl: fix open in stacked overlay
  ovl: fix dentry reference leak
  ovl: use O_LARGEFILE in ovl_copy_up()

8 years agoMerge branch 'pci/host-rcar' into next
Bjorn Helgaas [Sat, 31 Oct 2015 20:56:19 +0000 (15:56 -0500)]
Merge branch 'pci/host-rcar' into next

* pci/host-rcar:
  PCI: rcar: Fix I/O offset for multiple host bridges
  PCI: rcar: Set root bus nr to that provided in DT
  PCI: rcar: Remove dependency on ARM-specific struct hw_pci
  PCI: rcar: Make PCI aware of the I/O resources
  PCI: rcar: Build pcie-rcar.c only on ARM
  PCI: rcar: Build pci-rcar-gen2.c only on ARM

8 years agoMerge branch 'pci/host-hisi' into next
Bjorn Helgaas [Sat, 31 Oct 2015 20:55:28 +0000 (15:55 -0500)]
Merge branch 'pci/host-hisi' into next

* pci/host-hisi:
  PCI: hisi: Add HiSilicon SoC Hip05 PCIe driver

8 years agoMerge branch 'pci/host-designware' into next
Bjorn Helgaas [Sat, 31 Oct 2015 20:54:46 +0000 (15:54 -0500)]
Merge branch 'pci/host-designware' into next

* pci/host-designware:
  PCI: designware: Make driver arch-agnostic
  ARM/PCI: Replace pci_sys_data->align_resource with global function pointer
  PCI: designware: Use of_pci_get_host_bridge_resources() to parse DT
  Revert "PCI: designware: Program ATU with untranslated address"
  PCI: designware: Move calculation of bus addresses to DRA7xx

8 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Linus Torvalds [Sat, 31 Oct 2015 18:52:20 +0000 (11:52 -0700)]
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Pull networking fixes from David Miller:

 1) Fix two regressions in ipv6 route lookups, particularly wrt output
    interface specifications in the lookup key.  From David Ahern.

 2) Fix checks in ipv6 IPSEC tunnel pre-encap fragmentation, from
    Herbert Xu.

 3) Fix mis-advertisement of 1000BASE-T on bcm63xx_enet, from Simon
    Arlott.

 4) Some smsc phys misbehave with energy detect mode enabled, so add a
    DT property and disable it on such switches.  From Heiko Schocher.

 5) Fix TSO corruption on TX in mv643xx_eth, from Philipp Kirchhofer.

 6) Fix regression added by removal of openvswitch vport stats, from
    James Morse.

 7) Vendor Kconfig options should be bool, not tristate, from Andreas
    Schwab.

 8) Use non-_BH() net stats bump in tcp_xmit_probe_skb(), otherwise we
    barf during TCP REPAIR operations.

 9) Fix various bugs in openvswitch conntrack support, from Joe
    Stringer.

10) Fix NETLINK_LIST_MEMBERSHIPS locking, from David Herrmann.

11) Don't have VSOCK do sock_put() in interrupt context, from Jorgen
    Hansen.

12) Fix skb_realloc_headroom() failures properly in ISDN, from Karsten
    Keil.

13) Add some device IDs to qmi_wwan, from Bjorn Mork.

14) Fix ovs egress tunnel information when using lwtunnel devices, from
    Pravin B Shelar.

15) Add missing NETIF_F_FRAGLIST to macvtab feature list, from Jason
    Wang.

16) Fix incorrect handling of throw routes when the result of the throw
    cannot find a match, from Xin Long.

17) Protect ipv6 MTU calculations from wrap-around, from Hannes Frederic
    Sowa.

18) Fix failed autonegotiation on KSZ9031 micrel PHYs, from Nathan
    Sullivan.

19) Add missing memory barries in descriptor accesses or xgbe driver,
    from Thomas Lendacky.

20) Fix release conditon test in pppoe_release(), from Guillaume Nault.

21) Fix gianfar bugs wrt filter configuration, from Claudiu Manoil.

22) Fix violations of RX buffer alignment in sh_eth driver, from Sergei
    Shtylyov.

23) Fixing missing of_node_put() calls in various places around the
    networking, from Julia Lawall.

24) Fix incorrect leaf now walking in ipv4 routing tree, from Alexander
    Duyck.

25) RDS doesn't check pskb_pull()/pskb_trim() return values, from
    Sowmini Varadhan.

26) Fix VLAN configuration in mlx4 driver, from Jack Morgenstein.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (79 commits)
  ipv6: protect mtu calculation of wrap-around and infinite loop by rounding issues
  Revert "Merge branch 'ipv6-overflow-arith'"
  net/mlx4: Copy/set only sizeof struct mlx4_eqe bytes
  net/mlx4_en: Explicitly set no vlan tags in WQE ctrl segment when no vlan is present
  vhost: fix performance on LE hosts
  bpf: sample: define aarch64 specific registers
  amd-xgbe: Fix race between access of desc and desc index
  RDS-TCP: Recover correctly from pskb_pull()/pksb_trim() failure in rds_tcp_data_recv
  forcedeth: fix unilateral interrupt disabling in netpoll path
  openvswitch: Fix skb leak using IPv6 defrag
  ipv6: Export nf_ct_frag6_consume_orig()
  openvswitch: Fix double-free on ip_defrag() errors
  fib_trie: leaf_walk_rcu should not compute key if key is less than pn->key
  net: mv643xx_eth: add missing of_node_put
  ath6kl: add missing of_node_put
  net: phy: mdio: add missing of_node_put
  netdev/phy: add missing of_node_put
  net: netcp: add missing of_node_put
  net: thunderx: add missing of_node_put
  ipv6: gre: support SIT encapsulation
  ...

8 years agohwmon: (ina2xx) remove no longer used variable 'kind'
Marc Titinger [Thu, 29 Oct 2015 09:07:17 +0000 (10:07 +0100)]
hwmon: (ina2xx) remove no longer used variable 'kind'

Signed-off-by: Marc Titinger <mtitinger@baylibre.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
8 years agox86/vm86: Set thread.vm86 to NULL on fork/clone
Andy Lutomirski [Sat, 31 Oct 2015 05:42:46 +0000 (22:42 -0700)]
x86/vm86: Set thread.vm86 to NULL on fork/clone

thread.vm86 points to per-task information -- the pointer should not
be copied on clone.

Fixes: d4ce0f26c790 ("x86/vm86: Move fields from 'struct kernel_vm86_struct' to 'struct vm86'")
Signed-off-by: Andy Lutomirski <luto@kernel.org>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Stas Sergeev <stsp@list.ru>
Link: http://lkml.kernel.org/r/71c5d6985d70ec8197c8d72f003823c81b7dcf99.1446270067.git.luto@kernel.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
8 years agoselftests/x86: Add a fork() to entry_from_vm86 to catch fork bugs
Andy Lutomirski [Sat, 31 Oct 2015 05:42:45 +0000 (22:42 -0700)]
selftests/x86: Add a fork() to entry_from_vm86 to catch fork bugs

Mere possession of vm86 state is strange.  Make sure that nothing
gets corrupted if we fork after calling vm86().

Signed-off-by: Andy Lutomirski <luto@kernel.org>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Stas Sergeev <stsp@list.ru>
Link: http://lkml.kernel.org/r/08f83295460a80e41dc5e3e81ec40d6844d316f5.1446270067.git.luto@kernel.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
8 years agoMerge branch 'for-linus' into next
Vinod Koul [Sat, 31 Oct 2015 02:08:05 +0000 (07:38 +0530)]
Merge branch 'for-linus' into next

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Conflicts:
drivers/dma/dw/core.c

8 years agoMerge branch 'topic/of' into for-linus
Vinod Koul [Sat, 31 Oct 2015 02:07:21 +0000 (07:37 +0530)]
Merge branch 'topic/of' into for-linus