]> git.kernelconcepts.de Git - karo-tx-linux.git/log
karo-tx-linux.git
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: hisilicon: Remove .owner assignment from platform_driver
huangdaode [Fri, 30 Oct 2015 02:50:54 +0000 (10:50 +0800)]
net: hisilicon: Remove .owner assignment from platform_driver

platform_driver doesn't need to set .owner, because
platform_driver_register() will set it.

Signed-off-by: huangdaode <huangdaode@hisilicon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
8 years agonet: dsa: use switchdev obj for VLAN add/del ops
Vivien Didelot [Sun, 1 Nov 2015 17:33:55 +0000 (12:33 -0500)]
net: dsa: use switchdev obj for VLAN add/del ops

Simplify DSA by pushing the switchdev objects for VLAN add and delete
operations down to its drivers. Currently only mv88e6xxx is affected.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
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 agortc: rtc-s3c: Set year, month, day value for setting alarm
Krzysztof Kozlowski [Sun, 1 Nov 2015 11:49:04 +0000 (20:49 +0900)]
rtc: rtc-s3c: Set year, month, day value for setting alarm

This patch sets year, month, day value for set_alarm function.
The current driver omits to set the values.

This fixes setting wake alarm for dates different than current day.
Without the patch the alarm scheduled for tomorrow would fire today on
chosen time.

Signed-off-by: Donggeun Kim <dg77.kim@samsung.com>
Signed-off-by: MyungJoo Ham <myungjoo.kim@samsung.com>
Signed-off-by: KyungMin Park <kyungmin.park@samsung.com>
[k.kozlowski: Rebase and test the patch, update commit message]
Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
8 years agoVSOCK: define VSOCK_SS_LISTEN once only
Stefan Hajnoczi [Thu, 29 Oct 2015 11:57:42 +0000 (11:57 +0000)]
VSOCK: define VSOCK_SS_LISTEN once only

The SS_LISTEN socket state is defined by both af_vsock.c and
vmci_transport.c.  This is risky since the value could be changed in one
file and the other would be out of sync.

Rename from SS_LISTEN to VSOCK_SS_LISTEN since the constant is not part
of enum socket_state (SS_CONNECTED, ...).  This way it is clear that the
constant is vsock-specific.

The big text reflow in af_vsock.c was necessary to keep to the maximum
line length.  Text is unchanged except for s/SS_LISTEN/VSOCK_SS_LISTEN/.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
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 agoMerge branch 'csum_partial_frags'
David S. Miller [Sun, 1 Nov 2015 17:01:37 +0000 (12:01 -0500)]
Merge branch 'csum_partial_frags'

Hannes Frederic Sowa says:

====================
net: clean up interactions of CHECKSUM_PARTIAL and fragmentation

This series fixes wrong checksums on the wire for IPv4 and IPv6. Large
send buffers and especially NFS lead to wrong checksums in both IPv4
and IPv6.

CHECKSUM_PARTIAL skbs should not receive the respective fragmentations
functions, so we add WARN_ON_ONCE to those functions to fix up those as
soon as they get reported.

Changelog:
v2: added v4 checks
v3: removed WARN_ON_ONCES (advice by Tom Herbert)
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
8 years agoipv6: add defensive check for CHECKSUM_PARTIAL skbs in ip_fragment
Hannes Frederic Sowa [Tue, 27 Oct 2015 21:40:42 +0000 (22:40 +0100)]
ipv6: add defensive check for CHECKSUM_PARTIAL skbs in ip_fragment

CHECKSUM_PARTIAL skbs should never arrive in ip_fragment. If we get one
of those warn about them once and handle them gracefully by recalculating
the checksum.

Fixes: commit 32dce968dd987 ("ipv6: Allow for partial checksums on non-ufo packets")
See-also: commit 72e843bb09d45 ("ipv6: ip6_fragment() should check CHECKSUM_PARTIAL")
Cc: Eric Dumazet <edumazet@google.com>
Cc: Vlad Yasevich <vyasevich@gmail.com>
Cc: Benjamin Coddington <bcodding@redhat.com>
Cc: Tom Herbert <tom@herbertland.com>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
8 years agoipv6: no CHECKSUM_PARTIAL on MSG_MORE corked sockets
Hannes Frederic Sowa [Tue, 27 Oct 2015 21:40:41 +0000 (22:40 +0100)]
ipv6: no CHECKSUM_PARTIAL on MSG_MORE corked sockets

We cannot reliable calculate packet size on MSG_MORE corked sockets
and thus cannot decide if they are going to be fragmented later on,
so better not use CHECKSUM_PARTIAL in the first place.

The IPv6 code also intended to protect and not use CHECKSUM_PARTIAL in
the existence of IPv6 extension headers, but the condition was wrong. Fix
it up, too. Also the condition to check whether the packet fits into
one fragment was wrong and has been corrected.

Fixes: commit 32dce968dd987 ("ipv6: Allow for partial checksums on non-ufo packets")
See-also: commit 72e843bb09d45 ("ipv6: ip6_fragment() should check CHECKSUM_PARTIAL")
Cc: Eric Dumazet <edumazet@google.com>
Cc: Vlad Yasevich <vyasevich@gmail.com>
Cc: Benjamin Coddington <bcodding@redhat.com>
Cc: Tom Herbert <tom@herbertland.com>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
8 years agoipv4: add defensive check for CHECKSUM_PARTIAL skbs in ip_fragment
Hannes Frederic Sowa [Tue, 27 Oct 2015 21:40:40 +0000 (22:40 +0100)]
ipv4: add defensive check for CHECKSUM_PARTIAL skbs in ip_fragment

CHECKSUM_PARTIAL skbs should never arrive in ip_fragment. If we get one
of those warn about them once and handle them gracefully by recalculating
the checksum.

Cc: Eric Dumazet <edumazet@google.com>
Cc: Vlad Yasevich <vyasevich@gmail.com>
Cc: Benjamin Coddington <bcodding@redhat.com>
Cc: Tom Herbert <tom@herbertland.com>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
8 years agoipv4: no CHECKSUM_PARTIAL on MSG_MORE corked sockets
Hannes Frederic Sowa [Tue, 27 Oct 2015 21:40:39 +0000 (22:40 +0100)]
ipv4: no CHECKSUM_PARTIAL on MSG_MORE corked sockets

We cannot reliable calculate packet size on MSG_MORE corked sockets
and thus cannot decide if they are going to be fragmented later on,
so better not use CHECKSUM_PARTIAL in the first place.

Cc: Eric Dumazet <edumazet@google.com>
Cc: Vlad Yasevich <vyasevich@gmail.com>
Cc: Benjamin Coddington <bcodding@redhat.com>
Cc: Tom Herbert <tom@herbertland.com>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
8 years agoMerge branches 'x86/amd', 'x86/vt-d', 'arm/omap', 'arm/smmu', 'arm/renesas', 's390...
Joerg Roedel [Sun, 1 Nov 2015 15:12:31 +0000 (00:12 +0900)]
Merge branches 'x86/amd', 'x86/vt-d', 'arm/omap', 'arm/smmu', 'arm/renesas', 's390', 'core' and 'iommu/fixes' into next

Conflicts:
drivers/iommu/amd_iommu_types.h

8 years agoRevert "iommu/ipmmu-vmsa: Drop LPAE Kconfig dependency"
Joerg Roedel [Sun, 1 Nov 2015 15:07:12 +0000 (00:07 +0900)]
Revert "iommu/ipmmu-vmsa: Drop LPAE Kconfig dependency"

This reverts commit bad78b13e3057b4bbfe769e21c213dca7c4d51de.

Stephen Rothwell reported this build error on linux-next with
x86_64 allmodconfig:

drivers/iommu/ipmmu-vmsa.c:24:27: fatal error: asm/dma-iommu.h: No such file or directory

Reverting this patch for now.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
8 years agoBluetooth: Fix issue with HCI_QUIRK_FIXUP_INQUIRY_MODE and event mask
Marcel Holtmann [Sun, 1 Nov 2015 08:45:22 +0000 (09:45 +0100)]
Bluetooth: Fix issue with HCI_QUIRK_FIXUP_INQUIRY_MODE and event mask

When setting the event mask, the HCI_QUIRK_FIXUP_INQUIRY_MODE quirk is
required to be checked so that the Inquiry Result with RSSI event gets
actually enabled.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
8 years agoBluetooth: Build LE event mask based on supported commands
Marcel Holtmann [Sun, 1 Nov 2015 08:39:51 +0000 (09:39 +0100)]
Bluetooth: Build LE event mask based on supported commands

The LE event mask should be created based on the commands that are
actually supported by the controller.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
8 years agoBluetooth: Move BR/EDR default events behind its features
Marcel Holtmann [Sun, 1 Nov 2015 08:39:49 +0000 (09:39 +0100)]
Bluetooth: Move BR/EDR default events behind its features

There are some BR/EDR default events for Bluetooth 1.2 or later
controllers that are not conditional on their features being present.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
8 years agoBluetooth: Check for supported white list before issuing commands
Marcel Holtmann [Sun, 1 Nov 2015 08:39:48 +0000 (09:39 +0100)]
Bluetooth: Check for supported white list before issuing commands

The white list commands might not be implemented if the controller does
not actually support the white list. So check the supported commands
first before issuing these commands. Not supporting the white list is
the same as supporting a white list with zero size.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
8 years agoMerge branch 'x86/urgent'
Ingo Molnar [Sun, 1 Nov 2015 10:24:14 +0000 (11:24 +0100)]
Merge branch 'x86/urgent'

8 years agoMerge branch 'x86/platform'
Ingo Molnar [Sun, 1 Nov 2015 10:24:14 +0000 (11:24 +0100)]
Merge branch 'x86/platform'

8 years agoMerge branch 'x86/mm'
Ingo Molnar [Sun, 1 Nov 2015 10:24:13 +0000 (11:24 +0100)]
Merge branch 'x86/mm'

8 years agoMerge branch 'x86/headers'
Ingo Molnar [Sun, 1 Nov 2015 10:24:12 +0000 (11:24 +0100)]
Merge branch 'x86/headers'

8 years agomanual merge of x86/fpu
Ingo Molnar [Sun, 1 Nov 2015 10:24:12 +0000 (11:24 +0100)]
manual merge of x86/fpu

Signed-off-by: Ingo Molnar <mingo@kernel.org>
8 years agoMerge branch 'x86/debug'
Ingo Molnar [Sun, 1 Nov 2015 10:24:10 +0000 (11:24 +0100)]
Merge branch 'x86/debug'

8 years agoMerge branch 'x86/cpufeature'
Ingo Molnar [Sun, 1 Nov 2015 10:24:10 +0000 (11:24 +0100)]
Merge branch 'x86/cpufeature'

8 years agoMerge branch 'x86/cpu'
Ingo Molnar [Sun, 1 Nov 2015 10:24:09 +0000 (11:24 +0100)]
Merge branch 'x86/cpu'

8 years agoMerge branch 'x86/cleanups'
Ingo Molnar [Sun, 1 Nov 2015 10:24:09 +0000 (11:24 +0100)]
Merge branch 'x86/cleanups'

8 years agoMerge branch 'x86/boot'
Ingo Molnar [Sun, 1 Nov 2015 10:24:08 +0000 (11:24 +0100)]
Merge branch 'x86/boot'

8 years agoMerge branch 'x86/asm'
Ingo Molnar [Sun, 1 Nov 2015 10:24:08 +0000 (11:24 +0100)]
Merge branch 'x86/asm'

8 years agoMerge branch 'x86/apic'
Ingo Molnar [Sun, 1 Nov 2015 10:24:07 +0000 (11:24 +0100)]
Merge branch 'x86/apic'

8 years agoMerge branch 'timers/urgent'
Ingo Molnar [Sun, 1 Nov 2015 10:24:07 +0000 (11:24 +0100)]
Merge branch 'timers/urgent'

8 years agomanual merge of timers/core
Ingo Molnar [Sun, 1 Nov 2015 10:24:06 +0000 (11:24 +0100)]
manual merge of timers/core

Signed-off-by: Ingo Molnar <mingo@kernel.org>
8 years agoMerge branch 'sched/core'
Ingo Molnar [Sun, 1 Nov 2015 10:24:05 +0000 (11:24 +0100)]
Merge branch 'sched/core'