diff options
| author | Dong Aisheng <aisheng.dong@nxp.com> | 2021-11-02 20:33:06 +0800 |
|---|---|---|
| committer | Dong Aisheng <aisheng.dong@nxp.com> | 2021-11-02 20:33:06 +0800 |
| commit | 5cc7698d17bb9124880e0dc02f5c5cef8f438e82 (patch) | |
| tree | f52519c30761c55ec8214076f5022fa9654205ab /Documentation/devicetree/bindings/net | |
| parent | 8bb7eca972ad531c9b149c0a51ab43a417385813 (diff) | |
| parent | 319e703c7212db0669ec7610d9bf46b2690579d1 (diff) | |
| parent | 266116e7ef8f7a5a2eda97e64113157c44e504fe (diff) | |
| parent | f5386498ffda6704a57feb6d7c7c25d719fbe89e (diff) | |
Merge remote-tracking branches 'origin/core', 'origin/arch/core' and 'origin/arch/qoriq' into net/base
* origin/core: (9 commits)
LF-4658 Revert "mm: don't allow executable ioremap mappings"
drivers: base: move devices pm to tail when driver bound
dma-buf: cma_heap: Add a cma-uncached heap re-using the cma heap
dma-buf: dma-heap: Keep track of the heap device struct
LF-2702 scripts: gcc-plugins: make GCC_PLUGINS not default to y
...
* origin/arch/core: (16 commits)
MLK-23277: 8qm: Fix SW workaround for i.MX8QM TKT340553
MLK-25546 arm64: mm: barrier Fix 8QM usb stop when work with GPU
MLK-16912 PL310: unlock ways during initialization
LF-2438 arm64: kernel: smp: Add workaround for i.MX8MQ ERR11171
LF-363 arm64: kernel: TKT340553 Errata workaround update for i.MX8QM
...
* origin/arch/qoriq:
drivers/soc/fsl: add EPU FSM configuration for deep sleep
fsl_pmc: update device bindings
powerpc/pm: Fix suspend=n in menuconfig for e500mc platforms.
powerpc/pm: add sleep and deep sleep on QorIQ SoCs
soc: fsl: add qixis driver