forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions
linux-uconsole/net
History
Tao Huang 60a5825e9c Merge remote branch 'android-4.19' of https://android.googlesource.com/kernel/common 
* android-4.19: (206154 commits)
  Linux 4.19.20
  cifs: Always resolve hostname before reconnecting
  md/raid5: fix 'out of memory' during raid cache recovery
  of: overlay: do not duplicate properties from overlay for new nodes
  of: overlay: use prop add changeset entry for property in new nodes
  of: overlay: add missing of_node_get() in __of_attach_node_sysfs
  of: overlay: add tests to validate kfrees from overlay removal
  of: Convert to using %pOFn instead of device_node.name
  mm: migrate: don't rely on __PageMovable() of newpage after unlocking it
  mm: hwpoison: use do_send_sig_info() instead of force_sig()
  mm, oom: fix use-after-free in oom_kill_process
  mm,memory_hotplug: fix scan_movable_pages() for gigantic hugepages
  oom, oom_reaper: do not enqueue same task twice
  mm/hugetlb.c: teach follow_hugetlb_page() to handle FOLL_NOWAIT
  kernel/exit.c: release ptraced tasks before zap_pid_ns_processes
  btrfs: On error always free subvol_name in btrfs_mount
  Btrfs: fix deadlock when allocating tree block during leaf/node split
  mmc: sdhci-iproc: handle mmc_of_parse() errors during probe
  platform/x86: asus-nb-wmi: Drop mapping of 0x33 and 0x34 scan codes
  platform/x86: asus-nb-wmi: Map 0x35 to KEY_SCREENLOCK
  ...

Conflicts:
	Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.txt
	Documentation/devicetree/bindings/devfreq/event/rockchip-dfi.txt
	Documentation/devicetree/bindings/display/bridge/analogix_dp.txt
	Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt
	Documentation/devicetree/bindings/display/rockchip/dw_mipi_dsi_rockchip.txt
	Documentation/devicetree/bindings/display/rockchip/inno_hdmi-rockchip.txt
	Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt
	Documentation/devicetree/bindings/media/i2c/ov2685.txt
	Documentation/devicetree/bindings/media/i2c/ov5695.txt
	Documentation/devicetree/bindings/media/i2c/ov7251.txt
	Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.txt
	Documentation/devicetree/bindings/phy/phy-rockchip-typec.txt
	Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt
	Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt
	Documentation/devicetree/bindings/soc/rockchip/grf.txt
	Documentation/devicetree/bindings/sound/rockchip,pdm.txt
	Documentation/devicetree/bindings/timer/rockchip,rk-timer.txt
	Documentation/devicetree/bindings/usb/rockchip,dwc3.txt
	arch/arm/boot/dts/rk3036-kylin.dts
	arch/arm/boot/dts/rk3036.dtsi
	arch/arm/boot/dts/rk3228-evb.dts
	arch/arm/boot/dts/rk3229-evb.dts
	arch/arm/boot/dts/rk322x.dtsi
	arch/arm/boot/dts/rk3288-fennec.dts
	arch/arm/boot/dts/rk3288-firefly-reload.dts
	arch/arm/boot/dts/rk3288-miqi.dts
	arch/arm/boot/dts/rk3288-phycore-rdk.dts
	arch/arm/boot/dts/rk3288-phycore-som.dtsi
	arch/arm/boot/dts/rv1108.dtsi
	arch/arm64/boot/dts/rockchip/rk3328-evb.dts
	arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
	arch/arm64/boot/dts/rockchip/rk3328.dtsi
	arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi
	arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts
	arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts
	arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
	arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi
	arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
	arch/arm64/boot/dts/rockchip/rk3399.dtsi
	drivers/clk/rockchip/clk-ddr.c
	drivers/clk/rockchip/clk-half-divider.c
	drivers/clk/rockchip/clk-px30.c
	drivers/clk/rockchip/clk-rk3036.c
	drivers/clk/rockchip/clk-rk3128.c
	drivers/clk/rockchip/clk-rk3228.c
	drivers/clk/rockchip/clk-rk3328.c
	drivers/clk/rockchip/clk-rk3399.c
	drivers/clk/rockchip/clk-rv1108.c
	drivers/devfreq/event/rockchip-dfi.c
	drivers/gpu/drm/bridge/analogix/Kconfig
	drivers/gpu/drm/bridge/analogix/Makefile
	drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
	drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
	drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
	drivers/gpu/drm/bridge/dumb-vga-dac.c
	drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
	drivers/gpu/drm/rockchip/cdn-dp-core.c
	drivers/gpu/drm/rockchip/cdn-dp-core.h
	drivers/gpu/drm/rockchip/cdn-dp-reg.c
	drivers/gpu/drm/rockchip/cdn-dp-reg.h
	drivers/gpu/drm/rockchip/dw-mipi-dsi.c
	drivers/gpu/drm/rockchip/inno_hdmi.c
	drivers/gpu/drm/rockchip/inno_hdmi.h
	drivers/gpu/drm/rockchip/rockchip_lvds.c
	drivers/gpu/drm/rockchip/rockchip_vop_reg.c
	drivers/gpu/drm/rockchip/rockchip_vop_reg.h
	drivers/hid/hid-alps.c
	drivers/iio/light/vl6180.c
	drivers/leds/leds-is31fl32xx.c
	drivers/media/cec/cec-adap.c
	drivers/media/cec/cec-api.c
	drivers/media/cec/cec-notifier.c
	drivers/media/i2c/ov5647.c
	drivers/media/i2c/ov5695.c
	drivers/media/i2c/ov7251.c
	drivers/media/platform/rockchip/rga/rga.c
	drivers/media/rc/ir-imon-decoder.c
	drivers/media/rc/serial_ir.c
	drivers/media/spi/Kconfig
	drivers/media/spi/Makefile
	drivers/media/v4l2-core/v4l2-fwnode.c
	drivers/net/phy/rockchip.c
	drivers/phy/rockchip/Kconfig
	drivers/phy/rockchip/Makefile
	drivers/phy/rockchip/phy-rockchip-emmc.c
	drivers/phy/rockchip/phy-rockchip-inno-usb2.c
	drivers/phy/rockchip/phy-rockchip-typec.c
	drivers/phy/rockchip/phy-rockchip-usb.c
	drivers/pinctrl/pinctrl-rk805.c
	drivers/power/reset/reboot-mode.c
	drivers/soc/rockchip/grf.c
	drivers/usb/dwc3/dwc3-of-simple.c
	drivers/usb/gadget/udc/core.c
	include/drm/bridge/analogix_dp.h
	include/dt-bindings/clock/px30-cru.h
	include/dt-bindings/clock/rk3036-cru.h
	include/dt-bindings/clock/rk3128-cru.h
	include/dt-bindings/clock/rk3228-cru.h
	include/dt-bindings/clock/rk3328-cru.h
	include/dt-bindings/clock/rk3399-cru.h
	include/dt-bindings/power/px30-power.h
	include/dt-bindings/power/rk3036-power.h
	include/dt-bindings/power/rk3228-power.h
	include/media/cec-notifier.h
	include/soc/rockchip/rockchip_sip.h
	include/sound/hdmi-codec.h
	sound/soc/codecs/hdmi-codec.c
	sound/soc/rockchip/rockchip_pdm.c
	sound/soc/rockchip/rockchip_pdm.h

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-02-14 11:48:20 +08:00
..
6lowpan rk: revert to v4.4 2019-02-10 00:33:21 +08:00
9p rk: revert to v4.4 2019-02-10 00:33:21 +08:00
802
8021q rk: revert to v4.4 2019-02-10 00:33:21 +08:00
appletalk
atm rk: revert to v4.4 2019-02-10 00:33:21 +08:00
ax25 rk: revert to v4.4 2019-02-10 00:33:21 +08:00
batman-adv rk: revert to v4.4 2019-02-10 00:33:21 +08:00
bluetooth rk: revert to v4.4 2019-02-10 00:33:21 +08:00
bpf bpf/test_run: support cgroup local storage 2018-08-03 00:47:32 +02:00
bpfilter net: bpfilter: use get_pid_task instead of pid_task 2018-10-17 22:03:40 -07:00
bridge rk: revert to v4.4 2019-02-10 00:33:21 +08:00
caif rk: revert to v4.4 2019-02-10 00:33:21 +08:00
can rk: revert to v4.4 2019-02-10 00:33:21 +08:00
ceph rk: revert to v4.4 2019-02-10 00:33:21 +08:00
core rk: revert to v4.4 2019-02-10 00:33:21 +08:00
dcb rk: revert to v4.4 2019-02-10 00:33:21 +08:00
dccp rk: revert to v4.4 2019-02-10 00:33:21 +08:00
decnet rk: revert to v4.4 2019-02-10 00:33:21 +08:00
dns_resolver rk: revert to v4.4 2019-02-10 00:33:21 +08:00
dsa rk: revert to v4.4 2019-02-10 00:33:21 +08:00
ethernet rk: revert to v4.4 2019-02-10 00:33:21 +08:00
hsr
ieee802154 rk: revert to v4.4 2019-02-10 00:33:21 +08:00
ife
ipv4 rk: revert to v4.4 2019-02-10 00:33:21 +08:00
ipv6 rk: revert to v4.4 2019-02-10 00:33:21 +08:00
iucv rk: revert to v4.4 2019-02-10 00:33:21 +08:00
kcm Revert "kcm: remove any offset before parsing messages" 2018-09-17 18:43:42 -07:00
key rk: revert to v4.4 2019-02-10 00:33:21 +08:00
l2tp rk: revert to v4.4 2019-02-10 00:33:21 +08:00
l3mdev
lapb
llc rk: revert to v4.4 2019-02-10 00:33:21 +08:00
mac80211 rk: revert to v4.4 2019-02-10 00:33:21 +08:00
mac802154 rk: revert to v4.4 2019-02-10 00:33:21 +08:00
mpls rk: revert to v4.4 2019-02-10 00:33:21 +08:00
ncsi net/ncsi: Fixup .dumpit message flags and ID check in Netlink handler 2018-08-22 21:39:08 -07:00
netfilter rk: revert to v4.4 2019-02-10 00:33:21 +08:00
netlabel rk: revert to v4.4 2019-02-10 00:33:21 +08:00
netlink rk: revert to v4.4 2019-02-10 00:33:21 +08:00
netrom netrom: switch to sock timer API 2019-02-06 17:30:07 +01:00
nfc rk: revert to v4.4 2019-02-10 00:33:21 +08:00
nsh nsh: set mac len based on inner packet 2018-07-12 16:55:29 -07:00
openvswitch rk: revert to v4.4 2019-02-10 00:33:21 +08:00
packet rk: revert to v4.4 2019-02-10 00:33:21 +08:00
phonet rk: revert to v4.4 2019-02-10 00:33:21 +08:00
psample
qrtr
rds rk: revert to v4.4 2019-02-10 00:33:21 +08:00
rfkill Merge remote branch 'android-4.19' of https://android.googlesource.com/kernel/common 2019-02-14 11:48:20 +08:00
rose net/rose: fix NULL ax25_cb kernel panic 2019-02-06 17:30:07 +01:00
rxrpc rk: revert to v4.4 2019-02-10 00:33:21 +08:00
sched rk: revert to v4.4 2019-02-10 00:33:21 +08:00
sctp rk: revert to v4.4 2019-02-10 00:33:21 +08:00
smc smc: move unhash as early as possible in smc_release() 2019-01-22 21:40:31 +01:00
strparser strparser: remove redundant variable 'rd_desc' 2018-08-01 10:00:06 -07:00
sunrpc rk: revert to v4.4 2019-02-10 00:33:21 +08:00
switchdev rk: revert to v4.4 2019-02-10 00:33:21 +08:00
tipc rk: revert to v4.4 2019-02-10 00:33:21 +08:00
tls net/tls: Init routines in create_ctx 2019-01-13 09:51:00 +01:00
unix rk: revert to v4.4 2019-02-10 00:33:21 +08:00
vmw_vsock rk: revert to v4.4 2019-02-10 00:33:21 +08:00
wimax wimax: remove blank lines at EOF 2018-07-24 14:10:42 -07:00
wireless rk: revert to v4.4 2019-02-10 00:33:21 +08:00
x25 rk: revert to v4.4 2019-02-10 00:33:21 +08:00
xdp xsk: do not call synchronize_net() under RCU read lock 2018-10-11 10:19:01 +02:00
xfrm rk: revert to v4.4 2019-02-10 00:33:21 +08:00
compat.c rk: revert to v4.4 2019-02-10 00:33:21 +08:00
Kconfig rk: revert to v4.4 2019-02-10 00:33:21 +08:00
Makefile
socket.c rk: revert to v4.4 2019-02-10 00:33:21 +08:00
sysctl_net.c rk: revert to v4.4 2019-02-10 00:33:21 +08:00