OpenCloudOS-Kernel/include/dt-bindings
David S. Miller d96ff269a0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The new route handling in ip_mc_finish_output() from 'net' overlapped
with the new support for returning congestion notifications from BPF
programs.

In order to handle this I had to take the dev_loopback_xmit() calls
out of the switch statement.

The aquantia driver conflicts were simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2019-06-27 21:06:39 -07:00
..
arm treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 194 2019-05-30 11:29:22 -07:00
bus bus: ti-sysc: Add support for using ti-sysc for MCAN on dra76x 2018-07-09 22:31:27 -07:00
clk mfd: lochnagar: Add initial binding documentation 2019-02-07 10:43:55 +00:00
clock A handful of clk driver fixes and one core framework fix 2019-06-28 08:50:09 +08:00
display License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
dma treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 498 2019-06-19 17:09:53 +02:00
firmware/imx dt-bindings: firmware: imx-scu: add new resources to scu resource table 2019-03-19 16:46:37 +08:00
gce dt-bindings: soc: Add documentation for the MediaTek GCE unit 2018-08-03 19:52:14 +05:30
gpio treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 446 2019-06-05 17:37:18 +02:00
i2c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 498 2019-06-19 17:09:53 +02:00
iio dt-bindings: iio/temperature: Add thermocouple types (and doc) 2019-04-04 20:21:01 +01:00
input treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 174 2019-05-30 11:26:41 -07:00
interconnect interconnect: qcom: Add sdm845 interconnect provider driver 2019-01-22 13:37:25 +01:00
interrupt-controller treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
leds License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
mailbox dt-bindings: tegra186-hsp: Add shared mailboxes 2018-12-21 22:31:26 -06:00
media treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 174 2019-05-30 11:26:41 -07:00
memory treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 174 2019-05-30 11:26:41 -07:00
mfd treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
mips treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
mux License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
net Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2019-06-07 11:00:14 -07:00
phy treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 422 2019-06-05 17:37:15 +02:00
pinctrl treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
power treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
pwm License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
regulator regulator: act8945a-regulator: Implement PM functionalities 2018-12-12 16:59:04 +00:00
reset treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 282 2019-06-05 17:36:37 +02:00
soc treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 284 2019-06-05 17:36:37 +02:00
sound treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
spmi treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 284 2019-06-05 17:36:37 +02:00
thermal treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 498 2019-06-19 17:09:53 +02:00
usb dt-bindings: connector: Add support for USB-PD PPS APDOs to bindings 2018-09-20 12:56:02 +02:00