Herbert Xu
33dccbb050
tun: Limit amount of queued packets per device ...
Unlike a normal socket path, the tuntap device send path does
not have any accounting. This means that the user-space sender
may be able to pin down arbitrary amounts of kernel memory by
continuing to send data to an end-point that is congested.
Even when this isn't an issue because of limited queueing at
most end points, this can also be a problem because its only
response to congestion is packet loss. That is, when those
local queues at the end-point fills up, the tuntap device will
start wasting system time because it will continue to send
data there which simply gets dropped straight away.
Of course one could argue that everybody should do congestion
control end-to-end, unfortunately there are people in this world
still hooked on UDP, and they don't appear to be going away
anywhere fast. In fact, we've always helped them by performing
accounting in our UDP code, the sole purpose of which is to
provide congestion feedback other than through packet loss.
This patch attempts to apply the same bandaid to the tuntap device.
It creates a pseudo-socket object which is used to account our
packets just as a normal socket does for UDP. Of course things
are a little complex because we're actually reinjecting traffic
back into the stack rather than out of the stack.
The stack complexities however should have been resolved by preceding
patches. So this one can simply start using skb_set_owner_w.
For now the accounting is essentially disabled by default for
backwards compatibility. In particular, we set the cap to INT_MAX.
This is so that existing applications don't get confused by the
sudden arrival EAGAIN errors.
In future we may wish (or be forced to) do this by default.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2009-02-05 21:25:32 -08:00
byteorder: only use linux/swab.h
2009-01-06 18:10:26 -08:00
headers_check fix: can/bcm.h
2009-01-30 19:50:25 +05:30
headers_check fix: dvb/video.h
2009-01-30 19:59:53 +05:30
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2009-01-06 17:14:01 -08:00
NLM: Rewrite IPv4 privileged requester's check
2009-01-06 11:53:56 -05:00
regulator: PCF50633 pmic driver
2009-01-11 01:34:25 +01:00
mlx4_core: Add support for multiple completion event vectors
2008-12-22 07:15:03 -08:00
mmc: Add mmc_vddrange_to_ocrmask() helper function
2008-12-31 18:18:13 +01:00
Merge git://git.infradead.org/mtd-2.6
2009-01-09 12:37:15 -08:00
headers_check fix: netfilter/xt_conntrack.h
2009-01-30 20:00:47 +05:30
netfilter: ip{,6}t_policy.h should include xp_policy.h
2008-11-20 15:59:56 +01:00
netfilter: ip{,6}t_policy.h should include xp_policy.h
2008-11-20 15:59:56 +01:00
headers_check fix: nfsd/syscall.h
2009-01-30 23:30:42 +05:30
headers_check fix: raid/md_p.h
2009-01-30 23:32:45 +05:30
regulator: fix kernel-doc warnings
2009-01-08 20:10:38 +00:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
2009-02-03 12:41:58 -08:00
b43/ssb: Add SPROM8 extraction and LP-PHY detection
2009-01-29 15:59:38 -05:00
sunrpc: add sv_maxconn field to svc_serv (try #3 )
2009-01-06 11:53:47 -05:00
headers_check fix: tc_act/tc_pedit.h
2009-01-30 23:34:34 +05:30
headers_check fix: tc_ematch/tc_em_text.h
2009-01-30 23:36:36 +05:30
headers_check fix: usb/gadgetfs.h
2009-01-30 23:37:37 +05:30
uwb: remove unused include/linux/uwb/debug.h
2008-12-22 18:30:29 +00:00
wimax: export linux/wimax.h and linux/wimax/i2400m.h with headers_install
2009-01-07 10:00:22 -08:00
And here's a patch (to be applied on top of the last) which prevents
2009-01-02 10:19:37 -08:00
Merge branch 'simplify_PRT' into release
2009-01-09 03:41:08 -05:00
include of <linux/types.h> is preferred over <asm/types.h>
2009-01-15 16:39:41 -08:00
aio: make the lookup_ioctx() lockless
2008-12-29 08:29:50 +01:00
headers_check fix: linux/aio_abi.h
2009-01-30 23:38:03 +05:30
arcnet: convert to net_device_ops
2009-01-21 14:02:19 -08:00
async: Asynchronous function calls to speed up kernel boot
2009-01-07 08:45:46 -08:00
dmaengine: provide a common 'issue_pending_all' implementation
2009-01-06 11:38:14 -07:00
ide/libata: fix ata_id_is_cfa() (take 4)
2009-02-02 22:45:10 -05:00
headers_check fix: linux/atalk.h
2009-01-30 23:38:37 +05:30
ath9k: get EEPROM contents from platform data on AHB bus
2009-01-29 16:00:33 -05:00
atm: 32-bit ioctl compatibility
2008-12-03 22:12:38 -08:00
include of <linux/types.h> is preferred over <asm/types.h>
2009-01-15 16:39:41 -08:00
headers_check fix: linux/atmbr2684.h
2009-01-30 23:39:08 +05:30
atm: 32-bit ioctl compatibility
2008-12-03 22:12:38 -08:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
2009-01-09 11:52:14 -08:00
audit: validate comparison operations, store them in sane form
2009-01-04 15:14:42 -05:00
autofs4: improve parameter usage
2009-01-06 15:59:23 -08:00
headers_check fix: linux/auto_fs4.h
2009-01-30 23:39:42 +05:30
ELF: implement AT_RANDOM for glibc PRNG seeding
2009-01-08 08:31:12 -08:00
backlight: Add suspend/resume support to the backlight core
2009-01-08 15:37:43 +00:00
headers_check fix: linux/bfs_fs.h
2009-01-30 23:40:06 +05:30
fs/exec.c: make do_coredump() void
2009-01-06 15:59:29 -08:00
bio.h: If they MUST be inlined, then use __always_inline
2009-02-02 12:41:07 +01:00
bitmap: test for constant as well as small size for inline versions
2008-12-30 09:05:13 +10:30
bitmap: find_last_bit()
2009-01-01 10:12:19 +10:30
block: fix inconsistent parenthesisation of QUEUE_FLAG_DEFAULT
2009-02-02 08:43:48 +01:00
headers_check fix: linux/blktrace_api.h
2009-01-30 23:40:35 +05:30
fs: introduce bgl_lock_ptr()
2009-01-04 13:33:20 -08:00
softirq: remove useless function __local_bh_enable
2008-11-28 12:38:38 +01:00
filesystem freeze: implement generic freeze feature
2009-01-09 16:54:42 -08:00
headers_check fix: linux/capability.h
2009-01-30 23:41:27 +05:30
include of <linux/types.h> is preferred over <asm/types.h>
2009-01-15 16:39:41 -08:00
headers_check fix: linux/cdrom.h
2009-01-30 23:44:08 +05:30
cgroups: add cpu_relax() calls in css_tryget() and cgroup_clear_css_refs()
2009-01-29 18:04:45 -08:00
headers_check fix: linux/cgroupstats.h
2009-01-30 23:44:41 +05:30
hrtimers: allow the hot-unplugging of all cpus
2009-01-30 22:35:29 +01:00
com20020: Fix allyesconfig build failure.
2009-01-23 22:28:48 -08:00
[CVE-2009-0029] Move compat system call declarations to compat header file
2009-01-14 14:15:14 +01:00
compiler-gcc.h: add more comments to RELOC_HIDE
2009-01-09 16:54:41 -08:00
Disallow gcc versions 3.{0,1}
2009-01-02 12:19:34 -08:00
Disallow gcc versions 4.1.{0,1}
2009-01-02 09:29:43 -08:00
Sanitize gcc version header includes
2009-01-02 09:23:03 -08:00
connector: create connector workqueue only while needed once
2009-02-02 23:22:04 -08:00
DRM: add mode setting support
2008-12-29 17:47:23 +10:00
cpumask: convert struct cpufreq_policy to cpumask_var_t
2009-01-06 09:05:31 +01:00
cpumask: CONFIG_DISABLE_OBSOLETE_CPUMASK_FUNCTIONS
2009-01-01 10:12:30 +10:30
cpuset: remove remaining pointers to cpumask_t
2009-01-08 08:31:11 -08:00
libcrc32c: Add crc32c_le macro
2008-12-25 11:01:43 +11:00
User namespaces: set of cleanups (v2)
2008-11-24 18:57:41 -05:00
crypto: hash - Export shash through hash
2008-12-25 11:01:33 +11:00
include of <linux/types.h> is preferred over <asm/types.h>
2009-01-15 16:39:41 -08:00
shrink struct dentry
2008-12-31 18:07:38 -05:00
net: add DCNA attribute to the BCN interface for DCB
2008-12-21 20:10:29 -08:00
dccp: Initialisation and type-checking of feature sysctls
2009-01-21 14:34:05 -08:00
Fix "multiple definition of `debugfs_create_size_t'"
2009-01-26 19:21:26 -08:00
dm: support barriers on simple devices
2009-01-06 03:05:09 +00:00
Revert "driver core: create a private portion of struct device"
2009-01-09 15:06:12 -08:00
m68k: dio - Kill warn_unused_result warnings
2009-01-12 20:56:41 +01:00
headers_check fix: linux/dlm_plock.h
2009-01-30 23:45:32 +05:30
intel-iommu: fix build error with INTR_REMAP=y and DMAR=n
2009-01-04 11:00:05 +01:00
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
2009-01-26 10:13:08 -08:00
intel-iommu: kill off duplicate def of dmar_disabled
2009-01-03 11:57:35 +01:00
dmi: Fix build breakage
2009-01-28 07:50:14 -08:00
headers_check fix: linux/dn.h
2009-01-30 23:46:03 +05:30
quota: Split off quota tree handling into a separate file
2009-01-05 08:40:21 -08:00
quota: Unexport dqblk_v1.h and dqblk_v2.h
2009-01-05 08:40:25 -08:00
quota: Unexport dqblk_v1.h and dqblk_v2.h
2009-01-05 08:40:25 -08:00
atmel-mci: convert to dma_request_channel and down-level dma_slave
2009-01-06 11:38:16 -07:00
headers_check fix: linux/edd.h
2009-01-30 23:46:40 +05:30
headers_check fix: linux/efs_fs_sb.h
2009-01-30 23:47:07 +05:30
block: get rid of elevator_t typedef
2008-12-29 08:29:50 +01:00
headers_check fix: linux/elf-fdpic.h
2009-01-30 23:47:59 +05:30
headers_check fix: linux/elf.h
2009-01-30 23:48:33 +05:30
headers_check fix: linux/errqueue.h
2009-01-30 23:49:07 +05:30
eth: Declare an optimized compare_ether_addr_64bits() function
2008-11-23 23:24:32 -08:00
ethtool: Add GGRO and SGRO ops
2008-12-15 23:44:31 -08:00
ext2: tighten restrictions on inode flags
2009-01-08 08:31:00 -08:00
ext2: allocate ->s_blockgroup_lock separately
2009-01-08 08:31:00 -08:00
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
2009-01-08 17:14:59 -08:00
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
2009-01-08 17:14:59 -08:00
SLUB: failslab support
2008-12-29 11:27:46 +02:00
include of <linux/types.h> is preferred over <asm/types.h>
2009-01-15 16:39:41 -08:00
fddi: convert to new network device ops
2008-11-20 20:29:48 -08:00
filp_cachep can be static in fs/file_table.c
2008-12-31 18:07:42 -05:00
filter: add SKF_AD_NLATTR_NEST to look for nested attributes
2008-11-20 00:49:27 -08:00
filesystem freeze: implement generic freeze feature
2009-01-09 16:54:42 -08:00
take init_fs to saner place
2008-12-31 18:07:42 -05:00
gianfar: Convert gianfar to an of_platform_driver
2008-12-16 15:29:15 -08:00
ftrace: enable format arguments checking
2008-12-21 09:46:45 +01:00
tracing/function-return-tracer: change the name into function-graph-tracer
2008-11-26 01:59:45 +01:00
fuse: update interface version
2008-12-01 19:14:02 +01:00
futex: make clock selectable for FUTEX_WAIT_BITSET
2008-11-24 20:00:40 +01:00
tty_port: Add a port level carrier detect operation
2009-01-02 10:19:38 -08:00
headers_check fix: linux/genetlink.h
2009-01-30 23:49:39 +05:30
block: add one-hit cache for disk partition lookup
2008-12-29 08:29:51 +01:00
mm: remove GFP_HIGHUSER_PAGECACHE
2009-01-06 15:59:01 -08:00
headers_check fix: linux/gfs2_ondisk.h
2009-01-30 23:50:12 +05:30
Merge branch 'core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2008-12-30 16:10:19 -08:00
WAN: Convert generic HDLC drivers to netdev_ops.
2009-01-21 14:03:37 -08:00
hdlcdrv: convert to internal net_device_stats
2009-01-21 14:02:36 -08:00
headers_check fix: linux/hid.h
2009-01-30 23:50:37 +05:30
headers_check fix: linux/hiddev.h
2009-01-30 23:51:17 +05:30
HID: add phys and name ioctls to hidraw
2009-01-04 01:00:51 +01:00
Allow architectures to override copy_user_highpage()
2008-11-27 23:39:48 +00:00
hippi: convert driver to net_device_ops
2008-11-20 20:32:15 -08:00
hrtimer: removing all ur callback modes
2008-11-25 15:45:46 +01:00
mm: report the MMU pagesize in /proc/pid/smaps
2009-01-06 15:58:58 -08:00
i2c: Delete many unused adapter IDs
2009-01-26 21:19:52 +01:00
i2c: Warn on deprecated binding model use
2009-01-26 21:19:57 +01:00
ibmtr: convert to internal network_device_stats
2009-01-21 14:02:26 -08:00
headers_check fix: linux/icmpv6.h
2009-01-30 23:51:41 +05:30
IDE: fix sparse signed-ness errors with host->host_busy
2009-01-14 19:19:04 +01:00
lib/idr.c: fix rcu related race with idr_find
2008-12-01 19:55:25 -08:00
mac80211: Fix MFP Association Comeback to use Timeout Interval IE
2009-01-29 16:00:53 -05:00
WAN: Generic HDLC now uses IFF_WAN_HDLC private flag.
2009-01-21 14:03:35 -08:00
headers_check fix: linux/if_addr.h
2009-01-30 23:52:16 +05:30
headers_check fix: linux/if_addrlabel.h
2009-01-30 23:52:41 +05:30
Phonet: allocate separate ARP type for GPRS over a Phonet pipe
2008-12-17 15:47:48 -08:00
headers_check fix: linux/if_fc.h
2009-01-30 23:53:12 +05:30
net: Fix linux/if_frad.h's suitability for userspace.
2009-01-26 12:30:12 -08:00
headers_check fix: linux/if_hippi.h
2009-01-30 23:53:40 +05:30
headers_check fix: linux/if_link.h
2009-01-30 23:54:53 +05:30
headers_check fix: linux/if_ppp.h
2009-01-30 23:55:45 +05:30
include of <linux/types.h> is preferred over <asm/types.h>
2009-01-15 16:39:41 -08:00
include of <linux/types.h> is preferred over <asm/types.h>
2009-01-15 16:39:41 -08:00
headers_check fix: linux/if_strip.h
2009-01-30 23:56:13 +05:30
headers_check fix: linux/if_tr.h
2009-01-30 23:56:48 +05:30
tun: Limit amount of queued packets per device
2009-02-05 21:25:32 -08:00
net: Fix userland breakage wrt. linux/if_tunnel.h
2009-02-02 13:27:44 -08:00
vlan: Add GRO interfaces
2009-01-06 10:50:09 -08:00
headers_check fix: linux/igmp.h
2009-01-30 23:57:16 +05:30
headers_check fix: linux/inet_diag.h
2009-01-30 23:57:43 +05:30
net: add ARP notify option for devices
2009-02-01 01:04:33 -08:00
itimers: remove the per-cpu-ish-ness
2009-01-07 18:52:44 +01:00
include of <linux/types.h> is preferred over <asm/types.h>
2009-01-15 16:39:41 -08:00
VT-d: remove now unused intel_iommu_found function
2009-01-03 14:11:08 +01:00
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-01-06 17:10:53 -08:00
introcude linux/iommu.h for an iommu api
2009-01-03 14:10:09 +01:00
resources: fix parameter name and kernel-doc
2009-01-15 16:39:38 -08:00
ext4: Add mount option to set kjournald's I/O priority
2009-01-05 22:46:26 -05:00
headers_check fix: linux/ip6_tunnel.h
2009-01-30 23:58:12 +05:30
headers_check fix: linux/ipv6.h
2009-01-30 23:58:41 +05:30
headers_check fix: linux/ipv6_route.h
2009-01-30 23:59:12 +05:30
headers_check fix: linux/ipx.h
2009-01-30 23:59:44 +05:30
headers_check fix: linux/irda.h
2009-01-31 00:00:06 +05:30
Merge branch 'cpus4096-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-01-02 11:44:09 -08:00
genirq: provide irq_to_desc() to non-genirq architectures too
2009-01-05 14:53:30 +01:00
tty: Introduce some close helpers for ports
2009-01-02 10:19:40 -08:00
jbd: fix missing kernel-doc
2009-01-15 16:39:37 -08:00
jbd2: On a __journal_expect() assertion failure printk "JBD2", not "EXT3-fs"
2009-01-16 11:57:00 -05:00
optimize attribute timeouts for "noac" and "actimeo=0"
2008-12-23 15:21:56 -05:00
jbd2: Add buffer triggers
2009-01-05 08:40:30 -08:00
include of <linux/types.h> is preferred over <asm/types.h>
2009-01-15 16:39:41 -08:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2009-02-02 23:55:27 -08:00
generic swap(): introduce global macro swap(a, b)
2009-01-08 08:31:15 -08:00
[PATCH] idle cputime accounting
2008-12-31 15:11:46 +01:00
klist.c: bit 0 in pointer can't be used as flag
2009-01-20 20:52:10 -08:00
kprobes: fix module compilation error with CONFIG_KPROBES=n
2009-01-29 18:04:43 -08:00
include of <linux/types.h> is preferred over <asm/types.h>
2009-01-15 16:39:41 -08:00
KVM: change KVM to use IOMMU API
2009-01-03 14:11:07 +01:00
leds: leds-pcs9532 - Move i2c work to a workqueque
2009-01-08 12:38:58 +00:00
leds: Add suspend/resume to the core class
2009-01-08 17:55:03 +00:00
lguest: move the initial guest page table creation code to the host
2008-12-30 09:26:11 +10:30
libata: implement HORKAGE_1_5_GBPS and apply it to WD My Book
2009-02-02 23:04:31 -05:00
Input: libps2 - handle 0xfc responses from devices
2008-11-24 11:43:21 -05:00
i386: get rid of the use of KPROBE_ENTRY / KPROBE_END
2008-11-27 12:37:54 +01:00
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2008-12-30 16:20:19 -08:00
include of <linux/types.h> is preferred over <asm/types.h>
2009-01-15 16:39:41 -08:00
btrfs & squashfs: Move btrfs and squashfsto's magic number to <linux/magic.h>
2009-01-15 16:39:38 -08:00
Input: map_to_7segment.h - convert to __inline__ for userspace
2008-12-29 04:59:31 -08:00
markers: comment marker_synchronize_unregister() on data dependency
2008-11-28 16:47:41 +01:00
include of <linux/types.h> is preferred over <asm/types.h>
2009-01-15 16:39:41 -08:00
memcg: fix shmem's swap accounting
2009-01-08 08:31:10 -08:00
mm: show node to memory section relationship with symlinks in sysfs
2009-01-06 15:59:00 -08:00
mm: show node to memory section relationship with symlinks in sysfs
2009-01-06 15:59:00 -08:00
memstick: annotate endianness of attribute structs
2009-01-09 16:54:41 -08:00
mm: cleanup: remove #ifdef CONFIG_MIGRATION
2009-01-06 15:59:00 -08:00
net: Refactor full duplex flow control resolution
2008-12-16 02:00:48 -08:00
headers_check fix: linux/minix_fs.h
2009-01-31 00:00:35 +05:30
fuse: move FUSE_MINOR to miscdevice.h
2008-11-26 12:03:54 +01:00
mISDN: Add E-Channel logging features
2009-01-09 22:44:25 +01:00
BUGFIX: used NULL pointer at ioctl(sk,IMGETDEVINFO,&devinfo) when devinfo.id not registered
2009-01-11 17:55:16 +01:00
mm: fix assertion
2009-01-14 07:32:44 -08:00
inactive_anon_is_low: move to vmscan
2009-01-08 08:31:07 -08:00
NOMMU: Make mmap allocation page trimming behaviour configurable.
2009-01-08 12:04:47 +00:00
mm: introduce zone_reclaim struct
2009-01-08 08:31:07 -08:00
Fix longstanding "error: storage size of '__mod_dmi_device_table' isn't known"
2009-01-27 16:06:21 -08:00
modules: Use a better scheme for refcounting
2009-02-02 19:17:55 -08:00
module: fix module loading failure of large kernel modules for parisc
2009-01-05 08:40:13 +10:30
netns: ipmr: enable namespace support in ipv4 multicast routing code
2009-01-22 13:57:41 -08:00
netns: ip6mr: enable namespace support in ipv6 multicast forwarding code
2008-12-10 16:30:15 -08:00
headers_check fix: linux/msdos_fs.h
2009-01-31 00:01:11 +05:30
x86, MSI: pass irq_cfg and irq_desc
2008-12-08 14:31:59 +01:00
vfs: introduce helper function to safely NUL-terminate symlinks
2008-12-31 18:07:38 -05:00
trivial: fix an -> a typos in documentation and comments
2009-01-06 11:28:07 +01:00
headers_check fix: linux/neighbour.h
2009-01-31 00:01:42 +05:30
reintroduce accept4
2008-11-19 18:49:57 -08:00
gro: Avoid copying headers of unmerged packets
2009-01-29 16:33:03 -08:00
netlink: avoid memset of 0 bytes sparse warning
2008-11-20 04:08:29 -08:00
net: Add Generic Receive Offload infrastructure
2008-12-15 23:38:52 -08:00
nfsd: last_byte_offset
2009-01-07 17:38:31 -05:00
optimize attribute timeouts for "noac" and "actimeo=0"
2008-12-23 15:21:56 -05:00
NFSv4: Remove nfs_client->cl_sem
2008-12-23 15:21:45 -05:00
headers_check fix: linux/nfs_idmap.h
2009-01-31 00:02:27 +05:30
NFS: add "[no]resvport" mount option
2008-12-23 15:21:37 -05:00
NFSv4: Convert the open and close ops to use fmode
2008-12-23 15:21:56 -05:00
nl80211: New command for adding extra IE(s) into management frames
2009-01-29 16:00:35 -05:00
mm: show node to memory section relationship with symlinks in sysfs
2009-01-06 15:59:00 -08:00
User namespaces: set of cleanups (v2)
2008-11-24 18:57:41 -05:00
headers_check fix: linux/nubus.h
2009-01-31 00:15:24 +05:30
serial: Add driver for the Cell Network Processor serial port NWP device
2009-01-08 16:25:18 +11:00
of: Add helpers for finding device nodes which have a given property
2008-11-19 16:05:00 +11:00
of/gpio: Implement of_gpio_count()
2008-12-21 14:21:14 +11:00
drivers/of: Add the of_find_i2c_device_by_node function.
2009-01-09 15:49:06 -07:00
of: Fix comment, sparc no longer uses of_device objects on special busses.
2008-12-04 09:16:45 -08:00
oprofile: make new cpu buffer functions part of the api
2009-01-07 22:48:15 +01:00
usb host: Oxford OXU210HP HCD driver.
2009-01-07 09:59:50 -08:00
badpage: simplify page_alloc flag check+clear
2009-01-06 15:59:07 -08:00
memcg: synchronized LRU
2009-01-08 08:31:05 -08:00
fs: symlink write_begin allocation context fix
2009-01-04 13:33:20 -08:00
mm: get rid of pagevec_release_nonlru()
2009-01-06 15:59:00 -08:00
PCI hotplug: introduce functions for ACPI slot detection
2009-01-07 11:13:11 -08:00
PCI PM: Restore standard config registers of all devices early
2009-01-16 12:57:58 -08:00
Merge branch 'linus' into release
2009-01-09 03:39:43 -05:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
2009-02-03 12:41:58 -08:00
PCI: pciehp: cleanup register and field definitions
2009-01-07 11:13:22 -08:00
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-01-06 17:10:04 -08:00
include of <linux/types.h> is preferred over <asm/types.h>
2009-01-15 16:39:41 -08:00
headers_check fix: linux/phonet.h
2009-01-31 00:02:54 +05:30
phy: power management support
2008-11-28 16:24:56 -08:00
pid: implement ns_of_pid
2009-01-08 08:31:12 -08:00
pid: generalize task_active_pid_ns
2009-01-08 08:31:12 -08:00
headers_check fix: linux/pkt_cls.h
2009-01-31 00:03:40 +05:30
headers_check fix: linux/pkt_sched.h
2009-01-31 00:04:50 +05:30
PM: Simplify the new suspend/hibernation framework for devices
2009-01-06 10:44:29 -08:00
Fix misspellings in pm.h macros
2009-01-06 10:44:30 -08:00
poll: allow f_op->poll to sleep
2009-01-06 15:59:12 -08:00
posix-timers: use "struct pid*" instead of "struct task_struct*"
2008-12-12 17:00:07 +01:00
power_supply: Add cold to the POWER_SUPPLY_HEALTH report values
2009-01-04 12:17:39 +01:00
net: ppp_generic - introduce net-namespace functionality v2
2009-01-21 15:55:35 -08:00
headers_check fix: linux/ppp_defs.h
2009-01-31 00:05:30 +05:30
x86, bts: add fork and exit handling
2008-12-20 09:15:46 +01:00
qnx: include <linux/types.h> for definitions of __[us]{8,16,32,64} types
2009-01-07 21:44:20 +01:00
qnx: include <linux/types.h> for definitions of __[us]{8,16,32,64} types
2009-01-07 21:44:20 +01:00
quota: Unexport dqblk_v1.h and dqblk_v2.h
2009-01-05 08:40:25 -08:00
quota: Improve locking
2009-01-16 18:02:10 +01:00
include of <linux/types.h> is preferred over <asm/types.h>
2009-01-15 16:39:41 -08:00
mm lockless pagecache barrier fix
2009-01-05 18:31:12 -08:00
headers_check fix: linux/random.h
2009-01-31 00:05:59 +05:30
rbtree: add const qualifier to some functions
2009-01-10 06:04:33 -08:00
cpumask: convert RCU implementations
2009-01-01 10:12:26 +10:30
udp: Use hlist_nulls in UDP RCU code
2008-11-16 19:39:21 -08:00
rcu: eliminate synchronize_rcu_xxx macro
2009-01-05 10:18:08 +01:00
"Tree RCU": scalable classic RCU implementation
2008-12-18 21:56:04 +01:00
cgroups: consolidate cgroup documents
2009-01-15 16:39:37 -08:00
rfkill: strip pointless notifier chain
2008-12-12 14:45:25 -05:00
Merge branch 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2008-12-30 17:31:25 -08:00
rapidio: remove excess kernel-doc notation
2009-01-06 15:59:28 -08:00
badpage: remove vma from page_remove_rmap
2009-01-06 15:59:07 -08:00
rtc: add alarm/update irq interfaces
2009-01-04 13:33:20 -08:00
headers_check fix: linux/rtnetlink.h
2009-01-31 00:15:57 +05:30
epoll: drop max_user_instances and rely only on max_user_watches
2009-01-29 18:04:45 -08:00
Merge branch 'next' into for-linus
2009-01-07 09:58:22 +11:00
cpumask: Use nr_cpu_ids in seq_cpumask
2008-12-30 09:05:19 +10:30
serial: RS485 ioctl structure uses __u32 include linux/types.h
2009-01-02 10:19:42 -08:00
Serial: Allow port type to be specified when calling serial8250_register_port.
2009-01-02 10:19:43 -08:00
serial: Add driver for the Cell Network Processor serial port NWP device
2009-01-08 16:25:18 +11:00
Input: add support for Wacom W8001 penabled serial touchscreen
2008-11-24 11:41:38 -05:00
headers_check fix: linux/signalfd.h
2009-01-31 00:06:33 +05:30
gro: Avoid copying headers of unmerged packets
2009-01-29 16:33:03 -08:00
Merge branches 'topic/fixes', 'topic/cleanups' and 'topic/documentation' into for-linus
2008-12-29 11:45:47 +02:00
kmalloc: return NULL instead of link failure
2009-01-27 23:48:59 +02:00
smp_call_function_single(): be slightly less stupid
2009-01-11 03:41:58 +01:00
smsc911x: allow mac address to be saved before device reset
2009-02-01 00:37:22 -08:00
tcp: add some mibs to track collapsing
2008-11-24 21:27:22 -08:00
headers_check fix: linux/sound.h
2009-01-31 00:07:00 +05:30
tracing/stack-tracer: introduce CONFIG_USER_STACKTRACE_SUPPORT
2008-11-23 11:53:50 +01:00
stop_machine: introduce stop_machine_create/destroy.
2009-01-05 08:40:14 +10:30
Hibernation: Introduce system_entering_hibernation
2009-01-27 02:15:45 -05:00
byteorder: make swab.h include asm/swab.h like a regular header
2009-01-14 19:56:50 -08:00
memcg: fix shmem's swap accounting
2009-01-08 08:31:10 -08:00
swiotlb: add hwdev to swiotlb_phys_to_bus() / swiotlb_sg_to_bus()
2008-12-28 09:54:52 +01:00
headers_check fix: linux/synclink.h
2009-01-31 00:07:31 +05:30
alpha: use syscall wrappers
2009-01-29 18:04:44 -08:00
net: add ARP notify option for devices
2009-02-01 01:04:33 -08:00
headers_check fix: linux/taskstats.h
2009-01-31 00:08:18 +05:30
cpumask: make CONFIG_NR_CPUS always valid.
2008-12-30 09:05:12 +10:30
cpumask: convert kernel time functions
2009-01-01 10:12:25 +10:30
sched_clock: prevent scd->clock from moving backwards, take #2
2008-12-31 09:53:21 +01:00
linux/timex.h: cleanup for userspace
2008-12-12 17:01:38 +01:00
sched: add SD_BALANCE_NEWIDLE at MC and CPU level for sched_mc>0
2008-12-19 09:21:55 +01:00
tty: Introduce some close helpers for ports
2009-01-02 10:19:40 -08:00
pty: simplify resize
2009-01-02 10:19:36 -08:00
linux/types.h: Don't depend on __GNUC__ for __le64/__be64
2009-01-07 11:27:12 -08:00
uio: make uio_info's name and version const
2009-01-06 10:44:44 -08:00
USB: add kernel-doc for wusb_dev in struct usb_device
2009-01-27 16:15:36 -08:00
USB: storage: add last-sector hacks
2009-01-07 10:00:11 -08:00
User namespaces: set of cleanups (v2)
2008-11-24 18:57:41 -05:00
uwb: improved MAS allocator and reservation conflict handling
2008-12-12 13:00:06 +00:00
headers_check fix: linux/video_decoder.h
2009-01-31 00:09:13 +05:30
headers_check fix: linux/video_encoder.h
2009-01-31 00:10:11 +05:30
headers_check fix: linux/videodev.h
2009-01-31 00:10:59 +05:30
V4L/DVB (10141): v4l2: debugging API changed to match against driver name instead of ID.
2009-01-02 17:11:52 -02:00
virtio: avoid implicit use of Linux page size in balloon interface
2008-12-30 09:26:04 +10:30
headers_check fix: linux/virtio_blk.h
2009-01-31 00:11:25 +05:30
headers_check fix: linux/virtio_console.h
2009-01-31 00:12:44 +05:30
virtio_net: Add support for VLAN filtering in the hypervisor
2009-02-04 16:35:13 -08:00
virtio: Don't use PAGE_SIZE for vring alignment in virtio_pci.
2008-12-30 09:25:58 +10:30
virtio: hand virtio ring alignment as argument to vring_new_virtqueue
2008-12-30 09:26:03 +10:30
mm: make vread() and vwrite() declaration
2009-01-06 15:59:05 -08:00
wimax: headers for kernel API and user space interaction
2009-01-07 10:00:16 -08:00
mac80211: 802.11w - Configuration of MFP disabled/optional/required
2009-01-29 16:00:05 -05:00
wlp: start/stop radio on network interface up/down
2008-11-19 14:47:04 +00:00
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-01-26 09:47:56 -08:00
fs: remove WB_SYNC_HOLD
2009-01-06 15:59:09 -08:00
33dccbb050