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

Unverified Commit 8d3ebe52 authored by derfelot's avatar derfelot
Browse files

Merge Linux 4.4.253 kernel 

Changes in 4.4.253: (30 commits)
        ASoC: dapm: remove widget from dirty list on free
        mm/hugetlb: fix potential missing huge page size info
        ext4: fix bug for rename with RENAME_WHITEOUT
        ARC: build: add boot_targets to PHONY
        ethernet: ucc_geth: fix definition and size of ucc_geth_tx_global_pram
        arch/arc: add copy_user_page() to <asm/page.h> to fix build error on ARC
        misdn: dsp: select CONFIG_BITREVERSE
        net: ethernet: fs_enet: Add missing MODULE_LICENSE
        ACPI: scan: add stub acpi_create_platform_device() for !CONFIG_ACPI
        ARM: picoxcell: fix missing interrupt-parent properties
        Input: uinput - avoid FF flush when destroying device
        dump_common_audit_data(): fix racy accesses to ->d_name
        NFS: nfs_igrab_and_active must first reference the superblock
        ext4: fix superblock checksum failure when setting password salt
        RDMA/usnic: Fix memleak in find_free_vf_and_create_qp_grp
        mm, slub: consider rest of partial list if acquire_slab() fails
        net: sunrpc: interpret the return value of kstrtou32 correctly
        usb: ohci: Make distrust_firmware param default to false
        iio: buffer: Fix demux update
        nfsd4: readdirplus shouldn't return parent of export
        net: cdc_ncm: correct overhead in delayed_ndp_size
        netxen_nic: fix MSI/MSI-x interrupts
        rndis_host: set proper input size for OID_GEN_PHYSICAL_MEDIUM request
        net: dcb: Validate netlink message in DCB handler
        net: dcb: Accept RTM_GETDCB messages carrying set-like DCB commands
        net: sit: unregister_netdevice on newlink's error path
        rxrpc: Fix handling of an unsupported token type in rxrpc_read()
        net: avoid 32 x truesize under-estimation for tiny skbs
        spi: cadence: cache reference clock rate during probe
        Linux 4.4.253
parents 4dc77391 4f907dff

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 252

SUBLEVEL = 253

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ bootpImage: vmlinux 


boot_targets += uImage uImage.bin uImage.gz



PHONY += $(boot_targets)

$(boot_targets): vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@

arch/arc/include/asm/page.h

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#define free_user_page(page, addr)	free_page(addr)



#define clear_page(paddr)		memset((paddr), 0, PAGE_SIZE)

#define copy_user_page(to, from, vaddr, pg)	copy_page(to, from)

#define copy_page(to, from)		memcpy((to), (from), PAGE_SIZE)



struct vm_area_struct;

arch/arm/boot/dts/picoxcell-pc3x2.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -54,18 +54,21 @@ 
		emac: gem@30000 {

			compatible = "cadence,gem";

			reg = <0x30000 0x10000>;

			interrupt-parent = <&vic0>;

			interrupts = <31>;

		};



		dmac1: dmac@40000 {

			compatible = "snps,dw-dmac";

			reg = <0x40000 0x10000>;

			interrupt-parent = <&vic0>;

			interrupts = <25>;

		};



		dmac2: dmac@50000 {

			compatible = "snps,dw-dmac";

			reg = <0x50000 0x10000>;

			interrupt-parent = <&vic0>;

			interrupts = <26>;

		};
@@ -243,6 +246,7 @@ 
		axi2pico@c0000000 {

			compatible = "picochip,axi2pico-pc3x2";

			reg = <0xc0000000 0x10000>;

			interrupt-parent = <&vic0>;

			interrupts = <13 14 15 16 17 18 19 20 21>;

		};

	};

drivers/iio/industrialio-buffer.c

+3 −3
Original line number Diff line number Diff line
@@ -1281,9 +1281,6 @@ static int iio_buffer_update_demux(struct iio_dev *indio_dev, 
				       indio_dev->masklength,

				       in_ind + 1);

		while (in_ind != out_ind) {

			in_ind = find_next_bit(indio_dev->active_scan_mask,

					       indio_dev->masklength,

					       in_ind + 1);

			ch = iio_find_channel_from_si(indio_dev, in_ind);

			if (ch->scan_type.repeat > 1)

				length = ch->scan_type.storagebits / 8 *
@@ -1292,6 +1289,9 @@ static int iio_buffer_update_demux(struct iio_dev *indio_dev, 
				length = ch->scan_type.storagebits / 8;

			/* Make sure we are aligned */

			in_loc = roundup(in_loc, length) + length;

			in_ind = find_next_bit(indio_dev->active_scan_mask,

					       indio_dev->masklength,

					       in_ind + 1);

		}

		ch = iio_find_channel_from_si(indio_dev, in_ind);

		if (ch->scan_type.repeat > 1)