Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7d377b4 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.9.108 into android-4.9 



Changes in 4.9.108
	tpm: do not suspend/resume if power stays on
	tpm: self test failure should not cause suspend to fail
	mmap: introduce sane default mmap limits
	mmap: relax file size limit for regular files
	btrfs: define SUPER_FLAG_METADUMP_V2
	kconfig: Avoid format overflow warning from GCC 8.1
	drm: set FMODE_UNSIGNED_OFFSET for drm files
	bnx2x: use the right constant
	dccp: don't free ccid2_hc_tx_sock struct in dccp_disconnect()
	enic: set DMA mask to 47 bit
	ip6mr: only set ip6mr_table from setsockopt when ip6mr_new_table succeeds
	ipv4: remove warning in ip_recv_error
	isdn: eicon: fix a missing-check bug
	kcm: Fix use-after-free caused by clonned sockets
	netdev-FAQ: clarify DaveM's position for stable backports
	net/packet: refine check for priv area size
	net: usb: cdc_mbim: add flag FLAG_SEND_ZLP
	packet: fix reserve calculation
	qed: Fix mask for physical address in ILT entry
	sctp: not allow transport timeout value less than HZ/5 for hb_timer
	team: use netdev_features_t instead of u32
	vhost: synchronize IOTLB message with dev cleanup
	vrf: check the original netdevice for generating redirect
	net/mlx4: Fix irq-unsafe spinlock usage
	rtnetlink: validate attributes in do_setlink()
	net: phy: broadcom: Fix bcm_write_exp()
	net: metrics: add proper netlink validation
	KVM: VMX: Expose SSBD properly to guests, 4.9 supplement
	dm bufio: avoid false-positive Wmaybe-uninitialized warning
	objtool: Fix gcov check for older versions of GCC
	complete e390f9a port for v4.9.106
	Linux 4.9.108

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents db2c520b 4f42dc62

Documentation/networking/netdev-FAQ.txt

+9 −0
Original line number Diff line number Diff line
@@ -168,6 +168,15 @@ A: No. See above answer. In short, if you think it really belongs in 
   dash marker line as described in Documentation/SubmittingPatches to

   temporarily embed that information into the patch that you send.



Q: Are all networking bug fixes backported to all stable releases?



A: Due to capacity, Dave could only take care of the backports for the last

   2 stable releases. For earlier stable releases, each stable branch maintainer

   is supposed to take care of them. If you find any patch is missing from an

   earlier stable branch, please notify stable@vger.kernel.org with either a

   commit ID or a formal patch backported, and CC Dave and other relevant

   networking developers.



Q: Someone said that the comment style and coding convention is different

   for the networking content.  Is this true?

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 107

SUBLEVEL = 108

EXTRAVERSION =

NAME = Roaring Lionus

arch/x86/kernel/vmlinux.lds.S

+0 −2
Original line number Diff line number Diff line
@@ -352,8 +352,6 @@ SECTIONS 
	DISCARDS

	/DISCARD/ : {

		*(.eh_frame)

		*(__func_stack_frame_non_standard)

		*(__unreachable)

	}

}

arch/x86/kvm/cpuid.h

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static inline bool guest_cpuid_has_spec_ctrl(struct kvm_vcpu *vcpu) 
	if (best && (best->ebx & bit(X86_FEATURE_AMD_IBRS)))

		return true;

	best = kvm_find_cpuid_entry(vcpu, 7, 0);

	return best && (best->edx & (bit(X86_FEATURE_SPEC_CTRL) | bit(X86_FEATURE_SSBD)));

	return best && (best->edx & (bit(X86_FEATURE_SPEC_CTRL) | bit(X86_FEATURE_SPEC_CTRL_SSBD)));

}



static inline bool guest_cpuid_has_arch_capabilities(struct kvm_vcpu *vcpu)

drivers/char/tpm/tpm-chip.c

+13 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/spinlock.h>

#include <linux/freezer.h>

#include <linux/major.h>

#include <linux/of.h>

#include "tpm.h"

#include "tpm_eventlog.h"
@@ -388,8 +389,20 @@ static int tpm_add_legacy_sysfs(struct tpm_chip *chip) 
 */

int tpm_chip_register(struct tpm_chip *chip)

{

#ifdef CONFIG_OF

	struct device_node *np;

#endif

	int rc;



#ifdef CONFIG_OF

	np = of_find_node_by_name(NULL, "vtpm");

	if (np) {

		if (of_property_read_bool(np, "powered-while-suspended"))

			chip->flags |= TPM_CHIP_FLAG_ALWAYS_POWERED;

	}

	of_node_put(np);

#endif



	if (chip->ops->flags & TPM_OPS_AUTO_STARTUP) {

		if (chip->flags & TPM_CHIP_FLAG_TPM2)

			rc = tpm2_auto_startup(chip);