tree 7cf073f97633b75dbae9657f583beba446434203
parent bb37101b36332345a1e1c1f9f2f3bcc8ad7edb65
parent fc55e63e148f1db2180867da875460a00aac8bd1
author Linus Torvalds <torvalds@linux-foundation.org> 1643463244 +0200
committer Linus Torvalds <torvalds@linux-foundation.org> 1643463244 +0200
mergetag object fc55e63e148f1db2180867da875460a00aac8bd1
 type commit
 tag char-misc-5.17-rc2
 tagger Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1643461319 +0100
 
 Char/Misc driver fixes for 5.17-rc2
 
 Here are two small char/misc driver fixes for 5.17-rc2 that fix some
 reported issues.  They include:
 	- fix up a merge issue in the at25.c driver that ended up
 	  dropping some lines in the driver.  The removed lines ended
 	  being needed, so this restores it and the driver works again.
 	- counter core fix where the wrong error was being returned,
 	  NULL should be the correct error for when memory is gone here,
 	  like the kmalloc() core does.
 
 Both of these have been in linux-next this week with no reported issues.
 
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -----BEGIN PGP SIGNATURE-----
 
 iG0EABECAC0WIQT0tgzFv3jCIUoxPcsxR9QN2y37KQUCYfU7Qg8cZ3JlZ0Brcm9h
 aC5jb20ACgkQMUfUDdst+ymyqwCgr2af9iXxNWe2H4rC2ZbtIy93nPYAoI1XmpDd
 uO8nm/Gt/h3bQXMCr3iA
 =F1iZ
 -----END PGP SIGNATURE-----

Merge tag 'char-misc-5.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc driver fixes from Greg KH:
 "Here are two small char/misc driver fixes for 5.17-rc2 that fix some
  reported issues. They are:

   - fix up a merge issue in the at25.c driver that ended up dropping
     some lines in the driver. The removed lines ended being needed, so
     this restores it and the driver works again.

   - counter core fix where the wrong error was being returned, NULL
     should be the correct error for when memory is gone here, like the
     kmalloc() core does.

  Both of these have been in linux-next this week with no reported
  issues"

* tag 'char-misc-5.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  counter: fix an IS_ERR() vs NULL bug
  eeprom: at25: Restore missing allocation