Pavel Emelyanov
c9da99e647
unix_diag: Fixup RQLEN extension report ...
While it's not too late fix the recently added RQLEN diag extension
to report rqlen and wqlen in the same way as TCP does.
I.e. for listening sockets the ack backlog length (which is the input
queue length for socket) in rqlen and the max ack backlog length in
wqlen, and what the CINQ/OUTQ ioctls do for established.
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-12-30 16:46:02 -05:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2011-11-04 18:02:25 -07:00
bcma: use static keyword for inline function declaration in bcma.h
2011-12-13 15:31:27 -05:00
can: cc770: add driver core for the Bosch CC770 and Intel AN82527
2011-12-01 13:09:31 -05:00
libceph: Allocate larger oid buffer in request msgs
2011-11-11 09:50:19 -08:00
Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6
2011-11-03 09:40:51 -07:00
net: use IS_ENABLED(CONFIG_IPV6)
2011-12-11 18:25:16 -05:00
regulator: TPS65910: Fix VDD1/2 voltage selector count
2011-11-23 14:03:52 +00:00
mlx4_core: Changing link sensing logic
2011-12-19 14:57:07 -05:00
mmc: core: Add quirk for long data read time
2011-12-10 16:18:35 -05:00
Merge git://git.infradead.org/mtd-2.6
2011-11-07 09:11:16 -08:00
netfilter: xtables: give xt_ecn its own name
2011-12-27 20:31:38 +01:00
netfilter: xtables: give xt_ecn its own name
2011-12-27 20:31:38 +01:00
pinctrl: fix "warning: 'struct pinctrl_dev' declared inside parameter list"
2011-11-09 15:07:40 +01:00
drivers/leds/leds-renesas-tpu.c: move Renesas TPU LED driver platform data
2011-10-31 17:30:55 -07:00
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
backlight: fix broken regulator API usage in l4f00242t03
2011-10-31 17:30:54 -07:00
ssb: extract FEM info from SPROM
2011-12-13 15:30:49 -05:00
net: use IS_ENABLED(CONFIG_IPV6)
2011-12-11 18:25:16 -05:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2011-10-31 15:42:54 -07:00
include: convert various register fcns to macros to avoid include chaining
2011-10-31 19:32:32 -04:00
aio: allocate kiocbs in batches
2011-11-02 16:07:03 -07:00
atm: eliminate atm_guess_pdu2truesize()
2011-11-26 16:40:30 -05:00
mmc: atmel-mci: change namespace
2011-10-26 15:43:25 -04:00
mmc: atmel-mci: use ATMEL_PDC_SCND_BUF_OFF instead of a literal value
2011-10-26 15:43:26 -04:00
treewide: use __printf not __attribute__((format(printf,...)))
2011-10-31 17:30:54 -07:00
writeback: Add a 'reason' to wb_writeback_work
2011-10-31 00:33:36 +08:00
bio: change some signed vars to unsigned
2011-11-16 09:21:50 +01:00
block: Remove the control of complete cpu from bio.
2011-10-24 16:11:30 +02:00
block: initialize request_queue's numa node during
2011-11-23 10:59:13 +01:00
treewide: use __printf not __attribute__((format(printf,...)))
2011-10-31 17:30:54 -07:00
memcg: replace ss->id_lock with a rwlock
2011-11-02 16:07:03 -07:00
net: add network priority cgroup infrastructure (v4)
2011-11-22 15:22:23 -05:00
time/clocksource: Fix kernel-doc warnings
2011-12-19 11:41:40 +01:00
mm: compaction: make compact_zone_order() static
2011-10-31 17:30:49 -07:00
asm-generic/unistd.h: support new process_vm_{readv,write} syscalls
2011-12-03 15:31:48 -05:00
PM / Sleep: Remove unused symbol 'suspend_cpu_hotplug'
2011-11-04 22:28:09 +01:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2011-11-07 10:13:52 -08:00
[S390] kdump: Add size to elfcorehdr kernel parameter
2011-10-30 15:16:41 +01:00
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
crypto: Add userspace report for cipher type algorithms
2011-10-21 14:24:07 +02:00
fix apparmor dereferencing potentially freed dentry, sanitize __d_path() API
2011-12-06 23:57:18 -05:00
PM / devfreq: fix private_data
2011-11-07 23:54:53 +01:00
dm table: add immutable feature
2011-10-31 20:19:04 +00:00
Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2011-11-21 20:36:26 -08:00
device_cgroup.h: delete needless include <linux/module.h>
2011-10-31 19:32:26 -04:00
dm table: add immutable feature
2011-10-31 20:19:04 +00:00
dm kcopyd: add dm_kcopyd_zero to zero an area
2011-10-31 20:18:58 +00:00
dm log userspace: add log device dependency
2011-10-31 20:21:24 +00:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2011-11-06 17:12:03 -08:00
iommu: Export intel_iommu_enabled to signal when iommu is in use
2011-12-16 08:49:57 -08:00
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
include/linux/dmar.h: forward-declare struct acpi_dmar_header
2011-10-31 17:30:44 -07:00
treewide: use __printf not __attribute__((format(printf,...)))
2011-10-31 17:30:54 -07:00
dql: Dynamic queue limits
2011-11-29 12:46:19 -05:00
edac: Move edac main structs to include/linux/edac.h
2011-10-31 15:10:04 -02:00
eeprom_93cx6: Add write support
2011-11-26 14:59:39 -05:00
[S390] signal race with restarting system calls
2011-10-30 15:16:43 +01:00
net: use IS_ENABLED(CONFIG_IPV6)
2011-12-11 18:25:16 -05:00
ethtool: Define and apply a default policy for RX flow hash indirection
2011-12-16 13:53:18 -05:00
module.h: split out the EXPORT_SYMBOL into export.h
2011-10-31 09:20:11 -04:00
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
2011-11-02 10:06:20 -07:00
include: replace linux/module.h with "struct module" wherever possible
2011-10-31 19:32:32 -04:00
PM / Freezer: Reimplement wait_event_freezekillable using freezer_do_not_count/freezer_count
2011-11-04 22:28:15 +01:00
vmscan: use atomic-long for shrinker batching
2011-12-09 07:50:27 -08:00
treewide: use __printf not __attribute__((format(printf,...)))
2011-10-31 17:30:54 -07:00
include: replace linux/module.h with "struct module" wherever possible
2011-10-31 19:32:32 -04:00
tracing: Restore system filter behavior
2011-12-05 13:28:45 -05:00
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
genetlink: Add rcu_dereference_genl and genl_dereference.
2011-12-03 09:35:08 -08:00
block: Revert "[SCSI] genhd: add a new attribute "alias" in gendisk"
2011-11-10 09:03:55 +01:00
gpiolib: Ensure struct gpio is always defined
2011-10-24 16:04:06 +02:00
include: convert various register fcns to macros to avoid include chaining
2011-10-31 19:32:32 -04:00
thp: mremap support and TLB optimization
2011-10-31 17:30:48 -07:00
hugetlb: remove dummy definitions of HPAGE_MASK and HPAGE_SIZE
2011-11-19 06:15:59 -05:00
hwspinlock: Don't return a value in __hwspin_unlock
2011-11-08 09:28:27 +02:00
I2C: OMAP: remove unused function pointers from pdata
2011-10-29 09:37:09 +01:00
i2c: Delete ANY_I2C_BUS
2011-11-23 11:33:07 +01:00
ieee80211: Introduce ieee80211_is_first_frag
2011-12-13 15:30:40 -05:00
net: introduce ethernet teaming device
2011-11-13 16:10:10 -05:00
if_ether.h: Add IEEE 802.1 Local Experimental Ethertype 1.
2011-12-05 18:27:56 -05:00
macvtap: Fix the minor device number allocation
2011-10-21 02:53:07 -04:00
team: replicate options on register
2011-11-16 18:16:38 -05:00
vlan: introduce functions to do mass addition/deletion of vids by another device
2011-12-08 19:52:42 -05:00
inet_diag: Add the SKMEMINFO extension
2011-12-30 16:42:19 -05:00
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2011-12-05 16:50:24 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
2011-10-28 14:25:01 -07:00
Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2011-10-26 16:17:32 +02:00
Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linux
2011-10-28 05:54:23 -07:00
Merge branches 'amd/fixes', 'debug/dma-api', 'arm/omap', 'arm/msm', 'core', 'iommu/fault-reporting' and 'api/iommu-ops-per-bus' into next
2011-10-21 14:38:55 +02:00
include: replace linux/module.h with "struct module" wherever possible
2011-10-31 19:32:32 -04:00
include: replace linux/module.h with "struct module" wherever possible
2011-10-31 19:32:32 -04:00
net: use IS_ENABLED(CONFIG_IPV6)
2011-12-11 18:25:16 -05:00
irq: don't put module.h into irq.h for tracking irqgen modules.
2011-10-31 19:32:35 -04:00
irq: don't put module.h into irq.h for tracking irqgen modules.
2011-10-31 19:32:35 -04:00
irq: support domains with non-zero hwirq base
2011-10-31 14:03:23 +01:00
jdb/jbd2: factor out common functions from the jbd[2] header files
2011-10-27 04:38:18 -04:00
jdb/jbd2: factor out common functions from the jbd[2] header files
2011-10-27 04:38:18 -04:00
jdb/jbd2: factor out common functions from the jbd[2] header files
2011-10-27 04:38:18 -04:00
jump-label: initialize jump-label subsystem much earlier
2011-10-25 11:55:15 -07:00
treewide: use __printf not __attribute__((format(printf,...)))
2011-10-31 17:30:54 -07:00
unix_diag: Include unix_diag.h into header-y target
2011-12-30 16:42:19 -05:00
treewide: use __printf not __attribute__((format(printf,...)))
2011-10-31 17:30:54 -07:00
module,bug: Add TAINT_OOT_MODULE flag for modules not built in-tree
2011-11-07 07:54:42 +10:30
Merge branch 'akpm' (Andrew's incoming)
2011-10-31 17:46:07 -07:00
treewide: use __printf not __attribute__((format(printf,...)))
2011-10-31 17:30:54 -07:00
treewide: use __printf not __attribute__((format(printf,...)))
2011-10-31 17:30:54 -07:00
treewide: use __printf not __attribute__((format(printf,...)))
2011-10-31 17:30:54 -07:00
KVM: Don't automatically expose the TSC deadline timer in cpuid
2011-12-26 13:27:44 +02:00
VFS: Fix race between CPU hotplug and lglocks
2011-12-22 02:02:20 -05:00
treewide: use __printf not __attribute__((format(printf,...)))
2011-10-31 17:30:54 -07:00
lis3lv02d: make regulator API usage unconditional
2011-10-31 17:30:52 -07:00
llist-return-whether-list-is-empty-before-adding-in-llist_add-fix
2011-10-31 17:30:57 -07:00
linux/log2.h: Fix rounddown_pow_of_two(1)
2011-12-12 22:06:55 -08:00
Merge branch 'for-3.2/drivers' of git://git.kernel.dk/linux-block
2011-11-04 17:22:14 -07:00
minix: describe usage of different magic numbers
2011-11-02 16:06:59 -07:00
mdio-gpio: Add reset functionality to mdio-gpio driver(v2).
2011-11-15 16:56:17 -05:00
mdio-gpio: Add reset functionality to mdio-gpio driver(v2).
2011-11-15 16:56:17 -05:00
memblock: add memblock_start_of_DRAM()
2011-10-31 17:30:47 -07:00
Move limit definitions outside CONFIG_INET
2011-12-15 11:59:44 -05:00
net: Change mii to ethtool advertisement function names
2011-11-21 15:27:19 -05:00
miscdevice.h: fix up implicit use of lists and types
2011-10-31 19:32:29 -04:00
vmscan: use atomic-long for shrinker batching
2011-12-09 07:50:27 -08:00
mm: thp: tail page refcounting fix
2011-11-02 16:06:57 -07:00
treewide: use __printf not __attribute__((format(printf,...)))
2011-10-31 17:30:54 -07:00
mm: vmscan: immediately reclaim end-of-LRU dirty pages when writeback completes
2011-10-31 17:30:47 -07:00
module.h: relocate MODULE_PARM_DESC into moduleparam.h
2011-10-31 09:20:11 -04:00
module.h: relocate MODULE_PARM_DESC into moduleparam.h
2011-10-31 09:20:11 -04:00
readlinkat: ensure we return ENOENT for the empty pathname for normal lookups
2011-11-02 12:53:42 +01:00
neigh: new unresolved queue limits
2011-11-14 00:47:54 -05:00
net: remove NETIF_F_NO_CSUM feature bit
2011-11-16 17:43:12 -05:00
rfs: better sizing of dev_flow_table
2011-12-24 16:13:27 -05:00
netfilter: use jump_label for nf_hooks
2011-11-21 16:38:08 -05:00
inet_diag: Partly rename inet_ to sock_
2011-12-06 13:57:36 -05:00
NFC: Initial LLCP support
2011-12-14 14:50:13 -05:00
nfs: when attempting to open a directory, fall back on normal lookup (try #5 )
2011-11-04 16:39:04 -04:00
nfs: when attempting to open a directory, fall back on normal lookup (try #5 )
2011-11-04 16:39:04 -04:00
cfg80211: validate nl80211 station handling better
2011-12-15 14:45:45 -05:00
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
of/irq: introduce of_irq_init
2011-10-31 14:03:22 +01:00
of_platform.h: delete needless include <linux/module.h>
2011-10-31 19:32:27 -04:00
oom: fix race while temporarily setting current's oom_score_adj
2011-10-31 17:30:45 -07:00
net: Add Open vSwitch kernel components.
2011-12-03 09:35:17 -08:00
PM / OPP: Fix build when CONFIG_PM_OPP is not set
2011-11-04 22:28:13 +01:00
PCI: Fix compile errors with PCI_ATS and !PCI_IOV
2011-10-31 10:23:57 -07:00
PCI: Fix compile errors with PCI_ATS and !PCI_IOV
2011-10-31 10:23:57 -07:00
include: convert various register fcns to macros to avoid include chaining
2011-10-31 19:32:32 -04:00
x86, amd: Fix up numa_node information for AMD CPU family 15h model 0-0fh northbridge functions
2011-12-05 18:13:11 +01:00
perf: Fix loss of notification with multi-event
2011-12-05 09:33:03 +01:00
Phonet: set the pipe handle using setsockopt
2011-11-18 14:37:40 -05:00
net: hold sock reference while processing tx timestamps
2011-10-24 02:54:50 -04:00
netem: add cell concept to simulate special MAC behavior
2011-12-12 19:44:48 -05:00
Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6
2011-10-29 07:28:36 -07:00
PM: Update comments describing device power management callbacks
2011-11-28 22:14:55 +01:00
PM Sleep: Do not extend wakeup paths to devices with ignore_children set
2011-11-17 21:39:33 +01:00
pps: new client driver using GPIO
2011-11-02 16:07:02 -07:00
treewide: use __printf not __attribute__((format(printf,...)))
2011-10-31 17:30:54 -07:00
pstore: pass allocated memory region back to caller
2011-11-17 12:58:07 -08:00
treewide: use __printf not __attribute__((format(printf,...)))
2011-10-31 17:30:54 -07:00
Merge branch 'x86-rdrand-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2011-10-28 05:29:07 -07:00
include: replace linux/module.h with "struct module" wherever possible
2011-10-31 19:32:32 -04:00
RapidIO: add mport driver for Tsi721 bridge
2011-11-02 16:07:01 -07:00
writeback: remove vm_dirties and task->dirties
2011-11-17 20:49:06 +08:00
include/linux/sem.h: make sysv_sem empty if SYSVIPC is disabled
2011-11-02 16:07:01 -07:00
treewide: use __printf not __attribute__((format(printf,...)))
2011-10-31 17:30:54 -07:00
RS485: fix inconsistencies in the meaning of some variables
2011-11-15 12:13:44 -08:00
Merge branches 'sh/pm-runtime' and 'common/clkfwk' into sh-fixes-for-linus
2011-11-11 16:16:25 +09:00
include: convert various register fcns to macros to avoid include chaining
2011-10-31 19:32:32 -04:00
sh: clkfwk: Kill off remaining debugfs cruft.
2011-11-11 16:11:41 +09:00
ARM: mach-shmobile: move helper macro PORTCR to sh_pfc.h
2011-11-11 16:45:35 +09:00
vmscan: use atomic-long for shrinker batching
2011-12-09 07:50:27 -08:00
firmware: Sigma: Fix endianess issues
2011-11-29 11:59:50 +00:00
net: only use a single page of slop in MAX_SKB_FRAGS
2011-12-23 16:51:18 -05:00
sock_diag: Introduce the meminfo nla core (v2)
2011-12-30 16:42:19 -05:00
stop_machine.h: fix implicit use of smp.h for smp_processor_id
2011-10-31 19:32:28 -04:00
lib/string.c: introduce memchr_inv()
2011-10-31 17:30:47 -07:00
mm: change isolate mode from #define to bitwise type
2011-10-31 17:30:44 -07:00
Cross Memory Attach
2011-10-31 17:30:44 -07:00
sysctl: add support for poll()
2011-11-02 16:07:02 -07:00
sysdev.h: dont include <linux/module.h> for no reason
2011-10-31 19:32:24 -04:00
tcp: Replace constants with #define macros
2011-12-21 01:03:23 -05:00
include: replace linux/module.h with "struct module" wherever possible
2011-10-31 19:32:32 -04:00
treewide: use __printf not __attribute__((format(printf,...)))
2011-10-31 17:30:54 -07:00
Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
2011-10-26 15:11:09 +02:00
include: replace linux/module.h with "struct module" wherever possible
2011-10-31 19:32:32 -04:00
unix_diag: Fixup RQLEN extension report
2011-12-30 16:46:02 -05:00
include: convert various register fcns to macros to avoid include chaining
2011-10-31 19:32:32 -04:00
sysctl: add support for poll()
2011-11-02 16:07:02 -07:00
uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
2011-10-31 19:32:31 -04:00
vermagic: delete unused include of <linux/module.h>
2011-10-31 19:32:23 -04:00
[media] v4l: Add AUTO option for the V4L2_CID_POWER_LINE_FREQUENCY control
2011-11-03 18:29:09 -02:00
virtio.h: correct comment for struct virtio_driver
2011-11-02 11:40:59 +10:30
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2011-12-02 13:49:21 -05:00
virtio-mmio: Correct the name of the guest features selector
2011-11-24 13:04:47 +10:30
virtio: modify vring_init and vring_size to take account of the layout containing *_event_idx
2011-11-02 11:40:59 +10:30
include: replace linux/module.h with "struct module" wherever possible
2011-10-31 19:32:32 -04:00
xen: map foreign pages for shared rings by updating the PTEs directly
2011-11-16 12:13:08 -05:00
writeback: Add a 'reason' to wb_writeback_work
2011-10-31 00:33:36 +08:00
