The following patches have been reverted from v4.4.78 prior to the merge to avoid unnecessary conflicts.
    0f4fa2138e83 tpm: Issue a TPM2_Shutdown for TPM2 devices.
    5ec5771bcb2b tpm: Provide strong locking for device removal
    5e07de5b5a4e tpm: Get rid of chip->pdev

Conflicts:
    net/ipv4/tcp.c
    net/ipv6/ip6_offload.c
    fs/exec.c
    mm/mmap.c
    drivers/usb/dwc3/gadget.c

 

The following patches have been reverted from v4.4.79 prior to the merge to avoid unnecessary conflicts.
    0f4fa2138e83 tpm: Issue a TPM2_Shutdown for TPM2 devices.
    5ec5771bcb2b tpm: Provide strong locking for device removal
    5e07de5b5a4e tpm: Get rid of chip->pdev

Conflicts:
    net/ipv4/tcp.c
    net/ipv6/ip6_offload.c
    net/bluetooth/smp.c
    fs/exec.c
    mm/mmap.c
    drivers/usb/dwc3/gadget.c

 

The following patches have been reverted from v4.4.79 prior to the merge to avoid unnecessary conflicts.
    0f4fa2138e83 tpm: Issue a TPM2_Shutdown for TPM2 devices.
    5ec5771bcb2b tpm: Provide strong locking for device removal
    5e07de5b5a4e tpm: Get rid of chip->pdev

Conflicts:
    net/ipv4/tcp.c
    net/ipv6/ip6_offload.c
    net/ipv6/output_core.c
    net/bluetooth/smp.c
    fs/exec.c
    mm/mmap.c
    drivers/usb/dwc3/gadget.c