Re: linux-next: manual merge of the cel tree with the nfs tree

Hi all, On Tue, 15 Dec 2020 11:41:50 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the cel tree got a conflict in: > > include/linux/sunrpc/xdr.h > > between commits: > > 9a20f6f4e6ba ("SUNRPC: Fixes for xdr_align_data()") > c4f2f591f02c ("SUNRPC: Fix xdr_expand_hole()"

linux-next: manual merge of the cel tree with the nfs tree

Hi all, Today's linux-next merge of the cel tree got a conflict in: include/linux/sunrpc/xdr.h between commits: 9a20f6f4e6ba ("SUNRPC: Fixes for xdr_align_data()") c4f2f591f02c ("SUNRPC: Fix xdr_expand_hole()") f8d0e60f1056 ("SUNRPC: Cleanup - constify a number of xdr_buf helpers") fro