Re: linux-next: manual merge of the akpm-current tree with the random tree

On Wed, 28 Jun 2017 16:03:48 +1000 Stephen Rothwell wrote: > Hi Andrew, > > [Yes, top posting :-)] > > With the merge window approaching, just a reminder that this conflict > still exists. huh, it was only a teeny thing. I moved

Re: linux-next: manual merge of the akpm-current tree with the random tree

On Wed, 28 Jun 2017 16:03:48 +1000 Stephen Rothwell wrote: > Hi Andrew, > > [Yes, top posting :-)] > > With the merge window approaching, just a reminder that this conflict > still exists. huh, it was only a teeny thing. I moved

Re: linux-next: manual merge of the akpm-current tree with the random tree

Hi Andrew, [Yes, top posting :-)] With the merge window approaching, just a reminder that this conflict still exists. On Thu, 8 Jun 2017 16:28:12 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in: > >

Re: linux-next: manual merge of the akpm-current tree with the random tree

Hi Andrew, [Yes, top posting :-)] With the merge window approaching, just a reminder that this conflict still exists. On Thu, 8 Jun 2017 16:28:12 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in: > > include/linux/random.h > > between

linux-next: manual merge of the akpm-current tree with the random tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: include/linux/random.h between commit: 60473a13020f ("random: add get_random_{bytes,u32,u64,int,long,once}_wait family") from the random tree and commit: d7802aa82f66 ("random,stackprotect: introduce

linux-next: manual merge of the akpm-current tree with the random tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: include/linux/random.h between commit: 60473a13020f ("random: add get_random_{bytes,u32,u64,int,long,once}_wait family") from the random tree and commit: d7802aa82f66 ("random,stackprotect: introduce

linux-next: manual merge of the akpm-current tree with the random tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in arch/x86/syscalls/syscall_64.tbl between commit 69d7b7939c24 ("random: introduce getrandom(2) system call") from the random tree and commit f5e74a5d7743 ("kexec: new syscall kexec_file_load() declaration") from the

linux-next: manual merge of the akpm-current tree with the random tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in arch/x86/syscalls/syscall_64.tbl between commit 69d7b7939c24 (random: introduce getrandom(2) system call) from the random tree and commit f5e74a5d7743 (kexec: new syscall kexec_file_load() declaration) from the