[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-459-gcdb5c30
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-459-gcdb5c30
|
From: jorasse <jo...@us...> - 2014-10-28 14:52:13
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via cdb5c302f4a670a7e430467adb4d59a61ce4e82a (commit)
via 6113fcace02ffdb5678bfbcd522a6536b1ea40db (commit)
from 4e45eab750693e2945aff0b22c99ca3481cb3236 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit cdb5c302f4a670a7e430467adb4d59a61ce4e82a
Author: Eric Jarrige <eri...@ar...>
Date: Tue Oct 28 15:51:31 2014 +0100
[LINUX] 3.18: move to 3.18-rc2
commit 6113fcace02ffdb5678bfbcd522a6536b1ea40db
Author: Philippe Reynes <tr...@gm...>
Date: Sat Oct 25 23:02:01 2014 +0200
[LINUX] 3.18: add initial support of 3.18-rc1
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf27/apf27-linux-3.18-rc2.config | 1 +
...7-linux-3.17.config => apf27-linux-3.18.config} | 17 +--------
.../armadeus/apf28/apf28-linux-3.18-rc2.config | 1 +
...8-linux-3.14.config => apf28-linux-3.18.config} | 0
.../armadeus/apf51/apf51-linux-3.18-rc2.config | 1 +
...1-linux-3.16.config => apf51-linux-3.18.config} | 0
...d_board_to_linux_build_system.patch.dont_apply} | 0
...s-net-phy-fix_smsc_reset.patch.applied-3.17-rc2 | 0
...usbmisc_imx-add_imx51_support.patch.dont_build} | 0
...platfrom-get_max_timeout_count-hook.patch.tofix | 0
...-incorrect-max_discard_to-for-uSDHC.patch.tofix | 0
...sdhci-add-platform-set_timeout-hook.patch.tofix | 0
...correct-max-timeout-value-for-uSDHC.patch.tofix | 0
...SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch.tofix | 0
...-remove-PWD-in-ccflags-y.patch.applied-3.17-rc3 | 0
...ig-space-as-platform-resource.patch.dont_apply} | 0
...6-fix-occasional-link-failure.patch.dont_apply} | 0
...-fix-NULL-pointer-dereference-if-ptp_cloc.patch | 38 ++++++++++++++++++++
18 files changed, 43 insertions(+), 15 deletions(-)
create mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.18-rc2.config
copy buildroot/target/device/armadeus/apf27/{apf27-linux-3.17.config => apf27-linux-3.18.config} (94%)
create mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.18-rc2.config
copy buildroot/target/device/armadeus/apf28/{apf28-linux-3.14.config => apf28-linux-3.18.config} (100%)
create mode 120000 buildroot/target/device/armadeus/apf51/apf51-linux-3.18-rc2.config
copy buildroot/target/device/armadeus/apf51/{apf51-linux-3.16.config => apf51-linux-3.18.config} (100%)
copy patches/linux/{3.10/0024-armadeus-apf9328-add_board_to_linux_build_system.patch => 3.18/0024-armadeus-apf9328-add_board_to_linux_build_system.patch.dont_apply} (100%)
copy patches/linux/{3.17 => 3.18}/0232-armadeus-net-phy-fix_smsc_reset.patch.applied-3.17-rc2 (100%)
copy patches/linux/{3.12/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch => 3.18/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch.dont_build} (100%)
copy patches/linux/{3.16 => 3.18}/0498-v2-1-5-mmc-sdhci-add-platfrom-get_max_timeout_count-hook.patch.tofix (100%)
copy patches/linux/{3.16 => 3.18}/0499-v2-2-5-mmc-sdhci-esdhc-imx-fix-incorrect-max_discard_to-for-uSDHC.patch.tofix (100%)
copy patches/linux/{3.16 => 3.18}/0500-v2-3-5-mmc-sdhci-add-platform-set_timeout-hook.patch.tofix (100%)
copy patches/linux/{3.16 => 3.18}/0501-v2-4-5-mmc-sdhci-esdhc-imx-set-the-correct-max-timeout-value-for-uSDHC.patch.tofix (100%)
copy patches/linux/{3.16 => 3.18}/0502-v2-5-5-mmc-sdhci-calculate-max_discard_to-dynamically-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch.tofix (100%)
copy patches/linux/{3.17 => 3.18}/0506-usb-gadget-remove-PWD-in-ccflags-y.patch.applied-3.17-rc3 (100%)
copy patches/linux/{3.17/0507-ARM-imx6-add-pci-config-space-as-platform-resource.patch => 3.18/0507-ARM-imx6-add-pci-config-space-as-platform-resource.patch.dont_apply} (100%)
copy patches/linux/{3.17/0508-PCI-imx6-fix-occasional-link-failure.patch => 3.18/0508-PCI-imx6-fix-occasional-link-failure.patch.dont_apply} (100%)
create mode 100644 patches/linux/3.18/0510-net-fec-ptp-fix-NULL-pointer-dereference-if-ptp_cloc.patch
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.18-rc2.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.18-rc2.config
new file mode 120000
index 0000000..305faef
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.18-rc2.config
@@ -0,0 +1 @@
+apf27-linux-3.18.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.17.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.18.config
similarity index 94%
copy from buildroot/target/device/armadeus/apf27/apf27-linux-3.17.config
copy to buildroot/target/device/armadeus/apf27/apf27-linux-3.18.config
index e05962f..feb448f 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.17.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.18.config
@@ -1,4 +1,3 @@
-CONFIG_EXPERIMENTAL=y
# CONFIG_SWAP is not set
CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y
@@ -18,14 +17,11 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_IOSCHED_CFQ is not set
# CONFIG_ARCH_MULTI_V7 is not set
CONFIG_ARCH_MXC=y
-CONFIG_MXC_IRQ_PRIOR=y
CONFIG_MACH_IMX27_DT=y
CONFIG_PREEMPT=y
CONFIG_AEABI=y
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_FPE_NWFPE=y
-CONFIG_FPE_NWFPE_XP=y
CONFIG_PM_DEBUG=y
CONFIG_NET=y
CONFIG_PACKET=y
@@ -41,8 +37,6 @@ CONFIG_IP_PNP_DHCP=y
# CONFIG_INET_DIAG is not set
CONFIG_IPV6=y
CONFIG_CAN=m
-CONFIG_CAN_RAW=m
-CONFIG_CAN_BCM=m
CONFIG_CAN_VCAN=m
CONFIG_CAN_MCP251X=m
CONFIG_BT=m
@@ -61,7 +55,6 @@ CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
CONFIG_MTD=y
CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_CHAR=y
CONFIG_MTD_BLOCK=y
CONFIG_MTD_CFI=y
CONFIG_MTD_CFI_ADV_OPTIONS=y
@@ -73,8 +66,6 @@ CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_MXC=y
CONFIG_MTD_UBI=y
-CONFIG_PROC_DEVICETREE=y
-CONFIG_SRAM=y
CONFIG_EEPROM_AT24=y
CONFIG_EEPROM_AT25=y
CONFIG_SCSI=y
@@ -82,11 +73,9 @@ CONFIG_BLK_DEV_SD=y
CONFIG_BLK_DEV_SR=y
CONFIG_CHR_DEV_SG=y
CONFIG_CHR_DEV_SCH=y
-CONFIG_SCSI_MULTI_LUN=y
CONFIG_SCSI_LOGGING=y
CONFIG_SCSI_SCAN_ASYNC=y
CONFIG_NETDEVICES=y
-CONFIG_MII=y
# CONFIG_NET_VENDOR_BROADCOM is not set
# CONFIG_NET_VENDOR_CIRRUS is not set
# CONFIG_NET_VENDOR_FARADAY is not set
@@ -153,10 +142,7 @@ CONFIG_SOC_CAMERA_MT9M111=m
# CONFIG_DVB_TUNER_DIB0090 is not set
CONFIG_FB=y
CONFIG_FB_IMX=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=y
CONFIG_LCD_L4F00242T03=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_LOGO=y
CONFIG_SOUND=m
@@ -211,7 +197,8 @@ CONFIG_DMADEVICES=y
CONFIG_IMX_SDMA=y
CONFIG_IMX_DMA=y
# CONFIG_IOMMU_SUPPORT is not set
-CONFIG_IIO=m
+CONFIG_IIO=y
+CONFIG_MAX1027=y
CONFIG_PWM=y
CONFIG_PWM_IMX=y
CONFIG_ARMADEUS_DRIVERS=y
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.18-rc2.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.18-rc2.config
new file mode 120000
index 0000000..f82b65f
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.18-rc2.config
@@ -0,0 +1 @@
+apf28-linux-3.18.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.18.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf28/apf28-linux-3.14.config
copy to buildroot/target/device/armadeus/apf28/apf28-linux-3.18.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.18-rc2.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.18-rc2.config
new file mode 120000
index 0000000..4a20752
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-3.18-rc2.config
@@ -0,0 +1 @@
+apf51-linux-3.18.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.16.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.18.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf51/apf51-linux-3.16.config
copy to buildroot/target/device/armadeus/apf51/apf51-linux-3.18.config
diff --git a/patches/linux/3.10/0024-armadeus-apf9328-add_board_to_linux_build_system.patch b/patches/linux/3.18/0024-armadeus-apf9328-add_board_to_linux_build_system.patch.dont_apply
similarity index 100%
copy from patches/linux/3.10/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
copy to patches/linux/3.18/0024-armadeus-apf9328-add_board_to_linux_build_system.patch.dont_apply
diff --git a/patches/linux/3.17/0232-armadeus-net-phy-fix_smsc_reset.patch.applied-3.17-rc2 b/patches/linux/3.18/0232-armadeus-net-phy-fix_smsc_reset.patch.applied-3.17-rc2
similarity index 100%
copy from patches/linux/3.17/0232-armadeus-net-phy-fix_smsc_reset.patch.applied-3.17-rc2
copy to patches/linux/3.18/0232-armadeus-net-phy-fix_smsc_reset.patch.applied-3.17-rc2
diff --git a/patches/linux/3.12/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch b/patches/linux/3.18/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch.dont_build
similarity index 100%
copy from patches/linux/3.12/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch
copy to patches/linux/3.18/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch.dont_build
diff --git a/patches/linux/3.16/0498-v2-1-5-mmc-sdhci-add-platfrom-get_max_timeout_count-hook.patch.tofix b/patches/linux/3.18/0498-v2-1-5-mmc-sdhci-add-platfrom-get_max_timeout_count-hook.patch.tofix
similarity index 100%
copy from patches/linux/3.16/0498-v2-1-5-mmc-sdhci-add-platfrom-get_max_timeout_count-hook.patch.tofix
copy to patches/linux/3.18/0498-v2-1-5-mmc-sdhci-add-platfrom-get_max_timeout_count-hook.patch.tofix
diff --git a/patches/linux/3.16/0499-v2-2-5-mmc-sdhci-esdhc-imx-fix-incorrect-max_discard_to-for-uSDHC.patch.tofix b/patches/linux/3.18/0499-v2-2-5-mmc-sdhci-esdhc-imx-fix-incorrect-max_discard_to-for-uSDHC.patch.tofix
similarity index 100%
copy from patches/linux/3.16/0499-v2-2-5-mmc-sdhci-esdhc-imx-fix-incorrect-max_discard_to-for-uSDHC.patch.tofix
copy to patches/linux/3.18/0499-v2-2-5-mmc-sdhci-esdhc-imx-fix-incorrect-max_discard_to-for-uSDHC.patch.tofix
diff --git a/patches/linux/3.16/0500-v2-3-5-mmc-sdhci-add-platform-set_timeout-hook.patch.tofix b/patches/linux/3.18/0500-v2-3-5-mmc-sdhci-add-platform-set_timeout-hook.patch.tofix
similarity index 100%
copy from patches/linux/3.16/0500-v2-3-5-mmc-sdhci-add-platform-set_timeout-hook.patch.tofix
copy to patches/linux/3.18/0500-v2-3-5-mmc-sdhci-add-platform-set_timeout-hook.patch.tofix
diff --git a/patches/linux/3.16/0501-v2-4-5-mmc-sdhci-esdhc-imx-set-the-correct-max-timeout-value-for-uSDHC.patch.tofix b/patches/linux/3.18/0501-v2-4-5-mmc-sdhci-esdhc-imx-set-the-correct-max-timeout-value-for-uSDHC.patch.tofix
similarity index 100%
copy from patches/linux/3.16/0501-v2-4-5-mmc-sdhci-esdhc-imx-set-the-correct-max-timeout-value-for-uSDHC.patch.tofix
copy to patches/linux/3.18/0501-v2-4-5-mmc-sdhci-esdhc-imx-set-the-correct-max-timeout-value-for-uSDHC.patch.tofix
diff --git a/patches/linux/3.16/0502-v2-5-5-mmc-sdhci-calculate-max_discard_to-dynamically-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch.tofix b/patches/linux/3.18/0502-v2-5-5-mmc-sdhci-calculate-max_discard_to-dynamically-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch.tofix
similarity index 100%
copy from patches/linux/3.16/0502-v2-5-5-mmc-sdhci-calculate-max_discard_to-dynamically-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch.tofix
copy to patches/linux/3.18/0502-v2-5-5-mmc-sdhci-calculate-max_discard_to-dynamically-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch.tofix
diff --git a/patches/linux/3.17/0506-usb-gadget-remove-PWD-in-ccflags-y.patch.applied-3.17-rc3 b/patches/linux/3.18/0506-usb-gadget-remove-PWD-in-ccflags-y.patch.applied-3.17-rc3
similarity index 100%
copy from patches/linux/3.17/0506-usb-gadget-remove-PWD-in-ccflags-y.patch.applied-3.17-rc3
copy to patches/linux/3.18/0506-usb-gadget-remove-PWD-in-ccflags-y.patch.applied-3.17-rc3
diff --git a/patches/linux/3.17/0507-ARM-imx6-add-pci-config-space-as-platform-resource.patch b/patches/linux/3.18/0507-ARM-imx6-add-pci-config-space-as-platform-resource.patch.dont_apply
similarity index 100%
copy from patches/linux/3.17/0507-ARM-imx6-add-pci-config-space-as-platform-resource.patch
copy to patches/linux/3.18/0507-ARM-imx6-add-pci-config-space-as-platform-resource.patch.dont_apply
diff --git a/patches/linux/3.17/0508-PCI-imx6-fix-occasional-link-failure.patch b/patches/linux/3.18/0508-PCI-imx6-fix-occasional-link-failure.patch.dont_apply
similarity index 100%
copy from patches/linux/3.17/0508-PCI-imx6-fix-occasional-link-failure.patch
copy to patches/linux/3.18/0508-PCI-imx6-fix-occasional-link-failure.patch.dont_apply
diff --git a/patches/linux/3.18/0510-net-fec-ptp-fix-NULL-pointer-dereference-if-ptp_cloc.patch b/patches/linux/3.18/0510-net-fec-ptp-fix-NULL-pointer-dereference-if-ptp_cloc.patch
new file mode 100644
index 0000000..3e45b22
--- /dev/null
+++ b/patches/linux/3.18/0510-net-fec-ptp-fix-NULL-pointer-dereference-if-ptp_cloc.patch
@@ -0,0 +1,38 @@
+From 81f35ffde0e95ee18de83646bbf93dda55d9cc8b Mon Sep 17 00:00:00 2001
+From: Philipp Zabel <p....@pe...>
+Date: Wed, 22 Oct 2014 16:34:35 +0200
+Subject: [PATCH] net: fec: ptp: fix NULL pointer dereference if ptp_clock is
+ not set
+
+Since commit 278d24047891 (net: fec: ptp: Enable PPS output based on ptp clock)
+fec_enet_interrupt calls fec_ptp_check_pps_event unconditionally, which calls
+into ptp_clock_event. If fep->ptp_clock is NULL, ptp_clock_event tries to
+dereference the NULL pointer.
+Since on i.MX53 fep->bufdesc_ex is not set, fec_ptp_init is never called,
+and fep->ptp_clock is NULL, which reliably causes a kernel panic.
+
+This patch adds a check for fep->ptp_clock == NULL in fec_enet_interrupt.
+
+Signed-off-by: Philipp Zabel <p....@pe...>
+Signed-off-by: David S. Miller <da...@da...>
+---
+ drivers/net/ethernet/freescale/fec_main.c | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
+index 81b96cf..50a851d 100644
+--- a/drivers/net/ethernet/freescale/fec_main.c
++++ b/drivers/net/ethernet/freescale/fec_main.c
+@@ -1581,7 +1581,8 @@ fec_enet_interrupt(int irq, void *dev_id)
+ complete(&fep->mdio_done);
+ }
+
+- fec_ptp_check_pps_event(fep);
++ if (fep->ptp_clock)
++ fec_ptp_check_pps_event(fep);
+
+ return ret;
+ }
+--
+1.7.4.4
+
hooks/post-receive
--
armadeus
|