Linus Torvalds
7391daf2ff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking fixes from David Miller:
"Some straggler bug fixes:
1) Batman-adv DAT must consider VLAN IDs when choosing candidate
nodes, from Antonio Quartulli.
2) Fix botched reference counting of vlan objects and neigh nodes in
batman-adv, from Sven Eckelmann.
3) netem can crash when it sees GSO packets, the fix is to segment
then upon ->enqueue. Fix from Neil Horman with help from Eric
Dumazet.
4) Fix VXLAN dependencies in mlx5 driver Kconfig, from Matthew
Finlay.
5) Handle VXLAN ops outside of rcu lock, via a workqueue, in mlx5,
since it can sleep. Fix also from Matthew Finlay.
6) Check mdiobus_scan() return values properly in pxa168_eth and macb
drivers. From Sergei Shtylyov.
7) If the netdevice doesn't support checksumming, disable
segmentation. From Alexandery Duyck.
8) Fix races between RDS tcp accept and sending, from Sowmini
Varadhan.
9) In macb driver, probe MDIO bus before we register the netdev,
otherwise we can try to open the device before it is really ready
for that. Fix from Florian Fainelli.
10) Netlink attribute size for ILA "tunnels" not calculated properly,
fix from Nicolas Dichtel"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
ipv6/ila: fix nlsize calculation for lwtunnel
net: macb: Probe MDIO bus before registering netdev
RDS: TCP: Synchronize accept() and connect() paths on t_conn_lock.
RDS:TCP: Synchronize rds_tcp_accept_one with rds_send_xmit when resetting t_sock
vxlan: Add checksum check to the features check function
net: Disable segmentation if checksumming is not supported
net: mvneta: Remove superfluous SMP function call
macb: fix mdiobus_scan() error check
pxa168_eth: fix mdiobus_scan() error check
net/mlx5e: Use workqueue for vxlan ops
net/mlx5e: Implement a mlx5e workqueue
net/mlx5: Kconfig: Fix MLX5_EN/VXLAN build issue
net/mlx5: Unmap only the relevant IO memory mapping
netem: Segment GSO packets on enqueue
batman-adv: Fix reference counting of hardif_neigh_node object for neigh_node
batman-adv: Fix reference counting of vlan object for tt_local_entry
batman-adv: B.A.T.M.A.N V - make sure iface is reactivated upon NETDEV_UP event
batman-adv: fix DAT candidate selection (must use vid)
2016-05-03 15:07:50 -07:00
drivers/hwtracing: make coresight-* explicitly non-modular
2016-02-20 14:11:01 -08:00
bcma: move parallel flash support to separated file
2016-03-07 14:41:08 +02:00
libceph: make authorizer destruction independent of ceph_auth_client
2016-04-25 20:54:13 +02:00
The clk changes for this release cycle are mostly dominated by
2016-03-23 06:06:45 -07:00
powerpc/rcpm: add RCPM driver
2016-03-04 23:50:27 -06:00
gpio: Add devm_ apis for gpiochip_add_data and gpiochip_remove
2016-02-23 19:40:33 +05:30
MIPS: Make smp CMP, CPS and MT use the new generic IPI functions
2016-02-25 10:56:58 +01:00
MMC core:
2016-03-21 14:35:52 -07:00
net/mlx4_core: Avoid repeated calls to pci enable/disable
2016-04-21 15:02:40 -04:00
Final set of -rc fixes for 4.6
2016-04-29 17:07:54 -07:00
mmc: dw_mmc: remove DW_MCI_QUIRK_BROKEN_CARD_DETECTION quirk
2016-02-29 11:03:10 +01:00
mtd: nand: don't select chip in nand_chip's block_bad op
2016-03-10 10:52:21 -08:00
netfilter: ipset: fix race condition in ipset save, swap and delete
2016-03-28 17:57:45 +02:00
netfilter: xtables: prepare for on-demand hook register
2016-03-02 20:05:23 +01:00
netfilter: xtables: prepare for on-demand hook register
2016-03-02 20:05:23 +01:00
netfilter: xtables: prepare for on-demand hook register
2016-03-02 20:05:23 +01:00
drivers/perf: arm_pmu: implement CPU_PM notifier
2016-02-26 14:37:06 +00:00
MTD updates for v4.6
2016-03-24 19:57:15 -07:00
power supply and reset changes for the v4.6 series
2016-03-17 12:50:55 -07:00
qed/qede: Add infrastructure support for hardware GRO
2016-03-07 15:01:39 -05:00
Merge remote-tracking branches 'regulator/topic/discharge', 'regulator/topic/fan53555', 'regulator/topic/gpio', 'regulator/topic/hi655x' and 'regulator/topic/lp872x' into regulator-next
2016-03-13 15:19:35 +07:00
mm: move max_map_count bits into mm.h
2016-03-17 15:09:34 -07:00
Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration
2016-03-23 06:09:15 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2016-03-17 21:51:52 -07:00
mm, fs: remove remaining PAGE_CACHE_* and page_cache_{get,release} usage
2016-04-04 10:41:08 -07:00
include/linux/unaligned: force inlining of byteswap operations
2016-03-17 15:09:34 -07:00
USB: core: let USB device know device node
2016-03-05 12:05:01 -08:00
tty/serial: at91: fix bad offset for UART timeout register
2016-03-07 16:11:14 -08:00
locking/atomic, sched: Unexport fetch_or()
2016-03-29 11:52:11 +02:00
autofs4: fix string.h include in auto_dev-ioctl.h
2016-03-15 16:55:16 -07:00
autofs4: coding style fixes
2016-03-15 16:55:16 -07:00
mm, fs: remove remaining PAGE_CACHE_* and page_cache_{get,release} usage
2016-04-04 10:41:08 -07:00
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
2016-04-04 10:41:08 -07:00
lib/bitmap.c: conversion routines to/from u32 array
2016-02-19 22:54:09 -05:00
blk-mq: Use proper cpumask iterator
2016-03-20 09:34:02 -06:00
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
2016-04-04 10:41:08 -07:00
bpf: fix refcnt overflow
2016-04-28 17:29:45 -04:00
net: phy: bcm7xxx: Add entries for Broadcom BCM7346 and BCM7362
2016-03-25 11:37:57 -04:00
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
2016-04-04 10:41:08 -07:00
mm: Some arch may want to use HPAGE_PMD related values as variables
2016-03-03 21:18:29 +11:00
arch: Introduce post-init read-only memory
2016-02-22 08:51:38 +01:00
cred/userns: define current_user_ns() as a function
2016-03-22 15:36:02 -07:00
crypto: ccp - CCP versioning support
2016-03-11 21:19:16 +08:00
cgroup, cpuset: replace cpuset_post_attach_flush() with cgroup_subsys->post_attach callback
2016-04-25 15:45:14 -04:00
clk: Make of_clk_get_parent_count() return unsigned ints
2016-02-26 16:01:32 -08:00
clocksource: Introduce clocksource_freq2mult()
2016-02-27 08:55:30 +01:00
mm, compaction: introduce kcompactd
2016-03-17 15:09:34 -07:00
compat: add in_compat_syscall to ask whether we're in a compat syscall
2016-03-22 15:36:02 -07:00
compiler-gcc: disable -ftracer for __noclone functions
2016-04-05 14:19:08 +02:00
Merge commit 'fixes.2015.02.23a' into core/rcu
2016-03-15 09:01:06 +01:00
configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions
2016-03-25 19:10:03 +01:00
coresight: introducing a global trace ID function
2016-02-20 14:11:01 -08:00
coresight: etb10: implementing AUX API
2016-02-20 14:11:01 -08:00
rcu: Make CPU_DYING_IDLE an explicit call
2016-03-01 20:36:58 +01:00
Merge branch 'pm-cpufreq-governor' into pm-cpufreq
2016-03-10 20:46:03 +01:00
cpu/hotplug: Make wait for dead cpu completion based
2016-03-01 20:36:58 +01:00
cpumask: remove incorrect information from comment
2016-03-22 15:36:02 -07:00
cgroup, cpuset: replace cpuset_post_attach_flush() with cgroup_subsys->post_attach callback
2016-04-25 15:45:14 -04:00
cred/userns: define current_user_ns() as a function
2016-03-22 15:36:02 -07:00
misc: at24: replace memory_accessor with nvmem_device_read
2016-03-01 16:55:48 -08:00
dax: move writeback calls into the filesystems
2016-02-27 10:28:52 -08:00
fs: add file_dentry()
2016-03-26 16:14:37 -04:00
dm snapshot: disallow the COW and origin devices from being identical
2016-03-10 17:12:09 -05:00
The clk changes for this release cycle are mostly dominated by
2016-03-23 06:06:45 -07:00
devpts: more pty driver interface cleanups
2016-04-26 15:47:32 -07:00
dma-buf, drm, ion: Propagate error code from dma_buf_start_cpu_access()
2016-03-19 11:03:49 +01:00
virtio/vhost: new features, performance improvements, cleanups
2016-03-20 13:28:18 -07:00
Merge branch 'topic/pl330' into for-linus
2016-03-14 11:18:12 +05:30
Merge branch 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2016-03-20 18:58:18 -07:00
net: ethtool: remove unused __ethtool_get_settings
2016-02-25 22:06:47 -05:00
staging/lustre: proper support of NFS anonymous dentries
2016-02-25 22:12:26 -08:00
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
2016-04-04 10:41:08 -07:00
mm: fault-inject take over bootstrap kmem_cache check
2016-03-15 16:55:16 -07:00
fbdev: kill fb_rotate
2016-02-26 13:28:35 +02:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2016-03-25 08:48:31 -07:00
tun, bpf: fix suspicious RCU usage in tun_{attach, detach}_filter
2016-04-01 14:33:46 -04:00
objtool: Add STACK_FRAME_NON_STANDARD() macro
2016-02-29 08:35:10 +01:00
timer: convert timer_slack_ns from unsigned long to u64
2016-03-17 15:09:34 -07:00
These changes contains a fix for overlayfs interacting with some
2016-04-07 17:22:20 -07:00
fscrypto: don't let data integrity writebacks fail with ENOMEM
2016-04-12 10:25:30 -07:00
untangle fsnotify_d_instantiate() a bit
2016-03-14 00:17:28 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-03-19 18:52:29 -07:00
arch, ftrace: for KASAN put hard/soft IRQ entries into separate sections
2016-03-25 16:37:42 -07:00
mm: exclude ZONE_DEVICE from GFP_ZONE_TABLE
2016-03-17 15:09:34 -07:00
Revert "gpio: remove broken irq_to_gpio() interface"
2016-02-20 12:53:31 +01:00
Minimal fix-up of bad hashing behavior of hash_64()
2016-05-02 13:01:51 -07:00
timer: convert timer_slack_ns from unsigned long to u64
2016-03-17 15:09:34 -07:00
thp: keep huge zero page pinned until tlb flush
2016-04-28 19:34:04 -07:00
Drivers: hv: util: Pass the channel information during the init call
2016-03-01 16:57:20 -08:00
mac80211: limit the A-MSDU Tx based on peer's capabilities
2016-02-24 09:04:20 +01:00
bridge: allow zero ageing time
2016-03-11 14:58:58 -05:00
vxlan: Add checksum check to the features check function
2016-05-03 16:00:54 -04:00
module: replace copy_module_from_fd with kernel version
2016-02-21 09:06:12 -05:00
asm-generic: Consolidate mark_rodata_ro()
2016-02-22 08:51:37 +01:00
arch, ftrace: for KASAN put hard/soft IRQ entries into separate sections
2016-03-25 16:37:42 -07:00
memremap: add MEMREMAP_WC flag
2016-03-22 15:36:02 -07:00
iommu: provide of_xlate pointer unconditionally
2016-04-05 13:25:12 +02:00
libnvdimm for 4.6
2016-03-16 17:45:56 -07:00
Revert "ipv6: Revert optional address flusing on ifdown."
2016-04-26 11:47:41 -04:00
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2016-03-15 12:48:48 -07:00
Staging driver patches for 4.6-rc1
2016-03-17 22:13:41 -07:00
iscsi_ibft: Add prefix-len attr and display netmask
2016-03-14 10:30:57 -04:00
jbd2: unify revoke and tag block checksum handling
2016-02-22 23:19:09 -05:00
mm, kasan: add GFP flags to KASAN API
2016-03-25 16:37:42 -07:00
kernel: add kcov code coverage
2016-03-22 15:36:02 -07:00
Nothing major this round. Mostly small clean ups and fixes.
2016-03-24 10:52:25 -07:00
kfifo: fix sparse complaints
2016-03-22 15:36:02 -07:00
KVM: Use simple waitqueue for vcpu->wq
2016-02-25 11:27:16 +01:00
leds: core: avoid error message when a USB LED device is unplugged
2016-03-14 09:22:20 +01:00
libata: Align ata_device's id on a cacheline
2016-02-25 16:37:06 -05:00
nfit: disable userspace initiated ars during scrub
2016-03-05 12:24:06 -08:00
nvme: lightnvm: return ppa completion status
2016-03-18 18:10:38 -07:00
list: kill list_force_poison()
2016-03-09 15:43:42 -08:00
include/linux/list_bl.h: use bool instead of int for boolean functions
2016-03-17 15:09:34 -07:00
livepatch/module: remove livepatch module notifier
2016-03-17 09:45:10 +01:00
lockdep: Fix lock_chain::base size
2016-04-23 13:53:03 +02:00
module: replace copy_module_from_fd with kernel version
2016-02-21 09:06:12 -05:00
mbcache: add reusable flag to cache entries
2016-02-22 22:44:04 -05:00
bus: mvebu-mbus: provide api for obtaining IO and DRAM window information
2016-03-14 12:19:46 -04:00
mm: workingset: make shadow node shrinker memcg aware
2016-03-17 15:09:34 -07:00
Char/Misc patches for 4.6-rc1
2016-03-17 13:47:50 -07:00
mm/compaction: speed up pageblock_pfn_to_page() when zone is contiguous
2016-03-15 16:55:16 -07:00
mm, page_owner: track and print last migrate reason
2016-03-15 16:55:16 -07:00
isdn: Use ktime_t instead of 'struct timeval'
2016-03-20 16:47:13 -04:00
numa: fix /proc/<pid>/numa_maps for THP
2016-04-28 19:34:04 -07:00
mm, fs: remove remaining PAGE_CACHE_* and page_cache_{get,release} usage
2016-04-04 10:41:08 -07:00
mm, debug: move bad flags printing to bad_page()
2016-03-15 16:55:16 -07:00
mm: scale kswapd watermarks in proportion to memory
2016-03-17 15:09:34 -07:00
namei: teach lookup_slow() to skip revalidate
2016-03-14 00:15:46 -04:00
libnvdimm: async notification support
2016-03-05 12:24:06 -08:00
net: Implement net_dbg_ratelimited() for CONFIG_DYNAMIC_DEBUG case
2016-05-01 21:34:01 -04:00
net: fix net_gso_ok for new GSO types.
2016-04-28 15:53:17 -04:00
netfilter: don't call hooks unless needed
2016-03-02 20:05:26 +01:00
nfs4.h: add SCSI layout definitions
2016-03-17 14:57:16 -04:00
mm, fs: remove remaining PAGE_CACHE_* and page_cache_{get,release} usage
2016-04-04 10:41:08 -07:00
mm, fs: remove remaining PAGE_CACHE_* and page_cache_{get,release} usage
2016-04-04 10:41:08 -07:00
x86/apic: Remove declaration of unused hw_nmi_is_cpu_stuck
2016-03-23 12:34:17 +01:00
rcu: Make CPU_DYING_IDLE an explicit call
2016-03-01 20:36:58 +01:00
NTB: Make _addr functions optional in the API
2016-03-21 19:30:06 -04:00
nvmem: Add backwards compatibility support for older EEPROM drivers.
2016-03-01 16:55:48 -08:00
DeviceTree updates for 4.6:
2016-03-19 15:15:07 -07:00
include/linux/oom.h: remove undefined oom_kills_count()/note_oom_kill()
2016-03-25 16:37:42 -07:00
mm: exclude ZONE_DEVICE from GFP_ZONE_TABLE
2016-03-17 15:09:34 -07:00
include/linux/page-flags.h: force inlining of selected page flag modifications
2016-03-17 15:09:34 -07:00
mm, page_owner: track and print last migrate reason
2016-03-15 16:55:16 -07:00
mm, page_owner: dump page owner info from dump_page()
2016-03-15 16:55:16 -07:00
mm/page_ref: add tracepoint to track down page reference manipulation
2016-03-17 15:09:34 -07:00
mm: drop PAGE_CACHE_* and page_cache_{get,release} definition
2016-04-04 10:41:08 -07:00
PCI: Consolidate PCI DMA constants and interfaces in linux/pci-dma-compat.h
2016-03-07 11:39:16 -06:00
PCI: Add pci_set_vpd_size() to set VPD size
2016-04-15 13:00:11 -05:00
PCI: Add PCI_CLASS_SERIAL_USB_DEVICE definition
2016-03-15 08:52:28 -05:00
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2016-03-24 10:02:14 -07:00
phy: remove documentation of removed members of phy_device structure
2016-03-13 22:11:43 -04:00
phy: fixed: Fix removal of phys.
2016-03-14 15:43:11 -04:00
mm/core, x86/mm/pkeys: Add execute-only protection keys support
2016-02-18 19:46:33 +01:00
PM / clk: Add support for obtaining clocks from device-tree
2016-03-17 02:32:04 +01:00
pmem: fix BUG() error in pmem.h:48 on X86_32
2016-04-14 09:01:47 -06:00
mm/page_poisoning.c: allow for zero poisoning
2016-03-15 16:55:16 -07:00
timer: convert timer_slack_ns from unsigned long to u64
2016-03-17 15:09:34 -07:00
posix-cpu-timers: Migrate to use new tick dependency mask model
2016-03-02 16:44:27 +01:00
time: Remove duplicated code in ktime_get_raw_and_real()
2016-03-02 17:13:02 -08:00
pstore: Add support for 64 Bit address space
2016-03-10 09:43:36 -08:00
ptp: Add PTP_SYS_OFFSET_PRECISE for driver crosstimestamping
2016-03-03 14:23:43 -08:00
fix Christoph's email addresses
2016-03-17 15:09:34 -07:00
radix-tree,shmem: introduce radix_tree_iter_next()
2016-03-17 15:09:34 -07:00
drivers: char: random: add get_random_long()
2016-02-27 10:28:52 -08:00
rcu: Add list_next_or_null_rcu
2016-03-09 16:36:13 -05:00
soreuseport: fix ordering for mixed v4/v6 sockets
2016-04-14 21:14:03 -04:00
Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2016-03-15 13:50:29 -07:00
Merge remote-tracking branch 'regmap/topic/update-bits' into regmap-next
2016-03-05 21:30:41 +09:00
net: rfkill: add rfkill_find_type function
2016-02-24 09:12:45 +01:00
rapidio: add outbound window support
2016-03-22 15:36:02 -07:00
rapidio: add outbound window support
2016-03-22 15:36:02 -07:00
rapidio: add mport char device driver
2016-03-22 15:36:02 -07:00
rapidio: add query_mport operation
2016-03-22 15:36:02 -07:00
mm: make remove_migration_ptes() beyond mm/migration.c
2016-03-17 15:09:34 -07:00
Input: synaptics-rmi4 - add SPI transport driver
2016-03-10 16:04:24 -08:00
rtc: Add functions to set and read rtc offset
2016-03-14 17:08:15 +01:00
timers/nohz: Convert tick dependency mask to atomic_t
2016-03-29 11:52:11 +02:00
module: replace copy_module_from_fd with kernel version
2016-02-21 09:06:12 -05:00
Make file credentials available to the seqfile interfaces
2016-04-14 12:56:09 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-03-08 12:34:12 -05:00
mm, kasan: add GFP flags to KASAN API
2016-03-25 16:37:42 -07:00
mm, kasan: SLAB support
2016-03-25 16:37:42 -07:00
mm, kasan: SLAB support
2016-03-25 16:37:42 -07:00
kcm: Kernel Connection Multiplexor module
2016-03-09 16:36:14 -05:00
rcu: Document unique-name limitation for DEFINE_STATIC_SRCU()
2016-02-23 19:59:55 -08:00
mm, kasan: stackdepot implementation. Enable stackdepot for SLAB
2016-03-25 16:37:42 -07:00
stm class: Plug stm device's unlink callback
2016-02-20 14:09:14 -08:00
stmmac: fix MDIO settings
2016-04-01 14:38:59 -04:00
lib: move strtobool() to kstrtobool()
2016-03-17 15:09:34 -07:00
wait.[ch]: Introduce the simple waitqueue (swait) implementation
2016-02-25 11:27:16 +01:00
mm, fs: remove remaining PAGE_CACHE_* and page_cache_{get,release} usage
2016-04-04 10:41:08 -07:00
vfs: vfs: Define new syscalls preadv2,pwritev2
2016-03-04 12:20:10 -05:00
tcp: Add RFC4898 tcpEStatsPerfDataSegsOut/In
2016-03-14 14:55:26 -04:00
thermal: consistently use int for trip temp
2016-04-20 20:31:14 -07:00
param: convert some "on"/"off" users to strtobool
2016-03-17 15:09:34 -07:00
time: Add history to cross timestamp interface supporting slower devices
2016-03-02 17:13:17 -08:00
time: Add history to cross timestamp interface supporting slower devices
2016-03-02 17:13:17 -08:00
Nothing major this round. Mostly small clean ups and fixes.
2016-03-24 10:52:25 -07:00
tracepoints: move trace_print_flags definitions to tracepoint-defs.h
2016-03-15 16:55:16 -07:00
tracing: Fix check for cpu online when event is disabled
2016-03-09 11:58:41 -05:00
devpts: more pty driver interface cleanups
2016-04-26 15:47:32 -07:00
USB: uas: Add a new NO_REPORT_LUNS quirk
2016-04-13 12:02:28 -07:00
vfio: Add capability chain helpers
2016-02-22 16:10:08 -07:00
virtio: Add improved queue allocation API
2016-03-02 17:01:57 +02:00
virtio: Add improved queue allocation API
2016-03-02 17:01:57 +02:00
thp, vmstats: count deferred split events
2016-03-17 15:09:34 -07:00
sched/wait: Fix wait_event_freezable() documentation
2016-02-24 09:09:45 +01:00
watchdog: Add support for minimum time between heartbeats
2016-03-16 21:11:19 +01:00
writeback: flush inode cgroup wb switches instead of pinning super_block
2016-03-03 14:42:50 -07:00
