# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1387379602 0
# Node ID 83faf94fc7c8952e7a053559121ffdef76f14b87
# Parent  8580e54b52849e1b21372b5ebb3ebe3182ba20e9
Up linux (3.2.53) again...

diff -r 8580e54b5284 -r 83faf94fc7c8 linux/stuff/linux-core.u
--- a/linux/stuff/linux-core.u	Wed Dec 18 10:44:14 2013 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-FIX: Linux local privilege escalation 0day, 2.6.37 - 3.8.10
---- linux-3.2.40/kernel//events/core.c
-+++ linux-3.2.40/kernel//events/core.c
-@@ -5164,7 +5164,7 @@
- 
- static int perf_swevent_init(struct perf_event *event)
- {
--	int event_id = event->attr.config;
-+	u64 event_id = event->attr.config;
- 
- 	if (event->attr.type != PERF_TYPE_SOFTWARE)
- 		return -ENOENT;
diff -r 8580e54b5284 -r 83faf94fc7c8 linux/stuff/linux-diff.u
--- a/linux/stuff/linux-diff.u	Wed Dec 18 10:44:14 2013 +0000
+++ b/linux/stuff/linux-diff.u	Wed Dec 18 15:13:22 2013 +0000
@@ -29,7 +29,7 @@
  	(rm -f $@ ; false)
  
  # DTC
-@@ -253,7 +254,7 @@
+@@ -296,7 +297,7 @@
  
  quiet_cmd_lzma = LZMA    $@
  cmd_lzma = (cat $(filter-out FORCE,$^) | \
diff -r 8580e54b5284 -r 83faf94fc7c8 linux/stuff/modules.list
--- a/linux/stuff/modules.list	Wed Dec 18 10:44:14 2013 +0000
+++ b/linux/stuff/modules.list	Wed Dec 18 15:13:22 2013 +0000
@@ -15,6 +15,7 @@
 drivers/mmc/host/via-sdmmc.ko.xz
 drivers/mmc/host/vub300.ko.xz
 drivers/usb/otg/ab8500-usb.ko.xz
+drivers/usb/misc/ftdi-elan.ko.xz
 drivers/char/agp/agpgart.ko.xz
 drivers/connector/cn.ko.xz
 drivers/i2c/algos/i2c-algo-bit.ko.xz
@@ -68,6 +69,7 @@
 drivers/usb/gadget/g_acm_ms.ko.xz
 drivers/usb/renesas_usbhs/renesas_usbhs.ko.xz
 drivers/hv/hv_utils.ko.xz
+drivers/hv/hv_vmbus.ko.xz
 drivers/gpio/gpio-mcp23s08.ko.xz
 drivers/gpio/gpio-generic.ko.xz
 drivers/base/regmap/regmap-i2c.ko.xz
@@ -83,6 +85,7 @@
 drivers/input/sparse-keymap.ko.xz
 drivers/net/ethernet/realtek/atp.ko.xz
 drivers/net/ethernet/realtek/8139cp.ko.xz
+drivers/net/ethernet/realtek/r8169.ko.xz
 drivers/net/ethernet/cisco/enic/enic.ko.xz
 drivers/net/ethernet/qlogic/qlge/qlge.ko.xz
 drivers/net/ethernet/qlogic/netxen/netxen_nic.ko.xz
@@ -128,9 +131,6 @@
 drivers/net/mdio.ko.xz
 drivers/net/ethernet/sun/niu.ko.xz
 drivers/net/ifb.ko.xz
-drivers/net/veth.ko.xz
-drivers/net/macvtap.ko.xz
-drivers/net/macvlan.ko.xz
 drivers/net/ethernet/neterion/vxge/vxge.ko.xz
 drivers/net/ethernet/intel/ixgb/ixgb.ko.xz
 drivers/net/ethernet/intel/ixgbe/ixgbe.ko.xz
@@ -144,6 +144,8 @@
 drivers/net/ethernet/3com/3c574_cs.ko.xz
 drivers/net/ethernet/3com/3c589_cs.ko.xz
 drivers/net/ethernet/8390/axnet_cs.ko.xz
+drivers/net/arcnet/arcnet.ko.xz
+drivers/net/arcnet/com20020.ko.xz
 drivers/net/arcnet/com20020_cs.ko.xz
 drivers/net/ethernet/fujitsu/fmvj18x_cs.ko.xz
 drivers/net/ethernet/amd/nmclan_cs.ko.xz
@@ -275,7 +277,9 @@
 drivers/input/gameport/gameport.ko.xz
 drivers/i2c/i2c-core.ko.xz
 drivers/i2c/busses/i2c-designware-pci.ko.xz
+drivers/i2c/busses/i2c-designware-core.ko.xz
 drivers/regulator/gpio-regulator.ko.xz
+drivers/misc/ti-st/st_drv.ko.xz
 sound/soundcore.ko.xz
 sound/ac97_bus.ko.xz
 sound/core/snd.ko.xz
diff -r 8580e54b5284 -r 83faf94fc7c8 linux64-kvm/receipt
--- a/linux64-kvm/receipt	Wed Dec 18 10:44:14 2013 +0000
+++ b/linux64-kvm/receipt	Wed Dec 18 15:13:22 2013 +0000
@@ -23,6 +23,7 @@
     export _pkg
     $wanted_stuff/list_modules.sh arch/x86/kvm drivers/virtio \
     drivers/char/hw_random/virtio-rng.ko.xz \
+    drivers/char/virtio_console.ko.xz \
     drivers/net/virtio_net.ko.xz drivers/block/virtio_blk.ko.xz | \
     while read module; do
     	dir=$path/$(dirname $module)
diff -r 8580e54b5284 -r 83faf94fc7c8 linux64/stuff/modules64.list
--- a/linux64/stuff/modules64.list	Wed Dec 18 10:44:14 2013 +0000
+++ b/linux64/stuff/modules64.list	Wed Dec 18 15:13:22 2013 +0000
@@ -15,6 +15,7 @@
 drivers/mmc/host/via-sdmmc.ko.xz
 drivers/mmc/host/vub300.ko.xz
 drivers/usb/otg/ab8500-usb.ko.xz
+drivers/usb/misc/ftdi-elan.ko.xz
 drivers/char/agp/agpgart.ko.xz
 drivers/connector/cn.ko.xz
 drivers/i2c/algos/i2c-algo-bit.ko.xz
@@ -66,6 +67,7 @@
 drivers/usb/gadget/g_acm_ms.ko.xz
 drivers/usb/renesas_usbhs/renesas_usbhs.ko.xz
 drivers/hv/hv_utils.ko.xz
+drivers/hv/hv_vmbus.ko.xz
 drivers/gpio/gpio-mcp23s08.ko.xz
 drivers/gpio/gpio-generic.ko.xz
 drivers/base/regmap/regmap-i2c.ko.xz
@@ -118,6 +120,8 @@
 drivers/net/ethernet/3com/3c574_cs.ko.xz
 drivers/net/ethernet/3com/3c589_cs.ko.xz
 drivers/net/ethernet/8390/axnet_cs.ko.xz
+drivers/net/arcnet/arcnet.ko.xz
+drivers/net/arcnet/com20020.ko.xz
 drivers/net/arcnet/com20020_cs.ko.xz
 drivers/net/ethernet/fujitsu/fmvj18x_cs.ko.xz
 drivers/net/ethernet/amd/nmclan_cs.ko.xz
@@ -244,7 +248,9 @@
 drivers/input/gameport/gameport.ko.xz
 drivers/i2c/i2c-core.ko.xz
 drivers/i2c/busses/i2c-designware-pci.ko.xz
+drivers/i2c/busses/i2c-designware-core.ko.xz
 drivers/regulator/gpio-regulator.ko.xz
+drivers/misc/ti-st/st_drv.ko.xz
 sound/soundcore.ko.xz
 sound/ac97_bus.ko.xz
 sound/core/snd.ko.xz