Linus Torvalds
4ac4d58488
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking fixes from David Miller:
1) The wireless rate info fix from Johannes Berg.
2) When a RAW socket is in hdrincl mode, we need to make sure that the
user provided at least a minimally sized ipv4/ipv6 header. Fix from
Alexander Potapenko.
3) We must emit IFLA_PHYS_PORT_NAME netlink attributes using
nla_put_string() so that it is NULL terminated.
4) Fix a bug in TCP fastopen handling, wherein child sockets
erroneously inherit the fastopen_req from the parent, and later can
end up derefencing freed memory or doing a double free. From Eric
Dumazet.
5) Don't clear out netdev stats at close time in tg3 driver, from
YueHaibing.
6) Fix refcount leak in xt_CT, from Gao Feng.
7) In nft_set_bitmap() don't leak dummy elements, from Liping Zhang.
8) Fix deadlock due to taking the expectation lock twice, also from
Liping Zhang.
9) Make xt_socket work again with ipv6, from Peter Tirsek.
10) Don't allow IPV6 to be used with IPVS if ipv6.disable=1, from Paolo
Abeni.
11) Make the BPF loader more flexible wrt. changes to the bpf MAP entry
layout. From Jesper Dangaard Brouer.
12) Fix ethtool reported device name in aquantia driver, from Pavel
Belous.
13) Fix build failures due to the compile time size test not working in
netfilter conntrack. From Geert Uytterhoeven.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (52 commits)
cfg80211: make RATE_INFO_BW_20 the default
ipv6: initialize route null entry in addrconf_init()
qede: Fix possible misconfiguration of advertised autoneg value.
qed: Fix overriding of supported autoneg value.
qed*: Fix possible overflow for status block id field.
rtnetlink: NUL-terminate IFLA_PHYS_PORT_NAME string
netvsc: make sure napi enabled before vmbus_open
aquantia: Fix driver name reported by ethtool
ipv4, ipv6: ensure raw socket message is big enough to hold an IP header
net/sched: remove redundant null check on head
tcp: do not inherit fastopen_req from parent
forcedeth: remove unnecessary carrier status check
ibmvnic: Move queue restarting in ibmvnic_tx_complete
ibmvnic: Record SKB RX queue during poll
ibmvnic: Continue skb processing after skb completion error
ibmvnic: Check for driver reset first in ibmvnic_xmit
ibmvnic: Wait for any pending scrqs entries at driver close
ibmvnic: Clean up tx pools when closing
ibmvnic: Whitespace correction in release_rx_pools
ibmvnic: Delete napi's when releasing driver resources
...
2017-05-04 12:26:43 -07:00
can: complete initial namespace support
2017-04-25 09:04:29 +02:00
libceph: osd_request_timeout option
2017-03-07 14:30:38 +01:00
firmware /meson
This is the bulk of GPIO changes for the v4.12 kernel cycle:
2017-05-04 12:05:32 -07:00
Merge branch 'for-4.12/asus' into for-linus
2017-05-02 11:02:41 +02:00
iio: sw-device: Fix config group initialization
2017-03-13 20:42:34 +00:00
Input: eeti_ts - switch to gpiod API
2017-04-05 08:52:33 -07:00
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2017-05-01 16:15:18 -07:00
mailbox: Add driver for Broadcom FlexRM ring manager
2017-03-28 23:33:30 +05:30
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2017-05-03 12:38:20 -07:00
IB/mlx4: Support RAW Ethernet when RoCE is disabled
2017-04-21 12:26:05 -04:00
Updates for 4.12 kernel merge window
2017-05-03 12:45:55 -07:00
mmc: core: Export API to allow hosts to get the card address
2017-04-24 21:49:15 +02:00
mtd: Convert to dynamically allocated bdi infrastructure
2017-04-20 12:09:55 -06:00
netfilter: Add nfnl_msg_type() helper function
2017-04-07 16:31:36 +02:00
ebtables: remove nf_hook_register usage
2017-04-26 09:30:21 +02:00
This is the bulk of pin control changes for the v4.12 cycle:
2017-05-02 17:59:33 -07:00
platform-drivers-x86 for v4.12-1
2017-05-04 11:56:59 -07:00
power: supply: bq24190_charger: Use i2c-core irq-mapping code
2017-04-14 01:41:34 +02:00
qed*: Fix possible overflow for status block id field.
2017-05-04 12:31:02 -04:00
Merge remote-tracking branches 'regulator/topic/notifier', 'regulator/topic/pfuze100', 'regulator/topic/settle', 'regulator/topic/tps65132' and 'regulator/topic/twl6030' into regulator-next
2017-04-30 22:17:36 +09:00
soc: qcom: smd: Remove standalone driver
2017-03-28 17:58:07 -07:00
mm: introduce memalloc_nofs_{save,restore} API
2017-05-03 15:52:09 -07:00
soc: qcom: smd: Remove standalone driver
2017-03-28 17:58:07 -07:00
Merge remote-tracking branches 'spi/topic/ti-qspi' and 'spi/topic/xlp' into spi-next
2017-04-26 15:58:22 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2017-05-02 16:40:27 -07:00
This is the bulk of GPIO changes for the v4.12 kernel cycle:
2017-05-04 12:05:32 -07:00
libata: remove SCT WRITE SAME support
2017-04-28 18:09:59 -04:00
locking/atomic: Fix atomic_try_cmpxchg() semantics
2017-03-30 09:35:54 +02:00
audit: Use timespec64 to represent audit timestamps
2017-05-02 10:16:05 -04:00
fs: Provide infrastructure for dynamic BDIs in filesystems
2017-04-20 12:09:55 -06:00
bdi: Drop 'parent' argument from bdi_register[_va]()
2017-04-20 12:09:55 -06:00
sched/headers, vfs/execve: Move the do_execve*() prototypes from <linux/sched.h> to <linux/binfmts.h>
2017-03-03 01:45:23 +01:00
Merge branch 'md-next' into md-linus
2017-05-01 14:09:21 -07:00
Revert "blkcg: allocate struct blkcg_gq outside request queue spinlock"
2017-03-29 11:25:48 -06:00
blk-mq: unify hctx delay_work and run_work
2017-04-28 08:11:43 -06:00
block: add a REQ_NOUNMAP flag for REQ_OP_WRITE_ZEROES
2017-04-08 11:25:38 -06:00
Merge branch 'for-4.12/block' of git://git.kernel.dk/linux-block
2017-05-01 10:39:57 -07:00
bpf: remove struct bpf_map_type_list
2017-04-11 14:38:43 -04:00
bpf: remove struct bpf_map_type_list
2017-04-11 14:38:43 -04:00
bpf: add helper inlining infra and optimize map_array lookup
2017-03-16 20:44:11 -07:00
net: phy: bcm7xxx: add support for 28nm EPHY
2017-03-13 21:51:49 -07:00
debug: Add _ONCE() logic to report_bug()
2017-03-30 09:37:20 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2017-04-05 21:57:07 +08:00
cgroup: move cgroup_subsys_state parent field for cache locality
2017-04-11 09:06:17 +09:00
Merge branch 'for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2017-05-01 13:52:24 -07:00
kernel-api.rst: fix a series of errors when parsing C files
2017-04-02 14:31:49 -06:00
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2017-05-01 16:15:18 -07:00
clocksource: Use GENMASK_ULL in definition of CLOCKSOURCE_MASK
2017-04-20 14:56:58 +02:00
coda: Convert to separately allocated bdi
2017-04-20 12:09:55 -06:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2017-05-03 08:50:52 -07:00
perf/core: Keep AUX flags in the output handle
2017-03-16 09:51:10 +01:00
cpufreq: schedutil: Use policy-dependent transition delays
2017-04-17 18:37:27 +02:00
cpumask: Add helper cpumask_available()
2017-04-14 19:50:47 +02:00
cpuset: Remove cpuset_update_active_cpus()'s parameter.
2017-04-11 08:57:54 +09:00
crypto: api - Extend algorithm name limit to 128 bytes
2017-04-10 19:17:27 +08:00
md5: remove from lib and only live in crypto
2017-03-24 22:02:56 +08:00
dccp: fix use-after-free in dccp_feat_activate_values
2017-03-07 14:15:27 -08:00
sched/headers: Remove <linux/sched.h> and <linux/slab.h> from <linux/delayacct.h>
2017-03-03 01:45:28 +01:00
ALSA: hda - use dell_micmute_led_set() instead of dell_app_wmi_led_set()
2017-03-06 22:06:59 +01:00
PM / devfreq: Move struct devfreq_governor to devfreq directory
2017-04-12 12:42:14 +09:00
- A major update for DM cache that reduces the latency for deciding
2017-05-03 10:31:20 -07:00
drivers core: remove assert_held_device_hotplug()
2017-03-16 16:56:19 -07:00
dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro
2017-04-20 13:47:46 +05:30
dma-fence: add dma_fence_match_context helper
2017-03-17 23:51:36 +05:30
EDAC: Rename report status accessors
2017-04-10 17:15:02 +02:00
efi/bgrt: Enable ACPI BGRT handling on arm64
2017-04-05 12:27:25 +02:00
efi/libstub/arm/arm64: Disable debug prints on 'quiet' cmdline arg
2017-04-05 12:27:28 +02:00
blk-mq-sched: make completed_request() callback more useful
2017-04-14 14:06:57 -06:00
tcp: mark skbs with SCM_TIMESTAMPING_OPT_STATS
2017-03-21 18:44:17 -07:00
etherdevice: remove unused eth_addr_greater
2017-03-12 23:54:07 -07:00
ethtool: add CRC32 as an RSS hash function
2017-03-09 16:39:58 -08:00
extcon: Add new extcon_register_notifier_all() to monitor all external connectors
2017-04-04 11:22:42 +09:00
sched/headers: Remove <linux/sched.h> and <linux/slab.h> from <linux/delayacct.h>
2017-03-03 01:45:28 +01:00
bpf: make bpf_xdp_adjust_head support mandatory
2017-04-24 16:18:10 -04:00
Documentation: Add flexible-arrays.rst to the documentation tree
2017-03-29 14:50:21 -06:00
Merge branch 'fsnotify' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
2017-05-03 11:05:15 -07:00
fscrypt: eliminate ->prepare_context() operation
2017-03-15 14:15:47 -04:00
fsnotify: Move ->free_mark callback to fsnotify_ops
2017-04-10 17:37:36 +02:00
ftrace: Have the function probes call their own function
2017-04-20 22:06:43 -04:00
device property: Add support for fwnode endpoints
2017-03-29 00:00:29 +02:00
block: get rid of blk_integrity_revalidate()
2017-04-21 14:17:27 -06:00
mm: fix spelling error
2017-05-03 15:52:10 -07:00
drm/edid: check for HF-VSDB block
2017-03-21 10:15:47 +02:00
Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112', 'for-4.12/hid-core-null-state-handling', 'for-4.12/hiddev', 'for-4.12/i2c-hid', 'for-4.12/innomedia', 'for-4.12/logitech-hidpp-battery-power-supply', 'for-4.12/multitouch', 'for-4.12/nti', 'for-4.12/upstream' and 'for-4.12/wacom' into for-linus
2017-05-02 11:01:10 +02:00
HID: hiddev: reallocate hiddev's minor number
2017-03-21 15:24:01 +01:00
time: Change k_clock nsleep() to use timespec64
2017-04-14 21:49:56 +02:00
mm: convert generic code to 5-level paging
2017-03-09 11:48:47 -08:00
hwmon: Constify str parameter of hwmon_ops->read_string
2017-04-02 07:01:53 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-04-06 08:24:51 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2017-05-03 12:38:20 -07:00
scsi: introduce a result field in struct scsi_request
2017-04-20 12:16:10 -06:00
mac80211: Add support for BSS max idle period element
2017-04-28 12:28:45 +02:00
bridge: add per-port broadcast flood flag
2017-04-27 16:34:29 -04:00
net/utils: generic inet_pton_with_scope helper
2017-04-04 09:48:23 -06:00
net: devinet: Refactor inet_netconf_notify_devconf to take event
2017-03-28 22:32:42 -07:00
ftrace: Allow for function tracing to record init functions on boot up
2017-03-24 20:51:49 -04:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2017-05-03 08:50:52 -07:00
iommu: Disambiguate MSI region types
2017-03-22 16:16:17 +01:00
net: ipv6: Add sysctl for minimum prefix len acceptable in RIOs.
2017-03-22 14:20:54 -07:00
irqdomain: Add empty irq_domain_check_msi_remap
2017-03-06 14:40:04 +00:00
jbd2: mark the transaction context with the scope GFP_NOFS context
2017-05-03 15:52:09 -07:00
There was some breakage with the changes for jump labels in the 4.11 merge
2017-03-07 09:37:28 -08:00
kasan: report only the first error by default
2017-03-31 17:13:30 -07:00
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2017-05-02 15:53:46 -07:00
KEYS: Add an optional lookup_restriction hook to key_type
2017-04-04 14:10:11 -07:00
KEYS: Add KEYCTL_RESTRICT_KEYRING
2017-04-04 14:10:12 -07:00
kobject: Export kobject_get_unless_zero()
2017-03-22 20:11:35 -06:00
trace/kprobes: Fix check for kretprobe offset within function entry
2017-03-15 17:48:37 -03:00
mm: make rmap_walk() return void
2017-05-03 15:52:10 -07:00
KVM: kvm_io_bus_unregister_dev() should never fail
2017-03-23 19:02:25 +01:00
leds: pca9532: Extend pca9532 device tree support
2017-04-19 20:27:50 +02:00
leds: core: add OF variants of LED registering functions
2017-03-08 21:10:01 +01:00
lightnvm: allow to init targets on factory mode
2017-04-16 10:06:25 -06:00
bpf: convert htab map to hlist_nulls
2017-03-09 13:27:17 -08:00
livepatch: allow removal of a disabled patch
2017-03-08 09:38:43 +01:00
locking/lockdep: Add new check to lock_downgrade()
2017-03-16 09:57:07 +01:00
LSM: Revive security_task_alloc() hook and per "struct task_struct" security blob.
2017-03-28 11:05:14 +11:00
mm: memcontrol: use node page state naming scheme for memcg
2017-05-03 15:52:11 -07:00
include/linux/migrate.h: add arg names to prototype
2017-05-03 15:52:10 -07:00
mm: enable page poisoning early at boot
2017-05-03 15:52:10 -07:00
x86/mm: Introduce mmap_compat_base() for 32-bit mmap()
2017-03-13 14:59:22 +01:00
sched/headers, mm: Move 'struct tlbflush_unmap_batch' from <linux/sched.h> to <linux/mm_types_task.h>
2017-03-03 01:45:25 +01:00
mm: drop unused pmdp_huge_get_and_clear_notify()
2017-04-13 18:24:21 -07:00
mm: vmscan: fix IO/refault regression in cache workingset transition
2017-05-03 15:52:11 -07:00
Modules updates for v4.12
2017-05-03 19:12:27 -07:00
flow_dissector: add mpls support (v2)
2017-04-24 14:30:46 -04:00
l2tp: device MTU setup, tunnel socket needs a lock
2017-04-17 13:01:48 -04:00
net: Add ESP offload features
2017-04-14 10:05:36 +02:00
xdp: propagate extended ack to XDP setup
2017-05-01 10:35:47 -04:00
xdp: use common helper for netlink extended ack reporting
2017-05-03 09:51:24 -04:00
statx: Add a system call to make enhanced file info available
2017-03-02 20:51:15 -05:00
nfs: Convert to separately allocated bdi
2017-04-20 12:09:55 -06:00
sched/headers: Move softlockup detector watchdog methods to <linux/nmi.h>
2017-03-03 01:43:38 +01:00
nvmet_fc: Rework target side abort handling
2017-04-21 16:41:51 +02:00
nvme_fc: Sync FC-NVME header with standard
2017-04-04 09:48:23 -06:00
nvme: improve performance for virtual NVMe devices
2017-04-21 16:41:47 +02:00
of: Add of_fwnode_handle() to convert device nodes to fwnode_handle
2017-03-29 00:00:28 +02:00
gpio: core: Decouple open drain/source flag with active low/high
2017-04-07 12:23:29 +02:00
of_mdio: Correct check against CONFIG_OF
2017-03-24 12:51:04 -07:00
mm: Fix false-positive VM_BUG_ON() in page_cache_{get,add}_speculative()
2017-03-28 08:23:27 +02:00
main drm pull request for 4.12 kernel
2017-05-03 11:44:24 -07:00
percpu-refcount: support synchronous switch to atomic mode.
2017-03-22 19:18:43 -07:00
locking/lockdep: Handle statically initialized PER_CPU locks properly
2017-03-16 09:57:08 +01:00
x86/events/amd/iommu: Add IOMMU-specific hw_perf_event struct
2017-03-30 09:55:35 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-04-26 22:39:08 -04:00
PM / Domains: Enable users of genpd to specify always on PM domains
2017-03-29 00:11:34 +02:00
move compat select-related syscalls to fs/select.c
2017-04-17 12:52:22 -04:00
time: Change posix clocks ops interfaces to use timespec64
2017-04-14 21:49:54 +02:00
time: Change k_clock nsleep() to use timespec64
2017-04-14 21:49:56 +02:00
sched/headers: Move the PREEMPT_COUNT defines from <linux/sched.h> to <linux/preempt.h>
2017-03-03 01:43:47 +01:00
device property: Add fwnode_get_next_parent()
2017-03-29 00:00:29 +02:00
pstore: Remove write_buf() callback
2017-03-07 14:01:02 -08:00
kexec, x86/purgatory: Unbreak it and clean it up
2017-03-10 20:55:09 +01:00
quota: Remove dquot_quotactl_ops
2017-04-19 14:21:23 +02:00
RAS: Add a Corrected Errors Collector
2017-03-28 08:54:48 +02:00
bpf: convert htab map to hlist_nulls
2017-03-09 13:27:17 -08:00
rcu/tracing: Add rcu_disabled to denote when rcu_irq_enter() will not work
2017-04-10 15:22:03 -04:00
locking/refcount: Add refcount_t API kernel-doc comments
2017-03-13 07:41:08 +01:00
reset: add exported __reset_control_get, return NULL if optional
2017-04-04 17:36:10 +02:00
rhashtable: compact struct rhashtable_params
2017-05-01 16:22:40 -04:00
ring-buffer: Return reader page back into existing ring buffer
2017-05-01 10:26:40 -04:00
mm: remove SWAP_[SUCCESS|AGAIN|FAIL]
2017-05-03 15:52:10 -07:00
mm: remove rodata_test_data export, add pr_fmt
2017-05-03 15:52:09 -07:00
Revert "rtnl: Add support for netdev event to link messages"
2017-04-09 14:45:21 -07:00
sbitmap: add sbitmap_get_shallow() operation
2017-04-14 14:06:52 -06:00
mm: introduce memalloc_nofs_{save,restore} API
2017-05-03 15:52:09 -07:00
LSM: Revive security_task_alloc() hook and per "struct task_struct" security blob.
2017-03-28 11:05:14 +11:00
serdev: add helpers for cts and rts handling
2017-04-12 22:12:17 +02:00
Input: serio - add fast reconnect option
2017-03-25 10:37:26 -07:00
signals: Move signal data types from <linux/signal.h> to <linux/signal_types.h>
2017-03-03 01:43:48 +01:00
signals: Move signal data types from <linux/signal.h> to <linux/signal_types.h>
2017-03-03 01:43:48 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2017-05-02 16:40:27 -07:00
lockdep: Fix per-cpu static objects
2017-03-26 15:09:45 +02:00
Add a helper function to get socket cookie in eBPF
2017-03-23 17:01:02 -07:00
stacktrace/x86: add function for detecting reliable stack traces
2017-03-08 09:18:02 +01:00
statx: Include a mask for stx_attributes in struct statx
2017-04-03 01:06:00 -04:00
net: stmmac: Use AVB mode by default
2017-03-22 12:15:15 -07:00
mm, swap: remove unused function prototype
2017-05-03 15:52:11 -07:00
statx: Add a system call to make enhanced file info available
2017-03-02 20:51:15 -05:00
block: constify struct blk_integrity_profile
2017-03-24 20:34:39 -06:00
tcp: switch rcv_rtt_est and rcvq_space to high resolution timestamps
2017-04-26 14:44:39 -04:00
A couple hardened usercopy changes:
2017-05-02 10:45:15 -07:00
cpufreq: schedutil: Avoid reducing frequency of busy CPUs prematurely
2017-03-23 02:12:14 +01:00
sched/headers, timekeeping: Move the timer tick function prototypes to <linux/timekeeping.h>
2017-03-03 01:45:25 +01:00
time: Change k_clock clock_get() to use timespec64
2017-04-14 21:49:55 +02:00
sched/headers, timers: Remove the <linux/sysctl.h> include from <linux/timer.h>
2017-03-03 01:45:39 +01:00
tpm_crb: request and relinquish locality 0
2017-04-03 22:46:02 +03:00
tracing: Move trace_handle_return() out of line
2017-03-24 20:51:50 -04:00
tracing: Make sure rcu_irq_enter() can work for trace_*_rcuidle() trace events
2017-04-10 15:22:17 -04:00
CONFIG_ARCH_HAS_RAW_COPY_USER is unconditional now
2017-04-26 12:11:01 -04:00
udp: use sk_protocol instead of pcflag to detect udplite sockets
2017-04-01 20:11:36 -07:00
[iov_iter] new privimitive: iov_iter_revert()
2017-04-02 12:10:47 -04:00
ucount: Remove the atomicity from ucount->count
2017-03-06 15:26:37 -06:00
userfaultfd: non-cooperative: userfaultfd_remove revalidate vma in MADV_DONTNEED
2017-03-09 17:01:10 -08:00
virtio: allow drivers to validate features
2017-04-07 16:38:59 +03:00
VSOCK: Add virtio vsock vsockmon hooks
2017-04-24 12:35:56 -04:00
mm: move MADV_FREE pages into LRU_INACTIVE_FILE list
2017-05-03 15:52:08 -07:00
sched/headers: fix up header file dependency on <linux/sched/signal.h>
2017-03-08 10:36:03 -08:00
workqueue: Provide work_on_cpu_safe()
2017-04-15 12:20:53 +02:00
block: Fix oops in locked_inode_to_wb_and_lock_list()
2017-03-22 20:11:33 -06:00
