linux
5 years agoMerge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Thu, 7 Feb 2019 22:45:27 +0000 (09:45 +1100)]
Merge remote-tracking branch 'ecryptfs/next'

5 years agoMerge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Thu, 7 Feb 2019 22:43:56 +0000 (09:43 +1100)]
Merge remote-tracking branch 'cifs/for-next'

5 years agoMerge remote-tracking branch 'btrfs-kdave/for-next'
Stephen Rothwell [Thu, 7 Feb 2019 22:42:25 +0000 (09:42 +1100)]
Merge remote-tracking branch 'btrfs-kdave/for-next'

5 years agoMerge remote-tracking branch 'befs/for-next'
Stephen Rothwell [Thu, 7 Feb 2019 22:40:35 +0000 (09:40 +1100)]
Merge remote-tracking branch 'befs/for-next'

5 years agoMerge remote-tracking branch 'fscrypt/master'
Stephen Rothwell [Thu, 7 Feb 2019 22:30:33 +0000 (09:30 +1100)]
Merge remote-tracking branch 'fscrypt/master'

5 years agoMerge remote-tracking branch 'xtensa/xtensa-for-next'
Stephen Rothwell [Thu, 7 Feb 2019 22:28:58 +0000 (09:28 +1100)]
Merge remote-tracking branch 'xtensa/xtensa-for-next'

5 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Thu, 7 Feb 2019 22:26:42 +0000 (09:26 +1100)]
Merge remote-tracking branch 's390/features'

5 years agoMerge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Thu, 7 Feb 2019 22:24:05 +0000 (09:24 +1100)]
Merge remote-tracking branch 'powerpc/next'

5 years agoMerge remote-tracking branch 'parisc-hd/for-next'
Stephen Rothwell [Thu, 7 Feb 2019 22:22:40 +0000 (09:22 +1100)]
Merge remote-tracking branch 'parisc-hd/for-next'

5 years agoMerge remote-tracking branch 'nios2/for-next'
Stephen Rothwell [Thu, 7 Feb 2019 22:21:14 +0000 (09:21 +1100)]
Merge remote-tracking branch 'nios2/for-next'

5 years agoMerge remote-tracking branch 'mips/mips-next'
Stephen Rothwell [Thu, 7 Feb 2019 22:19:49 +0000 (09:19 +1100)]
Merge remote-tracking branch 'mips/mips-next'

5 years agoMerge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Thu, 7 Feb 2019 22:09:45 +0000 (09:09 +1100)]
Merge remote-tracking branch 'microblaze/next'

5 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Thu, 7 Feb 2019 22:08:21 +0000 (09:08 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'

5 years agoMerge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Thu, 7 Feb 2019 22:06:57 +0000 (09:06 +1100)]
Merge remote-tracking branch 'm68k/for-next'

5 years agoMerge remote-tracking branch 'csky/linux-next'
Stephen Rothwell [Thu, 7 Feb 2019 22:05:32 +0000 (09:05 +1100)]
Merge remote-tracking branch 'csky/linux-next'

5 years agoMerge remote-tracking branch 'clk/clk-next'
Stephen Rothwell [Thu, 7 Feb 2019 22:02:29 +0000 (09:02 +1100)]
Merge remote-tracking branch 'clk/clk-next'

5 years agoMerge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Thu, 7 Feb 2019 22:00:09 +0000 (09:00 +1100)]
Merge remote-tracking branch 'tegra/for-next'

5 years agoMerge remote-tracking branch 'sunxi/sunxi/for-next'
Stephen Rothwell [Thu, 7 Feb 2019 21:57:54 +0000 (08:57 +1100)]
Merge remote-tracking branch 'sunxi/sunxi/for-next'

5 years agoMerge remote-tracking branch 'samsung-krzk/for-next'
Stephen Rothwell [Thu, 7 Feb 2019 21:56:29 +0000 (08:56 +1100)]
Merge remote-tracking branch 'samsung-krzk/for-next'

5 years agoMerge remote-tracking branch 'rockchip/for-next'
Stephen Rothwell [Thu, 7 Feb 2019 21:55:03 +0000 (08:55 +1100)]
Merge remote-tracking branch 'rockchip/for-next'

5 years agoMerge remote-tracking branch 'renesas/next'
Stephen Rothwell [Thu, 7 Feb 2019 21:53:38 +0000 (08:53 +1100)]
Merge remote-tracking branch 'renesas/next'

5 years agoMerge remote-tracking branch 'qcom/for-next'
Stephen Rothwell [Thu, 7 Feb 2019 21:51:35 +0000 (08:51 +1100)]
Merge remote-tracking branch 'qcom/for-next'

5 years agoMerge remote-tracking branch 'reset/reset/next'
Stephen Rothwell [Thu, 7 Feb 2019 21:49:32 +0000 (08:49 +1100)]
Merge remote-tracking branch 'reset/reset/next'

5 years agoMerge remote-tracking branch 'omap/for-next'
Stephen Rothwell [Thu, 7 Feb 2019 21:48:08 +0000 (08:48 +1100)]
Merge remote-tracking branch 'omap/for-next'

5 years agoMerge remote-tracking branch 'mvebu/for-next'
Stephen Rothwell [Thu, 7 Feb 2019 21:46:44 +0000 (08:46 +1100)]
Merge remote-tracking branch 'mvebu/for-next'

5 years agoMerge remote-tracking branch 'mediatek/for-next'
Stephen Rothwell [Thu, 7 Feb 2019 21:45:19 +0000 (08:45 +1100)]
Merge remote-tracking branch 'mediatek/for-next'

5 years agoMerge remote-tracking branch 'keystone/next'
Stephen Rothwell [Thu, 7 Feb 2019 21:43:55 +0000 (08:43 +1100)]
Merge remote-tracking branch 'keystone/next'

5 years agoMerge remote-tracking branch 'imx-mxs/for-next'
Stephen Rothwell [Thu, 7 Feb 2019 21:41:53 +0000 (08:41 +1100)]
Merge remote-tracking branch 'imx-mxs/for-next'

5 years agoMerge remote-tracking branch 'bcm2835/for-next'
Stephen Rothwell [Thu, 7 Feb 2019 21:39:51 +0000 (08:39 +1100)]
Merge remote-tracking branch 'bcm2835/for-next'

5 years agoMerge remote-tracking branch 'at91/at91-next'
Stephen Rothwell [Thu, 7 Feb 2019 21:38:27 +0000 (08:38 +1100)]
Merge remote-tracking branch 'at91/at91-next'

5 years agoMerge remote-tracking branch 'amlogic/for-next'
Stephen Rothwell [Thu, 7 Feb 2019 21:36:24 +0000 (08:36 +1100)]
Merge remote-tracking branch 'amlogic/for-next'

5 years agoMerge remote-tracking branch 'actions/for-next'
Stephen Rothwell [Thu, 7 Feb 2019 21:36:09 +0000 (08:36 +1100)]
Merge remote-tracking branch 'actions/for-next'

5 years agoMerge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Thu, 7 Feb 2019 21:34:04 +0000 (08:34 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'

5 years agoMerge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Thu, 7 Feb 2019 21:32:40 +0000 (08:32 +1100)]
Merge remote-tracking branch 'arm-perf/for-next/perf'

5 years agoMerge remote-tracking branch 'arm64/for-next/core'
Stephen Rothwell [Thu, 7 Feb 2019 21:21:39 +0000 (08:21 +1100)]
Merge remote-tracking branch 'arm64/for-next/core'

5 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Thu, 7 Feb 2019 21:19:44 +0000 (08:19 +1100)]
Merge remote-tracking branch 'arm/for-next'

5 years agoMerge remote-tracking branch 'dma-mapping/for-next'
Stephen Rothwell [Thu, 7 Feb 2019 21:12:22 +0000 (08:12 +1100)]
Merge remote-tracking branch 'dma-mapping/for-next'

5 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Thu, 7 Feb 2019 21:10:16 +0000 (08:10 +1100)]
Merge remote-tracking branch 'kbuild/for-next'

5 years agoMerge remote-tracking branch 'drm-misc-fixes/for-linux-next-fixes'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:54 +0000 (08:03 +1100)]
Merge remote-tracking branch 'drm-misc-fixes/for-linux-next-fixes'

5 years agoMerge remote-tracking branch 'mmc-fixes/fixes'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:53 +0000 (08:03 +1100)]
Merge remote-tracking branch 'mmc-fixes/fixes'

5 years agoMerge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:52 +0000 (08:03 +1100)]
Merge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes'

5 years agoMerge remote-tracking branch 'drm-fixes/drm-fixes'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:52 +0000 (08:03 +1100)]
Merge remote-tracking branch 'drm-fixes/drm-fixes'

5 years agoMerge remote-tracking branch 'scsi-fixes/fixes'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:51 +0000 (08:03 +1100)]
Merge remote-tracking branch 'scsi-fixes/fixes'

5 years agoMerge remote-tracking branch 'drivers-x86-fixes/fixes'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:49 +0000 (08:03 +1100)]
Merge remote-tracking branch 'drivers-x86-fixes/fixes'

5 years agoMerge remote-tracking branch 'vfs-fixes/fixes'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:48 +0000 (08:03 +1100)]
Merge remote-tracking branch 'vfs-fixes/fixes'

5 years agoMerge remote-tracking branch 'hwmon-fixes/hwmon'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:47 +0000 (08:03 +1100)]
Merge remote-tracking branch 'hwmon-fixes/hwmon'

5 years agoMerge remote-tracking branch 'kvm-fixes/master'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:45 +0000 (08:03 +1100)]
Merge remote-tracking branch 'kvm-fixes/master'

5 years agoMerge remote-tracking branch 'omap-fixes/fixes'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:45 +0000 (08:03 +1100)]
Merge remote-tracking branch 'omap-fixes/fixes'

5 years agoMerge remote-tracking branch 'mips-fixes/mips-fixes'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:44 +0000 (08:03 +1100)]
Merge remote-tracking branch 'mips-fixes/mips-fixes'

5 years agoMerge remote-tracking branch 'mtd-fixes/master'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:40 +0000 (08:03 +1100)]
Merge remote-tracking branch 'mtd-fixes/master'

5 years agoMerge remote-tracking branch 'slave-dma-fixes/fixes'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:38 +0000 (08:03 +1100)]
Merge remote-tracking branch 'slave-dma-fixes/fixes'

5 years agoMerge remote-tracking branch 'ide/master'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:35 +0000 (08:03 +1100)]
Merge remote-tracking branch 'ide/master'

5 years agoMerge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:34 +0000 (08:03 +1100)]
Merge remote-tracking branch 'input-current/for-linus'

5 years agoMerge remote-tracking branch 'char-misc.current/char-misc-linus'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:32 +0000 (08:03 +1100)]
Merge remote-tracking branch 'char-misc.current/char-misc-linus'

5 years agoMerge remote-tracking branch 'staging.current/staging-linus'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:32 +0000 (08:03 +1100)]
Merge remote-tracking branch 'staging.current/staging-linus'

5 years agoMerge remote-tracking branch 'usb-chipidea-fixes/ci-for-usb-stable'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:31 +0000 (08:03 +1100)]
Merge remote-tracking branch 'usb-chipidea-fixes/ci-for-usb-stable'

5 years agoMerge remote-tracking branch 'usb-serial-fixes/usb-linus'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:31 +0000 (08:03 +1100)]
Merge remote-tracking branch 'usb-serial-fixes/usb-linus'

5 years agoMerge remote-tracking branch 'usb.current/usb-linus'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:30 +0000 (08:03 +1100)]
Merge remote-tracking branch 'usb.current/usb-linus'

5 years agoMerge remote-tracking branch 'tty.current/tty-linus'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:30 +0000 (08:03 +1100)]
Merge remote-tracking branch 'tty.current/tty-linus'

5 years agoMerge remote-tracking branch 'driver-core.current/driver-core-linus'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:30 +0000 (08:03 +1100)]
Merge remote-tracking branch 'driver-core.current/driver-core-linus'

5 years agoMerge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:29 +0000 (08:03 +1100)]
Merge remote-tracking branch 'pci-current/for-linus'

5 years agoMerge remote-tracking branch 'spi-fixes/for-linus'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:28 +0000 (08:03 +1100)]
Merge remote-tracking branch 'spi-fixes/for-linus'

5 years agoMerge remote-tracking branch 'regulator-fixes/for-linus'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:28 +0000 (08:03 +1100)]
Merge remote-tracking branch 'regulator-fixes/for-linus'

5 years agoMerge remote-tracking branch 'sound-asoc-fixes/for-linus'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:27 +0000 (08:03 +1100)]
Merge remote-tracking branch 'sound-asoc-fixes/for-linus'

5 years agoMerge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:27 +0000 (08:03 +1100)]
Merge remote-tracking branch 'sound-current/for-linus'

5 years agoMerge remote-tracking branch 'rdma-fixes/for-rc'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:26 +0000 (08:03 +1100)]
Merge remote-tracking branch 'rdma-fixes/for-rc'

5 years agoMerge remote-tracking branch 'mac80211/master'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:26 +0000 (08:03 +1100)]
Merge remote-tracking branch 'mac80211/master'

5 years agoMerge remote-tracking branch 'wireless-drivers/master'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:26 +0000 (08:03 +1100)]
Merge remote-tracking branch 'wireless-drivers/master'

5 years agoMerge remote-tracking branch 'ipsec/master'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:25 +0000 (08:03 +1100)]
Merge remote-tracking branch 'ipsec/master'

5 years agoMerge remote-tracking branch 'net/master'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:24 +0000 (08:03 +1100)]
Merge remote-tracking branch 'net/master'

5 years agoMerge remote-tracking branch 'powerpc-fixes/fixes'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:21 +0000 (08:03 +1100)]
Merge remote-tracking branch 'powerpc-fixes/fixes'

5 years agoMerge remote-tracking branch 'arm-current/fixes'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:19 +0000 (08:03 +1100)]
Merge remote-tracking branch 'arm-current/fixes'

5 years agoMerge remote-tracking branch 'arc-current/for-curr'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:19 +0000 (08:03 +1100)]
Merge remote-tracking branch 'arc-current/for-curr'

5 years agoMerge remote-tracking branch 'kbuild-current/fixes'
Stephen Rothwell [Thu, 7 Feb 2019 21:03:19 +0000 (08:03 +1100)]
Merge remote-tracking branch 'kbuild-current/fixes'

5 years agoMerge remote-tracking branch 'fixes/master'
Stephen Rothwell [Thu, 7 Feb 2019 20:50:36 +0000 (07:50 +1100)]
Merge remote-tracking branch 'fixes/master'

5 years agoMerge branch 'xtensa-5.1' into xtensa-for-next
Max Filippov [Thu, 7 Feb 2019 20:43:22 +0000 (12:43 -0800)]
Merge branch 'xtensa-5.1' into xtensa-for-next

5 years agoxtensa: simplify trap_init
Max Filippov [Wed, 2 Jan 2019 10:19:30 +0000 (02:19 -0800)]
xtensa: simplify trap_init

Drop redundant 'fast &&' condition from the exception handler assignment
loop.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
5 years agoxtensa: drop unused definitions
Max Filippov [Wed, 2 Jan 2019 10:03:39 +0000 (02:03 -0800)]
xtensa: drop unused definitions

drop the following unused definitions:
- TS_USEDFPU from arch/xtensa/include/asm/thread_info.h
- current_set from arch/xtensa/kernel/process.c

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
5 years agoxtensa: fix get_wchan
Max Filippov [Wed, 2 Jan 2019 09:08:32 +0000 (01:08 -0800)]
xtensa: fix get_wchan

Stack unwinding is implemented incorrectly in xtensa get_wchan: instead
of extracting a0 and a1 registers from the spill location under the
stack pointer it extracts a word pointed to by the stack pointer and
subtracts 4 or 3 from it.

Cc: stable@vger.kernel.org
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
5 years agoxtensa: use generic spinlock/rwlock implementation
Max Filippov [Tue, 1 Jan 2019 22:08:32 +0000 (14:08 -0800)]
xtensa: use generic spinlock/rwlock implementation

Drop custom spinlock/rwlock code and use ones from asm-generic. This way
there is less code duplication (atomic primitives are reused).

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
5 years agoxtensa: provide xchg for sizes 1 and 2
Max Filippov [Wed, 2 Jan 2019 03:29:07 +0000 (19:29 -0800)]
xtensa: provide xchg for sizes 1 and 2

This is required for generic queued spinlocks, implement it.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
5 years agoxtensa: clean up arch/xtensa/kernel/time.c
Max Filippov [Thu, 24 Jan 2019 23:09:21 +0000 (15:09 -0800)]
xtensa: clean up arch/xtensa/kernel/time.c

- move all constant assignments from local_timer_setup to the definition
  of ccount_timer to make it mostly statically initialized;
- drop local function declarations, reorder functions and variables that
  reference them.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
5 years agoxtensa: SMP: rework IPI processing
Max Filippov [Sat, 19 Jan 2019 02:45:17 +0000 (18:45 -0800)]
xtensa: SMP: rework IPI processing

Don't skip current CPU in send_ipi_message: callers of this function
take care of it and it's harmless anyway.
Don't clear IPI bits one by one, clear all that were read at once.
Check IPI register in a loop in case new IPI was posted while previous
was being handled.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
5 years agomips: cm: reprime error cause
Vladimir Kondratiev [Wed, 6 Feb 2019 11:46:17 +0000 (13:46 +0200)]
mips: cm: reprime error cause

Accordingly to the documentation
---cut---
The GCR_ERROR_CAUSE.ERR_TYPE field and the GCR_ERROR_MULT.ERR_TYPE
fields can be cleared by either a reset or by writing the current
value of GCR_ERROR_CAUSE.ERR_TYPE to the
GCR_ERROR_CAUSE.ERR_TYPE register.
---cut---
Do exactly this. Original value of cm_error may be safely written back;
it clears error cause and keeps other bits untouched.

Fixes: 3885c2b463f6 ("MIPS: CM: Add support for reporting CM cache errors")
Signed-off-by: Vladimir Kondratiev <vladimir.kondratiev@linux.intel.com>
Signed-off-by: Paul Burton <paul.burton@mips.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-mips@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: stable@vger.kernel.org # v4.3+
5 years agomips: loongson64: remove unreachable(), fix loongson_poweroff().
Yifeng Li [Wed, 6 Feb 2019 07:07:21 +0000 (15:07 +0800)]
mips: loongson64: remove unreachable(), fix loongson_poweroff().

On my Yeeloong 8089, I noticed the machine fails to shutdown
properly, and often, the function mach_prepare_reboot() is
unexpectedly executed, thus the machine reboots instead. A
wait loop is needed to ensure the system is in a well-defined
state before going down.

In commit 997e93d4df16 ("MIPS: Hang more efficiently on
halt/powerdown/restart"), a general superset of the wait loop for all
platforms is already provided, so we don't need to implement our own.

This commit simply removes the unreachable() compiler marco after
mach_prepare_reboot(), thus allowing the execution of machine_hang().
My test shows that the machine is now able to shutdown successfully.

Please note that there are two different bugs preventing the machine
from shutting down, another work-in-progress commit is needed to
fix a lockup in cpufreq / i8259 driver, please read Reference, this
commit does not fix that bug.

Reference: https://lkml.org/lkml/2019/2/5/908
Signed-off-by: Yifeng Li <tomli@tomli.me>
Signed-off-by: Paul Burton <paul.burton@mips.com>
Cc: linux-mips@vger.kernel.org
Cc: Huacai Chen <chenhc@lemote.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-kernel@vger.kernel.org
Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: stable@vger.kernel.org # v4.17+
5 years agoALSA: usb-audio: Fix implicit fb endpoint setup by quirk
Manuel Reinhardt [Thu, 31 Jan 2019 14:32:35 +0000 (15:32 +0100)]
ALSA: usb-audio: Fix implicit fb endpoint setup by quirk

The commit a60945fd08e4 ("ALSA: usb-audio: move implicit fb quirks to
separate function") introduced an error in the handling of quirks for
implicit feedback endpoints. This commit fixes this.

If a quirk successfully sets up an implicit feedback endpoint, usb-audio
no longer tries to find the implicit fb endpoint itself.

Fixes: a60945fd08e4 ("ALSA: usb-audio: move implicit fb quirks to separate function")
Signed-off-by: Manuel Reinhardt <manuel.rhdt@gmail.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
5 years agoMerge branch 'ipv6-fixes'
David S. Miller [Thu, 7 Feb 2019 18:48:42 +0000 (10:48 -0800)]
Merge branch 'ipv6-fixes'

Hangbin Liu says:

====================
fix two kernel panics when disabled IPv6 on boot up

When disabled IPv6 on boot up, since there is no ipv6 route tables, we should
not call rt6_lookup. Fix them by checking if we have inet6_dev pointer on
netdevice.

v2: Fix idev reference leak, declarations and code mixing as Stefano,
    Eric pointed. Since we only want to check if idev exists and not
    reference it, use __in6_dev_get() insteand of in6_dev_get().
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
5 years agosit: check if IPv6 enabled before calling ip6_err_gen_icmpv6_unreach()
Hangbin Liu [Thu, 7 Feb 2019 10:36:11 +0000 (18:36 +0800)]
sit: check if IPv6 enabled before calling ip6_err_gen_icmpv6_unreach()

If we disabled IPv6 from the kernel command line (ipv6.disable=1), we should
not call ip6_err_gen_icmpv6_unreach(). This:

  ip link add sit1 type sit local 192.0.2.1 remote 192.0.2.2 ttl 1
  ip link set sit1 up
  ip addr add 198.51.100.1/24 dev sit1
  ping 198.51.100.2

if IPv6 is disabled at boot time, will crash the kernel.

v2: there's no need to use in6_dev_get(), use __in6_dev_get() instead,
    as we only need to check that idev exists and we are under
    rcu_read_lock() (from netif_receive_skb_internal()).

Reported-by: Jianlin Shi <jishi@redhat.com>
Fixes: ca15a078bd90 ("sit: generate icmpv6 error when receiving icmpv4 error")
Cc: Oussama Ghorbel <ghorbel@pivasoftware.com>
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
5 years agogeneve: should not call rt6_lookup() when ipv6 was disabled
Hangbin Liu [Thu, 7 Feb 2019 10:36:10 +0000 (18:36 +0800)]
geneve: should not call rt6_lookup() when ipv6 was disabled

When we add a new GENEVE device with IPv6 remote, checking only for
IS_ENABLED(CONFIG_IPV6) is not enough as we may disable IPv6 in the
kernel command line (ipv6.disable=1), and calling rt6_lookup() would
cause a NULL pointer dereference.

v2:
- don't mix declarations and code (reported by Stefano Brivio, Eric Dumazet)
- there's no need to use in6_dev_get() as we only need to check that
  idev exists (reported by David Ahern). This is under RTNL, so we can
  simply use __in6_dev_get() instead (Stefano, Eric).

Reported-by: Jianlin Shi <jishi@redhat.com>
Fixes: c40e89fd358e9 ("geneve: configure MTU based on a lower device")
Cc: Alexey Kodanev <alexey.kodanev@oracle.com>
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
5 years agoMerge branch for-5.1/arm64/defconfig into for-next
Thierry Reding [Thu, 7 Feb 2019 18:04:48 +0000 (19:04 +0100)]
Merge branch for-5.1/arm64/defconfig into for-next

5 years agoMerge branch for-5.1/arm64/dt into for-next
Thierry Reding [Thu, 7 Feb 2019 18:04:48 +0000 (19:04 +0100)]
Merge branch for-5.1/arm64/dt into for-next

5 years agoMerge branch for-5.1/arm/dt into for-next
Thierry Reding [Thu, 7 Feb 2019 18:04:48 +0000 (19:04 +0100)]
Merge branch for-5.1/arm/dt into for-next

5 years agoMerge branch for-5.1/arm/core into for-next
Thierry Reding [Thu, 7 Feb 2019 18:04:47 +0000 (19:04 +0100)]
Merge branch for-5.1/arm/core into for-next

5 years agoMerge branch for-5.1/firmware into for-next
Thierry Reding [Thu, 7 Feb 2019 18:04:47 +0000 (19:04 +0100)]
Merge branch for-5.1/firmware into for-next

5 years agoMerge branch for-5.1/soc into for-next
Thierry Reding [Thu, 7 Feb 2019 18:04:47 +0000 (19:04 +0100)]
Merge branch for-5.1/soc into for-next

5 years agoMerge branch for-5.1/dt-bindings into for-next
Thierry Reding [Thu, 7 Feb 2019 18:04:46 +0000 (19:04 +0100)]
Merge branch for-5.1/dt-bindings into for-next

5 years agoMerge branch for-5.1/cpufreq into for-next
Thierry Reding [Thu, 7 Feb 2019 18:04:46 +0000 (19:04 +0100)]
Merge branch for-5.1/cpufreq into for-next

5 years agoMerge branch for-5.1/clk into for-next
Thierry Reding [Thu, 7 Feb 2019 18:04:45 +0000 (19:04 +0100)]
Merge branch for-5.1/clk into for-next

5 years agoarm64: tegra: Update compatible for Tegra186 I2C
Sowjanya Komatineni [Tue, 18 Dec 2018 22:40:56 +0000 (14:40 -0800)]
arm64: tegra: Update compatible for Tegra186 I2C

Update I2C Device node compatible string to be appropriate.

Signed-off-by: Sowjanya Komatineni <skomatineni@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
5 years agoarm64: tegra: Update compatible for Tegra210 I2C
Sowjanya Komatineni [Tue, 18 Dec 2018 22:37:04 +0000 (14:37 -0800)]
arm64: tegra: Update compatible for Tegra210 I2C

Update I2C device node compatible string to be appropriate.

Signed-off-by: Sowjanya Komatineni <skomatineni@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>