author | LCPD Auto Merger <lcpd_integration@list.ti.com> | |
Tue, 16 Oct 2018 19:27:52 +0000 (14:27 -0500) | ||
committer | LCPD Auto Merger <lcpd_integration@list.ti.com> | |
Tue, 16 Oct 2018 19:27:52 +0000 (14:27 -0500) |
TI-Feature: platform_base
TI-Tree: git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree.git
TI-Branch: platform-ti-linux-4.14.y
* 'platform-ti-linux-4.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree: (39 commits)
ti_config_fragments: v8_baseport: enable K3 thermal
soc/dmaengine: ti: Move cppi5.h header under dma as ti-cppi5.h
dmaengine: ti: k3-udma: Set the supported metadata modes
dmaengine: Update the descriptor metadata support as per mainline
dmaengine: ti: k3-udma: Do not set device_attach_metadata callback
dmaengine: ti: k3-udma: Remove unnecessary dev_width <-> elsize conversions
soc: ti: cppi5: Alignment fixes
dmaengine: ti: k3-udma: Use the cppi5 helpers for TR descriptor setup
soc: ti: cppi5: Update the TR descriptor init helper
soc: ti: cppi5: Rename cppi5_desc_is_epib_present to cppi5_hdesc_epib_present
soc: ti: cppi5: Collect generic Packet/TR descriptor helpers in one place
dmaengine: ti: k3-udma: Use cppi5_tr_calc_size() from cppi5.h
soc: ti: cppi5: Fix TR packet size calculation
soc: ti: cppi5: Move TR inline functions after the definition
dmaengine: ti: k3-udma: Use the cppi5_desc_hdr_t instead cppi50_tr_req_desc
dmaengine: ti: k3-udma: Fix (again) the TR descriptor size calculation
dmaengine: ti: k3-udma: Rename slave_thread_id to remote_thread_id
soc: ti: Add header file for k3-navss-desc-pool (tree-wide)
soc: ti: cppi5: Change prefixes from knav_udmap_ to cppi5_ (tree-wide)
crypto: sa2ul: Omit error print for DMA channel in case of deferred probe
...
Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>
TI-Tree: git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree.git
TI-Branch: platform-ti-linux-4.14.y
* 'platform-ti-linux-4.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree: (39 commits)
ti_config_fragments: v8_baseport: enable K3 thermal
soc/dmaengine: ti: Move cppi5.h header under dma as ti-cppi5.h
dmaengine: ti: k3-udma: Set the supported metadata modes
dmaengine: Update the descriptor metadata support as per mainline
dmaengine: ti: k3-udma: Do not set device_attach_metadata callback
dmaengine: ti: k3-udma: Remove unnecessary dev_width <-> elsize conversions
soc: ti: cppi5: Alignment fixes
dmaengine: ti: k3-udma: Use the cppi5 helpers for TR descriptor setup
soc: ti: cppi5: Update the TR descriptor init helper
soc: ti: cppi5: Rename cppi5_desc_is_epib_present to cppi5_hdesc_epib_present
soc: ti: cppi5: Collect generic Packet/TR descriptor helpers in one place
dmaengine: ti: k3-udma: Use cppi5_tr_calc_size() from cppi5.h
soc: ti: cppi5: Fix TR packet size calculation
soc: ti: cppi5: Move TR inline functions after the definition
dmaengine: ti: k3-udma: Use the cppi5_desc_hdr_t instead cppi50_tr_req_desc
dmaengine: ti: k3-udma: Fix (again) the TR descriptor size calculation
dmaengine: ti: k3-udma: Rename slave_thread_id to remote_thread_id
soc: ti: Add header file for k3-navss-desc-pool (tree-wide)
soc: ti: cppi5: Change prefixes from knav_udmap_ to cppi5_ (tree-wide)
crypto: sa2ul: Omit error print for DMA channel in case of deferred probe
...
Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>
1 | 2 | |||
---|---|---|---|---|
drivers/net/ethernet/ti/icssg_prueth.c | patch | | diff1 | | diff2 | | blob | history |
drivers/net/ethernet/ti/icssg_prueth.h | patch | | diff1 | | diff2 | | blob | history |
diff --cc drivers/net/ethernet/ti/icssg_prueth.c
Simple merge
diff --cc drivers/net/ethernet/ti/icssg_prueth.h
Simple merge