| Message ID | 20190429100007.GA69386@black.fi.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | [GIT,PULL] intel-pinctrl for 5.2-1 | expand |
On Mon, Apr 29, 2019 at 11:00 AM Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > There will be a conflict due to a patch for Intel pin control landed in the > devel pin control queue. Though, it applies cleanly on top of for-next. > > I would recommend to drop Intel specific patches from devel queue. OK I dropped Chris Chiu's patch from my queue and pulled this in instead. Sorry for picking that up by mistake. Yours, Linus Walleij
Hi Linus, There will be a conflict due to a patch for Intel pin control landed in the devel pin control queue. Though, it applies cleanly on top of for-next. I would recommend to drop Intel specific patches from devel queue. Thanks, With Best Regards, Andy Shevchenko The following changes since commit 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b: Linux 5.1-rc1 (2019-03-17 14:22:26 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git tags/intel-pinctrl-v5.2-1 for you to fetch changes up to 5f61d9517f17069dbedb94aa71034f0a22e014ef: pinctrl: intel: Increase readability of intel_gpio_update_pad_mode() (2019-04-28 20:19:06 +0300) ---------------------------------------------------------------- intel-pinctrl for v5.2-1 Non-critical fixes for Intel Baytrail and Intel Cedarfork. Couple of fixes for all pinctrl-intel based drivers with regard to IRQ handling, i.e. moving PM calls to noirq level to avoid IRQ lose and restore ownership of pins to prevent IRQ masking side effect. The following is an automated git shortlog grouped by driver: baytrail: - Fix potential NULL pointer dereference cedarfork: - Update pin names according to v1.13c intel: - Increase readability of intel_gpio_update_pad_mode() - Retain HOSTSW_OWN for requested gpio pin - move gpio suspend/resume to noirq phase ---------------------------------------------------------------- Aditya Pakki (1): pinctrl: baytrail: Fix potential NULL pointer dereference Andy Shevchenko (2): pinctrl: cedarfork: Update pin names according to v1.13c pinctrl: intel: Increase readability of intel_gpio_update_pad_mode() Binbin Wu (1): pinctrl: pinctrl-intel: move gpio suspend/resume to noirq phase Chris Chiu (1): pinctrl: intel: Retain HOSTSW_OWN for requested gpio pin drivers/pinctrl/intel/pinctrl-baytrail.c | 2 + drivers/pinctrl/intel/pinctrl-cedarfork.c | 18 ++++----- drivers/pinctrl/intel/pinctrl-intel.c | 66 ++++++++++++++++++++++++++++--- drivers/pinctrl/intel/pinctrl-intel.h | 11 +++--- 4 files changed, 78 insertions(+), 19 deletions(-)