Merge branch 'upstream-3.13' into tuxonice-3.13

Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>

Conflicts:
	drivers/gpu/drm/drm_gem.c
Merge branch 'upstream-3.13' into tuxonice-3.13
Merge tag 'v3.13.6' into 3.13/master

This is the 3.13.6 stable release

Conflicts:
	Makefile
Bluetooth: allocate static minor for vhci

Commit bfacbb9 (Bluetooth: Use devname:vhci module alias for virtual HCI
driver) added the module alias to hci_vhci module so it's possible to
create the /dev/vhci node. However creating an alias without
specifying the minor doesn't allow us to create the node ahead,
triggerring module auto-load when it's first accessed.

Starting with depmod from kmod 16 we started to warn if there's a
devname alias without specifying the major and minor.

Let's do the same done for uhid, kvm, fuse and others, specifying a
fixed minor. In systems with systemd as the init the following will
happen: on early boot systemd will call "kmod static-nodes" to read
/lib/modules/$(uname -r)/modules.devname and then create the nodes. When
first accessed these "dead" nodes will trigger the module loading.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Merge branch '3.13/misc' into 3.13/master
Fix VM_BUG_ON in swap allocation.

The VM_BUG_ON was being triggered because our invocation of
inc_cluster_info_page for each page in a range of pages being allocated
was including the first page. The first page has already had
inc_cluster_info_page via scan_swap_map.

Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
Zen 3.13.x merged
TOI 3.13 merged