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

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

Merge 4.4.90 into android-4.4 



Changes in 4.4.90
	cifs: release auth_key.response for reconnect.
	mac80211: flush hw_roc_start work before cancelling the ROC
	KVM: PPC: Book3S: Fix race and leak in kvm_vm_ioctl_create_spapr_tce()
	tracing: Fix trace_pipe behavior for instance traces
	tracing: Erase irqsoff trace with empty write
	md/raid5: fix a race condition in stripe batch
	md/raid5: preserve STRIPE_ON_UNPLUG_LIST in break_stripe_batch_list
	scsi: scsi_transport_iscsi: fix the issue that iscsi_if_rx doesn't parse nlmsg properly
	crypto: talitos - Don't provide setkey for non hmac hashing algs.
	crypto: talitos - fix sha224
	KEYS: fix writing past end of user-supplied buffer in keyring_read()
	KEYS: prevent creating a different user's keyrings
	KEYS: prevent KEYCTL_READ on negative key
	powerpc/pseries: Fix parent_dn reference leak in add_dt_node()
	Fix SMB3.1.1 guest authentication to Samba
	SMB: Validate negotiate (to protect against downgrade) even if signing off
	SMB3: Don't ignore O_SYNC/O_DSYNC and O_DIRECT flags
	vfs: Return -ENXIO for negative SEEK_HOLE / SEEK_DATA offsets
	nl80211: check for the required netlink attributes presence
	bsg-lib: don't free job in bsg_prepare_job
	seccomp: fix the usage of get/put_seccomp_filter() in seccomp_get_filter()
	arm64: Make sure SPsel is always set
	arm64: fault: Route pte translation faults via do_translation_fault
	KVM: VMX: Do not BUG() on out-of-bounds guest IRQ
	kvm: nVMX: Don't allow L2 to access the hardware CR8
	PCI: Fix race condition with driver_override
	btrfs: fix NULL pointer dereference from free_reloc_roots()
	btrfs: propagate error to btrfs_cmp_data_prepare caller
	btrfs: prevent to set invalid default subvolid
	x86/fpu: Don't let userspace set bogus xcomp_bv
	gfs2: Fix debugfs glocks dump
	timer/sysclt: Restrict timer migration sysctl values to 0 and 1
	KVM: VMX: do not change SN bit in vmx_update_pi_irte()
	KVM: VMX: remove WARN_ON_ONCE in kvm_vcpu_trigger_posted_interrupt
	cxl: Fix driver use count
	dmaengine: mmp-pdma: add number of requestors
	ARM: pxa: add the number of DMA requestor lines
	ARM: pxa: fix the number of DMA requestor lines
	KVM: VMX: use cmpxchg64
	video: fbdev: aty: do not leak uninitialized padding in clk to userspace
	swiotlb-xen: implement xen_swiotlb_dma_mmap callback
	fix xen_swiotlb_dma_mmap prototype
	Linux 4.4.90

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 3cc62103 37c2d0d3

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 89

SUBLEVEL = 90

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm/boot/dts/pxa27x.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
			interrupts = <25>;

			#dma-channels = <32>;

			#dma-cells = <2>;

			#dma-requests = <75>;

			status = "okay";

		};

arch/arm/boot/dts/pxa3xx.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
			interrupts = <25>;

			#dma-channels = <32>;

			#dma-cells = <2>;

			#dma-requests = <100>;

			status = "okay";

		};

arch/arm/mach-pxa/devices.c

+3 −1
Original line number Diff line number Diff line
@@ -1203,6 +1203,7 @@ void __init pxa2xx_set_spi_info(unsigned id, struct pxa2xx_spi_master *info) 


static struct mmp_dma_platdata pxa_dma_pdata = {

	.dma_channels	= 0,

	.nb_requestors	= 0,

};



static struct resource pxa_dma_resource[] = {
@@ -1231,8 +1232,9 @@ static struct platform_device pxa2xx_pxa_dma = { 
	.resource	= pxa_dma_resource,

};



void __init pxa2xx_set_dmac_info(int nb_channels)

void __init pxa2xx_set_dmac_info(int nb_channels, int nb_requestors)

{

	pxa_dma_pdata.dma_channels = nb_channels;

	pxa_dma_pdata.nb_requestors = nb_requestors;

	pxa_register_device(&pxa2xx_pxa_dma, &pxa_dma_pdata);

}

arch/arm/mach-pxa/pxa25x.c

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ static int __init pxa25x_init(void) 
		register_syscore_ops(&pxa_irq_syscore_ops);

		register_syscore_ops(&pxa2xx_mfp_syscore_ops);



		pxa2xx_set_dmac_info(16);

		pxa2xx_set_dmac_info(16, 40);

		pxa_register_device(&pxa25x_device_gpio, &pxa25x_gpio_info);

		ret = platform_add_devices(pxa25x_devices,

					   ARRAY_SIZE(pxa25x_devices));