Commit b2c3a2ca authored by Tim Gardner's avatar Tim Gardner

UBUNTU: rebase to v4.3

Signed-off-by: default avatarTim Gardner <tim.gardner@canonical.com>
parent 2236c106
......@@ -4,6 +4,10 @@ linux (4.3.0-0.6) UNRELEASED; urgency=low
CHANGELOG: Use the printchanges target to see the curent changes.
CHANGELOG: Use the insertchanges target to create the final log.
[ Upstream Kernel Changes ]
* rebase to v4.3
-- Tim Gardner <tim.gardner@canonical.com> Thu, 29 Oct 2015 09:16:26 -0600
linux (4.3.0-0.5) xenial; urgency=low
......
......@@ -1869,6 +1869,7 @@ CONFIG_DONGLE=y
CONFIG_DOUBLEFAULT=y
CONFIG_DOVE_CLK=y
CONFIG_DOVE_THERMAL=m
CONFIG_DP83848_PHY=m
CONFIG_DP83867_PHY=m
# CONFIG_DPM_WATCHDOG is not set
CONFIG_DQL=y
......@@ -5055,7 +5056,7 @@ CONFIG_NET_VENDOR_ARC=y
CONFIG_NET_VENDOR_ATHEROS=y
CONFIG_NET_VENDOR_BROADCOM=y
CONFIG_NET_VENDOR_BROCADE=y
CONFIG_NET_VENDOR_CAVIUM=m
CONFIG_NET_VENDOR_CAVIUM=y
CONFIG_NET_VENDOR_CHELSIO=y
CONFIG_NET_VENDOR_CIRRUS=y
CONFIG_NET_VENDOR_CISCO=y
......@@ -6660,9 +6661,6 @@ CONFIG_SECURITYFS=y
CONFIG_SECURITY_APPARMOR=y
CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
CONFIG_SECURITY_APPARMOR_HASH=y
CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
# CONFIG_SECURITY_APPARMOR_STATS is not set
CONFIG_SECURITY_APPARMOR_UNCONFINED_INIT=y
# CONFIG_SECURITY_DMESG_RESTRICT is not set
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_NETWORK_XFRM=y
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment