Skip to content

Commit

Permalink
Merge branch 'release-1.2.0'
Browse files Browse the repository at this point in the history
* release-1.2.0:
  Revert "UPSTREAM: sched/core: Allow putting thread_info into task_struct"
  Linux 3.18.122
  bcache: release dc->writeback_lock properly in bch_writeback_thread()
  getxattr: use correct xattr length
  udlfb: set optimal write delay
  fb: fix lost console when the user unplugs a USB adapter
  pwm: tiehrpwm: Fix disabling of output of PWMs
  ubifs: Fix synced_i_size calculation for xattr inodes
  Revert "UBIFS: Fix potential integer overflow in allocation"
  ubifs: Fix memory leak in lprobs self-check
  userns: move user access out of the mutex
  userns; Correct the comment in map_write
  sys: don't hold uts_sem while accessing userspace memory
  osf_getdomainname(): use copy_to_user()
  mm/tlb: Remove tlb_remove_table() non-concurrent condition
  ARM: tegra: Fix Tegra30 Cardhu PCA954x reset
  pnfs/blocklayout: off by one in bl_map_stripe()
  9p: fix multiple NULL-pointer-dereferences
  uprobes: Use synchronize_rcu() not synchronize_sched()
  kthread, tracing: Don't expose half-written comm when creating kthreads
  tracing/blktrace: Fix to allow setting same value
  tracing: Do not call start/stop() functions when tracing_on does not change
  iio: ad9523: Fix return value for ad952x_store()
  iio: ad9523: Fix displayed phase
  dm cache metadata: save in-core policy_hint_size to on-disk superblock
  net/9p/trans_fd.c: fix race-condition by flushing workqueue before the kfree()
  net/9p/client.c: version pointer uninitialized
  9p/virtio: fix off-by-one error in sg list bounds check
  powerpc/pseries: Fix endianness while restoring of r3 in MCE handler.
  powerpc/fadump: handle crash memory ranges array index overflow
  spi: davinci: fix a NULL pointer dereference
  ALSA: rawmidi: Undo my 3.18.117 resolution
  Linux 3.18.121
  cdrom: Fix info leak/OOB read in cdrom_ioctl_drive_status
  scsi: core: Avoid that SCSI device removal through sysfs triggers a deadlock
  scsi: sysfs: Introduce sysfs_{un,}break_active_protection()
  MIPS: Correct the 64-bit DSP accumulator register size
  kprobes: Make list and blacklist root user read only
  s390/pci: fix out of bounds access during irq setup
  s390/qdio: reset old sbal_state flags
  pinctrl: freescale: off by one in imx1_pinconf_group_dbg_show()
  ASoC: sirf: Fix potential NULL pointer dereference
  udl-kms: fix crash due to uninitialized memory
  udl-kms: handle allocation failure
  udl-kms: change down_interruptible to down
  fuse: Add missed unlock_page() to fuse_readpages_fill()
  fuse: Don't access pipe->buffers without pipe_lock()
  x86/process: Re-export start_thread()
  KVM: arm/arm64: Skip updating PMD entry if no change
  KVM: arm/arm64: Skip updating PTE entry if no change
  arm64: mm: check for upper PAGE_SHIFT bits in pfn_valid()
  ext4: reset error code in ext4_find_entry in fallback
  s390/kvm: fix deadlock when killed by oom
  btrfs: don't leak ret from do_chunk_alloc
  mm/memory.c: check return value of ioremap_prot
  scsi: vmw_pvscsi: Return DID_RESET for status SAM_STAT_COMMAND_TERMINATED
  scsi: fcoe: drop frames in ELS LOGO error path
  drivers: net: lmc: fix case value for target abort error
  arc: fix type warnings in arc/mm/cache.c
  arc: fix build errors in arc/include/asm/delay.h
  enic: handle mtu change for vf properly
  Revert "MIPS: BCM47XX: Enable 74K Core ExternalSync for PCIe erratum"
  tools/power turbostat: Read extended processor family from CPUID
  zswap: re-check zswap_is_full() after do zswap_shrink()
  selftests/ftrace: Add snapshot and tracing_on test case
  cachefiles: Wait rather than BUG'ing on "Unexpected object collision"
  cachefiles: Fix refcounting bug in backing-file read monitoring
  fscache: Allow cancelled operations to be enqueued
  net: axienet: Fix double deregister of mdio
  bnx2x: Fix invalid memory access in rss hash config path.
  media: staging: omap4iss: Include asm/cacheflush.h after generic includes
  can: mpc5xxx_can: check of_iomap return before use
  atl1c: reserve min skb headroom
  net: caif: Add a missing rcu_read_unlock() in caif_flow_cb
  tools/power turbostat: fix -S on UP systems
  usb: gadget: f_uac2: fix endianness of 'struct cntrl_*_lay3'
  tools: usb: ffs-test: Fix build on big endian systems
  usb/phy: fix PPC64 build errors in phy-fsl-usb.c
  usb: gadget: r8a66597: Fix a possible sleep-in-atomic-context bugs in r8a66597_queue()
  usb: gadget: r8a66597: Fix two possible sleep-in-atomic-context bugs in init_controller()
  drm/imx: imx-ldb: check if channel is enabled before printing warning
  drm/imx: imx-ldb: disable LDB on driver bind
  scsi: libiscsi: fix possible NULL pointer dereference in case of TMF
  nl80211: Add a missing break in parse_station_flags
  mac80211: add stations tied to AP_VLANs during hw reconfig
  xfrm: free skb if nlsk pointer is NULL
  xfrm: fix missing dst_release() after policy blocking lbcast and multicast
  Cipso: cipso_v4_optptr enter infinite loop
  sched/sysctl: Check user input value of sysctl_sched_time_avg
  Linux 3.18.120
  reiserfs: fix broken xattr handling (heap corruption, bad retval)
  PCI: hotplug: Don't leak pci_slot on registration failure
  packet: refine ring v3 block size test to hold one frame
  netfilter: conntrack: dccp: treat SYNC/SYNCACK as invalid if no prior state
  xfrm_user: prevent leaking 2 bytes of kernel memory
  staging: android: ion: check for kref overflow
  tcp: identify cryptic messages as TCP seq # bugs
  net: qca_spi: Make sure the QCA7000 reset is triggered
  net: qca_spi: Avoid packet drop during initial sync
  net: usb: rtl8150: demote allmulti message to dev_dbg()
  qlogic: check kstrtoul() for errors
  ixgbe: Be more careful when modifying MAC filters
  ARM: dts: am3517.dtsi: Disable reference to OMAP3 OTG controller
  drm/armada: fix colorkey mode property
  ARM: pxa: irq: fix handling of ICMR registers in suspend/resume
  netfilter: x_tables: set module owner for icmp(6) matches
  smsc75xx: Add workaround for gigabit link up hardware errata.
  tracing: Use __printf markup to silence compiler
  ARM: imx_v4_v5_defconfig: Select ULPI support
  m68k: fix "bad page state" oops on ColdFire boot
  bnx2x: Fix receiving tx-timeout in error or recovery state.
  drm/exynos: gsc: Fix support for NV16/61, YUV420/YVU420 and YUV422 modes
  md/raid10: fix that replacement cannot complete recovery after reassemble
  dmaengine: k3dma: Off by one in k3_of_dma_simple_xlate()
  ARM: dts: da850: Fix interrups property for gpio
  perf report powerpc: Fix crash if callchain is empty
  ARM: dts: am437x: make edt-ft5x06 a wakeup source
  brcmfmac: stop watchdog before detach and free everything
  cxgb4: when disabling dcb set txq dcb priority to 0
  Smack: Mark inode instant in smack_task_to_inode
  ipv6: mcast: fix unsolicited report interval after receiving querys
  locking/lockdep: Do not record IRQ state within lockdep code
  net: davinci_emac: match the mdio device against its compatible if possible
  net: propagate dev_get_valid_name return code
  net: hamradio: use eth_broadcast_addr
  enic: initialize enic->rfs_h.lock in enic_probe
  arm64: make secondary_start_kernel() notrace
  usb: gadget: composite: fix delayed_status race condition when set_interface
  usb: dwc2: fix isoc split in transfer with no data
  selftests: sync: add config fragment for testing sync framework
  netfilter: ipv6: nf_defrag: reduce struct net memory waste
  isdn: Disable IIOCDBGVAR
  Bluetooth: avoid killing an already killed socket
  serial: 8250_dw: always set baud rate in dw8250_set_termios
  USB: serial: sierra: fix potential deadlock at close
  ALSA: vxpocket: Fix invalid endian conversions
  ALSA: memalloc: Don't exceed over the requested size
  ALSA: cs5535audio: Fix invalid endian conversion
  ALSA: virmidi: Fix too long output trigger loop
  ALSA: vx222: Fix invalid endian conversions
  vsock: split dwork to avoid reinitializations
  net_sched: fix NULL pointer dereference when delete tcindex filter
  net_sched: Fix missing res info when create new tc_index filter
  llc: use refcount_inc_not_zero() for llc_sap_find()
  l2tp: use sk_dst_check() to avoid race on sk->sk_dst_cache
  dccp: fix undefined behavior with 'cwnd' shift in ccid2_cwnd_restart()
  futex: Replace barrier() in unqueue_me() with READ_ONCE()
  futex: Remove requirement for lock_page() in get_futex_key()
  diag: Allocate DCI memory using vzalloc instead of kzalloc
  UPSTREAM: scsi: sg: don't return bogus Sg_requests
  BACKPORT: futex: Prevent overflow by strengthen input validation
  Linux 3.18.119
  Bluetooth: hidp: buffer overflow in hidp_process_report
  crypto: ablkcipher - fix crash flushing dcache in error path
  crypto: blkcipher - fix crash flushing dcache in error path
  crypto: vmac - separate tfm and request context
  crypto: vmac - require a block cipher with 128-bit block size
  kbuild: verify that $DEPMOD is installed
  i2c: ismt: fix wrong device address when unmap the data buffer
  mm: slub: fix format mismatches in slab_err() callers
  ALSA: info: Check for integer overflow in snd_info_entry_write()
  kprobes/x86: Fix %p uses in error messages
  ARM: dts: imx6sx: fix irq for pcie bridge
  fix __legitimize_mnt()/mntput() race
  fix mntput/mntput race
  root dentries need RCU-delayed freeing
  xen/netfront: don't cache skb_shinfo()
  sched: qhmp_core: Apply missing commits
  sched: qhmp_core: Fix build errors
  defconfig: Enable FORCE_FAST_CHARGE
  drivers: misc: implement usb fast charge mode
  Linux 3.18.118
  jfs: Fix inconsistency between memory allocation and ea_buf->max_size
  ring_buffer: tracing: Inherit the tracing setting to next ring buffer
  scsi: qla2xxx: Return error when TMF returns
  scsi: qla2xxx: Fix ISP recovery on unload
  scsi: sg: fix minor memory leak in error path
  crypto: padlock-aes - Fix Nano workaround data corruption
  virtio_balloon: fix another race between migration and ballooning
  can: ems_usb: Fix memory leak on ems_usb_disconnect()
  squashfs: more metadata hardenings
  squashfs: more metadata hardening
  net: dsa: Do not suspend/resume closed slave_dev
  inet: frag: enforce memory limits earlier
  ipv4: remove BUG_ON() from fib_compute_spec_dst
  tcp: add one more quick ack after after ECN events
  tcp: refactor tcp_ecn_check_ce to remove sk type cast
  tcp: do not aggressively quick ack after ECN events
  tcp: add max_quickacks param to tcp_incr_quickack and tcp_enter_quickack_mode
  tcp: do not force quickack when receiving out-of-order packets
  xen-netfront: wait xenbus state change when load module manually
  NET: stmmac: align DMA stuff to largest cache line length
  squashfs: be more careful about metadata corruption
  random: mix rdrand with entropy sent in from userspace
  media: si470x: fix __be16 annotations
  media: omap3isp: fix unbalanced dma_iommu_mapping
  crypto: authenc - don't leak pointers to authenc keys
  crypto: authencesn - don't leak pointers to authenc keys
  usb: hub: Don't wait for connect state at resume for powered-off ports
  microblaze: Fix simpleImage format generation
  rsi: Fix 'invalid vdd' warning in mmc
  ipconfig: Correctly initialise ic_nameservers
  drm/gma500: fix psb_intel_lvds_mode_valid()'s return type
  ALSA: hda/ca0132: fix build failure when a local macro is defined
  media: siano: get rid of __le32/__le16 cast warnings
  bpf: fix references to free_bpf_prog_info() in comments
  scsi: megaraid: silence a static checker bug
  scsi: 3w-xxxx: fix a missing-check bug
  scsi: 3w-9xxx: fix a missing-check bug
  perf: fix invalid bit in diagnostic entry
  s390/cpum_sf: Add data entry sizes to sampling trailer entry
  media: saa7164: Fix driver name in debug output
  libata: Fix command retry decision
  tty: Fix data race in tty_insert_flip_string_fixed_flag
  HID: i2c-hid: check if device is there before really probing
  powerpc/embedded6xx/hlwd-pic: Prevent interrupts from being handled by Starlet
  drm/radeon: fix mode_valid's return type
  ALSA: usb-audio: Apply rate limit to warning messages in URB complete callback
  media: smiapp: fix timeout checking in smiapp_read_nvm
  md: fix NULL dereference of mddev->pers in remove_and_add_spares()
  regulator: pfuze100: add .is_enable() for pfuze100_swb_regulator_ops
  ALSA: emu10k1: Rate-limit error messages about page errors
  scsi: ufs: fix exception event handling
  PCI: pciehp: Request control of native hotplug only if supported
  powerpc/8xx: fix invalid register expression in head_8xx.S
  powerpc/powermac: Mark variable x as unused
  powerpc/powermac: Add missing prototype for note_bootable_part()
  powerpc/chrp/time: Make some functions static, add missing header include
  powerpc/32: Add a missing include header
  ath: Add regulatory mapping for Bahamas
  ath: Add regulatory mapping for Bermuda
  ath: Add regulatory mapping for Serbia
  ath: Add regulatory mapping for Tanzania
  ath: Add regulatory mapping for Uganda
  ath: Add regulatory mapping for APL2_FCCA
  ath: Add regulatory mapping for APL13_WORLD
  ath: Add regulatory mapping for ETSI8_WORLD
  ath: Add regulatory mapping for FCC3_ETSIC
  PCI: Prevent sysfs disable of device while driver is attached
  wlcore: sdio: check for valid platform device data before suspend
  mwifiex: handle race during mwifiex_usb_disconnect
  ASoC: dpcm: fix BE dai not hw_free and shutdown
  perf/x86/intel/uncore: Correct fixed counter index check for NHM
  perf/x86/intel/uncore: Correct fixed counter index check in generic code
  usbip: usbip_detach: Fix memory, udev context and udev leak
  RDMA/mad: Convert BUG_ONs to error flows
  hvc_opal: don't set tb_ticks_per_usec in udbg_init_opal_common()
  infiniband: fix a possible use-after-free bug
  rtc: ensure rtc_set_alarm fails when alarms are not supported
  mm/slub.c: add __printf verification to slab_err()
  mm: vmalloc: avoid racy handling of debugobjects in vunmap
  ALSA: fm801: add error handling for snd_ctl_add
  ALSA: emu10k1: add error handling for snd_ctl_add
  tracing: Quiet gcc warning about maybe unused link variable
  tracing/kprobes: Fix trace_probe flags on enable_trace_kprobe() failure
  tracing: Fix possible double free in event_enable_trigger_func()
  tracing: Fix double free of event_trigger_data
  defconfig: Remove FIPS flag from config
  ARM: dts: msm: Add common CMA device configuration for sdx20
  msm: vidc: remove redundant init_completion() calls
  msm: vidc: Increase minimum input buffer count for HEVC decode
  SoC: msm: msm_audio_ion: Add the scm call
  crypto: pcrypt - fix freeing pcrypt instances
  BACKPORT: arm64: split thread_info from task stack
  removed duplicate entry for ext_ec_ref_mux_Ul3
  msm: mhi_dev: Handle wrap-around case for event ring updates
  msm: mhi_dev: Initialize UCI client channel numbers early
  msm: mhi_dev: Add asynchronous read/write support in UCI driver
  msm: mhi_dev: Switch to look-up table for UCI channel attributes
  msm: ipa: Setting appropriate config on MHI ep
  selinux: KASAN: slab-out-of-bounds in xattr_getsecurity
  net: ipc_router: Initialize the sockaddr in recvmsg() handler
  msm: sps: Suppress bind/unbind attributes
  ASoC: msm: qdsp6v2: Fix uninitialized variable error
  msm: mhi_dev: Fix incorrect transfer size in completion event
  drivers: net: can: Inform power states to CAN controller
  drivers: net: can: Use proper device property in qti-can driver
  drivers: net: can: Use interrupt type from device tree
  ARM: dts: msm: Add proper interrupt type in device tree
  drivers: net: can: Add timestamp adjustment for frames in qti-can
  drivers: net: can: Add END_FW_UPDATE_FILE command to qti-can driver
  msm: mdss: use uaccess routines to access user space buffers
  msm: camera: Fix out-of-bounds read in string class name.
  Linux 3.18.117
  turn off -Wattribute-alias
  ARM: fix put_user() for gcc-8
  can: xilinx_can: fix RX overflow interrupt not being enabled
  can: xilinx_can: keep only 1-2 frames in TX FIFO to fix TX accounting
  can: xilinx_can: fix device dropping off bus on RX overrun
  can: xilinx_can: fix RX loop if RXNEMP is asserted without RXOK
  usb: gadget: f_fs: Only return delayed status when len is 0
  usb: core: handle hub C_PORT_OVER_CURRENT condition
  usb: cdc_acm: Add quirk for Castles VEGA3000
  tcp: detect malicious patterns in tcp_collapse_ofo_queue()
  tcp: avoid collapses in tcp_prune_queue() if possible
  tcp: do not delay ACK in DCTCP upon CE status change
  tcp: do not cancel delay-AcK on DCTCP special ACK
  tcp: helpers to send special DCTCP ack
  tcp: fix dctcp delayed ACK schedule
  rtnetlink: add rtnl_link_state check in rtnl_configure_link
  net/mlx4_core: Save the qpn from the input modifier in RST2INIT wrapper
  ip: hash fragments consistently
  skbuff: Unconditionally copy pfmemalloc in __skb_clone()
  net: Don't copy pfmemalloc flag in __copy_skb_header()
  ptp: fix missing break in switch
  ipv4: Return EINVAL when ping_group_range sysctl doesn't map to user ns
  ARC: mm: allow mprotect to make stack mappings executable
  ARC: Fix CONFIG_SWAP
  ALSA: rawmidi: Change resized buffers atomically
  fat: fix memory allocation failure handling of match_strdup()
  x86/MCE: Remove min interval polling limitation
  UPSTREAM: Revert "USB: core: only clean up what we allocated"
  Sync code to OxygenOS 5.0.4 OTA
  drm/msm: Fix the format prints in display driver
  ARM: dts: msm: Delete redundant code in hx83100a LCD
  msm: mdss: Change function from disbale_irq_nosync to disbale_irq
  KEYS: add missing permission check for request_key() destination
  KEYS: fix out-of-bounds read during ASN.1 parsing
  ARM: dts: msm: Untrusted pointer dereference
  defconfig: msm: enable new touch driver compilation
  ASoC: msm: Add new dai links for compress capture for apq8009
  KEYS: fix out-of-bounds read during ASN.1 parsing
  ASoC: msm: qdsp6v2: Add dynamic chmix config support
  ASoC: msm: Add support for AVS version check
  ARM: dts: msm: Add proper irq type in device tree for mdm device
  ASoC: msm: Add machine driver support for 32bit capture
  msm: wlan: ETSI13 shall support 144 channel
  ASoC: msm: add support for AVS 2.8 in compress driver
  msm: msm_bus: Fix error handling in msm_bus_device_init
  ARM: dts: msm: Adjust sdio clock as 177Mhz for apq8053
  msm: wlan: Support ETSI13 regulatory domain
  ASoC: msm: qdsp6v2: Add support to query adsp version
  drivers: net: can: Inform power states to k61 controller
  drivers: net: can: Add timestamp adjustment for frames in k61 driver
  ARM: dts: msm8909go: Enable supported crypto algos
  KEYS: add missing permission check for request_key() destination
  ASoC: msm: clean up bootup errors
  input: touchscreen: Add himax touchscreen support
  input: touchscreen: Remove himax touchscreen support
  cnss: merge cnss_wlan_status and cnss_driver_status
  cnss: notify wlan driver when failed to power up
  defconfig: msm8909: Enable config flags for req-crypt
  ARM: dts: msm: Add support for external codec on apq8009
  msm: wlan: Update regulatory database
  ASoC: msm: dynamically control i2s switch gpio
  ASoC: msm: enable TDM mics with gpio controlled
  SSM: Remove support for SSM driver
  ASoC: msm: qdspqv2: add route from MM_DL9 to PRI_MI2S_RX
  ASoC: msm: qdspqv2: enable secondary group based on group count
  ASoC: msm: qdspqv2: add property to start secondary port
  ASoC: msm: qdsp6v2: support source tracking with TDM interface
  ASoC: msm: qdspqv2: add check for TDM clock programming
  ASoC: msm: enable group config for both tx and rx
  ASoC: msm: qdsp6v2: Add TDM changes in dai driver
  ARM: dts: msm: add TDM support for apq8009
  ASoC: msm: add tdm support in machine driver for apq8009
  ASoC: msm: add afe loopback support for apq8009
  ASoC: codecs: add 32bit capture support in codec
  ASoC: msm: add machine driver support for 32 bit recording
  ASoC: msm: qdsp6v2: add 32bit capture support in dai driver
  ASoc: msm: Enable support for 32 bit format and 384Khz
  ASoC: msm: qdsp6v2: add support for latest version of media format command
  ASoC:msm: Add routing controls for SVA to work on BG
  ASoC: wcd9335: set codec TX path to tri-state
  ASoC: audio-ext-clk: enable lpass_mclk for LPASS_CLK_VER_2
  ARM: dts: msm: add afe_loopback_tx back-end dai for apq8009
  ANDROID: Bluetooth: hidp: buffer overflow in hidp_process_report
  ipv6: fix udpv6 sendmsg crash caused by too small MTU
  USB: core: only clean up what we allocated
  crypto: hmac - require that the underlying hash algorithm is unkeyed
  diag: Update mask buffer after reallocation
  sched: qhmp: Fix compilation for IRQ_TIME_ACCOUNTING
  msm: gsi: gsi_ctx pointer dereference fix
  defconfig: mdm9650: Boot KPI improvement
  ion: invalidate the pool pointers after free
  ASoC: msm: qdsp6v2: Add mutex protection for rtac cal apis
  msm: adsprpc: destroy mutex before file free
  msm: mhi_dev: Log BHI_IMGTXDB register
  md:dm: Fix Key size for GPCE
  Revert "block: use bio_clone_fast() in blk_rq_prep_clone()"
  Revert "dm: remove nr_iovecs parameter from alloc_tio()"
  dm-req-crypt: Add support for immutable bio_vec
  diag: Add new log codes to diag mask
  diag: Add new Diag IDs
  diag: Update msg, log and event information
  dm-req-crypt: Remove discard support as it keep reporting errors
  ARM: dts: msm: Update VDD restriction parameters for MDM9650
  clk: msm: clock-gcc-9650: Add support to use Max uV for GCC clocks
  ARM: dts: msm: Change the voltage level for cpu clock on MDM9650
  ARM: dts: msm: Change the voltage level for cpu clock on MDM9650
  clk: msm: clock: Add support to use Max uV for cpu clocks
  Revert "dm: use bioset_create_nobvec()"
  • Loading branch information
joshchoo committed Sep 12, 2018
2 parents 3fadcad + 80c6d0c commit dc712da
Show file tree
Hide file tree
Showing 403 changed files with 10,323 additions and 6,613 deletions.
17 changes: 6 additions & 11 deletions Documentation/Changes
Expand Up @@ -25,7 +25,7 @@ o Gnu C 3.2 # gcc --version
o Gnu make 3.80 # make --version
o binutils 2.12 # ld -v
o util-linux 2.10o # fdformat --version
o module-init-tools 0.9.10 # depmod -V
o kmod 13 # depmod -V
o e2fsprogs 1.41.4 # e2fsck -V
o jfsutils 1.1.3 # fsck.jfs -V
o reiserfsprogs 3.6.3 # reiserfsck -V
Expand Down Expand Up @@ -119,12 +119,6 @@ is not build with CONFIG_KALLSYMS and you have no way to rebuild and
reproduce the Oops with that option, then you can still decode that Oops
with ksymoops.

Module-Init-Tools
-----------------

A new module loader is now in the kernel that requires module-init-tools
to use. It is backward compatible with the 2.4.x series kernels.

Mkinitrd
--------

Expand Down Expand Up @@ -302,14 +296,15 @@ Util-linux
----------
o <ftp://ftp.kernel.org/pub/linux/utils/util-linux/>

Kmod
----
o <https://www.kernel.org/pub/linux/utils/kernel/kmod/>
o <https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git>

Ksymoops
--------
o <ftp://ftp.kernel.org/pub/linux/utils/kernel/ksymoops/v2.4/>

Module-Init-Tools
-----------------
o <ftp://ftp.kernel.org/pub/linux/kernel/people/rusty/modules/>

Mkinitrd
--------
o <https://code.launchpad.net/initrd-tools/main>
Expand Down
22 changes: 0 additions & 22 deletions Documentation/devicetree/bindings/input/touchscreen/himax.txt

This file was deleted.

@@ -0,0 +1,57 @@
Himax touch controller

Required properties:

- compatible : should be "himax,hxcommon"
- reg : i2c slave address of the device
- interrupt-parent : parent of interrupt
- interrupts : touch sample interrupt to indicate presense or release
of fingers on the panel.
- himax,irq-gpio : irq gpio
- himax,reset-gpio : reset gpio

Optional property:
- vdd-supply : Analog power supply needed to power device
- vcc_i2c-supply : Power source required to pull up i2c bus
- himax,i2c-pull-up : specify to indicate pull up is needed
- himax,disable-gpios : specify to disable gpios in suspend (power saving)
- himax,button-map : virtual key code mappings to be used
- himax,x-flip : modify orientation of the x axis
- himax,y-flip : modify orientation of the y axis
- himax,panel-coords : touch panel min x, min y, max x and
max y resolution
- himax,display-coords : display min x, min y, max x and
max y resolution
- himax,reset-delay : reset delay for controller (ms), default 100
- himax,fw-image-name : name of firmware .img file in /etc/firmware
- himax,power-down : fully power down regulators in suspend
- himax,do-lockdown : perform one time lockdown procedure

Example:
i2c@f9927000 { /* BLSP1 QUP5 */
cell-index = <5>;
compatible = "himax,hxcommon";
#address-cells = <1>;
#size-cells = <0>;
reg-names = "qup_phys_addr";
reg = <0xf9927000 0x1000>;
interrupt-names = "qup_err_intr";
interrupts = <0 99 0>;
gpios = <&msmgpio 19 0>, /* SCL */
<&msmgpio 18 0>; /* SDA */
qcom,i2c-bus-freq = <100000>;
qcom,i2c-src-freq = <19200000>;

himax_ts@20 {
compatible = "himax,hxcommon"
reg = <0x20>;
interrupt-parent = <&tlmm>;
interrupts = <255 0x2008>;
vdd-supply = <&pm8994_l15>;
avdd-supply = <&pm8994_l22>;
himax,panel-coords = <0 720 0 1440>;
himax,display-coords = <0 720 0 1440>;
himax,irq-gpio = <&tlmm 255 0x2008>;
himax,rst-gpio = <&tlmm 8 0x00>;
};
};
47 changes: 0 additions & 47 deletions Documentation/devicetree/bindings/input/touchscreen/hmxchipset.txt

This file was deleted.

13 changes: 0 additions & 13 deletions Documentation/devicetree/bindings/platform/msm/ssm.txt

This file was deleted.

13 changes: 13 additions & 0 deletions Documentation/devicetree/bindings/sound/qcom-audio-dev.txt
Expand Up @@ -1371,6 +1371,16 @@ Required properties:
When clock rate is set to zero,
then external clock is assumed.

- qcom,msm-cpudai-tdm-afe-ebit-unsupported: Notify if ebit setting is needed
When this is set , alongwith
clock rate as zero then afe
is not configured for clock.

- qcom,msm-cpudai-tdm-sec-port-start: For chipsets with the limitation where we need
to start both RX and TX AFE ports, this flag is
used to start TX/RX port for RX/TX streams.


[Second Level Nodes]

Required properties:
Expand Down Expand Up @@ -1963,6 +1973,9 @@ Optional properties:
- qcom,wsa-devs: This property contains list of wsa codec names. The names
should comply with the wsa nodes configurations.
- qcom,wsa-aux-dev-prefix: This property contains list of wsa codec prefixes.
- qcom,tdm-i2s-switch-enable: For chipsets where tdm mics are controlled by
switch, drive corresponding gpio to output high
to enable switch.

Example:
sound {
Expand Down
4 changes: 4 additions & 0 deletions Documentation/devicetree/bindings/sound/taiko_codec.txt
Expand Up @@ -536,6 +536,10 @@ Tasha audio CODEC in I2C mode

- qcom,cdc-dmic-sample-rate - Specifies dmic sample rate.
- qcom,cdc-variant - Specifies codec variant.
- qcom,wcd9xxx-mic-tristate: For chipsets where I2S TX line is shared between
the Codec and TDM mics, tristate the WCD mics to
avoid PCM interference as the end product uses
only TDM mics.

Example:
i2c_3: i2c@78B7000 { /* BLSP1 QUP3 */
Expand Down
1 change: 1 addition & 0 deletions Documentation/devicetree/bindings/vendor-prefixes.txt
Expand Up @@ -78,6 +78,7 @@ haoyu Haoyu Microelectronic Co. Ltd.
hisilicon Hisilicon Limited.
honeywell Honeywell
hp Hewlett Packard
himax Himax Coroporation
i2se I2SE GmbH
ibm International Business Machines (IBM)
idt Integrated Device Technologies, Inc.
Expand Down
3 changes: 2 additions & 1 deletion Makefile
@@ -1,6 +1,6 @@
VERSION = 3
PATCHLEVEL = 18
SUBLEVEL = 116
SUBLEVEL = 122
EXTRAVERSION =
NAME = Diseased Newt

Expand Down Expand Up @@ -615,6 +615,7 @@ KBUILD_CFLAGS += $(call cc-disable-warning,frame-address,)
KBUILD_CFLAGS += $(call cc-disable-warning, format-truncation)
KBUILD_CFLAGS += $(call cc-disable-warning, format-overflow)
KBUILD_CFLAGS += $(call cc-disable-warning, int-in-bool-context)
KBUILD_CFLAGS += $(call cc-disable-warning, attribute-alias)
KBUILD_CFLAGS += $(call cc-option,-fno-PIE)
KBUILD_AFLAGS += $(call cc-option,-fno-PIE)

Expand Down
64 changes: 28 additions & 36 deletions arch/alpha/kernel/osf_sys.c
Expand Up @@ -525,24 +525,19 @@ SYSCALL_DEFINE4(osf_mount, unsigned long, typenr, const char __user *, path,
SYSCALL_DEFINE1(osf_utsname, char __user *, name)
{
int error;
char tmp[5 * 32];

down_read(&uts_sem);
error = -EFAULT;
if (copy_to_user(name + 0, utsname()->sysname, 32))
goto out;
if (copy_to_user(name + 32, utsname()->nodename, 32))
goto out;
if (copy_to_user(name + 64, utsname()->release, 32))
goto out;
if (copy_to_user(name + 96, utsname()->version, 32))
goto out;
if (copy_to_user(name + 128, utsname()->machine, 32))
goto out;
memcpy(tmp + 0 * 32, utsname()->sysname, 32);
memcpy(tmp + 1 * 32, utsname()->nodename, 32);
memcpy(tmp + 2 * 32, utsname()->release, 32);
memcpy(tmp + 3 * 32, utsname()->version, 32);
memcpy(tmp + 4 * 32, utsname()->machine, 32);
up_read(&uts_sem);

error = 0;
out:
up_read(&uts_sem);
return error;
if (copy_to_user(name, tmp, sizeof(tmp)))
return -EFAULT;
return 0;
}

SYSCALL_DEFINE0(getpagesize)
Expand All @@ -560,24 +555,22 @@ SYSCALL_DEFINE0(getdtablesize)
*/
SYSCALL_DEFINE2(osf_getdomainname, char __user *, name, int, namelen)
{
unsigned len;
int i;
int len, err = 0;
char *kname;
char tmp[32];

if (!access_ok(VERIFY_WRITE, name, namelen))
return -EFAULT;

len = namelen;
if (len > 32)
len = 32;
if (namelen < 0 || namelen > 32)
namelen = 32;

down_read(&uts_sem);
for (i = 0; i < len; ++i) {
__put_user(utsname()->domainname[i], name + i);
if (utsname()->domainname[i] == '\0')
break;
}
kname = utsname()->domainname;
len = strnlen(kname, namelen);
len = min(len + 1, namelen);
memcpy(tmp, kname, len);
up_read(&uts_sem);

if (copy_to_user(name, tmp, len))
return -EFAULT;
return 0;
}

Expand Down Expand Up @@ -740,27 +733,26 @@ SYSCALL_DEFINE3(osf_sysinfo, int, command, char __user *, buf, long, count)
};
unsigned long offset;
const char *res;
long len, err = -EINVAL;
long len;
char tmp[__NEW_UTS_LEN + 1];

offset = command-1;
if (offset >= ARRAY_SIZE(sysinfo_table)) {
/* Digital UNIX has a few unpublished interfaces here */
printk("sysinfo(%d)", command);
goto out;
return -EINVAL;
}

down_read(&uts_sem);
res = sysinfo_table[offset];
len = strlen(res)+1;
if ((unsigned long)len > (unsigned long)count)
len = count;
if (copy_to_user(buf, res, len))
err = -EFAULT;
else
err = 0;
memcpy(tmp, res, len);
up_read(&uts_sem);
out:
return err;
if (copy_to_user(buf, tmp, len))
return -EFAULT;
return 0;
}

SYSCALL_DEFINE5(osf_getsysinfo, unsigned long, op, void __user *, buffer,
Expand Down
3 changes: 3 additions & 0 deletions arch/arc/include/asm/delay.h
Expand Up @@ -17,8 +17,11 @@
#ifndef __ASM_ARC_UDELAY_H
#define __ASM_ARC_UDELAY_H

#include <asm-generic/types.h>
#include <asm/param.h> /* HZ */

extern unsigned long loops_per_jiffy;

static inline void __delay(unsigned long loops)
{
__asm__ __volatile__(
Expand Down
2 changes: 1 addition & 1 deletion arch/arc/include/asm/page.h
Expand Up @@ -97,7 +97,7 @@ typedef unsigned long pgtable_t;
#define virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT)

/* Default Permissions for stack/heaps pages (Non Executable) */
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE)
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)

#define WANT_PAGE_VIRTUAL 1

Expand Down
2 changes: 1 addition & 1 deletion arch/arc/include/asm/pgtable.h
Expand Up @@ -372,7 +372,7 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address,

/* Decode a PTE containing swap "identifier "into constituents */
#define __swp_type(pte_lookalike) (((pte_lookalike).val) & 0x1f)
#define __swp_offset(pte_lookalike) ((pte_lookalike).val << 13)
#define __swp_offset(pte_lookalike) ((pte_lookalike).val >> 13)

/* NOPs, to keep generic kernel happy */
#define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) })
Expand Down

0 comments on commit dc712da

Please sign in to comment.