Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca9f672f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'ida-fixes-4.19-rc8' of git://git.infradead.org/users/willy/linux-dax 

Matthew writes:
  "IDA/IDR fixes for 4.19

   I have two tiny fixes, one for the IDA test-suite and one for the IDR
   documentation license."

* 'ida-fixes-4.19-rc8' of git://git.infradead.org/users/willy/linux-dax:
  idr: Change documentation license
  test_ida: Fix lockdep warning
parents 9bd871df a309d5db

Documentation/core-api/idr.rst

+1 −1
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: CC-BY-SA-4.0

.. SPDX-License-Identifier: GPL-2.0+



=============

ID Allocation

lib/test_ida.c

+2 −2
Original line number Diff line number Diff line
@@ -150,10 +150,10 @@ static void ida_check_conv(struct ida *ida) 
	IDA_BUG_ON(ida, !ida_is_empty(ida));

}



static DEFINE_IDA(ida);



static int ida_checks(void)

{

	DEFINE_IDA(ida);



	IDA_BUG_ON(&ida, !ida_is_empty(&ida));

	ida_check_alloc(&ida);

	ida_check_destroy(&ida);