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

On Mon, Mar 29, 2021 at 12:07 PM Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the akpm-current tree got a conflict in: > > include/linux/bitmap.h > > between commit: > > f7d5fbad07a4 ("lib: bitmap: order includes alphabetically") > > from the gpio-brgl tree and commit: >

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

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: include/linux/bitmap.h between commit: f7d5fbad07a4 ("lib: bitmap: order includes alphabetically") from the gpio-brgl tree and commit: f3b90426c407 ("kernel.h: drop inclusion in bitmap.h") from the akpm-curren