Re: linux-next: manual merge of the char-misc tree with the drivers-x86 tree

2021-02-24 Thread Greg KH
On Tue, Feb 23, 2021 at 02:28:33PM +1100, Stephen Rothwell wrote: > Hi all, > > On Mon, 15 Feb 2021 07:44:31 +1100 Stephen Rothwell > wrote: > > > > On Mon, 11 Jan 2021 13:08:51 +1100 Stephen Rothwell > > wrote: > > > > > > Today's linux-next merge of the char-misc tree got conflicts in: > >

Re: linux-next: manual merge of the char-misc tree with the drivers-x86 tree

2021-02-22 Thread Stephen Rothwell
Hi all, On Mon, 15 Feb 2021 07:44:31 +1100 Stephen Rothwell wrote: > > On Mon, 11 Jan 2021 13:08:51 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the char-misc tree got conflicts in: > > > > include/linux/mod_devicetable.h > > scripts/mod/devicetable-offsets.c > >

Re: linux-next: manual merge of the char-misc tree with the drivers-x86 tree

2021-02-14 Thread Stephen Rothwell
Hi all, On Mon, 11 Jan 2021 13:08:51 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the char-misc tree got conflicts in: > > include/linux/mod_devicetable.h > scripts/mod/devicetable-offsets.c > scripts/mod/file2alias.c > > between commit: > > eb0e90a82098

Re: linux-next: manual merge of the char-misc tree with the drivers-x86 tree

2021-01-10 Thread Greg KH
On Mon, Jan 11, 2021 at 01:08:51PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the char-misc tree got conflicts in: > > include/linux/mod_devicetable.h > scripts/mod/devicetable-offsets.c > scripts/mod/file2alias.c > > between commit: > > eb0e90a82098

linux-next: manual merge of the char-misc tree with the drivers-x86 tree

2021-01-10 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the char-misc tree got conflicts in: include/linux/mod_devicetable.h scripts/mod/devicetable-offsets.c scripts/mod/file2alias.c between commit: eb0e90a82098 ("platform/surface: aggregator: Add dedicated bus and device type") from the drivers-x86