diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-02 18:03:54 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-02 18:03:54 +0200 |
| commit | 233e562eac549f4f719176bbddeb50c3f17a9c8d (patch) | |
| tree | b6da3ebfee26d3dc05cd8f09bc64e7a568024fc0 | |
| parent | Merge branch 'akpm' (Fixups for Andrew's patchbomb) (diff) | |
| parent | powerpc: Fix size of st_nlink on 64bit (diff) | |
| parent | frv: Remove bogus closing parenthesis (diff) | |
| download | linux-233e562eac549f4f719176bbddeb50c3f17a9c8d.tar.xz linux-233e562eac549f4f719176bbddeb50c3f17a9c8d.zip | |
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