History log of /linux/net/sctp/Makefile (Results 151 – 175 of 192)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
# 1f782fee 24-May-2010 Paul Mundt <lethal@linux-sh.org>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6


# cf9b59e9 22-May-2010 Grant Likely <grant.likely@secretlab.ca>

Merge remote branch 'origin' into secretlab/next-devicetree

Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
drivers/i2c/bus

Merge remote branch 'origin' into secretlab/next-devicetree

Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
drivers/i2c/busses/i2c-cpm.c
drivers/i2c/busses/i2c-mpc.c
drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

show more ...


# 19fdb9ee 22-May-2010 NeilBrown <neilb@suse.de>

Merge commit '3ff195b011d7decf501a4d55aeed312731094796' into for-linus

Conflicts:
drivers/md/md.c

- Resolved conflict in md_update_sb
- Added extra 'NULL' arg to new instance of sysfs_get_dirent.

Merge commit '3ff195b011d7decf501a4d55aeed312731094796' into for-linus

Conflicts:
drivers/md/md.c

- Resolved conflict in md_update_sb
- Added extra 'NULL' arg to new instance of sysfs_get_dirent.

Signed-off-by: NeilBrown <neilb@suse.de>

show more ...


# ee9a3607 21-May-2010 Jens Axboe <jens.axboe@oracle.com>

Merge branch 'master' into for-2.6.35

Conflicts:
fs/ext3/fsync.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>


# f8965467 21-May-2010 Linus Torvalds <torvalds@linux-foundation.org>

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1674 commits)
qlcnic: adding co maintainer
ixgbe: add

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1674 commits)
qlcnic: adding co maintainer
ixgbe: add support for active DA cables
ixgbe: dcb, do not tag tc_prio_control frames
ixgbe: fix ixgbe_tx_is_paused logic
ixgbe: always enable vlan strip/insert when DCB is enabled
ixgbe: remove some redundant code in setting FCoE FIP filter
ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp
ixgbe: fix header len when unsplit packet overflows to data buffer
ipv6: Never schedule DAD timer on dead address
ipv6: Use POSTDAD state
ipv6: Use state_lock to protect ifa state
ipv6: Replace inet6_ifaddr->dead with state
cxgb4: notify upper drivers if the device is already up when they load
cxgb4: keep interrupts available when the ports are brought down
cxgb4: fix initial addition of MAC address
cnic: Return SPQ credit to bnx2x after ring setup and shutdown.
cnic: Convert cnic_local_flags to atomic ops.
can: Fix SJA1000 command register writes on SMP systems
bridge: fix build for CONFIG_SYSFS disabled
ARCNET: Limit com20020 PCI ID matches for SOHARD cards
...

Fix up various conflicts with pcmcia tree drivers/net/
{pcmcia/3c589_cs.c, wireless/orinoco/orinoco_cs.c and
wireless/orinoco/spectrum_cs.c} and feature removal
(Documentation/feature-removal-schedule.txt).

Also fix a non-content conflict due to pm_qos_requirement getting
renamed in the PM tree (now pm_qos_request) in net/mac80211/scan.c

show more ...


Revision tags: v2.6.34
# 1e4b1057 10-May-2010 Patrick McHardy <kaber@trash.net>

Merge branch 'master' of /repos/git/net-next-2.6

Conflicts:
net/bridge/br_device.c
net/bridge/br_forward.c

Signed-off-by: Patrick McHardy <kaber@trash.net>


Revision tags: v2.6.34-rc7
# f5460618 04-May-2010 David S. Miller <davem@davemloft.net>

Merge branch 'net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vxy/lksctp-dev

Add missing linux/vmalloc.h include to net/sctp/probe.c

Signed-off-by: David S. Miller <davem@davemloft.net>


# 787a51a0 01-May-2010 Wei Yongjun <yjwei@cn.fujitsu.com>

sctp: implement sctp association probing module

This patch implement sctp association probing module, the module
will be called sctp_probe.

This module allows for capturing the changes to SCTP asso

sctp: implement sctp association probing module

This patch implement sctp association probing module, the module
will be called sctp_probe.

This module allows for capturing the changes to SCTP association
state in response to incoming packets. It is used for debugging
SCTP congestion control algorithms.

Usage:
$ modprobe sctp_probe [full=n] [port=n] [bufsize=n]
$ cat /proc/net/sctpprobe

The output format is:
TIME ASSOC LPORT RPORT MTU RWND UNACK <REMOTE-ADDR STATE CWND SSTHRESH INFLIGHT PARTIAL_BYTES_ACKED MTU> ...

The output will be like this:
9.226086 c4064c48 9000 8000 1500 53352 1 *192.168.0.19 1 4380 54784 1252 0 1500
9.287195 c4064c48 9000 8000 1500 45144 5 *192.168.0.19 1 5880 54784 6500 0 1500
9.289130 c4064c48 9000 8000 1500 42724 5 *192.168.0.19 1 7380 54784 6500 0 1500
9.620332 c4064c48 9000 8000 1500 48284 4 *192.168.0.19 1 8880 54784 5200 0 1500
......

Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>

show more ...


Revision tags: v2.6.34-rc6, v2.6.34-rc5, v2.6.34-rc4, v2.6.34-rc3, v2.6.34-rc2, v2.6.34-rc1, v2.6.33, v2.6.33-rc8, v2.6.33-rc7, v2.6.33-rc6, v2.6.33-rc5, v2.6.33-rc4, v2.6.33-rc3, v2.6.33-rc2, v2.6.33-rc1, v2.6.32, v2.6.32-rc8, v2.6.32-rc7, v2.6.32-rc6, v2.6.32-rc5, v2.6.32-rc4, v2.6.32-rc3, v2.6.32-rc1, v2.6.32-rc2, v2.6.31, v2.6.31-rc9, v2.6.31-rc8, v2.6.31-rc7, v2.6.31-rc6, v2.6.31-rc5, v2.6.31-rc4, v2.6.31-rc3, v2.6.31-rc2, v2.6.31-rc1, v2.6.30, v2.6.30-rc8, v2.6.30-rc7, v2.6.30-rc6, v2.6.30-rc5, v2.6.30-rc4, v2.6.30-rc3, v2.6.30-rc2, v2.6.30-rc1, v2.6.29, v2.6.29-rc8, v2.6.29-rc7, v2.6.29-rc6, v2.6.29-rc5, v2.6.29-rc4, v2.6.29-rc3, v2.6.29-rc2, v2.6.29-rc1, v2.6.28, v2.6.28-rc9, v2.6.28-rc8, v2.6.28-rc7, v2.6.28-rc6, v2.6.28-rc5, v2.6.28-rc4, v2.6.28-rc3
# 7a9787e1 28-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks


Revision tags: v2.6.28-rc2, v2.6.28-rc1
# b2aaf8f7 15-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into stackprotector

Conflicts:
arch/x86/kernel/Makefile
include/asm-x86/pda.h


Revision tags: v2.6.27, v2.6.27-rc9
# f68ec0c2 03-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.27-rc8' into x86/setup


# d6d5aeb6 02-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.27-rc8' into genirq


Revision tags: v2.6.27-rc8, v2.6.27-rc7, v2.6.27-rc6, v2.6.27-rc5, v2.6.27-rc4, v2.6.27-rc3
# c4c0c56a 11-Aug-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into core/rcu


# af7a5356 08-Aug-2008 Ben Dooks <ben-linux@fluff.org>

Merge http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into for-rmk


Revision tags: v2.6.27-rc2
# 85e9ca33 31-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into timers/hpet


# bc588df7 30-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'x86/core' into x86/xsave


# 9fec6060 30-Jul-2008 Anton Vorontsov <cbouatmailru@gmail.com>

Merge branch 'master' of /home/cbou/linux-2.6

Conflicts:

drivers/power/Kconfig
drivers/power/Makefile


Revision tags: v2.6.27-rc1
# cb28a1bb 29-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into core/generic-dma-coherent

Conflicts:

arch/x86/Kconfig

Signed-off-by: Ingo Molnar <mingo@elte.hu>


# eda3d8f5 27-Jul-2008 Haavard Skinnemoen <haavard.skinnemoen@atmel.com>

Merge commit 'upstream/master'


# ff877ea8 25-Jul-2008 David Woodhouse <David.Woodhouse@intel.com>

Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6


# 0e2f65ee 25-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/pebs

Conflicts:

arch/x86/Kconfig.cpu
arch/x86/kernel/cpu/intel.c
arch/x86/kernel/setup_64.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>


# 28afe961 24-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into tracing/urgent


# 9063974c 23-Jul-2008 Jiri Kosina <jkosina@suse.cz>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6


# 8725f25a 22-Jul-2008 Benjamin Herrenschmidt <benh@kernel.crashing.org>

Merge commit 'origin/master'

Manually fixed up:

drivers/net/fs_enet/fs_enet-main.c


# 76c3bb15 22-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/x2apic


12345678