| #
46f5960f |
| 03-Aug-2006 |
Linus Torvalds <torvalds@g5.osdl.org> |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (32 commits)
[NET]: Fix more per-cpu typos
[SECURITY]: Fix build with
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (32 commits)
[NET]: Fix more per-cpu typos
[SECURITY]: Fix build with CONFIG_SECURITY disabled.
[I/OAT]: Remove CPU hotplug lock from net_dma_rebalance
[DECNET]: Fix for routing bug
[AF_UNIX]: Kernel memory leak fix for af_unix datagram getpeersec patch
[NET]: skb_queue_lock_key() is no longer used.
[NET]: Remove lockdep_set_class() call from skb_queue_head_init().
[IPV6]: SNMPv2 "ipv6IfStatsOutFragCreates" counter error
[IPV6]: SNMPv2 "ipv6IfStatsInHdrErrors" counter error
[NET]: Kill the WARN_ON() calls for checksum fixups.
[NETFILTER]: xt_hashlimit/xt_string: missing string validation
[NETFILTER]: SIP helper: expect RTP streams in both directions
[E1000]: Convert to netdev_alloc_skb
[TG3]: Convert to netdev_alloc_skb
[NET]: Add netdev_alloc_skb().
[TCP]: Process linger2 timeout consistently.
[SECURITY] secmark: nul-terminate secdata
[NET] infiniband: Cleanup ib_addr module to use the netevents
[NET]: Core net changes to generate netevents
[NET]: Network Event Notifier Mechanism.
...
show more ...
|
| #
9cac2c35 |
| 30-Jul-2006 |
David S. Miller <davem@davemloft.net> |
[ATALK]: Make CONFIG_DEV_APPLETALK a tristate.
Otherwise we allow building appletalk drivers in-kernel when
CONFIG_ATALK is modular. That doesn't work because these drivers use
symbols such as "all
[ATALK]: Make CONFIG_DEV_APPLETALK a tristate.
Otherwise we allow building appletalk drivers in-kernel when
CONFIG_ATALK is modular. That doesn't work because these drivers use
symbols such as "alloc_talkdev" which is exported from code built
by CONFIG_ATALK.
Noticed by Toralf Förster.
Signed-off-by: David S. Miller <davem@davemloft.net>
show more ...
|
|
Revision tags: v2.6.18-rc3, v2.6.18-rc2, v2.6.18-rc1, v2.6.17, v2.6.17-rc6, v2.6.17-rc5, v2.6.17-rc4, v2.6.17-rc3, v2.6.17-rc2, v2.6.17-rc1, 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 |
|
| #
bdf242ee |
| 29-Jul-2005 |
Dave Airlie <airlied@starflyer.(none)> |
Merge ../linux-2.6/
|
|
Revision tags: v2.6.13-rc4 |
|
| #
08cd84c8 |
| 13-Jul-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge /spare/repo/netdev-2.6 branch 'ieee80211'
|
| #
c5147207 |
| 13-Jul-2005 |
Anton Altaparmakov <aia21@cantab.net> |
Automatic merge with /usr/src/ntfs-2.6.git.
|
| #
327309e8 |
| 13-Jul-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.
|
| #
99ad25a3 |
| 13-Jul-2005 |
Tony Luck <tony.luck@intel.com> |
Auto merge with /home/aegl/GIT/linus
|
| #
30beab14 |
| 13-Jul-2005 |
David Woodhouse <dwmw2@shinybook.infradead.org> |
Merge with /shiny/git/linux-2.6/.git
|
| #
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>
|
| #
1b3035b7 |
| 13-Jul-2005 |
Thomas Gleixner <tglx@tglx.tec.linutronix.de> |
Merge with rsync://fileserver/linux
|
|
Revision tags: v2.6.13-rc3 |
|
| #
c27510c0 |
| 12-Jul-2005 |
Steve French <sfrench@hera.kernel.org> |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|
| #
9ffc7a0e |
| 12-Jul-2005 |
Linus Torvalds <torvalds@g5.osdl.org> |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
|
| #
6a2e9b73 |
| 11-Jul-2005 |
Sam Ravnborg <sam@ravnborg.org> |
[NET]: move config options out to individual protocols
Move the protocol specific config options out to the specific protocols.
With this change net/Kconfig now starts to become readable and serve a
[NET]: move config options out to individual protocols
Move the protocol specific config options out to the specific protocols.
With this change net/Kconfig now starts to become readable and serve as a
good basis for further re-structuring.
The menu structure is left almost intact, except that indention is
fixed in most cases. Most visible are the INET changes where several
"depends on INET" are replaced with a single ifdef INET / endif pair.
Several new files were created to accomplish this change - they are
small but serve the purpose that config options are now distributed
out where they belongs.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
show more ...
|
|
Revision tags: v2.6.13-rc2, v2.6.13-rc1, v2.6.12 |
|
| #
f2cbb4f0 |
| 15-Jun-2005 |
Tony Luck <tony.luck@intel.com> |
Auto merge with /home/aegl/GIT/linus
|
|
Revision tags: v2.6.12-rc6, v2.6.12-rc5 |
|
| #
ad34ea2c |
| 20-May-2005 |
James Bottomley <jejb@titanic.(none)> |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
|
|
Revision tags: v2.6.12-rc4 |
|
| #
bfd4bda0 |
| 05-May-2005 |
David Woodhouse <dwmw2@shinybook.infradead.org> |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|
| #
36050271 |
| 04-May-2005 |
Anton Altaparmakov <aia21@cantab.net> |
Merge with /usr/src/ntfs-2.6.git
|
| #
ddf3e298 |
| 04-May-2005 |
Dave Kleikamp <shaggy@kleikamp.(none)> |
Merge with /home/shaggy/git/linus-clean/
|
| #
a5532606 |
| 03-May-2005 |
Al Viro <viro@www.linux.org.uk> |
[PATCH] ISA DMA Kconfig fixes - part 3
Drivers that expect ISA DMA API are marked as such in Kconfig.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <
[PATCH] ISA DMA Kconfig fixes - part 3
Drivers that expect ISA DMA API are marked as such in Kconfig.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
show more ...
|
|
Revision tags: v2.6.12-rc3, v2.6.12-rc2 |
|
| #
1da177e4 |
| 16-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 ...
|