Eric Dumazet
76e3cc126b
codel: Controlled Delay AQM ...
An implementation of CoDel AQM, from Kathleen Nichols and Van Jacobson.
http://queue.acm.org/detail.cfm?id=2209336
This AQM main input is no longer queue size in bytes or packets, but the
delay packets stay in (FIFO) queue.
As we don't have infinite memory, we still can drop packets in enqueue()
in case of massive load, but mean of CoDel is to drop packets in
dequeue(), using a control law based on two simple parameters :
target : target sojourn time (default 5ms)
interval : width of moving time window (default 100ms)
Based on initial work from Dave Taht.
Refactored to help future codel inclusion as a plugin for other linux
qdisc (FQ_CODEL, ...), like RED.
include/net/codel.h contains codel algorithm as close as possible than
Kathleen reference.
net/sched/sch_codel.c contains the linux qdisc specific glue.
Separate structures permit a memory efficient implementation of fq_codel
(to be sent as a separate work) : Each flow has its own struct
codel_vars.
timestamps are taken at enqueue() time with 1024 ns precision, allowing
a range of 2199 seconds in queue, and 100Gb links support. iproute2 uses
usec as base unit.
Selected packets are dropped, unless ECN is enabled and packets can get
ECN mark instead.
Tested from 2Mb to 10Gb speeds with no particular problems, on ixgbe and
tg3 drivers (BQL enabled).
Usage: tc qdisc ... codel [ limit PACKETS ] [ target TIME ]
[ interval TIME ] [ ecn ]
qdisc codel 10: parent 1:1 limit 2000p target 3.0ms interval 60.0ms ecn
Sent 13347099587 bytes 8815805 pkt (dropped 0, overlimits 0 requeues 0)
rate 202365Kbit 16708pps backlog 113550b 75p requeues 0
count 116 lastcount 98 ldelay 4.3ms dropping drop_next 816us
maxpacket 1514 ecn_mark 84399 drop_overlimit 0
CoDel must be seen as a base module, and should be used keeping in mind
there is still a FIFO queue. So a typical setup will probably need a
hierarchy of several qdiscs and packet classifiers to be able to meet
whatever constraints a user might have.
One possible example would be to use fq_codel, which combines Fair
Queueing and CoDel, in replacement of sfq / sfq_red.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Dave Taht <dave.taht@bufferbloat.net>
Cc: Kathleen Nichols <nichols@pollere.com>
Cc: Van Jacobson <van@pollere.net>
Cc: Tom Herbert <therbert@google.com>
Cc: Matt Mathis <mattmathis@google.com>
Cc: Yuchung Cheng <ycheng@google.com>
Cc: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-05-10 23:35:02 -04:00
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
2012-04-15 17:35:19 -07:00
bcma: add support for on-chip OTP memory used for SPROM storage
2012-03-06 15:16:18 -05:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
2012-03-28 10:01:29 -07:00
mxs-dma : move the mxs dma.h to a more common place
2012-03-27 00:37:23 +01:00
HSI: hsi: Rework hsi_event interface
2012-04-23 14:23:32 +03:00
mfd: Convert twl6040 to i2c driver, and separate it from twl core
2012-04-16 16:45:34 +02:00
Input: ili210x - add support for Ilitek ILI210x based touchscreens
2012-03-17 12:20:44 -07:00
mfd: Fix modular builds of rc5t583 regulator support
2012-04-16 21:27:07 +02:00
net/mlx4_core: set port QoS attributes
2012-04-05 05:08:03 -04:00
mmc: remove MMC bus legacy suspend/resume method
2012-04-20 20:30:19 -04:00
MTD merge for 3.4
2012-03-30 17:31:56 -07:00
netfilter: hashlimit: byte-based limit mode
2012-05-09 13:04:57 +02:00
netfilter: remove ip_queue support
2012-05-08 20:25:42 +02:00
netfilter: ip6_tables: add flags parameter to ipv6_find_hdr()
2012-05-09 12:53:47 +02:00
nfsd: include cld.h in the headers_install target
2012-04-16 15:19:12 -04:00
pinctrl: include <linux/bug.h> to prevent compile errors
2012-04-11 09:31:01 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-04-10 14:30:45 -04:00
Add I2C driver for Summit Microelectronics SMB347 Battery Charger.
2012-03-26 20:41:01 +04:00
md: Use existed macros instead of numbers
2012-03-13 11:21:23 +11:00
regulator: Fixes for -rc1
2012-04-04 10:09:30 -07:00
spi: fix spi.h kernel-doc warning
2012-04-27 11:03:38 -06:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
Merge nfs containerization work from Trond's tree
2012-03-26 11:48:54 -04:00
USB: EHCI: fix crash during suspend on ASUS computers
2012-04-24 13:55:43 -07:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
apple_bl: Add register/unregister functions
2012-03-22 09:31:55 -04:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
atomic: Allow atomic_inc_not_zero to be overridden
2012-03-07 17:06:08 +11:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
constify path argument of audit_log_d_path()
2012-03-20 21:29:40 -04:00
__register_binfmt() made void
2012-03-20 21:29:46 -04:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
bitops: introduce for_each_clear_bit()
2012-03-23 16:58:34 -07:00
block: use lockdep_assert_held for queue locking
2012-03-30 12:33:28 +02:00
bug: consolidate BUILD_BUG_ON with other bug code
2012-03-04 17:54:35 -05:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
cgroup: revert ss_id_lock to spinlock
2012-03-21 17:55:01 -07:00
clk: basic clock hardware types
2012-03-16 20:35:02 +00:00
clk: basic clock hardware types
2012-03-16 20:35:02 +00:00
clk: introduce the common clock framework
2012-03-16 20:35:01 +00:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
vmscan: only defer compaction for failed order and higher
2012-03-21 17:54:56 -07:00
Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-03-29 18:12:23 -07:00
include/ and checkpatch: prefer __scanf to __attribute__((format(scanf,...)
2012-03-23 16:58:36 -07:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
cpuidle: power_usage should be declared signed integer
2012-03-30 03:23:30 -04:00
cpumask: remove old cpu_*_map.
2012-03-29 15:38:31 +10:30
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-03-29 14:46:05 -07:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
crc32: bolt on crc32c
2012-03-23 16:58:38 -07:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
crypto: user - Fix size of netlink dump message
2012-03-29 19:52:48 +08:00
vfs: d_alloc_root() gone
2012-03-20 21:29:37 -04:00
net/dcb: Add an optional max rate attribute
2012-04-05 05:08:04 -04:00
inet: makes syn_ack_timeout mandatory
2012-04-14 15:24:26 -04:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
debugfs-related mode_t whack-a-mole
2012-03-20 21:29:53 -04:00
PM / devfreq: add relation of recommended frequency.
2012-03-17 21:51:34 +01:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-03-21 18:55:10 -07:00
common: DMA-mapping: add NON-CONSISTENT attribute
2012-03-28 16:36:44 +02:00
Merge branch 'for-linus-3.4' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf
2012-03-28 15:02:41 -07:00
Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
2012-04-04 17:13:43 -07:00
dmaengine-fixes for 3.4-rc3
2012-04-10 15:30:16 -07:00
Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac
2012-03-28 14:24:40 -07:00
efi: Add new variable attributes
2012-04-30 15:30:18 -07:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
drivercore: Add driver probe deferral mechanism
2012-03-08 11:53:13 -08:00
etherdevice.h: Add ether_addr_equal_64bits
2012-05-10 23:33:01 -04:00
ethtool: Extend the ethtool API to obtain plugin module eeprom data
2012-05-10 02:22:17 +01:00
migrate ext2_fs.h guts to fs/ext2/ext2.h
2012-03-31 16:03:16 -04:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
vfs: drop_file_write_access() made static
2012-03-20 21:29:32 -04:00
filter: add XOR operation
2012-04-03 18:36:20 -04:00
firewire: allow explicit flushing of iso packet completions
2012-03-18 22:15:39 +01:00
firewire: restore the device.h include in linux/firewire.h
2012-04-02 14:41:27 -07:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
perf: Add ifdef to remove unused enum switch warnings
2012-03-14 08:47:58 -04:00
fuse: use flexible array in fuse.h
2012-04-12 12:57:08 +02:00
block: Fix NULL pointer dereference in sd_revalidate_disk
2012-03-02 10:38:33 +01:00
ARM: pxa: fix gpio wakeup setting
2012-04-27 10:46:45 +08:00
GPIO changes for v3.4
2012-03-28 14:08:46 -07:00
Input: gpio_keys - add support for interrupt only keys
2012-03-19 17:56:18 -07:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
thp: add HPAGE_PMD_* definitions for !CONFIG_TRANSPARENT_HUGEPAGE
2012-03-21 17:55:02 -07:00
hugetlbfs: fix alignment of huge page requests
2012-03-21 17:54:59 -07:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
net/hyperv: Add flow control based on hi/low watermark
2012-04-03 17:47:15 -04:00
i2c: Update the FSF address
2012-03-26 21:47:19 +02:00
i2c: Update the FSF address
2012-03-26 21:47:19 +02:00
i2c: Update the FSF address
2012-03-26 21:47:19 +02:00
i2c: Update the FSF address
2012-03-26 21:47:19 +02:00
i2c: Update the FSF address
2012-03-26 21:47:19 +02:00
i2c: Update the FSF address
2012-03-26 21:47:19 +02:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
mac80211: Set the correct values for hwmp (1) and airtimeLinkMetric (1)
2012-04-16 14:19:29 -04:00
eql: dont rely on HZ=100
2012-03-27 22:45:26 -04:00
macvlan: add FDB bridge ops and macvlan flags
2012-04-15 13:06:05 -04:00
macvlan: add FDB bridge ops and macvlan flags
2012-04-15 13:06:05 -04:00
ppp: Move ioctl definitions from if_ppp.h to new ppp-ioctl.h
2012-03-04 20:41:38 -05:00
net/l2tp: add support for L2TP over IPv6 UDP
2012-04-28 22:21:51 -04:00
pppox: Replace __attribute__((packed)) in if_pppox.h
2012-05-01 09:30:55 -04:00
team: allow to enable/disable ports
2012-04-21 16:26:33 -04:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
arp: allow arp processing to honor per interface arp_accept sysctl
2012-03-16 23:00:20 -07:00
cpuset: mm: reduce large amounts of memory barrier related damage v3
2012-03-21 17:54:59 -07:00
Merge branch 'for-next' of github.com:rydberg/linux into next
2012-03-09 10:56:35 -08:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
ipvs: always update some of the flags bits in backup
2012-05-08 19:38:31 +02:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
irq: Add IRQ_TYPE_DEFAULT for use by PIC drivers
2012-04-23 11:04:29 +10:00
irq_domain: Move irq_virq_count into NOMAP revmap
2012-04-12 00:37:48 -06:00
ppp: Replace uses of <linux/if_ppp.h> with <linux/ppp-ioctl.h>
2012-03-04 20:41:38 -05:00
jbd2: cleanup journal tail after transaction commit
2012-03-13 22:45:38 -04:00
jbd2: remove bh_state lock from checkpointing code
2012-03-13 22:45:25 -04:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
vt:tackle kbd_table
2012-03-08 10:50:35 -08:00
Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi
2012-04-02 09:50:40 -07:00
kconfig: fix IS_ENABLED to not require all options to be defined
2012-04-12 18:35:58 -07:00
pagemap: export KPF_THP
2012-03-21 17:54:57 -07:00
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-03-31 13:34:04 -07:00
NFS client updates for Linux 3.4
2012-03-23 08:53:47 -07:00
vt:tackle kbd_table
2012-03-08 10:50:35 -08:00
x86,kgdb: Fix DEBUG_RODATA limitation using text_poke()
2012-03-29 17:41:25 -05:00
PM / Sleep: Mitigate race between the freezer and request_firmware()
2012-03-28 23:30:28 +02:00
kmsg_dump: don't run on non-error paths by default
2012-03-05 15:49:42 -08:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
KVM: Allow host IRQ sharing for assigned PCI 2.3 devices
2012-03-08 14:11:36 +02:00
KVM: unmap pages from the iommu when slots are removed
2012-04-11 22:55:25 -03:00
l2tp: introduce L2TPv3 IP encapsulation support for IPv6
2012-05-01 09:30:55 -04:00
leds-lm3530: support pwm input mode
2012-03-23 16:58:35 -07:00
drivers/leds/leds-lp5521.c: support led pattern data
2012-03-23 16:58:34 -07:00
[SCSI] libsas, libata: fix start of life for a sas ata_port
2012-04-23 12:11:47 +01:00
Add #includes needed to permit the removal of asm/system.h
2012-03-28 18:30:03 +01:00
backlight: new backlight driver for LP855x devices
2012-03-23 16:58:33 -07:00
lp8727_charger: Correct typos on the comment
2012-03-26 20:40:59 +04:00
lsm_audit: don't specify the audit pre/post callbacks in 'struct common_audit_data'
2012-04-03 09:49:59 -07:00
magic.h: move some FS magic numbers into magic.h
2012-03-23 16:58:31 -07:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
math: Introduce div64_long
2012-03-15 21:41:34 +01:00
netdev/of/phy: Add MDIO bus multiplexer support.
2012-05-07 22:58:09 -04:00
mdio.h: Include linux/types.h
2012-03-03 15:04:45 -05:00
memcg: fix performance of mem_cgroup_begin_update_page_stat()
2012-03-21 17:55:02 -07:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
mm: replace PAGE_MIGRATION with IS_ENABLED(CONFIG_MIGRATION)
2012-03-21 17:54:57 -07:00
mISDN: Make layer1 timer 3 value configurable
2012-05-04 11:55:05 -04:00
mISDN: Help to identify the card
2012-05-04 11:56:19 -04:00
kill mm argument of vm_munmap()
2012-04-21 01:58:20 -04:00
vmscan: only defer compaction for failed order and higher
2012-03-21 17:54:56 -07:00
remoteproc/rpmsg: new subsystem
2012-03-27 16:30:09 -07:00
module: move __module_get and try_module_get() out of line.
2012-03-26 12:50:52 +10:30
params: <level>_initcall-like kernel parameters
2012-03-26 12:50:51 +10:30
[SCSI] st: expand ability to write immediate filemarks
2012-03-27 08:26:34 +01:00
net: add generic PF_BRIDGE:RTM_ FDB hooks
2012-04-15 13:06:04 -04:00
net: make GRO aware of skb->head_frag
2012-04-30 21:35:49 -04:00
net: Delete all remaining instances of ctl_path
2012-04-20 21:22:30 -04:00
set fake_rtable's dst to NULL to avoid kernel Oops
2012-04-24 00:16:24 -04:00
netfilter: remove ip_queue support
2012-05-08 20:25:42 +02:00
NFC: Add a target lost netlink event
2012-04-12 15:10:33 -04:00
Merge nfs containerization work from Trond's tree
2012-03-26 11:48:54 -04:00
NFS: Fix more NFS debug related build warnings
2012-03-21 09:31:44 -04:00
NFS: Request fh_expire_type attribute in "server caps" operation
2012-03-02 17:18:10 -05:00
NFS: Undo changes to idmap.h
2012-03-05 15:26:47 -05:00
NFSv4.1: Clean ups and bugfixes for the pNFS read/writeback/commit code
2012-03-17 11:09:33 -04:00
NFSv4: Ensure we do not reuse open owner names
2012-04-20 23:14:28 -04:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
cfg80211: add channel switch notify event
2012-04-11 16:23:59 -04:00
nmi watchdog: do not use cpp symbol in Kconfig
2012-03-23 16:58:31 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-03-28 14:41:36 -07:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
netdev/of/phy: New function: of_mdio_find_bus().
2012-05-07 22:58:09 -04:00
of/mtd/nand: add generic bindings and helpers
2012-03-15 23:28:19 +08:00
dt: fix twl4030 for non-dt compile on x86
2012-03-05 08:09:09 -07:00
mm, oom: force oom kill on sysrq+f
2012-03-21 17:54:58 -07:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
padata: Fix race on sequence number wrap
2012-03-14 17:25:56 +08:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
memcg: remove PCG_FILE_MAPPED
2012-03-21 17:55:01 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-03-23 14:02:12 -07:00
tg3: Recode PCI MRRS adjustment as a PCI quirk
2012-03-04 20:54:01 -05:00
percpu: fix __this_cpu_{sub,inc,dec}_return() definition
2012-03-04 09:34:15 -08:00
perf: Move mmap page data_head offset assertion out of header
2012-03-24 08:46:59 +01:00
ethtool: Introduce a method for getting time stamping capabilities.
2012-04-04 05:28:45 -04:00
pidns: add reboot_pid_ns() to handle the reboot syscall
2012-03-28 17:14:36 -07:00
pipes: add a "packetized pipe" mode for writing
2012-04-29 13:12:42 -07:00
codel: Controlled Delay AQM
2012-05-10 23:35:02 -04:00
Merge branch 'pm-qos'
2012-03-16 21:49:24 +01:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
PM / QoS: add pm_qos_update_request_timeout() API
2012-03-28 23:31:24 +02:00
PM / Sleep: Add more wakeup source initialization routines
2012-03-04 23:08:46 +01:00
poll: add poll_requested_events() and poll_does_not_wait() functions
2012-03-23 16:58:38 -07:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
ppp: Change copyright notices from ANU to me
2012-03-04 20:41:38 -05:00
ppp: Move ioctl definitions from if_ppp.h to new ppp-ioctl.h
2012-03-04 20:41:38 -05:00
ppp: Change copyright notices from ANU to me
2012-03-04 20:41:38 -05:00
prctl: add PR_{SET,GET}_CHILD_SUBREAPER to allow simple process supervision
2012-03-23 16:58:32 -07:00
driver core merge for 3.4-rc1
2012-03-20 11:16:20 -07:00
ptp: Add a method for obtaining the device index.
2012-04-04 05:28:45 -04:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
fs: initial qnx6fs addition
2012-03-20 21:29:38 -04:00
radix-tree: introduce bit-optimized iterator
2012-03-28 17:14:37 -07:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
move private bits of reiserfs_fs.h to fs/reiserfs/reiserfs.h
2012-03-20 21:29:43 -04:00
take private bits of reiserfs_xattr.h to fs/reiserfs/xattr.h
2012-03-20 21:29:42 -04:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
remoteproc: remove the hardcoded vring alignment
2012-03-06 19:14:37 +02:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
rmap: remove __anon_vma_link() declaration
2012-03-21 17:54:57 -07:00
rtc: Provide flag for rtc devices that don't support UIE
2012-03-15 18:23:10 -07:00
net: add generic PF_BRIDGE:RTM_ FDB hooks
2012-04-15 13:06:04 -04:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
DMA: sa11x0: add SA-11x0 DMA driver
2012-03-07 11:32:21 +00:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2012-03-21 13:25:04 -07:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
TTY: serial, simplify ASYNC_USR_MASK
2012-03-08 11:38:50 -08:00
serial/8250_pci: add a "force background timer" flag and use it for the "kt" serial port
2012-04-09 10:38:30 -07:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
sh: remove clk_ops
2012-03-12 22:19:13 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-05-07 23:35:40 -04:00
slab: introduce kmalloc_array()
2012-03-06 11:01:33 +02:00
Merge branch 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux
2012-03-28 15:04:26 -07:00
smp: add func to IPI cpus based on parameter func
2012-03-28 17:14:35 -07:00
tcp: reduce out_of_order memory use
2012-03-19 16:53:08 -04:00
net: sock_diag_handler structs can be const
2012-04-25 20:46:59 -04:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
locking/kconfig: Simplify INLINE_SPIN_UNLOCK usage
2012-03-23 13:18:57 +01:00
do not export kernel's NULL #define to userspace
2012-04-14 07:47:49 -07:00
stmmac: use custom init/exit functions in pm ops
2012-04-19 20:08:44 -04:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
memcg swap: use mem_cgroup_uncharge_swap fix
2012-04-05 15:25:51 -07:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
x86, acpi, tboot: Have a ACPI os prepare sleep instead of calling tboot_sleep.
2012-03-13 14:06:33 -04:00
tcp: early retransmit: delayed fast retransmit
2012-05-02 20:56:10 -04:00
Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-03-29 18:12:23 -07:00
ntp: Fix leap-second hrtimer livelock
2012-03-22 19:43:43 -07:00
constify path argument of trace_seq_path()
2012-03-20 21:29:40 -04:00
ptrace: the killed tracee should not enter the syscall
2012-03-23 16:58:40 -07:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
TTY: tty_driver, document tty->ops->shutdown limitation
2012-03-08 11:38:51 -08:00
irq: Kill pointless irqd_to_hw export
2012-04-10 22:39:17 -06:00
USB: dynamically allocate usb_device children pointers instead of using a fix array
2012-03-13 14:24:07 -07:00
vgaarb.h: fix build warnings
2012-04-11 09:36:00 +01:00
[media] V4L: Improve the selection API documentation
2012-03-19 15:33:24 -03:00
virtio: drop thaw PM operation
2012-03-31 08:09:50 +05:30
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
remoteproc/rpmsg: new subsystem
2012-03-27 16:30:09 -07:00
virtio-net: send gratuitous packets when needed
2012-04-15 03:23:31 -04:00
mm: fix up the vmscan stat in vmstat
2012-04-25 21:26:33 -07:00
vt:tackle kbd_table
2012-03-08 10:50:35 -08:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
watchdog: Add support for WDIOC_GETTIMELEFT IOCTL in watchdog core
2012-03-27 20:15:37 +02:00
Block: use a freezable workqueue for disk-event polling
2012-03-02 10:51:00 +01:00
writeback: fix typo in the writeback_control comment
2012-03-07 16:08:46 +01:00
