Linus Torvalds
4fc3acf291
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking updates from David Miller:
1) Make syn floods consume significantly less resources by
a) Not pre-COW'ing routing metrics for SYN/ACKs
b) Mirroring the device queue mapping of the SYN for the SYN/ACK
reply.
Both from Eric Dumazet.
2) Fix calculation errors in Byte Queue Limiting, from Hiroaki SHIMODA.
3) Validate the length requested when building a paged SKB for a
socket, so we don't overrun the page vector accidently. From Jason
Wang.
4) When netlabel is disabled, we abort all IP option processing when we
see a CIPSO option. This isn't the right thing to do, we should
simply skip over it and continue processing the remaining options
(if any). Fix from Paul Moore.
5) SRIOV fixes for the mellanox driver from Jack orgenstein and Marcel
Apfelbaum.
6) 8139cp enables the receiver before the ring address is properly
programmed, which potentially lets the device crap over random
memory. Fix from Jason Wang.
7) e1000/e1000e fixes for i217 RST handling, and an improper buffer
address reference in jumbo RX frame processing from Bruce Allan and
Sebastian Andrzej Siewior, respectively.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
fec_mpc52xx: fix timestamp filtering
mcs7830: Implement link state detection
e1000e: fix Rapid Start Technology support for i217
e1000: look into the page instead of skb->data for e1000_tbi_adjust_stats()
r8169: call netif_napi_del at errpaths and at driver unload
tcp: reflect SYN queue_mapping into SYNACK packets
tcp: do not create inetpeer on SYNACK message
8139cp/8139too: terminate the eeprom access with the right opmode
8139cp: set ring address before enabling receiver
cipso: handle CIPSO options correctly when NetLabel is disabled
net: sock: validate data_len before allocating skb in sock_alloc_send_pskb()
bql: Avoid possible inconsistent calculation.
bql: Avoid unneeded limit decrement.
bql: Fix POSDIFF() to integer overflow aware.
net/mlx4_core: Fix obscure mlx4_cmd_box parameter in QUERY_DEV_CAP
net/mlx4_core: Check port out-of-range before using in mlx4_slave_cap
net/mlx4_core: Fixes for VF / Guest startup flow
net/mlx4_en: Fix improper use of "port" parameter in mlx4_en_event
net/mlx4_core: Fix number of EQs used in ICM initialisation
net/mlx4_core: Fix the slave_id out-of-range test in mlx4_eq_int
2012-06-02 16:22:51 -07:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-05-25 09:31:59 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-05-24 11:54:29 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
2012-05-30 11:17:19 -07:00
crush: fix tree node weight lookup
2012-05-07 15:39:35 -07:00
[media] DVB: remove "stats" property bits from ATSC-MH API property additions
2012-05-20 10:06:08 -03:00
dma: mxs-dma: make platform_device_id more generic
2012-05-12 13:32:17 +08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2012-05-24 10:34:29 -07:00
iio: Add dev_to_iio_dev() helper function
2012-05-14 13:34:31 -07:00
Input: matrix-keymap - wire up device tree support
2012-05-10 22:39:43 -07:00
MFD changes for 3.5
2012-05-29 11:53:11 -07:00
net/mlx4_core: Fix number of EQs used in ICM initialisation
2012-05-31 18:18:16 -04:00
arm-soc: device tree conversions, part 2
2012-05-26 12:57:47 -07:00
- More robust parsing especially of xattr data in JFFS2
2012-06-01 16:55:42 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-05-16 22:17:37 -04: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
NFC: HCI based pn544 driver
2012-05-15 17:30:30 -04:00
Merge branch 'for-3.5-take-2' of git://linux-nfs.org/~bfields/linux
2012-05-31 18:18:11 -07:00
ux500 GPIO and pinctrl changes for kernel 3.5
2012-05-12 19:57:34 -07:00
hwmon updates for 3.5-rc1
2012-05-23 14:15:09 -07:00
max17042_battery: Add support for max17047/50 chip
2012-05-05 20:28:11 -07:00
lib/raid6: Add SSSE3 optimized recovery functions
2012-05-22 13:54:18 +10:00
regulator: tps62360: support force PWM mode via regulator mode
2012-05-14 18:03:04 +01:00
rtc: ds1307: add trickle charger support
2012-05-29 16:22:33 -07:00
arm-soc: clock driver changes
2012-05-26 12:42:29 -07:00
bcma/ssb: parse new attributes from sprom
2012-05-16 12:45:22 -04:00
nfsd4: move rq_flavor into svc_cred
2012-05-31 20:29:58 -04:00
USB 3.5-rc1 pull request
2012-05-22 15:50:46 -07:00
drivers/video/backlight/apple_bl.c: include header for exported symbol prototypes
2012-05-29 16:22:29 -07:00
atm: remove the coupling to token ring support
2012-05-15 20:14:35 -04:00
gpio/generic: initialize basic_mmio_gpio shadow variables properly
2012-05-19 12:17:35 -06:00
Merge branch 'for-3.5/core' of git://git.kernel.dk/linux-block
2012-05-30 08:52:42 -07:00
mm: remove sparsemem allocation details from the bootmem allocator
2012-05-29 16:22:22 -07:00
bug: introduce BUILD_BUG_ON_INVALID() macro
2012-05-29 16:22:20 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2012-05-23 17:42:39 -07:00
clk: add a fixed factor clock
2012-05-08 14:13:25 -07:00
clk: Provide dummy clk_unregister()
2012-05-15 12:02:39 -07:00
Merge branch 'depends/rmk/clkdev' into next/clock
2012-05-11 17:13:00 +02:00
CLKDEV: provide helpers for common clock framework
2012-05-02 09:30:32 +01:00
mm: compaction: handle incorrect MIGRATE_UNMOVABLE type pageblocks
2012-05-29 16:22:22 -07:00
aio/vfs: cleanup of rw_copy_check_uvector() and compat_rw_copy_check_uvector()
2012-05-31 17:49:32 -07:00
cpu: introduce clear_tasks_mm_cpumask() helper
2012-05-31 17:49:29 -07:00
cred: remove task_is_dead() from __task_cred() validation
2012-05-31 17:49:28 -07:00
x86/olpc/xo1/sci: Report RTC wakeup events
2012-05-07 15:02:26 +02:00
vfs: make it possible to access the dentry hash/len as one 64-bit entry
2012-05-10 19:54:35 -07:00
Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
2012-05-25 09:18:59 -07:00
dlm: fixes for nodir mode
2012-05-02 14:15:27 -05:00
dma-buf: minor documentation fixes.
2012-05-25 12:46:23 +05:30
drivers: add Contiguous Memory Allocator
2012-05-21 15:09:37 +02:00
rapidio: add DMA engine support for RIO data transfers
2012-05-31 17:49:31 -07:00
x86, iommu/vt-d: Clean up interfaces for interrupt remapping
2012-05-07 14:35:00 +02:00
drbd: grammar fix in log message
2012-05-10 12:00:56 +02:00
drbd: Implemented the disk-timeout option
2012-05-09 15:10:45 +02:00
drbd: Implemented the disk-timeout option
2012-05-09 15:10:45 +02:00
dynamic_debug: use printk(KERN_WARNING..) in stub function
2012-05-01 08:58:06 -04:00
edac: Initialize the dimm label with the known information
2012-05-28 19:13:50 -03:00
efi: Add new variable attributes
2012-04-30 15:30:18 -07:00
vfs: retry last component if opening stale dentry
2012-06-01 12:12:01 -04:00
etherdevice: fix comments
2012-05-17 15:36:35 -04:00
linux/ethtool: Added macro ETH_FW_DUMP_DISABLE
2012-05-15 13:13:33 -04:00
eventfd: change int to __u64 in eventfd_signal()
2012-05-31 17:49:32 -07:00
epoll: Add a flag, EPOLLWAKEUP, to prevent suspend while epoll events are ready
2012-05-05 21:50:41 +02:00
->encode_fh() API change
2012-05-29 23:28:33 -04:00
extcon: Add EXTCON_MECHANICAL cable type for physical presence
2012-05-04 16:25:29 -07:00
fbdev updates for 3.5
2012-06-01 16:57:51 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2012-05-21 20:27:36 -07:00
IEEE 1394 (FireWire) subsystem updates post v3.4:
2012-05-24 12:57:47 -07:00
[media] Input: move drivers/input/fixp-arith.h to include/linux
2012-05-14 09:47:23 -03:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-06-01 10:34:35 -07:00
fsnotify: handle subfiles' perm events
2012-05-30 21:04:53 -04:00
ftrace/x86: Have x86 ftrace use the ftrace_modify_all_code()
2012-05-16 20:00:27 -04:00
tracing: Do not enable function event with enable
2012-05-10 15:55:43 -04:00
genetlink: Build a generic netlink family module alias
2012-05-29 22:33:56 -04:00
block: fix buffer overflow when printing partition UUIDs
2012-05-15 08:22:04 +02:00
mm: page_isolation: MIGRATE_CMA isolation functions added
2012-05-21 15:09:33 +02:00
gpiolib: Implement devm_gpio_request_one()
2012-05-18 16:48:35 -06:00
Merge branch 'upstream' into for-linus
2012-05-22 11:32:31 +02:00
HID: fix return value of hidraw_report_event() when !CONFIG_HIDRAW
2012-04-30 10:39:17 +02:00
mm: move is_vma_temporary_stack() declaration to huge_mm.h
2012-05-29 16:22:21 -07:00
mm: add new arch_make_huge_pte() method for tile support
2012-05-25 12:48:26 -04:00
Driver core pull for 3.5-rc1
2012-05-22 16:02:13 -07:00
i2c: Rename last mux driver to standard pattern
2012-05-12 14:28:18 +02:00
i2c: Add a struct device * parameter to i2c_add_mux_adapter()
2012-05-12 14:28:15 +02:00
i2c: pnx: add device tree support
2012-05-12 14:28:14 +02:00
i2c: Split I2C_M_NOSTART support out of I2C_FUNC_PROTOCOL_MANGLING
2012-05-30 10:55:34 +02:00
MCA: delete all remaining traces of microchannel bus support.
2012-05-17 19:06:13 -04:00
if: restore token ring ARP type to header
2012-05-22 17:13:11 -04:00
pppox: Replace __attribute__((packed)) in if_pppox.h
2012-05-01 09:30:55 -04:00
ipv6: correct the ipv6 option name - Pad0 to Pad1
2012-05-17 15:49:51 -04:00
genirq: reimplement exit_irq_thread() hook via task_work_add()
2012-05-23 22:11:12 -04:00
iommu/core: pass a user-provided token to fault handlers
2012-05-22 18:08:08 +02:00
resources: add resource_overlaps()
2012-05-07 10:58:57 -06:00
ipvs: always update some of the flags bits in backup
2012-05-08 19:38:31 +02:00
mqueue: separate mqueue default value from maximum value
2012-05-31 17:49:31 -07:00
ipx: restore token ring define to include/linux/ipx.h
2012-05-23 13:49:23 -04:00
irq: Remove irq_chip->release()
2012-05-21 21:09:38 +02:00
irqdomain: Kill off duplicate definitions.
2012-05-19 12:41:56 -06:00
jbd: Write journal superblock with WRITE_FUA after checkpointing
2012-05-15 23:34:37 +02:00
ext4/jbd2: add metadata checksumming to the list of supported features
2012-05-27 08:12:42 -04:00
vsprintf: fix %ps on non symbols when using kallsyms
2012-05-29 16:22:32 -07:00
kexec: export kexec.h to user space
2012-05-31 17:49:30 -07:00
syscalls, x86: add __NR_kcmp syscall
2012-05-31 17:49:32 -07:00
kbuild: install kernel-page-flags.h
2012-05-29 16:22:21 -07:00
introduce SIZE_MAX
2012-05-31 17:49:26 -07:00
kexec: export kexec.h to user space
2012-05-31 17:49:30 -07:00
keys: kill the dummy key_replace_session_keyring()
2012-05-23 22:11:31 -04:00
KEYS: Add invalidation support
2012-05-11 10:56:56 +01:00
kmod: move call_usermodehelper_fns() to .c file and unexport all it's helpers
2012-05-31 17:49:28 -07:00
KVM: s390: add capability indicating COW support
2012-05-17 21:06:01 -03:00
KVM: MMU: Don't use RCU for lockless shadow walking
2012-05-16 16:08:28 -03:00
l2tp: introduce L2TPv3 IP encapsulation support for IPv6
2012-05-01 09:30:55 -04:00
lcd: add callbacks for early fb event blank support
2012-05-29 16:22:29 -07:00
include/linux/led-lm3530.h: comment correction about the range of brightness
2012-05-29 16:22:32 -07:00
leds: add new field to led_classdev struct to save activation state
2012-05-29 16:22:31 -07:00
brlocks/lglocks: turn into functions
2012-05-29 23:28:41 -04:00
libata: add a host flag to ignore detected ATA devices
2012-05-07 15:32:23 -04:00
lockdep: fix oops in processing workqueue
2012-05-15 08:08:31 -07:00
netdev/of/phy: Add MDIO bus multiplexer support.
2012-05-07 22:58:09 -04:00
mei: export mei.h for the user space
2012-05-09 13:58:06 -07:00
mm/memcg: apply add/del_page to lruvec
2012-05-29 16:22:28 -07:00
mm: do_migrate_pages(): rename arguments
2012-05-29 16:22:20 -07:00
phy/micrel: Fix ID of KSZ9021
2012-05-22 15:20:28 -04:00
mISDN: Implement MISDN_CTRL_RX_OFF for more drivers
2012-05-16 15:24:36 -04:00
mISDN: Allow to set a minimum length for transparent data
2012-05-16 15:23:46 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-06-01 10:34:35 -07:00
mm/memcg: apply add/del_page to lruvec
2012-05-29 16:22:28 -07:00
mm: remove swap token code
2012-05-29 16:22:19 -07:00
bug: completely remove code generated by disabled VM_BUG_ON()
2012-05-29 16:22:20 -07:00
mm: add link from struct lruvec to struct zone
2012-05-29 16:22:26 -07:00
HID: Allow bus wildcard matching
2012-05-01 12:54:54 +02:00
params: add 3rd arg to option handler callback signature
2012-04-30 14:05:27 -04:00
fat: introduce special inode for managing the FSINFO block
2012-05-31 17:49:27 -07:00
ARM: Orion: Eth: Add clk/clkdev support.
2012-05-08 16:33:56 -07:00
net: add MODULE_ALIAS_NET_PF_PROTO_NAME
2012-05-29 22:33:55 -04:00
netdevice: Update netif_dbg for CONFIG_DYNAMIC_DEBUG
2012-05-30 16:34:27 -04:00
netfilter: remove ip_queue support
2012-05-08 20:25:42 +02:00
NFSv4.1: Add DESTROY_CLIENTID
2012-05-26 14:17:30 -04:00
NFSv4.1 add nfs_inode book keeping for mdsthreshold
2012-05-24 16:15:48 -04:00
NFS: EXCHANGE_ID should save the server major and minor ID
2012-05-22 16:45:48 -04:00
NFS: Clean up - Rename nfs_unlock_request and nfs_unlock_request_dont_release
2012-05-09 15:17:43 -04:00
NFSv4.1: Don't clobber the seqid if exchange_id returns a confirmed clientid
2012-05-26 14:17:31 -04:00
nl80211: prevent additions to old station flags API
2012-05-16 13:08:15 -04:00
mac802154: monitor device support
2012-05-16 15:17:08 -04:00
dt: add of_get_child_count helper function
2012-05-02 01:14:40 +02:00
gpio: Adjust of_xlate API to support multiple GPIO chips
2012-05-18 16:48:36 -06:00
of/i2c: implement of_find_i2c_adapter_by_node
2012-05-12 14:28:17 +02:00
netdev/of/phy: New function: of_mdio_find_bus().
2012-05-07 22:58:09 -04:00
OF: PCI: const usage needed by MIPS
2012-05-21 14:31:48 +01:00
mm, oom: normalize oom scores to oom_score_adj scale only for userspace
2012-05-29 16:22:24 -07:00
mm: page_isolation: MIGRATE_CMA isolation functions added
2012-05-21 15:09:33 +02:00
pagemap.h: fix warning about possibly used before init var
2012-05-29 16:22:18 -07:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-05-29 18:27:19 -07:00
pci_ids: Add Intel Centerton Legacy Block DeviceID
2012-05-09 15:57:01 +02:00
percpu: remove percpu_xxx() functions
2012-05-14 14:15:32 -07:00
Revert "sched, perf: Use a single callback into the scheduler"
2012-05-23 17:40:51 +02:00
netdev/phy: Make get_phy_id() static and quit EXPORTing it.
2012-05-16 00:59:12 -04:00
userns: Convert proc to use kuid/kgid where appropriate
2012-05-15 14:59:28 -07:00
fq_codel: Fair Queue Codel AQM
2012-05-12 15:53:42 -04:00
PM / Runtime: Remove device fields related to suspend time, v2
2012-05-01 21:28:38 +02:00
PM / Domains: Make it possible to add devices to inactive domains
2012-05-18 20:45:26 +02:00
PM / Runtime: Remove device fields related to suspend time, v2
2012-05-01 21:28:38 +02:00
PM / Sleep: Add "prevent autosleep time" statistics to wakeup sources
2012-05-01 21:25:49 +02:00
power_supply: Make the core a boolean instead of a tristate
2012-05-04 21:15:52 -07:00
c/r: prctl: add ability to set new mm_struct::exe_file
2012-05-31 17:49:32 -07:00
kmsg: export printk records to the /dev/kmsg interface
2012-05-07 17:03:27 -07:00
userns: Convert proc to use kuid/kgid where appropriate
2012-05-15 14:59:28 -07:00
pstore/ram: Add ECC support
2012-05-17 08:51:59 -07:00
userns: Use uid_eq gid_eq helpers when comparing kuids and kgids in the vfs
2012-05-03 03:29:34 -07:00
lib: Change mail address of Oskar Schirmer
2012-05-17 15:18:37 +02:00
Merge branches 'barrier.2012.05.09a', 'fixes.2012.04.26a', 'inline.2012.05.02b' and 'srcu.2012.05.07b' into HEAD
2012-05-11 10:14:21 -07:00
rcu: Make exit_rcu() more precise and consolidate
2012-05-02 14:48:27 -07:00
Merge branches 'barrier.2012.05.09a', 'fixes.2012.04.26a', 'inline.2012.05.02b' and 'srcu.2012.05.07b' into HEAD
2012-05-11 10:14:21 -07:00
regmap: add support for non contiguous status to regmap-irq
2012-05-14 17:40:05 +01:00
rescounter: remove __must_check from res_counter_charge_nofail()
2012-05-29 16:22:27 -07:00
rapidio: add DMA engine support for RIO data transfers
2012-05-31 17:49:31 -07:00
rapidio: add DMA engine support for RIO data transfers
2012-05-31 17:49:31 -07:00
mm: move is_vma_temporary_stack() declaration to huge_mm.h
2012-05-29 16:22:21 -07:00
usb/net: rndis: move bus message definition
2012-05-12 15:15:20 -04:00
rtc: add ioctl to get/clear battery low voltage status
2012-05-29 16:22:33 -07:00
most of set_current_blocked() callers want SIGKILL/SIGSTOP removed from set
2012-06-01 12:58:51 -04:00
take security_mmap_file() outside of ->mmap_sem
2012-06-01 10:37:01 -04:00
seqlock: add 'raw_seqcount_begin()' function
2012-05-04 15:13:54 -07:00
serial: delete the MCA specific 8250 support.
2012-05-17 19:02:14 -04:00
Merge branch 'delete-mca' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2012-05-23 17:12:06 -07:00
sh: intc: Kill off special reservation interface.
2012-05-22 19:07:55 +09:00
userns: Convert tmpfs to use kuid and kgid where appropriate
2012-05-15 14:59:29 -07:00
new helper: signal_delivered()
2012-06-01 12:58:52 -04:00
skb: avoid unnecessary reallocations in __skb_cow
2012-05-29 17:30:08 -04:00
introduce SIZE_MAX
2012-05-31 17:49:26 -07:00
smp: Implement kick_all_cpus_sync()
2012-05-08 12:35:06 +02:00
rcu: Implement per-domain single-threaded call_srcu() state machine
2012-04-30 10:48:25 -07:00
userns: Convert stat to return values mapped from kuids and kgids
2012-05-15 14:08:35 -07:00
stmmac: add mixed burst for DMA
2012-05-14 18:53:19 -04:00
PM / Sleep: Add "prevent autosleep time" statistics to wakeup sources
2012-05-01 21:25:49 +02:00
mm/memcg: apply add/del_page to lruvec
2012-05-29 16:22:28 -07:00
syscalls, x86: add __NR_kcmp syscall
2012-05-31 17:49:32 -07:00
sysfs: get rid of some lockdep false positives
2012-05-14 12:19:56 -07:00
task_work_add: generic process-context callbacks
2012-05-23 22:09:21 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-05-22 19:22:50 -07:00
set_restore_sigmask() is never called without SIGPENDING (and never should be)
2012-06-01 12:58:50 -04:00
ARM: OMAP: WiLink platform data for the PandaBoard
2012-05-09 14:19:13 -07:00
time: remove obsolete declaration
2012-05-21 16:16:58 -07:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-05-22 18:27:32 -07:00
keys: kill the dummy key_replace_session_keyring()
2012-05-23 22:11:31 -04:00
tty: Revert the tty locking series, it needs more work
2012-06-02 15:21:43 -07:00
tty: move global ldisc idle waitqueue to the individual ldisc
2012-05-10 11:24:03 -07:00
bury __kernel_nlink_t, make internal nlink_t consistent
2012-05-30 21:04:50 -04:00
USB: Fix core compile with CONFIG_USB_SUSPEND=n
2012-05-21 09:00:03 -07:00
userns: Replace user_ns_map_uid and user_ns_map_gid with from_kuid and from_kgid
2012-05-03 03:28:39 -07:00
uuid: add uuid.h to exported header list
2012-05-09 13:57:30 -07:00
[media] v4l2-dv-timings.h: definitions for CEA-861 and VESA DMT timings
2012-05-20 08:27:44 -03:00
vga_switcheroo: Add the support for audio clients
2012-05-13 11:27:21 +02:00
vgaarb: Provide dummy default device functions
2012-05-03 09:30:55 +01:00
[media] V4L2: Mark the DV Preset API as deprecated
2012-05-20 08:31:52 -03:00
virtio: fix typo in comment
2012-05-22 12:16:16 +09:30
watchdog: Add support for dynamically allocated watchdog_device structs
2012-05-30 07:55:31 +02:00
writeback: Avoid iput() from flusher thread
2012-05-06 13:43:41 +08:00
