Merge pull request #10 from derfelot/lineage-17.1_update (394bcdc8) · Commits · e / devices / android_kernel_sony_msm8998

Documentation/filesystems/affs.txt

+10 −6

Original line number	Original line	Diff line number	Diff line
	@@ -93,13 +93,15 @@ The Amiga protection flags RWEDRWEDHSPARWED are handled as follows:

	- R maps to r for user, group and others. On directories, R implies x.		- R maps to r for user, group and others. On directories, R implies x.

	- If both W and D are allowed, w will be set.		- W maps to w.

	- E maps to x.		- E maps to x.

	- H and P are always retained and ignored under Linux.		- D is ignored.

	- A is always reset when a file is written to.		- H, S and P are always retained and ignored under Linux.

			- A is cleared when a file is written to.

	User id and group id will be used unless set[gu]id are given as mount		User id and group id will be used unless set[gu]id are given as mount
	options. Since most of the Amiga file systems are single user systems		options. Since most of the Amiga file systems are single user systems
	@@ -111,11 +113,13 @@ Linux -> Amiga:

	The Linux rwxrwxrwx file mode is handled as follows:		The Linux rwxrwxrwx file mode is handled as follows:

	- r permission will set R for user, group and others.		- r permission will allow R for user, group and others.

			- w permission will allow W for user, group and others.

	- w permission will set W and D for user, group and others.		- x permission of the user will allow E for plain files.

	- x permission of the user will set E for plain files.		- D will be allowed for user, group and others.

	- All other flags (suid, sgid, ...) are ignored and will		- All other flags (suid, sgid, ...) are ignored and will
	not be retained.		not be retained.

Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	VERSION = 4		VERSION = 4
	PATCHLEVEL = 4		PATCHLEVEL = 4
	SUBLEVEL = 235		SUBLEVEL = 237
	EXTRAVERSION =		EXTRAVERSION =
	NAME = Blurry Fish Butt		NAME = Blurry Fish Butt

arch/arm/boot/dts/qcom/msm-audio.dtsi

+23 −7

arch/arm/boot/dts/socfpga_arria10.dtsi

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -652,7 +652,7 @@
	timer3: timer3@ffd00100 {		timer3: timer3@ffd00100 {
	compatible = "snps,dw-apb-timer";		compatible = "snps,dw-apb-timer";
	interrupts = <0 118 IRQ_TYPE_LEVEL_HIGH>;		interrupts = <0 118 IRQ_TYPE_LEVEL_HIGH>;
	reg = <0xffd01000 0x100>;		reg = <0xffd00100 0x100>;
	clocks = <&l4_sys_free_clk>;		clocks = <&l4_sys_free_clk>;
	clock-names = "timer";		clock-names = "timer";
	};		};

arch/mips/Kconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -870,6 +870,7 @@ config SNI_RM
	select I8253		select I8253
	select I8259		select I8259
	select ISA		select ISA
			select MIPS_L1_CACHE_SHIFT_6
	select SWAP_IO_SPACE if CPU_BIG_ENDIAN		select SWAP_IO_SPACE if CPU_BIG_ENDIAN
	select SYS_HAS_CPU_R4X00		select SYS_HAS_CPU_R4X00
	select SYS_HAS_CPU_R5000		select SYS_HAS_CPU_R5000

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* Copyright (c) 2015-2017, 2019 The Linux Foundation. All rights reserved.		* Copyright (c) 2015-2017, 2020 The Linux Foundation. All rights reserved.
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License version 2 and		* it under the terms of the GNU General Public License version 2 and
	@@ -357,6 +357,16 @@
	qcom,msm-dai-q6-dev-id = <32770>;		qcom,msm-dai-q6-dev-id = <32770>;
	};		};

			proxy_rx: qcom,msm-dai-q6-proxy-rx {
			compatible = "qcom,msm-dai-q6-dev";
			qcom,msm-dai-q6-dev-id = <8194>;
			};

			proxy_tx: qcom,msm-dai-q6-proxy-tx {
			compatible = "qcom,msm-dai-q6-dev";
			qcom,msm-dai-q6-dev-id = <8195>;
			};

	usb_audio_rx: qcom,msm-dai-q6-usb-audio-rx {		usb_audio_rx: qcom,msm-dai-q6-usb-audio-rx {
	compatible = "qcom,msm-dai-q6-dev";		compatible = "qcom,msm-dai-q6-dev";
	qcom,msm-dai-q6-dev-id = <28672>;		qcom,msm-dai-q6-dev-id = <28672>;
	@@ -679,7 +689,8 @@
	<&dai_pri_tdm_rx_0>, <&dai_pri_tdm_tx_0>,		<&dai_pri_tdm_rx_0>, <&dai_pri_tdm_tx_0>,
	<&dai_sec_tdm_rx_0>, <&dai_sec_tdm_tx_0>,		<&dai_sec_tdm_rx_0>, <&dai_sec_tdm_tx_0>,
	<&dai_tert_tdm_rx_0>, <&dai_tert_tdm_tx_0>,		<&dai_tert_tdm_rx_0>, <&dai_tert_tdm_tx_0>,
	<&dai_quat_tdm_rx_0>, <&dai_quat_tdm_tx_0>;		<&dai_quat_tdm_rx_0>, <&dai_quat_tdm_tx_0>,
			<&proxy_rx>, <&proxy_tx>;
	asoc-cpu-names = "msm-dai-q6-dp.24608", "msm-dai-q6-mi2s.0",		asoc-cpu-names = "msm-dai-q6-dp.24608", "msm-dai-q6-mi2s.0",
	"msm-dai-q6-mi2s.1",		"msm-dai-q6-mi2s.1",
	"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",		"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
	@@ -702,7 +713,8 @@
	"msm-dai-q6-tdm.36865", "msm-dai-q6-tdm.36880",		"msm-dai-q6-tdm.36865", "msm-dai-q6-tdm.36880",
	"msm-dai-q6-tdm.36881", "msm-dai-q6-tdm.36896",		"msm-dai-q6-tdm.36881", "msm-dai-q6-tdm.36896",
	"msm-dai-q6-tdm.36897", "msm-dai-q6-tdm.36912",		"msm-dai-q6-tdm.36897", "msm-dai-q6-tdm.36912",
	"msm-dai-q6-tdm.36913";		"msm-dai-q6-tdm.36913",
			"msm-dai-q6-dev.8194", "msm-dai-q6-dev.8195";
	asoc-codec = <&stub_codec>, <&ext_disp_audio_codec>;		asoc-codec = <&stub_codec>, <&ext_disp_audio_codec>;
	asoc-codec-names = "msm-stub-codec.1",		asoc-codec-names = "msm-stub-codec.1",
	"msm-ext-disp-audio-codec-rx";		"msm-ext-disp-audio-codec-rx";