linux-kernel - linux-next: manual merge of the akpm tree with the pm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20181204165447.1532b860@canb.auug.org.au>
Date:   Tue, 4 Dec 2018 16:54:47 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>,
        "Rafael J. Wysocki" <rjw@...ysocki.net>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Davidlohr Bueso <dave@...olabs.net>
Subject: linux-next: manual merge of the akpm tree with the pm tree

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in:

  fs/exec.c

between commit:

  67fe1224adc5 ("Revert "exec: make de_thread() freezable"")

from the pm tree and patch:

  "fs/: remove caller signal_pending branch predictions"

from the akpm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/exec.c
index ea7d439cf79e,044e296f2381..000000000000
--- a/fs/exec.c
+++ b/fs/exec.c
@@@ -1086,8 -1087,8 +1086,8 @@@ static int de_thread(struct task_struc
  	while (sig->notify_count) {
  		__set_current_state(TASK_KILLABLE);
  		spin_unlock_irq(lock);
 -		freezable_schedule();
 +		schedule();
- 		if (unlikely(__fatal_signal_pending(tsk)))
+ 		if (__fatal_signal_pending(tsk))
  			goto killed;
  		spin_lock_irq(lock);
  	}
@@@ -1114,8 -1115,8 +1114,8 @@@
  			__set_current_state(TASK_KILLABLE);
  			write_unlock_irq(&tasklist_lock);
  			cgroup_threadgroup_change_end(tsk);
 -			freezable_schedule();
 +			schedule();
- 			if (unlikely(__fatal_signal_pending(tsk)))
+ 			if (__fatal_signal_pending(tsk))
  				goto killed;
  		}
  

Content of type "application/pgp-signature" skipped