]> git.kernelconcepts.de Git - karo-tx-linux.git/log
karo-tx-linux.git
8 years agoMerge remote-tracking branch 'dwmw2-iommu/master'
Stephen Rothwell [Mon, 2 Nov 2015 01:16:41 +0000 (12:16 +1100)]
Merge remote-tracking branch 'dwmw2-iommu/master'

8 years agoMerge remote-tracking branch 'iommu/next'
Stephen Rothwell [Mon, 2 Nov 2015 01:14:46 +0000 (12:14 +1100)]
Merge remote-tracking branch 'iommu/next'

8 years agoMerge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Mon, 2 Nov 2015 01:13:04 +0000 (12:13 +1100)]
Merge remote-tracking branch 'watchdog/master'

8 years agoMerge remote-tracking branch 'security/next'
Stephen Rothwell [Mon, 2 Nov 2015 01:04:44 +0000 (12:04 +1100)]
Merge remote-tracking branch 'security/next'

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

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

8 years agonext-20150925/battery
Stephen Rothwell [Mon, 2 Nov 2015 00:59:52 +0000 (11:59 +1100)]
next-20150925/battery

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

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

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

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

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

8 years agoMerge remote-tracking branch 'device-mapper/for-next'
Stephen Rothwell [Mon, 2 Nov 2015 00:49:13 +0000 (11:49 +1100)]
Merge remote-tracking branch 'device-mapper/for-next'

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

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

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

8 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Mon, 2 Nov 2015 00:40:15 +0000 (11:40 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'

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

8 years agoMerge remote-tracking branch 'drm-misc/topic/drm-misc'
Stephen Rothwell [Mon, 2 Nov 2015 00:32:29 +0000 (11:32 +1100)]
Merge remote-tracking branch 'drm-misc/topic/drm-misc'

8 years agoMerge remote-tracking branch 'drm-tegra/drm/tegra/for-next'
Stephen Rothwell [Mon, 2 Nov 2015 00:31:17 +0000 (11:31 +1100)]
Merge remote-tracking branch 'drm-tegra/drm/tegra/for-next'

8 years agoMerge remote-tracking branch 'drm-intel/for-linux-next'
Stephen Rothwell [Mon, 2 Nov 2015 00:30:06 +0000 (11:30 +1100)]
Merge remote-tracking branch 'drm-intel/for-linux-next'

8 years agoMerge remote-tracking branch 'drm-panel/drm/panel/for-next'
Stephen Rothwell [Mon, 2 Nov 2015 00:28:55 +0000 (11:28 +1100)]
Merge remote-tracking branch 'drm-panel/drm/panel/for-next'

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

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

8 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Mon, 2 Nov 2015 00:17:53 +0000 (11:17 +1100)]
Merge remote-tracking branch 'l2-mtd/master'

8 years agoMerge remote-tracking branch 'rdma/for-next'
Stephen Rothwell [Mon, 2 Nov 2015 00:16:30 +0000 (11:16 +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 [Mon, 2 Nov 2015 00:15:17 +0000 (11:15 +1100)]
Merge remote-tracking branch 'bluetooth/master'

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

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