Re: linux-next: manual merge of the y2038 tree with the xfs tree

[Stephen Rothwell]

Hi Darrick,

On Mon, 2 Dec 2019 16:22:58 -0800 "Darrick J. Wong" <darrick.wong@xxxxxxxxxx> wrote:
>
> On Tue, Dec 03, 2019 at 11:00:39AM +1100, Stephen Rothwell wrote:
> > Hi all,
> > 
> > This conflict is now between the xfs tree and Linus' tree (and the
> > merge fix up patch below needs applying to that merge.  
> 
> There shouldn't be a conflict any more, since Linus just pulled the xfs
> tree into master and resolved the conflict in the merge commit.
> (Right?  Or am I missing something here post-turkeyweekend? 8))

Yeah, it should all be gone in tomorrow's linux-next.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpNbZlHf30iJ.pgp
Description: OpenPGP digital signature