Update KERNEL_VERSION to 4.1.42

5 files changed, 11 insertions, 30 deletions

diff --git a/KERNEL_VERSION b/KERNEL_VERSION
index f8c734ef446b6c..4b4d80f46d051c 100644
--- a/KERNEL_VERSION
+++ b/KERNEL_VERSION
@@ -1 +1 @@
-4.1.33
+4.1.42
diff --git a/patches.altera/0003-add-FPGA-manager-core.patch b/patches.altera/0003-add-FPGA-manager-core.patch
index de36673b7b13e8..bb4491d2e0764a 100644
--- a/patches.altera/0003-add-FPGA-manager-core.patch
+++ b/patches.altera/0003-add-FPGA-manager-core.patch
@@ -35,20 +35,18 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 (cherry picked from commit 6a8c3be7ec8eb3c1197766f9245e0d65a4e5aff8)
 Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
 ---
- drivers/Kconfig               |   2 +
- drivers/Makefile              |   1 +
- drivers/fpga/Kconfig          |  14 ++
- drivers/fpga/Makefile         |   8 +
- drivers/fpga/fpga-mgr.c       | 382 ++++++++++++++++++++++++++++++++++++++++++
- include/linux/fpga/fpga-mgr.h | 127 ++++++++++++++
+ drivers/Kconfig               |    2 
+ drivers/Makefile              |    1 
+ drivers/fpga/Kconfig          |   14 +
+ drivers/fpga/Makefile         |    8 
+ drivers/fpga/fpga-mgr.c       |  382 ++++++++++++++++++++++++++++++++++++++++++
+ include/linux/fpga/fpga-mgr.h |  127 +++++++++++++
  6 files changed, 534 insertions(+)
  create mode 100644 drivers/fpga/Kconfig
  create mode 100644 drivers/fpga/Makefile
  create mode 100644 drivers/fpga/fpga-mgr.c
  create mode 100644 include/linux/fpga/fpga-mgr.h
 
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index c0cc96bab9e7..9df7978b5b40 100644
 --- a/drivers/Kconfig
 +++ b/drivers/Kconfig
 @@ -182,4 +182,6 @@ source "drivers/thunderbolt/Kconfig"
@@ -58,18 +56,13 @@ index c0cc96bab9e7..9df7978b5b40 100644
 +source "drivers/fpga/Kconfig"
 +
  endmenu
-diff --git a/drivers/Makefile b/drivers/Makefile
-index 46d2554be404..3cf37ee08ad8 100644
 --- a/drivers/Makefile
 +++ b/drivers/Makefile
-@@ -165,3 +165,4 @@ obj-$(CONFIG_RAS)		+= ras/
+@@ -166,3 +166,4 @@ obj-$(CONFIG_RAS)		+= ras/
  obj-$(CONFIG_THUNDERBOLT)	+= thunderbolt/
  obj-$(CONFIG_CORESIGHT)		+= hwtracing/coresight/
  obj-$(CONFIG_ANDROID)		+= android/
 +obj-$(CONFIG_FPGA)		+= fpga/
-diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig
-new file mode 100644
-index 000000000000..f1f1f6df54d3
 --- /dev/null
 +++ b/drivers/fpga/Kconfig
 @@ -0,0 +1,14 @@
@@ -87,9 +80,6 @@ index 000000000000..f1f1f6df54d3
 +	  manager drivers.
 +
 +endmenu
-diff --git a/drivers/fpga/Makefile b/drivers/fpga/Makefile
-new file mode 100644
-index 000000000000..3313c5266795
 --- /dev/null
 +++ b/drivers/fpga/Makefile
 @@ -0,0 +1,8 @@
@@ -101,9 +91,6 @@ index 000000000000..3313c5266795
 +obj-$(CONFIG_FPGA)			+= fpga-mgr.o
 +
 +# FPGA Manager Drivers
-diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c
-new file mode 100644
-index 000000000000..25261636687c
 --- /dev/null
 +++ b/drivers/fpga/fpga-mgr.c
 @@ -0,0 +1,382 @@
@@ -489,9 +476,6 @@ index 000000000000..25261636687c
 +
 +subsys_initcall(fpga_mgr_class_init);
 +module_exit(fpga_mgr_class_exit);
-diff --git a/include/linux/fpga/fpga-mgr.h b/include/linux/fpga/fpga-mgr.h
-new file mode 100644
-index 000000000000..0940bf45e2f2
 --- /dev/null
 +++ b/include/linux/fpga/fpga-mgr.h
 @@ -0,0 +1,127 @@
@@ -622,6 +606,3 @@ index 000000000000..0940bf45e2f2
 +void fpga_mgr_unregister(struct device *dev);
 +
 +#endif /*_LINUX_FPGA_MGR_H */
--- 
-2.6.2
-
diff --git a/patches.ltsi/ltsi-makefile-addition.patch b/patches.ltsi/ltsi-makefile-addition.patch
index c8974794c23130..7ece1962475aeb 100644
--- a/patches.ltsi/ltsi-makefile-addition.patch
+++ b/patches.ltsi/ltsi-makefile-addition.patch
@@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 @@ -1,7 +1,7 @@
  VERSION = 4
  PATCHLEVEL = 1
- SUBLEVEL = 33
+ SUBLEVEL = 42
 -EXTRAVERSION =
 +EXTRAVERSION = -ltsi
  NAME = Series 4800
diff --git a/patches.renesas/0068-pinctrl-make-pinctrl_register-return-proper-error-co.patch b/patches.renesas/0068-pinctrl-make-pinctrl_register-return-proper-error-co.patch
index c797aa813fde87..23be313fcb2b1a 100644
--- a/patches.renesas/0068-pinctrl-make-pinctrl_register-return-proper-error-co.patch
+++ b/patches.renesas/0068-pinctrl-make-pinctrl_register-return-proper-error-co.patch
@@ -576,7 +576,7 @@ Conflicts:
  
 --- a/drivers/pinctrl/qcom/pinctrl-msm.c
 +++ b/drivers/pinctrl/qcom/pinctrl-msm.c
-@@ -906,9 +906,9 @@ int msm_pinctrl_probe(struct platform_de
+@@ -902,9 +902,9 @@ int msm_pinctrl_probe(struct platform_de
  	msm_pinctrl_desc.pins = pctrl->soc->pins;
  	msm_pinctrl_desc.npins = pctrl->soc->npins;
  	pctrl->pctrl = pinctrl_register(&msm_pinctrl_desc, &pdev->dev, pctrl);
diff --git a/patches.renesas/0275-ASoC-core-add-snd_soc_of_parse_audio_prefix.patch b/patches.renesas/0275-ASoC-core-add-snd_soc_of_parse_audio_prefix.patch
index 701c8eeb496a02..4788d63fc7caaf 100644
--- a/patches.renesas/0275-ASoC-core-add-snd_soc_of_parse_audio_prefix.patch
+++ b/patches.renesas/0275-ASoC-core-add-snd_soc_of_parse_audio_prefix.patch
@@ -32,7 +32,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  unsigned int snd_soc_of_parse_daifmt(struct device_node *np,
 --- a/sound/soc/soc-core.c
 +++ b/sound/soc/soc-core.c
-@@ -3315,6 +3315,26 @@ int snd_soc_of_parse_tdm_slot(struct dev
+@@ -3316,6 +3316,26 @@ int snd_soc_of_parse_tdm_slot(struct dev
  }
  EXPORT_SYMBOL_GPL(snd_soc_of_parse_tdm_slot);