| #
875999c5 |
| 12-Apr-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'upstream'
|
| #
10a5fd5e |
| 11-Apr-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'master'
Conflicts:
drivers/scsi/libata-scsi.c
include/linux/libata.h
|
| #
b905b7b0 |
| 11-Apr-2006 |
NeilBrown <neilb@suse.de> |
[PATCH] knfsd: nfsd4: better nfs4acl errors
We're returning -1 in a few places in the NFSv4<->POSIX acl translation code
where we could return a reasonable error.
Also allows some minor simplificat
[PATCH] knfsd: nfsd4: better nfs4acl errors
We're returning -1 in a few places in the NFSv4<->POSIX acl translation code
where we could return a reasonable error.
Also allows some minor simplification elsewhere.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
show more ...
|
| #
24992052 |
| 11-Apr-2006 |
NeilBrown <neilb@suse.de> |
[PATCH] knfsd: nfsd4: Wrong error handling in nfs4acl
this fixes coverity id #3. Coverity detected dead code, since the == -1
comparison only returns 0 or 1 to error. Therefore the if ( error < 0
[PATCH] knfsd: nfsd4: Wrong error handling in nfs4acl
this fixes coverity id #3. Coverity detected dead code, since the == -1
comparison only returns 0 or 1 to error. Therefore the if ( error < 0 )
statement was always false. Seems that this was an if( error = nfs4... )
statement some time ago, which got broken during cleanup.
Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
show more ...
|
|
Revision tags: v2.6.17-rc1 |
|
| #
95d465fd |
| 02-Apr-2006 |
Dmitry Torokhov <dtor_core@ameritech.net> |
Manual merge with Linus.
Conflicts:
arch/powerpc/kernel/setup-common.c
drivers/input/keyboard/hil_kbd.c
drivers/input/mouse/hil_ptr.c
|
| #
86579dd0 |
| 31-Mar-2006 |
Steven Whitehouse <swhiteho@redhat.com> |
Merge branch 'master'
|
| #
d62e54ab |
| 31-Mar-2006 |
Steve French <sfrench@us.ibm.com> |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
|
| #
79072f38 |
| 30-Mar-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'upstream'
|
| #
4bbf7bc4 |
| 24-Mar-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'upstream'
Conflicts:
drivers/scsi/libata-core.c
|
| #
e8c96f8c |
| 24-Mar-2006 |
Tobias Klauser <tklauser@nuerscht.ch> |
[PATCH] fs: Use ARRAY_SIZE macro
Use ARRAY_SIZE macro instead of sizeof(x)/sizeof(x[0]) and remove a
duplicate of ARRAY_SIZE. Some trailing whitespaces are also deleted.
Signed-off-by: Tobias Klau
[PATCH] fs: Use ARRAY_SIZE macro
Use ARRAY_SIZE macro instead of sizeof(x)/sizeof(x[0]) and remove a
duplicate of ARRAY_SIZE. Some trailing whitespaces are also deleted.
Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Cc: David Howells <dhowells@redhat.com>
Cc: Dave Kleikamp <shaggy@austin.ibm.com>
Acked-by: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: Neil Brown <neilb@cse.unsw.edu.au>
Cc: Chris Mason <mason@suse.com>
Cc: Jeff Mahoney <jeffm@suse.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Nathan Scott <nathans@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
show more ...
|
|
Revision tags: v2.6.16, v2.6.16-rc6, v2.6.16-rc5, v2.6.16-rc4, v2.6.16-rc3, v2.6.16-rc2, v2.6.16-rc1, v2.6.15, v2.6.15-rc7, v2.6.15-rc6, v2.6.15-rc5, v2.6.15-rc4, v2.6.15-rc3, v2.6.15-rc2, v2.6.15-rc1, v2.6.14, v2.6.14-rc5, v2.6.14-rc4, v2.6.14-rc3, v2.6.14-rc2, v2.6.14-rc1 |
|
| #
c1b054d0 |
| 29-Aug-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge /spare/repo/linux-2.6/
|
| #
2fca877b |
| 29-Aug-2005 |
Jeff Garzik <jgarzik@pobox.com> |
/spare/repo/libata-dev branch 'v2.6.13'
|
|
Revision tags: v2.6.13, v2.6.13-rc7 |
|
| #
a8b3e6f1 |
| 18-Aug-2005 |
Dave Jones <davej@redhat.com> |
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
2f058256 |
| 10-Aug-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge /spare/repo/linux-2.6/
|
|
Revision tags: v2.6.13-rc6, v2.6.13-rc5, v2.6.13-rc4 |
|
| #
f7f24758 |
| 13-Jul-2005 |
Dave Kleikamp <shaggy@austin.ibm.com> |
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
|
|
Revision tags: v2.6.13-rc3, v2.6.13-rc2 |
|
| #
d2f64095 |
| 02-Jul-2005 |
David Woodhouse <dwmw2@shinybook.infradead.org> |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|
| #
ab997aae |
| 01-Jul-2005 |
Steve French <sfrench@hera.kernel.org> |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|
|
Revision tags: v2.6.13-rc1 |
|
| #
f45727d5 |
| 27-Jun-2005 |
Jeff Garzik <jgarzik@pretzel.yyz.us> |
Merge /spare/repo/netdev-2.6/ branch 'ieee80211'
|
| #
5696c194 |
| 27-Jun-2005 |
Jeff Garzik <jgarzik@pretzel.yyz.us> |
Merge /spare/repo/linux-2.6/
|
| #
aef7b83c |
| 27-Jun-2005 |
Jeff Garzik <jgarzik@pretzel.yyz.us> |
Merge /spare/repo/linux-2.6/
|
| #
7ca6448d |
| 26-Jun-2005 |
Thomas Gleixner <tglx@tglx.tec.linutronix.de> |
Merge with rsync://fileserver/linux
Update to Linus latest
|
| #
8b0ee07e |
| 26-Jun-2005 |
Jeff Garzik <jgarzik@pretzel.yyz.us> |
Merge upstream (approx. 2.6.12-git8) into 'janitor' branch of netdev-2.6.
|
| #
38b22b6e |
| 25-Jun-2005 |
Anton Altaparmakov <aia21@cantab.net> |
Automerge with /usr/src/ntfs-2.6.git.
|
| #
fd39ca9a |
| 24-Jun-2005 |
NeilBrown <neilb@cse.unsw.edu.au> |
[PATCH] knfsd: nfsd4: make needlessly global code static
This patch contains the following possible cleanups:
- make needlessly global code static
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signe
[PATCH] knfsd: nfsd4: make needlessly global code static
This patch contains the following possible cleanups:
- make needlessly global code static
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
show more ...
|
|
Revision tags: v2.6.12, v2.6.12-rc6, v2.6.12-rc5, v2.6.12-rc4, v2.6.12-rc3, v2.6.12-rc2 |
|
| #
1da177e4 |
| 17-Apr-2005 |
Linus Torvalds <torvalds@ppc970.osdl.org> |
Linux-2.6.12-rc2
Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in
Linux-2.6.12-rc2
Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in the meantime it's about
3.2GB when imported into git - space that would just make the early
git days unnecessarily complicated, when we don't have a lot of good
infrastructure for it.
Let it rip!
show more ...
|