diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2016-03-23 10:52:43 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2016-03-23 10:52:43 -0400 |
| commit | 62d5948052fe411376dd92e5d4640a5ebf5ad28e (patch) | |
| tree | e421149cb82e9761a6a41388287f63e577ea0f7d | |
| parent | 10af6f323347396a0946908731a5dbc2d458626d (diff) | |
| download | kernel-62d5948052fe411376dd92e5d4640a5ebf5ad28e.tar.gz kernel-62d5948052fe411376dd92e5d4640a5ebf5ad28e.tar.xz kernel-62d5948052fe411376dd92e5d4640a5ebf5ad28e.zip | |
Linux v4.5-12013-gc13042362033
- crypto, mailbox, clk merges
| -rw-r--r-- | Initial-AllWinner-A64-and-PINE64-support.patch | 4 | ||||
| -rw-r--r-- | config-armv7 | 2 | ||||
| -rw-r--r-- | config-armv7-lpae | 1 | ||||
| -rw-r--r-- | gitrev | 2 | ||||
| -rw-r--r-- | kernel.spec | 6 | ||||
| -rw-r--r-- | sources | 2 |
6 files changed, 12 insertions, 5 deletions
diff --git a/Initial-AllWinner-A64-and-PINE64-support.patch b/Initial-AllWinner-A64-and-PINE64-support.patch index e9b00f70e..966275a8f 100644 --- a/Initial-AllWinner-A64-and-PINE64-support.patch +++ b/Initial-AllWinner-A64-and-PINE64-support.patch @@ -1056,8 +1056,8 @@ index 171085a..cc89d1f 100644 --- a/drivers/clk/sunxi/clk-factors.h +++ b/drivers/clk/sunxi/clk-factors.h @@ -26,6 +26,7 @@ struct factors_data { - struct clk_factors_config *table; - void (*getter) (u32 *rate, u32 parent_rate, u8 *n, u8 *k, u8 *m, u8 *p); + void (*getter)(struct factors_request *req); + void (*recalc)(struct factors_request *req); const char *name; + int name_idx; }; diff --git a/config-armv7 b/config-armv7 index 1a040d692..1efb5899f 100644 --- a/config-armv7 +++ b/config-armv7 @@ -238,6 +238,7 @@ CONFIG_TI_CPSW_ALE=m CONFIG_TI_CPTS=y CONFIG_TI_EMIF=m CONFIG_DRM_TILCDC=m +# CONFIG_COMMON_CLK_TI_ADPLL is not set # We only need this until the BBB dts is actually updated CONFIG_DRM_TILCDC_SLAVE_COMPAT=y CONFIG_SPI_DAVINCI=m @@ -296,6 +297,7 @@ CONFIG_REGULATOR_QCOM_SPMI=m CONFIG_APQ_GCC_8084=m CONFIG_APQ_MMCC_8084=m CONFIG_IPQ_GCC_806X=m +CONFIG_IPQ_GCC_4019=m CONFIG_MSM_GCC_8660=m CONFIG_MSM_GCC_8960=m CONFIG_MSM_MMCC_8960=m diff --git a/config-armv7-lpae b/config-armv7-lpae index 4baa10c9b..e500e1d58 100644 --- a/config-armv7-lpae +++ b/config-armv7-lpae @@ -62,6 +62,7 @@ CONFIG_KEYSTONE_IRQ=m CONFIG_PCI_KEYSTONE=y CONFIG_MTD_NAND_DAVINCI=m CONFIG_GPIO_SYSCON=m +CONFIG_TI_MESSAGE_MANAGER=m # Tegra (non A15 device options) # CONFIG_ARCH_TEGRA_2x_SOC is not set @@ -1 +1 @@ -a24e3d414e59ac76566dedcad1ed1d319a93ec14 +c130423620331a104492bbbcc49f25125e26a21a diff --git a/kernel.spec b/kernel.spec index f6aa7815c..0a707f891 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 21 +%define gitrev 22 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -2162,6 +2162,10 @@ fi # # %changelog +* Wed Mar 23 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc0.git22.1 +- Linux v4.5-12013-gc13042362033 +- crypto, mailbox, clk merges + * Wed Mar 23 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc0.git21.1 - Linux v4.5-11787-ga24e3d414e59 - akpm, kvm, rdma @@ -1,3 +1,3 @@ a60d48eee08ec0536d5efb17ca819aef linux-4.5.tar.xz 6f557fe90b800b615c85c2ca04da6154 perf-man-4.5.tar.gz -89bdc4e5221ea4bfdc4f392bc193efa7 patch-4.5-git21.xz +1efd8aeadf2822f23214a5129575a8f6 patch-4.5-git22.xz |