linux38: fix bbswitch

linux311: fix aufs3

Author: philmmanjaro

.gitignore

@@ -9,5 +9,3 @@ pkg
 *.xz
 *.log
 *~
-
-#fn:qvJzFmAB

linux311/PKGBUILD

@@ -10,12 +10,12 @@ pkgname=('linux311' 'linux311-headers')
 _kernelname=-MANJARO
 _basekernel=3.11
 _basever=311
-_aufs=20130826
+_aufs=20130902
 _zfs=0.6.2
 _withzfs=yes
 _rc=rc7
 pkgver=${_basekernel}${_rc}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.kernel.org/"
 license=('GPL2')
@@ -50,11 +50,11 @@ sha256sums=('3da383c6899281fffeb5ef825bb30e3d050859d13ee7b7af78c0901caa3c49f1'
             'f09702f5405a4b7b4fa710bc92530d1e4a6ff416d8a8634a27441b6894bdf906'
             'b1b1cf291bd68270b700eb21f19f7b052116d07dde492761227cd94bb775910c'
             'd3be8e800b7fa0ab82700a61f7c85e4fe351f1b73688120a9a465bd34b473b19'
-            'cf71b3347819d265f0ba0f8234c2f4c09205cb6c2c663937c2f425fe4a4ccc67'
+            '96383a2a556759dfa60812e07b8eb053fd0a004112bb0f03c34e302a47aff18f'
             '95cf7e96f6e4836c4d933512cda213c2e7a0c3633a151d4a0047787422bbf616'
             'bfb1046e76d71e1f95d2d60b5ac69dfd8733d66901dc4bc96af5ffe28d607c7b'
-            '26b946a8be2c64f62c5b7aa5f24861ef8a6231a2daacd1122d77a980887d6947'
-            '3f23399039fa352121f6df1bed9ff284a01a6c021f07df666c4480d9b10c068f'
+            'c0f4f87bb8966f0f75e42285151fa76a6b38af0fc26e4cd948ce2e2fe23c2e42'
+            '2c14f6cf10b261d7e01675576e6cc88b2d789b4cc4cf6e443bd52b8c04414a03'
             '86b15f569ad36e63eff2c83cba0c018145e339bb344f4b5b8b8bc14d84d4b6b4'
             'd633a2039877c00302f32738099ee53e0275350a8f73691ecb107fb9735db5a9'
             '3c577c7055d6c73179726b9c8a7fd48f9122be0b345c50cd54732e801165daa4'

linux311/aufs3-loopback.patch

@@ -196,7 +196,7 @@ index 90df5d6..cb91822 100644
  	unsigned	lo_blocksize;
  	void		*key_data; 
 diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c
-index c43fafa..b9579d8 100644
+index 494982d..b832480 100644
 --- a/fs/aufs/f_op.c
 +++ b/fs/aufs/f_op.c
 @@ -353,7 +353,7 @@ static ssize_t aufs_splice_read(struct file *file, loff_t *ppos,
@@ -258,10 +258,10 @@ index 64d1e3f..e3a32a9 100644
 
  #endif /* __KERNEL__ */
 diff --git a/fs/aufs/super.c b/fs/aufs/super.c
-index 3955f86..b1d5e7f 100644
+index e97f900..58d7c13 100644
 --- a/fs/aufs/super.c
 +++ b/fs/aufs/super.c
-@@ -811,7 +811,10 @@ static const struct super_operations aufs_sop = {
+@@ -821,7 +821,10 @@ static const struct super_operations aufs_sop = {
  	.statfs		= aufs_statfs,
  	.put_super	= aufs_put_super,
  	.sync_fs	= aufs_sync_fs,
@@ -288,3 +288,50 @@ index 146f304..bd17b39 100644
  };
 
  /*
+commit 218e0c3eb3090dc912d93d394955cea04ef13d3b
+Author: J. R. Okajima <[email protected]>
+Date:   Thu Jul 11 00:16:10 2013 +0900
+
+    loop aufs: loopback block device supports for aufs
+    
+    By the commit
+    	83a8761 2013-06-29 move linux/loop.h to drivers/block
+    the definition of struct loop_device is hidden from aufs.
+    But aufs still needs to know the backing file of the loopback block
+    device to identify whether the branches are overlapped or not.
+    This commit defines a new function loop_backing_file() in
+    drivers/block/loop.c for aufs. The declaration in the aufs header file
+    will be added by succeeding commit.
+    
+    Signed-off-by: J. R. Okajima <[email protected]>
+
+diff --git a/drivers/block/loop.c b/drivers/block/loop.c
+index 40e7155..6e43ab0 100644
+--- a/drivers/block/loop.c
++++ b/drivers/block/loop.c
+@@ -691,6 +691,24 @@ static inline int is_loop_device(struct file *file)
+ 	return i && S_ISBLK(i->i_mode) && MAJOR(i->i_rdev) == LOOP_MAJOR;
+ }
+ 
++/*
++ * for AUFS
++ * no get/put for file.
++ */
++struct file *loop_backing_file(struct super_block *sb)
++{
++	struct file *ret;
++	struct loop_device *l;
++
++	ret = NULL;
++	if (MAJOR(sb->s_dev) == LOOP_MAJOR) {
++		l = sb->s_bdev->bd_disk->private_data;
++		ret = l->lo_backing_file;
++	}
++	return ret;
++}
++EXPORT_SYMBOL(loop_backing_file);
++
+ /* loop sysfs attributes */
+ 
+ static ssize_t loop_attr_show(struct device *dev, char *page,
+

linux311/aufs3-proc_map.patch

@@ -68,7 +68,7 @@ index 56123a6..b987a88 100644
  		ino = inode->i_ino;
  		pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT;
 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index fb425aa..cc0a3a4 100644
+index faf4b7c..cd750ff 100644
 --- a/include/linux/mm_types.h
 +++ b/include/linux/mm_types.h
 @@ -213,6 +213,7 @@ struct vm_region {

linux311/aufs3.x-rcN-20130826.patch.bz2

@@ -15,7 +15,7 @@ _zfs=0.6.2
 _withzfs=yes
 _subver=7
 pkgver=${_basekernel}.13.${_subver}
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://www.kernel.org/"
 license=('GPL2')
@@ -48,6 +48,8 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.xz
         "3.8.13.5.patch"
         "3.8.13.6.patch"
         "3.8.13.7.patch"
+        "http://git.kernel.org/cgit/linux/kernel/git/stable/stable-queue.git/plain/releases/3.10.10/acpi-add-_sta-evaluation-at-do_acpi_find_child.patch"
+        "http://git.kernel.org/cgit/linux/kernel/git/stable/stable-queue.git/plain/releases/3.10.10/acpi-try-harder-to-resolve-_adr-collisions-for-bridges.patch"
 )
 sha256sums=('e070d1bdfbded5676a4f374721c63565f1c969466c5a3e214004a136b583184b'
             'abc523f59e4c7a4c8ccadd7fd3cd03b7ae8788b399040a1c949c4232601cfd5b'
@@ -76,6 +78,8 @@ sha256sums=('e070d1bdfbded5676a4f374721c63565f1c969466c5a3e214004a136b583184b'
             '5bf544c716d05fb50dbce2f6705d23e5f46a4afcbda7039781d5d631ed9b89dd'
             'ff6f4e3612e7293ddb11b0693488dbcad1256161e89cdefc445211d0753e1fb2'
             '5bc0d17d70a12a8d535c5e464744e56801a8345625e89650dd3da65941fc2241'
+            'cb505a5b9aa750490ba28facb537bfd928ff6d0dc8edc349b6ad5e202f876e69'
+            'aaf27758adaf142d04ea8ba43378716d24699a884906ae1e2ef3f655695497c6'
 )
 
 ## modules.symboles md5sums
@@ -125,6 +129,10 @@ prepare() {
   patch -Np1 -i "${srcdir}/2700_ThinkPad-30-brightness-control-fix.patch"
   patch -Np1 -i "${srcdir}/4500_nouveau-video-output-control-Kconfig.patch"
 
+  # Fix bug #60561: https://bugzilla.kernel.org/show_bug.cgi?id=60561
+  patch -Np1 -i "${srcdir}/acpi-add-_sta-evaluation-at-do_acpi_find_child.patch"
+  patch -Np1 -i "${srcdir}/acpi-try-harder-to-resolve-_adr-collisions-for-bridges.patch"
+
   # add aufs3 support
   patch -Np1 -i "${srcdir}/aufs${_basekernel}-${_aufs}.patch"
   patch -Np1 -i "${srcdir}/aufs3-base.patch"