merge

3 files changed, 33 insertions, 3 deletions

diff --git a/README.md b/README.md
index 1701730..8bb7cc9 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,9 @@
-Minimal linux kernel config file for IBM/Lenovo x61s laptop with Atheros AR928X
-wifi and support for encrypted disks. pf-kernel patch [3], which includes BFS
-for [1] and BFQ [2].
+Minimal linux kernel config file for IBM/Lenovo x61s laptop with Atheros AR928X wifi and support for encrypted disks. pf-kernel patch [3], which includes BFS for [1] and BFQ [2]. Also build and install tp_smapi [4].
+
+Current version: 4.5.6 (w/ 4.5-sched-bfs-469.patch)
 
 [1] http://ck.kolivas.org/patches/bfs/
 [2] http://algo.ing.unimo.it/people/paolo/disk_sched/sources.php
 [3] https://pf.natalenko.name/
+[4] https://github.com/evgeni/tp_smapi.git
 
diff --git a/config b/config
index bc69d24..db53a07 100644
--- a/config
+++ b/config
@@ -2612,7 +2612,10 @@ CONFIG_USB_SERIAL_FTDI_SIO=m
 # CONFIG_USB_SERIAL_EDGEPORT is not set
 # CONFIG_USB_SERIAL_EDGEPORT_TI is not set
 # CONFIG_USB_SERIAL_F81232 is not set
+<<<<<<< HEAD
 # CONFIG_USB_SERIAL_F8153X is not set
+=======
+>>>>>>> 24e2cab3ea773c0e5fe60c7223e65d22f6ef4b4b
 # CONFIG_USB_SERIAL_GARMIN is not set
 # CONFIG_USB_SERIAL_IPW is not set
 # CONFIG_USB_SERIAL_IUU is not set
@@ -2644,7 +2647,10 @@ CONFIG_USB_SERIAL_FTDI_SIO=m
 # CONFIG_USB_SERIAL_WISHBONE is not set
 # CONFIG_USB_SERIAL_SSU100 is not set
 # CONFIG_USB_SERIAL_QT2 is not set
+<<<<<<< HEAD
 # CONFIG_USB_SERIAL_UPD78F0730 is not set
+=======
+>>>>>>> 24e2cab3ea773c0e5fe60c7223e65d22f6ef4b4b
 CONFIG_USB_SERIAL_DEBUG=m
 
 #
diff --git a/upgrade-kernel b/upgrade-kernel
new file mode 100755
index 0000000..32336c3
--- /dev/null
+++ b/upgrade-kernel
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+if [ ! -f .config ]; then echo "Call from kernel source dir!"; exit; fi
+V=`pwd | ruby -e "puts STDIN.gets.split('/').last.split('-')[1..-1].join '-'"`;
+make mrproper
+cp -v ../config .config
+make
+sudo make modules_install
+sudo cp -v arch/x86/boot/bzImage /boot/kernel
+sudo md5sum /boot/kernel > /tmp/kernel.md5
+sudo mv /tmp/kernel.md5 /boot/kernel.md5
+sudo /sbin/lilo
+sudo rm /usr/src/linux
+sudo ln -s $(pwd) /usr/src/linux
+cd ~/.local/src/kernel/tp_smapi/
+sudo make HDAPS=1 install KVER=$V KSRC=/home/pks/.local/src/kernel/linux-$V KBUILD=/home/pks/.local/src/kernel/linux-$V
+sudo make clean
+sudo chown -R pks:pks * .* /home/pks/.local/src/kernel/tp_smapi/ /home/pks/.local/src/kernel/linux-*
+echo "================="
+cd /lib/modules/
+pwd
+ls -lah
+