Linus Torvalds
1ee2dcc224
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking fixes from David Miller:
"Mostly these are fixes for fallout due to merge window changes, as
well as cures for problems that have been with us for a much longer
period of time"
1) Johannes Berg noticed two major deficiencies in our genetlink
registration. Some genetlink protocols we passing in constant
counts for their ops array rather than something like
ARRAY_SIZE(ops) or similar. Also, some genetlink protocols were
using fixed IDs for their multicast groups.
We have to retain these fixed IDs to keep existing userland tools
working, but reserve them so that other multicast groups used by
other protocols can not possibly conflict.
In dealing with these two problems, we actually now use less state
management for genetlink operations and multicast groups.
2) When configuring interface hardware timestamping, fix several
drivers that simply do not validate that the hwtstamp_config value
is one the driver actually supports. From Ben Hutchings.
3) Invalid memory references in mwifiex driver, from Amitkumar Karwar.
4) In dev_forward_skb(), set the skb->protocol in the right order
relative to skb_scrub_packet(). From Alexei Starovoitov.
5) Bridge erroneously fails to use the proper wrapper functions to make
calls to netdev_ops->ndo_vlan_rx_{add,kill}_vid. Fix from Toshiaki
Makita.
6) When detaching a bridge port, make sure to flush all VLAN IDs to
prevent them from leaking, also from Toshiaki Makita.
7) Put in a compromise for TCP Small Queues so that deep queued devices
that delay TX reclaim non-trivially don't have such a performance
decrease. One particularly problematic area is 802.11 AMPDU in
wireless. From Eric Dumazet.
8) Fix crashes in tcp_fastopen_cache_get(), we can see NULL socket dsts
here. Fix from Eric Dumzaet, reported by Dave Jones.
9) Fix use after free in ipv6 SIT driver, from Willem de Bruijn.
10) When computing mergeable buffer sizes, virtio-net fails to take the
virtio-net header into account. From Michael Dalton.
11) Fix seqlock deadlock in ip4_datagram_connect() wrt. statistic
bumping, this one has been with us for a while. From Eric Dumazet.
12) Fix NULL deref in the new TIPC fragmentation handling, from Erik
Hugne.
13) 6lowpan bit used for traffic classification was wrong, from Jukka
Rissanen.
14) macvlan has the same issue as normal vlans did wrt. propagating LRO
disabling down to the real device, fix it the same way. From Michal
Kubecek.
15) CPSW driver needs to soft reset all slaves during suspend, from
Daniel Mack.
16) Fix small frame pacing in FQ packet scheduler, from Eric Dumazet.
17) The xen-netfront RX buffer refill timer isn't properly scheduled on
partial RX allocation success, from Ma JieYue.
18) When ipv6 ping protocol support was added, the AF_INET6 protocol
initialization cleanup path on failure was borked a little. Fix
from Vlad Yasevich.
19) If a socket disconnects during a read/recvmsg/recvfrom/etc that
blocks we can do the wrong thing with the msg_name we write back to
userspace. From Hannes Frederic Sowa. There is another fix in the
works from Hannes which will prevent future problems of this nature.
20) Fix route leak in VTI tunnel transmit, from Fan Du.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (106 commits)
genetlink: make multicast groups const, prevent abuse
genetlink: pass family to functions using groups
genetlink: add and use genl_set_err()
genetlink: remove family pointer from genl_multicast_group
genetlink: remove genl_unregister_mc_group()
hsr: don't call genl_unregister_mc_group()
quota/genetlink: use proper genetlink multicast APIs
drop_monitor/genetlink: use proper genetlink multicast APIs
genetlink: only pass array to genl_register_family_with_ops()
tcp: don't update snd_nxt, when a socket is switched from repair mode
atm: idt77252: fix dev refcnt leak
xfrm: Release dst if this dst is improper for vti tunnel
netlink: fix documentation typo in netlink_set_err()
be2net: Delete secondary unicast MAC addresses during be_close
be2net: Fix unconditional enabling of Rx interface options
net, virtio_net: replace the magic value
ping: prevent NULL pointer dereference on write to msg_name
bnx2x: Prevent "timeout waiting for state X"
bnx2x: prevent CFC attention
bnx2x: Prevent panic during DMAE timeout
...
2013-11-19 15:50:47 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-11-15 16:47:22 -08:00
bcma: make bcma_core_pci_{up,down}() callable from atomic context
2013-09-26 14:02:33 -04:00
ARM: mxs: remove custom .init_time hook
2013-09-29 21:09:34 +02:00
extcon: gpio: Add support for active-low presence to detect pins
2013-09-27 09:37:01 +09:00
fsl /bestcomm
gpiolib: provide a declaration of seq_file in gpio/driver.h
2013-10-29 18:26:15 -07:00
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2013-11-18 15:50:07 -08:00
iio: Remove unused iio_sw_buffer_preenable()
2013-10-16 19:17:06 +01:00
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2013-11-14 08:51:29 +09:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-11-15 16:47:22 -08:00
net/mlx4_en: Datapath structures are allocated per NUMA node
2013-11-07 19:22:48 -05:00
mlx5: Use enum to indicate adapter page size
2013-11-08 14:43:01 -08:00
mmc: core: Add MMC_CAP_RUNTIME_RESUME to resume at runtime_resume
2013-10-30 20:28:43 -04:00
mtd: nand_bbt: kill NAND_BBT_SCANALLPAGES
2013-11-06 23:33:14 -08:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2013-11-04 19:46:58 -05:00
drivers: phy: add generic PHY framework
2013-09-27 17:35:41 -07:00
pinctrl/gpio: non-linear GPIO ranges accesible from gpiolib
2013-10-16 15:33:50 +02:00
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2013-11-18 15:50:07 -08:00
power_supply: Add support for bq24735 charger
2013-10-25 15:56:51 -07:00
Merge remote-tracking branch 'regulator/topic/optional' into regulator-next
2013-10-24 11:11:39 +01:00
Merge branch 'sched/core' into core/locking, to prepare the kernel/locking/ file move
2013-11-06 07:50:37 +01:00
Merge remote-tracking branch 'spi/topic/wr' into spi-next
2013-10-25 09:51:41 +01:00
ssb: provide phy address for Gigabit Ethernet driver
2013-10-02 15:40:57 -04:00
SUNRPC: Add a helper to switch the transport of an rpc_clnt
2013-10-28 15:21:32 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-11-13 17:40:34 +09:00
PCI changes for the v3.13 merge window:
2013-11-14 14:02:00 +09:00
gpiolib / ACPI: allow passing GPIOF_ACTIVE_LOW for GpioInt resources
2013-10-19 23:32:14 +02:00
... and kill anon_inode_getfile_private()
2013-11-09 00:16:28 -05:00
libata: Add some missing command descriptions
2013-10-27 08:40:39 -04:00
tty/serial: at91: add a fallback option to determine uart/usart property
2013-10-17 13:31:19 -07:00
bdi: test bdi_init failure
2013-11-08 08:59:44 -07:00
backlight: introduce backlight_device_registered
2013-10-16 01:16:04 +02:00
mm: avoid reinserting isolated balloon pages into LRU lists
2013-09-30 14:31:02 -07:00
Merge branch 'akpm' (patches from Andrew Morton)
2013-11-13 15:45:43 +09:00
Merge branch 'blk-mq/core' into for-3.13/core
2013-11-08 09:08:12 -07:00
ACPI and power management updates for 3.13-rc1
2013-11-14 13:41:48 +09:00
blk-mq: fix for flush deadlock
2013-10-28 13:33:58 -06:00
blk-mq: new multi-queue block IO queueing mechanism
2013-10-25 11:56:00 +01:00
blk-mq: new multi-queue block IO queueing mechanism
2013-10-25 11:56:00 +01:00
kernel: trace: blktrace: remove redundent memcpy() in compat_blk_trace_setup()
2013-11-08 09:04:30 -07:00
clk: of: helper for determining number of parent clocks
2013-10-07 23:13:33 -07:00
clockchips: Add FEAT_PERCPU clockevent flag
2013-10-02 11:33:23 +02:00
cmdline-parser: fix build
2013-11-15 09:32:23 +09:00
Merge branch 'akpm' (patches from Andrew Morton)
2013-11-13 15:45:43 +09:00
compiler/gcc4: Add quirk for 'asm goto' miscompilation bug
2013-10-11 07:39:14 +02:00
sched: remove INIT_COMPLETION
2013-11-15 09:32:21 +09:00
constify do_coredump() argument
2013-11-09 00:16:29 -05:00
ACPI, APEI, CPER: Add UEFI 2.4 support for memory error
2013-10-23 10:10:20 -07:00
ACPI and power management updates for 3.13-rc1
2013-11-14 13:41:48 +09:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2013-11-15 14:19:54 +09:00
cpuidle: remove cpuidle_unregister_governor()
2013-10-30 01:21:24 +01:00
cpuset: Fix potential deadlock w/ set_mems_allowed
2013-11-06 12:40:27 +01:00
lib: crc32: add functionality to combine two crc32{, c}s in GF(2)
2013-11-03 23:04:56 -05:00
VFS: Put a small type field into struct dentry::d_flags
2013-11-09 00:16:30 -05:00
fs/debugfs: add declaration for no CONFIG_DEBUG_FS
2013-10-03 16:14:12 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-11-15 16:47:22 -08:00
device: Make dev_WARN/dev_WARN_ONCE print device as well as driver name
2013-10-29 16:06:07 -07:00
ARM: 7795/1: mm: dma-mapping: Add dma_max_pfn(dev) helper function
2013-10-31 14:49:24 +00:00
DMI: Parse memory device (type 17) in SMBIOS
2013-10-23 10:10:12 -07:00
EDAC, GHES: Update ghes error record info
2013-10-23 10:11:00 -07:00
switch elf_coredump_extra_notes_write() to dump_emit()
2013-11-09 00:16:24 -05:00
switch elf_core_write_extra_data() to dump_emit()
2013-11-09 00:16:23 -05:00
[networking]device.h: Remove extern from function prototypes
2013-09-26 15:06:58 -07:00
asmlinkage, module: Make ksymtab and kcrctab symbols and __this_module __visible
2013-10-29 09:43:37 +10:30
extcon: Simplify extcon_dev_register() prototype by removing unnecessary parameter
2013-09-27 09:37:01 +09:00
framebuffer: Add fb_<level> convenience logging macros
2013-10-29 12:53:04 +02:00
[networking]device.h: Remove extern from function prototypes
2013-09-26 15:06:58 -07:00
[networking]device.h: Remove extern from function prototypes
2013-09-26 15:06:58 -07:00
net: fix unsafe set_memory_rw from softirq
2013-10-07 15:16:45 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-11-13 15:34:18 +09:00
FS-Cache: Provide the ability to enable/disable cookies
2013-09-27 18:40:25 +01:00
FS-Cache: Provide the ability to enable/disable cookies
2013-09-27 18:40:25 +01:00
tracing: Make register/unregister_ftrace_command __init
2013-11-05 17:43:40 -05:00
tracing: Update event filters for multibuffer
2013-11-05 16:50:20 -05:00
lib/genalloc: add a helper function for DMA buffer allocation
2013-11-13 12:09:22 +09:00
genetlink: make multicast groups const, prevent abuse
2013-11-19 16:39:06 -05:00
GPIO bulk changes for the v3.13 development cycle
2013-11-12 15:50:46 +09:00
hashtable: add hash_for_each_possible_rcu_notrace()
2013-10-11 17:21:14 +11:00
HID: Delay opening HID device
2013-10-01 16:19:08 +01:00
[networking]device.h: Remove extern from function prototypes
2013-09-26 15:06:58 -07:00
gpu: host1x: Add syncpoint base support
2013-10-31 09:55:48 +01:00
mm, thp: move ptl taking inside page_check_address_pmd()
2013-11-15 09:32:14 +09:00
mm, hugetlb: convert hugetlbfs to use split pmd lock
2013-11-15 09:32:14 +09:00
hwmon: (atxp1) Set and use error code from vid_to_reg()
2013-10-13 16:16:26 -07:00
hwmon: Provide managed hwmon registration
2013-10-13 16:16:28 -07:00
Merge 3.12-rc3 into char-misc-next
2013-09-29 18:27:03 -07:00
i2c: Remove redundant 'driver' field from the i2c_client struct
2013-10-03 22:28:31 +02:00
ide: convert bus code to use dev_groups
2013-10-16 18:40:57 -07:00
mac80211: process the CSA frame for mesh accordingly
2013-10-28 15:05:28 +01:00
macvlan: introduce macvlan_dev_real_dev() helper function
2013-11-15 17:55:48 -05:00
vlan: Implement vlan_dev_get_egress_qos_mask as an inline.
2013-11-11 00:42:07 -05:00
[networking]device.h: Remove extern from function prototypes
2013-09-26 15:06:58 -07:00
init.h: document the existence of __initconst
2013-11-13 12:09:26 +09:00
seqcount: Add lockdep functionality to seqcount/seqlock structures
2013-11-06 12:40:26 +01:00
revert "softirq: Add support for triggering softirq work on softirqs"
2013-11-15 09:32:22 +09:00
ipc, msg: forbid negative values for "msg{max,mnb,mni}"
2013-11-03 10:53:11 -08:00
ipv6: Remove privacy config option.
2013-10-28 20:07:50 -04:00
genirq: Prevent spurious detection for unconditionally polled interrupts
2013-11-13 16:03:02 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-11-13 17:40:34 +09:00
static_key: WARN on usage before jump_label_init was called
2013-10-19 19:45:35 -04:00
kdb: Add support for external NMI handler to call KGDB/KDB
2013-10-03 18:47:54 +02:00
tools/vm/page-types.c: support KPF_SOFTDIRTY bit
2013-11-13 12:09:07 +09:00
tracing: Remove unused function ftrace_off_permanent()
2013-11-06 15:26:55 -05:00
kfifo API type safety
2013-11-15 09:32:23 +09:00
kdb: Add support for external NMI handler to call KGDB/KDB
2013-10-03 18:47:54 +02:00
kobject: introduce kobj_completion
2013-09-26 16:17:33 -07:00
sysfs: remove ktype->namespace() invocations in directory code
2013-09-26 15:30:22 -07:00
Merge branch 'kvm-ppc-queue' of git://github.com/agraf/linux-2.6 into queue
2013-11-04 10:20:57 +02:00
no need to keep brlock macros anymore...
2013-11-09 00:16:21 -05:00
list: introduce list_last_entry(), use list_{first,last}_entry()
2013-11-13 12:09:24 +09:00
llists: move llist_reverse_order from raid5 to llist.c
2013-11-15 09:32:22 +09:00
seqcount: Add lockdep functionality to seqcount/seqlock structures
2013-11-06 12:40:26 +01:00
lockref: use BLOATED_SPINLOCKS to avoid explicit config dependencies
2013-11-15 09:32:20 +09:00
mm/memblock.c: introduce bottom-up allocation mode
2013-11-13 12:09:08 +09:00
mm: memcg: handle non-error OOM situations more gracefully
2013-10-16 21:35:53 -07:00
mm/sparsemem: use PAGES_PER_SECTION to remove redundant nr_pages parameter
2013-11-13 12:09:06 +09:00
mm, mempolicy: make mpol_to_str robust and always succeed
2013-11-13 12:09:05 +09:00
mm: numa: Scan pages with elevated page_mapcount
2013-10-09 12:40:32 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
2013-11-13 15:27:00 +09:00
mm: create a separate slab for page->ptl allocation
2013-11-15 09:32:20 +09:00
mm: properly separate the bloated ptl from the regular case
2013-11-15 09:32:20 +09:00
mm: factor commit limit calculation
2013-11-13 12:09:11 +09:00
RCU'd vfsmounts
2013-11-09 00:16:19 -05:00
ipc, msg: fix message length check for negative values
2013-11-13 12:09:36 +09:00
PCI: Add x86_msi.msi_mask_irq() and msix_mask_irq()
2013-11-06 16:32:19 -07:00
locking/doc: Update references to kernel/mutex.c
2013-11-11 12:41:33 +01:00
RCU'd vfsmounts
2013-11-09 00:16:19 -05:00
net: make net_get_random_once irq safe
2013-10-25 19:03:39 -04:00
net: Add layer 2 hardware acceleration operations for macvlan devices
2013-11-07 19:11:41 -05:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-11-15 16:47:22 -08:00
netfilter: add nftables
2013-10-14 17:15:48 +02:00
netfilter: Remove extern from function prototypes
2013-09-26 14:48:15 -07:00
netfilter: Remove extern from function prototypes
2013-09-26 14:48:15 -07:00
netfilter: Remove extern from function prototypes
2013-09-26 14:48:15 -07:00
netpoll: fix rx_hook() interface by passing the skb
2013-10-25 19:26:58 -04:00
Merge branch 'nfsd-next' of git://linux-nfs.org/~bfields/linux
2013-11-16 12:04:02 -08:00
NFS: Use i_writecount to control whether to get an fscache cookie in nfs_open()
2013-09-27 18:40:25 +01:00
NFS: cache parsed auth_info in nfs_server
2013-10-28 15:37:43 -04:00
NFS: add support for multiple sec= mount options
2013-10-28 15:38:02 -04:00
DeviceTree updates for 3.13. This is a bit larger pull request than
2013-11-12 16:52:17 +09:00
of: move of_translate_dma_address to of_address.h
2013-10-09 20:04:10 -05:00
of: introduce common FDT machine related functions
2013-10-09 20:03:54 -05:00
gpiolib: include gpio/consumer.h in of_gpio.h for desc_to_gpio()
2013-10-29 18:26:14 -07:00
dt/irq: add empty of_irq_count for !OF_IRQ
2013-11-08 10:47:28 -06:00
of_mtd: Add no-op stubs to support CONFIG_OF=n
2013-10-27 16:26:58 -07:00
of/irq: Create of_irq_parse_and_map_pci() to consolidate arch code.
2013-10-24 11:50:36 +01:00
mm: add a helper function to check may oom condition
2013-11-13 12:09:04 +09:00
mm: numa: Change page last {nid,pid} into {cpu,pid}
2013-10-09 14:47:45 +02:00
powerpc: Prepare to support kernel handling of IOMMU map/unmap
2013-10-11 17:24:39 +11:00
PCI: Add pci_upstream_bridge()
2013-11-07 14:44:27 -07:00
Merge branch 'for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2013-11-13 15:17:16 +09:00
percpu_ida: add an API to return free tags
2013-10-25 11:56:00 +01:00
perf: Add generic transaction flags
2013-10-04 10:06:08 +02:00
pid_namespace: make freeing struct pid_namespace rcu-delayed
2013-10-24 23:43:29 -04:00
driver core: prevent deferred probe with platform_driver_probe
2013-09-26 16:18:32 -07:00
PM / OPP: rename header to linux/pm_opp.h
2013-10-25 22:33:23 +02:00
PowerCap: Add class driver
2013-10-17 00:36:06 +02:00
preempt: Make PREEMPT_ACTIVE generic
2013-11-13 20:21:47 +01:00
printk: pr_debug_ratelimited: check state first to reduce "callbacks suppressed" messages
2013-10-29 16:50:52 -07:00
pwm-backlight: Add optional enable GPIO
2013-10-16 09:05:57 +02:00
random32: upgrade taus88 generator to taus113 from errata paper
2013-11-11 14:32:15 -05:00
rbtree: fix rbtree_postorder_for_each_entry_safe() iterator
2013-11-13 12:09:33 +09:00
Merge remote-tracking branch 'regmap/topic/spmi' into regmap-next
2013-10-28 13:01:35 -07:00
net: fix rtnl notification in atomic context
2013-10-25 19:03:45 -04:00
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-11-19 10:40:00 -08:00
sched_clock: Remove sched_clock_func() hook
2013-10-09 16:54:39 -07:00
seq_file: introduce seq_setwidth() and seq_pad()
2013-11-15 09:32:20 +09:00
seqcount: Add lockdep functionality to seqcount/seqlock structures
2013-11-06 12:40:26 +01:00
serial: core: delete .set_wake() callback
2013-10-16 13:16:19 -07:00
intel_mid: Move platform device setups to their own platform_<device>.* files
2013-10-17 16:41:50 -07:00
net: Handle CHECKSUM_COMPLETE more adequately in pskb_trim_rcsum().
2013-11-15 21:11:16 -05:00
kernel-provide-a-__smp_call_function_single-stub-for-config_smp-fix
2013-11-15 09:32:22 +09:00
srcu: API for barrier after srcu read unlock
2013-11-06 09:32:09 +02:00
stop_machine: Introduce stop_two_cpus()
2013-10-09 12:40:45 +02:00
mm, hugetlb: convert hugetlbfs to use split pmd lock
2013-11-15 09:32:14 +09:00
This batch of changes is mostly clean ups and small bug fixes.
2013-11-16 12:23:18 -08:00
sysfs: clean up sysfs_get_dirent()
2013-09-26 15:33:18 -07:00
sysrq: Allow magic SysRq key functions to be disabled through Kconfig
2013-10-16 13:01:44 -07:00
ARM: tegra: Add Tegra114 powergate support
2013-10-18 16:28:11 -06:00
thinkpad-acpi: Add mute and mic-mute LED functionality
2013-10-17 14:38:44 +02:00
These patches are designed to enable improvements to /dev/random for
2013-10-10 12:31:43 -07:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-11-12 10:20:12 +09:00
net: Explicitly initialize u64_stats_sync structures for lockdep
2013-11-06 12:40:25 +01:00
uprobes: Export write_opcode() as uprobe_write_opcode()
2013-11-06 20:00:09 +01:00
usb: Don't enable USB 2.0 Link PM by default.
2013-10-16 12:24:19 -07:00
usb-storage: add quirk for mandatory READ_CAPACITY_16
2013-10-16 13:32:04 -07:00
Revert "i915: Update VGA arbiter support for newer devices"
2013-10-11 15:19:22 +10:00
virtio_ring: add new function virtqueue_is_broken()
2013-10-29 11:28:17 +10:30
virtio_config: remove virtio_config_val
2013-10-17 10:55:37 +10:30
virtio_ring: change host notification API
2013-10-29 11:28:11 +10:30
mm: numa: return the number of base pages altered by protection changes
2013-11-13 12:09:11 +09:00
sched/wait: Fix __wait_event_interruptible_lock_irq_timeout()
2013-11-01 08:42:44 +01:00
writeback: do not sync data dirtied after sync start
2013-11-13 12:09:07 +09:00
yam: integer underflow in yam_ioctl()
2013-10-17 15:53:09 -04:00
