Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev

Conflicts:
	src/modules/driver/us_proc_inst.c

Resolve a conflict in install_file_probes()
with 832ea7b4775fe7d70de3fd9e97e0865a94db0fe7

diff --cc driver/storage.c
Simple merge

diff --cc driver/us_proc_inst.c
index e975e11,c651d50..52adc71
--- 1/driver/us_proc_inst.c
--- 2/driver/us_proc_inst.c
+++ b/driver/us_proc_inst.c
@@@ -761,10 -762,8 +762,8 @@@ static void install_file_probes(struct 
  
        for (i = 0; i < table_size; ++i) {
                head = &file->page_probes_table[i];
 -              hlist_for_each_entry_rcu(page, node, head, hlist) {
 +              swap_hlist_for_each_entry_rcu(page, node, head, hlist) {
-                       if (page_present(mm, page->offset)) {
-                               register_us_page_probe(page, file, task);
-                       }
+                       register_us_page_probe(page, file, task);
                }
        }
  }

diff --cc kprobe/arch/asm-arm/dbi_kprobes.c
Simple merge