]> git.baikalelectronics.ru Git - kernel.git/commit
Merge 'for-linus' branches from git://git.kernel.org/pub/scm/linux/kernel/git/viro...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 Jun 2012 16:03:54 +0000 (09:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 Jun 2012 16:03:54 +0000 (09:03 -0700)
commit4f45782083b402cb6bb82cf8bfb6e9eddeb24407
treeb6da3ebfee26d3dc05cd8f09bc64e7a568024fc0
parent960cae00f6409c1004fab5549a6ade49fb8cb094
parent7cf426b13078092ce6126dfabd9602987dd29f7f
parent2da0ae87b52b3a6fc6b3d3d7ab36abd5acdfb684
Merge 'for-linus' branches from git://git.kernel.org/pub/scm/linux/kernel/git/viro/{vfs,signal}

Pull vfs fix and a fix from the signal changes for frv from Al Viro.

The __kernel_nlink_t for powerpc got scrogged because 64-bit powerpc
actually depended on the default "unsigned long", while 32-bit powerpc
had an explicit override to "unsigned short".  Al didn't notice, and
made both of them be the unsigned short.

The frv signal fix is fallout from simplifying the do_notify_resume()
code, and leaving an extra parenthesis.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  powerpc: Fix size of st_nlink on 64bit

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal:
  frv: Remove bogus closing parenthesis