Hmm, I thought I had removed that commit when you asked me about it
last week. I've done it now, the conflict should be gone tomorrow.
On Tue, Jan 10, 2017 at 3:52 AM, Stephen Rothwell wrote:
> Hi Arnd,
>
> Today's linux-next merge of the y2038 tree got a conflict in:
>
> fs/afs/main.c
>
> betw
Hi Arnd,
Today's linux-next merge of the y2038 tree got a conflict in:
fs/afs/main.c
between commit:
8e8d7f13b6d5 ("afs: Add some tracepoints")
from the net-next tree and commit:
549eb7b22e24 ("AFS: Correctly use 64-bit time for UUID")
from the y2038 tree.
I fixed it up (see below) an
Hi Arnd,
Today's linux-next merge of the y2038 tree got a conflict in:
fs/afs/main.c
between commit:
e0661dfc5961 ("afs: Need linux/random.h")
from the net-next tree and commit:
549eb7b22e24 ("AFS: Correctly use 64-bit time for UUID")
from the y2038 tree.
I fixed it up (see below) and
